« back to all changes in this revision
Viewing changes to po/en_GB.po
- browse files at revision 6574
- compare with another revision
- download diff
- download tarball
- view history from revision 6574
- Committer: Patch Queue Manager
- Date: 2013-05-20 17:46:29 UTC
- mfrom: (6573.1.1 bzr)
- Revision ID: pqm@pqm.ubuntu.com-20130520174629-dp7zujtuclvomuzd
(jameinel) Fix CVE 2013-2009. Avoid allowing multiple wildcards in a single
SSL cert hostname segment. (Andrew Starr-Bochicchio)
SSL cert hostname segment. (Andrew Starr-Bochicchio)
- files added:
- bzrlib/_termcolor.py
- bzrlib/branchfmt
- bzrlib/plugins/grep
- bzrlib/plugins/po_merge
- bzrlib/plugins/po_merge/tests
- files removed:
- bzrlib/doc_generate/builders
- bzrlib/doc_generate/writers
- bzrlib/tests/doc_generate
- bzrlib/tests/doc_generate/builders
- bzrlib/tests/doc_generate/writers
- bzrlib/util/effbot
- bzrlib/util/effbot/org
- bzrlib/util/elementtree
- files renamed:
- tools/build_mo.py => bzrlib/bzr_distutils.py
- files modified:
- .bzrignore
added
removed
po/en_GB.po
1
# English (United Kingdom) translation for bzr
2
# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
3
# This file is distributed under the same license as the bzr package.
4
# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
5
#
6
msgid ""
7
msgstr ""
8
"Project-Id-Version: bzr\n"
9
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
10
"POT-Creation-Date: 2012-02-02 17:39+0100\n"
11
"PO-Revision-Date: 2012-01-16 16:40+0000\n"
12
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
13
"Language-Team: English (United Kingdom) <en_GB@li.org>\n"
14
"MIME-Version: 1.0\n"
15
"Content-Type: text/plain; charset=UTF-8\n"
16
"Content-Transfer-Encoding: 8bit\n"
17
"Plural-Forms: nplurals=2; plural=n != 1;\n"
18
"X-Launchpad-Export-Date: 2012-02-04 06:21+0000\n"
19
"X-Generator: Launchpad (build 14738)\n"
20
21
#: bzrlib/add.py:95
22
msgid "skipping {0} (larger than {1} of {2} bytes)"
23
msgstr "skipping {0} (larger than {1} of {2} bytes)"
24
25
#: bzrlib/branch.py:872
26
msgid "Unstacking"
27
msgstr "Unstacking"
28
29
#: bzrlib/branch.py:3205
30
#, python-format
31
msgid "Pushed up to revision %d."
32
msgstr "Pushed up to revision %d."
33
34
#: bzrlib/branch.py:3207
35
#, python-format
36
msgid "%d tag updated."
37
msgid_plural "%d tags updated."
38
msgstr[0] "%d tag updated."
39
msgstr[1] "%d tags updated."
40
41
#: bzrlib/branch.py:3210
42
msgid "No new revisions or tags to push."
43
msgstr "No new revisions or tags to push."
44
45
#: bzrlib/branch.py:3212
46
msgid "No new revisions to push."
47
msgstr "No new revisions to push."
48
49
#: bzrlib/branch.py:3232
50
msgid "checked branch {0} format {1}"
51
msgstr "checked branch {0} format {1}"
52
53
#: bzrlib/branch.py:3235
54
#, python-format
55
msgid "found error:%s"
56
msgstr "found error:%s"
57
58
#: bzrlib/builtins.py:209 bzrlib/builtins.py:3016 bzrlib/workingtree.py:315
59
#, python-format
60
msgid "Ignoring files outside view. View is %s"
61
msgstr "Ignoring files outside view. View is %s"
62
63
#: bzrlib/builtins.py:218
64
#, python-format
65
msgid "bzr %s --revision takes exactly one revision identifier"
66
msgstr "bzr %s --revision takes exactly one revision identifier"
67
68
#: bzrlib/builtins.py:303
69
msgid "Display status summary."
70
msgstr "Display status summary."
71
72
#: bzrlib/builtins.py:305
73
msgid ""
74
"This reports on versioned and unknown files, reporting them\n"
75
"grouped by state. Possible states are:"
76
msgstr ""
77
"This reports on versioned and unknown files, reporting them\n"
78
"grouped by state. Possible states are:"
79
80
#: bzrlib/builtins.py:308
81
msgid ""
82
"added\n"
83
" Versioned in the working copy but not in the previous revision."
84
msgstr ""
85
"added\n"
86
" Versioned in the working copy but not in the previous revision."
87
88
#: bzrlib/builtins.py:311
89
msgid ""
90
"removed\n"
91
" Versioned in the previous revision but removed or deleted\n"
92
" in the working copy."
93
msgstr ""
94
"removed\n"
95
" Versioned in the previous revision but removed or deleted\n"
96
" in the working copy."
97
98
#: bzrlib/builtins.py:315
99
msgid ""
100
"renamed\n"
101
" Path of this file changed from the previous revision;\n"
102
" the text may also have changed. This includes files whose\n"
103
" parent directory was renamed."
104
msgstr ""
105
"renamed\n"
106
" Path of this file changed from the previous revision;\n"
107
" the text may also have changed. This includes files whose\n"
108
" parent directory was renamed."
109
110
#: bzrlib/builtins.py:320
111
msgid ""
112
"modified\n"
113
" Text has changed since the previous revision."
114
msgstr ""
115
"modified\n"
116
" Text has changed since the previous revision."
117
118
#: bzrlib/builtins.py:323
119
msgid ""
120
"kind changed\n"
121
" File kind has been changed (e.g. from file to directory)."
122
msgstr ""
123
"type changed\n"
124
" File type has been changed (e.g. from file to directory)."
125
126
#: bzrlib/builtins.py:326
127
msgid ""
128
"unknown\n"
129
" Not versioned and not matching an ignore pattern."
130
msgstr ""
131
"unknown\n"
132
" Not versioned and not matching an ignore pattern."
133
134
#: bzrlib/builtins.py:329
135
msgid ""
136
"Additionally for directories, symlinks and files with a changed\n"
137
"executable bit, Bazaar indicates their type using a trailing\n"
138
"character: '/', '@' or '*' respectively. These decorations can be\n"
139
"disabled using the '--no-classify' option."
140
msgstr ""
141
"Additionally for directories, symlinks and files with a changed\n"
142
"executable bit, Bazaar indicates their type using a trailing\n"
143
"character: '/', '@' or '*' respectively. These decorations can be\n"
144
"disabled using the '--no-classify' option."
145
146
#: bzrlib/builtins.py:334
147
msgid ""
148
"To see ignored files use 'bzr ignored'. For details on the\n"
149
"changes to file texts, use 'bzr diff'."
150
msgstr ""
151
"To see ignored files, use 'bzr ignored'. For details on the\n"
152
"changes to file texts, use 'bzr diff'."
153
154
#: bzrlib/builtins.py:337
155
msgid ""
156
"Note that --short or -S gives status flags for each item, similar\n"
157
"to Subversion's status command. To get output similar to svn -q,\n"
158
"use bzr status -SV."
159
msgstr ""
160
"Note that --short or -S gives status flags for each item, similar\n"
161
"to Subversion's status command. To get output similar to svn -q,\n"
162
"use bzr status -SV."
163
164
#: bzrlib/builtins.py:341
165
msgid ""
166
"If no arguments are specified, the status of the entire working\n"
167
"directory is shown. Otherwise, only the status of the specified\n"
168
"files or directories is reported. If a directory is given, status\n"
169
"is reported for everything inside that directory."
170
msgstr ""
171
"If no arguments are specified, the status of the entire working\n"
172
"directory is shown. Otherwise, only the status of the specified\n"
173
"files or directories is reported. If a directory is given, status\n"
174
"is reported for everything inside that directory."
175
176
#: bzrlib/builtins.py:346
177
msgid ""
178
"Before merges are committed, the pending merge tip revisions are\n"
179
"shown. To see all pending merge revisions, use the -v option.\n"
180
"To skip the display of pending merge information altogether, use\n"
181
"the no-pending option or specify a file/directory."
182
msgstr ""
183
"Before merges are committed, the pending merge tip revisions are\n"
184
"shown. To see all pending merge revisions, use the -v option.\n"
185
"To skip the display of pending merge information altogether, use\n"
186
"the no-pending option or specify a file/directory."
187
188
#: bzrlib/builtins.py:351
189
msgid ""
190
"To compare the working directory to a specific revision, pass a\n"
191
"single revision to the revision argument."
192
msgstr ""
193
"To compare the working directory to a specific revision, pass a\n"
194
"single revision to the revision argument."
195
196
#: bzrlib/builtins.py:354
197
msgid ""
198
"To see which files have changed in a specific revision, or between\n"
199
"two revisions, pass a revision range to the revision argument.\n"
200
"This will produce the same results as calling 'bzr diff --summarize'."
201
msgstr ""
202
"To see which files have changed in a specific revision, or between\n"
203
"two revisions, pass a revision range to the revision argument.\n"
204
"This will produce the same results as calling 'bzr diff --summarize'."
205
206
#: bzrlib/builtins.py:363
207
msgid "Use short status indicators."
208
msgstr "Use short status indicators."
209
210
#: bzrlib/builtins.py:365
211
msgid "Only show versioned files."
212
msgstr "Only show versioned files."
213
214
#: bzrlib/builtins.py:367
215
msgid "Don't show pending merges."
216
msgstr "Don't show pending merges."
217
218
#: bzrlib/builtins.py:370
219
msgid "Do not mark object type using indicator."
220
msgstr "Do not mark object type using indicator."
221
222
#: bzrlib/builtins.py:385
223
msgid "bzr status --revision takes exactly one or two revision specifiers"
224
msgstr "bzr status --revision takes exactly one or two revision specifiers"
225
226
#: bzrlib/builtins.py:429 bzrlib/builtins.py:5183
227
msgid "You can only supply one of revision_id or --revision"
228
msgstr "You can only supply one of revision_id or --revision"
229
230
#: bzrlib/builtins.py:432 bzrlib/builtins.py:5185
231
msgid "You must supply either --revision or a revision_id"
232
msgstr ""
233
234
#: bzrlib/builtins.py:439
235
#, python-format
236
msgid "Repository %r does not support access to raw revision texts"
237
msgstr ""
238
239
#: bzrlib/builtins.py:450
240
msgid "The repository {0} contains no revision {1}."
241
msgstr ""
242
243
#: bzrlib/builtins.py:457
244
msgid "You cannot specify a NULL revision."
245
msgstr "You cannot specify a NULL revision."
246
247
#: bzrlib/builtins.py:549
248
msgid "Remove the working tree from a given branch/checkout."
249
msgstr ""
250
251
#: bzrlib/builtins.py:551
252
msgid ""
253
"Since a lightweight checkout is little more than a working tree\n"
254
"this will refuse to run against one."
255
msgstr ""
256
257
#: bzrlib/builtins.py:554
258
msgid "To re-create the working tree, use \"bzr checkout\"."
259
msgstr ""
260
261
#: bzrlib/builtins.py:560
262
msgid ""
263
"Remove the working tree even if it has uncommitted or shelved changes."
264
msgstr ""
265
"Remove the working tree even if it has uncommitted or shelved changes."
266
267
#: bzrlib/builtins.py:574
268
msgid "No working tree to remove"
269
msgstr ""
270
271
#: bzrlib/builtins.py:576
272
msgid "You cannot remove the working tree of a remote path"
273
msgstr "You cannot remove the working tree of a remote path"
274
275
#: bzrlib/builtins.py:585
276
msgid "You cannot remove the working tree from a lightweight checkout"
277
msgstr "You cannot remove the working tree from a lightweight checkout"
278
279
#: bzrlib/builtins.py:625
280
msgid ""
281
"The tree does not appear to be corrupt. You probably want \"bzr revert\" "
282
"instead. Use \"--force\" if you are sure you want to reset the working tree."
283
msgstr ""
284
"The tree does not appear to be corrupt. You probably want \"bzr revert\" "
285
"instead. Use \"--force\" if you are sure you want to reset the working tree."
286
287
#: bzrlib/builtins.py:636
288
msgid ""
289
", the header appears corrupt, try passing -r -1 to set the state to the last "
290
"commit"
291
msgstr ""
292
293
#: bzrlib/builtins.py:640
294
msgid "failed to reset the tree state{0}"
295
msgstr "failed to reset the tree state{0}"
296
297
#: bzrlib/builtins.py:644
298
msgid "Show current revision number."
299
msgstr "Show current revision number."
300
301
#: bzrlib/builtins.py:646
302
msgid "This is equal to the number of revisions on this branch."
303
msgstr ""
304
305
#: bzrlib/builtins.py:659
306
msgid "--tree and --revision can not be used together"
307
msgstr ""
308
309
#: bzrlib/builtins.py:676 bzrlib/builtins.py:5967
310
msgid "Tags can only be placed on a single revision, not on a range"
311
msgstr ""
312
313
#: bzrlib/builtins.py:700
314
msgid "Show revno of working tree."
315
msgstr "Show revno of working tree."
316
317
#: bzrlib/builtins.py:748
318
msgid "Add specified files or directories."
319
msgstr "Add specified files or directories."
320
321
#: bzrlib/builtins.py:750
322
msgid ""
323
"In non-recursive mode, all the named items are added, regardless\n"
324
"of whether they were previously ignored. A warning is given if\n"
325
"any of the named files are already versioned."
326
msgstr ""
327
328
#: bzrlib/builtins.py:754
329
msgid ""
330
"In recursive mode (the default), files are treated the same way\n"
331
"but the behaviour for directories is different. Directories that\n"
332
"are already versioned do not give a warning. All directories,\n"
333
"whether already versioned or not, are searched for files or\n"
334
"subdirectories that are neither versioned or ignored, and these\n"
335
"are added. This search proceeds recursively into versioned\n"
336
"directories. If no names are given '.' is assumed."
337
msgstr ""
338
339
#: bzrlib/builtins.py:762
340
msgid ""
341
"A warning will be printed when nested trees are encountered,\n"
342
"unless they are explicitly ignored."
343
msgstr ""
344
345
#: bzrlib/builtins.py:765
346
msgid ""
347
"Therefore simply saying 'bzr add' will version all files that\n"
348
"are currently unknown."
349
msgstr ""
350
351
#: bzrlib/builtins.py:768
352
msgid ""
353
"Adding a file whose parent directory is not versioned will\n"
354
"implicitly add the parent, and so on up to the root. This means\n"
355
"you should never need to explicitly add a directory, they'll just\n"
356
"get added when you add a file in the directory."
357
msgstr ""
358
359
#: bzrlib/builtins.py:773
360
msgid ""
361
"--dry-run will show which files would be added, but not actually\n"
362
"add them."
363
msgstr ""
364
"--dry-run will show which files would be added, but not actually\n"
365
"add them."
366
367
#: bzrlib/builtins.py:776
368
msgid ""
369
"--file-ids-from will try to use the file ids from the supplied path.\n"
370
"It looks up ids trying to find a matching parent directory with the\n"
371
"same filename, and then by pure path. This option is rarely needed\n"
372
"but can be useful when adding the same logical file into two\n"
373
"branches that will be merged later (without showing the two different\n"
374
"adds as a conflict). It is also useful when merging another project\n"
375
"into a subdirectory of this one."
376
msgstr ""
377
378
#: bzrlib/builtins.py:784
379
msgid ""
380
"Any files matching patterns in the ignore list will not be added\n"
381
"unless they are explicitly mentioned."
382
msgstr ""
383
384
#: bzrlib/builtins.py:787
385
msgid ""
386
"In recursive mode, files larger than the configuration option \n"
387
"add.maximum_file_size will be skipped. Named items are never skipped due\n"
388
"to file size."
389
msgstr ""
390
391
#: bzrlib/builtins.py:794
392
msgid "Don't recursively add the contents of directories."
393
msgstr ""
394
395
#: bzrlib/builtins.py:800
396
msgid "Lookup file ids from this tree."
397
msgstr "Lookup file ids from this tree."
398
399
#: bzrlib/builtins.py:836
400
msgid "ignored {0} matching \"{1}\"\n"
401
msgstr ""
402
403
#: bzrlib/builtins.py:841
404
msgid "Create a new versioned directory."
405
msgstr "Create a new versioned directory."
406
407
#: bzrlib/builtins.py:843
408
msgid "This is equivalent to creating the directory and then adding it."
409
msgstr ""
410
411
#: bzrlib/builtins.py:850
412
msgid "No error if existing, make parent directories as needed."
413
msgstr "No error if existing, make parent directories as needed."
414
415
#: bzrlib/builtins.py:884
416
#, python-format
417
msgid "added %s\n"
418
msgstr ""
419
420
#: bzrlib/builtins.py:926
421
#, python-format
422
msgid "invalid kind %r specified"
423
msgstr "invalid type %r specified"
424
425
#: bzrlib/builtins.py:963
426
msgid "Move or rename a file."
427
msgstr "Move or rename a file."
428
429
#: bzrlib/builtins.py:965
430
msgid " bzr mv SOURCE... DESTINATION"
431
msgstr " bzr mv SOURCE... DESTINATION"
432
433
#: bzrlib/builtins.py:967
434
msgid ""
435
"If the last argument is a versioned directory, all the other names\n"
436
"are moved into it. Otherwise, there must be exactly two arguments\n"
437
"and the file is changed to a new name."
438
msgstr ""
439
440
#: bzrlib/builtins.py:971
441
msgid ""
442
"If OLDNAME does not exist on the filesystem but is versioned and\n"
443
"NEWNAME does exist on the filesystem but is not versioned, mv\n"
444
"assumes that the file has been manually moved and only updates\n"
445
"its internal inventory to reflect that change.\n"
446
"The same is valid when moving many SOURCE files to a DESTINATION."
447
msgstr ""
448
449
#: bzrlib/builtins.py:977
450
msgid "Files cannot be moved between branches."
451
msgstr "Files cannot be moved between branches."
452
453
#: bzrlib/builtins.py:984
454
msgid ""
455
"Move only the bzr identifier of the file, because the file has already been "
456
"moved."
457
msgstr ""
458
459
#: bzrlib/builtins.py:986
460
msgid "Automatically guess renames."
461
msgstr "Automatically guess renames."
462
463
#: bzrlib/builtins.py:987
464
msgid "Avoid making changes when guessing renames."
465
msgstr "Avoid making changes when guessing renames."
466
467
#: bzrlib/builtins.py:996
468
msgid "--dry-run requires --auto."
469
msgstr ""
470
471
#: bzrlib/builtins.py:1000
472
msgid "missing file argument"
473
msgstr "missing file argument"
474
475
#: bzrlib/builtins.py:1004
476
msgid "can not move root of branch"
477
msgstr "cannot move root of branch"
478
479
#: bzrlib/builtins.py:1010
480
msgid "Only one path may be specified to --auto."
481
msgstr ""
482
483
#: bzrlib/builtins.py:1013
484
msgid "--after cannot be specified with --auto."
485
msgstr ""
486
487
#: bzrlib/builtins.py:1050
488
msgid "to mv multiple files the destination must be a versioned directory"
489
msgstr ""
490
491
#: bzrlib/builtins.py:1102
492
msgid "Turn this branch into a mirror of another branch."
493
msgstr ""
494
495
#: bzrlib/builtins.py:1104
496
msgid ""
497
"By default, this command only works on branches that have not diverged.\n"
498
"Branches are considered diverged if the destination branch's most recent \n"
499
"commit is one that has not been merged (directly or indirectly) into the \n"
500
"parent."
501
msgstr ""
502
503
#: bzrlib/builtins.py:1109
504
msgid ""
505
"If branches have diverged, you can use 'bzr merge' to integrate the changes\n"
506
"from one into the other. Once one branch has merged, the other should\n"
507
"be able to pull it again."
508
msgstr ""
509
510
#: bzrlib/builtins.py:1113
511
msgid ""
512
"If you want to replace your local changes and just want your branch to\n"
513
"match the remote one, use pull --overwrite. This will work even if the two\n"
514
"branches have diverged."
515
msgstr ""
516
517
#: bzrlib/builtins.py:1117
518
msgid ""
519
"If there is no default location set, the first pull will set it (use\n"
520
"--no-remember to avoid setting it). After that, you can omit the\n"
521
"location to use the default. To change the default, use --remember. The\n"
522
"value will only be saved if the remote location can be accessed."
523
msgstr ""
524
525
#: bzrlib/builtins.py:1122
526
msgid ""
527
"The --verbose option will display the revisions pulled using the log_format\n"
528
"configuration option. You can use a different format by overriding it with\n"
529
"-Olog_format=<other_format>."
530
msgstr ""
531
532
#: bzrlib/builtins.py:1126
533
msgid ""
534
"Note: The location can be specified either in the form of a branch,\n"
535
"or in the form of a path to a file containing a merge directive generated\n"
536
"with bzr send."
537
msgstr ""
538
539
#: bzrlib/builtins.py:1134
540
msgid "Show logs of pulled revisions."
541
msgstr ""
542
543
#: bzrlib/builtins.py:1136
544
msgid ""
545
"Branch to pull into, rather than the one containing the working directory."
546
msgstr ""
547
548
#: bzrlib/builtins.py:1139
549
msgid ""
550
"Perform a local pull in a bound branch. Local pulls are not applied to the "
551
"master branch."
552
msgstr ""
553
554
#: bzrlib/builtins.py:1168
555
msgid "Need working tree for --show-base."
556
msgstr ""
557
558
#: bzrlib/builtins.py:1184
559
msgid "No pull location known or specified."
560
msgstr ""
561
562
#: bzrlib/builtins.py:1190
563
#, python-format
564
msgid "Using saved parent location: %s\n"
565
msgstr ""
566
567
#: bzrlib/builtins.py:1197 bzrlib/builtins.py:4393
568
msgid "Cannot use -r with merge directives or bundles"
569
msgstr ""
570
571
#: bzrlib/builtins.py:1238
572
msgid "Update a mirror of this branch."
573
msgstr ""
574
575
#: bzrlib/builtins.py:1240
576
msgid ""
577
"The target branch will not have its working tree populated because this\n"
578
"is both expensive, and is not supported on remote file systems."
579
msgstr ""
580
581
#: bzrlib/builtins.py:1243
582
msgid ""
583
"Some smart servers or protocols *may* put the working tree in place in\n"
584
"the future."
585
msgstr ""
586
587
#: bzrlib/builtins.py:1246
588
msgid ""
589
"This command only works on branches that have not diverged. Branches are\n"
590
"considered diverged if the destination branch's most recent commit is one\n"
591
"that has not been merged (directly or indirectly) by the source branch."
592
msgstr ""
593
594
#: bzrlib/builtins.py:1250
595
msgid ""
596
"If branches have diverged, you can use 'bzr push --overwrite' to replace\n"
597
"the other branch completely, discarding its unmerged changes."
598
msgstr ""
599
600
#: bzrlib/builtins.py:1253
601
msgid ""
602
"If you want to ensure you have the different changes in the other branch,\n"
603
"do a merge (see bzr help merge) from the other branch, and commit that.\n"
604
"After that you will be able to do a push without '--overwrite'."
605
msgstr ""
606
607
#: bzrlib/builtins.py:1257
608
msgid ""
609
"If there is no default push location set, the first push will set it (use\n"
610
"--no-remember to avoid setting it). After that, you can omit the\n"
611
"location to use the default. To change the default, use --remember. The\n"
612
"value will only be saved if the remote location can be accessed."
613
msgstr ""
614
615
#: bzrlib/builtins.py:1262
616
msgid ""
617
"The --verbose option will display the revisions pushed using the log_format\n"
618
"configuration option. You can use a different format by overriding it with\n"
619
"-Olog_format=<other_format>."
620
msgstr ""
621
622
#: bzrlib/builtins.py:1273 bzrlib/foreign.py:272
623
msgid ""
624
"Branch to push from, rather than the one containing the working directory."
625
msgstr ""
626
627
#: bzrlib/builtins.py:1276
628
msgid ""
629
"By default push will fail if the target directory exists, but does not "
630
"already have a control directory. This flag will allow push to proceed."
631
msgstr ""
632
633
#: bzrlib/builtins.py:1281
634
msgid ""
635
"Create a stacked branch that references the public location of the parent "
636
"branch."
637
msgstr ""
638
639
#: bzrlib/builtins.py:1284
640
msgid ""
641
"Create a stacked branch that refers to another branch for the commit "
642
"history. Only the work not present in the referenced branch is included in "
643
"the branch created."
644
msgstr ""
645
646
#: bzrlib/builtins.py:1289 bzrlib/foreign.py:279
647
msgid ""
648
"Refuse to push if there are uncommitted changes in the working tree, --no-"
649
"strict disables the check."
650
msgstr ""
651
652
#: bzrlib/builtins.py:1292
653
msgid "Don't populate the working tree, even for protocols that support it."
654
msgstr ""
655
656
#: bzrlib/builtins.py:1336
657
msgid "Could not determine branch to refer to."
658
msgstr ""
659
660
#: bzrlib/builtins.py:1345
661
#, python-format
662
msgid ""
663
"No push location known or specified. To push to the parent branch (at %s), "
664
"use 'bzr push :parent'."
665
msgstr ""
666
667
#: bzrlib/builtins.py:1351 bzrlib/foreign.py:306
668
msgid "No push location known or specified."
669
msgstr ""
670
671
#: bzrlib/builtins.py:1355
672
#, python-format
673
msgid "Using saved push location: %s"
674
msgstr ""
675
676
#: bzrlib/builtins.py:1365
677
msgid "Create a new branch that is a copy of an existing branch."
678
msgstr ""
679
680
#: bzrlib/builtins.py:1367
681
msgid ""
682
"If the TO_LOCATION is omitted, the last component of the FROM_LOCATION will\n"
683
"be used. In other words, \"branch ../foo/bar\" will attempt to create "
684
"./bar.\n"
685
"If the FROM_LOCATION has no / or path separator embedded, the TO_LOCATION\n"
686
"is derived from the FROM_LOCATION by stripping a leading scheme or drive\n"
687
"identifier, if any. For example, \"branch lp:foo-bar\" will attempt to\n"
688
"create ./foo-bar."
689
msgstr ""
690
691
#: bzrlib/builtins.py:1374
692
msgid ""
693
"To retrieve the branch as of a particular revision, supply the --revision\n"
694
"parameter, as in \"branch foo/bar -r 5\"."
695
msgstr ""
696
697
#: bzrlib/builtins.py:1377
698
msgid "The synonyms 'clone' and 'get' for this command are deprecated."
699
msgstr ""
700
701
#: bzrlib/builtins.py:1387
702
msgid "Create a branch without a working-tree."
703
msgstr ""
704
705
#: bzrlib/builtins.py:1389
706
msgid "Switch the checkout in the current directory to the new branch."
707
msgstr ""
708
709
#: bzrlib/builtins.py:1392
710
msgid ""
711
"Create a stacked branch referring to the source branch. The new branch will "
712
"depend on the availability of the source branch for all operations."
713
msgstr ""
714
715
#: bzrlib/builtins.py:1396
716
msgid "Do not use a shared repository, even if available."
717
msgstr ""
718
719
#: bzrlib/builtins.py:1398
720
msgid ""
721
"By default branch will fail if the target directory exists, but does not "
722
"already have a control directory. This flag will allow branch to proceed."
723
msgstr ""
724
725
#: bzrlib/builtins.py:1403
726
msgid "Bind new branch to from location."
727
msgstr ""
728
729
#: bzrlib/builtins.py:1450
730
#, python-format
731
msgid "Target directory \"%s\" already exists."
732
msgstr ""
733
734
#: bzrlib/builtins.py:1462
735
#, python-format
736
msgid "Parent of \"%s\" does not exist."
737
msgstr ""
738
739
#: bzrlib/builtins.py:1481
740
msgid "The branch {0} has no revision {1}."
741
msgstr ""
742
743
#: bzrlib/builtins.py:1496 bzrlib/push.py:53
744
#, python-format
745
msgid "Created new stacked branch referring to %s."
746
msgstr ""
747
748
#: bzrlib/builtins.py:1500
749
#, python-format
750
msgid "Branched %d revision."
751
msgid_plural "Branched %d revisions."
752
msgstr[0] ""
753
msgstr[1] ""
754
755
#: bzrlib/builtins.py:1505
756
#, python-format
757
msgid "New branch bound to %s"
758
msgstr ""
759
760
#: bzrlib/builtins.py:1510 bzrlib/builtins.py:6256
761
#, python-format
762
msgid "Switched to branch: %s"
763
msgstr ""
764
765
#: bzrlib/builtins.py:1515
766
msgid "List the branches available at the current location."
767
msgstr ""
768
769
#: bzrlib/builtins.py:1517
770
msgid ""
771
"This command will print the names of all the branches at the current\n"
772
"location."
773
msgstr ""
774
775
#: bzrlib/builtins.py:1524
776
msgid ""
777
"Recursively scan for branches rather than just looking in the specified "
778
"location."
779
msgstr ""
780
781
#: bzrlib/builtins.py:1554
782
msgid "(default)"
783
msgstr ""
784
785
#: bzrlib/builtins.py:1566
786
msgid "Create a new checkout of an existing branch."
787
msgstr ""
788
789
#: bzrlib/builtins.py:1568
790
msgid ""
791
"If BRANCH_LOCATION is omitted, checkout will reconstitute a working tree "
792
"for\n"
793
"the branch found in '.'. This is useful if you have removed the working "
794
"tree\n"
795
"or if it was never created - i.e. if you pushed the branch to its current\n"
796
"location using SFTP."
797
msgstr ""
798
799
#: bzrlib/builtins.py:1573
800
msgid ""
801
"If the TO_LOCATION is omitted, the last component of the BRANCH_LOCATION "
802
"will\n"
803
"be used. In other words, \"checkout ../foo/bar\" will attempt to create "
804
"./bar.\n"
805
"If the BRANCH_LOCATION has no / or path separator embedded, the TO_LOCATION\n"
806
"is derived from the BRANCH_LOCATION by stripping a leading scheme or drive\n"
807
"identifier, if any. For example, \"checkout lp:foo-bar\" will attempt to\n"
808
"create ./foo-bar."
809
msgstr ""
810
811
#: bzrlib/builtins.py:1580
812
msgid ""
813
"To retrieve the branch as of a particular revision, supply the --revision\n"
814
"parameter, as in \"checkout foo/bar -r 5\". Note that this will be "
815
"immediately\n"
816
"out of date [so you cannot commit] but it may be useful (i.e. to examine "
817
"old\n"
818
"code.)"
819
msgstr ""
820
821
#: bzrlib/builtins.py:1590
822
msgid ""
823
"Perform a lightweight checkout. Lightweight checkouts depend on access to "
824
"the branch for every operation. Normal checkouts can perform common "
825
"operations like diff and status without such access, and also support local "
826
"commits."
827
msgstr ""
828
829
#: bzrlib/builtins.py:1597
830
msgid "Get file contents from this tree."
831
msgstr ""
832
833
#: bzrlib/builtins.py:1599
834
msgid "Hard-link working tree files where possible."
835
msgstr ""
836
837
#: bzrlib/builtins.py:1640
838
msgid ""
839
"Show list of renamed files.\n"
840
" "
841
msgstr ""
842
843
#: bzrlib/builtins.py:1670
844
msgid "Update a working tree to a new revision."
845
msgstr ""
846
847
#: bzrlib/builtins.py:1672
848
msgid ""
849
"This will perform a merge of the destination revision (the tip of the\n"
850
"branch, or the specified revision) into the working tree, and then make\n"
851
"that revision the basis revision for the working tree. "
852
msgstr ""
853
854
#: bzrlib/builtins.py:1676
855
msgid ""
856
"You can use this to visit an older revision, or to update a working tree\n"
857
"that is out of date from its branch."
858
msgstr ""
859
860
#: bzrlib/builtins.py:1679
861
msgid ""
862
"If there are any uncommitted changes in the tree, they will be carried\n"
863
"across and remain as uncommitted changes after the update. To discard\n"
864
"these changes, use 'bzr revert'. The uncommitted changes may conflict\n"
865
"with the changes brought in by the change in basis revision."
866
msgstr ""
867
868
#: bzrlib/builtins.py:1684
869
msgid ""
870
"If the tree's branch is bound to a master branch, bzr will also update\n"
871
"the branch from the master."
872
msgstr ""
873
874
#: bzrlib/builtins.py:1687
875
msgid ""
876
"You cannot update just a single file or directory, because each Bazaar\n"
877
"working tree has just a single basis revision. If you want to restore a\n"
878
"file that has been removed locally, use 'bzr revert' instead of 'bzr\n"
879
"update'. If you want to restore a file to its state in a previous\n"
880
"revision, use 'bzr revert' with a '-r' option, or use 'bzr cat' to write\n"
881
"out the old content of that file to a new location."
882
msgstr ""
883
884
#: bzrlib/builtins.py:1694
885
msgid ""
886
"The 'dir' argument, if given, must be the location of the root of a\n"
887
"working tree to update. By default, the working tree that contains the \n"
888
"current working directory is used."
889
msgstr ""
890
891
#: bzrlib/builtins.py:1710
892
msgid "bzr update --revision takes exactly one revision"
893
msgstr ""
894
895
#: bzrlib/builtins.py:1718
896
msgid "bzr update can only update a whole tree, not a file or subdirectory"
897
msgstr ""
898
899
#: bzrlib/builtins.py:1749
900
msgid "Tree is up to date at revision {0} of branch {1}"
901
msgstr ""
902
903
#: bzrlib/builtins.py:1765
904
#, python-format
905
msgid ""
906
"branch has no revision %s\n"
907
"bzr update --revision only works for a revision in the branch history"
908
msgstr ""
909
910
#: bzrlib/builtins.py:1771
911
msgid "Updated to revision {0} of branch {1}"
912
msgstr ""
913
914
#: bzrlib/builtins.py:1775
915
msgid ""
916
"Your local commits will now show as pending merges with 'bzr status', and "
917
"can be committed with 'bzr commit'."
918
msgstr ""
919
920
#: bzrlib/builtins.py:1784
921
msgid "Show information about a working tree, branch or repository."
922
msgstr ""
923
924
#: bzrlib/builtins.py:1786
925
msgid ""
926
"This command will show all known locations and formats associated to the\n"
927
"tree, branch or repository."
928
msgstr ""
929
930
#: bzrlib/builtins.py:1789
931
msgid ""
932
"In verbose mode, statistical information is included with each report.\n"
933
"To see extended statistic information, use a verbosity level of 2 or\n"
934
"higher by specifying the verbose option multiple times, e.g. -vv."
935
msgstr ""
936
937
#: bzrlib/builtins.py:1793
938
msgid "Branches and working trees will also report any missing revisions."
939
msgstr ""
940
941
#: bzrlib/builtins.py:1795 bzrlib/builtins.py:3715 bzrlib/builtins.py:4845
942
#: bzrlib/builtins.py:6442
943
msgid ":Examples:"
944
msgstr ""
945
946
#: bzrlib/builtins.py:1797
947
msgid " Display information on the format and related locations:"
948
msgstr ""
949
950
#: bzrlib/builtins.py:1799
951
msgid " bzr info"
952
msgstr ""
953
954
#: bzrlib/builtins.py:1801
955
msgid ""
956
" Display the above together with extended format information and\n"
957
" basic statistics (like the number of files in the working tree and\n"
958
" number of revisions in the branch and repository):"
959
msgstr ""
960
961
#: bzrlib/builtins.py:1805
962
msgid " bzr info -v"
963
msgstr ""
964
965
#: bzrlib/builtins.py:1807
966
msgid " Display the above together with number of committers to the branch:"
967
msgstr ""
968
969
#: bzrlib/builtins.py:1809
970
msgid " bzr info -vv"
971
msgstr ""
972
973
#: bzrlib/builtins.py:1828
974
msgid "Remove files or directories."
975
msgstr ""
976
977
#: bzrlib/builtins.py:1830
978
msgid ""
979
"This makes Bazaar stop tracking changes to the specified files. Bazaar will\n"
980
"delete them if they can easily be recovered using revert otherwise they\n"
981
"will be backed up (adding an extention of the form .~#~). If no options or\n"
982
"parameters are given Bazaar will scan for files that are being tracked by\n"
983
"Bazaar but missing in your tree and stop tracking them for you."
984
msgstr ""
985
986
#: bzrlib/builtins.py:1838
987
msgid "Only remove files that have never been committed."
988
msgstr ""
989
990
#: bzrlib/builtins.py:1840
991
msgid "The file deletion mode to be used."
992
msgstr ""
993
994
#: bzrlib/builtins.py:1841
995
msgid "Deletion Strategy"
996
msgstr ""
997
998
#: bzrlib/builtins.py:1842
999
msgid "Backup changed files (default)."
1000
msgstr ""
1001
1002
#: bzrlib/builtins.py:1843
1003
msgid "Delete from bzr but leave the working copy."
1004
msgstr ""
1005
1006
#: bzrlib/builtins.py:1844
1007
msgid "Don't backup changed files."
1008
msgstr ""
1009
1010
#: bzrlib/builtins.py:1845
1011
msgid ""
1012
"Delete all the specified files, even if they can not be recovered and even "
1013
"if they are non-empty directories. (deprecated, use no-backup)"
1014
msgstr ""
1015
1016
#: bzrlib/builtins.py:1854
1017
msgid "(The --force option is deprecated, rather use --no-backup in future.)"
1018
msgstr ""
1019
1020
#: bzrlib/builtins.py:1871
1021
msgid "No matching files."
1022
msgstr ""
1023
1024
#: bzrlib/builtins.py:1932
1025
msgid "Reconcile bzr metadata in a branch."
1026
msgstr ""
1027
1028
#: bzrlib/builtins.py:1934
1029
msgid ""
1030
"This can correct data mismatches that may have been caused by\n"
1031
"previous ghost operations or bzr upgrades. You should only\n"
1032
"need to run this command if 'bzr check' or a bzr developer\n"
1033
"advises you to run it."
1034
msgstr ""
1035
1036
#: bzrlib/builtins.py:1939
1037
msgid ""
1038
"If a second branch is provided, cross-branch reconciliation is\n"
1039
"also attempted, which will check that data like the tree root\n"
1040
"id which was not present in very early bzr versions is represented\n"
1041
"correctly in both branches."
1042
msgstr ""
1043
1044
#: bzrlib/builtins.py:1944
1045
msgid ""
1046
"At the same time it is run it may recompress data resulting in\n"
1047
"a potential saving in disk space or performance gain."
1048
msgstr ""
1049
1050
#: bzrlib/builtins.py:1947
1051
msgid "The branch *MUST* be on a listable system such as local disk or sftp."
1052
msgstr ""
1053
1054
#: bzrlib/builtins.py:2014 bzrlib/builtins.py:2132 bzrlib/builtins.py:3750
1055
msgid ""
1056
"Format for the bzr 2.0 series.\n"
1057
"Uses group-compress storage.\n"
1058
"Provides rich roots which are a one-way transition.\n"
1059
msgstr ""
1060
1061
#: bzrlib/builtins.py:2014 bzrlib/builtins.py:2132 bzrlib/builtins.py:3750
1062
msgid ""
1063
"Pack-based format used in 1.x series. Introduced in 0.92. Interoperates with "
1064
"bzr repositories before 0.92 but cannot be read by bzr < 0.92. "
1065
msgstr ""
1066
1067
#: bzrlib/builtins.py:2014 bzrlib/builtins.py:2132 bzrlib/builtins.py:3750
1068
msgid "The 2a format with experimental support for colocated branches.\n"
1069
msgstr ""
1070
1071
#: bzrlib/builtins.py:2015
1072
msgid "Make a directory into a versioned branch."
1073
msgstr ""
1074
1075
#: bzrlib/builtins.py:2017
1076
msgid ""
1077
"Use this to create an empty branch, or before importing an\n"
1078
"existing project."
1079
msgstr ""
1080
1081
#: bzrlib/builtins.py:2020
1082
msgid ""
1083
"If there is a repository in a parent directory of the location, then\n"
1084
"the history of the branch will be stored in the repository. Otherwise\n"
1085
"init creates a standalone branch which carries its own history\n"
1086
"in the .bzr directory."
1087
msgstr ""
1088
1089
#: bzrlib/builtins.py:2025
1090
msgid ""
1091
"If there is already a branch at the location but it has no working tree,\n"
1092
"the tree can be populated with 'bzr checkout'."
1093
msgstr ""
1094
1095
#: bzrlib/builtins.py:2028
1096
msgid "Recipe for importing a tree of files::"
1097
msgstr ""
1098
1099
#: bzrlib/builtins.py:2030
1100
msgid ""
1101
" cd ~/project\n"
1102
" bzr init\n"
1103
" bzr add .\n"
1104
" bzr status\n"
1105
" bzr commit -m \"imported project\""
1106
msgstr ""
1107
1108
#: bzrlib/builtins.py:2041
1109
msgid ""
1110
"Create the path leading up to the branch if it does not already exist."
1111
msgstr ""
1112
1113
#: bzrlib/builtins.py:2044
1114
msgid "Specify a format for this branch. See \"help formats\"."
1115
msgstr ""
1116
1117
#: bzrlib/builtins.py:2052
1118
msgid ""
1119
"Never change revnos or the existing log. Append revisions to it only."
1120
msgstr ""
1121
1122
#: bzrlib/builtins.py:2055
1123
msgid "Create a branch without a working tree."
1124
msgstr ""
1125
1126
#: bzrlib/builtins.py:2075 bzrlib/push.py:110
1127
#, python-format
1128
msgid ""
1129
"Parent directory of %s does not exist.\n"
1130
"You may supply --create-prefix to create all leading parent directories."
1131
msgstr ""
1132
1133
#: bzrlib/builtins.py:2109
1134
msgid ""
1135
"This branch format cannot be set to append-revisions-only. Try --default."
1136
msgstr ""
1137
1138
#: bzrlib/builtins.py:2120
1139
msgid "Created a {0} (format: {1})\n"
1140
msgstr ""
1141
1142
#: bzrlib/builtins.py:2129
1143
#, python-format
1144
msgid "Using shared repository: %s\n"
1145
msgstr ""
1146
1147
#: bzrlib/builtins.py:2133
1148
msgid "Create a shared repository for branches to share storage space."
1149
msgstr ""
1150
1151
#: bzrlib/builtins.py:2135
1152
msgid ""
1153
"New branches created under the repository directory will store their\n"
1154
"revisions in the repository, not in the branch directory. For branches\n"
1155
"with shared history, this reduces the amount of storage needed and \n"
1156
"speeds up the creation of new branches."
1157
msgstr ""
1158
1159
#: bzrlib/builtins.py:2140
1160
msgid ""
1161
"If the --no-trees option is given then the branches in the repository\n"
1162
"will not have working trees by default. They will still exist as \n"
1163
"directories on disk, but they will not have separate copies of the \n"
1164
"files at a certain revision. This can be useful for repositories that\n"
1165
"store branches which are interacted with through checkouts or remote\n"
1166
"branches, such as on a server."
1167
msgstr ""
1168
1169
#: bzrlib/builtins.py:2147
1170
msgid ""
1171
":Examples:\n"
1172
" Create a shared repository holding just branches::"
1173
msgstr ""
1174
1175
#: bzrlib/builtins.py:2150
1176
msgid ""
1177
" bzr init-repo --no-trees repo\n"
1178
" bzr init repo/trunk"
1179
msgstr ""
1180
1181
#: bzrlib/builtins.py:2153
1182
msgid " Make a lightweight checkout elsewhere::"
1183
msgstr ""
1184
1185
#: bzrlib/builtins.py:2155
1186
msgid ""
1187
" bzr checkout --lightweight repo/trunk trunk-checkout\n"
1188
" cd trunk-checkout\n"
1189
" (add files here)"
1190
msgstr ""
1191
1192
#: bzrlib/builtins.py:2163
1193
msgid ""
1194
"Specify a format for this repository. See \"bzr help formats\" for details."
1195
msgstr ""
1196
1197
#: bzrlib/builtins.py:2167
1198
msgid "Repository format"
1199
msgstr ""
1200
1201
#: bzrlib/builtins.py:2169
1202
msgid "Branches in the repository will default to not having a working tree."
1203
msgstr ""
1204
1205
#: bzrlib/builtins.py:2195
1206
msgid "Show differences in the working tree, between revisions or branches."
1207
msgstr ""
1208
1209
#: bzrlib/builtins.py:2197
1210
msgid ""
1211
"If no arguments are given, all changes for the current tree are listed.\n"
1212
"If files are given, only the changes in those files are listed.\n"
1213
"Remote and multiple branches can be compared by using the --old and\n"
1214
"--new options. If not provided, the default for both is derived from\n"
1215
"the first argument, if any, or the current tree if no arguments are\n"
1216
"given."
1217
msgstr ""
1218
1219
#: bzrlib/builtins.py:2204
1220
msgid ""
1221
"\"bzr diff -p1\" is equivalent to \"bzr diff --prefix old/:new/\", and\n"
1222
"produces patches suitable for \"patch -p1\"."
1223
msgstr ""
1224
1225
#: bzrlib/builtins.py:2207
1226
msgid ""
1227
"Note that when using the -r argument with a range of revisions, the\n"
1228
"differences are computed between the two specified revisions. That\n"
1229
"is, the command does not show the changes introduced by the first \n"
1230
"revision in the range. This differs from the interpretation of \n"
1231
"revision ranges used by \"bzr log\" which includes the first revision\n"
1232
"in the range."
1233
msgstr ""
1234
1235
#: bzrlib/builtins.py:2214
1236
msgid ""
1237
":Exit values:\n"
1238
" 1 - changed\n"
1239
" 2 - unrepresentable changes\n"
1240
" 3 - error\n"
1241
" 0 - no change"
1242
msgstr ""
1243
1244
#: bzrlib/builtins.py:2220
1245
msgid ""
1246
":Examples:\n"
1247
" Shows the difference in the working tree versus the last commit::"
1248
msgstr ""
1249
1250
#: bzrlib/builtins.py:2223
1251
msgid " bzr diff"
1252
msgstr ""
1253
1254
#: bzrlib/builtins.py:2225
1255
msgid " Difference between the working tree and revision 1::"
1256
msgstr ""
1257
1258
#: bzrlib/builtins.py:2227
1259
msgid " bzr diff -r1"
1260
msgstr ""
1261
1262
#: bzrlib/builtins.py:2229
1263
msgid " Difference between revision 3 and revision 1::"
1264
msgstr ""
1265
1266
#: bzrlib/builtins.py:2231
1267
msgid " bzr diff -r1..3"
1268
msgstr ""
1269
1270
#: bzrlib/builtins.py:2233
1271
msgid " Difference between revision 3 and revision 1 for branch xxx::"
1272
msgstr ""
1273
1274
#: bzrlib/builtins.py:2235
1275
msgid " bzr diff -r1..3 xxx"
1276
msgstr ""
1277
1278
#: bzrlib/builtins.py:2237
1279
msgid " The changes introduced by revision 2 (equivalent to -r1..2)::"
1280
msgstr ""
1281
1282
#: bzrlib/builtins.py:2239
1283
msgid " bzr diff -c2"
1284
msgstr ""
1285
1286
#: bzrlib/builtins.py:2241
1287
msgid ""
1288
" To see the changes introduced by revision X::\n"
1289
" \n"
1290
" bzr diff -cX"
1291
msgstr ""
1292
1293
#: bzrlib/builtins.py:2245
1294
msgid ""
1295
" Note that in the case of a merge, the -c option shows the changes\n"
1296
" compared to the left hand parent. To see the changes against\n"
1297
" another parent, use::"
1298
msgstr ""
1299
1300
#: bzrlib/builtins.py:2249
1301
msgid " bzr diff -r<chosen_parent>..X"
1302
msgstr ""
1303
1304
#: bzrlib/builtins.py:2251
1305
msgid ""
1306
" The changes between the current revision and the previous revision\n"
1307
" (equivalent to -c-1 and -r-2..-1)"
1308
msgstr ""
1309
1310
#: bzrlib/builtins.py:2254
1311
msgid " bzr diff -r-2.."
1312
msgstr ""
1313
1314
#: bzrlib/builtins.py:2256
1315
msgid " Show just the differences for file NEWS::"
1316
msgstr ""
1317
1318
#: bzrlib/builtins.py:2258
1319
msgid " bzr diff NEWS"
1320
msgstr ""
1321
1322
#: bzrlib/builtins.py:2260
1323
msgid " Show the differences in working tree xxx for file NEWS::"
1324
msgstr ""
1325
1326
#: bzrlib/builtins.py:2262
1327
msgid " bzr diff xxx/NEWS"
1328
msgstr ""
1329
1330
#: bzrlib/builtins.py:2264
1331
msgid " Show the differences from branch xxx to this working tree:"
1332
msgstr ""
1333
1334
#: bzrlib/builtins.py:2266
1335
msgid " bzr diff --old xxx"
1336
msgstr ""
1337
1338
#: bzrlib/builtins.py:2268
1339
msgid " Show the differences between two branches for file NEWS::"
1340
msgstr ""
1341
1342
#: bzrlib/builtins.py:2270
1343
msgid " bzr diff --old xxx --new yyy NEWS"
1344
msgstr ""
1345
1346
#: bzrlib/builtins.py:2272
1347
msgid " Same as 'bzr diff' but prefix paths with old/ and new/::"
1348
msgstr ""
1349
1350
#: bzrlib/builtins.py:2274
1351
msgid ""
1352
" bzr diff --prefix old/:new/\n"
1353
" \n"
1354
" Show the differences using a custom diff program with options::\n"
1355
" \n"
1356
" bzr diff --using /usr/bin/diff --diff-options -wu"
1357
msgstr ""
1358
1359
#: bzrlib/builtins.py:2284
1360
msgid "Pass these options to the external diff program."
1361
msgstr ""
1362
1363
#: bzrlib/builtins.py:2287
1364
msgid ""
1365
"Set prefixes added to old and new filenames, as two values separated by a "
1366
"colon. (eg \"old/:new/\")."
1367
msgstr ""
1368
1369
#: bzrlib/builtins.py:2290
1370
msgid "Branch/tree to compare from."
1371
msgstr ""
1372
1373
#: bzrlib/builtins.py:2294
1374
msgid "Branch/tree to compare to."
1375
msgstr ""
1376
1377
#: bzrlib/builtins.py:2300
1378
msgid "Use this command to compare files."
1379
msgstr ""
1380
1381
#: bzrlib/builtins.py:2305
1382
msgid "Diff format to use."
1383
msgstr ""
1384
1385
#: bzrlib/builtins.py:2307
1386
msgid "Diff format"
1387
msgstr ""
1388
1389
#: bzrlib/builtins.py:2329
1390
msgid "--prefix expects two values separated by a colon (eg \"old/:new/\")"
1391
msgstr ""
1392
1393
#: bzrlib/builtins.py:2333
1394
msgid "bzr diff --revision takes exactly one or two revision specifiers"
1395
msgstr ""
1396
1397
#: bzrlib/builtins.py:2338 bzrlib/builtins.py:2736 bzrlib/builtins.py:2749
1398
#: bzrlib/builtins.py:2757 bzrlib/builtins.py:4919
1399
msgid "{0} and {1} are mutually exclusive"
1400
msgstr ""
1401
1402
#: bzrlib/builtins.py:2358
1403
msgid ""
1404
"List files deleted in the working tree.\n"
1405
" "
1406
msgstr ""
1407
1408
#: bzrlib/builtins.py:2436
1409
msgid "Show the tree root directory."
1410
msgstr ""
1411
1412
#: bzrlib/builtins.py:2438
1413
msgid ""
1414
"The root is the nearest enclosing directory with a .bzr control\n"
1415
"directory."
1416
msgstr ""
1417
1418
#: bzrlib/builtins.py:2453
1419
msgid "The limit argument must be an integer."
1420
msgstr ""
1421
1422
#: bzrlib/builtins.py:2461
1423
msgid "The levels argument must be an integer."
1424
msgstr ""
1425
1426
#: bzrlib/builtins.py:2466
1427
msgid "Show historical log for a branch or subset of a branch."
1428
msgstr ""
1429
1430
#: bzrlib/builtins.py:2468
1431
msgid ""
1432
"log is bzr's default tool for exploring the history of a branch.\n"
1433
"The branch to use is taken from the first parameter. If no parameters\n"
1434
"are given, the branch containing the working directory is logged.\n"
1435
"Here are some simple examples::"
1436
msgstr ""
1437
1438
#: bzrlib/builtins.py:2473
1439
msgid ""
1440
" bzr log log the current branch\n"
1441
" bzr log foo.py log a file in its branch\n"
1442
" bzr log http://server/branch log a branch on a server"
1443
msgstr ""
1444
1445
#: bzrlib/builtins.py:2477
1446
msgid ""
1447
"The filtering, ordering and information shown for each revision can\n"
1448
"be controlled as explained below. By default, all revisions are\n"
1449
"shown sorted (topologically) so that newer revisions appear before\n"
1450
"older ones and descendants always appear before ancestors. If displayed,\n"
1451
"merged revisions are shown indented under the revision in which they\n"
1452
"were merged."
1453
msgstr ""
1454
1455
#: bzrlib/builtins.py:2484
1456
msgid ":Output control:"
1457
msgstr ""
1458
1459
#: bzrlib/builtins.py:2486
1460
msgid ""
1461
" The log format controls how information about each revision is\n"
1462
" displayed. The standard log formats are called ``long``, ``short``\n"
1463
" and ``line``. The default is long. See ``bzr help log-formats``\n"
1464
" for more details on log formats."
1465
msgstr ""
1466
1467
#: bzrlib/builtins.py:2491
1468
msgid ""
1469
" The following options can be used to control what information is\n"
1470
" displayed::"
1471
msgstr ""
1472
1473
#: bzrlib/builtins.py:2494
1474
msgid ""
1475
" -l N display a maximum of N revisions\n"
1476
" -n N display N levels of revisions (0 for all, 1 for collapsed)\n"
1477
" -v display a status summary (delta) for each revision\n"
1478
" -p display a diff (patch) for each revision\n"
1479
" --show-ids display revision-ids (and file-ids), not just revnos"
1480
msgstr ""
1481
1482
#: bzrlib/builtins.py:2500
1483
msgid ""
1484
" Note that the default number of levels to display is a function of the\n"
1485
" log format. If the -n option is not used, the standard log formats show\n"
1486
" just the top level (mainline)."
1487
msgstr ""
1488
1489
#: bzrlib/builtins.py:2504
1490
msgid ""
1491
" Status summaries are shown using status flags like A, M, etc. To see\n"
1492
" the changes explained using words like ``added`` and ``modified``\n"
1493
" instead, use the -vv option."
1494
msgstr ""
1495
1496
#: bzrlib/builtins.py:2508
1497
msgid ":Ordering control:"
1498
msgstr ""
1499
1500
#: bzrlib/builtins.py:2510
1501
msgid ""
1502
" To display revisions from oldest to newest, use the --forward option.\n"
1503
" In most cases, using this option will have little impact on the total\n"
1504
" time taken to produce a log, though --forward does not incrementally\n"
1505
" display revisions like --reverse does when it can."
1506
msgstr ""
1507
1508
#: bzrlib/builtins.py:2515
1509
msgid ":Revision filtering:"
1510
msgstr ""
1511
1512
#: bzrlib/builtins.py:2517
1513
msgid ""
1514
" The -r option can be used to specify what revision or range of revisions\n"
1515
" to filter against. The various forms are shown below::"
1516
msgstr ""
1517
1518
#: bzrlib/builtins.py:2520
1519
msgid ""
1520
" -rX display revision X\n"
1521
" -rX.. display revision X and later\n"
1522
" -r..Y display up to and including revision Y\n"
1523
" -rX..Y display from X to Y inclusive"
1524
msgstr ""
1525
1526
#: bzrlib/builtins.py:2525
1527
msgid ""
1528
" See ``bzr help revisionspec`` for details on how to specify X and Y.\n"
1529
" Some common examples are given below::"
1530
msgstr ""
1531
1532
#: bzrlib/builtins.py:2528
1533
msgid ""
1534
" -r-1 show just the tip\n"
1535
" -r-10.. show the last 10 mainline revisions\n"
1536
" -rsubmit:.. show what's new on this branch\n"
1537
" -rancestor:path.. show changes since the common ancestor of this\n"
1538
" branch and the one at location path\n"
1539
" -rdate:yesterday.. show changes since yesterday"
1540
msgstr ""
1541
1542
#: bzrlib/builtins.py:2535
1543
msgid ""
1544
" When logging a range of revisions using -rX..Y, log starts at\n"
1545
" revision Y and searches back in history through the primary\n"
1546
" (\"left-hand\") parents until it finds X. When logging just the\n"
1547
" top level (using -n1), an error is reported if X is not found\n"
1548
" along the way. If multi-level logging is used (-n0), X may be\n"
1549
" a nested merge revision and the log will be truncated accordingly."
1550
msgstr ""
1551
1552
#: bzrlib/builtins.py:2542
1553
msgid ":Path filtering:"
1554
msgstr ""
1555
1556
#: bzrlib/builtins.py:2544
1557
msgid ""
1558
" If parameters are given and the first one is not a branch, the log\n"
1559
" will be filtered to show only those revisions that changed the\n"
1560
" nominated files or directories."
1561
msgstr ""
1562
1563
#: bzrlib/builtins.py:2548
1564
msgid ""
1565
" Filenames are interpreted within their historical context. To log a\n"
1566
" deleted file, specify a revision range so that the file existed at\n"
1567
" the end or start of the range."
1568
msgstr ""
1569
1570
#: bzrlib/builtins.py:2552
1571
msgid ""
1572
" Historical context is also important when interpreting pathnames of\n"
1573
" renamed files/directories. Consider the following example:"
1574
msgstr ""
1575
1576
#: bzrlib/builtins.py:2555
1577
msgid ""
1578
" * revision 1: add tutorial.txt\n"
1579
" * revision 2: modify tutorial.txt\n"
1580
" * revision 3: rename tutorial.txt to guide.txt; add tutorial.txt"
1581
msgstr ""
1582
1583
#: bzrlib/builtins.py:2559
1584
msgid " In this case:"
1585
msgstr ""
1586
1587
#: bzrlib/builtins.py:2561
1588
msgid " * ``bzr log guide.txt`` will log the file added in revision 1"
1589
msgstr ""
1590
1591
#: bzrlib/builtins.py:2563
1592
msgid ""
1593
" * ``bzr log tutorial.txt`` will log the new file added in revision 3"
1594
msgstr ""
1595
1596
#: bzrlib/builtins.py:2565
1597
msgid ""
1598
" * ``bzr log -r2 -p tutorial.txt`` will show the changes made to\n"
1599
" the original file in revision 2."
1600
msgstr ""
1601
1602
#: bzrlib/builtins.py:2568
1603
msgid ""
1604
" * ``bzr log -r2 -p guide.txt`` will display an error message as there\n"
1605
" was no file called guide.txt in revision 2."
1606
msgstr ""
1607
1608
#: bzrlib/builtins.py:2571
1609
msgid ""
1610
" Renames are always followed by log. By design, there is no need to\n"
1611
" explicitly ask for this (and no way to stop logging a file back\n"
1612
" until it was last renamed)."
1613
msgstr ""
1614
1615
#: bzrlib/builtins.py:2575
1616
msgid ":Other filtering:"
1617
msgstr ""
1618
1619
#: bzrlib/builtins.py:2577
1620
msgid ""
1621
" The --match option can be used for finding revisions that match a\n"
1622
" regular expression in a commit message, committer, author or bug.\n"
1623
" Specifying the option several times will match any of the supplied\n"
1624
" expressions. --match-author, --match-bugs, --match-committer and\n"
1625
" --match-message can be used to only match a specific field."
1626
msgstr ""
1627
1628
#: bzrlib/builtins.py:2583
1629
msgid ":Tips & tricks:"
1630
msgstr ""
1631
1632
#: bzrlib/builtins.py:2585
1633
msgid ""
1634
" GUI tools and IDEs are often better at exploring history than command\n"
1635
" line tools: you may prefer qlog or viz from qbzr or bzr-gtk, the\n"
1636
" bzr-explorer shell, or the Loggerhead web interface. See the Plugin\n"
1637
" Guide <http://doc.bazaar.canonical.com/plugins/en/> and\n"
1638
" <http://wiki.bazaar.canonical.com/IDEIntegration>. "
1639
msgstr ""
1640
1641
#: bzrlib/builtins.py:2591
1642
msgid ""
1643
" You may find it useful to add the aliases below to ``bazaar.conf``::"
1644
msgstr ""
1645
1646
#: bzrlib/builtins.py:2593
1647
msgid ""
1648
" [ALIASES]\n"
1649
" tip = log -r-1\n"
1650
" top = log -l10 --line\n"
1651
" show = log -v -p"
1652
msgstr ""
1653
1654
#: bzrlib/builtins.py:2598
1655
msgid ""
1656
" ``bzr tip`` will then show the latest revision while ``bzr top``\n"
1657
" will show the last 10 mainline revisions. To see the details of a\n"
1658
" particular revision X, ``bzr show -rX``."
1659
msgstr ""
1660
1661
#: bzrlib/builtins.py:2602
1662
msgid ""
1663
" If you are interested in looking deeper into a particular merge X,\n"
1664
" use ``bzr log -n0 -rX``."
1665
msgstr ""
1666
1667
#: bzrlib/builtins.py:2605
1668
msgid ""
1669
" ``bzr log -v`` on a branch with lots of history is currently\n"
1670
" very slow. A fix for this issue is currently under development.\n"
1671
" With or without that fix, it is recommended that a revision range\n"
1672
" be given when using the -v option."
1673
msgstr ""
1674
1675
#: bzrlib/builtins.py:2610
1676
msgid ""
1677
" bzr has a generic full-text matching plugin, bzr-search, that can be\n"
1678
" used to find revisions matching user names, commit messages, etc.\n"
1679
" Among other features, this plugin can find all revisions containing\n"
1680
" a list of words but not others."
1681
msgstr ""
1682
1683
#: bzrlib/builtins.py:2615
1684
msgid ""
1685
" When exploring non-mainline history on large projects with deep\n"
1686
" history, the performance of log can be greatly improved by installing\n"
1687
" the historycache plugin. This plugin buffers historical information\n"
1688
" trading disk space for faster speed."
1689
msgstr ""
1690
1691
#: bzrlib/builtins.py:2624
1692
msgid "Show from oldest to newest."
1693
msgstr ""
1694
1695
#: bzrlib/builtins.py:2627
1696
msgid "Show files changed in each revision."
1697
msgstr ""
1698
1699
#: bzrlib/builtins.py:2633
1700
msgid "Show just the specified revision. See also \"help revisionspec\"."
1701
msgstr ""
1702
1703
#: bzrlib/builtins.py:2637
1704
msgid "What names to list as authors - first, all or committer."
1705
msgstr ""
1706
1707
#: bzrlib/builtins.py:2638
1708
msgid "Authors"
1709
msgstr ""
1710
1711
#: bzrlib/builtins.py:2643
1712
msgid "Number of levels to display - 0 for all, 1 for flat."
1713
msgstr ""
1714
1715
#: bzrlib/builtins.py:2653
1716
msgid "Limit the output to the first N revisions."
1717
msgstr ""
1718
1719
#: bzrlib/builtins.py:2658
1720
msgid "Show changes made in each revision as a patch."
1721
msgstr ""
1722
1723
#: bzrlib/builtins.py:2660
1724
msgid "Show merged revisions like --levels 0 does."
1725
msgstr ""
1726
1727
#: bzrlib/builtins.py:2664
1728
msgid "Do not report commits with more than one parent."
1729
msgstr ""
1730
1731
#: bzrlib/builtins.py:2666
1732
msgid ""
1733
"Display only the revisions that are not part of both ancestries (require -"
1734
"rX..Y)."
1735
msgstr ""
1736
1737
#: bzrlib/builtins.py:2670
1738
msgid "Show digital signature validity."
1739
msgstr ""
1740
1741
#: bzrlib/builtins.py:2673
1742
msgid "Show revisions whose properties match this expression."
1743
msgstr ""
1744
1745
#: bzrlib/builtins.py:2677
1746
msgid "Show revisions whose message matches this expression."
1747
msgstr ""
1748
1749
#: bzrlib/builtins.py:2681
1750
msgid "Show revisions whose committer matches this expression."
1751
msgstr ""
1752
1753
#: bzrlib/builtins.py:2685
1754
msgid "Show revisions whose authors match this expression."
1755
msgstr ""
1756
1757
#: bzrlib/builtins.py:2689
1758
msgid "Show revisions whose bugs match this expression."
1759
msgstr ""
1760
1761
#: bzrlib/builtins.py:2743
1762
msgid "--exclude-common-ancestry requires -r with two revisions"
1763
msgstr ""
1764
1765
#: bzrlib/builtins.py:2771
1766
#, python-format
1767
msgid "Path unknown at end or start of revision range: %s"
1768
msgstr ""
1769
1770
#: bzrlib/builtins.py:2888
1771
#, python-format
1772
msgid "bzr %s doesn't accept two revisions in different branches."
1773
msgstr ""
1774
1775
#: bzrlib/builtins.py:2904
1776
#, python-format
1777
msgid "bzr %s --revision takes one or two values."
1778
msgstr ""
1779
1780
#: bzrlib/builtins.py:2949
1781
msgid ""
1782
"List files in a tree.\n"
1783
" "
1784
msgstr ""
1785
1786
#: bzrlib/builtins.py:2958
1787
msgid "Recurse into subdirectories."
1788
msgstr ""
1789
1790
#: bzrlib/builtins.py:2960
1791
msgid "Print paths relative to the root of the branch."
1792
msgstr ""
1793
1794
#: bzrlib/builtins.py:2962
1795
msgid "Print unknown files."
1796
msgstr ""
1797
1798
#: bzrlib/builtins.py:2963
1799
msgid "Print versioned files."
1800
msgstr ""
1801
1802
#: bzrlib/builtins.py:2966
1803
msgid "Print ignored files."
1804
msgstr ""
1805
1806
#: bzrlib/builtins.py:2968
1807
msgid "List entries of a particular kind: file, directory, symlink."
1808
msgstr "List entries of a particular type: file, directory, symlink."
1809
1810
#: bzrlib/builtins.py:2981
1811
msgid "invalid kind specified"
1812
msgstr "invalid type specified"
1813
1814
#: bzrlib/builtins.py:2984
1815
msgid "Cannot set both --verbose and --null"
1816
msgstr ""
1817
1818
#: bzrlib/builtins.py:2993
1819
msgid "cannot specify both --from-root and PATH"
1820
msgstr ""
1821
1822
#: bzrlib/builtins.py:3080
1823
msgid "Ignore specified files or patterns."
1824
msgstr ""
1825
1826
#: bzrlib/builtins.py:3082
1827
msgid "See ``bzr help patterns`` for details on the syntax of patterns."
1828
msgstr ""
1829
1830
#: bzrlib/builtins.py:3084
1831
msgid ""
1832
"If a .bzrignore file does not exist, the ignore command\n"
1833
"will create one and add the specified files or patterns to the newly\n"
1834
"created file. The ignore command will also automatically add the \n"
1835
".bzrignore file to be versioned. Creating a .bzrignore file without\n"
1836
"the use of the ignore command will require an explicit add command."
1837
msgstr ""
1838
1839
#: bzrlib/builtins.py:3090
1840
msgid ""
1841
"To remove patterns from the ignore list, edit the .bzrignore file.\n"
1842
"After adding, editing or deleting that file either indirectly by\n"
1843
"using this command or directly by using an editor, be sure to commit\n"
1844
"it."
1845
msgstr ""
1846
1847
#: bzrlib/builtins.py:3095
1848
msgid ""
1849
"Bazaar also supports a global ignore file ~/.bazaar/ignore. On Windows\n"
1850
"the global ignore file can be found in the application data directory as\n"
1851
"C:\\Documents and Settings\\<user>\\Application Data\\Bazaar\\2.0\\ignore.\n"
1852
"Global ignores are not touched by this command. The global ignore file\n"
1853
"can be edited directly using an editor."
1854
msgstr ""
1855
1856
#: bzrlib/builtins.py:3101
1857
msgid ""
1858
"Patterns prefixed with '!' are exceptions to ignore patterns and take\n"
1859
"precedence over regular ignores. Such exceptions are used to specify\n"
1860
"files that should be versioned which would otherwise be ignored."
1861
msgstr ""
1862
1863
#: bzrlib/builtins.py:3105
1864
msgid ""
1865
"Patterns prefixed with '!!' act as regular ignore patterns, but have\n"
1866
"precedence over the '!' exception patterns."
1867
msgstr ""
1868
1869
#: bzrlib/builtins.py:3108
1870
msgid ""
1871
":Notes: \n"
1872
" \n"
1873
"* Ignore patterns containing shell wildcards must be quoted from\n"
1874
" the shell on Unix."
1875
msgstr ""
1876
1877
#: bzrlib/builtins.py:3113
1878
msgid ""
1879
"* Ignore patterns starting with \"#\" act as comments in the ignore file.\n"
1880
" To ignore patterns that begin with that character, use the \"RE:\" prefix."
1881
msgstr ""
1882
1883
#: bzrlib/builtins.py:3116
1884
msgid ""
1885
":Examples:\n"
1886
" Ignore the top level Makefile::"
1887
msgstr ""
1888
1889
#: bzrlib/builtins.py:3119
1890
msgid " bzr ignore ./Makefile"
1891
msgstr ""
1892
1893
#: bzrlib/builtins.py:3121
1894
msgid " Ignore .class files in all directories...::"
1895
msgstr ""
1896
1897
#: bzrlib/builtins.py:3123
1898
msgid " bzr ignore \"*.class\""
1899
msgstr ""
1900
1901
#: bzrlib/builtins.py:3125
1902
msgid " ...but do not ignore \"special.class\"::"
1903
msgstr ""
1904
1905
#: bzrlib/builtins.py:3127
1906
msgid " bzr ignore \"!special.class\""
1907
msgstr ""
1908
1909
#: bzrlib/builtins.py:3129
1910
msgid " Ignore files whose name begins with the \"#\" character::"
1911
msgstr ""
1912
1913
#: bzrlib/builtins.py:3131
1914
msgid " bzr ignore \"RE:^#\""
1915
msgstr ""
1916
1917
#: bzrlib/builtins.py:3133 bzrlib/builtins.py:3137
1918
msgid " Ignore .o files under the lib directory::"
1919
msgstr ""
1920
1921
#: bzrlib/builtins.py:3135
1922
msgid " bzr ignore \"lib/**/*.o\""
1923
msgstr ""
1924
1925
#: bzrlib/builtins.py:3139
1926
msgid " bzr ignore \"RE:lib/.*\\.o\""
1927
msgstr ""
1928
1929
#: bzrlib/builtins.py:3141
1930
msgid " Ignore everything but the \"debian\" toplevel directory::"
1931
msgstr ""
1932
1933
#: bzrlib/builtins.py:3143
1934
msgid ""
1935
" bzr ignore \"RE:(?!debian/).*\"\n"
1936
" \n"
1937
" Ignore everything except the \"local\" toplevel directory,\n"
1938
" but always ignore autosave files ending in ~, even under local/::\n"
1939
" \n"
1940
" bzr ignore \"*\"\n"
1941
" bzr ignore \"!./local\"\n"
1942
" bzr ignore \"!!*~\""
1943
msgstr ""
1944
1945
#: bzrlib/builtins.py:3157
1946
msgid "Display the default ignore rules that bzr uses."
1947
msgstr ""
1948
1949
#: bzrlib/builtins.py:3169
1950
msgid "ignore requires at least one NAME_PATTERN or --default-rules."
1951
msgstr ""
1952
1953
#: bzrlib/builtins.py:3180
1954
#, python-format
1955
msgid "Invalid ignore pattern found. %s"
1956
msgid_plural "Invalid ignore patterns found. %s"
1957
msgstr[0] ""
1958
msgstr[1] ""
1959
1960
#: bzrlib/builtins.py:3189
1961
msgid "NAME_PATTERN should not be an absolute path"
1962
msgstr ""
1963
1964
#: bzrlib/builtins.py:3202
1965
#, python-format
1966
msgid ""
1967
"Warning: the following files are version controlled and match your ignore "
1968
"pattern:\n"
1969
"%s\n"
1970
"These files will continue to be version controlled unless you 'bzr remove' "
1971
"them.\n"
1972
msgstr ""
1973
1974
#: bzrlib/builtins.py:3209
1975
msgid "List ignored files and the patterns that matched them."
1976
msgstr ""
1977
1978
#: bzrlib/builtins.py:3211
1979
msgid ""
1980
"List all the ignored files and the ignore pattern that caused the file to\n"
1981
"be ignored."
1982
msgstr ""
1983
1984
#: bzrlib/builtins.py:3214
1985
msgid "Alternatively, to list just the files::"
1986
msgstr ""
1987
1988
#: bzrlib/builtins.py:3216
1989
msgid " bzr ls --ignored"
1990
msgstr ""
1991
1992
#: bzrlib/builtins.py:3250
1993
#, python-format
1994
msgid "not a valid revision-number: %r"
1995
msgstr ""
1996
1997
#: bzrlib/builtins.py:3257
1998
msgid ""
1999
"Export current or past revision to a destination directory or archive."
2000
msgstr ""
2001
2002
#: bzrlib/builtins.py:3259
2003
msgid "If no revision is specified this exports the last committed revision."
2004
msgstr ""
2005
2006
#: bzrlib/builtins.py:3261
2007
msgid ""
2008
"Format may be an \"exporter\" name, such as tar, tgz, tbz2. If none is\n"
2009
"given, try to find the format with the extension. If no extension\n"
2010
"is found exports to a directory (equivalent to --format=dir)."
2011
msgstr ""
2012
2013
#: bzrlib/builtins.py:3265
2014
msgid ""
2015
"If root is supplied, it will be used as the root directory inside\n"
2016
"container formats (tar, zip, etc). If it is not supplied it will default\n"
2017
"to the exported filename. The root option has no effect for 'dir' format."
2018
msgstr ""
2019
2020
#: bzrlib/builtins.py:3269
2021
msgid ""
2022
"If branch is omitted then the branch containing the current working\n"
2023
"directory will be used."
2024
msgstr ""
2025
2026
#: bzrlib/builtins.py:3272
2027
msgid ""
2028
"Note: Export of tree with non-ASCII filenames to zip is not supported."
2029
msgstr ""
2030
2031
#: bzrlib/builtins.py:3274
2032
msgid ""
2033
" ================= =========================\n"
2034
" Supported formats Autodetected by extension\n"
2035
" ================= =========================\n"
2036
" dir (none)\n"
2037
" tar .tar\n"
2038
" tbz2 .tar.bz2, .tbz2\n"
2039
" tgz .tar.gz, .tgz\n"
2040
" zip .zip\n"
2041
" ================= ========================="
2042
msgstr ""
2043
2044
#: bzrlib/builtins.py:3288
2045
msgid "Type of file to export to."
2046
msgstr ""
2047
2048
#: bzrlib/builtins.py:3291
2049
msgid "Apply content filters to export the convenient form."
2050
msgstr ""
2051
2052
#: bzrlib/builtins.py:3295
2053
msgid "Name of the root directory inside the exported file."
2054
msgstr ""
2055
2056
#: bzrlib/builtins.py:3297
2057
msgid ""
2058
"Set modification time of files to that of the last revision in which it was "
2059
"changed."
2060
msgstr ""
2061
2062
#: bzrlib/builtins.py:3300
2063
msgid ""
2064
"Export the working tree contents rather than that of the last revision."
2065
msgstr ""
2066
2067
#: bzrlib/builtins.py:3319
2068
msgid "--uncommitted requires a working tree"
2069
msgstr ""
2070
2071
#: bzrlib/builtins.py:3328
2072
#, python-format
2073
msgid "Unsupported export format: %s"
2074
msgstr ""
2075
2076
#: bzrlib/builtins.py:3332
2077
msgid ""
2078
"Write the contents of a file as of a given revision to standard output."
2079
msgstr ""
2080
2081
#: bzrlib/builtins.py:3334
2082
msgid "If no revision is nominated, the last revision is used."
2083
msgstr ""
2084
2085
#: bzrlib/builtins.py:3336
2086
msgid ""
2087
"Note: Take care to redirect standard output when using this command on a\n"
2088
"binary file."
2089
msgstr ""
2090
2091
#: bzrlib/builtins.py:3342
2092
msgid "The path name in the old tree."
2093
msgstr ""
2094
2095
#: bzrlib/builtins.py:3343
2096
msgid "Apply content filters to display the convenience form."
2097
msgstr ""
2098
2099
#: bzrlib/builtins.py:3354
2100
msgid "bzr cat --revision takes exactly one revision specifier"
2101
msgstr ""
2102
2103
#: bzrlib/builtins.py:3379 bzrlib/builtins.py:3391
2104
msgid "{0!r} is not present in revision {1}"
2105
msgstr ""
2106
2107
#: bzrlib/builtins.py:3414
2108
msgid "Commit changes into a new revision."
2109
msgstr ""
2110
2111
#: bzrlib/builtins.py:3416
2112
msgid ""
2113
"An explanatory message needs to be given for each commit. This is\n"
2114
"often done by using the --message option (getting the message from the\n"
2115
"command line) or by using the --file option (getting the message from\n"
2116
"a file). If neither of these options is given, an editor is opened for\n"
2117
"the user to enter the message. To see the changed files in the\n"
2118
"boilerplate text loaded into the editor, use the --show-diff option."
2119
msgstr ""
2120
2121
#: bzrlib/builtins.py:3423
2122
msgid ""
2123
"By default, the entire tree is committed and the person doing the\n"
2124
"commit is assumed to be the author. These defaults can be overridden\n"
2125
"as explained below."
2126
msgstr ""
2127
2128
#: bzrlib/builtins.py:3427
2129
msgid ":Selective commits:"
2130
msgstr ""
2131
2132
#: bzrlib/builtins.py:3429
2133
msgid ""
2134
" If selected files are specified, only changes to those files are\n"
2135
" committed. If a directory is specified then the directory and\n"
2136
" everything within it is committed."
2137
msgstr ""
2138
2139
#: bzrlib/builtins.py:3433
2140
msgid ""
2141
" When excludes are given, they take precedence over selected files.\n"
2142
" For example, to commit only changes within foo, but not changes\n"
2143
" within foo/bar::"
2144
msgstr ""
2145
2146
#: bzrlib/builtins.py:3437
2147
msgid " bzr commit foo -x foo/bar"
2148
msgstr ""
2149
2150
#: bzrlib/builtins.py:3439
2151
msgid " A selective commit after a merge is not yet supported."
2152
msgstr ""
2153
2154
#: bzrlib/builtins.py:3441
2155
msgid ":Custom authors:"
2156
msgstr ""
2157
2158
#: bzrlib/builtins.py:3443
2159
msgid ""
2160
" If the author of the change is not the same person as the committer,\n"
2161
" you can specify the author's name using the --author option. The\n"
2162
" name should be in the same format as a committer-id, e.g.\n"
2163
" \"John Doe <jdoe@example.com>\". If there is more than one author of\n"
2164
" the change you can specify the option multiple times, once for each\n"
2165
" author."
2166
msgstr ""
2167
2168
#: bzrlib/builtins.py:3450
2169
msgid ":Checks:"
2170
msgstr ""
2171
2172
#: bzrlib/builtins.py:3452
2173
msgid ""
2174
" A common mistake is to forget to add a new file or directory before\n"
2175
" running the commit command. The --strict option checks for unknown\n"
2176
" files and aborts the commit if any are found. More advanced pre-commit\n"
2177
" checks can be implemented by defining hooks. See ``bzr help hooks``\n"
2178
" for details."
2179
msgstr ""
2180
2181
#: bzrlib/builtins.py:3458
2182
msgid ":Things to note:"
2183
msgstr ""
2184
2185
#: bzrlib/builtins.py:3460
2186
msgid ""
2187
" If you accidentially commit the wrong changes or make a spelling\n"
2188
" mistake in the commit message say, you can use the uncommit command\n"
2189
" to undo it. See ``bzr help uncommit`` for details."
2190
msgstr ""
2191
2192
#: bzrlib/builtins.py:3464
2193
msgid ""
2194
" Hooks can also be configured to run after a commit. This allows you\n"
2195
" to trigger updates to external systems like bug trackers. The --fixes\n"
2196
" option can be used to record the association between a revision and\n"
2197
" one or more bugs. See ``bzr help bugs`` for details."
2198
msgstr ""
2199
2200
#: bzrlib/builtins.py:3474
2201
msgid "Do not consider changes made to a given path."
2202
msgstr ""
2203
2204
#: bzrlib/builtins.py:3477
2205
msgid "Description of the new revision."
2206
msgstr ""
2207
2208
#: bzrlib/builtins.py:3480
2209
msgid "Commit even if nothing has changed."
2210
msgstr ""
2211
2212
#: bzrlib/builtins.py:3484
2213
msgid "Take commit message from this file."
2214
msgstr ""
2215
2216
#: bzrlib/builtins.py:3486
2217
msgid "Refuse to commit if there are unknown files in the working tree."
2218
msgstr ""
2219
2220
#: bzrlib/builtins.py:3489
2221
msgid ""
2222
"Manually set a commit time using commit date format, e.g. '2009-10-10 "
2223
"08:00:00 +0100'."
2224
msgstr ""
2225
2226
#: bzrlib/builtins.py:3492
2227
msgid "Mark a bug as being fixed by this revision (see \"bzr help bugs\")."
2228
msgstr ""
2229
2230
#: bzrlib/builtins.py:3495
2231
msgid "Set the author's name, if it's different from the committer."
2232
msgstr ""
2233
2234
#: bzrlib/builtins.py:3498
2235
msgid ""
2236
"Perform a local commit in a bound branch. Local commits are not pushed to "
2237
"the master branch until a normal commit is performed."
2238
msgstr ""
2239
2240
#: bzrlib/builtins.py:3504
2241
msgid ""
2242
"When no message is supplied, show the diff along with the status summary in "
2243
"the message editor."
2244
msgstr ""
2245
2246
#: bzrlib/builtins.py:3507
2247
msgid ""
2248
"When committing to a foreign version control system do not push data that "
2249
"can not be natively represented."
2250
msgstr ""
2251
2252
#: bzrlib/builtins.py:3525
2253
#, python-format
2254
msgid ""
2255
"No tracker specified for bug %s. Use the form 'tracker:id' or specify a "
2256
"default bug tracker using the `bugtracker` option.\n"
2257
"See \"bzr help bugs\" for more information on this feature. Commit refused."
2258
msgstr ""
2259
2260
#: bzrlib/builtins.py:3534
2261
#, python-format
2262
msgid ""
2263
"Invalid bug %s. Must be in the form of 'tracker:id'. See \"bzr help bugs\" "
2264
"for more information on this feature.\n"
2265
"Commit refused."
2266
msgstr ""
2267
2268
#: bzrlib/builtins.py:3543
2269
#, python-format
2270
msgid "Unrecognized bug %s. Commit refused."
2271
msgstr ""
2272
2273
#: bzrlib/builtins.py:3546
2274
#, python-format
2275
msgid ""
2276
"%s\n"
2277
"Commit refused."
2278
msgstr ""
2279
2280
#: bzrlib/builtins.py:3570
2281
msgid "Could not parse --commit-time: "
2282
msgstr ""
2283
2284
#: bzrlib/builtins.py:3610
2285
msgid "please specify either --message or --file"
2286
msgstr ""
2287
2288
#: bzrlib/builtins.py:3639
2289
msgid "please specify a commit message with either --message or --file"
2290
msgstr ""
2291
2292
#: bzrlib/builtins.py:3642
2293
msgid ""
2294
"Empty commit message specified. Please specify a commit message with either -"
2295
"-message or --file or leave a blank message with --message \"\"."
2296
msgstr ""
2297
2298
#: bzrlib/builtins.py:3662
2299
msgid ""
2300
"No changes to commit. Please 'bzr add' the files you want to commit, or use -"
2301
"-unchanged to force an empty commit."
2302
msgstr ""
2303
2304
#: bzrlib/builtins.py:3666
2305
msgid ""
2306
"Conflicts detected in working tree. Use \"bzr conflicts\" to list, \"bzr "
2307
"resolve FILE\" to resolve."
2308
msgstr ""
2309
2310
#: bzrlib/builtins.py:3670
2311
msgid "Commit refused because there are unknown files in the working tree."
2312
msgstr ""
2313
2314
#: bzrlib/builtins.py:3673
2315
msgid ""
2316
"\n"
2317
"To commit to master branch, run update and then commit.\n"
2318
"You can also pass --local to commit to continue working disconnected."
2319
msgstr ""
2320
2321
#: bzrlib/builtins.py:3681
2322
msgid ""
2323
"Validate working tree structure, branch consistency and repository history."
2324
msgstr ""
2325
2326
#: bzrlib/builtins.py:3683
2327
msgid ""
2328
"This command checks various invariants about branch and repository storage\n"
2329
"to detect data corruption or bzr bugs."
2330
msgstr ""
2331
2332
#: bzrlib/builtins.py:3686
2333
msgid ""
2334
"The working tree and branch checks will only give output if a problem is\n"
2335
"detected. The output fields of the repository check are:"
2336
msgstr ""
2337
2338
#: bzrlib/builtins.py:3689
2339
msgid ""
2340
"revisions\n"
2341
" This is just the number of revisions checked. It doesn't\n"
2342
" indicate a problem."
2343
msgstr ""
2344
2345
#: bzrlib/builtins.py:3693
2346
msgid ""
2347
"versionedfiles\n"
2348
" This is just the number of versionedfiles checked. It\n"
2349
" doesn't indicate a problem."
2350
msgstr ""
2351
2352
#: bzrlib/builtins.py:3697
2353
msgid ""
2354
"unreferenced ancestors\n"
2355
" Texts that are ancestors of other texts, but\n"
2356
" are not properly referenced by the revision ancestry. This is a\n"
2357
" subtle problem that Bazaar can work around."
2358
msgstr ""
2359
2360
#: bzrlib/builtins.py:3702
2361
msgid ""
2362
"unique file texts\n"
2363
" This is the total number of unique file contents\n"
2364
" seen in the checked revisions. It does not indicate a problem."
2365
msgstr ""
2366
2367
#: bzrlib/builtins.py:3706
2368
msgid ""
2369
"repeated file texts\n"
2370
" This is the total number of repeated texts seen\n"
2371
" in the checked revisions. Texts can be repeated when their file\n"
2372
" entries are modified, but the file contents are not. It does not\n"
2373
" indicate a problem."
2374
msgstr ""
2375
2376
#: bzrlib/builtins.py:3712
2377
msgid ""
2378
"If no restrictions are specified, all Bazaar data that is found at the "
2379
"given\n"
2380
"location will be checked."
2381
msgstr ""
2382
2383
#: bzrlib/builtins.py:3717
2384
msgid " Check the tree and branch at 'foo'::"
2385
msgstr ""
2386
2387
#: bzrlib/builtins.py:3719
2388
msgid " bzr check --tree --branch foo"
2389
msgstr ""
2390
2391
#: bzrlib/builtins.py:3721
2392
msgid " Check only the repository at 'bar'::"
2393
msgstr ""
2394
2395
#: bzrlib/builtins.py:3723
2396
msgid " bzr check --repo bar"
2397
msgstr ""
2398
2399
#: bzrlib/builtins.py:3725
2400
msgid " Check everything at 'baz'::"
2401
msgstr ""
2402
2403
#: bzrlib/builtins.py:3727
2404
msgid " bzr check baz"
2405
msgstr ""
2406
2407
#: bzrlib/builtins.py:3733
2408
msgid "Check the branch related to the current directory."
2409
msgstr ""
2410
2411
#: bzrlib/builtins.py:3735
2412
msgid "Check the repository related to the current directory."
2413
msgstr ""
2414
2415
#: bzrlib/builtins.py:3737
2416
msgid "Check the working tree related to the current directory."
2417
msgstr ""
2418
2419
#: bzrlib/builtins.py:3751
2420
msgid "Upgrade a repository, branch or working tree to a newer format."
2421
msgstr ""
2422
2423
#: bzrlib/builtins.py:3753
2424
msgid ""
2425
"When the default format has changed after a major new release of\n"
2426
"Bazaar, you may be informed during certain operations that you\n"
2427
"should upgrade. Upgrading to a newer format may improve performance\n"
2428
"or make new features available. It may however limit interoperability\n"
2429
"with older repositories or with older versions of Bazaar."
2430
msgstr ""
2431
2432
#: bzrlib/builtins.py:3759
2433
msgid ""
2434
"If you wish to upgrade to a particular format rather than the\n"
2435
"current default, that can be specified using the --format option.\n"
2436
"As a consequence, you can use the upgrade command this way to\n"
2437
"\"downgrade\" to an earlier format, though some conversions are\n"
2438
"a one way process (e.g. changing from the 1.x default to the\n"
2439
"2.x default) so downgrading is not always possible."
2440
msgstr ""
2441
2442
#: bzrlib/builtins.py:3766
2443
msgid ""
2444
"A backup.bzr.~#~ directory is created at the start of the conversion\n"
2445
"process (where # is a number). By default, this is left there on\n"
2446
"completion. If the conversion fails, delete the new .bzr directory\n"
2447
"and rename this one back in its place. Use the --clean option to ask\n"
2448
"for the backup.bzr directory to be removed on successful conversion.\n"
2449
"Alternatively, you can delete it by hand if everything looks good\n"
2450
"afterwards."
2451
msgstr ""
2452
2453
#: bzrlib/builtins.py:3774
2454
msgid ""
2455
"If the location given is a shared repository, dependent branches\n"
2456
"are also converted provided the repository converts successfully.\n"
2457
"If the conversion of a branch fails, remaining branches are still\n"
2458
"tried."
2459
msgstr ""
2460
2461
#: bzrlib/builtins.py:3779
2462
msgid ""
2463
"For more information on upgrades, see the Bazaar Upgrade Guide,\n"
2464
"http://doc.bazaar.canonical.com/latest/en/upgrade-guide/."
2465
msgstr ""
2466
2467
#: bzrlib/builtins.py:3787
2468
msgid "Upgrade to a specific format. See \"bzr help formats\" for details."
2469
msgstr ""
2470
2471
#: bzrlib/builtins.py:3791
2472
msgid "Branch format"
2473
msgstr ""
2474
2475
#: bzrlib/builtins.py:3793
2476
msgid "Remove the backup.bzr directory if successful."
2477
msgstr ""
2478
2479
#: bzrlib/builtins.py:3795
2480
msgid "Show what would be done, but don't actually do anything."
2481
msgstr ""
2482
2483
#: bzrlib/builtins.py:3810
2484
msgid "Show or set bzr user id."
2485
msgstr ""
2486
2487
#: bzrlib/builtins.py:3812
2488
msgid ""
2489
":Examples:\n"
2490
" Show the email of the current user::"
2491
msgstr ""
2492
2493
#: bzrlib/builtins.py:3815
2494
msgid " bzr whoami --email"
2495
msgstr ""
2496
2497
#: bzrlib/builtins.py:3817
2498
msgid " Set the current user::"
2499
msgstr ""
2500
2501
#: bzrlib/builtins.py:3819
2502
msgid " bzr whoami \"Frank Chu <fchu@example.com>\""
2503
msgstr ""
2504
2505
#: bzrlib/builtins.py:3823
2506
msgid "Display email address only."
2507
msgstr ""
2508
2509
#: bzrlib/builtins.py:3825
2510
msgid "Set identity for the current branch instead of globally."
2511
msgstr ""
2512
2513
#: bzrlib/builtins.py:3851
2514
msgid "--email can only be used to display existing identity"
2515
msgstr ""
2516
2517
#: bzrlib/builtins.py:3873
2518
msgid "Print or set the branch nickname."
2519
msgstr ""
2520
2521
#: bzrlib/builtins.py:3875
2522
msgid ""
2523
"If unset, the tree root directory name is used as the nickname.\n"
2524
"To print the current nickname, execute with no argument."
2525
msgstr ""
2526
2527
#: bzrlib/builtins.py:3878
2528
msgid ""
2529
"Bound branches use the nickname of its master branch unless it is set\n"
2530
"locally."
2531
msgstr ""
2532
2533
#: bzrlib/builtins.py:3898
2534
msgid "Set/unset and display aliases."
2535
msgstr ""
2536
2537
#: bzrlib/builtins.py:3900
2538
msgid ""
2539
":Examples:\n"
2540
" Show the current aliases::"
2541
msgstr ""
2542
2543
#: bzrlib/builtins.py:3903
2544
msgid " bzr alias"
2545
msgstr ""
2546
2547
#: bzrlib/builtins.py:3905
2548
msgid " Show the alias specified for 'll'::"
2549
msgstr ""
2550
2551
#: bzrlib/builtins.py:3907
2552
msgid " bzr alias ll"
2553
msgstr ""
2554
2555
#: bzrlib/builtins.py:3909
2556
msgid " Set an alias for 'll'::"
2557
msgstr ""
2558
2559
#: bzrlib/builtins.py:3911
2560
msgid " bzr alias ll=\"log --line -r-10..-1\""
2561
msgstr ""
2562
2563
#: bzrlib/builtins.py:3913
2564
msgid " To remove an alias for 'll'::"
2565
msgstr ""
2566
2567
#: bzrlib/builtins.py:3915
2568
msgid " bzr alias --remove ll"
2569
msgstr ""
2570
2571
#: bzrlib/builtins.py:3920
2572
msgid "Remove the alias."
2573
msgstr ""
2574
2575
#: bzrlib/builtins.py:3938
2576
msgid "bzr alias --remove expects an alias to remove."
2577
msgstr ""
2578
2579
#: bzrlib/builtins.py:4119
2580
msgid ""
2581
"subunit not available. subunit needs to be installed to use --subunit."
2582
msgstr ""
2583
2584
#: bzrlib/builtins.py:4136
2585
msgid ""
2586
"--benchmark is no longer supported from bzr 2.2; use bzr-usertest instead"
2587
msgstr ""
2588
2589
#: bzrlib/builtins.py:4183
2590
msgid "Show version of bzr."
2591
msgstr ""
2592
2593
#: bzrlib/builtins.py:4187
2594
msgid "Print just the version number."
2595
msgstr ""
2596
2597
#: bzrlib/builtins.py:4206
2598
msgid "It sure does!\n"
2599
msgstr ""
2600
2601
#: bzrlib/builtins.py:4230
2602
#, python-format
2603
msgid "merge base is revision %s\n"
2604
msgstr ""
2605
2606
#: bzrlib/builtins.py:4234
2607
msgid "Perform a three-way merge."
2608
msgstr ""
2609
2610
#: bzrlib/builtins.py:4236
2611
msgid ""
2612
"The source of the merge can be specified either in the form of a branch,\n"
2613
"or in the form of a path to a file containing a merge directive generated\n"
2614
"with bzr send. If neither is specified, the default is the upstream branch\n"
2615
"or the branch most recently merged using --remember. The source of the\n"
2616
"merge may also be specified in the form of a path to a file in another\n"
2617
"branch: in this case, only the modifications to that file are merged into\n"
2618
"the current working tree."
2619
msgstr ""
2620
2621
#: bzrlib/builtins.py:4244
2622
msgid ""
2623
"When merging from a branch, by default bzr will try to merge in all new\n"
2624
"work from the other branch, automatically determining an appropriate base\n"
2625
"revision. If this fails, you may need to give an explicit base."
2626
msgstr ""
2627
2628
#: bzrlib/builtins.py:4248
2629
msgid ""
2630
"To pick a different ending revision, pass \"--revision OTHER\". bzr will\n"
2631
"try to merge in all new work up to and including revision OTHER."
2632
msgstr ""
2633
2634
#: bzrlib/builtins.py:4251
2635
msgid ""
2636
"If you specify two values, \"--revision BASE..OTHER\", only revisions BASE\n"
2637
"through OTHER, excluding BASE but including OTHER, will be merged. If this\n"
2638
"causes some revisions to be skipped, i.e. if the destination branch does\n"
2639
"not already contain revision BASE, such a merge is commonly referred to as\n"
2640
"a \"cherrypick\". Unlike a normal merge, Bazaar does not currently track\n"
2641
"cherrypicks. The changes look like a normal commit, and the history of the\n"
2642
"changes from the other branch is not stored in the commit."
2643
msgstr ""
2644
2645
#: bzrlib/builtins.py:4259
2646
msgid "Revision numbers are always relative to the source branch."
2647
msgstr ""
2648
2649
#: bzrlib/builtins.py:4261 bzrlib/conflicts.py:52 bzrlib/conflicts.py:106
2650
msgid ""
2651
"Merge will do its best to combine the changes in two branches, but there\n"
2652
"are some kinds of problems only a human can fix. When it encounters those,\n"
2653
"it will mark a conflict. A conflict means that you need to fix something,\n"
2654
"before you can commit."
2655
msgstr ""
2656
2657
#: bzrlib/builtins.py:4266
2658
msgid ""
2659
"Use bzr resolve when you have fixed a problem. See also bzr conflicts."
2660
msgstr ""
2661
2662
#: bzrlib/builtins.py:4268
2663
msgid ""
2664
"If there is no default branch set, the first merge will set it (use\n"
2665
"--no-remember to avoid setting it). After that, you can omit the branch\n"
2666
"to use the default. To change the default, use --remember. The value will\n"
2667
"only be saved if the remote location can be accessed."
2668
msgstr ""
2669
2670
#: bzrlib/builtins.py:4273
2671
msgid ""
2672
"The results of the merge are placed into the destination working\n"
2673
"directory, where they can be reviewed (with bzr diff), tested, and then\n"
2674
"committed to record the result of the merge."
2675
msgstr ""
2676
2677
#: bzrlib/builtins.py:4277
2678
msgid ""
2679
"merge refuses to run if there are any uncommitted changes, unless\n"
2680
"--force is given. If --force is given, then the changes from the source \n"
2681
"will be merged with the current working tree, including any uncommitted\n"
2682
"changes in the tree. The --force option can also be used to create a\n"
2683
"merge revision which has more than two parents."
2684
msgstr ""
2685
2686
#: bzrlib/builtins.py:4283
2687
msgid ""
2688
"If one would like to merge changes from the working tree of the other\n"
2689
"branch without merging any committed revisions, the --uncommitted option\n"
2690
"can be given."
2691
msgstr ""
2692
2693
#: bzrlib/builtins.py:4287
2694
msgid ""
2695
"To select only some changes to merge, use \"merge -i\", which will prompt\n"
2696
"you to apply each diff hunk and file change, similar to \"shelve\"."
2697
msgstr ""
2698
2699
#: bzrlib/builtins.py:4290
2700
msgid ""
2701
":Examples:\n"
2702
" To merge all new revisions from bzr.dev::"
2703
msgstr ""
2704
2705
#: bzrlib/builtins.py:4293
2706
msgid " bzr merge ../bzr.dev"
2707
msgstr ""
2708
2709
#: bzrlib/builtins.py:4295
2710
msgid " To merge changes up to and including revision 82 from bzr.dev::"
2711
msgstr ""
2712
2713
#: bzrlib/builtins.py:4297
2714
msgid " bzr merge -r 82 ../bzr.dev"
2715
msgstr ""
2716
2717
#: bzrlib/builtins.py:4299
2718
msgid " To merge the changes introduced by 82, without previous changes::"
2719
msgstr ""
2720
2721
#: bzrlib/builtins.py:4301
2722
msgid " bzr merge -r 81..82 ../bzr.dev"
2723
msgstr ""
2724
2725
#: bzrlib/builtins.py:4303
2726
msgid " To apply a merge directive contained in /tmp/merge::"
2727
msgstr ""
2728
2729
#: bzrlib/builtins.py:4305
2730
msgid " bzr merge /tmp/merge"
2731
msgstr ""
2732
2733
#: bzrlib/builtins.py:4307
2734
msgid ""
2735
" To create a merge revision with three parents from two branches\n"
2736
" feature1a and feature1b:"
2737
msgstr ""
2738
2739
#: bzrlib/builtins.py:4310
2740
msgid ""
2741
" bzr merge ../feature1a\n"
2742
" bzr merge ../feature1b --force\n"
2743
" bzr commit -m 'revision with three parents'"
2744
msgstr ""
2745
2746
#: bzrlib/builtins.py:4322
2747
msgid "Merge even if the destination tree has uncommitted changes."
2748
msgstr ""
2749
2750
#: bzrlib/builtins.py:4328
2751
msgid ""
2752
"Apply uncommitted changes from a working copy, instead of branch changes."
2753
msgstr ""
2754
2755
#: bzrlib/builtins.py:4330
2756
msgid ""
2757
"If the destination is already completely merged into the source, pull from "
2758
"the source rather than merging. When this happens, you do not need to "
2759
"commit the result."
2760
msgstr ""
2761
2762
#: bzrlib/builtins.py:4335
2763
msgid ""
2764
"Branch to merge into, rather than the one containing the working directory."
2765
msgstr ""
2766
2767
#: bzrlib/builtins.py:4337
2768
msgid "Instead of merging, show a diff of the merge."
2769
msgstr ""
2770
2771
#: bzrlib/builtins.py:4339
2772
msgid "Select changes interactively."
2773
msgstr ""
2774
2775
#: bzrlib/builtins.py:4361
2776
msgid ""
2777
"Merging into empty branches not currently supported, "
2778
"https://bugs.launchpad.net/bzr/+bug/308562"
2779
msgstr ""
2780
2781
#: bzrlib/builtins.py:4388
2782
msgid "Cannot use --uncommitted with bundles or merge directives."
2783
msgstr ""
2784
2785
#: bzrlib/builtins.py:4399
2786
msgid "Cannot use --uncommitted and --revision at the same time."
2787
msgstr ""
2788
2789
#: bzrlib/builtins.py:4419
2790
msgid "merger: "
2791
msgstr ""
2792
2793
#: bzrlib/builtins.py:4421 bzrlib/bundle/apply_bundle.py:71
2794
msgid "Nothing to do."
2795
msgstr ""
2796
2797
#: bzrlib/builtins.py:4425
2798
msgid "Cannot pull individual files"
2799
msgstr ""
2800
2801
#: bzrlib/builtins.py:4433
2802
msgid "This branch has no commits. (perhaps you would prefer 'bzr pull')"
2803
msgstr ""
2804
2805
#: bzrlib/builtins.py:4491
2806
#, python-format
2807
msgid "Show-base is not supported for this merge type. %s"
2808
msgstr ""
2809
2810
#: bzrlib/builtins.py:4500
2811
#, python-format
2812
msgid "Conflict reduction is not supported for merge type %s."
2813
msgstr ""
2814
2815
#: bzrlib/builtins.py:4504
2816
msgid "Cannot do conflict reduction and show base."
2817
msgstr ""
2818
2819
#: bzrlib/builtins.py:4615
2820
msgid "No location specified or remembered"
2821
msgstr ""
2822
2823
#: bzrlib/builtins.py:4617
2824
msgid "{0} remembered {1} location {2}"
2825
msgstr ""
2826
2827
#: bzrlib/builtins.py:4623
2828
msgid "Redo a merge."
2829
msgstr ""
2830
2831
#: bzrlib/builtins.py:4625
2832
msgid ""
2833
"Use this if you want to try a different merge technique while resolving\n"
2834
"conflicts. Some merge techniques are better than others, and remerge\n"
2835
"lets you try different ones on different files."
2836
msgstr ""
2837
2838
#: bzrlib/builtins.py:4629
2839
msgid ""
2840
"The options for remerge have the same meaning and defaults as the ones for\n"
2841
"merge. The difference is that remerge can (only) be run when there is a\n"
2842
"pending merge, and it lets you specify particular files."
2843
msgstr ""
2844
2845
#: bzrlib/builtins.py:4633
2846
msgid ""
2847
":Examples:\n"
2848
" Re-do the merge of all conflicted files, and show the base text in\n"
2849
" conflict regions, in addition to the usual THIS and OTHER texts::"
2850
msgstr ""
2851
2852
#: bzrlib/builtins.py:4637
2853
msgid " bzr remerge --show-base"
2854
msgstr ""
2855
2856
#: bzrlib/builtins.py:4639
2857
msgid ""
2858
" Re-do the merge of \"foobar\", using the weave merge algorithm, with\n"
2859
" additional processing to reduce the size of conflict regions::"
2860
msgstr ""
2861
2862
#: bzrlib/builtins.py:4642
2863
msgid " bzr remerge --merge-type weave --reprocess foobar"
2864
msgstr ""
2865
2866
#: bzrlib/builtins.py:4649
2867
msgid "Show base revision text in conflicts."
2868
msgstr ""
2869
2870
#: bzrlib/builtins.py:4661
2871
msgid ""
2872
"Sorry, remerge only works after normal merges. Not cherrypicking or multi-"
2873
"merges."
2874
msgstr ""
2875
2876
#: bzrlib/builtins.py:4717
2877
msgid "Revert files to a previous revision."
2878
msgstr ""
2879
2880
#: bzrlib/builtins.py:4719
2881
msgid ""
2882
"Giving a list of files will revert only those files. Otherwise, all files\n"
2883
"will be reverted. If the revision is not specified with '--revision', the\n"
2884
"last committed revision is used."
2885
msgstr ""
2886
2887
#: bzrlib/builtins.py:4723
2888
msgid ""
2889
"To remove only some changes, without reverting to a prior version, use\n"
2890
"merge instead. For example, \"merge . -r -2..-3\" (don't forget the \".\")\n"
2891
"will remove the changes introduced by the second last commit (-2), without\n"
2892
"affecting the changes introduced by the last commit (-1). To remove\n"
2893
"certain changes on a hunk-by-hunk basis, see the shelve command."
2894
msgstr ""
2895
2896
#: bzrlib/builtins.py:4729
2897
msgid ""
2898
"By default, any files that have been manually changed will be backed up\n"
2899
"first. (Files changed only by merge are not backed up.) Backup files have\n"
2900
"'.~#~' appended to their name, where # is a number."
2901
msgstr ""
2902
2903
#: bzrlib/builtins.py:4733
2904
msgid ""
2905
"When you provide files, you can use their current pathname or the pathname\n"
2906
"from the target revision. So you can use revert to \"undelete\" a file by\n"
2907
"name. If you name a directory, all the contents of that directory will be\n"
2908
"reverted."
2909
msgstr ""
2910
2911
#: bzrlib/builtins.py:4738
2912
msgid ""
2913
"If you have newly added files since the target revision, they will be\n"
2914
"removed. If the files to be removed have been changed, backups will be\n"
2915
"created as above. Directories containing unknown files will not be\n"
2916
"deleted."
2917
msgstr ""
2918
2919
#: bzrlib/builtins.py:4743
2920
msgid ""
2921
"The working tree contains a list of revisions that have been merged but\n"
2922
"not yet committed. These revisions will be included as additional parents\n"
2923
"of the next commit. Normally, using revert clears that list as well as\n"
2924
"reverting the files. If any files are specified, revert leaves the list\n"
2925
"of uncommitted merges alone and reverts only the files. Use ``bzr revert\n"
2926
".`` in the tree root to revert all files but keep the recorded merges,\n"
2927
"and ``bzr revert --forget-merges`` to clear the pending merge list without\n"
2928
"reverting any files."
2929
msgstr ""
2930
2931
#: bzrlib/builtins.py:4752
2932
msgid ""
2933
"Using \"bzr revert --forget-merges\", it is possible to apply all of the\n"
2934
"changes from a branch in a single revision. To do this, perform the merge\n"
2935
"as desired. Then doing revert with the \"--forget-merges\" option will "
2936
"keep\n"
2937
"the content of the tree as it was, but it will clear the list of pending\n"
2938
"merges. The next commit will then contain all of the changes that are\n"
2939
"present in the other branch, but without any other parent revisions.\n"
2940
"Because this technique forgets where these changes originated, it may\n"
2941
"cause additional conflicts on later merges involving the same source and\n"
2942
"target branches."
2943
msgstr ""
2944
2945
#: bzrlib/builtins.py:4766
2946
msgid "Do not save backups of reverted files."
2947
msgstr ""
2948
2949
#: bzrlib/builtins.py:4768
2950
msgid "Remove pending merge marker, without changing any files."
2951
msgstr ""
2952
2953
#: bzrlib/builtins.py:4799
2954
msgid ""
2955
"Show help on a command or other topic.\n"
2956
" "
2957
msgstr ""
2958
2959
#: bzrlib/builtins.py:4804
2960
msgid "Show help on all commands."
2961
msgstr ""
2962
2963
#: bzrlib/builtins.py:4833
2964
msgid "Show unmerged/unpulled revisions between two branches."
2965
msgstr ""
2966
2967
#: bzrlib/builtins.py:4835
2968
msgid "OTHER_BRANCH may be local or remote."
2969
msgstr ""
2970
2971
#: bzrlib/builtins.py:4837
2972
msgid ""
2973
"To filter on a range of revisions, you can use the command -r begin..end\n"
2974
"-r revision requests a specific revision, -r ..end or -r begin.. are\n"
2975
"also valid.\n"
2976
" \n"
2977
":Exit values:\n"
2978
" 1 - some missing revisions\n"
2979
" 0 - no missing revisions"
2980
msgstr ""
2981
2982
#: bzrlib/builtins.py:4847
2983
msgid ""
2984
" Determine the missing revisions between this and the branch at the\n"
2985
" remembered pull location::"
2986
msgstr ""
2987
2988
#: bzrlib/builtins.py:4850
2989
msgid " bzr missing"
2990
msgstr ""
2991
2992
#: bzrlib/builtins.py:4852
2993
msgid " Determine the missing revisions between this and another branch::"
2994
msgstr ""
2995
2996
#: bzrlib/builtins.py:4854
2997
msgid " bzr missing http://server/branch"
2998
msgstr ""
2999
3000
#: bzrlib/builtins.py:4856
3001
msgid ""
3002
" Determine the missing revisions up to a specific revision on the other\n"
3003
" branch::"
3004
msgstr ""
3005
3006
#: bzrlib/builtins.py:4859
3007
msgid " bzr missing -r ..-10"
3008
msgstr ""
3009
3010
#: bzrlib/builtins.py:4861
3011
msgid ""
3012
" Determine the missing revisions up to a specific revision on this\n"
3013
" branch::"
3014
msgstr ""
3015
3016
#: bzrlib/builtins.py:4864
3017
msgid " bzr missing --my-revision ..-10"
3018
msgstr ""
3019
3020
#: bzrlib/builtins.py:4871
3021
msgid "Reverse the order of revisions."
3022
msgstr ""
3023
3024
#: bzrlib/builtins.py:4873
3025
msgid "Display changes in the local branch only."
3026
msgstr ""
3027
3028
#: bzrlib/builtins.py:4874
3029
msgid "Same as --mine-only."
3030
msgstr ""
3031
3032
#: bzrlib/builtins.py:4876
3033
msgid "Display changes in the remote branch only."
3034
msgstr ""
3035
3036
#: bzrlib/builtins.py:4877
3037
msgid "Same as --theirs-only."
3038
msgstr ""
3039
3040
#: bzrlib/builtins.py:4882
3041
msgid ""
3042
"Filter on other branch revisions (inclusive). See \"help revisionspec\" for "
3043
"details."
3044
msgstr ""
3045
3046
#: bzrlib/builtins.py:4886
3047
msgid ""
3048
"Filter on local branch revisions (inclusive). See \"help revisionspec\" for "
3049
"details."
3050
msgstr ""
3051
3052
#: bzrlib/builtins.py:4889
3053
msgid "Show all revisions in addition to the mainline ones."
3054
msgstr ""
3055
3056
#: bzrlib/builtins.py:4943
3057
msgid "No peer location known or specified."
3058
msgstr ""
3059
3060
#: bzrlib/builtins.py:4947
3061
msgid "Using saved parent location: {0}\n"
3062
msgstr ""
3063
3064
#: bzrlib/builtins.py:4980
3065
#, python-format
3066
msgid "You have %d extra revision:\n"
3067
msgid_plural "You have %d extra revisions:\n"
3068
msgstr[0] ""
3069
msgstr[1] ""
3070
3071
#: bzrlib/builtins.py:4996
3072
#, python-format
3073
msgid "You are missing %d revision:\n"
3074
msgid_plural "You are missing %d revisions:\n"
3075
msgstr[0] ""
3076
msgstr[1] ""
3077
3078
#: bzrlib/builtins.py:5008
3079
msgid "This branch has no new revisions.\n"
3080
msgstr ""
3081
3082
#: bzrlib/builtins.py:5011
3083
msgid "Other branch has no new revisions.\n"
3084
msgstr ""
3085
3086
#: bzrlib/builtins.py:5016
3087
msgid "Branches are up to date.\n"
3088
msgstr ""
3089
3090
#: bzrlib/builtins.py:5027
3091
msgid "Compress the data within a repository."
3092
msgstr ""
3093
3094
#: bzrlib/builtins.py:5029
3095
msgid ""
3096
"This operation compresses the data within a bazaar repository. As\n"
3097
"bazaar supports automatic packing of repository, this operation is\n"
3098
"normally not required to be done manually."
3099
msgstr ""
3100
3101
#: bzrlib/builtins.py:5033
3102
msgid ""
3103
"During the pack operation, bazaar takes a backup of existing repository\n"
3104
"data, i.e. pack files. This backup is eventually removed by bazaar\n"
3105
"automatically when it is safe to do so. To save disk space by removing\n"
3106
"the backed up pack files, the --clean-obsolete-packs option may be\n"
3107
"used."
3108
msgstr ""
3109
3110
#: bzrlib/builtins.py:5039
3111
msgid ""
3112
"Warning: If you use --clean-obsolete-packs and your machine crashes\n"
3113
"during or immediately after repacking, you may be left with a state\n"
3114
"where the deletion has been written to disk but the new packs have not\n"
3115
"been. In this case the repository may be unusable."
3116
msgstr ""
3117
3118
#: bzrlib/builtins.py:5048
3119
msgid "Delete obsolete packs to save disk space."
3120
msgstr ""
3121
3122
#: bzrlib/builtins.py:5062
3123
msgid "List the installed plugins."
3124
msgstr ""
3125
3126
#: bzrlib/builtins.py:5064
3127
msgid ""
3128
"This command displays the list of installed plugins including\n"
3129
"version of plugin and a short description of each."
3130
msgstr ""
3131
3132
#: bzrlib/builtins.py:5067
3133
msgid "--verbose shows the path where each plugin is located."
3134
msgstr ""
3135
3136
#: bzrlib/builtins.py:5069
3137
msgid ""
3138
"A plugin is an external component for Bazaar that extends the\n"
3139
"revision control system, by adding or replacing code in Bazaar.\n"
3140
"Plugins can do a variety of things, including overriding commands,\n"
3141
"adding new commands, providing additional network transports and\n"
3142
"customizing log output."
3143
msgstr ""
3144
3145
#: bzrlib/builtins.py:5075
3146
msgid ""
3147
"See the Bazaar Plugin Guide <http://doc.bazaar.canonical.com/plugins/en/>\n"
3148
"for further information on plugins including where to find them and how to\n"
3149
"install them. Instructions are also provided there on how to write new\n"
3150
"plugins using the Python programming language."
3151
msgstr ""
3152
3153
#: bzrlib/builtins.py:5091
3154
msgid "Show testament (signing-form) of a revision."
3155
msgstr ""
3156
3157
#: bzrlib/builtins.py:5094
3158
msgid "Produce long-format testament."
3159
msgstr ""
3160
3161
#: bzrlib/builtins.py:5096
3162
msgid "Produce a strict-format testament."
3163
msgstr ""
3164
3165
#: bzrlib/builtins.py:5122
3166
msgid "Show the origin of each line in a file."
3167
msgstr ""
3168
3169
#: bzrlib/builtins.py:5124
3170
msgid ""
3171
"This prints out the given file with an annotation on the left side\n"
3172
"indicating which revision, author and date introduced the change."
3173
msgstr ""
3174
3175
#: bzrlib/builtins.py:5127
3176
msgid ""
3177
"If the origin is the same for a run of consecutive lines, it is\n"
3178
"shown only at the top, unless the --all option is given."
3179
msgstr ""
3180
3181
#: bzrlib/builtins.py:5135
3182
msgid "Show annotations on all lines."
3183
msgstr ""
3184
3185
#: bzrlib/builtins.py:5136
3186
msgid "Show commit date in annotations."
3187
msgstr ""
3188
3189
#: bzrlib/builtins.py:5223
3190
msgid "Cannot sign a range of non-revision-history revisions"
3191
msgstr ""
3192
3193
#: bzrlib/builtins.py:5235
3194
msgid "Please supply either one revision, or a range."
3195
msgstr ""
3196
3197
#: bzrlib/builtins.py:5239
3198
msgid ""
3199
"Convert the current branch into a checkout of the supplied branch.\n"
3200
"If no branch is supplied, rebind to the last bound location."
3201
msgstr ""
3202
3203
#: bzrlib/builtins.py:5242
3204
msgid ""
3205
"Once converted into a checkout, commits must succeed on the master branch\n"
3206
"before they will be applied to the local branch."
3207
msgstr ""
3208
3209
#: bzrlib/builtins.py:5245
3210
msgid ""
3211
"Bound branches use the nickname of its master branch unless it is set\n"
3212
"locally, in which case binding will update the local nickname to be\n"
3213
"that of the master."
3214
msgstr ""
3215
3216
#: bzrlib/builtins.py:5260
3217
msgid "No location supplied. This format does not remember old locations."
3218
msgstr ""
3219
3220
#: bzrlib/builtins.py:5265
3221
msgid "Branch is already bound"
3222
msgstr ""
3223
3224
#: bzrlib/builtins.py:5267
3225
msgid "No location supplied and no previous location known"
3226
msgstr ""
3227
3228
#: bzrlib/builtins.py:5273
3229
msgid "These branches have diverged. Try merging, and then bind again."
3230
msgstr ""
3231
3232
#: bzrlib/builtins.py:5280
3233
msgid "Convert the current checkout into a regular branch."
3234
msgstr ""
3235
3236
#: bzrlib/builtins.py:5282
3237
msgid ""
3238
"After unbinding, the local branch is considered independent and subsequent\n"
3239
"commits will be local only."
3240
msgstr ""
3241
3242
#: bzrlib/builtins.py:5293
3243
msgid "Local branch is not bound"
3244
msgstr ""
3245
3246
#: bzrlib/builtins.py:5297
3247
msgid "Remove the last committed revision."
3248
msgstr ""
3249
3250
#: bzrlib/builtins.py:5299
3251
msgid ""
3252
"--verbose will print out what is being removed.\n"
3253
"--dry-run will go through all the motions, but not actually\n"
3254
"remove anything."
3255
msgstr ""
3256
3257
#: bzrlib/builtins.py:5303
3258
msgid ""
3259
"If --revision is specified, uncommit revisions to leave the branch at the\n"
3260
"specified revision. For example, \"bzr uncommit -r 15\" will leave the\n"
3261
"branch at revision 15."
3262
msgstr ""
3263
3264
#: bzrlib/builtins.py:5307
3265
msgid ""
3266
"Uncommit leaves the working tree ready for a new commit. The only change\n"
3267
"it may make is to restore any pending merges that were present before\n"
3268
"the commit."
3269
msgstr ""
3270
3271
#: bzrlib/builtins.py:5318
3272
msgid "Don't actually make changes."
3273
msgstr ""
3274
3275
#: bzrlib/builtins.py:5319
3276
msgid "Say yes to all questions."
3277
msgstr ""
3278
3279
#: bzrlib/builtins.py:5321
3280
msgid "Keep tags that point to removed revisions."
3281
msgstr ""
3282
3283
#: bzrlib/builtins.py:5323
3284
msgid "Only remove the commits from the local branch when in a checkout."
3285
msgstr ""
3286
3287
#: bzrlib/builtins.py:5372
3288
msgid "No revisions to uncommit.\n"
3289
msgstr ""
3290
3291
#: bzrlib/builtins.py:5387
3292
msgid "Dry-run, pretending to remove the above revisions.\n"
3293
msgstr ""
3294
3295
#: bzrlib/builtins.py:5390
3296
msgid "The above revision(s) will be removed.\n"
3297
msgstr ""
3298
3299
#: bzrlib/builtins.py:5394
3300
msgid "Uncommit these revisions"
3301
msgstr ""
3302
3303
#: bzrlib/builtins.py:5397
3304
msgid "Canceled\n"
3305
msgstr ""
3306
3307
#: bzrlib/builtins.py:5404
3308
#, python-format
3309
msgid ""
3310
"You can restore the old tip by running:\n"
3311
" bzr pull . -r revid:%s\n"
3312
msgstr ""
3313
3314
#: bzrlib/builtins.py:5409
3315
msgid "Break a dead lock."
3316
msgstr ""
3317
3318
#: bzrlib/builtins.py:5411
3319
msgid ""
3320
"This command breaks a lock on a repository, branch, working directory or\n"
3321
"config file."
3322
msgstr ""
3323
3324
#: bzrlib/builtins.py:5414
3325
msgid ""
3326
"CAUTION: Locks should only be broken when you are sure that the process\n"
3327
"holding the lock has been stopped."
3328
msgstr ""
3329
3330
#: bzrlib/builtins.py:5417
3331
msgid ""
3332
"You can get information on what locks are open via the 'bzr info\n"
3333
"[location]' command."
3334
msgstr ""
3335
3336
#: bzrlib/builtins.py:5420
3337
msgid ""
3338
":Examples:\n"
3339
" bzr break-lock\n"
3340
" bzr break-lock bzr+ssh://example.com/bzr/foo\n"
3341
" bzr break-lock --conf ~/.bazaar"
3342
msgstr ""
3343
3344
#: bzrlib/builtins.py:5429
3345
msgid "LOCATION is the directory where the config lock is."
3346
msgstr ""
3347
3348
#: bzrlib/builtins.py:5431
3349
msgid "Do not ask for confirmation before breaking the lock."
3350
msgstr ""
3351
3352
#: bzrlib/builtins.py:5466
3353
msgid "The Bazaar smart server protocol over TCP. (default port: 4155)"
3354
msgstr ""
3355
3356
#: bzrlib/builtins.py:5467
3357
msgid "Run the bzr server."
3358
msgstr ""
3359
3360
#: bzrlib/builtins.py:5473
3361
msgid "Serve on stdin/out for use from inetd or sshd."
3362
msgstr ""
3363
3364
#: bzrlib/builtins.py:5474
3365
msgid "protocol"
3366
msgstr ""
3367
3368
#: bzrlib/builtins.py:5475
3369
msgid "Protocol to serve."
3370
msgstr ""
3371
3372
#: bzrlib/builtins.py:5479
3373
msgid ""
3374
"Listen for connections on nominated port of the form [hostname:]portnumber. "
3375
"Passing 0 as the port number will result in a dynamically allocated port. "
3376
"The default port depends on the protocol."
3377
msgstr ""
3378
3379
#: bzrlib/builtins.py:5485
3380
msgid "Serve contents of this directory."
3381
msgstr ""
3382
3383
#: bzrlib/builtins.py:5487
3384
msgid ""
3385
"By default the server is a readonly server. Supplying --allow-writes "
3386
"enables write access to the contents of the served directory and below. "
3387
"Note that ``bzr serve`` does not perform authentication, so unless some form "
3388
"of external authentication is arranged supplying this option leads to global "
3389
"uncontrolled write access to your file system."
3390
msgstr ""
3391
3392
#: bzrlib/builtins.py:5496
3393
msgid "Override the default idle client timeout (5min)."
3394
msgstr ""
3395
3396
#: bzrlib/builtins.py:5546
3397
msgid "Combine a tree into its containing tree."
3398
msgstr ""
3399
3400
#: bzrlib/builtins.py:5548
3401
msgid "This command requires the target tree to be in a rich-root format."
3402
msgstr ""
3403
3404
#: bzrlib/builtins.py:5550
3405
msgid ""
3406
"The TREE argument should be an independent tree, inside another tree, but\n"
3407
"not part of it. (Such trees can be produced by \"bzr split\", but also by\n"
3408
"running \"bzr branch\" with the target inside a tree.)"
3409
msgstr ""
3410
3411
#: bzrlib/builtins.py:5554
3412
msgid ""
3413
"The result is a combined tree, with the subtree no longer an independent\n"
3414
"part. This is marked as a merge of the subtree into the containing tree,\n"
3415
"and all history is preserved."
3416
msgstr ""
3417
3418
#: bzrlib/builtins.py:5572
3419
#, python-format
3420
msgid ""
3421
"Can't join trees because %s doesn't support rich root data.\n"
3422
"You can use bzr upgrade on the repository."
3423
msgstr ""
3424
3425
#: bzrlib/builtins.py:5582 bzrlib/builtins.py:5588
3426
msgid "Cannot join {0}. {1}"
3427
msgstr ""
3428
3429
#: bzrlib/builtins.py:5592
3430
msgid "Split a subdirectory of a tree into a separate tree."
3431
msgstr ""
3432
3433
#: bzrlib/builtins.py:5594
3434
msgid ""
3435
"This command will produce a target tree in a format that supports\n"
3436
"rich roots, like 'rich-root' or 'rich-root-pack'. These formats cannot be\n"
3437
"converted into earlier formats like 'dirstate-tags'."
3438
msgstr ""
3439
3440
#: bzrlib/builtins.py:5598
3441
msgid ""
3442
"The TREE argument should be a subdirectory of a working tree. That\n"
3443
"subdirectory will be converted into an independent tree, with its own\n"
3444
"branch. Commits in the top-level tree will not apply to the new subtree."
3445
msgstr ""
3446
3447
#: bzrlib/builtins.py:5678
3448
msgid "No submit branch specified or known"
3449
msgstr ""
3450
3451
#: bzrlib/builtins.py:5686 bzrlib/send.py:108
3452
msgid "No public branch specified or known"
3453
msgstr ""
3454
3455
#: bzrlib/builtins.py:5691
3456
msgid "bzr merge-directive takes at most two one revision identifiers"
3457
msgstr ""
3458
3459
#: bzrlib/builtins.py:5700
3460
msgid "No revisions to bundle."
3461
msgstr ""
3462
3463
#: bzrlib/builtins.py:5719
3464
msgid "Mail or create a merge-directive for submitting changes."
3465
msgstr ""
3466
3467
#: bzrlib/builtins.py:5721
3468
msgid "A merge directive provides many things needed for requesting merges:"
3469
msgstr ""
3470
3471
#: bzrlib/builtins.py:5723
3472
msgid "* A machine-readable description of the merge to perform"
3473
msgstr ""
3474
3475
#: bzrlib/builtins.py:5725
3476
msgid "* An optional patch that is a preview of the changes requested"
3477
msgstr ""
3478
3479
#: bzrlib/builtins.py:5727
3480
msgid ""
3481
"* An optional bundle of revision data, so that the changes can be applied\n"
3482
" directly from the merge directive, without retrieving data from a\n"
3483
" branch."
3484
msgstr ""
3485
3486
#: bzrlib/builtins.py:5731
3487
msgid ""
3488
"`bzr send` creates a compact data set that, when applied using bzr\n"
3489
"merge, has the same effect as merging from the source branch. "
3490
msgstr ""
3491
3492
#: bzrlib/builtins.py:5734
3493
msgid ""
3494
"By default the merge directive is self-contained and can be applied to any\n"
3495
"branch containing submit_branch in its ancestory without needing access to\n"
3496
"the source branch."
3497
msgstr ""
3498
3499
#: bzrlib/builtins.py:5738
3500
msgid ""
3501
"If --no-bundle is specified, then Bazaar doesn't send the contents of the\n"
3502
"revisions, but only a structured request to merge from the\n"
3503
"public_location. In that case the public_branch is needed and it must be\n"
3504
"up-to-date and accessible to the recipient. The public_branch is always\n"
3505
"included if known, so that people can check it later."
3506
msgstr ""
3507
3508
#: bzrlib/builtins.py:5744
3509
msgid ""
3510
"The submit branch defaults to the parent of the source branch, but can be\n"
3511
"overridden. Both submit branch and public branch will be remembered in\n"
3512
"branch.conf the first time they are used for a particular branch. The\n"
3513
"source branch defaults to that containing the working directory, but can\n"
3514
"be changed using --from."
3515
msgstr ""
3516
3517
#: bzrlib/builtins.py:5750
3518
msgid ""
3519
"Both the submit branch and the public branch follow the usual behavior with\n"
3520
"respect to --remember: If there is no default location set, the first send\n"
3521
"will set it (use --no-remember to avoid setting it). After that, you can\n"
3522
"omit the location to use the default. To change the default, use\n"
3523
"--remember. The value will only be saved if the location can be accessed."
3524
msgstr ""
3525
3526
#: bzrlib/builtins.py:5756
3527
msgid ""
3528
"In order to calculate those changes, bzr must analyse the submit branch.\n"
3529
"Therefore it is most efficient for the submit branch to be a local mirror.\n"
3530
"If a public location is known for the submit_branch, that location is used\n"
3531
"in the merge directive."
3532
msgstr ""
3533
3534
#: bzrlib/builtins.py:5761
3535
msgid ""
3536
"The default behaviour is to send the merge directive by mail, unless -o is\n"
3537
"given, in which case it is sent to a file."
3538
msgstr ""
3539
3540
#: bzrlib/builtins.py:5764
3541
msgid ""
3542
"Mail is sent using your preferred mail program. This should be transparent\n"
3543
"on Windows (it uses MAPI). On Unix, it requires the xdg-email utility.\n"
3544
"If the preferred client can't be found (or used), your editor will be used."
3545
msgstr ""
3546
3547
#: bzrlib/builtins.py:5768
3548
msgid ""
3549
"To use a specific mail program, set the mail_client configuration option.\n"
3550
"(For Thunderbird 1.5, this works around some bugs.) Supported values for\n"
3551
"specific clients are \"claws\", \"evolution\", \"kmail\", \"mail.app\" "
3552
"(MacOS X's\n"
3553
"Mail.app), \"mutt\", and \"thunderbird\"; generic options are \"default\",\n"
3554
"\"editor\", \"emacsclient\", \"mapi\", and \"xdg-email\". Plugins may also "
3555
"add\n"
3556
"supported clients."
3557
msgstr ""
3558
3559
#: bzrlib/builtins.py:5775
3560
msgid ""
3561
"If mail is being sent, a to address is required. This can be supplied\n"
3562
"either on the commandline, by setting the submit_to configuration\n"
3563
"option in the branch itself or the child_submit_to configuration option\n"
3564
"in the submit branch."
3565
msgstr ""
3566
3567
#: bzrlib/builtins.py:5780
3568
msgid ""
3569
"Two formats are currently supported: \"4\" uses revision bundle format 4 "
3570
"and\n"
3571
"merge directive format 2. It is significantly faster and smaller than\n"
3572
"older formats. It is compatible with Bazaar 0.19 and later. It is the\n"
3573
"default. \"0.9\" uses revision bundle format 0.9 and merge directive\n"
3574
"format 1. It is compatible with Bazaar 0.12 - 0.18."
3575
msgstr ""
3576
3577
#: bzrlib/builtins.py:5786
3578
msgid ""
3579
"The merge directives created by bzr send may be applied using bzr merge or\n"
3580
"bzr pull by specifying a file containing a merge directive as the location."
3581
msgstr ""
3582
3583
#: bzrlib/builtins.py:5789
3584
msgid ""
3585
"bzr send makes extensive use of public locations to map local locations "
3586
"into\n"
3587
"URLs that can be used by other people. See `bzr help configuration` to\n"
3588
"set them, and use `bzr info` to display them."
3589
msgstr ""
3590
3591
#: bzrlib/builtins.py:5813
3592
msgid "Write merge directive to this file or directory; use - for stdout."
3593
msgstr ""
3594
3595
#: bzrlib/builtins.py:5817
3596
msgid ""
3597
"Refuse to send if there are uncommitted changes in the working tree, --no-"
3598
"strict disables the check."
3599
msgstr ""
3600
3601
#: bzrlib/builtins.py:5819
3602
msgid "Mail the request to this address."
3603
msgstr ""
3604
3605
#: bzrlib/builtins.py:5823
3606
msgid "Body for the email."
3607
msgstr ""
3608
3609
#: bzrlib/builtins.py:5876
3610
msgid "Do not include a bundle in the merge directive."
3611
msgstr ""
3612
3613
#: bzrlib/builtins.py:5877
3614
msgid "Do not include a preview patch in the merge directive."
3615
msgstr ""
3616
3617
#: bzrlib/builtins.py:5880
3618
msgid "Remember submit and public branch."
3619
msgstr ""
3620
3621
#: bzrlib/builtins.py:5882
3622
msgid ""
3623
"Branch to generate the submission from, rather than the one containing the "
3624
"working directory."
3625
msgstr ""
3626
3627
#: bzrlib/builtins.py:5892 bzrlib/cmd_version_info.py:76
3628
msgid "format"
3629
msgstr ""
3630
3631
#: bzrlib/builtins.py:5893
3632
msgid "Use the specified output format."
3633
msgstr ""
3634
3635
#: bzrlib/builtins.py:5915
3636
msgid "Create, remove or modify a tag naming a revision."
3637
msgstr ""
3638
3639
#: bzrlib/builtins.py:5917
3640
msgid ""
3641
"Tags give human-meaningful names to revisions. Commands that take a -r\n"
3642
"(--revision) option can be given -rtag:X, where X is any previously\n"
3643
"created tag."
3644
msgstr ""
3645
3646
#: bzrlib/builtins.py:5921
3647
msgid ""
3648
"Tags are stored in the branch. Tags are copied from one branch to another\n"
3649
"along when you branch, push, pull or merge."
3650
msgstr ""
3651
3652
#: bzrlib/builtins.py:5924
3653
msgid ""
3654
"It is an error to give a tag name that already exists unless you pass\n"
3655
"--force, in which case the tag is moved to point to the new revision."
3656
msgstr ""
3657
3658
#: bzrlib/builtins.py:5927
3659
msgid ""
3660
"To rename a tag (change the name but keep it on the same revsion), run "
3661
"``bzr\n"
3662
"tag new-name -r tag:old-name`` and then ``bzr tag --delete oldname``."
3663
msgstr ""
3664
3665
#: bzrlib/builtins.py:5930
3666
msgid ""
3667
"If no tag name is specified it will be determined through the \n"
3668
"'automatic_tag_name' hook. This can e.g. be used to automatically tag\n"
3669
"upstream releases by reading configure.ac. See ``bzr help hooks`` for\n"
3670
"details."
3671
msgstr ""
3672
3673
#: bzrlib/builtins.py:5940
3674
msgid "Delete this tag rather than placing it."
3675
msgstr ""
3676
3677
#: bzrlib/builtins.py:5943
3678
msgid "Branch in which to place the tag."
3679
msgstr ""
3680
3681
#: bzrlib/builtins.py:5945
3682
msgid "Replace existing tags."
3683
msgstr ""
3684
3685
#: bzrlib/builtins.py:5960
3686
msgid "No tag specified to delete."
3687
msgstr ""
3688
3689
#: bzrlib/builtins.py:5962
3690
#, python-format
3691
msgid "Deleted tag %s."
3692
msgstr ""
3693
3694
#: bzrlib/builtins.py:5976
3695
msgid "Please specify a tag name."
3696
msgstr ""
3697
3698
#: bzrlib/builtins.py:5984
3699
#, python-format
3700
msgid "Tag %s already exists for that revision."
3701
msgstr ""
3702
3703
#: bzrlib/builtins.py:5988
3704
#, python-format
3705
msgid "Created tag %s."
3706
msgstr ""
3707
3708
#: bzrlib/builtins.py:5990
3709
#, python-format
3710
msgid "Updated tag %s."
3711
msgstr ""
3712
3713
#: bzrlib/builtins.py:5994
3714
msgid "List tags."
3715
msgstr ""
3716
3717
#: bzrlib/builtins.py:5996
3718
msgid ""
3719
"This command shows a table of tag names and the revisions they reference."
3720
msgstr ""
3721
3722
#: bzrlib/builtins.py:6002
3723
msgid "Branch whose tags should be displayed."
3724
msgstr ""
3725
3726
#: bzrlib/builtins.py:6004
3727
msgid "Sort tags by different criteria."
3728
msgstr ""
3729
3730
#: bzrlib/builtins.py:6004
3731
msgid "Sorting"
3732
msgstr ""
3733
3734
#: bzrlib/builtins.py:6073
3735
msgid "Reconfigure the type of a bzr directory."
3736
msgstr ""
3737
3738
#: bzrlib/builtins.py:6075
3739
msgid "A target configuration must be specified."
3740
msgstr ""
3741
3742
#: bzrlib/builtins.py:6077
3743
msgid ""
3744
"For checkouts, the bind-to location will be auto-detected if not specified.\n"
3745
"The order of preference is\n"
3746
"1. For a lightweight checkout, the current bound location.\n"
3747
"2. For branches that used to be checkouts, the previously-bound location.\n"
3748
"3. The push location.\n"
3749
"4. The parent location.\n"
3750
"If none of these is available, --bind-to must be specified."
3751
msgstr ""
3752
3753
#: bzrlib/builtins.py:6091
3754
msgid "Tree type"
3755
msgstr ""
3756
3757
#: bzrlib/builtins.py:6092
3758
msgid "The relation between branch and tree."
3759
msgstr ""
3760
3761
#: bzrlib/builtins.py:6094
3762
msgid "Reconfigure to be an unbound branch with no working tree."
3763
msgstr ""
3764
3765
#: bzrlib/builtins.py:6095
3766
msgid "Reconfigure to be an unbound branch with a working tree."
3767
msgstr ""
3768
3769
#: bzrlib/builtins.py:6096
3770
msgid "Reconfigure to be a bound branch with a working tree."
3771
msgstr ""
3772
3773
#: bzrlib/builtins.py:6097
3774
msgid "Reconfigure to be a lightweight checkout (with no local history)."
3775
msgstr ""
3776
3777
#: bzrlib/builtins.py:6102
3778
msgid "Repository type"
3779
msgstr ""
3780
3781
#: bzrlib/builtins.py:6103
3782
msgid "Location fo the repository."
3783
msgstr ""
3784
3785
#: bzrlib/builtins.py:6105
3786
msgid ""
3787
"Reconfigure to be a standalone branch (i.e. stop using shared repository)."
3788
msgstr ""
3789
3790
#: bzrlib/builtins.py:6107
3791
msgid "Reconfigure to use a shared repository."
3792
msgstr ""
3793
3794
#: bzrlib/builtins.py:6111
3795
msgid "Trees in Repository"
3796
msgstr ""
3797
3798
#: bzrlib/builtins.py:6112
3799
msgid "Whether new branches in the repository have trees."
3800
msgstr ""
3801
3802
#: bzrlib/builtins.py:6114
3803
msgid ""
3804
"Reconfigure repository to create working trees on branches by default."
3805
msgstr ""
3806
3807
#: bzrlib/builtins.py:6116
3808
msgid ""
3809
"Reconfigure repository to not create working trees on branches by default."
3810
msgstr ""
3811
3812
#: bzrlib/builtins.py:6119
3813
msgid "Branch to bind checkout to."
3814
msgstr ""
3815
3816
#: bzrlib/builtins.py:6121
3817
msgid "Perform reconfiguration even if local changes will be lost."
3818
msgstr ""
3819
3820
#: bzrlib/builtins.py:6124
3821
msgid "Reconfigure a branch to be stacked on another branch."
3822
msgstr ""
3823
3824
#: bzrlib/builtins.py:6128
3825
msgid ""
3826
"Reconfigure a branch to be unstacked. This may require copying substantial "
3827
"data into it."
3828
msgstr ""
3829
3830
#: bzrlib/builtins.py:6138
3831
msgid "Can't use both --stacked-on and --unstacked"
3832
msgstr ""
3833
3834
#: bzrlib/builtins.py:6152
3835
msgid "No target configuration specified"
3836
msgstr ""
3837
3838
#: bzrlib/builtins.py:6187
3839
msgid "Set the branch of a checkout and update."
3840
msgstr ""
3841
3842
#: bzrlib/builtins.py:6189
3843
msgid ""
3844
"For lightweight checkouts, this changes the branch being referenced.\n"
3845
"For heavyweight checkouts, this checks that there are no local commits\n"
3846
"versus the current bound branch, then it makes the local branch a mirror\n"
3847
"of the new location and binds to it."
3848
msgstr ""
3849
3850
#: bzrlib/builtins.py:6194
3851
msgid ""
3852
"In both cases, the working tree is updated and uncommitted changes\n"
3853
"are merged. The user can commit or revert these as they desire."
3854
msgstr ""
3855
3856
#: bzrlib/builtins.py:6197
3857
msgid "Pending merges need to be committed or reverted before using switch."
3858
msgstr ""
3859
3860
#: bzrlib/builtins.py:6199
3861
msgid ""
3862
"The path to the branch to switch to can be specified relative to the parent\n"
3863
"directory of the current branch. For example, if you are currently in a\n"
3864
"checkout of /path/to/branch, specifying 'newbranch' will find a branch at\n"
3865
"/path/to/newbranch."
3866
msgstr ""
3867
3868
#: bzrlib/builtins.py:6204
3869
msgid ""
3870
"Bound branches use the nickname of its master branch unless it is set\n"
3871
"locally, in which case switching will update the local nickname to be\n"
3872
"that of the master."
3873
msgstr ""
3874
3875
#: bzrlib/builtins.py:6212
3876
msgid "Switch even if local commits will be lost."
3877
msgstr ""
3878
3879
#: bzrlib/builtins.py:6215
3880
msgid "Create the target branch from this one before switching to it."
3881
msgstr ""
3882
3883
#: bzrlib/builtins.py:6229
3884
msgid "You must supply either a revision or a location"
3885
msgstr ""
3886
3887
#: bzrlib/builtins.py:6242
3888
msgid "cannot create branch without source branch"
3889
msgstr ""
3890
3891
#: bzrlib/builtins.py:6262
3892
msgid "Manage filtered views."
3893
msgstr ""
3894
3895
#: bzrlib/builtins.py:6264
3896
msgid ""
3897
"Views provide a mask over the tree so that users can focus on\n"
3898
"a subset of a tree when doing their work. After creating a view,\n"
3899
"commands that support a list of files - status, diff, commit, etc -\n"
3900
"effectively have that list of files implicitly given each time.\n"
3901
"An explicit list of files can still be given but those files\n"
3902
"must be within the current view."
3903
msgstr ""
3904
3905
#: bzrlib/builtins.py:6271
3906
msgid ""
3907
"In most cases, a view has a short life-span: it is created to make\n"
3908
"a selected change and is deleted once that change is committed.\n"
3909
"At other times, you may wish to create one or more named views\n"
3910
"and switch between them."
3911
msgstr ""
3912
3913
#: bzrlib/builtins.py:6276
3914
msgid ""
3915
"To disable the current view without deleting it, you can switch to\n"
3916
"the pseudo view called ``off``. This can be useful when you need\n"
3917
"to see the whole tree for an operation or two (e.g. merge) but\n"
3918
"want to switch back to your view after that."
3919
msgstr ""
3920
3921
#: bzrlib/builtins.py:6281
3922
msgid ""
3923
":Examples:\n"
3924
" To define the current view::"
3925
msgstr ""
3926
3927
#: bzrlib/builtins.py:6284
3928
msgid " bzr view file1 dir1 ..."
3929
msgstr ""
3930
3931
#: bzrlib/builtins.py:6286
3932
msgid " To list the current view::"
3933
msgstr ""
3934
3935
#: bzrlib/builtins.py:6288
3936
msgid " bzr view"
3937
msgstr ""
3938
3939
#: bzrlib/builtins.py:6290
3940
msgid " To delete the current view::"
3941
msgstr ""
3942
3943
#: bzrlib/builtins.py:6292
3944
msgid " bzr view --delete"
3945
msgstr ""
3946
3947
#: bzrlib/builtins.py:6294
3948
msgid " To disable the current view without deleting it::"
3949
msgstr ""
3950
3951
#: bzrlib/builtins.py:6296
3952
msgid " bzr view --switch off"
3953
msgstr ""
3954
3955
#: bzrlib/builtins.py:6298
3956
msgid " To define a named view and switch to it::"
3957
msgstr ""
3958
3959
#: bzrlib/builtins.py:6300
3960
msgid " bzr view --name view-name file1 dir1 ..."
3961
msgstr ""
3962
3963
#: bzrlib/builtins.py:6302
3964
msgid " To list a named view::"
3965
msgstr ""
3966
3967
#: bzrlib/builtins.py:6304
3968
msgid " bzr view --name view-name"
3969
msgstr ""
3970
3971
#: bzrlib/builtins.py:6306
3972
msgid " To delete a named view::"
3973
msgstr ""
3974
3975
#: bzrlib/builtins.py:6308
3976
msgid " bzr view --name view-name --delete"
3977
msgstr ""
3978
3979
#: bzrlib/builtins.py:6310
3980
msgid " To switch to a named view::"
3981
msgstr ""
3982
3983
#: bzrlib/builtins.py:6312
3984
msgid " bzr view --switch view-name"
3985
msgstr ""
3986
3987
#: bzrlib/builtins.py:6314
3988
msgid " To list all views defined::"
3989
msgstr ""
3990
3991
#: bzrlib/builtins.py:6316
3992
msgid " bzr view --all"
3993
msgstr ""
3994
3995
#: bzrlib/builtins.py:6318
3996
msgid " To delete all views::"
3997
msgstr ""
3998
3999
#: bzrlib/builtins.py:6320
4000
msgid " bzr view --delete --all"
4001
msgstr ""
4002
4003
#: bzrlib/builtins.py:6327
4004
msgid "Apply list or delete action to all views."
4005
msgstr ""
4006
4007
#: bzrlib/builtins.py:6330
4008
msgid "Delete the view."
4009
msgstr ""
4010
4011
#: bzrlib/builtins.py:6333
4012
msgid "Name of the view to define, list or delete."
4013
msgstr ""
4014
4015
#: bzrlib/builtins.py:6337
4016
msgid "Name of the view to switch to."
4017
msgstr ""
4018
4019
#: bzrlib/builtins.py:6356
4020
msgid "Both --delete and a file list specified"
4021
msgstr ""
4022
4023
#: bzrlib/builtins.py:6359
4024
msgid "Both --delete and --switch specified"
4025
msgstr ""
4026
4027
#: bzrlib/builtins.py:6362
4028
msgid "Deleted all views.\n"
4029
msgstr ""
4030
4031
#: bzrlib/builtins.py:6364
4032
msgid "No current view to delete"
4033
msgstr ""
4034
4035
#: bzrlib/builtins.py:6367
4036
#, python-format
4037
msgid "Deleted '%s' view.\n"
4038
msgstr ""
4039
4040
#: bzrlib/builtins.py:6371
4041
msgid "Both --switch and a file list specified"
4042
msgstr ""
4043
4044
#: bzrlib/builtins.py:6374
4045
msgid "Both --switch and --all specified"
4046
msgstr ""
4047
4048
#: bzrlib/builtins.py:6377
4049
msgid "No current view to disable"
4050
msgstr ""
4051
4052
#: bzrlib/builtins.py:6379
4053
#, python-format
4054
msgid "Disabled '%s' view.\n"
4055
msgstr ""
4056
4057
#: bzrlib/builtins.py:6383 bzrlib/builtins.py:6405
4058
msgid "Using '{0}' view: {1}\n"
4059
msgstr ""
4060
4061
#: bzrlib/builtins.py:6386
4062
msgid "Views defined:\n"
4063
msgstr ""
4064
4065
#: bzrlib/builtins.py:6395
4066
msgid "No views defined.\n"
4067
msgstr ""
4068
4069
#: bzrlib/builtins.py:6402
4070
msgid "Cannot change the 'off' pseudo view"
4071
msgstr ""
4072
4073
#: bzrlib/builtins.py:6410
4074
msgid "No current view.\n"
4075
msgstr ""
4076
4077
#: bzrlib/builtins.py:6413
4078
msgid "'{0}' view is: {1}\n"
4079
msgstr ""
4080
4081
#: bzrlib/builtins.py:6433
4082
msgid " <no hooks installed>\n"
4083
msgstr ""
4084
4085
#: bzrlib/builtins.py:6437
4086
msgid "Remove a branch."
4087
msgstr ""
4088
4089
#: bzrlib/builtins.py:6439
4090
msgid ""
4091
"This will remove the branch from the specified location but \n"
4092
"will keep any working tree or repository in place."
4093
msgstr ""
4094
4095
#: bzrlib/builtins.py:6444
4096
msgid " Remove the branch at repo/trunk::"
4097
msgstr ""
4098
4099
#: bzrlib/builtins.py:6446
4100
msgid " bzr remove-branch repo/trunk"
4101
msgstr ""
4102
4103
#: bzrlib/builtins.py:6461
4104
msgid "Plaintext diff output."
4105
msgstr ""
4106
4107
#: bzrlib/builtins.py:6462
4108
msgid "Temporarily set aside some changes from the current tree."
4109
msgstr ""
4110
4111
#: bzrlib/builtins.py:6464
4112
msgid ""
4113
"Shelve allows you to temporarily put changes you've made \"on the shelf\",\n"
4114
"ie. out of the way, until a later time when you can bring them back from\n"
4115
"the shelf with the 'unshelve' command. The changes are stored alongside\n"
4116
"your working tree, and so they aren't propagated along with your branch nor\n"
4117
"will they survive its deletion."
4118
msgstr ""
4119
4120
#: bzrlib/builtins.py:6470
4121
msgid "If shelve --list is specified, previously-shelved changes are listed."
4122
msgstr ""
4123
4124
#: bzrlib/builtins.py:6472
4125
msgid ""
4126
"Shelve is intended to help separate several sets of changes that have\n"
4127
"been inappropriately mingled. If you just want to get rid of all changes\n"
4128
"and you don't need to restore them later, use revert. If you want to\n"
4129
"shelve all text changes at once, use shelve --all."
4130
msgstr ""
4131
4132
#: bzrlib/builtins.py:6477
4133
msgid ""
4134
"If filenames are specified, only the changes to those files will be\n"
4135
"shelved. Other files will be left untouched."
4136
msgstr ""
4137
4138
#: bzrlib/builtins.py:6480
4139
msgid ""
4140
"If a revision is specified, changes since that revision will be shelved."
4141
msgstr ""
4142
4143
#: bzrlib/builtins.py:6482
4144
msgid ""
4145
"You can put multiple items on the shelf, and by default, 'unshelve' will\n"
4146
"restore the most recently shelved changes."
4147
msgstr ""
4148
4149
#: bzrlib/builtins.py:6485
4150
msgid ""
4151
"For complicated changes, it is possible to edit the changes in a separate\n"
4152
"editor program to decide what the file remaining in the working copy\n"
4153
"should look like. To do this, add the configuration option"
4154
msgstr ""
4155
4156
#: bzrlib/builtins.py:6489
4157
msgid " change_editor = PROGRAM @new_path @old_path"
4158
msgstr ""
4159
4160
#: bzrlib/builtins.py:6491
4161
msgid ""
4162
"where @new_path is replaced with the path of the new version of the \n"
4163
"file and @old_path is replaced with the path of the old version of \n"
4164
"the file. The PROGRAM should save the new file with the desired \n"
4165
"contents of the file in the working tree.\n"
4166
" "
4167
msgstr ""
4168
4169
#: bzrlib/builtins.py:6503
4170
msgid "Shelve all changes."
4171
msgstr ""
4172
4173
#: bzrlib/builtins.py:6505
4174
msgid "Method to use for writing diffs."
4175
msgstr ""
4176
4177
#: bzrlib/builtins.py:6505
4178
msgid "writer"
4179
msgstr ""
4180
4181
#: bzrlib/builtins.py:6509
4182
msgid "List shelved changes."
4183
msgstr ""
4184
4185
#: bzrlib/builtins.py:6511
4186
msgid "Destroy removed changes instead of shelving them."
4187
msgstr ""
4188
4189
#: bzrlib/builtins.py:6540
4190
msgid "No shelved changes."
4191
msgstr ""
4192
4193
#: bzrlib/builtins.py:6551
4194
msgid "Restore shelved changes."
4195
msgstr ""
4196
4197
#: bzrlib/builtins.py:6553
4198
msgid ""
4199
"By default, the most recently shelved changes are restored. However if you\n"
4200
"specify a shelf by id those changes will be restored instead. This works\n"
4201
"best when the changes don't depend on each other."
4202
msgstr ""
4203
4204
#: bzrlib/builtins.py:6562
4205
msgid "The action to perform."
4206
msgstr ""
4207
4208
#: bzrlib/builtins.py:6562 bzrlib/conflicts.py:694
4209
msgid "action"
4210
msgstr ""
4211
4212
#: bzrlib/builtins.py:6564
4213
msgid "Apply changes and remove from the shelf."
4214
msgstr ""
4215
4216
#: bzrlib/builtins.py:6565
4217
msgid "Show changes, but do not apply or remove them."
4218
msgstr ""
4219
4220
#: bzrlib/builtins.py:6566
4221
msgid ""
4222
"Instead of unshelving the changes, show the diff that would result from "
4223
"unshelving."
4224
msgstr ""
4225
4226
#: bzrlib/builtins.py:6568
4227
msgid "Delete changes without applying them."
4228
msgstr ""
4229
4230
#: bzrlib/builtins.py:6569
4231
msgid "Apply changes but don't delete them."
4232
msgstr ""
4233
4234
#: bzrlib/builtins.py:6584
4235
msgid "Remove unwanted files from working tree."
4236
msgstr ""
4237
4238
#: bzrlib/builtins.py:6586
4239
msgid ""
4240
"By default, only unknown files, not ignored files, are deleted. Versioned\n"
4241
"files are never deleted."
4242
msgstr ""
4243
4244
#: bzrlib/builtins.py:6589
4245
msgid ""
4246
"Another class is 'detritus', which includes files emitted by bzr during\n"
4247
"normal operations and selftests. (The value of these files decreases with\n"
4248
"time.)"
4249
msgstr ""
4250
4251
#: bzrlib/builtins.py:6593
4252
msgid ""
4253
"If no options are specified, unknown files are deleted. Otherwise, option\n"
4254
"flags are respected, and may be combined."
4255
msgstr ""
4256
4257
#: bzrlib/builtins.py:6596
4258
msgid "To check what clean-tree will do, use --dry-run."
4259
msgstr ""
4260
4261
#: bzrlib/builtins.py:6599
4262
msgid "Delete all ignored files."
4263
msgstr ""
4264
4265
#: bzrlib/builtins.py:6600
4266
msgid ""
4267
"Delete conflict files, merge and revert backups, and failed selftest dirs."
4268
msgstr ""
4269
4270
#: bzrlib/builtins.py:6603
4271
msgid "Delete files unknown to bzr (default)."
4272
msgstr ""
4273
4274
#: bzrlib/builtins.py:6604
4275
msgid "Show files to delete instead of deleting them."
4276
msgstr ""
4277
4278
#: bzrlib/builtins.py:6606
4279
msgid "Do not prompt before deleting."
4280
msgstr ""
4281
4282
#: bzrlib/bundle/__init__.py:59
4283
msgid "A directory cannot be a bundle"
4284
msgstr ""
4285
4286
#: bzrlib/bundle/apply_bundle.py:40
4287
msgid "Install revisions"
4288
msgstr ""
4289
4290
#: bzrlib/bundle/commands.py:64
4291
msgid "--verbose requires a merge directive"
4292
msgstr ""
4293
4294
#: bzrlib/bundle/commands.py:67
4295
msgid "Bundle format not supported"
4296
msgstr ""
4297
4298
#: bzrlib/bundle/commands.py:77
4299
msgid "Records\n"
4300
msgstr ""
4301
4302
#: bzrlib/bundle/commands.py:81
4303
msgid "{0}: {1} ({2} multiparent)\n"
4304
msgstr ""
4305
4306
#: bzrlib/bundle/commands.py:83
4307
#, python-format
4308
msgid "unique files: %d\n"
4309
msgstr ""
4310
4311
#: bzrlib/bundle/commands.py:92
4312
msgid "Revisions\n"
4313
msgstr ""
4314
4315
#: bzrlib/bundle/commands.py:93
4316
#, python-format
4317
msgid "nicks: %s\n"
4318
msgstr ""
4319
4320
#: bzrlib/bundle/commands.py:95
4321
#, python-format
4322
msgid ""
4323
"committers: \n"
4324
"%s\n"
4325
msgstr ""
4326
4327
#: bzrlib/bundle/commands.py:103
4328
msgid "Decoded contents\n"
4329
msgstr ""
4330
4331
#: bzrlib/bundle/serializer/v4.py:327
4332
#, python-format
4333
msgid "Bundling %d revision."
4334
msgid_plural "Bundling %d revisions."
4335
msgstr[0] ""
4336
msgstr[1] ""
4337
4338
#: bzrlib/bzrdir.py:490
4339
msgid ""
4340
"making backup of {0}\n"
4341
" to {1}"
4342
msgstr ""
4343
4344
#: bzrlib/bzrdir.py:513
4345
msgid "renamed {0} to {1}"
4346
msgstr ""
4347
4348
#: bzrlib/bzrdir.py:1652
4349
#, python-format
4350
msgid ""
4351
"Source repository format does not support stacking, using format:\n"
4352
" %s"
4353
msgstr ""
4354
4355
#: bzrlib/bzrdir.py:1672
4356
#, python-format
4357
msgid ""
4358
"Source branch format does not support stacking, using format:\n"
4359
" %s"
4360
msgstr ""
4361
4362
#: bzrlib/bzrdir.py:1818
4363
msgid "starting repository conversion"
4364
msgstr ""
4365
4366
#: bzrlib/bzrdir.py:2039
4367
msgid "Using default stacking branch {0} at {1}"
4368
msgstr ""
4369
4370
#: bzrlib/check.py:108
4371
msgid "check"
4372
msgstr ""
4373
4374
#: bzrlib/check.py:110
4375
msgid "checking revisions"
4376
msgstr ""
4377
4378
#: bzrlib/check.py:112
4379
msgid "checking commit contents"
4380
msgstr ""
4381
4382
#: bzrlib/check.py:114
4383
msgid "checking file graphs"
4384
msgstr ""
4385
4386
#: bzrlib/check.py:118
4387
msgid "checking branches and trees"
4388
msgstr ""
4389
4390
#: bzrlib/check.py:205
4391
msgid "checked repository {0} format {1}"
4392
msgstr ""
4393
4394
#: bzrlib/check.py:208
4395
#, python-format
4396
msgid "%6d revisions"
4397
msgstr ""
4398
4399
#: bzrlib/check.py:209
4400
#, python-format
4401
msgid "%6d file-ids"
4402
msgstr ""
4403
4404
#: bzrlib/check.py:211
4405
#, python-format
4406
msgid "%6d unreferenced text versions"
4407
msgstr ""
4408
4409
#: bzrlib/check.py:215
4410
msgid "unreferenced version: {{{0}}} in {1}"
4411
msgstr ""
4412
4413
#: bzrlib/check.py:218
4414
#, python-format
4415
msgid "%6d revisions are missing inventory_sha1"
4416
msgstr ""
4417
4418
#: bzrlib/check.py:221
4419
#, python-format
4420
msgid "%6d revisions are mentioned but not present"
4421
msgstr ""
4422
4423
#: bzrlib/check.py:224
4424
#, python-format
4425
msgid "%6d ghost revisions"
4426
msgstr ""
4427
4428
#: bzrlib/check.py:229
4429
#, python-format
4430
msgid "%6d revisions missing parents in ancestry"
4431
msgstr ""
4432
4433
#: bzrlib/check.py:233
4434
#, python-format
4435
msgid " %s should be in the ancestry for:"
4436
msgstr ""
4437
4438
#: bzrlib/check.py:237
4439
#, python-format
4440
msgid "%6d inconsistent parents"
4441
msgstr ""
4442
4443
#: bzrlib/check.py:241
4444
msgid " * {0} version {1} has parents {2!r} but should have {3!r}"
4445
msgstr ""
4446
4447
#: bzrlib/check.py:247
4448
#, python-format
4449
msgid "%6d revisions have incorrect parents in the revision index"
4450
msgstr ""
4451
4452
#: bzrlib/check.py:253
4453
msgid " {0} has wrong parents in index: {1!r} should be {2!r}"
4454
msgstr ""
4455
4456
#: bzrlib/check.py:267
4457
msgid "Mismatched internal revid {{{0}}} and index revid {{{1}}}"
4458
msgstr ""
4459
4460
#: bzrlib/check.py:296
4461
msgid ""
4462
"Multiple expected sha1s for {0}. {{{1}}} expects {{{2}}}, {{{3}}} expects "
4463
"{{{4}}}"
4464
msgstr ""
4465
4466
#: bzrlib/check.py:354
4467
#, python-format
4468
msgid "Checking branch at '%s'."
4469
msgstr ""
4470
4471
#: bzrlib/check.py:374
4472
#, python-format
4473
msgid "Checking working tree at '%s'."
4474
msgstr ""
4475
4476
#: bzrlib/check.py:427 bzrlib/check.py:441
4477
msgid "No branch found at specified location."
4478
msgstr ""
4479
4480
#: bzrlib/check.py:429 bzrlib/check.py:439
4481
msgid "No working tree found at specified location."
4482
msgstr ""
4483
4484
#: bzrlib/check.py:432
4485
#, python-format
4486
msgid "Checking repository at '%s'."
4487
msgstr ""
4488
4489
#: bzrlib/check.py:443
4490
msgid "No repository found at specified location."
4491
msgstr ""
4492
4493
#: bzrlib/clean_tree.py:63
4494
msgid "Nothing to delete."
4495
msgstr ""
4496
4497
#: bzrlib/clean_tree.py:68
4498
msgid "Are you sure you wish to delete these"
4499
msgstr ""
4500
4501
#: bzrlib/clean_tree.py:70
4502
msgid "Canceled"
4503
msgstr ""
4504
4505
#: bzrlib/clean_tree.py:107
4506
#, python-format
4507
msgid "unable to remove %s"
4508
msgstr ""
4509
4510
#: bzrlib/clean_tree.py:111
4511
msgid "deleting paths:"
4512
msgstr ""
4513
4514
#: bzrlib/clean_tree.py:125
4515
msgid "unable to remove \"{0}\": {1}."
4516
msgstr ""
4517
4518
#: bzrlib/clean_tree.py:130
4519
msgid "No files deleted."
4520
msgstr ""
4521
4522
#: bzrlib/cmd_version_info.py:47
4523
msgid "No known version info format {0}. Supported types are: {1}"
4524
msgstr ""
4525
4526
#: bzrlib/cmd_version_info.py:52
4527
msgid "Version info in Custom template-based format."
4528
msgstr ""
4529
4530
#: bzrlib/cmd_version_info.py:52
4531
msgid "Version info in Python format."
4532
msgstr ""
4533
4534
#: bzrlib/cmd_version_info.py:52
4535
msgid "Version info in RIO (simple text) format (default)."
4536
msgstr ""
4537
4538
#: bzrlib/cmd_version_info.py:53
4539
msgid "Show version information about this tree."
4540
msgstr ""
4541
4542
#: bzrlib/cmd_version_info.py:55
4543
msgid ""
4544
"You can use this command to add information about version into\n"
4545
"source code of an application. The output can be in one of the\n"
4546
"supported formats or in a custom format based on a template."
4547
msgstr ""
4548
4549
#: bzrlib/cmd_version_info.py:59 en/help_topics/configuration.txt:700
4550
#: en/help_topics/configuration.txt:710
4551
msgid "For example::"
4552
msgstr ""
4553
4554
#: bzrlib/cmd_version_info.py:61
4555
msgid ""
4556
" bzr version-info --custom \\\n"
4557
" --template=\"#define VERSION_INFO \\\"Project 1.2.3 (r{revno})\\\"\\n\""
4558
msgstr ""
4559
4560
#: bzrlib/cmd_version_info.py:64
4561
msgid ""
4562
"will produce a C header file with formatted string containing the\n"
4563
"current revision number. Other supported variables in templates are:"
4564
msgstr ""
4565
4566
#: bzrlib/cmd_version_info.py:67
4567
msgid ""
4568
" * {date} - date of the last revision\n"
4569
" * {build_date} - current date\n"
4570
" * {revno} - revision number\n"
4571
" * {revision_id} - revision id\n"
4572
" * {branch_nick} - branch nickname\n"
4573
" * {clean} - 0 if the source tree contains uncommitted changes,\n"
4574
" otherwise 1"
4575
msgstr ""
4576
4577
#: bzrlib/cmd_version_info.py:77
4578
msgid "Select the output format."
4579
msgstr ""
4580
4581
#: bzrlib/cmd_version_info.py:81
4582
msgid "Include all possible information."
4583
msgstr ""
4584
4585
#: bzrlib/cmd_version_info.py:82
4586
msgid "Check if tree is clean."
4587
msgstr ""
4588
4589
#: bzrlib/cmd_version_info.py:84
4590
msgid "Include the revision-history."
4591
msgstr ""
4592
4593
#: bzrlib/cmd_version_info.py:86
4594
msgid "Include the last revision for each file."
4595
msgstr ""
4596
4597
#: bzrlib/cmd_version_info.py:87
4598
msgid "Template for the output."
4599
msgstr ""
4600
4601
#: bzrlib/cmd_version_info.py:101
4602
msgid "bzr version-info --revision takes exactly one revision specifier"
4603
msgstr ""
4604
4605
#: bzrlib/commands.py:229
4606
#, python-format
4607
msgid "unknown command \"%s\""
4608
msgstr ""
4609
4610
#: bzrlib/commands.py:476
4611
msgid "No help for this command."
4612
msgstr ""
4613
4614
#: bzrlib/commands.py:489
4615
#, python-format
4616
msgid ":Purpose: %s\n"
4617
msgstr ""
4618
4619
#: bzrlib/commands.py:491
4620
#, python-format
4621
msgid ""
4622
":Usage:\n"
4623
"%s\n"
4624
msgstr ""
4625
4626
#: bzrlib/commands.py:493
4627
#, python-format
4628
msgid ":Usage: %s\n"
4629
msgstr ""
4630
4631
#: bzrlib/commands.py:512
4632
#, python-format
4633
msgid ":Options:%s"
4634
msgstr ""
4635
4636
#: bzrlib/commands.py:523
4637
#, python-format
4638
msgid ""
4639
":Description:\n"
4640
" %s\n"
4641
"\n"
4642
msgstr ""
4643
4644
#: bzrlib/commands.py:533
4645
#, python-format
4646
msgid ""
4647
"See bzr help %s for more details and examples.\n"
4648
"\n"
4649
msgstr ""
4650
4651
#: bzrlib/commands.py:538
4652
msgid ":Aliases: "
4653
msgstr ""
4654
4655
#: bzrlib/commands.py:542
4656
#, python-format
4657
msgid ":From: plugin \"%s\"\n"
4658
msgstr ""
4659
4660
#: bzrlib/commands.py:554
4661
msgid ":doc:`{0} <{1}-help>`"
4662
msgstr ""
4663
4664
#: bzrlib/commands.py:558
4665
#, python-format
4666
msgid ":See also: %s"
4667
msgstr ""
4668
4669
#: bzrlib/commands.py:816 bzrlib/gpg.py:324
4670
msgid "Only ASCII permitted in option names"
4671
msgstr ""
4672
4673
#: bzrlib/commands.py:841 bzrlib/commands.py:849
4674
msgid "command {0!r} needs one or more {1}"
4675
msgstr ""
4676
4677
#: bzrlib/commands.py:858
4678
msgid "command {0!r} requires argument {1}"
4679
msgstr ""
4680
4681
#: bzrlib/commands.py:865
4682
msgid "extra argument to command {0}: {1}"
4683
msgstr ""
4684
4685
#: bzrlib/commands.py:962
4686
#, python-format
4687
msgid "Profile data written to \"%s\"."
4688
msgstr ""
4689
4690
#: bzrlib/commit.py:117 bzrlib/commit.py:740
4691
msgid "added"
4692
msgstr ""
4693
4694
#: bzrlib/commit.py:117 bzrlib/commit.py:748
4695
msgid "modified"
4696
msgstr ""
4697
4698
#: bzrlib/commit.py:131
4699
#, python-format
4700
msgid "Committing%s"
4701
msgstr ""
4702
4703
#: bzrlib/commit.py:134
4704
#, python-format
4705
msgid "Committed revision %d."
4706
msgstr ""
4707
4708
#: bzrlib/commit.py:143
4709
#, python-format
4710
msgid "deleted %s"
4711
msgstr ""
4712
4713
#: bzrlib/commit.py:146
4714
#, python-format
4715
msgid "missing %s"
4716
msgstr ""
4717
4718
#: bzrlib/commit.py:511
4719
msgid ""
4720
"Conflicting tags in bound branch:\n"
4721
"{0}"
4722
msgstr ""
4723
4724
#: bzrlib/commit.py:742
4725
msgid "renamed"
4726
msgstr ""
4727
4728
#: bzrlib/commit.py:977
4729
msgid "unchanged"
4730
msgstr ""
4731
4732
#: bzrlib/commit.py:999
4733
msgid "{0} [{1}] - Stage"
4734
msgstr ""
4735
4736
#: bzrlib/commit.py:1002
4737
#, python-format
4738
msgid "%s - Stage"
4739
msgstr ""
4740
4741
#: bzrlib/commit_signature_commands.py:36
4742
msgid "Sign all commits by a given committer."
4743
msgstr ""
4744
4745
#: bzrlib/commit_signature_commands.py:38
4746
msgid ""
4747
"If location is not specified the local tree is used.\n"
4748
"If committer is not specified the default committer is used."
4749
msgstr ""
4750
4751
#: bzrlib/commit_signature_commands.py:41
4752
msgid "This does not sign commits that already have signatures."
4753
msgstr ""
4754
4755
#: bzrlib/commit_signature_commands.py:49
4756
msgid ""
4757
"Don't actually sign anything, just print the revisions that would be signed."
4758
msgstr ""
4759
4760
#: bzrlib/commit_signature_commands.py:103
4761
msgid "Verify all commit signatures."
4762
msgstr ""
4763
4764
#: bzrlib/commit_signature_commands.py:105
4765
msgid ""
4766
"Verifies that all commits in the branch are signed by known GnuPG keys."
4767
msgstr ""
4768
4769
#: bzrlib/commit_signature_commands.py:110
4770
msgid ""
4771
"Comma separated list of GPG key patterns which are acceptable for "
4772
"verification."
4773
msgstr ""
4774
4775
#: bzrlib/commit_signature_commands.py:147
4776
msgid "Cannot verify a range of non-revision-history revisions"
4777
msgstr ""
4778
4779
#: bzrlib/commit_signature_commands.py:168
4780
msgid "All commits signed with verifiable keys"
4781
msgstr ""
4782
4783
#: bzrlib/config.py:475
4784
msgid "Invalid config value for \"{0}\" value {1!r} is not an SI unit."
4785
msgstr ""
4786
4787
#: bzrlib/config.py:2485
4788
msgid "{0} is not an SI unit."
4789
msgstr ""
4790
4791
#: bzrlib/config.py:2949
4792
msgid ""
4793
"Option {0} in section {1} of {2} was changed from {3} to {4}. The {5} value "
4794
"will be saved."
4795
msgstr ""
4796
4797
#: bzrlib/config.py:3093
4798
#, python-format
4799
msgid "Invalid '%s', should be of the form 'name=value'"
4800
msgstr ""
4801
4802
#: bzrlib/config.py:3962
4803
msgid "Display, set or remove a configuration option."
4804
msgstr ""
4805
4806
#: bzrlib/config.py:3964
4807
msgid "Display the active value for a given option."
4808
msgstr ""
4809
4810
#: bzrlib/config.py:3966
4811
msgid ""
4812
"If --all is specified, NAME is interpreted as a regular expression and all\n"
4813
"matching options are displayed mentioning their scope. The active value\n"
4814
"that bzr will take into account is the first one displayed for each option."
4815
msgstr ""
4816
4817
#: bzrlib/config.py:3970
4818
msgid "If no NAME is given, --all .* is implied."
4819
msgstr ""
4820
4821
#: bzrlib/config.py:3972
4822
msgid ""
4823
"Setting a value is achieved by using name=value without spaces. The value\n"
4824
"is set in the most relevant scope and can be checked by displaying the\n"
4825
"option again."
4826
msgstr ""
4827
4828
#: bzrlib/config.py:3984
4829
msgid "Reduce the scope to the specified configuration file."
4830
msgstr ""
4831
4832
#: bzrlib/config.py:3988
4833
msgid "Display all the defined values for the matching options."
4834
msgstr ""
4835
4836
#: bzrlib/config.py:3990
4837
msgid "Remove the option from the configuration file."
4838
msgstr ""
4839
4840
#: bzrlib/conflicts.py:50
4841
msgid "List files with conflicts."
4842
msgstr ""
4843
4844
#: bzrlib/conflicts.py:57
4845
msgid ""
4846
"Conflicts normally are listed as short, human-readable messages. If --text\n"
4847
"is supplied, the pathnames of files with text conflicts are listed,\n"
4848
"instead. (This is useful for editing all files with text conflicts.)"
4849
msgstr ""
4850
4851
#: bzrlib/conflicts.py:61
4852
msgid "Use bzr resolve when you have fixed a problem."
4853
msgstr ""
4854
4855
#: bzrlib/conflicts.py:66
4856
msgid "List paths of files with text conflicts."
4857
msgstr ""
4858
4859
#: bzrlib/conflicts.py:85
4860
msgid "Marks the conflict as resolved."
4861
msgstr ""
4862
4863
#: bzrlib/conflicts.py:88
4864
msgid "Resolve the conflict preserving the version in the working tree."
4865
msgstr ""
4866
4867
#: bzrlib/conflicts.py:91
4868
msgid "Resolve the conflict taking the merged version into account."
4869
msgstr ""
4870
4871
#: bzrlib/conflicts.py:98
4872
msgid "How to resolve the conflict."
4873
msgstr ""
4874
4875
#: bzrlib/conflicts.py:104
4876
msgid "Mark a conflict as resolved."
4877
msgstr ""
4878
4879
#: bzrlib/conflicts.py:111
4880
msgid ""
4881
"Once you have fixed a problem, use \"bzr resolve\" to automatically mark\n"
4882
"text conflicts as fixed, \"bzr resolve FILE\" to mark a specific conflict "
4883
"as\n"
4884
"resolved, or \"bzr resolve --all\" to mark all conflicts as resolved."
4885
msgstr ""
4886
4887
#: bzrlib/conflicts.py:119
4888
msgid "Resolve all conflicts in this tree."
4889
msgstr ""
4890
4891
#: bzrlib/conflicts.py:126
4892
msgid "If --all is specified, no FILE may be provided"
4893
msgstr ""
4894
4895
#: bzrlib/conflicts.py:151
4896
#, python-format
4897
msgid "%d conflict auto-resolved."
4898
msgid_plural "%d conflicts auto-resolved."
4899
msgstr[0] ""
4900
msgstr[1] ""
4901
4902
#: bzrlib/conflicts.py:154
4903
msgid "Remaining conflicts:"
4904
msgstr ""
4905
4906
#: bzrlib/conflicts.py:159
4907
msgid "All conflicts resolved."
4908
msgstr ""
4909
4910
#: bzrlib/conflicts.py:168
4911
msgid "{0} conflict resolved, {1} remaining"
4912
msgid_plural "{0} conflicts resolved, {1} remaining"
4913
msgstr[0] ""
4914
msgstr[1] ""
4915
4916
#: bzrlib/controldir.py:710
4917
msgid "{0} is{1} redirected to {2}"
4918
msgstr ""
4919
4920
#: bzrlib/diff.py:399
4921
#, python-format
4922
msgid "*** Ignoring files outside view. View is %s"
4923
msgstr ""
4924
4925
#: bzrlib/errors.py:157
4926
msgid "The tree builder is already building a tree."
4927
msgstr ""
4928
4929
#: bzrlib/errors.py:178
4930
msgid "The dirstate file (%(state)s) appears to be corrupt: %(msg)s"
4931
msgstr ""
4932
4933
#: bzrlib/errors.py:197
4934
msgid ""
4935
"The API for \"%(api)s\" is not compatible with \"%(wanted)s\". It supports "
4936
"versions \"%(minimum)s\" to \"%(current)s\"."
4937
msgstr ""
4938
4939
#: bzrlib/errors.py:209
4940
msgid "The transport '%(transport)s' is only accessible within this process."
4941
msgstr ""
4942
4943
#: bzrlib/errors.py:227
4944
msgid "Invalid revision number %(revno)s"
4945
msgstr ""
4946
4947
#: bzrlib/errors.py:236
4948
msgid "Invalid revision-id {%(revision_id)s} in %(branch)s"
4949
msgstr ""
4950
4951
#: bzrlib/errors.py:247
4952
msgid "Reserved revision-id {%(revision_id)s}"
4953
msgstr ""
4954
4955
#: bzrlib/errors.py:261
4956
msgid "There is no public branch set for \"%(branch_url)s\"."
4957
msgstr ""
4958
4959
#: bzrlib/errors.py:271
4960
msgid ""
4961
"No help could be found for '%(topic)s'. Please use 'bzr help topics' to "
4962
"obtain a list of topics."
4963
msgstr ""
4964
4965
#: bzrlib/errors.py:280
4966
msgid "The file id \"%(file_id)s\" is not present in the tree %(tree)s."
4967
msgstr ""
4968
4969
#: bzrlib/errors.py:290
4970
msgid ""
4971
"The file id \"%(file_id)s\" is not present in the repository %(repository)r"
4972
msgstr ""
4973
4974
#: bzrlib/errors.py:299
4975
msgid "The branch '%(branch)s' is not stacked."
4976
msgstr ""
4977
4978
#: bzrlib/errors.py:313
4979
msgid "No WorkingTree exists for \"%(base)s\"."
4980
msgstr ""
4981
4982
#: bzrlib/errors.py:322
4983
msgid "Not currently building a tree."
4984
msgstr ""
4985
4986
#: bzrlib/errors.py:327
4987
msgid "%(url)s is not a local path."
4988
msgstr ""
4989
4990
#: bzrlib/errors.py:355
4991
msgid "%(not_locked)r is not write locked but needs to be."
4992
msgstr ""
4993
4994
#: bzrlib/errors.py:363
4995
msgid "Error in command line options"
4996
msgstr ""
4997
4998
#: bzrlib/errors.py:368
4999
msgid "%(value)s is not an index of type %(_type)s."
5000
msgstr ""
5001
5002
#: bzrlib/errors.py:378
5003
msgid "Error in data for index %(value)s."
5004
msgstr ""
5005
5006
#: bzrlib/errors.py:387
5007
msgid "The key '%(key)s' is already in index '%(index)s'."
5008
msgstr ""
5009
5010
#: bzrlib/errors.py:397
5011
msgid "The key '%(key)s' is not a valid key."
5012
msgstr ""
5013
5014
#: bzrlib/errors.py:406
5015
msgid "Could not parse options for index %(value)s."
5016
msgstr ""
5017
5018
#: bzrlib/errors.py:415
5019
msgid "The value '%(value)s' is not a valid value."
5020
msgstr ""
5021
5022
#: bzrlib/errors.py:424
5023
msgid "Bad value \"%(value)s\" for option \"%(name)s\"."
5024
msgstr ""
5025
5026
#: bzrlib/errors.py:443
5027
msgid "Generic path error: %(path)r%(extra)s)"
5028
msgstr ""
5029
5030
#: bzrlib/errors.py:456
5031
msgid "No such file: %(path)r%(extra)s"
5032
msgstr ""
5033
5034
#: bzrlib/errors.py:461
5035
msgid "File exists: %(path)r%(extra)s"
5036
msgstr ""
5037
5038
#: bzrlib/errors.py:467
5039
msgid ""
5040
"Could not rename %(source)s => %(dest)s because both files exist. (Use --"
5041
"after to tell bzr about a rename that has already happened)%(extra)s"
5042
msgstr ""
5043
5044
#: bzrlib/errors.py:483
5045
msgid "\"%(path)s\" is not a directory %(extra)s"
5046
msgstr ""
5047
5048
#: bzrlib/errors.py:488
5049
msgid "\"%(path)s\" is not in the working directory %(extra)s"
5050
msgstr ""
5051
5052
#: bzrlib/errors.py:493
5053
msgid "Directory not empty: \"%(path)s\"%(extra)s"
5054
msgstr ""
5055
5056
#: bzrlib/errors.py:498
5057
msgid "Hard-linking \"%(path)s\" is not supported"
5058
msgstr ""
5059
5060
#: bzrlib/errors.py:513
5061
msgid "Device or resource busy: \"%(path)s\"%(extra)s"
5062
msgstr ""
5063
5064
#: bzrlib/errors.py:518
5065
msgid "Permission denied: \"%(path)s\"%(extra)s"
5066
msgstr ""
5067
5068
#: bzrlib/errors.py:523
5069
msgid "Invalid url supplied to transport: \"%(path)s\"%(extra)s"
5070
msgstr ""
5071
5072
#: bzrlib/errors.py:528
5073
msgid "Invalid URL join request: %(reason)s: %(base)r + %(join_args)r"
5074
msgstr ""
5075
5076
#: bzrlib/errors.py:539
5077
msgid "URLs differ by more than path: %(from_)r and %(to)r"
5078
msgstr ""
5079
5080
#: bzrlib/errors.py:561
5081
msgid "The %(type)s hook '%(hook)s' is unknown in this version of bzrlib."
5082
msgstr ""
5083
5084
#: bzrlib/errors.py:571
5085
msgid "Unsupported protocol for url \"%(path)s\"%(extra)s"
5086
msgstr ""
5087
5088
#: bzrlib/errors.py:579
5089
msgid ""
5090
"The branch '%(url)s'(%(format)s) is not a stackable format. You will need to "
5091
"upgrade the branch to permit branch stacking."
5092
msgstr ""
5093
5094
#: bzrlib/errors.py:590
5095
msgid "The branch '%(branch_url)s' cannot be stacked on '%(target_url)s'."
5096
msgstr ""
5097
5098
#: bzrlib/errors.py:600
5099
msgid ""
5100
"The repository '%(url)s'(%(format)s) is not a stackable format. You will "
5101
"need to upgrade the repository to permit branch stacking."
5102
msgstr ""
5103
5104
#: bzrlib/errors.py:611
5105
msgid "Error reading from %(path)r."
5106
msgstr ""
5107
5108
#: bzrlib/errors.py:630
5109
msgid "Path \"%(path)s\" is not a child of path \"%(base)s\"%(extra)s"
5110
msgstr ""
5111
5112
#: bzrlib/errors.py:646
5113
msgid "Path \"%(path)s\" is not unicode normalized"
5114
msgstr ""
5115
5116
#: bzrlib/errors.py:654
5117
msgid "Not a branch: \"%(path)s\"%(detail)s."
5118
msgstr ""
5119
5120
#: bzrlib/errors.py:696
5121
msgid "No submit branch available for branch \"%(path)s\""
5122
msgstr ""
5123
5124
#: bzrlib/errors.py:705
5125
msgid "A control directory already exists: \"%(path)s\"."
5126
msgstr ""
5127
5128
#: bzrlib/errors.py:710
5129
msgid "Already a branch: \"%(path)s\"."
5130
msgstr ""
5131
5132
#: bzrlib/errors.py:715
5133
msgid "Parent branch already exists: \"%(path)s\"."
5134
msgstr ""
5135
5136
#: bzrlib/errors.py:721
5137
msgid ""
5138
"Directory contains a branch, but no working tree (use bzr checkout if you "
5139
"wish to build a working tree): \"%(path)s\""
5140
msgstr ""
5141
5142
#: bzrlib/errors.py:726
5143
msgid ""
5144
"\"%(function)s\" called on an AtomicFile after it was closed: \"%(path)s\""
5145
msgstr ""
5146
5147
#: bzrlib/errors.py:736
5148
msgid ""
5149
"Parent not accessible given base \"%(base)s\" and relative path \"%(path)s\""
5150
msgstr ""
5151
5152
#: bzrlib/errors.py:746
5153
msgid "No repository present: \"%(path)s\""
5154
msgstr ""
5155
5156
#: bzrlib/errors.py:753
5157
msgid ""
5158
"Unsupported branch format: %(format)s\n"
5159
"Please run 'bzr upgrade'"
5160
msgstr ""
5161
5162
#: bzrlib/errors.py:759
5163
msgid "Unknown %(kind)s format: %(format)r"
5164
msgstr "Unknown %(kind)s format: %(format)r"
5165
5166
#: bzrlib/errors.py:768
5167
msgid "Format %(format)s is not compatible with .bzr version %(bzrdir)s."
5168
msgstr ""
5169
5170
#: bzrlib/errors.py:778
5171
msgid "Parse error on line %(lineno)d of %(format)s format: %(line)s"
5172
msgstr ""
5173
5174
#: bzrlib/errors.py:793
5175
msgid ""
5176
"%(target)s\n"
5177
"is not compatible with\n"
5178
"%(source)s\n"
5179
"%(details)s"
5180
msgstr ""
5181
5182
#: bzrlib/errors.py:809
5183
msgid "Revision is not compatible with %(repo_format)s"
5184
msgstr ""
5185
5186
#: bzrlib/errors.py:819
5187
msgid "%(context_info)s%(path)s is already versioned."
5188
msgstr ""
5189
5190
#: bzrlib/errors.py:840
5191
msgid "%(context_info)s%(path)s is not versioned."
5192
msgstr ""
5193
5194
#: bzrlib/errors.py:861
5195
msgid "Path(s) are not versioned: %(paths_as_string)s"
5196
msgstr ""
5197
5198
#: bzrlib/errors.py:872
5199
msgid "Path(s) do not exist: %(paths_as_string)s%(extra)s"
5200
msgstr ""
5201
5202
#: bzrlib/errors.py:891
5203
msgid "Cannot operate on \"%(filename)s\" of unsupported kind \"%(kind)s\""
5204
msgstr "Cannot operate on \"%(filename)s\" of unsupported type \"%(kind)s\""
5205
5206
#: bzrlib/errors.py:899
5207
msgid ""
5208
"Filename %(filename)r is not valid in your current filesystem encoding "
5209
"%(fs_encoding)s"
5210
msgstr ""
5211
5212
#: bzrlib/errors.py:910
5213
msgid "Cannot operate on \"%(filename)s\" because it is a control file"
5214
msgstr ""
5215
5216
#: bzrlib/errors.py:928
5217
msgid "The lock for '%(lock_description)s' is in use and cannot be broken."
5218
msgstr ""
5219
5220
#: bzrlib/errors.py:967
5221
msgid "Cannot lock %(lock)s: %(why)s"
5222
msgstr ""
5223
5224
#: bzrlib/errors.py:977
5225
msgid ""
5226
"A transaction related operation was attempted after the transaction finished."
5227
msgstr ""
5228
5229
#: bzrlib/errors.py:1004
5230
msgid "Cannot lock: transport is read only: %(transport)s"
5231
msgstr ""
5232
5233
#: bzrlib/errors.py:1012
5234
msgid "Could not acquire lock \"%(lock)s\": %(msg)s"
5235
msgstr ""
5236
5237
#: bzrlib/errors.py:1023
5238
msgid ""
5239
"Lock was broken while still open: %(lock)s - check storage consistency!"
5240
msgstr ""
5241
5242
#: bzrlib/errors.py:1034
5243
msgid ""
5244
"Lock was released and re-acquired before being broken: %(lock)s: held by "
5245
"%(holder)r, wanted to break %(target)r"
5246
msgstr ""
5247
5248
#: bzrlib/errors.py:1046
5249
msgid ""
5250
"Lock is apparently held, but corrupted: %(corruption_info)s\n"
5251
"Use 'bzr break-lock' to clear it"
5252
msgstr ""
5253
5254
#: bzrlib/errors.py:1059
5255
msgid "Lock not held: %(lock)s"
5256
msgstr ""
5257
5258
#: bzrlib/errors.py:1088
5259
msgid "No changes to commit"
5260
msgstr ""
5261
5262
#: bzrlib/errors.py:1093
5263
msgid ""
5264
"Selected-file commit of merges is not supported yet: files %(files_str)s"
5265
msgstr ""
5266
5267
#: bzrlib/errors.py:1103
5268
msgid ""
5269
"Excluding paths during commit is not supported by repository at "
5270
"%(repository)r."
5271
msgstr ""
5272
5273
#: bzrlib/errors.py:1112
5274
msgid ""
5275
"The specified commit message contains characters unsupported by the current "
5276
"encoding."
5277
msgstr ""
5278
5279
#: bzrlib/errors.py:1118
5280
msgid "Upgrade URL cannot work with readonly URLs."
5281
msgstr ""
5282
5283
#: bzrlib/errors.py:1123
5284
msgid "The branch format %(format)s is already at the most recent format."
5285
msgstr ""
5286
5287
#: bzrlib/errors.py:1146
5288
msgid "Option --change does not accept revision ranges"
5289
msgstr ""
5290
5291
#: bzrlib/errors.py:1151
5292
msgid "No namespace registered for string: %(spec)r"
5293
msgstr ""
5294
5295
#: bzrlib/errors.py:1170
5296
msgid ""
5297
"Requested revision: '%(spec)s' does not exist in branch: "
5298
"%(branch_url)s%(extra)s"
5299
msgstr ""
5300
5301
#: bzrlib/errors.py:1184
5302
msgid ""
5303
"Operation denied because it would change the main history, which is not "
5304
"permitted by the append_revisions_only setting on branch \"%(location)s\"."
5305
msgstr ""
5306
5307
#: bzrlib/errors.py:1195
5308
msgid ""
5309
"These branches have diverged. Use the missing command to see how.\n"
5310
"Use the merge command to reconcile them."
5311
msgstr ""
5312
5313
#: bzrlib/errors.py:1215
5314
msgid ""
5315
"Branches have no common ancestor, and no merge base revision was specified."
5316
msgstr ""
5317
5318
#: bzrlib/errors.py:1221
5319
msgid ""
5320
"Selected merge cannot perform reverse cherrypicks. Try merge3 or diff3."
5321
msgstr ""
5322
5323
#: bzrlib/errors.py:1227
5324
msgid "Revisions have no common ancestor: %(revision_a)s %(revision_b)s"
5325
msgstr ""
5326
5327
#: bzrlib/errors.py:1236
5328
msgid ""
5329
"Revisions are not derived from the same root: %(revision_a)s %(revision_b)s."
5330
msgstr ""
5331
5332
#: bzrlib/errors.py:1245
5333
msgid "Revision %(rev_id)s is not an ancestor of %(not_ancestor_id)s"
5334
msgstr ""
5335
5336
#: bzrlib/errors.py:1254
5337
msgid "Branch %(branch)s has no commits."
5338
msgstr ""
5339
5340
#: bzrlib/errors.py:1272
5341
msgid ""
5342
"Bound branch %(branch)s is out of date with master branch "
5343
"%(master)s.%(extra_help)s"
5344
msgstr ""
5345
5346
#: bzrlib/errors.py:1284
5347
msgid ""
5348
"Cannot commit to branch %(branch)s. It is bound to %(master)s, which is "
5349
"bound to %(remote)s."
5350
msgstr ""
5351
5352
#: bzrlib/errors.py:1296
5353
msgid "Cannot pull --overwrite to a branch which is bound %(branch)s"
5354
msgstr ""
5355
5356
#: bzrlib/errors.py:1305
5357
msgid ""
5358
"Unable to connect to target of bound branch %(branch)s => %(target)s: "
5359
"%(error)s"
5360
msgstr ""
5361
5362
#: bzrlib/errors.py:1317
5363
msgid "Error in processing weave: %(msg)s"
5364
msgstr ""
5365
5366
#: bzrlib/errors.py:1326
5367
msgid "Revision {%(revision_id)s} already present in %(weave)s"
5368
msgstr ""
5369
5370
#: bzrlib/errors.py:1337
5371
msgid "Revision {%(revision_id)s} not present in %(weave)s"
5372
msgstr ""
5373
5374
#: bzrlib/errors.py:1347
5375
msgid "Weave invariant violated: %(what)s"
5376
msgstr ""
5377
5378
#: bzrlib/errors.py:1356
5379
msgid "Parents are mismatched between two revisions. %(msg)s"
5380
msgstr ""
5381
5382
#: bzrlib/errors.py:1378
5383
msgid ""
5384
"Weaves differ on text content. Revision: {%(revision_id)s}, %(weave_a)s, "
5385
"%(weave_b)s"
5386
msgstr ""
5387
5388
#: bzrlib/errors.py:1390
5389
msgid "Versioned file error"
5390
msgstr ""
5391
5392
#: bzrlib/errors.py:1395
5393
msgid "Revision {%(revision_id)s} not present in \"%(file_id)s\"."
5394
msgstr ""
5395
5396
#: bzrlib/errors.py:1405
5397
msgid "Revision {%(revision_id)s} already present in \"%(file_id)s\"."
5398
msgstr ""
5399
5400
#: bzrlib/errors.py:1415
5401
msgid "Text did not match its checksum: %(msg)s"
5402
msgstr ""
5403
5404
#: bzrlib/errors.py:1541
5405
msgid "Export format %(format)r not supported"
5406
msgstr ""
5407
5408
#: bzrlib/errors.py:1550
5409
msgid "Transport error: %(msg)s %(orig_error)s"
5410
msgstr ""
5411
5412
#: bzrlib/errors.py:1576
5413
msgid "Generic bzr smart protocol error: %(details)s"
5414
msgstr ""
5415
5416
#: bzrlib/errors.py:1584
5417
msgid "Received bad protocol version marker: %(marker)r"
5418
msgstr ""
5419
5420
#: bzrlib/errors.py:1616
5421
msgid "Transport operation not possible: %(msg)s %(orig_error)s"
5422
msgstr ""
5423
5424
#: bzrlib/errors.py:1621
5425
msgid "Connection error: %(msg)s %(orig_error)s"
5426
msgstr ""
5427
5428
#: bzrlib/errors.py:1626
5429
msgid "%(msg)s %(host)s%(port)s%(orig_error)s"
5430
msgstr ""
5431
5432
#: bzrlib/errors.py:1647
5433
msgid "Connection closed: %(msg)s %(orig_error)s"
5434
msgstr ""
5435
5436
#: bzrlib/errors.py:1652
5437
msgid "Connection Timeout: %(msg)s%(orig_error)s"
5438
msgstr ""
5439
5440
#: bzrlib/errors.py:1657
5441
msgid "Invalid range access in %(path)s at %(offset)s: %(msg)s"
5442
msgstr ""
5443
5444
#: bzrlib/errors.py:1667
5445
msgid "Invalid http response for %(path)s: %(msg)s%(orig_error)s"
5446
msgstr ""
5447
5448
#: bzrlib/errors.py:1682
5449
msgid "Certificate error: %(error)s"
5450
msgstr ""
5451
5452
#: bzrlib/errors.py:1690
5453
msgid "Invalid http range %(range)r for %(path)s: %(msg)s"
5454
msgstr ""
5455
5456
#: bzrlib/errors.py:1704
5457
msgid "HTTP MIME Boundary missing for %(path)s: %(msg)s"
5458
msgstr ""
5459
5460
#: bzrlib/errors.py:1712
5461
msgid "Invalid http Content-type \"%(ctype)s\" for %(path)s: %(msg)s"
5462
msgstr ""
5463
5464
#: bzrlib/errors.py:1721
5465
msgid "%(source)s is%(permanently)s redirected to %(target)s"
5466
msgstr ""
5467
5468
#: bzrlib/errors.py:1735
5469
msgid "Too many redirections"
5470
msgstr ""
5471
5472
#: bzrlib/errors.py:1740
5473
msgid "Working tree has conflicts."
5474
msgstr ""
5475
5476
#: bzrlib/errors.py:1744
5477
msgid "Config file %(filename)s is not UTF-8 encoded\n"
5478
msgstr ""
5479
5480
#: bzrlib/errors.py:1753
5481
msgid ""
5482
"Error(s) parsing config file %(filename)s:\n"
5483
"%(errors)s"
5484
msgstr ""
5485
5486
#: bzrlib/errors.py:1763
5487
msgid ""
5488
"Bad value \"%(value)s\" for option \"%(name)s\".\n"
5489
"See ``bzr help %(name)s``"
5490
msgstr ""
5491
5492
#: bzrlib/errors.py:1773
5493
msgid "%(username)r does not seem to contain a reasonable email address"
5494
msgstr ""
5495
5496
#: bzrlib/errors.py:1782
5497
msgid "Failed to GPG sign data with command \"%(command_line)s\""
5498
msgstr ""
5499
5500
#: bzrlib/errors.py:1790
5501
msgid "Failed to verify GPG signature data with error \"%(error)s\""
5502
msgstr ""
5503
5504
#: bzrlib/errors.py:1798
5505
msgid "Unable to import library \"%(library)s\": %(error)s"
5506
msgstr ""
5507
5508
#: bzrlib/errors.py:1806
5509
msgid "python-gpgme is not installed, it is needed to verify signatures"
5510
msgstr ""
5511
5512
#: bzrlib/errors.py:1814
5513
msgid ""
5514
"The working tree for %(basedir)s has changed since the last commit, but "
5515
"weave merge requires that it be unchanged"
5516
msgstr ""
5517
5518
#: bzrlib/errors.py:1824
5519
msgid ""
5520
"Can't reprocess and show base, because reprocessing obscures the "
5521
"relationship of conflicting lines to the base"
5522
msgstr ""
5523
5524
#: bzrlib/errors.py:1830
5525
msgid "Cycle in graph %(graph)r"
5526
msgstr ""
5527
5528
#: bzrlib/errors.py:1858
5529
msgid "File %(filename)s is not conflicted."
5530
msgstr ""
5531
5532
#: bzrlib/errors.py:1880
5533
msgid "No bundle was found in \"%(filename)s\"."
5534
msgstr ""
5535
5536
#: bzrlib/errors.py:1889
5537
msgid "Unable to handle bundle version %(version)s: %(msg)s"
5538
msgstr ""
5539
5540
#: bzrlib/errors.py:1899
5541
msgid "Branch %(base)s is missing revision %(text_revision)s of %(file_id)s"
5542
msgstr ""
5543
5544
#: bzrlib/errors.py:1912
5545
msgid "File id {%(file_id)s} already exists in inventory as %(entry)s"
5546
msgstr ""
5547
5548
#: bzrlib/errors.py:1922
5549
msgid "Key %(key)s is already present in map"
5550
msgstr ""
5551
5552
#: bzrlib/errors.py:1927
5553
msgid "The prefix %(prefix)s is in the help search path twice."
5554
msgstr ""
5555
5556
#: bzrlib/errors.py:1937
5557
msgid ""
5558
"No final name for trans_id %(trans_id)r\n"
5559
"file-id: %(file_id)r\n"
5560
"root trans-id: %(root_trans_id)r\n"
5561
msgstr ""
5562
5563
#: bzrlib/errors.py:1969
5564
msgid "Attempt to reuse a transform that has already been applied."
5565
msgstr ""
5566
5567
#: bzrlib/errors.py:1974
5568
msgid "Moving the root directory is not supported at this time"
5569
msgstr ""
5570
5571
#: bzrlib/errors.py:1979
5572
msgid "Failed to rename %(from_path)s to %(to_path)s: %(why)s"
5573
msgstr ""
5574
5575
#: bzrlib/errors.py:1990
5576
msgid ""
5577
"Could not move %(from_path)s%(operator)s %(to_path)s%(_has_extra)s%(extra)s"
5578
msgstr ""
5579
5580
#: bzrlib/errors.py:2026
5581
msgid ""
5582
"Could not rename %(from_path)s%(operator)s %(to_path)s%(_has_extra)s%(extra)s"
5583
msgstr ""
5584
5585
#: bzrlib/errors.py:2056
5586
msgid "Unable to import paramiko (required for sftp support): %(error)s"
5587
msgstr ""
5588
5589
#: bzrlib/errors.py:2064
5590
msgid "Nothing to merge."
5591
msgstr ""
5592
5593
#: bzrlib/errors.py:2069
5594
msgid "Format %(format)s cannot be initialised by this version of bzr."
5595
msgstr ""
5596
5597
#: bzrlib/errors.py:2078
5598
msgid ""
5599
"Cannot convert from format %(from_format)s to format %(format)s. "
5600
"%(problem)s"
5601
msgstr ""
5602
5603
#: bzrlib/errors.py:2090
5604
msgid "Could not find an appropriate Differ for file \"%(path)s\""
5605
msgstr ""
5606
5607
#: bzrlib/errors.py:2098
5608
msgid "%(exe_name)s could not be found on this machine"
5609
msgstr ""
5610
5611
#: bzrlib/errors.py:2106
5612
msgid "Diff is not installed on this machine: %(msg)s"
5613
msgstr ""
5614
5615
#: bzrlib/errors.py:2114
5616
msgid "Diff3 is not installed on this machine."
5617
msgstr ""
5618
5619
#: bzrlib/errors.py:2120
5620
msgid "The content being inserted is already present."
5621
msgstr ""
5622
5623
#: bzrlib/errors.py:2125
5624
msgid ""
5625
"This tree contains left-over files from a failed operation.\n"
5626
" Please examine %(limbo_dir)s to see if it contains any files you wish "
5627
"to\n"
5628
" keep, and delete it when you are done."
5629
msgstr ""
5630
5631
#: bzrlib/errors.py:2136
5632
msgid ""
5633
"This tree contains left-over files from a failed operation.\n"
5634
" Please examine %(pending_deletion)s to see if it contains any files you\n"
5635
" wish to keep, and delete it when you are done."
5636
msgstr ""
5637
5638
#: bzrlib/errors.py:2146
5639
msgid ""
5640
"Unable to delete transform temporary directory %(limbo_dir)s.\n"
5641
" Please examine %(limbo_dir)s to see if it contains any files you wish "
5642
"to\n"
5643
" keep, and delete it when you are done."
5644
msgstr ""
5645
5646
#: bzrlib/errors.py:2157
5647
msgid ""
5648
"Unable to delete transform temporary directory %(pending_deletion)s. Please "
5649
"examine %(pending_deletion)s to see if it contains any files you wish to "
5650
"keep, and delete it when you are done."
5651
msgstr ""
5652
5653
#: bzrlib/errors.py:2167
5654
msgid "Working tree is out of date, please run 'bzr update'.%(more)s"
5655
msgstr ""
5656
5657
#: bzrlib/errors.py:2181
5658
msgid ""
5659
"Public branch \"%(public_location)s\" lacks revision \"%(revstring)s\"."
5660
msgstr ""
5661
5662
#: bzrlib/errors.py:2194
5663
msgid "Error in merge modified format"
5664
msgstr ""
5665
5666
#: bzrlib/errors.py:2199
5667
msgid "Format error in conflict listings"
5668
msgstr ""
5669
5670
#: bzrlib/errors.py:2203
5671
msgid ""
5672
"Inconsistency in dirstate file %(dirstate_path)s.\n"
5673
"Error: %(description)s"
5674
msgstr ""
5675
5676
#: bzrlib/errors.py:2214
5677
msgid ""
5678
"An error has been detected in the repository %(repo_path)s.\n"
5679
"Please run bzr reconcile on this repository."
5680
msgstr ""
5681
5682
#: bzrlib/errors.py:2225
5683
msgid ""
5684
"An inconsistent delta was supplied involving %(path)r, %(file_id)r\n"
5685
"reason: %(reason)s"
5686
msgstr ""
5687
5688
#: bzrlib/errors.py:2238
5689
msgid ""
5690
"An inconsistent delta was supplied: %(delta)r\n"
5691
"reason: %(reason)s"
5692
msgstr ""
5693
5694
#: bzrlib/errors.py:2250
5695
msgid "To use this feature you must upgrade your branch at %(path)s."
5696
msgstr ""
5697
5698
#: bzrlib/errors.py:2259
5699
msgid "To use this feature you must upgrade your repository at %(path)s."
5700
msgstr ""
5701
5702
#: bzrlib/errors.py:2264
5703
msgid ""
5704
"To use this feature you must upgrade your branch at %(path)s to a format "
5705
"which supports rich roots."
5706
msgstr ""
5707
5708
#: bzrlib/errors.py:2270
5709
msgid "Cannot perform local-only commits on unbound branches."
5710
msgstr ""
5711
5712
#: bzrlib/errors.py:2275
5713
msgid "The method %(mname)s is not supported on objects of type %(tname)s."
5714
msgstr ""
5715
5716
#: bzrlib/errors.py:2296
5717
msgid "Ghost tags not supported by format %(format)r."
5718
msgstr ""
5719
5720
#: bzrlib/errors.py:2304
5721
msgid "File is binary but should be text."
5722
msgstr ""
5723
5724
#: bzrlib/errors.py:2309
5725
msgid "The path %(path)s is not permitted on this platform"
5726
msgstr ""
5727
5728
#: bzrlib/errors.py:2318
5729
msgid ""
5730
"Testament did not match expected value.\n"
5731
" For revision_id {%(revision_id)s}, expected {%(expected)s}, measured\n"
5732
" {%(measured)s}"
5733
msgstr ""
5734
5735
#: bzrlib/errors.py:2330
5736
msgid "Not a bzr revision-bundle: %(text)r"
5737
msgstr ""
5738
5739
#: bzrlib/errors.py:2339
5740
msgid "Bad bzr revision-bundle: %(text)r"
5741
msgstr ""
5742
5743
#: bzrlib/errors.py:2348
5744
msgid "Malformed bzr revision-bundle header: %(text)r"
5745
msgstr ""
5746
5747
#: bzrlib/errors.py:2353
5748
msgid "Malformed patches in bzr revision-bundle: %(text)r"
5749
msgstr ""
5750
5751
#: bzrlib/errors.py:2358
5752
msgid "Malformed footer in bzr revision-bundle: %(text)r"
5753
msgstr ""
5754
5755
#: bzrlib/errors.py:2363
5756
msgid "End of line marker was not \\n in bzr revision-bundle"
5757
msgstr ""
5758
5759
#: bzrlib/errors.py:2373
5760
msgid "Bundle format %(bundle_format)s is incompatible with %(other)s"
5761
msgstr ""
5762
5763
#: bzrlib/errors.py:2383
5764
msgid "Root class for inventory serialization errors"
5765
msgstr ""
5766
5767
#: bzrlib/errors.py:2387
5768
msgid ""
5769
"The inventory was not in the expected format:\n"
5770
" %(msg)s"
5771
msgstr ""
5772
5773
#: bzrlib/errors.py:2396
5774
msgid "This operation requires rich root data storage"
5775
msgstr ""
5776
5777
#: bzrlib/errors.py:2409
5778
msgid "Unrecognised value for BZR_SSH environment variable: %(vendor)s"
5779
msgstr ""
5780
5781
#: bzrlib/errors.py:2418
5782
msgid ""
5783
"Don't know how to handle SSH connections. Please set BZR_SSH environment "
5784
"variable."
5785
msgstr ""
5786
5787
#: bzrlib/errors.py:2425
5788
msgid ""
5789
"Could not determine revno for {%(revision_id)s} because its ancestry shows a "
5790
"ghost at {%(ghost_revision_id)s}"
5791
msgstr ""
5792
5793
#: bzrlib/errors.py:2435
5794
msgid "Ghost revision {%(revision_id)s} cannot be used here."
5795
msgstr ""
5796
5797
#: bzrlib/errors.py:2486
5798
msgid ""
5799
"A merge directive must provide either a bundle or a public branch location."
5800
msgstr ""
5801
5802
#: bzrlib/errors.py:2493
5803
msgid "Bad merge directive payload %(start)r"
5804
msgstr ""
5805
5806
#: bzrlib/errors.py:2503
5807
msgid "Preview patch does not match requested changes."
5808
msgstr ""
5809
5810
#: bzrlib/errors.py:2509
5811
msgid "Patch_type was %(patch_type)s, but no patch was supplied."
5812
msgstr ""
5813
5814
#: bzrlib/errors.py:2519
5815
msgid ""
5816
"Your branch does not have all of the revisions required in order to merge "
5817
"this merge directive and the target location specified in the merge "
5818
"directive is not a branch: %(location)s."
5819
msgstr ""
5820
5821
#: bzrlib/errors.py:2531
5822
msgid "Unsupported entry kind %(kind)s"
5823
msgstr "Unsupported entry type %(kind)s"
5824
5825
#: bzrlib/errors.py:2539
5826
msgid "Can't subsume %(other_tree)s into %(tree)s. %(reason)s"
5827
msgstr ""
5828
5829
#: bzrlib/errors.py:2549
5830
msgid "Subsume target %(other_tree)s needs to be upgraded."
5831
msgstr ""
5832
5833
#: bzrlib/errors.py:2568
5834
msgid "No such tag: %(tag_name)s"
5835
msgstr ""
5836
5837
#: bzrlib/errors.py:2576
5838
msgid "Tags not supported by %(branch)s; you may be able to use bzr upgrade."
5839
msgstr ""
5840
5841
#: bzrlib/errors.py:2585
5842
msgid "Tag %(tag_name)s already exists."
5843
msgstr ""
5844
5845
#: bzrlib/errors.py:2593
5846
msgid ""
5847
"Did not understand bug identifier %(bug_id)s: %(reason)s. See \"bzr help "
5848
"bugs\" for more information on this feature."
5849
msgstr ""
5850
5851
#: bzrlib/errors.py:2603
5852
msgid ""
5853
"The URL for bug tracker \"%(abbreviation)s\" doesn't contain {id}: %(url)s"
5854
msgstr ""
5855
5856
#: bzrlib/errors.py:2613
5857
msgid ""
5858
"Cannot find registered bug tracker called %(abbreviation)s on %(branch)s"
5859
msgstr ""
5860
5861
#: bzrlib/errors.py:2623
5862
msgid "Invalid line in bugs property: '%(line)s'"
5863
msgstr ""
5864
5865
#: bzrlib/errors.py:2631
5866
msgid "Invalid bug status: '%(status)s'"
5867
msgstr ""
5868
5869
#: bzrlib/errors.py:2639
5870
msgid "Could not understand response from smart server: %(response_tuple)r"
5871
msgstr ""
5872
5873
#: bzrlib/errors.py:2678
5874
msgid "Server sent an unexpected error: %(error_tuple)r"
5875
msgstr ""
5876
5877
#: bzrlib/errors.py:2697
5878
msgid "Unrecognised container format: %(container_format)r"
5879
msgstr ""
5880
5881
#: bzrlib/errors.py:2705
5882
msgid "Unexpected end of container stream"
5883
msgstr ""
5884
5885
#: bzrlib/errors.py:2710
5886
msgid "Unknown record type: %(record_type)r"
5887
msgstr ""
5888
5889
#: bzrlib/errors.py:2718
5890
msgid "Invalid record: %(reason)s"
5891
msgstr ""
5892
5893
#: bzrlib/errors.py:2726
5894
msgid "Container has data after end marker: %(excess)r"
5895
msgstr ""
5896
5897
#: bzrlib/errors.py:2734
5898
msgid "Container has multiple records with the same name: %(name)s"
5899
msgstr ""
5900
5901
#: bzrlib/errors.py:2747
5902
msgid "Corrupt or incompatible data stream: %(reason)s"
5903
msgstr ""
5904
5905
#: bzrlib/errors.py:2755
5906
msgid "SMTP error: %(error)s"
5907
msgstr ""
5908
5909
#: bzrlib/errors.py:2763
5910
msgid "No message supplied."
5911
msgstr ""
5912
5913
#: bzrlib/errors.py:2768
5914
msgid "No mail-to address (--mail-to) or output (-o) specified."
5915
msgstr ""
5916
5917
#: bzrlib/errors.py:2773
5918
msgid "Unknown mail client: %(mail_client)s"
5919
msgstr ""
5920
5921
#: bzrlib/errors.py:2781
5922
msgid ""
5923
"Unable to find mail client with the following names: "
5924
"%(mail_command_list_string)s"
5925
msgstr ""
5926
5927
#: bzrlib/errors.py:2791
5928
msgid "SMTP connection to %(host)s refused"
5929
msgstr ""
5930
5931
#: bzrlib/errors.py:2800
5932
msgid "Please specify smtp_server. No server at default %(host)s."
5933
msgstr ""
5934
5935
#: bzrlib/errors.py:2814
5936
msgid ""
5937
"'%(display_url)s' is not in sync with %(target_url)s. See bzr help sync-for-"
5938
"reconfigure."
5939
msgstr ""
5940
5941
#: bzrlib/errors.py:2826
5942
msgid "'%(display_url)s' is already a branch."
5943
msgstr ""
5944
5945
#: bzrlib/errors.py:2831
5946
msgid "'%(display_url)s' is already a tree."
5947
msgstr ""
5948
5949
#: bzrlib/errors.py:2836
5950
msgid "'%(display_url)s' is already a checkout."
5951
msgstr ""
5952
5953
#: bzrlib/errors.py:2841
5954
msgid "'%(display_url)s' is already a lightweight checkout."
5955
msgstr ""
5956
5957
#: bzrlib/errors.py:2846
5958
msgid "'%(display_url)s' is already using a shared repository."
5959
msgstr ""
5960
5961
#: bzrlib/errors.py:2851
5962
msgid "'%(display_url)s' is already standalone."
5963
msgstr ""
5964
5965
#: bzrlib/errors.py:2856
5966
msgid "Shared repository '%(display_url)s' already creates working trees."
5967
msgstr ""
5968
5969
#: bzrlib/errors.py:2862
5970
msgid ""
5971
"Shared repository '%(display_url)s' already doesn't create working trees."
5972
msgstr ""
5973
5974
#: bzrlib/errors.py:2868
5975
msgid "Requested reconfiguration of '%(display_url)s' is not supported."
5976
msgstr ""
5977
5978
#: bzrlib/errors.py:2873
5979
msgid "No location could be found to bind to at %(display_url)s."
5980
msgstr ""
5981
5982
#: bzrlib/errors.py:2878
5983
msgid ""
5984
"Working tree \"%(display_url)s\" has uncommitted changes (See bzr "
5985
"status).%(more)s"
5986
msgstr ""
5987
5988
#: bzrlib/errors.py:2897
5989
msgid ""
5990
"Working tree \"%(display_url)s\" has shelved changes (See bzr shelve --"
5991
"list).%(more)s"
5992
msgstr ""
5993
5994
#: bzrlib/errors.py:2903
5995
msgid "Variable {%(name)s} is not available."
5996
msgstr ""
5997
5998
#: bzrlib/errors.py:2911
5999
msgid "No template specified."
6000
msgstr ""
6001
6002
#: bzrlib/errors.py:2916
6003
msgid "Unable to create symlink %(path_str)son this platform"
6004
msgstr ""
6005
6006
#: bzrlib/errors.py:2931
6007
msgid ""
6008
"Unsupported timezone format \"%(timezone)s\", options are \"utc\", "
6009
"\"original\", \"local\"."
6010
msgstr ""
6011
6012
#: bzrlib/errors.py:2965
6013
msgid ""
6014
"Unable to encode %(kind)s path %(path)r in user encoding %(user_encoding)s"
6015
msgstr ""
6016
"Unable to encode %(kind)s path %(path)r in user encoding %(user_encoding)s"
6017
6018
#: bzrlib/errors.py:2977
6019
msgid "The \"%(config_id)s\" configuration does not exist."
6020
msgstr ""
6021
6022
#: bzrlib/errors.py:2985
6023
msgid "The \"%(option_name)s\" configuration option does not exist."
6024
msgstr ""
6025
6026
#: bzrlib/errors.py:2993
6027
msgid "The alias \"%(alias_name)s\" does not exist."
6028
msgstr ""
6029
6030
#: bzrlib/errors.py:3007
6031
msgid "\"%(alias_name)s\" is not a valid location alias."
6032
msgstr ""
6033
6034
#: bzrlib/errors.py:3015
6035
msgid "No %(alias_name)s location assigned."
6036
msgstr ""
6037
6038
#: bzrlib/errors.py:3023
6039
msgid "Cannot bind address \"%(host)s:%(port)i\": %(orig_error)s."
6040
msgstr ""
6041
6042
#: bzrlib/errors.py:3033
6043
msgid "Unknown rules detected: %(unknowns_str)s."
6044
msgstr ""
6045
6046
#: bzrlib/errors.py:3044
6047
msgid "Tip change rejected: %(msg)s"
6048
msgstr ""
6049
6050
#: bzrlib/errors.py:3052
6051
msgid "Shelf corrupt."
6052
msgstr ""
6053
6054
#: bzrlib/errors.py:3057
6055
msgid "Corruption while decompressing repository file%(orig_error)s"
6056
msgstr ""
6057
6058
#: bzrlib/errors.py:3069
6059
msgid "No changes are shelved with id \"%(shelf_id)d\"."
6060
msgstr ""
6061
6062
#: bzrlib/errors.py:3077
6063
msgid "\"%(invalid_id)s\" is not a valid shelf id, try a number instead."
6064
msgstr ""
6065
6066
#: bzrlib/errors.py:3085
6067
msgid ""
6068
"An attempt to access a url outside the server jail was made: '%(url)s'."
6069
msgstr ""
6070
6071
#: bzrlib/errors.py:3093
6072
msgid "The user aborted the operation."
6073
msgstr ""
6074
6075
#: bzrlib/errors.py:3098
6076
msgid "Branching '%(url)s'(%(format)s) must create a working tree."
6077
msgstr ""
6078
6079
#: bzrlib/errors.py:3108
6080
msgid "No such view: %(view_name)s."
6081
msgstr ""
6082
6083
#: bzrlib/errors.py:3118
6084
msgid ""
6085
"Views are not supported by %(tree)s; use 'bzr upgrade' to change your tree "
6086
"to a later format."
6087
msgstr ""
6088
6089
#: bzrlib/errors.py:3127
6090
msgid ""
6091
"Specified file \"%(file_name)s\" is outside the current view: %(view_str)s"
6092
msgstr ""
6093
6094
#: bzrlib/errors.py:3194
6095
msgid "%(bzrdir)r does not support co-located branches."
6096
msgstr ""
6097
6098
#: bzrlib/errors.py:3200
6099
msgid ""
6100
"Unable to determine your name.\n"
6101
"Please, set your name with the 'whoami' command.\n"
6102
"E.g. bzr whoami \"Your Name <name@example.com>\""
6103
msgstr ""
6104
6105
#: bzrlib/errors.py:3209
6106
msgid "Invalid pattern(s) found. %(msg)s"
6107
msgstr ""
6108
6109
#: bzrlib/errors.py:3217
6110
msgid ""
6111
"Branch \"%(branch_url)s\" appears to be bound to itself. Please use `bzr "
6112
"unbind` to fix."
6113
msgstr ""
6114
6115
#: bzrlib/errors.py:3228
6116
msgid "Loop involving %(refs)r while expanding \"%(string)s\"."
6117
msgstr ""
6118
6119
#: bzrlib/errors.py:3237
6120
msgid "Option %(name)s is not defined while expanding \"%(string)s\"."
6121
msgstr ""
6122
6123
#: bzrlib/errors.py:3246
6124
msgid ""
6125
"No compatible object available for operations from %(source)r to %(target)r."
6126
msgstr ""
6127
6128
#: bzrlib/errors.py:3256
6129
msgid ""
6130
"VFS requests over the smart server are not allowed. Encountered: %(method)s, "
6131
"%(arguments)s."
6132
msgstr ""
6133
6134
#: bzrlib/errors.py:3266
6135
msgid ""
6136
"Kind change from %(from_kind)s to %(to_kind)s for %(path)s not supported by "
6137
"format %(format)r"
6138
msgstr ""
6139
"Type change from %(from_kind)s to %(to_kind)s for %(path)s not supported by "
6140
"format %(format)r"
6141
6142
#: bzrlib/errors.py:3278
6143
msgid ""
6144
"Missing feature %(feature)s not provided by this version of Bazaar or any "
6145
"plugin."
6146
msgstr ""
6147
6148
#: bzrlib/errors.py:3291
6149
msgid "Binary files section encountered."
6150
msgstr ""
6151
6152
#: bzrlib/errors.py:3299
6153
msgid ""
6154
"Malformed patch header. %(desc)s\n"
6155
"%(line)r"
6156
msgstr ""
6157
6158
#: bzrlib/errors.py:3308
6159
msgid ""
6160
"Malformed hunk header. %(desc)s\n"
6161
"%(line)r"
6162
msgstr ""
6163
6164
#: bzrlib/errors.py:3317
6165
msgid ""
6166
"Malformed line. %(desc)s\n"
6167
"%(line)r"
6168
msgstr ""
6169
6170
#: bzrlib/errors.py:3327
6171
msgid ""
6172
"Text contents mismatch at line %(line_no)d. Original has \"%(orig_line)s\", "
6173
"but patch says it should be \"%(patch_line)s\""
6174
msgstr ""
6175
6176
#: bzrlib/errors.py:3338
6177
msgid "The feature %(feature)s has already been registered."
6178
msgstr ""
6179
6180
#: bzrlib/export_pot.py:252
6181
#, python-format
6182
msgid "Exporting messages from builtin command: %s"
6183
msgstr ""
6184
6185
#: bzrlib/export_pot.py:271
6186
msgid "Exporting messages from plugin command: {0} in {1}"
6187
msgstr ""
6188
6189
#: bzrlib/export_pot.py:292
6190
#, python-format
6191
msgid "Exporting message from error: %s"
6192
msgstr ""
6193
6194
#: bzrlib/fetch.py:98
6195
msgid "Finding revisions"
6196
msgstr ""
6197
6198
#: bzrlib/fetch.py:103
6199
msgid "Fetching revisions"
6200
msgstr ""
6201
6202
#: bzrlib/foreign.py:262
6203
msgid "Push into a different VCS without any custom bzr metadata."
6204
msgstr ""
6205
6206
#: bzrlib/foreign.py:264
6207
msgid ""
6208
"This will afterwards rebase the local branch on the remote\n"
6209
"branch unless the --no-rebase option is used, in which case \n"
6210
"the two branches will be out of sync after the push. "
6211
msgstr ""
6212
6213
#: bzrlib/foreign.py:277
6214
msgid "Do not rebase after push."
6215
msgstr ""
6216
6217
#: bzrlib/foreign.py:311
6218
#, python-format
6219
msgid "Using saved location: %s\n"
6220
msgstr ""
6221
6222
#: bzrlib/foreign.py:321
6223
msgid ""
6224
"{0!r} and {1!r} are in the same VCS, lossy push not necessary. Please use "
6225
"regular push."
6226
msgstr ""
6227
6228
#: bzrlib/gpg.py:119 bzrlib/gpg.py:460
6229
msgid "{0} commits with valid signatures"
6230
msgstr ""
6231
6232
#: bzrlib/gpg.py:123 bzrlib/gpg.py:465
6233
msgid "{0} commit with unknown key"
6234
msgid_plural "{0} commits with unknown keys"
6235
msgstr[0] ""
6236
msgstr[1] ""
6237
6238
#: bzrlib/gpg.py:129 bzrlib/gpg.py:472
6239
msgid "{0} commit not valid"
6240
msgid_plural "{0} commits not valid"
6241
msgstr[0] ""
6242
msgstr[1] ""
6243
6244
#: bzrlib/gpg.py:135 bzrlib/gpg.py:479
6245
msgid "{0} commit not signed"
6246
msgid_plural "{0} commits not signed"
6247
msgstr[0] ""
6248
msgstr[1] ""
6249
6250
#: bzrlib/gpg.py:141 bzrlib/gpg.py:486
6251
msgid "{0} commit with key now expired"
6252
msgid_plural "{0} commits with key now expired"
6253
msgstr[0] ""
6254
msgstr[1] ""
6255
6256
#: bzrlib/gpg.py:343
6257
msgid "No GnuPG key results for pattern: {0}"
6258
msgstr ""
6259
6260
#: bzrlib/gpg.py:386
6261
msgid "{0} signed {1} commit"
6262
msgid_plural "{0} signed {1} commits"
6263
msgstr[0] ""
6264
msgstr[1] ""
6265
6266
#: bzrlib/gpg.py:403 bzrlib/gpg.py:419
6267
msgid "{0} commit by author {1}"
6268
msgid_plural "{0} commits by author {1}"
6269
msgstr[0] ""
6270
msgstr[1] ""
6271
6272
#: bzrlib/gpg.py:433
6273
msgid "Unknown key {0} signed {1} commit"
6274
msgid_plural "Unknown key {0} signed {1} commits"
6275
msgstr[0] ""
6276
msgstr[1] ""
6277
6278
#: bzrlib/gpg.py:452
6279
msgid "{0} commit by author {1} with key {2} now expired"
6280
msgid_plural "{0} commits by author {1} with key {2} now expired"
6281
msgstr[0] ""
6282
msgstr[1] ""
6283
6284
#: bzrlib/groupcompress.py:1739
6285
#, python-format
6286
msgid "Insert claimed random_id=True, but then inserted %r two times"
6287
msgstr ""
6288
6289
#: bzrlib/hooks.py:331
6290
#, python-format
6291
msgid "Introduced in: %s"
6292
msgstr ""
6293
6294
#: bzrlib/hooks.py:334
6295
#, python-format
6296
msgid "Deprecated in: %s"
6297
msgstr ""
6298
6299
#: bzrlib/knit.py:1766 bzrlib/knit.py:1802
6300
msgid "Walking content"
6301
msgstr ""
6302
6303
#: bzrlib/knit.py:3330
6304
msgid "annotating"
6305
msgstr ""
6306
6307
#: bzrlib/lock.py:548
6308
msgid "{0!r} was {1} locked again"
6309
msgstr ""
6310
6311
#: bzrlib/lockdir.py:321
6312
#, python-format
6313
msgid "error removing pending lock: %s"
6314
msgstr ""
6315
6316
#: bzrlib/lockdir.py:616
6317
msgid "Unable to obtain"
6318
msgstr ""
6319
6320
#: bzrlib/lockdir.py:618
6321
msgid "Lock owner changed for"
6322
msgstr ""
6323
6324
#: bzrlib/lockdir.py:620
6325
msgid "{0} lock {1} {2}."
6326
msgstr ""
6327
6328
#: bzrlib/lockdir.py:627
6329
#, python-format
6330
msgid "Will continue to try until %s, unless you press Ctrl-C."
6331
msgstr ""
6332
6333
#: bzrlib/lockdir.py:629
6334
msgid "See \"bzr help break-lock\" for more."
6335
msgstr ""
6336
6337
#: bzrlib/lockdir.py:739
6338
#, python-format
6339
msgid ""
6340
"held by %(user)s on %(hostname)s (process #%(pid)s), acquired %(time_ago)s"
6341
msgstr ""
6342
6343
#: bzrlib/log.py:572
6344
msgid "--exclude-common-ancestry requires two different revisions"
6345
msgstr ""
6346
6347
#: bzrlib/log.py:574
6348
#, python-format
6349
msgid "invalid direction %r"
6350
msgstr ""
6351
6352
#: bzrlib/log.py:662
6353
msgid "Start revision not found in history of end revision."
6354
msgstr ""
6355
6356
#: bzrlib/log.py:1080 bzrlib/log.py:1138
6357
msgid "Logging revision 0 is invalid."
6358
msgstr ""
6359
6360
#: bzrlib/log.py:1082 bzrlib/log.py:1140
6361
msgid "Start revision must be older than the end revision."
6362
msgstr ""
6363
6364
#: bzrlib/log.py:1827
6365
#, python-format
6366
msgid "unknown log formatter: %r"
6367
msgstr ""
6368
6369
#: bzrlib/log.py:2123
6370
msgid "fixes bug"
6371
msgid_plural "fixes bugs"
6372
msgstr[0] ""
6373
msgstr[1] ""
6374
6375
#: bzrlib/merge.py:689
6376
msgid "All changes applied successfully."
6377
msgstr ""
6378
6379
#: bzrlib/merge.py:691
6380
#, python-format
6381
msgid "%d conflicts encountered."
6382
msgstr ""
6383
6384
#: bzrlib/merge.py:845 bzrlib/merge.py:1933
6385
msgid "Preparing file merge"
6386
msgstr ""
6387
6388
#: bzrlib/multiparent.py:426
6389
msgid "Importing revisions"
6390
msgstr ""
6391
6392
#: bzrlib/option.py:526
6393
msgid "Show help message."
6394
msgstr ""
6395
6396
#: bzrlib/option.py:528
6397
msgid "Only display errors and warnings."
6398
msgstr ""
6399
6400
#: bzrlib/option.py:531
6401
msgid "Show usage message and options."
6402
msgstr ""
6403
6404
#: bzrlib/option.py:533
6405
msgid "Display more information."
6406
msgstr ""
6407
6408
#: bzrlib/option.py:541
6409
msgid ""
6410
"Select changes introduced by the specified revision. See also \"help "
6411
"revisionspec\"."
6412
msgstr ""
6413
6414
#: bzrlib/option.py:543
6415
msgid "Branch to operate on, instead of working directory."
6416
msgstr ""
6417
6418
#: bzrlib/option.py:545
6419
msgid "Detailed log format."
6420
msgstr ""
6421
6422
#: bzrlib/option.py:545
6423
msgid "Format used by GNU ChangeLog files."
6424
msgstr ""
6425
6426
#: bzrlib/option.py:545
6427
msgid "Log format with one line per revision."
6428
msgstr ""
6429
6430
#: bzrlib/option.py:545
6431
msgid "Moderately short log format."
6432
msgstr ""
6433
6434
#: bzrlib/option.py:545
6435
msgid "Use specified log format."
6436
msgstr ""
6437
6438
#: bzrlib/option.py:547
6439
msgid "Log format"
6440
msgstr ""
6441
6442
#: bzrlib/option.py:549
6443
msgid "LCA-newness merge."
6444
msgstr ""
6445
6446
#: bzrlib/option.py:549
6447
msgid "Merge using external diff3."
6448
msgstr ""
6449
6450
#: bzrlib/option.py:549
6451
msgid "Native diff3-style merge."
6452
msgstr ""
6453
6454
#: bzrlib/option.py:549
6455
msgid "Select a particular merge algorithm."
6456
msgstr ""
6457
6458
#: bzrlib/option.py:549
6459
msgid "Weave-based merge."
6460
msgstr ""
6461
6462
#: bzrlib/option.py:551
6463
msgid "Merge algorithm"
6464
msgstr ""
6465
6466
#: bzrlib/option.py:554
6467
msgid "Message string."
6468
msgstr ""
6469
6470
#: bzrlib/option.py:556
6471
msgid "Use an ASCII NUL (\\0) separator rather than a newline."
6472
msgstr ""
6473
6474
#: bzrlib/option.py:558
6475
msgid "Ignore differences between branches and overwrite unconditionally."
6476
msgstr ""
6477
6478
#: bzrlib/option.py:560
6479
msgid "Remember the specified location as a default."
6480
msgstr ""
6481
6482
#: bzrlib/option.py:562
6483
msgid "Reprocess to reduce spurious conflicts."
6484
msgstr ""
6485
6486
#: bzrlib/option.py:566
6487
msgid "See \"help revisionspec\" for details."
6488
msgstr ""
6489
6490
#: bzrlib/option.py:568
6491
msgid "Show internal object ids."
6492
msgstr ""
6493
6494
#: bzrlib/option.py:571
6495
msgid "Display timezone as local, original, or utc."
6496
msgstr ""
6497
6498
#: bzrlib/osutils.py:100
6499
msgid "Parameter {0!r} encoding is unsupported by {1} application locale."
6500
msgstr ""
6501
6502
#: bzrlib/osutils.py:220
6503
msgid "lstat/stat of ({0!r}): {1!r}"
6504
msgstr ""
6505
6506
#: bzrlib/osutils.py:1008 bzrlib/osutils.py:1019
6507
#, python-format
6508
msgid "sorry, %r not allowed in path"
6509
msgstr ""
6510
6511
#: bzrlib/osutils.py:1237
6512
#, python-format
6513
msgid "%r is too short to calculate a relative path"
6514
msgstr ""
6515
6516
#: bzrlib/plugin.py:143
6517
#, python-format
6518
msgid "\"%s\" is not a valid <plugin_name>@<plugin_path> description "
6519
msgstr ""
6520
6521
#: bzrlib/plugins/bash_completion/bashcomp.py:411
6522
msgid "Enable completions for the selected plugin (default: all plugins)"
6523
msgstr ""
6524
6525
#: bzrlib/plugins/bash_completion/bashcomp.py:412
6526
msgid "Generate a shell function for bash command line completion."
6527
msgstr ""
6528
6529
#: bzrlib/plugins/bash_completion/bashcomp.py:414
6530
msgid ""
6531
"This command generates a shell function which can be used by bash to\n"
6532
"automatically complete the currently typed command when the user presses\n"
6533
"the completion key (usually tab)."
6534
msgstr ""
6535
6536
#: bzrlib/plugins/bash_completion/bashcomp.py:418
6537
msgid ""
6538
"Commonly used like this:\n"
6539
" eval \"`bzr bash-completion`\""
6540
msgstr ""
6541
6542
#: bzrlib/plugins/bash_completion/bashcomp.py:424
6543
msgid "Name of the generated function (default: _bzr)"
6544
msgstr ""
6545
6546
#: bzrlib/plugins/bash_completion/bashcomp.py:426
6547
msgid "Generate only the shell function, don't enable it"
6548
msgstr ""
6549
6550
#: bzrlib/plugins/launchpad/__init__.py:81
6551
msgid "Register a branch with launchpad.net."
6552
msgstr ""
6553
6554
#: bzrlib/plugins/launchpad/__init__.py:83
6555
msgid ""
6556
"This command lists a bzr branch in the directory of branches on\n"
6557
"launchpad.net. Registration allows the branch to be associated with\n"
6558
"bugs or specifications."
6559
msgstr ""
6560
6561
#: bzrlib/plugins/launchpad/__init__.py:87
6562
msgid ""
6563
"Before using this command you must register the project to which the\n"
6564
"branch belongs, and create an account for yourself on launchpad.net."
6565
msgstr ""
6566
6567
#: bzrlib/plugins/launchpad/__init__.py:90
6568
msgid ""
6569
"arguments:\n"
6570
" public_url: The publicly visible url for the branch to register.\n"
6571
" This must be an http or https url (which Launchpad can read\n"
6572
" from to access the branch). Local file urls, SFTP urls, and\n"
6573
" bzr+ssh urls will not work.\n"
6574
" If no public_url is provided, bzr will use the configured\n"
6575
" public_url if there is one for the current branch, and\n"
6576
" otherwise error."
6577
msgstr ""
6578
6579
#: bzrlib/plugins/launchpad/__init__.py:99
6580
msgid ""
6581
"example:\n"
6582
" bzr register-branch http://foo.com/bzr/fooproject.mine \\\n"
6583
" --project fooproject"
6584
msgstr ""
6585
6586
#: bzrlib/plugins/launchpad/__init__.py:106
6587
msgid "Launchpad project short name to associate with the branch."
6588
msgstr ""
6589
6590
#: bzrlib/plugins/launchpad/__init__.py:113
6591
msgid ""
6592
"Short name for the branch; by default taken from the last component of the "
6593
"url."
6594
msgstr ""
6595
6596
#: bzrlib/plugins/launchpad/__init__.py:117
6597
msgid "One-sentence description of the branch."
6598
msgstr ""
6599
6600
#: bzrlib/plugins/launchpad/__init__.py:120
6601
msgid "Longer description of the purpose or contents of the branch."
6602
msgstr ""
6603
6604
#: bzrlib/plugins/launchpad/__init__.py:123
6605
msgid "Branch author's email address, if not yourself."
6606
msgstr ""
6607
6608
#: bzrlib/plugins/launchpad/__init__.py:126
6609
msgid "The bug this branch fixes."
6610
msgstr ""
6611
6612
#: bzrlib/plugins/launchpad/__init__.py:129
6613
msgid "Prepare the request but don't actually send it."
6614
msgstr ""
6615
6616
#: bzrlib/plugins/launchpad/__init__.py:151
6617
msgid ""
6618
"register-branch requires a public branch url - see bzr help register-branch."
6619
msgstr ""
6620
6621
#: bzrlib/plugins/launchpad/__init__.py:159
6622
msgid "--product is deprecated; please use --project."
6623
msgstr ""
6624
6625
#: bzrlib/plugins/launchpad/__init__.py:191
6626
msgid "Open a Launchpad branch page in your web browser."
6627
msgstr ""
6628
6629
#: bzrlib/plugins/launchpad/__init__.py:196
6630
msgid "Do not actually open the browser. Just say the URL we would use."
6631
msgstr ""
6632
6633
#: bzrlib/plugins/launchpad/__init__.py:231
6634
#, python-format
6635
msgid "Opening %s in web browser"
6636
msgstr ""
6637
6638
#: bzrlib/plugins/launchpad/__init__.py:241
6639
msgid "Show or set the Launchpad user ID."
6640
msgstr ""
6641
6642
#: bzrlib/plugins/launchpad/__init__.py:243
6643
msgid ""
6644
"When communicating with Launchpad, some commands need to know your\n"
6645
"Launchpad user ID. This command can be used to set or show the\n"
6646
"user ID that Bazaar will use for such communication."
6647
msgstr ""
6648
6649
#: bzrlib/plugins/launchpad/__init__.py:247
6650
msgid ""
6651
":Examples:\n"
6652
" Show the Launchpad ID of the current user::"
6653
msgstr ""
6654
6655
#: bzrlib/plugins/launchpad/__init__.py:250
6656
msgid " bzr launchpad-login"
6657
msgstr ""
6658
6659
#: bzrlib/plugins/launchpad/__init__.py:252
6660
msgid " Set the Launchpad ID of the current user to 'bob'::"
6661
msgstr ""
6662
6663
#: bzrlib/plugins/launchpad/__init__.py:254
6664
msgid " bzr launchpad-login bob"
6665
msgstr ""
6666
6667
#: bzrlib/plugins/launchpad/__init__.py:261
6668
msgid "Don't check that the user name is valid."
6669
msgstr ""
6670
6671
#: bzrlib/plugins/launchpad/__init__.py:276
6672
#: bzrlib/plugins/launchpad/__init__.py:287
6673
msgid "Launchpad user ID exists and has SSH keys.\n"
6674
msgstr ""
6675
6676
#: bzrlib/plugins/launchpad/__init__.py:279
6677
msgid "No Launchpad user ID configured.\n"
6678
msgstr ""
6679
6680
#: bzrlib/plugins/launchpad/__init__.py:290
6681
#, python-format
6682
msgid "Launchpad user ID set to '%s'.\n"
6683
msgstr ""
6684
6685
#: bzrlib/plugins/launchpad/__init__.py:298
6686
msgid "Ask Launchpad to mirror a branch now."
6687
msgstr ""
6688
6689
#: bzrlib/plugins/launchpad/__init__.py:318
6690
msgid "Propose merging a branch on Launchpad."
6691
msgstr ""
6692
6693
#: bzrlib/plugins/launchpad/__init__.py:320
6694
msgid ""
6695
"This will open your usual editor to provide the initial comment. When it\n"
6696
"has created the proposal, it will open it in your default web browser."
6697
msgstr ""
6698
6699
#: bzrlib/plugins/launchpad/__init__.py:323
6700
msgid ""
6701
"The branch will be proposed to merge into SUBMIT_BRANCH. If SUBMIT_BRANCH\n"
6702
"is not supplied, the remembered submit branch will be used. If no submit\n"
6703
"branch is remembered, the development focus will be used."
6704
msgstr ""
6705
6706
#: bzrlib/plugins/launchpad/__init__.py:327
6707
msgid ""
6708
"By default, the SUBMIT_BRANCH's review team will be requested to review\n"
6709
"the merge proposal. This can be overriden by specifying --review (-R).\n"
6710
"The parameter the launchpad account name of the desired reviewer. This\n"
6711
"may optionally be followed by '=' and the review type. For example:"
6712
msgstr ""
6713
6714
#: bzrlib/plugins/launchpad/__init__.py:332
6715
msgid " bzr lp-propose-merge --review jrandom --review review-team=qa"
6716
msgstr ""
6717
6718
#: bzrlib/plugins/launchpad/__init__.py:334
6719
msgid ""
6720
"This will propose a merge, request \"jrandom\" to perform a review of\n"
6721
"unspecified type, and request \"review-team\" to perform a \"qa\" review."
6722
msgstr ""
6723
6724
#: bzrlib/plugins/launchpad/__init__.py:339
6725
msgid "Propose the merge on staging."
6726
msgstr ""
6727
6728
#: bzrlib/plugins/launchpad/__init__.py:341
6729
msgid "Commit message."
6730
msgstr ""
6731
6732
#: bzrlib/plugins/launchpad/__init__.py:343
6733
msgid "Mark the proposal as approved immediately."
6734
msgstr ""
6735
6736
#: bzrlib/plugins/launchpad/__init__.py:345
6737
msgid "Requested reviewer and optional type."
6738
msgstr ""
6739
6740
#: bzrlib/plugins/launchpad/__init__.py:382
6741
msgid "Find the proposal to merge this revision."
6742
msgstr ""
6743
6744
#: bzrlib/plugins/launchpad/__init__.py:384
6745
msgid ""
6746
"Finds the merge proposal(s) that discussed landing the specified revision.\n"
6747
"This works only if the selected branch was the merge proposal target, and\n"
6748
"if the merged_revno is recorded for the merge proposal. The proposal(s)\n"
6749
"are opened in a web browser."
6750
msgstr ""
6751
6752
#: bzrlib/plugins/launchpad/__init__.py:389
6753
msgid ""
6754
"Any revision involved in the merge may be specified-- the revision in\n"
6755
"which the merge was performed, or one of the revisions that was merged."
6756
msgstr ""
6757
6758
#: bzrlib/plugins/launchpad/__init__.py:392
6759
msgid "So, to find the merge proposal that reviewed line 1 of README::"
6760
msgstr ""
6761
6762
#: bzrlib/plugins/launchpad/__init__.py:394
6763
msgid " bzr lp-find-proposal -r annotate:README:1"
6764
msgstr ""
6765
6766
#: bzrlib/plugins/launchpad/__init__.py:409
6767
msgid "No review found."
6768
msgstr ""
6769
6770
#: bzrlib/plugins/launchpad/__init__.py:410
6771
#, python-format
6772
msgid "%d proposals(s) found."
6773
msgstr ""
6774
6775
#: bzrlib/plugins/launchpad/__init__.py:420
6776
msgid "Finding revision-id"
6777
msgstr ""
6778
6779
#: bzrlib/plugins/launchpad/__init__.py:427
6780
msgid "Finding merge"
6781
msgstr ""
6782
6783
#: bzrlib/plugins/launchpad/__init__.py:432
6784
msgid "Finding revno"
6785
msgstr ""
6786
6787
#: bzrlib/plugins/launchpad/__init__.py:437
6788
msgid "Finding Launchpad branch"
6789
msgstr ""
6790
6791
#: bzrlib/plugins/launchpad/__init__.py:440
6792
msgid "Finding proposals"
6793
msgstr ""
6794
6795
#: bzrlib/plugins/launchpad/account.py:66
6796
msgid "Setting ssh/sftp usernames for launchpad.net."
6797
msgstr ""
6798
6799
#: bzrlib/plugins/launchpad/lp_api.py:241
6800
#: bzrlib/plugins/launchpad/lp_api.py:246
6801
#, python-format
6802
msgid "%s is not registered on Launchpad"
6803
msgstr ""
6804
6805
#: bzrlib/plugins/launchpad/lp_api.py:256
6806
#, python-format
6807
msgid "%s has no development focus."
6808
msgstr ""
6809
6810
#: bzrlib/plugins/launchpad/lp_api.py:261
6811
#, python-format
6812
msgid "development focus %s has no branch."
6813
msgstr ""
6814
6815
#: bzrlib/plugins/launchpad/lp_api.py:266
6816
#, python-format
6817
msgid "source package %s has no branch."
6818
msgstr ""
6819
6820
#: bzrlib/plugins/launchpad/lp_api.py:270
6821
#, python-format
6822
msgid "%s has no associated product or source package."
6823
msgstr ""
6824
6825
#: bzrlib/plugins/launchpad/lp_api.py:282
6826
#, python-format
6827
msgid "%s is already up-to-date."
6828
msgstr ""
6829
6830
#: bzrlib/plugins/launchpad/lp_api.py:289
6831
#, python-format
6832
msgid "Pushing to %s"
6833
msgstr ""
6834
6835
#: bzrlib/plugins/launchpad/lp_directory.py:170
6836
msgid ""
6837
"resolution for {0}\n"
6838
" local: {1}\n"
6839
" remote: {2}"
6840
msgstr ""
6841
6842
#: bzrlib/plugins/launchpad/lp_propose.py:149
6843
#, python-format
6844
msgid "There is already a branch merge proposal: %s"
6845
msgstr ""
6846
6847
#: bzrlib/plugins/weave_fmt/bzrdir.py:236
6848
msgid "pb parameter to convert() is deprecated"
6849
msgstr ""
6850
6851
#: bzrlib/plugins/weave_fmt/bzrdir.py:239
6852
msgid "starting upgrade from format 4 to 5"
6853
msgstr ""
6854
6855
#: bzrlib/plugins/weave_fmt/bzrdir.py:249
6856
msgid "note: upgrade may be faster if all store files are ungzipped first"
6857
msgstr ""
6858
6859
#: bzrlib/plugins/weave_fmt/bzrdir.py:278
6860
msgid "converting revision"
6861
msgstr ""
6862
6863
#: bzrlib/plugins/weave_fmt/bzrdir.py:283
6864
msgid "upgraded to weaves:"
6865
msgstr ""
6866
6867
#: bzrlib/plugins/weave_fmt/bzrdir.py:284
6868
#, python-format
6869
msgid "%6d revisions and inventories"
6870
msgstr ""
6871
6872
#: bzrlib/plugins/weave_fmt/bzrdir.py:286
6873
#, python-format
6874
msgid "%6d revisions not present"
6875
msgstr ""
6876
6877
#: bzrlib/plugins/weave_fmt/bzrdir.py:288
6878
#, python-format
6879
msgid "%6d texts"
6880
msgstr ""
6881
6882
#: bzrlib/plugins/weave_fmt/bzrdir.py:324
6883
msgid "writing weave"
6884
msgstr ""
6885
6886
#: bzrlib/plugins/weave_fmt/bzrdir.py:328
6887
#: bzrlib/plugins/weave_fmt/bzrdir.py:330
6888
msgid "inventory"
6889
msgstr ""
6890
6891
#: bzrlib/plugins/weave_fmt/bzrdir.py:347
6892
msgid "write revision"
6893
msgstr ""
6894
6895
#: bzrlib/plugins/weave_fmt/bzrdir.py:361
6896
msgid "loading revision"
6897
msgstr ""
6898
6899
#: bzrlib/plugins/weave_fmt/bzrdir.py:366
6900
#, python-format
6901
msgid "revision {%s} not present in branch; will be converted as a ghost"
6902
msgstr ""
6903
6904
#: bzrlib/plugins/weave_fmt/bzrdir.py:506
6905
msgid "starting upgrade from format 5 to 6"
6906
msgstr ""
6907
6908
#: bzrlib/plugins/weave_fmt/bzrdir.py:516
6909
#, python-format
6910
msgid "adding prefixes to %s"
6911
msgstr ""
6912
6913
#: bzrlib/plugins/weave_fmt/bzrdir.py:556
6914
msgid "starting upgrade from format 6 to metadir"
6915
msgstr ""
6916
6917
#: bzrlib/plugins/weave_fmt/bzrdir.py:564
6918
msgid "Removing ancestry.weave"
6919
msgstr ""
6920
6921
#: bzrlib/plugins/weave_fmt/bzrdir.py:569
6922
msgid "Finding branch files"
6923
msgstr ""
6924
6925
#: bzrlib/plugins/weave_fmt/bzrdir.py:579
6926
msgid "Upgrading repository"
6927
msgstr ""
6928
6929
#: bzrlib/plugins/weave_fmt/bzrdir.py:589
6930
msgid "Upgrading branch"
6931
msgstr ""
6932
6933
#: bzrlib/plugins/weave_fmt/bzrdir.py:612
6934
msgid "No working tree."
6935
msgstr ""
6936
6937
#: bzrlib/plugins/weave_fmt/bzrdir.py:619
6938
msgid "Upgrading working tree"
6939
msgstr ""
6940
6941
#: bzrlib/plugins/weave_fmt/bzrdir.py:640
6942
#, python-format
6943
msgid "Make %s lock"
6944
msgstr ""
6945
6946
#: bzrlib/plugins/weave_fmt/bzrdir.py:651
6947
#, python-format
6948
msgid "Moving %s"
6949
msgstr ""
6950
6951
#: bzrlib/push.py:56
6952
msgid "Created new branch."
6953
msgstr ""
6954
6955
#: bzrlib/push.py:97
6956
#, python-format
6957
msgid ""
6958
"Target directory %s already contains a .bzr directory, but it is not valid."
6959
msgstr ""
6960
6961
#: bzrlib/push.py:101
6962
#, python-format
6963
msgid ""
6964
"Target directory %s already exists, but does not have a .bzr directory. "
6965
"Supply --use-existing-dir to push there anyway."
6966
msgstr ""
6967
6968
#: bzrlib/push.py:122
6969
#, python-format
6970
msgid "Too many redirections trying to make %s."
6971
msgstr ""
6972
6973
#: bzrlib/push.py:147
6974
msgid ""
6975
"These branches have diverged. See \"bzr help diverged-branches\" for more "
6976
"information."
6977
msgstr ""
6978
6979
#: bzrlib/push.py:151
6980
#, python-format
6981
msgid ""
6982
"It is not possible to losslessly push to %s. You may want to use dpush "
6983
"instead."
6984
msgstr ""
6985
6986
#: bzrlib/push.py:157
6987
#, python-format
6988
msgid ""
6989
"At %s you have a valid .bzr control directory, but not a branch or "
6990
"repository. This is an unsupported configuration. Please move the target "
6991
"directory out of the way and try again."
6992
msgstr ""
6993
6994
#: bzrlib/reconcile.py:97
6995
#, python-format
6996
msgid "Reconciling branch %s"
6997
msgstr ""
6998
6999
#: bzrlib/reconcile.py:103
7000
#, python-format
7001
msgid "Reconciling repository %s"
7002
msgstr ""
7003
7004
#: bzrlib/reconcile.py:105
7005
msgid "Reconciling repository"
7006
msgstr ""
7007
7008
#: bzrlib/reconcile.py:111
7009
#, python-format
7010
msgid "%s cannot canonicalize CHKs."
7011
msgstr ""
7012
7013
#: bzrlib/reconcile.py:119
7014
msgid "Reconcile aborted: revision index has inconsistent parents."
7015
msgstr ""
7016
7017
#: bzrlib/reconcile.py:121
7018
msgid "Run \"bzr check\" for more details."
7019
msgstr ""
7020
7021
#: bzrlib/reconcile.py:123
7022
msgid "Reconciliation complete."
7023
msgstr ""
7024
7025
#: bzrlib/reconcile.py:166
7026
msgid "Fixing last revision info {0} => {1}"
7027
msgstr ""
7028
7029
#: bzrlib/reconcile.py:173
7030
msgid "revision_history ok."
7031
msgstr ""
7032
7033
#: bzrlib/reconcile.py:234
7034
msgid "Reading inventory data"
7035
msgstr ""
7036
7037
#: bzrlib/reconcile.py:254 bzrlib/reconcile.py:384
7038
msgid "Inventory ok."
7039
msgstr ""
7040
7041
#: bzrlib/reconcile.py:256 bzrlib/reconcile.py:386
7042
msgid "Backing up inventory"
7043
msgstr ""
7044
7045
#: bzrlib/reconcile.py:258
7046
msgid "Backup inventory created."
7047
msgstr ""
7048
7049
#: bzrlib/reconcile.py:274 bzrlib/reconcile.py:405
7050
msgid "Writing weave"
7051
msgstr ""
7052
7053
#: bzrlib/reconcile.py:277 bzrlib/reconcile.py:408
7054
msgid "Inventory regenerated."
7055
msgstr ""
7056
7057
#: bzrlib/reconcile.py:371 bzrlib/reconcile.py:373 bzrlib/reconcile.py:376
7058
msgid "Reading indexes"
7059
msgstr ""
7060
7061
#: bzrlib/reconcile.py:380 bzrlib/reconcile.py:382
7062
msgid "Checking unused inventories"
7063
msgstr ""
7064
7065
#: bzrlib/reconcile.py:388
7066
msgid "Backup Inventory created"
7067
msgstr ""
7068
7069
#: bzrlib/reconcile.py:446
7070
msgid "Fixing text parents"
7071
msgstr ""
7072
7073
#: bzrlib/reconfigure.py:54
7074
msgid "{0} is now stacked on {1}\n"
7075
msgstr ""
7076
7077
#: bzrlib/reconfigure.py:69
7078
#, python-format
7079
msgid "%s is now not stacked\n"
7080
msgstr ""
7081
7082
#: bzrlib/remote.py:1228 bzrlib/repository.py:289
7083
#, python-format
7084
msgid "bzr: ERROR (ignored): %s"
7085
msgstr ""
7086
7087
#: bzrlib/remote.py:2541
7088
msgid "Copying repository content as tarball..."
7089
msgstr ""
7090
7091
#: bzrlib/rename_map.py:69
7092
msgid "Calculating hashes"
7093
msgstr ""
7094
7095
#: bzrlib/rename_map.py:107
7096
msgid "Determining hash hits"
7097
msgstr ""
7098
7099
#: bzrlib/rename_map.py:242
7100
msgid "{0} => {1}"
7101
msgstr ""
7102
7103
#: bzrlib/repository.py:1787
7104
msgid "Moving repository to repository.backup"
7105
msgstr ""
7106
7107
#: bzrlib/repository.py:1794
7108
msgid "Creating new repository"
7109
msgstr ""
7110
7111
#: bzrlib/repository.py:1799
7112
msgid "Copying content"
7113
msgstr ""
7114
7115
#: bzrlib/repository.py:1803
7116
msgid "Deleting old repository content"
7117
msgstr ""
7118
7119
#: bzrlib/repository.py:1805
7120
msgid "repository converted"
7121
msgstr ""
7122
7123
#: bzrlib/revisionspec.py:903
7124
msgid "Using {0} {1}"
7125
msgstr ""
7126
7127
#: bzrlib/send.py:58
7128
#, python-format
7129
msgid "Mail client \"%s\" does not support specifying body"
7130
msgstr ""
7131
7132
#: bzrlib/send.py:62
7133
msgid "--remember requires a branch to be specified."
7134
msgstr ""
7135
7136
#: bzrlib/send.py:77
7137
msgid "No submit branch known or specified"
7138
msgstr ""
7139
7140
#: bzrlib/send.py:80
7141
msgid "Using saved {0} location \"{1}\" to determine what changes to submit."
7142
msgstr ""
7143
7144
#: bzrlib/send.py:98
7145
#, python-format
7146
msgid "No such send format '%s'."
7147
msgstr ""
7148
7149
#: bzrlib/send.py:114
7150
msgid "bzr send takes at most two one revision identifiers"
7151
msgstr ""
7152
7153
#: bzrlib/send.py:127
7154
msgid "No revisions to submit."
7155
msgstr ""
7156
7157
#: bzrlib/send.py:139
7158
msgid ""
7159
"- not supported for merge directives that use more than one output file."
7160
msgstr ""
7161
7162
#: bzrlib/send.py:185
7163
msgid "Format 0.9 does not permit bundle with no patch"
7164
msgstr ""
7165
7166
#: bzrlib/shelf_ui.py:46
7167
#, python-format
7168
msgid "Shelve adding file \"%(path)s\"?"
7169
msgstr ""
7170
7171
#: bzrlib/shelf_ui.py:47
7172
msgid "Shelve binary changes?"
7173
msgstr ""
7174
7175
#: bzrlib/shelf_ui.py:48
7176
msgid "Shelve changing \"%s\" from %(other)s to %(this)s?"
7177
msgstr ""
7178
7179
#: bzrlib/shelf_ui.py:50
7180
#, python-format
7181
msgid "Shelve removing file \"%(path)s\"?"
7182
msgstr ""
7183
7184
#: bzrlib/shelf_ui.py:51
7185
#, python-format
7186
msgid "Shelve %d change(s)?"
7187
msgstr ""
7188
7189
#: bzrlib/shelf_ui.py:52
7190
msgid "Shelve?"
7191
msgstr ""
7192
7193
#: bzrlib/shelf_ui.py:53
7194
#, python-format
7195
msgid ""
7196
"Shelve changing target of \"%(path)s\" from \"%(other)s\" to \"%(this)s\"?"
7197
msgstr ""
7198
7199
#: bzrlib/shelf_ui.py:55
7200
#, python-format
7201
msgid "Shelve renaming \"%(other)s\" => \"%(this)s\"?"
7202
msgstr ""
7203
7204
#: bzrlib/shelf_ui.py:70
7205
#, python-format
7206
msgid "Changes shelved with id \"%d\"."
7207
msgstr ""
7208
7209
#: bzrlib/shelf_ui.py:74
7210
msgid "Selected changes destroyed."
7211
msgstr ""
7212
7213
#: bzrlib/shelf_ui.py:78
7214
msgid "Selected changes:"
7215
msgstr ""
7216
7217
#: bzrlib/shelf_ui.py:98
7218
#, python-format
7219
msgid "Delete file \"%(path)s\"?"
7220
msgstr ""
7221
7222
#: bzrlib/shelf_ui.py:99
7223
msgid "Apply binary changes?"
7224
msgstr ""
7225
7226
#: bzrlib/shelf_ui.py:100
7227
#, python-format
7228
msgid "Change \"%(path)s\" from %(this)s to %(other)s?"
7229
msgstr ""
7230
7231
#: bzrlib/shelf_ui.py:102
7232
#, python-format
7233
msgid "Add file \"%(path)s\"?"
7234
msgstr ""
7235
7236
#: bzrlib/shelf_ui.py:103
7237
#, python-format
7238
msgid "Apply %d change(s)?"
7239
msgstr ""
7240
7241
#: bzrlib/shelf_ui.py:104
7242
msgid "Apply change?"
7243
msgstr ""
7244
7245
#: bzrlib/shelf_ui.py:105
7246
#, python-format
7247
msgid "Change target of \"%(path)s\" from \"%(this)s\" to \"%(other)s\"?"
7248
msgstr ""
7249
7250
#: bzrlib/shelf_ui.py:107
7251
#, python-format
7252
msgid "Rename \"%(this)s\" => \"%(other)s\"?"
7253
msgstr ""
7254
7255
#: bzrlib/shelf_ui.py:402
7256
msgid "No changes are shelved."
7257
msgstr ""
7258
7259
#: bzrlib/shelf_ui.py:460
7260
#, python-format
7261
msgid "Using changes with id \"%d\"."
7262
msgstr ""
7263
7264
#: bzrlib/shelf_ui.py:464
7265
#, python-format
7266
msgid "Message: %s"
7267
msgstr ""
7268
7269
#: bzrlib/shelf_ui.py:476
7270
#, python-format
7271
msgid "Deleted changes with id \"%d\"."
7272
msgstr ""
7273
7274
#: bzrlib/smart/medium.py:714
7275
msgid "HPSS calls: {0} ({1} vfs) {2}"
7276
msgstr ""
7277
7278
#: bzrlib/smart/server.py:169
7279
msgid "Requested to stop gracefully"
7280
msgstr ""
7281
7282
#: bzrlib/smart/server.py:179
7283
#, python-format
7284
msgid "Waiting for %d client(s) to finish"
7285
msgstr ""
7286
7287
#: bzrlib/smart/server.py:185
7288
#, python-format
7289
msgid "Still waiting for %d client(s) to finish"
7290
msgstr ""
7291
7292
#: bzrlib/smart/server.py:219
7293
#, python-format
7294
msgid "listening socket error: %s"
7295
msgstr ""
7296
7297
#: bzrlib/smart/server.py:452
7298
#, python-format
7299
msgid "listening on port: %s"
7300
msgstr ""
7301
7302
#: bzrlib/switch.py:73
7303
msgid "Pending merges must be committed or reverted before using switch."
7304
msgstr ""
7305
7306
#: bzrlib/switch.py:100
7307
msgid ""
7308
"Cannot switch as local commits found in the checkout. Commit these to the "
7309
"bound branch or use --force to throw them away."
7310
msgstr ""
7311
7312
#: bzrlib/switch.py:105
7313
#, python-format
7314
msgid ""
7315
"Unable to connect to current master branch %(target)s: %(error)s To switch "
7316
"anyway, use --force."
7317
msgstr ""
7318
7319
#: bzrlib/switch.py:125
7320
msgid "Cannot switch a branch, only a checkout."
7321
msgstr ""
7322
7323
#: bzrlib/switch.py:163
7324
#, python-format
7325
msgid "Tree is up to date at revision %d."
7326
msgstr ""
7327
7328
#: bzrlib/switch.py:169
7329
#, python-format
7330
msgid "Updated to revision %d."
7331
msgstr ""
7332
7333
#: bzrlib/transform.py:1734 bzrlib/transform.py:1745 bzrlib/transform.py:1747
7334
msgid "Apply phase"
7335
msgstr ""
7336
7337
#: bzrlib/transform.py:1773 bzrlib/transform.py:1841
7338
msgid "removing file"
7339
msgstr ""
7340
7341
#: bzrlib/transform.py:1791 bzrlib/transform.py:1876
7342
msgid "adding file"
7343
msgstr ""
7344
7345
#: bzrlib/transform.py:2591
7346
msgid "Building tree"
7347
msgstr ""
7348
7349
#: bzrlib/transform.py:2681 bzrlib/transform.py:2708
7350
msgid "Adding file contents"
7351
msgstr ""
7352
7353
#: bzrlib/transform.py:3028
7354
msgid "Resolution pass"
7355
msgstr ""
7356
7357
#: bzrlib/transport/ftp/_gssapi.py:88
7358
#, python-format
7359
msgid "Authenticated as %s"
7360
msgstr ""
7361
7362
#: bzrlib/tree.py:634
7363
msgid "*** {0} content-filter: {1} => {2!r}"
7364
msgstr ""
7365
7366
#: bzrlib/upgrade.py:77
7367
#, python-format
7368
msgid "This is a checkout. The branch (%s) needs to be upgraded separately."
7369
msgstr ""
7370
7371
#: bzrlib/upgrade.py:100
7372
#, python-format
7373
msgid "cannot upgrade from bzrdir format %s"
7374
msgstr ""
7375
7376
#: bzrlib/upgrade.py:103
7377
#, python-format
7378
msgid "starting upgrade of %s"
7379
msgstr ""
7380
7381
#: bzrlib/upgrade.py:110
7382
msgid "finished"
7383
msgstr ""
7384
7385
#: bzrlib/upgrade.py:120
7386
msgid "Deleting backup.bzr"
7387
msgstr ""
7388
7389
#: bzrlib/upgrade.py:151
7390
msgid ""
7391
"\n"
7392
"SUMMARY: {0} upgrades attempted, {1} succeeded, {2} failed"
7393
msgstr ""
7394
7395
#: bzrlib/upgrade.py:208
7396
#, python-format
7397
msgid "Found %d dependent branches - upgrading ..."
7398
msgstr ""
7399
7400
#: bzrlib/upgrade.py:276
7401
msgid "Upgrading bzrdirs"
7402
msgstr ""
7403
7404
#: bzrlib/upgrade.py:282
7405
#, python-format
7406
msgid "Upgrading %s"
7407
msgstr ""
7408
7409
#: bzrlib/upgrade.py:283
7410
msgid "Upgrading {0} {1} ..."
7411
msgstr ""
7412
7413
#: bzrlib/upgrade.py:301
7414
msgid "Removing backup ..."
7415
msgstr ""
7416
7417
#: bzrlib/upgrade.py:305
7418
msgid "failed to clean-up {0}: {1}"
7419
msgstr ""
7420
7421
#: bzrlib/vf_repository.py:1090
7422
msgid "inventories"
7423
msgstr ""
7424
7425
#: bzrlib/vf_repository.py:1116
7426
msgid "texts"
7427
msgstr ""
7428
7429
#: bzrlib/vf_repository.py:1621 bzrlib/vf_repository.py:1630
7430
msgid "Calculating text parents"
7431
msgstr ""
7432
7433
#: bzrlib/vf_repository.py:1706
7434
msgid "Fetch texts"
7435
msgstr ""
7436
7437
#: bzrlib/vf_repository.py:2535
7438
msgid "loading text store"
7439
msgstr ""
7440
7441
#: bzrlib/vf_repository.py:2541
7442
msgid "checking text graph"
7443
msgstr ""
7444
7445
#: bzrlib/vf_repository.py:2995 bzrlib/vf_repository.py:3009
7446
#: bzrlib/vf_repository.py:3124
7447
msgid "Transferring revisions"
7448
msgstr ""
7449
7450
#: bzrlib/win32utils.py:146
7451
msgid "Failed to GetProcessMemoryInfo()"
7452
msgstr ""
7453
7454
#: bzrlib/win32utils.py:167
7455
msgid "Cannot debug memory on win32 without ctypes or win32process"
7456
msgstr ""
7457
7458
#: bzrlib/win32utils.py:172
7459
msgid "WorkingSize {0:>7}KiB\tPeakWorking {1:>7}KiB\t{2}"
7460
msgstr ""
7461
7462
#: bzrlib/win32utils.py:180
7463
#, python-format
7464
msgid "WorkingSize %8d KiB"
7465
msgstr ""
7466
7467
#: bzrlib/win32utils.py:181
7468
#, python-format
7469
msgid "PeakWorking %8d KiB"
7470
msgstr ""
7471
7472
#: bzrlib/win32utils.py:182
7473
#, python-format
7474
msgid "PagefileUsage %8d KiB"
7475
msgstr ""
7476
7477
#: bzrlib/win32utils.py:183
7478
#, python-format
7479
msgid "PeakPagefileUsage %8d KiB"
7480
msgstr ""
7481
7482
#: bzrlib/win32utils.py:185
7483
#, python-format
7484
msgid "PrivateUsage %8d KiB"
7485
msgstr ""
7486
7487
#: bzrlib/win32utils.py:186
7488
#, python-format
7489
msgid "PageFaultCount %8d"
7490
msgstr ""
7491
7492
#: bzrlib/workingtree.py:1478
7493
msgid "Rerun update after fixing the conflicts."
7494
msgstr ""
7495
7496
#: dummy/help_topics/authentication/summary.txt:1
7497
msgid "Information on configuring authentication"
7498
msgstr ""
7499
7500
#: dummy/help_topics/basic/detail.txt:1
7501
msgid ""
7502
"Bazaar 2.5b6 -- a free distributed version-control tool\n"
7503
"http://bazaar.canonical.com/"
7504
msgstr ""
7505
7506
#: dummy/help_topics/basic/detail.txt:4
7507
msgid ""
7508
"Basic commands:\n"
7509
" bzr init makes this directory a versioned branch\n"
7510
" bzr branch make a copy of another branch"
7511
msgstr ""
7512
7513
#: dummy/help_topics/basic/detail.txt:8
7514
msgid ""
7515
" bzr add make files or directories versioned\n"
7516
" bzr ignore ignore a file or pattern\n"
7517
" bzr mv move or rename a versioned file"
7518
msgstr ""
7519
7520
#: dummy/help_topics/basic/detail.txt:12
7521
msgid ""
7522
" bzr status summarize changes in working copy\n"
7523
" bzr diff show detailed diffs"
7524
msgstr ""
7525
7526
#: dummy/help_topics/basic/detail.txt:15
7527
msgid ""
7528
" bzr merge pull in changes from another branch\n"
7529
" bzr commit save some or all changes\n"
7530
" bzr send send changes via email"
7531
msgstr ""
7532
7533
#: dummy/help_topics/basic/detail.txt:19
7534
msgid ""
7535
" bzr log show history of changes\n"
7536
" bzr check validate storage"
7537
msgstr ""
7538
7539
#: dummy/help_topics/basic/detail.txt:22
7540
msgid ""
7541
" bzr help init more help on e.g. init command\n"
7542
" bzr help commands list all commands\n"
7543
" bzr help topics list all help topics\n"
7544
msgstr ""
7545
7546
#: dummy/help_topics/basic/summary.txt:1
7547
msgid "Basic commands"
7548
msgstr ""
7549
7550
#: dummy/help_topics/branches/detail.txt:1
7551
msgid "Branches"
7552
msgstr ""
7553
7554
#: dummy/help_topics/branches/detail.txt:3
7555
msgid ""
7556
"A branch consists of the state of a project, including all of its\n"
7557
"history. All branches have a repository associated (which is where the\n"
7558
"branch history is stored), but multiple branches may share the same\n"
7559
"repository (a shared repository). Branches can be copied and merged."
7560
msgstr ""
7561
7562
#: dummy/help_topics/branches/detail.txt:8
7563
msgid ""
7564
"In addition, one branch may be bound to another one. Binding to another\n"
7565
"branch indicates that commits which happen in this branch must also \n"
7566
"happen in the other branch. Bazaar ensures consistency by not allowing \n"
7567
"commits when the two branches are out of date. In order for a commit \n"
7568
"to succeed, it may be necessary to update the current branch using \n"
7569
"``bzr update``."
7570
msgstr ""
7571
7572
#: dummy/help_topics/branches/detail.txt:15
7573
#: dummy/help_topics/checkouts/detail.txt:66
7574
#: dummy/help_topics/repositories/detail.txt:36
7575
msgid "Related commands::"
7576
msgstr ""
7577
7578
#: dummy/help_topics/branches/detail.txt:17
7579
msgid ""
7580
" init Change a directory into a versioned branch.\n"
7581
" branch Create a new branch that is a copy of an existing branch.\n"
7582
" merge Perform a three-way merge.\n"
7583
" bind Bind a branch to another one.\n"
7584
msgstr ""
7585
7586
#: dummy/help_topics/branches/summary.txt:1
7587
msgid "Information on what a branch is"
7588
msgstr ""
7589
7590
#: dummy/help_topics/bugs/summary.txt:1
7591
msgid "Bug tracker settings"
7592
msgstr ""
7593
7594
#: dummy/help_topics/checkouts/detail.txt:1
7595
msgid "Checkouts"
7596
msgstr ""
7597
7598
#: dummy/help_topics/checkouts/detail.txt:3
7599
msgid ""
7600
"Checkouts are source trees that are connected to a branch, so that when\n"
7601
"you commit in the source tree, the commit goes into that branch. They\n"
7602
"allow you to use a simpler, more centralized workflow, ignoring some of\n"
7603
"Bazaar's decentralized features until you want them. Using checkouts\n"
7604
"with shared repositories is very similar to working with SVN or CVS, but\n"
7605
"doesn't have the same restrictions. And using checkouts still allows\n"
7606
"others working on the project to use whatever workflow they like."
7607
msgstr ""
7608
7609
#: dummy/help_topics/checkouts/detail.txt:11
7610
msgid ""
7611
"A checkout is created with the bzr checkout command (see \"help "
7612
"checkout\").\n"
7613
"You pass it a reference to another branch, and it will create a local copy\n"
7614
"for you that still contains a reference to the branch you created the\n"
7615
"checkout from (the master branch). Then if you make any commits they will "
7616
"be\n"
7617
"made on the other branch first. This creates an instant mirror of your work, "
7618
"or\n"
7619
"facilitates lockstep development, where each developer is working together,\n"
7620
"continuously integrating the changes of others."
7621
msgstr ""
7622
7623
#: dummy/help_topics/checkouts/detail.txt:19
7624
msgid ""
7625
"However the checkout is still a first class branch in Bazaar terms, so that\n"
7626
"you have the full history locally. As you have a first class branch you "
7627
"can\n"
7628
"also commit locally if you want, for instance due to the temporary loss af "
7629
"a\n"
7630
"network connection. Use the --local option to commit to do this. All the "
7631
"local\n"
7632
"commits will then be made on the master branch the next time you do a non-"
7633
"local\n"
7634
"commit."
7635
msgstr ""
7636
7637
#: dummy/help_topics/checkouts/detail.txt:26
7638
msgid ""
7639
"If you are using a checkout from a shared branch you will periodically want "
7640
"to\n"
7641
"pull in all the changes made by others. This is done using the \"update\"\n"
7642
"command. The changes need to be applied before any non-local commit, but\n"
7643
"Bazaar will tell you if there are any changes and suggest that you use this\n"
7644
"command when needed."
7645
msgstr ""
7646
7647
#: dummy/help_topics/checkouts/detail.txt:32
7648
msgid ""
7649
"It is also possible to create a \"lightweight\" checkout by passing the\n"
7650
"--lightweight flag to checkout. A lightweight checkout is even closer to an\n"
7651
"SVN checkout in that it is not a first class branch, it mainly consists of "
7652
"the\n"
7653
"working tree. This means that any history operations must query the master\n"
7654
"branch, which could be slow if a network connection is involved. Also, as "
7655
"you\n"
7656
"don't have a local branch, then you cannot commit locally."
7657
msgstr ""
7658
7659
#: dummy/help_topics/checkouts/detail.txt:39
7660
msgid ""
7661
"Lightweight checkouts work best when you have fast reliable access to the\n"
7662
"master branch. This means that if the master branch is on the same disk or "
7663
"LAN\n"
7664
"a lightweight checkout will be faster than a heavyweight one for any "
7665
"commands\n"
7666
"that modify the revision history (as only one copy of the branch needs to\n"
7667
"be updated). Heavyweight checkouts will generally be faster for any command\n"
7668
"that uses the history but does not change it, but if the master branch is "
7669
"on\n"
7670
"the same disk then there won't be a noticeable difference."
7671
msgstr ""
7672
7673
#: dummy/help_topics/checkouts/detail.txt:47
7674
msgid ""
7675
"Another possible use for a checkout is to use it with a treeless repository\n"
7676
"containing your branches, where you maintain only one working tree by\n"
7677
"switching the master branch that the checkout points to when you want to\n"
7678
"work on a different branch."
7679
msgstr ""
7680
7681
#: dummy/help_topics/checkouts/detail.txt:52
7682
msgid ""
7683
"Obviously to commit on a checkout you need to be able to write to the "
7684
"master\n"
7685
"branch. This means that the master branch must be accessible over a "
7686
"writeable\n"
7687
"protocol , such as sftp://, and that you have write permissions at the "
7688
"other\n"
7689
"end. Checkouts also work on the local file system, so that all that matters "
7690
"is\n"
7691
"file permissions."
7692
msgstr ""
7693
7694
#: dummy/help_topics/checkouts/detail.txt:58
7695
msgid ""
7696
"You can change the master of a checkout by using the \"switch\" command "
7697
"(see\n"
7698
"\"help switch\"). This will change the location that the commits are sent "
7699
"to.\n"
7700
"The \"bind\" command can also be used to turn a normal branch into a heavy\n"
7701
"checkout. If you would like to convert your heavy checkout into a normal\n"
7702
"branch so that every commit is local, you can use the \"unbind\" command. To "
7703
"see\n"
7704
"whether or not a branch is bound or not you can use the \"info\" command. If "
7705
"the\n"
7706
"branch is bound it will tell you the location of the bound branch."
7707
msgstr ""
7708
7709
#: dummy/help_topics/checkouts/detail.txt:68
7710
msgid ""
7711
" checkout Create a checkout. Pass --lightweight to get a lightweight\n"
7712
" checkout\n"
7713
" update Pull any changes in the master branch in to your checkout\n"
7714
" commit Make a commit that is sent to the master branch. If you have\n"
7715
" a heavy checkout then the --local option will commit to the\n"
7716
" checkout without sending the commit to the master\n"
7717
" switch Change the master branch that the commits in the checkout "
7718
"will\n"
7719
" be sent to\n"
7720
" bind Turn a standalone branch into a heavy checkout so that any\n"
7721
" commits will be sent to the master branch\n"
7722
" unbind Turn a heavy checkout into a standalone branch so that any\n"
7723
" commits are only made locally\n"
7724
" info Displays whether a branch is bound or unbound. If the branch "
7725
"is\n"
7726
" bound, then it will also display the location of the bound "
7727
"branch\n"
7728
msgstr ""
7729
7730
#: dummy/help_topics/checkouts/summary.txt:1
7731
msgid "Information on what a checkout is"
7732
msgstr ""
7733
7734
#: dummy/help_topics/commands/summary.txt:1
7735
msgid "Basic help for all commands"
7736
msgstr ""
7737
7738
#: dummy/help_topics/configuration/summary.txt:1
7739
msgid "Details on the configuration settings available"
7740
msgstr ""
7741
7742
#: dummy/help_topics/conflict-types/summary.txt:1
7743
msgid "Types of conflicts and what to do about them"
7744
msgstr ""
7745
7746
#: dummy/help_topics/content-filters/summary.txt:1
7747
msgid "Conversion of content into/from working trees"
7748
msgstr ""
7749
7750
#: dummy/help_topics/criss-cross/detail.txt:1
7751
msgid "Criss-Cross"
7752
msgstr ""
7753
7754
#: dummy/help_topics/criss-cross/detail.txt:3
7755
msgid ""
7756
"A criss-cross in the branch history can cause the default merge technique\n"
7757
"to emit more conflicts than would normally be expected."
7758
msgstr ""
7759
7760
#: dummy/help_topics/criss-cross/detail.txt:6
7761
msgid ""
7762
"In complex merge cases, ``bzr merge --lca`` or ``bzr merge --weave`` may "
7763
"give\n"
7764
"better results. You may wish to ``bzr revert`` the working tree and merge\n"
7765
"again. Alternatively, use ``bzr remerge`` on particular conflicted files."
7766
msgstr ""
7767
7768
#: dummy/help_topics/criss-cross/detail.txt:10
7769
msgid ""
7770
"Criss-crosses occur in a branch's history if two branches merge the same "
7771
"thing\n"
7772
"and then merge one another, or if two branches merge one another at the "
7773
"same\n"
7774
"time. They can be avoided by having each branch only merge from or into a\n"
7775
"designated central branch (a \"star topology\")."
7776
msgstr ""
7777
7778
#: dummy/help_topics/criss-cross/detail.txt:15
7779
msgid ""
7780
"Criss-crosses cause problems because of the way merge works. Bazaar's "
7781
"default\n"
7782
"merge is a three-way merger; in order to merge OTHER into THIS, it must\n"
7783
"find a basis for comparison, BASE. Using BASE, it can determine whether\n"
7784
"differences between THIS and OTHER are due to one side adding lines, or\n"
7785
"from another side removing lines."
7786
msgstr ""
7787
7788
#: dummy/help_topics/criss-cross/detail.txt:21
7789
msgid ""
7790
"Criss-crosses mean there is no good choice for a base. Selecting the "
7791
"recent\n"
7792
"merge points could cause one side's changes to be silently discarded.\n"
7793
"Selecting older merge points (which Bazaar does) mean that extra conflicts\n"
7794
"are emitted."
7795
msgstr ""
7796
7797
#: dummy/help_topics/criss-cross/detail.txt:26
7798
msgid ""
7799
"The ``weave`` merge type is not affected by this problem because it uses\n"
7800
"line-origin detection instead of a basis revision to determine the cause of\n"
7801
"differences.\n"
7802
msgstr ""
7803
7804
#: dummy/help_topics/criss-cross/summary.txt:1
7805
msgid "Information on criss-cross merging"
7806
msgstr ""
7807
7808
#: dummy/help_topics/current-formats/summary.txt:1
7809
msgid "Current storage formats"
7810
msgstr ""
7811
7812
#: dummy/help_topics/debug-flags/summary.txt:1
7813
msgid "Options to show or record debug information"
7814
msgstr ""
7815
7816
#: dummy/help_topics/diverged-branches/summary.txt:1
7817
msgid "How to fix diverged branches"
7818
msgstr ""
7819
7820
#: dummy/help_topics/env-variables/detail.txt:1
7821
msgid "Environment Variables"
7822
msgstr ""
7823
7824
#: dummy/help_topics/env-variables/detail.txt:3
7825
msgid ""
7826
"=================== "
7827
"===========================================================\n"
7828
"BZRPATH Path where bzr is to look for shell plugin external\n"
7829
" commands.\n"
7830
"BZR_EMAIL E-Mail address of the user. Overrides EMAIL.\n"
7831
"EMAIL E-Mail address of the user.\n"
7832
"BZR_EDITOR Editor for editing commit messages. Overrides EDITOR.\n"
7833
"EDITOR Editor for editing commit messages.\n"
7834
"BZR_PLUGIN_PATH Paths where bzr should look for plugins.\n"
7835
"BZR_DISABLE_PLUGINS Plugins that bzr should not load.\n"
7836
"BZR_PLUGINS_AT Plugins to load from a directory not in "
7837
"BZR_PLUGIN_PATH.\n"
7838
"BZR_HOME Directory holding .bazaar config dir. Overrides HOME.\n"
7839
"BZR_HOME (Win32) Directory holding bazaar config dir. Overrides APPDATA "
7840
"and\n"
7841
" HOME.\n"
7842
"BZR_REMOTE_PATH Full name of remote 'bzr' command (for bzr+ssh:// "
7843
"URLs).\n"
7844
"BZR_SSH Path to SSH client, or one of paramiko, openssh, "
7845
"sshcorp,\n"
7846
" plink or lsh.\n"
7847
"BZR_LOG Location of .bzr.log (use '/dev/null' to suppress log).\n"
7848
"BZR_LOG (Win32) Location of .bzr.log (use 'NUL' to suppress log).\n"
7849
"BZR_COLUMNS Override implicit terminal width.\n"
7850
"BZR_CONCURRENCY Number of processes that can be run concurrently "
7851
"(selftest)\n"
7852
"BZR_PROGRESS_BAR Override the progress display. Values are 'none' or "
7853
"'text'.\n"
7854
"BZR_PDB Control whether to launch a debugger on error.\n"
7855
"BZR_SIGQUIT_PDB Control whether SIGQUIT behaves normally or invokes a\n"
7856
" breakin debugger.\n"
7857
"BZR_TEXTUI_INPUT Force console input mode for prompts to line-based "
7858
"(instead\n"
7859
" of char-based).\n"
7860
"=================== "
7861
"===========================================================\n"
7862
msgstr ""
7863
7864
#: dummy/help_topics/env-variables/summary.txt:1
7865
msgid "Environment variable names and values"
7866
msgstr ""
7867
7868
#: dummy/help_topics/eol/summary.txt:1
7869
msgid "Information on end-of-line handling"
7870
msgstr ""
7871
7872
#: dummy/help_topics/files/detail.txt:1
7873
msgid "Files"
7874
msgstr ""
7875
7876
#: dummy/help_topics/files/detail.txt:3
7877
msgid ""
7878
":On Unix: ~/.bazaar/bazaar.conf\n"
7879
":On Windows: C:\\\\Documents and Settings\\\\username\\\\Application Data\\\\"
7880
"bazaar\\\\2.0\\\\bazaar.conf"
7881
msgstr ""
7882
7883
#: dummy/help_topics/files/detail.txt:6
7884
msgid ""
7885
"Contains the user's default configuration. The section ``[DEFAULT]`` is\n"
7886
"used to define general configuration that will be applied everywhere.\n"
7887
"The section ``[ALIASES]`` can be used to create command aliases for\n"
7888
"commonly used options."
7889
msgstr ""
7890
7891
#: dummy/help_topics/files/detail.txt:11
7892
msgid "A typical config file might look something like::"
7893
msgstr ""
7894
7895
#: dummy/help_topics/files/detail.txt:13
7896
msgid ""
7897
" [DEFAULT]\n"
7898
" email=John Doe <jdoe@isp.com>"
7899
msgstr ""
7900
7901
#: dummy/help_topics/files/detail.txt:16
7902
msgid ""
7903
" [ALIASES]\n"
7904
" commit = commit --strict\n"
7905
" log10 = log --short -r -10..-1\n"
7906
msgstr ""
7907
7908
#: dummy/help_topics/files/summary.txt:1
7909
msgid "Information on configuration and log files"
7910
msgstr ""
7911
7912
#: dummy/help_topics/formats/detail.txt:1
7913
msgid "Storage Formats"
7914
msgstr ""
7915
7916
#: dummy/help_topics/formats/detail.txt:3
7917
msgid ""
7918
"To ensure that older clients do not access data incorrectly,\n"
7919
"Bazaar's policy is to introduce a new storage format whenever\n"
7920
"new features requiring new metadata are added. New storage\n"
7921
"formats may also be introduced to improve performance and\n"
7922
"scalability."
7923
msgstr ""
7924
7925
#: dummy/help_topics/formats/detail.txt:9
7926
msgid ""
7927
"The newest format, 2a, is highly recommended. If your\n"
7928
"project is not using 2a, then you should suggest to the\n"
7929
"project owner to upgrade."
7930
msgstr ""
7931
7932
#: dummy/help_topics/formats/detail.txt:13
7933
msgid ""
7934
"\n"
7935
".. note::"
7936
msgstr ""
7937
7938
#: dummy/help_topics/formats/detail.txt:16
7939
msgid ""
7940
" Some of the older formats have two variants:\n"
7941
" a plain one and a rich-root one. The latter include an additional\n"
7942
" field about the root of the tree. There is no performance cost\n"
7943
" for using a rich-root format but you cannot easily merge changes\n"
7944
" from a rich-root format into a plain format. As a consequence,\n"
7945
" moving a project to a rich-root format takes some co-ordination\n"
7946
" in that all contributors need to upgrade their repositories\n"
7947
" around the same time. 2a and all future formats will be\n"
7948
" implicitly rich-root."
7949
msgstr ""
7950
7951
#: dummy/help_topics/formats/detail.txt:26
7952
msgid ""
7953
"See :doc:`current-formats-help` for the complete list of\n"
7954
"currently supported formats. See :doc:`other-formats-help` for\n"
7955
"descriptions of any available experimental and deprecated formats.\n"
7956
msgstr ""
7957
7958
#: dummy/help_topics/formats/summary.txt:1
7959
msgid "Information on choosing a storage format"
7960
msgstr ""
7961
7962
#: dummy/help_topics/global-options/detail.txt:1
7963
msgid "Global Options"
7964
msgstr ""
7965
7966
#: dummy/help_topics/global-options/detail.txt:3
7967
msgid ""
7968
"These options may be used with any command, and may appear in front of any\n"
7969
"command. (e.g. ``bzr --profile help``)."
7970
msgstr ""
7971
7972
#: dummy/help_topics/global-options/detail.txt:6
7973
msgid ""
7974
"--version Print the version number. Must be supplied before the "
7975
"command.\n"
7976
"--no-aliases Do not process command aliases when running this command.\n"
7977
"--builtin Use the built-in version of a command, not the plugin "
7978
"version.\n"
7979
" This does not suppress other plugin effects.\n"
7980
"--no-plugins Do not process any plugins.\n"
7981
"--no-l10n Do not translate messages.\n"
7982
"--concurrency Number of processes that can be run concurrently (selftest)."
7983
msgstr ""
7984
7985
#: dummy/help_topics/global-options/detail.txt:14
7986
msgid ""
7987
"--profile Profile execution using the hotshot profiler.\n"
7988
"--lsprof Profile execution using the lsprof profiler.\n"
7989
"--lsprof-file Profile execution using the lsprof profiler, and write the\n"
7990
" results to a specified file. If the filename ends with "
7991
"\".txt\",\n"
7992
" text format will be used. If the filename either starts "
7993
"with\n"
7994
" \"callgrind.out\" or end with \".callgrind\", the output will "
7995
"be\n"
7996
" formatted for use with KCacheGrind. Otherwise, the output\n"
7997
" will be a pickle.\n"
7998
"--coverage Generate line coverage report in the specified directory."
7999
msgstr ""
8000
8001
#: dummy/help_topics/global-options/detail.txt:24
8002
msgid ""
8003
"-Oname=value Override the ``name`` config option setting it to ``value`` "
8004
"for\n"
8005
" the duration of the command. This can be used multiple times "
8006
"if\n"
8007
" several options need to be overridden."
8008
msgstr ""
8009
8010
#: dummy/help_topics/global-options/detail.txt:28
8011
msgid ""
8012
"See http://doc.bazaar.canonical.com/developers/profiling.html for more\n"
8013
"information on profiling."
8014
msgstr ""
8015
8016
#: dummy/help_topics/global-options/detail.txt:31
8017
msgid ""
8018
"A number of debug flags are also available to assist troubleshooting and\n"
8019
"development. See :doc:`debug-flags-help`.\n"
8020
msgstr ""
8021
8022
#: dummy/help_topics/global-options/summary.txt:1
8023
msgid "Options that control how Bazaar runs"
8024
msgstr ""
8025
8026
#: dummy/help_topics/hidden-commands/summary.txt:1
8027
msgid "All hidden commands"
8028
msgstr ""
8029
8030
#: dummy/help_topics/hooks/summary.txt:1
8031
msgid "Points at which custom processing can be added"
8032
msgstr ""
8033
8034
#: dummy/help_topics/launchpad/detail.txt:1
8035
msgid "Integration with Launchpad.net"
8036
msgstr ""
8037
8038
#: dummy/help_topics/launchpad/detail.txt:3
8039
msgid ""
8040
"Launchpad.net provides free Bazaar branch hosting with integrated bug and\n"
8041
"specification tracking."
8042
msgstr ""
8043
8044
#: dummy/help_topics/launchpad/detail.txt:6
8045
msgid ""
8046
"The bzr client (through the plugin called 'launchpad') has special\n"
8047
"features to communicate with Launchpad:"
8048
msgstr ""
8049
8050
#: dummy/help_topics/launchpad/detail.txt:9
8051
msgid ""
8052
" * The launchpad-login command tells Bazaar your Launchpad user name. "
8053
"This\n"
8054
" is then used by the 'lp:' transport to download your branches using\n"
8055
" bzr+ssh://."
8056
msgstr ""
8057
8058
#: dummy/help_topics/launchpad/detail.txt:13
8059
msgid ""
8060
" * The 'lp:' transport uses Launchpad as a directory service: for "
8061
"example\n"
8062
" 'lp:bzr' and 'lp:python' refer to the main branches of the relevant\n"
8063
" projects and may be branched, logged, etc. You can also use the 'lp:'\n"
8064
" transport to refer to specific branches, e.g. lp:~bzr/bzr/trunk."
8065
msgstr ""
8066
8067
#: dummy/help_topics/launchpad/detail.txt:18
8068
msgid ""
8069
" * The 'lp:' bug tracker alias can expand launchpad bug numbers to their\n"
8070
" URLs for use with 'bzr commit --fixes', e.g. 'bzr commit --fixes "
8071
"lp:12345'\n"
8072
" will record a revision property that marks that revision as fixing\n"
8073
" Launchpad bug 12345. When you push that branch to Launchpad it will\n"
8074
" automatically be linked to the bug report."
8075
msgstr ""
8076
8077
#: dummy/help_topics/launchpad/detail.txt:24
8078
msgid ""
8079
" * The register-branch command tells Launchpad about the url of a\n"
8080
" public branch. Launchpad will then mirror the branch, display\n"
8081
" its contents and allow it to be attached to bugs and other\n"
8082
" objects."
8083
msgstr ""
8084
8085
#: dummy/help_topics/launchpad/detail.txt:29
8086
msgid "For more information see http://help.launchpad.net/\n"
8087
msgstr ""
8088
8089
#: dummy/help_topics/launchpad/summary.txt:1
8090
msgid "Using Bazaar with Launchpad.net"
8091
msgstr ""
8092
8093
#: dummy/help_topics/location-alias/summary.txt:1
8094
msgid "Aliases for remembered locations"
8095
msgstr ""
8096
8097
#: dummy/help_topics/log-formats/summary.txt:1
8098
msgid "Details on the logging formats available"
8099
msgstr ""
8100
8101
#: dummy/help_topics/other-formats/summary.txt:1
8102
msgid "Experimental and deprecated storage formats"
8103
msgstr ""
8104
8105
#: dummy/help_topics/patterns/summary.txt:1
8106
msgid "Information on the pattern syntax"
8107
msgstr ""
8108
8109
#: dummy/help_topics/repositories/detail.txt:1
8110
msgid "Repositories"
8111
msgstr ""
8112
8113
#: dummy/help_topics/repositories/detail.txt:3
8114
msgid ""
8115
"Repositories in Bazaar are where committed information is stored. There is\n"
8116
"a repository associated with every branch."
8117
msgstr ""
8118
8119
#: dummy/help_topics/repositories/detail.txt:6
8120
msgid ""
8121
"Repositories are a form of database. Bzr will usually maintain this for\n"
8122
"good performance automatically, but in some situations (e.g. when doing\n"
8123
"very many commits in a short time period) you may want to ask bzr to\n"
8124
"optimise the database indices. This can be done by the 'bzr pack' command."
8125
msgstr ""
8126
8127
#: dummy/help_topics/repositories/detail.txt:11
8128
msgid ""
8129
"By default just running 'bzr init' will create a repository within the new\n"
8130
"branch but it is possible to create a shared repository which allows "
8131
"multiple\n"
8132
"branches to share their information in the same location. When a new branch "
8133
"is\n"
8134
"created it will first look to see if there is a containing shared repository "
8135
"it\n"
8136
"can use."
8137
msgstr ""
8138
8139
#: dummy/help_topics/repositories/detail.txt:17
8140
msgid ""
8141
"When two branches of the same project share a repository, there is\n"
8142
"generally a large space saving. For some operations (e.g. branching\n"
8143
"within the repository) this translates in to a large time saving."
8144
msgstr ""
8145
8146
#: dummy/help_topics/repositories/detail.txt:21
8147
msgid ""
8148
"To create a shared repository use the init-repository command (or the alias\n"
8149
"init-repo). This command takes the location of the repository to create. "
8150
"This\n"
8151
"means that 'bzr init-repository repo' will create a directory named 'repo',\n"
8152
"which contains a shared repository. Any new branches that are created in "
8153
"this\n"
8154
"directory will then use it for storage."
8155
msgstr ""
8156
8157
#: dummy/help_topics/repositories/detail.txt:27
8158
msgid ""
8159
"It is a good idea to create a repository whenever you might create more\n"
8160
"than one branch of a project. This is true for both working areas where you\n"
8161
"are doing the development, and any server areas that you use for hosting\n"
8162
"projects. In the latter case, it is common to want branches without working\n"
8163
"trees. Since the files in the branch will not be edited directly there is "
8164
"no\n"
8165
"need to use up disk space for a working tree. To create a repository in "
8166
"which\n"
8167
"the branches will not have working trees pass the '--no-trees' option to\n"
8168
"'init-repository'."
8169
msgstr ""
8170
8171
#: dummy/help_topics/repositories/detail.txt:38
8172
msgid ""
8173
" init-repository Create a shared repository. Use --no-trees to create "
8174
"one\n"
8175
" in which new branches won't get a working tree.\n"
8176
msgstr ""
8177
8178
#: dummy/help_topics/repositories/summary.txt:1
8179
msgid "Basic information on shared repositories."
8180
msgstr ""
8181
8182
#: dummy/help_topics/revisionspec/summary.txt:1
8183
msgid "Explain how to use --revision"
8184
msgstr ""
8185
8186
#: dummy/help_topics/rules/summary.txt:1
8187
msgid "Information on defining rule-based preferences"
8188
msgstr ""
8189
8190
#: dummy/help_topics/standalone-trees/detail.txt:1
8191
msgid "Standalone Trees"
8192
msgstr ""
8193
8194
#: dummy/help_topics/standalone-trees/detail.txt:3
8195
msgid ""
8196
"A standalone tree is a working tree with an associated repository. It\n"
8197
"is an independently usable branch, with no dependencies on any other.\n"
8198
"Creating a standalone tree (via bzr init) is the quickest way to put\n"
8199
"an existing project under version control."
8200
msgstr ""
8201
8202
#: dummy/help_topics/standalone-trees/detail.txt:8
8203
msgid "Related Commands::"
8204
msgstr ""
8205
8206
#: dummy/help_topics/standalone-trees/detail.txt:10
8207
msgid " init Make a directory into a versioned branch.\n"
8208
msgstr ""
8209
8210
#: dummy/help_topics/standalone-trees/summary.txt:1
8211
msgid "Information on what a standalone tree is"
8212
msgstr ""
8213
8214
#: dummy/help_topics/standard-options/detail.txt:1
8215
msgid "Standard Options"
8216
msgstr ""
8217
8218
#: dummy/help_topics/standard-options/detail.txt:3
8219
msgid "Standard options are legal for all commands."
8220
msgstr ""
8221
8222
#: dummy/help_topics/standard-options/detail.txt:5
8223
msgid ""
8224
"--help, -h Show help message.\n"
8225
"--verbose, -v Display more information.\n"
8226
"--quiet, -q Only display errors and warnings."
8227
msgstr ""
8228
8229
#: dummy/help_topics/standard-options/detail.txt:9
8230
msgid "Unlike global options, standard options can be used in aliases.\n"
8231
msgstr ""
8232
8233
#: dummy/help_topics/standard-options/summary.txt:1
8234
msgid "Options that can be used with any command"
8235
msgstr ""
8236
8237
#: dummy/help_topics/status-flags/detail.txt:1
8238
msgid "Status Flags"
8239
msgstr ""
8240
8241
#: dummy/help_topics/status-flags/detail.txt:3
8242
msgid ""
8243
"Status flags are used to summarise changes to the working tree in a concise\n"
8244
"manner. They are in the form::"
8245
msgstr ""
8246
8247
#: dummy/help_topics/status-flags/detail.txt:6
8248
msgid " xxx <filename>"
8249
msgstr ""
8250
8251
#: dummy/help_topics/status-flags/detail.txt:8
8252
msgid "where the columns' meanings are as follows."
8253
msgstr ""
8254
8255
#: dummy/help_topics/status-flags/detail.txt:10
8256
msgid "Column 1 - versioning/renames::"
8257
msgstr ""
8258
8259
#: dummy/help_topics/status-flags/detail.txt:12
8260
msgid ""
8261
" + File versioned\n"
8262
" - File unversioned\n"
8263
" R File renamed\n"
8264
" ? File unknown\n"
8265
" X File nonexistent (and unknown to bzr)\n"
8266
" C File has conflicts\n"
8267
" P Entry for a pending merge (not a file)"
8268
msgstr ""
8269
8270
#: dummy/help_topics/status-flags/detail.txt:20
8271
msgid "Column 2 - contents::"
8272
msgstr ""
8273
8274
#: dummy/help_topics/status-flags/detail.txt:22
8275
msgid ""
8276
" N File created\n"
8277
" D File deleted\n"
8278
" K File kind changed\n"
8279
" M File modified"
8280
msgstr ""
8281
" N File created\n"
8282
" D File deleted\n"
8283
" K File type changed\n"
8284
" M File modified"
8285
8286
#: dummy/help_topics/status-flags/detail.txt:27
8287
msgid "Column 3 - execute::"
8288
msgstr ""
8289
8290
#: dummy/help_topics/status-flags/detail.txt:29
8291
msgid " * The execute bit was changed\n"
8292
msgstr ""
8293
8294
#: dummy/help_topics/status-flags/summary.txt:1
8295
msgid "Help on status flags"
8296
msgstr ""
8297
8298
#: dummy/help_topics/sync-for-reconfigure/detail.txt:1
8299
msgid "Branches Out of Sync"
8300
msgstr ""
8301
8302
#: dummy/help_topics/sync-for-reconfigure/detail.txt:3
8303
msgid ""
8304
"When reconfiguring a checkout, tree or branch into a lightweight checkout,\n"
8305
"a local branch must be destroyed. (For checkouts, this is the local branch\n"
8306
"that serves primarily as a cache.) If the branch-to-be-destroyed does not\n"
8307
"have the same last revision as the new reference branch for the lightweight\n"
8308
"checkout, data could be lost, so Bazaar refuses."
8309
msgstr ""
8310
8311
#: dummy/help_topics/sync-for-reconfigure/detail.txt:9
8312
msgid "How you deal with this depends on *why* the branches are out of sync."
8313
msgstr ""
8314
8315
#: dummy/help_topics/sync-for-reconfigure/detail.txt:11
8316
msgid ""
8317
"If you have a checkout and have done local commits, you can get back in "
8318
"sync\n"
8319
"by running \"bzr update\" (and possibly \"bzr commit\")."
8320
msgstr ""
8321
8322
#: dummy/help_topics/sync-for-reconfigure/detail.txt:14
8323
msgid ""
8324
"If you have a branch and the remote branch is out-of-date, you can push\n"
8325
"the local changes using \"bzr push\". If the local branch is out of date, "
8326
"you\n"
8327
"can do \"bzr pull\". If both branches have had changes, you can merge, "
8328
"commit\n"
8329
"and then push your changes. If you decide that some of the changes aren't\n"
8330
"useful, you can \"push --overwrite\" or \"pull --overwrite\" instead.\n"
8331
msgstr ""
8332
8333
#: dummy/help_topics/sync-for-reconfigure/summary.txt:1
8334
msgid "Steps to resolve \"out-of-sync\" when reconfiguring"
8335
msgstr ""
8336
8337
#: dummy/help_topics/topics/summary.txt:1
8338
msgid "Topics list"
8339
msgstr ""
8340
8341
#: dummy/help_topics/url-special-chars/summary.txt:1
8342
msgid "Special character handling in URLs"
8343
msgstr ""
8344
8345
#: dummy/help_topics/urlspec/summary.txt:1
8346
msgid "Supported transport protocols"
8347
msgstr ""
8348
8349
#: dummy/help_topics/working-trees/detail.txt:1
8350
msgid "Working Trees"
8351
msgstr ""
8352
8353
#: dummy/help_topics/working-trees/detail.txt:3
8354
msgid ""
8355
"A working tree is the contents of a branch placed on disk so that you can\n"
8356
"see the files and edit them. The working tree is where you make changes to "
8357
"a\n"
8358
"branch, and when you commit the current state of the working tree is the\n"
8359
"snapshot that is recorded in the commit."
8360
msgstr ""
8361
8362
#: dummy/help_topics/working-trees/detail.txt:8
8363
msgid ""
8364
"When you push a branch to a remote system, a working tree will not be\n"
8365
"created. If one is already present the files will not be updated. The\n"
8366
"branch information will be updated and the working tree will be marked\n"
8367
"as out-of-date. Updating a working tree remotely is difficult, as there\n"
8368
"may be uncommitted changes or the update may cause content conflicts that "
8369
"are\n"
8370
"difficult to deal with remotely."
8371
msgstr ""
8372
8373
#: dummy/help_topics/working-trees/detail.txt:15
8374
msgid ""
8375
"If you have a branch with no working tree you can use the 'checkout' "
8376
"command\n"
8377
"to create a working tree. If you run 'bzr checkout .' from the branch it "
8378
"will\n"
8379
"create the working tree. If the branch is updated remotely, you can update "
8380
"the\n"
8381
"working tree by running 'bzr update' in that directory."
8382
msgstr ""
8383
8384
#: dummy/help_topics/working-trees/detail.txt:20
8385
msgid ""
8386
"If you have a branch with a working tree that you do not want the 'remove-"
8387
"tree'\n"
8388
"command will remove the tree if it is safe. This can be done to avoid the\n"
8389
"warning about the remote working tree not being updated when pushing to the\n"
8390
"branch. It can also be useful when working with a '--no-trees' repository\n"
8391
"(see 'bzr help repositories')."
8392
msgstr ""
8393
8394
#: dummy/help_topics/working-trees/detail.txt:26
8395
msgid ""
8396
"If you want to have a working tree on a remote machine that you push to you\n"
8397
"can either run 'bzr update' in the remote branch after each push, or use "
8398
"some\n"
8399
"other method to update the tree during the push. There is an 'rspush' "
8400
"plugin\n"
8401
"that will update the working tree using rsync as well as doing a push. "
8402
"There\n"
8403
"is also a 'push-and-update' plugin that automates running 'bzr update' via "
8404
"SSH\n"
8405
"after each push."
8406
msgstr ""
8407
8408
#: dummy/help_topics/working-trees/detail.txt:33
8409
msgid "Useful commands::"
8410
msgstr ""
8411
8412
#: dummy/help_topics/working-trees/detail.txt:35
8413
msgid ""
8414
" checkout Create a working tree when a branch does not have one.\n"
8415
" remove-tree Removes the working tree from a branch when it is safe to do "
8416
"so.\n"
8417
" update When a working tree is out of sync with its associated "
8418
"branch\n"
8419
" this will update the tree to match the branch.\n"
8420
msgstr ""
8421
8422
#: dummy/help_topics/working-trees/summary.txt:1
8423
msgid "Information on working trees"
8424
msgstr ""
8425
8426
#: en/help_topics/authentication.txt:1
8427
msgid ""
8428
"Authentication Settings\n"
8429
"======================="
8430
msgstr ""
8431
8432
#: en/help_topics/authentication.txt:4
8433
msgid ""
8434
"\n"
8435
"Intent\n"
8436
"------"
8437
msgstr ""
8438
8439
#: en/help_topics/authentication.txt:8
8440
msgid ""
8441
"Many different authentication policies can be described in the\n"
8442
"``authentication.conf`` file but a particular user should need only a few\n"
8443
"definitions to cover his needs without having to specify a user and a "
8444
"password\n"
8445
"for every branch he uses."
8446
msgstr ""
8447
8448
#: en/help_topics/authentication.txt:13
8449
msgid ""
8450
"The definitions found in this file are used to find the credentials to use "
8451
"for\n"
8452
"a given url. The same credentials can generally be used for as many branches "
8453
"as\n"
8454
"possible by grouping their declaration around the remote servers that need\n"
8455
"them. It's even possible to declare credentials that will be used by "
8456
"different\n"
8457
"servers."
8458
msgstr ""
8459
8460
#: en/help_topics/authentication.txt:19
8461
msgid ""
8462
"The intent is to make this file as small as possible to minimize maintenance."
8463
msgstr ""
8464
8465
#: en/help_topics/authentication.txt:21
8466
msgid ""
8467
"Once the relevant credentials are declared in this file you may use branch "
8468
"urls\n"
8469
"without embedding passwords (security hazard) or even users (enabling "
8470
"sharing\n"
8471
"of your urls with others)."
8472
msgstr ""
8473
8474
#: en/help_topics/authentication.txt:25
8475
msgid "Instead of using::"
8476
msgstr ""
8477
8478
#: en/help_topics/authentication.txt:27
8479
msgid " bzr branch ftp://joe:secret@host.com/path/to/my/branch"
8480
msgstr ""
8481
8482
#: en/help_topics/authentication.txt:29
8483
msgid "you simply use::"
8484
msgstr ""
8485
8486
#: en/help_topics/authentication.txt:31
8487
msgid " bzr branch ftp://host.com/path/to/my/branch"
8488
msgstr ""
8489
8490
#: en/help_topics/authentication.txt:33
8491
msgid ""
8492
"provided you have created the following ``authentication.conf`` file::"
8493
msgstr ""
8494
8495
#: en/help_topics/authentication.txt:35
8496
msgid ""
8497
" [myprojects]\n"
8498
" scheme=ftp\n"
8499
" host=host.com\n"
8500
" user=joe\n"
8501
" password=secret\n"
8502
" "
8503
msgstr ""
8504
8505
#: en/help_topics/authentication.txt:42
8506
msgid ""
8507
"Authentication definitions\n"
8508
"--------------------------"
8509
msgstr ""
8510
8511
#: en/help_topics/authentication.txt:45
8512
msgid ""
8513
"There are two kinds of authentication used by the various schemes supported "
8514
"by\n"
8515
"bzr:"
8516
msgstr ""
8517
"There are two kinds of authentication used by the various schemes supported "
8518
"by\n"
8519
"bzr:"
8520
8521
#: en/help_topics/authentication.txt:48
8522
msgid "1. user and password"
8523
msgstr ""
8524
8525
#: en/help_topics/authentication.txt:50
8526
msgid ""
8527
"``FTP`` needs a (``user``, ``password``) to authenticate against a ``host``\n"
8528
"``SFTP`` can use either a password or a host key to authenticate. However,\n"
8529
"ssh agents are a better, more secure solution. So we have chosen to not "
8530
"provide\n"
8531
"our own less secure method."
8532
msgstr ""
8533
8534
#: en/help_topics/authentication.txt:55
8535
msgid "2. user, realm and password"
8536
msgstr ""
8537
8538
#: en/help_topics/authentication.txt:57
8539
msgid ""
8540
"``HTTP`` and ``HTTPS`` needs a (``user, realm, password``) to authenticate\n"
8541
"against a host. But, by using ``.htaccess`` files, for example, it is "
8542
"possible\n"
8543
"to define several (``user, realm, password``) for a given ``host``. So what "
8544
"is\n"
8545
"really needed is (``user``, ``password``, ``host``, ``path``). The ``realm`` "
8546
"is\n"
8547
"not taken into account in the definitions, but will displayed if bzr "
8548
"prompts\n"
8549
"you for a password."
8550
msgstr ""
8551
8552
#: en/help_topics/authentication.txt:64
8553
msgid ""
8554
"``HTTP proxy`` can be handled as ``HTTP`` (or ``HTTPS``) by explicitly\n"
8555
"specifying the appropriate port."
8556
msgstr ""
8557
8558
#: en/help_topics/authentication.txt:67
8559
msgid ""
8560
"To take all schemes into account, the password will be deduced from a set "
8561
"of\n"
8562
"authentication definitions (``scheme``, ``host``, ``port``, ``path``, "
8563
"``user``,\n"
8564
"``password``)."
8565
msgstr ""
8566
8567
#: en/help_topics/authentication.txt:71
8568
msgid ""
8569
" * ``scheme``: can be empty (meaning the rest of the definition can be "
8570
"used\n"
8571
" for any scheme), ``SFTP`` and ``bzr+ssh`` should not be used here, "
8572
"``ssh``\n"
8573
" should be used instead since this is the real scheme regarding\n"
8574
" authentication,"
8575
msgstr ""
8576
8577
#: en/help_topics/authentication.txt:76
8578
msgid " * ``host``: can be empty (to act as a default for any host),"
8579
msgstr ""
8580
8581
#: en/help_topics/authentication.txt:78
8582
msgid ""
8583
" * ``port`` can be empty (useful when an host provides several servers for "
8584
"the\n"
8585
" same scheme), only numerical values are allowed, this should be used "
8586
"only\n"
8587
" when the server uses a port different than the scheme standard port,"
8588
msgstr ""
8589
8590
#: en/help_topics/authentication.txt:82
8591
msgid " * ``path``: can be empty (FTP or SFTP will never user it),"
8592
msgstr ""
8593
8594
#: en/help_topics/authentication.txt:84
8595
msgid ""
8596
" * ``user``: can be empty (``bzr`` will defaults to python's\n"
8597
" ``getpass.get_user()``),"
8598
msgstr ""
8599
8600
#: en/help_topics/authentication.txt:87
8601
msgid ""
8602
" * ``password``: can be empty if you prefer to always be prompted for your\n"
8603
" password."
8604
msgstr ""
8605
8606
#: en/help_topics/authentication.txt:90
8607
msgid ""
8608
"Multiple definitions can be provided and, for a given URL, bzr will select "
8609
"a\n"
8610
"(``user`` [, ``password``]) based on the following rules :"
8611
msgstr ""
8612
8613
#: en/help_topics/authentication.txt:93
8614
msgid " 1. the first match wins,"
8615
msgstr ""
8616
8617
#: en/help_topics/authentication.txt:95
8618
msgid " 2. empty fields match everything,"
8619
msgstr ""
8620
8621
#: en/help_topics/authentication.txt:97
8622
msgid ""
8623
" 3. ``scheme`` matches even if decorators are used in the requested URL,"
8624
msgstr ""
8625
8626
#: en/help_topics/authentication.txt:99
8627
msgid ""
8628
" 4. ``host`` matches exactly or act as a domain if it starts with '.'\n"
8629
" (``project.bzr.sf.net`` will match ``.bzr.sf.net`` but "
8630
"``projectbzr.sf.net``\n"
8631
" will not match ``bzr.sf.net``)."
8632
msgstr ""
8633
8634
#: en/help_topics/authentication.txt:103
8635
msgid ""
8636
" 5. ``port`` matches if included in the requested URL (exact matches only)"
8637
msgstr ""
8638
8639
#: en/help_topics/authentication.txt:105
8640
msgid ""
8641
" 6. ``path`` matches if included in the requested URL (and by rule #2 "
8642
"above,\n"
8643
" empty paths will match any provided path)."
8644
msgstr ""
8645
8646
#: en/help_topics/authentication.txt:110
8647
msgid ""
8648
"File format\n"
8649
"-----------"
8650
msgstr ""
8651
8652
#: en/help_topics/authentication.txt:113
8653
msgid ""
8654
"The general rules for :doc:`configuration files <configuration-help>`\n"
8655
"apply except for the variable policies."
8656
msgstr ""
8657
8658
#: en/help_topics/authentication.txt:116
8659
msgid "Each section describes an authentication definition."
8660
msgstr ""
8661
8662
#: en/help_topics/authentication.txt:118
8663
msgid ""
8664
"The section name is an arbitrary string, only the ``DEFAULT`` value is "
8665
"reserved\n"
8666
"and should appear as the *last* section."
8667
msgstr ""
8668
8669
#: en/help_topics/authentication.txt:121
8670
msgid "Each section should define:"
8671
msgstr ""
8672
8673
#: en/help_topics/authentication.txt:123
8674
msgid "* ``user``: the login to be used,"
8675
msgstr ""
8676
8677
#: en/help_topics/authentication.txt:125
8678
msgid "Each section could define:"
8679
msgstr ""
8680
8681
#: en/help_topics/authentication.txt:127
8682
msgid "* ``host``: the remote server,"
8683
msgstr ""
8684
8685
#: en/help_topics/authentication.txt:129
8686
msgid "* ``port``: the port the server is listening,"
8687
msgstr ""
8688
8689
#: en/help_topics/authentication.txt:131
8690
msgid "* ``path``: the branch location,"
8691
msgstr ""
8692
8693
#: en/help_topics/authentication.txt:133
8694
msgid "* ``password``: the password."
8695
msgstr ""
8696
8697
#: en/help_topics/authentication.txt:135
8698
msgid ""
8699
"\n"
8700
"Examples\n"
8701
"--------"
8702
msgstr ""
8703
8704
#: en/help_topics/authentication.txt:139
8705
msgid ""
8706
"\n"
8707
"Personal projects hosted outside\n"
8708
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
8709
msgstr ""
8710
8711
#: en/help_topics/authentication.txt:143
8712
msgid ""
8713
"All connections are done with the same ``user`` (the remote one for which "
8714
"the\n"
8715
"default bzr one is not appropriate) and the password is always prompted "
8716
"with\n"
8717
"some exceptions::"
8718
msgstr ""
8719
8720
#: en/help_topics/authentication.txt:147
8721
msgid ""
8722
" # Pet projects on hobby.net\n"
8723
" [hobby]\n"
8724
" host=r.hobby.net\n"
8725
" user=jim\n"
8726
" password=obvious1234\n"
8727
" \n"
8728
" # Home server\n"
8729
" [home]\n"
8730
" scheme=https\n"
8731
" host=home.net\n"
8732
" user=joe\n"
8733
" password=1essobV10us\n"
8734
" \n"
8735
" [DEFAULT]\n"
8736
" # Our local user is barbaz, on all remote sites we're known as "
8737
"foobar\n"
8738
" user=foobar"
8739
msgstr ""
8740
8741
#: en/help_topics/authentication.txt:164
8742
msgid ""
8743
"\n"
8744
"Source hosting provider\n"
8745
"~~~~~~~~~~~~~~~~~~~~~~~"
8746
msgstr ""
8747
8748
#: en/help_topics/authentication.txt:168
8749
msgid "In the shp.net (fictitious) domain, each project has its own site::"
8750
msgstr ""
8751
8752
#: en/help_topics/authentication.txt:170
8753
msgid ""
8754
" [shpnet domain]\n"
8755
" # we use sftp, but ssh is the scheme used for authentication\n"
8756
" scheme=ssh\n"
8757
" # The leading '.' ensures that 'shp.net' alone doesn't match\n"
8758
" host=.shp.net\n"
8759
" user=joe\n"
8760
" # bzr don't support supplying a password for sftp,\n"
8761
" # consider using an ssh agent if you don't want to supply\n"
8762
" # a password interactively. (pageant, ssh-agent, etc)"
8763
msgstr ""
8764
8765
#: en/help_topics/authentication.txt:180
8766
msgid ""
8767
"HTTPS, SFTP servers and their proxy\n"
8768
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
8769
msgstr ""
8770
8771
#: en/help_topics/authentication.txt:183
8772
msgid ""
8773
"At company.com, the server hosting release and integration branches is "
8774
"behind a\n"
8775
"proxy, and the two branches use different authentication policies::"
8776
msgstr ""
8777
8778
#: en/help_topics/authentication.txt:186
8779
msgid ""
8780
" [reference code]\n"
8781
" scheme=https\n"
8782
" host=dev.company.com\n"
8783
" path=/dev\n"
8784
" user=user1\n"
8785
" password=pass1"
8786
msgstr ""
8787
8788
#: en/help_topics/authentication.txt:193
8789
msgid ""
8790
" # development branches on dev server\n"
8791
" [dev]\n"
8792
" scheme=ssh # bzr+ssh and sftp are available here\n"
8793
" host=dev.company.com\n"
8794
" path=/dev/integration\n"
8795
" user=user2\n"
8796
" \n"
8797
" # proxy\n"
8798
" [proxy]\n"
8799
" scheme=http\n"
8800
" host=proxy.company.com\n"
8801
" port=3128\n"
8802
" user=proxyuser1\n"
8803
" password=proxypass1"
8804
msgstr ""
8805
8806
#: en/help_topics/authentication.txt:208
8807
msgid ""
8808
"\n"
8809
"Planned enhancements\n"
8810
"--------------------"
8811
msgstr ""
8812
8813
#: en/help_topics/authentication.txt:212
8814
msgid ""
8815
"The following are not yet implemented but planned as parts of a work in\n"
8816
"progress:"
8817
msgstr ""
8818
8819
#: en/help_topics/authentication.txt:215
8820
msgid "* add a ``password_encoding`` field allowing:"
8821
msgstr ""
8822
8823
#: en/help_topics/authentication.txt:217
8824
msgid ""
8825
" - storing the passwords in various obfuscating encodings (base64 for one),"
8826
msgstr ""
8827
8828
#: en/help_topics/authentication.txt:219
8829
msgid " - delegate password storage to plugins (.netrc for example)."
8830
msgstr ""
8831
8832
#: en/help_topics/authentication.txt:221
8833
msgid ""
8834
"* update the credentials when the user is prompted for user or password,"
8835
msgstr ""
8836
8837
#: en/help_topics/authentication.txt:223
8838
msgid "* add a ``verify_certificates`` field for ``HTTPS``."
8839
msgstr ""
8840
8841
#: en/help_topics/authentication.txt:225
8842
msgid ""
8843
"The ``password_encoding`` and ``verify_certificates`` fields are recognized "
8844
"but\n"
8845
"ignored in the actual implementation.\n"
8846
msgstr ""
8847
8848
#: en/help_topics/bugs.txt:1
8849
msgid "Bug Tracker Settings"
8850
msgstr ""
8851
8852
#: en/help_topics/bugs.txt:3
8853
msgid ""
8854
"When making a commit, metadata about bugs fixed by that change can be\n"
8855
"recorded by using the ``--fixes`` option. For each bug marked as fixed, an\n"
8856
"entry is included in the 'bugs' revision property stating '<url> <status>'.\n"
8857
"(The only ``status`` value currently supported is ``fixed.``)"
8858
msgstr ""
8859
8860
#: en/help_topics/bugs.txt:8
8861
msgid ""
8862
"The ``--fixes`` option allows you to specify a bug tracker and a bug "
8863
"identifier\n"
8864
"rather than a full URL. This looks like::"
8865
msgstr ""
8866
8867
#: en/help_topics/bugs.txt:11
8868
msgid " bzr commit --fixes <tracker>:<id>"
8869
msgstr ""
8870
8871
#: en/help_topics/bugs.txt:13 en/help_topics/configuration.txt:398
8872
msgid "or::"
8873
msgstr ""
8874
8875
#: en/help_topics/bugs.txt:15
8876
msgid " bzr commit --fixes <id>"
8877
msgstr ""
8878
8879
#: en/help_topics/bugs.txt:17
8880
msgid ""
8881
"where \"<tracker>\" is an identifier for the bug tracker, and \"<id>\" is "
8882
"the\n"
8883
"identifier for that bug within the bugtracker, usually the bug number.\n"
8884
"If \"<tracker>\" is not specified the ``bugtracker`` set in the branch\n"
8885
"or global configuration is used."
8886
msgstr ""
8887
8888
#: en/help_topics/bugs.txt:22
8889
msgid ""
8890
"Bazaar knows about a few bug trackers that have many users. If\n"
8891
"you use one of these bug trackers then there is no setup required to\n"
8892
"use this feature, you just need to know the tracker identifier to use.\n"
8893
"These are the bugtrackers that are built in:"
8894
msgstr ""
8895
8896
#: en/help_topics/bugs.txt:27
8897
msgid ""
8898
" ============================ ============ ============\n"
8899
" URL Abbreviation Example\n"
8900
" ============================ ============ ============\n"
8901
" https://bugs.launchpad.net/ lp lp:12345\n"
8902
" http://bugs.debian.org/ deb deb:12345\n"
8903
" http://bugzilla.gnome.org/ gnome gnome:12345\n"
8904
" ============================ ============ ============"
8905
msgstr ""
8906
8907
#: en/help_topics/bugs.txt:35
8908
msgid ""
8909
"For the bug trackers not listed above configuration is required.\n"
8910
"Support for generating the URLs for any project using Bugzilla or Trac\n"
8911
"is built in, along with a template mechanism for other bugtrackers with\n"
8912
"simple URL schemes. If your bug tracker can't be described by one\n"
8913
"of the schemes described below then you can write a plugin to support\n"
8914
"it."
8915
msgstr ""
8916
8917
#: en/help_topics/bugs.txt:42
8918
msgid ""
8919
"If you use Bugzilla or Trac, then you only need to set a configuration\n"
8920
"variable which contains the base URL of the bug tracker. These options\n"
8921
"can go into ``bazaar.conf``, ``branch.conf`` or into a branch-specific\n"
8922
"configuration section in ``locations.conf``. You can set up these values\n"
8923
"for each of the projects you work on."
8924
msgstr ""
8925
8926
#: en/help_topics/bugs.txt:48
8927
msgid ""
8928
"Note: As you provide a short name for each tracker, you can specify one or\n"
8929
"more bugs in one or more trackers at commit time if you wish."
8930
msgstr ""
8931
8932
#: en/help_topics/bugs.txt:51
8933
msgid ""
8934
"Launchpad\n"
8935
"---------"
8936
msgstr ""
8937
8938
#: en/help_topics/bugs.txt:54
8939
msgid ""
8940
"Use ``bzr commit --fixes lp:2`` to record that this commit fixes bug 2."
8941
msgstr ""
8942
8943
#: en/help_topics/bugs.txt:56
8944
msgid ""
8945
"bugzilla_<tracker>_url\n"
8946
"----------------------"
8947
msgstr ""
8948
8949
#: en/help_topics/bugs.txt:59
8950
msgid ""
8951
"If present, the location of the Bugzilla bug tracker referred to by\n"
8952
"<tracker>. This option can then be used together with ``bzr commit\n"
8953
"--fixes`` to mark bugs in that tracker as being fixed by that commit. For\n"
8954
"example::"
8955
msgstr ""
8956
8957
#: en/help_topics/bugs.txt:64
8958
msgid " bugzilla_squid_url = http://bugs.squid-cache.org"
8959
msgstr ""
8960
8961
#: en/help_topics/bugs.txt:66
8962
msgid ""
8963
"would allow ``bzr commit --fixes squid:1234`` to mark Squid's bug 1234 as\n"
8964
"fixed."
8965
msgstr ""
8966
8967
#: en/help_topics/bugs.txt:69
8968
msgid ""
8969
"trac_<tracker>_url\n"
8970
"------------------"
8971
msgstr ""
8972
8973
#: en/help_topics/bugs.txt:72
8974
msgid ""
8975
"If present, the location of the Trac instance referred to by\n"
8976
"<tracker>. This option can then be used together with ``bzr commit\n"
8977
"--fixes`` to mark bugs in that tracker as being fixed by that commit. For\n"
8978
"example::"
8979
msgstr ""
8980
8981
#: en/help_topics/bugs.txt:77
8982
msgid " trac_twisted_url = http://www.twistedmatrix.com/trac"
8983
msgstr ""
8984
8985
#: en/help_topics/bugs.txt:79
8986
msgid ""
8987
"would allow ``bzr commit --fixes twisted:1234`` to mark Twisted's bug 1234 "
8988
"as\n"
8989
"fixed."
8990
msgstr ""
8991
8992
#: en/help_topics/bugs.txt:82
8993
msgid ""
8994
"bugtracker_<tracker>_url\n"
8995
"------------------------"
8996
msgstr ""
8997
8998
#: en/help_topics/bugs.txt:85
8999
msgid ""
9000
"If present, the location of a generic bug tracker instance referred to by\n"
9001
"<tracker>. The location must contain an ``{id}`` placeholder,\n"
9002
"which will be replaced by a specific bug ID. This option can then be used\n"
9003
"together with ``bzr commit --fixes`` to mark bugs in that tracker as being\n"
9004
"fixed by that commit. For example::"
9005
msgstr ""
9006
9007
#: en/help_topics/bugs.txt:91
9008
msgid " bugtracker_python_url = http://bugs.python.org/issue{id}"
9009
msgstr ""
9010
9011
#: en/help_topics/bugs.txt:93
9012
msgid ""
9013
"would allow ``bzr commit --fixes python:1234`` to mark bug 1234 in Python's\n"
9014
"Roundup bug tracker as fixed, or::"
9015
msgstr ""
9016
9017
#: en/help_topics/bugs.txt:96
9018
msgid ""
9019
" bugtracker_cpan_url = http://rt.cpan.org/Public/Bug/Display.html?id={id}"
9020
msgstr ""
9021
9022
#: en/help_topics/bugs.txt:98
9023
msgid ""
9024
"would allow ``bzr commit --fixes cpan:1234`` to mark bug 1234 in CPAN's\n"
9025
"RT bug tracker as fixed, or::"
9026
msgstr ""
9027
9028
#: en/help_topics/bugs.txt:101
9029
msgid " bugtracker_hudson_url = http://issues.hudson-ci.org/browse/{id}"
9030
msgstr ""
9031
9032
#: en/help_topics/bugs.txt:103
9033
msgid ""
9034
"would allow ``bzr commit --fixes hudson:HUDSON-1234`` to mark bug HUDSON-"
9035
"1234\n"
9036
"in Hudson's JIRA bug tracker as fixed.\n"
9037
msgstr ""
9038
9039
#: en/help_topics/commands.txt:1
9040
msgid ""
9041
"add Add specified files or directories.\n"
9042
"alias Set/unset and display aliases.\n"
9043
"annotate Show the origin of each line in a file.\n"
9044
"bash-completion Generate a shell function for bash command line "
9045
"completion.\n"
9046
" [bash_completion]\n"
9047
"bind Convert the current branch into a checkout of the "
9048
"supplied\n"
9049
" branch.\n"
9050
"branch Create a new branch that is a copy of an existing branch.\n"
9051
"branches List the branches available at the current location.\n"
9052
"break-lock Break a dead lock.\n"
9053
"cat Write the contents of a file as of a given revision to\n"
9054
" standard output.\n"
9055
"check Validate working tree structure, branch consistency and\n"
9056
" repository history.\n"
9057
"checkout Create a new checkout of an existing branch.\n"
9058
"clean-tree Remove unwanted files from working tree.\n"
9059
"commit Commit changes into a new revision.\n"
9060
"config Display, set or remove a configuration option.\n"
9061
"conflicts List files with conflicts.\n"
9062
"deleted List files deleted in the working tree.\n"
9063
"diff Show differences in the working tree, between revisions "
9064
"or\n"
9065
" branches.\n"
9066
"dpush Push into a different VCS without any custom bzr "
9067
"metadata.\n"
9068
"export Export current or past revision to a destination directory "
9069
"or\n"
9070
" archive.\n"
9071
"help Show help on a command or other topic.\n"
9072
"ignore Ignore specified files or patterns.\n"
9073
"ignored List ignored files and the patterns that matched them.\n"
9074
"info Show information about a working tree, branch or "
9075
"repository.\n"
9076
"init Make a directory into a versioned branch.\n"
9077
"init-repository Create a shared repository for branches to share storage\n"
9078
" space.\n"
9079
"join Combine a tree into its containing tree.\n"
9080
"launchpad-login Show or set the Launchpad user ID. [launchpad]\n"
9081
"launchpad-mirror Ask Launchpad to mirror a branch now. [launchpad]\n"
9082
"launchpad-open Open a Launchpad branch page in your web browser. "
9083
"[launchpad]\n"
9084
"log Show historical log for a branch or subset of a branch.\n"
9085
"lp-find-proposal Find the proposal to merge this revision. [launchpad]\n"
9086
"lp-propose-merge Propose merging a branch on Launchpad. [launchpad]\n"
9087
"ls List files in a tree.\n"
9088
"merge Perform a three-way merge.\n"
9089
"missing Show unmerged/unpulled revisions between two branches.\n"
9090
"mkdir Create a new versioned directory.\n"
9091
"mv Move or rename a file.\n"
9092
"nick Print or set the branch nickname.\n"
9093
"pack Compress the data within a repository.\n"
9094
"plugins List the installed plugins.\n"
9095
"pull Turn this branch into a mirror of another branch.\n"
9096
"push Update a mirror of this branch.\n"
9097
"reconcile Reconcile bzr metadata in a branch.\n"
9098
"reconfigure Reconfigure the type of a bzr directory.\n"
9099
"register-branch Register a branch with launchpad.net. [launchpad]\n"
9100
"remerge Redo a merge.\n"
9101
"remove Remove files or directories.\n"
9102
"remove-branch Remove a branch.\n"
9103
"remove-tree Remove the working tree from a given branch/checkout.\n"
9104
"renames Show list of renamed files.\n"
9105
"resolve Mark a conflict as resolved.\n"
9106
"revert Revert files to a previous revision.\n"
9107
"revno Show current revision number.\n"
9108
"root Show the tree root directory.\n"
9109
"send Mail or create a merge-directive for submitting changes.\n"
9110
"serve Run the bzr server.\n"
9111
"shelve Temporarily set aside some changes from the current tree.\n"
9112
"sign-my-commits Sign all commits by a given committer.\n"
9113
"split Split a subdirectory of a tree into a separate tree.\n"
9114
"status Display status summary.\n"
9115
"switch Set the branch of a checkout and update.\n"
9116
"tag Create, remove or modify a tag naming a revision.\n"
9117
"tags List tags.\n"
9118
"testament Show testament (signing-form) of a revision.\n"
9119
"unbind Convert the current checkout into a regular branch.\n"
9120
"uncommit Remove the last committed revision.\n"
9121
"unshelve Restore shelved changes.\n"
9122
"update Update a working tree to a new revision.\n"
9123
"upgrade Upgrade a repository, branch or working tree to a newer\n"
9124
" format.\n"
9125
"verify-signatures Verify all commit signatures.\n"
9126
"version Show version of bzr.\n"
9127
"version-info Show version information about this tree.\n"
9128
"view Manage filtered views.\n"
9129
"whoami Show or set bzr user id.\n"
9130
msgstr ""
9131
9132
#: en/help_topics/configuration.txt:1
9133
msgid ""
9134
"Configuration Settings\n"
9135
"======================="
9136
msgstr ""
9137
9138
#: en/help_topics/configuration.txt:4
9139
msgid ""
9140
"Environment settings\n"
9141
"---------------------"
9142
msgstr ""
9143
9144
#: en/help_topics/configuration.txt:7
9145
msgid ""
9146
"While most configuration is handled by configuration files, some options\n"
9147
"which may be semi-permanent can also be controlled through the environment."
9148
msgstr ""
9149
9150
#: en/help_topics/configuration.txt:10
9151
msgid ""
9152
"BZR_EMAIL\n"
9153
"~~~~~~~~~"
9154
msgstr ""
9155
9156
#: en/help_topics/configuration.txt:13
9157
msgid "Override the email id used by Bazaar. Typical format::"
9158
msgstr ""
9159
9160
#: en/help_topics/configuration.txt:15
9161
msgid " \"John Doe <jdoe@example.com>\""
9162
msgstr ""
9163
9164
#: en/help_topics/configuration.txt:17
9165
msgid "See also the ``email`` configuration option."
9166
msgstr ""
9167
9168
#: en/help_topics/configuration.txt:19
9169
msgid ""
9170
"BZR_PROGRESS_BAR\n"
9171
"~~~~~~~~~~~~~~~~"
9172
msgstr ""
9173
9174
#: en/help_topics/configuration.txt:22
9175
msgid ""
9176
"Override the progress display. Possible values are \"none\" or \"text\". "
9177
"If\n"
9178
"the value is \"none\" then no progress bar is displayed. The value \"text\" "
9179
"draws\n"
9180
"the ordinary command line progress bar."
9181
msgstr ""
9182
9183
#: en/help_topics/configuration.txt:26
9184
msgid ""
9185
"BZR_SIGQUIT_PDB\n"
9186
"~~~~~~~~~~~~~~~"
9187
msgstr ""
9188
9189
#: en/help_topics/configuration.txt:29
9190
msgid ""
9191
"Control whether SIGQUIT behaves normally or invokes a breakin debugger."
9192
msgstr ""
9193
9194
#: en/help_topics/configuration.txt:31
9195
msgid ""
9196
"* 0 = Standard SIGQUIT behavior (normally, exit with a core dump)\n"
9197
"* 1 = Invoke breakin debugger (default)"
9198
msgstr ""
9199
9200
#: en/help_topics/configuration.txt:34
9201
msgid ""
9202
"BZR_HOME\n"
9203
"~~~~~~~~"
9204
msgstr ""
9205
9206
#: en/help_topics/configuration.txt:37
9207
msgid "Override the home directory used by Bazaar."
9208
msgstr ""
9209
9210
#: en/help_topics/configuration.txt:39
9211
msgid ""
9212
"BZR_SSH\n"
9213
"~~~~~~~"
9214
msgstr ""
9215
9216
#: en/help_topics/configuration.txt:42
9217
msgid "Select a different SSH implementation."
9218
msgstr ""
9219
9220
#: en/help_topics/configuration.txt:44
9221
msgid ""
9222
"BZR_PDB\n"
9223
"~~~~~~~"
9224
msgstr ""
9225
9226
#: en/help_topics/configuration.txt:47
9227
msgid "Control whether to launch a debugger on error."
9228
msgstr ""
9229
9230
#: en/help_topics/configuration.txt:49
9231
msgid ""
9232
"* 0 = Standard behavior\n"
9233
"* 1 = Launch debugger"
9234
msgstr ""
9235
9236
#: en/help_topics/configuration.txt:52
9237
msgid ""
9238
"BZR_REMOTE_PATH\n"
9239
"~~~~~~~~~~~~~~~"
9240
msgstr ""
9241
9242
#: en/help_topics/configuration.txt:55
9243
msgid "Path to the Bazaar executable to use when using the bzr+ssh protocol."
9244
msgstr ""
9245
9246
#: en/help_topics/configuration.txt:57
9247
msgid "See also the ``bzr_remote_path`` configuration option."
9248
msgstr ""
9249
9250
#: en/help_topics/configuration.txt:59
9251
msgid ""
9252
"BZR_EDITOR\n"
9253
"~~~~~~~~~~"
9254
msgstr ""
9255
9256
#: en/help_topics/configuration.txt:62
9257
msgid "Path to the editor Bazaar should use for commit messages, etc."
9258
msgstr ""
9259
9260
#: en/help_topics/configuration.txt:64
9261
msgid ""
9262
"BZR_LOG\n"
9263
"~~~~~~~"
9264
msgstr ""
9265
9266
#: en/help_topics/configuration.txt:67
9267
msgid ""
9268
"Location of the Bazaar log file. You can check the current location by\n"
9269
"running ``bzr version``."
9270
msgstr ""
9271
9272
#: en/help_topics/configuration.txt:70
9273
msgid ""
9274
"The log file contains debug information that is useful for diagnosing or\n"
9275
"reporting problems with Bazaar."
9276
msgstr ""
9277
9278
#: en/help_topics/configuration.txt:73
9279
msgid ""
9280
"Setting this to ``NUL`` on Windows or ``/dev/null`` on other platforms\n"
9281
"will disable logging."
9282
msgstr ""
9283
9284
#: en/help_topics/configuration.txt:76
9285
msgid ""
9286
"\n"
9287
"BZR_PLUGIN_PATH\n"
9288
"~~~~~~~~~~~~~~~"
9289
msgstr ""
9290
9291
#: en/help_topics/configuration.txt:80
9292
msgid ""
9293
"The path to the plugins directory that Bazaar should use.\n"
9294
"If not set, Bazaar will search for plugins in:"
9295
msgstr ""
9296
9297
#: en/help_topics/configuration.txt:83
9298
msgid ""
9299
"* the user specific plugin directory (containing the ``user`` plugins),"
9300
msgstr ""
9301
9302
#: en/help_topics/configuration.txt:85
9303
msgid "* the bzrlib directory (containing the ``core`` plugins),"
9304
msgstr ""
9305
9306
#: en/help_topics/configuration.txt:87
9307
msgid ""
9308
"* the site specific plugin directory if applicable (containing\n"
9309
" the ``site`` plugins)."
9310
msgstr ""
9311
9312
#: en/help_topics/configuration.txt:90
9313
msgid ""
9314
"If ``BZR_PLUGIN_PATH`` is set in any fashion, it will change the\n"
9315
"the way the plugin are searched. "
9316
msgstr ""
9317
9318
#: en/help_topics/configuration.txt:93
9319
msgid ""
9320
"As for the ``PATH`` variables, if multiple directories are\n"
9321
"specified in ``BZR_PLUGIN_PATH`` they should be separated by the\n"
9322
"platform specific appropriate character (':' on Unix,\n"
9323
"';' on windows)"
9324
msgstr ""
9325
9326
#: en/help_topics/configuration.txt:98
9327
msgid ""
9328
"By default if ``BZR_PLUGIN_PATH`` is set, it replaces searching\n"
9329
"in ``user``. However it will continue to search in ``core`` and\n"
9330
"``site`` unless they are explicitly removed."
9331
msgstr ""
9332
9333
#: en/help_topics/configuration.txt:102
9334
msgid ""
9335
"If you need to change the order or remove one of these\n"
9336
"directories, you should use special values:"
9337
msgstr ""
9338
9339
#: en/help_topics/configuration.txt:105
9340
msgid ""
9341
"* ``-user``, ``-core``, ``-site`` will remove the corresponding\n"
9342
" path from the default values,"
9343
msgstr ""
9344
9345
#: en/help_topics/configuration.txt:108
9346
msgid ""
9347
"* ``+user``, ``+core``, ``+site`` will add the corresponding path\n"
9348
" before the remaining default values (and also remove it from\n"
9349
" the default values)."
9350
msgstr ""
9351
9352
#: en/help_topics/configuration.txt:112
9353
msgid ""
9354
"Note that the special values 'user', 'core' and 'site' should be\n"
9355
"used literally, they will be substituted by the corresponding,\n"
9356
"platform specific, values."
9357
msgstr ""
9358
9359
#: en/help_topics/configuration.txt:116
9360
msgid ""
9361
"The examples below use ':' as the separator, windows users\n"
9362
"should use ';'."
9363
msgstr ""
9364
9365
#: en/help_topics/configuration.txt:119
9366
msgid "Overriding the default user plugin directory::"
9367
msgstr ""
9368
9369
#: en/help_topics/configuration.txt:121
9370
msgid " BZR_PLUGIN_PATH='/path/to/my/other/plugins'"
9371
msgstr ""
9372
9373
#: en/help_topics/configuration.txt:123
9374
msgid "Disabling the site directory while retaining the user directory::"
9375
msgstr ""
9376
9377
#: en/help_topics/configuration.txt:125
9378
msgid " BZR_PLUGIN_PATH='-site:+user'"
9379
msgstr ""
9380
9381
#: en/help_topics/configuration.txt:127
9382
msgid "Disabling all plugins (better achieved with --no-plugins)::"
9383
msgstr ""
9384
9385
#: en/help_topics/configuration.txt:129
9386
msgid " BZR_PLUGIN_PATH='-user:-core:-site'"
9387
msgstr ""
9388
9389
#: en/help_topics/configuration.txt:131
9390
msgid "Overriding the default site plugin directory::"
9391
msgstr ""
9392
9393
#: en/help_topics/configuration.txt:133
9394
msgid " BZR_PLUGIN_PATH='/path/to/my/site/plugins:-site':+user"
9395
msgstr ""
9396
9397
#: en/help_topics/configuration.txt:135
9398
msgid ""
9399
"BZR_DISABLE_PLUGINS\n"
9400
"~~~~~~~~~~~~~~~~~~~"
9401
msgstr ""
9402
9403
#: en/help_topics/configuration.txt:138
9404
msgid ""
9405
"Under special circumstances (mostly when trying to diagnose a\n"
9406
"bug), it's better to disable a plugin (or several) rather than\n"
9407
"uninstalling them completely. Such plugins can be specified in\n"
9408
"the ``BZR_DISABLE_PLUGINS`` environment variable."
9409
msgstr ""
9410
9411
#: en/help_topics/configuration.txt:143
9412
msgid ""
9413
"In that case, ``bzr`` will stop loading the specified plugins and\n"
9414
"will raise an import error if they are explicitly imported (by\n"
9415
"another plugin that depends on them for example)."
9416
msgstr ""
9417
9418
#: en/help_topics/configuration.txt:147
9419
msgid "Disabling ``myplugin`` and ``yourplugin`` is achieved by::"
9420
msgstr ""
9421
9422
#: en/help_topics/configuration.txt:149
9423
msgid " BZR_DISABLE_PLUGINS='myplugin:yourplugin'"
9424
msgstr ""
9425
9426
#: en/help_topics/configuration.txt:151
9427
msgid ""
9428
"BZR_PLUGINS_AT\n"
9429
"~~~~~~~~~~~~~~"
9430
msgstr ""
9431
9432
#: en/help_topics/configuration.txt:154
9433
msgid ""
9434
"When adding a new feature or working on a bug in a plugin,\n"
9435
"developers often need to use a specific version of a given\n"
9436
"plugin. Since python requires that the directory containing the\n"
9437
"code is named like the plugin itself this make it impossible to\n"
9438
"use arbitrary directory names (using a two-level directory scheme\n"
9439
"is inconvenient). ``BZR_PLUGINS_AT`` allows such directories even\n"
9440
"if they don't appear in ``BZR_PLUGIN_PATH`` ."
9441
msgstr ""
9442
9443
#: en/help_topics/configuration.txt:162
9444
msgid ""
9445
"Plugins specified in this environment variable takes precedence\n"
9446
"over the ones in ``BZR_PLUGIN_PATH``."
9447
msgstr ""
9448
9449
#: en/help_topics/configuration.txt:165
9450
msgid ""
9451
"The variable specified a list of ``plugin_name@plugin path``,\n"
9452
"``plugin_name`` being the name of the plugin as it appears in\n"
9453
"python module paths, ``plugin_path`` being the path to the\n"
9454
"directory containing the plugin code itself\n"
9455
"(i.e. ``plugins/myplugin`` not ``plugins``). Use ':' as the list\n"
9456
"separator, use ';' on windows."
9457
msgstr ""
9458
9459
#: en/help_topics/configuration.txt:172
9460
msgid ""
9461
"Example:\n"
9462
"~~~~~~~~"
9463
msgstr ""
9464
9465
#: en/help_topics/configuration.txt:175
9466
msgid ""
9467
"Using a specific version of ``myplugin``:\n"
9468
"``BZR_PLUGINS_AT='myplugin@/home/me/bugfixes/123456-myplugin``"
9469
msgstr ""
9470
9471
#: en/help_topics/configuration.txt:178
9472
msgid ""
9473
"BZRPATH\n"
9474
"~~~~~~~"
9475
msgstr ""
9476
9477
#: en/help_topics/configuration.txt:181
9478
msgid "The path where Bazaar should look for shell plugin external commands."
9479
msgstr ""
9480
9481
#: en/help_topics/configuration.txt:183
9482
msgid ""
9483
"\n"
9484
"http_proxy, https_proxy\n"
9485
"~~~~~~~~~~~~~~~~~~~~~~~"
9486
msgstr ""
9487
9488
#: en/help_topics/configuration.txt:187
9489
msgid "Specifies the network proxy for outgoing connections, for example::"
9490
msgstr ""
9491
9492
#: en/help_topics/configuration.txt:189
9493
msgid ""
9494
" http_proxy=http://proxy.example.com:3128/ \n"
9495
" https_proxy=http://proxy.example.com:3128/"
9496
msgstr ""
9497
9498
#: en/help_topics/configuration.txt:192
9499
msgid ""
9500
"\n"
9501
"Configuration files\n"
9502
"-------------------"
9503
msgstr ""
9504
9505
#: en/help_topics/configuration.txt:196
9506
msgid ""
9507
"Location\n"
9508
"~~~~~~~~"
9509
msgstr ""
9510
9511
#: en/help_topics/configuration.txt:199
9512
msgid ""
9513
"Configuration files are located in ``$HOME/.bazaar`` on Unix and\n"
9514
"``C:\\Documents and Settings\\<username>\\Application Data\\Bazaar\\2.0`` "
9515
"on\n"
9516
"Windows. (You can check the location for your system by using\n"
9517
"``bzr version``.)"
9518
msgstr ""
9519
9520
#: en/help_topics/configuration.txt:204
9521
msgid "There are three primary configuration files in this location:"
9522
msgstr ""
9523
9524
#: en/help_topics/configuration.txt:206
9525
msgid "* ``bazaar.conf`` describes default configuration options,"
9526
msgstr ""
9527
9528
#: en/help_topics/configuration.txt:208
9529
msgid ""
9530
"* ``locations.conf`` describes configuration information for\n"
9531
" specific branch locations,"
9532
msgstr ""
9533
9534
#: en/help_topics/configuration.txt:211
9535
msgid ""
9536
"* ``authentication.conf`` describes credential information for\n"
9537
" remote servers."
9538
msgstr ""
9539
9540
#: en/help_topics/configuration.txt:214
9541
msgid ""
9542
"Each branch can also contain a configuration file that sets values specific\n"
9543
"to that branch. This file is found at ``.bzr/branch/branch.conf`` within "
9544
"the\n"
9545
"branch. This file is visible to all users of a branch, if you wish to "
9546
"override\n"
9547
"one of the values for a branch with a setting that is specific to you then "
9548
"you\n"
9549
"can do so in ``locations.conf``."
9550
msgstr ""
9551
9552
#: en/help_topics/configuration.txt:220
9553
msgid ""
9554
"General format\n"
9555
"~~~~~~~~~~~~~~"
9556
msgstr ""
9557
9558
#: en/help_topics/configuration.txt:223
9559
msgid ""
9560
"An ini file has three types of contructs: section headers, section\n"
9561
"options and comments."
9562
msgstr ""
9563
9564
#: en/help_topics/configuration.txt:226
9565
msgid ""
9566
"Comments\n"
9567
"^^^^^^^^"
9568
msgstr ""
9569
9570
#: en/help_topics/configuration.txt:229
9571
msgid ""
9572
"A comment is any line that starts with a \"#\" (sometimes called a \"hash\n"
9573
"mark\", \"pound sign\" or \"number sign\"). Comment lines are ignored by\n"
9574
"Bazaar when parsing ini files."
9575
msgstr ""
9576
9577
#: en/help_topics/configuration.txt:233
9578
msgid ""
9579
"Section headers\n"
9580
"^^^^^^^^^^^^^^^"
9581
msgstr ""
9582
9583
#: en/help_topics/configuration.txt:236
9584
msgid ""
9585
"A section header is a word enclosed in brackets that starts at the begining\n"
9586
"of a line. A typical section header looks like this::"
9587
msgstr ""
9588
9589
#: en/help_topics/configuration.txt:239
9590
msgid " [DEFAULT]"
9591
msgstr ""
9592
9593
#: en/help_topics/configuration.txt:241
9594
msgid ""
9595
"The only valid section headers for bazaar.conf currently are [DEFAULT] and\n"
9596
"[ALIASES]. Section headers are case sensitive. The default section provides "
9597
"for\n"
9598
"setting options which can be overridden with the branch config file."
9599
msgstr ""
9600
9601
#: en/help_topics/configuration.txt:245
9602
msgid ""
9603
"For ``locations.conf``, the options from the section with the\n"
9604
"longest matching section header are used to the exclusion of other\n"
9605
"potentially valid section headers. A section header uses the path for\n"
9606
"the branch as the section header. Some examples include::"
9607
msgstr ""
9608
9609
#: en/help_topics/configuration.txt:250
9610
msgid ""
9611
" [http://mybranches.isp.com/~jdoe/branchdir]\n"
9612
" [/home/jdoe/branches/]"
9613
msgstr ""
9614
9615
#: en/help_topics/configuration.txt:253
9616
msgid ""
9617
"\n"
9618
"Section options\n"
9619
"^^^^^^^^^^^^^^^"
9620
msgstr ""
9621
9622
#: en/help_topics/configuration.txt:257
9623
msgid ""
9624
"A section option resides within a section. A section option contains an\n"
9625
"option name, an equals sign and a value. For example::"
9626
msgstr ""
9627
9628
#: en/help_topics/configuration.txt:260
9629
msgid ""
9630
" email = John Doe <jdoe@isp.com>\n"
9631
" gpg_signing_key = Amy Pond <amy@example.com>"
9632
msgstr ""
9633
9634
#: en/help_topics/configuration.txt:263
9635
msgid ""
9636
"A option can reference other options by enclosing them in curly brackets::"
9637
msgstr ""
9638
9639
#: en/help_topics/configuration.txt:265
9640
msgid ""
9641
" my_branch_name = feature_x\n"
9642
" my_server = bzr+ssh://example.com\n"
9643
" push_location = {my_server}/project/{my_branch_name}"
9644
msgstr ""
9645
9646
#: en/help_topics/configuration.txt:269
9647
msgid ""
9648
"Option policies\n"
9649
"^^^^^^^^^^^^^^^"
9650
msgstr ""
9651
9652
#: en/help_topics/configuration.txt:272
9653
msgid ""
9654
"Options defined in a section affect the named directory or URL plus\n"
9655
"any locations they contain. Policies can be used to change how an\n"
9656
"option value is interpreted for contained locations. Currently\n"
9657
"there are three policies available:"
9658
msgstr ""
9659
9660
#: en/help_topics/configuration.txt:277
9661
msgid ""
9662
" none:\n"
9663
" the value is interpreted the same for contained locations. This is\n"
9664
" the default behaviour.\n"
9665
" norecurse:\n"
9666
" the value is only used for the exact location specified by the\n"
9667
" section name.\n"
9668
" appendpath:\n"
9669
" for contained locations, any additional path components are\n"
9670
" appended to the value."
9671
msgstr ""
9672
9673
#: en/help_topics/configuration.txt:287
9674
msgid ""
9675
"Policies are specified by keys with names of the form "
9676
"\"<option_name>:policy\".\n"
9677
"For example, to define the push location for a tree of branches, the\n"
9678
"following could be used::"
9679
msgstr ""
9680
9681
#: en/help_topics/configuration.txt:291
9682
msgid ""
9683
" [/top/location]\n"
9684
" push_location = sftp://example.com/location\n"
9685
" push_location:policy = appendpath"
9686
msgstr ""
9687
9688
#: en/help_topics/configuration.txt:295
9689
msgid ""
9690
"With this configuration, the push location for ``/top/location/branch1``\n"
9691
"would be ``sftp://example.com/location/branch1``."
9692
msgstr ""
9693
9694
#: en/help_topics/configuration.txt:298
9695
msgid ""
9696
"Section local options\n"
9697
"^^^^^^^^^^^^^^^^^^^^^"
9698
msgstr ""
9699
9700
#: en/help_topics/configuration.txt:301
9701
msgid ""
9702
"Some options are defined automatically inside a given section and can be\n"
9703
"refered to in this section only. "
9704
msgstr ""
9705
9706
#: en/help_topics/configuration.txt:304
9707
msgid "For example, the ``appendpath`` policy can be used like this::"
9708
msgstr ""
9709
9710
#: en/help_topics/configuration.txt:306
9711
msgid ""
9712
" [/home/vila/src/bzr/bugs]\n"
9713
" mypush = lp:~vila/bzr\n"
9714
" mypush:policy=appendpath"
9715
msgstr ""
9716
9717
#: en/help_topics/configuration.txt:310
9718
msgid "Using ``relpath`` to achieve the same result is done like this::"
9719
msgstr ""
9720
9721
#: en/help_topics/configuration.txt:312
9722
msgid ""
9723
" [/home/vila/src/bzr/bugs]\n"
9724
" mypush = lp:~vila/bzr/{relpath}"
9725
msgstr ""
9726
9727
#: en/help_topics/configuration.txt:315
9728
msgid ""
9729
"In both cases, when used in a directory like\n"
9730
"``/home/vila/src/bzr/bugs/832013-expand-in-stack`` we'll get::"
9731
msgstr ""
9732
9733
#: en/help_topics/configuration.txt:318 en/help_topics/configuration.txt:329
9734
msgid ""
9735
" $ bzr config mypush\n"
9736
" lp:~vila/bzr/832013-expand-in-stack"
9737
msgstr ""
9738
9739
#: en/help_topics/configuration.txt:321
9740
msgid "Another such option is ``basename`` which can be used like this::"
9741
msgstr ""
9742
9743
#: en/help_topics/configuration.txt:323
9744
msgid ""
9745
" [/home/vila/src/bzr]\n"
9746
" mypush = lp:~vila/bzr/{basename}"
9747
msgstr ""
9748
9749
#: en/help_topics/configuration.txt:326
9750
msgid ""
9751
"When used in a directory like\n"
9752
"``/home/vila/src/bzr/bugs/832013-expand-in-stack`` we'll get::"
9753
msgstr ""
9754
9755
#: en/help_topics/configuration.txt:332
9756
msgid ""
9757
"Note that ``basename`` here refers to the base name of ``relpath`` which\n"
9758
"itself is defined as the relative path between the section name and the\n"
9759
"location it matches."
9760
msgstr ""
9761
9762
#: en/help_topics/configuration.txt:336
9763
msgid ""
9764
"When an option is local to a Section, it cannot be referred to from option\n"
9765
"values in any other section from the same ``Store`` nor from any other\n"
9766
"``Store``."
9767
msgstr ""
9768
9769
#: en/help_topics/configuration.txt:340
9770
msgid ""
9771
"\n"
9772
"The main configuration file, bazaar.conf\n"
9773
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
9774
msgstr ""
9775
9776
#: en/help_topics/configuration.txt:344
9777
msgid ""
9778
"``bazaar.conf`` allows two sections: ``[DEFAULT]`` and ``[ALIASES]``.\n"
9779
"The default section contains the default\n"
9780
"configuration options for all branches. The default section can be\n"
9781
"overriden by providing a branch-specific section in ``locations.conf``."
9782
msgstr ""
9783
9784
#: en/help_topics/configuration.txt:349
9785
msgid "A typical ``bazaar.conf`` section often looks like the following::"
9786
msgstr ""
9787
9788
#: en/help_topics/configuration.txt:351
9789
msgid ""
9790
" [DEFAULT]\n"
9791
" email = John Doe <jdoe@isp.com>\n"
9792
" editor = /usr/bin/vim\n"
9793
" create_signatures = when-required"
9794
msgstr ""
9795
9796
#: en/help_topics/configuration.txt:356
9797
msgid ""
9798
"\n"
9799
"The branch location configuration file, locations.conf\n"
9800
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
9801
msgstr ""
9802
9803
#: en/help_topics/configuration.txt:360
9804
msgid ""
9805
"``locations.conf`` allows one to specify overriding settings for\n"
9806
"a specific branch. The format is almost identical to the default section in\n"
9807
"bazaar.conf with one significant change: The section header, instead of "
9808
"saying\n"
9809
"default, will be the path to a branch that you wish to override a value\n"
9810
"for. The '?' and '*' wildcards are supported::"
9811
msgstr ""
9812
9813
#: en/help_topics/configuration.txt:366
9814
msgid ""
9815
" [/home/jdoe/branches/nethack]\n"
9816
" email = Nethack Admin <nethack@nethack.com>"
9817
msgstr ""
9818
9819
#: en/help_topics/configuration.txt:369
9820
msgid ""
9821
" [http://hypothetical.site.com/branches/devel-branch]\n"
9822
" create_signatures = always"
9823
msgstr ""
9824
9825
#: en/help_topics/configuration.txt:372
9826
msgid ""
9827
"The authentication configuration file, authentication.conf\n"
9828
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
9829
msgstr ""
9830
9831
#: en/help_topics/configuration.txt:375
9832
msgid ""
9833
"``authentication.conf`` allows one to specify credentials for\n"
9834
"remote servers. This can be used for all the supported transports and any "
9835
"part\n"
9836
"of bzr that requires authentication (smtp for example)."
9837
msgstr ""
9838
9839
#: en/help_topics/configuration.txt:379
9840
msgid ""
9841
"The syntax of the file obeys the same rules as the others except for the\n"
9842
"option policies which don't apply."
9843
msgstr ""
9844
9845
#: en/help_topics/configuration.txt:382
9846
msgid ""
9847
"For more information on the possible uses of the authentication "
9848
"configuration\n"
9849
"file see :doc:`authentication-help`."
9850
msgstr ""
9851
9852
#: en/help_topics/configuration.txt:385
9853
msgid ""
9854
"\n"
9855
"Common options\n"
9856
"--------------"
9857
msgstr ""
9858
9859
#: en/help_topics/configuration.txt:389
9860
msgid ""
9861
"debug_flags\n"
9862
"~~~~~~~~~~~"
9863
msgstr ""
9864
9865
#: en/help_topics/configuration.txt:392
9866
msgid ""
9867
"A comma-separated list of debugging options to turn on. The same values\n"
9868
"can be used as with the -D command-line option (see `help global-options`).\n"
9869
"For example::"
9870
msgstr ""
9871
9872
#: en/help_topics/configuration.txt:396
9873
msgid " debug_flags = hpss"
9874
msgstr ""
9875
9876
#: en/help_topics/configuration.txt:400
9877
msgid " debug_flags = hpss,evil"
9878
msgstr ""
9879
9880
#: en/help_topics/configuration.txt:402
9881
msgid ""
9882
"email\n"
9883
"~~~~~"
9884
msgstr ""
9885
9886
#: en/help_topics/configuration.txt:405
9887
msgid ""
9888
"The email address to use when committing a branch. Typically takes the form\n"
9889
"of::"
9890
msgstr ""
9891
9892
#: en/help_topics/configuration.txt:408
9893
msgid " email = Full Name <account@hostname.tld>"
9894
msgstr ""
9895
9896
#: en/help_topics/configuration.txt:410
9897
msgid ""
9898
"editor\n"
9899
"~~~~~~"
9900
msgstr ""
9901
9902
#: en/help_topics/configuration.txt:413
9903
msgid ""
9904
"The path of the editor that you wish to use if *bzr commit* is run without\n"
9905
"a commit message. This setting is trumped by the environment variable\n"
9906
"``BZR_EDITOR``, and overrides the ``VISUAL`` and ``EDITOR`` environment\n"
9907
"variables."
9908
msgstr ""
9909
9910
#: en/help_topics/configuration.txt:418
9911
msgid ""
9912
"log_format\n"
9913
"~~~~~~~~~~"
9914
msgstr ""
9915
9916
#: en/help_topics/configuration.txt:421
9917
msgid ""
9918
"The default log format to use. Standard log formats are ``long``, ``short``\n"
9919
"and ``line``. Additional formats may be provided by plugins. The default\n"
9920
"value is ``long``."
9921
msgstr ""
9922
9923
#: en/help_topics/configuration.txt:425
9924
msgid ""
9925
"check_signatures\n"
9926
"~~~~~~~~~~~~~~~~"
9927
msgstr ""
9928
9929
#: en/help_topics/configuration.txt:428
9930
msgid ""
9931
"Reserved for future use. These options will allow a policy for branches to\n"
9932
"require signatures."
9933
msgstr ""
9934
9935
#: en/help_topics/configuration.txt:431
9936
msgid ""
9937
"require\n"
9938
" The gnupg signature for revisions must be present and must be valid."
9939
msgstr ""
9940
9941
#: en/help_topics/configuration.txt:434
9942
msgid ""
9943
"ignore\n"
9944
" Do not check gnupg signatures of revisions."
9945
msgstr ""
9946
9947
#: en/help_topics/configuration.txt:437
9948
msgid ""
9949
"check-available\n"
9950
" (default) If gnupg signatures for revisions are present, check them.\n"
9951
" Bazaar will fail if it finds a bad signature, but will not fail if\n"
9952
" no signature is present."
9953
msgstr ""
9954
9955
#: en/help_topics/configuration.txt:442
9956
msgid ""
9957
"create_signatures\n"
9958
"~~~~~~~~~~~~~~~~~"
9959
msgstr ""
9960
9961
#: en/help_topics/configuration.txt:445
9962
msgid ""
9963
"Defines the behaviour of signing revisions on commits. By default bzr will "
9964
"not\n"
9965
"sign new commits."
9966
msgstr ""
9967
9968
#: en/help_topics/configuration.txt:448
9969
msgid ""
9970
"always\n"
9971
" Sign every new revision that is committed. If the signing fails then "
9972
"the\n"
9973
" commit will not be made."
9974
msgstr ""
9975
9976
#: en/help_topics/configuration.txt:452
9977
msgid ""
9978
"when-required\n"
9979
" Reserved for future use."
9980
msgstr ""
9981
9982
#: en/help_topics/configuration.txt:455
9983
msgid ""
9984
"never\n"
9985
" Reserved for future use."
9986
msgstr ""
9987
9988
#: en/help_topics/configuration.txt:458
9989
msgid ""
9990
"In future it is planned that ``when-required`` will sign newly\n"
9991
"committed revisions only when the branch requires them. ``never`` will "
9992
"refuse\n"
9993
"to sign newly committed revisions, even if the branch requires signatures."
9994
msgstr ""
9995
9996
#: en/help_topics/configuration.txt:462
9997
msgid ""
9998
"dirstate.fdatasync\n"
9999
"~~~~~~~~~~~~~~~~~~"
10000
msgstr ""
10001
10002
#: en/help_topics/configuration.txt:465
10003
msgid ""
10004
"If true (default), working tree metadata changes are flushed through the\n"
10005
"OS buffers to physical disk. This is somewhat slower, but means data\n"
10006
"should not be lost if the machine crashes. See also repository.fdatasync."
10007
msgstr ""
10008
10009
#: en/help_topics/configuration.txt:469
10010
msgid ""
10011
"gpg_signing_key\n"
10012
"~~~~~~~~~~~~~~~"
10013
msgstr ""
10014
10015
#: en/help_topics/configuration.txt:472
10016
msgid ""
10017
"The GnuPG user identity to use when signing commits. Can be an e-mail\n"
10018
"address, key fingerprint or full key ID. When unset or when set to\n"
10019
"\"default\" Bazaar will use the user e-mail set with ``whoami``."
10020
msgstr ""
10021
10022
#: en/help_topics/configuration.txt:476
10023
msgid ""
10024
"recurse\n"
10025
"~~~~~~~"
10026
msgstr ""
10027
10028
#: en/help_topics/configuration.txt:479
10029
msgid ""
10030
"Only useful in ``locations.conf``. Defines whether or not the\n"
10031
"configuration for this section applies to subdirectories:"
10032
msgstr ""
10033
10034
#: en/help_topics/configuration.txt:482
10035
msgid ""
10036
"true\n"
10037
" (default) This section applies to subdirectories as well."
10038
msgstr ""
10039
10040
#: en/help_topics/configuration.txt:485
10041
msgid ""
10042
"false\n"
10043
" This section only applies to the branch at this directory and not\n"
10044
" branches below it."
10045
msgstr ""
10046
10047
#: en/help_topics/configuration.txt:489
10048
msgid ""
10049
"gpg_signing_command\n"
10050
"~~~~~~~~~~~~~~~~~~~"
10051
msgstr ""
10052
10053
#: en/help_topics/configuration.txt:492
10054
msgid ""
10055
"(Default: \"gpg\"). Which program should be used to sign and check "
10056
"revisions.\n"
10057
"For example::"
10058
msgstr ""
10059
10060
#: en/help_topics/configuration.txt:495
10061
msgid " gpg_signing_command = /usr/bin/gnpg"
10062
msgstr ""
10063
10064
#: en/help_topics/configuration.txt:497
10065
msgid ""
10066
"The specified command must accept the options \"--clearsign\" and \"-u "
10067
"<email>\"."
10068
msgstr ""
10069
10070
#: en/help_topics/configuration.txt:499
10071
msgid ""
10072
"bzr_remote_path\n"
10073
"~~~~~~~~~~~~~~~"
10074
msgstr ""
10075
10076
#: en/help_topics/configuration.txt:502
10077
msgid ""
10078
"(Default: \"bzr\"). The path to the command that should be used to run the "
10079
"smart\n"
10080
"server for bzr. This value may only be specified in locations.conf, because:"
10081
msgstr ""
10082
10083
#: en/help_topics/configuration.txt:505
10084
msgid ""
10085
"- it's needed before branch.conf is accessible\n"
10086
"- allowing remote branch.conf files to specify commands would be a security\n"
10087
" risk"
10088
msgstr ""
10089
10090
#: en/help_topics/configuration.txt:509
10091
msgid "It is overridden by the BZR_REMOTE_PATH environment variable."
10092
msgstr ""
10093
10094
#: en/help_topics/configuration.txt:511
10095
msgid ""
10096
"smtp_server\n"
10097
"~~~~~~~~~~~"
10098
msgstr ""
10099
10100
#: en/help_topics/configuration.txt:514
10101
msgid ""
10102
"(Default: \"localhost\"). SMTP server to use when Bazaar needs to send\n"
10103
"email, eg. with ``merge-directive --mail-to``, or the bzr-email plugin."
10104
msgstr ""
10105
10106
#: en/help_topics/configuration.txt:517
10107
msgid ""
10108
"smtp_username, smtp_password\n"
10109
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
10110
msgstr ""
10111
10112
#: en/help_topics/configuration.txt:520
10113
msgid ""
10114
"User and password to authenticate to the SMTP server. If smtp_username\n"
10115
"is set, and smtp_password is not, Bazaar will prompt for a password.\n"
10116
"These settings are only needed if the SMTP server requires authentication\n"
10117
"to send mail."
10118
msgstr ""
10119
10120
#: en/help_topics/configuration.txt:525
10121
msgid ""
10122
"locks.steal_dead\n"
10123
"~~~~~~~~~~~~~~~~"
10124
msgstr ""
10125
10126
#: en/help_topics/configuration.txt:528
10127
msgid ""
10128
"If set to true, bzr will automatically break locks held by processes from\n"
10129
"the same machine and user that are no longer alive. Otherwise, it will\n"
10130
"print a message and you can break the lock manually, if you are satisfied\n"
10131
"the object is no longer in use."
10132
msgstr ""
10133
10134
#: en/help_topics/configuration.txt:533
10135
msgid ""
10136
"mail_client\n"
10137
"~~~~~~~~~~~"
10138
msgstr ""
10139
10140
#: en/help_topics/configuration.txt:536
10141
msgid ""
10142
"A mail client to use for sending merge requests.\n"
10143
"By default, bzr will try to use ``mapi`` on Windows. On other platforms, "
10144
"it\n"
10145
"will try ``xdg-email``. If either of these fails, it will fall back to\n"
10146
"``editor``."
10147
msgstr ""
10148
10149
#: en/help_topics/configuration.txt:541
10150
msgid "Supported values for specific clients:"
10151
msgstr ""
10152
10153
#: en/help_topics/configuration.txt:543
10154
msgid ""
10155
":claws: Use Claws. This skips a dialog for attaching files.\n"
10156
":evolution: Use Evolution.\n"
10157
":kmail: Use KMail.\n"
10158
":mutt: Use Mutt.\n"
10159
":thunderbird: Use Mozilla Thunderbird or Icedove. For Thunderbird/Icedove "
10160
"1.5,\n"
10161
" this works around some bugs that xdg-email doesn't handle."
10162
msgstr ""
10163
10164
#: en/help_topics/configuration.txt:550
10165
msgid "Supported generic values are:"
10166
msgstr ""
10167
10168
#: en/help_topics/configuration.txt:552
10169
msgid ""
10170
":default: See above.\n"
10171
":editor: Use your editor to compose the merge request. This also uses\n"
10172
" your commit id, (see ``bzr whoami``), smtp_server and (optionally)\n"
10173
" smtp_username and smtp_password.\n"
10174
":mapi: Use your preferred e-mail client on Windows.\n"
10175
":xdg-email: Use xdg-email to run your preferred mail program"
10176
msgstr ""
10177
10178
#: en/help_topics/configuration.txt:559
10179
msgid ""
10180
"repository.fdatasync\n"
10181
"~~~~~~~~~~~~~~~~~~~~"
10182
msgstr ""
10183
10184
#: en/help_topics/configuration.txt:562
10185
msgid ""
10186
"If true (default), repository changes are flushed through the OS buffers\n"
10187
"to physical disk. This is somewhat slower, but means data should not be\n"
10188
"lost if the machine crashes. See also dirstate.fdatasync."
10189
msgstr ""
10190
10191
#: en/help_topics/configuration.txt:566
10192
msgid ""
10193
"submit_branch\n"
10194
"~~~~~~~~~~~~~"
10195
msgstr ""
10196
10197
#: en/help_topics/configuration.txt:569
10198
msgid ""
10199
"The branch you intend to submit your current work to. This is "
10200
"automatically\n"
10201
"set by ``bzr send``, and is also used by the ``submit:`` revision spec. "
10202
"This\n"
10203
"should usually be set on a per-branch or per-location basis."
10204
msgstr ""
10205
10206
#: en/help_topics/configuration.txt:573
10207
msgid ""
10208
"public_branch\n"
10209
"~~~~~~~~~~~~~"
10210
msgstr ""
10211
10212
#: en/help_topics/configuration.txt:576
10213
msgid ""
10214
"A publically-accessible version of this branch (implying that this version "
10215
"is\n"
10216
"not publically-accessible). Used (and set) by ``bzr send``."
10217
msgstr ""
10218
10219
#: en/help_topics/configuration.txt:579
10220
msgid ""
10221
"suppress_warnings\n"
10222
"~~~~~~~~~~~~~~~~~"
10223
msgstr ""
10224
10225
#: en/help_topics/configuration.txt:582
10226
msgid ""
10227
"A list of strings, each string represent a warning that can be emitted by\n"
10228
"bzr. Mentioning a warning in this list tells bzr to not emit it."
10229
msgstr ""
10230
10231
#: en/help_topics/configuration.txt:585
10232
msgid "Valid values:"
10233
msgstr ""
10234
10235
#: en/help_topics/configuration.txt:587
10236
msgid ""
10237
"* ``format_deprecation``:\n"
10238
" whether the format deprecation warning is shown on repositories that "
10239
"are\n"
10240
" using deprecated formats."
10241
msgstr ""
10242
10243
#: en/help_topics/configuration.txt:591
10244
msgid ""
10245
"default_format\n"
10246
"~~~~~~~~~~~~~~"
10247
msgstr ""
10248
10249
#: en/help_topics/configuration.txt:594
10250
msgid ""
10251
"A format name for the default format used when creating branches. See "
10252
"``bzr\n"
10253
"help formats`` for possible values."
10254
msgstr ""
10255
10256
#: en/help_topics/configuration.txt:597
10257
msgid ""
10258
"\n"
10259
"Unicode options\n"
10260
"---------------"
10261
msgstr ""
10262
10263
#: en/help_topics/configuration.txt:601
10264
msgid ""
10265
"output_encoding\n"
10266
"~~~~~~~~~~~~~~~"
10267
msgstr ""
10268
10269
#: en/help_topics/configuration.txt:604
10270
msgid ""
10271
"A Python unicode encoding name for text output from bzr, such as log\n"
10272
"information. Values include: utf8, cp850, ascii, iso-8859-1. The default\n"
10273
"is the terminal encoding prefered by the operating system."
10274
msgstr ""
10275
10276
#: en/help_topics/configuration.txt:608
10277
msgid ""
10278
"\n"
10279
"Branch type specific options\n"
10280
"----------------------------"
10281
msgstr ""
10282
10283
#: en/help_topics/configuration.txt:612
10284
msgid ""
10285
"These options apply only to branches that use the ``dirstate-tags`` or\n"
10286
"later format. They\n"
10287
"are usually set in ``.bzr/branch/branch.conf`` automatically, but may be\n"
10288
"manually set in ``locations.conf`` or ``bazaar.conf``."
10289
msgstr ""
10290
10291
#: en/help_topics/configuration.txt:617
10292
msgid ""
10293
"append_revisions_only\n"
10294
"~~~~~~~~~~~~~~~~~~~~~"
10295
msgstr ""
10296
10297
#: en/help_topics/configuration.txt:620
10298
msgid ""
10299
"If set to \"True\" then revisions can only be appended to the log, not\n"
10300
"removed. A branch with this setting enabled can only pull from another\n"
10301
"branch if the other branch's log is a longer version of its own. This is\n"
10302
"normally set by ``bzr init --append-revisions-only``. If you set it\n"
10303
"manually, use either 'True' or 'False' (case-sensitive) to maintain\n"
10304
"compatibility with previous bzr versions (older than 2.2)."
10305
msgstr ""
10306
10307
#: en/help_topics/configuration.txt:627
10308
msgid ""
10309
"parent_location\n"
10310
"~~~~~~~~~~~~~~~"
10311
msgstr ""
10312
10313
#: en/help_topics/configuration.txt:630
10314
msgid ""
10315
"If present, the location of the default branch for pull or merge. This "
10316
"option\n"
10317
"is normally set when creating a branch, the first ``pull`` or by ``pull\n"
10318
"--remember``."
10319
msgstr ""
10320
10321
#: en/help_topics/configuration.txt:634
10322
msgid ""
10323
"push_location\n"
10324
"~~~~~~~~~~~~~"
10325
msgstr ""
10326
10327
#: en/help_topics/configuration.txt:637
10328
msgid ""
10329
"If present, the location of the default branch for push. This option\n"
10330
"is normally set by the first ``push`` or ``push --remember``."
10331
msgstr ""
10332
10333
#: en/help_topics/configuration.txt:640
10334
msgid ""
10335
"push_strict\n"
10336
"~~~~~~~~~~~"
10337
msgstr ""
10338
10339
#: en/help_topics/configuration.txt:643
10340
msgid ""
10341
"If present, defines the ``--strict`` option default value for checking\n"
10342
"uncommitted changes before pushing."
10343
msgstr ""
10344
10345
#: en/help_topics/configuration.txt:646
10346
msgid ""
10347
"dpush_strict\n"
10348
"~~~~~~~~~~~~"
10349
msgstr ""
10350
10351
#: en/help_topics/configuration.txt:649
10352
msgid ""
10353
"If present, defines the ``--strict`` option default value for checking\n"
10354
"uncommitted changes before pushing into a different VCS without any\n"
10355
"custom bzr metadata."
10356
msgstr ""
10357
10358
#: en/help_topics/configuration.txt:653
10359
msgid ""
10360
"bound_location\n"
10361
"~~~~~~~~~~~~~~"
10362
msgstr ""
10363
10364
#: en/help_topics/configuration.txt:656
10365
msgid ""
10366
"The location that commits should go to when acting as a checkout.\n"
10367
"This option is normally set by ``bind``."
10368
msgstr ""
10369
10370
#: en/help_topics/configuration.txt:659
10371
msgid ""
10372
"bound\n"
10373
"~~~~~"
10374
msgstr ""
10375
10376
#: en/help_topics/configuration.txt:662
10377
msgid ""
10378
"If set to \"True\", the branch should act as a checkout, and push each "
10379
"commit to\n"
10380
"the bound_location. This option is normally set by ``bind``/``unbind``."
10381
msgstr ""
10382
10383
#: en/help_topics/configuration.txt:665
10384
msgid ""
10385
"send_strict\n"
10386
"~~~~~~~~~~~"
10387
msgstr ""
10388
10389
#: en/help_topics/configuration.txt:668
10390
msgid ""
10391
"If present, defines the ``--strict`` option default value for checking\n"
10392
"uncommitted changes before sending a merge directive."
10393
msgstr ""
10394
10395
#: en/help_topics/configuration.txt:671
10396
msgid ""
10397
"add.maximum_file_size\n"
10398
"~~~~~~~~~~~~~~~~~~~~~"
10399
msgstr ""
10400
10401
#: en/help_topics/configuration.txt:674
10402
msgid ""
10403
"Defines the maximum file size the command line \"add\" operation will allow\n"
10404
"in recursive mode, with files larger than this value being skipped. You may "
10405
"\n"
10406
"specify this value as an integer (in which case it is interpreted as bytes), "
10407
"\n"
10408
"or you may specify the value using SI units, i.e. 10KB, 20MB, 1G. A value of "
10409
"0 \n"
10410
"will disable skipping."
10411
msgstr ""
10412
10413
#: en/help_topics/configuration.txt:680
10414
msgid ""
10415
"External Merge Tools\n"
10416
"--------------------"
10417
msgstr ""
10418
10419
#: en/help_topics/configuration.txt:683
10420
msgid ""
10421
"bzr.mergetool.<name>\n"
10422
"~~~~~~~~~~~~~~~~~~~~"
10423
msgstr ""
10424
10425
#: en/help_topics/configuration.txt:686
10426
msgid ""
10427
"Defines an external merge tool called <name> with the given command-line.\n"
10428
"Arguments containing spaces should be quoted using single or double quotes. "
10429
"The\n"
10430
"executable may omit its path if it can be found on the PATH."
10431
msgstr ""
10432
10433
#: en/help_topics/configuration.txt:690
10434
msgid ""
10435
"The following markers can be used in the command-line to substitute "
10436
"filenames\n"
10437
"involved in the merge conflict::"
10438
msgstr ""
10439
10440
#: en/help_topics/configuration.txt:693
10441
msgid ""
10442
" {base} file.BASE\n"
10443
" {this} file.THIS\n"
10444
" {other} file.OTHER\n"
10445
" {result} output file\n"
10446
" {this_temp} temp copy of file.THIS, used to overwrite output file if "
10447
"merge\n"
10448
" succeeds."
10449
msgstr ""
10450
10451
#: en/help_topics/configuration.txt:702
10452
msgid " bzr.mergetool.kdiff3 = kdiff3 {base} {this} {other} -o {result}"
10453
msgstr ""
10454
10455
#: en/help_topics/configuration.txt:704
10456
msgid ""
10457
"bzr.default_mergetool\n"
10458
"~~~~~~~~~~~~~~~~~~~~~"
10459
msgstr ""
10460
10461
#: en/help_topics/configuration.txt:707
10462
msgid ""
10463
"Specifies which external merge tool (as defined above) should be selected "
10464
"by\n"
10465
"default in tools such as ``bzr qconflicts``."
10466
msgstr ""
10467
10468
#: en/help_topics/configuration.txt:712
10469
msgid " bzr.default_mergetool = kdiff3\n"
10470
msgstr ""
10471
10472
#: en/help_topics/conflict-types.txt:1
10473
msgid ""
10474
"Conflict Types\n"
10475
"=============="
10476
msgstr ""
10477
10478
#: en/help_topics/conflict-types.txt:4
10479
msgid ""
10480
"Some operations, like merge, revert and pull, modify the contents of your\n"
10481
"working tree. These modifications are programmatically generated, and so "
10482
"they\n"
10483
"may conflict with the current state of your working tree. "
10484
msgstr ""
10485
10486
#: en/help_topics/conflict-types.txt:8
10487
msgid ""
10488
"When conflicts are present in your working tree (as shown by ``bzr\n"
10489
"conflicts``), you should resolve them and then inform bzr that the "
10490
"conflicts\n"
10491
"have been resolved."
10492
msgstr ""
10493
10494
#: en/help_topics/conflict-types.txt:12
10495
msgid ""
10496
"Resolving conflicts is sometimes not obvious. Either because the user that\n"
10497
"should resolve them is not the one responsible for their occurrence, as is "
10498
"the\n"
10499
"case when merging other people's work or because some conflicts are "
10500
"presented\n"
10501
"in a way that is not easy to understand."
10502
msgstr ""
10503
10504
#: en/help_topics/conflict-types.txt:17
10505
msgid ""
10506
"Bazaar tries to avoid conflicts ; its aim is to ask you to resolve the\n"
10507
"conflict if and only if there's an actual conceptual conflict in the source\n"
10508
"tree. Because Bazaar doesn't understand the real meaning of the files "
10509
"being\n"
10510
"versioned, it can, when faced with ambiguities, fall short in either "
10511
"direction\n"
10512
"trying to resolve the conflict itself. Many kinds of changes can be "
10513
"combined\n"
10514
"programmatically, but sometimes only a human can determine the right thing "
10515
"to\n"
10516
"do."
10517
msgstr ""
10518
"Bazaar tries to avoid conflicts; its aim is to ask you to resolve the\n"
10519
"conflict if and only if there's an actual conceptual conflict in the source\n"
10520
"tree. Because Bazaar doesn't understand the real meaning of the files "
10521
"being\n"
10522
"versioned, it can, when faced with ambiguities, fall short in either "
10523
"direction\n"
10524
"trying to resolve the conflict itself. Many kinds of changes can be "
10525
"combined\n"
10526
"programmatically, but sometimes only a human can determine the right thing "
10527
"to\n"
10528
"do."
10529
10530
#: en/help_topics/conflict-types.txt:25
10531
msgid ""
10532
"When Bazaar generates a conflict, it adds information into the working tree "
10533
"to\n"
10534
"present the conflicting versions, and it's up to you to find the correct\n"
10535
"resolution."
10536
msgstr ""
10537
10538
#: en/help_topics/conflict-types.txt:29
10539
msgid "Whatever the conflict is, resolving it is roughly done in two steps:"
10540
msgstr ""
10541
10542
#: en/help_topics/conflict-types.txt:31
10543
msgid ""
10544
"1. Modify the working tree content so that the conflicted item is now in "
10545
"the\n"
10546
" state you want to keep, then"
10547
msgstr ""
10548
10549
#: en/help_topics/conflict-types.txt:34
10550
msgid ""
10551
"2. Inform Bazaar that the conflict is now solved and ask to cleanup any\n"
10552
" remaining generated information (``bzr resolve <item>``)."
10553
msgstr ""
10554
10555
#: en/help_topics/conflict-types.txt:37
10556
msgid ""
10557
"For most conflict types, there are some obvious ways to modify the working\n"
10558
"tree and put it into the desired state. For some types of conflicts, Bazaar\n"
10559
"itself already made a choice, when possible."
10560
msgstr ""
10561
10562
#: en/help_topics/conflict-types.txt:41
10563
msgid ""
10564
"Yet, whether Bazaar makes a choice or not, there are some other simple but\n"
10565
"different ways to resolve the conflict."
10566
msgstr ""
10567
10568
#: en/help_topics/conflict-types.txt:44
10569
msgid ""
10570
"Each type of conflict is explained below, and the action which must be done "
10571
"to\n"
10572
"resolve the conflict is outlined."
10573
msgstr ""
10574
10575
#: en/help_topics/conflict-types.txt:47
10576
msgid ""
10577
"Various actions are available depending on the kind of conflict, for some "
10578
"of\n"
10579
"these actions, Bazaar can provide some help. In the end you should at least\n"
10580
"inform Bazaar that you're done with the conflict with::"
10581
msgstr ""
10582
"Various actions are available depending on the kind of conflict; for some "
10583
"of\n"
10584
"these actions, Bazaar can provide some help. In the end you should at least\n"
10585
"inform Bazaar that you're done with the conflict with::"
10586
10587
#: en/help_topics/conflict-types.txt:51
10588
msgid " ``bzr resolve FILE --action=done'"
10589
msgstr ""
10590
10591
#: en/help_topics/conflict-types.txt:53
10592
msgid ""
10593
"Note that this is the default action when a single file is involved so you "
10594
"can\n"
10595
"simply use::"
10596
msgstr ""
10597
10598
#: en/help_topics/conflict-types.txt:56
10599
msgid " ``bzr resolve FILE``"
10600
msgstr ""
10601
10602
#: en/help_topics/conflict-types.txt:58
10603
msgid "See ``bzr help resolve`` for more details."
10604
msgstr ""
10605
10606
#: en/help_topics/conflict-types.txt:60
10607
msgid ""
10608
"Text conflicts\n"
10609
"--------------"
10610
msgstr ""
10611
10612
#: en/help_topics/conflict-types.txt:63 en/help_topics/conflict-types.txt:120
10613
#: en/help_topics/conflict-types.txt:151 en/help_topics/conflict-types.txt:175
10614
#: en/help_topics/conflict-types.txt:198 en/help_topics/conflict-types.txt:213
10615
#: en/help_topics/conflict-types.txt:239 en/help_topics/conflict-types.txt:281
10616
#: en/help_topics/conflict-types.txt:303 en/help_topics/conflict-types.txt:339
10617
msgid "Typical message::"
10618
msgstr ""
10619
10620
#: en/help_topics/conflict-types.txt:65
10621
msgid " Text conflict in FILE"
10622
msgstr ""
10623
10624
#: en/help_topics/conflict-types.txt:67
10625
msgid ""
10626
"These are produced when a text merge cannot completely reconcile two sets "
10627
"of\n"
10628
"text changes. Bazaar will emit files for each version with the extensions\n"
10629
"THIS, OTHER, and BASE. THIS is the version of the file from the target "
10630
"tree,\n"
10631
"i.e. the tree that you are merging changes into. OTHER is the version that "
10632
"you\n"
10633
"are merging into the target. BASE is an older version that is used as a "
10634
"basis\n"
10635
"for comparison."
10636
msgstr ""
10637
10638
#: en/help_topics/conflict-types.txt:74
10639
msgid ""
10640
"In the main copy of the file, Bazaar will include all the changes that it\n"
10641
"could reconcile, and any un-reconciled conflicts are surrounded by\n"
10642
"\"herringbone\" markers like ``<<<<<<<``."
10643
msgstr ""
10644
10645
#: en/help_topics/conflict-types.txt:78
10646
msgid ""
10647
"Say the initial text is \"The project leader released it.\", and THIS "
10648
"modifies it\n"
10649
"to \"Martin Pool released it.\", while OTHER modifies it to \"The project "
10650
"leader\n"
10651
"released Bazaar.\" A conflict would look like this::"
10652
msgstr ""
10653
10654
#: en/help_topics/conflict-types.txt:82
10655
msgid ""
10656
" <<<<<<< TREE\n"
10657
" Martin Pool released it.\n"
10658
" =======\n"
10659
" The project leader released Bazaar.\n"
10660
" >>>>>>> MERGE-SOURCE"
10661
msgstr ""
10662
10663
#: en/help_topics/conflict-types.txt:88
10664
msgid "The correct resolution would be \"Martin Pool released Bazaar.\""
10665
msgstr ""
10666
10667
#: en/help_topics/conflict-types.txt:90
10668
msgid ""
10669
"You can handle text conflicts either by editing the main copy of the file,\n"
10670
"or by invoking external tools on the THIS, OTHER and BASE versions. It's\n"
10671
"worth mentioning that resolving text conflicts rarely involves picking one\n"
10672
"set of changes over the other (but see below when you encounter these\n"
10673
"cases). More often, the two sets of changes must be intelligently combined."
10674
msgstr ""
10675
10676
#: en/help_topics/conflict-types.txt:96
10677
msgid ""
10678
"If you edit the main copy, be sure to remove the herringbone markers. When\n"
10679
"you are done editing, the file should look like it never had a conflict, and "
10680
"be\n"
10681
"ready to commit."
10682
msgstr ""
10683
10684
#: en/help_topics/conflict-types.txt:100
10685
msgid ""
10686
"When you have resolved text conflicts, just run ``bzr resolve --auto``, and\n"
10687
"Bazaar will auto-detect which conflicts you have resolved."
10688
msgstr ""
10689
10690
#: en/help_topics/conflict-types.txt:103
10691
msgid ""
10692
"When the conflict is resolved, Bazaar deletes the previously generated\n"
10693
"``.BASE``, ``.THIS`` and ``.OTHER`` files if they are still present in the\n"
10694
"working tree."
10695
msgstr ""
10696
10697
#: en/help_topics/conflict-types.txt:107
10698
msgid ""
10699
"\n"
10700
"When you want to pick one set of changes over the other, you can use ``bzr\n"
10701
"resolve`` with one of the following actions:"
10702
msgstr ""
10703
10704
#: en/help_topics/conflict-types.txt:111
10705
msgid ""
10706
"* ``--action=take-this`` will issue ``mv FILE.THIS FILE``,\n"
10707
"* ``--action=take-other`` will issue ``mv FILE.OTHER FILE``."
10708
msgstr ""
10709
10710
#: en/help_topics/conflict-types.txt:114
10711
msgid ""
10712
"Note that if you have modified ``FILE.THIS`` or ``FILE.OTHER``, these\n"
10713
"modifications will be taken into account."
10714
msgstr ""
10715
10716
#: en/help_topics/conflict-types.txt:117
10717
msgid ""
10718
"Content conflicts\n"
10719
"-----------------"
10720
msgstr ""
10721
10722
#: en/help_topics/conflict-types.txt:122
10723
msgid " Contents conflict in FILE"
10724
msgstr ""
10725
10726
#: en/help_topics/conflict-types.txt:124
10727
msgid ""
10728
"This conflict happens when there are conflicting changes in the working "
10729
"tree\n"
10730
"and the merge source, but the conflicted items are not text files. They "
10731
"may\n"
10732
"be binary files, or symlinks, or directories. It can even happen with "
10733
"files\n"
10734
"that are deleted on one side, and modified on the other."
10735
msgstr ""
10736
10737
#: en/help_topics/conflict-types.txt:129
10738
msgid ""
10739
"Like text conflicts, Bazaar will emit THIS, OTHER and BASE files. (They may "
10740
"be\n"
10741
"regular files, symlinks or directories). But it will not include a \"main "
10742
"copy\"\n"
10743
"of the file with herringbone conflict markers. It will appear that the "
10744
"\"main\n"
10745
"copy\" has been renamed to THIS or OTHER."
10746
msgstr ""
10747
10748
#: en/help_topics/conflict-types.txt:134 en/help_topics/conflict-types.txt:182
10749
msgid ""
10750
"To resolve that kind of conflict, you should rebuild FILE from either "
10751
"version\n"
10752
"or a combination of both."
10753
msgstr ""
10754
"To resolve that kind of conflict, you should rebuild FILE from either "
10755
"version\n"
10756
"or a combination of both."
10757
10758
#: en/help_topics/conflict-types.txt:137 en/help_topics/conflict-types.txt:185
10759
#: en/help_topics/conflict-types.txt:226 en/help_topics/conflict-types.txt:252
10760
#: en/help_topics/conflict-types.txt:291 en/help_topics/conflict-types.txt:326
10761
#: en/help_topics/conflict-types.txt:361
10762
msgid "``bzr resolve`` recognizes the following actions:"
10763
msgstr ""
10764
10765
#: en/help_topics/conflict-types.txt:139
10766
msgid ""
10767
"* ``--action=take-this`` will issue ``bzr mv FILE.THIS FILE``,\n"
10768
"* ``--action=take-other`` will issue ``bzr mv FILE.OTHER FILE``,\n"
10769
"* ``--action=done`` will just mark the conflict as resolved."
10770
msgstr ""
10771
10772
#: en/help_topics/conflict-types.txt:143
10773
msgid ""
10774
"Any action will also delete the previously generated ``.BASE``, ``.THIS`` "
10775
"and\n"
10776
"``.OTHER`` files if they are still present in the working tree."
10777
msgstr ""
10778
10779
#: en/help_topics/conflict-types.txt:146 en/help_topics/conflict-types.txt:193
10780
#: en/help_topics/conflict-types.txt:234 en/help_topics/conflict-types.txt:276
10781
#: en/help_topics/conflict-types.txt:298 en/help_topics/conflict-types.txt:334
10782
#: en/help_topics/conflict-types.txt:369
10783
msgid ""
10784
"Bazaar cannot auto-detect when conflicts of this kind have been resolved."
10785
msgstr ""
10786
"Bazaar cannot auto-detect when conflicts of this kind have been resolved."
10787
10788
#: en/help_topics/conflict-types.txt:148
10789
msgid ""
10790
"Tag conflicts\n"
10791
"-------------"
10792
msgstr ""
10793
10794
#: en/help_topics/conflict-types.txt:153
10795
msgid ""
10796
" Conflicting tags:\n"
10797
" version-0.1"
10798
msgstr ""
10799
10800
#: en/help_topics/conflict-types.txt:156
10801
msgid ""
10802
"When pulling from or pushing to another branch, Bazaar informs you about "
10803
"tags\n"
10804
"that conflict between the two branches; that is the same tag points to two\n"
10805
"different revisions. You need not resolve these conflicts, but subsequent\n"
10806
"uses of pull or push will result in the same message."
10807
msgstr ""
10808
10809
#: en/help_topics/conflict-types.txt:161
10810
msgid ""
10811
"To resolve the conflict, you must apply the correct tags to either the "
10812
"target\n"
10813
"branch or the source branch as appropriate. Use \"bzr tags --show-ids -d\n"
10814
"SOURCE_URL\" to see the tags in the source branch. If you want to make the\n"
10815
"target branch's tags match the source branch, then in the target branch do\n"
10816
"``bzr tag --force -r revid:REVISION_ID CONFLICTING_TAG`` for each of the\n"
10817
"CONFLICTING_TAGs, where REVISION_ID comes from the list of tags in the "
10818
"source\n"
10819
"branch. You need not call \"bzr resolve\" after doing this. To resolve in\n"
10820
"favor of the target branch, you need to similarly use ``tag --force`` in "
10821
"the\n"
10822
"source branch. (Note that pulling or pushing using --overwrite will "
10823
"overwrite\n"
10824
"all tags as well.)"
10825
msgstr ""
10826
10827
#: en/help_topics/conflict-types.txt:172
10828
msgid ""
10829
"Duplicate paths\n"
10830
"---------------"
10831
msgstr ""
10832
10833
#: en/help_topics/conflict-types.txt:177
10834
msgid " Conflict adding file FILE. Moved existing file to FILE.moved."
10835
msgstr ""
10836
10837
#: en/help_topics/conflict-types.txt:179
10838
msgid ""
10839
"Sometimes Bazaar will attempt to create a file using a pathname that has\n"
10840
"already been used. The existing file will be renamed to \"FILE.moved\". "
10841
msgstr ""
10842
10843
#: en/help_topics/conflict-types.txt:187
10844
msgid ""
10845
"* ``--action=take-this`` will issue ``bzr rm FILE ; bzr mv FILE.moved "
10846
"FILE``,\n"
10847
"* ``--action=take-other`` will issue ``bzr rm FILE.moved``,\n"
10848
"* ``--action=done`` will just mark the conflict as resolved."
10849
msgstr ""
10850
10851
#: en/help_topics/conflict-types.txt:191
10852
msgid ""
10853
"Note that you must get rid of FILE.moved before using ``--action=done``."
10854
msgstr ""
10855
10856
#: en/help_topics/conflict-types.txt:195
10857
msgid ""
10858
"Unversioned parent\n"
10859
"------------------"
10860
msgstr ""
10861
10862
#: en/help_topics/conflict-types.txt:200
10863
msgid ""
10864
" Conflict because FILE is not versioned, but has versioned children."
10865
msgstr ""
10866
10867
#: en/help_topics/conflict-types.txt:202
10868
msgid ""
10869
"Sometimes Bazaar will attempt to create a file whose parent directory is "
10870
"not\n"
10871
"versioned. This happens when the directory has been deleted in the target,\n"
10872
"but has a new child in the source, or vice versa. In this situation, "
10873
"Bazaar\n"
10874
"will version the parent directory as well. Resolving this issue depends\n"
10875
"very much on the particular scenario. You may wish to rename or delete "
10876
"either\n"
10877
"the file or the directory. When you are satisfied, you can run \"bzr "
10878
"resolve\n"
10879
"FILE\" to mark the conflict as resolved."
10880
msgstr ""
10881
10882
#: en/help_topics/conflict-types.txt:210
10883
msgid ""
10884
"Missing parent\n"
10885
"--------------"
10886
msgstr ""
10887
10888
#: en/help_topics/conflict-types.txt:215
10889
msgid " Conflict adding files to FILE. Created directory."
10890
msgstr ""
10891
10892
#: en/help_topics/conflict-types.txt:217
10893
msgid ""
10894
"This happens when a directory has been deleted in the target, but has new\n"
10895
"children in the source. This is similar to the \"unversioned parent\" "
10896
"conflict,\n"
10897
"except that the parent directory does not *exist*, instead of just being\n"
10898
"unversioned. In this situation, Bazaar will create the missing parent.\n"
10899
"Resolving this issue depends very much on the particular scenario."
10900
msgstr ""
10901
10902
#: en/help_topics/conflict-types.txt:223 en/help_topics/conflict-types.txt:249
10903
msgid ""
10904
"To resolve that kind of conflict, you should either remove or rename the\n"
10905
"children or the directory or a combination of both."
10906
msgstr ""
10907
"To resolve that kind of conflict, you should either remove or rename the\n"
10908
"children or the directory or a combination of both."
10909
10910
#: en/help_topics/conflict-types.txt:228
10911
msgid ""
10912
"* ``--action=take-this`` will issue ``bzr rm directory`` including the\n"
10913
" children,\n"
10914
"* ``--action=take-other`` will acknowledge Bazaar choice to keep the "
10915
"children\n"
10916
" and restoring the directory,\n"
10917
"* ``--action=done`` will just mark the conflict as resolved."
10918
msgstr ""
10919
10920
#: en/help_topics/conflict-types.txt:236
10921
msgid ""
10922
"Deleting parent\n"
10923
"---------------"
10924
msgstr ""
10925
10926
#: en/help_topics/conflict-types.txt:241
10927
msgid " Conflict: can't delete DIR because it is not empty. Not deleting."
10928
msgstr ""
10929
10930
#: en/help_topics/conflict-types.txt:243
10931
msgid ""
10932
"This is the opposite of \"missing parent\". A directory is deleted in the\n"
10933
"source, but has new children in the target (either because a directory\n"
10934
"deletion is merged or because the merge introduce new children). Bazaar\n"
10935
"will retain the directory. Resolving this issue depends very much on the\n"
10936
"particular scenario."
10937
msgstr ""
10938
10939
#: en/help_topics/conflict-types.txt:254
10940
msgid ""
10941
"* ``--action=take-this`` will acknowledge Bazaar choice to keep the "
10942
"directory,"
10943
msgstr ""
10944
10945
#: en/help_topics/conflict-types.txt:256
10946
msgid ""
10947
"* ``--action=take-other`` will issue ``bzr rm directory`` including the \n"
10948
" children,"
10949
msgstr ""
10950
10951
#: en/help_topics/conflict-types.txt:259
10952
msgid "* ``--action=done`` will just mark the conflict as resolved."
10953
msgstr ""
10954
10955
#: en/help_topics/conflict-types.txt:261
10956
msgid ""
10957
"Note that when merging a directory deletion, if unversioned files are\n"
10958
"present, they become potential orphans has they don't have a directory\n"
10959
"parent anymore."
10960
msgstr ""
10961
10962
#: en/help_topics/conflict-types.txt:265
10963
msgid ""
10964
"Handling such orphans, *before* the conflict is created, is controlled by\n"
10965
"setting the ``bzr.transform.orphan_policy`` configuration option."
10966
msgstr ""
10967
10968
#: en/help_topics/conflict-types.txt:268
10969
msgid "There are two possible values for this option:"
10970
msgstr ""
10971
10972
#: en/help_topics/conflict-types.txt:270
10973
msgid ""
10974
"* ``conflict`` (the default): will leave the orphans in place and\n"
10975
" generate a conflicts,"
10976
msgstr ""
10977
10978
#: en/help_topics/conflict-types.txt:273
10979
msgid ""
10980
"* ``move``: will move the orphans to a ``bzr-orphans`` directory at the "
10981
"root\n"
10982
" of the working tree with names like ``<file>.~#~``."
10983
msgstr ""
10984
10985
#: en/help_topics/conflict-types.txt:278
10986
msgid ""
10987
"Path conflict\n"
10988
"-------------"
10989
msgstr ""
10990
10991
#: en/help_topics/conflict-types.txt:283
10992
msgid " Path conflict: PATH1 / PATH2"
10993
msgstr ""
10994
10995
#: en/help_topics/conflict-types.txt:285
10996
msgid ""
10997
"This happens when the source and target have each modified the name or "
10998
"parent\n"
10999
"directory of a file. Bazaar will use the path elements from the source."
11000
msgstr ""
11001
11002
#: en/help_topics/conflict-types.txt:288
11003
msgid ""
11004
"To resolve that kind of conflict, you just have to decide what name should "
11005
"be\n"
11006
"retained for the file involved."
11007
msgstr ""
11008
"To resolve that kind of conflict, you just have to decide which name should "
11009
"be\n"
11010
"retained for the file involved."
11011
11012
#: en/help_topics/conflict-types.txt:293
11013
msgid ""
11014
"* ``--action=take-this`` will revert Bazaar choice and keep ``PATH1`` by\n"
11015
" issuing ``bzr mv PATH2 PATH1``,\n"
11016
"* ``--action=take-other`` will acknowledge Bazaar choice of keeping "
11017
"``PATH2``,\n"
11018
"* ``--action=done`` will just mark the conflict as resolved."
11019
msgstr ""
11020
11021
#: en/help_topics/conflict-types.txt:300
11022
msgid ""
11023
"Parent loop\n"
11024
"-----------"
11025
msgstr ""
11026
11027
#: en/help_topics/conflict-types.txt:305
11028
msgid " Conflict moving FILE into DIRECTORY. Cancelled move."
11029
msgstr ""
11030
11031
#: en/help_topics/conflict-types.txt:307
11032
msgid ""
11033
"This happens when the source and the target have each moved directories, so\n"
11034
"that, if the change could be applied, a directory would be contained by "
11035
"itself.\n"
11036
"For example::"
11037
msgstr ""
11038
11039
#: en/help_topics/conflict-types.txt:311
11040
msgid ""
11041
" $ bzr init\n"
11042
" $ bzr mkdir white\n"
11043
" $ bzr mkdir black\n"
11044
" $ bzr commit -m \"BASE\"\n"
11045
" $ bzr branch . ../other\n"
11046
" $ bzr mv white black\n"
11047
" $ bzr commit -m \"THIS\"\n"
11048
" $ bzr mv ../other/black ../other/white\n"
11049
" $ bzr commit ../other -m \"OTHER\"\n"
11050
" $ bzr merge ../other"
11051
msgstr ""
11052
11053
#: en/help_topics/conflict-types.txt:322
11054
msgid ""
11055
"In this situation, Bazaar will cancel the move, and leave ``white`` in\n"
11056
"``black``. To resolve that kind of conflict, you just have to decide what\n"
11057
"name should be retained for the directories involved."
11058
msgstr ""
11059
"In this situation, Bazaar will cancel the move, and leave ``white`` in\n"
11060
"``black``. To resolve that kind of conflict, you just have to decide which\n"
11061
"name should be retained for the directories involved."
11062
11063
#: en/help_topics/conflict-types.txt:328
11064
msgid ""
11065
"* ``--action=take-this`` will acknowledge Bazaar choice of leaving ``white`` "
11066
"\n"
11067
" in ``black``,\n"
11068
"* ``--action=take-other`` will revert Bazaar choice and move ``black`` in\n"
11069
" ``white`` by issuing ``bzr mv black/white white ; bzr mv black white``,\n"
11070
"* ``--action=done`` will just mark the conflict as resolved."
11071
msgstr ""
11072
11073
#: en/help_topics/conflict-types.txt:336
11074
msgid ""
11075
"Non-directory parent\n"
11076
"--------------------"
11077
msgstr ""
11078
11079
#: en/help_topics/conflict-types.txt:341
11080
msgid ""
11081
" Conflict: foo.new is not a directory, but has files in it.\n"
11082
" Created directory."
11083
msgstr ""
11084
11085
#: en/help_topics/conflict-types.txt:344
11086
msgid ""
11087
"This happens when one side has added files to a directory, and the other "
11088
"side\n"
11089
"has changed the directory into a file or symlink. For example::"
11090
msgstr ""
11091
11092
#: en/help_topics/conflict-types.txt:347
11093
msgid ""
11094
" $ bzr init\n"
11095
" $ bzr mkdir foo\n"
11096
" $ bzr commit -m \"BASE\"\n"
11097
" $ bzr branch . ../other\n"
11098
" $ rmdir foo\n"
11099
" $ touch foo\n"
11100
" $ bzr commit -m \"THIS\"\n"
11101
" $ bzr mkdir ../other/foo/bar\n"
11102
" $ bzr commit ../other -m \"OTHER\"\n"
11103
" $ bzr merge ../other"
11104
msgstr ""
11105
11106
#: en/help_topics/conflict-types.txt:358
11107
msgid ""
11108
"To resolve that kind of conflict, you have to decide what name should be\n"
11109
"retained for the file, directory or symlink involved."
11110
msgstr ""
11111
"To resolve that kind of conflict, you have to decidewhich name should be\n"
11112
"retained for the file, directory or symlink involved."
11113
11114
#: en/help_topics/conflict-types.txt:363
11115
msgid ""
11116
"* ``--action=take-this`` will issue ``bzr rm --force foo.new`` and \n"
11117
" ``bzr add foo``,\n"
11118
"* ``--action=take-other`` will issue ``bzr rm --force foo`` and \n"
11119
" ``bzr mv foo.new foo``,\n"
11120
"* ``--action=done`` will just mark the conflict as resolved."
11121
msgstr ""
11122
11123
#: en/help_topics/conflict-types.txt:371
11124
msgid ""
11125
"MalformedTransform\n"
11126
"------------------"
11127
msgstr ""
11128
11129
#: en/help_topics/conflict-types.txt:374
11130
msgid ""
11131
"It is possible (though very rare) for Bazaar to raise a MalformedTransform\n"
11132
"exception. This means that Bazaar encountered a filesystem conflict that it "
11133
"was\n"
11134
"unable to resolve. This usually indicates a bug. Please let us know if "
11135
"you\n"
11136
"encounter this. Our bug tracker is at https://launchpad.net/bzr/+bugs\n"
11137
msgstr ""
11138
11139
#: en/help_topics/content-filters.txt:1
11140
msgid ""
11141
"Content Filters\n"
11142
"==============="
11143
msgstr ""
11144
11145
#: en/help_topics/content-filters.txt:4
11146
msgid ""
11147
"Content formats\n"
11148
"---------------"
11149
msgstr ""
11150
11151
#: en/help_topics/content-filters.txt:7
11152
msgid ""
11153
"Bazaar's content filtering allows you to store files in a different\n"
11154
"format from the copy in your working tree. This lets you, or your\n"
11155
"co-developers, use Windows development tools that expect CRLF files\n"
11156
"on projects that use other line-ending conventions. Among other things,\n"
11157
"content filters also let Unix developers more easily work on projects\n"
11158
"using Windows line-ending conventions, keyword expansion/compression,\n"
11159
"and trailing spaces on lines in text files to be implicitly stripped\n"
11160
"when committed."
11161
msgstr ""
11162
11163
#: en/help_topics/content-filters.txt:16
11164
msgid "To generalize, there are two content formats supported by Bazaar:"
11165
msgstr ""
11166
11167
#: en/help_topics/content-filters.txt:18
11168
msgid ""
11169
"* a canonical format - how files are stored internally\n"
11170
"* a convenience format - how files are created in a working tree."
11171
msgstr ""
11172
11173
#: en/help_topics/content-filters.txt:21
11174
msgid ""
11175
"\n"
11176
"Format conversion\n"
11177
"-----------------"
11178
msgstr ""
11179
11180
#: en/help_topics/content-filters.txt:25
11181
msgid ""
11182
"The conversion between these formats is done by content filters.\n"
11183
"A content filter has two parts:"
11184
msgstr ""
11185
11186
#: en/help_topics/content-filters.txt:28
11187
msgid ""
11188
"* a read converter - converts from convenience to canonical format\n"
11189
"* a write converter - converts from canonical to convenience format."
11190
msgstr ""
11191
11192
#: en/help_topics/content-filters.txt:31
11193
msgid ""
11194
"Many of these converters will provide *round-trip* conversion,\n"
11195
"i.e. applying the read converter followed by the write converter\n"
11196
"gives back the original content. However, others may provide an\n"
11197
"asymmetric conversion. For example, a read converter might strip\n"
11198
"trailing whitespace off lines in source code while the matching\n"
11199
"write converter might pass content through unchanged."
11200
msgstr ""
11201
11202
#: en/help_topics/content-filters.txt:38
11203
msgid ""
11204
"\n"
11205
"Enabling content filters\n"
11206
"------------------------"
11207
msgstr ""
11208
11209
#: en/help_topics/content-filters.txt:42
11210
msgid ""
11211
"Content filters are typically provided by plugins, so the first step\n"
11212
"in using them is to install the relevant plugins and read their\n"
11213
"documentation. Some plugins may be very specific about which files\n"
11214
"they filter, e.g. only files ending in ``.java`` or ``.php``.\n"
11215
"In other cases, the plugin may leave it in the user's hands to\n"
11216
"define which files are to be filtered. This is typically done\n"
11217
"using rule-based preferences. See ``bzr help rules`` for general\n"
11218
"information about defining these."
11219
msgstr ""
11220
11221
#: en/help_topics/content-filters.txt:51
11222
msgid ""
11223
"\n"
11224
"Impact on commands\n"
11225
"------------------"
11226
msgstr ""
11227
11228
#: en/help_topics/content-filters.txt:55
11229
msgid ""
11230
"Read converters are only applied to commands that read content from\n"
11231
"a working tree, e.g. status, diff and commit. For example, ``bzr diff``\n"
11232
"will apply read converters to files in the working tree, then compare\n"
11233
"the results to the content last committed."
11234
msgstr ""
11235
11236
#: en/help_topics/content-filters.txt:60
11237
msgid ""
11238
"Write converters are only applied by commands that **create files in a\n"
11239
"working tree**, e.g. branch, checkout, update. If you wish to see the\n"
11240
"canonical format of a file or tree, use ``bzr cat`` or ``bzr export``\n"
11241
"respectively."
11242
msgstr ""
11243
11244
#: en/help_topics/content-filters.txt:65
11245
msgid ""
11246
"Note: ``bzr commit`` does not implicitly apply write converters after\n"
11247
"comitting files. If this makes sense for a given plugin providing\n"
11248
"a content filter, the plugin can usually achieve this effect by using a\n"
11249
"``start_commit`` or ``post_commit`` hook say. See :doc:`hooks-help`\n"
11250
"for more information on hooks."
11251
msgstr ""
11252
11253
#: en/help_topics/content-filters.txt:71
11254
msgid ""
11255
"\n"
11256
"Refreshing your working tree\n"
11257
"----------------------------"
11258
msgstr ""
11259
11260
#: en/help_topics/content-filters.txt:75
11261
msgid ""
11262
"For performance reasons, Bazaar caches the timestamps of files in\n"
11263
"a working tree, and assumes files are unchanged if their timestamps\n"
11264
"match the cached values. As a consequence, there are times when\n"
11265
"you may need to explicitly ask for content filtering to be reapplied\n"
11266
"in one or both directions, e.g. after installing or reconfiguring\n"
11267
"plugins providing it."
11268
msgstr ""
11269
11270
#: en/help_topics/content-filters.txt:82
11271
msgid "Here are some general guidelines for doing this:"
11272
msgstr ""
11273
11274
#: en/help_topics/content-filters.txt:84
11275
msgid ""
11276
" * To reapply read converters, ``touch`` files, i.e. update their\n"
11277
" timestamp. Operations like ``bzr status`` should then reapply the\n"
11278
" relevant read converters and compare the end result with the\n"
11279
" canonical format."
11280
msgstr ""
11281
11282
#: en/help_topics/content-filters.txt:89
11283
msgid ""
11284
" * To reapply write converters, ensure there are no local changes,\n"
11285
" delete the relevant files and run ``bzr revert`` on those files."
11286
msgstr ""
11287
11288
#: en/help_topics/content-filters.txt:92
11289
msgid ""
11290
"Note: In the future, it is likely that additional options will be added\n"
11291
"to commands to make this refreshing process faster and safer.\n"
11292
msgstr ""
11293
11294
#: en/help_topics/current-formats.txt:1
11295
msgid "Current Storage Formats"
11296
msgstr ""
11297
11298
#: en/help_topics/current-formats.txt:3
11299
msgid ""
11300
":2a:\n"
11301
" (native) (default) Format for the bzr 2.0 series. Uses group-\n"
11302
" compress storage. Provides rich roots which are a one-way\n"
11303
" transition."
11304
msgstr ""
11305
11306
#: en/help_topics/current-formats.txt:8 en/help_topics/other-formats.txt:17
11307
msgid ""
11308
"\n"
11309
"See :doc:`formats-help` for more about storage formats."
11310
msgstr ""
11311
11312
#: en/help_topics/debug-flags.txt:1
11313
msgid ""
11314
"Debug Flags\n"
11315
"==========="
11316
msgstr ""
11317
11318
#: en/help_topics/debug-flags.txt:4
11319
msgid ""
11320
"These flags can be passed on the bzr command line or (without the ``-D``\n"
11321
"prefix) put in the ``debug_flags`` variable in ``bazaar.conf``."
11322
msgstr ""
11323
11324
#: en/help_topics/debug-flags.txt:7
11325
msgid ""
11326
"-Dauth Trace authentication sections used.\n"
11327
"-Dbytes Print out how many bytes were transferred\n"
11328
"-Ddirstate Trace dirstate activity (verbose!)\n"
11329
"-Derror Instead of normal error handling, always print a "
11330
"traceback\n"
11331
" on error.\n"
11332
"-Devil Capture call sites that do expensive or badly-scaling\n"
11333
" operations.\n"
11334
"-Dfetch Trace history copying between repositories.\n"
11335
"-Dfilters Emit information for debugging content filtering.\n"
11336
"-Dforceinvdeltas Force use of inventory deltas during generic streaming "
11337
"fetch.\n"
11338
"-Dgraph Trace graph traversal.\n"
11339
"-Dhashcache Log every time a working file is read to determine its "
11340
"hash.\n"
11341
"-Dhooks Trace hook execution.\n"
11342
"-Dhpss Trace smart protocol requests and responses.\n"
11343
"-Dhpssdetail More hpss details.\n"
11344
"-Dhpssvfs Traceback on vfs access to Remote objects.\n"
11345
"-Dhttp Trace http connections, requests and responses.\n"
11346
"-Dindex Trace major index operations.\n"
11347
"-Dknit Trace knit operations.\n"
11348
"-Dlock Trace when lockdir locks are taken or released.\n"
11349
"-Dnoretry If a connection is reset, fail immediately rather than\n"
11350
" retrying the request.\n"
11351
"-Dprogress Trace progress bar operations.\n"
11352
"-Dmem_dump Dump memory to a file upon an out of memory error.\n"
11353
"-Dmerge Emit information for debugging merges.\n"
11354
"-Dno_apport Don't use apport to report crashes.\n"
11355
"-Dno_activity \t Don't show transport activity indicator in progress bar.\n"
11356
"-Dpack Emit information about pack operations.\n"
11357
"-Drelock Emit a message every time a branch or repository object "
11358
"is\n"
11359
" unlocked then relocked the same way.\n"
11360
"-Dsftp Trace SFTP internals.\n"
11361
"-Dstatic_tuple Error when a tuple is used where a StaticTuple is "
11362
"expected\n"
11363
"-Dstream Trace fetch streams.\n"
11364
"-Dstrict_locks Trace when OS locks are potentially used in a non-"
11365
"portable\n"
11366
" manner.\n"
11367
"-Dunlock Some errors during unlock are treated as warnings.\n"
11368
"-DIDS_never Never use InterDifferingSerializer when fetching.\n"
11369
"-DIDS_always Always use InterDifferingSerializer to fetch if "
11370
"appropriate\n"
11371
" for the format, even for non-local fetches.\n"
11372
msgstr ""
11373
11374
#: en/help_topics/diverged-branches.txt:1
11375
msgid ""
11376
"Diverged Branches\n"
11377
"================="
11378
msgstr ""
11379
11380
#: en/help_topics/diverged-branches.txt:4
11381
msgid ""
11382
"When Bazaar tries to push one branch onto another, it requires that the\n"
11383
"destination branch must be ready to receive the source branch. If this "
11384
"isn't\n"
11385
"the case, then we say that the branches have ``diverged``. Branches are\n"
11386
"considered diverged if the destination branch's most recent commit is one "
11387
"that\n"
11388
"has not been merged (directly or indirectly) by the source branch. To "
11389
"recover\n"
11390
"from diverged branches, one must merge the missing revisions into the "
11391
"source\n"
11392
"branch."
11393
msgstr ""
11394
11395
#: en/help_topics/diverged-branches.txt:12
11396
msgid ""
11397
"This situation commonly arises when using a centralized workflow with local\n"
11398
"commits. If someone else has committed new work to the mainline since your\n"
11399
"last pull and you have local commits that have not yet been pushed to the\n"
11400
"mainline, then your local branch and the mainline have diverged."
11401
msgstr ""
11402
11403
#: en/help_topics/diverged-branches.txt:17
11404
msgid ""
11405
"Discovering What Has Diverged\n"
11406
"-----------------------------"
11407
msgstr ""
11408
11409
#: en/help_topics/diverged-branches.txt:20
11410
msgid ""
11411
"The ``bzr missing`` command is used to find out what revisions are in "
11412
"another\n"
11413
"branch that are not present in the current branch, and vice-versa. It shows "
11414
"a\n"
11415
"summary of which extra revisions exist in each branch. If you want to see "
11416
"the\n"
11417
"precise effects of those revisions, you can use ``bzr diff --"
11418
"old=other_branch``\n"
11419
"to show the differences between other_branch and your current branch."
11420
msgstr ""
11421
11422
#: en/help_topics/diverged-branches.txt:26
11423
msgid ""
11424
"A Solution\n"
11425
"----------"
11426
msgstr ""
11427
11428
#: en/help_topics/diverged-branches.txt:29
11429
msgid ""
11430
"The solution is to merge the revisions from the mainline into your local\n"
11431
"branch. To do so, use ``bzr merge`` to get the new revisions from the\n"
11432
"mainline. This merge may result in conflicts if the other developer's "
11433
"changes\n"
11434
"overlap with your changes. These conflicts should be resolved before\n"
11435
"continuing. After any conflicts have been resolved, or even if there were "
11436
"no\n"
11437
"conflicts, Bazaar requires that you explicitly commit these new revisions\n"
11438
"to your local branch. This requirement gives you an opportunity to test "
11439
"the\n"
11440
"resulting working tree for correctness, since the merged revisions could "
11441
"have\n"
11442
"made arbitrary changes. After testing, you should commit the merge using\n"
11443
"``bzr commit``. This clears up the diverged branches situation. Your "
11444
"local\n"
11445
"branch can now be pushed to the mainline.\n"
11446
msgstr ""
11447
11448
#: en/help_topics/eol.txt:1
11449
msgid ""
11450
"End of Line Conversion\n"
11451
"======================"
11452
msgstr ""
11453
11454
#: en/help_topics/eol.txt:4
11455
msgid ""
11456
"EOL conversion is provided as a content filter where Bazaar internally\n"
11457
"stores a canonical format but outputs a convenience format. See\n"
11458
"``bzr help content-filters`` for general information about using these."
11459
msgstr ""
11460
11461
#: en/help_topics/eol.txt:8
11462
msgid ""
11463
"Note: Content filtering is only supported in recently added formats,\n"
11464
"e.g. 1.14. Be sure that both the repository *and* the branch are\n"
11465
"in a recent format. (Just setting the format on the repository\n"
11466
"is not enough.) If content filtering does not appear to be working, use\n"
11467
"'bzr info -v' to confirm that the branch is using \"Working tree format 5\"\n"
11468
"or later."
11469
msgstr ""
11470
11471
#: en/help_topics/eol.txt:15
11472
msgid ""
11473
"EOL conversion needs to be enabled for selected file patterns using\n"
11474
"rules. See ``bzr help rules`` for general information on defining rules.\n"
11475
"Currently, rules are only supported in $BZR_HOME/.bazaar/rules (or\n"
11476
"%BZR_HOME%/bazaar/2.0/rules on Windows). Branch specific rules will be\n"
11477
"supported in a future verison of Bazaar."
11478
msgstr ""
11479
11480
#: en/help_topics/eol.txt:21
11481
msgid ""
11482
"To configure which files to filter, set ``eol`` to one of the values below.\n"
11483
"(If a value is not set, ``exact`` is the default.)"
11484
msgstr ""
11485
11486
#: en/help_topics/eol.txt:24
11487
msgid ""
11488
" ========== ===================================== ======================\n"
11489
" Value Checkout end-of-lines as Commit end-of-lines as\n"
11490
" ========== ===================================== ======================\n"
11491
" ``native`` ``crlf`` on Windows, ``lf`` otherwise ``lf``\n"
11492
" ---------- ------------------------------------- ----------------------\n"
11493
" ``lf`` ``lf`` ``lf``\n"
11494
" ---------- ------------------------------------- ----------------------\n"
11495
" ``crlf`` ``crlf`` ``lf``\n"
11496
" ---------- ------------------------------------- ----------------------\n"
11497
" ``exact`` No conversion Exactly as in file\n"
11498
" ========== ===================================== ======================"
11499
msgstr ""
11500
11501
#: en/help_topics/eol.txt:36
11502
msgid ""
11503
"Note: For safety reasons, no conversion is applied to any file where a null\n"
11504
"byte is detected in the file."
11505
msgstr ""
11506
11507
#: en/help_topics/eol.txt:39
11508
msgid ""
11509
"For users working on a cross-platform project, here is a suggested rule\n"
11510
"to use as a starting point::"
11511
msgstr ""
11512
11513
#: en/help_topics/eol.txt:42 en/help_topics/eol.txt:52
11514
#: en/help_topics/eol.txt:67 en/help_topics/eol.txt:82
11515
msgid ""
11516
" [name *]\n"
11517
" eol = native"
11518
msgstr ""
11519
11520
#: en/help_topics/eol.txt:45
11521
msgid ""
11522
"If you have binary files that do not contain a null byte though, be\n"
11523
"sure to add ``eol = exact`` rules for those as well. You can do this\n"
11524
"by giving more explicit patterns earlier in the rules file. For example::"
11525
msgstr ""
11526
11527
#: en/help_topics/eol.txt:49
11528
msgid ""
11529
" [name *.png]\n"
11530
" eol = exact"
11531
msgstr ""
11532
11533
#: en/help_topics/eol.txt:55
11534
msgid ""
11535
"If your working tree is on a network drive shared by users on different\n"
11536
"operating systems, you typically want to force certain conventions for\n"
11537
"certain files. In that way, if a file is created with the wrong line\n"
11538
"endings or line endings get mixed during editing, it gets committed\n"
11539
"correctly and gets checked out correctly. For example::"
11540
msgstr ""
11541
11542
#: en/help_topics/eol.txt:61
11543
msgid ""
11544
" [name *.bat]\n"
11545
" eol = crlf"
11546
msgstr ""
11547
11548
#: en/help_topics/eol.txt:64
11549
msgid ""
11550
" [name *.sh]\n"
11551
" eol = lf"
11552
msgstr ""
11553
11554
#: en/help_topics/eol.txt:70
11555
msgid ""
11556
"If you take the care to create files with their required endings, you can\n"
11557
"achieve *almost* the same thing by using ``eol = exact``. It is slightly\n"
11558
"safer to use ``lf`` and ``crlf`` though because edits accidentally\n"
11559
"introducing mixed line endings will be corrected during commit for files\n"
11560
"with those settings."
11561
msgstr ""
11562
11563
#: en/help_topics/eol.txt:76
11564
msgid ""
11565
"If you have sample test data that deliberately has text files with mixed\n"
11566
"newline conventions, you can ask for those to be left alone like this::"
11567
msgstr ""
11568
11569
#: en/help_topics/eol.txt:79
11570
msgid ""
11571
" [name test_data/]\n"
11572
" eol = exact"
11573
msgstr ""
11574
11575
#: en/help_topics/eol.txt:85
11576
msgid ""
11577
"Note that ``exact`` does not imply the file is binary but it does mean\n"
11578
"that no conversion of end-of-lines will be done. (Bazaar currently relies\n"
11579
"of content analysis to detect binary files for commands like ``diff``.\n"
11580
"In the future, a ``binary = true`` rule may be added but it is not\n"
11581
"supported yet.)"
11582
msgstr ""
11583
11584
#: en/help_topics/eol.txt:91
11585
msgid ""
11586
"If you have an existing repository with text files already stored using\n"
11587
"Windows newline conventions (``crlf``), then you may want to keep using "
11588
"that\n"
11589
"convention in the repository. Forcing certain files to this convention\n"
11590
"may also help users who do not have rules configured. To do this, set\n"
11591
"``eol`` to one of the values below."
11592
msgstr ""
11593
11594
#: en/help_topics/eol.txt:97
11595
msgid ""
11596
" ============================ ======================== "
11597
"======================\n"
11598
" Value Checkout end-of-lines as Commit end-of-lines "
11599
"as\n"
11600
" ============================ ======================== "
11601
"======================\n"
11602
" ``native-with-crlf-in-repo`` ``crlf`` on Windows, ``crlf``\n"
11603
" ``lf`` otherwise\n"
11604
" ---------------------------- ------------------------ ----------------------"
11605
"\n"
11606
" ``lf-with-crlf-in-repo`` ``lf`` ``crlf``\n"
11607
" ---------------------------- ------------------------ ----------------------"
11608
"\n"
11609
" ``crlf-with-crlf-in-repo`` ``crlf`` ``crlf``\n"
11610
" ============================ ======================== ======================"
11611
msgstr ""
11612
11613
#: en/help_topics/eol.txt:108
11614
msgid ""
11615
"For users working on an existing project that uses Windows newline\n"
11616
"conventions in their Bazaar repository, this rule is suggested as a\n"
11617
"starting point::"
11618
msgstr ""
11619
11620
#: en/help_topics/eol.txt:112
11621
msgid ""
11622
" [name *]\n"
11623
" eol = native-with-crlf-in-repo"
11624
msgstr ""
11625
11626
#: en/help_topics/eol.txt:115
11627
msgid ""
11628
"For new projects, it is recommended that end-of-lines be stored as ``lf``\n"
11629
"and that users stick to the basic settings, i.e. ``native``, ``lf``,\n"
11630
"``crlf`` and ``exact``."
11631
msgstr ""
11632
11633
#: en/help_topics/eol.txt:119
11634
msgid ""
11635
"Note: Bazaar's EOL conversion will convert the content of files but\n"
11636
"never reject files because a given line ending or mixed line endings\n"
11637
"are found. A precommit hook should be used if you wish to validate\n"
11638
"(and not just convert) content before committing.\n"
11639
msgstr ""
11640
11641
#: en/help_topics/hidden-commands.txt:1
11642
msgid ""
11643
"added List files added in working tree.\n"
11644
"ancestry List all revisions merged into this branch.\n"
11645
"assert-fail Test reporting of assertion failures\n"
11646
"bundle-info Output interesting stats about a bundle\n"
11647
"bundle-revisions Create a merge-directive for submitting changes.\n"
11648
"cat-revision Write out metadata for a revision.\n"
11649
"dump-btree Dump the contents of a btree index file to stdout.\n"
11650
"export-pot Export command helps and error messages in po format.\n"
11651
"file-id Print file_id of a particular file or directory.\n"
11652
"file-path Print path of file_ids to a file or directory.\n"
11653
"find-merge-base Find and print a base revision for merging two "
11654
"branches.\n"
11655
"hooks Show hooks.\n"
11656
"inventory Show inventory of the current working copy or a "
11657
"revision.\n"
11658
"local-time-offset Show the offset in seconds from GMT to local time.\n"
11659
"lookup-revision Lookup the revision-id from a revision-number\n"
11660
"merge-directive Generate a merge directive for auto-merge tools.\n"
11661
"modified List files modified in working tree.\n"
11662
"re-sign Create a digital signature for an existing revision.\n"
11663
"reference list, view and set branch locations for nested trees.\n"
11664
"relpath Show path of a file relative to root\n"
11665
"repair-workingtree Reset the working tree state file.\n"
11666
"revision-history Display the list of revision ids on a branch.\n"
11667
"revision-info Show revision number and revision id for a given "
11668
"revision\n"
11669
" identifier.\n"
11670
"rocks Statement of optimism.\n"
11671
"selftest Run internal test suite.\n"
11672
"shell-complete Show appropriate completions for context.\n"
11673
"test-script Run a shell-like test from a file.\n"
11674
"touching-revisions Return revision-ids which affected a particular file.\n"
11675
"unknowns List unknown files.\n"
11676
"wait-until-signalled Test helper for\n"
11677
" test_start_and_stop_bzr_subprocess_send_signal.\n"
11678
msgstr ""
11679
11680
#: en/help_topics/hooks.txt:1
11681
msgid ""
11682
"\n"
11683
"Hooks\n"
11684
"====="
11685
msgstr ""
11686
11687
#: en/help_topics/hooks.txt:5 en/help_topics/rules.txt:4
11688
msgid ""
11689
"Introduction\n"
11690
"------------"
11691
msgstr ""
11692
11693
#: en/help_topics/hooks.txt:8
11694
msgid "A hook of type *xxx* of class *yyy* needs to be registered using::"
11695
msgstr ""
11696
11697
#: en/help_topics/hooks.txt:10
11698
msgid " yyy.hooks.install_named_hook(\"xxx\", ...)"
11699
msgstr ""
11700
11701
#: en/help_topics/hooks.txt:12
11702
msgid ""
11703
"See :doc:`Using hooks<../user-guide/hooks>` in the User Guide for examples."
11704
msgstr ""
11705
11706
#: en/help_topics/hooks.txt:14
11707
msgid ""
11708
"The class that contains each hook is given before the hooks it supplies. "
11709
"For\n"
11710
"instance, BranchHooks as the class is the hooks class for\n"
11711
"`bzrlib.branch.Branch.hooks`."
11712
msgstr ""
11713
11714
#: en/help_topics/hooks.txt:18
11715
msgid ""
11716
"Each description also indicates whether the hook runs on the client (the\n"
11717
"machine where bzr was invoked) or the server (the machine addressed by\n"
11718
"the branch URL). These may be, but are not necessarily, the same machine."
11719
msgstr ""
11720
11721
#: en/help_topics/hooks.txt:22
11722
msgid ""
11723
"Plugins (including hooks) are run on the server if all of these is true:"
11724
msgstr ""
11725
11726
#: en/help_topics/hooks.txt:24
11727
msgid ""
11728
" * The connection is via a smart server (accessed with a URL starting with\n"
11729
" \"bzr://\", \"bzr+ssh://\" or \"bzr+http://\", or accessed via a "
11730
"\"http://\"\n"
11731
" URL when a smart server is available via HTTP)."
11732
msgstr ""
11733
11734
#: en/help_topics/hooks.txt:28
11735
msgid ""
11736
" * The hook is either server specific or part of general infrastructure "
11737
"rather\n"
11738
" than client specific code (such as commit)."
11739
msgstr ""
11740
11741
#: en/help_topics/hooks.txt:31
11742
msgid ""
11743
"\n"
11744
"BranchHooks\n"
11745
"-----------"
11746
msgstr ""
11747
11748
#: en/help_topics/hooks.txt:35
11749
msgid ""
11750
"automatic_tag_name\n"
11751
"~~~~~~~~~~~~~~~~~~"
11752
msgstr ""
11753
11754
#: en/help_topics/hooks.txt:38 en/help_topics/hooks.txt:56
11755
#: en/help_topics/hooks.txt:102 en/help_topics/hooks.txt:259
11756
msgid "Introduced in: 2.2"
11757
msgstr ""
11758
11759
#: en/help_topics/hooks.txt:40
11760
msgid ""
11761
"Called to determine an automatic tag name for a revision.\n"
11762
"automatic_tag_name is called with (branch, revision_id) and should\n"
11763
"return a tag name or None if no tag name could be determined. The\n"
11764
"first non-None tag name returned will be used."
11765
msgstr ""
11766
11767
#: en/help_topics/hooks.txt:45
11768
msgid ""
11769
"open\n"
11770
"~~~~"
11771
msgstr ""
11772
11773
#: en/help_topics/hooks.txt:48 en/help_topics/hooks.txt:290
11774
#: en/help_topics/hooks.txt:304
11775
msgid "Introduced in: 1.8"
11776
msgstr ""
11777
11778
#: en/help_topics/hooks.txt:50
11779
msgid ""
11780
"Called with the Branch object that has been opened after a branch is\n"
11781
"opened."
11782
msgstr ""
11783
11784
#: en/help_topics/hooks.txt:53
11785
msgid ""
11786
"post_branch_init\n"
11787
"~~~~~~~~~~~~~~~~"
11788
msgstr ""
11789
11790
#: en/help_topics/hooks.txt:58
11791
msgid ""
11792
"Called after new branch initialization completes. post_branch_init is\n"
11793
"called with a bzrlib.branch.BranchInitHookParams. Note that init,\n"
11794
"branch and checkout (both heavyweight and lightweight) will all\n"
11795
"trigger this hook."
11796
msgstr ""
11797
11798
#: en/help_topics/hooks.txt:63
11799
msgid ""
11800
"post_change_branch_tip\n"
11801
"~~~~~~~~~~~~~~~~~~~~~~"
11802
msgstr ""
11803
11804
#: en/help_topics/hooks.txt:66 en/help_topics/hooks.txt:418
11805
msgid "Introduced in: 1.4"
11806
msgstr ""
11807
11808
#: en/help_topics/hooks.txt:68
11809
msgid ""
11810
"Called in bzr client and server after a change to the tip of a branch\n"
11811
"is made. post_change_branch_tip is called with a\n"
11812
"bzrlib.branch.ChangeBranchTipParams. Note that push, pull, commit,\n"
11813
"uncommit will all trigger this hook."
11814
msgstr ""
11815
11816
#: en/help_topics/hooks.txt:73 en/help_topics/hooks.txt:389
11817
msgid ""
11818
"post_commit\n"
11819
"~~~~~~~~~~~"
11820
msgstr ""
11821
11822
#: en/help_topics/hooks.txt:76 en/help_topics/hooks.txt:86
11823
#: en/help_topics/hooks.txt:94 en/help_topics/hooks.txt:110
11824
#: en/help_topics/hooks.txt:145
11825
msgid "Introduced in: 0.15"
11826
msgstr ""
11827
11828
#: en/help_topics/hooks.txt:78
11829
msgid ""
11830
"Called in the bzr client after a commit has completed. post_commit is\n"
11831
"called with (local, master, old_revno, old_revid, new_revno,\n"
11832
"new_revid). old_revid is NULL_REVISION for the first commit to a\n"
11833
"branch."
11834
msgstr ""
11835
11836
#: en/help_topics/hooks.txt:83
11837
msgid ""
11838
"post_pull\n"
11839
"~~~~~~~~~"
11840
msgstr ""
11841
11842
#: en/help_topics/hooks.txt:88
11843
msgid ""
11844
"Called after a pull operation completes. post_pull is called with a\n"
11845
"bzrlib.branch.PullResult object and only runs in the bzr client."
11846
msgstr ""
11847
11848
#: en/help_topics/hooks.txt:91
11849
msgid ""
11850
"post_push\n"
11851
"~~~~~~~~~"
11852
msgstr ""
11853
11854
#: en/help_topics/hooks.txt:96
11855
msgid ""
11856
"Called after a push operation completes. post_push is called with a\n"
11857
"bzrlib.branch.BranchPushResult object and only runs in the bzr client."
11858
msgstr ""
11859
11860
#: en/help_topics/hooks.txt:99
11861
msgid ""
11862
"post_switch\n"
11863
"~~~~~~~~~~~"
11864
msgstr ""
11865
11866
#: en/help_topics/hooks.txt:104
11867
msgid ""
11868
"Called after a checkout switches branch. post_switch is called with a\n"
11869
"bzrlib.branch.SwitchHookParams."
11870
msgstr ""
11871
11872
#: en/help_topics/hooks.txt:107
11873
msgid ""
11874
"post_uncommit\n"
11875
"~~~~~~~~~~~~~"
11876
msgstr ""
11877
11878
#: en/help_topics/hooks.txt:112
11879
msgid ""
11880
"Called in the bzr client after an uncommit completes. post_uncommit is\n"
11881
"called with (local, master, old_revno, old_revid, new_revno,\n"
11882
"new_revid) where local is the local branch or None, master is the\n"
11883
"target branch, and an empty branch receives new_revno of 0, new_revid\n"
11884
"of None."
11885
msgstr ""
11886
11887
#: en/help_topics/hooks.txt:118
11888
msgid ""
11889
"pre_change_branch_tip\n"
11890
"~~~~~~~~~~~~~~~~~~~~~"
11891
msgstr ""
11892
11893
#: en/help_topics/hooks.txt:121
11894
msgid "Introduced in: 1.6"
11895
msgstr ""
11896
11897
#: en/help_topics/hooks.txt:123
11898
msgid ""
11899
"Called in bzr client and server before a change to the tip of a branch\n"
11900
"is made. pre_change_branch_tip is called with a\n"
11901
"bzrlib.branch.ChangeBranchTipParams. Note that push, pull, commit,\n"
11902
"uncommit will all trigger this hook."
11903
msgstr ""
11904
11905
#: en/help_topics/hooks.txt:128
11906
msgid ""
11907
"pre_commit\n"
11908
"~~~~~~~~~~"
11909
msgstr ""
11910
11911
#: en/help_topics/hooks.txt:131
11912
msgid "Introduced in: 0.91"
11913
msgstr ""
11914
11915
#: en/help_topics/hooks.txt:133
11916
msgid ""
11917
"Called after a commit is calculated but before it is completed.\n"
11918
"pre_commit is called with (local, master, old_revno, old_revid,\n"
11919
"future_revno, future_revid, tree_delta, future_tree). old_revid is\n"
11920
"NULL_REVISION for the first commit to a branch, tree_delta is a\n"
11921
"TreeDelta object describing changes from the basis revision. hooks\n"
11922
"MUST NOT modify this delta. future_tree is an in-memory tree obtained\n"
11923
"from CommitBuilder.revision_tree() and hooks MUST NOT modify this\n"
11924
"tree."
11925
msgstr ""
11926
11927
#: en/help_topics/hooks.txt:142
11928
msgid ""
11929
"set_rh\n"
11930
"~~~~~~"
11931
msgstr ""
11932
11933
#: en/help_topics/hooks.txt:147
11934
msgid ""
11935
"Invoked whenever the revision history has been set via\n"
11936
"set_revision_history. The api signature is (branch, revision_history),\n"
11937
"and the branch will be write-locked. The set_rh hook can be expensive\n"
11938
"for bzr to trigger, a better hook to use is\n"
11939
"Branch.post_change_branch_tip."
11940
msgstr ""
11941
11942
#: en/help_topics/hooks.txt:153
11943
msgid ""
11944
"transform_fallback_location\n"
11945
"~~~~~~~~~~~~~~~~~~~~~~~~~~~"
11946
msgstr ""
11947
11948
#: en/help_topics/hooks.txt:156
11949
msgid "Introduced in: 1.9"
11950
msgstr ""
11951
11952
#: en/help_topics/hooks.txt:158
11953
msgid ""
11954
"Called when a stacked branch is activating its fallback locations.\n"
11955
"transform_fallback_location is called with (branch, url), and should\n"
11956
"return a new url. Returning the same url allows it to be used as-is,\n"
11957
"returning a different one can be used to cause the branch to stack on\n"
11958
"a closer copy of that fallback_location. Note that the branch cannot\n"
11959
"have history accessing methods called on it during this hook because\n"
11960
"the fallback locations have not been activated. When there are\n"
11961
"multiple hooks installed for transform_fallback_location, all are\n"
11962
"called with the url returned from the previous hook.The order is\n"
11963
"however undefined."
11964
msgstr ""
11965
11966
#: en/help_topics/hooks.txt:169
11967
msgid ""
11968
"CommandHooks\n"
11969
"------------"
11970
msgstr ""
11971
11972
#: en/help_topics/hooks.txt:172
11973
msgid ""
11974
"extend_command\n"
11975
"~~~~~~~~~~~~~~"
11976
msgstr ""
11977
11978
#: en/help_topics/hooks.txt:175
11979
msgid "Introduced in: 1.13"
11980
msgstr ""
11981
11982
#: en/help_topics/hooks.txt:177
11983
msgid ""
11984
"Called after creating a command object to allow modifications such as\n"
11985
"adding or removing options, docs etc. Called with the new\n"
11986
"bzrlib.commands.Command object."
11987
msgstr ""
11988
11989
#: en/help_topics/hooks.txt:181
11990
msgid ""
11991
"get_command\n"
11992
"~~~~~~~~~~~"
11993
msgstr ""
11994
11995
#: en/help_topics/hooks.txt:184 en/help_topics/hooks.txt:196
11996
#: en/help_topics/hooks.txt:205 en/help_topics/hooks.txt:464
11997
msgid "Introduced in: 1.17"
11998
msgstr ""
11999
12000
#: en/help_topics/hooks.txt:186
12001
msgid ""
12002
"Called when creating a single command. Called with (cmd_or_None,\n"
12003
"command_name). get_command should either return the cmd_or_None\n"
12004
"parameter, or a replacement Command object that should be used for the\n"
12005
"command. Note that the Command.hooks hooks are core infrastructure.\n"
12006
"Many users will prefer to use bzrlib.commands.register_command or\n"
12007
"plugin_cmds.register_lazy."
12008
msgstr ""
12009
12010
#: en/help_topics/hooks.txt:193
12011
msgid ""
12012
"get_missing_command\n"
12013
"~~~~~~~~~~~~~~~~~~~"
12014
msgstr ""
12015
12016
#: en/help_topics/hooks.txt:198
12017
msgid ""
12018
"Called when creating a single command if no command could be found.\n"
12019
"Called with (command_name). get_missing_command should either return\n"
12020
"None, or a Command object to be used for the command."
12021
msgstr ""
12022
12023
#: en/help_topics/hooks.txt:202
12024
msgid ""
12025
"list_commands\n"
12026
"~~~~~~~~~~~~~"
12027
msgstr ""
12028
12029
#: en/help_topics/hooks.txt:207
12030
msgid ""
12031
"Called when enumerating commands. Called with a set of cmd_name\n"
12032
"strings for all the commands found so far. This set is safe to mutate\n"
12033
"- e.g. to remove a command. list_commands should return the updated\n"
12034
"set of command names."
12035
msgstr ""
12036
12037
#: en/help_topics/hooks.txt:212
12038
msgid ""
12039
"_ConfigHooks\n"
12040
"------------"
12041
msgstr ""
12042
12043
#: en/help_topics/hooks.txt:215
12044
msgid ""
12045
"get\n"
12046
"~~~"
12047
msgstr ""
12048
12049
#: en/help_topics/hooks.txt:218 en/help_topics/hooks.txt:226
12050
#: en/help_topics/hooks.txt:233 en/help_topics/hooks.txt:241
12051
#: en/help_topics/hooks.txt:248 en/help_topics/hooks.txt:370
12052
#: en/help_topics/hooks.txt:443
12053
msgid "Introduced in: 2.4"
12054
msgstr ""
12055
12056
#: en/help_topics/hooks.txt:220
12057
msgid ""
12058
"Invoked when a config option is read. The signature is (stack, name,\n"
12059
"value)."
12060
msgstr ""
12061
12062
#: en/help_topics/hooks.txt:223
12063
msgid ""
12064
"load\n"
12065
"~~~~"
12066
msgstr ""
12067
12068
#: en/help_topics/hooks.txt:228
12069
msgid "Invoked when a config store is loaded. The signature is (store)."
12070
msgstr ""
12071
12072
#: en/help_topics/hooks.txt:230
12073
msgid ""
12074
"remove\n"
12075
"~~~~~~"
12076
msgstr ""
12077
12078
#: en/help_topics/hooks.txt:235
12079
msgid ""
12080
"Invoked when a config option is removed. The signature is (stack,\n"
12081
"name)."
12082
msgstr ""
12083
12084
#: en/help_topics/hooks.txt:238
12085
msgid ""
12086
"save\n"
12087
"~~~~"
12088
msgstr ""
12089
12090
#: en/help_topics/hooks.txt:243
12091
msgid "Invoked when a config store is saved. The signature is (store)."
12092
msgstr ""
12093
12094
#: en/help_topics/hooks.txt:245
12095
msgid ""
12096
"set\n"
12097
"~~~"
12098
msgstr ""
12099
12100
#: en/help_topics/hooks.txt:250
12101
msgid ""
12102
"Invoked when a config option is set. The signature is (stack, name,\n"
12103
"value)."
12104
msgstr ""
12105
12106
#: en/help_topics/hooks.txt:253
12107
msgid ""
12108
"ControlDirHooks\n"
12109
"---------------"
12110
msgstr ""
12111
12112
#: en/help_topics/hooks.txt:256
12113
msgid ""
12114
"post_repo_init\n"
12115
"~~~~~~~~~~~~~~"
12116
msgstr ""
12117
12118
#: en/help_topics/hooks.txt:261
12119
msgid ""
12120
"Invoked after a repository has been initialized. post_repo_init is\n"
12121
"called with a bzrlib.controldir.RepoInitHookParams."
12122
msgstr ""
12123
12124
#: en/help_topics/hooks.txt:264
12125
msgid ""
12126
"pre_open\n"
12127
"~~~~~~~~"
12128
msgstr ""
12129
12130
#: en/help_topics/hooks.txt:267
12131
msgid "Introduced in: 1.14"
12132
msgstr ""
12133
12134
#: en/help_topics/hooks.txt:269
12135
msgid ""
12136
"Invoked before attempting to open a ControlDir with the transport that\n"
12137
"the open will use."
12138
msgstr ""
12139
12140
#: en/help_topics/hooks.txt:272
12141
msgid ""
12142
"InfoHooks\n"
12143
"---------"
12144
msgstr ""
12145
12146
#: en/help_topics/hooks.txt:275
12147
msgid ""
12148
"repository\n"
12149
"~~~~~~~~~~"
12150
msgstr ""
12151
12152
#: en/help_topics/hooks.txt:278 en/help_topics/hooks.txt:297
12153
#: en/help_topics/hooks.txt:521
12154
msgid "Introduced in: 1.15"
12155
msgstr ""
12156
12157
#: en/help_topics/hooks.txt:280
12158
msgid ""
12159
"Invoked when displaying the statistics for a repository. repository is\n"
12160
"called with a statistics dictionary as returned by the repository and\n"
12161
"a file-like object to write to."
12162
msgstr ""
12163
12164
#: en/help_topics/hooks.txt:284
12165
msgid ""
12166
"LockHooks\n"
12167
"---------"
12168
msgstr ""
12169
12170
#: en/help_topics/hooks.txt:287
12171
msgid ""
12172
"lock_acquired\n"
12173
"~~~~~~~~~~~~~"
12174
msgstr ""
12175
12176
#: en/help_topics/hooks.txt:292
12177
msgid ""
12178
"Called with a bzrlib.lock.LockResult when a physical lock is acquired."
12179
msgstr ""
12180
12181
#: en/help_topics/hooks.txt:294
12182
msgid ""
12183
"lock_broken\n"
12184
"~~~~~~~~~~~"
12185
msgstr ""
12186
12187
#: en/help_topics/hooks.txt:299
12188
msgid "Called with a bzrlib.lock.LockResult when a physical lock is broken."
12189
msgstr ""
12190
12191
#: en/help_topics/hooks.txt:301
12192
msgid ""
12193
"lock_released\n"
12194
"~~~~~~~~~~~~~"
12195
msgstr ""
12196
12197
#: en/help_topics/hooks.txt:306
12198
msgid ""
12199
"Called with a bzrlib.lock.LockResult when a physical lock is released."
12200
msgstr ""
12201
12202
#: en/help_topics/hooks.txt:308
12203
msgid ""
12204
"MergeHooks\n"
12205
"----------"
12206
msgstr ""
12207
12208
#: en/help_topics/hooks.txt:311
12209
msgid ""
12210
"merge_file_content\n"
12211
"~~~~~~~~~~~~~~~~~~"
12212
msgstr ""
12213
12214
#: en/help_topics/hooks.txt:314
12215
msgid "Introduced in: 2.1"
12216
msgstr ""
12217
12218
#: en/help_topics/hooks.txt:316
12219
msgid ""
12220
"Called with a bzrlib.merge.Merger object to create a per file merge\n"
12221
"object when starting a merge. Should return either None or a subclass\n"
12222
"of ``bzrlib.merge.AbstractPerFileMerger``. Such objects will then be\n"
12223
"called per file that needs to be merged (including when one side has\n"
12224
"deleted the file and the other has changed it). See the\n"
12225
"AbstractPerFileMerger API docs for details on how it is used by merge."
12226
msgstr ""
12227
12228
#: en/help_topics/hooks.txt:323
12229
msgid ""
12230
"post_merge\n"
12231
"~~~~~~~~~~"
12232
msgstr ""
12233
12234
#: en/help_topics/hooks.txt:326 en/help_topics/hooks.txt:334
12235
#: en/help_topics/hooks.txt:384 en/help_topics/hooks.txt:402
12236
#: en/help_topics/hooks.txt:410 en/help_topics/hooks.txt:509
12237
msgid "Introduced in: 2.5"
12238
msgstr ""
12239
12240
#: en/help_topics/hooks.txt:328
12241
msgid ""
12242
"Called after a merge. Receives a Merger object as the single argument.\n"
12243
"The return value is ignored."
12244
msgstr ""
12245
12246
#: en/help_topics/hooks.txt:331
12247
msgid ""
12248
"pre_merge\n"
12249
"~~~~~~~~~"
12250
msgstr ""
12251
12252
#: en/help_topics/hooks.txt:336
12253
msgid ""
12254
"Called before a merge. Receives a Merger object as the single\n"
12255
"argument."
12256
msgstr ""
12257
12258
#: en/help_topics/hooks.txt:339
12259
msgid ""
12260
"MergeDirectiveHooks\n"
12261
"-------------------"
12262
msgstr ""
12263
12264
#: en/help_topics/hooks.txt:342
12265
msgid ""
12266
"merge_request_body\n"
12267
"~~~~~~~~~~~~~~~~~~"
12268
msgstr ""
12269
12270
#: en/help_topics/hooks.txt:345
12271
msgid "Introduced in: 1.15.0"
12272
msgstr ""
12273
12274
#: en/help_topics/hooks.txt:347
12275
msgid ""
12276
"Called with a MergeRequestBodyParams when a body is needed for a merge\n"
12277
"request. Callbacks must return a body. If more than one callback is\n"
12278
"registered, the output of one callback is provided to the next."
12279
msgstr ""
12280
12281
#: en/help_topics/hooks.txt:351
12282
msgid ""
12283
"MessageEditorHooks\n"
12284
"------------------"
12285
msgstr ""
12286
12287
#: en/help_topics/hooks.txt:354
12288
msgid ""
12289
"commit_message_template\n"
12290
"~~~~~~~~~~~~~~~~~~~~~~~"
12291
msgstr ""
12292
12293
#: en/help_topics/hooks.txt:357
12294
msgid "Introduced in: 1.10"
12295
msgstr ""
12296
12297
#: en/help_topics/hooks.txt:359
12298
msgid ""
12299
"Called when a commit message is being generated.\n"
12300
"commit_message_template is called with the bzrlib.commit.Commit object\n"
12301
"and the message that is known so far. commit_message_template must\n"
12302
"return a new message to use (which could be the same as it was given).\n"
12303
"When there are multiple hooks registered for commit_message_template,\n"
12304
"they are chained with the result from the first passed into the\n"
12305
"second, and so on."
12306
msgstr ""
12307
12308
#: en/help_topics/hooks.txt:367
12309
msgid ""
12310
"set_commit_message\n"
12311
"~~~~~~~~~~~~~~~~~~"
12312
msgstr ""
12313
12314
#: en/help_topics/hooks.txt:372
12315
msgid ""
12316
"Set a fixed commit message. set_commit_message is called with the\n"
12317
"bzrlib.commit.Commit object (so you can also change e.g. revision\n"
12318
"properties by editing commit.builder._revprops) and the message so\n"
12319
"far. set_commit_message must return the message to use or None if it\n"
12320
"should use the message editor as normal."
12321
msgstr ""
12322
12323
#: en/help_topics/hooks.txt:378
12324
msgid ""
12325
"MutableTreeHooks\n"
12326
"----------------"
12327
msgstr ""
12328
12329
#: en/help_topics/hooks.txt:381
12330
msgid ""
12331
"post_build_tree\n"
12332
"~~~~~~~~~~~~~~~"
12333
msgstr ""
12334
12335
#: en/help_topics/hooks.txt:386
12336
msgid ""
12337
"Called after a completely new tree is built. The hook is called with\n"
12338
"the tree as its only argument."
12339
msgstr ""
12340
12341
#: en/help_topics/hooks.txt:392
12342
msgid "Introduced in: 2.0"
12343
msgstr ""
12344
12345
#: en/help_topics/hooks.txt:394
12346
msgid ""
12347
"Called after a commit is performed on a tree. The hook is called with\n"
12348
"a bzrlib.mutabletree.PostCommitHookParams object. The mutable tree the\n"
12349
"commit was performed on is available via the mutable_tree attribute of\n"
12350
"that object."
12351
msgstr ""
12352
12353
#: en/help_topics/hooks.txt:399
12354
msgid ""
12355
"post_transform\n"
12356
"~~~~~~~~~~~~~~"
12357
msgstr ""
12358
12359
#: en/help_topics/hooks.txt:404
12360
msgid ""
12361
"Called after a tree transform has been performed on a tree. The hook\n"
12362
"is called with the tree that is being transformed and the transform."
12363
msgstr ""
12364
12365
#: en/help_topics/hooks.txt:407
12366
msgid ""
12367
"pre_transform\n"
12368
"~~~~~~~~~~~~~"
12369
msgstr ""
12370
12371
#: en/help_topics/hooks.txt:412
12372
msgid ""
12373
"Called before a tree transform on this tree. The hook is called with\n"
12374
"the tree that is being transformed and the transform."
12375
msgstr ""
12376
12377
#: en/help_topics/hooks.txt:415
12378
msgid ""
12379
"start_commit\n"
12380
"~~~~~~~~~~~~"
12381
msgstr ""
12382
12383
#: en/help_topics/hooks.txt:420
12384
msgid ""
12385
"Called before a commit is performed on a tree. The start commit hook\n"
12386
"is able to change the tree before the commit takes place. start_commit\n"
12387
"is called with the bzrlib.mutabletree.MutableTree that the commit is\n"
12388
"being performed on."
12389
msgstr ""
12390
12391
#: en/help_topics/hooks.txt:425
12392
msgid ""
12393
"SmartClientHooks\n"
12394
"----------------"
12395
msgstr ""
12396
12397
#: en/help_topics/hooks.txt:428
12398
msgid ""
12399
"call\n"
12400
"~~~~"
12401
msgstr ""
12402
12403
#: en/help_topics/hooks.txt:431
12404
msgid "Introduced in: unknown"
12405
msgstr ""
12406
12407
#: en/help_topics/hooks.txt:433
12408
msgid ""
12409
"Called when the smart client is submitting a request to the smart\n"
12410
"server. Called with a bzrlib.smart.client.CallHookParams object.\n"
12411
"Streaming request bodies, and responses, are not accessible."
12412
msgstr ""
12413
12414
#: en/help_topics/hooks.txt:437
12415
msgid ""
12416
"SmartServerHooks\n"
12417
"----------------"
12418
msgstr ""
12419
12420
#: en/help_topics/hooks.txt:440
12421
msgid ""
12422
"server_exception\n"
12423
"~~~~~~~~~~~~~~~~"
12424
msgstr ""
12425
12426
#: en/help_topics/hooks.txt:445
12427
msgid ""
12428
"Called by the bzr server when an exception occurs. server_exception is\n"
12429
"called with the sys.exc_info() tuple return true for the hook if the\n"
12430
"exception has been handled, in which case the server will exit\n"
12431
"normally."
12432
msgstr ""
12433
12434
#: en/help_topics/hooks.txt:450
12435
msgid ""
12436
"server_started\n"
12437
"~~~~~~~~~~~~~~"
12438
msgstr ""
12439
12440
#: en/help_topics/hooks.txt:453 en/help_topics/hooks.txt:472
12441
msgid "Introduced in: 0.16"
12442
msgstr ""
12443
12444
#: en/help_topics/hooks.txt:455
12445
msgid ""
12446
"Called by the bzr server when it starts serving a directory.\n"
12447
"server_started is called with (backing urls, public url), where\n"
12448
"backing_url is a list of URLs giving the server-specific directory\n"
12449
"locations, and public_url is the public URL for the directory being\n"
12450
"served."
12451
msgstr ""
12452
12453
#: en/help_topics/hooks.txt:461
12454
msgid ""
12455
"server_started_ex\n"
12456
"~~~~~~~~~~~~~~~~~"
12457
msgstr ""
12458
12459
#: en/help_topics/hooks.txt:466
12460
msgid ""
12461
"Called by the bzr server when it starts serving a directory.\n"
12462
"server_started is called with (backing_urls, server_obj)."
12463
msgstr ""
12464
12465
#: en/help_topics/hooks.txt:469
12466
msgid ""
12467
"server_stopped\n"
12468
"~~~~~~~~~~~~~~"
12469
msgstr ""
12470
12471
#: en/help_topics/hooks.txt:474
12472
msgid ""
12473
"Called by the bzr server when it stops serving a directory.\n"
12474
"server_stopped is called with the same parameters as the\n"
12475
"server_started hook: (backing_urls, public_url)."
12476
msgstr ""
12477
12478
#: en/help_topics/hooks.txt:478
12479
msgid ""
12480
"StatusHooks\n"
12481
"-----------"
12482
msgstr ""
12483
12484
#: en/help_topics/hooks.txt:481
12485
msgid ""
12486
"post_status\n"
12487
"~~~~~~~~~~~"
12488
msgstr ""
12489
12490
#: en/help_topics/hooks.txt:484 en/help_topics/hooks.txt:495
12491
msgid "Introduced in: 2.3"
12492
msgstr ""
12493
12494
#: en/help_topics/hooks.txt:486
12495
msgid ""
12496
"Called with argument StatusHookParams after Bazaar has displayed the\n"
12497
"status. StatusHookParams has the attributes (old_tree, new_tree,\n"
12498
"to_file, versioned, show_ids, short, verbose). The last four arguments\n"
12499
"correspond to the command line options specified by the user for the\n"
12500
"status command. to_file is the output stream for writing."
12501
msgstr ""
12502
12503
#: en/help_topics/hooks.txt:492
12504
msgid ""
12505
"pre_status\n"
12506
"~~~~~~~~~~"
12507
msgstr ""
12508
12509
#: en/help_topics/hooks.txt:497
12510
msgid ""
12511
"Called with argument StatusHookParams before Bazaar displays the\n"
12512
"status. StatusHookParams has the attributes (old_tree, new_tree,\n"
12513
"to_file, versioned, show_ids, short, verbose). The last four arguments\n"
12514
"correspond to the command line options specified by the user for the\n"
12515
"status command. to_file is the output stream for writing."
12516
msgstr ""
12517
12518
#: en/help_topics/hooks.txt:503
12519
msgid ""
12520
"TransportHooks\n"
12521
"--------------"
12522
msgstr ""
12523
12524
#: en/help_topics/hooks.txt:506
12525
msgid ""
12526
"post_connect\n"
12527
"~~~~~~~~~~~~"
12528
msgstr ""
12529
12530
#: en/help_topics/hooks.txt:511
12531
msgid ""
12532
"Called after a new connection is established or a reconnect occurs.\n"
12533
"The sole argument passed is either the connected transport or smart\n"
12534
"medium instance."
12535
msgstr ""
12536
12537
#: en/help_topics/hooks.txt:515
12538
msgid ""
12539
"RioVersionInfoBuilderHooks\n"
12540
"--------------------------"
12541
msgstr ""
12542
12543
#: en/help_topics/hooks.txt:518
12544
msgid ""
12545
"revision\n"
12546
"~~~~~~~~"
12547
msgstr ""
12548
12549
#: en/help_topics/hooks.txt:523
12550
msgid ""
12551
"Invoked when adding information about a revision to the RIO stanza\n"
12552
"that is printed. revision is called with a revision object and a RIO\n"
12553
"stanza.\n"
12554
msgstr ""
12555
12556
#: en/help_topics/location-alias.txt:1
12557
msgid ""
12558
"Location aliases\n"
12559
"================"
12560
msgstr ""
12561
12562
#: en/help_topics/location-alias.txt:4
12563
msgid ""
12564
"Bazaar defines several aliases for locations associated with a branch. "
12565
"These\n"
12566
"can be used with most commands that expect a location, such as `bzr push`."
12567
msgstr ""
12568
12569
#: en/help_topics/location-alias.txt:7
12570
msgid "The aliases are::"
12571
msgstr ""
12572
12573
#: en/help_topics/location-alias.txt:9
12574
msgid ""
12575
" :bound The branch this branch is bound to, for bound branches.\n"
12576
" :parent The parent of this branch.\n"
12577
" :public The public location of this branch.\n"
12578
" :push The saved location used for `bzr push` with no arguments.\n"
12579
" :submit The submit branch for this branch.\n"
12580
" :this This branch."
12581
msgstr ""
12582
12583
#: en/help_topics/location-alias.txt:16
12584
msgid "For example, to push to the parent location::"
12585
msgstr ""
12586
12587
#: en/help_topics/location-alias.txt:18
12588
msgid " bzr push :parent\n"
12589
msgstr ""
12590
12591
#: en/help_topics/log-formats.txt:1
12592
msgid ""
12593
"Log Formats\n"
12594
"==========="
12595
msgstr ""
12596
12597
#: en/help_topics/log-formats.txt:4
12598
msgid ""
12599
"A log format controls how information about each revision is displayed.\n"
12600
"The standard log formats are compared below::"
12601
msgstr ""
12602
12603
#: en/help_topics/log-formats.txt:7
12604
msgid ""
12605
" Feature long short line\n"
12606
" ---------------------- ------------- ------------ -------------------\n"
12607
" design goal detailed view concise view 1 revision per line\n"
12608
" committer name+email name only name only\n"
12609
" author name+email - -\n"
12610
" date-time format full date only date only\n"
12611
" commit message full full top line\n"
12612
" tags yes yes yes\n"
12613
" merges indicator - yes -\n"
12614
" status/delta optional optional -\n"
12615
" diff/patch optional optional -\n"
12616
" revision-id optional optional -\n"
12617
" branch nick yes - -\n"
12618
" foreign vcs properties yes yes -\n"
12619
" preferred levels all 1 1\n"
12620
" digital signature optional - -"
12621
msgstr ""
12622
12623
#: en/help_topics/log-formats.txt:24
12624
msgid ""
12625
"The default format is ``long``. To change this, define the ``log_format``\n"
12626
"setting in the ``[DEFAULT]`` section of ``bazaar.conf`` like this (say)::"
12627
msgstr ""
12628
12629
#: en/help_topics/log-formats.txt:27
12630
msgid ""
12631
" [DEFAULT]\n"
12632
" log_format = short"
12633
msgstr ""
12634
12635
#: en/help_topics/log-formats.txt:30
12636
msgid ""
12637
"Alternatively, to change the log format used for a given query, use the\n"
12638
"--long, --short or --line options."
12639
msgstr ""
12640
12641
#: en/help_topics/log-formats.txt:33
12642
msgid ""
12643
"If one of the standard log formats does not meet your needs, additional\n"
12644
"formats can be provided by plugins.\n"
12645
msgstr ""
12646
12647
#: en/help_topics/other-formats.txt:1
12648
msgid "Other Storage Formats"
12649
msgstr ""
12650
12651
#: en/help_topics/other-formats.txt:3
12652
msgid "Experimental formats are shown below."
12653
msgstr ""
12654
12655
#: en/help_topics/other-formats.txt:5
12656
msgid ""
12657
":development-colo:\n"
12658
" (native) The 2a format with experimental support for colocated\n"
12659
" branches."
12660
msgstr ""
12661
12662
#: en/help_topics/other-formats.txt:9
12663
msgid ""
12664
"\n"
12665
"Deprecated formats are shown below."
12666
msgstr ""
12667
12668
#: en/help_topics/other-formats.txt:12
12669
msgid ""
12670
":pack-0.92:\n"
12671
" (native) Pack-based format used in 1.x series. Introduced in 0.92.\n"
12672
" Interoperates with bzr repositories before 0.92 but cannot be read\n"
12673
" by bzr < 0.92."
12674
msgstr ""
12675
12676
#: en/help_topics/patterns.txt:1
12677
msgid ""
12678
"Patterns\n"
12679
"========"
12680
msgstr ""
12681
12682
#: en/help_topics/patterns.txt:4
12683
msgid ""
12684
"Bazaar uses patterns to match files at various times. For example,\n"
12685
"the ``add`` command skips over files that match ignore patterns\n"
12686
"and preferences can be associated with files using rule patterns.\n"
12687
"The pattern syntax is described below."
12688
msgstr ""
12689
12690
#: en/help_topics/patterns.txt:9
12691
msgid ""
12692
"Trailing slashes on patterns are ignored. If the pattern contains a\n"
12693
"slash or is a regular expression, it is compared to the whole path\n"
12694
"from the branch root. Otherwise, it is compared to only the last\n"
12695
"component of the path. To match a file only in the root directory,\n"
12696
"prepend ``./``. Patterns specifying absolute paths are not allowed."
12697
msgstr ""
12698
12699
#: en/help_topics/patterns.txt:15
12700
msgid "Patterns may include globbing wildcards such as::"
12701
msgstr ""
12702
12703
#: en/help_topics/patterns.txt:17
12704
msgid ""
12705
" ? - Matches any single character except '/'\n"
12706
" * - Matches 0 or more characters except '/'\n"
12707
" /**/ - Matches 0 or more directories in a path\n"
12708
" [a-z] - Matches a single character from within a group of characters"
12709
msgstr ""
12710
12711
#: en/help_topics/patterns.txt:22
12712
msgid ""
12713
"Patterns may also be `Python regular expressions`_. Regular expression\n"
12714
"patterns are identified by a ``RE:`` prefix followed by the regular\n"
12715
"expression. Regular expression patterns may not include named or\n"
12716
"numbered groups."
12717
msgstr ""
12718
12719
#: en/help_topics/patterns.txt:27
12720
msgid ""
12721
"Case insensitive ignore patterns can be specified with regular expressions\n"
12722
"by using the ``i`` (for ignore case) flag in the pattern."
12723
msgstr ""
12724
12725
#: en/help_topics/patterns.txt:30
12726
msgid ""
12727
"For example, a case insensitive match for ``foo`` may be specified as::"
12728
msgstr ""
12729
12730
#: en/help_topics/patterns.txt:32
12731
msgid " RE:(?i)foo"
12732
msgstr ""
12733
12734
#: en/help_topics/patterns.txt:34
12735
msgid ""
12736
"Ignore patterns may be prefixed with ``!``, which means that a filename\n"
12737
"matched by that pattern will not be ignored."
12738
msgstr ""
12739
12740
#: en/help_topics/patterns.txt:37
12741
msgid ""
12742
".. _Python regular expressions: http://docs.python.org/library/re.html"
12743
msgstr ""
12744
12745
#: en/help_topics/revisionspec.txt:1
12746
msgid "Revision Identifiers"
12747
msgstr ""
12748
12749
#: en/help_topics/revisionspec.txt:3
12750
msgid ""
12751
"A revision identifier refers to a specific state of a branch's history. It\n"
12752
"can be expressed in several ways. It can begin with a keyword to\n"
12753
"unambiguously specify a given lookup type; some examples are 'last:1',\n"
12754
"'before:yesterday' and 'submit:'."
12755
msgstr ""
12756
12757
#: en/help_topics/revisionspec.txt:8
12758
msgid ""
12759
"Alternately, it can be given without a keyword, in which case it will be\n"
12760
"checked as a revision number, a tag, a revision id, a date specification, or "
12761
"a\n"
12762
"branch specification, in that order. For example, 'date:today' could be\n"
12763
"written as simply 'today', though if you have a tag called 'today' that "
12764
"will\n"
12765
"be found first."
12766
msgstr ""
12767
12768
#: en/help_topics/revisionspec.txt:14
12769
msgid ""
12770
"If 'REV1' and 'REV2' are revision identifiers, then 'REV1..REV2' denotes a\n"
12771
"revision range. Examples: '3647..3649', 'date:yesterday..-1' and\n"
12772
"'branch:/path/to/branch1/..branch:/branch2' (note that there are no quotes "
12773
"or\n"
12774
"spaces around the '..')."
12775
msgstr ""
12776
12777
#: en/help_topics/revisionspec.txt:19
12778
msgid ""
12779
"Ranges are interpreted differently by different commands. To the \"log\" "
12780
"command,\n"
12781
"a range is a sequence of log messages, but to the \"diff\" command, the "
12782
"range\n"
12783
"denotes a change between revisions (and not a sequence of changes). In\n"
12784
"addition, \"log\" considers a closed range whereas \"diff\" and \"merge\" "
12785
"consider it\n"
12786
"to be open-ended, that is, they include one end but not the other. For "
12787
"example:\n"
12788
"\"bzr log -r 3647..3649\" shows the messages of revisions 3647, 3648 and "
12789
"3649,\n"
12790
"while \"bzr diff -r 3647..3649\" includes the changes done in revisions 3648 "
12791
"and\n"
12792
"3649, but not 3647."
12793
msgstr ""
12794
12795
#: en/help_topics/revisionspec.txt:28
12796
msgid "The keywords used as revision selection methods are the following:"
12797
msgstr ""
12798
12799
#: en/help_topics/revisionspec.txt:30
12800
msgid ""
12801
":revid:\n"
12802
"\tSelects a revision using the revision id.\n"
12803
":submit:\n"
12804
"\tSelects a common ancestor with the submit branch.\n"
12805
":ancestor:\n"
12806
"\tSelects a common ancestor with a second branch.\n"
12807
":date:\n"
12808
"\tSelects a revision on the basis of a datestamp.\n"
12809
":branch:\n"
12810
"\tSelects the last revision of a specified branch.\n"
12811
":tag:\n"
12812
"\tSelects a revision identified by a tag name.\n"
12813
":revno:\n"
12814
"\tSelects a revision using a number.\n"
12815
":before:\n"
12816
"\tSelects the parent of the revision specified.\n"
12817
":annotate:\n"
12818
"\tSelect the revision that last modified the specified line.\n"
12819
":mainline:\n"
12820
"\tSelect mainline revision that merged the specified revision.\n"
12821
":last:\n"
12822
"\tSelects the nth revision from the end."
12823
msgstr ""
12824
12825
#: en/help_topics/revisionspec.txt:53
12826
msgid "In addition, plugins can provide other keywords."
12827
msgstr ""
12828
12829
#: en/help_topics/revisionspec.txt:55
12830
msgid "A detailed description of each keyword is given below."
12831
msgstr ""
12832
12833
#: en/help_topics/revisionspec.txt:57
12834
msgid ":revid:"
12835
msgstr ""
12836
12837
#: en/help_topics/revisionspec.txt:59
12838
msgid ""
12839
" Supply a specific revision id, that can be used to specify any\n"
12840
" revision id in the ancestry of the branch.\n"
12841
" Including merges, and pending merges.\n"
12842
" Examples::"
12843
msgstr ""
12844
12845
#: en/help_topics/revisionspec.txt:64
12846
msgid ""
12847
" revid:aaaa@bbbb-123456789 -> Select revision 'aaaa@bbbb-123456789'"
12848
msgstr ""
12849
12850
#: en/help_topics/revisionspec.txt:66
12851
msgid ":submit:"
12852
msgstr ""
12853
12854
#: en/help_topics/revisionspec.txt:68
12855
msgid ""
12856
" Diffing against this shows all the changes that were made in this "
12857
"branch,\n"
12858
" and is a good predictor of what merge will do. The submit branch is\n"
12859
" used by the bundle and merge directive commands. If no submit branch\n"
12860
" is specified, the parent branch is used instead."
12861
msgstr ""
12862
12863
#: en/help_topics/revisionspec.txt:73 en/help_topics/revisionspec.txt:85
12864
msgid ""
12865
" The common ancestor is the last revision that existed in both\n"
12866
" branches. Usually this is the branch point, but it could also be\n"
12867
" a revision that was merged."
12868
msgstr ""
12869
12870
#: en/help_topics/revisionspec.txt:77 en/help_topics/revisionspec.txt:93
12871
#: en/help_topics/revisionspec.txt:109 en/help_topics/revisionspec.txt:119
12872
#: en/help_topics/revisionspec.txt:153
12873
msgid " Examples::"
12874
msgstr ""
12875
12876
#: en/help_topics/revisionspec.txt:79
12877
msgid " $ bzr diff -r submit:"
12878
msgstr ""
12879
12880
#: en/help_topics/revisionspec.txt:81
12881
msgid ":ancestor:"
12882
msgstr ""
12883
12884
#: en/help_topics/revisionspec.txt:83
12885
msgid " Supply the path to a branch to select the common ancestor."
12886
msgstr ""
12887
12888
#: en/help_topics/revisionspec.txt:89
12889
msgid ""
12890
" This is frequently used with 'diff' to return all of the changes\n"
12891
" that your branch introduces, while excluding the changes that you\n"
12892
" have not merged from the remote branch."
12893
msgstr ""
12894
12895
#: en/help_topics/revisionspec.txt:95
12896
msgid ""
12897
" ancestor:/path/to/branch\n"
12898
" $ bzr diff -r ancestor:../../mainline/branch"
12899
msgstr ""
12900
12901
#: en/help_topics/revisionspec.txt:98
12902
msgid ":date:"
12903
msgstr ""
12904
12905
#: en/help_topics/revisionspec.txt:100
12906
msgid ""
12907
" Supply a datestamp to select the first revision that matches the date.\n"
12908
" Date can be 'yesterday', 'today', 'tomorrow' or a YYYY-MM-DD string.\n"
12909
" Matches the first entry after a given date (either at midnight or\n"
12910
" at a specified time)."
12911
msgstr ""
12912
12913
#: en/help_topics/revisionspec.txt:105
12914
msgid " One way to display all the changes since yesterday would be::"
12915
msgstr ""
12916
12917
#: en/help_topics/revisionspec.txt:107
12918
msgid " bzr log -r date:yesterday.."
12919
msgstr ""
12920
12921
#: en/help_topics/revisionspec.txt:111
12922
msgid ""
12923
" date:yesterday -> select the first revision since "
12924
"yesterday\n"
12925
" date:2006-08-14,17:10:14 -> select the first revision after\n"
12926
" August 14th, 2006 at 5:10pm."
12927
msgstr ""
12928
12929
#: en/help_topics/revisionspec.txt:115
12930
msgid ":branch:"
12931
msgstr ""
12932
12933
#: en/help_topics/revisionspec.txt:117
12934
msgid " Supply the path to a branch to select its last revision."
12935
msgstr ""
12936
12937
#: en/help_topics/revisionspec.txt:121
12938
msgid " branch:/path/to/branch"
12939
msgstr ""
12940
12941
#: en/help_topics/revisionspec.txt:123
12942
msgid ":tag:"
12943
msgstr ""
12944
12945
#: en/help_topics/revisionspec.txt:125
12946
msgid " Tags are stored in the branch and created by the 'tag' command."
12947
msgstr ""
12948
12949
#: en/help_topics/revisionspec.txt:127
12950
msgid ":revno:"
12951
msgstr ""
12952
12953
#: en/help_topics/revisionspec.txt:129
12954
msgid ""
12955
" Use an integer to specify a revision in the history of the branch.\n"
12956
" Optionally a branch can be specified. A negative number will count\n"
12957
" from the end of the branch (-1 is the last revision, -2 the previous\n"
12958
" one). If the negative number is larger than the branch's history, the\n"
12959
" first revision is returned.\n"
12960
" Examples::"
12961
msgstr ""
12962
12963
#: en/help_topics/revisionspec.txt:136
12964
msgid ""
12965
" revno:1 -> return the first revision of this branch\n"
12966
" revno:3:/path/to/branch -> return the 3rd revision of\n"
12967
" the branch '/path/to/branch'\n"
12968
" revno:-1 -> The last revision in a branch.\n"
12969
" -2:http://other/branch -> The second to last revision in the\n"
12970
" remote branch.\n"
12971
" -1000000 -> Most likely the first revision, unless\n"
12972
" your history is very long."
12973
msgstr ""
12974
12975
#: en/help_topics/revisionspec.txt:145
12976
msgid ":before:"
12977
msgstr ""
12978
12979
#: en/help_topics/revisionspec.txt:147
12980
msgid ""
12981
" Supply any revision spec to return the parent of that revision. This "
12982
"is\n"
12983
" mostly useful when inspecting revisions that are not in the revision "
12984
"history\n"
12985
" of a branch."
12986
msgstr ""
12987
12988
#: en/help_topics/revisionspec.txt:151
12989
msgid ""
12990
" It is an error to request the parent of the null revision (before:0)."
12991
msgstr ""
12992
12993
#: en/help_topics/revisionspec.txt:155
12994
msgid ""
12995
" before:1913 -> Return the parent of revno 1913 (revno 1912)\n"
12996
" before:revid:aaaa@bbbb-1234567890 -> return the parent of revision\n"
12997
" aaaa@bbbb-1234567890\n"
12998
" bzr diff -r before:1913..1913\n"
12999
" -> Find the changes between revision 1913 and its parent "
13000
"(1912).\n"
13001
" (What changes did revision 1913 introduce).\n"
13002
" This is equivalent to: bzr diff -c 1913"
13003
msgstr ""
13004
13005
#: en/help_topics/revisionspec.txt:163
13006
msgid ":annotate:"
13007
msgstr ""
13008
13009
#: en/help_topics/revisionspec.txt:165
13010
msgid ""
13011
" Select the revision that last modified the specified line. Line is\n"
13012
" specified as path:number. Path is a relative path to the file. "
13013
"Numbers\n"
13014
" start at 1, and are relative to the current version, not the last-\n"
13015
" committed version of the file."
13016
msgstr ""
13017
13018
#: en/help_topics/revisionspec.txt:170
13019
msgid ":mainline:"
13020
msgstr ""
13021
13022
#: en/help_topics/revisionspec.txt:172
13023
msgid ""
13024
" Select the revision that merged the specified revision into mainline."
13025
msgstr ""
13026
13027
#: en/help_topics/revisionspec.txt:174
13028
msgid ":last:"
13029
msgstr ""
13030
13031
#: en/help_topics/revisionspec.txt:176
13032
msgid ""
13033
" Supply a positive number to get the nth revision from the end.\n"
13034
" This is the same as supplying negative numbers to the 'revno:' spec.\n"
13035
" Examples::"
13036
msgstr ""
13037
13038
#: en/help_topics/revisionspec.txt:180
13039
msgid ""
13040
" last:1 -> return the last revision\n"
13041
" last:3 -> return the revision 2 before the end.\n"
13042
msgstr ""
13043
13044
#: en/help_topics/rules.txt:1
13045
msgid ""
13046
"Rules\n"
13047
"====="
13048
msgstr ""
13049
13050
#: en/help_topics/rules.txt:7
13051
msgid ""
13052
"Rules are defined in ini file format where the sections are file glob\n"
13053
"patterns and the contents of each section are the preferences for files\n"
13054
"matching that pattern(s). For example::"
13055
msgstr ""
13056
13057
#: en/help_topics/rules.txt:11
13058
msgid ""
13059
" [name *.bat]\n"
13060
" eol = native"
13061
msgstr ""
13062
13063
#: en/help_topics/rules.txt:14
13064
msgid ""
13065
" [name *.html *.xml]\n"
13066
" keywords = xml_escape"
13067
msgstr ""
13068
13069
#: en/help_topics/rules.txt:17
13070
msgid ""
13071
"Preferences like these are useful for commands and plugins wishing to\n"
13072
"provide custom behaviour for selected files. For more information on \n"
13073
"end of line conversion see :doc:`eol-help`.\n"
13074
"Keyword support is provided by the `keywords plugin\n"
13075
"<http://doc.bazaar.canonical.com/plugins/en/keywords-plugin.html>`_."
13076
msgstr ""
13077
13078
#: en/help_topics/rules.txt:23
13079
msgid ""
13080
"Files\n"
13081
"-----"
13082
msgstr ""
13083
13084
#: en/help_topics/rules.txt:26
13085
msgid ""
13086
"Default rules for all branches are defined in the optional file\n"
13087
"``BZR_HOME/rules``. "
13088
msgstr ""
13089
13090
#: en/help_topics/rules.txt:29
13091
msgid ""
13092
"Rule Patterns\n"
13093
"-------------"
13094
msgstr ""
13095
13096
#: en/help_topics/rules.txt:32
13097
msgid ""
13098
"Patterns are ordered and searching stops as soon as one matches.\n"
13099
"As a consequence, more explicit patterns should be placed towards\n"
13100
"the top of the file. Rule patterns use exactly the same conventions\n"
13101
"as ignore patterns. See :doc:`patterns-help` for details."
13102
msgstr ""
13103
13104
#: en/help_topics/rules.txt:37
13105
msgid ".. note::"
13106
msgstr ""
13107
13108
#: en/help_topics/rules.txt:39
13109
msgid ""
13110
" Patterns containing square brackets or spaces should be\n"
13111
" surrounded in quotes to ensure they are correctly parsed.\n"
13112
msgstr ""
13113
13114
#: en/help_topics/topics.txt:1
13115
msgid ""
13116
"authentication Information on configuring authentication\n"
13117
"basic Basic commands\n"
13118
"branches Information on what a branch is\n"
13119
"bugs Bug tracker settings\n"
13120
"checkouts Information on what a checkout is\n"
13121
"commands Basic help for all commands\n"
13122
"configuration Details on the configuration settings available\n"
13123
"conflict-types Types of conflicts and what to do about them\n"
13124
"content-filters Conversion of content into/from working trees\n"
13125
"criss-cross Information on criss-cross merging\n"
13126
"current-formats Current storage formats\n"
13127
"debug-flags Options to show or record debug information\n"
13128
"diverged-branches How to fix diverged branches\n"
13129
"env-variables Environment variable names and values\n"
13130
"eol Information on end-of-line handling\n"
13131
"files Information on configuration and log files\n"
13132
"formats Information on choosing a storage format\n"
13133
"global-options Options that control how Bazaar runs\n"
13134
"hidden-commands All hidden commands\n"
13135
"hooks Points at which custom processing can be added\n"
13136
"launchpad Using Bazaar with Launchpad.net\n"
13137
"location-alias Aliases for remembered locations\n"
13138
"log-formats Details on the logging formats available\n"
13139
"other-formats Experimental and deprecated storage formats\n"
13140
"patterns Information on the pattern syntax\n"
13141
"repositories Basic information on shared repositories.\n"
13142
"revisionspec Explain how to use --revision\n"
13143
"rules Information on defining rule-based preferences\n"
13144
"standalone-trees Information on what a standalone tree is\n"
13145
"standard-options Options that can be used with any command\n"
13146
"status-flags Help on status flags\n"
13147
"sync-for-reconfigure Steps to resolve \"out-of-sync\" when reconfiguring\n"
13148
"topics Topics list\n"
13149
"url-special-chars Special character handling in URLs\n"
13150
"urlspec Supported transport protocols\n"
13151
"working-trees Information on working trees\n"
13152
msgstr ""
13153
13154
#: en/help_topics/url-special-chars.txt:1
13155
msgid ""
13156
"Special character handling in URLs\n"
13157
"=================================="
13158
msgstr ""
13159
13160
#: en/help_topics/url-special-chars.txt:4
13161
msgid "Bazaar allows locations to be specified in multiple ways, either:"
13162
msgstr ""
13163
13164
#: en/help_topics/url-special-chars.txt:6
13165
msgid " * Fully qualified URLs"
13166
msgstr ""
13167
13168
#: en/help_topics/url-special-chars.txt:8
13169
msgid " * File system paths, relative or absolute"
13170
msgstr ""
13171
13172
#: en/help_topics/url-special-chars.txt:10
13173
msgid ""
13174
"Internally bzr treats all locations as URLs. For any file system paths\n"
13175
"that are specified it will automatically determine the appropriate URL\n"
13176
"representation, and escape special characters where necessary."
13177
msgstr ""
13178
13179
#: en/help_topics/url-special-chars.txt:14
13180
msgid ""
13181
"There are a few characters which have special meaning in URLs and need "
13182
"careful\n"
13183
"handling to avoid ambiguities. Characters can be escaped with a % and a hex\n"
13184
"value in URLs. Any non-ASCII characters in a file path will automatically "
13185
"be\n"
13186
"urlencoded when the path is converted to a URL."
13187
msgstr ""
13188
13189
#: en/help_topics/url-special-chars.txt:19
13190
msgid ""
13191
"URLs represent non-ASCII characters in an encoding defined by the server, "
13192
"but\n"
13193
"usually UTF-8. The % escapes should be of the UTF-8 bytes. Bazaar tries to "
13194
"be\n"
13195
"generous in what it accepts as a URL and to print them in a way that\n"
13196
"will be readable."
13197
msgstr ""
13198
13199
#: en/help_topics/url-special-chars.txt:24
13200
msgid ""
13201
"For example, if you have a directory named '/tmp/%2False' these are all "
13202
"valid\n"
13203
"ways of accessing the content (0x2F, or 47, is the ASCII code for forward "
13204
"slash)::"
13205
msgstr ""
13206
13207
#: en/help_topics/url-special-chars.txt:27
13208
msgid ""
13209
" cd /tmp\n"
13210
" bzr log /tmp/%2False\n"
13211
" bzr log %2False\n"
13212
" bzr log file:///tmp/%252False\n"
13213
" bzr log file://localhost/tmp/%252False\n"
13214
" bzr log file:%252False"
13215
msgstr ""
13216
13217
#: en/help_topics/url-special-chars.txt:34
13218
msgid "These are valid but do not refer to the same file::"
13219
msgstr ""
13220
13221
#: en/help_topics/url-special-chars.txt:36
13222
msgid ""
13223
" bzr log file:///tmp/%2False (refers to a file called /tmp/\\/alse)\n"
13224
" bzr log %252False (refers to a file called /tmp/%252False)"
13225
msgstr ""
13226
13227
#: en/help_topics/url-special-chars.txt:39
13228
msgid ""
13229
"Comma also has special meaning in URLs, because it denotes `segment "
13230
"parameters`_"
13231
msgstr ""
13232
13233
#: en/help_topics/url-special-chars.txt:41
13234
msgid ""
13235
"_`segment parameters`: http://www.ietf.org/rfc/rfc3986.txt (section 3.3)"
13236
msgstr ""
13237
13238
#: en/help_topics/url-special-chars.txt:43
13239
msgid ""
13240
"Comma is also special in any file system paths that are specified. To use a "
13241
"literal\n"
13242
"comma in a file system path, specify a URL and URL encode the comma::"
13243
msgstr ""
13244
13245
#: en/help_topics/url-special-chars.txt:46
13246
msgid ""
13247
" bzr log foo,branch=bla # path \"foo\" with the segment parameter "
13248
"\"branch\" set to \"bla\"\n"
13249
" bzr log file:foo%2Cbranch=bla # path \"foo,branch=bla\"\n"
13250
" bzr log file:foo,branch=bla # path \"foo\" with segment parameter "
13251
"\"branch\" set to \"bla\"\n"
13252
msgstr ""
13253
13254
#: en/help_topics/urlspec.txt:1
13255
msgid "URL Identifiers"
13256
msgstr ""
13257
13258
#: en/help_topics/urlspec.txt:3
13259
msgid "Supported URL prefixes::"
13260
msgstr ""
13261
13262
#: en/help_topics/urlspec.txt:5
13263
msgid ""
13264
" aftp:// Access using active FTP.\n"
13265
" bzr:// Fast access using the Bazaar smart server.\n"
13266
" bzr+ssh:// Fast access using the Bazaar smart server over SSH.\n"
13267
" file:// Access using the standard filesystem (default)\n"
13268
" ftp:// Access using passive FTP.\n"
13269
" http:// Read-only access of branches exported on the web.\n"
13270
" https:// Read-only access of branches exported on the web using "
13271
"SSL.\n"
13272
" sftp:// Access using SFTP (most SSH servers provide SFTP)."
13273
msgstr ""
13274
13275
#: en/help_topics/urlspec.txt:14
13276
msgid "Supported modifiers::"
13277
msgstr ""
13278
13279
#: en/help_topics/urlspec.txt:16
13280
msgid " gio+ Access using any GIO supported protocols."
13281
msgstr ""
13282
13283
#: en/help_topics/urlspec.txt:18
13284
msgid "Bazaar supports all of the standard parts within the URL::"
13285
msgstr ""
13286
13287
#: en/help_topics/urlspec.txt:20
13288
msgid " <protocol>://[user[:password]@]host[:port]/[path]"
13289
msgstr ""
13290
13291
#: en/help_topics/urlspec.txt:22
13292
msgid "allowing URLs such as::"
13293
msgstr ""
13294
13295
#: en/help_topics/urlspec.txt:24
13296
msgid " http://bzruser:BadPass@bzr.example.com:8080/bzr/trunk"
13297
msgstr ""
13298
13299
#: en/help_topics/urlspec.txt:26
13300
msgid ""
13301
"For bzr+ssh:// and sftp:// URLs, Bazaar also supports paths that begin\n"
13302
"with '~' as meaning that the rest of the path should be interpreted\n"
13303
"relative to the remote user's home directory. For example if the user\n"
13304
"``remote`` has a home directory of ``/home/remote`` on the server\n"
13305
"shell.example.com, then::"
13306
msgstr ""
13307
13308
#: en/help_topics/urlspec.txt:32
13309
msgid " bzr+ssh://remote@shell.example.com/~/myproject/trunk"
13310
msgstr ""
13311
13312
#: en/help_topics/urlspec.txt:34
13313
msgid "would refer to ``/home/remote/myproject/trunk``."
13314
msgstr ""
13315
13316
#: en/help_topics/urlspec.txt:36
13317
msgid ""
13318
"Many commands that accept URLs also accept location aliases too.\n"
13319
"See :doc:`location-alias-help` and :doc:`url-special-chars-help`.\n"
13320
msgstr ""
13321
13322
#~ msgid ""
13323
#~ "Merge will do its best to combine the changes in two branches, but there\n"
13324
#~ "are some kinds of problems only a human can fix. When it encounters those,\n"
13325
#~ "it will mark a conflict. A conflict means that you need to fix something,\n"
13326
#~ "before you should commit."
13327
#~ msgstr ""
13328
#~ "Merge will do its best to combine the changes in two branches, but there\n"
13329
#~ "are some kinds of problems only a human can fix. When it encounters those,\n"
13330
#~ "it will mark a conflict. A conflict means that you need to fix something,\n"
13331
#~ "before you should commit."
Loggerhead is a web-based interface for Breezy
Version: 2.0.1