~ubuntu-branches/ubuntu/wily/language-pack-el/wily-proposed
» Revision
260
: data/el/LC_MESSAGES/bzr.po
« back to all changes in this revision
Viewing changes to data/el/LC_MESSAGES/bzr.po
- browse files at revision 260
- compare with another revision
- download diff
- download tarball
- view history from revision 260
- Committer: Package Import Robot
- Author(s): Ubuntu automatic language-pack builder
- Date: 2015-10-16 10:18:37 UTC
- Revision ID: package-import@ubuntu.com-20151016101837-1fcfdr1cigrhkhzt
Tags: 1:15.10+20151016
Initial release.
- files removed:
- data/el
- data/el/LC_MESSAGES
- files modified:
- debian/changelog
added
removed
data/el/LC_MESSAGES/bzr.po
1
# Greek translation for bzr
2
# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
3
# This file is distributed under the same license as the bzr package.
4
# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
5
#
6
msgid ""
7
msgstr ""
8
"Project-Id-Version: bzr\n"
9
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
10
"POT-Creation-Date: 2013-07-27 12:45+0200\n"
11
"PO-Revision-Date: 2012-07-03 04:41+0000\n"
12
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
13
"Language-Team: Greek <el@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: 2015-10-08 10:47+0000\n"
19
"X-Generator: Launchpad (build 17802)\n"
20
21
#: bzrlib/add.py:93
22
msgid "skipping {0} (larger than {1} of {2} bytes)"
23
msgstr ""
24
25
#: bzrlib/branch.py:872
26
msgid "Unstacking"
27
msgstr ""
28
29
#: bzrlib/branch.py:3012
30
#, python-format
31
msgid "Pushed up to revision %d."
32
msgstr ""
33
34
#: bzrlib/branch.py:3014
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:3017
42
msgid "No new revisions or tags to push."
43
msgstr ""
44
45
#: bzrlib/branch.py:3019
46
msgid "No new revisions to push."
47
msgstr ""
48
49
#: bzrlib/branch.py:3039
50
msgid "checked branch {0} format {1}"
51
msgstr ""
52
53
#: bzrlib/branch.py:3042
54
#, python-format
55
msgid "found error:%s"
56
msgstr ""
57
58
#: bzrlib/builtins.py:251 bzrlib/builtins.py:3043 bzrlib/workingtree.py:324
59
#, python-format
60
msgid "Ignoring files outside view. View is %s"
61
msgstr ""
62
63
#: bzrlib/builtins.py:260
64
#, python-format
65
msgid "bzr %s --revision takes exactly one revision identifier"
66
msgstr ""
67
68
#: bzrlib/builtins.py:315
69
msgid "Display status summary."
70
msgstr ""
71
72
#: bzrlib/builtins.py:317
73
msgid ""
74
"This reports on versioned and unknown files, reporting them\n"
75
"grouped by state. Possible states are:"
76
msgstr ""
77
78
#: bzrlib/builtins.py:320
79
msgid ""
80
"added\n"
81
" Versioned in the working copy but not in the previous revision."
82
msgstr ""
83
84
#: bzrlib/builtins.py:323
85
msgid ""
86
"removed\n"
87
" Versioned in the previous revision but removed or deleted\n"
88
" in the working copy."
89
msgstr ""
90
91
#: bzrlib/builtins.py:327
92
msgid ""
93
"renamed\n"
94
" Path of this file changed from the previous revision;\n"
95
" the text may also have changed. This includes files whose\n"
96
" parent directory was renamed."
97
msgstr ""
98
99
#: bzrlib/builtins.py:332
100
msgid ""
101
"modified\n"
102
" Text has changed since the previous revision."
103
msgstr ""
104
105
#: bzrlib/builtins.py:335
106
msgid ""
107
"kind changed\n"
108
" File kind has been changed (e.g. from file to directory)."
109
msgstr ""
110
111
#: bzrlib/builtins.py:338
112
msgid ""
113
"unknown\n"
114
" Not versioned and not matching an ignore pattern."
115
msgstr ""
116
117
#: bzrlib/builtins.py:341
118
msgid ""
119
"Additionally for directories, symlinks and files with a changed\n"
120
"executable bit, Bazaar indicates their type using a trailing\n"
121
"character: '/', '@' or '*' respectively. These decorations can be\n"
122
"disabled using the '--no-classify' option."
123
msgstr ""
124
125
#: bzrlib/builtins.py:346
126
msgid ""
127
"To see ignored files use 'bzr ignored'. For details on the\n"
128
"changes to file texts, use 'bzr diff'."
129
msgstr ""
130
131
#: bzrlib/builtins.py:349
132
msgid ""
133
"Note that --short or -S gives status flags for each item, similar\n"
134
"to Subversion's status command. To get output similar to svn -q,\n"
135
"use bzr status -SV."
136
msgstr ""
137
138
#: bzrlib/builtins.py:353
139
msgid ""
140
"If no arguments are specified, the status of the entire working\n"
141
"directory is shown. Otherwise, only the status of the specified\n"
142
"files or directories is reported. If a directory is given, status\n"
143
"is reported for everything inside that directory."
144
msgstr ""
145
146
#: bzrlib/builtins.py:358
147
msgid ""
148
"Before merges are committed, the pending merge tip revisions are\n"
149
"shown. To see all pending merge revisions, use the -v option.\n"
150
"To skip the display of pending merge information altogether, use\n"
151
"the no-pending option or specify a file/directory."
152
msgstr ""
153
154
#: bzrlib/builtins.py:363
155
msgid ""
156
"To compare the working directory to a specific revision, pass a\n"
157
"single revision to the revision argument."
158
msgstr ""
159
160
#: bzrlib/builtins.py:366
161
msgid ""
162
"To see which files have changed in a specific revision, or between\n"
163
"two revisions, pass a revision range to the revision argument.\n"
164
"This will produce the same results as calling 'bzr diff --summarize'."
165
msgstr ""
166
167
#: bzrlib/builtins.py:375
168
msgid "Use short status indicators."
169
msgstr ""
170
171
#: bzrlib/builtins.py:377
172
msgid "Only show versioned files."
173
msgstr ""
174
175
#: bzrlib/builtins.py:379
176
msgid "Don't show pending merges."
177
msgstr ""
178
179
#: bzrlib/builtins.py:382
180
msgid "Do not mark object type using indicator."
181
msgstr ""
182
183
#: bzrlib/builtins.py:397
184
msgid "bzr status --revision takes exactly one or two revision specifiers"
185
msgstr ""
186
187
#: bzrlib/builtins.py:441 bzrlib/builtins.py:5229
188
msgid "You can only supply one of revision_id or --revision"
189
msgstr ""
190
191
#: bzrlib/builtins.py:444 bzrlib/builtins.py:5231
192
msgid "You must supply either --revision or a revision_id"
193
msgstr ""
194
195
#: bzrlib/builtins.py:451
196
#, python-format
197
msgid "Repository %r does not support access to raw revision texts"
198
msgstr ""
199
200
#: bzrlib/builtins.py:462
201
msgid "The repository {0} contains no revision {1}."
202
msgstr ""
203
204
#: bzrlib/builtins.py:469
205
msgid "You cannot specify a NULL revision."
206
msgstr ""
207
208
#: bzrlib/builtins.py:561
209
msgid "Remove the working tree from a given branch/checkout."
210
msgstr ""
211
212
#: bzrlib/builtins.py:563
213
msgid ""
214
"Since a lightweight checkout is little more than a working tree\n"
215
"this will refuse to run against one."
216
msgstr ""
217
218
#: bzrlib/builtins.py:566
219
msgid "To re-create the working tree, use \"bzr checkout\"."
220
msgstr ""
221
222
#: bzrlib/builtins.py:572
223
msgid ""
224
"Remove the working tree even if it has uncommitted or shelved changes."
225
msgstr ""
226
227
#: bzrlib/builtins.py:586
228
msgid "No working tree to remove"
229
msgstr ""
230
231
#: bzrlib/builtins.py:588
232
msgid "You cannot remove the working tree of a remote path"
233
msgstr ""
234
235
#: bzrlib/builtins.py:597
236
msgid "You cannot remove the working tree from a lightweight checkout"
237
msgstr ""
238
239
#: bzrlib/builtins.py:637
240
msgid ""
241
"The tree does not appear to be corrupt. You probably want \"bzr revert\" "
242
"instead. Use \"--force\" if you are sure you want to reset the working tree."
243
msgstr ""
244
245
#: bzrlib/builtins.py:648
246
msgid ""
247
", the header appears corrupt, try passing -r -1 to set the state to the last "
248
"commit"
249
msgstr ""
250
251
#: bzrlib/builtins.py:652
252
msgid "failed to reset the tree state{0}"
253
msgstr ""
254
255
#: bzrlib/builtins.py:656
256
msgid "Show current revision number."
257
msgstr ""
258
259
#: bzrlib/builtins.py:658
260
msgid "This is equal to the number of revisions on this branch."
261
msgstr ""
262
263
#: bzrlib/builtins.py:671
264
msgid "--tree and --revision can not be used together"
265
msgstr ""
266
267
#: bzrlib/builtins.py:688
268
msgid "Revision numbers only make sense for single revisions, not ranges"
269
msgstr ""
270
271
#: bzrlib/builtins.py:712
272
msgid "Show revno of working tree."
273
msgstr ""
274
275
#: bzrlib/builtins.py:760
276
msgid "Add specified files or directories."
277
msgstr ""
278
279
#: bzrlib/builtins.py:762
280
msgid ""
281
"In non-recursive mode, all the named items are added, regardless\n"
282
"of whether they were previously ignored. A warning is given if\n"
283
"any of the named files are already versioned."
284
msgstr ""
285
286
#: bzrlib/builtins.py:766
287
msgid ""
288
"In recursive mode (the default), files are treated the same way\n"
289
"but the behaviour for directories is different. Directories that\n"
290
"are already versioned do not give a warning. All directories,\n"
291
"whether already versioned or not, are searched for files or\n"
292
"subdirectories that are neither versioned or ignored, and these\n"
293
"are added. This search proceeds recursively into versioned\n"
294
"directories. If no names are given '.' is assumed."
295
msgstr ""
296
297
#: bzrlib/builtins.py:774
298
msgid ""
299
"A warning will be printed when nested trees are encountered,\n"
300
"unless they are explicitly ignored."
301
msgstr ""
302
303
#: bzrlib/builtins.py:777
304
msgid ""
305
"Therefore simply saying 'bzr add' will version all files that\n"
306
"are currently unknown."
307
msgstr ""
308
309
#: bzrlib/builtins.py:780
310
msgid ""
311
"Adding a file whose parent directory is not versioned will\n"
312
"implicitly add the parent, and so on up to the root. This means\n"
313
"you should never need to explicitly add a directory, they'll just\n"
314
"get added when you add a file in the directory."
315
msgstr ""
316
317
#: bzrlib/builtins.py:785
318
msgid ""
319
"--dry-run will show which files would be added, but not actually\n"
320
"add them."
321
msgstr ""
322
323
#: bzrlib/builtins.py:788
324
msgid ""
325
"--file-ids-from will try to use the file ids from the supplied path.\n"
326
"It looks up ids trying to find a matching parent directory with the\n"
327
"same filename, and then by pure path. This option is rarely needed\n"
328
"but can be useful when adding the same logical file into two\n"
329
"branches that will be merged later (without showing the two different\n"
330
"adds as a conflict). It is also useful when merging another project\n"
331
"into a subdirectory of this one."
332
msgstr ""
333
334
#: bzrlib/builtins.py:796
335
msgid ""
336
"Any files matching patterns in the ignore list will not be added\n"
337
"unless they are explicitly mentioned."
338
msgstr ""
339
340
#: bzrlib/builtins.py:799
341
msgid ""
342
"In recursive mode, files larger than the configuration option \n"
343
"add.maximum_file_size will be skipped. Named items are never skipped due\n"
344
"to file size."
345
msgstr ""
346
347
#: bzrlib/builtins.py:806
348
msgid "Don't recursively add the contents of directories."
349
msgstr ""
350
351
#: bzrlib/builtins.py:813
352
msgid "Lookup file ids from this tree."
353
msgstr ""
354
355
#: bzrlib/builtins.py:849
356
msgid "ignored {0} matching \"{1}\"\n"
357
msgstr ""
358
359
#: bzrlib/builtins.py:854
360
msgid "Create a new versioned directory."
361
msgstr ""
362
363
#: bzrlib/builtins.py:856
364
msgid "This is equivalent to creating the directory and then adding it."
365
msgstr ""
366
367
#: bzrlib/builtins.py:863
368
msgid "No error if existing, make parent directories as needed."
369
msgstr ""
370
371
#: bzrlib/builtins.py:897
372
#, python-format
373
msgid "added %s\n"
374
msgstr ""
375
376
#: bzrlib/builtins.py:939
377
#, python-format
378
msgid "invalid kind %r specified"
379
msgstr ""
380
381
#: bzrlib/builtins.py:976
382
msgid "Move or rename a file."
383
msgstr ""
384
385
#: bzrlib/builtins.py:978
386
msgid " bzr mv SOURCE... DESTINATION"
387
msgstr ""
388
389
#: bzrlib/builtins.py:980
390
msgid ""
391
"If the last argument is a versioned directory, all the other names\n"
392
"are moved into it. Otherwise, there must be exactly two arguments\n"
393
"and the file is changed to a new name."
394
msgstr ""
395
396
#: bzrlib/builtins.py:984
397
msgid ""
398
"If OLDNAME does not exist on the filesystem but is versioned and\n"
399
"NEWNAME does exist on the filesystem but is not versioned, mv\n"
400
"assumes that the file has been manually moved and only updates\n"
401
"its internal inventory to reflect that change.\n"
402
"The same is valid when moving many SOURCE files to a DESTINATION."
403
msgstr ""
404
405
#: bzrlib/builtins.py:990
406
msgid "Files cannot be moved between branches."
407
msgstr ""
408
409
#: bzrlib/builtins.py:997
410
msgid ""
411
"Move only the bzr identifier of the file, because the file has already been "
412
"moved."
413
msgstr ""
414
415
#: bzrlib/builtins.py:999
416
msgid "Automatically guess renames."
417
msgstr ""
418
419
#: bzrlib/builtins.py:1000
420
msgid "Avoid making changes when guessing renames."
421
msgstr ""
422
423
#: bzrlib/builtins.py:1009
424
msgid "--dry-run requires --auto."
425
msgstr ""
426
427
#: bzrlib/builtins.py:1013
428
msgid "missing file argument"
429
msgstr ""
430
431
#: bzrlib/builtins.py:1017
432
msgid "can not move root of branch"
433
msgstr ""
434
435
#: bzrlib/builtins.py:1023
436
msgid "Only one path may be specified to --auto."
437
msgstr ""
438
439
#: bzrlib/builtins.py:1026
440
msgid "--after cannot be specified with --auto."
441
msgstr ""
442
443
#: bzrlib/builtins.py:1062
444
msgid "to mv multiple files the destination must be a versioned directory"
445
msgstr ""
446
447
#: bzrlib/builtins.py:1114
448
msgid "Turn this branch into a mirror of another branch."
449
msgstr ""
450
451
#: bzrlib/builtins.py:1116
452
msgid ""
453
"By default, this command only works on branches that have not diverged.\n"
454
"Branches are considered diverged if the destination branch's most recent \n"
455
"commit is one that has not been merged (directly or indirectly) into the \n"
456
"parent."
457
msgstr ""
458
459
#: bzrlib/builtins.py:1121
460
msgid ""
461
"If branches have diverged, you can use 'bzr merge' to integrate the changes\n"
462
"from one into the other. Once one branch has merged, the other should\n"
463
"be able to pull it again."
464
msgstr ""
465
466
#: bzrlib/builtins.py:1125
467
msgid ""
468
"If you want to replace your local changes and just want your branch to\n"
469
"match the remote one, use pull --overwrite. This will work even if the two\n"
470
"branches have diverged."
471
msgstr ""
472
473
#: bzrlib/builtins.py:1129
474
msgid ""
475
"If there is no default location set, the first pull will set it (use\n"
476
"--no-remember to avoid setting it). After that, you can omit the\n"
477
"location to use the default. To change the default, use --remember. The\n"
478
"value will only be saved if the remote location can be accessed."
479
msgstr ""
480
481
#: bzrlib/builtins.py:1134
482
msgid ""
483
"The --verbose option will display the revisions pulled using the log_format\n"
484
"configuration option. You can use a different format by overriding it with\n"
485
"-Olog_format=<other_format>."
486
msgstr ""
487
488
#: bzrlib/builtins.py:1138
489
msgid ""
490
"Note: The location can be specified either in the form of a branch,\n"
491
"or in the form of a path to a file containing a merge directive generated\n"
492
"with bzr send."
493
msgstr ""
494
495
#: bzrlib/builtins.py:1146
496
msgid "Show logs of pulled revisions."
497
msgstr ""
498
499
#: bzrlib/builtins.py:1148
500
msgid ""
501
"Branch to pull into, rather than the one containing the working directory."
502
msgstr ""
503
504
#: bzrlib/builtins.py:1151
505
msgid ""
506
"Perform a local pull in a bound branch. Local pulls are not applied to the "
507
"master branch."
508
msgstr ""
509
510
#: bzrlib/builtins.py:1188
511
msgid "No working tree, ignoring --show-base"
512
msgstr ""
513
514
#: bzrlib/builtins.py:1204
515
msgid "No pull location known or specified."
516
msgstr ""
517
518
#: bzrlib/builtins.py:1210
519
#, python-format
520
msgid "Using saved parent location: %s\n"
521
msgstr ""
522
523
#: bzrlib/builtins.py:1217 bzrlib/builtins.py:4423
524
msgid "Cannot use -r with merge directives or bundles"
525
msgstr ""
526
527
#: bzrlib/builtins.py:1260
528
msgid "Update a mirror of this branch."
529
msgstr ""
530
531
#: bzrlib/builtins.py:1262
532
msgid ""
533
"The target branch will not have its working tree populated because this\n"
534
"is both expensive, and is not supported on remote file systems."
535
msgstr ""
536
537
#: bzrlib/builtins.py:1265
538
msgid ""
539
"Some smart servers or protocols *may* put the working tree in place in\n"
540
"the future."
541
msgstr ""
542
543
#: bzrlib/builtins.py:1268
544
msgid ""
545
"This command only works on branches that have not diverged. Branches are\n"
546
"considered diverged if the destination branch's most recent commit is one\n"
547
"that has not been merged (directly or indirectly) by the source branch."
548
msgstr ""
549
550
#: bzrlib/builtins.py:1272
551
msgid ""
552
"If branches have diverged, you can use 'bzr push --overwrite' to replace\n"
553
"the other branch completely, discarding its unmerged changes."
554
msgstr ""
555
556
#: bzrlib/builtins.py:1275
557
msgid ""
558
"If you want to ensure you have the different changes in the other branch,\n"
559
"do a merge (see bzr help merge) from the other branch, and commit that.\n"
560
"After that you will be able to do a push without '--overwrite'."
561
msgstr ""
562
563
#: bzrlib/builtins.py:1279
564
msgid ""
565
"If there is no default push location set, the first push will set it (use\n"
566
"--no-remember to avoid setting it). After that, you can omit the\n"
567
"location to use the default. To change the default, use --remember. The\n"
568
"value will only be saved if the remote location can be accessed."
569
msgstr ""
570
571
#: bzrlib/builtins.py:1284
572
msgid ""
573
"The --verbose option will display the revisions pushed using the log_format\n"
574
"configuration option. You can use a different format by overriding it with\n"
575
"-Olog_format=<other_format>."
576
msgstr ""
577
578
#: bzrlib/builtins.py:1295 bzrlib/foreign.py:272
579
msgid ""
580
"Branch to push from, rather than the one containing the working directory."
581
msgstr ""
582
583
#: bzrlib/builtins.py:1298
584
msgid ""
585
"By default push will fail if the target directory exists, but does not "
586
"already have a control directory. This flag will allow push to proceed."
587
msgstr ""
588
589
#: bzrlib/builtins.py:1303
590
msgid ""
591
"Create a stacked branch that references the public location of the parent "
592
"branch."
593
msgstr ""
594
595
#: bzrlib/builtins.py:1306
596
msgid ""
597
"Create a stacked branch that refers to another branch for the commit "
598
"history. Only the work not present in the referenced branch is included in "
599
"the branch created."
600
msgstr ""
601
602
#: bzrlib/builtins.py:1311 bzrlib/foreign.py:279
603
msgid ""
604
"Refuse to push if there are uncommitted changes in the working tree, --no-"
605
"strict disables the check."
606
msgstr ""
607
608
#: bzrlib/builtins.py:1314
609
msgid "Don't populate the working tree, even for protocols that support it."
610
msgstr ""
611
612
#: bzrlib/builtins.py:1317
613
msgid "Overwrite tags only."
614
msgstr ""
615
616
#: bzrlib/builtins.py:1368
617
msgid "Could not determine branch to refer to."
618
msgstr ""
619
620
#: bzrlib/builtins.py:1377
621
#, python-format
622
msgid ""
623
"No push location known or specified. To push to the parent branch (at %s), "
624
"use 'bzr push :parent'."
625
msgstr ""
626
627
#: bzrlib/builtins.py:1383 bzrlib/foreign.py:306
628
msgid "No push location known or specified."
629
msgstr ""
630
631
#: bzrlib/builtins.py:1387
632
#, python-format
633
msgid "Using saved push location: %s"
634
msgstr ""
635
636
#: bzrlib/builtins.py:1397
637
msgid "Create a new branch that is a copy of an existing branch."
638
msgstr ""
639
640
#: bzrlib/builtins.py:1399
641
msgid ""
642
"If the TO_LOCATION is omitted, the last component of the FROM_LOCATION will\n"
643
"be used. In other words, \"branch ../foo/bar\" will attempt to create "
644
"./bar.\n"
645
"If the FROM_LOCATION has no / or path separator embedded, the TO_LOCATION\n"
646
"is derived from the FROM_LOCATION by stripping a leading scheme or drive\n"
647
"identifier, if any. For example, \"branch lp:foo-bar\" will attempt to\n"
648
"create ./foo-bar."
649
msgstr ""
650
651
#: bzrlib/builtins.py:1406
652
msgid ""
653
"To retrieve the branch as of a particular revision, supply the --revision\n"
654
"parameter, as in \"branch foo/bar -r 5\"."
655
msgstr ""
656
657
#: bzrlib/builtins.py:1409
658
msgid "The synonyms 'clone' and 'get' for this command are deprecated."
659
msgstr ""
660
661
#: bzrlib/builtins.py:1419
662
msgid "Create a branch without a working-tree."
663
msgstr ""
664
665
#: bzrlib/builtins.py:1421
666
msgid "Switch the checkout in the current directory to the new branch."
667
msgstr ""
668
669
#: bzrlib/builtins.py:1424
670
msgid ""
671
"Create a stacked branch referring to the source branch. The new branch will "
672
"depend on the availability of the source branch for all operations."
673
msgstr ""
674
675
#: bzrlib/builtins.py:1428
676
msgid "Do not use a shared repository, even if available."
677
msgstr ""
678
679
#: bzrlib/builtins.py:1430
680
msgid ""
681
"By default branch will fail if the target directory exists, but does not "
682
"already have a control directory. This flag will allow branch to proceed."
683
msgstr ""
684
685
#: bzrlib/builtins.py:1435
686
msgid "Bind new branch to from location."
687
msgstr ""
688
689
#: bzrlib/builtins.py:1482
690
#, python-format
691
msgid "Target directory \"%s\" already exists."
692
msgstr ""
693
694
#: bzrlib/builtins.py:1494
695
#, python-format
696
msgid "Parent of \"%s\" does not exist."
697
msgstr ""
698
699
#: bzrlib/builtins.py:1513
700
msgid "The branch {0} has no revision {1}."
701
msgstr ""
702
703
#: bzrlib/builtins.py:1528 bzrlib/push.py:53
704
#, python-format
705
msgid "Created new stacked branch referring to %s."
706
msgstr ""
707
708
#: bzrlib/builtins.py:1532
709
#, python-format
710
msgid "Branched %d revision."
711
msgid_plural "Branched %d revisions."
712
msgstr[0] ""
713
msgstr[1] ""
714
715
#: bzrlib/builtins.py:1537
716
#, python-format
717
msgid "New branch bound to %s"
718
msgstr ""
719
720
#: bzrlib/builtins.py:1542 bzrlib/builtins.py:6283
721
#, python-format
722
msgid "Switched to branch: %s"
723
msgstr ""
724
725
#: bzrlib/builtins.py:1547
726
msgid "List the branches available at the current location."
727
msgstr ""
728
729
#: bzrlib/builtins.py:1549
730
msgid ""
731
"This command will print the names of all the branches at the current\n"
732
"location."
733
msgstr ""
734
735
#: bzrlib/builtins.py:1556
736
msgid ""
737
"Recursively scan for branches rather than just looking in the specified "
738
"location."
739
msgstr ""
740
741
#: bzrlib/builtins.py:1585
742
msgid "(default)"
743
msgstr ""
744
745
#: bzrlib/builtins.py:1597
746
msgid "Create a new checkout of an existing branch."
747
msgstr ""
748
749
#: bzrlib/builtins.py:1599
750
msgid ""
751
"If BRANCH_LOCATION is omitted, checkout will reconstitute a working tree "
752
"for\n"
753
"the branch found in '.'. This is useful if you have removed the working "
754
"tree\n"
755
"or if it was never created - i.e. if you pushed the branch to its current\n"
756
"location using SFTP."
757
msgstr ""
758
759
#: bzrlib/builtins.py:1604
760
msgid ""
761
"If the TO_LOCATION is omitted, the last component of the BRANCH_LOCATION "
762
"will\n"
763
"be used. In other words, \"checkout ../foo/bar\" will attempt to create "
764
"./bar.\n"
765
"If the BRANCH_LOCATION has no / or path separator embedded, the TO_LOCATION\n"
766
"is derived from the BRANCH_LOCATION by stripping a leading scheme or drive\n"
767
"identifier, if any. For example, \"checkout lp:foo-bar\" will attempt to\n"
768
"create ./foo-bar."
769
msgstr ""
770
771
#: bzrlib/builtins.py:1611
772
msgid ""
773
"To retrieve the branch as of a particular revision, supply the --revision\n"
774
"parameter, as in \"checkout foo/bar -r 5\". Note that this will be "
775
"immediately\n"
776
"out of date [so you cannot commit] but it may be useful (i.e. to examine "
777
"old\n"
778
"code.)"
779
msgstr ""
780
781
#: bzrlib/builtins.py:1621
782
msgid ""
783
"Perform a lightweight checkout. Lightweight checkouts depend on access to "
784
"the branch for every operation. Normal checkouts can perform common "
785
"operations like diff and status without such access, and also support local "
786
"commits."
787
msgstr ""
788
789
#: bzrlib/builtins.py:1628
790
msgid "Get file contents from this tree."
791
msgstr ""
792
793
#: bzrlib/builtins.py:1630
794
msgid "Hard-link working tree files where possible."
795
msgstr ""
796
797
#: bzrlib/builtins.py:1671
798
msgid ""
799
"Show list of renamed files.\n"
800
" "
801
msgstr ""
802
803
#: bzrlib/builtins.py:1699
804
msgid "Update a working tree to a new revision."
805
msgstr ""
806
807
#: bzrlib/builtins.py:1701
808
msgid ""
809
"This will perform a merge of the destination revision (the tip of the\n"
810
"branch, or the specified revision) into the working tree, and then make\n"
811
"that revision the basis revision for the working tree. "
812
msgstr ""
813
814
#: bzrlib/builtins.py:1705
815
msgid ""
816
"You can use this to visit an older revision, or to update a working tree\n"
817
"that is out of date from its branch."
818
msgstr ""
819
820
#: bzrlib/builtins.py:1708
821
msgid ""
822
"If there are any uncommitted changes in the tree, they will be carried\n"
823
"across and remain as uncommitted changes after the update. To discard\n"
824
"these changes, use 'bzr revert'. The uncommitted changes may conflict\n"
825
"with the changes brought in by the change in basis revision."
826
msgstr ""
827
828
#: bzrlib/builtins.py:1713
829
msgid ""
830
"If the tree's branch is bound to a master branch, bzr will also update\n"
831
"the branch from the master."
832
msgstr ""
833
834
#: bzrlib/builtins.py:1716
835
msgid ""
836
"You cannot update just a single file or directory, because each Bazaar\n"
837
"working tree has just a single basis revision. If you want to restore a\n"
838
"file that has been removed locally, use 'bzr revert' instead of 'bzr\n"
839
"update'. If you want to restore a file to its state in a previous\n"
840
"revision, use 'bzr revert' with a '-r' option, or use 'bzr cat' to write\n"
841
"out the old content of that file to a new location."
842
msgstr ""
843
844
#: bzrlib/builtins.py:1723
845
msgid ""
846
"The 'dir' argument, if given, must be the location of the root of a\n"
847
"working tree to update. By default, the working tree that contains the \n"
848
"current working directory is used."
849
msgstr ""
850
851
#: bzrlib/builtins.py:1739
852
msgid "bzr update --revision takes exactly one revision"
853
msgstr ""
854
855
#: bzrlib/builtins.py:1747
856
msgid "bzr update can only update a whole tree, not a file or subdirectory"
857
msgstr ""
858
859
#: bzrlib/builtins.py:1778
860
msgid "Tree is up to date at revision {0} of branch {1}"
861
msgstr ""
862
863
#: bzrlib/builtins.py:1794
864
#, python-format
865
msgid ""
866
"branch has no revision %s\n"
867
"bzr update --revision only works for a revision in the branch history"
868
msgstr ""
869
870
#: bzrlib/builtins.py:1800
871
msgid "Updated to revision {0} of branch {1}"
872
msgstr ""
873
874
#: bzrlib/builtins.py:1804
875
msgid ""
876
"Your local commits will now show as pending merges with 'bzr status', and "
877
"can be committed with 'bzr commit'."
878
msgstr ""
879
880
#: bzrlib/builtins.py:1813
881
msgid "Show information about a working tree, branch or repository."
882
msgstr ""
883
884
#: bzrlib/builtins.py:1815
885
msgid ""
886
"This command will show all known locations and formats associated to the\n"
887
"tree, branch or repository."
888
msgstr ""
889
890
#: bzrlib/builtins.py:1818
891
msgid ""
892
"In verbose mode, statistical information is included with each report.\n"
893
"To see extended statistic information, use a verbosity level of 2 or\n"
894
"higher by specifying the verbose option multiple times, e.g. -vv."
895
msgstr ""
896
897
#: bzrlib/builtins.py:1822
898
msgid "Branches and working trees will also report any missing revisions."
899
msgstr ""
900
901
#: bzrlib/builtins.py:1824 bzrlib/builtins.py:3742 bzrlib/builtins.py:4883
902
#: bzrlib/builtins.py:6469
903
msgid ":Examples:"
904
msgstr ""
905
906
#: bzrlib/builtins.py:1826
907
msgid " Display information on the format and related locations:"
908
msgstr ""
909
910
#: bzrlib/builtins.py:1828
911
msgid " bzr info"
912
msgstr ""
913
914
#: bzrlib/builtins.py:1830
915
msgid ""
916
" Display the above together with extended format information and\n"
917
" basic statistics (like the number of files in the working tree and\n"
918
" number of revisions in the branch and repository):"
919
msgstr ""
920
921
#: bzrlib/builtins.py:1834
922
msgid " bzr info -v"
923
msgstr ""
924
925
#: bzrlib/builtins.py:1836
926
msgid " Display the above together with number of committers to the branch:"
927
msgstr ""
928
929
#: bzrlib/builtins.py:1838
930
msgid " bzr info -vv"
931
msgstr ""
932
933
#: bzrlib/builtins.py:1857
934
msgid "Remove files or directories."
935
msgstr ""
936
937
#: bzrlib/builtins.py:1859
938
msgid ""
939
"This makes Bazaar stop tracking changes to the specified files. Bazaar will\n"
940
"delete them if they can easily be recovered using revert otherwise they\n"
941
"will be backed up (adding an extension of the form .~#~). If no options or\n"
942
"parameters are given Bazaar will scan for files that are being tracked by\n"
943
"Bazaar but missing in your tree and stop tracking them for you."
944
msgstr ""
945
946
#: bzrlib/builtins.py:1867
947
msgid "Only remove files that have never been committed."
948
msgstr ""
949
950
#: bzrlib/builtins.py:1869
951
msgid "The file deletion mode to be used."
952
msgstr ""
953
954
#: bzrlib/builtins.py:1870
955
msgid "Deletion Strategy"
956
msgstr ""
957
958
#: bzrlib/builtins.py:1871
959
msgid "Backup changed files (default)."
960
msgstr ""
961
962
#: bzrlib/builtins.py:1872
963
msgid "Delete from bzr but leave the working copy."
964
msgstr ""
965
966
#: bzrlib/builtins.py:1873
967
msgid "Don't backup changed files."
968
msgstr ""
969
970
#: bzrlib/builtins.py:1894
971
msgid "No matching files."
972
msgstr ""
973
974
#: bzrlib/builtins.py:1955
975
msgid "Reconcile bzr metadata in a branch."
976
msgstr ""
977
978
#: bzrlib/builtins.py:1957
979
msgid ""
980
"This can correct data mismatches that may have been caused by\n"
981
"previous ghost operations or bzr upgrades. You should only\n"
982
"need to run this command if 'bzr check' or a bzr developer\n"
983
"advises you to run it."
984
msgstr ""
985
986
#: bzrlib/builtins.py:1962
987
msgid ""
988
"If a second branch is provided, cross-branch reconciliation is\n"
989
"also attempted, which will check that data like the tree root\n"
990
"id which was not present in very early bzr versions is represented\n"
991
"correctly in both branches."
992
msgstr ""
993
994
#: bzrlib/builtins.py:1967
995
msgid ""
996
"At the same time it is run it may recompress data resulting in\n"
997
"a potential saving in disk space or performance gain."
998
msgstr ""
999
1000
#: bzrlib/builtins.py:1970
1001
msgid "The branch *MUST* be on a listable system such as local disk or sftp."
1002
msgstr ""
1003
1004
#: bzrlib/builtins.py:2037 bzrlib/builtins.py:2155 bzrlib/builtins.py:3777
1005
msgid ""
1006
"Format for the bzr 2.0 series.\n"
1007
"Uses group-compress storage.\n"
1008
"Provides rich roots which are a one-way transition.\n"
1009
msgstr ""
1010
1011
#: bzrlib/builtins.py:2037 bzrlib/builtins.py:2155 bzrlib/builtins.py:3777
1012
msgid ""
1013
"Pack-based format used in 1.x series. Introduced in 0.92. Interoperates with "
1014
"bzr repositories before 0.92 but cannot be read by bzr < 0.92. "
1015
msgstr ""
1016
1017
#: bzrlib/builtins.py:2037 bzrlib/builtins.py:2155 bzrlib/builtins.py:3777
1018
msgid "The 2a format with experimental support for colocated branches.\n"
1019
msgstr ""
1020
1021
#: bzrlib/builtins.py:2038
1022
msgid "Make a directory into a versioned branch."
1023
msgstr ""
1024
1025
#: bzrlib/builtins.py:2040
1026
msgid ""
1027
"Use this to create an empty branch, or before importing an\n"
1028
"existing project."
1029
msgstr ""
1030
1031
#: bzrlib/builtins.py:2043
1032
msgid ""
1033
"If there is a repository in a parent directory of the location, then\n"
1034
"the history of the branch will be stored in the repository. Otherwise\n"
1035
"init creates a standalone branch which carries its own history\n"
1036
"in the .bzr directory."
1037
msgstr ""
1038
1039
#: bzrlib/builtins.py:2048
1040
msgid ""
1041
"If there is already a branch at the location but it has no working tree,\n"
1042
"the tree can be populated with 'bzr checkout'."
1043
msgstr ""
1044
1045
#: bzrlib/builtins.py:2051
1046
msgid "Recipe for importing a tree of files::"
1047
msgstr ""
1048
1049
#: bzrlib/builtins.py:2053
1050
msgid ""
1051
" cd ~/project\n"
1052
" bzr init\n"
1053
" bzr add .\n"
1054
" bzr status\n"
1055
" bzr commit -m \"imported project\""
1056
msgstr ""
1057
1058
#: bzrlib/builtins.py:2064
1059
msgid ""
1060
"Create the path leading up to the branch if it does not already exist."
1061
msgstr ""
1062
1063
#: bzrlib/builtins.py:2067
1064
msgid "Specify a format for this branch. See \"help formats\"."
1065
msgstr ""
1066
1067
#: bzrlib/builtins.py:2075
1068
msgid ""
1069
"Never change revnos or the existing log. Append revisions to it only."
1070
msgstr ""
1071
1072
#: bzrlib/builtins.py:2078
1073
msgid "Create a branch without a working tree."
1074
msgstr ""
1075
1076
#: bzrlib/builtins.py:2098 bzrlib/push.py:110
1077
#, python-format
1078
msgid ""
1079
"Parent directory of %s does not exist.\n"
1080
"You may supply --create-prefix to create all leading parent directories."
1081
msgstr ""
1082
1083
#: bzrlib/builtins.py:2132
1084
msgid ""
1085
"This branch format cannot be set to append-revisions-only. Try --default."
1086
msgstr ""
1087
1088
#: bzrlib/builtins.py:2143
1089
msgid "Created a {0} (format: {1})\n"
1090
msgstr ""
1091
1092
#: bzrlib/builtins.py:2152
1093
#, python-format
1094
msgid "Using shared repository: %s\n"
1095
msgstr ""
1096
1097
#: bzrlib/builtins.py:2156
1098
msgid "Create a shared repository for branches to share storage space."
1099
msgstr ""
1100
1101
#: bzrlib/builtins.py:2158
1102
msgid ""
1103
"New branches created under the repository directory will store their\n"
1104
"revisions in the repository, not in the branch directory. For branches\n"
1105
"with shared history, this reduces the amount of storage needed and \n"
1106
"speeds up the creation of new branches."
1107
msgstr ""
1108
1109
#: bzrlib/builtins.py:2163
1110
msgid ""
1111
"If the --no-trees option is given then the branches in the repository\n"
1112
"will not have working trees by default. They will still exist as \n"
1113
"directories on disk, but they will not have separate copies of the \n"
1114
"files at a certain revision. This can be useful for repositories that\n"
1115
"store branches which are interacted with through checkouts or remote\n"
1116
"branches, such as on a server."
1117
msgstr ""
1118
1119
#: bzrlib/builtins.py:2170
1120
msgid ""
1121
":Examples:\n"
1122
" Create a shared repository holding just branches::"
1123
msgstr ""
1124
1125
#: bzrlib/builtins.py:2173
1126
msgid ""
1127
" bzr init-repo --no-trees repo\n"
1128
" bzr init repo/trunk"
1129
msgstr ""
1130
1131
#: bzrlib/builtins.py:2176
1132
msgid " Make a lightweight checkout elsewhere::"
1133
msgstr ""
1134
1135
#: bzrlib/builtins.py:2178
1136
msgid ""
1137
" bzr checkout --lightweight repo/trunk trunk-checkout\n"
1138
" cd trunk-checkout\n"
1139
" (add files here)"
1140
msgstr ""
1141
1142
#: bzrlib/builtins.py:2186
1143
msgid ""
1144
"Specify a format for this repository. See \"bzr help formats\" for details."
1145
msgstr ""
1146
1147
#: bzrlib/builtins.py:2190
1148
msgid "Repository format"
1149
msgstr ""
1150
1151
#: bzrlib/builtins.py:2192
1152
msgid "Branches in the repository will default to not having a working tree."
1153
msgstr ""
1154
1155
#: bzrlib/builtins.py:2218
1156
msgid "Show differences in the working tree, between revisions or branches."
1157
msgstr ""
1158
1159
#: bzrlib/builtins.py:2220
1160
msgid ""
1161
"If no arguments are given, all changes for the current tree are listed.\n"
1162
"If files are given, only the changes in those files are listed.\n"
1163
"Remote and multiple branches can be compared by using the --old and\n"
1164
"--new options. If not provided, the default for both is derived from\n"
1165
"the first argument, if any, or the current tree if no arguments are\n"
1166
"given."
1167
msgstr ""
1168
1169
#: bzrlib/builtins.py:2227
1170
msgid ""
1171
"\"bzr diff -p1\" is equivalent to \"bzr diff --prefix old/:new/\", and\n"
1172
"produces patches suitable for \"patch -p1\"."
1173
msgstr ""
1174
1175
#: bzrlib/builtins.py:2230
1176
msgid ""
1177
"Note that when using the -r argument with a range of revisions, the\n"
1178
"differences are computed between the two specified revisions. That\n"
1179
"is, the command does not show the changes introduced by the first \n"
1180
"revision in the range. This differs from the interpretation of \n"
1181
"revision ranges used by \"bzr log\" which includes the first revision\n"
1182
"in the range."
1183
msgstr ""
1184
1185
#: bzrlib/builtins.py:2237
1186
msgid ""
1187
":Exit values:\n"
1188
" 1 - changed\n"
1189
" 2 - unrepresentable changes\n"
1190
" 3 - error\n"
1191
" 0 - no change"
1192
msgstr ""
1193
1194
#: bzrlib/builtins.py:2243
1195
msgid ""
1196
":Examples:\n"
1197
" Shows the difference in the working tree versus the last commit::"
1198
msgstr ""
1199
1200
#: bzrlib/builtins.py:2246
1201
msgid " bzr diff"
1202
msgstr ""
1203
1204
#: bzrlib/builtins.py:2248
1205
msgid " Difference between the working tree and revision 1::"
1206
msgstr ""
1207
1208
#: bzrlib/builtins.py:2250
1209
msgid " bzr diff -r1"
1210
msgstr ""
1211
1212
#: bzrlib/builtins.py:2252
1213
msgid " Difference between revision 3 and revision 1::"
1214
msgstr ""
1215
1216
#: bzrlib/builtins.py:2254
1217
msgid " bzr diff -r1..3"
1218
msgstr ""
1219
1220
#: bzrlib/builtins.py:2256
1221
msgid " Difference between revision 3 and revision 1 for branch xxx::"
1222
msgstr ""
1223
1224
#: bzrlib/builtins.py:2258
1225
msgid " bzr diff -r1..3 xxx"
1226
msgstr ""
1227
1228
#: bzrlib/builtins.py:2260
1229
msgid " The changes introduced by revision 2 (equivalent to -r1..2)::"
1230
msgstr ""
1231
1232
#: bzrlib/builtins.py:2262
1233
msgid " bzr diff -c2"
1234
msgstr ""
1235
1236
#: bzrlib/builtins.py:2264
1237
msgid ""
1238
" To see the changes introduced by revision X::\n"
1239
" \n"
1240
" bzr diff -cX"
1241
msgstr ""
1242
1243
#: bzrlib/builtins.py:2268
1244
msgid ""
1245
" Note that in the case of a merge, the -c option shows the changes\n"
1246
" compared to the left hand parent. To see the changes against\n"
1247
" another parent, use::"
1248
msgstr ""
1249
1250
#: bzrlib/builtins.py:2272
1251
msgid " bzr diff -r<chosen_parent>..X"
1252
msgstr ""
1253
1254
#: bzrlib/builtins.py:2274
1255
msgid ""
1256
" The changes between the current revision and the previous revision\n"
1257
" (equivalent to -c-1 and -r-2..-1)"
1258
msgstr ""
1259
1260
#: bzrlib/builtins.py:2277
1261
msgid " bzr diff -r-2.."
1262
msgstr ""
1263
1264
#: bzrlib/builtins.py:2279
1265
msgid " Show just the differences for file NEWS::"
1266
msgstr ""
1267
1268
#: bzrlib/builtins.py:2281
1269
msgid " bzr diff NEWS"
1270
msgstr ""
1271
1272
#: bzrlib/builtins.py:2283
1273
msgid " Show the differences in working tree xxx for file NEWS::"
1274
msgstr ""
1275
1276
#: bzrlib/builtins.py:2285
1277
msgid " bzr diff xxx/NEWS"
1278
msgstr ""
1279
1280
#: bzrlib/builtins.py:2287
1281
msgid " Show the differences from branch xxx to this working tree:"
1282
msgstr ""
1283
1284
#: bzrlib/builtins.py:2289
1285
msgid " bzr diff --old xxx"
1286
msgstr ""
1287
1288
#: bzrlib/builtins.py:2291
1289
msgid " Show the differences between two branches for file NEWS::"
1290
msgstr ""
1291
1292
#: bzrlib/builtins.py:2293
1293
msgid " bzr diff --old xxx --new yyy NEWS"
1294
msgstr ""
1295
1296
#: bzrlib/builtins.py:2295
1297
msgid " Same as 'bzr diff' but prefix paths with old/ and new/::"
1298
msgstr ""
1299
1300
#: bzrlib/builtins.py:2297
1301
msgid ""
1302
" bzr diff --prefix old/:new/\n"
1303
" \n"
1304
" Show the differences using a custom diff program with options::\n"
1305
" \n"
1306
" bzr diff --using /usr/bin/diff --diff-options -wu"
1307
msgstr ""
1308
1309
#: bzrlib/builtins.py:2307
1310
msgid "Pass these options to the external diff program."
1311
msgstr ""
1312
1313
#: bzrlib/builtins.py:2310
1314
msgid ""
1315
"Set prefixes added to old and new filenames, as two values separated by a "
1316
"colon. (eg \"old/:new/\")."
1317
msgstr ""
1318
1319
#: bzrlib/builtins.py:2313
1320
msgid "Branch/tree to compare from."
1321
msgstr ""
1322
1323
#: bzrlib/builtins.py:2317
1324
msgid "Branch/tree to compare to."
1325
msgstr ""
1326
1327
#: bzrlib/builtins.py:2323
1328
msgid "Use this command to compare files."
1329
msgstr ""
1330
1331
#: bzrlib/builtins.py:2328
1332
msgid "Diff format to use."
1333
msgstr ""
1334
1335
#: bzrlib/builtins.py:2330
1336
msgid "Diff format"
1337
msgstr ""
1338
1339
#: bzrlib/builtins.py:2332
1340
msgid "How many lines of context to show."
1341
msgstr ""
1342
1343
#: bzrlib/builtins.py:2357
1344
msgid "--prefix expects two values separated by a colon (eg \"old/:new/\")"
1345
msgstr ""
1346
1347
#: bzrlib/builtins.py:2361
1348
msgid "bzr diff --revision takes exactly one or two revision specifiers"
1349
msgstr ""
1350
1351
#: bzrlib/builtins.py:2366 bzrlib/builtins.py:2763 bzrlib/builtins.py:2776
1352
#: bzrlib/builtins.py:2784 bzrlib/builtins.py:4957
1353
msgid "{0} and {1} are mutually exclusive"
1354
msgstr ""
1355
1356
#: bzrlib/builtins.py:2386
1357
msgid ""
1358
"List files deleted in the working tree.\n"
1359
" "
1360
msgstr ""
1361
1362
#: bzrlib/builtins.py:2463
1363
msgid "Show the tree root directory."
1364
msgstr ""
1365
1366
#: bzrlib/builtins.py:2465
1367
msgid ""
1368
"The root is the nearest enclosing directory with a .bzr control\n"
1369
"directory."
1370
msgstr ""
1371
1372
#: bzrlib/builtins.py:2480
1373
msgid "The limit argument must be an integer."
1374
msgstr ""
1375
1376
#: bzrlib/builtins.py:2488
1377
msgid "The levels argument must be an integer."
1378
msgstr ""
1379
1380
#: bzrlib/builtins.py:2493
1381
msgid "Show historical log for a branch or subset of a branch."
1382
msgstr ""
1383
1384
#: bzrlib/builtins.py:2495
1385
msgid ""
1386
"log is bzr's default tool for exploring the history of a branch.\n"
1387
"The branch to use is taken from the first parameter. If no parameters\n"
1388
"are given, the branch containing the working directory is logged.\n"
1389
"Here are some simple examples::"
1390
msgstr ""
1391
1392
#: bzrlib/builtins.py:2500
1393
msgid ""
1394
" bzr log log the current branch\n"
1395
" bzr log foo.py log a file in its branch\n"
1396
" bzr log http://server/branch log a branch on a server"
1397
msgstr ""
1398
1399
#: bzrlib/builtins.py:2504
1400
msgid ""
1401
"The filtering, ordering and information shown for each revision can\n"
1402
"be controlled as explained below. By default, all revisions are\n"
1403
"shown sorted (topologically) so that newer revisions appear before\n"
1404
"older ones and descendants always appear before ancestors. If displayed,\n"
1405
"merged revisions are shown indented under the revision in which they\n"
1406
"were merged."
1407
msgstr ""
1408
1409
#: bzrlib/builtins.py:2511
1410
msgid ":Output control:"
1411
msgstr ""
1412
1413
#: bzrlib/builtins.py:2513
1414
msgid ""
1415
" The log format controls how information about each revision is\n"
1416
" displayed. The standard log formats are called ``long``, ``short``\n"
1417
" and ``line``. The default is long. See ``bzr help log-formats``\n"
1418
" for more details on log formats."
1419
msgstr ""
1420
1421
#: bzrlib/builtins.py:2518
1422
msgid ""
1423
" The following options can be used to control what information is\n"
1424
" displayed::"
1425
msgstr ""
1426
1427
#: bzrlib/builtins.py:2521
1428
msgid ""
1429
" -l N display a maximum of N revisions\n"
1430
" -n N display N levels of revisions (0 for all, 1 for collapsed)\n"
1431
" -v display a status summary (delta) for each revision\n"
1432
" -p display a diff (patch) for each revision\n"
1433
" --show-ids display revision-ids (and file-ids), not just revnos"
1434
msgstr ""
1435
1436
#: bzrlib/builtins.py:2527
1437
msgid ""
1438
" Note that the default number of levels to display is a function of the\n"
1439
" log format. If the -n option is not used, the standard log formats show\n"
1440
" just the top level (mainline)."
1441
msgstr ""
1442
1443
#: bzrlib/builtins.py:2531
1444
msgid ""
1445
" Status summaries are shown using status flags like A, M, etc. To see\n"
1446
" the changes explained using words like ``added`` and ``modified``\n"
1447
" instead, use the -vv option."
1448
msgstr ""
1449
1450
#: bzrlib/builtins.py:2535
1451
msgid ":Ordering control:"
1452
msgstr ""
1453
1454
#: bzrlib/builtins.py:2537
1455
msgid ""
1456
" To display revisions from oldest to newest, use the --forward option.\n"
1457
" In most cases, using this option will have little impact on the total\n"
1458
" time taken to produce a log, though --forward does not incrementally\n"
1459
" display revisions like --reverse does when it can."
1460
msgstr ""
1461
1462
#: bzrlib/builtins.py:2542
1463
msgid ":Revision filtering:"
1464
msgstr ""
1465
1466
#: bzrlib/builtins.py:2544
1467
msgid ""
1468
" The -r option can be used to specify what revision or range of revisions\n"
1469
" to filter against. The various forms are shown below::"
1470
msgstr ""
1471
1472
#: bzrlib/builtins.py:2547
1473
msgid ""
1474
" -rX display revision X\n"
1475
" -rX.. display revision X and later\n"
1476
" -r..Y display up to and including revision Y\n"
1477
" -rX..Y display from X to Y inclusive"
1478
msgstr ""
1479
1480
#: bzrlib/builtins.py:2552
1481
msgid ""
1482
" See ``bzr help revisionspec`` for details on how to specify X and Y.\n"
1483
" Some common examples are given below::"
1484
msgstr ""
1485
1486
#: bzrlib/builtins.py:2555
1487
msgid ""
1488
" -r-1 show just the tip\n"
1489
" -r-10.. show the last 10 mainline revisions\n"
1490
" -rsubmit:.. show what's new on this branch\n"
1491
" -rancestor:path.. show changes since the common ancestor of this\n"
1492
" branch and the one at location path\n"
1493
" -rdate:yesterday.. show changes since yesterday"
1494
msgstr ""
1495
1496
#: bzrlib/builtins.py:2562
1497
msgid ""
1498
" When logging a range of revisions using -rX..Y, log starts at\n"
1499
" revision Y and searches back in history through the primary\n"
1500
" (\"left-hand\") parents until it finds X. When logging just the\n"
1501
" top level (using -n1), an error is reported if X is not found\n"
1502
" along the way. If multi-level logging is used (-n0), X may be\n"
1503
" a nested merge revision and the log will be truncated accordingly."
1504
msgstr ""
1505
1506
#: bzrlib/builtins.py:2569
1507
msgid ":Path filtering:"
1508
msgstr ""
1509
1510
#: bzrlib/builtins.py:2571
1511
msgid ""
1512
" If parameters are given and the first one is not a branch, the log\n"
1513
" will be filtered to show only those revisions that changed the\n"
1514
" nominated files or directories."
1515
msgstr ""
1516
1517
#: bzrlib/builtins.py:2575
1518
msgid ""
1519
" Filenames are interpreted within their historical context. To log a\n"
1520
" deleted file, specify a revision range so that the file existed at\n"
1521
" the end or start of the range."
1522
msgstr ""
1523
1524
#: bzrlib/builtins.py:2579
1525
msgid ""
1526
" Historical context is also important when interpreting pathnames of\n"
1527
" renamed files/directories. Consider the following example:"
1528
msgstr ""
1529
1530
#: bzrlib/builtins.py:2582
1531
msgid ""
1532
" * revision 1: add tutorial.txt\n"
1533
" * revision 2: modify tutorial.txt\n"
1534
" * revision 3: rename tutorial.txt to guide.txt; add tutorial.txt"
1535
msgstr ""
1536
1537
#: bzrlib/builtins.py:2586
1538
msgid " In this case:"
1539
msgstr ""
1540
1541
#: bzrlib/builtins.py:2588
1542
msgid " * ``bzr log guide.txt`` will log the file added in revision 1"
1543
msgstr ""
1544
1545
#: bzrlib/builtins.py:2590
1546
msgid ""
1547
" * ``bzr log tutorial.txt`` will log the new file added in revision 3"
1548
msgstr ""
1549
1550
#: bzrlib/builtins.py:2592
1551
msgid ""
1552
" * ``bzr log -r2 -p tutorial.txt`` will show the changes made to\n"
1553
" the original file in revision 2."
1554
msgstr ""
1555
1556
#: bzrlib/builtins.py:2595
1557
msgid ""
1558
" * ``bzr log -r2 -p guide.txt`` will display an error message as there\n"
1559
" was no file called guide.txt in revision 2."
1560
msgstr ""
1561
1562
#: bzrlib/builtins.py:2598
1563
msgid ""
1564
" Renames are always followed by log. By design, there is no need to\n"
1565
" explicitly ask for this (and no way to stop logging a file back\n"
1566
" until it was last renamed)."
1567
msgstr ""
1568
1569
#: bzrlib/builtins.py:2602
1570
msgid ":Other filtering:"
1571
msgstr ""
1572
1573
#: bzrlib/builtins.py:2604
1574
msgid ""
1575
" The --match option can be used for finding revisions that match a\n"
1576
" regular expression in a commit message, committer, author or bug.\n"
1577
" Specifying the option several times will match any of the supplied\n"
1578
" expressions. --match-author, --match-bugs, --match-committer and\n"
1579
" --match-message can be used to only match a specific field."
1580
msgstr ""
1581
1582
#: bzrlib/builtins.py:2610
1583
msgid ":Tips & tricks:"
1584
msgstr ""
1585
1586
#: bzrlib/builtins.py:2612
1587
msgid ""
1588
" GUI tools and IDEs are often better at exploring history than command\n"
1589
" line tools: you may prefer qlog or viz from qbzr or bzr-gtk, the\n"
1590
" bzr-explorer shell, or the Loggerhead web interface. See the Plugin\n"
1591
" Guide <http://doc.bazaar.canonical.com/plugins/en/> and\n"
1592
" <http://wiki.bazaar.canonical.com/IDEIntegration>. "
1593
msgstr ""
1594
1595
#: bzrlib/builtins.py:2618
1596
msgid ""
1597
" You may find it useful to add the aliases below to ``bazaar.conf``::"
1598
msgstr ""
1599
1600
#: bzrlib/builtins.py:2620
1601
msgid ""
1602
" [ALIASES]\n"
1603
" tip = log -r-1\n"
1604
" top = log -l10 --line\n"
1605
" show = log -v -p"
1606
msgstr ""
1607
1608
#: bzrlib/builtins.py:2625
1609
msgid ""
1610
" ``bzr tip`` will then show the latest revision while ``bzr top``\n"
1611
" will show the last 10 mainline revisions. To see the details of a\n"
1612
" particular revision X, ``bzr show -rX``."
1613
msgstr ""
1614
1615
#: bzrlib/builtins.py:2629
1616
msgid ""
1617
" If you are interested in looking deeper into a particular merge X,\n"
1618
" use ``bzr log -n0 -rX``."
1619
msgstr ""
1620
1621
#: bzrlib/builtins.py:2632
1622
msgid ""
1623
" ``bzr log -v`` on a branch with lots of history is currently\n"
1624
" very slow. A fix for this issue is currently under development.\n"
1625
" With or without that fix, it is recommended that a revision range\n"
1626
" be given when using the -v option."
1627
msgstr ""
1628
1629
#: bzrlib/builtins.py:2637
1630
msgid ""
1631
" bzr has a generic full-text matching plugin, bzr-search, that can be\n"
1632
" used to find revisions matching user names, commit messages, etc.\n"
1633
" Among other features, this plugin can find all revisions containing\n"
1634
" a list of words but not others."
1635
msgstr ""
1636
1637
#: bzrlib/builtins.py:2642
1638
msgid ""
1639
" When exploring non-mainline history on large projects with deep\n"
1640
" history, the performance of log can be greatly improved by installing\n"
1641
" the historycache plugin. This plugin buffers historical information\n"
1642
" trading disk space for faster speed."
1643
msgstr ""
1644
1645
#: bzrlib/builtins.py:2651
1646
msgid "Show from oldest to newest."
1647
msgstr ""
1648
1649
#: bzrlib/builtins.py:2654
1650
msgid "Show files changed in each revision."
1651
msgstr ""
1652
1653
#: bzrlib/builtins.py:2660
1654
msgid "Show just the specified revision. See also \"help revisionspec\"."
1655
msgstr ""
1656
1657
#: bzrlib/builtins.py:2664
1658
msgid "What names to list as authors - first, all or committer."
1659
msgstr ""
1660
1661
#: bzrlib/builtins.py:2665
1662
msgid "Authors"
1663
msgstr ""
1664
1665
#: bzrlib/builtins.py:2670
1666
msgid "Number of levels to display - 0 for all, 1 for flat."
1667
msgstr ""
1668
1669
#: bzrlib/builtins.py:2680
1670
msgid "Limit the output to the first N revisions."
1671
msgstr ""
1672
1673
#: bzrlib/builtins.py:2685
1674
msgid "Show changes made in each revision as a patch."
1675
msgstr ""
1676
1677
#: bzrlib/builtins.py:2687
1678
msgid "Show merged revisions like --levels 0 does."
1679
msgstr ""
1680
1681
#: bzrlib/builtins.py:2691
1682
msgid "Do not report commits with more than one parent."
1683
msgstr ""
1684
1685
#: bzrlib/builtins.py:2693
1686
msgid ""
1687
"Display only the revisions that are not part of both ancestries (require -"
1688
"rX..Y)."
1689
msgstr ""
1690
1691
#: bzrlib/builtins.py:2697
1692
msgid "Show digital signature validity."
1693
msgstr ""
1694
1695
#: bzrlib/builtins.py:2700
1696
msgid "Show revisions whose properties match this expression."
1697
msgstr ""
1698
1699
#: bzrlib/builtins.py:2704
1700
msgid "Show revisions whose message matches this expression."
1701
msgstr ""
1702
1703
#: bzrlib/builtins.py:2708
1704
msgid "Show revisions whose committer matches this expression."
1705
msgstr ""
1706
1707
#: bzrlib/builtins.py:2712
1708
msgid "Show revisions whose authors match this expression."
1709
msgstr ""
1710
1711
#: bzrlib/builtins.py:2716
1712
msgid "Show revisions whose bugs match this expression."
1713
msgstr ""
1714
1715
#: bzrlib/builtins.py:2770
1716
msgid "--exclude-common-ancestry requires -r with two revisions"
1717
msgstr ""
1718
1719
#: bzrlib/builtins.py:2798
1720
#, python-format
1721
msgid "Path unknown at end or start of revision range: %s"
1722
msgstr ""
1723
1724
#: bzrlib/builtins.py:2915
1725
#, python-format
1726
msgid "bzr %s doesn't accept two revisions in different branches."
1727
msgstr ""
1728
1729
#: bzrlib/builtins.py:2931
1730
#, python-format
1731
msgid "bzr %s --revision takes one or two values."
1732
msgstr ""
1733
1734
#: bzrlib/builtins.py:2976
1735
msgid ""
1736
"List files in a tree.\n"
1737
" "
1738
msgstr ""
1739
1740
#: bzrlib/builtins.py:2985
1741
msgid "Recurse into subdirectories."
1742
msgstr ""
1743
1744
#: bzrlib/builtins.py:2987
1745
msgid "Print paths relative to the root of the branch."
1746
msgstr ""
1747
1748
#: bzrlib/builtins.py:2989
1749
msgid "Print unknown files."
1750
msgstr ""
1751
1752
#: bzrlib/builtins.py:2990
1753
msgid "Print versioned files."
1754
msgstr ""
1755
1756
#: bzrlib/builtins.py:2993
1757
msgid "Print ignored files."
1758
msgstr ""
1759
1760
#: bzrlib/builtins.py:2995
1761
msgid "List entries of a particular kind: file, directory, symlink."
1762
msgstr ""
1763
1764
#: bzrlib/builtins.py:3008
1765
msgid "invalid kind specified"
1766
msgstr ""
1767
1768
#: bzrlib/builtins.py:3011
1769
msgid "Cannot set both --verbose and --null"
1770
msgstr ""
1771
1772
#: bzrlib/builtins.py:3020
1773
msgid "cannot specify both --from-root and PATH"
1774
msgstr ""
1775
1776
#: bzrlib/builtins.py:3107
1777
msgid "Ignore specified files or patterns."
1778
msgstr ""
1779
1780
#: bzrlib/builtins.py:3109
1781
msgid "See ``bzr help patterns`` for details on the syntax of patterns."
1782
msgstr ""
1783
1784
#: bzrlib/builtins.py:3111
1785
msgid ""
1786
"If a .bzrignore file does not exist, the ignore command\n"
1787
"will create one and add the specified files or patterns to the newly\n"
1788
"created file. The ignore command will also automatically add the \n"
1789
".bzrignore file to be versioned. Creating a .bzrignore file without\n"
1790
"the use of the ignore command will require an explicit add command."
1791
msgstr ""
1792
1793
#: bzrlib/builtins.py:3117
1794
msgid ""
1795
"To remove patterns from the ignore list, edit the .bzrignore file.\n"
1796
"After adding, editing or deleting that file either indirectly by\n"
1797
"using this command or directly by using an editor, be sure to commit\n"
1798
"it."
1799
msgstr ""
1800
1801
#: bzrlib/builtins.py:3122
1802
msgid ""
1803
"Bazaar also supports a global ignore file ~/.bazaar/ignore. On Windows\n"
1804
"the global ignore file can be found in the application data directory as\n"
1805
"C:\\Documents and Settings\\<user>\\Application Data\\Bazaar\\2.0\\ignore.\n"
1806
"Global ignores are not touched by this command. The global ignore file\n"
1807
"can be edited directly using an editor."
1808
msgstr ""
1809
1810
#: bzrlib/builtins.py:3128
1811
msgid ""
1812
"Patterns prefixed with '!' are exceptions to ignore patterns and take\n"
1813
"precedence over regular ignores. Such exceptions are used to specify\n"
1814
"files that should be versioned which would otherwise be ignored."
1815
msgstr ""
1816
1817
#: bzrlib/builtins.py:3132
1818
msgid ""
1819
"Patterns prefixed with '!!' act as regular ignore patterns, but have\n"
1820
"precedence over the '!' exception patterns."
1821
msgstr ""
1822
1823
#: bzrlib/builtins.py:3135
1824
msgid ""
1825
":Notes: \n"
1826
" \n"
1827
"* Ignore patterns containing shell wildcards must be quoted from\n"
1828
" the shell on Unix."
1829
msgstr ""
1830
1831
#: bzrlib/builtins.py:3140
1832
msgid ""
1833
"* Ignore patterns starting with \"#\" act as comments in the ignore file.\n"
1834
" To ignore patterns that begin with that character, use the \"RE:\" prefix."
1835
msgstr ""
1836
1837
#: bzrlib/builtins.py:3143
1838
msgid ""
1839
":Examples:\n"
1840
" Ignore the top level Makefile::"
1841
msgstr ""
1842
1843
#: bzrlib/builtins.py:3146
1844
msgid " bzr ignore ./Makefile"
1845
msgstr ""
1846
1847
#: bzrlib/builtins.py:3148
1848
msgid " Ignore .class files in all directories...::"
1849
msgstr ""
1850
1851
#: bzrlib/builtins.py:3150
1852
msgid " bzr ignore \"*.class\""
1853
msgstr ""
1854
1855
#: bzrlib/builtins.py:3152
1856
msgid " ...but do not ignore \"special.class\"::"
1857
msgstr ""
1858
1859
#: bzrlib/builtins.py:3154
1860
msgid " bzr ignore \"!special.class\""
1861
msgstr ""
1862
1863
#: bzrlib/builtins.py:3156
1864
msgid " Ignore files whose name begins with the \"#\" character::"
1865
msgstr ""
1866
1867
#: bzrlib/builtins.py:3158
1868
msgid " bzr ignore \"RE:^#\""
1869
msgstr ""
1870
1871
#: bzrlib/builtins.py:3160 bzrlib/builtins.py:3164
1872
msgid " Ignore .o files under the lib directory::"
1873
msgstr ""
1874
1875
#: bzrlib/builtins.py:3162
1876
msgid " bzr ignore \"lib/**/*.o\""
1877
msgstr ""
1878
1879
#: bzrlib/builtins.py:3166
1880
msgid " bzr ignore \"RE:lib/.*\\.o\""
1881
msgstr ""
1882
1883
#: bzrlib/builtins.py:3168
1884
msgid " Ignore everything but the \"debian\" toplevel directory::"
1885
msgstr ""
1886
1887
#: bzrlib/builtins.py:3170
1888
msgid ""
1889
" bzr ignore \"RE:(?!debian/).*\"\n"
1890
" \n"
1891
" Ignore everything except the \"local\" toplevel directory,\n"
1892
" but always ignore autosave files ending in ~, even under local/::\n"
1893
" \n"
1894
" bzr ignore \"*\"\n"
1895
" bzr ignore \"!./local\"\n"
1896
" bzr ignore \"!!*~\""
1897
msgstr ""
1898
1899
#: bzrlib/builtins.py:3184
1900
msgid "Display the default ignore rules that bzr uses."
1901
msgstr ""
1902
1903
#: bzrlib/builtins.py:3196
1904
msgid "ignore requires at least one NAME_PATTERN or --default-rules."
1905
msgstr ""
1906
1907
#: bzrlib/builtins.py:3207
1908
#, python-format
1909
msgid "Invalid ignore pattern found. %s"
1910
msgid_plural "Invalid ignore patterns found. %s"
1911
msgstr[0] ""
1912
msgstr[1] ""
1913
1914
#: bzrlib/builtins.py:3216
1915
msgid "NAME_PATTERN should not be an absolute path"
1916
msgstr ""
1917
1918
#: bzrlib/builtins.py:3229
1919
#, python-format
1920
msgid ""
1921
"Warning: the following files are version controlled and match your ignore "
1922
"pattern:\n"
1923
"%s\n"
1924
"These files will continue to be version controlled unless you 'bzr remove' "
1925
"them.\n"
1926
msgstr ""
1927
1928
#: bzrlib/builtins.py:3236
1929
msgid "List ignored files and the patterns that matched them."
1930
msgstr ""
1931
1932
#: bzrlib/builtins.py:3238
1933
msgid ""
1934
"List all the ignored files and the ignore pattern that caused the file to\n"
1935
"be ignored."
1936
msgstr ""
1937
1938
#: bzrlib/builtins.py:3241
1939
msgid "Alternatively, to list just the files::"
1940
msgstr ""
1941
1942
#: bzrlib/builtins.py:3243
1943
msgid " bzr ls --ignored"
1944
msgstr ""
1945
1946
#: bzrlib/builtins.py:3277
1947
#, python-format
1948
msgid "not a valid revision-number: %r"
1949
msgstr ""
1950
1951
#: bzrlib/builtins.py:3284
1952
msgid ""
1953
"Export current or past revision to a destination directory or archive."
1954
msgstr ""
1955
1956
#: bzrlib/builtins.py:3286
1957
msgid "If no revision is specified this exports the last committed revision."
1958
msgstr ""
1959
1960
#: bzrlib/builtins.py:3288
1961
msgid ""
1962
"Format may be an \"exporter\" name, such as tar, tgz, tbz2. If none is\n"
1963
"given, try to find the format with the extension. If no extension\n"
1964
"is found exports to a directory (equivalent to --format=dir)."
1965
msgstr ""
1966
1967
#: bzrlib/builtins.py:3292
1968
msgid ""
1969
"If root is supplied, it will be used as the root directory inside\n"
1970
"container formats (tar, zip, etc). If it is not supplied it will default\n"
1971
"to the exported filename. The root option has no effect for 'dir' format."
1972
msgstr ""
1973
1974
#: bzrlib/builtins.py:3296
1975
msgid ""
1976
"If branch is omitted then the branch containing the current working\n"
1977
"directory will be used."
1978
msgstr ""
1979
1980
#: bzrlib/builtins.py:3299
1981
msgid ""
1982
"Note: Export of tree with non-ASCII filenames to zip is not supported."
1983
msgstr ""
1984
1985
#: bzrlib/builtins.py:3301
1986
msgid ""
1987
" ================= =========================\n"
1988
" Supported formats Autodetected by extension\n"
1989
" ================= =========================\n"
1990
" dir (none)\n"
1991
" tar .tar\n"
1992
" tbz2 .tar.bz2, .tbz2\n"
1993
" tgz .tar.gz, .tgz\n"
1994
" zip .zip\n"
1995
" ================= ========================="
1996
msgstr ""
1997
1998
#: bzrlib/builtins.py:3315
1999
msgid "Type of file to export to."
2000
msgstr ""
2001
2002
#: bzrlib/builtins.py:3318
2003
msgid "Apply content filters to export the convenient form."
2004
msgstr ""
2005
2006
#: bzrlib/builtins.py:3322
2007
msgid "Name of the root directory inside the exported file."
2008
msgstr ""
2009
2010
#: bzrlib/builtins.py:3324
2011
msgid ""
2012
"Set modification time of files to that of the last revision in which it was "
2013
"changed."
2014
msgstr ""
2015
2016
#: bzrlib/builtins.py:3327
2017
msgid ""
2018
"Export the working tree contents rather than that of the last revision."
2019
msgstr ""
2020
2021
#: bzrlib/builtins.py:3346
2022
msgid "--uncommitted requires a working tree"
2023
msgstr ""
2024
2025
#: bzrlib/builtins.py:3355
2026
#, python-format
2027
msgid "Unsupported export format: %s"
2028
msgstr ""
2029
2030
#: bzrlib/builtins.py:3359
2031
msgid ""
2032
"Write the contents of a file as of a given revision to standard output."
2033
msgstr ""
2034
2035
#: bzrlib/builtins.py:3361
2036
msgid "If no revision is nominated, the last revision is used."
2037
msgstr ""
2038
2039
#: bzrlib/builtins.py:3363
2040
msgid ""
2041
"Note: Take care to redirect standard output when using this command on a\n"
2042
"binary file."
2043
msgstr ""
2044
2045
#: bzrlib/builtins.py:3369
2046
msgid "The path name in the old tree."
2047
msgstr ""
2048
2049
#: bzrlib/builtins.py:3370
2050
msgid "Apply content filters to display the convenience form."
2051
msgstr ""
2052
2053
#: bzrlib/builtins.py:3381
2054
msgid "bzr cat --revision takes exactly one revision specifier"
2055
msgstr ""
2056
2057
#: bzrlib/builtins.py:3406 bzrlib/builtins.py:3418
2058
msgid "{0!r} is not present in revision {1}"
2059
msgstr ""
2060
2061
#: bzrlib/builtins.py:3441
2062
msgid "Commit changes into a new revision."
2063
msgstr ""
2064
2065
#: bzrlib/builtins.py:3443
2066
msgid ""
2067
"An explanatory message needs to be given for each commit. This is\n"
2068
"often done by using the --message option (getting the message from the\n"
2069
"command line) or by using the --file option (getting the message from\n"
2070
"a file). If neither of these options is given, an editor is opened for\n"
2071
"the user to enter the message. To see the changed files in the\n"
2072
"boilerplate text loaded into the editor, use the --show-diff option."
2073
msgstr ""
2074
2075
#: bzrlib/builtins.py:3450
2076
msgid ""
2077
"By default, the entire tree is committed and the person doing the\n"
2078
"commit is assumed to be the author. These defaults can be overridden\n"
2079
"as explained below."
2080
msgstr ""
2081
2082
#: bzrlib/builtins.py:3454
2083
msgid ":Selective commits:"
2084
msgstr ""
2085
2086
#: bzrlib/builtins.py:3456
2087
msgid ""
2088
" If selected files are specified, only changes to those files are\n"
2089
" committed. If a directory is specified then the directory and\n"
2090
" everything within it is committed."
2091
msgstr ""
2092
2093
#: bzrlib/builtins.py:3460
2094
msgid ""
2095
" When excludes are given, they take precedence over selected files.\n"
2096
" For example, to commit only changes within foo, but not changes\n"
2097
" within foo/bar::"
2098
msgstr ""
2099
2100
#: bzrlib/builtins.py:3464
2101
msgid " bzr commit foo -x foo/bar"
2102
msgstr ""
2103
2104
#: bzrlib/builtins.py:3466
2105
msgid " A selective commit after a merge is not yet supported."
2106
msgstr ""
2107
2108
#: bzrlib/builtins.py:3468
2109
msgid ":Custom authors:"
2110
msgstr ""
2111
2112
#: bzrlib/builtins.py:3470
2113
msgid ""
2114
" If the author of the change is not the same person as the committer,\n"
2115
" you can specify the author's name using the --author option. The\n"
2116
" name should be in the same format as a committer-id, e.g.\n"
2117
" \"John Doe <jdoe@example.com>\". If there is more than one author of\n"
2118
" the change you can specify the option multiple times, once for each\n"
2119
" author."
2120
msgstr ""
2121
2122
#: bzrlib/builtins.py:3477
2123
msgid ":Checks:"
2124
msgstr ""
2125
2126
#: bzrlib/builtins.py:3479
2127
msgid ""
2128
" A common mistake is to forget to add a new file or directory before\n"
2129
" running the commit command. The --strict option checks for unknown\n"
2130
" files and aborts the commit if any are found. More advanced pre-commit\n"
2131
" checks can be implemented by defining hooks. See ``bzr help hooks``\n"
2132
" for details."
2133
msgstr ""
2134
2135
#: bzrlib/builtins.py:3485
2136
msgid ":Things to note:"
2137
msgstr ""
2138
2139
#: bzrlib/builtins.py:3487
2140
msgid ""
2141
" If you accidentially commit the wrong changes or make a spelling\n"
2142
" mistake in the commit message say, you can use the uncommit command\n"
2143
" to undo it. See ``bzr help uncommit`` for details."
2144
msgstr ""
2145
2146
#: bzrlib/builtins.py:3491
2147
msgid ""
2148
" Hooks can also be configured to run after a commit. This allows you\n"
2149
" to trigger updates to external systems like bug trackers. The --fixes\n"
2150
" option can be used to record the association between a revision and\n"
2151
" one or more bugs. See ``bzr help bugs`` for details."
2152
msgstr ""
2153
2154
#: bzrlib/builtins.py:3501
2155
msgid "Do not consider changes made to a given path."
2156
msgstr ""
2157
2158
#: bzrlib/builtins.py:3504
2159
msgid "Description of the new revision."
2160
msgstr ""
2161
2162
#: bzrlib/builtins.py:3507
2163
msgid "Commit even if nothing has changed."
2164
msgstr ""
2165
2166
#: bzrlib/builtins.py:3511
2167
msgid "Take commit message from this file."
2168
msgstr ""
2169
2170
#: bzrlib/builtins.py:3513
2171
msgid "Refuse to commit if there are unknown files in the working tree."
2172
msgstr ""
2173
2174
#: bzrlib/builtins.py:3516
2175
msgid ""
2176
"Manually set a commit time using commit date format, e.g. '2009-10-10 "
2177
"08:00:00 +0100'."
2178
msgstr ""
2179
2180
#: bzrlib/builtins.py:3519
2181
msgid "Mark a bug as being fixed by this revision (see \"bzr help bugs\")."
2182
msgstr ""
2183
2184
#: bzrlib/builtins.py:3522
2185
msgid "Set the author's name, if it's different from the committer."
2186
msgstr ""
2187
2188
#: bzrlib/builtins.py:3525
2189
msgid ""
2190
"Perform a local commit in a bound branch. Local commits are not pushed to "
2191
"the master branch until a normal commit is performed."
2192
msgstr ""
2193
2194
#: bzrlib/builtins.py:3531
2195
msgid ""
2196
"When no message is supplied, show the diff along with the status summary in "
2197
"the message editor."
2198
msgstr ""
2199
2200
#: bzrlib/builtins.py:3534
2201
msgid ""
2202
"When committing to a foreign version control system do not push data that "
2203
"can not be natively represented."
2204
msgstr ""
2205
2206
#: bzrlib/builtins.py:3552
2207
#, python-format
2208
msgid ""
2209
"No tracker specified for bug %s. Use the form 'tracker:id' or specify a "
2210
"default bug tracker using the `bugtracker` option.\n"
2211
"See \"bzr help bugs\" for more information on this feature. Commit refused."
2212
msgstr ""
2213
2214
#: bzrlib/builtins.py:3561
2215
#, python-format
2216
msgid ""
2217
"Invalid bug %s. Must be in the form of 'tracker:id'. See \"bzr help bugs\" "
2218
"for more information on this feature.\n"
2219
"Commit refused."
2220
msgstr ""
2221
2222
#: bzrlib/builtins.py:3570
2223
#, python-format
2224
msgid "Unrecognized bug %s. Commit refused."
2225
msgstr ""
2226
2227
#: bzrlib/builtins.py:3573
2228
#, python-format
2229
msgid ""
2230
"%s\n"
2231
"Commit refused."
2232
msgstr ""
2233
2234
#: bzrlib/builtins.py:3597
2235
msgid "Could not parse --commit-time: "
2236
msgstr ""
2237
2238
#: bzrlib/builtins.py:3637
2239
msgid "please specify either --message or --file"
2240
msgstr ""
2241
2242
#: bzrlib/builtins.py:3666
2243
msgid "please specify a commit message with either --message or --file"
2244
msgstr ""
2245
2246
#: bzrlib/builtins.py:3669
2247
msgid ""
2248
"Empty commit message specified. Please specify a commit message with either -"
2249
"-message or --file or leave a blank message with --message \"\"."
2250
msgstr ""
2251
2252
#: bzrlib/builtins.py:3689
2253
msgid ""
2254
"No changes to commit. Please 'bzr add' the files you want to commit, or use -"
2255
"-unchanged to force an empty commit."
2256
msgstr ""
2257
2258
#: bzrlib/builtins.py:3693
2259
msgid ""
2260
"Conflicts detected in working tree. Use \"bzr conflicts\" to list, \"bzr "
2261
"resolve FILE\" to resolve."
2262
msgstr ""
2263
2264
#: bzrlib/builtins.py:3697
2265
msgid "Commit refused because there are unknown files in the working tree."
2266
msgstr ""
2267
2268
#: bzrlib/builtins.py:3700
2269
msgid ""
2270
"\n"
2271
"To commit to master branch, run update and then commit.\n"
2272
"You can also pass --local to commit to continue working disconnected."
2273
msgstr ""
2274
2275
#: bzrlib/builtins.py:3708
2276
msgid ""
2277
"Validate working tree structure, branch consistency and repository history."
2278
msgstr ""
2279
2280
#: bzrlib/builtins.py:3710
2281
msgid ""
2282
"This command checks various invariants about branch and repository storage\n"
2283
"to detect data corruption or bzr bugs."
2284
msgstr ""
2285
2286
#: bzrlib/builtins.py:3713
2287
msgid ""
2288
"The working tree and branch checks will only give output if a problem is\n"
2289
"detected. The output fields of the repository check are:"
2290
msgstr ""
2291
2292
#: bzrlib/builtins.py:3716
2293
msgid ""
2294
"revisions\n"
2295
" This is just the number of revisions checked. It doesn't\n"
2296
" indicate a problem."
2297
msgstr ""
2298
2299
#: bzrlib/builtins.py:3720
2300
msgid ""
2301
"versionedfiles\n"
2302
" This is just the number of versionedfiles checked. It\n"
2303
" doesn't indicate a problem."
2304
msgstr ""
2305
2306
#: bzrlib/builtins.py:3724
2307
msgid ""
2308
"unreferenced ancestors\n"
2309
" Texts that are ancestors of other texts, but\n"
2310
" are not properly referenced by the revision ancestry. This is a\n"
2311
" subtle problem that Bazaar can work around."
2312
msgstr ""
2313
2314
#: bzrlib/builtins.py:3729
2315
msgid ""
2316
"unique file texts\n"
2317
" This is the total number of unique file contents\n"
2318
" seen in the checked revisions. It does not indicate a problem."
2319
msgstr ""
2320
2321
#: bzrlib/builtins.py:3733
2322
msgid ""
2323
"repeated file texts\n"
2324
" This is the total number of repeated texts seen\n"
2325
" in the checked revisions. Texts can be repeated when their file\n"
2326
" entries are modified, but the file contents are not. It does not\n"
2327
" indicate a problem."
2328
msgstr ""
2329
2330
#: bzrlib/builtins.py:3739
2331
msgid ""
2332
"If no restrictions are specified, all Bazaar data that is found at the "
2333
"given\n"
2334
"location will be checked."
2335
msgstr ""
2336
2337
#: bzrlib/builtins.py:3744
2338
msgid " Check the tree and branch at 'foo'::"
2339
msgstr ""
2340
2341
#: bzrlib/builtins.py:3746
2342
msgid " bzr check --tree --branch foo"
2343
msgstr ""
2344
2345
#: bzrlib/builtins.py:3748
2346
msgid " Check only the repository at 'bar'::"
2347
msgstr ""
2348
2349
#: bzrlib/builtins.py:3750
2350
msgid " bzr check --repo bar"
2351
msgstr ""
2352
2353
#: bzrlib/builtins.py:3752
2354
msgid " Check everything at 'baz'::"
2355
msgstr ""
2356
2357
#: bzrlib/builtins.py:3754
2358
msgid " bzr check baz"
2359
msgstr ""
2360
2361
#: bzrlib/builtins.py:3760
2362
msgid "Check the branch related to the current directory."
2363
msgstr ""
2364
2365
#: bzrlib/builtins.py:3762
2366
msgid "Check the repository related to the current directory."
2367
msgstr ""
2368
2369
#: bzrlib/builtins.py:3764
2370
msgid "Check the working tree related to the current directory."
2371
msgstr ""
2372
2373
#: bzrlib/builtins.py:3778
2374
msgid "Upgrade a repository, branch or working tree to a newer format."
2375
msgstr ""
2376
2377
#: bzrlib/builtins.py:3780
2378
msgid ""
2379
"When the default format has changed after a major new release of\n"
2380
"Bazaar, you may be informed during certain operations that you\n"
2381
"should upgrade. Upgrading to a newer format may improve performance\n"
2382
"or make new features available. It may however limit interoperability\n"
2383
"with older repositories or with older versions of Bazaar."
2384
msgstr ""
2385
2386
#: bzrlib/builtins.py:3786
2387
msgid ""
2388
"If you wish to upgrade to a particular format rather than the\n"
2389
"current default, that can be specified using the --format option.\n"
2390
"As a consequence, you can use the upgrade command this way to\n"
2391
"\"downgrade\" to an earlier format, though some conversions are\n"
2392
"a one way process (e.g. changing from the 1.x default to the\n"
2393
"2.x default) so downgrading is not always possible."
2394
msgstr ""
2395
2396
#: bzrlib/builtins.py:3793
2397
msgid ""
2398
"A backup.bzr.~#~ directory is created at the start of the conversion\n"
2399
"process (where # is a number). By default, this is left there on\n"
2400
"completion. If the conversion fails, delete the new .bzr directory\n"
2401
"and rename this one back in its place. Use the --clean option to ask\n"
2402
"for the backup.bzr directory to be removed on successful conversion.\n"
2403
"Alternatively, you can delete it by hand if everything looks good\n"
2404
"afterwards."
2405
msgstr ""
2406
2407
#: bzrlib/builtins.py:3801
2408
msgid ""
2409
"If the location given is a shared repository, dependent branches\n"
2410
"are also converted provided the repository converts successfully.\n"
2411
"If the conversion of a branch fails, remaining branches are still\n"
2412
"tried."
2413
msgstr ""
2414
2415
#: bzrlib/builtins.py:3806
2416
msgid ""
2417
"For more information on upgrades, see the Bazaar Upgrade Guide,\n"
2418
"http://doc.bazaar.canonical.com/latest/en/upgrade-guide/."
2419
msgstr ""
2420
2421
#: bzrlib/builtins.py:3814
2422
msgid "Upgrade to a specific format. See \"bzr help formats\" for details."
2423
msgstr ""
2424
2425
#: bzrlib/builtins.py:3818
2426
msgid "Branch format"
2427
msgstr ""
2428
2429
#: bzrlib/builtins.py:3820
2430
msgid "Remove the backup.bzr directory if successful."
2431
msgstr ""
2432
2433
#: bzrlib/builtins.py:3822
2434
msgid "Show what would be done, but don't actually do anything."
2435
msgstr ""
2436
2437
#: bzrlib/builtins.py:3837
2438
msgid "Show or set bzr user id."
2439
msgstr ""
2440
2441
#: bzrlib/builtins.py:3839
2442
msgid ""
2443
":Examples:\n"
2444
" Show the email of the current user::"
2445
msgstr ""
2446
2447
#: bzrlib/builtins.py:3842
2448
msgid " bzr whoami --email"
2449
msgstr ""
2450
2451
#: bzrlib/builtins.py:3844
2452
msgid " Set the current user::"
2453
msgstr ""
2454
2455
#: bzrlib/builtins.py:3846
2456
msgid " bzr whoami \"Frank Chu <fchu@example.com>\""
2457
msgstr ""
2458
2459
#: bzrlib/builtins.py:3850
2460
msgid "Display email address only."
2461
msgstr ""
2462
2463
#: bzrlib/builtins.py:3852
2464
msgid "Set identity for the current branch instead of globally."
2465
msgstr ""
2466
2467
#: bzrlib/builtins.py:3878
2468
msgid "--email can only be used to display existing identity"
2469
msgstr ""
2470
2471
#: bzrlib/builtins.py:3902
2472
msgid "Print or set the branch nickname."
2473
msgstr ""
2474
2475
#: bzrlib/builtins.py:3904
2476
msgid ""
2477
"If unset, the colocated branch name is used for colocated branches, and\n"
2478
"the branch directory name is used for other branches. To print the\n"
2479
"current nickname, execute with no argument."
2480
msgstr ""
2481
2482
#: bzrlib/builtins.py:3908
2483
msgid ""
2484
"Bound branches use the nickname of its master branch unless it is set\n"
2485
"locally."
2486
msgstr ""
2487
2488
#: bzrlib/builtins.py:3928
2489
msgid "Set/unset and display aliases."
2490
msgstr ""
2491
2492
#: bzrlib/builtins.py:3930
2493
msgid ""
2494
":Examples:\n"
2495
" Show the current aliases::"
2496
msgstr ""
2497
2498
#: bzrlib/builtins.py:3933
2499
msgid " bzr alias"
2500
msgstr ""
2501
2502
#: bzrlib/builtins.py:3935
2503
msgid " Show the alias specified for 'll'::"
2504
msgstr ""
2505
2506
#: bzrlib/builtins.py:3937
2507
msgid " bzr alias ll"
2508
msgstr ""
2509
2510
#: bzrlib/builtins.py:3939
2511
msgid " Set an alias for 'll'::"
2512
msgstr ""
2513
2514
#: bzrlib/builtins.py:3941
2515
msgid " bzr alias ll=\"log --line -r-10..-1\""
2516
msgstr ""
2517
2518
#: bzrlib/builtins.py:3943
2519
msgid " To remove an alias for 'll'::"
2520
msgstr ""
2521
2522
#: bzrlib/builtins.py:3945
2523
msgid " bzr alias --remove ll"
2524
msgstr ""
2525
2526
#: bzrlib/builtins.py:3950
2527
msgid "Remove the alias."
2528
msgstr ""
2529
2530
#: bzrlib/builtins.py:3968
2531
msgid "bzr alias --remove expects an alias to remove."
2532
msgstr ""
2533
2534
#: bzrlib/builtins.py:4149
2535
msgid ""
2536
"subunit not available. subunit needs to be installed to use --subunit."
2537
msgstr ""
2538
2539
#: bzrlib/builtins.py:4166
2540
msgid ""
2541
"--benchmark is no longer supported from bzr 2.2; use bzr-usertest instead"
2542
msgstr ""
2543
2544
#: bzrlib/builtins.py:4213
2545
msgid "Show version of bzr."
2546
msgstr ""
2547
2548
#: bzrlib/builtins.py:4217
2549
msgid "Print just the version number."
2550
msgstr ""
2551
2552
#: bzrlib/builtins.py:4236
2553
msgid "It sure does!\n"
2554
msgstr ""
2555
2556
#: bzrlib/builtins.py:4260
2557
#, python-format
2558
msgid "merge base is revision %s\n"
2559
msgstr ""
2560
2561
#: bzrlib/builtins.py:4264
2562
msgid "Perform a three-way merge."
2563
msgstr ""
2564
2565
#: bzrlib/builtins.py:4266
2566
msgid ""
2567
"The source of the merge can be specified either in the form of a branch,\n"
2568
"or in the form of a path to a file containing a merge directive generated\n"
2569
"with bzr send. If neither is specified, the default is the upstream branch\n"
2570
"or the branch most recently merged using --remember. The source of the\n"
2571
"merge may also be specified in the form of a path to a file in another\n"
2572
"branch: in this case, only the modifications to that file are merged into\n"
2573
"the current working tree."
2574
msgstr ""
2575
2576
#: bzrlib/builtins.py:4274
2577
msgid ""
2578
"When merging from a branch, by default bzr will try to merge in all new\n"
2579
"work from the other branch, automatically determining an appropriate base\n"
2580
"revision. If this fails, you may need to give an explicit base."
2581
msgstr ""
2582
2583
#: bzrlib/builtins.py:4278
2584
msgid ""
2585
"To pick a different ending revision, pass \"--revision OTHER\". bzr will\n"
2586
"try to merge in all new work up to and including revision OTHER."
2587
msgstr ""
2588
2589
#: bzrlib/builtins.py:4281
2590
msgid ""
2591
"If you specify two values, \"--revision BASE..OTHER\", only revisions BASE\n"
2592
"through OTHER, excluding BASE but including OTHER, will be merged. If this\n"
2593
"causes some revisions to be skipped, i.e. if the destination branch does\n"
2594
"not already contain revision BASE, such a merge is commonly referred to as\n"
2595
"a \"cherrypick\". Unlike a normal merge, Bazaar does not currently track\n"
2596
"cherrypicks. The changes look like a normal commit, and the history of the\n"
2597
"changes from the other branch is not stored in the commit."
2598
msgstr ""
2599
2600
#: bzrlib/builtins.py:4289
2601
msgid "Revision numbers are always relative to the source branch."
2602
msgstr ""
2603
2604
#: bzrlib/builtins.py:4291 bzrlib/conflicts.py:52 bzrlib/conflicts.py:106
2605
msgid ""
2606
"Merge will do its best to combine the changes in two branches, but there\n"
2607
"are some kinds of problems only a human can fix. When it encounters those,\n"
2608
"it will mark a conflict. A conflict means that you need to fix something,\n"
2609
"before you can commit."
2610
msgstr ""
2611
2612
#: bzrlib/builtins.py:4296
2613
msgid ""
2614
"Use bzr resolve when you have fixed a problem. See also bzr conflicts."
2615
msgstr ""
2616
2617
#: bzrlib/builtins.py:4298
2618
msgid ""
2619
"If there is no default branch set, the first merge will set it (use\n"
2620
"--no-remember to avoid setting it). After that, you can omit the branch\n"
2621
"to use the default. To change the default, use --remember. The value will\n"
2622
"only be saved if the remote location can be accessed."
2623
msgstr ""
2624
2625
#: bzrlib/builtins.py:4303
2626
msgid ""
2627
"The results of the merge are placed into the destination working\n"
2628
"directory, where they can be reviewed (with bzr diff), tested, and then\n"
2629
"committed to record the result of the merge."
2630
msgstr ""
2631
2632
#: bzrlib/builtins.py:4307
2633
msgid ""
2634
"merge refuses to run if there are any uncommitted changes, unless\n"
2635
"--force is given. If --force is given, then the changes from the source \n"
2636
"will be merged with the current working tree, including any uncommitted\n"
2637
"changes in the tree. The --force option can also be used to create a\n"
2638
"merge revision which has more than two parents."
2639
msgstr ""
2640
2641
#: bzrlib/builtins.py:4313
2642
msgid ""
2643
"If one would like to merge changes from the working tree of the other\n"
2644
"branch without merging any committed revisions, the --uncommitted option\n"
2645
"can be given."
2646
msgstr ""
2647
2648
#: bzrlib/builtins.py:4317
2649
msgid ""
2650
"To select only some changes to merge, use \"merge -i\", which will prompt\n"
2651
"you to apply each diff hunk and file change, similar to \"shelve\"."
2652
msgstr ""
2653
2654
#: bzrlib/builtins.py:4320
2655
msgid ""
2656
":Examples:\n"
2657
" To merge all new revisions from bzr.dev::"
2658
msgstr ""
2659
2660
#: bzrlib/builtins.py:4323
2661
msgid " bzr merge ../bzr.dev"
2662
msgstr ""
2663
2664
#: bzrlib/builtins.py:4325
2665
msgid " To merge changes up to and including revision 82 from bzr.dev::"
2666
msgstr ""
2667
2668
#: bzrlib/builtins.py:4327
2669
msgid " bzr merge -r 82 ../bzr.dev"
2670
msgstr ""
2671
2672
#: bzrlib/builtins.py:4329
2673
msgid " To merge the changes introduced by 82, without previous changes::"
2674
msgstr ""
2675
2676
#: bzrlib/builtins.py:4331
2677
msgid " bzr merge -r 81..82 ../bzr.dev"
2678
msgstr ""
2679
2680
#: bzrlib/builtins.py:4333
2681
msgid " To apply a merge directive contained in /tmp/merge::"
2682
msgstr ""
2683
2684
#: bzrlib/builtins.py:4335
2685
msgid " bzr merge /tmp/merge"
2686
msgstr ""
2687
2688
#: bzrlib/builtins.py:4337
2689
msgid ""
2690
" To create a merge revision with three parents from two branches\n"
2691
" feature1a and feature1b:"
2692
msgstr ""
2693
2694
#: bzrlib/builtins.py:4340
2695
msgid ""
2696
" bzr merge ../feature1a\n"
2697
" bzr merge ../feature1b --force\n"
2698
" bzr commit -m 'revision with three parents'"
2699
msgstr ""
2700
2701
#: bzrlib/builtins.py:4352
2702
msgid "Merge even if the destination tree has uncommitted changes."
2703
msgstr ""
2704
2705
#: bzrlib/builtins.py:4358
2706
msgid ""
2707
"Apply uncommitted changes from a working copy, instead of branch changes."
2708
msgstr ""
2709
2710
#: bzrlib/builtins.py:4360
2711
msgid ""
2712
"If the destination is already completely merged into the source, pull from "
2713
"the source rather than merging. When this happens, you do not need to "
2714
"commit the result."
2715
msgstr ""
2716
2717
#: bzrlib/builtins.py:4365
2718
msgid ""
2719
"Branch to merge into, rather than the one containing the working directory."
2720
msgstr ""
2721
2722
#: bzrlib/builtins.py:4367
2723
msgid "Instead of merging, show a diff of the merge."
2724
msgstr ""
2725
2726
#: bzrlib/builtins.py:4369
2727
msgid "Select changes interactively."
2728
msgstr ""
2729
2730
#: bzrlib/builtins.py:4391
2731
msgid ""
2732
"Merging into empty branches not currently supported, "
2733
"https://bugs.launchpad.net/bzr/+bug/308562"
2734
msgstr ""
2735
2736
#: bzrlib/builtins.py:4418
2737
msgid "Cannot use --uncommitted with bundles or merge directives."
2738
msgstr ""
2739
2740
#: bzrlib/builtins.py:4429
2741
msgid "Cannot use --uncommitted and --revision at the same time."
2742
msgstr ""
2743
2744
#: bzrlib/builtins.py:4449
2745
msgid "merger: "
2746
msgstr ""
2747
2748
#: bzrlib/builtins.py:4451 bzrlib/bundle/apply_bundle.py:71
2749
msgid "Nothing to do."
2750
msgstr ""
2751
2752
#: bzrlib/builtins.py:4455
2753
msgid "Cannot pull individual files"
2754
msgstr ""
2755
2756
#: bzrlib/builtins.py:4463
2757
msgid "This branch has no commits. (perhaps you would prefer 'bzr pull')"
2758
msgstr ""
2759
2760
#: bzrlib/builtins.py:4521
2761
#, python-format
2762
msgid "Show-base is not supported for this merge type. %s"
2763
msgstr ""
2764
2765
#: bzrlib/builtins.py:4530
2766
#, python-format
2767
msgid "Conflict reduction is not supported for merge type %s."
2768
msgstr ""
2769
2770
#: bzrlib/builtins.py:4534
2771
msgid "Cannot do conflict reduction and show base."
2772
msgstr ""
2773
2774
#: bzrlib/builtins.py:4645
2775
msgid "No location specified or remembered"
2776
msgstr ""
2777
2778
#: bzrlib/builtins.py:4647
2779
msgid "{0} remembered {1} location {2}"
2780
msgstr ""
2781
2782
#: bzrlib/builtins.py:4653
2783
msgid "Redo a merge."
2784
msgstr ""
2785
2786
#: bzrlib/builtins.py:4655
2787
msgid ""
2788
"Use this if you want to try a different merge technique while resolving\n"
2789
"conflicts. Some merge techniques are better than others, and remerge\n"
2790
"lets you try different ones on different files."
2791
msgstr ""
2792
2793
#: bzrlib/builtins.py:4659
2794
msgid ""
2795
"The options for remerge have the same meaning and defaults as the ones for\n"
2796
"merge. The difference is that remerge can (only) be run when there is a\n"
2797
"pending merge, and it lets you specify particular files."
2798
msgstr ""
2799
2800
#: bzrlib/builtins.py:4663
2801
msgid ""
2802
":Examples:\n"
2803
" Re-do the merge of all conflicted files, and show the base text in\n"
2804
" conflict regions, in addition to the usual THIS and OTHER texts::"
2805
msgstr ""
2806
2807
#: bzrlib/builtins.py:4667
2808
msgid " bzr remerge --show-base"
2809
msgstr ""
2810
2811
#: bzrlib/builtins.py:4669
2812
msgid ""
2813
" Re-do the merge of \"foobar\", using the weave merge algorithm, with\n"
2814
" additional processing to reduce the size of conflict regions::"
2815
msgstr ""
2816
2817
#: bzrlib/builtins.py:4672
2818
msgid " bzr remerge --merge-type weave --reprocess foobar"
2819
msgstr ""
2820
2821
#: bzrlib/builtins.py:4679
2822
msgid "Show base revision text in conflicts."
2823
msgstr ""
2824
2825
#: bzrlib/builtins.py:4691
2826
msgid ""
2827
"Sorry, remerge only works after normal merges. Not cherrypicking or multi-"
2828
"merges."
2829
msgstr ""
2830
2831
#: bzrlib/builtins.py:4749
2832
msgid ""
2833
"Set files in the working tree back to the contents of a previous revision."
2834
msgstr ""
2835
2836
#: bzrlib/builtins.py:4751
2837
msgid ""
2838
"Giving a list of files will revert only those files. Otherwise, all files\n"
2839
"will be reverted. If the revision is not specified with '--revision', the\n"
2840
"working tree basis revision is used. A revert operation affects only the\n"
2841
"working tree, not any revision history like the branch and repository or\n"
2842
"the working tree basis revision."
2843
msgstr ""
2844
2845
#: bzrlib/builtins.py:4757
2846
msgid ""
2847
"To remove only some changes, without reverting to a prior version, use\n"
2848
"merge instead. For example, \"merge . -r -2..-3\" (don't forget the \".\")\n"
2849
"will remove the changes introduced by the second last commit (-2), without\n"
2850
"affecting the changes introduced by the last commit (-1). To remove\n"
2851
"certain changes on a hunk-by-hunk basis, see the shelve command.\n"
2852
"To update the branch to a specific revision or the latest revision and\n"
2853
"update the working tree accordingly while preserving local changes, see the\n"
2854
"update command."
2855
msgstr ""
2856
2857
#: bzrlib/builtins.py:4766
2858
msgid ""
2859
"Uncommitted changes to files that are reverted will be discarded.\n"
2860
"Howver, by default, any files that have been manually changed will be\n"
2861
"backed up first. (Files changed only by merge are not backed up.) Backup\n"
2862
"files have '.~#~' appended to their name, where # is a number."
2863
msgstr ""
2864
2865
#: bzrlib/builtins.py:4771
2866
msgid ""
2867
"When you provide files, you can use their current pathname or the pathname\n"
2868
"from the target revision. So you can use revert to \"undelete\" a file by\n"
2869
"name. If you name a directory, all the contents of that directory will be\n"
2870
"reverted."
2871
msgstr ""
2872
2873
#: bzrlib/builtins.py:4776
2874
msgid ""
2875
"If you have newly added files since the target revision, they will be\n"
2876
"removed. If the files to be removed have been changed, backups will be\n"
2877
"created as above. Directories containing unknown files will not be\n"
2878
"deleted."
2879
msgstr ""
2880
2881
#: bzrlib/builtins.py:4781
2882
msgid ""
2883
"The working tree contains a list of revisions that have been merged but\n"
2884
"not yet committed. These revisions will be included as additional parents\n"
2885
"of the next commit. Normally, using revert clears that list as well as\n"
2886
"reverting the files. If any files are specified, revert leaves the list\n"
2887
"of uncommitted merges alone and reverts only the files. Use ``bzr revert\n"
2888
".`` in the tree root to revert all files but keep the recorded merges,\n"
2889
"and ``bzr revert --forget-merges`` to clear the pending merge list without\n"
2890
"reverting any files."
2891
msgstr ""
2892
2893
#: bzrlib/builtins.py:4790
2894
msgid ""
2895
"Using \"bzr revert --forget-merges\", it is possible to apply all of the\n"
2896
"changes from a branch in a single revision. To do this, perform the merge\n"
2897
"as desired. Then doing revert with the \"--forget-merges\" option will "
2898
"keep\n"
2899
"the content of the tree as it was, but it will clear the list of pending\n"
2900
"merges. The next commit will then contain all of the changes that are\n"
2901
"present in the other branch, but without any other parent revisions.\n"
2902
"Because this technique forgets where these changes originated, it may\n"
2903
"cause additional conflicts on later merges involving the same source and\n"
2904
"target branches."
2905
msgstr ""
2906
2907
#: bzrlib/builtins.py:4804
2908
msgid "Do not save backups of reverted files."
2909
msgstr ""
2910
2911
#: bzrlib/builtins.py:4806
2912
msgid "Remove pending merge marker, without changing any files."
2913
msgstr ""
2914
2915
#: bzrlib/builtins.py:4837
2916
msgid ""
2917
"Show help on a command or other topic.\n"
2918
" "
2919
msgstr ""
2920
2921
#: bzrlib/builtins.py:4842
2922
msgid "Show help on all commands."
2923
msgstr ""
2924
2925
#: bzrlib/builtins.py:4871
2926
msgid "Show unmerged/unpulled revisions between two branches."
2927
msgstr ""
2928
2929
#: bzrlib/builtins.py:4873
2930
msgid "OTHER_BRANCH may be local or remote."
2931
msgstr ""
2932
2933
#: bzrlib/builtins.py:4875
2934
msgid ""
2935
"To filter on a range of revisions, you can use the command -r begin..end\n"
2936
"-r revision requests a specific revision, -r ..end or -r begin.. are\n"
2937
"also valid.\n"
2938
" \n"
2939
":Exit values:\n"
2940
" 1 - some missing revisions\n"
2941
" 0 - no missing revisions"
2942
msgstr ""
2943
2944
#: bzrlib/builtins.py:4885
2945
msgid ""
2946
" Determine the missing revisions between this and the branch at the\n"
2947
" remembered pull location::"
2948
msgstr ""
2949
2950
#: bzrlib/builtins.py:4888
2951
msgid " bzr missing"
2952
msgstr ""
2953
2954
#: bzrlib/builtins.py:4890
2955
msgid " Determine the missing revisions between this and another branch::"
2956
msgstr ""
2957
2958
#: bzrlib/builtins.py:4892
2959
msgid " bzr missing http://server/branch"
2960
msgstr ""
2961
2962
#: bzrlib/builtins.py:4894
2963
msgid ""
2964
" Determine the missing revisions up to a specific revision on the other\n"
2965
" branch::"
2966
msgstr ""
2967
2968
#: bzrlib/builtins.py:4897
2969
msgid " bzr missing -r ..-10"
2970
msgstr ""
2971
2972
#: bzrlib/builtins.py:4899
2973
msgid ""
2974
" Determine the missing revisions up to a specific revision on this\n"
2975
" branch::"
2976
msgstr ""
2977
2978
#: bzrlib/builtins.py:4902
2979
msgid " bzr missing --my-revision ..-10"
2980
msgstr ""
2981
2982
#: bzrlib/builtins.py:4909
2983
msgid "Reverse the order of revisions."
2984
msgstr ""
2985
2986
#: bzrlib/builtins.py:4911
2987
msgid "Display changes in the local branch only."
2988
msgstr ""
2989
2990
#: bzrlib/builtins.py:4912
2991
msgid "Same as --mine-only."
2992
msgstr ""
2993
2994
#: bzrlib/builtins.py:4914
2995
msgid "Display changes in the remote branch only."
2996
msgstr ""
2997
2998
#: bzrlib/builtins.py:4915
2999
msgid "Same as --theirs-only."
3000
msgstr ""
3001
3002
#: bzrlib/builtins.py:4920
3003
msgid ""
3004
"Filter on other branch revisions (inclusive). See \"help revisionspec\" for "
3005
"details."
3006
msgstr ""
3007
3008
#: bzrlib/builtins.py:4924
3009
msgid ""
3010
"Filter on local branch revisions (inclusive). See \"help revisionspec\" for "
3011
"details."
3012
msgstr ""
3013
3014
#: bzrlib/builtins.py:4927
3015
msgid "Show all revisions in addition to the mainline ones."
3016
msgstr ""
3017
3018
#: bzrlib/builtins.py:4981
3019
msgid "No peer location known or specified."
3020
msgstr ""
3021
3022
#: bzrlib/builtins.py:4985
3023
msgid "Using saved parent location: {0}\n"
3024
msgstr ""
3025
3026
#: bzrlib/builtins.py:5018
3027
#, python-format
3028
msgid "You have %d extra revision:\n"
3029
msgid_plural "You have %d extra revisions:\n"
3030
msgstr[0] ""
3031
msgstr[1] ""
3032
3033
#: bzrlib/builtins.py:5038
3034
#, python-format
3035
msgid "You are missing %d revision:\n"
3036
msgid_plural "You are missing %d revisions:\n"
3037
msgstr[0] ""
3038
msgstr[1] ""
3039
3040
#: bzrlib/builtins.py:5053
3041
msgid "This branch has no new revisions.\n"
3042
msgstr ""
3043
3044
#: bzrlib/builtins.py:5056
3045
msgid "Other branch has no new revisions.\n"
3046
msgstr ""
3047
3048
#: bzrlib/builtins.py:5061
3049
msgid "Branches are up to date.\n"
3050
msgstr ""
3051
3052
#: bzrlib/builtins.py:5072
3053
msgid "Compress the data within a repository."
3054
msgstr ""
3055
3056
#: bzrlib/builtins.py:5074
3057
msgid ""
3058
"This operation compresses the data within a bazaar repository. As\n"
3059
"bazaar supports automatic packing of repository, this operation is\n"
3060
"normally not required to be done manually."
3061
msgstr ""
3062
3063
#: bzrlib/builtins.py:5078
3064
msgid ""
3065
"During the pack operation, bazaar takes a backup of existing repository\n"
3066
"data, i.e. pack files. This backup is eventually removed by bazaar\n"
3067
"automatically when it is safe to do so. To save disk space by removing\n"
3068
"the backed up pack files, the --clean-obsolete-packs option may be\n"
3069
"used."
3070
msgstr ""
3071
3072
#: bzrlib/builtins.py:5084
3073
msgid ""
3074
"Warning: If you use --clean-obsolete-packs and your machine crashes\n"
3075
"during or immediately after repacking, you may be left with a state\n"
3076
"where the deletion has been written to disk but the new packs have not\n"
3077
"been. In this case the repository may be unusable."
3078
msgstr ""
3079
3080
#: bzrlib/builtins.py:5093
3081
msgid "Delete obsolete packs to save disk space."
3082
msgstr ""
3083
3084
#: bzrlib/builtins.py:5107
3085
msgid "List the installed plugins."
3086
msgstr ""
3087
3088
#: bzrlib/builtins.py:5109
3089
msgid ""
3090
"This command displays the list of installed plugins including\n"
3091
"version of plugin and a short description of each."
3092
msgstr ""
3093
3094
#: bzrlib/builtins.py:5112
3095
msgid "--verbose shows the path where each plugin is located."
3096
msgstr ""
3097
3098
#: bzrlib/builtins.py:5114
3099
msgid ""
3100
"A plugin is an external component for Bazaar that extends the\n"
3101
"revision control system, by adding or replacing code in Bazaar.\n"
3102
"Plugins can do a variety of things, including overriding commands,\n"
3103
"adding new commands, providing additional network transports and\n"
3104
"customizing log output."
3105
msgstr ""
3106
3107
#: bzrlib/builtins.py:5120
3108
msgid ""
3109
"See the Bazaar Plugin Guide <http://doc.bazaar.canonical.com/plugins/en/>\n"
3110
"for further information on plugins including where to find them and how to\n"
3111
"install them. Instructions are also provided there on how to write new\n"
3112
"plugins using the Python programming language."
3113
msgstr ""
3114
3115
#: bzrlib/builtins.py:5136
3116
msgid "Show testament (signing-form) of a revision."
3117
msgstr ""
3118
3119
#: bzrlib/builtins.py:5139
3120
msgid "Produce long-format testament."
3121
msgstr ""
3122
3123
#: bzrlib/builtins.py:5141
3124
msgid "Produce a strict-format testament."
3125
msgstr ""
3126
3127
#: bzrlib/builtins.py:5168
3128
msgid "Show the origin of each line in a file."
3129
msgstr ""
3130
3131
#: bzrlib/builtins.py:5170
3132
msgid ""
3133
"This prints out the given file with an annotation on the left side\n"
3134
"indicating which revision, author and date introduced the change."
3135
msgstr ""
3136
3137
#: bzrlib/builtins.py:5173
3138
msgid ""
3139
"If the origin is the same for a run of consecutive lines, it is\n"
3140
"shown only at the top, unless the --all option is given."
3141
msgstr ""
3142
3143
#: bzrlib/builtins.py:5181
3144
msgid "Show annotations on all lines."
3145
msgstr ""
3146
3147
#: bzrlib/builtins.py:5182
3148
msgid "Show commit date in annotations."
3149
msgstr ""
3150
3151
#: bzrlib/builtins.py:5269
3152
msgid "Cannot sign a range of non-revision-history revisions"
3153
msgstr ""
3154
3155
#: bzrlib/builtins.py:5281
3156
msgid "Please supply either one revision, or a range."
3157
msgstr ""
3158
3159
#: bzrlib/builtins.py:5285
3160
msgid ""
3161
"Convert the current branch into a checkout of the supplied branch.\n"
3162
"If no branch is supplied, rebind to the last bound location."
3163
msgstr ""
3164
3165
#: bzrlib/builtins.py:5288
3166
msgid ""
3167
"Once converted into a checkout, commits must succeed on the master branch\n"
3168
"before they will be applied to the local branch."
3169
msgstr ""
3170
3171
#: bzrlib/builtins.py:5291
3172
msgid ""
3173
"Bound branches use the nickname of its master branch unless it is set\n"
3174
"locally, in which case binding will update the local nickname to be\n"
3175
"that of the master."
3176
msgstr ""
3177
3178
#: bzrlib/builtins.py:5306
3179
msgid "No location supplied. This format does not remember old locations."
3180
msgstr ""
3181
3182
#: bzrlib/builtins.py:5312
3183
msgid "Branch is already bound"
3184
msgstr ""
3185
3186
#: bzrlib/builtins.py:5315
3187
msgid "No location supplied and no previous location known"
3188
msgstr ""
3189
3190
#: bzrlib/builtins.py:5321
3191
msgid "These branches have diverged. Try merging, and then bind again."
3192
msgstr ""
3193
3194
#: bzrlib/builtins.py:5328
3195
msgid "Convert the current checkout into a regular branch."
3196
msgstr ""
3197
3198
#: bzrlib/builtins.py:5330
3199
msgid ""
3200
"After unbinding, the local branch is considered independent and subsequent\n"
3201
"commits will be local only."
3202
msgstr ""
3203
3204
#: bzrlib/builtins.py:5341
3205
msgid "Local branch is not bound"
3206
msgstr ""
3207
3208
#: bzrlib/builtins.py:5345
3209
msgid "Remove the last committed revision."
3210
msgstr ""
3211
3212
#: bzrlib/builtins.py:5347
3213
msgid ""
3214
"--verbose will print out what is being removed.\n"
3215
"--dry-run will go through all the motions, but not actually\n"
3216
"remove anything."
3217
msgstr ""
3218
3219
#: bzrlib/builtins.py:5351
3220
msgid ""
3221
"If --revision is specified, uncommit revisions to leave the branch at the\n"
3222
"specified revision. For example, \"bzr uncommit -r 15\" will leave the\n"
3223
"branch at revision 15."
3224
msgstr ""
3225
3226
#: bzrlib/builtins.py:5355
3227
msgid ""
3228
"Uncommit leaves the working tree ready for a new commit. The only change\n"
3229
"it may make is to restore any pending merges that were present before\n"
3230
"the commit."
3231
msgstr ""
3232
3233
#: bzrlib/builtins.py:5366
3234
msgid "Don't actually make changes."
3235
msgstr ""
3236
3237
#: bzrlib/builtins.py:5367
3238
msgid "Say yes to all questions."
3239
msgstr ""
3240
3241
#: bzrlib/builtins.py:5369
3242
msgid "Keep tags that point to removed revisions."
3243
msgstr ""
3244
3245
#: bzrlib/builtins.py:5371
3246
msgid "Only remove the commits from the local branch when in a checkout."
3247
msgstr ""
3248
3249
#: bzrlib/builtins.py:5420
3250
msgid "No revisions to uncommit.\n"
3251
msgstr ""
3252
3253
#: bzrlib/builtins.py:5435
3254
msgid "Dry-run, pretending to remove the above revisions.\n"
3255
msgstr ""
3256
3257
#: bzrlib/builtins.py:5438
3258
msgid "The above revision(s) will be removed.\n"
3259
msgstr ""
3260
3261
#: bzrlib/builtins.py:5442
3262
msgid "Uncommit these revisions"
3263
msgstr ""
3264
3265
#: bzrlib/builtins.py:5445
3266
msgid "Canceled\n"
3267
msgstr ""
3268
3269
#: bzrlib/builtins.py:5452
3270
#, python-format
3271
msgid ""
3272
"You can restore the old tip by running:\n"
3273
" bzr pull . -r revid:%s\n"
3274
msgstr ""
3275
3276
#: bzrlib/builtins.py:5457
3277
msgid "Break a dead lock."
3278
msgstr ""
3279
3280
#: bzrlib/builtins.py:5459
3281
msgid ""
3282
"This command breaks a lock on a repository, branch, working directory or\n"
3283
"config file."
3284
msgstr ""
3285
3286
#: bzrlib/builtins.py:5462
3287
msgid ""
3288
"CAUTION: Locks should only be broken when you are sure that the process\n"
3289
"holding the lock has been stopped."
3290
msgstr ""
3291
3292
#: bzrlib/builtins.py:5465
3293
msgid ""
3294
"You can get information on what locks are open via the 'bzr info\n"
3295
"[location]' command."
3296
msgstr ""
3297
3298
#: bzrlib/builtins.py:5468
3299
msgid ""
3300
":Examples:\n"
3301
" bzr break-lock\n"
3302
" bzr break-lock bzr+ssh://example.com/bzr/foo\n"
3303
" bzr break-lock --conf ~/.bazaar"
3304
msgstr ""
3305
3306
#: bzrlib/builtins.py:5477
3307
msgid "LOCATION is the directory where the config lock is."
3308
msgstr ""
3309
3310
#: bzrlib/builtins.py:5479
3311
msgid "Do not ask for confirmation before breaking the lock."
3312
msgstr ""
3313
3314
#: bzrlib/builtins.py:5514
3315
msgid "The Bazaar smart server protocol over TCP. (default port: 4155)"
3316
msgstr ""
3317
3318
#: bzrlib/builtins.py:5515
3319
msgid "Run the bzr server."
3320
msgstr ""
3321
3322
#: bzrlib/builtins.py:5521
3323
msgid "Serve on stdin/out for use from inetd or sshd."
3324
msgstr ""
3325
3326
#: bzrlib/builtins.py:5522
3327
msgid "protocol"
3328
msgstr ""
3329
3330
#: bzrlib/builtins.py:5523
3331
msgid "Protocol to serve."
3332
msgstr ""
3333
3334
#: bzrlib/builtins.py:5527
3335
msgid "Listen for connections on nominated address."
3336
msgstr ""
3337
3338
#: bzrlib/builtins.py:5529
3339
msgid ""
3340
"Listen for connections on nominated port. Passing 0 as the port number will "
3341
"result in a dynamically allocated port. The default port depends on the "
3342
"protocol."
3343
msgstr ""
3344
3345
#: bzrlib/builtins.py:5534
3346
msgid "Serve contents of this directory."
3347
msgstr ""
3348
3349
#: bzrlib/builtins.py:5536
3350
msgid ""
3351
"By default the server is a readonly server. Supplying --allow-writes "
3352
"enables write access to the contents of the served directory and below. "
3353
"Note that ``bzr serve`` does not perform authentication, so unless some form "
3354
"of external authentication is arranged supplying this option leads to global "
3355
"uncontrolled write access to your file system."
3356
msgstr ""
3357
3358
#: bzrlib/builtins.py:5545
3359
msgid "Override the default idle client timeout (5min)."
3360
msgstr ""
3361
3362
#: bzrlib/builtins.py:5563
3363
msgid "Combine a tree into its containing tree."
3364
msgstr ""
3365
3366
#: bzrlib/builtins.py:5565
3367
msgid "This command requires the target tree to be in a rich-root format."
3368
msgstr ""
3369
3370
#: bzrlib/builtins.py:5567
3371
msgid ""
3372
"The TREE argument should be an independent tree, inside another tree, but\n"
3373
"not part of it. (Such trees can be produced by \"bzr split\", but also by\n"
3374
"running \"bzr branch\" with the target inside a tree.)"
3375
msgstr ""
3376
3377
#: bzrlib/builtins.py:5571
3378
msgid ""
3379
"The result is a combined tree, with the subtree no longer an independent\n"
3380
"part. This is marked as a merge of the subtree into the containing tree,\n"
3381
"and all history is preserved."
3382
msgstr ""
3383
3384
#: bzrlib/builtins.py:5589
3385
#, python-format
3386
msgid ""
3387
"Can't join trees because %s doesn't support rich root data.\n"
3388
"You can use bzr upgrade on the repository."
3389
msgstr ""
3390
3391
#: bzrlib/builtins.py:5599 bzrlib/builtins.py:5605
3392
msgid "Cannot join {0}. {1}"
3393
msgstr ""
3394
3395
#: bzrlib/builtins.py:5609
3396
msgid "Split a subdirectory of a tree into a separate tree."
3397
msgstr ""
3398
3399
#: bzrlib/builtins.py:5611
3400
msgid ""
3401
"This command will produce a target tree in a format that supports\n"
3402
"rich roots, like 'rich-root' or 'rich-root-pack'. These formats cannot be\n"
3403
"converted into earlier formats like 'dirstate-tags'."
3404
msgstr ""
3405
3406
#: bzrlib/builtins.py:5615
3407
msgid ""
3408
"The TREE argument should be a subdirectory of a working tree. That\n"
3409
"subdirectory will be converted into an independent tree, with its own\n"
3410
"branch. Commits in the top-level tree will not apply to the new subtree."
3411
msgstr ""
3412
3413
#: bzrlib/builtins.py:5695
3414
msgid "No submit branch specified or known"
3415
msgstr ""
3416
3417
#: bzrlib/builtins.py:5704 bzrlib/send.py:109
3418
msgid "No public branch specified or known"
3419
msgstr ""
3420
3421
#: bzrlib/builtins.py:5709
3422
msgid "bzr merge-directive takes at most two one revision identifiers"
3423
msgstr ""
3424
3425
#: bzrlib/builtins.py:5718
3426
msgid "No revisions to bundle."
3427
msgstr ""
3428
3429
#: bzrlib/builtins.py:5737
3430
msgid "Mail or create a merge-directive for submitting changes."
3431
msgstr ""
3432
3433
#: bzrlib/builtins.py:5739
3434
msgid "A merge directive provides many things needed for requesting merges:"
3435
msgstr ""
3436
3437
#: bzrlib/builtins.py:5741
3438
msgid "* A machine-readable description of the merge to perform"
3439
msgstr ""
3440
3441
#: bzrlib/builtins.py:5743
3442
msgid "* An optional patch that is a preview of the changes requested"
3443
msgstr ""
3444
3445
#: bzrlib/builtins.py:5745
3446
msgid ""
3447
"* An optional bundle of revision data, so that the changes can be applied\n"
3448
" directly from the merge directive, without retrieving data from a\n"
3449
" branch."
3450
msgstr ""
3451
3452
#: bzrlib/builtins.py:5749
3453
msgid ""
3454
"`bzr send` creates a compact data set that, when applied using bzr\n"
3455
"merge, has the same effect as merging from the source branch. "
3456
msgstr ""
3457
3458
#: bzrlib/builtins.py:5752
3459
msgid ""
3460
"By default the merge directive is self-contained and can be applied to any\n"
3461
"branch containing submit_branch in its ancestory without needing access to\n"
3462
"the source branch."
3463
msgstr ""
3464
3465
#: bzrlib/builtins.py:5756
3466
msgid ""
3467
"If --no-bundle is specified, then Bazaar doesn't send the contents of the\n"
3468
"revisions, but only a structured request to merge from the\n"
3469
"public_location. In that case the public_branch is needed and it must be\n"
3470
"up-to-date and accessible to the recipient. The public_branch is always\n"
3471
"included if known, so that people can check it later."
3472
msgstr ""
3473
3474
#: bzrlib/builtins.py:5762
3475
msgid ""
3476
"The submit branch defaults to the parent of the source branch, but can be\n"
3477
"overridden. Both submit branch and public branch will be remembered in\n"
3478
"branch.conf the first time they are used for a particular branch. The\n"
3479
"source branch defaults to that containing the working directory, but can\n"
3480
"be changed using --from."
3481
msgstr ""
3482
3483
#: bzrlib/builtins.py:5768
3484
msgid ""
3485
"Both the submit branch and the public branch follow the usual behavior with\n"
3486
"respect to --remember: If there is no default location set, the first send\n"
3487
"will set it (use --no-remember to avoid setting it). After that, you can\n"
3488
"omit the location to use the default. To change the default, use\n"
3489
"--remember. The value will only be saved if the location can be accessed."
3490
msgstr ""
3491
3492
#: bzrlib/builtins.py:5774
3493
msgid ""
3494
"In order to calculate those changes, bzr must analyse the submit branch.\n"
3495
"Therefore it is most efficient for the submit branch to be a local mirror.\n"
3496
"If a public location is known for the submit_branch, that location is used\n"
3497
"in the merge directive."
3498
msgstr ""
3499
3500
#: bzrlib/builtins.py:5779
3501
msgid ""
3502
"The default behaviour is to send the merge directive by mail, unless -o is\n"
3503
"given, in which case it is sent to a file."
3504
msgstr ""
3505
3506
#: bzrlib/builtins.py:5782
3507
msgid ""
3508
"Mail is sent using your preferred mail program. This should be transparent\n"
3509
"on Windows (it uses MAPI). On Unix, it requires the xdg-email utility.\n"
3510
"If the preferred client can't be found (or used), your editor will be used."
3511
msgstr ""
3512
3513
#: bzrlib/builtins.py:5786
3514
msgid ""
3515
"To use a specific mail program, set the mail_client configuration option.\n"
3516
"(For Thunderbird 1.5, this works around some bugs.) Supported values for\n"
3517
"specific clients are \"claws\", \"evolution\", \"kmail\", \"mail.app\" "
3518
"(MacOS X's\n"
3519
"Mail.app), \"mutt\", and \"thunderbird\"; generic options are \"default\",\n"
3520
"\"editor\", \"emacsclient\", \"mapi\", and \"xdg-email\". Plugins may also "
3521
"add\n"
3522
"supported clients."
3523
msgstr ""
3524
3525
#: bzrlib/builtins.py:5793
3526
msgid ""
3527
"If mail is being sent, a to address is required. This can be supplied\n"
3528
"either on the commandline, by setting the submit_to configuration\n"
3529
"option in the branch itself or the child_submit_to configuration option\n"
3530
"in the submit branch."
3531
msgstr ""
3532
3533
#: bzrlib/builtins.py:5798
3534
msgid ""
3535
"Two formats are currently supported: \"4\" uses revision bundle format 4 "
3536
"and\n"
3537
"merge directive format 2. It is significantly faster and smaller than\n"
3538
"older formats. It is compatible with Bazaar 0.19 and later. It is the\n"
3539
"default. \"0.9\" uses revision bundle format 0.9 and merge directive\n"
3540
"format 1. It is compatible with Bazaar 0.12 - 0.18."
3541
msgstr ""
3542
3543
#: bzrlib/builtins.py:5804
3544
msgid ""
3545
"The merge directives created by bzr send may be applied using bzr merge or\n"
3546
"bzr pull by specifying a file containing a merge directive as the location."
3547
msgstr ""
3548
3549
#: bzrlib/builtins.py:5807
3550
msgid ""
3551
"bzr send makes extensive use of public locations to map local locations "
3552
"into\n"
3553
"URLs that can be used by other people. See `bzr help configuration` to\n"
3554
"set them, and use `bzr info` to display them."
3555
msgstr ""
3556
3557
#: bzrlib/builtins.py:5831
3558
msgid "Write merge directive to this file or directory; use - for stdout."
3559
msgstr ""
3560
3561
#: bzrlib/builtins.py:5835
3562
msgid ""
3563
"Refuse to send if there are uncommitted changes in the working tree, --no-"
3564
"strict disables the check."
3565
msgstr ""
3566
3567
#: bzrlib/builtins.py:5837
3568
msgid "Mail the request to this address."
3569
msgstr ""
3570
3571
#: bzrlib/builtins.py:5841
3572
msgid "Body for the email."
3573
msgstr ""
3574
3575
#: bzrlib/builtins.py:5894
3576
msgid "Do not include a bundle in the merge directive."
3577
msgstr ""
3578
3579
#: bzrlib/builtins.py:5895
3580
msgid "Do not include a preview patch in the merge directive."
3581
msgstr ""
3582
3583
#: bzrlib/builtins.py:5898
3584
msgid "Remember submit and public branch."
3585
msgstr ""
3586
3587
#: bzrlib/builtins.py:5900
3588
msgid ""
3589
"Branch to generate the submission from, rather than the one containing the "
3590
"working directory."
3591
msgstr ""
3592
3593
#: bzrlib/builtins.py:5910 bzrlib/cmd_version_info.py:76
3594
msgid "format"
3595
msgstr ""
3596
3597
#: bzrlib/builtins.py:5911
3598
msgid "Use the specified output format."
3599
msgstr ""
3600
3601
#: bzrlib/builtins.py:5933
3602
msgid "Create, remove or modify a tag naming a revision."
3603
msgstr ""
3604
3605
#: bzrlib/builtins.py:5935
3606
msgid ""
3607
"Tags give human-meaningful names to revisions. Commands that take a -r\n"
3608
"(--revision) option can be given -rtag:X, where X is any previously\n"
3609
"created tag."
3610
msgstr ""
3611
3612
#: bzrlib/builtins.py:5939
3613
msgid ""
3614
"Tags are stored in the branch. Tags are copied from one branch to another\n"
3615
"along when you branch, push, pull or merge."
3616
msgstr ""
3617
3618
#: bzrlib/builtins.py:5942
3619
msgid ""
3620
"It is an error to give a tag name that already exists unless you pass\n"
3621
"--force, in which case the tag is moved to point to the new revision."
3622
msgstr ""
3623
3624
#: bzrlib/builtins.py:5945
3625
msgid ""
3626
"To rename a tag (change the name but keep it on the same revsion), run "
3627
"``bzr\n"
3628
"tag new-name -r tag:old-name`` and then ``bzr tag --delete oldname``."
3629
msgstr ""
3630
3631
#: bzrlib/builtins.py:5948
3632
msgid ""
3633
"If no tag name is specified it will be determined through the \n"
3634
"'automatic_tag_name' hook. This can e.g. be used to automatically tag\n"
3635
"upstream releases by reading configure.ac. See ``bzr help hooks`` for\n"
3636
"details."
3637
msgstr ""
3638
3639
#: bzrlib/builtins.py:5958
3640
msgid "Delete this tag rather than placing it."
3641
msgstr ""
3642
3643
#: bzrlib/builtins.py:5961
3644
msgid "Branch in which to place the tag."
3645
msgstr ""
3646
3647
#: bzrlib/builtins.py:5963
3648
msgid "Replace existing tags."
3649
msgstr ""
3650
3651
#: bzrlib/builtins.py:5978
3652
msgid "No tag specified to delete."
3653
msgstr ""
3654
3655
#: bzrlib/builtins.py:5980
3656
#, python-format
3657
msgid "Deleted tag %s."
3658
msgstr ""
3659
3660
#: bzrlib/builtins.py:5985
3661
msgid "Tags can only be placed on a single revision, not on a range"
3662
msgstr ""
3663
3664
#: bzrlib/builtins.py:5994
3665
msgid "Please specify a tag name."
3666
msgstr ""
3667
3668
#: bzrlib/builtins.py:6002
3669
#, python-format
3670
msgid "Tag %s already exists for that revision."
3671
msgstr ""
3672
3673
#: bzrlib/builtins.py:6006
3674
#, python-format
3675
msgid "Created tag %s."
3676
msgstr ""
3677
3678
#: bzrlib/builtins.py:6008
3679
#, python-format
3680
msgid "Updated tag %s."
3681
msgstr ""
3682
3683
#: bzrlib/builtins.py:6012
3684
msgid "List tags."
3685
msgstr ""
3686
3687
#: bzrlib/builtins.py:6014
3688
msgid ""
3689
"This command shows a table of tag names and the revisions they reference."
3690
msgstr ""
3691
3692
#: bzrlib/builtins.py:6020
3693
msgid "Branch whose tags should be displayed."
3694
msgstr ""
3695
3696
#: bzrlib/builtins.py:6022
3697
msgid "Sort tags by different criteria."
3698
msgstr ""
3699
3700
#: bzrlib/builtins.py:6022
3701
msgid "Sorting"
3702
msgstr ""
3703
3704
#: bzrlib/builtins.py:6091
3705
msgid "Reconfigure the type of a bzr directory."
3706
msgstr ""
3707
3708
#: bzrlib/builtins.py:6093
3709
msgid "A target configuration must be specified."
3710
msgstr ""
3711
3712
#: bzrlib/builtins.py:6095
3713
msgid ""
3714
"For checkouts, the bind-to location will be auto-detected if not specified.\n"
3715
"The order of preference is\n"
3716
"1. For a lightweight checkout, the current bound location.\n"
3717
"2. For branches that used to be checkouts, the previously-bound location.\n"
3718
"3. The push location.\n"
3719
"4. The parent location.\n"
3720
"If none of these is available, --bind-to must be specified."
3721
msgstr ""
3722
3723
#: bzrlib/builtins.py:6109
3724
msgid "Tree type"
3725
msgstr ""
3726
3727
#: bzrlib/builtins.py:6110
3728
msgid "The relation between branch and tree."
3729
msgstr ""
3730
3731
#: bzrlib/builtins.py:6112
3732
msgid "Reconfigure to be an unbound branch with no working tree."
3733
msgstr ""
3734
3735
#: bzrlib/builtins.py:6113
3736
msgid "Reconfigure to be an unbound branch with a working tree."
3737
msgstr ""
3738
3739
#: bzrlib/builtins.py:6114
3740
msgid "Reconfigure to be a bound branch with a working tree."
3741
msgstr ""
3742
3743
#: bzrlib/builtins.py:6115
3744
msgid "Reconfigure to be a lightweight checkout (with no local history)."
3745
msgstr ""
3746
3747
#: bzrlib/builtins.py:6120
3748
msgid "Repository type"
3749
msgstr ""
3750
3751
#: bzrlib/builtins.py:6121
3752
msgid "Location fo the repository."
3753
msgstr ""
3754
3755
#: bzrlib/builtins.py:6123
3756
msgid ""
3757
"Reconfigure to be a standalone branch (i.e. stop using shared repository)."
3758
msgstr ""
3759
3760
#: bzrlib/builtins.py:6125
3761
msgid "Reconfigure to use a shared repository."
3762
msgstr ""
3763
3764
#: bzrlib/builtins.py:6129
3765
msgid "Trees in Repository"
3766
msgstr ""
3767
3768
#: bzrlib/builtins.py:6130
3769
msgid "Whether new branches in the repository have trees."
3770
msgstr ""
3771
3772
#: bzrlib/builtins.py:6132
3773
msgid ""
3774
"Reconfigure repository to create working trees on branches by default."
3775
msgstr ""
3776
3777
#: bzrlib/builtins.py:6134
3778
msgid ""
3779
"Reconfigure repository to not create working trees on branches by default."
3780
msgstr ""
3781
3782
#: bzrlib/builtins.py:6137
3783
msgid "Branch to bind checkout to."
3784
msgstr ""
3785
3786
#: bzrlib/builtins.py:6139
3787
msgid "Perform reconfiguration even if local changes will be lost."
3788
msgstr ""
3789
3790
#: bzrlib/builtins.py:6142
3791
msgid "Reconfigure a branch to be stacked on another branch."
3792
msgstr ""
3793
3794
#: bzrlib/builtins.py:6146
3795
msgid ""
3796
"Reconfigure a branch to be unstacked. This may require copying substantial "
3797
"data into it."
3798
msgstr ""
3799
3800
#: bzrlib/builtins.py:6156
3801
msgid "Can't use both --stacked-on and --unstacked"
3802
msgstr ""
3803
3804
#: bzrlib/builtins.py:6170
3805
msgid "No target configuration specified"
3806
msgstr ""
3807
3808
#: bzrlib/builtins.py:6205
3809
msgid "Set the branch of a checkout and update."
3810
msgstr ""
3811
3812
#: bzrlib/builtins.py:6207
3813
msgid ""
3814
"For lightweight checkouts, this changes the branch being referenced.\n"
3815
"For heavyweight checkouts, this checks that there are no local commits\n"
3816
"versus the current bound branch, then it makes the local branch a mirror\n"
3817
"of the new location and binds to it."
3818
msgstr ""
3819
3820
#: bzrlib/builtins.py:6212
3821
msgid ""
3822
"In both cases, the working tree is updated and uncommitted changes\n"
3823
"are merged. The user can commit or revert these as they desire."
3824
msgstr ""
3825
3826
#: bzrlib/builtins.py:6215
3827
msgid "Pending merges need to be committed or reverted before using switch."
3828
msgstr ""
3829
3830
#: bzrlib/builtins.py:6217
3831
msgid ""
3832
"The path to the branch to switch to can be specified relative to the parent\n"
3833
"directory of the current branch. For example, if you are currently in a\n"
3834
"checkout of /path/to/branch, specifying 'newbranch' will find a branch at\n"
3835
"/path/to/newbranch."
3836
msgstr ""
3837
3838
#: bzrlib/builtins.py:6222
3839
msgid ""
3840
"Bound branches use the nickname of its master branch unless it is set\n"
3841
"locally, in which case switching will update the local nickname to be\n"
3842
"that of the master."
3843
msgstr ""
3844
3845
#: bzrlib/builtins.py:6230
3846
msgid "Switch even if local commits will be lost."
3847
msgstr ""
3848
3849
#: bzrlib/builtins.py:6233
3850
msgid "Create the target branch from this one before switching to it."
3851
msgstr ""
3852
3853
#: bzrlib/builtins.py:6236
3854
msgid "Store and restore uncommitted changes in the branch."
3855
msgstr ""
3856
3857
#: bzrlib/builtins.py:6250
3858
msgid "You must supply either a revision or a location"
3859
msgstr ""
3860
3861
#: bzrlib/builtins.py:6263
3862
msgid "cannot create branch without source branch"
3863
msgstr ""
3864
3865
#: bzrlib/builtins.py:6289
3866
msgid "Manage filtered views."
3867
msgstr ""
3868
3869
#: bzrlib/builtins.py:6291
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:6298
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:6303
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:6308
3896
msgid ""
3897
":Examples:\n"
3898
" To define the current view::"
3899
msgstr ""
3900
3901
#: bzrlib/builtins.py:6311
3902
msgid " bzr view file1 dir1 ..."
3903
msgstr ""
3904
3905
#: bzrlib/builtins.py:6313
3906
msgid " To list the current view::"
3907
msgstr ""
3908
3909
#: bzrlib/builtins.py:6315
3910
msgid " bzr view"
3911
msgstr ""
3912
3913
#: bzrlib/builtins.py:6317
3914
msgid " To delete the current view::"
3915
msgstr ""
3916
3917
#: bzrlib/builtins.py:6319
3918
msgid " bzr view --delete"
3919
msgstr ""
3920
3921
#: bzrlib/builtins.py:6321
3922
msgid " To disable the current view without deleting it::"
3923
msgstr ""
3924
3925
#: bzrlib/builtins.py:6323
3926
msgid " bzr view --switch off"
3927
msgstr ""
3928
3929
#: bzrlib/builtins.py:6325
3930
msgid " To define a named view and switch to it::"
3931
msgstr ""
3932
3933
#: bzrlib/builtins.py:6327
3934
msgid " bzr view --name view-name file1 dir1 ..."
3935
msgstr ""
3936
3937
#: bzrlib/builtins.py:6329
3938
msgid " To list a named view::"
3939
msgstr ""
3940
3941
#: bzrlib/builtins.py:6331
3942
msgid " bzr view --name view-name"
3943
msgstr ""
3944
3945
#: bzrlib/builtins.py:6333
3946
msgid " To delete a named view::"
3947
msgstr ""
3948
3949
#: bzrlib/builtins.py:6335
3950
msgid " bzr view --name view-name --delete"
3951
msgstr ""
3952
3953
#: bzrlib/builtins.py:6337
3954
msgid " To switch to a named view::"
3955
msgstr ""
3956
3957
#: bzrlib/builtins.py:6339
3958
msgid " bzr view --switch view-name"
3959
msgstr ""
3960
3961
#: bzrlib/builtins.py:6341
3962
msgid " To list all views defined::"
3963
msgstr ""
3964
3965
#: bzrlib/builtins.py:6343
3966
msgid " bzr view --all"
3967
msgstr ""
3968
3969
#: bzrlib/builtins.py:6345
3970
msgid " To delete all views::"
3971
msgstr ""
3972
3973
#: bzrlib/builtins.py:6347
3974
msgid " bzr view --delete --all"
3975
msgstr ""
3976
3977
#: bzrlib/builtins.py:6354
3978
msgid "Apply list or delete action to all views."
3979
msgstr ""
3980
3981
#: bzrlib/builtins.py:6357
3982
msgid "Delete the view."
3983
msgstr ""
3984
3985
#: bzrlib/builtins.py:6360
3986
msgid "Name of the view to define, list or delete."
3987
msgstr ""
3988
3989
#: bzrlib/builtins.py:6364
3990
msgid "Name of the view to switch to."
3991
msgstr ""
3992
3993
#: bzrlib/builtins.py:6383
3994
msgid "Both --delete and a file list specified"
3995
msgstr ""
3996
3997
#: bzrlib/builtins.py:6386
3998
msgid "Both --delete and --switch specified"
3999
msgstr ""
4000
4001
#: bzrlib/builtins.py:6389
4002
msgid "Deleted all views.\n"
4003
msgstr ""
4004
4005
#: bzrlib/builtins.py:6391
4006
msgid "No current view to delete"
4007
msgstr ""
4008
4009
#: bzrlib/builtins.py:6394
4010
#, python-format
4011
msgid "Deleted '%s' view.\n"
4012
msgstr ""
4013
4014
#: bzrlib/builtins.py:6398
4015
msgid "Both --switch and a file list specified"
4016
msgstr ""
4017
4018
#: bzrlib/builtins.py:6401
4019
msgid "Both --switch and --all specified"
4020
msgstr ""
4021
4022
#: bzrlib/builtins.py:6404
4023
msgid "No current view to disable"
4024
msgstr ""
4025
4026
#: bzrlib/builtins.py:6406
4027
#, python-format
4028
msgid "Disabled '%s' view.\n"
4029
msgstr ""
4030
4031
#: bzrlib/builtins.py:6410 bzrlib/builtins.py:6432
4032
msgid "Using '{0}' view: {1}\n"
4033
msgstr ""
4034
4035
#: bzrlib/builtins.py:6413
4036
msgid "Views defined:\n"
4037
msgstr ""
4038
4039
#: bzrlib/builtins.py:6422
4040
msgid "No views defined.\n"
4041
msgstr ""
4042
4043
#: bzrlib/builtins.py:6429
4044
msgid "Cannot change the 'off' pseudo view"
4045
msgstr ""
4046
4047
#: bzrlib/builtins.py:6437
4048
msgid "No current view.\n"
4049
msgstr ""
4050
4051
#: bzrlib/builtins.py:6440
4052
msgid "'{0}' view is: {1}\n"
4053
msgstr ""
4054
4055
#: bzrlib/builtins.py:6460
4056
msgid " <no hooks installed>\n"
4057
msgstr ""
4058
4059
#: bzrlib/builtins.py:6464
4060
msgid "Remove a branch."
4061
msgstr ""
4062
4063
#: bzrlib/builtins.py:6466
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:6471
4070
msgid " Remove the branch at repo/trunk::"
4071
msgstr ""
4072
4073
#: bzrlib/builtins.py:6473
4074
msgid " bzr remove-branch repo/trunk"
4075
msgstr ""
4076
4077
#: bzrlib/builtins.py:6480
4078
msgid "Remove branch even if it is the active branch."
4079
msgstr ""
4080
4081
#: bzrlib/builtins.py:6494
4082
msgid "Branch is active. Use --force to remove it."
4083
msgstr ""
4084
4085
#: bzrlib/builtins.py:6498
4086
msgid "Plaintext diff output."
4087
msgstr ""
4088
4089
#: bzrlib/builtins.py:6499
4090
msgid "Temporarily set aside some changes from the current tree."
4091
msgstr ""
4092
4093
#: bzrlib/builtins.py:6501
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:6507
4103
msgid "If shelve --list is specified, previously-shelved changes are listed."
4104
msgstr ""
4105
4106
#: bzrlib/builtins.py:6509
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:6514
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:6517
4121
msgid ""
4122
"If a revision is specified, changes since that revision will be shelved."
4123
msgstr ""
4124
4125
#: bzrlib/builtins.py:6519
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:6522
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:6526
4139
msgid " change_editor = PROGRAM @new_path @old_path"
4140
msgstr ""
4141
4142
#: bzrlib/builtins.py:6528
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:6540
4152
msgid "Shelve all changes."
4153
msgstr ""
4154
4155
#: bzrlib/builtins.py:6542
4156
msgid "Method to use for writing diffs."
4157
msgstr ""
4158
4159
#: bzrlib/builtins.py:6542
4160
msgid "writer"
4161
msgstr ""
4162
4163
#: bzrlib/builtins.py:6546
4164
msgid "List shelved changes."
4165
msgstr ""
4166
4167
#: bzrlib/builtins.py:6548
4168
msgid "Destroy removed changes instead of shelving them."
4169
msgstr ""
4170
4171
#: bzrlib/builtins.py:6577
4172
msgid "No shelved changes."
4173
msgstr ""
4174
4175
#: bzrlib/builtins.py:6588
4176
msgid "Restore shelved changes."
4177
msgstr ""
4178
4179
#: bzrlib/builtins.py:6590
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:6599
4187
msgid "The action to perform."
4188
msgstr ""
4189
4190
#: bzrlib/builtins.py:6599 bzrlib/conflicts.py:694
4191
msgid "action"
4192
msgstr ""
4193
4194
#: bzrlib/builtins.py:6601
4195
msgid "Apply changes and remove from the shelf."
4196
msgstr ""
4197
4198
#: bzrlib/builtins.py:6602
4199
msgid "Show changes, but do not apply or remove them."
4200
msgstr ""
4201
4202
#: bzrlib/builtins.py:6603
4203
msgid ""
4204
"Instead of unshelving the changes, show the diff that would result from "
4205
"unshelving."
4206
msgstr ""
4207
4208
#: bzrlib/builtins.py:6605
4209
msgid "Delete changes without applying them."
4210
msgstr ""
4211
4212
#: bzrlib/builtins.py:6606
4213
msgid "Apply changes but don't delete them."
4214
msgstr ""
4215
4216
#: bzrlib/builtins.py:6621
4217
msgid "Remove unwanted files from working tree."
4218
msgstr ""
4219
4220
#: bzrlib/builtins.py:6623
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:6626
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:6630
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:6633
4240
msgid "To check what clean-tree will do, use --dry-run."
4241
msgstr ""
4242
4243
#: bzrlib/builtins.py:6636
4244
msgid "Delete all ignored files."
4245
msgstr ""
4246
4247
#: bzrlib/builtins.py:6637
4248
msgid ""
4249
"Delete conflict files, merge and revert backups, and failed selftest dirs."
4250
msgstr ""
4251
4252
#: bzrlib/builtins.py:6640
4253
msgid "Delete files unknown to bzr (default)."
4254
msgstr ""
4255
4256
#: bzrlib/builtins.py:6641
4257
msgid "Show files to delete instead of deleting them."
4258
msgstr ""
4259
4260
#: bzrlib/builtins.py:6643
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:738
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:952
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:438
4773
msgid "Invalid config value for \"{0}\" value {1!r} is not an SI unit."
4774
msgstr ""
4775
4776
#: bzrlib/config.py:2468
4777
msgid "{0} is not an SI unit."
4778
msgstr ""
4779
4780
#: bzrlib/config.py:2989
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:3134
4787
#, python-format
4788
msgid "Invalid '%s', should be of the form 'name=value'"
4789
msgstr ""
4790
4791
#: bzrlib/config.py:4089
4792
msgid "Display, set or remove a configuration option."
4793
msgstr ""
4794
4795
#: bzrlib/config.py:4091
4796
msgid "Display the active value for option NAME."
4797
msgstr ""
4798
4799
#: bzrlib/config.py:4093
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 and without resolving\n"
4803
"option references in the value). The active value that bzr will take into\n"
4804
"account is the first one displayed for each option."
4805
msgstr ""
4806
4807
#: bzrlib/config.py:4098
4808
msgid ""
4809
"If NAME is not given, --all .* is implied (all options are displayed for "
4810
"the\n"
4811
"current scope)."
4812
msgstr ""
4813
4814
#: bzrlib/config.py:4101
4815
msgid ""
4816
"Setting a value is achieved by using NAME=value without spaces. The value\n"
4817
"is set in the most relevant scope and can be checked by displaying the\n"
4818
"option again."
4819
msgstr ""
4820
4821
#: bzrlib/config.py:4105
4822
msgid "Removing a value is achieved by using --remove NAME."
4823
msgstr ""
4824
4825
#: bzrlib/config.py:4115
4826
msgid "Reduce the scope to the specified configuration file."
4827
msgstr ""
4828
4829
#: bzrlib/config.py:4119
4830
msgid "Display all the defined values for the matching options."
4831
msgstr ""
4832
4833
#: bzrlib/config.py:4121
4834
msgid "Remove the option from the configuration file."
4835
msgstr ""
4836
4837
#: bzrlib/conflicts.py:50
4838
msgid "List files with conflicts."
4839
msgstr ""
4840
4841
#: bzrlib/conflicts.py:57
4842
msgid ""
4843
"Conflicts normally are listed as short, human-readable messages. If --text\n"
4844
"is supplied, the pathnames of files with text conflicts are listed,\n"
4845
"instead. (This is useful for editing all files with text conflicts.)"
4846
msgstr ""
4847
4848
#: bzrlib/conflicts.py:61
4849
msgid "Use bzr resolve when you have fixed a problem."
4850
msgstr ""
4851
4852
#: bzrlib/conflicts.py:66
4853
msgid "List paths of files with text conflicts."
4854
msgstr ""
4855
4856
#: bzrlib/conflicts.py:85
4857
msgid "Marks the conflict as resolved."
4858
msgstr ""
4859
4860
#: bzrlib/conflicts.py:88
4861
msgid "Resolve the conflict preserving the version in the working tree."
4862
msgstr ""
4863
4864
#: bzrlib/conflicts.py:91
4865
msgid "Resolve the conflict taking the merged version into account."
4866
msgstr ""
4867
4868
#: bzrlib/conflicts.py:98
4869
msgid "How to resolve the conflict."
4870
msgstr ""
4871
4872
#: bzrlib/conflicts.py:104
4873
msgid "Mark a conflict as resolved."
4874
msgstr ""
4875
4876
#: bzrlib/conflicts.py:111
4877
msgid ""
4878
"Once you have fixed a problem, use \"bzr resolve\" to automatically mark\n"
4879
"text conflicts as fixed, \"bzr resolve FILE\" to mark a specific conflict "
4880
"as\n"
4881
"resolved, or \"bzr resolve --all\" to mark all conflicts as resolved."
4882
msgstr ""
4883
4884
#: bzrlib/conflicts.py:119
4885
msgid "Resolve all conflicts in this tree."
4886
msgstr ""
4887
4888
#: bzrlib/conflicts.py:126
4889
msgid "If --all is specified, no FILE may be provided"
4890
msgstr ""
4891
4892
#: bzrlib/conflicts.py:151
4893
#, python-format
4894
msgid "%d conflict auto-resolved."
4895
msgid_plural "%d conflicts auto-resolved."
4896
msgstr[0] ""
4897
msgstr[1] ""
4898
4899
#: bzrlib/conflicts.py:154
4900
msgid "Remaining conflicts:"
4901
msgstr ""
4902
4903
#: bzrlib/conflicts.py:159
4904
msgid "All conflicts resolved."
4905
msgstr ""
4906
4907
#: bzrlib/conflicts.py:168
4908
msgid "{0} conflict resolved, {1} remaining"
4909
msgid_plural "{0} conflicts resolved, {1} remaining"
4910
msgstr[0] ""
4911
msgstr[1] ""
4912
4913
#: bzrlib/controldir.py:712
4914
msgid "{0} is{1} redirected to {2}"
4915
msgstr ""
4916
4917
#: bzrlib/diff.py:400
4918
#, python-format
4919
msgid "*** Ignoring files outside view. View is %s"
4920
msgstr ""
4921
4922
#: bzrlib/errors.py:157
4923
msgid "The tree builder is already building a tree."
4924
msgstr ""
4925
4926
#: bzrlib/errors.py:178
4927
msgid "The dirstate file (%(state)s) appears to be corrupt: %(msg)s"
4928
msgstr ""
4929
4930
#: bzrlib/errors.py:197
4931
msgid ""
4932
"The API for \"%(api)s\" is not compatible with \"%(wanted)s\". It supports "
4933
"versions \"%(minimum)s\" to \"%(current)s\"."
4934
msgstr ""
4935
4936
#: bzrlib/errors.py:209
4937
msgid "The transport '%(transport)s' is only accessible within this process."
4938
msgstr ""
4939
4940
#: bzrlib/errors.py:227
4941
msgid "Invalid revision number %(revno)s"
4942
msgstr ""
4943
4944
#: bzrlib/errors.py:236
4945
msgid "Invalid revision-id {%(revision_id)s} in %(branch)s"
4946
msgstr ""
4947
4948
#: bzrlib/errors.py:247
4949
msgid "Reserved revision-id {%(revision_id)s}"
4950
msgstr ""
4951
4952
#: bzrlib/errors.py:261
4953
msgid "There is no public branch set for \"%(branch_url)s\"."
4954
msgstr ""
4955
4956
#: bzrlib/errors.py:271
4957
msgid ""
4958
"No help could be found for '%(topic)s'. Please use 'bzr help topics' to "
4959
"obtain a list of topics."
4960
msgstr ""
4961
4962
#: bzrlib/errors.py:280
4963
msgid "The file id \"%(file_id)s\" is not present in the tree %(tree)s."
4964
msgstr ""
4965
4966
#: bzrlib/errors.py:290
4967
msgid ""
4968
"The file id \"%(file_id)s\" is not present in the repository %(repository)r"
4969
msgstr ""
4970
4971
#: bzrlib/errors.py:299
4972
msgid "The branch '%(branch)s' is not stacked."
4973
msgstr ""
4974
4975
#: bzrlib/errors.py:313
4976
msgid "No WorkingTree exists for \"%(base)s\"."
4977
msgstr ""
4978
4979
#: bzrlib/errors.py:322
4980
msgid "Not currently building a tree."
4981
msgstr ""
4982
4983
#: bzrlib/errors.py:327
4984
msgid "%(url)s is not a local path."
4985
msgstr ""
4986
4987
#: bzrlib/errors.py:355
4988
msgid "%(not_locked)r is not write locked but needs to be."
4989
msgstr ""
4990
4991
#: bzrlib/errors.py:363
4992
msgid "Error in command line options"
4993
msgstr ""
4994
4995
#: bzrlib/errors.py:368
4996
msgid "%(value)s is not an index of type %(_type)s."
4997
msgstr ""
4998
4999
#: bzrlib/errors.py:378
5000
msgid "Error in data for index %(value)s."
5001
msgstr ""
5002
5003
#: bzrlib/errors.py:387
5004
msgid "The key '%(key)s' is already in index '%(index)s'."
5005
msgstr ""
5006
5007
#: bzrlib/errors.py:397
5008
msgid "The key '%(key)s' is not a valid key."
5009
msgstr ""
5010
5011
#: bzrlib/errors.py:406
5012
msgid "Could not parse options for index %(value)s."
5013
msgstr ""
5014
5015
#: bzrlib/errors.py:415
5016
msgid "The value '%(value)s' is not a valid value."
5017
msgstr ""
5018
5019
#: bzrlib/errors.py:424
5020
msgid "Bad value \"%(value)s\" for option \"%(name)s\"."
5021
msgstr ""
5022
5023
#: bzrlib/errors.py:443
5024
msgid "Generic path error: %(path)r%(extra)s)"
5025
msgstr ""
5026
5027
#: bzrlib/errors.py:456
5028
msgid "No such file: %(path)r%(extra)s"
5029
msgstr ""
5030
5031
#: bzrlib/errors.py:461
5032
msgid "File exists: %(path)r%(extra)s"
5033
msgstr ""
5034
5035
#: bzrlib/errors.py:467
5036
msgid ""
5037
"Could not rename %(source)s => %(dest)s because both files exist. (Use --"
5038
"after to tell bzr about a rename that has already happened)%(extra)s"
5039
msgstr ""
5040
5041
#: bzrlib/errors.py:483
5042
msgid "\"%(path)s\" is not a directory %(extra)s"
5043
msgstr ""
5044
5045
#: bzrlib/errors.py:488
5046
msgid "\"%(path)s\" is not in the working directory %(extra)s"
5047
msgstr ""
5048
5049
#: bzrlib/errors.py:493
5050
msgid "Directory not empty: \"%(path)s\"%(extra)s"
5051
msgstr ""
5052
5053
#: bzrlib/errors.py:498
5054
msgid "Hard-linking \"%(path)s\" is not supported"
5055
msgstr ""
5056
5057
#: bzrlib/errors.py:513
5058
msgid "Device or resource busy: \"%(path)s\"%(extra)s"
5059
msgstr ""
5060
5061
#: bzrlib/errors.py:518
5062
msgid "Permission denied: \"%(path)s\"%(extra)s"
5063
msgstr ""
5064
5065
#: bzrlib/errors.py:523
5066
msgid "Invalid url supplied to transport: \"%(path)s\"%(extra)s"
5067
msgstr ""
5068
5069
#: bzrlib/errors.py:528
5070
msgid "Invalid URL join request: %(reason)s: %(base)r + %(join_args)r"
5071
msgstr ""
5072
5073
#: bzrlib/errors.py:539
5074
msgid "URLs differ by more than path: %(from_)r and %(to)r"
5075
msgstr ""
5076
5077
#: bzrlib/errors.py:561
5078
msgid "The %(type)s hook '%(hook)s' is unknown in this version of bzrlib."
5079
msgstr ""
5080
5081
#: bzrlib/errors.py:571
5082
msgid "Unsupported protocol for url \"%(path)s\"%(extra)s"
5083
msgstr ""
5084
5085
#: bzrlib/errors.py:579
5086
msgid ""
5087
"The branch '%(url)s'(%(format)s) is not a stackable format. You will need to "
5088
"upgrade the branch to permit branch stacking."
5089
msgstr ""
5090
5091
#: bzrlib/errors.py:590
5092
msgid "The branch '%(branch_url)s' cannot be stacked on '%(target_url)s'."
5093
msgstr ""
5094
5095
#: bzrlib/errors.py:600
5096
msgid ""
5097
"The repository '%(url)s'(%(format)s) is not a stackable format. You will "
5098
"need to upgrade the repository to permit branch stacking."
5099
msgstr ""
5100
5101
#: bzrlib/errors.py:611
5102
msgid "Error reading from %(path)r."
5103
msgstr ""
5104
5105
#: bzrlib/errors.py:630
5106
msgid "Path \"%(path)s\" is not a child of path \"%(base)s\"%(extra)s"
5107
msgstr ""
5108
5109
#: bzrlib/errors.py:646
5110
msgid "Path \"%(path)s\" is not unicode normalized"
5111
msgstr ""
5112
5113
#: bzrlib/errors.py:654
5114
msgid "Not a branch: \"%(path)s\"%(detail)s."
5115
msgstr ""
5116
5117
#: bzrlib/errors.py:696
5118
msgid "No submit branch available for branch \"%(path)s\""
5119
msgstr ""
5120
5121
#: bzrlib/errors.py:705
5122
msgid "A control directory already exists: \"%(path)s\"."
5123
msgstr ""
5124
5125
#: bzrlib/errors.py:710
5126
msgid "Already a branch: \"%(path)s\"."
5127
msgstr ""
5128
5129
#: bzrlib/errors.py:715
5130
msgid "Invalid branch name: %(name)s"
5131
msgstr ""
5132
5133
#: bzrlib/errors.py:724
5134
msgid "Parent branch already exists: \"%(path)s\"."
5135
msgstr ""
5136
5137
#: bzrlib/errors.py:730
5138
msgid ""
5139
"Directory contains a branch, but no working tree (use bzr checkout if you "
5140
"wish to build a working tree): \"%(path)s\""
5141
msgstr ""
5142
5143
#: bzrlib/errors.py:735
5144
msgid ""
5145
"\"%(function)s\" called on an AtomicFile after it was closed: \"%(path)s\""
5146
msgstr ""
5147
5148
#: bzrlib/errors.py:745
5149
msgid ""
5150
"Parent not accessible given base \"%(base)s\" and relative path \"%(path)s\""
5151
msgstr ""
5152
5153
#: bzrlib/errors.py:755
5154
msgid "No repository present: \"%(path)s\""
5155
msgstr ""
5156
5157
#: bzrlib/errors.py:762
5158
msgid ""
5159
"Unsupported branch format: %(format)s\n"
5160
"Please run 'bzr upgrade'"
5161
msgstr ""
5162
5163
#: bzrlib/errors.py:768
5164
msgid "Unknown %(kind)s format: %(format)r"
5165
msgstr ""
5166
5167
#: bzrlib/errors.py:777
5168
msgid "Format %(format)s is not compatible with .bzr version %(bzrdir)s."
5169
msgstr ""
5170
5171
#: bzrlib/errors.py:787
5172
msgid "Parse error on line %(lineno)d of %(format)s format: %(line)s"
5173
msgstr ""
5174
5175
#: bzrlib/errors.py:802
5176
msgid ""
5177
"%(target)s\n"
5178
"is not compatible with\n"
5179
"%(source)s\n"
5180
"%(details)s"
5181
msgstr ""
5182
5183
#: bzrlib/errors.py:818
5184
msgid "Revision is not compatible with %(repo_format)s"
5185
msgstr ""
5186
5187
#: bzrlib/errors.py:828
5188
msgid "%(context_info)s%(path)s is already versioned."
5189
msgstr ""
5190
5191
#: bzrlib/errors.py:849
5192
msgid "%(context_info)s%(path)s is not versioned."
5193
msgstr ""
5194
5195
#: bzrlib/errors.py:870
5196
msgid "Path(s) are not versioned: %(paths_as_string)s"
5197
msgstr ""
5198
5199
#: bzrlib/errors.py:881
5200
msgid "Path(s) do not exist: %(paths_as_string)s%(extra)s"
5201
msgstr ""
5202
5203
#: bzrlib/errors.py:900
5204
msgid "Cannot operate on \"%(filename)s\" of unsupported kind \"%(kind)s\""
5205
msgstr ""
5206
5207
#: bzrlib/errors.py:908
5208
msgid ""
5209
"Filename %(filename)r is not valid in your current filesystem encoding "
5210
"%(fs_encoding)s"
5211
msgstr ""
5212
5213
#: bzrlib/errors.py:919
5214
msgid "Cannot operate on \"%(filename)s\" because it is a control file"
5215
msgstr ""
5216
5217
#: bzrlib/errors.py:937
5218
msgid "The lock for '%(lock_description)s' is in use and cannot be broken."
5219
msgstr ""
5220
5221
#: bzrlib/errors.py:976
5222
msgid "Cannot lock %(lock)s: %(why)s"
5223
msgstr ""
5224
5225
#: bzrlib/errors.py:986
5226
msgid ""
5227
"A transaction related operation was attempted after the transaction finished."
5228
msgstr ""
5229
5230
#: bzrlib/errors.py:1013
5231
msgid "Cannot lock: transport is read only: %(transport)s"
5232
msgstr ""
5233
5234
#: bzrlib/errors.py:1021
5235
msgid "Could not acquire lock \"%(lock)s\": %(msg)s"
5236
msgstr ""
5237
5238
#: bzrlib/errors.py:1032
5239
msgid ""
5240
"Lock was broken while still open: %(lock)s - check storage consistency!"
5241
msgstr ""
5242
5243
#: bzrlib/errors.py:1043
5244
msgid ""
5245
"Lock was released and re-acquired before being broken: %(lock)s: held by "
5246
"%(holder)r, wanted to break %(target)r"
5247
msgstr ""
5248
5249
#: bzrlib/errors.py:1055
5250
msgid ""
5251
"Lock is apparently held, but corrupted: %(corruption_info)s\n"
5252
"Use 'bzr break-lock' to clear it"
5253
msgstr ""
5254
5255
#: bzrlib/errors.py:1068
5256
msgid "Lock not held: %(lock)s"
5257
msgstr ""
5258
5259
#: bzrlib/errors.py:1097
5260
msgid "No changes to commit"
5261
msgstr ""
5262
5263
#: bzrlib/errors.py:1102
5264
msgid ""
5265
"Selected-file commit of merges is not supported yet: files %(files_str)s"
5266
msgstr ""
5267
5268
#: bzrlib/errors.py:1112
5269
msgid ""
5270
"Excluding paths during commit is not supported by repository at "
5271
"%(repository)r."
5272
msgstr ""
5273
5274
#: bzrlib/errors.py:1121
5275
msgid ""
5276
"The specified commit message contains characters unsupported by the current "
5277
"encoding."
5278
msgstr ""
5279
5280
#: bzrlib/errors.py:1127
5281
msgid "Upgrade URL cannot work with readonly URLs."
5282
msgstr ""
5283
5284
#: bzrlib/errors.py:1132
5285
msgid "The branch format %(format)s is already at the most recent format."
5286
msgstr ""
5287
5288
#: bzrlib/errors.py:1155
5289
msgid "Option --change does not accept revision ranges"
5290
msgstr ""
5291
5292
#: bzrlib/errors.py:1160
5293
msgid "No namespace registered for string: %(spec)r"
5294
msgstr ""
5295
5296
#: bzrlib/errors.py:1179
5297
msgid ""
5298
"Requested revision: '%(spec)s' does not exist in branch: "
5299
"%(branch_url)s%(extra)s"
5300
msgstr ""
5301
5302
#: bzrlib/errors.py:1193
5303
msgid ""
5304
"Operation denied because it would change the main history, which is not "
5305
"permitted by the append_revisions_only setting on branch \"%(location)s\"."
5306
msgstr ""
5307
5308
#: bzrlib/errors.py:1204
5309
msgid ""
5310
"These branches have diverged. Use the missing command to see how.\n"
5311
"Use the merge command to reconcile them."
5312
msgstr ""
5313
5314
#: bzrlib/errors.py:1224
5315
msgid ""
5316
"Branches have no common ancestor, and no merge base revision was specified."
5317
msgstr ""
5318
5319
#: bzrlib/errors.py:1230
5320
msgid ""
5321
"Selected merge cannot perform reverse cherrypicks. Try merge3 or diff3."
5322
msgstr ""
5323
5324
#: bzrlib/errors.py:1236
5325
msgid "Revisions have no common ancestor: %(revision_a)s %(revision_b)s"
5326
msgstr ""
5327
5328
#: bzrlib/errors.py:1245
5329
msgid ""
5330
"Revisions are not derived from the same root: %(revision_a)s %(revision_b)s."
5331
msgstr ""
5332
5333
#: bzrlib/errors.py:1254
5334
msgid "Revision %(rev_id)s is not an ancestor of %(not_ancestor_id)s"
5335
msgstr ""
5336
5337
#: bzrlib/errors.py:1263
5338
msgid "Branch %(branch)s has no commits."
5339
msgstr ""
5340
5341
#: bzrlib/errors.py:1281
5342
msgid ""
5343
"Bound branch %(branch)s is out of date with master branch "
5344
"%(master)s.%(extra_help)s"
5345
msgstr ""
5346
5347
#: bzrlib/errors.py:1293
5348
msgid ""
5349
"Cannot commit to branch %(branch)s. It is bound to %(master)s, which is "
5350
"bound to %(remote)s."
5351
msgstr ""
5352
5353
#: bzrlib/errors.py:1305
5354
msgid "Cannot pull --overwrite to a branch which is bound %(branch)s"
5355
msgstr ""
5356
5357
#: bzrlib/errors.py:1314
5358
msgid ""
5359
"Unable to connect to target of bound branch %(branch)s => %(target)s: "
5360
"%(error)s"
5361
msgstr ""
5362
5363
#: bzrlib/errors.py:1326
5364
msgid "Error in processing weave: %(msg)s"
5365
msgstr ""
5366
5367
#: bzrlib/errors.py:1335
5368
msgid "Revision {%(revision_id)s} already present in %(weave)s"
5369
msgstr ""
5370
5371
#: bzrlib/errors.py:1346
5372
msgid "Revision {%(revision_id)s} not present in %(weave)s"
5373
msgstr ""
5374
5375
#: bzrlib/errors.py:1356
5376
msgid "Weave invariant violated: %(what)s"
5377
msgstr ""
5378
5379
#: bzrlib/errors.py:1365
5380
msgid "Parents are mismatched between two revisions. %(msg)s"
5381
msgstr ""
5382
5383
#: bzrlib/errors.py:1387
5384
msgid ""
5385
"Weaves differ on text content. Revision: {%(revision_id)s}, %(weave_a)s, "
5386
"%(weave_b)s"
5387
msgstr ""
5388
5389
#: bzrlib/errors.py:1399
5390
msgid "Versioned file error"
5391
msgstr ""
5392
5393
#: bzrlib/errors.py:1404
5394
msgid "Revision {%(revision_id)s} not present in \"%(file_id)s\"."
5395
msgstr ""
5396
5397
#: bzrlib/errors.py:1414
5398
msgid "Revision {%(revision_id)s} already present in \"%(file_id)s\"."
5399
msgstr ""
5400
5401
#: bzrlib/errors.py:1424
5402
msgid "Text did not match its checksum: %(msg)s"
5403
msgstr ""
5404
5405
#: bzrlib/errors.py:1550
5406
msgid "Export format %(format)r not supported"
5407
msgstr ""
5408
5409
#: bzrlib/errors.py:1559
5410
msgid "Transport error: %(msg)s %(orig_error)s"
5411
msgstr ""
5412
5413
#: bzrlib/errors.py:1585
5414
msgid "Generic bzr smart protocol error: %(details)s"
5415
msgstr ""
5416
5417
#: bzrlib/errors.py:1593
5418
msgid "Received bad protocol version marker: %(marker)r"
5419
msgstr ""
5420
5421
#: bzrlib/errors.py:1625
5422
msgid "Transport operation not possible: %(msg)s %(orig_error)s"
5423
msgstr ""
5424
5425
#: bzrlib/errors.py:1630
5426
msgid "Connection error: %(msg)s %(orig_error)s"
5427
msgstr ""
5428
5429
#: bzrlib/errors.py:1635
5430
msgid "%(msg)s %(host)s%(port)s%(orig_error)s"
5431
msgstr ""
5432
5433
#: bzrlib/errors.py:1656
5434
msgid "Connection closed: %(msg)s %(orig_error)s"
5435
msgstr ""
5436
5437
#: bzrlib/errors.py:1661
5438
msgid "Connection Timeout: %(msg)s%(orig_error)s"
5439
msgstr ""
5440
5441
#: bzrlib/errors.py:1666
5442
msgid "Invalid range access in %(path)s at %(offset)s: %(msg)s"
5443
msgstr ""
5444
5445
#: bzrlib/errors.py:1676
5446
msgid "Invalid http response for %(path)s: %(msg)s%(orig_error)s"
5447
msgstr ""
5448
5449
#: bzrlib/errors.py:1691
5450
msgid "Certificate error: %(error)s"
5451
msgstr ""
5452
5453
#: bzrlib/errors.py:1699
5454
msgid "Invalid http range %(range)r for %(path)s: %(msg)s"
5455
msgstr ""
5456
5457
#: bzrlib/errors.py:1713
5458
msgid "HTTP MIME Boundary missing for %(path)s: %(msg)s"
5459
msgstr ""
5460
5461
#: bzrlib/errors.py:1721
5462
msgid "Invalid http Content-type \"%(ctype)s\" for %(path)s: %(msg)s"
5463
msgstr ""
5464
5465
#: bzrlib/errors.py:1730
5466
msgid "%(source)s is%(permanently)s redirected to %(target)s"
5467
msgstr ""
5468
5469
#: bzrlib/errors.py:1744
5470
msgid "Too many redirections"
5471
msgstr ""
5472
5473
#: bzrlib/errors.py:1749
5474
msgid "Working tree has conflicts."
5475
msgstr ""
5476
5477
#: bzrlib/errors.py:1753
5478
msgid "Config file %(filename)s is not UTF-8 encoded\n"
5479
msgstr ""
5480
5481
#: bzrlib/errors.py:1762
5482
msgid ""
5483
"Error(s) parsing config file %(filename)s:\n"
5484
"%(errors)s"
5485
msgstr ""
5486
5487
#: bzrlib/errors.py:1772
5488
msgid ""
5489
"Bad value \"%(value)s\" for option \"%(name)s\".\n"
5490
"See ``bzr help %(name)s``"
5491
msgstr ""
5492
5493
#: bzrlib/errors.py:1782
5494
msgid "%(username)r does not seem to contain a reasonable email address"
5495
msgstr ""
5496
5497
#: bzrlib/errors.py:1791
5498
msgid "Failed to GPG sign data with command \"%(command_line)s\""
5499
msgstr ""
5500
5501
#: bzrlib/errors.py:1799
5502
msgid "Failed to verify GPG signature data with error \"%(error)s\""
5503
msgstr ""
5504
5505
#: bzrlib/errors.py:1807
5506
msgid "Unable to import library \"%(library)s\": %(error)s"
5507
msgstr ""
5508
5509
#: bzrlib/errors.py:1815
5510
msgid "python-gpgme is not installed, it is needed to verify signatures"
5511
msgstr ""
5512
5513
#: bzrlib/errors.py:1823
5514
msgid ""
5515
"The working tree for %(basedir)s has changed since the last commit, but "
5516
"weave merge requires that it be unchanged"
5517
msgstr ""
5518
5519
#: bzrlib/errors.py:1833
5520
msgid ""
5521
"Can't reprocess and show base, because reprocessing obscures the "
5522
"relationship of conflicting lines to the base"
5523
msgstr ""
5524
5525
#: bzrlib/errors.py:1839
5526
msgid "Cycle in graph %(graph)r"
5527
msgstr ""
5528
5529
#: bzrlib/errors.py:1867
5530
msgid "File %(filename)s is not conflicted."
5531
msgstr ""
5532
5533
#: bzrlib/errors.py:1889
5534
msgid "No bundle was found in \"%(filename)s\"."
5535
msgstr ""
5536
5537
#: bzrlib/errors.py:1898
5538
msgid "Unable to handle bundle version %(version)s: %(msg)s"
5539
msgstr ""
5540
5541
#: bzrlib/errors.py:1908
5542
msgid "Branch %(base)s is missing revision %(text_revision)s of %(file_id)s"
5543
msgstr ""
5544
5545
#: bzrlib/errors.py:1921
5546
msgid "File id {%(file_id)s} already exists in inventory as %(entry)s"
5547
msgstr ""
5548
5549
#: bzrlib/errors.py:1931
5550
msgid "Key %(key)s is already present in map"
5551
msgstr ""
5552
5553
#: bzrlib/errors.py:1936
5554
msgid "The prefix %(prefix)s is in the help search path twice."
5555
msgstr ""
5556
5557
#: bzrlib/errors.py:1946
5558
msgid ""
5559
"No final name for trans_id %(trans_id)r\n"
5560
"file-id: %(file_id)r\n"
5561
"root trans-id: %(root_trans_id)r\n"
5562
msgstr ""
5563
5564
#: bzrlib/errors.py:1978
5565
msgid "Attempt to reuse a transform that has already been applied."
5566
msgstr ""
5567
5568
#: bzrlib/errors.py:1983
5569
msgid "Moving the root directory is not supported at this time"
5570
msgstr ""
5571
5572
#: bzrlib/errors.py:1988
5573
msgid "Failed to rename %(from_path)s to %(to_path)s: %(why)s"
5574
msgstr ""
5575
5576
#: bzrlib/errors.py:1999
5577
msgid ""
5578
"Could not move %(from_path)s%(operator)s %(to_path)s%(_has_extra)s%(extra)s"
5579
msgstr ""
5580
5581
#: bzrlib/errors.py:2035
5582
msgid ""
5583
"Could not rename %(from_path)s%(operator)s %(to_path)s%(_has_extra)s%(extra)s"
5584
msgstr ""
5585
5586
#: bzrlib/errors.py:2065
5587
msgid "Unable to import paramiko (required for sftp support): %(error)s"
5588
msgstr ""
5589
5590
#: bzrlib/errors.py:2073
5591
msgid "Nothing to merge."
5592
msgstr ""
5593
5594
#: bzrlib/errors.py:2078
5595
msgid "Format %(format)s cannot be initialised by this version of bzr."
5596
msgstr ""
5597
5598
#: bzrlib/errors.py:2087
5599
msgid ""
5600
"Cannot convert from format %(from_format)s to format %(format)s. "
5601
"%(problem)s"
5602
msgstr ""
5603
5604
#: bzrlib/errors.py:2099
5605
msgid "Could not find an appropriate Differ for file \"%(path)s\""
5606
msgstr ""
5607
5608
#: bzrlib/errors.py:2107
5609
msgid "%(exe_name)s could not be found on this machine"
5610
msgstr ""
5611
5612
#: bzrlib/errors.py:2115
5613
msgid "Diff is not installed on this machine: %(msg)s"
5614
msgstr ""
5615
5616
#: bzrlib/errors.py:2123
5617
msgid "Diff3 is not installed on this machine."
5618
msgstr ""
5619
5620
#: bzrlib/errors.py:2129
5621
msgid "The content being inserted is already present."
5622
msgstr ""
5623
5624
#: bzrlib/errors.py:2134
5625
msgid ""
5626
"This tree contains left-over files from a failed operation.\n"
5627
" Please examine %(limbo_dir)s to see if it contains any files you wish "
5628
"to\n"
5629
" keep, and delete it when you are done."
5630
msgstr ""
5631
5632
#: bzrlib/errors.py:2145
5633
msgid ""
5634
"This tree contains left-over files from a failed operation.\n"
5635
" Please examine %(pending_deletion)s to see if it contains any files you\n"
5636
" wish to keep, and delete it when you are done."
5637
msgstr ""
5638
5639
#: bzrlib/errors.py:2155
5640
msgid ""
5641
"Unable to delete transform temporary directory %(limbo_dir)s.\n"
5642
" Please examine %(limbo_dir)s to see if it contains any files you wish "
5643
"to\n"
5644
" keep, and delete it when you are done."
5645
msgstr ""
5646
5647
#: bzrlib/errors.py:2166
5648
msgid ""
5649
"Unable to delete transform temporary directory %(pending_deletion)s. Please "
5650
"examine %(pending_deletion)s to see if it contains any files you wish to "
5651
"keep, and delete it when you are done."
5652
msgstr ""
5653
5654
#: bzrlib/errors.py:2176
5655
msgid "Working tree is out of date, please run 'bzr update'.%(more)s"
5656
msgstr ""
5657
5658
#: bzrlib/errors.py:2190
5659
msgid ""
5660
"Public branch \"%(public_location)s\" lacks revision \"%(revstring)s\"."
5661
msgstr ""
5662
5663
#: bzrlib/errors.py:2203
5664
msgid "Error in merge modified format"
5665
msgstr ""
5666
5667
#: bzrlib/errors.py:2208
5668
msgid "Format error in conflict listings"
5669
msgstr ""
5670
5671
#: bzrlib/errors.py:2212
5672
msgid ""
5673
"Inconsistency in dirstate file %(dirstate_path)s.\n"
5674
"Error: %(description)s"
5675
msgstr ""
5676
5677
#: bzrlib/errors.py:2223
5678
msgid ""
5679
"An error has been detected in the repository %(repo_path)s.\n"
5680
"Please run bzr reconcile on this repository."
5681
msgstr ""
5682
5683
#: bzrlib/errors.py:2234
5684
msgid ""
5685
"An inconsistent delta was supplied involving %(path)r, %(file_id)r\n"
5686
"reason: %(reason)s"
5687
msgstr ""
5688
5689
#: bzrlib/errors.py:2247
5690
msgid ""
5691
"An inconsistent delta was supplied: %(delta)r\n"
5692
"reason: %(reason)s"
5693
msgstr ""
5694
5695
#: bzrlib/errors.py:2259
5696
msgid "To use this feature you must upgrade your branch at %(path)s."
5697
msgstr ""
5698
5699
#: bzrlib/errors.py:2268
5700
msgid "To use this feature you must upgrade your repository at %(path)s."
5701
msgstr ""
5702
5703
#: bzrlib/errors.py:2273
5704
msgid ""
5705
"To use this feature you must upgrade your branch at %(path)s to a format "
5706
"which supports rich roots."
5707
msgstr ""
5708
5709
#: bzrlib/errors.py:2279
5710
msgid "Cannot perform local-only commits on unbound branches."
5711
msgstr ""
5712
5713
#: bzrlib/errors.py:2284
5714
msgid "The method %(mname)s is not supported on objects of type %(tname)s."
5715
msgstr ""
5716
5717
#: bzrlib/errors.py:2305
5718
msgid "Ghost tags not supported by format %(format)r."
5719
msgstr ""
5720
5721
#: bzrlib/errors.py:2313
5722
msgid "File is binary but should be text."
5723
msgstr ""
5724
5725
#: bzrlib/errors.py:2318
5726
msgid "The path %(path)s is not permitted on this platform"
5727
msgstr ""
5728
5729
#: bzrlib/errors.py:2327
5730
msgid ""
5731
"Testament did not match expected value.\n"
5732
" For revision_id {%(revision_id)s}, expected {%(expected)s}, measured\n"
5733
" {%(measured)s}"
5734
msgstr ""
5735
5736
#: bzrlib/errors.py:2339
5737
msgid "Not a bzr revision-bundle: %(text)r"
5738
msgstr ""
5739
5740
#: bzrlib/errors.py:2348
5741
msgid "Bad bzr revision-bundle: %(text)r"
5742
msgstr ""
5743
5744
#: bzrlib/errors.py:2357
5745
msgid "Malformed bzr revision-bundle header: %(text)r"
5746
msgstr ""
5747
5748
#: bzrlib/errors.py:2362
5749
msgid "Malformed patches in bzr revision-bundle: %(text)r"
5750
msgstr ""
5751
5752
#: bzrlib/errors.py:2367
5753
msgid "Malformed footer in bzr revision-bundle: %(text)r"
5754
msgstr ""
5755
5756
#: bzrlib/errors.py:2372
5757
msgid "End of line marker was not \\n in bzr revision-bundle"
5758
msgstr ""
5759
5760
#: bzrlib/errors.py:2382
5761
msgid "Bundle format %(bundle_format)s is incompatible with %(other)s"
5762
msgstr ""
5763
5764
#: bzrlib/errors.py:2392
5765
msgid "Root class for inventory serialization errors"
5766
msgstr ""
5767
5768
#: bzrlib/errors.py:2396
5769
msgid ""
5770
"The inventory was not in the expected format:\n"
5771
" %(msg)s"
5772
msgstr ""
5773
5774
#: bzrlib/errors.py:2405
5775
msgid "This operation requires rich root data storage"
5776
msgstr ""
5777
5778
#: bzrlib/errors.py:2418
5779
msgid "Unrecognised value for BZR_SSH environment variable: %(vendor)s"
5780
msgstr ""
5781
5782
#: bzrlib/errors.py:2427
5783
msgid ""
5784
"Don't know how to handle SSH connections. Please set BZR_SSH environment "
5785
"variable."
5786
msgstr ""
5787
5788
#: bzrlib/errors.py:2434
5789
msgid ""
5790
"Could not determine revno for {%(revision_id)s} because its ancestry shows a "
5791
"ghost at {%(ghost_revision_id)s}"
5792
msgstr ""
5793
5794
#: bzrlib/errors.py:2444
5795
msgid "Ghost revision {%(revision_id)s} cannot be used here."
5796
msgstr ""
5797
5798
#: bzrlib/errors.py:2495
5799
msgid ""
5800
"A merge directive must provide either a bundle or a public branch location."
5801
msgstr ""
5802
5803
#: bzrlib/errors.py:2502
5804
msgid "Bad merge directive payload %(start)r"
5805
msgstr ""
5806
5807
#: bzrlib/errors.py:2512
5808
msgid "Preview patch does not match requested changes."
5809
msgstr ""
5810
5811
#: bzrlib/errors.py:2518
5812
msgid "Patch_type was %(patch_type)s, but no patch was supplied."
5813
msgstr ""
5814
5815
#: bzrlib/errors.py:2528
5816
msgid ""
5817
"Your branch does not have all of the revisions required in order to merge "
5818
"this merge directive and the target location specified in the merge "
5819
"directive is not a branch: %(location)s."
5820
msgstr ""
5821
5822
#: bzrlib/errors.py:2540
5823
msgid "Unsupported entry kind %(kind)s"
5824
msgstr ""
5825
5826
#: bzrlib/errors.py:2548
5827
msgid "Can't subsume %(other_tree)s into %(tree)s. %(reason)s"
5828
msgstr ""
5829
5830
#: bzrlib/errors.py:2558
5831
msgid "Subsume target %(other_tree)s needs to be upgraded."
5832
msgstr ""
5833
5834
#: bzrlib/errors.py:2577
5835
msgid "No such tag: %(tag_name)s"
5836
msgstr ""
5837
5838
#: bzrlib/errors.py:2585
5839
msgid "Tags not supported by %(branch)s; you may be able to use bzr upgrade."
5840
msgstr ""
5841
5842
#: bzrlib/errors.py:2594
5843
msgid "Tag %(tag_name)s already exists."
5844
msgstr ""
5845
5846
#: bzrlib/errors.py:2602
5847
msgid ""
5848
"Did not understand bug identifier %(bug_id)s: %(reason)s. See \"bzr help "
5849
"bugs\" for more information on this feature."
5850
msgstr ""
5851
5852
#: bzrlib/errors.py:2612
5853
msgid ""
5854
"The URL for bug tracker \"%(abbreviation)s\" doesn't contain {id}: %(url)s"
5855
msgstr ""
5856
5857
#: bzrlib/errors.py:2622
5858
msgid ""
5859
"Cannot find registered bug tracker called %(abbreviation)s on %(branch)s"
5860
msgstr ""
5861
5862
#: bzrlib/errors.py:2632
5863
msgid "Invalid line in bugs property: '%(line)s'"
5864
msgstr ""
5865
5866
#: bzrlib/errors.py:2640
5867
msgid "Invalid bug status: '%(status)s'"
5868
msgstr ""
5869
5870
#: bzrlib/errors.py:2648
5871
msgid "Could not understand response from smart server: %(response_tuple)r"
5872
msgstr ""
5873
5874
#: bzrlib/errors.py:2687
5875
msgid "Server sent an unexpected error: %(error_tuple)r"
5876
msgstr ""
5877
5878
#: bzrlib/errors.py:2706
5879
msgid "Unrecognised container format: %(container_format)r"
5880
msgstr ""
5881
5882
#: bzrlib/errors.py:2714
5883
msgid "Unexpected end of container stream"
5884
msgstr ""
5885
5886
#: bzrlib/errors.py:2719
5887
msgid "Unknown record type: %(record_type)r"
5888
msgstr ""
5889
5890
#: bzrlib/errors.py:2727
5891
msgid "Invalid record: %(reason)s"
5892
msgstr ""
5893
5894
#: bzrlib/errors.py:2735
5895
msgid "Container has data after end marker: %(excess)r"
5896
msgstr ""
5897
5898
#: bzrlib/errors.py:2743
5899
msgid "Container has multiple records with the same name: %(name)s"
5900
msgstr ""
5901
5902
#: bzrlib/errors.py:2756
5903
msgid "Corrupt or incompatible data stream: %(reason)s"
5904
msgstr ""
5905
5906
#: bzrlib/errors.py:2764
5907
msgid "SMTP error: %(error)s"
5908
msgstr ""
5909
5910
#: bzrlib/errors.py:2772
5911
msgid "No message supplied."
5912
msgstr ""
5913
5914
#: bzrlib/errors.py:2777
5915
msgid "No mail-to address (--mail-to) or output (-o) specified."
5916
msgstr ""
5917
5918
#: bzrlib/errors.py:2782
5919
msgid ""
5920
"Unable to find mail client with the following names: "
5921
"%(mail_command_list_string)s"
5922
msgstr ""
5923
5924
#: bzrlib/errors.py:2792
5925
msgid "SMTP connection to %(host)s refused"
5926
msgstr ""
5927
5928
#: bzrlib/errors.py:2801
5929
msgid "Please specify smtp_server. No server at default %(host)s."
5930
msgstr ""
5931
5932
#: bzrlib/errors.py:2815
5933
msgid ""
5934
"'%(display_url)s' is not in sync with %(target_url)s. See bzr help sync-for-"
5935
"reconfigure."
5936
msgstr ""
5937
5938
#: bzrlib/errors.py:2827
5939
msgid "'%(display_url)s' is already a branch."
5940
msgstr ""
5941
5942
#: bzrlib/errors.py:2832
5943
msgid "'%(display_url)s' is already a tree."
5944
msgstr ""
5945
5946
#: bzrlib/errors.py:2837
5947
msgid "'%(display_url)s' is already a checkout."
5948
msgstr ""
5949
5950
#: bzrlib/errors.py:2842
5951
msgid "'%(display_url)s' is already a lightweight checkout."
5952
msgstr ""
5953
5954
#: bzrlib/errors.py:2847
5955
msgid "'%(display_url)s' is already using a shared repository."
5956
msgstr ""
5957
5958
#: bzrlib/errors.py:2852
5959
msgid "'%(display_url)s' is already standalone."
5960
msgstr ""
5961
5962
#: bzrlib/errors.py:2857
5963
msgid "Shared repository '%(display_url)s' already creates working trees."
5964
msgstr ""
5965
5966
#: bzrlib/errors.py:2863
5967
msgid ""
5968
"Shared repository '%(display_url)s' already doesn't create working trees."
5969
msgstr ""
5970
5971
#: bzrlib/errors.py:2869
5972
msgid "Requested reconfiguration of '%(display_url)s' is not supported."
5973
msgstr ""
5974
5975
#: bzrlib/errors.py:2874
5976
msgid "No location could be found to bind to at %(display_url)s."
5977
msgstr ""
5978
5979
#: bzrlib/errors.py:2879
5980
msgid ""
5981
"Working tree \"%(display_url)s\" has uncommitted changes (See bzr "
5982
"status).%(more)s"
5983
msgstr ""
5984
5985
#: bzrlib/errors.py:2898
5986
msgid ""
5987
"Branch \"%(display_url)s\" does not support storing uncommitted changes."
5988
msgstr ""
5989
5990
#: bzrlib/errors.py:2913
5991
msgid ""
5992
"Working tree \"%(display_url)s\" has shelved changes (See bzr shelve --"
5993
"list).%(more)s"
5994
msgstr ""
5995
5996
#: bzrlib/errors.py:2919
5997
msgid "Variable {%(name)s} is not available."
5998
msgstr ""
5999
6000
#: bzrlib/errors.py:2927
6001
msgid "No template specified."
6002
msgstr ""
6003
6004
#: bzrlib/errors.py:2932
6005
msgid "Unable to create symlink %(path_str)son this platform"
6006
msgstr ""
6007
6008
#: bzrlib/errors.py:2947
6009
msgid ""
6010
"Unsupported timezone format \"%(timezone)s\", options are \"utc\", "
6011
"\"original\", \"local\"."
6012
msgstr ""
6013
6014
#: bzrlib/errors.py:2981
6015
msgid ""
6016
"Unable to encode %(kind)s path %(path)r in user encoding %(user_encoding)s"
6017
msgstr ""
6018
6019
#: bzrlib/errors.py:2993
6020
msgid "The \"%(config_id)s\" configuration does not exist."
6021
msgstr ""
6022
6023
#: bzrlib/errors.py:3001
6024
msgid "The \"%(option_name)s\" configuration option does not exist."
6025
msgstr ""
6026
6027
#: bzrlib/errors.py:3009
6028
msgid "The alias \"%(alias_name)s\" does not exist."
6029
msgstr ""
6030
6031
#: bzrlib/errors.py:3023
6032
msgid "\"%(alias_name)s\" is not a valid location alias."
6033
msgstr ""
6034
6035
#: bzrlib/errors.py:3031
6036
msgid "No %(alias_name)s location assigned."
6037
msgstr ""
6038
6039
#: bzrlib/errors.py:3039
6040
msgid "Cannot bind address \"%(host)s:%(port)i\": %(orig_error)s."
6041
msgstr ""
6042
6043
#: bzrlib/errors.py:3049
6044
msgid "Unknown rules detected: %(unknowns_str)s."
6045
msgstr ""
6046
6047
#: bzrlib/errors.py:3060
6048
msgid "Tip change rejected: %(msg)s"
6049
msgstr ""
6050
6051
#: bzrlib/errors.py:3068
6052
msgid "Shelf corrupt."
6053
msgstr ""
6054
6055
#: bzrlib/errors.py:3073
6056
msgid "Corruption while decompressing repository file%(orig_error)s"
6057
msgstr ""
6058
6059
#: bzrlib/errors.py:3085
6060
msgid "No changes are shelved with id \"%(shelf_id)d\"."
6061
msgstr ""
6062
6063
#: bzrlib/errors.py:3093
6064
msgid "\"%(invalid_id)s\" is not a valid shelf id, try a number instead."
6065
msgstr ""
6066
6067
#: bzrlib/errors.py:3101
6068
msgid ""
6069
"An attempt to access a url outside the server jail was made: '%(url)s'."
6070
msgstr ""
6071
6072
#: bzrlib/errors.py:3109
6073
msgid "The user aborted the operation."
6074
msgstr ""
6075
6076
#: bzrlib/errors.py:3114
6077
msgid "Branching '%(url)s'(%(format)s) must create a working tree."
6078
msgstr ""
6079
6080
#: bzrlib/errors.py:3124
6081
msgid "No such view: %(view_name)s."
6082
msgstr ""
6083
6084
#: bzrlib/errors.py:3134
6085
msgid ""
6086
"Views are not supported by %(tree)s; use 'bzr upgrade' to change your tree "
6087
"to a later format."
6088
msgstr ""
6089
6090
#: bzrlib/errors.py:3143
6091
msgid ""
6092
"Specified file \"%(file_name)s\" is outside the current view: %(view_str)s"
6093
msgstr ""
6094
6095
#: bzrlib/errors.py:3210
6096
msgid "%(bzrdir)r does not support co-located branches."
6097
msgstr ""
6098
6099
#: bzrlib/errors.py:3216
6100
msgid ""
6101
"Unable to determine your name.\n"
6102
"Please, set your name with the 'whoami' command.\n"
6103
"E.g. bzr whoami \"Your Name <name@example.com>\""
6104
msgstr ""
6105
6106
#: bzrlib/errors.py:3225
6107
msgid "Invalid pattern(s) found. %(msg)s"
6108
msgstr ""
6109
6110
#: bzrlib/errors.py:3233
6111
msgid ""
6112
"Branch \"%(branch_url)s\" appears to be bound to itself. Please use `bzr "
6113
"unbind` to fix."
6114
msgstr ""
6115
6116
#: bzrlib/errors.py:3244
6117
msgid "Loop involving %(refs)r while expanding \"%(string)s\"."
6118
msgstr ""
6119
6120
#: bzrlib/errors.py:3253
6121
msgid "Option %(name)s is not defined while expanding \"%(string)s\"."
6122
msgstr ""
6123
6124
#: bzrlib/errors.py:3262
6125
msgid ""
6126
"No compatible object available for operations from %(source)r to %(target)r."
6127
msgstr ""
6128
6129
#: bzrlib/errors.py:3272
6130
msgid ""
6131
"VFS requests over the smart server are not allowed. Encountered: %(method)s, "
6132
"%(arguments)s."
6133
msgstr ""
6134
6135
#: bzrlib/errors.py:3282
6136
msgid ""
6137
"Kind change from %(from_kind)s to %(to_kind)s for %(path)s not supported by "
6138
"format %(format)r"
6139
msgstr ""
6140
6141
#: bzrlib/errors.py:3294
6142
msgid ""
6143
"Missing feature %(feature)s not provided by this version of Bazaar or any "
6144
"plugin."
6145
msgstr ""
6146
6147
#: bzrlib/errors.py:3307
6148
msgid "Binary files section encountered."
6149
msgstr ""
6150
6151
#: bzrlib/errors.py:3315
6152
msgid ""
6153
"Malformed patch header. %(desc)s\n"
6154
"%(line)r"
6155
msgstr ""
6156
6157
#: bzrlib/errors.py:3324
6158
msgid ""
6159
"Malformed hunk header. %(desc)s\n"
6160
"%(line)r"
6161
msgstr ""
6162
6163
#: bzrlib/errors.py:3333
6164
msgid ""
6165
"Malformed line. %(desc)s\n"
6166
"%(line)r"
6167
msgstr ""
6168
6169
#: bzrlib/errors.py:3343
6170
msgid ""
6171
"Text contents mismatch at line %(line_no)d. Original has \"%(orig_line)s\", "
6172
"but patch says it should be \"%(patch_line)s\""
6173
msgstr ""
6174
6175
#: bzrlib/errors.py:3354
6176
msgid "The feature %(feature)s has already been registered."
6177
msgstr ""
6178
6179
#: bzrlib/errors.py:3362
6180
msgid ""
6181
"Cannot store uncommitted changes because this branch already stores "
6182
"uncommitted changes."
6183
msgstr ""
6184
6185
#: bzrlib/export_pot.py:252
6186
#, python-format
6187
msgid "Exporting messages from builtin command: %s"
6188
msgstr ""
6189
6190
#: bzrlib/export_pot.py:271
6191
msgid "Exporting messages from plugin command: {0} in {1}"
6192
msgstr ""
6193
6194
#: bzrlib/export_pot.py:292
6195
#, python-format
6196
msgid "Exporting message from error: %s"
6197
msgstr ""
6198
6199
#: bzrlib/fetch.py:98
6200
msgid "Finding revisions"
6201
msgstr ""
6202
6203
#: bzrlib/fetch.py:103
6204
msgid "Fetching revisions"
6205
msgstr ""
6206
6207
#: bzrlib/foreign.py:262
6208
msgid "Push into a different VCS without any custom bzr metadata."
6209
msgstr ""
6210
6211
#: bzrlib/foreign.py:264
6212
msgid ""
6213
"This will afterwards rebase the local branch on the remote\n"
6214
"branch unless the --no-rebase option is used, in which case \n"
6215
"the two branches will be out of sync after the push. "
6216
msgstr ""
6217
6218
#: bzrlib/foreign.py:277
6219
msgid "Do not rebase after push."
6220
msgstr ""
6221
6222
#: bzrlib/foreign.py:311
6223
#, python-format
6224
msgid "Using saved location: %s\n"
6225
msgstr ""
6226
6227
#: bzrlib/foreign.py:321
6228
msgid ""
6229
"{0!r} and {1!r} are in the same VCS, lossy push not necessary. Please use "
6230
"regular push."
6231
msgstr ""
6232
6233
#: bzrlib/gpg.py:366
6234
msgid "No GnuPG key results for pattern: {0}"
6235
msgstr ""
6236
6237
#: bzrlib/gpg.py:439
6238
msgid "{0} commits with valid signatures"
6239
msgstr ""
6240
6241
#: bzrlib/gpg.py:445
6242
msgid "{0} commit with unknown key"
6243
msgid_plural "{0} commits with unknown keys"
6244
msgstr[0] ""
6245
msgstr[1] ""
6246
6247
#: bzrlib/gpg.py:453
6248
msgid "{0} commit not valid"
6249
msgid_plural "{0} commits not valid"
6250
msgstr[0] ""
6251
msgstr[1] ""
6252
6253
#: bzrlib/gpg.py:461
6254
msgid "{0} commit not signed"
6255
msgid_plural "{0} commits not signed"
6256
msgstr[0] ""
6257
msgstr[1] ""
6258
6259
#: bzrlib/gpg.py:469
6260
msgid "{0} commit with key now expired"
6261
msgid_plural "{0} commits with key now expired"
6262
msgstr[0] ""
6263
msgstr[1] ""
6264
6265
#: bzrlib/gpg.py:489
6266
msgid "{0} commit by author {1} with key {2} now expired"
6267
msgid_plural "{0} commits by author {1} with key {2} now expired"
6268
msgstr[0] ""
6269
msgstr[1] ""
6270
6271
#: bzrlib/gpg.py:505
6272
msgid "{0} signed {1} commit"
6273
msgid_plural "{0} signed {1} commits"
6274
msgstr[0] ""
6275
msgstr[1] ""
6276
6277
#: bzrlib/gpg.py:522 bzrlib/gpg.py:539
6278
msgid "{0} commit by author {1}"
6279
msgid_plural "{0} commits by author {1}"
6280
msgstr[0] ""
6281
msgstr[1] ""
6282
6283
#: bzrlib/gpg.py:554
6284
msgid "Unknown key {0} signed {1} commit"
6285
msgid_plural "Unknown key {0} signed {1} commits"
6286
msgstr[0] ""
6287
msgstr[1] ""
6288
6289
#: bzrlib/groupcompress.py:1739
6290
#, python-format
6291
msgid "Insert claimed random_id=True, but then inserted %r two times"
6292
msgstr ""
6293
6294
#: bzrlib/hooks.py:313
6295
#, python-format
6296
msgid "Introduced in: %s"
6297
msgstr ""
6298
6299
#: bzrlib/hooks.py:316
6300
#, python-format
6301
msgid "Deprecated in: %s"
6302
msgstr ""
6303
6304
#: bzrlib/knit.py:1766 bzrlib/knit.py:1802
6305
msgid "Walking content"
6306
msgstr ""
6307
6308
#: bzrlib/knit.py:3330
6309
msgid "annotating"
6310
msgstr ""
6311
6312
#: bzrlib/lock.py:549
6313
msgid "{0!r} was {1} locked again"
6314
msgstr ""
6315
6316
#: bzrlib/lockdir.py:321
6317
#, python-format
6318
msgid "error removing pending lock: %s"
6319
msgstr ""
6320
6321
#: bzrlib/lockdir.py:616
6322
msgid "Unable to obtain"
6323
msgstr ""
6324
6325
#: bzrlib/lockdir.py:618
6326
msgid "Lock owner changed for"
6327
msgstr ""
6328
6329
#: bzrlib/lockdir.py:620
6330
msgid "{0} lock {1} {2}."
6331
msgstr ""
6332
6333
#: bzrlib/lockdir.py:627
6334
#, python-format
6335
msgid "Will continue to try until %s, unless you press Ctrl-C."
6336
msgstr ""
6337
6338
#: bzrlib/lockdir.py:629
6339
msgid "See \"bzr help break-lock\" for more."
6340
msgstr ""
6341
6342
#: bzrlib/lockdir.py:739
6343
#, python-format
6344
msgid ""
6345
"held by %(user)s on %(hostname)s (process #%(pid)s), acquired %(time_ago)s"
6346
msgstr ""
6347
6348
#: bzrlib/log.py:563
6349
msgid "--exclude-common-ancestry requires two different revisions"
6350
msgstr ""
6351
6352
#: bzrlib/log.py:565
6353
#, python-format
6354
msgid "invalid direction %r"
6355
msgstr ""
6356
6357
#: bzrlib/log.py:653
6358
msgid "Start revision not found in history of end revision."
6359
msgstr ""
6360
6361
#: bzrlib/log.py:1071 bzrlib/log.py:1129
6362
msgid "Logging revision 0 is invalid."
6363
msgstr ""
6364
6365
#: bzrlib/log.py:1073 bzrlib/log.py:1131
6366
msgid "Start revision must be older than the end revision."
6367
msgstr ""
6368
6369
#: bzrlib/log.py:1818
6370
#, python-format
6371
msgid "unknown log formatter: %r"
6372
msgstr ""
6373
6374
#: bzrlib/log.py:2114
6375
msgid "fixes bug"
6376
msgid_plural "fixes bugs"
6377
msgstr[0] ""
6378
msgstr[1] ""
6379
6380
#: bzrlib/merge.py:689
6381
msgid "All changes applied successfully."
6382
msgstr ""
6383
6384
#: bzrlib/merge.py:691
6385
#, python-format
6386
msgid "%d conflicts encountered."
6387
msgstr ""
6388
6389
#: bzrlib/merge.py:845 bzrlib/merge.py:1868
6390
msgid "Preparing file merge"
6391
msgstr ""
6392
6393
#: bzrlib/multiparent.py:426
6394
msgid "Importing revisions"
6395
msgstr ""
6396
6397
#: bzrlib/option.py:526
6398
msgid "Show help message."
6399
msgstr ""
6400
6401
#: bzrlib/option.py:528
6402
msgid "Only display errors and warnings."
6403
msgstr ""
6404
6405
#: bzrlib/option.py:531
6406
msgid "Show usage message and options."
6407
msgstr ""
6408
6409
#: bzrlib/option.py:533
6410
msgid "Display more information."
6411
msgstr ""
6412
6413
#: bzrlib/option.py:541
6414
msgid ""
6415
"Select changes introduced by the specified revision. See also \"help "
6416
"revisionspec\"."
6417
msgstr ""
6418
6419
#: bzrlib/option.py:543
6420
msgid "Branch to operate on, instead of working directory."
6421
msgstr ""
6422
6423
#: bzrlib/option.py:545
6424
msgid "Detailed log format."
6425
msgstr ""
6426
6427
#: bzrlib/option.py:545
6428
msgid "Format used by GNU ChangeLog files."
6429
msgstr ""
6430
6431
#: bzrlib/option.py:545
6432
msgid "Log format with one line per revision."
6433
msgstr ""
6434
6435
#: bzrlib/option.py:545
6436
msgid "Moderately short log format."
6437
msgstr ""
6438
6439
#: bzrlib/option.py:545
6440
msgid "Use specified log format."
6441
msgstr ""
6442
6443
#: bzrlib/option.py:547
6444
msgid "Log format"
6445
msgstr ""
6446
6447
#: bzrlib/option.py:549
6448
msgid "LCA-newness merge."
6449
msgstr ""
6450
6451
#: bzrlib/option.py:549
6452
msgid "Merge using external diff3."
6453
msgstr ""
6454
6455
#: bzrlib/option.py:549
6456
msgid "Native diff3-style merge."
6457
msgstr ""
6458
6459
#: bzrlib/option.py:549
6460
msgid "Select a particular merge algorithm."
6461
msgstr ""
6462
6463
#: bzrlib/option.py:549
6464
msgid "Weave-based merge."
6465
msgstr ""
6466
6467
#: bzrlib/option.py:551
6468
msgid "Merge algorithm"
6469
msgstr ""
6470
6471
#: bzrlib/option.py:554
6472
msgid "Message string."
6473
msgstr ""
6474
6475
#: bzrlib/option.py:556
6476
msgid "Use an ASCII NUL (\\0) separator rather than a newline."
6477
msgstr ""
6478
6479
#: bzrlib/option.py:558
6480
msgid "Ignore differences between branches and overwrite unconditionally."
6481
msgstr ""
6482
6483
#: bzrlib/option.py:560
6484
msgid "Remember the specified location as a default."
6485
msgstr ""
6486
6487
#: bzrlib/option.py:562
6488
msgid "Reprocess to reduce spurious conflicts."
6489
msgstr ""
6490
6491
#: bzrlib/option.py:566
6492
msgid "See \"help revisionspec\" for details."
6493
msgstr ""
6494
6495
#: bzrlib/option.py:568
6496
msgid "Show internal object ids."
6497
msgstr ""
6498
6499
#: bzrlib/option.py:571
6500
msgid "Display timezone as local, original, or utc."
6501
msgstr ""
6502
6503
#: bzrlib/osutils.py:100
6504
msgid "Parameter {0!r} encoding is unsupported by {1} application locale."
6505
msgstr ""
6506
6507
#: bzrlib/osutils.py:220
6508
msgid "lstat/stat of ({0!r}): {1!r}"
6509
msgstr ""
6510
6511
#: bzrlib/osutils.py:1030 bzrlib/osutils.py:1041
6512
#, python-format
6513
msgid "sorry, %r not allowed in path"
6514
msgstr ""
6515
6516
#: bzrlib/osutils.py:1259
6517
#, python-format
6518
msgid "%r is too short to calculate a relative path"
6519
msgstr ""
6520
6521
#: bzrlib/plugin.py:143
6522
#, python-format
6523
msgid "\"%s\" is not a valid <plugin_name>@<plugin_path> description "
6524
msgstr ""
6525
6526
#: bzrlib/plugins/bash_completion/bashcomp.py:411
6527
msgid "Enable completions for the selected plugin (default: all plugins)"
6528
msgstr ""
6529
6530
#: bzrlib/plugins/bash_completion/bashcomp.py:412
6531
msgid "Generate a shell function for bash command line completion."
6532
msgstr ""
6533
6534
#: bzrlib/plugins/bash_completion/bashcomp.py:414
6535
msgid ""
6536
"This command generates a shell function which can be used by bash to\n"
6537
"automatically complete the currently typed command when the user presses\n"
6538
"the completion key (usually tab)."
6539
msgstr ""
6540
6541
#: bzrlib/plugins/bash_completion/bashcomp.py:418
6542
msgid ""
6543
"Commonly used like this:\n"
6544
" eval \"`bzr bash-completion`\""
6545
msgstr ""
6546
6547
#: bzrlib/plugins/bash_completion/bashcomp.py:424
6548
msgid "Name of the generated function (default: _bzr)"
6549
msgstr ""
6550
6551
#: bzrlib/plugins/bash_completion/bashcomp.py:426
6552
msgid "Generate only the shell function, don't enable it"
6553
msgstr ""
6554
6555
#: bzrlib/plugins/grep/cmds.py:77
6556
msgid "Print lines matching PATTERN for specified files and revisions."
6557
msgstr ""
6558
6559
#: bzrlib/plugins/grep/cmds.py:79
6560
msgid ""
6561
"This command searches the specified files and revisions for a given\n"
6562
"pattern. The pattern is specified as a Python regular expressions[1]."
6563
msgstr ""
6564
6565
#: bzrlib/plugins/grep/cmds.py:82
6566
msgid ""
6567
"If the file name is not specified, the revisions starting with the\n"
6568
"current directory are searched recursively. If the revision number is\n"
6569
"not specified, the working copy is searched. To search the last committed\n"
6570
"revision, use the '-r -1' or '-r last:1' option."
6571
msgstr ""
6572
6573
#: bzrlib/plugins/grep/cmds.py:87
6574
msgid ""
6575
"Unversioned files are not searched unless explicitly specified on the\n"
6576
"command line. Unversioned directores are not searched."
6577
msgstr ""
6578
6579
#: bzrlib/plugins/grep/cmds.py:90
6580
msgid ""
6581
"When searching a pattern, the output is shown in the 'filepath:string'\n"
6582
"format. If a revision is explicitly searched, the output is shown as\n"
6583
"'filepath~N:string', where N is the revision number."
6584
msgstr ""
6585
6586
#: bzrlib/plugins/grep/cmds.py:94
6587
msgid ""
6588
"--include and --exclude options can be used to search only (or exclude\n"
6589
"from search) files with base name matches the specified Unix style GLOB\n"
6590
"pattern. The GLOB pattern an use *, ?, and [...] as wildcards, and \\\n"
6591
"to quote wildcard or backslash character literally. Note that the glob\n"
6592
"pattern is not a regular expression."
6593
msgstr ""
6594
6595
#: bzrlib/plugins/grep/cmds.py:100
6596
msgid "[1] http://docs.python.org/library/re.html#regular-expression-syntax"
6597
msgstr ""
6598
6599
#: bzrlib/plugins/grep/cmds.py:109
6600
msgid "Show match in color. WHEN is never, always or auto."
6601
msgstr ""
6602
6603
#: bzrlib/plugins/grep/cmds.py:111
6604
msgid "Grep for pattern in changeset for each revision."
6605
msgstr ""
6606
6607
#: bzrlib/plugins/grep/cmds.py:113
6608
msgid "Skip files whose base name matches GLOB."
6609
msgstr ""
6610
6611
#: bzrlib/plugins/grep/cmds.py:115
6612
msgid "Search only files whose base name matches GLOB."
6613
msgstr ""
6614
6615
#: bzrlib/plugins/grep/cmds.py:117
6616
msgid "Print only the name of each input file in which PATTERN is found."
6617
msgstr ""
6618
6619
#: bzrlib/plugins/grep/cmds.py:120
6620
msgid "Print only the name of each input file in which PATTERN is not found."
6621
msgstr ""
6622
6623
#: bzrlib/plugins/grep/cmds.py:123
6624
msgid "Interpret PATTERN is a single fixed string (not regex)."
6625
msgstr ""
6626
6627
#: bzrlib/plugins/grep/cmds.py:125
6628
msgid ""
6629
"Search for pattern starting from the root of the branch. (implies --"
6630
"recursive)"
6631
msgstr ""
6632
6633
#: bzrlib/plugins/grep/cmds.py:128
6634
msgid "ignore case distinctions while matching."
6635
msgstr ""
6636
6637
#: bzrlib/plugins/grep/cmds.py:130
6638
msgid ""
6639
"Number of levels to display - 0 for all, 1 for collapsed (1 is default)."
6640
msgstr ""
6641
6642
#: bzrlib/plugins/grep/cmds.py:135
6643
msgid "show 1-based line number."
6644
msgstr ""
6645
6646
#: bzrlib/plugins/grep/cmds.py:137
6647
msgid "Don't recurse into subdirectories. (default is --recursive)"
6648
msgstr ""
6649
6650
#: bzrlib/plugins/grep/cmds.py:139
6651
msgid ""
6652
"Write an ASCII NUL (\\0) separator between output lines rather than a "
6653
"newline."
6654
msgstr ""
6655
6656
#: bzrlib/plugins/launchpad/account.py:66
6657
msgid "Setting ssh/sftp usernames for launchpad.net."
6658
msgstr ""
6659
6660
#: bzrlib/plugins/launchpad/cmds.py:43
6661
msgid "Register a branch with launchpad.net."
6662
msgstr ""
6663
6664
#: bzrlib/plugins/launchpad/cmds.py:45
6665
msgid ""
6666
"This command lists a bzr branch in the directory of branches on\n"
6667
"launchpad.net. Registration allows the branch to be associated with\n"
6668
"bugs or specifications."
6669
msgstr ""
6670
6671
#: bzrlib/plugins/launchpad/cmds.py:49
6672
msgid ""
6673
"Before using this command you must register the project to which the\n"
6674
"branch belongs, and create an account for yourself on launchpad.net."
6675
msgstr ""
6676
6677
#: bzrlib/plugins/launchpad/cmds.py:52
6678
msgid ""
6679
"arguments:\n"
6680
" public_url: The publicly visible url for the branch to register.\n"
6681
" This must be an http or https url (which Launchpad can read\n"
6682
" from to access the branch). Local file urls, SFTP urls, and\n"
6683
" bzr+ssh urls will not work.\n"
6684
" If no public_url is provided, bzr will use the configured\n"
6685
" public_url if there is one for the current branch, and\n"
6686
" otherwise error."
6687
msgstr ""
6688
6689
#: bzrlib/plugins/launchpad/cmds.py:61
6690
msgid ""
6691
"example:\n"
6692
" bzr register-branch http://foo.com/bzr/fooproject.mine \\\n"
6693
" --project fooproject"
6694
msgstr ""
6695
6696
#: bzrlib/plugins/launchpad/cmds.py:68
6697
msgid "Launchpad project short name to associate with the branch."
6698
msgstr ""
6699
6700
#: bzrlib/plugins/launchpad/cmds.py:75
6701
msgid ""
6702
"Short name for the branch; by default taken from the last component of the "
6703
"url."
6704
msgstr ""
6705
6706
#: bzrlib/plugins/launchpad/cmds.py:79
6707
msgid "One-sentence description of the branch."
6708
msgstr ""
6709
6710
#: bzrlib/plugins/launchpad/cmds.py:82
6711
msgid "Longer description of the purpose or contents of the branch."
6712
msgstr ""
6713
6714
#: bzrlib/plugins/launchpad/cmds.py:85
6715
msgid "Branch author's email address, if not yourself."
6716
msgstr ""
6717
6718
#: bzrlib/plugins/launchpad/cmds.py:88
6719
msgid "The bug this branch fixes."
6720
msgstr ""
6721
6722
#: bzrlib/plugins/launchpad/cmds.py:91
6723
msgid "Prepare the request but don't actually send it."
6724
msgstr ""
6725
6726
#: bzrlib/plugins/launchpad/cmds.py:113
6727
msgid ""
6728
"register-branch requires a public branch url - see bzr help register-branch."
6729
msgstr ""
6730
6731
#: bzrlib/plugins/launchpad/cmds.py:121
6732
msgid "--product is deprecated; please use --project."
6733
msgstr ""
6734
6735
#: bzrlib/plugins/launchpad/cmds.py:151
6736
msgid "Open a Launchpad branch page in your web browser."
6737
msgstr ""
6738
6739
#: bzrlib/plugins/launchpad/cmds.py:156
6740
msgid "Do not actually open the browser. Just say the URL we would use."
6741
msgstr ""
6742
6743
#: bzrlib/plugins/launchpad/cmds.py:191
6744
#, python-format
6745
msgid "Opening %s in web browser"
6746
msgstr ""
6747
6748
#: bzrlib/plugins/launchpad/cmds.py:199
6749
msgid "Show or set the Launchpad user ID."
6750
msgstr ""
6751
6752
#: bzrlib/plugins/launchpad/cmds.py:201
6753
msgid ""
6754
"When communicating with Launchpad, some commands need to know your\n"
6755
"Launchpad user ID. This command can be used to set or show the\n"
6756
"user ID that Bazaar will use for such communication."
6757
msgstr ""
6758
6759
#: bzrlib/plugins/launchpad/cmds.py:205
6760
msgid ""
6761
":Examples:\n"
6762
" Show the Launchpad ID of the current user::"
6763
msgstr ""
6764
6765
#: bzrlib/plugins/launchpad/cmds.py:208
6766
msgid " bzr launchpad-login"
6767
msgstr ""
6768
6769
#: bzrlib/plugins/launchpad/cmds.py:210
6770
msgid " Set the Launchpad ID of the current user to 'bob'::"
6771
msgstr ""
6772
6773
#: bzrlib/plugins/launchpad/cmds.py:212
6774
msgid " bzr launchpad-login bob"
6775
msgstr ""
6776
6777
#: bzrlib/plugins/launchpad/cmds.py:219
6778
msgid "Don't check that the user name is valid."
6779
msgstr ""
6780
6781
#: bzrlib/plugins/launchpad/cmds.py:234 bzrlib/plugins/launchpad/cmds.py:245
6782
msgid "Launchpad user ID exists and has SSH keys.\n"
6783
msgstr ""
6784
6785
#: bzrlib/plugins/launchpad/cmds.py:237
6786
msgid "No Launchpad user ID configured.\n"
6787
msgstr ""
6788
6789
#: bzrlib/plugins/launchpad/cmds.py:248
6790
#, python-format
6791
msgid "Launchpad user ID set to '%s'.\n"
6792
msgstr ""
6793
6794
#: bzrlib/plugins/launchpad/cmds.py:254
6795
msgid "Ask Launchpad to mirror a branch now."
6796
msgstr ""
6797
6798
#: bzrlib/plugins/launchpad/cmds.py:271
6799
msgid "Propose merging a branch on Launchpad."
6800
msgstr ""
6801
6802
#: bzrlib/plugins/launchpad/cmds.py:273
6803
msgid ""
6804
"This will open your usual editor to provide the initial comment. When it\n"
6805
"has created the proposal, it will open it in your default web browser."
6806
msgstr ""
6807
6808
#: bzrlib/plugins/launchpad/cmds.py:276
6809
msgid ""
6810
"The branch will be proposed to merge into SUBMIT_BRANCH. If SUBMIT_BRANCH\n"
6811
"is not supplied, the remembered submit branch will be used. If no submit\n"
6812
"branch is remembered, the development focus will be used."
6813
msgstr ""
6814
6815
#: bzrlib/plugins/launchpad/cmds.py:280
6816
msgid ""
6817
"By default, the SUBMIT_BRANCH's review team will be requested to review\n"
6818
"the merge proposal. This can be overriden by specifying --review (-R).\n"
6819
"The parameter the launchpad account name of the desired reviewer. This\n"
6820
"may optionally be followed by '=' and the review type. For example:"
6821
msgstr ""
6822
6823
#: bzrlib/plugins/launchpad/cmds.py:285
6824
msgid " bzr lp-propose-merge --review jrandom --review review-team=qa"
6825
msgstr ""
6826
6827
#: bzrlib/plugins/launchpad/cmds.py:287
6828
msgid ""
6829
"This will propose a merge, request \"jrandom\" to perform a review of\n"
6830
"unspecified type, and request \"review-team\" to perform a \"qa\" review."
6831
msgstr ""
6832
6833
#: bzrlib/plugins/launchpad/cmds.py:292
6834
msgid "Propose the merge on staging."
6835
msgstr ""
6836
6837
#: bzrlib/plugins/launchpad/cmds.py:294
6838
msgid "Commit message."
6839
msgstr ""
6840
6841
#: bzrlib/plugins/launchpad/cmds.py:296
6842
msgid ""
6843
"Mark the proposal as approved immediately, setting the approved revision to "
6844
"tip."
6845
msgstr ""
6846
6847
#: bzrlib/plugins/launchpad/cmds.py:298
6848
msgid "The bug this proposal fixes."
6849
msgstr ""
6850
6851
#: bzrlib/plugins/launchpad/cmds.py:300
6852
msgid "Requested reviewer and optional type."
6853
msgstr ""
6854
6855
#: bzrlib/plugins/launchpad/cmds.py:335
6856
msgid "Find the proposal to merge this revision."
6857
msgstr ""
6858
6859
#: bzrlib/plugins/launchpad/cmds.py:337
6860
msgid ""
6861
"Finds the merge proposal(s) that discussed landing the specified revision.\n"
6862
"This works only if the if the merged_revno was recorded for the merge\n"
6863
"proposal. The proposal(s) are opened in a web browser."
6864
msgstr ""
6865
6866
#: bzrlib/plugins/launchpad/cmds.py:341
6867
msgid ""
6868
"Only the revision specified is searched for. To find the mainline\n"
6869
"revision that merged it into mainline, use the \"mainline\" revision spec."
6870
msgstr ""
6871
6872
#: bzrlib/plugins/launchpad/cmds.py:344
6873
msgid "So, to find the merge proposal that reviewed line 1 of README::"
6874
msgstr ""
6875
6876
#: bzrlib/plugins/launchpad/cmds.py:346
6877
msgid " bzr lp-find-proposal -r mainline:annotate:README:1"
6878
msgstr ""
6879
6880
#: bzrlib/plugins/launchpad/cmds.py:365
6881
msgid "No review found."
6882
msgstr ""
6883
6884
#: bzrlib/plugins/launchpad/cmds.py:366
6885
#, python-format
6886
msgid "%d proposals(s) found."
6887
msgstr ""
6888
6889
#: bzrlib/plugins/launchpad/cmds.py:378
6890
msgid "Finding proposals"
6891
msgstr ""
6892
6893
#: bzrlib/plugins/launchpad/lp_api.py:228
6894
#: bzrlib/plugins/launchpad/lp_api.py:233
6895
#, python-format
6896
msgid "%s is not registered on Launchpad"
6897
msgstr ""
6898
6899
#: bzrlib/plugins/launchpad/lp_api.py:243
6900
#, python-format
6901
msgid "%s has no development focus."
6902
msgstr ""
6903
6904
#: bzrlib/plugins/launchpad/lp_api.py:248
6905
#, python-format
6906
msgid "development focus %s has no branch."
6907
msgstr ""
6908
6909
#: bzrlib/plugins/launchpad/lp_api.py:253
6910
#, python-format
6911
msgid "source package %s has no branch."
6912
msgstr ""
6913
6914
#: bzrlib/plugins/launchpad/lp_api.py:257
6915
#, python-format
6916
msgid "%s has no associated product or source package."
6917
msgstr ""
6918
6919
#: bzrlib/plugins/launchpad/lp_api.py:269
6920
#, python-format
6921
msgid "%s is already up-to-date."
6922
msgstr ""
6923
6924
#: bzrlib/plugins/launchpad/lp_api.py:276
6925
#, python-format
6926
msgid "Pushing to %s"
6927
msgstr ""
6928
6929
#: bzrlib/plugins/launchpad/lp_directory.py:170
6930
msgid ""
6931
"resolution for {0}\n"
6932
" local: {1}\n"
6933
" remote: {2}"
6934
msgstr ""
6935
6936
#: bzrlib/plugins/launchpad/lp_propose.py:159
6937
#, python-format
6938
msgid "There is already a branch merge proposal: %s"
6939
msgstr ""
6940
6941
#: bzrlib/plugins/weave_fmt/bzrdir.py:237
6942
msgid "pb parameter to convert() is deprecated"
6943
msgstr ""
6944
6945
#: bzrlib/plugins/weave_fmt/bzrdir.py:240
6946
msgid "starting upgrade from format 4 to 5"
6947
msgstr ""
6948
6949
#: bzrlib/plugins/weave_fmt/bzrdir.py:250
6950
msgid "note: upgrade may be faster if all store files are ungzipped first"
6951
msgstr ""
6952
6953
#: bzrlib/plugins/weave_fmt/bzrdir.py:279
6954
msgid "converting revision"
6955
msgstr ""
6956
6957
#: bzrlib/plugins/weave_fmt/bzrdir.py:284
6958
msgid "upgraded to weaves:"
6959
msgstr ""
6960
6961
#: bzrlib/plugins/weave_fmt/bzrdir.py:285
6962
#, python-format
6963
msgid "%6d revisions and inventories"
6964
msgstr ""
6965
6966
#: bzrlib/plugins/weave_fmt/bzrdir.py:287
6967
#, python-format
6968
msgid "%6d revisions not present"
6969
msgstr ""
6970
6971
#: bzrlib/plugins/weave_fmt/bzrdir.py:289
6972
#, python-format
6973
msgid "%6d texts"
6974
msgstr ""
6975
6976
#: bzrlib/plugins/weave_fmt/bzrdir.py:325
6977
msgid "writing weave"
6978
msgstr ""
6979
6980
#: bzrlib/plugins/weave_fmt/bzrdir.py:329
6981
#: bzrlib/plugins/weave_fmt/bzrdir.py:331
6982
msgid "inventory"
6983
msgstr ""
6984
6985
#: bzrlib/plugins/weave_fmt/bzrdir.py:348
6986
msgid "write revision"
6987
msgstr ""
6988
6989
#: bzrlib/plugins/weave_fmt/bzrdir.py:362
6990
msgid "loading revision"
6991
msgstr ""
6992
6993
#: bzrlib/plugins/weave_fmt/bzrdir.py:367
6994
#, python-format
6995
msgid "revision {%s} not present in branch; will be converted as a ghost"
6996
msgstr ""
6997
6998
#: bzrlib/plugins/weave_fmt/bzrdir.py:507
6999
msgid "starting upgrade from format 5 to 6"
7000
msgstr ""
7001
7002
#: bzrlib/plugins/weave_fmt/bzrdir.py:517
7003
#, python-format
7004
msgid "adding prefixes to %s"
7005
msgstr ""
7006
7007
#: bzrlib/plugins/weave_fmt/bzrdir.py:557
7008
msgid "starting upgrade from format 6 to metadir"
7009
msgstr ""
7010
7011
#: bzrlib/plugins/weave_fmt/bzrdir.py:565
7012
msgid "Removing ancestry.weave"
7013
msgstr ""
7014
7015
#: bzrlib/plugins/weave_fmt/bzrdir.py:570
7016
msgid "Finding branch files"
7017
msgstr ""
7018
7019
#: bzrlib/plugins/weave_fmt/bzrdir.py:580
7020
msgid "Upgrading repository"
7021
msgstr ""
7022
7023
#: bzrlib/plugins/weave_fmt/bzrdir.py:590
7024
msgid "Upgrading branch"
7025
msgstr ""
7026
7027
#: bzrlib/plugins/weave_fmt/bzrdir.py:613
7028
msgid "No working tree."
7029
msgstr ""
7030
7031
#: bzrlib/plugins/weave_fmt/bzrdir.py:620
7032
msgid "Upgrading working tree"
7033
msgstr ""
7034
7035
#: bzrlib/plugins/weave_fmt/bzrdir.py:641
7036
#, python-format
7037
msgid "Make %s lock"
7038
msgstr ""
7039
7040
#: bzrlib/plugins/weave_fmt/bzrdir.py:652
7041
#, python-format
7042
msgid "Moving %s"
7043
msgstr ""
7044
7045
#: bzrlib/push.py:56
7046
msgid "Created new branch."
7047
msgstr ""
7048
7049
#: bzrlib/push.py:97
7050
#, python-format
7051
msgid ""
7052
"Target directory %s already contains a .bzr directory, but it is not valid."
7053
msgstr ""
7054
7055
#: bzrlib/push.py:101
7056
#, python-format
7057
msgid ""
7058
"Target directory %s already exists, but does not have a .bzr directory. "
7059
"Supply --use-existing-dir to push there anyway."
7060
msgstr ""
7061
7062
#: bzrlib/push.py:122
7063
#, python-format
7064
msgid "Too many redirections trying to make %s."
7065
msgstr ""
7066
7067
#: bzrlib/push.py:148
7068
msgid ""
7069
"These branches have diverged. See \"bzr help diverged-branches\" for more "
7070
"information."
7071
msgstr ""
7072
7073
#: bzrlib/push.py:152
7074
#, python-format
7075
msgid ""
7076
"It is not possible to losslessly push to %s. You may want to use dpush "
7077
"instead."
7078
msgstr ""
7079
7080
#: bzrlib/push.py:158
7081
#, python-format
7082
msgid ""
7083
"At %s you have a valid .bzr control directory, but not a branch or "
7084
"repository. This is an unsupported configuration. Please move the target "
7085
"directory out of the way and try again."
7086
msgstr ""
7087
7088
#: bzrlib/reconcile.py:97
7089
#, python-format
7090
msgid "Reconciling branch %s"
7091
msgstr ""
7092
7093
#: bzrlib/reconcile.py:103
7094
#, python-format
7095
msgid "Reconciling repository %s"
7096
msgstr ""
7097
7098
#: bzrlib/reconcile.py:105
7099
msgid "Reconciling repository"
7100
msgstr ""
7101
7102
#: bzrlib/reconcile.py:111
7103
#, python-format
7104
msgid "%s cannot canonicalize CHKs."
7105
msgstr ""
7106
7107
#: bzrlib/reconcile.py:119
7108
msgid "Reconcile aborted: revision index has inconsistent parents."
7109
msgstr ""
7110
7111
#: bzrlib/reconcile.py:121
7112
msgid "Run \"bzr check\" for more details."
7113
msgstr ""
7114
7115
#: bzrlib/reconcile.py:123
7116
msgid "Reconciliation complete."
7117
msgstr ""
7118
7119
#: bzrlib/reconcile.py:166
7120
msgid "Fixing last revision info {0} => {1}"
7121
msgstr ""
7122
7123
#: bzrlib/reconcile.py:173
7124
msgid "revision_history ok."
7125
msgstr ""
7126
7127
#: bzrlib/reconcile.py:234
7128
msgid "Reading inventory data"
7129
msgstr ""
7130
7131
#: bzrlib/reconcile.py:254 bzrlib/reconcile.py:384
7132
msgid "Inventory ok."
7133
msgstr ""
7134
7135
#: bzrlib/reconcile.py:256 bzrlib/reconcile.py:386
7136
msgid "Backing up inventory"
7137
msgstr ""
7138
7139
#: bzrlib/reconcile.py:258
7140
msgid "Backup inventory created."
7141
msgstr ""
7142
7143
#: bzrlib/reconcile.py:274 bzrlib/reconcile.py:405
7144
msgid "Writing weave"
7145
msgstr ""
7146
7147
#: bzrlib/reconcile.py:277 bzrlib/reconcile.py:408
7148
msgid "Inventory regenerated."
7149
msgstr ""
7150
7151
#: bzrlib/reconcile.py:371 bzrlib/reconcile.py:373 bzrlib/reconcile.py:376
7152
msgid "Reading indexes"
7153
msgstr ""
7154
7155
#: bzrlib/reconcile.py:380 bzrlib/reconcile.py:382
7156
msgid "Checking unused inventories"
7157
msgstr ""
7158
7159
#: bzrlib/reconcile.py:388
7160
msgid "Backup Inventory created"
7161
msgstr ""
7162
7163
#: bzrlib/reconcile.py:446
7164
msgid "Fixing text parents"
7165
msgstr ""
7166
7167
#: bzrlib/reconfigure.py:54
7168
msgid "{0} is now stacked on {1}\n"
7169
msgstr ""
7170
7171
#: bzrlib/reconfigure.py:69
7172
#, python-format
7173
msgid "%s is now not stacked\n"
7174
msgstr ""
7175
7176
#: bzrlib/remote.py:1228 bzrlib/repository.py:289
7177
#, python-format
7178
msgid "bzr: ERROR (ignored): %s"
7179
msgstr ""
7180
7181
#: bzrlib/remote.py:2534
7182
msgid "Copying repository content as tarball..."
7183
msgstr ""
7184
7185
#: bzrlib/rename_map.py:69
7186
msgid "Calculating hashes"
7187
msgstr ""
7188
7189
#: bzrlib/rename_map.py:107
7190
msgid "Determining hash hits"
7191
msgstr ""
7192
7193
#: bzrlib/rename_map.py:242
7194
msgid "{0} => {1}"
7195
msgstr ""
7196
7197
#: bzrlib/repository.py:1738
7198
msgid "Moving repository to repository.backup"
7199
msgstr ""
7200
7201
#: bzrlib/repository.py:1745
7202
msgid "Creating new repository"
7203
msgstr ""
7204
7205
#: bzrlib/repository.py:1750
7206
msgid "Copying content"
7207
msgstr ""
7208
7209
#: bzrlib/repository.py:1754
7210
msgid "Deleting old repository content"
7211
msgstr ""
7212
7213
#: bzrlib/repository.py:1756
7214
msgid "repository converted"
7215
msgstr ""
7216
7217
#: bzrlib/revisionspec.py:903
7218
msgid "Using {0} {1}"
7219
msgstr ""
7220
7221
#: bzrlib/send.py:59
7222
#, python-format
7223
msgid "Mail client \"%s\" does not support specifying body"
7224
msgstr ""
7225
7226
#: bzrlib/send.py:63
7227
msgid "--remember requires a branch to be specified."
7228
msgstr ""
7229
7230
#: bzrlib/send.py:78
7231
msgid "No submit branch known or specified"
7232
msgstr ""
7233
7234
#: bzrlib/send.py:81
7235
msgid "Using saved {0} location \"{1}\" to determine what changes to submit."
7236
msgstr ""
7237
7238
#: bzrlib/send.py:99
7239
#, python-format
7240
msgid "No such send format '%s'."
7241
msgstr ""
7242
7243
#: bzrlib/send.py:115
7244
msgid "bzr send takes at most two one revision identifiers"
7245
msgstr ""
7246
7247
#: bzrlib/send.py:128
7248
msgid "No revisions to submit."
7249
msgstr ""
7250
7251
#: bzrlib/send.py:140
7252
msgid ""
7253
"- not supported for merge directives that use more than one output file."
7254
msgstr ""
7255
7256
#: bzrlib/send.py:186
7257
msgid "Format 0.9 does not permit bundle with no patch"
7258
msgstr ""
7259
7260
#: bzrlib/shelf_ui.py:46
7261
#, python-format
7262
msgid "Shelve adding file \"%(path)s\"?"
7263
msgstr ""
7264
7265
#: bzrlib/shelf_ui.py:47
7266
msgid "Shelve binary changes?"
7267
msgstr ""
7268
7269
#: bzrlib/shelf_ui.py:48
7270
msgid "Shelve changing \"%s\" from %(other)s to %(this)s?"
7271
msgstr ""
7272
7273
#: bzrlib/shelf_ui.py:50
7274
#, python-format
7275
msgid "Shelve removing file \"%(path)s\"?"
7276
msgstr ""
7277
7278
#: bzrlib/shelf_ui.py:51
7279
#, python-format
7280
msgid "Shelve %d change(s)?"
7281
msgstr ""
7282
7283
#: bzrlib/shelf_ui.py:52
7284
msgid "Shelve?"
7285
msgstr ""
7286
7287
#: bzrlib/shelf_ui.py:53
7288
#, python-format
7289
msgid ""
7290
"Shelve changing target of \"%(path)s\" from \"%(other)s\" to \"%(this)s\"?"
7291
msgstr ""
7292
7293
#: bzrlib/shelf_ui.py:55
7294
#, python-format
7295
msgid "Shelve renaming \"%(other)s\" => \"%(this)s\"?"
7296
msgstr ""
7297
7298
#: bzrlib/shelf_ui.py:70
7299
#, python-format
7300
msgid "Changes shelved with id \"%d\"."
7301
msgstr ""
7302
7303
#: bzrlib/shelf_ui.py:74
7304
msgid "Selected changes destroyed."
7305
msgstr ""
7306
7307
#: bzrlib/shelf_ui.py:78
7308
msgid "Selected changes:"
7309
msgstr ""
7310
7311
#: bzrlib/shelf_ui.py:98
7312
#, python-format
7313
msgid "Delete file \"%(path)s\"?"
7314
msgstr ""
7315
7316
#: bzrlib/shelf_ui.py:99
7317
msgid "Apply binary changes?"
7318
msgstr ""
7319
7320
#: bzrlib/shelf_ui.py:100
7321
#, python-format
7322
msgid "Change \"%(path)s\" from %(this)s to %(other)s?"
7323
msgstr ""
7324
7325
#: bzrlib/shelf_ui.py:102
7326
#, python-format
7327
msgid "Add file \"%(path)s\"?"
7328
msgstr ""
7329
7330
#: bzrlib/shelf_ui.py:103
7331
#, python-format
7332
msgid "Apply %d change(s)?"
7333
msgstr ""
7334
7335
#: bzrlib/shelf_ui.py:104
7336
msgid "Apply change?"
7337
msgstr ""
7338
7339
#: bzrlib/shelf_ui.py:105
7340
#, python-format
7341
msgid "Change target of \"%(path)s\" from \"%(this)s\" to \"%(other)s\"?"
7342
msgstr ""
7343
7344
#: bzrlib/shelf_ui.py:107
7345
#, python-format
7346
msgid "Rename \"%(this)s\" => \"%(other)s\"?"
7347
msgstr ""
7348
7349
#: bzrlib/shelf_ui.py:402
7350
msgid "No changes are shelved."
7351
msgstr ""
7352
7353
#: bzrlib/shelf_ui.py:460
7354
#, python-format
7355
msgid "Using changes with id \"%d\"."
7356
msgstr ""
7357
7358
#: bzrlib/shelf_ui.py:464
7359
#, python-format
7360
msgid "Message: %s"
7361
msgstr ""
7362
7363
#: bzrlib/shelf_ui.py:476
7364
#, python-format
7365
msgid "Deleted changes with id \"%d\"."
7366
msgstr ""
7367
7368
#: bzrlib/smart/medium.py:714
7369
msgid "HPSS calls: {0} ({1} vfs) {2}"
7370
msgstr ""
7371
7372
#: bzrlib/smart/ping.py:32
7373
msgid "Pings a Bazaar smart server."
7374
msgstr ""
7375
7376
#: bzrlib/smart/ping.py:34
7377
msgid ""
7378
"This command sends a 'hello' request to the given location using the bzr\n"
7379
"smart protocol, and reports the response."
7380
msgstr ""
7381
7382
#: bzrlib/smart/server.py:169
7383
msgid "Requested to stop gracefully"
7384
msgstr ""
7385
7386
#: bzrlib/smart/server.py:179
7387
#, python-format
7388
msgid "Waiting for %d client(s) to finish"
7389
msgstr ""
7390
7391
#: bzrlib/smart/server.py:185
7392
#, python-format
7393
msgid "Still waiting for %d client(s) to finish"
7394
msgstr ""
7395
7396
#: bzrlib/smart/server.py:219
7397
#, python-format
7398
msgid "listening socket error: %s"
7399
msgstr ""
7400
7401
#: bzrlib/smart/server.py:452
7402
#, python-format
7403
msgid "listening on port: %s"
7404
msgstr ""
7405
7406
#: bzrlib/switch.py:84
7407
msgid "Pending merges must be committed or reverted before using switch."
7408
msgstr ""
7409
7410
#: bzrlib/switch.py:111
7411
msgid ""
7412
"Cannot switch as local commits found in the checkout. Commit these to the "
7413
"bound branch or use --force to throw them away."
7414
msgstr ""
7415
7416
#: bzrlib/switch.py:116
7417
#, python-format
7418
msgid ""
7419
"Unable to connect to current master branch %(target)s: %(error)s To switch "
7420
"anyway, use --force."
7421
msgstr ""
7422
7423
#: bzrlib/switch.py:140
7424
msgid "Cannot switch a branch, only a checkout."
7425
msgstr ""
7426
7427
#: bzrlib/switch.py:183
7428
#, python-format
7429
msgid "Tree is up to date at revision %d."
7430
msgstr ""
7431
7432
#: bzrlib/switch.py:190
7433
#, python-format
7434
msgid "Updated to revision %d."
7435
msgstr ""
7436
7437
#: bzrlib/transform.py:1723 bzrlib/transform.py:1734 bzrlib/transform.py:1736
7438
msgid "Apply phase"
7439
msgstr ""
7440
7441
#: bzrlib/transform.py:1762 bzrlib/transform.py:1830
7442
msgid "removing file"
7443
msgstr ""
7444
7445
#: bzrlib/transform.py:1780 bzrlib/transform.py:1865
7446
msgid "adding file"
7447
msgstr ""
7448
7449
#: bzrlib/transform.py:2598
7450
msgid "Building tree"
7451
msgstr ""
7452
7453
#: bzrlib/transform.py:2688 bzrlib/transform.py:2715
7454
msgid "Adding file contents"
7455
msgstr ""
7456
7457
#: bzrlib/transform.py:3017
7458
msgid "Resolution pass"
7459
msgstr ""
7460
7461
#: bzrlib/transport/ftp/_gssapi.py:88
7462
#, python-format
7463
msgid "Authenticated as %s"
7464
msgstr ""
7465
7466
#: bzrlib/tree.py:647
7467
msgid "*** {0} content-filter: {1} => {2!r}"
7468
msgstr ""
7469
7470
#: bzrlib/upgrade.py:77
7471
#, python-format
7472
msgid "This is a checkout. The branch (%s) needs to be upgraded separately."
7473
msgstr ""
7474
7475
#: bzrlib/upgrade.py:100
7476
#, python-format
7477
msgid "cannot upgrade from bzrdir format %s"
7478
msgstr ""
7479
7480
#: bzrlib/upgrade.py:103
7481
#, python-format
7482
msgid "starting upgrade of %s"
7483
msgstr ""
7484
7485
#: bzrlib/upgrade.py:110
7486
msgid "finished"
7487
msgstr ""
7488
7489
#: bzrlib/upgrade.py:120
7490
msgid "Deleting backup.bzr"
7491
msgstr ""
7492
7493
#: bzrlib/upgrade.py:151
7494
msgid ""
7495
"\n"
7496
"SUMMARY: {0} upgrades attempted, {1} succeeded, {2} failed"
7497
msgstr ""
7498
7499
#: bzrlib/upgrade.py:208
7500
#, python-format
7501
msgid "Found %d dependent branches - upgrading ..."
7502
msgstr ""
7503
7504
#: bzrlib/upgrade.py:276
7505
msgid "Upgrading bzrdirs"
7506
msgstr ""
7507
7508
#: bzrlib/upgrade.py:282
7509
#, python-format
7510
msgid "Upgrading %s"
7511
msgstr ""
7512
7513
#: bzrlib/upgrade.py:283
7514
msgid "Upgrading {0} {1} ..."
7515
msgstr ""
7516
7517
#: bzrlib/upgrade.py:301
7518
msgid "Removing backup ..."
7519
msgstr ""
7520
7521
#: bzrlib/upgrade.py:305
7522
msgid "failed to clean-up {0}: {1}"
7523
msgstr ""
7524
7525
#: bzrlib/vf_repository.py:1091
7526
msgid "inventories"
7527
msgstr ""
7528
7529
#: bzrlib/vf_repository.py:1117
7530
msgid "texts"
7531
msgstr ""
7532
7533
#: bzrlib/vf_repository.py:1622 bzrlib/vf_repository.py:1631
7534
msgid "Calculating text parents"
7535
msgstr ""
7536
7537
#: bzrlib/vf_repository.py:1707
7538
msgid "Fetch texts"
7539
msgstr ""
7540
7541
#: bzrlib/vf_repository.py:2536
7542
msgid "loading text store"
7543
msgstr ""
7544
7545
#: bzrlib/vf_repository.py:2542
7546
msgid "checking text graph"
7547
msgstr ""
7548
7549
#: bzrlib/vf_repository.py:2998 bzrlib/vf_repository.py:3012
7550
#: bzrlib/vf_repository.py:3127
7551
msgid "Transferring revisions"
7552
msgstr ""
7553
7554
#: bzrlib/win32utils.py:146
7555
msgid "Failed to GetProcessMemoryInfo()"
7556
msgstr ""
7557
7558
#: bzrlib/win32utils.py:167
7559
msgid "Cannot debug memory on win32 without ctypes or win32process"
7560
msgstr ""
7561
7562
#: bzrlib/win32utils.py:172
7563
msgid "WorkingSize {0:>7}KiB\tPeakWorking {1:>7}KiB\t{2}"
7564
msgstr ""
7565
7566
#: bzrlib/win32utils.py:180
7567
#, python-format
7568
msgid "WorkingSize %8d KiB"
7569
msgstr ""
7570
7571
#: bzrlib/win32utils.py:181
7572
#, python-format
7573
msgid "PeakWorking %8d KiB"
7574
msgstr ""
7575
7576
#: bzrlib/win32utils.py:182
7577
#, python-format
7578
msgid "PagefileUsage %8d KiB"
7579
msgstr ""
7580
7581
#: bzrlib/win32utils.py:183
7582
#, python-format
7583
msgid "PeakPagefileUsage %8d KiB"
7584
msgstr ""
7585
7586
#: bzrlib/win32utils.py:185
7587
#, python-format
7588
msgid "PrivateUsage %8d KiB"
7589
msgstr ""
7590
7591
#: bzrlib/win32utils.py:186
7592
#, python-format
7593
msgid "PageFaultCount %8d"
7594
msgstr ""
7595
7596
#: bzrlib/workingtree.py:1516
7597
msgid "Rerun update after fixing the conflicts."
7598
msgstr ""
7599
7600
#: dummy/help_topics/authentication/summary.txt:1
7601
msgid "Information on configuring authentication"
7602
msgstr ""
7603
7604
#: dummy/help_topics/basic/detail.txt:1
7605
msgid ""
7606
"Bazaar 2.6.0 -- a free distributed version-control tool\n"
7607
"http://bazaar.canonical.com/"
7608
msgstr ""
7609
7610
#: dummy/help_topics/basic/detail.txt:4
7611
msgid ""
7612
"Basic commands:\n"
7613
" bzr init makes this directory a versioned branch\n"
7614
" bzr branch make a copy of another branch"
7615
msgstr ""
7616
7617
#: dummy/help_topics/basic/detail.txt:8
7618
msgid ""
7619
" bzr add make files or directories versioned\n"
7620
" bzr ignore ignore a file or pattern\n"
7621
" bzr mv move or rename a versioned file"
7622
msgstr ""
7623
7624
#: dummy/help_topics/basic/detail.txt:12
7625
msgid ""
7626
" bzr status summarize changes in working copy\n"
7627
" bzr diff show detailed diffs"
7628
msgstr ""
7629
7630
#: dummy/help_topics/basic/detail.txt:15
7631
msgid ""
7632
" bzr merge pull in changes from another branch\n"
7633
" bzr commit save some or all changes\n"
7634
" bzr send send changes via email"
7635
msgstr ""
7636
7637
#: dummy/help_topics/basic/detail.txt:19
7638
msgid ""
7639
" bzr log show history of changes\n"
7640
" bzr check validate storage"
7641
msgstr ""
7642
7643
#: dummy/help_topics/basic/detail.txt:22
7644
msgid ""
7645
" bzr help init more help on e.g. init command\n"
7646
" bzr help commands list all commands\n"
7647
" bzr help topics list all help topics\n"
7648
msgstr ""
7649
7650
#: dummy/help_topics/basic/summary.txt:1
7651
msgid "Basic commands"
7652
msgstr ""
7653
7654
#: dummy/help_topics/branches/detail.txt:1
7655
msgid "Branches"
7656
msgstr ""
7657
7658
#: dummy/help_topics/branches/detail.txt:3
7659
msgid ""
7660
"A branch consists of the state of a project, including all of its\n"
7661
"history. All branches have a repository associated (which is where the\n"
7662
"branch history is stored), but multiple branches may share the same\n"
7663
"repository (a shared repository). Branches can be copied and merged."
7664
msgstr ""
7665
7666
#: dummy/help_topics/branches/detail.txt:8
7667
msgid ""
7668
"In addition, one branch may be bound to another one. Binding to another\n"
7669
"branch indicates that commits which happen in this branch must also \n"
7670
"happen in the other branch. Bazaar ensures consistency by not allowing \n"
7671
"commits when the two branches are out of date. In order for a commit \n"
7672
"to succeed, it may be necessary to update the current branch using \n"
7673
"``bzr update``."
7674
msgstr ""
7675
7676
#: dummy/help_topics/branches/detail.txt:15
7677
#: dummy/help_topics/checkouts/detail.txt:66
7678
#: dummy/help_topics/repositories/detail.txt:36
7679
msgid "Related commands::"
7680
msgstr ""
7681
7682
#: dummy/help_topics/branches/detail.txt:17
7683
msgid ""
7684
" init Change a directory into a versioned branch.\n"
7685
" branch Create a new branch that is a copy of an existing branch.\n"
7686
" merge Perform a three-way merge.\n"
7687
" bind Bind a branch to another one.\n"
7688
msgstr ""
7689
7690
#: dummy/help_topics/branches/summary.txt:1
7691
msgid "Information on what a branch is"
7692
msgstr ""
7693
7694
#: dummy/help_topics/bugs/summary.txt:1
7695
msgid "Bug tracker settings"
7696
msgstr ""
7697
7698
#: dummy/help_topics/checkouts/detail.txt:1
7699
msgid "Checkouts"
7700
msgstr ""
7701
7702
#: dummy/help_topics/checkouts/detail.txt:3
7703
msgid ""
7704
"Checkouts are source trees that are connected to a branch, so that when\n"
7705
"you commit in the source tree, the commit goes into that branch. They\n"
7706
"allow you to use a simpler, more centralized workflow, ignoring some of\n"
7707
"Bazaar's decentralized features until you want them. Using checkouts\n"
7708
"with shared repositories is very similar to working with SVN or CVS, but\n"
7709
"doesn't have the same restrictions. And using checkouts still allows\n"
7710
"others working on the project to use whatever workflow they like."
7711
msgstr ""
7712
7713
#: dummy/help_topics/checkouts/detail.txt:11
7714
msgid ""
7715
"A checkout is created with the bzr checkout command (see \"help "
7716
"checkout\").\n"
7717
"You pass it a reference to another branch, and it will create a local copy\n"
7718
"for you that still contains a reference to the branch you created the\n"
7719
"checkout from (the master branch). Then if you make any commits they will "
7720
"be\n"
7721
"made on the other branch first. This creates an instant mirror of your work, "
7722
"or\n"
7723
"facilitates lockstep development, where each developer is working together,\n"
7724
"continuously integrating the changes of others."
7725
msgstr ""
7726
7727
#: dummy/help_topics/checkouts/detail.txt:19
7728
msgid ""
7729
"However the checkout is still a first class branch in Bazaar terms, so that\n"
7730
"you have the full history locally. As you have a first class branch you "
7731
"can\n"
7732
"also commit locally if you want, for instance due to the temporary loss af "
7733
"a\n"
7734
"network connection. Use the --local option to commit to do this. All the "
7735
"local\n"
7736
"commits will then be made on the master branch the next time you do a non-"
7737
"local\n"
7738
"commit."
7739
msgstr ""
7740
7741
#: dummy/help_topics/checkouts/detail.txt:26
7742
msgid ""
7743
"If you are using a checkout from a shared branch you will periodically want "
7744
"to\n"
7745
"pull in all the changes made by others. This is done using the \"update\"\n"
7746
"command. The changes need to be applied before any non-local commit, but\n"
7747
"Bazaar will tell you if there are any changes and suggest that you use this\n"
7748
"command when needed."
7749
msgstr ""
7750
7751
#: dummy/help_topics/checkouts/detail.txt:32
7752
msgid ""
7753
"It is also possible to create a \"lightweight\" checkout by passing the\n"
7754
"--lightweight flag to checkout. A lightweight checkout is even closer to an\n"
7755
"SVN checkout in that it is not a first class branch, it mainly consists of "
7756
"the\n"
7757
"working tree. This means that any history operations must query the master\n"
7758
"branch, which could be slow if a network connection is involved. Also, as "
7759
"you\n"
7760
"don't have a local branch, then you cannot commit locally."
7761
msgstr ""
7762
7763
#: dummy/help_topics/checkouts/detail.txt:39
7764
msgid ""
7765
"Lightweight checkouts work best when you have fast reliable access to the\n"
7766
"master branch. This means that if the master branch is on the same disk or "
7767
"LAN\n"
7768
"a lightweight checkout will be faster than a heavyweight one for any "
7769
"commands\n"
7770
"that modify the revision history (as only one copy of the branch needs to\n"
7771
"be updated). Heavyweight checkouts will generally be faster for any command\n"
7772
"that uses the history but does not change it, but if the master branch is "
7773
"on\n"
7774
"the same disk then there won't be a noticeable difference."
7775
msgstr ""
7776
7777
#: dummy/help_topics/checkouts/detail.txt:47
7778
msgid ""
7779
"Another possible use for a checkout is to use it with a treeless repository\n"
7780
"containing your branches, where you maintain only one working tree by\n"
7781
"switching the master branch that the checkout points to when you want to\n"
7782
"work on a different branch."
7783
msgstr ""
7784
7785
#: dummy/help_topics/checkouts/detail.txt:52
7786
msgid ""
7787
"Obviously to commit on a checkout you need to be able to write to the "
7788
"master\n"
7789
"branch. This means that the master branch must be accessible over a "
7790
"writeable\n"
7791
"protocol , such as sftp://, and that you have write permissions at the "
7792
"other\n"
7793
"end. Checkouts also work on the local file system, so that all that matters "
7794
"is\n"
7795
"file permissions."
7796
msgstr ""
7797
7798
#: dummy/help_topics/checkouts/detail.txt:58
7799
msgid ""
7800
"You can change the master of a checkout by using the \"switch\" command "
7801
"(see\n"
7802
"\"help switch\"). This will change the location that the commits are sent "
7803
"to.\n"
7804
"The \"bind\" command can also be used to turn a normal branch into a heavy\n"
7805
"checkout. If you would like to convert your heavy checkout into a normal\n"
7806
"branch so that every commit is local, you can use the \"unbind\" command. To "
7807
"see\n"
7808
"whether or not a branch is bound or not you can use the \"info\" command. If "
7809
"the\n"
7810
"branch is bound it will tell you the location of the bound branch."
7811
msgstr ""
7812
7813
#: dummy/help_topics/checkouts/detail.txt:68
7814
msgid ""
7815
" checkout Create a checkout. Pass --lightweight to get a lightweight\n"
7816
" checkout\n"
7817
" update Pull any changes in the master branch in to your checkout\n"
7818
" commit Make a commit that is sent to the master branch. If you have\n"
7819
" a heavy checkout then the --local option will commit to the\n"
7820
" checkout without sending the commit to the master\n"
7821
" switch Change the master branch that the commits in the checkout "
7822
"will\n"
7823
" be sent to\n"
7824
" bind Turn a standalone branch into a heavy checkout so that any\n"
7825
" commits will be sent to the master branch\n"
7826
" unbind Turn a heavy checkout into a standalone branch so that any\n"
7827
" commits are only made locally\n"
7828
" info Displays whether a branch is bound or unbound. If the branch "
7829
"is\n"
7830
" bound, then it will also display the location of the bound "
7831
"branch\n"
7832
msgstr ""
7833
7834
#: dummy/help_topics/checkouts/summary.txt:1
7835
msgid "Information on what a checkout is"
7836
msgstr ""
7837
7838
#: dummy/help_topics/commands/summary.txt:1
7839
msgid "Basic help for all commands"
7840
msgstr ""
7841
7842
#: dummy/help_topics/configuration/summary.txt:1
7843
msgid "Details on the configuration settings available"
7844
msgstr ""
7845
7846
#: dummy/help_topics/conflict-types/summary.txt:1
7847
msgid "Types of conflicts and what to do about them"
7848
msgstr ""
7849
7850
#: dummy/help_topics/content-filters/summary.txt:1
7851
msgid "Conversion of content into/from working trees"
7852
msgstr ""
7853
7854
#: dummy/help_topics/criss-cross/detail.txt:1
7855
msgid "Criss-Cross"
7856
msgstr ""
7857
7858
#: dummy/help_topics/criss-cross/detail.txt:3
7859
msgid ""
7860
"A criss-cross in the branch history can cause the default merge technique\n"
7861
"to emit more conflicts than would normally be expected."
7862
msgstr ""
7863
7864
#: dummy/help_topics/criss-cross/detail.txt:6
7865
msgid ""
7866
"In complex merge cases, ``bzr merge --lca`` or ``bzr merge --weave`` may "
7867
"give\n"
7868
"better results. You may wish to ``bzr revert`` the working tree and merge\n"
7869
"again. Alternatively, use ``bzr remerge`` on particular conflicted files."
7870
msgstr ""
7871
7872
#: dummy/help_topics/criss-cross/detail.txt:10
7873
msgid ""
7874
"Criss-crosses occur in a branch's history if two branches merge the same "
7875
"thing\n"
7876
"and then merge one another, or if two branches merge one another at the "
7877
"same\n"
7878
"time. They can be avoided by having each branch only merge from or into a\n"
7879
"designated central branch (a \"star topology\")."
7880
msgstr ""
7881
7882
#: dummy/help_topics/criss-cross/detail.txt:15
7883
msgid ""
7884
"Criss-crosses cause problems because of the way merge works. Bazaar's "
7885
"default\n"
7886
"merge is a three-way merger; in order to merge OTHER into THIS, it must\n"
7887
"find a basis for comparison, BASE. Using BASE, it can determine whether\n"
7888
"differences between THIS and OTHER are due to one side adding lines, or\n"
7889
"from another side removing lines."
7890
msgstr ""
7891
7892
#: dummy/help_topics/criss-cross/detail.txt:21
7893
msgid ""
7894
"Criss-crosses mean there is no good choice for a base. Selecting the "
7895
"recent\n"
7896
"merge points could cause one side's changes to be silently discarded.\n"
7897
"Selecting older merge points (which Bazaar does) mean that extra conflicts\n"
7898
"are emitted."
7899
msgstr ""
7900
7901
#: dummy/help_topics/criss-cross/detail.txt:26
7902
msgid ""
7903
"The ``weave`` merge type is not affected by this problem because it uses\n"
7904
"line-origin detection instead of a basis revision to determine the cause of\n"
7905
"differences.\n"
7906
msgstr ""
7907
7908
#: dummy/help_topics/criss-cross/summary.txt:1
7909
msgid "Information on criss-cross merging"
7910
msgstr ""
7911
7912
#: dummy/help_topics/current-formats/summary.txt:1
7913
msgid "Current storage formats"
7914
msgstr ""
7915
7916
#: dummy/help_topics/debug-flags/summary.txt:1
7917
msgid "Options to show or record debug information"
7918
msgstr ""
7919
7920
#: dummy/help_topics/diverged-branches/summary.txt:1
7921
msgid "How to fix diverged branches"
7922
msgstr ""
7923
7924
#: dummy/help_topics/env-variables/summary.txt:1
7925
msgid "Environment variable names and values"
7926
msgstr ""
7927
7928
#: dummy/help_topics/eol/summary.txt:1
7929
msgid "Information on end-of-line handling"
7930
msgstr ""
7931
7932
#: dummy/help_topics/files/detail.txt:1
7933
msgid "Files"
7934
msgstr ""
7935
7936
#: dummy/help_topics/files/detail.txt:3
7937
msgid ""
7938
":On Unix: ~/.bazaar/bazaar.conf\n"
7939
":On Windows: C:\\\\Documents and Settings\\\\username\\\\Application Data\\\\"
7940
"bazaar\\\\2.0\\\\bazaar.conf"
7941
msgstr ""
7942
7943
#: dummy/help_topics/files/detail.txt:6
7944
msgid ""
7945
"Contains the user's default configuration. The section ``[DEFAULT]`` is\n"
7946
"used to define general configuration that will be applied everywhere.\n"
7947
"The section ``[ALIASES]`` can be used to create command aliases for\n"
7948
"commonly used options."
7949
msgstr ""
7950
7951
#: dummy/help_topics/files/detail.txt:11
7952
msgid "A typical config file might look something like::"
7953
msgstr ""
7954
7955
#: dummy/help_topics/files/detail.txt:13
7956
msgid ""
7957
" [DEFAULT]\n"
7958
" email=John Doe <jdoe@isp.com>"
7959
msgstr ""
7960
7961
#: dummy/help_topics/files/detail.txt:16
7962
msgid ""
7963
" [ALIASES]\n"
7964
" commit = commit --strict\n"
7965
" log10 = log --short -r -10..-1\n"
7966
msgstr ""
7967
7968
#: dummy/help_topics/files/summary.txt:1
7969
msgid "Information on configuration and log files"
7970
msgstr ""
7971
7972
#: dummy/help_topics/formats/detail.txt:1
7973
msgid "Storage Formats"
7974
msgstr ""
7975
7976
#: dummy/help_topics/formats/detail.txt:3
7977
msgid ""
7978
"To ensure that older clients do not access data incorrectly,\n"
7979
"Bazaar's policy is to introduce a new storage format whenever\n"
7980
"new features requiring new metadata are added. New storage\n"
7981
"formats may also be introduced to improve performance and\n"
7982
"scalability."
7983
msgstr ""
7984
7985
#: dummy/help_topics/formats/detail.txt:9
7986
msgid ""
7987
"The newest format, 2a, is highly recommended. If your\n"
7988
"project is not using 2a, then you should suggest to the\n"
7989
"project owner to upgrade."
7990
msgstr ""
7991
7992
#: dummy/help_topics/formats/detail.txt:13
7993
msgid ""
7994
"\n"
7995
".. note::"
7996
msgstr ""
7997
7998
#: dummy/help_topics/formats/detail.txt:16
7999
msgid ""
8000
" Some of the older formats have two variants:\n"
8001
" a plain one and a rich-root one. The latter include an additional\n"
8002
" field about the root of the tree. There is no performance cost\n"
8003
" for using a rich-root format but you cannot easily merge changes\n"
8004
" from a rich-root format into a plain format. As a consequence,\n"
8005
" moving a project to a rich-root format takes some co-ordination\n"
8006
" in that all contributors need to upgrade their repositories\n"
8007
" around the same time. 2a and all future formats will be\n"
8008
" implicitly rich-root."
8009
msgstr ""
8010
8011
#: dummy/help_topics/formats/detail.txt:26
8012
msgid ""
8013
"See :doc:`current-formats-help` for the complete list of\n"
8014
"currently supported formats. See :doc:`other-formats-help` for\n"
8015
"descriptions of any available experimental and deprecated formats.\n"
8016
msgstr ""
8017
8018
#: dummy/help_topics/formats/summary.txt:1
8019
msgid "Information on choosing a storage format"
8020
msgstr ""
8021
8022
#: dummy/help_topics/global-options/detail.txt:1
8023
msgid "Global Options"
8024
msgstr ""
8025
8026
#: dummy/help_topics/global-options/detail.txt:3
8027
msgid ""
8028
"These options may be used with any command, and may appear in front of any\n"
8029
"command. (e.g. ``bzr --profile help``)."
8030
msgstr ""
8031
8032
#: dummy/help_topics/global-options/detail.txt:6
8033
msgid ""
8034
"--version Print the version number. Must be supplied before the "
8035
"command.\n"
8036
"--no-aliases Do not process command aliases when running this command.\n"
8037
"--builtin Use the built-in version of a command, not the plugin "
8038
"version.\n"
8039
" This does not suppress other plugin effects.\n"
8040
"--no-plugins Do not process any plugins.\n"
8041
"--no-l10n Do not translate messages.\n"
8042
"--concurrency Number of processes that can be run concurrently (selftest)."
8043
msgstr ""
8044
8045
#: dummy/help_topics/global-options/detail.txt:14
8046
msgid ""
8047
"--profile Profile execution using the hotshot profiler.\n"
8048
"--lsprof Profile execution using the lsprof profiler.\n"
8049
"--lsprof-file Profile execution using the lsprof profiler, and write the\n"
8050
" results to a specified file. If the filename ends with "
8051
"\".txt\",\n"
8052
" text format will be used. If the filename either starts "
8053
"with\n"
8054
" \"callgrind.out\" or end with \".callgrind\", the output will "
8055
"be\n"
8056
" formatted for use with KCacheGrind. Otherwise, the output\n"
8057
" will be a pickle.\n"
8058
"--coverage Generate line coverage report in the specified directory."
8059
msgstr ""
8060
8061
#: dummy/help_topics/global-options/detail.txt:24
8062
msgid ""
8063
"-Oname=value Override the ``name`` config option setting it to ``value`` "
8064
"for\n"
8065
" the duration of the command. This can be used multiple times "
8066
"if\n"
8067
" several options need to be overridden."
8068
msgstr ""
8069
8070
#: dummy/help_topics/global-options/detail.txt:28
8071
msgid ""
8072
"See http://doc.bazaar.canonical.com/developers/profiling.html for more\n"
8073
"information on profiling."
8074
msgstr ""
8075
8076
#: dummy/help_topics/global-options/detail.txt:31
8077
msgid ""
8078
"A number of debug flags are also available to assist troubleshooting and\n"
8079
"development. See :doc:`debug-flags-help`.\n"
8080
msgstr ""
8081
8082
#: dummy/help_topics/global-options/summary.txt:1
8083
msgid "Options that control how Bazaar runs"
8084
msgstr ""
8085
8086
#: dummy/help_topics/hidden-commands/summary.txt:1
8087
msgid "All hidden commands"
8088
msgstr ""
8089
8090
#: dummy/help_topics/hooks/summary.txt:1
8091
msgid "Points at which custom processing can be added"
8092
msgstr ""
8093
8094
#: dummy/help_topics/launchpad/detail.txt:1
8095
msgid "Integration with Launchpad.net"
8096
msgstr ""
8097
8098
#: dummy/help_topics/launchpad/detail.txt:3
8099
msgid ""
8100
"Launchpad.net provides free Bazaar branch hosting with integrated bug and\n"
8101
"specification tracking."
8102
msgstr ""
8103
8104
#: dummy/help_topics/launchpad/detail.txt:6
8105
msgid ""
8106
"The bzr client (through the plugin called 'launchpad') has special\n"
8107
"features to communicate with Launchpad:"
8108
msgstr ""
8109
8110
#: dummy/help_topics/launchpad/detail.txt:9
8111
msgid ""
8112
" * The launchpad-login command tells Bazaar your Launchpad user name. "
8113
"This\n"
8114
" is then used by the 'lp:' transport to download your branches using\n"
8115
" bzr+ssh://."
8116
msgstr ""
8117
8118
#: dummy/help_topics/launchpad/detail.txt:13
8119
msgid ""
8120
" * The 'lp:' transport uses Launchpad as a directory service: for "
8121
"example\n"
8122
" 'lp:bzr' and 'lp:python' refer to the main branches of the relevant\n"
8123
" projects and may be branched, logged, etc. You can also use the 'lp:'\n"
8124
" transport to refer to specific branches, e.g. lp:~bzr/bzr/trunk."
8125
msgstr ""
8126
8127
#: dummy/help_topics/launchpad/detail.txt:18
8128
msgid ""
8129
" * The 'lp:' bug tracker alias can expand launchpad bug numbers to their\n"
8130
" URLs for use with 'bzr commit --fixes', e.g. 'bzr commit --fixes "
8131
"lp:12345'\n"
8132
" will record a revision property that marks that revision as fixing\n"
8133
" Launchpad bug 12345. When you push that branch to Launchpad it will\n"
8134
" automatically be linked to the bug report."
8135
msgstr ""
8136
8137
#: dummy/help_topics/launchpad/detail.txt:24
8138
msgid ""
8139
" * The register-branch command tells Launchpad about the url of a\n"
8140
" public branch. Launchpad will then mirror the branch, display\n"
8141
" its contents and allow it to be attached to bugs and other\n"
8142
" objects."
8143
msgstr ""
8144
8145
#: dummy/help_topics/launchpad/detail.txt:29
8146
msgid "For more information see http://help.launchpad.net/\n"
8147
msgstr ""
8148
8149
#: dummy/help_topics/launchpad/summary.txt:1
8150
msgid "Using Bazaar with Launchpad.net"
8151
msgstr ""
8152
8153
#: dummy/help_topics/location-alias/summary.txt:1
8154
msgid "Aliases for remembered locations"
8155
msgstr ""
8156
8157
#: dummy/help_topics/log-formats/summary.txt:1
8158
msgid "Details on the logging formats available"
8159
msgstr ""
8160
8161
#: dummy/help_topics/other-formats/summary.txt:1
8162
msgid "Experimental and deprecated storage formats"
8163
msgstr ""
8164
8165
#: dummy/help_topics/patterns/summary.txt:1
8166
msgid "Information on the pattern syntax"
8167
msgstr ""
8168
8169
#: dummy/help_topics/repositories/detail.txt:1
8170
msgid "Repositories"
8171
msgstr ""
8172
8173
#: dummy/help_topics/repositories/detail.txt:3
8174
msgid ""
8175
"Repositories in Bazaar are where committed information is stored. There is\n"
8176
"a repository associated with every branch."
8177
msgstr ""
8178
8179
#: dummy/help_topics/repositories/detail.txt:6
8180
msgid ""
8181
"Repositories are a form of database. Bzr will usually maintain this for\n"
8182
"good performance automatically, but in some situations (e.g. when doing\n"
8183
"very many commits in a short time period) you may want to ask bzr to\n"
8184
"optimise the database indices. This can be done by the 'bzr pack' command."
8185
msgstr ""
8186
8187
#: dummy/help_topics/repositories/detail.txt:11
8188
msgid ""
8189
"By default just running 'bzr init' will create a repository within the new\n"
8190
"branch but it is possible to create a shared repository which allows "
8191
"multiple\n"
8192
"branches to share their information in the same location. When a new branch "
8193
"is\n"
8194
"created it will first look to see if there is a containing shared repository "
8195
"it\n"
8196
"can use."
8197
msgstr ""
8198
8199
#: dummy/help_topics/repositories/detail.txt:17
8200
msgid ""
8201
"When two branches of the same project share a repository, there is\n"
8202
"generally a large space saving. For some operations (e.g. branching\n"
8203
"within the repository) this translates in to a large time saving."
8204
msgstr ""
8205
8206
#: dummy/help_topics/repositories/detail.txt:21
8207
msgid ""
8208
"To create a shared repository use the init-repository command (or the alias\n"
8209
"init-repo). This command takes the location of the repository to create. "
8210
"This\n"
8211
"means that 'bzr init-repository repo' will create a directory named 'repo',\n"
8212
"which contains a shared repository. Any new branches that are created in "
8213
"this\n"
8214
"directory will then use it for storage."
8215
msgstr ""
8216
8217
#: dummy/help_topics/repositories/detail.txt:27
8218
msgid ""
8219
"It is a good idea to create a repository whenever you might create more\n"
8220
"than one branch of a project. This is true for both working areas where you\n"
8221
"are doing the development, and any server areas that you use for hosting\n"
8222
"projects. In the latter case, it is common to want branches without working\n"
8223
"trees. Since the files in the branch will not be edited directly there is "
8224
"no\n"
8225
"need to use up disk space for a working tree. To create a repository in "
8226
"which\n"
8227
"the branches will not have working trees pass the '--no-trees' option to\n"
8228
"'init-repository'."
8229
msgstr ""
8230
8231
#: dummy/help_topics/repositories/detail.txt:38
8232
msgid ""
8233
" init-repository Create a shared repository. Use --no-trees to create "
8234
"one\n"
8235
" in which new branches won't get a working tree.\n"
8236
msgstr ""
8237
8238
#: dummy/help_topics/repositories/summary.txt:1
8239
msgid "Basic information on shared repositories."
8240
msgstr ""
8241
8242
#: dummy/help_topics/revisionspec/summary.txt:1
8243
msgid "Explain how to use --revision"
8244
msgstr ""
8245
8246
#: dummy/help_topics/rules/summary.txt:1
8247
msgid "Information on defining rule-based preferences"
8248
msgstr ""
8249
8250
#: dummy/help_topics/standalone-trees/detail.txt:1
8251
msgid "Standalone Trees"
8252
msgstr ""
8253
8254
#: dummy/help_topics/standalone-trees/detail.txt:3
8255
msgid ""
8256
"A standalone tree is a working tree with an associated repository. It\n"
8257
"is an independently usable branch, with no dependencies on any other.\n"
8258
"Creating a standalone tree (via bzr init) is the quickest way to put\n"
8259
"an existing project under version control."
8260
msgstr ""
8261
8262
#: dummy/help_topics/standalone-trees/detail.txt:8
8263
msgid "Related Commands::"
8264
msgstr ""
8265
8266
#: dummy/help_topics/standalone-trees/detail.txt:10
8267
msgid " init Make a directory into a versioned branch.\n"
8268
msgstr ""
8269
8270
#: dummy/help_topics/standalone-trees/summary.txt:1
8271
msgid "Information on what a standalone tree is"
8272
msgstr ""
8273
8274
#: dummy/help_topics/standard-options/detail.txt:1
8275
msgid "Standard Options"
8276
msgstr ""
8277
8278
#: dummy/help_topics/standard-options/detail.txt:3
8279
msgid "Standard options are legal for all commands."
8280
msgstr ""
8281
8282
#: dummy/help_topics/standard-options/detail.txt:5
8283
msgid ""
8284
"--help, -h Show help message.\n"
8285
"--verbose, -v Display more information.\n"
8286
"--quiet, -q Only display errors and warnings."
8287
msgstr ""
8288
8289
#: dummy/help_topics/standard-options/detail.txt:9
8290
msgid "Unlike global options, standard options can be used in aliases.\n"
8291
msgstr ""
8292
8293
#: dummy/help_topics/standard-options/summary.txt:1
8294
msgid "Options that can be used with any command"
8295
msgstr ""
8296
8297
#: dummy/help_topics/status-flags/detail.txt:1
8298
msgid "Status Flags"
8299
msgstr ""
8300
8301
#: dummy/help_topics/status-flags/detail.txt:3
8302
msgid ""
8303
"Status flags are used to summarise changes to the working tree in a concise\n"
8304
"manner. They are in the form::"
8305
msgstr ""
8306
8307
#: dummy/help_topics/status-flags/detail.txt:6
8308
msgid " xxx <filename>"
8309
msgstr ""
8310
8311
#: dummy/help_topics/status-flags/detail.txt:8
8312
msgid "where the columns' meanings are as follows."
8313
msgstr ""
8314
8315
#: dummy/help_topics/status-flags/detail.txt:10
8316
msgid "Column 1 - versioning/renames::"
8317
msgstr ""
8318
8319
#: dummy/help_topics/status-flags/detail.txt:12
8320
msgid ""
8321
" + File versioned\n"
8322
" - File unversioned\n"
8323
" R File renamed\n"
8324
" ? File unknown\n"
8325
" X File nonexistent (and unknown to bzr)\n"
8326
" C File has conflicts\n"
8327
" P Entry for a pending merge (not a file)"
8328
msgstr ""
8329
8330
#: dummy/help_topics/status-flags/detail.txt:20
8331
msgid "Column 2 - contents::"
8332
msgstr ""
8333
8334
#: dummy/help_topics/status-flags/detail.txt:22
8335
msgid ""
8336
" N File created\n"
8337
" D File deleted\n"
8338
" K File kind changed\n"
8339
" M File modified"
8340
msgstr ""
8341
8342
#: dummy/help_topics/status-flags/detail.txt:27
8343
msgid "Column 3 - execute::"
8344
msgstr ""
8345
8346
#: dummy/help_topics/status-flags/detail.txt:29
8347
msgid " * The execute bit was changed\n"
8348
msgstr ""
8349
8350
#: dummy/help_topics/status-flags/summary.txt:1
8351
msgid "Help on status flags"
8352
msgstr ""
8353
8354
#: dummy/help_topics/sync-for-reconfigure/detail.txt:1
8355
msgid "Branches Out of Sync"
8356
msgstr ""
8357
8358
#: dummy/help_topics/sync-for-reconfigure/detail.txt:3
8359
msgid ""
8360
"When reconfiguring a checkout, tree or branch into a lightweight checkout,\n"
8361
"a local branch must be destroyed. (For checkouts, this is the local branch\n"
8362
"that serves primarily as a cache.) If the branch-to-be-destroyed does not\n"
8363
"have the same last revision as the new reference branch for the lightweight\n"
8364
"checkout, data could be lost, so Bazaar refuses."
8365
msgstr ""
8366
8367
#: dummy/help_topics/sync-for-reconfigure/detail.txt:9
8368
msgid "How you deal with this depends on *why* the branches are out of sync."
8369
msgstr ""
8370
8371
#: dummy/help_topics/sync-for-reconfigure/detail.txt:11
8372
msgid ""
8373
"If you have a checkout and have done local commits, you can get back in "
8374
"sync\n"
8375
"by running \"bzr update\" (and possibly \"bzr commit\")."
8376
msgstr ""
8377
8378
#: dummy/help_topics/sync-for-reconfigure/detail.txt:14
8379
msgid ""
8380
"If you have a branch and the remote branch is out-of-date, you can push\n"
8381
"the local changes using \"bzr push\". If the local branch is out of date, "
8382
"you\n"
8383
"can do \"bzr pull\". If both branches have had changes, you can merge, "
8384
"commit\n"
8385
"and then push your changes. If you decide that some of the changes aren't\n"
8386
"useful, you can \"push --overwrite\" or \"pull --overwrite\" instead.\n"
8387
msgstr ""
8388
8389
#: dummy/help_topics/sync-for-reconfigure/summary.txt:1
8390
msgid "Steps to resolve \"out-of-sync\" when reconfiguring"
8391
msgstr ""
8392
8393
#: dummy/help_topics/topics/summary.txt:1
8394
msgid "Topics list"
8395
msgstr ""
8396
8397
#: dummy/help_topics/url-special-chars/summary.txt:1
8398
msgid "Special character handling in URLs"
8399
msgstr ""
8400
8401
#: dummy/help_topics/urlspec/summary.txt:1
8402
msgid "Supported transport protocols"
8403
msgstr ""
8404
8405
#: dummy/help_topics/working-trees/detail.txt:1
8406
msgid "Working Trees"
8407
msgstr ""
8408
8409
#: dummy/help_topics/working-trees/detail.txt:3
8410
msgid ""
8411
"A working tree is the contents of a branch placed on disk so that you can\n"
8412
"see the files and edit them. The working tree is where you make changes to "
8413
"a\n"
8414
"branch, and when you commit the current state of the working tree is the\n"
8415
"snapshot that is recorded in the commit."
8416
msgstr ""
8417
8418
#: dummy/help_topics/working-trees/detail.txt:8
8419
msgid ""
8420
"When you push a branch to a remote system, a working tree will not be\n"
8421
"created. If one is already present the files will not be updated. The\n"
8422
"branch information will be updated and the working tree will be marked\n"
8423
"as out-of-date. Updating a working tree remotely is difficult, as there\n"
8424
"may be uncommitted changes or the update may cause content conflicts that "
8425
"are\n"
8426
"difficult to deal with remotely."
8427
msgstr ""
8428
8429
#: dummy/help_topics/working-trees/detail.txt:15
8430
msgid ""
8431
"If you have a branch with no working tree you can use the 'checkout' "
8432
"command\n"
8433
"to create a working tree. If you run 'bzr checkout .' from the branch it "
8434
"will\n"
8435
"create the working tree. If the branch is updated remotely, you can update "
8436
"the\n"
8437
"working tree by running 'bzr update' in that directory."
8438
msgstr ""
8439
8440
#: dummy/help_topics/working-trees/detail.txt:20
8441
msgid ""
8442
"If you have a branch with a working tree that you do not want the 'remove-"
8443
"tree'\n"
8444
"command will remove the tree if it is safe. This can be done to avoid the\n"
8445
"warning about the remote working tree not being updated when pushing to the\n"
8446
"branch. It can also be useful when working with a '--no-trees' repository\n"
8447
"(see 'bzr help repositories')."
8448
msgstr ""
8449
8450
#: dummy/help_topics/working-trees/detail.txt:26
8451
msgid ""
8452
"If you want to have a working tree on a remote machine that you push to you\n"
8453
"can either run 'bzr update' in the remote branch after each push, or use "
8454
"some\n"
8455
"other method to update the tree during the push. There is an 'rspush' "
8456
"plugin\n"
8457
"that will update the working tree using rsync as well as doing a push. "
8458
"There\n"
8459
"is also a 'push-and-update' plugin that automates running 'bzr update' via "
8460
"SSH\n"
8461
"after each push."
8462
msgstr ""
8463
8464
#: dummy/help_topics/working-trees/detail.txt:33
8465
msgid "Useful commands::"
8466
msgstr ""
8467
8468
#: dummy/help_topics/working-trees/detail.txt:35
8469
msgid ""
8470
" checkout Create a working tree when a branch does not have one.\n"
8471
" remove-tree Removes the working tree from a branch when it is safe to do "
8472
"so.\n"
8473
" update When a working tree is out of sync with its associated "
8474
"branch\n"
8475
" this will update the tree to match the branch.\n"
8476
msgstr ""
8477
8478
#: dummy/help_topics/working-trees/summary.txt:1
8479
msgid "Information on working trees"
8480
msgstr ""
8481
8482
#: en/help_topics/authentication.txt:1
8483
msgid ""
8484
"Authentication Settings\n"
8485
"======================="
8486
msgstr ""
8487
8488
#: en/help_topics/authentication.txt:4
8489
msgid ""
8490
"\n"
8491
"Intent\n"
8492
"------"
8493
msgstr ""
8494
8495
#: en/help_topics/authentication.txt:8
8496
msgid ""
8497
"Many different authentication policies can be described in the\n"
8498
"``authentication.conf`` file but a particular user should need only a few\n"
8499
"definitions to cover his needs without having to specify a user and a "
8500
"password\n"
8501
"for every branch he uses."
8502
msgstr ""
8503
8504
#: en/help_topics/authentication.txt:13
8505
msgid ""
8506
"The definitions found in this file are used to find the credentials to use "
8507
"for\n"
8508
"a given url. The same credentials can generally be used for as many branches "
8509
"as\n"
8510
"possible by grouping their declaration around the remote servers that need\n"
8511
"them. It's even possible to declare credentials that will be used by "
8512
"different\n"
8513
"servers."
8514
msgstr ""
8515
8516
#: en/help_topics/authentication.txt:19
8517
msgid ""
8518
"The intent is to make this file as small as possible to minimize maintenance."
8519
msgstr ""
8520
8521
#: en/help_topics/authentication.txt:21
8522
msgid ""
8523
"Once the relevant credentials are declared in this file you may use branch "
8524
"urls\n"
8525
"without embedding passwords (security hazard) or even users (enabling "
8526
"sharing\n"
8527
"of your urls with others)."
8528
msgstr ""
8529
8530
#: en/help_topics/authentication.txt:25
8531
msgid "Instead of using::"
8532
msgstr ""
8533
8534
#: en/help_topics/authentication.txt:27
8535
msgid " bzr branch ftp://joe:secret@host.com/path/to/my/branch"
8536
msgstr ""
8537
8538
#: en/help_topics/authentication.txt:29
8539
msgid "you simply use::"
8540
msgstr ""
8541
8542
#: en/help_topics/authentication.txt:31
8543
msgid " bzr branch ftp://host.com/path/to/my/branch"
8544
msgstr ""
8545
8546
#: en/help_topics/authentication.txt:33
8547
msgid ""
8548
"provided you have created the following ``authentication.conf`` file::"
8549
msgstr ""
8550
8551
#: en/help_topics/authentication.txt:35
8552
msgid ""
8553
" [myprojects]\n"
8554
" scheme=ftp\n"
8555
" host=host.com\n"
8556
" user=joe\n"
8557
" password=secret\n"
8558
" "
8559
msgstr ""
8560
8561
#: en/help_topics/authentication.txt:42
8562
msgid ""
8563
"Authentication definitions\n"
8564
"--------------------------"
8565
msgstr ""
8566
8567
#: en/help_topics/authentication.txt:45
8568
msgid ""
8569
"There are two kinds of authentication used by the various schemes supported "
8570
"by\n"
8571
"bzr:"
8572
msgstr ""
8573
8574
#: en/help_topics/authentication.txt:48
8575
msgid "1. user and password"
8576
msgstr ""
8577
8578
#: en/help_topics/authentication.txt:50
8579
msgid ""
8580
"``FTP`` needs a (``user``, ``password``) to authenticate against a ``host``\n"
8581
"``SFTP`` can use either a password or a host key to authenticate. However,\n"
8582
"ssh agents are a better, more secure solution. So we have chosen to not "
8583
"provide\n"
8584
"our own less secure method."
8585
msgstr ""
8586
8587
#: en/help_topics/authentication.txt:55
8588
msgid "2. user, realm and password"
8589
msgstr ""
8590
8591
#: en/help_topics/authentication.txt:57
8592
msgid ""
8593
"``HTTP`` and ``HTTPS`` needs a (``user, realm, password``) to authenticate\n"
8594
"against a host. But, by using ``.htaccess`` files, for example, it is "
8595
"possible\n"
8596
"to define several (``user, realm, password``) for a given ``host``. So what "
8597
"is\n"
8598
"really needed is (``user``, ``password``, ``host``, ``path``). The ``realm`` "
8599
"is\n"
8600
"not taken into account in the definitions, but will displayed if bzr "
8601
"prompts\n"
8602
"you for a password."
8603
msgstr ""
8604
8605
#: en/help_topics/authentication.txt:64
8606
msgid ""
8607
"``HTTP proxy`` can be handled as ``HTTP`` (or ``HTTPS``) by explicitly\n"
8608
"specifying the appropriate port."
8609
msgstr ""
8610
8611
#: en/help_topics/authentication.txt:67
8612
msgid ""
8613
"To take all schemes into account, the password will be deduced from a set "
8614
"of\n"
8615
"authentication definitions (``scheme``, ``host``, ``port``, ``path``, "
8616
"``user``,\n"
8617
"``password``)."
8618
msgstr ""
8619
8620
#: en/help_topics/authentication.txt:71
8621
msgid ""
8622
" * ``scheme``: can be empty (meaning the rest of the definition can be "
8623
"used\n"
8624
" for any scheme), ``SFTP`` and ``bzr+ssh`` should not be used here, "
8625
"``ssh``\n"
8626
" should be used instead since this is the real scheme regarding\n"
8627
" authentication,"
8628
msgstr ""
8629
8630
#: en/help_topics/authentication.txt:76
8631
msgid " * ``host``: can be empty (to act as a default for any host),"
8632
msgstr ""
8633
8634
#: en/help_topics/authentication.txt:78
8635
msgid ""
8636
" * ``port`` can be empty (useful when an host provides several servers for "
8637
"the\n"
8638
" same scheme), only numerical values are allowed, this should be used "
8639
"only\n"
8640
" when the server uses a port different than the scheme standard port,"
8641
msgstr ""
8642
8643
#: en/help_topics/authentication.txt:82
8644
msgid " * ``path``: can be empty (FTP or SFTP will never user it),"
8645
msgstr ""
8646
8647
#: en/help_topics/authentication.txt:84
8648
msgid ""
8649
" * ``user``: can be empty (``bzr`` will defaults to python's\n"
8650
" ``getpass.get_user()``),"
8651
msgstr ""
8652
8653
#: en/help_topics/authentication.txt:87
8654
msgid ""
8655
" * ``password``: can be empty if you prefer to always be prompted for your\n"
8656
" password."
8657
msgstr ""
8658
8659
#: en/help_topics/authentication.txt:90
8660
msgid ""
8661
"Multiple definitions can be provided and, for a given URL, bzr will select "
8662
"a\n"
8663
"(``user`` [, ``password``]) based on the following rules :"
8664
msgstr ""
8665
8666
#: en/help_topics/authentication.txt:93
8667
msgid " 1. the first match wins,"
8668
msgstr ""
8669
8670
#: en/help_topics/authentication.txt:95
8671
msgid " 2. empty fields match everything,"
8672
msgstr ""
8673
8674
#: en/help_topics/authentication.txt:97
8675
msgid ""
8676
" 3. ``scheme`` matches even if decorators are used in the requested URL,"
8677
msgstr ""
8678
8679
#: en/help_topics/authentication.txt:99
8680
msgid ""
8681
" 4. ``host`` matches exactly or act as a domain if it starts with '.'\n"
8682
" (``project.bzr.sf.net`` will match ``.bzr.sf.net`` but "
8683
"``projectbzr.sf.net``\n"
8684
" will not match ``bzr.sf.net``)."
8685
msgstr ""
8686
8687
#: en/help_topics/authentication.txt:103
8688
msgid ""
8689
" 5. ``port`` matches if included in the requested URL (exact matches only)"
8690
msgstr ""
8691
8692
#: en/help_topics/authentication.txt:105
8693
msgid ""
8694
" 6. ``path`` matches if included in the requested URL (and by rule #2 "
8695
"above,\n"
8696
" empty paths will match any provided path)."
8697
msgstr ""
8698
8699
#: en/help_topics/authentication.txt:110
8700
msgid ""
8701
"File format\n"
8702
"-----------"
8703
msgstr ""
8704
8705
#: en/help_topics/authentication.txt:113
8706
msgid ""
8707
"The general rules for :doc:`configuration files <configuration-help>`\n"
8708
"apply except for the variable policies."
8709
msgstr ""
8710
8711
#: en/help_topics/authentication.txt:116
8712
msgid "Each section describes an authentication definition."
8713
msgstr ""
8714
8715
#: en/help_topics/authentication.txt:118
8716
msgid ""
8717
"The section name is an arbitrary string, only the ``DEFAULT`` value is "
8718
"reserved\n"
8719
"and should appear as the *last* section."
8720
msgstr ""
8721
8722
#: en/help_topics/authentication.txt:121
8723
msgid "Each section should define:"
8724
msgstr ""
8725
8726
#: en/help_topics/authentication.txt:123
8727
msgid "* ``user``: the login to be used,"
8728
msgstr ""
8729
8730
#: en/help_topics/authentication.txt:125
8731
msgid "Each section could define:"
8732
msgstr ""
8733
8734
#: en/help_topics/authentication.txt:127
8735
msgid "* ``host``: the remote server,"
8736
msgstr ""
8737
8738
#: en/help_topics/authentication.txt:129
8739
msgid "* ``port``: the port the server is listening,"
8740
msgstr ""
8741
8742
#: en/help_topics/authentication.txt:131
8743
msgid "* ``path``: the branch location,"
8744
msgstr ""
8745
8746
#: en/help_topics/authentication.txt:133
8747
msgid "* ``password``: the password."
8748
msgstr ""
8749
8750
#: en/help_topics/authentication.txt:135
8751
msgid ""
8752
"\n"
8753
"Examples\n"
8754
"--------"
8755
msgstr ""
8756
8757
#: en/help_topics/authentication.txt:139
8758
msgid ""
8759
"\n"
8760
"Personal projects hosted outside\n"
8761
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
8762
msgstr ""
8763
8764
#: en/help_topics/authentication.txt:143
8765
msgid ""
8766
"All connections are done with the same ``user`` (the remote one for which "
8767
"the\n"
8768
"default bzr one is not appropriate) and the password is always prompted "
8769
"with\n"
8770
"some exceptions::"
8771
msgstr ""
8772
8773
#: en/help_topics/authentication.txt:147
8774
msgid ""
8775
" # Pet projects on hobby.net\n"
8776
" [hobby]\n"
8777
" host=r.hobby.net\n"
8778
" user=jim\n"
8779
" password=obvious1234\n"
8780
" \n"
8781
" # Home server\n"
8782
" [home]\n"
8783
" scheme=https\n"
8784
" host=home.net\n"
8785
" user=joe\n"
8786
" password=1essobV10us\n"
8787
" \n"
8788
" [DEFAULT]\n"
8789
" # Our local user is barbaz, on all remote sites we're known as "
8790
"foobar\n"
8791
" user=foobar"
8792
msgstr ""
8793
8794
#: en/help_topics/authentication.txt:164
8795
msgid ""
8796
"\n"
8797
"Source hosting provider\n"
8798
"~~~~~~~~~~~~~~~~~~~~~~~"
8799
msgstr ""
8800
8801
#: en/help_topics/authentication.txt:168
8802
msgid "In the shp.net (fictitious) domain, each project has its own site::"
8803
msgstr ""
8804
8805
#: en/help_topics/authentication.txt:170
8806
msgid ""
8807
" [shpnet domain]\n"
8808
" # we use sftp, but ssh is the scheme used for authentication\n"
8809
" scheme=ssh\n"
8810
" # The leading '.' ensures that 'shp.net' alone doesn't match\n"
8811
" host=.shp.net\n"
8812
" user=joe\n"
8813
" # bzr don't support supplying a password for sftp,\n"
8814
" # consider using an ssh agent if you don't want to supply\n"
8815
" # a password interactively. (pageant, ssh-agent, etc)"
8816
msgstr ""
8817
8818
#: en/help_topics/authentication.txt:180
8819
msgid ""
8820
"HTTPS, SFTP servers and their proxy\n"
8821
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
8822
msgstr ""
8823
8824
#: en/help_topics/authentication.txt:183
8825
msgid ""
8826
"At company.com, the server hosting release and integration branches is "
8827
"behind a\n"
8828
"proxy, and the two branches use different authentication policies::"
8829
msgstr ""
8830
8831
#: en/help_topics/authentication.txt:186
8832
msgid ""
8833
" [reference code]\n"
8834
" scheme=https\n"
8835
" host=dev.company.com\n"
8836
" path=/dev\n"
8837
" user=user1\n"
8838
" password=pass1"
8839
msgstr ""
8840
8841
#: en/help_topics/authentication.txt:193
8842
msgid ""
8843
" # development branches on dev server\n"
8844
" [dev]\n"
8845
" scheme=ssh # bzr+ssh and sftp are available here\n"
8846
" host=dev.company.com\n"
8847
" path=/dev/integration\n"
8848
" user=user2\n"
8849
" \n"
8850
" # proxy\n"
8851
" [proxy]\n"
8852
" scheme=http\n"
8853
" host=proxy.company.com\n"
8854
" port=3128\n"
8855
" user=proxyuser1\n"
8856
" password=proxypass1"
8857
msgstr ""
8858
8859
#: en/help_topics/authentication.txt:208
8860
msgid ""
8861
"\n"
8862
"Planned enhancements\n"
8863
"--------------------"
8864
msgstr ""
8865
8866
#: en/help_topics/authentication.txt:212
8867
msgid ""
8868
"The following are not yet implemented but planned as parts of a work in\n"
8869
"progress:"
8870
msgstr ""
8871
8872
#: en/help_topics/authentication.txt:215
8873
msgid "* add a ``password_encoding`` field allowing:"
8874
msgstr ""
8875
8876
#: en/help_topics/authentication.txt:217
8877
msgid ""
8878
" - storing the passwords in various obfuscating encodings (base64 for one),"
8879
msgstr ""
8880
8881
#: en/help_topics/authentication.txt:219
8882
msgid " - delegate password storage to plugins (.netrc for example)."
8883
msgstr ""
8884
8885
#: en/help_topics/authentication.txt:221
8886
msgid ""
8887
"* update the credentials when the user is prompted for user or password,"
8888
msgstr ""
8889
8890
#: en/help_topics/authentication.txt:223
8891
msgid "* add a ``verify_certificates`` field for ``HTTPS``."
8892
msgstr ""
8893
8894
#: en/help_topics/authentication.txt:225
8895
msgid ""
8896
"The ``password_encoding`` and ``verify_certificates`` fields are recognized "
8897
"but\n"
8898
"ignored in the actual implementation.\n"
8899
msgstr ""
8900
8901
#: en/help_topics/bugs.txt:1
8902
msgid "Bug Tracker Settings"
8903
msgstr ""
8904
8905
#: en/help_topics/bugs.txt:3
8906
msgid ""
8907
"When making a commit, metadata about bugs fixed by that change can be\n"
8908
"recorded by using the ``--fixes`` option. For each bug marked as fixed, an\n"
8909
"entry is included in the 'bugs' revision property stating '<url> <status>'.\n"
8910
"(The only ``status`` value currently supported is ``fixed.``)"
8911
msgstr ""
8912
8913
#: en/help_topics/bugs.txt:8
8914
msgid ""
8915
"The ``--fixes`` option allows you to specify a bug tracker and a bug "
8916
"identifier\n"
8917
"rather than a full URL. This looks like::"
8918
msgstr ""
8919
8920
#: en/help_topics/bugs.txt:11
8921
msgid " bzr commit --fixes <tracker>:<id>"
8922
msgstr ""
8923
8924
#: en/help_topics/bugs.txt:13 en/help_topics/configuration.txt:410
8925
msgid "or::"
8926
msgstr ""
8927
8928
#: en/help_topics/bugs.txt:15
8929
msgid " bzr commit --fixes <id>"
8930
msgstr ""
8931
8932
#: en/help_topics/bugs.txt:17
8933
msgid ""
8934
"where \"<tracker>\" is an identifier for the bug tracker, and \"<id>\" is "
8935
"the\n"
8936
"identifier for that bug within the bugtracker, usually the bug number.\n"
8937
"If \"<tracker>\" is not specified the ``bugtracker`` set in the branch\n"
8938
"or global configuration is used."
8939
msgstr ""
8940
8941
#: en/help_topics/bugs.txt:22
8942
msgid ""
8943
"Bazaar knows about a few bug trackers that have many users. If\n"
8944
"you use one of these bug trackers then there is no setup required to\n"
8945
"use this feature, you just need to know the tracker identifier to use.\n"
8946
"These are the bugtrackers that are built in:"
8947
msgstr ""
8948
8949
#: en/help_topics/bugs.txt:27
8950
msgid ""
8951
" ============================ ============ ============\n"
8952
" URL Abbreviation Example\n"
8953
" ============================ ============ ============\n"
8954
" https://bugs.launchpad.net/ lp lp:12345\n"
8955
" http://bugs.debian.org/ deb deb:12345\n"
8956
" http://bugzilla.gnome.org/ gnome gnome:12345\n"
8957
" ============================ ============ ============"
8958
msgstr ""
8959
8960
#: en/help_topics/bugs.txt:35
8961
msgid ""
8962
"For the bug trackers not listed above configuration is required.\n"
8963
"Support for generating the URLs for any project using Bugzilla or Trac\n"
8964
"is built in, along with a template mechanism for other bugtrackers with\n"
8965
"simple URL schemes. If your bug tracker can't be described by one\n"
8966
"of the schemes described below then you can write a plugin to support\n"
8967
"it."
8968
msgstr ""
8969
8970
#: en/help_topics/bugs.txt:42
8971
msgid ""
8972
"If you use Bugzilla or Trac, then you only need to set a configuration\n"
8973
"variable which contains the base URL of the bug tracker. These options\n"
8974
"can go into ``bazaar.conf``, ``branch.conf`` or into a branch-specific\n"
8975
"configuration section in ``locations.conf``. You can set up these values\n"
8976
"for each of the projects you work on."
8977
msgstr ""
8978
8979
#: en/help_topics/bugs.txt:48
8980
msgid ""
8981
"Note: As you provide a short name for each tracker, you can specify one or\n"
8982
"more bugs in one or more trackers at commit time if you wish."
8983
msgstr ""
8984
8985
#: en/help_topics/bugs.txt:51
8986
msgid ""
8987
"Launchpad\n"
8988
"---------"
8989
msgstr ""
8990
8991
#: en/help_topics/bugs.txt:54
8992
msgid ""
8993
"Use ``bzr commit --fixes lp:2`` to record that this commit fixes bug 2."
8994
msgstr ""
8995
8996
#: en/help_topics/bugs.txt:56
8997
msgid ""
8998
"bugzilla_<tracker>_url\n"
8999
"----------------------"
9000
msgstr ""
9001
9002
#: en/help_topics/bugs.txt:59
9003
msgid ""
9004
"If present, the location of the Bugzilla bug tracker referred to by\n"
9005
"<tracker>. This option can then be used together with ``bzr commit\n"
9006
"--fixes`` to mark bugs in that tracker as being fixed by that commit. For\n"
9007
"example::"
9008
msgstr ""
9009
9010
#: en/help_topics/bugs.txt:64
9011
msgid " bugzilla_squid_url = http://bugs.squid-cache.org"
9012
msgstr ""
9013
9014
#: en/help_topics/bugs.txt:66
9015
msgid ""
9016
"would allow ``bzr commit --fixes squid:1234`` to mark Squid's bug 1234 as\n"
9017
"fixed."
9018
msgstr ""
9019
9020
#: en/help_topics/bugs.txt:69
9021
msgid ""
9022
"trac_<tracker>_url\n"
9023
"------------------"
9024
msgstr ""
9025
9026
#: en/help_topics/bugs.txt:72
9027
msgid ""
9028
"If present, the location of the Trac instance referred to by\n"
9029
"<tracker>. This option can then be used together with ``bzr commit\n"
9030
"--fixes`` to mark bugs in that tracker as being fixed by that commit. For\n"
9031
"example::"
9032
msgstr ""
9033
9034
#: en/help_topics/bugs.txt:77
9035
msgid " trac_twisted_url = http://www.twistedmatrix.com/trac"
9036
msgstr ""
9037
9038
#: en/help_topics/bugs.txt:79
9039
msgid ""
9040
"would allow ``bzr commit --fixes twisted:1234`` to mark Twisted's bug 1234 "
9041
"as\n"
9042
"fixed."
9043
msgstr ""
9044
9045
#: en/help_topics/bugs.txt:82
9046
msgid ""
9047
"bugtracker_<tracker>_url\n"
9048
"------------------------"
9049
msgstr ""
9050
9051
#: en/help_topics/bugs.txt:85
9052
msgid ""
9053
"If present, the location of a generic bug tracker instance referred to by\n"
9054
"<tracker>. The location must contain an ``{id}`` placeholder,\n"
9055
"which will be replaced by a specific bug ID. This option can then be used\n"
9056
"together with ``bzr commit --fixes`` to mark bugs in that tracker as being\n"
9057
"fixed by that commit. For example::"
9058
msgstr ""
9059
9060
#: en/help_topics/bugs.txt:91
9061
msgid " bugtracker_python_url = http://bugs.python.org/issue{id}"
9062
msgstr ""
9063
9064
#: en/help_topics/bugs.txt:93
9065
msgid ""
9066
"would allow ``bzr commit --fixes python:1234`` to mark bug 1234 in Python's\n"
9067
"Roundup bug tracker as fixed, or::"
9068
msgstr ""
9069
9070
#: en/help_topics/bugs.txt:96
9071
msgid ""
9072
" bugtracker_cpan_url = http://rt.cpan.org/Public/Bug/Display.html?id={id}"
9073
msgstr ""
9074
9075
#: en/help_topics/bugs.txt:98
9076
msgid ""
9077
"would allow ``bzr commit --fixes cpan:1234`` to mark bug 1234 in CPAN's\n"
9078
"RT bug tracker as fixed, or::"
9079
msgstr ""
9080
9081
#: en/help_topics/bugs.txt:101
9082
msgid " bugtracker_hudson_url = http://issues.hudson-ci.org/browse/{id}"
9083
msgstr ""
9084
9085
#: en/help_topics/bugs.txt:103
9086
msgid ""
9087
"would allow ``bzr commit --fixes hudson:HUDSON-1234`` to mark bug HUDSON-"
9088
"1234\n"
9089
"in Hudson's JIRA bug tracker as fixed.\n"
9090
msgstr ""
9091
9092
#: en/help_topics/commands.txt:1
9093
msgid ""
9094
"add Add specified files or directories.\n"
9095
"alias Set/unset and display aliases.\n"
9096
"annotate Show the origin of each line in a file.\n"
9097
"bash-completion Generate a shell function for bash command line "
9098
"completion.\n"
9099
" [bash_completion]\n"
9100
"bind Convert the current branch into a checkout of the "
9101
"supplied\n"
9102
" branch.\n"
9103
"branch Create a new branch that is a copy of an existing branch.\n"
9104
"branches List the branches available at the current location.\n"
9105
"break-lock Break a dead lock.\n"
9106
"cat Write the contents of a file as of a given revision to\n"
9107
" standard output.\n"
9108
"check Validate working tree structure, branch consistency and\n"
9109
" repository history.\n"
9110
"checkout Create a new checkout of an existing branch.\n"
9111
"clean-tree Remove unwanted files from working tree.\n"
9112
"commit Commit changes into a new revision.\n"
9113
"config Display, set or remove a configuration option.\n"
9114
"conflicts List files with conflicts.\n"
9115
"deleted List files deleted in the working tree.\n"
9116
"diff Show differences in the working tree, between revisions "
9117
"or\n"
9118
" branches.\n"
9119
"dpush Push into a different VCS without any custom bzr "
9120
"metadata.\n"
9121
"export Export current or past revision to a destination directory "
9122
"or\n"
9123
" archive.\n"
9124
"grep Print lines matching PATTERN for specified files and\n"
9125
" revisions. [grep]\n"
9126
"help Show help on a command or other topic.\n"
9127
"ignore Ignore specified files or patterns.\n"
9128
"ignored List ignored files and the patterns that matched them.\n"
9129
"info Show information about a working tree, branch or "
9130
"repository.\n"
9131
"init Make a directory into a versioned branch.\n"
9132
"init-repository Create a shared repository for branches to share storage\n"
9133
" space.\n"
9134
"join Combine a tree into its containing tree.\n"
9135
"launchpad-login Show or set the Launchpad user ID. [launchpad]\n"
9136
"launchpad-mirror Ask Launchpad to mirror a branch now. [launchpad]\n"
9137
"launchpad-open Open a Launchpad branch page in your web browser. "
9138
"[launchpad]\n"
9139
"log Show historical log for a branch or subset of a branch.\n"
9140
"lp-find-proposal Find the proposal to merge this revision. [launchpad]\n"
9141
"lp-propose-merge Propose merging a branch on Launchpad. [launchpad]\n"
9142
"ls List files in a tree.\n"
9143
"merge Perform a three-way merge.\n"
9144
"missing Show unmerged/unpulled revisions between two branches.\n"
9145
"mkdir Create a new versioned directory.\n"
9146
"mv Move or rename a file.\n"
9147
"nick Print or set the branch nickname.\n"
9148
"pack Compress the data within a repository.\n"
9149
"ping Pings a Bazaar smart server.\n"
9150
"plugins List the installed plugins.\n"
9151
"pull Turn this branch into a mirror of another branch.\n"
9152
"push Update a mirror of this branch.\n"
9153
"reconcile Reconcile bzr metadata in a branch.\n"
9154
"reconfigure Reconfigure the type of a bzr directory.\n"
9155
"register-branch Register a branch with launchpad.net. [launchpad]\n"
9156
"remerge Redo a merge.\n"
9157
"remove Remove files or directories.\n"
9158
"remove-branch Remove a branch.\n"
9159
"remove-tree Remove the working tree from a given branch/checkout.\n"
9160
"renames Show list of renamed files.\n"
9161
"resolve Mark a conflict as resolved.\n"
9162
"revert Set files in the working tree back to the contents of a\n"
9163
" previous revision.\n"
9164
"revno Show current revision number.\n"
9165
"root Show the tree root directory.\n"
9166
"send Mail or create a merge-directive for submitting changes.\n"
9167
"serve Run the bzr server.\n"
9168
"shelve Temporarily set aside some changes from the current tree.\n"
9169
"sign-my-commits Sign all commits by a given committer.\n"
9170
"split Split a subdirectory of a tree into a separate tree.\n"
9171
"status Display status summary.\n"
9172
"switch Set the branch of a checkout and update.\n"
9173
"tag Create, remove or modify a tag naming a revision.\n"
9174
"tags List tags.\n"
9175
"testament Show testament (signing-form) of a revision.\n"
9176
"unbind Convert the current checkout into a regular branch.\n"
9177
"uncommit Remove the last committed revision.\n"
9178
"unshelve Restore shelved changes.\n"
9179
"update Update a working tree to a new revision.\n"
9180
"upgrade Upgrade a repository, branch or working tree to a newer\n"
9181
" format.\n"
9182
"verify-signatures Verify all commit signatures.\n"
9183
"version Show version of bzr.\n"
9184
"version-info Show version information about this tree.\n"
9185
"view Manage filtered views.\n"
9186
"whoami Show or set bzr user id.\n"
9187
msgstr ""
9188
9189
#: en/help_topics/configuration.txt:1
9190
msgid ""
9191
"Configuration Settings\n"
9192
"======================="
9193
msgstr ""
9194
9195
#: en/help_topics/configuration.txt:4
9196
msgid ""
9197
"Environment settings\n"
9198
"---------------------"
9199
msgstr ""
9200
9201
#: en/help_topics/configuration.txt:7
9202
msgid ""
9203
"While most configuration is handled by configuration files, some options\n"
9204
"which may be semi-permanent can also be controlled through the environment."
9205
msgstr ""
9206
9207
#: en/help_topics/configuration.txt:10
9208
msgid ""
9209
"BZR_EMAIL\n"
9210
"~~~~~~~~~"
9211
msgstr ""
9212
9213
#: en/help_topics/configuration.txt:13
9214
msgid "Override the email id used by Bazaar. Typical format::"
9215
msgstr ""
9216
9217
#: en/help_topics/configuration.txt:15
9218
msgid " \"John Doe <jdoe@example.com>\""
9219
msgstr ""
9220
9221
#: en/help_topics/configuration.txt:17
9222
msgid "See also the ``email`` configuration option."
9223
msgstr ""
9224
9225
#: en/help_topics/configuration.txt:19
9226
msgid ""
9227
"BZR_PROGRESS_BAR\n"
9228
"~~~~~~~~~~~~~~~~"
9229
msgstr ""
9230
9231
#: en/help_topics/configuration.txt:22
9232
msgid ""
9233
"Override the progress display. Possible values are \"none\" or \"text\". "
9234
"If\n"
9235
"the value is \"none\" then no progress bar is displayed. The value \"text\" "
9236
"draws\n"
9237
"the ordinary command line progress bar."
9238
msgstr ""
9239
9240
#: en/help_topics/configuration.txt:26
9241
msgid ""
9242
"BZR_SIGQUIT_PDB\n"
9243
"~~~~~~~~~~~~~~~"
9244
msgstr ""
9245
9246
#: en/help_topics/configuration.txt:29
9247
msgid ""
9248
"Control whether SIGQUIT behaves normally or invokes a breakin debugger."
9249
msgstr ""
9250
9251
#: en/help_topics/configuration.txt:31
9252
msgid ""
9253
"* 0 = Standard SIGQUIT behavior (normally, exit with a core dump)\n"
9254
"* 1 = Invoke breakin debugger (default)"
9255
msgstr ""
9256
9257
#: en/help_topics/configuration.txt:34
9258
msgid ""
9259
"BZR_HOME\n"
9260
"~~~~~~~~"
9261
msgstr ""
9262
9263
#: en/help_topics/configuration.txt:37
9264
msgid "Override the home directory used by Bazaar."
9265
msgstr ""
9266
9267
#: en/help_topics/configuration.txt:39
9268
msgid ""
9269
"BZR_SSH\n"
9270
"~~~~~~~"
9271
msgstr ""
9272
9273
#: en/help_topics/configuration.txt:42
9274
msgid "Select a different SSH implementation."
9275
msgstr ""
9276
9277
#: en/help_topics/configuration.txt:44
9278
msgid ""
9279
"BZR_PDB\n"
9280
"~~~~~~~"
9281
msgstr ""
9282
9283
#: en/help_topics/configuration.txt:47
9284
msgid "Control whether to launch a debugger on error."
9285
msgstr ""
9286
9287
#: en/help_topics/configuration.txt:49
9288
msgid ""
9289
"* 0 = Standard behavior\n"
9290
"* 1 = Launch debugger"
9291
msgstr ""
9292
9293
#: en/help_topics/configuration.txt:52
9294
msgid ""
9295
"BZR_REMOTE_PATH\n"
9296
"~~~~~~~~~~~~~~~"
9297
msgstr ""
9298
9299
#: en/help_topics/configuration.txt:55
9300
msgid "Path to the Bazaar executable to use when using the bzr+ssh protocol."
9301
msgstr ""
9302
9303
#: en/help_topics/configuration.txt:57
9304
msgid "See also the ``bzr_remote_path`` configuration option."
9305
msgstr ""
9306
9307
#: en/help_topics/configuration.txt:59
9308
msgid ""
9309
"BZR_EDITOR\n"
9310
"~~~~~~~~~~"
9311
msgstr ""
9312
9313
#: en/help_topics/configuration.txt:62
9314
msgid "Path to the editor Bazaar should use for commit messages, etc."
9315
msgstr ""
9316
9317
#: en/help_topics/configuration.txt:64
9318
msgid ""
9319
"BZR_LOG\n"
9320
"~~~~~~~"
9321
msgstr ""
9322
9323
#: en/help_topics/configuration.txt:67
9324
msgid ""
9325
"Location of the Bazaar log file. You can check the current location by\n"
9326
"running ``bzr version``."
9327
msgstr ""
9328
9329
#: en/help_topics/configuration.txt:70
9330
msgid ""
9331
"The log file contains debug information that is useful for diagnosing or\n"
9332
"reporting problems with Bazaar."
9333
msgstr ""
9334
9335
#: en/help_topics/configuration.txt:73
9336
msgid ""
9337
"Setting this to ``NUL`` on Windows or ``/dev/null`` on other platforms\n"
9338
"will disable logging."
9339
msgstr ""
9340
9341
#: en/help_topics/configuration.txt:76
9342
msgid ""
9343
"\n"
9344
"BZR_PLUGIN_PATH\n"
9345
"~~~~~~~~~~~~~~~"
9346
msgstr ""
9347
9348
#: en/help_topics/configuration.txt:80
9349
msgid ""
9350
"The path to the plugins directory that Bazaar should use.\n"
9351
"If not set, Bazaar will search for plugins in:"
9352
msgstr ""
9353
9354
#: en/help_topics/configuration.txt:83
9355
msgid ""
9356
"* the user specific plugin directory (containing the ``user`` plugins),"
9357
msgstr ""
9358
9359
#: en/help_topics/configuration.txt:85
9360
msgid "* the bzrlib directory (containing the ``core`` plugins),"
9361
msgstr ""
9362
9363
#: en/help_topics/configuration.txt:87
9364
msgid ""
9365
"* the site specific plugin directory if applicable (containing\n"
9366
" the ``site`` plugins)."
9367
msgstr ""
9368
9369
#: en/help_topics/configuration.txt:90
9370
msgid ""
9371
"If ``BZR_PLUGIN_PATH`` is set in any fashion, it will change the\n"
9372
"the way the plugin are searched. "
9373
msgstr ""
9374
9375
#: en/help_topics/configuration.txt:93
9376
msgid ""
9377
"As for the ``PATH`` variables, if multiple directories are\n"
9378
"specified in ``BZR_PLUGIN_PATH`` they should be separated by the\n"
9379
"platform specific appropriate character (':' on Unix,\n"
9380
"';' on windows)"
9381
msgstr ""
9382
9383
#: en/help_topics/configuration.txt:98
9384
msgid ""
9385
"By default if ``BZR_PLUGIN_PATH`` is set, it replaces searching\n"
9386
"in ``user``. However it will continue to search in ``core`` and\n"
9387
"``site`` unless they are explicitly removed."
9388
msgstr ""
9389
9390
#: en/help_topics/configuration.txt:102
9391
msgid ""
9392
"If you need to change the order or remove one of these\n"
9393
"directories, you should use special values:"
9394
msgstr ""
9395
9396
#: en/help_topics/configuration.txt:105
9397
msgid ""
9398
"* ``-user``, ``-core``, ``-site`` will remove the corresponding\n"
9399
" path from the default values,"
9400
msgstr ""
9401
9402
#: en/help_topics/configuration.txt:108
9403
msgid ""
9404
"* ``+user``, ``+core``, ``+site`` will add the corresponding path\n"
9405
" before the remaining default values (and also remove it from\n"
9406
" the default values)."
9407
msgstr ""
9408
9409
#: en/help_topics/configuration.txt:112
9410
msgid ""
9411
"Note that the special values 'user', 'core' and 'site' should be\n"
9412
"used literally, they will be substituted by the corresponding,\n"
9413
"platform specific, values."
9414
msgstr ""
9415
9416
#: en/help_topics/configuration.txt:116
9417
msgid ""
9418
"The examples below use ':' as the separator, windows users\n"
9419
"should use ';'."
9420
msgstr ""
9421
9422
#: en/help_topics/configuration.txt:119
9423
msgid "Overriding the default user plugin directory::"
9424
msgstr ""
9425
9426
#: en/help_topics/configuration.txt:121
9427
msgid " BZR_PLUGIN_PATH='/path/to/my/other/plugins'"
9428
msgstr ""
9429
9430
#: en/help_topics/configuration.txt:123
9431
msgid "Disabling the site directory while retaining the user directory::"
9432
msgstr ""
9433
9434
#: en/help_topics/configuration.txt:125
9435
msgid " BZR_PLUGIN_PATH='-site:+user'"
9436
msgstr ""
9437
9438
#: en/help_topics/configuration.txt:127
9439
msgid "Disabling all plugins (better achieved with --no-plugins)::"
9440
msgstr ""
9441
9442
#: en/help_topics/configuration.txt:129
9443
msgid " BZR_PLUGIN_PATH='-user:-core:-site'"
9444
msgstr ""
9445
9446
#: en/help_topics/configuration.txt:131
9447
msgid "Overriding the default site plugin directory::"
9448
msgstr ""
9449
9450
#: en/help_topics/configuration.txt:133
9451
msgid " BZR_PLUGIN_PATH='/path/to/my/site/plugins:-site':+user"
9452
msgstr ""
9453
9454
#: en/help_topics/configuration.txt:135
9455
msgid ""
9456
"BZR_DISABLE_PLUGINS\n"
9457
"~~~~~~~~~~~~~~~~~~~"
9458
msgstr ""
9459
9460
#: en/help_topics/configuration.txt:138
9461
msgid ""
9462
"Under special circumstances (mostly when trying to diagnose a\n"
9463
"bug), it's better to disable a plugin (or several) rather than\n"
9464
"uninstalling them completely. Such plugins can be specified in\n"
9465
"the ``BZR_DISABLE_PLUGINS`` environment variable."
9466
msgstr ""
9467
9468
#: en/help_topics/configuration.txt:143
9469
msgid ""
9470
"In that case, ``bzr`` will stop loading the specified plugins and\n"
9471
"will raise an import error if they are explicitly imported (by\n"
9472
"another plugin that depends on them for example)."
9473
msgstr ""
9474
9475
#: en/help_topics/configuration.txt:147
9476
msgid "Disabling ``myplugin`` and ``yourplugin`` is achieved by::"
9477
msgstr ""
9478
9479
#: en/help_topics/configuration.txt:149
9480
msgid " BZR_DISABLE_PLUGINS='myplugin:yourplugin'"
9481
msgstr ""
9482
9483
#: en/help_topics/configuration.txt:151
9484
msgid ""
9485
"BZR_PLUGINS_AT\n"
9486
"~~~~~~~~~~~~~~"
9487
msgstr ""
9488
9489
#: en/help_topics/configuration.txt:154
9490
msgid ""
9491
"When adding a new feature or working on a bug in a plugin,\n"
9492
"developers often need to use a specific version of a given\n"
9493
"plugin. Since python requires that the directory containing the\n"
9494
"code is named like the plugin itself this make it impossible to\n"
9495
"use arbitrary directory names (using a two-level directory scheme\n"
9496
"is inconvenient). ``BZR_PLUGINS_AT`` allows such directories even\n"
9497
"if they don't appear in ``BZR_PLUGIN_PATH`` ."
9498
msgstr ""
9499
9500
#: en/help_topics/configuration.txt:162
9501
msgid ""
9502
"Plugins specified in this environment variable takes precedence\n"
9503
"over the ones in ``BZR_PLUGIN_PATH``."
9504
msgstr ""
9505
9506
#: en/help_topics/configuration.txt:165
9507
msgid ""
9508
"The variable specified a list of ``plugin_name@plugin path``,\n"
9509
"``plugin_name`` being the name of the plugin as it appears in\n"
9510
"python module paths, ``plugin_path`` being the path to the\n"
9511
"directory containing the plugin code itself\n"
9512
"(i.e. ``plugins/myplugin`` not ``plugins``). Use ':' as the list\n"
9513
"separator, use ';' on windows."
9514
msgstr ""
9515
9516
#: en/help_topics/configuration.txt:172
9517
msgid ""
9518
"Example:\n"
9519
"~~~~~~~~"
9520
msgstr ""
9521
9522
#: en/help_topics/configuration.txt:175
9523
msgid ""
9524
"Using a specific version of ``myplugin``:\n"
9525
"``BZR_PLUGINS_AT='myplugin@/home/me/bugfixes/123456-myplugin``"
9526
msgstr ""
9527
9528
#: en/help_topics/configuration.txt:178
9529
msgid ""
9530
"BZRPATH\n"
9531
"~~~~~~~"
9532
msgstr ""
9533
9534
#: en/help_topics/configuration.txt:181
9535
msgid "The path where Bazaar should look for shell plugin external commands."
9536
msgstr ""
9537
9538
#: en/help_topics/configuration.txt:183
9539
msgid ""
9540
"\n"
9541
"http_proxy, https_proxy\n"
9542
"~~~~~~~~~~~~~~~~~~~~~~~"
9543
msgstr ""
9544
9545
#: en/help_topics/configuration.txt:187
9546
msgid "Specifies the network proxy for outgoing connections, for example::"
9547
msgstr ""
9548
9549
#: en/help_topics/configuration.txt:189
9550
msgid ""
9551
" http_proxy=http://proxy.example.com:3128/ \n"
9552
" https_proxy=http://proxy.example.com:3128/"
9553
msgstr ""
9554
9555
#: en/help_topics/configuration.txt:192
9556
msgid ""
9557
"\n"
9558
"Configuration files\n"
9559
"-------------------"
9560
msgstr ""
9561
9562
#: en/help_topics/configuration.txt:196
9563
msgid ""
9564
"Location\n"
9565
"~~~~~~~~"
9566
msgstr ""
9567
9568
#: en/help_topics/configuration.txt:199
9569
msgid ""
9570
"Configuration files are located in ``$HOME/.bazaar`` on Unix and\n"
9571
"``C:\\Documents and Settings\\<username>\\Application Data\\Bazaar\\2.0`` "
9572
"on\n"
9573
"Windows. (You can check the location for your system by using\n"
9574
"``bzr version``.)"
9575
msgstr ""
9576
9577
#: en/help_topics/configuration.txt:204
9578
msgid "There are three primary configuration files in this location:"
9579
msgstr ""
9580
9581
#: en/help_topics/configuration.txt:206
9582
msgid "* ``bazaar.conf`` describes default configuration options,"
9583
msgstr ""
9584
9585
#: en/help_topics/configuration.txt:208
9586
msgid ""
9587
"* ``locations.conf`` describes configuration information for\n"
9588
" specific branch locations,"
9589
msgstr ""
9590
9591
#: en/help_topics/configuration.txt:211
9592
msgid ""
9593
"* ``authentication.conf`` describes credential information for\n"
9594
" remote servers."
9595
msgstr ""
9596
9597
#: en/help_topics/configuration.txt:214
9598
msgid ""
9599
"Each branch can also contain a configuration file that sets values specific\n"
9600
"to that branch. This file is found at ``.bzr/branch/branch.conf`` within "
9601
"the\n"
9602
"branch. This file is visible to all users of a branch, if you wish to "
9603
"override\n"
9604
"one of the values for a branch with a setting that is specific to you then "
9605
"you\n"
9606
"can do so in ``locations.conf``."
9607
msgstr ""
9608
9609
#: en/help_topics/configuration.txt:220
9610
msgid ""
9611
"General format\n"
9612
"~~~~~~~~~~~~~~"
9613
msgstr ""
9614
9615
#: en/help_topics/configuration.txt:223
9616
msgid ""
9617
"An ini file has three types of contructs: section headers, section\n"
9618
"options and comments."
9619
msgstr ""
9620
9621
#: en/help_topics/configuration.txt:226
9622
msgid ""
9623
"Comments\n"
9624
"^^^^^^^^"
9625
msgstr ""
9626
9627
#: en/help_topics/configuration.txt:229
9628
msgid ""
9629
"A comment is any line that starts with a \"#\" (sometimes called a \"hash\n"
9630
"mark\", \"pound sign\" or \"number sign\"). Comment lines are ignored by\n"
9631
"Bazaar when parsing ini files."
9632
msgstr ""
9633
9634
#: en/help_topics/configuration.txt:233
9635
msgid ""
9636
"Section headers\n"
9637
"^^^^^^^^^^^^^^^"
9638
msgstr ""
9639
9640
#: en/help_topics/configuration.txt:236
9641
msgid ""
9642
"A section header is a word enclosed in brackets that starts at the begining\n"
9643
"of a line. A typical section header looks like this::"
9644
msgstr ""
9645
9646
#: en/help_topics/configuration.txt:239
9647
msgid " [DEFAULT]"
9648
msgstr ""
9649
9650
#: en/help_topics/configuration.txt:241
9651
msgid ""
9652
"The only valid section headers for bazaar.conf currently are [DEFAULT] and\n"
9653
"[ALIASES]. Section headers are case sensitive. The default section provides "
9654
"for\n"
9655
"setting options which can be overridden with the branch config file."
9656
msgstr ""
9657
9658
#: en/help_topics/configuration.txt:245
9659
msgid ""
9660
"For ``locations.conf``, the options from the section with the\n"
9661
"longest matching section header are used to the exclusion of other\n"
9662
"potentially valid section headers. A section header uses the path for\n"
9663
"the branch as the section header. Some examples include::"
9664
msgstr ""
9665
9666
#: en/help_topics/configuration.txt:250
9667
msgid ""
9668
" [http://mybranches.isp.com/~jdoe/branchdir]\n"
9669
" [/home/jdoe/branches/]"
9670
msgstr ""
9671
9672
#: en/help_topics/configuration.txt:253
9673
msgid ""
9674
"\n"
9675
"Section options\n"
9676
"^^^^^^^^^^^^^^^"
9677
msgstr ""
9678
9679
#: en/help_topics/configuration.txt:257
9680
msgid ""
9681
"A section option resides within a section. A section option contains an\n"
9682
"option name, an equals sign and a value. For example::"
9683
msgstr ""
9684
9685
#: en/help_topics/configuration.txt:260
9686
msgid ""
9687
" email = John Doe <jdoe@isp.com>\n"
9688
" gpg_signing_key = Amy Pond <amy@example.com>"
9689
msgstr ""
9690
9691
#: en/help_topics/configuration.txt:263
9692
msgid ""
9693
"A option can reference other options by enclosing them in curly brackets::"
9694
msgstr ""
9695
9696
#: en/help_topics/configuration.txt:265
9697
msgid ""
9698
" my_branch_name = feature_x\n"
9699
" my_server = bzr+ssh://example.com\n"
9700
" push_location = {my_server}/project/{my_branch_name}"
9701
msgstr ""
9702
9703
#: en/help_topics/configuration.txt:269
9704
msgid ""
9705
"Option policies\n"
9706
"^^^^^^^^^^^^^^^"
9707
msgstr ""
9708
9709
#: en/help_topics/configuration.txt:272
9710
msgid ""
9711
"Options defined in a section affect the named directory or URL plus\n"
9712
"any locations they contain. Policies can be used to change how an\n"
9713
"option value is interpreted for contained locations. Currently\n"
9714
"there are three policies available:"
9715
msgstr ""
9716
9717
#: en/help_topics/configuration.txt:277
9718
msgid ""
9719
" none:\n"
9720
" the value is interpreted the same for contained locations. This is\n"
9721
" the default behaviour.\n"
9722
" norecurse:\n"
9723
" the value is only used for the exact location specified by the\n"
9724
" section name.\n"
9725
" appendpath:\n"
9726
" for contained locations, any additional path components are\n"
9727
" appended to the value."
9728
msgstr ""
9729
9730
#: en/help_topics/configuration.txt:287
9731
msgid ""
9732
"Policies are specified by keys with names of the form "
9733
"\"<option_name>:policy\".\n"
9734
"For example, to define the push location for a tree of branches, the\n"
9735
"following could be used::"
9736
msgstr ""
9737
9738
#: en/help_topics/configuration.txt:291
9739
msgid ""
9740
" [/top/location]\n"
9741
" push_location = sftp://example.com/location\n"
9742
" push_location:policy = appendpath"
9743
msgstr ""
9744
9745
#: en/help_topics/configuration.txt:295
9746
msgid ""
9747
"With this configuration, the push location for ``/top/location/branch1``\n"
9748
"would be ``sftp://example.com/location/branch1``."
9749
msgstr ""
9750
9751
#: en/help_topics/configuration.txt:298
9752
msgid ""
9753
"Section local options\n"
9754
"^^^^^^^^^^^^^^^^^^^^^"
9755
msgstr ""
9756
9757
#: en/help_topics/configuration.txt:301
9758
msgid ""
9759
"Some options are defined automatically inside a given section and can be\n"
9760
"refered to in this section only. "
9761
msgstr ""
9762
9763
#: en/help_topics/configuration.txt:304
9764
msgid "For example, the ``appendpath`` policy can be used like this::"
9765
msgstr ""
9766
9767
#: en/help_topics/configuration.txt:306
9768
msgid ""
9769
" [/home/vila/src/bzr/bugs]\n"
9770
" mypush = lp:~vila/bzr\n"
9771
" mypush:policy=appendpath"
9772
msgstr ""
9773
9774
#: en/help_topics/configuration.txt:310
9775
msgid "Using ``relpath`` to achieve the same result is done like this::"
9776
msgstr ""
9777
9778
#: en/help_topics/configuration.txt:312
9779
msgid ""
9780
" [/home/vila/src/bzr/bugs]\n"
9781
" mypush = lp:~vila/bzr/{relpath}"
9782
msgstr ""
9783
9784
#: en/help_topics/configuration.txt:315
9785
msgid ""
9786
"In both cases, when used in a directory like\n"
9787
"``/home/vila/src/bzr/bugs/832013-expand-in-stack`` we'll get::"
9788
msgstr ""
9789
9790
#: en/help_topics/configuration.txt:318 en/help_topics/configuration.txt:329
9791
msgid ""
9792
" $ bzr config mypush\n"
9793
" lp:~vila/bzr/832013-expand-in-stack"
9794
msgstr ""
9795
9796
#: en/help_topics/configuration.txt:321
9797
msgid "Another such option is ``basename`` which can be used like this::"
9798
msgstr ""
9799
9800
#: en/help_topics/configuration.txt:323
9801
msgid ""
9802
" [/home/vila/src/bzr]\n"
9803
" mypush = lp:~vila/bzr/{basename}"
9804
msgstr ""
9805
9806
#: en/help_topics/configuration.txt:326
9807
msgid ""
9808
"When used in a directory like\n"
9809
"``/home/vila/src/bzr/bugs/832013-expand-in-stack`` we'll get::"
9810
msgstr ""
9811
9812
#: en/help_topics/configuration.txt:332
9813
msgid ""
9814
"Note that ``basename`` here refers to the base name of ``relpath`` which\n"
9815
"itself is defined as the relative path between the section name and the\n"
9816
"location it matches."
9817
msgstr ""
9818
9819
#: en/help_topics/configuration.txt:336
9820
msgid ""
9821
"Another such option is ``branchname``, which refers to the name of a "
9822
"colocated\n"
9823
"branch. For non-colocated branches, it behaves like basename. It can be "
9824
"used\n"
9825
"like this::"
9826
msgstr ""
9827
9828
#: en/help_topics/configuration.txt:340
9829
msgid ""
9830
" [/home/vila/src/bzr/bugs]\n"
9831
" mypush = lp:~vila/bzr/{branchname}"
9832
msgstr ""
9833
9834
#: en/help_topics/configuration.txt:343
9835
msgid ""
9836
"When used with a colocated branch named ``832013-expand-in-stack``, we'll "
9837
"get::"
9838
msgstr ""
9839
9840
#: en/help_topics/configuration.txt:345
9841
msgid ""
9842
" bzr config mypush\n"
9843
" lp:~vila/bzr/832013-expand-in-stack"
9844
msgstr ""
9845
9846
#: en/help_topics/configuration.txt:348
9847
msgid ""
9848
"When an option is local to a Section, it cannot be referred to from option\n"
9849
"values in any other section from the same ``Store`` nor from any other\n"
9850
"``Store``."
9851
msgstr ""
9852
9853
#: en/help_topics/configuration.txt:352
9854
msgid ""
9855
"\n"
9856
"The main configuration file, bazaar.conf\n"
9857
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
9858
msgstr ""
9859
9860
#: en/help_topics/configuration.txt:356
9861
msgid ""
9862
"``bazaar.conf`` allows two sections: ``[DEFAULT]`` and ``[ALIASES]``.\n"
9863
"The default section contains the default\n"
9864
"configuration options for all branches. The default section can be\n"
9865
"overriden by providing a branch-specific section in ``locations.conf``."
9866
msgstr ""
9867
9868
#: en/help_topics/configuration.txt:361
9869
msgid "A typical ``bazaar.conf`` section often looks like the following::"
9870
msgstr ""
9871
9872
#: en/help_topics/configuration.txt:363
9873
msgid ""
9874
" [DEFAULT]\n"
9875
" email = John Doe <jdoe@isp.com>\n"
9876
" editor = /usr/bin/vim\n"
9877
" create_signatures = when-required"
9878
msgstr ""
9879
9880
#: en/help_topics/configuration.txt:368
9881
msgid ""
9882
"\n"
9883
"The branch location configuration file, locations.conf\n"
9884
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
9885
msgstr ""
9886
9887
#: en/help_topics/configuration.txt:372
9888
msgid ""
9889
"``locations.conf`` allows one to specify overriding settings for\n"
9890
"a specific branch. The format is almost identical to the default section in\n"
9891
"bazaar.conf with one significant change: The section header, instead of "
9892
"saying\n"
9893
"default, will be the path to a branch that you wish to override a value\n"
9894
"for. The '?' and '*' wildcards are supported::"
9895
msgstr ""
9896
9897
#: en/help_topics/configuration.txt:378
9898
msgid ""
9899
" [/home/jdoe/branches/nethack]\n"
9900
" email = Nethack Admin <nethack@nethack.com>"
9901
msgstr ""
9902
9903
#: en/help_topics/configuration.txt:381
9904
msgid ""
9905
" [http://hypothetical.site.com/branches/devel-branch]\n"
9906
" create_signatures = always"
9907
msgstr ""
9908
9909
#: en/help_topics/configuration.txt:384
9910
msgid ""
9911
"The authentication configuration file, authentication.conf\n"
9912
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
9913
msgstr ""
9914
9915
#: en/help_topics/configuration.txt:387
9916
msgid ""
9917
"``authentication.conf`` allows one to specify credentials for\n"
9918
"remote servers. This can be used for all the supported transports and any "
9919
"part\n"
9920
"of bzr that requires authentication (smtp for example)."
9921
msgstr ""
9922
9923
#: en/help_topics/configuration.txt:391
9924
msgid ""
9925
"The syntax of the file obeys the same rules as the others except for the\n"
9926
"option policies which don't apply."
9927
msgstr ""
9928
9929
#: en/help_topics/configuration.txt:394
9930
msgid ""
9931
"For more information on the possible uses of the authentication "
9932
"configuration\n"
9933
"file see :doc:`authentication-help`."
9934
msgstr ""
9935
9936
#: en/help_topics/configuration.txt:397
9937
msgid ""
9938
"\n"
9939
"Common options\n"
9940
"--------------"
9941
msgstr ""
9942
9943
#: en/help_topics/configuration.txt:401
9944
msgid ""
9945
"debug_flags\n"
9946
"~~~~~~~~~~~"
9947
msgstr ""
9948
9949
#: en/help_topics/configuration.txt:404
9950
msgid ""
9951
"A comma-separated list of debugging options to turn on. The same values\n"
9952
"can be used as with the -D command-line option (see `help global-options`).\n"
9953
"For example::"
9954
msgstr ""
9955
9956
#: en/help_topics/configuration.txt:408
9957
msgid " debug_flags = hpss"
9958
msgstr ""
9959
9960
#: en/help_topics/configuration.txt:412
9961
msgid " debug_flags = hpss,evil"
9962
msgstr ""
9963
9964
#: en/help_topics/configuration.txt:414
9965
msgid ""
9966
"email\n"
9967
"~~~~~"
9968
msgstr ""
9969
9970
#: en/help_topics/configuration.txt:417
9971
msgid ""
9972
"The email address to use when committing a branch. Typically takes the form\n"
9973
"of::"
9974
msgstr ""
9975
9976
#: en/help_topics/configuration.txt:420
9977
msgid " email = Full Name <account@hostname.tld>"
9978
msgstr ""
9979
9980
#: en/help_topics/configuration.txt:422
9981
msgid ""
9982
"editor\n"
9983
"~~~~~~"
9984
msgstr ""
9985
9986
#: en/help_topics/configuration.txt:425
9987
msgid ""
9988
"The path of the editor that you wish to use if *bzr commit* is run without\n"
9989
"a commit message. This setting is trumped by the environment variable\n"
9990
"``BZR_EDITOR``, and overrides the ``VISUAL`` and ``EDITOR`` environment\n"
9991
"variables."
9992
msgstr ""
9993
9994
#: en/help_topics/configuration.txt:430
9995
msgid ""
9996
"log_format\n"
9997
"~~~~~~~~~~"
9998
msgstr ""
9999
10000
#: en/help_topics/configuration.txt:433
10001
msgid ""
10002
"The default log format to use. Standard log formats are ``long``, ``short``\n"
10003
"and ``line``. Additional formats may be provided by plugins. The default\n"
10004
"value is ``long``."
10005
msgstr ""
10006
10007
#: en/help_topics/configuration.txt:437
10008
msgid ""
10009
"check_signatures\n"
10010
"~~~~~~~~~~~~~~~~"
10011
msgstr ""
10012
10013
#: en/help_topics/configuration.txt:440
10014
msgid ""
10015
"Reserved for future use. These options will allow a policy for branches to\n"
10016
"require signatures."
10017
msgstr ""
10018
10019
#: en/help_topics/configuration.txt:443
10020
msgid ""
10021
"require\n"
10022
" The gnupg signature for revisions must be present and must be valid."
10023
msgstr ""
10024
10025
#: en/help_topics/configuration.txt:446
10026
msgid ""
10027
"ignore\n"
10028
" Do not check gnupg signatures of revisions."
10029
msgstr ""
10030
10031
#: en/help_topics/configuration.txt:449
10032
msgid ""
10033
"check-available\n"
10034
" (default) If gnupg signatures for revisions are present, check them.\n"
10035
" Bazaar will fail if it finds a bad signature, but will not fail if\n"
10036
" no signature is present."
10037
msgstr ""
10038
10039
#: en/help_topics/configuration.txt:454
10040
msgid ""
10041
"create_signatures\n"
10042
"~~~~~~~~~~~~~~~~~"
10043
msgstr ""
10044
10045
#: en/help_topics/configuration.txt:457
10046
msgid ""
10047
"Defines the behaviour of signing revisions on commits. By default bzr will "
10048
"not\n"
10049
"sign new commits."
10050
msgstr ""
10051
10052
#: en/help_topics/configuration.txt:460
10053
msgid ""
10054
"always\n"
10055
" Sign every new revision that is committed. If the signing fails then "
10056
"the\n"
10057
" commit will not be made."
10058
msgstr ""
10059
10060
#: en/help_topics/configuration.txt:464
10061
msgid ""
10062
"when-required\n"
10063
" Reserved for future use."
10064
msgstr ""
10065
10066
#: en/help_topics/configuration.txt:467
10067
msgid ""
10068
"never\n"
10069
" Reserved for future use."
10070
msgstr ""
10071
10072
#: en/help_topics/configuration.txt:470
10073
msgid ""
10074
"In future it is planned that ``when-required`` will sign newly\n"
10075
"committed revisions only when the branch requires them. ``never`` will "
10076
"refuse\n"
10077
"to sign newly committed revisions, even if the branch requires signatures."
10078
msgstr ""
10079
10080
#: en/help_topics/configuration.txt:474
10081
msgid ""
10082
"dirstate.fdatasync\n"
10083
"~~~~~~~~~~~~~~~~~~"
10084
msgstr ""
10085
10086
#: en/help_topics/configuration.txt:477
10087
msgid ""
10088
"If true (default), working tree metadata changes are flushed through the\n"
10089
"OS buffers to physical disk. This is somewhat slower, but means data\n"
10090
"should not be lost if the machine crashes. See also repository.fdatasync."
10091
msgstr ""
10092
10093
#: en/help_topics/configuration.txt:481
10094
msgid ""
10095
"gpg_signing_key\n"
10096
"~~~~~~~~~~~~~~~"
10097
msgstr ""
10098
10099
#: en/help_topics/configuration.txt:484
10100
msgid ""
10101
"The GnuPG user identity to use when signing commits. Can be an e-mail\n"
10102
"address, key fingerprint or full key ID. When unset or when set to\n"
10103
"\"default\" Bazaar will use the user e-mail set with ``whoami``."
10104
msgstr ""
10105
10106
#: en/help_topics/configuration.txt:488
10107
msgid ""
10108
"recurse\n"
10109
"~~~~~~~"
10110
msgstr ""
10111
10112
#: en/help_topics/configuration.txt:491
10113
msgid ""
10114
"Only useful in ``locations.conf``. Defines whether or not the\n"
10115
"configuration for this section applies to subdirectories:"
10116
msgstr ""
10117
10118
#: en/help_topics/configuration.txt:494
10119
msgid ""
10120
"true\n"
10121
" (default) This section applies to subdirectories as well."
10122
msgstr ""
10123
10124
#: en/help_topics/configuration.txt:497
10125
msgid ""
10126
"false\n"
10127
" This section only applies to the branch at this directory and not\n"
10128
" branches below it."
10129
msgstr ""
10130
10131
#: en/help_topics/configuration.txt:501
10132
msgid ""
10133
"gpg_signing_command\n"
10134
"~~~~~~~~~~~~~~~~~~~"
10135
msgstr ""
10136
10137
#: en/help_topics/configuration.txt:504
10138
msgid ""
10139
"(Default: \"gpg\"). Which program should be used to sign and check "
10140
"revisions.\n"
10141
"For example::"
10142
msgstr ""
10143
10144
#: en/help_topics/configuration.txt:507
10145
msgid " gpg_signing_command = /usr/bin/gnpg"
10146
msgstr ""
10147
10148
#: en/help_topics/configuration.txt:509
10149
msgid ""
10150
"The specified command must accept the options \"--clearsign\" and \"-u "
10151
"<email>\"."
10152
msgstr ""
10153
10154
#: en/help_topics/configuration.txt:511
10155
msgid ""
10156
"bzr_remote_path\n"
10157
"~~~~~~~~~~~~~~~"
10158
msgstr ""
10159
10160
#: en/help_topics/configuration.txt:514
10161
msgid ""
10162
"(Default: \"bzr\"). The path to the command that should be used to run the "
10163
"smart\n"
10164
"server for bzr. This value may only be specified in locations.conf, because:"
10165
msgstr ""
10166
10167
#: en/help_topics/configuration.txt:517
10168
msgid ""
10169
"- it's needed before branch.conf is accessible\n"
10170
"- allowing remote branch.conf files to specify commands would be a security\n"
10171
" risk"
10172
msgstr ""
10173
10174
#: en/help_topics/configuration.txt:521
10175
msgid "It is overridden by the BZR_REMOTE_PATH environment variable."
10176
msgstr ""
10177
10178
#: en/help_topics/configuration.txt:523
10179
msgid ""
10180
"smtp_server\n"
10181
"~~~~~~~~~~~"
10182
msgstr ""
10183
10184
#: en/help_topics/configuration.txt:526
10185
msgid ""
10186
"(Default: \"localhost\"). SMTP server to use when Bazaar needs to send\n"
10187
"email, eg. with ``merge-directive --mail-to``, or the bzr-email plugin."
10188
msgstr ""
10189
10190
#: en/help_topics/configuration.txt:529
10191
msgid ""
10192
"smtp_username, smtp_password\n"
10193
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
10194
msgstr ""
10195
10196
#: en/help_topics/configuration.txt:532
10197
msgid ""
10198
"User and password to authenticate to the SMTP server. If smtp_username\n"
10199
"is set, and smtp_password is not, Bazaar will prompt for a password.\n"
10200
"These settings are only needed if the SMTP server requires authentication\n"
10201
"to send mail."
10202
msgstr ""
10203
10204
#: en/help_topics/configuration.txt:537
10205
msgid ""
10206
"locks.steal_dead\n"
10207
"~~~~~~~~~~~~~~~~"
10208
msgstr ""
10209
10210
#: en/help_topics/configuration.txt:540
10211
msgid ""
10212
"If set to true, bzr will automatically break locks held by processes from\n"
10213
"the same machine and user that are no longer alive. Otherwise, it will\n"
10214
"print a message and you can break the lock manually, if you are satisfied\n"
10215
"the object is no longer in use."
10216
msgstr ""
10217
10218
#: en/help_topics/configuration.txt:545
10219
msgid ""
10220
"mail_client\n"
10221
"~~~~~~~~~~~"
10222
msgstr ""
10223
10224
#: en/help_topics/configuration.txt:548
10225
msgid ""
10226
"A mail client to use for sending merge requests.\n"
10227
"By default, bzr will try to use ``mapi`` on Windows. On other platforms, "
10228
"it\n"
10229
"will try ``xdg-email``. If either of these fails, it will fall back to\n"
10230
"``editor``."
10231
msgstr ""
10232
10233
#: en/help_topics/configuration.txt:553
10234
msgid "Supported values for specific clients:"
10235
msgstr ""
10236
10237
#: en/help_topics/configuration.txt:555
10238
msgid ""
10239
":claws: Use Claws. This skips a dialog for attaching files.\n"
10240
":evolution: Use Evolution.\n"
10241
":kmail: Use KMail.\n"
10242
":mutt: Use Mutt.\n"
10243
":thunderbird: Use Mozilla Thunderbird or Icedove. For Thunderbird/Icedove "
10244
"1.5,\n"
10245
" this works around some bugs that xdg-email doesn't handle."
10246
msgstr ""
10247
10248
#: en/help_topics/configuration.txt:562
10249
msgid "Supported generic values are:"
10250
msgstr ""
10251
10252
#: en/help_topics/configuration.txt:564
10253
msgid ""
10254
":default: See above.\n"
10255
":editor: Use your editor to compose the merge request. This also uses\n"
10256
" your commit id, (see ``bzr whoami``), smtp_server and (optionally)\n"
10257
" smtp_username and smtp_password.\n"
10258
":mapi: Use your preferred e-mail client on Windows.\n"
10259
":xdg-email: Use xdg-email to run your preferred mail program"
10260
msgstr ""
10261
10262
#: en/help_topics/configuration.txt:571
10263
msgid ""
10264
"repository.fdatasync\n"
10265
"~~~~~~~~~~~~~~~~~~~~"
10266
msgstr ""
10267
10268
#: en/help_topics/configuration.txt:574
10269
msgid ""
10270
"If true (default), repository changes are flushed through the OS buffers\n"
10271
"to physical disk. This is somewhat slower, but means data should not be\n"
10272
"lost if the machine crashes. See also dirstate.fdatasync."
10273
msgstr ""
10274
10275
#: en/help_topics/configuration.txt:578
10276
msgid ""
10277
"submit_branch\n"
10278
"~~~~~~~~~~~~~"
10279
msgstr ""
10280
10281
#: en/help_topics/configuration.txt:581
10282
msgid ""
10283
"The branch you intend to submit your current work to. This is "
10284
"automatically\n"
10285
"set by ``bzr send``, and is also used by the ``submit:`` revision spec. "
10286
"This\n"
10287
"should usually be set on a per-branch or per-location basis."
10288
msgstr ""
10289
10290
#: en/help_topics/configuration.txt:585
10291
msgid ""
10292
"public_branch\n"
10293
"~~~~~~~~~~~~~"
10294
msgstr ""
10295
10296
#: en/help_topics/configuration.txt:588
10297
msgid ""
10298
"A publically-accessible version of this branch (implying that this version "
10299
"is\n"
10300
"not publically-accessible). Used (and set) by ``bzr send``."
10301
msgstr ""
10302
10303
#: en/help_topics/configuration.txt:591
10304
msgid ""
10305
"suppress_warnings\n"
10306
"~~~~~~~~~~~~~~~~~"
10307
msgstr ""
10308
10309
#: en/help_topics/configuration.txt:594
10310
msgid ""
10311
"A list of strings, each string represent a warning that can be emitted by\n"
10312
"bzr. Mentioning a warning in this list tells bzr to not emit it."
10313
msgstr ""
10314
10315
#: en/help_topics/configuration.txt:597
10316
msgid "Valid values:"
10317
msgstr ""
10318
10319
#: en/help_topics/configuration.txt:599
10320
msgid ""
10321
"* ``format_deprecation``:\n"
10322
" whether the format deprecation warning is shown on repositories that "
10323
"are\n"
10324
" using deprecated formats."
10325
msgstr ""
10326
10327
#: en/help_topics/configuration.txt:603
10328
msgid ""
10329
"default_format\n"
10330
"~~~~~~~~~~~~~~"
10331
msgstr ""
10332
10333
#: en/help_topics/configuration.txt:606
10334
msgid ""
10335
"A format name for the default format used when creating branches. See "
10336
"``bzr\n"
10337
"help formats`` for possible values."
10338
msgstr ""
10339
10340
#: en/help_topics/configuration.txt:609
10341
msgid ""
10342
"\n"
10343
"Unicode options\n"
10344
"---------------"
10345
msgstr ""
10346
10347
#: en/help_topics/configuration.txt:613
10348
msgid ""
10349
"output_encoding\n"
10350
"~~~~~~~~~~~~~~~"
10351
msgstr ""
10352
10353
#: en/help_topics/configuration.txt:616
10354
msgid ""
10355
"A Python unicode encoding name for text output from bzr, such as log\n"
10356
"information. Values include: utf8, cp850, ascii, iso-8859-1. The default\n"
10357
"is the terminal encoding prefered by the operating system."
10358
msgstr ""
10359
10360
#: en/help_topics/configuration.txt:620
10361
msgid ""
10362
"\n"
10363
"Branch type specific options\n"
10364
"----------------------------"
10365
msgstr ""
10366
10367
#: en/help_topics/configuration.txt:624
10368
msgid ""
10369
"These options apply only to branches that use the ``dirstate-tags`` or\n"
10370
"later format. They\n"
10371
"are usually set in ``.bzr/branch/branch.conf`` automatically, but may be\n"
10372
"manually set in ``locations.conf`` or ``bazaar.conf``."
10373
msgstr ""
10374
10375
#: en/help_topics/configuration.txt:629
10376
msgid ""
10377
"append_revisions_only\n"
10378
"~~~~~~~~~~~~~~~~~~~~~"
10379
msgstr ""
10380
10381
#: en/help_topics/configuration.txt:632
10382
msgid ""
10383
"If set to \"True\" then revisions can only be appended to the log, not\n"
10384
"removed. A branch with this setting enabled can only pull from another\n"
10385
"branch if the other branch's log is a longer version of its own. This is\n"
10386
"normally set by ``bzr init --append-revisions-only``. If you set it\n"
10387
"manually, use either 'True' or 'False' (case-sensitive) to maintain\n"
10388
"compatibility with previous bzr versions (older than 2.2)."
10389
msgstr ""
10390
10391
#: en/help_topics/configuration.txt:639
10392
msgid ""
10393
"parent_location\n"
10394
"~~~~~~~~~~~~~~~"
10395
msgstr ""
10396
10397
#: en/help_topics/configuration.txt:642
10398
msgid ""
10399
"If present, the location of the default branch for pull or merge. This "
10400
"option\n"
10401
"is normally set when creating a branch, the first ``pull`` or by ``pull\n"
10402
"--remember``."
10403
msgstr ""
10404
10405
#: en/help_topics/configuration.txt:646
10406
msgid ""
10407
"push_location\n"
10408
"~~~~~~~~~~~~~"
10409
msgstr ""
10410
10411
#: en/help_topics/configuration.txt:649
10412
msgid ""
10413
"If present, the location of the default branch for push. This option\n"
10414
"is normally set by the first ``push`` or ``push --remember``."
10415
msgstr ""
10416
10417
#: en/help_topics/configuration.txt:652
10418
msgid ""
10419
"push_strict\n"
10420
"~~~~~~~~~~~"
10421
msgstr ""
10422
10423
#: en/help_topics/configuration.txt:655
10424
msgid ""
10425
"If present, defines the ``--strict`` option default value for checking\n"
10426
"uncommitted changes before pushing."
10427
msgstr ""
10428
10429
#: en/help_topics/configuration.txt:658
10430
msgid ""
10431
"dpush_strict\n"
10432
"~~~~~~~~~~~~"
10433
msgstr ""
10434
10435
#: en/help_topics/configuration.txt:661
10436
msgid ""
10437
"If present, defines the ``--strict`` option default value for checking\n"
10438
"uncommitted changes before pushing into a different VCS without any\n"
10439
"custom bzr metadata."
10440
msgstr ""
10441
10442
#: en/help_topics/configuration.txt:665
10443
msgid ""
10444
"bound_location\n"
10445
"~~~~~~~~~~~~~~"
10446
msgstr ""
10447
10448
#: en/help_topics/configuration.txt:668
10449
msgid ""
10450
"The location that commits should go to when acting as a checkout.\n"
10451
"This option is normally set by ``bind``."
10452
msgstr ""
10453
10454
#: en/help_topics/configuration.txt:671
10455
msgid ""
10456
"bound\n"
10457
"~~~~~"
10458
msgstr ""
10459
10460
#: en/help_topics/configuration.txt:674
10461
msgid ""
10462
"If set to \"True\", the branch should act as a checkout, and push each "
10463
"commit to\n"
10464
"the bound_location. This option is normally set by ``bind``/``unbind``."
10465
msgstr ""
10466
10467
#: en/help_topics/configuration.txt:677
10468
msgid ""
10469
"send_strict\n"
10470
"~~~~~~~~~~~"
10471
msgstr ""
10472
10473
#: en/help_topics/configuration.txt:680
10474
msgid ""
10475
"If present, defines the ``--strict`` option default value for checking\n"
10476
"uncommitted changes before sending a merge directive."
10477
msgstr ""
10478
10479
#: en/help_topics/configuration.txt:683
10480
msgid ""
10481
"add.maximum_file_size\n"
10482
"~~~~~~~~~~~~~~~~~~~~~"
10483
msgstr ""
10484
10485
#: en/help_topics/configuration.txt:686
10486
msgid ""
10487
"Defines the maximum file size the command line \"add\" operation will allow\n"
10488
"in recursive mode, with files larger than this value being skipped. You may "
10489
"\n"
10490
"specify this value as an integer (in which case it is interpreted as bytes), "
10491
"\n"
10492
"or you may specify the value using SI units, i.e. 10KB, 20MB, 1G. A value of "
10493
"0 \n"
10494
"will disable skipping."
10495
msgstr ""
10496
10497
#: en/help_topics/configuration.txt:692
10498
msgid ""
10499
"External Merge Tools\n"
10500
"--------------------"
10501
msgstr ""
10502
10503
#: en/help_topics/configuration.txt:695
10504
msgid ""
10505
"bzr.mergetool.<name>\n"
10506
"~~~~~~~~~~~~~~~~~~~~"
10507
msgstr ""
10508
10509
#: en/help_topics/configuration.txt:698
10510
msgid ""
10511
"Defines an external merge tool called <name> with the given command-line.\n"
10512
"Arguments containing spaces should be quoted using single or double quotes. "
10513
"The\n"
10514
"executable may omit its path if it can be found on the PATH."
10515
msgstr ""
10516
10517
#: en/help_topics/configuration.txt:702
10518
msgid ""
10519
"The following markers can be used in the command-line to substitute "
10520
"filenames\n"
10521
"involved in the merge conflict::"
10522
msgstr ""
10523
10524
#: en/help_topics/configuration.txt:705
10525
msgid ""
10526
" {base} file.BASE\n"
10527
" {this} file.THIS\n"
10528
" {other} file.OTHER\n"
10529
" {result} output file\n"
10530
" {this_temp} temp copy of file.THIS, used to overwrite output file if "
10531
"merge\n"
10532
" succeeds."
10533
msgstr ""
10534
10535
#: en/help_topics/configuration.txt:714
10536
msgid " bzr.mergetool.kdiff3 = kdiff3 {base} {this} {other} -o {result}"
10537
msgstr ""
10538
10539
#: en/help_topics/configuration.txt:716
10540
msgid ""
10541
"Because ``mergetool`` and ``config`` itself both use curly braces as\n"
10542
"interpolation markers, trying to display the mergetool line results in the\n"
10543
"following problem::"
10544
msgstr ""
10545
10546
#: en/help_topics/configuration.txt:720
10547
msgid ""
10548
"\n"
10549
" $ bzr config bzr.mergetool.kdiff3='kdiff3 {base} {this} {other} -o "
10550
"{result}'\n"
10551
" $ bzr config bzr.mergetool.kdiff3\n"
10552
" bzr: ERROR: Option base is not defined while expanding \"kdiff3 {base} "
10553
"{this} {other} -o {result}\"."
10554
msgstr ""
10555
10556
#: en/help_topics/configuration.txt:725
10557
msgid ""
10558
"To avoid this, ``config`` can be instructed not to try expanding variables::"
10559
msgstr ""
10560
10561
#: en/help_topics/configuration.txt:727
10562
msgid ""
10563
" $ bzr config --all bzr.mergetool.kdiff3\n"
10564
" branch:\n"
10565
" bzr.mergetool.kdiff3 = kdiff3 {base} {this} {other} -o {result}"
10566
msgstr ""
10567
10568
#: en/help_topics/configuration.txt:731
10569
msgid ""
10570
"\n"
10571
"bzr.default_mergetool\n"
10572
"~~~~~~~~~~~~~~~~~~~~~"
10573
msgstr ""
10574
10575
#: en/help_topics/configuration.txt:735
10576
msgid ""
10577
"Specifies which external merge tool (as defined above) should be selected "
10578
"by\n"
10579
"default in tools such as ``bzr qconflicts``."
10580
msgstr ""
10581
10582
#: en/help_topics/configuration.txt:740
10583
msgid " bzr.default_mergetool = kdiff3\n"
10584
msgstr ""
10585
10586
#: en/help_topics/conflict-types.txt:1
10587
msgid ""
10588
"Conflict Types\n"
10589
"=============="
10590
msgstr ""
10591
10592
#: en/help_topics/conflict-types.txt:4
10593
msgid ""
10594
"Some operations, like merge, revert and pull, modify the contents of your\n"
10595
"working tree. These modifications are programmatically generated, and so "
10596
"they\n"
10597
"may conflict with the current state of your working tree. "
10598
msgstr ""
10599
10600
#: en/help_topics/conflict-types.txt:8
10601
msgid ""
10602
"When conflicts are present in your working tree (as shown by ``bzr\n"
10603
"conflicts``), you should resolve them and then inform bzr that the "
10604
"conflicts\n"
10605
"have been resolved."
10606
msgstr ""
10607
10608
#: en/help_topics/conflict-types.txt:12
10609
msgid ""
10610
"Resolving conflicts is sometimes not obvious. Either because the user that\n"
10611
"should resolve them is not the one responsible for their occurrence, as is "
10612
"the\n"
10613
"case when merging other people's work or because some conflicts are "
10614
"presented\n"
10615
"in a way that is not easy to understand."
10616
msgstr ""
10617
10618
#: en/help_topics/conflict-types.txt:17
10619
msgid ""
10620
"Bazaar tries to avoid conflicts ; its aim is to ask you to resolve the\n"
10621
"conflict if and only if there's an actual conceptual conflict in the source\n"
10622
"tree. Because Bazaar doesn't understand the real meaning of the files "
10623
"being\n"
10624
"versioned, it can, when faced with ambiguities, fall short in either "
10625
"direction\n"
10626
"trying to resolve the conflict itself. Many kinds of changes can be "
10627
"combined\n"
10628
"programmatically, but sometimes only a human can determine the right thing "
10629
"to\n"
10630
"do."
10631
msgstr ""
10632
10633
#: en/help_topics/conflict-types.txt:25
10634
msgid ""
10635
"When Bazaar generates a conflict, it adds information into the working tree "
10636
"to\n"
10637
"present the conflicting versions, and it's up to you to find the correct\n"
10638
"resolution."
10639
msgstr ""
10640
10641
#: en/help_topics/conflict-types.txt:29
10642
msgid "Whatever the conflict is, resolving it is roughly done in two steps:"
10643
msgstr ""
10644
10645
#: en/help_topics/conflict-types.txt:31
10646
msgid ""
10647
"1. Modify the working tree content so that the conflicted item is now in "
10648
"the\n"
10649
" state you want to keep, then"
10650
msgstr ""
10651
10652
#: en/help_topics/conflict-types.txt:34
10653
msgid ""
10654
"2. Inform Bazaar that the conflict is now solved and ask to cleanup any\n"
10655
" remaining generated information (``bzr resolve <item>``)."
10656
msgstr ""
10657
10658
#: en/help_topics/conflict-types.txt:37
10659
msgid ""
10660
"For most conflict types, there are some obvious ways to modify the working\n"
10661
"tree and put it into the desired state. For some types of conflicts, Bazaar\n"
10662
"itself already made a choice, when possible."
10663
msgstr ""
10664
10665
#: en/help_topics/conflict-types.txt:41
10666
msgid ""
10667
"Yet, whether Bazaar makes a choice or not, there are some other simple but\n"
10668
"different ways to resolve the conflict."
10669
msgstr ""
10670
10671
#: en/help_topics/conflict-types.txt:44
10672
msgid ""
10673
"Each type of conflict is explained below, and the action which must be done "
10674
"to\n"
10675
"resolve the conflict is outlined."
10676
msgstr ""
10677
10678
#: en/help_topics/conflict-types.txt:47
10679
msgid ""
10680
"Various actions are available depending on the kind of conflict, for some "
10681
"of\n"
10682
"these actions, Bazaar can provide some help. In the end you should at least\n"
10683
"inform Bazaar that you're done with the conflict with::"
10684
msgstr ""
10685
10686
#: en/help_topics/conflict-types.txt:51
10687
msgid " ``bzr resolve FILE --action=done'"
10688
msgstr ""
10689
10690
#: en/help_topics/conflict-types.txt:53
10691
msgid ""
10692
"Note that this is the default action when a single file is involved so you "
10693
"can\n"
10694
"simply use::"
10695
msgstr ""
10696
10697
#: en/help_topics/conflict-types.txt:56
10698
msgid " ``bzr resolve FILE``"
10699
msgstr ""
10700
10701
#: en/help_topics/conflict-types.txt:58
10702
msgid "See ``bzr help resolve`` for more details."
10703
msgstr ""
10704
10705
#: en/help_topics/conflict-types.txt:60
10706
msgid ""
10707
"Text conflicts\n"
10708
"--------------"
10709
msgstr ""
10710
10711
#: en/help_topics/conflict-types.txt:63 en/help_topics/conflict-types.txt:120
10712
#: en/help_topics/conflict-types.txt:151 en/help_topics/conflict-types.txt:175
10713
#: en/help_topics/conflict-types.txt:198 en/help_topics/conflict-types.txt:213
10714
#: en/help_topics/conflict-types.txt:239 en/help_topics/conflict-types.txt:281
10715
#: en/help_topics/conflict-types.txt:303 en/help_topics/conflict-types.txt:339
10716
msgid "Typical message::"
10717
msgstr ""
10718
10719
#: en/help_topics/conflict-types.txt:65
10720
msgid " Text conflict in FILE"
10721
msgstr ""
10722
10723
#: en/help_topics/conflict-types.txt:67
10724
msgid ""
10725
"These are produced when a text merge cannot completely reconcile two sets "
10726
"of\n"
10727
"text changes. Bazaar will emit files for each version with the extensions\n"
10728
"THIS, OTHER, and BASE. THIS is the version of the file from the target "
10729
"tree,\n"
10730
"i.e. the tree that you are merging changes into. OTHER is the version that "
10731
"you\n"
10732
"are merging into the target. BASE is an older version that is used as a "
10733
"basis\n"
10734
"for comparison."
10735
msgstr ""
10736
10737
#: en/help_topics/conflict-types.txt:74
10738
msgid ""
10739
"In the main copy of the file, Bazaar will include all the changes that it\n"
10740
"could reconcile, and any un-reconciled conflicts are surrounded by\n"
10741
"\"herringbone\" markers like ``<<<<<<<``."
10742
msgstr ""
10743
10744
#: en/help_topics/conflict-types.txt:78
10745
msgid ""
10746
"Say the initial text is \"The project leader released it.\", and THIS "
10747
"modifies it\n"
10748
"to \"Martin Pool released it.\", while OTHER modifies it to \"The project "
10749
"leader\n"
10750
"released Bazaar.\" A conflict would look like this::"
10751
msgstr ""
10752
10753
#: en/help_topics/conflict-types.txt:82
10754
msgid ""
10755
" <<<<<<< TREE\n"
10756
" Martin Pool released it.\n"
10757
" =======\n"
10758
" The project leader released Bazaar.\n"
10759
" >>>>>>> MERGE-SOURCE"
10760
msgstr ""
10761
10762
#: en/help_topics/conflict-types.txt:88
10763
msgid "The correct resolution would be \"Martin Pool released Bazaar.\""
10764
msgstr ""
10765
10766
#: en/help_topics/conflict-types.txt:90
10767
msgid ""
10768
"You can handle text conflicts either by editing the main copy of the file,\n"
10769
"or by invoking external tools on the THIS, OTHER and BASE versions. It's\n"
10770
"worth mentioning that resolving text conflicts rarely involves picking one\n"
10771
"set of changes over the other (but see below when you encounter these\n"
10772
"cases). More often, the two sets of changes must be intelligently combined."
10773
msgstr ""
10774
10775
#: en/help_topics/conflict-types.txt:96
10776
msgid ""
10777
"If you edit the main copy, be sure to remove the herringbone markers. When\n"
10778
"you are done editing, the file should look like it never had a conflict, and "
10779
"be\n"
10780
"ready to commit."
10781
msgstr ""
10782
10783
#: en/help_topics/conflict-types.txt:100
10784
msgid ""
10785
"When you have resolved text conflicts, just run ``bzr resolve --auto``, and\n"
10786
"Bazaar will auto-detect which conflicts you have resolved."
10787
msgstr ""
10788
10789
#: en/help_topics/conflict-types.txt:103
10790
msgid ""
10791
"When the conflict is resolved, Bazaar deletes the previously generated\n"
10792
"``.BASE``, ``.THIS`` and ``.OTHER`` files if they are still present in the\n"
10793
"working tree."
10794
msgstr ""
10795
10796
#: en/help_topics/conflict-types.txt:107
10797
msgid ""
10798
"\n"
10799
"When you want to pick one set of changes over the other, you can use ``bzr\n"
10800
"resolve`` with one of the following actions:"
10801
msgstr ""
10802
10803
#: en/help_topics/conflict-types.txt:111
10804
msgid ""
10805
"* ``--action=take-this`` will issue ``mv FILE.THIS FILE``,\n"
10806
"* ``--action=take-other`` will issue ``mv FILE.OTHER FILE``."
10807
msgstr ""
10808
10809
#: en/help_topics/conflict-types.txt:114
10810
msgid ""
10811
"Note that if you have modified ``FILE.THIS`` or ``FILE.OTHER``, these\n"
10812
"modifications will be taken into account."
10813
msgstr ""
10814
10815
#: en/help_topics/conflict-types.txt:117
10816
msgid ""
10817
"Content conflicts\n"
10818
"-----------------"
10819
msgstr ""
10820
10821
#: en/help_topics/conflict-types.txt:122
10822
msgid " Contents conflict in FILE"
10823
msgstr ""
10824
10825
#: en/help_topics/conflict-types.txt:124
10826
msgid ""
10827
"This conflict happens when there are conflicting changes in the working "
10828
"tree\n"
10829
"and the merge source, but the conflicted items are not text files. They "
10830
"may\n"
10831
"be binary files, or symlinks, or directories. It can even happen with "
10832
"files\n"
10833
"that are deleted on one side, and modified on the other."
10834
msgstr ""
10835
10836
#: en/help_topics/conflict-types.txt:129
10837
msgid ""
10838
"Like text conflicts, Bazaar will emit THIS, OTHER and BASE files. (They may "
10839
"be\n"
10840
"regular files, symlinks or directories). But it will not include a \"main "
10841
"copy\"\n"
10842
"of the file with herringbone conflict markers. It will appear that the "
10843
"\"main\n"
10844
"copy\" has been renamed to THIS or OTHER."
10845
msgstr ""
10846
10847
#: en/help_topics/conflict-types.txt:134 en/help_topics/conflict-types.txt:182
10848
msgid ""
10849
"To resolve that kind of conflict, you should rebuild FILE from either "
10850
"version\n"
10851
"or a combination of both."
10852
msgstr ""
10853
10854
#: en/help_topics/conflict-types.txt:137 en/help_topics/conflict-types.txt:185
10855
#: en/help_topics/conflict-types.txt:226 en/help_topics/conflict-types.txt:252
10856
#: en/help_topics/conflict-types.txt:291 en/help_topics/conflict-types.txt:326
10857
#: en/help_topics/conflict-types.txt:361
10858
msgid "``bzr resolve`` recognizes the following actions:"
10859
msgstr ""
10860
10861
#: en/help_topics/conflict-types.txt:139
10862
msgid ""
10863
"* ``--action=take-this`` will issue ``bzr mv FILE.THIS FILE``,\n"
10864
"* ``--action=take-other`` will issue ``bzr mv FILE.OTHER FILE``,\n"
10865
"* ``--action=done`` will just mark the conflict as resolved."
10866
msgstr ""
10867
10868
#: en/help_topics/conflict-types.txt:143
10869
msgid ""
10870
"Any action will also delete the previously generated ``.BASE``, ``.THIS`` "
10871
"and\n"
10872
"``.OTHER`` files if they are still present in the working tree."
10873
msgstr ""
10874
10875
#: en/help_topics/conflict-types.txt:146 en/help_topics/conflict-types.txt:193
10876
#: en/help_topics/conflict-types.txt:234 en/help_topics/conflict-types.txt:276
10877
#: en/help_topics/conflict-types.txt:298 en/help_topics/conflict-types.txt:334
10878
#: en/help_topics/conflict-types.txt:369
10879
msgid ""
10880
"Bazaar cannot auto-detect when conflicts of this kind have been resolved."
10881
msgstr ""
10882
10883
#: en/help_topics/conflict-types.txt:148
10884
msgid ""
10885
"Tag conflicts\n"
10886
"-------------"
10887
msgstr ""
10888
10889
#: en/help_topics/conflict-types.txt:153
10890
msgid ""
10891
" Conflicting tags:\n"
10892
" version-0.1"
10893
msgstr ""
10894
10895
#: en/help_topics/conflict-types.txt:156
10896
msgid ""
10897
"When pulling from or pushing to another branch, Bazaar informs you about "
10898
"tags\n"
10899
"that conflict between the two branches; that is the same tag points to two\n"
10900
"different revisions. You need not resolve these conflicts, but subsequent\n"
10901
"uses of pull or push will result in the same message."
10902
msgstr ""
10903
10904
#: en/help_topics/conflict-types.txt:161
10905
msgid ""
10906
"To resolve the conflict, you must apply the correct tags to either the "
10907
"target\n"
10908
"branch or the source branch as appropriate. Use \"bzr tags --show-ids -d\n"
10909
"SOURCE_URL\" to see the tags in the source branch. If you want to make the\n"
10910
"target branch's tags match the source branch, then in the target branch do\n"
10911
"``bzr tag --force -r revid:REVISION_ID CONFLICTING_TAG`` for each of the\n"
10912
"CONFLICTING_TAGs, where REVISION_ID comes from the list of tags in the "
10913
"source\n"
10914
"branch. You need not call \"bzr resolve\" after doing this. To resolve in\n"
10915
"favor of the target branch, you need to similarly use ``tag --force`` in "
10916
"the\n"
10917
"source branch. (Note that pulling or pushing using --overwrite will "
10918
"overwrite\n"
10919
"all tags as well.)"
10920
msgstr ""
10921
10922
#: en/help_topics/conflict-types.txt:172
10923
msgid ""
10924
"Duplicate paths\n"
10925
"---------------"
10926
msgstr ""
10927
10928
#: en/help_topics/conflict-types.txt:177
10929
msgid " Conflict adding file FILE. Moved existing file to FILE.moved."
10930
msgstr ""
10931
10932
#: en/help_topics/conflict-types.txt:179
10933
msgid ""
10934
"Sometimes Bazaar will attempt to create a file using a pathname that has\n"
10935
"already been used. The existing file will be renamed to \"FILE.moved\". "
10936
msgstr ""
10937
10938
#: en/help_topics/conflict-types.txt:187
10939
msgid ""
10940
"* ``--action=take-this`` will issue ``bzr rm FILE ; bzr mv FILE.moved "
10941
"FILE``,\n"
10942
"* ``--action=take-other`` will issue ``bzr rm FILE.moved``,\n"
10943
"* ``--action=done`` will just mark the conflict as resolved."
10944
msgstr ""
10945
10946
#: en/help_topics/conflict-types.txt:191
10947
msgid ""
10948
"Note that you must get rid of FILE.moved before using ``--action=done``."
10949
msgstr ""
10950
10951
#: en/help_topics/conflict-types.txt:195
10952
msgid ""
10953
"Unversioned parent\n"
10954
"------------------"
10955
msgstr ""
10956
10957
#: en/help_topics/conflict-types.txt:200
10958
msgid ""
10959
" Conflict because FILE is not versioned, but has versioned children."
10960
msgstr ""
10961
10962
#: en/help_topics/conflict-types.txt:202
10963
msgid ""
10964
"Sometimes Bazaar will attempt to create a file whose parent directory is "
10965
"not\n"
10966
"versioned. This happens when the directory has been deleted in the target,\n"
10967
"but has a new child in the source, or vice versa. In this situation, "
10968
"Bazaar\n"
10969
"will version the parent directory as well. Resolving this issue depends\n"
10970
"very much on the particular scenario. You may wish to rename or delete "
10971
"either\n"
10972
"the file or the directory. When you are satisfied, you can run \"bzr "
10973
"resolve\n"
10974
"FILE\" to mark the conflict as resolved."
10975
msgstr ""
10976
10977
#: en/help_topics/conflict-types.txt:210
10978
msgid ""
10979
"Missing parent\n"
10980
"--------------"
10981
msgstr ""
10982
10983
#: en/help_topics/conflict-types.txt:215
10984
msgid " Conflict adding files to FILE. Created directory."
10985
msgstr ""
10986
10987
#: en/help_topics/conflict-types.txt:217
10988
msgid ""
10989
"This happens when a directory has been deleted in the target, but has new\n"
10990
"children in the source. This is similar to the \"unversioned parent\" "
10991
"conflict,\n"
10992
"except that the parent directory does not *exist*, instead of just being\n"
10993
"unversioned. In this situation, Bazaar will create the missing parent.\n"
10994
"Resolving this issue depends very much on the particular scenario."
10995
msgstr ""
10996
10997
#: en/help_topics/conflict-types.txt:223 en/help_topics/conflict-types.txt:249
10998
msgid ""
10999
"To resolve that kind of conflict, you should either remove or rename the\n"
11000
"children or the directory or a combination of both."
11001
msgstr ""
11002
11003
#: en/help_topics/conflict-types.txt:228
11004
msgid ""
11005
"* ``--action=take-this`` will issue ``bzr rm directory`` including the\n"
11006
" children,\n"
11007
"* ``--action=take-other`` will acknowledge Bazaar choice to keep the "
11008
"children\n"
11009
" and restoring the directory,\n"
11010
"* ``--action=done`` will just mark the conflict as resolved."
11011
msgstr ""
11012
11013
#: en/help_topics/conflict-types.txt:236
11014
msgid ""
11015
"Deleting parent\n"
11016
"---------------"
11017
msgstr ""
11018
11019
#: en/help_topics/conflict-types.txt:241
11020
msgid " Conflict: can't delete DIR because it is not empty. Not deleting."
11021
msgstr ""
11022
11023
#: en/help_topics/conflict-types.txt:243
11024
msgid ""
11025
"This is the opposite of \"missing parent\". A directory is deleted in the\n"
11026
"source, but has new children in the target (either because a directory\n"
11027
"deletion is merged or because the merge introduce new children). Bazaar\n"
11028
"will retain the directory. Resolving this issue depends very much on the\n"
11029
"particular scenario."
11030
msgstr ""
11031
11032
#: en/help_topics/conflict-types.txt:254
11033
msgid ""
11034
"* ``--action=take-this`` will acknowledge Bazaar choice to keep the "
11035
"directory,"
11036
msgstr ""
11037
11038
#: en/help_topics/conflict-types.txt:256
11039
msgid ""
11040
"* ``--action=take-other`` will issue ``bzr rm directory`` including the \n"
11041
" children,"
11042
msgstr ""
11043
11044
#: en/help_topics/conflict-types.txt:259
11045
msgid "* ``--action=done`` will just mark the conflict as resolved."
11046
msgstr ""
11047
11048
#: en/help_topics/conflict-types.txt:261
11049
msgid ""
11050
"Note that when merging a directory deletion, if unversioned files are\n"
11051
"present, they become potential orphans has they don't have a directory\n"
11052
"parent anymore."
11053
msgstr ""
11054
11055
#: en/help_topics/conflict-types.txt:265
11056
msgid ""
11057
"Handling such orphans, *before* the conflict is created, is controlled by\n"
11058
"setting the ``bzr.transform.orphan_policy`` configuration option."
11059
msgstr ""
11060
11061
#: en/help_topics/conflict-types.txt:268
11062
msgid "There are two possible values for this option:"
11063
msgstr ""
11064
11065
#: en/help_topics/conflict-types.txt:270
11066
msgid ""
11067
"* ``conflict`` (the default): will leave the orphans in place and\n"
11068
" generate a conflicts,"
11069
msgstr ""
11070
11071
#: en/help_topics/conflict-types.txt:273
11072
msgid ""
11073
"* ``move``: will move the orphans to a ``bzr-orphans`` directory at the "
11074
"root\n"
11075
" of the working tree with names like ``<file>.~#~``."
11076
msgstr ""
11077
11078
#: en/help_topics/conflict-types.txt:278
11079
msgid ""
11080
"Path conflict\n"
11081
"-------------"
11082
msgstr ""
11083
11084
#: en/help_topics/conflict-types.txt:283
11085
msgid " Path conflict: PATH1 / PATH2"
11086
msgstr ""
11087
11088
#: en/help_topics/conflict-types.txt:285
11089
msgid ""
11090
"This happens when the source and target have each modified the name or "
11091
"parent\n"
11092
"directory of a file. Bazaar will use the path elements from the source."
11093
msgstr ""
11094
11095
#: en/help_topics/conflict-types.txt:288
11096
msgid ""
11097
"To resolve that kind of conflict, you just have to decide what name should "
11098
"be\n"
11099
"retained for the file involved."
11100
msgstr ""
11101
11102
#: en/help_topics/conflict-types.txt:293
11103
msgid ""
11104
"* ``--action=take-this`` will revert Bazaar choice and keep ``PATH1`` by\n"
11105
" issuing ``bzr mv PATH2 PATH1``,\n"
11106
"* ``--action=take-other`` will acknowledge Bazaar choice of keeping "
11107
"``PATH2``,\n"
11108
"* ``--action=done`` will just mark the conflict as resolved."
11109
msgstr ""
11110
11111
#: en/help_topics/conflict-types.txt:300
11112
msgid ""
11113
"Parent loop\n"
11114
"-----------"
11115
msgstr ""
11116
11117
#: en/help_topics/conflict-types.txt:305
11118
msgid " Conflict moving FILE into DIRECTORY. Cancelled move."
11119
msgstr ""
11120
11121
#: en/help_topics/conflict-types.txt:307
11122
msgid ""
11123
"This happens when the source and the target have each moved directories, so\n"
11124
"that, if the change could be applied, a directory would be contained by "
11125
"itself.\n"
11126
"For example::"
11127
msgstr ""
11128
11129
#: en/help_topics/conflict-types.txt:311
11130
msgid ""
11131
" $ bzr init\n"
11132
" $ bzr mkdir white\n"
11133
" $ bzr mkdir black\n"
11134
" $ bzr commit -m \"BASE\"\n"
11135
" $ bzr branch . ../other\n"
11136
" $ bzr mv white black\n"
11137
" $ bzr commit -m \"THIS\"\n"
11138
" $ bzr mv ../other/black ../other/white\n"
11139
" $ bzr commit ../other -m \"OTHER\"\n"
11140
" $ bzr merge ../other"
11141
msgstr ""
11142
11143
#: en/help_topics/conflict-types.txt:322
11144
msgid ""
11145
"In this situation, Bazaar will cancel the move, and leave ``white`` in\n"
11146
"``black``. To resolve that kind of conflict, you just have to decide what\n"
11147
"name should be retained for the directories involved."
11148
msgstr ""
11149
11150
#: en/help_topics/conflict-types.txt:328
11151
msgid ""
11152
"* ``--action=take-this`` will acknowledge Bazaar choice of leaving ``white`` "
11153
"\n"
11154
" in ``black``,\n"
11155
"* ``--action=take-other`` will revert Bazaar choice and move ``black`` in\n"
11156
" ``white`` by issuing ``bzr mv black/white white ; bzr mv black white``,\n"
11157
"* ``--action=done`` will just mark the conflict as resolved."
11158
msgstr ""
11159
11160
#: en/help_topics/conflict-types.txt:336
11161
msgid ""
11162
"Non-directory parent\n"
11163
"--------------------"
11164
msgstr ""
11165
11166
#: en/help_topics/conflict-types.txt:341
11167
msgid ""
11168
" Conflict: foo.new is not a directory, but has files in it.\n"
11169
" Created directory."
11170
msgstr ""
11171
11172
#: en/help_topics/conflict-types.txt:344
11173
msgid ""
11174
"This happens when one side has added files to a directory, and the other "
11175
"side\n"
11176
"has changed the directory into a file or symlink. For example::"
11177
msgstr ""
11178
11179
#: en/help_topics/conflict-types.txt:347
11180
msgid ""
11181
" $ bzr init\n"
11182
" $ bzr mkdir foo\n"
11183
" $ bzr commit -m \"BASE\"\n"
11184
" $ bzr branch . ../other\n"
11185
" $ rmdir foo\n"
11186
" $ touch foo\n"
11187
" $ bzr commit -m \"THIS\"\n"
11188
" $ bzr mkdir ../other/foo/bar\n"
11189
" $ bzr commit ../other -m \"OTHER\"\n"
11190
" $ bzr merge ../other"
11191
msgstr ""
11192
11193
#: en/help_topics/conflict-types.txt:358
11194
msgid ""
11195
"To resolve that kind of conflict, you have to decide what name should be\n"
11196
"retained for the file, directory or symlink involved."
11197
msgstr ""
11198
11199
#: en/help_topics/conflict-types.txt:363
11200
msgid ""
11201
"* ``--action=take-this`` will issue ``bzr rm --force foo.new`` and \n"
11202
" ``bzr add foo``,\n"
11203
"* ``--action=take-other`` will issue ``bzr rm --force foo`` and \n"
11204
" ``bzr mv foo.new foo``,\n"
11205
"* ``--action=done`` will just mark the conflict as resolved."
11206
msgstr ""
11207
11208
#: en/help_topics/conflict-types.txt:371
11209
msgid ""
11210
"MalformedTransform\n"
11211
"------------------"
11212
msgstr ""
11213
11214
#: en/help_topics/conflict-types.txt:374
11215
msgid ""
11216
"It is possible (though very rare) for Bazaar to raise a MalformedTransform\n"
11217
"exception. This means that Bazaar encountered a filesystem conflict that it "
11218
"was\n"
11219
"unable to resolve. This usually indicates a bug. Please let us know if "
11220
"you\n"
11221
"encounter this. Our bug tracker is at https://launchpad.net/bzr/+bugs\n"
11222
msgstr ""
11223
11224
#: en/help_topics/content-filters.txt:1
11225
msgid ""
11226
"Content Filters\n"
11227
"==============="
11228
msgstr ""
11229
11230
#: en/help_topics/content-filters.txt:4
11231
msgid ""
11232
"Content formats\n"
11233
"---------------"
11234
msgstr ""
11235
11236
#: en/help_topics/content-filters.txt:7
11237
msgid ""
11238
"Bazaar's content filtering allows you to store files in a different\n"
11239
"format from the copy in your working tree. This lets you, or your\n"
11240
"co-developers, use Windows development tools that expect CRLF files\n"
11241
"on projects that use other line-ending conventions. Among other things,\n"
11242
"content filters also let Unix developers more easily work on projects\n"
11243
"using Windows line-ending conventions, keyword expansion/compression,\n"
11244
"and trailing spaces on lines in text files to be implicitly stripped\n"
11245
"when committed."
11246
msgstr ""
11247
11248
#: en/help_topics/content-filters.txt:16
11249
msgid "To generalize, there are two content formats supported by Bazaar:"
11250
msgstr ""
11251
11252
#: en/help_topics/content-filters.txt:18
11253
msgid ""
11254
"* a canonical format - how files are stored internally\n"
11255
"* a convenience format - how files are created in a working tree."
11256
msgstr ""
11257
11258
#: en/help_topics/content-filters.txt:21
11259
msgid ""
11260
"\n"
11261
"Format conversion\n"
11262
"-----------------"
11263
msgstr ""
11264
11265
#: en/help_topics/content-filters.txt:25
11266
msgid ""
11267
"The conversion between these formats is done by content filters.\n"
11268
"A content filter has two parts:"
11269
msgstr ""
11270
11271
#: en/help_topics/content-filters.txt:28
11272
msgid ""
11273
"* a read converter - converts from convenience to canonical format\n"
11274
"* a write converter - converts from canonical to convenience format."
11275
msgstr ""
11276
11277
#: en/help_topics/content-filters.txt:31
11278
msgid ""
11279
"Many of these converters will provide *round-trip* conversion,\n"
11280
"i.e. applying the read converter followed by the write converter\n"
11281
"gives back the original content. However, others may provide an\n"
11282
"asymmetric conversion. For example, a read converter might strip\n"
11283
"trailing whitespace off lines in source code while the matching\n"
11284
"write converter might pass content through unchanged."
11285
msgstr ""
11286
11287
#: en/help_topics/content-filters.txt:38
11288
msgid ""
11289
"\n"
11290
"Enabling content filters\n"
11291
"------------------------"
11292
msgstr ""
11293
11294
#: en/help_topics/content-filters.txt:42
11295
msgid ""
11296
"Content filters are typically provided by plugins, so the first step\n"
11297
"in using them is to install the relevant plugins and read their\n"
11298
"documentation. Some plugins may be very specific about which files\n"
11299
"they filter, e.g. only files ending in ``.java`` or ``.php``.\n"
11300
"In other cases, the plugin may leave it in the user's hands to\n"
11301
"define which files are to be filtered. This is typically done\n"
11302
"using rule-based preferences. See ``bzr help rules`` for general\n"
11303
"information about defining these."
11304
msgstr ""
11305
11306
#: en/help_topics/content-filters.txt:51
11307
msgid ""
11308
"\n"
11309
"Impact on commands\n"
11310
"------------------"
11311
msgstr ""
11312
11313
#: en/help_topics/content-filters.txt:55
11314
msgid ""
11315
"Read converters are only applied to commands that read content from\n"
11316
"a working tree, e.g. status, diff and commit. For example, ``bzr diff``\n"
11317
"will apply read converters to files in the working tree, then compare\n"
11318
"the results to the content last committed."
11319
msgstr ""
11320
11321
#: en/help_topics/content-filters.txt:60
11322
msgid ""
11323
"Write converters are only applied by commands that **create files in a\n"
11324
"working tree**, e.g. branch, checkout, update. If you wish to see the\n"
11325
"canonical format of a file or tree, use ``bzr cat`` or ``bzr export``\n"
11326
"respectively."
11327
msgstr ""
11328
11329
#: en/help_topics/content-filters.txt:65
11330
msgid ""
11331
"Note: ``bzr commit`` does not implicitly apply write converters after\n"
11332
"comitting files. If this makes sense for a given plugin providing\n"
11333
"a content filter, the plugin can usually achieve this effect by using a\n"
11334
"``start_commit`` or ``post_commit`` hook say. See :doc:`hooks-help`\n"
11335
"for more information on hooks."
11336
msgstr ""
11337
11338
#: en/help_topics/content-filters.txt:71
11339
msgid ""
11340
"\n"
11341
"Refreshing your working tree\n"
11342
"----------------------------"
11343
msgstr ""
11344
11345
#: en/help_topics/content-filters.txt:75
11346
msgid ""
11347
"For performance reasons, Bazaar caches the timestamps of files in\n"
11348
"a working tree, and assumes files are unchanged if their timestamps\n"
11349
"match the cached values. As a consequence, there are times when\n"
11350
"you may need to explicitly ask for content filtering to be reapplied\n"
11351
"in one or both directions, e.g. after installing or reconfiguring\n"
11352
"plugins providing it."
11353
msgstr ""
11354
11355
#: en/help_topics/content-filters.txt:82
11356
msgid "Here are some general guidelines for doing this:"
11357
msgstr ""
11358
11359
#: en/help_topics/content-filters.txt:84
11360
msgid ""
11361
" * To reapply read converters, ``touch`` files, i.e. update their\n"
11362
" timestamp. Operations like ``bzr status`` should then reapply the\n"
11363
" relevant read converters and compare the end result with the\n"
11364
" canonical format."
11365
msgstr ""
11366
11367
#: en/help_topics/content-filters.txt:89
11368
msgid ""
11369
" * To reapply write converters, ensure there are no local changes,\n"
11370
" delete the relevant files and run ``bzr revert`` on those files."
11371
msgstr ""
11372
11373
#: en/help_topics/content-filters.txt:92
11374
msgid ""
11375
"Note: In the future, it is likely that additional options will be added\n"
11376
"to commands to make this refreshing process faster and safer.\n"
11377
msgstr ""
11378
11379
#: en/help_topics/current-formats.txt:1
11380
msgid "Current Storage Formats"
11381
msgstr ""
11382
11383
#: en/help_topics/current-formats.txt:3
11384
msgid ""
11385
":2a:\n"
11386
" (native) (default) Format for the bzr 2.0 series. Uses group-\n"
11387
" compress storage. Provides rich roots which are a one-way\n"
11388
" transition."
11389
msgstr ""
11390
11391
#: en/help_topics/current-formats.txt:8 en/help_topics/other-formats.txt:17
11392
msgid ""
11393
"\n"
11394
"See :doc:`formats-help` for more about storage formats."
11395
msgstr ""
11396
11397
#: en/help_topics/debug-flags.txt:1
11398
msgid ""
11399
"Debug Flags\n"
11400
"==========="
11401
msgstr ""
11402
11403
#: en/help_topics/debug-flags.txt:4
11404
msgid ""
11405
"These flags can be passed on the bzr command line or (without the ``-D``\n"
11406
"prefix) put in the ``debug_flags`` variable in ``bazaar.conf``."
11407
msgstr ""
11408
11409
#: en/help_topics/debug-flags.txt:7
11410
msgid ""
11411
"-Dauth Trace authentication sections used.\n"
11412
"-Dbytes Print out how many bytes were transferred\n"
11413
"-Ddirstate Trace dirstate activity (verbose!)\n"
11414
"-Derror Instead of normal error handling, always print a "
11415
"traceback\n"
11416
" on error.\n"
11417
"-Devil Capture call sites that do expensive or badly-scaling\n"
11418
" operations.\n"
11419
"-Dfetch Trace history copying between repositories.\n"
11420
"-Dfilters Emit information for debugging content filtering.\n"
11421
"-Dforceinvdeltas Force use of inventory deltas during generic streaming "
11422
"fetch.\n"
11423
"-Dgraph Trace graph traversal.\n"
11424
"-Dhashcache Log every time a working file is read to determine its "
11425
"hash.\n"
11426
"-Dhooks Trace hook execution.\n"
11427
"-Dhpss Trace smart protocol requests and responses.\n"
11428
"-Dhpssdetail More hpss details.\n"
11429
"-Dhpssvfs Traceback on vfs access to Remote objects.\n"
11430
"-Dhttp Trace http connections, requests and responses.\n"
11431
"-Dindex Trace major index operations.\n"
11432
"-Dknit Trace knit operations.\n"
11433
"-Dlock Trace when lockdir locks are taken or released.\n"
11434
"-Dnoretry If a connection is reset, fail immediately rather than\n"
11435
" retrying the request.\n"
11436
"-Dprogress Trace progress bar operations.\n"
11437
"-Dmem_dump Dump memory to a file upon an out of memory error.\n"
11438
"-Dmerge Emit information for debugging merges.\n"
11439
"-Dno_apport Don't use apport to report crashes.\n"
11440
"-Dno_activity \t Don't show transport activity indicator in progress bar.\n"
11441
"-Dpack Emit information about pack operations.\n"
11442
"-Drelock Emit a message every time a branch or repository object "
11443
"is\n"
11444
" unlocked then relocked the same way.\n"
11445
"-Dsftp Trace SFTP internals.\n"
11446
"-Dstatic_tuple Error when a tuple is used where a StaticTuple is "
11447
"expected\n"
11448
"-Dstream Trace fetch streams.\n"
11449
"-Dstrict_locks Trace when OS locks are potentially used in a non-"
11450
"portable\n"
11451
" manner.\n"
11452
"-Dunlock Some errors during unlock are treated as warnings.\n"
11453
"-DIDS_never Never use InterDifferingSerializer when fetching.\n"
11454
"-DIDS_always Always use InterDifferingSerializer to fetch if "
11455
"appropriate\n"
11456
" for the format, even for non-local fetches.\n"
11457
msgstr ""
11458
11459
#: en/help_topics/diverged-branches.txt:1
11460
msgid ""
11461
"Diverged Branches\n"
11462
"================="
11463
msgstr ""
11464
11465
#: en/help_topics/diverged-branches.txt:4
11466
msgid ""
11467
"When Bazaar tries to push one branch onto another, it requires that the\n"
11468
"destination branch must be ready to receive the source branch. If this "
11469
"isn't\n"
11470
"the case, then we say that the branches have ``diverged``. Branches are\n"
11471
"considered diverged if the destination branch's most recent commit is one "
11472
"that\n"
11473
"has not been merged (directly or indirectly) by the source branch. To "
11474
"recover\n"
11475
"from diverged branches, one must merge the missing revisions into the "
11476
"source\n"
11477
"branch."
11478
msgstr ""
11479
11480
#: en/help_topics/diverged-branches.txt:12
11481
msgid ""
11482
"This situation commonly arises when using a centralized workflow with local\n"
11483
"commits. If someone else has committed new work to the mainline since your\n"
11484
"last pull and you have local commits that have not yet been pushed to the\n"
11485
"mainline, then your local branch and the mainline have diverged."
11486
msgstr ""
11487
11488
#: en/help_topics/diverged-branches.txt:17
11489
msgid ""
11490
"Discovering What Has Diverged\n"
11491
"-----------------------------"
11492
msgstr ""
11493
11494
#: en/help_topics/diverged-branches.txt:20
11495
msgid ""
11496
"The ``bzr missing`` command is used to find out what revisions are in "
11497
"another\n"
11498
"branch that are not present in the current branch, and vice-versa. It shows "
11499
"a\n"
11500
"summary of which extra revisions exist in each branch. If you want to see "
11501
"the\n"
11502
"precise effects of those revisions, you can use ``bzr diff --"
11503
"old=other_branch``\n"
11504
"to show the differences between other_branch and your current branch."
11505
msgstr ""
11506
11507
#: en/help_topics/diverged-branches.txt:26
11508
msgid ""
11509
"A Solution\n"
11510
"----------"
11511
msgstr ""
11512
11513
#: en/help_topics/diverged-branches.txt:29
11514
msgid ""
11515
"The solution is to merge the revisions from the mainline into your local\n"
11516
"branch. To do so, use ``bzr merge`` to get the new revisions from the\n"
11517
"mainline. This merge may result in conflicts if the other developer's "
11518
"changes\n"
11519
"overlap with your changes. These conflicts should be resolved before\n"
11520
"continuing. After any conflicts have been resolved, or even if there were "
11521
"no\n"
11522
"conflicts, Bazaar requires that you explicitly commit these new revisions\n"
11523
"to your local branch. This requirement gives you an opportunity to test "
11524
"the\n"
11525
"resulting working tree for correctness, since the merged revisions could "
11526
"have\n"
11527
"made arbitrary changes. After testing, you should commit the merge using\n"
11528
"``bzr commit``. This clears up the diverged branches situation. Your "
11529
"local\n"
11530
"branch can now be pushed to the mainline.\n"
11531
msgstr ""
11532
11533
#: en/help_topics/env-variables.txt:1
11534
msgid "Environment Variables"
11535
msgstr ""
11536
11537
#: en/help_topics/env-variables.txt:3
11538
msgid "See bzr help configuration for more details."
11539
msgstr ""
11540
11541
#: en/help_topics/env-variables.txt:5
11542
msgid ""
11543
"=================== "
11544
"===========================================================\n"
11545
"BZRPATH Path where bzr is to look for shell plugin external\n"
11546
" commands.\n"
11547
"BZR_EMAIL E-Mail address of the user. Overrides EMAIL.\n"
11548
"EMAIL E-Mail address of the user.\n"
11549
"BZR_EDITOR Editor for editing commit messages. Overrides EDITOR.\n"
11550
"EDITOR Editor for editing commit messages.\n"
11551
"BZR_PLUGIN_PATH Paths where bzr should look for plugins.\n"
11552
"BZR_DISABLE_PLUGINS Plugins that bzr should not load.\n"
11553
"BZR_PLUGINS_AT Plugins to load from a directory not in "
11554
"BZR_PLUGIN_PATH.\n"
11555
"BZR_HOME Directory holding .bazaar config dir. Overrides HOME.\n"
11556
"BZR_HOME (Win32) Directory holding bazaar config dir. Overrides APPDATA "
11557
"and\n"
11558
" HOME.\n"
11559
"BZR_REMOTE_PATH Full name of remote 'bzr' command (for bzr+ssh:// "
11560
"URLs).\n"
11561
"BZR_SSH Path to SSH client, or one of paramiko, openssh, "
11562
"sshcorp,\n"
11563
" plink or lsh.\n"
11564
"BZR_LOG Location of .bzr.log (use '/dev/null' to suppress log).\n"
11565
"BZR_LOG (Win32) Location of .bzr.log (use 'NUL' to suppress log).\n"
11566
"BZR_COLUMNS Override implicit terminal width.\n"
11567
"BZR_CONCURRENCY Number of processes that can be run concurrently "
11568
"(selftest)\n"
11569
"BZR_PROGRESS_BAR Override the progress display. Values are 'none' or "
11570
"'text'.\n"
11571
"BZR_PDB Control whether to launch a debugger on error.\n"
11572
"BZR_SIGQUIT_PDB Control whether SIGQUIT behaves normally or invokes a\n"
11573
" breakin debugger.\n"
11574
"BZR_TEXTUI_INPUT Force console input mode for prompts to line-based "
11575
"(instead\n"
11576
" of char-based).\n"
11577
"=================== "
11578
"===========================================================\n"
11579
msgstr ""
11580
11581
#: en/help_topics/eol.txt:1
11582
msgid ""
11583
"End of Line Conversion\n"
11584
"======================"
11585
msgstr ""
11586
11587
#: en/help_topics/eol.txt:4
11588
msgid ""
11589
"EOL conversion is provided as a content filter where Bazaar internally\n"
11590
"stores a canonical format but outputs a convenience format. See\n"
11591
"``bzr help content-filters`` for general information about using these."
11592
msgstr ""
11593
11594
#: en/help_topics/eol.txt:8
11595
msgid ""
11596
"Note: Content filtering is only supported in recently added formats,\n"
11597
"e.g. 1.14. Be sure that both the repository *and* the branch are\n"
11598
"in a recent format. (Just setting the format on the repository\n"
11599
"is not enough.) If content filtering does not appear to be working, use\n"
11600
"'bzr info -v' to confirm that the branch is using \"Working tree format 5\"\n"
11601
"or later."
11602
msgstr ""
11603
11604
#: en/help_topics/eol.txt:15
11605
msgid ""
11606
"EOL conversion needs to be enabled for selected file patterns using\n"
11607
"rules. See ``bzr help rules`` for general information on defining rules.\n"
11608
"Currently, rules are only supported in $BZR_HOME/.bazaar/rules (or\n"
11609
"%BZR_HOME%/bazaar/2.0/rules on Windows). Branch specific rules will be\n"
11610
"supported in a future verison of Bazaar."
11611
msgstr ""
11612
11613
#: en/help_topics/eol.txt:21
11614
msgid ""
11615
"To configure which files to filter, set ``eol`` to one of the values below.\n"
11616
"(If a value is not set, ``exact`` is the default.)"
11617
msgstr ""
11618
11619
#: en/help_topics/eol.txt:24
11620
msgid ""
11621
" ========== ===================================== ======================\n"
11622
" Value Checkout end-of-lines as Commit end-of-lines as\n"
11623
" ========== ===================================== ======================\n"
11624
" ``native`` ``crlf`` on Windows, ``lf`` otherwise ``lf``\n"
11625
" ---------- ------------------------------------- ----------------------\n"
11626
" ``lf`` ``lf`` ``lf``\n"
11627
" ---------- ------------------------------------- ----------------------\n"
11628
" ``crlf`` ``crlf`` ``lf``\n"
11629
" ---------- ------------------------------------- ----------------------\n"
11630
" ``exact`` No conversion Exactly as in file\n"
11631
" ========== ===================================== ======================"
11632
msgstr ""
11633
11634
#: en/help_topics/eol.txt:36
11635
msgid ""
11636
"Note: For safety reasons, no conversion is applied to any file where a null\n"
11637
"byte is detected in the file."
11638
msgstr ""
11639
11640
#: en/help_topics/eol.txt:39
11641
msgid ""
11642
"For users working on a cross-platform project, here is a suggested rule\n"
11643
"to use as a starting point::"
11644
msgstr ""
11645
11646
#: en/help_topics/eol.txt:42 en/help_topics/eol.txt:52
11647
#: en/help_topics/eol.txt:67 en/help_topics/eol.txt:82
11648
msgid ""
11649
" [name *]\n"
11650
" eol = native"
11651
msgstr ""
11652
11653
#: en/help_topics/eol.txt:45
11654
msgid ""
11655
"If you have binary files that do not contain a null byte though, be\n"
11656
"sure to add ``eol = exact`` rules for those as well. You can do this\n"
11657
"by giving more explicit patterns earlier in the rules file. For example::"
11658
msgstr ""
11659
11660
#: en/help_topics/eol.txt:49
11661
msgid ""
11662
" [name *.png]\n"
11663
" eol = exact"
11664
msgstr ""
11665
11666
#: en/help_topics/eol.txt:55
11667
msgid ""
11668
"If your working tree is on a network drive shared by users on different\n"
11669
"operating systems, you typically want to force certain conventions for\n"
11670
"certain files. In that way, if a file is created with the wrong line\n"
11671
"endings or line endings get mixed during editing, it gets committed\n"
11672
"correctly and gets checked out correctly. For example::"
11673
msgstr ""
11674
11675
#: en/help_topics/eol.txt:61
11676
msgid ""
11677
" [name *.bat]\n"
11678
" eol = crlf"
11679
msgstr ""
11680
11681
#: en/help_topics/eol.txt:64
11682
msgid ""
11683
" [name *.sh]\n"
11684
" eol = lf"
11685
msgstr ""
11686
11687
#: en/help_topics/eol.txt:70
11688
msgid ""
11689
"If you take the care to create files with their required endings, you can\n"
11690
"achieve *almost* the same thing by using ``eol = exact``. It is slightly\n"
11691
"safer to use ``lf`` and ``crlf`` though because edits accidentally\n"
11692
"introducing mixed line endings will be corrected during commit for files\n"
11693
"with those settings."
11694
msgstr ""
11695
11696
#: en/help_topics/eol.txt:76
11697
msgid ""
11698
"If you have sample test data that deliberately has text files with mixed\n"
11699
"newline conventions, you can ask for those to be left alone like this::"
11700
msgstr ""
11701
11702
#: en/help_topics/eol.txt:79
11703
msgid ""
11704
" [name test_data/]\n"
11705
" eol = exact"
11706
msgstr ""
11707
11708
#: en/help_topics/eol.txt:85
11709
msgid ""
11710
"Note that ``exact`` does not imply the file is binary but it does mean\n"
11711
"that no conversion of end-of-lines will be done. (Bazaar currently relies\n"
11712
"of content analysis to detect binary files for commands like ``diff``.\n"
11713
"In the future, a ``binary = true`` rule may be added but it is not\n"
11714
"supported yet.)"
11715
msgstr ""
11716
11717
#: en/help_topics/eol.txt:91
11718
msgid ""
11719
"If you have an existing repository with text files already stored using\n"
11720
"Windows newline conventions (``crlf``), then you may want to keep using "
11721
"that\n"
11722
"convention in the repository. Forcing certain files to this convention\n"
11723
"may also help users who do not have rules configured. To do this, set\n"
11724
"``eol`` to one of the values below."
11725
msgstr ""
11726
11727
#: en/help_topics/eol.txt:97
11728
msgid ""
11729
" ============================ ======================== "
11730
"======================\n"
11731
" Value Checkout end-of-lines as Commit end-of-lines "
11732
"as\n"
11733
" ============================ ======================== "
11734
"======================\n"
11735
" ``native-with-crlf-in-repo`` ``crlf`` on Windows, ``crlf``\n"
11736
" ``lf`` otherwise\n"
11737
" ---------------------------- ------------------------ ----------------------"
11738
"\n"
11739
" ``lf-with-crlf-in-repo`` ``lf`` ``crlf``\n"
11740
" ---------------------------- ------------------------ ----------------------"
11741
"\n"
11742
" ``crlf-with-crlf-in-repo`` ``crlf`` ``crlf``\n"
11743
" ============================ ======================== ======================"
11744
msgstr ""
11745
11746
#: en/help_topics/eol.txt:108
11747
msgid ""
11748
"For users working on an existing project that uses Windows newline\n"
11749
"conventions in their Bazaar repository, this rule is suggested as a\n"
11750
"starting point::"
11751
msgstr ""
11752
11753
#: en/help_topics/eol.txt:112
11754
msgid ""
11755
" [name *]\n"
11756
" eol = native-with-crlf-in-repo"
11757
msgstr ""
11758
11759
#: en/help_topics/eol.txt:115
11760
msgid ""
11761
"For new projects, it is recommended that end-of-lines be stored as ``lf``\n"
11762
"and that users stick to the basic settings, i.e. ``native``, ``lf``,\n"
11763
"``crlf`` and ``exact``."
11764
msgstr ""
11765
11766
#: en/help_topics/eol.txt:119
11767
msgid ""
11768
"Note: Bazaar's EOL conversion will convert the content of files but\n"
11769
"never reject files because a given line ending or mixed line endings\n"
11770
"are found. A precommit hook should be used if you wish to validate\n"
11771
"(and not just convert) content before committing.\n"
11772
msgstr ""
11773
11774
#: en/help_topics/hidden-commands.txt:1
11775
msgid ""
11776
"added List files added in working tree.\n"
11777
"ancestry List all revisions merged into this branch.\n"
11778
"assert-fail Test reporting of assertion failures\n"
11779
"bundle-info Output interesting stats about a bundle\n"
11780
"bundle-revisions Create a merge-directive for submitting changes.\n"
11781
"cat-revision Write out metadata for a revision.\n"
11782
"dump-btree Dump the contents of a btree index file to stdout.\n"
11783
"export-pot Export command helps and error messages in po format.\n"
11784
"file-id Print file_id of a particular file or directory.\n"
11785
"file-path Print path of file_ids to a file or directory.\n"
11786
"find-merge-base Find and print a base revision for merging two "
11787
"branches.\n"
11788
"hooks Show hooks.\n"
11789
"inventory Show inventory of the current working copy or a "
11790
"revision.\n"
11791
"local-time-offset Show the offset in seconds from GMT to local time.\n"
11792
"lookup-revision Lookup the revision-id from a revision-number\n"
11793
"merge-directive Generate a merge directive for auto-merge tools.\n"
11794
"modified List files modified in working tree.\n"
11795
"re-sign Create a digital signature for an existing revision.\n"
11796
"reference list, view and set branch locations for nested trees.\n"
11797
"relpath Show path of a file relative to root\n"
11798
"repair-workingtree Reset the working tree state file.\n"
11799
"revision-history Display the list of revision ids on a branch.\n"
11800
"revision-info Show revision number and revision id for a given "
11801
"revision\n"
11802
" identifier.\n"
11803
"rocks Statement of optimism.\n"
11804
"selftest Run internal test suite.\n"
11805
"shell-complete Show appropriate completions for context.\n"
11806
"test-script Run a shell-like test from a file.\n"
11807
"touching-revisions Return revision-ids which affected a particular file.\n"
11808
"unknowns List unknown files.\n"
11809
"wait-until-signalled Test helper for\n"
11810
" test_start_and_stop_bzr_subprocess_send_signal.\n"
11811
msgstr ""
11812
11813
#: en/help_topics/hooks.txt:1
11814
msgid ""
11815
"\n"
11816
"Hooks\n"
11817
"====="
11818
msgstr ""
11819
11820
#: en/help_topics/hooks.txt:5 en/help_topics/rules.txt:4
11821
msgid ""
11822
"Introduction\n"
11823
"------------"
11824
msgstr ""
11825
11826
#: en/help_topics/hooks.txt:8
11827
msgid "A hook of type *xxx* of class *yyy* needs to be registered using::"
11828
msgstr ""
11829
11830
#: en/help_topics/hooks.txt:10
11831
msgid " yyy.hooks.install_named_hook(\"xxx\", ...)"
11832
msgstr ""
11833
11834
#: en/help_topics/hooks.txt:12
11835
msgid ""
11836
"See :doc:`Using hooks<../user-guide/hooks>` in the User Guide for examples."
11837
msgstr ""
11838
11839
#: en/help_topics/hooks.txt:14
11840
msgid ""
11841
"The class that contains each hook is given before the hooks it supplies. "
11842
"For\n"
11843
"instance, BranchHooks as the class is the hooks class for\n"
11844
"`bzrlib.branch.Branch.hooks`."
11845
msgstr ""
11846
11847
#: en/help_topics/hooks.txt:18
11848
msgid ""
11849
"Each description also indicates whether the hook runs on the client (the\n"
11850
"machine where bzr was invoked) or the server (the machine addressed by\n"
11851
"the branch URL). These may be, but are not necessarily, the same machine."
11852
msgstr ""
11853
11854
#: en/help_topics/hooks.txt:22
11855
msgid ""
11856
"Plugins (including hooks) are run on the server if all of these is true:"
11857
msgstr ""
11858
11859
#: en/help_topics/hooks.txt:24
11860
msgid ""
11861
" * The connection is via a smart server (accessed with a URL starting with\n"
11862
" \"bzr://\", \"bzr+ssh://\" or \"bzr+http://\", or accessed via a "
11863
"\"http://\"\n"
11864
" URL when a smart server is available via HTTP)."
11865
msgstr ""
11866
11867
#: en/help_topics/hooks.txt:28
11868
msgid ""
11869
" * The hook is either server specific or part of general infrastructure "
11870
"rather\n"
11871
" than client specific code (such as commit)."
11872
msgstr ""
11873
11874
#: en/help_topics/hooks.txt:31
11875
msgid ""
11876
"\n"
11877
"BranchHooks\n"
11878
"-----------"
11879
msgstr ""
11880
11881
#: en/help_topics/hooks.txt:35
11882
msgid ""
11883
"automatic_tag_name\n"
11884
"~~~~~~~~~~~~~~~~~~"
11885
msgstr ""
11886
11887
#: en/help_topics/hooks.txt:38 en/help_topics/hooks.txt:56
11888
#: en/help_topics/hooks.txt:102 en/help_topics/hooks.txt:262
11889
msgid "Introduced in: 2.2"
11890
msgstr ""
11891
11892
#: en/help_topics/hooks.txt:40
11893
msgid ""
11894
"Called to determine an automatic tag name for a revision.\n"
11895
"automatic_tag_name is called with (branch, revision_id) and should\n"
11896
"return a tag name or None if no tag name could be determined. The\n"
11897
"first non-None tag name returned will be used."
11898
msgstr ""
11899
11900
#: en/help_topics/hooks.txt:45
11901
msgid ""
11902
"open\n"
11903
"~~~~"
11904
msgstr ""
11905
11906
#: en/help_topics/hooks.txt:48 en/help_topics/hooks.txt:293
11907
#: en/help_topics/hooks.txt:307
11908
msgid "Introduced in: 1.8"
11909
msgstr ""
11910
11911
#: en/help_topics/hooks.txt:50
11912
msgid ""
11913
"Called with the Branch object that has been opened after a branch is\n"
11914
"opened."
11915
msgstr ""
11916
11917
#: en/help_topics/hooks.txt:53
11918
msgid ""
11919
"post_branch_init\n"
11920
"~~~~~~~~~~~~~~~~"
11921
msgstr ""
11922
11923
#: en/help_topics/hooks.txt:58
11924
msgid ""
11925
"Called after new branch initialization completes. post_branch_init is\n"
11926
"called with a bzrlib.branch.BranchInitHookParams. Note that init,\n"
11927
"branch and checkout (both heavyweight and lightweight) will all\n"
11928
"trigger this hook."
11929
msgstr ""
11930
11931
#: en/help_topics/hooks.txt:63
11932
msgid ""
11933
"post_change_branch_tip\n"
11934
"~~~~~~~~~~~~~~~~~~~~~~"
11935
msgstr ""
11936
11937
#: en/help_topics/hooks.txt:66 en/help_topics/hooks.txt:421
11938
msgid "Introduced in: 1.4"
11939
msgstr ""
11940
11941
#: en/help_topics/hooks.txt:68
11942
msgid ""
11943
"Called in bzr client and server after a change to the tip of a branch\n"
11944
"is made. post_change_branch_tip is called with a\n"
11945
"bzrlib.branch.ChangeBranchTipParams. Note that push, pull, commit,\n"
11946
"uncommit will all trigger this hook."
11947
msgstr ""
11948
11949
#: en/help_topics/hooks.txt:73 en/help_topics/hooks.txt:392
11950
msgid ""
11951
"post_commit\n"
11952
"~~~~~~~~~~~"
11953
msgstr ""
11954
11955
#: en/help_topics/hooks.txt:76 en/help_topics/hooks.txt:86
11956
#: en/help_topics/hooks.txt:94 en/help_topics/hooks.txt:110
11957
msgid "Introduced in: 0.15"
11958
msgstr ""
11959
11960
#: en/help_topics/hooks.txt:78
11961
msgid ""
11962
"Called in the bzr client after a commit has completed. post_commit is\n"
11963
"called with (local, master, old_revno, old_revid, new_revno,\n"
11964
"new_revid). old_revid is NULL_REVISION for the first commit to a\n"
11965
"branch."
11966
msgstr ""
11967
11968
#: en/help_topics/hooks.txt:83
11969
msgid ""
11970
"post_pull\n"
11971
"~~~~~~~~~"
11972
msgstr ""
11973
11974
#: en/help_topics/hooks.txt:88
11975
msgid ""
11976
"Called after a pull operation completes. post_pull is called with a\n"
11977
"bzrlib.branch.PullResult object and only runs in the bzr client."
11978
msgstr ""
11979
11980
#: en/help_topics/hooks.txt:91
11981
msgid ""
11982
"post_push\n"
11983
"~~~~~~~~~"
11984
msgstr ""
11985
11986
#: en/help_topics/hooks.txt:96
11987
msgid ""
11988
"Called after a push operation completes. post_push is called with a\n"
11989
"bzrlib.branch.BranchPushResult object and only runs in the bzr client."
11990
msgstr ""
11991
11992
#: en/help_topics/hooks.txt:99
11993
msgid ""
11994
"post_switch\n"
11995
"~~~~~~~~~~~"
11996
msgstr ""
11997
11998
#: en/help_topics/hooks.txt:104
11999
msgid ""
12000
"Called after a checkout switches branch. post_switch is called with a\n"
12001
"bzrlib.branch.SwitchHookParams."
12002
msgstr ""
12003
12004
#: en/help_topics/hooks.txt:107
12005
msgid ""
12006
"post_uncommit\n"
12007
"~~~~~~~~~~~~~"
12008
msgstr ""
12009
12010
#: en/help_topics/hooks.txt:112
12011
msgid ""
12012
"Called in the bzr client after an uncommit completes. post_uncommit is\n"
12013
"called with (local, master, old_revno, old_revid, new_revno,\n"
12014
"new_revid) where local is the local branch or None, master is the\n"
12015
"target branch, and an empty branch receives new_revno of 0, new_revid\n"
12016
"of None."
12017
msgstr ""
12018
12019
#: en/help_topics/hooks.txt:118
12020
msgid ""
12021
"pre_change_branch_tip\n"
12022
"~~~~~~~~~~~~~~~~~~~~~"
12023
msgstr ""
12024
12025
#: en/help_topics/hooks.txt:121
12026
msgid "Introduced in: 1.6"
12027
msgstr ""
12028
12029
#: en/help_topics/hooks.txt:123
12030
msgid ""
12031
"Called in bzr client and server before a change to the tip of a branch\n"
12032
"is made. pre_change_branch_tip is called with a\n"
12033
"bzrlib.branch.ChangeBranchTipParams. Note that push, pull, commit,\n"
12034
"uncommit will all trigger this hook."
12035
msgstr ""
12036
12037
#: en/help_topics/hooks.txt:128
12038
msgid ""
12039
"pre_commit\n"
12040
"~~~~~~~~~~"
12041
msgstr ""
12042
12043
#: en/help_topics/hooks.txt:131
12044
msgid "Introduced in: 0.91"
12045
msgstr ""
12046
12047
#: en/help_topics/hooks.txt:133
12048
msgid ""
12049
"Called after a commit is calculated but before it is completed.\n"
12050
"pre_commit is called with (local, master, old_revno, old_revid,\n"
12051
"future_revno, future_revid, tree_delta, future_tree). old_revid is\n"
12052
"NULL_REVISION for the first commit to a branch, tree_delta is a\n"
12053
"TreeDelta object describing changes from the basis revision. hooks\n"
12054
"MUST NOT modify this delta. future_tree is an in-memory tree obtained\n"
12055
"from CommitBuilder.revision_tree() and hooks MUST NOT modify this\n"
12056
"tree."
12057
msgstr ""
12058
12059
#: en/help_topics/hooks.txt:142
12060
msgid ""
12061
"transform_fallback_location\n"
12062
"~~~~~~~~~~~~~~~~~~~~~~~~~~~"
12063
msgstr ""
12064
12065
#: en/help_topics/hooks.txt:145
12066
msgid "Introduced in: 1.9"
12067
msgstr ""
12068
12069
#: en/help_topics/hooks.txt:147
12070
msgid ""
12071
"Called when a stacked branch is activating its fallback locations.\n"
12072
"transform_fallback_location is called with (branch, url), and should\n"
12073
"return a new url. Returning the same url allows it to be used as-is,\n"
12074
"returning a different one can be used to cause the branch to stack on\n"
12075
"a closer copy of that fallback_location. Note that the branch cannot\n"
12076
"have history accessing methods called on it during this hook because\n"
12077
"the fallback locations have not been activated. When there are\n"
12078
"multiple hooks installed for transform_fallback_location, all are\n"
12079
"called with the url returned from the previous hook.The order is\n"
12080
"however undefined."
12081
msgstr ""
12082
12083
#: en/help_topics/hooks.txt:158
12084
msgid ""
12085
"CommandHooks\n"
12086
"------------"
12087
msgstr ""
12088
12089
#: en/help_topics/hooks.txt:161
12090
msgid ""
12091
"extend_command\n"
12092
"~~~~~~~~~~~~~~"
12093
msgstr ""
12094
12095
#: en/help_topics/hooks.txt:164
12096
msgid "Introduced in: 1.13"
12097
msgstr ""
12098
12099
#: en/help_topics/hooks.txt:166
12100
msgid ""
12101
"Called after creating a command object to allow modifications such as\n"
12102
"adding or removing options, docs etc. Called with the new\n"
12103
"bzrlib.commands.Command object."
12104
msgstr ""
12105
12106
#: en/help_topics/hooks.txt:170
12107
msgid ""
12108
"get_command\n"
12109
"~~~~~~~~~~~"
12110
msgstr ""
12111
12112
#: en/help_topics/hooks.txt:173 en/help_topics/hooks.txt:185
12113
#: en/help_topics/hooks.txt:194 en/help_topics/hooks.txt:467
12114
msgid "Introduced in: 1.17"
12115
msgstr ""
12116
12117
#: en/help_topics/hooks.txt:175
12118
msgid ""
12119
"Called when creating a single command. Called with (cmd_or_None,\n"
12120
"command_name). get_command should either return the cmd_or_None\n"
12121
"parameter, or a replacement Command object that should be used for the\n"
12122
"command. Note that the Command.hooks hooks are core infrastructure.\n"
12123
"Many users will prefer to use bzrlib.commands.register_command or\n"
12124
"plugin_cmds.register_lazy."
12125
msgstr ""
12126
12127
#: en/help_topics/hooks.txt:182
12128
msgid ""
12129
"get_missing_command\n"
12130
"~~~~~~~~~~~~~~~~~~~"
12131
msgstr ""
12132
12133
#: en/help_topics/hooks.txt:187
12134
msgid ""
12135
"Called when creating a single command if no command could be found.\n"
12136
"Called with (command_name). get_missing_command should either return\n"
12137
"None, or a Command object to be used for the command."
12138
msgstr ""
12139
12140
#: en/help_topics/hooks.txt:191
12141
msgid ""
12142
"list_commands\n"
12143
"~~~~~~~~~~~~~"
12144
msgstr ""
12145
12146
#: en/help_topics/hooks.txt:196
12147
msgid ""
12148
"Called when enumerating commands. Called with a set of cmd_name\n"
12149
"strings for all the commands found so far. This set is safe to mutate\n"
12150
"- e.g. to remove a command. list_commands should return the updated\n"
12151
"set of command names."
12152
msgstr ""
12153
12154
#: en/help_topics/hooks.txt:201
12155
msgid ""
12156
"post_command\n"
12157
"~~~~~~~~~~~~"
12158
msgstr ""
12159
12160
#: en/help_topics/hooks.txt:204 en/help_topics/hooks.txt:211
12161
msgid "Introduced in: 2.6"
12162
msgstr ""
12163
12164
#: en/help_topics/hooks.txt:206
12165
msgid "Called after executing a command. Called with the command object."
12166
msgstr ""
12167
12168
#: en/help_topics/hooks.txt:208
12169
msgid ""
12170
"pre_command\n"
12171
"~~~~~~~~~~~"
12172
msgstr ""
12173
12174
#: en/help_topics/hooks.txt:213
12175
msgid "Called prior to executing a command. Called with the command object."
12176
msgstr ""
12177
12178
#: en/help_topics/hooks.txt:215
12179
msgid ""
12180
"_ConfigHooks\n"
12181
"------------"
12182
msgstr ""
12183
12184
#: en/help_topics/hooks.txt:218
12185
msgid ""
12186
"get\n"
12187
"~~~"
12188
msgstr ""
12189
12190
#: en/help_topics/hooks.txt:221 en/help_topics/hooks.txt:229
12191
#: en/help_topics/hooks.txt:236 en/help_topics/hooks.txt:244
12192
#: en/help_topics/hooks.txt:251 en/help_topics/hooks.txt:373
12193
#: en/help_topics/hooks.txt:446
12194
msgid "Introduced in: 2.4"
12195
msgstr ""
12196
12197
#: en/help_topics/hooks.txt:223
12198
msgid ""
12199
"Invoked when a config option is read. The signature is (stack, name,\n"
12200
"value)."
12201
msgstr ""
12202
12203
#: en/help_topics/hooks.txt:226
12204
msgid ""
12205
"load\n"
12206
"~~~~"
12207
msgstr ""
12208
12209
#: en/help_topics/hooks.txt:231
12210
msgid "Invoked when a config store is loaded. The signature is (store)."
12211
msgstr ""
12212
12213
#: en/help_topics/hooks.txt:233
12214
msgid ""
12215
"remove\n"
12216
"~~~~~~"
12217
msgstr ""
12218
12219
#: en/help_topics/hooks.txt:238
12220
msgid ""
12221
"Invoked when a config option is removed. The signature is (stack,\n"
12222
"name)."
12223
msgstr ""
12224
12225
#: en/help_topics/hooks.txt:241
12226
msgid ""
12227
"save\n"
12228
"~~~~"
12229
msgstr ""
12230
12231
#: en/help_topics/hooks.txt:246
12232
msgid "Invoked when a config store is saved. The signature is (store)."
12233
msgstr ""
12234
12235
#: en/help_topics/hooks.txt:248
12236
msgid ""
12237
"set\n"
12238
"~~~"
12239
msgstr ""
12240
12241
#: en/help_topics/hooks.txt:253
12242
msgid ""
12243
"Invoked when a config option is set. The signature is (stack, name,\n"
12244
"value)."
12245
msgstr ""
12246
12247
#: en/help_topics/hooks.txt:256
12248
msgid ""
12249
"ControlDirHooks\n"
12250
"---------------"
12251
msgstr ""
12252
12253
#: en/help_topics/hooks.txt:259
12254
msgid ""
12255
"post_repo_init\n"
12256
"~~~~~~~~~~~~~~"
12257
msgstr ""
12258
12259
#: en/help_topics/hooks.txt:264
12260
msgid ""
12261
"Invoked after a repository has been initialized. post_repo_init is\n"
12262
"called with a bzrlib.controldir.RepoInitHookParams."
12263
msgstr ""
12264
12265
#: en/help_topics/hooks.txt:267
12266
msgid ""
12267
"pre_open\n"
12268
"~~~~~~~~"
12269
msgstr ""
12270
12271
#: en/help_topics/hooks.txt:270
12272
msgid "Introduced in: 1.14"
12273
msgstr ""
12274
12275
#: en/help_topics/hooks.txt:272
12276
msgid ""
12277
"Invoked before attempting to open a ControlDir with the transport that\n"
12278
"the open will use."
12279
msgstr ""
12280
12281
#: en/help_topics/hooks.txt:275
12282
msgid ""
12283
"InfoHooks\n"
12284
"---------"
12285
msgstr ""
12286
12287
#: en/help_topics/hooks.txt:278
12288
msgid ""
12289
"repository\n"
12290
"~~~~~~~~~~"
12291
msgstr ""
12292
12293
#: en/help_topics/hooks.txt:281 en/help_topics/hooks.txt:300
12294
#: en/help_topics/hooks.txt:524
12295
msgid "Introduced in: 1.15"
12296
msgstr ""
12297
12298
#: en/help_topics/hooks.txt:283
12299
msgid ""
12300
"Invoked when displaying the statistics for a repository. repository is\n"
12301
"called with a statistics dictionary as returned by the repository and\n"
12302
"a file-like object to write to."
12303
msgstr ""
12304
12305
#: en/help_topics/hooks.txt:287
12306
msgid ""
12307
"LockHooks\n"
12308
"---------"
12309
msgstr ""
12310
12311
#: en/help_topics/hooks.txt:290
12312
msgid ""
12313
"lock_acquired\n"
12314
"~~~~~~~~~~~~~"
12315
msgstr ""
12316
12317
#: en/help_topics/hooks.txt:295
12318
msgid ""
12319
"Called with a bzrlib.lock.LockResult when a physical lock is acquired."
12320
msgstr ""
12321
12322
#: en/help_topics/hooks.txt:297
12323
msgid ""
12324
"lock_broken\n"
12325
"~~~~~~~~~~~"
12326
msgstr ""
12327
12328
#: en/help_topics/hooks.txt:302
12329
msgid "Called with a bzrlib.lock.LockResult when a physical lock is broken."
12330
msgstr ""
12331
12332
#: en/help_topics/hooks.txt:304
12333
msgid ""
12334
"lock_released\n"
12335
"~~~~~~~~~~~~~"
12336
msgstr ""
12337
12338
#: en/help_topics/hooks.txt:309
12339
msgid ""
12340
"Called with a bzrlib.lock.LockResult when a physical lock is released."
12341
msgstr ""
12342
12343
#: en/help_topics/hooks.txt:311
12344
msgid ""
12345
"MergeHooks\n"
12346
"----------"
12347
msgstr ""
12348
12349
#: en/help_topics/hooks.txt:314
12350
msgid ""
12351
"merge_file_content\n"
12352
"~~~~~~~~~~~~~~~~~~"
12353
msgstr ""
12354
12355
#: en/help_topics/hooks.txt:317
12356
msgid "Introduced in: 2.1"
12357
msgstr ""
12358
12359
#: en/help_topics/hooks.txt:319
12360
msgid ""
12361
"Called with a bzrlib.merge.Merger object to create a per file merge\n"
12362
"object when starting a merge. Should return either None or a subclass\n"
12363
"of ``bzrlib.merge.AbstractPerFileMerger``. Such objects will then be\n"
12364
"called per file that needs to be merged (including when one side has\n"
12365
"deleted the file and the other has changed it). See the\n"
12366
"AbstractPerFileMerger API docs for details on how it is used by merge."
12367
msgstr ""
12368
12369
#: en/help_topics/hooks.txt:326
12370
msgid ""
12371
"post_merge\n"
12372
"~~~~~~~~~~"
12373
msgstr ""
12374
12375
#: en/help_topics/hooks.txt:329 en/help_topics/hooks.txt:337
12376
#: en/help_topics/hooks.txt:387 en/help_topics/hooks.txt:405
12377
#: en/help_topics/hooks.txt:413 en/help_topics/hooks.txt:512
12378
msgid "Introduced in: 2.5"
12379
msgstr ""
12380
12381
#: en/help_topics/hooks.txt:331
12382
msgid ""
12383
"Called after a merge. Receives a Merger object as the single argument.\n"
12384
"The return value is ignored."
12385
msgstr ""
12386
12387
#: en/help_topics/hooks.txt:334
12388
msgid ""
12389
"pre_merge\n"
12390
"~~~~~~~~~"
12391
msgstr ""
12392
12393
#: en/help_topics/hooks.txt:339
12394
msgid ""
12395
"Called before a merge. Receives a Merger object as the single\n"
12396
"argument."
12397
msgstr ""
12398
12399
#: en/help_topics/hooks.txt:342
12400
msgid ""
12401
"MergeDirectiveHooks\n"
12402
"-------------------"
12403
msgstr ""
12404
12405
#: en/help_topics/hooks.txt:345
12406
msgid ""
12407
"merge_request_body\n"
12408
"~~~~~~~~~~~~~~~~~~"
12409
msgstr ""
12410
12411
#: en/help_topics/hooks.txt:348
12412
msgid "Introduced in: 1.15.0"
12413
msgstr ""
12414
12415
#: en/help_topics/hooks.txt:350
12416
msgid ""
12417
"Called with a MergeRequestBodyParams when a body is needed for a merge\n"
12418
"request. Callbacks must return a body. If more than one callback is\n"
12419
"registered, the output of one callback is provided to the next."
12420
msgstr ""
12421
12422
#: en/help_topics/hooks.txt:354
12423
msgid ""
12424
"MessageEditorHooks\n"
12425
"------------------"
12426
msgstr ""
12427
12428
#: en/help_topics/hooks.txt:357
12429
msgid ""
12430
"commit_message_template\n"
12431
"~~~~~~~~~~~~~~~~~~~~~~~"
12432
msgstr ""
12433
12434
#: en/help_topics/hooks.txt:360
12435
msgid "Introduced in: 1.10"
12436
msgstr ""
12437
12438
#: en/help_topics/hooks.txt:362
12439
msgid ""
12440
"Called when a commit message is being generated.\n"
12441
"commit_message_template is called with the bzrlib.commit.Commit object\n"
12442
"and the message that is known so far. commit_message_template must\n"
12443
"return a new message to use (which could be the same as it was given).\n"
12444
"When there are multiple hooks registered for commit_message_template,\n"
12445
"they are chained with the result from the first passed into the\n"
12446
"second, and so on."
12447
msgstr ""
12448
12449
#: en/help_topics/hooks.txt:370
12450
msgid ""
12451
"set_commit_message\n"
12452
"~~~~~~~~~~~~~~~~~~"
12453
msgstr ""
12454
12455
#: en/help_topics/hooks.txt:375
12456
msgid ""
12457
"Set a fixed commit message. set_commit_message is called with the\n"
12458
"bzrlib.commit.Commit object (so you can also change e.g. revision\n"
12459
"properties by editing commit.builder._revprops) and the message so\n"
12460
"far. set_commit_message must return the message to use or None if it\n"
12461
"should use the message editor as normal."
12462
msgstr ""
12463
12464
#: en/help_topics/hooks.txt:381
12465
msgid ""
12466
"MutableTreeHooks\n"
12467
"----------------"
12468
msgstr ""
12469
12470
#: en/help_topics/hooks.txt:384
12471
msgid ""
12472
"post_build_tree\n"
12473
"~~~~~~~~~~~~~~~"
12474
msgstr ""
12475
12476
#: en/help_topics/hooks.txt:389
12477
msgid ""
12478
"Called after a completely new tree is built. The hook is called with\n"
12479
"the tree as its only argument."
12480
msgstr ""
12481
12482
#: en/help_topics/hooks.txt:395
12483
msgid "Introduced in: 2.0"
12484
msgstr ""
12485
12486
#: en/help_topics/hooks.txt:397
12487
msgid ""
12488
"Called after a commit is performed on a tree. The hook is called with\n"
12489
"a bzrlib.mutabletree.PostCommitHookParams object. The mutable tree the\n"
12490
"commit was performed on is available via the mutable_tree attribute of\n"
12491
"that object."
12492
msgstr ""
12493
12494
#: en/help_topics/hooks.txt:402
12495
msgid ""
12496
"post_transform\n"
12497
"~~~~~~~~~~~~~~"
12498
msgstr ""
12499
12500
#: en/help_topics/hooks.txt:407
12501
msgid ""
12502
"Called after a tree transform has been performed on a tree. The hook\n"
12503
"is called with the tree that is being transformed and the transform."
12504
msgstr ""
12505
12506
#: en/help_topics/hooks.txt:410
12507
msgid ""
12508
"pre_transform\n"
12509
"~~~~~~~~~~~~~"
12510
msgstr ""
12511
12512
#: en/help_topics/hooks.txt:415
12513
msgid ""
12514
"Called before a tree transform on this tree. The hook is called with\n"
12515
"the tree that is being transformed and the transform."
12516
msgstr ""
12517
12518
#: en/help_topics/hooks.txt:418
12519
msgid ""
12520
"start_commit\n"
12521
"~~~~~~~~~~~~"
12522
msgstr ""
12523
12524
#: en/help_topics/hooks.txt:423
12525
msgid ""
12526
"Called before a commit is performed on a tree. The start commit hook\n"
12527
"is able to change the tree before the commit takes place. start_commit\n"
12528
"is called with the bzrlib.mutabletree.MutableTree that the commit is\n"
12529
"being performed on."
12530
msgstr ""
12531
12532
#: en/help_topics/hooks.txt:428
12533
msgid ""
12534
"SmartClientHooks\n"
12535
"----------------"
12536
msgstr ""
12537
12538
#: en/help_topics/hooks.txt:431
12539
msgid ""
12540
"call\n"
12541
"~~~~"
12542
msgstr ""
12543
12544
#: en/help_topics/hooks.txt:434
12545
msgid "Introduced in: unknown"
12546
msgstr ""
12547
12548
#: en/help_topics/hooks.txt:436
12549
msgid ""
12550
"Called when the smart client is submitting a request to the smart\n"
12551
"server. Called with a bzrlib.smart.client.CallHookParams object.\n"
12552
"Streaming request bodies, and responses, are not accessible."
12553
msgstr ""
12554
12555
#: en/help_topics/hooks.txt:440
12556
msgid ""
12557
"SmartServerHooks\n"
12558
"----------------"
12559
msgstr ""
12560
12561
#: en/help_topics/hooks.txt:443
12562
msgid ""
12563
"server_exception\n"
12564
"~~~~~~~~~~~~~~~~"
12565
msgstr ""
12566
12567
#: en/help_topics/hooks.txt:448
12568
msgid ""
12569
"Called by the bzr server when an exception occurs. server_exception is\n"
12570
"called with the sys.exc_info() tuple return true for the hook if the\n"
12571
"exception has been handled, in which case the server will exit\n"
12572
"normally."
12573
msgstr ""
12574
12575
#: en/help_topics/hooks.txt:453
12576
msgid ""
12577
"server_started\n"
12578
"~~~~~~~~~~~~~~"
12579
msgstr ""
12580
12581
#: en/help_topics/hooks.txt:456 en/help_topics/hooks.txt:475
12582
msgid "Introduced in: 0.16"
12583
msgstr ""
12584
12585
#: en/help_topics/hooks.txt:458
12586
msgid ""
12587
"Called by the bzr server when it starts serving a directory.\n"
12588
"server_started is called with (backing urls, public url), where\n"
12589
"backing_url is a list of URLs giving the server-specific directory\n"
12590
"locations, and public_url is the public URL for the directory being\n"
12591
"served."
12592
msgstr ""
12593
12594
#: en/help_topics/hooks.txt:464
12595
msgid ""
12596
"server_started_ex\n"
12597
"~~~~~~~~~~~~~~~~~"
12598
msgstr ""
12599
12600
#: en/help_topics/hooks.txt:469
12601
msgid ""
12602
"Called by the bzr server when it starts serving a directory.\n"
12603
"server_started is called with (backing_urls, server_obj)."
12604
msgstr ""
12605
12606
#: en/help_topics/hooks.txt:472
12607
msgid ""
12608
"server_stopped\n"
12609
"~~~~~~~~~~~~~~"
12610
msgstr ""
12611
12612
#: en/help_topics/hooks.txt:477
12613
msgid ""
12614
"Called by the bzr server when it stops serving a directory.\n"
12615
"server_stopped is called with the same parameters as the\n"
12616
"server_started hook: (backing_urls, public_url)."
12617
msgstr ""
12618
12619
#: en/help_topics/hooks.txt:481
12620
msgid ""
12621
"StatusHooks\n"
12622
"-----------"
12623
msgstr ""
12624
12625
#: en/help_topics/hooks.txt:484
12626
msgid ""
12627
"post_status\n"
12628
"~~~~~~~~~~~"
12629
msgstr ""
12630
12631
#: en/help_topics/hooks.txt:487 en/help_topics/hooks.txt:498
12632
msgid "Introduced in: 2.3"
12633
msgstr ""
12634
12635
#: en/help_topics/hooks.txt:489
12636
msgid ""
12637
"Called with argument StatusHookParams after Bazaar has displayed the\n"
12638
"status. StatusHookParams has the attributes (old_tree, new_tree,\n"
12639
"to_file, versioned, show_ids, short, verbose). The last four arguments\n"
12640
"correspond to the command line options specified by the user for the\n"
12641
"status command. to_file is the output stream for writing."
12642
msgstr ""
12643
12644
#: en/help_topics/hooks.txt:495
12645
msgid ""
12646
"pre_status\n"
12647
"~~~~~~~~~~"
12648
msgstr ""
12649
12650
#: en/help_topics/hooks.txt:500
12651
msgid ""
12652
"Called with argument StatusHookParams before Bazaar displays the\n"
12653
"status. StatusHookParams has the attributes (old_tree, new_tree,\n"
12654
"to_file, versioned, show_ids, short, verbose). The last four arguments\n"
12655
"correspond to the command line options specified by the user for the\n"
12656
"status command. to_file is the output stream for writing."
12657
msgstr ""
12658
12659
#: en/help_topics/hooks.txt:506
12660
msgid ""
12661
"TransportHooks\n"
12662
"--------------"
12663
msgstr ""
12664
12665
#: en/help_topics/hooks.txt:509
12666
msgid ""
12667
"post_connect\n"
12668
"~~~~~~~~~~~~"
12669
msgstr ""
12670
12671
#: en/help_topics/hooks.txt:514
12672
msgid ""
12673
"Called after a new connection is established or a reconnect occurs.\n"
12674
"The sole argument passed is either the connected transport or smart\n"
12675
"medium instance."
12676
msgstr ""
12677
12678
#: en/help_topics/hooks.txt:518
12679
msgid ""
12680
"RioVersionInfoBuilderHooks\n"
12681
"--------------------------"
12682
msgstr ""
12683
12684
#: en/help_topics/hooks.txt:521
12685
msgid ""
12686
"revision\n"
12687
"~~~~~~~~"
12688
msgstr ""
12689
12690
#: en/help_topics/hooks.txt:526
12691
msgid ""
12692
"Invoked when adding information about a revision to the RIO stanza\n"
12693
"that is printed. revision is called with a revision object and a RIO\n"
12694
"stanza.\n"
12695
msgstr ""
12696
12697
#: en/help_topics/location-alias.txt:1
12698
msgid ""
12699
"Location aliases\n"
12700
"================"
12701
msgstr ""
12702
12703
#: en/help_topics/location-alias.txt:4
12704
msgid ""
12705
"Bazaar defines several aliases for locations associated with a branch. "
12706
"These\n"
12707
"can be used with most commands that expect a location, such as `bzr push`."
12708
msgstr ""
12709
12710
#: en/help_topics/location-alias.txt:7
12711
msgid "The aliases are::"
12712
msgstr ""
12713
12714
#: en/help_topics/location-alias.txt:9
12715
msgid ""
12716
" :bound The branch this branch is bound to, for bound branches.\n"
12717
" :parent The parent of this branch.\n"
12718
" :public The public location of this branch.\n"
12719
" :push The saved location used for `bzr push` with no arguments.\n"
12720
" :submit The submit branch for this branch.\n"
12721
" :this This branch."
12722
msgstr ""
12723
12724
#: en/help_topics/location-alias.txt:16
12725
msgid "For example, to push to the parent location::"
12726
msgstr ""
12727
12728
#: en/help_topics/location-alias.txt:18
12729
msgid " bzr push :parent\n"
12730
msgstr ""
12731
12732
#: en/help_topics/log-formats.txt:1
12733
msgid ""
12734
"Log Formats\n"
12735
"==========="
12736
msgstr ""
12737
12738
#: en/help_topics/log-formats.txt:4
12739
msgid ""
12740
"A log format controls how information about each revision is displayed.\n"
12741
"The standard log formats are compared below::"
12742
msgstr ""
12743
12744
#: en/help_topics/log-formats.txt:7
12745
msgid ""
12746
" Feature long short line\n"
12747
" ---------------------- ------------- ------------ -------------------\n"
12748
" design goal detailed view concise view 1 revision per line\n"
12749
" committer name+email name only name only\n"
12750
" author name+email - -\n"
12751
" date-time format full date only date only\n"
12752
" commit message full full top line\n"
12753
" tags yes yes yes\n"
12754
" merges indicator - yes -\n"
12755
" status/delta optional optional -\n"
12756
" diff/patch optional optional -\n"
12757
" revision-id optional optional -\n"
12758
" branch nick yes - -\n"
12759
" foreign vcs properties yes yes -\n"
12760
" preferred levels all 1 1\n"
12761
" digital signature optional - -"
12762
msgstr ""
12763
12764
#: en/help_topics/log-formats.txt:24
12765
msgid ""
12766
"The default format is ``long``. To change this, define the ``log_format``\n"
12767
"setting in the ``[DEFAULT]`` section of ``bazaar.conf`` like this (say)::"
12768
msgstr ""
12769
12770
#: en/help_topics/log-formats.txt:27
12771
msgid ""
12772
" [DEFAULT]\n"
12773
" log_format = short"
12774
msgstr ""
12775
12776
#: en/help_topics/log-formats.txt:30
12777
msgid ""
12778
"Alternatively, to change the log format used for a given query, use the\n"
12779
"--long, --short or --line options."
12780
msgstr ""
12781
12782
#: en/help_topics/log-formats.txt:33
12783
msgid ""
12784
"If one of the standard log formats does not meet your needs, additional\n"
12785
"formats can be provided by plugins.\n"
12786
msgstr ""
12787
12788
#: en/help_topics/other-formats.txt:1
12789
msgid "Other Storage Formats"
12790
msgstr ""
12791
12792
#: en/help_topics/other-formats.txt:3
12793
msgid "Experimental formats are shown below."
12794
msgstr ""
12795
12796
#: en/help_topics/other-formats.txt:5
12797
msgid ""
12798
":development-colo:\n"
12799
" (native) The 2a format with experimental support for colocated\n"
12800
" branches."
12801
msgstr ""
12802
12803
#: en/help_topics/other-formats.txt:9
12804
msgid ""
12805
"\n"
12806
"Deprecated formats are shown below."
12807
msgstr ""
12808
12809
#: en/help_topics/other-formats.txt:12
12810
msgid ""
12811
":pack-0.92:\n"
12812
" (native) Pack-based format used in 1.x series. Introduced in 0.92.\n"
12813
" Interoperates with bzr repositories before 0.92 but cannot be read\n"
12814
" by bzr < 0.92."
12815
msgstr ""
12816
12817
#: en/help_topics/patterns.txt:1
12818
msgid ""
12819
"Patterns\n"
12820
"========"
12821
msgstr ""
12822
12823
#: en/help_topics/patterns.txt:4
12824
msgid ""
12825
"Bazaar uses patterns to match files at various times. For example,\n"
12826
"the ``add`` command skips over files that match ignore patterns\n"
12827
"and preferences can be associated with files using rule patterns.\n"
12828
"The pattern syntax is described below."
12829
msgstr ""
12830
12831
#: en/help_topics/patterns.txt:9
12832
msgid ""
12833
"Trailing slashes on patterns are ignored. If the pattern contains a\n"
12834
"slash or is a regular expression, it is compared to the whole path\n"
12835
"from the branch root. Otherwise, it is compared to only the last\n"
12836
"component of the path. To match a file only in the root directory,\n"
12837
"prepend ``./``. Patterns specifying absolute paths are not allowed."
12838
msgstr ""
12839
12840
#: en/help_topics/patterns.txt:15
12841
msgid "Patterns may include globbing wildcards such as::"
12842
msgstr ""
12843
12844
#: en/help_topics/patterns.txt:17
12845
msgid ""
12846
" ? - Matches any single character except '/'\n"
12847
" * - Matches 0 or more characters except '/'\n"
12848
" /**/ - Matches 0 or more directories in a path\n"
12849
" [a-z] - Matches a single character from within a group of characters"
12850
msgstr ""
12851
12852
#: en/help_topics/patterns.txt:22
12853
msgid ""
12854
"Patterns may also be `Python regular expressions`_. Regular expression\n"
12855
"patterns are identified by a ``RE:`` prefix followed by the regular\n"
12856
"expression. Regular expression patterns may not include named or\n"
12857
"numbered groups."
12858
msgstr ""
12859
12860
#: en/help_topics/patterns.txt:27
12861
msgid ""
12862
"Case insensitive ignore patterns can be specified with regular expressions\n"
12863
"by using the ``i`` (for ignore case) flag in the pattern."
12864
msgstr ""
12865
12866
#: en/help_topics/patterns.txt:30
12867
msgid ""
12868
"For example, a case insensitive match for ``foo`` may be specified as::"
12869
msgstr ""
12870
12871
#: en/help_topics/patterns.txt:32
12872
msgid " RE:(?i)foo"
12873
msgstr ""
12874
12875
#: en/help_topics/patterns.txt:34
12876
msgid ""
12877
"Ignore patterns may be prefixed with ``!``, which means that a filename\n"
12878
"matched by that pattern will not be ignored."
12879
msgstr ""
12880
12881
#: en/help_topics/patterns.txt:37
12882
msgid ""
12883
".. _Python regular expressions: http://docs.python.org/library/re.html"
12884
msgstr ""
12885
12886
#: en/help_topics/revisionspec.txt:1
12887
msgid "Revision Identifiers"
12888
msgstr ""
12889
12890
#: en/help_topics/revisionspec.txt:3
12891
msgid ""
12892
"A revision identifier refers to a specific state of a branch's history. It\n"
12893
"can be expressed in several ways. It can begin with a keyword to\n"
12894
"unambiguously specify a given lookup type; some examples are 'last:1',\n"
12895
"'before:yesterday' and 'submit:'."
12896
msgstr ""
12897
12898
#: en/help_topics/revisionspec.txt:8
12899
msgid ""
12900
"Alternately, it can be given without a keyword, in which case it will be\n"
12901
"checked as a revision number, a tag, a revision id, a date specification, or "
12902
"a\n"
12903
"branch specification, in that order. For example, 'date:today' could be\n"
12904
"written as simply 'today', though if you have a tag called 'today' that "
12905
"will\n"
12906
"be found first."
12907
msgstr ""
12908
12909
#: en/help_topics/revisionspec.txt:14
12910
msgid ""
12911
"If 'REV1' and 'REV2' are revision identifiers, then 'REV1..REV2' denotes a\n"
12912
"revision range. Examples: '3647..3649', 'date:yesterday..-1' and\n"
12913
"'branch:/path/to/branch1/..branch:/branch2' (note that there are no quotes "
12914
"or\n"
12915
"spaces around the '..')."
12916
msgstr ""
12917
12918
#: en/help_topics/revisionspec.txt:19
12919
msgid ""
12920
"Ranges are interpreted differently by different commands. To the \"log\" "
12921
"command,\n"
12922
"a range is a sequence of log messages, but to the \"diff\" command, the "
12923
"range\n"
12924
"denotes a change between revisions (and not a sequence of changes). In\n"
12925
"addition, \"log\" considers a closed range whereas \"diff\" and \"merge\" "
12926
"consider it\n"
12927
"to be open-ended, that is, they include one end but not the other. For "
12928
"example:\n"
12929
"\"bzr log -r 3647..3649\" shows the messages of revisions 3647, 3648 and "
12930
"3649,\n"
12931
"while \"bzr diff -r 3647..3649\" includes the changes done in revisions 3648 "
12932
"and\n"
12933
"3649, but not 3647."
12934
msgstr ""
12935
12936
#: en/help_topics/revisionspec.txt:28
12937
msgid "The keywords used as revision selection methods are the following:"
12938
msgstr ""
12939
12940
#: en/help_topics/revisionspec.txt:30
12941
msgid ""
12942
":revid:\n"
12943
"\tSelects a revision using the revision id.\n"
12944
":submit:\n"
12945
"\tSelects a common ancestor with the submit branch.\n"
12946
":ancestor:\n"
12947
"\tSelects a common ancestor with a second branch.\n"
12948
":date:\n"
12949
"\tSelects a revision on the basis of a datestamp.\n"
12950
":branch:\n"
12951
"\tSelects the last revision of a specified branch.\n"
12952
":tag:\n"
12953
"\tSelects a revision identified by a tag name.\n"
12954
":revno:\n"
12955
"\tSelects a revision using a number.\n"
12956
":before:\n"
12957
"\tSelects the parent of the revision specified.\n"
12958
":annotate:\n"
12959
"\tSelect the revision that last modified the specified line.\n"
12960
":mainline:\n"
12961
"\tSelect mainline revision that merged the specified revision.\n"
12962
":last:\n"
12963
"\tSelects the nth revision from the end."
12964
msgstr ""
12965
12966
#: en/help_topics/revisionspec.txt:53
12967
msgid "In addition, plugins can provide other keywords."
12968
msgstr ""
12969
12970
#: en/help_topics/revisionspec.txt:55
12971
msgid "A detailed description of each keyword is given below."
12972
msgstr ""
12973
12974
#: en/help_topics/revisionspec.txt:57
12975
msgid ":revid:"
12976
msgstr ""
12977
12978
#: en/help_topics/revisionspec.txt:59
12979
msgid ""
12980
" Supply a specific revision id, that can be used to specify any\n"
12981
" revision id in the ancestry of the branch.\n"
12982
" Including merges, and pending merges.\n"
12983
" Examples::"
12984
msgstr ""
12985
12986
#: en/help_topics/revisionspec.txt:64
12987
msgid ""
12988
" revid:aaaa@bbbb-123456789 -> Select revision 'aaaa@bbbb-123456789'"
12989
msgstr ""
12990
12991
#: en/help_topics/revisionspec.txt:66
12992
msgid ":submit:"
12993
msgstr ""
12994
12995
#: en/help_topics/revisionspec.txt:68
12996
msgid ""
12997
" Diffing against this shows all the changes that were made in this "
12998
"branch,\n"
12999
" and is a good predictor of what merge will do. The submit branch is\n"
13000
" used by the bundle and merge directive commands. If no submit branch\n"
13001
" is specified, the parent branch is used instead."
13002
msgstr ""
13003
13004
#: en/help_topics/revisionspec.txt:73 en/help_topics/revisionspec.txt:85
13005
msgid ""
13006
" The common ancestor is the last revision that existed in both\n"
13007
" branches. Usually this is the branch point, but it could also be\n"
13008
" a revision that was merged."
13009
msgstr ""
13010
13011
#: en/help_topics/revisionspec.txt:77 en/help_topics/revisionspec.txt:93
13012
#: en/help_topics/revisionspec.txt:109 en/help_topics/revisionspec.txt:119
13013
#: en/help_topics/revisionspec.txt:153
13014
msgid " Examples::"
13015
msgstr ""
13016
13017
#: en/help_topics/revisionspec.txt:79
13018
msgid " $ bzr diff -r submit:"
13019
msgstr ""
13020
13021
#: en/help_topics/revisionspec.txt:81
13022
msgid ":ancestor:"
13023
msgstr ""
13024
13025
#: en/help_topics/revisionspec.txt:83
13026
msgid " Supply the path to a branch to select the common ancestor."
13027
msgstr ""
13028
13029
#: en/help_topics/revisionspec.txt:89
13030
msgid ""
13031
" This is frequently used with 'diff' to return all of the changes\n"
13032
" that your branch introduces, while excluding the changes that you\n"
13033
" have not merged from the remote branch."
13034
msgstr ""
13035
13036
#: en/help_topics/revisionspec.txt:95
13037
msgid ""
13038
" ancestor:/path/to/branch\n"
13039
" $ bzr diff -r ancestor:../../mainline/branch"
13040
msgstr ""
13041
13042
#: en/help_topics/revisionspec.txt:98
13043
msgid ":date:"
13044
msgstr ""
13045
13046
#: en/help_topics/revisionspec.txt:100
13047
msgid ""
13048
" Supply a datestamp to select the first revision that matches the date.\n"
13049
" Date can be 'yesterday', 'today', 'tomorrow' or a YYYY-MM-DD string.\n"
13050
" Matches the first entry after a given date (either at midnight or\n"
13051
" at a specified time)."
13052
msgstr ""
13053
13054
#: en/help_topics/revisionspec.txt:105
13055
msgid " One way to display all the changes since yesterday would be::"
13056
msgstr ""
13057
13058
#: en/help_topics/revisionspec.txt:107
13059
msgid " bzr log -r date:yesterday.."
13060
msgstr ""
13061
13062
#: en/help_topics/revisionspec.txt:111
13063
msgid ""
13064
" date:yesterday -> select the first revision since "
13065
"yesterday\n"
13066
" date:2006-08-14,17:10:14 -> select the first revision after\n"
13067
" August 14th, 2006 at 5:10pm."
13068
msgstr ""
13069
13070
#: en/help_topics/revisionspec.txt:115
13071
msgid ":branch:"
13072
msgstr ""
13073
13074
#: en/help_topics/revisionspec.txt:117
13075
msgid " Supply the path to a branch to select its last revision."
13076
msgstr ""
13077
13078
#: en/help_topics/revisionspec.txt:121
13079
msgid " branch:/path/to/branch"
13080
msgstr ""
13081
13082
#: en/help_topics/revisionspec.txt:123
13083
msgid ":tag:"
13084
msgstr ""
13085
13086
#: en/help_topics/revisionspec.txt:125
13087
msgid " Tags are stored in the branch and created by the 'tag' command."
13088
msgstr ""
13089
13090
#: en/help_topics/revisionspec.txt:127
13091
msgid ":revno:"
13092
msgstr ""
13093
13094
#: en/help_topics/revisionspec.txt:129
13095
msgid ""
13096
" Use an integer to specify a revision in the history of the branch.\n"
13097
" Optionally a branch can be specified. A negative number will count\n"
13098
" from the end of the branch (-1 is the last revision, -2 the previous\n"
13099
" one). If the negative number is larger than the branch's history, the\n"
13100
" first revision is returned.\n"
13101
" Examples::"
13102
msgstr ""
13103
13104
#: en/help_topics/revisionspec.txt:136
13105
msgid ""
13106
" revno:1 -> return the first revision of this branch\n"
13107
" revno:3:/path/to/branch -> return the 3rd revision of\n"
13108
" the branch '/path/to/branch'\n"
13109
" revno:-1 -> The last revision in a branch.\n"
13110
" -2:http://other/branch -> The second to last revision in the\n"
13111
" remote branch.\n"
13112
" -1000000 -> Most likely the first revision, unless\n"
13113
" your history is very long."
13114
msgstr ""
13115
13116
#: en/help_topics/revisionspec.txt:145
13117
msgid ":before:"
13118
msgstr ""
13119
13120
#: en/help_topics/revisionspec.txt:147
13121
msgid ""
13122
" Supply any revision spec to return the parent of that revision. This "
13123
"is\n"
13124
" mostly useful when inspecting revisions that are not in the revision "
13125
"history\n"
13126
" of a branch."
13127
msgstr ""
13128
13129
#: en/help_topics/revisionspec.txt:151
13130
msgid ""
13131
" It is an error to request the parent of the null revision (before:0)."
13132
msgstr ""
13133
13134
#: en/help_topics/revisionspec.txt:155
13135
msgid ""
13136
" before:1913 -> Return the parent of revno 1913 (revno 1912)\n"
13137
" before:revid:aaaa@bbbb-1234567890 -> return the parent of revision\n"
13138
" aaaa@bbbb-1234567890\n"
13139
" bzr diff -r before:1913..1913\n"
13140
" -> Find the changes between revision 1913 and its parent "
13141
"(1912).\n"
13142
" (What changes did revision 1913 introduce).\n"
13143
" This is equivalent to: bzr diff -c 1913"
13144
msgstr ""
13145
13146
#: en/help_topics/revisionspec.txt:163
13147
msgid ":annotate:"
13148
msgstr ""
13149
13150
#: en/help_topics/revisionspec.txt:165
13151
msgid ""
13152
" Select the revision that last modified the specified line. Line is\n"
13153
" specified as path:number. Path is a relative path to the file. "
13154
"Numbers\n"
13155
" start at 1, and are relative to the current version, not the last-\n"
13156
" committed version of the file."
13157
msgstr ""
13158
13159
#: en/help_topics/revisionspec.txt:170
13160
msgid ":mainline:"
13161
msgstr ""
13162
13163
#: en/help_topics/revisionspec.txt:172
13164
msgid ""
13165
" Select the revision that merged the specified revision into mainline."
13166
msgstr ""
13167
13168
#: en/help_topics/revisionspec.txt:174
13169
msgid ":last:"
13170
msgstr ""
13171
13172
#: en/help_topics/revisionspec.txt:176
13173
msgid ""
13174
" Supply a positive number to get the nth revision from the end.\n"
13175
" This is the same as supplying negative numbers to the 'revno:' spec.\n"
13176
" Examples::"
13177
msgstr ""
13178
13179
#: en/help_topics/revisionspec.txt:180
13180
msgid ""
13181
" last:1 -> return the last revision\n"
13182
" last:3 -> return the revision 2 before the end.\n"
13183
msgstr ""
13184
13185
#: en/help_topics/rules.txt:1
13186
msgid ""
13187
"Rules\n"
13188
"====="
13189
msgstr ""
13190
13191
#: en/help_topics/rules.txt:7
13192
msgid ""
13193
"Rules are defined in ini file format where the sections are file glob\n"
13194
"patterns and the contents of each section are the preferences for files\n"
13195
"matching that pattern(s). For example::"
13196
msgstr ""
13197
13198
#: en/help_topics/rules.txt:11
13199
msgid ""
13200
" [name *.bat]\n"
13201
" eol = native"
13202
msgstr ""
13203
" [name *.bat]\n"
13204
" eol = native"
13205
13206
#: en/help_topics/rules.txt:14
13207
msgid ""
13208
" [name *.html *.xml]\n"
13209
" keywords = xml_escape"
13210
msgstr ""
13211
" [name *.html *.xml]\n"
13212
" keywords = xml_escape"
13213
13214
#: en/help_topics/rules.txt:17
13215
msgid ""
13216
"Preferences like these are useful for commands and plugins wishing to\n"
13217
"provide custom behaviour for selected files. For more information on \n"
13218
"end of line conversion see :doc:`eol-help`.\n"
13219
"Keyword support is provided by the `keywords plugin\n"
13220
"<http://doc.bazaar.canonical.com/plugins/en/keywords-plugin.html>`_."
13221
msgstr ""
13222
13223
#: en/help_topics/rules.txt:23
13224
msgid ""
13225
"Files\n"
13226
"-----"
13227
msgstr ""
13228
13229
#: en/help_topics/rules.txt:26
13230
msgid ""
13231
"Default rules for all branches are defined in the optional file\n"
13232
"``BZR_HOME/rules``. "
13233
msgstr ""
13234
13235
#: en/help_topics/rules.txt:29
13236
msgid ""
13237
"Rule Patterns\n"
13238
"-------------"
13239
msgstr ""
13240
13241
#: en/help_topics/rules.txt:32
13242
msgid ""
13243
"Patterns are ordered and searching stops as soon as one matches.\n"
13244
"As a consequence, more explicit patterns should be placed towards\n"
13245
"the top of the file. Rule patterns use exactly the same conventions\n"
13246
"as ignore patterns. See :doc:`patterns-help` for details."
13247
msgstr ""
13248
13249
#: en/help_topics/rules.txt:37
13250
msgid ".. note::"
13251
msgstr ""
13252
13253
#: en/help_topics/rules.txt:39
13254
msgid ""
13255
" Patterns containing square brackets or spaces should be\n"
13256
" surrounded in quotes to ensure they are correctly parsed.\n"
13257
msgstr ""
13258
13259
#: en/help_topics/topics.txt:1
13260
msgid ""
13261
"authentication Information on configuring authentication\n"
13262
"basic Basic commands\n"
13263
"branches Information on what a branch is\n"
13264
"bugs Bug tracker settings\n"
13265
"checkouts Information on what a checkout is\n"
13266
"commands Basic help for all commands\n"
13267
"configuration Details on the configuration settings available\n"
13268
"conflict-types Types of conflicts and what to do about them\n"
13269
"content-filters Conversion of content into/from working trees\n"
13270
"criss-cross Information on criss-cross merging\n"
13271
"current-formats Current storage formats\n"
13272
"debug-flags Options to show or record debug information\n"
13273
"diverged-branches How to fix diverged branches\n"
13274
"env-variables Environment variable names and values\n"
13275
"eol Information on end-of-line handling\n"
13276
"files Information on configuration and log files\n"
13277
"formats Information on choosing a storage format\n"
13278
"global-options Options that control how Bazaar runs\n"
13279
"hidden-commands All hidden commands\n"
13280
"hooks Points at which custom processing can be added\n"
13281
"launchpad Using Bazaar with Launchpad.net\n"
13282
"location-alias Aliases for remembered locations\n"
13283
"log-formats Details on the logging formats available\n"
13284
"other-formats Experimental and deprecated storage formats\n"
13285
"patterns Information on the pattern syntax\n"
13286
"repositories Basic information on shared repositories.\n"
13287
"revisionspec Explain how to use --revision\n"
13288
"rules Information on defining rule-based preferences\n"
13289
"standalone-trees Information on what a standalone tree is\n"
13290
"standard-options Options that can be used with any command\n"
13291
"status-flags Help on status flags\n"
13292
"sync-for-reconfigure Steps to resolve \"out-of-sync\" when reconfiguring\n"
13293
"topics Topics list\n"
13294
"url-special-chars Special character handling in URLs\n"
13295
"urlspec Supported transport protocols\n"
13296
"working-trees Information on working trees\n"
13297
msgstr ""
13298
13299
#: en/help_topics/url-special-chars.txt:1
13300
msgid ""
13301
"Special character handling in URLs\n"
13302
"=================================="
13303
msgstr ""
13304
13305
#: en/help_topics/url-special-chars.txt:4
13306
msgid "Bazaar allows locations to be specified in multiple ways, either:"
13307
msgstr ""
13308
13309
#: en/help_topics/url-special-chars.txt:6
13310
msgid " * Fully qualified URLs"
13311
msgstr ""
13312
13313
#: en/help_topics/url-special-chars.txt:8
13314
msgid " * File system paths, relative or absolute"
13315
msgstr ""
13316
13317
#: en/help_topics/url-special-chars.txt:10
13318
msgid ""
13319
"Internally bzr treats all locations as URLs. For any file system paths\n"
13320
"that are specified it will automatically determine the appropriate URL\n"
13321
"representation, and escape special characters where necessary."
13322
msgstr ""
13323
13324
#: en/help_topics/url-special-chars.txt:14
13325
msgid ""
13326
"There are a few characters which have special meaning in URLs and need "
13327
"careful\n"
13328
"handling to avoid ambiguities. Characters can be escaped with a % and a hex\n"
13329
"value in URLs. Any non-ASCII characters in a file path will automatically "
13330
"be\n"
13331
"urlencoded when the path is converted to a URL."
13332
msgstr ""
13333
13334
#: en/help_topics/url-special-chars.txt:19
13335
msgid ""
13336
"URLs represent non-ASCII characters in an encoding defined by the server, "
13337
"but\n"
13338
"usually UTF-8. The % escapes should be of the UTF-8 bytes. Bazaar tries to "
13339
"be\n"
13340
"generous in what it accepts as a URL and to print them in a way that\n"
13341
"will be readable."
13342
msgstr ""
13343
13344
#: en/help_topics/url-special-chars.txt:24
13345
msgid ""
13346
"For example, if you have a directory named '/tmp/%2False' these are all "
13347
"valid\n"
13348
"ways of accessing the content (0x2F, or 47, is the ASCII code for forward "
13349
"slash)::"
13350
msgstr ""
13351
13352
#: en/help_topics/url-special-chars.txt:27
13353
msgid ""
13354
" cd /tmp\n"
13355
" bzr log /tmp/%2False\n"
13356
" bzr log %2False\n"
13357
" bzr log file:///tmp/%252False\n"
13358
" bzr log file://localhost/tmp/%252False\n"
13359
" bzr log file:%252False"
13360
msgstr ""
13361
" cd /tmp\n"
13362
" bzr log /tmp/%2False\n"
13363
" bzr log %2False\n"
13364
" bzr log file:///tmp/%252False\n"
13365
" bzr log file://localhost/tmp/%252False\n"
13366
" bzr log file:%252False"
13367
13368
#: en/help_topics/url-special-chars.txt:34
13369
msgid "These are valid but do not refer to the same file::"
13370
msgstr ""
13371
13372
#: en/help_topics/url-special-chars.txt:36
13373
msgid ""
13374
" bzr log file:///tmp/%2False (refers to a file called /tmp/\\/alse)\n"
13375
" bzr log %252False (refers to a file called /tmp/%252False)"
13376
msgstr ""
13377
13378
#: en/help_topics/url-special-chars.txt:39
13379
msgid ""
13380
"Comma also has special meaning in URLs, because it denotes `segment "
13381
"parameters`_"
13382
msgstr ""
13383
13384
#: en/help_topics/url-special-chars.txt:41
13385
msgid ""
13386
"_`segment parameters`: http://www.ietf.org/rfc/rfc3986.txt (section 3.3)"
13387
msgstr ""
13388
13389
#: en/help_topics/url-special-chars.txt:43
13390
msgid ""
13391
"Comma is also special in any file system paths that are specified. To use a "
13392
"literal\n"
13393
"comma in a file system path, specify a URL and URL encode the comma::"
13394
msgstr ""
13395
13396
#: en/help_topics/url-special-chars.txt:46
13397
msgid ""
13398
" bzr log foo,branch=bla # path \"foo\" with the segment parameter "
13399
"\"branch\" set to \"bla\"\n"
13400
" bzr log file:foo%2Cbranch=bla # path \"foo,branch=bla\"\n"
13401
" bzr log file:foo,branch=bla # path \"foo\" with segment parameter "
13402
"\"branch\" set to \"bla\"\n"
13403
msgstr ""
13404
13405
#: en/help_topics/urlspec.txt:1
13406
msgid "URL Identifiers"
13407
msgstr ""
13408
13409
#: en/help_topics/urlspec.txt:3
13410
msgid "Supported URL prefixes::"
13411
msgstr ""
13412
13413
#: en/help_topics/urlspec.txt:5
13414
msgid ""
13415
" aftp:// Access using active FTP.\n"
13416
" bzr:// Fast access using the Bazaar smart server.\n"
13417
" bzr+ssh:// Fast access using the Bazaar smart server over SSH.\n"
13418
" file:// Access using the standard filesystem (default)\n"
13419
" ftp:// Access using passive FTP.\n"
13420
" http:// Read-only access of branches exported on the web.\n"
13421
" https:// Read-only access of branches exported on the web using "
13422
"SSL.\n"
13423
" sftp:// Access using SFTP (most SSH servers provide SFTP)."
13424
msgstr ""
13425
13426
#: en/help_topics/urlspec.txt:14
13427
msgid "Supported modifiers::"
13428
msgstr ""
13429
13430
#: en/help_topics/urlspec.txt:16
13431
msgid " gio+ Access using any GIO supported protocols."
13432
msgstr ""
13433
13434
#: en/help_topics/urlspec.txt:18
13435
msgid "Bazaar supports all of the standard parts within the URL::"
13436
msgstr ""
13437
13438
#: en/help_topics/urlspec.txt:20
13439
msgid " <protocol>://[user[:password]@]host[:port]/[path]"
13440
msgstr " <protocol>://[user[:password]@]host[:port]/[path]"
13441
13442
#: en/help_topics/urlspec.txt:22
13443
msgid "allowing URLs such as::"
13444
msgstr ""
13445
13446
#: en/help_topics/urlspec.txt:24
13447
msgid " http://bzruser:BadPass@bzr.example.com:8080/bzr/trunk"
13448
msgstr " http://bzruser:BadPass@bzr.example.com:8080/bzr/trunk"
13449
13450
#: en/help_topics/urlspec.txt:26
13451
msgid ""
13452
"For bzr+ssh:// and sftp:// URLs, Bazaar also supports paths that begin\n"
13453
"with '~' as meaning that the rest of the path should be interpreted\n"
13454
"relative to the remote user's home directory. For example if the user\n"
13455
"``remote`` has a home directory of ``/home/remote`` on the server\n"
13456
"shell.example.com, then::"
13457
msgstr ""
13458
13459
#: en/help_topics/urlspec.txt:32
13460
msgid " bzr+ssh://remote@shell.example.com/~/myproject/trunk"
13461
msgstr " bzr+ssh://remote@shell.example.com/~/myproject/trunk"
13462
13463
#: en/help_topics/urlspec.txt:34
13464
msgid "would refer to ``/home/remote/myproject/trunk``."
13465
msgstr ""
13466
13467
#: en/help_topics/urlspec.txt:36
13468
msgid ""
13469
"Many commands that accept URLs also accept location aliases too.\n"
13470
"See :doc:`location-alias-help` and :doc:`url-special-chars-help`.\n"
13471
msgstr ""
Loggerhead is a web-based interface for Breezy
Version: 2.0.1