« back to all changes in this revision
Viewing changes to po/bzr.pot
- browse files at revision 5401
- compare with another revision
- download diff
- download tarball
- view history from revision 5401
- Committer: Canonical.com Patch Queue Manager
- Date: 2010-09-01 08:02:42 UTC
- mfrom: (5390.3.3 faster-revert-593560)
- Revision ID: pqm@pqm.ubuntu.com-20100901080242-esg62ody4frwmy66
(spiv) Avoid repeatedly calling self.target.all_file_ids() in
InterTree.iter_changes. (Andrew Bennetts)
InterTree.iter_changes. (Andrew Bennetts)
- files added:
- bzrlib/deprecated_graph.py
- 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 removed:
- NEWS
- bzrlib/branchfmt
- bzrlib/plugins/changelog_merge
- bzrlib/plugins/changelog_merge/tests
- bzrlib/plugins/grep
- bzrlib/plugins/po_merge
- bzrlib/plugins/po_merge/tests
- bzrlib/plugins/weave_fmt
- bzrlib/plugins/weave_fmt/tests
- bzrlib/tests/per_bzrdir
- bzrlib/tests/per_repository_vf
- po
- files renamed:
- doc/en/release-notes/bzr-2.3.txt => NEWS
- doc/en/release-notes/release-template.txt => NEWS-template.txt
- bzrlib/plugins/weave_fmt/repository.py => bzrlib/repofmt/weaverepo.py
- bzrlib/commit_signature_commands.py => bzrlib/sign_my_commits.py
- bzrlib/tests/per_repository_vf/helpers.py => bzrlib/tests/per_repository/helpers.py
- bzrlib/tests/per_repository_vf/test__generate_text_key_index.py => bzrlib/tests/per_repository/test__generate_text_key_index.py
- bzrlib/tests/per_repository_vf/test_add_inventory_by_delta.py => bzrlib/tests/per_repository/test_add_inventory_by_delta.py
- bzrlib/tests/per_repository_vf/test_check_reconcile.py => bzrlib/tests/per_repository/test_check_reconcile.py
- bzrlib/tests/per_repository_vf/test_find_text_key_references.py => bzrlib/tests/per_repository/test_find_text_key_references.py
- bzrlib/tests/per_repository/test_locking.py => bzrlib/tests/per_repository/test_is_write_locked.py
- bzrlib/tests/per_repository_vf/test_merge_directive.py => bzrlib/tests/per_repository/test_merge_directive.py
- bzrlib/plugins/weave_fmt/xml4.py => bzrlib/xml4.py
- files modified:
- .bzrignore
added
removed
po/bzr.pot
1
# SOME DESCRIPTIVE TITLE.
2
# Copyright (C) YEAR Canonical
3
# This file is distributed under the same license as the PACKAGE package.
4
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
5
#
6
#, fuzzy
7
msgid ""
8
msgstr ""
9
"Project-Id-Version: bzr\n"
10
"Report-Msgid-Bugs-To: <bazaar@canonical.com>\n"
11
"POT-Creation-Date: 2013-07-27 12:45+0200\n"
12
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
13
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
14
"Language-Team: LANGUAGE <LL@li.org>\n"
15
"Language: \n"
16
"MIME-Version: 1.0\n"
17
"Content-Type: text/plain; charset=CHARSET\n"
18
"Content-Transfer-Encoding: 8bit\n"
19
"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
20
21
#: bzrlib/add.py:93
22
msgid "skipping {0} (larger than {1} of {2} bytes)"
23
msgstr ""
24
25
#: bzrlib/branch.py:872
26
msgid "Unstacking"
27
msgstr ""
28
29
#: bzrlib/branch.py:3012
30
#, python-format
31
msgid "Pushed up to revision %d."
32
msgstr ""
33
34
#: bzrlib/branch.py:3014
35
#, python-format
36
msgid "%d tag updated."
37
msgid_plural "%d tags updated."
38
msgstr[0] ""
39
msgstr[1] ""
40
41
#: bzrlib/branch.py:3017
42
msgid "No new revisions or tags to push."
43
msgstr ""
44
45
#: bzrlib/branch.py:3019
46
msgid "No new revisions to push."
47
msgstr ""
48
49
#: bzrlib/branch.py:3039
50
msgid "checked branch {0} format {1}"
51
msgstr ""
52
53
#: bzrlib/branch.py:3042
54
#, python-format
55
msgid "found error:%s"
56
msgstr ""
57
58
#: bzrlib/builtins.py:251 bzrlib/builtins.py:3043 bzrlib/workingtree.py:324
59
#, python-format
60
msgid "Ignoring files outside view. View is %s"
61
msgstr ""
62
63
#: bzrlib/builtins.py:260
64
#, python-format
65
msgid "bzr %s --revision takes exactly one revision identifier"
66
msgstr ""
67
68
#: bzrlib/builtins.py:315
69
msgid "Display status summary."
70
msgstr ""
71
72
#: bzrlib/builtins.py:317
73
msgid ""
74
"This reports on versioned and unknown files, reporting them\n"
75
"grouped by state. Possible states are:"
76
msgstr ""
77
78
#: bzrlib/builtins.py:320
79
msgid ""
80
"added\n"
81
" Versioned in the working copy but not in the previous revision."
82
msgstr ""
83
84
#: bzrlib/builtins.py:323
85
msgid ""
86
"removed\n"
87
" Versioned in the previous revision but removed or deleted\n"
88
" in the working copy."
89
msgstr ""
90
91
#: bzrlib/builtins.py:327
92
msgid ""
93
"renamed\n"
94
" Path of this file changed from the previous revision;\n"
95
" the text may also have changed. This includes files whose\n"
96
" parent directory was renamed."
97
msgstr ""
98
99
#: bzrlib/builtins.py:332
100
msgid ""
101
"modified\n"
102
" Text has changed since the previous revision."
103
msgstr ""
104
105
#: bzrlib/builtins.py:335
106
msgid ""
107
"kind changed\n"
108
" File kind has been changed (e.g. from file to directory)."
109
msgstr ""
110
111
#: bzrlib/builtins.py:338
112
msgid ""
113
"unknown\n"
114
" Not versioned and not matching an ignore pattern."
115
msgstr ""
116
117
#: bzrlib/builtins.py:341
118
msgid ""
119
"Additionally for directories, symlinks and files with a changed\n"
120
"executable bit, Bazaar indicates their type using a trailing\n"
121
"character: '/', '@' or '*' respectively. These decorations can be\n"
122
"disabled using the '--no-classify' option."
123
msgstr ""
124
125
#: bzrlib/builtins.py:346
126
msgid ""
127
"To see ignored files use 'bzr ignored'. For details on the\n"
128
"changes to file texts, use 'bzr diff'."
129
msgstr ""
130
131
#: bzrlib/builtins.py:349
132
msgid ""
133
"Note that --short or -S gives status flags for each item, similar\n"
134
"to Subversion's status command. To get output similar to svn -q,\n"
135
"use bzr status -SV."
136
msgstr ""
137
138
#: bzrlib/builtins.py:353
139
msgid ""
140
"If no arguments are specified, the status of the entire working\n"
141
"directory is shown. Otherwise, only the status of the specified\n"
142
"files or directories is reported. If a directory is given, status\n"
143
"is reported for everything inside that directory."
144
msgstr ""
145
146
#: bzrlib/builtins.py:358
147
msgid ""
148
"Before merges are committed, the pending merge tip revisions are\n"
149
"shown. To see all pending merge revisions, use the -v option.\n"
150
"To skip the display of pending merge information altogether, use\n"
151
"the no-pending option or specify a file/directory."
152
msgstr ""
153
154
#: bzrlib/builtins.py:363
155
msgid ""
156
"To compare the working directory to a specific revision, pass a\n"
157
"single revision to the revision argument."
158
msgstr ""
159
160
#: bzrlib/builtins.py:366
161
msgid ""
162
"To see which files have changed in a specific revision, or between\n"
163
"two revisions, pass a revision range to the revision argument.\n"
164
"This will produce the same results as calling 'bzr diff --summarize'."
165
msgstr ""
166
167
# help of 'short' option of 'status' command
168
#: bzrlib/builtins.py:375
169
msgid "Use short status indicators."
170
msgstr ""
171
172
# help of 'versioned' option of 'status' command
173
#: bzrlib/builtins.py:377
174
msgid "Only show versioned files."
175
msgstr ""
176
177
# help of 'no-pending' option of 'status' command
178
#: bzrlib/builtins.py:379
179
msgid "Don't show pending merges."
180
msgstr ""
181
182
# help of 'no-classify' option of 'status' command
183
#: bzrlib/builtins.py:382
184
msgid "Do not mark object type using indicator."
185
msgstr ""
186
187
#: bzrlib/builtins.py:397
188
msgid "bzr status --revision takes exactly one or two revision specifiers"
189
msgstr ""
190
191
#: bzrlib/builtins.py:441 bzrlib/builtins.py:5229
192
msgid "You can only supply one of revision_id or --revision"
193
msgstr ""
194
195
#: bzrlib/builtins.py:444 bzrlib/builtins.py:5231
196
msgid "You must supply either --revision or a revision_id"
197
msgstr ""
198
199
#: bzrlib/builtins.py:451
200
#, python-format
201
msgid "Repository %r does not support access to raw revision texts"
202
msgstr ""
203
204
#: bzrlib/builtins.py:462
205
msgid "The repository {0} contains no revision {1}."
206
msgstr ""
207
208
#: bzrlib/builtins.py:469
209
msgid "You cannot specify a NULL revision."
210
msgstr ""
211
212
#: bzrlib/builtins.py:561
213
msgid "Remove the working tree from a given branch/checkout."
214
msgstr ""
215
216
#: bzrlib/builtins.py:563
217
msgid ""
218
"Since a lightweight checkout is little more than a working tree\n"
219
"this will refuse to run against one."
220
msgstr ""
221
222
#: bzrlib/builtins.py:566
223
msgid "To re-create the working tree, use \"bzr checkout\"."
224
msgstr ""
225
226
# help of 'force' option of 'remove-tree' command
227
#: bzrlib/builtins.py:572
228
msgid "Remove the working tree even if it has uncommitted or shelved changes."
229
msgstr ""
230
231
#: bzrlib/builtins.py:586
232
msgid "No working tree to remove"
233
msgstr ""
234
235
#: bzrlib/builtins.py:588
236
msgid "You cannot remove the working tree of a remote path"
237
msgstr ""
238
239
#: bzrlib/builtins.py:597
240
msgid "You cannot remove the working tree from a lightweight checkout"
241
msgstr ""
242
243
#: bzrlib/builtins.py:637
244
msgid ""
245
"The tree does not appear to be corrupt. You probably want \"bzr revert\" "
246
"instead. Use \"--force\" if you are sure you want to reset the working tree."
247
msgstr ""
248
249
#: bzrlib/builtins.py:648
250
msgid ""
251
", the header appears corrupt, try passing -r -1 to set the state to the last "
252
"commit"
253
msgstr ""
254
255
#: bzrlib/builtins.py:652
256
msgid "failed to reset the tree state{0}"
257
msgstr ""
258
259
#: bzrlib/builtins.py:656
260
msgid "Show current revision number."
261
msgstr ""
262
263
#: bzrlib/builtins.py:658
264
msgid "This is equal to the number of revisions on this branch."
265
msgstr ""
266
267
#: bzrlib/builtins.py:671
268
msgid "--tree and --revision can not be used together"
269
msgstr ""
270
271
#: bzrlib/builtins.py:688
272
msgid "Revision numbers only make sense for single revisions, not ranges"
273
msgstr ""
274
275
# help of 'tree' option of 'revno' command
276
#: bzrlib/builtins.py:712
277
msgid "Show revno of working tree."
278
msgstr ""
279
280
#: bzrlib/builtins.py:760
281
msgid "Add specified files or directories."
282
msgstr ""
283
284
#: bzrlib/builtins.py:762
285
msgid ""
286
"In non-recursive mode, all the named items are added, regardless\n"
287
"of whether they were previously ignored. A warning is given if\n"
288
"any of the named files are already versioned."
289
msgstr ""
290
291
#: bzrlib/builtins.py:766
292
msgid ""
293
"In recursive mode (the default), files are treated the same way\n"
294
"but the behaviour for directories is different. Directories that\n"
295
"are already versioned do not give a warning. All directories,\n"
296
"whether already versioned or not, are searched for files or\n"
297
"subdirectories that are neither versioned or ignored, and these\n"
298
"are added. This search proceeds recursively into versioned\n"
299
"directories. If no names are given '.' is assumed."
300
msgstr ""
301
302
#: bzrlib/builtins.py:774
303
msgid ""
304
"A warning will be printed when nested trees are encountered,\n"
305
"unless they are explicitly ignored."
306
msgstr ""
307
308
#: bzrlib/builtins.py:777
309
msgid ""
310
"Therefore simply saying 'bzr add' will version all files that\n"
311
"are currently unknown."
312
msgstr ""
313
314
#: bzrlib/builtins.py:780
315
msgid ""
316
"Adding a file whose parent directory is not versioned will\n"
317
"implicitly add the parent, and so on up to the root. This means\n"
318
"you should never need to explicitly add a directory, they'll just\n"
319
"get added when you add a file in the directory."
320
msgstr ""
321
322
#: bzrlib/builtins.py:785
323
msgid ""
324
"--dry-run will show which files would be added, but not actually\n"
325
"add them."
326
msgstr ""
327
328
#: bzrlib/builtins.py:788
329
msgid ""
330
"--file-ids-from will try to use the file ids from the supplied path.\n"
331
"It looks up ids trying to find a matching parent directory with the\n"
332
"same filename, and then by pure path. This option is rarely needed\n"
333
"but can be useful when adding the same logical file into two\n"
334
"branches that will be merged later (without showing the two different\n"
335
"adds as a conflict). It is also useful when merging another project\n"
336
"into a subdirectory of this one."
337
msgstr ""
338
339
#: bzrlib/builtins.py:796
340
msgid ""
341
"Any files matching patterns in the ignore list will not be added\n"
342
"unless they are explicitly mentioned."
343
msgstr ""
344
345
#: bzrlib/builtins.py:799
346
msgid ""
347
"In recursive mode, files larger than the configuration option \n"
348
"add.maximum_file_size will be skipped. Named items are never skipped due\n"
349
"to file size."
350
msgstr ""
351
352
# help of 'no-recurse' option of 'add' command
353
#: bzrlib/builtins.py:806
354
msgid "Don't recursively add the contents of directories."
355
msgstr ""
356
357
# help of 'file-ids-from' option of 'add' command
358
#: bzrlib/builtins.py:813
359
msgid "Lookup file ids from this tree."
360
msgstr ""
361
362
#: bzrlib/builtins.py:849
363
msgid "ignored {0} matching \"{1}\"\n"
364
msgstr ""
365
366
#: bzrlib/builtins.py:854
367
msgid "Create a new versioned directory."
368
msgstr ""
369
370
#: bzrlib/builtins.py:856
371
msgid "This is equivalent to creating the directory and then adding it."
372
msgstr ""
373
374
# help of 'parents' option of 'mkdir' command
375
#: bzrlib/builtins.py:863
376
msgid "No error if existing, make parent directories as needed."
377
msgstr ""
378
379
#: bzrlib/builtins.py:897
380
#, python-format
381
msgid "added %s\n"
382
msgstr ""
383
384
#: bzrlib/builtins.py:939
385
#, python-format
386
msgid "invalid kind %r specified"
387
msgstr ""
388
389
#: bzrlib/builtins.py:976
390
msgid "Move or rename a file."
391
msgstr ""
392
393
#: bzrlib/builtins.py:978
394
msgid " bzr mv SOURCE... DESTINATION"
395
msgstr ""
396
397
#: bzrlib/builtins.py:980
398
msgid ""
399
"If the last argument is a versioned directory, all the other names\n"
400
"are moved into it. Otherwise, there must be exactly two arguments\n"
401
"and the file is changed to a new name."
402
msgstr ""
403
404
#: bzrlib/builtins.py:984
405
msgid ""
406
"If OLDNAME does not exist on the filesystem but is versioned and\n"
407
"NEWNAME does exist on the filesystem but is not versioned, mv\n"
408
"assumes that the file has been manually moved and only updates\n"
409
"its internal inventory to reflect that change.\n"
410
"The same is valid when moving many SOURCE files to a DESTINATION."
411
msgstr ""
412
413
#: bzrlib/builtins.py:990
414
msgid "Files cannot be moved between branches."
415
msgstr ""
416
417
# help of 'after' option of 'mv' command
418
#: bzrlib/builtins.py:997
419
msgid ""
420
"Move only the bzr identifier of the file, because the file has already been "
421
"moved."
422
msgstr ""
423
424
# help of 'auto' option of 'mv' command
425
#: bzrlib/builtins.py:999
426
msgid "Automatically guess renames."
427
msgstr ""
428
429
# help of 'dry-run' option of 'mv' command
430
#: bzrlib/builtins.py:1000
431
msgid "Avoid making changes when guessing renames."
432
msgstr ""
433
434
#: bzrlib/builtins.py:1009
435
msgid "--dry-run requires --auto."
436
msgstr ""
437
438
#: bzrlib/builtins.py:1013
439
msgid "missing file argument"
440
msgstr ""
441
442
#: bzrlib/builtins.py:1017
443
msgid "can not move root of branch"
444
msgstr ""
445
446
#: bzrlib/builtins.py:1023
447
msgid "Only one path may be specified to --auto."
448
msgstr ""
449
450
#: bzrlib/builtins.py:1026
451
msgid "--after cannot be specified with --auto."
452
msgstr ""
453
454
#: bzrlib/builtins.py:1062
455
msgid "to mv multiple files the destination must be a versioned directory"
456
msgstr ""
457
458
#: bzrlib/builtins.py:1114
459
msgid "Turn this branch into a mirror of another branch."
460
msgstr ""
461
462
#: bzrlib/builtins.py:1116
463
msgid ""
464
"By default, this command only works on branches that have not diverged.\n"
465
"Branches are considered diverged if the destination branch's most recent \n"
466
"commit is one that has not been merged (directly or indirectly) into the \n"
467
"parent."
468
msgstr ""
469
470
#: bzrlib/builtins.py:1121
471
msgid ""
472
"If branches have diverged, you can use 'bzr merge' to integrate the changes\n"
473
"from one into the other. Once one branch has merged, the other should\n"
474
"be able to pull it again."
475
msgstr ""
476
477
#: bzrlib/builtins.py:1125
478
msgid ""
479
"If you want to replace your local changes and just want your branch to\n"
480
"match the remote one, use pull --overwrite. This will work even if the two\n"
481
"branches have diverged."
482
msgstr ""
483
484
#: bzrlib/builtins.py:1129
485
msgid ""
486
"If there is no default location set, the first pull will set it (use\n"
487
"--no-remember to avoid setting it). After that, you can omit the\n"
488
"location to use the default. To change the default, use --remember. The\n"
489
"value will only be saved if the remote location can be accessed."
490
msgstr ""
491
492
#: bzrlib/builtins.py:1134
493
msgid ""
494
"The --verbose option will display the revisions pulled using the log_format\n"
495
"configuration option. You can use a different format by overriding it with\n"
496
"-Olog_format=<other_format>."
497
msgstr ""
498
499
#: bzrlib/builtins.py:1138
500
msgid ""
501
"Note: The location can be specified either in the form of a branch,\n"
502
"or in the form of a path to a file containing a merge directive generated\n"
503
"with bzr send."
504
msgstr ""
505
506
# help of 'verbose' option of 'pull' command
507
#: bzrlib/builtins.py:1146
508
msgid "Show logs of pulled revisions."
509
msgstr ""
510
511
# help of 'directory' option of 'pull' command
512
#: bzrlib/builtins.py:1148
513
msgid ""
514
"Branch to pull into, rather than the one containing the working directory."
515
msgstr ""
516
517
# help of 'local' option of 'pull' command
518
#: bzrlib/builtins.py:1151
519
msgid ""
520
"Perform a local pull in a bound branch. Local pulls are not applied to the "
521
"master branch."
522
msgstr ""
523
524
#: bzrlib/builtins.py:1188
525
msgid "No working tree, ignoring --show-base"
526
msgstr ""
527
528
#: bzrlib/builtins.py:1204
529
msgid "No pull location known or specified."
530
msgstr ""
531
532
#: bzrlib/builtins.py:1210
533
#, python-format
534
msgid "Using saved parent location: %s\n"
535
msgstr ""
536
537
#: bzrlib/builtins.py:1217 bzrlib/builtins.py:4423
538
msgid "Cannot use -r with merge directives or bundles"
539
msgstr ""
540
541
#: bzrlib/builtins.py:1260
542
msgid "Update a mirror of this branch."
543
msgstr ""
544
545
#: bzrlib/builtins.py:1262
546
msgid ""
547
"The target branch will not have its working tree populated because this\n"
548
"is both expensive, and is not supported on remote file systems."
549
msgstr ""
550
551
#: bzrlib/builtins.py:1265
552
msgid ""
553
"Some smart servers or protocols *may* put the working tree in place in\n"
554
"the future."
555
msgstr ""
556
557
#: bzrlib/builtins.py:1268
558
msgid ""
559
"This command only works on branches that have not diverged. Branches are\n"
560
"considered diverged if the destination branch's most recent commit is one\n"
561
"that has not been merged (directly or indirectly) by the source branch."
562
msgstr ""
563
564
#: bzrlib/builtins.py:1272
565
msgid ""
566
"If branches have diverged, you can use 'bzr push --overwrite' to replace\n"
567
"the other branch completely, discarding its unmerged changes."
568
msgstr ""
569
570
#: bzrlib/builtins.py:1275
571
msgid ""
572
"If you want to ensure you have the different changes in the other branch,\n"
573
"do a merge (see bzr help merge) from the other branch, and commit that.\n"
574
"After that you will be able to do a push without '--overwrite'."
575
msgstr ""
576
577
#: bzrlib/builtins.py:1279
578
msgid ""
579
"If there is no default push location set, the first push will set it (use\n"
580
"--no-remember to avoid setting it). After that, you can omit the\n"
581
"location to use the default. To change the default, use --remember. The\n"
582
"value will only be saved if the remote location can be accessed."
583
msgstr ""
584
585
#: bzrlib/builtins.py:1284
586
msgid ""
587
"The --verbose option will display the revisions pushed using the log_format\n"
588
"configuration option. You can use a different format by overriding it with\n"
589
"-Olog_format=<other_format>."
590
msgstr ""
591
592
# help of 'directory' option of 'dpush' command
593
# help of 'directory' option of 'push' command
594
#: bzrlib/builtins.py:1295 bzrlib/foreign.py:272
595
msgid ""
596
"Branch to push from, rather than the one containing the working directory."
597
msgstr ""
598
599
# help of 'use-existing-dir' option of 'push' command
600
#: bzrlib/builtins.py:1298
601
msgid ""
602
"By default push will fail if the target directory exists, but does not "
603
"already have a control directory. This flag will allow push to proceed."
604
msgstr ""
605
606
# help of 'stacked' option of 'push' command
607
#: bzrlib/builtins.py:1303
608
msgid ""
609
"Create a stacked branch that references the public location of the parent "
610
"branch."
611
msgstr ""
612
613
# help of 'stacked-on' option of 'push' command
614
#: bzrlib/builtins.py:1306
615
msgid ""
616
"Create a stacked branch that refers to another branch for the commit "
617
"history. Only the work not present in the referenced branch is included in "
618
"the branch created."
619
msgstr ""
620
621
# help of 'strict' option of 'dpush' command
622
# help of 'strict' option of 'push' command
623
#: bzrlib/builtins.py:1311 bzrlib/foreign.py:279
624
msgid ""
625
"Refuse to push if there are uncommitted changes in the working tree, --no-"
626
"strict disables the check."
627
msgstr ""
628
629
# help of 'no-tree' option of 'push' command
630
#: bzrlib/builtins.py:1314
631
msgid "Don't populate the working tree, even for protocols that support it."
632
msgstr ""
633
634
# help of 'overwrite-tags' option of 'pull' command
635
# help of 'overwrite-tags' option of 'push' command
636
#: bzrlib/builtins.py:1317
637
msgid "Overwrite tags only."
638
msgstr ""
639
640
#: bzrlib/builtins.py:1368
641
msgid "Could not determine branch to refer to."
642
msgstr ""
643
644
#: bzrlib/builtins.py:1377
645
#, python-format
646
msgid ""
647
"No push location known or specified. To push to the parent branch (at %s), "
648
"use 'bzr push :parent'."
649
msgstr ""
650
651
#: bzrlib/builtins.py:1383 bzrlib/foreign.py:306
652
msgid "No push location known or specified."
653
msgstr ""
654
655
#: bzrlib/builtins.py:1387
656
#, python-format
657
msgid "Using saved push location: %s"
658
msgstr ""
659
660
#: bzrlib/builtins.py:1397
661
msgid "Create a new branch that is a copy of an existing branch."
662
msgstr ""
663
664
#: bzrlib/builtins.py:1399
665
msgid ""
666
"If the TO_LOCATION is omitted, the last component of the FROM_LOCATION will\n"
667
"be used. In other words, \"branch ../foo/bar\" will attempt to create ./"
668
"bar.\n"
669
"If the FROM_LOCATION has no / or path separator embedded, the TO_LOCATION\n"
670
"is derived from the FROM_LOCATION by stripping a leading scheme or drive\n"
671
"identifier, if any. For example, \"branch lp:foo-bar\" will attempt to\n"
672
"create ./foo-bar."
673
msgstr ""
674
675
#: bzrlib/builtins.py:1406
676
msgid ""
677
"To retrieve the branch as of a particular revision, supply the --revision\n"
678
"parameter, as in \"branch foo/bar -r 5\"."
679
msgstr ""
680
681
#: bzrlib/builtins.py:1409
682
msgid "The synonyms 'clone' and 'get' for this command are deprecated."
683
msgstr ""
684
685
# help of 'no-tree' option of 'branch' command
686
#: bzrlib/builtins.py:1419
687
msgid "Create a branch without a working-tree."
688
msgstr ""
689
690
# help of 'switch' option of 'branch' command
691
#: bzrlib/builtins.py:1421
692
msgid "Switch the checkout in the current directory to the new branch."
693
msgstr ""
694
695
# help of 'stacked' option of 'branch' command
696
#: bzrlib/builtins.py:1424
697
msgid ""
698
"Create a stacked branch referring to the source branch. The new branch will "
699
"depend on the availability of the source branch for all operations."
700
msgstr ""
701
702
# help of 'standalone' option of 'branch' command
703
#: bzrlib/builtins.py:1428
704
msgid "Do not use a shared repository, even if available."
705
msgstr ""
706
707
# help of 'use-existing-dir' option of 'branch' command
708
#: bzrlib/builtins.py:1430
709
msgid ""
710
"By default branch will fail if the target directory exists, but does not "
711
"already have a control directory. This flag will allow branch to proceed."
712
msgstr ""
713
714
# help of 'bind' option of 'branch' command
715
#: bzrlib/builtins.py:1435
716
msgid "Bind new branch to from location."
717
msgstr ""
718
719
#: bzrlib/builtins.py:1482
720
#, python-format
721
msgid "Target directory \"%s\" already exists."
722
msgstr ""
723
724
#: bzrlib/builtins.py:1494
725
#, python-format
726
msgid "Parent of \"%s\" does not exist."
727
msgstr ""
728
729
#: bzrlib/builtins.py:1513
730
msgid "The branch {0} has no revision {1}."
731
msgstr ""
732
733
#: bzrlib/builtins.py:1528 bzrlib/push.py:53
734
#, python-format
735
msgid "Created new stacked branch referring to %s."
736
msgstr ""
737
738
#: bzrlib/builtins.py:1532
739
#, python-format
740
msgid "Branched %d revision."
741
msgid_plural "Branched %d revisions."
742
msgstr[0] ""
743
msgstr[1] ""
744
745
#: bzrlib/builtins.py:1537
746
#, python-format
747
msgid "New branch bound to %s"
748
msgstr ""
749
750
#: bzrlib/builtins.py:1542 bzrlib/builtins.py:6283
751
#, python-format
752
msgid "Switched to branch: %s"
753
msgstr ""
754
755
#: bzrlib/builtins.py:1547
756
msgid "List the branches available at the current location."
757
msgstr ""
758
759
#: bzrlib/builtins.py:1549
760
msgid ""
761
"This command will print the names of all the branches at the current\n"
762
"location."
763
msgstr ""
764
765
# help of 'recursive' option of 'branches' command
766
#: bzrlib/builtins.py:1556
767
msgid ""
768
"Recursively scan for branches rather than just looking in the specified "
769
"location."
770
msgstr ""
771
772
#: bzrlib/builtins.py:1585
773
msgid "(default)"
774
msgstr ""
775
776
#: bzrlib/builtins.py:1597
777
msgid "Create a new checkout of an existing branch."
778
msgstr ""
779
780
#: bzrlib/builtins.py:1599
781
msgid ""
782
"If BRANCH_LOCATION is omitted, checkout will reconstitute a working tree "
783
"for\n"
784
"the branch found in '.'. This is useful if you have removed the working "
785
"tree\n"
786
"or if it was never created - i.e. if you pushed the branch to its current\n"
787
"location using SFTP."
788
msgstr ""
789
790
#: bzrlib/builtins.py:1604
791
msgid ""
792
"If the TO_LOCATION is omitted, the last component of the BRANCH_LOCATION "
793
"will\n"
794
"be used. In other words, \"checkout ../foo/bar\" will attempt to create ./"
795
"bar.\n"
796
"If the BRANCH_LOCATION has no / or path separator embedded, the TO_LOCATION\n"
797
"is derived from the BRANCH_LOCATION by stripping a leading scheme or drive\n"
798
"identifier, if any. For example, \"checkout lp:foo-bar\" will attempt to\n"
799
"create ./foo-bar."
800
msgstr ""
801
802
#: bzrlib/builtins.py:1611
803
msgid ""
804
"To retrieve the branch as of a particular revision, supply the --revision\n"
805
"parameter, as in \"checkout foo/bar -r 5\". Note that this will be "
806
"immediately\n"
807
"out of date [so you cannot commit] but it may be useful (i.e. to examine "
808
"old\n"
809
"code.)"
810
msgstr ""
811
812
# help of 'lightweight' option of 'checkout' command
813
#: bzrlib/builtins.py:1621
814
msgid ""
815
"Perform a lightweight checkout. Lightweight checkouts depend on access to "
816
"the branch for every operation. Normal checkouts can perform common "
817
"operations like diff and status without such access, and also support local "
818
"commits."
819
msgstr ""
820
821
# help of 'files-from' option of 'branch' command
822
# help of 'files-from' option of 'checkout' command
823
#: bzrlib/builtins.py:1628
824
msgid "Get file contents from this tree."
825
msgstr ""
826
827
# help of 'hardlink' option of 'branch' command
828
# help of 'hardlink' option of 'checkout' command
829
#: bzrlib/builtins.py:1630
830
msgid "Hard-link working tree files where possible."
831
msgstr ""
832
833
#: bzrlib/builtins.py:1671
834
msgid ""
835
"Show list of renamed files.\n"
836
" "
837
msgstr ""
838
839
#: bzrlib/builtins.py:1699
840
msgid "Update a working tree to a new revision."
841
msgstr ""
842
843
#: bzrlib/builtins.py:1701
844
msgid ""
845
"This will perform a merge of the destination revision (the tip of the\n"
846
"branch, or the specified revision) into the working tree, and then make\n"
847
"that revision the basis revision for the working tree. "
848
msgstr ""
849
850
#: bzrlib/builtins.py:1705
851
msgid ""
852
"You can use this to visit an older revision, or to update a working tree\n"
853
"that is out of date from its branch."
854
msgstr ""
855
856
#: bzrlib/builtins.py:1708
857
msgid ""
858
"If there are any uncommitted changes in the tree, they will be carried\n"
859
"across and remain as uncommitted changes after the update. To discard\n"
860
"these changes, use 'bzr revert'. The uncommitted changes may conflict\n"
861
"with the changes brought in by the change in basis revision."
862
msgstr ""
863
864
#: bzrlib/builtins.py:1713
865
msgid ""
866
"If the tree's branch is bound to a master branch, bzr will also update\n"
867
"the branch from the master."
868
msgstr ""
869
870
#: bzrlib/builtins.py:1716
871
msgid ""
872
"You cannot update just a single file or directory, because each Bazaar\n"
873
"working tree has just a single basis revision. If you want to restore a\n"
874
"file that has been removed locally, use 'bzr revert' instead of 'bzr\n"
875
"update'. If you want to restore a file to its state in a previous\n"
876
"revision, use 'bzr revert' with a '-r' option, or use 'bzr cat' to write\n"
877
"out the old content of that file to a new location."
878
msgstr ""
879
880
#: bzrlib/builtins.py:1723
881
msgid ""
882
"The 'dir' argument, if given, must be the location of the root of a\n"
883
"working tree to update. By default, the working tree that contains the \n"
884
"current working directory is used."
885
msgstr ""
886
887
#: bzrlib/builtins.py:1739
888
msgid "bzr update --revision takes exactly one revision"
889
msgstr ""
890
891
#: bzrlib/builtins.py:1747
892
msgid "bzr update can only update a whole tree, not a file or subdirectory"
893
msgstr ""
894
895
#: bzrlib/builtins.py:1778
896
msgid "Tree is up to date at revision {0} of branch {1}"
897
msgstr ""
898
899
#: bzrlib/builtins.py:1794
900
#, python-format
901
msgid ""
902
"branch has no revision %s\n"
903
"bzr update --revision only works for a revision in the branch history"
904
msgstr ""
905
906
#: bzrlib/builtins.py:1800
907
msgid "Updated to revision {0} of branch {1}"
908
msgstr ""
909
910
#: bzrlib/builtins.py:1804
911
msgid ""
912
"Your local commits will now show as pending merges with 'bzr status', and "
913
"can be committed with 'bzr commit'."
914
msgstr ""
915
916
#: bzrlib/builtins.py:1813
917
msgid "Show information about a working tree, branch or repository."
918
msgstr ""
919
920
#: bzrlib/builtins.py:1815
921
msgid ""
922
"This command will show all known locations and formats associated to the\n"
923
"tree, branch or repository."
924
msgstr ""
925
926
#: bzrlib/builtins.py:1818
927
msgid ""
928
"In verbose mode, statistical information is included with each report.\n"
929
"To see extended statistic information, use a verbosity level of 2 or\n"
930
"higher by specifying the verbose option multiple times, e.g. -vv."
931
msgstr ""
932
933
#: bzrlib/builtins.py:1822
934
msgid "Branches and working trees will also report any missing revisions."
935
msgstr ""
936
937
#: bzrlib/builtins.py:1824 bzrlib/builtins.py:3742 bzrlib/builtins.py:4883
938
#: bzrlib/builtins.py:6469
939
msgid ":Examples:"
940
msgstr ""
941
942
#: bzrlib/builtins.py:1826
943
msgid " Display information on the format and related locations:"
944
msgstr ""
945
946
#: bzrlib/builtins.py:1828
947
msgid " bzr info"
948
msgstr ""
949
950
#: bzrlib/builtins.py:1830
951
msgid ""
952
" Display the above together with extended format information and\n"
953
" basic statistics (like the number of files in the working tree and\n"
954
" number of revisions in the branch and repository):"
955
msgstr ""
956
957
#: bzrlib/builtins.py:1834
958
msgid " bzr info -v"
959
msgstr ""
960
961
#: bzrlib/builtins.py:1836
962
msgid " Display the above together with number of committers to the branch:"
963
msgstr ""
964
965
#: bzrlib/builtins.py:1838
966
msgid " bzr info -vv"
967
msgstr ""
968
969
#: bzrlib/builtins.py:1857
970
msgid "Remove files or directories."
971
msgstr ""
972
973
#: bzrlib/builtins.py:1859
974
msgid ""
975
"This makes Bazaar stop tracking changes to the specified files. Bazaar will\n"
976
"delete them if they can easily be recovered using revert otherwise they\n"
977
"will be backed up (adding an extension of the form .~#~). If no options or\n"
978
"parameters are given Bazaar will scan for files that are being tracked by\n"
979
"Bazaar but missing in your tree and stop tracking them for you."
980
msgstr ""
981
982
# help of 'new' option of 'remove' command
983
#: bzrlib/builtins.py:1867
984
msgid "Only remove files that have never been committed."
985
msgstr ""
986
987
# help of 'file-deletion-strategy' option of 'remove' command
988
#: bzrlib/builtins.py:1869
989
msgid "The file deletion mode to be used."
990
msgstr ""
991
992
# title of 'file-deletion-strategy' option of 'remove' command
993
#: bzrlib/builtins.py:1870
994
msgid "Deletion Strategy"
995
msgstr ""
996
997
# help of 'file-deletion-strategy=safe' option of 'remove' command
998
#: bzrlib/builtins.py:1871
999
msgid "Backup changed files (default)."
1000
msgstr ""
1001
1002
# help of 'file-deletion-strategy=keep' option of 'remove' command
1003
#: bzrlib/builtins.py:1872
1004
msgid "Delete from bzr but leave the working copy."
1005
msgstr ""
1006
1007
# help of 'file-deletion-strategy=no-backup' option of 'remove' command
1008
#: bzrlib/builtins.py:1873
1009
msgid "Don't backup changed files."
1010
msgstr ""
1011
1012
#: bzrlib/builtins.py:1894
1013
msgid "No matching files."
1014
msgstr ""
1015
1016
#: bzrlib/builtins.py:1955
1017
msgid "Reconcile bzr metadata in a branch."
1018
msgstr ""
1019
1020
#: bzrlib/builtins.py:1957
1021
msgid ""
1022
"This can correct data mismatches that may have been caused by\n"
1023
"previous ghost operations or bzr upgrades. You should only\n"
1024
"need to run this command if 'bzr check' or a bzr developer\n"
1025
"advises you to run it."
1026
msgstr ""
1027
1028
#: bzrlib/builtins.py:1962
1029
msgid ""
1030
"If a second branch is provided, cross-branch reconciliation is\n"
1031
"also attempted, which will check that data like the tree root\n"
1032
"id which was not present in very early bzr versions is represented\n"
1033
"correctly in both branches."
1034
msgstr ""
1035
1036
#: bzrlib/builtins.py:1967
1037
msgid ""
1038
"At the same time it is run it may recompress data resulting in\n"
1039
"a potential saving in disk space or performance gain."
1040
msgstr ""
1041
1042
#: bzrlib/builtins.py:1970
1043
msgid "The branch *MUST* be on a listable system such as local disk or sftp."
1044
msgstr ""
1045
1046
# help of 'format=2a' option of 'init' command
1047
# help of 'format=default' option of 'init' command
1048
# help of 'format=2a' option of 'init-repository' command
1049
# help of 'format=default' option of 'init-repository' command
1050
# help of 'format=2a' option of 'upgrade' command
1051
# help of 'format=default' option of 'upgrade' command
1052
#: bzrlib/builtins.py:2037 bzrlib/builtins.py:2155 bzrlib/builtins.py:3777
1053
msgid ""
1054
"Format for the bzr 2.0 series.\n"
1055
"Uses group-compress storage.\n"
1056
"Provides rich roots which are a one-way transition.\n"
1057
msgstr ""
1058
1059
# help of 'format=pack-0.92' option of 'init' command
1060
# help of 'format=pack-0.92' option of 'init-repository' command
1061
# help of 'format=pack-0.92' option of 'upgrade' command
1062
#: bzrlib/builtins.py:2037 bzrlib/builtins.py:2155 bzrlib/builtins.py:3777
1063
msgid ""
1064
"Pack-based format used in 1.x series. Introduced in 0.92. Interoperates with "
1065
"bzr repositories before 0.92 but cannot be read by bzr < 0.92. "
1066
msgstr ""
1067
1068
# help of 'format=development-colo' option of 'init' command
1069
# help of 'format=development-colo' option of 'init-repository' command
1070
# help of 'format=development-colo' option of 'upgrade' command
1071
#: bzrlib/builtins.py:2037 bzrlib/builtins.py:2155 bzrlib/builtins.py:3777
1072
msgid "The 2a format with experimental support for colocated branches.\n"
1073
msgstr ""
1074
1075
#: bzrlib/builtins.py:2038
1076
msgid "Make a directory into a versioned branch."
1077
msgstr ""
1078
1079
#: bzrlib/builtins.py:2040
1080
msgid ""
1081
"Use this to create an empty branch, or before importing an\n"
1082
"existing project."
1083
msgstr ""
1084
1085
#: bzrlib/builtins.py:2043
1086
msgid ""
1087
"If there is a repository in a parent directory of the location, then\n"
1088
"the history of the branch will be stored in the repository. Otherwise\n"
1089
"init creates a standalone branch which carries its own history\n"
1090
"in the .bzr directory."
1091
msgstr ""
1092
1093
#: bzrlib/builtins.py:2048
1094
msgid ""
1095
"If there is already a branch at the location but it has no working tree,\n"
1096
"the tree can be populated with 'bzr checkout'."
1097
msgstr ""
1098
1099
#: bzrlib/builtins.py:2051
1100
msgid "Recipe for importing a tree of files::"
1101
msgstr ""
1102
1103
#: bzrlib/builtins.py:2053
1104
msgid ""
1105
" cd ~/project\n"
1106
" bzr init\n"
1107
" bzr add .\n"
1108
" bzr status\n"
1109
" bzr commit -m \"imported project\""
1110
msgstr ""
1111
1112
# help of 'create-prefix' option of 'init' command
1113
# help of 'create-prefix' option of 'push' command
1114
#: bzrlib/builtins.py:2064
1115
msgid "Create the path leading up to the branch if it does not already exist."
1116
msgstr ""
1117
1118
# help of 'format' option of 'init' command
1119
#: bzrlib/builtins.py:2067
1120
msgid "Specify a format for this branch. See \"help formats\"."
1121
msgstr ""
1122
1123
# help of 'append-revisions-only' option of 'init' command
1124
#: bzrlib/builtins.py:2075
1125
msgid "Never change revnos or the existing log. Append revisions to it only."
1126
msgstr ""
1127
1128
# help of 'no-tree' option of 'init' command
1129
#: bzrlib/builtins.py:2078
1130
msgid "Create a branch without a working tree."
1131
msgstr ""
1132
1133
#: bzrlib/builtins.py:2098 bzrlib/push.py:110
1134
#, python-format
1135
msgid ""
1136
"Parent directory of %s does not exist.\n"
1137
"You may supply --create-prefix to create all leading parent directories."
1138
msgstr ""
1139
1140
#: bzrlib/builtins.py:2132
1141
msgid ""
1142
"This branch format cannot be set to append-revisions-only. Try --default."
1143
msgstr ""
1144
1145
#: bzrlib/builtins.py:2143
1146
msgid "Created a {0} (format: {1})\n"
1147
msgstr ""
1148
1149
#: bzrlib/builtins.py:2152
1150
#, python-format
1151
msgid "Using shared repository: %s\n"
1152
msgstr ""
1153
1154
#: bzrlib/builtins.py:2156
1155
msgid "Create a shared repository for branches to share storage space."
1156
msgstr ""
1157
1158
#: bzrlib/builtins.py:2158
1159
msgid ""
1160
"New branches created under the repository directory will store their\n"
1161
"revisions in the repository, not in the branch directory. For branches\n"
1162
"with shared history, this reduces the amount of storage needed and \n"
1163
"speeds up the creation of new branches."
1164
msgstr ""
1165
1166
#: bzrlib/builtins.py:2163
1167
msgid ""
1168
"If the --no-trees option is given then the branches in the repository\n"
1169
"will not have working trees by default. They will still exist as \n"
1170
"directories on disk, but they will not have separate copies of the \n"
1171
"files at a certain revision. This can be useful for repositories that\n"
1172
"store branches which are interacted with through checkouts or remote\n"
1173
"branches, such as on a server."
1174
msgstr ""
1175
1176
#: bzrlib/builtins.py:2170
1177
msgid ""
1178
":Examples:\n"
1179
" Create a shared repository holding just branches::"
1180
msgstr ""
1181
1182
#: bzrlib/builtins.py:2173
1183
msgid ""
1184
" bzr init-repo --no-trees repo\n"
1185
" bzr init repo/trunk"
1186
msgstr ""
1187
1188
#: bzrlib/builtins.py:2176
1189
msgid " Make a lightweight checkout elsewhere::"
1190
msgstr ""
1191
1192
#: bzrlib/builtins.py:2178
1193
msgid ""
1194
" bzr checkout --lightweight repo/trunk trunk-checkout\n"
1195
" cd trunk-checkout\n"
1196
" (add files here)"
1197
msgstr ""
1198
1199
# help of 'format' option of 'init-repository' command
1200
#: bzrlib/builtins.py:2186
1201
msgid ""
1202
"Specify a format for this repository. See \"bzr help formats\" for details."
1203
msgstr ""
1204
1205
# title of 'format' option of 'init-repository' command
1206
#: bzrlib/builtins.py:2190
1207
msgid "Repository format"
1208
msgstr ""
1209
1210
# help of 'no-trees' option of 'init-repository' command
1211
#: bzrlib/builtins.py:2192
1212
msgid "Branches in the repository will default to not having a working tree."
1213
msgstr ""
1214
1215
#: bzrlib/builtins.py:2218
1216
msgid "Show differences in the working tree, between revisions or branches."
1217
msgstr ""
1218
1219
#: bzrlib/builtins.py:2220
1220
msgid ""
1221
"If no arguments are given, all changes for the current tree are listed.\n"
1222
"If files are given, only the changes in those files are listed.\n"
1223
"Remote and multiple branches can be compared by using the --old and\n"
1224
"--new options. If not provided, the default for both is derived from\n"
1225
"the first argument, if any, or the current tree if no arguments are\n"
1226
"given."
1227
msgstr ""
1228
1229
#: bzrlib/builtins.py:2227
1230
msgid ""
1231
"\"bzr diff -p1\" is equivalent to \"bzr diff --prefix old/:new/\", and\n"
1232
"produces patches suitable for \"patch -p1\"."
1233
msgstr ""
1234
1235
#: bzrlib/builtins.py:2230
1236
msgid ""
1237
"Note that when using the -r argument with a range of revisions, the\n"
1238
"differences are computed between the two specified revisions. That\n"
1239
"is, the command does not show the changes introduced by the first \n"
1240
"revision in the range. This differs from the interpretation of \n"
1241
"revision ranges used by \"bzr log\" which includes the first revision\n"
1242
"in the range."
1243
msgstr ""
1244
1245
#: bzrlib/builtins.py:2237
1246
msgid ""
1247
":Exit values:\n"
1248
" 1 - changed\n"
1249
" 2 - unrepresentable changes\n"
1250
" 3 - error\n"
1251
" 0 - no change"
1252
msgstr ""
1253
1254
#: bzrlib/builtins.py:2243
1255
msgid ""
1256
":Examples:\n"
1257
" Shows the difference in the working tree versus the last commit::"
1258
msgstr ""
1259
1260
#: bzrlib/builtins.py:2246
1261
msgid " bzr diff"
1262
msgstr ""
1263
1264
#: bzrlib/builtins.py:2248
1265
msgid " Difference between the working tree and revision 1::"
1266
msgstr ""
1267
1268
#: bzrlib/builtins.py:2250
1269
msgid " bzr diff -r1"
1270
msgstr ""
1271
1272
#: bzrlib/builtins.py:2252
1273
msgid " Difference between revision 3 and revision 1::"
1274
msgstr ""
1275
1276
#: bzrlib/builtins.py:2254
1277
msgid " bzr diff -r1..3"
1278
msgstr ""
1279
1280
#: bzrlib/builtins.py:2256
1281
msgid " Difference between revision 3 and revision 1 for branch xxx::"
1282
msgstr ""
1283
1284
#: bzrlib/builtins.py:2258
1285
msgid " bzr diff -r1..3 xxx"
1286
msgstr ""
1287
1288
#: bzrlib/builtins.py:2260
1289
msgid " The changes introduced by revision 2 (equivalent to -r1..2)::"
1290
msgstr ""
1291
1292
#: bzrlib/builtins.py:2262
1293
msgid " bzr diff -c2"
1294
msgstr ""
1295
1296
#: bzrlib/builtins.py:2264
1297
msgid ""
1298
" To see the changes introduced by revision X::\n"
1299
" \n"
1300
" bzr diff -cX"
1301
msgstr ""
1302
1303
#: bzrlib/builtins.py:2268
1304
msgid ""
1305
" Note that in the case of a merge, the -c option shows the changes\n"
1306
" compared to the left hand parent. To see the changes against\n"
1307
" another parent, use::"
1308
msgstr ""
1309
1310
#: bzrlib/builtins.py:2272
1311
msgid " bzr diff -r<chosen_parent>..X"
1312
msgstr ""
1313
1314
#: bzrlib/builtins.py:2274
1315
msgid ""
1316
" The changes between the current revision and the previous revision\n"
1317
" (equivalent to -c-1 and -r-2..-1)"
1318
msgstr ""
1319
1320
#: bzrlib/builtins.py:2277
1321
msgid " bzr diff -r-2.."
1322
msgstr ""
1323
1324
#: bzrlib/builtins.py:2279
1325
msgid " Show just the differences for file NEWS::"
1326
msgstr ""
1327
1328
#: bzrlib/builtins.py:2281
1329
msgid " bzr diff NEWS"
1330
msgstr ""
1331
1332
#: bzrlib/builtins.py:2283
1333
msgid " Show the differences in working tree xxx for file NEWS::"
1334
msgstr ""
1335
1336
#: bzrlib/builtins.py:2285
1337
msgid " bzr diff xxx/NEWS"
1338
msgstr ""
1339
1340
#: bzrlib/builtins.py:2287
1341
msgid " Show the differences from branch xxx to this working tree:"
1342
msgstr ""
1343
1344
#: bzrlib/builtins.py:2289
1345
msgid " bzr diff --old xxx"
1346
msgstr ""
1347
1348
#: bzrlib/builtins.py:2291
1349
msgid " Show the differences between two branches for file NEWS::"
1350
msgstr ""
1351
1352
#: bzrlib/builtins.py:2293
1353
msgid " bzr diff --old xxx --new yyy NEWS"
1354
msgstr ""
1355
1356
#: bzrlib/builtins.py:2295
1357
msgid " Same as 'bzr diff' but prefix paths with old/ and new/::"
1358
msgstr ""
1359
1360
#: bzrlib/builtins.py:2297
1361
msgid ""
1362
" bzr diff --prefix old/:new/\n"
1363
" \n"
1364
" Show the differences using a custom diff program with options::\n"
1365
" \n"
1366
" bzr diff --using /usr/bin/diff --diff-options -wu"
1367
msgstr ""
1368
1369
# help of 'diff-options' option of 'diff' command
1370
#: bzrlib/builtins.py:2307
1371
msgid "Pass these options to the external diff program."
1372
msgstr ""
1373
1374
# help of 'prefix' option of 'diff' command
1375
#: bzrlib/builtins.py:2310
1376
msgid ""
1377
"Set prefixes added to old and new filenames, as two values separated by a "
1378
"colon. (eg \"old/:new/\")."
1379
msgstr ""
1380
1381
# help of 'old' option of 'diff' command
1382
#: bzrlib/builtins.py:2313
1383
msgid "Branch/tree to compare from."
1384
msgstr ""
1385
1386
# help of 'new' option of 'diff' command
1387
#: bzrlib/builtins.py:2317
1388
msgid "Branch/tree to compare to."
1389
msgstr ""
1390
1391
# help of 'using' option of 'diff' command
1392
#: bzrlib/builtins.py:2323
1393
msgid "Use this command to compare files."
1394
msgstr ""
1395
1396
# help of 'format' option of 'diff' command
1397
#: bzrlib/builtins.py:2328
1398
msgid "Diff format to use."
1399
msgstr ""
1400
1401
# title of 'format' option of 'diff' command
1402
#: bzrlib/builtins.py:2330
1403
msgid "Diff format"
1404
msgstr ""
1405
1406
# help of 'context' option of 'diff' command
1407
#: bzrlib/builtins.py:2332
1408
msgid "How many lines of context to show."
1409
msgstr ""
1410
1411
#: bzrlib/builtins.py:2357
1412
msgid "--prefix expects two values separated by a colon (eg \"old/:new/\")"
1413
msgstr ""
1414
1415
#: bzrlib/builtins.py:2361
1416
msgid "bzr diff --revision takes exactly one or two revision specifiers"
1417
msgstr ""
1418
1419
#: bzrlib/builtins.py:2366 bzrlib/builtins.py:2763 bzrlib/builtins.py:2776
1420
#: bzrlib/builtins.py:2784 bzrlib/builtins.py:4957
1421
msgid "{0} and {1} are mutually exclusive"
1422
msgstr ""
1423
1424
#: bzrlib/builtins.py:2386
1425
msgid ""
1426
"List files deleted in the working tree.\n"
1427
" "
1428
msgstr ""
1429
1430
#: bzrlib/builtins.py:2463
1431
msgid "Show the tree root directory."
1432
msgstr ""
1433
1434
#: bzrlib/builtins.py:2465
1435
msgid ""
1436
"The root is the nearest enclosing directory with a .bzr control\n"
1437
"directory."
1438
msgstr ""
1439
1440
#: bzrlib/builtins.py:2480
1441
msgid "The limit argument must be an integer."
1442
msgstr ""
1443
1444
#: bzrlib/builtins.py:2488
1445
msgid "The levels argument must be an integer."
1446
msgstr ""
1447
1448
#: bzrlib/builtins.py:2493
1449
msgid "Show historical log for a branch or subset of a branch."
1450
msgstr ""
1451
1452
#: bzrlib/builtins.py:2495
1453
msgid ""
1454
"log is bzr's default tool for exploring the history of a branch.\n"
1455
"The branch to use is taken from the first parameter. If no parameters\n"
1456
"are given, the branch containing the working directory is logged.\n"
1457
"Here are some simple examples::"
1458
msgstr ""
1459
1460
#: bzrlib/builtins.py:2500
1461
msgid ""
1462
" bzr log log the current branch\n"
1463
" bzr log foo.py log a file in its branch\n"
1464
" bzr log http://server/branch log a branch on a server"
1465
msgstr ""
1466
1467
#: bzrlib/builtins.py:2504
1468
msgid ""
1469
"The filtering, ordering and information shown for each revision can\n"
1470
"be controlled as explained below. By default, all revisions are\n"
1471
"shown sorted (topologically) so that newer revisions appear before\n"
1472
"older ones and descendants always appear before ancestors. If displayed,\n"
1473
"merged revisions are shown indented under the revision in which they\n"
1474
"were merged."
1475
msgstr ""
1476
1477
#: bzrlib/builtins.py:2511
1478
msgid ":Output control:"
1479
msgstr ""
1480
1481
#: bzrlib/builtins.py:2513
1482
msgid ""
1483
" The log format controls how information about each revision is\n"
1484
" displayed. The standard log formats are called ``long``, ``short``\n"
1485
" and ``line``. The default is long. See ``bzr help log-formats``\n"
1486
" for more details on log formats."
1487
msgstr ""
1488
1489
#: bzrlib/builtins.py:2518
1490
msgid ""
1491
" The following options can be used to control what information is\n"
1492
" displayed::"
1493
msgstr ""
1494
1495
#: bzrlib/builtins.py:2521
1496
msgid ""
1497
" -l N display a maximum of N revisions\n"
1498
" -n N display N levels of revisions (0 for all, 1 for collapsed)\n"
1499
" -v display a status summary (delta) for each revision\n"
1500
" -p display a diff (patch) for each revision\n"
1501
" --show-ids display revision-ids (and file-ids), not just revnos"
1502
msgstr ""
1503
1504
#: bzrlib/builtins.py:2527
1505
msgid ""
1506
" Note that the default number of levels to display is a function of the\n"
1507
" log format. If the -n option is not used, the standard log formats show\n"
1508
" just the top level (mainline)."
1509
msgstr ""
1510
1511
#: bzrlib/builtins.py:2531
1512
msgid ""
1513
" Status summaries are shown using status flags like A, M, etc. To see\n"
1514
" the changes explained using words like ``added`` and ``modified``\n"
1515
" instead, use the -vv option."
1516
msgstr ""
1517
1518
#: bzrlib/builtins.py:2535
1519
msgid ":Ordering control:"
1520
msgstr ""
1521
1522
#: bzrlib/builtins.py:2537
1523
msgid ""
1524
" To display revisions from oldest to newest, use the --forward option.\n"
1525
" In most cases, using this option will have little impact on the total\n"
1526
" time taken to produce a log, though --forward does not incrementally\n"
1527
" display revisions like --reverse does when it can."
1528
msgstr ""
1529
1530
#: bzrlib/builtins.py:2542
1531
msgid ":Revision filtering:"
1532
msgstr ""
1533
1534
#: bzrlib/builtins.py:2544
1535
msgid ""
1536
" The -r option can be used to specify what revision or range of revisions\n"
1537
" to filter against. The various forms are shown below::"
1538
msgstr ""
1539
1540
#: bzrlib/builtins.py:2547
1541
msgid ""
1542
" -rX display revision X\n"
1543
" -rX.. display revision X and later\n"
1544
" -r..Y display up to and including revision Y\n"
1545
" -rX..Y display from X to Y inclusive"
1546
msgstr ""
1547
1548
#: bzrlib/builtins.py:2552
1549
msgid ""
1550
" See ``bzr help revisionspec`` for details on how to specify X and Y.\n"
1551
" Some common examples are given below::"
1552
msgstr ""
1553
1554
#: bzrlib/builtins.py:2555
1555
msgid ""
1556
" -r-1 show just the tip\n"
1557
" -r-10.. show the last 10 mainline revisions\n"
1558
" -rsubmit:.. show what's new on this branch\n"
1559
" -rancestor:path.. show changes since the common ancestor of this\n"
1560
" branch and the one at location path\n"
1561
" -rdate:yesterday.. show changes since yesterday"
1562
msgstr ""
1563
1564
#: bzrlib/builtins.py:2562
1565
msgid ""
1566
" When logging a range of revisions using -rX..Y, log starts at\n"
1567
" revision Y and searches back in history through the primary\n"
1568
" (\"left-hand\") parents until it finds X. When logging just the\n"
1569
" top level (using -n1), an error is reported if X is not found\n"
1570
" along the way. If multi-level logging is used (-n0), X may be\n"
1571
" a nested merge revision and the log will be truncated accordingly."
1572
msgstr ""
1573
1574
#: bzrlib/builtins.py:2569
1575
msgid ":Path filtering:"
1576
msgstr ""
1577
1578
#: bzrlib/builtins.py:2571
1579
msgid ""
1580
" If parameters are given and the first one is not a branch, the log\n"
1581
" will be filtered to show only those revisions that changed the\n"
1582
" nominated files or directories."
1583
msgstr ""
1584
1585
#: bzrlib/builtins.py:2575
1586
msgid ""
1587
" Filenames are interpreted within their historical context. To log a\n"
1588
" deleted file, specify a revision range so that the file existed at\n"
1589
" the end or start of the range."
1590
msgstr ""
1591
1592
#: bzrlib/builtins.py:2579
1593
msgid ""
1594
" Historical context is also important when interpreting pathnames of\n"
1595
" renamed files/directories. Consider the following example:"
1596
msgstr ""
1597
1598
#: bzrlib/builtins.py:2582
1599
msgid ""
1600
" * revision 1: add tutorial.txt\n"
1601
" * revision 2: modify tutorial.txt\n"
1602
" * revision 3: rename tutorial.txt to guide.txt; add tutorial.txt"
1603
msgstr ""
1604
1605
#: bzrlib/builtins.py:2586
1606
msgid " In this case:"
1607
msgstr ""
1608
1609
#: bzrlib/builtins.py:2588
1610
msgid " * ``bzr log guide.txt`` will log the file added in revision 1"
1611
msgstr ""
1612
1613
#: bzrlib/builtins.py:2590
1614
msgid " * ``bzr log tutorial.txt`` will log the new file added in revision 3"
1615
msgstr ""
1616
1617
#: bzrlib/builtins.py:2592
1618
msgid ""
1619
" * ``bzr log -r2 -p tutorial.txt`` will show the changes made to\n"
1620
" the original file in revision 2."
1621
msgstr ""
1622
1623
#: bzrlib/builtins.py:2595
1624
msgid ""
1625
" * ``bzr log -r2 -p guide.txt`` will display an error message as there\n"
1626
" was no file called guide.txt in revision 2."
1627
msgstr ""
1628
1629
#: bzrlib/builtins.py:2598
1630
msgid ""
1631
" Renames are always followed by log. By design, there is no need to\n"
1632
" explicitly ask for this (and no way to stop logging a file back\n"
1633
" until it was last renamed)."
1634
msgstr ""
1635
1636
#: bzrlib/builtins.py:2602
1637
msgid ":Other filtering:"
1638
msgstr ""
1639
1640
#: bzrlib/builtins.py:2604
1641
msgid ""
1642
" The --match option can be used for finding revisions that match a\n"
1643
" regular expression in a commit message, committer, author or bug.\n"
1644
" Specifying the option several times will match any of the supplied\n"
1645
" expressions. --match-author, --match-bugs, --match-committer and\n"
1646
" --match-message can be used to only match a specific field."
1647
msgstr ""
1648
1649
#: bzrlib/builtins.py:2610
1650
msgid ":Tips & tricks:"
1651
msgstr ""
1652
1653
#: bzrlib/builtins.py:2612
1654
msgid ""
1655
" GUI tools and IDEs are often better at exploring history than command\n"
1656
" line tools: you may prefer qlog or viz from qbzr or bzr-gtk, the\n"
1657
" bzr-explorer shell, or the Loggerhead web interface. See the Plugin\n"
1658
" Guide <http://doc.bazaar.canonical.com/plugins/en/> and\n"
1659
" <http://wiki.bazaar.canonical.com/IDEIntegration>. "
1660
msgstr ""
1661
1662
#: bzrlib/builtins.py:2618
1663
msgid " You may find it useful to add the aliases below to ``bazaar.conf``::"
1664
msgstr ""
1665
1666
#: bzrlib/builtins.py:2620
1667
msgid ""
1668
" [ALIASES]\n"
1669
" tip = log -r-1\n"
1670
" top = log -l10 --line\n"
1671
" show = log -v -p"
1672
msgstr ""
1673
1674
#: bzrlib/builtins.py:2625
1675
msgid ""
1676
" ``bzr tip`` will then show the latest revision while ``bzr top``\n"
1677
" will show the last 10 mainline revisions. To see the details of a\n"
1678
" particular revision X, ``bzr show -rX``."
1679
msgstr ""
1680
1681
#: bzrlib/builtins.py:2629
1682
msgid ""
1683
" If you are interested in looking deeper into a particular merge X,\n"
1684
" use ``bzr log -n0 -rX``."
1685
msgstr ""
1686
1687
#: bzrlib/builtins.py:2632
1688
msgid ""
1689
" ``bzr log -v`` on a branch with lots of history is currently\n"
1690
" very slow. A fix for this issue is currently under development.\n"
1691
" With or without that fix, it is recommended that a revision range\n"
1692
" be given when using the -v option."
1693
msgstr ""
1694
1695
#: bzrlib/builtins.py:2637
1696
msgid ""
1697
" bzr has a generic full-text matching plugin, bzr-search, that can be\n"
1698
" used to find revisions matching user names, commit messages, etc.\n"
1699
" Among other features, this plugin can find all revisions containing\n"
1700
" a list of words but not others."
1701
msgstr ""
1702
1703
#: bzrlib/builtins.py:2642
1704
msgid ""
1705
" When exploring non-mainline history on large projects with deep\n"
1706
" history, the performance of log can be greatly improved by installing\n"
1707
" the historycache plugin. This plugin buffers historical information\n"
1708
" trading disk space for faster speed."
1709
msgstr ""
1710
1711
# help of 'forward' option of 'log' command
1712
#: bzrlib/builtins.py:2651
1713
msgid "Show from oldest to newest."
1714
msgstr ""
1715
1716
# help of 'verbose' option of 'log' command
1717
#: bzrlib/builtins.py:2654
1718
msgid "Show files changed in each revision."
1719
msgstr ""
1720
1721
# help of 'change' option of 'log' command
1722
#: bzrlib/builtins.py:2660
1723
msgid "Show just the specified revision. See also \"help revisionspec\"."
1724
msgstr ""
1725
1726
# help of 'authors' option of 'log' command
1727
#: bzrlib/builtins.py:2664
1728
msgid "What names to list as authors - first, all or committer."
1729
msgstr ""
1730
1731
# title of 'authors' option of 'log' command
1732
#: bzrlib/builtins.py:2665
1733
msgid "Authors"
1734
msgstr ""
1735
1736
# help of 'levels' option of 'log' command
1737
#: bzrlib/builtins.py:2670
1738
msgid "Number of levels to display - 0 for all, 1 for flat."
1739
msgstr ""
1740
1741
# help of 'limit' option of 'log' command
1742
#: bzrlib/builtins.py:2680
1743
msgid "Limit the output to the first N revisions."
1744
msgstr ""
1745
1746
# help of 'show-diff' option of 'log' command
1747
#: bzrlib/builtins.py:2685
1748
msgid "Show changes made in each revision as a patch."
1749
msgstr ""
1750
1751
# help of 'include-merged' option of 'log' command
1752
#: bzrlib/builtins.py:2687
1753
msgid "Show merged revisions like --levels 0 does."
1754
msgstr ""
1755
1756
# help of 'omit-merges' option of 'log' command
1757
#: bzrlib/builtins.py:2691
1758
msgid "Do not report commits with more than one parent."
1759
msgstr ""
1760
1761
# help of 'exclude-common-ancestry' option of 'log' command
1762
#: bzrlib/builtins.py:2693
1763
msgid ""
1764
"Display only the revisions that are not part of both ancestries (require -"
1765
"rX..Y)."
1766
msgstr ""
1767
1768
# help of 'signatures' option of 'log' command
1769
#: bzrlib/builtins.py:2697
1770
msgid "Show digital signature validity."
1771
msgstr ""
1772
1773
# help of 'match' option of 'log' command
1774
#: bzrlib/builtins.py:2700
1775
msgid "Show revisions whose properties match this expression."
1776
msgstr ""
1777
1778
# help of 'match-message' option of 'log' command
1779
#: bzrlib/builtins.py:2704
1780
msgid "Show revisions whose message matches this expression."
1781
msgstr ""
1782
1783
# help of 'match-committer' option of 'log' command
1784
#: bzrlib/builtins.py:2708
1785
msgid "Show revisions whose committer matches this expression."
1786
msgstr ""
1787
1788
# help of 'match-author' option of 'log' command
1789
#: bzrlib/builtins.py:2712
1790
msgid "Show revisions whose authors match this expression."
1791
msgstr ""
1792
1793
# help of 'match-bugs' option of 'log' command
1794
#: bzrlib/builtins.py:2716
1795
msgid "Show revisions whose bugs match this expression."
1796
msgstr ""
1797
1798
#: bzrlib/builtins.py:2770
1799
msgid "--exclude-common-ancestry requires -r with two revisions"
1800
msgstr ""
1801
1802
#: bzrlib/builtins.py:2798
1803
#, python-format
1804
msgid "Path unknown at end or start of revision range: %s"
1805
msgstr ""
1806
1807
#: bzrlib/builtins.py:2915
1808
#, python-format
1809
msgid "bzr %s doesn't accept two revisions in different branches."
1810
msgstr ""
1811
1812
#: bzrlib/builtins.py:2931
1813
#, python-format
1814
msgid "bzr %s --revision takes one or two values."
1815
msgstr ""
1816
1817
#: bzrlib/builtins.py:2976
1818
msgid ""
1819
"List files in a tree.\n"
1820
" "
1821
msgstr ""
1822
1823
# help of 'recursive' option of 'ls' command
1824
#: bzrlib/builtins.py:2985
1825
msgid "Recurse into subdirectories."
1826
msgstr ""
1827
1828
# help of 'from-root' option of 'ls' command
1829
#: bzrlib/builtins.py:2987
1830
msgid "Print paths relative to the root of the branch."
1831
msgstr ""
1832
1833
# help of 'unknown' option of 'ls' command
1834
#: bzrlib/builtins.py:2989
1835
msgid "Print unknown files."
1836
msgstr ""
1837
1838
# help of 'versioned' option of 'ls' command
1839
#: bzrlib/builtins.py:2990
1840
msgid "Print versioned files."
1841
msgstr ""
1842
1843
# help of 'ignored' option of 'ls' command
1844
#: bzrlib/builtins.py:2993
1845
msgid "Print ignored files."
1846
msgstr ""
1847
1848
# help of 'kind' option of 'ls' command
1849
#: bzrlib/builtins.py:2995
1850
msgid "List entries of a particular kind: file, directory, symlink."
1851
msgstr ""
1852
1853
#: bzrlib/builtins.py:3008
1854
msgid "invalid kind specified"
1855
msgstr ""
1856
1857
#: bzrlib/builtins.py:3011
1858
msgid "Cannot set both --verbose and --null"
1859
msgstr ""
1860
1861
#: bzrlib/builtins.py:3020
1862
msgid "cannot specify both --from-root and PATH"
1863
msgstr ""
1864
1865
#: bzrlib/builtins.py:3107
1866
msgid "Ignore specified files or patterns."
1867
msgstr ""
1868
1869
#: bzrlib/builtins.py:3109
1870
msgid "See ``bzr help patterns`` for details on the syntax of patterns."
1871
msgstr ""
1872
1873
#: bzrlib/builtins.py:3111
1874
msgid ""
1875
"If a .bzrignore file does not exist, the ignore command\n"
1876
"will create one and add the specified files or patterns to the newly\n"
1877
"created file. The ignore command will also automatically add the \n"
1878
".bzrignore file to be versioned. Creating a .bzrignore file without\n"
1879
"the use of the ignore command will require an explicit add command."
1880
msgstr ""
1881
1882
#: bzrlib/builtins.py:3117
1883
msgid ""
1884
"To remove patterns from the ignore list, edit the .bzrignore file.\n"
1885
"After adding, editing or deleting that file either indirectly by\n"
1886
"using this command or directly by using an editor, be sure to commit\n"
1887
"it."
1888
msgstr ""
1889
1890
#: bzrlib/builtins.py:3122
1891
msgid ""
1892
"Bazaar also supports a global ignore file ~/.bazaar/ignore. On Windows\n"
1893
"the global ignore file can be found in the application data directory as\n"
1894
"C:\\Documents and Settings\\<user>\\Application Data\\Bazaar\\2.0\\ignore.\n"
1895
"Global ignores are not touched by this command. The global ignore file\n"
1896
"can be edited directly using an editor."
1897
msgstr ""
1898
1899
#: bzrlib/builtins.py:3128
1900
msgid ""
1901
"Patterns prefixed with '!' are exceptions to ignore patterns and take\n"
1902
"precedence over regular ignores. Such exceptions are used to specify\n"
1903
"files that should be versioned which would otherwise be ignored."
1904
msgstr ""
1905
1906
#: bzrlib/builtins.py:3132
1907
msgid ""
1908
"Patterns prefixed with '!!' act as regular ignore patterns, but have\n"
1909
"precedence over the '!' exception patterns."
1910
msgstr ""
1911
1912
#: bzrlib/builtins.py:3135
1913
msgid ""
1914
":Notes: \n"
1915
" \n"
1916
"* Ignore patterns containing shell wildcards must be quoted from\n"
1917
" the shell on Unix."
1918
msgstr ""
1919
1920
#: bzrlib/builtins.py:3140
1921
msgid ""
1922
"* Ignore patterns starting with \"#\" act as comments in the ignore file.\n"
1923
" To ignore patterns that begin with that character, use the \"RE:\" prefix."
1924
msgstr ""
1925
1926
#: bzrlib/builtins.py:3143
1927
msgid ""
1928
":Examples:\n"
1929
" Ignore the top level Makefile::"
1930
msgstr ""
1931
1932
#: bzrlib/builtins.py:3146
1933
msgid " bzr ignore ./Makefile"
1934
msgstr ""
1935
1936
#: bzrlib/builtins.py:3148
1937
msgid " Ignore .class files in all directories...::"
1938
msgstr ""
1939
1940
#: bzrlib/builtins.py:3150
1941
msgid " bzr ignore \"*.class\""
1942
msgstr ""
1943
1944
#: bzrlib/builtins.py:3152
1945
msgid " ...but do not ignore \"special.class\"::"
1946
msgstr ""
1947
1948
#: bzrlib/builtins.py:3154
1949
msgid " bzr ignore \"!special.class\""
1950
msgstr ""
1951
1952
#: bzrlib/builtins.py:3156
1953
msgid " Ignore files whose name begins with the \"#\" character::"
1954
msgstr ""
1955
1956
#: bzrlib/builtins.py:3158
1957
msgid " bzr ignore \"RE:^#\""
1958
msgstr ""
1959
1960
#: bzrlib/builtins.py:3160 bzrlib/builtins.py:3164
1961
msgid " Ignore .o files under the lib directory::"
1962
msgstr ""
1963
1964
#: bzrlib/builtins.py:3162
1965
msgid " bzr ignore \"lib/**/*.o\""
1966
msgstr ""
1967
1968
#: bzrlib/builtins.py:3166
1969
msgid " bzr ignore \"RE:lib/.*\\.o\""
1970
msgstr ""
1971
1972
#: bzrlib/builtins.py:3168
1973
msgid " Ignore everything but the \"debian\" toplevel directory::"
1974
msgstr ""
1975
1976
#: bzrlib/builtins.py:3170
1977
msgid ""
1978
" bzr ignore \"RE:(?!debian/).*\"\n"
1979
" \n"
1980
" Ignore everything except the \"local\" toplevel directory,\n"
1981
" but always ignore autosave files ending in ~, even under local/::\n"
1982
" \n"
1983
" bzr ignore \"*\"\n"
1984
" bzr ignore \"!./local\"\n"
1985
" bzr ignore \"!!*~\""
1986
msgstr ""
1987
1988
# help of 'default-rules' option of 'ignore' command
1989
#: bzrlib/builtins.py:3184
1990
msgid "Display the default ignore rules that bzr uses."
1991
msgstr ""
1992
1993
#: bzrlib/builtins.py:3196
1994
msgid "ignore requires at least one NAME_PATTERN or --default-rules."
1995
msgstr ""
1996
1997
#: bzrlib/builtins.py:3207
1998
#, python-format
1999
msgid "Invalid ignore pattern found. %s"
2000
msgid_plural "Invalid ignore patterns found. %s"
2001
msgstr[0] ""
2002
msgstr[1] ""
2003
2004
#: bzrlib/builtins.py:3216
2005
msgid "NAME_PATTERN should not be an absolute path"
2006
msgstr ""
2007
2008
#: bzrlib/builtins.py:3229
2009
#, python-format
2010
msgid ""
2011
"Warning: the following files are version controlled and match your ignore "
2012
"pattern:\n"
2013
"%s\n"
2014
"These files will continue to be version controlled unless you 'bzr remove' "
2015
"them.\n"
2016
msgstr ""
2017
2018
#: bzrlib/builtins.py:3236
2019
msgid "List ignored files and the patterns that matched them."
2020
msgstr ""
2021
2022
#: bzrlib/builtins.py:3238
2023
msgid ""
2024
"List all the ignored files and the ignore pattern that caused the file to\n"
2025
"be ignored."
2026
msgstr ""
2027
2028
#: bzrlib/builtins.py:3241
2029
msgid "Alternatively, to list just the files::"
2030
msgstr ""
2031
2032
#: bzrlib/builtins.py:3243
2033
msgid " bzr ls --ignored"
2034
msgstr ""
2035
2036
#: bzrlib/builtins.py:3277
2037
#, python-format
2038
msgid "not a valid revision-number: %r"
2039
msgstr ""
2040
2041
#: bzrlib/builtins.py:3284
2042
msgid "Export current or past revision to a destination directory or archive."
2043
msgstr ""
2044
2045
#: bzrlib/builtins.py:3286
2046
msgid "If no revision is specified this exports the last committed revision."
2047
msgstr ""
2048
2049
#: bzrlib/builtins.py:3288
2050
msgid ""
2051
"Format may be an \"exporter\" name, such as tar, tgz, tbz2. If none is\n"
2052
"given, try to find the format with the extension. If no extension\n"
2053
"is found exports to a directory (equivalent to --format=dir)."
2054
msgstr ""
2055
2056
#: bzrlib/builtins.py:3292
2057
msgid ""
2058
"If root is supplied, it will be used as the root directory inside\n"
2059
"container formats (tar, zip, etc). If it is not supplied it will default\n"
2060
"to the exported filename. The root option has no effect for 'dir' format."
2061
msgstr ""
2062
2063
#: bzrlib/builtins.py:3296
2064
msgid ""
2065
"If branch is omitted then the branch containing the current working\n"
2066
"directory will be used."
2067
msgstr ""
2068
2069
#: bzrlib/builtins.py:3299
2070
msgid "Note: Export of tree with non-ASCII filenames to zip is not supported."
2071
msgstr ""
2072
2073
#: bzrlib/builtins.py:3301
2074
msgid ""
2075
" ================= =========================\n"
2076
" Supported formats Autodetected by extension\n"
2077
" ================= =========================\n"
2078
" dir (none)\n"
2079
" tar .tar\n"
2080
" tbz2 .tar.bz2, .tbz2\n"
2081
" tgz .tar.gz, .tgz\n"
2082
" zip .zip\n"
2083
" ================= ========================="
2084
msgstr ""
2085
2086
# help of 'format' option of 'export' command
2087
#: bzrlib/builtins.py:3315
2088
msgid "Type of file to export to."
2089
msgstr ""
2090
2091
# help of 'filters' option of 'export' command
2092
#: bzrlib/builtins.py:3318
2093
msgid "Apply content filters to export the convenient form."
2094
msgstr ""
2095
2096
# help of 'root' option of 'export' command
2097
#: bzrlib/builtins.py:3322
2098
msgid "Name of the root directory inside the exported file."
2099
msgstr ""
2100
2101
# help of 'per-file-timestamps' option of 'export' command
2102
#: bzrlib/builtins.py:3324
2103
msgid ""
2104
"Set modification time of files to that of the last revision in which it was "
2105
"changed."
2106
msgstr ""
2107
2108
# help of 'uncommitted' option of 'export' command
2109
#: bzrlib/builtins.py:3327
2110
msgid "Export the working tree contents rather than that of the last revision."
2111
msgstr ""
2112
2113
#: bzrlib/builtins.py:3346
2114
msgid "--uncommitted requires a working tree"
2115
msgstr ""
2116
2117
#: bzrlib/builtins.py:3355
2118
#, python-format
2119
msgid "Unsupported export format: %s"
2120
msgstr ""
2121
2122
#: bzrlib/builtins.py:3359
2123
msgid "Write the contents of a file as of a given revision to standard output."
2124
msgstr ""
2125
2126
#: bzrlib/builtins.py:3361
2127
msgid "If no revision is nominated, the last revision is used."
2128
msgstr ""
2129
2130
#: bzrlib/builtins.py:3363
2131
msgid ""
2132
"Note: Take care to redirect standard output when using this command on a\n"
2133
"binary file."
2134
msgstr ""
2135
2136
# help of 'name-from-revision' option of 'cat' command
2137
#: bzrlib/builtins.py:3369
2138
msgid "The path name in the old tree."
2139
msgstr ""
2140
2141
# help of 'filters' option of 'cat' command
2142
#: bzrlib/builtins.py:3370
2143
msgid "Apply content filters to display the convenience form."
2144
msgstr ""
2145
2146
#: bzrlib/builtins.py:3381
2147
msgid "bzr cat --revision takes exactly one revision specifier"
2148
msgstr ""
2149
2150
#: bzrlib/builtins.py:3406 bzrlib/builtins.py:3418
2151
msgid "{0!r} is not present in revision {1}"
2152
msgstr ""
2153
2154
#: bzrlib/builtins.py:3441
2155
msgid "Commit changes into a new revision."
2156
msgstr ""
2157
2158
#: bzrlib/builtins.py:3443
2159
msgid ""
2160
"An explanatory message needs to be given for each commit. This is\n"
2161
"often done by using the --message option (getting the message from the\n"
2162
"command line) or by using the --file option (getting the message from\n"
2163
"a file). If neither of these options is given, an editor is opened for\n"
2164
"the user to enter the message. To see the changed files in the\n"
2165
"boilerplate text loaded into the editor, use the --show-diff option."
2166
msgstr ""
2167
2168
#: bzrlib/builtins.py:3450
2169
msgid ""
2170
"By default, the entire tree is committed and the person doing the\n"
2171
"commit is assumed to be the author. These defaults can be overridden\n"
2172
"as explained below."
2173
msgstr ""
2174
2175
#: bzrlib/builtins.py:3454
2176
msgid ":Selective commits:"
2177
msgstr ""
2178
2179
#: bzrlib/builtins.py:3456
2180
msgid ""
2181
" If selected files are specified, only changes to those files are\n"
2182
" committed. If a directory is specified then the directory and\n"
2183
" everything within it is committed."
2184
msgstr ""
2185
2186
#: bzrlib/builtins.py:3460
2187
msgid ""
2188
" When excludes are given, they take precedence over selected files.\n"
2189
" For example, to commit only changes within foo, but not changes\n"
2190
" within foo/bar::"
2191
msgstr ""
2192
2193
#: bzrlib/builtins.py:3464
2194
msgid " bzr commit foo -x foo/bar"
2195
msgstr ""
2196
2197
#: bzrlib/builtins.py:3466
2198
msgid " A selective commit after a merge is not yet supported."
2199
msgstr ""
2200
2201
#: bzrlib/builtins.py:3468
2202
msgid ":Custom authors:"
2203
msgstr ""
2204
2205
#: bzrlib/builtins.py:3470
2206
msgid ""
2207
" If the author of the change is not the same person as the committer,\n"
2208
" you can specify the author's name using the --author option. The\n"
2209
" name should be in the same format as a committer-id, e.g.\n"
2210
" \"John Doe <jdoe@example.com>\". If there is more than one author of\n"
2211
" the change you can specify the option multiple times, once for each\n"
2212
" author."
2213
msgstr ""
2214
2215
#: bzrlib/builtins.py:3477
2216
msgid ":Checks:"
2217
msgstr ""
2218
2219
#: bzrlib/builtins.py:3479
2220
msgid ""
2221
" A common mistake is to forget to add a new file or directory before\n"
2222
" running the commit command. The --strict option checks for unknown\n"
2223
" files and aborts the commit if any are found. More advanced pre-commit\n"
2224
" checks can be implemented by defining hooks. See ``bzr help hooks``\n"
2225
" for details."
2226
msgstr ""
2227
2228
#: bzrlib/builtins.py:3485
2229
msgid ":Things to note:"
2230
msgstr ""
2231
2232
#: bzrlib/builtins.py:3487
2233
msgid ""
2234
" If you accidentially commit the wrong changes or make a spelling\n"
2235
" mistake in the commit message say, you can use the uncommit command\n"
2236
" to undo it. See ``bzr help uncommit`` for details."
2237
msgstr ""
2238
2239
#: bzrlib/builtins.py:3491
2240
msgid ""
2241
" Hooks can also be configured to run after a commit. This allows you\n"
2242
" to trigger updates to external systems like bug trackers. The --fixes\n"
2243
" option can be used to record the association between a revision and\n"
2244
" one or more bugs. See ``bzr help bugs`` for details."
2245
msgstr ""
2246
2247
# help of 'exclude' option of 'commit' command
2248
#: bzrlib/builtins.py:3501
2249
msgid "Do not consider changes made to a given path."
2250
msgstr ""
2251
2252
# help of 'message' option of 'commit' command
2253
#: bzrlib/builtins.py:3504
2254
msgid "Description of the new revision."
2255
msgstr ""
2256
2257
# help of 'unchanged' option of 'commit' command
2258
#: bzrlib/builtins.py:3507
2259
msgid "Commit even if nothing has changed."
2260
msgstr ""
2261
2262
# help of 'file' option of 'commit' command
2263
#: bzrlib/builtins.py:3511
2264
msgid "Take commit message from this file."
2265
msgstr ""
2266
2267
# help of 'strict' option of 'commit' command
2268
#: bzrlib/builtins.py:3513
2269
msgid "Refuse to commit if there are unknown files in the working tree."
2270
msgstr ""
2271
2272
# help of 'commit-time' option of 'commit' command
2273
#: bzrlib/builtins.py:3516
2274
msgid ""
2275
"Manually set a commit time using commit date format, e.g. '2009-10-10 "
2276
"08:00:00 +0100'."
2277
msgstr ""
2278
2279
# help of 'fixes' option of 'commit' command
2280
#: bzrlib/builtins.py:3519
2281
msgid "Mark a bug as being fixed by this revision (see \"bzr help bugs\")."
2282
msgstr ""
2283
2284
# help of 'author' option of 'commit' command
2285
#: bzrlib/builtins.py:3522
2286
msgid "Set the author's name, if it's different from the committer."
2287
msgstr ""
2288
2289
# help of 'local' option of 'commit' command
2290
#: bzrlib/builtins.py:3525
2291
msgid ""
2292
"Perform a local commit in a bound branch. Local commits are not pushed to "
2293
"the master branch until a normal commit is performed."
2294
msgstr ""
2295
2296
# help of 'show-diff' option of 'commit' command
2297
#: bzrlib/builtins.py:3531
2298
msgid ""
2299
"When no message is supplied, show the diff along with the status summary in "
2300
"the message editor."
2301
msgstr ""
2302
2303
# help of 'lossy' option of 'commit' command
2304
#: bzrlib/builtins.py:3534
2305
msgid ""
2306
"When committing to a foreign version control system do not push data that "
2307
"can not be natively represented."
2308
msgstr ""
2309
2310
#: bzrlib/builtins.py:3552
2311
#, python-format
2312
msgid ""
2313
"No tracker specified for bug %s. Use the form 'tracker:id' or specify a "
2314
"default bug tracker using the `bugtracker` option.\n"
2315
"See \"bzr help bugs\" for more information on this feature. Commit refused."
2316
msgstr ""
2317
2318
#: bzrlib/builtins.py:3561
2319
#, python-format
2320
msgid ""
2321
"Invalid bug %s. Must be in the form of 'tracker:id'. See \"bzr help bugs\" "
2322
"for more information on this feature.\n"
2323
"Commit refused."
2324
msgstr ""
2325
2326
#: bzrlib/builtins.py:3570
2327
#, python-format
2328
msgid "Unrecognized bug %s. Commit refused."
2329
msgstr ""
2330
2331
#: bzrlib/builtins.py:3573
2332
#, python-format
2333
msgid ""
2334
"%s\n"
2335
"Commit refused."
2336
msgstr ""
2337
2338
#: bzrlib/builtins.py:3597
2339
msgid "Could not parse --commit-time: "
2340
msgstr ""
2341
2342
#: bzrlib/builtins.py:3637
2343
msgid "please specify either --message or --file"
2344
msgstr ""
2345
2346
#: bzrlib/builtins.py:3666
2347
msgid "please specify a commit message with either --message or --file"
2348
msgstr ""
2349
2350
#: bzrlib/builtins.py:3669
2351
msgid ""
2352
"Empty commit message specified. Please specify a commit message with either "
2353
"--message or --file or leave a blank message with --message \"\"."
2354
msgstr ""
2355
2356
#: bzrlib/builtins.py:3689
2357
msgid ""
2358
"No changes to commit. Please 'bzr add' the files you want to commit, or use "
2359
"--unchanged to force an empty commit."
2360
msgstr ""
2361
2362
#: bzrlib/builtins.py:3693
2363
msgid ""
2364
"Conflicts detected in working tree. Use \"bzr conflicts\" to list, \"bzr "
2365
"resolve FILE\" to resolve."
2366
msgstr ""
2367
2368
#: bzrlib/builtins.py:3697
2369
msgid "Commit refused because there are unknown files in the working tree."
2370
msgstr ""
2371
2372
#: bzrlib/builtins.py:3700
2373
msgid ""
2374
"\n"
2375
"To commit to master branch, run update and then commit.\n"
2376
"You can also pass --local to commit to continue working disconnected."
2377
msgstr ""
2378
2379
#: bzrlib/builtins.py:3708
2380
msgid ""
2381
"Validate working tree structure, branch consistency and repository history."
2382
msgstr ""
2383
2384
#: bzrlib/builtins.py:3710
2385
msgid ""
2386
"This command checks various invariants about branch and repository storage\n"
2387
"to detect data corruption or bzr bugs."
2388
msgstr ""
2389
2390
#: bzrlib/builtins.py:3713
2391
msgid ""
2392
"The working tree and branch checks will only give output if a problem is\n"
2393
"detected. The output fields of the repository check are:"
2394
msgstr ""
2395
2396
#: bzrlib/builtins.py:3716
2397
msgid ""
2398
"revisions\n"
2399
" This is just the number of revisions checked. It doesn't\n"
2400
" indicate a problem."
2401
msgstr ""
2402
2403
#: bzrlib/builtins.py:3720
2404
msgid ""
2405
"versionedfiles\n"
2406
" This is just the number of versionedfiles checked. It\n"
2407
" doesn't indicate a problem."
2408
msgstr ""
2409
2410
#: bzrlib/builtins.py:3724
2411
msgid ""
2412
"unreferenced ancestors\n"
2413
" Texts that are ancestors of other texts, but\n"
2414
" are not properly referenced by the revision ancestry. This is a\n"
2415
" subtle problem that Bazaar can work around."
2416
msgstr ""
2417
2418
#: bzrlib/builtins.py:3729
2419
msgid ""
2420
"unique file texts\n"
2421
" This is the total number of unique file contents\n"
2422
" seen in the checked revisions. It does not indicate a problem."
2423
msgstr ""
2424
2425
#: bzrlib/builtins.py:3733
2426
msgid ""
2427
"repeated file texts\n"
2428
" This is the total number of repeated texts seen\n"
2429
" in the checked revisions. Texts can be repeated when their file\n"
2430
" entries are modified, but the file contents are not. It does not\n"
2431
" indicate a problem."
2432
msgstr ""
2433
2434
#: bzrlib/builtins.py:3739
2435
msgid ""
2436
"If no restrictions are specified, all Bazaar data that is found at the "
2437
"given\n"
2438
"location will be checked."
2439
msgstr ""
2440
2441
#: bzrlib/builtins.py:3744
2442
msgid " Check the tree and branch at 'foo'::"
2443
msgstr ""
2444
2445
#: bzrlib/builtins.py:3746
2446
msgid " bzr check --tree --branch foo"
2447
msgstr ""
2448
2449
#: bzrlib/builtins.py:3748
2450
msgid " Check only the repository at 'bar'::"
2451
msgstr ""
2452
2453
#: bzrlib/builtins.py:3750
2454
msgid " bzr check --repo bar"
2455
msgstr ""
2456
2457
#: bzrlib/builtins.py:3752
2458
msgid " Check everything at 'baz'::"
2459
msgstr ""
2460
2461
#: bzrlib/builtins.py:3754
2462
msgid " bzr check baz"
2463
msgstr ""
2464
2465
# help of 'branch' option of 'check' command
2466
#: bzrlib/builtins.py:3760
2467
msgid "Check the branch related to the current directory."
2468
msgstr ""
2469
2470
# help of 'repo' option of 'check' command
2471
#: bzrlib/builtins.py:3762
2472
msgid "Check the repository related to the current directory."
2473
msgstr ""
2474
2475
# help of 'tree' option of 'check' command
2476
#: bzrlib/builtins.py:3764
2477
msgid "Check the working tree related to the current directory."
2478
msgstr ""
2479
2480
#: bzrlib/builtins.py:3778
2481
msgid "Upgrade a repository, branch or working tree to a newer format."
2482
msgstr ""
2483
2484
#: bzrlib/builtins.py:3780
2485
msgid ""
2486
"When the default format has changed after a major new release of\n"
2487
"Bazaar, you may be informed during certain operations that you\n"
2488
"should upgrade. Upgrading to a newer format may improve performance\n"
2489
"or make new features available. It may however limit interoperability\n"
2490
"with older repositories or with older versions of Bazaar."
2491
msgstr ""
2492
2493
#: bzrlib/builtins.py:3786
2494
msgid ""
2495
"If you wish to upgrade to a particular format rather than the\n"
2496
"current default, that can be specified using the --format option.\n"
2497
"As a consequence, you can use the upgrade command this way to\n"
2498
"\"downgrade\" to an earlier format, though some conversions are\n"
2499
"a one way process (e.g. changing from the 1.x default to the\n"
2500
"2.x default) so downgrading is not always possible."
2501
msgstr ""
2502
2503
#: bzrlib/builtins.py:3793
2504
msgid ""
2505
"A backup.bzr.~#~ directory is created at the start of the conversion\n"
2506
"process (where # is a number). By default, this is left there on\n"
2507
"completion. If the conversion fails, delete the new .bzr directory\n"
2508
"and rename this one back in its place. Use the --clean option to ask\n"
2509
"for the backup.bzr directory to be removed on successful conversion.\n"
2510
"Alternatively, you can delete it by hand if everything looks good\n"
2511
"afterwards."
2512
msgstr ""
2513
2514
#: bzrlib/builtins.py:3801
2515
msgid ""
2516
"If the location given is a shared repository, dependent branches\n"
2517
"are also converted provided the repository converts successfully.\n"
2518
"If the conversion of a branch fails, remaining branches are still\n"
2519
"tried."
2520
msgstr ""
2521
2522
#: bzrlib/builtins.py:3806
2523
msgid ""
2524
"For more information on upgrades, see the Bazaar Upgrade Guide,\n"
2525
"http://doc.bazaar.canonical.com/latest/en/upgrade-guide/."
2526
msgstr ""
2527
2528
# help of 'format' option of 'upgrade' command
2529
#: bzrlib/builtins.py:3814
2530
msgid "Upgrade to a specific format. See \"bzr help formats\" for details."
2531
msgstr ""
2532
2533
# title of 'format' option of 'init' command
2534
# title of 'format' option of 'upgrade' command
2535
#: bzrlib/builtins.py:3818
2536
msgid "Branch format"
2537
msgstr ""
2538
2539
# help of 'clean' option of 'upgrade' command
2540
#: bzrlib/builtins.py:3820
2541
msgid "Remove the backup.bzr directory if successful."
2542
msgstr ""
2543
2544
# help of 'dry-run' option of 'add' command
2545
# help of 'dry-run' option of 'upgrade' command
2546
#: bzrlib/builtins.py:3822
2547
msgid "Show what would be done, but don't actually do anything."
2548
msgstr ""
2549
2550
#: bzrlib/builtins.py:3837
2551
msgid "Show or set bzr user id."
2552
msgstr ""
2553
2554
#: bzrlib/builtins.py:3839
2555
msgid ""
2556
":Examples:\n"
2557
" Show the email of the current user::"
2558
msgstr ""
2559
2560
#: bzrlib/builtins.py:3842
2561
msgid " bzr whoami --email"
2562
msgstr ""
2563
2564
#: bzrlib/builtins.py:3844
2565
msgid " Set the current user::"
2566
msgstr ""
2567
2568
#: bzrlib/builtins.py:3846
2569
msgid " bzr whoami \"Frank Chu <fchu@example.com>\""
2570
msgstr ""
2571
2572
# help of 'email' option of 'whoami' command
2573
#: bzrlib/builtins.py:3850
2574
msgid "Display email address only."
2575
msgstr ""
2576
2577
# help of 'branch' option of 'whoami' command
2578
#: bzrlib/builtins.py:3852
2579
msgid "Set identity for the current branch instead of globally."
2580
msgstr ""
2581
2582
#: bzrlib/builtins.py:3878
2583
msgid "--email can only be used to display existing identity"
2584
msgstr ""
2585
2586
#: bzrlib/builtins.py:3902
2587
msgid "Print or set the branch nickname."
2588
msgstr ""
2589
2590
#: bzrlib/builtins.py:3904
2591
msgid ""
2592
"If unset, the colocated branch name is used for colocated branches, and\n"
2593
"the branch directory name is used for other branches. To print the\n"
2594
"current nickname, execute with no argument."
2595
msgstr ""
2596
2597
#: bzrlib/builtins.py:3908
2598
msgid ""
2599
"Bound branches use the nickname of its master branch unless it is set\n"
2600
"locally."
2601
msgstr ""
2602
2603
#: bzrlib/builtins.py:3928
2604
msgid "Set/unset and display aliases."
2605
msgstr ""
2606
2607
#: bzrlib/builtins.py:3930
2608
msgid ""
2609
":Examples:\n"
2610
" Show the current aliases::"
2611
msgstr ""
2612
2613
#: bzrlib/builtins.py:3933
2614
msgid " bzr alias"
2615
msgstr ""
2616
2617
#: bzrlib/builtins.py:3935
2618
msgid " Show the alias specified for 'll'::"
2619
msgstr ""
2620
2621
#: bzrlib/builtins.py:3937
2622
msgid " bzr alias ll"
2623
msgstr ""
2624
2625
#: bzrlib/builtins.py:3939
2626
msgid " Set an alias for 'll'::"
2627
msgstr ""
2628
2629
#: bzrlib/builtins.py:3941
2630
msgid " bzr alias ll=\"log --line -r-10..-1\""
2631
msgstr ""
2632
2633
#: bzrlib/builtins.py:3943
2634
msgid " To remove an alias for 'll'::"
2635
msgstr ""
2636
2637
#: bzrlib/builtins.py:3945
2638
msgid " bzr alias --remove ll"
2639
msgstr ""
2640
2641
# help of 'remove' option of 'alias' command
2642
#: bzrlib/builtins.py:3950
2643
msgid "Remove the alias."
2644
msgstr ""
2645
2646
#: bzrlib/builtins.py:3968
2647
msgid "bzr alias --remove expects an alias to remove."
2648
msgstr ""
2649
2650
#: bzrlib/builtins.py:4149
2651
msgid "subunit not available. subunit needs to be installed to use --subunit."
2652
msgstr ""
2653
2654
#: bzrlib/builtins.py:4166
2655
msgid ""
2656
"--benchmark is no longer supported from bzr 2.2; use bzr-usertest instead"
2657
msgstr ""
2658
2659
#: bzrlib/builtins.py:4213
2660
msgid "Show version of bzr."
2661
msgstr ""
2662
2663
# help of 'short' option of 'version' command
2664
#: bzrlib/builtins.py:4217
2665
msgid "Print just the version number."
2666
msgstr ""
2667
2668
#: bzrlib/builtins.py:4236
2669
msgid "It sure does!\n"
2670
msgstr ""
2671
2672
#: bzrlib/builtins.py:4260
2673
#, python-format
2674
msgid "merge base is revision %s\n"
2675
msgstr ""
2676
2677
#: bzrlib/builtins.py:4264
2678
msgid "Perform a three-way merge."
2679
msgstr ""
2680
2681
#: bzrlib/builtins.py:4266
2682
msgid ""
2683
"The source of the merge can be specified either in the form of a branch,\n"
2684
"or in the form of a path to a file containing a merge directive generated\n"
2685
"with bzr send. If neither is specified, the default is the upstream branch\n"
2686
"or the branch most recently merged using --remember. The source of the\n"
2687
"merge may also be specified in the form of a path to a file in another\n"
2688
"branch: in this case, only the modifications to that file are merged into\n"
2689
"the current working tree."
2690
msgstr ""
2691
2692
#: bzrlib/builtins.py:4274
2693
msgid ""
2694
"When merging from a branch, by default bzr will try to merge in all new\n"
2695
"work from the other branch, automatically determining an appropriate base\n"
2696
"revision. If this fails, you may need to give an explicit base."
2697
msgstr ""
2698
2699
#: bzrlib/builtins.py:4278
2700
msgid ""
2701
"To pick a different ending revision, pass \"--revision OTHER\". bzr will\n"
2702
"try to merge in all new work up to and including revision OTHER."
2703
msgstr ""
2704
2705
#: bzrlib/builtins.py:4281
2706
msgid ""
2707
"If you specify two values, \"--revision BASE..OTHER\", only revisions BASE\n"
2708
"through OTHER, excluding BASE but including OTHER, will be merged. If this\n"
2709
"causes some revisions to be skipped, i.e. if the destination branch does\n"
2710
"not already contain revision BASE, such a merge is commonly referred to as\n"
2711
"a \"cherrypick\". Unlike a normal merge, Bazaar does not currently track\n"
2712
"cherrypicks. The changes look like a normal commit, and the history of the\n"
2713
"changes from the other branch is not stored in the commit."
2714
msgstr ""
2715
2716
#: bzrlib/builtins.py:4289
2717
msgid "Revision numbers are always relative to the source branch."
2718
msgstr ""
2719
2720
#: bzrlib/builtins.py:4291 bzrlib/conflicts.py:52 bzrlib/conflicts.py:106
2721
msgid ""
2722
"Merge will do its best to combine the changes in two branches, but there\n"
2723
"are some kinds of problems only a human can fix. When it encounters those,\n"
2724
"it will mark a conflict. A conflict means that you need to fix something,\n"
2725
"before you can commit."
2726
msgstr ""
2727
2728
#: bzrlib/builtins.py:4296
2729
msgid "Use bzr resolve when you have fixed a problem. See also bzr conflicts."
2730
msgstr ""
2731
2732
#: bzrlib/builtins.py:4298
2733
msgid ""
2734
"If there is no default branch set, the first merge will set it (use\n"
2735
"--no-remember to avoid setting it). After that, you can omit the branch\n"
2736
"to use the default. To change the default, use --remember. The value will\n"
2737
"only be saved if the remote location can be accessed."
2738
msgstr ""
2739
2740
#: bzrlib/builtins.py:4303
2741
msgid ""
2742
"The results of the merge are placed into the destination working\n"
2743
"directory, where they can be reviewed (with bzr diff), tested, and then\n"
2744
"committed to record the result of the merge."
2745
msgstr ""
2746
2747
#: bzrlib/builtins.py:4307
2748
msgid ""
2749
"merge refuses to run if there are any uncommitted changes, unless\n"
2750
"--force is given. If --force is given, then the changes from the source \n"
2751
"will be merged with the current working tree, including any uncommitted\n"
2752
"changes in the tree. The --force option can also be used to create a\n"
2753
"merge revision which has more than two parents."
2754
msgstr ""
2755
2756
#: bzrlib/builtins.py:4313
2757
msgid ""
2758
"If one would like to merge changes from the working tree of the other\n"
2759
"branch without merging any committed revisions, the --uncommitted option\n"
2760
"can be given."
2761
msgstr ""
2762
2763
#: bzrlib/builtins.py:4317
2764
msgid ""
2765
"To select only some changes to merge, use \"merge -i\", which will prompt\n"
2766
"you to apply each diff hunk and file change, similar to \"shelve\"."
2767
msgstr ""
2768
2769
#: bzrlib/builtins.py:4320
2770
msgid ""
2771
":Examples:\n"
2772
" To merge all new revisions from bzr.dev::"
2773
msgstr ""
2774
2775
#: bzrlib/builtins.py:4323
2776
msgid " bzr merge ../bzr.dev"
2777
msgstr ""
2778
2779
#: bzrlib/builtins.py:4325
2780
msgid " To merge changes up to and including revision 82 from bzr.dev::"
2781
msgstr ""
2782
2783
#: bzrlib/builtins.py:4327
2784
msgid " bzr merge -r 82 ../bzr.dev"
2785
msgstr ""
2786
2787
#: bzrlib/builtins.py:4329
2788
msgid " To merge the changes introduced by 82, without previous changes::"
2789
msgstr ""
2790
2791
#: bzrlib/builtins.py:4331
2792
msgid " bzr merge -r 81..82 ../bzr.dev"
2793
msgstr ""
2794
2795
#: bzrlib/builtins.py:4333
2796
msgid " To apply a merge directive contained in /tmp/merge::"
2797
msgstr ""
2798
2799
#: bzrlib/builtins.py:4335
2800
msgid " bzr merge /tmp/merge"
2801
msgstr ""
2802
2803
#: bzrlib/builtins.py:4337
2804
msgid ""
2805
" To create a merge revision with three parents from two branches\n"
2806
" feature1a and feature1b:"
2807
msgstr ""
2808
2809
#: bzrlib/builtins.py:4340
2810
msgid ""
2811
" bzr merge ../feature1a\n"
2812
" bzr merge ../feature1b --force\n"
2813
" bzr commit -m 'revision with three parents'"
2814
msgstr ""
2815
2816
# help of 'force' option of 'merge' command
2817
#: bzrlib/builtins.py:4352
2818
msgid "Merge even if the destination tree has uncommitted changes."
2819
msgstr ""
2820
2821
# help of 'uncommitted' option of 'merge' command
2822
#: bzrlib/builtins.py:4358
2823
msgid ""
2824
"Apply uncommitted changes from a working copy, instead of branch changes."
2825
msgstr ""
2826
2827
# help of 'pull' option of 'merge' command
2828
#: bzrlib/builtins.py:4360
2829
msgid ""
2830
"If the destination is already completely merged into the source, pull from "
2831
"the source rather than merging. When this happens, you do not need to "
2832
"commit the result."
2833
msgstr ""
2834
2835
# help of 'directory' option of 'merge' command
2836
#: bzrlib/builtins.py:4365
2837
msgid ""
2838
"Branch to merge into, rather than the one containing the working directory."
2839
msgstr ""
2840
2841
# help of 'preview' option of 'merge' command
2842
#: bzrlib/builtins.py:4367
2843
msgid "Instead of merging, show a diff of the merge."
2844
msgstr ""
2845
2846
# help of 'interactive' option of 'merge' command
2847
#: bzrlib/builtins.py:4369
2848
msgid "Select changes interactively."
2849
msgstr ""
2850
2851
#: bzrlib/builtins.py:4391
2852
msgid ""
2853
"Merging into empty branches not currently supported, https://bugs.launchpad."
2854
"net/bzr/+bug/308562"
2855
msgstr ""
2856
2857
#: bzrlib/builtins.py:4418
2858
msgid "Cannot use --uncommitted with bundles or merge directives."
2859
msgstr ""
2860
2861
#: bzrlib/builtins.py:4429
2862
msgid "Cannot use --uncommitted and --revision at the same time."
2863
msgstr ""
2864
2865
#: bzrlib/builtins.py:4449
2866
msgid "merger: "
2867
msgstr ""
2868
2869
#: bzrlib/builtins.py:4451 bzrlib/bundle/apply_bundle.py:71
2870
msgid "Nothing to do."
2871
msgstr ""
2872
2873
#: bzrlib/builtins.py:4455
2874
msgid "Cannot pull individual files"
2875
msgstr ""
2876
2877
#: bzrlib/builtins.py:4463
2878
msgid "This branch has no commits. (perhaps you would prefer 'bzr pull')"
2879
msgstr ""
2880
2881
#: bzrlib/builtins.py:4521
2882
#, python-format
2883
msgid "Show-base is not supported for this merge type. %s"
2884
msgstr ""
2885
2886
#: bzrlib/builtins.py:4530
2887
#, python-format
2888
msgid "Conflict reduction is not supported for merge type %s."
2889
msgstr ""
2890
2891
#: bzrlib/builtins.py:4534
2892
msgid "Cannot do conflict reduction and show base."
2893
msgstr ""
2894
2895
#: bzrlib/builtins.py:4645
2896
msgid "No location specified or remembered"
2897
msgstr ""
2898
2899
#: bzrlib/builtins.py:4647
2900
msgid "{0} remembered {1} location {2}"
2901
msgstr ""
2902
2903
#: bzrlib/builtins.py:4653
2904
msgid "Redo a merge."
2905
msgstr ""
2906
2907
#: bzrlib/builtins.py:4655
2908
msgid ""
2909
"Use this if you want to try a different merge technique while resolving\n"
2910
"conflicts. Some merge techniques are better than others, and remerge\n"
2911
"lets you try different ones on different files."
2912
msgstr ""
2913
2914
#: bzrlib/builtins.py:4659
2915
msgid ""
2916
"The options for remerge have the same meaning and defaults as the ones for\n"
2917
"merge. The difference is that remerge can (only) be run when there is a\n"
2918
"pending merge, and it lets you specify particular files."
2919
msgstr ""
2920
2921
#: bzrlib/builtins.py:4663
2922
msgid ""
2923
":Examples:\n"
2924
" Re-do the merge of all conflicted files, and show the base text in\n"
2925
" conflict regions, in addition to the usual THIS and OTHER texts::"
2926
msgstr ""
2927
2928
#: bzrlib/builtins.py:4667
2929
msgid " bzr remerge --show-base"
2930
msgstr ""
2931
2932
#: bzrlib/builtins.py:4669
2933
msgid ""
2934
" Re-do the merge of \"foobar\", using the weave merge algorithm, with\n"
2935
" additional processing to reduce the size of conflict regions::"
2936
msgstr ""
2937
2938
#: bzrlib/builtins.py:4672
2939
msgid " bzr remerge --merge-type weave --reprocess foobar"
2940
msgstr ""
2941
2942
# help of 'show-base' option of 'merge' command
2943
# help of 'show-base' option of 'pull' command
2944
# help of 'show-base' option of 'remerge' command
2945
# help of 'show-base' option of 'update' command
2946
#: bzrlib/builtins.py:4679
2947
msgid "Show base revision text in conflicts."
2948
msgstr ""
2949
2950
#: bzrlib/builtins.py:4691
2951
msgid ""
2952
"Sorry, remerge only works after normal merges. Not cherrypicking or multi-"
2953
"merges."
2954
msgstr ""
2955
2956
#: bzrlib/builtins.py:4749
2957
msgid ""
2958
"Set files in the working tree back to the contents of a previous revision."
2959
msgstr ""
2960
2961
#: bzrlib/builtins.py:4751
2962
msgid ""
2963
"Giving a list of files will revert only those files. Otherwise, all files\n"
2964
"will be reverted. If the revision is not specified with '--revision', the\n"
2965
"working tree basis revision is used. A revert operation affects only the\n"
2966
"working tree, not any revision history like the branch and repository or\n"
2967
"the working tree basis revision."
2968
msgstr ""
2969
2970
#: bzrlib/builtins.py:4757
2971
msgid ""
2972
"To remove only some changes, without reverting to a prior version, use\n"
2973
"merge instead. For example, \"merge . -r -2..-3\" (don't forget the \".\")\n"
2974
"will remove the changes introduced by the second last commit (-2), without\n"
2975
"affecting the changes introduced by the last commit (-1). To remove\n"
2976
"certain changes on a hunk-by-hunk basis, see the shelve command.\n"
2977
"To update the branch to a specific revision or the latest revision and\n"
2978
"update the working tree accordingly while preserving local changes, see the\n"
2979
"update command."
2980
msgstr ""
2981
2982
#: bzrlib/builtins.py:4766
2983
msgid ""
2984
"Uncommitted changes to files that are reverted will be discarded.\n"
2985
"Howver, by default, any files that have been manually changed will be\n"
2986
"backed up first. (Files changed only by merge are not backed up.) Backup\n"
2987
"files have '.~#~' appended to their name, where # is a number."
2988
msgstr ""
2989
2990
#: bzrlib/builtins.py:4771
2991
msgid ""
2992
"When you provide files, you can use their current pathname or the pathname\n"
2993
"from the target revision. So you can use revert to \"undelete\" a file by\n"
2994
"name. If you name a directory, all the contents of that directory will be\n"
2995
"reverted."
2996
msgstr ""
2997
2998
#: bzrlib/builtins.py:4776
2999
msgid ""
3000
"If you have newly added files since the target revision, they will be\n"
3001
"removed. If the files to be removed have been changed, backups will be\n"
3002
"created as above. Directories containing unknown files will not be\n"
3003
"deleted."
3004
msgstr ""
3005
3006
#: bzrlib/builtins.py:4781
3007
msgid ""
3008
"The working tree contains a list of revisions that have been merged but\n"
3009
"not yet committed. These revisions will be included as additional parents\n"
3010
"of the next commit. Normally, using revert clears that list as well as\n"
3011
"reverting the files. If any files are specified, revert leaves the list\n"
3012
"of uncommitted merges alone and reverts only the files. Use ``bzr revert\n"
3013
".`` in the tree root to revert all files but keep the recorded merges,\n"
3014
"and ``bzr revert --forget-merges`` to clear the pending merge list without\n"
3015
"reverting any files."
3016
msgstr ""
3017
3018
#: bzrlib/builtins.py:4790
3019
msgid ""
3020
"Using \"bzr revert --forget-merges\", it is possible to apply all of the\n"
3021
"changes from a branch in a single revision. To do this, perform the merge\n"
3022
"as desired. Then doing revert with the \"--forget-merges\" option will "
3023
"keep\n"
3024
"the content of the tree as it was, but it will clear the list of pending\n"
3025
"merges. The next commit will then contain all of the changes that are\n"
3026
"present in the other branch, but without any other parent revisions.\n"
3027
"Because this technique forgets where these changes originated, it may\n"
3028
"cause additional conflicts on later merges involving the same source and\n"
3029
"target branches."
3030
msgstr ""
3031
3032
# help of 'no-backup' option of 'revert' command
3033
#: bzrlib/builtins.py:4804
3034
msgid "Do not save backups of reverted files."
3035
msgstr ""
3036
3037
# help of 'forget-merges' option of 'revert' command
3038
#: bzrlib/builtins.py:4806
3039
msgid "Remove pending merge marker, without changing any files."
3040
msgstr ""
3041
3042
#: bzrlib/builtins.py:4837
3043
msgid ""
3044
"Show help on a command or other topic.\n"
3045
" "
3046
msgstr ""
3047
3048
# help of 'long' option of 'help' command
3049
#: bzrlib/builtins.py:4842
3050
msgid "Show help on all commands."
3051
msgstr ""
3052
3053
#: bzrlib/builtins.py:4871
3054
msgid "Show unmerged/unpulled revisions between two branches."
3055
msgstr ""
3056
3057
#: bzrlib/builtins.py:4873
3058
msgid "OTHER_BRANCH may be local or remote."
3059
msgstr ""
3060
3061
#: bzrlib/builtins.py:4875
3062
msgid ""
3063
"To filter on a range of revisions, you can use the command -r begin..end\n"
3064
"-r revision requests a specific revision, -r ..end or -r begin.. are\n"
3065
"also valid.\n"
3066
" \n"
3067
":Exit values:\n"
3068
" 1 - some missing revisions\n"
3069
" 0 - no missing revisions"
3070
msgstr ""
3071
3072
#: bzrlib/builtins.py:4885
3073
msgid ""
3074
" Determine the missing revisions between this and the branch at the\n"
3075
" remembered pull location::"
3076
msgstr ""
3077
3078
#: bzrlib/builtins.py:4888
3079
msgid " bzr missing"
3080
msgstr ""
3081
3082
#: bzrlib/builtins.py:4890
3083
msgid " Determine the missing revisions between this and another branch::"
3084
msgstr ""
3085
3086
#: bzrlib/builtins.py:4892
3087
msgid " bzr missing http://server/branch"
3088
msgstr ""
3089
3090
#: bzrlib/builtins.py:4894
3091
msgid ""
3092
" Determine the missing revisions up to a specific revision on the other\n"
3093
" branch::"
3094
msgstr ""
3095
3096
#: bzrlib/builtins.py:4897
3097
msgid " bzr missing -r ..-10"
3098
msgstr ""
3099
3100
#: bzrlib/builtins.py:4899
3101
msgid ""
3102
" Determine the missing revisions up to a specific revision on this\n"
3103
" branch::"
3104
msgstr ""
3105
3106
#: bzrlib/builtins.py:4902
3107
msgid " bzr missing --my-revision ..-10"
3108
msgstr ""
3109
3110
# help of 'reverse' option of 'missing' command
3111
#: bzrlib/builtins.py:4909
3112
msgid "Reverse the order of revisions."
3113
msgstr ""
3114
3115
# help of 'mine-only' option of 'missing' command
3116
#: bzrlib/builtins.py:4911
3117
msgid "Display changes in the local branch only."
3118
msgstr ""
3119
3120
# help of 'this' option of 'missing' command
3121
#: bzrlib/builtins.py:4912
3122
msgid "Same as --mine-only."
3123
msgstr ""
3124
3125
# help of 'theirs-only' option of 'missing' command
3126
#: bzrlib/builtins.py:4914
3127
msgid "Display changes in the remote branch only."
3128
msgstr ""
3129
3130
# help of 'other' option of 'missing' command
3131
#: bzrlib/builtins.py:4915
3132
msgid "Same as --theirs-only."
3133
msgstr ""
3134
3135
# help of 'revision' option of 'missing' command
3136
#: bzrlib/builtins.py:4920
3137
msgid ""
3138
"Filter on other branch revisions (inclusive). See \"help revisionspec\" for "
3139
"details."
3140
msgstr ""
3141
3142
# help of 'my-revision' option of 'missing' command
3143
#: bzrlib/builtins.py:4924
3144
msgid ""
3145
"Filter on local branch revisions (inclusive). See \"help revisionspec\" for "
3146
"details."
3147
msgstr ""
3148
3149
# help of 'include-merged' option of 'missing' command
3150
#: bzrlib/builtins.py:4927
3151
msgid "Show all revisions in addition to the mainline ones."
3152
msgstr ""
3153
3154
#: bzrlib/builtins.py:4981
3155
msgid "No peer location known or specified."
3156
msgstr ""
3157
3158
#: bzrlib/builtins.py:4985
3159
msgid "Using saved parent location: {0}\n"
3160
msgstr ""
3161
3162
#: bzrlib/builtins.py:5018
3163
#, python-format
3164
msgid "You have %d extra revision:\n"
3165
msgid_plural "You have %d extra revisions:\n"
3166
msgstr[0] ""
3167
msgstr[1] ""
3168
3169
#: bzrlib/builtins.py:5038
3170
#, python-format
3171
msgid "You are missing %d revision:\n"
3172
msgid_plural "You are missing %d revisions:\n"
3173
msgstr[0] ""
3174
msgstr[1] ""
3175
3176
#: bzrlib/builtins.py:5053
3177
msgid "This branch has no new revisions.\n"
3178
msgstr ""
3179
3180
#: bzrlib/builtins.py:5056
3181
msgid "Other branch has no new revisions.\n"
3182
msgstr ""
3183
3184
#: bzrlib/builtins.py:5061
3185
msgid "Branches are up to date.\n"
3186
msgstr ""
3187
3188
#: bzrlib/builtins.py:5072
3189
msgid "Compress the data within a repository."
3190
msgstr ""
3191
3192
#: bzrlib/builtins.py:5074
3193
msgid ""
3194
"This operation compresses the data within a bazaar repository. As\n"
3195
"bazaar supports automatic packing of repository, this operation is\n"
3196
"normally not required to be done manually."
3197
msgstr ""
3198
3199
#: bzrlib/builtins.py:5078
3200
msgid ""
3201
"During the pack operation, bazaar takes a backup of existing repository\n"
3202
"data, i.e. pack files. This backup is eventually removed by bazaar\n"
3203
"automatically when it is safe to do so. To save disk space by removing\n"
3204
"the backed up pack files, the --clean-obsolete-packs option may be\n"
3205
"used."
3206
msgstr ""
3207
3208
#: bzrlib/builtins.py:5084
3209
msgid ""
3210
"Warning: If you use --clean-obsolete-packs and your machine crashes\n"
3211
"during or immediately after repacking, you may be left with a state\n"
3212
"where the deletion has been written to disk but the new packs have not\n"
3213
"been. In this case the repository may be unusable."
3214
msgstr ""
3215
3216
# help of 'clean-obsolete-packs' option of 'pack' command
3217
#: bzrlib/builtins.py:5093
3218
msgid "Delete obsolete packs to save disk space."
3219
msgstr ""
3220
3221
#: bzrlib/builtins.py:5107
3222
msgid "List the installed plugins."
3223
msgstr ""
3224
3225
#: bzrlib/builtins.py:5109
3226
msgid ""
3227
"This command displays the list of installed plugins including\n"
3228
"version of plugin and a short description of each."
3229
msgstr ""
3230
3231
#: bzrlib/builtins.py:5112
3232
msgid "--verbose shows the path where each plugin is located."
3233
msgstr ""
3234
3235
#: bzrlib/builtins.py:5114
3236
msgid ""
3237
"A plugin is an external component for Bazaar that extends the\n"
3238
"revision control system, by adding or replacing code in Bazaar.\n"
3239
"Plugins can do a variety of things, including overriding commands,\n"
3240
"adding new commands, providing additional network transports and\n"
3241
"customizing log output."
3242
msgstr ""
3243
3244
#: bzrlib/builtins.py:5120
3245
msgid ""
3246
"See the Bazaar Plugin Guide <http://doc.bazaar.canonical.com/plugins/en/>\n"
3247
"for further information on plugins including where to find them and how to\n"
3248
"install them. Instructions are also provided there on how to write new\n"
3249
"plugins using the Python programming language."
3250
msgstr ""
3251
3252
#: bzrlib/builtins.py:5136
3253
msgid "Show testament (signing-form) of a revision."
3254
msgstr ""
3255
3256
# help of 'long' option of 'testament' command
3257
#: bzrlib/builtins.py:5139
3258
msgid "Produce long-format testament."
3259
msgstr ""
3260
3261
# help of 'strict' option of 'testament' command
3262
#: bzrlib/builtins.py:5141
3263
msgid "Produce a strict-format testament."
3264
msgstr ""
3265
3266
#: bzrlib/builtins.py:5168
3267
msgid "Show the origin of each line in a file."
3268
msgstr ""
3269
3270
#: bzrlib/builtins.py:5170
3271
msgid ""
3272
"This prints out the given file with an annotation on the left side\n"
3273
"indicating which revision, author and date introduced the change."
3274
msgstr ""
3275
3276
#: bzrlib/builtins.py:5173
3277
msgid ""
3278
"If the origin is the same for a run of consecutive lines, it is\n"
3279
"shown only at the top, unless the --all option is given."
3280
msgstr ""
3281
3282
# help of 'all' option of 'annotate' command
3283
#: bzrlib/builtins.py:5181
3284
msgid "Show annotations on all lines."
3285
msgstr ""
3286
3287
# help of 'long' option of 'annotate' command
3288
#: bzrlib/builtins.py:5182
3289
msgid "Show commit date in annotations."
3290
msgstr ""
3291
3292
#: bzrlib/builtins.py:5269
3293
msgid "Cannot sign a range of non-revision-history revisions"
3294
msgstr ""
3295
3296
#: bzrlib/builtins.py:5281
3297
msgid "Please supply either one revision, or a range."
3298
msgstr ""
3299
3300
#: bzrlib/builtins.py:5285
3301
msgid ""
3302
"Convert the current branch into a checkout of the supplied branch.\n"
3303
"If no branch is supplied, rebind to the last bound location."
3304
msgstr ""
3305
3306
#: bzrlib/builtins.py:5288
3307
msgid ""
3308
"Once converted into a checkout, commits must succeed on the master branch\n"
3309
"before they will be applied to the local branch."
3310
msgstr ""
3311
3312
#: bzrlib/builtins.py:5291
3313
msgid ""
3314
"Bound branches use the nickname of its master branch unless it is set\n"
3315
"locally, in which case binding will update the local nickname to be\n"
3316
"that of the master."
3317
msgstr ""
3318
3319
#: bzrlib/builtins.py:5306
3320
msgid "No location supplied. This format does not remember old locations."
3321
msgstr ""
3322
3323
#: bzrlib/builtins.py:5312
3324
msgid "Branch is already bound"
3325
msgstr ""
3326
3327
#: bzrlib/builtins.py:5315
3328
msgid "No location supplied and no previous location known"
3329
msgstr ""
3330
3331
#: bzrlib/builtins.py:5321
3332
msgid "These branches have diverged. Try merging, and then bind again."
3333
msgstr ""
3334
3335
#: bzrlib/builtins.py:5328
3336
msgid "Convert the current checkout into a regular branch."
3337
msgstr ""
3338
3339
#: bzrlib/builtins.py:5330
3340
msgid ""
3341
"After unbinding, the local branch is considered independent and subsequent\n"
3342
"commits will be local only."
3343
msgstr ""
3344
3345
#: bzrlib/builtins.py:5341
3346
msgid "Local branch is not bound"
3347
msgstr ""
3348
3349
#: bzrlib/builtins.py:5345
3350
msgid "Remove the last committed revision."
3351
msgstr ""
3352
3353
#: bzrlib/builtins.py:5347
3354
msgid ""
3355
"--verbose will print out what is being removed.\n"
3356
"--dry-run will go through all the motions, but not actually\n"
3357
"remove anything."
3358
msgstr ""
3359
3360
#: bzrlib/builtins.py:5351
3361
msgid ""
3362
"If --revision is specified, uncommit revisions to leave the branch at the\n"
3363
"specified revision. For example, \"bzr uncommit -r 15\" will leave the\n"
3364
"branch at revision 15."
3365
msgstr ""
3366
3367
#: bzrlib/builtins.py:5355
3368
msgid ""
3369
"Uncommit leaves the working tree ready for a new commit. The only change\n"
3370
"it may make is to restore any pending merges that were present before\n"
3371
"the commit."
3372
msgstr ""
3373
3374
# help of 'dry-run' option of 'uncommit' command
3375
#: bzrlib/builtins.py:5366
3376
msgid "Don't actually make changes."
3377
msgstr ""
3378
3379
# help of 'force' option of 'uncommit' command
3380
#: bzrlib/builtins.py:5367
3381
msgid "Say yes to all questions."
3382
msgstr ""
3383
3384
# help of 'keep-tags' option of 'uncommit' command
3385
#: bzrlib/builtins.py:5369
3386
msgid "Keep tags that point to removed revisions."
3387
msgstr ""
3388
3389
# help of 'local' option of 'uncommit' command
3390
#: bzrlib/builtins.py:5371
3391
msgid "Only remove the commits from the local branch when in a checkout."
3392
msgstr ""
3393
3394
#: bzrlib/builtins.py:5420
3395
msgid "No revisions to uncommit.\n"
3396
msgstr ""
3397
3398
#: bzrlib/builtins.py:5435
3399
msgid "Dry-run, pretending to remove the above revisions.\n"
3400
msgstr ""
3401
3402
#: bzrlib/builtins.py:5438
3403
msgid "The above revision(s) will be removed.\n"
3404
msgstr ""
3405
3406
#: bzrlib/builtins.py:5442
3407
msgid "Uncommit these revisions"
3408
msgstr ""
3409
3410
#: bzrlib/builtins.py:5445
3411
msgid "Canceled\n"
3412
msgstr ""
3413
3414
#: bzrlib/builtins.py:5452
3415
#, python-format
3416
msgid ""
3417
"You can restore the old tip by running:\n"
3418
" bzr pull . -r revid:%s\n"
3419
msgstr ""
3420
3421
#: bzrlib/builtins.py:5457
3422
msgid "Break a dead lock."
3423
msgstr ""
3424
3425
#: bzrlib/builtins.py:5459
3426
msgid ""
3427
"This command breaks a lock on a repository, branch, working directory or\n"
3428
"config file."
3429
msgstr ""
3430
3431
#: bzrlib/builtins.py:5462
3432
msgid ""
3433
"CAUTION: Locks should only be broken when you are sure that the process\n"
3434
"holding the lock has been stopped."
3435
msgstr ""
3436
3437
#: bzrlib/builtins.py:5465
3438
msgid ""
3439
"You can get information on what locks are open via the 'bzr info\n"
3440
"[location]' command."
3441
msgstr ""
3442
3443
#: bzrlib/builtins.py:5468
3444
msgid ""
3445
":Examples:\n"
3446
" bzr break-lock\n"
3447
" bzr break-lock bzr+ssh://example.com/bzr/foo\n"
3448
" bzr break-lock --conf ~/.bazaar"
3449
msgstr ""
3450
3451
# help of 'config' option of 'break-lock' command
3452
#: bzrlib/builtins.py:5477
3453
msgid "LOCATION is the directory where the config lock is."
3454
msgstr ""
3455
3456
# help of 'force' option of 'break-lock' command
3457
#: bzrlib/builtins.py:5479
3458
msgid "Do not ask for confirmation before breaking the lock."
3459
msgstr ""
3460
3461
# help of 'protocol=bzr' option of 'serve' command
3462
#: bzrlib/builtins.py:5514
3463
msgid "The Bazaar smart server protocol over TCP. (default port: 4155)"
3464
msgstr ""
3465
3466
#: bzrlib/builtins.py:5515
3467
msgid "Run the bzr server."
3468
msgstr ""
3469
3470
# help of 'inet' option of 'serve' command
3471
#: bzrlib/builtins.py:5521
3472
msgid "Serve on stdin/out for use from inetd or sshd."
3473
msgstr ""
3474
3475
# title of 'protocol' option of 'serve' command
3476
#: bzrlib/builtins.py:5522
3477
msgid "protocol"
3478
msgstr ""
3479
3480
# help of 'protocol' option of 'serve' command
3481
#: bzrlib/builtins.py:5523
3482
msgid "Protocol to serve."
3483
msgstr ""
3484
3485
# help of 'listen' option of 'serve' command
3486
#: bzrlib/builtins.py:5527
3487
msgid "Listen for connections on nominated address."
3488
msgstr ""
3489
3490
# help of 'port' option of 'serve' command
3491
#: bzrlib/builtins.py:5529
3492
msgid ""
3493
"Listen for connections on nominated port. Passing 0 as the port number will "
3494
"result in a dynamically allocated port. The default port depends on the "
3495
"protocol."
3496
msgstr ""
3497
3498
# help of 'directory' option of 'serve' command
3499
#: bzrlib/builtins.py:5534
3500
msgid "Serve contents of this directory."
3501
msgstr ""
3502
3503
# help of 'allow-writes' option of 'serve' command
3504
#: bzrlib/builtins.py:5536
3505
msgid ""
3506
"By default the server is a readonly server. Supplying --allow-writes "
3507
"enables write access to the contents of the served directory and below. "
3508
"Note that ``bzr serve`` does not perform authentication, so unless some form "
3509
"of external authentication is arranged supplying this option leads to global "
3510
"uncontrolled write access to your file system."
3511
msgstr ""
3512
3513
# help of 'client-timeout' option of 'serve' command
3514
#: bzrlib/builtins.py:5545
3515
msgid "Override the default idle client timeout (5min)."
3516
msgstr ""
3517
3518
#: bzrlib/builtins.py:5563
3519
msgid "Combine a tree into its containing tree."
3520
msgstr ""
3521
3522
#: bzrlib/builtins.py:5565
3523
msgid "This command requires the target tree to be in a rich-root format."
3524
msgstr ""
3525
3526
#: bzrlib/builtins.py:5567
3527
msgid ""
3528
"The TREE argument should be an independent tree, inside another tree, but\n"
3529
"not part of it. (Such trees can be produced by \"bzr split\", but also by\n"
3530
"running \"bzr branch\" with the target inside a tree.)"
3531
msgstr ""
3532
3533
#: bzrlib/builtins.py:5571
3534
msgid ""
3535
"The result is a combined tree, with the subtree no longer an independent\n"
3536
"part. This is marked as a merge of the subtree into the containing tree,\n"
3537
"and all history is preserved."
3538
msgstr ""
3539
3540
#: bzrlib/builtins.py:5589
3541
#, python-format
3542
msgid ""
3543
"Can't join trees because %s doesn't support rich root data.\n"
3544
"You can use bzr upgrade on the repository."
3545
msgstr ""
3546
3547
#: bzrlib/builtins.py:5599 bzrlib/builtins.py:5605
3548
msgid "Cannot join {0}. {1}"
3549
msgstr ""
3550
3551
#: bzrlib/builtins.py:5609
3552
msgid "Split a subdirectory of a tree into a separate tree."
3553
msgstr ""
3554
3555
#: bzrlib/builtins.py:5611
3556
msgid ""
3557
"This command will produce a target tree in a format that supports\n"
3558
"rich roots, like 'rich-root' or 'rich-root-pack'. These formats cannot be\n"
3559
"converted into earlier formats like 'dirstate-tags'."
3560
msgstr ""
3561
3562
#: bzrlib/builtins.py:5615
3563
msgid ""
3564
"The TREE argument should be a subdirectory of a working tree. That\n"
3565
"subdirectory will be converted into an independent tree, with its own\n"
3566
"branch. Commits in the top-level tree will not apply to the new subtree."
3567
msgstr ""
3568
3569
#: bzrlib/builtins.py:5695
3570
msgid "No submit branch specified or known"
3571
msgstr ""
3572
3573
#: bzrlib/builtins.py:5704 bzrlib/send.py:109
3574
msgid "No public branch specified or known"
3575
msgstr ""
3576
3577
#: bzrlib/builtins.py:5709
3578
msgid "bzr merge-directive takes at most two one revision identifiers"
3579
msgstr ""
3580
3581
#: bzrlib/builtins.py:5718
3582
msgid "No revisions to bundle."
3583
msgstr ""
3584
3585
#: bzrlib/builtins.py:5737
3586
msgid "Mail or create a merge-directive for submitting changes."
3587
msgstr ""
3588
3589
#: bzrlib/builtins.py:5739
3590
msgid "A merge directive provides many things needed for requesting merges:"
3591
msgstr ""
3592
3593
#: bzrlib/builtins.py:5741
3594
msgid "* A machine-readable description of the merge to perform"
3595
msgstr ""
3596
3597
#: bzrlib/builtins.py:5743
3598
msgid "* An optional patch that is a preview of the changes requested"
3599
msgstr ""
3600
3601
#: bzrlib/builtins.py:5745
3602
msgid ""
3603
"* An optional bundle of revision data, so that the changes can be applied\n"
3604
" directly from the merge directive, without retrieving data from a\n"
3605
" branch."
3606
msgstr ""
3607
3608
#: bzrlib/builtins.py:5749
3609
msgid ""
3610
"`bzr send` creates a compact data set that, when applied using bzr\n"
3611
"merge, has the same effect as merging from the source branch. "
3612
msgstr ""
3613
3614
#: bzrlib/builtins.py:5752
3615
msgid ""
3616
"By default the merge directive is self-contained and can be applied to any\n"
3617
"branch containing submit_branch in its ancestory without needing access to\n"
3618
"the source branch."
3619
msgstr ""
3620
3621
#: bzrlib/builtins.py:5756
3622
msgid ""
3623
"If --no-bundle is specified, then Bazaar doesn't send the contents of the\n"
3624
"revisions, but only a structured request to merge from the\n"
3625
"public_location. In that case the public_branch is needed and it must be\n"
3626
"up-to-date and accessible to the recipient. The public_branch is always\n"
3627
"included if known, so that people can check it later."
3628
msgstr ""
3629
3630
#: bzrlib/builtins.py:5762
3631
msgid ""
3632
"The submit branch defaults to the parent of the source branch, but can be\n"
3633
"overridden. Both submit branch and public branch will be remembered in\n"
3634
"branch.conf the first time they are used for a particular branch. The\n"
3635
"source branch defaults to that containing the working directory, but can\n"
3636
"be changed using --from."
3637
msgstr ""
3638
3639
#: bzrlib/builtins.py:5768
3640
msgid ""
3641
"Both the submit branch and the public branch follow the usual behavior with\n"
3642
"respect to --remember: If there is no default location set, the first send\n"
3643
"will set it (use --no-remember to avoid setting it). After that, you can\n"
3644
"omit the location to use the default. To change the default, use\n"
3645
"--remember. The value will only be saved if the location can be accessed."
3646
msgstr ""
3647
3648
#: bzrlib/builtins.py:5774
3649
msgid ""
3650
"In order to calculate those changes, bzr must analyse the submit branch.\n"
3651
"Therefore it is most efficient for the submit branch to be a local mirror.\n"
3652
"If a public location is known for the submit_branch, that location is used\n"
3653
"in the merge directive."
3654
msgstr ""
3655
3656
#: bzrlib/builtins.py:5779
3657
msgid ""
3658
"The default behaviour is to send the merge directive by mail, unless -o is\n"
3659
"given, in which case it is sent to a file."
3660
msgstr ""
3661
3662
#: bzrlib/builtins.py:5782
3663
msgid ""
3664
"Mail is sent using your preferred mail program. This should be transparent\n"
3665
"on Windows (it uses MAPI). On Unix, it requires the xdg-email utility.\n"
3666
"If the preferred client can't be found (or used), your editor will be used."
3667
msgstr ""
3668
3669
#: bzrlib/builtins.py:5786
3670
msgid ""
3671
"To use a specific mail program, set the mail_client configuration option.\n"
3672
"(For Thunderbird 1.5, this works around some bugs.) Supported values for\n"
3673
"specific clients are \"claws\", \"evolution\", \"kmail\", \"mail.app"
3674
"\" (MacOS X's\n"
3675
"Mail.app), \"mutt\", and \"thunderbird\"; generic options are \"default\",\n"
3676
"\"editor\", \"emacsclient\", \"mapi\", and \"xdg-email\". Plugins may also "
3677
"add\n"
3678
"supported clients."
3679
msgstr ""
3680
3681
#: bzrlib/builtins.py:5793
3682
msgid ""
3683
"If mail is being sent, a to address is required. This can be supplied\n"
3684
"either on the commandline, by setting the submit_to configuration\n"
3685
"option in the branch itself or the child_submit_to configuration option\n"
3686
"in the submit branch."
3687
msgstr ""
3688
3689
#: bzrlib/builtins.py:5798
3690
msgid ""
3691
"Two formats are currently supported: \"4\" uses revision bundle format 4 "
3692
"and\n"
3693
"merge directive format 2. It is significantly faster and smaller than\n"
3694
"older formats. It is compatible with Bazaar 0.19 and later. It is the\n"
3695
"default. \"0.9\" uses revision bundle format 0.9 and merge directive\n"
3696
"format 1. It is compatible with Bazaar 0.12 - 0.18."
3697
msgstr ""
3698
3699
#: bzrlib/builtins.py:5804
3700
msgid ""
3701
"The merge directives created by bzr send may be applied using bzr merge or\n"
3702
"bzr pull by specifying a file containing a merge directive as the location."
3703
msgstr ""
3704
3705
#: bzrlib/builtins.py:5807
3706
msgid ""
3707
"bzr send makes extensive use of public locations to map local locations "
3708
"into\n"
3709
"URLs that can be used by other people. See `bzr help configuration` to\n"
3710
"set them, and use `bzr info` to display them."
3711
msgstr ""
3712
3713
# help of 'output' option of 'send' command
3714
#: bzrlib/builtins.py:5831
3715
msgid "Write merge directive to this file or directory; use - for stdout."
3716
msgstr ""
3717
3718
# help of 'strict' option of 'send' command
3719
#: bzrlib/builtins.py:5835
3720
msgid ""
3721
"Refuse to send if there are uncommitted changes in the working tree, --no-"
3722
"strict disables the check."
3723
msgstr ""
3724
3725
# help of 'mail-to' option of 'send' command
3726
#: bzrlib/builtins.py:5837
3727
msgid "Mail the request to this address."
3728
msgstr ""
3729
3730
# help of 'body' option of 'send' command
3731
#: bzrlib/builtins.py:5841
3732
msgid "Body for the email."
3733
msgstr ""
3734
3735
# help of 'no-bundle' option of 'send' command
3736
#: bzrlib/builtins.py:5894
3737
msgid "Do not include a bundle in the merge directive."
3738
msgstr ""
3739
3740
# help of 'no-patch' option of 'send' command
3741
#: bzrlib/builtins.py:5895
3742
msgid "Do not include a preview patch in the merge directive."
3743
msgstr ""
3744
3745
# help of 'remember' option of 'send' command
3746
#: bzrlib/builtins.py:5898
3747
msgid "Remember submit and public branch."
3748
msgstr ""
3749
3750
# help of 'from' option of 'send' command
3751
#: bzrlib/builtins.py:5900
3752
msgid ""
3753
"Branch to generate the submission from, rather than the one containing the "
3754
"working directory."
3755
msgstr ""
3756
3757
# title of 'format' option of 'send' command
3758
# title of 'format' option of 'version-info' command
3759
#: bzrlib/builtins.py:5910 bzrlib/cmd_version_info.py:76
3760
msgid "format"
3761
msgstr ""
3762
3763
# help of 'format' option of 'send' command
3764
#: bzrlib/builtins.py:5911
3765
msgid "Use the specified output format."
3766
msgstr ""
3767
3768
#: bzrlib/builtins.py:5933
3769
msgid "Create, remove or modify a tag naming a revision."
3770
msgstr ""
3771
3772
#: bzrlib/builtins.py:5935
3773
msgid ""
3774
"Tags give human-meaningful names to revisions. Commands that take a -r\n"
3775
"(--revision) option can be given -rtag:X, where X is any previously\n"
3776
"created tag."
3777
msgstr ""
3778
3779
#: bzrlib/builtins.py:5939
3780
msgid ""
3781
"Tags are stored in the branch. Tags are copied from one branch to another\n"
3782
"along when you branch, push, pull or merge."
3783
msgstr ""
3784
3785
#: bzrlib/builtins.py:5942
3786
msgid ""
3787
"It is an error to give a tag name that already exists unless you pass\n"
3788
"--force, in which case the tag is moved to point to the new revision."
3789
msgstr ""
3790
3791
#: bzrlib/builtins.py:5945
3792
msgid ""
3793
"To rename a tag (change the name but keep it on the same revsion), run "
3794
"``bzr\n"
3795
"tag new-name -r tag:old-name`` and then ``bzr tag --delete oldname``."
3796
msgstr ""
3797
3798
#: bzrlib/builtins.py:5948
3799
msgid ""
3800
"If no tag name is specified it will be determined through the \n"
3801
"'automatic_tag_name' hook. This can e.g. be used to automatically tag\n"
3802
"upstream releases by reading configure.ac. See ``bzr help hooks`` for\n"
3803
"details."
3804
msgstr ""
3805
3806
# help of 'delete' option of 'tag' command
3807
#: bzrlib/builtins.py:5958
3808
msgid "Delete this tag rather than placing it."
3809
msgstr ""
3810
3811
# help of 'directory' option of 'tag' command
3812
#: bzrlib/builtins.py:5961
3813
msgid "Branch in which to place the tag."
3814
msgstr ""
3815
3816
# help of 'force' option of 'tag' command
3817
#: bzrlib/builtins.py:5963
3818
msgid "Replace existing tags."
3819
msgstr ""
3820
3821
#: bzrlib/builtins.py:5978
3822
msgid "No tag specified to delete."
3823
msgstr ""
3824
3825
#: bzrlib/builtins.py:5980
3826
#, python-format
3827
msgid "Deleted tag %s."
3828
msgstr ""
3829
3830
#: bzrlib/builtins.py:5985
3831
msgid "Tags can only be placed on a single revision, not on a range"
3832
msgstr ""
3833
3834
#: bzrlib/builtins.py:5994
3835
msgid "Please specify a tag name."
3836
msgstr ""
3837
3838
#: bzrlib/builtins.py:6002
3839
#, python-format
3840
msgid "Tag %s already exists for that revision."
3841
msgstr ""
3842
3843
#: bzrlib/builtins.py:6006
3844
#, python-format
3845
msgid "Created tag %s."
3846
msgstr ""
3847
3848
#: bzrlib/builtins.py:6008
3849
#, python-format
3850
msgid "Updated tag %s."
3851
msgstr ""
3852
3853
#: bzrlib/builtins.py:6012
3854
msgid "List tags."
3855
msgstr ""
3856
3857
#: bzrlib/builtins.py:6014
3858
msgid ""
3859
"This command shows a table of tag names and the revisions they reference."
3860
msgstr ""
3861
3862
# help of 'directory' option of 'tags' command
3863
#: bzrlib/builtins.py:6020
3864
msgid "Branch whose tags should be displayed."
3865
msgstr ""
3866
3867
# help of 'sort' option of 'tags' command
3868
#: bzrlib/builtins.py:6022
3869
msgid "Sort tags by different criteria."
3870
msgstr ""
3871
3872
# title of 'sort' option of 'tags' command
3873
#: bzrlib/builtins.py:6022
3874
msgid "Sorting"
3875
msgstr ""
3876
3877
#: bzrlib/builtins.py:6091
3878
msgid "Reconfigure the type of a bzr directory."
3879
msgstr ""
3880
3881
#: bzrlib/builtins.py:6093
3882
msgid "A target configuration must be specified."
3883
msgstr ""
3884
3885
#: bzrlib/builtins.py:6095
3886
msgid ""
3887
"For checkouts, the bind-to location will be auto-detected if not specified.\n"
3888
"The order of preference is\n"
3889
"1. For a lightweight checkout, the current bound location.\n"
3890
"2. For branches that used to be checkouts, the previously-bound location.\n"
3891
"3. The push location.\n"
3892
"4. The parent location.\n"
3893
"If none of these is available, --bind-to must be specified."
3894
msgstr ""
3895
3896
# title of 'tree_type' option of 'reconfigure' command
3897
#: bzrlib/builtins.py:6109
3898
msgid "Tree type"
3899
msgstr ""
3900
3901
# help of 'tree_type' option of 'reconfigure' command
3902
#: bzrlib/builtins.py:6110
3903
msgid "The relation between branch and tree."
3904
msgstr ""
3905
3906
# help of 'tree_type=branch' option of 'reconfigure' command
3907
#: bzrlib/builtins.py:6112
3908
msgid "Reconfigure to be an unbound branch with no working tree."
3909
msgstr ""
3910
3911
# help of 'tree_type=tree' option of 'reconfigure' command
3912
#: bzrlib/builtins.py:6113
3913
msgid "Reconfigure to be an unbound branch with a working tree."
3914
msgstr ""
3915
3916
# help of 'tree_type=checkout' option of 'reconfigure' command
3917
#: bzrlib/builtins.py:6114
3918
msgid "Reconfigure to be a bound branch with a working tree."
3919
msgstr ""
3920
3921
# help of 'tree_type=lightweight-checkout' option of 'reconfigure' command
3922
#: bzrlib/builtins.py:6115
3923
msgid "Reconfigure to be a lightweight checkout (with no local history)."
3924
msgstr ""
3925
3926
# title of 'repository_type' option of 'reconfigure' command
3927
#: bzrlib/builtins.py:6120
3928
msgid "Repository type"
3929
msgstr ""
3930
3931
# help of 'repository_type' option of 'reconfigure' command
3932
#: bzrlib/builtins.py:6121
3933
msgid "Location fo the repository."
3934
msgstr ""
3935
3936
# help of 'repository_type=standalone' option of 'reconfigure' command
3937
#: bzrlib/builtins.py:6123
3938
msgid ""
3939
"Reconfigure to be a standalone branch (i.e. stop using shared repository)."
3940
msgstr ""
3941
3942
# help of 'repository_type=use-shared' option of 'reconfigure' command
3943
#: bzrlib/builtins.py:6125
3944
msgid "Reconfigure to use a shared repository."
3945
msgstr ""
3946
3947
# title of 'repository_trees' option of 'reconfigure' command
3948
#: bzrlib/builtins.py:6129
3949
msgid "Trees in Repository"
3950
msgstr ""
3951
3952
# help of 'repository_trees' option of 'reconfigure' command
3953
#: bzrlib/builtins.py:6130
3954
msgid "Whether new branches in the repository have trees."
3955
msgstr ""
3956
3957
# help of 'repository_trees=with-trees' option of 'reconfigure' command
3958
#: bzrlib/builtins.py:6132
3959
msgid "Reconfigure repository to create working trees on branches by default."
3960
msgstr ""
3961
3962
# help of 'repository_trees=with-no-trees' option of 'reconfigure' command
3963
#: bzrlib/builtins.py:6134
3964
msgid ""
3965
"Reconfigure repository to not create working trees on branches by default."
3966
msgstr ""
3967
3968
# help of 'bind-to' option of 'reconfigure' command
3969
#: bzrlib/builtins.py:6137
3970
msgid "Branch to bind checkout to."
3971
msgstr ""
3972
3973
# help of 'force' option of 'reconfigure' command
3974
#: bzrlib/builtins.py:6139
3975
msgid "Perform reconfiguration even if local changes will be lost."
3976
msgstr ""
3977
3978
# help of 'stacked-on' option of 'reconfigure' command
3979
#: bzrlib/builtins.py:6142
3980
msgid "Reconfigure a branch to be stacked on another branch."
3981
msgstr ""
3982
3983
# help of 'unstacked' option of 'reconfigure' command
3984
#: bzrlib/builtins.py:6146
3985
msgid ""
3986
"Reconfigure a branch to be unstacked. This may require copying substantial "
3987
"data into it."
3988
msgstr ""
3989
3990
#: bzrlib/builtins.py:6156
3991
msgid "Can't use both --stacked-on and --unstacked"
3992
msgstr ""
3993
3994
#: bzrlib/builtins.py:6170
3995
msgid "No target configuration specified"
3996
msgstr ""
3997
3998
#: bzrlib/builtins.py:6205
3999
msgid "Set the branch of a checkout and update."
4000
msgstr ""
4001
4002
#: bzrlib/builtins.py:6207
4003
msgid ""
4004
"For lightweight checkouts, this changes the branch being referenced.\n"
4005
"For heavyweight checkouts, this checks that there are no local commits\n"
4006
"versus the current bound branch, then it makes the local branch a mirror\n"
4007
"of the new location and binds to it."
4008
msgstr ""
4009
4010
#: bzrlib/builtins.py:6212
4011
msgid ""
4012
"In both cases, the working tree is updated and uncommitted changes\n"
4013
"are merged. The user can commit or revert these as they desire."
4014
msgstr ""
4015
4016
#: bzrlib/builtins.py:6215
4017
msgid "Pending merges need to be committed or reverted before using switch."
4018
msgstr ""
4019
4020
#: bzrlib/builtins.py:6217
4021
msgid ""
4022
"The path to the branch to switch to can be specified relative to the parent\n"
4023
"directory of the current branch. For example, if you are currently in a\n"
4024
"checkout of /path/to/branch, specifying 'newbranch' will find a branch at\n"
4025
"/path/to/newbranch."
4026
msgstr ""
4027
4028
#: bzrlib/builtins.py:6222
4029
msgid ""
4030
"Bound branches use the nickname of its master branch unless it is set\n"
4031
"locally, in which case switching will update the local nickname to be\n"
4032
"that of the master."
4033
msgstr ""
4034
4035
# help of 'force' option of 'switch' command
4036
#: bzrlib/builtins.py:6230
4037
msgid "Switch even if local commits will be lost."
4038
msgstr ""
4039
4040
# help of 'create-branch' option of 'switch' command
4041
#: bzrlib/builtins.py:6233
4042
msgid "Create the target branch from this one before switching to it."
4043
msgstr ""
4044
4045
# help of 'store' option of 'switch' command
4046
#: bzrlib/builtins.py:6236
4047
msgid "Store and restore uncommitted changes in the branch."
4048
msgstr ""
4049
4050
#: bzrlib/builtins.py:6250
4051
msgid "You must supply either a revision or a location"
4052
msgstr ""
4053
4054
#: bzrlib/builtins.py:6263
4055
msgid "cannot create branch without source branch"
4056
msgstr ""
4057
4058
#: bzrlib/builtins.py:6289
4059
msgid "Manage filtered views."
4060
msgstr ""
4061
4062
#: bzrlib/builtins.py:6291
4063
msgid ""
4064
"Views provide a mask over the tree so that users can focus on\n"
4065
"a subset of a tree when doing their work. After creating a view,\n"
4066
"commands that support a list of files - status, diff, commit, etc -\n"
4067
"effectively have that list of files implicitly given each time.\n"
4068
"An explicit list of files can still be given but those files\n"
4069
"must be within the current view."
4070
msgstr ""
4071
4072
#: bzrlib/builtins.py:6298
4073
msgid ""
4074
"In most cases, a view has a short life-span: it is created to make\n"
4075
"a selected change and is deleted once that change is committed.\n"
4076
"At other times, you may wish to create one or more named views\n"
4077
"and switch between them."
4078
msgstr ""
4079
4080
#: bzrlib/builtins.py:6303
4081
msgid ""
4082
"To disable the current view without deleting it, you can switch to\n"
4083
"the pseudo view called ``off``. This can be useful when you need\n"
4084
"to see the whole tree for an operation or two (e.g. merge) but\n"
4085
"want to switch back to your view after that."
4086
msgstr ""
4087
4088
#: bzrlib/builtins.py:6308
4089
msgid ""
4090
":Examples:\n"
4091
" To define the current view::"
4092
msgstr ""
4093
4094
#: bzrlib/builtins.py:6311
4095
msgid " bzr view file1 dir1 ..."
4096
msgstr ""
4097
4098
#: bzrlib/builtins.py:6313
4099
msgid " To list the current view::"
4100
msgstr ""
4101
4102
#: bzrlib/builtins.py:6315
4103
msgid " bzr view"
4104
msgstr ""
4105
4106
#: bzrlib/builtins.py:6317
4107
msgid " To delete the current view::"
4108
msgstr ""
4109
4110
#: bzrlib/builtins.py:6319
4111
msgid " bzr view --delete"
4112
msgstr ""
4113
4114
#: bzrlib/builtins.py:6321
4115
msgid " To disable the current view without deleting it::"
4116
msgstr ""
4117
4118
#: bzrlib/builtins.py:6323
4119
msgid " bzr view --switch off"
4120
msgstr ""
4121
4122
#: bzrlib/builtins.py:6325
4123
msgid " To define a named view and switch to it::"
4124
msgstr ""
4125
4126
#: bzrlib/builtins.py:6327
4127
msgid " bzr view --name view-name file1 dir1 ..."
4128
msgstr ""
4129
4130
#: bzrlib/builtins.py:6329
4131
msgid " To list a named view::"
4132
msgstr ""
4133
4134
#: bzrlib/builtins.py:6331
4135
msgid " bzr view --name view-name"
4136
msgstr ""
4137
4138
#: bzrlib/builtins.py:6333
4139
msgid " To delete a named view::"
4140
msgstr ""
4141
4142
#: bzrlib/builtins.py:6335
4143
msgid " bzr view --name view-name --delete"
4144
msgstr ""
4145
4146
#: bzrlib/builtins.py:6337
4147
msgid " To switch to a named view::"
4148
msgstr ""
4149
4150
#: bzrlib/builtins.py:6339
4151
msgid " bzr view --switch view-name"
4152
msgstr ""
4153
4154
#: bzrlib/builtins.py:6341
4155
msgid " To list all views defined::"
4156
msgstr ""
4157
4158
#: bzrlib/builtins.py:6343
4159
msgid " bzr view --all"
4160
msgstr ""
4161
4162
#: bzrlib/builtins.py:6345
4163
msgid " To delete all views::"
4164
msgstr ""
4165
4166
#: bzrlib/builtins.py:6347
4167
msgid " bzr view --delete --all"
4168
msgstr ""
4169
4170
# help of 'all' option of 'view' command
4171
#: bzrlib/builtins.py:6354
4172
msgid "Apply list or delete action to all views."
4173
msgstr ""
4174
4175
# help of 'delete' option of 'view' command
4176
#: bzrlib/builtins.py:6357
4177
msgid "Delete the view."
4178
msgstr ""
4179
4180
# help of 'name' option of 'view' command
4181
#: bzrlib/builtins.py:6360
4182
msgid "Name of the view to define, list or delete."
4183
msgstr ""
4184
4185
# help of 'switch' option of 'view' command
4186
#: bzrlib/builtins.py:6364
4187
msgid "Name of the view to switch to."
4188
msgstr ""
4189
4190
#: bzrlib/builtins.py:6383
4191
msgid "Both --delete and a file list specified"
4192
msgstr ""
4193
4194
#: bzrlib/builtins.py:6386
4195
msgid "Both --delete and --switch specified"
4196
msgstr ""
4197
4198
#: bzrlib/builtins.py:6389
4199
msgid "Deleted all views.\n"
4200
msgstr ""
4201
4202
#: bzrlib/builtins.py:6391
4203
msgid "No current view to delete"
4204
msgstr ""
4205
4206
#: bzrlib/builtins.py:6394
4207
#, python-format
4208
msgid "Deleted '%s' view.\n"
4209
msgstr ""
4210
4211
#: bzrlib/builtins.py:6398
4212
msgid "Both --switch and a file list specified"
4213
msgstr ""
4214
4215
#: bzrlib/builtins.py:6401
4216
msgid "Both --switch and --all specified"
4217
msgstr ""
4218
4219
#: bzrlib/builtins.py:6404
4220
msgid "No current view to disable"
4221
msgstr ""
4222
4223
#: bzrlib/builtins.py:6406
4224
#, python-format
4225
msgid "Disabled '%s' view.\n"
4226
msgstr ""
4227
4228
#: bzrlib/builtins.py:6410 bzrlib/builtins.py:6432
4229
msgid "Using '{0}' view: {1}\n"
4230
msgstr ""
4231
4232
#: bzrlib/builtins.py:6413
4233
msgid "Views defined:\n"
4234
msgstr ""
4235
4236
#: bzrlib/builtins.py:6422
4237
msgid "No views defined.\n"
4238
msgstr ""
4239
4240
#: bzrlib/builtins.py:6429
4241
msgid "Cannot change the 'off' pseudo view"
4242
msgstr ""
4243
4244
#: bzrlib/builtins.py:6437
4245
msgid "No current view.\n"
4246
msgstr ""
4247
4248
#: bzrlib/builtins.py:6440
4249
msgid "'{0}' view is: {1}\n"
4250
msgstr ""
4251
4252
#: bzrlib/builtins.py:6460
4253
msgid " <no hooks installed>\n"
4254
msgstr ""
4255
4256
#: bzrlib/builtins.py:6464
4257
msgid "Remove a branch."
4258
msgstr ""
4259
4260
#: bzrlib/builtins.py:6466
4261
msgid ""
4262
"This will remove the branch from the specified location but \n"
4263
"will keep any working tree or repository in place."
4264
msgstr ""
4265
4266
#: bzrlib/builtins.py:6471
4267
msgid " Remove the branch at repo/trunk::"
4268
msgstr ""
4269
4270
#: bzrlib/builtins.py:6473
4271
msgid " bzr remove-branch repo/trunk"
4272
msgstr ""
4273
4274
# help of 'force' option of 'remove-branch' command
4275
#: bzrlib/builtins.py:6480
4276
msgid "Remove branch even if it is the active branch."
4277
msgstr ""
4278
4279
#: bzrlib/builtins.py:6494
4280
msgid "Branch is active. Use --force to remove it."
4281
msgstr ""
4282
4283
# help of 'writer=plain' option of 'shelve' command
4284
#: bzrlib/builtins.py:6498
4285
msgid "Plaintext diff output."
4286
msgstr ""
4287
4288
#: bzrlib/builtins.py:6499
4289
msgid "Temporarily set aside some changes from the current tree."
4290
msgstr ""
4291
4292
#: bzrlib/builtins.py:6501
4293
msgid ""
4294
"Shelve allows you to temporarily put changes you've made \"on the shelf\",\n"
4295
"ie. out of the way, until a later time when you can bring them back from\n"
4296
"the shelf with the 'unshelve' command. The changes are stored alongside\n"
4297
"your working tree, and so they aren't propagated along with your branch nor\n"
4298
"will they survive its deletion."
4299
msgstr ""
4300
4301
#: bzrlib/builtins.py:6507
4302
msgid "If shelve --list is specified, previously-shelved changes are listed."
4303
msgstr ""
4304
4305
#: bzrlib/builtins.py:6509
4306
msgid ""
4307
"Shelve is intended to help separate several sets of changes that have\n"
4308
"been inappropriately mingled. If you just want to get rid of all changes\n"
4309
"and you don't need to restore them later, use revert. If you want to\n"
4310
"shelve all text changes at once, use shelve --all."
4311
msgstr ""
4312
4313
#: bzrlib/builtins.py:6514
4314
msgid ""
4315
"If filenames are specified, only the changes to those files will be\n"
4316
"shelved. Other files will be left untouched."
4317
msgstr ""
4318
4319
#: bzrlib/builtins.py:6517
4320
msgid ""
4321
"If a revision is specified, changes since that revision will be shelved."
4322
msgstr ""
4323
4324
#: bzrlib/builtins.py:6519
4325
msgid ""
4326
"You can put multiple items on the shelf, and by default, 'unshelve' will\n"
4327
"restore the most recently shelved changes."
4328
msgstr ""
4329
4330
#: bzrlib/builtins.py:6522
4331
msgid ""
4332
"For complicated changes, it is possible to edit the changes in a separate\n"
4333
"editor program to decide what the file remaining in the working copy\n"
4334
"should look like. To do this, add the configuration option"
4335
msgstr ""
4336
4337
#: bzrlib/builtins.py:6526
4338
msgid " change_editor = PROGRAM @new_path @old_path"
4339
msgstr ""
4340
4341
#: bzrlib/builtins.py:6528
4342
msgid ""
4343
"where @new_path is replaced with the path of the new version of the \n"
4344
"file and @old_path is replaced with the path of the old version of \n"
4345
"the file. The PROGRAM should save the new file with the desired \n"
4346
"contents of the file in the working tree.\n"
4347
" "
4348
msgstr ""
4349
4350
# help of 'all' option of 'shelve' command
4351
#: bzrlib/builtins.py:6540
4352
msgid "Shelve all changes."
4353
msgstr ""
4354
4355
# help of 'writer' option of 'shelve' command
4356
#: bzrlib/builtins.py:6542
4357
msgid "Method to use for writing diffs."
4358
msgstr ""
4359
4360
# title of 'writer' option of 'shelve' command
4361
#: bzrlib/builtins.py:6542
4362
msgid "writer"
4363
msgstr ""
4364
4365
# help of 'list' option of 'shelve' command
4366
#: bzrlib/builtins.py:6546
4367
msgid "List shelved changes."
4368
msgstr ""
4369
4370
# help of 'destroy' option of 'shelve' command
4371
#: bzrlib/builtins.py:6548
4372
msgid "Destroy removed changes instead of shelving them."
4373
msgstr ""
4374
4375
#: bzrlib/builtins.py:6577
4376
msgid "No shelved changes."
4377
msgstr ""
4378
4379
#: bzrlib/builtins.py:6588
4380
msgid "Restore shelved changes."
4381
msgstr ""
4382
4383
#: bzrlib/builtins.py:6590
4384
msgid ""
4385
"By default, the most recently shelved changes are restored. However if you\n"
4386
"specify a shelf by id those changes will be restored instead. This works\n"
4387
"best when the changes don't depend on each other."
4388
msgstr ""
4389
4390
# help of 'action' option of 'unshelve' command
4391
#: bzrlib/builtins.py:6599
4392
msgid "The action to perform."
4393
msgstr ""
4394
4395
# title of 'action' option of 'resolve' command
4396
# title of 'action' option of 'unshelve' command
4397
#: bzrlib/builtins.py:6599 bzrlib/conflicts.py:694
4398
msgid "action"
4399
msgstr ""
4400
4401
# help of 'action=apply' option of 'unshelve' command
4402
#: bzrlib/builtins.py:6601
4403
msgid "Apply changes and remove from the shelf."
4404
msgstr ""
4405
4406
# help of 'action=dry-run' option of 'unshelve' command
4407
#: bzrlib/builtins.py:6602
4408
msgid "Show changes, but do not apply or remove them."
4409
msgstr ""
4410
4411
# help of 'action=preview' option of 'unshelve' command
4412
#: bzrlib/builtins.py:6603
4413
msgid ""
4414
"Instead of unshelving the changes, show the diff that would result from "
4415
"unshelving."
4416
msgstr ""
4417
4418
# help of 'action=delete-only' option of 'unshelve' command
4419
#: bzrlib/builtins.py:6605
4420
msgid "Delete changes without applying them."
4421
msgstr ""
4422
4423
# help of 'action=keep' option of 'unshelve' command
4424
#: bzrlib/builtins.py:6606
4425
msgid "Apply changes but don't delete them."
4426
msgstr ""
4427
4428
#: bzrlib/builtins.py:6621
4429
msgid "Remove unwanted files from working tree."
4430
msgstr ""
4431
4432
#: bzrlib/builtins.py:6623
4433
msgid ""
4434
"By default, only unknown files, not ignored files, are deleted. Versioned\n"
4435
"files are never deleted."
4436
msgstr ""
4437
4438
#: bzrlib/builtins.py:6626
4439
msgid ""
4440
"Another class is 'detritus', which includes files emitted by bzr during\n"
4441
"normal operations and selftests. (The value of these files decreases with\n"
4442
"time.)"
4443
msgstr ""
4444
4445
#: bzrlib/builtins.py:6630
4446
msgid ""
4447
"If no options are specified, unknown files are deleted. Otherwise, option\n"
4448
"flags are respected, and may be combined."
4449
msgstr ""
4450
4451
#: bzrlib/builtins.py:6633
4452
msgid "To check what clean-tree will do, use --dry-run."
4453
msgstr ""
4454
4455
# help of 'ignored' option of 'clean-tree' command
4456
#: bzrlib/builtins.py:6636
4457
msgid "Delete all ignored files."
4458
msgstr ""
4459
4460
# help of 'detritus' option of 'clean-tree' command
4461
#: bzrlib/builtins.py:6637
4462
msgid ""
4463
"Delete conflict files, merge and revert backups, and failed selftest dirs."
4464
msgstr ""
4465
4466
# help of 'unknown' option of 'clean-tree' command
4467
#: bzrlib/builtins.py:6640
4468
msgid "Delete files unknown to bzr (default)."
4469
msgstr ""
4470
4471
# help of 'dry-run' option of 'clean-tree' command
4472
#: bzrlib/builtins.py:6641
4473
msgid "Show files to delete instead of deleting them."
4474
msgstr ""
4475
4476
# help of 'force' option of 'clean-tree' command
4477
#: bzrlib/builtins.py:6643
4478
msgid "Do not prompt before deleting."
4479
msgstr ""
4480
4481
#: bzrlib/bundle/__init__.py:59
4482
msgid "A directory cannot be a bundle"
4483
msgstr ""
4484
4485
#: bzrlib/bundle/apply_bundle.py:40
4486
msgid "Install revisions"
4487
msgstr ""
4488
4489
#: bzrlib/bundle/commands.py:64
4490
msgid "--verbose requires a merge directive"
4491
msgstr ""
4492
4493
#: bzrlib/bundle/commands.py:67
4494
msgid "Bundle format not supported"
4495
msgstr ""
4496
4497
#: bzrlib/bundle/commands.py:77
4498
msgid "Records\n"
4499
msgstr ""
4500
4501
#: bzrlib/bundle/commands.py:81
4502
msgid "{0}: {1} ({2} multiparent)\n"
4503
msgstr ""
4504
4505
#: bzrlib/bundle/commands.py:83
4506
#, python-format
4507
msgid "unique files: %d\n"
4508
msgstr ""
4509
4510
#: bzrlib/bundle/commands.py:92
4511
msgid "Revisions\n"
4512
msgstr ""
4513
4514
#: bzrlib/bundle/commands.py:93
4515
#, python-format
4516
msgid "nicks: %s\n"
4517
msgstr ""
4518
4519
#: bzrlib/bundle/commands.py:95
4520
#, python-format
4521
msgid ""
4522
"committers: \n"
4523
"%s\n"
4524
msgstr ""
4525
4526
#: bzrlib/bundle/commands.py:103
4527
msgid "Decoded contents\n"
4528
msgstr ""
4529
4530
#: bzrlib/bundle/serializer/v4.py:327
4531
#, python-format
4532
msgid "Bundling %d revision."
4533
msgid_plural "Bundling %d revisions."
4534
msgstr[0] ""
4535
msgstr[1] ""
4536
4537
#: bzrlib/bzrdir.py:487
4538
msgid ""
4539
"making backup of {0}\n"
4540
" to {1}"
4541
msgstr ""
4542
4543
#: bzrlib/bzrdir.py:510
4544
msgid "renamed {0} to {1}"
4545
msgstr ""
4546
4547
#: bzrlib/bzrdir.py:1639
4548
#, python-format
4549
msgid ""
4550
"Source repository format does not support stacking, using format:\n"
4551
" %s"
4552
msgstr ""
4553
4554
#: bzrlib/bzrdir.py:1659
4555
#, python-format
4556
msgid ""
4557
"Source branch format does not support stacking, using format:\n"
4558
" %s"
4559
msgstr ""
4560
4561
#: bzrlib/bzrdir.py:1805
4562
msgid "starting repository conversion"
4563
msgstr ""
4564
4565
#: bzrlib/bzrdir.py:2026
4566
msgid "Using default stacking branch {0} at {1}"
4567
msgstr ""
4568
4569
#: bzrlib/check.py:108
4570
msgid "check"
4571
msgstr ""
4572
4573
#: bzrlib/check.py:110
4574
msgid "checking revisions"
4575
msgstr ""
4576
4577
#: bzrlib/check.py:112
4578
msgid "checking commit contents"
4579
msgstr ""
4580
4581
#: bzrlib/check.py:114
4582
msgid "checking file graphs"
4583
msgstr ""
4584
4585
#: bzrlib/check.py:118
4586
msgid "checking branches and trees"
4587
msgstr ""
4588
4589
#: bzrlib/check.py:205
4590
msgid "checked repository {0} format {1}"
4591
msgstr ""
4592
4593
#: bzrlib/check.py:208
4594
#, python-format
4595
msgid "%6d revisions"
4596
msgstr ""
4597
4598
#: bzrlib/check.py:209
4599
#, python-format
4600
msgid "%6d file-ids"
4601
msgstr ""
4602
4603
#: bzrlib/check.py:211
4604
#, python-format
4605
msgid "%6d unreferenced text versions"
4606
msgstr ""
4607
4608
#: bzrlib/check.py:215
4609
msgid "unreferenced version: {{{0}}} in {1}"
4610
msgstr ""
4611
4612
#: bzrlib/check.py:218
4613
#, python-format
4614
msgid "%6d revisions are missing inventory_sha1"
4615
msgstr ""
4616
4617
#: bzrlib/check.py:221
4618
#, python-format
4619
msgid "%6d revisions are mentioned but not present"
4620
msgstr ""
4621
4622
#: bzrlib/check.py:224
4623
#, python-format
4624
msgid "%6d ghost revisions"
4625
msgstr ""
4626
4627
#: bzrlib/check.py:229
4628
#, python-format
4629
msgid "%6d revisions missing parents in ancestry"
4630
msgstr ""
4631
4632
#: bzrlib/check.py:233
4633
#, python-format
4634
msgid " %s should be in the ancestry for:"
4635
msgstr ""
4636
4637
#: bzrlib/check.py:237
4638
#, python-format
4639
msgid "%6d inconsistent parents"
4640
msgstr ""
4641
4642
#: bzrlib/check.py:241
4643
msgid " * {0} version {1} has parents {2!r} but should have {3!r}"
4644
msgstr ""
4645
4646
#: bzrlib/check.py:247
4647
#, python-format
4648
msgid "%6d revisions have incorrect parents in the revision index"
4649
msgstr ""
4650
4651
#: bzrlib/check.py:253
4652
msgid " {0} has wrong parents in index: {1!r} should be {2!r}"
4653
msgstr ""
4654
4655
#: bzrlib/check.py:267
4656
msgid "Mismatched internal revid {{{0}}} and index revid {{{1}}}"
4657
msgstr ""
4658
4659
#: bzrlib/check.py:296
4660
msgid ""
4661
"Multiple expected sha1s for {0}. {{{1}}} expects {{{2}}}, {{{3}}} expects "
4662
"{{{4}}}"
4663
msgstr ""
4664
4665
#: bzrlib/check.py:354
4666
#, python-format
4667
msgid "Checking branch at '%s'."
4668
msgstr ""
4669
4670
#: bzrlib/check.py:374
4671
#, python-format
4672
msgid "Checking working tree at '%s'."
4673
msgstr ""
4674
4675
#: bzrlib/check.py:427 bzrlib/check.py:441
4676
msgid "No branch found at specified location."
4677
msgstr ""
4678
4679
#: bzrlib/check.py:429 bzrlib/check.py:439
4680
msgid "No working tree found at specified location."
4681
msgstr ""
4682
4683
#: bzrlib/check.py:432
4684
#, python-format
4685
msgid "Checking repository at '%s'."
4686
msgstr ""
4687
4688
#: bzrlib/check.py:443
4689
msgid "No repository found at specified location."
4690
msgstr ""
4691
4692
#: bzrlib/clean_tree.py:63
4693
msgid "Nothing to delete."
4694
msgstr ""
4695
4696
#: bzrlib/clean_tree.py:68
4697
msgid "Are you sure you wish to delete these"
4698
msgstr ""
4699
4700
#: bzrlib/clean_tree.py:70
4701
msgid "Canceled"
4702
msgstr ""
4703
4704
#: bzrlib/clean_tree.py:107
4705
#, python-format
4706
msgid "unable to remove %s"
4707
msgstr ""
4708
4709
#: bzrlib/clean_tree.py:111
4710
msgid "deleting paths:"
4711
msgstr ""
4712
4713
#: bzrlib/clean_tree.py:125
4714
msgid "unable to remove \"{0}\": {1}."
4715
msgstr ""
4716
4717
#: bzrlib/clean_tree.py:130
4718
msgid "No files deleted."
4719
msgstr ""
4720
4721
#: bzrlib/cmd_version_info.py:47
4722
msgid "No known version info format {0}. Supported types are: {1}"
4723
msgstr ""
4724
4725
# help of 'format=custom' option of 'version-info' command
4726
#: bzrlib/cmd_version_info.py:52
4727
msgid "Version info in Custom template-based format."
4728
msgstr ""
4729
4730
# help of 'format=python' option of 'version-info' command
4731
#: bzrlib/cmd_version_info.py:52
4732
msgid "Version info in Python format."
4733
msgstr ""
4734
4735
# help of 'format=rio' option of 'version-info' command
4736
#: bzrlib/cmd_version_info.py:52
4737
msgid "Version info in RIO (simple text) format (default)."
4738
msgstr ""
4739
4740
#: bzrlib/cmd_version_info.py:53
4741
msgid "Show version information about this tree."
4742
msgstr ""
4743
4744
#: bzrlib/cmd_version_info.py:55
4745
msgid ""
4746
"You can use this command to add information about version into\n"
4747
"source code of an application. The output can be in one of the\n"
4748
"supported formats or in a custom format based on a template."
4749
msgstr ""
4750
4751
#: bzrlib/cmd_version_info.py:59 en/help_topics/configuration.txt:712
4752
#: en/help_topics/configuration.txt:738
4753
msgid "For example::"
4754
msgstr ""
4755
4756
#: bzrlib/cmd_version_info.py:61
4757
msgid ""
4758
" bzr version-info --custom \\\n"
4759
" --template=\"#define VERSION_INFO \\\"Project 1.2.3 (r{revno})\\\"\\n\""
4760
msgstr ""
4761
4762
#: bzrlib/cmd_version_info.py:64
4763
msgid ""
4764
"will produce a C header file with formatted string containing the\n"
4765
"current revision number. Other supported variables in templates are:"
4766
msgstr ""
4767
4768
#: bzrlib/cmd_version_info.py:67
4769
msgid ""
4770
" * {date} - date of the last revision\n"
4771
" * {build_date} - current date\n"
4772
" * {revno} - revision number\n"
4773
" * {revision_id} - revision id\n"
4774
" * {branch_nick} - branch nickname\n"
4775
" * {clean} - 0 if the source tree contains uncommitted changes,\n"
4776
" otherwise 1"
4777
msgstr ""
4778
4779
# help of 'format' option of 'version-info' command
4780
#: bzrlib/cmd_version_info.py:77
4781
msgid "Select the output format."
4782
msgstr ""
4783
4784
# help of 'all' option of 'version-info' command
4785
#: bzrlib/cmd_version_info.py:81
4786
msgid "Include all possible information."
4787
msgstr ""
4788
4789
# help of 'check-clean' option of 'version-info' command
4790
#: bzrlib/cmd_version_info.py:82
4791
msgid "Check if tree is clean."
4792
msgstr ""
4793
4794
# help of 'include-history' option of 'version-info' command
4795
#: bzrlib/cmd_version_info.py:84
4796
msgid "Include the revision-history."
4797
msgstr ""
4798
4799
# help of 'include-file-revisions' option of 'version-info' command
4800
#: bzrlib/cmd_version_info.py:86
4801
msgid "Include the last revision for each file."
4802
msgstr ""
4803
4804
# help of 'template' option of 'version-info' command
4805
#: bzrlib/cmd_version_info.py:87
4806
msgid "Template for the output."
4807
msgstr ""
4808
4809
#: bzrlib/cmd_version_info.py:101
4810
msgid "bzr version-info --revision takes exactly one revision specifier"
4811
msgstr ""
4812
4813
#: bzrlib/commands.py:229
4814
#, python-format
4815
msgid "unknown command \"%s\""
4816
msgstr ""
4817
4818
#: bzrlib/commands.py:476
4819
msgid "No help for this command."
4820
msgstr ""
4821
4822
#: bzrlib/commands.py:489
4823
#, python-format
4824
msgid ":Purpose: %s\n"
4825
msgstr ""
4826
4827
#: bzrlib/commands.py:491
4828
#, python-format
4829
msgid ""
4830
":Usage:\n"
4831
"%s\n"
4832
msgstr ""
4833
4834
#: bzrlib/commands.py:493
4835
#, python-format
4836
msgid ":Usage: %s\n"
4837
msgstr ""
4838
4839
#: bzrlib/commands.py:512
4840
#, python-format
4841
msgid ":Options:%s"
4842
msgstr ""
4843
4844
#: bzrlib/commands.py:523
4845
#, python-format
4846
msgid ""
4847
":Description:\n"
4848
" %s\n"
4849
"\n"
4850
msgstr ""
4851
4852
#: bzrlib/commands.py:533
4853
#, python-format
4854
msgid ""
4855
"See bzr help %s for more details and examples.\n"
4856
"\n"
4857
msgstr ""
4858
4859
#: bzrlib/commands.py:538
4860
msgid ":Aliases: "
4861
msgstr ""
4862
4863
#: bzrlib/commands.py:542
4864
#, python-format
4865
msgid ":From: plugin \"%s\"\n"
4866
msgstr ""
4867
4868
#: bzrlib/commands.py:554
4869
msgid ":doc:`{0} <{1}-help>`"
4870
msgstr ""
4871
4872
#: bzrlib/commands.py:558
4873
#, python-format
4874
msgid ":See also: %s"
4875
msgstr ""
4876
4877
#: bzrlib/commands.py:826 bzrlib/gpg.py:347
4878
msgid "Only ASCII permitted in option names"
4879
msgstr ""
4880
4881
#: bzrlib/commands.py:851 bzrlib/commands.py:859
4882
msgid "command {0!r} needs one or more {1}"
4883
msgstr ""
4884
4885
#: bzrlib/commands.py:868
4886
msgid "command {0!r} requires argument {1}"
4887
msgstr ""
4888
4889
#: bzrlib/commands.py:875
4890
msgid "extra argument to command {0}: {1}"
4891
msgstr ""
4892
4893
#: bzrlib/commands.py:952
4894
#, python-format
4895
msgid "Profile data written to \"%s\"."
4896
msgstr ""
4897
4898
#: bzrlib/commit.py:117 bzrlib/commit.py:740
4899
msgid "added"
4900
msgstr ""
4901
4902
#: bzrlib/commit.py:117 bzrlib/commit.py:748
4903
msgid "modified"
4904
msgstr ""
4905
4906
#: bzrlib/commit.py:131
4907
#, python-format
4908
msgid "Committing%s"
4909
msgstr ""
4910
4911
#: bzrlib/commit.py:134
4912
#, python-format
4913
msgid "Committed revision %d."
4914
msgstr ""
4915
4916
#: bzrlib/commit.py:143
4917
#, python-format
4918
msgid "deleted %s"
4919
msgstr ""
4920
4921
#: bzrlib/commit.py:146
4922
#, python-format
4923
msgid "missing %s"
4924
msgstr ""
4925
4926
#: bzrlib/commit.py:511
4927
msgid ""
4928
"Conflicting tags in bound branch:\n"
4929
"{0}"
4930
msgstr ""
4931
4932
#: bzrlib/commit.py:742
4933
msgid "renamed"
4934
msgstr ""
4935
4936
#: bzrlib/commit.py:976
4937
msgid "unchanged"
4938
msgstr ""
4939
4940
#: bzrlib/commit.py:998
4941
msgid "{0} [{1}] - Stage"
4942
msgstr ""
4943
4944
#: bzrlib/commit.py:1001
4945
#, python-format
4946
msgid "%s - Stage"
4947
msgstr ""
4948
4949
#: bzrlib/commit_signature_commands.py:34
4950
msgid "Sign all commits by a given committer."
4951
msgstr ""
4952
4953
#: bzrlib/commit_signature_commands.py:36
4954
msgid ""
4955
"If location is not specified the local tree is used.\n"
4956
"If committer is not specified the default committer is used."
4957
msgstr ""
4958
4959
#: bzrlib/commit_signature_commands.py:39
4960
msgid "This does not sign commits that already have signatures."
4961
msgstr ""
4962
4963
# help of 'dry-run' option of 'sign-my-commits' command
4964
#: bzrlib/commit_signature_commands.py:47
4965
msgid ""
4966
"Don't actually sign anything, just print the revisions that would be signed."
4967
msgstr ""
4968
4969
#: bzrlib/commit_signature_commands.py:98
4970
#, python-format
4971
msgid "Signed %d revision.\n"
4972
msgid_plural "Signed %d revisions.\n"
4973
msgstr[0] ""
4974
msgstr[1] ""
4975
4976
#: bzrlib/commit_signature_commands.py:103
4977
msgid "Verify all commit signatures."
4978
msgstr ""
4979
4980
#: bzrlib/commit_signature_commands.py:105
4981
msgid "Verifies that all commits in the branch are signed by known GnuPG keys."
4982
msgstr ""
4983
4984
# help of 'acceptable-keys' option of 'verify-signatures' command
4985
#: bzrlib/commit_signature_commands.py:110
4986
msgid ""
4987
"Comma separated list of GPG key patterns which are acceptable for "
4988
"verification."
4989
msgstr ""
4990
4991
#: bzrlib/commit_signature_commands.py:148
4992
msgid "Cannot verify a range of non-revision-history revisions"
4993
msgstr ""
4994
4995
#: bzrlib/commit_signature_commands.py:166
4996
msgid "All commits signed with verifiable keys"
4997
msgstr ""
4998
4999
#: bzrlib/config.py:438
5000
msgid "Invalid config value for \"{0}\" value {1!r} is not an SI unit."
5001
msgstr ""
5002
5003
#: bzrlib/config.py:2468
5004
msgid "{0} is not an SI unit."
5005
msgstr ""
5006
5007
#: bzrlib/config.py:2989
5008
msgid ""
5009
"Option {0} in section {1} of {2} was changed from {3} to {4}. The {5} value "
5010
"will be saved."
5011
msgstr ""
5012
5013
#: bzrlib/config.py:3134
5014
#, python-format
5015
msgid "Invalid '%s', should be of the form 'name=value'"
5016
msgstr ""
5017
5018
#: bzrlib/config.py:4089
5019
msgid "Display, set or remove a configuration option."
5020
msgstr ""
5021
5022
#: bzrlib/config.py:4091
5023
msgid "Display the active value for option NAME."
5024
msgstr ""
5025
5026
#: bzrlib/config.py:4093
5027
msgid ""
5028
"If --all is specified, NAME is interpreted as a regular expression and all\n"
5029
"matching options are displayed mentioning their scope and without resolving\n"
5030
"option references in the value). The active value that bzr will take into\n"
5031
"account is the first one displayed for each option."
5032
msgstr ""
5033
5034
#: bzrlib/config.py:4098
5035
msgid ""
5036
"If NAME is not given, --all .* is implied (all options are displayed for "
5037
"the\n"
5038
"current scope)."
5039
msgstr ""
5040
5041
#: bzrlib/config.py:4101
5042
msgid ""
5043
"Setting a value is achieved by using NAME=value without spaces. The value\n"
5044
"is set in the most relevant scope and can be checked by displaying the\n"
5045
"option again."
5046
msgstr ""
5047
5048
#: bzrlib/config.py:4105
5049
msgid "Removing a value is achieved by using --remove NAME."
5050
msgstr ""
5051
5052
# help of 'scope' option of 'config' command
5053
#: bzrlib/config.py:4115
5054
msgid "Reduce the scope to the specified configuration file."
5055
msgstr ""
5056
5057
# help of 'all' option of 'config' command
5058
#: bzrlib/config.py:4119
5059
msgid "Display all the defined values for the matching options."
5060
msgstr ""
5061
5062
# help of 'remove' option of 'config' command
5063
#: bzrlib/config.py:4121
5064
msgid "Remove the option from the configuration file."
5065
msgstr ""
5066
5067
#: bzrlib/conflicts.py:50
5068
msgid "List files with conflicts."
5069
msgstr ""
5070
5071
#: bzrlib/conflicts.py:57
5072
msgid ""
5073
"Conflicts normally are listed as short, human-readable messages. If --text\n"
5074
"is supplied, the pathnames of files with text conflicts are listed,\n"
5075
"instead. (This is useful for editing all files with text conflicts.)"
5076
msgstr ""
5077
5078
#: bzrlib/conflicts.py:61
5079
msgid "Use bzr resolve when you have fixed a problem."
5080
msgstr ""
5081
5082
# help of 'text' option of 'conflicts' command
5083
#: bzrlib/conflicts.py:66
5084
msgid "List paths of files with text conflicts."
5085
msgstr ""
5086
5087
# help of 'action=done' option of 'resolve' command
5088
#: bzrlib/conflicts.py:85
5089
msgid "Marks the conflict as resolved."
5090
msgstr ""
5091
5092
# help of 'action=take-this' option of 'resolve' command
5093
#: bzrlib/conflicts.py:88
5094
msgid "Resolve the conflict preserving the version in the working tree."
5095
msgstr ""
5096
5097
# help of 'action=take-other' option of 'resolve' command
5098
#: bzrlib/conflicts.py:91
5099
msgid "Resolve the conflict taking the merged version into account."
5100
msgstr ""
5101
5102
# help of 'action' option of 'resolve' command
5103
#: bzrlib/conflicts.py:98
5104
msgid "How to resolve the conflict."
5105
msgstr ""
5106
5107
#: bzrlib/conflicts.py:104
5108
msgid "Mark a conflict as resolved."
5109
msgstr ""
5110
5111
#: bzrlib/conflicts.py:111
5112
msgid ""
5113
"Once you have fixed a problem, use \"bzr resolve\" to automatically mark\n"
5114
"text conflicts as fixed, \"bzr resolve FILE\" to mark a specific conflict "
5115
"as\n"
5116
"resolved, or \"bzr resolve --all\" to mark all conflicts as resolved."
5117
msgstr ""
5118
5119
# help of 'all' option of 'resolve' command
5120
#: bzrlib/conflicts.py:119
5121
msgid "Resolve all conflicts in this tree."
5122
msgstr ""
5123
5124
#: bzrlib/conflicts.py:126
5125
msgid "If --all is specified, no FILE may be provided"
5126
msgstr ""
5127
5128
#: bzrlib/conflicts.py:151
5129
#, python-format
5130
msgid "%d conflict auto-resolved."
5131
msgid_plural "%d conflicts auto-resolved."
5132
msgstr[0] ""
5133
msgstr[1] ""
5134
5135
#: bzrlib/conflicts.py:154
5136
msgid "Remaining conflicts:"
5137
msgstr ""
5138
5139
#: bzrlib/conflicts.py:159
5140
msgid "All conflicts resolved."
5141
msgstr ""
5142
5143
#: bzrlib/conflicts.py:168
5144
msgid "{0} conflict resolved, {1} remaining"
5145
msgid_plural "{0} conflicts resolved, {1} remaining"
5146
msgstr[0] ""
5147
msgstr[1] ""
5148
5149
#: bzrlib/controldir.py:712
5150
msgid "{0} is{1} redirected to {2}"
5151
msgstr ""
5152
5153
#: bzrlib/diff.py:400
5154
#, python-format
5155
msgid "*** Ignoring files outside view. View is %s"
5156
msgstr ""
5157
5158
#: bzrlib/errors.py:157
5159
msgid "The tree builder is already building a tree."
5160
msgstr ""
5161
5162
#: bzrlib/errors.py:178
5163
msgid "The dirstate file (%(state)s) appears to be corrupt: %(msg)s"
5164
msgstr ""
5165
5166
#: bzrlib/errors.py:197
5167
msgid ""
5168
"The API for \"%(api)s\" is not compatible with \"%(wanted)s\". It supports "
5169
"versions \"%(minimum)s\" to \"%(current)s\"."
5170
msgstr ""
5171
5172
#: bzrlib/errors.py:209
5173
msgid "The transport '%(transport)s' is only accessible within this process."
5174
msgstr ""
5175
5176
#: bzrlib/errors.py:227
5177
msgid "Invalid revision number %(revno)s"
5178
msgstr ""
5179
5180
#: bzrlib/errors.py:236
5181
msgid "Invalid revision-id {%(revision_id)s} in %(branch)s"
5182
msgstr ""
5183
5184
#: bzrlib/errors.py:247
5185
msgid "Reserved revision-id {%(revision_id)s}"
5186
msgstr ""
5187
5188
#: bzrlib/errors.py:261
5189
msgid "There is no public branch set for \"%(branch_url)s\"."
5190
msgstr ""
5191
5192
#: bzrlib/errors.py:271
5193
msgid ""
5194
"No help could be found for '%(topic)s'. Please use 'bzr help topics' to "
5195
"obtain a list of topics."
5196
msgstr ""
5197
5198
#: bzrlib/errors.py:280
5199
msgid "The file id \"%(file_id)s\" is not present in the tree %(tree)s."
5200
msgstr ""
5201
5202
#: bzrlib/errors.py:290
5203
msgid ""
5204
"The file id \"%(file_id)s\" is not present in the repository %(repository)r"
5205
msgstr ""
5206
5207
#: bzrlib/errors.py:299
5208
msgid "The branch '%(branch)s' is not stacked."
5209
msgstr ""
5210
5211
#: bzrlib/errors.py:313
5212
msgid "No WorkingTree exists for \"%(base)s\"."
5213
msgstr ""
5214
5215
#: bzrlib/errors.py:322
5216
msgid "Not currently building a tree."
5217
msgstr ""
5218
5219
#: bzrlib/errors.py:327
5220
msgid "%(url)s is not a local path."
5221
msgstr ""
5222
5223
#: bzrlib/errors.py:355
5224
msgid "%(not_locked)r is not write locked but needs to be."
5225
msgstr ""
5226
5227
#: bzrlib/errors.py:363
5228
msgid "Error in command line options"
5229
msgstr ""
5230
5231
#: bzrlib/errors.py:368
5232
msgid "%(value)s is not an index of type %(_type)s."
5233
msgstr ""
5234
5235
#: bzrlib/errors.py:378
5236
msgid "Error in data for index %(value)s."
5237
msgstr ""
5238
5239
#: bzrlib/errors.py:387
5240
msgid "The key '%(key)s' is already in index '%(index)s'."
5241
msgstr ""
5242
5243
#: bzrlib/errors.py:397
5244
msgid "The key '%(key)s' is not a valid key."
5245
msgstr ""
5246
5247
#: bzrlib/errors.py:406
5248
msgid "Could not parse options for index %(value)s."
5249
msgstr ""
5250
5251
#: bzrlib/errors.py:415
5252
msgid "The value '%(value)s' is not a valid value."
5253
msgstr ""
5254
5255
#: bzrlib/errors.py:424
5256
msgid "Bad value \"%(value)s\" for option \"%(name)s\"."
5257
msgstr ""
5258
5259
#: bzrlib/errors.py:443
5260
msgid "Generic path error: %(path)r%(extra)s)"
5261
msgstr ""
5262
5263
#: bzrlib/errors.py:456
5264
msgid "No such file: %(path)r%(extra)s"
5265
msgstr ""
5266
5267
#: bzrlib/errors.py:461
5268
msgid "File exists: %(path)r%(extra)s"
5269
msgstr ""
5270
5271
#: bzrlib/errors.py:467
5272
msgid ""
5273
"Could not rename %(source)s => %(dest)s because both files exist. (Use --"
5274
"after to tell bzr about a rename that has already happened)%(extra)s"
5275
msgstr ""
5276
5277
#: bzrlib/errors.py:483
5278
msgid "\"%(path)s\" is not a directory %(extra)s"
5279
msgstr ""
5280
5281
#: bzrlib/errors.py:488
5282
msgid "\"%(path)s\" is not in the working directory %(extra)s"
5283
msgstr ""
5284
5285
#: bzrlib/errors.py:493
5286
msgid "Directory not empty: \"%(path)s\"%(extra)s"
5287
msgstr ""
5288
5289
#: bzrlib/errors.py:498
5290
msgid "Hard-linking \"%(path)s\" is not supported"
5291
msgstr ""
5292
5293
#: bzrlib/errors.py:513
5294
msgid "Device or resource busy: \"%(path)s\"%(extra)s"
5295
msgstr ""
5296
5297
#: bzrlib/errors.py:518
5298
msgid "Permission denied: \"%(path)s\"%(extra)s"
5299
msgstr ""
5300
5301
#: bzrlib/errors.py:523
5302
msgid "Invalid url supplied to transport: \"%(path)s\"%(extra)s"
5303
msgstr ""
5304
5305
#: bzrlib/errors.py:528
5306
msgid "Invalid URL join request: %(reason)s: %(base)r + %(join_args)r"
5307
msgstr ""
5308
5309
#: bzrlib/errors.py:539
5310
msgid "URLs differ by more than path: %(from_)r and %(to)r"
5311
msgstr ""
5312
5313
#: bzrlib/errors.py:561
5314
msgid "The %(type)s hook '%(hook)s' is unknown in this version of bzrlib."
5315
msgstr ""
5316
5317
#: bzrlib/errors.py:571
5318
msgid "Unsupported protocol for url \"%(path)s\"%(extra)s"
5319
msgstr ""
5320
5321
#: bzrlib/errors.py:579
5322
msgid ""
5323
"The branch '%(url)s'(%(format)s) is not a stackable format. You will need to "
5324
"upgrade the branch to permit branch stacking."
5325
msgstr ""
5326
5327
#: bzrlib/errors.py:590
5328
msgid "The branch '%(branch_url)s' cannot be stacked on '%(target_url)s'."
5329
msgstr ""
5330
5331
#: bzrlib/errors.py:600
5332
msgid ""
5333
"The repository '%(url)s'(%(format)s) is not a stackable format. You will "
5334
"need to upgrade the repository to permit branch stacking."
5335
msgstr ""
5336
5337
#: bzrlib/errors.py:611
5338
msgid "Error reading from %(path)r."
5339
msgstr ""
5340
5341
#: bzrlib/errors.py:630
5342
msgid "Path \"%(path)s\" is not a child of path \"%(base)s\"%(extra)s"
5343
msgstr ""
5344
5345
#: bzrlib/errors.py:646
5346
msgid "Path \"%(path)s\" is not unicode normalized"
5347
msgstr ""
5348
5349
#: bzrlib/errors.py:654
5350
msgid "Not a branch: \"%(path)s\"%(detail)s."
5351
msgstr ""
5352
5353
#: bzrlib/errors.py:696
5354
msgid "No submit branch available for branch \"%(path)s\""
5355
msgstr ""
5356
5357
#: bzrlib/errors.py:705
5358
msgid "A control directory already exists: \"%(path)s\"."
5359
msgstr ""
5360
5361
#: bzrlib/errors.py:710
5362
msgid "Already a branch: \"%(path)s\"."
5363
msgstr ""
5364
5365
#: bzrlib/errors.py:715
5366
msgid "Invalid branch name: %(name)s"
5367
msgstr ""
5368
5369
#: bzrlib/errors.py:724
5370
msgid "Parent branch already exists: \"%(path)s\"."
5371
msgstr ""
5372
5373
#: bzrlib/errors.py:730
5374
msgid ""
5375
"Directory contains a branch, but no working tree (use bzr checkout if you "
5376
"wish to build a working tree): \"%(path)s\""
5377
msgstr ""
5378
5379
#: bzrlib/errors.py:735
5380
msgid ""
5381
"\"%(function)s\" called on an AtomicFile after it was closed: \"%(path)s\""
5382
msgstr ""
5383
5384
#: bzrlib/errors.py:745
5385
msgid ""
5386
"Parent not accessible given base \"%(base)s\" and relative path \"%(path)s\""
5387
msgstr ""
5388
5389
#: bzrlib/errors.py:755
5390
msgid "No repository present: \"%(path)s\""
5391
msgstr ""
5392
5393
#: bzrlib/errors.py:762
5394
msgid ""
5395
"Unsupported branch format: %(format)s\n"
5396
"Please run 'bzr upgrade'"
5397
msgstr ""
5398
5399
#: bzrlib/errors.py:768
5400
msgid "Unknown %(kind)s format: %(format)r"
5401
msgstr ""
5402
5403
#: bzrlib/errors.py:777
5404
msgid "Format %(format)s is not compatible with .bzr version %(bzrdir)s."
5405
msgstr ""
5406
5407
#: bzrlib/errors.py:787
5408
msgid "Parse error on line %(lineno)d of %(format)s format: %(line)s"
5409
msgstr ""
5410
5411
#: bzrlib/errors.py:802
5412
msgid ""
5413
"%(target)s\n"
5414
"is not compatible with\n"
5415
"%(source)s\n"
5416
"%(details)s"
5417
msgstr ""
5418
5419
#: bzrlib/errors.py:818
5420
msgid "Revision is not compatible with %(repo_format)s"
5421
msgstr ""
5422
5423
#: bzrlib/errors.py:828
5424
msgid "%(context_info)s%(path)s is already versioned."
5425
msgstr ""
5426
5427
#: bzrlib/errors.py:849
5428
msgid "%(context_info)s%(path)s is not versioned."
5429
msgstr ""
5430
5431
#: bzrlib/errors.py:870
5432
msgid "Path(s) are not versioned: %(paths_as_string)s"
5433
msgstr ""
5434
5435
#: bzrlib/errors.py:881
5436
msgid "Path(s) do not exist: %(paths_as_string)s%(extra)s"
5437
msgstr ""
5438
5439
#: bzrlib/errors.py:900
5440
msgid "Cannot operate on \"%(filename)s\" of unsupported kind \"%(kind)s\""
5441
msgstr ""
5442
5443
#: bzrlib/errors.py:908
5444
msgid ""
5445
"Filename %(filename)r is not valid in your current filesystem encoding "
5446
"%(fs_encoding)s"
5447
msgstr ""
5448
5449
#: bzrlib/errors.py:919
5450
msgid "Cannot operate on \"%(filename)s\" because it is a control file"
5451
msgstr ""
5452
5453
#: bzrlib/errors.py:937
5454
msgid "The lock for '%(lock_description)s' is in use and cannot be broken."
5455
msgstr ""
5456
5457
#: bzrlib/errors.py:976
5458
msgid "Cannot lock %(lock)s: %(why)s"
5459
msgstr ""
5460
5461
#: bzrlib/errors.py:986
5462
msgid ""
5463
"A transaction related operation was attempted after the transaction finished."
5464
msgstr ""
5465
5466
#: bzrlib/errors.py:1013
5467
msgid "Cannot lock: transport is read only: %(transport)s"
5468
msgstr ""
5469
5470
#: bzrlib/errors.py:1021
5471
msgid "Could not acquire lock \"%(lock)s\": %(msg)s"
5472
msgstr ""
5473
5474
#: bzrlib/errors.py:1032
5475
msgid "Lock was broken while still open: %(lock)s - check storage consistency!"
5476
msgstr ""
5477
5478
#: bzrlib/errors.py:1043
5479
msgid ""
5480
"Lock was released and re-acquired before being broken: %(lock)s: held by "
5481
"%(holder)r, wanted to break %(target)r"
5482
msgstr ""
5483
5484
#: bzrlib/errors.py:1055
5485
msgid ""
5486
"Lock is apparently held, but corrupted: %(corruption_info)s\n"
5487
"Use 'bzr break-lock' to clear it"
5488
msgstr ""
5489
5490
#: bzrlib/errors.py:1068
5491
msgid "Lock not held: %(lock)s"
5492
msgstr ""
5493
5494
#: bzrlib/errors.py:1097
5495
msgid "No changes to commit"
5496
msgstr ""
5497
5498
#: bzrlib/errors.py:1102
5499
msgid ""
5500
"Selected-file commit of merges is not supported yet: files %(files_str)s"
5501
msgstr ""
5502
5503
#: bzrlib/errors.py:1112
5504
msgid ""
5505
"Excluding paths during commit is not supported by repository at %(repository)"
5506
"r."
5507
msgstr ""
5508
5509
#: bzrlib/errors.py:1121
5510
msgid ""
5511
"The specified commit message contains characters unsupported by the current "
5512
"encoding."
5513
msgstr ""
5514
5515
#: bzrlib/errors.py:1127
5516
msgid "Upgrade URL cannot work with readonly URLs."
5517
msgstr ""
5518
5519
#: bzrlib/errors.py:1132
5520
msgid "The branch format %(format)s is already at the most recent format."
5521
msgstr ""
5522
5523
#: bzrlib/errors.py:1155
5524
msgid "Option --change does not accept revision ranges"
5525
msgstr ""
5526
5527
#: bzrlib/errors.py:1160
5528
msgid "No namespace registered for string: %(spec)r"
5529
msgstr ""
5530
5531
#: bzrlib/errors.py:1179
5532
msgid ""
5533
"Requested revision: '%(spec)s' does not exist in branch: %(branch_url)s"
5534
"%(extra)s"
5535
msgstr ""
5536
5537
#: bzrlib/errors.py:1193
5538
msgid ""
5539
"Operation denied because it would change the main history, which is not "
5540
"permitted by the append_revisions_only setting on branch \"%(location)s\"."
5541
msgstr ""
5542
5543
#: bzrlib/errors.py:1204
5544
msgid ""
5545
"These branches have diverged. Use the missing command to see how.\n"
5546
"Use the merge command to reconcile them."
5547
msgstr ""
5548
5549
#: bzrlib/errors.py:1224
5550
msgid ""
5551
"Branches have no common ancestor, and no merge base revision was specified."
5552
msgstr ""
5553
5554
#: bzrlib/errors.py:1230
5555
msgid ""
5556
"Selected merge cannot perform reverse cherrypicks. Try merge3 or diff3."
5557
msgstr ""
5558
5559
#: bzrlib/errors.py:1236
5560
msgid "Revisions have no common ancestor: %(revision_a)s %(revision_b)s"
5561
msgstr ""
5562
5563
#: bzrlib/errors.py:1245
5564
msgid ""
5565
"Revisions are not derived from the same root: %(revision_a)s %(revision_b)s."
5566
msgstr ""
5567
5568
#: bzrlib/errors.py:1254
5569
msgid "Revision %(rev_id)s is not an ancestor of %(not_ancestor_id)s"
5570
msgstr ""
5571
5572
#: bzrlib/errors.py:1263
5573
msgid "Branch %(branch)s has no commits."
5574
msgstr ""
5575
5576
#: bzrlib/errors.py:1281
5577
msgid ""
5578
"Bound branch %(branch)s is out of date with master branch %(master)s."
5579
"%(extra_help)s"
5580
msgstr ""
5581
5582
#: bzrlib/errors.py:1293
5583
msgid ""
5584
"Cannot commit to branch %(branch)s. It is bound to %(master)s, which is "
5585
"bound to %(remote)s."
5586
msgstr ""
5587
5588
#: bzrlib/errors.py:1305
5589
msgid "Cannot pull --overwrite to a branch which is bound %(branch)s"
5590
msgstr ""
5591
5592
#: bzrlib/errors.py:1314
5593
msgid ""
5594
"Unable to connect to target of bound branch %(branch)s => %(target)s: "
5595
"%(error)s"
5596
msgstr ""
5597
5598
#: bzrlib/errors.py:1326
5599
msgid "Error in processing weave: %(msg)s"
5600
msgstr ""
5601
5602
#: bzrlib/errors.py:1335
5603
msgid "Revision {%(revision_id)s} already present in %(weave)s"
5604
msgstr ""
5605
5606
#: bzrlib/errors.py:1346
5607
msgid "Revision {%(revision_id)s} not present in %(weave)s"
5608
msgstr ""
5609
5610
#: bzrlib/errors.py:1356
5611
msgid "Weave invariant violated: %(what)s"
5612
msgstr ""
5613
5614
#: bzrlib/errors.py:1365
5615
msgid "Parents are mismatched between two revisions. %(msg)s"
5616
msgstr ""
5617
5618
#: bzrlib/errors.py:1387
5619
msgid ""
5620
"Weaves differ on text content. Revision: {%(revision_id)s}, %(weave_a)s, "
5621
"%(weave_b)s"
5622
msgstr ""
5623
5624
#: bzrlib/errors.py:1399
5625
msgid "Versioned file error"
5626
msgstr ""
5627
5628
#: bzrlib/errors.py:1404
5629
msgid "Revision {%(revision_id)s} not present in \"%(file_id)s\"."
5630
msgstr ""
5631
5632
#: bzrlib/errors.py:1414
5633
msgid "Revision {%(revision_id)s} already present in \"%(file_id)s\"."
5634
msgstr ""
5635
5636
#: bzrlib/errors.py:1424
5637
msgid "Text did not match its checksum: %(msg)s"
5638
msgstr ""
5639
5640
#: bzrlib/errors.py:1550
5641
msgid "Export format %(format)r not supported"
5642
msgstr ""
5643
5644
#: bzrlib/errors.py:1559
5645
msgid "Transport error: %(msg)s %(orig_error)s"
5646
msgstr ""
5647
5648
#: bzrlib/errors.py:1585
5649
msgid "Generic bzr smart protocol error: %(details)s"
5650
msgstr ""
5651
5652
#: bzrlib/errors.py:1593
5653
msgid "Received bad protocol version marker: %(marker)r"
5654
msgstr ""
5655
5656
#: bzrlib/errors.py:1625
5657
msgid "Transport operation not possible: %(msg)s %(orig_error)s"
5658
msgstr ""
5659
5660
#: bzrlib/errors.py:1630
5661
msgid "Connection error: %(msg)s %(orig_error)s"
5662
msgstr ""
5663
5664
#: bzrlib/errors.py:1635
5665
msgid "%(msg)s %(host)s%(port)s%(orig_error)s"
5666
msgstr ""
5667
5668
#: bzrlib/errors.py:1656
5669
msgid "Connection closed: %(msg)s %(orig_error)s"
5670
msgstr ""
5671
5672
#: bzrlib/errors.py:1661
5673
msgid "Connection Timeout: %(msg)s%(orig_error)s"
5674
msgstr ""
5675
5676
#: bzrlib/errors.py:1666
5677
msgid "Invalid range access in %(path)s at %(offset)s: %(msg)s"
5678
msgstr ""
5679
5680
#: bzrlib/errors.py:1676
5681
msgid "Invalid http response for %(path)s: %(msg)s%(orig_error)s"
5682
msgstr ""
5683
5684
#: bzrlib/errors.py:1691
5685
msgid "Certificate error: %(error)s"
5686
msgstr ""
5687
5688
#: bzrlib/errors.py:1699
5689
msgid "Invalid http range %(range)r for %(path)s: %(msg)s"
5690
msgstr ""
5691
5692
#: bzrlib/errors.py:1713
5693
msgid "HTTP MIME Boundary missing for %(path)s: %(msg)s"
5694
msgstr ""
5695
5696
#: bzrlib/errors.py:1721
5697
msgid "Invalid http Content-type \"%(ctype)s\" for %(path)s: %(msg)s"
5698
msgstr ""
5699
5700
#: bzrlib/errors.py:1730
5701
msgid "%(source)s is%(permanently)s redirected to %(target)s"
5702
msgstr ""
5703
5704
#: bzrlib/errors.py:1744
5705
msgid "Too many redirections"
5706
msgstr ""
5707
5708
#: bzrlib/errors.py:1749
5709
msgid "Working tree has conflicts."
5710
msgstr ""
5711
5712
#: bzrlib/errors.py:1753
5713
msgid "Config file %(filename)s is not UTF-8 encoded\n"
5714
msgstr ""
5715
5716
#: bzrlib/errors.py:1762
5717
msgid ""
5718
"Error(s) parsing config file %(filename)s:\n"
5719
"%(errors)s"
5720
msgstr ""
5721
5722
#: bzrlib/errors.py:1772
5723
msgid ""
5724
"Bad value \"%(value)s\" for option \"%(name)s\".\n"
5725
"See ``bzr help %(name)s``"
5726
msgstr ""
5727
5728
#: bzrlib/errors.py:1782
5729
msgid "%(username)r does not seem to contain a reasonable email address"
5730
msgstr ""
5731
5732
#: bzrlib/errors.py:1791
5733
msgid "Failed to GPG sign data with command \"%(command_line)s\""
5734
msgstr ""
5735
5736
#: bzrlib/errors.py:1799
5737
msgid "Failed to verify GPG signature data with error \"%(error)s\""
5738
msgstr ""
5739
5740
#: bzrlib/errors.py:1807
5741
msgid "Unable to import library \"%(library)s\": %(error)s"
5742
msgstr ""
5743
5744
#: bzrlib/errors.py:1815
5745
msgid "python-gpgme is not installed, it is needed to verify signatures"
5746
msgstr ""
5747
5748
#: bzrlib/errors.py:1823
5749
msgid ""
5750
"The working tree for %(basedir)s has changed since the last commit, but "
5751
"weave merge requires that it be unchanged"
5752
msgstr ""
5753
5754
#: bzrlib/errors.py:1833
5755
msgid ""
5756
"Can't reprocess and show base, because reprocessing obscures the "
5757
"relationship of conflicting lines to the base"
5758
msgstr ""
5759
5760
#: bzrlib/errors.py:1839
5761
msgid "Cycle in graph %(graph)r"
5762
msgstr ""
5763
5764
#: bzrlib/errors.py:1867
5765
msgid "File %(filename)s is not conflicted."
5766
msgstr ""
5767
5768
#: bzrlib/errors.py:1889
5769
msgid "No bundle was found in \"%(filename)s\"."
5770
msgstr ""
5771
5772
#: bzrlib/errors.py:1898
5773
msgid "Unable to handle bundle version %(version)s: %(msg)s"
5774
msgstr ""
5775
5776
#: bzrlib/errors.py:1908
5777
msgid "Branch %(base)s is missing revision %(text_revision)s of %(file_id)s"
5778
msgstr ""
5779
5780
#: bzrlib/errors.py:1921
5781
msgid "File id {%(file_id)s} already exists in inventory as %(entry)s"
5782
msgstr ""
5783
5784
#: bzrlib/errors.py:1931
5785
msgid "Key %(key)s is already present in map"
5786
msgstr ""
5787
5788
#: bzrlib/errors.py:1936
5789
msgid "The prefix %(prefix)s is in the help search path twice."
5790
msgstr ""
5791
5792
#: bzrlib/errors.py:1946
5793
msgid ""
5794
"No final name for trans_id %(trans_id)r\n"
5795
"file-id: %(file_id)r\n"
5796
"root trans-id: %(root_trans_id)r\n"
5797
msgstr ""
5798
5799
#: bzrlib/errors.py:1978
5800
msgid "Attempt to reuse a transform that has already been applied."
5801
msgstr ""
5802
5803
#: bzrlib/errors.py:1983
5804
msgid "Moving the root directory is not supported at this time"
5805
msgstr ""
5806
5807
#: bzrlib/errors.py:1988
5808
msgid "Failed to rename %(from_path)s to %(to_path)s: %(why)s"
5809
msgstr ""
5810
5811
#: bzrlib/errors.py:1999
5812
msgid ""
5813
"Could not move %(from_path)s%(operator)s %(to_path)s%(_has_extra)s%(extra)s"
5814
msgstr ""
5815
5816
#: bzrlib/errors.py:2035
5817
msgid ""
5818
"Could not rename %(from_path)s%(operator)s %(to_path)s%(_has_extra)s%(extra)s"
5819
msgstr ""
5820
5821
#: bzrlib/errors.py:2065
5822
msgid "Unable to import paramiko (required for sftp support): %(error)s"
5823
msgstr ""
5824
5825
#: bzrlib/errors.py:2073
5826
msgid "Nothing to merge."
5827
msgstr ""
5828
5829
#: bzrlib/errors.py:2078
5830
msgid "Format %(format)s cannot be initialised by this version of bzr."
5831
msgstr ""
5832
5833
#: bzrlib/errors.py:2087
5834
msgid ""
5835
"Cannot convert from format %(from_format)s to format %(format)s. "
5836
"%(problem)s"
5837
msgstr ""
5838
5839
#: bzrlib/errors.py:2099
5840
msgid "Could not find an appropriate Differ for file \"%(path)s\""
5841
msgstr ""
5842
5843
#: bzrlib/errors.py:2107
5844
msgid "%(exe_name)s could not be found on this machine"
5845
msgstr ""
5846
5847
#: bzrlib/errors.py:2115
5848
msgid "Diff is not installed on this machine: %(msg)s"
5849
msgstr ""
5850
5851
#: bzrlib/errors.py:2123
5852
msgid "Diff3 is not installed on this machine."
5853
msgstr ""
5854
5855
#: bzrlib/errors.py:2129
5856
msgid "The content being inserted is already present."
5857
msgstr ""
5858
5859
#: bzrlib/errors.py:2134
5860
msgid ""
5861
"This tree contains left-over files from a failed operation.\n"
5862
" Please examine %(limbo_dir)s to see if it contains any files you wish "
5863
"to\n"
5864
" keep, and delete it when you are done."
5865
msgstr ""
5866
5867
#: bzrlib/errors.py:2145
5868
msgid ""
5869
"This tree contains left-over files from a failed operation.\n"
5870
" Please examine %(pending_deletion)s to see if it contains any files you\n"
5871
" wish to keep, and delete it when you are done."
5872
msgstr ""
5873
5874
#: bzrlib/errors.py:2155
5875
msgid ""
5876
"Unable to delete transform temporary directory %(limbo_dir)s.\n"
5877
" Please examine %(limbo_dir)s to see if it contains any files you wish "
5878
"to\n"
5879
" keep, and delete it when you are done."
5880
msgstr ""
5881
5882
#: bzrlib/errors.py:2166
5883
msgid ""
5884
"Unable to delete transform temporary directory %(pending_deletion)s. Please "
5885
"examine %(pending_deletion)s to see if it contains any files you wish to "
5886
"keep, and delete it when you are done."
5887
msgstr ""
5888
5889
#: bzrlib/errors.py:2176
5890
msgid "Working tree is out of date, please run 'bzr update'.%(more)s"
5891
msgstr ""
5892
5893
#: bzrlib/errors.py:2190
5894
msgid "Public branch \"%(public_location)s\" lacks revision \"%(revstring)s\"."
5895
msgstr ""
5896
5897
#: bzrlib/errors.py:2203
5898
msgid "Error in merge modified format"
5899
msgstr ""
5900
5901
#: bzrlib/errors.py:2208
5902
msgid "Format error in conflict listings"
5903
msgstr ""
5904
5905
#: bzrlib/errors.py:2212
5906
msgid ""
5907
"Inconsistency in dirstate file %(dirstate_path)s.\n"
5908
"Error: %(description)s"
5909
msgstr ""
5910
5911
#: bzrlib/errors.py:2223
5912
msgid ""
5913
"An error has been detected in the repository %(repo_path)s.\n"
5914
"Please run bzr reconcile on this repository."
5915
msgstr ""
5916
5917
#: bzrlib/errors.py:2234
5918
msgid ""
5919
"An inconsistent delta was supplied involving %(path)r, %(file_id)r\n"
5920
"reason: %(reason)s"
5921
msgstr ""
5922
5923
#: bzrlib/errors.py:2247
5924
msgid ""
5925
"An inconsistent delta was supplied: %(delta)r\n"
5926
"reason: %(reason)s"
5927
msgstr ""
5928
5929
#: bzrlib/errors.py:2259
5930
msgid "To use this feature you must upgrade your branch at %(path)s."
5931
msgstr ""
5932
5933
#: bzrlib/errors.py:2268
5934
msgid "To use this feature you must upgrade your repository at %(path)s."
5935
msgstr ""
5936
5937
#: bzrlib/errors.py:2273
5938
msgid ""
5939
"To use this feature you must upgrade your branch at %(path)s to a format "
5940
"which supports rich roots."
5941
msgstr ""
5942
5943
#: bzrlib/errors.py:2279
5944
msgid "Cannot perform local-only commits on unbound branches."
5945
msgstr ""
5946
5947
#: bzrlib/errors.py:2284
5948
msgid "The method %(mname)s is not supported on objects of type %(tname)s."
5949
msgstr ""
5950
5951
#: bzrlib/errors.py:2305
5952
msgid "Ghost tags not supported by format %(format)r."
5953
msgstr ""
5954
5955
#: bzrlib/errors.py:2313
5956
msgid "File is binary but should be text."
5957
msgstr ""
5958
5959
#: bzrlib/errors.py:2318
5960
msgid "The path %(path)s is not permitted on this platform"
5961
msgstr ""
5962
5963
#: bzrlib/errors.py:2327
5964
msgid ""
5965
"Testament did not match expected value.\n"
5966
" For revision_id {%(revision_id)s}, expected {%(expected)s}, measured\n"
5967
" {%(measured)s}"
5968
msgstr ""
5969
5970
#: bzrlib/errors.py:2339
5971
msgid "Not a bzr revision-bundle: %(text)r"
5972
msgstr ""
5973
5974
#: bzrlib/errors.py:2348
5975
msgid "Bad bzr revision-bundle: %(text)r"
5976
msgstr ""
5977
5978
#: bzrlib/errors.py:2357
5979
msgid "Malformed bzr revision-bundle header: %(text)r"
5980
msgstr ""
5981
5982
#: bzrlib/errors.py:2362
5983
msgid "Malformed patches in bzr revision-bundle: %(text)r"
5984
msgstr ""
5985
5986
#: bzrlib/errors.py:2367
5987
msgid "Malformed footer in bzr revision-bundle: %(text)r"
5988
msgstr ""
5989
5990
#: bzrlib/errors.py:2372
5991
msgid "End of line marker was not \\n in bzr revision-bundle"
5992
msgstr ""
5993
5994
#: bzrlib/errors.py:2382
5995
msgid "Bundle format %(bundle_format)s is incompatible with %(other)s"
5996
msgstr ""
5997
5998
#: bzrlib/errors.py:2392
5999
msgid "Root class for inventory serialization errors"
6000
msgstr ""
6001
6002
#: bzrlib/errors.py:2396
6003
msgid ""
6004
"The inventory was not in the expected format:\n"
6005
" %(msg)s"
6006
msgstr ""
6007
6008
#: bzrlib/errors.py:2405
6009
msgid "This operation requires rich root data storage"
6010
msgstr ""
6011
6012
#: bzrlib/errors.py:2418
6013
msgid "Unrecognised value for BZR_SSH environment variable: %(vendor)s"
6014
msgstr ""
6015
6016
#: bzrlib/errors.py:2427
6017
msgid ""
6018
"Don't know how to handle SSH connections. Please set BZR_SSH environment "
6019
"variable."
6020
msgstr ""
6021
6022
#: bzrlib/errors.py:2434
6023
msgid ""
6024
"Could not determine revno for {%(revision_id)s} because its ancestry shows a "
6025
"ghost at {%(ghost_revision_id)s}"
6026
msgstr ""
6027
6028
#: bzrlib/errors.py:2444
6029
msgid "Ghost revision {%(revision_id)s} cannot be used here."
6030
msgstr ""
6031
6032
#: bzrlib/errors.py:2495
6033
msgid ""
6034
"A merge directive must provide either a bundle or a public branch location."
6035
msgstr ""
6036
6037
#: bzrlib/errors.py:2502
6038
msgid "Bad merge directive payload %(start)r"
6039
msgstr ""
6040
6041
#: bzrlib/errors.py:2512
6042
msgid "Preview patch does not match requested changes."
6043
msgstr ""
6044
6045
#: bzrlib/errors.py:2518
6046
msgid "Patch_type was %(patch_type)s, but no patch was supplied."
6047
msgstr ""
6048
6049
#: bzrlib/errors.py:2528
6050
msgid ""
6051
"Your branch does not have all of the revisions required in order to merge "
6052
"this merge directive and the target location specified in the merge "
6053
"directive is not a branch: %(location)s."
6054
msgstr ""
6055
6056
#: bzrlib/errors.py:2540
6057
msgid "Unsupported entry kind %(kind)s"
6058
msgstr ""
6059
6060
#: bzrlib/errors.py:2548
6061
msgid "Can't subsume %(other_tree)s into %(tree)s. %(reason)s"
6062
msgstr ""
6063
6064
#: bzrlib/errors.py:2558
6065
msgid "Subsume target %(other_tree)s needs to be upgraded."
6066
msgstr ""
6067
6068
#: bzrlib/errors.py:2577
6069
msgid "No such tag: %(tag_name)s"
6070
msgstr ""
6071
6072
#: bzrlib/errors.py:2585
6073
msgid "Tags not supported by %(branch)s; you may be able to use bzr upgrade."
6074
msgstr ""
6075
6076
#: bzrlib/errors.py:2594
6077
msgid "Tag %(tag_name)s already exists."
6078
msgstr ""
6079
6080
#: bzrlib/errors.py:2602
6081
msgid ""
6082
"Did not understand bug identifier %(bug_id)s: %(reason)s. See \"bzr help bugs"
6083
"\" for more information on this feature."
6084
msgstr ""
6085
6086
#: bzrlib/errors.py:2612
6087
msgid ""
6088
"The URL for bug tracker \"%(abbreviation)s\" doesn't contain {id}: %(url)s"
6089
msgstr ""
6090
6091
#: bzrlib/errors.py:2622
6092
msgid ""
6093
"Cannot find registered bug tracker called %(abbreviation)s on %(branch)s"
6094
msgstr ""
6095
6096
#: bzrlib/errors.py:2632
6097
msgid "Invalid line in bugs property: '%(line)s'"
6098
msgstr ""
6099
6100
#: bzrlib/errors.py:2640
6101
msgid "Invalid bug status: '%(status)s'"
6102
msgstr ""
6103
6104
#: bzrlib/errors.py:2648
6105
msgid "Could not understand response from smart server: %(response_tuple)r"
6106
msgstr ""
6107
6108
#: bzrlib/errors.py:2687
6109
msgid "Server sent an unexpected error: %(error_tuple)r"
6110
msgstr ""
6111
6112
#: bzrlib/errors.py:2706
6113
msgid "Unrecognised container format: %(container_format)r"
6114
msgstr ""
6115
6116
#: bzrlib/errors.py:2714
6117
msgid "Unexpected end of container stream"
6118
msgstr ""
6119
6120
#: bzrlib/errors.py:2719
6121
msgid "Unknown record type: %(record_type)r"
6122
msgstr ""
6123
6124
#: bzrlib/errors.py:2727
6125
msgid "Invalid record: %(reason)s"
6126
msgstr ""
6127
6128
#: bzrlib/errors.py:2735
6129
msgid "Container has data after end marker: %(excess)r"
6130
msgstr ""
6131
6132
#: bzrlib/errors.py:2743
6133
msgid "Container has multiple records with the same name: %(name)s"
6134
msgstr ""
6135
6136
#: bzrlib/errors.py:2756
6137
msgid "Corrupt or incompatible data stream: %(reason)s"
6138
msgstr ""
6139
6140
#: bzrlib/errors.py:2764
6141
msgid "SMTP error: %(error)s"
6142
msgstr ""
6143
6144
#: bzrlib/errors.py:2772
6145
msgid "No message supplied."
6146
msgstr ""
6147
6148
#: bzrlib/errors.py:2777
6149
msgid "No mail-to address (--mail-to) or output (-o) specified."
6150
msgstr ""
6151
6152
#: bzrlib/errors.py:2782
6153
msgid ""
6154
"Unable to find mail client with the following names: "
6155
"%(mail_command_list_string)s"
6156
msgstr ""
6157
6158
#: bzrlib/errors.py:2792
6159
msgid "SMTP connection to %(host)s refused"
6160
msgstr ""
6161
6162
#: bzrlib/errors.py:2801
6163
msgid "Please specify smtp_server. No server at default %(host)s."
6164
msgstr ""
6165
6166
#: bzrlib/errors.py:2815
6167
msgid ""
6168
"'%(display_url)s' is not in sync with %(target_url)s. See bzr help sync-for-"
6169
"reconfigure."
6170
msgstr ""
6171
6172
#: bzrlib/errors.py:2827
6173
msgid "'%(display_url)s' is already a branch."
6174
msgstr ""
6175
6176
#: bzrlib/errors.py:2832
6177
msgid "'%(display_url)s' is already a tree."
6178
msgstr ""
6179
6180
#: bzrlib/errors.py:2837
6181
msgid "'%(display_url)s' is already a checkout."
6182
msgstr ""
6183
6184
#: bzrlib/errors.py:2842
6185
msgid "'%(display_url)s' is already a lightweight checkout."
6186
msgstr ""
6187
6188
#: bzrlib/errors.py:2847
6189
msgid "'%(display_url)s' is already using a shared repository."
6190
msgstr ""
6191
6192
#: bzrlib/errors.py:2852
6193
msgid "'%(display_url)s' is already standalone."
6194
msgstr ""
6195
6196
#: bzrlib/errors.py:2857
6197
msgid "Shared repository '%(display_url)s' already creates working trees."
6198
msgstr ""
6199
6200
#: bzrlib/errors.py:2863
6201
msgid ""
6202
"Shared repository '%(display_url)s' already doesn't create working trees."
6203
msgstr ""
6204
6205
#: bzrlib/errors.py:2869
6206
msgid "Requested reconfiguration of '%(display_url)s' is not supported."
6207
msgstr ""
6208
6209
#: bzrlib/errors.py:2874
6210
msgid "No location could be found to bind to at %(display_url)s."
6211
msgstr ""
6212
6213
#: bzrlib/errors.py:2879
6214
msgid ""
6215
"Working tree \"%(display_url)s\" has uncommitted changes (See bzr status)."
6216
"%(more)s"
6217
msgstr ""
6218
6219
#: bzrlib/errors.py:2898
6220
msgid ""
6221
"Branch \"%(display_url)s\" does not support storing uncommitted changes."
6222
msgstr ""
6223
6224
#: bzrlib/errors.py:2913
6225
msgid ""
6226
"Working tree \"%(display_url)s\" has shelved changes (See bzr shelve --list)."
6227
"%(more)s"
6228
msgstr ""
6229
6230
#: bzrlib/errors.py:2919
6231
msgid "Variable {%(name)s} is not available."
6232
msgstr ""
6233
6234
#: bzrlib/errors.py:2927
6235
msgid "No template specified."
6236
msgstr ""
6237
6238
#: bzrlib/errors.py:2932
6239
msgid "Unable to create symlink %(path_str)son this platform"
6240
msgstr ""
6241
6242
#: bzrlib/errors.py:2947
6243
msgid ""
6244
"Unsupported timezone format \"%(timezone)s\", options are \"utc\", \"original"
6245
"\", \"local\"."
6246
msgstr ""
6247
6248
#: bzrlib/errors.py:2981
6249
msgid ""
6250
"Unable to encode %(kind)s path %(path)r in user encoding %(user_encoding)s"
6251
msgstr ""
6252
6253
#: bzrlib/errors.py:2993
6254
msgid "The \"%(config_id)s\" configuration does not exist."
6255
msgstr ""
6256
6257
#: bzrlib/errors.py:3001
6258
msgid "The \"%(option_name)s\" configuration option does not exist."
6259
msgstr ""
6260
6261
#: bzrlib/errors.py:3009
6262
msgid "The alias \"%(alias_name)s\" does not exist."
6263
msgstr ""
6264
6265
#: bzrlib/errors.py:3023
6266
msgid "\"%(alias_name)s\" is not a valid location alias."
6267
msgstr ""
6268
6269
#: bzrlib/errors.py:3031
6270
msgid "No %(alias_name)s location assigned."
6271
msgstr ""
6272
6273
#: bzrlib/errors.py:3039
6274
msgid "Cannot bind address \"%(host)s:%(port)i\": %(orig_error)s."
6275
msgstr ""
6276
6277
#: bzrlib/errors.py:3049
6278
msgid "Unknown rules detected: %(unknowns_str)s."
6279
msgstr ""
6280
6281
#: bzrlib/errors.py:3060
6282
msgid "Tip change rejected: %(msg)s"
6283
msgstr ""
6284
6285
#: bzrlib/errors.py:3068
6286
msgid "Shelf corrupt."
6287
msgstr ""
6288
6289
#: bzrlib/errors.py:3073
6290
msgid "Corruption while decompressing repository file%(orig_error)s"
6291
msgstr ""
6292
6293
#: bzrlib/errors.py:3085
6294
msgid "No changes are shelved with id \"%(shelf_id)d\"."
6295
msgstr ""
6296
6297
#: bzrlib/errors.py:3093
6298
msgid "\"%(invalid_id)s\" is not a valid shelf id, try a number instead."
6299
msgstr ""
6300
6301
#: bzrlib/errors.py:3101
6302
msgid "An attempt to access a url outside the server jail was made: '%(url)s'."
6303
msgstr ""
6304
6305
#: bzrlib/errors.py:3109
6306
msgid "The user aborted the operation."
6307
msgstr ""
6308
6309
#: bzrlib/errors.py:3114
6310
msgid "Branching '%(url)s'(%(format)s) must create a working tree."
6311
msgstr ""
6312
6313
#: bzrlib/errors.py:3124
6314
msgid "No such view: %(view_name)s."
6315
msgstr ""
6316
6317
#: bzrlib/errors.py:3134
6318
msgid ""
6319
"Views are not supported by %(tree)s; use 'bzr upgrade' to change your tree "
6320
"to a later format."
6321
msgstr ""
6322
6323
#: bzrlib/errors.py:3143
6324
msgid ""
6325
"Specified file \"%(file_name)s\" is outside the current view: %(view_str)s"
6326
msgstr ""
6327
6328
#: bzrlib/errors.py:3210
6329
msgid "%(bzrdir)r does not support co-located branches."
6330
msgstr ""
6331
6332
#: bzrlib/errors.py:3216
6333
msgid ""
6334
"Unable to determine your name.\n"
6335
"Please, set your name with the 'whoami' command.\n"
6336
"E.g. bzr whoami \"Your Name <name@example.com>\""
6337
msgstr ""
6338
6339
#: bzrlib/errors.py:3225
6340
msgid "Invalid pattern(s) found. %(msg)s"
6341
msgstr ""
6342
6343
#: bzrlib/errors.py:3233
6344
msgid ""
6345
"Branch \"%(branch_url)s\" appears to be bound to itself. Please use `bzr "
6346
"unbind` to fix."
6347
msgstr ""
6348
6349
#: bzrlib/errors.py:3244
6350
msgid "Loop involving %(refs)r while expanding \"%(string)s\"."
6351
msgstr ""
6352
6353
#: bzrlib/errors.py:3253
6354
msgid "Option %(name)s is not defined while expanding \"%(string)s\"."
6355
msgstr ""
6356
6357
#: bzrlib/errors.py:3262
6358
msgid ""
6359
"No compatible object available for operations from %(source)r to %(target)r."
6360
msgstr ""
6361
6362
#: bzrlib/errors.py:3272
6363
msgid ""
6364
"VFS requests over the smart server are not allowed. Encountered: %(method)s, "
6365
"%(arguments)s."
6366
msgstr ""
6367
6368
#: bzrlib/errors.py:3282
6369
msgid ""
6370
"Kind change from %(from_kind)s to %(to_kind)s for %(path)s not supported by "
6371
"format %(format)r"
6372
msgstr ""
6373
6374
#: bzrlib/errors.py:3294
6375
msgid ""
6376
"Missing feature %(feature)s not provided by this version of Bazaar or any "
6377
"plugin."
6378
msgstr ""
6379
6380
#: bzrlib/errors.py:3307
6381
msgid "Binary files section encountered."
6382
msgstr ""
6383
6384
#: bzrlib/errors.py:3315
6385
msgid ""
6386
"Malformed patch header. %(desc)s\n"
6387
"%(line)r"
6388
msgstr ""
6389
6390
#: bzrlib/errors.py:3324
6391
msgid ""
6392
"Malformed hunk header. %(desc)s\n"
6393
"%(line)r"
6394
msgstr ""
6395
6396
#: bzrlib/errors.py:3333
6397
msgid ""
6398
"Malformed line. %(desc)s\n"
6399
"%(line)r"
6400
msgstr ""
6401
6402
#: bzrlib/errors.py:3343
6403
msgid ""
6404
"Text contents mismatch at line %(line_no)d. Original has \"%(orig_line)s\", "
6405
"but patch says it should be \"%(patch_line)s\""
6406
msgstr ""
6407
6408
#: bzrlib/errors.py:3354
6409
msgid "The feature %(feature)s has already been registered."
6410
msgstr ""
6411
6412
#: bzrlib/errors.py:3362
6413
msgid ""
6414
"Cannot store uncommitted changes because this branch already stores "
6415
"uncommitted changes."
6416
msgstr ""
6417
6418
#: bzrlib/export_pot.py:252
6419
#, python-format
6420
msgid "Exporting messages from builtin command: %s"
6421
msgstr ""
6422
6423
#: bzrlib/export_pot.py:271
6424
msgid "Exporting messages from plugin command: {0} in {1}"
6425
msgstr ""
6426
6427
#: bzrlib/export_pot.py:292
6428
#, python-format
6429
msgid "Exporting message from error: %s"
6430
msgstr ""
6431
6432
#: bzrlib/fetch.py:98
6433
msgid "Finding revisions"
6434
msgstr ""
6435
6436
#: bzrlib/fetch.py:103
6437
msgid "Fetching revisions"
6438
msgstr ""
6439
6440
#: bzrlib/foreign.py:262
6441
msgid "Push into a different VCS without any custom bzr metadata."
6442
msgstr ""
6443
6444
#: bzrlib/foreign.py:264
6445
msgid ""
6446
"This will afterwards rebase the local branch on the remote\n"
6447
"branch unless the --no-rebase option is used, in which case \n"
6448
"the two branches will be out of sync after the push. "
6449
msgstr ""
6450
6451
# help of 'no-rebase' option of 'dpush' command
6452
#: bzrlib/foreign.py:277
6453
msgid "Do not rebase after push."
6454
msgstr ""
6455
6456
#: bzrlib/foreign.py:311
6457
#, python-format
6458
msgid "Using saved location: %s\n"
6459
msgstr ""
6460
6461
#: bzrlib/foreign.py:321
6462
msgid ""
6463
"{0!r} and {1!r} are in the same VCS, lossy push not necessary. Please use "
6464
"regular push."
6465
msgstr ""
6466
6467
#: bzrlib/gpg.py:366
6468
msgid "No GnuPG key results for pattern: {0}"
6469
msgstr ""
6470
6471
#: bzrlib/gpg.py:439
6472
msgid "{0} commits with valid signatures"
6473
msgstr ""
6474
6475
#: bzrlib/gpg.py:445
6476
msgid "{0} commit with unknown key"
6477
msgid_plural "{0} commits with unknown keys"
6478
msgstr[0] ""
6479
msgstr[1] ""
6480
6481
#: bzrlib/gpg.py:453
6482
msgid "{0} commit not valid"
6483
msgid_plural "{0} commits not valid"
6484
msgstr[0] ""
6485
msgstr[1] ""
6486
6487
#: bzrlib/gpg.py:461
6488
msgid "{0} commit not signed"
6489
msgid_plural "{0} commits not signed"
6490
msgstr[0] ""
6491
msgstr[1] ""
6492
6493
#: bzrlib/gpg.py:469
6494
msgid "{0} commit with key now expired"
6495
msgid_plural "{0} commits with key now expired"
6496
msgstr[0] ""
6497
msgstr[1] ""
6498
6499
#: bzrlib/gpg.py:489
6500
msgid "{0} commit by author {1} with key {2} now expired"
6501
msgid_plural "{0} commits by author {1} with key {2} now expired"
6502
msgstr[0] ""
6503
msgstr[1] ""
6504
6505
#: bzrlib/gpg.py:505
6506
msgid "{0} signed {1} commit"
6507
msgid_plural "{0} signed {1} commits"
6508
msgstr[0] ""
6509
msgstr[1] ""
6510
6511
#: bzrlib/gpg.py:522 bzrlib/gpg.py:539
6512
msgid "{0} commit by author {1}"
6513
msgid_plural "{0} commits by author {1}"
6514
msgstr[0] ""
6515
msgstr[1] ""
6516
6517
#: bzrlib/gpg.py:554
6518
msgid "Unknown key {0} signed {1} commit"
6519
msgid_plural "Unknown key {0} signed {1} commits"
6520
msgstr[0] ""
6521
msgstr[1] ""
6522
6523
#: bzrlib/groupcompress.py:1739
6524
#, python-format
6525
msgid "Insert claimed random_id=True, but then inserted %r two times"
6526
msgstr ""
6527
6528
#: bzrlib/hooks.py:313
6529
#, python-format
6530
msgid "Introduced in: %s"
6531
msgstr ""
6532
6533
#: bzrlib/hooks.py:316
6534
#, python-format
6535
msgid "Deprecated in: %s"
6536
msgstr ""
6537
6538
#: bzrlib/knit.py:1766 bzrlib/knit.py:1802
6539
msgid "Walking content"
6540
msgstr ""
6541
6542
#: bzrlib/knit.py:3330
6543
msgid "annotating"
6544
msgstr ""
6545
6546
#: bzrlib/lock.py:549
6547
msgid "{0!r} was {1} locked again"
6548
msgstr ""
6549
6550
#: bzrlib/lockdir.py:321
6551
#, python-format
6552
msgid "error removing pending lock: %s"
6553
msgstr ""
6554
6555
#: bzrlib/lockdir.py:616
6556
msgid "Unable to obtain"
6557
msgstr ""
6558
6559
#: bzrlib/lockdir.py:618
6560
msgid "Lock owner changed for"
6561
msgstr ""
6562
6563
#: bzrlib/lockdir.py:620
6564
msgid "{0} lock {1} {2}."
6565
msgstr ""
6566
6567
#: bzrlib/lockdir.py:627
6568
#, python-format
6569
msgid "Will continue to try until %s, unless you press Ctrl-C."
6570
msgstr ""
6571
6572
#: bzrlib/lockdir.py:629
6573
msgid "See \"bzr help break-lock\" for more."
6574
msgstr ""
6575
6576
#: bzrlib/lockdir.py:739
6577
#, python-format
6578
msgid ""
6579
"held by %(user)s on %(hostname)s (process #%(pid)s), acquired %(time_ago)s"
6580
msgstr ""
6581
6582
#: bzrlib/log.py:563
6583
msgid "--exclude-common-ancestry requires two different revisions"
6584
msgstr ""
6585
6586
#: bzrlib/log.py:565
6587
#, python-format
6588
msgid "invalid direction %r"
6589
msgstr ""
6590
6591
#: bzrlib/log.py:653
6592
msgid "Start revision not found in history of end revision."
6593
msgstr ""
6594
6595
#: bzrlib/log.py:1071 bzrlib/log.py:1129
6596
msgid "Logging revision 0 is invalid."
6597
msgstr ""
6598
6599
#: bzrlib/log.py:1073 bzrlib/log.py:1131
6600
msgid "Start revision must be older than the end revision."
6601
msgstr ""
6602
6603
#: bzrlib/log.py:1818
6604
#, python-format
6605
msgid "unknown log formatter: %r"
6606
msgstr ""
6607
6608
#: bzrlib/log.py:2114
6609
msgid "fixes bug"
6610
msgid_plural "fixes bugs"
6611
msgstr[0] ""
6612
msgstr[1] ""
6613
6614
#: bzrlib/merge.py:689
6615
msgid "All changes applied successfully."
6616
msgstr ""
6617
6618
#: bzrlib/merge.py:691
6619
#, python-format
6620
msgid "%d conflicts encountered."
6621
msgstr ""
6622
6623
#: bzrlib/merge.py:845 bzrlib/merge.py:1868
6624
msgid "Preparing file merge"
6625
msgstr ""
6626
6627
#: bzrlib/multiparent.py:426
6628
msgid "Importing revisions"
6629
msgstr ""
6630
6631
# help of 'help' option
6632
#: bzrlib/option.py:526
6633
msgid "Show help message."
6634
msgstr ""
6635
6636
# help of 'quiet' option
6637
#: bzrlib/option.py:528
6638
msgid "Only display errors and warnings."
6639
msgstr ""
6640
6641
# help of 'usage' option
6642
#: bzrlib/option.py:531
6643
msgid "Show usage message and options."
6644
msgstr ""
6645
6646
# help of 'verbose' option
6647
#: bzrlib/option.py:533
6648
msgid "Display more information."
6649
msgstr ""
6650
6651
# help of 'change' option
6652
#: bzrlib/option.py:541
6653
msgid ""
6654
"Select changes introduced by the specified revision. See also \"help "
6655
"revisionspec\"."
6656
msgstr ""
6657
6658
# help of 'directory' option
6659
#: bzrlib/option.py:543
6660
msgid "Branch to operate on, instead of working directory."
6661
msgstr ""
6662
6663
# help of 'log-format=long' option
6664
#: bzrlib/option.py:545
6665
msgid "Detailed log format."
6666
msgstr ""
6667
6668
# help of 'log-format=gnu-changelog' option
6669
#: bzrlib/option.py:545
6670
msgid "Format used by GNU ChangeLog files."
6671
msgstr ""
6672
6673
# help of 'log-format=line' option
6674
#: bzrlib/option.py:545
6675
msgid "Log format with one line per revision."
6676
msgstr ""
6677
6678
# help of 'log-format=short' option
6679
#: bzrlib/option.py:545
6680
msgid "Moderately short log format."
6681
msgstr ""
6682
6683
# help of 'log-format' option
6684
#: bzrlib/option.py:545
6685
msgid "Use specified log format."
6686
msgstr ""
6687
6688
# title of 'log-format' option
6689
#: bzrlib/option.py:547
6690
msgid "Log format"
6691
msgstr ""
6692
6693
# help of 'merge-type=lca' option
6694
#: bzrlib/option.py:549
6695
msgid "LCA-newness merge."
6696
msgstr ""
6697
6698
# help of 'merge-type=diff3' option
6699
#: bzrlib/option.py:549
6700
msgid "Merge using external diff3."
6701
msgstr ""
6702
6703
# help of 'merge-type=merge3' option
6704
#: bzrlib/option.py:549
6705
msgid "Native diff3-style merge."
6706
msgstr ""
6707
6708
# help of 'merge-type' option
6709
#: bzrlib/option.py:549
6710
msgid "Select a particular merge algorithm."
6711
msgstr ""
6712
6713
# help of 'merge-type=weave' option
6714
#: bzrlib/option.py:549
6715
msgid "Weave-based merge."
6716
msgstr ""
6717
6718
# title of 'merge-type' option
6719
#: bzrlib/option.py:551
6720
msgid "Merge algorithm"
6721
msgstr ""
6722
6723
# help of 'message' option
6724
#: bzrlib/option.py:554
6725
msgid "Message string."
6726
msgstr ""
6727
6728
# help of 'null' option
6729
#: bzrlib/option.py:556
6730
msgid "Use an ASCII NUL (\\0) separator rather than a newline."
6731
msgstr ""
6732
6733
# help of 'overwrite' option
6734
#: bzrlib/option.py:558
6735
msgid "Ignore differences between branches and overwrite unconditionally."
6736
msgstr ""
6737
6738
# help of 'remember' option
6739
#: bzrlib/option.py:560
6740
msgid "Remember the specified location as a default."
6741
msgstr ""
6742
6743
# help of 'reprocess' option
6744
#: bzrlib/option.py:562
6745
msgid "Reprocess to reduce spurious conflicts."
6746
msgstr ""
6747
6748
# help of 'revision' option
6749
#: bzrlib/option.py:566
6750
msgid "See \"help revisionspec\" for details."
6751
msgstr ""
6752
6753
# help of 'show-ids' option
6754
#: bzrlib/option.py:568
6755
msgid "Show internal object ids."
6756
msgstr ""
6757
6758
# help of 'timezone' option
6759
#: bzrlib/option.py:571
6760
msgid "Display timezone as local, original, or utc."
6761
msgstr ""
6762
6763
#: bzrlib/osutils.py:100
6764
msgid "Parameter {0!r} encoding is unsupported by {1} application locale."
6765
msgstr ""
6766
6767
#: bzrlib/osutils.py:220
6768
msgid "lstat/stat of ({0!r}): {1!r}"
6769
msgstr ""
6770
6771
#: bzrlib/osutils.py:1030 bzrlib/osutils.py:1041
6772
#, python-format
6773
msgid "sorry, %r not allowed in path"
6774
msgstr ""
6775
6776
#: bzrlib/osutils.py:1259
6777
#, python-format
6778
msgid "%r is too short to calculate a relative path"
6779
msgstr ""
6780
6781
#: bzrlib/plugin.py:143
6782
#, python-format
6783
msgid "\"%s\" is not a valid <plugin_name>@<plugin_path> description "
6784
msgstr ""
6785
6786
# help of 'plugin' option of 'bash-completion' command
6787
#: bzrlib/plugins/bash_completion/bashcomp.py:411
6788
msgid "Enable completions for the selected plugin (default: all plugins)"
6789
msgstr ""
6790
6791
#: bzrlib/plugins/bash_completion/bashcomp.py:412
6792
msgid "Generate a shell function for bash command line completion."
6793
msgstr ""
6794
6795
#: bzrlib/plugins/bash_completion/bashcomp.py:414
6796
msgid ""
6797
"This command generates a shell function which can be used by bash to\n"
6798
"automatically complete the currently typed command when the user presses\n"
6799
"the completion key (usually tab)."
6800
msgstr ""
6801
6802
#: bzrlib/plugins/bash_completion/bashcomp.py:418
6803
msgid ""
6804
"Commonly used like this:\n"
6805
" eval \"`bzr bash-completion`\""
6806
msgstr ""
6807
6808
# help of 'function-name' option of 'bash-completion' command
6809
#: bzrlib/plugins/bash_completion/bashcomp.py:424
6810
msgid "Name of the generated function (default: _bzr)"
6811
msgstr ""
6812
6813
# help of 'function-only' option of 'bash-completion' command
6814
#: bzrlib/plugins/bash_completion/bashcomp.py:426
6815
msgid "Generate only the shell function, don't enable it"
6816
msgstr ""
6817
6818
#: bzrlib/plugins/grep/cmds.py:77
6819
msgid "Print lines matching PATTERN for specified files and revisions."
6820
msgstr ""
6821
6822
#: bzrlib/plugins/grep/cmds.py:79
6823
msgid ""
6824
"This command searches the specified files and revisions for a given\n"
6825
"pattern. The pattern is specified as a Python regular expressions[1]."
6826
msgstr ""
6827
6828
#: bzrlib/plugins/grep/cmds.py:82
6829
msgid ""
6830
"If the file name is not specified, the revisions starting with the\n"
6831
"current directory are searched recursively. If the revision number is\n"
6832
"not specified, the working copy is searched. To search the last committed\n"
6833
"revision, use the '-r -1' or '-r last:1' option."
6834
msgstr ""
6835
6836
#: bzrlib/plugins/grep/cmds.py:87
6837
msgid ""
6838
"Unversioned files are not searched unless explicitly specified on the\n"
6839
"command line. Unversioned directores are not searched."
6840
msgstr ""
6841
6842
#: bzrlib/plugins/grep/cmds.py:90
6843
msgid ""
6844
"When searching a pattern, the output is shown in the 'filepath:string'\n"
6845
"format. If a revision is explicitly searched, the output is shown as\n"
6846
"'filepath~N:string', where N is the revision number."
6847
msgstr ""
6848
6849
#: bzrlib/plugins/grep/cmds.py:94
6850
msgid ""
6851
"--include and --exclude options can be used to search only (or exclude\n"
6852
"from search) files with base name matches the specified Unix style GLOB\n"
6853
"pattern. The GLOB pattern an use *, ?, and [...] as wildcards, and \\\n"
6854
"to quote wildcard or backslash character literally. Note that the glob\n"
6855
"pattern is not a regular expression."
6856
msgstr ""
6857
6858
#: bzrlib/plugins/grep/cmds.py:100
6859
msgid "[1] http://docs.python.org/library/re.html#regular-expression-syntax"
6860
msgstr ""
6861
6862
# help of 'color' option of 'grep' command
6863
#: bzrlib/plugins/grep/cmds.py:109
6864
msgid "Show match in color. WHEN is never, always or auto."
6865
msgstr ""
6866
6867
# help of 'diff' option of 'grep' command
6868
#: bzrlib/plugins/grep/cmds.py:111
6869
msgid "Grep for pattern in changeset for each revision."
6870
msgstr ""
6871
6872
# help of 'exclude' option of 'grep' command
6873
#: bzrlib/plugins/grep/cmds.py:113
6874
msgid "Skip files whose base name matches GLOB."
6875
msgstr ""
6876
6877
# help of 'include' option of 'grep' command
6878
#: bzrlib/plugins/grep/cmds.py:115
6879
msgid "Search only files whose base name matches GLOB."
6880
msgstr ""
6881
6882
# help of 'files-with-matches' option of 'grep' command
6883
#: bzrlib/plugins/grep/cmds.py:117
6884
msgid "Print only the name of each input file in which PATTERN is found."
6885
msgstr ""
6886
6887
# help of 'files-without-match' option of 'grep' command
6888
#: bzrlib/plugins/grep/cmds.py:120
6889
msgid "Print only the name of each input file in which PATTERN is not found."
6890
msgstr ""
6891
6892
# help of 'fixed-string' option of 'grep' command
6893
#: bzrlib/plugins/grep/cmds.py:123
6894
msgid "Interpret PATTERN is a single fixed string (not regex)."
6895
msgstr ""
6896
6897
# help of 'from-root' option of 'grep' command
6898
#: bzrlib/plugins/grep/cmds.py:125
6899
msgid ""
6900
"Search for pattern starting from the root of the branch. (implies --"
6901
"recursive)"
6902
msgstr ""
6903
6904
# help of 'ignore-case' option of 'grep' command
6905
#: bzrlib/plugins/grep/cmds.py:128
6906
msgid "ignore case distinctions while matching."
6907
msgstr ""
6908
6909
# help of 'levels' option of 'grep' command
6910
#: bzrlib/plugins/grep/cmds.py:130
6911
msgid ""
6912
"Number of levels to display - 0 for all, 1 for collapsed (1 is default)."
6913
msgstr ""
6914
6915
# help of 'line-number' option of 'grep' command
6916
#: bzrlib/plugins/grep/cmds.py:135
6917
msgid "show 1-based line number."
6918
msgstr ""
6919
6920
# help of 'no-recursive' option of 'grep' command
6921
#: bzrlib/plugins/grep/cmds.py:137
6922
msgid "Don't recurse into subdirectories. (default is --recursive)"
6923
msgstr ""
6924
6925
# help of 'null' option of 'grep' command
6926
#: bzrlib/plugins/grep/cmds.py:139
6927
msgid ""
6928
"Write an ASCII NUL (\\0) separator between output lines rather than a "
6929
"newline."
6930
msgstr ""
6931
6932
#: bzrlib/plugins/launchpad/account.py:66
6933
msgid "Setting ssh/sftp usernames for launchpad.net."
6934
msgstr ""
6935
6936
#: bzrlib/plugins/launchpad/cmds.py:43
6937
msgid "Register a branch with launchpad.net."
6938
msgstr ""
6939
6940
#: bzrlib/plugins/launchpad/cmds.py:45
6941
msgid ""
6942
"This command lists a bzr branch in the directory of branches on\n"
6943
"launchpad.net. Registration allows the branch to be associated with\n"
6944
"bugs or specifications."
6945
msgstr ""
6946
6947
#: bzrlib/plugins/launchpad/cmds.py:49
6948
msgid ""
6949
"Before using this command you must register the project to which the\n"
6950
"branch belongs, and create an account for yourself on launchpad.net."
6951
msgstr ""
6952
6953
#: bzrlib/plugins/launchpad/cmds.py:52
6954
msgid ""
6955
"arguments:\n"
6956
" public_url: The publicly visible url for the branch to register.\n"
6957
" This must be an http or https url (which Launchpad can read\n"
6958
" from to access the branch). Local file urls, SFTP urls, and\n"
6959
" bzr+ssh urls will not work.\n"
6960
" If no public_url is provided, bzr will use the configured\n"
6961
" public_url if there is one for the current branch, and\n"
6962
" otherwise error."
6963
msgstr ""
6964
6965
#: bzrlib/plugins/launchpad/cmds.py:61
6966
msgid ""
6967
"example:\n"
6968
" bzr register-branch http://foo.com/bzr/fooproject.mine \\\n"
6969
" --project fooproject"
6970
msgstr ""
6971
6972
# help of 'project' option of 'register-branch' command
6973
#: bzrlib/plugins/launchpad/cmds.py:68
6974
msgid "Launchpad project short name to associate with the branch."
6975
msgstr ""
6976
6977
# help of 'branch-name' option of 'register-branch' command
6978
#: bzrlib/plugins/launchpad/cmds.py:75
6979
msgid ""
6980
"Short name for the branch; by default taken from the last component of the "
6981
"url."
6982
msgstr ""
6983
6984
# help of 'branch-title' option of 'register-branch' command
6985
#: bzrlib/plugins/launchpad/cmds.py:79
6986
msgid "One-sentence description of the branch."
6987
msgstr ""
6988
6989
# help of 'branch-description' option of 'register-branch' command
6990
#: bzrlib/plugins/launchpad/cmds.py:82
6991
msgid "Longer description of the purpose or contents of the branch."
6992
msgstr ""
6993
6994
# help of 'author' option of 'register-branch' command
6995
#: bzrlib/plugins/launchpad/cmds.py:85
6996
msgid "Branch author's email address, if not yourself."
6997
msgstr ""
6998
6999
# help of 'link-bug' option of 'register-branch' command
7000
#: bzrlib/plugins/launchpad/cmds.py:88
7001
msgid "The bug this branch fixes."
7002
msgstr ""
7003
7004
# help of 'dry-run' option of 'register-branch' command
7005
#: bzrlib/plugins/launchpad/cmds.py:91
7006
msgid "Prepare the request but don't actually send it."
7007
msgstr ""
7008
7009
#: bzrlib/plugins/launchpad/cmds.py:113
7010
msgid ""
7011
"register-branch requires a public branch url - see bzr help register-branch."
7012
msgstr ""
7013
7014
#: bzrlib/plugins/launchpad/cmds.py:121
7015
msgid "--product is deprecated; please use --project."
7016
msgstr ""
7017
7018
#: bzrlib/plugins/launchpad/cmds.py:151
7019
msgid "Open a Launchpad branch page in your web browser."
7020
msgstr ""
7021
7022
# help of 'dry-run' option of 'launchpad-open' command
7023
#: bzrlib/plugins/launchpad/cmds.py:156
7024
msgid "Do not actually open the browser. Just say the URL we would use."
7025
msgstr ""
7026
7027
#: bzrlib/plugins/launchpad/cmds.py:191
7028
#, python-format
7029
msgid "Opening %s in web browser"
7030
msgstr ""
7031
7032
#: bzrlib/plugins/launchpad/cmds.py:199
7033
msgid "Show or set the Launchpad user ID."
7034
msgstr ""
7035
7036
#: bzrlib/plugins/launchpad/cmds.py:201
7037
msgid ""
7038
"When communicating with Launchpad, some commands need to know your\n"
7039
"Launchpad user ID. This command can be used to set or show the\n"
7040
"user ID that Bazaar will use for such communication."
7041
msgstr ""
7042
7043
#: bzrlib/plugins/launchpad/cmds.py:205
7044
msgid ""
7045
":Examples:\n"
7046
" Show the Launchpad ID of the current user::"
7047
msgstr ""
7048
7049
#: bzrlib/plugins/launchpad/cmds.py:208
7050
msgid " bzr launchpad-login"
7051
msgstr ""
7052
7053
#: bzrlib/plugins/launchpad/cmds.py:210
7054
msgid " Set the Launchpad ID of the current user to 'bob'::"
7055
msgstr ""
7056
7057
#: bzrlib/plugins/launchpad/cmds.py:212
7058
msgid " bzr launchpad-login bob"
7059
msgstr ""
7060
7061
# help of 'no-check' option of 'launchpad-login' command
7062
#: bzrlib/plugins/launchpad/cmds.py:219
7063
msgid "Don't check that the user name is valid."
7064
msgstr ""
7065
7066
#: bzrlib/plugins/launchpad/cmds.py:234 bzrlib/plugins/launchpad/cmds.py:245
7067
msgid "Launchpad user ID exists and has SSH keys.\n"
7068
msgstr ""
7069
7070
#: bzrlib/plugins/launchpad/cmds.py:237
7071
msgid "No Launchpad user ID configured.\n"
7072
msgstr ""
7073
7074
#: bzrlib/plugins/launchpad/cmds.py:248
7075
#, python-format
7076
msgid "Launchpad user ID set to '%s'.\n"
7077
msgstr ""
7078
7079
#: bzrlib/plugins/launchpad/cmds.py:254
7080
msgid "Ask Launchpad to mirror a branch now."
7081
msgstr ""
7082
7083
#: bzrlib/plugins/launchpad/cmds.py:271
7084
msgid "Propose merging a branch on Launchpad."
7085
msgstr ""
7086
7087
#: bzrlib/plugins/launchpad/cmds.py:273
7088
msgid ""
7089
"This will open your usual editor to provide the initial comment. When it\n"
7090
"has created the proposal, it will open it in your default web browser."
7091
msgstr ""
7092
7093
#: bzrlib/plugins/launchpad/cmds.py:276
7094
msgid ""
7095
"The branch will be proposed to merge into SUBMIT_BRANCH. If SUBMIT_BRANCH\n"
7096
"is not supplied, the remembered submit branch will be used. If no submit\n"
7097
"branch is remembered, the development focus will be used."
7098
msgstr ""
7099
7100
#: bzrlib/plugins/launchpad/cmds.py:280
7101
msgid ""
7102
"By default, the SUBMIT_BRANCH's review team will be requested to review\n"
7103
"the merge proposal. This can be overriden by specifying --review (-R).\n"
7104
"The parameter the launchpad account name of the desired reviewer. This\n"
7105
"may optionally be followed by '=' and the review type. For example:"
7106
msgstr ""
7107
7108
#: bzrlib/plugins/launchpad/cmds.py:285
7109
msgid " bzr lp-propose-merge --review jrandom --review review-team=qa"
7110
msgstr ""
7111
7112
#: bzrlib/plugins/launchpad/cmds.py:287
7113
msgid ""
7114
"This will propose a merge, request \"jrandom\" to perform a review of\n"
7115
"unspecified type, and request \"review-team\" to perform a \"qa\" review."
7116
msgstr ""
7117
7118
# help of 'staging' option of 'lp-propose-merge' command
7119
#: bzrlib/plugins/launchpad/cmds.py:292
7120
msgid "Propose the merge on staging."
7121
msgstr ""
7122
7123
# help of 'message' option of 'lp-propose-merge' command
7124
#: bzrlib/plugins/launchpad/cmds.py:294
7125
msgid "Commit message."
7126
msgstr ""
7127
7128
# help of 'approve' option of 'lp-propose-merge' command
7129
#: bzrlib/plugins/launchpad/cmds.py:296
7130
msgid ""
7131
"Mark the proposal as approved immediately, setting the approved revision to "
7132
"tip."
7133
msgstr ""
7134
7135
# help of 'fixes' option of 'lp-propose-merge' command
7136
#: bzrlib/plugins/launchpad/cmds.py:298
7137
msgid "The bug this proposal fixes."
7138
msgstr ""
7139
7140
# help of 'review' option of 'lp-propose-merge' command
7141
#: bzrlib/plugins/launchpad/cmds.py:300
7142
msgid "Requested reviewer and optional type."
7143
msgstr ""
7144
7145
#: bzrlib/plugins/launchpad/cmds.py:335
7146
msgid "Find the proposal to merge this revision."
7147
msgstr ""
7148
7149
#: bzrlib/plugins/launchpad/cmds.py:337
7150
msgid ""
7151
"Finds the merge proposal(s) that discussed landing the specified revision.\n"
7152
"This works only if the if the merged_revno was recorded for the merge\n"
7153
"proposal. The proposal(s) are opened in a web browser."
7154
msgstr ""
7155
7156
#: bzrlib/plugins/launchpad/cmds.py:341
7157
msgid ""
7158
"Only the revision specified is searched for. To find the mainline\n"
7159
"revision that merged it into mainline, use the \"mainline\" revision spec."
7160
msgstr ""
7161
7162
#: bzrlib/plugins/launchpad/cmds.py:344
7163
msgid "So, to find the merge proposal that reviewed line 1 of README::"
7164
msgstr ""
7165
7166
#: bzrlib/plugins/launchpad/cmds.py:346
7167
msgid " bzr lp-find-proposal -r mainline:annotate:README:1"
7168
msgstr ""
7169
7170
#: bzrlib/plugins/launchpad/cmds.py:365
7171
msgid "No review found."
7172
msgstr ""
7173
7174
#: bzrlib/plugins/launchpad/cmds.py:366
7175
#, python-format
7176
msgid "%d proposals(s) found."
7177
msgstr ""
7178
7179
#: bzrlib/plugins/launchpad/cmds.py:378
7180
msgid "Finding proposals"
7181
msgstr ""
7182
7183
#: bzrlib/plugins/launchpad/lp_api.py:228
7184
#: bzrlib/plugins/launchpad/lp_api.py:233
7185
#, python-format
7186
msgid "%s is not registered on Launchpad"
7187
msgstr ""
7188
7189
#: bzrlib/plugins/launchpad/lp_api.py:243
7190
#, python-format
7191
msgid "%s has no development focus."
7192
msgstr ""
7193
7194
#: bzrlib/plugins/launchpad/lp_api.py:248
7195
#, python-format
7196
msgid "development focus %s has no branch."
7197
msgstr ""
7198
7199
#: bzrlib/plugins/launchpad/lp_api.py:253
7200
#, python-format
7201
msgid "source package %s has no branch."
7202
msgstr ""
7203
7204
#: bzrlib/plugins/launchpad/lp_api.py:257
7205
#, python-format
7206
msgid "%s has no associated product or source package."
7207
msgstr ""
7208
7209
#: bzrlib/plugins/launchpad/lp_api.py:269
7210
#, python-format
7211
msgid "%s is already up-to-date."
7212
msgstr ""
7213
7214
#: bzrlib/plugins/launchpad/lp_api.py:276
7215
#, python-format
7216
msgid "Pushing to %s"
7217
msgstr ""
7218
7219
#: bzrlib/plugins/launchpad/lp_directory.py:170
7220
msgid ""
7221
"resolution for {0}\n"
7222
" local: {1}\n"
7223
" remote: {2}"
7224
msgstr ""
7225
7226
#: bzrlib/plugins/launchpad/lp_propose.py:159
7227
#, python-format
7228
msgid "There is already a branch merge proposal: %s"
7229
msgstr ""
7230
7231
#: bzrlib/plugins/weave_fmt/bzrdir.py:237
7232
msgid "pb parameter to convert() is deprecated"
7233
msgstr ""
7234
7235
#: bzrlib/plugins/weave_fmt/bzrdir.py:240
7236
msgid "starting upgrade from format 4 to 5"
7237
msgstr ""
7238
7239
#: bzrlib/plugins/weave_fmt/bzrdir.py:250
7240
msgid "note: upgrade may be faster if all store files are ungzipped first"
7241
msgstr ""
7242
7243
#: bzrlib/plugins/weave_fmt/bzrdir.py:279
7244
msgid "converting revision"
7245
msgstr ""
7246
7247
#: bzrlib/plugins/weave_fmt/bzrdir.py:284
7248
msgid "upgraded to weaves:"
7249
msgstr ""
7250
7251
#: bzrlib/plugins/weave_fmt/bzrdir.py:285
7252
#, python-format
7253
msgid "%6d revisions and inventories"
7254
msgstr ""
7255
7256
#: bzrlib/plugins/weave_fmt/bzrdir.py:287
7257
#, python-format
7258
msgid "%6d revisions not present"
7259
msgstr ""
7260
7261
#: bzrlib/plugins/weave_fmt/bzrdir.py:289
7262
#, python-format
7263
msgid "%6d texts"
7264
msgstr ""
7265
7266
#: bzrlib/plugins/weave_fmt/bzrdir.py:325
7267
msgid "writing weave"
7268
msgstr ""
7269
7270
#: bzrlib/plugins/weave_fmt/bzrdir.py:329
7271
#: bzrlib/plugins/weave_fmt/bzrdir.py:331
7272
msgid "inventory"
7273
msgstr ""
7274
7275
#: bzrlib/plugins/weave_fmt/bzrdir.py:348
7276
msgid "write revision"
7277
msgstr ""
7278
7279
#: bzrlib/plugins/weave_fmt/bzrdir.py:362
7280
msgid "loading revision"
7281
msgstr ""
7282
7283
#: bzrlib/plugins/weave_fmt/bzrdir.py:367
7284
#, python-format
7285
msgid "revision {%s} not present in branch; will be converted as a ghost"
7286
msgstr ""
7287
7288
#: bzrlib/plugins/weave_fmt/bzrdir.py:507
7289
msgid "starting upgrade from format 5 to 6"
7290
msgstr ""
7291
7292
#: bzrlib/plugins/weave_fmt/bzrdir.py:517
7293
#, python-format
7294
msgid "adding prefixes to %s"
7295
msgstr ""
7296
7297
#: bzrlib/plugins/weave_fmt/bzrdir.py:557
7298
msgid "starting upgrade from format 6 to metadir"
7299
msgstr ""
7300
7301
#: bzrlib/plugins/weave_fmt/bzrdir.py:565
7302
msgid "Removing ancestry.weave"
7303
msgstr ""
7304
7305
#: bzrlib/plugins/weave_fmt/bzrdir.py:570
7306
msgid "Finding branch files"
7307
msgstr ""
7308
7309
#: bzrlib/plugins/weave_fmt/bzrdir.py:580
7310
msgid "Upgrading repository"
7311
msgstr ""
7312
7313
#: bzrlib/plugins/weave_fmt/bzrdir.py:590
7314
msgid "Upgrading branch"
7315
msgstr ""
7316
7317
#: bzrlib/plugins/weave_fmt/bzrdir.py:613
7318
msgid "No working tree."
7319
msgstr ""
7320
7321
#: bzrlib/plugins/weave_fmt/bzrdir.py:620
7322
msgid "Upgrading working tree"
7323
msgstr ""
7324
7325
#: bzrlib/plugins/weave_fmt/bzrdir.py:641
7326
#, python-format
7327
msgid "Make %s lock"
7328
msgstr ""
7329
7330
#: bzrlib/plugins/weave_fmt/bzrdir.py:652
7331
#, python-format
7332
msgid "Moving %s"
7333
msgstr ""
7334
7335
#: bzrlib/push.py:56
7336
msgid "Created new branch."
7337
msgstr ""
7338
7339
#: bzrlib/push.py:97
7340
#, python-format
7341
msgid ""
7342
"Target directory %s already contains a .bzr directory, but it is not valid."
7343
msgstr ""
7344
7345
#: bzrlib/push.py:101
7346
#, python-format
7347
msgid ""
7348
"Target directory %s already exists, but does not have a .bzr directory. "
7349
"Supply --use-existing-dir to push there anyway."
7350
msgstr ""
7351
7352
#: bzrlib/push.py:122
7353
#, python-format
7354
msgid "Too many redirections trying to make %s."
7355
msgstr ""
7356
7357
#: bzrlib/push.py:148
7358
msgid ""
7359
"These branches have diverged. See \"bzr help diverged-branches\" for more "
7360
"information."
7361
msgstr ""
7362
7363
#: bzrlib/push.py:152
7364
#, python-format
7365
msgid ""
7366
"It is not possible to losslessly push to %s. You may want to use dpush "
7367
"instead."
7368
msgstr ""
7369
7370
#: bzrlib/push.py:158
7371
#, python-format
7372
msgid ""
7373
"At %s you have a valid .bzr control directory, but not a branch or "
7374
"repository. This is an unsupported configuration. Please move the target "
7375
"directory out of the way and try again."
7376
msgstr ""
7377
7378
#: bzrlib/reconcile.py:97
7379
#, python-format
7380
msgid "Reconciling branch %s"
7381
msgstr ""
7382
7383
#: bzrlib/reconcile.py:103
7384
#, python-format
7385
msgid "Reconciling repository %s"
7386
msgstr ""
7387
7388
#: bzrlib/reconcile.py:105
7389
msgid "Reconciling repository"
7390
msgstr ""
7391
7392
#: bzrlib/reconcile.py:111
7393
#, python-format
7394
msgid "%s cannot canonicalize CHKs."
7395
msgstr ""
7396
7397
#: bzrlib/reconcile.py:119
7398
msgid "Reconcile aborted: revision index has inconsistent parents."
7399
msgstr ""
7400
7401
#: bzrlib/reconcile.py:121
7402
msgid "Run \"bzr check\" for more details."
7403
msgstr ""
7404
7405
#: bzrlib/reconcile.py:123
7406
msgid "Reconciliation complete."
7407
msgstr ""
7408
7409
#: bzrlib/reconcile.py:166
7410
msgid "Fixing last revision info {0} => {1}"
7411
msgstr ""
7412
7413
#: bzrlib/reconcile.py:173
7414
msgid "revision_history ok."
7415
msgstr ""
7416
7417
#: bzrlib/reconcile.py:234
7418
msgid "Reading inventory data"
7419
msgstr ""
7420
7421
#: bzrlib/reconcile.py:254 bzrlib/reconcile.py:384
7422
msgid "Inventory ok."
7423
msgstr ""
7424
7425
#: bzrlib/reconcile.py:256 bzrlib/reconcile.py:386
7426
msgid "Backing up inventory"
7427
msgstr ""
7428
7429
#: bzrlib/reconcile.py:258
7430
msgid "Backup inventory created."
7431
msgstr ""
7432
7433
#: bzrlib/reconcile.py:274 bzrlib/reconcile.py:405
7434
msgid "Writing weave"
7435
msgstr ""
7436
7437
#: bzrlib/reconcile.py:277 bzrlib/reconcile.py:408
7438
msgid "Inventory regenerated."
7439
msgstr ""
7440
7441
#: bzrlib/reconcile.py:371 bzrlib/reconcile.py:373 bzrlib/reconcile.py:376
7442
msgid "Reading indexes"
7443
msgstr ""
7444
7445
#: bzrlib/reconcile.py:380 bzrlib/reconcile.py:382
7446
msgid "Checking unused inventories"
7447
msgstr ""
7448
7449
#: bzrlib/reconcile.py:388
7450
msgid "Backup Inventory created"
7451
msgstr ""
7452
7453
#: bzrlib/reconcile.py:446
7454
msgid "Fixing text parents"
7455
msgstr ""
7456
7457
#: bzrlib/reconfigure.py:54
7458
msgid "{0} is now stacked on {1}\n"
7459
msgstr ""
7460
7461
#: bzrlib/reconfigure.py:69
7462
#, python-format
7463
msgid "%s is now not stacked\n"
7464
msgstr ""
7465
7466
#: bzrlib/remote.py:1228 bzrlib/repository.py:289
7467
#, python-format
7468
msgid "bzr: ERROR (ignored): %s"
7469
msgstr ""
7470
7471
#: bzrlib/remote.py:2534
7472
msgid "Copying repository content as tarball..."
7473
msgstr ""
7474
7475
#: bzrlib/rename_map.py:69
7476
msgid "Calculating hashes"
7477
msgstr ""
7478
7479
#: bzrlib/rename_map.py:107
7480
msgid "Determining hash hits"
7481
msgstr ""
7482
7483
#: bzrlib/rename_map.py:242
7484
msgid "{0} => {1}"
7485
msgstr ""
7486
7487
#: bzrlib/repository.py:1738
7488
msgid "Moving repository to repository.backup"
7489
msgstr ""
7490
7491
#: bzrlib/repository.py:1745
7492
msgid "Creating new repository"
7493
msgstr ""
7494
7495
#: bzrlib/repository.py:1750
7496
msgid "Copying content"
7497
msgstr ""
7498
7499
#: bzrlib/repository.py:1754
7500
msgid "Deleting old repository content"
7501
msgstr ""
7502
7503
#: bzrlib/repository.py:1756
7504
msgid "repository converted"
7505
msgstr ""
7506
7507
#: bzrlib/revisionspec.py:903
7508
msgid "Using {0} {1}"
7509
msgstr ""
7510
7511
#: bzrlib/send.py:59
7512
#, python-format
7513
msgid "Mail client \"%s\" does not support specifying body"
7514
msgstr ""
7515
7516
#: bzrlib/send.py:63
7517
msgid "--remember requires a branch to be specified."
7518
msgstr ""
7519
7520
#: bzrlib/send.py:78
7521
msgid "No submit branch known or specified"
7522
msgstr ""
7523
7524
#: bzrlib/send.py:81
7525
msgid "Using saved {0} location \"{1}\" to determine what changes to submit."
7526
msgstr ""
7527
7528
#: bzrlib/send.py:99
7529
#, python-format
7530
msgid "No such send format '%s'."
7531
msgstr ""
7532
7533
#: bzrlib/send.py:115
7534
msgid "bzr send takes at most two one revision identifiers"
7535
msgstr ""
7536
7537
#: bzrlib/send.py:128
7538
msgid "No revisions to submit."
7539
msgstr ""
7540
7541
#: bzrlib/send.py:140
7542
msgid ""
7543
"- not supported for merge directives that use more than one output file."
7544
msgstr ""
7545
7546
#: bzrlib/send.py:186
7547
msgid "Format 0.9 does not permit bundle with no patch"
7548
msgstr ""
7549
7550
#: bzrlib/shelf_ui.py:46
7551
#, python-format
7552
msgid "Shelve adding file \"%(path)s\"?"
7553
msgstr ""
7554
7555
#: bzrlib/shelf_ui.py:47
7556
msgid "Shelve binary changes?"
7557
msgstr ""
7558
7559
#: bzrlib/shelf_ui.py:48
7560
msgid "Shelve changing \"%s\" from %(other)s to %(this)s?"
7561
msgstr ""
7562
7563
#: bzrlib/shelf_ui.py:50
7564
#, python-format
7565
msgid "Shelve removing file \"%(path)s\"?"
7566
msgstr ""
7567
7568
#: bzrlib/shelf_ui.py:51
7569
#, python-format
7570
msgid "Shelve %d change(s)?"
7571
msgstr ""
7572
7573
#: bzrlib/shelf_ui.py:52
7574
msgid "Shelve?"
7575
msgstr ""
7576
7577
#: bzrlib/shelf_ui.py:53
7578
#, python-format
7579
msgid ""
7580
"Shelve changing target of \"%(path)s\" from \"%(other)s\" to \"%(this)s\"?"
7581
msgstr ""
7582
7583
#: bzrlib/shelf_ui.py:55
7584
#, python-format
7585
msgid "Shelve renaming \"%(other)s\" => \"%(this)s\"?"
7586
msgstr ""
7587
7588
#: bzrlib/shelf_ui.py:70
7589
#, python-format
7590
msgid "Changes shelved with id \"%d\"."
7591
msgstr ""
7592
7593
#: bzrlib/shelf_ui.py:74
7594
msgid "Selected changes destroyed."
7595
msgstr ""
7596
7597
#: bzrlib/shelf_ui.py:78
7598
msgid "Selected changes:"
7599
msgstr ""
7600
7601
#: bzrlib/shelf_ui.py:98
7602
#, python-format
7603
msgid "Delete file \"%(path)s\"?"
7604
msgstr ""
7605
7606
#: bzrlib/shelf_ui.py:99
7607
msgid "Apply binary changes?"
7608
msgstr ""
7609
7610
#: bzrlib/shelf_ui.py:100
7611
#, python-format
7612
msgid "Change \"%(path)s\" from %(this)s to %(other)s?"
7613
msgstr ""
7614
7615
#: bzrlib/shelf_ui.py:102
7616
#, python-format
7617
msgid "Add file \"%(path)s\"?"
7618
msgstr ""
7619
7620
#: bzrlib/shelf_ui.py:103
7621
#, python-format
7622
msgid "Apply %d change(s)?"
7623
msgstr ""
7624
7625
#: bzrlib/shelf_ui.py:104
7626
msgid "Apply change?"
7627
msgstr ""
7628
7629
#: bzrlib/shelf_ui.py:105
7630
#, python-format
7631
msgid "Change target of \"%(path)s\" from \"%(this)s\" to \"%(other)s\"?"
7632
msgstr ""
7633
7634
#: bzrlib/shelf_ui.py:107
7635
#, python-format
7636
msgid "Rename \"%(this)s\" => \"%(other)s\"?"
7637
msgstr ""
7638
7639
#: bzrlib/shelf_ui.py:402
7640
msgid "No changes are shelved."
7641
msgstr ""
7642
7643
#: bzrlib/shelf_ui.py:460
7644
#, python-format
7645
msgid "Using changes with id \"%d\"."
7646
msgstr ""
7647
7648
#: bzrlib/shelf_ui.py:464
7649
#, python-format
7650
msgid "Message: %s"
7651
msgstr ""
7652
7653
#: bzrlib/shelf_ui.py:476
7654
#, python-format
7655
msgid "Deleted changes with id \"%d\"."
7656
msgstr ""
7657
7658
#: bzrlib/smart/medium.py:714
7659
msgid "HPSS calls: {0} ({1} vfs) {2}"
7660
msgstr ""
7661
7662
#: bzrlib/smart/ping.py:32
7663
msgid "Pings a Bazaar smart server."
7664
msgstr ""
7665
7666
#: bzrlib/smart/ping.py:34
7667
msgid ""
7668
"This command sends a 'hello' request to the given location using the bzr\n"
7669
"smart protocol, and reports the response."
7670
msgstr ""
7671
7672
#: bzrlib/smart/server.py:169
7673
msgid "Requested to stop gracefully"
7674
msgstr ""
7675
7676
#: bzrlib/smart/server.py:179
7677
#, python-format
7678
msgid "Waiting for %d client(s) to finish"
7679
msgstr ""
7680
7681
#: bzrlib/smart/server.py:185
7682
#, python-format
7683
msgid "Still waiting for %d client(s) to finish"
7684
msgstr ""
7685
7686
#: bzrlib/smart/server.py:219
7687
#, python-format
7688
msgid "listening socket error: %s"
7689
msgstr ""
7690
7691
#: bzrlib/smart/server.py:452
7692
#, python-format
7693
msgid "listening on port: %s"
7694
msgstr ""
7695
7696
#: bzrlib/switch.py:84
7697
msgid "Pending merges must be committed or reverted before using switch."
7698
msgstr ""
7699
7700
#: bzrlib/switch.py:111
7701
msgid ""
7702
"Cannot switch as local commits found in the checkout. Commit these to the "
7703
"bound branch or use --force to throw them away."
7704
msgstr ""
7705
7706
#: bzrlib/switch.py:116
7707
#, python-format
7708
msgid ""
7709
"Unable to connect to current master branch %(target)s: %(error)s To switch "
7710
"anyway, use --force."
7711
msgstr ""
7712
7713
#: bzrlib/switch.py:140
7714
msgid "Cannot switch a branch, only a checkout."
7715
msgstr ""
7716
7717
#: bzrlib/switch.py:183
7718
#, python-format
7719
msgid "Tree is up to date at revision %d."
7720
msgstr ""
7721
7722
#: bzrlib/switch.py:190
7723
#, python-format
7724
msgid "Updated to revision %d."
7725
msgstr ""
7726
7727
#: bzrlib/transform.py:1723 bzrlib/transform.py:1734 bzrlib/transform.py:1736
7728
msgid "Apply phase"
7729
msgstr ""
7730
7731
#: bzrlib/transform.py:1762 bzrlib/transform.py:1830
7732
msgid "removing file"
7733
msgstr ""
7734
7735
#: bzrlib/transform.py:1780 bzrlib/transform.py:1865
7736
msgid "adding file"
7737
msgstr ""
7738
7739
#: bzrlib/transform.py:2598
7740
msgid "Building tree"
7741
msgstr ""
7742
7743
#: bzrlib/transform.py:2688 bzrlib/transform.py:2715
7744
msgid "Adding file contents"
7745
msgstr ""
7746
7747
#: bzrlib/transform.py:3017
7748
msgid "Resolution pass"
7749
msgstr ""
7750
7751
#: bzrlib/transport/ftp/_gssapi.py:88
7752
#, python-format
7753
msgid "Authenticated as %s"
7754
msgstr ""
7755
7756
#: bzrlib/tree.py:647
7757
msgid "*** {0} content-filter: {1} => {2!r}"
7758
msgstr ""
7759
7760
#: bzrlib/upgrade.py:77
7761
#, python-format
7762
msgid "This is a checkout. The branch (%s) needs to be upgraded separately."
7763
msgstr ""
7764
7765
#: bzrlib/upgrade.py:100
7766
#, python-format
7767
msgid "cannot upgrade from bzrdir format %s"
7768
msgstr ""
7769
7770
#: bzrlib/upgrade.py:103
7771
#, python-format
7772
msgid "starting upgrade of %s"
7773
msgstr ""
7774
7775
#: bzrlib/upgrade.py:110
7776
msgid "finished"
7777
msgstr ""
7778
7779
#: bzrlib/upgrade.py:120
7780
msgid "Deleting backup.bzr"
7781
msgstr ""
7782
7783
#: bzrlib/upgrade.py:151
7784
msgid ""
7785
"\n"
7786
"SUMMARY: {0} upgrades attempted, {1} succeeded, {2} failed"
7787
msgstr ""
7788
7789
#: bzrlib/upgrade.py:208
7790
#, python-format
7791
msgid "Found %d dependent branches - upgrading ..."
7792
msgstr ""
7793
7794
#: bzrlib/upgrade.py:276
7795
msgid "Upgrading bzrdirs"
7796
msgstr ""
7797
7798
#: bzrlib/upgrade.py:282
7799
#, python-format
7800
msgid "Upgrading %s"
7801
msgstr ""
7802
7803
#: bzrlib/upgrade.py:283
7804
msgid "Upgrading {0} {1} ..."
7805
msgstr ""
7806
7807
#: bzrlib/upgrade.py:301
7808
msgid "Removing backup ..."
7809
msgstr ""
7810
7811
#: bzrlib/upgrade.py:305
7812
msgid "failed to clean-up {0}: {1}"
7813
msgstr ""
7814
7815
#: bzrlib/vf_repository.py:1091
7816
msgid "inventories"
7817
msgstr ""
7818
7819
#: bzrlib/vf_repository.py:1117
7820
msgid "texts"
7821
msgstr ""
7822
7823
#: bzrlib/vf_repository.py:1622 bzrlib/vf_repository.py:1631
7824
msgid "Calculating text parents"
7825
msgstr ""
7826
7827
#: bzrlib/vf_repository.py:1707
7828
msgid "Fetch texts"
7829
msgstr ""
7830
7831
#: bzrlib/vf_repository.py:2536
7832
msgid "loading text store"
7833
msgstr ""
7834
7835
#: bzrlib/vf_repository.py:2542
7836
msgid "checking text graph"
7837
msgstr ""
7838
7839
#: bzrlib/vf_repository.py:2998 bzrlib/vf_repository.py:3012
7840
#: bzrlib/vf_repository.py:3127
7841
msgid "Transferring revisions"
7842
msgstr ""
7843
7844
#: bzrlib/win32utils.py:146
7845
msgid "Failed to GetProcessMemoryInfo()"
7846
msgstr ""
7847
7848
#: bzrlib/win32utils.py:167
7849
msgid "Cannot debug memory on win32 without ctypes or win32process"
7850
msgstr ""
7851
7852
#: bzrlib/win32utils.py:172
7853
msgid "WorkingSize {0:>7}KiB\tPeakWorking {1:>7}KiB\t{2}"
7854
msgstr ""
7855
7856
#: bzrlib/win32utils.py:180
7857
#, python-format
7858
msgid "WorkingSize %8d KiB"
7859
msgstr ""
7860
7861
#: bzrlib/win32utils.py:181
7862
#, python-format
7863
msgid "PeakWorking %8d KiB"
7864
msgstr ""
7865
7866
#: bzrlib/win32utils.py:182
7867
#, python-format
7868
msgid "PagefileUsage %8d KiB"
7869
msgstr ""
7870
7871
#: bzrlib/win32utils.py:183
7872
#, python-format
7873
msgid "PeakPagefileUsage %8d KiB"
7874
msgstr ""
7875
7876
#: bzrlib/win32utils.py:185
7877
#, python-format
7878
msgid "PrivateUsage %8d KiB"
7879
msgstr ""
7880
7881
#: bzrlib/win32utils.py:186
7882
#, python-format
7883
msgid "PageFaultCount %8d"
7884
msgstr ""
7885
7886
#: bzrlib/workingtree.py:1516
7887
msgid "Rerun update after fixing the conflicts."
7888
msgstr ""
7889
7890
#: dummy/help_topics/authentication/summary.txt:1
7891
msgid "Information on configuring authentication"
7892
msgstr ""
7893
7894
#: dummy/help_topics/basic/detail.txt:1
7895
msgid ""
7896
"Bazaar 2.6.0 -- a free distributed version-control tool\n"
7897
"http://bazaar.canonical.com/"
7898
msgstr ""
7899
7900
#: dummy/help_topics/basic/detail.txt:4
7901
msgid ""
7902
"Basic commands:\n"
7903
" bzr init makes this directory a versioned branch\n"
7904
" bzr branch make a copy of another branch"
7905
msgstr ""
7906
7907
#: dummy/help_topics/basic/detail.txt:8
7908
msgid ""
7909
" bzr add make files or directories versioned\n"
7910
" bzr ignore ignore a file or pattern\n"
7911
" bzr mv move or rename a versioned file"
7912
msgstr ""
7913
7914
#: dummy/help_topics/basic/detail.txt:12
7915
msgid ""
7916
" bzr status summarize changes in working copy\n"
7917
" bzr diff show detailed diffs"
7918
msgstr ""
7919
7920
#: dummy/help_topics/basic/detail.txt:15
7921
msgid ""
7922
" bzr merge pull in changes from another branch\n"
7923
" bzr commit save some or all changes\n"
7924
" bzr send send changes via email"
7925
msgstr ""
7926
7927
#: dummy/help_topics/basic/detail.txt:19
7928
msgid ""
7929
" bzr log show history of changes\n"
7930
" bzr check validate storage"
7931
msgstr ""
7932
7933
#: dummy/help_topics/basic/detail.txt:22
7934
msgid ""
7935
" bzr help init more help on e.g. init command\n"
7936
" bzr help commands list all commands\n"
7937
" bzr help topics list all help topics\n"
7938
msgstr ""
7939
7940
#: dummy/help_topics/basic/summary.txt:1
7941
msgid "Basic commands"
7942
msgstr ""
7943
7944
#: dummy/help_topics/branches/detail.txt:1
7945
msgid "Branches"
7946
msgstr ""
7947
7948
#: dummy/help_topics/branches/detail.txt:3
7949
msgid ""
7950
"A branch consists of the state of a project, including all of its\n"
7951
"history. All branches have a repository associated (which is where the\n"
7952
"branch history is stored), but multiple branches may share the same\n"
7953
"repository (a shared repository). Branches can be copied and merged."
7954
msgstr ""
7955
7956
#: dummy/help_topics/branches/detail.txt:8
7957
msgid ""
7958
"In addition, one branch may be bound to another one. Binding to another\n"
7959
"branch indicates that commits which happen in this branch must also \n"
7960
"happen in the other branch. Bazaar ensures consistency by not allowing \n"
7961
"commits when the two branches are out of date. In order for a commit \n"
7962
"to succeed, it may be necessary to update the current branch using \n"
7963
"``bzr update``."
7964
msgstr ""
7965
7966
#: dummy/help_topics/branches/detail.txt:15
7967
#: dummy/help_topics/checkouts/detail.txt:66
7968
#: dummy/help_topics/repositories/detail.txt:36
7969
msgid "Related commands::"
7970
msgstr ""
7971
7972
#: dummy/help_topics/branches/detail.txt:17
7973
msgid ""
7974
" init Change a directory into a versioned branch.\n"
7975
" branch Create a new branch that is a copy of an existing branch.\n"
7976
" merge Perform a three-way merge.\n"
7977
" bind Bind a branch to another one.\n"
7978
msgstr ""
7979
7980
#: dummy/help_topics/branches/summary.txt:1
7981
msgid "Information on what a branch is"
7982
msgstr ""
7983
7984
#: dummy/help_topics/bugs/summary.txt:1
7985
msgid "Bug tracker settings"
7986
msgstr ""
7987
7988
#: dummy/help_topics/checkouts/detail.txt:1
7989
msgid "Checkouts"
7990
msgstr ""
7991
7992
#: dummy/help_topics/checkouts/detail.txt:3
7993
msgid ""
7994
"Checkouts are source trees that are connected to a branch, so that when\n"
7995
"you commit in the source tree, the commit goes into that branch. They\n"
7996
"allow you to use a simpler, more centralized workflow, ignoring some of\n"
7997
"Bazaar's decentralized features until you want them. Using checkouts\n"
7998
"with shared repositories is very similar to working with SVN or CVS, but\n"
7999
"doesn't have the same restrictions. And using checkouts still allows\n"
8000
"others working on the project to use whatever workflow they like."
8001
msgstr ""
8002
8003
#: dummy/help_topics/checkouts/detail.txt:11
8004
msgid ""
8005
"A checkout is created with the bzr checkout command (see \"help checkout"
8006
"\").\n"
8007
"You pass it a reference to another branch, and it will create a local copy\n"
8008
"for you that still contains a reference to the branch you created the\n"
8009
"checkout from (the master branch). Then if you make any commits they will "
8010
"be\n"
8011
"made on the other branch first. This creates an instant mirror of your work, "
8012
"or\n"
8013
"facilitates lockstep development, where each developer is working together,\n"
8014
"continuously integrating the changes of others."
8015
msgstr ""
8016
8017
#: dummy/help_topics/checkouts/detail.txt:19
8018
msgid ""
8019
"However the checkout is still a first class branch in Bazaar terms, so that\n"
8020
"you have the full history locally. As you have a first class branch you "
8021
"can\n"
8022
"also commit locally if you want, for instance due to the temporary loss af "
8023
"a\n"
8024
"network connection. Use the --local option to commit to do this. All the "
8025
"local\n"
8026
"commits will then be made on the master branch the next time you do a non-"
8027
"local\n"
8028
"commit."
8029
msgstr ""
8030
8031
#: dummy/help_topics/checkouts/detail.txt:26
8032
msgid ""
8033
"If you are using a checkout from a shared branch you will periodically want "
8034
"to\n"
8035
"pull in all the changes made by others. This is done using the \"update\"\n"
8036
"command. The changes need to be applied before any non-local commit, but\n"
8037
"Bazaar will tell you if there are any changes and suggest that you use this\n"
8038
"command when needed."
8039
msgstr ""
8040
8041
#: dummy/help_topics/checkouts/detail.txt:32
8042
msgid ""
8043
"It is also possible to create a \"lightweight\" checkout by passing the\n"
8044
"--lightweight flag to checkout. A lightweight checkout is even closer to an\n"
8045
"SVN checkout in that it is not a first class branch, it mainly consists of "
8046
"the\n"
8047
"working tree. This means that any history operations must query the master\n"
8048
"branch, which could be slow if a network connection is involved. Also, as "
8049
"you\n"
8050
"don't have a local branch, then you cannot commit locally."
8051
msgstr ""
8052
8053
#: dummy/help_topics/checkouts/detail.txt:39
8054
msgid ""
8055
"Lightweight checkouts work best when you have fast reliable access to the\n"
8056
"master branch. This means that if the master branch is on the same disk or "
8057
"LAN\n"
8058
"a lightweight checkout will be faster than a heavyweight one for any "
8059
"commands\n"
8060
"that modify the revision history (as only one copy of the branch needs to\n"
8061
"be updated). Heavyweight checkouts will generally be faster for any command\n"
8062
"that uses the history but does not change it, but if the master branch is "
8063
"on\n"
8064
"the same disk then there won't be a noticeable difference."
8065
msgstr ""
8066
8067
#: dummy/help_topics/checkouts/detail.txt:47
8068
msgid ""
8069
"Another possible use for a checkout is to use it with a treeless repository\n"
8070
"containing your branches, where you maintain only one working tree by\n"
8071
"switching the master branch that the checkout points to when you want to\n"
8072
"work on a different branch."
8073
msgstr ""
8074
8075
#: dummy/help_topics/checkouts/detail.txt:52
8076
msgid ""
8077
"Obviously to commit on a checkout you need to be able to write to the "
8078
"master\n"
8079
"branch. This means that the master branch must be accessible over a "
8080
"writeable\n"
8081
"protocol , such as sftp://, and that you have write permissions at the "
8082
"other\n"
8083
"end. Checkouts also work on the local file system, so that all that matters "
8084
"is\n"
8085
"file permissions."
8086
msgstr ""
8087
8088
#: dummy/help_topics/checkouts/detail.txt:58
8089
msgid ""
8090
"You can change the master of a checkout by using the \"switch\" command "
8091
"(see\n"
8092
"\"help switch\"). This will change the location that the commits are sent "
8093
"to.\n"
8094
"The \"bind\" command can also be used to turn a normal branch into a heavy\n"
8095
"checkout. If you would like to convert your heavy checkout into a normal\n"
8096
"branch so that every commit is local, you can use the \"unbind\" command. To "
8097
"see\n"
8098
"whether or not a branch is bound or not you can use the \"info\" command. If "
8099
"the\n"
8100
"branch is bound it will tell you the location of the bound branch."
8101
msgstr ""
8102
8103
#: dummy/help_topics/checkouts/detail.txt:68
8104
msgid ""
8105
" checkout Create a checkout. Pass --lightweight to get a lightweight\n"
8106
" checkout\n"
8107
" update Pull any changes in the master branch in to your checkout\n"
8108
" commit Make a commit that is sent to the master branch. If you have\n"
8109
" a heavy checkout then the --local option will commit to the\n"
8110
" checkout without sending the commit to the master\n"
8111
" switch Change the master branch that the commits in the checkout "
8112
"will\n"
8113
" be sent to\n"
8114
" bind Turn a standalone branch into a heavy checkout so that any\n"
8115
" commits will be sent to the master branch\n"
8116
" unbind Turn a heavy checkout into a standalone branch so that any\n"
8117
" commits are only made locally\n"
8118
" info Displays whether a branch is bound or unbound. If the branch "
8119
"is\n"
8120
" bound, then it will also display the location of the bound "
8121
"branch\n"
8122
msgstr ""
8123
8124
#: dummy/help_topics/checkouts/summary.txt:1
8125
msgid "Information on what a checkout is"
8126
msgstr ""
8127
8128
#: dummy/help_topics/commands/summary.txt:1
8129
msgid "Basic help for all commands"
8130
msgstr ""
8131
8132
#: dummy/help_topics/configuration/summary.txt:1
8133
msgid "Details on the configuration settings available"
8134
msgstr ""
8135
8136
#: dummy/help_topics/conflict-types/summary.txt:1
8137
msgid "Types of conflicts and what to do about them"
8138
msgstr ""
8139
8140
#: dummy/help_topics/content-filters/summary.txt:1
8141
msgid "Conversion of content into/from working trees"
8142
msgstr ""
8143
8144
#: dummy/help_topics/criss-cross/detail.txt:1
8145
msgid "Criss-Cross"
8146
msgstr ""
8147
8148
#: dummy/help_topics/criss-cross/detail.txt:3
8149
msgid ""
8150
"A criss-cross in the branch history can cause the default merge technique\n"
8151
"to emit more conflicts than would normally be expected."
8152
msgstr ""
8153
8154
#: dummy/help_topics/criss-cross/detail.txt:6
8155
msgid ""
8156
"In complex merge cases, ``bzr merge --lca`` or ``bzr merge --weave`` may "
8157
"give\n"
8158
"better results. You may wish to ``bzr revert`` the working tree and merge\n"
8159
"again. Alternatively, use ``bzr remerge`` on particular conflicted files."
8160
msgstr ""
8161
8162
#: dummy/help_topics/criss-cross/detail.txt:10
8163
msgid ""
8164
"Criss-crosses occur in a branch's history if two branches merge the same "
8165
"thing\n"
8166
"and then merge one another, or if two branches merge one another at the "
8167
"same\n"
8168
"time. They can be avoided by having each branch only merge from or into a\n"
8169
"designated central branch (a \"star topology\")."
8170
msgstr ""
8171
8172
#: dummy/help_topics/criss-cross/detail.txt:15
8173
msgid ""
8174
"Criss-crosses cause problems because of the way merge works. Bazaar's "
8175
"default\n"
8176
"merge is a three-way merger; in order to merge OTHER into THIS, it must\n"
8177
"find a basis for comparison, BASE. Using BASE, it can determine whether\n"
8178
"differences between THIS and OTHER are due to one side adding lines, or\n"
8179
"from another side removing lines."
8180
msgstr ""
8181
8182
#: dummy/help_topics/criss-cross/detail.txt:21
8183
msgid ""
8184
"Criss-crosses mean there is no good choice for a base. Selecting the "
8185
"recent\n"
8186
"merge points could cause one side's changes to be silently discarded.\n"
8187
"Selecting older merge points (which Bazaar does) mean that extra conflicts\n"
8188
"are emitted."
8189
msgstr ""
8190
8191
#: dummy/help_topics/criss-cross/detail.txt:26
8192
msgid ""
8193
"The ``weave`` merge type is not affected by this problem because it uses\n"
8194
"line-origin detection instead of a basis revision to determine the cause of\n"
8195
"differences.\n"
8196
msgstr ""
8197
8198
#: dummy/help_topics/criss-cross/summary.txt:1
8199
msgid "Information on criss-cross merging"
8200
msgstr ""
8201
8202
#: dummy/help_topics/current-formats/summary.txt:1
8203
msgid "Current storage formats"
8204
msgstr ""
8205
8206
#: dummy/help_topics/debug-flags/summary.txt:1
8207
msgid "Options to show or record debug information"
8208
msgstr ""
8209
8210
#: dummy/help_topics/diverged-branches/summary.txt:1
8211
msgid "How to fix diverged branches"
8212
msgstr ""
8213
8214
#: dummy/help_topics/env-variables/summary.txt:1
8215
msgid "Environment variable names and values"
8216
msgstr ""
8217
8218
#: dummy/help_topics/eol/summary.txt:1
8219
msgid "Information on end-of-line handling"
8220
msgstr ""
8221
8222
#: dummy/help_topics/files/detail.txt:1
8223
msgid "Files"
8224
msgstr ""
8225
8226
#: dummy/help_topics/files/detail.txt:3
8227
msgid ""
8228
":On Unix: ~/.bazaar/bazaar.conf\n"
8229
":On Windows: C:\\\\Documents and Settings\\\\username\\\\Application Data\\"
8230
"\\bazaar\\\\2.0\\\\bazaar.conf"
8231
msgstr ""
8232
8233
#: dummy/help_topics/files/detail.txt:6
8234
msgid ""
8235
"Contains the user's default configuration. The section ``[DEFAULT]`` is\n"
8236
"used to define general configuration that will be applied everywhere.\n"
8237
"The section ``[ALIASES]`` can be used to create command aliases for\n"
8238
"commonly used options."
8239
msgstr ""
8240
8241
#: dummy/help_topics/files/detail.txt:11
8242
msgid "A typical config file might look something like::"
8243
msgstr ""
8244
8245
#: dummy/help_topics/files/detail.txt:13
8246
msgid ""
8247
" [DEFAULT]\n"
8248
" email=John Doe <jdoe@isp.com>"
8249
msgstr ""
8250
8251
#: dummy/help_topics/files/detail.txt:16
8252
msgid ""
8253
" [ALIASES]\n"
8254
" commit = commit --strict\n"
8255
" log10 = log --short -r -10..-1\n"
8256
msgstr ""
8257
8258
#: dummy/help_topics/files/summary.txt:1
8259
msgid "Information on configuration and log files"
8260
msgstr ""
8261
8262
#: dummy/help_topics/formats/detail.txt:1
8263
msgid "Storage Formats"
8264
msgstr ""
8265
8266
#: dummy/help_topics/formats/detail.txt:3
8267
msgid ""
8268
"To ensure that older clients do not access data incorrectly,\n"
8269
"Bazaar's policy is to introduce a new storage format whenever\n"
8270
"new features requiring new metadata are added. New storage\n"
8271
"formats may also be introduced to improve performance and\n"
8272
"scalability."
8273
msgstr ""
8274
8275
#: dummy/help_topics/formats/detail.txt:9
8276
msgid ""
8277
"The newest format, 2a, is highly recommended. If your\n"
8278
"project is not using 2a, then you should suggest to the\n"
8279
"project owner to upgrade."
8280
msgstr ""
8281
8282
#: dummy/help_topics/formats/detail.txt:13
8283
msgid ""
8284
"\n"
8285
".. note::"
8286
msgstr ""
8287
8288
#: dummy/help_topics/formats/detail.txt:16
8289
msgid ""
8290
" Some of the older formats have two variants:\n"
8291
" a plain one and a rich-root one. The latter include an additional\n"
8292
" field about the root of the tree. There is no performance cost\n"
8293
" for using a rich-root format but you cannot easily merge changes\n"
8294
" from a rich-root format into a plain format. As a consequence,\n"
8295
" moving a project to a rich-root format takes some co-ordination\n"
8296
" in that all contributors need to upgrade their repositories\n"
8297
" around the same time. 2a and all future formats will be\n"
8298
" implicitly rich-root."
8299
msgstr ""
8300
8301
#: dummy/help_topics/formats/detail.txt:26
8302
msgid ""
8303
"See :doc:`current-formats-help` for the complete list of\n"
8304
"currently supported formats. See :doc:`other-formats-help` for\n"
8305
"descriptions of any available experimental and deprecated formats.\n"
8306
msgstr ""
8307
8308
#: dummy/help_topics/formats/summary.txt:1
8309
msgid "Information on choosing a storage format"
8310
msgstr ""
8311
8312
#: dummy/help_topics/global-options/detail.txt:1
8313
msgid "Global Options"
8314
msgstr ""
8315
8316
#: dummy/help_topics/global-options/detail.txt:3
8317
msgid ""
8318
"These options may be used with any command, and may appear in front of any\n"
8319
"command. (e.g. ``bzr --profile help``)."
8320
msgstr ""
8321
8322
#: dummy/help_topics/global-options/detail.txt:6
8323
msgid ""
8324
"--version Print the version number. Must be supplied before the "
8325
"command.\n"
8326
"--no-aliases Do not process command aliases when running this command.\n"
8327
"--builtin Use the built-in version of a command, not the plugin "
8328
"version.\n"
8329
" This does not suppress other plugin effects.\n"
8330
"--no-plugins Do not process any plugins.\n"
8331
"--no-l10n Do not translate messages.\n"
8332
"--concurrency Number of processes that can be run concurrently (selftest)."
8333
msgstr ""
8334
8335
#: dummy/help_topics/global-options/detail.txt:14
8336
msgid ""
8337
"--profile Profile execution using the hotshot profiler.\n"
8338
"--lsprof Profile execution using the lsprof profiler.\n"
8339
"--lsprof-file Profile execution using the lsprof profiler, and write the\n"
8340
" results to a specified file. If the filename ends with \".txt"
8341
"\",\n"
8342
" text format will be used. If the filename either starts "
8343
"with\n"
8344
" \"callgrind.out\" or end with \".callgrind\", the output will "
8345
"be\n"
8346
" formatted for use with KCacheGrind. Otherwise, the output\n"
8347
" will be a pickle.\n"
8348
"--coverage Generate line coverage report in the specified directory."
8349
msgstr ""
8350
8351
#: dummy/help_topics/global-options/detail.txt:24
8352
msgid ""
8353
"-Oname=value Override the ``name`` config option setting it to ``value`` "
8354
"for\n"
8355
" the duration of the command. This can be used multiple times "
8356
"if\n"
8357
" several options need to be overridden."
8358
msgstr ""
8359
8360
#: dummy/help_topics/global-options/detail.txt:28
8361
msgid ""
8362
"See http://doc.bazaar.canonical.com/developers/profiling.html for more\n"
8363
"information on profiling."
8364
msgstr ""
8365
8366
#: dummy/help_topics/global-options/detail.txt:31
8367
msgid ""
8368
"A number of debug flags are also available to assist troubleshooting and\n"
8369
"development. See :doc:`debug-flags-help`.\n"
8370
msgstr ""
8371
8372
#: dummy/help_topics/global-options/summary.txt:1
8373
msgid "Options that control how Bazaar runs"
8374
msgstr ""
8375
8376
#: dummy/help_topics/hidden-commands/summary.txt:1
8377
msgid "All hidden commands"
8378
msgstr ""
8379
8380
#: dummy/help_topics/hooks/summary.txt:1
8381
msgid "Points at which custom processing can be added"
8382
msgstr ""
8383
8384
#: dummy/help_topics/launchpad/detail.txt:1
8385
msgid "Integration with Launchpad.net"
8386
msgstr ""
8387
8388
#: dummy/help_topics/launchpad/detail.txt:3
8389
msgid ""
8390
"Launchpad.net provides free Bazaar branch hosting with integrated bug and\n"
8391
"specification tracking."
8392
msgstr ""
8393
8394
#: dummy/help_topics/launchpad/detail.txt:6
8395
msgid ""
8396
"The bzr client (through the plugin called 'launchpad') has special\n"
8397
"features to communicate with Launchpad:"
8398
msgstr ""
8399
8400
#: dummy/help_topics/launchpad/detail.txt:9
8401
msgid ""
8402
" * The launchpad-login command tells Bazaar your Launchpad user name. "
8403
"This\n"
8404
" is then used by the 'lp:' transport to download your branches using\n"
8405
" bzr+ssh://."
8406
msgstr ""
8407
8408
#: dummy/help_topics/launchpad/detail.txt:13
8409
msgid ""
8410
" * The 'lp:' transport uses Launchpad as a directory service: for "
8411
"example\n"
8412
" 'lp:bzr' and 'lp:python' refer to the main branches of the relevant\n"
8413
" projects and may be branched, logged, etc. You can also use the 'lp:'\n"
8414
" transport to refer to specific branches, e.g. lp:~bzr/bzr/trunk."
8415
msgstr ""
8416
8417
#: dummy/help_topics/launchpad/detail.txt:18
8418
msgid ""
8419
" * The 'lp:' bug tracker alias can expand launchpad bug numbers to their\n"
8420
" URLs for use with 'bzr commit --fixes', e.g. 'bzr commit --fixes "
8421
"lp:12345'\n"
8422
" will record a revision property that marks that revision as fixing\n"
8423
" Launchpad bug 12345. When you push that branch to Launchpad it will\n"
8424
" automatically be linked to the bug report."
8425
msgstr ""
8426
8427
#: dummy/help_topics/launchpad/detail.txt:24
8428
msgid ""
8429
" * The register-branch command tells Launchpad about the url of a\n"
8430
" public branch. Launchpad will then mirror the branch, display\n"
8431
" its contents and allow it to be attached to bugs and other\n"
8432
" objects."
8433
msgstr ""
8434
8435
#: dummy/help_topics/launchpad/detail.txt:29
8436
msgid "For more information see http://help.launchpad.net/\n"
8437
msgstr ""
8438
8439
#: dummy/help_topics/launchpad/summary.txt:1
8440
msgid "Using Bazaar with Launchpad.net"
8441
msgstr ""
8442
8443
#: dummy/help_topics/location-alias/summary.txt:1
8444
msgid "Aliases for remembered locations"
8445
msgstr ""
8446
8447
#: dummy/help_topics/log-formats/summary.txt:1
8448
msgid "Details on the logging formats available"
8449
msgstr ""
8450
8451
#: dummy/help_topics/other-formats/summary.txt:1
8452
msgid "Experimental and deprecated storage formats"
8453
msgstr ""
8454
8455
#: dummy/help_topics/patterns/summary.txt:1
8456
msgid "Information on the pattern syntax"
8457
msgstr ""
8458
8459
#: dummy/help_topics/repositories/detail.txt:1
8460
msgid "Repositories"
8461
msgstr ""
8462
8463
#: dummy/help_topics/repositories/detail.txt:3
8464
msgid ""
8465
"Repositories in Bazaar are where committed information is stored. There is\n"
8466
"a repository associated with every branch."
8467
msgstr ""
8468
8469
#: dummy/help_topics/repositories/detail.txt:6
8470
msgid ""
8471
"Repositories are a form of database. Bzr will usually maintain this for\n"
8472
"good performance automatically, but in some situations (e.g. when doing\n"
8473
"very many commits in a short time period) you may want to ask bzr to\n"
8474
"optimise the database indices. This can be done by the 'bzr pack' command."
8475
msgstr ""
8476
8477
#: dummy/help_topics/repositories/detail.txt:11
8478
msgid ""
8479
"By default just running 'bzr init' will create a repository within the new\n"
8480
"branch but it is possible to create a shared repository which allows "
8481
"multiple\n"
8482
"branches to share their information in the same location. When a new branch "
8483
"is\n"
8484
"created it will first look to see if there is a containing shared repository "
8485
"it\n"
8486
"can use."
8487
msgstr ""
8488
8489
#: dummy/help_topics/repositories/detail.txt:17
8490
msgid ""
8491
"When two branches of the same project share a repository, there is\n"
8492
"generally a large space saving. For some operations (e.g. branching\n"
8493
"within the repository) this translates in to a large time saving."
8494
msgstr ""
8495
8496
#: dummy/help_topics/repositories/detail.txt:21
8497
msgid ""
8498
"To create a shared repository use the init-repository command (or the alias\n"
8499
"init-repo). This command takes the location of the repository to create. "
8500
"This\n"
8501
"means that 'bzr init-repository repo' will create a directory named 'repo',\n"
8502
"which contains a shared repository. Any new branches that are created in "
8503
"this\n"
8504
"directory will then use it for storage."
8505
msgstr ""
8506
8507
#: dummy/help_topics/repositories/detail.txt:27
8508
msgid ""
8509
"It is a good idea to create a repository whenever you might create more\n"
8510
"than one branch of a project. This is true for both working areas where you\n"
8511
"are doing the development, and any server areas that you use for hosting\n"
8512
"projects. In the latter case, it is common to want branches without working\n"
8513
"trees. Since the files in the branch will not be edited directly there is "
8514
"no\n"
8515
"need to use up disk space for a working tree. To create a repository in "
8516
"which\n"
8517
"the branches will not have working trees pass the '--no-trees' option to\n"
8518
"'init-repository'."
8519
msgstr ""
8520
8521
#: dummy/help_topics/repositories/detail.txt:38
8522
msgid ""
8523
" init-repository Create a shared repository. Use --no-trees to create "
8524
"one\n"
8525
" in which new branches won't get a working tree.\n"
8526
msgstr ""
8527
8528
#: dummy/help_topics/repositories/summary.txt:1
8529
msgid "Basic information on shared repositories."
8530
msgstr ""
8531
8532
#: dummy/help_topics/revisionspec/summary.txt:1
8533
msgid "Explain how to use --revision"
8534
msgstr ""
8535
8536
#: dummy/help_topics/rules/summary.txt:1
8537
msgid "Information on defining rule-based preferences"
8538
msgstr ""
8539
8540
#: dummy/help_topics/standalone-trees/detail.txt:1
8541
msgid "Standalone Trees"
8542
msgstr ""
8543
8544
#: dummy/help_topics/standalone-trees/detail.txt:3
8545
msgid ""
8546
"A standalone tree is a working tree with an associated repository. It\n"
8547
"is an independently usable branch, with no dependencies on any other.\n"
8548
"Creating a standalone tree (via bzr init) is the quickest way to put\n"
8549
"an existing project under version control."
8550
msgstr ""
8551
8552
#: dummy/help_topics/standalone-trees/detail.txt:8
8553
msgid "Related Commands::"
8554
msgstr ""
8555
8556
#: dummy/help_topics/standalone-trees/detail.txt:10
8557
msgid " init Make a directory into a versioned branch.\n"
8558
msgstr ""
8559
8560
#: dummy/help_topics/standalone-trees/summary.txt:1
8561
msgid "Information on what a standalone tree is"
8562
msgstr ""
8563
8564
#: dummy/help_topics/standard-options/detail.txt:1
8565
msgid "Standard Options"
8566
msgstr ""
8567
8568
#: dummy/help_topics/standard-options/detail.txt:3
8569
msgid "Standard options are legal for all commands."
8570
msgstr ""
8571
8572
#: dummy/help_topics/standard-options/detail.txt:5
8573
msgid ""
8574
"--help, -h Show help message.\n"
8575
"--verbose, -v Display more information.\n"
8576
"--quiet, -q Only display errors and warnings."
8577
msgstr ""
8578
8579
#: dummy/help_topics/standard-options/detail.txt:9
8580
msgid "Unlike global options, standard options can be used in aliases.\n"
8581
msgstr ""
8582
8583
#: dummy/help_topics/standard-options/summary.txt:1
8584
msgid "Options that can be used with any command"
8585
msgstr ""
8586
8587
#: dummy/help_topics/status-flags/detail.txt:1
8588
msgid "Status Flags"
8589
msgstr ""
8590
8591
#: dummy/help_topics/status-flags/detail.txt:3
8592
msgid ""
8593
"Status flags are used to summarise changes to the working tree in a concise\n"
8594
"manner. They are in the form::"
8595
msgstr ""
8596
8597
#: dummy/help_topics/status-flags/detail.txt:6
8598
msgid " xxx <filename>"
8599
msgstr ""
8600
8601
#: dummy/help_topics/status-flags/detail.txt:8
8602
msgid "where the columns' meanings are as follows."
8603
msgstr ""
8604
8605
#: dummy/help_topics/status-flags/detail.txt:10
8606
msgid "Column 1 - versioning/renames::"
8607
msgstr ""
8608
8609
#: dummy/help_topics/status-flags/detail.txt:12
8610
msgid ""
8611
" + File versioned\n"
8612
" - File unversioned\n"
8613
" R File renamed\n"
8614
" ? File unknown\n"
8615
" X File nonexistent (and unknown to bzr)\n"
8616
" C File has conflicts\n"
8617
" P Entry for a pending merge (not a file)"
8618
msgstr ""
8619
8620
#: dummy/help_topics/status-flags/detail.txt:20
8621
msgid "Column 2 - contents::"
8622
msgstr ""
8623
8624
#: dummy/help_topics/status-flags/detail.txt:22
8625
msgid ""
8626
" N File created\n"
8627
" D File deleted\n"
8628
" K File kind changed\n"
8629
" M File modified"
8630
msgstr ""
8631
8632
#: dummy/help_topics/status-flags/detail.txt:27
8633
msgid "Column 3 - execute::"
8634
msgstr ""
8635
8636
#: dummy/help_topics/status-flags/detail.txt:29
8637
msgid " * The execute bit was changed\n"
8638
msgstr ""
8639
8640
#: dummy/help_topics/status-flags/summary.txt:1
8641
msgid "Help on status flags"
8642
msgstr ""
8643
8644
#: dummy/help_topics/sync-for-reconfigure/detail.txt:1
8645
msgid "Branches Out of Sync"
8646
msgstr ""
8647
8648
#: dummy/help_topics/sync-for-reconfigure/detail.txt:3
8649
msgid ""
8650
"When reconfiguring a checkout, tree or branch into a lightweight checkout,\n"
8651
"a local branch must be destroyed. (For checkouts, this is the local branch\n"
8652
"that serves primarily as a cache.) If the branch-to-be-destroyed does not\n"
8653
"have the same last revision as the new reference branch for the lightweight\n"
8654
"checkout, data could be lost, so Bazaar refuses."
8655
msgstr ""
8656
8657
#: dummy/help_topics/sync-for-reconfigure/detail.txt:9
8658
msgid "How you deal with this depends on *why* the branches are out of sync."
8659
msgstr ""
8660
8661
#: dummy/help_topics/sync-for-reconfigure/detail.txt:11
8662
msgid ""
8663
"If you have a checkout and have done local commits, you can get back in "
8664
"sync\n"
8665
"by running \"bzr update\" (and possibly \"bzr commit\")."
8666
msgstr ""
8667
8668
#: dummy/help_topics/sync-for-reconfigure/detail.txt:14
8669
msgid ""
8670
"If you have a branch and the remote branch is out-of-date, you can push\n"
8671
"the local changes using \"bzr push\". If the local branch is out of date, "
8672
"you\n"
8673
"can do \"bzr pull\". If both branches have had changes, you can merge, "
8674
"commit\n"
8675
"and then push your changes. If you decide that some of the changes aren't\n"
8676
"useful, you can \"push --overwrite\" or \"pull --overwrite\" instead.\n"
8677
msgstr ""
8678
8679
#: dummy/help_topics/sync-for-reconfigure/summary.txt:1
8680
msgid "Steps to resolve \"out-of-sync\" when reconfiguring"
8681
msgstr ""
8682
8683
#: dummy/help_topics/topics/summary.txt:1
8684
msgid "Topics list"
8685
msgstr ""
8686
8687
#: dummy/help_topics/url-special-chars/summary.txt:1
8688
msgid "Special character handling in URLs"
8689
msgstr ""
8690
8691
#: dummy/help_topics/urlspec/summary.txt:1
8692
msgid "Supported transport protocols"
8693
msgstr ""
8694
8695
#: dummy/help_topics/working-trees/detail.txt:1
8696
msgid "Working Trees"
8697
msgstr ""
8698
8699
#: dummy/help_topics/working-trees/detail.txt:3
8700
msgid ""
8701
"A working tree is the contents of a branch placed on disk so that you can\n"
8702
"see the files and edit them. The working tree is where you make changes to "
8703
"a\n"
8704
"branch, and when you commit the current state of the working tree is the\n"
8705
"snapshot that is recorded in the commit."
8706
msgstr ""
8707
8708
#: dummy/help_topics/working-trees/detail.txt:8
8709
msgid ""
8710
"When you push a branch to a remote system, a working tree will not be\n"
8711
"created. If one is already present the files will not be updated. The\n"
8712
"branch information will be updated and the working tree will be marked\n"
8713
"as out-of-date. Updating a working tree remotely is difficult, as there\n"
8714
"may be uncommitted changes or the update may cause content conflicts that "
8715
"are\n"
8716
"difficult to deal with remotely."
8717
msgstr ""
8718
8719
#: dummy/help_topics/working-trees/detail.txt:15
8720
msgid ""
8721
"If you have a branch with no working tree you can use the 'checkout' "
8722
"command\n"
8723
"to create a working tree. If you run 'bzr checkout .' from the branch it "
8724
"will\n"
8725
"create the working tree. If the branch is updated remotely, you can update "
8726
"the\n"
8727
"working tree by running 'bzr update' in that directory."
8728
msgstr ""
8729
8730
#: dummy/help_topics/working-trees/detail.txt:20
8731
msgid ""
8732
"If you have a branch with a working tree that you do not want the 'remove-"
8733
"tree'\n"
8734
"command will remove the tree if it is safe. This can be done to avoid the\n"
8735
"warning about the remote working tree not being updated when pushing to the\n"
8736
"branch. It can also be useful when working with a '--no-trees' repository\n"
8737
"(see 'bzr help repositories')."
8738
msgstr ""
8739
8740
#: dummy/help_topics/working-trees/detail.txt:26
8741
msgid ""
8742
"If you want to have a working tree on a remote machine that you push to you\n"
8743
"can either run 'bzr update' in the remote branch after each push, or use "
8744
"some\n"
8745
"other method to update the tree during the push. There is an 'rspush' "
8746
"plugin\n"
8747
"that will update the working tree using rsync as well as doing a push. "
8748
"There\n"
8749
"is also a 'push-and-update' plugin that automates running 'bzr update' via "
8750
"SSH\n"
8751
"after each push."
8752
msgstr ""
8753
8754
#: dummy/help_topics/working-trees/detail.txt:33
8755
msgid "Useful commands::"
8756
msgstr ""
8757
8758
#: dummy/help_topics/working-trees/detail.txt:35
8759
msgid ""
8760
" checkout Create a working tree when a branch does not have one.\n"
8761
" remove-tree Removes the working tree from a branch when it is safe to do "
8762
"so.\n"
8763
" update When a working tree is out of sync with its associated "
8764
"branch\n"
8765
" this will update the tree to match the branch.\n"
8766
msgstr ""
8767
8768
#: dummy/help_topics/working-trees/summary.txt:1
8769
msgid "Information on working trees"
8770
msgstr ""
8771
8772
#: en/help_topics/authentication.txt:1
8773
msgid ""
8774
"Authentication Settings\n"
8775
"======================="
8776
msgstr ""
8777
8778
#: en/help_topics/authentication.txt:4
8779
msgid ""
8780
"\n"
8781
"Intent\n"
8782
"------"
8783
msgstr ""
8784
8785
#: en/help_topics/authentication.txt:8
8786
msgid ""
8787
"Many different authentication policies can be described in the\n"
8788
"``authentication.conf`` file but a particular user should need only a few\n"
8789
"definitions to cover his needs without having to specify a user and a "
8790
"password\n"
8791
"for every branch he uses."
8792
msgstr ""
8793
8794
#: en/help_topics/authentication.txt:13
8795
msgid ""
8796
"The definitions found in this file are used to find the credentials to use "
8797
"for\n"
8798
"a given url. The same credentials can generally be used for as many branches "
8799
"as\n"
8800
"possible by grouping their declaration around the remote servers that need\n"
8801
"them. It's even possible to declare credentials that will be used by "
8802
"different\n"
8803
"servers."
8804
msgstr ""
8805
8806
#: en/help_topics/authentication.txt:19
8807
msgid ""
8808
"The intent is to make this file as small as possible to minimize maintenance."
8809
msgstr ""
8810
8811
#: en/help_topics/authentication.txt:21
8812
msgid ""
8813
"Once the relevant credentials are declared in this file you may use branch "
8814
"urls\n"
8815
"without embedding passwords (security hazard) or even users (enabling "
8816
"sharing\n"
8817
"of your urls with others)."
8818
msgstr ""
8819
8820
#: en/help_topics/authentication.txt:25
8821
msgid "Instead of using::"
8822
msgstr ""
8823
8824
#: en/help_topics/authentication.txt:27
8825
msgid " bzr branch ftp://joe:secret@host.com/path/to/my/branch"
8826
msgstr ""
8827
8828
#: en/help_topics/authentication.txt:29
8829
msgid "you simply use::"
8830
msgstr ""
8831
8832
#: en/help_topics/authentication.txt:31
8833
msgid " bzr branch ftp://host.com/path/to/my/branch"
8834
msgstr ""
8835
8836
#: en/help_topics/authentication.txt:33
8837
msgid "provided you have created the following ``authentication.conf`` file::"
8838
msgstr ""
8839
8840
#: en/help_topics/authentication.txt:35
8841
msgid ""
8842
" [myprojects]\n"
8843
" scheme=ftp\n"
8844
" host=host.com\n"
8845
" user=joe\n"
8846
" password=secret\n"
8847
" "
8848
msgstr ""
8849
8850
#: en/help_topics/authentication.txt:42
8851
msgid ""
8852
"Authentication definitions\n"
8853
"--------------------------"
8854
msgstr ""
8855
8856
#: en/help_topics/authentication.txt:45
8857
msgid ""
8858
"There are two kinds of authentication used by the various schemes supported "
8859
"by\n"
8860
"bzr:"
8861
msgstr ""
8862
8863
#: en/help_topics/authentication.txt:48
8864
msgid "1. user and password"
8865
msgstr ""
8866
8867
#: en/help_topics/authentication.txt:50
8868
msgid ""
8869
"``FTP`` needs a (``user``, ``password``) to authenticate against a ``host``\n"
8870
"``SFTP`` can use either a password or a host key to authenticate. However,\n"
8871
"ssh agents are a better, more secure solution. So we have chosen to not "
8872
"provide\n"
8873
"our own less secure method."
8874
msgstr ""
8875
8876
#: en/help_topics/authentication.txt:55
8877
msgid "2. user, realm and password"
8878
msgstr ""
8879
8880
#: en/help_topics/authentication.txt:57
8881
msgid ""
8882
"``HTTP`` and ``HTTPS`` needs a (``user, realm, password``) to authenticate\n"
8883
"against a host. But, by using ``.htaccess`` files, for example, it is "
8884
"possible\n"
8885
"to define several (``user, realm, password``) for a given ``host``. So what "
8886
"is\n"
8887
"really needed is (``user``, ``password``, ``host``, ``path``). The ``realm`` "
8888
"is\n"
8889
"not taken into account in the definitions, but will displayed if bzr "
8890
"prompts\n"
8891
"you for a password."
8892
msgstr ""
8893
8894
#: en/help_topics/authentication.txt:64
8895
msgid ""
8896
"``HTTP proxy`` can be handled as ``HTTP`` (or ``HTTPS``) by explicitly\n"
8897
"specifying the appropriate port."
8898
msgstr ""
8899
8900
#: en/help_topics/authentication.txt:67
8901
msgid ""
8902
"To take all schemes into account, the password will be deduced from a set "
8903
"of\n"
8904
"authentication definitions (``scheme``, ``host``, ``port``, ``path``, "
8905
"``user``,\n"
8906
"``password``)."
8907
msgstr ""
8908
8909
#: en/help_topics/authentication.txt:71
8910
msgid ""
8911
" * ``scheme``: can be empty (meaning the rest of the definition can be "
8912
"used\n"
8913
" for any scheme), ``SFTP`` and ``bzr+ssh`` should not be used here, "
8914
"``ssh``\n"
8915
" should be used instead since this is the real scheme regarding\n"
8916
" authentication,"
8917
msgstr ""
8918
8919
#: en/help_topics/authentication.txt:76
8920
msgid " * ``host``: can be empty (to act as a default for any host),"
8921
msgstr ""
8922
8923
#: en/help_topics/authentication.txt:78
8924
msgid ""
8925
" * ``port`` can be empty (useful when an host provides several servers for "
8926
"the\n"
8927
" same scheme), only numerical values are allowed, this should be used "
8928
"only\n"
8929
" when the server uses a port different than the scheme standard port,"
8930
msgstr ""
8931
8932
#: en/help_topics/authentication.txt:82
8933
msgid " * ``path``: can be empty (FTP or SFTP will never user it),"
8934
msgstr ""
8935
8936
#: en/help_topics/authentication.txt:84
8937
msgid ""
8938
" * ``user``: can be empty (``bzr`` will defaults to python's\n"
8939
" ``getpass.get_user()``),"
8940
msgstr ""
8941
8942
#: en/help_topics/authentication.txt:87
8943
msgid ""
8944
" * ``password``: can be empty if you prefer to always be prompted for your\n"
8945
" password."
8946
msgstr ""
8947
8948
#: en/help_topics/authentication.txt:90
8949
msgid ""
8950
"Multiple definitions can be provided and, for a given URL, bzr will select "
8951
"a\n"
8952
"(``user`` [, ``password``]) based on the following rules :"
8953
msgstr ""
8954
8955
#: en/help_topics/authentication.txt:93
8956
msgid " 1. the first match wins,"
8957
msgstr ""
8958
8959
#: en/help_topics/authentication.txt:95
8960
msgid " 2. empty fields match everything,"
8961
msgstr ""
8962
8963
#: en/help_topics/authentication.txt:97
8964
msgid ""
8965
" 3. ``scheme`` matches even if decorators are used in the requested URL,"
8966
msgstr ""
8967
8968
#: en/help_topics/authentication.txt:99
8969
msgid ""
8970
" 4. ``host`` matches exactly or act as a domain if it starts with '.'\n"
8971
" (``project.bzr.sf.net`` will match ``.bzr.sf.net`` but ``projectbzr.sf."
8972
"net``\n"
8973
" will not match ``bzr.sf.net``)."
8974
msgstr ""
8975
8976
#: en/help_topics/authentication.txt:103
8977
msgid ""
8978
" 5. ``port`` matches if included in the requested URL (exact matches only)"
8979
msgstr ""
8980
8981
#: en/help_topics/authentication.txt:105
8982
msgid ""
8983
" 6. ``path`` matches if included in the requested URL (and by rule #2 "
8984
"above,\n"
8985
" empty paths will match any provided path)."
8986
msgstr ""
8987
8988
#: en/help_topics/authentication.txt:110
8989
msgid ""
8990
"File format\n"
8991
"-----------"
8992
msgstr ""
8993
8994
#: en/help_topics/authentication.txt:113
8995
msgid ""
8996
"The general rules for :doc:`configuration files <configuration-help>`\n"
8997
"apply except for the variable policies."
8998
msgstr ""
8999
9000
#: en/help_topics/authentication.txt:116
9001
msgid "Each section describes an authentication definition."
9002
msgstr ""
9003
9004
#: en/help_topics/authentication.txt:118
9005
msgid ""
9006
"The section name is an arbitrary string, only the ``DEFAULT`` value is "
9007
"reserved\n"
9008
"and should appear as the *last* section."
9009
msgstr ""
9010
9011
#: en/help_topics/authentication.txt:121
9012
msgid "Each section should define:"
9013
msgstr ""
9014
9015
#: en/help_topics/authentication.txt:123
9016
msgid "* ``user``: the login to be used,"
9017
msgstr ""
9018
9019
#: en/help_topics/authentication.txt:125
9020
msgid "Each section could define:"
9021
msgstr ""
9022
9023
#: en/help_topics/authentication.txt:127
9024
msgid "* ``host``: the remote server,"
9025
msgstr ""
9026
9027
#: en/help_topics/authentication.txt:129
9028
msgid "* ``port``: the port the server is listening,"
9029
msgstr ""
9030
9031
#: en/help_topics/authentication.txt:131
9032
msgid "* ``path``: the branch location,"
9033
msgstr ""
9034
9035
#: en/help_topics/authentication.txt:133
9036
msgid "* ``password``: the password."
9037
msgstr ""
9038
9039
#: en/help_topics/authentication.txt:135
9040
msgid ""
9041
"\n"
9042
"Examples\n"
9043
"--------"
9044
msgstr ""
9045
9046
#: en/help_topics/authentication.txt:139
9047
msgid ""
9048
"\n"
9049
"Personal projects hosted outside\n"
9050
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
9051
msgstr ""
9052
9053
#: en/help_topics/authentication.txt:143
9054
msgid ""
9055
"All connections are done with the same ``user`` (the remote one for which "
9056
"the\n"
9057
"default bzr one is not appropriate) and the password is always prompted "
9058
"with\n"
9059
"some exceptions::"
9060
msgstr ""
9061
9062
#: en/help_topics/authentication.txt:147
9063
msgid ""
9064
" # Pet projects on hobby.net\n"
9065
" [hobby]\n"
9066
" host=r.hobby.net\n"
9067
" user=jim\n"
9068
" password=obvious1234\n"
9069
" \n"
9070
" # Home server\n"
9071
" [home]\n"
9072
" scheme=https\n"
9073
" host=home.net\n"
9074
" user=joe\n"
9075
" password=1essobV10us\n"
9076
" \n"
9077
" [DEFAULT]\n"
9078
" # Our local user is barbaz, on all remote sites we're known as "
9079
"foobar\n"
9080
" user=foobar"
9081
msgstr ""
9082
9083
#: en/help_topics/authentication.txt:164
9084
msgid ""
9085
"\n"
9086
"Source hosting provider\n"
9087
"~~~~~~~~~~~~~~~~~~~~~~~"
9088
msgstr ""
9089
9090
#: en/help_topics/authentication.txt:168
9091
msgid "In the shp.net (fictitious) domain, each project has its own site::"
9092
msgstr ""
9093
9094
#: en/help_topics/authentication.txt:170
9095
msgid ""
9096
" [shpnet domain]\n"
9097
" # we use sftp, but ssh is the scheme used for authentication\n"
9098
" scheme=ssh\n"
9099
" # The leading '.' ensures that 'shp.net' alone doesn't match\n"
9100
" host=.shp.net\n"
9101
" user=joe\n"
9102
" # bzr don't support supplying a password for sftp,\n"
9103
" # consider using an ssh agent if you don't want to supply\n"
9104
" # a password interactively. (pageant, ssh-agent, etc)"
9105
msgstr ""
9106
9107
#: en/help_topics/authentication.txt:180
9108
msgid ""
9109
"HTTPS, SFTP servers and their proxy\n"
9110
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
9111
msgstr ""
9112
9113
#: en/help_topics/authentication.txt:183
9114
msgid ""
9115
"At company.com, the server hosting release and integration branches is "
9116
"behind a\n"
9117
"proxy, and the two branches use different authentication policies::"
9118
msgstr ""
9119
9120
#: en/help_topics/authentication.txt:186
9121
msgid ""
9122
" [reference code]\n"
9123
" scheme=https\n"
9124
" host=dev.company.com\n"
9125
" path=/dev\n"
9126
" user=user1\n"
9127
" password=pass1"
9128
msgstr ""
9129
9130
#: en/help_topics/authentication.txt:193
9131
msgid ""
9132
" # development branches on dev server\n"
9133
" [dev]\n"
9134
" scheme=ssh # bzr+ssh and sftp are available here\n"
9135
" host=dev.company.com\n"
9136
" path=/dev/integration\n"
9137
" user=user2\n"
9138
" \n"
9139
" # proxy\n"
9140
" [proxy]\n"
9141
" scheme=http\n"
9142
" host=proxy.company.com\n"
9143
" port=3128\n"
9144
" user=proxyuser1\n"
9145
" password=proxypass1"
9146
msgstr ""
9147
9148
#: en/help_topics/authentication.txt:208
9149
msgid ""
9150
"\n"
9151
"Planned enhancements\n"
9152
"--------------------"
9153
msgstr ""
9154
9155
#: en/help_topics/authentication.txt:212
9156
msgid ""
9157
"The following are not yet implemented but planned as parts of a work in\n"
9158
"progress:"
9159
msgstr ""
9160
9161
#: en/help_topics/authentication.txt:215
9162
msgid "* add a ``password_encoding`` field allowing:"
9163
msgstr ""
9164
9165
#: en/help_topics/authentication.txt:217
9166
msgid ""
9167
" - storing the passwords in various obfuscating encodings (base64 for one),"
9168
msgstr ""
9169
9170
#: en/help_topics/authentication.txt:219
9171
msgid " - delegate password storage to plugins (.netrc for example)."
9172
msgstr ""
9173
9174
#: en/help_topics/authentication.txt:221
9175
msgid ""
9176
"* update the credentials when the user is prompted for user or password,"
9177
msgstr ""
9178
9179
#: en/help_topics/authentication.txt:223
9180
msgid "* add a ``verify_certificates`` field for ``HTTPS``."
9181
msgstr ""
9182
9183
#: en/help_topics/authentication.txt:225
9184
msgid ""
9185
"The ``password_encoding`` and ``verify_certificates`` fields are recognized "
9186
"but\n"
9187
"ignored in the actual implementation.\n"
9188
msgstr ""
9189
9190
#: en/help_topics/bugs.txt:1
9191
msgid "Bug Tracker Settings"
9192
msgstr ""
9193
9194
#: en/help_topics/bugs.txt:3
9195
msgid ""
9196
"When making a commit, metadata about bugs fixed by that change can be\n"
9197
"recorded by using the ``--fixes`` option. For each bug marked as fixed, an\n"
9198
"entry is included in the 'bugs' revision property stating '<url> <status>'.\n"
9199
"(The only ``status`` value currently supported is ``fixed.``)"
9200
msgstr ""
9201
9202
#: en/help_topics/bugs.txt:8
9203
msgid ""
9204
"The ``--fixes`` option allows you to specify a bug tracker and a bug "
9205
"identifier\n"
9206
"rather than a full URL. This looks like::"
9207
msgstr ""
9208
9209
#: en/help_topics/bugs.txt:11
9210
msgid " bzr commit --fixes <tracker>:<id>"
9211
msgstr ""
9212
9213
#: en/help_topics/bugs.txt:13 en/help_topics/configuration.txt:410
9214
msgid "or::"
9215
msgstr ""
9216
9217
#: en/help_topics/bugs.txt:15
9218
msgid " bzr commit --fixes <id>"
9219
msgstr ""
9220
9221
#: en/help_topics/bugs.txt:17
9222
msgid ""
9223
"where \"<tracker>\" is an identifier for the bug tracker, and \"<id>\" is "
9224
"the\n"
9225
"identifier for that bug within the bugtracker, usually the bug number.\n"
9226
"If \"<tracker>\" is not specified the ``bugtracker`` set in the branch\n"
9227
"or global configuration is used."
9228
msgstr ""
9229
9230
#: en/help_topics/bugs.txt:22
9231
msgid ""
9232
"Bazaar knows about a few bug trackers that have many users. If\n"
9233
"you use one of these bug trackers then there is no setup required to\n"
9234
"use this feature, you just need to know the tracker identifier to use.\n"
9235
"These are the bugtrackers that are built in:"
9236
msgstr ""
9237
9238
#: en/help_topics/bugs.txt:27
9239
msgid ""
9240
" ============================ ============ ============\n"
9241
" URL Abbreviation Example\n"
9242
" ============================ ============ ============\n"
9243
" https://bugs.launchpad.net/ lp lp:12345\n"
9244
" http://bugs.debian.org/ deb deb:12345\n"
9245
" http://bugzilla.gnome.org/ gnome gnome:12345\n"
9246
" ============================ ============ ============"
9247
msgstr ""
9248
9249
#: en/help_topics/bugs.txt:35
9250
msgid ""
9251
"For the bug trackers not listed above configuration is required.\n"
9252
"Support for generating the URLs for any project using Bugzilla or Trac\n"
9253
"is built in, along with a template mechanism for other bugtrackers with\n"
9254
"simple URL schemes. If your bug tracker can't be described by one\n"
9255
"of the schemes described below then you can write a plugin to support\n"
9256
"it."
9257
msgstr ""
9258
9259
#: en/help_topics/bugs.txt:42
9260
msgid ""
9261
"If you use Bugzilla or Trac, then you only need to set a configuration\n"
9262
"variable which contains the base URL of the bug tracker. These options\n"
9263
"can go into ``bazaar.conf``, ``branch.conf`` or into a branch-specific\n"
9264
"configuration section in ``locations.conf``. You can set up these values\n"
9265
"for each of the projects you work on."
9266
msgstr ""
9267
9268
#: en/help_topics/bugs.txt:48
9269
msgid ""
9270
"Note: As you provide a short name for each tracker, you can specify one or\n"
9271
"more bugs in one or more trackers at commit time if you wish."
9272
msgstr ""
9273
9274
#: en/help_topics/bugs.txt:51
9275
msgid ""
9276
"Launchpad\n"
9277
"---------"
9278
msgstr ""
9279
9280
#: en/help_topics/bugs.txt:54
9281
msgid "Use ``bzr commit --fixes lp:2`` to record that this commit fixes bug 2."
9282
msgstr ""
9283
9284
#: en/help_topics/bugs.txt:56
9285
msgid ""
9286
"bugzilla_<tracker>_url\n"
9287
"----------------------"
9288
msgstr ""
9289
9290
#: en/help_topics/bugs.txt:59
9291
msgid ""
9292
"If present, the location of the Bugzilla bug tracker referred to by\n"
9293
"<tracker>. This option can then be used together with ``bzr commit\n"
9294
"--fixes`` to mark bugs in that tracker as being fixed by that commit. For\n"
9295
"example::"
9296
msgstr ""
9297
9298
#: en/help_topics/bugs.txt:64
9299
msgid " bugzilla_squid_url = http://bugs.squid-cache.org"
9300
msgstr ""
9301
9302
#: en/help_topics/bugs.txt:66
9303
msgid ""
9304
"would allow ``bzr commit --fixes squid:1234`` to mark Squid's bug 1234 as\n"
9305
"fixed."
9306
msgstr ""
9307
9308
#: en/help_topics/bugs.txt:69
9309
msgid ""
9310
"trac_<tracker>_url\n"
9311
"------------------"
9312
msgstr ""
9313
9314
#: en/help_topics/bugs.txt:72
9315
msgid ""
9316
"If present, the location of the Trac instance referred to by\n"
9317
"<tracker>. This option can then be used together with ``bzr commit\n"
9318
"--fixes`` to mark bugs in that tracker as being fixed by that commit. For\n"
9319
"example::"
9320
msgstr ""
9321
9322
#: en/help_topics/bugs.txt:77
9323
msgid " trac_twisted_url = http://www.twistedmatrix.com/trac"
9324
msgstr ""
9325
9326
#: en/help_topics/bugs.txt:79
9327
msgid ""
9328
"would allow ``bzr commit --fixes twisted:1234`` to mark Twisted's bug 1234 "
9329
"as\n"
9330
"fixed."
9331
msgstr ""
9332
9333
#: en/help_topics/bugs.txt:82
9334
msgid ""
9335
"bugtracker_<tracker>_url\n"
9336
"------------------------"
9337
msgstr ""
9338
9339
#: en/help_topics/bugs.txt:85
9340
msgid ""
9341
"If present, the location of a generic bug tracker instance referred to by\n"
9342
"<tracker>. The location must contain an ``{id}`` placeholder,\n"
9343
"which will be replaced by a specific bug ID. This option can then be used\n"
9344
"together with ``bzr commit --fixes`` to mark bugs in that tracker as being\n"
9345
"fixed by that commit. For example::"
9346
msgstr ""
9347
9348
#: en/help_topics/bugs.txt:91
9349
msgid " bugtracker_python_url = http://bugs.python.org/issue{id}"
9350
msgstr ""
9351
9352
#: en/help_topics/bugs.txt:93
9353
msgid ""
9354
"would allow ``bzr commit --fixes python:1234`` to mark bug 1234 in Python's\n"
9355
"Roundup bug tracker as fixed, or::"
9356
msgstr ""
9357
9358
#: en/help_topics/bugs.txt:96
9359
msgid ""
9360
" bugtracker_cpan_url = http://rt.cpan.org/Public/Bug/Display.html?id={id}"
9361
msgstr ""
9362
9363
#: en/help_topics/bugs.txt:98
9364
msgid ""
9365
"would allow ``bzr commit --fixes cpan:1234`` to mark bug 1234 in CPAN's\n"
9366
"RT bug tracker as fixed, or::"
9367
msgstr ""
9368
9369
#: en/help_topics/bugs.txt:101
9370
msgid " bugtracker_hudson_url = http://issues.hudson-ci.org/browse/{id}"
9371
msgstr ""
9372
9373
#: en/help_topics/bugs.txt:103
9374
msgid ""
9375
"would allow ``bzr commit --fixes hudson:HUDSON-1234`` to mark bug "
9376
"HUDSON-1234\n"
9377
"in Hudson's JIRA bug tracker as fixed.\n"
9378
msgstr ""
9379
9380
#: en/help_topics/commands.txt:1
9381
msgid ""
9382
"add Add specified files or directories.\n"
9383
"alias Set/unset and display aliases.\n"
9384
"annotate Show the origin of each line in a file.\n"
9385
"bash-completion Generate a shell function for bash command line "
9386
"completion.\n"
9387
" [bash_completion]\n"
9388
"bind Convert the current branch into a checkout of the "
9389
"supplied\n"
9390
" branch.\n"
9391
"branch Create a new branch that is a copy of an existing branch.\n"
9392
"branches List the branches available at the current location.\n"
9393
"break-lock Break a dead lock.\n"
9394
"cat Write the contents of a file as of a given revision to\n"
9395
" standard output.\n"
9396
"check Validate working tree structure, branch consistency and\n"
9397
" repository history.\n"
9398
"checkout Create a new checkout of an existing branch.\n"
9399
"clean-tree Remove unwanted files from working tree.\n"
9400
"commit Commit changes into a new revision.\n"
9401
"config Display, set or remove a configuration option.\n"
9402
"conflicts List files with conflicts.\n"
9403
"deleted List files deleted in the working tree.\n"
9404
"diff Show differences in the working tree, between revisions "
9405
"or\n"
9406
" branches.\n"
9407
"dpush Push into a different VCS without any custom bzr "
9408
"metadata.\n"
9409
"export Export current or past revision to a destination directory "
9410
"or\n"
9411
" archive.\n"
9412
"grep Print lines matching PATTERN for specified files and\n"
9413
" revisions. [grep]\n"
9414
"help Show help on a command or other topic.\n"
9415
"ignore Ignore specified files or patterns.\n"
9416
"ignored List ignored files and the patterns that matched them.\n"
9417
"info Show information about a working tree, branch or "
9418
"repository.\n"
9419
"init Make a directory into a versioned branch.\n"
9420
"init-repository Create a shared repository for branches to share storage\n"
9421
" space.\n"
9422
"join Combine a tree into its containing tree.\n"
9423
"launchpad-login Show or set the Launchpad user ID. [launchpad]\n"
9424
"launchpad-mirror Ask Launchpad to mirror a branch now. [launchpad]\n"
9425
"launchpad-open Open a Launchpad branch page in your web browser. "
9426
"[launchpad]\n"
9427
"log Show historical log for a branch or subset of a branch.\n"
9428
"lp-find-proposal Find the proposal to merge this revision. [launchpad]\n"
9429
"lp-propose-merge Propose merging a branch on Launchpad. [launchpad]\n"
9430
"ls List files in a tree.\n"
9431
"merge Perform a three-way merge.\n"
9432
"missing Show unmerged/unpulled revisions between two branches.\n"
9433
"mkdir Create a new versioned directory.\n"
9434
"mv Move or rename a file.\n"
9435
"nick Print or set the branch nickname.\n"
9436
"pack Compress the data within a repository.\n"
9437
"ping Pings a Bazaar smart server.\n"
9438
"plugins List the installed plugins.\n"
9439
"pull Turn this branch into a mirror of another branch.\n"
9440
"push Update a mirror of this branch.\n"
9441
"reconcile Reconcile bzr metadata in a branch.\n"
9442
"reconfigure Reconfigure the type of a bzr directory.\n"
9443
"register-branch Register a branch with launchpad.net. [launchpad]\n"
9444
"remerge Redo a merge.\n"
9445
"remove Remove files or directories.\n"
9446
"remove-branch Remove a branch.\n"
9447
"remove-tree Remove the working tree from a given branch/checkout.\n"
9448
"renames Show list of renamed files.\n"
9449
"resolve Mark a conflict as resolved.\n"
9450
"revert Set files in the working tree back to the contents of a\n"
9451
" previous revision.\n"
9452
"revno Show current revision number.\n"
9453
"root Show the tree root directory.\n"
9454
"send Mail or create a merge-directive for submitting changes.\n"
9455
"serve Run the bzr server.\n"
9456
"shelve Temporarily set aside some changes from the current tree.\n"
9457
"sign-my-commits Sign all commits by a given committer.\n"
9458
"split Split a subdirectory of a tree into a separate tree.\n"
9459
"status Display status summary.\n"
9460
"switch Set the branch of a checkout and update.\n"
9461
"tag Create, remove or modify a tag naming a revision.\n"
9462
"tags List tags.\n"
9463
"testament Show testament (signing-form) of a revision.\n"
9464
"unbind Convert the current checkout into a regular branch.\n"
9465
"uncommit Remove the last committed revision.\n"
9466
"unshelve Restore shelved changes.\n"
9467
"update Update a working tree to a new revision.\n"
9468
"upgrade Upgrade a repository, branch or working tree to a newer\n"
9469
" format.\n"
9470
"verify-signatures Verify all commit signatures.\n"
9471
"version Show version of bzr.\n"
9472
"version-info Show version information about this tree.\n"
9473
"view Manage filtered views.\n"
9474
"whoami Show or set bzr user id.\n"
9475
msgstr ""
9476
9477
#: en/help_topics/configuration.txt:1
9478
msgid ""
9479
"Configuration Settings\n"
9480
"======================="
9481
msgstr ""
9482
9483
#: en/help_topics/configuration.txt:4
9484
msgid ""
9485
"Environment settings\n"
9486
"---------------------"
9487
msgstr ""
9488
9489
#: en/help_topics/configuration.txt:7
9490
msgid ""
9491
"While most configuration is handled by configuration files, some options\n"
9492
"which may be semi-permanent can also be controlled through the environment."
9493
msgstr ""
9494
9495
#: en/help_topics/configuration.txt:10
9496
msgid ""
9497
"BZR_EMAIL\n"
9498
"~~~~~~~~~"
9499
msgstr ""
9500
9501
#: en/help_topics/configuration.txt:13
9502
msgid "Override the email id used by Bazaar. Typical format::"
9503
msgstr ""
9504
9505
#: en/help_topics/configuration.txt:15
9506
msgid " \"John Doe <jdoe@example.com>\""
9507
msgstr ""
9508
9509
#: en/help_topics/configuration.txt:17
9510
msgid "See also the ``email`` configuration option."
9511
msgstr ""
9512
9513
#: en/help_topics/configuration.txt:19
9514
msgid ""
9515
"BZR_PROGRESS_BAR\n"
9516
"~~~~~~~~~~~~~~~~"
9517
msgstr ""
9518
9519
#: en/help_topics/configuration.txt:22
9520
msgid ""
9521
"Override the progress display. Possible values are \"none\" or \"text\". "
9522
"If\n"
9523
"the value is \"none\" then no progress bar is displayed. The value \"text\" "
9524
"draws\n"
9525
"the ordinary command line progress bar."
9526
msgstr ""
9527
9528
#: en/help_topics/configuration.txt:26
9529
msgid ""
9530
"BZR_SIGQUIT_PDB\n"
9531
"~~~~~~~~~~~~~~~"
9532
msgstr ""
9533
9534
#: en/help_topics/configuration.txt:29
9535
msgid "Control whether SIGQUIT behaves normally or invokes a breakin debugger."
9536
msgstr ""
9537
9538
#: en/help_topics/configuration.txt:31
9539
msgid ""
9540
"* 0 = Standard SIGQUIT behavior (normally, exit with a core dump)\n"
9541
"* 1 = Invoke breakin debugger (default)"
9542
msgstr ""
9543
9544
#: en/help_topics/configuration.txt:34
9545
msgid ""
9546
"BZR_HOME\n"
9547
"~~~~~~~~"
9548
msgstr ""
9549
9550
#: en/help_topics/configuration.txt:37
9551
msgid "Override the home directory used by Bazaar."
9552
msgstr ""
9553
9554
#: en/help_topics/configuration.txt:39
9555
msgid ""
9556
"BZR_SSH\n"
9557
"~~~~~~~"
9558
msgstr ""
9559
9560
#: en/help_topics/configuration.txt:42
9561
msgid "Select a different SSH implementation."
9562
msgstr ""
9563
9564
#: en/help_topics/configuration.txt:44
9565
msgid ""
9566
"BZR_PDB\n"
9567
"~~~~~~~"
9568
msgstr ""
9569
9570
#: en/help_topics/configuration.txt:47
9571
msgid "Control whether to launch a debugger on error."
9572
msgstr ""
9573
9574
#: en/help_topics/configuration.txt:49
9575
msgid ""
9576
"* 0 = Standard behavior\n"
9577
"* 1 = Launch debugger"
9578
msgstr ""
9579
9580
#: en/help_topics/configuration.txt:52
9581
msgid ""
9582
"BZR_REMOTE_PATH\n"
9583
"~~~~~~~~~~~~~~~"
9584
msgstr ""
9585
9586
#: en/help_topics/configuration.txt:55
9587
msgid "Path to the Bazaar executable to use when using the bzr+ssh protocol."
9588
msgstr ""
9589
9590
#: en/help_topics/configuration.txt:57
9591
msgid "See also the ``bzr_remote_path`` configuration option."
9592
msgstr ""
9593
9594
#: en/help_topics/configuration.txt:59
9595
msgid ""
9596
"BZR_EDITOR\n"
9597
"~~~~~~~~~~"
9598
msgstr ""
9599
9600
#: en/help_topics/configuration.txt:62
9601
msgid "Path to the editor Bazaar should use for commit messages, etc."
9602
msgstr ""
9603
9604
#: en/help_topics/configuration.txt:64
9605
msgid ""
9606
"BZR_LOG\n"
9607
"~~~~~~~"
9608
msgstr ""
9609
9610
#: en/help_topics/configuration.txt:67
9611
msgid ""
9612
"Location of the Bazaar log file. You can check the current location by\n"
9613
"running ``bzr version``."
9614
msgstr ""
9615
9616
#: en/help_topics/configuration.txt:70
9617
msgid ""
9618
"The log file contains debug information that is useful for diagnosing or\n"
9619
"reporting problems with Bazaar."
9620
msgstr ""
9621
9622
#: en/help_topics/configuration.txt:73
9623
msgid ""
9624
"Setting this to ``NUL`` on Windows or ``/dev/null`` on other platforms\n"
9625
"will disable logging."
9626
msgstr ""
9627
9628
#: en/help_topics/configuration.txt:76
9629
msgid ""
9630
"\n"
9631
"BZR_PLUGIN_PATH\n"
9632
"~~~~~~~~~~~~~~~"
9633
msgstr ""
9634
9635
#: en/help_topics/configuration.txt:80
9636
msgid ""
9637
"The path to the plugins directory that Bazaar should use.\n"
9638
"If not set, Bazaar will search for plugins in:"
9639
msgstr ""
9640
9641
#: en/help_topics/configuration.txt:83
9642
msgid "* the user specific plugin directory (containing the ``user`` plugins),"
9643
msgstr ""
9644
9645
#: en/help_topics/configuration.txt:85
9646
msgid "* the bzrlib directory (containing the ``core`` plugins),"
9647
msgstr ""
9648
9649
#: en/help_topics/configuration.txt:87
9650
msgid ""
9651
"* the site specific plugin directory if applicable (containing\n"
9652
" the ``site`` plugins)."
9653
msgstr ""
9654
9655
#: en/help_topics/configuration.txt:90
9656
msgid ""
9657
"If ``BZR_PLUGIN_PATH`` is set in any fashion, it will change the\n"
9658
"the way the plugin are searched. "
9659
msgstr ""
9660
9661
#: en/help_topics/configuration.txt:93
9662
msgid ""
9663
"As for the ``PATH`` variables, if multiple directories are\n"
9664
"specified in ``BZR_PLUGIN_PATH`` they should be separated by the\n"
9665
"platform specific appropriate character (':' on Unix,\n"
9666
"';' on windows)"
9667
msgstr ""
9668
9669
#: en/help_topics/configuration.txt:98
9670
msgid ""
9671
"By default if ``BZR_PLUGIN_PATH`` is set, it replaces searching\n"
9672
"in ``user``. However it will continue to search in ``core`` and\n"
9673
"``site`` unless they are explicitly removed."
9674
msgstr ""
9675
9676
#: en/help_topics/configuration.txt:102
9677
msgid ""
9678
"If you need to change the order or remove one of these\n"
9679
"directories, you should use special values:"
9680
msgstr ""
9681
9682
#: en/help_topics/configuration.txt:105
9683
msgid ""
9684
"* ``-user``, ``-core``, ``-site`` will remove the corresponding\n"
9685
" path from the default values,"
9686
msgstr ""
9687
9688
#: en/help_topics/configuration.txt:108
9689
msgid ""
9690
"* ``+user``, ``+core``, ``+site`` will add the corresponding path\n"
9691
" before the remaining default values (and also remove it from\n"
9692
" the default values)."
9693
msgstr ""
9694
9695
#: en/help_topics/configuration.txt:112
9696
msgid ""
9697
"Note that the special values 'user', 'core' and 'site' should be\n"
9698
"used literally, they will be substituted by the corresponding,\n"
9699
"platform specific, values."
9700
msgstr ""
9701
9702
#: en/help_topics/configuration.txt:116
9703
msgid ""
9704
"The examples below use ':' as the separator, windows users\n"
9705
"should use ';'."
9706
msgstr ""
9707
9708
#: en/help_topics/configuration.txt:119
9709
msgid "Overriding the default user plugin directory::"
9710
msgstr ""
9711
9712
#: en/help_topics/configuration.txt:121
9713
msgid " BZR_PLUGIN_PATH='/path/to/my/other/plugins'"
9714
msgstr ""
9715
9716
#: en/help_topics/configuration.txt:123
9717
msgid "Disabling the site directory while retaining the user directory::"
9718
msgstr ""
9719
9720
#: en/help_topics/configuration.txt:125
9721
msgid " BZR_PLUGIN_PATH='-site:+user'"
9722
msgstr ""
9723
9724
#: en/help_topics/configuration.txt:127
9725
msgid "Disabling all plugins (better achieved with --no-plugins)::"
9726
msgstr ""
9727
9728
#: en/help_topics/configuration.txt:129
9729
msgid " BZR_PLUGIN_PATH='-user:-core:-site'"
9730
msgstr ""
9731
9732
#: en/help_topics/configuration.txt:131
9733
msgid "Overriding the default site plugin directory::"
9734
msgstr ""
9735
9736
#: en/help_topics/configuration.txt:133
9737
msgid " BZR_PLUGIN_PATH='/path/to/my/site/plugins:-site':+user"
9738
msgstr ""
9739
9740
#: en/help_topics/configuration.txt:135
9741
msgid ""
9742
"BZR_DISABLE_PLUGINS\n"
9743
"~~~~~~~~~~~~~~~~~~~"
9744
msgstr ""
9745
9746
#: en/help_topics/configuration.txt:138
9747
msgid ""
9748
"Under special circumstances (mostly when trying to diagnose a\n"
9749
"bug), it's better to disable a plugin (or several) rather than\n"
9750
"uninstalling them completely. Such plugins can be specified in\n"
9751
"the ``BZR_DISABLE_PLUGINS`` environment variable."
9752
msgstr ""
9753
9754
#: en/help_topics/configuration.txt:143
9755
msgid ""
9756
"In that case, ``bzr`` will stop loading the specified plugins and\n"
9757
"will raise an import error if they are explicitly imported (by\n"
9758
"another plugin that depends on them for example)."
9759
msgstr ""
9760
9761
#: en/help_topics/configuration.txt:147
9762
msgid "Disabling ``myplugin`` and ``yourplugin`` is achieved by::"
9763
msgstr ""
9764
9765
#: en/help_topics/configuration.txt:149
9766
msgid " BZR_DISABLE_PLUGINS='myplugin:yourplugin'"
9767
msgstr ""
9768
9769
#: en/help_topics/configuration.txt:151
9770
msgid ""
9771
"BZR_PLUGINS_AT\n"
9772
"~~~~~~~~~~~~~~"
9773
msgstr ""
9774
9775
#: en/help_topics/configuration.txt:154
9776
msgid ""
9777
"When adding a new feature or working on a bug in a plugin,\n"
9778
"developers often need to use a specific version of a given\n"
9779
"plugin. Since python requires that the directory containing the\n"
9780
"code is named like the plugin itself this make it impossible to\n"
9781
"use arbitrary directory names (using a two-level directory scheme\n"
9782
"is inconvenient). ``BZR_PLUGINS_AT`` allows such directories even\n"
9783
"if they don't appear in ``BZR_PLUGIN_PATH`` ."
9784
msgstr ""
9785
9786
#: en/help_topics/configuration.txt:162
9787
msgid ""
9788
"Plugins specified in this environment variable takes precedence\n"
9789
"over the ones in ``BZR_PLUGIN_PATH``."
9790
msgstr ""
9791
9792
#: en/help_topics/configuration.txt:165
9793
msgid ""
9794
"The variable specified a list of ``plugin_name@plugin path``,\n"
9795
"``plugin_name`` being the name of the plugin as it appears in\n"
9796
"python module paths, ``plugin_path`` being the path to the\n"
9797
"directory containing the plugin code itself\n"
9798
"(i.e. ``plugins/myplugin`` not ``plugins``). Use ':' as the list\n"
9799
"separator, use ';' on windows."
9800
msgstr ""
9801
9802
#: en/help_topics/configuration.txt:172
9803
msgid ""
9804
"Example:\n"
9805
"~~~~~~~~"
9806
msgstr ""
9807
9808
#: en/help_topics/configuration.txt:175
9809
msgid ""
9810
"Using a specific version of ``myplugin``:\n"
9811
"``BZR_PLUGINS_AT='myplugin@/home/me/bugfixes/123456-myplugin``"
9812
msgstr ""
9813
9814
#: en/help_topics/configuration.txt:178
9815
msgid ""
9816
"BZRPATH\n"
9817
"~~~~~~~"
9818
msgstr ""
9819
9820
#: en/help_topics/configuration.txt:181
9821
msgid "The path where Bazaar should look for shell plugin external commands."
9822
msgstr ""
9823
9824
#: en/help_topics/configuration.txt:183
9825
msgid ""
9826
"\n"
9827
"http_proxy, https_proxy\n"
9828
"~~~~~~~~~~~~~~~~~~~~~~~"
9829
msgstr ""
9830
9831
#: en/help_topics/configuration.txt:187
9832
msgid "Specifies the network proxy for outgoing connections, for example::"
9833
msgstr ""
9834
9835
#: en/help_topics/configuration.txt:189
9836
msgid ""
9837
" http_proxy=http://proxy.example.com:3128/ \n"
9838
" https_proxy=http://proxy.example.com:3128/"
9839
msgstr ""
9840
9841
#: en/help_topics/configuration.txt:192
9842
msgid ""
9843
"\n"
9844
"Configuration files\n"
9845
"-------------------"
9846
msgstr ""
9847
9848
#: en/help_topics/configuration.txt:196
9849
msgid ""
9850
"Location\n"
9851
"~~~~~~~~"
9852
msgstr ""
9853
9854
#: en/help_topics/configuration.txt:199
9855
msgid ""
9856
"Configuration files are located in ``$HOME/.bazaar`` on Unix and\n"
9857
"``C:\\Documents and Settings\\<username>\\Application Data\\Bazaar\\2.0`` "
9858
"on\n"
9859
"Windows. (You can check the location for your system by using\n"
9860
"``bzr version``.)"
9861
msgstr ""
9862
9863
#: en/help_topics/configuration.txt:204
9864
msgid "There are three primary configuration files in this location:"
9865
msgstr ""
9866
9867
#: en/help_topics/configuration.txt:206
9868
msgid "* ``bazaar.conf`` describes default configuration options,"
9869
msgstr ""
9870
9871
#: en/help_topics/configuration.txt:208
9872
msgid ""
9873
"* ``locations.conf`` describes configuration information for\n"
9874
" specific branch locations,"
9875
msgstr ""
9876
9877
#: en/help_topics/configuration.txt:211
9878
msgid ""
9879
"* ``authentication.conf`` describes credential information for\n"
9880
" remote servers."
9881
msgstr ""
9882
9883
#: en/help_topics/configuration.txt:214
9884
msgid ""
9885
"Each branch can also contain a configuration file that sets values specific\n"
9886
"to that branch. This file is found at ``.bzr/branch/branch.conf`` within "
9887
"the\n"
9888
"branch. This file is visible to all users of a branch, if you wish to "
9889
"override\n"
9890
"one of the values for a branch with a setting that is specific to you then "
9891
"you\n"
9892
"can do so in ``locations.conf``."
9893
msgstr ""
9894
9895
#: en/help_topics/configuration.txt:220
9896
msgid ""
9897
"General format\n"
9898
"~~~~~~~~~~~~~~"
9899
msgstr ""
9900
9901
#: en/help_topics/configuration.txt:223
9902
msgid ""
9903
"An ini file has three types of contructs: section headers, section\n"
9904
"options and comments."
9905
msgstr ""
9906
9907
#: en/help_topics/configuration.txt:226
9908
msgid ""
9909
"Comments\n"
9910
"^^^^^^^^"
9911
msgstr ""
9912
9913
#: en/help_topics/configuration.txt:229
9914
msgid ""
9915
"A comment is any line that starts with a \"#\" (sometimes called a \"hash\n"
9916
"mark\", \"pound sign\" or \"number sign\"). Comment lines are ignored by\n"
9917
"Bazaar when parsing ini files."
9918
msgstr ""
9919
9920
#: en/help_topics/configuration.txt:233
9921
msgid ""
9922
"Section headers\n"
9923
"^^^^^^^^^^^^^^^"
9924
msgstr ""
9925
9926
#: en/help_topics/configuration.txt:236
9927
msgid ""
9928
"A section header is a word enclosed in brackets that starts at the begining\n"
9929
"of a line. A typical section header looks like this::"
9930
msgstr ""
9931
9932
#: en/help_topics/configuration.txt:239
9933
msgid " [DEFAULT]"
9934
msgstr ""
9935
9936
#: en/help_topics/configuration.txt:241
9937
msgid ""
9938
"The only valid section headers for bazaar.conf currently are [DEFAULT] and\n"
9939
"[ALIASES]. Section headers are case sensitive. The default section provides "
9940
"for\n"
9941
"setting options which can be overridden with the branch config file."
9942
msgstr ""
9943
9944
#: en/help_topics/configuration.txt:245
9945
msgid ""
9946
"For ``locations.conf``, the options from the section with the\n"
9947
"longest matching section header are used to the exclusion of other\n"
9948
"potentially valid section headers. A section header uses the path for\n"
9949
"the branch as the section header. Some examples include::"
9950
msgstr ""
9951
9952
#: en/help_topics/configuration.txt:250
9953
msgid ""
9954
" [http://mybranches.isp.com/~jdoe/branchdir]\n"
9955
" [/home/jdoe/branches/]"
9956
msgstr ""
9957
9958
#: en/help_topics/configuration.txt:253
9959
msgid ""
9960
"\n"
9961
"Section options\n"
9962
"^^^^^^^^^^^^^^^"
9963
msgstr ""
9964
9965
#: en/help_topics/configuration.txt:257
9966
msgid ""
9967
"A section option resides within a section. A section option contains an\n"
9968
"option name, an equals sign and a value. For example::"
9969
msgstr ""
9970
9971
#: en/help_topics/configuration.txt:260
9972
msgid ""
9973
" email = John Doe <jdoe@isp.com>\n"
9974
" gpg_signing_key = Amy Pond <amy@example.com>"
9975
msgstr ""
9976
9977
#: en/help_topics/configuration.txt:263
9978
msgid ""
9979
"A option can reference other options by enclosing them in curly brackets::"
9980
msgstr ""
9981
9982
#: en/help_topics/configuration.txt:265
9983
msgid ""
9984
" my_branch_name = feature_x\n"
9985
" my_server = bzr+ssh://example.com\n"
9986
" push_location = {my_server}/project/{my_branch_name}"
9987
msgstr ""
9988
9989
#: en/help_topics/configuration.txt:269
9990
msgid ""
9991
"Option policies\n"
9992
"^^^^^^^^^^^^^^^"
9993
msgstr ""
9994
9995
#: en/help_topics/configuration.txt:272
9996
msgid ""
9997
"Options defined in a section affect the named directory or URL plus\n"
9998
"any locations they contain. Policies can be used to change how an\n"
9999
"option value is interpreted for contained locations. Currently\n"
10000
"there are three policies available:"
10001
msgstr ""
10002
10003
#: en/help_topics/configuration.txt:277
10004
msgid ""
10005
" none:\n"
10006
" the value is interpreted the same for contained locations. This is\n"
10007
" the default behaviour.\n"
10008
" norecurse:\n"
10009
" the value is only used for the exact location specified by the\n"
10010
" section name.\n"
10011
" appendpath:\n"
10012
" for contained locations, any additional path components are\n"
10013
" appended to the value."
10014
msgstr ""
10015
10016
#: en/help_topics/configuration.txt:287
10017
msgid ""
10018
"Policies are specified by keys with names of the form \"<option_name>:policy"
10019
"\".\n"
10020
"For example, to define the push location for a tree of branches, the\n"
10021
"following could be used::"
10022
msgstr ""
10023
10024
#: en/help_topics/configuration.txt:291
10025
msgid ""
10026
" [/top/location]\n"
10027
" push_location = sftp://example.com/location\n"
10028
" push_location:policy = appendpath"
10029
msgstr ""
10030
10031
#: en/help_topics/configuration.txt:295
10032
msgid ""
10033
"With this configuration, the push location for ``/top/location/branch1``\n"
10034
"would be ``sftp://example.com/location/branch1``."
10035
msgstr ""
10036
10037
#: en/help_topics/configuration.txt:298
10038
msgid ""
10039
"Section local options\n"
10040
"^^^^^^^^^^^^^^^^^^^^^"
10041
msgstr ""
10042
10043
#: en/help_topics/configuration.txt:301
10044
msgid ""
10045
"Some options are defined automatically inside a given section and can be\n"
10046
"refered to in this section only. "
10047
msgstr ""
10048
10049
#: en/help_topics/configuration.txt:304
10050
msgid "For example, the ``appendpath`` policy can be used like this::"
10051
msgstr ""
10052
10053
#: en/help_topics/configuration.txt:306
10054
msgid ""
10055
" [/home/vila/src/bzr/bugs]\n"
10056
" mypush = lp:~vila/bzr\n"
10057
" mypush:policy=appendpath"
10058
msgstr ""
10059
10060
#: en/help_topics/configuration.txt:310
10061
msgid "Using ``relpath`` to achieve the same result is done like this::"
10062
msgstr ""
10063
10064
#: en/help_topics/configuration.txt:312
10065
msgid ""
10066
" [/home/vila/src/bzr/bugs]\n"
10067
" mypush = lp:~vila/bzr/{relpath}"
10068
msgstr ""
10069
10070
#: en/help_topics/configuration.txt:315
10071
msgid ""
10072
"In both cases, when used in a directory like\n"
10073
"``/home/vila/src/bzr/bugs/832013-expand-in-stack`` we'll get::"
10074
msgstr ""
10075
10076
#: en/help_topics/configuration.txt:318 en/help_topics/configuration.txt:329
10077
msgid ""
10078
" $ bzr config mypush\n"
10079
" lp:~vila/bzr/832013-expand-in-stack"
10080
msgstr ""
10081
10082
#: en/help_topics/configuration.txt:321
10083
msgid "Another such option is ``basename`` which can be used like this::"
10084
msgstr ""
10085
10086
#: en/help_topics/configuration.txt:323
10087
msgid ""
10088
" [/home/vila/src/bzr]\n"
10089
" mypush = lp:~vila/bzr/{basename}"
10090
msgstr ""
10091
10092
#: en/help_topics/configuration.txt:326
10093
msgid ""
10094
"When used in a directory like\n"
10095
"``/home/vila/src/bzr/bugs/832013-expand-in-stack`` we'll get::"
10096
msgstr ""
10097
10098
#: en/help_topics/configuration.txt:332
10099
msgid ""
10100
"Note that ``basename`` here refers to the base name of ``relpath`` which\n"
10101
"itself is defined as the relative path between the section name and the\n"
10102
"location it matches."
10103
msgstr ""
10104
10105
#: en/help_topics/configuration.txt:336
10106
msgid ""
10107
"Another such option is ``branchname``, which refers to the name of a "
10108
"colocated\n"
10109
"branch. For non-colocated branches, it behaves like basename. It can be "
10110
"used\n"
10111
"like this::"
10112
msgstr ""
10113
10114
#: en/help_topics/configuration.txt:340
10115
msgid ""
10116
" [/home/vila/src/bzr/bugs]\n"
10117
" mypush = lp:~vila/bzr/{branchname}"
10118
msgstr ""
10119
10120
#: en/help_topics/configuration.txt:343
10121
msgid ""
10122
"When used with a colocated branch named ``832013-expand-in-stack``, we'll "
10123
"get::"
10124
msgstr ""
10125
10126
#: en/help_topics/configuration.txt:345
10127
msgid ""
10128
" bzr config mypush\n"
10129
" lp:~vila/bzr/832013-expand-in-stack"
10130
msgstr ""
10131
10132
#: en/help_topics/configuration.txt:348
10133
msgid ""
10134
"When an option is local to a Section, it cannot be referred to from option\n"
10135
"values in any other section from the same ``Store`` nor from any other\n"
10136
"``Store``."
10137
msgstr ""
10138
10139
#: en/help_topics/configuration.txt:352
10140
msgid ""
10141
"\n"
10142
"The main configuration file, bazaar.conf\n"
10143
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
10144
msgstr ""
10145
10146
#: en/help_topics/configuration.txt:356
10147
msgid ""
10148
"``bazaar.conf`` allows two sections: ``[DEFAULT]`` and ``[ALIASES]``.\n"
10149
"The default section contains the default\n"
10150
"configuration options for all branches. The default section can be\n"
10151
"overriden by providing a branch-specific section in ``locations.conf``."
10152
msgstr ""
10153
10154
#: en/help_topics/configuration.txt:361
10155
msgid "A typical ``bazaar.conf`` section often looks like the following::"
10156
msgstr ""
10157
10158
#: en/help_topics/configuration.txt:363
10159
msgid ""
10160
" [DEFAULT]\n"
10161
" email = John Doe <jdoe@isp.com>\n"
10162
" editor = /usr/bin/vim\n"
10163
" create_signatures = when-required"
10164
msgstr ""
10165
10166
#: en/help_topics/configuration.txt:368
10167
msgid ""
10168
"\n"
10169
"The branch location configuration file, locations.conf\n"
10170
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
10171
msgstr ""
10172
10173
#: en/help_topics/configuration.txt:372
10174
msgid ""
10175
"``locations.conf`` allows one to specify overriding settings for\n"
10176
"a specific branch. The format is almost identical to the default section in\n"
10177
"bazaar.conf with one significant change: The section header, instead of "
10178
"saying\n"
10179
"default, will be the path to a branch that you wish to override a value\n"
10180
"for. The '?' and '*' wildcards are supported::"
10181
msgstr ""
10182
10183
#: en/help_topics/configuration.txt:378
10184
msgid ""
10185
" [/home/jdoe/branches/nethack]\n"
10186
" email = Nethack Admin <nethack@nethack.com>"
10187
msgstr ""
10188
10189
#: en/help_topics/configuration.txt:381
10190
msgid ""
10191
" [http://hypothetical.site.com/branches/devel-branch]\n"
10192
" create_signatures = always"
10193
msgstr ""
10194
10195
#: en/help_topics/configuration.txt:384
10196
msgid ""
10197
"The authentication configuration file, authentication.conf\n"
10198
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
10199
msgstr ""
10200
10201
#: en/help_topics/configuration.txt:387
10202
msgid ""
10203
"``authentication.conf`` allows one to specify credentials for\n"
10204
"remote servers. This can be used for all the supported transports and any "
10205
"part\n"
10206
"of bzr that requires authentication (smtp for example)."
10207
msgstr ""
10208
10209
#: en/help_topics/configuration.txt:391
10210
msgid ""
10211
"The syntax of the file obeys the same rules as the others except for the\n"
10212
"option policies which don't apply."
10213
msgstr ""
10214
10215
#: en/help_topics/configuration.txt:394
10216
msgid ""
10217
"For more information on the possible uses of the authentication "
10218
"configuration\n"
10219
"file see :doc:`authentication-help`."
10220
msgstr ""
10221
10222
#: en/help_topics/configuration.txt:397
10223
msgid ""
10224
"\n"
10225
"Common options\n"
10226
"--------------"
10227
msgstr ""
10228
10229
#: en/help_topics/configuration.txt:401
10230
msgid ""
10231
"debug_flags\n"
10232
"~~~~~~~~~~~"
10233
msgstr ""
10234
10235
#: en/help_topics/configuration.txt:404
10236
msgid ""
10237
"A comma-separated list of debugging options to turn on. The same values\n"
10238
"can be used as with the -D command-line option (see `help global-options`).\n"
10239
"For example::"
10240
msgstr ""
10241
10242
#: en/help_topics/configuration.txt:408
10243
msgid " debug_flags = hpss"
10244
msgstr ""
10245
10246
#: en/help_topics/configuration.txt:412
10247
msgid " debug_flags = hpss,evil"
10248
msgstr ""
10249
10250
#: en/help_topics/configuration.txt:414
10251
msgid ""
10252
"email\n"
10253
"~~~~~"
10254
msgstr ""
10255
10256
#: en/help_topics/configuration.txt:417
10257
msgid ""
10258
"The email address to use when committing a branch. Typically takes the form\n"
10259
"of::"
10260
msgstr ""
10261
10262
#: en/help_topics/configuration.txt:420
10263
msgid " email = Full Name <account@hostname.tld>"
10264
msgstr ""
10265
10266
#: en/help_topics/configuration.txt:422
10267
msgid ""
10268
"editor\n"
10269
"~~~~~~"
10270
msgstr ""
10271
10272
#: en/help_topics/configuration.txt:425
10273
msgid ""
10274
"The path of the editor that you wish to use if *bzr commit* is run without\n"
10275
"a commit message. This setting is trumped by the environment variable\n"
10276
"``BZR_EDITOR``, and overrides the ``VISUAL`` and ``EDITOR`` environment\n"
10277
"variables."
10278
msgstr ""
10279
10280
#: en/help_topics/configuration.txt:430
10281
msgid ""
10282
"log_format\n"
10283
"~~~~~~~~~~"
10284
msgstr ""
10285
10286
#: en/help_topics/configuration.txt:433
10287
msgid ""
10288
"The default log format to use. Standard log formats are ``long``, ``short``\n"
10289
"and ``line``. Additional formats may be provided by plugins. The default\n"
10290
"value is ``long``."
10291
msgstr ""
10292
10293
#: en/help_topics/configuration.txt:437
10294
msgid ""
10295
"check_signatures\n"
10296
"~~~~~~~~~~~~~~~~"
10297
msgstr ""
10298
10299
#: en/help_topics/configuration.txt:440
10300
msgid ""
10301
"Reserved for future use. These options will allow a policy for branches to\n"
10302
"require signatures."
10303
msgstr ""
10304
10305
#: en/help_topics/configuration.txt:443
10306
msgid ""
10307
"require\n"
10308
" The gnupg signature for revisions must be present and must be valid."
10309
msgstr ""
10310
10311
#: en/help_topics/configuration.txt:446
10312
msgid ""
10313
"ignore\n"
10314
" Do not check gnupg signatures of revisions."
10315
msgstr ""
10316
10317
#: en/help_topics/configuration.txt:449
10318
msgid ""
10319
"check-available\n"
10320
" (default) If gnupg signatures for revisions are present, check them.\n"
10321
" Bazaar will fail if it finds a bad signature, but will not fail if\n"
10322
" no signature is present."
10323
msgstr ""
10324
10325
#: en/help_topics/configuration.txt:454
10326
msgid ""
10327
"create_signatures\n"
10328
"~~~~~~~~~~~~~~~~~"
10329
msgstr ""
10330
10331
#: en/help_topics/configuration.txt:457
10332
msgid ""
10333
"Defines the behaviour of signing revisions on commits. By default bzr will "
10334
"not\n"
10335
"sign new commits."
10336
msgstr ""
10337
10338
#: en/help_topics/configuration.txt:460
10339
msgid ""
10340
"always\n"
10341
" Sign every new revision that is committed. If the signing fails then "
10342
"the\n"
10343
" commit will not be made."
10344
msgstr ""
10345
10346
#: en/help_topics/configuration.txt:464
10347
msgid ""
10348
"when-required\n"
10349
" Reserved for future use."
10350
msgstr ""
10351
10352
#: en/help_topics/configuration.txt:467
10353
msgid ""
10354
"never\n"
10355
" Reserved for future use."
10356
msgstr ""
10357
10358
#: en/help_topics/configuration.txt:470
10359
msgid ""
10360
"In future it is planned that ``when-required`` will sign newly\n"
10361
"committed revisions only when the branch requires them. ``never`` will "
10362
"refuse\n"
10363
"to sign newly committed revisions, even if the branch requires signatures."
10364
msgstr ""
10365
10366
#: en/help_topics/configuration.txt:474
10367
msgid ""
10368
"dirstate.fdatasync\n"
10369
"~~~~~~~~~~~~~~~~~~"
10370
msgstr ""
10371
10372
#: en/help_topics/configuration.txt:477
10373
msgid ""
10374
"If true (default), working tree metadata changes are flushed through the\n"
10375
"OS buffers to physical disk. This is somewhat slower, but means data\n"
10376
"should not be lost if the machine crashes. See also repository.fdatasync."
10377
msgstr ""
10378
10379
#: en/help_topics/configuration.txt:481
10380
msgid ""
10381
"gpg_signing_key\n"
10382
"~~~~~~~~~~~~~~~"
10383
msgstr ""
10384
10385
#: en/help_topics/configuration.txt:484
10386
msgid ""
10387
"The GnuPG user identity to use when signing commits. Can be an e-mail\n"
10388
"address, key fingerprint or full key ID. When unset or when set to\n"
10389
"\"default\" Bazaar will use the user e-mail set with ``whoami``."
10390
msgstr ""
10391
10392
#: en/help_topics/configuration.txt:488
10393
msgid ""
10394
"recurse\n"
10395
"~~~~~~~"
10396
msgstr ""
10397
10398
#: en/help_topics/configuration.txt:491
10399
msgid ""
10400
"Only useful in ``locations.conf``. Defines whether or not the\n"
10401
"configuration for this section applies to subdirectories:"
10402
msgstr ""
10403
10404
#: en/help_topics/configuration.txt:494
10405
msgid ""
10406
"true\n"
10407
" (default) This section applies to subdirectories as well."
10408
msgstr ""
10409
10410
#: en/help_topics/configuration.txt:497
10411
msgid ""
10412
"false\n"
10413
" This section only applies to the branch at this directory and not\n"
10414
" branches below it."
10415
msgstr ""
10416
10417
#: en/help_topics/configuration.txt:501
10418
msgid ""
10419
"gpg_signing_command\n"
10420
"~~~~~~~~~~~~~~~~~~~"
10421
msgstr ""
10422
10423
#: en/help_topics/configuration.txt:504
10424
msgid ""
10425
"(Default: \"gpg\"). Which program should be used to sign and check "
10426
"revisions.\n"
10427
"For example::"
10428
msgstr ""
10429
10430
#: en/help_topics/configuration.txt:507
10431
msgid " gpg_signing_command = /usr/bin/gnpg"
10432
msgstr ""
10433
10434
#: en/help_topics/configuration.txt:509
10435
msgid ""
10436
"The specified command must accept the options \"--clearsign\" and \"-u "
10437
"<email>\"."
10438
msgstr ""
10439
10440
#: en/help_topics/configuration.txt:511
10441
msgid ""
10442
"bzr_remote_path\n"
10443
"~~~~~~~~~~~~~~~"
10444
msgstr ""
10445
10446
#: en/help_topics/configuration.txt:514
10447
msgid ""
10448
"(Default: \"bzr\"). The path to the command that should be used to run the "
10449
"smart\n"
10450
"server for bzr. This value may only be specified in locations.conf, because:"
10451
msgstr ""
10452
10453
#: en/help_topics/configuration.txt:517
10454
msgid ""
10455
"- it's needed before branch.conf is accessible\n"
10456
"- allowing remote branch.conf files to specify commands would be a security\n"
10457
" risk"
10458
msgstr ""
10459
10460
#: en/help_topics/configuration.txt:521
10461
msgid "It is overridden by the BZR_REMOTE_PATH environment variable."
10462
msgstr ""
10463
10464
#: en/help_topics/configuration.txt:523
10465
msgid ""
10466
"smtp_server\n"
10467
"~~~~~~~~~~~"
10468
msgstr ""
10469
10470
#: en/help_topics/configuration.txt:526
10471
msgid ""
10472
"(Default: \"localhost\"). SMTP server to use when Bazaar needs to send\n"
10473
"email, eg. with ``merge-directive --mail-to``, or the bzr-email plugin."
10474
msgstr ""
10475
10476
#: en/help_topics/configuration.txt:529
10477
msgid ""
10478
"smtp_username, smtp_password\n"
10479
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
10480
msgstr ""
10481
10482
#: en/help_topics/configuration.txt:532
10483
msgid ""
10484
"User and password to authenticate to the SMTP server. If smtp_username\n"
10485
"is set, and smtp_password is not, Bazaar will prompt for a password.\n"
10486
"These settings are only needed if the SMTP server requires authentication\n"
10487
"to send mail."
10488
msgstr ""
10489
10490
#: en/help_topics/configuration.txt:537
10491
msgid ""
10492
"locks.steal_dead\n"
10493
"~~~~~~~~~~~~~~~~"
10494
msgstr ""
10495
10496
#: en/help_topics/configuration.txt:540
10497
msgid ""
10498
"If set to true, bzr will automatically break locks held by processes from\n"
10499
"the same machine and user that are no longer alive. Otherwise, it will\n"
10500
"print a message and you can break the lock manually, if you are satisfied\n"
10501
"the object is no longer in use."
10502
msgstr ""
10503
10504
#: en/help_topics/configuration.txt:545
10505
msgid ""
10506
"mail_client\n"
10507
"~~~~~~~~~~~"
10508
msgstr ""
10509
10510
#: en/help_topics/configuration.txt:548
10511
msgid ""
10512
"A mail client to use for sending merge requests.\n"
10513
"By default, bzr will try to use ``mapi`` on Windows. On other platforms, "
10514
"it\n"
10515
"will try ``xdg-email``. If either of these fails, it will fall back to\n"
10516
"``editor``."
10517
msgstr ""
10518
10519
#: en/help_topics/configuration.txt:553
10520
msgid "Supported values for specific clients:"
10521
msgstr ""
10522
10523
#: en/help_topics/configuration.txt:555
10524
msgid ""
10525
":claws: Use Claws. This skips a dialog for attaching files.\n"
10526
":evolution: Use Evolution.\n"
10527
":kmail: Use KMail.\n"
10528
":mutt: Use Mutt.\n"
10529
":thunderbird: Use Mozilla Thunderbird or Icedove. For Thunderbird/Icedove "
10530
"1.5,\n"
10531
" this works around some bugs that xdg-email doesn't handle."
10532
msgstr ""
10533
10534
#: en/help_topics/configuration.txt:562
10535
msgid "Supported generic values are:"
10536
msgstr ""
10537
10538
#: en/help_topics/configuration.txt:564
10539
msgid ""
10540
":default: See above.\n"
10541
":editor: Use your editor to compose the merge request. This also uses\n"
10542
" your commit id, (see ``bzr whoami``), smtp_server and (optionally)\n"
10543
" smtp_username and smtp_password.\n"
10544
":mapi: Use your preferred e-mail client on Windows.\n"
10545
":xdg-email: Use xdg-email to run your preferred mail program"
10546
msgstr ""
10547
10548
#: en/help_topics/configuration.txt:571
10549
msgid ""
10550
"repository.fdatasync\n"
10551
"~~~~~~~~~~~~~~~~~~~~"
10552
msgstr ""
10553
10554
#: en/help_topics/configuration.txt:574
10555
msgid ""
10556
"If true (default), repository changes are flushed through the OS buffers\n"
10557
"to physical disk. This is somewhat slower, but means data should not be\n"
10558
"lost if the machine crashes. See also dirstate.fdatasync."
10559
msgstr ""
10560
10561
#: en/help_topics/configuration.txt:578
10562
msgid ""
10563
"submit_branch\n"
10564
"~~~~~~~~~~~~~"
10565
msgstr ""
10566
10567
#: en/help_topics/configuration.txt:581
10568
msgid ""
10569
"The branch you intend to submit your current work to. This is "
10570
"automatically\n"
10571
"set by ``bzr send``, and is also used by the ``submit:`` revision spec. "
10572
"This\n"
10573
"should usually be set on a per-branch or per-location basis."
10574
msgstr ""
10575
10576
#: en/help_topics/configuration.txt:585
10577
msgid ""
10578
"public_branch\n"
10579
"~~~~~~~~~~~~~"
10580
msgstr ""
10581
10582
#: en/help_topics/configuration.txt:588
10583
msgid ""
10584
"A publically-accessible version of this branch (implying that this version "
10585
"is\n"
10586
"not publically-accessible). Used (and set) by ``bzr send``."
10587
msgstr ""
10588
10589
#: en/help_topics/configuration.txt:591
10590
msgid ""
10591
"suppress_warnings\n"
10592
"~~~~~~~~~~~~~~~~~"
10593
msgstr ""
10594
10595
#: en/help_topics/configuration.txt:594
10596
msgid ""
10597
"A list of strings, each string represent a warning that can be emitted by\n"
10598
"bzr. Mentioning a warning in this list tells bzr to not emit it."
10599
msgstr ""
10600
10601
#: en/help_topics/configuration.txt:597
10602
msgid "Valid values:"
10603
msgstr ""
10604
10605
#: en/help_topics/configuration.txt:599
10606
msgid ""
10607
"* ``format_deprecation``:\n"
10608
" whether the format deprecation warning is shown on repositories that "
10609
"are\n"
10610
" using deprecated formats."
10611
msgstr ""
10612
10613
#: en/help_topics/configuration.txt:603
10614
msgid ""
10615
"default_format\n"
10616
"~~~~~~~~~~~~~~"
10617
msgstr ""
10618
10619
#: en/help_topics/configuration.txt:606
10620
msgid ""
10621
"A format name for the default format used when creating branches. See "
10622
"``bzr\n"
10623
"help formats`` for possible values."
10624
msgstr ""
10625
10626
#: en/help_topics/configuration.txt:609
10627
msgid ""
10628
"\n"
10629
"Unicode options\n"
10630
"---------------"
10631
msgstr ""
10632
10633
#: en/help_topics/configuration.txt:613
10634
msgid ""
10635
"output_encoding\n"
10636
"~~~~~~~~~~~~~~~"
10637
msgstr ""
10638
10639
#: en/help_topics/configuration.txt:616
10640
msgid ""
10641
"A Python unicode encoding name for text output from bzr, such as log\n"
10642
"information. Values include: utf8, cp850, ascii, iso-8859-1. The default\n"
10643
"is the terminal encoding prefered by the operating system."
10644
msgstr ""
10645
10646
#: en/help_topics/configuration.txt:620
10647
msgid ""
10648
"\n"
10649
"Branch type specific options\n"
10650
"----------------------------"
10651
msgstr ""
10652
10653
#: en/help_topics/configuration.txt:624
10654
msgid ""
10655
"These options apply only to branches that use the ``dirstate-tags`` or\n"
10656
"later format. They\n"
10657
"are usually set in ``.bzr/branch/branch.conf`` automatically, but may be\n"
10658
"manually set in ``locations.conf`` or ``bazaar.conf``."
10659
msgstr ""
10660
10661
#: en/help_topics/configuration.txt:629
10662
msgid ""
10663
"append_revisions_only\n"
10664
"~~~~~~~~~~~~~~~~~~~~~"
10665
msgstr ""
10666
10667
#: en/help_topics/configuration.txt:632
10668
msgid ""
10669
"If set to \"True\" then revisions can only be appended to the log, not\n"
10670
"removed. A branch with this setting enabled can only pull from another\n"
10671
"branch if the other branch's log is a longer version of its own. This is\n"
10672
"normally set by ``bzr init --append-revisions-only``. If you set it\n"
10673
"manually, use either 'True' or 'False' (case-sensitive) to maintain\n"
10674
"compatibility with previous bzr versions (older than 2.2)."
10675
msgstr ""
10676
10677
#: en/help_topics/configuration.txt:639
10678
msgid ""
10679
"parent_location\n"
10680
"~~~~~~~~~~~~~~~"
10681
msgstr ""
10682
10683
#: en/help_topics/configuration.txt:642
10684
msgid ""
10685
"If present, the location of the default branch for pull or merge. This "
10686
"option\n"
10687
"is normally set when creating a branch, the first ``pull`` or by ``pull\n"
10688
"--remember``."
10689
msgstr ""
10690
10691
#: en/help_topics/configuration.txt:646
10692
msgid ""
10693
"push_location\n"
10694
"~~~~~~~~~~~~~"
10695
msgstr ""
10696
10697
#: en/help_topics/configuration.txt:649
10698
msgid ""
10699
"If present, the location of the default branch for push. This option\n"
10700
"is normally set by the first ``push`` or ``push --remember``."
10701
msgstr ""
10702
10703
#: en/help_topics/configuration.txt:652
10704
msgid ""
10705
"push_strict\n"
10706
"~~~~~~~~~~~"
10707
msgstr ""
10708
10709
#: en/help_topics/configuration.txt:655
10710
msgid ""
10711
"If present, defines the ``--strict`` option default value for checking\n"
10712
"uncommitted changes before pushing."
10713
msgstr ""
10714
10715
#: en/help_topics/configuration.txt:658
10716
msgid ""
10717
"dpush_strict\n"
10718
"~~~~~~~~~~~~"
10719
msgstr ""
10720
10721
#: en/help_topics/configuration.txt:661
10722
msgid ""
10723
"If present, defines the ``--strict`` option default value for checking\n"
10724
"uncommitted changes before pushing into a different VCS without any\n"
10725
"custom bzr metadata."
10726
msgstr ""
10727
10728
#: en/help_topics/configuration.txt:665
10729
msgid ""
10730
"bound_location\n"
10731
"~~~~~~~~~~~~~~"
10732
msgstr ""
10733
10734
#: en/help_topics/configuration.txt:668
10735
msgid ""
10736
"The location that commits should go to when acting as a checkout.\n"
10737
"This option is normally set by ``bind``."
10738
msgstr ""
10739
10740
#: en/help_topics/configuration.txt:671
10741
msgid ""
10742
"bound\n"
10743
"~~~~~"
10744
msgstr ""
10745
10746
#: en/help_topics/configuration.txt:674
10747
msgid ""
10748
"If set to \"True\", the branch should act as a checkout, and push each "
10749
"commit to\n"
10750
"the bound_location. This option is normally set by ``bind``/``unbind``."
10751
msgstr ""
10752
10753
#: en/help_topics/configuration.txt:677
10754
msgid ""
10755
"send_strict\n"
10756
"~~~~~~~~~~~"
10757
msgstr ""
10758
10759
#: en/help_topics/configuration.txt:680
10760
msgid ""
10761
"If present, defines the ``--strict`` option default value for checking\n"
10762
"uncommitted changes before sending a merge directive."
10763
msgstr ""
10764
10765
#: en/help_topics/configuration.txt:683
10766
msgid ""
10767
"add.maximum_file_size\n"
10768
"~~~~~~~~~~~~~~~~~~~~~"
10769
msgstr ""
10770
10771
#: en/help_topics/configuration.txt:686
10772
msgid ""
10773
"Defines the maximum file size the command line \"add\" operation will allow\n"
10774
"in recursive mode, with files larger than this value being skipped. You "
10775
"may \n"
10776
"specify this value as an integer (in which case it is interpreted as "
10777
"bytes), \n"
10778
"or you may specify the value using SI units, i.e. 10KB, 20MB, 1G. A value of "
10779
"0 \n"
10780
"will disable skipping."
10781
msgstr ""
10782
10783
#: en/help_topics/configuration.txt:692
10784
msgid ""
10785
"External Merge Tools\n"
10786
"--------------------"
10787
msgstr ""
10788
10789
#: en/help_topics/configuration.txt:695
10790
msgid ""
10791
"bzr.mergetool.<name>\n"
10792
"~~~~~~~~~~~~~~~~~~~~"
10793
msgstr ""
10794
10795
#: en/help_topics/configuration.txt:698
10796
msgid ""
10797
"Defines an external merge tool called <name> with the given command-line.\n"
10798
"Arguments containing spaces should be quoted using single or double quotes. "
10799
"The\n"
10800
"executable may omit its path if it can be found on the PATH."
10801
msgstr ""
10802
10803
#: en/help_topics/configuration.txt:702
10804
msgid ""
10805
"The following markers can be used in the command-line to substitute "
10806
"filenames\n"
10807
"involved in the merge conflict::"
10808
msgstr ""
10809
10810
#: en/help_topics/configuration.txt:705
10811
msgid ""
10812
" {base} file.BASE\n"
10813
" {this} file.THIS\n"
10814
" {other} file.OTHER\n"
10815
" {result} output file\n"
10816
" {this_temp} temp copy of file.THIS, used to overwrite output file if "
10817
"merge\n"
10818
" succeeds."
10819
msgstr ""
10820
10821
#: en/help_topics/configuration.txt:714
10822
msgid " bzr.mergetool.kdiff3 = kdiff3 {base} {this} {other} -o {result}"
10823
msgstr ""
10824
10825
#: en/help_topics/configuration.txt:716
10826
msgid ""
10827
"Because ``mergetool`` and ``config`` itself both use curly braces as\n"
10828
"interpolation markers, trying to display the mergetool line results in the\n"
10829
"following problem::"
10830
msgstr ""
10831
10832
#: en/help_topics/configuration.txt:720
10833
msgid ""
10834
"\n"
10835
" $ bzr config bzr.mergetool.kdiff3='kdiff3 {base} {this} {other} -o "
10836
"{result}'\n"
10837
" $ bzr config bzr.mergetool.kdiff3\n"
10838
" bzr: ERROR: Option base is not defined while expanding \"kdiff3 {base} "
10839
"{this} {other} -o {result}\"."
10840
msgstr ""
10841
10842
#: en/help_topics/configuration.txt:725
10843
msgid ""
10844
"To avoid this, ``config`` can be instructed not to try expanding variables::"
10845
msgstr ""
10846
10847
#: en/help_topics/configuration.txt:727
10848
msgid ""
10849
" $ bzr config --all bzr.mergetool.kdiff3\n"
10850
" branch:\n"
10851
" bzr.mergetool.kdiff3 = kdiff3 {base} {this} {other} -o {result}"
10852
msgstr ""
10853
10854
#: en/help_topics/configuration.txt:731
10855
msgid ""
10856
"\n"
10857
"bzr.default_mergetool\n"
10858
"~~~~~~~~~~~~~~~~~~~~~"
10859
msgstr ""
10860
10861
#: en/help_topics/configuration.txt:735
10862
msgid ""
10863
"Specifies which external merge tool (as defined above) should be selected "
10864
"by\n"
10865
"default in tools such as ``bzr qconflicts``."
10866
msgstr ""
10867
10868
#: en/help_topics/configuration.txt:740
10869
msgid " bzr.default_mergetool = kdiff3\n"
10870
msgstr ""
10871
10872
#: en/help_topics/conflict-types.txt:1
10873
msgid ""
10874
"Conflict Types\n"
10875
"=============="
10876
msgstr ""
10877
10878
#: en/help_topics/conflict-types.txt:4
10879
msgid ""
10880
"Some operations, like merge, revert and pull, modify the contents of your\n"
10881
"working tree. These modifications are programmatically generated, and so "
10882
"they\n"
10883
"may conflict with the current state of your working tree. "
10884
msgstr ""
10885
10886
#: en/help_topics/conflict-types.txt:8
10887
msgid ""
10888
"When conflicts are present in your working tree (as shown by ``bzr\n"
10889
"conflicts``), you should resolve them and then inform bzr that the "
10890
"conflicts\n"
10891
"have been resolved."
10892
msgstr ""
10893
10894
#: en/help_topics/conflict-types.txt:12
10895
msgid ""
10896
"Resolving conflicts is sometimes not obvious. Either because the user that\n"
10897
"should resolve them is not the one responsible for their occurrence, as is "
10898
"the\n"
10899
"case when merging other people's work or because some conflicts are "
10900
"presented\n"
10901
"in a way that is not easy to understand."
10902
msgstr ""
10903
10904
#: en/help_topics/conflict-types.txt:17
10905
msgid ""
10906
"Bazaar tries to avoid conflicts ; its aim is to ask you to resolve the\n"
10907
"conflict if and only if there's an actual conceptual conflict in the source\n"
10908
"tree. Because Bazaar doesn't understand the real meaning of the files "
10909
"being\n"
10910
"versioned, it can, when faced with ambiguities, fall short in either "
10911
"direction\n"
10912
"trying to resolve the conflict itself. Many kinds of changes can be "
10913
"combined\n"
10914
"programmatically, but sometimes only a human can determine the right thing "
10915
"to\n"
10916
"do."
10917
msgstr ""
10918
10919
#: en/help_topics/conflict-types.txt:25
10920
msgid ""
10921
"When Bazaar generates a conflict, it adds information into the working tree "
10922
"to\n"
10923
"present the conflicting versions, and it's up to you to find the correct\n"
10924
"resolution."
10925
msgstr ""
10926
10927
#: en/help_topics/conflict-types.txt:29
10928
msgid "Whatever the conflict is, resolving it is roughly done in two steps:"
10929
msgstr ""
10930
10931
#: en/help_topics/conflict-types.txt:31
10932
msgid ""
10933
"1. Modify the working tree content so that the conflicted item is now in "
10934
"the\n"
10935
" state you want to keep, then"
10936
msgstr ""
10937
10938
#: en/help_topics/conflict-types.txt:34
10939
msgid ""
10940
"2. Inform Bazaar that the conflict is now solved and ask to cleanup any\n"
10941
" remaining generated information (``bzr resolve <item>``)."
10942
msgstr ""
10943
10944
#: en/help_topics/conflict-types.txt:37
10945
msgid ""
10946
"For most conflict types, there are some obvious ways to modify the working\n"
10947
"tree and put it into the desired state. For some types of conflicts, Bazaar\n"
10948
"itself already made a choice, when possible."
10949
msgstr ""
10950
10951
#: en/help_topics/conflict-types.txt:41
10952
msgid ""
10953
"Yet, whether Bazaar makes a choice or not, there are some other simple but\n"
10954
"different ways to resolve the conflict."
10955
msgstr ""
10956
10957
#: en/help_topics/conflict-types.txt:44
10958
msgid ""
10959
"Each type of conflict is explained below, and the action which must be done "
10960
"to\n"
10961
"resolve the conflict is outlined."
10962
msgstr ""
10963
10964
#: en/help_topics/conflict-types.txt:47
10965
msgid ""
10966
"Various actions are available depending on the kind of conflict, for some "
10967
"of\n"
10968
"these actions, Bazaar can provide some help. In the end you should at least\n"
10969
"inform Bazaar that you're done with the conflict with::"
10970
msgstr ""
10971
10972
#: en/help_topics/conflict-types.txt:51
10973
msgid " ``bzr resolve FILE --action=done'"
10974
msgstr ""
10975
10976
#: en/help_topics/conflict-types.txt:53
10977
msgid ""
10978
"Note that this is the default action when a single file is involved so you "
10979
"can\n"
10980
"simply use::"
10981
msgstr ""
10982
10983
#: en/help_topics/conflict-types.txt:56
10984
msgid " ``bzr resolve FILE``"
10985
msgstr ""
10986
10987
#: en/help_topics/conflict-types.txt:58
10988
msgid "See ``bzr help resolve`` for more details."
10989
msgstr ""
10990
10991
#: en/help_topics/conflict-types.txt:60
10992
msgid ""
10993
"Text conflicts\n"
10994
"--------------"
10995
msgstr ""
10996
10997
#: en/help_topics/conflict-types.txt:63 en/help_topics/conflict-types.txt:120
10998
#: en/help_topics/conflict-types.txt:151 en/help_topics/conflict-types.txt:175
10999
#: en/help_topics/conflict-types.txt:198 en/help_topics/conflict-types.txt:213
11000
#: en/help_topics/conflict-types.txt:239 en/help_topics/conflict-types.txt:281
11001
#: en/help_topics/conflict-types.txt:303 en/help_topics/conflict-types.txt:339
11002
msgid "Typical message::"
11003
msgstr ""
11004
11005
#: en/help_topics/conflict-types.txt:65
11006
msgid " Text conflict in FILE"
11007
msgstr ""
11008
11009
#: en/help_topics/conflict-types.txt:67
11010
msgid ""
11011
"These are produced when a text merge cannot completely reconcile two sets "
11012
"of\n"
11013
"text changes. Bazaar will emit files for each version with the extensions\n"
11014
"THIS, OTHER, and BASE. THIS is the version of the file from the target "
11015
"tree,\n"
11016
"i.e. the tree that you are merging changes into. OTHER is the version that "
11017
"you\n"
11018
"are merging into the target. BASE is an older version that is used as a "
11019
"basis\n"
11020
"for comparison."
11021
msgstr ""
11022
11023
#: en/help_topics/conflict-types.txt:74
11024
msgid ""
11025
"In the main copy of the file, Bazaar will include all the changes that it\n"
11026
"could reconcile, and any un-reconciled conflicts are surrounded by\n"
11027
"\"herringbone\" markers like ``<<<<<<<``."
11028
msgstr ""
11029
11030
#: en/help_topics/conflict-types.txt:78
11031
msgid ""
11032
"Say the initial text is \"The project leader released it.\", and THIS "
11033
"modifies it\n"
11034
"to \"Martin Pool released it.\", while OTHER modifies it to \"The project "
11035
"leader\n"
11036
"released Bazaar.\" A conflict would look like this::"
11037
msgstr ""
11038
11039
#: en/help_topics/conflict-types.txt:82
11040
msgid ""
11041
" <<<<<<< TREE\n"
11042
" Martin Pool released it.\n"
11043
" =======\n"
11044
" The project leader released Bazaar.\n"
11045
" >>>>>>> MERGE-SOURCE"
11046
msgstr ""
11047
11048
#: en/help_topics/conflict-types.txt:88
11049
msgid "The correct resolution would be \"Martin Pool released Bazaar.\""
11050
msgstr ""
11051
11052
#: en/help_topics/conflict-types.txt:90
11053
msgid ""
11054
"You can handle text conflicts either by editing the main copy of the file,\n"
11055
"or by invoking external tools on the THIS, OTHER and BASE versions. It's\n"
11056
"worth mentioning that resolving text conflicts rarely involves picking one\n"
11057
"set of changes over the other (but see below when you encounter these\n"
11058
"cases). More often, the two sets of changes must be intelligently combined."
11059
msgstr ""
11060
11061
#: en/help_topics/conflict-types.txt:96
11062
msgid ""
11063
"If you edit the main copy, be sure to remove the herringbone markers. When\n"
11064
"you are done editing, the file should look like it never had a conflict, and "
11065
"be\n"
11066
"ready to commit."
11067
msgstr ""
11068
11069
#: en/help_topics/conflict-types.txt:100
11070
msgid ""
11071
"When you have resolved text conflicts, just run ``bzr resolve --auto``, and\n"
11072
"Bazaar will auto-detect which conflicts you have resolved."
11073
msgstr ""
11074
11075
#: en/help_topics/conflict-types.txt:103
11076
msgid ""
11077
"When the conflict is resolved, Bazaar deletes the previously generated\n"
11078
"``.BASE``, ``.THIS`` and ``.OTHER`` files if they are still present in the\n"
11079
"working tree."
11080
msgstr ""
11081
11082
#: en/help_topics/conflict-types.txt:107
11083
msgid ""
11084
"\n"
11085
"When you want to pick one set of changes over the other, you can use ``bzr\n"
11086
"resolve`` with one of the following actions:"
11087
msgstr ""
11088
11089
#: en/help_topics/conflict-types.txt:111
11090
msgid ""
11091
"* ``--action=take-this`` will issue ``mv FILE.THIS FILE``,\n"
11092
"* ``--action=take-other`` will issue ``mv FILE.OTHER FILE``."
11093
msgstr ""
11094
11095
#: en/help_topics/conflict-types.txt:114
11096
msgid ""
11097
"Note that if you have modified ``FILE.THIS`` or ``FILE.OTHER``, these\n"
11098
"modifications will be taken into account."
11099
msgstr ""
11100
11101
#: en/help_topics/conflict-types.txt:117
11102
msgid ""
11103
"Content conflicts\n"
11104
"-----------------"
11105
msgstr ""
11106
11107
#: en/help_topics/conflict-types.txt:122
11108
msgid " Contents conflict in FILE"
11109
msgstr ""
11110
11111
#: en/help_topics/conflict-types.txt:124
11112
msgid ""
11113
"This conflict happens when there are conflicting changes in the working "
11114
"tree\n"
11115
"and the merge source, but the conflicted items are not text files. They "
11116
"may\n"
11117
"be binary files, or symlinks, or directories. It can even happen with "
11118
"files\n"
11119
"that are deleted on one side, and modified on the other."
11120
msgstr ""
11121
11122
#: en/help_topics/conflict-types.txt:129
11123
msgid ""
11124
"Like text conflicts, Bazaar will emit THIS, OTHER and BASE files. (They may "
11125
"be\n"
11126
"regular files, symlinks or directories). But it will not include a \"main "
11127
"copy\"\n"
11128
"of the file with herringbone conflict markers. It will appear that the "
11129
"\"main\n"
11130
"copy\" has been renamed to THIS or OTHER."
11131
msgstr ""
11132
11133
#: en/help_topics/conflict-types.txt:134 en/help_topics/conflict-types.txt:182
11134
msgid ""
11135
"To resolve that kind of conflict, you should rebuild FILE from either "
11136
"version\n"
11137
"or a combination of both."
11138
msgstr ""
11139
11140
#: en/help_topics/conflict-types.txt:137 en/help_topics/conflict-types.txt:185
11141
#: en/help_topics/conflict-types.txt:226 en/help_topics/conflict-types.txt:252
11142
#: en/help_topics/conflict-types.txt:291 en/help_topics/conflict-types.txt:326
11143
#: en/help_topics/conflict-types.txt:361
11144
msgid "``bzr resolve`` recognizes the following actions:"
11145
msgstr ""
11146
11147
#: en/help_topics/conflict-types.txt:139
11148
msgid ""
11149
"* ``--action=take-this`` will issue ``bzr mv FILE.THIS FILE``,\n"
11150
"* ``--action=take-other`` will issue ``bzr mv FILE.OTHER FILE``,\n"
11151
"* ``--action=done`` will just mark the conflict as resolved."
11152
msgstr ""
11153
11154
#: en/help_topics/conflict-types.txt:143
11155
msgid ""
11156
"Any action will also delete the previously generated ``.BASE``, ``.THIS`` "
11157
"and\n"
11158
"``.OTHER`` files if they are still present in the working tree."
11159
msgstr ""
11160
11161
#: en/help_topics/conflict-types.txt:146 en/help_topics/conflict-types.txt:193
11162
#: en/help_topics/conflict-types.txt:234 en/help_topics/conflict-types.txt:276
11163
#: en/help_topics/conflict-types.txt:298 en/help_topics/conflict-types.txt:334
11164
#: en/help_topics/conflict-types.txt:369
11165
msgid ""
11166
"Bazaar cannot auto-detect when conflicts of this kind have been resolved."
11167
msgstr ""
11168
11169
#: en/help_topics/conflict-types.txt:148
11170
msgid ""
11171
"Tag conflicts\n"
11172
"-------------"
11173
msgstr ""
11174
11175
#: en/help_topics/conflict-types.txt:153
11176
msgid ""
11177
" Conflicting tags:\n"
11178
" version-0.1"
11179
msgstr ""
11180
11181
#: en/help_topics/conflict-types.txt:156
11182
msgid ""
11183
"When pulling from or pushing to another branch, Bazaar informs you about "
11184
"tags\n"
11185
"that conflict between the two branches; that is the same tag points to two\n"
11186
"different revisions. You need not resolve these conflicts, but subsequent\n"
11187
"uses of pull or push will result in the same message."
11188
msgstr ""
11189
11190
#: en/help_topics/conflict-types.txt:161
11191
msgid ""
11192
"To resolve the conflict, you must apply the correct tags to either the "
11193
"target\n"
11194
"branch or the source branch as appropriate. Use \"bzr tags --show-ids -d\n"
11195
"SOURCE_URL\" to see the tags in the source branch. If you want to make the\n"
11196
"target branch's tags match the source branch, then in the target branch do\n"
11197
"``bzr tag --force -r revid:REVISION_ID CONFLICTING_TAG`` for each of the\n"
11198
"CONFLICTING_TAGs, where REVISION_ID comes from the list of tags in the "
11199
"source\n"
11200
"branch. You need not call \"bzr resolve\" after doing this. To resolve in\n"
11201
"favor of the target branch, you need to similarly use ``tag --force`` in "
11202
"the\n"
11203
"source branch. (Note that pulling or pushing using --overwrite will "
11204
"overwrite\n"
11205
"all tags as well.)"
11206
msgstr ""
11207
11208
#: en/help_topics/conflict-types.txt:172
11209
msgid ""
11210
"Duplicate paths\n"
11211
"---------------"
11212
msgstr ""
11213
11214
#: en/help_topics/conflict-types.txt:177
11215
msgid " Conflict adding file FILE. Moved existing file to FILE.moved."
11216
msgstr ""
11217
11218
#: en/help_topics/conflict-types.txt:179
11219
msgid ""
11220
"Sometimes Bazaar will attempt to create a file using a pathname that has\n"
11221
"already been used. The existing file will be renamed to \"FILE.moved\". "
11222
msgstr ""
11223
11224
#: en/help_topics/conflict-types.txt:187
11225
msgid ""
11226
"* ``--action=take-this`` will issue ``bzr rm FILE ; bzr mv FILE.moved "
11227
"FILE``,\n"
11228
"* ``--action=take-other`` will issue ``bzr rm FILE.moved``,\n"
11229
"* ``--action=done`` will just mark the conflict as resolved."
11230
msgstr ""
11231
11232
#: en/help_topics/conflict-types.txt:191
11233
msgid ""
11234
"Note that you must get rid of FILE.moved before using ``--action=done``."
11235
msgstr ""
11236
11237
#: en/help_topics/conflict-types.txt:195
11238
msgid ""
11239
"Unversioned parent\n"
11240
"------------------"
11241
msgstr ""
11242
11243
#: en/help_topics/conflict-types.txt:200
11244
msgid " Conflict because FILE is not versioned, but has versioned children."
11245
msgstr ""
11246
11247
#: en/help_topics/conflict-types.txt:202
11248
msgid ""
11249
"Sometimes Bazaar will attempt to create a file whose parent directory is "
11250
"not\n"
11251
"versioned. This happens when the directory has been deleted in the target,\n"
11252
"but has a new child in the source, or vice versa. In this situation, "
11253
"Bazaar\n"
11254
"will version the parent directory as well. Resolving this issue depends\n"
11255
"very much on the particular scenario. You may wish to rename or delete "
11256
"either\n"
11257
"the file or the directory. When you are satisfied, you can run \"bzr "
11258
"resolve\n"
11259
"FILE\" to mark the conflict as resolved."
11260
msgstr ""
11261
11262
#: en/help_topics/conflict-types.txt:210
11263
msgid ""
11264
"Missing parent\n"
11265
"--------------"
11266
msgstr ""
11267
11268
#: en/help_topics/conflict-types.txt:215
11269
msgid " Conflict adding files to FILE. Created directory."
11270
msgstr ""
11271
11272
#: en/help_topics/conflict-types.txt:217
11273
msgid ""
11274
"This happens when a directory has been deleted in the target, but has new\n"
11275
"children in the source. This is similar to the \"unversioned parent\" "
11276
"conflict,\n"
11277
"except that the parent directory does not *exist*, instead of just being\n"
11278
"unversioned. In this situation, Bazaar will create the missing parent.\n"
11279
"Resolving this issue depends very much on the particular scenario."
11280
msgstr ""
11281
11282
#: en/help_topics/conflict-types.txt:223 en/help_topics/conflict-types.txt:249
11283
msgid ""
11284
"To resolve that kind of conflict, you should either remove or rename the\n"
11285
"children or the directory or a combination of both."
11286
msgstr ""
11287
11288
#: en/help_topics/conflict-types.txt:228
11289
msgid ""
11290
"* ``--action=take-this`` will issue ``bzr rm directory`` including the\n"
11291
" children,\n"
11292
"* ``--action=take-other`` will acknowledge Bazaar choice to keep the "
11293
"children\n"
11294
" and restoring the directory,\n"
11295
"* ``--action=done`` will just mark the conflict as resolved."
11296
msgstr ""
11297
11298
#: en/help_topics/conflict-types.txt:236
11299
msgid ""
11300
"Deleting parent\n"
11301
"---------------"
11302
msgstr ""
11303
11304
#: en/help_topics/conflict-types.txt:241
11305
msgid " Conflict: can't delete DIR because it is not empty. Not deleting."
11306
msgstr ""
11307
11308
#: en/help_topics/conflict-types.txt:243
11309
msgid ""
11310
"This is the opposite of \"missing parent\". A directory is deleted in the\n"
11311
"source, but has new children in the target (either because a directory\n"
11312
"deletion is merged or because the merge introduce new children). Bazaar\n"
11313
"will retain the directory. Resolving this issue depends very much on the\n"
11314
"particular scenario."
11315
msgstr ""
11316
11317
#: en/help_topics/conflict-types.txt:254
11318
msgid ""
11319
"* ``--action=take-this`` will acknowledge Bazaar choice to keep the "
11320
"directory,"
11321
msgstr ""
11322
11323
#: en/help_topics/conflict-types.txt:256
11324
msgid ""
11325
"* ``--action=take-other`` will issue ``bzr rm directory`` including the \n"
11326
" children,"
11327
msgstr ""
11328
11329
#: en/help_topics/conflict-types.txt:259
11330
msgid "* ``--action=done`` will just mark the conflict as resolved."
11331
msgstr ""
11332
11333
#: en/help_topics/conflict-types.txt:261
11334
msgid ""
11335
"Note that when merging a directory deletion, if unversioned files are\n"
11336
"present, they become potential orphans has they don't have a directory\n"
11337
"parent anymore."
11338
msgstr ""
11339
11340
#: en/help_topics/conflict-types.txt:265
11341
msgid ""
11342
"Handling such orphans, *before* the conflict is created, is controlled by\n"
11343
"setting the ``bzr.transform.orphan_policy`` configuration option."
11344
msgstr ""
11345
11346
#: en/help_topics/conflict-types.txt:268
11347
msgid "There are two possible values for this option:"
11348
msgstr ""
11349
11350
#: en/help_topics/conflict-types.txt:270
11351
msgid ""
11352
"* ``conflict`` (the default): will leave the orphans in place and\n"
11353
" generate a conflicts,"
11354
msgstr ""
11355
11356
#: en/help_topics/conflict-types.txt:273
11357
msgid ""
11358
"* ``move``: will move the orphans to a ``bzr-orphans`` directory at the "
11359
"root\n"
11360
" of the working tree with names like ``<file>.~#~``."
11361
msgstr ""
11362
11363
#: en/help_topics/conflict-types.txt:278
11364
msgid ""
11365
"Path conflict\n"
11366
"-------------"
11367
msgstr ""
11368
11369
#: en/help_topics/conflict-types.txt:283
11370
msgid " Path conflict: PATH1 / PATH2"
11371
msgstr ""
11372
11373
#: en/help_topics/conflict-types.txt:285
11374
msgid ""
11375
"This happens when the source and target have each modified the name or "
11376
"parent\n"
11377
"directory of a file. Bazaar will use the path elements from the source."
11378
msgstr ""
11379
11380
#: en/help_topics/conflict-types.txt:288
11381
msgid ""
11382
"To resolve that kind of conflict, you just have to decide what name should "
11383
"be\n"
11384
"retained for the file involved."
11385
msgstr ""
11386
11387
#: en/help_topics/conflict-types.txt:293
11388
msgid ""
11389
"* ``--action=take-this`` will revert Bazaar choice and keep ``PATH1`` by\n"
11390
" issuing ``bzr mv PATH2 PATH1``,\n"
11391
"* ``--action=take-other`` will acknowledge Bazaar choice of keeping "
11392
"``PATH2``,\n"
11393
"* ``--action=done`` will just mark the conflict as resolved."
11394
msgstr ""
11395
11396
#: en/help_topics/conflict-types.txt:300
11397
msgid ""
11398
"Parent loop\n"
11399
"-----------"
11400
msgstr ""
11401
11402
#: en/help_topics/conflict-types.txt:305
11403
msgid " Conflict moving FILE into DIRECTORY. Cancelled move."
11404
msgstr ""
11405
11406
#: en/help_topics/conflict-types.txt:307
11407
msgid ""
11408
"This happens when the source and the target have each moved directories, so\n"
11409
"that, if the change could be applied, a directory would be contained by "
11410
"itself.\n"
11411
"For example::"
11412
msgstr ""
11413
11414
#: en/help_topics/conflict-types.txt:311
11415
msgid ""
11416
" $ bzr init\n"
11417
" $ bzr mkdir white\n"
11418
" $ bzr mkdir black\n"
11419
" $ bzr commit -m \"BASE\"\n"
11420
" $ bzr branch . ../other\n"
11421
" $ bzr mv white black\n"
11422
" $ bzr commit -m \"THIS\"\n"
11423
" $ bzr mv ../other/black ../other/white\n"
11424
" $ bzr commit ../other -m \"OTHER\"\n"
11425
" $ bzr merge ../other"
11426
msgstr ""
11427
11428
#: en/help_topics/conflict-types.txt:322
11429
msgid ""
11430
"In this situation, Bazaar will cancel the move, and leave ``white`` in\n"
11431
"``black``. To resolve that kind of conflict, you just have to decide what\n"
11432
"name should be retained for the directories involved."
11433
msgstr ""
11434
11435
#: en/help_topics/conflict-types.txt:328
11436
msgid ""
11437
"* ``--action=take-this`` will acknowledge Bazaar choice of leaving "
11438
"``white`` \n"
11439
" in ``black``,\n"
11440
"* ``--action=take-other`` will revert Bazaar choice and move ``black`` in\n"
11441
" ``white`` by issuing ``bzr mv black/white white ; bzr mv black white``,\n"
11442
"* ``--action=done`` will just mark the conflict as resolved."
11443
msgstr ""
11444
11445
#: en/help_topics/conflict-types.txt:336
11446
msgid ""
11447
"Non-directory parent\n"
11448
"--------------------"
11449
msgstr ""
11450
11451
#: en/help_topics/conflict-types.txt:341
11452
msgid ""
11453
" Conflict: foo.new is not a directory, but has files in it.\n"
11454
" Created directory."
11455
msgstr ""
11456
11457
#: en/help_topics/conflict-types.txt:344
11458
msgid ""
11459
"This happens when one side has added files to a directory, and the other "
11460
"side\n"
11461
"has changed the directory into a file or symlink. For example::"
11462
msgstr ""
11463
11464
#: en/help_topics/conflict-types.txt:347
11465
msgid ""
11466
" $ bzr init\n"
11467
" $ bzr mkdir foo\n"
11468
" $ bzr commit -m \"BASE\"\n"
11469
" $ bzr branch . ../other\n"
11470
" $ rmdir foo\n"
11471
" $ touch foo\n"
11472
" $ bzr commit -m \"THIS\"\n"
11473
" $ bzr mkdir ../other/foo/bar\n"
11474
" $ bzr commit ../other -m \"OTHER\"\n"
11475
" $ bzr merge ../other"
11476
msgstr ""
11477
11478
#: en/help_topics/conflict-types.txt:358
11479
msgid ""
11480
"To resolve that kind of conflict, you have to decide what name should be\n"
11481
"retained for the file, directory or symlink involved."
11482
msgstr ""
11483
11484
#: en/help_topics/conflict-types.txt:363
11485
msgid ""
11486
"* ``--action=take-this`` will issue ``bzr rm --force foo.new`` and \n"
11487
" ``bzr add foo``,\n"
11488
"* ``--action=take-other`` will issue ``bzr rm --force foo`` and \n"
11489
" ``bzr mv foo.new foo``,\n"
11490
"* ``--action=done`` will just mark the conflict as resolved."
11491
msgstr ""
11492
11493
#: en/help_topics/conflict-types.txt:371
11494
msgid ""
11495
"MalformedTransform\n"
11496
"------------------"
11497
msgstr ""
11498
11499
#: en/help_topics/conflict-types.txt:374
11500
msgid ""
11501
"It is possible (though very rare) for Bazaar to raise a MalformedTransform\n"
11502
"exception. This means that Bazaar encountered a filesystem conflict that it "
11503
"was\n"
11504
"unable to resolve. This usually indicates a bug. Please let us know if "
11505
"you\n"
11506
"encounter this. Our bug tracker is at https://launchpad.net/bzr/+bugs\n"
11507
msgstr ""
11508
11509
#: en/help_topics/content-filters.txt:1
11510
msgid ""
11511
"Content Filters\n"
11512
"==============="
11513
msgstr ""
11514
11515
#: en/help_topics/content-filters.txt:4
11516
msgid ""
11517
"Content formats\n"
11518
"---------------"
11519
msgstr ""
11520
11521
#: en/help_topics/content-filters.txt:7
11522
msgid ""
11523
"Bazaar's content filtering allows you to store files in a different\n"
11524
"format from the copy in your working tree. This lets you, or your\n"
11525
"co-developers, use Windows development tools that expect CRLF files\n"
11526
"on projects that use other line-ending conventions. Among other things,\n"
11527
"content filters also let Unix developers more easily work on projects\n"
11528
"using Windows line-ending conventions, keyword expansion/compression,\n"
11529
"and trailing spaces on lines in text files to be implicitly stripped\n"
11530
"when committed."
11531
msgstr ""
11532
11533
#: en/help_topics/content-filters.txt:16
11534
msgid "To generalize, there are two content formats supported by Bazaar:"
11535
msgstr ""
11536
11537
#: en/help_topics/content-filters.txt:18
11538
msgid ""
11539
"* a canonical format - how files are stored internally\n"
11540
"* a convenience format - how files are created in a working tree."
11541
msgstr ""
11542
11543
#: en/help_topics/content-filters.txt:21
11544
msgid ""
11545
"\n"
11546
"Format conversion\n"
11547
"-----------------"
11548
msgstr ""
11549
11550
#: en/help_topics/content-filters.txt:25
11551
msgid ""
11552
"The conversion between these formats is done by content filters.\n"
11553
"A content filter has two parts:"
11554
msgstr ""
11555
11556
#: en/help_topics/content-filters.txt:28
11557
msgid ""
11558
"* a read converter - converts from convenience to canonical format\n"
11559
"* a write converter - converts from canonical to convenience format."
11560
msgstr ""
11561
11562
#: en/help_topics/content-filters.txt:31
11563
msgid ""
11564
"Many of these converters will provide *round-trip* conversion,\n"
11565
"i.e. applying the read converter followed by the write converter\n"
11566
"gives back the original content. However, others may provide an\n"
11567
"asymmetric conversion. For example, a read converter might strip\n"
11568
"trailing whitespace off lines in source code while the matching\n"
11569
"write converter might pass content through unchanged."
11570
msgstr ""
11571
11572
#: en/help_topics/content-filters.txt:38
11573
msgid ""
11574
"\n"
11575
"Enabling content filters\n"
11576
"------------------------"
11577
msgstr ""
11578
11579
#: en/help_topics/content-filters.txt:42
11580
msgid ""
11581
"Content filters are typically provided by plugins, so the first step\n"
11582
"in using them is to install the relevant plugins and read their\n"
11583
"documentation. Some plugins may be very specific about which files\n"
11584
"they filter, e.g. only files ending in ``.java`` or ``.php``.\n"
11585
"In other cases, the plugin may leave it in the user's hands to\n"
11586
"define which files are to be filtered. This is typically done\n"
11587
"using rule-based preferences. See ``bzr help rules`` for general\n"
11588
"information about defining these."
11589
msgstr ""
11590
11591
#: en/help_topics/content-filters.txt:51
11592
msgid ""
11593
"\n"
11594
"Impact on commands\n"
11595
"------------------"
11596
msgstr ""
11597
11598
#: en/help_topics/content-filters.txt:55
11599
msgid ""
11600
"Read converters are only applied to commands that read content from\n"
11601
"a working tree, e.g. status, diff and commit. For example, ``bzr diff``\n"
11602
"will apply read converters to files in the working tree, then compare\n"
11603
"the results to the content last committed."
11604
msgstr ""
11605
11606
#: en/help_topics/content-filters.txt:60
11607
msgid ""
11608
"Write converters are only applied by commands that **create files in a\n"
11609
"working tree**, e.g. branch, checkout, update. If you wish to see the\n"
11610
"canonical format of a file or tree, use ``bzr cat`` or ``bzr export``\n"
11611
"respectively."
11612
msgstr ""
11613
11614
#: en/help_topics/content-filters.txt:65
11615
msgid ""
11616
"Note: ``bzr commit`` does not implicitly apply write converters after\n"
11617
"comitting files. If this makes sense for a given plugin providing\n"
11618
"a content filter, the plugin can usually achieve this effect by using a\n"
11619
"``start_commit`` or ``post_commit`` hook say. See :doc:`hooks-help`\n"
11620
"for more information on hooks."
11621
msgstr ""
11622
11623
#: en/help_topics/content-filters.txt:71
11624
msgid ""
11625
"\n"
11626
"Refreshing your working tree\n"
11627
"----------------------------"
11628
msgstr ""
11629
11630
#: en/help_topics/content-filters.txt:75
11631
msgid ""
11632
"For performance reasons, Bazaar caches the timestamps of files in\n"
11633
"a working tree, and assumes files are unchanged if their timestamps\n"
11634
"match the cached values. As a consequence, there are times when\n"
11635
"you may need to explicitly ask for content filtering to be reapplied\n"
11636
"in one or both directions, e.g. after installing or reconfiguring\n"
11637
"plugins providing it."
11638
msgstr ""
11639
11640
#: en/help_topics/content-filters.txt:82
11641
msgid "Here are some general guidelines for doing this:"
11642
msgstr ""
11643
11644
#: en/help_topics/content-filters.txt:84
11645
msgid ""
11646
" * To reapply read converters, ``touch`` files, i.e. update their\n"
11647
" timestamp. Operations like ``bzr status`` should then reapply the\n"
11648
" relevant read converters and compare the end result with the\n"
11649
" canonical format."
11650
msgstr ""
11651
11652
#: en/help_topics/content-filters.txt:89
11653
msgid ""
11654
" * To reapply write converters, ensure there are no local changes,\n"
11655
" delete the relevant files and run ``bzr revert`` on those files."
11656
msgstr ""
11657
11658
#: en/help_topics/content-filters.txt:92
11659
msgid ""
11660
"Note: In the future, it is likely that additional options will be added\n"
11661
"to commands to make this refreshing process faster and safer.\n"
11662
msgstr ""
11663
11664
#: en/help_topics/current-formats.txt:1
11665
msgid "Current Storage Formats"
11666
msgstr ""
11667
11668
#: en/help_topics/current-formats.txt:3
11669
msgid ""
11670
":2a:\n"
11671
" (native) (default) Format for the bzr 2.0 series. Uses group-\n"
11672
" compress storage. Provides rich roots which are a one-way\n"
11673
" transition."
11674
msgstr ""
11675
11676
#: en/help_topics/current-formats.txt:8 en/help_topics/other-formats.txt:17
11677
msgid ""
11678
"\n"
11679
"See :doc:`formats-help` for more about storage formats."
11680
msgstr ""
11681
11682
#: en/help_topics/debug-flags.txt:1
11683
msgid ""
11684
"Debug Flags\n"
11685
"==========="
11686
msgstr ""
11687
11688
#: en/help_topics/debug-flags.txt:4
11689
msgid ""
11690
"These flags can be passed on the bzr command line or (without the ``-D``\n"
11691
"prefix) put in the ``debug_flags`` variable in ``bazaar.conf``."
11692
msgstr ""
11693
11694
#: en/help_topics/debug-flags.txt:7
11695
msgid ""
11696
"-Dauth Trace authentication sections used.\n"
11697
"-Dbytes Print out how many bytes were transferred\n"
11698
"-Ddirstate Trace dirstate activity (verbose!)\n"
11699
"-Derror Instead of normal error handling, always print a "
11700
"traceback\n"
11701
" on error.\n"
11702
"-Devil Capture call sites that do expensive or badly-scaling\n"
11703
" operations.\n"
11704
"-Dfetch Trace history copying between repositories.\n"
11705
"-Dfilters Emit information for debugging content filtering.\n"
11706
"-Dforceinvdeltas Force use of inventory deltas during generic streaming "
11707
"fetch.\n"
11708
"-Dgraph Trace graph traversal.\n"
11709
"-Dhashcache Log every time a working file is read to determine its "
11710
"hash.\n"
11711
"-Dhooks Trace hook execution.\n"
11712
"-Dhpss Trace smart protocol requests and responses.\n"
11713
"-Dhpssdetail More hpss details.\n"
11714
"-Dhpssvfs Traceback on vfs access to Remote objects.\n"
11715
"-Dhttp Trace http connections, requests and responses.\n"
11716
"-Dindex Trace major index operations.\n"
11717
"-Dknit Trace knit operations.\n"
11718
"-Dlock Trace when lockdir locks are taken or released.\n"
11719
"-Dnoretry If a connection is reset, fail immediately rather than\n"
11720
" retrying the request.\n"
11721
"-Dprogress Trace progress bar operations.\n"
11722
"-Dmem_dump Dump memory to a file upon an out of memory error.\n"
11723
"-Dmerge Emit information for debugging merges.\n"
11724
"-Dno_apport Don't use apport to report crashes.\n"
11725
"-Dno_activity \t Don't show transport activity indicator in progress bar.\n"
11726
"-Dpack Emit information about pack operations.\n"
11727
"-Drelock Emit a message every time a branch or repository object "
11728
"is\n"
11729
" unlocked then relocked the same way.\n"
11730
"-Dsftp Trace SFTP internals.\n"
11731
"-Dstatic_tuple Error when a tuple is used where a StaticTuple is "
11732
"expected\n"
11733
"-Dstream Trace fetch streams.\n"
11734
"-Dstrict_locks Trace when OS locks are potentially used in a non-"
11735
"portable\n"
11736
" manner.\n"
11737
"-Dunlock Some errors during unlock are treated as warnings.\n"
11738
"-DIDS_never Never use InterDifferingSerializer when fetching.\n"
11739
"-DIDS_always Always use InterDifferingSerializer to fetch if "
11740
"appropriate\n"
11741
" for the format, even for non-local fetches.\n"
11742
msgstr ""
11743
11744
#: en/help_topics/diverged-branches.txt:1
11745
msgid ""
11746
"Diverged Branches\n"
11747
"================="
11748
msgstr ""
11749
11750
#: en/help_topics/diverged-branches.txt:4
11751
msgid ""
11752
"When Bazaar tries to push one branch onto another, it requires that the\n"
11753
"destination branch must be ready to receive the source branch. If this "
11754
"isn't\n"
11755
"the case, then we say that the branches have ``diverged``. Branches are\n"
11756
"considered diverged if the destination branch's most recent commit is one "
11757
"that\n"
11758
"has not been merged (directly or indirectly) by the source branch. To "
11759
"recover\n"
11760
"from diverged branches, one must merge the missing revisions into the "
11761
"source\n"
11762
"branch."
11763
msgstr ""
11764
11765
#: en/help_topics/diverged-branches.txt:12
11766
msgid ""
11767
"This situation commonly arises when using a centralized workflow with local\n"
11768
"commits. If someone else has committed new work to the mainline since your\n"
11769
"last pull and you have local commits that have not yet been pushed to the\n"
11770
"mainline, then your local branch and the mainline have diverged."
11771
msgstr ""
11772
11773
#: en/help_topics/diverged-branches.txt:17
11774
msgid ""
11775
"Discovering What Has Diverged\n"
11776
"-----------------------------"
11777
msgstr ""
11778
11779
#: en/help_topics/diverged-branches.txt:20
11780
msgid ""
11781
"The ``bzr missing`` command is used to find out what revisions are in "
11782
"another\n"
11783
"branch that are not present in the current branch, and vice-versa. It shows "
11784
"a\n"
11785
"summary of which extra revisions exist in each branch. If you want to see "
11786
"the\n"
11787
"precise effects of those revisions, you can use ``bzr diff --"
11788
"old=other_branch``\n"
11789
"to show the differences between other_branch and your current branch."
11790
msgstr ""
11791
11792
#: en/help_topics/diverged-branches.txt:26
11793
msgid ""
11794
"A Solution\n"
11795
"----------"
11796
msgstr ""
11797
11798
#: en/help_topics/diverged-branches.txt:29
11799
msgid ""
11800
"The solution is to merge the revisions from the mainline into your local\n"
11801
"branch. To do so, use ``bzr merge`` to get the new revisions from the\n"
11802
"mainline. This merge may result in conflicts if the other developer's "
11803
"changes\n"
11804
"overlap with your changes. These conflicts should be resolved before\n"
11805
"continuing. After any conflicts have been resolved, or even if there were "
11806
"no\n"
11807
"conflicts, Bazaar requires that you explicitly commit these new revisions\n"
11808
"to your local branch. This requirement gives you an opportunity to test "
11809
"the\n"
11810
"resulting working tree for correctness, since the merged revisions could "
11811
"have\n"
11812
"made arbitrary changes. After testing, you should commit the merge using\n"
11813
"``bzr commit``. This clears up the diverged branches situation. Your "
11814
"local\n"
11815
"branch can now be pushed to the mainline.\n"
11816
msgstr ""
11817
11818
#: en/help_topics/env-variables.txt:1
11819
msgid "Environment Variables"
11820
msgstr ""
11821
11822
#: en/help_topics/env-variables.txt:3
11823
msgid "See bzr help configuration for more details."
11824
msgstr ""
11825
11826
#: en/help_topics/env-variables.txt:5
11827
msgid ""
11828
"=================== "
11829
"===========================================================\n"
11830
"BZRPATH Path where bzr is to look for shell plugin external\n"
11831
" commands.\n"
11832
"BZR_EMAIL E-Mail address of the user. Overrides EMAIL.\n"
11833
"EMAIL E-Mail address of the user.\n"
11834
"BZR_EDITOR Editor for editing commit messages. Overrides EDITOR.\n"
11835
"EDITOR Editor for editing commit messages.\n"
11836
"BZR_PLUGIN_PATH Paths where bzr should look for plugins.\n"
11837
"BZR_DISABLE_PLUGINS Plugins that bzr should not load.\n"
11838
"BZR_PLUGINS_AT Plugins to load from a directory not in "
11839
"BZR_PLUGIN_PATH.\n"
11840
"BZR_HOME Directory holding .bazaar config dir. Overrides HOME.\n"
11841
"BZR_HOME (Win32) Directory holding bazaar config dir. Overrides APPDATA "
11842
"and\n"
11843
" HOME.\n"
11844
"BZR_REMOTE_PATH Full name of remote 'bzr' command (for bzr+ssh:// "
11845
"URLs).\n"
11846
"BZR_SSH Path to SSH client, or one of paramiko, openssh, "
11847
"sshcorp,\n"
11848
" plink or lsh.\n"
11849
"BZR_LOG Location of .bzr.log (use '/dev/null' to suppress log).\n"
11850
"BZR_LOG (Win32) Location of .bzr.log (use 'NUL' to suppress log).\n"
11851
"BZR_COLUMNS Override implicit terminal width.\n"
11852
"BZR_CONCURRENCY Number of processes that can be run concurrently "
11853
"(selftest)\n"
11854
"BZR_PROGRESS_BAR Override the progress display. Values are 'none' or "
11855
"'text'.\n"
11856
"BZR_PDB Control whether to launch a debugger on error.\n"
11857
"BZR_SIGQUIT_PDB Control whether SIGQUIT behaves normally or invokes a\n"
11858
" breakin debugger.\n"
11859
"BZR_TEXTUI_INPUT Force console input mode for prompts to line-based "
11860
"(instead\n"
11861
" of char-based).\n"
11862
"=================== "
11863
"===========================================================\n"
11864
msgstr ""
11865
11866
#: en/help_topics/eol.txt:1
11867
msgid ""
11868
"End of Line Conversion\n"
11869
"======================"
11870
msgstr ""
11871
11872
#: en/help_topics/eol.txt:4
11873
msgid ""
11874
"EOL conversion is provided as a content filter where Bazaar internally\n"
11875
"stores a canonical format but outputs a convenience format. See\n"
11876
"``bzr help content-filters`` for general information about using these."
11877
msgstr ""
11878
11879
#: en/help_topics/eol.txt:8
11880
msgid ""
11881
"Note: Content filtering is only supported in recently added formats,\n"
11882
"e.g. 1.14. Be sure that both the repository *and* the branch are\n"
11883
"in a recent format. (Just setting the format on the repository\n"
11884
"is not enough.) If content filtering does not appear to be working, use\n"
11885
"'bzr info -v' to confirm that the branch is using \"Working tree format 5\"\n"
11886
"or later."
11887
msgstr ""
11888
11889
#: en/help_topics/eol.txt:15
11890
msgid ""
11891
"EOL conversion needs to be enabled for selected file patterns using\n"
11892
"rules. See ``bzr help rules`` for general information on defining rules.\n"
11893
"Currently, rules are only supported in $BZR_HOME/.bazaar/rules (or\n"
11894
"%BZR_HOME%/bazaar/2.0/rules on Windows). Branch specific rules will be\n"
11895
"supported in a future verison of Bazaar."
11896
msgstr ""
11897
11898
#: en/help_topics/eol.txt:21
11899
msgid ""
11900
"To configure which files to filter, set ``eol`` to one of the values below.\n"
11901
"(If a value is not set, ``exact`` is the default.)"
11902
msgstr ""
11903
11904
#: en/help_topics/eol.txt:24
11905
msgid ""
11906
" ========== ===================================== ======================\n"
11907
" Value Checkout end-of-lines as Commit end-of-lines as\n"
11908
" ========== ===================================== ======================\n"
11909
" ``native`` ``crlf`` on Windows, ``lf`` otherwise ``lf``\n"
11910
" ---------- ------------------------------------- ----------------------\n"
11911
" ``lf`` ``lf`` ``lf``\n"
11912
" ---------- ------------------------------------- ----------------------\n"
11913
" ``crlf`` ``crlf`` ``lf``\n"
11914
" ---------- ------------------------------------- ----------------------\n"
11915
" ``exact`` No conversion Exactly as in file\n"
11916
" ========== ===================================== ======================"
11917
msgstr ""
11918
11919
#: en/help_topics/eol.txt:36
11920
msgid ""
11921
"Note: For safety reasons, no conversion is applied to any file where a null\n"
11922
"byte is detected in the file."
11923
msgstr ""
11924
11925
#: en/help_topics/eol.txt:39
11926
msgid ""
11927
"For users working on a cross-platform project, here is a suggested rule\n"
11928
"to use as a starting point::"
11929
msgstr ""
11930
11931
#: en/help_topics/eol.txt:42 en/help_topics/eol.txt:52
11932
#: en/help_topics/eol.txt:67 en/help_topics/eol.txt:82
11933
msgid ""
11934
" [name *]\n"
11935
" eol = native"
11936
msgstr ""
11937
11938
#: en/help_topics/eol.txt:45
11939
msgid ""
11940
"If you have binary files that do not contain a null byte though, be\n"
11941
"sure to add ``eol = exact`` rules for those as well. You can do this\n"
11942
"by giving more explicit patterns earlier in the rules file. For example::"
11943
msgstr ""
11944
11945
#: en/help_topics/eol.txt:49
11946
msgid ""
11947
" [name *.png]\n"
11948
" eol = exact"
11949
msgstr ""
11950
11951
#: en/help_topics/eol.txt:55
11952
msgid ""
11953
"If your working tree is on a network drive shared by users on different\n"
11954
"operating systems, you typically want to force certain conventions for\n"
11955
"certain files. In that way, if a file is created with the wrong line\n"
11956
"endings or line endings get mixed during editing, it gets committed\n"
11957
"correctly and gets checked out correctly. For example::"
11958
msgstr ""
11959
11960
#: en/help_topics/eol.txt:61
11961
msgid ""
11962
" [name *.bat]\n"
11963
" eol = crlf"
11964
msgstr ""
11965
11966
#: en/help_topics/eol.txt:64
11967
msgid ""
11968
" [name *.sh]\n"
11969
" eol = lf"
11970
msgstr ""
11971
11972
#: en/help_topics/eol.txt:70
11973
msgid ""
11974
"If you take the care to create files with their required endings, you can\n"
11975
"achieve *almost* the same thing by using ``eol = exact``. It is slightly\n"
11976
"safer to use ``lf`` and ``crlf`` though because edits accidentally\n"
11977
"introducing mixed line endings will be corrected during commit for files\n"
11978
"with those settings."
11979
msgstr ""
11980
11981
#: en/help_topics/eol.txt:76
11982
msgid ""
11983
"If you have sample test data that deliberately has text files with mixed\n"
11984
"newline conventions, you can ask for those to be left alone like this::"
11985
msgstr ""
11986
11987
#: en/help_topics/eol.txt:79
11988
msgid ""
11989
" [name test_data/]\n"
11990
" eol = exact"
11991
msgstr ""
11992
11993
#: en/help_topics/eol.txt:85
11994
msgid ""
11995
"Note that ``exact`` does not imply the file is binary but it does mean\n"
11996
"that no conversion of end-of-lines will be done. (Bazaar currently relies\n"
11997
"of content analysis to detect binary files for commands like ``diff``.\n"
11998
"In the future, a ``binary = true`` rule may be added but it is not\n"
11999
"supported yet.)"
12000
msgstr ""
12001
12002
#: en/help_topics/eol.txt:91
12003
msgid ""
12004
"If you have an existing repository with text files already stored using\n"
12005
"Windows newline conventions (``crlf``), then you may want to keep using "
12006
"that\n"
12007
"convention in the repository. Forcing certain files to this convention\n"
12008
"may also help users who do not have rules configured. To do this, set\n"
12009
"``eol`` to one of the values below."
12010
msgstr ""
12011
12012
#: en/help_topics/eol.txt:97
12013
msgid ""
12014
" ============================ ======================== "
12015
"======================\n"
12016
" Value Checkout end-of-lines as Commit end-of-lines "
12017
"as\n"
12018
" ============================ ======================== "
12019
"======================\n"
12020
" ``native-with-crlf-in-repo`` ``crlf`` on Windows, ``crlf``\n"
12021
" ``lf`` otherwise\n"
12022
" ---------------------------- ------------------------ "
12023
"----------------------\n"
12024
" ``lf-with-crlf-in-repo`` ``lf`` ``crlf``\n"
12025
" ---------------------------- ------------------------ "
12026
"----------------------\n"
12027
" ``crlf-with-crlf-in-repo`` ``crlf`` ``crlf``\n"
12028
" ============================ ======================== ======================"
12029
msgstr ""
12030
12031
#: en/help_topics/eol.txt:108
12032
msgid ""
12033
"For users working on an existing project that uses Windows newline\n"
12034
"conventions in their Bazaar repository, this rule is suggested as a\n"
12035
"starting point::"
12036
msgstr ""
12037
12038
#: en/help_topics/eol.txt:112
12039
msgid ""
12040
" [name *]\n"
12041
" eol = native-with-crlf-in-repo"
12042
msgstr ""
12043
12044
#: en/help_topics/eol.txt:115
12045
msgid ""
12046
"For new projects, it is recommended that end-of-lines be stored as ``lf``\n"
12047
"and that users stick to the basic settings, i.e. ``native``, ``lf``,\n"
12048
"``crlf`` and ``exact``."
12049
msgstr ""
12050
12051
#: en/help_topics/eol.txt:119
12052
msgid ""
12053
"Note: Bazaar's EOL conversion will convert the content of files but\n"
12054
"never reject files because a given line ending or mixed line endings\n"
12055
"are found. A precommit hook should be used if you wish to validate\n"
12056
"(and not just convert) content before committing.\n"
12057
msgstr ""
12058
12059
#: en/help_topics/hidden-commands.txt:1
12060
msgid ""
12061
"added List files added in working tree.\n"
12062
"ancestry List all revisions merged into this branch.\n"
12063
"assert-fail Test reporting of assertion failures\n"
12064
"bundle-info Output interesting stats about a bundle\n"
12065
"bundle-revisions Create a merge-directive for submitting changes.\n"
12066
"cat-revision Write out metadata for a revision.\n"
12067
"dump-btree Dump the contents of a btree index file to stdout.\n"
12068
"export-pot Export command helps and error messages in po format.\n"
12069
"file-id Print file_id of a particular file or directory.\n"
12070
"file-path Print path of file_ids to a file or directory.\n"
12071
"find-merge-base Find and print a base revision for merging two "
12072
"branches.\n"
12073
"hooks Show hooks.\n"
12074
"inventory Show inventory of the current working copy or a "
12075
"revision.\n"
12076
"local-time-offset Show the offset in seconds from GMT to local time.\n"
12077
"lookup-revision Lookup the revision-id from a revision-number\n"
12078
"merge-directive Generate a merge directive for auto-merge tools.\n"
12079
"modified List files modified in working tree.\n"
12080
"re-sign Create a digital signature for an existing revision.\n"
12081
"reference list, view and set branch locations for nested trees.\n"
12082
"relpath Show path of a file relative to root\n"
12083
"repair-workingtree Reset the working tree state file.\n"
12084
"revision-history Display the list of revision ids on a branch.\n"
12085
"revision-info Show revision number and revision id for a given "
12086
"revision\n"
12087
" identifier.\n"
12088
"rocks Statement of optimism.\n"
12089
"selftest Run internal test suite.\n"
12090
"shell-complete Show appropriate completions for context.\n"
12091
"test-script Run a shell-like test from a file.\n"
12092
"touching-revisions Return revision-ids which affected a particular file.\n"
12093
"unknowns List unknown files.\n"
12094
"wait-until-signalled Test helper for\n"
12095
" test_start_and_stop_bzr_subprocess_send_signal.\n"
12096
msgstr ""
12097
12098
#: en/help_topics/hooks.txt:1
12099
msgid ""
12100
"\n"
12101
"Hooks\n"
12102
"====="
12103
msgstr ""
12104
12105
#: en/help_topics/hooks.txt:5 en/help_topics/rules.txt:4
12106
msgid ""
12107
"Introduction\n"
12108
"------------"
12109
msgstr ""
12110
12111
#: en/help_topics/hooks.txt:8
12112
msgid "A hook of type *xxx* of class *yyy* needs to be registered using::"
12113
msgstr ""
12114
12115
#: en/help_topics/hooks.txt:10
12116
msgid " yyy.hooks.install_named_hook(\"xxx\", ...)"
12117
msgstr ""
12118
12119
#: en/help_topics/hooks.txt:12
12120
msgid ""
12121
"See :doc:`Using hooks<../user-guide/hooks>` in the User Guide for examples."
12122
msgstr ""
12123
12124
#: en/help_topics/hooks.txt:14
12125
msgid ""
12126
"The class that contains each hook is given before the hooks it supplies. "
12127
"For\n"
12128
"instance, BranchHooks as the class is the hooks class for\n"
12129
"`bzrlib.branch.Branch.hooks`."
12130
msgstr ""
12131
12132
#: en/help_topics/hooks.txt:18
12133
msgid ""
12134
"Each description also indicates whether the hook runs on the client (the\n"
12135
"machine where bzr was invoked) or the server (the machine addressed by\n"
12136
"the branch URL). These may be, but are not necessarily, the same machine."
12137
msgstr ""
12138
12139
#: en/help_topics/hooks.txt:22
12140
msgid ""
12141
"Plugins (including hooks) are run on the server if all of these is true:"
12142
msgstr ""
12143
12144
#: en/help_topics/hooks.txt:24
12145
msgid ""
12146
" * The connection is via a smart server (accessed with a URL starting with\n"
12147
" \"bzr://\", \"bzr+ssh://\" or \"bzr+http://\", or accessed via a "
12148
"\"http://\"\n"
12149
" URL when a smart server is available via HTTP)."
12150
msgstr ""
12151
12152
#: en/help_topics/hooks.txt:28
12153
msgid ""
12154
" * The hook is either server specific or part of general infrastructure "
12155
"rather\n"
12156
" than client specific code (such as commit)."
12157
msgstr ""
12158
12159
#: en/help_topics/hooks.txt:31
12160
msgid ""
12161
"\n"
12162
"BranchHooks\n"
12163
"-----------"
12164
msgstr ""
12165
12166
#: en/help_topics/hooks.txt:35
12167
msgid ""
12168
"automatic_tag_name\n"
12169
"~~~~~~~~~~~~~~~~~~"
12170
msgstr ""
12171
12172
#: en/help_topics/hooks.txt:38 en/help_topics/hooks.txt:56
12173
#: en/help_topics/hooks.txt:102 en/help_topics/hooks.txt:262
12174
msgid "Introduced in: 2.2"
12175
msgstr ""
12176
12177
#: en/help_topics/hooks.txt:40
12178
msgid ""
12179
"Called to determine an automatic tag name for a revision.\n"
12180
"automatic_tag_name is called with (branch, revision_id) and should\n"
12181
"return a tag name or None if no tag name could be determined. The\n"
12182
"first non-None tag name returned will be used."
12183
msgstr ""
12184
12185
#: en/help_topics/hooks.txt:45
12186
msgid ""
12187
"open\n"
12188
"~~~~"
12189
msgstr ""
12190
12191
#: en/help_topics/hooks.txt:48 en/help_topics/hooks.txt:293
12192
#: en/help_topics/hooks.txt:307
12193
msgid "Introduced in: 1.8"
12194
msgstr ""
12195
12196
#: en/help_topics/hooks.txt:50
12197
msgid ""
12198
"Called with the Branch object that has been opened after a branch is\n"
12199
"opened."
12200
msgstr ""
12201
12202
#: en/help_topics/hooks.txt:53
12203
msgid ""
12204
"post_branch_init\n"
12205
"~~~~~~~~~~~~~~~~"
12206
msgstr ""
12207
12208
#: en/help_topics/hooks.txt:58
12209
msgid ""
12210
"Called after new branch initialization completes. post_branch_init is\n"
12211
"called with a bzrlib.branch.BranchInitHookParams. Note that init,\n"
12212
"branch and checkout (both heavyweight and lightweight) will all\n"
12213
"trigger this hook."
12214
msgstr ""
12215
12216
#: en/help_topics/hooks.txt:63
12217
msgid ""
12218
"post_change_branch_tip\n"
12219
"~~~~~~~~~~~~~~~~~~~~~~"
12220
msgstr ""
12221
12222
#: en/help_topics/hooks.txt:66 en/help_topics/hooks.txt:421
12223
msgid "Introduced in: 1.4"
12224
msgstr ""
12225
12226
#: en/help_topics/hooks.txt:68
12227
msgid ""
12228
"Called in bzr client and server after a change to the tip of a branch\n"
12229
"is made. post_change_branch_tip is called with a\n"
12230
"bzrlib.branch.ChangeBranchTipParams. Note that push, pull, commit,\n"
12231
"uncommit will all trigger this hook."
12232
msgstr ""
12233
12234
#: en/help_topics/hooks.txt:73 en/help_topics/hooks.txt:392
12235
msgid ""
12236
"post_commit\n"
12237
"~~~~~~~~~~~"
12238
msgstr ""
12239
12240
#: en/help_topics/hooks.txt:76 en/help_topics/hooks.txt:86
12241
#: en/help_topics/hooks.txt:94 en/help_topics/hooks.txt:110
12242
msgid "Introduced in: 0.15"
12243
msgstr ""
12244
12245
#: en/help_topics/hooks.txt:78
12246
msgid ""
12247
"Called in the bzr client after a commit has completed. post_commit is\n"
12248
"called with (local, master, old_revno, old_revid, new_revno,\n"
12249
"new_revid). old_revid is NULL_REVISION for the first commit to a\n"
12250
"branch."
12251
msgstr ""
12252
12253
#: en/help_topics/hooks.txt:83
12254
msgid ""
12255
"post_pull\n"
12256
"~~~~~~~~~"
12257
msgstr ""
12258
12259
#: en/help_topics/hooks.txt:88
12260
msgid ""
12261
"Called after a pull operation completes. post_pull is called with a\n"
12262
"bzrlib.branch.PullResult object and only runs in the bzr client."
12263
msgstr ""
12264
12265
#: en/help_topics/hooks.txt:91
12266
msgid ""
12267
"post_push\n"
12268
"~~~~~~~~~"
12269
msgstr ""
12270
12271
#: en/help_topics/hooks.txt:96
12272
msgid ""
12273
"Called after a push operation completes. post_push is called with a\n"
12274
"bzrlib.branch.BranchPushResult object and only runs in the bzr client."
12275
msgstr ""
12276
12277
#: en/help_topics/hooks.txt:99
12278
msgid ""
12279
"post_switch\n"
12280
"~~~~~~~~~~~"
12281
msgstr ""
12282
12283
#: en/help_topics/hooks.txt:104
12284
msgid ""
12285
"Called after a checkout switches branch. post_switch is called with a\n"
12286
"bzrlib.branch.SwitchHookParams."
12287
msgstr ""
12288
12289
#: en/help_topics/hooks.txt:107
12290
msgid ""
12291
"post_uncommit\n"
12292
"~~~~~~~~~~~~~"
12293
msgstr ""
12294
12295
#: en/help_topics/hooks.txt:112
12296
msgid ""
12297
"Called in the bzr client after an uncommit completes. post_uncommit is\n"
12298
"called with (local, master, old_revno, old_revid, new_revno,\n"
12299
"new_revid) where local is the local branch or None, master is the\n"
12300
"target branch, and an empty branch receives new_revno of 0, new_revid\n"
12301
"of None."
12302
msgstr ""
12303
12304
#: en/help_topics/hooks.txt:118
12305
msgid ""
12306
"pre_change_branch_tip\n"
12307
"~~~~~~~~~~~~~~~~~~~~~"
12308
msgstr ""
12309
12310
#: en/help_topics/hooks.txt:121
12311
msgid "Introduced in: 1.6"
12312
msgstr ""
12313
12314
#: en/help_topics/hooks.txt:123
12315
msgid ""
12316
"Called in bzr client and server before a change to the tip of a branch\n"
12317
"is made. pre_change_branch_tip is called with a\n"
12318
"bzrlib.branch.ChangeBranchTipParams. Note that push, pull, commit,\n"
12319
"uncommit will all trigger this hook."
12320
msgstr ""
12321
12322
#: en/help_topics/hooks.txt:128
12323
msgid ""
12324
"pre_commit\n"
12325
"~~~~~~~~~~"
12326
msgstr ""
12327
12328
#: en/help_topics/hooks.txt:131
12329
msgid "Introduced in: 0.91"
12330
msgstr ""
12331
12332
#: en/help_topics/hooks.txt:133
12333
msgid ""
12334
"Called after a commit is calculated but before it is completed.\n"
12335
"pre_commit is called with (local, master, old_revno, old_revid,\n"
12336
"future_revno, future_revid, tree_delta, future_tree). old_revid is\n"
12337
"NULL_REVISION for the first commit to a branch, tree_delta is a\n"
12338
"TreeDelta object describing changes from the basis revision. hooks\n"
12339
"MUST NOT modify this delta. future_tree is an in-memory tree obtained\n"
12340
"from CommitBuilder.revision_tree() and hooks MUST NOT modify this\n"
12341
"tree."
12342
msgstr ""
12343
12344
#: en/help_topics/hooks.txt:142
12345
msgid ""
12346
"transform_fallback_location\n"
12347
"~~~~~~~~~~~~~~~~~~~~~~~~~~~"
12348
msgstr ""
12349
12350
#: en/help_topics/hooks.txt:145
12351
msgid "Introduced in: 1.9"
12352
msgstr ""
12353
12354
#: en/help_topics/hooks.txt:147
12355
msgid ""
12356
"Called when a stacked branch is activating its fallback locations.\n"
12357
"transform_fallback_location is called with (branch, url), and should\n"
12358
"return a new url. Returning the same url allows it to be used as-is,\n"
12359
"returning a different one can be used to cause the branch to stack on\n"
12360
"a closer copy of that fallback_location. Note that the branch cannot\n"
12361
"have history accessing methods called on it during this hook because\n"
12362
"the fallback locations have not been activated. When there are\n"
12363
"multiple hooks installed for transform_fallback_location, all are\n"
12364
"called with the url returned from the previous hook.The order is\n"
12365
"however undefined."
12366
msgstr ""
12367
12368
#: en/help_topics/hooks.txt:158
12369
msgid ""
12370
"CommandHooks\n"
12371
"------------"
12372
msgstr ""
12373
12374
#: en/help_topics/hooks.txt:161
12375
msgid ""
12376
"extend_command\n"
12377
"~~~~~~~~~~~~~~"
12378
msgstr ""
12379
12380
#: en/help_topics/hooks.txt:164
12381
msgid "Introduced in: 1.13"
12382
msgstr ""
12383
12384
#: en/help_topics/hooks.txt:166
12385
msgid ""
12386
"Called after creating a command object to allow modifications such as\n"
12387
"adding or removing options, docs etc. Called with the new\n"
12388
"bzrlib.commands.Command object."
12389
msgstr ""
12390
12391
#: en/help_topics/hooks.txt:170
12392
msgid ""
12393
"get_command\n"
12394
"~~~~~~~~~~~"
12395
msgstr ""
12396
12397
#: en/help_topics/hooks.txt:173 en/help_topics/hooks.txt:185
12398
#: en/help_topics/hooks.txt:194 en/help_topics/hooks.txt:467
12399
msgid "Introduced in: 1.17"
12400
msgstr ""
12401
12402
#: en/help_topics/hooks.txt:175
12403
msgid ""
12404
"Called when creating a single command. Called with (cmd_or_None,\n"
12405
"command_name). get_command should either return the cmd_or_None\n"
12406
"parameter, or a replacement Command object that should be used for the\n"
12407
"command. Note that the Command.hooks hooks are core infrastructure.\n"
12408
"Many users will prefer to use bzrlib.commands.register_command or\n"
12409
"plugin_cmds.register_lazy."
12410
msgstr ""
12411
12412
#: en/help_topics/hooks.txt:182
12413
msgid ""
12414
"get_missing_command\n"
12415
"~~~~~~~~~~~~~~~~~~~"
12416
msgstr ""
12417
12418
#: en/help_topics/hooks.txt:187
12419
msgid ""
12420
"Called when creating a single command if no command could be found.\n"
12421
"Called with (command_name). get_missing_command should either return\n"
12422
"None, or a Command object to be used for the command."
12423
msgstr ""
12424
12425
#: en/help_topics/hooks.txt:191
12426
msgid ""
12427
"list_commands\n"
12428
"~~~~~~~~~~~~~"
12429
msgstr ""
12430
12431
#: en/help_topics/hooks.txt:196
12432
msgid ""
12433
"Called when enumerating commands. Called with a set of cmd_name\n"
12434
"strings for all the commands found so far. This set is safe to mutate\n"
12435
"- e.g. to remove a command. list_commands should return the updated\n"
12436
"set of command names."
12437
msgstr ""
12438
12439
#: en/help_topics/hooks.txt:201
12440
msgid ""
12441
"post_command\n"
12442
"~~~~~~~~~~~~"
12443
msgstr ""
12444
12445
#: en/help_topics/hooks.txt:204 en/help_topics/hooks.txt:211
12446
msgid "Introduced in: 2.6"
12447
msgstr ""
12448
12449
#: en/help_topics/hooks.txt:206
12450
msgid "Called after executing a command. Called with the command object."
12451
msgstr ""
12452
12453
#: en/help_topics/hooks.txt:208
12454
msgid ""
12455
"pre_command\n"
12456
"~~~~~~~~~~~"
12457
msgstr ""
12458
12459
#: en/help_topics/hooks.txt:213
12460
msgid "Called prior to executing a command. Called with the command object."
12461
msgstr ""
12462
12463
#: en/help_topics/hooks.txt:215
12464
msgid ""
12465
"_ConfigHooks\n"
12466
"------------"
12467
msgstr ""
12468
12469
#: en/help_topics/hooks.txt:218
12470
msgid ""
12471
"get\n"
12472
"~~~"
12473
msgstr ""
12474
12475
#: en/help_topics/hooks.txt:221 en/help_topics/hooks.txt:229
12476
#: en/help_topics/hooks.txt:236 en/help_topics/hooks.txt:244
12477
#: en/help_topics/hooks.txt:251 en/help_topics/hooks.txt:373
12478
#: en/help_topics/hooks.txt:446
12479
msgid "Introduced in: 2.4"
12480
msgstr ""
12481
12482
#: en/help_topics/hooks.txt:223
12483
msgid ""
12484
"Invoked when a config option is read. The signature is (stack, name,\n"
12485
"value)."
12486
msgstr ""
12487
12488
#: en/help_topics/hooks.txt:226
12489
msgid ""
12490
"load\n"
12491
"~~~~"
12492
msgstr ""
12493
12494
#: en/help_topics/hooks.txt:231
12495
msgid "Invoked when a config store is loaded. The signature is (store)."
12496
msgstr ""
12497
12498
#: en/help_topics/hooks.txt:233
12499
msgid ""
12500
"remove\n"
12501
"~~~~~~"
12502
msgstr ""
12503
12504
#: en/help_topics/hooks.txt:238
12505
msgid ""
12506
"Invoked when a config option is removed. The signature is (stack,\n"
12507
"name)."
12508
msgstr ""
12509
12510
#: en/help_topics/hooks.txt:241
12511
msgid ""
12512
"save\n"
12513
"~~~~"
12514
msgstr ""
12515
12516
#: en/help_topics/hooks.txt:246
12517
msgid "Invoked when a config store is saved. The signature is (store)."
12518
msgstr ""
12519
12520
#: en/help_topics/hooks.txt:248
12521
msgid ""
12522
"set\n"
12523
"~~~"
12524
msgstr ""
12525
12526
#: en/help_topics/hooks.txt:253
12527
msgid ""
12528
"Invoked when a config option is set. The signature is (stack, name,\n"
12529
"value)."
12530
msgstr ""
12531
12532
#: en/help_topics/hooks.txt:256
12533
msgid ""
12534
"ControlDirHooks\n"
12535
"---------------"
12536
msgstr ""
12537
12538
#: en/help_topics/hooks.txt:259
12539
msgid ""
12540
"post_repo_init\n"
12541
"~~~~~~~~~~~~~~"
12542
msgstr ""
12543
12544
#: en/help_topics/hooks.txt:264
12545
msgid ""
12546
"Invoked after a repository has been initialized. post_repo_init is\n"
12547
"called with a bzrlib.controldir.RepoInitHookParams."
12548
msgstr ""
12549
12550
#: en/help_topics/hooks.txt:267
12551
msgid ""
12552
"pre_open\n"
12553
"~~~~~~~~"
12554
msgstr ""
12555
12556
#: en/help_topics/hooks.txt:270
12557
msgid "Introduced in: 1.14"
12558
msgstr ""
12559
12560
#: en/help_topics/hooks.txt:272
12561
msgid ""
12562
"Invoked before attempting to open a ControlDir with the transport that\n"
12563
"the open will use."
12564
msgstr ""
12565
12566
#: en/help_topics/hooks.txt:275
12567
msgid ""
12568
"InfoHooks\n"
12569
"---------"
12570
msgstr ""
12571
12572
#: en/help_topics/hooks.txt:278
12573
msgid ""
12574
"repository\n"
12575
"~~~~~~~~~~"
12576
msgstr ""
12577
12578
#: en/help_topics/hooks.txt:281 en/help_topics/hooks.txt:300
12579
#: en/help_topics/hooks.txt:524
12580
msgid "Introduced in: 1.15"
12581
msgstr ""
12582
12583
#: en/help_topics/hooks.txt:283
12584
msgid ""
12585
"Invoked when displaying the statistics for a repository. repository is\n"
12586
"called with a statistics dictionary as returned by the repository and\n"
12587
"a file-like object to write to."
12588
msgstr ""
12589
12590
#: en/help_topics/hooks.txt:287
12591
msgid ""
12592
"LockHooks\n"
12593
"---------"
12594
msgstr ""
12595
12596
#: en/help_topics/hooks.txt:290
12597
msgid ""
12598
"lock_acquired\n"
12599
"~~~~~~~~~~~~~"
12600
msgstr ""
12601
12602
#: en/help_topics/hooks.txt:295
12603
msgid "Called with a bzrlib.lock.LockResult when a physical lock is acquired."
12604
msgstr ""
12605
12606
#: en/help_topics/hooks.txt:297
12607
msgid ""
12608
"lock_broken\n"
12609
"~~~~~~~~~~~"
12610
msgstr ""
12611
12612
#: en/help_topics/hooks.txt:302
12613
msgid "Called with a bzrlib.lock.LockResult when a physical lock is broken."
12614
msgstr ""
12615
12616
#: en/help_topics/hooks.txt:304
12617
msgid ""
12618
"lock_released\n"
12619
"~~~~~~~~~~~~~"
12620
msgstr ""
12621
12622
#: en/help_topics/hooks.txt:309
12623
msgid "Called with a bzrlib.lock.LockResult when a physical lock is released."
12624
msgstr ""
12625
12626
#: en/help_topics/hooks.txt:311
12627
msgid ""
12628
"MergeHooks\n"
12629
"----------"
12630
msgstr ""
12631
12632
#: en/help_topics/hooks.txt:314
12633
msgid ""
12634
"merge_file_content\n"
12635
"~~~~~~~~~~~~~~~~~~"
12636
msgstr ""
12637
12638
#: en/help_topics/hooks.txt:317
12639
msgid "Introduced in: 2.1"
12640
msgstr ""
12641
12642
#: en/help_topics/hooks.txt:319
12643
msgid ""
12644
"Called with a bzrlib.merge.Merger object to create a per file merge\n"
12645
"object when starting a merge. Should return either None or a subclass\n"
12646
"of ``bzrlib.merge.AbstractPerFileMerger``. Such objects will then be\n"
12647
"called per file that needs to be merged (including when one side has\n"
12648
"deleted the file and the other has changed it). See the\n"
12649
"AbstractPerFileMerger API docs for details on how it is used by merge."
12650
msgstr ""
12651
12652
#: en/help_topics/hooks.txt:326
12653
msgid ""
12654
"post_merge\n"
12655
"~~~~~~~~~~"
12656
msgstr ""
12657
12658
#: en/help_topics/hooks.txt:329 en/help_topics/hooks.txt:337
12659
#: en/help_topics/hooks.txt:387 en/help_topics/hooks.txt:405
12660
#: en/help_topics/hooks.txt:413 en/help_topics/hooks.txt:512
12661
msgid "Introduced in: 2.5"
12662
msgstr ""
12663
12664
#: en/help_topics/hooks.txt:331
12665
msgid ""
12666
"Called after a merge. Receives a Merger object as the single argument.\n"
12667
"The return value is ignored."
12668
msgstr ""
12669
12670
#: en/help_topics/hooks.txt:334
12671
msgid ""
12672
"pre_merge\n"
12673
"~~~~~~~~~"
12674
msgstr ""
12675
12676
#: en/help_topics/hooks.txt:339
12677
msgid ""
12678
"Called before a merge. Receives a Merger object as the single\n"
12679
"argument."
12680
msgstr ""
12681
12682
#: en/help_topics/hooks.txt:342
12683
msgid ""
12684
"MergeDirectiveHooks\n"
12685
"-------------------"
12686
msgstr ""
12687
12688
#: en/help_topics/hooks.txt:345
12689
msgid ""
12690
"merge_request_body\n"
12691
"~~~~~~~~~~~~~~~~~~"
12692
msgstr ""
12693
12694
#: en/help_topics/hooks.txt:348
12695
msgid "Introduced in: 1.15.0"
12696
msgstr ""
12697
12698
#: en/help_topics/hooks.txt:350
12699
msgid ""
12700
"Called with a MergeRequestBodyParams when a body is needed for a merge\n"
12701
"request. Callbacks must return a body. If more than one callback is\n"
12702
"registered, the output of one callback is provided to the next."
12703
msgstr ""
12704
12705
#: en/help_topics/hooks.txt:354
12706
msgid ""
12707
"MessageEditorHooks\n"
12708
"------------------"
12709
msgstr ""
12710
12711
#: en/help_topics/hooks.txt:357
12712
msgid ""
12713
"commit_message_template\n"
12714
"~~~~~~~~~~~~~~~~~~~~~~~"
12715
msgstr ""
12716
12717
#: en/help_topics/hooks.txt:360
12718
msgid "Introduced in: 1.10"
12719
msgstr ""
12720
12721
#: en/help_topics/hooks.txt:362
12722
msgid ""
12723
"Called when a commit message is being generated.\n"
12724
"commit_message_template is called with the bzrlib.commit.Commit object\n"
12725
"and the message that is known so far. commit_message_template must\n"
12726
"return a new message to use (which could be the same as it was given).\n"
12727
"When there are multiple hooks registered for commit_message_template,\n"
12728
"they are chained with the result from the first passed into the\n"
12729
"second, and so on."
12730
msgstr ""
12731
12732
#: en/help_topics/hooks.txt:370
12733
msgid ""
12734
"set_commit_message\n"
12735
"~~~~~~~~~~~~~~~~~~"
12736
msgstr ""
12737
12738
#: en/help_topics/hooks.txt:375
12739
msgid ""
12740
"Set a fixed commit message. set_commit_message is called with the\n"
12741
"bzrlib.commit.Commit object (so you can also change e.g. revision\n"
12742
"properties by editing commit.builder._revprops) and the message so\n"
12743
"far. set_commit_message must return the message to use or None if it\n"
12744
"should use the message editor as normal."
12745
msgstr ""
12746
12747
#: en/help_topics/hooks.txt:381
12748
msgid ""
12749
"MutableTreeHooks\n"
12750
"----------------"
12751
msgstr ""
12752
12753
#: en/help_topics/hooks.txt:384
12754
msgid ""
12755
"post_build_tree\n"
12756
"~~~~~~~~~~~~~~~"
12757
msgstr ""
12758
12759
#: en/help_topics/hooks.txt:389
12760
msgid ""
12761
"Called after a completely new tree is built. The hook is called with\n"
12762
"the tree as its only argument."
12763
msgstr ""
12764
12765
#: en/help_topics/hooks.txt:395
12766
msgid "Introduced in: 2.0"
12767
msgstr ""
12768
12769
#: en/help_topics/hooks.txt:397
12770
msgid ""
12771
"Called after a commit is performed on a tree. The hook is called with\n"
12772
"a bzrlib.mutabletree.PostCommitHookParams object. The mutable tree the\n"
12773
"commit was performed on is available via the mutable_tree attribute of\n"
12774
"that object."
12775
msgstr ""
12776
12777
#: en/help_topics/hooks.txt:402
12778
msgid ""
12779
"post_transform\n"
12780
"~~~~~~~~~~~~~~"
12781
msgstr ""
12782
12783
#: en/help_topics/hooks.txt:407
12784
msgid ""
12785
"Called after a tree transform has been performed on a tree. The hook\n"
12786
"is called with the tree that is being transformed and the transform."
12787
msgstr ""
12788
12789
#: en/help_topics/hooks.txt:410
12790
msgid ""
12791
"pre_transform\n"
12792
"~~~~~~~~~~~~~"
12793
msgstr ""
12794
12795
#: en/help_topics/hooks.txt:415
12796
msgid ""
12797
"Called before a tree transform on this tree. The hook is called with\n"
12798
"the tree that is being transformed and the transform."
12799
msgstr ""
12800
12801
#: en/help_topics/hooks.txt:418
12802
msgid ""
12803
"start_commit\n"
12804
"~~~~~~~~~~~~"
12805
msgstr ""
12806
12807
#: en/help_topics/hooks.txt:423
12808
msgid ""
12809
"Called before a commit is performed on a tree. The start commit hook\n"
12810
"is able to change the tree before the commit takes place. start_commit\n"
12811
"is called with the bzrlib.mutabletree.MutableTree that the commit is\n"
12812
"being performed on."
12813
msgstr ""
12814
12815
#: en/help_topics/hooks.txt:428
12816
msgid ""
12817
"SmartClientHooks\n"
12818
"----------------"
12819
msgstr ""
12820
12821
#: en/help_topics/hooks.txt:431
12822
msgid ""
12823
"call\n"
12824
"~~~~"
12825
msgstr ""
12826
12827
#: en/help_topics/hooks.txt:434
12828
msgid "Introduced in: unknown"
12829
msgstr ""
12830
12831
#: en/help_topics/hooks.txt:436
12832
msgid ""
12833
"Called when the smart client is submitting a request to the smart\n"
12834
"server. Called with a bzrlib.smart.client.CallHookParams object.\n"
12835
"Streaming request bodies, and responses, are not accessible."
12836
msgstr ""
12837
12838
#: en/help_topics/hooks.txt:440
12839
msgid ""
12840
"SmartServerHooks\n"
12841
"----------------"
12842
msgstr ""
12843
12844
#: en/help_topics/hooks.txt:443
12845
msgid ""
12846
"server_exception\n"
12847
"~~~~~~~~~~~~~~~~"
12848
msgstr ""
12849
12850
#: en/help_topics/hooks.txt:448
12851
msgid ""
12852
"Called by the bzr server when an exception occurs. server_exception is\n"
12853
"called with the sys.exc_info() tuple return true for the hook if the\n"
12854
"exception has been handled, in which case the server will exit\n"
12855
"normally."
12856
msgstr ""
12857
12858
#: en/help_topics/hooks.txt:453
12859
msgid ""
12860
"server_started\n"
12861
"~~~~~~~~~~~~~~"
12862
msgstr ""
12863
12864
#: en/help_topics/hooks.txt:456 en/help_topics/hooks.txt:475
12865
msgid "Introduced in: 0.16"
12866
msgstr ""
12867
12868
#: en/help_topics/hooks.txt:458
12869
msgid ""
12870
"Called by the bzr server when it starts serving a directory.\n"
12871
"server_started is called with (backing urls, public url), where\n"
12872
"backing_url is a list of URLs giving the server-specific directory\n"
12873
"locations, and public_url is the public URL for the directory being\n"
12874
"served."
12875
msgstr ""
12876
12877
#: en/help_topics/hooks.txt:464
12878
msgid ""
12879
"server_started_ex\n"
12880
"~~~~~~~~~~~~~~~~~"
12881
msgstr ""
12882
12883
#: en/help_topics/hooks.txt:469
12884
msgid ""
12885
"Called by the bzr server when it starts serving a directory.\n"
12886
"server_started is called with (backing_urls, server_obj)."
12887
msgstr ""
12888
12889
#: en/help_topics/hooks.txt:472
12890
msgid ""
12891
"server_stopped\n"
12892
"~~~~~~~~~~~~~~"
12893
msgstr ""
12894
12895
#: en/help_topics/hooks.txt:477
12896
msgid ""
12897
"Called by the bzr server when it stops serving a directory.\n"
12898
"server_stopped is called with the same parameters as the\n"
12899
"server_started hook: (backing_urls, public_url)."
12900
msgstr ""
12901
12902
#: en/help_topics/hooks.txt:481
12903
msgid ""
12904
"StatusHooks\n"
12905
"-----------"
12906
msgstr ""
12907
12908
#: en/help_topics/hooks.txt:484
12909
msgid ""
12910
"post_status\n"
12911
"~~~~~~~~~~~"
12912
msgstr ""
12913
12914
#: en/help_topics/hooks.txt:487 en/help_topics/hooks.txt:498
12915
msgid "Introduced in: 2.3"
12916
msgstr ""
12917
12918
#: en/help_topics/hooks.txt:489
12919
msgid ""
12920
"Called with argument StatusHookParams after Bazaar has displayed the\n"
12921
"status. StatusHookParams has the attributes (old_tree, new_tree,\n"
12922
"to_file, versioned, show_ids, short, verbose). The last four arguments\n"
12923
"correspond to the command line options specified by the user for the\n"
12924
"status command. to_file is the output stream for writing."
12925
msgstr ""
12926
12927
#: en/help_topics/hooks.txt:495
12928
msgid ""
12929
"pre_status\n"
12930
"~~~~~~~~~~"
12931
msgstr ""
12932
12933
#: en/help_topics/hooks.txt:500
12934
msgid ""
12935
"Called with argument StatusHookParams before Bazaar displays the\n"
12936
"status. StatusHookParams has the attributes (old_tree, new_tree,\n"
12937
"to_file, versioned, show_ids, short, verbose). The last four arguments\n"
12938
"correspond to the command line options specified by the user for the\n"
12939
"status command. to_file is the output stream for writing."
12940
msgstr ""
12941
12942
#: en/help_topics/hooks.txt:506
12943
msgid ""
12944
"TransportHooks\n"
12945
"--------------"
12946
msgstr ""
12947
12948
#: en/help_topics/hooks.txt:509
12949
msgid ""
12950
"post_connect\n"
12951
"~~~~~~~~~~~~"
12952
msgstr ""
12953
12954
#: en/help_topics/hooks.txt:514
12955
msgid ""
12956
"Called after a new connection is established or a reconnect occurs.\n"
12957
"The sole argument passed is either the connected transport or smart\n"
12958
"medium instance."
12959
msgstr ""
12960
12961
#: en/help_topics/hooks.txt:518
12962
msgid ""
12963
"RioVersionInfoBuilderHooks\n"
12964
"--------------------------"
12965
msgstr ""
12966
12967
#: en/help_topics/hooks.txt:521
12968
msgid ""
12969
"revision\n"
12970
"~~~~~~~~"
12971
msgstr ""
12972
12973
#: en/help_topics/hooks.txt:526
12974
msgid ""
12975
"Invoked when adding information about a revision to the RIO stanza\n"
12976
"that is printed. revision is called with a revision object and a RIO\n"
12977
"stanza.\n"
12978
msgstr ""
12979
12980
#: en/help_topics/location-alias.txt:1
12981
msgid ""
12982
"Location aliases\n"
12983
"================"
12984
msgstr ""
12985
12986
#: en/help_topics/location-alias.txt:4
12987
msgid ""
12988
"Bazaar defines several aliases for locations associated with a branch. "
12989
"These\n"
12990
"can be used with most commands that expect a location, such as `bzr push`."
12991
msgstr ""
12992
12993
#: en/help_topics/location-alias.txt:7
12994
msgid "The aliases are::"
12995
msgstr ""
12996
12997
#: en/help_topics/location-alias.txt:9
12998
msgid ""
12999
" :bound The branch this branch is bound to, for bound branches.\n"
13000
" :parent The parent of this branch.\n"
13001
" :public The public location of this branch.\n"
13002
" :push The saved location used for `bzr push` with no arguments.\n"
13003
" :submit The submit branch for this branch.\n"
13004
" :this This branch."
13005
msgstr ""
13006
13007
#: en/help_topics/location-alias.txt:16
13008
msgid "For example, to push to the parent location::"
13009
msgstr ""
13010
13011
#: en/help_topics/location-alias.txt:18
13012
msgid " bzr push :parent\n"
13013
msgstr ""
13014
13015
#: en/help_topics/log-formats.txt:1
13016
msgid ""
13017
"Log Formats\n"
13018
"==========="
13019
msgstr ""
13020
13021
#: en/help_topics/log-formats.txt:4
13022
msgid ""
13023
"A log format controls how information about each revision is displayed.\n"
13024
"The standard log formats are compared below::"
13025
msgstr ""
13026
13027
#: en/help_topics/log-formats.txt:7
13028
msgid ""
13029
" Feature long short line\n"
13030
" ---------------------- ------------- ------------ -------------------\n"
13031
" design goal detailed view concise view 1 revision per line\n"
13032
" committer name+email name only name only\n"
13033
" author name+email - -\n"
13034
" date-time format full date only date only\n"
13035
" commit message full full top line\n"
13036
" tags yes yes yes\n"
13037
" merges indicator - yes -\n"
13038
" status/delta optional optional -\n"
13039
" diff/patch optional optional -\n"
13040
" revision-id optional optional -\n"
13041
" branch nick yes - -\n"
13042
" foreign vcs properties yes yes -\n"
13043
" preferred levels all 1 1\n"
13044
" digital signature optional - -"
13045
msgstr ""
13046
13047
#: en/help_topics/log-formats.txt:24
13048
msgid ""
13049
"The default format is ``long``. To change this, define the ``log_format``\n"
13050
"setting in the ``[DEFAULT]`` section of ``bazaar.conf`` like this (say)::"
13051
msgstr ""
13052
13053
#: en/help_topics/log-formats.txt:27
13054
msgid ""
13055
" [DEFAULT]\n"
13056
" log_format = short"
13057
msgstr ""
13058
13059
#: en/help_topics/log-formats.txt:30
13060
msgid ""
13061
"Alternatively, to change the log format used for a given query, use the\n"
13062
"--long, --short or --line options."
13063
msgstr ""
13064
13065
#: en/help_topics/log-formats.txt:33
13066
msgid ""
13067
"If one of the standard log formats does not meet your needs, additional\n"
13068
"formats can be provided by plugins.\n"
13069
msgstr ""
13070
13071
#: en/help_topics/other-formats.txt:1
13072
msgid "Other Storage Formats"
13073
msgstr ""
13074
13075
#: en/help_topics/other-formats.txt:3
13076
msgid "Experimental formats are shown below."
13077
msgstr ""
13078
13079
#: en/help_topics/other-formats.txt:5
13080
msgid ""
13081
":development-colo:\n"
13082
" (native) The 2a format with experimental support for colocated\n"
13083
" branches."
13084
msgstr ""
13085
13086
#: en/help_topics/other-formats.txt:9
13087
msgid ""
13088
"\n"
13089
"Deprecated formats are shown below."
13090
msgstr ""
13091
13092
#: en/help_topics/other-formats.txt:12
13093
msgid ""
13094
":pack-0.92:\n"
13095
" (native) Pack-based format used in 1.x series. Introduced in 0.92.\n"
13096
" Interoperates with bzr repositories before 0.92 but cannot be read\n"
13097
" by bzr < 0.92."
13098
msgstr ""
13099
13100
#: en/help_topics/patterns.txt:1
13101
msgid ""
13102
"Patterns\n"
13103
"========"
13104
msgstr ""
13105
13106
#: en/help_topics/patterns.txt:4
13107
msgid ""
13108
"Bazaar uses patterns to match files at various times. For example,\n"
13109
"the ``add`` command skips over files that match ignore patterns\n"
13110
"and preferences can be associated with files using rule patterns.\n"
13111
"The pattern syntax is described below."
13112
msgstr ""
13113
13114
#: en/help_topics/patterns.txt:9
13115
msgid ""
13116
"Trailing slashes on patterns are ignored. If the pattern contains a\n"
13117
"slash or is a regular expression, it is compared to the whole path\n"
13118
"from the branch root. Otherwise, it is compared to only the last\n"
13119
"component of the path. To match a file only in the root directory,\n"
13120
"prepend ``./``. Patterns specifying absolute paths are not allowed."
13121
msgstr ""
13122
13123
#: en/help_topics/patterns.txt:15
13124
msgid "Patterns may include globbing wildcards such as::"
13125
msgstr ""
13126
13127
#: en/help_topics/patterns.txt:17
13128
msgid ""
13129
" ? - Matches any single character except '/'\n"
13130
" * - Matches 0 or more characters except '/'\n"
13131
" /**/ - Matches 0 or more directories in a path\n"
13132
" [a-z] - Matches a single character from within a group of characters"
13133
msgstr ""
13134
13135
#: en/help_topics/patterns.txt:22
13136
msgid ""
13137
"Patterns may also be `Python regular expressions`_. Regular expression\n"
13138
"patterns are identified by a ``RE:`` prefix followed by the regular\n"
13139
"expression. Regular expression patterns may not include named or\n"
13140
"numbered groups."
13141
msgstr ""
13142
13143
#: en/help_topics/patterns.txt:27
13144
msgid ""
13145
"Case insensitive ignore patterns can be specified with regular expressions\n"
13146
"by using the ``i`` (for ignore case) flag in the pattern."
13147
msgstr ""
13148
13149
#: en/help_topics/patterns.txt:30
13150
msgid "For example, a case insensitive match for ``foo`` may be specified as::"
13151
msgstr ""
13152
13153
#: en/help_topics/patterns.txt:32
13154
msgid " RE:(?i)foo"
13155
msgstr ""
13156
13157
#: en/help_topics/patterns.txt:34
13158
msgid ""
13159
"Ignore patterns may be prefixed with ``!``, which means that a filename\n"
13160
"matched by that pattern will not be ignored."
13161
msgstr ""
13162
13163
#: en/help_topics/patterns.txt:37
13164
msgid ".. _Python regular expressions: http://docs.python.org/library/re.html"
13165
msgstr ""
13166
13167
#: en/help_topics/revisionspec.txt:1
13168
msgid "Revision Identifiers"
13169
msgstr ""
13170
13171
#: en/help_topics/revisionspec.txt:3
13172
msgid ""
13173
"A revision identifier refers to a specific state of a branch's history. It\n"
13174
"can be expressed in several ways. It can begin with a keyword to\n"
13175
"unambiguously specify a given lookup type; some examples are 'last:1',\n"
13176
"'before:yesterday' and 'submit:'."
13177
msgstr ""
13178
13179
#: en/help_topics/revisionspec.txt:8
13180
msgid ""
13181
"Alternately, it can be given without a keyword, in which case it will be\n"
13182
"checked as a revision number, a tag, a revision id, a date specification, or "
13183
"a\n"
13184
"branch specification, in that order. For example, 'date:today' could be\n"
13185
"written as simply 'today', though if you have a tag called 'today' that "
13186
"will\n"
13187
"be found first."
13188
msgstr ""
13189
13190
#: en/help_topics/revisionspec.txt:14
13191
msgid ""
13192
"If 'REV1' and 'REV2' are revision identifiers, then 'REV1..REV2' denotes a\n"
13193
"revision range. Examples: '3647..3649', 'date:yesterday..-1' and\n"
13194
"'branch:/path/to/branch1/..branch:/branch2' (note that there are no quotes "
13195
"or\n"
13196
"spaces around the '..')."
13197
msgstr ""
13198
13199
#: en/help_topics/revisionspec.txt:19
13200
msgid ""
13201
"Ranges are interpreted differently by different commands. To the \"log\" "
13202
"command,\n"
13203
"a range is a sequence of log messages, but to the \"diff\" command, the "
13204
"range\n"
13205
"denotes a change between revisions (and not a sequence of changes). In\n"
13206
"addition, \"log\" considers a closed range whereas \"diff\" and \"merge\" "
13207
"consider it\n"
13208
"to be open-ended, that is, they include one end but not the other. For "
13209
"example:\n"
13210
"\"bzr log -r 3647..3649\" shows the messages of revisions 3647, 3648 and "
13211
"3649,\n"
13212
"while \"bzr diff -r 3647..3649\" includes the changes done in revisions 3648 "
13213
"and\n"
13214
"3649, but not 3647."
13215
msgstr ""
13216
13217
#: en/help_topics/revisionspec.txt:28
13218
msgid "The keywords used as revision selection methods are the following:"
13219
msgstr ""
13220
13221
#: en/help_topics/revisionspec.txt:30
13222
msgid ""
13223
":revid:\n"
13224
"\tSelects a revision using the revision id.\n"
13225
":submit:\n"
13226
"\tSelects a common ancestor with the submit branch.\n"
13227
":ancestor:\n"
13228
"\tSelects a common ancestor with a second branch.\n"
13229
":date:\n"
13230
"\tSelects a revision on the basis of a datestamp.\n"
13231
":branch:\n"
13232
"\tSelects the last revision of a specified branch.\n"
13233
":tag:\n"
13234
"\tSelects a revision identified by a tag name.\n"
13235
":revno:\n"
13236
"\tSelects a revision using a number.\n"
13237
":before:\n"
13238
"\tSelects the parent of the revision specified.\n"
13239
":annotate:\n"
13240
"\tSelect the revision that last modified the specified line.\n"
13241
":mainline:\n"
13242
"\tSelect mainline revision that merged the specified revision.\n"
13243
":last:\n"
13244
"\tSelects the nth revision from the end."
13245
msgstr ""
13246
13247
#: en/help_topics/revisionspec.txt:53
13248
msgid "In addition, plugins can provide other keywords."
13249
msgstr ""
13250
13251
#: en/help_topics/revisionspec.txt:55
13252
msgid "A detailed description of each keyword is given below."
13253
msgstr ""
13254
13255
#: en/help_topics/revisionspec.txt:57
13256
msgid ":revid:"
13257
msgstr ""
13258
13259
#: en/help_topics/revisionspec.txt:59
13260
msgid ""
13261
" Supply a specific revision id, that can be used to specify any\n"
13262
" revision id in the ancestry of the branch.\n"
13263
" Including merges, and pending merges.\n"
13264
" Examples::"
13265
msgstr ""
13266
13267
#: en/help_topics/revisionspec.txt:64
13268
msgid ""
13269
" revid:aaaa@bbbb-123456789 -> Select revision 'aaaa@bbbb-123456789'"
13270
msgstr ""
13271
13272
#: en/help_topics/revisionspec.txt:66
13273
msgid ":submit:"
13274
msgstr ""
13275
13276
#: en/help_topics/revisionspec.txt:68
13277
msgid ""
13278
" Diffing against this shows all the changes that were made in this "
13279
"branch,\n"
13280
" and is a good predictor of what merge will do. The submit branch is\n"
13281
" used by the bundle and merge directive commands. If no submit branch\n"
13282
" is specified, the parent branch is used instead."
13283
msgstr ""
13284
13285
#: en/help_topics/revisionspec.txt:73 en/help_topics/revisionspec.txt:85
13286
msgid ""
13287
" The common ancestor is the last revision that existed in both\n"
13288
" branches. Usually this is the branch point, but it could also be\n"
13289
" a revision that was merged."
13290
msgstr ""
13291
13292
#: en/help_topics/revisionspec.txt:77 en/help_topics/revisionspec.txt:93
13293
#: en/help_topics/revisionspec.txt:109 en/help_topics/revisionspec.txt:119
13294
#: en/help_topics/revisionspec.txt:153
13295
msgid " Examples::"
13296
msgstr ""
13297
13298
#: en/help_topics/revisionspec.txt:79
13299
msgid " $ bzr diff -r submit:"
13300
msgstr ""
13301
13302
#: en/help_topics/revisionspec.txt:81
13303
msgid ":ancestor:"
13304
msgstr ""
13305
13306
#: en/help_topics/revisionspec.txt:83
13307
msgid " Supply the path to a branch to select the common ancestor."
13308
msgstr ""
13309
13310
#: en/help_topics/revisionspec.txt:89
13311
msgid ""
13312
" This is frequently used with 'diff' to return all of the changes\n"
13313
" that your branch introduces, while excluding the changes that you\n"
13314
" have not merged from the remote branch."
13315
msgstr ""
13316
13317
#: en/help_topics/revisionspec.txt:95
13318
msgid ""
13319
" ancestor:/path/to/branch\n"
13320
" $ bzr diff -r ancestor:../../mainline/branch"
13321
msgstr ""
13322
13323
#: en/help_topics/revisionspec.txt:98
13324
msgid ":date:"
13325
msgstr ""
13326
13327
#: en/help_topics/revisionspec.txt:100
13328
msgid ""
13329
" Supply a datestamp to select the first revision that matches the date.\n"
13330
" Date can be 'yesterday', 'today', 'tomorrow' or a YYYY-MM-DD string.\n"
13331
" Matches the first entry after a given date (either at midnight or\n"
13332
" at a specified time)."
13333
msgstr ""
13334
13335
#: en/help_topics/revisionspec.txt:105
13336
msgid " One way to display all the changes since yesterday would be::"
13337
msgstr ""
13338
13339
#: en/help_topics/revisionspec.txt:107
13340
msgid " bzr log -r date:yesterday.."
13341
msgstr ""
13342
13343
#: en/help_topics/revisionspec.txt:111
13344
msgid ""
13345
" date:yesterday -> select the first revision since "
13346
"yesterday\n"
13347
" date:2006-08-14,17:10:14 -> select the first revision after\n"
13348
" August 14th, 2006 at 5:10pm."
13349
msgstr ""
13350
13351
#: en/help_topics/revisionspec.txt:115
13352
msgid ":branch:"
13353
msgstr ""
13354
13355
#: en/help_topics/revisionspec.txt:117
13356
msgid " Supply the path to a branch to select its last revision."
13357
msgstr ""
13358
13359
#: en/help_topics/revisionspec.txt:121
13360
msgid " branch:/path/to/branch"
13361
msgstr ""
13362
13363
#: en/help_topics/revisionspec.txt:123
13364
msgid ":tag:"
13365
msgstr ""
13366
13367
#: en/help_topics/revisionspec.txt:125
13368
msgid " Tags are stored in the branch and created by the 'tag' command."
13369
msgstr ""
13370
13371
#: en/help_topics/revisionspec.txt:127
13372
msgid ":revno:"
13373
msgstr ""
13374
13375
#: en/help_topics/revisionspec.txt:129
13376
msgid ""
13377
" Use an integer to specify a revision in the history of the branch.\n"
13378
" Optionally a branch can be specified. A negative number will count\n"
13379
" from the end of the branch (-1 is the last revision, -2 the previous\n"
13380
" one). If the negative number is larger than the branch's history, the\n"
13381
" first revision is returned.\n"
13382
" Examples::"
13383
msgstr ""
13384
13385
#: en/help_topics/revisionspec.txt:136
13386
msgid ""
13387
" revno:1 -> return the first revision of this branch\n"
13388
" revno:3:/path/to/branch -> return the 3rd revision of\n"
13389
" the branch '/path/to/branch'\n"
13390
" revno:-1 -> The last revision in a branch.\n"
13391
" -2:http://other/branch -> The second to last revision in the\n"
13392
" remote branch.\n"
13393
" -1000000 -> Most likely the first revision, unless\n"
13394
" your history is very long."
13395
msgstr ""
13396
13397
#: en/help_topics/revisionspec.txt:145
13398
msgid ":before:"
13399
msgstr ""
13400
13401
#: en/help_topics/revisionspec.txt:147
13402
msgid ""
13403
" Supply any revision spec to return the parent of that revision. This "
13404
"is\n"
13405
" mostly useful when inspecting revisions that are not in the revision "
13406
"history\n"
13407
" of a branch."
13408
msgstr ""
13409
13410
#: en/help_topics/revisionspec.txt:151
13411
msgid ""
13412
" It is an error to request the parent of the null revision (before:0)."
13413
msgstr ""
13414
13415
#: en/help_topics/revisionspec.txt:155
13416
msgid ""
13417
" before:1913 -> Return the parent of revno 1913 (revno 1912)\n"
13418
" before:revid:aaaa@bbbb-1234567890 -> return the parent of revision\n"
13419
" aaaa@bbbb-1234567890\n"
13420
" bzr diff -r before:1913..1913\n"
13421
" -> Find the changes between revision 1913 and its parent "
13422
"(1912).\n"
13423
" (What changes did revision 1913 introduce).\n"
13424
" This is equivalent to: bzr diff -c 1913"
13425
msgstr ""
13426
13427
#: en/help_topics/revisionspec.txt:163
13428
msgid ":annotate:"
13429
msgstr ""
13430
13431
#: en/help_topics/revisionspec.txt:165
13432
msgid ""
13433
" Select the revision that last modified the specified line. Line is\n"
13434
" specified as path:number. Path is a relative path to the file. "
13435
"Numbers\n"
13436
" start at 1, and are relative to the current version, not the last-\n"
13437
" committed version of the file."
13438
msgstr ""
13439
13440
#: en/help_topics/revisionspec.txt:170
13441
msgid ":mainline:"
13442
msgstr ""
13443
13444
#: en/help_topics/revisionspec.txt:172
13445
msgid ""
13446
" Select the revision that merged the specified revision into mainline."
13447
msgstr ""
13448
13449
#: en/help_topics/revisionspec.txt:174
13450
msgid ":last:"
13451
msgstr ""
13452
13453
#: en/help_topics/revisionspec.txt:176
13454
msgid ""
13455
" Supply a positive number to get the nth revision from the end.\n"
13456
" This is the same as supplying negative numbers to the 'revno:' spec.\n"
13457
" Examples::"
13458
msgstr ""
13459
13460
#: en/help_topics/revisionspec.txt:180
13461
msgid ""
13462
" last:1 -> return the last revision\n"
13463
" last:3 -> return the revision 2 before the end.\n"
13464
msgstr ""
13465
13466
#: en/help_topics/rules.txt:1
13467
msgid ""
13468
"Rules\n"
13469
"====="
13470
msgstr ""
13471
13472
#: en/help_topics/rules.txt:7
13473
msgid ""
13474
"Rules are defined in ini file format where the sections are file glob\n"
13475
"patterns and the contents of each section are the preferences for files\n"
13476
"matching that pattern(s). For example::"
13477
msgstr ""
13478
13479
#: en/help_topics/rules.txt:11
13480
msgid ""
13481
" [name *.bat]\n"
13482
" eol = native"
13483
msgstr ""
13484
13485
#: en/help_topics/rules.txt:14
13486
msgid ""
13487
" [name *.html *.xml]\n"
13488
" keywords = xml_escape"
13489
msgstr ""
13490
13491
#: en/help_topics/rules.txt:17
13492
msgid ""
13493
"Preferences like these are useful for commands and plugins wishing to\n"
13494
"provide custom behaviour for selected files. For more information on \n"
13495
"end of line conversion see :doc:`eol-help`.\n"
13496
"Keyword support is provided by the `keywords plugin\n"
13497
"<http://doc.bazaar.canonical.com/plugins/en/keywords-plugin.html>`_."
13498
msgstr ""
13499
13500
#: en/help_topics/rules.txt:23
13501
msgid ""
13502
"Files\n"
13503
"-----"
13504
msgstr ""
13505
13506
#: en/help_topics/rules.txt:26
13507
msgid ""
13508
"Default rules for all branches are defined in the optional file\n"
13509
"``BZR_HOME/rules``. "
13510
msgstr ""
13511
13512
#: en/help_topics/rules.txt:29
13513
msgid ""
13514
"Rule Patterns\n"
13515
"-------------"
13516
msgstr ""
13517
13518
#: en/help_topics/rules.txt:32
13519
msgid ""
13520
"Patterns are ordered and searching stops as soon as one matches.\n"
13521
"As a consequence, more explicit patterns should be placed towards\n"
13522
"the top of the file. Rule patterns use exactly the same conventions\n"
13523
"as ignore patterns. See :doc:`patterns-help` for details."
13524
msgstr ""
13525
13526
#: en/help_topics/rules.txt:37
13527
msgid ".. note::"
13528
msgstr ""
13529
13530
#: en/help_topics/rules.txt:39
13531
msgid ""
13532
" Patterns containing square brackets or spaces should be\n"
13533
" surrounded in quotes to ensure they are correctly parsed.\n"
13534
msgstr ""
13535
13536
#: en/help_topics/topics.txt:1
13537
msgid ""
13538
"authentication Information on configuring authentication\n"
13539
"basic Basic commands\n"
13540
"branches Information on what a branch is\n"
13541
"bugs Bug tracker settings\n"
13542
"checkouts Information on what a checkout is\n"
13543
"commands Basic help for all commands\n"
13544
"configuration Details on the configuration settings available\n"
13545
"conflict-types Types of conflicts and what to do about them\n"
13546
"content-filters Conversion of content into/from working trees\n"
13547
"criss-cross Information on criss-cross merging\n"
13548
"current-formats Current storage formats\n"
13549
"debug-flags Options to show or record debug information\n"
13550
"diverged-branches How to fix diverged branches\n"
13551
"env-variables Environment variable names and values\n"
13552
"eol Information on end-of-line handling\n"
13553
"files Information on configuration and log files\n"
13554
"formats Information on choosing a storage format\n"
13555
"global-options Options that control how Bazaar runs\n"
13556
"hidden-commands All hidden commands\n"
13557
"hooks Points at which custom processing can be added\n"
13558
"launchpad Using Bazaar with Launchpad.net\n"
13559
"location-alias Aliases for remembered locations\n"
13560
"log-formats Details on the logging formats available\n"
13561
"other-formats Experimental and deprecated storage formats\n"
13562
"patterns Information on the pattern syntax\n"
13563
"repositories Basic information on shared repositories.\n"
13564
"revisionspec Explain how to use --revision\n"
13565
"rules Information on defining rule-based preferences\n"
13566
"standalone-trees Information on what a standalone tree is\n"
13567
"standard-options Options that can be used with any command\n"
13568
"status-flags Help on status flags\n"
13569
"sync-for-reconfigure Steps to resolve \"out-of-sync\" when reconfiguring\n"
13570
"topics Topics list\n"
13571
"url-special-chars Special character handling in URLs\n"
13572
"urlspec Supported transport protocols\n"
13573
"working-trees Information on working trees\n"
13574
msgstr ""
13575
13576
#: en/help_topics/url-special-chars.txt:1
13577
msgid ""
13578
"Special character handling in URLs\n"
13579
"=================================="
13580
msgstr ""
13581
13582
#: en/help_topics/url-special-chars.txt:4
13583
msgid "Bazaar allows locations to be specified in multiple ways, either:"
13584
msgstr ""
13585
13586
#: en/help_topics/url-special-chars.txt:6
13587
msgid " * Fully qualified URLs"
13588
msgstr ""
13589
13590
#: en/help_topics/url-special-chars.txt:8
13591
msgid " * File system paths, relative or absolute"
13592
msgstr ""
13593
13594
#: en/help_topics/url-special-chars.txt:10
13595
msgid ""
13596
"Internally bzr treats all locations as URLs. For any file system paths\n"
13597
"that are specified it will automatically determine the appropriate URL\n"
13598
"representation, and escape special characters where necessary."
13599
msgstr ""
13600
13601
#: en/help_topics/url-special-chars.txt:14
13602
msgid ""
13603
"There are a few characters which have special meaning in URLs and need "
13604
"careful\n"
13605
"handling to avoid ambiguities. Characters can be escaped with a % and a hex\n"
13606
"value in URLs. Any non-ASCII characters in a file path will automatically "
13607
"be\n"
13608
"urlencoded when the path is converted to a URL."
13609
msgstr ""
13610
13611
#: en/help_topics/url-special-chars.txt:19
13612
msgid ""
13613
"URLs represent non-ASCII characters in an encoding defined by the server, "
13614
"but\n"
13615
"usually UTF-8. The % escapes should be of the UTF-8 bytes. Bazaar tries to "
13616
"be\n"
13617
"generous in what it accepts as a URL and to print them in a way that\n"
13618
"will be readable."
13619
msgstr ""
13620
13621
#: en/help_topics/url-special-chars.txt:24
13622
msgid ""
13623
"For example, if you have a directory named '/tmp/%2False' these are all "
13624
"valid\n"
13625
"ways of accessing the content (0x2F, or 47, is the ASCII code for forward "
13626
"slash)::"
13627
msgstr ""
13628
13629
#: en/help_topics/url-special-chars.txt:27
13630
msgid ""
13631
" cd /tmp\n"
13632
" bzr log /tmp/%2False\n"
13633
" bzr log %2False\n"
13634
" bzr log file:///tmp/%252False\n"
13635
" bzr log file://localhost/tmp/%252False\n"
13636
" bzr log file:%252False"
13637
msgstr ""
13638
13639
#: en/help_topics/url-special-chars.txt:34
13640
msgid "These are valid but do not refer to the same file::"
13641
msgstr ""
13642
13643
#: en/help_topics/url-special-chars.txt:36
13644
msgid ""
13645
" bzr log file:///tmp/%2False (refers to a file called /tmp/\\/alse)\n"
13646
" bzr log %252False (refers to a file called /tmp/%252False)"
13647
msgstr ""
13648
13649
#: en/help_topics/url-special-chars.txt:39
13650
msgid ""
13651
"Comma also has special meaning in URLs, because it denotes `segment "
13652
"parameters`_"
13653
msgstr ""
13654
13655
#: en/help_topics/url-special-chars.txt:41
13656
msgid ""
13657
"_`segment parameters`: http://www.ietf.org/rfc/rfc3986.txt (section 3.3)"
13658
msgstr ""
13659
13660
#: en/help_topics/url-special-chars.txt:43
13661
msgid ""
13662
"Comma is also special in any file system paths that are specified. To use a "
13663
"literal\n"
13664
"comma in a file system path, specify a URL and URL encode the comma::"
13665
msgstr ""
13666
13667
#: en/help_topics/url-special-chars.txt:46
13668
msgid ""
13669
" bzr log foo,branch=bla # path \"foo\" with the segment parameter \"branch"
13670
"\" set to \"bla\"\n"
13671
" bzr log file:foo%2Cbranch=bla # path \"foo,branch=bla\"\n"
13672
" bzr log file:foo,branch=bla # path \"foo\" with segment parameter \"branch"
13673
"\" set to \"bla\"\n"
13674
msgstr ""
13675
13676
#: en/help_topics/urlspec.txt:1
13677
msgid "URL Identifiers"
13678
msgstr ""
13679
13680
#: en/help_topics/urlspec.txt:3
13681
msgid "Supported URL prefixes::"
13682
msgstr ""
13683
13684
#: en/help_topics/urlspec.txt:5
13685
msgid ""
13686
" aftp:// Access using active FTP.\n"
13687
" bzr:// Fast access using the Bazaar smart server.\n"
13688
" bzr+ssh:// Fast access using the Bazaar smart server over SSH.\n"
13689
" file:// Access using the standard filesystem (default)\n"
13690
" ftp:// Access using passive FTP.\n"
13691
" http:// Read-only access of branches exported on the web.\n"
13692
" https:// Read-only access of branches exported on the web using "
13693
"SSL.\n"
13694
" sftp:// Access using SFTP (most SSH servers provide SFTP)."
13695
msgstr ""
13696
13697
#: en/help_topics/urlspec.txt:14
13698
msgid "Supported modifiers::"
13699
msgstr ""
13700
13701
#: en/help_topics/urlspec.txt:16
13702
msgid " gio+ Access using any GIO supported protocols."
13703
msgstr ""
13704
13705
#: en/help_topics/urlspec.txt:18
13706
msgid "Bazaar supports all of the standard parts within the URL::"
13707
msgstr ""
13708
13709
#: en/help_topics/urlspec.txt:20
13710
msgid " <protocol>://[user[:password]@]host[:port]/[path]"
13711
msgstr ""
13712
13713
#: en/help_topics/urlspec.txt:22
13714
msgid "allowing URLs such as::"
13715
msgstr ""
13716
13717
#: en/help_topics/urlspec.txt:24
13718
msgid " http://bzruser:BadPass@bzr.example.com:8080/bzr/trunk"
13719
msgstr ""
13720
13721
#: en/help_topics/urlspec.txt:26
13722
msgid ""
13723
"For bzr+ssh:// and sftp:// URLs, Bazaar also supports paths that begin\n"
13724
"with '~' as meaning that the rest of the path should be interpreted\n"
13725
"relative to the remote user's home directory. For example if the user\n"
13726
"``remote`` has a home directory of ``/home/remote`` on the server\n"
13727
"shell.example.com, then::"
13728
msgstr ""
13729
13730
#: en/help_topics/urlspec.txt:32
13731
msgid " bzr+ssh://remote@shell.example.com/~/myproject/trunk"
13732
msgstr ""
13733
13734
#: en/help_topics/urlspec.txt:34
13735
msgid "would refer to ``/home/remote/myproject/trunk``."
13736
msgstr ""
13737
13738
#: en/help_topics/urlspec.txt:36
13739
msgid ""
13740
"Many commands that accept URLs also accept location aliases too.\n"
13741
"See :doc:`location-alias-help` and :doc:`url-special-chars-help`.\n"
13742
msgstr ""
Loggerhead is a web-based interface for Breezy
Version: 2.0.1