« back to all changes in this revision
Viewing changes to po/sco.po
- browse files at revision 6617
- compare with another revision
- download diff
- download tarball
- view history from revision 6617
- Committer: Patch Queue Manager
- Date: 2016-04-21 04:10:52 UTC
- mfrom: (6616.1.1 fix-en-user-guide)
- Revision ID: pqm@pqm.ubuntu.com-20160421041052-clcye7ns1qcl2n7w
(richard-wilbur) Ensure build of English use guide always uses English text
even when user's locale specifies a different language. (Jelmer Vernooij)
even when user's locale specifies a different language. (Jelmer Vernooij)
- files added:
- bzrlib/_termcolor.py
- bzrlib/branchfmt
- bzrlib/plugins/grep
- files removed:
- bzrlib/doc_generate/builders
- bzrlib/doc_generate/writers
- bzrlib/tests/doc_generate
- bzrlib/tests/doc_generate/builders
- bzrlib/tests/doc_generate/writers
- files modified:
- .bzrignore
added
removed
po/sco.po
1
# Scots translation for bzr
2
# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
3
# This file is distributed under the same license as the bzr package.
4
# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
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-07-10 11:35+0200\n"
11
"PO-Revision-Date: 2011-08-31 13:33+0000\n"
12
"Last-Translator: Jonathan Riddell <jriddell@ubuntu.com>\n"
13
"Language-Team: Scots <sco@li.org>\n"
14
"MIME-Version: 1.0\n"
15
"Content-Type: text/plain; charset=UTF-8\n"
16
"Content-Transfer-Encoding: 8bit\n"
17
"Plural-Forms: nplurals=2; plural=n != 1;\n"
18
"X-Launchpad-Export-Date: 2012-07-11 04:33+0000\n"
19
"X-Generator: Launchpad (build 15593)\n"
20
21
#: bzrlib/add.py:93
22
msgid "skipping {0} (larger than {1} of {2} bytes)"
23
msgstr ""
24
25
#: bzrlib/branch.py:854
26
msgid "Unstacking"
27
msgstr ""
28
29
#: bzrlib/branch.py:2955
30
#, python-format
31
msgid "Pushed up to revision %d."
32
msgstr ""
33
34
#: bzrlib/branch.py:2957
35
#, python-format
36
msgid "%d tag updated."
37
msgid_plural "%d tags updated."
38
msgstr[0] ""
39
msgstr[1] ""
40
41
#: bzrlib/branch.py:2960
42
msgid "No new revisions or tags to push."
43
msgstr ""
44
45
#: bzrlib/branch.py:2962
46
msgid "No new revisions to push."
47
msgstr ""
48
49
#: bzrlib/branch.py:2982
50
msgid "checked branch {0} format {1}"
51
msgstr ""
52
53
#: bzrlib/branch.py:2985
54
#, python-format
55
msgid "found error:%s"
56
msgstr ""
57
58
#: bzrlib/builtins.py:251 bzrlib/builtins.py:3045 bzrlib/workingtree.py:323
59
#, python-format
60
msgid "Ignoring files outside view. View is %s"
61
msgstr ""
62
63
#: bzrlib/builtins.py:260
64
#, python-format
65
msgid "bzr %s --revision takes exactly one revision identifier"
66
msgstr ""
67
68
#: bzrlib/builtins.py:315
69
msgid "Display status summary."
70
msgstr ""
71
72
#: bzrlib/builtins.py:317
73
msgid ""
74
"This reports on versioned and unknown files, reporting them\n"
75
"grouped by state. Possible states are:"
76
msgstr ""
77
"This report on versioned and unkent files, reporting them\n"
78
"grouped by state. Possible states are:"
79
80
#: bzrlib/builtins.py:320
81
msgid ""
82
"added\n"
83
" Versioned in the working copy but not in the previous revision."
84
msgstr ""
85
86
#: bzrlib/builtins.py:323
87
msgid ""
88
"removed\n"
89
" Versioned in the previous revision but removed or deleted\n"
90
" in the working copy."
91
msgstr ""
92
93
#: bzrlib/builtins.py:327
94
msgid ""
95
"renamed\n"
96
" Path of this file changed from the previous revision;\n"
97
" the text may also have changed. This includes files whose\n"
98
" parent directory was renamed."
99
msgstr ""
100
101
#: bzrlib/builtins.py:332
102
msgid ""
103
"modified\n"
104
" Text has changed since the previous revision."
105
msgstr ""
106
107
#: bzrlib/builtins.py:335
108
msgid ""
109
"kind changed\n"
110
" File kind has been changed (e.g. from file to directory)."
111
msgstr ""
112
113
#: bzrlib/builtins.py:338
114
msgid ""
115
"unknown\n"
116
" Not versioned and not matching an ignore pattern."
117
msgstr ""
118
119
#: bzrlib/builtins.py:341
120
msgid ""
121
"Additionally for directories, symlinks and files with a changed\n"
122
"executable bit, Bazaar indicates their type using a trailing\n"
123
"character: '/', '@' or '*' respectively. These decorations can be\n"
124
"disabled using the '--no-classify' option."
125
msgstr ""
126
127
#: bzrlib/builtins.py:346
128
msgid ""
129
"To see ignored files use 'bzr ignored'. For details on the\n"
130
"changes to file texts, use 'bzr diff'."
131
msgstr ""
132
133
#: bzrlib/builtins.py:349
134
msgid ""
135
"Note that --short or -S gives status flags for each item, similar\n"
136
"to Subversion's status command. To get output similar to svn -q,\n"
137
"use bzr status -SV."
138
msgstr ""
139
140
#: bzrlib/builtins.py:353
141
msgid ""
142
"If no arguments are specified, the status of the entire working\n"
143
"directory is shown. Otherwise, only the status of the specified\n"
144
"files or directories is reported. If a directory is given, status\n"
145
"is reported for everything inside that directory."
146
msgstr ""
147
148
#: bzrlib/builtins.py:358
149
msgid ""
150
"Before merges are committed, the pending merge tip revisions are\n"
151
"shown. To see all pending merge revisions, use the -v option.\n"
152
"To skip the display of pending merge information altogether, use\n"
153
"the no-pending option or specify a file/directory."
154
msgstr ""
155
156
#: bzrlib/builtins.py:363
157
msgid ""
158
"To compare the working directory to a specific revision, pass a\n"
159
"single revision to the revision argument."
160
msgstr ""
161
162
#: bzrlib/builtins.py:366
163
msgid ""
164
"To see which files have changed in a specific revision, or between\n"
165
"two revisions, pass a revision range to the revision argument.\n"
166
"This will produce the same results as calling 'bzr diff --summarize'."
167
msgstr ""
168
169
#: bzrlib/builtins.py:375
170
msgid "Use short status indicators."
171
msgstr ""
172
173
#: bzrlib/builtins.py:377
174
msgid "Only show versioned files."
175
msgstr ""
176
177
#: bzrlib/builtins.py:379
178
msgid "Don't show pending merges."
179
msgstr ""
180
181
#: bzrlib/builtins.py:382
182
msgid "Do not mark object type using indicator."
183
msgstr ""
184
185
#: bzrlib/builtins.py:397
186
msgid "bzr status --revision takes exactly one or two revision specifiers"
187
msgstr ""
188
189
#: bzrlib/builtins.py:441 bzrlib/builtins.py:5230
190
msgid "You can only supply one of revision_id or --revision"
191
msgstr ""
192
193
#: bzrlib/builtins.py:444 bzrlib/builtins.py:5232
194
msgid "You must supply either --revision or a revision_id"
195
msgstr ""
196
197
#: bzrlib/builtins.py:451
198
#, python-format
199
msgid "Repository %r does not support access to raw revision texts"
200
msgstr ""
201
202
#: bzrlib/builtins.py:462
203
msgid "The repository {0} contains no revision {1}."
204
msgstr ""
205
206
#: bzrlib/builtins.py:469
207
msgid "You cannot specify a NULL revision."
208
msgstr ""
209
210
#: bzrlib/builtins.py:561
211
msgid "Remove the working tree from a given branch/checkout."
212
msgstr "Remove the working tree frae a gien branch/checkoot."
213
214
#: bzrlib/builtins.py:563
215
msgid ""
216
"Since a lightweight checkout is little more than a working tree\n"
217
"this will refuse to run against one."
218
msgstr ""
219
220
#: bzrlib/builtins.py:566
221
msgid "To re-create the working tree, use \"bzr checkout\"."
222
msgstr ""
223
224
#: bzrlib/builtins.py:572
225
msgid ""
226
"Remove the working tree even if it has uncommitted or shelved changes."
227
msgstr ""
228
229
#: bzrlib/builtins.py:586
230
msgid "No working tree to remove"
231
msgstr ""
232
233
#: bzrlib/builtins.py:588
234
msgid "You cannot remove the working tree of a remote path"
235
msgstr ""
236
237
#: bzrlib/builtins.py:597
238
msgid "You cannot remove the working tree from a lightweight checkout"
239
msgstr ""
240
241
#: bzrlib/builtins.py:637
242
msgid ""
243
"The tree does not appear to be corrupt. You probably want \"bzr revert\" "
244
"instead. Use \"--force\" if you are sure you want to reset the working tree."
245
msgstr ""
246
247
#: bzrlib/builtins.py:648
248
msgid ""
249
", the header appears corrupt, try passing -r -1 to set the state to the last "
250
"commit"
251
msgstr ""
252
253
#: bzrlib/builtins.py:652
254
msgid "failed to reset the tree state{0}"
255
msgstr ""
256
257
#: bzrlib/builtins.py:656
258
msgid "Show current revision number."
259
msgstr ""
260
261
#: bzrlib/builtins.py:658
262
msgid "This is equal to the number of revisions on this branch."
263
msgstr ""
264
265
#: bzrlib/builtins.py:671
266
msgid "--tree and --revision can not be used together"
267
msgstr ""
268
269
#: bzrlib/builtins.py:688 bzrlib/builtins.py:5986
270
msgid "Tags can only be placed on a single revision, not on a range"
271
msgstr ""
272
273
#: bzrlib/builtins.py:712
274
msgid "Show revno of working tree."
275
msgstr ""
276
277
#: bzrlib/builtins.py:760
278
msgid "Add specified files or directories."
279
msgstr ""
280
281
#: bzrlib/builtins.py:762
282
msgid ""
283
"In non-recursive mode, all the named items are added, regardless\n"
284
"of whether they were previously ignored. A warning is given if\n"
285
"any of the named files are already versioned."
286
msgstr ""
287
288
#: bzrlib/builtins.py:766
289
msgid ""
290
"In recursive mode (the default), files are treated the same way\n"
291
"but the behaviour for directories is different. Directories that\n"
292
"are already versioned do not give a warning. All directories,\n"
293
"whether already versioned or not, are searched for files or\n"
294
"subdirectories that are neither versioned or ignored, and these\n"
295
"are added. This search proceeds recursively into versioned\n"
296
"directories. If no names are given '.' is assumed."
297
msgstr ""
298
299
#: bzrlib/builtins.py:774
300
msgid ""
301
"A warning will be printed when nested trees are encountered,\n"
302
"unless they are explicitly ignored."
303
msgstr ""
304
305
#: bzrlib/builtins.py:777
306
msgid ""
307
"Therefore simply saying 'bzr add' will version all files that\n"
308
"are currently unknown."
309
msgstr ""
310
311
#: bzrlib/builtins.py:780
312
msgid ""
313
"Adding a file whose parent directory is not versioned will\n"
314
"implicitly add the parent, and so on up to the root. This means\n"
315
"you should never need to explicitly add a directory, they'll just\n"
316
"get added when you add a file in the directory."
317
msgstr ""
318
319
#: bzrlib/builtins.py:785
320
msgid ""
321
"--dry-run will show which files would be added, but not actually\n"
322
"add them."
323
msgstr ""
324
325
#: bzrlib/builtins.py:788
326
msgid ""
327
"--file-ids-from will try to use the file ids from the supplied path.\n"
328
"It looks up ids trying to find a matching parent directory with the\n"
329
"same filename, and then by pure path. This option is rarely needed\n"
330
"but can be useful when adding the same logical file into two\n"
331
"branches that will be merged later (without showing the two different\n"
332
"adds as a conflict). It is also useful when merging another project\n"
333
"into a subdirectory of this one."
334
msgstr ""
335
336
#: bzrlib/builtins.py:796
337
msgid ""
338
"Any files matching patterns in the ignore list will not be added\n"
339
"unless they are explicitly mentioned."
340
msgstr ""
341
342
#: bzrlib/builtins.py:799
343
msgid ""
344
"In recursive mode, files larger than the configuration option \n"
345
"add.maximum_file_size will be skipped. Named items are never skipped due\n"
346
"to file size."
347
msgstr ""
348
349
#: bzrlib/builtins.py:806
350
msgid "Don't recursively add the contents of directories."
351
msgstr ""
352
353
#: bzrlib/builtins.py:813
354
msgid "Lookup file ids from this tree."
355
msgstr ""
356
357
#: bzrlib/builtins.py:849
358
msgid "ignored {0} matching \"{1}\"\n"
359
msgstr ""
360
361
#: bzrlib/builtins.py:854
362
msgid "Create a new versioned directory."
363
msgstr ""
364
365
#: bzrlib/builtins.py:856
366
msgid "This is equivalent to creating the directory and then adding it."
367
msgstr ""
368
369
#: bzrlib/builtins.py:863
370
msgid "No error if existing, make parent directories as needed."
371
msgstr ""
372
373
#: bzrlib/builtins.py:897
374
#, python-format
375
msgid "added %s\n"
376
msgstr ""
377
378
#: bzrlib/builtins.py:939
379
#, python-format
380
msgid "invalid kind %r specified"
381
msgstr ""
382
383
#: bzrlib/builtins.py:976
384
msgid "Move or rename a file."
385
msgstr ""
386
387
#: bzrlib/builtins.py:978
388
msgid " bzr mv SOURCE... DESTINATION"
389
msgstr ""
390
391
#: bzrlib/builtins.py:980
392
msgid ""
393
"If the last argument is a versioned directory, all the other names\n"
394
"are moved into it. Otherwise, there must be exactly two arguments\n"
395
"and the file is changed to a new name."
396
msgstr ""
397
398
#: bzrlib/builtins.py:984
399
msgid ""
400
"If OLDNAME does not exist on the filesystem but is versioned and\n"
401
"NEWNAME does exist on the filesystem but is not versioned, mv\n"
402
"assumes that the file has been manually moved and only updates\n"
403
"its internal inventory to reflect that change.\n"
404
"The same is valid when moving many SOURCE files to a DESTINATION."
405
msgstr ""
406
407
#: bzrlib/builtins.py:990
408
msgid "Files cannot be moved between branches."
409
msgstr ""
410
411
#: bzrlib/builtins.py:997
412
msgid ""
413
"Move only the bzr identifier of the file, because the file has already been "
414
"moved."
415
msgstr ""
416
417
#: bzrlib/builtins.py:999
418
msgid "Automatically guess renames."
419
msgstr ""
420
421
#: bzrlib/builtins.py:1000
422
msgid "Avoid making changes when guessing renames."
423
msgstr ""
424
425
#: bzrlib/builtins.py:1009
426
msgid "--dry-run requires --auto."
427
msgstr ""
428
429
#: bzrlib/builtins.py:1013
430
msgid "missing file argument"
431
msgstr ""
432
433
#: bzrlib/builtins.py:1017
434
msgid "can not move root of branch"
435
msgstr ""
436
437
#: bzrlib/builtins.py:1023
438
msgid "Only one path may be specified to --auto."
439
msgstr ""
440
441
#: bzrlib/builtins.py:1026
442
msgid "--after cannot be specified with --auto."
443
msgstr ""
444
445
#: bzrlib/builtins.py:1062
446
msgid "to mv multiple files the destination must be a versioned directory"
447
msgstr ""
448
449
#: bzrlib/builtins.py:1114
450
msgid "Turn this branch into a mirror of another branch."
451
msgstr ""
452
453
#: bzrlib/builtins.py:1116
454
msgid ""
455
"By default, this command only works on branches that have not diverged.\n"
456
"Branches are considered diverged if the destination branch's most recent \n"
457
"commit is one that has not been merged (directly or indirectly) into the \n"
458
"parent."
459
msgstr ""
460
461
#: bzrlib/builtins.py:1121
462
msgid ""
463
"If branches have diverged, you can use 'bzr merge' to integrate the changes\n"
464
"from one into the other. Once one branch has merged, the other should\n"
465
"be able to pull it again."
466
msgstr ""
467
468
#: bzrlib/builtins.py:1125
469
msgid ""
470
"If you want to replace your local changes and just want your branch to\n"
471
"match the remote one, use pull --overwrite. This will work even if the two\n"
472
"branches have diverged."
473
msgstr ""
474
475
#: bzrlib/builtins.py:1129
476
msgid ""
477
"If there is no default location set, the first pull will set it (use\n"
478
"--no-remember to avoid setting it). After that, you can omit the\n"
479
"location to use the default. To change the default, use --remember. The\n"
480
"value will only be saved if the remote location can be accessed."
481
msgstr ""
482
483
#: bzrlib/builtins.py:1134
484
msgid ""
485
"The --verbose option will display the revisions pulled using the log_format\n"
486
"configuration option. You can use a different format by overriding it with\n"
487
"-Olog_format=<other_format>."
488
msgstr ""
489
490
#: bzrlib/builtins.py:1138
491
msgid ""
492
"Note: The location can be specified either in the form of a branch,\n"
493
"or in the form of a path to a file containing a merge directive generated\n"
494
"with bzr send."
495
msgstr ""
496
497
#: bzrlib/builtins.py:1146
498
msgid "Show logs of pulled revisions."
499
msgstr ""
500
501
#: bzrlib/builtins.py:1148
502
msgid ""
503
"Branch to pull into, rather than the one containing the working directory."
504
msgstr ""
505
506
#: bzrlib/builtins.py:1151
507
msgid ""
508
"Perform a local pull in a bound branch. Local pulls are not applied to the "
509
"master branch."
510
msgstr ""
511
512
#: bzrlib/builtins.py:1189
513
msgid "Need working tree for --show-base."
514
msgstr ""
515
516
#: bzrlib/builtins.py:1205
517
msgid "No pull location known or specified."
518
msgstr ""
519
520
#: bzrlib/builtins.py:1211
521
#, python-format
522
msgid "Using saved parent location: %s\n"
523
msgstr ""
524
525
#: bzrlib/builtins.py:1218 bzrlib/builtins.py:4425
526
msgid "Cannot use -r with merge directives or bundles"
527
msgstr ""
528
529
#: bzrlib/builtins.py:1261
530
msgid "Update a mirror of this branch."
531
msgstr ""
532
533
#: bzrlib/builtins.py:1263
534
msgid ""
535
"The target branch will not have its working tree populated because this\n"
536
"is both expensive, and is not supported on remote file systems."
537
msgstr ""
538
539
#: bzrlib/builtins.py:1266
540
msgid ""
541
"Some smart servers or protocols *may* put the working tree in place in\n"
542
"the future."
543
msgstr ""
544
545
#: bzrlib/builtins.py:1269
546
msgid ""
547
"This command only works on branches that have not diverged. Branches are\n"
548
"considered diverged if the destination branch's most recent commit is one\n"
549
"that has not been merged (directly or indirectly) by the source branch."
550
msgstr ""
551
552
#: bzrlib/builtins.py:1273
553
msgid ""
554
"If branches have diverged, you can use 'bzr push --overwrite' to replace\n"
555
"the other branch completely, discarding its unmerged changes."
556
msgstr ""
557
558
#: bzrlib/builtins.py:1276
559
msgid ""
560
"If you want to ensure you have the different changes in the other branch,\n"
561
"do a merge (see bzr help merge) from the other branch, and commit that.\n"
562
"After that you will be able to do a push without '--overwrite'."
563
msgstr ""
564
565
#: bzrlib/builtins.py:1280
566
msgid ""
567
"If there is no default push location set, the first push will set it (use\n"
568
"--no-remember to avoid setting it). After that, you can omit the\n"
569
"location to use the default. To change the default, use --remember. The\n"
570
"value will only be saved if the remote location can be accessed."
571
msgstr ""
572
573
#: bzrlib/builtins.py:1285
574
msgid ""
575
"The --verbose option will display the revisions pushed using the log_format\n"
576
"configuration option. You can use a different format by overriding it with\n"
577
"-Olog_format=<other_format>."
578
msgstr ""
579
580
#: bzrlib/builtins.py:1296 bzrlib/foreign.py:272
581
msgid ""
582
"Branch to push from, rather than the one containing the working directory."
583
msgstr ""
584
585
#: bzrlib/builtins.py:1299
586
msgid ""
587
"By default push will fail if the target directory exists, but does not "
588
"already have a control directory. This flag will allow push to proceed."
589
msgstr ""
590
591
#: bzrlib/builtins.py:1304
592
msgid ""
593
"Create a stacked branch that references the public location of the parent "
594
"branch."
595
msgstr ""
596
597
#: bzrlib/builtins.py:1307
598
msgid ""
599
"Create a stacked branch that refers to another branch for the commit "
600
"history. Only the work not present in the referenced branch is included in "
601
"the branch created."
602
msgstr ""
603
604
#: bzrlib/builtins.py:1312 bzrlib/foreign.py:279
605
msgid ""
606
"Refuse to push if there are uncommitted changes in the working tree, --no-"
607
"strict disables the check."
608
msgstr ""
609
610
#: bzrlib/builtins.py:1315
611
msgid "Don't populate the working tree, even for protocols that support it."
612
msgstr ""
613
614
#: bzrlib/builtins.py:1318
615
msgid "Overwrite tags only."
616
msgstr ""
617
618
#: bzrlib/builtins.py:1369
619
msgid "Could not determine branch to refer to."
620
msgstr ""
621
622
#: bzrlib/builtins.py:1378
623
#, python-format
624
msgid ""
625
"No push location known or specified. To push to the parent branch (at %s), "
626
"use 'bzr push :parent'."
627
msgstr ""
628
629
#: bzrlib/builtins.py:1384 bzrlib/foreign.py:306
630
msgid "No push location known or specified."
631
msgstr ""
632
633
#: bzrlib/builtins.py:1388
634
#, python-format
635
msgid "Using saved push location: %s"
636
msgstr ""
637
638
#: bzrlib/builtins.py:1398
639
msgid "Create a new branch that is a copy of an existing branch."
640
msgstr ""
641
642
#: bzrlib/builtins.py:1400
643
msgid ""
644
"If the TO_LOCATION is omitted, the last component of the FROM_LOCATION will\n"
645
"be used. In other words, \"branch ../foo/bar\" will attempt to create "
646
"./bar.\n"
647
"If the FROM_LOCATION has no / or path separator embedded, the TO_LOCATION\n"
648
"is derived from the FROM_LOCATION by stripping a leading scheme or drive\n"
649
"identifier, if any. For example, \"branch lp:foo-bar\" will attempt to\n"
650
"create ./foo-bar."
651
msgstr ""
652
653
#: bzrlib/builtins.py:1407
654
msgid ""
655
"To retrieve the branch as of a particular revision, supply the --revision\n"
656
"parameter, as in \"branch foo/bar -r 5\"."
657
msgstr ""
658
659
#: bzrlib/builtins.py:1410
660
msgid "The synonyms 'clone' and 'get' for this command are deprecated."
661
msgstr ""
662
663
#: bzrlib/builtins.py:1420
664
msgid "Create a branch without a working-tree."
665
msgstr ""
666
667
#: bzrlib/builtins.py:1422
668
msgid "Switch the checkout in the current directory to the new branch."
669
msgstr ""
670
671
#: bzrlib/builtins.py:1425
672
msgid ""
673
"Create a stacked branch referring to the source branch. The new branch will "
674
"depend on the availability of the source branch for all operations."
675
msgstr ""
676
677
#: bzrlib/builtins.py:1429
678
msgid "Do not use a shared repository, even if available."
679
msgstr ""
680
681
#: bzrlib/builtins.py:1431
682
msgid ""
683
"By default branch will fail if the target directory exists, but does not "
684
"already have a control directory. This flag will allow branch to proceed."
685
msgstr ""
686
687
#: bzrlib/builtins.py:1436
688
msgid "Bind new branch to from location."
689
msgstr ""
690
691
#: bzrlib/builtins.py:1483
692
#, python-format
693
msgid "Target directory \"%s\" already exists."
694
msgstr ""
695
696
#: bzrlib/builtins.py:1495
697
#, python-format
698
msgid "Parent of \"%s\" does not exist."
699
msgstr ""
700
701
#: bzrlib/builtins.py:1514
702
msgid "The branch {0} has no revision {1}."
703
msgstr ""
704
705
#: bzrlib/builtins.py:1529 bzrlib/push.py:53
706
#, python-format
707
msgid "Created new stacked branch referring to %s."
708
msgstr ""
709
710
#: bzrlib/builtins.py:1533
711
#, python-format
712
msgid "Branched %d revision."
713
msgid_plural "Branched %d revisions."
714
msgstr[0] ""
715
msgstr[1] ""
716
717
#: bzrlib/builtins.py:1538
718
#, python-format
719
msgid "New branch bound to %s"
720
msgstr ""
721
722
#: bzrlib/builtins.py:1543 bzrlib/builtins.py:6280
723
#, python-format
724
msgid "Switched to branch: %s"
725
msgstr ""
726
727
#: bzrlib/builtins.py:1548
728
msgid "List the branches available at the current location."
729
msgstr ""
730
731
#: bzrlib/builtins.py:1550
732
msgid ""
733
"This command will print the names of all the branches at the current\n"
734
"location."
735
msgstr ""
736
737
#: bzrlib/builtins.py:1557
738
msgid ""
739
"Recursively scan for branches rather than just looking in the specified "
740
"location."
741
msgstr ""
742
743
#: bzrlib/builtins.py:1586
744
msgid "(default)"
745
msgstr ""
746
747
#: bzrlib/builtins.py:1598
748
msgid "Create a new checkout of an existing branch."
749
msgstr ""
750
751
#: bzrlib/builtins.py:1600
752
msgid ""
753
"If BRANCH_LOCATION is omitted, checkout will reconstitute a working tree "
754
"for\n"
755
"the branch found in '.'. This is useful if you have removed the working "
756
"tree\n"
757
"or if it was never created - i.e. if you pushed the branch to its current\n"
758
"location using SFTP."
759
msgstr ""
760
761
#: bzrlib/builtins.py:1605
762
msgid ""
763
"If the TO_LOCATION is omitted, the last component of the BRANCH_LOCATION "
764
"will\n"
765
"be used. In other words, \"checkout ../foo/bar\" will attempt to create "
766
"./bar.\n"
767
"If the BRANCH_LOCATION has no / or path separator embedded, the TO_LOCATION\n"
768
"is derived from the BRANCH_LOCATION by stripping a leading scheme or drive\n"
769
"identifier, if any. For example, \"checkout lp:foo-bar\" will attempt to\n"
770
"create ./foo-bar."
771
msgstr ""
772
773
#: bzrlib/builtins.py:1612
774
msgid ""
775
"To retrieve the branch as of a particular revision, supply the --revision\n"
776
"parameter, as in \"checkout foo/bar -r 5\". Note that this will be "
777
"immediately\n"
778
"out of date [so you cannot commit] but it may be useful (i.e. to examine "
779
"old\n"
780
"code.)"
781
msgstr ""
782
783
#: bzrlib/builtins.py:1622
784
msgid ""
785
"Perform a lightweight checkout. Lightweight checkouts depend on access to "
786
"the branch for every operation. Normal checkouts can perform common "
787
"operations like diff and status without such access, and also support local "
788
"commits."
789
msgstr ""
790
791
#: bzrlib/builtins.py:1629
792
msgid "Get file contents from this tree."
793
msgstr ""
794
795
#: bzrlib/builtins.py:1631
796
msgid "Hard-link working tree files where possible."
797
msgstr ""
798
799
#: bzrlib/builtins.py:1672
800
msgid ""
801
"Show list of renamed files.\n"
802
" "
803
msgstr ""
804
805
#: bzrlib/builtins.py:1700
806
msgid "Update a working tree to a new revision."
807
msgstr ""
808
809
#: bzrlib/builtins.py:1702
810
msgid ""
811
"This will perform a merge of the destination revision (the tip of the\n"
812
"branch, or the specified revision) into the working tree, and then make\n"
813
"that revision the basis revision for the working tree. "
814
msgstr ""
815
816
#: bzrlib/builtins.py:1706
817
msgid ""
818
"You can use this to visit an older revision, or to update a working tree\n"
819
"that is out of date from its branch."
820
msgstr ""
821
822
#: bzrlib/builtins.py:1709
823
msgid ""
824
"If there are any uncommitted changes in the tree, they will be carried\n"
825
"across and remain as uncommitted changes after the update. To discard\n"
826
"these changes, use 'bzr revert'. The uncommitted changes may conflict\n"
827
"with the changes brought in by the change in basis revision."
828
msgstr ""
829
830
#: bzrlib/builtins.py:1714
831
msgid ""
832
"If the tree's branch is bound to a master branch, bzr will also update\n"
833
"the branch from the master."
834
msgstr ""
835
836
#: bzrlib/builtins.py:1717
837
msgid ""
838
"You cannot update just a single file or directory, because each Bazaar\n"
839
"working tree has just a single basis revision. If you want to restore a\n"
840
"file that has been removed locally, use 'bzr revert' instead of 'bzr\n"
841
"update'. If you want to restore a file to its state in a previous\n"
842
"revision, use 'bzr revert' with a '-r' option, or use 'bzr cat' to write\n"
843
"out the old content of that file to a new location."
844
msgstr ""
845
846
#: bzrlib/builtins.py:1724
847
msgid ""
848
"The 'dir' argument, if given, must be the location of the root of a\n"
849
"working tree to update. By default, the working tree that contains the \n"
850
"current working directory is used."
851
msgstr ""
852
853
#: bzrlib/builtins.py:1740
854
msgid "bzr update --revision takes exactly one revision"
855
msgstr ""
856
857
#: bzrlib/builtins.py:1748
858
msgid "bzr update can only update a whole tree, not a file or subdirectory"
859
msgstr ""
860
861
#: bzrlib/builtins.py:1779
862
msgid "Tree is up to date at revision {0} of branch {1}"
863
msgstr ""
864
865
#: bzrlib/builtins.py:1795
866
#, python-format
867
msgid ""
868
"branch has no revision %s\n"
869
"bzr update --revision only works for a revision in the branch history"
870
msgstr ""
871
872
#: bzrlib/builtins.py:1801
873
msgid "Updated to revision {0} of branch {1}"
874
msgstr ""
875
876
#: bzrlib/builtins.py:1805
877
msgid ""
878
"Your local commits will now show as pending merges with 'bzr status', and "
879
"can be committed with 'bzr commit'."
880
msgstr ""
881
882
#: bzrlib/builtins.py:1814
883
msgid "Show information about a working tree, branch or repository."
884
msgstr ""
885
886
#: bzrlib/builtins.py:1816
887
msgid ""
888
"This command will show all known locations and formats associated to the\n"
889
"tree, branch or repository."
890
msgstr ""
891
892
#: bzrlib/builtins.py:1819
893
msgid ""
894
"In verbose mode, statistical information is included with each report.\n"
895
"To see extended statistic information, use a verbosity level of 2 or\n"
896
"higher by specifying the verbose option multiple times, e.g. -vv."
897
msgstr ""
898
899
#: bzrlib/builtins.py:1823
900
msgid "Branches and working trees will also report any missing revisions."
901
msgstr ""
902
903
#: bzrlib/builtins.py:1825 bzrlib/builtins.py:3744 bzrlib/builtins.py:4885
904
#: bzrlib/builtins.py:6466
905
msgid ":Examples:"
906
msgstr ""
907
908
#: bzrlib/builtins.py:1827
909
msgid " Display information on the format and related locations:"
910
msgstr ""
911
912
#: bzrlib/builtins.py:1829
913
msgid " bzr info"
914
msgstr ""
915
916
#: bzrlib/builtins.py:1831
917
msgid ""
918
" Display the above together with extended format information and\n"
919
" basic statistics (like the number of files in the working tree and\n"
920
" number of revisions in the branch and repository):"
921
msgstr ""
922
923
#: bzrlib/builtins.py:1835
924
msgid " bzr info -v"
925
msgstr ""
926
927
#: bzrlib/builtins.py:1837
928
msgid " Display the above together with number of committers to the branch:"
929
msgstr ""
930
931
#: bzrlib/builtins.py:1839
932
msgid " bzr info -vv"
933
msgstr ""
934
935
#: bzrlib/builtins.py:1858
936
msgid "Remove files or directories."
937
msgstr ""
938
939
#: bzrlib/builtins.py:1860
940
msgid ""
941
"This makes Bazaar stop tracking changes to the specified files. Bazaar will\n"
942
"delete them if they can easily be recovered using revert otherwise they\n"
943
"will be backed up (adding an extension of the form .~#~). If no options or\n"
944
"parameters are given Bazaar will scan for files that are being tracked by\n"
945
"Bazaar but missing in your tree and stop tracking them for you."
946
msgstr ""
947
948
#: bzrlib/builtins.py:1868
949
msgid "Only remove files that have never been committed."
950
msgstr ""
951
952
#: bzrlib/builtins.py:1870
953
msgid "The file deletion mode to be used."
954
msgstr ""
955
956
#: bzrlib/builtins.py:1871
957
msgid "Deletion Strategy"
958
msgstr ""
959
960
#: bzrlib/builtins.py:1872
961
msgid "Backup changed files (default)."
962
msgstr ""
963
964
#: bzrlib/builtins.py:1873
965
msgid "Delete from bzr but leave the working copy."
966
msgstr ""
967
968
#: bzrlib/builtins.py:1874
969
msgid "Don't backup changed files."
970
msgstr ""
971
972
#: bzrlib/builtins.py:1875
973
msgid ""
974
"Delete all the specified files, even if they can not be recovered and even "
975
"if they are non-empty directories. (deprecated, use no-backup)"
976
msgstr ""
977
978
#: bzrlib/builtins.py:1884
979
msgid "(The --force option is deprecated, rather use --no-backup in future.)"
980
msgstr ""
981
982
#: bzrlib/builtins.py:1901
983
msgid "No matching files."
984
msgstr ""
985
986
#: bzrlib/builtins.py:1962
987
msgid "Reconcile bzr metadata in a branch."
988
msgstr ""
989
990
#: bzrlib/builtins.py:1964
991
msgid ""
992
"This can correct data mismatches that may have been caused by\n"
993
"previous ghost operations or bzr upgrades. You should only\n"
994
"need to run this command if 'bzr check' or a bzr developer\n"
995
"advises you to run it."
996
msgstr ""
997
998
#: bzrlib/builtins.py:1969
999
msgid ""
1000
"If a second branch is provided, cross-branch reconciliation is\n"
1001
"also attempted, which will check that data like the tree root\n"
1002
"id which was not present in very early bzr versions is represented\n"
1003
"correctly in both branches."
1004
msgstr ""
1005
1006
#: bzrlib/builtins.py:1974
1007
msgid ""
1008
"At the same time it is run it may recompress data resulting in\n"
1009
"a potential saving in disk space or performance gain."
1010
msgstr ""
1011
1012
#: bzrlib/builtins.py:1977
1013
msgid "The branch *MUST* be on a listable system such as local disk or sftp."
1014
msgstr ""
1015
1016
#: bzrlib/builtins.py:2044 bzrlib/builtins.py:2162 bzrlib/builtins.py:3779
1017
msgid ""
1018
"Format for the bzr 2.0 series.\n"
1019
"Uses group-compress storage.\n"
1020
"Provides rich roots which are a one-way transition.\n"
1021
msgstr ""
1022
1023
#: bzrlib/builtins.py:2044 bzrlib/builtins.py:2162 bzrlib/builtins.py:3779
1024
msgid ""
1025
"Pack-based format used in 1.x series. Introduced in 0.92. Interoperates with "
1026
"bzr repositories before 0.92 but cannot be read by bzr < 0.92. "
1027
msgstr ""
1028
1029
#: bzrlib/builtins.py:2044 bzrlib/builtins.py:2162 bzrlib/builtins.py:3779
1030
msgid "The 2a format with experimental support for colocated branches.\n"
1031
msgstr ""
1032
1033
#: bzrlib/builtins.py:2045
1034
msgid "Make a directory into a versioned branch."
1035
msgstr ""
1036
1037
#: bzrlib/builtins.py:2047
1038
msgid ""
1039
"Use this to create an empty branch, or before importing an\n"
1040
"existing project."
1041
msgstr ""
1042
1043
#: bzrlib/builtins.py:2050
1044
msgid ""
1045
"If there is a repository in a parent directory of the location, then\n"
1046
"the history of the branch will be stored in the repository. Otherwise\n"
1047
"init creates a standalone branch which carries its own history\n"
1048
"in the .bzr directory."
1049
msgstr ""
1050
1051
#: bzrlib/builtins.py:2055
1052
msgid ""
1053
"If there is already a branch at the location but it has no working tree,\n"
1054
"the tree can be populated with 'bzr checkout'."
1055
msgstr ""
1056
1057
#: bzrlib/builtins.py:2058
1058
msgid "Recipe for importing a tree of files::"
1059
msgstr ""
1060
1061
#: bzrlib/builtins.py:2060
1062
msgid ""
1063
" cd ~/project\n"
1064
" bzr init\n"
1065
" bzr add .\n"
1066
" bzr status\n"
1067
" bzr commit -m \"imported project\""
1068
msgstr ""
1069
1070
#: bzrlib/builtins.py:2071
1071
msgid ""
1072
"Create the path leading up to the branch if it does not already exist."
1073
msgstr ""
1074
1075
#: bzrlib/builtins.py:2074
1076
msgid "Specify a format for this branch. See \"help formats\"."
1077
msgstr ""
1078
1079
#: bzrlib/builtins.py:2082
1080
msgid ""
1081
"Never change revnos or the existing log. Append revisions to it only."
1082
msgstr ""
1083
1084
#: bzrlib/builtins.py:2085
1085
msgid "Create a branch without a working tree."
1086
msgstr ""
1087
1088
#: bzrlib/builtins.py:2105 bzrlib/push.py:110
1089
#, python-format
1090
msgid ""
1091
"Parent directory of %s does not exist.\n"
1092
"You may supply --create-prefix to create all leading parent directories."
1093
msgstr ""
1094
1095
#: bzrlib/builtins.py:2139
1096
msgid ""
1097
"This branch format cannot be set to append-revisions-only. Try --default."
1098
msgstr ""
1099
1100
#: bzrlib/builtins.py:2150
1101
msgid "Created a {0} (format: {1})\n"
1102
msgstr ""
1103
1104
#: bzrlib/builtins.py:2159
1105
#, python-format
1106
msgid "Using shared repository: %s\n"
1107
msgstr ""
1108
1109
#: bzrlib/builtins.py:2163
1110
msgid "Create a shared repository for branches to share storage space."
1111
msgstr ""
1112
1113
#: bzrlib/builtins.py:2165
1114
msgid ""
1115
"New branches created under the repository directory will store their\n"
1116
"revisions in the repository, not in the branch directory. For branches\n"
1117
"with shared history, this reduces the amount of storage needed and \n"
1118
"speeds up the creation of new branches."
1119
msgstr ""
1120
1121
#: bzrlib/builtins.py:2170
1122
msgid ""
1123
"If the --no-trees option is given then the branches in the repository\n"
1124
"will not have working trees by default. They will still exist as \n"
1125
"directories on disk, but they will not have separate copies of the \n"
1126
"files at a certain revision. This can be useful for repositories that\n"
1127
"store branches which are interacted with through checkouts or remote\n"
1128
"branches, such as on a server."
1129
msgstr ""
1130
1131
#: bzrlib/builtins.py:2177
1132
msgid ""
1133
":Examples:\n"
1134
" Create a shared repository holding just branches::"
1135
msgstr ""
1136
1137
#: bzrlib/builtins.py:2180
1138
msgid ""
1139
" bzr init-repo --no-trees repo\n"
1140
" bzr init repo/trunk"
1141
msgstr ""
1142
1143
#: bzrlib/builtins.py:2183
1144
msgid " Make a lightweight checkout elsewhere::"
1145
msgstr ""
1146
1147
#: bzrlib/builtins.py:2185
1148
msgid ""
1149
" bzr checkout --lightweight repo/trunk trunk-checkout\n"
1150
" cd trunk-checkout\n"
1151
" (add files here)"
1152
msgstr ""
1153
1154
#: bzrlib/builtins.py:2193
1155
msgid ""
1156
"Specify a format for this repository. See \"bzr help formats\" for details."
1157
msgstr ""
1158
1159
#: bzrlib/builtins.py:2197
1160
msgid "Repository format"
1161
msgstr ""
1162
1163
#: bzrlib/builtins.py:2199
1164
msgid "Branches in the repository will default to not having a working tree."
1165
msgstr ""
1166
1167
#: bzrlib/builtins.py:2225
1168
msgid "Show differences in the working tree, between revisions or branches."
1169
msgstr ""
1170
1171
#: bzrlib/builtins.py:2227
1172
msgid ""
1173
"If no arguments are given, all changes for the current tree are listed.\n"
1174
"If files are given, only the changes in those files are listed.\n"
1175
"Remote and multiple branches can be compared by using the --old and\n"
1176
"--new options. If not provided, the default for both is derived from\n"
1177
"the first argument, if any, or the current tree if no arguments are\n"
1178
"given."
1179
msgstr ""
1180
1181
#: bzrlib/builtins.py:2234
1182
msgid ""
1183
"\"bzr diff -p1\" is equivalent to \"bzr diff --prefix old/:new/\", and\n"
1184
"produces patches suitable for \"patch -p1\"."
1185
msgstr ""
1186
1187
#: bzrlib/builtins.py:2237
1188
msgid ""
1189
"Note that when using the -r argument with a range of revisions, the\n"
1190
"differences are computed between the two specified revisions. That\n"
1191
"is, the command does not show the changes introduced by the first \n"
1192
"revision in the range. This differs from the interpretation of \n"
1193
"revision ranges used by \"bzr log\" which includes the first revision\n"
1194
"in the range."
1195
msgstr ""
1196
1197
#: bzrlib/builtins.py:2244
1198
msgid ""
1199
":Exit values:\n"
1200
" 1 - changed\n"
1201
" 2 - unrepresentable changes\n"
1202
" 3 - error\n"
1203
" 0 - no change"
1204
msgstr ""
1205
1206
#: bzrlib/builtins.py:2250
1207
msgid ""
1208
":Examples:\n"
1209
" Shows the difference in the working tree versus the last commit::"
1210
msgstr ""
1211
1212
#: bzrlib/builtins.py:2253
1213
msgid " bzr diff"
1214
msgstr ""
1215
1216
#: bzrlib/builtins.py:2255
1217
msgid " Difference between the working tree and revision 1::"
1218
msgstr ""
1219
1220
#: bzrlib/builtins.py:2257
1221
msgid " bzr diff -r1"
1222
msgstr ""
1223
1224
#: bzrlib/builtins.py:2259
1225
msgid " Difference between revision 3 and revision 1::"
1226
msgstr ""
1227
1228
#: bzrlib/builtins.py:2261
1229
msgid " bzr diff -r1..3"
1230
msgstr ""
1231
1232
#: bzrlib/builtins.py:2263
1233
msgid " Difference between revision 3 and revision 1 for branch xxx::"
1234
msgstr ""
1235
1236
#: bzrlib/builtins.py:2265
1237
msgid " bzr diff -r1..3 xxx"
1238
msgstr ""
1239
1240
#: bzrlib/builtins.py:2267
1241
msgid " The changes introduced by revision 2 (equivalent to -r1..2)::"
1242
msgstr ""
1243
1244
#: bzrlib/builtins.py:2269
1245
msgid " bzr diff -c2"
1246
msgstr ""
1247
1248
#: bzrlib/builtins.py:2271
1249
msgid ""
1250
" To see the changes introduced by revision X::\n"
1251
" \n"
1252
" bzr diff -cX"
1253
msgstr ""
1254
1255
#: bzrlib/builtins.py:2275
1256
msgid ""
1257
" Note that in the case of a merge, the -c option shows the changes\n"
1258
" compared to the left hand parent. To see the changes against\n"
1259
" another parent, use::"
1260
msgstr ""
1261
1262
#: bzrlib/builtins.py:2279
1263
msgid " bzr diff -r<chosen_parent>..X"
1264
msgstr ""
1265
1266
#: bzrlib/builtins.py:2281
1267
msgid ""
1268
" The changes between the current revision and the previous revision\n"
1269
" (equivalent to -c-1 and -r-2..-1)"
1270
msgstr ""
1271
1272
#: bzrlib/builtins.py:2284
1273
msgid " bzr diff -r-2.."
1274
msgstr ""
1275
1276
#: bzrlib/builtins.py:2286
1277
msgid " Show just the differences for file NEWS::"
1278
msgstr ""
1279
1280
#: bzrlib/builtins.py:2288
1281
msgid " bzr diff NEWS"
1282
msgstr ""
1283
1284
#: bzrlib/builtins.py:2290
1285
msgid " Show the differences in working tree xxx for file NEWS::"
1286
msgstr ""
1287
1288
#: bzrlib/builtins.py:2292
1289
msgid " bzr diff xxx/NEWS"
1290
msgstr ""
1291
1292
#: bzrlib/builtins.py:2294
1293
msgid " Show the differences from branch xxx to this working tree:"
1294
msgstr ""
1295
1296
#: bzrlib/builtins.py:2296
1297
msgid " bzr diff --old xxx"
1298
msgstr ""
1299
1300
#: bzrlib/builtins.py:2298
1301
msgid " Show the differences between two branches for file NEWS::"
1302
msgstr ""
1303
1304
#: bzrlib/builtins.py:2300
1305
msgid " bzr diff --old xxx --new yyy NEWS"
1306
msgstr ""
1307
1308
#: bzrlib/builtins.py:2302
1309
msgid " Same as 'bzr diff' but prefix paths with old/ and new/::"
1310
msgstr ""
1311
1312
#: bzrlib/builtins.py:2304
1313
msgid ""
1314
" bzr diff --prefix old/:new/\n"
1315
" \n"
1316
" Show the differences using a custom diff program with options::\n"
1317
" \n"
1318
" bzr diff --using /usr/bin/diff --diff-options -wu"
1319
msgstr ""
1320
1321
#: bzrlib/builtins.py:2314
1322
msgid "Pass these options to the external diff program."
1323
msgstr ""
1324
1325
#: bzrlib/builtins.py:2317
1326
msgid ""
1327
"Set prefixes added to old and new filenames, as two values separated by a "
1328
"colon. (eg \"old/:new/\")."
1329
msgstr ""
1330
1331
#: bzrlib/builtins.py:2320
1332
msgid "Branch/tree to compare from."
1333
msgstr ""
1334
1335
#: bzrlib/builtins.py:2324
1336
msgid "Branch/tree to compare to."
1337
msgstr ""
1338
1339
#: bzrlib/builtins.py:2330
1340
msgid "Use this command to compare files."
1341
msgstr ""
1342
1343
#: bzrlib/builtins.py:2335
1344
msgid "Diff format to use."
1345
msgstr ""
1346
1347
#: bzrlib/builtins.py:2337
1348
msgid "Diff format"
1349
msgstr ""
1350
1351
#: bzrlib/builtins.py:2359
1352
msgid "--prefix expects two values separated by a colon (eg \"old/:new/\")"
1353
msgstr ""
1354
1355
#: bzrlib/builtins.py:2363
1356
msgid "bzr diff --revision takes exactly one or two revision specifiers"
1357
msgstr ""
1358
1359
#: bzrlib/builtins.py:2368 bzrlib/builtins.py:2765 bzrlib/builtins.py:2778
1360
#: bzrlib/builtins.py:2786 bzrlib/builtins.py:4959
1361
msgid "{0} and {1} are mutually exclusive"
1362
msgstr ""
1363
1364
#: bzrlib/builtins.py:2388
1365
msgid ""
1366
"List files deleted in the working tree.\n"
1367
" "
1368
msgstr ""
1369
1370
#: bzrlib/builtins.py:2465
1371
msgid "Show the tree root directory."
1372
msgstr ""
1373
1374
#: bzrlib/builtins.py:2467
1375
msgid ""
1376
"The root is the nearest enclosing directory with a .bzr control\n"
1377
"directory."
1378
msgstr ""
1379
1380
#: bzrlib/builtins.py:2482
1381
msgid "The limit argument must be an integer."
1382
msgstr ""
1383
1384
#: bzrlib/builtins.py:2490
1385
msgid "The levels argument must be an integer."
1386
msgstr ""
1387
1388
#: bzrlib/builtins.py:2495
1389
msgid "Show historical log for a branch or subset of a branch."
1390
msgstr ""
1391
1392
#: bzrlib/builtins.py:2497
1393
msgid ""
1394
"log is bzr's default tool for exploring the history of a branch.\n"
1395
"The branch to use is taken from the first parameter. If no parameters\n"
1396
"are given, the branch containing the working directory is logged.\n"
1397
"Here are some simple examples::"
1398
msgstr ""
1399
1400
#: bzrlib/builtins.py:2502
1401
msgid ""
1402
" bzr log log the current branch\n"
1403
" bzr log foo.py log a file in its branch\n"
1404
" bzr log http://server/branch log a branch on a server"
1405
msgstr ""
1406
1407
#: bzrlib/builtins.py:2506
1408
msgid ""
1409
"The filtering, ordering and information shown for each revision can\n"
1410
"be controlled as explained below. By default, all revisions are\n"
1411
"shown sorted (topologically) so that newer revisions appear before\n"
1412
"older ones and descendants always appear before ancestors. If displayed,\n"
1413
"merged revisions are shown indented under the revision in which they\n"
1414
"were merged."
1415
msgstr ""
1416
1417
#: bzrlib/builtins.py:2513
1418
msgid ":Output control:"
1419
msgstr ""
1420
1421
#: bzrlib/builtins.py:2515
1422
msgid ""
1423
" The log format controls how information about each revision is\n"
1424
" displayed. The standard log formats are called ``long``, ``short``\n"
1425
" and ``line``. The default is long. See ``bzr help log-formats``\n"
1426
" for more details on log formats."
1427
msgstr ""
1428
1429
#: bzrlib/builtins.py:2520
1430
msgid ""
1431
" The following options can be used to control what information is\n"
1432
" displayed::"
1433
msgstr ""
1434
1435
#: bzrlib/builtins.py:2523
1436
msgid ""
1437
" -l N display a maximum of N revisions\n"
1438
" -n N display N levels of revisions (0 for all, 1 for collapsed)\n"
1439
" -v display a status summary (delta) for each revision\n"
1440
" -p display a diff (patch) for each revision\n"
1441
" --show-ids display revision-ids (and file-ids), not just revnos"
1442
msgstr ""
1443
1444
#: bzrlib/builtins.py:2529
1445
msgid ""
1446
" Note that the default number of levels to display is a function of the\n"
1447
" log format. If the -n option is not used, the standard log formats show\n"
1448
" just the top level (mainline)."
1449
msgstr ""
1450
1451
#: bzrlib/builtins.py:2533
1452
msgid ""
1453
" Status summaries are shown using status flags like A, M, etc. To see\n"
1454
" the changes explained using words like ``added`` and ``modified``\n"
1455
" instead, use the -vv option."
1456
msgstr ""
1457
1458
#: bzrlib/builtins.py:2537
1459
msgid ":Ordering control:"
1460
msgstr ""
1461
1462
#: bzrlib/builtins.py:2539
1463
msgid ""
1464
" To display revisions from oldest to newest, use the --forward option.\n"
1465
" In most cases, using this option will have little impact on the total\n"
1466
" time taken to produce a log, though --forward does not incrementally\n"
1467
" display revisions like --reverse does when it can."
1468
msgstr ""
1469
1470
#: bzrlib/builtins.py:2544
1471
msgid ":Revision filtering:"
1472
msgstr ""
1473
1474
#: bzrlib/builtins.py:2546
1475
msgid ""
1476
" The -r option can be used to specify what revision or range of revisions\n"
1477
" to filter against. The various forms are shown below::"
1478
msgstr ""
1479
1480
#: bzrlib/builtins.py:2549
1481
msgid ""
1482
" -rX display revision X\n"
1483
" -rX.. display revision X and later\n"
1484
" -r..Y display up to and including revision Y\n"
1485
" -rX..Y display from X to Y inclusive"
1486
msgstr ""
1487
1488
#: bzrlib/builtins.py:2554
1489
msgid ""
1490
" See ``bzr help revisionspec`` for details on how to specify X and Y.\n"
1491
" Some common examples are given below::"
1492
msgstr ""
1493
1494
#: bzrlib/builtins.py:2557
1495
msgid ""
1496
" -r-1 show just the tip\n"
1497
" -r-10.. show the last 10 mainline revisions\n"
1498
" -rsubmit:.. show what's new on this branch\n"
1499
" -rancestor:path.. show changes since the common ancestor of this\n"
1500
" branch and the one at location path\n"
1501
" -rdate:yesterday.. show changes since yesterday"
1502
msgstr ""
1503
1504
#: bzrlib/builtins.py:2564
1505
msgid ""
1506
" When logging a range of revisions using -rX..Y, log starts at\n"
1507
" revision Y and searches back in history through the primary\n"
1508
" (\"left-hand\") parents until it finds X. When logging just the\n"
1509
" top level (using -n1), an error is reported if X is not found\n"
1510
" along the way. If multi-level logging is used (-n0), X may be\n"
1511
" a nested merge revision and the log will be truncated accordingly."
1512
msgstr ""
1513
1514
#: bzrlib/builtins.py:2571
1515
msgid ":Path filtering:"
1516
msgstr ""
1517
1518
#: bzrlib/builtins.py:2573
1519
msgid ""
1520
" If parameters are given and the first one is not a branch, the log\n"
1521
" will be filtered to show only those revisions that changed the\n"
1522
" nominated files or directories."
1523
msgstr ""
1524
1525
#: bzrlib/builtins.py:2577
1526
msgid ""
1527
" Filenames are interpreted within their historical context. To log a\n"
1528
" deleted file, specify a revision range so that the file existed at\n"
1529
" the end or start of the range."
1530
msgstr ""
1531
1532
#: bzrlib/builtins.py:2581
1533
msgid ""
1534
" Historical context is also important when interpreting pathnames of\n"
1535
" renamed files/directories. Consider the following example:"
1536
msgstr ""
1537
1538
#: bzrlib/builtins.py:2584
1539
msgid ""
1540
" * revision 1: add tutorial.txt\n"
1541
" * revision 2: modify tutorial.txt\n"
1542
" * revision 3: rename tutorial.txt to guide.txt; add tutorial.txt"
1543
msgstr ""
1544
1545
#: bzrlib/builtins.py:2588
1546
msgid " In this case:"
1547
msgstr ""
1548
1549
#: bzrlib/builtins.py:2590
1550
msgid " * ``bzr log guide.txt`` will log the file added in revision 1"
1551
msgstr ""
1552
1553
#: bzrlib/builtins.py:2592
1554
msgid ""
1555
" * ``bzr log tutorial.txt`` will log the new file added in revision 3"
1556
msgstr ""
1557
1558
#: bzrlib/builtins.py:2594
1559
msgid ""
1560
" * ``bzr log -r2 -p tutorial.txt`` will show the changes made to\n"
1561
" the original file in revision 2."
1562
msgstr ""
1563
1564
#: bzrlib/builtins.py:2597
1565
msgid ""
1566
" * ``bzr log -r2 -p guide.txt`` will display an error message as there\n"
1567
" was no file called guide.txt in revision 2."
1568
msgstr ""
1569
1570
#: bzrlib/builtins.py:2600
1571
msgid ""
1572
" Renames are always followed by log. By design, there is no need to\n"
1573
" explicitly ask for this (and no way to stop logging a file back\n"
1574
" until it was last renamed)."
1575
msgstr ""
1576
1577
#: bzrlib/builtins.py:2604
1578
msgid ":Other filtering:"
1579
msgstr ""
1580
1581
#: bzrlib/builtins.py:2606
1582
msgid ""
1583
" The --match option can be used for finding revisions that match a\n"
1584
" regular expression in a commit message, committer, author or bug.\n"
1585
" Specifying the option several times will match any of the supplied\n"
1586
" expressions. --match-author, --match-bugs, --match-committer and\n"
1587
" --match-message can be used to only match a specific field."
1588
msgstr ""
1589
1590
#: bzrlib/builtins.py:2612
1591
msgid ":Tips & tricks:"
1592
msgstr ""
1593
1594
#: bzrlib/builtins.py:2614
1595
msgid ""
1596
" GUI tools and IDEs are often better at exploring history than command\n"
1597
" line tools: you may prefer qlog or viz from qbzr or bzr-gtk, the\n"
1598
" bzr-explorer shell, or the Loggerhead web interface. See the Plugin\n"
1599
" Guide <http://doc.bazaar.canonical.com/plugins/en/> and\n"
1600
" <http://wiki.bazaar.canonical.com/IDEIntegration>. "
1601
msgstr ""
1602
1603
#: bzrlib/builtins.py:2620
1604
msgid ""
1605
" You may find it useful to add the aliases below to ``bazaar.conf``::"
1606
msgstr ""
1607
1608
#: bzrlib/builtins.py:2622
1609
msgid ""
1610
" [ALIASES]\n"
1611
" tip = log -r-1\n"
1612
" top = log -l10 --line\n"
1613
" show = log -v -p"
1614
msgstr ""
1615
1616
#: bzrlib/builtins.py:2627
1617
msgid ""
1618
" ``bzr tip`` will then show the latest revision while ``bzr top``\n"
1619
" will show the last 10 mainline revisions. To see the details of a\n"
1620
" particular revision X, ``bzr show -rX``."
1621
msgstr ""
1622
1623
#: bzrlib/builtins.py:2631
1624
msgid ""
1625
" If you are interested in looking deeper into a particular merge X,\n"
1626
" use ``bzr log -n0 -rX``."
1627
msgstr ""
1628
1629
#: bzrlib/builtins.py:2634
1630
msgid ""
1631
" ``bzr log -v`` on a branch with lots of history is currently\n"
1632
" very slow. A fix for this issue is currently under development.\n"
1633
" With or without that fix, it is recommended that a revision range\n"
1634
" be given when using the -v option."
1635
msgstr ""
1636
1637
#: bzrlib/builtins.py:2639
1638
msgid ""
1639
" bzr has a generic full-text matching plugin, bzr-search, that can be\n"
1640
" used to find revisions matching user names, commit messages, etc.\n"
1641
" Among other features, this plugin can find all revisions containing\n"
1642
" a list of words but not others."
1643
msgstr ""
1644
1645
#: bzrlib/builtins.py:2644
1646
msgid ""
1647
" When exploring non-mainline history on large projects with deep\n"
1648
" history, the performance of log can be greatly improved by installing\n"
1649
" the historycache plugin. This plugin buffers historical information\n"
1650
" trading disk space for faster speed."
1651
msgstr ""
1652
1653
#: bzrlib/builtins.py:2653
1654
msgid "Show from oldest to newest."
1655
msgstr ""
1656
1657
#: bzrlib/builtins.py:2656
1658
msgid "Show files changed in each revision."
1659
msgstr ""
1660
1661
#: bzrlib/builtins.py:2662
1662
msgid "Show just the specified revision. See also \"help revisionspec\"."
1663
msgstr ""
1664
1665
#: bzrlib/builtins.py:2666
1666
msgid "What names to list as authors - first, all or committer."
1667
msgstr ""
1668
1669
#: bzrlib/builtins.py:2667
1670
msgid "Authors"
1671
msgstr ""
1672
1673
#: bzrlib/builtins.py:2672
1674
msgid "Number of levels to display - 0 for all, 1 for flat."
1675
msgstr ""
1676
1677
#: bzrlib/builtins.py:2682
1678
msgid "Limit the output to the first N revisions."
1679
msgstr ""
1680
1681
#: bzrlib/builtins.py:2687
1682
msgid "Show changes made in each revision as a patch."
1683
msgstr ""
1684
1685
#: bzrlib/builtins.py:2689
1686
msgid "Show merged revisions like --levels 0 does."
1687
msgstr ""
1688
1689
#: bzrlib/builtins.py:2693
1690
msgid "Do not report commits with more than one parent."
1691
msgstr ""
1692
1693
#: bzrlib/builtins.py:2695
1694
msgid ""
1695
"Display only the revisions that are not part of both ancestries (require -"
1696
"rX..Y)."
1697
msgstr ""
1698
1699
#: bzrlib/builtins.py:2699
1700
msgid "Show digital signature validity."
1701
msgstr ""
1702
1703
#: bzrlib/builtins.py:2702
1704
msgid "Show revisions whose properties match this expression."
1705
msgstr ""
1706
1707
#: bzrlib/builtins.py:2706
1708
msgid "Show revisions whose message matches this expression."
1709
msgstr ""
1710
1711
#: bzrlib/builtins.py:2710
1712
msgid "Show revisions whose committer matches this expression."
1713
msgstr ""
1714
1715
#: bzrlib/builtins.py:2714
1716
msgid "Show revisions whose authors match this expression."
1717
msgstr ""
1718
1719
#: bzrlib/builtins.py:2718
1720
msgid "Show revisions whose bugs match this expression."
1721
msgstr ""
1722
1723
#: bzrlib/builtins.py:2772
1724
msgid "--exclude-common-ancestry requires -r with two revisions"
1725
msgstr ""
1726
1727
#: bzrlib/builtins.py:2800
1728
#, python-format
1729
msgid "Path unknown at end or start of revision range: %s"
1730
msgstr ""
1731
1732
#: bzrlib/builtins.py:2917
1733
#, python-format
1734
msgid "bzr %s doesn't accept two revisions in different branches."
1735
msgstr ""
1736
1737
#: bzrlib/builtins.py:2933
1738
#, python-format
1739
msgid "bzr %s --revision takes one or two values."
1740
msgstr ""
1741
1742
#: bzrlib/builtins.py:2978
1743
msgid ""
1744
"List files in a tree.\n"
1745
" "
1746
msgstr ""
1747
1748
#: bzrlib/builtins.py:2987
1749
msgid "Recurse into subdirectories."
1750
msgstr ""
1751
1752
#: bzrlib/builtins.py:2989
1753
msgid "Print paths relative to the root of the branch."
1754
msgstr ""
1755
1756
#: bzrlib/builtins.py:2991
1757
msgid "Print unknown files."
1758
msgstr ""
1759
1760
#: bzrlib/builtins.py:2992
1761
msgid "Print versioned files."
1762
msgstr ""
1763
1764
#: bzrlib/builtins.py:2995
1765
msgid "Print ignored files."
1766
msgstr ""
1767
1768
#: bzrlib/builtins.py:2997
1769
msgid "List entries of a particular kind: file, directory, symlink."
1770
msgstr ""
1771
1772
#: bzrlib/builtins.py:3010
1773
msgid "invalid kind specified"
1774
msgstr ""
1775
1776
#: bzrlib/builtins.py:3013
1777
msgid "Cannot set both --verbose and --null"
1778
msgstr ""
1779
1780
#: bzrlib/builtins.py:3022
1781
msgid "cannot specify both --from-root and PATH"
1782
msgstr ""
1783
1784
#: bzrlib/builtins.py:3109
1785
msgid "Ignore specified files or patterns."
1786
msgstr ""
1787
1788
#: bzrlib/builtins.py:3111
1789
msgid "See ``bzr help patterns`` for details on the syntax of patterns."
1790
msgstr ""
1791
1792
#: bzrlib/builtins.py:3113
1793
msgid ""
1794
"If a .bzrignore file does not exist, the ignore command\n"
1795
"will create one and add the specified files or patterns to the newly\n"
1796
"created file. The ignore command will also automatically add the \n"
1797
".bzrignore file to be versioned. Creating a .bzrignore file without\n"
1798
"the use of the ignore command will require an explicit add command."
1799
msgstr ""
1800
1801
#: bzrlib/builtins.py:3119
1802
msgid ""
1803
"To remove patterns from the ignore list, edit the .bzrignore file.\n"
1804
"After adding, editing or deleting that file either indirectly by\n"
1805
"using this command or directly by using an editor, be sure to commit\n"
1806
"it."
1807
msgstr ""
1808
1809
#: bzrlib/builtins.py:3124
1810
msgid ""
1811
"Bazaar also supports a global ignore file ~/.bazaar/ignore. On Windows\n"
1812
"the global ignore file can be found in the application data directory as\n"
1813
"C:\\Documents and Settings\\<user>\\Application Data\\Bazaar\\2.0\\ignore.\n"
1814
"Global ignores are not touched by this command. The global ignore file\n"
1815
"can be edited directly using an editor."
1816
msgstr ""
1817
1818
#: bzrlib/builtins.py:3130
1819
msgid ""
1820
"Patterns prefixed with '!' are exceptions to ignore patterns and take\n"
1821
"precedence over regular ignores. Such exceptions are used to specify\n"
1822
"files that should be versioned which would otherwise be ignored."
1823
msgstr ""
1824
1825
#: bzrlib/builtins.py:3134
1826
msgid ""
1827
"Patterns prefixed with '!!' act as regular ignore patterns, but have\n"
1828
"precedence over the '!' exception patterns."
1829
msgstr ""
1830
1831
#: bzrlib/builtins.py:3137
1832
msgid ""
1833
":Notes: \n"
1834
" \n"
1835
"* Ignore patterns containing shell wildcards must be quoted from\n"
1836
" the shell on Unix."
1837
msgstr ""
1838
1839
#: bzrlib/builtins.py:3142
1840
msgid ""
1841
"* Ignore patterns starting with \"#\" act as comments in the ignore file.\n"
1842
" To ignore patterns that begin with that character, use the \"RE:\" prefix."
1843
msgstr ""
1844
1845
#: bzrlib/builtins.py:3145
1846
msgid ""
1847
":Examples:\n"
1848
" Ignore the top level Makefile::"
1849
msgstr ""
1850
1851
#: bzrlib/builtins.py:3148
1852
msgid " bzr ignore ./Makefile"
1853
msgstr ""
1854
1855
#: bzrlib/builtins.py:3150
1856
msgid " Ignore .class files in all directories...::"
1857
msgstr ""
1858
1859
#: bzrlib/builtins.py:3152
1860
msgid " bzr ignore \"*.class\""
1861
msgstr ""
1862
1863
#: bzrlib/builtins.py:3154
1864
msgid " ...but do not ignore \"special.class\"::"
1865
msgstr ""
1866
1867
#: bzrlib/builtins.py:3156
1868
msgid " bzr ignore \"!special.class\""
1869
msgstr ""
1870
1871
#: bzrlib/builtins.py:3158
1872
msgid " Ignore files whose name begins with the \"#\" character::"
1873
msgstr ""
1874
1875
#: bzrlib/builtins.py:3160
1876
msgid " bzr ignore \"RE:^#\""
1877
msgstr ""
1878
1879
#: bzrlib/builtins.py:3162 bzrlib/builtins.py:3166
1880
msgid " Ignore .o files under the lib directory::"
1881
msgstr ""
1882
1883
#: bzrlib/builtins.py:3164
1884
msgid " bzr ignore \"lib/**/*.o\""
1885
msgstr ""
1886
1887
#: bzrlib/builtins.py:3168
1888
msgid " bzr ignore \"RE:lib/.*\\.o\""
1889
msgstr ""
1890
1891
#: bzrlib/builtins.py:3170
1892
msgid " Ignore everything but the \"debian\" toplevel directory::"
1893
msgstr ""
1894
1895
#: bzrlib/builtins.py:3172
1896
msgid ""
1897
" bzr ignore \"RE:(?!debian/).*\"\n"
1898
" \n"
1899
" Ignore everything except the \"local\" toplevel directory,\n"
1900
" but always ignore autosave files ending in ~, even under local/::\n"
1901
" \n"
1902
" bzr ignore \"*\"\n"
1903
" bzr ignore \"!./local\"\n"
1904
" bzr ignore \"!!*~\""
1905
msgstr ""
1906
1907
#: bzrlib/builtins.py:3186
1908
msgid "Display the default ignore rules that bzr uses."
1909
msgstr ""
1910
1911
#: bzrlib/builtins.py:3198
1912
msgid "ignore requires at least one NAME_PATTERN or --default-rules."
1913
msgstr ""
1914
1915
#: bzrlib/builtins.py:3209
1916
#, python-format
1917
msgid "Invalid ignore pattern found. %s"
1918
msgid_plural "Invalid ignore patterns found. %s"
1919
msgstr[0] ""
1920
msgstr[1] ""
1921
1922
#: bzrlib/builtins.py:3218
1923
msgid "NAME_PATTERN should not be an absolute path"
1924
msgstr ""
1925
1926
#: bzrlib/builtins.py:3231
1927
#, python-format
1928
msgid ""
1929
"Warning: the following files are version controlled and match your ignore "
1930
"pattern:\n"
1931
"%s\n"
1932
"These files will continue to be version controlled unless you 'bzr remove' "
1933
"them.\n"
1934
msgstr ""
1935
1936
#: bzrlib/builtins.py:3238
1937
msgid "List ignored files and the patterns that matched them."
1938
msgstr ""
1939
1940
#: bzrlib/builtins.py:3240
1941
msgid ""
1942
"List all the ignored files and the ignore pattern that caused the file to\n"
1943
"be ignored."
1944
msgstr ""
1945
1946
#: bzrlib/builtins.py:3243
1947
msgid "Alternatively, to list just the files::"
1948
msgstr ""
1949
1950
#: bzrlib/builtins.py:3245
1951
msgid " bzr ls --ignored"
1952
msgstr ""
1953
1954
#: bzrlib/builtins.py:3279
1955
#, python-format
1956
msgid "not a valid revision-number: %r"
1957
msgstr ""
1958
1959
#: bzrlib/builtins.py:3286
1960
msgid ""
1961
"Export current or past revision to a destination directory or archive."
1962
msgstr ""
1963
1964
#: bzrlib/builtins.py:3288
1965
msgid "If no revision is specified this exports the last committed revision."
1966
msgstr ""
1967
1968
#: bzrlib/builtins.py:3290
1969
msgid ""
1970
"Format may be an \"exporter\" name, such as tar, tgz, tbz2. If none is\n"
1971
"given, try to find the format with the extension. If no extension\n"
1972
"is found exports to a directory (equivalent to --format=dir)."
1973
msgstr ""
1974
1975
#: bzrlib/builtins.py:3294
1976
msgid ""
1977
"If root is supplied, it will be used as the root directory inside\n"
1978
"container formats (tar, zip, etc). If it is not supplied it will default\n"
1979
"to the exported filename. The root option has no effect for 'dir' format."
1980
msgstr ""
1981
1982
#: bzrlib/builtins.py:3298
1983
msgid ""
1984
"If branch is omitted then the branch containing the current working\n"
1985
"directory will be used."
1986
msgstr ""
1987
1988
#: bzrlib/builtins.py:3301
1989
msgid ""
1990
"Note: Export of tree with non-ASCII filenames to zip is not supported."
1991
msgstr ""
1992
1993
#: bzrlib/builtins.py:3303
1994
msgid ""
1995
" ================= =========================\n"
1996
" Supported formats Autodetected by extension\n"
1997
" ================= =========================\n"
1998
" dir (none)\n"
1999
" tar .tar\n"
2000
" tbz2 .tar.bz2, .tbz2\n"
2001
" tgz .tar.gz, .tgz\n"
2002
" zip .zip\n"
2003
" ================= ========================="
2004
msgstr ""
2005
2006
#: bzrlib/builtins.py:3317
2007
msgid "Type of file to export to."
2008
msgstr ""
2009
2010
#: bzrlib/builtins.py:3320
2011
msgid "Apply content filters to export the convenient form."
2012
msgstr ""
2013
2014
#: bzrlib/builtins.py:3324
2015
msgid "Name of the root directory inside the exported file."
2016
msgstr ""
2017
2018
#: bzrlib/builtins.py:3326
2019
msgid ""
2020
"Set modification time of files to that of the last revision in which it was "
2021
"changed."
2022
msgstr ""
2023
2024
#: bzrlib/builtins.py:3329
2025
msgid ""
2026
"Export the working tree contents rather than that of the last revision."
2027
msgstr ""
2028
2029
#: bzrlib/builtins.py:3348
2030
msgid "--uncommitted requires a working tree"
2031
msgstr ""
2032
2033
#: bzrlib/builtins.py:3357
2034
#, python-format
2035
msgid "Unsupported export format: %s"
2036
msgstr ""
2037
2038
#: bzrlib/builtins.py:3361
2039
msgid ""
2040
"Write the contents of a file as of a given revision to standard output."
2041
msgstr ""
2042
2043
#: bzrlib/builtins.py:3363
2044
msgid "If no revision is nominated, the last revision is used."
2045
msgstr ""
2046
2047
#: bzrlib/builtins.py:3365
2048
msgid ""
2049
"Note: Take care to redirect standard output when using this command on a\n"
2050
"binary file."
2051
msgstr ""
2052
2053
#: bzrlib/builtins.py:3371
2054
msgid "The path name in the old tree."
2055
msgstr ""
2056
2057
#: bzrlib/builtins.py:3372
2058
msgid "Apply content filters to display the convenience form."
2059
msgstr ""
2060
2061
#: bzrlib/builtins.py:3383
2062
msgid "bzr cat --revision takes exactly one revision specifier"
2063
msgstr ""
2064
2065
#: bzrlib/builtins.py:3408 bzrlib/builtins.py:3420
2066
msgid "{0!r} is not present in revision {1}"
2067
msgstr ""
2068
2069
#: bzrlib/builtins.py:3443
2070
msgid "Commit changes into a new revision."
2071
msgstr ""
2072
2073
#: bzrlib/builtins.py:3445
2074
msgid ""
2075
"An explanatory message needs to be given for each commit. This is\n"
2076
"often done by using the --message option (getting the message from the\n"
2077
"command line) or by using the --file option (getting the message from\n"
2078
"a file). If neither of these options is given, an editor is opened for\n"
2079
"the user to enter the message. To see the changed files in the\n"
2080
"boilerplate text loaded into the editor, use the --show-diff option."
2081
msgstr ""
2082
2083
#: bzrlib/builtins.py:3452
2084
msgid ""
2085
"By default, the entire tree is committed and the person doing the\n"
2086
"commit is assumed to be the author. These defaults can be overridden\n"
2087
"as explained below."
2088
msgstr ""
2089
2090
#: bzrlib/builtins.py:3456
2091
msgid ":Selective commits:"
2092
msgstr ""
2093
2094
#: bzrlib/builtins.py:3458
2095
msgid ""
2096
" If selected files are specified, only changes to those files are\n"
2097
" committed. If a directory is specified then the directory and\n"
2098
" everything within it is committed."
2099
msgstr ""
2100
2101
#: bzrlib/builtins.py:3462
2102
msgid ""
2103
" When excludes are given, they take precedence over selected files.\n"
2104
" For example, to commit only changes within foo, but not changes\n"
2105
" within foo/bar::"
2106
msgstr ""
2107
2108
#: bzrlib/builtins.py:3466
2109
msgid " bzr commit foo -x foo/bar"
2110
msgstr ""
2111
2112
#: bzrlib/builtins.py:3468
2113
msgid " A selective commit after a merge is not yet supported."
2114
msgstr ""
2115
2116
#: bzrlib/builtins.py:3470
2117
msgid ":Custom authors:"
2118
msgstr ""
2119
2120
#: bzrlib/builtins.py:3472
2121
msgid ""
2122
" If the author of the change is not the same person as the committer,\n"
2123
" you can specify the author's name using the --author option. The\n"
2124
" name should be in the same format as a committer-id, e.g.\n"
2125
" \"John Doe <jdoe@example.com>\". If there is more than one author of\n"
2126
" the change you can specify the option multiple times, once for each\n"
2127
" author."
2128
msgstr ""
2129
2130
#: bzrlib/builtins.py:3479
2131
msgid ":Checks:"
2132
msgstr ""
2133
2134
#: bzrlib/builtins.py:3481
2135
msgid ""
2136
" A common mistake is to forget to add a new file or directory before\n"
2137
" running the commit command. The --strict option checks for unknown\n"
2138
" files and aborts the commit if any are found. More advanced pre-commit\n"
2139
" checks can be implemented by defining hooks. See ``bzr help hooks``\n"
2140
" for details."
2141
msgstr ""
2142
2143
#: bzrlib/builtins.py:3487
2144
msgid ":Things to note:"
2145
msgstr ""
2146
2147
#: bzrlib/builtins.py:3489
2148
msgid ""
2149
" If you accidentially commit the wrong changes or make a spelling\n"
2150
" mistake in the commit message say, you can use the uncommit command\n"
2151
" to undo it. See ``bzr help uncommit`` for details."
2152
msgstr ""
2153
2154
#: bzrlib/builtins.py:3493
2155
msgid ""
2156
" Hooks can also be configured to run after a commit. This allows you\n"
2157
" to trigger updates to external systems like bug trackers. The --fixes\n"
2158
" option can be used to record the association between a revision and\n"
2159
" one or more bugs. See ``bzr help bugs`` for details."
2160
msgstr ""
2161
2162
#: bzrlib/builtins.py:3503
2163
msgid "Do not consider changes made to a given path."
2164
msgstr ""
2165
2166
#: bzrlib/builtins.py:3506
2167
msgid "Description of the new revision."
2168
msgstr ""
2169
2170
#: bzrlib/builtins.py:3509
2171
msgid "Commit even if nothing has changed."
2172
msgstr ""
2173
2174
#: bzrlib/builtins.py:3513
2175
msgid "Take commit message from this file."
2176
msgstr ""
2177
2178
#: bzrlib/builtins.py:3515
2179
msgid "Refuse to commit if there are unknown files in the working tree."
2180
msgstr ""
2181
2182
#: bzrlib/builtins.py:3518
2183
msgid ""
2184
"Manually set a commit time using commit date format, e.g. '2009-10-10 "
2185
"08:00:00 +0100'."
2186
msgstr ""
2187
2188
#: bzrlib/builtins.py:3521
2189
msgid "Mark a bug as being fixed by this revision (see \"bzr help bugs\")."
2190
msgstr ""
2191
2192
#: bzrlib/builtins.py:3524
2193
msgid "Set the author's name, if it's different from the committer."
2194
msgstr ""
2195
2196
#: bzrlib/builtins.py:3527
2197
msgid ""
2198
"Perform a local commit in a bound branch. Local commits are not pushed to "
2199
"the master branch until a normal commit is performed."
2200
msgstr ""
2201
2202
#: bzrlib/builtins.py:3533
2203
msgid ""
2204
"When no message is supplied, show the diff along with the status summary in "
2205
"the message editor."
2206
msgstr ""
2207
2208
#: bzrlib/builtins.py:3536
2209
msgid ""
2210
"When committing to a foreign version control system do not push data that "
2211
"can not be natively represented."
2212
msgstr ""
2213
2214
#: bzrlib/builtins.py:3554
2215
#, python-format
2216
msgid ""
2217
"No tracker specified for bug %s. Use the form 'tracker:id' or specify a "
2218
"default bug tracker using the `bugtracker` option.\n"
2219
"See \"bzr help bugs\" for more information on this feature. Commit refused."
2220
msgstr ""
2221
2222
#: bzrlib/builtins.py:3563
2223
#, python-format
2224
msgid ""
2225
"Invalid bug %s. Must be in the form of 'tracker:id'. See \"bzr help bugs\" "
2226
"for more information on this feature.\n"
2227
"Commit refused."
2228
msgstr ""
2229
2230
#: bzrlib/builtins.py:3572
2231
#, python-format
2232
msgid "Unrecognized bug %s. Commit refused."
2233
msgstr ""
2234
2235
#: bzrlib/builtins.py:3575
2236
#, python-format
2237
msgid ""
2238
"%s\n"
2239
"Commit refused."
2240
msgstr ""
2241
2242
#: bzrlib/builtins.py:3599
2243
msgid "Could not parse --commit-time: "
2244
msgstr ""
2245
2246
#: bzrlib/builtins.py:3639
2247
msgid "please specify either --message or --file"
2248
msgstr ""
2249
2250
#: bzrlib/builtins.py:3668
2251
msgid "please specify a commit message with either --message or --file"
2252
msgstr ""
2253
2254
#: bzrlib/builtins.py:3671
2255
msgid ""
2256
"Empty commit message specified. Please specify a commit message with either -"
2257
"-message or --file or leave a blank message with --message \"\"."
2258
msgstr ""
2259
2260
#: bzrlib/builtins.py:3691
2261
msgid ""
2262
"No changes to commit. Please 'bzr add' the files you want to commit, or use -"
2263
"-unchanged to force an empty commit."
2264
msgstr ""
2265
2266
#: bzrlib/builtins.py:3695
2267
msgid ""
2268
"Conflicts detected in working tree. Use \"bzr conflicts\" to list, \"bzr "
2269
"resolve FILE\" to resolve."
2270
msgstr ""
2271
2272
#: bzrlib/builtins.py:3699
2273
msgid "Commit refused because there are unknown files in the working tree."
2274
msgstr ""
2275
2276
#: bzrlib/builtins.py:3702
2277
msgid ""
2278
"\n"
2279
"To commit to master branch, run update and then commit.\n"
2280
"You can also pass --local to commit to continue working disconnected."
2281
msgstr ""
2282
2283
#: bzrlib/builtins.py:3710
2284
msgid ""
2285
"Validate working tree structure, branch consistency and repository history."
2286
msgstr ""
2287
2288
#: bzrlib/builtins.py:3712
2289
msgid ""
2290
"This command checks various invariants about branch and repository storage\n"
2291
"to detect data corruption or bzr bugs."
2292
msgstr ""
2293
2294
#: bzrlib/builtins.py:3715
2295
msgid ""
2296
"The working tree and branch checks will only give output if a problem is\n"
2297
"detected. The output fields of the repository check are:"
2298
msgstr ""
2299
2300
#: bzrlib/builtins.py:3718
2301
msgid ""
2302
"revisions\n"
2303
" This is just the number of revisions checked. It doesn't\n"
2304
" indicate a problem."
2305
msgstr ""
2306
2307
#: bzrlib/builtins.py:3722
2308
msgid ""
2309
"versionedfiles\n"
2310
" This is just the number of versionedfiles checked. It\n"
2311
" doesn't indicate a problem."
2312
msgstr ""
2313
2314
#: bzrlib/builtins.py:3726
2315
msgid ""
2316
"unreferenced ancestors\n"
2317
" Texts that are ancestors of other texts, but\n"
2318
" are not properly referenced by the revision ancestry. This is a\n"
2319
" subtle problem that Bazaar can work around."
2320
msgstr ""
2321
2322
#: bzrlib/builtins.py:3731
2323
msgid ""
2324
"unique file texts\n"
2325
" This is the total number of unique file contents\n"
2326
" seen in the checked revisions. It does not indicate a problem."
2327
msgstr ""
2328
2329
#: bzrlib/builtins.py:3735
2330
msgid ""
2331
"repeated file texts\n"
2332
" This is the total number of repeated texts seen\n"
2333
" in the checked revisions. Texts can be repeated when their file\n"
2334
" entries are modified, but the file contents are not. It does not\n"
2335
" indicate a problem."
2336
msgstr ""
2337
2338
#: bzrlib/builtins.py:3741
2339
msgid ""
2340
"If no restrictions are specified, all Bazaar data that is found at the "
2341
"given\n"
2342
"location will be checked."
2343
msgstr ""
2344
2345
#: bzrlib/builtins.py:3746
2346
msgid " Check the tree and branch at 'foo'::"
2347
msgstr ""
2348
2349
#: bzrlib/builtins.py:3748
2350
msgid " bzr check --tree --branch foo"
2351
msgstr ""
2352
2353
#: bzrlib/builtins.py:3750
2354
msgid " Check only the repository at 'bar'::"
2355
msgstr ""
2356
2357
#: bzrlib/builtins.py:3752
2358
msgid " bzr check --repo bar"
2359
msgstr ""
2360
2361
#: bzrlib/builtins.py:3754
2362
msgid " Check everything at 'baz'::"
2363
msgstr ""
2364
2365
#: bzrlib/builtins.py:3756
2366
msgid " bzr check baz"
2367
msgstr ""
2368
2369
#: bzrlib/builtins.py:3762
2370
msgid "Check the branch related to the current directory."
2371
msgstr ""
2372
2373
#: bzrlib/builtins.py:3764
2374
msgid "Check the repository related to the current directory."
2375
msgstr ""
2376
2377
#: bzrlib/builtins.py:3766
2378
msgid "Check the working tree related to the current directory."
2379
msgstr ""
2380
2381
#: bzrlib/builtins.py:3780
2382
msgid "Upgrade a repository, branch or working tree to a newer format."
2383
msgstr ""
2384
2385
#: bzrlib/builtins.py:3782
2386
msgid ""
2387
"When the default format has changed after a major new release of\n"
2388
"Bazaar, you may be informed during certain operations that you\n"
2389
"should upgrade. Upgrading to a newer format may improve performance\n"
2390
"or make new features available. It may however limit interoperability\n"
2391
"with older repositories or with older versions of Bazaar."
2392
msgstr ""
2393
2394
#: bzrlib/builtins.py:3788
2395
msgid ""
2396
"If you wish to upgrade to a particular format rather than the\n"
2397
"current default, that can be specified using the --format option.\n"
2398
"As a consequence, you can use the upgrade command this way to\n"
2399
"\"downgrade\" to an earlier format, though some conversions are\n"
2400
"a one way process (e.g. changing from the 1.x default to the\n"
2401
"2.x default) so downgrading is not always possible."
2402
msgstr ""
2403
2404
#: bzrlib/builtins.py:3795
2405
msgid ""
2406
"A backup.bzr.~#~ directory is created at the start of the conversion\n"
2407
"process (where # is a number). By default, this is left there on\n"
2408
"completion. If the conversion fails, delete the new .bzr directory\n"
2409
"and rename this one back in its place. Use the --clean option to ask\n"
2410
"for the backup.bzr directory to be removed on successful conversion.\n"
2411
"Alternatively, you can delete it by hand if everything looks good\n"
2412
"afterwards."
2413
msgstr ""
2414
2415
#: bzrlib/builtins.py:3803
2416
msgid ""
2417
"If the location given is a shared repository, dependent branches\n"
2418
"are also converted provided the repository converts successfully.\n"
2419
"If the conversion of a branch fails, remaining branches are still\n"
2420
"tried."
2421
msgstr ""
2422
2423
#: bzrlib/builtins.py:3808
2424
msgid ""
2425
"For more information on upgrades, see the Bazaar Upgrade Guide,\n"
2426
"http://doc.bazaar.canonical.com/latest/en/upgrade-guide/."
2427
msgstr ""
2428
2429
#: bzrlib/builtins.py:3816
2430
msgid "Upgrade to a specific format. See \"bzr help formats\" for details."
2431
msgstr ""
2432
2433
#: bzrlib/builtins.py:3820
2434
msgid "Branch format"
2435
msgstr ""
2436
2437
#: bzrlib/builtins.py:3822
2438
msgid "Remove the backup.bzr directory if successful."
2439
msgstr ""
2440
2441
#: bzrlib/builtins.py:3824
2442
msgid "Show what would be done, but don't actually do anything."
2443
msgstr ""
2444
2445
#: bzrlib/builtins.py:3839
2446
msgid "Show or set bzr user id."
2447
msgstr ""
2448
2449
#: bzrlib/builtins.py:3841
2450
msgid ""
2451
":Examples:\n"
2452
" Show the email of the current user::"
2453
msgstr ""
2454
2455
#: bzrlib/builtins.py:3844
2456
msgid " bzr whoami --email"
2457
msgstr ""
2458
2459
#: bzrlib/builtins.py:3846
2460
msgid " Set the current user::"
2461
msgstr ""
2462
2463
#: bzrlib/builtins.py:3848
2464
msgid " bzr whoami \"Frank Chu <fchu@example.com>\""
2465
msgstr ""
2466
2467
#: bzrlib/builtins.py:3852
2468
msgid "Display email address only."
2469
msgstr ""
2470
2471
#: bzrlib/builtins.py:3854
2472
msgid "Set identity for the current branch instead of globally."
2473
msgstr ""
2474
2475
#: bzrlib/builtins.py:3880
2476
msgid "--email can only be used to display existing identity"
2477
msgstr ""
2478
2479
#: bzrlib/builtins.py:3904
2480
msgid "Print or set the branch nickname."
2481
msgstr ""
2482
2483
#: bzrlib/builtins.py:3906
2484
msgid ""
2485
"If unset, the colocated branch name is used for colocated branches, and\n"
2486
"the branch directory name is used for other branches. To print the\n"
2487
"current nickname, execute with no argument."
2488
msgstr ""
2489
2490
#: bzrlib/builtins.py:3910
2491
msgid ""
2492
"Bound branches use the nickname of its master branch unless it is set\n"
2493
"locally."
2494
msgstr ""
2495
2496
#: bzrlib/builtins.py:3930
2497
msgid "Set/unset and display aliases."
2498
msgstr ""
2499
2500
#: bzrlib/builtins.py:3932
2501
msgid ""
2502
":Examples:\n"
2503
" Show the current aliases::"
2504
msgstr ""
2505
2506
#: bzrlib/builtins.py:3935
2507
msgid " bzr alias"
2508
msgstr ""
2509
2510
#: bzrlib/builtins.py:3937
2511
msgid " Show the alias specified for 'll'::"
2512
msgstr ""
2513
2514
#: bzrlib/builtins.py:3939
2515
msgid " bzr alias ll"
2516
msgstr ""
2517
2518
#: bzrlib/builtins.py:3941
2519
msgid " Set an alias for 'll'::"
2520
msgstr ""
2521
2522
#: bzrlib/builtins.py:3943
2523
msgid " bzr alias ll=\"log --line -r-10..-1\""
2524
msgstr ""
2525
2526
#: bzrlib/builtins.py:3945
2527
msgid " To remove an alias for 'll'::"
2528
msgstr ""
2529
2530
#: bzrlib/builtins.py:3947
2531
msgid " bzr alias --remove ll"
2532
msgstr ""
2533
2534
#: bzrlib/builtins.py:3952
2535
msgid "Remove the alias."
2536
msgstr ""
2537
2538
#: bzrlib/builtins.py:3970
2539
msgid "bzr alias --remove expects an alias to remove."
2540
msgstr ""
2541
2542
#: bzrlib/builtins.py:4151
2543
msgid ""
2544
"subunit not available. subunit needs to be installed to use --subunit."
2545
msgstr ""
2546
2547
#: bzrlib/builtins.py:4168
2548
msgid ""
2549
"--benchmark is no longer supported from bzr 2.2; use bzr-usertest instead"
2550
msgstr ""
2551
2552
#: bzrlib/builtins.py:4215
2553
msgid "Show version of bzr."
2554
msgstr ""
2555
2556
#: bzrlib/builtins.py:4219
2557
msgid "Print just the version number."
2558
msgstr ""
2559
2560
#: bzrlib/builtins.py:4238
2561
msgid "It sure does!\n"
2562
msgstr ""
2563
2564
#: bzrlib/builtins.py:4262
2565
#, python-format
2566
msgid "merge base is revision %s\n"
2567
msgstr ""
2568
2569
#: bzrlib/builtins.py:4266
2570
msgid "Perform a three-way merge."
2571
msgstr ""
2572
2573
#: bzrlib/builtins.py:4268
2574
msgid ""
2575
"The source of the merge can be specified either in the form of a branch,\n"
2576
"or in the form of a path to a file containing a merge directive generated\n"
2577
"with bzr send. If neither is specified, the default is the upstream branch\n"
2578
"or the branch most recently merged using --remember. The source of the\n"
2579
"merge may also be specified in the form of a path to a file in another\n"
2580
"branch: in this case, only the modifications to that file are merged into\n"
2581
"the current working tree."
2582
msgstr ""
2583
2584
#: bzrlib/builtins.py:4276
2585
msgid ""
2586
"When merging from a branch, by default bzr will try to merge in all new\n"
2587
"work from the other branch, automatically determining an appropriate base\n"
2588
"revision. If this fails, you may need to give an explicit base."
2589
msgstr ""
2590
2591
#: bzrlib/builtins.py:4280
2592
msgid ""
2593
"To pick a different ending revision, pass \"--revision OTHER\". bzr will\n"
2594
"try to merge in all new work up to and including revision OTHER."
2595
msgstr ""
2596
2597
#: bzrlib/builtins.py:4283
2598
msgid ""
2599
"If you specify two values, \"--revision BASE..OTHER\", only revisions BASE\n"
2600
"through OTHER, excluding BASE but including OTHER, will be merged. If this\n"
2601
"causes some revisions to be skipped, i.e. if the destination branch does\n"
2602
"not already contain revision BASE, such a merge is commonly referred to as\n"
2603
"a \"cherrypick\". Unlike a normal merge, Bazaar does not currently track\n"
2604
"cherrypicks. The changes look like a normal commit, and the history of the\n"
2605
"changes from the other branch is not stored in the commit."
2606
msgstr ""
2607
2608
#: bzrlib/builtins.py:4291
2609
msgid "Revision numbers are always relative to the source branch."
2610
msgstr ""
2611
2612
#: bzrlib/builtins.py:4293 bzrlib/conflicts.py:52 bzrlib/conflicts.py:106
2613
msgid ""
2614
"Merge will do its best to combine the changes in two branches, but there\n"
2615
"are some kinds of problems only a human can fix. When it encounters those,\n"
2616
"it will mark a conflict. A conflict means that you need to fix something,\n"
2617
"before you can commit."
2618
msgstr ""
2619
2620
#: bzrlib/builtins.py:4298
2621
msgid ""
2622
"Use bzr resolve when you have fixed a problem. See also bzr conflicts."
2623
msgstr ""
2624
2625
#: bzrlib/builtins.py:4300
2626
msgid ""
2627
"If there is no default branch set, the first merge will set it (use\n"
2628
"--no-remember to avoid setting it). After that, you can omit the branch\n"
2629
"to use the default. To change the default, use --remember. The value will\n"
2630
"only be saved if the remote location can be accessed."
2631
msgstr ""
2632
2633
#: bzrlib/builtins.py:4305
2634
msgid ""
2635
"The results of the merge are placed into the destination working\n"
2636
"directory, where they can be reviewed (with bzr diff), tested, and then\n"
2637
"committed to record the result of the merge."
2638
msgstr ""
2639
2640
#: bzrlib/builtins.py:4309
2641
msgid ""
2642
"merge refuses to run if there are any uncommitted changes, unless\n"
2643
"--force is given. If --force is given, then the changes from the source \n"
2644
"will be merged with the current working tree, including any uncommitted\n"
2645
"changes in the tree. The --force option can also be used to create a\n"
2646
"merge revision which has more than two parents."
2647
msgstr ""
2648
2649
#: bzrlib/builtins.py:4315
2650
msgid ""
2651
"If one would like to merge changes from the working tree of the other\n"
2652
"branch without merging any committed revisions, the --uncommitted option\n"
2653
"can be given."
2654
msgstr ""
2655
2656
#: bzrlib/builtins.py:4319
2657
msgid ""
2658
"To select only some changes to merge, use \"merge -i\", which will prompt\n"
2659
"you to apply each diff hunk and file change, similar to \"shelve\"."
2660
msgstr ""
2661
2662
#: bzrlib/builtins.py:4322
2663
msgid ""
2664
":Examples:\n"
2665
" To merge all new revisions from bzr.dev::"
2666
msgstr ""
2667
2668
#: bzrlib/builtins.py:4325
2669
msgid " bzr merge ../bzr.dev"
2670
msgstr ""
2671
2672
#: bzrlib/builtins.py:4327
2673
msgid " To merge changes up to and including revision 82 from bzr.dev::"
2674
msgstr ""
2675
2676
#: bzrlib/builtins.py:4329
2677
msgid " bzr merge -r 82 ../bzr.dev"
2678
msgstr ""
2679
2680
#: bzrlib/builtins.py:4331
2681
msgid " To merge the changes introduced by 82, without previous changes::"
2682
msgstr ""
2683
2684
#: bzrlib/builtins.py:4333
2685
msgid " bzr merge -r 81..82 ../bzr.dev"
2686
msgstr ""
2687
2688
#: bzrlib/builtins.py:4335
2689
msgid " To apply a merge directive contained in /tmp/merge::"
2690
msgstr ""
2691
2692
#: bzrlib/builtins.py:4337
2693
msgid " bzr merge /tmp/merge"
2694
msgstr ""
2695
2696
#: bzrlib/builtins.py:4339
2697
msgid ""
2698
" To create a merge revision with three parents from two branches\n"
2699
" feature1a and feature1b:"
2700
msgstr ""
2701
2702
#: bzrlib/builtins.py:4342
2703
msgid ""
2704
" bzr merge ../feature1a\n"
2705
" bzr merge ../feature1b --force\n"
2706
" bzr commit -m 'revision with three parents'"
2707
msgstr ""
2708
2709
#: bzrlib/builtins.py:4354
2710
msgid "Merge even if the destination tree has uncommitted changes."
2711
msgstr ""
2712
2713
#: bzrlib/builtins.py:4360
2714
msgid ""
2715
"Apply uncommitted changes from a working copy, instead of branch changes."
2716
msgstr ""
2717
2718
#: bzrlib/builtins.py:4362
2719
msgid ""
2720
"If the destination is already completely merged into the source, pull from "
2721
"the source rather than merging. When this happens, you do not need to "
2722
"commit the result."
2723
msgstr ""
2724
2725
#: bzrlib/builtins.py:4367
2726
msgid ""
2727
"Branch to merge into, rather than the one containing the working directory."
2728
msgstr ""
2729
2730
#: bzrlib/builtins.py:4369
2731
msgid "Instead of merging, show a diff of the merge."
2732
msgstr ""
2733
2734
#: bzrlib/builtins.py:4371
2735
msgid "Select changes interactively."
2736
msgstr ""
2737
2738
#: bzrlib/builtins.py:4393
2739
msgid ""
2740
"Merging into empty branches not currently supported, "
2741
"https://bugs.launchpad.net/bzr/+bug/308562"
2742
msgstr ""
2743
2744
#: bzrlib/builtins.py:4420
2745
msgid "Cannot use --uncommitted with bundles or merge directives."
2746
msgstr ""
2747
2748
#: bzrlib/builtins.py:4431
2749
msgid "Cannot use --uncommitted and --revision at the same time."
2750
msgstr ""
2751
2752
#: bzrlib/builtins.py:4451
2753
msgid "merger: "
2754
msgstr ""
2755
2756
#: bzrlib/builtins.py:4453 bzrlib/bundle/apply_bundle.py:71
2757
msgid "Nothing to do."
2758
msgstr ""
2759
2760
#: bzrlib/builtins.py:4457
2761
msgid "Cannot pull individual files"
2762
msgstr ""
2763
2764
#: bzrlib/builtins.py:4465
2765
msgid "This branch has no commits. (perhaps you would prefer 'bzr pull')"
2766
msgstr ""
2767
2768
#: bzrlib/builtins.py:4523
2769
#, python-format
2770
msgid "Show-base is not supported for this merge type. %s"
2771
msgstr ""
2772
2773
#: bzrlib/builtins.py:4532
2774
#, python-format
2775
msgid "Conflict reduction is not supported for merge type %s."
2776
msgstr ""
2777
2778
#: bzrlib/builtins.py:4536
2779
msgid "Cannot do conflict reduction and show base."
2780
msgstr ""
2781
2782
#: bzrlib/builtins.py:4647
2783
msgid "No location specified or remembered"
2784
msgstr ""
2785
2786
#: bzrlib/builtins.py:4649
2787
msgid "{0} remembered {1} location {2}"
2788
msgstr ""
2789
2790
#: bzrlib/builtins.py:4655
2791
msgid "Redo a merge."
2792
msgstr ""
2793
2794
#: bzrlib/builtins.py:4657
2795
msgid ""
2796
"Use this if you want to try a different merge technique while resolving\n"
2797
"conflicts. Some merge techniques are better than others, and remerge\n"
2798
"lets you try different ones on different files."
2799
msgstr ""
2800
2801
#: bzrlib/builtins.py:4661
2802
msgid ""
2803
"The options for remerge have the same meaning and defaults as the ones for\n"
2804
"merge. The difference is that remerge can (only) be run when there is a\n"
2805
"pending merge, and it lets you specify particular files."
2806
msgstr ""
2807
2808
#: bzrlib/builtins.py:4665
2809
msgid ""
2810
":Examples:\n"
2811
" Re-do the merge of all conflicted files, and show the base text in\n"
2812
" conflict regions, in addition to the usual THIS and OTHER texts::"
2813
msgstr ""
2814
2815
#: bzrlib/builtins.py:4669
2816
msgid " bzr remerge --show-base"
2817
msgstr ""
2818
2819
#: bzrlib/builtins.py:4671
2820
msgid ""
2821
" Re-do the merge of \"foobar\", using the weave merge algorithm, with\n"
2822
" additional processing to reduce the size of conflict regions::"
2823
msgstr ""
2824
2825
#: bzrlib/builtins.py:4674
2826
msgid " bzr remerge --merge-type weave --reprocess foobar"
2827
msgstr ""
2828
2829
#: bzrlib/builtins.py:4681
2830
msgid "Show base revision text in conflicts."
2831
msgstr ""
2832
2833
#: bzrlib/builtins.py:4693
2834
msgid ""
2835
"Sorry, remerge only works after normal merges. Not cherrypicking or multi-"
2836
"merges."
2837
msgstr ""
2838
2839
#: bzrlib/builtins.py:4751
2840
msgid ""
2841
"Set files in the working tree back to the contents of a previous revision."
2842
msgstr ""
2843
2844
#: bzrlib/builtins.py:4753
2845
msgid ""
2846
"Giving a list of files will revert only those files. Otherwise, all files\n"
2847
"will be reverted. If the revision is not specified with '--revision', the\n"
2848
"working tree basis revision is used. A revert operation affects only the\n"
2849
"working tree, not any revision history like the branch and repository or\n"
2850
"the working tree basis revision."
2851
msgstr ""
2852
2853
#: bzrlib/builtins.py:4759
2854
msgid ""
2855
"To remove only some changes, without reverting to a prior version, use\n"
2856
"merge instead. For example, \"merge . -r -2..-3\" (don't forget the \".\")\n"
2857
"will remove the changes introduced by the second last commit (-2), without\n"
2858
"affecting the changes introduced by the last commit (-1). To remove\n"
2859
"certain changes on a hunk-by-hunk basis, see the shelve command.\n"
2860
"To update the branch to a specific revision or the latest revision and\n"
2861
"update the working tree accordingly while preserving local changes, see the\n"
2862
"update command."
2863
msgstr ""
2864
2865
#: bzrlib/builtins.py:4768
2866
msgid ""
2867
"Uncommitted changes to files that are reverted will be discarded.\n"
2868
"Howver, by default, any files that have been manually changed will be\n"
2869
"backed up first. (Files changed only by merge are not backed up.) Backup\n"
2870
"files have '.~#~' appended to their name, where # is a number."
2871
msgstr ""
2872
2873
#: bzrlib/builtins.py:4773
2874
msgid ""
2875
"When you provide files, you can use their current pathname or the pathname\n"
2876
"from the target revision. So you can use revert to \"undelete\" a file by\n"
2877
"name. If you name a directory, all the contents of that directory will be\n"
2878
"reverted."
2879
msgstr ""
2880
2881
#: bzrlib/builtins.py:4778
2882
msgid ""
2883
"If you have newly added files since the target revision, they will be\n"
2884
"removed. If the files to be removed have been changed, backups will be\n"
2885
"created as above. Directories containing unknown files will not be\n"
2886
"deleted."
2887
msgstr ""
2888
2889
#: bzrlib/builtins.py:4783
2890
msgid ""
2891
"The working tree contains a list of revisions that have been merged but\n"
2892
"not yet committed. These revisions will be included as additional parents\n"
2893
"of the next commit. Normally, using revert clears that list as well as\n"
2894
"reverting the files. If any files are specified, revert leaves the list\n"
2895
"of uncommitted merges alone and reverts only the files. Use ``bzr revert\n"
2896
".`` in the tree root to revert all files but keep the recorded merges,\n"
2897
"and ``bzr revert --forget-merges`` to clear the pending merge list without\n"
2898
"reverting any files."
2899
msgstr ""
2900
2901
#: bzrlib/builtins.py:4792
2902
msgid ""
2903
"Using \"bzr revert --forget-merges\", it is possible to apply all of the\n"
2904
"changes from a branch in a single revision. To do this, perform the merge\n"
2905
"as desired. Then doing revert with the \"--forget-merges\" option will "
2906
"keep\n"
2907
"the content of the tree as it was, but it will clear the list of pending\n"
2908
"merges. The next commit will then contain all of the changes that are\n"
2909
"present in the other branch, but without any other parent revisions.\n"
2910
"Because this technique forgets where these changes originated, it may\n"
2911
"cause additional conflicts on later merges involving the same source and\n"
2912
"target branches."
2913
msgstr ""
2914
2915
#: bzrlib/builtins.py:4806
2916
msgid "Do not save backups of reverted files."
2917
msgstr ""
2918
2919
#: bzrlib/builtins.py:4808
2920
msgid "Remove pending merge marker, without changing any files."
2921
msgstr ""
2922
2923
#: bzrlib/builtins.py:4839
2924
msgid ""
2925
"Show help on a command or other topic.\n"
2926
" "
2927
msgstr ""
2928
2929
#: bzrlib/builtins.py:4844
2930
msgid "Show help on all commands."
2931
msgstr ""
2932
2933
#: bzrlib/builtins.py:4873
2934
msgid "Show unmerged/unpulled revisions between two branches."
2935
msgstr ""
2936
2937
#: bzrlib/builtins.py:4875
2938
msgid "OTHER_BRANCH may be local or remote."
2939
msgstr ""
2940
2941
#: bzrlib/builtins.py:4877
2942
msgid ""
2943
"To filter on a range of revisions, you can use the command -r begin..end\n"
2944
"-r revision requests a specific revision, -r ..end or -r begin.. are\n"
2945
"also valid.\n"
2946
" \n"
2947
":Exit values:\n"
2948
" 1 - some missing revisions\n"
2949
" 0 - no missing revisions"
2950
msgstr ""
2951
2952
#: bzrlib/builtins.py:4887
2953
msgid ""
2954
" Determine the missing revisions between this and the branch at the\n"
2955
" remembered pull location::"
2956
msgstr ""
2957
2958
#: bzrlib/builtins.py:4890
2959
msgid " bzr missing"
2960
msgstr ""
2961
2962
#: bzrlib/builtins.py:4892
2963
msgid " Determine the missing revisions between this and another branch::"
2964
msgstr ""
2965
2966
#: bzrlib/builtins.py:4894
2967
msgid " bzr missing http://server/branch"
2968
msgstr ""
2969
2970
#: bzrlib/builtins.py:4896
2971
msgid ""
2972
" Determine the missing revisions up to a specific revision on the other\n"
2973
" branch::"
2974
msgstr ""
2975
2976
#: bzrlib/builtins.py:4899
2977
msgid " bzr missing -r ..-10"
2978
msgstr ""
2979
2980
#: bzrlib/builtins.py:4901
2981
msgid ""
2982
" Determine the missing revisions up to a specific revision on this\n"
2983
" branch::"
2984
msgstr ""
2985
2986
#: bzrlib/builtins.py:4904
2987
msgid " bzr missing --my-revision ..-10"
2988
msgstr ""
2989
2990
#: bzrlib/builtins.py:4911
2991
msgid "Reverse the order of revisions."
2992
msgstr ""
2993
2994
#: bzrlib/builtins.py:4913
2995
msgid "Display changes in the local branch only."
2996
msgstr ""
2997
2998
#: bzrlib/builtins.py:4914
2999
msgid "Same as --mine-only."
3000
msgstr ""
3001
3002
#: bzrlib/builtins.py:4916
3003
msgid "Display changes in the remote branch only."
3004
msgstr ""
3005
3006
#: bzrlib/builtins.py:4917
3007
msgid "Same as --theirs-only."
3008
msgstr ""
3009
3010
#: bzrlib/builtins.py:4922
3011
msgid ""
3012
"Filter on other branch revisions (inclusive). See \"help revisionspec\" for "
3013
"details."
3014
msgstr ""
3015
3016
#: bzrlib/builtins.py:4926
3017
msgid ""
3018
"Filter on local branch revisions (inclusive). See \"help revisionspec\" for "
3019
"details."
3020
msgstr ""
3021
3022
#: bzrlib/builtins.py:4929
3023
msgid "Show all revisions in addition to the mainline ones."
3024
msgstr ""
3025
3026
#: bzrlib/builtins.py:4983
3027
msgid "No peer location known or specified."
3028
msgstr ""
3029
3030
#: bzrlib/builtins.py:4987
3031
msgid "Using saved parent location: {0}\n"
3032
msgstr ""
3033
3034
#: bzrlib/builtins.py:5020
3035
#, python-format
3036
msgid "You have %d extra revision:\n"
3037
msgid_plural "You have %d extra revisions:\n"
3038
msgstr[0] ""
3039
msgstr[1] ""
3040
3041
#: bzrlib/builtins.py:5040
3042
#, python-format
3043
msgid "You are missing %d revision:\n"
3044
msgid_plural "You are missing %d revisions:\n"
3045
msgstr[0] ""
3046
msgstr[1] ""
3047
3048
#: bzrlib/builtins.py:5055
3049
msgid "This branch has no new revisions.\n"
3050
msgstr ""
3051
3052
#: bzrlib/builtins.py:5058
3053
msgid "Other branch has no new revisions.\n"
3054
msgstr ""
3055
3056
#: bzrlib/builtins.py:5063
3057
msgid "Branches are up to date.\n"
3058
msgstr ""
3059
3060
#: bzrlib/builtins.py:5074
3061
msgid "Compress the data within a repository."
3062
msgstr ""
3063
3064
#: bzrlib/builtins.py:5076
3065
msgid ""
3066
"This operation compresses the data within a bazaar repository. As\n"
3067
"bazaar supports automatic packing of repository, this operation is\n"
3068
"normally not required to be done manually."
3069
msgstr ""
3070
3071
#: bzrlib/builtins.py:5080
3072
msgid ""
3073
"During the pack operation, bazaar takes a backup of existing repository\n"
3074
"data, i.e. pack files. This backup is eventually removed by bazaar\n"
3075
"automatically when it is safe to do so. To save disk space by removing\n"
3076
"the backed up pack files, the --clean-obsolete-packs option may be\n"
3077
"used."
3078
msgstr ""
3079
3080
#: bzrlib/builtins.py:5086
3081
msgid ""
3082
"Warning: If you use --clean-obsolete-packs and your machine crashes\n"
3083
"during or immediately after repacking, you may be left with a state\n"
3084
"where the deletion has been written to disk but the new packs have not\n"
3085
"been. In this case the repository may be unusable."
3086
msgstr ""
3087
3088
#: bzrlib/builtins.py:5095
3089
msgid "Delete obsolete packs to save disk space."
3090
msgstr ""
3091
3092
#: bzrlib/builtins.py:5109
3093
msgid "List the installed plugins."
3094
msgstr ""
3095
3096
#: bzrlib/builtins.py:5111
3097
msgid ""
3098
"This command displays the list of installed plugins including\n"
3099
"version of plugin and a short description of each."
3100
msgstr ""
3101
3102
#: bzrlib/builtins.py:5114
3103
msgid "--verbose shows the path where each plugin is located."
3104
msgstr ""
3105
3106
#: bzrlib/builtins.py:5116
3107
msgid ""
3108
"A plugin is an external component for Bazaar that extends the\n"
3109
"revision control system, by adding or replacing code in Bazaar.\n"
3110
"Plugins can do a variety of things, including overriding commands,\n"
3111
"adding new commands, providing additional network transports and\n"
3112
"customizing log output."
3113
msgstr ""
3114
3115
#: bzrlib/builtins.py:5122
3116
msgid ""
3117
"See the Bazaar Plugin Guide <http://doc.bazaar.canonical.com/plugins/en/>\n"
3118
"for further information on plugins including where to find them and how to\n"
3119
"install them. Instructions are also provided there on how to write new\n"
3120
"plugins using the Python programming language."
3121
msgstr ""
3122
3123
#: bzrlib/builtins.py:5138
3124
msgid "Show testament (signing-form) of a revision."
3125
msgstr ""
3126
3127
#: bzrlib/builtins.py:5141
3128
msgid "Produce long-format testament."
3129
msgstr ""
3130
3131
#: bzrlib/builtins.py:5143
3132
msgid "Produce a strict-format testament."
3133
msgstr ""
3134
3135
#: bzrlib/builtins.py:5169
3136
msgid "Show the origin of each line in a file."
3137
msgstr ""
3138
3139
#: bzrlib/builtins.py:5171
3140
msgid ""
3141
"This prints out the given file with an annotation on the left side\n"
3142
"indicating which revision, author and date introduced the change."
3143
msgstr ""
3144
3145
#: bzrlib/builtins.py:5174
3146
msgid ""
3147
"If the origin is the same for a run of consecutive lines, it is\n"
3148
"shown only at the top, unless the --all option is given."
3149
msgstr ""
3150
3151
#: bzrlib/builtins.py:5182
3152
msgid "Show annotations on all lines."
3153
msgstr ""
3154
3155
#: bzrlib/builtins.py:5183
3156
msgid "Show commit date in annotations."
3157
msgstr ""
3158
3159
#: bzrlib/builtins.py:5270
3160
msgid "Cannot sign a range of non-revision-history revisions"
3161
msgstr ""
3162
3163
#: bzrlib/builtins.py:5282
3164
msgid "Please supply either one revision, or a range."
3165
msgstr ""
3166
3167
#: bzrlib/builtins.py:5286
3168
msgid ""
3169
"Convert the current branch into a checkout of the supplied branch.\n"
3170
"If no branch is supplied, rebind to the last bound location."
3171
msgstr ""
3172
3173
#: bzrlib/builtins.py:5289
3174
msgid ""
3175
"Once converted into a checkout, commits must succeed on the master branch\n"
3176
"before they will be applied to the local branch."
3177
msgstr ""
3178
3179
#: bzrlib/builtins.py:5292
3180
msgid ""
3181
"Bound branches use the nickname of its master branch unless it is set\n"
3182
"locally, in which case binding will update the local nickname to be\n"
3183
"that of the master."
3184
msgstr ""
3185
3186
#: bzrlib/builtins.py:5307
3187
msgid "No location supplied. This format does not remember old locations."
3188
msgstr ""
3189
3190
#: bzrlib/builtins.py:5313
3191
msgid "Branch is already bound"
3192
msgstr ""
3193
3194
#: bzrlib/builtins.py:5316
3195
msgid "No location supplied and no previous location known"
3196
msgstr ""
3197
3198
#: bzrlib/builtins.py:5322
3199
msgid "These branches have diverged. Try merging, and then bind again."
3200
msgstr ""
3201
3202
#: bzrlib/builtins.py:5329
3203
msgid "Convert the current checkout into a regular branch."
3204
msgstr ""
3205
3206
#: bzrlib/builtins.py:5331
3207
msgid ""
3208
"After unbinding, the local branch is considered independent and subsequent\n"
3209
"commits will be local only."
3210
msgstr ""
3211
3212
#: bzrlib/builtins.py:5342
3213
msgid "Local branch is not bound"
3214
msgstr ""
3215
3216
#: bzrlib/builtins.py:5346
3217
msgid "Remove the last committed revision."
3218
msgstr ""
3219
3220
#: bzrlib/builtins.py:5348
3221
msgid ""
3222
"--verbose will print out what is being removed.\n"
3223
"--dry-run will go through all the motions, but not actually\n"
3224
"remove anything."
3225
msgstr ""
3226
3227
#: bzrlib/builtins.py:5352
3228
msgid ""
3229
"If --revision is specified, uncommit revisions to leave the branch at the\n"
3230
"specified revision. For example, \"bzr uncommit -r 15\" will leave the\n"
3231
"branch at revision 15."
3232
msgstr ""
3233
3234
#: bzrlib/builtins.py:5356
3235
msgid ""
3236
"Uncommit leaves the working tree ready for a new commit. The only change\n"
3237
"it may make is to restore any pending merges that were present before\n"
3238
"the commit."
3239
msgstr ""
3240
3241
#: bzrlib/builtins.py:5367
3242
msgid "Don't actually make changes."
3243
msgstr ""
3244
3245
#: bzrlib/builtins.py:5368
3246
msgid "Say yes to all questions."
3247
msgstr ""
3248
3249
#: bzrlib/builtins.py:5370
3250
msgid "Keep tags that point to removed revisions."
3251
msgstr ""
3252
3253
#: bzrlib/builtins.py:5372
3254
msgid "Only remove the commits from the local branch when in a checkout."
3255
msgstr ""
3256
3257
#: bzrlib/builtins.py:5421
3258
msgid "No revisions to uncommit.\n"
3259
msgstr ""
3260
3261
#: bzrlib/builtins.py:5436
3262
msgid "Dry-run, pretending to remove the above revisions.\n"
3263
msgstr ""
3264
3265
#: bzrlib/builtins.py:5439
3266
msgid "The above revision(s) will be removed.\n"
3267
msgstr ""
3268
3269
#: bzrlib/builtins.py:5443
3270
msgid "Uncommit these revisions"
3271
msgstr ""
3272
3273
#: bzrlib/builtins.py:5446
3274
msgid "Canceled\n"
3275
msgstr ""
3276
3277
#: bzrlib/builtins.py:5453
3278
#, python-format
3279
msgid ""
3280
"You can restore the old tip by running:\n"
3281
" bzr pull . -r revid:%s\n"
3282
msgstr ""
3283
3284
#: bzrlib/builtins.py:5458
3285
msgid "Break a dead lock."
3286
msgstr ""
3287
3288
#: bzrlib/builtins.py:5460
3289
msgid ""
3290
"This command breaks a lock on a repository, branch, working directory or\n"
3291
"config file."
3292
msgstr ""
3293
3294
#: bzrlib/builtins.py:5463
3295
msgid ""
3296
"CAUTION: Locks should only be broken when you are sure that the process\n"
3297
"holding the lock has been stopped."
3298
msgstr ""
3299
3300
#: bzrlib/builtins.py:5466
3301
msgid ""
3302
"You can get information on what locks are open via the 'bzr info\n"
3303
"[location]' command."
3304
msgstr ""
3305
3306
#: bzrlib/builtins.py:5469
3307
msgid ""
3308
":Examples:\n"
3309
" bzr break-lock\n"
3310
" bzr break-lock bzr+ssh://example.com/bzr/foo\n"
3311
" bzr break-lock --conf ~/.bazaar"
3312
msgstr ""
3313
3314
#: bzrlib/builtins.py:5478
3315
msgid "LOCATION is the directory where the config lock is."
3316
msgstr ""
3317
3318
#: bzrlib/builtins.py:5480
3319
msgid "Do not ask for confirmation before breaking the lock."
3320
msgstr ""
3321
3322
#: bzrlib/builtins.py:5515
3323
msgid "The Bazaar smart server protocol over TCP. (default port: 4155)"
3324
msgstr ""
3325
3326
#: bzrlib/builtins.py:5516
3327
msgid "Run the bzr server."
3328
msgstr ""
3329
3330
#: bzrlib/builtins.py:5522
3331
msgid "Serve on stdin/out for use from inetd or sshd."
3332
msgstr ""
3333
3334
#: bzrlib/builtins.py:5523
3335
msgid "protocol"
3336
msgstr ""
3337
3338
#: bzrlib/builtins.py:5524
3339
msgid "Protocol to serve."
3340
msgstr ""
3341
3342
#: bzrlib/builtins.py:5528
3343
msgid "Listen for connections on nominated address."
3344
msgstr ""
3345
3346
#: bzrlib/builtins.py:5530
3347
msgid ""
3348
"Listen for connections on nominated port. Passing 0 as the port number will "
3349
"result in a dynamically allocated port. The default port depends on the "
3350
"protocol."
3351
msgstr ""
3352
3353
#: bzrlib/builtins.py:5535
3354
msgid "Serve contents of this directory."
3355
msgstr ""
3356
3357
#: bzrlib/builtins.py:5537
3358
msgid ""
3359
"By default the server is a readonly server. Supplying --allow-writes "
3360
"enables write access to the contents of the served directory and below. "
3361
"Note that ``bzr serve`` does not perform authentication, so unless some form "
3362
"of external authentication is arranged supplying this option leads to global "
3363
"uncontrolled write access to your file system."
3364
msgstr ""
3365
3366
#: bzrlib/builtins.py:5546
3367
msgid "Override the default idle client timeout (5min)."
3368
msgstr ""
3369
3370
#: bzrlib/builtins.py:5564
3371
msgid "Combine a tree into its containing tree."
3372
msgstr ""
3373
3374
#: bzrlib/builtins.py:5566
3375
msgid "This command requires the target tree to be in a rich-root format."
3376
msgstr ""
3377
3378
#: bzrlib/builtins.py:5568
3379
msgid ""
3380
"The TREE argument should be an independent tree, inside another tree, but\n"
3381
"not part of it. (Such trees can be produced by \"bzr split\", but also by\n"
3382
"running \"bzr branch\" with the target inside a tree.)"
3383
msgstr ""
3384
3385
#: bzrlib/builtins.py:5572
3386
msgid ""
3387
"The result is a combined tree, with the subtree no longer an independent\n"
3388
"part. This is marked as a merge of the subtree into the containing tree,\n"
3389
"and all history is preserved."
3390
msgstr ""
3391
3392
#: bzrlib/builtins.py:5590
3393
#, python-format
3394
msgid ""
3395
"Can't join trees because %s doesn't support rich root data.\n"
3396
"You can use bzr upgrade on the repository."
3397
msgstr ""
3398
3399
#: bzrlib/builtins.py:5600 bzrlib/builtins.py:5606
3400
msgid "Cannot join {0}. {1}"
3401
msgstr ""
3402
3403
#: bzrlib/builtins.py:5610
3404
msgid "Split a subdirectory of a tree into a separate tree."
3405
msgstr ""
3406
3407
#: bzrlib/builtins.py:5612
3408
msgid ""
3409
"This command will produce a target tree in a format that supports\n"
3410
"rich roots, like 'rich-root' or 'rich-root-pack'. These formats cannot be\n"
3411
"converted into earlier formats like 'dirstate-tags'."
3412
msgstr ""
3413
3414
#: bzrlib/builtins.py:5616
3415
msgid ""
3416
"The TREE argument should be a subdirectory of a working tree. That\n"
3417
"subdirectory will be converted into an independent tree, with its own\n"
3418
"branch. Commits in the top-level tree will not apply to the new subtree."
3419
msgstr ""
3420
3421
#: bzrlib/builtins.py:5696
3422
msgid "No submit branch specified or known"
3423
msgstr ""
3424
3425
#: bzrlib/builtins.py:5705 bzrlib/send.py:109
3426
msgid "No public branch specified or known"
3427
msgstr ""
3428
3429
#: bzrlib/builtins.py:5710
3430
msgid "bzr merge-directive takes at most two one revision identifiers"
3431
msgstr ""
3432
3433
#: bzrlib/builtins.py:5719
3434
msgid "No revisions to bundle."
3435
msgstr ""
3436
3437
#: bzrlib/builtins.py:5738
3438
msgid "Mail or create a merge-directive for submitting changes."
3439
msgstr ""
3440
3441
#: bzrlib/builtins.py:5740
3442
msgid "A merge directive provides many things needed for requesting merges:"
3443
msgstr ""
3444
3445
#: bzrlib/builtins.py:5742
3446
msgid "* A machine-readable description of the merge to perform"
3447
msgstr ""
3448
3449
#: bzrlib/builtins.py:5744
3450
msgid "* An optional patch that is a preview of the changes requested"
3451
msgstr ""
3452
3453
#: bzrlib/builtins.py:5746
3454
msgid ""
3455
"* An optional bundle of revision data, so that the changes can be applied\n"
3456
" directly from the merge directive, without retrieving data from a\n"
3457
" branch."
3458
msgstr ""
3459
3460
#: bzrlib/builtins.py:5750
3461
msgid ""
3462
"`bzr send` creates a compact data set that, when applied using bzr\n"
3463
"merge, has the same effect as merging from the source branch. "
3464
msgstr ""
3465
3466
#: bzrlib/builtins.py:5753
3467
msgid ""
3468
"By default the merge directive is self-contained and can be applied to any\n"
3469
"branch containing submit_branch in its ancestory without needing access to\n"
3470
"the source branch."
3471
msgstr ""
3472
3473
#: bzrlib/builtins.py:5757
3474
msgid ""
3475
"If --no-bundle is specified, then Bazaar doesn't send the contents of the\n"
3476
"revisions, but only a structured request to merge from the\n"
3477
"public_location. In that case the public_branch is needed and it must be\n"
3478
"up-to-date and accessible to the recipient. The public_branch is always\n"
3479
"included if known, so that people can check it later."
3480
msgstr ""
3481
3482
#: bzrlib/builtins.py:5763
3483
msgid ""
3484
"The submit branch defaults to the parent of the source branch, but can be\n"
3485
"overridden. Both submit branch and public branch will be remembered in\n"
3486
"branch.conf the first time they are used for a particular branch. The\n"
3487
"source branch defaults to that containing the working directory, but can\n"
3488
"be changed using --from."
3489
msgstr ""
3490
3491
#: bzrlib/builtins.py:5769
3492
msgid ""
3493
"Both the submit branch and the public branch follow the usual behavior with\n"
3494
"respect to --remember: If there is no default location set, the first send\n"
3495
"will set it (use --no-remember to avoid setting it). After that, you can\n"
3496
"omit the location to use the default. To change the default, use\n"
3497
"--remember. The value will only be saved if the location can be accessed."
3498
msgstr ""
3499
3500
#: bzrlib/builtins.py:5775
3501
msgid ""
3502
"In order to calculate those changes, bzr must analyse the submit branch.\n"
3503
"Therefore it is most efficient for the submit branch to be a local mirror.\n"
3504
"If a public location is known for the submit_branch, that location is used\n"
3505
"in the merge directive."
3506
msgstr ""
3507
3508
#: bzrlib/builtins.py:5780
3509
msgid ""
3510
"The default behaviour is to send the merge directive by mail, unless -o is\n"
3511
"given, in which case it is sent to a file."
3512
msgstr ""
3513
3514
#: bzrlib/builtins.py:5783
3515
msgid ""
3516
"Mail is sent using your preferred mail program. This should be transparent\n"
3517
"on Windows (it uses MAPI). On Unix, it requires the xdg-email utility.\n"
3518
"If the preferred client can't be found (or used), your editor will be used."
3519
msgstr ""
3520
3521
#: bzrlib/builtins.py:5787
3522
msgid ""
3523
"To use a specific mail program, set the mail_client configuration option.\n"
3524
"(For Thunderbird 1.5, this works around some bugs.) Supported values for\n"
3525
"specific clients are \"claws\", \"evolution\", \"kmail\", \"mail.app\" "
3526
"(MacOS X's\n"
3527
"Mail.app), \"mutt\", and \"thunderbird\"; generic options are \"default\",\n"
3528
"\"editor\", \"emacsclient\", \"mapi\", and \"xdg-email\". Plugins may also "
3529
"add\n"
3530
"supported clients."
3531
msgstr ""
3532
3533
#: bzrlib/builtins.py:5794
3534
msgid ""
3535
"If mail is being sent, a to address is required. This can be supplied\n"
3536
"either on the commandline, by setting the submit_to configuration\n"
3537
"option in the branch itself or the child_submit_to configuration option\n"
3538
"in the submit branch."
3539
msgstr ""
3540
3541
#: bzrlib/builtins.py:5799
3542
msgid ""
3543
"Two formats are currently supported: \"4\" uses revision bundle format 4 "
3544
"and\n"
3545
"merge directive format 2. It is significantly faster and smaller than\n"
3546
"older formats. It is compatible with Bazaar 0.19 and later. It is the\n"
3547
"default. \"0.9\" uses revision bundle format 0.9 and merge directive\n"
3548
"format 1. It is compatible with Bazaar 0.12 - 0.18."
3549
msgstr ""
3550
3551
#: bzrlib/builtins.py:5805
3552
msgid ""
3553
"The merge directives created by bzr send may be applied using bzr merge or\n"
3554
"bzr pull by specifying a file containing a merge directive as the location."
3555
msgstr ""
3556
3557
#: bzrlib/builtins.py:5808
3558
msgid ""
3559
"bzr send makes extensive use of public locations to map local locations "
3560
"into\n"
3561
"URLs that can be used by other people. See `bzr help configuration` to\n"
3562
"set them, and use `bzr info` to display them."
3563
msgstr ""
3564
3565
#: bzrlib/builtins.py:5832
3566
msgid "Write merge directive to this file or directory; use - for stdout."
3567
msgstr ""
3568
3569
#: bzrlib/builtins.py:5836
3570
msgid ""
3571
"Refuse to send if there are uncommitted changes in the working tree, --no-"
3572
"strict disables the check."
3573
msgstr ""
3574
3575
#: bzrlib/builtins.py:5838
3576
msgid "Mail the request to this address."
3577
msgstr ""
3578
3579
#: bzrlib/builtins.py:5842
3580
msgid "Body for the email."
3581
msgstr ""
3582
3583
#: bzrlib/builtins.py:5895
3584
msgid "Do not include a bundle in the merge directive."
3585
msgstr ""
3586
3587
#: bzrlib/builtins.py:5896
3588
msgid "Do not include a preview patch in the merge directive."
3589
msgstr ""
3590
3591
#: bzrlib/builtins.py:5899
3592
msgid "Remember submit and public branch."
3593
msgstr ""
3594
3595
#: bzrlib/builtins.py:5901
3596
msgid ""
3597
"Branch to generate the submission from, rather than the one containing the "
3598
"working directory."
3599
msgstr ""
3600
3601
#: bzrlib/builtins.py:5911 bzrlib/cmd_version_info.py:76
3602
msgid "format"
3603
msgstr ""
3604
3605
#: bzrlib/builtins.py:5912
3606
msgid "Use the specified output format."
3607
msgstr ""
3608
3609
#: bzrlib/builtins.py:5934
3610
msgid "Create, remove or modify a tag naming a revision."
3611
msgstr ""
3612
3613
#: bzrlib/builtins.py:5936
3614
msgid ""
3615
"Tags give human-meaningful names to revisions. Commands that take a -r\n"
3616
"(--revision) option can be given -rtag:X, where X is any previously\n"
3617
"created tag."
3618
msgstr ""
3619
3620
#: bzrlib/builtins.py:5940
3621
msgid ""
3622
"Tags are stored in the branch. Tags are copied from one branch to another\n"
3623
"along when you branch, push, pull or merge."
3624
msgstr ""
3625
3626
#: bzrlib/builtins.py:5943
3627
msgid ""
3628
"It is an error to give a tag name that already exists unless you pass\n"
3629
"--force, in which case the tag is moved to point to the new revision."
3630
msgstr ""
3631
3632
#: bzrlib/builtins.py:5946
3633
msgid ""
3634
"To rename a tag (change the name but keep it on the same revsion), run "
3635
"``bzr\n"
3636
"tag new-name -r tag:old-name`` and then ``bzr tag --delete oldname``."
3637
msgstr ""
3638
3639
#: bzrlib/builtins.py:5949
3640
msgid ""
3641
"If no tag name is specified it will be determined through the \n"
3642
"'automatic_tag_name' hook. This can e.g. be used to automatically tag\n"
3643
"upstream releases by reading configure.ac. See ``bzr help hooks`` for\n"
3644
"details."
3645
msgstr ""
3646
3647
#: bzrlib/builtins.py:5959
3648
msgid "Delete this tag rather than placing it."
3649
msgstr ""
3650
3651
#: bzrlib/builtins.py:5962
3652
msgid "Branch in which to place the tag."
3653
msgstr ""
3654
3655
#: bzrlib/builtins.py:5964
3656
msgid "Replace existing tags."
3657
msgstr ""
3658
3659
#: bzrlib/builtins.py:5979
3660
msgid "No tag specified to delete."
3661
msgstr ""
3662
3663
#: bzrlib/builtins.py:5981
3664
#, python-format
3665
msgid "Deleted tag %s."
3666
msgstr ""
3667
3668
#: bzrlib/builtins.py:5995
3669
msgid "Please specify a tag name."
3670
msgstr ""
3671
3672
#: bzrlib/builtins.py:6003
3673
#, python-format
3674
msgid "Tag %s already exists for that revision."
3675
msgstr ""
3676
3677
#: bzrlib/builtins.py:6007
3678
#, python-format
3679
msgid "Created tag %s."
3680
msgstr ""
3681
3682
#: bzrlib/builtins.py:6009
3683
#, python-format
3684
msgid "Updated tag %s."
3685
msgstr ""
3686
3687
#: bzrlib/builtins.py:6013
3688
msgid "List tags."
3689
msgstr ""
3690
3691
#: bzrlib/builtins.py:6015
3692
msgid ""
3693
"This command shows a table of tag names and the revisions they reference."
3694
msgstr ""
3695
3696
#: bzrlib/builtins.py:6021
3697
msgid "Branch whose tags should be displayed."
3698
msgstr ""
3699
3700
#: bzrlib/builtins.py:6023
3701
msgid "Sort tags by different criteria."
3702
msgstr ""
3703
3704
#: bzrlib/builtins.py:6023
3705
msgid "Sorting"
3706
msgstr ""
3707
3708
#: bzrlib/builtins.py:6092
3709
msgid "Reconfigure the type of a bzr directory."
3710
msgstr ""
3711
3712
#: bzrlib/builtins.py:6094
3713
msgid "A target configuration must be specified."
3714
msgstr ""
3715
3716
#: bzrlib/builtins.py:6096
3717
msgid ""
3718
"For checkouts, the bind-to location will be auto-detected if not specified.\n"
3719
"The order of preference is\n"
3720
"1. For a lightweight checkout, the current bound location.\n"
3721
"2. For branches that used to be checkouts, the previously-bound location.\n"
3722
"3. The push location.\n"
3723
"4. The parent location.\n"
3724
"If none of these is available, --bind-to must be specified."
3725
msgstr ""
3726
3727
#: bzrlib/builtins.py:6110
3728
msgid "Tree type"
3729
msgstr ""
3730
3731
#: bzrlib/builtins.py:6111
3732
msgid "The relation between branch and tree."
3733
msgstr ""
3734
3735
#: bzrlib/builtins.py:6113
3736
msgid "Reconfigure to be an unbound branch with no working tree."
3737
msgstr ""
3738
3739
#: bzrlib/builtins.py:6114
3740
msgid "Reconfigure to be an unbound branch with a working tree."
3741
msgstr ""
3742
3743
#: bzrlib/builtins.py:6115
3744
msgid "Reconfigure to be a bound branch with a working tree."
3745
msgstr ""
3746
3747
#: bzrlib/builtins.py:6116
3748
msgid "Reconfigure to be a lightweight checkout (with no local history)."
3749
msgstr ""
3750
3751
#: bzrlib/builtins.py:6121
3752
msgid "Repository type"
3753
msgstr ""
3754
3755
#: bzrlib/builtins.py:6122
3756
msgid "Location fo the repository."
3757
msgstr ""
3758
3759
#: bzrlib/builtins.py:6124
3760
msgid ""
3761
"Reconfigure to be a standalone branch (i.e. stop using shared repository)."
3762
msgstr ""
3763
3764
#: bzrlib/builtins.py:6126
3765
msgid "Reconfigure to use a shared repository."
3766
msgstr ""
3767
3768
#: bzrlib/builtins.py:6130
3769
msgid "Trees in Repository"
3770
msgstr ""
3771
3772
#: bzrlib/builtins.py:6131
3773
msgid "Whether new branches in the repository have trees."
3774
msgstr ""
3775
3776
#: bzrlib/builtins.py:6133
3777
msgid ""
3778
"Reconfigure repository to create working trees on branches by default."
3779
msgstr ""
3780
3781
#: bzrlib/builtins.py:6135
3782
msgid ""
3783
"Reconfigure repository to not create working trees on branches by default."
3784
msgstr ""
3785
3786
#: bzrlib/builtins.py:6138
3787
msgid "Branch to bind checkout to."
3788
msgstr ""
3789
3790
#: bzrlib/builtins.py:6140
3791
msgid "Perform reconfiguration even if local changes will be lost."
3792
msgstr ""
3793
3794
#: bzrlib/builtins.py:6143
3795
msgid "Reconfigure a branch to be stacked on another branch."
3796
msgstr ""
3797
3798
#: bzrlib/builtins.py:6147
3799
msgid ""
3800
"Reconfigure a branch to be unstacked. This may require copying substantial "
3801
"data into it."
3802
msgstr ""
3803
3804
#: bzrlib/builtins.py:6157
3805
msgid "Can't use both --stacked-on and --unstacked"
3806
msgstr ""
3807
3808
#: bzrlib/builtins.py:6171
3809
msgid "No target configuration specified"
3810
msgstr ""
3811
3812
#: bzrlib/builtins.py:6206
3813
msgid "Set the branch of a checkout and update."
3814
msgstr ""
3815
3816
#: bzrlib/builtins.py:6208
3817
msgid ""
3818
"For lightweight checkouts, this changes the branch being referenced.\n"
3819
"For heavyweight checkouts, this checks that there are no local commits\n"
3820
"versus the current bound branch, then it makes the local branch a mirror\n"
3821
"of the new location and binds to it."
3822
msgstr ""
3823
3824
#: bzrlib/builtins.py:6213
3825
msgid ""
3826
"In both cases, the working tree is updated and uncommitted changes\n"
3827
"are merged. The user can commit or revert these as they desire."
3828
msgstr ""
3829
3830
#: bzrlib/builtins.py:6216
3831
msgid "Pending merges need to be committed or reverted before using switch."
3832
msgstr ""
3833
3834
#: bzrlib/builtins.py:6218
3835
msgid ""
3836
"The path to the branch to switch to can be specified relative to the parent\n"
3837
"directory of the current branch. For example, if you are currently in a\n"
3838
"checkout of /path/to/branch, specifying 'newbranch' will find a branch at\n"
3839
"/path/to/newbranch."
3840
msgstr ""
3841
3842
#: bzrlib/builtins.py:6223
3843
msgid ""
3844
"Bound branches use the nickname of its master branch unless it is set\n"
3845
"locally, in which case switching will update the local nickname to be\n"
3846
"that of the master."
3847
msgstr ""
3848
3849
#: bzrlib/builtins.py:6231
3850
msgid "Switch even if local commits will be lost."
3851
msgstr ""
3852
3853
#: bzrlib/builtins.py:6234
3854
msgid "Create the target branch from this one before switching to it."
3855
msgstr ""
3856
3857
#: bzrlib/builtins.py:6248
3858
msgid "You must supply either a revision or a location"
3859
msgstr ""
3860
3861
#: bzrlib/builtins.py:6261
3862
msgid "cannot create branch without source branch"
3863
msgstr ""
3864
3865
#: bzrlib/builtins.py:6286
3866
msgid "Manage filtered views."
3867
msgstr ""
3868
3869
#: bzrlib/builtins.py:6288
3870
msgid ""
3871
"Views provide a mask over the tree so that users can focus on\n"
3872
"a subset of a tree when doing their work. After creating a view,\n"
3873
"commands that support a list of files - status, diff, commit, etc -\n"
3874
"effectively have that list of files implicitly given each time.\n"
3875
"An explicit list of files can still be given but those files\n"
3876
"must be within the current view."
3877
msgstr ""
3878
3879
#: bzrlib/builtins.py:6295
3880
msgid ""
3881
"In most cases, a view has a short life-span: it is created to make\n"
3882
"a selected change and is deleted once that change is committed.\n"
3883
"At other times, you may wish to create one or more named views\n"
3884
"and switch between them."
3885
msgstr ""
3886
3887
#: bzrlib/builtins.py:6300
3888
msgid ""
3889
"To disable the current view without deleting it, you can switch to\n"
3890
"the pseudo view called ``off``. This can be useful when you need\n"
3891
"to see the whole tree for an operation or two (e.g. merge) but\n"
3892
"want to switch back to your view after that."
3893
msgstr ""
3894
3895
#: bzrlib/builtins.py:6305
3896
msgid ""
3897
":Examples:\n"
3898
" To define the current view::"
3899
msgstr ""
3900
3901
#: bzrlib/builtins.py:6308
3902
msgid " bzr view file1 dir1 ..."
3903
msgstr ""
3904
3905
#: bzrlib/builtins.py:6310
3906
msgid " To list the current view::"
3907
msgstr ""
3908
3909
#: bzrlib/builtins.py:6312
3910
msgid " bzr view"
3911
msgstr ""
3912
3913
#: bzrlib/builtins.py:6314
3914
msgid " To delete the current view::"
3915
msgstr ""
3916
3917
#: bzrlib/builtins.py:6316
3918
msgid " bzr view --delete"
3919
msgstr ""
3920
3921
#: bzrlib/builtins.py:6318
3922
msgid " To disable the current view without deleting it::"
3923
msgstr ""
3924
3925
#: bzrlib/builtins.py:6320
3926
msgid " bzr view --switch off"
3927
msgstr ""
3928
3929
#: bzrlib/builtins.py:6322
3930
msgid " To define a named view and switch to it::"
3931
msgstr ""
3932
3933
#: bzrlib/builtins.py:6324
3934
msgid " bzr view --name view-name file1 dir1 ..."
3935
msgstr ""
3936
3937
#: bzrlib/builtins.py:6326
3938
msgid " To list a named view::"
3939
msgstr ""
3940
3941
#: bzrlib/builtins.py:6328
3942
msgid " bzr view --name view-name"
3943
msgstr ""
3944
3945
#: bzrlib/builtins.py:6330
3946
msgid " To delete a named view::"
3947
msgstr ""
3948
3949
#: bzrlib/builtins.py:6332
3950
msgid " bzr view --name view-name --delete"
3951
msgstr ""
3952
3953
#: bzrlib/builtins.py:6334
3954
msgid " To switch to a named view::"
3955
msgstr ""
3956
3957
#: bzrlib/builtins.py:6336
3958
msgid " bzr view --switch view-name"
3959
msgstr ""
3960
3961
#: bzrlib/builtins.py:6338
3962
msgid " To list all views defined::"
3963
msgstr ""
3964
3965
#: bzrlib/builtins.py:6340
3966
msgid " bzr view --all"
3967
msgstr ""
3968
3969
#: bzrlib/builtins.py:6342
3970
msgid " To delete all views::"
3971
msgstr ""
3972
3973
#: bzrlib/builtins.py:6344
3974
msgid " bzr view --delete --all"
3975
msgstr ""
3976
3977
#: bzrlib/builtins.py:6351
3978
msgid "Apply list or delete action to all views."
3979
msgstr ""
3980
3981
#: bzrlib/builtins.py:6354
3982
msgid "Delete the view."
3983
msgstr ""
3984
3985
#: bzrlib/builtins.py:6357
3986
msgid "Name of the view to define, list or delete."
3987
msgstr ""
3988
3989
#: bzrlib/builtins.py:6361
3990
msgid "Name of the view to switch to."
3991
msgstr ""
3992
3993
#: bzrlib/builtins.py:6380
3994
msgid "Both --delete and a file list specified"
3995
msgstr ""
3996
3997
#: bzrlib/builtins.py:6383
3998
msgid "Both --delete and --switch specified"
3999
msgstr ""
4000
4001
#: bzrlib/builtins.py:6386
4002
msgid "Deleted all views.\n"
4003
msgstr ""
4004
4005
#: bzrlib/builtins.py:6388
4006
msgid "No current view to delete"
4007
msgstr ""
4008
4009
#: bzrlib/builtins.py:6391
4010
#, python-format
4011
msgid "Deleted '%s' view.\n"
4012
msgstr ""
4013
4014
#: bzrlib/builtins.py:6395
4015
msgid "Both --switch and a file list specified"
4016
msgstr ""
4017
4018
#: bzrlib/builtins.py:6398
4019
msgid "Both --switch and --all specified"
4020
msgstr ""
4021
4022
#: bzrlib/builtins.py:6401
4023
msgid "No current view to disable"
4024
msgstr ""
4025
4026
#: bzrlib/builtins.py:6403
4027
#, python-format
4028
msgid "Disabled '%s' view.\n"
4029
msgstr ""
4030
4031
#: bzrlib/builtins.py:6407 bzrlib/builtins.py:6429
4032
msgid "Using '{0}' view: {1}\n"
4033
msgstr ""
4034
4035
#: bzrlib/builtins.py:6410
4036
msgid "Views defined:\n"
4037
msgstr ""
4038
4039
#: bzrlib/builtins.py:6419
4040
msgid "No views defined.\n"
4041
msgstr ""
4042
4043
#: bzrlib/builtins.py:6426
4044
msgid "Cannot change the 'off' pseudo view"
4045
msgstr ""
4046
4047
#: bzrlib/builtins.py:6434
4048
msgid "No current view.\n"
4049
msgstr ""
4050
4051
#: bzrlib/builtins.py:6437
4052
msgid "'{0}' view is: {1}\n"
4053
msgstr ""
4054
4055
#: bzrlib/builtins.py:6457
4056
msgid " <no hooks installed>\n"
4057
msgstr ""
4058
4059
#: bzrlib/builtins.py:6461
4060
msgid "Remove a branch."
4061
msgstr ""
4062
4063
#: bzrlib/builtins.py:6463
4064
msgid ""
4065
"This will remove the branch from the specified location but \n"
4066
"will keep any working tree or repository in place."
4067
msgstr ""
4068
4069
#: bzrlib/builtins.py:6468
4070
msgid " Remove the branch at repo/trunk::"
4071
msgstr ""
4072
4073
#: bzrlib/builtins.py:6470
4074
msgid " bzr remove-branch repo/trunk"
4075
msgstr ""
4076
4077
#: bzrlib/builtins.py:6477
4078
msgid "Remove branch even if it is the active branch."
4079
msgstr ""
4080
4081
#: bzrlib/builtins.py:6491
4082
msgid "Branch is active. Use --force to remove it."
4083
msgstr ""
4084
4085
#: bzrlib/builtins.py:6495
4086
msgid "Plaintext diff output."
4087
msgstr ""
4088
4089
#: bzrlib/builtins.py:6496
4090
msgid "Temporarily set aside some changes from the current tree."
4091
msgstr ""
4092
4093
#: bzrlib/builtins.py:6498
4094
msgid ""
4095
"Shelve allows you to temporarily put changes you've made \"on the shelf\",\n"
4096
"ie. out of the way, until a later time when you can bring them back from\n"
4097
"the shelf with the 'unshelve' command. The changes are stored alongside\n"
4098
"your working tree, and so they aren't propagated along with your branch nor\n"
4099
"will they survive its deletion."
4100
msgstr ""
4101
4102
#: bzrlib/builtins.py:6504
4103
msgid "If shelve --list is specified, previously-shelved changes are listed."
4104
msgstr ""
4105
4106
#: bzrlib/builtins.py:6506
4107
msgid ""
4108
"Shelve is intended to help separate several sets of changes that have\n"
4109
"been inappropriately mingled. If you just want to get rid of all changes\n"
4110
"and you don't need to restore them later, use revert. If you want to\n"
4111
"shelve all text changes at once, use shelve --all."
4112
msgstr ""
4113
4114
#: bzrlib/builtins.py:6511
4115
msgid ""
4116
"If filenames are specified, only the changes to those files will be\n"
4117
"shelved. Other files will be left untouched."
4118
msgstr ""
4119
4120
#: bzrlib/builtins.py:6514
4121
msgid ""
4122
"If a revision is specified, changes since that revision will be shelved."
4123
msgstr ""
4124
4125
#: bzrlib/builtins.py:6516
4126
msgid ""
4127
"You can put multiple items on the shelf, and by default, 'unshelve' will\n"
4128
"restore the most recently shelved changes."
4129
msgstr ""
4130
4131
#: bzrlib/builtins.py:6519
4132
msgid ""
4133
"For complicated changes, it is possible to edit the changes in a separate\n"
4134
"editor program to decide what the file remaining in the working copy\n"
4135
"should look like. To do this, add the configuration option"
4136
msgstr ""
4137
4138
#: bzrlib/builtins.py:6523
4139
msgid " change_editor = PROGRAM @new_path @old_path"
4140
msgstr ""
4141
4142
#: bzrlib/builtins.py:6525
4143
msgid ""
4144
"where @new_path is replaced with the path of the new version of the \n"
4145
"file and @old_path is replaced with the path of the old version of \n"
4146
"the file. The PROGRAM should save the new file with the desired \n"
4147
"contents of the file in the working tree.\n"
4148
" "
4149
msgstr ""
4150
4151
#: bzrlib/builtins.py:6537
4152
msgid "Shelve all changes."
4153
msgstr ""
4154
4155
#: bzrlib/builtins.py:6539
4156
msgid "Method to use for writing diffs."
4157
msgstr ""
4158
4159
#: bzrlib/builtins.py:6539
4160
msgid "writer"
4161
msgstr ""
4162
4163
#: bzrlib/builtins.py:6543
4164
msgid "List shelved changes."
4165
msgstr ""
4166
4167
#: bzrlib/builtins.py:6545
4168
msgid "Destroy removed changes instead of shelving them."
4169
msgstr ""
4170
4171
#: bzrlib/builtins.py:6574
4172
msgid "No shelved changes."
4173
msgstr ""
4174
4175
#: bzrlib/builtins.py:6585
4176
msgid "Restore shelved changes."
4177
msgstr ""
4178
4179
#: bzrlib/builtins.py:6587
4180
msgid ""
4181
"By default, the most recently shelved changes are restored. However if you\n"
4182
"specify a shelf by id those changes will be restored instead. This works\n"
4183
"best when the changes don't depend on each other."
4184
msgstr ""
4185
4186
#: bzrlib/builtins.py:6596
4187
msgid "The action to perform."
4188
msgstr ""
4189
4190
#: bzrlib/builtins.py:6596 bzrlib/conflicts.py:694
4191
msgid "action"
4192
msgstr ""
4193
4194
#: bzrlib/builtins.py:6598
4195
msgid "Apply changes and remove from the shelf."
4196
msgstr ""
4197
4198
#: bzrlib/builtins.py:6599
4199
msgid "Show changes, but do not apply or remove them."
4200
msgstr ""
4201
4202
#: bzrlib/builtins.py:6600
4203
msgid ""
4204
"Instead of unshelving the changes, show the diff that would result from "
4205
"unshelving."
4206
msgstr ""
4207
4208
#: bzrlib/builtins.py:6602
4209
msgid "Delete changes without applying them."
4210
msgstr ""
4211
4212
#: bzrlib/builtins.py:6603
4213
msgid "Apply changes but don't delete them."
4214
msgstr ""
4215
4216
#: bzrlib/builtins.py:6618
4217
msgid "Remove unwanted files from working tree."
4218
msgstr ""
4219
4220
#: bzrlib/builtins.py:6620
4221
msgid ""
4222
"By default, only unknown files, not ignored files, are deleted. Versioned\n"
4223
"files are never deleted."
4224
msgstr ""
4225
4226
#: bzrlib/builtins.py:6623
4227
msgid ""
4228
"Another class is 'detritus', which includes files emitted by bzr during\n"
4229
"normal operations and selftests. (The value of these files decreases with\n"
4230
"time.)"
4231
msgstr ""
4232
4233
#: bzrlib/builtins.py:6627
4234
msgid ""
4235
"If no options are specified, unknown files are deleted. Otherwise, option\n"
4236
"flags are respected, and may be combined."
4237
msgstr ""
4238
4239
#: bzrlib/builtins.py:6630
4240
msgid "To check what clean-tree will do, use --dry-run."
4241
msgstr ""
4242
4243
#: bzrlib/builtins.py:6633
4244
msgid "Delete all ignored files."
4245
msgstr ""
4246
4247
#: bzrlib/builtins.py:6634
4248
msgid ""
4249
"Delete conflict files, merge and revert backups, and failed selftest dirs."
4250
msgstr ""
4251
4252
#: bzrlib/builtins.py:6637
4253
msgid "Delete files unknown to bzr (default)."
4254
msgstr ""
4255
4256
#: bzrlib/builtins.py:6638
4257
msgid "Show files to delete instead of deleting them."
4258
msgstr ""
4259
4260
#: bzrlib/builtins.py:6640
4261
msgid "Do not prompt before deleting."
4262
msgstr ""
4263
4264
#: bzrlib/bundle/__init__.py:59
4265
msgid "A directory cannot be a bundle"
4266
msgstr ""
4267
4268
#: bzrlib/bundle/apply_bundle.py:40
4269
msgid "Install revisions"
4270
msgstr ""
4271
4272
#: bzrlib/bundle/commands.py:64
4273
msgid "--verbose requires a merge directive"
4274
msgstr ""
4275
4276
#: bzrlib/bundle/commands.py:67
4277
msgid "Bundle format not supported"
4278
msgstr ""
4279
4280
#: bzrlib/bundle/commands.py:77
4281
msgid "Records\n"
4282
msgstr ""
4283
4284
#: bzrlib/bundle/commands.py:81
4285
msgid "{0}: {1} ({2} multiparent)\n"
4286
msgstr ""
4287
4288
#: bzrlib/bundle/commands.py:83
4289
#, python-format
4290
msgid "unique files: %d\n"
4291
msgstr ""
4292
4293
#: bzrlib/bundle/commands.py:92
4294
msgid "Revisions\n"
4295
msgstr ""
4296
4297
#: bzrlib/bundle/commands.py:93
4298
#, python-format
4299
msgid "nicks: %s\n"
4300
msgstr ""
4301
4302
#: bzrlib/bundle/commands.py:95
4303
#, python-format
4304
msgid ""
4305
"committers: \n"
4306
"%s\n"
4307
msgstr ""
4308
4309
#: bzrlib/bundle/commands.py:103
4310
msgid "Decoded contents\n"
4311
msgstr ""
4312
4313
#: bzrlib/bundle/serializer/v4.py:327
4314
#, python-format
4315
msgid "Bundling %d revision."
4316
msgid_plural "Bundling %d revisions."
4317
msgstr[0] ""
4318
msgstr[1] ""
4319
4320
#: bzrlib/bzrdir.py:487
4321
msgid ""
4322
"making backup of {0}\n"
4323
" to {1}"
4324
msgstr ""
4325
4326
#: bzrlib/bzrdir.py:510
4327
msgid "renamed {0} to {1}"
4328
msgstr ""
4329
4330
#: bzrlib/bzrdir.py:1639
4331
#, python-format
4332
msgid ""
4333
"Source repository format does not support stacking, using format:\n"
4334
" %s"
4335
msgstr ""
4336
4337
#: bzrlib/bzrdir.py:1659
4338
#, python-format
4339
msgid ""
4340
"Source branch format does not support stacking, using format:\n"
4341
" %s"
4342
msgstr ""
4343
4344
#: bzrlib/bzrdir.py:1805
4345
msgid "starting repository conversion"
4346
msgstr ""
4347
4348
#: bzrlib/bzrdir.py:2026
4349
msgid "Using default stacking branch {0} at {1}"
4350
msgstr ""
4351
4352
#: bzrlib/check.py:108
4353
msgid "check"
4354
msgstr ""
4355
4356
#: bzrlib/check.py:110
4357
msgid "checking revisions"
4358
msgstr ""
4359
4360
#: bzrlib/check.py:112
4361
msgid "checking commit contents"
4362
msgstr ""
4363
4364
#: bzrlib/check.py:114
4365
msgid "checking file graphs"
4366
msgstr ""
4367
4368
#: bzrlib/check.py:118
4369
msgid "checking branches and trees"
4370
msgstr ""
4371
4372
#: bzrlib/check.py:205
4373
msgid "checked repository {0} format {1}"
4374
msgstr ""
4375
4376
#: bzrlib/check.py:208
4377
#, python-format
4378
msgid "%6d revisions"
4379
msgstr ""
4380
4381
#: bzrlib/check.py:209
4382
#, python-format
4383
msgid "%6d file-ids"
4384
msgstr ""
4385
4386
#: bzrlib/check.py:211
4387
#, python-format
4388
msgid "%6d unreferenced text versions"
4389
msgstr ""
4390
4391
#: bzrlib/check.py:215
4392
msgid "unreferenced version: {{{0}}} in {1}"
4393
msgstr ""
4394
4395
#: bzrlib/check.py:218
4396
#, python-format
4397
msgid "%6d revisions are missing inventory_sha1"
4398
msgstr ""
4399
4400
#: bzrlib/check.py:221
4401
#, python-format
4402
msgid "%6d revisions are mentioned but not present"
4403
msgstr ""
4404
4405
#: bzrlib/check.py:224
4406
#, python-format
4407
msgid "%6d ghost revisions"
4408
msgstr ""
4409
4410
#: bzrlib/check.py:229
4411
#, python-format
4412
msgid "%6d revisions missing parents in ancestry"
4413
msgstr ""
4414
4415
#: bzrlib/check.py:233
4416
#, python-format
4417
msgid " %s should be in the ancestry for:"
4418
msgstr ""
4419
4420
#: bzrlib/check.py:237
4421
#, python-format
4422
msgid "%6d inconsistent parents"
4423
msgstr ""
4424
4425
#: bzrlib/check.py:241
4426
msgid " * {0} version {1} has parents {2!r} but should have {3!r}"
4427
msgstr ""
4428
4429
#: bzrlib/check.py:247
4430
#, python-format
4431
msgid "%6d revisions have incorrect parents in the revision index"
4432
msgstr ""
4433
4434
#: bzrlib/check.py:253
4435
msgid " {0} has wrong parents in index: {1!r} should be {2!r}"
4436
msgstr ""
4437
4438
#: bzrlib/check.py:267
4439
msgid "Mismatched internal revid {{{0}}} and index revid {{{1}}}"
4440
msgstr ""
4441
4442
#: bzrlib/check.py:296
4443
msgid ""
4444
"Multiple expected sha1s for {0}. {{{1}}} expects {{{2}}}, {{{3}}} expects "
4445
"{{{4}}}"
4446
msgstr ""
4447
4448
#: bzrlib/check.py:354
4449
#, python-format
4450
msgid "Checking branch at '%s'."
4451
msgstr ""
4452
4453
#: bzrlib/check.py:374
4454
#, python-format
4455
msgid "Checking working tree at '%s'."
4456
msgstr ""
4457
4458
#: bzrlib/check.py:427 bzrlib/check.py:441
4459
msgid "No branch found at specified location."
4460
msgstr ""
4461
4462
#: bzrlib/check.py:429 bzrlib/check.py:439
4463
msgid "No working tree found at specified location."
4464
msgstr ""
4465
4466
#: bzrlib/check.py:432
4467
#, python-format
4468
msgid "Checking repository at '%s'."
4469
msgstr ""
4470
4471
#: bzrlib/check.py:443
4472
msgid "No repository found at specified location."
4473
msgstr ""
4474
4475
#: bzrlib/clean_tree.py:63
4476
msgid "Nothing to delete."
4477
msgstr ""
4478
4479
#: bzrlib/clean_tree.py:68
4480
msgid "Are you sure you wish to delete these"
4481
msgstr ""
4482
4483
#: bzrlib/clean_tree.py:70
4484
msgid "Canceled"
4485
msgstr ""
4486
4487
#: bzrlib/clean_tree.py:107
4488
#, python-format
4489
msgid "unable to remove %s"
4490
msgstr ""
4491
4492
#: bzrlib/clean_tree.py:111
4493
msgid "deleting paths:"
4494
msgstr ""
4495
4496
#: bzrlib/clean_tree.py:125
4497
msgid "unable to remove \"{0}\": {1}."
4498
msgstr ""
4499
4500
#: bzrlib/clean_tree.py:130
4501
msgid "No files deleted."
4502
msgstr ""
4503
4504
#: bzrlib/cmd_version_info.py:47
4505
msgid "No known version info format {0}. Supported types are: {1}"
4506
msgstr ""
4507
4508
#: bzrlib/cmd_version_info.py:52
4509
msgid "Version info in Custom template-based format."
4510
msgstr ""
4511
4512
#: bzrlib/cmd_version_info.py:52
4513
msgid "Version info in Python format."
4514
msgstr ""
4515
4516
#: bzrlib/cmd_version_info.py:52
4517
msgid "Version info in RIO (simple text) format (default)."
4518
msgstr ""
4519
4520
#: bzrlib/cmd_version_info.py:53
4521
msgid "Show version information about this tree."
4522
msgstr ""
4523
4524
#: bzrlib/cmd_version_info.py:55
4525
msgid ""
4526
"You can use this command to add information about version into\n"
4527
"source code of an application. The output can be in one of the\n"
4528
"supported formats or in a custom format based on a template."
4529
msgstr ""
4530
4531
#: bzrlib/cmd_version_info.py:59 en/help_topics/configuration.txt:712
4532
#: en/help_topics/configuration.txt:722
4533
msgid "For example::"
4534
msgstr ""
4535
4536
#: bzrlib/cmd_version_info.py:61
4537
msgid ""
4538
" bzr version-info --custom \\\n"
4539
" --template=\"#define VERSION_INFO \\\"Project 1.2.3 (r{revno})\\\"\\n\""
4540
msgstr ""
4541
4542
#: bzrlib/cmd_version_info.py:64
4543
msgid ""
4544
"will produce a C header file with formatted string containing the\n"
4545
"current revision number. Other supported variables in templates are:"
4546
msgstr ""
4547
4548
#: bzrlib/cmd_version_info.py:67
4549
msgid ""
4550
" * {date} - date of the last revision\n"
4551
" * {build_date} - current date\n"
4552
" * {revno} - revision number\n"
4553
" * {revision_id} - revision id\n"
4554
" * {branch_nick} - branch nickname\n"
4555
" * {clean} - 0 if the source tree contains uncommitted changes,\n"
4556
" otherwise 1"
4557
msgstr ""
4558
4559
#: bzrlib/cmd_version_info.py:77
4560
msgid "Select the output format."
4561
msgstr ""
4562
4563
#: bzrlib/cmd_version_info.py:81
4564
msgid "Include all possible information."
4565
msgstr ""
4566
4567
#: bzrlib/cmd_version_info.py:82
4568
msgid "Check if tree is clean."
4569
msgstr ""
4570
4571
#: bzrlib/cmd_version_info.py:84
4572
msgid "Include the revision-history."
4573
msgstr ""
4574
4575
#: bzrlib/cmd_version_info.py:86
4576
msgid "Include the last revision for each file."
4577
msgstr ""
4578
4579
#: bzrlib/cmd_version_info.py:87
4580
msgid "Template for the output."
4581
msgstr ""
4582
4583
#: bzrlib/cmd_version_info.py:101
4584
msgid "bzr version-info --revision takes exactly one revision specifier"
4585
msgstr ""
4586
4587
#: bzrlib/commands.py:229
4588
#, python-format
4589
msgid "unknown command \"%s\""
4590
msgstr ""
4591
4592
#: bzrlib/commands.py:476
4593
msgid "No help for this command."
4594
msgstr ""
4595
4596
#: bzrlib/commands.py:489
4597
#, python-format
4598
msgid ":Purpose: %s\n"
4599
msgstr ""
4600
4601
#: bzrlib/commands.py:491
4602
#, python-format
4603
msgid ""
4604
":Usage:\n"
4605
"%s\n"
4606
msgstr ""
4607
4608
#: bzrlib/commands.py:493
4609
#, python-format
4610
msgid ":Usage: %s\n"
4611
msgstr ""
4612
4613
#: bzrlib/commands.py:512
4614
#, python-format
4615
msgid ":Options:%s"
4616
msgstr ""
4617
4618
#: bzrlib/commands.py:523
4619
#, python-format
4620
msgid ""
4621
":Description:\n"
4622
" %s\n"
4623
"\n"
4624
msgstr ""
4625
4626
#: bzrlib/commands.py:533
4627
#, python-format
4628
msgid ""
4629
"See bzr help %s for more details and examples.\n"
4630
"\n"
4631
msgstr ""
4632
4633
#: bzrlib/commands.py:538
4634
msgid ":Aliases: "
4635
msgstr ""
4636
4637
#: bzrlib/commands.py:542
4638
#, python-format
4639
msgid ":From: plugin \"%s\"\n"
4640
msgstr ""
4641
4642
#: bzrlib/commands.py:554
4643
msgid ":doc:`{0} <{1}-help>`"
4644
msgstr ""
4645
4646
#: bzrlib/commands.py:558
4647
#, python-format
4648
msgid ":See also: %s"
4649
msgstr ""
4650
4651
#: bzrlib/commands.py:826 bzrlib/gpg.py:347
4652
msgid "Only ASCII permitted in option names"
4653
msgstr ""
4654
4655
#: bzrlib/commands.py:851 bzrlib/commands.py:859
4656
msgid "command {0!r} needs one or more {1}"
4657
msgstr ""
4658
4659
#: bzrlib/commands.py:868
4660
msgid "command {0!r} requires argument {1}"
4661
msgstr ""
4662
4663
#: bzrlib/commands.py:875
4664
msgid "extra argument to command {0}: {1}"
4665
msgstr ""
4666
4667
#: bzrlib/commands.py:972
4668
#, python-format
4669
msgid "Profile data written to \"%s\"."
4670
msgstr ""
4671
4672
#: bzrlib/commit.py:117 bzrlib/commit.py:740
4673
msgid "added"
4674
msgstr ""
4675
4676
#: bzrlib/commit.py:117 bzrlib/commit.py:748
4677
msgid "modified"
4678
msgstr ""
4679
4680
#: bzrlib/commit.py:131
4681
#, python-format
4682
msgid "Committing%s"
4683
msgstr ""
4684
4685
#: bzrlib/commit.py:134
4686
#, python-format
4687
msgid "Committed revision %d."
4688
msgstr ""
4689
4690
#: bzrlib/commit.py:143
4691
#, python-format
4692
msgid "deleted %s"
4693
msgstr ""
4694
4695
#: bzrlib/commit.py:146
4696
#, python-format
4697
msgid "missing %s"
4698
msgstr ""
4699
4700
#: bzrlib/commit.py:511
4701
msgid ""
4702
"Conflicting tags in bound branch:\n"
4703
"{0}"
4704
msgstr ""
4705
4706
#: bzrlib/commit.py:742
4707
msgid "renamed"
4708
msgstr ""
4709
4710
#: bzrlib/commit.py:976
4711
msgid "unchanged"
4712
msgstr ""
4713
4714
#: bzrlib/commit.py:998
4715
msgid "{0} [{1}] - Stage"
4716
msgstr ""
4717
4718
#: bzrlib/commit.py:1001
4719
#, python-format
4720
msgid "%s - Stage"
4721
msgstr ""
4722
4723
#: bzrlib/commit_signature_commands.py:34
4724
msgid "Sign all commits by a given committer."
4725
msgstr ""
4726
4727
#: bzrlib/commit_signature_commands.py:36
4728
msgid ""
4729
"If location is not specified the local tree is used.\n"
4730
"If committer is not specified the default committer is used."
4731
msgstr ""
4732
4733
#: bzrlib/commit_signature_commands.py:39
4734
msgid "This does not sign commits that already have signatures."
4735
msgstr ""
4736
4737
#: bzrlib/commit_signature_commands.py:47
4738
msgid ""
4739
"Don't actually sign anything, just print the revisions that would be signed."
4740
msgstr ""
4741
4742
#: bzrlib/commit_signature_commands.py:98
4743
#, python-format
4744
msgid "Signed %d revision.\n"
4745
msgid_plural "Signed %d revisions.\n"
4746
msgstr[0] ""
4747
msgstr[1] ""
4748
4749
#: bzrlib/commit_signature_commands.py:103
4750
msgid "Verify all commit signatures."
4751
msgstr ""
4752
4753
#: bzrlib/commit_signature_commands.py:105
4754
msgid ""
4755
"Verifies that all commits in the branch are signed by known GnuPG keys."
4756
msgstr ""
4757
4758
#: bzrlib/commit_signature_commands.py:110
4759
msgid ""
4760
"Comma separated list of GPG key patterns which are acceptable for "
4761
"verification."
4762
msgstr ""
4763
4764
#: bzrlib/commit_signature_commands.py:148
4765
msgid "Cannot verify a range of non-revision-history revisions"
4766
msgstr ""
4767
4768
#: bzrlib/commit_signature_commands.py:166
4769
msgid "All commits signed with verifiable keys"
4770
msgstr ""
4771
4772
#: bzrlib/config.py:436
4773
msgid "Invalid config value for \"{0}\" value {1!r} is not an SI unit."
4774
msgstr ""
4775
4776
#: bzrlib/config.py:2452
4777
msgid "{0} is not an SI unit."
4778
msgstr ""
4779
4780
#: bzrlib/config.py:2971
4781
msgid ""
4782
"Option {0} in section {1} of {2} was changed from {3} to {4}. The {5} value "
4783
"will be saved."
4784
msgstr ""
4785
4786
#: bzrlib/config.py:3116
4787
#, python-format
4788
msgid "Invalid '%s', should be of the form 'name=value'"
4789
msgstr ""
4790
4791
#: bzrlib/config.py:4018
4792
msgid "Display, set or remove a configuration option."
4793
msgstr ""
4794
4795
#: bzrlib/config.py:4020
4796
msgid "Display the active value for a given option."
4797
msgstr ""
4798
4799
#: bzrlib/config.py:4022
4800
msgid ""
4801
"If --all is specified, NAME is interpreted as a regular expression and all\n"
4802
"matching options are displayed mentioning their scope. The active value\n"
4803
"that bzr will take into account is the first one displayed for each option."
4804
msgstr ""
4805
4806
#: bzrlib/config.py:4026
4807
msgid "If no NAME is given, --all .* is implied."
4808
msgstr ""
4809
4810
#: bzrlib/config.py:4028
4811
msgid ""
4812
"Setting a value is achieved by using name=value without spaces. The value\n"
4813
"is set in the most relevant scope and can be checked by displaying the\n"
4814
"option again."
4815
msgstr ""
4816
4817
#: bzrlib/config.py:4040
4818
msgid "Reduce the scope to the specified configuration file."
4819
msgstr ""
4820
4821
#: bzrlib/config.py:4044
4822
msgid "Display all the defined values for the matching options."
4823
msgstr ""
4824
4825
#: bzrlib/config.py:4046
4826
msgid "Remove the option from the configuration file."
4827
msgstr ""
4828
4829
#: bzrlib/conflicts.py:50
4830
msgid "List files with conflicts."
4831
msgstr ""
4832
4833
#: bzrlib/conflicts.py:57
4834
msgid ""
4835
"Conflicts normally are listed as short, human-readable messages. If --text\n"
4836
"is supplied, the pathnames of files with text conflicts are listed,\n"
4837
"instead. (This is useful for editing all files with text conflicts.)"
4838
msgstr ""
4839
4840
#: bzrlib/conflicts.py:61
4841
msgid "Use bzr resolve when you have fixed a problem."
4842
msgstr ""
4843
4844
#: bzrlib/conflicts.py:66
4845
msgid "List paths of files with text conflicts."
4846
msgstr ""
4847
4848
#: bzrlib/conflicts.py:85
4849
msgid "Marks the conflict as resolved."
4850
msgstr ""
4851
4852
#: bzrlib/conflicts.py:88
4853
msgid "Resolve the conflict preserving the version in the working tree."
4854
msgstr ""
4855
4856
#: bzrlib/conflicts.py:91
4857
msgid "Resolve the conflict taking the merged version into account."
4858
msgstr ""
4859
4860
#: bzrlib/conflicts.py:98
4861
msgid "How to resolve the conflict."
4862
msgstr ""
4863
4864
#: bzrlib/conflicts.py:104
4865
msgid "Mark a conflict as resolved."
4866
msgstr ""
4867
4868
#: bzrlib/conflicts.py:111
4869
msgid ""
4870
"Once you have fixed a problem, use \"bzr resolve\" to automatically mark\n"
4871
"text conflicts as fixed, \"bzr resolve FILE\" to mark a specific conflict "
4872
"as\n"
4873
"resolved, or \"bzr resolve --all\" to mark all conflicts as resolved."
4874
msgstr ""
4875
4876
#: bzrlib/conflicts.py:119
4877
msgid "Resolve all conflicts in this tree."
4878
msgstr ""
4879
4880
#: bzrlib/conflicts.py:126
4881
msgid "If --all is specified, no FILE may be provided"
4882
msgstr ""
4883
4884
#: bzrlib/conflicts.py:151
4885
#, python-format
4886
msgid "%d conflict auto-resolved."
4887
msgid_plural "%d conflicts auto-resolved."
4888
msgstr[0] ""
4889
msgstr[1] ""
4890
4891
#: bzrlib/conflicts.py:154
4892
msgid "Remaining conflicts:"
4893
msgstr ""
4894
4895
#: bzrlib/conflicts.py:159
4896
msgid "All conflicts resolved."
4897
msgstr ""
4898
4899
#: bzrlib/conflicts.py:168
4900
msgid "{0} conflict resolved, {1} remaining"
4901
msgid_plural "{0} conflicts resolved, {1} remaining"
4902
msgstr[0] ""
4903
msgstr[1] ""
4904
4905
#: bzrlib/controldir.py:712
4906
msgid "{0} is{1} redirected to {2}"
4907
msgstr ""
4908
4909
#: bzrlib/diff.py:399
4910
#, python-format
4911
msgid "*** Ignoring files outside view. View is %s"
4912
msgstr ""
4913
4914
#: bzrlib/errors.py:157
4915
msgid "The tree builder is already building a tree."
4916
msgstr ""
4917
4918
#: bzrlib/errors.py:178
4919
msgid "The dirstate file (%(state)s) appears to be corrupt: %(msg)s"
4920
msgstr ""
4921
4922
#: bzrlib/errors.py:197
4923
msgid ""
4924
"The API for \"%(api)s\" is not compatible with \"%(wanted)s\". It supports "
4925
"versions \"%(minimum)s\" to \"%(current)s\"."
4926
msgstr ""
4927
4928
#: bzrlib/errors.py:209
4929
msgid "The transport '%(transport)s' is only accessible within this process."
4930
msgstr ""
4931
4932
#: bzrlib/errors.py:227
4933
msgid "Invalid revision number %(revno)s"
4934
msgstr ""
4935
4936
#: bzrlib/errors.py:236
4937
msgid "Invalid revision-id {%(revision_id)s} in %(branch)s"
4938
msgstr ""
4939
4940
#: bzrlib/errors.py:247
4941
msgid "Reserved revision-id {%(revision_id)s}"
4942
msgstr ""
4943
4944
#: bzrlib/errors.py:261
4945
msgid "There is no public branch set for \"%(branch_url)s\"."
4946
msgstr ""
4947
4948
#: bzrlib/errors.py:271
4949
msgid ""
4950
"No help could be found for '%(topic)s'. Please use 'bzr help topics' to "
4951
"obtain a list of topics."
4952
msgstr ""
4953
4954
#: bzrlib/errors.py:280
4955
msgid "The file id \"%(file_id)s\" is not present in the tree %(tree)s."
4956
msgstr ""
4957
4958
#: bzrlib/errors.py:290
4959
msgid ""
4960
"The file id \"%(file_id)s\" is not present in the repository %(repository)r"
4961
msgstr ""
4962
4963
#: bzrlib/errors.py:299
4964
msgid "The branch '%(branch)s' is not stacked."
4965
msgstr ""
4966
4967
#: bzrlib/errors.py:313
4968
msgid "No WorkingTree exists for \"%(base)s\"."
4969
msgstr ""
4970
4971
#: bzrlib/errors.py:322
4972
msgid "Not currently building a tree."
4973
msgstr ""
4974
4975
#: bzrlib/errors.py:327
4976
msgid "%(url)s is not a local path."
4977
msgstr ""
4978
4979
#: bzrlib/errors.py:355
4980
msgid "%(not_locked)r is not write locked but needs to be."
4981
msgstr ""
4982
4983
#: bzrlib/errors.py:363
4984
msgid "Error in command line options"
4985
msgstr ""
4986
4987
#: bzrlib/errors.py:368
4988
msgid "%(value)s is not an index of type %(_type)s."
4989
msgstr ""
4990
4991
#: bzrlib/errors.py:378
4992
msgid "Error in data for index %(value)s."
4993
msgstr ""
4994
4995
#: bzrlib/errors.py:387
4996
msgid "The key '%(key)s' is already in index '%(index)s'."
4997
msgstr ""
4998
4999
#: bzrlib/errors.py:397
5000
msgid "The key '%(key)s' is not a valid key."
5001
msgstr ""
5002
5003
#: bzrlib/errors.py:406
5004
msgid "Could not parse options for index %(value)s."
5005
msgstr ""
5006
5007
#: bzrlib/errors.py:415
5008
msgid "The value '%(value)s' is not a valid value."
5009
msgstr ""
5010
5011
#: bzrlib/errors.py:424
5012
msgid "Bad value \"%(value)s\" for option \"%(name)s\"."
5013
msgstr ""
5014
5015
#: bzrlib/errors.py:443
5016
msgid "Generic path error: %(path)r%(extra)s)"
5017
msgstr ""
5018
5019
#: bzrlib/errors.py:456
5020
msgid "No such file: %(path)r%(extra)s"
5021
msgstr ""
5022
5023
#: bzrlib/errors.py:461
5024
msgid "File exists: %(path)r%(extra)s"
5025
msgstr ""
5026
5027
#: bzrlib/errors.py:467
5028
msgid ""
5029
"Could not rename %(source)s => %(dest)s because both files exist. (Use --"
5030
"after to tell bzr about a rename that has already happened)%(extra)s"
5031
msgstr ""
5032
5033
#: bzrlib/errors.py:483
5034
msgid "\"%(path)s\" is not a directory %(extra)s"
5035
msgstr ""
5036
5037
#: bzrlib/errors.py:488
5038
msgid "\"%(path)s\" is not in the working directory %(extra)s"
5039
msgstr ""
5040
5041
#: bzrlib/errors.py:493
5042
msgid "Directory not empty: \"%(path)s\"%(extra)s"
5043
msgstr ""
5044
5045
#: bzrlib/errors.py:498
5046
msgid "Hard-linking \"%(path)s\" is not supported"
5047
msgstr ""
5048
5049
#: bzrlib/errors.py:513
5050
msgid "Device or resource busy: \"%(path)s\"%(extra)s"
5051
msgstr ""
5052
5053
#: bzrlib/errors.py:518
5054
msgid "Permission denied: \"%(path)s\"%(extra)s"
5055
msgstr ""
5056
5057
#: bzrlib/errors.py:523
5058
msgid "Invalid url supplied to transport: \"%(path)s\"%(extra)s"
5059
msgstr ""
5060
5061
#: bzrlib/errors.py:528
5062
msgid "Invalid URL join request: %(reason)s: %(base)r + %(join_args)r"
5063
msgstr ""
5064
5065
#: bzrlib/errors.py:539
5066
msgid "URLs differ by more than path: %(from_)r and %(to)r"
5067
msgstr ""
5068
5069
#: bzrlib/errors.py:561
5070
msgid "The %(type)s hook '%(hook)s' is unknown in this version of bzrlib."
5071
msgstr ""
5072
5073
#: bzrlib/errors.py:571
5074
msgid "Unsupported protocol for url \"%(path)s\"%(extra)s"
5075
msgstr ""
5076
5077
#: bzrlib/errors.py:579
5078
msgid ""
5079
"The branch '%(url)s'(%(format)s) is not a stackable format. You will need to "
5080
"upgrade the branch to permit branch stacking."
5081
msgstr ""
5082
5083
#: bzrlib/errors.py:590
5084
msgid "The branch '%(branch_url)s' cannot be stacked on '%(target_url)s'."
5085
msgstr ""
5086
5087
#: bzrlib/errors.py:600
5088
msgid ""
5089
"The repository '%(url)s'(%(format)s) is not a stackable format. You will "
5090
"need to upgrade the repository to permit branch stacking."
5091
msgstr ""
5092
5093
#: bzrlib/errors.py:611
5094
msgid "Error reading from %(path)r."
5095
msgstr ""
5096
5097
#: bzrlib/errors.py:630
5098
msgid "Path \"%(path)s\" is not a child of path \"%(base)s\"%(extra)s"
5099
msgstr ""
5100
5101
#: bzrlib/errors.py:646
5102
msgid "Path \"%(path)s\" is not unicode normalized"
5103
msgstr ""
5104
5105
#: bzrlib/errors.py:654
5106
msgid "Not a branch: \"%(path)s\"%(detail)s."
5107
msgstr ""
5108
5109
#: bzrlib/errors.py:696
5110
msgid "No submit branch available for branch \"%(path)s\""
5111
msgstr ""
5112
5113
#: bzrlib/errors.py:705
5114
msgid "A control directory already exists: \"%(path)s\"."
5115
msgstr ""
5116
5117
#: bzrlib/errors.py:710
5118
msgid "Already a branch: \"%(path)s\"."
5119
msgstr ""
5120
5121
#: bzrlib/errors.py:715
5122
msgid "Invalid branch name: %(name)s"
5123
msgstr ""
5124
5125
#: bzrlib/errors.py:724
5126
msgid "Parent branch already exists: \"%(path)s\"."
5127
msgstr ""
5128
5129
#: bzrlib/errors.py:730
5130
msgid ""
5131
"Directory contains a branch, but no working tree (use bzr checkout if you "
5132
"wish to build a working tree): \"%(path)s\""
5133
msgstr ""
5134
5135
#: bzrlib/errors.py:735
5136
msgid ""
5137
"\"%(function)s\" called on an AtomicFile after it was closed: \"%(path)s\""
5138
msgstr ""
5139
5140
#: bzrlib/errors.py:745
5141
msgid ""
5142
"Parent not accessible given base \"%(base)s\" and relative path \"%(path)s\""
5143
msgstr ""
5144
5145
#: bzrlib/errors.py:755
5146
msgid "No repository present: \"%(path)s\""
5147
msgstr ""
5148
5149
#: bzrlib/errors.py:762
5150
msgid ""
5151
"Unsupported branch format: %(format)s\n"
5152
"Please run 'bzr upgrade'"
5153
msgstr ""
5154
5155
#: bzrlib/errors.py:768
5156
msgid "Unknown %(kind)s format: %(format)r"
5157
msgstr ""
5158
5159
#: bzrlib/errors.py:777
5160
msgid "Format %(format)s is not compatible with .bzr version %(bzrdir)s."
5161
msgstr ""
5162
5163
#: bzrlib/errors.py:787
5164
msgid "Parse error on line %(lineno)d of %(format)s format: %(line)s"
5165
msgstr ""
5166
5167
#: bzrlib/errors.py:802
5168
msgid ""
5169
"%(target)s\n"
5170
"is not compatible with\n"
5171
"%(source)s\n"
5172
"%(details)s"
5173
msgstr ""
5174
5175
#: bzrlib/errors.py:818
5176
msgid "Revision is not compatible with %(repo_format)s"
5177
msgstr ""
5178
5179
#: bzrlib/errors.py:828
5180
msgid "%(context_info)s%(path)s is already versioned."
5181
msgstr ""
5182
5183
#: bzrlib/errors.py:849
5184
msgid "%(context_info)s%(path)s is not versioned."
5185
msgstr ""
5186
5187
#: bzrlib/errors.py:870
5188
msgid "Path(s) are not versioned: %(paths_as_string)s"
5189
msgstr ""
5190
5191
#: bzrlib/errors.py:881
5192
msgid "Path(s) do not exist: %(paths_as_string)s%(extra)s"
5193
msgstr ""
5194
5195
#: bzrlib/errors.py:900
5196
msgid "Cannot operate on \"%(filename)s\" of unsupported kind \"%(kind)s\""
5197
msgstr ""
5198
5199
#: bzrlib/errors.py:908
5200
msgid ""
5201
"Filename %(filename)r is not valid in your current filesystem encoding "
5202
"%(fs_encoding)s"
5203
msgstr ""
5204
5205
#: bzrlib/errors.py:919
5206
msgid "Cannot operate on \"%(filename)s\" because it is a control file"
5207
msgstr ""
5208
5209
#: bzrlib/errors.py:937
5210
msgid "The lock for '%(lock_description)s' is in use and cannot be broken."
5211
msgstr ""
5212
5213
#: bzrlib/errors.py:976
5214
msgid "Cannot lock %(lock)s: %(why)s"
5215
msgstr ""
5216
5217
#: bzrlib/errors.py:986
5218
msgid ""
5219
"A transaction related operation was attempted after the transaction finished."
5220
msgstr ""
5221
5222
#: bzrlib/errors.py:1013
5223
msgid "Cannot lock: transport is read only: %(transport)s"
5224
msgstr ""
5225
5226
#: bzrlib/errors.py:1021
5227
msgid "Could not acquire lock \"%(lock)s\": %(msg)s"
5228
msgstr ""
5229
5230
#: bzrlib/errors.py:1032
5231
msgid ""
5232
"Lock was broken while still open: %(lock)s - check storage consistency!"
5233
msgstr ""
5234
5235
#: bzrlib/errors.py:1043
5236
msgid ""
5237
"Lock was released and re-acquired before being broken: %(lock)s: held by "
5238
"%(holder)r, wanted to break %(target)r"
5239
msgstr ""
5240
5241
#: bzrlib/errors.py:1055
5242
msgid ""
5243
"Lock is apparently held, but corrupted: %(corruption_info)s\n"
5244
"Use 'bzr break-lock' to clear it"
5245
msgstr ""
5246
5247
#: bzrlib/errors.py:1068
5248
msgid "Lock not held: %(lock)s"
5249
msgstr ""
5250
5251
#: bzrlib/errors.py:1097
5252
msgid "No changes to commit"
5253
msgstr ""
5254
5255
#: bzrlib/errors.py:1102
5256
msgid ""
5257
"Selected-file commit of merges is not supported yet: files %(files_str)s"
5258
msgstr ""
5259
5260
#: bzrlib/errors.py:1112
5261
msgid ""
5262
"Excluding paths during commit is not supported by repository at "
5263
"%(repository)r."
5264
msgstr ""
5265
5266
#: bzrlib/errors.py:1121
5267
msgid ""
5268
"The specified commit message contains characters unsupported by the current "
5269
"encoding."
5270
msgstr ""
5271
5272
#: bzrlib/errors.py:1127
5273
msgid "Upgrade URL cannot work with readonly URLs."
5274
msgstr ""
5275
5276
#: bzrlib/errors.py:1132
5277
msgid "The branch format %(format)s is already at the most recent format."
5278
msgstr ""
5279
5280
#: bzrlib/errors.py:1155
5281
msgid "Option --change does not accept revision ranges"
5282
msgstr ""
5283
5284
#: bzrlib/errors.py:1160
5285
msgid "No namespace registered for string: %(spec)r"
5286
msgstr ""
5287
5288
#: bzrlib/errors.py:1179
5289
msgid ""
5290
"Requested revision: '%(spec)s' does not exist in branch: "
5291
"%(branch_url)s%(extra)s"
5292
msgstr ""
5293
5294
#: bzrlib/errors.py:1193
5295
msgid ""
5296
"Operation denied because it would change the main history, which is not "
5297
"permitted by the append_revisions_only setting on branch \"%(location)s\"."
5298
msgstr ""
5299
5300
#: bzrlib/errors.py:1204
5301
msgid ""
5302
"These branches have diverged. Use the missing command to see how.\n"
5303
"Use the merge command to reconcile them."
5304
msgstr ""
5305
5306
#: bzrlib/errors.py:1224
5307
msgid ""
5308
"Branches have no common ancestor, and no merge base revision was specified."
5309
msgstr ""
5310
5311
#: bzrlib/errors.py:1230
5312
msgid ""
5313
"Selected merge cannot perform reverse cherrypicks. Try merge3 or diff3."
5314
msgstr ""
5315
5316
#: bzrlib/errors.py:1236
5317
msgid "Revisions have no common ancestor: %(revision_a)s %(revision_b)s"
5318
msgstr ""
5319
5320
#: bzrlib/errors.py:1245
5321
msgid ""
5322
"Revisions are not derived from the same root: %(revision_a)s %(revision_b)s."
5323
msgstr ""
5324
5325
#: bzrlib/errors.py:1254
5326
msgid "Revision %(rev_id)s is not an ancestor of %(not_ancestor_id)s"
5327
msgstr ""
5328
5329
#: bzrlib/errors.py:1263
5330
msgid "Branch %(branch)s has no commits."
5331
msgstr ""
5332
5333
#: bzrlib/errors.py:1281
5334
msgid ""
5335
"Bound branch %(branch)s is out of date with master branch "
5336
"%(master)s.%(extra_help)s"
5337
msgstr ""
5338
5339
#: bzrlib/errors.py:1293
5340
msgid ""
5341
"Cannot commit to branch %(branch)s. It is bound to %(master)s, which is "
5342
"bound to %(remote)s."
5343
msgstr ""
5344
5345
#: bzrlib/errors.py:1305
5346
msgid "Cannot pull --overwrite to a branch which is bound %(branch)s"
5347
msgstr ""
5348
5349
#: bzrlib/errors.py:1314
5350
msgid ""
5351
"Unable to connect to target of bound branch %(branch)s => %(target)s: "
5352
"%(error)s"
5353
msgstr ""
5354
5355
#: bzrlib/errors.py:1326
5356
msgid "Error in processing weave: %(msg)s"
5357
msgstr ""
5358
5359
#: bzrlib/errors.py:1335
5360
msgid "Revision {%(revision_id)s} already present in %(weave)s"
5361
msgstr ""
5362
5363
#: bzrlib/errors.py:1346
5364
msgid "Revision {%(revision_id)s} not present in %(weave)s"
5365
msgstr ""
5366
5367
#: bzrlib/errors.py:1356
5368
msgid "Weave invariant violated: %(what)s"
5369
msgstr ""
5370
5371
#: bzrlib/errors.py:1365
5372
msgid "Parents are mismatched between two revisions. %(msg)s"
5373
msgstr ""
5374
5375
#: bzrlib/errors.py:1387
5376
msgid ""
5377
"Weaves differ on text content. Revision: {%(revision_id)s}, %(weave_a)s, "
5378
"%(weave_b)s"
5379
msgstr ""
5380
5381
#: bzrlib/errors.py:1399
5382
msgid "Versioned file error"
5383
msgstr ""
5384
5385
#: bzrlib/errors.py:1404
5386
msgid "Revision {%(revision_id)s} not present in \"%(file_id)s\"."
5387
msgstr ""
5388
5389
#: bzrlib/errors.py:1414
5390
msgid "Revision {%(revision_id)s} already present in \"%(file_id)s\"."
5391
msgstr ""
5392
5393
#: bzrlib/errors.py:1424
5394
msgid "Text did not match its checksum: %(msg)s"
5395
msgstr ""
5396
5397
#: bzrlib/errors.py:1550
5398
msgid "Export format %(format)r not supported"
5399
msgstr ""
5400
5401
#: bzrlib/errors.py:1559
5402
msgid "Transport error: %(msg)s %(orig_error)s"
5403
msgstr ""
5404
5405
#: bzrlib/errors.py:1585
5406
msgid "Generic bzr smart protocol error: %(details)s"
5407
msgstr ""
5408
5409
#: bzrlib/errors.py:1593
5410
msgid "Received bad protocol version marker: %(marker)r"
5411
msgstr ""
5412
5413
#: bzrlib/errors.py:1625
5414
msgid "Transport operation not possible: %(msg)s %(orig_error)s"
5415
msgstr ""
5416
5417
#: bzrlib/errors.py:1630
5418
msgid "Connection error: %(msg)s %(orig_error)s"
5419
msgstr ""
5420
5421
#: bzrlib/errors.py:1635
5422
msgid "%(msg)s %(host)s%(port)s%(orig_error)s"
5423
msgstr ""
5424
5425
#: bzrlib/errors.py:1656
5426
msgid "Connection closed: %(msg)s %(orig_error)s"
5427
msgstr ""
5428
5429
#: bzrlib/errors.py:1661
5430
msgid "Connection Timeout: %(msg)s%(orig_error)s"
5431
msgstr ""
5432
5433
#: bzrlib/errors.py:1666
5434
msgid "Invalid range access in %(path)s at %(offset)s: %(msg)s"
5435
msgstr ""
5436
5437
#: bzrlib/errors.py:1676
5438
msgid "Invalid http response for %(path)s: %(msg)s%(orig_error)s"
5439
msgstr ""
5440
5441
#: bzrlib/errors.py:1691
5442
msgid "Certificate error: %(error)s"
5443
msgstr ""
5444
5445
#: bzrlib/errors.py:1699
5446
msgid "Invalid http range %(range)r for %(path)s: %(msg)s"
5447
msgstr ""
5448
5449
#: bzrlib/errors.py:1713
5450
msgid "HTTP MIME Boundary missing for %(path)s: %(msg)s"
5451
msgstr ""
5452
5453
#: bzrlib/errors.py:1721
5454
msgid "Invalid http Content-type \"%(ctype)s\" for %(path)s: %(msg)s"
5455
msgstr ""
5456
5457
#: bzrlib/errors.py:1730
5458
msgid "%(source)s is%(permanently)s redirected to %(target)s"
5459
msgstr ""
5460
5461
#: bzrlib/errors.py:1744
5462
msgid "Too many redirections"
5463
msgstr ""
5464
5465
#: bzrlib/errors.py:1749
5466
msgid "Working tree has conflicts."
5467
msgstr ""
5468
5469
#: bzrlib/errors.py:1753
5470
msgid "Config file %(filename)s is not UTF-8 encoded\n"
5471
msgstr ""
5472
5473
#: bzrlib/errors.py:1762
5474
msgid ""
5475
"Error(s) parsing config file %(filename)s:\n"
5476
"%(errors)s"
5477
msgstr ""
5478
5479
#: bzrlib/errors.py:1772
5480
msgid ""
5481
"Bad value \"%(value)s\" for option \"%(name)s\".\n"
5482
"See ``bzr help %(name)s``"
5483
msgstr ""
5484
5485
#: bzrlib/errors.py:1782
5486
msgid "%(username)r does not seem to contain a reasonable email address"
5487
msgstr ""
5488
5489
#: bzrlib/errors.py:1791
5490
msgid "Failed to GPG sign data with command \"%(command_line)s\""
5491
msgstr ""
5492
5493
#: bzrlib/errors.py:1799
5494
msgid "Failed to verify GPG signature data with error \"%(error)s\""
5495
msgstr ""
5496
5497
#: bzrlib/errors.py:1807
5498
msgid "Unable to import library \"%(library)s\": %(error)s"
5499
msgstr ""
5500
5501
#: bzrlib/errors.py:1815
5502
msgid "python-gpgme is not installed, it is needed to verify signatures"
5503
msgstr ""
5504
5505
#: bzrlib/errors.py:1823
5506
msgid ""
5507
"The working tree for %(basedir)s has changed since the last commit, but "
5508
"weave merge requires that it be unchanged"
5509
msgstr ""
5510
5511
#: bzrlib/errors.py:1833
5512
msgid ""
5513
"Can't reprocess and show base, because reprocessing obscures the "
5514
"relationship of conflicting lines to the base"
5515
msgstr ""
5516
5517
#: bzrlib/errors.py:1839
5518
msgid "Cycle in graph %(graph)r"
5519
msgstr ""
5520
5521
#: bzrlib/errors.py:1867
5522
msgid "File %(filename)s is not conflicted."
5523
msgstr ""
5524
5525
#: bzrlib/errors.py:1889
5526
msgid "No bundle was found in \"%(filename)s\"."
5527
msgstr ""
5528
5529
#: bzrlib/errors.py:1898
5530
msgid "Unable to handle bundle version %(version)s: %(msg)s"
5531
msgstr ""
5532
5533
#: bzrlib/errors.py:1908
5534
msgid "Branch %(base)s is missing revision %(text_revision)s of %(file_id)s"
5535
msgstr ""
5536
5537
#: bzrlib/errors.py:1921
5538
msgid "File id {%(file_id)s} already exists in inventory as %(entry)s"
5539
msgstr ""
5540
5541
#: bzrlib/errors.py:1931
5542
msgid "Key %(key)s is already present in map"
5543
msgstr ""
5544
5545
#: bzrlib/errors.py:1936
5546
msgid "The prefix %(prefix)s is in the help search path twice."
5547
msgstr ""
5548
5549
#: bzrlib/errors.py:1946
5550
msgid ""
5551
"No final name for trans_id %(trans_id)r\n"
5552
"file-id: %(file_id)r\n"
5553
"root trans-id: %(root_trans_id)r\n"
5554
msgstr ""
5555
5556
#: bzrlib/errors.py:1978
5557
msgid "Attempt to reuse a transform that has already been applied."
5558
msgstr ""
5559
5560
#: bzrlib/errors.py:1983
5561
msgid "Moving the root directory is not supported at this time"
5562
msgstr ""
5563
5564
#: bzrlib/errors.py:1988
5565
msgid "Failed to rename %(from_path)s to %(to_path)s: %(why)s"
5566
msgstr ""
5567
5568
#: bzrlib/errors.py:1999
5569
msgid ""
5570
"Could not move %(from_path)s%(operator)s %(to_path)s%(_has_extra)s%(extra)s"
5571
msgstr ""
5572
5573
#: bzrlib/errors.py:2035
5574
msgid ""
5575
"Could not rename %(from_path)s%(operator)s %(to_path)s%(_has_extra)s%(extra)s"
5576
msgstr ""
5577
5578
#: bzrlib/errors.py:2065
5579
msgid "Unable to import paramiko (required for sftp support): %(error)s"
5580
msgstr ""
5581
5582
#: bzrlib/errors.py:2073
5583
msgid "Nothing to merge."
5584
msgstr ""
5585
5586
#: bzrlib/errors.py:2078
5587
msgid "Format %(format)s cannot be initialised by this version of bzr."
5588
msgstr ""
5589
5590
#: bzrlib/errors.py:2087
5591
msgid ""
5592
"Cannot convert from format %(from_format)s to format %(format)s. "
5593
"%(problem)s"
5594
msgstr ""
5595
5596
#: bzrlib/errors.py:2099
5597
msgid "Could not find an appropriate Differ for file \"%(path)s\""
5598
msgstr ""
5599
5600
#: bzrlib/errors.py:2107
5601
msgid "%(exe_name)s could not be found on this machine"
5602
msgstr ""
5603
5604
#: bzrlib/errors.py:2115
5605
msgid "Diff is not installed on this machine: %(msg)s"
5606
msgstr ""
5607
5608
#: bzrlib/errors.py:2123
5609
msgid "Diff3 is not installed on this machine."
5610
msgstr ""
5611
5612
#: bzrlib/errors.py:2129
5613
msgid "The content being inserted is already present."
5614
msgstr ""
5615
5616
#: bzrlib/errors.py:2134
5617
msgid ""
5618
"This tree contains left-over files from a failed operation.\n"
5619
" Please examine %(limbo_dir)s to see if it contains any files you wish "
5620
"to\n"
5621
" keep, and delete it when you are done."
5622
msgstr ""
5623
5624
#: bzrlib/errors.py:2145
5625
msgid ""
5626
"This tree contains left-over files from a failed operation.\n"
5627
" Please examine %(pending_deletion)s to see if it contains any files you\n"
5628
" wish to keep, and delete it when you are done."
5629
msgstr ""
5630
5631
#: bzrlib/errors.py:2155
5632
msgid ""
5633
"Unable to delete transform temporary directory %(limbo_dir)s.\n"
5634
" Please examine %(limbo_dir)s to see if it contains any files you wish "
5635
"to\n"
5636
" keep, and delete it when you are done."
5637
msgstr ""
5638
5639
#: bzrlib/errors.py:2166
5640
msgid ""
5641
"Unable to delete transform temporary directory %(pending_deletion)s. Please "
5642
"examine %(pending_deletion)s to see if it contains any files you wish to "
5643
"keep, and delete it when you are done."
5644
msgstr ""
5645
5646
#: bzrlib/errors.py:2176
5647
msgid "Working tree is out of date, please run 'bzr update'.%(more)s"
5648
msgstr ""
5649
5650
#: bzrlib/errors.py:2190
5651
msgid ""
5652
"Public branch \"%(public_location)s\" lacks revision \"%(revstring)s\"."
5653
msgstr ""
5654
5655
#: bzrlib/errors.py:2203
5656
msgid "Error in merge modified format"
5657
msgstr ""
5658
5659
#: bzrlib/errors.py:2208
5660
msgid "Format error in conflict listings"
5661
msgstr ""
5662
5663
#: bzrlib/errors.py:2212
5664
msgid ""
5665
"Inconsistency in dirstate file %(dirstate_path)s.\n"
5666
"Error: %(description)s"
5667
msgstr ""
5668
5669
#: bzrlib/errors.py:2223
5670
msgid ""
5671
"An error has been detected in the repository %(repo_path)s.\n"
5672
"Please run bzr reconcile on this repository."
5673
msgstr ""
5674
5675
#: bzrlib/errors.py:2234
5676
msgid ""
5677
"An inconsistent delta was supplied involving %(path)r, %(file_id)r\n"
5678
"reason: %(reason)s"
5679
msgstr ""
5680
5681
#: bzrlib/errors.py:2247
5682
msgid ""
5683
"An inconsistent delta was supplied: %(delta)r\n"
5684
"reason: %(reason)s"
5685
msgstr ""
5686
5687
#: bzrlib/errors.py:2259
5688
msgid "To use this feature you must upgrade your branch at %(path)s."
5689
msgstr ""
5690
5691
#: bzrlib/errors.py:2268
5692
msgid "To use this feature you must upgrade your repository at %(path)s."
5693
msgstr ""
5694
5695
#: bzrlib/errors.py:2273
5696
msgid ""
5697
"To use this feature you must upgrade your branch at %(path)s to a format "
5698
"which supports rich roots."
5699
msgstr ""
5700
5701
#: bzrlib/errors.py:2279
5702
msgid "Cannot perform local-only commits on unbound branches."
5703
msgstr ""
5704
5705
#: bzrlib/errors.py:2284
5706
msgid "The method %(mname)s is not supported on objects of type %(tname)s."
5707
msgstr ""
5708
5709
#: bzrlib/errors.py:2305
5710
msgid "Ghost tags not supported by format %(format)r."
5711
msgstr ""
5712
5713
#: bzrlib/errors.py:2313
5714
msgid "File is binary but should be text."
5715
msgstr ""
5716
5717
#: bzrlib/errors.py:2318
5718
msgid "The path %(path)s is not permitted on this platform"
5719
msgstr ""
5720
5721
#: bzrlib/errors.py:2327
5722
msgid ""
5723
"Testament did not match expected value.\n"
5724
" For revision_id {%(revision_id)s}, expected {%(expected)s}, measured\n"
5725
" {%(measured)s}"
5726
msgstr ""
5727
5728
#: bzrlib/errors.py:2339
5729
msgid "Not a bzr revision-bundle: %(text)r"
5730
msgstr ""
5731
5732
#: bzrlib/errors.py:2348
5733
msgid "Bad bzr revision-bundle: %(text)r"
5734
msgstr ""
5735
5736
#: bzrlib/errors.py:2357
5737
msgid "Malformed bzr revision-bundle header: %(text)r"
5738
msgstr ""
5739
5740
#: bzrlib/errors.py:2362
5741
msgid "Malformed patches in bzr revision-bundle: %(text)r"
5742
msgstr ""
5743
5744
#: bzrlib/errors.py:2367
5745
msgid "Malformed footer in bzr revision-bundle: %(text)r"
5746
msgstr ""
5747
5748
#: bzrlib/errors.py:2372
5749
msgid "End of line marker was not \\n in bzr revision-bundle"
5750
msgstr ""
5751
5752
#: bzrlib/errors.py:2382
5753
msgid "Bundle format %(bundle_format)s is incompatible with %(other)s"
5754
msgstr ""
5755
5756
#: bzrlib/errors.py:2392
5757
msgid "Root class for inventory serialization errors"
5758
msgstr ""
5759
5760
#: bzrlib/errors.py:2396
5761
msgid ""
5762
"The inventory was not in the expected format:\n"
5763
" %(msg)s"
5764
msgstr ""
5765
5766
#: bzrlib/errors.py:2405
5767
msgid "This operation requires rich root data storage"
5768
msgstr ""
5769
5770
#: bzrlib/errors.py:2418
5771
msgid "Unrecognised value for BZR_SSH environment variable: %(vendor)s"
5772
msgstr ""
5773
5774
#: bzrlib/errors.py:2427
5775
msgid ""
5776
"Don't know how to handle SSH connections. Please set BZR_SSH environment "
5777
"variable."
5778
msgstr ""
5779
5780
#: bzrlib/errors.py:2434
5781
msgid ""
5782
"Could not determine revno for {%(revision_id)s} because its ancestry shows a "
5783
"ghost at {%(ghost_revision_id)s}"
5784
msgstr ""
5785
5786
#: bzrlib/errors.py:2444
5787
msgid "Ghost revision {%(revision_id)s} cannot be used here."
5788
msgstr ""
5789
5790
#: bzrlib/errors.py:2495
5791
msgid ""
5792
"A merge directive must provide either a bundle or a public branch location."
5793
msgstr ""
5794
5795
#: bzrlib/errors.py:2502
5796
msgid "Bad merge directive payload %(start)r"
5797
msgstr ""
5798
5799
#: bzrlib/errors.py:2512
5800
msgid "Preview patch does not match requested changes."
5801
msgstr ""
5802
5803
#: bzrlib/errors.py:2518
5804
msgid "Patch_type was %(patch_type)s, but no patch was supplied."
5805
msgstr ""
5806
5807
#: bzrlib/errors.py:2528
5808
msgid ""
5809
"Your branch does not have all of the revisions required in order to merge "
5810
"this merge directive and the target location specified in the merge "
5811
"directive is not a branch: %(location)s."
5812
msgstr ""
5813
5814
#: bzrlib/errors.py:2540
5815
msgid "Unsupported entry kind %(kind)s"
5816
msgstr ""
5817
5818
#: bzrlib/errors.py:2548
5819
msgid "Can't subsume %(other_tree)s into %(tree)s. %(reason)s"
5820
msgstr ""
5821
5822
#: bzrlib/errors.py:2558
5823
msgid "Subsume target %(other_tree)s needs to be upgraded."
5824
msgstr ""
5825
5826
#: bzrlib/errors.py:2577
5827
msgid "No such tag: %(tag_name)s"
5828
msgstr ""
5829
5830
#: bzrlib/errors.py:2585
5831
msgid "Tags not supported by %(branch)s; you may be able to use bzr upgrade."
5832
msgstr ""
5833
5834
#: bzrlib/errors.py:2594
5835
msgid "Tag %(tag_name)s already exists."
5836
msgstr ""
5837
5838
#: bzrlib/errors.py:2602
5839
msgid ""
5840
"Did not understand bug identifier %(bug_id)s: %(reason)s. See \"bzr help "
5841
"bugs\" for more information on this feature."
5842
msgstr ""
5843
5844
#: bzrlib/errors.py:2612
5845
msgid ""
5846
"The URL for bug tracker \"%(abbreviation)s\" doesn't contain {id}: %(url)s"
5847
msgstr ""
5848
5849
#: bzrlib/errors.py:2622
5850
msgid ""
5851
"Cannot find registered bug tracker called %(abbreviation)s on %(branch)s"
5852
msgstr ""
5853
5854
#: bzrlib/errors.py:2632
5855
msgid "Invalid line in bugs property: '%(line)s'"
5856
msgstr ""
5857
5858
#: bzrlib/errors.py:2640
5859
msgid "Invalid bug status: '%(status)s'"
5860
msgstr ""
5861
5862
#: bzrlib/errors.py:2648
5863
msgid "Could not understand response from smart server: %(response_tuple)r"
5864
msgstr ""
5865
5866
#: bzrlib/errors.py:2687
5867
msgid "Server sent an unexpected error: %(error_tuple)r"
5868
msgstr ""
5869
5870
#: bzrlib/errors.py:2706
5871
msgid "Unrecognised container format: %(container_format)r"
5872
msgstr ""
5873
5874
#: bzrlib/errors.py:2714
5875
msgid "Unexpected end of container stream"
5876
msgstr ""
5877
5878
#: bzrlib/errors.py:2719
5879
msgid "Unknown record type: %(record_type)r"
5880
msgstr ""
5881
5882
#: bzrlib/errors.py:2727
5883
msgid "Invalid record: %(reason)s"
5884
msgstr ""
5885
5886
#: bzrlib/errors.py:2735
5887
msgid "Container has data after end marker: %(excess)r"
5888
msgstr ""
5889
5890
#: bzrlib/errors.py:2743
5891
msgid "Container has multiple records with the same name: %(name)s"
5892
msgstr ""
5893
5894
#: bzrlib/errors.py:2756
5895
msgid "Corrupt or incompatible data stream: %(reason)s"
5896
msgstr ""
5897
5898
#: bzrlib/errors.py:2764
5899
msgid "SMTP error: %(error)s"
5900
msgstr ""
5901
5902
#: bzrlib/errors.py:2772
5903
msgid "No message supplied."
5904
msgstr ""
5905
5906
#: bzrlib/errors.py:2777
5907
msgid "No mail-to address (--mail-to) or output (-o) specified."
5908
msgstr ""
5909
5910
#: bzrlib/errors.py:2782
5911
msgid ""
5912
"Unable to find mail client with the following names: "
5913
"%(mail_command_list_string)s"
5914
msgstr ""
5915
5916
#: bzrlib/errors.py:2792
5917
msgid "SMTP connection to %(host)s refused"
5918
msgstr ""
5919
5920
#: bzrlib/errors.py:2801
5921
msgid "Please specify smtp_server. No server at default %(host)s."
5922
msgstr ""
5923
5924
#: bzrlib/errors.py:2815
5925
msgid ""
5926
"'%(display_url)s' is not in sync with %(target_url)s. See bzr help sync-for-"
5927
"reconfigure."
5928
msgstr ""
5929
5930
#: bzrlib/errors.py:2827
5931
msgid "'%(display_url)s' is already a branch."
5932
msgstr ""
5933
5934
#: bzrlib/errors.py:2832
5935
msgid "'%(display_url)s' is already a tree."
5936
msgstr ""
5937
5938
#: bzrlib/errors.py:2837
5939
msgid "'%(display_url)s' is already a checkout."
5940
msgstr ""
5941
5942
#: bzrlib/errors.py:2842
5943
msgid "'%(display_url)s' is already a lightweight checkout."
5944
msgstr ""
5945
5946
#: bzrlib/errors.py:2847
5947
msgid "'%(display_url)s' is already using a shared repository."
5948
msgstr ""
5949
5950
#: bzrlib/errors.py:2852
5951
msgid "'%(display_url)s' is already standalone."
5952
msgstr ""
5953
5954
#: bzrlib/errors.py:2857
5955
msgid "Shared repository '%(display_url)s' already creates working trees."
5956
msgstr ""
5957
5958
#: bzrlib/errors.py:2863
5959
msgid ""
5960
"Shared repository '%(display_url)s' already doesn't create working trees."
5961
msgstr ""
5962
5963
#: bzrlib/errors.py:2869
5964
msgid "Requested reconfiguration of '%(display_url)s' is not supported."
5965
msgstr ""
5966
5967
#: bzrlib/errors.py:2874
5968
msgid "No location could be found to bind to at %(display_url)s."
5969
msgstr ""
5970
5971
#: bzrlib/errors.py:2879
5972
msgid ""
5973
"Working tree \"%(display_url)s\" has uncommitted changes (See bzr "
5974
"status).%(more)s"
5975
msgstr ""
5976
5977
#: bzrlib/errors.py:2898
5978
msgid ""
5979
"Working tree \"%(display_url)s\" has shelved changes (See bzr shelve --"
5980
"list).%(more)s"
5981
msgstr ""
5982
5983
#: bzrlib/errors.py:2904
5984
msgid "Variable {%(name)s} is not available."
5985
msgstr ""
5986
5987
#: bzrlib/errors.py:2912
5988
msgid "No template specified."
5989
msgstr ""
5990
5991
#: bzrlib/errors.py:2917
5992
msgid "Unable to create symlink %(path_str)son this platform"
5993
msgstr ""
5994
5995
#: bzrlib/errors.py:2932
5996
msgid ""
5997
"Unsupported timezone format \"%(timezone)s\", options are \"utc\", "
5998
"\"original\", \"local\"."
5999
msgstr ""
6000
6001
#: bzrlib/errors.py:2966
6002
msgid ""
6003
"Unable to encode %(kind)s path %(path)r in user encoding %(user_encoding)s"
6004
msgstr ""
6005
6006
#: bzrlib/errors.py:2978
6007
msgid "The \"%(config_id)s\" configuration does not exist."
6008
msgstr ""
6009
6010
#: bzrlib/errors.py:2986
6011
msgid "The \"%(option_name)s\" configuration option does not exist."
6012
msgstr ""
6013
6014
#: bzrlib/errors.py:2994
6015
msgid "The alias \"%(alias_name)s\" does not exist."
6016
msgstr ""
6017
6018
#: bzrlib/errors.py:3008
6019
msgid "\"%(alias_name)s\" is not a valid location alias."
6020
msgstr ""
6021
6022
#: bzrlib/errors.py:3016
6023
msgid "No %(alias_name)s location assigned."
6024
msgstr ""
6025
6026
#: bzrlib/errors.py:3024
6027
msgid "Cannot bind address \"%(host)s:%(port)i\": %(orig_error)s."
6028
msgstr ""
6029
6030
#: bzrlib/errors.py:3034
6031
msgid "Unknown rules detected: %(unknowns_str)s."
6032
msgstr ""
6033
6034
#: bzrlib/errors.py:3045
6035
msgid "Tip change rejected: %(msg)s"
6036
msgstr ""
6037
6038
#: bzrlib/errors.py:3053
6039
msgid "Shelf corrupt."
6040
msgstr ""
6041
6042
#: bzrlib/errors.py:3058
6043
msgid "Corruption while decompressing repository file%(orig_error)s"
6044
msgstr ""
6045
6046
#: bzrlib/errors.py:3070
6047
msgid "No changes are shelved with id \"%(shelf_id)d\"."
6048
msgstr ""
6049
6050
#: bzrlib/errors.py:3078
6051
msgid "\"%(invalid_id)s\" is not a valid shelf id, try a number instead."
6052
msgstr ""
6053
6054
#: bzrlib/errors.py:3086
6055
msgid ""
6056
"An attempt to access a url outside the server jail was made: '%(url)s'."
6057
msgstr ""
6058
6059
#: bzrlib/errors.py:3094
6060
msgid "The user aborted the operation."
6061
msgstr ""
6062
6063
#: bzrlib/errors.py:3099
6064
msgid "Branching '%(url)s'(%(format)s) must create a working tree."
6065
msgstr ""
6066
6067
#: bzrlib/errors.py:3109
6068
msgid "No such view: %(view_name)s."
6069
msgstr ""
6070
6071
#: bzrlib/errors.py:3119
6072
msgid ""
6073
"Views are not supported by %(tree)s; use 'bzr upgrade' to change your tree "
6074
"to a later format."
6075
msgstr ""
6076
6077
#: bzrlib/errors.py:3128
6078
msgid ""
6079
"Specified file \"%(file_name)s\" is outside the current view: %(view_str)s"
6080
msgstr ""
6081
6082
#: bzrlib/errors.py:3195
6083
msgid "%(bzrdir)r does not support co-located branches."
6084
msgstr ""
6085
6086
#: bzrlib/errors.py:3201
6087
msgid ""
6088
"Unable to determine your name.\n"
6089
"Please, set your name with the 'whoami' command.\n"
6090
"E.g. bzr whoami \"Your Name <name@example.com>\""
6091
msgstr ""
6092
6093
#: bzrlib/errors.py:3210
6094
msgid "Invalid pattern(s) found. %(msg)s"
6095
msgstr ""
6096
6097
#: bzrlib/errors.py:3218
6098
msgid ""
6099
"Branch \"%(branch_url)s\" appears to be bound to itself. Please use `bzr "
6100
"unbind` to fix."
6101
msgstr ""
6102
6103
#: bzrlib/errors.py:3229
6104
msgid "Loop involving %(refs)r while expanding \"%(string)s\"."
6105
msgstr ""
6106
6107
#: bzrlib/errors.py:3238
6108
msgid "Option %(name)s is not defined while expanding \"%(string)s\"."
6109
msgstr ""
6110
6111
#: bzrlib/errors.py:3247
6112
msgid ""
6113
"No compatible object available for operations from %(source)r to %(target)r."
6114
msgstr ""
6115
6116
#: bzrlib/errors.py:3257
6117
msgid ""
6118
"VFS requests over the smart server are not allowed. Encountered: %(method)s, "
6119
"%(arguments)s."
6120
msgstr ""
6121
6122
#: bzrlib/errors.py:3267
6123
msgid ""
6124
"Kind change from %(from_kind)s to %(to_kind)s for %(path)s not supported by "
6125
"format %(format)r"
6126
msgstr ""
6127
6128
#: bzrlib/errors.py:3279
6129
msgid ""
6130
"Missing feature %(feature)s not provided by this version of Bazaar or any "
6131
"plugin."
6132
msgstr ""
6133
6134
#: bzrlib/errors.py:3292
6135
msgid "Binary files section encountered."
6136
msgstr ""
6137
6138
#: bzrlib/errors.py:3300
6139
msgid ""
6140
"Malformed patch header. %(desc)s\n"
6141
"%(line)r"
6142
msgstr ""
6143
6144
#: bzrlib/errors.py:3309
6145
msgid ""
6146
"Malformed hunk header. %(desc)s\n"
6147
"%(line)r"
6148
msgstr ""
6149
6150
#: bzrlib/errors.py:3318
6151
msgid ""
6152
"Malformed line. %(desc)s\n"
6153
"%(line)r"
6154
msgstr ""
6155
6156
#: bzrlib/errors.py:3328
6157
msgid ""
6158
"Text contents mismatch at line %(line_no)d. Original has \"%(orig_line)s\", "
6159
"but patch says it should be \"%(patch_line)s\""
6160
msgstr ""
6161
6162
#: bzrlib/errors.py:3339
6163
msgid "The feature %(feature)s has already been registered."
6164
msgstr ""
6165
6166
#: bzrlib/export_pot.py:252
6167
#, python-format
6168
msgid "Exporting messages from builtin command: %s"
6169
msgstr ""
6170
6171
#: bzrlib/export_pot.py:271
6172
msgid "Exporting messages from plugin command: {0} in {1}"
6173
msgstr ""
6174
6175
#: bzrlib/export_pot.py:292
6176
#, python-format
6177
msgid "Exporting message from error: %s"
6178
msgstr ""
6179
6180
#: bzrlib/fetch.py:98
6181
msgid "Finding revisions"
6182
msgstr ""
6183
6184
#: bzrlib/fetch.py:103
6185
msgid "Fetching revisions"
6186
msgstr ""
6187
6188
#: bzrlib/foreign.py:262
6189
msgid "Push into a different VCS without any custom bzr metadata."
6190
msgstr ""
6191
6192
#: bzrlib/foreign.py:264
6193
msgid ""
6194
"This will afterwards rebase the local branch on the remote\n"
6195
"branch unless the --no-rebase option is used, in which case \n"
6196
"the two branches will be out of sync after the push. "
6197
msgstr ""
6198
6199
#: bzrlib/foreign.py:277
6200
msgid "Do not rebase after push."
6201
msgstr ""
6202
6203
#: bzrlib/foreign.py:311
6204
#, python-format
6205
msgid "Using saved location: %s\n"
6206
msgstr ""
6207
6208
#: bzrlib/foreign.py:321
6209
msgid ""
6210
"{0!r} and {1!r} are in the same VCS, lossy push not necessary. Please use "
6211
"regular push."
6212
msgstr ""
6213
6214
#: bzrlib/gpg.py:366
6215
msgid "No GnuPG key results for pattern: {0}"
6216
msgstr ""
6217
6218
#: bzrlib/gpg.py:439
6219
msgid "{0} commits with valid signatures"
6220
msgstr ""
6221
6222
#: bzrlib/gpg.py:445
6223
msgid "{0} commit with unknown key"
6224
msgid_plural "{0} commits with unknown keys"
6225
msgstr[0] ""
6226
msgstr[1] ""
6227
6228
#: bzrlib/gpg.py:453
6229
msgid "{0} commit not valid"
6230
msgid_plural "{0} commits not valid"
6231
msgstr[0] ""
6232
msgstr[1] ""
6233
6234
#: bzrlib/gpg.py:461
6235
msgid "{0} commit not signed"
6236
msgid_plural "{0} commits not signed"
6237
msgstr[0] ""
6238
msgstr[1] ""
6239
6240
#: bzrlib/gpg.py:469
6241
msgid "{0} commit with key now expired"
6242
msgid_plural "{0} commits with key now expired"
6243
msgstr[0] ""
6244
msgstr[1] ""
6245
6246
#: bzrlib/gpg.py:489
6247
msgid "{0} commit by author {1} with key {2} now expired"
6248
msgid_plural "{0} commits by author {1} with key {2} now expired"
6249
msgstr[0] ""
6250
msgstr[1] ""
6251
6252
#: bzrlib/gpg.py:505
6253
msgid "{0} signed {1} commit"
6254
msgid_plural "{0} signed {1} commits"
6255
msgstr[0] ""
6256
msgstr[1] ""
6257
6258
#: bzrlib/gpg.py:522 bzrlib/gpg.py:539
6259
msgid "{0} commit by author {1}"
6260
msgid_plural "{0} commits by author {1}"
6261
msgstr[0] ""
6262
msgstr[1] ""
6263
6264
#: bzrlib/gpg.py:554
6265
msgid "Unknown key {0} signed {1} commit"
6266
msgid_plural "Unknown key {0} signed {1} commits"
6267
msgstr[0] ""
6268
msgstr[1] ""
6269
6270
#: bzrlib/groupcompress.py:1739
6271
#, python-format
6272
msgid "Insert claimed random_id=True, but then inserted %r two times"
6273
msgstr ""
6274
6275
#: bzrlib/hooks.py:313
6276
#, python-format
6277
msgid "Introduced in: %s"
6278
msgstr ""
6279
6280
#: bzrlib/hooks.py:316
6281
#, python-format
6282
msgid "Deprecated in: %s"
6283
msgstr ""
6284
6285
#: bzrlib/knit.py:1766 bzrlib/knit.py:1802
6286
msgid "Walking content"
6287
msgstr ""
6288
6289
#: bzrlib/knit.py:3330
6290
msgid "annotating"
6291
msgstr ""
6292
6293
#: bzrlib/lock.py:548
6294
msgid "{0!r} was {1} locked again"
6295
msgstr ""
6296
6297
#: bzrlib/lockdir.py:321
6298
#, python-format
6299
msgid "error removing pending lock: %s"
6300
msgstr ""
6301
6302
#: bzrlib/lockdir.py:616
6303
msgid "Unable to obtain"
6304
msgstr ""
6305
6306
#: bzrlib/lockdir.py:618
6307
msgid "Lock owner changed for"
6308
msgstr ""
6309
6310
#: bzrlib/lockdir.py:620
6311
msgid "{0} lock {1} {2}."
6312
msgstr ""
6313
6314
#: bzrlib/lockdir.py:627
6315
#, python-format
6316
msgid "Will continue to try until %s, unless you press Ctrl-C."
6317
msgstr ""
6318
6319
#: bzrlib/lockdir.py:629
6320
msgid "See \"bzr help break-lock\" for more."
6321
msgstr ""
6322
6323
#: bzrlib/lockdir.py:739
6324
#, python-format
6325
msgid ""
6326
"held by %(user)s on %(hostname)s (process #%(pid)s), acquired %(time_ago)s"
6327
msgstr ""
6328
6329
#: bzrlib/log.py:563
6330
msgid "--exclude-common-ancestry requires two different revisions"
6331
msgstr ""
6332
6333
#: bzrlib/log.py:565
6334
#, python-format
6335
msgid "invalid direction %r"
6336
msgstr ""
6337
6338
#: bzrlib/log.py:653
6339
msgid "Start revision not found in history of end revision."
6340
msgstr ""
6341
6342
#: bzrlib/log.py:1071 bzrlib/log.py:1129
6343
msgid "Logging revision 0 is invalid."
6344
msgstr ""
6345
6346
#: bzrlib/log.py:1073 bzrlib/log.py:1131
6347
msgid "Start revision must be older than the end revision."
6348
msgstr ""
6349
6350
#: bzrlib/log.py:1818
6351
#, python-format
6352
msgid "unknown log formatter: %r"
6353
msgstr ""
6354
6355
#: bzrlib/log.py:2114
6356
msgid "fixes bug"
6357
msgid_plural "fixes bugs"
6358
msgstr[0] ""
6359
msgstr[1] ""
6360
6361
#: bzrlib/merge.py:689
6362
msgid "All changes applied successfully."
6363
msgstr ""
6364
6365
#: bzrlib/merge.py:691
6366
#, python-format
6367
msgid "%d conflicts encountered."
6368
msgstr ""
6369
6370
#: bzrlib/merge.py:845 bzrlib/merge.py:1868
6371
msgid "Preparing file merge"
6372
msgstr ""
6373
6374
#: bzrlib/multiparent.py:426
6375
msgid "Importing revisions"
6376
msgstr ""
6377
6378
#: bzrlib/option.py:526
6379
msgid "Show help message."
6380
msgstr ""
6381
6382
#: bzrlib/option.py:528
6383
msgid "Only display errors and warnings."
6384
msgstr ""
6385
6386
#: bzrlib/option.py:531
6387
msgid "Show usage message and options."
6388
msgstr ""
6389
6390
#: bzrlib/option.py:533
6391
msgid "Display more information."
6392
msgstr ""
6393
6394
#: bzrlib/option.py:541
6395
msgid ""
6396
"Select changes introduced by the specified revision. See also \"help "
6397
"revisionspec\"."
6398
msgstr ""
6399
6400
#: bzrlib/option.py:543
6401
msgid "Branch to operate on, instead of working directory."
6402
msgstr ""
6403
6404
#: bzrlib/option.py:545
6405
msgid "Detailed log format."
6406
msgstr ""
6407
6408
#: bzrlib/option.py:545
6409
msgid "Format used by GNU ChangeLog files."
6410
msgstr ""
6411
6412
#: bzrlib/option.py:545
6413
msgid "Log format with one line per revision."
6414
msgstr ""
6415
6416
#: bzrlib/option.py:545
6417
msgid "Moderately short log format."
6418
msgstr ""
6419
6420
#: bzrlib/option.py:545
6421
msgid "Use specified log format."
6422
msgstr ""
6423
6424
#: bzrlib/option.py:547
6425
msgid "Log format"
6426
msgstr ""
6427
6428
#: bzrlib/option.py:549
6429
msgid "LCA-newness merge."
6430
msgstr ""
6431
6432
#: bzrlib/option.py:549
6433
msgid "Merge using external diff3."
6434
msgstr ""
6435
6436
#: bzrlib/option.py:549
6437
msgid "Native diff3-style merge."
6438
msgstr ""
6439
6440
#: bzrlib/option.py:549
6441
msgid "Select a particular merge algorithm."
6442
msgstr ""
6443
6444
#: bzrlib/option.py:549
6445
msgid "Weave-based merge."
6446
msgstr ""
6447
6448
#: bzrlib/option.py:551
6449
msgid "Merge algorithm"
6450
msgstr ""
6451
6452
#: bzrlib/option.py:554
6453
msgid "Message string."
6454
msgstr ""
6455
6456
#: bzrlib/option.py:556
6457
msgid "Use an ASCII NUL (\\0) separator rather than a newline."
6458
msgstr ""
6459
6460
#: bzrlib/option.py:558
6461
msgid "Ignore differences between branches and overwrite unconditionally."
6462
msgstr ""
6463
6464
#: bzrlib/option.py:560
6465
msgid "Remember the specified location as a default."
6466
msgstr ""
6467
6468
#: bzrlib/option.py:562
6469
msgid "Reprocess to reduce spurious conflicts."
6470
msgstr ""
6471
6472
#: bzrlib/option.py:566
6473
msgid "See \"help revisionspec\" for details."
6474
msgstr ""
6475
6476
#: bzrlib/option.py:568
6477
msgid "Show internal object ids."
6478
msgstr ""
6479
6480
#: bzrlib/option.py:571
6481
msgid "Display timezone as local, original, or utc."
6482
msgstr ""
6483
6484
#: bzrlib/osutils.py:100
6485
msgid "Parameter {0!r} encoding is unsupported by {1} application locale."
6486
msgstr ""
6487
6488
#: bzrlib/osutils.py:220
6489
msgid "lstat/stat of ({0!r}): {1!r}"
6490
msgstr ""
6491
6492
#: bzrlib/osutils.py:1030 bzrlib/osutils.py:1041
6493
#, python-format
6494
msgid "sorry, %r not allowed in path"
6495
msgstr ""
6496
6497
#: bzrlib/osutils.py:1259
6498
#, python-format
6499
msgid "%r is too short to calculate a relative path"
6500
msgstr ""
6501
6502
#: bzrlib/plugin.py:143
6503
#, python-format
6504
msgid "\"%s\" is not a valid <plugin_name>@<plugin_path> description "
6505
msgstr ""
6506
6507
#: bzrlib/plugins/bash_completion/bashcomp.py:411
6508
msgid "Enable completions for the selected plugin (default: all plugins)"
6509
msgstr ""
6510
6511
#: bzrlib/plugins/bash_completion/bashcomp.py:412
6512
msgid "Generate a shell function for bash command line completion."
6513
msgstr ""
6514
6515
#: bzrlib/plugins/bash_completion/bashcomp.py:414
6516
msgid ""
6517
"This command generates a shell function which can be used by bash to\n"
6518
"automatically complete the currently typed command when the user presses\n"
6519
"the completion key (usually tab)."
6520
msgstr ""
6521
6522
#: bzrlib/plugins/bash_completion/bashcomp.py:418
6523
msgid ""
6524
"Commonly used like this:\n"
6525
" eval \"`bzr bash-completion`\""
6526
msgstr ""
6527
6528
#: bzrlib/plugins/bash_completion/bashcomp.py:424
6529
msgid "Name of the generated function (default: _bzr)"
6530
msgstr ""
6531
6532
#: bzrlib/plugins/bash_completion/bashcomp.py:426
6533
msgid "Generate only the shell function, don't enable it"
6534
msgstr ""
6535
6536
#: bzrlib/plugins/launchpad/account.py:66
6537
msgid "Setting ssh/sftp usernames for launchpad.net."
6538
msgstr ""
6539
6540
#: bzrlib/plugins/launchpad/cmds.py:44
6541
msgid "Register a branch with launchpad.net."
6542
msgstr ""
6543
6544
#: bzrlib/plugins/launchpad/cmds.py:46
6545
msgid ""
6546
"This command lists a bzr branch in the directory of branches on\n"
6547
"launchpad.net. Registration allows the branch to be associated with\n"
6548
"bugs or specifications."
6549
msgstr ""
6550
6551
#: bzrlib/plugins/launchpad/cmds.py:50
6552
msgid ""
6553
"Before using this command you must register the project to which the\n"
6554
"branch belongs, and create an account for yourself on launchpad.net."
6555
msgstr ""
6556
6557
#: bzrlib/plugins/launchpad/cmds.py:53
6558
msgid ""
6559
"arguments:\n"
6560
" public_url: The publicly visible url for the branch to register.\n"
6561
" This must be an http or https url (which Launchpad can read\n"
6562
" from to access the branch). Local file urls, SFTP urls, and\n"
6563
" bzr+ssh urls will not work.\n"
6564
" If no public_url is provided, bzr will use the configured\n"
6565
" public_url if there is one for the current branch, and\n"
6566
" otherwise error."
6567
msgstr ""
6568
6569
#: bzrlib/plugins/launchpad/cmds.py:62
6570
msgid ""
6571
"example:\n"
6572
" bzr register-branch http://foo.com/bzr/fooproject.mine \\\n"
6573
" --project fooproject"
6574
msgstr ""
6575
6576
#: bzrlib/plugins/launchpad/cmds.py:69
6577
msgid "Launchpad project short name to associate with the branch."
6578
msgstr ""
6579
6580
#: bzrlib/plugins/launchpad/cmds.py:76
6581
msgid ""
6582
"Short name for the branch; by default taken from the last component of the "
6583
"url."
6584
msgstr ""
6585
6586
#: bzrlib/plugins/launchpad/cmds.py:80
6587
msgid "One-sentence description of the branch."
6588
msgstr ""
6589
6590
#: bzrlib/plugins/launchpad/cmds.py:83
6591
msgid "Longer description of the purpose or contents of the branch."
6592
msgstr ""
6593
6594
#: bzrlib/plugins/launchpad/cmds.py:86
6595
msgid "Branch author's email address, if not yourself."
6596
msgstr ""
6597
6598
#: bzrlib/plugins/launchpad/cmds.py:89
6599
msgid "The bug this branch fixes."
6600
msgstr ""
6601
6602
#: bzrlib/plugins/launchpad/cmds.py:92
6603
msgid "Prepare the request but don't actually send it."
6604
msgstr ""
6605
6606
#: bzrlib/plugins/launchpad/cmds.py:114
6607
msgid ""
6608
"register-branch requires a public branch url - see bzr help register-branch."
6609
msgstr ""
6610
6611
#: bzrlib/plugins/launchpad/cmds.py:122
6612
msgid "--product is deprecated; please use --project."
6613
msgstr ""
6614
6615
#: bzrlib/plugins/launchpad/cmds.py:152
6616
msgid "Open a Launchpad branch page in your web browser."
6617
msgstr ""
6618
6619
#: bzrlib/plugins/launchpad/cmds.py:157
6620
msgid "Do not actually open the browser. Just say the URL we would use."
6621
msgstr ""
6622
6623
#: bzrlib/plugins/launchpad/cmds.py:192
6624
#, python-format
6625
msgid "Opening %s in web browser"
6626
msgstr ""
6627
6628
#: bzrlib/plugins/launchpad/cmds.py:200
6629
msgid "Show or set the Launchpad user ID."
6630
msgstr ""
6631
6632
#: bzrlib/plugins/launchpad/cmds.py:202
6633
msgid ""
6634
"When communicating with Launchpad, some commands need to know your\n"
6635
"Launchpad user ID. This command can be used to set or show the\n"
6636
"user ID that Bazaar will use for such communication."
6637
msgstr ""
6638
6639
#: bzrlib/plugins/launchpad/cmds.py:206
6640
msgid ""
6641
":Examples:\n"
6642
" Show the Launchpad ID of the current user::"
6643
msgstr ""
6644
6645
#: bzrlib/plugins/launchpad/cmds.py:209
6646
msgid " bzr launchpad-login"
6647
msgstr ""
6648
6649
#: bzrlib/plugins/launchpad/cmds.py:211
6650
msgid " Set the Launchpad ID of the current user to 'bob'::"
6651
msgstr ""
6652
6653
#: bzrlib/plugins/launchpad/cmds.py:213
6654
msgid " bzr launchpad-login bob"
6655
msgstr ""
6656
6657
#: bzrlib/plugins/launchpad/cmds.py:220
6658
msgid "Don't check that the user name is valid."
6659
msgstr ""
6660
6661
#: bzrlib/plugins/launchpad/cmds.py:235 bzrlib/plugins/launchpad/cmds.py:246
6662
msgid "Launchpad user ID exists and has SSH keys.\n"
6663
msgstr ""
6664
6665
#: bzrlib/plugins/launchpad/cmds.py:238
6666
msgid "No Launchpad user ID configured.\n"
6667
msgstr ""
6668
6669
#: bzrlib/plugins/launchpad/cmds.py:249
6670
#, python-format
6671
msgid "Launchpad user ID set to '%s'.\n"
6672
msgstr ""
6673
6674
#: bzrlib/plugins/launchpad/cmds.py:255
6675
msgid "Ask Launchpad to mirror a branch now."
6676
msgstr ""
6677
6678
#: bzrlib/plugins/launchpad/cmds.py:272
6679
msgid "Propose merging a branch on Launchpad."
6680
msgstr ""
6681
6682
#: bzrlib/plugins/launchpad/cmds.py:274
6683
msgid ""
6684
"This will open your usual editor to provide the initial comment. When it\n"
6685
"has created the proposal, it will open it in your default web browser."
6686
msgstr ""
6687
6688
#: bzrlib/plugins/launchpad/cmds.py:277
6689
msgid ""
6690
"The branch will be proposed to merge into SUBMIT_BRANCH. If SUBMIT_BRANCH\n"
6691
"is not supplied, the remembered submit branch will be used. If no submit\n"
6692
"branch is remembered, the development focus will be used."
6693
msgstr ""
6694
6695
#: bzrlib/plugins/launchpad/cmds.py:281
6696
msgid ""
6697
"By default, the SUBMIT_BRANCH's review team will be requested to review\n"
6698
"the merge proposal. This can be overriden by specifying --review (-R).\n"
6699
"The parameter the launchpad account name of the desired reviewer. This\n"
6700
"may optionally be followed by '=' and the review type. For example:"
6701
msgstr ""
6702
6703
#: bzrlib/plugins/launchpad/cmds.py:286
6704
msgid " bzr lp-propose-merge --review jrandom --review review-team=qa"
6705
msgstr ""
6706
6707
#: bzrlib/plugins/launchpad/cmds.py:288
6708
msgid ""
6709
"This will propose a merge, request \"jrandom\" to perform a review of\n"
6710
"unspecified type, and request \"review-team\" to perform a \"qa\" review."
6711
msgstr ""
6712
6713
#: bzrlib/plugins/launchpad/cmds.py:293
6714
msgid "Propose the merge on staging."
6715
msgstr ""
6716
6717
#: bzrlib/plugins/launchpad/cmds.py:295
6718
msgid "Commit message."
6719
msgstr ""
6720
6721
#: bzrlib/plugins/launchpad/cmds.py:297
6722
msgid "Mark the proposal as approved immediately."
6723
msgstr ""
6724
6725
#: bzrlib/plugins/launchpad/cmds.py:298
6726
msgid "The bug this proposal fixes."
6727
msgstr ""
6728
6729
#: bzrlib/plugins/launchpad/cmds.py:300
6730
msgid "Requested reviewer and optional type."
6731
msgstr ""
6732
6733
#: bzrlib/plugins/launchpad/cmds.py:335
6734
msgid "Find the proposal to merge this revision."
6735
msgstr ""
6736
6737
#: bzrlib/plugins/launchpad/cmds.py:337
6738
msgid ""
6739
"Finds the merge proposal(s) that discussed landing the specified revision.\n"
6740
"This works only if the selected branch was the merge proposal target, and\n"
6741
"if the merged_revno is recorded for the merge proposal. The proposal(s)\n"
6742
"are opened in a web browser."
6743
msgstr ""
6744
6745
#: bzrlib/plugins/launchpad/cmds.py:342
6746
msgid ""
6747
"Any revision involved in the merge may be specified-- the revision in\n"
6748
"which the merge was performed, or one of the revisions that was merged."
6749
msgstr ""
6750
6751
#: bzrlib/plugins/launchpad/cmds.py:345
6752
msgid "So, to find the merge proposal that reviewed line 1 of README::"
6753
msgstr ""
6754
6755
#: bzrlib/plugins/launchpad/cmds.py:347
6756
msgid " bzr lp-find-proposal -r annotate:README:1"
6757
msgstr ""
6758
6759
#: bzrlib/plugins/launchpad/cmds.py:363
6760
msgid "No review found."
6761
msgstr ""
6762
6763
#: bzrlib/plugins/launchpad/cmds.py:364
6764
#, python-format
6765
msgid "%d proposals(s) found."
6766
msgstr ""
6767
6768
#: bzrlib/plugins/launchpad/cmds.py:374
6769
msgid "Finding revision-id"
6770
msgstr ""
6771
6772
#: bzrlib/plugins/launchpad/cmds.py:381
6773
msgid "Finding merge"
6774
msgstr ""
6775
6776
#: bzrlib/plugins/launchpad/cmds.py:386
6777
msgid "Finding revno"
6778
msgstr ""
6779
6780
#: bzrlib/plugins/launchpad/cmds.py:392
6781
msgid "Finding Launchpad branch"
6782
msgstr ""
6783
6784
#: bzrlib/plugins/launchpad/cmds.py:395
6785
msgid "Finding proposals"
6786
msgstr ""
6787
6788
#: bzrlib/plugins/launchpad/lp_api.py:241
6789
#: bzrlib/plugins/launchpad/lp_api.py:246
6790
#, python-format
6791
msgid "%s is not registered on Launchpad"
6792
msgstr ""
6793
6794
#: bzrlib/plugins/launchpad/lp_api.py:256
6795
#, python-format
6796
msgid "%s has no development focus."
6797
msgstr ""
6798
6799
#: bzrlib/plugins/launchpad/lp_api.py:261
6800
#, python-format
6801
msgid "development focus %s has no branch."
6802
msgstr ""
6803
6804
#: bzrlib/plugins/launchpad/lp_api.py:266
6805
#, python-format
6806
msgid "source package %s has no branch."
6807
msgstr ""
6808
6809
#: bzrlib/plugins/launchpad/lp_api.py:270
6810
#, python-format
6811
msgid "%s has no associated product or source package."
6812
msgstr ""
6813
6814
#: bzrlib/plugins/launchpad/lp_api.py:282
6815
#, python-format
6816
msgid "%s is already up-to-date."
6817
msgstr ""
6818
6819
#: bzrlib/plugins/launchpad/lp_api.py:289
6820
#, python-format
6821
msgid "Pushing to %s"
6822
msgstr ""
6823
6824
#: bzrlib/plugins/launchpad/lp_directory.py:170
6825
msgid ""
6826
"resolution for {0}\n"
6827
" local: {1}\n"
6828
" remote: {2}"
6829
msgstr ""
6830
6831
#: bzrlib/plugins/launchpad/lp_propose.py:150
6832
#, python-format
6833
msgid "There is already a branch merge proposal: %s"
6834
msgstr ""
6835
6836
#: bzrlib/plugins/weave_fmt/bzrdir.py:237
6837
msgid "pb parameter to convert() is deprecated"
6838
msgstr ""
6839
6840
#: bzrlib/plugins/weave_fmt/bzrdir.py:240
6841
msgid "starting upgrade from format 4 to 5"
6842
msgstr ""
6843
6844
#: bzrlib/plugins/weave_fmt/bzrdir.py:250
6845
msgid "note: upgrade may be faster if all store files are ungzipped first"
6846
msgstr ""
6847
6848
#: bzrlib/plugins/weave_fmt/bzrdir.py:279
6849
msgid "converting revision"
6850
msgstr ""
6851
6852
#: bzrlib/plugins/weave_fmt/bzrdir.py:284
6853
msgid "upgraded to weaves:"
6854
msgstr ""
6855
6856
#: bzrlib/plugins/weave_fmt/bzrdir.py:285
6857
#, python-format
6858
msgid "%6d revisions and inventories"
6859
msgstr ""
6860
6861
#: bzrlib/plugins/weave_fmt/bzrdir.py:287
6862
#, python-format
6863
msgid "%6d revisions not present"
6864
msgstr ""
6865
6866
#: bzrlib/plugins/weave_fmt/bzrdir.py:289
6867
#, python-format
6868
msgid "%6d texts"
6869
msgstr ""
6870
6871
#: bzrlib/plugins/weave_fmt/bzrdir.py:325
6872
msgid "writing weave"
6873
msgstr ""
6874
6875
#: bzrlib/plugins/weave_fmt/bzrdir.py:329
6876
#: bzrlib/plugins/weave_fmt/bzrdir.py:331
6877
msgid "inventory"
6878
msgstr ""
6879
6880
#: bzrlib/plugins/weave_fmt/bzrdir.py:348
6881
msgid "write revision"
6882
msgstr ""
6883
6884
#: bzrlib/plugins/weave_fmt/bzrdir.py:362
6885
msgid "loading revision"
6886
msgstr ""
6887
6888
#: bzrlib/plugins/weave_fmt/bzrdir.py:367
6889
#, python-format
6890
msgid "revision {%s} not present in branch; will be converted as a ghost"
6891
msgstr ""
6892
6893
#: bzrlib/plugins/weave_fmt/bzrdir.py:507
6894
msgid "starting upgrade from format 5 to 6"
6895
msgstr ""
6896
6897
#: bzrlib/plugins/weave_fmt/bzrdir.py:517
6898
#, python-format
6899
msgid "adding prefixes to %s"
6900
msgstr ""
6901
6902
#: bzrlib/plugins/weave_fmt/bzrdir.py:557
6903
msgid "starting upgrade from format 6 to metadir"
6904
msgstr ""
6905
6906
#: bzrlib/plugins/weave_fmt/bzrdir.py:565
6907
msgid "Removing ancestry.weave"
6908
msgstr ""
6909
6910
#: bzrlib/plugins/weave_fmt/bzrdir.py:570
6911
msgid "Finding branch files"
6912
msgstr ""
6913
6914
#: bzrlib/plugins/weave_fmt/bzrdir.py:580
6915
msgid "Upgrading repository"
6916
msgstr ""
6917
6918
#: bzrlib/plugins/weave_fmt/bzrdir.py:590
6919
msgid "Upgrading branch"
6920
msgstr ""
6921
6922
#: bzrlib/plugins/weave_fmt/bzrdir.py:613
6923
msgid "No working tree."
6924
msgstr ""
6925
6926
#: bzrlib/plugins/weave_fmt/bzrdir.py:620
6927
msgid "Upgrading working tree"
6928
msgstr ""
6929
6930
#: bzrlib/plugins/weave_fmt/bzrdir.py:641
6931
#, python-format
6932
msgid "Make %s lock"
6933
msgstr ""
6934
6935
#: bzrlib/plugins/weave_fmt/bzrdir.py:652
6936
#, python-format
6937
msgid "Moving %s"
6938
msgstr ""
6939
6940
#: bzrlib/push.py:56
6941
msgid "Created new branch."
6942
msgstr ""
6943
6944
#: bzrlib/push.py:97
6945
#, python-format
6946
msgid ""
6947
"Target directory %s already contains a .bzr directory, but it is not valid."
6948
msgstr ""
6949
6950
#: bzrlib/push.py:101
6951
#, python-format
6952
msgid ""
6953
"Target directory %s already exists, but does not have a .bzr directory. "
6954
"Supply --use-existing-dir to push there anyway."
6955
msgstr ""
6956
6957
#: bzrlib/push.py:122
6958
#, python-format
6959
msgid "Too many redirections trying to make %s."
6960
msgstr ""
6961
6962
#: bzrlib/push.py:148
6963
msgid ""
6964
"These branches have diverged. See \"bzr help diverged-branches\" for more "
6965
"information."
6966
msgstr ""
6967
6968
#: bzrlib/push.py:152
6969
#, python-format
6970
msgid ""
6971
"It is not possible to losslessly push to %s. You may want to use dpush "
6972
"instead."
6973
msgstr ""
6974
6975
#: bzrlib/push.py:158
6976
#, python-format
6977
msgid ""
6978
"At %s you have a valid .bzr control directory, but not a branch or "
6979
"repository. This is an unsupported configuration. Please move the target "
6980
"directory out of the way and try again."
6981
msgstr ""
6982
6983
#: bzrlib/reconcile.py:97
6984
#, python-format
6985
msgid "Reconciling branch %s"
6986
msgstr ""
6987
6988
#: bzrlib/reconcile.py:103
6989
#, python-format
6990
msgid "Reconciling repository %s"
6991
msgstr ""
6992
6993
#: bzrlib/reconcile.py:105
6994
msgid "Reconciling repository"
6995
msgstr ""
6996
6997
#: bzrlib/reconcile.py:111
6998
#, python-format
6999
msgid "%s cannot canonicalize CHKs."
7000
msgstr ""
7001
7002
#: bzrlib/reconcile.py:119
7003
msgid "Reconcile aborted: revision index has inconsistent parents."
7004
msgstr ""
7005
7006
#: bzrlib/reconcile.py:121
7007
msgid "Run \"bzr check\" for more details."
7008
msgstr ""
7009
7010
#: bzrlib/reconcile.py:123
7011
msgid "Reconciliation complete."
7012
msgstr ""
7013
7014
#: bzrlib/reconcile.py:166
7015
msgid "Fixing last revision info {0} => {1}"
7016
msgstr ""
7017
7018
#: bzrlib/reconcile.py:173
7019
msgid "revision_history ok."
7020
msgstr ""
7021
7022
#: bzrlib/reconcile.py:234
7023
msgid "Reading inventory data"
7024
msgstr ""
7025
7026
#: bzrlib/reconcile.py:254 bzrlib/reconcile.py:384
7027
msgid "Inventory ok."
7028
msgstr ""
7029
7030
#: bzrlib/reconcile.py:256 bzrlib/reconcile.py:386
7031
msgid "Backing up inventory"
7032
msgstr ""
7033
7034
#: bzrlib/reconcile.py:258
7035
msgid "Backup inventory created."
7036
msgstr ""
7037
7038
#: bzrlib/reconcile.py:274 bzrlib/reconcile.py:405
7039
msgid "Writing weave"
7040
msgstr ""
7041
7042
#: bzrlib/reconcile.py:277 bzrlib/reconcile.py:408
7043
msgid "Inventory regenerated."
7044
msgstr ""
7045
7046
#: bzrlib/reconcile.py:371 bzrlib/reconcile.py:373 bzrlib/reconcile.py:376
7047
msgid "Reading indexes"
7048
msgstr ""
7049
7050
#: bzrlib/reconcile.py:380 bzrlib/reconcile.py:382
7051
msgid "Checking unused inventories"
7052
msgstr ""
7053
7054
#: bzrlib/reconcile.py:388
7055
msgid "Backup Inventory created"
7056
msgstr ""
7057
7058
#: bzrlib/reconcile.py:446
7059
msgid "Fixing text parents"
7060
msgstr ""
7061
7062
#: bzrlib/reconfigure.py:54
7063
msgid "{0} is now stacked on {1}\n"
7064
msgstr ""
7065
7066
#: bzrlib/reconfigure.py:69
7067
#, python-format
7068
msgid "%s is now not stacked\n"
7069
msgstr ""
7070
7071
#: bzrlib/remote.py:1228 bzrlib/repository.py:289
7072
#, python-format
7073
msgid "bzr: ERROR (ignored): %s"
7074
msgstr ""
7075
7076
#: bzrlib/remote.py:2534
7077
msgid "Copying repository content as tarball..."
7078
msgstr ""
7079
7080
#: bzrlib/rename_map.py:69
7081
msgid "Calculating hashes"
7082
msgstr ""
7083
7084
#: bzrlib/rename_map.py:107
7085
msgid "Determining hash hits"
7086
msgstr ""
7087
7088
#: bzrlib/rename_map.py:242
7089
msgid "{0} => {1}"
7090
msgstr ""
7091
7092
#: bzrlib/repository.py:1738
7093
msgid "Moving repository to repository.backup"
7094
msgstr ""
7095
7096
#: bzrlib/repository.py:1745
7097
msgid "Creating new repository"
7098
msgstr ""
7099
7100
#: bzrlib/repository.py:1750
7101
msgid "Copying content"
7102
msgstr ""
7103
7104
#: bzrlib/repository.py:1754
7105
msgid "Deleting old repository content"
7106
msgstr ""
7107
7108
#: bzrlib/repository.py:1756
7109
msgid "repository converted"
7110
msgstr ""
7111
7112
#: bzrlib/revisionspec.py:903
7113
msgid "Using {0} {1}"
7114
msgstr ""
7115
7116
#: bzrlib/send.py:59
7117
#, python-format
7118
msgid "Mail client \"%s\" does not support specifying body"
7119
msgstr ""
7120
7121
#: bzrlib/send.py:63
7122
msgid "--remember requires a branch to be specified."
7123
msgstr ""
7124
7125
#: bzrlib/send.py:78
7126
msgid "No submit branch known or specified"
7127
msgstr ""
7128
7129
#: bzrlib/send.py:81
7130
msgid "Using saved {0} location \"{1}\" to determine what changes to submit."
7131
msgstr ""
7132
7133
#: bzrlib/send.py:99
7134
#, python-format
7135
msgid "No such send format '%s'."
7136
msgstr ""
7137
7138
#: bzrlib/send.py:115
7139
msgid "bzr send takes at most two one revision identifiers"
7140
msgstr ""
7141
7142
#: bzrlib/send.py:128
7143
msgid "No revisions to submit."
7144
msgstr ""
7145
7146
#: bzrlib/send.py:140
7147
msgid ""
7148
"- not supported for merge directives that use more than one output file."
7149
msgstr ""
7150
7151
#: bzrlib/send.py:186
7152
msgid "Format 0.9 does not permit bundle with no patch"
7153
msgstr ""
7154
7155
#: bzrlib/shelf_ui.py:46
7156
#, python-format
7157
msgid "Shelve adding file \"%(path)s\"?"
7158
msgstr ""
7159
7160
#: bzrlib/shelf_ui.py:47
7161
msgid "Shelve binary changes?"
7162
msgstr ""
7163
7164
#: bzrlib/shelf_ui.py:48
7165
msgid "Shelve changing \"%s\" from %(other)s to %(this)s?"
7166
msgstr ""
7167
7168
#: bzrlib/shelf_ui.py:50
7169
#, python-format
7170
msgid "Shelve removing file \"%(path)s\"?"
7171
msgstr ""
7172
7173
#: bzrlib/shelf_ui.py:51
7174
#, python-format
7175
msgid "Shelve %d change(s)?"
7176
msgstr ""
7177
7178
#: bzrlib/shelf_ui.py:52
7179
msgid "Shelve?"
7180
msgstr ""
7181
7182
#: bzrlib/shelf_ui.py:53
7183
#, python-format
7184
msgid ""
7185
"Shelve changing target of \"%(path)s\" from \"%(other)s\" to \"%(this)s\"?"
7186
msgstr ""
7187
7188
#: bzrlib/shelf_ui.py:55
7189
#, python-format
7190
msgid "Shelve renaming \"%(other)s\" => \"%(this)s\"?"
7191
msgstr ""
7192
7193
#: bzrlib/shelf_ui.py:70
7194
#, python-format
7195
msgid "Changes shelved with id \"%d\"."
7196
msgstr ""
7197
7198
#: bzrlib/shelf_ui.py:74
7199
msgid "Selected changes destroyed."
7200
msgstr ""
7201
7202
#: bzrlib/shelf_ui.py:78
7203
msgid "Selected changes:"
7204
msgstr ""
7205
7206
#: bzrlib/shelf_ui.py:98
7207
#, python-format
7208
msgid "Delete file \"%(path)s\"?"
7209
msgstr ""
7210
7211
#: bzrlib/shelf_ui.py:99
7212
msgid "Apply binary changes?"
7213
msgstr ""
7214
7215
#: bzrlib/shelf_ui.py:100
7216
#, python-format
7217
msgid "Change \"%(path)s\" from %(this)s to %(other)s?"
7218
msgstr ""
7219
7220
#: bzrlib/shelf_ui.py:102
7221
#, python-format
7222
msgid "Add file \"%(path)s\"?"
7223
msgstr ""
7224
7225
#: bzrlib/shelf_ui.py:103
7226
#, python-format
7227
msgid "Apply %d change(s)?"
7228
msgstr ""
7229
7230
#: bzrlib/shelf_ui.py:104
7231
msgid "Apply change?"
7232
msgstr ""
7233
7234
#: bzrlib/shelf_ui.py:105
7235
#, python-format
7236
msgid "Change target of \"%(path)s\" from \"%(this)s\" to \"%(other)s\"?"
7237
msgstr ""
7238
7239
#: bzrlib/shelf_ui.py:107
7240
#, python-format
7241
msgid "Rename \"%(this)s\" => \"%(other)s\"?"
7242
msgstr ""
7243
7244
#: bzrlib/shelf_ui.py:402
7245
msgid "No changes are shelved."
7246
msgstr ""
7247
7248
#: bzrlib/shelf_ui.py:460
7249
#, python-format
7250
msgid "Using changes with id \"%d\"."
7251
msgstr ""
7252
7253
#: bzrlib/shelf_ui.py:464
7254
#, python-format
7255
msgid "Message: %s"
7256
msgstr ""
7257
7258
#: bzrlib/shelf_ui.py:476
7259
#, python-format
7260
msgid "Deleted changes with id \"%d\"."
7261
msgstr ""
7262
7263
#: bzrlib/smart/medium.py:714
7264
msgid "HPSS calls: {0} ({1} vfs) {2}"
7265
msgstr ""
7266
7267
#: bzrlib/smart/server.py:169
7268
msgid "Requested to stop gracefully"
7269
msgstr ""
7270
7271
#: bzrlib/smart/server.py:179
7272
#, python-format
7273
msgid "Waiting for %d client(s) to finish"
7274
msgstr ""
7275
7276
#: bzrlib/smart/server.py:185
7277
#, python-format
7278
msgid "Still waiting for %d client(s) to finish"
7279
msgstr ""
7280
7281
#: bzrlib/smart/server.py:219
7282
#, python-format
7283
msgid "listening socket error: %s"
7284
msgstr ""
7285
7286
#: bzrlib/smart/server.py:452
7287
#, python-format
7288
msgid "listening on port: %s"
7289
msgstr ""
7290
7291
#: bzrlib/switch.py:73
7292
msgid "Pending merges must be committed or reverted before using switch."
7293
msgstr ""
7294
7295
#: bzrlib/switch.py:100
7296
msgid ""
7297
"Cannot switch as local commits found in the checkout. Commit these to the "
7298
"bound branch or use --force to throw them away."
7299
msgstr ""
7300
7301
#: bzrlib/switch.py:105
7302
#, python-format
7303
msgid ""
7304
"Unable to connect to current master branch %(target)s: %(error)s To switch "
7305
"anyway, use --force."
7306
msgstr ""
7307
7308
#: bzrlib/switch.py:129
7309
msgid "Cannot switch a branch, only a checkout."
7310
msgstr ""
7311
7312
#: bzrlib/switch.py:167
7313
#, python-format
7314
msgid "Tree is up to date at revision %d."
7315
msgstr ""
7316
7317
#: bzrlib/switch.py:173
7318
#, python-format
7319
msgid "Updated to revision %d."
7320
msgstr ""
7321
7322
#: bzrlib/transform.py:1723 bzrlib/transform.py:1734 bzrlib/transform.py:1736
7323
msgid "Apply phase"
7324
msgstr ""
7325
7326
#: bzrlib/transform.py:1762 bzrlib/transform.py:1830
7327
msgid "removing file"
7328
msgstr ""
7329
7330
#: bzrlib/transform.py:1780 bzrlib/transform.py:1865
7331
msgid "adding file"
7332
msgstr ""
7333
7334
#: bzrlib/transform.py:2598
7335
msgid "Building tree"
7336
msgstr ""
7337
7338
#: bzrlib/transform.py:2688 bzrlib/transform.py:2715
7339
msgid "Adding file contents"
7340
msgstr ""
7341
7342
#: bzrlib/transform.py:3017
7343
msgid "Resolution pass"
7344
msgstr ""
7345
7346
#: bzrlib/transport/ftp/_gssapi.py:88
7347
#, python-format
7348
msgid "Authenticated as %s"
7349
msgstr ""
7350
7351
#: bzrlib/tree.py:647
7352
msgid "*** {0} content-filter: {1} => {2!r}"
7353
msgstr ""
7354
7355
#: bzrlib/upgrade.py:77
7356
#, python-format
7357
msgid "This is a checkout. The branch (%s) needs to be upgraded separately."
7358
msgstr ""
7359
7360
#: bzrlib/upgrade.py:100
7361
#, python-format
7362
msgid "cannot upgrade from bzrdir format %s"
7363
msgstr ""
7364
7365
#: bzrlib/upgrade.py:103
7366
#, python-format
7367
msgid "starting upgrade of %s"
7368
msgstr ""
7369
7370
#: bzrlib/upgrade.py:110
7371
msgid "finished"
7372
msgstr ""
7373
7374
#: bzrlib/upgrade.py:120
7375
msgid "Deleting backup.bzr"
7376
msgstr ""
7377
7378
#: bzrlib/upgrade.py:151
7379
msgid ""
7380
"\n"
7381
"SUMMARY: {0} upgrades attempted, {1} succeeded, {2} failed"
7382
msgstr ""
7383
7384
#: bzrlib/upgrade.py:208
7385
#, python-format
7386
msgid "Found %d dependent branches - upgrading ..."
7387
msgstr ""
7388
7389
#: bzrlib/upgrade.py:276
7390
msgid "Upgrading bzrdirs"
7391
msgstr ""
7392
7393
#: bzrlib/upgrade.py:282
7394
#, python-format
7395
msgid "Upgrading %s"
7396
msgstr ""
7397
7398
#: bzrlib/upgrade.py:283
7399
msgid "Upgrading {0} {1} ..."
7400
msgstr ""
7401
7402
#: bzrlib/upgrade.py:301
7403
msgid "Removing backup ..."
7404
msgstr ""
7405
7406
#: bzrlib/upgrade.py:305
7407
msgid "failed to clean-up {0}: {1}"
7408
msgstr ""
7409
7410
#: bzrlib/vf_repository.py:1091
7411
msgid "inventories"
7412
msgstr ""
7413
7414
#: bzrlib/vf_repository.py:1117
7415
msgid "texts"
7416
msgstr ""
7417
7418
#: bzrlib/vf_repository.py:1622 bzrlib/vf_repository.py:1631
7419
msgid "Calculating text parents"
7420
msgstr ""
7421
7422
#: bzrlib/vf_repository.py:1707
7423
msgid "Fetch texts"
7424
msgstr ""
7425
7426
#: bzrlib/vf_repository.py:2536
7427
msgid "loading text store"
7428
msgstr ""
7429
7430
#: bzrlib/vf_repository.py:2542
7431
msgid "checking text graph"
7432
msgstr ""
7433
7434
#: bzrlib/vf_repository.py:2998 bzrlib/vf_repository.py:3012
7435
#: bzrlib/vf_repository.py:3127
7436
msgid "Transferring revisions"
7437
msgstr ""
7438
7439
#: bzrlib/win32utils.py:146
7440
msgid "Failed to GetProcessMemoryInfo()"
7441
msgstr ""
7442
7443
#: bzrlib/win32utils.py:167
7444
msgid "Cannot debug memory on win32 without ctypes or win32process"
7445
msgstr ""
7446
7447
#: bzrlib/win32utils.py:172
7448
msgid "WorkingSize {0:>7}KiB\tPeakWorking {1:>7}KiB\t{2}"
7449
msgstr ""
7450
7451
#: bzrlib/win32utils.py:180
7452
#, python-format
7453
msgid "WorkingSize %8d KiB"
7454
msgstr ""
7455
7456
#: bzrlib/win32utils.py:181
7457
#, python-format
7458
msgid "PeakWorking %8d KiB"
7459
msgstr ""
7460
7461
#: bzrlib/win32utils.py:182
7462
#, python-format
7463
msgid "PagefileUsage %8d KiB"
7464
msgstr ""
7465
7466
#: bzrlib/win32utils.py:183
7467
#, python-format
7468
msgid "PeakPagefileUsage %8d KiB"
7469
msgstr ""
7470
7471
#: bzrlib/win32utils.py:185
7472
#, python-format
7473
msgid "PrivateUsage %8d KiB"
7474
msgstr ""
7475
7476
#: bzrlib/win32utils.py:186
7477
#, python-format
7478
msgid "PageFaultCount %8d"
7479
msgstr ""
7480
7481
#: bzrlib/workingtree.py:1482
7482
msgid "Rerun update after fixing the conflicts."
7483
msgstr ""
7484
7485
#: dummy/help_topics/authentication/summary.txt:1
7486
msgid "Information on configuring authentication"
7487
msgstr ""
7488
7489
#: dummy/help_topics/basic/detail.txt:1
7490
msgid ""
7491
"Bazaar 2.6b2 -- a free distributed version-control tool\n"
7492
"http://bazaar.canonical.com/"
7493
msgstr ""
7494
7495
#: dummy/help_topics/basic/detail.txt:4
7496
msgid ""
7497
"Basic commands:\n"
7498
" bzr init makes this directory a versioned branch\n"
7499
" bzr branch make a copy of another branch"
7500
msgstr ""
7501
7502
#: dummy/help_topics/basic/detail.txt:8
7503
msgid ""
7504
" bzr add make files or directories versioned\n"
7505
" bzr ignore ignore a file or pattern\n"
7506
" bzr mv move or rename a versioned file"
7507
msgstr ""
7508
7509
#: dummy/help_topics/basic/detail.txt:12
7510
msgid ""
7511
" bzr status summarize changes in working copy\n"
7512
" bzr diff show detailed diffs"
7513
msgstr ""
7514
7515
#: dummy/help_topics/basic/detail.txt:15
7516
msgid ""
7517
" bzr merge pull in changes from another branch\n"
7518
" bzr commit save some or all changes\n"
7519
" bzr send send changes via email"
7520
msgstr ""
7521
7522
#: dummy/help_topics/basic/detail.txt:19
7523
msgid ""
7524
" bzr log show history of changes\n"
7525
" bzr check validate storage"
7526
msgstr ""
7527
7528
#: dummy/help_topics/basic/detail.txt:22
7529
msgid ""
7530
" bzr help init more help on e.g. init command\n"
7531
" bzr help commands list all commands\n"
7532
" bzr help topics list all help topics\n"
7533
msgstr ""
7534
7535
#: dummy/help_topics/basic/summary.txt:1
7536
msgid "Basic commands"
7537
msgstr ""
7538
7539
#: dummy/help_topics/branches/detail.txt:1
7540
msgid "Branches"
7541
msgstr ""
7542
7543
#: dummy/help_topics/branches/detail.txt:3
7544
msgid ""
7545
"A branch consists of the state of a project, including all of its\n"
7546
"history. All branches have a repository associated (which is where the\n"
7547
"branch history is stored), but multiple branches may share the same\n"
7548
"repository (a shared repository). Branches can be copied and merged."
7549
msgstr ""
7550
7551
#: dummy/help_topics/branches/detail.txt:8
7552
msgid ""
7553
"In addition, one branch may be bound to another one. Binding to another\n"
7554
"branch indicates that commits which happen in this branch must also \n"
7555
"happen in the other branch. Bazaar ensures consistency by not allowing \n"
7556
"commits when the two branches are out of date. In order for a commit \n"
7557
"to succeed, it may be necessary to update the current branch using \n"
7558
"``bzr update``."
7559
msgstr ""
7560
7561
#: dummy/help_topics/branches/detail.txt:15
7562
#: dummy/help_topics/checkouts/detail.txt:66
7563
#: dummy/help_topics/repositories/detail.txt:36
7564
msgid "Related commands::"
7565
msgstr ""
7566
7567
#: dummy/help_topics/branches/detail.txt:17
7568
msgid ""
7569
" init Change a directory into a versioned branch.\n"
7570
" branch Create a new branch that is a copy of an existing branch.\n"
7571
" merge Perform a three-way merge.\n"
7572
" bind Bind a branch to another one.\n"
7573
msgstr ""
7574
7575
#: dummy/help_topics/branches/summary.txt:1
7576
msgid "Information on what a branch is"
7577
msgstr ""
7578
7579
#: dummy/help_topics/bugs/summary.txt:1
7580
msgid "Bug tracker settings"
7581
msgstr ""
7582
7583
#: dummy/help_topics/checkouts/detail.txt:1
7584
msgid "Checkouts"
7585
msgstr ""
7586
7587
#: dummy/help_topics/checkouts/detail.txt:3
7588
msgid ""
7589
"Checkouts are source trees that are connected to a branch, so that when\n"
7590
"you commit in the source tree, the commit goes into that branch. They\n"
7591
"allow you to use a simpler, more centralized workflow, ignoring some of\n"
7592
"Bazaar's decentralized features until you want them. Using checkouts\n"
7593
"with shared repositories is very similar to working with SVN or CVS, but\n"
7594
"doesn't have the same restrictions. And using checkouts still allows\n"
7595
"others working on the project to use whatever workflow they like."
7596
msgstr ""
7597
7598
#: dummy/help_topics/checkouts/detail.txt:11
7599
msgid ""
7600
"A checkout is created with the bzr checkout command (see \"help "
7601
"checkout\").\n"
7602
"You pass it a reference to another branch, and it will create a local copy\n"
7603
"for you that still contains a reference to the branch you created the\n"
7604
"checkout from (the master branch). Then if you make any commits they will "
7605
"be\n"
7606
"made on the other branch first. This creates an instant mirror of your work, "
7607
"or\n"
7608
"facilitates lockstep development, where each developer is working together,\n"
7609
"continuously integrating the changes of others."
7610
msgstr ""
7611
7612
#: dummy/help_topics/checkouts/detail.txt:19
7613
msgid ""
7614
"However the checkout is still a first class branch in Bazaar terms, so that\n"
7615
"you have the full history locally. As you have a first class branch you "
7616
"can\n"
7617
"also commit locally if you want, for instance due to the temporary loss af "
7618
"a\n"
7619
"network connection. Use the --local option to commit to do this. All the "
7620
"local\n"
7621
"commits will then be made on the master branch the next time you do a non-"
7622
"local\n"
7623
"commit."
7624
msgstr ""
7625
7626
#: dummy/help_topics/checkouts/detail.txt:26
7627
msgid ""
7628
"If you are using a checkout from a shared branch you will periodically want "
7629
"to\n"
7630
"pull in all the changes made by others. This is done using the \"update\"\n"
7631
"command. The changes need to be applied before any non-local commit, but\n"
7632
"Bazaar will tell you if there are any changes and suggest that you use this\n"
7633
"command when needed."
7634
msgstr ""
7635
7636
#: dummy/help_topics/checkouts/detail.txt:32
7637
msgid ""
7638
"It is also possible to create a \"lightweight\" checkout by passing the\n"
7639
"--lightweight flag to checkout. A lightweight checkout is even closer to an\n"
7640
"SVN checkout in that it is not a first class branch, it mainly consists of "
7641
"the\n"
7642
"working tree. This means that any history operations must query the master\n"
7643
"branch, which could be slow if a network connection is involved. Also, as "
7644
"you\n"
7645
"don't have a local branch, then you cannot commit locally."
7646
msgstr ""
7647
7648
#: dummy/help_topics/checkouts/detail.txt:39
7649
msgid ""
7650
"Lightweight checkouts work best when you have fast reliable access to the\n"
7651
"master branch. This means that if the master branch is on the same disk or "
7652
"LAN\n"
7653
"a lightweight checkout will be faster than a heavyweight one for any "
7654
"commands\n"
7655
"that modify the revision history (as only one copy of the branch needs to\n"
7656
"be updated). Heavyweight checkouts will generally be faster for any command\n"
7657
"that uses the history but does not change it, but if the master branch is "
7658
"on\n"
7659
"the same disk then there won't be a noticeable difference."
7660
msgstr ""
7661
7662
#: dummy/help_topics/checkouts/detail.txt:47
7663
msgid ""
7664
"Another possible use for a checkout is to use it with a treeless repository\n"
7665
"containing your branches, where you maintain only one working tree by\n"
7666
"switching the master branch that the checkout points to when you want to\n"
7667
"work on a different branch."
7668
msgstr ""
7669
7670
#: dummy/help_topics/checkouts/detail.txt:52
7671
msgid ""
7672
"Obviously to commit on a checkout you need to be able to write to the "
7673
"master\n"
7674
"branch. This means that the master branch must be accessible over a "
7675
"writeable\n"
7676
"protocol , such as sftp://, and that you have write permissions at the "
7677
"other\n"
7678
"end. Checkouts also work on the local file system, so that all that matters "
7679
"is\n"
7680
"file permissions."
7681
msgstr ""
7682
7683
#: dummy/help_topics/checkouts/detail.txt:58
7684
msgid ""
7685
"You can change the master of a checkout by using the \"switch\" command "
7686
"(see\n"
7687
"\"help switch\"). This will change the location that the commits are sent "
7688
"to.\n"
7689
"The \"bind\" command can also be used to turn a normal branch into a heavy\n"
7690
"checkout. If you would like to convert your heavy checkout into a normal\n"
7691
"branch so that every commit is local, you can use the \"unbind\" command. To "
7692
"see\n"
7693
"whether or not a branch is bound or not you can use the \"info\" command. If "
7694
"the\n"
7695
"branch is bound it will tell you the location of the bound branch."
7696
msgstr ""
7697
7698
#: dummy/help_topics/checkouts/detail.txt:68
7699
msgid ""
7700
" checkout Create a checkout. Pass --lightweight to get a lightweight\n"
7701
" checkout\n"
7702
" update Pull any changes in the master branch in to your checkout\n"
7703
" commit Make a commit that is sent to the master branch. If you have\n"
7704
" a heavy checkout then the --local option will commit to the\n"
7705
" checkout without sending the commit to the master\n"
7706
" switch Change the master branch that the commits in the checkout "
7707
"will\n"
7708
" be sent to\n"
7709
" bind Turn a standalone branch into a heavy checkout so that any\n"
7710
" commits will be sent to the master branch\n"
7711
" unbind Turn a heavy checkout into a standalone branch so that any\n"
7712
" commits are only made locally\n"
7713
" info Displays whether a branch is bound or unbound. If the branch "
7714
"is\n"
7715
" bound, then it will also display the location of the bound "
7716
"branch\n"
7717
msgstr ""
7718
7719
#: dummy/help_topics/checkouts/summary.txt:1
7720
msgid "Information on what a checkout is"
7721
msgstr ""
7722
7723
#: dummy/help_topics/commands/summary.txt:1
7724
msgid "Basic help for all commands"
7725
msgstr ""
7726
7727
#: dummy/help_topics/configuration/summary.txt:1
7728
msgid "Details on the configuration settings available"
7729
msgstr ""
7730
7731
#: dummy/help_topics/conflict-types/summary.txt:1
7732
msgid "Types of conflicts and what to do about them"
7733
msgstr ""
7734
7735
#: dummy/help_topics/content-filters/summary.txt:1
7736
msgid "Conversion of content into/from working trees"
7737
msgstr ""
7738
7739
#: dummy/help_topics/criss-cross/detail.txt:1
7740
msgid "Criss-Cross"
7741
msgstr ""
7742
7743
#: dummy/help_topics/criss-cross/detail.txt:3
7744
msgid ""
7745
"A criss-cross in the branch history can cause the default merge technique\n"
7746
"to emit more conflicts than would normally be expected."
7747
msgstr ""
7748
7749
#: dummy/help_topics/criss-cross/detail.txt:6
7750
msgid ""
7751
"In complex merge cases, ``bzr merge --lca`` or ``bzr merge --weave`` may "
7752
"give\n"
7753
"better results. You may wish to ``bzr revert`` the working tree and merge\n"
7754
"again. Alternatively, use ``bzr remerge`` on particular conflicted files."
7755
msgstr ""
7756
7757
#: dummy/help_topics/criss-cross/detail.txt:10
7758
msgid ""
7759
"Criss-crosses occur in a branch's history if two branches merge the same "
7760
"thing\n"
7761
"and then merge one another, or if two branches merge one another at the "
7762
"same\n"
7763
"time. They can be avoided by having each branch only merge from or into a\n"
7764
"designated central branch (a \"star topology\")."
7765
msgstr ""
7766
7767
#: dummy/help_topics/criss-cross/detail.txt:15
7768
msgid ""
7769
"Criss-crosses cause problems because of the way merge works. Bazaar's "
7770
"default\n"
7771
"merge is a three-way merger; in order to merge OTHER into THIS, it must\n"
7772
"find a basis for comparison, BASE. Using BASE, it can determine whether\n"
7773
"differences between THIS and OTHER are due to one side adding lines, or\n"
7774
"from another side removing lines."
7775
msgstr ""
7776
7777
#: dummy/help_topics/criss-cross/detail.txt:21
7778
msgid ""
7779
"Criss-crosses mean there is no good choice for a base. Selecting the "
7780
"recent\n"
7781
"merge points could cause one side's changes to be silently discarded.\n"
7782
"Selecting older merge points (which Bazaar does) mean that extra conflicts\n"
7783
"are emitted."
7784
msgstr ""
7785
7786
#: dummy/help_topics/criss-cross/detail.txt:26
7787
msgid ""
7788
"The ``weave`` merge type is not affected by this problem because it uses\n"
7789
"line-origin detection instead of a basis revision to determine the cause of\n"
7790
"differences.\n"
7791
msgstr ""
7792
7793
#: dummy/help_topics/criss-cross/summary.txt:1
7794
msgid "Information on criss-cross merging"
7795
msgstr ""
7796
7797
#: dummy/help_topics/current-formats/summary.txt:1
7798
msgid "Current storage formats"
7799
msgstr ""
7800
7801
#: dummy/help_topics/debug-flags/summary.txt:1
7802
msgid "Options to show or record debug information"
7803
msgstr ""
7804
7805
#: dummy/help_topics/diverged-branches/summary.txt:1
7806
msgid "How to fix diverged branches"
7807
msgstr ""
7808
7809
#: dummy/help_topics/env-variables/summary.txt:1
7810
msgid "Environment variable names and values"
7811
msgstr ""
7812
7813
#: dummy/help_topics/eol/summary.txt:1
7814
msgid "Information on end-of-line handling"
7815
msgstr ""
7816
7817
#: dummy/help_topics/files/detail.txt:1
7818
msgid "Files"
7819
msgstr ""
7820
7821
#: dummy/help_topics/files/detail.txt:3
7822
msgid ""
7823
":On Unix: ~/.bazaar/bazaar.conf\n"
7824
":On Windows: C:\\\\Documents and Settings\\\\username\\\\Application Data\\\\"
7825
"bazaar\\\\2.0\\\\bazaar.conf"
7826
msgstr ""
7827
7828
#: dummy/help_topics/files/detail.txt:6
7829
msgid ""
7830
"Contains the user's default configuration. The section ``[DEFAULT]`` is\n"
7831
"used to define general configuration that will be applied everywhere.\n"
7832
"The section ``[ALIASES]`` can be used to create command aliases for\n"
7833
"commonly used options."
7834
msgstr ""
7835
7836
#: dummy/help_topics/files/detail.txt:11
7837
msgid "A typical config file might look something like::"
7838
msgstr ""
7839
7840
#: dummy/help_topics/files/detail.txt:13
7841
msgid ""
7842
" [DEFAULT]\n"
7843
" email=John Doe <jdoe@isp.com>"
7844
msgstr ""
7845
7846
#: dummy/help_topics/files/detail.txt:16
7847
msgid ""
7848
" [ALIASES]\n"
7849
" commit = commit --strict\n"
7850
" log10 = log --short -r -10..-1\n"
7851
msgstr ""
7852
7853
#: dummy/help_topics/files/summary.txt:1
7854
msgid "Information on configuration and log files"
7855
msgstr ""
7856
7857
#: dummy/help_topics/formats/detail.txt:1
7858
msgid "Storage Formats"
7859
msgstr ""
7860
7861
#: dummy/help_topics/formats/detail.txt:3
7862
msgid ""
7863
"To ensure that older clients do not access data incorrectly,\n"
7864
"Bazaar's policy is to introduce a new storage format whenever\n"
7865
"new features requiring new metadata are added. New storage\n"
7866
"formats may also be introduced to improve performance and\n"
7867
"scalability."
7868
msgstr ""
7869
7870
#: dummy/help_topics/formats/detail.txt:9
7871
msgid ""
7872
"The newest format, 2a, is highly recommended. If your\n"
7873
"project is not using 2a, then you should suggest to the\n"
7874
"project owner to upgrade."
7875
msgstr ""
7876
7877
#: dummy/help_topics/formats/detail.txt:13
7878
msgid ""
7879
"\n"
7880
".. note::"
7881
msgstr ""
7882
7883
#: dummy/help_topics/formats/detail.txt:16
7884
msgid ""
7885
" Some of the older formats have two variants:\n"
7886
" a plain one and a rich-root one. The latter include an additional\n"
7887
" field about the root of the tree. There is no performance cost\n"
7888
" for using a rich-root format but you cannot easily merge changes\n"
7889
" from a rich-root format into a plain format. As a consequence,\n"
7890
" moving a project to a rich-root format takes some co-ordination\n"
7891
" in that all contributors need to upgrade their repositories\n"
7892
" around the same time. 2a and all future formats will be\n"
7893
" implicitly rich-root."
7894
msgstr ""
7895
7896
#: dummy/help_topics/formats/detail.txt:26
7897
msgid ""
7898
"See :doc:`current-formats-help` for the complete list of\n"
7899
"currently supported formats. See :doc:`other-formats-help` for\n"
7900
"descriptions of any available experimental and deprecated formats.\n"
7901
msgstr ""
7902
7903
#: dummy/help_topics/formats/summary.txt:1
7904
msgid "Information on choosing a storage format"
7905
msgstr ""
7906
7907
#: dummy/help_topics/global-options/detail.txt:1
7908
msgid "Global Options"
7909
msgstr ""
7910
7911
#: dummy/help_topics/global-options/detail.txt:3
7912
msgid ""
7913
"These options may be used with any command, and may appear in front of any\n"
7914
"command. (e.g. ``bzr --profile help``)."
7915
msgstr ""
7916
7917
#: dummy/help_topics/global-options/detail.txt:6
7918
msgid ""
7919
"--version Print the version number. Must be supplied before the "
7920
"command.\n"
7921
"--no-aliases Do not process command aliases when running this command.\n"
7922
"--builtin Use the built-in version of a command, not the plugin "
7923
"version.\n"
7924
" This does not suppress other plugin effects.\n"
7925
"--no-plugins Do not process any plugins.\n"
7926
"--no-l10n Do not translate messages.\n"
7927
"--concurrency Number of processes that can be run concurrently (selftest)."
7928
msgstr ""
7929
7930
#: dummy/help_topics/global-options/detail.txt:14
7931
msgid ""
7932
"--profile Profile execution using the hotshot profiler.\n"
7933
"--lsprof Profile execution using the lsprof profiler.\n"
7934
"--lsprof-file Profile execution using the lsprof profiler, and write the\n"
7935
" results to a specified file. If the filename ends with "
7936
"\".txt\",\n"
7937
" text format will be used. If the filename either starts "
7938
"with\n"
7939
" \"callgrind.out\" or end with \".callgrind\", the output will "
7940
"be\n"
7941
" formatted for use with KCacheGrind. Otherwise, the output\n"
7942
" will be a pickle.\n"
7943
"--coverage Generate line coverage report in the specified directory."
7944
msgstr ""
7945
7946
#: dummy/help_topics/global-options/detail.txt:24
7947
msgid ""
7948
"-Oname=value Override the ``name`` config option setting it to ``value`` "
7949
"for\n"
7950
" the duration of the command. This can be used multiple times "
7951
"if\n"
7952
" several options need to be overridden."
7953
msgstr ""
7954
7955
#: dummy/help_topics/global-options/detail.txt:28
7956
msgid ""
7957
"See http://doc.bazaar.canonical.com/developers/profiling.html for more\n"
7958
"information on profiling."
7959
msgstr ""
7960
7961
#: dummy/help_topics/global-options/detail.txt:31
7962
msgid ""
7963
"A number of debug flags are also available to assist troubleshooting and\n"
7964
"development. See :doc:`debug-flags-help`.\n"
7965
msgstr ""
7966
7967
#: dummy/help_topics/global-options/summary.txt:1
7968
msgid "Options that control how Bazaar runs"
7969
msgstr ""
7970
7971
#: dummy/help_topics/hidden-commands/summary.txt:1
7972
msgid "All hidden commands"
7973
msgstr ""
7974
7975
#: dummy/help_topics/hooks/summary.txt:1
7976
msgid "Points at which custom processing can be added"
7977
msgstr ""
7978
7979
#: dummy/help_topics/launchpad/detail.txt:1
7980
msgid "Integration with Launchpad.net"
7981
msgstr ""
7982
7983
#: dummy/help_topics/launchpad/detail.txt:3
7984
msgid ""
7985
"Launchpad.net provides free Bazaar branch hosting with integrated bug and\n"
7986
"specification tracking."
7987
msgstr ""
7988
7989
#: dummy/help_topics/launchpad/detail.txt:6
7990
msgid ""
7991
"The bzr client (through the plugin called 'launchpad') has special\n"
7992
"features to communicate with Launchpad:"
7993
msgstr ""
7994
7995
#: dummy/help_topics/launchpad/detail.txt:9
7996
msgid ""
7997
" * The launchpad-login command tells Bazaar your Launchpad user name. "
7998
"This\n"
7999
" is then used by the 'lp:' transport to download your branches using\n"
8000
" bzr+ssh://."
8001
msgstr ""
8002
8003
#: dummy/help_topics/launchpad/detail.txt:13
8004
msgid ""
8005
" * The 'lp:' transport uses Launchpad as a directory service: for "
8006
"example\n"
8007
" 'lp:bzr' and 'lp:python' refer to the main branches of the relevant\n"
8008
" projects and may be branched, logged, etc. You can also use the 'lp:'\n"
8009
" transport to refer to specific branches, e.g. lp:~bzr/bzr/trunk."
8010
msgstr ""
8011
8012
#: dummy/help_topics/launchpad/detail.txt:18
8013
msgid ""
8014
" * The 'lp:' bug tracker alias can expand launchpad bug numbers to their\n"
8015
" URLs for use with 'bzr commit --fixes', e.g. 'bzr commit --fixes "
8016
"lp:12345'\n"
8017
" will record a revision property that marks that revision as fixing\n"
8018
" Launchpad bug 12345. When you push that branch to Launchpad it will\n"
8019
" automatically be linked to the bug report."
8020
msgstr ""
8021
8022
#: dummy/help_topics/launchpad/detail.txt:24
8023
msgid ""
8024
" * The register-branch command tells Launchpad about the url of a\n"
8025
" public branch. Launchpad will then mirror the branch, display\n"
8026
" its contents and allow it to be attached to bugs and other\n"
8027
" objects."
8028
msgstr ""
8029
8030
#: dummy/help_topics/launchpad/detail.txt:29
8031
msgid "For more information see http://help.launchpad.net/\n"
8032
msgstr ""
8033
8034
#: dummy/help_topics/launchpad/summary.txt:1
8035
msgid "Using Bazaar with Launchpad.net"
8036
msgstr ""
8037
8038
#: dummy/help_topics/location-alias/summary.txt:1
8039
msgid "Aliases for remembered locations"
8040
msgstr ""
8041
8042
#: dummy/help_topics/log-formats/summary.txt:1
8043
msgid "Details on the logging formats available"
8044
msgstr ""
8045
8046
#: dummy/help_topics/other-formats/summary.txt:1
8047
msgid "Experimental and deprecated storage formats"
8048
msgstr ""
8049
8050
#: dummy/help_topics/patterns/summary.txt:1
8051
msgid "Information on the pattern syntax"
8052
msgstr ""
8053
8054
#: dummy/help_topics/repositories/detail.txt:1
8055
msgid "Repositories"
8056
msgstr ""
8057
8058
#: dummy/help_topics/repositories/detail.txt:3
8059
msgid ""
8060
"Repositories in Bazaar are where committed information is stored. There is\n"
8061
"a repository associated with every branch."
8062
msgstr ""
8063
8064
#: dummy/help_topics/repositories/detail.txt:6
8065
msgid ""
8066
"Repositories are a form of database. Bzr will usually maintain this for\n"
8067
"good performance automatically, but in some situations (e.g. when doing\n"
8068
"very many commits in a short time period) you may want to ask bzr to\n"
8069
"optimise the database indices. This can be done by the 'bzr pack' command."
8070
msgstr ""
8071
8072
#: dummy/help_topics/repositories/detail.txt:11
8073
msgid ""
8074
"By default just running 'bzr init' will create a repository within the new\n"
8075
"branch but it is possible to create a shared repository which allows "
8076
"multiple\n"
8077
"branches to share their information in the same location. When a new branch "
8078
"is\n"
8079
"created it will first look to see if there is a containing shared repository "
8080
"it\n"
8081
"can use."
8082
msgstr ""
8083
8084
#: dummy/help_topics/repositories/detail.txt:17
8085
msgid ""
8086
"When two branches of the same project share a repository, there is\n"
8087
"generally a large space saving. For some operations (e.g. branching\n"
8088
"within the repository) this translates in to a large time saving."
8089
msgstr ""
8090
8091
#: dummy/help_topics/repositories/detail.txt:21
8092
msgid ""
8093
"To create a shared repository use the init-repository command (or the alias\n"
8094
"init-repo). This command takes the location of the repository to create. "
8095
"This\n"
8096
"means that 'bzr init-repository repo' will create a directory named 'repo',\n"
8097
"which contains a shared repository. Any new branches that are created in "
8098
"this\n"
8099
"directory will then use it for storage."
8100
msgstr ""
8101
8102
#: dummy/help_topics/repositories/detail.txt:27
8103
msgid ""
8104
"It is a good idea to create a repository whenever you might create more\n"
8105
"than one branch of a project. This is true for both working areas where you\n"
8106
"are doing the development, and any server areas that you use for hosting\n"
8107
"projects. In the latter case, it is common to want branches without working\n"
8108
"trees. Since the files in the branch will not be edited directly there is "
8109
"no\n"
8110
"need to use up disk space for a working tree. To create a repository in "
8111
"which\n"
8112
"the branches will not have working trees pass the '--no-trees' option to\n"
8113
"'init-repository'."
8114
msgstr ""
8115
8116
#: dummy/help_topics/repositories/detail.txt:38
8117
msgid ""
8118
" init-repository Create a shared repository. Use --no-trees to create "
8119
"one\n"
8120
" in which new branches won't get a working tree.\n"
8121
msgstr ""
8122
8123
#: dummy/help_topics/repositories/summary.txt:1
8124
msgid "Basic information on shared repositories."
8125
msgstr ""
8126
8127
#: dummy/help_topics/revisionspec/summary.txt:1
8128
msgid "Explain how to use --revision"
8129
msgstr ""
8130
8131
#: dummy/help_topics/rules/summary.txt:1
8132
msgid "Information on defining rule-based preferences"
8133
msgstr ""
8134
8135
#: dummy/help_topics/standalone-trees/detail.txt:1
8136
msgid "Standalone Trees"
8137
msgstr ""
8138
8139
#: dummy/help_topics/standalone-trees/detail.txt:3
8140
msgid ""
8141
"A standalone tree is a working tree with an associated repository. It\n"
8142
"is an independently usable branch, with no dependencies on any other.\n"
8143
"Creating a standalone tree (via bzr init) is the quickest way to put\n"
8144
"an existing project under version control."
8145
msgstr ""
8146
8147
#: dummy/help_topics/standalone-trees/detail.txt:8
8148
msgid "Related Commands::"
8149
msgstr ""
8150
8151
#: dummy/help_topics/standalone-trees/detail.txt:10
8152
msgid " init Make a directory into a versioned branch.\n"
8153
msgstr ""
8154
8155
#: dummy/help_topics/standalone-trees/summary.txt:1
8156
msgid "Information on what a standalone tree is"
8157
msgstr ""
8158
8159
#: dummy/help_topics/standard-options/detail.txt:1
8160
msgid "Standard Options"
8161
msgstr ""
8162
8163
#: dummy/help_topics/standard-options/detail.txt:3
8164
msgid "Standard options are legal for all commands."
8165
msgstr ""
8166
8167
#: dummy/help_topics/standard-options/detail.txt:5
8168
msgid ""
8169
"--help, -h Show help message.\n"
8170
"--verbose, -v Display more information.\n"
8171
"--quiet, -q Only display errors and warnings."
8172
msgstr ""
8173
8174
#: dummy/help_topics/standard-options/detail.txt:9
8175
msgid "Unlike global options, standard options can be used in aliases.\n"
8176
msgstr ""
8177
8178
#: dummy/help_topics/standard-options/summary.txt:1
8179
msgid "Options that can be used with any command"
8180
msgstr ""
8181
8182
#: dummy/help_topics/status-flags/detail.txt:1
8183
msgid "Status Flags"
8184
msgstr ""
8185
8186
#: dummy/help_topics/status-flags/detail.txt:3
8187
msgid ""
8188
"Status flags are used to summarise changes to the working tree in a concise\n"
8189
"manner. They are in the form::"
8190
msgstr ""
8191
8192
#: dummy/help_topics/status-flags/detail.txt:6
8193
msgid " xxx <filename>"
8194
msgstr ""
8195
8196
#: dummy/help_topics/status-flags/detail.txt:8
8197
msgid "where the columns' meanings are as follows."
8198
msgstr ""
8199
8200
#: dummy/help_topics/status-flags/detail.txt:10
8201
msgid "Column 1 - versioning/renames::"
8202
msgstr ""
8203
8204
#: dummy/help_topics/status-flags/detail.txt:12
8205
msgid ""
8206
" + File versioned\n"
8207
" - File unversioned\n"
8208
" R File renamed\n"
8209
" ? File unknown\n"
8210
" X File nonexistent (and unknown to bzr)\n"
8211
" C File has conflicts\n"
8212
" P Entry for a pending merge (not a file)"
8213
msgstr ""
8214
8215
#: dummy/help_topics/status-flags/detail.txt:20
8216
msgid "Column 2 - contents::"
8217
msgstr ""
8218
8219
#: dummy/help_topics/status-flags/detail.txt:22
8220
msgid ""
8221
" N File created\n"
8222
" D File deleted\n"
8223
" K File kind changed\n"
8224
" M File modified"
8225
msgstr ""
8226
8227
#: dummy/help_topics/status-flags/detail.txt:27
8228
msgid "Column 3 - execute::"
8229
msgstr ""
8230
8231
#: dummy/help_topics/status-flags/detail.txt:29
8232
msgid " * The execute bit was changed\n"
8233
msgstr ""
8234
8235
#: dummy/help_topics/status-flags/summary.txt:1
8236
msgid "Help on status flags"
8237
msgstr ""
8238
8239
#: dummy/help_topics/sync-for-reconfigure/detail.txt:1
8240
msgid "Branches Out of Sync"
8241
msgstr ""
8242
8243
#: dummy/help_topics/sync-for-reconfigure/detail.txt:3
8244
msgid ""
8245
"When reconfiguring a checkout, tree or branch into a lightweight checkout,\n"
8246
"a local branch must be destroyed. (For checkouts, this is the local branch\n"
8247
"that serves primarily as a cache.) If the branch-to-be-destroyed does not\n"
8248
"have the same last revision as the new reference branch for the lightweight\n"
8249
"checkout, data could be lost, so Bazaar refuses."
8250
msgstr ""
8251
8252
#: dummy/help_topics/sync-for-reconfigure/detail.txt:9
8253
msgid "How you deal with this depends on *why* the branches are out of sync."
8254
msgstr ""
8255
8256
#: dummy/help_topics/sync-for-reconfigure/detail.txt:11
8257
msgid ""
8258
"If you have a checkout and have done local commits, you can get back in "
8259
"sync\n"
8260
"by running \"bzr update\" (and possibly \"bzr commit\")."
8261
msgstr ""
8262
8263
#: dummy/help_topics/sync-for-reconfigure/detail.txt:14
8264
msgid ""
8265
"If you have a branch and the remote branch is out-of-date, you can push\n"
8266
"the local changes using \"bzr push\". If the local branch is out of date, "
8267
"you\n"
8268
"can do \"bzr pull\". If both branches have had changes, you can merge, "
8269
"commit\n"
8270
"and then push your changes. If you decide that some of the changes aren't\n"
8271
"useful, you can \"push --overwrite\" or \"pull --overwrite\" instead.\n"
8272
msgstr ""
8273
8274
#: dummy/help_topics/sync-for-reconfigure/summary.txt:1
8275
msgid "Steps to resolve \"out-of-sync\" when reconfiguring"
8276
msgstr ""
8277
8278
#: dummy/help_topics/topics/summary.txt:1
8279
msgid "Topics list"
8280
msgstr ""
8281
8282
#: dummy/help_topics/url-special-chars/summary.txt:1
8283
msgid "Special character handling in URLs"
8284
msgstr ""
8285
8286
#: dummy/help_topics/urlspec/summary.txt:1
8287
msgid "Supported transport protocols"
8288
msgstr ""
8289
8290
#: dummy/help_topics/working-trees/detail.txt:1
8291
msgid "Working Trees"
8292
msgstr ""
8293
8294
#: dummy/help_topics/working-trees/detail.txt:3
8295
msgid ""
8296
"A working tree is the contents of a branch placed on disk so that you can\n"
8297
"see the files and edit them. The working tree is where you make changes to "
8298
"a\n"
8299
"branch, and when you commit the current state of the working tree is the\n"
8300
"snapshot that is recorded in the commit."
8301
msgstr ""
8302
8303
#: dummy/help_topics/working-trees/detail.txt:8
8304
msgid ""
8305
"When you push a branch to a remote system, a working tree will not be\n"
8306
"created. If one is already present the files will not be updated. The\n"
8307
"branch information will be updated and the working tree will be marked\n"
8308
"as out-of-date. Updating a working tree remotely is difficult, as there\n"
8309
"may be uncommitted changes or the update may cause content conflicts that "
8310
"are\n"
8311
"difficult to deal with remotely."
8312
msgstr ""
8313
8314
#: dummy/help_topics/working-trees/detail.txt:15
8315
msgid ""
8316
"If you have a branch with no working tree you can use the 'checkout' "
8317
"command\n"
8318
"to create a working tree. If you run 'bzr checkout .' from the branch it "
8319
"will\n"
8320
"create the working tree. If the branch is updated remotely, you can update "
8321
"the\n"
8322
"working tree by running 'bzr update' in that directory."
8323
msgstr ""
8324
8325
#: dummy/help_topics/working-trees/detail.txt:20
8326
msgid ""
8327
"If you have a branch with a working tree that you do not want the 'remove-"
8328
"tree'\n"
8329
"command will remove the tree if it is safe. This can be done to avoid the\n"
8330
"warning about the remote working tree not being updated when pushing to the\n"
8331
"branch. It can also be useful when working with a '--no-trees' repository\n"
8332
"(see 'bzr help repositories')."
8333
msgstr ""
8334
8335
#: dummy/help_topics/working-trees/detail.txt:26
8336
msgid ""
8337
"If you want to have a working tree on a remote machine that you push to you\n"
8338
"can either run 'bzr update' in the remote branch after each push, or use "
8339
"some\n"
8340
"other method to update the tree during the push. There is an 'rspush' "
8341
"plugin\n"
8342
"that will update the working tree using rsync as well as doing a push. "
8343
"There\n"
8344
"is also a 'push-and-update' plugin that automates running 'bzr update' via "
8345
"SSH\n"
8346
"after each push."
8347
msgstr ""
8348
8349
#: dummy/help_topics/working-trees/detail.txt:33
8350
msgid "Useful commands::"
8351
msgstr ""
8352
8353
#: dummy/help_topics/working-trees/detail.txt:35
8354
msgid ""
8355
" checkout Create a working tree when a branch does not have one.\n"
8356
" remove-tree Removes the working tree from a branch when it is safe to do "
8357
"so.\n"
8358
" update When a working tree is out of sync with its associated "
8359
"branch\n"
8360
" this will update the tree to match the branch.\n"
8361
msgstr ""
8362
8363
#: dummy/help_topics/working-trees/summary.txt:1
8364
msgid "Information on working trees"
8365
msgstr ""
8366
8367
#: en/help_topics/authentication.txt:1
8368
msgid ""
8369
"Authentication Settings\n"
8370
"======================="
8371
msgstr ""
8372
8373
#: en/help_topics/authentication.txt:4
8374
msgid ""
8375
"\n"
8376
"Intent\n"
8377
"------"
8378
msgstr ""
8379
8380
#: en/help_topics/authentication.txt:8
8381
msgid ""
8382
"Many different authentication policies can be described in the\n"
8383
"``authentication.conf`` file but a particular user should need only a few\n"
8384
"definitions to cover his needs without having to specify a user and a "
8385
"password\n"
8386
"for every branch he uses."
8387
msgstr ""
8388
8389
#: en/help_topics/authentication.txt:13
8390
msgid ""
8391
"The definitions found in this file are used to find the credentials to use "
8392
"for\n"
8393
"a given url. The same credentials can generally be used for as many branches "
8394
"as\n"
8395
"possible by grouping their declaration around the remote servers that need\n"
8396
"them. It's even possible to declare credentials that will be used by "
8397
"different\n"
8398
"servers."
8399
msgstr ""
8400
8401
#: en/help_topics/authentication.txt:19
8402
msgid ""
8403
"The intent is to make this file as small as possible to minimize maintenance."
8404
msgstr ""
8405
8406
#: en/help_topics/authentication.txt:21
8407
msgid ""
8408
"Once the relevant credentials are declared in this file you may use branch "
8409
"urls\n"
8410
"without embedding passwords (security hazard) or even users (enabling "
8411
"sharing\n"
8412
"of your urls with others)."
8413
msgstr ""
8414
8415
#: en/help_topics/authentication.txt:25
8416
msgid "Instead of using::"
8417
msgstr ""
8418
8419
#: en/help_topics/authentication.txt:27
8420
msgid " bzr branch ftp://joe:secret@host.com/path/to/my/branch"
8421
msgstr ""
8422
8423
#: en/help_topics/authentication.txt:29
8424
msgid "you simply use::"
8425
msgstr ""
8426
8427
#: en/help_topics/authentication.txt:31
8428
msgid " bzr branch ftp://host.com/path/to/my/branch"
8429
msgstr ""
8430
8431
#: en/help_topics/authentication.txt:33
8432
msgid ""
8433
"provided you have created the following ``authentication.conf`` file::"
8434
msgstr ""
8435
8436
#: en/help_topics/authentication.txt:35
8437
msgid ""
8438
" [myprojects]\n"
8439
" scheme=ftp\n"
8440
" host=host.com\n"
8441
" user=joe\n"
8442
" password=secret\n"
8443
" "
8444
msgstr ""
8445
8446
#: en/help_topics/authentication.txt:42
8447
msgid ""
8448
"Authentication definitions\n"
8449
"--------------------------"
8450
msgstr ""
8451
8452
#: en/help_topics/authentication.txt:45
8453
msgid ""
8454
"There are two kinds of authentication used by the various schemes supported "
8455
"by\n"
8456
"bzr:"
8457
msgstr ""
8458
8459
#: en/help_topics/authentication.txt:48
8460
msgid "1. user and password"
8461
msgstr ""
8462
8463
#: en/help_topics/authentication.txt:50
8464
msgid ""
8465
"``FTP`` needs a (``user``, ``password``) to authenticate against a ``host``\n"
8466
"``SFTP`` can use either a password or a host key to authenticate. However,\n"
8467
"ssh agents are a better, more secure solution. So we have chosen to not "
8468
"provide\n"
8469
"our own less secure method."
8470
msgstr ""
8471
8472
#: en/help_topics/authentication.txt:55
8473
msgid "2. user, realm and password"
8474
msgstr ""
8475
8476
#: en/help_topics/authentication.txt:57
8477
msgid ""
8478
"``HTTP`` and ``HTTPS`` needs a (``user, realm, password``) to authenticate\n"
8479
"against a host. But, by using ``.htaccess`` files, for example, it is "
8480
"possible\n"
8481
"to define several (``user, realm, password``) for a given ``host``. So what "
8482
"is\n"
8483
"really needed is (``user``, ``password``, ``host``, ``path``). The ``realm`` "
8484
"is\n"
8485
"not taken into account in the definitions, but will displayed if bzr "
8486
"prompts\n"
8487
"you for a password."
8488
msgstr ""
8489
8490
#: en/help_topics/authentication.txt:64
8491
msgid ""
8492
"``HTTP proxy`` can be handled as ``HTTP`` (or ``HTTPS``) by explicitly\n"
8493
"specifying the appropriate port."
8494
msgstr ""
8495
8496
#: en/help_topics/authentication.txt:67
8497
msgid ""
8498
"To take all schemes into account, the password will be deduced from a set "
8499
"of\n"
8500
"authentication definitions (``scheme``, ``host``, ``port``, ``path``, "
8501
"``user``,\n"
8502
"``password``)."
8503
msgstr ""
8504
8505
#: en/help_topics/authentication.txt:71
8506
msgid ""
8507
" * ``scheme``: can be empty (meaning the rest of the definition can be "
8508
"used\n"
8509
" for any scheme), ``SFTP`` and ``bzr+ssh`` should not be used here, "
8510
"``ssh``\n"
8511
" should be used instead since this is the real scheme regarding\n"
8512
" authentication,"
8513
msgstr ""
8514
8515
#: en/help_topics/authentication.txt:76
8516
msgid " * ``host``: can be empty (to act as a default for any host),"
8517
msgstr ""
8518
8519
#: en/help_topics/authentication.txt:78
8520
msgid ""
8521
" * ``port`` can be empty (useful when an host provides several servers for "
8522
"the\n"
8523
" same scheme), only numerical values are allowed, this should be used "
8524
"only\n"
8525
" when the server uses a port different than the scheme standard port,"
8526
msgstr ""
8527
8528
#: en/help_topics/authentication.txt:82
8529
msgid " * ``path``: can be empty (FTP or SFTP will never user it),"
8530
msgstr ""
8531
8532
#: en/help_topics/authentication.txt:84
8533
msgid ""
8534
" * ``user``: can be empty (``bzr`` will defaults to python's\n"
8535
" ``getpass.get_user()``),"
8536
msgstr ""
8537
8538
#: en/help_topics/authentication.txt:87
8539
msgid ""
8540
" * ``password``: can be empty if you prefer to always be prompted for your\n"
8541
" password."
8542
msgstr ""
8543
8544
#: en/help_topics/authentication.txt:90
8545
msgid ""
8546
"Multiple definitions can be provided and, for a given URL, bzr will select "
8547
"a\n"
8548
"(``user`` [, ``password``]) based on the following rules :"
8549
msgstr ""
8550
8551
#: en/help_topics/authentication.txt:93
8552
msgid " 1. the first match wins,"
8553
msgstr ""
8554
8555
#: en/help_topics/authentication.txt:95
8556
msgid " 2. empty fields match everything,"
8557
msgstr ""
8558
8559
#: en/help_topics/authentication.txt:97
8560
msgid ""
8561
" 3. ``scheme`` matches even if decorators are used in the requested URL,"
8562
msgstr ""
8563
8564
#: en/help_topics/authentication.txt:99
8565
msgid ""
8566
" 4. ``host`` matches exactly or act as a domain if it starts with '.'\n"
8567
" (``project.bzr.sf.net`` will match ``.bzr.sf.net`` but "
8568
"``projectbzr.sf.net``\n"
8569
" will not match ``bzr.sf.net``)."
8570
msgstr ""
8571
8572
#: en/help_topics/authentication.txt:103
8573
msgid ""
8574
" 5. ``port`` matches if included in the requested URL (exact matches only)"
8575
msgstr ""
8576
8577
#: en/help_topics/authentication.txt:105
8578
msgid ""
8579
" 6. ``path`` matches if included in the requested URL (and by rule #2 "
8580
"above,\n"
8581
" empty paths will match any provided path)."
8582
msgstr ""
8583
8584
#: en/help_topics/authentication.txt:110
8585
msgid ""
8586
"File format\n"
8587
"-----------"
8588
msgstr ""
8589
8590
#: en/help_topics/authentication.txt:113
8591
msgid ""
8592
"The general rules for :doc:`configuration files <configuration-help>`\n"
8593
"apply except for the variable policies."
8594
msgstr ""
8595
8596
#: en/help_topics/authentication.txt:116
8597
msgid "Each section describes an authentication definition."
8598
msgstr ""
8599
8600
#: en/help_topics/authentication.txt:118
8601
msgid ""
8602
"The section name is an arbitrary string, only the ``DEFAULT`` value is "
8603
"reserved\n"
8604
"and should appear as the *last* section."
8605
msgstr ""
8606
8607
#: en/help_topics/authentication.txt:121
8608
msgid "Each section should define:"
8609
msgstr ""
8610
8611
#: en/help_topics/authentication.txt:123
8612
msgid "* ``user``: the login to be used,"
8613
msgstr ""
8614
8615
#: en/help_topics/authentication.txt:125
8616
msgid "Each section could define:"
8617
msgstr ""
8618
8619
#: en/help_topics/authentication.txt:127
8620
msgid "* ``host``: the remote server,"
8621
msgstr ""
8622
8623
#: en/help_topics/authentication.txt:129
8624
msgid "* ``port``: the port the server is listening,"
8625
msgstr ""
8626
8627
#: en/help_topics/authentication.txt:131
8628
msgid "* ``path``: the branch location,"
8629
msgstr ""
8630
8631
#: en/help_topics/authentication.txt:133
8632
msgid "* ``password``: the password."
8633
msgstr ""
8634
8635
#: en/help_topics/authentication.txt:135
8636
msgid ""
8637
"\n"
8638
"Examples\n"
8639
"--------"
8640
msgstr ""
8641
8642
#: en/help_topics/authentication.txt:139
8643
msgid ""
8644
"\n"
8645
"Personal projects hosted outside\n"
8646
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
8647
msgstr ""
8648
8649
#: en/help_topics/authentication.txt:143
8650
msgid ""
8651
"All connections are done with the same ``user`` (the remote one for which "
8652
"the\n"
8653
"default bzr one is not appropriate) and the password is always prompted "
8654
"with\n"
8655
"some exceptions::"
8656
msgstr ""
8657
8658
#: en/help_topics/authentication.txt:147
8659
msgid ""
8660
" # Pet projects on hobby.net\n"
8661
" [hobby]\n"
8662
" host=r.hobby.net\n"
8663
" user=jim\n"
8664
" password=obvious1234\n"
8665
" \n"
8666
" # Home server\n"
8667
" [home]\n"
8668
" scheme=https\n"
8669
" host=home.net\n"
8670
" user=joe\n"
8671
" password=1essobV10us\n"
8672
" \n"
8673
" [DEFAULT]\n"
8674
" # Our local user is barbaz, on all remote sites we're known as "
8675
"foobar\n"
8676
" user=foobar"
8677
msgstr ""
8678
8679
#: en/help_topics/authentication.txt:164
8680
msgid ""
8681
"\n"
8682
"Source hosting provider\n"
8683
"~~~~~~~~~~~~~~~~~~~~~~~"
8684
msgstr ""
8685
8686
#: en/help_topics/authentication.txt:168
8687
msgid "In the shp.net (fictitious) domain, each project has its own site::"
8688
msgstr ""
8689
8690
#: en/help_topics/authentication.txt:170
8691
msgid ""
8692
" [shpnet domain]\n"
8693
" # we use sftp, but ssh is the scheme used for authentication\n"
8694
" scheme=ssh\n"
8695
" # The leading '.' ensures that 'shp.net' alone doesn't match\n"
8696
" host=.shp.net\n"
8697
" user=joe\n"
8698
" # bzr don't support supplying a password for sftp,\n"
8699
" # consider using an ssh agent if you don't want to supply\n"
8700
" # a password interactively. (pageant, ssh-agent, etc)"
8701
msgstr ""
8702
8703
#: en/help_topics/authentication.txt:180
8704
msgid ""
8705
"HTTPS, SFTP servers and their proxy\n"
8706
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
8707
msgstr ""
8708
8709
#: en/help_topics/authentication.txt:183
8710
msgid ""
8711
"At company.com, the server hosting release and integration branches is "
8712
"behind a\n"
8713
"proxy, and the two branches use different authentication policies::"
8714
msgstr ""
8715
8716
#: en/help_topics/authentication.txt:186
8717
msgid ""
8718
" [reference code]\n"
8719
" scheme=https\n"
8720
" host=dev.company.com\n"
8721
" path=/dev\n"
8722
" user=user1\n"
8723
" password=pass1"
8724
msgstr ""
8725
8726
#: en/help_topics/authentication.txt:193
8727
msgid ""
8728
" # development branches on dev server\n"
8729
" [dev]\n"
8730
" scheme=ssh # bzr+ssh and sftp are available here\n"
8731
" host=dev.company.com\n"
8732
" path=/dev/integration\n"
8733
" user=user2\n"
8734
" \n"
8735
" # proxy\n"
8736
" [proxy]\n"
8737
" scheme=http\n"
8738
" host=proxy.company.com\n"
8739
" port=3128\n"
8740
" user=proxyuser1\n"
8741
" password=proxypass1"
8742
msgstr ""
8743
8744
#: en/help_topics/authentication.txt:208
8745
msgid ""
8746
"\n"
8747
"Planned enhancements\n"
8748
"--------------------"
8749
msgstr ""
8750
8751
#: en/help_topics/authentication.txt:212
8752
msgid ""
8753
"The following are not yet implemented but planned as parts of a work in\n"
8754
"progress:"
8755
msgstr ""
8756
8757
#: en/help_topics/authentication.txt:215
8758
msgid "* add a ``password_encoding`` field allowing:"
8759
msgstr ""
8760
8761
#: en/help_topics/authentication.txt:217
8762
msgid ""
8763
" - storing the passwords in various obfuscating encodings (base64 for one),"
8764
msgstr ""
8765
8766
#: en/help_topics/authentication.txt:219
8767
msgid " - delegate password storage to plugins (.netrc for example)."
8768
msgstr ""
8769
8770
#: en/help_topics/authentication.txt:221
8771
msgid ""
8772
"* update the credentials when the user is prompted for user or password,"
8773
msgstr ""
8774
8775
#: en/help_topics/authentication.txt:223
8776
msgid "* add a ``verify_certificates`` field for ``HTTPS``."
8777
msgstr ""
8778
8779
#: en/help_topics/authentication.txt:225
8780
msgid ""
8781
"The ``password_encoding`` and ``verify_certificates`` fields are recognized "
8782
"but\n"
8783
"ignored in the actual implementation.\n"
8784
msgstr ""
8785
8786
#: en/help_topics/bugs.txt:1
8787
msgid "Bug Tracker Settings"
8788
msgstr ""
8789
8790
#: en/help_topics/bugs.txt:3
8791
msgid ""
8792
"When making a commit, metadata about bugs fixed by that change can be\n"
8793
"recorded by using the ``--fixes`` option. For each bug marked as fixed, an\n"
8794
"entry is included in the 'bugs' revision property stating '<url> <status>'.\n"
8795
"(The only ``status`` value currently supported is ``fixed.``)"
8796
msgstr ""
8797
8798
#: en/help_topics/bugs.txt:8
8799
msgid ""
8800
"The ``--fixes`` option allows you to specify a bug tracker and a bug "
8801
"identifier\n"
8802
"rather than a full URL. This looks like::"
8803
msgstr ""
8804
8805
#: en/help_topics/bugs.txt:11
8806
msgid " bzr commit --fixes <tracker>:<id>"
8807
msgstr ""
8808
8809
#: en/help_topics/bugs.txt:13 en/help_topics/configuration.txt:410
8810
msgid "or::"
8811
msgstr ""
8812
8813
#: en/help_topics/bugs.txt:15
8814
msgid " bzr commit --fixes <id>"
8815
msgstr ""
8816
8817
#: en/help_topics/bugs.txt:17
8818
msgid ""
8819
"where \"<tracker>\" is an identifier for the bug tracker, and \"<id>\" is "
8820
"the\n"
8821
"identifier for that bug within the bugtracker, usually the bug number.\n"
8822
"If \"<tracker>\" is not specified the ``bugtracker`` set in the branch\n"
8823
"or global configuration is used."
8824
msgstr ""
8825
8826
#: en/help_topics/bugs.txt:22
8827
msgid ""
8828
"Bazaar knows about a few bug trackers that have many users. If\n"
8829
"you use one of these bug trackers then there is no setup required to\n"
8830
"use this feature, you just need to know the tracker identifier to use.\n"
8831
"These are the bugtrackers that are built in:"
8832
msgstr ""
8833
8834
#: en/help_topics/bugs.txt:27
8835
msgid ""
8836
" ============================ ============ ============\n"
8837
" URL Abbreviation Example\n"
8838
" ============================ ============ ============\n"
8839
" https://bugs.launchpad.net/ lp lp:12345\n"
8840
" http://bugs.debian.org/ deb deb:12345\n"
8841
" http://bugzilla.gnome.org/ gnome gnome:12345\n"
8842
" ============================ ============ ============"
8843
msgstr ""
8844
8845
#: en/help_topics/bugs.txt:35
8846
msgid ""
8847
"For the bug trackers not listed above configuration is required.\n"
8848
"Support for generating the URLs for any project using Bugzilla or Trac\n"
8849
"is built in, along with a template mechanism for other bugtrackers with\n"
8850
"simple URL schemes. If your bug tracker can't be described by one\n"
8851
"of the schemes described below then you can write a plugin to support\n"
8852
"it."
8853
msgstr ""
8854
8855
#: en/help_topics/bugs.txt:42
8856
msgid ""
8857
"If you use Bugzilla or Trac, then you only need to set a configuration\n"
8858
"variable which contains the base URL of the bug tracker. These options\n"
8859
"can go into ``bazaar.conf``, ``branch.conf`` or into a branch-specific\n"
8860
"configuration section in ``locations.conf``. You can set up these values\n"
8861
"for each of the projects you work on."
8862
msgstr ""
8863
8864
#: en/help_topics/bugs.txt:48
8865
msgid ""
8866
"Note: As you provide a short name for each tracker, you can specify one or\n"
8867
"more bugs in one or more trackers at commit time if you wish."
8868
msgstr ""
8869
8870
#: en/help_topics/bugs.txt:51
8871
msgid ""
8872
"Launchpad\n"
8873
"---------"
8874
msgstr ""
8875
8876
#: en/help_topics/bugs.txt:54
8877
msgid ""
8878
"Use ``bzr commit --fixes lp:2`` to record that this commit fixes bug 2."
8879
msgstr ""
8880
8881
#: en/help_topics/bugs.txt:56
8882
msgid ""
8883
"bugzilla_<tracker>_url\n"
8884
"----------------------"
8885
msgstr ""
8886
8887
#: en/help_topics/bugs.txt:59
8888
msgid ""
8889
"If present, the location of the Bugzilla bug tracker referred to by\n"
8890
"<tracker>. This option can then be used together with ``bzr commit\n"
8891
"--fixes`` to mark bugs in that tracker as being fixed by that commit. For\n"
8892
"example::"
8893
msgstr ""
8894
8895
#: en/help_topics/bugs.txt:64
8896
msgid " bugzilla_squid_url = http://bugs.squid-cache.org"
8897
msgstr ""
8898
8899
#: en/help_topics/bugs.txt:66
8900
msgid ""
8901
"would allow ``bzr commit --fixes squid:1234`` to mark Squid's bug 1234 as\n"
8902
"fixed."
8903
msgstr ""
8904
8905
#: en/help_topics/bugs.txt:69
8906
msgid ""
8907
"trac_<tracker>_url\n"
8908
"------------------"
8909
msgstr ""
8910
8911
#: en/help_topics/bugs.txt:72
8912
msgid ""
8913
"If present, the location of the Trac instance referred to by\n"
8914
"<tracker>. This option can then be used together with ``bzr commit\n"
8915
"--fixes`` to mark bugs in that tracker as being fixed by that commit. For\n"
8916
"example::"
8917
msgstr ""
8918
8919
#: en/help_topics/bugs.txt:77
8920
msgid " trac_twisted_url = http://www.twistedmatrix.com/trac"
8921
msgstr ""
8922
8923
#: en/help_topics/bugs.txt:79
8924
msgid ""
8925
"would allow ``bzr commit --fixes twisted:1234`` to mark Twisted's bug 1234 "
8926
"as\n"
8927
"fixed."
8928
msgstr ""
8929
8930
#: en/help_topics/bugs.txt:82
8931
msgid ""
8932
"bugtracker_<tracker>_url\n"
8933
"------------------------"
8934
msgstr ""
8935
8936
#: en/help_topics/bugs.txt:85
8937
msgid ""
8938
"If present, the location of a generic bug tracker instance referred to by\n"
8939
"<tracker>. The location must contain an ``{id}`` placeholder,\n"
8940
"which will be replaced by a specific bug ID. This option can then be used\n"
8941
"together with ``bzr commit --fixes`` to mark bugs in that tracker as being\n"
8942
"fixed by that commit. For example::"
8943
msgstr ""
8944
8945
#: en/help_topics/bugs.txt:91
8946
msgid " bugtracker_python_url = http://bugs.python.org/issue{id}"
8947
msgstr ""
8948
8949
#: en/help_topics/bugs.txt:93
8950
msgid ""
8951
"would allow ``bzr commit --fixes python:1234`` to mark bug 1234 in Python's\n"
8952
"Roundup bug tracker as fixed, or::"
8953
msgstr ""
8954
8955
#: en/help_topics/bugs.txt:96
8956
msgid ""
8957
" bugtracker_cpan_url = http://rt.cpan.org/Public/Bug/Display.html?id={id}"
8958
msgstr ""
8959
8960
#: en/help_topics/bugs.txt:98
8961
msgid ""
8962
"would allow ``bzr commit --fixes cpan:1234`` to mark bug 1234 in CPAN's\n"
8963
"RT bug tracker as fixed, or::"
8964
msgstr ""
8965
8966
#: en/help_topics/bugs.txt:101
8967
msgid " bugtracker_hudson_url = http://issues.hudson-ci.org/browse/{id}"
8968
msgstr ""
8969
8970
#: en/help_topics/bugs.txt:103
8971
msgid ""
8972
"would allow ``bzr commit --fixes hudson:HUDSON-1234`` to mark bug HUDSON-"
8973
"1234\n"
8974
"in Hudson's JIRA bug tracker as fixed.\n"
8975
msgstr ""
8976
8977
#: en/help_topics/commands.txt:1
8978
msgid ""
8979
"add Add specified files or directories.\n"
8980
"alias Set/unset and display aliases.\n"
8981
"annotate Show the origin of each line in a file.\n"
8982
"bash-completion Generate a shell function for bash command line "
8983
"completion.\n"
8984
" [bash_completion]\n"
8985
"bind Convert the current branch into a checkout of the "
8986
"supplied\n"
8987
" branch.\n"
8988
"branch Create a new branch that is a copy of an existing branch.\n"
8989
"branches List the branches available at the current location.\n"
8990
"break-lock Break a dead lock.\n"
8991
"cat Write the contents of a file as of a given revision to\n"
8992
" standard output.\n"
8993
"check Validate working tree structure, branch consistency and\n"
8994
" repository history.\n"
8995
"checkout Create a new checkout of an existing branch.\n"
8996
"clean-tree Remove unwanted files from working tree.\n"
8997
"commit Commit changes into a new revision.\n"
8998
"config Display, set or remove a configuration option.\n"
8999
"conflicts List files with conflicts.\n"
9000
"deleted List files deleted in the working tree.\n"
9001
"diff Show differences in the working tree, between revisions "
9002
"or\n"
9003
" branches.\n"
9004
"dpush Push into a different VCS without any custom bzr "
9005
"metadata.\n"
9006
"export Export current or past revision to a destination directory "
9007
"or\n"
9008
" archive.\n"
9009
"help Show help on a command or other topic.\n"
9010
"ignore Ignore specified files or patterns.\n"
9011
"ignored List ignored files and the patterns that matched them.\n"
9012
"info Show information about a working tree, branch or "
9013
"repository.\n"
9014
"init Make a directory into a versioned branch.\n"
9015
"init-repository Create a shared repository for branches to share storage\n"
9016
" space.\n"
9017
"join Combine a tree into its containing tree.\n"
9018
"launchpad-login Show or set the Launchpad user ID. [launchpad]\n"
9019
"launchpad-mirror Ask Launchpad to mirror a branch now. [launchpad]\n"
9020
"launchpad-open Open a Launchpad branch page in your web browser. "
9021
"[launchpad]\n"
9022
"log Show historical log for a branch or subset of a branch.\n"
9023
"lp-find-proposal Find the proposal to merge this revision. [launchpad]\n"
9024
"lp-propose-merge Propose merging a branch on Launchpad. [launchpad]\n"
9025
"ls List files in a tree.\n"
9026
"merge Perform a three-way merge.\n"
9027
"missing Show unmerged/unpulled revisions between two branches.\n"
9028
"mkdir Create a new versioned directory.\n"
9029
"mv Move or rename a file.\n"
9030
"nick Print or set the branch nickname.\n"
9031
"pack Compress the data within a repository.\n"
9032
"plugins List the installed plugins.\n"
9033
"pull Turn this branch into a mirror of another branch.\n"
9034
"push Update a mirror of this branch.\n"
9035
"reconcile Reconcile bzr metadata in a branch.\n"
9036
"reconfigure Reconfigure the type of a bzr directory.\n"
9037
"register-branch Register a branch with launchpad.net. [launchpad]\n"
9038
"remerge Redo a merge.\n"
9039
"remove Remove files or directories.\n"
9040
"remove-branch Remove a branch.\n"
9041
"remove-tree Remove the working tree from a given branch/checkout.\n"
9042
"renames Show list of renamed files.\n"
9043
"resolve Mark a conflict as resolved.\n"
9044
"revert Set files in the working tree back to the contents of a\n"
9045
" previous revision.\n"
9046
"revno Show current revision number.\n"
9047
"root Show the tree root directory.\n"
9048
"send Mail or create a merge-directive for submitting changes.\n"
9049
"serve Run the bzr server.\n"
9050
"shelve Temporarily set aside some changes from the current tree.\n"
9051
"sign-my-commits Sign all commits by a given committer.\n"
9052
"split Split a subdirectory of a tree into a separate tree.\n"
9053
"status Display status summary.\n"
9054
"switch Set the branch of a checkout and update.\n"
9055
"tag Create, remove or modify a tag naming a revision.\n"
9056
"tags List tags.\n"
9057
"testament Show testament (signing-form) of a revision.\n"
9058
"unbind Convert the current checkout into a regular branch.\n"
9059
"uncommit Remove the last committed revision.\n"
9060
"unshelve Restore shelved changes.\n"
9061
"update Update a working tree to a new revision.\n"
9062
"upgrade Upgrade a repository, branch or working tree to a newer\n"
9063
" format.\n"
9064
"verify-signatures Verify all commit signatures.\n"
9065
"version Show version of bzr.\n"
9066
"version-info Show version information about this tree.\n"
9067
"view Manage filtered views.\n"
9068
"whoami Show or set bzr user id.\n"
9069
msgstr ""
9070
9071
#: en/help_topics/configuration.txt:1
9072
msgid ""
9073
"Configuration Settings\n"
9074
"======================="
9075
msgstr ""
9076
9077
#: en/help_topics/configuration.txt:4
9078
msgid ""
9079
"Environment settings\n"
9080
"---------------------"
9081
msgstr ""
9082
9083
#: en/help_topics/configuration.txt:7
9084
msgid ""
9085
"While most configuration is handled by configuration files, some options\n"
9086
"which may be semi-permanent can also be controlled through the environment."
9087
msgstr ""
9088
9089
#: en/help_topics/configuration.txt:10
9090
msgid ""
9091
"BZR_EMAIL\n"
9092
"~~~~~~~~~"
9093
msgstr ""
9094
9095
#: en/help_topics/configuration.txt:13
9096
msgid "Override the email id used by Bazaar. Typical format::"
9097
msgstr ""
9098
9099
#: en/help_topics/configuration.txt:15
9100
msgid " \"John Doe <jdoe@example.com>\""
9101
msgstr ""
9102
9103
#: en/help_topics/configuration.txt:17
9104
msgid "See also the ``email`` configuration option."
9105
msgstr ""
9106
9107
#: en/help_topics/configuration.txt:19
9108
msgid ""
9109
"BZR_PROGRESS_BAR\n"
9110
"~~~~~~~~~~~~~~~~"
9111
msgstr ""
9112
9113
#: en/help_topics/configuration.txt:22
9114
msgid ""
9115
"Override the progress display. Possible values are \"none\" or \"text\". "
9116
"If\n"
9117
"the value is \"none\" then no progress bar is displayed. The value \"text\" "
9118
"draws\n"
9119
"the ordinary command line progress bar."
9120
msgstr ""
9121
9122
#: en/help_topics/configuration.txt:26
9123
msgid ""
9124
"BZR_SIGQUIT_PDB\n"
9125
"~~~~~~~~~~~~~~~"
9126
msgstr ""
9127
9128
#: en/help_topics/configuration.txt:29
9129
msgid ""
9130
"Control whether SIGQUIT behaves normally or invokes a breakin debugger."
9131
msgstr ""
9132
9133
#: en/help_topics/configuration.txt:31
9134
msgid ""
9135
"* 0 = Standard SIGQUIT behavior (normally, exit with a core dump)\n"
9136
"* 1 = Invoke breakin debugger (default)"
9137
msgstr ""
9138
9139
#: en/help_topics/configuration.txt:34
9140
msgid ""
9141
"BZR_HOME\n"
9142
"~~~~~~~~"
9143
msgstr ""
9144
9145
#: en/help_topics/configuration.txt:37
9146
msgid "Override the home directory used by Bazaar."
9147
msgstr ""
9148
9149
#: en/help_topics/configuration.txt:39
9150
msgid ""
9151
"BZR_SSH\n"
9152
"~~~~~~~"
9153
msgstr ""
9154
9155
#: en/help_topics/configuration.txt:42
9156
msgid "Select a different SSH implementation."
9157
msgstr ""
9158
9159
#: en/help_topics/configuration.txt:44
9160
msgid ""
9161
"BZR_PDB\n"
9162
"~~~~~~~"
9163
msgstr ""
9164
9165
#: en/help_topics/configuration.txt:47
9166
msgid "Control whether to launch a debugger on error."
9167
msgstr ""
9168
9169
#: en/help_topics/configuration.txt:49
9170
msgid ""
9171
"* 0 = Standard behavior\n"
9172
"* 1 = Launch debugger"
9173
msgstr ""
9174
9175
#: en/help_topics/configuration.txt:52
9176
msgid ""
9177
"BZR_REMOTE_PATH\n"
9178
"~~~~~~~~~~~~~~~"
9179
msgstr ""
9180
9181
#: en/help_topics/configuration.txt:55
9182
msgid "Path to the Bazaar executable to use when using the bzr+ssh protocol."
9183
msgstr ""
9184
9185
#: en/help_topics/configuration.txt:57
9186
msgid "See also the ``bzr_remote_path`` configuration option."
9187
msgstr ""
9188
9189
#: en/help_topics/configuration.txt:59
9190
msgid ""
9191
"BZR_EDITOR\n"
9192
"~~~~~~~~~~"
9193
msgstr ""
9194
9195
#: en/help_topics/configuration.txt:62
9196
msgid "Path to the editor Bazaar should use for commit messages, etc."
9197
msgstr ""
9198
9199
#: en/help_topics/configuration.txt:64
9200
msgid ""
9201
"BZR_LOG\n"
9202
"~~~~~~~"
9203
msgstr ""
9204
9205
#: en/help_topics/configuration.txt:67
9206
msgid ""
9207
"Location of the Bazaar log file. You can check the current location by\n"
9208
"running ``bzr version``."
9209
msgstr ""
9210
9211
#: en/help_topics/configuration.txt:70
9212
msgid ""
9213
"The log file contains debug information that is useful for diagnosing or\n"
9214
"reporting problems with Bazaar."
9215
msgstr ""
9216
9217
#: en/help_topics/configuration.txt:73
9218
msgid ""
9219
"Setting this to ``NUL`` on Windows or ``/dev/null`` on other platforms\n"
9220
"will disable logging."
9221
msgstr ""
9222
9223
#: en/help_topics/configuration.txt:76
9224
msgid ""
9225
"\n"
9226
"BZR_PLUGIN_PATH\n"
9227
"~~~~~~~~~~~~~~~"
9228
msgstr ""
9229
9230
#: en/help_topics/configuration.txt:80
9231
msgid ""
9232
"The path to the plugins directory that Bazaar should use.\n"
9233
"If not set, Bazaar will search for plugins in:"
9234
msgstr ""
9235
9236
#: en/help_topics/configuration.txt:83
9237
msgid ""
9238
"* the user specific plugin directory (containing the ``user`` plugins),"
9239
msgstr ""
9240
9241
#: en/help_topics/configuration.txt:85
9242
msgid "* the bzrlib directory (containing the ``core`` plugins),"
9243
msgstr ""
9244
9245
#: en/help_topics/configuration.txt:87
9246
msgid ""
9247
"* the site specific plugin directory if applicable (containing\n"
9248
" the ``site`` plugins)."
9249
msgstr ""
9250
9251
#: en/help_topics/configuration.txt:90
9252
msgid ""
9253
"If ``BZR_PLUGIN_PATH`` is set in any fashion, it will change the\n"
9254
"the way the plugin are searched. "
9255
msgstr ""
9256
9257
#: en/help_topics/configuration.txt:93
9258
msgid ""
9259
"As for the ``PATH`` variables, if multiple directories are\n"
9260
"specified in ``BZR_PLUGIN_PATH`` they should be separated by the\n"
9261
"platform specific appropriate character (':' on Unix,\n"
9262
"';' on windows)"
9263
msgstr ""
9264
9265
#: en/help_topics/configuration.txt:98
9266
msgid ""
9267
"By default if ``BZR_PLUGIN_PATH`` is set, it replaces searching\n"
9268
"in ``user``. However it will continue to search in ``core`` and\n"
9269
"``site`` unless they are explicitly removed."
9270
msgstr ""
9271
9272
#: en/help_topics/configuration.txt:102
9273
msgid ""
9274
"If you need to change the order or remove one of these\n"
9275
"directories, you should use special values:"
9276
msgstr ""
9277
9278
#: en/help_topics/configuration.txt:105
9279
msgid ""
9280
"* ``-user``, ``-core``, ``-site`` will remove the corresponding\n"
9281
" path from the default values,"
9282
msgstr ""
9283
9284
#: en/help_topics/configuration.txt:108
9285
msgid ""
9286
"* ``+user``, ``+core``, ``+site`` will add the corresponding path\n"
9287
" before the remaining default values (and also remove it from\n"
9288
" the default values)."
9289
msgstr ""
9290
9291
#: en/help_topics/configuration.txt:112
9292
msgid ""
9293
"Note that the special values 'user', 'core' and 'site' should be\n"
9294
"used literally, they will be substituted by the corresponding,\n"
9295
"platform specific, values."
9296
msgstr ""
9297
9298
#: en/help_topics/configuration.txt:116
9299
msgid ""
9300
"The examples below use ':' as the separator, windows users\n"
9301
"should use ';'."
9302
msgstr ""
9303
9304
#: en/help_topics/configuration.txt:119
9305
msgid "Overriding the default user plugin directory::"
9306
msgstr ""
9307
9308
#: en/help_topics/configuration.txt:121
9309
msgid " BZR_PLUGIN_PATH='/path/to/my/other/plugins'"
9310
msgstr ""
9311
9312
#: en/help_topics/configuration.txt:123
9313
msgid "Disabling the site directory while retaining the user directory::"
9314
msgstr ""
9315
9316
#: en/help_topics/configuration.txt:125
9317
msgid " BZR_PLUGIN_PATH='-site:+user'"
9318
msgstr ""
9319
9320
#: en/help_topics/configuration.txt:127
9321
msgid "Disabling all plugins (better achieved with --no-plugins)::"
9322
msgstr ""
9323
9324
#: en/help_topics/configuration.txt:129
9325
msgid " BZR_PLUGIN_PATH='-user:-core:-site'"
9326
msgstr ""
9327
9328
#: en/help_topics/configuration.txt:131
9329
msgid "Overriding the default site plugin directory::"
9330
msgstr ""
9331
9332
#: en/help_topics/configuration.txt:133
9333
msgid " BZR_PLUGIN_PATH='/path/to/my/site/plugins:-site':+user"
9334
msgstr ""
9335
9336
#: en/help_topics/configuration.txt:135
9337
msgid ""
9338
"BZR_DISABLE_PLUGINS\n"
9339
"~~~~~~~~~~~~~~~~~~~"
9340
msgstr ""
9341
9342
#: en/help_topics/configuration.txt:138
9343
msgid ""
9344
"Under special circumstances (mostly when trying to diagnose a\n"
9345
"bug), it's better to disable a plugin (or several) rather than\n"
9346
"uninstalling them completely. Such plugins can be specified in\n"
9347
"the ``BZR_DISABLE_PLUGINS`` environment variable."
9348
msgstr ""
9349
9350
#: en/help_topics/configuration.txt:143
9351
msgid ""
9352
"In that case, ``bzr`` will stop loading the specified plugins and\n"
9353
"will raise an import error if they are explicitly imported (by\n"
9354
"another plugin that depends on them for example)."
9355
msgstr ""
9356
9357
#: en/help_topics/configuration.txt:147
9358
msgid "Disabling ``myplugin`` and ``yourplugin`` is achieved by::"
9359
msgstr ""
9360
9361
#: en/help_topics/configuration.txt:149
9362
msgid " BZR_DISABLE_PLUGINS='myplugin:yourplugin'"
9363
msgstr ""
9364
9365
#: en/help_topics/configuration.txt:151
9366
msgid ""
9367
"BZR_PLUGINS_AT\n"
9368
"~~~~~~~~~~~~~~"
9369
msgstr ""
9370
9371
#: en/help_topics/configuration.txt:154
9372
msgid ""
9373
"When adding a new feature or working on a bug in a plugin,\n"
9374
"developers often need to use a specific version of a given\n"
9375
"plugin. Since python requires that the directory containing the\n"
9376
"code is named like the plugin itself this make it impossible to\n"
9377
"use arbitrary directory names (using a two-level directory scheme\n"
9378
"is inconvenient). ``BZR_PLUGINS_AT`` allows such directories even\n"
9379
"if they don't appear in ``BZR_PLUGIN_PATH`` ."
9380
msgstr ""
9381
9382
#: en/help_topics/configuration.txt:162
9383
msgid ""
9384
"Plugins specified in this environment variable takes precedence\n"
9385
"over the ones in ``BZR_PLUGIN_PATH``."
9386
msgstr ""
9387
9388
#: en/help_topics/configuration.txt:165
9389
msgid ""
9390
"The variable specified a list of ``plugin_name@plugin path``,\n"
9391
"``plugin_name`` being the name of the plugin as it appears in\n"
9392
"python module paths, ``plugin_path`` being the path to the\n"
9393
"directory containing the plugin code itself\n"
9394
"(i.e. ``plugins/myplugin`` not ``plugins``). Use ':' as the list\n"
9395
"separator, use ';' on windows."
9396
msgstr ""
9397
9398
#: en/help_topics/configuration.txt:172
9399
msgid ""
9400
"Example:\n"
9401
"~~~~~~~~"
9402
msgstr ""
9403
9404
#: en/help_topics/configuration.txt:175
9405
msgid ""
9406
"Using a specific version of ``myplugin``:\n"
9407
"``BZR_PLUGINS_AT='myplugin@/home/me/bugfixes/123456-myplugin``"
9408
msgstr ""
9409
9410
#: en/help_topics/configuration.txt:178
9411
msgid ""
9412
"BZRPATH\n"
9413
"~~~~~~~"
9414
msgstr ""
9415
9416
#: en/help_topics/configuration.txt:181
9417
msgid "The path where Bazaar should look for shell plugin external commands."
9418
msgstr ""
9419
9420
#: en/help_topics/configuration.txt:183
9421
msgid ""
9422
"\n"
9423
"http_proxy, https_proxy\n"
9424
"~~~~~~~~~~~~~~~~~~~~~~~"
9425
msgstr ""
9426
9427
#: en/help_topics/configuration.txt:187
9428
msgid "Specifies the network proxy for outgoing connections, for example::"
9429
msgstr ""
9430
9431
#: en/help_topics/configuration.txt:189
9432
msgid ""
9433
" http_proxy=http://proxy.example.com:3128/ \n"
9434
" https_proxy=http://proxy.example.com:3128/"
9435
msgstr ""
9436
9437
#: en/help_topics/configuration.txt:192
9438
msgid ""
9439
"\n"
9440
"Configuration files\n"
9441
"-------------------"
9442
msgstr ""
9443
9444
#: en/help_topics/configuration.txt:196
9445
msgid ""
9446
"Location\n"
9447
"~~~~~~~~"
9448
msgstr ""
9449
9450
#: en/help_topics/configuration.txt:199
9451
msgid ""
9452
"Configuration files are located in ``$HOME/.bazaar`` on Unix and\n"
9453
"``C:\\Documents and Settings\\<username>\\Application Data\\Bazaar\\2.0`` "
9454
"on\n"
9455
"Windows. (You can check the location for your system by using\n"
9456
"``bzr version``.)"
9457
msgstr ""
9458
9459
#: en/help_topics/configuration.txt:204
9460
msgid "There are three primary configuration files in this location:"
9461
msgstr ""
9462
9463
#: en/help_topics/configuration.txt:206
9464
msgid "* ``bazaar.conf`` describes default configuration options,"
9465
msgstr ""
9466
9467
#: en/help_topics/configuration.txt:208
9468
msgid ""
9469
"* ``locations.conf`` describes configuration information for\n"
9470
" specific branch locations,"
9471
msgstr ""
9472
9473
#: en/help_topics/configuration.txt:211
9474
msgid ""
9475
"* ``authentication.conf`` describes credential information for\n"
9476
" remote servers."
9477
msgstr ""
9478
9479
#: en/help_topics/configuration.txt:214
9480
msgid ""
9481
"Each branch can also contain a configuration file that sets values specific\n"
9482
"to that branch. This file is found at ``.bzr/branch/branch.conf`` within "
9483
"the\n"
9484
"branch. This file is visible to all users of a branch, if you wish to "
9485
"override\n"
9486
"one of the values for a branch with a setting that is specific to you then "
9487
"you\n"
9488
"can do so in ``locations.conf``."
9489
msgstr ""
9490
9491
#: en/help_topics/configuration.txt:220
9492
msgid ""
9493
"General format\n"
9494
"~~~~~~~~~~~~~~"
9495
msgstr ""
9496
9497
#: en/help_topics/configuration.txt:223
9498
msgid ""
9499
"An ini file has three types of contructs: section headers, section\n"
9500
"options and comments."
9501
msgstr ""
9502
9503
#: en/help_topics/configuration.txt:226
9504
msgid ""
9505
"Comments\n"
9506
"^^^^^^^^"
9507
msgstr ""
9508
9509
#: en/help_topics/configuration.txt:229
9510
msgid ""
9511
"A comment is any line that starts with a \"#\" (sometimes called a \"hash\n"
9512
"mark\", \"pound sign\" or \"number sign\"). Comment lines are ignored by\n"
9513
"Bazaar when parsing ini files."
9514
msgstr ""
9515
9516
#: en/help_topics/configuration.txt:233
9517
msgid ""
9518
"Section headers\n"
9519
"^^^^^^^^^^^^^^^"
9520
msgstr ""
9521
9522
#: en/help_topics/configuration.txt:236
9523
msgid ""
9524
"A section header is a word enclosed in brackets that starts at the begining\n"
9525
"of a line. A typical section header looks like this::"
9526
msgstr ""
9527
9528
#: en/help_topics/configuration.txt:239
9529
msgid " [DEFAULT]"
9530
msgstr ""
9531
9532
#: en/help_topics/configuration.txt:241
9533
msgid ""
9534
"The only valid section headers for bazaar.conf currently are [DEFAULT] and\n"
9535
"[ALIASES]. Section headers are case sensitive. The default section provides "
9536
"for\n"
9537
"setting options which can be overridden with the branch config file."
9538
msgstr ""
9539
9540
#: en/help_topics/configuration.txt:245
9541
msgid ""
9542
"For ``locations.conf``, the options from the section with the\n"
9543
"longest matching section header are used to the exclusion of other\n"
9544
"potentially valid section headers. A section header uses the path for\n"
9545
"the branch as the section header. Some examples include::"
9546
msgstr ""
9547
9548
#: en/help_topics/configuration.txt:250
9549
msgid ""
9550
" [http://mybranches.isp.com/~jdoe/branchdir]\n"
9551
" [/home/jdoe/branches/]"
9552
msgstr ""
9553
9554
#: en/help_topics/configuration.txt:253
9555
msgid ""
9556
"\n"
9557
"Section options\n"
9558
"^^^^^^^^^^^^^^^"
9559
msgstr ""
9560
9561
#: en/help_topics/configuration.txt:257
9562
msgid ""
9563
"A section option resides within a section. A section option contains an\n"
9564
"option name, an equals sign and a value. For example::"
9565
msgstr ""
9566
9567
#: en/help_topics/configuration.txt:260
9568
msgid ""
9569
" email = John Doe <jdoe@isp.com>\n"
9570
" gpg_signing_key = Amy Pond <amy@example.com>"
9571
msgstr ""
9572
9573
#: en/help_topics/configuration.txt:263
9574
msgid ""
9575
"A option can reference other options by enclosing them in curly brackets::"
9576
msgstr ""
9577
9578
#: en/help_topics/configuration.txt:265
9579
msgid ""
9580
" my_branch_name = feature_x\n"
9581
" my_server = bzr+ssh://example.com\n"
9582
" push_location = {my_server}/project/{my_branch_name}"
9583
msgstr ""
9584
9585
#: en/help_topics/configuration.txt:269
9586
msgid ""
9587
"Option policies\n"
9588
"^^^^^^^^^^^^^^^"
9589
msgstr ""
9590
9591
#: en/help_topics/configuration.txt:272
9592
msgid ""
9593
"Options defined in a section affect the named directory or URL plus\n"
9594
"any locations they contain. Policies can be used to change how an\n"
9595
"option value is interpreted for contained locations. Currently\n"
9596
"there are three policies available:"
9597
msgstr ""
9598
9599
#: en/help_topics/configuration.txt:277
9600
msgid ""
9601
" none:\n"
9602
" the value is interpreted the same for contained locations. This is\n"
9603
" the default behaviour.\n"
9604
" norecurse:\n"
9605
" the value is only used for the exact location specified by the\n"
9606
" section name.\n"
9607
" appendpath:\n"
9608
" for contained locations, any additional path components are\n"
9609
" appended to the value."
9610
msgstr ""
9611
9612
#: en/help_topics/configuration.txt:287
9613
msgid ""
9614
"Policies are specified by keys with names of the form "
9615
"\"<option_name>:policy\".\n"
9616
"For example, to define the push location for a tree of branches, the\n"
9617
"following could be used::"
9618
msgstr ""
9619
9620
#: en/help_topics/configuration.txt:291
9621
msgid ""
9622
" [/top/location]\n"
9623
" push_location = sftp://example.com/location\n"
9624
" push_location:policy = appendpath"
9625
msgstr ""
9626
9627
#: en/help_topics/configuration.txt:295
9628
msgid ""
9629
"With this configuration, the push location for ``/top/location/branch1``\n"
9630
"would be ``sftp://example.com/location/branch1``."
9631
msgstr ""
9632
9633
#: en/help_topics/configuration.txt:298
9634
msgid ""
9635
"Section local options\n"
9636
"^^^^^^^^^^^^^^^^^^^^^"
9637
msgstr ""
9638
9639
#: en/help_topics/configuration.txt:301
9640
msgid ""
9641
"Some options are defined automatically inside a given section and can be\n"
9642
"refered to in this section only. "
9643
msgstr ""
9644
9645
#: en/help_topics/configuration.txt:304
9646
msgid "For example, the ``appendpath`` policy can be used like this::"
9647
msgstr ""
9648
9649
#: en/help_topics/configuration.txt:306
9650
msgid ""
9651
" [/home/vila/src/bzr/bugs]\n"
9652
" mypush = lp:~vila/bzr\n"
9653
" mypush:policy=appendpath"
9654
msgstr ""
9655
9656
#: en/help_topics/configuration.txt:310
9657
msgid "Using ``relpath`` to achieve the same result is done like this::"
9658
msgstr ""
9659
9660
#: en/help_topics/configuration.txt:312
9661
msgid ""
9662
" [/home/vila/src/bzr/bugs]\n"
9663
" mypush = lp:~vila/bzr/{relpath}"
9664
msgstr ""
9665
9666
#: en/help_topics/configuration.txt:315
9667
msgid ""
9668
"In both cases, when used in a directory like\n"
9669
"``/home/vila/src/bzr/bugs/832013-expand-in-stack`` we'll get::"
9670
msgstr ""
9671
9672
#: en/help_topics/configuration.txt:318 en/help_topics/configuration.txt:329
9673
msgid ""
9674
" $ bzr config mypush\n"
9675
" lp:~vila/bzr/832013-expand-in-stack"
9676
msgstr ""
9677
9678
#: en/help_topics/configuration.txt:321
9679
msgid "Another such option is ``basename`` which can be used like this::"
9680
msgstr ""
9681
9682
#: en/help_topics/configuration.txt:323
9683
msgid ""
9684
" [/home/vila/src/bzr]\n"
9685
" mypush = lp:~vila/bzr/{basename}"
9686
msgstr ""
9687
9688
#: en/help_topics/configuration.txt:326
9689
msgid ""
9690
"When used in a directory like\n"
9691
"``/home/vila/src/bzr/bugs/832013-expand-in-stack`` we'll get::"
9692
msgstr ""
9693
9694
#: en/help_topics/configuration.txt:332
9695
msgid ""
9696
"Note that ``basename`` here refers to the base name of ``relpath`` which\n"
9697
"itself is defined as the relative path between the section name and the\n"
9698
"location it matches."
9699
msgstr ""
9700
9701
#: en/help_topics/configuration.txt:336
9702
msgid ""
9703
"Another such option is ``branchname``, which refers to the name of a "
9704
"colocated\n"
9705
"branch. For non-colocated branches, it behaves like basename. It can be "
9706
"used\n"
9707
"like this::"
9708
msgstr ""
9709
9710
#: en/help_topics/configuration.txt:340
9711
msgid ""
9712
" [/home/vila/src/bzr/bugs]\n"
9713
" mypush = lp:~vila/bzr/{branchname}"
9714
msgstr ""
9715
9716
#: en/help_topics/configuration.txt:343
9717
msgid ""
9718
"When used with a colocated branch named ``832013-expand-in-stack``, we'll "
9719
"get::"
9720
msgstr ""
9721
9722
#: en/help_topics/configuration.txt:345
9723
msgid ""
9724
" bzr config mypush\n"
9725
" lp:~vila/bzr/832013-expand-in-stack"
9726
msgstr ""
9727
9728
#: en/help_topics/configuration.txt:348
9729
msgid ""
9730
"When an option is local to a Section, it cannot be referred to from option\n"
9731
"values in any other section from the same ``Store`` nor from any other\n"
9732
"``Store``."
9733
msgstr ""
9734
9735
#: en/help_topics/configuration.txt:352
9736
msgid ""
9737
"\n"
9738
"The main configuration file, bazaar.conf\n"
9739
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
9740
msgstr ""
9741
9742
#: en/help_topics/configuration.txt:356
9743
msgid ""
9744
"``bazaar.conf`` allows two sections: ``[DEFAULT]`` and ``[ALIASES]``.\n"
9745
"The default section contains the default\n"
9746
"configuration options for all branches. The default section can be\n"
9747
"overriden by providing a branch-specific section in ``locations.conf``."
9748
msgstr ""
9749
9750
#: en/help_topics/configuration.txt:361
9751
msgid "A typical ``bazaar.conf`` section often looks like the following::"
9752
msgstr ""
9753
9754
#: en/help_topics/configuration.txt:363
9755
msgid ""
9756
" [DEFAULT]\n"
9757
" email = John Doe <jdoe@isp.com>\n"
9758
" editor = /usr/bin/vim\n"
9759
" create_signatures = when-required"
9760
msgstr ""
9761
9762
#: en/help_topics/configuration.txt:368
9763
msgid ""
9764
"\n"
9765
"The branch location configuration file, locations.conf\n"
9766
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
9767
msgstr ""
9768
9769
#: en/help_topics/configuration.txt:372
9770
msgid ""
9771
"``locations.conf`` allows one to specify overriding settings for\n"
9772
"a specific branch. The format is almost identical to the default section in\n"
9773
"bazaar.conf with one significant change: The section header, instead of "
9774
"saying\n"
9775
"default, will be the path to a branch that you wish to override a value\n"
9776
"for. The '?' and '*' wildcards are supported::"
9777
msgstr ""
9778
9779
#: en/help_topics/configuration.txt:378
9780
msgid ""
9781
" [/home/jdoe/branches/nethack]\n"
9782
" email = Nethack Admin <nethack@nethack.com>"
9783
msgstr ""
9784
9785
#: en/help_topics/configuration.txt:381
9786
msgid ""
9787
" [http://hypothetical.site.com/branches/devel-branch]\n"
9788
" create_signatures = always"
9789
msgstr ""
9790
9791
#: en/help_topics/configuration.txt:384
9792
msgid ""
9793
"The authentication configuration file, authentication.conf\n"
9794
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
9795
msgstr ""
9796
9797
#: en/help_topics/configuration.txt:387
9798
msgid ""
9799
"``authentication.conf`` allows one to specify credentials for\n"
9800
"remote servers. This can be used for all the supported transports and any "
9801
"part\n"
9802
"of bzr that requires authentication (smtp for example)."
9803
msgstr ""
9804
9805
#: en/help_topics/configuration.txt:391
9806
msgid ""
9807
"The syntax of the file obeys the same rules as the others except for the\n"
9808
"option policies which don't apply."
9809
msgstr ""
9810
9811
#: en/help_topics/configuration.txt:394
9812
msgid ""
9813
"For more information on the possible uses of the authentication "
9814
"configuration\n"
9815
"file see :doc:`authentication-help`."
9816
msgstr ""
9817
9818
#: en/help_topics/configuration.txt:397
9819
msgid ""
9820
"\n"
9821
"Common options\n"
9822
"--------------"
9823
msgstr ""
9824
9825
#: en/help_topics/configuration.txt:401
9826
msgid ""
9827
"debug_flags\n"
9828
"~~~~~~~~~~~"
9829
msgstr ""
9830
9831
#: en/help_topics/configuration.txt:404
9832
msgid ""
9833
"A comma-separated list of debugging options to turn on. The same values\n"
9834
"can be used as with the -D command-line option (see `help global-options`).\n"
9835
"For example::"
9836
msgstr ""
9837
9838
#: en/help_topics/configuration.txt:408
9839
msgid " debug_flags = hpss"
9840
msgstr ""
9841
9842
#: en/help_topics/configuration.txt:412
9843
msgid " debug_flags = hpss,evil"
9844
msgstr ""
9845
9846
#: en/help_topics/configuration.txt:414
9847
msgid ""
9848
"email\n"
9849
"~~~~~"
9850
msgstr ""
9851
9852
#: en/help_topics/configuration.txt:417
9853
msgid ""
9854
"The email address to use when committing a branch. Typically takes the form\n"
9855
"of::"
9856
msgstr ""
9857
9858
#: en/help_topics/configuration.txt:420
9859
msgid " email = Full Name <account@hostname.tld>"
9860
msgstr ""
9861
9862
#: en/help_topics/configuration.txt:422
9863
msgid ""
9864
"editor\n"
9865
"~~~~~~"
9866
msgstr ""
9867
9868
#: en/help_topics/configuration.txt:425
9869
msgid ""
9870
"The path of the editor that you wish to use if *bzr commit* is run without\n"
9871
"a commit message. This setting is trumped by the environment variable\n"
9872
"``BZR_EDITOR``, and overrides the ``VISUAL`` and ``EDITOR`` environment\n"
9873
"variables."
9874
msgstr ""
9875
9876
#: en/help_topics/configuration.txt:430
9877
msgid ""
9878
"log_format\n"
9879
"~~~~~~~~~~"
9880
msgstr ""
9881
9882
#: en/help_topics/configuration.txt:433
9883
msgid ""
9884
"The default log format to use. Standard log formats are ``long``, ``short``\n"
9885
"and ``line``. Additional formats may be provided by plugins. The default\n"
9886
"value is ``long``."
9887
msgstr ""
9888
9889
#: en/help_topics/configuration.txt:437
9890
msgid ""
9891
"check_signatures\n"
9892
"~~~~~~~~~~~~~~~~"
9893
msgstr ""
9894
9895
#: en/help_topics/configuration.txt:440
9896
msgid ""
9897
"Reserved for future use. These options will allow a policy for branches to\n"
9898
"require signatures."
9899
msgstr ""
9900
9901
#: en/help_topics/configuration.txt:443
9902
msgid ""
9903
"require\n"
9904
" The gnupg signature for revisions must be present and must be valid."
9905
msgstr ""
9906
9907
#: en/help_topics/configuration.txt:446
9908
msgid ""
9909
"ignore\n"
9910
" Do not check gnupg signatures of revisions."
9911
msgstr ""
9912
9913
#: en/help_topics/configuration.txt:449
9914
msgid ""
9915
"check-available\n"
9916
" (default) If gnupg signatures for revisions are present, check them.\n"
9917
" Bazaar will fail if it finds a bad signature, but will not fail if\n"
9918
" no signature is present."
9919
msgstr ""
9920
9921
#: en/help_topics/configuration.txt:454
9922
msgid ""
9923
"create_signatures\n"
9924
"~~~~~~~~~~~~~~~~~"
9925
msgstr ""
9926
9927
#: en/help_topics/configuration.txt:457
9928
msgid ""
9929
"Defines the behaviour of signing revisions on commits. By default bzr will "
9930
"not\n"
9931
"sign new commits."
9932
msgstr ""
9933
9934
#: en/help_topics/configuration.txt:460
9935
msgid ""
9936
"always\n"
9937
" Sign every new revision that is committed. If the signing fails then "
9938
"the\n"
9939
" commit will not be made."
9940
msgstr ""
9941
9942
#: en/help_topics/configuration.txt:464
9943
msgid ""
9944
"when-required\n"
9945
" Reserved for future use."
9946
msgstr ""
9947
9948
#: en/help_topics/configuration.txt:467
9949
msgid ""
9950
"never\n"
9951
" Reserved for future use."
9952
msgstr ""
9953
9954
#: en/help_topics/configuration.txt:470
9955
msgid ""
9956
"In future it is planned that ``when-required`` will sign newly\n"
9957
"committed revisions only when the branch requires them. ``never`` will "
9958
"refuse\n"
9959
"to sign newly committed revisions, even if the branch requires signatures."
9960
msgstr ""
9961
9962
#: en/help_topics/configuration.txt:474
9963
msgid ""
9964
"dirstate.fdatasync\n"
9965
"~~~~~~~~~~~~~~~~~~"
9966
msgstr ""
9967
9968
#: en/help_topics/configuration.txt:477
9969
msgid ""
9970
"If true (default), working tree metadata changes are flushed through the\n"
9971
"OS buffers to physical disk. This is somewhat slower, but means data\n"
9972
"should not be lost if the machine crashes. See also repository.fdatasync."
9973
msgstr ""
9974
9975
#: en/help_topics/configuration.txt:481
9976
msgid ""
9977
"gpg_signing_key\n"
9978
"~~~~~~~~~~~~~~~"
9979
msgstr ""
9980
9981
#: en/help_topics/configuration.txt:484
9982
msgid ""
9983
"The GnuPG user identity to use when signing commits. Can be an e-mail\n"
9984
"address, key fingerprint or full key ID. When unset or when set to\n"
9985
"\"default\" Bazaar will use the user e-mail set with ``whoami``."
9986
msgstr ""
9987
9988
#: en/help_topics/configuration.txt:488
9989
msgid ""
9990
"recurse\n"
9991
"~~~~~~~"
9992
msgstr ""
9993
9994
#: en/help_topics/configuration.txt:491
9995
msgid ""
9996
"Only useful in ``locations.conf``. Defines whether or not the\n"
9997
"configuration for this section applies to subdirectories:"
9998
msgstr ""
9999
10000
#: en/help_topics/configuration.txt:494
10001
msgid ""
10002
"true\n"
10003
" (default) This section applies to subdirectories as well."
10004
msgstr ""
10005
10006
#: en/help_topics/configuration.txt:497
10007
msgid ""
10008
"false\n"
10009
" This section only applies to the branch at this directory and not\n"
10010
" branches below it."
10011
msgstr ""
10012
10013
#: en/help_topics/configuration.txt:501
10014
msgid ""
10015
"gpg_signing_command\n"
10016
"~~~~~~~~~~~~~~~~~~~"
10017
msgstr ""
10018
10019
#: en/help_topics/configuration.txt:504
10020
msgid ""
10021
"(Default: \"gpg\"). Which program should be used to sign and check "
10022
"revisions.\n"
10023
"For example::"
10024
msgstr ""
10025
10026
#: en/help_topics/configuration.txt:507
10027
msgid " gpg_signing_command = /usr/bin/gnpg"
10028
msgstr ""
10029
10030
#: en/help_topics/configuration.txt:509
10031
msgid ""
10032
"The specified command must accept the options \"--clearsign\" and \"-u "
10033
"<email>\"."
10034
msgstr ""
10035
10036
#: en/help_topics/configuration.txt:511
10037
msgid ""
10038
"bzr_remote_path\n"
10039
"~~~~~~~~~~~~~~~"
10040
msgstr ""
10041
10042
#: en/help_topics/configuration.txt:514
10043
msgid ""
10044
"(Default: \"bzr\"). The path to the command that should be used to run the "
10045
"smart\n"
10046
"server for bzr. This value may only be specified in locations.conf, because:"
10047
msgstr ""
10048
10049
#: en/help_topics/configuration.txt:517
10050
msgid ""
10051
"- it's needed before branch.conf is accessible\n"
10052
"- allowing remote branch.conf files to specify commands would be a security\n"
10053
" risk"
10054
msgstr ""
10055
10056
#: en/help_topics/configuration.txt:521
10057
msgid "It is overridden by the BZR_REMOTE_PATH environment variable."
10058
msgstr ""
10059
10060
#: en/help_topics/configuration.txt:523
10061
msgid ""
10062
"smtp_server\n"
10063
"~~~~~~~~~~~"
10064
msgstr ""
10065
10066
#: en/help_topics/configuration.txt:526
10067
msgid ""
10068
"(Default: \"localhost\"). SMTP server to use when Bazaar needs to send\n"
10069
"email, eg. with ``merge-directive --mail-to``, or the bzr-email plugin."
10070
msgstr ""
10071
10072
#: en/help_topics/configuration.txt:529
10073
msgid ""
10074
"smtp_username, smtp_password\n"
10075
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
10076
msgstr ""
10077
10078
#: en/help_topics/configuration.txt:532
10079
msgid ""
10080
"User and password to authenticate to the SMTP server. If smtp_username\n"
10081
"is set, and smtp_password is not, Bazaar will prompt for a password.\n"
10082
"These settings are only needed if the SMTP server requires authentication\n"
10083
"to send mail."
10084
msgstr ""
10085
10086
#: en/help_topics/configuration.txt:537
10087
msgid ""
10088
"locks.steal_dead\n"
10089
"~~~~~~~~~~~~~~~~"
10090
msgstr ""
10091
10092
#: en/help_topics/configuration.txt:540
10093
msgid ""
10094
"If set to true, bzr will automatically break locks held by processes from\n"
10095
"the same machine and user that are no longer alive. Otherwise, it will\n"
10096
"print a message and you can break the lock manually, if you are satisfied\n"
10097
"the object is no longer in use."
10098
msgstr ""
10099
10100
#: en/help_topics/configuration.txt:545
10101
msgid ""
10102
"mail_client\n"
10103
"~~~~~~~~~~~"
10104
msgstr ""
10105
10106
#: en/help_topics/configuration.txt:548
10107
msgid ""
10108
"A mail client to use for sending merge requests.\n"
10109
"By default, bzr will try to use ``mapi`` on Windows. On other platforms, "
10110
"it\n"
10111
"will try ``xdg-email``. If either of these fails, it will fall back to\n"
10112
"``editor``."
10113
msgstr ""
10114
10115
#: en/help_topics/configuration.txt:553
10116
msgid "Supported values for specific clients:"
10117
msgstr ""
10118
10119
#: en/help_topics/configuration.txt:555
10120
msgid ""
10121
":claws: Use Claws. This skips a dialog for attaching files.\n"
10122
":evolution: Use Evolution.\n"
10123
":kmail: Use KMail.\n"
10124
":mutt: Use Mutt.\n"
10125
":thunderbird: Use Mozilla Thunderbird or Icedove. For Thunderbird/Icedove "
10126
"1.5,\n"
10127
" this works around some bugs that xdg-email doesn't handle."
10128
msgstr ""
10129
10130
#: en/help_topics/configuration.txt:562
10131
msgid "Supported generic values are:"
10132
msgstr ""
10133
10134
#: en/help_topics/configuration.txt:564
10135
msgid ""
10136
":default: See above.\n"
10137
":editor: Use your editor to compose the merge request. This also uses\n"
10138
" your commit id, (see ``bzr whoami``), smtp_server and (optionally)\n"
10139
" smtp_username and smtp_password.\n"
10140
":mapi: Use your preferred e-mail client on Windows.\n"
10141
":xdg-email: Use xdg-email to run your preferred mail program"
10142
msgstr ""
10143
10144
#: en/help_topics/configuration.txt:571
10145
msgid ""
10146
"repository.fdatasync\n"
10147
"~~~~~~~~~~~~~~~~~~~~"
10148
msgstr ""
10149
10150
#: en/help_topics/configuration.txt:574
10151
msgid ""
10152
"If true (default), repository changes are flushed through the OS buffers\n"
10153
"to physical disk. This is somewhat slower, but means data should not be\n"
10154
"lost if the machine crashes. See also dirstate.fdatasync."
10155
msgstr ""
10156
10157
#: en/help_topics/configuration.txt:578
10158
msgid ""
10159
"submit_branch\n"
10160
"~~~~~~~~~~~~~"
10161
msgstr ""
10162
10163
#: en/help_topics/configuration.txt:581
10164
msgid ""
10165
"The branch you intend to submit your current work to. This is "
10166
"automatically\n"
10167
"set by ``bzr send``, and is also used by the ``submit:`` revision spec. "
10168
"This\n"
10169
"should usually be set on a per-branch or per-location basis."
10170
msgstr ""
10171
10172
#: en/help_topics/configuration.txt:585
10173
msgid ""
10174
"public_branch\n"
10175
"~~~~~~~~~~~~~"
10176
msgstr ""
10177
10178
#: en/help_topics/configuration.txt:588
10179
msgid ""
10180
"A publically-accessible version of this branch (implying that this version "
10181
"is\n"
10182
"not publically-accessible). Used (and set) by ``bzr send``."
10183
msgstr ""
10184
10185
#: en/help_topics/configuration.txt:591
10186
msgid ""
10187
"suppress_warnings\n"
10188
"~~~~~~~~~~~~~~~~~"
10189
msgstr ""
10190
10191
#: en/help_topics/configuration.txt:594
10192
msgid ""
10193
"A list of strings, each string represent a warning that can be emitted by\n"
10194
"bzr. Mentioning a warning in this list tells bzr to not emit it."
10195
msgstr ""
10196
10197
#: en/help_topics/configuration.txt:597
10198
msgid "Valid values:"
10199
msgstr ""
10200
10201
#: en/help_topics/configuration.txt:599
10202
msgid ""
10203
"* ``format_deprecation``:\n"
10204
" whether the format deprecation warning is shown on repositories that "
10205
"are\n"
10206
" using deprecated formats."
10207
msgstr ""
10208
10209
#: en/help_topics/configuration.txt:603
10210
msgid ""
10211
"default_format\n"
10212
"~~~~~~~~~~~~~~"
10213
msgstr ""
10214
10215
#: en/help_topics/configuration.txt:606
10216
msgid ""
10217
"A format name for the default format used when creating branches. See "
10218
"``bzr\n"
10219
"help formats`` for possible values."
10220
msgstr ""
10221
10222
#: en/help_topics/configuration.txt:609
10223
msgid ""
10224
"\n"
10225
"Unicode options\n"
10226
"---------------"
10227
msgstr ""
10228
10229
#: en/help_topics/configuration.txt:613
10230
msgid ""
10231
"output_encoding\n"
10232
"~~~~~~~~~~~~~~~"
10233
msgstr ""
10234
10235
#: en/help_topics/configuration.txt:616
10236
msgid ""
10237
"A Python unicode encoding name for text output from bzr, such as log\n"
10238
"information. Values include: utf8, cp850, ascii, iso-8859-1. The default\n"
10239
"is the terminal encoding prefered by the operating system."
10240
msgstr ""
10241
10242
#: en/help_topics/configuration.txt:620
10243
msgid ""
10244
"\n"
10245
"Branch type specific options\n"
10246
"----------------------------"
10247
msgstr ""
10248
10249
#: en/help_topics/configuration.txt:624
10250
msgid ""
10251
"These options apply only to branches that use the ``dirstate-tags`` or\n"
10252
"later format. They\n"
10253
"are usually set in ``.bzr/branch/branch.conf`` automatically, but may be\n"
10254
"manually set in ``locations.conf`` or ``bazaar.conf``."
10255
msgstr ""
10256
10257
#: en/help_topics/configuration.txt:629
10258
msgid ""
10259
"append_revisions_only\n"
10260
"~~~~~~~~~~~~~~~~~~~~~"
10261
msgstr ""
10262
10263
#: en/help_topics/configuration.txt:632
10264
msgid ""
10265
"If set to \"True\" then revisions can only be appended to the log, not\n"
10266
"removed. A branch with this setting enabled can only pull from another\n"
10267
"branch if the other branch's log is a longer version of its own. This is\n"
10268
"normally set by ``bzr init --append-revisions-only``. If you set it\n"
10269
"manually, use either 'True' or 'False' (case-sensitive) to maintain\n"
10270
"compatibility with previous bzr versions (older than 2.2)."
10271
msgstr ""
10272
10273
#: en/help_topics/configuration.txt:639
10274
msgid ""
10275
"parent_location\n"
10276
"~~~~~~~~~~~~~~~"
10277
msgstr ""
10278
10279
#: en/help_topics/configuration.txt:642
10280
msgid ""
10281
"If present, the location of the default branch for pull or merge. This "
10282
"option\n"
10283
"is normally set when creating a branch, the first ``pull`` or by ``pull\n"
10284
"--remember``."
10285
msgstr ""
10286
10287
#: en/help_topics/configuration.txt:646
10288
msgid ""
10289
"push_location\n"
10290
"~~~~~~~~~~~~~"
10291
msgstr ""
10292
10293
#: en/help_topics/configuration.txt:649
10294
msgid ""
10295
"If present, the location of the default branch for push. This option\n"
10296
"is normally set by the first ``push`` or ``push --remember``."
10297
msgstr ""
10298
10299
#: en/help_topics/configuration.txt:652
10300
msgid ""
10301
"push_strict\n"
10302
"~~~~~~~~~~~"
10303
msgstr ""
10304
10305
#: en/help_topics/configuration.txt:655
10306
msgid ""
10307
"If present, defines the ``--strict`` option default value for checking\n"
10308
"uncommitted changes before pushing."
10309
msgstr ""
10310
10311
#: en/help_topics/configuration.txt:658
10312
msgid ""
10313
"dpush_strict\n"
10314
"~~~~~~~~~~~~"
10315
msgstr ""
10316
10317
#: en/help_topics/configuration.txt:661
10318
msgid ""
10319
"If present, defines the ``--strict`` option default value for checking\n"
10320
"uncommitted changes before pushing into a different VCS without any\n"
10321
"custom bzr metadata."
10322
msgstr ""
10323
10324
#: en/help_topics/configuration.txt:665
10325
msgid ""
10326
"bound_location\n"
10327
"~~~~~~~~~~~~~~"
10328
msgstr ""
10329
10330
#: en/help_topics/configuration.txt:668
10331
msgid ""
10332
"The location that commits should go to when acting as a checkout.\n"
10333
"This option is normally set by ``bind``."
10334
msgstr ""
10335
10336
#: en/help_topics/configuration.txt:671
10337
msgid ""
10338
"bound\n"
10339
"~~~~~"
10340
msgstr ""
10341
10342
#: en/help_topics/configuration.txt:674
10343
msgid ""
10344
"If set to \"True\", the branch should act as a checkout, and push each "
10345
"commit to\n"
10346
"the bound_location. This option is normally set by ``bind``/``unbind``."
10347
msgstr ""
10348
10349
#: en/help_topics/configuration.txt:677
10350
msgid ""
10351
"send_strict\n"
10352
"~~~~~~~~~~~"
10353
msgstr ""
10354
10355
#: en/help_topics/configuration.txt:680
10356
msgid ""
10357
"If present, defines the ``--strict`` option default value for checking\n"
10358
"uncommitted changes before sending a merge directive."
10359
msgstr ""
10360
10361
#: en/help_topics/configuration.txt:683
10362
msgid ""
10363
"add.maximum_file_size\n"
10364
"~~~~~~~~~~~~~~~~~~~~~"
10365
msgstr ""
10366
10367
#: en/help_topics/configuration.txt:686
10368
msgid ""
10369
"Defines the maximum file size the command line \"add\" operation will allow\n"
10370
"in recursive mode, with files larger than this value being skipped. You may "
10371
"\n"
10372
"specify this value as an integer (in which case it is interpreted as bytes), "
10373
"\n"
10374
"or you may specify the value using SI units, i.e. 10KB, 20MB, 1G. A value of "
10375
"0 \n"
10376
"will disable skipping."
10377
msgstr ""
10378
10379
#: en/help_topics/configuration.txt:692
10380
msgid ""
10381
"External Merge Tools\n"
10382
"--------------------"
10383
msgstr ""
10384
10385
#: en/help_topics/configuration.txt:695
10386
msgid ""
10387
"bzr.mergetool.<name>\n"
10388
"~~~~~~~~~~~~~~~~~~~~"
10389
msgstr ""
10390
10391
#: en/help_topics/configuration.txt:698
10392
msgid ""
10393
"Defines an external merge tool called <name> with the given command-line.\n"
10394
"Arguments containing spaces should be quoted using single or double quotes. "
10395
"The\n"
10396
"executable may omit its path if it can be found on the PATH."
10397
msgstr ""
10398
10399
#: en/help_topics/configuration.txt:702
10400
msgid ""
10401
"The following markers can be used in the command-line to substitute "
10402
"filenames\n"
10403
"involved in the merge conflict::"
10404
msgstr ""
10405
10406
#: en/help_topics/configuration.txt:705
10407
msgid ""
10408
" {base} file.BASE\n"
10409
" {this} file.THIS\n"
10410
" {other} file.OTHER\n"
10411
" {result} output file\n"
10412
" {this_temp} temp copy of file.THIS, used to overwrite output file if "
10413
"merge\n"
10414
" succeeds."
10415
msgstr ""
10416
10417
#: en/help_topics/configuration.txt:714
10418
msgid " bzr.mergetool.kdiff3 = kdiff3 {base} {this} {other} -o {result}"
10419
msgstr ""
10420
10421
#: en/help_topics/configuration.txt:716
10422
msgid ""
10423
"bzr.default_mergetool\n"
10424
"~~~~~~~~~~~~~~~~~~~~~"
10425
msgstr ""
10426
10427
#: en/help_topics/configuration.txt:719
10428
msgid ""
10429
"Specifies which external merge tool (as defined above) should be selected "
10430
"by\n"
10431
"default in tools such as ``bzr qconflicts``."
10432
msgstr ""
10433
10434
#: en/help_topics/configuration.txt:724
10435
msgid " bzr.default_mergetool = kdiff3\n"
10436
msgstr ""
10437
10438
#: en/help_topics/conflict-types.txt:1
10439
msgid ""
10440
"Conflict Types\n"
10441
"=============="
10442
msgstr ""
10443
10444
#: en/help_topics/conflict-types.txt:4
10445
msgid ""
10446
"Some operations, like merge, revert and pull, modify the contents of your\n"
10447
"working tree. These modifications are programmatically generated, and so "
10448
"they\n"
10449
"may conflict with the current state of your working tree. "
10450
msgstr ""
10451
10452
#: en/help_topics/conflict-types.txt:8
10453
msgid ""
10454
"When conflicts are present in your working tree (as shown by ``bzr\n"
10455
"conflicts``), you should resolve them and then inform bzr that the "
10456
"conflicts\n"
10457
"have been resolved."
10458
msgstr ""
10459
10460
#: en/help_topics/conflict-types.txt:12
10461
msgid ""
10462
"Resolving conflicts is sometimes not obvious. Either because the user that\n"
10463
"should resolve them is not the one responsible for their occurrence, as is "
10464
"the\n"
10465
"case when merging other people's work or because some conflicts are "
10466
"presented\n"
10467
"in a way that is not easy to understand."
10468
msgstr ""
10469
10470
#: en/help_topics/conflict-types.txt:17
10471
msgid ""
10472
"Bazaar tries to avoid conflicts ; its aim is to ask you to resolve the\n"
10473
"conflict if and only if there's an actual conceptual conflict in the source\n"
10474
"tree. Because Bazaar doesn't understand the real meaning of the files "
10475
"being\n"
10476
"versioned, it can, when faced with ambiguities, fall short in either "
10477
"direction\n"
10478
"trying to resolve the conflict itself. Many kinds of changes can be "
10479
"combined\n"
10480
"programmatically, but sometimes only a human can determine the right thing "
10481
"to\n"
10482
"do."
10483
msgstr ""
10484
10485
#: en/help_topics/conflict-types.txt:25
10486
msgid ""
10487
"When Bazaar generates a conflict, it adds information into the working tree "
10488
"to\n"
10489
"present the conflicting versions, and it's up to you to find the correct\n"
10490
"resolution."
10491
msgstr ""
10492
10493
#: en/help_topics/conflict-types.txt:29
10494
msgid "Whatever the conflict is, resolving it is roughly done in two steps:"
10495
msgstr ""
10496
10497
#: en/help_topics/conflict-types.txt:31
10498
msgid ""
10499
"1. Modify the working tree content so that the conflicted item is now in "
10500
"the\n"
10501
" state you want to keep, then"
10502
msgstr ""
10503
10504
#: en/help_topics/conflict-types.txt:34
10505
msgid ""
10506
"2. Inform Bazaar that the conflict is now solved and ask to cleanup any\n"
10507
" remaining generated information (``bzr resolve <item>``)."
10508
msgstr ""
10509
10510
#: en/help_topics/conflict-types.txt:37
10511
msgid ""
10512
"For most conflict types, there are some obvious ways to modify the working\n"
10513
"tree and put it into the desired state. For some types of conflicts, Bazaar\n"
10514
"itself already made a choice, when possible."
10515
msgstr ""
10516
10517
#: en/help_topics/conflict-types.txt:41
10518
msgid ""
10519
"Yet, whether Bazaar makes a choice or not, there are some other simple but\n"
10520
"different ways to resolve the conflict."
10521
msgstr ""
10522
10523
#: en/help_topics/conflict-types.txt:44
10524
msgid ""
10525
"Each type of conflict is explained below, and the action which must be done "
10526
"to\n"
10527
"resolve the conflict is outlined."
10528
msgstr ""
10529
10530
#: en/help_topics/conflict-types.txt:47
10531
msgid ""
10532
"Various actions are available depending on the kind of conflict, for some "
10533
"of\n"
10534
"these actions, Bazaar can provide some help. In the end you should at least\n"
10535
"inform Bazaar that you're done with the conflict with::"
10536
msgstr ""
10537
10538
#: en/help_topics/conflict-types.txt:51
10539
msgid " ``bzr resolve FILE --action=done'"
10540
msgstr ""
10541
10542
#: en/help_topics/conflict-types.txt:53
10543
msgid ""
10544
"Note that this is the default action when a single file is involved so you "
10545
"can\n"
10546
"simply use::"
10547
msgstr ""
10548
10549
#: en/help_topics/conflict-types.txt:56
10550
msgid " ``bzr resolve FILE``"
10551
msgstr ""
10552
10553
#: en/help_topics/conflict-types.txt:58
10554
msgid "See ``bzr help resolve`` for more details."
10555
msgstr ""
10556
10557
#: en/help_topics/conflict-types.txt:60
10558
msgid ""
10559
"Text conflicts\n"
10560
"--------------"
10561
msgstr ""
10562
10563
#: en/help_topics/conflict-types.txt:63 en/help_topics/conflict-types.txt:120
10564
#: en/help_topics/conflict-types.txt:151 en/help_topics/conflict-types.txt:175
10565
#: en/help_topics/conflict-types.txt:198 en/help_topics/conflict-types.txt:213
10566
#: en/help_topics/conflict-types.txt:239 en/help_topics/conflict-types.txt:281
10567
#: en/help_topics/conflict-types.txt:303 en/help_topics/conflict-types.txt:339
10568
msgid "Typical message::"
10569
msgstr ""
10570
10571
#: en/help_topics/conflict-types.txt:65
10572
msgid " Text conflict in FILE"
10573
msgstr ""
10574
10575
#: en/help_topics/conflict-types.txt:67
10576
msgid ""
10577
"These are produced when a text merge cannot completely reconcile two sets "
10578
"of\n"
10579
"text changes. Bazaar will emit files for each version with the extensions\n"
10580
"THIS, OTHER, and BASE. THIS is the version of the file from the target "
10581
"tree,\n"
10582
"i.e. the tree that you are merging changes into. OTHER is the version that "
10583
"you\n"
10584
"are merging into the target. BASE is an older version that is used as a "
10585
"basis\n"
10586
"for comparison."
10587
msgstr ""
10588
10589
#: en/help_topics/conflict-types.txt:74
10590
msgid ""
10591
"In the main copy of the file, Bazaar will include all the changes that it\n"
10592
"could reconcile, and any un-reconciled conflicts are surrounded by\n"
10593
"\"herringbone\" markers like ``<<<<<<<``."
10594
msgstr ""
10595
10596
#: en/help_topics/conflict-types.txt:78
10597
msgid ""
10598
"Say the initial text is \"The project leader released it.\", and THIS "
10599
"modifies it\n"
10600
"to \"Martin Pool released it.\", while OTHER modifies it to \"The project "
10601
"leader\n"
10602
"released Bazaar.\" A conflict would look like this::"
10603
msgstr ""
10604
10605
#: en/help_topics/conflict-types.txt:82
10606
msgid ""
10607
" <<<<<<< TREE\n"
10608
" Martin Pool released it.\n"
10609
" =======\n"
10610
" The project leader released Bazaar.\n"
10611
" >>>>>>> MERGE-SOURCE"
10612
msgstr ""
10613
10614
#: en/help_topics/conflict-types.txt:88
10615
msgid "The correct resolution would be \"Martin Pool released Bazaar.\""
10616
msgstr ""
10617
10618
#: en/help_topics/conflict-types.txt:90
10619
msgid ""
10620
"You can handle text conflicts either by editing the main copy of the file,\n"
10621
"or by invoking external tools on the THIS, OTHER and BASE versions. It's\n"
10622
"worth mentioning that resolving text conflicts rarely involves picking one\n"
10623
"set of changes over the other (but see below when you encounter these\n"
10624
"cases). More often, the two sets of changes must be intelligently combined."
10625
msgstr ""
10626
10627
#: en/help_topics/conflict-types.txt:96
10628
msgid ""
10629
"If you edit the main copy, be sure to remove the herringbone markers. When\n"
10630
"you are done editing, the file should look like it never had a conflict, and "
10631
"be\n"
10632
"ready to commit."
10633
msgstr ""
10634
10635
#: en/help_topics/conflict-types.txt:100
10636
msgid ""
10637
"When you have resolved text conflicts, just run ``bzr resolve --auto``, and\n"
10638
"Bazaar will auto-detect which conflicts you have resolved."
10639
msgstr ""
10640
10641
#: en/help_topics/conflict-types.txt:103
10642
msgid ""
10643
"When the conflict is resolved, Bazaar deletes the previously generated\n"
10644
"``.BASE``, ``.THIS`` and ``.OTHER`` files if they are still present in the\n"
10645
"working tree."
10646
msgstr ""
10647
10648
#: en/help_topics/conflict-types.txt:107
10649
msgid ""
10650
"\n"
10651
"When you want to pick one set of changes over the other, you can use ``bzr\n"
10652
"resolve`` with one of the following actions:"
10653
msgstr ""
10654
10655
#: en/help_topics/conflict-types.txt:111
10656
msgid ""
10657
"* ``--action=take-this`` will issue ``mv FILE.THIS FILE``,\n"
10658
"* ``--action=take-other`` will issue ``mv FILE.OTHER FILE``."
10659
msgstr ""
10660
10661
#: en/help_topics/conflict-types.txt:114
10662
msgid ""
10663
"Note that if you have modified ``FILE.THIS`` or ``FILE.OTHER``, these\n"
10664
"modifications will be taken into account."
10665
msgstr ""
10666
10667
#: en/help_topics/conflict-types.txt:117
10668
msgid ""
10669
"Content conflicts\n"
10670
"-----------------"
10671
msgstr ""
10672
10673
#: en/help_topics/conflict-types.txt:122
10674
msgid " Contents conflict in FILE"
10675
msgstr ""
10676
10677
#: en/help_topics/conflict-types.txt:124
10678
msgid ""
10679
"This conflict happens when there are conflicting changes in the working "
10680
"tree\n"
10681
"and the merge source, but the conflicted items are not text files. They "
10682
"may\n"
10683
"be binary files, or symlinks, or directories. It can even happen with "
10684
"files\n"
10685
"that are deleted on one side, and modified on the other."
10686
msgstr ""
10687
10688
#: en/help_topics/conflict-types.txt:129
10689
msgid ""
10690
"Like text conflicts, Bazaar will emit THIS, OTHER and BASE files. (They may "
10691
"be\n"
10692
"regular files, symlinks or directories). But it will not include a \"main "
10693
"copy\"\n"
10694
"of the file with herringbone conflict markers. It will appear that the "
10695
"\"main\n"
10696
"copy\" has been renamed to THIS or OTHER."
10697
msgstr ""
10698
10699
#: en/help_topics/conflict-types.txt:134 en/help_topics/conflict-types.txt:182
10700
msgid ""
10701
"To resolve that kind of conflict, you should rebuild FILE from either "
10702
"version\n"
10703
"or a combination of both."
10704
msgstr ""
10705
10706
#: en/help_topics/conflict-types.txt:137 en/help_topics/conflict-types.txt:185
10707
#: en/help_topics/conflict-types.txt:226 en/help_topics/conflict-types.txt:252
10708
#: en/help_topics/conflict-types.txt:291 en/help_topics/conflict-types.txt:326
10709
#: en/help_topics/conflict-types.txt:361
10710
msgid "``bzr resolve`` recognizes the following actions:"
10711
msgstr ""
10712
10713
#: en/help_topics/conflict-types.txt:139
10714
msgid ""
10715
"* ``--action=take-this`` will issue ``bzr mv FILE.THIS FILE``,\n"
10716
"* ``--action=take-other`` will issue ``bzr mv FILE.OTHER FILE``,\n"
10717
"* ``--action=done`` will just mark the conflict as resolved."
10718
msgstr ""
10719
10720
#: en/help_topics/conflict-types.txt:143
10721
msgid ""
10722
"Any action will also delete the previously generated ``.BASE``, ``.THIS`` "
10723
"and\n"
10724
"``.OTHER`` files if they are still present in the working tree."
10725
msgstr ""
10726
10727
#: en/help_topics/conflict-types.txt:146 en/help_topics/conflict-types.txt:193
10728
#: en/help_topics/conflict-types.txt:234 en/help_topics/conflict-types.txt:276
10729
#: en/help_topics/conflict-types.txt:298 en/help_topics/conflict-types.txt:334
10730
#: en/help_topics/conflict-types.txt:369
10731
msgid ""
10732
"Bazaar cannot auto-detect when conflicts of this kind have been resolved."
10733
msgstr ""
10734
10735
#: en/help_topics/conflict-types.txt:148
10736
msgid ""
10737
"Tag conflicts\n"
10738
"-------------"
10739
msgstr ""
10740
10741
#: en/help_topics/conflict-types.txt:153
10742
msgid ""
10743
" Conflicting tags:\n"
10744
" version-0.1"
10745
msgstr ""
10746
10747
#: en/help_topics/conflict-types.txt:156
10748
msgid ""
10749
"When pulling from or pushing to another branch, Bazaar informs you about "
10750
"tags\n"
10751
"that conflict between the two branches; that is the same tag points to two\n"
10752
"different revisions. You need not resolve these conflicts, but subsequent\n"
10753
"uses of pull or push will result in the same message."
10754
msgstr ""
10755
10756
#: en/help_topics/conflict-types.txt:161
10757
msgid ""
10758
"To resolve the conflict, you must apply the correct tags to either the "
10759
"target\n"
10760
"branch or the source branch as appropriate. Use \"bzr tags --show-ids -d\n"
10761
"SOURCE_URL\" to see the tags in the source branch. If you want to make the\n"
10762
"target branch's tags match the source branch, then in the target branch do\n"
10763
"``bzr tag --force -r revid:REVISION_ID CONFLICTING_TAG`` for each of the\n"
10764
"CONFLICTING_TAGs, where REVISION_ID comes from the list of tags in the "
10765
"source\n"
10766
"branch. You need not call \"bzr resolve\" after doing this. To resolve in\n"
10767
"favor of the target branch, you need to similarly use ``tag --force`` in "
10768
"the\n"
10769
"source branch. (Note that pulling or pushing using --overwrite will "
10770
"overwrite\n"
10771
"all tags as well.)"
10772
msgstr ""
10773
10774
#: en/help_topics/conflict-types.txt:172
10775
msgid ""
10776
"Duplicate paths\n"
10777
"---------------"
10778
msgstr ""
10779
10780
#: en/help_topics/conflict-types.txt:177
10781
msgid " Conflict adding file FILE. Moved existing file to FILE.moved."
10782
msgstr ""
10783
10784
#: en/help_topics/conflict-types.txt:179
10785
msgid ""
10786
"Sometimes Bazaar will attempt to create a file using a pathname that has\n"
10787
"already been used. The existing file will be renamed to \"FILE.moved\". "
10788
msgstr ""
10789
10790
#: en/help_topics/conflict-types.txt:187
10791
msgid ""
10792
"* ``--action=take-this`` will issue ``bzr rm FILE ; bzr mv FILE.moved "
10793
"FILE``,\n"
10794
"* ``--action=take-other`` will issue ``bzr rm FILE.moved``,\n"
10795
"* ``--action=done`` will just mark the conflict as resolved."
10796
msgstr ""
10797
10798
#: en/help_topics/conflict-types.txt:191
10799
msgid ""
10800
"Note that you must get rid of FILE.moved before using ``--action=done``."
10801
msgstr ""
10802
10803
#: en/help_topics/conflict-types.txt:195
10804
msgid ""
10805
"Unversioned parent\n"
10806
"------------------"
10807
msgstr ""
10808
10809
#: en/help_topics/conflict-types.txt:200
10810
msgid ""
10811
" Conflict because FILE is not versioned, but has versioned children."
10812
msgstr ""
10813
10814
#: en/help_topics/conflict-types.txt:202
10815
msgid ""
10816
"Sometimes Bazaar will attempt to create a file whose parent directory is "
10817
"not\n"
10818
"versioned. This happens when the directory has been deleted in the target,\n"
10819
"but has a new child in the source, or vice versa. In this situation, "
10820
"Bazaar\n"
10821
"will version the parent directory as well. Resolving this issue depends\n"
10822
"very much on the particular scenario. You may wish to rename or delete "
10823
"either\n"
10824
"the file or the directory. When you are satisfied, you can run \"bzr "
10825
"resolve\n"
10826
"FILE\" to mark the conflict as resolved."
10827
msgstr ""
10828
10829
#: en/help_topics/conflict-types.txt:210
10830
msgid ""
10831
"Missing parent\n"
10832
"--------------"
10833
msgstr ""
10834
10835
#: en/help_topics/conflict-types.txt:215
10836
msgid " Conflict adding files to FILE. Created directory."
10837
msgstr ""
10838
10839
#: en/help_topics/conflict-types.txt:217
10840
msgid ""
10841
"This happens when a directory has been deleted in the target, but has new\n"
10842
"children in the source. This is similar to the \"unversioned parent\" "
10843
"conflict,\n"
10844
"except that the parent directory does not *exist*, instead of just being\n"
10845
"unversioned. In this situation, Bazaar will create the missing parent.\n"
10846
"Resolving this issue depends very much on the particular scenario."
10847
msgstr ""
10848
10849
#: en/help_topics/conflict-types.txt:223 en/help_topics/conflict-types.txt:249
10850
msgid ""
10851
"To resolve that kind of conflict, you should either remove or rename the\n"
10852
"children or the directory or a combination of both."
10853
msgstr ""
10854
10855
#: en/help_topics/conflict-types.txt:228
10856
msgid ""
10857
"* ``--action=take-this`` will issue ``bzr rm directory`` including the\n"
10858
" children,\n"
10859
"* ``--action=take-other`` will acknowledge Bazaar choice to keep the "
10860
"children\n"
10861
" and restoring the directory,\n"
10862
"* ``--action=done`` will just mark the conflict as resolved."
10863
msgstr ""
10864
10865
#: en/help_topics/conflict-types.txt:236
10866
msgid ""
10867
"Deleting parent\n"
10868
"---------------"
10869
msgstr ""
10870
10871
#: en/help_topics/conflict-types.txt:241
10872
msgid " Conflict: can't delete DIR because it is not empty. Not deleting."
10873
msgstr ""
10874
10875
#: en/help_topics/conflict-types.txt:243
10876
msgid ""
10877
"This is the opposite of \"missing parent\". A directory is deleted in the\n"
10878
"source, but has new children in the target (either because a directory\n"
10879
"deletion is merged or because the merge introduce new children). Bazaar\n"
10880
"will retain the directory. Resolving this issue depends very much on the\n"
10881
"particular scenario."
10882
msgstr ""
10883
10884
#: en/help_topics/conflict-types.txt:254
10885
msgid ""
10886
"* ``--action=take-this`` will acknowledge Bazaar choice to keep the "
10887
"directory,"
10888
msgstr ""
10889
10890
#: en/help_topics/conflict-types.txt:256
10891
msgid ""
10892
"* ``--action=take-other`` will issue ``bzr rm directory`` including the \n"
10893
" children,"
10894
msgstr ""
10895
10896
#: en/help_topics/conflict-types.txt:259
10897
msgid "* ``--action=done`` will just mark the conflict as resolved."
10898
msgstr ""
10899
10900
#: en/help_topics/conflict-types.txt:261
10901
msgid ""
10902
"Note that when merging a directory deletion, if unversioned files are\n"
10903
"present, they become potential orphans has they don't have a directory\n"
10904
"parent anymore."
10905
msgstr ""
10906
10907
#: en/help_topics/conflict-types.txt:265
10908
msgid ""
10909
"Handling such orphans, *before* the conflict is created, is controlled by\n"
10910
"setting the ``bzr.transform.orphan_policy`` configuration option."
10911
msgstr ""
10912
10913
#: en/help_topics/conflict-types.txt:268
10914
msgid "There are two possible values for this option:"
10915
msgstr ""
10916
10917
#: en/help_topics/conflict-types.txt:270
10918
msgid ""
10919
"* ``conflict`` (the default): will leave the orphans in place and\n"
10920
" generate a conflicts,"
10921
msgstr ""
10922
10923
#: en/help_topics/conflict-types.txt:273
10924
msgid ""
10925
"* ``move``: will move the orphans to a ``bzr-orphans`` directory at the "
10926
"root\n"
10927
" of the working tree with names like ``<file>.~#~``."
10928
msgstr ""
10929
10930
#: en/help_topics/conflict-types.txt:278
10931
msgid ""
10932
"Path conflict\n"
10933
"-------------"
10934
msgstr ""
10935
10936
#: en/help_topics/conflict-types.txt:283
10937
msgid " Path conflict: PATH1 / PATH2"
10938
msgstr ""
10939
10940
#: en/help_topics/conflict-types.txt:285
10941
msgid ""
10942
"This happens when the source and target have each modified the name or "
10943
"parent\n"
10944
"directory of a file. Bazaar will use the path elements from the source."
10945
msgstr ""
10946
10947
#: en/help_topics/conflict-types.txt:288
10948
msgid ""
10949
"To resolve that kind of conflict, you just have to decide what name should "
10950
"be\n"
10951
"retained for the file involved."
10952
msgstr ""
10953
10954
#: en/help_topics/conflict-types.txt:293
10955
msgid ""
10956
"* ``--action=take-this`` will revert Bazaar choice and keep ``PATH1`` by\n"
10957
" issuing ``bzr mv PATH2 PATH1``,\n"
10958
"* ``--action=take-other`` will acknowledge Bazaar choice of keeping "
10959
"``PATH2``,\n"
10960
"* ``--action=done`` will just mark the conflict as resolved."
10961
msgstr ""
10962
10963
#: en/help_topics/conflict-types.txt:300
10964
msgid ""
10965
"Parent loop\n"
10966
"-----------"
10967
msgstr ""
10968
10969
#: en/help_topics/conflict-types.txt:305
10970
msgid " Conflict moving FILE into DIRECTORY. Cancelled move."
10971
msgstr ""
10972
10973
#: en/help_topics/conflict-types.txt:307
10974
msgid ""
10975
"This happens when the source and the target have each moved directories, so\n"
10976
"that, if the change could be applied, a directory would be contained by "
10977
"itself.\n"
10978
"For example::"
10979
msgstr ""
10980
10981
#: en/help_topics/conflict-types.txt:311
10982
msgid ""
10983
" $ bzr init\n"
10984
" $ bzr mkdir white\n"
10985
" $ bzr mkdir black\n"
10986
" $ bzr commit -m \"BASE\"\n"
10987
" $ bzr branch . ../other\n"
10988
" $ bzr mv white black\n"
10989
" $ bzr commit -m \"THIS\"\n"
10990
" $ bzr mv ../other/black ../other/white\n"
10991
" $ bzr commit ../other -m \"OTHER\"\n"
10992
" $ bzr merge ../other"
10993
msgstr ""
10994
10995
#: en/help_topics/conflict-types.txt:322
10996
msgid ""
10997
"In this situation, Bazaar will cancel the move, and leave ``white`` in\n"
10998
"``black``. To resolve that kind of conflict, you just have to decide what\n"
10999
"name should be retained for the directories involved."
11000
msgstr ""
11001
11002
#: en/help_topics/conflict-types.txt:328
11003
msgid ""
11004
"* ``--action=take-this`` will acknowledge Bazaar choice of leaving ``white`` "
11005
"\n"
11006
" in ``black``,\n"
11007
"* ``--action=take-other`` will revert Bazaar choice and move ``black`` in\n"
11008
" ``white`` by issuing ``bzr mv black/white white ; bzr mv black white``,\n"
11009
"* ``--action=done`` will just mark the conflict as resolved."
11010
msgstr ""
11011
11012
#: en/help_topics/conflict-types.txt:336
11013
msgid ""
11014
"Non-directory parent\n"
11015
"--------------------"
11016
msgstr ""
11017
11018
#: en/help_topics/conflict-types.txt:341
11019
msgid ""
11020
" Conflict: foo.new is not a directory, but has files in it.\n"
11021
" Created directory."
11022
msgstr ""
11023
11024
#: en/help_topics/conflict-types.txt:344
11025
msgid ""
11026
"This happens when one side has added files to a directory, and the other "
11027
"side\n"
11028
"has changed the directory into a file or symlink. For example::"
11029
msgstr ""
11030
11031
#: en/help_topics/conflict-types.txt:347
11032
msgid ""
11033
" $ bzr init\n"
11034
" $ bzr mkdir foo\n"
11035
" $ bzr commit -m \"BASE\"\n"
11036
" $ bzr branch . ../other\n"
11037
" $ rmdir foo\n"
11038
" $ touch foo\n"
11039
" $ bzr commit -m \"THIS\"\n"
11040
" $ bzr mkdir ../other/foo/bar\n"
11041
" $ bzr commit ../other -m \"OTHER\"\n"
11042
" $ bzr merge ../other"
11043
msgstr ""
11044
11045
#: en/help_topics/conflict-types.txt:358
11046
msgid ""
11047
"To resolve that kind of conflict, you have to decide what name should be\n"
11048
"retained for the file, directory or symlink involved."
11049
msgstr ""
11050
11051
#: en/help_topics/conflict-types.txt:363
11052
msgid ""
11053
"* ``--action=take-this`` will issue ``bzr rm --force foo.new`` and \n"
11054
" ``bzr add foo``,\n"
11055
"* ``--action=take-other`` will issue ``bzr rm --force foo`` and \n"
11056
" ``bzr mv foo.new foo``,\n"
11057
"* ``--action=done`` will just mark the conflict as resolved."
11058
msgstr ""
11059
11060
#: en/help_topics/conflict-types.txt:371
11061
msgid ""
11062
"MalformedTransform\n"
11063
"------------------"
11064
msgstr ""
11065
11066
#: en/help_topics/conflict-types.txt:374
11067
msgid ""
11068
"It is possible (though very rare) for Bazaar to raise a MalformedTransform\n"
11069
"exception. This means that Bazaar encountered a filesystem conflict that it "
11070
"was\n"
11071
"unable to resolve. This usually indicates a bug. Please let us know if "
11072
"you\n"
11073
"encounter this. Our bug tracker is at https://launchpad.net/bzr/+bugs\n"
11074
msgstr ""
11075
11076
#: en/help_topics/content-filters.txt:1
11077
msgid ""
11078
"Content Filters\n"
11079
"==============="
11080
msgstr ""
11081
11082
#: en/help_topics/content-filters.txt:4
11083
msgid ""
11084
"Content formats\n"
11085
"---------------"
11086
msgstr ""
11087
11088
#: en/help_topics/content-filters.txt:7
11089
msgid ""
11090
"Bazaar's content filtering allows you to store files in a different\n"
11091
"format from the copy in your working tree. This lets you, or your\n"
11092
"co-developers, use Windows development tools that expect CRLF files\n"
11093
"on projects that use other line-ending conventions. Among other things,\n"
11094
"content filters also let Unix developers more easily work on projects\n"
11095
"using Windows line-ending conventions, keyword expansion/compression,\n"
11096
"and trailing spaces on lines in text files to be implicitly stripped\n"
11097
"when committed."
11098
msgstr ""
11099
11100
#: en/help_topics/content-filters.txt:16
11101
msgid "To generalize, there are two content formats supported by Bazaar:"
11102
msgstr ""
11103
11104
#: en/help_topics/content-filters.txt:18
11105
msgid ""
11106
"* a canonical format - how files are stored internally\n"
11107
"* a convenience format - how files are created in a working tree."
11108
msgstr ""
11109
11110
#: en/help_topics/content-filters.txt:21
11111
msgid ""
11112
"\n"
11113
"Format conversion\n"
11114
"-----------------"
11115
msgstr ""
11116
11117
#: en/help_topics/content-filters.txt:25
11118
msgid ""
11119
"The conversion between these formats is done by content filters.\n"
11120
"A content filter has two parts:"
11121
msgstr ""
11122
11123
#: en/help_topics/content-filters.txt:28
11124
msgid ""
11125
"* a read converter - converts from convenience to canonical format\n"
11126
"* a write converter - converts from canonical to convenience format."
11127
msgstr ""
11128
11129
#: en/help_topics/content-filters.txt:31
11130
msgid ""
11131
"Many of these converters will provide *round-trip* conversion,\n"
11132
"i.e. applying the read converter followed by the write converter\n"
11133
"gives back the original content. However, others may provide an\n"
11134
"asymmetric conversion. For example, a read converter might strip\n"
11135
"trailing whitespace off lines in source code while the matching\n"
11136
"write converter might pass content through unchanged."
11137
msgstr ""
11138
11139
#: en/help_topics/content-filters.txt:38
11140
msgid ""
11141
"\n"
11142
"Enabling content filters\n"
11143
"------------------------"
11144
msgstr ""
11145
11146
#: en/help_topics/content-filters.txt:42
11147
msgid ""
11148
"Content filters are typically provided by plugins, so the first step\n"
11149
"in using them is to install the relevant plugins and read their\n"
11150
"documentation. Some plugins may be very specific about which files\n"
11151
"they filter, e.g. only files ending in ``.java`` or ``.php``.\n"
11152
"In other cases, the plugin may leave it in the user's hands to\n"
11153
"define which files are to be filtered. This is typically done\n"
11154
"using rule-based preferences. See ``bzr help rules`` for general\n"
11155
"information about defining these."
11156
msgstr ""
11157
11158
#: en/help_topics/content-filters.txt:51
11159
msgid ""
11160
"\n"
11161
"Impact on commands\n"
11162
"------------------"
11163
msgstr ""
11164
11165
#: en/help_topics/content-filters.txt:55
11166
msgid ""
11167
"Read converters are only applied to commands that read content from\n"
11168
"a working tree, e.g. status, diff and commit. For example, ``bzr diff``\n"
11169
"will apply read converters to files in the working tree, then compare\n"
11170
"the results to the content last committed."
11171
msgstr ""
11172
11173
#: en/help_topics/content-filters.txt:60
11174
msgid ""
11175
"Write converters are only applied by commands that **create files in a\n"
11176
"working tree**, e.g. branch, checkout, update. If you wish to see the\n"
11177
"canonical format of a file or tree, use ``bzr cat`` or ``bzr export``\n"
11178
"respectively."
11179
msgstr ""
11180
11181
#: en/help_topics/content-filters.txt:65
11182
msgid ""
11183
"Note: ``bzr commit`` does not implicitly apply write converters after\n"
11184
"comitting files. If this makes sense for a given plugin providing\n"
11185
"a content filter, the plugin can usually achieve this effect by using a\n"
11186
"``start_commit`` or ``post_commit`` hook say. See :doc:`hooks-help`\n"
11187
"for more information on hooks."
11188
msgstr ""
11189
11190
#: en/help_topics/content-filters.txt:71
11191
msgid ""
11192
"\n"
11193
"Refreshing your working tree\n"
11194
"----------------------------"
11195
msgstr ""
11196
11197
#: en/help_topics/content-filters.txt:75
11198
msgid ""
11199
"For performance reasons, Bazaar caches the timestamps of files in\n"
11200
"a working tree, and assumes files are unchanged if their timestamps\n"
11201
"match the cached values. As a consequence, there are times when\n"
11202
"you may need to explicitly ask for content filtering to be reapplied\n"
11203
"in one or both directions, e.g. after installing or reconfiguring\n"
11204
"plugins providing it."
11205
msgstr ""
11206
11207
#: en/help_topics/content-filters.txt:82
11208
msgid "Here are some general guidelines for doing this:"
11209
msgstr ""
11210
11211
#: en/help_topics/content-filters.txt:84
11212
msgid ""
11213
" * To reapply read converters, ``touch`` files, i.e. update their\n"
11214
" timestamp. Operations like ``bzr status`` should then reapply the\n"
11215
" relevant read converters and compare the end result with the\n"
11216
" canonical format."
11217
msgstr ""
11218
11219
#: en/help_topics/content-filters.txt:89
11220
msgid ""
11221
" * To reapply write converters, ensure there are no local changes,\n"
11222
" delete the relevant files and run ``bzr revert`` on those files."
11223
msgstr ""
11224
11225
#: en/help_topics/content-filters.txt:92
11226
msgid ""
11227
"Note: In the future, it is likely that additional options will be added\n"
11228
"to commands to make this refreshing process faster and safer.\n"
11229
msgstr ""
11230
11231
#: en/help_topics/current-formats.txt:1
11232
msgid "Current Storage Formats"
11233
msgstr ""
11234
11235
#: en/help_topics/current-formats.txt:3
11236
msgid ""
11237
":2a:\n"
11238
" (native) (default) Format for the bzr 2.0 series. Uses group-\n"
11239
" compress storage. Provides rich roots which are a one-way\n"
11240
" transition."
11241
msgstr ""
11242
11243
#: en/help_topics/current-formats.txt:8 en/help_topics/other-formats.txt:17
11244
msgid ""
11245
"\n"
11246
"See :doc:`formats-help` for more about storage formats."
11247
msgstr ""
11248
11249
#: en/help_topics/debug-flags.txt:1
11250
msgid ""
11251
"Debug Flags\n"
11252
"==========="
11253
msgstr ""
11254
11255
#: en/help_topics/debug-flags.txt:4
11256
msgid ""
11257
"These flags can be passed on the bzr command line or (without the ``-D``\n"
11258
"prefix) put in the ``debug_flags`` variable in ``bazaar.conf``."
11259
msgstr ""
11260
11261
#: en/help_topics/debug-flags.txt:7
11262
msgid ""
11263
"-Dauth Trace authentication sections used.\n"
11264
"-Dbytes Print out how many bytes were transferred\n"
11265
"-Ddirstate Trace dirstate activity (verbose!)\n"
11266
"-Derror Instead of normal error handling, always print a "
11267
"traceback\n"
11268
" on error.\n"
11269
"-Devil Capture call sites that do expensive or badly-scaling\n"
11270
" operations.\n"
11271
"-Dfetch Trace history copying between repositories.\n"
11272
"-Dfilters Emit information for debugging content filtering.\n"
11273
"-Dforceinvdeltas Force use of inventory deltas during generic streaming "
11274
"fetch.\n"
11275
"-Dgraph Trace graph traversal.\n"
11276
"-Dhashcache Log every time a working file is read to determine its "
11277
"hash.\n"
11278
"-Dhooks Trace hook execution.\n"
11279
"-Dhpss Trace smart protocol requests and responses.\n"
11280
"-Dhpssdetail More hpss details.\n"
11281
"-Dhpssvfs Traceback on vfs access to Remote objects.\n"
11282
"-Dhttp Trace http connections, requests and responses.\n"
11283
"-Dindex Trace major index operations.\n"
11284
"-Dknit Trace knit operations.\n"
11285
"-Dlock Trace when lockdir locks are taken or released.\n"
11286
"-Dnoretry If a connection is reset, fail immediately rather than\n"
11287
" retrying the request.\n"
11288
"-Dprogress Trace progress bar operations.\n"
11289
"-Dmem_dump Dump memory to a file upon an out of memory error.\n"
11290
"-Dmerge Emit information for debugging merges.\n"
11291
"-Dno_apport Don't use apport to report crashes.\n"
11292
"-Dno_activity \t Don't show transport activity indicator in progress bar.\n"
11293
"-Dpack Emit information about pack operations.\n"
11294
"-Drelock Emit a message every time a branch or repository object "
11295
"is\n"
11296
" unlocked then relocked the same way.\n"
11297
"-Dsftp Trace SFTP internals.\n"
11298
"-Dstatic_tuple Error when a tuple is used where a StaticTuple is "
11299
"expected\n"
11300
"-Dstream Trace fetch streams.\n"
11301
"-Dstrict_locks Trace when OS locks are potentially used in a non-"
11302
"portable\n"
11303
" manner.\n"
11304
"-Dunlock Some errors during unlock are treated as warnings.\n"
11305
"-DIDS_never Never use InterDifferingSerializer when fetching.\n"
11306
"-DIDS_always Always use InterDifferingSerializer to fetch if "
11307
"appropriate\n"
11308
" for the format, even for non-local fetches.\n"
11309
msgstr ""
11310
11311
#: en/help_topics/diverged-branches.txt:1
11312
msgid ""
11313
"Diverged Branches\n"
11314
"================="
11315
msgstr ""
11316
11317
#: en/help_topics/diverged-branches.txt:4
11318
msgid ""
11319
"When Bazaar tries to push one branch onto another, it requires that the\n"
11320
"destination branch must be ready to receive the source branch. If this "
11321
"isn't\n"
11322
"the case, then we say that the branches have ``diverged``. Branches are\n"
11323
"considered diverged if the destination branch's most recent commit is one "
11324
"that\n"
11325
"has not been merged (directly or indirectly) by the source branch. To "
11326
"recover\n"
11327
"from diverged branches, one must merge the missing revisions into the "
11328
"source\n"
11329
"branch."
11330
msgstr ""
11331
11332
#: en/help_topics/diverged-branches.txt:12
11333
msgid ""
11334
"This situation commonly arises when using a centralized workflow with local\n"
11335
"commits. If someone else has committed new work to the mainline since your\n"
11336
"last pull and you have local commits that have not yet been pushed to the\n"
11337
"mainline, then your local branch and the mainline have diverged."
11338
msgstr ""
11339
11340
#: en/help_topics/diverged-branches.txt:17
11341
msgid ""
11342
"Discovering What Has Diverged\n"
11343
"-----------------------------"
11344
msgstr ""
11345
11346
#: en/help_topics/diverged-branches.txt:20
11347
msgid ""
11348
"The ``bzr missing`` command is used to find out what revisions are in "
11349
"another\n"
11350
"branch that are not present in the current branch, and vice-versa. It shows "
11351
"a\n"
11352
"summary of which extra revisions exist in each branch. If you want to see "
11353
"the\n"
11354
"precise effects of those revisions, you can use ``bzr diff --"
11355
"old=other_branch``\n"
11356
"to show the differences between other_branch and your current branch."
11357
msgstr ""
11358
11359
#: en/help_topics/diverged-branches.txt:26
11360
msgid ""
11361
"A Solution\n"
11362
"----------"
11363
msgstr ""
11364
11365
#: en/help_topics/diverged-branches.txt:29
11366
msgid ""
11367
"The solution is to merge the revisions from the mainline into your local\n"
11368
"branch. To do so, use ``bzr merge`` to get the new revisions from the\n"
11369
"mainline. This merge may result in conflicts if the other developer's "
11370
"changes\n"
11371
"overlap with your changes. These conflicts should be resolved before\n"
11372
"continuing. After any conflicts have been resolved, or even if there were "
11373
"no\n"
11374
"conflicts, Bazaar requires that you explicitly commit these new revisions\n"
11375
"to your local branch. This requirement gives you an opportunity to test "
11376
"the\n"
11377
"resulting working tree for correctness, since the merged revisions could "
11378
"have\n"
11379
"made arbitrary changes. After testing, you should commit the merge using\n"
11380
"``bzr commit``. This clears up the diverged branches situation. Your "
11381
"local\n"
11382
"branch can now be pushed to the mainline.\n"
11383
msgstr ""
11384
11385
#: en/help_topics/env-variables.txt:1
11386
msgid "Environment Variables"
11387
msgstr ""
11388
11389
#: en/help_topics/env-variables.txt:3
11390
msgid ""
11391
"=================== "
11392
"===========================================================\n"
11393
"BZRPATH Path where bzr is to look for shell plugin external\n"
11394
" commands.\n"
11395
"BZR_EMAIL E-Mail address of the user. Overrides EMAIL.\n"
11396
"EMAIL E-Mail address of the user.\n"
11397
"BZR_EDITOR Editor for editing commit messages. Overrides EDITOR.\n"
11398
"EDITOR Editor for editing commit messages.\n"
11399
"BZR_PLUGIN_PATH Paths where bzr should look for plugins.\n"
11400
"BZR_DISABLE_PLUGINS Plugins that bzr should not load.\n"
11401
"BZR_PLUGINS_AT Plugins to load from a directory not in "
11402
"BZR_PLUGIN_PATH.\n"
11403
"BZR_HOME Directory holding .bazaar config dir. Overrides HOME.\n"
11404
"BZR_HOME (Win32) Directory holding bazaar config dir. Overrides APPDATA "
11405
"and\n"
11406
" HOME.\n"
11407
"BZR_REMOTE_PATH Full name of remote 'bzr' command (for bzr+ssh:// "
11408
"URLs).\n"
11409
"BZR_SSH Path to SSH client, or one of paramiko, openssh, "
11410
"sshcorp,\n"
11411
" plink or lsh.\n"
11412
"BZR_LOG Location of .bzr.log (use '/dev/null' to suppress log).\n"
11413
"BZR_LOG (Win32) Location of .bzr.log (use 'NUL' to suppress log).\n"
11414
"BZR_COLUMNS Override implicit terminal width.\n"
11415
"BZR_CONCURRENCY Number of processes that can be run concurrently "
11416
"(selftest)\n"
11417
"BZR_PROGRESS_BAR Override the progress display. Values are 'none' or "
11418
"'text'.\n"
11419
"BZR_PDB Control whether to launch a debugger on error.\n"
11420
"BZR_SIGQUIT_PDB Control whether SIGQUIT behaves normally or invokes a\n"
11421
" breakin debugger.\n"
11422
"BZR_TEXTUI_INPUT Force console input mode for prompts to line-based "
11423
"(instead\n"
11424
" of char-based).\n"
11425
"=================== "
11426
"===========================================================\n"
11427
msgstr ""
11428
11429
#: en/help_topics/eol.txt:1
11430
msgid ""
11431
"End of Line Conversion\n"
11432
"======================"
11433
msgstr ""
11434
11435
#: en/help_topics/eol.txt:4
11436
msgid ""
11437
"EOL conversion is provided as a content filter where Bazaar internally\n"
11438
"stores a canonical format but outputs a convenience format. See\n"
11439
"``bzr help content-filters`` for general information about using these."
11440
msgstr ""
11441
11442
#: en/help_topics/eol.txt:8
11443
msgid ""
11444
"Note: Content filtering is only supported in recently added formats,\n"
11445
"e.g. 1.14. Be sure that both the repository *and* the branch are\n"
11446
"in a recent format. (Just setting the format on the repository\n"
11447
"is not enough.) If content filtering does not appear to be working, use\n"
11448
"'bzr info -v' to confirm that the branch is using \"Working tree format 5\"\n"
11449
"or later."
11450
msgstr ""
11451
11452
#: en/help_topics/eol.txt:15
11453
msgid ""
11454
"EOL conversion needs to be enabled for selected file patterns using\n"
11455
"rules. See ``bzr help rules`` for general information on defining rules.\n"
11456
"Currently, rules are only supported in $BZR_HOME/.bazaar/rules (or\n"
11457
"%BZR_HOME%/bazaar/2.0/rules on Windows). Branch specific rules will be\n"
11458
"supported in a future verison of Bazaar."
11459
msgstr ""
11460
11461
#: en/help_topics/eol.txt:21
11462
msgid ""
11463
"To configure which files to filter, set ``eol`` to one of the values below.\n"
11464
"(If a value is not set, ``exact`` is the default.)"
11465
msgstr ""
11466
11467
#: en/help_topics/eol.txt:24
11468
msgid ""
11469
" ========== ===================================== ======================\n"
11470
" Value Checkout end-of-lines as Commit end-of-lines as\n"
11471
" ========== ===================================== ======================\n"
11472
" ``native`` ``crlf`` on Windows, ``lf`` otherwise ``lf``\n"
11473
" ---------- ------------------------------------- ----------------------\n"
11474
" ``lf`` ``lf`` ``lf``\n"
11475
" ---------- ------------------------------------- ----------------------\n"
11476
" ``crlf`` ``crlf`` ``lf``\n"
11477
" ---------- ------------------------------------- ----------------------\n"
11478
" ``exact`` No conversion Exactly as in file\n"
11479
" ========== ===================================== ======================"
11480
msgstr ""
11481
11482
#: en/help_topics/eol.txt:36
11483
msgid ""
11484
"Note: For safety reasons, no conversion is applied to any file where a null\n"
11485
"byte is detected in the file."
11486
msgstr ""
11487
11488
#: en/help_topics/eol.txt:39
11489
msgid ""
11490
"For users working on a cross-platform project, here is a suggested rule\n"
11491
"to use as a starting point::"
11492
msgstr ""
11493
11494
#: en/help_topics/eol.txt:42 en/help_topics/eol.txt:52
11495
#: en/help_topics/eol.txt:67 en/help_topics/eol.txt:82
11496
msgid ""
11497
" [name *]\n"
11498
" eol = native"
11499
msgstr ""
11500
11501
#: en/help_topics/eol.txt:45
11502
msgid ""
11503
"If you have binary files that do not contain a null byte though, be\n"
11504
"sure to add ``eol = exact`` rules for those as well. You can do this\n"
11505
"by giving more explicit patterns earlier in the rules file. For example::"
11506
msgstr ""
11507
11508
#: en/help_topics/eol.txt:49
11509
msgid ""
11510
" [name *.png]\n"
11511
" eol = exact"
11512
msgstr ""
11513
11514
#: en/help_topics/eol.txt:55
11515
msgid ""
11516
"If your working tree is on a network drive shared by users on different\n"
11517
"operating systems, you typically want to force certain conventions for\n"
11518
"certain files. In that way, if a file is created with the wrong line\n"
11519
"endings or line endings get mixed during editing, it gets committed\n"
11520
"correctly and gets checked out correctly. For example::"
11521
msgstr ""
11522
11523
#: en/help_topics/eol.txt:61
11524
msgid ""
11525
" [name *.bat]\n"
11526
" eol = crlf"
11527
msgstr ""
11528
11529
#: en/help_topics/eol.txt:64
11530
msgid ""
11531
" [name *.sh]\n"
11532
" eol = lf"
11533
msgstr ""
11534
11535
#: en/help_topics/eol.txt:70
11536
msgid ""
11537
"If you take the care to create files with their required endings, you can\n"
11538
"achieve *almost* the same thing by using ``eol = exact``. It is slightly\n"
11539
"safer to use ``lf`` and ``crlf`` though because edits accidentally\n"
11540
"introducing mixed line endings will be corrected during commit for files\n"
11541
"with those settings."
11542
msgstr ""
11543
11544
#: en/help_topics/eol.txt:76
11545
msgid ""
11546
"If you have sample test data that deliberately has text files with mixed\n"
11547
"newline conventions, you can ask for those to be left alone like this::"
11548
msgstr ""
11549
11550
#: en/help_topics/eol.txt:79
11551
msgid ""
11552
" [name test_data/]\n"
11553
" eol = exact"
11554
msgstr ""
11555
11556
#: en/help_topics/eol.txt:85
11557
msgid ""
11558
"Note that ``exact`` does not imply the file is binary but it does mean\n"
11559
"that no conversion of end-of-lines will be done. (Bazaar currently relies\n"
11560
"of content analysis to detect binary files for commands like ``diff``.\n"
11561
"In the future, a ``binary = true`` rule may be added but it is not\n"
11562
"supported yet.)"
11563
msgstr ""
11564
11565
#: en/help_topics/eol.txt:91
11566
msgid ""
11567
"If you have an existing repository with text files already stored using\n"
11568
"Windows newline conventions (``crlf``), then you may want to keep using "
11569
"that\n"
11570
"convention in the repository. Forcing certain files to this convention\n"
11571
"may also help users who do not have rules configured. To do this, set\n"
11572
"``eol`` to one of the values below."
11573
msgstr ""
11574
11575
#: en/help_topics/eol.txt:97
11576
msgid ""
11577
" ============================ ======================== "
11578
"======================\n"
11579
" Value Checkout end-of-lines as Commit end-of-lines "
11580
"as\n"
11581
" ============================ ======================== "
11582
"======================\n"
11583
" ``native-with-crlf-in-repo`` ``crlf`` on Windows, ``crlf``\n"
11584
" ``lf`` otherwise\n"
11585
" ---------------------------- ------------------------ ----------------------"
11586
"\n"
11587
" ``lf-with-crlf-in-repo`` ``lf`` ``crlf``\n"
11588
" ---------------------------- ------------------------ ----------------------"
11589
"\n"
11590
" ``crlf-with-crlf-in-repo`` ``crlf`` ``crlf``\n"
11591
" ============================ ======================== ======================"
11592
msgstr ""
11593
11594
#: en/help_topics/eol.txt:108
11595
msgid ""
11596
"For users working on an existing project that uses Windows newline\n"
11597
"conventions in their Bazaar repository, this rule is suggested as a\n"
11598
"starting point::"
11599
msgstr ""
11600
11601
#: en/help_topics/eol.txt:112
11602
msgid ""
11603
" [name *]\n"
11604
" eol = native-with-crlf-in-repo"
11605
msgstr ""
11606
11607
#: en/help_topics/eol.txt:115
11608
msgid ""
11609
"For new projects, it is recommended that end-of-lines be stored as ``lf``\n"
11610
"and that users stick to the basic settings, i.e. ``native``, ``lf``,\n"
11611
"``crlf`` and ``exact``."
11612
msgstr ""
11613
11614
#: en/help_topics/eol.txt:119
11615
msgid ""
11616
"Note: Bazaar's EOL conversion will convert the content of files but\n"
11617
"never reject files because a given line ending or mixed line endings\n"
11618
"are found. A precommit hook should be used if you wish to validate\n"
11619
"(and not just convert) content before committing.\n"
11620
msgstr ""
11621
11622
#: en/help_topics/hidden-commands.txt:1
11623
msgid ""
11624
"added List files added in working tree.\n"
11625
"ancestry List all revisions merged into this branch.\n"
11626
"assert-fail Test reporting of assertion failures\n"
11627
"bundle-info Output interesting stats about a bundle\n"
11628
"bundle-revisions Create a merge-directive for submitting changes.\n"
11629
"cat-revision Write out metadata for a revision.\n"
11630
"dump-btree Dump the contents of a btree index file to stdout.\n"
11631
"export-pot Export command helps and error messages in po format.\n"
11632
"file-id Print file_id of a particular file or directory.\n"
11633
"file-path Print path of file_ids to a file or directory.\n"
11634
"find-merge-base Find and print a base revision for merging two "
11635
"branches.\n"
11636
"hooks Show hooks.\n"
11637
"inventory Show inventory of the current working copy or a "
11638
"revision.\n"
11639
"local-time-offset Show the offset in seconds from GMT to local time.\n"
11640
"lookup-revision Lookup the revision-id from a revision-number\n"
11641
"merge-directive Generate a merge directive for auto-merge tools.\n"
11642
"modified List files modified in working tree.\n"
11643
"re-sign Create a digital signature for an existing revision.\n"
11644
"reference list, view and set branch locations for nested trees.\n"
11645
"relpath Show path of a file relative to root\n"
11646
"repair-workingtree Reset the working tree state file.\n"
11647
"revision-history Display the list of revision ids on a branch.\n"
11648
"revision-info Show revision number and revision id for a given "
11649
"revision\n"
11650
" identifier.\n"
11651
"rocks Statement of optimism.\n"
11652
"selftest Run internal test suite.\n"
11653
"shell-complete Show appropriate completions for context.\n"
11654
"test-script Run a shell-like test from a file.\n"
11655
"touching-revisions Return revision-ids which affected a particular file.\n"
11656
"unknowns List unknown files.\n"
11657
"wait-until-signalled Test helper for\n"
11658
" test_start_and_stop_bzr_subprocess_send_signal.\n"
11659
msgstr ""
11660
11661
#: en/help_topics/hooks.txt:1
11662
msgid ""
11663
"\n"
11664
"Hooks\n"
11665
"====="
11666
msgstr ""
11667
11668
#: en/help_topics/hooks.txt:5 en/help_topics/rules.txt:4
11669
msgid ""
11670
"Introduction\n"
11671
"------------"
11672
msgstr ""
11673
11674
#: en/help_topics/hooks.txt:8
11675
msgid "A hook of type *xxx* of class *yyy* needs to be registered using::"
11676
msgstr ""
11677
11678
#: en/help_topics/hooks.txt:10
11679
msgid " yyy.hooks.install_named_hook(\"xxx\", ...)"
11680
msgstr ""
11681
11682
#: en/help_topics/hooks.txt:12
11683
msgid ""
11684
"See :doc:`Using hooks<../user-guide/hooks>` in the User Guide for examples."
11685
msgstr ""
11686
11687
#: en/help_topics/hooks.txt:14
11688
msgid ""
11689
"The class that contains each hook is given before the hooks it supplies. "
11690
"For\n"
11691
"instance, BranchHooks as the class is the hooks class for\n"
11692
"`bzrlib.branch.Branch.hooks`."
11693
msgstr ""
11694
11695
#: en/help_topics/hooks.txt:18
11696
msgid ""
11697
"Each description also indicates whether the hook runs on the client (the\n"
11698
"machine where bzr was invoked) or the server (the machine addressed by\n"
11699
"the branch URL). These may be, but are not necessarily, the same machine."
11700
msgstr ""
11701
11702
#: en/help_topics/hooks.txt:22
11703
msgid ""
11704
"Plugins (including hooks) are run on the server if all of these is true:"
11705
msgstr ""
11706
11707
#: en/help_topics/hooks.txt:24
11708
msgid ""
11709
" * The connection is via a smart server (accessed with a URL starting with\n"
11710
" \"bzr://\", \"bzr+ssh://\" or \"bzr+http://\", or accessed via a "
11711
"\"http://\"\n"
11712
" URL when a smart server is available via HTTP)."
11713
msgstr ""
11714
11715
#: en/help_topics/hooks.txt:28
11716
msgid ""
11717
" * The hook is either server specific or part of general infrastructure "
11718
"rather\n"
11719
" than client specific code (such as commit)."
11720
msgstr ""
11721
11722
#: en/help_topics/hooks.txt:31
11723
msgid ""
11724
"\n"
11725
"BranchHooks\n"
11726
"-----------"
11727
msgstr ""
11728
11729
#: en/help_topics/hooks.txt:35
11730
msgid ""
11731
"automatic_tag_name\n"
11732
"~~~~~~~~~~~~~~~~~~"
11733
msgstr ""
11734
11735
#: en/help_topics/hooks.txt:38 en/help_topics/hooks.txt:56
11736
#: en/help_topics/hooks.txt:102 en/help_topics/hooks.txt:262
11737
msgid "Introduced in: 2.2"
11738
msgstr ""
11739
11740
#: en/help_topics/hooks.txt:40
11741
msgid ""
11742
"Called to determine an automatic tag name for a revision.\n"
11743
"automatic_tag_name is called with (branch, revision_id) and should\n"
11744
"return a tag name or None if no tag name could be determined. The\n"
11745
"first non-None tag name returned will be used."
11746
msgstr ""
11747
11748
#: en/help_topics/hooks.txt:45
11749
msgid ""
11750
"open\n"
11751
"~~~~"
11752
msgstr ""
11753
11754
#: en/help_topics/hooks.txt:48 en/help_topics/hooks.txt:293
11755
#: en/help_topics/hooks.txt:307
11756
msgid "Introduced in: 1.8"
11757
msgstr ""
11758
11759
#: en/help_topics/hooks.txt:50
11760
msgid ""
11761
"Called with the Branch object that has been opened after a branch is\n"
11762
"opened."
11763
msgstr ""
11764
11765
#: en/help_topics/hooks.txt:53
11766
msgid ""
11767
"post_branch_init\n"
11768
"~~~~~~~~~~~~~~~~"
11769
msgstr ""
11770
11771
#: en/help_topics/hooks.txt:58
11772
msgid ""
11773
"Called after new branch initialization completes. post_branch_init is\n"
11774
"called with a bzrlib.branch.BranchInitHookParams. Note that init,\n"
11775
"branch and checkout (both heavyweight and lightweight) will all\n"
11776
"trigger this hook."
11777
msgstr ""
11778
11779
#: en/help_topics/hooks.txt:63
11780
msgid ""
11781
"post_change_branch_tip\n"
11782
"~~~~~~~~~~~~~~~~~~~~~~"
11783
msgstr ""
11784
11785
#: en/help_topics/hooks.txt:66 en/help_topics/hooks.txt:421
11786
msgid "Introduced in: 1.4"
11787
msgstr ""
11788
11789
#: en/help_topics/hooks.txt:68
11790
msgid ""
11791
"Called in bzr client and server after a change to the tip of a branch\n"
11792
"is made. post_change_branch_tip is called with a\n"
11793
"bzrlib.branch.ChangeBranchTipParams. Note that push, pull, commit,\n"
11794
"uncommit will all trigger this hook."
11795
msgstr ""
11796
11797
#: en/help_topics/hooks.txt:73 en/help_topics/hooks.txt:392
11798
msgid ""
11799
"post_commit\n"
11800
"~~~~~~~~~~~"
11801
msgstr ""
11802
11803
#: en/help_topics/hooks.txt:76 en/help_topics/hooks.txt:86
11804
#: en/help_topics/hooks.txt:94 en/help_topics/hooks.txt:110
11805
msgid "Introduced in: 0.15"
11806
msgstr ""
11807
11808
#: en/help_topics/hooks.txt:78
11809
msgid ""
11810
"Called in the bzr client after a commit has completed. post_commit is\n"
11811
"called with (local, master, old_revno, old_revid, new_revno,\n"
11812
"new_revid). old_revid is NULL_REVISION for the first commit to a\n"
11813
"branch."
11814
msgstr ""
11815
11816
#: en/help_topics/hooks.txt:83
11817
msgid ""
11818
"post_pull\n"
11819
"~~~~~~~~~"
11820
msgstr ""
11821
11822
#: en/help_topics/hooks.txt:88
11823
msgid ""
11824
"Called after a pull operation completes. post_pull is called with a\n"
11825
"bzrlib.branch.PullResult object and only runs in the bzr client."
11826
msgstr ""
11827
11828
#: en/help_topics/hooks.txt:91
11829
msgid ""
11830
"post_push\n"
11831
"~~~~~~~~~"
11832
msgstr ""
11833
11834
#: en/help_topics/hooks.txt:96
11835
msgid ""
11836
"Called after a push operation completes. post_push is called with a\n"
11837
"bzrlib.branch.BranchPushResult object and only runs in the bzr client."
11838
msgstr ""
11839
11840
#: en/help_topics/hooks.txt:99
11841
msgid ""
11842
"post_switch\n"
11843
"~~~~~~~~~~~"
11844
msgstr ""
11845
11846
#: en/help_topics/hooks.txt:104
11847
msgid ""
11848
"Called after a checkout switches branch. post_switch is called with a\n"
11849
"bzrlib.branch.SwitchHookParams."
11850
msgstr ""
11851
11852
#: en/help_topics/hooks.txt:107
11853
msgid ""
11854
"post_uncommit\n"
11855
"~~~~~~~~~~~~~"
11856
msgstr ""
11857
11858
#: en/help_topics/hooks.txt:112
11859
msgid ""
11860
"Called in the bzr client after an uncommit completes. post_uncommit is\n"
11861
"called with (local, master, old_revno, old_revid, new_revno,\n"
11862
"new_revid) where local is the local branch or None, master is the\n"
11863
"target branch, and an empty branch receives new_revno of 0, new_revid\n"
11864
"of None."
11865
msgstr ""
11866
11867
#: en/help_topics/hooks.txt:118
11868
msgid ""
11869
"pre_change_branch_tip\n"
11870
"~~~~~~~~~~~~~~~~~~~~~"
11871
msgstr ""
11872
11873
#: en/help_topics/hooks.txt:121
11874
msgid "Introduced in: 1.6"
11875
msgstr ""
11876
11877
#: en/help_topics/hooks.txt:123
11878
msgid ""
11879
"Called in bzr client and server before a change to the tip of a branch\n"
11880
"is made. pre_change_branch_tip is called with a\n"
11881
"bzrlib.branch.ChangeBranchTipParams. Note that push, pull, commit,\n"
11882
"uncommit will all trigger this hook."
11883
msgstr ""
11884
11885
#: en/help_topics/hooks.txt:128
11886
msgid ""
11887
"pre_commit\n"
11888
"~~~~~~~~~~"
11889
msgstr ""
11890
11891
#: en/help_topics/hooks.txt:131
11892
msgid "Introduced in: 0.91"
11893
msgstr ""
11894
11895
#: en/help_topics/hooks.txt:133
11896
msgid ""
11897
"Called after a commit is calculated but before it is completed.\n"
11898
"pre_commit is called with (local, master, old_revno, old_revid,\n"
11899
"future_revno, future_revid, tree_delta, future_tree). old_revid is\n"
11900
"NULL_REVISION for the first commit to a branch, tree_delta is a\n"
11901
"TreeDelta object describing changes from the basis revision. hooks\n"
11902
"MUST NOT modify this delta. future_tree is an in-memory tree obtained\n"
11903
"from CommitBuilder.revision_tree() and hooks MUST NOT modify this\n"
11904
"tree."
11905
msgstr ""
11906
11907
#: en/help_topics/hooks.txt:142
11908
msgid ""
11909
"transform_fallback_location\n"
11910
"~~~~~~~~~~~~~~~~~~~~~~~~~~~"
11911
msgstr ""
11912
11913
#: en/help_topics/hooks.txt:145
11914
msgid "Introduced in: 1.9"
11915
msgstr ""
11916
11917
#: en/help_topics/hooks.txt:147
11918
msgid ""
11919
"Called when a stacked branch is activating its fallback locations.\n"
11920
"transform_fallback_location is called with (branch, url), and should\n"
11921
"return a new url. Returning the same url allows it to be used as-is,\n"
11922
"returning a different one can be used to cause the branch to stack on\n"
11923
"a closer copy of that fallback_location. Note that the branch cannot\n"
11924
"have history accessing methods called on it during this hook because\n"
11925
"the fallback locations have not been activated. When there are\n"
11926
"multiple hooks installed for transform_fallback_location, all are\n"
11927
"called with the url returned from the previous hook.The order is\n"
11928
"however undefined."
11929
msgstr ""
11930
11931
#: en/help_topics/hooks.txt:158
11932
msgid ""
11933
"CommandHooks\n"
11934
"------------"
11935
msgstr ""
11936
11937
#: en/help_topics/hooks.txt:161
11938
msgid ""
11939
"extend_command\n"
11940
"~~~~~~~~~~~~~~"
11941
msgstr ""
11942
11943
#: en/help_topics/hooks.txt:164
11944
msgid "Introduced in: 1.13"
11945
msgstr ""
11946
11947
#: en/help_topics/hooks.txt:166
11948
msgid ""
11949
"Called after creating a command object to allow modifications such as\n"
11950
"adding or removing options, docs etc. Called with the new\n"
11951
"bzrlib.commands.Command object."
11952
msgstr ""
11953
11954
#: en/help_topics/hooks.txt:170
11955
msgid ""
11956
"get_command\n"
11957
"~~~~~~~~~~~"
11958
msgstr ""
11959
11960
#: en/help_topics/hooks.txt:173 en/help_topics/hooks.txt:185
11961
#: en/help_topics/hooks.txt:194 en/help_topics/hooks.txt:467
11962
msgid "Introduced in: 1.17"
11963
msgstr ""
11964
11965
#: en/help_topics/hooks.txt:175
11966
msgid ""
11967
"Called when creating a single command. Called with (cmd_or_None,\n"
11968
"command_name). get_command should either return the cmd_or_None\n"
11969
"parameter, or a replacement Command object that should be used for the\n"
11970
"command. Note that the Command.hooks hooks are core infrastructure.\n"
11971
"Many users will prefer to use bzrlib.commands.register_command or\n"
11972
"plugin_cmds.register_lazy."
11973
msgstr ""
11974
11975
#: en/help_topics/hooks.txt:182
11976
msgid ""
11977
"get_missing_command\n"
11978
"~~~~~~~~~~~~~~~~~~~"
11979
msgstr ""
11980
11981
#: en/help_topics/hooks.txt:187
11982
msgid ""
11983
"Called when creating a single command if no command could be found.\n"
11984
"Called with (command_name). get_missing_command should either return\n"
11985
"None, or a Command object to be used for the command."
11986
msgstr ""
11987
11988
#: en/help_topics/hooks.txt:191
11989
msgid ""
11990
"list_commands\n"
11991
"~~~~~~~~~~~~~"
11992
msgstr ""
11993
11994
#: en/help_topics/hooks.txt:196
11995
msgid ""
11996
"Called when enumerating commands. Called with a set of cmd_name\n"
11997
"strings for all the commands found so far. This set is safe to mutate\n"
11998
"- e.g. to remove a command. list_commands should return the updated\n"
11999
"set of command names."
12000
msgstr ""
12001
12002
#: en/help_topics/hooks.txt:201
12003
msgid ""
12004
"post_command\n"
12005
"~~~~~~~~~~~~"
12006
msgstr ""
12007
12008
#: en/help_topics/hooks.txt:204 en/help_topics/hooks.txt:211
12009
msgid "Introduced in: 2.6"
12010
msgstr ""
12011
12012
#: en/help_topics/hooks.txt:206
12013
msgid "Called after executing a command. Called with the command object."
12014
msgstr ""
12015
12016
#: en/help_topics/hooks.txt:208
12017
msgid ""
12018
"pre_command\n"
12019
"~~~~~~~~~~~"
12020
msgstr ""
12021
12022
#: en/help_topics/hooks.txt:213
12023
msgid "Called prior to executing a command. Called with the command object."
12024
msgstr ""
12025
12026
#: en/help_topics/hooks.txt:215
12027
msgid ""
12028
"_ConfigHooks\n"
12029
"------------"
12030
msgstr ""
12031
12032
#: en/help_topics/hooks.txt:218
12033
msgid ""
12034
"get\n"
12035
"~~~"
12036
msgstr ""
12037
12038
#: en/help_topics/hooks.txt:221 en/help_topics/hooks.txt:229
12039
#: en/help_topics/hooks.txt:236 en/help_topics/hooks.txt:244
12040
#: en/help_topics/hooks.txt:251 en/help_topics/hooks.txt:373
12041
#: en/help_topics/hooks.txt:446
12042
msgid "Introduced in: 2.4"
12043
msgstr ""
12044
12045
#: en/help_topics/hooks.txt:223
12046
msgid ""
12047
"Invoked when a config option is read. The signature is (stack, name,\n"
12048
"value)."
12049
msgstr ""
12050
12051
#: en/help_topics/hooks.txt:226
12052
msgid ""
12053
"load\n"
12054
"~~~~"
12055
msgstr ""
12056
12057
#: en/help_topics/hooks.txt:231
12058
msgid "Invoked when a config store is loaded. The signature is (store)."
12059
msgstr ""
12060
12061
#: en/help_topics/hooks.txt:233
12062
msgid ""
12063
"remove\n"
12064
"~~~~~~"
12065
msgstr ""
12066
12067
#: en/help_topics/hooks.txt:238
12068
msgid ""
12069
"Invoked when a config option is removed. The signature is (stack,\n"
12070
"name)."
12071
msgstr ""
12072
12073
#: en/help_topics/hooks.txt:241
12074
msgid ""
12075
"save\n"
12076
"~~~~"
12077
msgstr ""
12078
12079
#: en/help_topics/hooks.txt:246
12080
msgid "Invoked when a config store is saved. The signature is (store)."
12081
msgstr ""
12082
12083
#: en/help_topics/hooks.txt:248
12084
msgid ""
12085
"set\n"
12086
"~~~"
12087
msgstr ""
12088
12089
#: en/help_topics/hooks.txt:253
12090
msgid ""
12091
"Invoked when a config option is set. The signature is (stack, name,\n"
12092
"value)."
12093
msgstr ""
12094
12095
#: en/help_topics/hooks.txt:256
12096
msgid ""
12097
"ControlDirHooks\n"
12098
"---------------"
12099
msgstr ""
12100
12101
#: en/help_topics/hooks.txt:259
12102
msgid ""
12103
"post_repo_init\n"
12104
"~~~~~~~~~~~~~~"
12105
msgstr ""
12106
12107
#: en/help_topics/hooks.txt:264
12108
msgid ""
12109
"Invoked after a repository has been initialized. post_repo_init is\n"
12110
"called with a bzrlib.controldir.RepoInitHookParams."
12111
msgstr ""
12112
12113
#: en/help_topics/hooks.txt:267
12114
msgid ""
12115
"pre_open\n"
12116
"~~~~~~~~"
12117
msgstr ""
12118
12119
#: en/help_topics/hooks.txt:270
12120
msgid "Introduced in: 1.14"
12121
msgstr ""
12122
12123
#: en/help_topics/hooks.txt:272
12124
msgid ""
12125
"Invoked before attempting to open a ControlDir with the transport that\n"
12126
"the open will use."
12127
msgstr ""
12128
12129
#: en/help_topics/hooks.txt:275
12130
msgid ""
12131
"InfoHooks\n"
12132
"---------"
12133
msgstr ""
12134
12135
#: en/help_topics/hooks.txt:278
12136
msgid ""
12137
"repository\n"
12138
"~~~~~~~~~~"
12139
msgstr ""
12140
12141
#: en/help_topics/hooks.txt:281 en/help_topics/hooks.txt:300
12142
#: en/help_topics/hooks.txt:524
12143
msgid "Introduced in: 1.15"
12144
msgstr ""
12145
12146
#: en/help_topics/hooks.txt:283
12147
msgid ""
12148
"Invoked when displaying the statistics for a repository. repository is\n"
12149
"called with a statistics dictionary as returned by the repository and\n"
12150
"a file-like object to write to."
12151
msgstr ""
12152
12153
#: en/help_topics/hooks.txt:287
12154
msgid ""
12155
"LockHooks\n"
12156
"---------"
12157
msgstr ""
12158
12159
#: en/help_topics/hooks.txt:290
12160
msgid ""
12161
"lock_acquired\n"
12162
"~~~~~~~~~~~~~"
12163
msgstr ""
12164
12165
#: en/help_topics/hooks.txt:295
12166
msgid ""
12167
"Called with a bzrlib.lock.LockResult when a physical lock is acquired."
12168
msgstr ""
12169
12170
#: en/help_topics/hooks.txt:297
12171
msgid ""
12172
"lock_broken\n"
12173
"~~~~~~~~~~~"
12174
msgstr ""
12175
12176
#: en/help_topics/hooks.txt:302
12177
msgid "Called with a bzrlib.lock.LockResult when a physical lock is broken."
12178
msgstr ""
12179
12180
#: en/help_topics/hooks.txt:304
12181
msgid ""
12182
"lock_released\n"
12183
"~~~~~~~~~~~~~"
12184
msgstr ""
12185
12186
#: en/help_topics/hooks.txt:309
12187
msgid ""
12188
"Called with a bzrlib.lock.LockResult when a physical lock is released."
12189
msgstr ""
12190
12191
#: en/help_topics/hooks.txt:311
12192
msgid ""
12193
"MergeHooks\n"
12194
"----------"
12195
msgstr ""
12196
12197
#: en/help_topics/hooks.txt:314
12198
msgid ""
12199
"merge_file_content\n"
12200
"~~~~~~~~~~~~~~~~~~"
12201
msgstr ""
12202
12203
#: en/help_topics/hooks.txt:317
12204
msgid "Introduced in: 2.1"
12205
msgstr ""
12206
12207
#: en/help_topics/hooks.txt:319
12208
msgid ""
12209
"Called with a bzrlib.merge.Merger object to create a per file merge\n"
12210
"object when starting a merge. Should return either None or a subclass\n"
12211
"of ``bzrlib.merge.AbstractPerFileMerger``. Such objects will then be\n"
12212
"called per file that needs to be merged (including when one side has\n"
12213
"deleted the file and the other has changed it). See the\n"
12214
"AbstractPerFileMerger API docs for details on how it is used by merge."
12215
msgstr ""
12216
12217
#: en/help_topics/hooks.txt:326
12218
msgid ""
12219
"post_merge\n"
12220
"~~~~~~~~~~"
12221
msgstr ""
12222
12223
#: en/help_topics/hooks.txt:329 en/help_topics/hooks.txt:337
12224
#: en/help_topics/hooks.txt:387 en/help_topics/hooks.txt:405
12225
#: en/help_topics/hooks.txt:413 en/help_topics/hooks.txt:512
12226
msgid "Introduced in: 2.5"
12227
msgstr ""
12228
12229
#: en/help_topics/hooks.txt:331
12230
msgid ""
12231
"Called after a merge. Receives a Merger object as the single argument.\n"
12232
"The return value is ignored."
12233
msgstr ""
12234
12235
#: en/help_topics/hooks.txt:334
12236
msgid ""
12237
"pre_merge\n"
12238
"~~~~~~~~~"
12239
msgstr ""
12240
12241
#: en/help_topics/hooks.txt:339
12242
msgid ""
12243
"Called before a merge. Receives a Merger object as the single\n"
12244
"argument."
12245
msgstr ""
12246
12247
#: en/help_topics/hooks.txt:342
12248
msgid ""
12249
"MergeDirectiveHooks\n"
12250
"-------------------"
12251
msgstr ""
12252
12253
#: en/help_topics/hooks.txt:345
12254
msgid ""
12255
"merge_request_body\n"
12256
"~~~~~~~~~~~~~~~~~~"
12257
msgstr ""
12258
12259
#: en/help_topics/hooks.txt:348
12260
msgid "Introduced in: 1.15.0"
12261
msgstr ""
12262
12263
#: en/help_topics/hooks.txt:350
12264
msgid ""
12265
"Called with a MergeRequestBodyParams when a body is needed for a merge\n"
12266
"request. Callbacks must return a body. If more than one callback is\n"
12267
"registered, the output of one callback is provided to the next."
12268
msgstr ""
12269
12270
#: en/help_topics/hooks.txt:354
12271
msgid ""
12272
"MessageEditorHooks\n"
12273
"------------------"
12274
msgstr ""
12275
12276
#: en/help_topics/hooks.txt:357
12277
msgid ""
12278
"commit_message_template\n"
12279
"~~~~~~~~~~~~~~~~~~~~~~~"
12280
msgstr ""
12281
12282
#: en/help_topics/hooks.txt:360
12283
msgid "Introduced in: 1.10"
12284
msgstr ""
12285
12286
#: en/help_topics/hooks.txt:362
12287
msgid ""
12288
"Called when a commit message is being generated.\n"
12289
"commit_message_template is called with the bzrlib.commit.Commit object\n"
12290
"and the message that is known so far. commit_message_template must\n"
12291
"return a new message to use (which could be the same as it was given).\n"
12292
"When there are multiple hooks registered for commit_message_template,\n"
12293
"they are chained with the result from the first passed into the\n"
12294
"second, and so on."
12295
msgstr ""
12296
12297
#: en/help_topics/hooks.txt:370
12298
msgid ""
12299
"set_commit_message\n"
12300
"~~~~~~~~~~~~~~~~~~"
12301
msgstr ""
12302
12303
#: en/help_topics/hooks.txt:375
12304
msgid ""
12305
"Set a fixed commit message. set_commit_message is called with the\n"
12306
"bzrlib.commit.Commit object (so you can also change e.g. revision\n"
12307
"properties by editing commit.builder._revprops) and the message so\n"
12308
"far. set_commit_message must return the message to use or None if it\n"
12309
"should use the message editor as normal."
12310
msgstr ""
12311
12312
#: en/help_topics/hooks.txt:381
12313
msgid ""
12314
"MutableTreeHooks\n"
12315
"----------------"
12316
msgstr ""
12317
12318
#: en/help_topics/hooks.txt:384
12319
msgid ""
12320
"post_build_tree\n"
12321
"~~~~~~~~~~~~~~~"
12322
msgstr ""
12323
12324
#: en/help_topics/hooks.txt:389
12325
msgid ""
12326
"Called after a completely new tree is built. The hook is called with\n"
12327
"the tree as its only argument."
12328
msgstr ""
12329
12330
#: en/help_topics/hooks.txt:395
12331
msgid "Introduced in: 2.0"
12332
msgstr ""
12333
12334
#: en/help_topics/hooks.txt:397
12335
msgid ""
12336
"Called after a commit is performed on a tree. The hook is called with\n"
12337
"a bzrlib.mutabletree.PostCommitHookParams object. The mutable tree the\n"
12338
"commit was performed on is available via the mutable_tree attribute of\n"
12339
"that object."
12340
msgstr ""
12341
12342
#: en/help_topics/hooks.txt:402
12343
msgid ""
12344
"post_transform\n"
12345
"~~~~~~~~~~~~~~"
12346
msgstr ""
12347
12348
#: en/help_topics/hooks.txt:407
12349
msgid ""
12350
"Called after a tree transform has been performed on a tree. The hook\n"
12351
"is called with the tree that is being transformed and the transform."
12352
msgstr ""
12353
12354
#: en/help_topics/hooks.txt:410
12355
msgid ""
12356
"pre_transform\n"
12357
"~~~~~~~~~~~~~"
12358
msgstr ""
12359
12360
#: en/help_topics/hooks.txt:415
12361
msgid ""
12362
"Called before a tree transform on this tree. The hook is called with\n"
12363
"the tree that is being transformed and the transform."
12364
msgstr ""
12365
12366
#: en/help_topics/hooks.txt:418
12367
msgid ""
12368
"start_commit\n"
12369
"~~~~~~~~~~~~"
12370
msgstr ""
12371
12372
#: en/help_topics/hooks.txt:423
12373
msgid ""
12374
"Called before a commit is performed on a tree. The start commit hook\n"
12375
"is able to change the tree before the commit takes place. start_commit\n"
12376
"is called with the bzrlib.mutabletree.MutableTree that the commit is\n"
12377
"being performed on."
12378
msgstr ""
12379
12380
#: en/help_topics/hooks.txt:428
12381
msgid ""
12382
"SmartClientHooks\n"
12383
"----------------"
12384
msgstr ""
12385
12386
#: en/help_topics/hooks.txt:431
12387
msgid ""
12388
"call\n"
12389
"~~~~"
12390
msgstr ""
12391
12392
#: en/help_topics/hooks.txt:434
12393
msgid "Introduced in: unknown"
12394
msgstr ""
12395
12396
#: en/help_topics/hooks.txt:436
12397
msgid ""
12398
"Called when the smart client is submitting a request to the smart\n"
12399
"server. Called with a bzrlib.smart.client.CallHookParams object.\n"
12400
"Streaming request bodies, and responses, are not accessible."
12401
msgstr ""
12402
12403
#: en/help_topics/hooks.txt:440
12404
msgid ""
12405
"SmartServerHooks\n"
12406
"----------------"
12407
msgstr ""
12408
12409
#: en/help_topics/hooks.txt:443
12410
msgid ""
12411
"server_exception\n"
12412
"~~~~~~~~~~~~~~~~"
12413
msgstr ""
12414
12415
#: en/help_topics/hooks.txt:448
12416
msgid ""
12417
"Called by the bzr server when an exception occurs. server_exception is\n"
12418
"called with the sys.exc_info() tuple return true for the hook if the\n"
12419
"exception has been handled, in which case the server will exit\n"
12420
"normally."
12421
msgstr ""
12422
12423
#: en/help_topics/hooks.txt:453
12424
msgid ""
12425
"server_started\n"
12426
"~~~~~~~~~~~~~~"
12427
msgstr ""
12428
12429
#: en/help_topics/hooks.txt:456 en/help_topics/hooks.txt:475
12430
msgid "Introduced in: 0.16"
12431
msgstr ""
12432
12433
#: en/help_topics/hooks.txt:458
12434
msgid ""
12435
"Called by the bzr server when it starts serving a directory.\n"
12436
"server_started is called with (backing urls, public url), where\n"
12437
"backing_url is a list of URLs giving the server-specific directory\n"
12438
"locations, and public_url is the public URL for the directory being\n"
12439
"served."
12440
msgstr ""
12441
12442
#: en/help_topics/hooks.txt:464
12443
msgid ""
12444
"server_started_ex\n"
12445
"~~~~~~~~~~~~~~~~~"
12446
msgstr ""
12447
12448
#: en/help_topics/hooks.txt:469
12449
msgid ""
12450
"Called by the bzr server when it starts serving a directory.\n"
12451
"server_started is called with (backing_urls, server_obj)."
12452
msgstr ""
12453
12454
#: en/help_topics/hooks.txt:472
12455
msgid ""
12456
"server_stopped\n"
12457
"~~~~~~~~~~~~~~"
12458
msgstr ""
12459
12460
#: en/help_topics/hooks.txt:477
12461
msgid ""
12462
"Called by the bzr server when it stops serving a directory.\n"
12463
"server_stopped is called with the same parameters as the\n"
12464
"server_started hook: (backing_urls, public_url)."
12465
msgstr ""
12466
12467
#: en/help_topics/hooks.txt:481
12468
msgid ""
12469
"StatusHooks\n"
12470
"-----------"
12471
msgstr ""
12472
12473
#: en/help_topics/hooks.txt:484
12474
msgid ""
12475
"post_status\n"
12476
"~~~~~~~~~~~"
12477
msgstr ""
12478
12479
#: en/help_topics/hooks.txt:487 en/help_topics/hooks.txt:498
12480
msgid "Introduced in: 2.3"
12481
msgstr ""
12482
12483
#: en/help_topics/hooks.txt:489
12484
msgid ""
12485
"Called with argument StatusHookParams after Bazaar has displayed the\n"
12486
"status. StatusHookParams has the attributes (old_tree, new_tree,\n"
12487
"to_file, versioned, show_ids, short, verbose). The last four arguments\n"
12488
"correspond to the command line options specified by the user for the\n"
12489
"status command. to_file is the output stream for writing."
12490
msgstr ""
12491
12492
#: en/help_topics/hooks.txt:495
12493
msgid ""
12494
"pre_status\n"
12495
"~~~~~~~~~~"
12496
msgstr ""
12497
12498
#: en/help_topics/hooks.txt:500
12499
msgid ""
12500
"Called with argument StatusHookParams before Bazaar displays the\n"
12501
"status. StatusHookParams has the attributes (old_tree, new_tree,\n"
12502
"to_file, versioned, show_ids, short, verbose). The last four arguments\n"
12503
"correspond to the command line options specified by the user for the\n"
12504
"status command. to_file is the output stream for writing."
12505
msgstr ""
12506
12507
#: en/help_topics/hooks.txt:506
12508
msgid ""
12509
"TransportHooks\n"
12510
"--------------"
12511
msgstr ""
12512
12513
#: en/help_topics/hooks.txt:509
12514
msgid ""
12515
"post_connect\n"
12516
"~~~~~~~~~~~~"
12517
msgstr ""
12518
12519
#: en/help_topics/hooks.txt:514
12520
msgid ""
12521
"Called after a new connection is established or a reconnect occurs.\n"
12522
"The sole argument passed is either the connected transport or smart\n"
12523
"medium instance."
12524
msgstr ""
12525
12526
#: en/help_topics/hooks.txt:518
12527
msgid ""
12528
"RioVersionInfoBuilderHooks\n"
12529
"--------------------------"
12530
msgstr ""
12531
12532
#: en/help_topics/hooks.txt:521
12533
msgid ""
12534
"revision\n"
12535
"~~~~~~~~"
12536
msgstr ""
12537
12538
#: en/help_topics/hooks.txt:526
12539
msgid ""
12540
"Invoked when adding information about a revision to the RIO stanza\n"
12541
"that is printed. revision is called with a revision object and a RIO\n"
12542
"stanza.\n"
12543
msgstr ""
12544
12545
#: en/help_topics/location-alias.txt:1
12546
msgid ""
12547
"Location aliases\n"
12548
"================"
12549
msgstr ""
12550
12551
#: en/help_topics/location-alias.txt:4
12552
msgid ""
12553
"Bazaar defines several aliases for locations associated with a branch. "
12554
"These\n"
12555
"can be used with most commands that expect a location, such as `bzr push`."
12556
msgstr ""
12557
12558
#: en/help_topics/location-alias.txt:7
12559
msgid "The aliases are::"
12560
msgstr ""
12561
12562
#: en/help_topics/location-alias.txt:9
12563
msgid ""
12564
" :bound The branch this branch is bound to, for bound branches.\n"
12565
" :parent The parent of this branch.\n"
12566
" :public The public location of this branch.\n"
12567
" :push The saved location used for `bzr push` with no arguments.\n"
12568
" :submit The submit branch for this branch.\n"
12569
" :this This branch."
12570
msgstr ""
12571
12572
#: en/help_topics/location-alias.txt:16
12573
msgid "For example, to push to the parent location::"
12574
msgstr ""
12575
12576
#: en/help_topics/location-alias.txt:18
12577
msgid " bzr push :parent\n"
12578
msgstr ""
12579
12580
#: en/help_topics/log-formats.txt:1
12581
msgid ""
12582
"Log Formats\n"
12583
"==========="
12584
msgstr ""
12585
12586
#: en/help_topics/log-formats.txt:4
12587
msgid ""
12588
"A log format controls how information about each revision is displayed.\n"
12589
"The standard log formats are compared below::"
12590
msgstr ""
12591
12592
#: en/help_topics/log-formats.txt:7
12593
msgid ""
12594
" Feature long short line\n"
12595
" ---------------------- ------------- ------------ -------------------\n"
12596
" design goal detailed view concise view 1 revision per line\n"
12597
" committer name+email name only name only\n"
12598
" author name+email - -\n"
12599
" date-time format full date only date only\n"
12600
" commit message full full top line\n"
12601
" tags yes yes yes\n"
12602
" merges indicator - yes -\n"
12603
" status/delta optional optional -\n"
12604
" diff/patch optional optional -\n"
12605
" revision-id optional optional -\n"
12606
" branch nick yes - -\n"
12607
" foreign vcs properties yes yes -\n"
12608
" preferred levels all 1 1\n"
12609
" digital signature optional - -"
12610
msgstr ""
12611
12612
#: en/help_topics/log-formats.txt:24
12613
msgid ""
12614
"The default format is ``long``. To change this, define the ``log_format``\n"
12615
"setting in the ``[DEFAULT]`` section of ``bazaar.conf`` like this (say)::"
12616
msgstr ""
12617
12618
#: en/help_topics/log-formats.txt:27
12619
msgid ""
12620
" [DEFAULT]\n"
12621
" log_format = short"
12622
msgstr ""
12623
12624
#: en/help_topics/log-formats.txt:30
12625
msgid ""
12626
"Alternatively, to change the log format used for a given query, use the\n"
12627
"--long, --short or --line options."
12628
msgstr ""
12629
12630
#: en/help_topics/log-formats.txt:33
12631
msgid ""
12632
"If one of the standard log formats does not meet your needs, additional\n"
12633
"formats can be provided by plugins.\n"
12634
msgstr ""
12635
12636
#: en/help_topics/other-formats.txt:1
12637
msgid "Other Storage Formats"
12638
msgstr ""
12639
12640
#: en/help_topics/other-formats.txt:3
12641
msgid "Experimental formats are shown below."
12642
msgstr ""
12643
12644
#: en/help_topics/other-formats.txt:5
12645
msgid ""
12646
":development-colo:\n"
12647
" (native) The 2a format with experimental support for colocated\n"
12648
" branches."
12649
msgstr ""
12650
12651
#: en/help_topics/other-formats.txt:9
12652
msgid ""
12653
"\n"
12654
"Deprecated formats are shown below."
12655
msgstr ""
12656
12657
#: en/help_topics/other-formats.txt:12
12658
msgid ""
12659
":pack-0.92:\n"
12660
" (native) Pack-based format used in 1.x series. Introduced in 0.92.\n"
12661
" Interoperates with bzr repositories before 0.92 but cannot be read\n"
12662
" by bzr < 0.92."
12663
msgstr ""
12664
12665
#: en/help_topics/patterns.txt:1
12666
msgid ""
12667
"Patterns\n"
12668
"========"
12669
msgstr ""
12670
12671
#: en/help_topics/patterns.txt:4
12672
msgid ""
12673
"Bazaar uses patterns to match files at various times. For example,\n"
12674
"the ``add`` command skips over files that match ignore patterns\n"
12675
"and preferences can be associated with files using rule patterns.\n"
12676
"The pattern syntax is described below."
12677
msgstr ""
12678
12679
#: en/help_topics/patterns.txt:9
12680
msgid ""
12681
"Trailing slashes on patterns are ignored. If the pattern contains a\n"
12682
"slash or is a regular expression, it is compared to the whole path\n"
12683
"from the branch root. Otherwise, it is compared to only the last\n"
12684
"component of the path. To match a file only in the root directory,\n"
12685
"prepend ``./``. Patterns specifying absolute paths are not allowed."
12686
msgstr ""
12687
12688
#: en/help_topics/patterns.txt:15
12689
msgid "Patterns may include globbing wildcards such as::"
12690
msgstr ""
12691
12692
#: en/help_topics/patterns.txt:17
12693
msgid ""
12694
" ? - Matches any single character except '/'\n"
12695
" * - Matches 0 or more characters except '/'\n"
12696
" /**/ - Matches 0 or more directories in a path\n"
12697
" [a-z] - Matches a single character from within a group of characters"
12698
msgstr ""
12699
12700
#: en/help_topics/patterns.txt:22
12701
msgid ""
12702
"Patterns may also be `Python regular expressions`_. Regular expression\n"
12703
"patterns are identified by a ``RE:`` prefix followed by the regular\n"
12704
"expression. Regular expression patterns may not include named or\n"
12705
"numbered groups."
12706
msgstr ""
12707
12708
#: en/help_topics/patterns.txt:27
12709
msgid ""
12710
"Case insensitive ignore patterns can be specified with regular expressions\n"
12711
"by using the ``i`` (for ignore case) flag in the pattern."
12712
msgstr ""
12713
12714
#: en/help_topics/patterns.txt:30
12715
msgid ""
12716
"For example, a case insensitive match for ``foo`` may be specified as::"
12717
msgstr ""
12718
12719
#: en/help_topics/patterns.txt:32
12720
msgid " RE:(?i)foo"
12721
msgstr ""
12722
12723
#: en/help_topics/patterns.txt:34
12724
msgid ""
12725
"Ignore patterns may be prefixed with ``!``, which means that a filename\n"
12726
"matched by that pattern will not be ignored."
12727
msgstr ""
12728
12729
#: en/help_topics/patterns.txt:37
12730
msgid ""
12731
".. _Python regular expressions: http://docs.python.org/library/re.html"
12732
msgstr ""
12733
12734
#: en/help_topics/revisionspec.txt:1
12735
msgid "Revision Identifiers"
12736
msgstr ""
12737
12738
#: en/help_topics/revisionspec.txt:3
12739
msgid ""
12740
"A revision identifier refers to a specific state of a branch's history. It\n"
12741
"can be expressed in several ways. It can begin with a keyword to\n"
12742
"unambiguously specify a given lookup type; some examples are 'last:1',\n"
12743
"'before:yesterday' and 'submit:'."
12744
msgstr ""
12745
12746
#: en/help_topics/revisionspec.txt:8
12747
msgid ""
12748
"Alternately, it can be given without a keyword, in which case it will be\n"
12749
"checked as a revision number, a tag, a revision id, a date specification, or "
12750
"a\n"
12751
"branch specification, in that order. For example, 'date:today' could be\n"
12752
"written as simply 'today', though if you have a tag called 'today' that "
12753
"will\n"
12754
"be found first."
12755
msgstr ""
12756
12757
#: en/help_topics/revisionspec.txt:14
12758
msgid ""
12759
"If 'REV1' and 'REV2' are revision identifiers, then 'REV1..REV2' denotes a\n"
12760
"revision range. Examples: '3647..3649', 'date:yesterday..-1' and\n"
12761
"'branch:/path/to/branch1/..branch:/branch2' (note that there are no quotes "
12762
"or\n"
12763
"spaces around the '..')."
12764
msgstr ""
12765
12766
#: en/help_topics/revisionspec.txt:19
12767
msgid ""
12768
"Ranges are interpreted differently by different commands. To the \"log\" "
12769
"command,\n"
12770
"a range is a sequence of log messages, but to the \"diff\" command, the "
12771
"range\n"
12772
"denotes a change between revisions (and not a sequence of changes). In\n"
12773
"addition, \"log\" considers a closed range whereas \"diff\" and \"merge\" "
12774
"consider it\n"
12775
"to be open-ended, that is, they include one end but not the other. For "
12776
"example:\n"
12777
"\"bzr log -r 3647..3649\" shows the messages of revisions 3647, 3648 and "
12778
"3649,\n"
12779
"while \"bzr diff -r 3647..3649\" includes the changes done in revisions 3648 "
12780
"and\n"
12781
"3649, but not 3647."
12782
msgstr ""
12783
12784
#: en/help_topics/revisionspec.txt:28
12785
msgid "The keywords used as revision selection methods are the following:"
12786
msgstr ""
12787
12788
#: en/help_topics/revisionspec.txt:30
12789
msgid ""
12790
":revid:\n"
12791
"\tSelects a revision using the revision id.\n"
12792
":submit:\n"
12793
"\tSelects a common ancestor with the submit branch.\n"
12794
":ancestor:\n"
12795
"\tSelects a common ancestor with a second branch.\n"
12796
":date:\n"
12797
"\tSelects a revision on the basis of a datestamp.\n"
12798
":branch:\n"
12799
"\tSelects the last revision of a specified branch.\n"
12800
":tag:\n"
12801
"\tSelects a revision identified by a tag name.\n"
12802
":revno:\n"
12803
"\tSelects a revision using a number.\n"
12804
":before:\n"
12805
"\tSelects the parent of the revision specified.\n"
12806
":annotate:\n"
12807
"\tSelect the revision that last modified the specified line.\n"
12808
":mainline:\n"
12809
"\tSelect mainline revision that merged the specified revision.\n"
12810
":last:\n"
12811
"\tSelects the nth revision from the end."
12812
msgstr ""
12813
12814
#: en/help_topics/revisionspec.txt:53
12815
msgid "In addition, plugins can provide other keywords."
12816
msgstr ""
12817
12818
#: en/help_topics/revisionspec.txt:55
12819
msgid "A detailed description of each keyword is given below."
12820
msgstr ""
12821
12822
#: en/help_topics/revisionspec.txt:57
12823
msgid ":revid:"
12824
msgstr ""
12825
12826
#: en/help_topics/revisionspec.txt:59
12827
msgid ""
12828
" Supply a specific revision id, that can be used to specify any\n"
12829
" revision id in the ancestry of the branch.\n"
12830
" Including merges, and pending merges.\n"
12831
" Examples::"
12832
msgstr ""
12833
12834
#: en/help_topics/revisionspec.txt:64
12835
msgid ""
12836
" revid:aaaa@bbbb-123456789 -> Select revision 'aaaa@bbbb-123456789'"
12837
msgstr ""
12838
12839
#: en/help_topics/revisionspec.txt:66
12840
msgid ":submit:"
12841
msgstr ""
12842
12843
#: en/help_topics/revisionspec.txt:68
12844
msgid ""
12845
" Diffing against this shows all the changes that were made in this "
12846
"branch,\n"
12847
" and is a good predictor of what merge will do. The submit branch is\n"
12848
" used by the bundle and merge directive commands. If no submit branch\n"
12849
" is specified, the parent branch is used instead."
12850
msgstr ""
12851
12852
#: en/help_topics/revisionspec.txt:73 en/help_topics/revisionspec.txt:85
12853
msgid ""
12854
" The common ancestor is the last revision that existed in both\n"
12855
" branches. Usually this is the branch point, but it could also be\n"
12856
" a revision that was merged."
12857
msgstr ""
12858
12859
#: en/help_topics/revisionspec.txt:77 en/help_topics/revisionspec.txt:93
12860
#: en/help_topics/revisionspec.txt:109 en/help_topics/revisionspec.txt:119
12861
#: en/help_topics/revisionspec.txt:153
12862
msgid " Examples::"
12863
msgstr ""
12864
12865
#: en/help_topics/revisionspec.txt:79
12866
msgid " $ bzr diff -r submit:"
12867
msgstr ""
12868
12869
#: en/help_topics/revisionspec.txt:81
12870
msgid ":ancestor:"
12871
msgstr ""
12872
12873
#: en/help_topics/revisionspec.txt:83
12874
msgid " Supply the path to a branch to select the common ancestor."
12875
msgstr ""
12876
12877
#: en/help_topics/revisionspec.txt:89
12878
msgid ""
12879
" This is frequently used with 'diff' to return all of the changes\n"
12880
" that your branch introduces, while excluding the changes that you\n"
12881
" have not merged from the remote branch."
12882
msgstr ""
12883
12884
#: en/help_topics/revisionspec.txt:95
12885
msgid ""
12886
" ancestor:/path/to/branch\n"
12887
" $ bzr diff -r ancestor:../../mainline/branch"
12888
msgstr ""
12889
12890
#: en/help_topics/revisionspec.txt:98
12891
msgid ":date:"
12892
msgstr ""
12893
12894
#: en/help_topics/revisionspec.txt:100
12895
msgid ""
12896
" Supply a datestamp to select the first revision that matches the date.\n"
12897
" Date can be 'yesterday', 'today', 'tomorrow' or a YYYY-MM-DD string.\n"
12898
" Matches the first entry after a given date (either at midnight or\n"
12899
" at a specified time)."
12900
msgstr ""
12901
12902
#: en/help_topics/revisionspec.txt:105
12903
msgid " One way to display all the changes since yesterday would be::"
12904
msgstr ""
12905
12906
#: en/help_topics/revisionspec.txt:107
12907
msgid " bzr log -r date:yesterday.."
12908
msgstr ""
12909
12910
#: en/help_topics/revisionspec.txt:111
12911
msgid ""
12912
" date:yesterday -> select the first revision since "
12913
"yesterday\n"
12914
" date:2006-08-14,17:10:14 -> select the first revision after\n"
12915
" August 14th, 2006 at 5:10pm."
12916
msgstr ""
12917
12918
#: en/help_topics/revisionspec.txt:115
12919
msgid ":branch:"
12920
msgstr ""
12921
12922
#: en/help_topics/revisionspec.txt:117
12923
msgid " Supply the path to a branch to select its last revision."
12924
msgstr ""
12925
12926
#: en/help_topics/revisionspec.txt:121
12927
msgid " branch:/path/to/branch"
12928
msgstr ""
12929
12930
#: en/help_topics/revisionspec.txt:123
12931
msgid ":tag:"
12932
msgstr ""
12933
12934
#: en/help_topics/revisionspec.txt:125
12935
msgid " Tags are stored in the branch and created by the 'tag' command."
12936
msgstr ""
12937
12938
#: en/help_topics/revisionspec.txt:127
12939
msgid ":revno:"
12940
msgstr ""
12941
12942
#: en/help_topics/revisionspec.txt:129
12943
msgid ""
12944
" Use an integer to specify a revision in the history of the branch.\n"
12945
" Optionally a branch can be specified. A negative number will count\n"
12946
" from the end of the branch (-1 is the last revision, -2 the previous\n"
12947
" one). If the negative number is larger than the branch's history, the\n"
12948
" first revision is returned.\n"
12949
" Examples::"
12950
msgstr ""
12951
12952
#: en/help_topics/revisionspec.txt:136
12953
msgid ""
12954
" revno:1 -> return the first revision of this branch\n"
12955
" revno:3:/path/to/branch -> return the 3rd revision of\n"
12956
" the branch '/path/to/branch'\n"
12957
" revno:-1 -> The last revision in a branch.\n"
12958
" -2:http://other/branch -> The second to last revision in the\n"
12959
" remote branch.\n"
12960
" -1000000 -> Most likely the first revision, unless\n"
12961
" your history is very long."
12962
msgstr ""
12963
12964
#: en/help_topics/revisionspec.txt:145
12965
msgid ":before:"
12966
msgstr ""
12967
12968
#: en/help_topics/revisionspec.txt:147
12969
msgid ""
12970
" Supply any revision spec to return the parent of that revision. This "
12971
"is\n"
12972
" mostly useful when inspecting revisions that are not in the revision "
12973
"history\n"
12974
" of a branch."
12975
msgstr ""
12976
12977
#: en/help_topics/revisionspec.txt:151
12978
msgid ""
12979
" It is an error to request the parent of the null revision (before:0)."
12980
msgstr ""
12981
12982
#: en/help_topics/revisionspec.txt:155
12983
msgid ""
12984
" before:1913 -> Return the parent of revno 1913 (revno 1912)\n"
12985
" before:revid:aaaa@bbbb-1234567890 -> return the parent of revision\n"
12986
" aaaa@bbbb-1234567890\n"
12987
" bzr diff -r before:1913..1913\n"
12988
" -> Find the changes between revision 1913 and its parent "
12989
"(1912).\n"
12990
" (What changes did revision 1913 introduce).\n"
12991
" This is equivalent to: bzr diff -c 1913"
12992
msgstr ""
12993
12994
#: en/help_topics/revisionspec.txt:163
12995
msgid ":annotate:"
12996
msgstr ""
12997
12998
#: en/help_topics/revisionspec.txt:165
12999
msgid ""
13000
" Select the revision that last modified the specified line. Line is\n"
13001
" specified as path:number. Path is a relative path to the file. "
13002
"Numbers\n"
13003
" start at 1, and are relative to the current version, not the last-\n"
13004
" committed version of the file."
13005
msgstr ""
13006
13007
#: en/help_topics/revisionspec.txt:170
13008
msgid ":mainline:"
13009
msgstr ""
13010
13011
#: en/help_topics/revisionspec.txt:172
13012
msgid ""
13013
" Select the revision that merged the specified revision into mainline."
13014
msgstr ""
13015
13016
#: en/help_topics/revisionspec.txt:174
13017
msgid ":last:"
13018
msgstr ""
13019
13020
#: en/help_topics/revisionspec.txt:176
13021
msgid ""
13022
" Supply a positive number to get the nth revision from the end.\n"
13023
" This is the same as supplying negative numbers to the 'revno:' spec.\n"
13024
" Examples::"
13025
msgstr ""
13026
13027
#: en/help_topics/revisionspec.txt:180
13028
msgid ""
13029
" last:1 -> return the last revision\n"
13030
" last:3 -> return the revision 2 before the end.\n"
13031
msgstr ""
13032
13033
#: en/help_topics/rules.txt:1
13034
msgid ""
13035
"Rules\n"
13036
"====="
13037
msgstr ""
13038
13039
#: en/help_topics/rules.txt:7
13040
msgid ""
13041
"Rules are defined in ini file format where the sections are file glob\n"
13042
"patterns and the contents of each section are the preferences for files\n"
13043
"matching that pattern(s). For example::"
13044
msgstr ""
13045
13046
#: en/help_topics/rules.txt:11
13047
msgid ""
13048
" [name *.bat]\n"
13049
" eol = native"
13050
msgstr ""
13051
13052
#: en/help_topics/rules.txt:14
13053
msgid ""
13054
" [name *.html *.xml]\n"
13055
" keywords = xml_escape"
13056
msgstr ""
13057
13058
#: en/help_topics/rules.txt:17
13059
msgid ""
13060
"Preferences like these are useful for commands and plugins wishing to\n"
13061
"provide custom behaviour for selected files. For more information on \n"
13062
"end of line conversion see :doc:`eol-help`.\n"
13063
"Keyword support is provided by the `keywords plugin\n"
13064
"<http://doc.bazaar.canonical.com/plugins/en/keywords-plugin.html>`_."
13065
msgstr ""
13066
13067
#: en/help_topics/rules.txt:23
13068
msgid ""
13069
"Files\n"
13070
"-----"
13071
msgstr ""
13072
13073
#: en/help_topics/rules.txt:26
13074
msgid ""
13075
"Default rules for all branches are defined in the optional file\n"
13076
"``BZR_HOME/rules``. "
13077
msgstr ""
13078
13079
#: en/help_topics/rules.txt:29
13080
msgid ""
13081
"Rule Patterns\n"
13082
"-------------"
13083
msgstr ""
13084
13085
#: en/help_topics/rules.txt:32
13086
msgid ""
13087
"Patterns are ordered and searching stops as soon as one matches.\n"
13088
"As a consequence, more explicit patterns should be placed towards\n"
13089
"the top of the file. Rule patterns use exactly the same conventions\n"
13090
"as ignore patterns. See :doc:`patterns-help` for details."
13091
msgstr ""
13092
13093
#: en/help_topics/rules.txt:37
13094
msgid ".. note::"
13095
msgstr ""
13096
13097
#: en/help_topics/rules.txt:39
13098
msgid ""
13099
" Patterns containing square brackets or spaces should be\n"
13100
" surrounded in quotes to ensure they are correctly parsed.\n"
13101
msgstr ""
13102
13103
#: en/help_topics/topics.txt:1
13104
msgid ""
13105
"authentication Information on configuring authentication\n"
13106
"basic Basic commands\n"
13107
"branches Information on what a branch is\n"
13108
"bugs Bug tracker settings\n"
13109
"checkouts Information on what a checkout is\n"
13110
"commands Basic help for all commands\n"
13111
"configuration Details on the configuration settings available\n"
13112
"conflict-types Types of conflicts and what to do about them\n"
13113
"content-filters Conversion of content into/from working trees\n"
13114
"criss-cross Information on criss-cross merging\n"
13115
"current-formats Current storage formats\n"
13116
"debug-flags Options to show or record debug information\n"
13117
"diverged-branches How to fix diverged branches\n"
13118
"env-variables Environment variable names and values\n"
13119
"eol Information on end-of-line handling\n"
13120
"files Information on configuration and log files\n"
13121
"formats Information on choosing a storage format\n"
13122
"global-options Options that control how Bazaar runs\n"
13123
"hidden-commands All hidden commands\n"
13124
"hooks Points at which custom processing can be added\n"
13125
"launchpad Using Bazaar with Launchpad.net\n"
13126
"location-alias Aliases for remembered locations\n"
13127
"log-formats Details on the logging formats available\n"
13128
"other-formats Experimental and deprecated storage formats\n"
13129
"patterns Information on the pattern syntax\n"
13130
"repositories Basic information on shared repositories.\n"
13131
"revisionspec Explain how to use --revision\n"
13132
"rules Information on defining rule-based preferences\n"
13133
"standalone-trees Information on what a standalone tree is\n"
13134
"standard-options Options that can be used with any command\n"
13135
"status-flags Help on status flags\n"
13136
"sync-for-reconfigure Steps to resolve \"out-of-sync\" when reconfiguring\n"
13137
"topics Topics list\n"
13138
"url-special-chars Special character handling in URLs\n"
13139
"urlspec Supported transport protocols\n"
13140
"working-trees Information on working trees\n"
13141
msgstr ""
13142
13143
#: en/help_topics/url-special-chars.txt:1
13144
msgid ""
13145
"Special character handling in URLs\n"
13146
"=================================="
13147
msgstr ""
13148
13149
#: en/help_topics/url-special-chars.txt:4
13150
msgid "Bazaar allows locations to be specified in multiple ways, either:"
13151
msgstr ""
13152
13153
#: en/help_topics/url-special-chars.txt:6
13154
msgid " * Fully qualified URLs"
13155
msgstr ""
13156
13157
#: en/help_topics/url-special-chars.txt:8
13158
msgid " * File system paths, relative or absolute"
13159
msgstr ""
13160
13161
#: en/help_topics/url-special-chars.txt:10
13162
msgid ""
13163
"Internally bzr treats all locations as URLs. For any file system paths\n"
13164
"that are specified it will automatically determine the appropriate URL\n"
13165
"representation, and escape special characters where necessary."
13166
msgstr ""
13167
13168
#: en/help_topics/url-special-chars.txt:14
13169
msgid ""
13170
"There are a few characters which have special meaning in URLs and need "
13171
"careful\n"
13172
"handling to avoid ambiguities. Characters can be escaped with a % and a hex\n"
13173
"value in URLs. Any non-ASCII characters in a file path will automatically "
13174
"be\n"
13175
"urlencoded when the path is converted to a URL."
13176
msgstr ""
13177
13178
#: en/help_topics/url-special-chars.txt:19
13179
msgid ""
13180
"URLs represent non-ASCII characters in an encoding defined by the server, "
13181
"but\n"
13182
"usually UTF-8. The % escapes should be of the UTF-8 bytes. Bazaar tries to "
13183
"be\n"
13184
"generous in what it accepts as a URL and to print them in a way that\n"
13185
"will be readable."
13186
msgstr ""
13187
13188
#: en/help_topics/url-special-chars.txt:24
13189
msgid ""
13190
"For example, if you have a directory named '/tmp/%2False' these are all "
13191
"valid\n"
13192
"ways of accessing the content (0x2F, or 47, is the ASCII code for forward "
13193
"slash)::"
13194
msgstr ""
13195
13196
#: en/help_topics/url-special-chars.txt:27
13197
msgid ""
13198
" cd /tmp\n"
13199
" bzr log /tmp/%2False\n"
13200
" bzr log %2False\n"
13201
" bzr log file:///tmp/%252False\n"
13202
" bzr log file://localhost/tmp/%252False\n"
13203
" bzr log file:%252False"
13204
msgstr ""
13205
13206
#: en/help_topics/url-special-chars.txt:34
13207
msgid "These are valid but do not refer to the same file::"
13208
msgstr ""
13209
13210
#: en/help_topics/url-special-chars.txt:36
13211
msgid ""
13212
" bzr log file:///tmp/%2False (refers to a file called /tmp/\\/alse)\n"
13213
" bzr log %252False (refers to a file called /tmp/%252False)"
13214
msgstr ""
13215
13216
#: en/help_topics/url-special-chars.txt:39
13217
msgid ""
13218
"Comma also has special meaning in URLs, because it denotes `segment "
13219
"parameters`_"
13220
msgstr ""
13221
13222
#: en/help_topics/url-special-chars.txt:41
13223
msgid ""
13224
"_`segment parameters`: http://www.ietf.org/rfc/rfc3986.txt (section 3.3)"
13225
msgstr ""
13226
13227
#: en/help_topics/url-special-chars.txt:43
13228
msgid ""
13229
"Comma is also special in any file system paths that are specified. To use a "
13230
"literal\n"
13231
"comma in a file system path, specify a URL and URL encode the comma::"
13232
msgstr ""
13233
13234
#: en/help_topics/url-special-chars.txt:46
13235
msgid ""
13236
" bzr log foo,branch=bla # path \"foo\" with the segment parameter "
13237
"\"branch\" set to \"bla\"\n"
13238
" bzr log file:foo%2Cbranch=bla # path \"foo,branch=bla\"\n"
13239
" bzr log file:foo,branch=bla # path \"foo\" with segment parameter "
13240
"\"branch\" set to \"bla\"\n"
13241
msgstr ""
13242
13243
#: en/help_topics/urlspec.txt:1
13244
msgid "URL Identifiers"
13245
msgstr ""
13246
13247
#: en/help_topics/urlspec.txt:3
13248
msgid "Supported URL prefixes::"
13249
msgstr ""
13250
13251
#: en/help_topics/urlspec.txt:5
13252
msgid ""
13253
" aftp:// Access using active FTP.\n"
13254
" bzr:// Fast access using the Bazaar smart server.\n"
13255
" bzr+ssh:// Fast access using the Bazaar smart server over SSH.\n"
13256
" file:// Access using the standard filesystem (default)\n"
13257
" ftp:// Access using passive FTP.\n"
13258
" http:// Read-only access of branches exported on the web.\n"
13259
" https:// Read-only access of branches exported on the web using "
13260
"SSL.\n"
13261
" sftp:// Access using SFTP (most SSH servers provide SFTP)."
13262
msgstr ""
13263
13264
#: en/help_topics/urlspec.txt:14
13265
msgid "Supported modifiers::"
13266
msgstr ""
13267
13268
#: en/help_topics/urlspec.txt:16
13269
msgid " gio+ Access using any GIO supported protocols."
13270
msgstr ""
13271
13272
#: en/help_topics/urlspec.txt:18
13273
msgid "Bazaar supports all of the standard parts within the URL::"
13274
msgstr ""
13275
13276
#: en/help_topics/urlspec.txt:20
13277
msgid " <protocol>://[user[:password]@]host[:port]/[path]"
13278
msgstr ""
13279
13280
#: en/help_topics/urlspec.txt:22
13281
msgid "allowing URLs such as::"
13282
msgstr ""
13283
13284
#: en/help_topics/urlspec.txt:24
13285
msgid " http://bzruser:BadPass@bzr.example.com:8080/bzr/trunk"
13286
msgstr ""
13287
13288
#: en/help_topics/urlspec.txt:26
13289
msgid ""
13290
"For bzr+ssh:// and sftp:// URLs, Bazaar also supports paths that begin\n"
13291
"with '~' as meaning that the rest of the path should be interpreted\n"
13292
"relative to the remote user's home directory. For example if the user\n"
13293
"``remote`` has a home directory of ``/home/remote`` on the server\n"
13294
"shell.example.com, then::"
13295
msgstr ""
13296
13297
#: en/help_topics/urlspec.txt:32
13298
msgid " bzr+ssh://remote@shell.example.com/~/myproject/trunk"
13299
msgstr ""
13300
13301
#: en/help_topics/urlspec.txt:34
13302
msgid "would refer to ``/home/remote/myproject/trunk``."
13303
msgstr ""
13304
13305
#: en/help_topics/urlspec.txt:36
13306
msgid ""
13307
"Many commands that accept URLs also accept location aliases too.\n"
13308
"See :doc:`location-alias-help` and :doc:`url-special-chars-help`.\n"
13309
msgstr ""
Loggerhead is a web-based interface for Breezy
Version: 2.0.1