« back to all changes in this revision
Viewing changes to po/ro.po
- browse files at revision 6217
- compare with another revision
- download diff
- download tarball
- view history from revision 6217
- Committer: Patch Queue Manager
- Date: 2011-10-14 16:54:26 UTC
- mfrom: (6216.1.1 remove-this-file)
- Revision ID: pqm@pqm.ubuntu.com-20111014165426-tjix4e6idryf1r2z
(jelmer) Remove an accidentally committed .THIS file. (Jelmer Vernooij)
- files added:
- bzrlib/help_topics/en/location-alias.txt
- bzrlib/util/effbot
- bzrlib/util/effbot/org
- bzrlib/util/elementtree
- files removed:
- bzrlib/plugins/po_merge
- bzrlib/plugins/po_merge/tests
- files modified:
- Makefile
added
removed
po/ro.po
1
# Romanian 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: Romanian <ro@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=3; plural=(n == 1 ? 0: (((n % 100 > 19) || ((n % 100 "
18
"== 0) && (n != 0))) ? 2: 1));\n"
19
"X-Launchpad-Export-Date: 2012-01-17 05:17+0000\n"
20
"X-Generator: Launchpad (build 14676)\n"
21
22
#: bzrlib/add.py:95
23
msgid "skipping {0} (larger than {1} of {2} bytes)"
24
msgstr ""
25
26
#: bzrlib/branch.py:872
27
msgid "Unstacking"
28
msgstr ""
29
30
#: bzrlib/branch.py:3183
31
#, python-format
32
msgid "Pushed up to revision %d."
33
msgstr ""
34
35
#: bzrlib/branch.py:3185
36
#, python-format
37
msgid "%d tag updated."
38
msgid_plural "%d tags updated."
39
msgstr[0] ""
40
msgstr[1] ""
41
42
#: bzrlib/branch.py:3188
43
msgid "No new revisions or tags to push."
44
msgstr ""
45
46
#: bzrlib/branch.py:3190
47
msgid "No new revisions to push."
48
msgstr ""
49
50
#: bzrlib/branch.py:3210
51
msgid "checked branch {0} format {1}"
52
msgstr ""
53
54
#: bzrlib/branch.py:3213
55
#, python-format
56
msgid "found error:%s"
57
msgstr ""
58
59
#: bzrlib/builtins.py:121 bzrlib/builtins.py:2923 bzrlib/workingtree.py:315
60
#, python-format
61
msgid "Ignoring files outside view. View is %s"
62
msgstr ""
63
64
#: bzrlib/builtins.py:130
65
#, python-format
66
msgid "bzr %s --revision takes exactly one revision identifier"
67
msgstr ""
68
69
#: bzrlib/builtins.py:215
70
msgid "Display status summary."
71
msgstr ""
72
73
#: bzrlib/builtins.py:217
74
msgid ""
75
"This reports on versioned and unknown files, reporting them\n"
76
"grouped by state. Possible states are:"
77
msgstr ""
78
79
#: bzrlib/builtins.py:220
80
msgid ""
81
"added\n"
82
" Versioned in the working copy but not in the previous revision."
83
msgstr ""
84
85
#: bzrlib/builtins.py:223
86
msgid ""
87
"removed\n"
88
" Versioned in the previous revision but removed or deleted\n"
89
" in the working copy."
90
msgstr ""
91
92
#: bzrlib/builtins.py:227
93
msgid ""
94
"renamed\n"
95
" Path of this file changed from the previous revision;\n"
96
" the text may also have changed. This includes files whose\n"
97
" parent directory was renamed."
98
msgstr ""
99
100
#: bzrlib/builtins.py:232
101
msgid ""
102
"modified\n"
103
" Text has changed since the previous revision."
104
msgstr ""
105
106
#: bzrlib/builtins.py:235
107
msgid ""
108
"kind changed\n"
109
" File kind has been changed (e.g. from file to directory)."
110
msgstr ""
111
112
#: bzrlib/builtins.py:238
113
msgid ""
114
"unknown\n"
115
" Not versioned and not matching an ignore pattern."
116
msgstr ""
117
118
#: bzrlib/builtins.py:241
119
msgid ""
120
"Additionally for directories, symlinks and files with a changed\n"
121
"executable bit, Bazaar indicates their type using a trailing\n"
122
"character: '/', '@' or '*' respectively. These decorations can be\n"
123
"disabled using the '--no-classify' option."
124
msgstr ""
125
126
#: bzrlib/builtins.py:246
127
msgid ""
128
"To see ignored files use 'bzr ignored'. For details on the\n"
129
"changes to file texts, use 'bzr diff'."
130
msgstr ""
131
132
#: bzrlib/builtins.py:249
133
msgid ""
134
"Note that --short or -S gives status flags for each item, similar\n"
135
"to Subversion's status command. To get output similar to svn -q,\n"
136
"use bzr status -SV."
137
msgstr ""
138
139
#: bzrlib/builtins.py:253
140
msgid ""
141
"If no arguments are specified, the status of the entire working\n"
142
"directory is shown. Otherwise, only the status of the specified\n"
143
"files or directories is reported. If a directory is given, status\n"
144
"is reported for everything inside that directory."
145
msgstr ""
146
147
#: bzrlib/builtins.py:258
148
msgid ""
149
"Before merges are committed, the pending merge tip revisions are\n"
150
"shown. To see all pending merge revisions, use the -v option.\n"
151
"To skip the display of pending merge information altogether, use\n"
152
"the no-pending option or specify a file/directory."
153
msgstr ""
154
155
#: bzrlib/builtins.py:263
156
msgid ""
157
"To compare the working directory to a specific revision, pass a\n"
158
"single revision to the revision argument."
159
msgstr ""
160
161
#: bzrlib/builtins.py:266
162
msgid ""
163
"To see which files have changed in a specific revision, or between\n"
164
"two revisions, pass a revision range to the revision argument.\n"
165
"This will produce the same results as calling 'bzr diff --summarize'."
166
msgstr ""
167
168
#: bzrlib/builtins.py:275
169
msgid "Use short status indicators."
170
msgstr ""
171
172
#: bzrlib/builtins.py:277
173
msgid "Only show versioned files."
174
msgstr ""
175
176
#: bzrlib/builtins.py:279
177
msgid "Don't show pending merges."
178
msgstr ""
179
180
#: bzrlib/builtins.py:282
181
msgid "Do not mark object type using indicator."
182
msgstr ""
183
184
#: bzrlib/builtins.py:297
185
msgid "bzr status --revision takes exactly one or two revision specifiers"
186
msgstr ""
187
188
#: bzrlib/builtins.py:341 bzrlib/builtins.py:5090
189
msgid "You can only supply one of revision_id or --revision"
190
msgstr ""
191
192
#: bzrlib/builtins.py:344 bzrlib/builtins.py:5092
193
msgid "You must supply either --revision or a revision_id"
194
msgstr ""
195
196
#: bzrlib/builtins.py:351
197
#, python-format
198
msgid "Repository %r does not support access to raw revision texts"
199
msgstr ""
200
201
#: bzrlib/builtins.py:362
202
msgid "The repository {0} contains no revision {1}."
203
msgstr ""
204
205
#: bzrlib/builtins.py:369
206
msgid "You cannot specify a NULL revision."
207
msgstr ""
208
209
#: bzrlib/builtins.py:461
210
msgid "Remove the working tree from a given branch/checkout."
211
msgstr ""
212
213
#: bzrlib/builtins.py:463
214
msgid ""
215
"Since a lightweight checkout is little more than a working tree\n"
216
"this will refuse to run against one."
217
msgstr ""
218
219
#: bzrlib/builtins.py:466
220
msgid "To re-create the working tree, use \"bzr checkout\"."
221
msgstr ""
222
223
#: bzrlib/builtins.py:472
224
msgid ""
225
"Remove the working tree even if it has uncommitted or shelved changes."
226
msgstr ""
227
228
#: bzrlib/builtins.py:486
229
msgid "No working tree to remove"
230
msgstr ""
231
232
#: bzrlib/builtins.py:488
233
msgid "You cannot remove the working tree of a remote path"
234
msgstr ""
235
236
#: bzrlib/builtins.py:497
237
msgid "You cannot remove the working tree from a lightweight checkout"
238
msgstr ""
239
240
#: bzrlib/builtins.py:537
241
msgid ""
242
"The tree does not appear to be corrupt. You probably want \"bzr revert\" "
243
"instead. Use \"--force\" if you are sure you want to reset the working tree."
244
msgstr ""
245
246
#: bzrlib/builtins.py:548
247
msgid ""
248
", the header appears corrupt, try passing -r -1 to set the state to the last "
249
"commit"
250
msgstr ""
251
252
#: bzrlib/builtins.py:552
253
msgid "failed to reset the tree state{0}"
254
msgstr ""
255
256
#: bzrlib/builtins.py:556
257
msgid "Show current revision number."
258
msgstr ""
259
260
#: bzrlib/builtins.py:558
261
msgid "This is equal to the number of revisions on this branch."
262
msgstr ""
263
264
#: bzrlib/builtins.py:571
265
msgid "--tree and --revision can not be used together"
266
msgstr ""
267
268
#: bzrlib/builtins.py:588 bzrlib/builtins.py:5874
269
msgid "Tags can only be placed on a single revision, not on a range"
270
msgstr ""
271
272
#: bzrlib/builtins.py:612
273
msgid "Show revno of working tree."
274
msgstr ""
275
276
#: bzrlib/builtins.py:660
277
msgid "Add specified files or directories."
278
msgstr ""
279
280
#: bzrlib/builtins.py:662
281
msgid ""
282
"In non-recursive mode, all the named items are added, regardless\n"
283
"of whether they were previously ignored. A warning is given if\n"
284
"any of the named files are already versioned."
285
msgstr ""
286
287
#: bzrlib/builtins.py:666
288
msgid ""
289
"In recursive mode (the default), files are treated the same way\n"
290
"but the behaviour for directories is different. Directories that\n"
291
"are already versioned do not give a warning. All directories,\n"
292
"whether already versioned or not, are searched for files or\n"
293
"subdirectories that are neither versioned or ignored, and these\n"
294
"are added. This search proceeds recursively into versioned\n"
295
"directories. If no names are given '.' is assumed."
296
msgstr ""
297
298
#: bzrlib/builtins.py:674
299
msgid ""
300
"A warning will be printed when nested trees are encountered,\n"
301
"unless they are explicitly ignored."
302
msgstr ""
303
304
#: bzrlib/builtins.py:677
305
msgid ""
306
"Therefore simply saying 'bzr add' will version all files that\n"
307
"are currently unknown."
308
msgstr ""
309
310
#: bzrlib/builtins.py:680
311
msgid ""
312
"Adding a file whose parent directory is not versioned will\n"
313
"implicitly add the parent, and so on up to the root. This means\n"
314
"you should never need to explicitly add a directory, they'll just\n"
315
"get added when you add a file in the directory."
316
msgstr ""
317
318
#: bzrlib/builtins.py:685
319
msgid ""
320
"--dry-run will show which files would be added, but not actually\n"
321
"add them."
322
msgstr ""
323
324
#: bzrlib/builtins.py:688
325
msgid ""
326
"--file-ids-from will try to use the file ids from the supplied path.\n"
327
"It looks up ids trying to find a matching parent directory with the\n"
328
"same filename, and then by pure path. This option is rarely needed\n"
329
"but can be useful when adding the same logical file into two\n"
330
"branches that will be merged later (without showing the two different\n"
331
"adds as a conflict). It is also useful when merging another project\n"
332
"into a subdirectory of this one."
333
msgstr ""
334
335
#: bzrlib/builtins.py:696
336
msgid ""
337
"Any files matching patterns in the ignore list will not be added\n"
338
"unless they are explicitly mentioned."
339
msgstr ""
340
341
#: bzrlib/builtins.py:699
342
msgid ""
343
"In recursive mode, files larger than the configuration option \n"
344
"add.maximum_file_size will be skipped. Named items are never skipped due\n"
345
"to file size."
346
msgstr ""
347
348
#: bzrlib/builtins.py:706
349
msgid "Don't recursively add the contents of directories."
350
msgstr ""
351
352
#: bzrlib/builtins.py:712
353
msgid "Lookup file ids from this tree."
354
msgstr ""
355
356
#: bzrlib/builtins.py:748
357
msgid "ignored {0} matching \"{1}\"\n"
358
msgstr ""
359
360
#: bzrlib/builtins.py:753
361
msgid "Create a new versioned directory."
362
msgstr ""
363
364
#: bzrlib/builtins.py:755
365
msgid "This is equivalent to creating the directory and then adding it."
366
msgstr ""
367
368
#: bzrlib/builtins.py:762
369
msgid "No error if existing, make parent directories as needed."
370
msgstr ""
371
372
#: bzrlib/builtins.py:796
373
#, python-format
374
msgid "added %s\n"
375
msgstr ""
376
377
#: bzrlib/builtins.py:838
378
#, python-format
379
msgid "invalid kind %r specified"
380
msgstr ""
381
382
#: bzrlib/builtins.py:875
383
msgid "Move or rename a file."
384
msgstr ""
385
386
#: bzrlib/builtins.py:877
387
msgid " bzr mv SOURCE... DESTINATION"
388
msgstr ""
389
390
#: bzrlib/builtins.py:879
391
msgid ""
392
"If the last argument is a versioned directory, all the other names\n"
393
"are moved into it. Otherwise, there must be exactly two arguments\n"
394
"and the file is changed to a new name."
395
msgstr ""
396
397
#: bzrlib/builtins.py:883
398
msgid ""
399
"If OLDNAME does not exist on the filesystem but is versioned and\n"
400
"NEWNAME does exist on the filesystem but is not versioned, mv\n"
401
"assumes that the file has been manually moved and only updates\n"
402
"its internal inventory to reflect that change.\n"
403
"The same is valid when moving many SOURCE files to a DESTINATION."
404
msgstr ""
405
406
#: bzrlib/builtins.py:889
407
msgid "Files cannot be moved between branches."
408
msgstr ""
409
410
#: bzrlib/builtins.py:896
411
msgid ""
412
"Move only the bzr identifier of the file, because the file has already been "
413
"moved."
414
msgstr ""
415
416
#: bzrlib/builtins.py:898
417
msgid "Automatically guess renames."
418
msgstr ""
419
420
#: bzrlib/builtins.py:899
421
msgid "Avoid making changes when guessing renames."
422
msgstr ""
423
424
#: bzrlib/builtins.py:908
425
msgid "--dry-run requires --auto."
426
msgstr ""
427
428
#: bzrlib/builtins.py:912
429
msgid "missing file argument"
430
msgstr ""
431
432
#: bzrlib/builtins.py:916
433
msgid "can not move root of branch"
434
msgstr ""
435
436
#: bzrlib/builtins.py:922
437
msgid "Only one path may be specified to --auto."
438
msgstr ""
439
440
#: bzrlib/builtins.py:925
441
msgid "--after cannot be specified with --auto."
442
msgstr ""
443
444
#: bzrlib/builtins.py:962
445
msgid "to mv multiple files the destination must be a versioned directory"
446
msgstr ""
447
448
#: bzrlib/builtins.py:1014
449
msgid "Turn this branch into a mirror of another branch."
450
msgstr ""
451
452
#: bzrlib/builtins.py:1016
453
msgid ""
454
"By default, this command only works on branches that have not diverged.\n"
455
"Branches are considered diverged if the destination branch's most recent \n"
456
"commit is one that has not been merged (directly or indirectly) into the \n"
457
"parent."
458
msgstr ""
459
460
#: bzrlib/builtins.py:1021
461
msgid ""
462
"If branches have diverged, you can use 'bzr merge' to integrate the changes\n"
463
"from one into the other. Once one branch has merged, the other should\n"
464
"be able to pull it again."
465
msgstr ""
466
467
#: bzrlib/builtins.py:1025
468
msgid ""
469
"If you want to replace your local changes and just want your branch to\n"
470
"match the remote one, use pull --overwrite. This will work even if the two\n"
471
"branches have diverged."
472
msgstr ""
473
474
#: bzrlib/builtins.py:1029
475
msgid ""
476
"If there is no default location set, the first pull will set it (use\n"
477
"--no-remember to avoid setting it). After that, you can omit the\n"
478
"location to use the default. To change the default, use --remember. The\n"
479
"value will only be saved if the remote location can be accessed."
480
msgstr ""
481
482
#: bzrlib/builtins.py:1034
483
msgid ""
484
"The --verbose option will display the revisions pulled using the log_format\n"
485
"configuration option. You can use a different format by overriding it with\n"
486
"-Olog_format=<other_format>."
487
msgstr ""
488
489
#: bzrlib/builtins.py:1038
490
msgid ""
491
"Note: The location can be specified either in the form of a branch,\n"
492
"or in the form of a path to a file containing a merge directive generated\n"
493
"with bzr send."
494
msgstr ""
495
496
#: bzrlib/builtins.py:1046
497
msgid "Show logs of pulled revisions."
498
msgstr ""
499
500
#: bzrlib/builtins.py:1048
501
msgid ""
502
"Branch to pull into, rather than the one containing the working directory."
503
msgstr ""
504
505
#: bzrlib/builtins.py:1051
506
msgid ""
507
"Perform a local pull in a bound branch. Local pulls are not applied to the "
508
"master branch."
509
msgstr ""
510
511
#: bzrlib/builtins.py:1080
512
msgid "Need working tree for --show-base."
513
msgstr ""
514
515
#: bzrlib/builtins.py:1096
516
msgid "No pull location known or specified."
517
msgstr ""
518
519
#: bzrlib/builtins.py:1102
520
#, python-format
521
msgid "Using saved parent location: %s\n"
522
msgstr ""
523
524
#: bzrlib/builtins.py:1109 bzrlib/builtins.py:4300
525
msgid "Cannot use -r with merge directives or bundles"
526
msgstr ""
527
528
#: bzrlib/builtins.py:1150
529
msgid "Update a mirror of this branch."
530
msgstr ""
531
532
#: bzrlib/builtins.py:1152
533
msgid ""
534
"The target branch will not have its working tree populated because this\n"
535
"is both expensive, and is not supported on remote file systems."
536
msgstr ""
537
538
#: bzrlib/builtins.py:1155
539
msgid ""
540
"Some smart servers or protocols *may* put the working tree in place in\n"
541
"the future."
542
msgstr ""
543
544
#: bzrlib/builtins.py:1158
545
msgid ""
546
"This command only works on branches that have not diverged. Branches are\n"
547
"considered diverged if the destination branch's most recent commit is one\n"
548
"that has not been merged (directly or indirectly) by the source branch."
549
msgstr ""
550
551
#: bzrlib/builtins.py:1162
552
msgid ""
553
"If branches have diverged, you can use 'bzr push --overwrite' to replace\n"
554
"the other branch completely, discarding its unmerged changes."
555
msgstr ""
556
557
#: bzrlib/builtins.py:1165
558
msgid ""
559
"If you want to ensure you have the different changes in the other branch,\n"
560
"do a merge (see bzr help merge) from the other branch, and commit that.\n"
561
"After that you will be able to do a push without '--overwrite'."
562
msgstr ""
563
564
#: bzrlib/builtins.py:1169
565
msgid ""
566
"If there is no default push location set, the first push will set it (use\n"
567
"--no-remember to avoid setting it). After that, you can omit the\n"
568
"location to use the default. To change the default, use --remember. The\n"
569
"value will only be saved if the remote location can be accessed."
570
msgstr ""
571
572
#: bzrlib/builtins.py:1174
573
msgid ""
574
"The --verbose option will display the revisions pushed using the log_format\n"
575
"configuration option. You can use a different format by overriding it with\n"
576
"-Olog_format=<other_format>."
577
msgstr ""
578
579
#: bzrlib/builtins.py:1185 bzrlib/foreign.py:272
580
msgid ""
581
"Branch to push from, rather than the one containing the working directory."
582
msgstr ""
583
584
#: bzrlib/builtins.py:1188
585
msgid ""
586
"By default push will fail if the target directory exists, but does not "
587
"already have a control directory. This flag will allow push to proceed."
588
msgstr ""
589
590
#: bzrlib/builtins.py:1193
591
msgid ""
592
"Create a stacked branch that references the public location of the parent "
593
"branch."
594
msgstr ""
595
596
#: bzrlib/builtins.py:1196
597
msgid ""
598
"Create a stacked branch that refers to another branch for the commit "
599
"history. Only the work not present in the referenced branch is included in "
600
"the branch created."
601
msgstr ""
602
603
#: bzrlib/builtins.py:1201 bzrlib/foreign.py:279
604
msgid ""
605
"Refuse to push if there are uncommitted changes in the working tree, --no-"
606
"strict disables the check."
607
msgstr ""
608
609
#: bzrlib/builtins.py:1204
610
msgid "Don't populate the working tree, even for protocols that support it."
611
msgstr ""
612
613
#: bzrlib/builtins.py:1248
614
msgid "Could not determine branch to refer to."
615
msgstr ""
616
617
#: bzrlib/builtins.py:1257
618
#, python-format
619
msgid ""
620
"No push location known or specified. To push to the parent branch (at %s), "
621
"use 'bzr push :parent'."
622
msgstr ""
623
624
#: bzrlib/builtins.py:1263 bzrlib/foreign.py:306
625
msgid "No push location known or specified."
626
msgstr ""
627
628
#: bzrlib/builtins.py:1267
629
#, python-format
630
msgid "Using saved push location: %s"
631
msgstr ""
632
633
#: bzrlib/builtins.py:1277
634
msgid "Create a new branch that is a copy of an existing branch."
635
msgstr ""
636
637
#: bzrlib/builtins.py:1279
638
msgid ""
639
"If the TO_LOCATION is omitted, the last component of the FROM_LOCATION will\n"
640
"be used. In other words, \"branch ../foo/bar\" will attempt to create "
641
"./bar.\n"
642
"If the FROM_LOCATION has no / or path separator embedded, the TO_LOCATION\n"
643
"is derived from the FROM_LOCATION by stripping a leading scheme or drive\n"
644
"identifier, if any. For example, \"branch lp:foo-bar\" will attempt to\n"
645
"create ./foo-bar."
646
msgstr ""
647
648
#: bzrlib/builtins.py:1286
649
msgid ""
650
"To retrieve the branch as of a particular revision, supply the --revision\n"
651
"parameter, as in \"branch foo/bar -r 5\"."
652
msgstr ""
653
654
#: bzrlib/builtins.py:1289
655
msgid "The synonyms 'clone' and 'get' for this command are deprecated."
656
msgstr ""
657
658
#: bzrlib/builtins.py:1299
659
msgid "Create a branch without a working-tree."
660
msgstr ""
661
662
#: bzrlib/builtins.py:1301
663
msgid "Switch the checkout in the current directory to the new branch."
664
msgstr ""
665
666
#: bzrlib/builtins.py:1304
667
msgid ""
668
"Create a stacked branch referring to the source branch. The new branch will "
669
"depend on the availability of the source branch for all operations."
670
msgstr ""
671
672
#: bzrlib/builtins.py:1308
673
msgid "Do not use a shared repository, even if available."
674
msgstr ""
675
676
#: bzrlib/builtins.py:1310
677
msgid ""
678
"By default branch will fail if the target directory exists, but does not "
679
"already have a control directory. This flag will allow branch to proceed."
680
msgstr ""
681
682
#: bzrlib/builtins.py:1315
683
msgid "Bind new branch to from location."
684
msgstr ""
685
686
#: bzrlib/builtins.py:1362
687
#, python-format
688
msgid "Target directory \"%s\" already exists."
689
msgstr ""
690
691
#: bzrlib/builtins.py:1374
692
#, python-format
693
msgid "Parent of \"%s\" does not exist."
694
msgstr ""
695
696
#: bzrlib/builtins.py:1393
697
msgid "The branch {0} has no revision {1}."
698
msgstr ""
699
700
#: bzrlib/builtins.py:1403 bzrlib/push.py:53
701
#, python-format
702
msgid "Created new stacked branch referring to %s."
703
msgstr ""
704
705
#: bzrlib/builtins.py:1407
706
#, python-format
707
msgid "Branched %d revision."
708
msgid_plural "Branched %d revisions."
709
msgstr[0] ""
710
msgstr[1] ""
711
712
#: bzrlib/builtins.py:1412
713
#, python-format
714
msgid "New branch bound to %s"
715
msgstr ""
716
717
#: bzrlib/builtins.py:1417 bzrlib/builtins.py:6187
718
#, python-format
719
msgid "Switched to branch: %s"
720
msgstr ""
721
722
#: bzrlib/builtins.py:1422
723
msgid "List the branches available at the current location."
724
msgstr ""
725
726
#: bzrlib/builtins.py:1424
727
msgid ""
728
"This command will print the names of all the branches at the current\n"
729
"location."
730
msgstr ""
731
732
#: bzrlib/builtins.py:1431
733
msgid ""
734
"Recursively scan for branches rather than just looking in the specified "
735
"location."
736
msgstr ""
737
738
#: bzrlib/builtins.py:1461
739
msgid "(default)"
740
msgstr ""
741
742
#: bzrlib/builtins.py:1473
743
msgid "Create a new checkout of an existing branch."
744
msgstr ""
745
746
#: bzrlib/builtins.py:1475
747
msgid ""
748
"If BRANCH_LOCATION is omitted, checkout will reconstitute a working tree "
749
"for\n"
750
"the branch found in '.'. This is useful if you have removed the working "
751
"tree\n"
752
"or if it was never created - i.e. if you pushed the branch to its current\n"
753
"location using SFTP."
754
msgstr ""
755
756
#: bzrlib/builtins.py:1480
757
msgid ""
758
"If the TO_LOCATION is omitted, the last component of the BRANCH_LOCATION "
759
"will\n"
760
"be used. In other words, \"checkout ../foo/bar\" will attempt to create "
761
"./bar.\n"
762
"If the BRANCH_LOCATION has no / or path separator embedded, the TO_LOCATION\n"
763
"is derived from the BRANCH_LOCATION by stripping a leading scheme or drive\n"
764
"identifier, if any. For example, \"checkout lp:foo-bar\" will attempt to\n"
765
"create ./foo-bar."
766
msgstr ""
767
768
#: bzrlib/builtins.py:1487
769
msgid ""
770
"To retrieve the branch as of a particular revision, supply the --revision\n"
771
"parameter, as in \"checkout foo/bar -r 5\". Note that this will be "
772
"immediately\n"
773
"out of date [so you cannot commit] but it may be useful (i.e. to examine "
774
"old\n"
775
"code.)"
776
msgstr ""
777
778
#: bzrlib/builtins.py:1497
779
msgid ""
780
"Perform a lightweight checkout. Lightweight checkouts depend on access to "
781
"the branch for every operation. Normal checkouts can perform common "
782
"operations like diff and status without such access, and also support local "
783
"commits."
784
msgstr ""
785
786
#: bzrlib/builtins.py:1504
787
msgid "Get file contents from this tree."
788
msgstr ""
789
790
#: bzrlib/builtins.py:1506
791
msgid "Hard-link working tree files where possible."
792
msgstr ""
793
794
#: bzrlib/builtins.py:1547
795
msgid ""
796
"Show list of renamed files.\n"
797
" "
798
msgstr ""
799
800
#: bzrlib/builtins.py:1577
801
msgid "Update a working tree to a new revision."
802
msgstr ""
803
804
#: bzrlib/builtins.py:1579
805
msgid ""
806
"This will perform a merge of the destination revision (the tip of the\n"
807
"branch, or the specified revision) into the working tree, and then make\n"
808
"that revision the basis revision for the working tree. "
809
msgstr ""
810
811
#: bzrlib/builtins.py:1583
812
msgid ""
813
"You can use this to visit an older revision, or to update a working tree\n"
814
"that is out of date from its branch."
815
msgstr ""
816
817
#: bzrlib/builtins.py:1586
818
msgid ""
819
"If there are any uncommitted changes in the tree, they will be carried\n"
820
"across and remain as uncommitted changes after the update. To discard\n"
821
"these changes, use 'bzr revert'. The uncommitted changes may conflict\n"
822
"with the changes brought in by the change in basis revision."
823
msgstr ""
824
825
#: bzrlib/builtins.py:1591
826
msgid ""
827
"If the tree's branch is bound to a master branch, bzr will also update\n"
828
"the branch from the master."
829
msgstr ""
830
831
#: bzrlib/builtins.py:1594
832
msgid ""
833
"You cannot update just a single file or directory, because each Bazaar\n"
834
"working tree has just a single basis revision. If you want to restore a\n"
835
"file that has been removed locally, use 'bzr revert' instead of 'bzr\n"
836
"update'. If you want to restore a file to its state in a previous\n"
837
"revision, use 'bzr revert' with a '-r' option, or use 'bzr cat' to write\n"
838
"out the old content of that file to a new location."
839
msgstr ""
840
841
#: bzrlib/builtins.py:1601
842
msgid ""
843
"The 'dir' argument, if given, must be the location of the root of a\n"
844
"working tree to update. By default, the working tree that contains the \n"
845
"current working directory is used."
846
msgstr ""
847
848
#: bzrlib/builtins.py:1617
849
msgid "bzr update --revision takes exactly one revision"
850
msgstr ""
851
852
#: bzrlib/builtins.py:1625
853
msgid "bzr update can only update a whole tree, not a file or subdirectory"
854
msgstr ""
855
856
#: bzrlib/builtins.py:1656
857
msgid "Tree is up to date at revision {0} of branch {1}"
858
msgstr ""
859
860
#: bzrlib/builtins.py:1672
861
#, python-format
862
msgid ""
863
"branch has no revision %s\n"
864
"bzr update --revision only works for a revision in the branch history"
865
msgstr ""
866
867
#: bzrlib/builtins.py:1678
868
msgid "Updated to revision {0} of branch {1}"
869
msgstr ""
870
871
#: bzrlib/builtins.py:1682
872
msgid ""
873
"Your local commits will now show as pending merges with 'bzr status', and "
874
"can be committed with 'bzr commit'."
875
msgstr ""
876
877
#: bzrlib/builtins.py:1691
878
msgid "Show information about a working tree, branch or repository."
879
msgstr ""
880
881
#: bzrlib/builtins.py:1693
882
msgid ""
883
"This command will show all known locations and formats associated to the\n"
884
"tree, branch or repository."
885
msgstr ""
886
887
#: bzrlib/builtins.py:1696
888
msgid ""
889
"In verbose mode, statistical information is included with each report.\n"
890
"To see extended statistic information, use a verbosity level of 2 or\n"
891
"higher by specifying the verbose option multiple times, e.g. -vv."
892
msgstr ""
893
894
#: bzrlib/builtins.py:1700
895
msgid "Branches and working trees will also report any missing revisions."
896
msgstr ""
897
898
#: bzrlib/builtins.py:1702 bzrlib/builtins.py:3622 bzrlib/builtins.py:4752
899
#: bzrlib/builtins.py:6389
900
msgid ":Examples:"
901
msgstr ""
902
903
#: bzrlib/builtins.py:1704
904
msgid " Display information on the format and related locations:"
905
msgstr ""
906
907
#: bzrlib/builtins.py:1706
908
msgid " bzr info"
909
msgstr ""
910
911
#: bzrlib/builtins.py:1708
912
msgid ""
913
" Display the above together with extended format information and\n"
914
" basic statistics (like the number of files in the working tree and\n"
915
" number of revisions in the branch and repository):"
916
msgstr ""
917
918
#: bzrlib/builtins.py:1712
919
msgid " bzr info -v"
920
msgstr ""
921
922
#: bzrlib/builtins.py:1714
923
msgid " Display the above together with number of committers to the branch:"
924
msgstr ""
925
926
#: bzrlib/builtins.py:1716
927
msgid " bzr info -vv"
928
msgstr ""
929
930
#: bzrlib/builtins.py:1735
931
msgid "Remove files or directories."
932
msgstr ""
933
934
#: bzrlib/builtins.py:1737
935
msgid ""
936
"This makes Bazaar stop tracking changes to the specified files. Bazaar will\n"
937
"delete them if they can easily be recovered using revert otherwise they\n"
938
"will be backed up (adding an extention of the form .~#~). If no options or\n"
939
"parameters are given Bazaar will scan for files that are being tracked by\n"
940
"Bazaar but missing in your tree and stop tracking them for you."
941
msgstr ""
942
943
#: bzrlib/builtins.py:1745
944
msgid "Only remove files that have never been committed."
945
msgstr ""
946
947
#: bzrlib/builtins.py:1747
948
msgid "The file deletion mode to be used."
949
msgstr ""
950
951
#: bzrlib/builtins.py:1748
952
msgid "Deletion Strategy"
953
msgstr ""
954
955
#: bzrlib/builtins.py:1749
956
msgid "Backup changed files (default)."
957
msgstr ""
958
959
#: bzrlib/builtins.py:1750
960
msgid "Delete from bzr but leave the working copy."
961
msgstr ""
962
963
#: bzrlib/builtins.py:1751
964
msgid "Don't backup changed files."
965
msgstr ""
966
967
#: bzrlib/builtins.py:1752
968
msgid ""
969
"Delete all the specified files, even if they can not be recovered and even "
970
"if they are non-empty directories. (deprecated, use no-backup)"
971
msgstr ""
972
973
#: bzrlib/builtins.py:1761
974
msgid "(The --force option is deprecated, rather use --no-backup in future.)"
975
msgstr ""
976
977
#: bzrlib/builtins.py:1778
978
msgid "No matching files."
979
msgstr ""
980
981
#: bzrlib/builtins.py:1839
982
msgid "Reconcile bzr metadata in a branch."
983
msgstr ""
984
985
#: bzrlib/builtins.py:1841
986
msgid ""
987
"This can correct data mismatches that may have been caused by\n"
988
"previous ghost operations or bzr upgrades. You should only\n"
989
"need to run this command if 'bzr check' or a bzr developer\n"
990
"advises you to run it."
991
msgstr ""
992
993
#: bzrlib/builtins.py:1846
994
msgid ""
995
"If a second branch is provided, cross-branch reconciliation is\n"
996
"also attempted, which will check that data like the tree root\n"
997
"id which was not present in very early bzr versions is represented\n"
998
"correctly in both branches."
999
msgstr ""
1000
1001
#: bzrlib/builtins.py:1851
1002
msgid ""
1003
"At the same time it is run it may recompress data resulting in\n"
1004
"a potential saving in disk space or performance gain."
1005
msgstr ""
1006
1007
#: bzrlib/builtins.py:1854
1008
msgid "The branch *MUST* be on a listable system such as local disk or sftp."
1009
msgstr ""
1010
1011
#: bzrlib/builtins.py:1921 bzrlib/builtins.py:2039 bzrlib/builtins.py:3657
1012
msgid ""
1013
"Format for the bzr 2.0 series.\n"
1014
"Uses group-compress storage.\n"
1015
"Provides rich roots which are a one-way transition.\n"
1016
msgstr ""
1017
1018
#: bzrlib/builtins.py:1921 bzrlib/builtins.py:2039 bzrlib/builtins.py:3657
1019
msgid ""
1020
"Pack-based format used in 1.x series. Introduced in 0.92. Interoperates with "
1021
"bzr repositories before 0.92 but cannot be read by bzr < 0.92. "
1022
msgstr ""
1023
1024
#: bzrlib/builtins.py:1921 bzrlib/builtins.py:2039 bzrlib/builtins.py:3657
1025
msgid "The 2a format with experimental support for colocated branches.\n"
1026
msgstr ""
1027
1028
#: bzrlib/builtins.py:1922
1029
msgid "Make a directory into a versioned branch."
1030
msgstr ""
1031
1032
#: bzrlib/builtins.py:1924
1033
msgid ""
1034
"Use this to create an empty branch, or before importing an\n"
1035
"existing project."
1036
msgstr ""
1037
1038
#: bzrlib/builtins.py:1927
1039
msgid ""
1040
"If there is a repository in a parent directory of the location, then\n"
1041
"the history of the branch will be stored in the repository. Otherwise\n"
1042
"init creates a standalone branch which carries its own history\n"
1043
"in the .bzr directory."
1044
msgstr ""
1045
1046
#: bzrlib/builtins.py:1932
1047
msgid ""
1048
"If there is already a branch at the location but it has no working tree,\n"
1049
"the tree can be populated with 'bzr checkout'."
1050
msgstr ""
1051
1052
#: bzrlib/builtins.py:1935
1053
msgid "Recipe for importing a tree of files::"
1054
msgstr ""
1055
1056
#: bzrlib/builtins.py:1937
1057
msgid ""
1058
" cd ~/project\n"
1059
" bzr init\n"
1060
" bzr add .\n"
1061
" bzr status\n"
1062
" bzr commit -m \"imported project\""
1063
msgstr ""
1064
1065
#: bzrlib/builtins.py:1948
1066
msgid ""
1067
"Create the path leading up to the branch if it does not already exist."
1068
msgstr ""
1069
1070
#: bzrlib/builtins.py:1951
1071
msgid "Specify a format for this branch. See \"help formats\"."
1072
msgstr ""
1073
1074
#: bzrlib/builtins.py:1959
1075
msgid ""
1076
"Never change revnos or the existing log. Append revisions to it only."
1077
msgstr ""
1078
1079
#: bzrlib/builtins.py:1962
1080
msgid "Create a branch without a working tree."
1081
msgstr ""
1082
1083
#: bzrlib/builtins.py:1982 bzrlib/push.py:110
1084
#, python-format
1085
msgid ""
1086
"Parent directory of %s does not exist.\n"
1087
"You may supply --create-prefix to create all leading parent directories."
1088
msgstr ""
1089
1090
#: bzrlib/builtins.py:2016
1091
msgid ""
1092
"This branch format cannot be set to append-revisions-only. Try --default."
1093
msgstr ""
1094
1095
#: bzrlib/builtins.py:2027
1096
msgid "Created a {0} (format: {1})\n"
1097
msgstr ""
1098
1099
#: bzrlib/builtins.py:2036
1100
#, python-format
1101
msgid "Using shared repository: %s\n"
1102
msgstr ""
1103
1104
#: bzrlib/builtins.py:2040
1105
msgid "Create a shared repository for branches to share storage space."
1106
msgstr ""
1107
1108
#: bzrlib/builtins.py:2042
1109
msgid ""
1110
"New branches created under the repository directory will store their\n"
1111
"revisions in the repository, not in the branch directory. For branches\n"
1112
"with shared history, this reduces the amount of storage needed and \n"
1113
"speeds up the creation of new branches."
1114
msgstr ""
1115
1116
#: bzrlib/builtins.py:2047
1117
msgid ""
1118
"If the --no-trees option is given then the branches in the repository\n"
1119
"will not have working trees by default. They will still exist as \n"
1120
"directories on disk, but they will not have separate copies of the \n"
1121
"files at a certain revision. This can be useful for repositories that\n"
1122
"store branches which are interacted with through checkouts or remote\n"
1123
"branches, such as on a server."
1124
msgstr ""
1125
1126
#: bzrlib/builtins.py:2054
1127
msgid ""
1128
":Examples:\n"
1129
" Create a shared repository holding just branches::"
1130
msgstr ""
1131
1132
#: bzrlib/builtins.py:2057
1133
msgid ""
1134
" bzr init-repo --no-trees repo\n"
1135
" bzr init repo/trunk"
1136
msgstr ""
1137
1138
#: bzrlib/builtins.py:2060
1139
msgid " Make a lightweight checkout elsewhere::"
1140
msgstr ""
1141
1142
#: bzrlib/builtins.py:2062
1143
msgid ""
1144
" bzr checkout --lightweight repo/trunk trunk-checkout\n"
1145
" cd trunk-checkout\n"
1146
" (add files here)"
1147
msgstr ""
1148
1149
#: bzrlib/builtins.py:2070
1150
msgid ""
1151
"Specify a format for this repository. See \"bzr help formats\" for details."
1152
msgstr ""
1153
1154
#: bzrlib/builtins.py:2074
1155
msgid "Repository format"
1156
msgstr ""
1157
1158
#: bzrlib/builtins.py:2076
1159
msgid "Branches in the repository will default to not having a working tree."
1160
msgstr ""
1161
1162
#: bzrlib/builtins.py:2102
1163
msgid "Show differences in the working tree, between revisions or branches."
1164
msgstr ""
1165
1166
#: bzrlib/builtins.py:2104
1167
msgid ""
1168
"If no arguments are given, all changes for the current tree are listed.\n"
1169
"If files are given, only the changes in those files are listed.\n"
1170
"Remote and multiple branches can be compared by using the --old and\n"
1171
"--new options. If not provided, the default for both is derived from\n"
1172
"the first argument, if any, or the current tree if no arguments are\n"
1173
"given."
1174
msgstr ""
1175
1176
#: bzrlib/builtins.py:2111
1177
msgid ""
1178
"\"bzr diff -p1\" is equivalent to \"bzr diff --prefix old/:new/\", and\n"
1179
"produces patches suitable for \"patch -p1\"."
1180
msgstr ""
1181
1182
#: bzrlib/builtins.py:2114
1183
msgid ""
1184
"Note that when using the -r argument with a range of revisions, the\n"
1185
"differences are computed between the two specified revisions. That\n"
1186
"is, the command does not show the changes introduced by the first \n"
1187
"revision in the range. This differs from the interpretation of \n"
1188
"revision ranges used by \"bzr log\" which includes the first revision\n"
1189
"in the range."
1190
msgstr ""
1191
1192
#: bzrlib/builtins.py:2121
1193
msgid ""
1194
":Exit values:\n"
1195
" 1 - changed\n"
1196
" 2 - unrepresentable changes\n"
1197
" 3 - error\n"
1198
" 0 - no change"
1199
msgstr ""
1200
1201
#: bzrlib/builtins.py:2127
1202
msgid ""
1203
":Examples:\n"
1204
" Shows the difference in the working tree versus the last commit::"
1205
msgstr ""
1206
1207
#: bzrlib/builtins.py:2130
1208
msgid " bzr diff"
1209
msgstr ""
1210
1211
#: bzrlib/builtins.py:2132
1212
msgid " Difference between the working tree and revision 1::"
1213
msgstr ""
1214
1215
#: bzrlib/builtins.py:2134
1216
msgid " bzr diff -r1"
1217
msgstr ""
1218
1219
#: bzrlib/builtins.py:2136
1220
msgid " Difference between revision 3 and revision 1::"
1221
msgstr ""
1222
1223
#: bzrlib/builtins.py:2138
1224
msgid " bzr diff -r1..3"
1225
msgstr ""
1226
1227
#: bzrlib/builtins.py:2140
1228
msgid " Difference between revision 3 and revision 1 for branch xxx::"
1229
msgstr ""
1230
1231
#: bzrlib/builtins.py:2142
1232
msgid " bzr diff -r1..3 xxx"
1233
msgstr ""
1234
1235
#: bzrlib/builtins.py:2144
1236
msgid " The changes introduced by revision 2 (equivalent to -r1..2)::"
1237
msgstr ""
1238
1239
#: bzrlib/builtins.py:2146
1240
msgid " bzr diff -c2"
1241
msgstr ""
1242
1243
#: bzrlib/builtins.py:2148
1244
msgid ""
1245
" To see the changes introduced by revision X::\n"
1246
" \n"
1247
" bzr diff -cX"
1248
msgstr ""
1249
1250
#: bzrlib/builtins.py:2152
1251
msgid ""
1252
" Note that in the case of a merge, the -c option shows the changes\n"
1253
" compared to the left hand parent. To see the changes against\n"
1254
" another parent, use::"
1255
msgstr ""
1256
1257
#: bzrlib/builtins.py:2156
1258
msgid " bzr diff -r<chosen_parent>..X"
1259
msgstr ""
1260
1261
#: bzrlib/builtins.py:2158
1262
msgid ""
1263
" The changes between the current revision and the previous revision\n"
1264
" (equivalent to -c-1 and -r-2..-1)"
1265
msgstr ""
1266
1267
#: bzrlib/builtins.py:2161
1268
msgid " bzr diff -r-2.."
1269
msgstr ""
1270
1271
#: bzrlib/builtins.py:2163
1272
msgid " Show just the differences for file NEWS::"
1273
msgstr ""
1274
1275
#: bzrlib/builtins.py:2165
1276
msgid " bzr diff NEWS"
1277
msgstr ""
1278
1279
#: bzrlib/builtins.py:2167
1280
msgid " Show the differences in working tree xxx for file NEWS::"
1281
msgstr ""
1282
1283
#: bzrlib/builtins.py:2169
1284
msgid " bzr diff xxx/NEWS"
1285
msgstr ""
1286
1287
#: bzrlib/builtins.py:2171
1288
msgid " Show the differences from branch xxx to this working tree:"
1289
msgstr ""
1290
1291
#: bzrlib/builtins.py:2173
1292
msgid " bzr diff --old xxx"
1293
msgstr ""
1294
1295
#: bzrlib/builtins.py:2175
1296
msgid " Show the differences between two branches for file NEWS::"
1297
msgstr ""
1298
1299
#: bzrlib/builtins.py:2177
1300
msgid " bzr diff --old xxx --new yyy NEWS"
1301
msgstr ""
1302
1303
#: bzrlib/builtins.py:2179
1304
msgid " Same as 'bzr diff' but prefix paths with old/ and new/::"
1305
msgstr ""
1306
1307
#: bzrlib/builtins.py:2181
1308
msgid ""
1309
" bzr diff --prefix old/:new/\n"
1310
" \n"
1311
" Show the differences using a custom diff program with options::\n"
1312
" \n"
1313
" bzr diff --using /usr/bin/diff --diff-options -wu"
1314
msgstr ""
1315
1316
#: bzrlib/builtins.py:2191
1317
msgid "Pass these options to the external diff program."
1318
msgstr ""
1319
1320
#: bzrlib/builtins.py:2194
1321
msgid ""
1322
"Set prefixes added to old and new filenames, as two values separated by a "
1323
"colon. (eg \"old/:new/\")."
1324
msgstr ""
1325
1326
#: bzrlib/builtins.py:2197
1327
msgid "Branch/tree to compare from."
1328
msgstr ""
1329
1330
#: bzrlib/builtins.py:2201
1331
msgid "Branch/tree to compare to."
1332
msgstr ""
1333
1334
#: bzrlib/builtins.py:2207
1335
msgid "Use this command to compare files."
1336
msgstr ""
1337
1338
#: bzrlib/builtins.py:2212
1339
msgid "Diff format to use."
1340
msgstr ""
1341
1342
#: bzrlib/builtins.py:2214
1343
msgid "Diff format"
1344
msgstr ""
1345
1346
#: bzrlib/builtins.py:2236
1347
msgid "--prefix expects two values separated by a colon (eg \"old/:new/\")"
1348
msgstr ""
1349
1350
#: bzrlib/builtins.py:2240
1351
msgid "bzr diff --revision takes exactly one or two revision specifiers"
1352
msgstr ""
1353
1354
#: bzrlib/builtins.py:2245 bzrlib/builtins.py:2643 bzrlib/builtins.py:2656
1355
#: bzrlib/builtins.py:2664 bzrlib/builtins.py:4826
1356
msgid "{0} and {1} are mutually exclusive"
1357
msgstr ""
1358
1359
#: bzrlib/builtins.py:2265
1360
msgid ""
1361
"List files deleted in the working tree.\n"
1362
" "
1363
msgstr ""
1364
1365
#: bzrlib/builtins.py:2343
1366
msgid "Show the tree root directory."
1367
msgstr ""
1368
1369
#: bzrlib/builtins.py:2345
1370
msgid ""
1371
"The root is the nearest enclosing directory with a .bzr control\n"
1372
"directory."
1373
msgstr ""
1374
1375
#: bzrlib/builtins.py:2360
1376
msgid "The limit argument must be an integer."
1377
msgstr ""
1378
1379
#: bzrlib/builtins.py:2368
1380
msgid "The levels argument must be an integer."
1381
msgstr ""
1382
1383
#: bzrlib/builtins.py:2373
1384
msgid "Show historical log for a branch or subset of a branch."
1385
msgstr ""
1386
1387
#: bzrlib/builtins.py:2375
1388
msgid ""
1389
"log is bzr's default tool for exploring the history of a branch.\n"
1390
"The branch to use is taken from the first parameter. If no parameters\n"
1391
"are given, the branch containing the working directory is logged.\n"
1392
"Here are some simple examples::"
1393
msgstr ""
1394
1395
#: bzrlib/builtins.py:2380
1396
msgid ""
1397
" bzr log log the current branch\n"
1398
" bzr log foo.py log a file in its branch\n"
1399
" bzr log http://server/branch log a branch on a server"
1400
msgstr ""
1401
1402
#: bzrlib/builtins.py:2384
1403
msgid ""
1404
"The filtering, ordering and information shown for each revision can\n"
1405
"be controlled as explained below. By default, all revisions are\n"
1406
"shown sorted (topologically) so that newer revisions appear before\n"
1407
"older ones and descendants always appear before ancestors. If displayed,\n"
1408
"merged revisions are shown indented under the revision in which they\n"
1409
"were merged."
1410
msgstr ""
1411
1412
#: bzrlib/builtins.py:2391
1413
msgid ":Output control:"
1414
msgstr ""
1415
1416
#: bzrlib/builtins.py:2393
1417
msgid ""
1418
" The log format controls how information about each revision is\n"
1419
" displayed. The standard log formats are called ``long``, ``short``\n"
1420
" and ``line``. The default is long. See ``bzr help log-formats``\n"
1421
" for more details on log formats."
1422
msgstr ""
1423
1424
#: bzrlib/builtins.py:2398
1425
msgid ""
1426
" The following options can be used to control what information is\n"
1427
" displayed::"
1428
msgstr ""
1429
1430
#: bzrlib/builtins.py:2401
1431
msgid ""
1432
" -l N display a maximum of N revisions\n"
1433
" -n N display N levels of revisions (0 for all, 1 for collapsed)\n"
1434
" -v display a status summary (delta) for each revision\n"
1435
" -p display a diff (patch) for each revision\n"
1436
" --show-ids display revision-ids (and file-ids), not just revnos"
1437
msgstr ""
1438
1439
#: bzrlib/builtins.py:2407
1440
msgid ""
1441
" Note that the default number of levels to display is a function of the\n"
1442
" log format. If the -n option is not used, the standard log formats show\n"
1443
" just the top level (mainline)."
1444
msgstr ""
1445
1446
#: bzrlib/builtins.py:2411
1447
msgid ""
1448
" Status summaries are shown using status flags like A, M, etc. To see\n"
1449
" the changes explained using words like ``added`` and ``modified``\n"
1450
" instead, use the -vv option."
1451
msgstr ""
1452
1453
#: bzrlib/builtins.py:2415
1454
msgid ":Ordering control:"
1455
msgstr ""
1456
1457
#: bzrlib/builtins.py:2417
1458
msgid ""
1459
" To display revisions from oldest to newest, use the --forward option.\n"
1460
" In most cases, using this option will have little impact on the total\n"
1461
" time taken to produce a log, though --forward does not incrementally\n"
1462
" display revisions like --reverse does when it can."
1463
msgstr ""
1464
1465
#: bzrlib/builtins.py:2422
1466
msgid ":Revision filtering:"
1467
msgstr ""
1468
1469
#: bzrlib/builtins.py:2424
1470
msgid ""
1471
" The -r option can be used to specify what revision or range of revisions\n"
1472
" to filter against. The various forms are shown below::"
1473
msgstr ""
1474
1475
#: bzrlib/builtins.py:2427
1476
msgid ""
1477
" -rX display revision X\n"
1478
" -rX.. display revision X and later\n"
1479
" -r..Y display up to and including revision Y\n"
1480
" -rX..Y display from X to Y inclusive"
1481
msgstr ""
1482
1483
#: bzrlib/builtins.py:2432
1484
msgid ""
1485
" See ``bzr help revisionspec`` for details on how to specify X and Y.\n"
1486
" Some common examples are given below::"
1487
msgstr ""
1488
1489
#: bzrlib/builtins.py:2435
1490
msgid ""
1491
" -r-1 show just the tip\n"
1492
" -r-10.. show the last 10 mainline revisions\n"
1493
" -rsubmit:.. show what's new on this branch\n"
1494
" -rancestor:path.. show changes since the common ancestor of this\n"
1495
" branch and the one at location path\n"
1496
" -rdate:yesterday.. show changes since yesterday"
1497
msgstr ""
1498
1499
#: bzrlib/builtins.py:2442
1500
msgid ""
1501
" When logging a range of revisions using -rX..Y, log starts at\n"
1502
" revision Y and searches back in history through the primary\n"
1503
" (\"left-hand\") parents until it finds X. When logging just the\n"
1504
" top level (using -n1), an error is reported if X is not found\n"
1505
" along the way. If multi-level logging is used (-n0), X may be\n"
1506
" a nested merge revision and the log will be truncated accordingly."
1507
msgstr ""
1508
1509
#: bzrlib/builtins.py:2449
1510
msgid ":Path filtering:"
1511
msgstr ""
1512
1513
#: bzrlib/builtins.py:2451
1514
msgid ""
1515
" If parameters are given and the first one is not a branch, the log\n"
1516
" will be filtered to show only those revisions that changed the\n"
1517
" nominated files or directories."
1518
msgstr ""
1519
1520
#: bzrlib/builtins.py:2455
1521
msgid ""
1522
" Filenames are interpreted within their historical context. To log a\n"
1523
" deleted file, specify a revision range so that the file existed at\n"
1524
" the end or start of the range."
1525
msgstr ""
1526
1527
#: bzrlib/builtins.py:2459
1528
msgid ""
1529
" Historical context is also important when interpreting pathnames of\n"
1530
" renamed files/directories. Consider the following example:"
1531
msgstr ""
1532
1533
#: bzrlib/builtins.py:2462
1534
msgid ""
1535
" * revision 1: add tutorial.txt\n"
1536
" * revision 2: modify tutorial.txt\n"
1537
" * revision 3: rename tutorial.txt to guide.txt; add tutorial.txt"
1538
msgstr ""
1539
1540
#: bzrlib/builtins.py:2466
1541
msgid " In this case:"
1542
msgstr ""
1543
1544
#: bzrlib/builtins.py:2468
1545
msgid " * ``bzr log guide.txt`` will log the file added in revision 1"
1546
msgstr ""
1547
1548
#: bzrlib/builtins.py:2470
1549
msgid ""
1550
" * ``bzr log tutorial.txt`` will log the new file added in revision 3"
1551
msgstr ""
1552
1553
#: bzrlib/builtins.py:2472
1554
msgid ""
1555
" * ``bzr log -r2 -p tutorial.txt`` will show the changes made to\n"
1556
" the original file in revision 2."
1557
msgstr ""
1558
1559
#: bzrlib/builtins.py:2475
1560
msgid ""
1561
" * ``bzr log -r2 -p guide.txt`` will display an error message as there\n"
1562
" was no file called guide.txt in revision 2."
1563
msgstr ""
1564
1565
#: bzrlib/builtins.py:2478
1566
msgid ""
1567
" Renames are always followed by log. By design, there is no need to\n"
1568
" explicitly ask for this (and no way to stop logging a file back\n"
1569
" until it was last renamed)."
1570
msgstr ""
1571
1572
#: bzrlib/builtins.py:2482
1573
msgid ":Other filtering:"
1574
msgstr ""
1575
1576
#: bzrlib/builtins.py:2484
1577
msgid ""
1578
" The --match option can be used for finding revisions that match a\n"
1579
" regular expression in a commit message, committer, author or bug.\n"
1580
" Specifying the option several times will match any of the supplied\n"
1581
" expressions. --match-author, --match-bugs, --match-committer and\n"
1582
" --match-message can be used to only match a specific field."
1583
msgstr ""
1584
1585
#: bzrlib/builtins.py:2490
1586
msgid ":Tips & tricks:"
1587
msgstr ""
1588
1589
#: bzrlib/builtins.py:2492
1590
msgid ""
1591
" GUI tools and IDEs are often better at exploring history than command\n"
1592
" line tools: you may prefer qlog or viz from qbzr or bzr-gtk, the\n"
1593
" bzr-explorer shell, or the Loggerhead web interface. See the Plugin\n"
1594
" Guide <http://doc.bazaar.canonical.com/plugins/en/> and\n"
1595
" <http://wiki.bazaar.canonical.com/IDEIntegration>. "
1596
msgstr ""
1597
1598
#: bzrlib/builtins.py:2498
1599
msgid ""
1600
" You may find it useful to add the aliases below to ``bazaar.conf``::"
1601
msgstr ""
1602
1603
#: bzrlib/builtins.py:2500
1604
msgid ""
1605
" [ALIASES]\n"
1606
" tip = log -r-1\n"
1607
" top = log -l10 --line\n"
1608
" show = log -v -p"
1609
msgstr ""
1610
1611
#: bzrlib/builtins.py:2505
1612
msgid ""
1613
" ``bzr tip`` will then show the latest revision while ``bzr top``\n"
1614
" will show the last 10 mainline revisions. To see the details of a\n"
1615
" particular revision X, ``bzr show -rX``."
1616
msgstr ""
1617
1618
#: bzrlib/builtins.py:2509
1619
msgid ""
1620
" If you are interested in looking deeper into a particular merge X,\n"
1621
" use ``bzr log -n0 -rX``."
1622
msgstr ""
1623
1624
#: bzrlib/builtins.py:2512
1625
msgid ""
1626
" ``bzr log -v`` on a branch with lots of history is currently\n"
1627
" very slow. A fix for this issue is currently under development.\n"
1628
" With or without that fix, it is recommended that a revision range\n"
1629
" be given when using the -v option."
1630
msgstr ""
1631
1632
#: bzrlib/builtins.py:2517
1633
msgid ""
1634
" bzr has a generic full-text matching plugin, bzr-search, that can be\n"
1635
" used to find revisions matching user names, commit messages, etc.\n"
1636
" Among other features, this plugin can find all revisions containing\n"
1637
" a list of words but not others."
1638
msgstr ""
1639
1640
#: bzrlib/builtins.py:2522
1641
msgid ""
1642
" When exploring non-mainline history on large projects with deep\n"
1643
" history, the performance of log can be greatly improved by installing\n"
1644
" the historycache plugin. This plugin buffers historical information\n"
1645
" trading disk space for faster speed."
1646
msgstr ""
1647
1648
#: bzrlib/builtins.py:2531
1649
msgid "Show from oldest to newest."
1650
msgstr ""
1651
1652
#: bzrlib/builtins.py:2534
1653
msgid "Show files changed in each revision."
1654
msgstr ""
1655
1656
#: bzrlib/builtins.py:2540
1657
msgid "Show just the specified revision. See also \"help revisionspec\"."
1658
msgstr ""
1659
1660
#: bzrlib/builtins.py:2544
1661
msgid "What names to list as authors - first, all or committer."
1662
msgstr ""
1663
1664
#: bzrlib/builtins.py:2545
1665
msgid "Authors"
1666
msgstr ""
1667
1668
#: bzrlib/builtins.py:2550
1669
msgid "Number of levels to display - 0 for all, 1 for flat."
1670
msgstr ""
1671
1672
#: bzrlib/builtins.py:2560
1673
msgid "Limit the output to the first N revisions."
1674
msgstr ""
1675
1676
#: bzrlib/builtins.py:2565
1677
msgid "Show changes made in each revision as a patch."
1678
msgstr ""
1679
1680
#: bzrlib/builtins.py:2567
1681
msgid "Show merged revisions like --levels 0 does."
1682
msgstr ""
1683
1684
#: bzrlib/builtins.py:2571
1685
msgid "Do not report commits with more than one parent."
1686
msgstr ""
1687
1688
#: bzrlib/builtins.py:2573
1689
msgid ""
1690
"Display only the revisions that are not part of both ancestries (require -"
1691
"rX..Y)."
1692
msgstr ""
1693
1694
#: bzrlib/builtins.py:2577
1695
msgid "Show digital signature validity."
1696
msgstr ""
1697
1698
#: bzrlib/builtins.py:2580
1699
msgid "Show revisions whose properties match this expression."
1700
msgstr ""
1701
1702
#: bzrlib/builtins.py:2584
1703
msgid "Show revisions whose message matches this expression."
1704
msgstr ""
1705
1706
#: bzrlib/builtins.py:2588
1707
msgid "Show revisions whose committer matches this expression."
1708
msgstr ""
1709
1710
#: bzrlib/builtins.py:2592
1711
msgid "Show revisions whose authors match this expression."
1712
msgstr ""
1713
1714
#: bzrlib/builtins.py:2596
1715
msgid "Show revisions whose bugs match this expression."
1716
msgstr ""
1717
1718
#: bzrlib/builtins.py:2650
1719
msgid "--exclude-common-ancestry requires -r with two revisions"
1720
msgstr ""
1721
1722
#: bzrlib/builtins.py:2678
1723
#, python-format
1724
msgid "Path unknown at end or start of revision range: %s"
1725
msgstr ""
1726
1727
#: bzrlib/builtins.py:2795
1728
#, python-format
1729
msgid "bzr %s doesn't accept two revisions in different branches."
1730
msgstr ""
1731
1732
#: bzrlib/builtins.py:2811
1733
#, python-format
1734
msgid "bzr %s --revision takes one or two values."
1735
msgstr ""
1736
1737
#: bzrlib/builtins.py:2856
1738
msgid ""
1739
"List files in a tree.\n"
1740
" "
1741
msgstr ""
1742
1743
#: bzrlib/builtins.py:2865
1744
msgid "Recurse into subdirectories."
1745
msgstr ""
1746
1747
#: bzrlib/builtins.py:2867
1748
msgid "Print paths relative to the root of the branch."
1749
msgstr ""
1750
1751
#: bzrlib/builtins.py:2869
1752
msgid "Print unknown files."
1753
msgstr ""
1754
1755
#: bzrlib/builtins.py:2870
1756
msgid "Print versioned files."
1757
msgstr ""
1758
1759
#: bzrlib/builtins.py:2873
1760
msgid "Print ignored files."
1761
msgstr ""
1762
1763
#: bzrlib/builtins.py:2875
1764
msgid "List entries of a particular kind: file, directory, symlink."
1765
msgstr ""
1766
1767
#: bzrlib/builtins.py:2888
1768
msgid "invalid kind specified"
1769
msgstr ""
1770
1771
#: bzrlib/builtins.py:2891
1772
msgid "Cannot set both --verbose and --null"
1773
msgstr ""
1774
1775
#: bzrlib/builtins.py:2900
1776
msgid "cannot specify both --from-root and PATH"
1777
msgstr ""
1778
1779
#: bzrlib/builtins.py:2987
1780
msgid "Ignore specified files or patterns."
1781
msgstr ""
1782
1783
#: bzrlib/builtins.py:2989
1784
msgid "See ``bzr help patterns`` for details on the syntax of patterns."
1785
msgstr ""
1786
1787
#: bzrlib/builtins.py:2991
1788
msgid ""
1789
"If a .bzrignore file does not exist, the ignore command\n"
1790
"will create one and add the specified files or patterns to the newly\n"
1791
"created file. The ignore command will also automatically add the \n"
1792
".bzrignore file to be versioned. Creating a .bzrignore file without\n"
1793
"the use of the ignore command will require an explicit add command."
1794
msgstr ""
1795
1796
#: bzrlib/builtins.py:2997
1797
msgid ""
1798
"To remove patterns from the ignore list, edit the .bzrignore file.\n"
1799
"After adding, editing or deleting that file either indirectly by\n"
1800
"using this command or directly by using an editor, be sure to commit\n"
1801
"it."
1802
msgstr ""
1803
1804
#: bzrlib/builtins.py:3002
1805
msgid ""
1806
"Bazaar also supports a global ignore file ~/.bazaar/ignore. On Windows\n"
1807
"the global ignore file can be found in the application data directory as\n"
1808
"C:\\Documents and Settings\\<user>\\Application Data\\Bazaar\\2.0\\ignore.\n"
1809
"Global ignores are not touched by this command. The global ignore file\n"
1810
"can be edited directly using an editor."
1811
msgstr ""
1812
1813
#: bzrlib/builtins.py:3008
1814
msgid ""
1815
"Patterns prefixed with '!' are exceptions to ignore patterns and take\n"
1816
"precedence over regular ignores. Such exceptions are used to specify\n"
1817
"files that should be versioned which would otherwise be ignored."
1818
msgstr ""
1819
1820
#: bzrlib/builtins.py:3012
1821
msgid ""
1822
"Patterns prefixed with '!!' act as regular ignore patterns, but have\n"
1823
"precedence over the '!' exception patterns."
1824
msgstr ""
1825
1826
#: bzrlib/builtins.py:3015
1827
msgid ""
1828
":Notes: \n"
1829
" \n"
1830
"* Ignore patterns containing shell wildcards must be quoted from\n"
1831
" the shell on Unix."
1832
msgstr ""
1833
1834
#: bzrlib/builtins.py:3020
1835
msgid ""
1836
"* Ignore patterns starting with \"#\" act as comments in the ignore file.\n"
1837
" To ignore patterns that begin with that character, use the \"RE:\" prefix."
1838
msgstr ""
1839
1840
#: bzrlib/builtins.py:3023
1841
msgid ""
1842
":Examples:\n"
1843
" Ignore the top level Makefile::"
1844
msgstr ""
1845
1846
#: bzrlib/builtins.py:3026
1847
msgid " bzr ignore ./Makefile"
1848
msgstr ""
1849
1850
#: bzrlib/builtins.py:3028
1851
msgid " Ignore .class files in all directories...::"
1852
msgstr ""
1853
1854
#: bzrlib/builtins.py:3030
1855
msgid " bzr ignore \"*.class\""
1856
msgstr ""
1857
1858
#: bzrlib/builtins.py:3032
1859
msgid " ...but do not ignore \"special.class\"::"
1860
msgstr ""
1861
1862
#: bzrlib/builtins.py:3034
1863
msgid " bzr ignore \"!special.class\""
1864
msgstr ""
1865
1866
#: bzrlib/builtins.py:3036
1867
msgid " Ignore files whose name begins with the \"#\" character::"
1868
msgstr ""
1869
1870
#: bzrlib/builtins.py:3038
1871
msgid " bzr ignore \"RE:^#\""
1872
msgstr ""
1873
1874
#: bzrlib/builtins.py:3040 bzrlib/builtins.py:3044
1875
msgid " Ignore .o files under the lib directory::"
1876
msgstr ""
1877
1878
#: bzrlib/builtins.py:3042
1879
msgid " bzr ignore \"lib/**/*.o\""
1880
msgstr ""
1881
1882
#: bzrlib/builtins.py:3046
1883
msgid " bzr ignore \"RE:lib/.*\\.o\""
1884
msgstr ""
1885
1886
#: bzrlib/builtins.py:3048
1887
msgid " Ignore everything but the \"debian\" toplevel directory::"
1888
msgstr ""
1889
1890
#: bzrlib/builtins.py:3050
1891
msgid ""
1892
" bzr ignore \"RE:(?!debian/).*\"\n"
1893
" \n"
1894
" Ignore everything except the \"local\" toplevel directory,\n"
1895
" but always ignore autosave files ending in ~, even under local/::\n"
1896
" \n"
1897
" bzr ignore \"*\"\n"
1898
" bzr ignore \"!./local\"\n"
1899
" bzr ignore \"!!*~\""
1900
msgstr ""
1901
1902
#: bzrlib/builtins.py:3064
1903
msgid "Display the default ignore rules that bzr uses."
1904
msgstr ""
1905
1906
#: bzrlib/builtins.py:3076
1907
msgid "ignore requires at least one NAME_PATTERN or --default-rules."
1908
msgstr ""
1909
1910
#: bzrlib/builtins.py:3087
1911
#, python-format
1912
msgid "Invalid ignore pattern found. %s"
1913
msgid_plural "Invalid ignore patterns found. %s"
1914
msgstr[0] ""
1915
msgstr[1] ""
1916
1917
#: bzrlib/builtins.py:3096
1918
msgid "NAME_PATTERN should not be an absolute path"
1919
msgstr ""
1920
1921
#: bzrlib/builtins.py:3109
1922
#, python-format
1923
msgid ""
1924
"Warning: the following files are version controlled and match your ignore "
1925
"pattern:\n"
1926
"%s\n"
1927
"These files will continue to be version controlled unless you 'bzr remove' "
1928
"them.\n"
1929
msgstr ""
1930
1931
#: bzrlib/builtins.py:3116
1932
msgid "List ignored files and the patterns that matched them."
1933
msgstr ""
1934
1935
#: bzrlib/builtins.py:3118
1936
msgid ""
1937
"List all the ignored files and the ignore pattern that caused the file to\n"
1938
"be ignored."
1939
msgstr ""
1940
1941
#: bzrlib/builtins.py:3121
1942
msgid "Alternatively, to list just the files::"
1943
msgstr ""
1944
1945
#: bzrlib/builtins.py:3123
1946
msgid " bzr ls --ignored"
1947
msgstr ""
1948
1949
#: bzrlib/builtins.py:3157
1950
#, python-format
1951
msgid "not a valid revision-number: %r"
1952
msgstr ""
1953
1954
#: bzrlib/builtins.py:3164
1955
msgid ""
1956
"Export current or past revision to a destination directory or archive."
1957
msgstr ""
1958
1959
#: bzrlib/builtins.py:3166
1960
msgid "If no revision is specified this exports the last committed revision."
1961
msgstr ""
1962
1963
#: bzrlib/builtins.py:3168
1964
msgid ""
1965
"Format may be an \"exporter\" name, such as tar, tgz, tbz2. If none is\n"
1966
"given, try to find the format with the extension. If no extension\n"
1967
"is found exports to a directory (equivalent to --format=dir)."
1968
msgstr ""
1969
1970
#: bzrlib/builtins.py:3172
1971
msgid ""
1972
"If root is supplied, it will be used as the root directory inside\n"
1973
"container formats (tar, zip, etc). If it is not supplied it will default\n"
1974
"to the exported filename. The root option has no effect for 'dir' format."
1975
msgstr ""
1976
1977
#: bzrlib/builtins.py:3176
1978
msgid ""
1979
"If branch is omitted then the branch containing the current working\n"
1980
"directory will be used."
1981
msgstr ""
1982
1983
#: bzrlib/builtins.py:3179
1984
msgid ""
1985
"Note: Export of tree with non-ASCII filenames to zip is not supported."
1986
msgstr ""
1987
1988
#: bzrlib/builtins.py:3181
1989
msgid ""
1990
" ================= =========================\n"
1991
" Supported formats Autodetected by extension\n"
1992
" ================= =========================\n"
1993
" dir (none)\n"
1994
" tar .tar\n"
1995
" tbz2 .tar.bz2, .tbz2\n"
1996
" tgz .tar.gz, .tgz\n"
1997
" zip .zip\n"
1998
" ================= ========================="
1999
msgstr ""
2000
2001
#: bzrlib/builtins.py:3195
2002
msgid "Type of file to export to."
2003
msgstr ""
2004
2005
#: bzrlib/builtins.py:3198
2006
msgid "Apply content filters to export the convenient form."
2007
msgstr ""
2008
2009
#: bzrlib/builtins.py:3202
2010
msgid "Name of the root directory inside the exported file."
2011
msgstr ""
2012
2013
#: bzrlib/builtins.py:3204
2014
msgid ""
2015
"Set modification time of files to that of the last revision in which it was "
2016
"changed."
2017
msgstr ""
2018
2019
#: bzrlib/builtins.py:3207
2020
msgid ""
2021
"Export the working tree contents rather than that of the last revision."
2022
msgstr ""
2023
2024
#: bzrlib/builtins.py:3226
2025
msgid "--uncommitted requires a working tree"
2026
msgstr ""
2027
2028
#: bzrlib/builtins.py:3235
2029
#, python-format
2030
msgid "Unsupported export format: %s"
2031
msgstr ""
2032
2033
#: bzrlib/builtins.py:3239
2034
msgid ""
2035
"Write the contents of a file as of a given revision to standard output."
2036
msgstr ""
2037
2038
#: bzrlib/builtins.py:3241
2039
msgid "If no revision is nominated, the last revision is used."
2040
msgstr ""
2041
2042
#: bzrlib/builtins.py:3243
2043
msgid ""
2044
"Note: Take care to redirect standard output when using this command on a\n"
2045
"binary file."
2046
msgstr ""
2047
2048
#: bzrlib/builtins.py:3249
2049
msgid "The path name in the old tree."
2050
msgstr ""
2051
2052
#: bzrlib/builtins.py:3250
2053
msgid "Apply content filters to display the convenience form."
2054
msgstr ""
2055
2056
#: bzrlib/builtins.py:3261
2057
msgid "bzr cat --revision takes exactly one revision specifier"
2058
msgstr ""
2059
2060
#: bzrlib/builtins.py:3286 bzrlib/builtins.py:3298
2061
msgid "{0!r} is not present in revision {1}"
2062
msgstr ""
2063
2064
#: bzrlib/builtins.py:3321
2065
msgid "Commit changes into a new revision."
2066
msgstr ""
2067
2068
#: bzrlib/builtins.py:3323
2069
msgid ""
2070
"An explanatory message needs to be given for each commit. This is\n"
2071
"often done by using the --message option (getting the message from the\n"
2072
"command line) or by using the --file option (getting the message from\n"
2073
"a file). If neither of these options is given, an editor is opened for\n"
2074
"the user to enter the message. To see the changed files in the\n"
2075
"boilerplate text loaded into the editor, use the --show-diff option."
2076
msgstr ""
2077
2078
#: bzrlib/builtins.py:3330
2079
msgid ""
2080
"By default, the entire tree is committed and the person doing the\n"
2081
"commit is assumed to be the author. These defaults can be overridden\n"
2082
"as explained below."
2083
msgstr ""
2084
2085
#: bzrlib/builtins.py:3334
2086
msgid ":Selective commits:"
2087
msgstr ""
2088
2089
#: bzrlib/builtins.py:3336
2090
msgid ""
2091
" If selected files are specified, only changes to those files are\n"
2092
" committed. If a directory is specified then the directory and\n"
2093
" everything within it is committed."
2094
msgstr ""
2095
2096
#: bzrlib/builtins.py:3340
2097
msgid ""
2098
" When excludes are given, they take precedence over selected files.\n"
2099
" For example, to commit only changes within foo, but not changes\n"
2100
" within foo/bar::"
2101
msgstr ""
2102
2103
#: bzrlib/builtins.py:3344
2104
msgid " bzr commit foo -x foo/bar"
2105
msgstr ""
2106
2107
#: bzrlib/builtins.py:3346
2108
msgid " A selective commit after a merge is not yet supported."
2109
msgstr ""
2110
2111
#: bzrlib/builtins.py:3348
2112
msgid ":Custom authors:"
2113
msgstr ""
2114
2115
#: bzrlib/builtins.py:3350
2116
msgid ""
2117
" If the author of the change is not the same person as the committer,\n"
2118
" you can specify the author's name using the --author option. The\n"
2119
" name should be in the same format as a committer-id, e.g.\n"
2120
" \"John Doe <jdoe@example.com>\". If there is more than one author of\n"
2121
" the change you can specify the option multiple times, once for each\n"
2122
" author."
2123
msgstr ""
2124
2125
#: bzrlib/builtins.py:3357
2126
msgid ":Checks:"
2127
msgstr ""
2128
2129
#: bzrlib/builtins.py:3359
2130
msgid ""
2131
" A common mistake is to forget to add a new file or directory before\n"
2132
" running the commit command. The --strict option checks for unknown\n"
2133
" files and aborts the commit if any are found. More advanced pre-commit\n"
2134
" checks can be implemented by defining hooks. See ``bzr help hooks``\n"
2135
" for details."
2136
msgstr ""
2137
2138
#: bzrlib/builtins.py:3365
2139
msgid ":Things to note:"
2140
msgstr ""
2141
2142
#: bzrlib/builtins.py:3367
2143
msgid ""
2144
" If you accidentially commit the wrong changes or make a spelling\n"
2145
" mistake in the commit message say, you can use the uncommit command\n"
2146
" to undo it. See ``bzr help uncommit`` for details."
2147
msgstr ""
2148
2149
#: bzrlib/builtins.py:3371
2150
msgid ""
2151
" Hooks can also be configured to run after a commit. This allows you\n"
2152
" to trigger updates to external systems like bug trackers. The --fixes\n"
2153
" option can be used to record the association between a revision and\n"
2154
" one or more bugs. See ``bzr help bugs`` for details."
2155
msgstr ""
2156
2157
#: bzrlib/builtins.py:3381
2158
msgid "Do not consider changes made to a given path."
2159
msgstr ""
2160
2161
#: bzrlib/builtins.py:3384
2162
msgid "Description of the new revision."
2163
msgstr ""
2164
2165
#: bzrlib/builtins.py:3387
2166
msgid "Commit even if nothing has changed."
2167
msgstr ""
2168
2169
#: bzrlib/builtins.py:3391
2170
msgid "Take commit message from this file."
2171
msgstr ""
2172
2173
#: bzrlib/builtins.py:3393
2174
msgid "Refuse to commit if there are unknown files in the working tree."
2175
msgstr ""
2176
2177
#: bzrlib/builtins.py:3396
2178
msgid ""
2179
"Manually set a commit time using commit date format, e.g. '2009-10-10 "
2180
"08:00:00 +0100'."
2181
msgstr ""
2182
2183
#: bzrlib/builtins.py:3399
2184
msgid "Mark a bug as being fixed by this revision (see \"bzr help bugs\")."
2185
msgstr ""
2186
2187
#: bzrlib/builtins.py:3402
2188
msgid "Set the author's name, if it's different from the committer."
2189
msgstr ""
2190
2191
#: bzrlib/builtins.py:3405
2192
msgid ""
2193
"Perform a local commit in a bound branch. Local commits are not pushed to "
2194
"the master branch until a normal commit is performed."
2195
msgstr ""
2196
2197
#: bzrlib/builtins.py:3411
2198
msgid ""
2199
"When no message is supplied, show the diff along with the status summary in "
2200
"the message editor."
2201
msgstr ""
2202
2203
#: bzrlib/builtins.py:3414
2204
msgid ""
2205
"When committing to a foreign version control system do not push data that "
2206
"can not be natively represented."
2207
msgstr ""
2208
2209
#: bzrlib/builtins.py:3432
2210
#, python-format
2211
msgid ""
2212
"No tracker specified for bug %s. Use the form 'tracker:id' or specify a "
2213
"default bug tracker using the `bugtracker` option.\n"
2214
"See \"bzr help bugs\" for more information on this feature. Commit refused."
2215
msgstr ""
2216
2217
#: bzrlib/builtins.py:3441
2218
#, python-format
2219
msgid ""
2220
"Invalid bug %s. Must be in the form of 'tracker:id'. See \"bzr help bugs\" "
2221
"for more information on this feature.\n"
2222
"Commit refused."
2223
msgstr ""
2224
2225
#: bzrlib/builtins.py:3450
2226
#, python-format
2227
msgid "Unrecognized bug %s. Commit refused."
2228
msgstr ""
2229
2230
#: bzrlib/builtins.py:3453
2231
#, python-format
2232
msgid ""
2233
"%s\n"
2234
"Commit refused."
2235
msgstr ""
2236
2237
#: bzrlib/builtins.py:3477
2238
msgid "Could not parse --commit-time: "
2239
msgstr ""
2240
2241
#: bzrlib/builtins.py:3517
2242
msgid "please specify either --message or --file"
2243
msgstr ""
2244
2245
#: bzrlib/builtins.py:3546
2246
msgid "please specify a commit message with either --message or --file"
2247
msgstr ""
2248
2249
#: bzrlib/builtins.py:3549
2250
msgid ""
2251
"Empty commit message specified. Please specify a commit message with either -"
2252
"-message or --file or leave a blank message with --message \"\"."
2253
msgstr ""
2254
2255
#: bzrlib/builtins.py:3569
2256
msgid ""
2257
"No changes to commit. Please 'bzr add' the files you want to commit, or use -"
2258
"-unchanged to force an empty commit."
2259
msgstr ""
2260
2261
#: bzrlib/builtins.py:3573
2262
msgid ""
2263
"Conflicts detected in working tree. Use \"bzr conflicts\" to list, \"bzr "
2264
"resolve FILE\" to resolve."
2265
msgstr ""
2266
2267
#: bzrlib/builtins.py:3577
2268
msgid "Commit refused because there are unknown files in the working tree."
2269
msgstr ""
2270
2271
#: bzrlib/builtins.py:3580
2272
msgid ""
2273
"\n"
2274
"To commit to master branch, run update and then commit.\n"
2275
"You can also pass --local to commit to continue working disconnected."
2276
msgstr ""
2277
2278
#: bzrlib/builtins.py:3588
2279
msgid ""
2280
"Validate working tree structure, branch consistency and repository history."
2281
msgstr ""
2282
2283
#: bzrlib/builtins.py:3590
2284
msgid ""
2285
"This command checks various invariants about branch and repository storage\n"
2286
"to detect data corruption or bzr bugs."
2287
msgstr ""
2288
2289
#: bzrlib/builtins.py:3593
2290
msgid ""
2291
"The working tree and branch checks will only give output if a problem is\n"
2292
"detected. The output fields of the repository check are:"
2293
msgstr ""
2294
2295
#: bzrlib/builtins.py:3596
2296
msgid ""
2297
"revisions\n"
2298
" This is just the number of revisions checked. It doesn't\n"
2299
" indicate a problem."
2300
msgstr ""
2301
2302
#: bzrlib/builtins.py:3600
2303
msgid ""
2304
"versionedfiles\n"
2305
" This is just the number of versionedfiles checked. It\n"
2306
" doesn't indicate a problem."
2307
msgstr ""
2308
2309
#: bzrlib/builtins.py:3604
2310
msgid ""
2311
"unreferenced ancestors\n"
2312
" Texts that are ancestors of other texts, but\n"
2313
" are not properly referenced by the revision ancestry. This is a\n"
2314
" subtle problem that Bazaar can work around."
2315
msgstr ""
2316
2317
#: bzrlib/builtins.py:3609
2318
msgid ""
2319
"unique file texts\n"
2320
" This is the total number of unique file contents\n"
2321
" seen in the checked revisions. It does not indicate a problem."
2322
msgstr ""
2323
2324
#: bzrlib/builtins.py:3613
2325
msgid ""
2326
"repeated file texts\n"
2327
" This is the total number of repeated texts seen\n"
2328
" in the checked revisions. Texts can be repeated when their file\n"
2329
" entries are modified, but the file contents are not. It does not\n"
2330
" indicate a problem."
2331
msgstr ""
2332
2333
#: bzrlib/builtins.py:3619
2334
msgid ""
2335
"If no restrictions are specified, all Bazaar data that is found at the "
2336
"given\n"
2337
"location will be checked."
2338
msgstr ""
2339
2340
#: bzrlib/builtins.py:3624
2341
msgid " Check the tree and branch at 'foo'::"
2342
msgstr ""
2343
2344
#: bzrlib/builtins.py:3626
2345
msgid " bzr check --tree --branch foo"
2346
msgstr ""
2347
2348
#: bzrlib/builtins.py:3628
2349
msgid " Check only the repository at 'bar'::"
2350
msgstr ""
2351
2352
#: bzrlib/builtins.py:3630
2353
msgid " bzr check --repo bar"
2354
msgstr ""
2355
2356
#: bzrlib/builtins.py:3632
2357
msgid " Check everything at 'baz'::"
2358
msgstr ""
2359
2360
#: bzrlib/builtins.py:3634
2361
msgid " bzr check baz"
2362
msgstr ""
2363
2364
#: bzrlib/builtins.py:3640
2365
msgid "Check the branch related to the current directory."
2366
msgstr ""
2367
2368
#: bzrlib/builtins.py:3642
2369
msgid "Check the repository related to the current directory."
2370
msgstr ""
2371
2372
#: bzrlib/builtins.py:3644
2373
msgid "Check the working tree related to the current directory."
2374
msgstr ""
2375
2376
#: bzrlib/builtins.py:3658
2377
msgid "Upgrade a repository, branch or working tree to a newer format."
2378
msgstr ""
2379
2380
#: bzrlib/builtins.py:3660
2381
msgid ""
2382
"When the default format has changed after a major new release of\n"
2383
"Bazaar, you may be informed during certain operations that you\n"
2384
"should upgrade. Upgrading to a newer format may improve performance\n"
2385
"or make new features available. It may however limit interoperability\n"
2386
"with older repositories or with older versions of Bazaar."
2387
msgstr ""
2388
2389
#: bzrlib/builtins.py:3666
2390
msgid ""
2391
"If you wish to upgrade to a particular format rather than the\n"
2392
"current default, that can be specified using the --format option.\n"
2393
"As a consequence, you can use the upgrade command this way to\n"
2394
"\"downgrade\" to an earlier format, though some conversions are\n"
2395
"a one way process (e.g. changing from the 1.x default to the\n"
2396
"2.x default) so downgrading is not always possible."
2397
msgstr ""
2398
2399
#: bzrlib/builtins.py:3673
2400
msgid ""
2401
"A backup.bzr.~#~ directory is created at the start of the conversion\n"
2402
"process (where # is a number). By default, this is left there on\n"
2403
"completion. If the conversion fails, delete the new .bzr directory\n"
2404
"and rename this one back in its place. Use the --clean option to ask\n"
2405
"for the backup.bzr directory to be removed on successful conversion.\n"
2406
"Alternatively, you can delete it by hand if everything looks good\n"
2407
"afterwards."
2408
msgstr ""
2409
2410
#: bzrlib/builtins.py:3681
2411
msgid ""
2412
"If the location given is a shared repository, dependent branches\n"
2413
"are also converted provided the repository converts successfully.\n"
2414
"If the conversion of a branch fails, remaining branches are still\n"
2415
"tried."
2416
msgstr ""
2417
2418
#: bzrlib/builtins.py:3686
2419
msgid ""
2420
"For more information on upgrades, see the Bazaar Upgrade Guide,\n"
2421
"http://doc.bazaar.canonical.com/latest/en/upgrade-guide/."
2422
msgstr ""
2423
2424
#: bzrlib/builtins.py:3694
2425
msgid "Upgrade to a specific format. See \"bzr help formats\" for details."
2426
msgstr ""
2427
2428
#: bzrlib/builtins.py:3698
2429
msgid "Branch format"
2430
msgstr ""
2431
2432
#: bzrlib/builtins.py:3700
2433
msgid "Remove the backup.bzr directory if successful."
2434
msgstr ""
2435
2436
#: bzrlib/builtins.py:3702
2437
msgid "Show what would be done, but don't actually do anything."
2438
msgstr ""
2439
2440
#: bzrlib/builtins.py:3717
2441
msgid "Show or set bzr user id."
2442
msgstr ""
2443
2444
#: bzrlib/builtins.py:3719
2445
msgid ""
2446
":Examples:\n"
2447
" Show the email of the current user::"
2448
msgstr ""
2449
2450
#: bzrlib/builtins.py:3722
2451
msgid " bzr whoami --email"
2452
msgstr ""
2453
2454
#: bzrlib/builtins.py:3724
2455
msgid " Set the current user::"
2456
msgstr ""
2457
2458
#: bzrlib/builtins.py:3726
2459
msgid " bzr whoami \"Frank Chu <fchu@example.com>\""
2460
msgstr ""
2461
2462
#: bzrlib/builtins.py:3730
2463
msgid "Display email address only."
2464
msgstr ""
2465
2466
#: bzrlib/builtins.py:3732
2467
msgid "Set identity for the current branch instead of globally."
2468
msgstr ""
2469
2470
#: bzrlib/builtins.py:3758
2471
msgid "--email can only be used to display existing identity"
2472
msgstr ""
2473
2474
#: bzrlib/builtins.py:3780
2475
msgid "Print or set the branch nickname."
2476
msgstr ""
2477
2478
#: bzrlib/builtins.py:3782
2479
msgid ""
2480
"If unset, the tree root directory name is used as the nickname.\n"
2481
"To print the current nickname, execute with no argument."
2482
msgstr ""
2483
2484
#: bzrlib/builtins.py:3785
2485
msgid ""
2486
"Bound branches use the nickname of its master branch unless it is set\n"
2487
"locally."
2488
msgstr ""
2489
2490
#: bzrlib/builtins.py:3805
2491
msgid "Set/unset and display aliases."
2492
msgstr ""
2493
2494
#: bzrlib/builtins.py:3807
2495
msgid ""
2496
":Examples:\n"
2497
" Show the current aliases::"
2498
msgstr ""
2499
2500
#: bzrlib/builtins.py:3810
2501
msgid " bzr alias"
2502
msgstr ""
2503
2504
#: bzrlib/builtins.py:3812
2505
msgid " Show the alias specified for 'll'::"
2506
msgstr ""
2507
2508
#: bzrlib/builtins.py:3814
2509
msgid " bzr alias ll"
2510
msgstr ""
2511
2512
#: bzrlib/builtins.py:3816
2513
msgid " Set an alias for 'll'::"
2514
msgstr ""
2515
2516
#: bzrlib/builtins.py:3818
2517
msgid " bzr alias ll=\"log --line -r-10..-1\""
2518
msgstr ""
2519
2520
#: bzrlib/builtins.py:3820
2521
msgid " To remove an alias for 'll'::"
2522
msgstr ""
2523
2524
#: bzrlib/builtins.py:3822
2525
msgid " bzr alias --remove ll"
2526
msgstr ""
2527
2528
#: bzrlib/builtins.py:3827
2529
msgid "Remove the alias."
2530
msgstr ""
2531
2532
#: bzrlib/builtins.py:3845
2533
msgid "bzr alias --remove expects an alias to remove."
2534
msgstr ""
2535
2536
#: bzrlib/builtins.py:4026
2537
msgid ""
2538
"subunit not available. subunit needs to be installed to use --subunit."
2539
msgstr ""
2540
2541
#: bzrlib/builtins.py:4043
2542
msgid ""
2543
"--benchmark is no longer supported from bzr 2.2; use bzr-usertest instead"
2544
msgstr ""
2545
2546
#: bzrlib/builtins.py:4090
2547
msgid "Show version of bzr."
2548
msgstr ""
2549
2550
#: bzrlib/builtins.py:4094
2551
msgid "Print just the version number."
2552
msgstr ""
2553
2554
#: bzrlib/builtins.py:4113
2555
msgid "It sure does!\n"
2556
msgstr ""
2557
2558
#: bzrlib/builtins.py:4137
2559
#, python-format
2560
msgid "merge base is revision %s\n"
2561
msgstr ""
2562
2563
#: bzrlib/builtins.py:4141
2564
msgid "Perform a three-way merge."
2565
msgstr ""
2566
2567
#: bzrlib/builtins.py:4143
2568
msgid ""
2569
"The source of the merge can be specified either in the form of a branch,\n"
2570
"or in the form of a path to a file containing a merge directive generated\n"
2571
"with bzr send. If neither is specified, the default is the upstream branch\n"
2572
"or the branch most recently merged using --remember. The source of the\n"
2573
"merge may also be specified in the form of a path to a file in another\n"
2574
"branch: in this case, only the modifications to that file are merged into\n"
2575
"the current working tree."
2576
msgstr ""
2577
2578
#: bzrlib/builtins.py:4151
2579
msgid ""
2580
"When merging from a branch, by default bzr will try to merge in all new\n"
2581
"work from the other branch, automatically determining an appropriate base\n"
2582
"revision. If this fails, you may need to give an explicit base."
2583
msgstr ""
2584
2585
#: bzrlib/builtins.py:4155
2586
msgid ""
2587
"To pick a different ending revision, pass \"--revision OTHER\". bzr will\n"
2588
"try to merge in all new work up to and including revision OTHER."
2589
msgstr ""
2590
2591
#: bzrlib/builtins.py:4158
2592
msgid ""
2593
"If you specify two values, \"--revision BASE..OTHER\", only revisions BASE\n"
2594
"through OTHER, excluding BASE but including OTHER, will be merged. If this\n"
2595
"causes some revisions to be skipped, i.e. if the destination branch does\n"
2596
"not already contain revision BASE, such a merge is commonly referred to as\n"
2597
"a \"cherrypick\". Unlike a normal merge, Bazaar does not currently track\n"
2598
"cherrypicks. The changes look like a normal commit, and the history of the\n"
2599
"changes from the other branch is not stored in the commit."
2600
msgstr ""
2601
2602
#: bzrlib/builtins.py:4166
2603
msgid "Revision numbers are always relative to the source branch."
2604
msgstr ""
2605
2606
#: bzrlib/builtins.py:4168 bzrlib/conflicts.py:52 bzrlib/conflicts.py:106
2607
msgid ""
2608
"Merge will do its best to combine the changes in two branches, but there\n"
2609
"are some kinds of problems only a human can fix. When it encounters those,\n"
2610
"it will mark a conflict. A conflict means that you need to fix something,\n"
2611
"before you should commit."
2612
msgstr ""
2613
2614
#: bzrlib/builtins.py:4173
2615
msgid ""
2616
"Use bzr resolve when you have fixed a problem. See also bzr conflicts."
2617
msgstr ""
2618
2619
#: bzrlib/builtins.py:4175
2620
msgid ""
2621
"If there is no default branch set, the first merge will set it (use\n"
2622
"--no-remember to avoid setting it). After that, you can omit the branch\n"
2623
"to use the default. To change the default, use --remember. The value will\n"
2624
"only be saved if the remote location can be accessed."
2625
msgstr ""
2626
2627
#: bzrlib/builtins.py:4180
2628
msgid ""
2629
"The results of the merge are placed into the destination working\n"
2630
"directory, where they can be reviewed (with bzr diff), tested, and then\n"
2631
"committed to record the result of the merge."
2632
msgstr ""
2633
2634
#: bzrlib/builtins.py:4184
2635
msgid ""
2636
"merge refuses to run if there are any uncommitted changes, unless\n"
2637
"--force is given. If --force is given, then the changes from the source \n"
2638
"will be merged with the current working tree, including any uncommitted\n"
2639
"changes in the tree. The --force option can also be used to create a\n"
2640
"merge revision which has more than two parents."
2641
msgstr ""
2642
2643
#: bzrlib/builtins.py:4190
2644
msgid ""
2645
"If one would like to merge changes from the working tree of the other\n"
2646
"branch without merging any committed revisions, the --uncommitted option\n"
2647
"can be given."
2648
msgstr ""
2649
2650
#: bzrlib/builtins.py:4194
2651
msgid ""
2652
"To select only some changes to merge, use \"merge -i\", which will prompt\n"
2653
"you to apply each diff hunk and file change, similar to \"shelve\"."
2654
msgstr ""
2655
2656
#: bzrlib/builtins.py:4197
2657
msgid ""
2658
":Examples:\n"
2659
" To merge all new revisions from bzr.dev::"
2660
msgstr ""
2661
2662
#: bzrlib/builtins.py:4200
2663
msgid " bzr merge ../bzr.dev"
2664
msgstr ""
2665
2666
#: bzrlib/builtins.py:4202
2667
msgid " To merge changes up to and including revision 82 from bzr.dev::"
2668
msgstr ""
2669
2670
#: bzrlib/builtins.py:4204
2671
msgid " bzr merge -r 82 ../bzr.dev"
2672
msgstr ""
2673
2674
#: bzrlib/builtins.py:4206
2675
msgid " To merge the changes introduced by 82, without previous changes::"
2676
msgstr ""
2677
2678
#: bzrlib/builtins.py:4208
2679
msgid " bzr merge -r 81..82 ../bzr.dev"
2680
msgstr ""
2681
2682
#: bzrlib/builtins.py:4210
2683
msgid " To apply a merge directive contained in /tmp/merge::"
2684
msgstr ""
2685
2686
#: bzrlib/builtins.py:4212
2687
msgid " bzr merge /tmp/merge"
2688
msgstr ""
2689
2690
#: bzrlib/builtins.py:4214
2691
msgid ""
2692
" To create a merge revision with three parents from two branches\n"
2693
" feature1a and feature1b:"
2694
msgstr ""
2695
2696
#: bzrlib/builtins.py:4217
2697
msgid ""
2698
" bzr merge ../feature1a\n"
2699
" bzr merge ../feature1b --force\n"
2700
" bzr commit -m 'revision with three parents'"
2701
msgstr ""
2702
2703
#: bzrlib/builtins.py:4229
2704
msgid "Merge even if the destination tree has uncommitted changes."
2705
msgstr ""
2706
2707
#: bzrlib/builtins.py:4235
2708
msgid ""
2709
"Apply uncommitted changes from a working copy, instead of branch changes."
2710
msgstr ""
2711
2712
#: bzrlib/builtins.py:4237
2713
msgid ""
2714
"If the destination is already completely merged into the source, pull from "
2715
"the source rather than merging. When this happens, you do not need to "
2716
"commit the result."
2717
msgstr ""
2718
2719
#: bzrlib/builtins.py:4242
2720
msgid ""
2721
"Branch to merge into, rather than the one containing the working directory."
2722
msgstr ""
2723
2724
#: bzrlib/builtins.py:4244
2725
msgid "Instead of merging, show a diff of the merge."
2726
msgstr ""
2727
2728
#: bzrlib/builtins.py:4246
2729
msgid "Select changes interactively."
2730
msgstr ""
2731
2732
#: bzrlib/builtins.py:4268
2733
msgid ""
2734
"Merging into empty branches not currently supported, "
2735
"https://bugs.launchpad.net/bzr/+bug/308562"
2736
msgstr ""
2737
2738
#: bzrlib/builtins.py:4295
2739
msgid "Cannot use --uncommitted with bundles or merge directives."
2740
msgstr ""
2741
2742
#: bzrlib/builtins.py:4306
2743
msgid "Cannot use --uncommitted and --revision at the same time."
2744
msgstr ""
2745
2746
#: bzrlib/builtins.py:4326
2747
msgid "merger: "
2748
msgstr ""
2749
2750
#: bzrlib/builtins.py:4328 bzrlib/bundle/apply_bundle.py:71
2751
msgid "Nothing to do."
2752
msgstr ""
2753
2754
#: bzrlib/builtins.py:4332
2755
msgid "Cannot pull individual files"
2756
msgstr ""
2757
2758
#: bzrlib/builtins.py:4340
2759
msgid "This branch has no commits. (perhaps you would prefer 'bzr pull')"
2760
msgstr ""
2761
2762
#: bzrlib/builtins.py:4398
2763
#, python-format
2764
msgid "Show-base is not supported for this merge type. %s"
2765
msgstr ""
2766
2767
#: bzrlib/builtins.py:4407
2768
#, python-format
2769
msgid "Conflict reduction is not supported for merge type %s."
2770
msgstr ""
2771
2772
#: bzrlib/builtins.py:4411
2773
msgid "Cannot do conflict reduction and show base."
2774
msgstr ""
2775
2776
#: bzrlib/builtins.py:4522
2777
msgid "No location specified or remembered"
2778
msgstr ""
2779
2780
#: bzrlib/builtins.py:4524
2781
msgid "{0} remembered {1} location {2}"
2782
msgstr ""
2783
2784
#: bzrlib/builtins.py:4530
2785
msgid "Redo a merge."
2786
msgstr ""
2787
2788
#: bzrlib/builtins.py:4532
2789
msgid ""
2790
"Use this if you want to try a different merge technique while resolving\n"
2791
"conflicts. Some merge techniques are better than others, and remerge\n"
2792
"lets you try different ones on different files."
2793
msgstr ""
2794
2795
#: bzrlib/builtins.py:4536
2796
msgid ""
2797
"The options for remerge have the same meaning and defaults as the ones for\n"
2798
"merge. The difference is that remerge can (only) be run when there is a\n"
2799
"pending merge, and it lets you specify particular files."
2800
msgstr ""
2801
2802
#: bzrlib/builtins.py:4540
2803
msgid ""
2804
":Examples:\n"
2805
" Re-do the merge of all conflicted files, and show the base text in\n"
2806
" conflict regions, in addition to the usual THIS and OTHER texts::"
2807
msgstr ""
2808
2809
#: bzrlib/builtins.py:4544
2810
msgid " bzr remerge --show-base"
2811
msgstr ""
2812
2813
#: bzrlib/builtins.py:4546
2814
msgid ""
2815
" Re-do the merge of \"foobar\", using the weave merge algorithm, with\n"
2816
" additional processing to reduce the size of conflict regions::"
2817
msgstr ""
2818
2819
#: bzrlib/builtins.py:4549
2820
msgid " bzr remerge --merge-type weave --reprocess foobar"
2821
msgstr ""
2822
2823
#: bzrlib/builtins.py:4556
2824
msgid "Show base revision text in conflicts."
2825
msgstr ""
2826
2827
#: bzrlib/builtins.py:4568
2828
msgid ""
2829
"Sorry, remerge only works after normal merges. Not cherrypicking or multi-"
2830
"merges."
2831
msgstr ""
2832
2833
#: bzrlib/builtins.py:4624
2834
msgid "Revert files to a previous revision."
2835
msgstr ""
2836
2837
#: bzrlib/builtins.py:4626
2838
msgid ""
2839
"Giving a list of files will revert only those files. Otherwise, all files\n"
2840
"will be reverted. If the revision is not specified with '--revision', the\n"
2841
"last committed revision is used."
2842
msgstr ""
2843
2844
#: bzrlib/builtins.py:4630
2845
msgid ""
2846
"To remove only some changes, without reverting to a prior version, use\n"
2847
"merge instead. For example, \"merge . -r -2..-3\" (don't forget the \".\")\n"
2848
"will remove the changes introduced by the second last commit (-2), without\n"
2849
"affecting the changes introduced by the last commit (-1). To remove\n"
2850
"certain changes on a hunk-by-hunk basis, see the shelve command."
2851
msgstr ""
2852
2853
#: bzrlib/builtins.py:4636
2854
msgid ""
2855
"By default, any files that have been manually changed will be backed up\n"
2856
"first. (Files changed only by merge are not backed up.) Backup files have\n"
2857
"'.~#~' appended to their name, where # is a number."
2858
msgstr ""
2859
2860
#: bzrlib/builtins.py:4640
2861
msgid ""
2862
"When you provide files, you can use their current pathname or the pathname\n"
2863
"from the target revision. So you can use revert to \"undelete\" a file by\n"
2864
"name. If you name a directory, all the contents of that directory will be\n"
2865
"reverted."
2866
msgstr ""
2867
2868
#: bzrlib/builtins.py:4645
2869
msgid ""
2870
"If you have newly added files since the target revision, they will be\n"
2871
"removed. If the files to be removed have been changed, backups will be\n"
2872
"created as above. Directories containing unknown files will not be\n"
2873
"deleted."
2874
msgstr ""
2875
2876
#: bzrlib/builtins.py:4650
2877
msgid ""
2878
"The working tree contains a list of revisions that have been merged but\n"
2879
"not yet committed. These revisions will be included as additional parents\n"
2880
"of the next commit. Normally, using revert clears that list as well as\n"
2881
"reverting the files. If any files are specified, revert leaves the list\n"
2882
"of uncommitted merges alone and reverts only the files. Use ``bzr revert\n"
2883
".`` in the tree root to revert all files but keep the recorded merges,\n"
2884
"and ``bzr revert --forget-merges`` to clear the pending merge list without\n"
2885
"reverting any files."
2886
msgstr ""
2887
2888
#: bzrlib/builtins.py:4659
2889
msgid ""
2890
"Using \"bzr revert --forget-merges\", it is possible to apply all of the\n"
2891
"changes from a branch in a single revision. To do this, perform the merge\n"
2892
"as desired. Then doing revert with the \"--forget-merges\" option will "
2893
"keep\n"
2894
"the content of the tree as it was, but it will clear the list of pending\n"
2895
"merges. The next commit will then contain all of the changes that are\n"
2896
"present in the other branch, but without any other parent revisions.\n"
2897
"Because this technique forgets where these changes originated, it may\n"
2898
"cause additional conflicts on later merges involving the same source and\n"
2899
"target branches."
2900
msgstr ""
2901
2902
#: bzrlib/builtins.py:4673
2903
msgid "Do not save backups of reverted files."
2904
msgstr ""
2905
2906
#: bzrlib/builtins.py:4675
2907
msgid "Remove pending merge marker, without changing any files."
2908
msgstr ""
2909
2910
#: bzrlib/builtins.py:4706
2911
msgid ""
2912
"Show help on a command or other topic.\n"
2913
" "
2914
msgstr ""
2915
2916
#: bzrlib/builtins.py:4711
2917
msgid "Show help on all commands."
2918
msgstr ""
2919
2920
#: bzrlib/builtins.py:4740
2921
msgid "Show unmerged/unpulled revisions between two branches."
2922
msgstr ""
2923
2924
#: bzrlib/builtins.py:4742
2925
msgid "OTHER_BRANCH may be local or remote."
2926
msgstr ""
2927
2928
#: bzrlib/builtins.py:4744
2929
msgid ""
2930
"To filter on a range of revisions, you can use the command -r begin..end\n"
2931
"-r revision requests a specific revision, -r ..end or -r begin.. are\n"
2932
"also valid.\n"
2933
" \n"
2934
":Exit values:\n"
2935
" 1 - some missing revisions\n"
2936
" 0 - no missing revisions"
2937
msgstr ""
2938
2939
#: bzrlib/builtins.py:4754
2940
msgid ""
2941
" Determine the missing revisions between this and the branch at the\n"
2942
" remembered pull location::"
2943
msgstr ""
2944
2945
#: bzrlib/builtins.py:4757
2946
msgid " bzr missing"
2947
msgstr ""
2948
2949
#: bzrlib/builtins.py:4759
2950
msgid " Determine the missing revisions between this and another branch::"
2951
msgstr ""
2952
2953
#: bzrlib/builtins.py:4761
2954
msgid " bzr missing http://server/branch"
2955
msgstr ""
2956
2957
#: bzrlib/builtins.py:4763
2958
msgid ""
2959
" Determine the missing revisions up to a specific revision on the other\n"
2960
" branch::"
2961
msgstr ""
2962
2963
#: bzrlib/builtins.py:4766
2964
msgid " bzr missing -r ..-10"
2965
msgstr ""
2966
2967
#: bzrlib/builtins.py:4768
2968
msgid ""
2969
" Determine the missing revisions up to a specific revision on this\n"
2970
" branch::"
2971
msgstr ""
2972
2973
#: bzrlib/builtins.py:4771
2974
msgid " bzr missing --my-revision ..-10"
2975
msgstr ""
2976
2977
#: bzrlib/builtins.py:4778
2978
msgid "Reverse the order of revisions."
2979
msgstr ""
2980
2981
#: bzrlib/builtins.py:4780
2982
msgid "Display changes in the local branch only."
2983
msgstr ""
2984
2985
#: bzrlib/builtins.py:4781
2986
msgid "Same as --mine-only."
2987
msgstr ""
2988
2989
#: bzrlib/builtins.py:4783
2990
msgid "Display changes in the remote branch only."
2991
msgstr ""
2992
2993
#: bzrlib/builtins.py:4784
2994
msgid "Same as --theirs-only."
2995
msgstr ""
2996
2997
#: bzrlib/builtins.py:4789
2998
msgid ""
2999
"Filter on other branch revisions (inclusive). See \"help revisionspec\" for "
3000
"details."
3001
msgstr ""
3002
3003
#: bzrlib/builtins.py:4793
3004
msgid ""
3005
"Filter on local branch revisions (inclusive). See \"help revisionspec\" for "
3006
"details."
3007
msgstr ""
3008
3009
#: bzrlib/builtins.py:4796
3010
msgid "Show all revisions in addition to the mainline ones."
3011
msgstr ""
3012
3013
#: bzrlib/builtins.py:4850
3014
msgid "No peer location known or specified."
3015
msgstr ""
3016
3017
#: bzrlib/builtins.py:4854
3018
msgid "Using saved parent location: {0}\n"
3019
msgstr ""
3020
3021
#: bzrlib/builtins.py:4887
3022
#, python-format
3023
msgid "You have %d extra revision:\n"
3024
msgid_plural "You have %d extra revisions:\n"
3025
msgstr[0] ""
3026
msgstr[1] ""
3027
3028
#: bzrlib/builtins.py:4903
3029
#, python-format
3030
msgid "You are missing %d revision:\n"
3031
msgid_plural "You are missing %d revisions:\n"
3032
msgstr[0] ""
3033
msgstr[1] ""
3034
3035
#: bzrlib/builtins.py:4915
3036
msgid "This branch has no new revisions.\n"
3037
msgstr ""
3038
3039
#: bzrlib/builtins.py:4918
3040
msgid "Other branch has no new revisions.\n"
3041
msgstr ""
3042
3043
#: bzrlib/builtins.py:4923
3044
msgid "Branches are up to date.\n"
3045
msgstr ""
3046
3047
#: bzrlib/builtins.py:4934
3048
msgid "Compress the data within a repository."
3049
msgstr ""
3050
3051
#: bzrlib/builtins.py:4936
3052
msgid ""
3053
"This operation compresses the data within a bazaar repository. As\n"
3054
"bazaar supports automatic packing of repository, this operation is\n"
3055
"normally not required to be done manually."
3056
msgstr ""
3057
3058
#: bzrlib/builtins.py:4940
3059
msgid ""
3060
"During the pack operation, bazaar takes a backup of existing repository\n"
3061
"data, i.e. pack files. This backup is eventually removed by bazaar\n"
3062
"automatically when it is safe to do so. To save disk space by removing\n"
3063
"the backed up pack files, the --clean-obsolete-packs option may be\n"
3064
"used."
3065
msgstr ""
3066
3067
#: bzrlib/builtins.py:4946
3068
msgid ""
3069
"Warning: If you use --clean-obsolete-packs and your machine crashes\n"
3070
"during or immediately after repacking, you may be left with a state\n"
3071
"where the deletion has been written to disk but the new packs have not\n"
3072
"been. In this case the repository may be unusable."
3073
msgstr ""
3074
3075
#: bzrlib/builtins.py:4955
3076
msgid "Delete obsolete packs to save disk space."
3077
msgstr ""
3078
3079
#: bzrlib/builtins.py:4969
3080
msgid "List the installed plugins."
3081
msgstr ""
3082
3083
#: bzrlib/builtins.py:4971
3084
msgid ""
3085
"This command displays the list of installed plugins including\n"
3086
"version of plugin and a short description of each."
3087
msgstr ""
3088
3089
#: bzrlib/builtins.py:4974
3090
msgid "--verbose shows the path where each plugin is located."
3091
msgstr ""
3092
3093
#: bzrlib/builtins.py:4976
3094
msgid ""
3095
"A plugin is an external component for Bazaar that extends the\n"
3096
"revision control system, by adding or replacing code in Bazaar.\n"
3097
"Plugins can do a variety of things, including overriding commands,\n"
3098
"adding new commands, providing additional network transports and\n"
3099
"customizing log output."
3100
msgstr ""
3101
3102
#: bzrlib/builtins.py:4982
3103
msgid ""
3104
"See the Bazaar Plugin Guide <http://doc.bazaar.canonical.com/plugins/en/>\n"
3105
"for further information on plugins including where to find them and how to\n"
3106
"install them. Instructions are also provided there on how to write new\n"
3107
"plugins using the Python programming language."
3108
msgstr ""
3109
3110
#: bzrlib/builtins.py:4998
3111
msgid "Show testament (signing-form) of a revision."
3112
msgstr ""
3113
3114
#: bzrlib/builtins.py:5001
3115
msgid "Produce long-format testament."
3116
msgstr ""
3117
3118
#: bzrlib/builtins.py:5003
3119
msgid "Produce a strict-format testament."
3120
msgstr ""
3121
3122
#: bzrlib/builtins.py:5029
3123
msgid "Show the origin of each line in a file."
3124
msgstr ""
3125
3126
#: bzrlib/builtins.py:5031
3127
msgid ""
3128
"This prints out the given file with an annotation on the left side\n"
3129
"indicating which revision, author and date introduced the change."
3130
msgstr ""
3131
3132
#: bzrlib/builtins.py:5034
3133
msgid ""
3134
"If the origin is the same for a run of consecutive lines, it is\n"
3135
"shown only at the top, unless the --all option is given."
3136
msgstr ""
3137
3138
#: bzrlib/builtins.py:5042
3139
msgid "Show annotations on all lines."
3140
msgstr ""
3141
3142
#: bzrlib/builtins.py:5043
3143
msgid "Show commit date in annotations."
3144
msgstr ""
3145
3146
#: bzrlib/builtins.py:5130
3147
msgid "Cannot sign a range of non-revision-history revisions"
3148
msgstr ""
3149
3150
#: bzrlib/builtins.py:5142
3151
msgid "Please supply either one revision, or a range."
3152
msgstr ""
3153
3154
#: bzrlib/builtins.py:5146
3155
msgid ""
3156
"Convert the current branch into a checkout of the supplied branch.\n"
3157
"If no branch is supplied, rebind to the last bound location."
3158
msgstr ""
3159
3160
#: bzrlib/builtins.py:5149
3161
msgid ""
3162
"Once converted into a checkout, commits must succeed on the master branch\n"
3163
"before they will be applied to the local branch."
3164
msgstr ""
3165
3166
#: bzrlib/builtins.py:5152
3167
msgid ""
3168
"Bound branches use the nickname of its master branch unless it is set\n"
3169
"locally, in which case binding will update the local nickname to be\n"
3170
"that of the master."
3171
msgstr ""
3172
3173
#: bzrlib/builtins.py:5167
3174
msgid "No location supplied. This format does not remember old locations."
3175
msgstr ""
3176
3177
#: bzrlib/builtins.py:5172
3178
msgid "Branch is already bound"
3179
msgstr ""
3180
3181
#: bzrlib/builtins.py:5174
3182
msgid "No location supplied and no previous location known"
3183
msgstr ""
3184
3185
#: bzrlib/builtins.py:5180
3186
msgid "These branches have diverged. Try merging, and then bind again."
3187
msgstr ""
3188
3189
#: bzrlib/builtins.py:5187
3190
msgid "Convert the current checkout into a regular branch."
3191
msgstr ""
3192
3193
#: bzrlib/builtins.py:5189
3194
msgid ""
3195
"After unbinding, the local branch is considered independent and subsequent\n"
3196
"commits will be local only."
3197
msgstr ""
3198
3199
#: bzrlib/builtins.py:5200
3200
msgid "Local branch is not bound"
3201
msgstr ""
3202
3203
#: bzrlib/builtins.py:5204
3204
msgid "Remove the last committed revision."
3205
msgstr ""
3206
3207
#: bzrlib/builtins.py:5206
3208
msgid ""
3209
"--verbose will print out what is being removed.\n"
3210
"--dry-run will go through all the motions, but not actually\n"
3211
"remove anything."
3212
msgstr ""
3213
3214
#: bzrlib/builtins.py:5210
3215
msgid ""
3216
"If --revision is specified, uncommit revisions to leave the branch at the\n"
3217
"specified revision. For example, \"bzr uncommit -r 15\" will leave the\n"
3218
"branch at revision 15."
3219
msgstr ""
3220
3221
#: bzrlib/builtins.py:5214
3222
msgid ""
3223
"Uncommit leaves the working tree ready for a new commit. The only change\n"
3224
"it may make is to restore any pending merges that were present before\n"
3225
"the commit."
3226
msgstr ""
3227
3228
#: bzrlib/builtins.py:5225
3229
msgid "Don't actually make changes."
3230
msgstr ""
3231
3232
#: bzrlib/builtins.py:5226
3233
msgid "Say yes to all questions."
3234
msgstr ""
3235
3236
#: bzrlib/builtins.py:5228
3237
msgid "Keep tags that point to removed revisions."
3238
msgstr ""
3239
3240
#: bzrlib/builtins.py:5230
3241
msgid "Only remove the commits from the local branch when in a checkout."
3242
msgstr ""
3243
3244
#: bzrlib/builtins.py:5279
3245
msgid "No revisions to uncommit.\n"
3246
msgstr ""
3247
3248
#: bzrlib/builtins.py:5294
3249
msgid "Dry-run, pretending to remove the above revisions.\n"
3250
msgstr ""
3251
3252
#: bzrlib/builtins.py:5297
3253
msgid "The above revision(s) will be removed.\n"
3254
msgstr ""
3255
3256
#: bzrlib/builtins.py:5301
3257
msgid "Uncommit these revisions"
3258
msgstr ""
3259
3260
#: bzrlib/builtins.py:5304
3261
msgid "Canceled\n"
3262
msgstr ""
3263
3264
#: bzrlib/builtins.py:5311
3265
#, python-format
3266
msgid ""
3267
"You can restore the old tip by running:\n"
3268
" bzr pull . -r revid:%s\n"
3269
msgstr ""
3270
3271
#: bzrlib/builtins.py:5316
3272
msgid "Break a dead lock."
3273
msgstr ""
3274
3275
#: bzrlib/builtins.py:5318
3276
msgid ""
3277
"This command breaks a lock on a repository, branch, working directory or\n"
3278
"config file."
3279
msgstr ""
3280
3281
#: bzrlib/builtins.py:5321
3282
msgid ""
3283
"CAUTION: Locks should only be broken when you are sure that the process\n"
3284
"holding the lock has been stopped."
3285
msgstr ""
3286
3287
#: bzrlib/builtins.py:5324
3288
msgid ""
3289
"You can get information on what locks are open via the 'bzr info\n"
3290
"[location]' command."
3291
msgstr ""
3292
3293
#: bzrlib/builtins.py:5327
3294
msgid ""
3295
":Examples:\n"
3296
" bzr break-lock\n"
3297
" bzr break-lock bzr+ssh://example.com/bzr/foo\n"
3298
" bzr break-lock --conf ~/.bazaar"
3299
msgstr ""
3300
3301
#: bzrlib/builtins.py:5336
3302
msgid "LOCATION is the directory where the config lock is."
3303
msgstr ""
3304
3305
#: bzrlib/builtins.py:5338
3306
msgid "Do not ask for confirmation before breaking the lock."
3307
msgstr ""
3308
3309
#: bzrlib/builtins.py:5373
3310
msgid "The Bazaar smart server protocol over TCP. (default port: 4155)"
3311
msgstr ""
3312
3313
#: bzrlib/builtins.py:5374
3314
msgid "Run the bzr server."
3315
msgstr ""
3316
3317
#: bzrlib/builtins.py:5380
3318
msgid "Serve on stdin/out for use from inetd or sshd."
3319
msgstr ""
3320
3321
#: bzrlib/builtins.py:5381
3322
msgid "protocol"
3323
msgstr ""
3324
3325
#: bzrlib/builtins.py:5382
3326
msgid "Protocol to serve."
3327
msgstr ""
3328
3329
#: bzrlib/builtins.py:5386
3330
msgid ""
3331
"Listen for connections on nominated port of the form [hostname:]portnumber. "
3332
"Passing 0 as the port number will result in a dynamically allocated port. "
3333
"The default port depends on the protocol."
3334
msgstr ""
3335
3336
#: bzrlib/builtins.py:5392
3337
msgid "Serve contents of this directory."
3338
msgstr ""
3339
3340
#: bzrlib/builtins.py:5394
3341
msgid ""
3342
"By default the server is a readonly server. Supplying --allow-writes "
3343
"enables write access to the contents of the served directory and below. "
3344
"Note that ``bzr serve`` does not perform authentication, so unless some form "
3345
"of external authentication is arranged supplying this option leads to global "
3346
"uncontrolled write access to your file system."
3347
msgstr ""
3348
3349
#: bzrlib/builtins.py:5403
3350
msgid "Override the default idle client timeout (5min)."
3351
msgstr ""
3352
3353
#: bzrlib/builtins.py:5453
3354
msgid "Combine a tree into its containing tree."
3355
msgstr ""
3356
3357
#: bzrlib/builtins.py:5455
3358
msgid "This command requires the target tree to be in a rich-root format."
3359
msgstr ""
3360
3361
#: bzrlib/builtins.py:5457
3362
msgid ""
3363
"The TREE argument should be an independent tree, inside another tree, but\n"
3364
"not part of it. (Such trees can be produced by \"bzr split\", but also by\n"
3365
"running \"bzr branch\" with the target inside a tree.)"
3366
msgstr ""
3367
3368
#: bzrlib/builtins.py:5461
3369
msgid ""
3370
"The result is a combined tree, with the subtree no longer an independent\n"
3371
"part. This is marked as a merge of the subtree into the containing tree,\n"
3372
"and all history is preserved."
3373
msgstr ""
3374
3375
#: bzrlib/builtins.py:5479
3376
#, python-format
3377
msgid ""
3378
"Can't join trees because %s doesn't support rich root data.\n"
3379
"You can use bzr upgrade on the repository."
3380
msgstr ""
3381
3382
#: bzrlib/builtins.py:5489 bzrlib/builtins.py:5495
3383
msgid "Cannot join {0}. {1}"
3384
msgstr ""
3385
3386
#: bzrlib/builtins.py:5499
3387
msgid "Split a subdirectory of a tree into a separate tree."
3388
msgstr ""
3389
3390
#: bzrlib/builtins.py:5501
3391
msgid ""
3392
"This command will produce a target tree in a format that supports\n"
3393
"rich roots, like 'rich-root' or 'rich-root-pack'. These formats cannot be\n"
3394
"converted into earlier formats like 'dirstate-tags'."
3395
msgstr ""
3396
3397
#: bzrlib/builtins.py:5505
3398
msgid ""
3399
"The TREE argument should be a subdirectory of a working tree. That\n"
3400
"subdirectory will be converted into an independent tree, with its own\n"
3401
"branch. Commits in the top-level tree will not apply to the new subtree."
3402
msgstr ""
3403
3404
#: bzrlib/builtins.py:5585
3405
msgid "No submit branch specified or known"
3406
msgstr ""
3407
3408
#: bzrlib/builtins.py:5593 bzrlib/send.py:108
3409
msgid "No public branch specified or known"
3410
msgstr ""
3411
3412
#: bzrlib/builtins.py:5598
3413
msgid "bzr merge-directive takes at most two one revision identifiers"
3414
msgstr ""
3415
3416
#: bzrlib/builtins.py:5607
3417
msgid "No revisions to bundle."
3418
msgstr ""
3419
3420
#: bzrlib/builtins.py:5626
3421
msgid "Mail or create a merge-directive for submitting changes."
3422
msgstr ""
3423
3424
#: bzrlib/builtins.py:5628
3425
msgid "A merge directive provides many things needed for requesting merges:"
3426
msgstr ""
3427
3428
#: bzrlib/builtins.py:5630
3429
msgid "* A machine-readable description of the merge to perform"
3430
msgstr ""
3431
3432
#: bzrlib/builtins.py:5632
3433
msgid "* An optional patch that is a preview of the changes requested"
3434
msgstr ""
3435
3436
#: bzrlib/builtins.py:5634
3437
msgid ""
3438
"* An optional bundle of revision data, so that the changes can be applied\n"
3439
" directly from the merge directive, without retrieving data from a\n"
3440
" branch."
3441
msgstr ""
3442
3443
#: bzrlib/builtins.py:5638
3444
msgid ""
3445
"`bzr send` creates a compact data set that, when applied using bzr\n"
3446
"merge, has the same effect as merging from the source branch. "
3447
msgstr ""
3448
3449
#: bzrlib/builtins.py:5641
3450
msgid ""
3451
"By default the merge directive is self-contained and can be applied to any\n"
3452
"branch containing submit_branch in its ancestory without needing access to\n"
3453
"the source branch."
3454
msgstr ""
3455
3456
#: bzrlib/builtins.py:5645
3457
msgid ""
3458
"If --no-bundle is specified, then Bazaar doesn't send the contents of the\n"
3459
"revisions, but only a structured request to merge from the\n"
3460
"public_location. In that case the public_branch is needed and it must be\n"
3461
"up-to-date and accessible to the recipient. The public_branch is always\n"
3462
"included if known, so that people can check it later."
3463
msgstr ""
3464
3465
#: bzrlib/builtins.py:5651
3466
msgid ""
3467
"The submit branch defaults to the parent of the source branch, but can be\n"
3468
"overridden. Both submit branch and public branch will be remembered in\n"
3469
"branch.conf the first time they are used for a particular branch. The\n"
3470
"source branch defaults to that containing the working directory, but can\n"
3471
"be changed using --from."
3472
msgstr ""
3473
3474
#: bzrlib/builtins.py:5657
3475
msgid ""
3476
"Both the submit branch and the public branch follow the usual behavior with\n"
3477
"respect to --remember: If there is no default location set, the first send\n"
3478
"will set it (use --no-remember to avoid setting it). After that, you can\n"
3479
"omit the location to use the default. To change the default, use\n"
3480
"--remember. The value will only be saved if the location can be accessed."
3481
msgstr ""
3482
3483
#: bzrlib/builtins.py:5663
3484
msgid ""
3485
"In order to calculate those changes, bzr must analyse the submit branch.\n"
3486
"Therefore it is most efficient for the submit branch to be a local mirror.\n"
3487
"If a public location is known for the submit_branch, that location is used\n"
3488
"in the merge directive."
3489
msgstr ""
3490
3491
#: bzrlib/builtins.py:5668
3492
msgid ""
3493
"The default behaviour is to send the merge directive by mail, unless -o is\n"
3494
"given, in which case it is sent to a file."
3495
msgstr ""
3496
3497
#: bzrlib/builtins.py:5671
3498
msgid ""
3499
"Mail is sent using your preferred mail program. This should be transparent\n"
3500
"on Windows (it uses MAPI). On Unix, it requires the xdg-email utility.\n"
3501
"If the preferred client can't be found (or used), your editor will be used."
3502
msgstr ""
3503
3504
#: bzrlib/builtins.py:5675
3505
msgid ""
3506
"To use a specific mail program, set the mail_client configuration option.\n"
3507
"(For Thunderbird 1.5, this works around some bugs.) Supported values for\n"
3508
"specific clients are \"claws\", \"evolution\", \"kmail\", \"mail.app\" "
3509
"(MacOS X's\n"
3510
"Mail.app), \"mutt\", and \"thunderbird\"; generic options are \"default\",\n"
3511
"\"editor\", \"emacsclient\", \"mapi\", and \"xdg-email\". Plugins may also "
3512
"add\n"
3513
"supported clients."
3514
msgstr ""
3515
3516
#: bzrlib/builtins.py:5682
3517
msgid ""
3518
"If mail is being sent, a to address is required. This can be supplied\n"
3519
"either on the commandline, by setting the submit_to configuration\n"
3520
"option in the branch itself or the child_submit_to configuration option\n"
3521
"in the submit branch."
3522
msgstr ""
3523
3524
#: bzrlib/builtins.py:5687
3525
msgid ""
3526
"Two formats are currently supported: \"4\" uses revision bundle format 4 "
3527
"and\n"
3528
"merge directive format 2. It is significantly faster and smaller than\n"
3529
"older formats. It is compatible with Bazaar 0.19 and later. It is the\n"
3530
"default. \"0.9\" uses revision bundle format 0.9 and merge directive\n"
3531
"format 1. It is compatible with Bazaar 0.12 - 0.18."
3532
msgstr ""
3533
3534
#: bzrlib/builtins.py:5693
3535
msgid ""
3536
"The merge directives created by bzr send may be applied using bzr merge or\n"
3537
"bzr pull by specifying a file containing a merge directive as the location."
3538
msgstr ""
3539
3540
#: bzrlib/builtins.py:5696
3541
msgid ""
3542
"bzr send makes extensive use of public locations to map local locations "
3543
"into\n"
3544
"URLs that can be used by other people. See `bzr help configuration` to\n"
3545
"set them, and use `bzr info` to display them."
3546
msgstr ""
3547
3548
#: bzrlib/builtins.py:5720
3549
msgid "Write merge directive to this file or directory; use - for stdout."
3550
msgstr ""
3551
3552
#: bzrlib/builtins.py:5724
3553
msgid ""
3554
"Refuse to send if there are uncommitted changes in the working tree, --no-"
3555
"strict disables the check."
3556
msgstr ""
3557
3558
#: bzrlib/builtins.py:5726
3559
msgid "Mail the request to this address."
3560
msgstr ""
3561
3562
#: bzrlib/builtins.py:5730
3563
msgid "Body for the email."
3564
msgstr ""
3565
3566
#: bzrlib/builtins.py:5783
3567
msgid "Do not include a bundle in the merge directive."
3568
msgstr ""
3569
3570
#: bzrlib/builtins.py:5784
3571
msgid "Do not include a preview patch in the merge directive."
3572
msgstr ""
3573
3574
#: bzrlib/builtins.py:5787
3575
msgid "Remember submit and public branch."
3576
msgstr ""
3577
3578
#: bzrlib/builtins.py:5789
3579
msgid ""
3580
"Branch to generate the submission from, rather than the one containing the "
3581
"working directory."
3582
msgstr ""
3583
3584
#: bzrlib/builtins.py:5799 bzrlib/cmd_version_info.py:76
3585
msgid "format"
3586
msgstr ""
3587
3588
#: bzrlib/builtins.py:5800
3589
msgid "Use the specified output format."
3590
msgstr ""
3591
3592
#: bzrlib/builtins.py:5822
3593
msgid "Create, remove or modify a tag naming a revision."
3594
msgstr ""
3595
3596
#: bzrlib/builtins.py:5824
3597
msgid ""
3598
"Tags give human-meaningful names to revisions. Commands that take a -r\n"
3599
"(--revision) option can be given -rtag:X, where X is any previously\n"
3600
"created tag."
3601
msgstr ""
3602
3603
#: bzrlib/builtins.py:5828
3604
msgid ""
3605
"Tags are stored in the branch. Tags are copied from one branch to another\n"
3606
"along when you branch, push, pull or merge."
3607
msgstr ""
3608
3609
#: bzrlib/builtins.py:5831
3610
msgid ""
3611
"It is an error to give a tag name that already exists unless you pass\n"
3612
"--force, in which case the tag is moved to point to the new revision."
3613
msgstr ""
3614
3615
#: bzrlib/builtins.py:5834
3616
msgid ""
3617
"To rename a tag (change the name but keep it on the same revsion), run "
3618
"``bzr\n"
3619
"tag new-name -r tag:old-name`` and then ``bzr tag --delete oldname``."
3620
msgstr ""
3621
3622
#: bzrlib/builtins.py:5837
3623
msgid ""
3624
"If no tag name is specified it will be determined through the \n"
3625
"'automatic_tag_name' hook. This can e.g. be used to automatically tag\n"
3626
"upstream releases by reading configure.ac. See ``bzr help hooks`` for\n"
3627
"details."
3628
msgstr ""
3629
3630
#: bzrlib/builtins.py:5847
3631
msgid "Delete this tag rather than placing it."
3632
msgstr ""
3633
3634
#: bzrlib/builtins.py:5850
3635
msgid "Branch in which to place the tag."
3636
msgstr ""
3637
3638
#: bzrlib/builtins.py:5852
3639
msgid "Replace existing tags."
3640
msgstr ""
3641
3642
#: bzrlib/builtins.py:5867
3643
msgid "No tag specified to delete."
3644
msgstr ""
3645
3646
#: bzrlib/builtins.py:5869
3647
#, python-format
3648
msgid "Deleted tag %s."
3649
msgstr ""
3650
3651
#: bzrlib/builtins.py:5883
3652
msgid "Please specify a tag name."
3653
msgstr ""
3654
3655
#: bzrlib/builtins.py:5891
3656
#, python-format
3657
msgid "Tag %s already exists for that revision."
3658
msgstr ""
3659
3660
#: bzrlib/builtins.py:5895
3661
#, python-format
3662
msgid "Created tag %s."
3663
msgstr ""
3664
3665
#: bzrlib/builtins.py:5897
3666
#, python-format
3667
msgid "Updated tag %s."
3668
msgstr ""
3669
3670
#: bzrlib/builtins.py:5901
3671
msgid "List tags."
3672
msgstr ""
3673
3674
#: bzrlib/builtins.py:5903
3675
msgid ""
3676
"This command shows a table of tag names and the revisions they reference."
3677
msgstr ""
3678
3679
#: bzrlib/builtins.py:5909
3680
msgid "Branch whose tags should be displayed."
3681
msgstr ""
3682
3683
#: bzrlib/builtins.py:5911
3684
msgid "Sort tags by different criteria."
3685
msgstr ""
3686
3687
#: bzrlib/builtins.py:5911
3688
msgid "Sorting"
3689
msgstr ""
3690
3691
#: bzrlib/builtins.py:5980
3692
msgid "Reconfigure the type of a bzr directory."
3693
msgstr ""
3694
3695
#: bzrlib/builtins.py:5982
3696
msgid "A target configuration must be specified."
3697
msgstr ""
3698
3699
#: bzrlib/builtins.py:5984
3700
msgid ""
3701
"For checkouts, the bind-to location will be auto-detected if not specified.\n"
3702
"The order of preference is\n"
3703
"1. For a lightweight checkout, the current bound location.\n"
3704
"2. For branches that used to be checkouts, the previously-bound location.\n"
3705
"3. The push location.\n"
3706
"4. The parent location.\n"
3707
"If none of these is available, --bind-to must be specified."
3708
msgstr ""
3709
3710
#: bzrlib/builtins.py:5998
3711
msgid "Tree type"
3712
msgstr ""
3713
3714
#: bzrlib/builtins.py:5999
3715
msgid "The relation between branch and tree."
3716
msgstr ""
3717
3718
#: bzrlib/builtins.py:6001
3719
msgid "Reconfigure to be an unbound branch with no working tree."
3720
msgstr ""
3721
3722
#: bzrlib/builtins.py:6002
3723
msgid "Reconfigure to be an unbound branch with a working tree."
3724
msgstr ""
3725
3726
#: bzrlib/builtins.py:6003
3727
msgid "Reconfigure to be a bound branch with a working tree."
3728
msgstr ""
3729
3730
#: bzrlib/builtins.py:6004
3731
msgid "Reconfigure to be a lightweight checkout (with no local history)."
3732
msgstr ""
3733
3734
#: bzrlib/builtins.py:6009
3735
msgid "Repository type"
3736
msgstr ""
3737
3738
#: bzrlib/builtins.py:6010
3739
msgid "Location fo the repository."
3740
msgstr ""
3741
3742
#: bzrlib/builtins.py:6012
3743
msgid ""
3744
"Reconfigure to be a standalone branch (i.e. stop using shared repository)."
3745
msgstr ""
3746
3747
#: bzrlib/builtins.py:6014
3748
msgid "Reconfigure to use a shared repository."
3749
msgstr ""
3750
3751
#: bzrlib/builtins.py:6018
3752
msgid "Trees in Repository"
3753
msgstr ""
3754
3755
#: bzrlib/builtins.py:6019
3756
msgid "Whether new branches in the repository have trees."
3757
msgstr ""
3758
3759
#: bzrlib/builtins.py:6021
3760
msgid ""
3761
"Reconfigure repository to create working trees on branches by default."
3762
msgstr ""
3763
3764
#: bzrlib/builtins.py:6023
3765
msgid ""
3766
"Reconfigure repository to not create working trees on branches by default."
3767
msgstr ""
3768
3769
#: bzrlib/builtins.py:6026
3770
msgid "Branch to bind checkout to."
3771
msgstr ""
3772
3773
#: bzrlib/builtins.py:6028
3774
msgid "Perform reconfiguration even if local changes will be lost."
3775
msgstr ""
3776
3777
#: bzrlib/builtins.py:6031
3778
msgid "Reconfigure a branch to be stacked on another branch."
3779
msgstr ""
3780
3781
#: bzrlib/builtins.py:6035
3782
msgid ""
3783
"Reconfigure a branch to be unstacked. This may require copying substantial "
3784
"data into it."
3785
msgstr ""
3786
3787
#: bzrlib/builtins.py:6045
3788
msgid "Can't use both --stacked-on and --unstacked"
3789
msgstr ""
3790
3791
#: bzrlib/builtins.py:6059
3792
msgid "No target configuration specified"
3793
msgstr ""
3794
3795
#: bzrlib/builtins.py:6094
3796
msgid "Set the branch of a checkout and update."
3797
msgstr ""
3798
3799
#: bzrlib/builtins.py:6096
3800
msgid ""
3801
"For lightweight checkouts, this changes the branch being referenced.\n"
3802
"For heavyweight checkouts, this checks that there are no local commits\n"
3803
"versus the current bound branch, then it makes the local branch a mirror\n"
3804
"of the new location and binds to it."
3805
msgstr ""
3806
3807
#: bzrlib/builtins.py:6101
3808
msgid ""
3809
"In both cases, the working tree is updated and uncommitted changes\n"
3810
"are merged. The user can commit or revert these as they desire."
3811
msgstr ""
3812
3813
#: bzrlib/builtins.py:6104
3814
msgid "Pending merges need to be committed or reverted before using switch."
3815
msgstr ""
3816
3817
#: bzrlib/builtins.py:6106
3818
msgid ""
3819
"The path to the branch to switch to can be specified relative to the parent\n"
3820
"directory of the current branch. For example, if you are currently in a\n"
3821
"checkout of /path/to/branch, specifying 'newbranch' will find a branch at\n"
3822
"/path/to/newbranch."
3823
msgstr ""
3824
3825
#: bzrlib/builtins.py:6111
3826
msgid ""
3827
"Bound branches use the nickname of its master branch unless it is set\n"
3828
"locally, in which case switching will update the local nickname to be\n"
3829
"that of the master."
3830
msgstr ""
3831
3832
#: bzrlib/builtins.py:6119
3833
msgid "Switch even if local commits will be lost."
3834
msgstr ""
3835
3836
#: bzrlib/builtins.py:6122
3837
msgid "Create the target branch from this one before switching to it."
3838
msgstr ""
3839
3840
#: bzrlib/builtins.py:6134
3841
msgid "You must supply either a revision or a location"
3842
msgstr ""
3843
3844
#: bzrlib/builtins.py:6145
3845
msgid "cannot create branch without source branch"
3846
msgstr ""
3847
3848
#: bzrlib/builtins.py:6209
3849
msgid "Manage filtered views."
3850
msgstr ""
3851
3852
#: bzrlib/builtins.py:6211
3853
msgid ""
3854
"Views provide a mask over the tree so that users can focus on\n"
3855
"a subset of a tree when doing their work. After creating a view,\n"
3856
"commands that support a list of files - status, diff, commit, etc -\n"
3857
"effectively have that list of files implicitly given each time.\n"
3858
"An explicit list of files can still be given but those files\n"
3859
"must be within the current view."
3860
msgstr ""
3861
3862
#: bzrlib/builtins.py:6218
3863
msgid ""
3864
"In most cases, a view has a short life-span: it is created to make\n"
3865
"a selected change and is deleted once that change is committed.\n"
3866
"At other times, you may wish to create one or more named views\n"
3867
"and switch between them."
3868
msgstr ""
3869
3870
#: bzrlib/builtins.py:6223
3871
msgid ""
3872
"To disable the current view without deleting it, you can switch to\n"
3873
"the pseudo view called ``off``. This can be useful when you need\n"
3874
"to see the whole tree for an operation or two (e.g. merge) but\n"
3875
"want to switch back to your view after that."
3876
msgstr ""
3877
3878
#: bzrlib/builtins.py:6228
3879
msgid ""
3880
":Examples:\n"
3881
" To define the current view::"
3882
msgstr ""
3883
3884
#: bzrlib/builtins.py:6231
3885
msgid " bzr view file1 dir1 ..."
3886
msgstr ""
3887
3888
#: bzrlib/builtins.py:6233
3889
msgid " To list the current view::"
3890
msgstr ""
3891
3892
#: bzrlib/builtins.py:6235
3893
msgid " bzr view"
3894
msgstr ""
3895
3896
#: bzrlib/builtins.py:6237
3897
msgid " To delete the current view::"
3898
msgstr ""
3899
3900
#: bzrlib/builtins.py:6239
3901
msgid " bzr view --delete"
3902
msgstr ""
3903
3904
#: bzrlib/builtins.py:6241
3905
msgid " To disable the current view without deleting it::"
3906
msgstr ""
3907
3908
#: bzrlib/builtins.py:6243
3909
msgid " bzr view --switch off"
3910
msgstr ""
3911
3912
#: bzrlib/builtins.py:6245
3913
msgid " To define a named view and switch to it::"
3914
msgstr ""
3915
3916
#: bzrlib/builtins.py:6247
3917
msgid " bzr view --name view-name file1 dir1 ..."
3918
msgstr ""
3919
3920
#: bzrlib/builtins.py:6249
3921
msgid " To list a named view::"
3922
msgstr ""
3923
3924
#: bzrlib/builtins.py:6251
3925
msgid " bzr view --name view-name"
3926
msgstr ""
3927
3928
#: bzrlib/builtins.py:6253
3929
msgid " To delete a named view::"
3930
msgstr ""
3931
3932
#: bzrlib/builtins.py:6255
3933
msgid " bzr view --name view-name --delete"
3934
msgstr ""
3935
3936
#: bzrlib/builtins.py:6257
3937
msgid " To switch to a named view::"
3938
msgstr ""
3939
3940
#: bzrlib/builtins.py:6259
3941
msgid " bzr view --switch view-name"
3942
msgstr ""
3943
3944
#: bzrlib/builtins.py:6261
3945
msgid " To list all views defined::"
3946
msgstr ""
3947
3948
#: bzrlib/builtins.py:6263
3949
msgid " bzr view --all"
3950
msgstr ""
3951
3952
#: bzrlib/builtins.py:6265
3953
msgid " To delete all views::"
3954
msgstr ""
3955
3956
#: bzrlib/builtins.py:6267
3957
msgid " bzr view --delete --all"
3958
msgstr ""
3959
3960
#: bzrlib/builtins.py:6274
3961
msgid "Apply list or delete action to all views."
3962
msgstr ""
3963
3964
#: bzrlib/builtins.py:6277
3965
msgid "Delete the view."
3966
msgstr ""
3967
3968
#: bzrlib/builtins.py:6280
3969
msgid "Name of the view to define, list or delete."
3970
msgstr ""
3971
3972
#: bzrlib/builtins.py:6284
3973
msgid "Name of the view to switch to."
3974
msgstr ""
3975
3976
#: bzrlib/builtins.py:6303
3977
msgid "Both --delete and a file list specified"
3978
msgstr ""
3979
3980
#: bzrlib/builtins.py:6306
3981
msgid "Both --delete and --switch specified"
3982
msgstr ""
3983
3984
#: bzrlib/builtins.py:6309
3985
msgid "Deleted all views.\n"
3986
msgstr ""
3987
3988
#: bzrlib/builtins.py:6311
3989
msgid "No current view to delete"
3990
msgstr ""
3991
3992
#: bzrlib/builtins.py:6314
3993
#, python-format
3994
msgid "Deleted '%s' view.\n"
3995
msgstr ""
3996
3997
#: bzrlib/builtins.py:6318
3998
msgid "Both --switch and a file list specified"
3999
msgstr ""
4000
4001
#: bzrlib/builtins.py:6321
4002
msgid "Both --switch and --all specified"
4003
msgstr ""
4004
4005
#: bzrlib/builtins.py:6324
4006
msgid "No current view to disable"
4007
msgstr ""
4008
4009
#: bzrlib/builtins.py:6326
4010
#, python-format
4011
msgid "Disabled '%s' view.\n"
4012
msgstr ""
4013
4014
#: bzrlib/builtins.py:6330 bzrlib/builtins.py:6352
4015
msgid "Using '{0}' view: {1}\n"
4016
msgstr ""
4017
4018
#: bzrlib/builtins.py:6333
4019
msgid "Views defined:\n"
4020
msgstr ""
4021
4022
#: bzrlib/builtins.py:6342
4023
msgid "No views defined.\n"
4024
msgstr ""
4025
4026
#: bzrlib/builtins.py:6349
4027
msgid "Cannot change the 'off' pseudo view"
4028
msgstr ""
4029
4030
#: bzrlib/builtins.py:6357
4031
msgid "No current view.\n"
4032
msgstr ""
4033
4034
#: bzrlib/builtins.py:6360
4035
msgid "'{0}' view is: {1}\n"
4036
msgstr ""
4037
4038
#: bzrlib/builtins.py:6380
4039
msgid " <no hooks installed>\n"
4040
msgstr ""
4041
4042
#: bzrlib/builtins.py:6384
4043
msgid "Remove a branch."
4044
msgstr ""
4045
4046
#: bzrlib/builtins.py:6386
4047
msgid ""
4048
"This will remove the branch from the specified location but \n"
4049
"will keep any working tree or repository in place."
4050
msgstr ""
4051
4052
#: bzrlib/builtins.py:6391
4053
msgid " Remove the branch at repo/trunk::"
4054
msgstr ""
4055
4056
#: bzrlib/builtins.py:6393
4057
msgid " bzr remove-branch repo/trunk"
4058
msgstr ""
4059
4060
#: bzrlib/builtins.py:6408
4061
msgid "Plaintext diff output."
4062
msgstr ""
4063
4064
#: bzrlib/builtins.py:6409
4065
msgid "Temporarily set aside some changes from the current tree."
4066
msgstr ""
4067
4068
#: bzrlib/builtins.py:6411
4069
msgid ""
4070
"Shelve allows you to temporarily put changes you've made \"on the shelf\",\n"
4071
"ie. out of the way, until a later time when you can bring them back from\n"
4072
"the shelf with the 'unshelve' command. The changes are stored alongside\n"
4073
"your working tree, and so they aren't propagated along with your branch nor\n"
4074
"will they survive its deletion."
4075
msgstr ""
4076
4077
#: bzrlib/builtins.py:6417
4078
msgid "If shelve --list is specified, previously-shelved changes are listed."
4079
msgstr ""
4080
4081
#: bzrlib/builtins.py:6419
4082
msgid ""
4083
"Shelve is intended to help separate several sets of changes that have\n"
4084
"been inappropriately mingled. If you just want to get rid of all changes\n"
4085
"and you don't need to restore them later, use revert. If you want to\n"
4086
"shelve all text changes at once, use shelve --all."
4087
msgstr ""
4088
4089
#: bzrlib/builtins.py:6424
4090
msgid ""
4091
"If filenames are specified, only the changes to those files will be\n"
4092
"shelved. Other files will be left untouched."
4093
msgstr ""
4094
4095
#: bzrlib/builtins.py:6427
4096
msgid ""
4097
"If a revision is specified, changes since that revision will be shelved."
4098
msgstr ""
4099
4100
#: bzrlib/builtins.py:6429
4101
msgid ""
4102
"You can put multiple items on the shelf, and by default, 'unshelve' will\n"
4103
"restore the most recently shelved changes."
4104
msgstr ""
4105
4106
#: bzrlib/builtins.py:6432
4107
msgid ""
4108
"For complicated changes, it is possible to edit the changes in a separate\n"
4109
"editor program to decide what the file remaining in the working copy\n"
4110
"should look like. To do this, add the configuration option"
4111
msgstr ""
4112
4113
#: bzrlib/builtins.py:6436
4114
msgid " change_editor = PROGRAM @new_path @old_path"
4115
msgstr ""
4116
4117
#: bzrlib/builtins.py:6438
4118
msgid ""
4119
"where @new_path is replaced with the path of the new version of the \n"
4120
"file and @old_path is replaced with the path of the old version of \n"
4121
"the file. The PROGRAM should save the new file with the desired \n"
4122
"contents of the file in the working tree.\n"
4123
" "
4124
msgstr ""
4125
4126
#: bzrlib/builtins.py:6450
4127
msgid "Shelve all changes."
4128
msgstr ""
4129
4130
#: bzrlib/builtins.py:6452
4131
msgid "Method to use for writing diffs."
4132
msgstr ""
4133
4134
#: bzrlib/builtins.py:6452
4135
msgid "writer"
4136
msgstr ""
4137
4138
#: bzrlib/builtins.py:6456
4139
msgid "List shelved changes."
4140
msgstr ""
4141
4142
#: bzrlib/builtins.py:6458
4143
msgid "Destroy removed changes instead of shelving them."
4144
msgstr ""
4145
4146
#: bzrlib/builtins.py:6487
4147
msgid "No shelved changes."
4148
msgstr ""
4149
4150
#: bzrlib/builtins.py:6498
4151
msgid "Restore shelved changes."
4152
msgstr ""
4153
4154
#: bzrlib/builtins.py:6500
4155
msgid ""
4156
"By default, the most recently shelved changes are restored. However if you\n"
4157
"specify a shelf by id those changes will be restored instead. This works\n"
4158
"best when the changes don't depend on each other."
4159
msgstr ""
4160
4161
#: bzrlib/builtins.py:6509
4162
msgid "The action to perform."
4163
msgstr ""
4164
4165
#: bzrlib/builtins.py:6509 bzrlib/conflicts.py:694
4166
msgid "action"
4167
msgstr ""
4168
4169
#: bzrlib/builtins.py:6511
4170
msgid "Apply changes and remove from the shelf."
4171
msgstr ""
4172
4173
#: bzrlib/builtins.py:6512
4174
msgid "Show changes, but do not apply or remove them."
4175
msgstr ""
4176
4177
#: bzrlib/builtins.py:6513
4178
msgid ""
4179
"Instead of unshelving the changes, show the diff that would result from "
4180
"unshelving."
4181
msgstr ""
4182
4183
#: bzrlib/builtins.py:6515
4184
msgid "Delete changes without applying them."
4185
msgstr ""
4186
4187
#: bzrlib/builtins.py:6516
4188
msgid "Apply changes but don't delete them."
4189
msgstr ""
4190
4191
#: bzrlib/builtins.py:6531
4192
msgid "Remove unwanted files from working tree."
4193
msgstr ""
4194
4195
#: bzrlib/builtins.py:6533
4196
msgid ""
4197
"By default, only unknown files, not ignored files, are deleted. Versioned\n"
4198
"files are never deleted."
4199
msgstr ""
4200
4201
#: bzrlib/builtins.py:6536
4202
msgid ""
4203
"Another class is 'detritus', which includes files emitted by bzr during\n"
4204
"normal operations and selftests. (The value of these files decreases with\n"
4205
"time.)"
4206
msgstr ""
4207
4208
#: bzrlib/builtins.py:6540
4209
msgid ""
4210
"If no options are specified, unknown files are deleted. Otherwise, option\n"
4211
"flags are respected, and may be combined."
4212
msgstr ""
4213
4214
#: bzrlib/builtins.py:6543
4215
msgid "To check what clean-tree will do, use --dry-run."
4216
msgstr ""
4217
4218
#: bzrlib/builtins.py:6546
4219
msgid "Delete all ignored files."
4220
msgstr ""
4221
4222
#: bzrlib/builtins.py:6547
4223
msgid ""
4224
"Delete conflict files, merge and revert backups, and failed selftest dirs."
4225
msgstr ""
4226
4227
#: bzrlib/builtins.py:6550
4228
msgid "Delete files unknown to bzr (default)."
4229
msgstr ""
4230
4231
#: bzrlib/builtins.py:6551
4232
msgid "Show files to delete instead of deleting them."
4233
msgstr ""
4234
4235
#: bzrlib/builtins.py:6553
4236
msgid "Do not prompt before deleting."
4237
msgstr ""
4238
4239
#: bzrlib/bundle/__init__.py:59
4240
msgid "A directory cannot be a bundle"
4241
msgstr ""
4242
4243
#: bzrlib/bundle/apply_bundle.py:40
4244
msgid "Install revisions"
4245
msgstr ""
4246
4247
#: bzrlib/bundle/commands.py:64
4248
msgid "--verbose requires a merge directive"
4249
msgstr ""
4250
4251
#: bzrlib/bundle/commands.py:67
4252
msgid "Bundle format not supported"
4253
msgstr ""
4254
4255
#: bzrlib/bundle/commands.py:77
4256
msgid "Records\n"
4257
msgstr ""
4258
4259
#: bzrlib/bundle/commands.py:81
4260
msgid "{0}: {1} ({2} multiparent)\n"
4261
msgstr ""
4262
4263
#: bzrlib/bundle/commands.py:83
4264
#, python-format
4265
msgid "unique files: %d\n"
4266
msgstr ""
4267
4268
#: bzrlib/bundle/commands.py:92
4269
msgid "Revisions\n"
4270
msgstr ""
4271
4272
#: bzrlib/bundle/commands.py:93
4273
#, python-format
4274
msgid "nicks: %s\n"
4275
msgstr ""
4276
4277
#: bzrlib/bundle/commands.py:95
4278
#, python-format
4279
msgid ""
4280
"committers: \n"
4281
"%s\n"
4282
msgstr ""
4283
4284
#: bzrlib/bundle/commands.py:103
4285
msgid "Decoded contents\n"
4286
msgstr ""
4287
4288
#: bzrlib/bundle/serializer/v4.py:327
4289
#, python-format
4290
msgid "Bundling %d revision."
4291
msgid_plural "Bundling %d revisions."
4292
msgstr[0] ""
4293
msgstr[1] ""
4294
4295
#: bzrlib/bzrdir.py:489
4296
msgid ""
4297
"making backup of {0}\n"
4298
" to {1}"
4299
msgstr ""
4300
4301
#: bzrlib/bzrdir.py:512
4302
msgid "renamed {0} to {1}"
4303
msgstr ""
4304
4305
#: bzrlib/bzrdir.py:1663
4306
#, python-format
4307
msgid ""
4308
"Source repository format does not support stacking, using format:\n"
4309
" %s"
4310
msgstr ""
4311
4312
#: bzrlib/bzrdir.py:1683
4313
#, python-format
4314
msgid ""
4315
"Source branch format does not support stacking, using format:\n"
4316
" %s"
4317
msgstr ""
4318
4319
#: bzrlib/bzrdir.py:1829
4320
msgid "starting repository conversion"
4321
msgstr ""
4322
4323
#: bzrlib/bzrdir.py:2058
4324
msgid "Using default stacking branch {0} at {1}"
4325
msgstr ""
4326
4327
#: bzrlib/check.py:108
4328
msgid "check"
4329
msgstr ""
4330
4331
#: bzrlib/check.py:110
4332
msgid "checking revisions"
4333
msgstr ""
4334
4335
#: bzrlib/check.py:112
4336
msgid "checking commit contents"
4337
msgstr ""
4338
4339
#: bzrlib/check.py:114
4340
msgid "checking file graphs"
4341
msgstr ""
4342
4343
#: bzrlib/check.py:118
4344
msgid "checking branches and trees"
4345
msgstr ""
4346
4347
#: bzrlib/check.py:205
4348
msgid "checked repository {0} format {1}"
4349
msgstr ""
4350
4351
#: bzrlib/check.py:208
4352
#, python-format
4353
msgid "%6d revisions"
4354
msgstr ""
4355
4356
#: bzrlib/check.py:209
4357
#, python-format
4358
msgid "%6d file-ids"
4359
msgstr ""
4360
4361
#: bzrlib/check.py:211
4362
#, python-format
4363
msgid "%6d unreferenced text versions"
4364
msgstr ""
4365
4366
#: bzrlib/check.py:215
4367
msgid "unreferenced version: {{{0}}} in {1}"
4368
msgstr ""
4369
4370
#: bzrlib/check.py:218
4371
#, python-format
4372
msgid "%6d revisions are missing inventory_sha1"
4373
msgstr ""
4374
4375
#: bzrlib/check.py:221
4376
#, python-format
4377
msgid "%6d revisions are mentioned but not present"
4378
msgstr ""
4379
4380
#: bzrlib/check.py:224
4381
#, python-format
4382
msgid "%6d ghost revisions"
4383
msgstr ""
4384
4385
#: bzrlib/check.py:229
4386
#, python-format
4387
msgid "%6d revisions missing parents in ancestry"
4388
msgstr ""
4389
4390
#: bzrlib/check.py:233
4391
#, python-format
4392
msgid " %s should be in the ancestry for:"
4393
msgstr ""
4394
4395
#: bzrlib/check.py:237
4396
#, python-format
4397
msgid "%6d inconsistent parents"
4398
msgstr ""
4399
4400
#: bzrlib/check.py:241
4401
msgid " * {0} version {1} has parents {2!r} but should have {3!r}"
4402
msgstr ""
4403
4404
#: bzrlib/check.py:247
4405
#, python-format
4406
msgid "%6d revisions have incorrect parents in the revision index"
4407
msgstr ""
4408
4409
#: bzrlib/check.py:253
4410
msgid " {0} has wrong parents in index: {1!r} should be {2!r}"
4411
msgstr ""
4412
4413
#: bzrlib/check.py:267
4414
msgid "Mismatched internal revid {{{0}}} and index revid {{{1}}}"
4415
msgstr ""
4416
4417
#: bzrlib/check.py:296
4418
msgid ""
4419
"Multiple expected sha1s for {0}. {{{1}}} expects {{{2}}}, {{{3}}} expects "
4420
"{{{4}}}"
4421
msgstr ""
4422
4423
#: bzrlib/check.py:354
4424
#, python-format
4425
msgid "Checking branch at '%s'."
4426
msgstr ""
4427
4428
#: bzrlib/check.py:374
4429
#, python-format
4430
msgid "Checking working tree at '%s'."
4431
msgstr ""
4432
4433
#: bzrlib/check.py:427 bzrlib/check.py:441
4434
msgid "No branch found at specified location."
4435
msgstr ""
4436
4437
#: bzrlib/check.py:429 bzrlib/check.py:439
4438
msgid "No working tree found at specified location."
4439
msgstr ""
4440
4441
#: bzrlib/check.py:432
4442
#, python-format
4443
msgid "Checking repository at '%s'."
4444
msgstr ""
4445
4446
#: bzrlib/check.py:443
4447
msgid "No repository found at specified location."
4448
msgstr ""
4449
4450
#: bzrlib/clean_tree.py:63
4451
msgid "Nothing to delete."
4452
msgstr ""
4453
4454
#: bzrlib/clean_tree.py:68
4455
msgid "Are you sure you wish to delete these"
4456
msgstr ""
4457
4458
#: bzrlib/clean_tree.py:70
4459
msgid "Canceled"
4460
msgstr ""
4461
4462
#: bzrlib/clean_tree.py:107
4463
#, python-format
4464
msgid "unable to remove %s"
4465
msgstr ""
4466
4467
#: bzrlib/clean_tree.py:111
4468
msgid "deleting paths:"
4469
msgstr ""
4470
4471
#: bzrlib/clean_tree.py:125
4472
msgid "unable to remove \"{0}\": {1}."
4473
msgstr ""
4474
4475
#: bzrlib/clean_tree.py:130
4476
msgid "No files deleted."
4477
msgstr ""
4478
4479
#: bzrlib/cmd_version_info.py:47
4480
msgid "No known version info format {0}. Supported types are: {1}"
4481
msgstr ""
4482
4483
#: bzrlib/cmd_version_info.py:52
4484
msgid "Version info in Custom template-based format."
4485
msgstr ""
4486
4487
#: bzrlib/cmd_version_info.py:52
4488
msgid "Version info in Python format."
4489
msgstr ""
4490
4491
#: bzrlib/cmd_version_info.py:52
4492
msgid "Version info in RIO (simple text) format (default)."
4493
msgstr ""
4494
4495
#: bzrlib/cmd_version_info.py:53
4496
msgid "Show version information about this tree."
4497
msgstr ""
4498
4499
#: bzrlib/cmd_version_info.py:55
4500
msgid ""
4501
"You can use this command to add information about version into\n"
4502
"source code of an application. The output can be in one of the\n"
4503
"supported formats or in a custom format based on a template."
4504
msgstr ""
4505
4506
#: bzrlib/cmd_version_info.py:59 en/help_topics/configuration.txt:700
4507
#: en/help_topics/configuration.txt:710
4508
msgid "For example::"
4509
msgstr ""
4510
4511
#: bzrlib/cmd_version_info.py:61
4512
msgid ""
4513
" bzr version-info --custom \\\n"
4514
" --template=\"#define VERSION_INFO \\\"Project 1.2.3 (r{revno})\\\"\\n\""
4515
msgstr ""
4516
4517
#: bzrlib/cmd_version_info.py:64
4518
msgid ""
4519
"will produce a C header file with formatted string containing the\n"
4520
"current revision number. Other supported variables in templates are:"
4521
msgstr ""
4522
4523
#: bzrlib/cmd_version_info.py:67
4524
msgid ""
4525
" * {date} - date of the last revision\n"
4526
" * {build_date} - current date\n"
4527
" * {revno} - revision number\n"
4528
" * {revision_id} - revision id\n"
4529
" * {branch_nick} - branch nickname\n"
4530
" * {clean} - 0 if the source tree contains uncommitted changes,\n"
4531
" otherwise 1"
4532
msgstr ""
4533
4534
#: bzrlib/cmd_version_info.py:77
4535
msgid "Select the output format."
4536
msgstr ""
4537
4538
#: bzrlib/cmd_version_info.py:81
4539
msgid "Include all possible information."
4540
msgstr ""
4541
4542
#: bzrlib/cmd_version_info.py:82
4543
msgid "Check if tree is clean."
4544
msgstr ""
4545
4546
#: bzrlib/cmd_version_info.py:84
4547
msgid "Include the revision-history."
4548
msgstr ""
4549
4550
#: bzrlib/cmd_version_info.py:86
4551
msgid "Include the last revision for each file."
4552
msgstr ""
4553
4554
#: bzrlib/cmd_version_info.py:87
4555
msgid "Template for the output."
4556
msgstr ""
4557
4558
#: bzrlib/cmd_version_info.py:101
4559
msgid "bzr version-info --revision takes exactly one revision specifier"
4560
msgstr ""
4561
4562
#: bzrlib/commands.py:228
4563
#, python-format
4564
msgid "unknown command \"%s\""
4565
msgstr ""
4566
4567
#: bzrlib/commands.py:475
4568
msgid "No help for this command."
4569
msgstr ""
4570
4571
#: bzrlib/commands.py:488
4572
#, python-format
4573
msgid ":Purpose: %s\n"
4574
msgstr ""
4575
4576
#: bzrlib/commands.py:490
4577
#, python-format
4578
msgid ""
4579
":Usage:\n"
4580
"%s\n"
4581
msgstr ""
4582
4583
#: bzrlib/commands.py:492
4584
#, python-format
4585
msgid ":Usage: %s\n"
4586
msgstr ""
4587
4588
#: bzrlib/commands.py:511
4589
#, python-format
4590
msgid ":Options:%s"
4591
msgstr ""
4592
4593
#: bzrlib/commands.py:522
4594
#, python-format
4595
msgid ""
4596
":Description:\n"
4597
" %s\n"
4598
"\n"
4599
msgstr ""
4600
4601
#: bzrlib/commands.py:532
4602
#, python-format
4603
msgid ""
4604
"See bzr help %s for more details and examples.\n"
4605
"\n"
4606
msgstr ""
4607
4608
#: bzrlib/commands.py:537
4609
msgid ":Aliases: "
4610
msgstr ""
4611
4612
#: bzrlib/commands.py:541
4613
#, python-format
4614
msgid ":From: plugin \"%s\"\n"
4615
msgstr ""
4616
4617
#: bzrlib/commands.py:553
4618
msgid ":doc:`{0} <{1}-help>`"
4619
msgstr ""
4620
4621
#: bzrlib/commands.py:557
4622
#, python-format
4623
msgid ":See also: %s"
4624
msgstr ""
4625
4626
#: bzrlib/commands.py:815 bzrlib/gpg.py:324
4627
msgid "Only ASCII permitted in option names"
4628
msgstr ""
4629
4630
#: bzrlib/commands.py:840 bzrlib/commands.py:848
4631
msgid "command {0!r} needs one or more {1}"
4632
msgstr ""
4633
4634
#: bzrlib/commands.py:857
4635
msgid "command {0!r} requires argument {1}"
4636
msgstr ""
4637
4638
#: bzrlib/commands.py:864
4639
msgid "extra argument to command {0}: {1}"
4640
msgstr ""
4641
4642
#: bzrlib/commands.py:961
4643
#, python-format
4644
msgid "Profile data written to \"%s\"."
4645
msgstr ""
4646
4647
#: bzrlib/commit.py:117 bzrlib/commit.py:740
4648
msgid "added"
4649
msgstr ""
4650
4651
#: bzrlib/commit.py:117 bzrlib/commit.py:748
4652
msgid "modified"
4653
msgstr ""
4654
4655
#: bzrlib/commit.py:131
4656
#, python-format
4657
msgid "Committing%s"
4658
msgstr ""
4659
4660
#: bzrlib/commit.py:134
4661
#, python-format
4662
msgid "Committed revision %d."
4663
msgstr ""
4664
4665
#: bzrlib/commit.py:143
4666
#, python-format
4667
msgid "deleted %s"
4668
msgstr ""
4669
4670
#: bzrlib/commit.py:146
4671
#, python-format
4672
msgid "missing %s"
4673
msgstr ""
4674
4675
#: bzrlib/commit.py:511
4676
msgid ""
4677
"Conflicting tags in bound branch:\n"
4678
"{0}"
4679
msgstr ""
4680
4681
#: bzrlib/commit.py:742
4682
msgid "renamed"
4683
msgstr ""
4684
4685
#: bzrlib/commit.py:977
4686
msgid "unchanged"
4687
msgstr ""
4688
4689
#: bzrlib/commit.py:999
4690
msgid "{0} [{1}] - Stage"
4691
msgstr ""
4692
4693
#: bzrlib/commit.py:1002
4694
#, python-format
4695
msgid "%s - Stage"
4696
msgstr ""
4697
4698
#: bzrlib/commit_signature_commands.py:36
4699
msgid "Sign all commits by a given committer."
4700
msgstr ""
4701
4702
#: bzrlib/commit_signature_commands.py:38
4703
msgid ""
4704
"If location is not specified the local tree is used.\n"
4705
"If committer is not specified the default committer is used."
4706
msgstr ""
4707
4708
#: bzrlib/commit_signature_commands.py:41
4709
msgid "This does not sign commits that already have signatures."
4710
msgstr ""
4711
4712
#: bzrlib/commit_signature_commands.py:49
4713
msgid ""
4714
"Don't actually sign anything, just print the revisions that would be signed."
4715
msgstr ""
4716
4717
#: bzrlib/commit_signature_commands.py:103
4718
msgid "Verify all commit signatures."
4719
msgstr ""
4720
4721
#: bzrlib/commit_signature_commands.py:105
4722
msgid ""
4723
"Verifies that all commits in the branch are signed by known GnuPG keys."
4724
msgstr ""
4725
4726
#: bzrlib/commit_signature_commands.py:110
4727
msgid ""
4728
"Comma separated list of GPG key patterns which are acceptable for "
4729
"verification."
4730
msgstr ""
4731
4732
#: bzrlib/commit_signature_commands.py:147
4733
msgid "Cannot verify a range of non-revision-history revisions"
4734
msgstr ""
4735
4736
#: bzrlib/commit_signature_commands.py:168
4737
msgid "All commits signed with verifiable keys"
4738
msgstr ""
4739
4740
#: bzrlib/config.py:475
4741
msgid "Invalid config value for \"{0}\" value {1!r} is not an SI unit."
4742
msgstr ""
4743
4744
#: bzrlib/config.py:2499
4745
msgid "{0} is not an SI unit."
4746
msgstr ""
4747
4748
#: bzrlib/config.py:2956
4749
msgid ""
4750
"Option {0} in section {1} of {2} was changed from {3} to {4}. The {5} value "
4751
"will be saved."
4752
msgstr ""
4753
4754
#: bzrlib/config.py:3100
4755
#, python-format
4756
msgid "Invalid '%s', should be of the form 'name=value'"
4757
msgstr ""
4758
4759
#: bzrlib/config.py:3969
4760
msgid "Display, set or remove a configuration option."
4761
msgstr ""
4762
4763
#: bzrlib/config.py:3971
4764
msgid "Display the active value for a given option."
4765
msgstr ""
4766
4767
#: bzrlib/config.py:3973
4768
msgid ""
4769
"If --all is specified, NAME is interpreted as a regular expression and all\n"
4770
"matching options are displayed mentioning their scope. The active value\n"
4771
"that bzr will take into account is the first one displayed for each option."
4772
msgstr ""
4773
4774
#: bzrlib/config.py:3977
4775
msgid "If no NAME is given, --all .* is implied."
4776
msgstr ""
4777
4778
#: bzrlib/config.py:3979
4779
msgid ""
4780
"Setting a value is achieved by using name=value without spaces. The value\n"
4781
"is set in the most relevant scope and can be checked by displaying the\n"
4782
"option again."
4783
msgstr ""
4784
4785
#: bzrlib/config.py:3991
4786
msgid "Reduce the scope to the specified configuration file."
4787
msgstr ""
4788
4789
#: bzrlib/config.py:3995
4790
msgid "Display all the defined values for the matching options."
4791
msgstr ""
4792
4793
#: bzrlib/config.py:3997
4794
msgid "Remove the option from the configuration file."
4795
msgstr ""
4796
4797
#: bzrlib/conflicts.py:50
4798
msgid "List files with conflicts."
4799
msgstr ""
4800
4801
#: bzrlib/conflicts.py:57
4802
msgid ""
4803
"Conflicts normally are listed as short, human-readable messages. If --text\n"
4804
"is supplied, the pathnames of files with text conflicts are listed,\n"
4805
"instead. (This is useful for editing all files with text conflicts.)"
4806
msgstr ""
4807
4808
#: bzrlib/conflicts.py:61
4809
msgid "Use bzr resolve when you have fixed a problem."
4810
msgstr ""
4811
4812
#: bzrlib/conflicts.py:66
4813
msgid "List paths of files with text conflicts."
4814
msgstr ""
4815
4816
#: bzrlib/conflicts.py:85
4817
msgid "Marks the conflict as resolved."
4818
msgstr ""
4819
4820
#: bzrlib/conflicts.py:88
4821
msgid "Resolve the conflict preserving the version in the working tree."
4822
msgstr ""
4823
4824
#: bzrlib/conflicts.py:91
4825
msgid "Resolve the conflict taking the merged version into account."
4826
msgstr ""
4827
4828
#: bzrlib/conflicts.py:98
4829
msgid "How to resolve the conflict."
4830
msgstr ""
4831
4832
#: bzrlib/conflicts.py:104
4833
msgid "Mark a conflict as resolved."
4834
msgstr ""
4835
4836
#: bzrlib/conflicts.py:111
4837
msgid ""
4838
"Once you have fixed a problem, use \"bzr resolve\" to automatically mark\n"
4839
"text conflicts as fixed, \"bzr resolve FILE\" to mark a specific conflict "
4840
"as\n"
4841
"resolved, or \"bzr resolve --all\" to mark all conflicts as resolved."
4842
msgstr ""
4843
4844
#: bzrlib/conflicts.py:119
4845
msgid "Resolve all conflicts in this tree."
4846
msgstr ""
4847
4848
#: bzrlib/conflicts.py:126
4849
msgid "If --all is specified, no FILE may be provided"
4850
msgstr ""
4851
4852
#: bzrlib/conflicts.py:151
4853
#, python-format
4854
msgid "%d conflict auto-resolved."
4855
msgid_plural "%d conflicts auto-resolved."
4856
msgstr[0] ""
4857
msgstr[1] ""
4858
4859
#: bzrlib/conflicts.py:154
4860
msgid "Remaining conflicts:"
4861
msgstr ""
4862
4863
#: bzrlib/conflicts.py:159
4864
msgid "All conflicts resolved."
4865
msgstr ""
4866
4867
#: bzrlib/conflicts.py:168
4868
msgid "{0} conflict resolved, {1} remaining"
4869
msgid_plural "{0} conflicts resolved, {1} remaining"
4870
msgstr[0] ""
4871
msgstr[1] ""
4872
4873
#: bzrlib/controldir.py:698
4874
msgid "{0} is{1} redirected to {2}"
4875
msgstr ""
4876
4877
#: bzrlib/diff.py:399
4878
#, python-format
4879
msgid "*** Ignoring files outside view. View is %s"
4880
msgstr ""
4881
4882
#: bzrlib/errors.py:157
4883
msgid "The tree builder is already building a tree."
4884
msgstr ""
4885
4886
#: bzrlib/errors.py:178
4887
msgid "The dirstate file (%(state)s) appears to be corrupt: %(msg)s"
4888
msgstr ""
4889
4890
#: bzrlib/errors.py:197
4891
msgid ""
4892
"The API for \"%(api)s\" is not compatible with \"%(wanted)s\". It supports "
4893
"versions \"%(minimum)s\" to \"%(current)s\"."
4894
msgstr ""
4895
4896
#: bzrlib/errors.py:209
4897
msgid "The transport '%(transport)s' is only accessible within this process."
4898
msgstr ""
4899
4900
#: bzrlib/errors.py:227
4901
msgid "Invalid revision number %(revno)s"
4902
msgstr ""
4903
4904
#: bzrlib/errors.py:236
4905
msgid "Invalid revision-id {%(revision_id)s} in %(branch)s"
4906
msgstr ""
4907
4908
#: bzrlib/errors.py:247
4909
msgid "Reserved revision-id {%(revision_id)s}"
4910
msgstr ""
4911
4912
#: bzrlib/errors.py:261
4913
msgid "There is no public branch set for \"%(branch_url)s\"."
4914
msgstr ""
4915
4916
#: bzrlib/errors.py:271
4917
msgid ""
4918
"No help could be found for '%(topic)s'. Please use 'bzr help topics' to "
4919
"obtain a list of topics."
4920
msgstr ""
4921
4922
#: bzrlib/errors.py:280
4923
msgid "The file id \"%(file_id)s\" is not present in the tree %(tree)s."
4924
msgstr ""
4925
4926
#: bzrlib/errors.py:290
4927
msgid ""
4928
"The file id \"%(file_id)s\" is not present in the repository %(repository)r"
4929
msgstr ""
4930
4931
#: bzrlib/errors.py:299
4932
msgid "The branch '%(branch)s' is not stacked."
4933
msgstr ""
4934
4935
#: bzrlib/errors.py:313
4936
msgid "No WorkingTree exists for \"%(base)s\"."
4937
msgstr ""
4938
4939
#: bzrlib/errors.py:322
4940
msgid "Not currently building a tree."
4941
msgstr ""
4942
4943
#: bzrlib/errors.py:327
4944
msgid "%(url)s is not a local path."
4945
msgstr ""
4946
4947
#: bzrlib/errors.py:355
4948
msgid "%(not_locked)r is not write locked but needs to be."
4949
msgstr ""
4950
4951
#: bzrlib/errors.py:363
4952
msgid "Error in command line options"
4953
msgstr ""
4954
4955
#: bzrlib/errors.py:368
4956
msgid "%(value)s is not an index of type %(_type)s."
4957
msgstr ""
4958
4959
#: bzrlib/errors.py:378
4960
msgid "Error in data for index %(value)s."
4961
msgstr ""
4962
4963
#: bzrlib/errors.py:387
4964
msgid "The key '%(key)s' is already in index '%(index)s'."
4965
msgstr ""
4966
4967
#: bzrlib/errors.py:397
4968
msgid "The key '%(key)s' is not a valid key."
4969
msgstr ""
4970
4971
#: bzrlib/errors.py:406
4972
msgid "Could not parse options for index %(value)s."
4973
msgstr ""
4974
4975
#: bzrlib/errors.py:415
4976
msgid "The value '%(value)s' is not a valid value."
4977
msgstr ""
4978
4979
#: bzrlib/errors.py:443
4980
msgid "Generic path error: %(path)r%(extra)s)"
4981
msgstr ""
4982
4983
#: bzrlib/errors.py:456
4984
msgid "No such file: %(path)r%(extra)s"
4985
msgstr ""
4986
4987
#: bzrlib/errors.py:461
4988
msgid "File exists: %(path)r%(extra)s"
4989
msgstr ""
4990
4991
#: bzrlib/errors.py:467
4992
msgid ""
4993
"Could not rename %(source)s => %(dest)s because both files exist. (Use --"
4994
"after to tell bzr about a rename that has already happened)%(extra)s"
4995
msgstr ""
4996
4997
#: bzrlib/errors.py:483
4998
msgid "\"%(path)s\" is not a directory %(extra)s"
4999
msgstr ""
5000
5001
#: bzrlib/errors.py:488
5002
msgid "\"%(path)s\" is not in the working directory %(extra)s"
5003
msgstr ""
5004
5005
#: bzrlib/errors.py:493
5006
msgid "Directory not empty: \"%(path)s\"%(extra)s"
5007
msgstr ""
5008
5009
#: bzrlib/errors.py:498
5010
msgid "Hard-linking \"%(path)s\" is not supported"
5011
msgstr ""
5012
5013
#: bzrlib/errors.py:513
5014
msgid "Device or resource busy: \"%(path)s\"%(extra)s"
5015
msgstr ""
5016
5017
#: bzrlib/errors.py:518
5018
msgid "Permission denied: \"%(path)s\"%(extra)s"
5019
msgstr ""
5020
5021
#: bzrlib/errors.py:523
5022
msgid "Invalid url supplied to transport: \"%(path)s\"%(extra)s"
5023
msgstr ""
5024
5025
#: bzrlib/errors.py:528
5026
msgid "Invalid URL join request: %(reason)s: %(base)r + %(join_args)r"
5027
msgstr ""
5028
5029
#: bzrlib/errors.py:539
5030
msgid "URLs differ by more than path: %(from_)r and %(to)r"
5031
msgstr ""
5032
5033
#: bzrlib/errors.py:561
5034
msgid "The %(type)s hook '%(hook)s' is unknown in this version of bzrlib."
5035
msgstr ""
5036
5037
#: bzrlib/errors.py:571
5038
msgid "Unsupported protocol for url \"%(path)s\"%(extra)s"
5039
msgstr ""
5040
5041
#: bzrlib/errors.py:579
5042
msgid ""
5043
"The branch '%(url)s'(%(format)s) is not a stackable format. You will need to "
5044
"upgrade the branch to permit branch stacking."
5045
msgstr ""
5046
5047
#: bzrlib/errors.py:590
5048
msgid "The branch '%(branch_url)s' cannot be stacked on '%(target_url)s'."
5049
msgstr ""
5050
5051
#: bzrlib/errors.py:600
5052
msgid ""
5053
"The repository '%(url)s'(%(format)s) is not a stackable format. You will "
5054
"need to upgrade the repository to permit branch stacking."
5055
msgstr ""
5056
5057
#: bzrlib/errors.py:611
5058
msgid "Error reading from %(path)r."
5059
msgstr ""
5060
5061
#: bzrlib/errors.py:630
5062
msgid "Path \"%(path)s\" is not a child of path \"%(base)s\"%(extra)s"
5063
msgstr ""
5064
5065
#: bzrlib/errors.py:646
5066
msgid "Path \"%(path)s\" is not unicode normalized"
5067
msgstr ""
5068
5069
#: bzrlib/errors.py:654
5070
msgid "Not a branch: \"%(path)s\"%(detail)s."
5071
msgstr ""
5072
5073
#: bzrlib/errors.py:696
5074
msgid "No submit branch available for branch \"%(path)s\""
5075
msgstr ""
5076
5077
#: bzrlib/errors.py:705
5078
msgid "Already a branch: \"%(path)s\"."
5079
msgstr ""
5080
5081
#: bzrlib/errors.py:711
5082
msgid ""
5083
"Directory contains a branch, but no working tree (use bzr checkout if you "
5084
"wish to build a working tree): \"%(path)s\""
5085
msgstr ""
5086
5087
#: bzrlib/errors.py:716
5088
msgid ""
5089
"\"%(function)s\" called on an AtomicFile after it was closed: \"%(path)s\""
5090
msgstr ""
5091
5092
#: bzrlib/errors.py:726
5093
msgid ""
5094
"Parent not accessible given base \"%(base)s\" and relative path \"%(path)s\""
5095
msgstr ""
5096
5097
#: bzrlib/errors.py:736
5098
msgid "No repository present: \"%(path)s\""
5099
msgstr ""
5100
5101
#: bzrlib/errors.py:743
5102
msgid ""
5103
"Unsupported branch format: %(format)s\n"
5104
"Please run 'bzr upgrade'"
5105
msgstr ""
5106
5107
#: bzrlib/errors.py:749
5108
msgid "Unknown %(kind)s format: %(format)r"
5109
msgstr ""
5110
5111
#: bzrlib/errors.py:758
5112
msgid "Format %(format)s is not compatible with .bzr version %(bzrdir)s."
5113
msgstr ""
5114
5115
#: bzrlib/errors.py:768
5116
msgid "Parse error on line %(lineno)d of %(format)s format: %(line)s"
5117
msgstr ""
5118
5119
#: bzrlib/errors.py:783
5120
msgid ""
5121
"%(target)s\n"
5122
"is not compatible with\n"
5123
"%(source)s\n"
5124
"%(details)s"
5125
msgstr ""
5126
5127
#: bzrlib/errors.py:799
5128
msgid "Revision is not compatible with %(repo_format)s"
5129
msgstr ""
5130
5131
#: bzrlib/errors.py:809
5132
msgid "%(context_info)s%(path)s is already versioned."
5133
msgstr ""
5134
5135
#: bzrlib/errors.py:830
5136
msgid "%(context_info)s%(path)s is not versioned."
5137
msgstr ""
5138
5139
#: bzrlib/errors.py:851
5140
msgid "Path(s) are not versioned: %(paths_as_string)s"
5141
msgstr ""
5142
5143
#: bzrlib/errors.py:862
5144
msgid "Path(s) do not exist: %(paths_as_string)s%(extra)s"
5145
msgstr ""
5146
5147
#: bzrlib/errors.py:881
5148
msgid "Cannot operate on \"%(filename)s\" of unsupported kind \"%(kind)s\""
5149
msgstr ""
5150
5151
#: bzrlib/errors.py:889
5152
msgid ""
5153
"Filename %(filename)r is not valid in your current filesystem encoding "
5154
"%(fs_encoding)s"
5155
msgstr ""
5156
5157
#: bzrlib/errors.py:900
5158
msgid "Cannot operate on \"%(filename)s\" because it is a control file"
5159
msgstr ""
5160
5161
#: bzrlib/errors.py:918
5162
msgid "The lock for '%(lock_description)s' is in use and cannot be broken."
5163
msgstr ""
5164
5165
#: bzrlib/errors.py:957
5166
msgid "Cannot lock %(lock)s: %(why)s"
5167
msgstr ""
5168
5169
#: bzrlib/errors.py:967
5170
msgid ""
5171
"A transaction related operation was attempted after the transaction finished."
5172
msgstr ""
5173
5174
#: bzrlib/errors.py:994
5175
msgid "Cannot lock: transport is read only: %(transport)s"
5176
msgstr ""
5177
5178
#: bzrlib/errors.py:1002
5179
msgid "Could not acquire lock \"%(lock)s\": %(msg)s"
5180
msgstr ""
5181
5182
#: bzrlib/errors.py:1013
5183
msgid ""
5184
"Lock was broken while still open: %(lock)s - check storage consistency!"
5185
msgstr ""
5186
5187
#: bzrlib/errors.py:1024
5188
msgid ""
5189
"Lock was released and re-acquired before being broken: %(lock)s: held by "
5190
"%(holder)r, wanted to break %(target)r"
5191
msgstr ""
5192
5193
#: bzrlib/errors.py:1036
5194
msgid ""
5195
"Lock is apparently held, but corrupted: %(corruption_info)s\n"
5196
"Use 'bzr break-lock' to clear it"
5197
msgstr ""
5198
5199
#: bzrlib/errors.py:1049
5200
msgid "Lock not held: %(lock)s"
5201
msgstr ""
5202
5203
#: bzrlib/errors.py:1078
5204
msgid "No changes to commit"
5205
msgstr ""
5206
5207
#: bzrlib/errors.py:1083
5208
msgid ""
5209
"Selected-file commit of merges is not supported yet: files %(files_str)s"
5210
msgstr ""
5211
5212
#: bzrlib/errors.py:1093
5213
msgid ""
5214
"Excluding paths during commit is not supported by repository at "
5215
"%(repository)r."
5216
msgstr ""
5217
5218
#: bzrlib/errors.py:1102
5219
msgid ""
5220
"The specified commit message contains characters unsupported by the current "
5221
"encoding."
5222
msgstr ""
5223
5224
#: bzrlib/errors.py:1108
5225
msgid "Upgrade URL cannot work with readonly URLs."
5226
msgstr ""
5227
5228
#: bzrlib/errors.py:1113
5229
msgid "The branch format %(format)s is already at the most recent format."
5230
msgstr ""
5231
5232
#: bzrlib/errors.py:1136
5233
msgid "Option --change does not accept revision ranges"
5234
msgstr ""
5235
5236
#: bzrlib/errors.py:1141
5237
msgid "No namespace registered for string: %(spec)r"
5238
msgstr ""
5239
5240
#: bzrlib/errors.py:1160
5241
msgid ""
5242
"Requested revision: '%(spec)s' does not exist in branch: "
5243
"%(branch_url)s%(extra)s"
5244
msgstr ""
5245
5246
#: bzrlib/errors.py:1174
5247
msgid ""
5248
"Operation denied because it would change the main history, which is not "
5249
"permitted by the append_revisions_only setting on branch \"%(location)s\"."
5250
msgstr ""
5251
5252
#: bzrlib/errors.py:1185
5253
msgid ""
5254
"These branches have diverged. Use the missing command to see how.\n"
5255
"Use the merge command to reconcile them."
5256
msgstr ""
5257
5258
#: bzrlib/errors.py:1205
5259
msgid ""
5260
"Branches have no common ancestor, and no merge base revision was specified."
5261
msgstr ""
5262
5263
#: bzrlib/errors.py:1211
5264
msgid ""
5265
"Selected merge cannot perform reverse cherrypicks. Try merge3 or diff3."
5266
msgstr ""
5267
5268
#: bzrlib/errors.py:1217
5269
msgid "Revisions have no common ancestor: %(revision_a)s %(revision_b)s"
5270
msgstr ""
5271
5272
#: bzrlib/errors.py:1226
5273
msgid ""
5274
"Revisions are not derived from the same root: %(revision_a)s %(revision_b)s."
5275
msgstr ""
5276
5277
#: bzrlib/errors.py:1235
5278
msgid "Revision %(rev_id)s is not an ancestor of %(not_ancestor_id)s"
5279
msgstr ""
5280
5281
#: bzrlib/errors.py:1244
5282
msgid "Branch %(branch)s has no commits."
5283
msgstr ""
5284
5285
#: bzrlib/errors.py:1262
5286
msgid ""
5287
"Bound branch %(branch)s is out of date with master branch "
5288
"%(master)s.%(extra_help)s"
5289
msgstr ""
5290
5291
#: bzrlib/errors.py:1274
5292
msgid ""
5293
"Cannot commit to branch %(branch)s. It is bound to %(master)s, which is "
5294
"bound to %(remote)s."
5295
msgstr ""
5296
5297
#: bzrlib/errors.py:1286
5298
msgid "Cannot pull --overwrite to a branch which is bound %(branch)s"
5299
msgstr ""
5300
5301
#: bzrlib/errors.py:1295
5302
msgid ""
5303
"Unable to connect to target of bound branch %(branch)s => %(target)s: "
5304
"%(error)s"
5305
msgstr ""
5306
5307
#: bzrlib/errors.py:1307
5308
msgid "Error in processing weave: %(msg)s"
5309
msgstr ""
5310
5311
#: bzrlib/errors.py:1316
5312
msgid "Revision {%(revision_id)s} already present in %(weave)s"
5313
msgstr ""
5314
5315
#: bzrlib/errors.py:1327
5316
msgid "Revision {%(revision_id)s} not present in %(weave)s"
5317
msgstr ""
5318
5319
#: bzrlib/errors.py:1337
5320
msgid "Weave invariant violated: %(what)s"
5321
msgstr ""
5322
5323
#: bzrlib/errors.py:1346
5324
msgid "Parents are mismatched between two revisions. %(msg)s"
5325
msgstr ""
5326
5327
#: bzrlib/errors.py:1368
5328
msgid ""
5329
"Weaves differ on text content. Revision: {%(revision_id)s}, %(weave_a)s, "
5330
"%(weave_b)s"
5331
msgstr ""
5332
5333
#: bzrlib/errors.py:1380
5334
msgid "Versioned file error"
5335
msgstr ""
5336
5337
#: bzrlib/errors.py:1385
5338
msgid "Revision {%(revision_id)s} not present in \"%(file_id)s\"."
5339
msgstr ""
5340
5341
#: bzrlib/errors.py:1395
5342
msgid "Revision {%(revision_id)s} already present in \"%(file_id)s\"."
5343
msgstr ""
5344
5345
#: bzrlib/errors.py:1405
5346
msgid "Text did not match its checksum: %(msg)s"
5347
msgstr ""
5348
5349
#: bzrlib/errors.py:1531
5350
msgid "Export format %(format)r not supported"
5351
msgstr ""
5352
5353
#: bzrlib/errors.py:1540
5354
msgid "Transport error: %(msg)s %(orig_error)s"
5355
msgstr ""
5356
5357
#: bzrlib/errors.py:1566
5358
msgid "Generic bzr smart protocol error: %(details)s"
5359
msgstr ""
5360
5361
#: bzrlib/errors.py:1574
5362
msgid "Received bad protocol version marker: %(marker)r"
5363
msgstr ""
5364
5365
#: bzrlib/errors.py:1606
5366
msgid "Transport operation not possible: %(msg)s %(orig_error)s"
5367
msgstr ""
5368
5369
#: bzrlib/errors.py:1611
5370
msgid "Connection error: %(msg)s %(orig_error)s"
5371
msgstr ""
5372
5373
#: bzrlib/errors.py:1616
5374
msgid "%(msg)s %(host)s%(port)s%(orig_error)s"
5375
msgstr ""
5376
5377
#: bzrlib/errors.py:1637
5378
msgid "Connection closed: %(msg)s %(orig_error)s"
5379
msgstr ""
5380
5381
#: bzrlib/errors.py:1642
5382
msgid "Connection Timeout: %(msg)s%(orig_error)s"
5383
msgstr ""
5384
5385
#: bzrlib/errors.py:1647
5386
msgid "Invalid range access in %(path)s at %(offset)s: %(msg)s"
5387
msgstr ""
5388
5389
#: bzrlib/errors.py:1657
5390
msgid "Invalid http response for %(path)s: %(msg)s%(orig_error)s"
5391
msgstr ""
5392
5393
#: bzrlib/errors.py:1672
5394
msgid "Invalid http range %(range)r for %(path)s: %(msg)s"
5395
msgstr ""
5396
5397
#: bzrlib/errors.py:1686
5398
msgid "HTTP MIME Boundary missing for %(path)s: %(msg)s"
5399
msgstr ""
5400
5401
#: bzrlib/errors.py:1694
5402
msgid "Invalid http Content-type \"%(ctype)s\" for %(path)s: %(msg)s"
5403
msgstr ""
5404
5405
#: bzrlib/errors.py:1703
5406
msgid "%(source)s is%(permanently)s redirected to %(target)s"
5407
msgstr ""
5408
5409
#: bzrlib/errors.py:1717
5410
msgid "Too many redirections"
5411
msgstr ""
5412
5413
#: bzrlib/errors.py:1722
5414
msgid "Working tree has conflicts."
5415
msgstr ""
5416
5417
#: bzrlib/errors.py:1726
5418
msgid "Config file %(filename)s is not UTF-8 encoded\n"
5419
msgstr ""
5420
5421
#: bzrlib/errors.py:1735
5422
msgid ""
5423
"Error(s) parsing config file %(filename)s:\n"
5424
"%(errors)s"
5425
msgstr ""
5426
5427
#: bzrlib/errors.py:1746
5428
msgid "Bad value \"%(value)s\" for option \"%(name)s\"."
5429
msgstr ""
5430
5431
#: bzrlib/errors.py:1754
5432
msgid "%(username)r does not seem to contain a reasonable email address"
5433
msgstr ""
5434
5435
#: bzrlib/errors.py:1763
5436
msgid "Failed to GPG sign data with command \"%(command_line)s\""
5437
msgstr ""
5438
5439
#: bzrlib/errors.py:1771
5440
msgid "Failed to verify GPG signature data with error \"%(error)s\""
5441
msgstr ""
5442
5443
#: bzrlib/errors.py:1779
5444
msgid "Unable to import library \"%(library)s\": %(error)s"
5445
msgstr ""
5446
5447
#: bzrlib/errors.py:1787
5448
msgid "python-gpgme is not installed, it is needed to verify signatures"
5449
msgstr ""
5450
5451
#: bzrlib/errors.py:1795
5452
msgid ""
5453
"The working tree for %(basedir)s has changed since the last commit, but "
5454
"weave merge requires that it be unchanged"
5455
msgstr ""
5456
5457
#: bzrlib/errors.py:1805
5458
msgid ""
5459
"Can't reprocess and show base, because reprocessing obscures the "
5460
"relationship of conflicting lines to the base"
5461
msgstr ""
5462
5463
#: bzrlib/errors.py:1811
5464
msgid "Cycle in graph %(graph)r"
5465
msgstr ""
5466
5467
#: bzrlib/errors.py:1839
5468
msgid "File %(filename)s is not conflicted."
5469
msgstr ""
5470
5471
#: bzrlib/errors.py:1861
5472
msgid "No bundle was found in \"%(filename)s\"."
5473
msgstr ""
5474
5475
#: bzrlib/errors.py:1870
5476
msgid "Unable to handle bundle version %(version)s: %(msg)s"
5477
msgstr ""
5478
5479
#: bzrlib/errors.py:1880
5480
msgid "Branch %(base)s is missing revision %(text_revision)s of %(file_id)s"
5481
msgstr ""
5482
5483
#: bzrlib/errors.py:1893
5484
msgid "File id {%(file_id)s} already exists in inventory as %(entry)s"
5485
msgstr ""
5486
5487
#: bzrlib/errors.py:1903
5488
msgid "Key %(key)s is already present in map"
5489
msgstr ""
5490
5491
#: bzrlib/errors.py:1908
5492
msgid "The prefix %(prefix)s is in the help search path twice."
5493
msgstr ""
5494
5495
#: bzrlib/errors.py:1918
5496
msgid ""
5497
"No final name for trans_id %(trans_id)r\n"
5498
"file-id: %(file_id)r\n"
5499
"root trans-id: %(root_trans_id)r\n"
5500
msgstr ""
5501
5502
#: bzrlib/errors.py:1950
5503
msgid "Attempt to reuse a transform that has already been applied."
5504
msgstr ""
5505
5506
#: bzrlib/errors.py:1955
5507
msgid "Moving the root directory is not supported at this time"
5508
msgstr ""
5509
5510
#: bzrlib/errors.py:1960
5511
msgid "Failed to rename %(from_path)s to %(to_path)s: %(why)s"
5512
msgstr ""
5513
5514
#: bzrlib/errors.py:1971
5515
msgid ""
5516
"Could not move %(from_path)s%(operator)s %(to_path)s%(_has_extra)s%(extra)s"
5517
msgstr ""
5518
5519
#: bzrlib/errors.py:2007
5520
msgid ""
5521
"Could not rename %(from_path)s%(operator)s %(to_path)s%(_has_extra)s%(extra)s"
5522
msgstr ""
5523
5524
#: bzrlib/errors.py:2037
5525
msgid "Unable to import paramiko (required for sftp support): %(error)s"
5526
msgstr ""
5527
5528
#: bzrlib/errors.py:2045
5529
msgid "Nothing to merge."
5530
msgstr ""
5531
5532
#: bzrlib/errors.py:2050
5533
msgid "Format %(format)s cannot be initialised by this version of bzr."
5534
msgstr ""
5535
5536
#: bzrlib/errors.py:2059
5537
msgid ""
5538
"Cannot convert from format %(from_format)s to format %(format)s. "
5539
"%(problem)s"
5540
msgstr ""
5541
5542
#: bzrlib/errors.py:2071
5543
msgid "Could not find an appropriate Differ for file \"%(path)s\""
5544
msgstr ""
5545
5546
#: bzrlib/errors.py:2079
5547
msgid "%(exe_name)s could not be found on this machine"
5548
msgstr ""
5549
5550
#: bzrlib/errors.py:2087
5551
msgid "Diff is not installed on this machine: %(msg)s"
5552
msgstr ""
5553
5554
#: bzrlib/errors.py:2095
5555
msgid "Diff3 is not installed on this machine."
5556
msgstr ""
5557
5558
#: bzrlib/errors.py:2101
5559
msgid "The content being inserted is already present."
5560
msgstr ""
5561
5562
#: bzrlib/errors.py:2106
5563
msgid ""
5564
"This tree contains left-over files from a failed operation.\n"
5565
" Please examine %(limbo_dir)s to see if it contains any files you wish "
5566
"to\n"
5567
" keep, and delete it when you are done."
5568
msgstr ""
5569
5570
#: bzrlib/errors.py:2117
5571
msgid ""
5572
"This tree contains left-over files from a failed operation.\n"
5573
" Please examine %(pending_deletion)s to see if it contains any files you\n"
5574
" wish to keep, and delete it when you are done."
5575
msgstr ""
5576
5577
#: bzrlib/errors.py:2127
5578
msgid ""
5579
"Unable to delete transform temporary directory %(limbo_dir)s.\n"
5580
" Please examine %(limbo_dir)s to see if it contains any files you wish "
5581
"to\n"
5582
" keep, and delete it when you are done."
5583
msgstr ""
5584
5585
#: bzrlib/errors.py:2138
5586
msgid ""
5587
"Unable to delete transform temporary directory %(pending_deletion)s. Please "
5588
"examine %(pending_deletion)s to see if it contains any files you wish to "
5589
"keep, and delete it when you are done."
5590
msgstr ""
5591
5592
#: bzrlib/errors.py:2148
5593
msgid "Working tree is out of date, please run 'bzr update'.%(more)s"
5594
msgstr ""
5595
5596
#: bzrlib/errors.py:2162
5597
msgid ""
5598
"Public branch \"%(public_location)s\" lacks revision \"%(revstring)s\"."
5599
msgstr ""
5600
5601
#: bzrlib/errors.py:2175
5602
msgid "Error in merge modified format"
5603
msgstr ""
5604
5605
#: bzrlib/errors.py:2180
5606
msgid "Format error in conflict listings"
5607
msgstr ""
5608
5609
#: bzrlib/errors.py:2184
5610
msgid ""
5611
"Inconsistency in dirstate file %(dirstate_path)s.\n"
5612
"Error: %(description)s"
5613
msgstr ""
5614
5615
#: bzrlib/errors.py:2195
5616
msgid ""
5617
"An error has been detected in the repository %(repo_path)s.\n"
5618
"Please run bzr reconcile on this repository."
5619
msgstr ""
5620
5621
#: bzrlib/errors.py:2206
5622
msgid ""
5623
"An inconsistent delta was supplied involving %(path)r, %(file_id)r\n"
5624
"reason: %(reason)s"
5625
msgstr ""
5626
5627
#: bzrlib/errors.py:2219
5628
msgid ""
5629
"An inconsistent delta was supplied: %(delta)r\n"
5630
"reason: %(reason)s"
5631
msgstr ""
5632
5633
#: bzrlib/errors.py:2231
5634
msgid "To use this feature you must upgrade your branch at %(path)s."
5635
msgstr ""
5636
5637
#: bzrlib/errors.py:2240
5638
msgid "To use this feature you must upgrade your repository at %(path)s."
5639
msgstr ""
5640
5641
#: bzrlib/errors.py:2245
5642
msgid ""
5643
"To use this feature you must upgrade your branch at %(path)s to a format "
5644
"which supports rich roots."
5645
msgstr ""
5646
5647
#: bzrlib/errors.py:2251
5648
msgid "Cannot perform local-only commits on unbound branches."
5649
msgstr ""
5650
5651
#: bzrlib/errors.py:2256
5652
msgid "The method %(mname)s is not supported on objects of type %(tname)s."
5653
msgstr ""
5654
5655
#: bzrlib/errors.py:2277
5656
msgid "Ghost tags not supported by format %(format)r."
5657
msgstr ""
5658
5659
#: bzrlib/errors.py:2285
5660
msgid "File is binary but should be text."
5661
msgstr ""
5662
5663
#: bzrlib/errors.py:2290
5664
msgid "The path %(path)s is not permitted on this platform"
5665
msgstr ""
5666
5667
#: bzrlib/errors.py:2299
5668
msgid ""
5669
"Testament did not match expected value.\n"
5670
" For revision_id {%(revision_id)s}, expected {%(expected)s}, measured\n"
5671
" {%(measured)s}"
5672
msgstr ""
5673
5674
#: bzrlib/errors.py:2311
5675
msgid "Not a bzr revision-bundle: %(text)r"
5676
msgstr ""
5677
5678
#: bzrlib/errors.py:2320
5679
msgid "Bad bzr revision-bundle: %(text)r"
5680
msgstr ""
5681
5682
#: bzrlib/errors.py:2329
5683
msgid "Malformed bzr revision-bundle header: %(text)r"
5684
msgstr ""
5685
5686
#: bzrlib/errors.py:2334
5687
msgid "Malformed patches in bzr revision-bundle: %(text)r"
5688
msgstr ""
5689
5690
#: bzrlib/errors.py:2339
5691
msgid "Malformed footer in bzr revision-bundle: %(text)r"
5692
msgstr ""
5693
5694
#: bzrlib/errors.py:2344
5695
msgid "End of line marker was not \\n in bzr revision-bundle"
5696
msgstr ""
5697
5698
#: bzrlib/errors.py:2354
5699
msgid "Bundle format %(bundle_format)s is incompatible with %(other)s"
5700
msgstr ""
5701
5702
#: bzrlib/errors.py:2364
5703
msgid "Root class for inventory serialization errors"
5704
msgstr ""
5705
5706
#: bzrlib/errors.py:2368
5707
msgid ""
5708
"The inventory was not in the expected format:\n"
5709
" %(msg)s"
5710
msgstr ""
5711
5712
#: bzrlib/errors.py:2377
5713
msgid "This operation requires rich root data storage"
5714
msgstr ""
5715
5716
#: bzrlib/errors.py:2390
5717
msgid "Unrecognised value for BZR_SSH environment variable: %(vendor)s"
5718
msgstr ""
5719
5720
#: bzrlib/errors.py:2399
5721
msgid ""
5722
"Don't know how to handle SSH connections. Please set BZR_SSH environment "
5723
"variable."
5724
msgstr ""
5725
5726
#: bzrlib/errors.py:2406
5727
msgid ""
5728
"Could not determine revno for {%(revision_id)s} because its ancestry shows a "
5729
"ghost at {%(ghost_revision_id)s}"
5730
msgstr ""
5731
5732
#: bzrlib/errors.py:2416
5733
msgid "Ghost revision {%(revision_id)s} cannot be used here."
5734
msgstr ""
5735
5736
#: bzrlib/errors.py:2467
5737
msgid ""
5738
"A merge directive must provide either a bundle or a public branch location."
5739
msgstr ""
5740
5741
#: bzrlib/errors.py:2474
5742
msgid "Bad merge directive payload %(start)r"
5743
msgstr ""
5744
5745
#: bzrlib/errors.py:2484
5746
msgid "Preview patch does not match requested changes."
5747
msgstr ""
5748
5749
#: bzrlib/errors.py:2490
5750
msgid "Patch_type was %(patch_type)s, but no patch was supplied."
5751
msgstr ""
5752
5753
#: bzrlib/errors.py:2500
5754
msgid ""
5755
"Your branch does not have all of the revisions required in order to merge "
5756
"this merge directive and the target location specified in the merge "
5757
"directive is not a branch: %(location)s."
5758
msgstr ""
5759
5760
#: bzrlib/errors.py:2512
5761
msgid "Unsupported entry kind %(kind)s"
5762
msgstr ""
5763
5764
#: bzrlib/errors.py:2520
5765
msgid "Can't subsume %(other_tree)s into %(tree)s. %(reason)s"
5766
msgstr ""
5767
5768
#: bzrlib/errors.py:2530
5769
msgid "Subsume target %(other_tree)s needs to be upgraded."
5770
msgstr ""
5771
5772
#: bzrlib/errors.py:2549
5773
msgid "No such tag: %(tag_name)s"
5774
msgstr ""
5775
5776
#: bzrlib/errors.py:2557
5777
msgid "Tags not supported by %(branch)s; you may be able to use bzr upgrade."
5778
msgstr ""
5779
5780
#: bzrlib/errors.py:2566
5781
msgid "Tag %(tag_name)s already exists."
5782
msgstr ""
5783
5784
#: bzrlib/errors.py:2574
5785
msgid ""
5786
"Did not understand bug identifier %(bug_id)s: %(reason)s. See \"bzr help "
5787
"bugs\" for more information on this feature."
5788
msgstr ""
5789
5790
#: bzrlib/errors.py:2584
5791
msgid ""
5792
"The URL for bug tracker \"%(abbreviation)s\" doesn't contain {id}: %(url)s"
5793
msgstr ""
5794
5795
#: bzrlib/errors.py:2594
5796
msgid ""
5797
"Cannot find registered bug tracker called %(abbreviation)s on %(branch)s"
5798
msgstr ""
5799
5800
#: bzrlib/errors.py:2604
5801
msgid "Invalid line in bugs property: '%(line)s'"
5802
msgstr ""
5803
5804
#: bzrlib/errors.py:2612
5805
msgid "Invalid bug status: '%(status)s'"
5806
msgstr ""
5807
5808
#: bzrlib/errors.py:2620
5809
msgid "Could not understand response from smart server: %(response_tuple)r"
5810
msgstr ""
5811
5812
#: bzrlib/errors.py:2659
5813
msgid "Server sent an unexpected error: %(error_tuple)r"
5814
msgstr ""
5815
5816
#: bzrlib/errors.py:2678
5817
msgid "Unrecognised container format: %(container_format)r"
5818
msgstr ""
5819
5820
#: bzrlib/errors.py:2686
5821
msgid "Unexpected end of container stream"
5822
msgstr ""
5823
5824
#: bzrlib/errors.py:2691
5825
msgid "Unknown record type: %(record_type)r"
5826
msgstr ""
5827
5828
#: bzrlib/errors.py:2699
5829
msgid "Invalid record: %(reason)s"
5830
msgstr ""
5831
5832
#: bzrlib/errors.py:2707
5833
msgid "Container has data after end marker: %(excess)r"
5834
msgstr ""
5835
5836
#: bzrlib/errors.py:2715
5837
msgid "Container has multiple records with the same name: %(name)s"
5838
msgstr ""
5839
5840
#: bzrlib/errors.py:2728
5841
msgid "Corrupt or incompatible data stream: %(reason)s"
5842
msgstr ""
5843
5844
#: bzrlib/errors.py:2736
5845
msgid "SMTP error: %(error)s"
5846
msgstr ""
5847
5848
#: bzrlib/errors.py:2744
5849
msgid "No message supplied."
5850
msgstr ""
5851
5852
#: bzrlib/errors.py:2749
5853
msgid "No mail-to address (--mail-to) or output (-o) specified."
5854
msgstr ""
5855
5856
#: bzrlib/errors.py:2754
5857
msgid "Unknown mail client: %(mail_client)s"
5858
msgstr ""
5859
5860
#: bzrlib/errors.py:2762
5861
msgid ""
5862
"Unable to find mail client with the following names: "
5863
"%(mail_command_list_string)s"
5864
msgstr ""
5865
5866
#: bzrlib/errors.py:2772
5867
msgid "SMTP connection to %(host)s refused"
5868
msgstr ""
5869
5870
#: bzrlib/errors.py:2781
5871
msgid "Please specify smtp_server. No server at default %(host)s."
5872
msgstr ""
5873
5874
#: bzrlib/errors.py:2795
5875
msgid ""
5876
"'%(display_url)s' is not in sync with %(target_url)s. See bzr help sync-for-"
5877
"reconfigure."
5878
msgstr ""
5879
5880
#: bzrlib/errors.py:2807
5881
msgid "'%(display_url)s' is already a branch."
5882
msgstr ""
5883
5884
#: bzrlib/errors.py:2812
5885
msgid "'%(display_url)s' is already a tree."
5886
msgstr ""
5887
5888
#: bzrlib/errors.py:2817
5889
msgid "'%(display_url)s' is already a checkout."
5890
msgstr ""
5891
5892
#: bzrlib/errors.py:2822
5893
msgid "'%(display_url)s' is already a lightweight checkout."
5894
msgstr ""
5895
5896
#: bzrlib/errors.py:2827
5897
msgid "'%(display_url)s' is already using a shared repository."
5898
msgstr ""
5899
5900
#: bzrlib/errors.py:2832
5901
msgid "'%(display_url)s' is already standalone."
5902
msgstr ""
5903
5904
#: bzrlib/errors.py:2837
5905
msgid "Shared repository '%(display_url)s' already creates working trees."
5906
msgstr ""
5907
5908
#: bzrlib/errors.py:2843
5909
msgid ""
5910
"Shared repository '%(display_url)s' already doesn't create working trees."
5911
msgstr ""
5912
5913
#: bzrlib/errors.py:2849
5914
msgid "Requested reconfiguration of '%(display_url)s' is not supported."
5915
msgstr ""
5916
5917
#: bzrlib/errors.py:2854
5918
msgid "No location could be found to bind to at %(display_url)s."
5919
msgstr ""
5920
5921
#: bzrlib/errors.py:2859
5922
msgid ""
5923
"Working tree \"%(display_url)s\" has uncommitted changes (See bzr "
5924
"status).%(more)s"
5925
msgstr ""
5926
5927
#: bzrlib/errors.py:2878
5928
msgid ""
5929
"Working tree \"%(display_url)s\" has shelved changes (See bzr shelve --"
5930
"list).%(more)s"
5931
msgstr ""
5932
5933
#: bzrlib/errors.py:2884
5934
msgid "Variable {%(name)s} is not available."
5935
msgstr ""
5936
5937
#: bzrlib/errors.py:2892
5938
msgid "No template specified."
5939
msgstr ""
5940
5941
#: bzrlib/errors.py:2897
5942
msgid "Unable to create symlink %(path_str)son this platform"
5943
msgstr ""
5944
5945
#: bzrlib/errors.py:2912
5946
msgid ""
5947
"Unsupported timezone format \"%(timezone)s\", options are \"utc\", "
5948
"\"original\", \"local\"."
5949
msgstr ""
5950
5951
#: bzrlib/errors.py:2946
5952
msgid ""
5953
"Unable to encode %(kind)s path %(path)r in user encoding %(user_encoding)s"
5954
msgstr ""
5955
5956
#: bzrlib/errors.py:2958
5957
msgid "The \"%(config_id)s\" configuration does not exist."
5958
msgstr ""
5959
5960
#: bzrlib/errors.py:2966
5961
msgid "The \"%(option_name)s\" configuration option does not exist."
5962
msgstr ""
5963
5964
#: bzrlib/errors.py:2974
5965
msgid "The alias \"%(alias_name)s\" does not exist."
5966
msgstr ""
5967
5968
#: bzrlib/errors.py:2988
5969
msgid "\"%(alias_name)s\" is not a valid location alias."
5970
msgstr ""
5971
5972
#: bzrlib/errors.py:2996
5973
msgid "No %(alias_name)s location assigned."
5974
msgstr ""
5975
5976
#: bzrlib/errors.py:3004
5977
msgid "Cannot bind address \"%(host)s:%(port)i\": %(orig_error)s."
5978
msgstr ""
5979
5980
#: bzrlib/errors.py:3014
5981
msgid "Unknown rules detected: %(unknowns_str)s."
5982
msgstr ""
5983
5984
#: bzrlib/errors.py:3025
5985
msgid "Tip change rejected: %(msg)s"
5986
msgstr ""
5987
5988
#: bzrlib/errors.py:3033
5989
msgid "Shelf corrupt."
5990
msgstr ""
5991
5992
#: bzrlib/errors.py:3038
5993
msgid "Corruption while decompressing repository file%(orig_error)s"
5994
msgstr ""
5995
5996
#: bzrlib/errors.py:3050
5997
msgid "No changes are shelved with id \"%(shelf_id)d\"."
5998
msgstr ""
5999
6000
#: bzrlib/errors.py:3058
6001
msgid "\"%(invalid_id)s\" is not a valid shelf id, try a number instead."
6002
msgstr ""
6003
6004
#: bzrlib/errors.py:3066
6005
msgid ""
6006
"An attempt to access a url outside the server jail was made: '%(url)s'."
6007
msgstr ""
6008
6009
#: bzrlib/errors.py:3074
6010
msgid "The user aborted the operation."
6011
msgstr ""
6012
6013
#: bzrlib/errors.py:3079
6014
msgid "Branching '%(url)s'(%(format)s) must create a working tree."
6015
msgstr ""
6016
6017
#: bzrlib/errors.py:3089
6018
msgid "No such view: %(view_name)s."
6019
msgstr ""
6020
6021
#: bzrlib/errors.py:3099
6022
msgid ""
6023
"Views are not supported by %(tree)s; use 'bzr upgrade' to change your tree "
6024
"to a later format."
6025
msgstr ""
6026
6027
#: bzrlib/errors.py:3108
6028
msgid ""
6029
"Specified file \"%(file_name)s\" is outside the current view: %(view_str)s"
6030
msgstr ""
6031
6032
#: bzrlib/errors.py:3175
6033
msgid "%(bzrdir)r does not support co-located branches."
6034
msgstr ""
6035
6036
#: bzrlib/errors.py:3181
6037
msgid ""
6038
"Unable to determine your name.\n"
6039
"Please, set your name with the 'whoami' command.\n"
6040
"E.g. bzr whoami \"Your Name <name@example.com>\""
6041
msgstr ""
6042
6043
#: bzrlib/errors.py:3190
6044
msgid "Invalid pattern(s) found. %(msg)s"
6045
msgstr ""
6046
6047
#: bzrlib/errors.py:3198
6048
msgid ""
6049
"Branch \"%(branch_url)s\" appears to be bound to itself. Please use `bzr "
6050
"unbind` to fix."
6051
msgstr ""
6052
6053
#: bzrlib/errors.py:3209
6054
msgid "Loop involving %(refs)r while expanding \"%(string)s\"."
6055
msgstr ""
6056
6057
#: bzrlib/errors.py:3218
6058
msgid "Option %(name)s is not defined while expanding \"%(string)s\"."
6059
msgstr ""
6060
6061
#: bzrlib/errors.py:3227
6062
msgid ""
6063
"No compatible object available for operations from %(source)r to %(target)r."
6064
msgstr ""
6065
6066
#: bzrlib/errors.py:3237
6067
msgid ""
6068
"VFS requests over the smart server are not allowed. Encountered: %(method)s, "
6069
"%(arguments)s."
6070
msgstr ""
6071
6072
#: bzrlib/errors.py:3247
6073
msgid ""
6074
"Kind change from %(from_kind)s to %(to_kind)s for %(path)s not supported by "
6075
"format %(format)r"
6076
msgstr ""
6077
6078
#: bzrlib/errors.py:3259
6079
msgid ""
6080
"Missing feature %(feature)s not provided by this version of Bazaar or any "
6081
"plugin."
6082
msgstr ""
6083
6084
#: bzrlib/errors.py:3272
6085
msgid "Binary files section encountered."
6086
msgstr ""
6087
6088
#: bzrlib/errors.py:3280
6089
msgid ""
6090
"Malformed patch header. %(desc)s\n"
6091
"%(line)r"
6092
msgstr ""
6093
6094
#: bzrlib/errors.py:3289
6095
msgid ""
6096
"Malformed hunk header. %(desc)s\n"
6097
"%(line)r"
6098
msgstr ""
6099
6100
#: bzrlib/errors.py:3298
6101
msgid ""
6102
"Malformed line. %(desc)s\n"
6103
"%(line)r"
6104
msgstr ""
6105
6106
#: bzrlib/errors.py:3308
6107
msgid ""
6108
"Text contents mismatch at line %(line_no)d. Original has \"%(orig_line)s\", "
6109
"but patch says it should be \"%(patch_line)s\""
6110
msgstr ""
6111
6112
#: bzrlib/errors.py:3319
6113
msgid "The feature %(feature)s has already been registered."
6114
msgstr ""
6115
6116
#: bzrlib/export_pot.py:252
6117
#, python-format
6118
msgid "Exporting messages from builtin command: %s"
6119
msgstr ""
6120
6121
#: bzrlib/export_pot.py:271
6122
msgid "Exporting messages from plugin command: {0} in {1}"
6123
msgstr ""
6124
6125
#: bzrlib/export_pot.py:292
6126
#, python-format
6127
msgid "Exporting message from error: %s"
6128
msgstr ""
6129
6130
#: bzrlib/fetch.py:98
6131
msgid "Finding revisions"
6132
msgstr ""
6133
6134
#: bzrlib/fetch.py:103
6135
msgid "Fetching revisions"
6136
msgstr ""
6137
6138
#: bzrlib/foreign.py:262
6139
msgid "Push into a different VCS without any custom bzr metadata."
6140
msgstr ""
6141
6142
#: bzrlib/foreign.py:264
6143
msgid ""
6144
"This will afterwards rebase the local branch on the remote\n"
6145
"branch unless the --no-rebase option is used, in which case \n"
6146
"the two branches will be out of sync after the push. "
6147
msgstr ""
6148
6149
#: bzrlib/foreign.py:277
6150
msgid "Do not rebase after push."
6151
msgstr ""
6152
6153
#: bzrlib/foreign.py:311
6154
#, python-format
6155
msgid "Using saved location: %s\n"
6156
msgstr ""
6157
6158
#: bzrlib/foreign.py:321
6159
msgid ""
6160
"{0!r} and {1!r} are in the same VCS, lossy push not necessary. Please use "
6161
"regular push."
6162
msgstr ""
6163
6164
#: bzrlib/gpg.py:119 bzrlib/gpg.py:460
6165
msgid "{0} commits with valid signatures"
6166
msgstr ""
6167
6168
#: bzrlib/gpg.py:123 bzrlib/gpg.py:465
6169
msgid "{0} commit with unknown key"
6170
msgid_plural "{0} commits with unknown keys"
6171
msgstr[0] ""
6172
msgstr[1] ""
6173
6174
#: bzrlib/gpg.py:129 bzrlib/gpg.py:472
6175
msgid "{0} commit not valid"
6176
msgid_plural "{0} commits not valid"
6177
msgstr[0] ""
6178
msgstr[1] ""
6179
6180
#: bzrlib/gpg.py:135 bzrlib/gpg.py:479
6181
msgid "{0} commit not signed"
6182
msgid_plural "{0} commits not signed"
6183
msgstr[0] ""
6184
msgstr[1] ""
6185
6186
#: bzrlib/gpg.py:141 bzrlib/gpg.py:486
6187
msgid "{0} commit with key now expired"
6188
msgid_plural "{0} commits with key now expired"
6189
msgstr[0] ""
6190
msgstr[1] ""
6191
6192
#: bzrlib/gpg.py:343
6193
msgid "No GnuPG key results for pattern: {0}"
6194
msgstr ""
6195
6196
#: bzrlib/gpg.py:386
6197
msgid "{0} signed {1} commit"
6198
msgid_plural "{0} signed {1} commits"
6199
msgstr[0] ""
6200
msgstr[1] ""
6201
6202
#: bzrlib/gpg.py:403 bzrlib/gpg.py:419
6203
msgid "{0} commit by author {1}"
6204
msgid_plural "{0} commits by author {1}"
6205
msgstr[0] ""
6206
msgstr[1] ""
6207
6208
#: bzrlib/gpg.py:433
6209
msgid "Unknown key {0} signed {1} commit"
6210
msgid_plural "Unknown key {0} signed {1} commits"
6211
msgstr[0] ""
6212
msgstr[1] ""
6213
6214
#: bzrlib/gpg.py:452
6215
msgid "{0} commit by author {1} with key {2} now expired"
6216
msgid_plural "{0} commits by author {1} with key {2} now expired"
6217
msgstr[0] ""
6218
msgstr[1] ""
6219
6220
#: bzrlib/groupcompress.py:1739
6221
#, python-format
6222
msgid "Insert claimed random_id=True, but then inserted %r two times"
6223
msgstr ""
6224
6225
#: bzrlib/hooks.py:331
6226
#, python-format
6227
msgid "Introduced in: %s"
6228
msgstr ""
6229
6230
#: bzrlib/hooks.py:334
6231
#, python-format
6232
msgid "Deprecated in: %s"
6233
msgstr ""
6234
6235
#: bzrlib/knit.py:1766 bzrlib/knit.py:1802
6236
msgid "Walking content"
6237
msgstr ""
6238
6239
#: bzrlib/knit.py:3330
6240
msgid "annotating"
6241
msgstr ""
6242
6243
#: bzrlib/lock.py:548
6244
msgid "{0!r} was {1} locked again"
6245
msgstr ""
6246
6247
#: bzrlib/lockdir.py:321
6248
#, python-format
6249
msgid "error removing pending lock: %s"
6250
msgstr ""
6251
6252
#: bzrlib/lockdir.py:616
6253
msgid "Unable to obtain"
6254
msgstr ""
6255
6256
#: bzrlib/lockdir.py:618
6257
msgid "Lock owner changed for"
6258
msgstr ""
6259
6260
#: bzrlib/lockdir.py:620
6261
msgid "{0} lock {1} {2}."
6262
msgstr ""
6263
6264
#: bzrlib/lockdir.py:627
6265
#, python-format
6266
msgid "Will continue to try until %s, unless you press Ctrl-C."
6267
msgstr ""
6268
6269
#: bzrlib/lockdir.py:629
6270
msgid "See \"bzr help break-lock\" for more."
6271
msgstr ""
6272
6273
#: bzrlib/lockdir.py:739
6274
#, python-format
6275
msgid ""
6276
"held by %(user)s on %(hostname)s (process #%(pid)s), acquired %(time_ago)s"
6277
msgstr ""
6278
6279
#: bzrlib/log.py:572
6280
msgid "--exclude-common-ancestry requires two different revisions"
6281
msgstr ""
6282
6283
#: bzrlib/log.py:574
6284
#, python-format
6285
msgid "invalid direction %r"
6286
msgstr ""
6287
6288
#: bzrlib/log.py:662
6289
msgid "Start revision not found in history of end revision."
6290
msgstr ""
6291
6292
#: bzrlib/log.py:1080 bzrlib/log.py:1138
6293
msgid "Logging revision 0 is invalid."
6294
msgstr ""
6295
6296
#: bzrlib/log.py:1082 bzrlib/log.py:1140
6297
msgid "Start revision must be older than the end revision."
6298
msgstr ""
6299
6300
#: bzrlib/log.py:1827
6301
#, python-format
6302
msgid "unknown log formatter: %r"
6303
msgstr ""
6304
6305
#: bzrlib/log.py:2123
6306
msgid "fixes bug"
6307
msgid_plural "fixes bugs"
6308
msgstr[0] ""
6309
msgstr[1] ""
6310
6311
#: bzrlib/merge.py:689
6312
msgid "All changes applied successfully."
6313
msgstr ""
6314
6315
#: bzrlib/merge.py:691
6316
#, python-format
6317
msgid "%d conflicts encountered."
6318
msgstr ""
6319
6320
#: bzrlib/merge.py:845 bzrlib/merge.py:1933
6321
msgid "Preparing file merge"
6322
msgstr ""
6323
6324
#: bzrlib/multiparent.py:426
6325
msgid "Importing revisions"
6326
msgstr ""
6327
6328
#: bzrlib/option.py:526
6329
msgid "Show help message."
6330
msgstr ""
6331
6332
#: bzrlib/option.py:528
6333
msgid "Only display errors and warnings."
6334
msgstr ""
6335
6336
#: bzrlib/option.py:531
6337
msgid "Show usage message and options."
6338
msgstr ""
6339
6340
#: bzrlib/option.py:533
6341
msgid "Display more information."
6342
msgstr ""
6343
6344
#: bzrlib/option.py:541
6345
msgid ""
6346
"Select changes introduced by the specified revision. See also \"help "
6347
"revisionspec\"."
6348
msgstr ""
6349
6350
#: bzrlib/option.py:543
6351
msgid "Branch to operate on, instead of working directory."
6352
msgstr ""
6353
6354
#: bzrlib/option.py:545
6355
msgid "Detailed log format."
6356
msgstr ""
6357
6358
#: bzrlib/option.py:545
6359
msgid "Format used by GNU ChangeLog files."
6360
msgstr ""
6361
6362
#: bzrlib/option.py:545
6363
msgid "Log format with one line per revision."
6364
msgstr ""
6365
6366
#: bzrlib/option.py:545
6367
msgid "Moderately short log format."
6368
msgstr ""
6369
6370
#: bzrlib/option.py:545
6371
msgid "Use specified log format."
6372
msgstr ""
6373
6374
#: bzrlib/option.py:547
6375
msgid "Log format"
6376
msgstr ""
6377
6378
#: bzrlib/option.py:549
6379
msgid "LCA-newness merge."
6380
msgstr ""
6381
6382
#: bzrlib/option.py:549
6383
msgid "Merge using external diff3."
6384
msgstr ""
6385
6386
#: bzrlib/option.py:549
6387
msgid "Native diff3-style merge."
6388
msgstr ""
6389
6390
#: bzrlib/option.py:549
6391
msgid "Select a particular merge algorithm."
6392
msgstr ""
6393
6394
#: bzrlib/option.py:549
6395
msgid "Weave-based merge."
6396
msgstr ""
6397
6398
#: bzrlib/option.py:551
6399
msgid "Merge algorithm"
6400
msgstr ""
6401
6402
#: bzrlib/option.py:554
6403
msgid "Message string."
6404
msgstr ""
6405
6406
#: bzrlib/option.py:556
6407
msgid "Use an ASCII NUL (\\0) separator rather than a newline."
6408
msgstr ""
6409
6410
#: bzrlib/option.py:558
6411
msgid "Ignore differences between branches and overwrite unconditionally."
6412
msgstr ""
6413
6414
#: bzrlib/option.py:560
6415
msgid "Remember the specified location as a default."
6416
msgstr ""
6417
6418
#: bzrlib/option.py:562
6419
msgid "Reprocess to reduce spurious conflicts."
6420
msgstr ""
6421
6422
#: bzrlib/option.py:566
6423
msgid "See \"help revisionspec\" for details."
6424
msgstr ""
6425
6426
#: bzrlib/option.py:568
6427
msgid "Show internal object ids."
6428
msgstr ""
6429
6430
#: bzrlib/option.py:571
6431
msgid "Display timezone as local, original, or utc."
6432
msgstr ""
6433
6434
#: bzrlib/osutils.py:100
6435
msgid "Parameter {0!r} encoding is unsupported by {1} application locale."
6436
msgstr ""
6437
6438
#: bzrlib/osutils.py:220
6439
msgid "lstat/stat of ({0!r}): {1!r}"
6440
msgstr ""
6441
6442
#: bzrlib/osutils.py:997 bzrlib/osutils.py:1008
6443
#, python-format
6444
msgid "sorry, %r not allowed in path"
6445
msgstr ""
6446
6447
#: bzrlib/osutils.py:1226
6448
#, python-format
6449
msgid "%r is too short to calculate a relative path"
6450
msgstr ""
6451
6452
#: bzrlib/plugin.py:143
6453
#, python-format
6454
msgid "\"%s\" is not a valid <plugin_name>@<plugin_path> description "
6455
msgstr ""
6456
6457
#: bzrlib/plugins/bash_completion/bashcomp.py:411
6458
msgid "Enable completions for the selected plugin (default: all plugins)"
6459
msgstr ""
6460
6461
#: bzrlib/plugins/bash_completion/bashcomp.py:412
6462
msgid "Generate a shell function for bash command line completion."
6463
msgstr ""
6464
6465
#: bzrlib/plugins/bash_completion/bashcomp.py:414
6466
msgid ""
6467
"This command generates a shell function which can be used by bash to\n"
6468
"automatically complete the currently typed command when the user presses\n"
6469
"the completion key (usually tab)."
6470
msgstr ""
6471
6472
#: bzrlib/plugins/bash_completion/bashcomp.py:418
6473
msgid ""
6474
"Commonly used like this:\n"
6475
" eval \"`bzr bash-completion`\""
6476
msgstr ""
6477
6478
#: bzrlib/plugins/bash_completion/bashcomp.py:424
6479
msgid "Name of the generated function (default: _bzr)"
6480
msgstr ""
6481
6482
#: bzrlib/plugins/bash_completion/bashcomp.py:426
6483
msgid "Generate only the shell function, don't enable it"
6484
msgstr ""
6485
6486
#: bzrlib/plugins/launchpad/__init__.py:81
6487
msgid "Register a branch with launchpad.net."
6488
msgstr ""
6489
6490
#: bzrlib/plugins/launchpad/__init__.py:83
6491
msgid ""
6492
"This command lists a bzr branch in the directory of branches on\n"
6493
"launchpad.net. Registration allows the branch to be associated with\n"
6494
"bugs or specifications."
6495
msgstr ""
6496
6497
#: bzrlib/plugins/launchpad/__init__.py:87
6498
msgid ""
6499
"Before using this command you must register the project to which the\n"
6500
"branch belongs, and create an account for yourself on launchpad.net."
6501
msgstr ""
6502
6503
#: bzrlib/plugins/launchpad/__init__.py:90
6504
msgid ""
6505
"arguments:\n"
6506
" public_url: The publicly visible url for the branch to register.\n"
6507
" This must be an http or https url (which Launchpad can read\n"
6508
" from to access the branch). Local file urls, SFTP urls, and\n"
6509
" bzr+ssh urls will not work.\n"
6510
" If no public_url is provided, bzr will use the configured\n"
6511
" public_url if there is one for the current branch, and\n"
6512
" otherwise error."
6513
msgstr ""
6514
6515
#: bzrlib/plugins/launchpad/__init__.py:99
6516
msgid ""
6517
"example:\n"
6518
" bzr register-branch http://foo.com/bzr/fooproject.mine \\\n"
6519
" --project fooproject"
6520
msgstr ""
6521
6522
#: bzrlib/plugins/launchpad/__init__.py:106
6523
msgid "Launchpad project short name to associate with the branch."
6524
msgstr ""
6525
6526
#: bzrlib/plugins/launchpad/__init__.py:113
6527
msgid ""
6528
"Short name for the branch; by default taken from the last component of the "
6529
"url."
6530
msgstr ""
6531
6532
#: bzrlib/plugins/launchpad/__init__.py:117
6533
msgid "One-sentence description of the branch."
6534
msgstr ""
6535
6536
#: bzrlib/plugins/launchpad/__init__.py:120
6537
msgid "Longer description of the purpose or contents of the branch."
6538
msgstr ""
6539
6540
#: bzrlib/plugins/launchpad/__init__.py:123
6541
msgid "Branch author's email address, if not yourself."
6542
msgstr ""
6543
6544
#: bzrlib/plugins/launchpad/__init__.py:126
6545
msgid "The bug this branch fixes."
6546
msgstr ""
6547
6548
#: bzrlib/plugins/launchpad/__init__.py:129
6549
msgid "Prepare the request but don't actually send it."
6550
msgstr ""
6551
6552
#: bzrlib/plugins/launchpad/__init__.py:151
6553
msgid ""
6554
"register-branch requires a public branch url - see bzr help register-branch."
6555
msgstr ""
6556
6557
#: bzrlib/plugins/launchpad/__init__.py:159
6558
msgid "--product is deprecated; please use --project."
6559
msgstr ""
6560
6561
#: bzrlib/plugins/launchpad/__init__.py:191
6562
msgid "Open a Launchpad branch page in your web browser."
6563
msgstr ""
6564
6565
#: bzrlib/plugins/launchpad/__init__.py:196
6566
msgid "Do not actually open the browser. Just say the URL we would use."
6567
msgstr ""
6568
6569
#: bzrlib/plugins/launchpad/__init__.py:231
6570
#, python-format
6571
msgid "Opening %s in web browser"
6572
msgstr ""
6573
6574
#: bzrlib/plugins/launchpad/__init__.py:241
6575
msgid "Show or set the Launchpad user ID."
6576
msgstr ""
6577
6578
#: bzrlib/plugins/launchpad/__init__.py:243
6579
msgid ""
6580
"When communicating with Launchpad, some commands need to know your\n"
6581
"Launchpad user ID. This command can be used to set or show the\n"
6582
"user ID that Bazaar will use for such communication."
6583
msgstr ""
6584
6585
#: bzrlib/plugins/launchpad/__init__.py:247
6586
msgid ""
6587
":Examples:\n"
6588
" Show the Launchpad ID of the current user::"
6589
msgstr ""
6590
6591
#: bzrlib/plugins/launchpad/__init__.py:250
6592
msgid " bzr launchpad-login"
6593
msgstr ""
6594
6595
#: bzrlib/plugins/launchpad/__init__.py:252
6596
msgid " Set the Launchpad ID of the current user to 'bob'::"
6597
msgstr ""
6598
6599
#: bzrlib/plugins/launchpad/__init__.py:254
6600
msgid " bzr launchpad-login bob"
6601
msgstr ""
6602
6603
#: bzrlib/plugins/launchpad/__init__.py:261
6604
msgid "Don't check that the user name is valid."
6605
msgstr ""
6606
6607
#: bzrlib/plugins/launchpad/__init__.py:276
6608
#: bzrlib/plugins/launchpad/__init__.py:287
6609
msgid "Launchpad user ID exists and has SSH keys.\n"
6610
msgstr ""
6611
6612
#: bzrlib/plugins/launchpad/__init__.py:279
6613
msgid "No Launchpad user ID configured.\n"
6614
msgstr ""
6615
6616
#: bzrlib/plugins/launchpad/__init__.py:290
6617
#, python-format
6618
msgid "Launchpad user ID set to '%s'.\n"
6619
msgstr ""
6620
6621
#: bzrlib/plugins/launchpad/__init__.py:298
6622
msgid "Ask Launchpad to mirror a branch now."
6623
msgstr ""
6624
6625
#: bzrlib/plugins/launchpad/__init__.py:318
6626
msgid "Propose merging a branch on Launchpad."
6627
msgstr ""
6628
6629
#: bzrlib/plugins/launchpad/__init__.py:320
6630
msgid ""
6631
"This will open your usual editor to provide the initial comment. When it\n"
6632
"has created the proposal, it will open it in your default web browser."
6633
msgstr ""
6634
6635
#: bzrlib/plugins/launchpad/__init__.py:323
6636
msgid ""
6637
"The branch will be proposed to merge into SUBMIT_BRANCH. If SUBMIT_BRANCH\n"
6638
"is not supplied, the remembered submit branch will be used. If no submit\n"
6639
"branch is remembered, the development focus will be used."
6640
msgstr ""
6641
6642
#: bzrlib/plugins/launchpad/__init__.py:327
6643
msgid ""
6644
"By default, the SUBMIT_BRANCH's review team will be requested to review\n"
6645
"the merge proposal. This can be overriden by specifying --review (-R).\n"
6646
"The parameter the launchpad account name of the desired reviewer. This\n"
6647
"may optionally be followed by '=' and the review type. For example:"
6648
msgstr ""
6649
6650
#: bzrlib/plugins/launchpad/__init__.py:332
6651
msgid " bzr lp-propose-merge --review jrandom --review review-team=qa"
6652
msgstr ""
6653
6654
#: bzrlib/plugins/launchpad/__init__.py:334
6655
msgid ""
6656
"This will propose a merge, request \"jrandom\" to perform a review of\n"
6657
"unspecified type, and request \"review-team\" to perform a \"qa\" review."
6658
msgstr ""
6659
6660
#: bzrlib/plugins/launchpad/__init__.py:339
6661
msgid "Propose the merge on staging."
6662
msgstr ""
6663
6664
#: bzrlib/plugins/launchpad/__init__.py:341
6665
msgid "Commit message."
6666
msgstr ""
6667
6668
#: bzrlib/plugins/launchpad/__init__.py:343
6669
msgid "Mark the proposal as approved immediately."
6670
msgstr ""
6671
6672
#: bzrlib/plugins/launchpad/__init__.py:345
6673
msgid "Requested reviewer and optional type."
6674
msgstr ""
6675
6676
#: bzrlib/plugins/launchpad/__init__.py:382
6677
msgid "Find the proposal to merge this revision."
6678
msgstr ""
6679
6680
#: bzrlib/plugins/launchpad/__init__.py:384
6681
msgid ""
6682
"Finds the merge proposal(s) that discussed landing the specified revision.\n"
6683
"This works only if the selected branch was the merge proposal target, and\n"
6684
"if the merged_revno is recorded for the merge proposal. The proposal(s)\n"
6685
"are opened in a web browser."
6686
msgstr ""
6687
6688
#: bzrlib/plugins/launchpad/__init__.py:389
6689
msgid ""
6690
"Any revision involved in the merge may be specified-- the revision in\n"
6691
"which the merge was performed, or one of the revisions that was merged."
6692
msgstr ""
6693
6694
#: bzrlib/plugins/launchpad/__init__.py:392
6695
msgid "So, to find the merge proposal that reviewed line 1 of README::"
6696
msgstr ""
6697
6698
#: bzrlib/plugins/launchpad/__init__.py:394
6699
msgid " bzr lp-find-proposal -r annotate:README:1"
6700
msgstr ""
6701
6702
#: bzrlib/plugins/launchpad/__init__.py:409
6703
msgid "No review found."
6704
msgstr ""
6705
6706
#: bzrlib/plugins/launchpad/__init__.py:410
6707
#, python-format
6708
msgid "%d proposals(s) found."
6709
msgstr ""
6710
6711
#: bzrlib/plugins/launchpad/__init__.py:420
6712
msgid "Finding revision-id"
6713
msgstr ""
6714
6715
#: bzrlib/plugins/launchpad/__init__.py:427
6716
msgid "Finding merge"
6717
msgstr ""
6718
6719
#: bzrlib/plugins/launchpad/__init__.py:432
6720
msgid "Finding revno"
6721
msgstr ""
6722
6723
#: bzrlib/plugins/launchpad/__init__.py:437
6724
msgid "Finding Launchpad branch"
6725
msgstr ""
6726
6727
#: bzrlib/plugins/launchpad/__init__.py:440
6728
msgid "Finding proposals"
6729
msgstr ""
6730
6731
#: bzrlib/plugins/launchpad/account.py:66
6732
msgid "Setting ssh/sftp usernames for launchpad.net."
6733
msgstr ""
6734
6735
#: bzrlib/plugins/launchpad/lp_api.py:241
6736
#: bzrlib/plugins/launchpad/lp_api.py:246
6737
#, python-format
6738
msgid "%s is not registered on Launchpad"
6739
msgstr ""
6740
6741
#: bzrlib/plugins/launchpad/lp_api.py:256
6742
#, python-format
6743
msgid "%s has no development focus."
6744
msgstr ""
6745
6746
#: bzrlib/plugins/launchpad/lp_api.py:261
6747
#, python-format
6748
msgid "development focus %s has no branch."
6749
msgstr ""
6750
6751
#: bzrlib/plugins/launchpad/lp_api.py:266
6752
#, python-format
6753
msgid "source package %s has no branch."
6754
msgstr ""
6755
6756
#: bzrlib/plugins/launchpad/lp_api.py:270
6757
#, python-format
6758
msgid "%s has no associated product or source package."
6759
msgstr ""
6760
6761
#: bzrlib/plugins/launchpad/lp_api.py:282
6762
#, python-format
6763
msgid "%s is already up-to-date."
6764
msgstr ""
6765
6766
#: bzrlib/plugins/launchpad/lp_api.py:289
6767
#, python-format
6768
msgid "Pushing to %s"
6769
msgstr ""
6770
6771
#: bzrlib/plugins/launchpad/lp_directory.py:170
6772
msgid ""
6773
"resolution for {0}\n"
6774
" local: {1}\n"
6775
" remote: {2}"
6776
msgstr ""
6777
6778
#: bzrlib/plugins/launchpad/lp_propose.py:149
6779
#, python-format
6780
msgid "There is already a branch merge proposal: %s"
6781
msgstr ""
6782
6783
#: bzrlib/plugins/weave_fmt/bzrdir.py:236
6784
msgid "pb parameter to convert() is deprecated"
6785
msgstr ""
6786
6787
#: bzrlib/plugins/weave_fmt/bzrdir.py:239
6788
msgid "starting upgrade from format 4 to 5"
6789
msgstr ""
6790
6791
#: bzrlib/plugins/weave_fmt/bzrdir.py:249
6792
msgid "note: upgrade may be faster if all store files are ungzipped first"
6793
msgstr ""
6794
6795
#: bzrlib/plugins/weave_fmt/bzrdir.py:278
6796
msgid "converting revision"
6797
msgstr ""
6798
6799
#: bzrlib/plugins/weave_fmt/bzrdir.py:283
6800
msgid "upgraded to weaves:"
6801
msgstr ""
6802
6803
#: bzrlib/plugins/weave_fmt/bzrdir.py:284
6804
#, python-format
6805
msgid "%6d revisions and inventories"
6806
msgstr ""
6807
6808
#: bzrlib/plugins/weave_fmt/bzrdir.py:286
6809
#, python-format
6810
msgid "%6d revisions not present"
6811
msgstr ""
6812
6813
#: bzrlib/plugins/weave_fmt/bzrdir.py:288
6814
#, python-format
6815
msgid "%6d texts"
6816
msgstr ""
6817
6818
#: bzrlib/plugins/weave_fmt/bzrdir.py:324
6819
msgid "writing weave"
6820
msgstr ""
6821
6822
#: bzrlib/plugins/weave_fmt/bzrdir.py:328
6823
#: bzrlib/plugins/weave_fmt/bzrdir.py:330
6824
msgid "inventory"
6825
msgstr ""
6826
6827
#: bzrlib/plugins/weave_fmt/bzrdir.py:347
6828
msgid "write revision"
6829
msgstr ""
6830
6831
#: bzrlib/plugins/weave_fmt/bzrdir.py:361
6832
msgid "loading revision"
6833
msgstr ""
6834
6835
#: bzrlib/plugins/weave_fmt/bzrdir.py:366
6836
#, python-format
6837
msgid "revision {%s} not present in branch; will be converted as a ghost"
6838
msgstr ""
6839
6840
#: bzrlib/plugins/weave_fmt/bzrdir.py:506
6841
msgid "starting upgrade from format 5 to 6"
6842
msgstr ""
6843
6844
#: bzrlib/plugins/weave_fmt/bzrdir.py:516
6845
#, python-format
6846
msgid "adding prefixes to %s"
6847
msgstr ""
6848
6849
#: bzrlib/plugins/weave_fmt/bzrdir.py:556
6850
msgid "starting upgrade from format 6 to metadir"
6851
msgstr ""
6852
6853
#: bzrlib/plugins/weave_fmt/bzrdir.py:564
6854
msgid "Removing ancestry.weave"
6855
msgstr ""
6856
6857
#: bzrlib/plugins/weave_fmt/bzrdir.py:569
6858
msgid "Finding branch files"
6859
msgstr ""
6860
6861
#: bzrlib/plugins/weave_fmt/bzrdir.py:579
6862
msgid "Upgrading repository"
6863
msgstr ""
6864
6865
#: bzrlib/plugins/weave_fmt/bzrdir.py:589
6866
msgid "Upgrading branch"
6867
msgstr ""
6868
6869
#: bzrlib/plugins/weave_fmt/bzrdir.py:612
6870
msgid "No working tree."
6871
msgstr ""
6872
6873
#: bzrlib/plugins/weave_fmt/bzrdir.py:619
6874
msgid "Upgrading working tree"
6875
msgstr ""
6876
6877
#: bzrlib/plugins/weave_fmt/bzrdir.py:640
6878
#, python-format
6879
msgid "Make %s lock"
6880
msgstr ""
6881
6882
#: bzrlib/plugins/weave_fmt/bzrdir.py:651
6883
#, python-format
6884
msgid "Moving %s"
6885
msgstr ""
6886
6887
#: bzrlib/push.py:56
6888
msgid "Created new branch."
6889
msgstr ""
6890
6891
#: bzrlib/push.py:98
6892
#, python-format
6893
msgid ""
6894
"Target directory %s already contains a .bzr directory, but it is not valid."
6895
msgstr ""
6896
6897
#: bzrlib/push.py:101
6898
#, python-format
6899
msgid ""
6900
"Target directory %s already exists, but does not have a .bzr directory. "
6901
"Supply --use-existing-dir to push there anyway."
6902
msgstr ""
6903
6904
#: bzrlib/push.py:122
6905
#, python-format
6906
msgid "Too many redirections trying to make %s."
6907
msgstr ""
6908
6909
#: bzrlib/push.py:147
6910
msgid ""
6911
"These branches have diverged. See \"bzr help diverged-branches\" for more "
6912
"information."
6913
msgstr ""
6914
6915
#: bzrlib/push.py:151
6916
#, python-format
6917
msgid ""
6918
"It is not possible to losslessly push to %s. You may want to use dpush "
6919
"instead."
6920
msgstr ""
6921
6922
#: bzrlib/push.py:157
6923
#, python-format
6924
msgid ""
6925
"At %s you have a valid .bzr control directory, but not a branch or "
6926
"repository. This is an unsupported configuration. Please move the target "
6927
"directory out of the way and try again."
6928
msgstr ""
6929
6930
#: bzrlib/reconcile.py:97
6931
#, python-format
6932
msgid "Reconciling branch %s"
6933
msgstr ""
6934
6935
#: bzrlib/reconcile.py:103
6936
#, python-format
6937
msgid "Reconciling repository %s"
6938
msgstr ""
6939
6940
#: bzrlib/reconcile.py:105
6941
msgid "Reconciling repository"
6942
msgstr ""
6943
6944
#: bzrlib/reconcile.py:111
6945
#, python-format
6946
msgid "%s cannot canonicalize CHKs."
6947
msgstr ""
6948
6949
#: bzrlib/reconcile.py:119
6950
msgid "Reconcile aborted: revision index has inconsistent parents."
6951
msgstr ""
6952
6953
#: bzrlib/reconcile.py:121
6954
msgid "Run \"bzr check\" for more details."
6955
msgstr ""
6956
6957
#: bzrlib/reconcile.py:123
6958
msgid "Reconciliation complete."
6959
msgstr ""
6960
6961
#: bzrlib/reconcile.py:166
6962
msgid "Fixing last revision info {0} => {1}"
6963
msgstr ""
6964
6965
#: bzrlib/reconcile.py:173
6966
msgid "revision_history ok."
6967
msgstr ""
6968
6969
#: bzrlib/reconcile.py:234
6970
msgid "Reading inventory data"
6971
msgstr ""
6972
6973
#: bzrlib/reconcile.py:254 bzrlib/reconcile.py:384
6974
msgid "Inventory ok."
6975
msgstr ""
6976
6977
#: bzrlib/reconcile.py:256 bzrlib/reconcile.py:386
6978
msgid "Backing up inventory"
6979
msgstr ""
6980
6981
#: bzrlib/reconcile.py:258
6982
msgid "Backup inventory created."
6983
msgstr ""
6984
6985
#: bzrlib/reconcile.py:274 bzrlib/reconcile.py:405
6986
msgid "Writing weave"
6987
msgstr ""
6988
6989
#: bzrlib/reconcile.py:277 bzrlib/reconcile.py:408
6990
msgid "Inventory regenerated."
6991
msgstr ""
6992
6993
#: bzrlib/reconcile.py:371 bzrlib/reconcile.py:373 bzrlib/reconcile.py:376
6994
msgid "Reading indexes"
6995
msgstr ""
6996
6997
#: bzrlib/reconcile.py:380 bzrlib/reconcile.py:382
6998
msgid "Checking unused inventories"
6999
msgstr ""
7000
7001
#: bzrlib/reconcile.py:388
7002
msgid "Backup Inventory created"
7003
msgstr ""
7004
7005
#: bzrlib/reconcile.py:446
7006
msgid "Fixing text parents"
7007
msgstr ""
7008
7009
#: bzrlib/reconfigure.py:54
7010
msgid "{0} is now stacked on {1}\n"
7011
msgstr ""
7012
7013
#: bzrlib/reconfigure.py:69
7014
#, python-format
7015
msgid "%s is now not stacked\n"
7016
msgstr ""
7017
7018
#: bzrlib/remote.py:1180 bzrlib/repository.py:289
7019
#, python-format
7020
msgid "bzr: ERROR (ignored): %s"
7021
msgstr ""
7022
7023
#: bzrlib/remote.py:2493
7024
msgid "Copying repository content as tarball..."
7025
msgstr ""
7026
7027
#: bzrlib/rename_map.py:69
7028
msgid "Calculating hashes"
7029
msgstr ""
7030
7031
#: bzrlib/rename_map.py:107
7032
msgid "Determining hash hits"
7033
msgstr ""
7034
7035
#: bzrlib/rename_map.py:242
7036
msgid "{0} => {1}"
7037
msgstr ""
7038
7039
#: bzrlib/repository.py:1787
7040
msgid "Moving repository to repository.backup"
7041
msgstr ""
7042
7043
#: bzrlib/repository.py:1794
7044
msgid "Creating new repository"
7045
msgstr ""
7046
7047
#: bzrlib/repository.py:1799
7048
msgid "Copying content"
7049
msgstr ""
7050
7051
#: bzrlib/repository.py:1803
7052
msgid "Deleting old repository content"
7053
msgstr ""
7054
7055
#: bzrlib/repository.py:1805
7056
msgid "repository converted"
7057
msgstr ""
7058
7059
#: bzrlib/revisionspec.py:903
7060
msgid "Using {0} {1}"
7061
msgstr ""
7062
7063
#: bzrlib/send.py:58
7064
#, python-format
7065
msgid "Mail client \"%s\" does not support specifying body"
7066
msgstr ""
7067
7068
#: bzrlib/send.py:62
7069
msgid "--remember requires a branch to be specified."
7070
msgstr ""
7071
7072
#: bzrlib/send.py:77
7073
msgid "No submit branch known or specified"
7074
msgstr ""
7075
7076
#: bzrlib/send.py:80
7077
msgid "Using saved {0} location \"{1}\" to determine what changes to submit."
7078
msgstr ""
7079
7080
#: bzrlib/send.py:98
7081
#, python-format
7082
msgid "No such send format '%s'."
7083
msgstr ""
7084
7085
#: bzrlib/send.py:114
7086
msgid "bzr send takes at most two one revision identifiers"
7087
msgstr ""
7088
7089
#: bzrlib/send.py:127
7090
msgid "No revisions to submit."
7091
msgstr ""
7092
7093
#: bzrlib/send.py:139
7094
msgid ""
7095
"- not supported for merge directives that use more than one output file."
7096
msgstr ""
7097
7098
#: bzrlib/send.py:185
7099
msgid "Format 0.9 does not permit bundle with no patch"
7100
msgstr ""
7101
7102
#: bzrlib/shelf_ui.py:46
7103
#, python-format
7104
msgid "Shelve adding file \"%(path)s\"?"
7105
msgstr ""
7106
7107
#: bzrlib/shelf_ui.py:47
7108
msgid "Shelve binary changes?"
7109
msgstr ""
7110
7111
#: bzrlib/shelf_ui.py:48
7112
msgid "Shelve changing \"%s\" from %(other)s to %(this)s?"
7113
msgstr ""
7114
7115
#: bzrlib/shelf_ui.py:50
7116
#, python-format
7117
msgid "Shelve removing file \"%(path)s\"?"
7118
msgstr ""
7119
7120
#: bzrlib/shelf_ui.py:51
7121
#, python-format
7122
msgid "Shelve %d change(s)?"
7123
msgstr ""
7124
7125
#: bzrlib/shelf_ui.py:52
7126
msgid "Shelve?"
7127
msgstr ""
7128
7129
#: bzrlib/shelf_ui.py:53
7130
#, python-format
7131
msgid ""
7132
"Shelve changing target of \"%(path)s\" from \"%(other)s\" to \"%(this)s\"?"
7133
msgstr ""
7134
7135
#: bzrlib/shelf_ui.py:55
7136
#, python-format
7137
msgid "Shelve renaming \"%(other)s\" => \"%(this)s\"?"
7138
msgstr ""
7139
7140
#: bzrlib/shelf_ui.py:70
7141
#, python-format
7142
msgid "Changes shelved with id \"%d\"."
7143
msgstr ""
7144
7145
#: bzrlib/shelf_ui.py:74
7146
msgid "Selected changes destroyed."
7147
msgstr ""
7148
7149
#: bzrlib/shelf_ui.py:78
7150
msgid "Selected changes:"
7151
msgstr ""
7152
7153
#: bzrlib/shelf_ui.py:98
7154
#, python-format
7155
msgid "Delete file \"%(path)s\"?"
7156
msgstr ""
7157
7158
#: bzrlib/shelf_ui.py:99
7159
msgid "Apply binary changes?"
7160
msgstr ""
7161
7162
#: bzrlib/shelf_ui.py:100
7163
#, python-format
7164
msgid "Change \"%(path)s\" from %(this)s to %(other)s?"
7165
msgstr ""
7166
7167
#: bzrlib/shelf_ui.py:102
7168
#, python-format
7169
msgid "Add file \"%(path)s\"?"
7170
msgstr ""
7171
7172
#: bzrlib/shelf_ui.py:103
7173
#, python-format
7174
msgid "Apply %d change(s)?"
7175
msgstr ""
7176
7177
#: bzrlib/shelf_ui.py:104
7178
msgid "Apply change?"
7179
msgstr ""
7180
7181
#: bzrlib/shelf_ui.py:105
7182
#, python-format
7183
msgid "Change target of \"%(path)s\" from \"%(this)s\" to \"%(other)s\"?"
7184
msgstr ""
7185
7186
#: bzrlib/shelf_ui.py:107
7187
#, python-format
7188
msgid "Rename \"%(this)s\" => \"%(other)s\"?"
7189
msgstr ""
7190
7191
#: bzrlib/shelf_ui.py:402
7192
msgid "No changes are shelved."
7193
msgstr ""
7194
7195
#: bzrlib/shelf_ui.py:460
7196
#, python-format
7197
msgid "Using changes with id \"%d\"."
7198
msgstr ""
7199
7200
#: bzrlib/shelf_ui.py:464
7201
#, python-format
7202
msgid "Message: %s"
7203
msgstr ""
7204
7205
#: bzrlib/shelf_ui.py:476
7206
#, python-format
7207
msgid "Deleted changes with id \"%d\"."
7208
msgstr ""
7209
7210
#: bzrlib/smart/medium.py:714
7211
msgid "HPSS calls: {0} ({1} vfs) {2}"
7212
msgstr ""
7213
7214
#: bzrlib/smart/server.py:169
7215
msgid "Requested to stop gracefully"
7216
msgstr ""
7217
7218
#: bzrlib/smart/server.py:179
7219
#, python-format
7220
msgid "Waiting for %d client(s) to finish"
7221
msgstr ""
7222
7223
#: bzrlib/smart/server.py:185
7224
#, python-format
7225
msgid "Still waiting for %d client(s) to finish"
7226
msgstr ""
7227
7228
#: bzrlib/smart/server.py:219
7229
#, python-format
7230
msgid "listening socket error: %s"
7231
msgstr ""
7232
7233
#: bzrlib/smart/server.py:452
7234
#, python-format
7235
msgid "listening on port: %s"
7236
msgstr ""
7237
7238
#: bzrlib/switch.py:69
7239
msgid "Pending merges must be committed or reverted before using switch."
7240
msgstr ""
7241
7242
#: bzrlib/switch.py:96
7243
msgid ""
7244
"Cannot switch as local commits found in the checkout. Commit these to the "
7245
"bound branch or use --force to throw them away."
7246
msgstr ""
7247
7248
#: bzrlib/switch.py:101
7249
#, python-format
7250
msgid ""
7251
"Unable to connect to current master branch %(target)s: %(error)s To switch "
7252
"anyway, use --force."
7253
msgstr ""
7254
7255
#: bzrlib/switch.py:110
7256
msgid "Cannot switch a branch, only a checkout."
7257
msgstr ""
7258
7259
#: bzrlib/switch.py:146
7260
#, python-format
7261
msgid "Tree is up to date at revision %d."
7262
msgstr ""
7263
7264
#: bzrlib/switch.py:152
7265
#, python-format
7266
msgid "Updated to revision %d."
7267
msgstr ""
7268
7269
#: bzrlib/transform.py:1730 bzrlib/transform.py:1741 bzrlib/transform.py:1743
7270
msgid "Apply phase"
7271
msgstr ""
7272
7273
#: bzrlib/transform.py:1769 bzrlib/transform.py:1837
7274
msgid "removing file"
7275
msgstr ""
7276
7277
#: bzrlib/transform.py:1787 bzrlib/transform.py:1872
7278
msgid "adding file"
7279
msgstr ""
7280
7281
#: bzrlib/transform.py:2587
7282
msgid "Building tree"
7283
msgstr ""
7284
7285
#: bzrlib/transform.py:2677 bzrlib/transform.py:2704
7286
msgid "Adding file contents"
7287
msgstr ""
7288
7289
#: bzrlib/transform.py:3024
7290
msgid "Resolution pass"
7291
msgstr ""
7292
7293
#: bzrlib/transport/ftp/_gssapi.py:88
7294
#, python-format
7295
msgid "Authenticated as %s"
7296
msgstr ""
7297
7298
#: bzrlib/tree.py:634
7299
msgid "*** {0} content-filter: {1} => {2!r}"
7300
msgstr ""
7301
7302
#: bzrlib/upgrade.py:77
7303
#, python-format
7304
msgid "This is a checkout. The branch (%s) needs to be upgraded separately."
7305
msgstr ""
7306
7307
#: bzrlib/upgrade.py:100
7308
#, python-format
7309
msgid "cannot upgrade from bzrdir format %s"
7310
msgstr ""
7311
7312
#: bzrlib/upgrade.py:103
7313
#, python-format
7314
msgid "starting upgrade of %s"
7315
msgstr ""
7316
7317
#: bzrlib/upgrade.py:110
7318
msgid "finished"
7319
msgstr ""
7320
7321
#: bzrlib/upgrade.py:120
7322
msgid "Deleting backup.bzr"
7323
msgstr ""
7324
7325
#: bzrlib/upgrade.py:151
7326
msgid ""
7327
"\n"
7328
"SUMMARY: {0} upgrades attempted, {1} succeeded, {2} failed"
7329
msgstr ""
7330
7331
#: bzrlib/upgrade.py:208
7332
#, python-format
7333
msgid "Found %d dependent branches - upgrading ..."
7334
msgstr ""
7335
7336
#: bzrlib/upgrade.py:276
7337
msgid "Upgrading bzrdirs"
7338
msgstr ""
7339
7340
#: bzrlib/upgrade.py:282
7341
#, python-format
7342
msgid "Upgrading %s"
7343
msgstr ""
7344
7345
#: bzrlib/upgrade.py:283
7346
msgid "Upgrading {0} {1} ..."
7347
msgstr ""
7348
7349
#: bzrlib/upgrade.py:301
7350
msgid "Removing backup ..."
7351
msgstr ""
7352
7353
#: bzrlib/upgrade.py:305
7354
msgid "failed to clean-up {0}: {1}"
7355
msgstr ""
7356
7357
#: bzrlib/vf_repository.py:1090
7358
msgid "inventories"
7359
msgstr ""
7360
7361
#: bzrlib/vf_repository.py:1116
7362
msgid "texts"
7363
msgstr ""
7364
7365
#: bzrlib/vf_repository.py:1621 bzrlib/vf_repository.py:1630
7366
msgid "Calculating text parents"
7367
msgstr ""
7368
7369
#: bzrlib/vf_repository.py:1706
7370
msgid "Fetch texts"
7371
msgstr ""
7372
7373
#: bzrlib/vf_repository.py:2535
7374
msgid "loading text store"
7375
msgstr ""
7376
7377
#: bzrlib/vf_repository.py:2541
7378
msgid "checking text graph"
7379
msgstr ""
7380
7381
#: bzrlib/vf_repository.py:2995 bzrlib/vf_repository.py:3009
7382
#: bzrlib/vf_repository.py:3124
7383
msgid "Transferring revisions"
7384
msgstr ""
7385
7386
#: bzrlib/win32utils.py:146
7387
msgid "Failed to GetProcessMemoryInfo()"
7388
msgstr ""
7389
7390
#: bzrlib/win32utils.py:167
7391
msgid "Cannot debug memory on win32 without ctypes or win32process"
7392
msgstr ""
7393
7394
#: bzrlib/win32utils.py:172
7395
msgid "WorkingSize {0:>7}KiB\tPeakWorking {1:>7}KiB\t{2}"
7396
msgstr ""
7397
7398
#: bzrlib/win32utils.py:180
7399
#, python-format
7400
msgid "WorkingSize %8d KiB"
7401
msgstr ""
7402
7403
#: bzrlib/win32utils.py:181
7404
#, python-format
7405
msgid "PeakWorking %8d KiB"
7406
msgstr ""
7407
7408
#: bzrlib/win32utils.py:182
7409
#, python-format
7410
msgid "PagefileUsage %8d KiB"
7411
msgstr ""
7412
7413
#: bzrlib/win32utils.py:183
7414
#, python-format
7415
msgid "PeakPagefileUsage %8d KiB"
7416
msgstr ""
7417
7418
#: bzrlib/win32utils.py:185
7419
#, python-format
7420
msgid "PrivateUsage %8d KiB"
7421
msgstr ""
7422
7423
#: bzrlib/win32utils.py:186
7424
#, python-format
7425
msgid "PageFaultCount %8d"
7426
msgstr ""
7427
7428
#: bzrlib/workingtree.py:1478
7429
msgid "Rerun update after fixing the conflicts."
7430
msgstr ""
7431
7432
#: dummy/help_topics/authentication/summary.txt:1
7433
msgid "Information on configuring authentication"
7434
msgstr ""
7435
7436
#: dummy/help_topics/basic/detail.txt:1
7437
msgid ""
7438
"Bazaar 2.5b5 -- a free distributed version-control tool\n"
7439
"http://bazaar.canonical.com/"
7440
msgstr ""
7441
7442
#: dummy/help_topics/basic/detail.txt:4
7443
msgid ""
7444
"Basic commands:\n"
7445
" bzr init makes this directory a versioned branch\n"
7446
" bzr branch make a copy of another branch"
7447
msgstr ""
7448
7449
#: dummy/help_topics/basic/detail.txt:8
7450
msgid ""
7451
" bzr add make files or directories versioned\n"
7452
" bzr ignore ignore a file or pattern\n"
7453
" bzr mv move or rename a versioned file"
7454
msgstr ""
7455
7456
#: dummy/help_topics/basic/detail.txt:12
7457
msgid ""
7458
" bzr status summarize changes in working copy\n"
7459
" bzr diff show detailed diffs"
7460
msgstr ""
7461
7462
#: dummy/help_topics/basic/detail.txt:15
7463
msgid ""
7464
" bzr merge pull in changes from another branch\n"
7465
" bzr commit save some or all changes\n"
7466
" bzr send send changes via email"
7467
msgstr ""
7468
7469
#: dummy/help_topics/basic/detail.txt:19
7470
msgid ""
7471
" bzr log show history of changes\n"
7472
" bzr check validate storage"
7473
msgstr ""
7474
7475
#: dummy/help_topics/basic/detail.txt:22
7476
msgid ""
7477
" bzr help init more help on e.g. init command\n"
7478
" bzr help commands list all commands\n"
7479
" bzr help topics list all help topics\n"
7480
msgstr ""
7481
7482
#: dummy/help_topics/basic/summary.txt:1
7483
msgid "Basic commands"
7484
msgstr ""
7485
7486
#: dummy/help_topics/branches/detail.txt:1
7487
msgid "Branches"
7488
msgstr ""
7489
7490
#: dummy/help_topics/branches/detail.txt:3
7491
msgid ""
7492
"A branch consists of the state of a project, including all of its\n"
7493
"history. All branches have a repository associated (which is where the\n"
7494
"branch history is stored), but multiple branches may share the same\n"
7495
"repository (a shared repository). Branches can be copied and merged."
7496
msgstr ""
7497
7498
#: dummy/help_topics/branches/detail.txt:8
7499
msgid ""
7500
"In addition, one branch may be bound to another one. Binding to another\n"
7501
"branch indicates that commits which happen in this branch must also \n"
7502
"happen in the other branch. Bazaar ensures consistency by not allowing \n"
7503
"commits when the two branches are out of date. In order for a commit \n"
7504
"to succeed, it may be necessary to update the current branch using \n"
7505
"``bzr update``."
7506
msgstr ""
7507
7508
#: dummy/help_topics/branches/detail.txt:15
7509
#: dummy/help_topics/checkouts/detail.txt:66
7510
#: dummy/help_topics/repositories/detail.txt:36
7511
msgid "Related commands::"
7512
msgstr ""
7513
7514
#: dummy/help_topics/branches/detail.txt:17
7515
msgid ""
7516
" init Change a directory into a versioned branch.\n"
7517
" branch Create a new branch that is a copy of an existing branch.\n"
7518
" merge Perform a three-way merge.\n"
7519
" bind Bind a branch to another one.\n"
7520
msgstr ""
7521
7522
#: dummy/help_topics/branches/summary.txt:1
7523
msgid "Information on what a branch is"
7524
msgstr ""
7525
7526
#: dummy/help_topics/bugs/summary.txt:1
7527
msgid "Bug tracker settings"
7528
msgstr ""
7529
7530
#: dummy/help_topics/checkouts/detail.txt:1
7531
msgid "Checkouts"
7532
msgstr ""
7533
7534
#: dummy/help_topics/checkouts/detail.txt:3
7535
msgid ""
7536
"Checkouts are source trees that are connected to a branch, so that when\n"
7537
"you commit in the source tree, the commit goes into that branch. They\n"
7538
"allow you to use a simpler, more centralized workflow, ignoring some of\n"
7539
"Bazaar's decentralized features until you want them. Using checkouts\n"
7540
"with shared repositories is very similar to working with SVN or CVS, but\n"
7541
"doesn't have the same restrictions. And using checkouts still allows\n"
7542
"others working on the project to use whatever workflow they like."
7543
msgstr ""
7544
7545
#: dummy/help_topics/checkouts/detail.txt:11
7546
msgid ""
7547
"A checkout is created with the bzr checkout command (see \"help "
7548
"checkout\").\n"
7549
"You pass it a reference to another branch, and it will create a local copy\n"
7550
"for you that still contains a reference to the branch you created the\n"
7551
"checkout from (the master branch). Then if you make any commits they will "
7552
"be\n"
7553
"made on the other branch first. This creates an instant mirror of your work, "
7554
"or\n"
7555
"facilitates lockstep development, where each developer is working together,\n"
7556
"continuously integrating the changes of others."
7557
msgstr ""
7558
7559
#: dummy/help_topics/checkouts/detail.txt:19
7560
msgid ""
7561
"However the checkout is still a first class branch in Bazaar terms, so that\n"
7562
"you have the full history locally. As you have a first class branch you "
7563
"can\n"
7564
"also commit locally if you want, for instance due to the temporary loss af "
7565
"a\n"
7566
"network connection. Use the --local option to commit to do this. All the "
7567
"local\n"
7568
"commits will then be made on the master branch the next time you do a non-"
7569
"local\n"
7570
"commit."
7571
msgstr ""
7572
7573
#: dummy/help_topics/checkouts/detail.txt:26
7574
msgid ""
7575
"If you are using a checkout from a shared branch you will periodically want "
7576
"to\n"
7577
"pull in all the changes made by others. This is done using the \"update\"\n"
7578
"command. The changes need to be applied before any non-local commit, but\n"
7579
"Bazaar will tell you if there are any changes and suggest that you use this\n"
7580
"command when needed."
7581
msgstr ""
7582
7583
#: dummy/help_topics/checkouts/detail.txt:32
7584
msgid ""
7585
"It is also possible to create a \"lightweight\" checkout by passing the\n"
7586
"--lightweight flag to checkout. A lightweight checkout is even closer to an\n"
7587
"SVN checkout in that it is not a first class branch, it mainly consists of "
7588
"the\n"
7589
"working tree. This means that any history operations must query the master\n"
7590
"branch, which could be slow if a network connection is involved. Also, as "
7591
"you\n"
7592
"don't have a local branch, then you cannot commit locally."
7593
msgstr ""
7594
7595
#: dummy/help_topics/checkouts/detail.txt:39
7596
msgid ""
7597
"Lightweight checkouts work best when you have fast reliable access to the\n"
7598
"master branch. This means that if the master branch is on the same disk or "
7599
"LAN\n"
7600
"a lightweight checkout will be faster than a heavyweight one for any "
7601
"commands\n"
7602
"that modify the revision history (as only one copy of the branch needs to\n"
7603
"be updated). Heavyweight checkouts will generally be faster for any command\n"
7604
"that uses the history but does not change it, but if the master branch is "
7605
"on\n"
7606
"the same disk then there won't be a noticeable difference."
7607
msgstr ""
7608
7609
#: dummy/help_topics/checkouts/detail.txt:47
7610
msgid ""
7611
"Another possible use for a checkout is to use it with a treeless repository\n"
7612
"containing your branches, where you maintain only one working tree by\n"
7613
"switching the master branch that the checkout points to when you want to\n"
7614
"work on a different branch."
7615
msgstr ""
7616
7617
#: dummy/help_topics/checkouts/detail.txt:52
7618
msgid ""
7619
"Obviously to commit on a checkout you need to be able to write to the "
7620
"master\n"
7621
"branch. This means that the master branch must be accessible over a "
7622
"writeable\n"
7623
"protocol , such as sftp://, and that you have write permissions at the "
7624
"other\n"
7625
"end. Checkouts also work on the local file system, so that all that matters "
7626
"is\n"
7627
"file permissions."
7628
msgstr ""
7629
7630
#: dummy/help_topics/checkouts/detail.txt:58
7631
msgid ""
7632
"You can change the master of a checkout by using the \"switch\" command "
7633
"(see\n"
7634
"\"help switch\"). This will change the location that the commits are sent "
7635
"to.\n"
7636
"The \"bind\" command can also be used to turn a normal branch into a heavy\n"
7637
"checkout. If you would like to convert your heavy checkout into a normal\n"
7638
"branch so that every commit is local, you can use the \"unbind\" command. To "
7639
"see\n"
7640
"whether or not a branch is bound or not you can use the \"info\" command. If "
7641
"the\n"
7642
"branch is bound it will tell you the location of the bound branch."
7643
msgstr ""
7644
7645
#: dummy/help_topics/checkouts/detail.txt:68
7646
msgid ""
7647
" checkout Create a checkout. Pass --lightweight to get a lightweight\n"
7648
" checkout\n"
7649
" update Pull any changes in the master branch in to your checkout\n"
7650
" commit Make a commit that is sent to the master branch. If you have\n"
7651
" a heavy checkout then the --local option will commit to the\n"
7652
" checkout without sending the commit to the master\n"
7653
" switch Change the master branch that the commits in the checkout "
7654
"will\n"
7655
" be sent to\n"
7656
" bind Turn a standalone branch into a heavy checkout so that any\n"
7657
" commits will be sent to the master branch\n"
7658
" unbind Turn a heavy checkout into a standalone branch so that any\n"
7659
" commits are only made locally\n"
7660
" info Displays whether a branch is bound or unbound. If the branch "
7661
"is\n"
7662
" bound, then it will also display the location of the bound "
7663
"branch\n"
7664
msgstr ""
7665
7666
#: dummy/help_topics/checkouts/summary.txt:1
7667
msgid "Information on what a checkout is"
7668
msgstr ""
7669
7670
#: dummy/help_topics/commands/summary.txt:1
7671
msgid "Basic help for all commands"
7672
msgstr ""
7673
7674
#: dummy/help_topics/configuration/summary.txt:1
7675
msgid "Details on the configuration settings available"
7676
msgstr ""
7677
7678
#: dummy/help_topics/conflict-types/summary.txt:1
7679
msgid "Types of conflicts and what to do about them"
7680
msgstr ""
7681
7682
#: dummy/help_topics/content-filters/summary.txt:1
7683
msgid "Conversion of content into/from working trees"
7684
msgstr ""
7685
7686
#: dummy/help_topics/criss-cross/detail.txt:1
7687
msgid "Criss-Cross"
7688
msgstr ""
7689
7690
#: dummy/help_topics/criss-cross/detail.txt:3
7691
msgid ""
7692
"A criss-cross in the branch history can cause the default merge technique\n"
7693
"to emit more conflicts than would normally be expected."
7694
msgstr ""
7695
7696
#: dummy/help_topics/criss-cross/detail.txt:6
7697
msgid ""
7698
"In complex merge cases, ``bzr merge --lca`` or ``bzr merge --weave`` may "
7699
"give\n"
7700
"better results. You may wish to ``bzr revert`` the working tree and merge\n"
7701
"again. Alternatively, use ``bzr remerge`` on particular conflicted files."
7702
msgstr ""
7703
7704
#: dummy/help_topics/criss-cross/detail.txt:10
7705
msgid ""
7706
"Criss-crosses occur in a branch's history if two branches merge the same "
7707
"thing\n"
7708
"and then merge one another, or if two branches merge one another at the "
7709
"same\n"
7710
"time. They can be avoided by having each branch only merge from or into a\n"
7711
"designated central branch (a \"star topology\")."
7712
msgstr ""
7713
7714
#: dummy/help_topics/criss-cross/detail.txt:15
7715
msgid ""
7716
"Criss-crosses cause problems because of the way merge works. Bazaar's "
7717
"default\n"
7718
"merge is a three-way merger; in order to merge OTHER into THIS, it must\n"
7719
"find a basis for comparison, BASE. Using BASE, it can determine whether\n"
7720
"differences between THIS and OTHER are due to one side adding lines, or\n"
7721
"from another side removing lines."
7722
msgstr ""
7723
7724
#: dummy/help_topics/criss-cross/detail.txt:21
7725
msgid ""
7726
"Criss-crosses mean there is no good choice for a base. Selecting the "
7727
"recent\n"
7728
"merge points could cause one side's changes to be silently discarded.\n"
7729
"Selecting older merge points (which Bazaar does) mean that extra conflicts\n"
7730
"are emitted."
7731
msgstr ""
7732
7733
#: dummy/help_topics/criss-cross/detail.txt:26
7734
msgid ""
7735
"The ``weave`` merge type is not affected by this problem because it uses\n"
7736
"line-origin detection instead of a basis revision to determine the cause of\n"
7737
"differences.\n"
7738
msgstr ""
7739
7740
#: dummy/help_topics/criss-cross/summary.txt:1
7741
msgid "Information on criss-cross merging"
7742
msgstr ""
7743
7744
#: dummy/help_topics/current-formats/summary.txt:1
7745
msgid "Current storage formats"
7746
msgstr ""
7747
7748
#: dummy/help_topics/debug-flags/summary.txt:1
7749
msgid "Options to show or record debug information"
7750
msgstr ""
7751
7752
#: dummy/help_topics/diverged-branches/summary.txt:1
7753
msgid "How to fix diverged branches"
7754
msgstr ""
7755
7756
#: dummy/help_topics/env-variables/detail.txt:1
7757
msgid "Environment Variables"
7758
msgstr ""
7759
7760
#: dummy/help_topics/env-variables/detail.txt:3
7761
msgid ""
7762
"=================== "
7763
"===========================================================\n"
7764
"BZRPATH Path where bzr is to look for shell plugin external\n"
7765
" commands.\n"
7766
"BZR_EMAIL E-Mail address of the user. Overrides EMAIL.\n"
7767
"EMAIL E-Mail address of the user.\n"
7768
"BZR_EDITOR Editor for editing commit messages. Overrides EDITOR.\n"
7769
"EDITOR Editor for editing commit messages.\n"
7770
"BZR_PLUGIN_PATH Paths where bzr should look for plugins.\n"
7771
"BZR_DISABLE_PLUGINS Plugins that bzr should not load.\n"
7772
"BZR_PLUGINS_AT Plugins to load from a directory not in "
7773
"BZR_PLUGIN_PATH.\n"
7774
"BZR_HOME Directory holding .bazaar config dir. Overrides HOME.\n"
7775
"BZR_HOME (Win32) Directory holding bazaar config dir. Overrides APPDATA "
7776
"and\n"
7777
" HOME.\n"
7778
"BZR_REMOTE_PATH Full name of remote 'bzr' command (for bzr+ssh:// "
7779
"URLs).\n"
7780
"BZR_SSH Path to SSH client, or one of paramiko, openssh, "
7781
"sshcorp,\n"
7782
" plink or lsh.\n"
7783
"BZR_LOG Location of .bzr.log (use '/dev/null' to suppress log).\n"
7784
"BZR_LOG (Win32) Location of .bzr.log (use 'NUL' to suppress log).\n"
7785
"BZR_COLUMNS Override implicit terminal width.\n"
7786
"BZR_CONCURRENCY Number of processes that can be run concurrently "
7787
"(selftest)\n"
7788
"BZR_PROGRESS_BAR Override the progress display. Values are 'none' or "
7789
"'text'.\n"
7790
"BZR_PDB Control whether to launch a debugger on error.\n"
7791
"BZR_SIGQUIT_PDB Control whether SIGQUIT behaves normally or invokes a\n"
7792
" breakin debugger.\n"
7793
"BZR_TEXTUI_INPUT Force console input mode for prompts to line-based "
7794
"(instead\n"
7795
" of char-based).\n"
7796
"=================== "
7797
"===========================================================\n"
7798
msgstr ""
7799
7800
#: dummy/help_topics/env-variables/summary.txt:1
7801
msgid "Environment variable names and values"
7802
msgstr ""
7803
7804
#: dummy/help_topics/eol/summary.txt:1
7805
msgid "Information on end-of-line handling"
7806
msgstr ""
7807
7808
#: dummy/help_topics/files/detail.txt:1
7809
msgid "Files"
7810
msgstr ""
7811
7812
#: dummy/help_topics/files/detail.txt:3
7813
msgid ""
7814
":On Unix: ~/.bazaar/bazaar.conf\n"
7815
":On Windows: C:\\\\Documents and Settings\\\\username\\\\Application Data\\\\"
7816
"bazaar\\\\2.0\\\\bazaar.conf"
7817
msgstr ""
7818
7819
#: dummy/help_topics/files/detail.txt:6
7820
msgid ""
7821
"Contains the user's default configuration. The section ``[DEFAULT]`` is\n"
7822
"used to define general configuration that will be applied everywhere.\n"
7823
"The section ``[ALIASES]`` can be used to create command aliases for\n"
7824
"commonly used options."
7825
msgstr ""
7826
7827
#: dummy/help_topics/files/detail.txt:11
7828
msgid "A typical config file might look something like::"
7829
msgstr ""
7830
7831
#: dummy/help_topics/files/detail.txt:13
7832
msgid ""
7833
" [DEFAULT]\n"
7834
" email=John Doe <jdoe@isp.com>"
7835
msgstr ""
7836
7837
#: dummy/help_topics/files/detail.txt:16
7838
msgid ""
7839
" [ALIASES]\n"
7840
" commit = commit --strict\n"
7841
" log10 = log --short -r -10..-1\n"
7842
msgstr ""
7843
7844
#: dummy/help_topics/files/summary.txt:1
7845
msgid "Information on configuration and log files"
7846
msgstr ""
7847
7848
#: dummy/help_topics/formats/detail.txt:1
7849
msgid "Storage Formats"
7850
msgstr ""
7851
7852
#: dummy/help_topics/formats/detail.txt:3
7853
msgid ""
7854
"To ensure that older clients do not access data incorrectly,\n"
7855
"Bazaar's policy is to introduce a new storage format whenever\n"
7856
"new features requiring new metadata are added. New storage\n"
7857
"formats may also be introduced to improve performance and\n"
7858
"scalability."
7859
msgstr ""
7860
7861
#: dummy/help_topics/formats/detail.txt:9
7862
msgid ""
7863
"The newest format, 2a, is highly recommended. If your\n"
7864
"project is not using 2a, then you should suggest to the\n"
7865
"project owner to upgrade."
7866
msgstr ""
7867
7868
#: dummy/help_topics/formats/detail.txt:13
7869
msgid ""
7870
"\n"
7871
".. note::"
7872
msgstr ""
7873
7874
#: dummy/help_topics/formats/detail.txt:16
7875
msgid ""
7876
" Some of the older formats have two variants:\n"
7877
" a plain one and a rich-root one. The latter include an additional\n"
7878
" field about the root of the tree. There is no performance cost\n"
7879
" for using a rich-root format but you cannot easily merge changes\n"
7880
" from a rich-root format into a plain format. As a consequence,\n"
7881
" moving a project to a rich-root format takes some co-ordination\n"
7882
" in that all contributors need to upgrade their repositories\n"
7883
" around the same time. 2a and all future formats will be\n"
7884
" implicitly rich-root."
7885
msgstr ""
7886
7887
#: dummy/help_topics/formats/detail.txt:26
7888
msgid ""
7889
"See :doc:`current-formats-help` for the complete list of\n"
7890
"currently supported formats. See :doc:`other-formats-help` for\n"
7891
"descriptions of any available experimental and deprecated formats.\n"
7892
msgstr ""
7893
7894
#: dummy/help_topics/formats/summary.txt:1
7895
msgid "Information on choosing a storage format"
7896
msgstr ""
7897
7898
#: dummy/help_topics/global-options/detail.txt:1
7899
msgid "Global Options"
7900
msgstr ""
7901
7902
#: dummy/help_topics/global-options/detail.txt:3
7903
msgid ""
7904
"These options may be used with any command, and may appear in front of any\n"
7905
"command. (e.g. ``bzr --profile help``)."
7906
msgstr ""
7907
7908
#: dummy/help_topics/global-options/detail.txt:6
7909
msgid ""
7910
"--version Print the version number. Must be supplied before the "
7911
"command.\n"
7912
"--no-aliases Do not process command aliases when running this command.\n"
7913
"--builtin Use the built-in version of a command, not the plugin "
7914
"version.\n"
7915
" This does not suppress other plugin effects.\n"
7916
"--no-plugins Do not process any plugins.\n"
7917
"--no-l10n Do not translate messages.\n"
7918
"--concurrency Number of processes that can be run concurrently (selftest)."
7919
msgstr ""
7920
7921
#: dummy/help_topics/global-options/detail.txt:14
7922
msgid ""
7923
"--profile Profile execution using the hotshot profiler.\n"
7924
"--lsprof Profile execution using the lsprof profiler.\n"
7925
"--lsprof-file Profile execution using the lsprof profiler, and write the\n"
7926
" results to a specified file. If the filename ends with "
7927
"\".txt\",\n"
7928
" text format will be used. If the filename either starts "
7929
"with\n"
7930
" \"callgrind.out\" or end with \".callgrind\", the output will "
7931
"be\n"
7932
" formatted for use with KCacheGrind. Otherwise, the output\n"
7933
" will be a pickle.\n"
7934
"--coverage Generate line coverage report in the specified directory."
7935
msgstr ""
7936
7937
#: dummy/help_topics/global-options/detail.txt:24
7938
msgid ""
7939
"-Oname=value Override the ``name`` config option setting it to ``value`` "
7940
"for\n"
7941
" the duration of the command. This can be used multiple times "
7942
"if\n"
7943
" several options need to be overridden."
7944
msgstr ""
7945
7946
#: dummy/help_topics/global-options/detail.txt:28
7947
msgid ""
7948
"See http://doc.bazaar.canonical.com/developers/profiling.html for more\n"
7949
"information on profiling."
7950
msgstr ""
7951
7952
#: dummy/help_topics/global-options/detail.txt:31
7953
msgid ""
7954
"A number of debug flags are also available to assist troubleshooting and\n"
7955
"development. See :doc:`debug-flags-help`.\n"
7956
msgstr ""
7957
7958
#: dummy/help_topics/global-options/summary.txt:1
7959
msgid "Options that control how Bazaar runs"
7960
msgstr ""
7961
7962
#: dummy/help_topics/hidden-commands/summary.txt:1
7963
msgid "All hidden commands"
7964
msgstr ""
7965
7966
#: dummy/help_topics/hooks/summary.txt:1
7967
msgid "Points at which custom processing can be added"
7968
msgstr ""
7969
7970
#: dummy/help_topics/launchpad/detail.txt:1
7971
msgid "Integration with Launchpad.net"
7972
msgstr ""
7973
7974
#: dummy/help_topics/launchpad/detail.txt:3
7975
msgid ""
7976
"Launchpad.net provides free Bazaar branch hosting with integrated bug and\n"
7977
"specification tracking."
7978
msgstr ""
7979
7980
#: dummy/help_topics/launchpad/detail.txt:6
7981
msgid ""
7982
"The bzr client (through the plugin called 'launchpad') has special\n"
7983
"features to communicate with Launchpad:"
7984
msgstr ""
7985
7986
#: dummy/help_topics/launchpad/detail.txt:9
7987
msgid ""
7988
" * The launchpad-login command tells Bazaar your Launchpad user name. "
7989
"This\n"
7990
" is then used by the 'lp:' transport to download your branches using\n"
7991
" bzr+ssh://."
7992
msgstr ""
7993
7994
#: dummy/help_topics/launchpad/detail.txt:13
7995
msgid ""
7996
" * The 'lp:' transport uses Launchpad as a directory service: for "
7997
"example\n"
7998
" 'lp:bzr' and 'lp:python' refer to the main branches of the relevant\n"
7999
" projects and may be branched, logged, etc. You can also use the 'lp:'\n"
8000
" transport to refer to specific branches, e.g. lp:~bzr/bzr/trunk."
8001
msgstr ""
8002
8003
#: dummy/help_topics/launchpad/detail.txt:18
8004
msgid ""
8005
" * The 'lp:' bug tracker alias can expand launchpad bug numbers to their\n"
8006
" URLs for use with 'bzr commit --fixes', e.g. 'bzr commit --fixes "
8007
"lp:12345'\n"
8008
" will record a revision property that marks that revision as fixing\n"
8009
" Launchpad bug 12345. When you push that branch to Launchpad it will\n"
8010
" automatically be linked to the bug report."
8011
msgstr ""
8012
8013
#: dummy/help_topics/launchpad/detail.txt:24
8014
msgid ""
8015
" * The register-branch command tells Launchpad about the url of a\n"
8016
" public branch. Launchpad will then mirror the branch, display\n"
8017
" its contents and allow it to be attached to bugs and other\n"
8018
" objects."
8019
msgstr ""
8020
8021
#: dummy/help_topics/launchpad/detail.txt:29
8022
msgid "For more information see http://help.launchpad.net/\n"
8023
msgstr ""
8024
8025
#: dummy/help_topics/launchpad/summary.txt:1
8026
msgid "Using Bazaar with Launchpad.net"
8027
msgstr ""
8028
8029
#: dummy/help_topics/location-alias/summary.txt:1
8030
msgid "Aliases for remembered locations"
8031
msgstr ""
8032
8033
#: dummy/help_topics/log-formats/summary.txt:1
8034
msgid "Details on the logging formats available"
8035
msgstr ""
8036
8037
#: dummy/help_topics/other-formats/summary.txt:1
8038
msgid "Experimental and deprecated storage formats"
8039
msgstr ""
8040
8041
#: dummy/help_topics/patterns/summary.txt:1
8042
msgid "Information on the pattern syntax"
8043
msgstr ""
8044
8045
#: dummy/help_topics/repositories/detail.txt:1
8046
msgid "Repositories"
8047
msgstr ""
8048
8049
#: dummy/help_topics/repositories/detail.txt:3
8050
msgid ""
8051
"Repositories in Bazaar are where committed information is stored. There is\n"
8052
"a repository associated with every branch."
8053
msgstr ""
8054
8055
#: dummy/help_topics/repositories/detail.txt:6
8056
msgid ""
8057
"Repositories are a form of database. Bzr will usually maintain this for\n"
8058
"good performance automatically, but in some situations (e.g. when doing\n"
8059
"very many commits in a short time period) you may want to ask bzr to\n"
8060
"optimise the database indices. This can be done by the 'bzr pack' command."
8061
msgstr ""
8062
8063
#: dummy/help_topics/repositories/detail.txt:11
8064
msgid ""
8065
"By default just running 'bzr init' will create a repository within the new\n"
8066
"branch but it is possible to create a shared repository which allows "
8067
"multiple\n"
8068
"branches to share their information in the same location. When a new branch "
8069
"is\n"
8070
"created it will first look to see if there is a containing shared repository "
8071
"it\n"
8072
"can use."
8073
msgstr ""
8074
8075
#: dummy/help_topics/repositories/detail.txt:17
8076
msgid ""
8077
"When two branches of the same project share a repository, there is\n"
8078
"generally a large space saving. For some operations (e.g. branching\n"
8079
"within the repository) this translates in to a large time saving."
8080
msgstr ""
8081
8082
#: dummy/help_topics/repositories/detail.txt:21
8083
msgid ""
8084
"To create a shared repository use the init-repository command (or the alias\n"
8085
"init-repo). This command takes the location of the repository to create. "
8086
"This\n"
8087
"means that 'bzr init-repository repo' will create a directory named 'repo',\n"
8088
"which contains a shared repository. Any new branches that are created in "
8089
"this\n"
8090
"directory will then use it for storage."
8091
msgstr ""
8092
8093
#: dummy/help_topics/repositories/detail.txt:27
8094
msgid ""
8095
"It is a good idea to create a repository whenever you might create more\n"
8096
"than one branch of a project. This is true for both working areas where you\n"
8097
"are doing the development, and any server areas that you use for hosting\n"
8098
"projects. In the latter case, it is common to want branches without working\n"
8099
"trees. Since the files in the branch will not be edited directly there is "
8100
"no\n"
8101
"need to use up disk space for a working tree. To create a repository in "
8102
"which\n"
8103
"the branches will not have working trees pass the '--no-trees' option to\n"
8104
"'init-repository'."
8105
msgstr ""
8106
8107
#: dummy/help_topics/repositories/detail.txt:38
8108
msgid ""
8109
" init-repository Create a shared repository. Use --no-trees to create "
8110
"one\n"
8111
" in which new branches won't get a working tree.\n"
8112
msgstr ""
8113
8114
#: dummy/help_topics/repositories/summary.txt:1
8115
msgid "Basic information on shared repositories."
8116
msgstr ""
8117
8118
#: dummy/help_topics/revisionspec/summary.txt:1
8119
msgid "Explain how to use --revision"
8120
msgstr ""
8121
8122
#: dummy/help_topics/rules/summary.txt:1
8123
msgid "Information on defining rule-based preferences"
8124
msgstr ""
8125
8126
#: dummy/help_topics/standalone-trees/detail.txt:1
8127
msgid "Standalone Trees"
8128
msgstr ""
8129
8130
#: dummy/help_topics/standalone-trees/detail.txt:3
8131
msgid ""
8132
"A standalone tree is a working tree with an associated repository. It\n"
8133
"is an independently usable branch, with no dependencies on any other.\n"
8134
"Creating a standalone tree (via bzr init) is the quickest way to put\n"
8135
"an existing project under version control."
8136
msgstr ""
8137
8138
#: dummy/help_topics/standalone-trees/detail.txt:8
8139
msgid "Related Commands::"
8140
msgstr ""
8141
8142
#: dummy/help_topics/standalone-trees/detail.txt:10
8143
msgid " init Make a directory into a versioned branch.\n"
8144
msgstr ""
8145
8146
#: dummy/help_topics/standalone-trees/summary.txt:1
8147
msgid "Information on what a standalone tree is"
8148
msgstr ""
8149
8150
#: dummy/help_topics/standard-options/detail.txt:1
8151
msgid "Standard Options"
8152
msgstr ""
8153
8154
#: dummy/help_topics/standard-options/detail.txt:3
8155
msgid "Standard options are legal for all commands."
8156
msgstr ""
8157
8158
#: dummy/help_topics/standard-options/detail.txt:5
8159
msgid ""
8160
"--help, -h Show help message.\n"
8161
"--verbose, -v Display more information.\n"
8162
"--quiet, -q Only display errors and warnings."
8163
msgstr ""
8164
8165
#: dummy/help_topics/standard-options/detail.txt:9
8166
msgid "Unlike global options, standard options can be used in aliases.\n"
8167
msgstr ""
8168
8169
#: dummy/help_topics/standard-options/summary.txt:1
8170
msgid "Options that can be used with any command"
8171
msgstr ""
8172
8173
#: dummy/help_topics/status-flags/detail.txt:1
8174
msgid "Status Flags"
8175
msgstr ""
8176
8177
#: dummy/help_topics/status-flags/detail.txt:3
8178
msgid ""
8179
"Status flags are used to summarise changes to the working tree in a concise\n"
8180
"manner. They are in the form::"
8181
msgstr ""
8182
8183
#: dummy/help_topics/status-flags/detail.txt:6
8184
msgid " xxx <filename>"
8185
msgstr ""
8186
8187
#: dummy/help_topics/status-flags/detail.txt:8
8188
msgid "where the columns' meanings are as follows."
8189
msgstr ""
8190
8191
#: dummy/help_topics/status-flags/detail.txt:10
8192
msgid "Column 1 - versioning/renames::"
8193
msgstr ""
8194
8195
#: dummy/help_topics/status-flags/detail.txt:12
8196
msgid ""
8197
" + File versioned\n"
8198
" - File unversioned\n"
8199
" R File renamed\n"
8200
" ? File unknown\n"
8201
" X File nonexistent (and unknown to bzr)\n"
8202
" C File has conflicts\n"
8203
" P Entry for a pending merge (not a file)"
8204
msgstr ""
8205
8206
#: dummy/help_topics/status-flags/detail.txt:20
8207
msgid "Column 2 - contents::"
8208
msgstr ""
8209
8210
#: dummy/help_topics/status-flags/detail.txt:22
8211
msgid ""
8212
" N File created\n"
8213
" D File deleted\n"
8214
" K File kind changed\n"
8215
" M File modified"
8216
msgstr ""
8217
8218
#: dummy/help_topics/status-flags/detail.txt:27
8219
msgid "Column 3 - execute::"
8220
msgstr ""
8221
8222
#: dummy/help_topics/status-flags/detail.txt:29
8223
msgid " * The execute bit was changed\n"
8224
msgstr ""
8225
8226
#: dummy/help_topics/status-flags/summary.txt:1
8227
msgid "Help on status flags"
8228
msgstr ""
8229
8230
#: dummy/help_topics/sync-for-reconfigure/detail.txt:1
8231
msgid "Branches Out of Sync"
8232
msgstr ""
8233
8234
#: dummy/help_topics/sync-for-reconfigure/detail.txt:3
8235
msgid ""
8236
"When reconfiguring a checkout, tree or branch into a lightweight checkout,\n"
8237
"a local branch must be destroyed. (For checkouts, this is the local branch\n"
8238
"that serves primarily as a cache.) If the branch-to-be-destroyed does not\n"
8239
"have the same last revision as the new reference branch for the lightweight\n"
8240
"checkout, data could be lost, so Bazaar refuses."
8241
msgstr ""
8242
8243
#: dummy/help_topics/sync-for-reconfigure/detail.txt:9
8244
msgid "How you deal with this depends on *why* the branches are out of sync."
8245
msgstr ""
8246
8247
#: dummy/help_topics/sync-for-reconfigure/detail.txt:11
8248
msgid ""
8249
"If you have a checkout and have done local commits, you can get back in "
8250
"sync\n"
8251
"by running \"bzr update\" (and possibly \"bzr commit\")."
8252
msgstr ""
8253
8254
#: dummy/help_topics/sync-for-reconfigure/detail.txt:14
8255
msgid ""
8256
"If you have a branch and the remote branch is out-of-date, you can push\n"
8257
"the local changes using \"bzr push\". If the local branch is out of date, "
8258
"you\n"
8259
"can do \"bzr pull\". If both branches have had changes, you can merge, "
8260
"commit\n"
8261
"and then push your changes. If you decide that some of the changes aren't\n"
8262
"useful, you can \"push --overwrite\" or \"pull --overwrite\" instead.\n"
8263
msgstr ""
8264
8265
#: dummy/help_topics/sync-for-reconfigure/summary.txt:1
8266
msgid "Steps to resolve \"out-of-sync\" when reconfiguring"
8267
msgstr ""
8268
8269
#: dummy/help_topics/topics/summary.txt:1
8270
msgid "Topics list"
8271
msgstr ""
8272
8273
#: dummy/help_topics/url-special-chars/summary.txt:1
8274
msgid "Special character handling in URLs"
8275
msgstr ""
8276
8277
#: dummy/help_topics/urlspec/summary.txt:1
8278
msgid "Supported transport protocols"
8279
msgstr ""
8280
8281
#: dummy/help_topics/working-trees/detail.txt:1
8282
msgid "Working Trees"
8283
msgstr ""
8284
8285
#: dummy/help_topics/working-trees/detail.txt:3
8286
msgid ""
8287
"A working tree is the contents of a branch placed on disk so that you can\n"
8288
"see the files and edit them. The working tree is where you make changes to "
8289
"a\n"
8290
"branch, and when you commit the current state of the working tree is the\n"
8291
"snapshot that is recorded in the commit."
8292
msgstr ""
8293
8294
#: dummy/help_topics/working-trees/detail.txt:8
8295
msgid ""
8296
"When you push a branch to a remote system, a working tree will not be\n"
8297
"created. If one is already present the files will not be updated. The\n"
8298
"branch information will be updated and the working tree will be marked\n"
8299
"as out-of-date. Updating a working tree remotely is difficult, as there\n"
8300
"may be uncommitted changes or the update may cause content conflicts that "
8301
"are\n"
8302
"difficult to deal with remotely."
8303
msgstr ""
8304
8305
#: dummy/help_topics/working-trees/detail.txt:15
8306
msgid ""
8307
"If you have a branch with no working tree you can use the 'checkout' "
8308
"command\n"
8309
"to create a working tree. If you run 'bzr checkout .' from the branch it "
8310
"will\n"
8311
"create the working tree. If the branch is updated remotely, you can update "
8312
"the\n"
8313
"working tree by running 'bzr update' in that directory."
8314
msgstr ""
8315
8316
#: dummy/help_topics/working-trees/detail.txt:20
8317
msgid ""
8318
"If you have a branch with a working tree that you do not want the 'remove-"
8319
"tree'\n"
8320
"command will remove the tree if it is safe. This can be done to avoid the\n"
8321
"warning about the remote working tree not being updated when pushing to the\n"
8322
"branch. It can also be useful when working with a '--no-trees' repository\n"
8323
"(see 'bzr help repositories')."
8324
msgstr ""
8325
8326
#: dummy/help_topics/working-trees/detail.txt:26
8327
msgid ""
8328
"If you want to have a working tree on a remote machine that you push to you\n"
8329
"can either run 'bzr update' in the remote branch after each push, or use "
8330
"some\n"
8331
"other method to update the tree during the push. There is an 'rspush' "
8332
"plugin\n"
8333
"that will update the working tree using rsync as well as doing a push. "
8334
"There\n"
8335
"is also a 'push-and-update' plugin that automates running 'bzr update' via "
8336
"SSH\n"
8337
"after each push."
8338
msgstr ""
8339
8340
#: dummy/help_topics/working-trees/detail.txt:33
8341
msgid "Useful commands::"
8342
msgstr ""
8343
8344
#: dummy/help_topics/working-trees/detail.txt:35
8345
msgid ""
8346
" checkout Create a working tree when a branch does not have one.\n"
8347
" remove-tree Removes the working tree from a branch when it is safe to do "
8348
"so.\n"
8349
" update When a working tree is out of sync with its associated "
8350
"branch\n"
8351
" this will update the tree to match the branch.\n"
8352
msgstr ""
8353
8354
#: dummy/help_topics/working-trees/summary.txt:1
8355
msgid "Information on working trees"
8356
msgstr ""
8357
8358
#: en/help_topics/authentication.txt:1
8359
msgid ""
8360
"Authentication Settings\n"
8361
"======================="
8362
msgstr ""
8363
8364
#: en/help_topics/authentication.txt:4
8365
msgid ""
8366
"\n"
8367
"Intent\n"
8368
"------"
8369
msgstr ""
8370
8371
#: en/help_topics/authentication.txt:8
8372
msgid ""
8373
"Many different authentication policies can be described in the\n"
8374
"``authentication.conf`` file but a particular user should need only a few\n"
8375
"definitions to cover his needs without having to specify a user and a "
8376
"password\n"
8377
"for every branch he uses."
8378
msgstr ""
8379
8380
#: en/help_topics/authentication.txt:13
8381
msgid ""
8382
"The definitions found in this file are used to find the credentials to use "
8383
"for\n"
8384
"a given url. The same credentials can generally be used for as many branches "
8385
"as\n"
8386
"possible by grouping their declaration around the remote servers that need\n"
8387
"them. It's even possible to declare credentials that will be used by "
8388
"different\n"
8389
"servers."
8390
msgstr ""
8391
8392
#: en/help_topics/authentication.txt:19
8393
msgid ""
8394
"The intent is to make this file as small as possible to minimize maintenance."
8395
msgstr ""
8396
8397
#: en/help_topics/authentication.txt:21
8398
msgid ""
8399
"Once the relevant credentials are declared in this file you may use branch "
8400
"urls\n"
8401
"without embedding passwords (security hazard) or even users (enabling "
8402
"sharing\n"
8403
"of your urls with others)."
8404
msgstr ""
8405
8406
#: en/help_topics/authentication.txt:25
8407
msgid "Instead of using::"
8408
msgstr ""
8409
8410
#: en/help_topics/authentication.txt:27
8411
msgid " bzr branch ftp://joe:secret@host.com/path/to/my/branch"
8412
msgstr ""
8413
8414
#: en/help_topics/authentication.txt:29
8415
msgid "you simply use::"
8416
msgstr ""
8417
8418
#: en/help_topics/authentication.txt:31
8419
msgid " bzr branch ftp://host.com/path/to/my/branch"
8420
msgstr ""
8421
8422
#: en/help_topics/authentication.txt:33
8423
msgid ""
8424
"provided you have created the following ``authentication.conf`` file::"
8425
msgstr ""
8426
8427
#: en/help_topics/authentication.txt:35
8428
msgid ""
8429
" [myprojects]\n"
8430
" scheme=ftp\n"
8431
" host=host.com\n"
8432
" user=joe\n"
8433
" password=secret\n"
8434
" "
8435
msgstr ""
8436
8437
#: en/help_topics/authentication.txt:42
8438
msgid ""
8439
"Authentication definitions\n"
8440
"--------------------------"
8441
msgstr ""
8442
8443
#: en/help_topics/authentication.txt:45
8444
msgid ""
8445
"There are two kinds of authentication used by the various schemes supported "
8446
"by\n"
8447
"bzr:"
8448
msgstr ""
8449
8450
#: en/help_topics/authentication.txt:48
8451
msgid "1. user and password"
8452
msgstr ""
8453
8454
#: en/help_topics/authentication.txt:50
8455
msgid ""
8456
"``FTP`` needs a (``user``, ``password``) to authenticate against a ``host``\n"
8457
"``SFTP`` can use either a password or a host key to authenticate. However,\n"
8458
"ssh agents are a better, more secure solution. So we have chosen to not "
8459
"provide\n"
8460
"our own less secure method."
8461
msgstr ""
8462
8463
#: en/help_topics/authentication.txt:55
8464
msgid "2. user, realm and password"
8465
msgstr ""
8466
8467
#: en/help_topics/authentication.txt:57
8468
msgid ""
8469
"``HTTP`` and ``HTTPS`` needs a (``user, realm, password``) to authenticate\n"
8470
"against a host. But, by using ``.htaccess`` files, for example, it is "
8471
"possible\n"
8472
"to define several (``user, realm, password``) for a given ``host``. So what "
8473
"is\n"
8474
"really needed is (``user``, ``password``, ``host``, ``path``). The ``realm`` "
8475
"is\n"
8476
"not taken into account in the definitions, but will displayed if bzr "
8477
"prompts\n"
8478
"you for a password."
8479
msgstr ""
8480
8481
#: en/help_topics/authentication.txt:64
8482
msgid ""
8483
"``HTTP proxy`` can be handled as ``HTTP`` (or ``HTTPS``) by explicitly\n"
8484
"specifying the appropriate port."
8485
msgstr ""
8486
8487
#: en/help_topics/authentication.txt:67
8488
msgid ""
8489
"To take all schemes into account, the password will be deduced from a set "
8490
"of\n"
8491
"authentication definitions (``scheme``, ``host``, ``port``, ``path``, "
8492
"``user``,\n"
8493
"``password``)."
8494
msgstr ""
8495
8496
#: en/help_topics/authentication.txt:71
8497
msgid ""
8498
" * ``scheme``: can be empty (meaning the rest of the definition can be "
8499
"used\n"
8500
" for any scheme), ``SFTP`` and ``bzr+ssh`` should not be used here, "
8501
"``ssh``\n"
8502
" should be used instead since this is the real scheme regarding\n"
8503
" authentication,"
8504
msgstr ""
8505
8506
#: en/help_topics/authentication.txt:76
8507
msgid " * ``host``: can be empty (to act as a default for any host),"
8508
msgstr ""
8509
8510
#: en/help_topics/authentication.txt:78
8511
msgid ""
8512
" * ``port`` can be empty (useful when an host provides several servers for "
8513
"the\n"
8514
" same scheme), only numerical values are allowed, this should be used "
8515
"only\n"
8516
" when the server uses a port different than the scheme standard port,"
8517
msgstr ""
8518
8519
#: en/help_topics/authentication.txt:82
8520
msgid " * ``path``: can be empty (FTP or SFTP will never user it),"
8521
msgstr ""
8522
8523
#: en/help_topics/authentication.txt:84
8524
msgid ""
8525
" * ``user``: can be empty (``bzr`` will defaults to python's\n"
8526
" ``getpass.get_user()``),"
8527
msgstr ""
8528
8529
#: en/help_topics/authentication.txt:87
8530
msgid ""
8531
" * ``password``: can be empty if you prefer to always be prompted for your\n"
8532
" password."
8533
msgstr ""
8534
8535
#: en/help_topics/authentication.txt:90
8536
msgid ""
8537
"Multiple definitions can be provided and, for a given URL, bzr will select "
8538
"a\n"
8539
"(``user`` [, ``password``]) based on the following rules :"
8540
msgstr ""
8541
8542
#: en/help_topics/authentication.txt:93
8543
msgid " 1. the first match wins,"
8544
msgstr ""
8545
8546
#: en/help_topics/authentication.txt:95
8547
msgid " 2. empty fields match everything,"
8548
msgstr ""
8549
8550
#: en/help_topics/authentication.txt:97
8551
msgid ""
8552
" 3. ``scheme`` matches even if decorators are used in the requested URL,"
8553
msgstr ""
8554
8555
#: en/help_topics/authentication.txt:99
8556
msgid ""
8557
" 4. ``host`` matches exactly or act as a domain if it starts with '.'\n"
8558
" (``project.bzr.sf.net`` will match ``.bzr.sf.net`` but "
8559
"``projectbzr.sf.net``\n"
8560
" will not match ``bzr.sf.net``)."
8561
msgstr ""
8562
8563
#: en/help_topics/authentication.txt:103
8564
msgid ""
8565
" 5. ``port`` matches if included in the requested URL (exact matches only)"
8566
msgstr ""
8567
8568
#: en/help_topics/authentication.txt:105
8569
msgid ""
8570
" 6. ``path`` matches if included in the requested URL (and by rule #2 "
8571
"above,\n"
8572
" empty paths will match any provided path)."
8573
msgstr ""
8574
8575
#: en/help_topics/authentication.txt:110
8576
msgid ""
8577
"File format\n"
8578
"-----------"
8579
msgstr ""
8580
8581
#: en/help_topics/authentication.txt:113
8582
msgid ""
8583
"The general rules for :doc:`configuration files <configuration-help>`\n"
8584
"apply except for the variable policies."
8585
msgstr ""
8586
8587
#: en/help_topics/authentication.txt:116
8588
msgid "Each section describes an authentication definition."
8589
msgstr ""
8590
8591
#: en/help_topics/authentication.txt:118
8592
msgid ""
8593
"The section name is an arbitrary string, only the ``DEFAULT`` value is "
8594
"reserved\n"
8595
"and should appear as the *last* section."
8596
msgstr ""
8597
8598
#: en/help_topics/authentication.txt:121
8599
msgid "Each section should define:"
8600
msgstr ""
8601
8602
#: en/help_topics/authentication.txt:123
8603
msgid "* ``user``: the login to be used,"
8604
msgstr ""
8605
8606
#: en/help_topics/authentication.txt:125
8607
msgid "Each section could define:"
8608
msgstr ""
8609
8610
#: en/help_topics/authentication.txt:127
8611
msgid "* ``host``: the remote server,"
8612
msgstr ""
8613
8614
#: en/help_topics/authentication.txt:129
8615
msgid "* ``port``: the port the server is listening,"
8616
msgstr ""
8617
8618
#: en/help_topics/authentication.txt:131
8619
msgid "* ``path``: the branch location,"
8620
msgstr ""
8621
8622
#: en/help_topics/authentication.txt:133
8623
msgid "* ``password``: the password."
8624
msgstr ""
8625
8626
#: en/help_topics/authentication.txt:135
8627
msgid ""
8628
"\n"
8629
"Examples\n"
8630
"--------"
8631
msgstr ""
8632
8633
#: en/help_topics/authentication.txt:139
8634
msgid ""
8635
"\n"
8636
"Personal projects hosted outside\n"
8637
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
8638
msgstr ""
8639
8640
#: en/help_topics/authentication.txt:143
8641
msgid ""
8642
"All connections are done with the same ``user`` (the remote one for which "
8643
"the\n"
8644
"default bzr one is not appropriate) and the password is always prompted "
8645
"with\n"
8646
"some exceptions::"
8647
msgstr ""
8648
8649
#: en/help_topics/authentication.txt:147
8650
msgid ""
8651
" # Pet projects on hobby.net\n"
8652
" [hobby]\n"
8653
" host=r.hobby.net\n"
8654
" user=jim\n"
8655
" password=obvious1234\n"
8656
" \n"
8657
" # Home server\n"
8658
" [home]\n"
8659
" scheme=https\n"
8660
" host=home.net\n"
8661
" user=joe\n"
8662
" password=1essobV10us\n"
8663
" \n"
8664
" [DEFAULT]\n"
8665
" # Our local user is barbaz, on all remote sites we're known as "
8666
"foobar\n"
8667
" user=foobar"
8668
msgstr ""
8669
8670
#: en/help_topics/authentication.txt:164
8671
msgid ""
8672
"\n"
8673
"Source hosting provider\n"
8674
"~~~~~~~~~~~~~~~~~~~~~~~"
8675
msgstr ""
8676
8677
#: en/help_topics/authentication.txt:168
8678
msgid "In the shp.net (fictitious) domain, each project has its own site::"
8679
msgstr ""
8680
8681
#: en/help_topics/authentication.txt:170
8682
msgid ""
8683
" [shpnet domain]\n"
8684
" # we use sftp, but ssh is the scheme used for authentication\n"
8685
" scheme=ssh\n"
8686
" # The leading '.' ensures that 'shp.net' alone doesn't match\n"
8687
" host=.shp.net\n"
8688
" user=joe\n"
8689
" # bzr don't support supplying a password for sftp,\n"
8690
" # consider using an ssh agent if you don't want to supply\n"
8691
" # a password interactively. (pageant, ssh-agent, etc)"
8692
msgstr ""
8693
8694
#: en/help_topics/authentication.txt:180
8695
msgid ""
8696
"HTTPS, SFTP servers and their proxy\n"
8697
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
8698
msgstr ""
8699
8700
#: en/help_topics/authentication.txt:183
8701
msgid ""
8702
"At company.com, the server hosting release and integration branches is "
8703
"behind a\n"
8704
"proxy, and the two branches use different authentication policies::"
8705
msgstr ""
8706
8707
#: en/help_topics/authentication.txt:186
8708
msgid ""
8709
" [reference code]\n"
8710
" scheme=https\n"
8711
" host=dev.company.com\n"
8712
" path=/dev\n"
8713
" user=user1\n"
8714
" password=pass1"
8715
msgstr ""
8716
8717
#: en/help_topics/authentication.txt:193
8718
msgid ""
8719
" # development branches on dev server\n"
8720
" [dev]\n"
8721
" scheme=ssh # bzr+ssh and sftp are available here\n"
8722
" host=dev.company.com\n"
8723
" path=/dev/integration\n"
8724
" user=user2\n"
8725
" \n"
8726
" # proxy\n"
8727
" [proxy]\n"
8728
" scheme=http\n"
8729
" host=proxy.company.com\n"
8730
" port=3128\n"
8731
" user=proxyuser1\n"
8732
" password=proxypass1"
8733
msgstr ""
8734
8735
#: en/help_topics/authentication.txt:208
8736
msgid ""
8737
"\n"
8738
"Planned enhancements\n"
8739
"--------------------"
8740
msgstr ""
8741
8742
#: en/help_topics/authentication.txt:212
8743
msgid ""
8744
"The following are not yet implemented but planned as parts of a work in\n"
8745
"progress:"
8746
msgstr ""
8747
8748
#: en/help_topics/authentication.txt:215
8749
msgid "* add a ``password_encoding`` field allowing:"
8750
msgstr ""
8751
8752
#: en/help_topics/authentication.txt:217
8753
msgid ""
8754
" - storing the passwords in various obfuscating encodings (base64 for one),"
8755
msgstr ""
8756
8757
#: en/help_topics/authentication.txt:219
8758
msgid " - delegate password storage to plugins (.netrc for example)."
8759
msgstr ""
8760
8761
#: en/help_topics/authentication.txt:221
8762
msgid ""
8763
"* update the credentials when the user is prompted for user or password,"
8764
msgstr ""
8765
8766
#: en/help_topics/authentication.txt:223
8767
msgid "* add a ``verify_certificates`` field for ``HTTPS``."
8768
msgstr ""
8769
8770
#: en/help_topics/authentication.txt:225
8771
msgid ""
8772
"The ``password_encoding`` and ``verify_certificates`` fields are recognized "
8773
"but\n"
8774
"ignored in the actual implementation.\n"
8775
msgstr ""
8776
8777
#: en/help_topics/bugs.txt:1
8778
msgid "Bug Tracker Settings"
8779
msgstr ""
8780
8781
#: en/help_topics/bugs.txt:3
8782
msgid ""
8783
"When making a commit, metadata about bugs fixed by that change can be\n"
8784
"recorded by using the ``--fixes`` option. For each bug marked as fixed, an\n"
8785
"entry is included in the 'bugs' revision property stating '<url> <status>'.\n"
8786
"(The only ``status`` value currently supported is ``fixed.``)"
8787
msgstr ""
8788
8789
#: en/help_topics/bugs.txt:8
8790
msgid ""
8791
"The ``--fixes`` option allows you to specify a bug tracker and a bug "
8792
"identifier\n"
8793
"rather than a full URL. This looks like::"
8794
msgstr ""
8795
8796
#: en/help_topics/bugs.txt:11
8797
msgid " bzr commit --fixes <tracker>:<id>"
8798
msgstr ""
8799
8800
#: en/help_topics/bugs.txt:13 en/help_topics/configuration.txt:398
8801
msgid "or::"
8802
msgstr ""
8803
8804
#: en/help_topics/bugs.txt:15
8805
msgid " bzr commit --fixes <id>"
8806
msgstr ""
8807
8808
#: en/help_topics/bugs.txt:17
8809
msgid ""
8810
"where \"<tracker>\" is an identifier for the bug tracker, and \"<id>\" is "
8811
"the\n"
8812
"identifier for that bug within the bugtracker, usually the bug number.\n"
8813
"If \"<tracker>\" is not specified the ``bugtracker`` set in the branch\n"
8814
"or global configuration is used."
8815
msgstr ""
8816
8817
#: en/help_topics/bugs.txt:22
8818
msgid ""
8819
"Bazaar knows about a few bug trackers that have many users. If\n"
8820
"you use one of these bug trackers then there is no setup required to\n"
8821
"use this feature, you just need to know the tracker identifier to use.\n"
8822
"These are the bugtrackers that are built in:"
8823
msgstr ""
8824
8825
#: en/help_topics/bugs.txt:27
8826
msgid ""
8827
" ============================ ============ ============\n"
8828
" URL Abbreviation Example\n"
8829
" ============================ ============ ============\n"
8830
" https://bugs.launchpad.net/ lp lp:12345\n"
8831
" http://bugs.debian.org/ deb deb:12345\n"
8832
" http://bugzilla.gnome.org/ gnome gnome:12345\n"
8833
" ============================ ============ ============"
8834
msgstr ""
8835
8836
#: en/help_topics/bugs.txt:35
8837
msgid ""
8838
"For the bug trackers not listed above configuration is required.\n"
8839
"Support for generating the URLs for any project using Bugzilla or Trac\n"
8840
"is built in, along with a template mechanism for other bugtrackers with\n"
8841
"simple URL schemes. If your bug tracker can't be described by one\n"
8842
"of the schemes described below then you can write a plugin to support\n"
8843
"it."
8844
msgstr ""
8845
8846
#: en/help_topics/bugs.txt:42
8847
msgid ""
8848
"If you use Bugzilla or Trac, then you only need to set a configuration\n"
8849
"variable which contains the base URL of the bug tracker. These options\n"
8850
"can go into ``bazaar.conf``, ``branch.conf`` or into a branch-specific\n"
8851
"configuration section in ``locations.conf``. You can set up these values\n"
8852
"for each of the projects you work on."
8853
msgstr ""
8854
8855
#: en/help_topics/bugs.txt:48
8856
msgid ""
8857
"Note: As you provide a short name for each tracker, you can specify one or\n"
8858
"more bugs in one or more trackers at commit time if you wish."
8859
msgstr ""
8860
8861
#: en/help_topics/bugs.txt:51
8862
msgid ""
8863
"Launchpad\n"
8864
"---------"
8865
msgstr ""
8866
8867
#: en/help_topics/bugs.txt:54
8868
msgid ""
8869
"Use ``bzr commit --fixes lp:2`` to record that this commit fixes bug 2."
8870
msgstr ""
8871
8872
#: en/help_topics/bugs.txt:56
8873
msgid ""
8874
"bugzilla_<tracker>_url\n"
8875
"----------------------"
8876
msgstr ""
8877
8878
#: en/help_topics/bugs.txt:59
8879
msgid ""
8880
"If present, the location of the Bugzilla bug tracker referred to by\n"
8881
"<tracker>. This option can then be used together with ``bzr commit\n"
8882
"--fixes`` to mark bugs in that tracker as being fixed by that commit. For\n"
8883
"example::"
8884
msgstr ""
8885
8886
#: en/help_topics/bugs.txt:64
8887
msgid " bugzilla_squid_url = http://bugs.squid-cache.org"
8888
msgstr ""
8889
8890
#: en/help_topics/bugs.txt:66
8891
msgid ""
8892
"would allow ``bzr commit --fixes squid:1234`` to mark Squid's bug 1234 as\n"
8893
"fixed."
8894
msgstr ""
8895
8896
#: en/help_topics/bugs.txt:69
8897
msgid ""
8898
"trac_<tracker>_url\n"
8899
"------------------"
8900
msgstr ""
8901
8902
#: en/help_topics/bugs.txt:72
8903
msgid ""
8904
"If present, the location of the Trac instance referred to by\n"
8905
"<tracker>. This option can then be used together with ``bzr commit\n"
8906
"--fixes`` to mark bugs in that tracker as being fixed by that commit. For\n"
8907
"example::"
8908
msgstr ""
8909
8910
#: en/help_topics/bugs.txt:77
8911
msgid " trac_twisted_url = http://www.twistedmatrix.com/trac"
8912
msgstr ""
8913
8914
#: en/help_topics/bugs.txt:79
8915
msgid ""
8916
"would allow ``bzr commit --fixes twisted:1234`` to mark Twisted's bug 1234 "
8917
"as\n"
8918
"fixed."
8919
msgstr ""
8920
8921
#: en/help_topics/bugs.txt:82
8922
msgid ""
8923
"bugtracker_<tracker>_url\n"
8924
"------------------------"
8925
msgstr ""
8926
8927
#: en/help_topics/bugs.txt:85
8928
msgid ""
8929
"If present, the location of a generic bug tracker instance referred to by\n"
8930
"<tracker>. The location must contain an ``{id}`` placeholder,\n"
8931
"which will be replaced by a specific bug ID. This option can then be used\n"
8932
"together with ``bzr commit --fixes`` to mark bugs in that tracker as being\n"
8933
"fixed by that commit. For example::"
8934
msgstr ""
8935
8936
#: en/help_topics/bugs.txt:91
8937
msgid " bugtracker_python_url = http://bugs.python.org/issue{id}"
8938
msgstr ""
8939
8940
#: en/help_topics/bugs.txt:93
8941
msgid ""
8942
"would allow ``bzr commit --fixes python:1234`` to mark bug 1234 in Python's\n"
8943
"Roundup bug tracker as fixed, or::"
8944
msgstr ""
8945
8946
#: en/help_topics/bugs.txt:96
8947
msgid ""
8948
" bugtracker_cpan_url = http://rt.cpan.org/Public/Bug/Display.html?id={id}"
8949
msgstr ""
8950
8951
#: en/help_topics/bugs.txt:98
8952
msgid ""
8953
"would allow ``bzr commit --fixes cpan:1234`` to mark bug 1234 in CPAN's\n"
8954
"RT bug tracker as fixed, or::"
8955
msgstr ""
8956
8957
#: en/help_topics/bugs.txt:101
8958
msgid " bugtracker_hudson_url = http://issues.hudson-ci.org/browse/{id}"
8959
msgstr ""
8960
8961
#: en/help_topics/bugs.txt:103
8962
msgid ""
8963
"would allow ``bzr commit --fixes hudson:HUDSON-1234`` to mark bug HUDSON-"
8964
"1234\n"
8965
"in Hudson's JIRA bug tracker as fixed.\n"
8966
msgstr ""
8967
8968
#: en/help_topics/commands.txt:1
8969
msgid ""
8970
"add Add specified files or directories.\n"
8971
"alias Set/unset and display aliases.\n"
8972
"annotate Show the origin of each line in a file.\n"
8973
"bash-completion Generate a shell function for bash command line "
8974
"completion.\n"
8975
" [bash_completion]\n"
8976
"bind Convert the current branch into a checkout of the "
8977
"supplied\n"
8978
" branch.\n"
8979
"branch Create a new branch that is a copy of an existing branch.\n"
8980
"branches List the branches available at the current location.\n"
8981
"break-lock Break a dead lock.\n"
8982
"cat Write the contents of a file as of a given revision to\n"
8983
" standard output.\n"
8984
"check Validate working tree structure, branch consistency and\n"
8985
" repository history.\n"
8986
"checkout Create a new checkout of an existing branch.\n"
8987
"clean-tree Remove unwanted files from working tree.\n"
8988
"commit Commit changes into a new revision.\n"
8989
"config Display, set or remove a configuration option.\n"
8990
"conflicts List files with conflicts.\n"
8991
"deleted List files deleted in the working tree.\n"
8992
"diff Show differences in the working tree, between revisions "
8993
"or\n"
8994
" branches.\n"
8995
"dpush Push into a different VCS without any custom bzr "
8996
"metadata.\n"
8997
"export Export current or past revision to a destination directory "
8998
"or\n"
8999
" archive.\n"
9000
"help Show help on a command or other topic.\n"
9001
"ignore Ignore specified files or patterns.\n"
9002
"ignored List ignored files and the patterns that matched them.\n"
9003
"info Show information about a working tree, branch or "
9004
"repository.\n"
9005
"init Make a directory into a versioned branch.\n"
9006
"init-repository Create a shared repository for branches to share storage\n"
9007
" space.\n"
9008
"join Combine a tree into its containing tree.\n"
9009
"launchpad-login Show or set the Launchpad user ID. [launchpad]\n"
9010
"launchpad-mirror Ask Launchpad to mirror a branch now. [launchpad]\n"
9011
"launchpad-open Open a Launchpad branch page in your web browser. "
9012
"[launchpad]\n"
9013
"log Show historical log for a branch or subset of a branch.\n"
9014
"lp-find-proposal Find the proposal to merge this revision. [launchpad]\n"
9015
"lp-propose-merge Propose merging a branch on Launchpad. [launchpad]\n"
9016
"ls List files in a tree.\n"
9017
"merge Perform a three-way merge.\n"
9018
"missing Show unmerged/unpulled revisions between two branches.\n"
9019
"mkdir Create a new versioned directory.\n"
9020
"mv Move or rename a file.\n"
9021
"nick Print or set the branch nickname.\n"
9022
"pack Compress the data within a repository.\n"
9023
"plugins List the installed plugins.\n"
9024
"pull Turn this branch into a mirror of another branch.\n"
9025
"push Update a mirror of this branch.\n"
9026
"reconcile Reconcile bzr metadata in a branch.\n"
9027
"reconfigure Reconfigure the type of a bzr directory.\n"
9028
"register-branch Register a branch with launchpad.net. [launchpad]\n"
9029
"remerge Redo a merge.\n"
9030
"remove Remove files or directories.\n"
9031
"remove-branch Remove a branch.\n"
9032
"remove-tree Remove the working tree from a given branch/checkout.\n"
9033
"renames Show list of renamed files.\n"
9034
"resolve Mark a conflict as resolved.\n"
9035
"revert Revert files to a previous revision.\n"
9036
"revno Show current revision number.\n"
9037
"root Show the tree root directory.\n"
9038
"send Mail or create a merge-directive for submitting changes.\n"
9039
"serve Run the bzr server.\n"
9040
"shelve Temporarily set aside some changes from the current tree.\n"
9041
"sign-my-commits Sign all commits by a given committer.\n"
9042
"split Split a subdirectory of a tree into a separate tree.\n"
9043
"status Display status summary.\n"
9044
"switch Set the branch of a checkout and update.\n"
9045
"tag Create, remove or modify a tag naming a revision.\n"
9046
"tags List tags.\n"
9047
"testament Show testament (signing-form) of a revision.\n"
9048
"unbind Convert the current checkout into a regular branch.\n"
9049
"uncommit Remove the last committed revision.\n"
9050
"unshelve Restore shelved changes.\n"
9051
"update Update a working tree to a new revision.\n"
9052
"upgrade Upgrade a repository, branch or working tree to a newer\n"
9053
" format.\n"
9054
"verify-signatures Verify all commit signatures.\n"
9055
"version Show version of bzr.\n"
9056
"version-info Show version information about this tree.\n"
9057
"view Manage filtered views.\n"
9058
"whoami Show or set bzr user id.\n"
9059
msgstr ""
9060
9061
#: en/help_topics/configuration.txt:1
9062
msgid ""
9063
"Configuration Settings\n"
9064
"======================="
9065
msgstr ""
9066
9067
#: en/help_topics/configuration.txt:4
9068
msgid ""
9069
"Environment settings\n"
9070
"---------------------"
9071
msgstr ""
9072
9073
#: en/help_topics/configuration.txt:7
9074
msgid ""
9075
"While most configuration is handled by configuration files, some options\n"
9076
"which may be semi-permanent can also be controlled through the environment."
9077
msgstr ""
9078
9079
#: en/help_topics/configuration.txt:10
9080
msgid ""
9081
"BZR_EMAIL\n"
9082
"~~~~~~~~~"
9083
msgstr ""
9084
9085
#: en/help_topics/configuration.txt:13
9086
msgid "Override the email id used by Bazaar. Typical format::"
9087
msgstr ""
9088
9089
#: en/help_topics/configuration.txt:15
9090
msgid " \"John Doe <jdoe@example.com>\""
9091
msgstr ""
9092
9093
#: en/help_topics/configuration.txt:17
9094
msgid "See also the ``email`` configuration option."
9095
msgstr ""
9096
9097
#: en/help_topics/configuration.txt:19
9098
msgid ""
9099
"BZR_PROGRESS_BAR\n"
9100
"~~~~~~~~~~~~~~~~"
9101
msgstr ""
9102
9103
#: en/help_topics/configuration.txt:22
9104
msgid ""
9105
"Override the progress display. Possible values are \"none\" or \"text\". "
9106
"If\n"
9107
"the value is \"none\" then no progress bar is displayed. The value \"text\" "
9108
"draws\n"
9109
"the ordinary command line progress bar."
9110
msgstr ""
9111
9112
#: en/help_topics/configuration.txt:26
9113
msgid ""
9114
"BZR_SIGQUIT_PDB\n"
9115
"~~~~~~~~~~~~~~~"
9116
msgstr ""
9117
9118
#: en/help_topics/configuration.txt:29
9119
msgid ""
9120
"Control whether SIGQUIT behaves normally or invokes a breakin debugger."
9121
msgstr ""
9122
9123
#: en/help_topics/configuration.txt:31
9124
msgid ""
9125
"* 0 = Standard SIGQUIT behavior (normally, exit with a core dump)\n"
9126
"* 1 = Invoke breakin debugger (default)"
9127
msgstr ""
9128
9129
#: en/help_topics/configuration.txt:34
9130
msgid ""
9131
"BZR_HOME\n"
9132
"~~~~~~~~"
9133
msgstr ""
9134
9135
#: en/help_topics/configuration.txt:37
9136
msgid "Override the home directory used by Bazaar."
9137
msgstr ""
9138
9139
#: en/help_topics/configuration.txt:39
9140
msgid ""
9141
"BZR_SSH\n"
9142
"~~~~~~~"
9143
msgstr ""
9144
9145
#: en/help_topics/configuration.txt:42
9146
msgid "Select a different SSH implementation."
9147
msgstr ""
9148
9149
#: en/help_topics/configuration.txt:44
9150
msgid ""
9151
"BZR_PDB\n"
9152
"~~~~~~~"
9153
msgstr ""
9154
9155
#: en/help_topics/configuration.txt:47
9156
msgid "Control whether to launch a debugger on error."
9157
msgstr ""
9158
9159
#: en/help_topics/configuration.txt:49
9160
msgid ""
9161
"* 0 = Standard behavior\n"
9162
"* 1 = Launch debugger"
9163
msgstr ""
9164
9165
#: en/help_topics/configuration.txt:52
9166
msgid ""
9167
"BZR_REMOTE_PATH\n"
9168
"~~~~~~~~~~~~~~~"
9169
msgstr ""
9170
9171
#: en/help_topics/configuration.txt:55
9172
msgid "Path to the Bazaar executable to use when using the bzr+ssh protocol."
9173
msgstr ""
9174
9175
#: en/help_topics/configuration.txt:57
9176
msgid "See also the ``bzr_remote_path`` configuration option."
9177
msgstr ""
9178
9179
#: en/help_topics/configuration.txt:59
9180
msgid ""
9181
"BZR_EDITOR\n"
9182
"~~~~~~~~~~"
9183
msgstr ""
9184
9185
#: en/help_topics/configuration.txt:62
9186
msgid "Path to the editor Bazaar should use for commit messages, etc."
9187
msgstr ""
9188
9189
#: en/help_topics/configuration.txt:64
9190
msgid ""
9191
"BZR_LOG\n"
9192
"~~~~~~~"
9193
msgstr ""
9194
9195
#: en/help_topics/configuration.txt:67
9196
msgid ""
9197
"Location of the Bazaar log file. You can check the current location by\n"
9198
"running ``bzr version``."
9199
msgstr ""
9200
9201
#: en/help_topics/configuration.txt:70
9202
msgid ""
9203
"The log file contains debug information that is useful for diagnosing or\n"
9204
"reporting problems with Bazaar."
9205
msgstr ""
9206
9207
#: en/help_topics/configuration.txt:73
9208
msgid ""
9209
"Setting this to ``NUL`` on Windows or ``/dev/null`` on other platforms\n"
9210
"will disable logging."
9211
msgstr ""
9212
9213
#: en/help_topics/configuration.txt:76
9214
msgid ""
9215
"\n"
9216
"BZR_PLUGIN_PATH\n"
9217
"~~~~~~~~~~~~~~~"
9218
msgstr ""
9219
9220
#: en/help_topics/configuration.txt:80
9221
msgid ""
9222
"The path to the plugins directory that Bazaar should use.\n"
9223
"If not set, Bazaar will search for plugins in:"
9224
msgstr ""
9225
9226
#: en/help_topics/configuration.txt:83
9227
msgid ""
9228
"* the user specific plugin directory (containing the ``user`` plugins),"
9229
msgstr ""
9230
9231
#: en/help_topics/configuration.txt:85
9232
msgid "* the bzrlib directory (containing the ``core`` plugins),"
9233
msgstr ""
9234
9235
#: en/help_topics/configuration.txt:87
9236
msgid ""
9237
"* the site specific plugin directory if applicable (containing\n"
9238
" the ``site`` plugins)."
9239
msgstr ""
9240
9241
#: en/help_topics/configuration.txt:90
9242
msgid ""
9243
"If ``BZR_PLUGIN_PATH`` is set in any fashion, it will change the\n"
9244
"the way the plugin are searched. "
9245
msgstr ""
9246
9247
#: en/help_topics/configuration.txt:93
9248
msgid ""
9249
"As for the ``PATH`` variables, if multiple directories are\n"
9250
"specified in ``BZR_PLUGIN_PATH`` they should be separated by the\n"
9251
"platform specific appropriate character (':' on Unix,\n"
9252
"';' on windows)"
9253
msgstr ""
9254
9255
#: en/help_topics/configuration.txt:98
9256
msgid ""
9257
"By default if ``BZR_PLUGIN_PATH`` is set, it replaces searching\n"
9258
"in ``user``. However it will continue to search in ``core`` and\n"
9259
"``site`` unless they are explicitly removed."
9260
msgstr ""
9261
9262
#: en/help_topics/configuration.txt:102
9263
msgid ""
9264
"If you need to change the order or remove one of these\n"
9265
"directories, you should use special values:"
9266
msgstr ""
9267
9268
#: en/help_topics/configuration.txt:105
9269
msgid ""
9270
"* ``-user``, ``-core``, ``-site`` will remove the corresponding\n"
9271
" path from the default values,"
9272
msgstr ""
9273
9274
#: en/help_topics/configuration.txt:108
9275
msgid ""
9276
"* ``+user``, ``+core``, ``+site`` will add the corresponding path\n"
9277
" before the remaining default values (and also remove it from\n"
9278
" the default values)."
9279
msgstr ""
9280
9281
#: en/help_topics/configuration.txt:112
9282
msgid ""
9283
"Note that the special values 'user', 'core' and 'site' should be\n"
9284
"used literally, they will be substituted by the corresponding,\n"
9285
"platform specific, values."
9286
msgstr ""
9287
9288
#: en/help_topics/configuration.txt:116
9289
msgid ""
9290
"The examples below use ':' as the separator, windows users\n"
9291
"should use ';'."
9292
msgstr ""
9293
9294
#: en/help_topics/configuration.txt:119
9295
msgid "Overriding the default user plugin directory::"
9296
msgstr ""
9297
9298
#: en/help_topics/configuration.txt:121
9299
msgid " BZR_PLUGIN_PATH='/path/to/my/other/plugins'"
9300
msgstr ""
9301
9302
#: en/help_topics/configuration.txt:123
9303
msgid "Disabling the site directory while retaining the user directory::"
9304
msgstr ""
9305
9306
#: en/help_topics/configuration.txt:125
9307
msgid " BZR_PLUGIN_PATH='-site:+user'"
9308
msgstr ""
9309
9310
#: en/help_topics/configuration.txt:127
9311
msgid "Disabling all plugins (better achieved with --no-plugins)::"
9312
msgstr ""
9313
9314
#: en/help_topics/configuration.txt:129
9315
msgid " BZR_PLUGIN_PATH='-user:-core:-site'"
9316
msgstr ""
9317
9318
#: en/help_topics/configuration.txt:131
9319
msgid "Overriding the default site plugin directory::"
9320
msgstr ""
9321
9322
#: en/help_topics/configuration.txt:133
9323
msgid " BZR_PLUGIN_PATH='/path/to/my/site/plugins:-site':+user"
9324
msgstr ""
9325
9326
#: en/help_topics/configuration.txt:135
9327
msgid ""
9328
"BZR_DISABLE_PLUGINS\n"
9329
"~~~~~~~~~~~~~~~~~~~"
9330
msgstr ""
9331
9332
#: en/help_topics/configuration.txt:138
9333
msgid ""
9334
"Under special circumstances (mostly when trying to diagnose a\n"
9335
"bug), it's better to disable a plugin (or several) rather than\n"
9336
"uninstalling them completely. Such plugins can be specified in\n"
9337
"the ``BZR_DISABLE_PLUGINS`` environment variable."
9338
msgstr ""
9339
9340
#: en/help_topics/configuration.txt:143
9341
msgid ""
9342
"In that case, ``bzr`` will stop loading the specified plugins and\n"
9343
"will raise an import error if they are explicitly imported (by\n"
9344
"another plugin that depends on them for example)."
9345
msgstr ""
9346
9347
#: en/help_topics/configuration.txt:147
9348
msgid "Disabling ``myplugin`` and ``yourplugin`` is achieved by::"
9349
msgstr ""
9350
9351
#: en/help_topics/configuration.txt:149
9352
msgid " BZR_DISABLE_PLUGINS='myplugin:yourplugin'"
9353
msgstr ""
9354
9355
#: en/help_topics/configuration.txt:151
9356
msgid ""
9357
"BZR_PLUGINS_AT\n"
9358
"~~~~~~~~~~~~~~"
9359
msgstr ""
9360
9361
#: en/help_topics/configuration.txt:154
9362
msgid ""
9363
"When adding a new feature or working on a bug in a plugin,\n"
9364
"developers often need to use a specific version of a given\n"
9365
"plugin. Since python requires that the directory containing the\n"
9366
"code is named like the plugin itself this make it impossible to\n"
9367
"use arbitrary directory names (using a two-level directory scheme\n"
9368
"is inconvenient). ``BZR_PLUGINS_AT`` allows such directories even\n"
9369
"if they don't appear in ``BZR_PLUGIN_PATH`` ."
9370
msgstr ""
9371
9372
#: en/help_topics/configuration.txt:162
9373
msgid ""
9374
"Plugins specified in this environment variable takes precedence\n"
9375
"over the ones in ``BZR_PLUGIN_PATH``."
9376
msgstr ""
9377
9378
#: en/help_topics/configuration.txt:165
9379
msgid ""
9380
"The variable specified a list of ``plugin_name@plugin path``,\n"
9381
"``plugin_name`` being the name of the plugin as it appears in\n"
9382
"python module paths, ``plugin_path`` being the path to the\n"
9383
"directory containing the plugin code itself\n"
9384
"(i.e. ``plugins/myplugin`` not ``plugins``). Use ':' as the list\n"
9385
"separator, use ';' on windows."
9386
msgstr ""
9387
9388
#: en/help_topics/configuration.txt:172
9389
msgid ""
9390
"Example:\n"
9391
"~~~~~~~~"
9392
msgstr ""
9393
9394
#: en/help_topics/configuration.txt:175
9395
msgid ""
9396
"Using a specific version of ``myplugin``:\n"
9397
"``BZR_PLUGINS_AT='myplugin@/home/me/bugfixes/123456-myplugin``"
9398
msgstr ""
9399
9400
#: en/help_topics/configuration.txt:178
9401
msgid ""
9402
"BZRPATH\n"
9403
"~~~~~~~"
9404
msgstr ""
9405
9406
#: en/help_topics/configuration.txt:181
9407
msgid "The path where Bazaar should look for shell plugin external commands."
9408
msgstr ""
9409
9410
#: en/help_topics/configuration.txt:183
9411
msgid ""
9412
"\n"
9413
"http_proxy, https_proxy\n"
9414
"~~~~~~~~~~~~~~~~~~~~~~~"
9415
msgstr ""
9416
9417
#: en/help_topics/configuration.txt:187
9418
msgid "Specifies the network proxy for outgoing connections, for example::"
9419
msgstr ""
9420
9421
#: en/help_topics/configuration.txt:189
9422
msgid ""
9423
" http_proxy=http://proxy.example.com:3128/ \n"
9424
" https_proxy=http://proxy.example.com:3128/"
9425
msgstr ""
9426
9427
#: en/help_topics/configuration.txt:192
9428
msgid ""
9429
"\n"
9430
"Configuration files\n"
9431
"-------------------"
9432
msgstr ""
9433
9434
#: en/help_topics/configuration.txt:196
9435
msgid ""
9436
"Location\n"
9437
"~~~~~~~~"
9438
msgstr ""
9439
9440
#: en/help_topics/configuration.txt:199
9441
msgid ""
9442
"Configuration files are located in ``$HOME/.bazaar`` on Unix and\n"
9443
"``C:\\Documents and Settings\\<username>\\Application Data\\Bazaar\\2.0`` "
9444
"on\n"
9445
"Windows. (You can check the location for your system by using\n"
9446
"``bzr version``.)"
9447
msgstr ""
9448
9449
#: en/help_topics/configuration.txt:204
9450
msgid "There are three primary configuration files in this location:"
9451
msgstr ""
9452
9453
#: en/help_topics/configuration.txt:206
9454
msgid "* ``bazaar.conf`` describes default configuration options,"
9455
msgstr ""
9456
9457
#: en/help_topics/configuration.txt:208
9458
msgid ""
9459
"* ``locations.conf`` describes configuration information for\n"
9460
" specific branch locations,"
9461
msgstr ""
9462
9463
#: en/help_topics/configuration.txt:211
9464
msgid ""
9465
"* ``authentication.conf`` describes credential information for\n"
9466
" remote servers."
9467
msgstr ""
9468
9469
#: en/help_topics/configuration.txt:214
9470
msgid ""
9471
"Each branch can also contain a configuration file that sets values specific\n"
9472
"to that branch. This file is found at ``.bzr/branch/branch.conf`` within "
9473
"the\n"
9474
"branch. This file is visible to all users of a branch, if you wish to "
9475
"override\n"
9476
"one of the values for a branch with a setting that is specific to you then "
9477
"you\n"
9478
"can do so in ``locations.conf``."
9479
msgstr ""
9480
9481
#: en/help_topics/configuration.txt:220
9482
msgid ""
9483
"General format\n"
9484
"~~~~~~~~~~~~~~"
9485
msgstr ""
9486
9487
#: en/help_topics/configuration.txt:223
9488
msgid ""
9489
"An ini file has three types of contructs: section headers, section\n"
9490
"options and comments."
9491
msgstr ""
9492
9493
#: en/help_topics/configuration.txt:226
9494
msgid ""
9495
"Comments\n"
9496
"^^^^^^^^"
9497
msgstr ""
9498
9499
#: en/help_topics/configuration.txt:229
9500
msgid ""
9501
"A comment is any line that starts with a \"#\" (sometimes called a \"hash\n"
9502
"mark\", \"pound sign\" or \"number sign\"). Comment lines are ignored by\n"
9503
"Bazaar when parsing ini files."
9504
msgstr ""
9505
9506
#: en/help_topics/configuration.txt:233
9507
msgid ""
9508
"Section headers\n"
9509
"^^^^^^^^^^^^^^^"
9510
msgstr ""
9511
9512
#: en/help_topics/configuration.txt:236
9513
msgid ""
9514
"A section header is a word enclosed in brackets that starts at the begining\n"
9515
"of a line. A typical section header looks like this::"
9516
msgstr ""
9517
9518
#: en/help_topics/configuration.txt:239
9519
msgid " [DEFAULT]"
9520
msgstr ""
9521
9522
#: en/help_topics/configuration.txt:241
9523
msgid ""
9524
"The only valid section headers for bazaar.conf currently are [DEFAULT] and\n"
9525
"[ALIASES]. Section headers are case sensitive. The default section provides "
9526
"for\n"
9527
"setting options which can be overridden with the branch config file."
9528
msgstr ""
9529
9530
#: en/help_topics/configuration.txt:245
9531
msgid ""
9532
"For ``locations.conf``, the options from the section with the\n"
9533
"longest matching section header are used to the exclusion of other\n"
9534
"potentially valid section headers. A section header uses the path for\n"
9535
"the branch as the section header. Some examples include::"
9536
msgstr ""
9537
9538
#: en/help_topics/configuration.txt:250
9539
msgid ""
9540
" [http://mybranches.isp.com/~jdoe/branchdir]\n"
9541
" [/home/jdoe/branches/]"
9542
msgstr ""
9543
9544
#: en/help_topics/configuration.txt:253
9545
msgid ""
9546
"\n"
9547
"Section options\n"
9548
"^^^^^^^^^^^^^^^"
9549
msgstr ""
9550
9551
#: en/help_topics/configuration.txt:257
9552
msgid ""
9553
"A section option resides within a section. A section option contains an\n"
9554
"option name, an equals sign and a value. For example::"
9555
msgstr ""
9556
9557
#: en/help_topics/configuration.txt:260
9558
msgid ""
9559
" email = John Doe <jdoe@isp.com>\n"
9560
" gpg_signing_key = Amy Pond <amy@example.com>"
9561
msgstr ""
9562
9563
#: en/help_topics/configuration.txt:263
9564
msgid ""
9565
"A option can reference other options by enclosing them in curly brackets::"
9566
msgstr ""
9567
9568
#: en/help_topics/configuration.txt:265
9569
msgid ""
9570
" my_branch_name = feature_x\n"
9571
" my_server = bzr+ssh://example.com\n"
9572
" push_location = {my_server}/project/{my_branch_name}"
9573
msgstr ""
9574
9575
#: en/help_topics/configuration.txt:269
9576
msgid ""
9577
"Option policies\n"
9578
"^^^^^^^^^^^^^^^"
9579
msgstr ""
9580
9581
#: en/help_topics/configuration.txt:272
9582
msgid ""
9583
"Options defined in a section affect the named directory or URL plus\n"
9584
"any locations they contain. Policies can be used to change how an\n"
9585
"option value is interpreted for contained locations. Currently\n"
9586
"there are three policies available:"
9587
msgstr ""
9588
9589
#: en/help_topics/configuration.txt:277
9590
msgid ""
9591
" none:\n"
9592
" the value is interpreted the same for contained locations. This is\n"
9593
" the default behaviour.\n"
9594
" norecurse:\n"
9595
" the value is only used for the exact location specified by the\n"
9596
" section name.\n"
9597
" appendpath:\n"
9598
" for contained locations, any additional path components are\n"
9599
" appended to the value."
9600
msgstr ""
9601
9602
#: en/help_topics/configuration.txt:287
9603
msgid ""
9604
"Policies are specified by keys with names of the form "
9605
"\"<option_name>:policy\".\n"
9606
"For example, to define the push location for a tree of branches, the\n"
9607
"following could be used::"
9608
msgstr ""
9609
9610
#: en/help_topics/configuration.txt:291
9611
msgid ""
9612
" [/top/location]\n"
9613
" push_location = sftp://example.com/location\n"
9614
" push_location:policy = appendpath"
9615
msgstr ""
9616
9617
#: en/help_topics/configuration.txt:295
9618
msgid ""
9619
"With this configuration, the push location for ``/top/location/branch1``\n"
9620
"would be ``sftp://example.com/location/branch1``."
9621
msgstr ""
9622
9623
#: en/help_topics/configuration.txt:298
9624
msgid ""
9625
"Section local options\n"
9626
"^^^^^^^^^^^^^^^^^^^^^"
9627
msgstr ""
9628
9629
#: en/help_topics/configuration.txt:301
9630
msgid ""
9631
"Some options are defined automatically inside a given section and can be\n"
9632
"refered to in this section only. "
9633
msgstr ""
9634
9635
#: en/help_topics/configuration.txt:304
9636
msgid "For example, the ``appendpath`` policy can be used like this::"
9637
msgstr ""
9638
9639
#: en/help_topics/configuration.txt:306
9640
msgid ""
9641
" [/home/vila/src/bzr/bugs]\n"
9642
" mypush = lp:~vila/bzr\n"
9643
" mypush:policy=appendpath"
9644
msgstr ""
9645
9646
#: en/help_topics/configuration.txt:310
9647
msgid "Using ``relpath`` to achieve the same result is done like this::"
9648
msgstr ""
9649
9650
#: en/help_topics/configuration.txt:312
9651
msgid ""
9652
" [/home/vila/src/bzr/bugs]\n"
9653
" mypush = lp:~vila/bzr/{relpath}"
9654
msgstr ""
9655
9656
#: en/help_topics/configuration.txt:315
9657
msgid ""
9658
"In both cases, when used in a directory like\n"
9659
"``/home/vila/src/bzr/bugs/832013-expand-in-stack`` we'll get::"
9660
msgstr ""
9661
9662
#: en/help_topics/configuration.txt:318 en/help_topics/configuration.txt:329
9663
msgid ""
9664
" $ bzr config mypush\n"
9665
" lp:~vila/bzr/832013-expand-in-stack"
9666
msgstr ""
9667
9668
#: en/help_topics/configuration.txt:321
9669
msgid "Another such option is ``basename`` which can be used like this::"
9670
msgstr ""
9671
9672
#: en/help_topics/configuration.txt:323
9673
msgid ""
9674
" [/home/vila/src/bzr]\n"
9675
" mypush = lp:~vila/bzr/{basename}"
9676
msgstr ""
9677
9678
#: en/help_topics/configuration.txt:326
9679
msgid ""
9680
"When used in a directory like\n"
9681
"``/home/vila/src/bzr/bugs/832013-expand-in-stack`` we'll get::"
9682
msgstr ""
9683
9684
#: en/help_topics/configuration.txt:332
9685
msgid ""
9686
"Note that ``basename`` here refers to the base name of ``relpath`` which\n"
9687
"itself is defined as the relative path between the section name and the\n"
9688
"location it matches."
9689
msgstr ""
9690
9691
#: en/help_topics/configuration.txt:336
9692
msgid ""
9693
"When an option is local to a Section, it cannot be referred to from option\n"
9694
"values in any other section from the same ``Store`` nor from any other\n"
9695
"``Store``."
9696
msgstr ""
9697
9698
#: en/help_topics/configuration.txt:340
9699
msgid ""
9700
"\n"
9701
"The main configuration file, bazaar.conf\n"
9702
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
9703
msgstr ""
9704
9705
#: en/help_topics/configuration.txt:344
9706
msgid ""
9707
"``bazaar.conf`` allows two sections: ``[DEFAULT]`` and ``[ALIASES]``.\n"
9708
"The default section contains the default\n"
9709
"configuration options for all branches. The default section can be\n"
9710
"overriden by providing a branch-specific section in ``locations.conf``."
9711
msgstr ""
9712
9713
#: en/help_topics/configuration.txt:349
9714
msgid "A typical ``bazaar.conf`` section often looks like the following::"
9715
msgstr ""
9716
9717
#: en/help_topics/configuration.txt:351
9718
msgid ""
9719
" [DEFAULT]\n"
9720
" email = John Doe <jdoe@isp.com>\n"
9721
" editor = /usr/bin/vim\n"
9722
" create_signatures = when-required"
9723
msgstr ""
9724
9725
#: en/help_topics/configuration.txt:356
9726
msgid ""
9727
"\n"
9728
"The branch location configuration file, locations.conf\n"
9729
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
9730
msgstr ""
9731
9732
#: en/help_topics/configuration.txt:360
9733
msgid ""
9734
"``locations.conf`` allows one to specify overriding settings for\n"
9735
"a specific branch. The format is almost identical to the default section in\n"
9736
"bazaar.conf with one significant change: The section header, instead of "
9737
"saying\n"
9738
"default, will be the path to a branch that you wish to override a value\n"
9739
"for. The '?' and '*' wildcards are supported::"
9740
msgstr ""
9741
9742
#: en/help_topics/configuration.txt:366
9743
msgid ""
9744
" [/home/jdoe/branches/nethack]\n"
9745
" email = Nethack Admin <nethack@nethack.com>"
9746
msgstr ""
9747
9748
#: en/help_topics/configuration.txt:369
9749
msgid ""
9750
" [http://hypothetical.site.com/branches/devel-branch]\n"
9751
" create_signatures = always"
9752
msgstr ""
9753
9754
#: en/help_topics/configuration.txt:372
9755
msgid ""
9756
"The authentication configuration file, authentication.conf\n"
9757
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
9758
msgstr ""
9759
9760
#: en/help_topics/configuration.txt:375
9761
msgid ""
9762
"``authentication.conf`` allows one to specify credentials for\n"
9763
"remote servers. This can be used for all the supported transports and any "
9764
"part\n"
9765
"of bzr that requires authentication (smtp for example)."
9766
msgstr ""
9767
9768
#: en/help_topics/configuration.txt:379
9769
msgid ""
9770
"The syntax of the file obeys the same rules as the others except for the\n"
9771
"option policies which don't apply."
9772
msgstr ""
9773
9774
#: en/help_topics/configuration.txt:382
9775
msgid ""
9776
"For more information on the possible uses of the authentication "
9777
"configuration\n"
9778
"file see :doc:`authentication-help`."
9779
msgstr ""
9780
9781
#: en/help_topics/configuration.txt:385
9782
msgid ""
9783
"\n"
9784
"Common options\n"
9785
"--------------"
9786
msgstr ""
9787
9788
#: en/help_topics/configuration.txt:389
9789
msgid ""
9790
"debug_flags\n"
9791
"~~~~~~~~~~~"
9792
msgstr ""
9793
9794
#: en/help_topics/configuration.txt:392
9795
msgid ""
9796
"A comma-separated list of debugging options to turn on. The same values\n"
9797
"can be used as with the -D command-line option (see `help global-options`).\n"
9798
"For example::"
9799
msgstr ""
9800
9801
#: en/help_topics/configuration.txt:396
9802
msgid " debug_flags = hpss"
9803
msgstr ""
9804
9805
#: en/help_topics/configuration.txt:400
9806
msgid " debug_flags = hpss,evil"
9807
msgstr ""
9808
9809
#: en/help_topics/configuration.txt:402
9810
msgid ""
9811
"email\n"
9812
"~~~~~"
9813
msgstr ""
9814
9815
#: en/help_topics/configuration.txt:405
9816
msgid ""
9817
"The email address to use when committing a branch. Typically takes the form\n"
9818
"of::"
9819
msgstr ""
9820
9821
#: en/help_topics/configuration.txt:408
9822
msgid " email = Full Name <account@hostname.tld>"
9823
msgstr ""
9824
9825
#: en/help_topics/configuration.txt:410
9826
msgid ""
9827
"editor\n"
9828
"~~~~~~"
9829
msgstr ""
9830
9831
#: en/help_topics/configuration.txt:413
9832
msgid ""
9833
"The path of the editor that you wish to use if *bzr commit* is run without\n"
9834
"a commit message. This setting is trumped by the environment variable\n"
9835
"``BZR_EDITOR``, and overrides the ``VISUAL`` and ``EDITOR`` environment\n"
9836
"variables."
9837
msgstr ""
9838
9839
#: en/help_topics/configuration.txt:418
9840
msgid ""
9841
"log_format\n"
9842
"~~~~~~~~~~"
9843
msgstr ""
9844
9845
#: en/help_topics/configuration.txt:421
9846
msgid ""
9847
"The default log format to use. Standard log formats are ``long``, ``short``\n"
9848
"and ``line``. Additional formats may be provided by plugins. The default\n"
9849
"value is ``long``."
9850
msgstr ""
9851
9852
#: en/help_topics/configuration.txt:425
9853
msgid ""
9854
"check_signatures\n"
9855
"~~~~~~~~~~~~~~~~"
9856
msgstr ""
9857
9858
#: en/help_topics/configuration.txt:428
9859
msgid ""
9860
"Reserved for future use. These options will allow a policy for branches to\n"
9861
"require signatures."
9862
msgstr ""
9863
9864
#: en/help_topics/configuration.txt:431
9865
msgid ""
9866
"require\n"
9867
" The gnupg signature for revisions must be present and must be valid."
9868
msgstr ""
9869
9870
#: en/help_topics/configuration.txt:434
9871
msgid ""
9872
"ignore\n"
9873
" Do not check gnupg signatures of revisions."
9874
msgstr ""
9875
9876
#: en/help_topics/configuration.txt:437
9877
msgid ""
9878
"check-available\n"
9879
" (default) If gnupg signatures for revisions are present, check them.\n"
9880
" Bazaar will fail if it finds a bad signature, but will not fail if\n"
9881
" no signature is present."
9882
msgstr ""
9883
9884
#: en/help_topics/configuration.txt:442
9885
msgid ""
9886
"create_signatures\n"
9887
"~~~~~~~~~~~~~~~~~"
9888
msgstr ""
9889
9890
#: en/help_topics/configuration.txt:445
9891
msgid ""
9892
"Defines the behaviour of signing revisions on commits. By default bzr will "
9893
"not\n"
9894
"sign new commits."
9895
msgstr ""
9896
9897
#: en/help_topics/configuration.txt:448
9898
msgid ""
9899
"always\n"
9900
" Sign every new revision that is committed. If the signing fails then "
9901
"the\n"
9902
" commit will not be made."
9903
msgstr ""
9904
9905
#: en/help_topics/configuration.txt:452
9906
msgid ""
9907
"when-required\n"
9908
" Reserved for future use."
9909
msgstr ""
9910
9911
#: en/help_topics/configuration.txt:455
9912
msgid ""
9913
"never\n"
9914
" Reserved for future use."
9915
msgstr ""
9916
9917
#: en/help_topics/configuration.txt:458
9918
msgid ""
9919
"In future it is planned that ``when-required`` will sign newly\n"
9920
"committed revisions only when the branch requires them. ``never`` will "
9921
"refuse\n"
9922
"to sign newly committed revisions, even if the branch requires signatures."
9923
msgstr ""
9924
9925
#: en/help_topics/configuration.txt:462
9926
msgid ""
9927
"dirstate.fdatasync\n"
9928
"~~~~~~~~~~~~~~~~~~"
9929
msgstr ""
9930
9931
#: en/help_topics/configuration.txt:465
9932
msgid ""
9933
"If true (default), working tree metadata changes are flushed through the\n"
9934
"OS buffers to physical disk. This is somewhat slower, but means data\n"
9935
"should not be lost if the machine crashes. See also repository.fdatasync."
9936
msgstr ""
9937
9938
#: en/help_topics/configuration.txt:469
9939
msgid ""
9940
"gpg_signing_key\n"
9941
"~~~~~~~~~~~~~~~"
9942
msgstr ""
9943
9944
#: en/help_topics/configuration.txt:472
9945
msgid ""
9946
"The GnuPG user identity to use when signing commits. Can be an e-mail\n"
9947
"address, key fingerprint or full key ID. When unset or when set to\n"
9948
"\"default\" Bazaar will use the user e-mail set with ``whoami``."
9949
msgstr ""
9950
9951
#: en/help_topics/configuration.txt:476
9952
msgid ""
9953
"recurse\n"
9954
"~~~~~~~"
9955
msgstr ""
9956
9957
#: en/help_topics/configuration.txt:479
9958
msgid ""
9959
"Only useful in ``locations.conf``. Defines whether or not the\n"
9960
"configuration for this section applies to subdirectories:"
9961
msgstr ""
9962
9963
#: en/help_topics/configuration.txt:482
9964
msgid ""
9965
"true\n"
9966
" (default) This section applies to subdirectories as well."
9967
msgstr ""
9968
9969
#: en/help_topics/configuration.txt:485
9970
msgid ""
9971
"false\n"
9972
" This section only applies to the branch at this directory and not\n"
9973
" branches below it."
9974
msgstr ""
9975
9976
#: en/help_topics/configuration.txt:489
9977
msgid ""
9978
"gpg_signing_command\n"
9979
"~~~~~~~~~~~~~~~~~~~"
9980
msgstr ""
9981
9982
#: en/help_topics/configuration.txt:492
9983
msgid ""
9984
"(Default: \"gpg\"). Which program should be used to sign and check "
9985
"revisions.\n"
9986
"For example::"
9987
msgstr ""
9988
9989
#: en/help_topics/configuration.txt:495
9990
msgid " gpg_signing_command = /usr/bin/gnpg"
9991
msgstr ""
9992
9993
#: en/help_topics/configuration.txt:497
9994
msgid ""
9995
"The specified command must accept the options \"--clearsign\" and \"-u "
9996
"<email>\"."
9997
msgstr ""
9998
9999
#: en/help_topics/configuration.txt:499
10000
msgid ""
10001
"bzr_remote_path\n"
10002
"~~~~~~~~~~~~~~~"
10003
msgstr ""
10004
10005
#: en/help_topics/configuration.txt:502
10006
msgid ""
10007
"(Default: \"bzr\"). The path to the command that should be used to run the "
10008
"smart\n"
10009
"server for bzr. This value may only be specified in locations.conf, because:"
10010
msgstr ""
10011
10012
#: en/help_topics/configuration.txt:505
10013
msgid ""
10014
"- it's needed before branch.conf is accessible\n"
10015
"- allowing remote branch.conf files to specify commands would be a security\n"
10016
" risk"
10017
msgstr ""
10018
10019
#: en/help_topics/configuration.txt:509
10020
msgid "It is overridden by the BZR_REMOTE_PATH environment variable."
10021
msgstr ""
10022
10023
#: en/help_topics/configuration.txt:511
10024
msgid ""
10025
"smtp_server\n"
10026
"~~~~~~~~~~~"
10027
msgstr ""
10028
10029
#: en/help_topics/configuration.txt:514
10030
msgid ""
10031
"(Default: \"localhost\"). SMTP server to use when Bazaar needs to send\n"
10032
"email, eg. with ``merge-directive --mail-to``, or the bzr-email plugin."
10033
msgstr ""
10034
10035
#: en/help_topics/configuration.txt:517
10036
msgid ""
10037
"smtp_username, smtp_password\n"
10038
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
10039
msgstr ""
10040
10041
#: en/help_topics/configuration.txt:520
10042
msgid ""
10043
"User and password to authenticate to the SMTP server. If smtp_username\n"
10044
"is set, and smtp_password is not, Bazaar will prompt for a password.\n"
10045
"These settings are only needed if the SMTP server requires authentication\n"
10046
"to send mail."
10047
msgstr ""
10048
10049
#: en/help_topics/configuration.txt:525
10050
msgid ""
10051
"locks.steal_dead\n"
10052
"~~~~~~~~~~~~~~~~"
10053
msgstr ""
10054
10055
#: en/help_topics/configuration.txt:528
10056
msgid ""
10057
"If set to true, bzr will automatically break locks held by processes from\n"
10058
"the same machine and user that are no longer alive. Otherwise, it will\n"
10059
"print a message and you can break the lock manually, if you are satisfied\n"
10060
"the object is no longer in use."
10061
msgstr ""
10062
10063
#: en/help_topics/configuration.txt:533
10064
msgid ""
10065
"mail_client\n"
10066
"~~~~~~~~~~~"
10067
msgstr ""
10068
10069
#: en/help_topics/configuration.txt:536
10070
msgid ""
10071
"A mail client to use for sending merge requests.\n"
10072
"By default, bzr will try to use ``mapi`` on Windows. On other platforms, "
10073
"it\n"
10074
"will try ``xdg-email``. If either of these fails, it will fall back to\n"
10075
"``editor``."
10076
msgstr ""
10077
10078
#: en/help_topics/configuration.txt:541
10079
msgid "Supported values for specific clients:"
10080
msgstr ""
10081
10082
#: en/help_topics/configuration.txt:543
10083
msgid ""
10084
":claws: Use Claws. This skips a dialog for attaching files.\n"
10085
":evolution: Use Evolution.\n"
10086
":kmail: Use KMail.\n"
10087
":mutt: Use Mutt.\n"
10088
":thunderbird: Use Mozilla Thunderbird or Icedove. For Thunderbird/Icedove "
10089
"1.5,\n"
10090
" this works around some bugs that xdg-email doesn't handle."
10091
msgstr ""
10092
10093
#: en/help_topics/configuration.txt:550
10094
msgid "Supported generic values are:"
10095
msgstr ""
10096
10097
#: en/help_topics/configuration.txt:552
10098
msgid ""
10099
":default: See above.\n"
10100
":editor: Use your editor to compose the merge request. This also uses\n"
10101
" your commit id, (see ``bzr whoami``), smtp_server and (optionally)\n"
10102
" smtp_username and smtp_password.\n"
10103
":mapi: Use your preferred e-mail client on Windows.\n"
10104
":xdg-email: Use xdg-email to run your preferred mail program"
10105
msgstr ""
10106
10107
#: en/help_topics/configuration.txt:559
10108
msgid ""
10109
"repository.fdatasync\n"
10110
"~~~~~~~~~~~~~~~~~~~~"
10111
msgstr ""
10112
10113
#: en/help_topics/configuration.txt:562
10114
msgid ""
10115
"If true (default), repository changes are flushed through the OS buffers\n"
10116
"to physical disk. This is somewhat slower, but means data should not be\n"
10117
"lost if the machine crashes. See also dirstate.fdatasync."
10118
msgstr ""
10119
10120
#: en/help_topics/configuration.txt:566
10121
msgid ""
10122
"submit_branch\n"
10123
"~~~~~~~~~~~~~"
10124
msgstr ""
10125
10126
#: en/help_topics/configuration.txt:569
10127
msgid ""
10128
"The branch you intend to submit your current work to. This is "
10129
"automatically\n"
10130
"set by ``bzr send``, and is also used by the ``submit:`` revision spec. "
10131
"This\n"
10132
"should usually be set on a per-branch or per-location basis."
10133
msgstr ""
10134
10135
#: en/help_topics/configuration.txt:573
10136
msgid ""
10137
"public_branch\n"
10138
"~~~~~~~~~~~~~"
10139
msgstr ""
10140
10141
#: en/help_topics/configuration.txt:576
10142
msgid ""
10143
"A publically-accessible version of this branch (implying that this version "
10144
"is\n"
10145
"not publically-accessible). Used (and set) by ``bzr send``."
10146
msgstr ""
10147
10148
#: en/help_topics/configuration.txt:579
10149
msgid ""
10150
"suppress_warnings\n"
10151
"~~~~~~~~~~~~~~~~~"
10152
msgstr ""
10153
10154
#: en/help_topics/configuration.txt:582
10155
msgid ""
10156
"A list of strings, each string represent a warning that can be emitted by\n"
10157
"bzr. Mentioning a warning in this list tells bzr to not emit it."
10158
msgstr ""
10159
10160
#: en/help_topics/configuration.txt:585
10161
msgid "Valid values:"
10162
msgstr ""
10163
10164
#: en/help_topics/configuration.txt:587
10165
msgid ""
10166
"* ``format_deprecation``:\n"
10167
" whether the format deprecation warning is shown on repositories that "
10168
"are\n"
10169
" using deprecated formats."
10170
msgstr ""
10171
10172
#: en/help_topics/configuration.txt:591
10173
msgid ""
10174
"default_format\n"
10175
"~~~~~~~~~~~~~~"
10176
msgstr ""
10177
10178
#: en/help_topics/configuration.txt:594
10179
msgid ""
10180
"A format name for the default format used when creating branches. See "
10181
"``bzr\n"
10182
"help formats`` for possible values."
10183
msgstr ""
10184
10185
#: en/help_topics/configuration.txt:597
10186
msgid ""
10187
"\n"
10188
"Unicode options\n"
10189
"---------------"
10190
msgstr ""
10191
10192
#: en/help_topics/configuration.txt:601
10193
msgid ""
10194
"output_encoding\n"
10195
"~~~~~~~~~~~~~~~"
10196
msgstr ""
10197
10198
#: en/help_topics/configuration.txt:604
10199
msgid ""
10200
"A Python unicode encoding name for text output from bzr, such as log\n"
10201
"information. Values include: utf8, cp850, ascii, iso-8859-1. The default\n"
10202
"is the terminal encoding prefered by the operating system."
10203
msgstr ""
10204
10205
#: en/help_topics/configuration.txt:608
10206
msgid ""
10207
"\n"
10208
"Branch type specific options\n"
10209
"----------------------------"
10210
msgstr ""
10211
10212
#: en/help_topics/configuration.txt:612
10213
msgid ""
10214
"These options apply only to branches that use the ``dirstate-tags`` or\n"
10215
"later format. They\n"
10216
"are usually set in ``.bzr/branch/branch.conf`` automatically, but may be\n"
10217
"manually set in ``locations.conf`` or ``bazaar.conf``."
10218
msgstr ""
10219
10220
#: en/help_topics/configuration.txt:617
10221
msgid ""
10222
"append_revisions_only\n"
10223
"~~~~~~~~~~~~~~~~~~~~~"
10224
msgstr ""
10225
10226
#: en/help_topics/configuration.txt:620
10227
msgid ""
10228
"If set to \"True\" then revisions can only be appended to the log, not\n"
10229
"removed. A branch with this setting enabled can only pull from another\n"
10230
"branch if the other branch's log is a longer version of its own. This is\n"
10231
"normally set by ``bzr init --append-revisions-only``. If you set it\n"
10232
"manually, use either 'True' or 'False' (case-sensitive) to maintain\n"
10233
"compatibility with previous bzr versions (older than 2.2)."
10234
msgstr ""
10235
10236
#: en/help_topics/configuration.txt:627
10237
msgid ""
10238
"parent_location\n"
10239
"~~~~~~~~~~~~~~~"
10240
msgstr ""
10241
10242
#: en/help_topics/configuration.txt:630
10243
msgid ""
10244
"If present, the location of the default branch for pull or merge. This "
10245
"option\n"
10246
"is normally set when creating a branch, the first ``pull`` or by ``pull\n"
10247
"--remember``."
10248
msgstr ""
10249
10250
#: en/help_topics/configuration.txt:634
10251
msgid ""
10252
"push_location\n"
10253
"~~~~~~~~~~~~~"
10254
msgstr ""
10255
10256
#: en/help_topics/configuration.txt:637
10257
msgid ""
10258
"If present, the location of the default branch for push. This option\n"
10259
"is normally set by the first ``push`` or ``push --remember``."
10260
msgstr ""
10261
10262
#: en/help_topics/configuration.txt:640
10263
msgid ""
10264
"push_strict\n"
10265
"~~~~~~~~~~~"
10266
msgstr ""
10267
10268
#: en/help_topics/configuration.txt:643
10269
msgid ""
10270
"If present, defines the ``--strict`` option default value for checking\n"
10271
"uncommitted changes before pushing."
10272
msgstr ""
10273
10274
#: en/help_topics/configuration.txt:646
10275
msgid ""
10276
"dpush_strict\n"
10277
"~~~~~~~~~~~~"
10278
msgstr ""
10279
10280
#: en/help_topics/configuration.txt:649
10281
msgid ""
10282
"If present, defines the ``--strict`` option default value for checking\n"
10283
"uncommitted changes before pushing into a different VCS without any\n"
10284
"custom bzr metadata."
10285
msgstr ""
10286
10287
#: en/help_topics/configuration.txt:653
10288
msgid ""
10289
"bound_location\n"
10290
"~~~~~~~~~~~~~~"
10291
msgstr ""
10292
10293
#: en/help_topics/configuration.txt:656
10294
msgid ""
10295
"The location that commits should go to when acting as a checkout.\n"
10296
"This option is normally set by ``bind``."
10297
msgstr ""
10298
10299
#: en/help_topics/configuration.txt:659
10300
msgid ""
10301
"bound\n"
10302
"~~~~~"
10303
msgstr ""
10304
10305
#: en/help_topics/configuration.txt:662
10306
msgid ""
10307
"If set to \"True\", the branch should act as a checkout, and push each "
10308
"commit to\n"
10309
"the bound_location. This option is normally set by ``bind``/``unbind``."
10310
msgstr ""
10311
10312
#: en/help_topics/configuration.txt:665
10313
msgid ""
10314
"send_strict\n"
10315
"~~~~~~~~~~~"
10316
msgstr ""
10317
10318
#: en/help_topics/configuration.txt:668
10319
msgid ""
10320
"If present, defines the ``--strict`` option default value for checking\n"
10321
"uncommitted changes before sending a merge directive."
10322
msgstr ""
10323
10324
#: en/help_topics/configuration.txt:671
10325
msgid ""
10326
"add.maximum_file_size\n"
10327
"~~~~~~~~~~~~~~~~~~~~~"
10328
msgstr ""
10329
10330
#: en/help_topics/configuration.txt:674
10331
msgid ""
10332
"Defines the maximum file size the command line \"add\" operation will allow\n"
10333
"in recursive mode, with files larger than this value being skipped. You may "
10334
"\n"
10335
"specify this value as an integer (in which case it is interpreted as bytes), "
10336
"\n"
10337
"or you may specify the value using SI units, i.e. 10KB, 20MB, 1G. A value of "
10338
"0 \n"
10339
"will disable skipping."
10340
msgstr ""
10341
10342
#: en/help_topics/configuration.txt:680
10343
msgid ""
10344
"External Merge Tools\n"
10345
"--------------------"
10346
msgstr ""
10347
10348
#: en/help_topics/configuration.txt:683
10349
msgid ""
10350
"bzr.mergetool.<name>\n"
10351
"~~~~~~~~~~~~~~~~~~~~"
10352
msgstr ""
10353
10354
#: en/help_topics/configuration.txt:686
10355
msgid ""
10356
"Defines an external merge tool called <name> with the given command-line.\n"
10357
"Arguments containing spaces should be quoted using single or double quotes. "
10358
"The\n"
10359
"executable may omit its path if it can be found on the PATH."
10360
msgstr ""
10361
10362
#: en/help_topics/configuration.txt:690
10363
msgid ""
10364
"The following markers can be used in the command-line to substitute "
10365
"filenames\n"
10366
"involved in the merge conflict::"
10367
msgstr ""
10368
10369
#: en/help_topics/configuration.txt:693
10370
msgid ""
10371
" {base} file.BASE\n"
10372
" {this} file.THIS\n"
10373
" {other} file.OTHER\n"
10374
" {result} output file\n"
10375
" {this_temp} temp copy of file.THIS, used to overwrite output file if "
10376
"merge\n"
10377
" succeeds."
10378
msgstr ""
10379
10380
#: en/help_topics/configuration.txt:702
10381
msgid " bzr.mergetool.kdiff3 = kdiff3 {base} {this} {other} -o {result}"
10382
msgstr ""
10383
10384
#: en/help_topics/configuration.txt:704
10385
msgid ""
10386
"bzr.default_mergetool\n"
10387
"~~~~~~~~~~~~~~~~~~~~~"
10388
msgstr ""
10389
10390
#: en/help_topics/configuration.txt:707
10391
msgid ""
10392
"Specifies which external merge tool (as defined above) should be selected "
10393
"by\n"
10394
"default in tools such as ``bzr qconflicts``."
10395
msgstr ""
10396
10397
#: en/help_topics/configuration.txt:712
10398
msgid " bzr.default_mergetool = kdiff3\n"
10399
msgstr ""
10400
10401
#: en/help_topics/conflict-types.txt:1
10402
msgid ""
10403
"Conflict Types\n"
10404
"=============="
10405
msgstr ""
10406
10407
#: en/help_topics/conflict-types.txt:4
10408
msgid ""
10409
"Some operations, like merge, revert and pull, modify the contents of your\n"
10410
"working tree. These modifications are programmatically generated, and so "
10411
"they\n"
10412
"may conflict with the current state of your working tree. "
10413
msgstr ""
10414
10415
#: en/help_topics/conflict-types.txt:8
10416
msgid ""
10417
"When conflicts are present in your working tree (as shown by ``bzr\n"
10418
"conflicts``), you should resolve them and then inform bzr that the "
10419
"conflicts\n"
10420
"have been resolved."
10421
msgstr ""
10422
10423
#: en/help_topics/conflict-types.txt:12
10424
msgid ""
10425
"Resolving conflicts is sometimes not obvious. Either because the user that\n"
10426
"should resolve them is not the one responsible for their occurrence, as is "
10427
"the\n"
10428
"case when merging other people's work or because some conflicts are "
10429
"presented\n"
10430
"in a way that is not easy to understand."
10431
msgstr ""
10432
10433
#: en/help_topics/conflict-types.txt:17
10434
msgid ""
10435
"Bazaar tries to avoid conflicts ; its aim is to ask you to resolve the\n"
10436
"conflict if and only if there's an actual conceptual conflict in the source\n"
10437
"tree. Because Bazaar doesn't understand the real meaning of the files "
10438
"being\n"
10439
"versioned, it can, when faced with ambiguities, fall short in either "
10440
"direction\n"
10441
"trying to resolve the conflict itself. Many kinds of changes can be "
10442
"combined\n"
10443
"programmatically, but sometimes only a human can determine the right thing "
10444
"to\n"
10445
"do."
10446
msgstr ""
10447
10448
#: en/help_topics/conflict-types.txt:25
10449
msgid ""
10450
"When Bazaar generates a conflict, it adds information into the working tree "
10451
"to\n"
10452
"present the conflicting versions, and it's up to you to find the correct\n"
10453
"resolution."
10454
msgstr ""
10455
10456
#: en/help_topics/conflict-types.txt:29
10457
msgid "Whatever the conflict is, resolving it is roughly done in two steps:"
10458
msgstr ""
10459
10460
#: en/help_topics/conflict-types.txt:31
10461
msgid ""
10462
"1. Modify the working tree content so that the conflicted item is now in "
10463
"the\n"
10464
" state you want to keep, then"
10465
msgstr ""
10466
10467
#: en/help_topics/conflict-types.txt:34
10468
msgid ""
10469
"2. Inform Bazaar that the conflict is now solved and ask to cleanup any\n"
10470
" remaining generated information (``bzr resolve <item>``)."
10471
msgstr ""
10472
10473
#: en/help_topics/conflict-types.txt:37
10474
msgid ""
10475
"For most conflict types, there are some obvious ways to modify the working\n"
10476
"tree and put it into the desired state. For some types of conflicts, Bazaar\n"
10477
"itself already made a choice, when possible."
10478
msgstr ""
10479
10480
#: en/help_topics/conflict-types.txt:41
10481
msgid ""
10482
"Yet, whether Bazaar makes a choice or not, there are some other simple but\n"
10483
"different ways to resolve the conflict."
10484
msgstr ""
10485
10486
#: en/help_topics/conflict-types.txt:44
10487
msgid ""
10488
"Each type of conflict is explained below, and the action which must be done "
10489
"to\n"
10490
"resolve the conflict is outlined."
10491
msgstr ""
10492
10493
#: en/help_topics/conflict-types.txt:47
10494
msgid ""
10495
"Various actions are available depending on the kind of conflict, for some "
10496
"of\n"
10497
"these actions, Bazaar can provide some help. In the end you should at least\n"
10498
"inform Bazaar that you're done with the conflict with::"
10499
msgstr ""
10500
10501
#: en/help_topics/conflict-types.txt:51
10502
msgid " ``bzr resolve FILE --action=done'"
10503
msgstr ""
10504
10505
#: en/help_topics/conflict-types.txt:53
10506
msgid ""
10507
"Note that this is the default action when a single file is involved so you "
10508
"can\n"
10509
"simply use::"
10510
msgstr ""
10511
10512
#: en/help_topics/conflict-types.txt:56
10513
msgid " ``bzr resolve FILE``"
10514
msgstr ""
10515
10516
#: en/help_topics/conflict-types.txt:58
10517
msgid "See ``bzr help resolve`` for more details."
10518
msgstr ""
10519
10520
#: en/help_topics/conflict-types.txt:60
10521
msgid ""
10522
"Text conflicts\n"
10523
"--------------"
10524
msgstr ""
10525
10526
#: en/help_topics/conflict-types.txt:63 en/help_topics/conflict-types.txt:120
10527
#: en/help_topics/conflict-types.txt:151 en/help_topics/conflict-types.txt:175
10528
#: en/help_topics/conflict-types.txt:198 en/help_topics/conflict-types.txt:213
10529
#: en/help_topics/conflict-types.txt:239 en/help_topics/conflict-types.txt:281
10530
#: en/help_topics/conflict-types.txt:303 en/help_topics/conflict-types.txt:339
10531
msgid "Typical message::"
10532
msgstr ""
10533
10534
#: en/help_topics/conflict-types.txt:65
10535
msgid " Text conflict in FILE"
10536
msgstr ""
10537
10538
#: en/help_topics/conflict-types.txt:67
10539
msgid ""
10540
"These are produced when a text merge cannot completely reconcile two sets "
10541
"of\n"
10542
"text changes. Bazaar will emit files for each version with the extensions\n"
10543
"THIS, OTHER, and BASE. THIS is the version of the file from the target "
10544
"tree,\n"
10545
"i.e. the tree that you are merging changes into. OTHER is the version that "
10546
"you\n"
10547
"are merging into the target. BASE is an older version that is used as a "
10548
"basis\n"
10549
"for comparison."
10550
msgstr ""
10551
10552
#: en/help_topics/conflict-types.txt:74
10553
msgid ""
10554
"In the main copy of the file, Bazaar will include all the changes that it\n"
10555
"could reconcile, and any un-reconciled conflicts are surrounded by\n"
10556
"\"herringbone\" markers like ``<<<<<<<``."
10557
msgstr ""
10558
10559
#: en/help_topics/conflict-types.txt:78
10560
msgid ""
10561
"Say the initial text is \"The project leader released it.\", and THIS "
10562
"modifies it\n"
10563
"to \"Martin Pool released it.\", while OTHER modifies it to \"The project "
10564
"leader\n"
10565
"released Bazaar.\" A conflict would look like this::"
10566
msgstr ""
10567
10568
#: en/help_topics/conflict-types.txt:82
10569
msgid ""
10570
" <<<<<<< TREE\n"
10571
" Martin Pool released it.\n"
10572
" =======\n"
10573
" The project leader released Bazaar.\n"
10574
" >>>>>>> MERGE-SOURCE"
10575
msgstr ""
10576
10577
#: en/help_topics/conflict-types.txt:88
10578
msgid "The correct resolution would be \"Martin Pool released Bazaar.\""
10579
msgstr ""
10580
10581
#: en/help_topics/conflict-types.txt:90
10582
msgid ""
10583
"You can handle text conflicts either by editing the main copy of the file,\n"
10584
"or by invoking external tools on the THIS, OTHER and BASE versions. It's\n"
10585
"worth mentioning that resolving text conflicts rarely involves picking one\n"
10586
"set of changes over the other (but see below when you encounter these\n"
10587
"cases). More often, the two sets of changes must be intelligently combined."
10588
msgstr ""
10589
10590
#: en/help_topics/conflict-types.txt:96
10591
msgid ""
10592
"If you edit the main copy, be sure to remove the herringbone markers. When\n"
10593
"you are done editing, the file should look like it never had a conflict, and "
10594
"be\n"
10595
"ready to commit."
10596
msgstr ""
10597
10598
#: en/help_topics/conflict-types.txt:100
10599
msgid ""
10600
"When you have resolved text conflicts, just run ``bzr resolve --auto``, and\n"
10601
"Bazaar will auto-detect which conflicts you have resolved."
10602
msgstr ""
10603
10604
#: en/help_topics/conflict-types.txt:103
10605
msgid ""
10606
"When the conflict is resolved, Bazaar deletes the previously generated\n"
10607
"``.BASE``, ``.THIS`` and ``.OTHER`` files if they are still present in the\n"
10608
"working tree."
10609
msgstr ""
10610
10611
#: en/help_topics/conflict-types.txt:107
10612
msgid ""
10613
"\n"
10614
"When you want to pick one set of changes over the other, you can use ``bzr\n"
10615
"resolve`` with one of the following actions:"
10616
msgstr ""
10617
10618
#: en/help_topics/conflict-types.txt:111
10619
msgid ""
10620
"* ``--action=take-this`` will issue ``mv FILE.THIS FILE``,\n"
10621
"* ``--action=take-other`` will issue ``mv FILE.OTHER FILE``."
10622
msgstr ""
10623
10624
#: en/help_topics/conflict-types.txt:114
10625
msgid ""
10626
"Note that if you have modified ``FILE.THIS`` or ``FILE.OTHER``, these\n"
10627
"modifications will be taken into account."
10628
msgstr ""
10629
10630
#: en/help_topics/conflict-types.txt:117
10631
msgid ""
10632
"Content conflicts\n"
10633
"-----------------"
10634
msgstr ""
10635
10636
#: en/help_topics/conflict-types.txt:122
10637
msgid " Contents conflict in FILE"
10638
msgstr ""
10639
10640
#: en/help_topics/conflict-types.txt:124
10641
msgid ""
10642
"This conflict happens when there are conflicting changes in the working "
10643
"tree\n"
10644
"and the merge source, but the conflicted items are not text files. They "
10645
"may\n"
10646
"be binary files, or symlinks, or directories. It can even happen with "
10647
"files\n"
10648
"that are deleted on one side, and modified on the other."
10649
msgstr ""
10650
10651
#: en/help_topics/conflict-types.txt:129
10652
msgid ""
10653
"Like text conflicts, Bazaar will emit THIS, OTHER and BASE files. (They may "
10654
"be\n"
10655
"regular files, symlinks or directories). But it will not include a \"main "
10656
"copy\"\n"
10657
"of the file with herringbone conflict markers. It will appear that the "
10658
"\"main\n"
10659
"copy\" has been renamed to THIS or OTHER."
10660
msgstr ""
10661
10662
#: en/help_topics/conflict-types.txt:134 en/help_topics/conflict-types.txt:182
10663
msgid ""
10664
"To resolve that kind of conflict, you should rebuild FILE from either "
10665
"version\n"
10666
"or a combination of both."
10667
msgstr ""
10668
10669
#: en/help_topics/conflict-types.txt:137 en/help_topics/conflict-types.txt:185
10670
#: en/help_topics/conflict-types.txt:226 en/help_topics/conflict-types.txt:252
10671
#: en/help_topics/conflict-types.txt:291 en/help_topics/conflict-types.txt:326
10672
#: en/help_topics/conflict-types.txt:361
10673
msgid "``bzr resolve`` recognizes the following actions:"
10674
msgstr ""
10675
10676
#: en/help_topics/conflict-types.txt:139
10677
msgid ""
10678
"* ``--action=take-this`` will issue ``bzr mv FILE.THIS FILE``,\n"
10679
"* ``--action=take-other`` will issue ``bzr mv FILE.OTHER FILE``,\n"
10680
"* ``--action=done`` will just mark the conflict as resolved."
10681
msgstr ""
10682
10683
#: en/help_topics/conflict-types.txt:143
10684
msgid ""
10685
"Any action will also delete the previously generated ``.BASE``, ``.THIS`` "
10686
"and\n"
10687
"``.OTHER`` files if they are still present in the working tree."
10688
msgstr ""
10689
10690
#: en/help_topics/conflict-types.txt:146 en/help_topics/conflict-types.txt:193
10691
#: en/help_topics/conflict-types.txt:234 en/help_topics/conflict-types.txt:276
10692
#: en/help_topics/conflict-types.txt:298 en/help_topics/conflict-types.txt:334
10693
#: en/help_topics/conflict-types.txt:369
10694
msgid ""
10695
"Bazaar cannot auto-detect when conflicts of this kind have been resolved."
10696
msgstr ""
10697
10698
#: en/help_topics/conflict-types.txt:148
10699
msgid ""
10700
"Tag conflicts\n"
10701
"-------------"
10702
msgstr ""
10703
10704
#: en/help_topics/conflict-types.txt:153
10705
msgid ""
10706
" Conflicting tags:\n"
10707
" version-0.1"
10708
msgstr ""
10709
10710
#: en/help_topics/conflict-types.txt:156
10711
msgid ""
10712
"When pulling from or pushing to another branch, Bazaar informs you about "
10713
"tags\n"
10714
"that conflict between the two branches; that is the same tag points to two\n"
10715
"different revisions. You need not resolve these conflicts, but subsequent\n"
10716
"uses of pull or push will result in the same message."
10717
msgstr ""
10718
10719
#: en/help_topics/conflict-types.txt:161
10720
msgid ""
10721
"To resolve the conflict, you must apply the correct tags to either the "
10722
"target\n"
10723
"branch or the source branch as appropriate. Use \"bzr tags --show-ids -d\n"
10724
"SOURCE_URL\" to see the tags in the source branch. If you want to make the\n"
10725
"target branch's tags match the source branch, then in the target branch do\n"
10726
"``bzr tag --force -r revid:REVISION_ID CONFLICTING_TAG`` for each of the\n"
10727
"CONFLICTING_TAGs, where REVISION_ID comes from the list of tags in the "
10728
"source\n"
10729
"branch. You need not call \"bzr resolve\" after doing this. To resolve in\n"
10730
"favor of the target branch, you need to similarly use ``tag --force`` in "
10731
"the\n"
10732
"source branch. (Note that pulling or pushing using --overwrite will "
10733
"overwrite\n"
10734
"all tags as well.)"
10735
msgstr ""
10736
10737
#: en/help_topics/conflict-types.txt:172
10738
msgid ""
10739
"Duplicate paths\n"
10740
"---------------"
10741
msgstr ""
10742
10743
#: en/help_topics/conflict-types.txt:177
10744
msgid " Conflict adding file FILE. Moved existing file to FILE.moved."
10745
msgstr ""
10746
10747
#: en/help_topics/conflict-types.txt:179
10748
msgid ""
10749
"Sometimes Bazaar will attempt to create a file using a pathname that has\n"
10750
"already been used. The existing file will be renamed to \"FILE.moved\". "
10751
msgstr ""
10752
10753
#: en/help_topics/conflict-types.txt:187
10754
msgid ""
10755
"* ``--action=take-this`` will issue ``bzr rm FILE ; bzr mv FILE.moved "
10756
"FILE``,\n"
10757
"* ``--action=take-other`` will issue ``bzr rm FILE.moved``,\n"
10758
"* ``--action=done`` will just mark the conflict as resolved."
10759
msgstr ""
10760
10761
#: en/help_topics/conflict-types.txt:191
10762
msgid ""
10763
"Note that you must get rid of FILE.moved before using ``--action=done``."
10764
msgstr ""
10765
10766
#: en/help_topics/conflict-types.txt:195
10767
msgid ""
10768
"Unversioned parent\n"
10769
"------------------"
10770
msgstr ""
10771
10772
#: en/help_topics/conflict-types.txt:200
10773
msgid ""
10774
" Conflict because FILE is not versioned, but has versioned children."
10775
msgstr ""
10776
10777
#: en/help_topics/conflict-types.txt:202
10778
msgid ""
10779
"Sometimes Bazaar will attempt to create a file whose parent directory is "
10780
"not\n"
10781
"versioned. This happens when the directory has been deleted in the target,\n"
10782
"but has a new child in the source, or vice versa. In this situation, "
10783
"Bazaar\n"
10784
"will version the parent directory as well. Resolving this issue depends\n"
10785
"very much on the particular scenario. You may wish to rename or delete "
10786
"either\n"
10787
"the file or the directory. When you are satisfied, you can run \"bzr "
10788
"resolve\n"
10789
"FILE\" to mark the conflict as resolved."
10790
msgstr ""
10791
10792
#: en/help_topics/conflict-types.txt:210
10793
msgid ""
10794
"Missing parent\n"
10795
"--------------"
10796
msgstr ""
10797
10798
#: en/help_topics/conflict-types.txt:215
10799
msgid " Conflict adding files to FILE. Created directory."
10800
msgstr ""
10801
10802
#: en/help_topics/conflict-types.txt:217
10803
msgid ""
10804
"This happens when a directory has been deleted in the target, but has new\n"
10805
"children in the source. This is similar to the \"unversioned parent\" "
10806
"conflict,\n"
10807
"except that the parent directory does not *exist*, instead of just being\n"
10808
"unversioned. In this situation, Bazaar will create the missing parent.\n"
10809
"Resolving this issue depends very much on the particular scenario."
10810
msgstr ""
10811
10812
#: en/help_topics/conflict-types.txt:223 en/help_topics/conflict-types.txt:249
10813
msgid ""
10814
"To resolve that kind of conflict, you should either remove or rename the\n"
10815
"children or the directory or a combination of both."
10816
msgstr ""
10817
10818
#: en/help_topics/conflict-types.txt:228
10819
msgid ""
10820
"* ``--action=take-this`` will issue ``bzr rm directory`` including the\n"
10821
" children,\n"
10822
"* ``--action=take-other`` will acknowledge Bazaar choice to keep the "
10823
"children\n"
10824
" and restoring the directory,\n"
10825
"* ``--action=done`` will just mark the conflict as resolved."
10826
msgstr ""
10827
10828
#: en/help_topics/conflict-types.txt:236
10829
msgid ""
10830
"Deleting parent\n"
10831
"---------------"
10832
msgstr ""
10833
10834
#: en/help_topics/conflict-types.txt:241
10835
msgid " Conflict: can't delete DIR because it is not empty. Not deleting."
10836
msgstr ""
10837
10838
#: en/help_topics/conflict-types.txt:243
10839
msgid ""
10840
"This is the opposite of \"missing parent\". A directory is deleted in the\n"
10841
"source, but has new children in the target (either because a directory\n"
10842
"deletion is merged or because the merge introduce new children). Bazaar\n"
10843
"will retain the directory. Resolving this issue depends very much on the\n"
10844
"particular scenario."
10845
msgstr ""
10846
10847
#: en/help_topics/conflict-types.txt:254
10848
msgid ""
10849
"* ``--action=take-this`` will acknowledge Bazaar choice to keep the "
10850
"directory,"
10851
msgstr ""
10852
10853
#: en/help_topics/conflict-types.txt:256
10854
msgid ""
10855
"* ``--action=take-other`` will issue ``bzr rm directory`` including the \n"
10856
" children,"
10857
msgstr ""
10858
10859
#: en/help_topics/conflict-types.txt:259
10860
msgid "* ``--action=done`` will just mark the conflict as resolved."
10861
msgstr ""
10862
10863
#: en/help_topics/conflict-types.txt:261
10864
msgid ""
10865
"Note that when merging a directory deletion, if unversioned files are\n"
10866
"present, they become potential orphans has they don't have a directory\n"
10867
"parent anymore."
10868
msgstr ""
10869
10870
#: en/help_topics/conflict-types.txt:265
10871
msgid ""
10872
"Handling such orphans, *before* the conflict is created, is controlled by\n"
10873
"setting the ``bzr.transform.orphan_policy`` configuration option."
10874
msgstr ""
10875
10876
#: en/help_topics/conflict-types.txt:268
10877
msgid "There are two possible values for this option:"
10878
msgstr ""
10879
10880
#: en/help_topics/conflict-types.txt:270
10881
msgid ""
10882
"* ``conflict`` (the default): will leave the orphans in place and\n"
10883
" generate a conflicts,"
10884
msgstr ""
10885
10886
#: en/help_topics/conflict-types.txt:273
10887
msgid ""
10888
"* ``move``: will move the orphans to a ``bzr-orphans`` directory at the "
10889
"root\n"
10890
" of the working tree with names like ``<file>.~#~``."
10891
msgstr ""
10892
10893
#: en/help_topics/conflict-types.txt:278
10894
msgid ""
10895
"Path conflict\n"
10896
"-------------"
10897
msgstr ""
10898
10899
#: en/help_topics/conflict-types.txt:283
10900
msgid " Path conflict: PATH1 / PATH2"
10901
msgstr ""
10902
10903
#: en/help_topics/conflict-types.txt:285
10904
msgid ""
10905
"This happens when the source and target have each modified the name or "
10906
"parent\n"
10907
"directory of a file. Bazaar will use the path elements from the source."
10908
msgstr ""
10909
10910
#: en/help_topics/conflict-types.txt:288
10911
msgid ""
10912
"To resolve that kind of conflict, you just have to decide what name should "
10913
"be\n"
10914
"retained for the file involved."
10915
msgstr ""
10916
10917
#: en/help_topics/conflict-types.txt:293
10918
msgid ""
10919
"* ``--action=take-this`` will revert Bazaar choice and keep ``PATH1`` by\n"
10920
" issuing ``bzr mv PATH2 PATH1``,\n"
10921
"* ``--action=take-other`` will acknowledge Bazaar choice of keeping "
10922
"``PATH2``,\n"
10923
"* ``--action=done`` will just mark the conflict as resolved."
10924
msgstr ""
10925
10926
#: en/help_topics/conflict-types.txt:300
10927
msgid ""
10928
"Parent loop\n"
10929
"-----------"
10930
msgstr ""
10931
10932
#: en/help_topics/conflict-types.txt:305
10933
msgid " Conflict moving FILE into DIRECTORY. Cancelled move."
10934
msgstr ""
10935
10936
#: en/help_topics/conflict-types.txt:307
10937
msgid ""
10938
"This happens when the source and the target have each moved directories, so\n"
10939
"that, if the change could be applied, a directory would be contained by "
10940
"itself.\n"
10941
"For example::"
10942
msgstr ""
10943
10944
#: en/help_topics/conflict-types.txt:311
10945
msgid ""
10946
" $ bzr init\n"
10947
" $ bzr mkdir white\n"
10948
" $ bzr mkdir black\n"
10949
" $ bzr commit -m \"BASE\"\n"
10950
" $ bzr branch . ../other\n"
10951
" $ bzr mv white black\n"
10952
" $ bzr commit -m \"THIS\"\n"
10953
" $ bzr mv ../other/black ../other/white\n"
10954
" $ bzr commit ../other -m \"OTHER\"\n"
10955
" $ bzr merge ../other"
10956
msgstr ""
10957
10958
#: en/help_topics/conflict-types.txt:322
10959
msgid ""
10960
"In this situation, Bazaar will cancel the move, and leave ``white`` in\n"
10961
"``black``. To resolve that kind of conflict, you just have to decide what\n"
10962
"name should be retained for the directories involved."
10963
msgstr ""
10964
10965
#: en/help_topics/conflict-types.txt:328
10966
msgid ""
10967
"* ``--action=take-this`` will acknowledge Bazaar choice of leaving ``white`` "
10968
"\n"
10969
" in ``black``,\n"
10970
"* ``--action=take-other`` will revert Bazaar choice and move ``black`` in\n"
10971
" ``white`` by issuing ``bzr mv black/white white ; bzr mv black white``,\n"
10972
"* ``--action=done`` will just mark the conflict as resolved."
10973
msgstr ""
10974
10975
#: en/help_topics/conflict-types.txt:336
10976
msgid ""
10977
"Non-directory parent\n"
10978
"--------------------"
10979
msgstr ""
10980
10981
#: en/help_topics/conflict-types.txt:341
10982
msgid ""
10983
" Conflict: foo.new is not a directory, but has files in it.\n"
10984
" Created directory."
10985
msgstr ""
10986
10987
#: en/help_topics/conflict-types.txt:344
10988
msgid ""
10989
"This happens when one side has added files to a directory, and the other "
10990
"side\n"
10991
"has changed the directory into a file or symlink. For example::"
10992
msgstr ""
10993
10994
#: en/help_topics/conflict-types.txt:347
10995
msgid ""
10996
" $ bzr init\n"
10997
" $ bzr mkdir foo\n"
10998
" $ bzr commit -m \"BASE\"\n"
10999
" $ bzr branch . ../other\n"
11000
" $ rmdir foo\n"
11001
" $ touch foo\n"
11002
" $ bzr commit -m \"THIS\"\n"
11003
" $ bzr mkdir ../other/foo/bar\n"
11004
" $ bzr commit ../other -m \"OTHER\"\n"
11005
" $ bzr merge ../other"
11006
msgstr ""
11007
11008
#: en/help_topics/conflict-types.txt:358
11009
msgid ""
11010
"To resolve that kind of conflict, you have to decide what name should be\n"
11011
"retained for the file, directory or symlink involved."
11012
msgstr ""
11013
11014
#: en/help_topics/conflict-types.txt:363
11015
msgid ""
11016
"* ``--action=take-this`` will issue ``bzr rm --force foo.new`` and \n"
11017
" ``bzr add foo``,\n"
11018
"* ``--action=take-other`` will issue ``bzr rm --force foo`` and \n"
11019
" ``bzr mv foo.new foo``,\n"
11020
"* ``--action=done`` will just mark the conflict as resolved."
11021
msgstr ""
11022
11023
#: en/help_topics/conflict-types.txt:371
11024
msgid ""
11025
"MalformedTransform\n"
11026
"------------------"
11027
msgstr ""
11028
11029
#: en/help_topics/conflict-types.txt:374
11030
msgid ""
11031
"It is possible (though very rare) for Bazaar to raise a MalformedTransform\n"
11032
"exception. This means that Bazaar encountered a filesystem conflict that it "
11033
"was\n"
11034
"unable to resolve. This usually indicates a bug. Please let us know if "
11035
"you\n"
11036
"encounter this. Our bug tracker is at https://launchpad.net/bzr/+bugs\n"
11037
msgstr ""
11038
11039
#: en/help_topics/content-filters.txt:1
11040
msgid ""
11041
"Content Filters\n"
11042
"==============="
11043
msgstr ""
11044
11045
#: en/help_topics/content-filters.txt:4
11046
msgid ""
11047
"Content formats\n"
11048
"---------------"
11049
msgstr ""
11050
11051
#: en/help_topics/content-filters.txt:7
11052
msgid ""
11053
"Bazaar's content filtering allows you to store files in a different\n"
11054
"format from the copy in your working tree. This lets you, or your\n"
11055
"co-developers, use Windows development tools that expect CRLF files\n"
11056
"on projects that use other line-ending conventions. Among other things,\n"
11057
"content filters also let Unix developers more easily work on projects\n"
11058
"using Windows line-ending conventions, keyword expansion/compression,\n"
11059
"and trailing spaces on lines in text files to be implicitly stripped\n"
11060
"when committed."
11061
msgstr ""
11062
11063
#: en/help_topics/content-filters.txt:16
11064
msgid "To generalize, there are two content formats supported by Bazaar:"
11065
msgstr ""
11066
11067
#: en/help_topics/content-filters.txt:18
11068
msgid ""
11069
"* a canonical format - how files are stored internally\n"
11070
"* a convenience format - how files are created in a working tree."
11071
msgstr ""
11072
11073
#: en/help_topics/content-filters.txt:21
11074
msgid ""
11075
"\n"
11076
"Format conversion\n"
11077
"-----------------"
11078
msgstr ""
11079
11080
#: en/help_topics/content-filters.txt:25
11081
msgid ""
11082
"The conversion between these formats is done by content filters.\n"
11083
"A content filter has two parts:"
11084
msgstr ""
11085
11086
#: en/help_topics/content-filters.txt:28
11087
msgid ""
11088
"* a read converter - converts from convenience to canonical format\n"
11089
"* a write converter - converts from canonical to convenience format."
11090
msgstr ""
11091
11092
#: en/help_topics/content-filters.txt:31
11093
msgid ""
11094
"Many of these converters will provide *round-trip* conversion,\n"
11095
"i.e. applying the read converter followed by the write converter\n"
11096
"gives back the original content. However, others may provide an\n"
11097
"asymmetric conversion. For example, a read converter might strip\n"
11098
"trailing whitespace off lines in source code while the matching\n"
11099
"write converter might pass content through unchanged."
11100
msgstr ""
11101
11102
#: en/help_topics/content-filters.txt:38
11103
msgid ""
11104
"\n"
11105
"Enabling content filters\n"
11106
"------------------------"
11107
msgstr ""
11108
11109
#: en/help_topics/content-filters.txt:42
11110
msgid ""
11111
"Content filters are typically provided by plugins, so the first step\n"
11112
"in using them is to install the relevant plugins and read their\n"
11113
"documentation. Some plugins may be very specific about which files\n"
11114
"they filter, e.g. only files ending in ``.java`` or ``.php``.\n"
11115
"In other cases, the plugin may leave it in the user's hands to\n"
11116
"define which files are to be filtered. This is typically done\n"
11117
"using rule-based preferences. See ``bzr help rules`` for general\n"
11118
"information about defining these."
11119
msgstr ""
11120
11121
#: en/help_topics/content-filters.txt:51
11122
msgid ""
11123
"\n"
11124
"Impact on commands\n"
11125
"------------------"
11126
msgstr ""
11127
11128
#: en/help_topics/content-filters.txt:55
11129
msgid ""
11130
"Read converters are only applied to commands that read content from\n"
11131
"a working tree, e.g. status, diff and commit. For example, ``bzr diff``\n"
11132
"will apply read converters to files in the working tree, then compare\n"
11133
"the results to the content last committed."
11134
msgstr ""
11135
11136
#: en/help_topics/content-filters.txt:60
11137
msgid ""
11138
"Write converters are only applied by commands that **create files in a\n"
11139
"working tree**, e.g. branch, checkout, update. If you wish to see the\n"
11140
"canonical format of a file or tree, use ``bzr cat`` or ``bzr export``\n"
11141
"respectively."
11142
msgstr ""
11143
11144
#: en/help_topics/content-filters.txt:65
11145
msgid ""
11146
"Note: ``bzr commit`` does not implicitly apply write converters after\n"
11147
"comitting files. If this makes sense for a given plugin providing\n"
11148
"a content filter, the plugin can usually achieve this effect by using a\n"
11149
"``start_commit`` or ``post_commit`` hook say. See :doc:`hooks-help`\n"
11150
"for more information on hooks."
11151
msgstr ""
11152
11153
#: en/help_topics/content-filters.txt:71
11154
msgid ""
11155
"\n"
11156
"Refreshing your working tree\n"
11157
"----------------------------"
11158
msgstr ""
11159
11160
#: en/help_topics/content-filters.txt:75
11161
msgid ""
11162
"For performance reasons, Bazaar caches the timestamps of files in\n"
11163
"a working tree, and assumes files are unchanged if their timestamps\n"
11164
"match the cached values. As a consequence, there are times when\n"
11165
"you may need to explicitly ask for content filtering to be reapplied\n"
11166
"in one or both directions, e.g. after installing or reconfiguring\n"
11167
"plugins providing it."
11168
msgstr ""
11169
11170
#: en/help_topics/content-filters.txt:82
11171
msgid "Here are some general guidelines for doing this:"
11172
msgstr ""
11173
11174
#: en/help_topics/content-filters.txt:84
11175
msgid ""
11176
" * To reapply read converters, ``touch`` files, i.e. update their\n"
11177
" timestamp. Operations like ``bzr status`` should then reapply the\n"
11178
" relevant read converters and compare the end result with the\n"
11179
" canonical format."
11180
msgstr ""
11181
11182
#: en/help_topics/content-filters.txt:89
11183
msgid ""
11184
" * To reapply write converters, ensure there are no local changes,\n"
11185
" delete the relevant files and run ``bzr revert`` on those files."
11186
msgstr ""
11187
11188
#: en/help_topics/content-filters.txt:92
11189
msgid ""
11190
"Note: In the future, it is likely that additional options will be added\n"
11191
"to commands to make this refreshing process faster and safer.\n"
11192
msgstr ""
11193
11194
#: en/help_topics/current-formats.txt:1
11195
msgid "Current Storage Formats"
11196
msgstr ""
11197
11198
#: en/help_topics/current-formats.txt:3
11199
msgid ""
11200
":2a:\n"
11201
" (native) (default) Format for the bzr 2.0 series. Uses group-\n"
11202
" compress storage. Provides rich roots which are a one-way\n"
11203
" transition."
11204
msgstr ""
11205
11206
#: en/help_topics/current-formats.txt:8 en/help_topics/other-formats.txt:17
11207
msgid ""
11208
"\n"
11209
"See :doc:`formats-help` for more about storage formats."
11210
msgstr ""
11211
11212
#: en/help_topics/debug-flags.txt:1
11213
msgid ""
11214
"Debug Flags\n"
11215
"==========="
11216
msgstr ""
11217
11218
#: en/help_topics/debug-flags.txt:4
11219
msgid ""
11220
"These flags can be passed on the bzr command line or (without the ``-D``\n"
11221
"prefix) put in the ``debug_flags`` variable in ``bazaar.conf``."
11222
msgstr ""
11223
11224
#: en/help_topics/debug-flags.txt:7
11225
msgid ""
11226
"-Dauth Trace authentication sections used.\n"
11227
"-Dbytes Print out how many bytes were transferred\n"
11228
"-Ddirstate Trace dirstate activity (verbose!)\n"
11229
"-Derror Instead of normal error handling, always print a "
11230
"traceback\n"
11231
" on error.\n"
11232
"-Devil Capture call sites that do expensive or badly-scaling\n"
11233
" operations.\n"
11234
"-Dfetch Trace history copying between repositories.\n"
11235
"-Dfilters Emit information for debugging content filtering.\n"
11236
"-Dforceinvdeltas Force use of inventory deltas during generic streaming "
11237
"fetch.\n"
11238
"-Dgraph Trace graph traversal.\n"
11239
"-Dhashcache Log every time a working file is read to determine its "
11240
"hash.\n"
11241
"-Dhooks Trace hook execution.\n"
11242
"-Dhpss Trace smart protocol requests and responses.\n"
11243
"-Dhpssdetail More hpss details.\n"
11244
"-Dhpssvfs Traceback on vfs access to Remote objects.\n"
11245
"-Dhttp Trace http connections, requests and responses.\n"
11246
"-Dindex Trace major index operations.\n"
11247
"-Dknit Trace knit operations.\n"
11248
"-Dlock Trace when lockdir locks are taken or released.\n"
11249
"-Dnoretry If a connection is reset, fail immediately rather than\n"
11250
" retrying the request.\n"
11251
"-Dprogress Trace progress bar operations.\n"
11252
"-Dmem_dump Dump memory to a file upon an out of memory error.\n"
11253
"-Dmerge Emit information for debugging merges.\n"
11254
"-Dno_apport Don't use apport to report crashes.\n"
11255
"-Dno_activity \t Don't show transport activity indicator in progress bar.\n"
11256
"-Dpack Emit information about pack operations.\n"
11257
"-Drelock Emit a message every time a branch or repository object "
11258
"is\n"
11259
" unlocked then relocked the same way.\n"
11260
"-Dsftp Trace SFTP internals.\n"
11261
"-Dstatic_tuple Error when a tuple is used where a StaticTuple is "
11262
"expected\n"
11263
"-Dstream Trace fetch streams.\n"
11264
"-Dstrict_locks Trace when OS locks are potentially used in a non-"
11265
"portable\n"
11266
" manner.\n"
11267
"-Dunlock Some errors during unlock are treated as warnings.\n"
11268
"-DIDS_never Never use InterDifferingSerializer when fetching.\n"
11269
"-DIDS_always Always use InterDifferingSerializer to fetch if "
11270
"appropriate\n"
11271
" for the format, even for non-local fetches.\n"
11272
msgstr ""
11273
11274
#: en/help_topics/diverged-branches.txt:1
11275
msgid ""
11276
"Diverged Branches\n"
11277
"================="
11278
msgstr ""
11279
11280
#: en/help_topics/diverged-branches.txt:4
11281
msgid ""
11282
"When Bazaar tries to push one branch onto another, it requires that the\n"
11283
"destination branch must be ready to receive the source branch. If this "
11284
"isn't\n"
11285
"the case, then we say that the branches have ``diverged``. Branches are\n"
11286
"considered diverged if the destination branch's most recent commit is one "
11287
"that\n"
11288
"has not been merged (directly or indirectly) by the source branch. To "
11289
"recover\n"
11290
"from diverged branches, one must merge the missing revisions into the "
11291
"source\n"
11292
"branch."
11293
msgstr ""
11294
11295
#: en/help_topics/diverged-branches.txt:12
11296
msgid ""
11297
"This situation commonly arises when using a centralized workflow with local\n"
11298
"commits. If someone else has committed new work to the mainline since your\n"
11299
"last pull and you have local commits that have not yet been pushed to the\n"
11300
"mainline, then your local branch and the mainline have diverged."
11301
msgstr ""
11302
11303
#: en/help_topics/diverged-branches.txt:17
11304
msgid ""
11305
"Discovering What Has Diverged\n"
11306
"-----------------------------"
11307
msgstr ""
11308
11309
#: en/help_topics/diverged-branches.txt:20
11310
msgid ""
11311
"The ``bzr missing`` command is used to find out what revisions are in "
11312
"another\n"
11313
"branch that are not present in the current branch, and vice-versa. It shows "
11314
"a\n"
11315
"summary of which extra revisions exist in each branch. If you want to see "
11316
"the\n"
11317
"precise effects of those revisions, you can use ``bzr diff --"
11318
"old=other_branch``\n"
11319
"to show the differences between other_branch and your current branch."
11320
msgstr ""
11321
11322
#: en/help_topics/diverged-branches.txt:26
11323
msgid ""
11324
"A Solution\n"
11325
"----------"
11326
msgstr ""
11327
11328
#: en/help_topics/diverged-branches.txt:29
11329
msgid ""
11330
"The solution is to merge the revisions from the mainline into your local\n"
11331
"branch. To do so, use ``bzr merge`` to get the new revisions from the\n"
11332
"mainline. This merge may result in conflicts if the other developer's "
11333
"changes\n"
11334
"overlap with your changes. These conflicts should be resolved before\n"
11335
"continuing. After any conflicts have been resolved, or even if there were "
11336
"no\n"
11337
"conflicts, Bazaar requires that you explicitly commit these new revisions\n"
11338
"to your local branch. This requirement gives you an opportunity to test "
11339
"the\n"
11340
"resulting working tree for correctness, since the merged revisions could "
11341
"have\n"
11342
"made arbitrary changes. After testing, you should commit the merge using\n"
11343
"``bzr commit``. This clears up the diverged branches situation. Your "
11344
"local\n"
11345
"branch can now be pushed to the mainline.\n"
11346
msgstr ""
11347
11348
#: en/help_topics/eol.txt:1
11349
msgid ""
11350
"End of Line Conversion\n"
11351
"======================"
11352
msgstr ""
11353
11354
#: en/help_topics/eol.txt:4
11355
msgid ""
11356
"EOL conversion is provided as a content filter where Bazaar internally\n"
11357
"stores a canonical format but outputs a convenience format. See\n"
11358
"``bzr help content-filters`` for general information about using these."
11359
msgstr ""
11360
11361
#: en/help_topics/eol.txt:8
11362
msgid ""
11363
"Note: Content filtering is only supported in recently added formats,\n"
11364
"e.g. 1.14. Be sure that both the repository *and* the branch are\n"
11365
"in a recent format. (Just setting the format on the repository\n"
11366
"is not enough.) If content filtering does not appear to be working, use\n"
11367
"'bzr info -v' to confirm that the branch is using \"Working tree format 5\"\n"
11368
"or later."
11369
msgstr ""
11370
11371
#: en/help_topics/eol.txt:15
11372
msgid ""
11373
"EOL conversion needs to be enabled for selected file patterns using\n"
11374
"rules. See ``bzr help rules`` for general information on defining rules.\n"
11375
"Currently, rules are only supported in $BZR_HOME/.bazaar/rules (or\n"
11376
"%BZR_HOME%/bazaar/2.0/rules on Windows). Branch specific rules will be\n"
11377
"supported in a future verison of Bazaar."
11378
msgstr ""
11379
11380
#: en/help_topics/eol.txt:21
11381
msgid ""
11382
"To configure which files to filter, set ``eol`` to one of the values below.\n"
11383
"(If a value is not set, ``exact`` is the default.)"
11384
msgstr ""
11385
11386
#: en/help_topics/eol.txt:24
11387
msgid ""
11388
" ========== ===================================== ======================\n"
11389
" Value Checkout end-of-lines as Commit end-of-lines as\n"
11390
" ========== ===================================== ======================\n"
11391
" ``native`` ``crlf`` on Windows, ``lf`` otherwise ``lf``\n"
11392
" ---------- ------------------------------------- ----------------------\n"
11393
" ``lf`` ``lf`` ``lf``\n"
11394
" ---------- ------------------------------------- ----------------------\n"
11395
" ``crlf`` ``crlf`` ``lf``\n"
11396
" ---------- ------------------------------------- ----------------------\n"
11397
" ``exact`` No conversion Exactly as in file\n"
11398
" ========== ===================================== ======================"
11399
msgstr ""
11400
11401
#: en/help_topics/eol.txt:36
11402
msgid ""
11403
"Note: For safety reasons, no conversion is applied to any file where a null\n"
11404
"byte is detected in the file."
11405
msgstr ""
11406
11407
#: en/help_topics/eol.txt:39
11408
msgid ""
11409
"For users working on a cross-platform project, here is a suggested rule\n"
11410
"to use as a starting point::"
11411
msgstr ""
11412
11413
#: en/help_topics/eol.txt:42 en/help_topics/eol.txt:52
11414
#: en/help_topics/eol.txt:67 en/help_topics/eol.txt:82
11415
msgid ""
11416
" [name *]\n"
11417
" eol = native"
11418
msgstr ""
11419
11420
#: en/help_topics/eol.txt:45
11421
msgid ""
11422
"If you have binary files that do not contain a null byte though, be\n"
11423
"sure to add ``eol = exact`` rules for those as well. You can do this\n"
11424
"by giving more explicit patterns earlier in the rules file. For example::"
11425
msgstr ""
11426
11427
#: en/help_topics/eol.txt:49
11428
msgid ""
11429
" [name *.png]\n"
11430
" eol = exact"
11431
msgstr ""
11432
11433
#: en/help_topics/eol.txt:55
11434
msgid ""
11435
"If your working tree is on a network drive shared by users on different\n"
11436
"operating systems, you typically want to force certain conventions for\n"
11437
"certain files. In that way, if a file is created with the wrong line\n"
11438
"endings or line endings get mixed during editing, it gets committed\n"
11439
"correctly and gets checked out correctly. For example::"
11440
msgstr ""
11441
11442
#: en/help_topics/eol.txt:61
11443
msgid ""
11444
" [name *.bat]\n"
11445
" eol = crlf"
11446
msgstr ""
11447
11448
#: en/help_topics/eol.txt:64
11449
msgid ""
11450
" [name *.sh]\n"
11451
" eol = lf"
11452
msgstr ""
11453
11454
#: en/help_topics/eol.txt:70
11455
msgid ""
11456
"If you take the care to create files with their required endings, you can\n"
11457
"achieve *almost* the same thing by using ``eol = exact``. It is slightly\n"
11458
"safer to use ``lf`` and ``crlf`` though because edits accidentally\n"
11459
"introducing mixed line endings will be corrected during commit for files\n"
11460
"with those settings."
11461
msgstr ""
11462
11463
#: en/help_topics/eol.txt:76
11464
msgid ""
11465
"If you have sample test data that deliberately has text files with mixed\n"
11466
"newline conventions, you can ask for those to be left alone like this::"
11467
msgstr ""
11468
11469
#: en/help_topics/eol.txt:79
11470
msgid ""
11471
" [name test_data/]\n"
11472
" eol = exact"
11473
msgstr ""
11474
11475
#: en/help_topics/eol.txt:85
11476
msgid ""
11477
"Note that ``exact`` does not imply the file is binary but it does mean\n"
11478
"that no conversion of end-of-lines will be done. (Bazaar currently relies\n"
11479
"of content analysis to detect binary files for commands like ``diff``.\n"
11480
"In the future, a ``binary = true`` rule may be added but it is not\n"
11481
"supported yet.)"
11482
msgstr ""
11483
11484
#: en/help_topics/eol.txt:91
11485
msgid ""
11486
"If you have an existing repository with text files already stored using\n"
11487
"Windows newline conventions (``crlf``), then you may want to keep using "
11488
"that\n"
11489
"convention in the repository. Forcing certain files to this convention\n"
11490
"may also help users who do not have rules configured. To do this, set\n"
11491
"``eol`` to one of the values below."
11492
msgstr ""
11493
11494
#: en/help_topics/eol.txt:97
11495
msgid ""
11496
" ============================ ======================== "
11497
"======================\n"
11498
" Value Checkout end-of-lines as Commit end-of-lines "
11499
"as\n"
11500
" ============================ ======================== "
11501
"======================\n"
11502
" ``native-with-crlf-in-repo`` ``crlf`` on Windows, ``crlf``\n"
11503
" ``lf`` otherwise\n"
11504
" ---------------------------- ------------------------ ----------------------"
11505
"\n"
11506
" ``lf-with-crlf-in-repo`` ``lf`` ``crlf``\n"
11507
" ---------------------------- ------------------------ ----------------------"
11508
"\n"
11509
" ``crlf-with-crlf-in-repo`` ``crlf`` ``crlf``\n"
11510
" ============================ ======================== ======================"
11511
msgstr ""
11512
11513
#: en/help_topics/eol.txt:108
11514
msgid ""
11515
"For users working on an existing project that uses Windows newline\n"
11516
"conventions in their Bazaar repository, this rule is suggested as a\n"
11517
"starting point::"
11518
msgstr ""
11519
11520
#: en/help_topics/eol.txt:112
11521
msgid ""
11522
" [name *]\n"
11523
" eol = native-with-crlf-in-repo"
11524
msgstr ""
11525
11526
#: en/help_topics/eol.txt:115
11527
msgid ""
11528
"For new projects, it is recommended that end-of-lines be stored as ``lf``\n"
11529
"and that users stick to the basic settings, i.e. ``native``, ``lf``,\n"
11530
"``crlf`` and ``exact``."
11531
msgstr ""
11532
11533
#: en/help_topics/eol.txt:119
11534
msgid ""
11535
"Note: Bazaar's EOL conversion will convert the content of files but\n"
11536
"never reject files because a given line ending or mixed line endings\n"
11537
"are found. A precommit hook should be used if you wish to validate\n"
11538
"(and not just convert) content before committing.\n"
11539
msgstr ""
11540
11541
#: en/help_topics/hidden-commands.txt:1
11542
msgid ""
11543
"added List files added in working tree.\n"
11544
"ancestry List all revisions merged into this branch.\n"
11545
"assert-fail Test reporting of assertion failures\n"
11546
"bundle-info Output interesting stats about a bundle\n"
11547
"bundle-revisions Create a merge-directive for submitting changes.\n"
11548
"cat-revision Write out metadata for a revision.\n"
11549
"dump-btree Dump the contents of a btree index file to stdout.\n"
11550
"export-pot Export command helps and error messages in po format.\n"
11551
"file-id Print file_id of a particular file or directory.\n"
11552
"file-path Print path of file_ids to a file or directory.\n"
11553
"find-merge-base Find and print a base revision for merging two "
11554
"branches.\n"
11555
"hooks Show hooks.\n"
11556
"inventory Show inventory of the current working copy or a "
11557
"revision.\n"
11558
"local-time-offset Show the offset in seconds from GMT to local time.\n"
11559
"lookup-revision Lookup the revision-id from a revision-number\n"
11560
"merge-directive Generate a merge directive for auto-merge tools.\n"
11561
"modified List files modified in working tree.\n"
11562
"re-sign Create a digital signature for an existing revision.\n"
11563
"reference list, view and set branch locations for nested trees.\n"
11564
"relpath Show path of a file relative to root\n"
11565
"repair-workingtree Reset the working tree state file.\n"
11566
"revision-history Display the list of revision ids on a branch.\n"
11567
"revision-info Show revision number and revision id for a given "
11568
"revision\n"
11569
" identifier.\n"
11570
"rocks Statement of optimism.\n"
11571
"selftest Run internal test suite.\n"
11572
"shell-complete Show appropriate completions for context.\n"
11573
"test-script Run a shell-like test from a file.\n"
11574
"touching-revisions Return revision-ids which affected a particular file.\n"
11575
"unknowns List unknown files.\n"
11576
"wait-until-signalled Test helper for\n"
11577
" test_start_and_stop_bzr_subprocess_send_signal.\n"
11578
msgstr ""
11579
11580
#: en/help_topics/hooks.txt:1
11581
msgid ""
11582
"\n"
11583
"Hooks\n"
11584
"====="
11585
msgstr ""
11586
11587
#: en/help_topics/hooks.txt:5 en/help_topics/rules.txt:4
11588
msgid ""
11589
"Introduction\n"
11590
"------------"
11591
msgstr ""
11592
11593
#: en/help_topics/hooks.txt:8
11594
msgid "A hook of type *xxx* of class *yyy* needs to be registered using::"
11595
msgstr ""
11596
11597
#: en/help_topics/hooks.txt:10
11598
msgid " yyy.hooks.install_named_hook(\"xxx\", ...)"
11599
msgstr ""
11600
11601
#: en/help_topics/hooks.txt:12
11602
msgid ""
11603
"See :doc:`Using hooks<../user-guide/hooks>` in the User Guide for examples."
11604
msgstr ""
11605
11606
#: en/help_topics/hooks.txt:14
11607
msgid ""
11608
"The class that contains each hook is given before the hooks it supplies. "
11609
"For\n"
11610
"instance, BranchHooks as the class is the hooks class for\n"
11611
"`bzrlib.branch.Branch.hooks`."
11612
msgstr ""
11613
11614
#: en/help_topics/hooks.txt:18
11615
msgid ""
11616
"Each description also indicates whether the hook runs on the client (the\n"
11617
"machine where bzr was invoked) or the server (the machine addressed by\n"
11618
"the branch URL). These may be, but are not necessarily, the same machine."
11619
msgstr ""
11620
11621
#: en/help_topics/hooks.txt:22
11622
msgid ""
11623
"Plugins (including hooks) are run on the server if all of these is true:"
11624
msgstr ""
11625
11626
#: en/help_topics/hooks.txt:24
11627
msgid ""
11628
" * The connection is via a smart server (accessed with a URL starting with\n"
11629
" \"bzr://\", \"bzr+ssh://\" or \"bzr+http://\", or accessed via a "
11630
"\"http://\"\n"
11631
" URL when a smart server is available via HTTP)."
11632
msgstr ""
11633
11634
#: en/help_topics/hooks.txt:28
11635
msgid ""
11636
" * The hook is either server specific or part of general infrastructure "
11637
"rather\n"
11638
" than client specific code (such as commit)."
11639
msgstr ""
11640
11641
#: en/help_topics/hooks.txt:31
11642
msgid ""
11643
"\n"
11644
"BranchHooks\n"
11645
"-----------"
11646
msgstr ""
11647
11648
#: en/help_topics/hooks.txt:35
11649
msgid ""
11650
"automatic_tag_name\n"
11651
"~~~~~~~~~~~~~~~~~~"
11652
msgstr ""
11653
11654
#: en/help_topics/hooks.txt:38 en/help_topics/hooks.txt:56
11655
#: en/help_topics/hooks.txt:102 en/help_topics/hooks.txt:259
11656
msgid "Introduced in: 2.2"
11657
msgstr ""
11658
11659
#: en/help_topics/hooks.txt:40
11660
msgid ""
11661
"Called to determine an automatic tag name for a revision.\n"
11662
"automatic_tag_name is called with (branch, revision_id) and should\n"
11663
"return a tag name or None if no tag name could be determined. The\n"
11664
"first non-None tag name returned will be used."
11665
msgstr ""
11666
11667
#: en/help_topics/hooks.txt:45
11668
msgid ""
11669
"open\n"
11670
"~~~~"
11671
msgstr ""
11672
11673
#: en/help_topics/hooks.txt:48 en/help_topics/hooks.txt:290
11674
#: en/help_topics/hooks.txt:304
11675
msgid "Introduced in: 1.8"
11676
msgstr ""
11677
11678
#: en/help_topics/hooks.txt:50
11679
msgid ""
11680
"Called with the Branch object that has been opened after a branch is\n"
11681
"opened."
11682
msgstr ""
11683
11684
#: en/help_topics/hooks.txt:53
11685
msgid ""
11686
"post_branch_init\n"
11687
"~~~~~~~~~~~~~~~~"
11688
msgstr ""
11689
11690
#: en/help_topics/hooks.txt:58
11691
msgid ""
11692
"Called after new branch initialization completes. post_branch_init is\n"
11693
"called with a bzrlib.branch.BranchInitHookParams. Note that init,\n"
11694
"branch and checkout (both heavyweight and lightweight) will all\n"
11695
"trigger this hook."
11696
msgstr ""
11697
11698
#: en/help_topics/hooks.txt:63
11699
msgid ""
11700
"post_change_branch_tip\n"
11701
"~~~~~~~~~~~~~~~~~~~~~~"
11702
msgstr ""
11703
11704
#: en/help_topics/hooks.txt:66 en/help_topics/hooks.txt:402
11705
msgid "Introduced in: 1.4"
11706
msgstr ""
11707
11708
#: en/help_topics/hooks.txt:68
11709
msgid ""
11710
"Called in bzr client and server after a change to the tip of a branch\n"
11711
"is made. post_change_branch_tip is called with a\n"
11712
"bzrlib.branch.ChangeBranchTipParams. Note that push, pull, commit,\n"
11713
"uncommit will all trigger this hook."
11714
msgstr ""
11715
11716
#: en/help_topics/hooks.txt:73 en/help_topics/hooks.txt:389
11717
msgid ""
11718
"post_commit\n"
11719
"~~~~~~~~~~~"
11720
msgstr ""
11721
11722
#: en/help_topics/hooks.txt:76 en/help_topics/hooks.txt:86
11723
#: en/help_topics/hooks.txt:94 en/help_topics/hooks.txt:110
11724
#: en/help_topics/hooks.txt:145
11725
msgid "Introduced in: 0.15"
11726
msgstr ""
11727
11728
#: en/help_topics/hooks.txt:78
11729
msgid ""
11730
"Called in the bzr client after a commit has completed. post_commit is\n"
11731
"called with (local, master, old_revno, old_revid, new_revno,\n"
11732
"new_revid). old_revid is NULL_REVISION for the first commit to a\n"
11733
"branch."
11734
msgstr ""
11735
11736
#: en/help_topics/hooks.txt:83
11737
msgid ""
11738
"post_pull\n"
11739
"~~~~~~~~~"
11740
msgstr ""
11741
11742
#: en/help_topics/hooks.txt:88
11743
msgid ""
11744
"Called after a pull operation completes. post_pull is called with a\n"
11745
"bzrlib.branch.PullResult object and only runs in the bzr client."
11746
msgstr ""
11747
11748
#: en/help_topics/hooks.txt:91
11749
msgid ""
11750
"post_push\n"
11751
"~~~~~~~~~"
11752
msgstr ""
11753
11754
#: en/help_topics/hooks.txt:96
11755
msgid ""
11756
"Called after a push operation completes. post_push is called with a\n"
11757
"bzrlib.branch.BranchPushResult object and only runs in the bzr client."
11758
msgstr ""
11759
11760
#: en/help_topics/hooks.txt:99
11761
msgid ""
11762
"post_switch\n"
11763
"~~~~~~~~~~~"
11764
msgstr ""
11765
11766
#: en/help_topics/hooks.txt:104
11767
msgid ""
11768
"Called after a checkout switches branch. post_switch is called with a\n"
11769
"bzrlib.branch.SwitchHookParams."
11770
msgstr ""
11771
11772
#: en/help_topics/hooks.txt:107
11773
msgid ""
11774
"post_uncommit\n"
11775
"~~~~~~~~~~~~~"
11776
msgstr ""
11777
11778
#: en/help_topics/hooks.txt:112
11779
msgid ""
11780
"Called in the bzr client after an uncommit completes. post_uncommit is\n"
11781
"called with (local, master, old_revno, old_revid, new_revno,\n"
11782
"new_revid) where local is the local branch or None, master is the\n"
11783
"target branch, and an empty branch receives new_revno of 0, new_revid\n"
11784
"of None."
11785
msgstr ""
11786
11787
#: en/help_topics/hooks.txt:118
11788
msgid ""
11789
"pre_change_branch_tip\n"
11790
"~~~~~~~~~~~~~~~~~~~~~"
11791
msgstr ""
11792
11793
#: en/help_topics/hooks.txt:121
11794
msgid "Introduced in: 1.6"
11795
msgstr ""
11796
11797
#: en/help_topics/hooks.txt:123
11798
msgid ""
11799
"Called in bzr client and server before a change to the tip of a branch\n"
11800
"is made. pre_change_branch_tip is called with a\n"
11801
"bzrlib.branch.ChangeBranchTipParams. Note that push, pull, commit,\n"
11802
"uncommit will all trigger this hook."
11803
msgstr ""
11804
11805
#: en/help_topics/hooks.txt:128
11806
msgid ""
11807
"pre_commit\n"
11808
"~~~~~~~~~~"
11809
msgstr ""
11810
11811
#: en/help_topics/hooks.txt:131
11812
msgid "Introduced in: 0.91"
11813
msgstr ""
11814
11815
#: en/help_topics/hooks.txt:133
11816
msgid ""
11817
"Called after a commit is calculated but before it is completed.\n"
11818
"pre_commit is called with (local, master, old_revno, old_revid,\n"
11819
"future_revno, future_revid, tree_delta, future_tree). old_revid is\n"
11820
"NULL_REVISION for the first commit to a branch, tree_delta is a\n"
11821
"TreeDelta object describing changes from the basis revision. hooks\n"
11822
"MUST NOT modify this delta. future_tree is an in-memory tree obtained\n"
11823
"from CommitBuilder.revision_tree() and hooks MUST NOT modify this\n"
11824
"tree."
11825
msgstr ""
11826
11827
#: en/help_topics/hooks.txt:142
11828
msgid ""
11829
"set_rh\n"
11830
"~~~~~~"
11831
msgstr ""
11832
11833
#: en/help_topics/hooks.txt:147
11834
msgid ""
11835
"Invoked whenever the revision history has been set via\n"
11836
"set_revision_history. The api signature is (branch, revision_history),\n"
11837
"and the branch will be write-locked. The set_rh hook can be expensive\n"
11838
"for bzr to trigger, a better hook to use is\n"
11839
"Branch.post_change_branch_tip."
11840
msgstr ""
11841
11842
#: en/help_topics/hooks.txt:153
11843
msgid ""
11844
"transform_fallback_location\n"
11845
"~~~~~~~~~~~~~~~~~~~~~~~~~~~"
11846
msgstr ""
11847
11848
#: en/help_topics/hooks.txt:156
11849
msgid "Introduced in: 1.9"
11850
msgstr ""
11851
11852
#: en/help_topics/hooks.txt:158
11853
msgid ""
11854
"Called when a stacked branch is activating its fallback locations.\n"
11855
"transform_fallback_location is called with (branch, url), and should\n"
11856
"return a new url. Returning the same url allows it to be used as-is,\n"
11857
"returning a different one can be used to cause the branch to stack on\n"
11858
"a closer copy of that fallback_location. Note that the branch cannot\n"
11859
"have history accessing methods called on it during this hook because\n"
11860
"the fallback locations have not been activated. When there are\n"
11861
"multiple hooks installed for transform_fallback_location, all are\n"
11862
"called with the url returned from the previous hook.The order is\n"
11863
"however undefined."
11864
msgstr ""
11865
11866
#: en/help_topics/hooks.txt:169
11867
msgid ""
11868
"CommandHooks\n"
11869
"------------"
11870
msgstr ""
11871
11872
#: en/help_topics/hooks.txt:172
11873
msgid ""
11874
"extend_command\n"
11875
"~~~~~~~~~~~~~~"
11876
msgstr ""
11877
11878
#: en/help_topics/hooks.txt:175
11879
msgid "Introduced in: 1.13"
11880
msgstr ""
11881
11882
#: en/help_topics/hooks.txt:177
11883
msgid ""
11884
"Called after creating a command object to allow modifications such as\n"
11885
"adding or removing options, docs etc. Called with the new\n"
11886
"bzrlib.commands.Command object."
11887
msgstr ""
11888
11889
#: en/help_topics/hooks.txt:181
11890
msgid ""
11891
"get_command\n"
11892
"~~~~~~~~~~~"
11893
msgstr ""
11894
11895
#: en/help_topics/hooks.txt:184 en/help_topics/hooks.txt:196
11896
#: en/help_topics/hooks.txt:205 en/help_topics/hooks.txt:448
11897
msgid "Introduced in: 1.17"
11898
msgstr ""
11899
11900
#: en/help_topics/hooks.txt:186
11901
msgid ""
11902
"Called when creating a single command. Called with (cmd_or_None,\n"
11903
"command_name). get_command should either return the cmd_or_None\n"
11904
"parameter, or a replacement Command object that should be used for the\n"
11905
"command. Note that the Command.hooks hooks are core infrastructure.\n"
11906
"Many users will prefer to use bzrlib.commands.register_command or\n"
11907
"plugin_cmds.register_lazy."
11908
msgstr ""
11909
11910
#: en/help_topics/hooks.txt:193
11911
msgid ""
11912
"get_missing_command\n"
11913
"~~~~~~~~~~~~~~~~~~~"
11914
msgstr ""
11915
11916
#: en/help_topics/hooks.txt:198
11917
msgid ""
11918
"Called when creating a single command if no command could be found.\n"
11919
"Called with (command_name). get_missing_command should either return\n"
11920
"None, or a Command object to be used for the command."
11921
msgstr ""
11922
11923
#: en/help_topics/hooks.txt:202
11924
msgid ""
11925
"list_commands\n"
11926
"~~~~~~~~~~~~~"
11927
msgstr ""
11928
11929
#: en/help_topics/hooks.txt:207
11930
msgid ""
11931
"Called when enumerating commands. Called with a set of cmd_name\n"
11932
"strings for all the commands found so far. This set is safe to mutate\n"
11933
"- e.g. to remove a command. list_commands should return the updated\n"
11934
"set of command names."
11935
msgstr ""
11936
11937
#: en/help_topics/hooks.txt:212
11938
msgid ""
11939
"_ConfigHooks\n"
11940
"------------"
11941
msgstr ""
11942
11943
#: en/help_topics/hooks.txt:215
11944
msgid ""
11945
"get\n"
11946
"~~~"
11947
msgstr ""
11948
11949
#: en/help_topics/hooks.txt:218 en/help_topics/hooks.txt:226
11950
#: en/help_topics/hooks.txt:233 en/help_topics/hooks.txt:241
11951
#: en/help_topics/hooks.txt:248 en/help_topics/hooks.txt:370
11952
#: en/help_topics/hooks.txt:427
11953
msgid "Introduced in: 2.4"
11954
msgstr ""
11955
11956
#: en/help_topics/hooks.txt:220
11957
msgid ""
11958
"Invoked when a config option is read. The signature is (stack, name,\n"
11959
"value)."
11960
msgstr ""
11961
11962
#: en/help_topics/hooks.txt:223
11963
msgid ""
11964
"load\n"
11965
"~~~~"
11966
msgstr ""
11967
11968
#: en/help_topics/hooks.txt:228
11969
msgid "Invoked when a config store is loaded. The signature is (store)."
11970
msgstr ""
11971
11972
#: en/help_topics/hooks.txt:230
11973
msgid ""
11974
"remove\n"
11975
"~~~~~~"
11976
msgstr ""
11977
11978
#: en/help_topics/hooks.txt:235
11979
msgid ""
11980
"Invoked when a config option is removed. The signature is (stack,\n"
11981
"name)."
11982
msgstr ""
11983
11984
#: en/help_topics/hooks.txt:238
11985
msgid ""
11986
"save\n"
11987
"~~~~"
11988
msgstr ""
11989
11990
#: en/help_topics/hooks.txt:243
11991
msgid "Invoked when a config store is saved. The signature is (store)."
11992
msgstr ""
11993
11994
#: en/help_topics/hooks.txt:245
11995
msgid ""
11996
"set\n"
11997
"~~~"
11998
msgstr ""
11999
12000
#: en/help_topics/hooks.txt:250
12001
msgid ""
12002
"Invoked when a config option is set. The signature is (stack, name,\n"
12003
"value)."
12004
msgstr ""
12005
12006
#: en/help_topics/hooks.txt:253
12007
msgid ""
12008
"ControlDirHooks\n"
12009
"---------------"
12010
msgstr ""
12011
12012
#: en/help_topics/hooks.txt:256
12013
msgid ""
12014
"post_repo_init\n"
12015
"~~~~~~~~~~~~~~"
12016
msgstr ""
12017
12018
#: en/help_topics/hooks.txt:261
12019
msgid ""
12020
"Invoked after a repository has been initialized. post_repo_init is\n"
12021
"called with a bzrlib.controldir.RepoInitHookParams."
12022
msgstr ""
12023
12024
#: en/help_topics/hooks.txt:264
12025
msgid ""
12026
"pre_open\n"
12027
"~~~~~~~~"
12028
msgstr ""
12029
12030
#: en/help_topics/hooks.txt:267
12031
msgid "Introduced in: 1.14"
12032
msgstr ""
12033
12034
#: en/help_topics/hooks.txt:269
12035
msgid ""
12036
"Invoked before attempting to open a ControlDir with the transport that\n"
12037
"the open will use."
12038
msgstr ""
12039
12040
#: en/help_topics/hooks.txt:272
12041
msgid ""
12042
"InfoHooks\n"
12043
"---------"
12044
msgstr ""
12045
12046
#: en/help_topics/hooks.txt:275
12047
msgid ""
12048
"repository\n"
12049
"~~~~~~~~~~"
12050
msgstr ""
12051
12052
#: en/help_topics/hooks.txt:278 en/help_topics/hooks.txt:297
12053
#: en/help_topics/hooks.txt:505
12054
msgid "Introduced in: 1.15"
12055
msgstr ""
12056
12057
#: en/help_topics/hooks.txt:280
12058
msgid ""
12059
"Invoked when displaying the statistics for a repository. repository is\n"
12060
"called with a statistics dictionary as returned by the repository and\n"
12061
"a file-like object to write to."
12062
msgstr ""
12063
12064
#: en/help_topics/hooks.txt:284
12065
msgid ""
12066
"LockHooks\n"
12067
"---------"
12068
msgstr ""
12069
12070
#: en/help_topics/hooks.txt:287
12071
msgid ""
12072
"lock_acquired\n"
12073
"~~~~~~~~~~~~~"
12074
msgstr ""
12075
12076
#: en/help_topics/hooks.txt:292
12077
msgid ""
12078
"Called with a bzrlib.lock.LockResult when a physical lock is acquired."
12079
msgstr ""
12080
12081
#: en/help_topics/hooks.txt:294
12082
msgid ""
12083
"lock_broken\n"
12084
"~~~~~~~~~~~"
12085
msgstr ""
12086
12087
#: en/help_topics/hooks.txt:299
12088
msgid "Called with a bzrlib.lock.LockResult when a physical lock is broken."
12089
msgstr ""
12090
12091
#: en/help_topics/hooks.txt:301
12092
msgid ""
12093
"lock_released\n"
12094
"~~~~~~~~~~~~~"
12095
msgstr ""
12096
12097
#: en/help_topics/hooks.txt:306
12098
msgid ""
12099
"Called with a bzrlib.lock.LockResult when a physical lock is released."
12100
msgstr ""
12101
12102
#: en/help_topics/hooks.txt:308
12103
msgid ""
12104
"MergeHooks\n"
12105
"----------"
12106
msgstr ""
12107
12108
#: en/help_topics/hooks.txt:311
12109
msgid ""
12110
"merge_file_content\n"
12111
"~~~~~~~~~~~~~~~~~~"
12112
msgstr ""
12113
12114
#: en/help_topics/hooks.txt:314
12115
msgid "Introduced in: 2.1"
12116
msgstr ""
12117
12118
#: en/help_topics/hooks.txt:316
12119
msgid ""
12120
"Called with a bzrlib.merge.Merger object to create a per file merge\n"
12121
"object when starting a merge. Should return either None or a subclass\n"
12122
"of ``bzrlib.merge.AbstractPerFileMerger``. Such objects will then be\n"
12123
"called per file that needs to be merged (including when one side has\n"
12124
"deleted the file and the other has changed it). See the\n"
12125
"AbstractPerFileMerger API docs for details on how it is used by merge."
12126
msgstr ""
12127
12128
#: en/help_topics/hooks.txt:323
12129
msgid ""
12130
"post_merge\n"
12131
"~~~~~~~~~~"
12132
msgstr ""
12133
12134
#: en/help_topics/hooks.txt:326 en/help_topics/hooks.txt:334
12135
#: en/help_topics/hooks.txt:384 en/help_topics/hooks.txt:493
12136
msgid "Introduced in: 2.5"
12137
msgstr ""
12138
12139
#: en/help_topics/hooks.txt:328
12140
msgid ""
12141
"Called after a merge. Receives a Merger object as the single argument.\n"
12142
"The return value is ignored."
12143
msgstr ""
12144
12145
#: en/help_topics/hooks.txt:331
12146
msgid ""
12147
"pre_merge\n"
12148
"~~~~~~~~~"
12149
msgstr ""
12150
12151
#: en/help_topics/hooks.txt:336
12152
msgid ""
12153
"Called before a merge. Receives a Merger object as the single\n"
12154
"argument."
12155
msgstr ""
12156
12157
#: en/help_topics/hooks.txt:339
12158
msgid ""
12159
"MergeDirectiveHooks\n"
12160
"-------------------"
12161
msgstr ""
12162
12163
#: en/help_topics/hooks.txt:342
12164
msgid ""
12165
"merge_request_body\n"
12166
"~~~~~~~~~~~~~~~~~~"
12167
msgstr ""
12168
12169
#: en/help_topics/hooks.txt:345
12170
msgid "Introduced in: 1.15.0"
12171
msgstr ""
12172
12173
#: en/help_topics/hooks.txt:347
12174
msgid ""
12175
"Called with a MergeRequestBodyParams when a body is needed for a merge\n"
12176
"request. Callbacks must return a body. If more than one callback is\n"
12177
"registered, the output of one callback is provided to the next."
12178
msgstr ""
12179
12180
#: en/help_topics/hooks.txt:351
12181
msgid ""
12182
"MessageEditorHooks\n"
12183
"------------------"
12184
msgstr ""
12185
12186
#: en/help_topics/hooks.txt:354
12187
msgid ""
12188
"commit_message_template\n"
12189
"~~~~~~~~~~~~~~~~~~~~~~~"
12190
msgstr ""
12191
12192
#: en/help_topics/hooks.txt:357
12193
msgid "Introduced in: 1.10"
12194
msgstr ""
12195
12196
#: en/help_topics/hooks.txt:359
12197
msgid ""
12198
"Called when a commit message is being generated.\n"
12199
"commit_message_template is called with the bzrlib.commit.Commit object\n"
12200
"and the message that is known so far. commit_message_template must\n"
12201
"return a new message to use (which could be the same as it was given).\n"
12202
"When there are multiple hooks registered for commit_message_template,\n"
12203
"they are chained with the result from the first passed into the\n"
12204
"second, and so on."
12205
msgstr ""
12206
12207
#: en/help_topics/hooks.txt:367
12208
msgid ""
12209
"set_commit_message\n"
12210
"~~~~~~~~~~~~~~~~~~"
12211
msgstr ""
12212
12213
#: en/help_topics/hooks.txt:372
12214
msgid ""
12215
"Set a fixed commit message. set_commit_message is called with the\n"
12216
"bzrlib.commit.Commit object (so you can also change e.g. revision\n"
12217
"properties by editing commit.builder._revprops) and the message so\n"
12218
"far. set_commit_message must return the message to use or None if it\n"
12219
"should use the message editor as normal."
12220
msgstr ""
12221
12222
#: en/help_topics/hooks.txt:378
12223
msgid ""
12224
"MutableTreeHooks\n"
12225
"----------------"
12226
msgstr ""
12227
12228
#: en/help_topics/hooks.txt:381
12229
msgid ""
12230
"post_build_tree\n"
12231
"~~~~~~~~~~~~~~~"
12232
msgstr ""
12233
12234
#: en/help_topics/hooks.txt:386
12235
msgid ""
12236
"Called after a completely new tree is built. The hook is called with\n"
12237
"the tree as its only argument."
12238
msgstr ""
12239
12240
#: en/help_topics/hooks.txt:392
12241
msgid "Introduced in: 2.0"
12242
msgstr ""
12243
12244
#: en/help_topics/hooks.txt:394
12245
msgid ""
12246
"Called after a commit is performed on a tree. The hook is called with\n"
12247
"a bzrlib.mutabletree.PostCommitHookParams object. The mutable tree the\n"
12248
"commit was performed on is available via the mutable_tree attribute of\n"
12249
"that object."
12250
msgstr ""
12251
12252
#: en/help_topics/hooks.txt:399
12253
msgid ""
12254
"start_commit\n"
12255
"~~~~~~~~~~~~"
12256
msgstr ""
12257
12258
#: en/help_topics/hooks.txt:404
12259
msgid ""
12260
"Called before a commit is performed on a tree. The start commit hook\n"
12261
"is able to change the tree before the commit takes place. start_commit\n"
12262
"is called with the bzrlib.mutabletree.MutableTree that the commit is\n"
12263
"being performed on."
12264
msgstr ""
12265
12266
#: en/help_topics/hooks.txt:409
12267
msgid ""
12268
"SmartClientHooks\n"
12269
"----------------"
12270
msgstr ""
12271
12272
#: en/help_topics/hooks.txt:412
12273
msgid ""
12274
"call\n"
12275
"~~~~"
12276
msgstr ""
12277
12278
#: en/help_topics/hooks.txt:415
12279
msgid "Introduced in: unknown"
12280
msgstr ""
12281
12282
#: en/help_topics/hooks.txt:417
12283
msgid ""
12284
"Called when the smart client is submitting a request to the smart\n"
12285
"server. Called with a bzrlib.smart.client.CallHookParams object.\n"
12286
"Streaming request bodies, and responses, are not accessible."
12287
msgstr ""
12288
12289
#: en/help_topics/hooks.txt:421
12290
msgid ""
12291
"SmartServerHooks\n"
12292
"----------------"
12293
msgstr ""
12294
12295
#: en/help_topics/hooks.txt:424
12296
msgid ""
12297
"server_exception\n"
12298
"~~~~~~~~~~~~~~~~"
12299
msgstr ""
12300
12301
#: en/help_topics/hooks.txt:429
12302
msgid ""
12303
"Called by the bzr server when an exception occurs. server_exception is\n"
12304
"called with the sys.exc_info() tuple return true for the hook if the\n"
12305
"exception has been handled, in which case the server will exit\n"
12306
"normally."
12307
msgstr ""
12308
12309
#: en/help_topics/hooks.txt:434
12310
msgid ""
12311
"server_started\n"
12312
"~~~~~~~~~~~~~~"
12313
msgstr ""
12314
12315
#: en/help_topics/hooks.txt:437 en/help_topics/hooks.txt:456
12316
msgid "Introduced in: 0.16"
12317
msgstr ""
12318
12319
#: en/help_topics/hooks.txt:439
12320
msgid ""
12321
"Called by the bzr server when it starts serving a directory.\n"
12322
"server_started is called with (backing urls, public url), where\n"
12323
"backing_url is a list of URLs giving the server-specific directory\n"
12324
"locations, and public_url is the public URL for the directory being\n"
12325
"served."
12326
msgstr ""
12327
12328
#: en/help_topics/hooks.txt:445
12329
msgid ""
12330
"server_started_ex\n"
12331
"~~~~~~~~~~~~~~~~~"
12332
msgstr ""
12333
12334
#: en/help_topics/hooks.txt:450
12335
msgid ""
12336
"Called by the bzr server when it starts serving a directory.\n"
12337
"server_started is called with (backing_urls, server_obj)."
12338
msgstr ""
12339
12340
#: en/help_topics/hooks.txt:453
12341
msgid ""
12342
"server_stopped\n"
12343
"~~~~~~~~~~~~~~"
12344
msgstr ""
12345
12346
#: en/help_topics/hooks.txt:458
12347
msgid ""
12348
"Called by the bzr server when it stops serving a directory.\n"
12349
"server_stopped is called with the same parameters as the\n"
12350
"server_started hook: (backing_urls, public_url)."
12351
msgstr ""
12352
12353
#: en/help_topics/hooks.txt:462
12354
msgid ""
12355
"StatusHooks\n"
12356
"-----------"
12357
msgstr ""
12358
12359
#: en/help_topics/hooks.txt:465
12360
msgid ""
12361
"post_status\n"
12362
"~~~~~~~~~~~"
12363
msgstr ""
12364
12365
#: en/help_topics/hooks.txt:468 en/help_topics/hooks.txt:479
12366
msgid "Introduced in: 2.3"
12367
msgstr ""
12368
12369
#: en/help_topics/hooks.txt:470
12370
msgid ""
12371
"Called with argument StatusHookParams after Bazaar has displayed the\n"
12372
"status. StatusHookParams has the attributes (old_tree, new_tree,\n"
12373
"to_file, versioned, show_ids, short, verbose). The last four arguments\n"
12374
"correspond to the command line options specified by the user for the\n"
12375
"status command. to_file is the output stream for writing."
12376
msgstr ""
12377
12378
#: en/help_topics/hooks.txt:476
12379
msgid ""
12380
"pre_status\n"
12381
"~~~~~~~~~~"
12382
msgstr ""
12383
12384
#: en/help_topics/hooks.txt:481
12385
msgid ""
12386
"Called with argument StatusHookParams before Bazaar displays the\n"
12387
"status. StatusHookParams has the attributes (old_tree, new_tree,\n"
12388
"to_file, versioned, show_ids, short, verbose). The last four arguments\n"
12389
"correspond to the command line options specified by the user for the\n"
12390
"status command. to_file is the output stream for writing."
12391
msgstr ""
12392
12393
#: en/help_topics/hooks.txt:487
12394
msgid ""
12395
"TransportHooks\n"
12396
"--------------"
12397
msgstr ""
12398
12399
#: en/help_topics/hooks.txt:490
12400
msgid ""
12401
"post_connect\n"
12402
"~~~~~~~~~~~~"
12403
msgstr ""
12404
12405
#: en/help_topics/hooks.txt:495
12406
msgid ""
12407
"Called after a new connection is established or a reconnect occurs.\n"
12408
"The sole argument passed is either the connected transport or smart\n"
12409
"medium instance."
12410
msgstr ""
12411
12412
#: en/help_topics/hooks.txt:499
12413
msgid ""
12414
"RioVersionInfoBuilderHooks\n"
12415
"--------------------------"
12416
msgstr ""
12417
12418
#: en/help_topics/hooks.txt:502
12419
msgid ""
12420
"revision\n"
12421
"~~~~~~~~"
12422
msgstr ""
12423
12424
#: en/help_topics/hooks.txt:507
12425
msgid ""
12426
"Invoked when adding information about a revision to the RIO stanza\n"
12427
"that is printed. revision is called with a revision object and a RIO\n"
12428
"stanza.\n"
12429
msgstr ""
12430
12431
#: en/help_topics/location-alias.txt:1
12432
msgid ""
12433
"Location aliases\n"
12434
"================"
12435
msgstr ""
12436
12437
#: en/help_topics/location-alias.txt:4
12438
msgid ""
12439
"Bazaar defines several aliases for locations associated with a branch. "
12440
"These\n"
12441
"can be used with most commands that expect a location, such as `bzr push`."
12442
msgstr ""
12443
12444
#: en/help_topics/location-alias.txt:7
12445
msgid "The aliases are::"
12446
msgstr ""
12447
12448
#: en/help_topics/location-alias.txt:9
12449
msgid ""
12450
" :bound The branch this branch is bound to, for bound branches.\n"
12451
" :parent The parent of this branch.\n"
12452
" :public The public location of this branch.\n"
12453
" :push The saved location used for `bzr push` with no arguments.\n"
12454
" :submit The submit branch for this branch.\n"
12455
" :this This branch."
12456
msgstr ""
12457
12458
#: en/help_topics/location-alias.txt:16
12459
msgid "For example, to push to the parent location::"
12460
msgstr ""
12461
12462
#: en/help_topics/location-alias.txt:18
12463
msgid " bzr push :parent\n"
12464
msgstr ""
12465
12466
#: en/help_topics/log-formats.txt:1
12467
msgid ""
12468
"Log Formats\n"
12469
"==========="
12470
msgstr ""
12471
12472
#: en/help_topics/log-formats.txt:4
12473
msgid ""
12474
"A log format controls how information about each revision is displayed.\n"
12475
"The standard log formats are compared below::"
12476
msgstr ""
12477
12478
#: en/help_topics/log-formats.txt:7
12479
msgid ""
12480
" Feature long short line\n"
12481
" ---------------------- ------------- ------------ -------------------\n"
12482
" design goal detailed view concise view 1 revision per line\n"
12483
" committer name+email name only name only\n"
12484
" author name+email - -\n"
12485
" date-time format full date only date only\n"
12486
" commit message full full top line\n"
12487
" tags yes yes yes\n"
12488
" merges indicator - yes -\n"
12489
" status/delta optional optional -\n"
12490
" diff/patch optional optional -\n"
12491
" revision-id optional optional -\n"
12492
" branch nick yes - -\n"
12493
" foreign vcs properties yes yes -\n"
12494
" preferred levels all 1 1\n"
12495
" digital signature optional - -"
12496
msgstr ""
12497
12498
#: en/help_topics/log-formats.txt:24
12499
msgid ""
12500
"The default format is ``long``. To change this, define the ``log_format``\n"
12501
"setting in the ``[DEFAULT]`` section of ``bazaar.conf`` like this (say)::"
12502
msgstr ""
12503
12504
#: en/help_topics/log-formats.txt:27
12505
msgid ""
12506
" [DEFAULT]\n"
12507
" log_format = short"
12508
msgstr ""
12509
12510
#: en/help_topics/log-formats.txt:30
12511
msgid ""
12512
"Alternatively, to change the log format used for a given query, use the\n"
12513
"--long, --short or --line options."
12514
msgstr ""
12515
12516
#: en/help_topics/log-formats.txt:33
12517
msgid ""
12518
"If one of the standard log formats does not meet your needs, additional\n"
12519
"formats can be provided by plugins.\n"
12520
msgstr ""
12521
12522
#: en/help_topics/other-formats.txt:1
12523
msgid "Other Storage Formats"
12524
msgstr ""
12525
12526
#: en/help_topics/other-formats.txt:3
12527
msgid "Experimental formats are shown below."
12528
msgstr ""
12529
12530
#: en/help_topics/other-formats.txt:5
12531
msgid ""
12532
":development-colo:\n"
12533
" (native) The 2a format with experimental support for colocated\n"
12534
" branches."
12535
msgstr ""
12536
12537
#: en/help_topics/other-formats.txt:9
12538
msgid ""
12539
"\n"
12540
"Deprecated formats are shown below."
12541
msgstr ""
12542
12543
#: en/help_topics/other-formats.txt:12
12544
msgid ""
12545
":pack-0.92:\n"
12546
" (native) Pack-based format used in 1.x series. Introduced in 0.92.\n"
12547
" Interoperates with bzr repositories before 0.92 but cannot be read\n"
12548
" by bzr < 0.92."
12549
msgstr ""
12550
12551
#: en/help_topics/patterns.txt:1
12552
msgid ""
12553
"Patterns\n"
12554
"========"
12555
msgstr ""
12556
12557
#: en/help_topics/patterns.txt:4
12558
msgid ""
12559
"Bazaar uses patterns to match files at various times. For example,\n"
12560
"the ``add`` command skips over files that match ignore patterns\n"
12561
"and preferences can be associated with files using rule patterns.\n"
12562
"The pattern syntax is described below."
12563
msgstr ""
12564
12565
#: en/help_topics/patterns.txt:9
12566
msgid ""
12567
"Trailing slashes on patterns are ignored. If the pattern contains a\n"
12568
"slash or is a regular expression, it is compared to the whole path\n"
12569
"from the branch root. Otherwise, it is compared to only the last\n"
12570
"component of the path. To match a file only in the root directory,\n"
12571
"prepend ``./``. Patterns specifying absolute paths are not allowed."
12572
msgstr ""
12573
12574
#: en/help_topics/patterns.txt:15
12575
msgid "Patterns may include globbing wildcards such as::"
12576
msgstr ""
12577
12578
#: en/help_topics/patterns.txt:17
12579
msgid ""
12580
" ? - Matches any single character except '/'\n"
12581
" * - Matches 0 or more characters except '/'\n"
12582
" /**/ - Matches 0 or more directories in a path\n"
12583
" [a-z] - Matches a single character from within a group of characters"
12584
msgstr ""
12585
12586
#: en/help_topics/patterns.txt:22
12587
msgid ""
12588
"Patterns may also be `Python regular expressions`_. Regular expression\n"
12589
"patterns are identified by a ``RE:`` prefix followed by the regular\n"
12590
"expression. Regular expression patterns may not include named or\n"
12591
"numbered groups."
12592
msgstr ""
12593
12594
#: en/help_topics/patterns.txt:27
12595
msgid ""
12596
"Case insensitive ignore patterns can be specified with regular expressions\n"
12597
"by using the ``i`` (for ignore case) flag in the pattern."
12598
msgstr ""
12599
12600
#: en/help_topics/patterns.txt:30
12601
msgid ""
12602
"For example, a case insensitive match for ``foo`` may be specified as::"
12603
msgstr ""
12604
12605
#: en/help_topics/patterns.txt:32
12606
msgid " RE:(?i)foo"
12607
msgstr ""
12608
12609
#: en/help_topics/patterns.txt:34
12610
msgid ""
12611
"Ignore patterns may be prefixed with ``!``, which means that a filename\n"
12612
"matched by that pattern will not be ignored."
12613
msgstr ""
12614
12615
#: en/help_topics/patterns.txt:37
12616
msgid ""
12617
".. _Python regular expressions: http://docs.python.org/library/re.html"
12618
msgstr ""
12619
12620
#: en/help_topics/revisionspec.txt:1
12621
msgid "Revision Identifiers"
12622
msgstr ""
12623
12624
#: en/help_topics/revisionspec.txt:3
12625
msgid ""
12626
"A revision identifier refers to a specific state of a branch's history. It\n"
12627
"can be expressed in several ways. It can begin with a keyword to\n"
12628
"unambiguously specify a given lookup type; some examples are 'last:1',\n"
12629
"'before:yesterday' and 'submit:'."
12630
msgstr ""
12631
12632
#: en/help_topics/revisionspec.txt:8
12633
msgid ""
12634
"Alternately, it can be given without a keyword, in which case it will be\n"
12635
"checked as a revision number, a tag, a revision id, a date specification, or "
12636
"a\n"
12637
"branch specification, in that order. For example, 'date:today' could be\n"
12638
"written as simply 'today', though if you have a tag called 'today' that "
12639
"will\n"
12640
"be found first."
12641
msgstr ""
12642
12643
#: en/help_topics/revisionspec.txt:14
12644
msgid ""
12645
"If 'REV1' and 'REV2' are revision identifiers, then 'REV1..REV2' denotes a\n"
12646
"revision range. Examples: '3647..3649', 'date:yesterday..-1' and\n"
12647
"'branch:/path/to/branch1/..branch:/branch2' (note that there are no quotes "
12648
"or\n"
12649
"spaces around the '..')."
12650
msgstr ""
12651
12652
#: en/help_topics/revisionspec.txt:19
12653
msgid ""
12654
"Ranges are interpreted differently by different commands. To the \"log\" "
12655
"command,\n"
12656
"a range is a sequence of log messages, but to the \"diff\" command, the "
12657
"range\n"
12658
"denotes a change between revisions (and not a sequence of changes). In\n"
12659
"addition, \"log\" considers a closed range whereas \"diff\" and \"merge\" "
12660
"consider it\n"
12661
"to be open-ended, that is, they include one end but not the other. For "
12662
"example:\n"
12663
"\"bzr log -r 3647..3649\" shows the messages of revisions 3647, 3648 and "
12664
"3649,\n"
12665
"while \"bzr diff -r 3647..3649\" includes the changes done in revisions 3648 "
12666
"and\n"
12667
"3649, but not 3647."
12668
msgstr ""
12669
12670
#: en/help_topics/revisionspec.txt:28
12671
msgid "The keywords used as revision selection methods are the following:"
12672
msgstr ""
12673
12674
#: en/help_topics/revisionspec.txt:30
12675
msgid ""
12676
":revid:\n"
12677
"\tSelects a revision using the revision id.\n"
12678
":submit:\n"
12679
"\tSelects a common ancestor with the submit branch.\n"
12680
":ancestor:\n"
12681
"\tSelects a common ancestor with a second branch.\n"
12682
":date:\n"
12683
"\tSelects a revision on the basis of a datestamp.\n"
12684
":branch:\n"
12685
"\tSelects the last revision of a specified branch.\n"
12686
":tag:\n"
12687
"\tSelects a revision identified by a tag name.\n"
12688
":revno:\n"
12689
"\tSelects a revision using a number.\n"
12690
":before:\n"
12691
"\tSelects the parent of the revision specified.\n"
12692
":annotate:\n"
12693
"\tSelect the revision that last modified the specified line.\n"
12694
":mainline:\n"
12695
"\tSelect mainline revision that merged the specified revision.\n"
12696
":last:\n"
12697
"\tSelects the nth revision from the end."
12698
msgstr ""
12699
12700
#: en/help_topics/revisionspec.txt:53
12701
msgid "In addition, plugins can provide other keywords."
12702
msgstr ""
12703
12704
#: en/help_topics/revisionspec.txt:55
12705
msgid "A detailed description of each keyword is given below."
12706
msgstr ""
12707
12708
#: en/help_topics/revisionspec.txt:57
12709
msgid ":revid:"
12710
msgstr ""
12711
12712
#: en/help_topics/revisionspec.txt:59
12713
msgid ""
12714
" Supply a specific revision id, that can be used to specify any\n"
12715
" revision id in the ancestry of the branch.\n"
12716
" Including merges, and pending merges.\n"
12717
" Examples::"
12718
msgstr ""
12719
12720
#: en/help_topics/revisionspec.txt:64
12721
msgid ""
12722
" revid:aaaa@bbbb-123456789 -> Select revision 'aaaa@bbbb-123456789'"
12723
msgstr ""
12724
12725
#: en/help_topics/revisionspec.txt:66
12726
msgid ":submit:"
12727
msgstr ""
12728
12729
#: en/help_topics/revisionspec.txt:68
12730
msgid ""
12731
" Diffing against this shows all the changes that were made in this "
12732
"branch,\n"
12733
" and is a good predictor of what merge will do. The submit branch is\n"
12734
" used by the bundle and merge directive commands. If no submit branch\n"
12735
" is specified, the parent branch is used instead."
12736
msgstr ""
12737
12738
#: en/help_topics/revisionspec.txt:73 en/help_topics/revisionspec.txt:85
12739
msgid ""
12740
" The common ancestor is the last revision that existed in both\n"
12741
" branches. Usually this is the branch point, but it could also be\n"
12742
" a revision that was merged."
12743
msgstr ""
12744
12745
#: en/help_topics/revisionspec.txt:77 en/help_topics/revisionspec.txt:93
12746
#: en/help_topics/revisionspec.txt:109 en/help_topics/revisionspec.txt:119
12747
#: en/help_topics/revisionspec.txt:153
12748
msgid " Examples::"
12749
msgstr ""
12750
12751
#: en/help_topics/revisionspec.txt:79
12752
msgid " $ bzr diff -r submit:"
12753
msgstr ""
12754
12755
#: en/help_topics/revisionspec.txt:81
12756
msgid ":ancestor:"
12757
msgstr ""
12758
12759
#: en/help_topics/revisionspec.txt:83
12760
msgid " Supply the path to a branch to select the common ancestor."
12761
msgstr ""
12762
12763
#: en/help_topics/revisionspec.txt:89
12764
msgid ""
12765
" This is frequently used with 'diff' to return all of the changes\n"
12766
" that your branch introduces, while excluding the changes that you\n"
12767
" have not merged from the remote branch."
12768
msgstr ""
12769
12770
#: en/help_topics/revisionspec.txt:95
12771
msgid ""
12772
" ancestor:/path/to/branch\n"
12773
" $ bzr diff -r ancestor:../../mainline/branch"
12774
msgstr ""
12775
12776
#: en/help_topics/revisionspec.txt:98
12777
msgid ":date:"
12778
msgstr ""
12779
12780
#: en/help_topics/revisionspec.txt:100
12781
msgid ""
12782
" Supply a datestamp to select the first revision that matches the date.\n"
12783
" Date can be 'yesterday', 'today', 'tomorrow' or a YYYY-MM-DD string.\n"
12784
" Matches the first entry after a given date (either at midnight or\n"
12785
" at a specified time)."
12786
msgstr ""
12787
12788
#: en/help_topics/revisionspec.txt:105
12789
msgid " One way to display all the changes since yesterday would be::"
12790
msgstr ""
12791
12792
#: en/help_topics/revisionspec.txt:107
12793
msgid " bzr log -r date:yesterday.."
12794
msgstr ""
12795
12796
#: en/help_topics/revisionspec.txt:111
12797
msgid ""
12798
" date:yesterday -> select the first revision since "
12799
"yesterday\n"
12800
" date:2006-08-14,17:10:14 -> select the first revision after\n"
12801
" August 14th, 2006 at 5:10pm."
12802
msgstr ""
12803
12804
#: en/help_topics/revisionspec.txt:115
12805
msgid ":branch:"
12806
msgstr ""
12807
12808
#: en/help_topics/revisionspec.txt:117
12809
msgid " Supply the path to a branch to select its last revision."
12810
msgstr ""
12811
12812
#: en/help_topics/revisionspec.txt:121
12813
msgid " branch:/path/to/branch"
12814
msgstr ""
12815
12816
#: en/help_topics/revisionspec.txt:123
12817
msgid ":tag:"
12818
msgstr ""
12819
12820
#: en/help_topics/revisionspec.txt:125
12821
msgid " Tags are stored in the branch and created by the 'tag' command."
12822
msgstr ""
12823
12824
#: en/help_topics/revisionspec.txt:127
12825
msgid ":revno:"
12826
msgstr ""
12827
12828
#: en/help_topics/revisionspec.txt:129
12829
msgid ""
12830
" Use an integer to specify a revision in the history of the branch.\n"
12831
" Optionally a branch can be specified. A negative number will count\n"
12832
" from the end of the branch (-1 is the last revision, -2 the previous\n"
12833
" one). If the negative number is larger than the branch's history, the\n"
12834
" first revision is returned.\n"
12835
" Examples::"
12836
msgstr ""
12837
12838
#: en/help_topics/revisionspec.txt:136
12839
msgid ""
12840
" revno:1 -> return the first revision of this branch\n"
12841
" revno:3:/path/to/branch -> return the 3rd revision of\n"
12842
" the branch '/path/to/branch'\n"
12843
" revno:-1 -> The last revision in a branch.\n"
12844
" -2:http://other/branch -> The second to last revision in the\n"
12845
" remote branch.\n"
12846
" -1000000 -> Most likely the first revision, unless\n"
12847
" your history is very long."
12848
msgstr ""
12849
12850
#: en/help_topics/revisionspec.txt:145
12851
msgid ":before:"
12852
msgstr ""
12853
12854
#: en/help_topics/revisionspec.txt:147
12855
msgid ""
12856
" Supply any revision spec to return the parent of that revision. This "
12857
"is\n"
12858
" mostly useful when inspecting revisions that are not in the revision "
12859
"history\n"
12860
" of a branch."
12861
msgstr ""
12862
12863
#: en/help_topics/revisionspec.txt:151
12864
msgid ""
12865
" It is an error to request the parent of the null revision (before:0)."
12866
msgstr ""
12867
12868
#: en/help_topics/revisionspec.txt:155
12869
msgid ""
12870
" before:1913 -> Return the parent of revno 1913 (revno 1912)\n"
12871
" before:revid:aaaa@bbbb-1234567890 -> return the parent of revision\n"
12872
" aaaa@bbbb-1234567890\n"
12873
" bzr diff -r before:1913..1913\n"
12874
" -> Find the changes between revision 1913 and its parent "
12875
"(1912).\n"
12876
" (What changes did revision 1913 introduce).\n"
12877
" This is equivalent to: bzr diff -c 1913"
12878
msgstr ""
12879
12880
#: en/help_topics/revisionspec.txt:163
12881
msgid ":annotate:"
12882
msgstr ""
12883
12884
#: en/help_topics/revisionspec.txt:165
12885
msgid ""
12886
" Select the revision that last modified the specified line. Line is\n"
12887
" specified as path:number. Path is a relative path to the file. "
12888
"Numbers\n"
12889
" start at 1, and are relative to the current version, not the last-\n"
12890
" committed version of the file."
12891
msgstr ""
12892
12893
#: en/help_topics/revisionspec.txt:170
12894
msgid ":mainline:"
12895
msgstr ""
12896
12897
#: en/help_topics/revisionspec.txt:172
12898
msgid ""
12899
" Select the revision that merged the specified revision into mainline."
12900
msgstr ""
12901
12902
#: en/help_topics/revisionspec.txt:174
12903
msgid ":last:"
12904
msgstr ""
12905
12906
#: en/help_topics/revisionspec.txt:176
12907
msgid ""
12908
" Supply a positive number to get the nth revision from the end.\n"
12909
" This is the same as supplying negative numbers to the 'revno:' spec.\n"
12910
" Examples::"
12911
msgstr ""
12912
12913
#: en/help_topics/revisionspec.txt:180
12914
msgid ""
12915
" last:1 -> return the last revision\n"
12916
" last:3 -> return the revision 2 before the end.\n"
12917
msgstr ""
12918
12919
#: en/help_topics/rules.txt:1
12920
msgid ""
12921
"Rules\n"
12922
"====="
12923
msgstr ""
12924
12925
#: en/help_topics/rules.txt:7
12926
msgid ""
12927
"Rules are defined in ini file format where the sections are file glob\n"
12928
"patterns and the contents of each section are the preferences for files\n"
12929
"matching that pattern(s). For example::"
12930
msgstr ""
12931
12932
#: en/help_topics/rules.txt:11
12933
msgid ""
12934
" [name *.bat]\n"
12935
" eol = native"
12936
msgstr ""
12937
12938
#: en/help_topics/rules.txt:14
12939
msgid ""
12940
" [name *.html *.xml]\n"
12941
" keywords = xml_escape"
12942
msgstr ""
12943
12944
#: en/help_topics/rules.txt:17
12945
msgid ""
12946
"Preferences like these are useful for commands and plugins wishing to\n"
12947
"provide custom behaviour for selected files. For more information on \n"
12948
"end of line conversion see :doc:`eol-help`.\n"
12949
"Keyword support is provided by the `keywords plugin\n"
12950
"<http://doc.bazaar.canonical.com/plugins/en/keywords-plugin.html>`_."
12951
msgstr ""
12952
12953
#: en/help_topics/rules.txt:23
12954
msgid ""
12955
"Files\n"
12956
"-----"
12957
msgstr ""
12958
12959
#: en/help_topics/rules.txt:26
12960
msgid ""
12961
"Default rules for all branches are defined in the optional file\n"
12962
"``BZR_HOME/rules``. "
12963
msgstr ""
12964
12965
#: en/help_topics/rules.txt:29
12966
msgid ""
12967
"Rule Patterns\n"
12968
"-------------"
12969
msgstr ""
12970
12971
#: en/help_topics/rules.txt:32
12972
msgid ""
12973
"Patterns are ordered and searching stops as soon as one matches.\n"
12974
"As a consequence, more explicit patterns should be placed towards\n"
12975
"the top of the file. Rule patterns use exactly the same conventions\n"
12976
"as ignore patterns. See :doc:`patterns-help` for details."
12977
msgstr ""
12978
12979
#: en/help_topics/rules.txt:37
12980
msgid ".. note::"
12981
msgstr ""
12982
12983
#: en/help_topics/rules.txt:39
12984
msgid ""
12985
" Patterns containing square brackets or spaces should be\n"
12986
" surrounded in quotes to ensure they are correctly parsed.\n"
12987
msgstr ""
12988
12989
#: en/help_topics/topics.txt:1
12990
msgid ""
12991
"authentication Information on configuring authentication\n"
12992
"basic Basic commands\n"
12993
"branches Information on what a branch is\n"
12994
"bugs Bug tracker settings\n"
12995
"checkouts Information on what a checkout is\n"
12996
"commands Basic help for all commands\n"
12997
"configuration Details on the configuration settings available\n"
12998
"conflict-types Types of conflicts and what to do about them\n"
12999
"content-filters Conversion of content into/from working trees\n"
13000
"criss-cross Information on criss-cross merging\n"
13001
"current-formats Current storage formats\n"
13002
"debug-flags Options to show or record debug information\n"
13003
"diverged-branches How to fix diverged branches\n"
13004
"env-variables Environment variable names and values\n"
13005
"eol Information on end-of-line handling\n"
13006
"files Information on configuration and log files\n"
13007
"formats Information on choosing a storage format\n"
13008
"global-options Options that control how Bazaar runs\n"
13009
"hidden-commands All hidden commands\n"
13010
"hooks Points at which custom processing can be added\n"
13011
"launchpad Using Bazaar with Launchpad.net\n"
13012
"location-alias Aliases for remembered locations\n"
13013
"log-formats Details on the logging formats available\n"
13014
"other-formats Experimental and deprecated storage formats\n"
13015
"patterns Information on the pattern syntax\n"
13016
"repositories Basic information on shared repositories.\n"
13017
"revisionspec Explain how to use --revision\n"
13018
"rules Information on defining rule-based preferences\n"
13019
"standalone-trees Information on what a standalone tree is\n"
13020
"standard-options Options that can be used with any command\n"
13021
"status-flags Help on status flags\n"
13022
"sync-for-reconfigure Steps to resolve \"out-of-sync\" when reconfiguring\n"
13023
"topics Topics list\n"
13024
"url-special-chars Special character handling in URLs\n"
13025
"urlspec Supported transport protocols\n"
13026
"working-trees Information on working trees\n"
13027
msgstr ""
13028
13029
#: en/help_topics/url-special-chars.txt:1
13030
msgid ""
13031
"Special character handling in URLs\n"
13032
"=================================="
13033
msgstr ""
13034
13035
#: en/help_topics/url-special-chars.txt:4
13036
msgid "Bazaar allows locations to be specified in multiple ways, either:"
13037
msgstr ""
13038
13039
#: en/help_topics/url-special-chars.txt:6
13040
msgid " * Fully qualified URLs"
13041
msgstr ""
13042
13043
#: en/help_topics/url-special-chars.txt:8
13044
msgid " * File system paths, relative or absolute"
13045
msgstr ""
13046
13047
#: en/help_topics/url-special-chars.txt:10
13048
msgid ""
13049
"Internally bzr treats all locations as URLs. For any file system paths\n"
13050
"that are specified it will automatically determine the appropriate URL\n"
13051
"representation, and escape special characters where necessary."
13052
msgstr ""
13053
13054
#: en/help_topics/url-special-chars.txt:14
13055
msgid ""
13056
"There are a few characters which have special meaning in URLs and need "
13057
"careful\n"
13058
"handling to avoid ambiguities. Characters can be escaped with a % and a hex\n"
13059
"value in URLs. Any non-ASCII characters in a file path will automatically "
13060
"be\n"
13061
"urlencoded when the path is converted to a URL."
13062
msgstr ""
13063
13064
#: en/help_topics/url-special-chars.txt:19
13065
msgid ""
13066
"URLs represent non-ASCII characters in an encoding defined by the server, "
13067
"but\n"
13068
"usually UTF-8. The % escapes should be of the UTF-8 bytes. Bazaar tries to "
13069
"be\n"
13070
"generous in what it accepts as a URL and to print them in a way that\n"
13071
"will be readable."
13072
msgstr ""
13073
13074
#: en/help_topics/url-special-chars.txt:24
13075
msgid ""
13076
"For example, if you have a directory named '/tmp/%2False' these are all "
13077
"valid\n"
13078
"ways of accessing the content (0x2F, or 47, is the ASCII code for forward "
13079
"slash)::"
13080
msgstr ""
13081
13082
#: en/help_topics/url-special-chars.txt:27
13083
msgid ""
13084
" cd /tmp\n"
13085
" bzr log /tmp/%2False\n"
13086
" bzr log %2False\n"
13087
" bzr log file:///tmp/%252False\n"
13088
" bzr log file://localhost/tmp/%252False\n"
13089
" bzr log file:%252False"
13090
msgstr ""
13091
13092
#: en/help_topics/url-special-chars.txt:34
13093
msgid "These are valid but do not refer to the same file::"
13094
msgstr ""
13095
13096
#: en/help_topics/url-special-chars.txt:36
13097
msgid ""
13098
" bzr log file:///tmp/%2False (refers to a file called /tmp/\\/alse)\n"
13099
" bzr log %252False (refers to a file called /tmp/%252False)"
13100
msgstr ""
13101
13102
#: en/help_topics/url-special-chars.txt:39
13103
msgid ""
13104
"Comma also has special meaning in URLs, because it denotes `segment "
13105
"parameters`_"
13106
msgstr ""
13107
13108
#: en/help_topics/url-special-chars.txt:41
13109
msgid ""
13110
"_`segment parameters`: http://www.ietf.org/rfc/rfc3986.txt (section 3.3)"
13111
msgstr ""
13112
13113
#: en/help_topics/url-special-chars.txt:43
13114
msgid ""
13115
"Comma is also special in any file system paths that are specified. To use a "
13116
"literal\n"
13117
"comma in a file system path, specify a URL and URL encode the comma::"
13118
msgstr ""
13119
13120
#: en/help_topics/url-special-chars.txt:46
13121
msgid ""
13122
" bzr log foo,branch=bla # path \"foo\" with the segment parameter "
13123
"\"branch\" set to \"bla\"\n"
13124
" bzr log file:foo%2Cbranch=bla # path \"foo,branch=bla\"\n"
13125
" bzr log file:foo,branch=bla # path \"foo\" with segment parameter "
13126
"\"branch\" set to \"bla\"\n"
13127
msgstr ""
13128
13129
#: en/help_topics/urlspec.txt:1
13130
msgid "URL Identifiers"
13131
msgstr ""
13132
13133
#: en/help_topics/urlspec.txt:3
13134
msgid "Supported URL prefixes::"
13135
msgstr ""
13136
13137
#: en/help_topics/urlspec.txt:5
13138
msgid ""
13139
" aftp:// Access using active FTP.\n"
13140
" bzr:// Fast access using the Bazaar smart server.\n"
13141
" bzr+ssh:// Fast access using the Bazaar smart server over SSH.\n"
13142
" file:// Access using the standard filesystem (default)\n"
13143
" ftp:// Access using passive FTP.\n"
13144
" http:// Read-only access of branches exported on the web.\n"
13145
" https:// Read-only access of branches exported on the web using "
13146
"SSL.\n"
13147
" sftp:// Access using SFTP (most SSH servers provide SFTP)."
13148
msgstr ""
13149
13150
#: en/help_topics/urlspec.txt:14
13151
msgid "Supported modifiers::"
13152
msgstr ""
13153
13154
#: en/help_topics/urlspec.txt:16
13155
msgid " gio+ Access using any GIO supported protocols."
13156
msgstr ""
13157
13158
#: en/help_topics/urlspec.txt:18
13159
msgid "Bazaar supports all of the standard parts within the URL::"
13160
msgstr ""
13161
13162
#: en/help_topics/urlspec.txt:20
13163
msgid " <protocol>://[user[:password]@]host[:port]/[path]"
13164
msgstr ""
13165
13166
#: en/help_topics/urlspec.txt:22
13167
msgid "allowing URLs such as::"
13168
msgstr ""
13169
13170
#: en/help_topics/urlspec.txt:24
13171
msgid " http://bzruser:BadPass@bzr.example.com:8080/bzr/trunk"
13172
msgstr ""
13173
13174
#: en/help_topics/urlspec.txt:26
13175
msgid ""
13176
"For bzr+ssh:// and sftp:// URLs, Bazaar also supports paths that begin\n"
13177
"with '~' as meaning that the rest of the path should be interpreted\n"
13178
"relative to the remote user's home directory. For example if the user\n"
13179
"``remote`` has a home directory of ``/home/remote`` on the server\n"
13180
"shell.example.com, then::"
13181
msgstr ""
13182
13183
#: en/help_topics/urlspec.txt:32
13184
msgid " bzr+ssh://remote@shell.example.com/~/myproject/trunk"
13185
msgstr ""
13186
13187
#: en/help_topics/urlspec.txt:34
13188
msgid "would refer to ``/home/remote/myproject/trunk``."
13189
msgstr ""
13190
13191
#: en/help_topics/urlspec.txt:36
13192
msgid ""
13193
"Many commands that accept URLs also accept location aliases too.\n"
13194
"See :doc:`location-alias-help` and :doc:`url-special-chars-help`.\n"
13195
msgstr ""
Loggerhead is a web-based interface for Breezy
Version: 2.0.1