« back to all changes in this revision
Viewing changes to po/bzr.pot
- browse files at revision 6445.4.1
- compare with another revision
- download diff
- download tarball
- view history from revision 6445.4.1
- Committer: Jelmer Vernooij
- Date: 2012-01-24 13:14:06 UTC
- mto: (6445.4.5 nested-trees-spec)
- mto: This revision was merged to the branch mainline in revision 6518.
- Revision ID: jelmer@samba.org-20120124131406-wedftkorbpv37bm0
Import nested tree doc from devnotes.
- files added:
- NEWS
- bzrlib/plugins/changelog_merge
- bzrlib/plugins/changelog_merge/tests
- 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 removed:
- bzrlib/deprecated_graph.py
- bzrlib/util/effbot
- bzrlib/util/effbot/org
- bzrlib/util/elementtree
- files renamed:
- bzrlib/sign_my_commits.py => bzrlib/commit_signature_commands.py
- bzrlib/repofmt/weaverepo.py => bzrlib/plugins/weave_fmt/repository.py
- bzrlib/xml4.py => bzrlib/plugins/weave_fmt/xml4.py
- bzrlib/tests/per_repository/test_is_write_locked.py => bzrlib/tests/per_repository/test_locking.py
- bzrlib/tests/per_repository/helpers.py => bzrlib/tests/per_repository_vf/helpers.py
- bzrlib/tests/per_repository/test__generate_text_key_index.py => bzrlib/tests/per_repository_vf/test__generate_text_key_index.py
- bzrlib/tests/per_repository/test_add_inventory_by_delta.py => bzrlib/tests/per_repository_vf/test_add_inventory_by_delta.py
- bzrlib/tests/per_repository/test_check_reconcile.py => bzrlib/tests/per_repository_vf/test_check_reconcile.py
- bzrlib/tests/per_repository/test_find_text_key_references.py => bzrlib/tests/per_repository_vf/test_find_text_key_references.py
- bzrlib/tests/per_repository/test_merge_directive.py => bzrlib/tests/per_repository_vf/test_merge_directive.py
- NEWS => doc/en/release-notes/bzr-2.3.txt
- NEWS-template.txt => doc/en/release-notes/release-template.txt
- 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: 2012-01-16 15:18+0100\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:95
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:3183
30
#, python-format
31
msgid "Pushed up to revision %d."
32
msgstr ""
33
34
#: bzrlib/branch.py:3185
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:3188
42
msgid "No new revisions or tags to push."
43
msgstr ""
44
45
#: bzrlib/branch.py:3190
46
msgid "No new revisions to push."
47
msgstr ""
48
49
#: bzrlib/branch.py:3210
50
msgid "checked branch {0} format {1}"
51
msgstr ""
52
53
#: bzrlib/branch.py:3213
54
#, python-format
55
msgid "found error:%s"
56
msgstr ""
57
58
#: bzrlib/builtins.py:121 bzrlib/builtins.py:2923 bzrlib/workingtree.py:315
59
#, python-format
60
msgid "Ignoring files outside view. View is %s"
61
msgstr ""
62
63
#: bzrlib/builtins.py:130
64
#, python-format
65
msgid "bzr %s --revision takes exactly one revision identifier"
66
msgstr ""
67
68
#: bzrlib/builtins.py:215
69
msgid "Display status summary."
70
msgstr ""
71
72
#: bzrlib/builtins.py:217
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:220
79
msgid ""
80
"added\n"
81
" Versioned in the working copy but not in the previous revision."
82
msgstr ""
83
84
#: bzrlib/builtins.py:223
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:227
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:232
100
msgid ""
101
"modified\n"
102
" Text has changed since the previous revision."
103
msgstr ""
104
105
#: bzrlib/builtins.py:235
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:238
112
msgid ""
113
"unknown\n"
114
" Not versioned and not matching an ignore pattern."
115
msgstr ""
116
117
#: bzrlib/builtins.py:241
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:246
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:249
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:253
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:258
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:263
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:266
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:275
169
msgid "Use short status indicators."
170
msgstr ""
171
172
# help of 'versioned' option of 'status' command
173
#: bzrlib/builtins.py:277
174
msgid "Only show versioned files."
175
msgstr ""
176
177
# help of 'no-pending' option of 'status' command
178
#: bzrlib/builtins.py:279
179
msgid "Don't show pending merges."
180
msgstr ""
181
182
# help of 'no-classify' option of 'status' command
183
#: bzrlib/builtins.py:282
184
msgid "Do not mark object type using indicator."
185
msgstr ""
186
187
#: bzrlib/builtins.py:297
188
msgid "bzr status --revision takes exactly one or two revision specifiers"
189
msgstr ""
190
191
#: bzrlib/builtins.py:341 bzrlib/builtins.py:5090
192
msgid "You can only supply one of revision_id or --revision"
193
msgstr ""
194
195
#: bzrlib/builtins.py:344 bzrlib/builtins.py:5092
196
msgid "You must supply either --revision or a revision_id"
197
msgstr ""
198
199
#: bzrlib/builtins.py:351
200
#, python-format
201
msgid "Repository %r does not support access to raw revision texts"
202
msgstr ""
203
204
#: bzrlib/builtins.py:362
205
msgid "The repository {0} contains no revision {1}."
206
msgstr ""
207
208
#: bzrlib/builtins.py:369
209
msgid "You cannot specify a NULL revision."
210
msgstr ""
211
212
#: bzrlib/builtins.py:461
213
msgid "Remove the working tree from a given branch/checkout."
214
msgstr ""
215
216
#: bzrlib/builtins.py:463
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:466
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:472
228
msgid "Remove the working tree even if it has uncommitted or shelved changes."
229
msgstr ""
230
231
#: bzrlib/builtins.py:486
232
msgid "No working tree to remove"
233
msgstr ""
234
235
#: bzrlib/builtins.py:488
236
msgid "You cannot remove the working tree of a remote path"
237
msgstr ""
238
239
#: bzrlib/builtins.py:497
240
msgid "You cannot remove the working tree from a lightweight checkout"
241
msgstr ""
242
243
#: bzrlib/builtins.py:537
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:548
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:552
256
msgid "failed to reset the tree state{0}"
257
msgstr ""
258
259
#: bzrlib/builtins.py:556
260
msgid "Show current revision number."
261
msgstr ""
262
263
#: bzrlib/builtins.py:558
264
msgid "This is equal to the number of revisions on this branch."
265
msgstr ""
266
267
#: bzrlib/builtins.py:571
268
msgid "--tree and --revision can not be used together"
269
msgstr ""
270
271
#: bzrlib/builtins.py:588 bzrlib/builtins.py:5874
272
msgid "Tags can only be placed on a single revision, not on a range"
273
msgstr ""
274
275
# help of 'tree' option of 'revno' command
276
#: bzrlib/builtins.py:612
277
msgid "Show revno of working tree."
278
msgstr ""
279
280
#: bzrlib/builtins.py:660
281
msgid "Add specified files or directories."
282
msgstr ""
283
284
#: bzrlib/builtins.py:662
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:666
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:674
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:677
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:680
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:685
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:688
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:696
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:699
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:706
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:712
359
msgid "Lookup file ids from this tree."
360
msgstr ""
361
362
#: bzrlib/builtins.py:748
363
msgid "ignored {0} matching \"{1}\"\n"
364
msgstr ""
365
366
#: bzrlib/builtins.py:753
367
msgid "Create a new versioned directory."
368
msgstr ""
369
370
#: bzrlib/builtins.py:755
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:762
376
msgid "No error if existing, make parent directories as needed."
377
msgstr ""
378
379
#: bzrlib/builtins.py:796
380
#, python-format
381
msgid "added %s\n"
382
msgstr ""
383
384
#: bzrlib/builtins.py:838
385
#, python-format
386
msgid "invalid kind %r specified"
387
msgstr ""
388
389
#: bzrlib/builtins.py:875
390
msgid "Move or rename a file."
391
msgstr ""
392
393
#: bzrlib/builtins.py:877
394
msgid " bzr mv SOURCE... DESTINATION"
395
msgstr ""
396
397
#: bzrlib/builtins.py:879
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:883
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:889
414
msgid "Files cannot be moved between branches."
415
msgstr ""
416
417
# help of 'after' option of 'mv' command
418
#: bzrlib/builtins.py:896
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:898
426
msgid "Automatically guess renames."
427
msgstr ""
428
429
# help of 'dry-run' option of 'mv' command
430
#: bzrlib/builtins.py:899
431
msgid "Avoid making changes when guessing renames."
432
msgstr ""
433
434
#: bzrlib/builtins.py:908
435
msgid "--dry-run requires --auto."
436
msgstr ""
437
438
#: bzrlib/builtins.py:912
439
msgid "missing file argument"
440
msgstr ""
441
442
#: bzrlib/builtins.py:916
443
msgid "can not move root of branch"
444
msgstr ""
445
446
#: bzrlib/builtins.py:922
447
msgid "Only one path may be specified to --auto."
448
msgstr ""
449
450
#: bzrlib/builtins.py:925
451
msgid "--after cannot be specified with --auto."
452
msgstr ""
453
454
#: bzrlib/builtins.py:962
455
msgid "to mv multiple files the destination must be a versioned directory"
456
msgstr ""
457
458
#: bzrlib/builtins.py:1014
459
msgid "Turn this branch into a mirror of another branch."
460
msgstr ""
461
462
#: bzrlib/builtins.py:1016
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:1021
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:1025
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:1029
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:1034
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:1038
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:1046
508
msgid "Show logs of pulled revisions."
509
msgstr ""
510
511
# help of 'directory' option of 'pull' command
512
#: bzrlib/builtins.py:1048
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:1051
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:1080
525
msgid "Need working tree for --show-base."
526
msgstr ""
527
528
#: bzrlib/builtins.py:1096
529
msgid "No pull location known or specified."
530
msgstr ""
531
532
#: bzrlib/builtins.py:1102
533
#, python-format
534
msgid "Using saved parent location: %s\n"
535
msgstr ""
536
537
#: bzrlib/builtins.py:1109 bzrlib/builtins.py:4300
538
msgid "Cannot use -r with merge directives or bundles"
539
msgstr ""
540
541
#: bzrlib/builtins.py:1150
542
msgid "Update a mirror of this branch."
543
msgstr ""
544
545
#: bzrlib/builtins.py:1152
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:1155
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:1158
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:1162
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:1165
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:1169
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:1174
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:1185 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:1188
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:1193
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:1196
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:1201 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:1204
631
msgid "Don't populate the working tree, even for protocols that support it."
632
msgstr ""
633
634
#: bzrlib/builtins.py:1248
635
msgid "Could not determine branch to refer to."
636
msgstr ""
637
638
#: bzrlib/builtins.py:1257
639
#, python-format
640
msgid ""
641
"No push location known or specified. To push to the parent branch (at %s), "
642
"use 'bzr push :parent'."
643
msgstr ""
644
645
#: bzrlib/builtins.py:1263 bzrlib/foreign.py:306
646
msgid "No push location known or specified."
647
msgstr ""
648
649
#: bzrlib/builtins.py:1267
650
#, python-format
651
msgid "Using saved push location: %s"
652
msgstr ""
653
654
#: bzrlib/builtins.py:1277
655
msgid "Create a new branch that is a copy of an existing branch."
656
msgstr ""
657
658
#: bzrlib/builtins.py:1279
659
msgid ""
660
"If the TO_LOCATION is omitted, the last component of the FROM_LOCATION will\n"
661
"be used. In other words, \"branch ../foo/bar\" will attempt to create ./"
662
"bar.\n"
663
"If the FROM_LOCATION has no / or path separator embedded, the TO_LOCATION\n"
664
"is derived from the FROM_LOCATION by stripping a leading scheme or drive\n"
665
"identifier, if any. For example, \"branch lp:foo-bar\" will attempt to\n"
666
"create ./foo-bar."
667
msgstr ""
668
669
#: bzrlib/builtins.py:1286
670
msgid ""
671
"To retrieve the branch as of a particular revision, supply the --revision\n"
672
"parameter, as in \"branch foo/bar -r 5\"."
673
msgstr ""
674
675
#: bzrlib/builtins.py:1289
676
msgid "The synonyms 'clone' and 'get' for this command are deprecated."
677
msgstr ""
678
679
# help of 'no-tree' option of 'branch' command
680
#: bzrlib/builtins.py:1299
681
msgid "Create a branch without a working-tree."
682
msgstr ""
683
684
# help of 'switch' option of 'branch' command
685
#: bzrlib/builtins.py:1301
686
msgid "Switch the checkout in the current directory to the new branch."
687
msgstr ""
688
689
# help of 'stacked' option of 'branch' command
690
#: bzrlib/builtins.py:1304
691
msgid ""
692
"Create a stacked branch referring to the source branch. The new branch will "
693
"depend on the availability of the source branch for all operations."
694
msgstr ""
695
696
# help of 'standalone' option of 'branch' command
697
#: bzrlib/builtins.py:1308
698
msgid "Do not use a shared repository, even if available."
699
msgstr ""
700
701
# help of 'use-existing-dir' option of 'branch' command
702
#: bzrlib/builtins.py:1310
703
msgid ""
704
"By default branch will fail if the target directory exists, but does not "
705
"already have a control directory. This flag will allow branch to proceed."
706
msgstr ""
707
708
# help of 'bind' option of 'branch' command
709
#: bzrlib/builtins.py:1315
710
msgid "Bind new branch to from location."
711
msgstr ""
712
713
#: bzrlib/builtins.py:1362
714
#, python-format
715
msgid "Target directory \"%s\" already exists."
716
msgstr ""
717
718
#: bzrlib/builtins.py:1374
719
#, python-format
720
msgid "Parent of \"%s\" does not exist."
721
msgstr ""
722
723
#: bzrlib/builtins.py:1393
724
msgid "The branch {0} has no revision {1}."
725
msgstr ""
726
727
#: bzrlib/builtins.py:1403 bzrlib/push.py:53
728
#, python-format
729
msgid "Created new stacked branch referring to %s."
730
msgstr ""
731
732
#: bzrlib/builtins.py:1407
733
#, python-format
734
msgid "Branched %d revision."
735
msgid_plural "Branched %d revisions."
736
msgstr[0] ""
737
msgstr[1] ""
738
739
#: bzrlib/builtins.py:1412
740
#, python-format
741
msgid "New branch bound to %s"
742
msgstr ""
743
744
#: bzrlib/builtins.py:1417 bzrlib/builtins.py:6187
745
#, python-format
746
msgid "Switched to branch: %s"
747
msgstr ""
748
749
#: bzrlib/builtins.py:1422
750
msgid "List the branches available at the current location."
751
msgstr ""
752
753
#: bzrlib/builtins.py:1424
754
msgid ""
755
"This command will print the names of all the branches at the current\n"
756
"location."
757
msgstr ""
758
759
# help of 'recursive' option of 'branches' command
760
#: bzrlib/builtins.py:1431
761
msgid ""
762
"Recursively scan for branches rather than just looking in the specified "
763
"location."
764
msgstr ""
765
766
#: bzrlib/builtins.py:1461
767
msgid "(default)"
768
msgstr ""
769
770
#: bzrlib/builtins.py:1473
771
msgid "Create a new checkout of an existing branch."
772
msgstr ""
773
774
#: bzrlib/builtins.py:1475
775
msgid ""
776
"If BRANCH_LOCATION is omitted, checkout will reconstitute a working tree "
777
"for\n"
778
"the branch found in '.'. This is useful if you have removed the working "
779
"tree\n"
780
"or if it was never created - i.e. if you pushed the branch to its current\n"
781
"location using SFTP."
782
msgstr ""
783
784
#: bzrlib/builtins.py:1480
785
msgid ""
786
"If the TO_LOCATION is omitted, the last component of the BRANCH_LOCATION "
787
"will\n"
788
"be used. In other words, \"checkout ../foo/bar\" will attempt to create ./"
789
"bar.\n"
790
"If the BRANCH_LOCATION has no / or path separator embedded, the TO_LOCATION\n"
791
"is derived from the BRANCH_LOCATION by stripping a leading scheme or drive\n"
792
"identifier, if any. For example, \"checkout lp:foo-bar\" will attempt to\n"
793
"create ./foo-bar."
794
msgstr ""
795
796
#: bzrlib/builtins.py:1487
797
msgid ""
798
"To retrieve the branch as of a particular revision, supply the --revision\n"
799
"parameter, as in \"checkout foo/bar -r 5\". Note that this will be "
800
"immediately\n"
801
"out of date [so you cannot commit] but it may be useful (i.e. to examine "
802
"old\n"
803
"code.)"
804
msgstr ""
805
806
# help of 'lightweight' option of 'checkout' command
807
#: bzrlib/builtins.py:1497
808
msgid ""
809
"Perform a lightweight checkout. Lightweight checkouts depend on access to "
810
"the branch for every operation. Normal checkouts can perform common "
811
"operations like diff and status without such access, and also support local "
812
"commits."
813
msgstr ""
814
815
# help of 'files-from' option of 'branch' command
816
# help of 'files-from' option of 'checkout' command
817
#: bzrlib/builtins.py:1504
818
msgid "Get file contents from this tree."
819
msgstr ""
820
821
# help of 'hardlink' option of 'branch' command
822
# help of 'hardlink' option of 'checkout' command
823
#: bzrlib/builtins.py:1506
824
msgid "Hard-link working tree files where possible."
825
msgstr ""
826
827
#: bzrlib/builtins.py:1547
828
msgid ""
829
"Show list of renamed files.\n"
830
" "
831
msgstr ""
832
833
#: bzrlib/builtins.py:1577
834
msgid "Update a working tree to a new revision."
835
msgstr ""
836
837
#: bzrlib/builtins.py:1579
838
msgid ""
839
"This will perform a merge of the destination revision (the tip of the\n"
840
"branch, or the specified revision) into the working tree, and then make\n"
841
"that revision the basis revision for the working tree. "
842
msgstr ""
843
844
#: bzrlib/builtins.py:1583
845
msgid ""
846
"You can use this to visit an older revision, or to update a working tree\n"
847
"that is out of date from its branch."
848
msgstr ""
849
850
#: bzrlib/builtins.py:1586
851
msgid ""
852
"If there are any uncommitted changes in the tree, they will be carried\n"
853
"across and remain as uncommitted changes after the update. To discard\n"
854
"these changes, use 'bzr revert'. The uncommitted changes may conflict\n"
855
"with the changes brought in by the change in basis revision."
856
msgstr ""
857
858
#: bzrlib/builtins.py:1591
859
msgid ""
860
"If the tree's branch is bound to a master branch, bzr will also update\n"
861
"the branch from the master."
862
msgstr ""
863
864
#: bzrlib/builtins.py:1594
865
msgid ""
866
"You cannot update just a single file or directory, because each Bazaar\n"
867
"working tree has just a single basis revision. If you want to restore a\n"
868
"file that has been removed locally, use 'bzr revert' instead of 'bzr\n"
869
"update'. If you want to restore a file to its state in a previous\n"
870
"revision, use 'bzr revert' with a '-r' option, or use 'bzr cat' to write\n"
871
"out the old content of that file to a new location."
872
msgstr ""
873
874
#: bzrlib/builtins.py:1601
875
msgid ""
876
"The 'dir' argument, if given, must be the location of the root of a\n"
877
"working tree to update. By default, the working tree that contains the \n"
878
"current working directory is used."
879
msgstr ""
880
881
#: bzrlib/builtins.py:1617
882
msgid "bzr update --revision takes exactly one revision"
883
msgstr ""
884
885
#: bzrlib/builtins.py:1625
886
msgid "bzr update can only update a whole tree, not a file or subdirectory"
887
msgstr ""
888
889
#: bzrlib/builtins.py:1656
890
msgid "Tree is up to date at revision {0} of branch {1}"
891
msgstr ""
892
893
#: bzrlib/builtins.py:1672
894
#, python-format
895
msgid ""
896
"branch has no revision %s\n"
897
"bzr update --revision only works for a revision in the branch history"
898
msgstr ""
899
900
#: bzrlib/builtins.py:1678
901
msgid "Updated to revision {0} of branch {1}"
902
msgstr ""
903
904
#: bzrlib/builtins.py:1682
905
msgid ""
906
"Your local commits will now show as pending merges with 'bzr status', and "
907
"can be committed with 'bzr commit'."
908
msgstr ""
909
910
#: bzrlib/builtins.py:1691
911
msgid "Show information about a working tree, branch or repository."
912
msgstr ""
913
914
#: bzrlib/builtins.py:1693
915
msgid ""
916
"This command will show all known locations and formats associated to the\n"
917
"tree, branch or repository."
918
msgstr ""
919
920
#: bzrlib/builtins.py:1696
921
msgid ""
922
"In verbose mode, statistical information is included with each report.\n"
923
"To see extended statistic information, use a verbosity level of 2 or\n"
924
"higher by specifying the verbose option multiple times, e.g. -vv."
925
msgstr ""
926
927
#: bzrlib/builtins.py:1700
928
msgid "Branches and working trees will also report any missing revisions."
929
msgstr ""
930
931
#: bzrlib/builtins.py:1702 bzrlib/builtins.py:3622 bzrlib/builtins.py:4752
932
#: bzrlib/builtins.py:6389
933
msgid ":Examples:"
934
msgstr ""
935
936
#: bzrlib/builtins.py:1704
937
msgid " Display information on the format and related locations:"
938
msgstr ""
939
940
#: bzrlib/builtins.py:1706
941
msgid " bzr info"
942
msgstr ""
943
944
#: bzrlib/builtins.py:1708
945
msgid ""
946
" Display the above together with extended format information and\n"
947
" basic statistics (like the number of files in the working tree and\n"
948
" number of revisions in the branch and repository):"
949
msgstr ""
950
951
#: bzrlib/builtins.py:1712
952
msgid " bzr info -v"
953
msgstr ""
954
955
#: bzrlib/builtins.py:1714
956
msgid " Display the above together with number of committers to the branch:"
957
msgstr ""
958
959
#: bzrlib/builtins.py:1716
960
msgid " bzr info -vv"
961
msgstr ""
962
963
#: bzrlib/builtins.py:1735
964
msgid "Remove files or directories."
965
msgstr ""
966
967
#: bzrlib/builtins.py:1737
968
msgid ""
969
"This makes Bazaar stop tracking changes to the specified files. Bazaar will\n"
970
"delete them if they can easily be recovered using revert otherwise they\n"
971
"will be backed up (adding an extention of the form .~#~). If no options or\n"
972
"parameters are given Bazaar will scan for files that are being tracked by\n"
973
"Bazaar but missing in your tree and stop tracking them for you."
974
msgstr ""
975
976
# help of 'new' option of 'remove' command
977
#: bzrlib/builtins.py:1745
978
msgid "Only remove files that have never been committed."
979
msgstr ""
980
981
# help of 'file-deletion-strategy' option of 'remove' command
982
#: bzrlib/builtins.py:1747
983
msgid "The file deletion mode to be used."
984
msgstr ""
985
986
# title of 'file-deletion-strategy' option of 'remove' command
987
#: bzrlib/builtins.py:1748
988
msgid "Deletion Strategy"
989
msgstr ""
990
991
# help of 'file-deletion-strategy=safe' option of 'remove' command
992
#: bzrlib/builtins.py:1749
993
msgid "Backup changed files (default)."
994
msgstr ""
995
996
# help of 'file-deletion-strategy=keep' option of 'remove' command
997
#: bzrlib/builtins.py:1750
998
msgid "Delete from bzr but leave the working copy."
999
msgstr ""
1000
1001
# help of 'file-deletion-strategy=no-backup' option of 'remove' command
1002
#: bzrlib/builtins.py:1751
1003
msgid "Don't backup changed files."
1004
msgstr ""
1005
1006
# help of 'file-deletion-strategy=force' option of 'remove' command
1007
#: bzrlib/builtins.py:1752
1008
msgid ""
1009
"Delete all the specified files, even if they can not be recovered and even "
1010
"if they are non-empty directories. (deprecated, use no-backup)"
1011
msgstr ""
1012
1013
#: bzrlib/builtins.py:1761
1014
msgid "(The --force option is deprecated, rather use --no-backup in future.)"
1015
msgstr ""
1016
1017
#: bzrlib/builtins.py:1778
1018
msgid "No matching files."
1019
msgstr ""
1020
1021
#: bzrlib/builtins.py:1839
1022
msgid "Reconcile bzr metadata in a branch."
1023
msgstr ""
1024
1025
#: bzrlib/builtins.py:1841
1026
msgid ""
1027
"This can correct data mismatches that may have been caused by\n"
1028
"previous ghost operations or bzr upgrades. You should only\n"
1029
"need to run this command if 'bzr check' or a bzr developer\n"
1030
"advises you to run it."
1031
msgstr ""
1032
1033
#: bzrlib/builtins.py:1846
1034
msgid ""
1035
"If a second branch is provided, cross-branch reconciliation is\n"
1036
"also attempted, which will check that data like the tree root\n"
1037
"id which was not present in very early bzr versions is represented\n"
1038
"correctly in both branches."
1039
msgstr ""
1040
1041
#: bzrlib/builtins.py:1851
1042
msgid ""
1043
"At the same time it is run it may recompress data resulting in\n"
1044
"a potential saving in disk space or performance gain."
1045
msgstr ""
1046
1047
#: bzrlib/builtins.py:1854
1048
msgid "The branch *MUST* be on a listable system such as local disk or sftp."
1049
msgstr ""
1050
1051
# help of 'format=2a' option of 'init' command
1052
# help of 'format=default' option of 'init' command
1053
# help of 'format=2a' option of 'init-repository' command
1054
# help of 'format=default' option of 'init-repository' command
1055
# help of 'format=2a' option of 'upgrade' command
1056
# help of 'format=default' option of 'upgrade' command
1057
#: bzrlib/builtins.py:1921 bzrlib/builtins.py:2039 bzrlib/builtins.py:3657
1058
msgid ""
1059
"Format for the bzr 2.0 series.\n"
1060
"Uses group-compress storage.\n"
1061
"Provides rich roots which are a one-way transition.\n"
1062
msgstr ""
1063
1064
# help of 'format=pack-0.92' option of 'init' command
1065
# help of 'format=pack-0.92' option of 'init-repository' command
1066
# help of 'format=pack-0.92' option of 'upgrade' command
1067
#: bzrlib/builtins.py:1921 bzrlib/builtins.py:2039 bzrlib/builtins.py:3657
1068
msgid ""
1069
"Pack-based format used in 1.x series. Introduced in 0.92. Interoperates with "
1070
"bzr repositories before 0.92 but cannot be read by bzr < 0.92. "
1071
msgstr ""
1072
1073
# help of 'format=development-colo' option of 'init' command
1074
# help of 'format=development-colo' option of 'init-repository' command
1075
# help of 'format=development-colo' option of 'upgrade' command
1076
#: bzrlib/builtins.py:1921 bzrlib/builtins.py:2039 bzrlib/builtins.py:3657
1077
msgid "The 2a format with experimental support for colocated branches.\n"
1078
msgstr ""
1079
1080
#: bzrlib/builtins.py:1922
1081
msgid "Make a directory into a versioned branch."
1082
msgstr ""
1083
1084
#: bzrlib/builtins.py:1924
1085
msgid ""
1086
"Use this to create an empty branch, or before importing an\n"
1087
"existing project."
1088
msgstr ""
1089
1090
#: bzrlib/builtins.py:1927
1091
msgid ""
1092
"If there is a repository in a parent directory of the location, then\n"
1093
"the history of the branch will be stored in the repository. Otherwise\n"
1094
"init creates a standalone branch which carries its own history\n"
1095
"in the .bzr directory."
1096
msgstr ""
1097
1098
#: bzrlib/builtins.py:1932
1099
msgid ""
1100
"If there is already a branch at the location but it has no working tree,\n"
1101
"the tree can be populated with 'bzr checkout'."
1102
msgstr ""
1103
1104
#: bzrlib/builtins.py:1935
1105
msgid "Recipe for importing a tree of files::"
1106
msgstr ""
1107
1108
#: bzrlib/builtins.py:1937
1109
msgid ""
1110
" cd ~/project\n"
1111
" bzr init\n"
1112
" bzr add .\n"
1113
" bzr status\n"
1114
" bzr commit -m \"imported project\""
1115
msgstr ""
1116
1117
# help of 'create-prefix' option of 'init' command
1118
# help of 'create-prefix' option of 'push' command
1119
#: bzrlib/builtins.py:1948
1120
msgid "Create the path leading up to the branch if it does not already exist."
1121
msgstr ""
1122
1123
# help of 'format' option of 'init' command
1124
#: bzrlib/builtins.py:1951
1125
msgid "Specify a format for this branch. See \"help formats\"."
1126
msgstr ""
1127
1128
# help of 'append-revisions-only' option of 'init' command
1129
#: bzrlib/builtins.py:1959
1130
msgid "Never change revnos or the existing log. Append revisions to it only."
1131
msgstr ""
1132
1133
# help of 'no-tree' option of 'init' command
1134
#: bzrlib/builtins.py:1962
1135
msgid "Create a branch without a working tree."
1136
msgstr ""
1137
1138
#: bzrlib/builtins.py:1982 bzrlib/push.py:110
1139
#, python-format
1140
msgid ""
1141
"Parent directory of %s does not exist.\n"
1142
"You may supply --create-prefix to create all leading parent directories."
1143
msgstr ""
1144
1145
#: bzrlib/builtins.py:2016
1146
msgid ""
1147
"This branch format cannot be set to append-revisions-only. Try --default."
1148
msgstr ""
1149
1150
#: bzrlib/builtins.py:2027
1151
msgid "Created a {0} (format: {1})\n"
1152
msgstr ""
1153
1154
#: bzrlib/builtins.py:2036
1155
#, python-format
1156
msgid "Using shared repository: %s\n"
1157
msgstr ""
1158
1159
#: bzrlib/builtins.py:2040
1160
msgid "Create a shared repository for branches to share storage space."
1161
msgstr ""
1162
1163
#: bzrlib/builtins.py:2042
1164
msgid ""
1165
"New branches created under the repository directory will store their\n"
1166
"revisions in the repository, not in the branch directory. For branches\n"
1167
"with shared history, this reduces the amount of storage needed and \n"
1168
"speeds up the creation of new branches."
1169
msgstr ""
1170
1171
#: bzrlib/builtins.py:2047
1172
msgid ""
1173
"If the --no-trees option is given then the branches in the repository\n"
1174
"will not have working trees by default. They will still exist as \n"
1175
"directories on disk, but they will not have separate copies of the \n"
1176
"files at a certain revision. This can be useful for repositories that\n"
1177
"store branches which are interacted with through checkouts or remote\n"
1178
"branches, such as on a server."
1179
msgstr ""
1180
1181
#: bzrlib/builtins.py:2054
1182
msgid ""
1183
":Examples:\n"
1184
" Create a shared repository holding just branches::"
1185
msgstr ""
1186
1187
#: bzrlib/builtins.py:2057
1188
msgid ""
1189
" bzr init-repo --no-trees repo\n"
1190
" bzr init repo/trunk"
1191
msgstr ""
1192
1193
#: bzrlib/builtins.py:2060
1194
msgid " Make a lightweight checkout elsewhere::"
1195
msgstr ""
1196
1197
#: bzrlib/builtins.py:2062
1198
msgid ""
1199
" bzr checkout --lightweight repo/trunk trunk-checkout\n"
1200
" cd trunk-checkout\n"
1201
" (add files here)"
1202
msgstr ""
1203
1204
# help of 'format' option of 'init-repository' command
1205
#: bzrlib/builtins.py:2070
1206
msgid ""
1207
"Specify a format for this repository. See \"bzr help formats\" for details."
1208
msgstr ""
1209
1210
# title of 'format' option of 'init-repository' command
1211
#: bzrlib/builtins.py:2074
1212
msgid "Repository format"
1213
msgstr ""
1214
1215
# help of 'no-trees' option of 'init-repository' command
1216
#: bzrlib/builtins.py:2076
1217
msgid "Branches in the repository will default to not having a working tree."
1218
msgstr ""
1219
1220
#: bzrlib/builtins.py:2102
1221
msgid "Show differences in the working tree, between revisions or branches."
1222
msgstr ""
1223
1224
#: bzrlib/builtins.py:2104
1225
msgid ""
1226
"If no arguments are given, all changes for the current tree are listed.\n"
1227
"If files are given, only the changes in those files are listed.\n"
1228
"Remote and multiple branches can be compared by using the --old and\n"
1229
"--new options. If not provided, the default for both is derived from\n"
1230
"the first argument, if any, or the current tree if no arguments are\n"
1231
"given."
1232
msgstr ""
1233
1234
#: bzrlib/builtins.py:2111
1235
msgid ""
1236
"\"bzr diff -p1\" is equivalent to \"bzr diff --prefix old/:new/\", and\n"
1237
"produces patches suitable for \"patch -p1\"."
1238
msgstr ""
1239
1240
#: bzrlib/builtins.py:2114
1241
msgid ""
1242
"Note that when using the -r argument with a range of revisions, the\n"
1243
"differences are computed between the two specified revisions. That\n"
1244
"is, the command does not show the changes introduced by the first \n"
1245
"revision in the range. This differs from the interpretation of \n"
1246
"revision ranges used by \"bzr log\" which includes the first revision\n"
1247
"in the range."
1248
msgstr ""
1249
1250
#: bzrlib/builtins.py:2121
1251
msgid ""
1252
":Exit values:\n"
1253
" 1 - changed\n"
1254
" 2 - unrepresentable changes\n"
1255
" 3 - error\n"
1256
" 0 - no change"
1257
msgstr ""
1258
1259
#: bzrlib/builtins.py:2127
1260
msgid ""
1261
":Examples:\n"
1262
" Shows the difference in the working tree versus the last commit::"
1263
msgstr ""
1264
1265
#: bzrlib/builtins.py:2130
1266
msgid " bzr diff"
1267
msgstr ""
1268
1269
#: bzrlib/builtins.py:2132
1270
msgid " Difference between the working tree and revision 1::"
1271
msgstr ""
1272
1273
#: bzrlib/builtins.py:2134
1274
msgid " bzr diff -r1"
1275
msgstr ""
1276
1277
#: bzrlib/builtins.py:2136
1278
msgid " Difference between revision 3 and revision 1::"
1279
msgstr ""
1280
1281
#: bzrlib/builtins.py:2138
1282
msgid " bzr diff -r1..3"
1283
msgstr ""
1284
1285
#: bzrlib/builtins.py:2140
1286
msgid " Difference between revision 3 and revision 1 for branch xxx::"
1287
msgstr ""
1288
1289
#: bzrlib/builtins.py:2142
1290
msgid " bzr diff -r1..3 xxx"
1291
msgstr ""
1292
1293
#: bzrlib/builtins.py:2144
1294
msgid " The changes introduced by revision 2 (equivalent to -r1..2)::"
1295
msgstr ""
1296
1297
#: bzrlib/builtins.py:2146
1298
msgid " bzr diff -c2"
1299
msgstr ""
1300
1301
#: bzrlib/builtins.py:2148
1302
msgid ""
1303
" To see the changes introduced by revision X::\n"
1304
" \n"
1305
" bzr diff -cX"
1306
msgstr ""
1307
1308
#: bzrlib/builtins.py:2152
1309
msgid ""
1310
" Note that in the case of a merge, the -c option shows the changes\n"
1311
" compared to the left hand parent. To see the changes against\n"
1312
" another parent, use::"
1313
msgstr ""
1314
1315
#: bzrlib/builtins.py:2156
1316
msgid " bzr diff -r<chosen_parent>..X"
1317
msgstr ""
1318
1319
#: bzrlib/builtins.py:2158
1320
msgid ""
1321
" The changes between the current revision and the previous revision\n"
1322
" (equivalent to -c-1 and -r-2..-1)"
1323
msgstr ""
1324
1325
#: bzrlib/builtins.py:2161
1326
msgid " bzr diff -r-2.."
1327
msgstr ""
1328
1329
#: bzrlib/builtins.py:2163
1330
msgid " Show just the differences for file NEWS::"
1331
msgstr ""
1332
1333
#: bzrlib/builtins.py:2165
1334
msgid " bzr diff NEWS"
1335
msgstr ""
1336
1337
#: bzrlib/builtins.py:2167
1338
msgid " Show the differences in working tree xxx for file NEWS::"
1339
msgstr ""
1340
1341
#: bzrlib/builtins.py:2169
1342
msgid " bzr diff xxx/NEWS"
1343
msgstr ""
1344
1345
#: bzrlib/builtins.py:2171
1346
msgid " Show the differences from branch xxx to this working tree:"
1347
msgstr ""
1348
1349
#: bzrlib/builtins.py:2173
1350
msgid " bzr diff --old xxx"
1351
msgstr ""
1352
1353
#: bzrlib/builtins.py:2175
1354
msgid " Show the differences between two branches for file NEWS::"
1355
msgstr ""
1356
1357
#: bzrlib/builtins.py:2177
1358
msgid " bzr diff --old xxx --new yyy NEWS"
1359
msgstr ""
1360
1361
#: bzrlib/builtins.py:2179
1362
msgid " Same as 'bzr diff' but prefix paths with old/ and new/::"
1363
msgstr ""
1364
1365
#: bzrlib/builtins.py:2181
1366
msgid ""
1367
" bzr diff --prefix old/:new/\n"
1368
" \n"
1369
" Show the differences using a custom diff program with options::\n"
1370
" \n"
1371
" bzr diff --using /usr/bin/diff --diff-options -wu"
1372
msgstr ""
1373
1374
# help of 'diff-options' option of 'diff' command
1375
#: bzrlib/builtins.py:2191
1376
msgid "Pass these options to the external diff program."
1377
msgstr ""
1378
1379
# help of 'prefix' option of 'diff' command
1380
#: bzrlib/builtins.py:2194
1381
msgid ""
1382
"Set prefixes added to old and new filenames, as two values separated by a "
1383
"colon. (eg \"old/:new/\")."
1384
msgstr ""
1385
1386
# help of 'old' option of 'diff' command
1387
#: bzrlib/builtins.py:2197
1388
msgid "Branch/tree to compare from."
1389
msgstr ""
1390
1391
# help of 'new' option of 'diff' command
1392
#: bzrlib/builtins.py:2201
1393
msgid "Branch/tree to compare to."
1394
msgstr ""
1395
1396
# help of 'using' option of 'diff' command
1397
#: bzrlib/builtins.py:2207
1398
msgid "Use this command to compare files."
1399
msgstr ""
1400
1401
# help of 'format' option of 'diff' command
1402
#: bzrlib/builtins.py:2212
1403
msgid "Diff format to use."
1404
msgstr ""
1405
1406
# title of 'format' option of 'diff' command
1407
#: bzrlib/builtins.py:2214
1408
msgid "Diff format"
1409
msgstr ""
1410
1411
#: bzrlib/builtins.py:2236
1412
msgid "--prefix expects two values separated by a colon (eg \"old/:new/\")"
1413
msgstr ""
1414
1415
#: bzrlib/builtins.py:2240
1416
msgid "bzr diff --revision takes exactly one or two revision specifiers"
1417
msgstr ""
1418
1419
#: bzrlib/builtins.py:2245 bzrlib/builtins.py:2643 bzrlib/builtins.py:2656
1420
#: bzrlib/builtins.py:2664 bzrlib/builtins.py:4826
1421
msgid "{0} and {1} are mutually exclusive"
1422
msgstr ""
1423
1424
#: bzrlib/builtins.py:2265
1425
msgid ""
1426
"List files deleted in the working tree.\n"
1427
" "
1428
msgstr ""
1429
1430
#: bzrlib/builtins.py:2343
1431
msgid "Show the tree root directory."
1432
msgstr ""
1433
1434
#: bzrlib/builtins.py:2345
1435
msgid ""
1436
"The root is the nearest enclosing directory with a .bzr control\n"
1437
"directory."
1438
msgstr ""
1439
1440
#: bzrlib/builtins.py:2360
1441
msgid "The limit argument must be an integer."
1442
msgstr ""
1443
1444
#: bzrlib/builtins.py:2368
1445
msgid "The levels argument must be an integer."
1446
msgstr ""
1447
1448
#: bzrlib/builtins.py:2373
1449
msgid "Show historical log for a branch or subset of a branch."
1450
msgstr ""
1451
1452
#: bzrlib/builtins.py:2375
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:2380
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:2384
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:2391
1478
msgid ":Output control:"
1479
msgstr ""
1480
1481
#: bzrlib/builtins.py:2393
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:2398
1490
msgid ""
1491
" The following options can be used to control what information is\n"
1492
" displayed::"
1493
msgstr ""
1494
1495
#: bzrlib/builtins.py:2401
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:2407
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:2411
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:2415
1519
msgid ":Ordering control:"
1520
msgstr ""
1521
1522
#: bzrlib/builtins.py:2417
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:2422
1531
msgid ":Revision filtering:"
1532
msgstr ""
1533
1534
#: bzrlib/builtins.py:2424
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:2427
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:2432
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:2435
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:2442
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:2449
1575
msgid ":Path filtering:"
1576
msgstr ""
1577
1578
#: bzrlib/builtins.py:2451
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:2455
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:2459
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:2462
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:2466
1606
msgid " In this case:"
1607
msgstr ""
1608
1609
#: bzrlib/builtins.py:2468
1610
msgid " * ``bzr log guide.txt`` will log the file added in revision 1"
1611
msgstr ""
1612
1613
#: bzrlib/builtins.py:2470
1614
msgid " * ``bzr log tutorial.txt`` will log the new file added in revision 3"
1615
msgstr ""
1616
1617
#: bzrlib/builtins.py:2472
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:2475
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:2478
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:2482
1637
msgid ":Other filtering:"
1638
msgstr ""
1639
1640
#: bzrlib/builtins.py:2484
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:2490
1650
msgid ":Tips & tricks:"
1651
msgstr ""
1652
1653
#: bzrlib/builtins.py:2492
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:2498
1663
msgid " You may find it useful to add the aliases below to ``bazaar.conf``::"
1664
msgstr ""
1665
1666
#: bzrlib/builtins.py:2500
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:2505
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:2509
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:2512
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:2517
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:2522
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:2531
1713
msgid "Show from oldest to newest."
1714
msgstr ""
1715
1716
# help of 'verbose' option of 'log' command
1717
#: bzrlib/builtins.py:2534
1718
msgid "Show files changed in each revision."
1719
msgstr ""
1720
1721
# help of 'change' option of 'log' command
1722
#: bzrlib/builtins.py:2540
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:2544
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:2545
1733
msgid "Authors"
1734
msgstr ""
1735
1736
# help of 'levels' option of 'log' command
1737
#: bzrlib/builtins.py:2550
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:2560
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:2565
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:2567
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:2571
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:2573
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:2577
1770
msgid "Show digital signature validity."
1771
msgstr ""
1772
1773
# help of 'match' option of 'log' command
1774
#: bzrlib/builtins.py:2580
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:2584
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:2588
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:2592
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:2596
1795
msgid "Show revisions whose bugs match this expression."
1796
msgstr ""
1797
1798
#: bzrlib/builtins.py:2650
1799
msgid "--exclude-common-ancestry requires -r with two revisions"
1800
msgstr ""
1801
1802
#: bzrlib/builtins.py:2678
1803
#, python-format
1804
msgid "Path unknown at end or start of revision range: %s"
1805
msgstr ""
1806
1807
#: bzrlib/builtins.py:2795
1808
#, python-format
1809
msgid "bzr %s doesn't accept two revisions in different branches."
1810
msgstr ""
1811
1812
#: bzrlib/builtins.py:2811
1813
#, python-format
1814
msgid "bzr %s --revision takes one or two values."
1815
msgstr ""
1816
1817
#: bzrlib/builtins.py:2856
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:2865
1825
msgid "Recurse into subdirectories."
1826
msgstr ""
1827
1828
# help of 'from-root' option of 'ls' command
1829
#: bzrlib/builtins.py:2867
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:2869
1835
msgid "Print unknown files."
1836
msgstr ""
1837
1838
# help of 'versioned' option of 'ls' command
1839
#: bzrlib/builtins.py:2870
1840
msgid "Print versioned files."
1841
msgstr ""
1842
1843
# help of 'ignored' option of 'ls' command
1844
#: bzrlib/builtins.py:2873
1845
msgid "Print ignored files."
1846
msgstr ""
1847
1848
# help of 'kind' option of 'ls' command
1849
#: bzrlib/builtins.py:2875
1850
msgid "List entries of a particular kind: file, directory, symlink."
1851
msgstr ""
1852
1853
#: bzrlib/builtins.py:2888
1854
msgid "invalid kind specified"
1855
msgstr ""
1856
1857
#: bzrlib/builtins.py:2891
1858
msgid "Cannot set both --verbose and --null"
1859
msgstr ""
1860
1861
#: bzrlib/builtins.py:2900
1862
msgid "cannot specify both --from-root and PATH"
1863
msgstr ""
1864
1865
#: bzrlib/builtins.py:2987
1866
msgid "Ignore specified files or patterns."
1867
msgstr ""
1868
1869
#: bzrlib/builtins.py:2989
1870
msgid "See ``bzr help patterns`` for details on the syntax of patterns."
1871
msgstr ""
1872
1873
#: bzrlib/builtins.py:2991
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:2997
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:3002
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:3008
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:3012
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:3015
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:3020
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:3023
1927
msgid ""
1928
":Examples:\n"
1929
" Ignore the top level Makefile::"
1930
msgstr ""
1931
1932
#: bzrlib/builtins.py:3026
1933
msgid " bzr ignore ./Makefile"
1934
msgstr ""
1935
1936
#: bzrlib/builtins.py:3028
1937
msgid " Ignore .class files in all directories...::"
1938
msgstr ""
1939
1940
#: bzrlib/builtins.py:3030
1941
msgid " bzr ignore \"*.class\""
1942
msgstr ""
1943
1944
#: bzrlib/builtins.py:3032
1945
msgid " ...but do not ignore \"special.class\"::"
1946
msgstr ""
1947
1948
#: bzrlib/builtins.py:3034
1949
msgid " bzr ignore \"!special.class\""
1950
msgstr ""
1951
1952
#: bzrlib/builtins.py:3036
1953
msgid " Ignore files whose name begins with the \"#\" character::"
1954
msgstr ""
1955
1956
#: bzrlib/builtins.py:3038
1957
msgid " bzr ignore \"RE:^#\""
1958
msgstr ""
1959
1960
#: bzrlib/builtins.py:3040 bzrlib/builtins.py:3044
1961
msgid " Ignore .o files under the lib directory::"
1962
msgstr ""
1963
1964
#: bzrlib/builtins.py:3042
1965
msgid " bzr ignore \"lib/**/*.o\""
1966
msgstr ""
1967
1968
#: bzrlib/builtins.py:3046
1969
msgid " bzr ignore \"RE:lib/.*\\.o\""
1970
msgstr ""
1971
1972
#: bzrlib/builtins.py:3048
1973
msgid " Ignore everything but the \"debian\" toplevel directory::"
1974
msgstr ""
1975
1976
#: bzrlib/builtins.py:3050
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:3064
1990
msgid "Display the default ignore rules that bzr uses."
1991
msgstr ""
1992
1993
#: bzrlib/builtins.py:3076
1994
msgid "ignore requires at least one NAME_PATTERN or --default-rules."
1995
msgstr ""
1996
1997
#: bzrlib/builtins.py:3087
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:3096
2005
msgid "NAME_PATTERN should not be an absolute path"
2006
msgstr ""
2007
2008
#: bzrlib/builtins.py:3109
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:3116
2019
msgid "List ignored files and the patterns that matched them."
2020
msgstr ""
2021
2022
#: bzrlib/builtins.py:3118
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:3121
2029
msgid "Alternatively, to list just the files::"
2030
msgstr ""
2031
2032
#: bzrlib/builtins.py:3123
2033
msgid " bzr ls --ignored"
2034
msgstr ""
2035
2036
#: bzrlib/builtins.py:3157
2037
#, python-format
2038
msgid "not a valid revision-number: %r"
2039
msgstr ""
2040
2041
#: bzrlib/builtins.py:3164
2042
msgid "Export current or past revision to a destination directory or archive."
2043
msgstr ""
2044
2045
#: bzrlib/builtins.py:3166
2046
msgid "If no revision is specified this exports the last committed revision."
2047
msgstr ""
2048
2049
#: bzrlib/builtins.py:3168
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:3172
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:3176
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:3179
2070
msgid "Note: Export of tree with non-ASCII filenames to zip is not supported."
2071
msgstr ""
2072
2073
#: bzrlib/builtins.py:3181
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:3195
2088
msgid "Type of file to export to."
2089
msgstr ""
2090
2091
# help of 'filters' option of 'export' command
2092
#: bzrlib/builtins.py:3198
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:3202
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:3204
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:3207
2110
msgid "Export the working tree contents rather than that of the last revision."
2111
msgstr ""
2112
2113
#: bzrlib/builtins.py:3226
2114
msgid "--uncommitted requires a working tree"
2115
msgstr ""
2116
2117
#: bzrlib/builtins.py:3235
2118
#, python-format
2119
msgid "Unsupported export format: %s"
2120
msgstr ""
2121
2122
#: bzrlib/builtins.py:3239
2123
msgid "Write the contents of a file as of a given revision to standard output."
2124
msgstr ""
2125
2126
#: bzrlib/builtins.py:3241
2127
msgid "If no revision is nominated, the last revision is used."
2128
msgstr ""
2129
2130
#: bzrlib/builtins.py:3243
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:3249
2138
msgid "The path name in the old tree."
2139
msgstr ""
2140
2141
# help of 'filters' option of 'cat' command
2142
#: bzrlib/builtins.py:3250
2143
msgid "Apply content filters to display the convenience form."
2144
msgstr ""
2145
2146
#: bzrlib/builtins.py:3261
2147
msgid "bzr cat --revision takes exactly one revision specifier"
2148
msgstr ""
2149
2150
#: bzrlib/builtins.py:3286 bzrlib/builtins.py:3298
2151
msgid "{0!r} is not present in revision {1}"
2152
msgstr ""
2153
2154
#: bzrlib/builtins.py:3321
2155
msgid "Commit changes into a new revision."
2156
msgstr ""
2157
2158
#: bzrlib/builtins.py:3323
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:3330
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:3334
2176
msgid ":Selective commits:"
2177
msgstr ""
2178
2179
#: bzrlib/builtins.py:3336
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:3340
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:3344
2194
msgid " bzr commit foo -x foo/bar"
2195
msgstr ""
2196
2197
#: bzrlib/builtins.py:3346
2198
msgid " A selective commit after a merge is not yet supported."
2199
msgstr ""
2200
2201
#: bzrlib/builtins.py:3348
2202
msgid ":Custom authors:"
2203
msgstr ""
2204
2205
#: bzrlib/builtins.py:3350
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:3357
2216
msgid ":Checks:"
2217
msgstr ""
2218
2219
#: bzrlib/builtins.py:3359
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:3365
2229
msgid ":Things to note:"
2230
msgstr ""
2231
2232
#: bzrlib/builtins.py:3367
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:3371
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:3381
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:3384
2254
msgid "Description of the new revision."
2255
msgstr ""
2256
2257
# help of 'unchanged' option of 'commit' command
2258
#: bzrlib/builtins.py:3387
2259
msgid "Commit even if nothing has changed."
2260
msgstr ""
2261
2262
# help of 'file' option of 'commit' command
2263
#: bzrlib/builtins.py:3391
2264
msgid "Take commit message from this file."
2265
msgstr ""
2266
2267
# help of 'strict' option of 'commit' command
2268
#: bzrlib/builtins.py:3393
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:3396
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:3399
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:3402
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:3405
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:3411
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:3414
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:3432
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:3441
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:3450
2327
#, python-format
2328
msgid "Unrecognized bug %s. Commit refused."
2329
msgstr ""
2330
2331
#: bzrlib/builtins.py:3453
2332
#, python-format
2333
msgid ""
2334
"%s\n"
2335
"Commit refused."
2336
msgstr ""
2337
2338
#: bzrlib/builtins.py:3477
2339
msgid "Could not parse --commit-time: "
2340
msgstr ""
2341
2342
#: bzrlib/builtins.py:3517
2343
msgid "please specify either --message or --file"
2344
msgstr ""
2345
2346
#: bzrlib/builtins.py:3546
2347
msgid "please specify a commit message with either --message or --file"
2348
msgstr ""
2349
2350
#: bzrlib/builtins.py:3549
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:3569
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:3573
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:3577
2369
msgid "Commit refused because there are unknown files in the working tree."
2370
msgstr ""
2371
2372
#: bzrlib/builtins.py:3580
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:3588
2380
msgid ""
2381
"Validate working tree structure, branch consistency and repository history."
2382
msgstr ""
2383
2384
#: bzrlib/builtins.py:3590
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:3593
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:3596
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:3600
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:3604
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:3609
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:3613
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:3619
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:3624
2442
msgid " Check the tree and branch at 'foo'::"
2443
msgstr ""
2444
2445
#: bzrlib/builtins.py:3626
2446
msgid " bzr check --tree --branch foo"
2447
msgstr ""
2448
2449
#: bzrlib/builtins.py:3628
2450
msgid " Check only the repository at 'bar'::"
2451
msgstr ""
2452
2453
#: bzrlib/builtins.py:3630
2454
msgid " bzr check --repo bar"
2455
msgstr ""
2456
2457
#: bzrlib/builtins.py:3632
2458
msgid " Check everything at 'baz'::"
2459
msgstr ""
2460
2461
#: bzrlib/builtins.py:3634
2462
msgid " bzr check baz"
2463
msgstr ""
2464
2465
# help of 'branch' option of 'check' command
2466
#: bzrlib/builtins.py:3640
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:3642
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:3644
2477
msgid "Check the working tree related to the current directory."
2478
msgstr ""
2479
2480
#: bzrlib/builtins.py:3658
2481
msgid "Upgrade a repository, branch or working tree to a newer format."
2482
msgstr ""
2483
2484
#: bzrlib/builtins.py:3660
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:3666
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:3673
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:3681
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:3686
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:3694
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:3698
2536
msgid "Branch format"
2537
msgstr ""
2538
2539
# help of 'clean' option of 'upgrade' command
2540
#: bzrlib/builtins.py:3700
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:3702
2547
msgid "Show what would be done, but don't actually do anything."
2548
msgstr ""
2549
2550
#: bzrlib/builtins.py:3717
2551
msgid "Show or set bzr user id."
2552
msgstr ""
2553
2554
#: bzrlib/builtins.py:3719
2555
msgid ""
2556
":Examples:\n"
2557
" Show the email of the current user::"
2558
msgstr ""
2559
2560
#: bzrlib/builtins.py:3722
2561
msgid " bzr whoami --email"
2562
msgstr ""
2563
2564
#: bzrlib/builtins.py:3724
2565
msgid " Set the current user::"
2566
msgstr ""
2567
2568
#: bzrlib/builtins.py:3726
2569
msgid " bzr whoami \"Frank Chu <fchu@example.com>\""
2570
msgstr ""
2571
2572
# help of 'email' option of 'whoami' command
2573
#: bzrlib/builtins.py:3730
2574
msgid "Display email address only."
2575
msgstr ""
2576
2577
# help of 'branch' option of 'whoami' command
2578
#: bzrlib/builtins.py:3732
2579
msgid "Set identity for the current branch instead of globally."
2580
msgstr ""
2581
2582
#: bzrlib/builtins.py:3758
2583
msgid "--email can only be used to display existing identity"
2584
msgstr ""
2585
2586
#: bzrlib/builtins.py:3780
2587
msgid "Print or set the branch nickname."
2588
msgstr ""
2589
2590
#: bzrlib/builtins.py:3782
2591
msgid ""
2592
"If unset, the tree root directory name is used as the nickname.\n"
2593
"To print the current nickname, execute with no argument."
2594
msgstr ""
2595
2596
#: bzrlib/builtins.py:3785
2597
msgid ""
2598
"Bound branches use the nickname of its master branch unless it is set\n"
2599
"locally."
2600
msgstr ""
2601
2602
#: bzrlib/builtins.py:3805
2603
msgid "Set/unset and display aliases."
2604
msgstr ""
2605
2606
#: bzrlib/builtins.py:3807
2607
msgid ""
2608
":Examples:\n"
2609
" Show the current aliases::"
2610
msgstr ""
2611
2612
#: bzrlib/builtins.py:3810
2613
msgid " bzr alias"
2614
msgstr ""
2615
2616
#: bzrlib/builtins.py:3812
2617
msgid " Show the alias specified for 'll'::"
2618
msgstr ""
2619
2620
#: bzrlib/builtins.py:3814
2621
msgid " bzr alias ll"
2622
msgstr ""
2623
2624
#: bzrlib/builtins.py:3816
2625
msgid " Set an alias for 'll'::"
2626
msgstr ""
2627
2628
#: bzrlib/builtins.py:3818
2629
msgid " bzr alias ll=\"log --line -r-10..-1\""
2630
msgstr ""
2631
2632
#: bzrlib/builtins.py:3820
2633
msgid " To remove an alias for 'll'::"
2634
msgstr ""
2635
2636
#: bzrlib/builtins.py:3822
2637
msgid " bzr alias --remove ll"
2638
msgstr ""
2639
2640
# help of 'remove' option of 'alias' command
2641
#: bzrlib/builtins.py:3827
2642
msgid "Remove the alias."
2643
msgstr ""
2644
2645
#: bzrlib/builtins.py:3845
2646
msgid "bzr alias --remove expects an alias to remove."
2647
msgstr ""
2648
2649
#: bzrlib/builtins.py:4026
2650
msgid "subunit not available. subunit needs to be installed to use --subunit."
2651
msgstr ""
2652
2653
#: bzrlib/builtins.py:4043
2654
msgid ""
2655
"--benchmark is no longer supported from bzr 2.2; use bzr-usertest instead"
2656
msgstr ""
2657
2658
#: bzrlib/builtins.py:4090
2659
msgid "Show version of bzr."
2660
msgstr ""
2661
2662
# help of 'short' option of 'version' command
2663
#: bzrlib/builtins.py:4094
2664
msgid "Print just the version number."
2665
msgstr ""
2666
2667
#: bzrlib/builtins.py:4113
2668
msgid "It sure does!\n"
2669
msgstr ""
2670
2671
#: bzrlib/builtins.py:4137
2672
#, python-format
2673
msgid "merge base is revision %s\n"
2674
msgstr ""
2675
2676
#: bzrlib/builtins.py:4141
2677
msgid "Perform a three-way merge."
2678
msgstr ""
2679
2680
#: bzrlib/builtins.py:4143
2681
msgid ""
2682
"The source of the merge can be specified either in the form of a branch,\n"
2683
"or in the form of a path to a file containing a merge directive generated\n"
2684
"with bzr send. If neither is specified, the default is the upstream branch\n"
2685
"or the branch most recently merged using --remember. The source of the\n"
2686
"merge may also be specified in the form of a path to a file in another\n"
2687
"branch: in this case, only the modifications to that file are merged into\n"
2688
"the current working tree."
2689
msgstr ""
2690
2691
#: bzrlib/builtins.py:4151
2692
msgid ""
2693
"When merging from a branch, by default bzr will try to merge in all new\n"
2694
"work from the other branch, automatically determining an appropriate base\n"
2695
"revision. If this fails, you may need to give an explicit base."
2696
msgstr ""
2697
2698
#: bzrlib/builtins.py:4155
2699
msgid ""
2700
"To pick a different ending revision, pass \"--revision OTHER\". bzr will\n"
2701
"try to merge in all new work up to and including revision OTHER."
2702
msgstr ""
2703
2704
#: bzrlib/builtins.py:4158
2705
msgid ""
2706
"If you specify two values, \"--revision BASE..OTHER\", only revisions BASE\n"
2707
"through OTHER, excluding BASE but including OTHER, will be merged. If this\n"
2708
"causes some revisions to be skipped, i.e. if the destination branch does\n"
2709
"not already contain revision BASE, such a merge is commonly referred to as\n"
2710
"a \"cherrypick\". Unlike a normal merge, Bazaar does not currently track\n"
2711
"cherrypicks. The changes look like a normal commit, and the history of the\n"
2712
"changes from the other branch is not stored in the commit."
2713
msgstr ""
2714
2715
#: bzrlib/builtins.py:4166
2716
msgid "Revision numbers are always relative to the source branch."
2717
msgstr ""
2718
2719
#: bzrlib/builtins.py:4168 bzrlib/conflicts.py:52 bzrlib/conflicts.py:106
2720
msgid ""
2721
"Merge will do its best to combine the changes in two branches, but there\n"
2722
"are some kinds of problems only a human can fix. When it encounters those,\n"
2723
"it will mark a conflict. A conflict means that you need to fix something,\n"
2724
"before you should commit."
2725
msgstr ""
2726
2727
#: bzrlib/builtins.py:4173
2728
msgid "Use bzr resolve when you have fixed a problem. See also bzr conflicts."
2729
msgstr ""
2730
2731
#: bzrlib/builtins.py:4175
2732
msgid ""
2733
"If there is no default branch set, the first merge will set it (use\n"
2734
"--no-remember to avoid setting it). After that, you can omit the branch\n"
2735
"to use the default. To change the default, use --remember. The value will\n"
2736
"only be saved if the remote location can be accessed."
2737
msgstr ""
2738
2739
#: bzrlib/builtins.py:4180
2740
msgid ""
2741
"The results of the merge are placed into the destination working\n"
2742
"directory, where they can be reviewed (with bzr diff), tested, and then\n"
2743
"committed to record the result of the merge."
2744
msgstr ""
2745
2746
#: bzrlib/builtins.py:4184
2747
msgid ""
2748
"merge refuses to run if there are any uncommitted changes, unless\n"
2749
"--force is given. If --force is given, then the changes from the source \n"
2750
"will be merged with the current working tree, including any uncommitted\n"
2751
"changes in the tree. The --force option can also be used to create a\n"
2752
"merge revision which has more than two parents."
2753
msgstr ""
2754
2755
#: bzrlib/builtins.py:4190
2756
msgid ""
2757
"If one would like to merge changes from the working tree of the other\n"
2758
"branch without merging any committed revisions, the --uncommitted option\n"
2759
"can be given."
2760
msgstr ""
2761
2762
#: bzrlib/builtins.py:4194
2763
msgid ""
2764
"To select only some changes to merge, use \"merge -i\", which will prompt\n"
2765
"you to apply each diff hunk and file change, similar to \"shelve\"."
2766
msgstr ""
2767
2768
#: bzrlib/builtins.py:4197
2769
msgid ""
2770
":Examples:\n"
2771
" To merge all new revisions from bzr.dev::"
2772
msgstr ""
2773
2774
#: bzrlib/builtins.py:4200
2775
msgid " bzr merge ../bzr.dev"
2776
msgstr ""
2777
2778
#: bzrlib/builtins.py:4202
2779
msgid " To merge changes up to and including revision 82 from bzr.dev::"
2780
msgstr ""
2781
2782
#: bzrlib/builtins.py:4204
2783
msgid " bzr merge -r 82 ../bzr.dev"
2784
msgstr ""
2785
2786
#: bzrlib/builtins.py:4206
2787
msgid " To merge the changes introduced by 82, without previous changes::"
2788
msgstr ""
2789
2790
#: bzrlib/builtins.py:4208
2791
msgid " bzr merge -r 81..82 ../bzr.dev"
2792
msgstr ""
2793
2794
#: bzrlib/builtins.py:4210
2795
msgid " To apply a merge directive contained in /tmp/merge::"
2796
msgstr ""
2797
2798
#: bzrlib/builtins.py:4212
2799
msgid " bzr merge /tmp/merge"
2800
msgstr ""
2801
2802
#: bzrlib/builtins.py:4214
2803
msgid ""
2804
" To create a merge revision with three parents from two branches\n"
2805
" feature1a and feature1b:"
2806
msgstr ""
2807
2808
#: bzrlib/builtins.py:4217
2809
msgid ""
2810
" bzr merge ../feature1a\n"
2811
" bzr merge ../feature1b --force\n"
2812
" bzr commit -m 'revision with three parents'"
2813
msgstr ""
2814
2815
# help of 'force' option of 'merge' command
2816
#: bzrlib/builtins.py:4229
2817
msgid "Merge even if the destination tree has uncommitted changes."
2818
msgstr ""
2819
2820
# help of 'uncommitted' option of 'merge' command
2821
#: bzrlib/builtins.py:4235
2822
msgid ""
2823
"Apply uncommitted changes from a working copy, instead of branch changes."
2824
msgstr ""
2825
2826
# help of 'pull' option of 'merge' command
2827
#: bzrlib/builtins.py:4237
2828
msgid ""
2829
"If the destination is already completely merged into the source, pull from "
2830
"the source rather than merging. When this happens, you do not need to "
2831
"commit the result."
2832
msgstr ""
2833
2834
# help of 'directory' option of 'merge' command
2835
#: bzrlib/builtins.py:4242
2836
msgid ""
2837
"Branch to merge into, rather than the one containing the working directory."
2838
msgstr ""
2839
2840
# help of 'preview' option of 'merge' command
2841
#: bzrlib/builtins.py:4244
2842
msgid "Instead of merging, show a diff of the merge."
2843
msgstr ""
2844
2845
# help of 'interactive' option of 'merge' command
2846
#: bzrlib/builtins.py:4246
2847
msgid "Select changes interactively."
2848
msgstr ""
2849
2850
#: bzrlib/builtins.py:4268
2851
msgid ""
2852
"Merging into empty branches not currently supported, https://bugs.launchpad."
2853
"net/bzr/+bug/308562"
2854
msgstr ""
2855
2856
#: bzrlib/builtins.py:4295
2857
msgid "Cannot use --uncommitted with bundles or merge directives."
2858
msgstr ""
2859
2860
#: bzrlib/builtins.py:4306
2861
msgid "Cannot use --uncommitted and --revision at the same time."
2862
msgstr ""
2863
2864
#: bzrlib/builtins.py:4326
2865
msgid "merger: "
2866
msgstr ""
2867
2868
#: bzrlib/builtins.py:4328 bzrlib/bundle/apply_bundle.py:71
2869
msgid "Nothing to do."
2870
msgstr ""
2871
2872
#: bzrlib/builtins.py:4332
2873
msgid "Cannot pull individual files"
2874
msgstr ""
2875
2876
#: bzrlib/builtins.py:4340
2877
msgid "This branch has no commits. (perhaps you would prefer 'bzr pull')"
2878
msgstr ""
2879
2880
#: bzrlib/builtins.py:4398
2881
#, python-format
2882
msgid "Show-base is not supported for this merge type. %s"
2883
msgstr ""
2884
2885
#: bzrlib/builtins.py:4407
2886
#, python-format
2887
msgid "Conflict reduction is not supported for merge type %s."
2888
msgstr ""
2889
2890
#: bzrlib/builtins.py:4411
2891
msgid "Cannot do conflict reduction and show base."
2892
msgstr ""
2893
2894
#: bzrlib/builtins.py:4522
2895
msgid "No location specified or remembered"
2896
msgstr ""
2897
2898
#: bzrlib/builtins.py:4524
2899
msgid "{0} remembered {1} location {2}"
2900
msgstr ""
2901
2902
#: bzrlib/builtins.py:4530
2903
msgid "Redo a merge."
2904
msgstr ""
2905
2906
#: bzrlib/builtins.py:4532
2907
msgid ""
2908
"Use this if you want to try a different merge technique while resolving\n"
2909
"conflicts. Some merge techniques are better than others, and remerge\n"
2910
"lets you try different ones on different files."
2911
msgstr ""
2912
2913
#: bzrlib/builtins.py:4536
2914
msgid ""
2915
"The options for remerge have the same meaning and defaults as the ones for\n"
2916
"merge. The difference is that remerge can (only) be run when there is a\n"
2917
"pending merge, and it lets you specify particular files."
2918
msgstr ""
2919
2920
#: bzrlib/builtins.py:4540
2921
msgid ""
2922
":Examples:\n"
2923
" Re-do the merge of all conflicted files, and show the base text in\n"
2924
" conflict regions, in addition to the usual THIS and OTHER texts::"
2925
msgstr ""
2926
2927
#: bzrlib/builtins.py:4544
2928
msgid " bzr remerge --show-base"
2929
msgstr ""
2930
2931
#: bzrlib/builtins.py:4546
2932
msgid ""
2933
" Re-do the merge of \"foobar\", using the weave merge algorithm, with\n"
2934
" additional processing to reduce the size of conflict regions::"
2935
msgstr ""
2936
2937
#: bzrlib/builtins.py:4549
2938
msgid " bzr remerge --merge-type weave --reprocess foobar"
2939
msgstr ""
2940
2941
# help of 'show-base' option of 'merge' command
2942
# help of 'show-base' option of 'pull' command
2943
# help of 'show-base' option of 'remerge' command
2944
# help of 'show-base' option of 'update' command
2945
#: bzrlib/builtins.py:4556
2946
msgid "Show base revision text in conflicts."
2947
msgstr ""
2948
2949
#: bzrlib/builtins.py:4568
2950
msgid ""
2951
"Sorry, remerge only works after normal merges. Not cherrypicking or multi-"
2952
"merges."
2953
msgstr ""
2954
2955
#: bzrlib/builtins.py:4624
2956
msgid "Revert files to a previous revision."
2957
msgstr ""
2958
2959
#: bzrlib/builtins.py:4626
2960
msgid ""
2961
"Giving a list of files will revert only those files. Otherwise, all files\n"
2962
"will be reverted. If the revision is not specified with '--revision', the\n"
2963
"last committed revision is used."
2964
msgstr ""
2965
2966
#: bzrlib/builtins.py:4630
2967
msgid ""
2968
"To remove only some changes, without reverting to a prior version, use\n"
2969
"merge instead. For example, \"merge . -r -2..-3\" (don't forget the \".\")\n"
2970
"will remove the changes introduced by the second last commit (-2), without\n"
2971
"affecting the changes introduced by the last commit (-1). To remove\n"
2972
"certain changes on a hunk-by-hunk basis, see the shelve command."
2973
msgstr ""
2974
2975
#: bzrlib/builtins.py:4636
2976
msgid ""
2977
"By default, any files that have been manually changed will be backed up\n"
2978
"first. (Files changed only by merge are not backed up.) Backup files have\n"
2979
"'.~#~' appended to their name, where # is a number."
2980
msgstr ""
2981
2982
#: bzrlib/builtins.py:4640
2983
msgid ""
2984
"When you provide files, you can use their current pathname or the pathname\n"
2985
"from the target revision. So you can use revert to \"undelete\" a file by\n"
2986
"name. If you name a directory, all the contents of that directory will be\n"
2987
"reverted."
2988
msgstr ""
2989
2990
#: bzrlib/builtins.py:4645
2991
msgid ""
2992
"If you have newly added files since the target revision, they will be\n"
2993
"removed. If the files to be removed have been changed, backups will be\n"
2994
"created as above. Directories containing unknown files will not be\n"
2995
"deleted."
2996
msgstr ""
2997
2998
#: bzrlib/builtins.py:4650
2999
msgid ""
3000
"The working tree contains a list of revisions that have been merged but\n"
3001
"not yet committed. These revisions will be included as additional parents\n"
3002
"of the next commit. Normally, using revert clears that list as well as\n"
3003
"reverting the files. If any files are specified, revert leaves the list\n"
3004
"of uncommitted merges alone and reverts only the files. Use ``bzr revert\n"
3005
".`` in the tree root to revert all files but keep the recorded merges,\n"
3006
"and ``bzr revert --forget-merges`` to clear the pending merge list without\n"
3007
"reverting any files."
3008
msgstr ""
3009
3010
#: bzrlib/builtins.py:4659
3011
msgid ""
3012
"Using \"bzr revert --forget-merges\", it is possible to apply all of the\n"
3013
"changes from a branch in a single revision. To do this, perform the merge\n"
3014
"as desired. Then doing revert with the \"--forget-merges\" option will "
3015
"keep\n"
3016
"the content of the tree as it was, but it will clear the list of pending\n"
3017
"merges. The next commit will then contain all of the changes that are\n"
3018
"present in the other branch, but without any other parent revisions.\n"
3019
"Because this technique forgets where these changes originated, it may\n"
3020
"cause additional conflicts on later merges involving the same source and\n"
3021
"target branches."
3022
msgstr ""
3023
3024
# help of 'no-backup' option of 'revert' command
3025
#: bzrlib/builtins.py:4673
3026
msgid "Do not save backups of reverted files."
3027
msgstr ""
3028
3029
# help of 'forget-merges' option of 'revert' command
3030
#: bzrlib/builtins.py:4675
3031
msgid "Remove pending merge marker, without changing any files."
3032
msgstr ""
3033
3034
#: bzrlib/builtins.py:4706
3035
msgid ""
3036
"Show help on a command or other topic.\n"
3037
" "
3038
msgstr ""
3039
3040
# help of 'long' option of 'help' command
3041
#: bzrlib/builtins.py:4711
3042
msgid "Show help on all commands."
3043
msgstr ""
3044
3045
#: bzrlib/builtins.py:4740
3046
msgid "Show unmerged/unpulled revisions between two branches."
3047
msgstr ""
3048
3049
#: bzrlib/builtins.py:4742
3050
msgid "OTHER_BRANCH may be local or remote."
3051
msgstr ""
3052
3053
#: bzrlib/builtins.py:4744
3054
msgid ""
3055
"To filter on a range of revisions, you can use the command -r begin..end\n"
3056
"-r revision requests a specific revision, -r ..end or -r begin.. are\n"
3057
"also valid.\n"
3058
" \n"
3059
":Exit values:\n"
3060
" 1 - some missing revisions\n"
3061
" 0 - no missing revisions"
3062
msgstr ""
3063
3064
#: bzrlib/builtins.py:4754
3065
msgid ""
3066
" Determine the missing revisions between this and the branch at the\n"
3067
" remembered pull location::"
3068
msgstr ""
3069
3070
#: bzrlib/builtins.py:4757
3071
msgid " bzr missing"
3072
msgstr ""
3073
3074
#: bzrlib/builtins.py:4759
3075
msgid " Determine the missing revisions between this and another branch::"
3076
msgstr ""
3077
3078
#: bzrlib/builtins.py:4761
3079
msgid " bzr missing http://server/branch"
3080
msgstr ""
3081
3082
#: bzrlib/builtins.py:4763
3083
msgid ""
3084
" Determine the missing revisions up to a specific revision on the other\n"
3085
" branch::"
3086
msgstr ""
3087
3088
#: bzrlib/builtins.py:4766
3089
msgid " bzr missing -r ..-10"
3090
msgstr ""
3091
3092
#: bzrlib/builtins.py:4768
3093
msgid ""
3094
" Determine the missing revisions up to a specific revision on this\n"
3095
" branch::"
3096
msgstr ""
3097
3098
#: bzrlib/builtins.py:4771
3099
msgid " bzr missing --my-revision ..-10"
3100
msgstr ""
3101
3102
# help of 'reverse' option of 'missing' command
3103
#: bzrlib/builtins.py:4778
3104
msgid "Reverse the order of revisions."
3105
msgstr ""
3106
3107
# help of 'mine-only' option of 'missing' command
3108
#: bzrlib/builtins.py:4780
3109
msgid "Display changes in the local branch only."
3110
msgstr ""
3111
3112
# help of 'this' option of 'missing' command
3113
#: bzrlib/builtins.py:4781
3114
msgid "Same as --mine-only."
3115
msgstr ""
3116
3117
# help of 'theirs-only' option of 'missing' command
3118
#: bzrlib/builtins.py:4783
3119
msgid "Display changes in the remote branch only."
3120
msgstr ""
3121
3122
# help of 'other' option of 'missing' command
3123
#: bzrlib/builtins.py:4784
3124
msgid "Same as --theirs-only."
3125
msgstr ""
3126
3127
# help of 'revision' option of 'missing' command
3128
#: bzrlib/builtins.py:4789
3129
msgid ""
3130
"Filter on other branch revisions (inclusive). See \"help revisionspec\" for "
3131
"details."
3132
msgstr ""
3133
3134
# help of 'my-revision' option of 'missing' command
3135
#: bzrlib/builtins.py:4793
3136
msgid ""
3137
"Filter on local branch revisions (inclusive). See \"help revisionspec\" for "
3138
"details."
3139
msgstr ""
3140
3141
# help of 'include-merged' option of 'missing' command
3142
#: bzrlib/builtins.py:4796
3143
msgid "Show all revisions in addition to the mainline ones."
3144
msgstr ""
3145
3146
#: bzrlib/builtins.py:4850
3147
msgid "No peer location known or specified."
3148
msgstr ""
3149
3150
#: bzrlib/builtins.py:4854
3151
msgid "Using saved parent location: {0}\n"
3152
msgstr ""
3153
3154
#: bzrlib/builtins.py:4887
3155
#, python-format
3156
msgid "You have %d extra revision:\n"
3157
msgid_plural "You have %d extra revisions:\n"
3158
msgstr[0] ""
3159
msgstr[1] ""
3160
3161
#: bzrlib/builtins.py:4903
3162
#, python-format
3163
msgid "You are missing %d revision:\n"
3164
msgid_plural "You are missing %d revisions:\n"
3165
msgstr[0] ""
3166
msgstr[1] ""
3167
3168
#: bzrlib/builtins.py:4915
3169
msgid "This branch has no new revisions.\n"
3170
msgstr ""
3171
3172
#: bzrlib/builtins.py:4918
3173
msgid "Other branch has no new revisions.\n"
3174
msgstr ""
3175
3176
#: bzrlib/builtins.py:4923
3177
msgid "Branches are up to date.\n"
3178
msgstr ""
3179
3180
#: bzrlib/builtins.py:4934
3181
msgid "Compress the data within a repository."
3182
msgstr ""
3183
3184
#: bzrlib/builtins.py:4936
3185
msgid ""
3186
"This operation compresses the data within a bazaar repository. As\n"
3187
"bazaar supports automatic packing of repository, this operation is\n"
3188
"normally not required to be done manually."
3189
msgstr ""
3190
3191
#: bzrlib/builtins.py:4940
3192
msgid ""
3193
"During the pack operation, bazaar takes a backup of existing repository\n"
3194
"data, i.e. pack files. This backup is eventually removed by bazaar\n"
3195
"automatically when it is safe to do so. To save disk space by removing\n"
3196
"the backed up pack files, the --clean-obsolete-packs option may be\n"
3197
"used."
3198
msgstr ""
3199
3200
#: bzrlib/builtins.py:4946
3201
msgid ""
3202
"Warning: If you use --clean-obsolete-packs and your machine crashes\n"
3203
"during or immediately after repacking, you may be left with a state\n"
3204
"where the deletion has been written to disk but the new packs have not\n"
3205
"been. In this case the repository may be unusable."
3206
msgstr ""
3207
3208
# help of 'clean-obsolete-packs' option of 'pack' command
3209
#: bzrlib/builtins.py:4955
3210
msgid "Delete obsolete packs to save disk space."
3211
msgstr ""
3212
3213
#: bzrlib/builtins.py:4969
3214
msgid "List the installed plugins."
3215
msgstr ""
3216
3217
#: bzrlib/builtins.py:4971
3218
msgid ""
3219
"This command displays the list of installed plugins including\n"
3220
"version of plugin and a short description of each."
3221
msgstr ""
3222
3223
#: bzrlib/builtins.py:4974
3224
msgid "--verbose shows the path where each plugin is located."
3225
msgstr ""
3226
3227
#: bzrlib/builtins.py:4976
3228
msgid ""
3229
"A plugin is an external component for Bazaar that extends the\n"
3230
"revision control system, by adding or replacing code in Bazaar.\n"
3231
"Plugins can do a variety of things, including overriding commands,\n"
3232
"adding new commands, providing additional network transports and\n"
3233
"customizing log output."
3234
msgstr ""
3235
3236
#: bzrlib/builtins.py:4982
3237
msgid ""
3238
"See the Bazaar Plugin Guide <http://doc.bazaar.canonical.com/plugins/en/>\n"
3239
"for further information on plugins including where to find them and how to\n"
3240
"install them. Instructions are also provided there on how to write new\n"
3241
"plugins using the Python programming language."
3242
msgstr ""
3243
3244
#: bzrlib/builtins.py:4998
3245
msgid "Show testament (signing-form) of a revision."
3246
msgstr ""
3247
3248
# help of 'long' option of 'testament' command
3249
#: bzrlib/builtins.py:5001
3250
msgid "Produce long-format testament."
3251
msgstr ""
3252
3253
# help of 'strict' option of 'testament' command
3254
#: bzrlib/builtins.py:5003
3255
msgid "Produce a strict-format testament."
3256
msgstr ""
3257
3258
#: bzrlib/builtins.py:5029
3259
msgid "Show the origin of each line in a file."
3260
msgstr ""
3261
3262
#: bzrlib/builtins.py:5031
3263
msgid ""
3264
"This prints out the given file with an annotation on the left side\n"
3265
"indicating which revision, author and date introduced the change."
3266
msgstr ""
3267
3268
#: bzrlib/builtins.py:5034
3269
msgid ""
3270
"If the origin is the same for a run of consecutive lines, it is\n"
3271
"shown only at the top, unless the --all option is given."
3272
msgstr ""
3273
3274
# help of 'all' option of 'annotate' command
3275
#: bzrlib/builtins.py:5042
3276
msgid "Show annotations on all lines."
3277
msgstr ""
3278
3279
# help of 'long' option of 'annotate' command
3280
#: bzrlib/builtins.py:5043
3281
msgid "Show commit date in annotations."
3282
msgstr ""
3283
3284
#: bzrlib/builtins.py:5130
3285
msgid "Cannot sign a range of non-revision-history revisions"
3286
msgstr ""
3287
3288
#: bzrlib/builtins.py:5142
3289
msgid "Please supply either one revision, or a range."
3290
msgstr ""
3291
3292
#: bzrlib/builtins.py:5146
3293
msgid ""
3294
"Convert the current branch into a checkout of the supplied branch.\n"
3295
"If no branch is supplied, rebind to the last bound location."
3296
msgstr ""
3297
3298
#: bzrlib/builtins.py:5149
3299
msgid ""
3300
"Once converted into a checkout, commits must succeed on the master branch\n"
3301
"before they will be applied to the local branch."
3302
msgstr ""
3303
3304
#: bzrlib/builtins.py:5152
3305
msgid ""
3306
"Bound branches use the nickname of its master branch unless it is set\n"
3307
"locally, in which case binding will update the local nickname to be\n"
3308
"that of the master."
3309
msgstr ""
3310
3311
#: bzrlib/builtins.py:5167
3312
msgid "No location supplied. This format does not remember old locations."
3313
msgstr ""
3314
3315
#: bzrlib/builtins.py:5172
3316
msgid "Branch is already bound"
3317
msgstr ""
3318
3319
#: bzrlib/builtins.py:5174
3320
msgid "No location supplied and no previous location known"
3321
msgstr ""
3322
3323
#: bzrlib/builtins.py:5180
3324
msgid "These branches have diverged. Try merging, and then bind again."
3325
msgstr ""
3326
3327
#: bzrlib/builtins.py:5187
3328
msgid "Convert the current checkout into a regular branch."
3329
msgstr ""
3330
3331
#: bzrlib/builtins.py:5189
3332
msgid ""
3333
"After unbinding, the local branch is considered independent and subsequent\n"
3334
"commits will be local only."
3335
msgstr ""
3336
3337
#: bzrlib/builtins.py:5200
3338
msgid "Local branch is not bound"
3339
msgstr ""
3340
3341
#: bzrlib/builtins.py:5204
3342
msgid "Remove the last committed revision."
3343
msgstr ""
3344
3345
#: bzrlib/builtins.py:5206
3346
msgid ""
3347
"--verbose will print out what is being removed.\n"
3348
"--dry-run will go through all the motions, but not actually\n"
3349
"remove anything."
3350
msgstr ""
3351
3352
#: bzrlib/builtins.py:5210
3353
msgid ""
3354
"If --revision is specified, uncommit revisions to leave the branch at the\n"
3355
"specified revision. For example, \"bzr uncommit -r 15\" will leave the\n"
3356
"branch at revision 15."
3357
msgstr ""
3358
3359
#: bzrlib/builtins.py:5214
3360
msgid ""
3361
"Uncommit leaves the working tree ready for a new commit. The only change\n"
3362
"it may make is to restore any pending merges that were present before\n"
3363
"the commit."
3364
msgstr ""
3365
3366
# help of 'dry-run' option of 'uncommit' command
3367
#: bzrlib/builtins.py:5225
3368
msgid "Don't actually make changes."
3369
msgstr ""
3370
3371
# help of 'force' option of 'uncommit' command
3372
#: bzrlib/builtins.py:5226
3373
msgid "Say yes to all questions."
3374
msgstr ""
3375
3376
# help of 'keep-tags' option of 'uncommit' command
3377
#: bzrlib/builtins.py:5228
3378
msgid "Keep tags that point to removed revisions."
3379
msgstr ""
3380
3381
# help of 'local' option of 'uncommit' command
3382
#: bzrlib/builtins.py:5230
3383
msgid "Only remove the commits from the local branch when in a checkout."
3384
msgstr ""
3385
3386
#: bzrlib/builtins.py:5279
3387
msgid "No revisions to uncommit.\n"
3388
msgstr ""
3389
3390
#: bzrlib/builtins.py:5294
3391
msgid "Dry-run, pretending to remove the above revisions.\n"
3392
msgstr ""
3393
3394
#: bzrlib/builtins.py:5297
3395
msgid "The above revision(s) will be removed.\n"
3396
msgstr ""
3397
3398
#: bzrlib/builtins.py:5301
3399
msgid "Uncommit these revisions"
3400
msgstr ""
3401
3402
#: bzrlib/builtins.py:5304
3403
msgid "Canceled\n"
3404
msgstr ""
3405
3406
#: bzrlib/builtins.py:5311
3407
#, python-format
3408
msgid ""
3409
"You can restore the old tip by running:\n"
3410
" bzr pull . -r revid:%s\n"
3411
msgstr ""
3412
3413
#: bzrlib/builtins.py:5316
3414
msgid "Break a dead lock."
3415
msgstr ""
3416
3417
#: bzrlib/builtins.py:5318
3418
msgid ""
3419
"This command breaks a lock on a repository, branch, working directory or\n"
3420
"config file."
3421
msgstr ""
3422
3423
#: bzrlib/builtins.py:5321
3424
msgid ""
3425
"CAUTION: Locks should only be broken when you are sure that the process\n"
3426
"holding the lock has been stopped."
3427
msgstr ""
3428
3429
#: bzrlib/builtins.py:5324
3430
msgid ""
3431
"You can get information on what locks are open via the 'bzr info\n"
3432
"[location]' command."
3433
msgstr ""
3434
3435
#: bzrlib/builtins.py:5327
3436
msgid ""
3437
":Examples:\n"
3438
" bzr break-lock\n"
3439
" bzr break-lock bzr+ssh://example.com/bzr/foo\n"
3440
" bzr break-lock --conf ~/.bazaar"
3441
msgstr ""
3442
3443
# help of 'config' option of 'break-lock' command
3444
#: bzrlib/builtins.py:5336
3445
msgid "LOCATION is the directory where the config lock is."
3446
msgstr ""
3447
3448
# help of 'force' option of 'break-lock' command
3449
#: bzrlib/builtins.py:5338
3450
msgid "Do not ask for confirmation before breaking the lock."
3451
msgstr ""
3452
3453
# help of 'protocol=bzr' option of 'serve' command
3454
#: bzrlib/builtins.py:5373
3455
msgid "The Bazaar smart server protocol over TCP. (default port: 4155)"
3456
msgstr ""
3457
3458
#: bzrlib/builtins.py:5374
3459
msgid "Run the bzr server."
3460
msgstr ""
3461
3462
# help of 'inet' option of 'serve' command
3463
#: bzrlib/builtins.py:5380
3464
msgid "Serve on stdin/out for use from inetd or sshd."
3465
msgstr ""
3466
3467
# title of 'protocol' option of 'serve' command
3468
#: bzrlib/builtins.py:5381
3469
msgid "protocol"
3470
msgstr ""
3471
3472
# help of 'protocol' option of 'serve' command
3473
#: bzrlib/builtins.py:5382
3474
msgid "Protocol to serve."
3475
msgstr ""
3476
3477
# help of 'port' option of 'serve' command
3478
#: bzrlib/builtins.py:5386
3479
msgid ""
3480
"Listen for connections on nominated port of the form [hostname:]portnumber. "
3481
"Passing 0 as the port number will result in a dynamically allocated port. "
3482
"The default port depends on the protocol."
3483
msgstr ""
3484
3485
# help of 'directory' option of 'serve' command
3486
#: bzrlib/builtins.py:5392
3487
msgid "Serve contents of this directory."
3488
msgstr ""
3489
3490
# help of 'allow-writes' option of 'serve' command
3491
#: bzrlib/builtins.py:5394
3492
msgid ""
3493
"By default the server is a readonly server. Supplying --allow-writes "
3494
"enables write access to the contents of the served directory and below. "
3495
"Note that ``bzr serve`` does not perform authentication, so unless some form "
3496
"of external authentication is arranged supplying this option leads to global "
3497
"uncontrolled write access to your file system."
3498
msgstr ""
3499
3500
# help of 'client-timeout' option of 'serve' command
3501
#: bzrlib/builtins.py:5403
3502
msgid "Override the default idle client timeout (5min)."
3503
msgstr ""
3504
3505
#: bzrlib/builtins.py:5453
3506
msgid "Combine a tree into its containing tree."
3507
msgstr ""
3508
3509
#: bzrlib/builtins.py:5455
3510
msgid "This command requires the target tree to be in a rich-root format."
3511
msgstr ""
3512
3513
#: bzrlib/builtins.py:5457
3514
msgid ""
3515
"The TREE argument should be an independent tree, inside another tree, but\n"
3516
"not part of it. (Such trees can be produced by \"bzr split\", but also by\n"
3517
"running \"bzr branch\" with the target inside a tree.)"
3518
msgstr ""
3519
3520
#: bzrlib/builtins.py:5461
3521
msgid ""
3522
"The result is a combined tree, with the subtree no longer an independent\n"
3523
"part. This is marked as a merge of the subtree into the containing tree,\n"
3524
"and all history is preserved."
3525
msgstr ""
3526
3527
#: bzrlib/builtins.py:5479
3528
#, python-format
3529
msgid ""
3530
"Can't join trees because %s doesn't support rich root data.\n"
3531
"You can use bzr upgrade on the repository."
3532
msgstr ""
3533
3534
#: bzrlib/builtins.py:5489 bzrlib/builtins.py:5495
3535
msgid "Cannot join {0}. {1}"
3536
msgstr ""
3537
3538
#: bzrlib/builtins.py:5499
3539
msgid "Split a subdirectory of a tree into a separate tree."
3540
msgstr ""
3541
3542
#: bzrlib/builtins.py:5501
3543
msgid ""
3544
"This command will produce a target tree in a format that supports\n"
3545
"rich roots, like 'rich-root' or 'rich-root-pack'. These formats cannot be\n"
3546
"converted into earlier formats like 'dirstate-tags'."
3547
msgstr ""
3548
3549
#: bzrlib/builtins.py:5505
3550
msgid ""
3551
"The TREE argument should be a subdirectory of a working tree. That\n"
3552
"subdirectory will be converted into an independent tree, with its own\n"
3553
"branch. Commits in the top-level tree will not apply to the new subtree."
3554
msgstr ""
3555
3556
#: bzrlib/builtins.py:5585
3557
msgid "No submit branch specified or known"
3558
msgstr ""
3559
3560
#: bzrlib/builtins.py:5593 bzrlib/send.py:108
3561
msgid "No public branch specified or known"
3562
msgstr ""
3563
3564
#: bzrlib/builtins.py:5598
3565
msgid "bzr merge-directive takes at most two one revision identifiers"
3566
msgstr ""
3567
3568
#: bzrlib/builtins.py:5607
3569
msgid "No revisions to bundle."
3570
msgstr ""
3571
3572
#: bzrlib/builtins.py:5626
3573
msgid "Mail or create a merge-directive for submitting changes."
3574
msgstr ""
3575
3576
#: bzrlib/builtins.py:5628
3577
msgid "A merge directive provides many things needed for requesting merges:"
3578
msgstr ""
3579
3580
#: bzrlib/builtins.py:5630
3581
msgid "* A machine-readable description of the merge to perform"
3582
msgstr ""
3583
3584
#: bzrlib/builtins.py:5632
3585
msgid "* An optional patch that is a preview of the changes requested"
3586
msgstr ""
3587
3588
#: bzrlib/builtins.py:5634
3589
msgid ""
3590
"* An optional bundle of revision data, so that the changes can be applied\n"
3591
" directly from the merge directive, without retrieving data from a\n"
3592
" branch."
3593
msgstr ""
3594
3595
#: bzrlib/builtins.py:5638
3596
msgid ""
3597
"`bzr send` creates a compact data set that, when applied using bzr\n"
3598
"merge, has the same effect as merging from the source branch. "
3599
msgstr ""
3600
3601
#: bzrlib/builtins.py:5641
3602
msgid ""
3603
"By default the merge directive is self-contained and can be applied to any\n"
3604
"branch containing submit_branch in its ancestory without needing access to\n"
3605
"the source branch."
3606
msgstr ""
3607
3608
#: bzrlib/builtins.py:5645
3609
msgid ""
3610
"If --no-bundle is specified, then Bazaar doesn't send the contents of the\n"
3611
"revisions, but only a structured request to merge from the\n"
3612
"public_location. In that case the public_branch is needed and it must be\n"
3613
"up-to-date and accessible to the recipient. The public_branch is always\n"
3614
"included if known, so that people can check it later."
3615
msgstr ""
3616
3617
#: bzrlib/builtins.py:5651
3618
msgid ""
3619
"The submit branch defaults to the parent of the source branch, but can be\n"
3620
"overridden. Both submit branch and public branch will be remembered in\n"
3621
"branch.conf the first time they are used for a particular branch. The\n"
3622
"source branch defaults to that containing the working directory, but can\n"
3623
"be changed using --from."
3624
msgstr ""
3625
3626
#: bzrlib/builtins.py:5657
3627
msgid ""
3628
"Both the submit branch and the public branch follow the usual behavior with\n"
3629
"respect to --remember: If there is no default location set, the first send\n"
3630
"will set it (use --no-remember to avoid setting it). After that, you can\n"
3631
"omit the location to use the default. To change the default, use\n"
3632
"--remember. The value will only be saved if the location can be accessed."
3633
msgstr ""
3634
3635
#: bzrlib/builtins.py:5663
3636
msgid ""
3637
"In order to calculate those changes, bzr must analyse the submit branch.\n"
3638
"Therefore it is most efficient for the submit branch to be a local mirror.\n"
3639
"If a public location is known for the submit_branch, that location is used\n"
3640
"in the merge directive."
3641
msgstr ""
3642
3643
#: bzrlib/builtins.py:5668
3644
msgid ""
3645
"The default behaviour is to send the merge directive by mail, unless -o is\n"
3646
"given, in which case it is sent to a file."
3647
msgstr ""
3648
3649
#: bzrlib/builtins.py:5671
3650
msgid ""
3651
"Mail is sent using your preferred mail program. This should be transparent\n"
3652
"on Windows (it uses MAPI). On Unix, it requires the xdg-email utility.\n"
3653
"If the preferred client can't be found (or used), your editor will be used."
3654
msgstr ""
3655
3656
#: bzrlib/builtins.py:5675
3657
msgid ""
3658
"To use a specific mail program, set the mail_client configuration option.\n"
3659
"(For Thunderbird 1.5, this works around some bugs.) Supported values for\n"
3660
"specific clients are \"claws\", \"evolution\", \"kmail\", \"mail.app"
3661
"\" (MacOS X's\n"
3662
"Mail.app), \"mutt\", and \"thunderbird\"; generic options are \"default\",\n"
3663
"\"editor\", \"emacsclient\", \"mapi\", and \"xdg-email\". Plugins may also "
3664
"add\n"
3665
"supported clients."
3666
msgstr ""
3667
3668
#: bzrlib/builtins.py:5682
3669
msgid ""
3670
"If mail is being sent, a to address is required. This can be supplied\n"
3671
"either on the commandline, by setting the submit_to configuration\n"
3672
"option in the branch itself or the child_submit_to configuration option\n"
3673
"in the submit branch."
3674
msgstr ""
3675
3676
#: bzrlib/builtins.py:5687
3677
msgid ""
3678
"Two formats are currently supported: \"4\" uses revision bundle format 4 "
3679
"and\n"
3680
"merge directive format 2. It is significantly faster and smaller than\n"
3681
"older formats. It is compatible with Bazaar 0.19 and later. It is the\n"
3682
"default. \"0.9\" uses revision bundle format 0.9 and merge directive\n"
3683
"format 1. It is compatible with Bazaar 0.12 - 0.18."
3684
msgstr ""
3685
3686
#: bzrlib/builtins.py:5693
3687
msgid ""
3688
"The merge directives created by bzr send may be applied using bzr merge or\n"
3689
"bzr pull by specifying a file containing a merge directive as the location."
3690
msgstr ""
3691
3692
#: bzrlib/builtins.py:5696
3693
msgid ""
3694
"bzr send makes extensive use of public locations to map local locations "
3695
"into\n"
3696
"URLs that can be used by other people. See `bzr help configuration` to\n"
3697
"set them, and use `bzr info` to display them."
3698
msgstr ""
3699
3700
# help of 'output' option of 'send' command
3701
#: bzrlib/builtins.py:5720
3702
msgid "Write merge directive to this file or directory; use - for stdout."
3703
msgstr ""
3704
3705
# help of 'strict' option of 'send' command
3706
#: bzrlib/builtins.py:5724
3707
msgid ""
3708
"Refuse to send if there are uncommitted changes in the working tree, --no-"
3709
"strict disables the check."
3710
msgstr ""
3711
3712
# help of 'mail-to' option of 'send' command
3713
#: bzrlib/builtins.py:5726
3714
msgid "Mail the request to this address."
3715
msgstr ""
3716
3717
# help of 'body' option of 'send' command
3718
#: bzrlib/builtins.py:5730
3719
msgid "Body for the email."
3720
msgstr ""
3721
3722
# help of 'no-bundle' option of 'send' command
3723
#: bzrlib/builtins.py:5783
3724
msgid "Do not include a bundle in the merge directive."
3725
msgstr ""
3726
3727
# help of 'no-patch' option of 'send' command
3728
#: bzrlib/builtins.py:5784
3729
msgid "Do not include a preview patch in the merge directive."
3730
msgstr ""
3731
3732
# help of 'remember' option of 'send' command
3733
#: bzrlib/builtins.py:5787
3734
msgid "Remember submit and public branch."
3735
msgstr ""
3736
3737
# help of 'from' option of 'send' command
3738
#: bzrlib/builtins.py:5789
3739
msgid ""
3740
"Branch to generate the submission from, rather than the one containing the "
3741
"working directory."
3742
msgstr ""
3743
3744
# title of 'format' option of 'send' command
3745
# title of 'format' option of 'version-info' command
3746
#: bzrlib/builtins.py:5799 bzrlib/cmd_version_info.py:76
3747
msgid "format"
3748
msgstr ""
3749
3750
# help of 'format' option of 'send' command
3751
#: bzrlib/builtins.py:5800
3752
msgid "Use the specified output format."
3753
msgstr ""
3754
3755
#: bzrlib/builtins.py:5822
3756
msgid "Create, remove or modify a tag naming a revision."
3757
msgstr ""
3758
3759
#: bzrlib/builtins.py:5824
3760
msgid ""
3761
"Tags give human-meaningful names to revisions. Commands that take a -r\n"
3762
"(--revision) option can be given -rtag:X, where X is any previously\n"
3763
"created tag."
3764
msgstr ""
3765
3766
#: bzrlib/builtins.py:5828
3767
msgid ""
3768
"Tags are stored in the branch. Tags are copied from one branch to another\n"
3769
"along when you branch, push, pull or merge."
3770
msgstr ""
3771
3772
#: bzrlib/builtins.py:5831
3773
msgid ""
3774
"It is an error to give a tag name that already exists unless you pass\n"
3775
"--force, in which case the tag is moved to point to the new revision."
3776
msgstr ""
3777
3778
#: bzrlib/builtins.py:5834
3779
msgid ""
3780
"To rename a tag (change the name but keep it on the same revsion), run "
3781
"``bzr\n"
3782
"tag new-name -r tag:old-name`` and then ``bzr tag --delete oldname``."
3783
msgstr ""
3784
3785
#: bzrlib/builtins.py:5837
3786
msgid ""
3787
"If no tag name is specified it will be determined through the \n"
3788
"'automatic_tag_name' hook. This can e.g. be used to automatically tag\n"
3789
"upstream releases by reading configure.ac. See ``bzr help hooks`` for\n"
3790
"details."
3791
msgstr ""
3792
3793
# help of 'delete' option of 'tag' command
3794
#: bzrlib/builtins.py:5847
3795
msgid "Delete this tag rather than placing it."
3796
msgstr ""
3797
3798
# help of 'directory' option of 'tag' command
3799
#: bzrlib/builtins.py:5850
3800
msgid "Branch in which to place the tag."
3801
msgstr ""
3802
3803
# help of 'force' option of 'tag' command
3804
#: bzrlib/builtins.py:5852
3805
msgid "Replace existing tags."
3806
msgstr ""
3807
3808
#: bzrlib/builtins.py:5867
3809
msgid "No tag specified to delete."
3810
msgstr ""
3811
3812
#: bzrlib/builtins.py:5869
3813
#, python-format
3814
msgid "Deleted tag %s."
3815
msgstr ""
3816
3817
#: bzrlib/builtins.py:5883
3818
msgid "Please specify a tag name."
3819
msgstr ""
3820
3821
#: bzrlib/builtins.py:5891
3822
#, python-format
3823
msgid "Tag %s already exists for that revision."
3824
msgstr ""
3825
3826
#: bzrlib/builtins.py:5895
3827
#, python-format
3828
msgid "Created tag %s."
3829
msgstr ""
3830
3831
#: bzrlib/builtins.py:5897
3832
#, python-format
3833
msgid "Updated tag %s."
3834
msgstr ""
3835
3836
#: bzrlib/builtins.py:5901
3837
msgid "List tags."
3838
msgstr ""
3839
3840
#: bzrlib/builtins.py:5903
3841
msgid ""
3842
"This command shows a table of tag names and the revisions they reference."
3843
msgstr ""
3844
3845
# help of 'directory' option of 'tags' command
3846
#: bzrlib/builtins.py:5909
3847
msgid "Branch whose tags should be displayed."
3848
msgstr ""
3849
3850
# help of 'sort' option of 'tags' command
3851
#: bzrlib/builtins.py:5911
3852
msgid "Sort tags by different criteria."
3853
msgstr ""
3854
3855
# title of 'sort' option of 'tags' command
3856
#: bzrlib/builtins.py:5911
3857
msgid "Sorting"
3858
msgstr ""
3859
3860
#: bzrlib/builtins.py:5980
3861
msgid "Reconfigure the type of a bzr directory."
3862
msgstr ""
3863
3864
#: bzrlib/builtins.py:5982
3865
msgid "A target configuration must be specified."
3866
msgstr ""
3867
3868
#: bzrlib/builtins.py:5984
3869
msgid ""
3870
"For checkouts, the bind-to location will be auto-detected if not specified.\n"
3871
"The order of preference is\n"
3872
"1. For a lightweight checkout, the current bound location.\n"
3873
"2. For branches that used to be checkouts, the previously-bound location.\n"
3874
"3. The push location.\n"
3875
"4. The parent location.\n"
3876
"If none of these is available, --bind-to must be specified."
3877
msgstr ""
3878
3879
# title of 'tree_type' option of 'reconfigure' command
3880
#: bzrlib/builtins.py:5998
3881
msgid "Tree type"
3882
msgstr ""
3883
3884
# help of 'tree_type' option of 'reconfigure' command
3885
#: bzrlib/builtins.py:5999
3886
msgid "The relation between branch and tree."
3887
msgstr ""
3888
3889
# help of 'tree_type=branch' option of 'reconfigure' command
3890
#: bzrlib/builtins.py:6001
3891
msgid "Reconfigure to be an unbound branch with no working tree."
3892
msgstr ""
3893
3894
# help of 'tree_type=tree' option of 'reconfigure' command
3895
#: bzrlib/builtins.py:6002
3896
msgid "Reconfigure to be an unbound branch with a working tree."
3897
msgstr ""
3898
3899
# help of 'tree_type=checkout' option of 'reconfigure' command
3900
#: bzrlib/builtins.py:6003
3901
msgid "Reconfigure to be a bound branch with a working tree."
3902
msgstr ""
3903
3904
# help of 'tree_type=lightweight-checkout' option of 'reconfigure' command
3905
#: bzrlib/builtins.py:6004
3906
msgid "Reconfigure to be a lightweight checkout (with no local history)."
3907
msgstr ""
3908
3909
# title of 'repository_type' option of 'reconfigure' command
3910
#: bzrlib/builtins.py:6009
3911
msgid "Repository type"
3912
msgstr ""
3913
3914
# help of 'repository_type' option of 'reconfigure' command
3915
#: bzrlib/builtins.py:6010
3916
msgid "Location fo the repository."
3917
msgstr ""
3918
3919
# help of 'repository_type=standalone' option of 'reconfigure' command
3920
#: bzrlib/builtins.py:6012
3921
msgid ""
3922
"Reconfigure to be a standalone branch (i.e. stop using shared repository)."
3923
msgstr ""
3924
3925
# help of 'repository_type=use-shared' option of 'reconfigure' command
3926
#: bzrlib/builtins.py:6014
3927
msgid "Reconfigure to use a shared repository."
3928
msgstr ""
3929
3930
# title of 'repository_trees' option of 'reconfigure' command
3931
#: bzrlib/builtins.py:6018
3932
msgid "Trees in Repository"
3933
msgstr ""
3934
3935
# help of 'repository_trees' option of 'reconfigure' command
3936
#: bzrlib/builtins.py:6019
3937
msgid "Whether new branches in the repository have trees."
3938
msgstr ""
3939
3940
# help of 'repository_trees=with-trees' option of 'reconfigure' command
3941
#: bzrlib/builtins.py:6021
3942
msgid "Reconfigure repository to create working trees on branches by default."
3943
msgstr ""
3944
3945
# help of 'repository_trees=with-no-trees' option of 'reconfigure' command
3946
#: bzrlib/builtins.py:6023
3947
msgid ""
3948
"Reconfigure repository to not create working trees on branches by default."
3949
msgstr ""
3950
3951
# help of 'bind-to' option of 'reconfigure' command
3952
#: bzrlib/builtins.py:6026
3953
msgid "Branch to bind checkout to."
3954
msgstr ""
3955
3956
# help of 'force' option of 'reconfigure' command
3957
#: bzrlib/builtins.py:6028
3958
msgid "Perform reconfiguration even if local changes will be lost."
3959
msgstr ""
3960
3961
# help of 'stacked-on' option of 'reconfigure' command
3962
#: bzrlib/builtins.py:6031
3963
msgid "Reconfigure a branch to be stacked on another branch."
3964
msgstr ""
3965
3966
# help of 'unstacked' option of 'reconfigure' command
3967
#: bzrlib/builtins.py:6035
3968
msgid ""
3969
"Reconfigure a branch to be unstacked. This may require copying substantial "
3970
"data into it."
3971
msgstr ""
3972
3973
#: bzrlib/builtins.py:6045
3974
msgid "Can't use both --stacked-on and --unstacked"
3975
msgstr ""
3976
3977
#: bzrlib/builtins.py:6059
3978
msgid "No target configuration specified"
3979
msgstr ""
3980
3981
#: bzrlib/builtins.py:6094
3982
msgid "Set the branch of a checkout and update."
3983
msgstr ""
3984
3985
#: bzrlib/builtins.py:6096
3986
msgid ""
3987
"For lightweight checkouts, this changes the branch being referenced.\n"
3988
"For heavyweight checkouts, this checks that there are no local commits\n"
3989
"versus the current bound branch, then it makes the local branch a mirror\n"
3990
"of the new location and binds to it."
3991
msgstr ""
3992
3993
#: bzrlib/builtins.py:6101
3994
msgid ""
3995
"In both cases, the working tree is updated and uncommitted changes\n"
3996
"are merged. The user can commit or revert these as they desire."
3997
msgstr ""
3998
3999
#: bzrlib/builtins.py:6104
4000
msgid "Pending merges need to be committed or reverted before using switch."
4001
msgstr ""
4002
4003
#: bzrlib/builtins.py:6106
4004
msgid ""
4005
"The path to the branch to switch to can be specified relative to the parent\n"
4006
"directory of the current branch. For example, if you are currently in a\n"
4007
"checkout of /path/to/branch, specifying 'newbranch' will find a branch at\n"
4008
"/path/to/newbranch."
4009
msgstr ""
4010
4011
#: bzrlib/builtins.py:6111
4012
msgid ""
4013
"Bound branches use the nickname of its master branch unless it is set\n"
4014
"locally, in which case switching will update the local nickname to be\n"
4015
"that of the master."
4016
msgstr ""
4017
4018
# help of 'force' option of 'switch' command
4019
#: bzrlib/builtins.py:6119
4020
msgid "Switch even if local commits will be lost."
4021
msgstr ""
4022
4023
# help of 'create-branch' option of 'switch' command
4024
#: bzrlib/builtins.py:6122
4025
msgid "Create the target branch from this one before switching to it."
4026
msgstr ""
4027
4028
#: bzrlib/builtins.py:6134
4029
msgid "You must supply either a revision or a location"
4030
msgstr ""
4031
4032
#: bzrlib/builtins.py:6145
4033
msgid "cannot create branch without source branch"
4034
msgstr ""
4035
4036
#: bzrlib/builtins.py:6209
4037
msgid "Manage filtered views."
4038
msgstr ""
4039
4040
#: bzrlib/builtins.py:6211
4041
msgid ""
4042
"Views provide a mask over the tree so that users can focus on\n"
4043
"a subset of a tree when doing their work. After creating a view,\n"
4044
"commands that support a list of files - status, diff, commit, etc -\n"
4045
"effectively have that list of files implicitly given each time.\n"
4046
"An explicit list of files can still be given but those files\n"
4047
"must be within the current view."
4048
msgstr ""
4049
4050
#: bzrlib/builtins.py:6218
4051
msgid ""
4052
"In most cases, a view has a short life-span: it is created to make\n"
4053
"a selected change and is deleted once that change is committed.\n"
4054
"At other times, you may wish to create one or more named views\n"
4055
"and switch between them."
4056
msgstr ""
4057
4058
#: bzrlib/builtins.py:6223
4059
msgid ""
4060
"To disable the current view without deleting it, you can switch to\n"
4061
"the pseudo view called ``off``. This can be useful when you need\n"
4062
"to see the whole tree for an operation or two (e.g. merge) but\n"
4063
"want to switch back to your view after that."
4064
msgstr ""
4065
4066
#: bzrlib/builtins.py:6228
4067
msgid ""
4068
":Examples:\n"
4069
" To define the current view::"
4070
msgstr ""
4071
4072
#: bzrlib/builtins.py:6231
4073
msgid " bzr view file1 dir1 ..."
4074
msgstr ""
4075
4076
#: bzrlib/builtins.py:6233
4077
msgid " To list the current view::"
4078
msgstr ""
4079
4080
#: bzrlib/builtins.py:6235
4081
msgid " bzr view"
4082
msgstr ""
4083
4084
#: bzrlib/builtins.py:6237
4085
msgid " To delete the current view::"
4086
msgstr ""
4087
4088
#: bzrlib/builtins.py:6239
4089
msgid " bzr view --delete"
4090
msgstr ""
4091
4092
#: bzrlib/builtins.py:6241
4093
msgid " To disable the current view without deleting it::"
4094
msgstr ""
4095
4096
#: bzrlib/builtins.py:6243
4097
msgid " bzr view --switch off"
4098
msgstr ""
4099
4100
#: bzrlib/builtins.py:6245
4101
msgid " To define a named view and switch to it::"
4102
msgstr ""
4103
4104
#: bzrlib/builtins.py:6247
4105
msgid " bzr view --name view-name file1 dir1 ..."
4106
msgstr ""
4107
4108
#: bzrlib/builtins.py:6249
4109
msgid " To list a named view::"
4110
msgstr ""
4111
4112
#: bzrlib/builtins.py:6251
4113
msgid " bzr view --name view-name"
4114
msgstr ""
4115
4116
#: bzrlib/builtins.py:6253
4117
msgid " To delete a named view::"
4118
msgstr ""
4119
4120
#: bzrlib/builtins.py:6255
4121
msgid " bzr view --name view-name --delete"
4122
msgstr ""
4123
4124
#: bzrlib/builtins.py:6257
4125
msgid " To switch to a named view::"
4126
msgstr ""
4127
4128
#: bzrlib/builtins.py:6259
4129
msgid " bzr view --switch view-name"
4130
msgstr ""
4131
4132
#: bzrlib/builtins.py:6261
4133
msgid " To list all views defined::"
4134
msgstr ""
4135
4136
#: bzrlib/builtins.py:6263
4137
msgid " bzr view --all"
4138
msgstr ""
4139
4140
#: bzrlib/builtins.py:6265
4141
msgid " To delete all views::"
4142
msgstr ""
4143
4144
#: bzrlib/builtins.py:6267
4145
msgid " bzr view --delete --all"
4146
msgstr ""
4147
4148
# help of 'all' option of 'view' command
4149
#: bzrlib/builtins.py:6274
4150
msgid "Apply list or delete action to all views."
4151
msgstr ""
4152
4153
# help of 'delete' option of 'view' command
4154
#: bzrlib/builtins.py:6277
4155
msgid "Delete the view."
4156
msgstr ""
4157
4158
# help of 'name' option of 'view' command
4159
#: bzrlib/builtins.py:6280
4160
msgid "Name of the view to define, list or delete."
4161
msgstr ""
4162
4163
# help of 'switch' option of 'view' command
4164
#: bzrlib/builtins.py:6284
4165
msgid "Name of the view to switch to."
4166
msgstr ""
4167
4168
#: bzrlib/builtins.py:6303
4169
msgid "Both --delete and a file list specified"
4170
msgstr ""
4171
4172
#: bzrlib/builtins.py:6306
4173
msgid "Both --delete and --switch specified"
4174
msgstr ""
4175
4176
#: bzrlib/builtins.py:6309
4177
msgid "Deleted all views.\n"
4178
msgstr ""
4179
4180
#: bzrlib/builtins.py:6311
4181
msgid "No current view to delete"
4182
msgstr ""
4183
4184
#: bzrlib/builtins.py:6314
4185
#, python-format
4186
msgid "Deleted '%s' view.\n"
4187
msgstr ""
4188
4189
#: bzrlib/builtins.py:6318
4190
msgid "Both --switch and a file list specified"
4191
msgstr ""
4192
4193
#: bzrlib/builtins.py:6321
4194
msgid "Both --switch and --all specified"
4195
msgstr ""
4196
4197
#: bzrlib/builtins.py:6324
4198
msgid "No current view to disable"
4199
msgstr ""
4200
4201
#: bzrlib/builtins.py:6326
4202
#, python-format
4203
msgid "Disabled '%s' view.\n"
4204
msgstr ""
4205
4206
#: bzrlib/builtins.py:6330 bzrlib/builtins.py:6352
4207
msgid "Using '{0}' view: {1}\n"
4208
msgstr ""
4209
4210
#: bzrlib/builtins.py:6333
4211
msgid "Views defined:\n"
4212
msgstr ""
4213
4214
#: bzrlib/builtins.py:6342
4215
msgid "No views defined.\n"
4216
msgstr ""
4217
4218
#: bzrlib/builtins.py:6349
4219
msgid "Cannot change the 'off' pseudo view"
4220
msgstr ""
4221
4222
#: bzrlib/builtins.py:6357
4223
msgid "No current view.\n"
4224
msgstr ""
4225
4226
#: bzrlib/builtins.py:6360
4227
msgid "'{0}' view is: {1}\n"
4228
msgstr ""
4229
4230
#: bzrlib/builtins.py:6380
4231
msgid " <no hooks installed>\n"
4232
msgstr ""
4233
4234
#: bzrlib/builtins.py:6384
4235
msgid "Remove a branch."
4236
msgstr ""
4237
4238
#: bzrlib/builtins.py:6386
4239
msgid ""
4240
"This will remove the branch from the specified location but \n"
4241
"will keep any working tree or repository in place."
4242
msgstr ""
4243
4244
#: bzrlib/builtins.py:6391
4245
msgid " Remove the branch at repo/trunk::"
4246
msgstr ""
4247
4248
#: bzrlib/builtins.py:6393
4249
msgid " bzr remove-branch repo/trunk"
4250
msgstr ""
4251
4252
# help of 'writer=plain' option of 'shelve' command
4253
#: bzrlib/builtins.py:6408
4254
msgid "Plaintext diff output."
4255
msgstr ""
4256
4257
#: bzrlib/builtins.py:6409
4258
msgid "Temporarily set aside some changes from the current tree."
4259
msgstr ""
4260
4261
#: bzrlib/builtins.py:6411
4262
msgid ""
4263
"Shelve allows you to temporarily put changes you've made \"on the shelf\",\n"
4264
"ie. out of the way, until a later time when you can bring them back from\n"
4265
"the shelf with the 'unshelve' command. The changes are stored alongside\n"
4266
"your working tree, and so they aren't propagated along with your branch nor\n"
4267
"will they survive its deletion."
4268
msgstr ""
4269
4270
#: bzrlib/builtins.py:6417
4271
msgid "If shelve --list is specified, previously-shelved changes are listed."
4272
msgstr ""
4273
4274
#: bzrlib/builtins.py:6419
4275
msgid ""
4276
"Shelve is intended to help separate several sets of changes that have\n"
4277
"been inappropriately mingled. If you just want to get rid of all changes\n"
4278
"and you don't need to restore them later, use revert. If you want to\n"
4279
"shelve all text changes at once, use shelve --all."
4280
msgstr ""
4281
4282
#: bzrlib/builtins.py:6424
4283
msgid ""
4284
"If filenames are specified, only the changes to those files will be\n"
4285
"shelved. Other files will be left untouched."
4286
msgstr ""
4287
4288
#: bzrlib/builtins.py:6427
4289
msgid ""
4290
"If a revision is specified, changes since that revision will be shelved."
4291
msgstr ""
4292
4293
#: bzrlib/builtins.py:6429
4294
msgid ""
4295
"You can put multiple items on the shelf, and by default, 'unshelve' will\n"
4296
"restore the most recently shelved changes."
4297
msgstr ""
4298
4299
#: bzrlib/builtins.py:6432
4300
msgid ""
4301
"For complicated changes, it is possible to edit the changes in a separate\n"
4302
"editor program to decide what the file remaining in the working copy\n"
4303
"should look like. To do this, add the configuration option"
4304
msgstr ""
4305
4306
#: bzrlib/builtins.py:6436
4307
msgid " change_editor = PROGRAM @new_path @old_path"
4308
msgstr ""
4309
4310
#: bzrlib/builtins.py:6438
4311
msgid ""
4312
"where @new_path is replaced with the path of the new version of the \n"
4313
"file and @old_path is replaced with the path of the old version of \n"
4314
"the file. The PROGRAM should save the new file with the desired \n"
4315
"contents of the file in the working tree.\n"
4316
" "
4317
msgstr ""
4318
4319
# help of 'all' option of 'shelve' command
4320
#: bzrlib/builtins.py:6450
4321
msgid "Shelve all changes."
4322
msgstr ""
4323
4324
# help of 'writer' option of 'shelve' command
4325
#: bzrlib/builtins.py:6452
4326
msgid "Method to use for writing diffs."
4327
msgstr ""
4328
4329
# title of 'writer' option of 'shelve' command
4330
#: bzrlib/builtins.py:6452
4331
msgid "writer"
4332
msgstr ""
4333
4334
# help of 'list' option of 'shelve' command
4335
#: bzrlib/builtins.py:6456
4336
msgid "List shelved changes."
4337
msgstr ""
4338
4339
# help of 'destroy' option of 'shelve' command
4340
#: bzrlib/builtins.py:6458
4341
msgid "Destroy removed changes instead of shelving them."
4342
msgstr ""
4343
4344
#: bzrlib/builtins.py:6487
4345
msgid "No shelved changes."
4346
msgstr ""
4347
4348
#: bzrlib/builtins.py:6498
4349
msgid "Restore shelved changes."
4350
msgstr ""
4351
4352
#: bzrlib/builtins.py:6500
4353
msgid ""
4354
"By default, the most recently shelved changes are restored. However if you\n"
4355
"specify a shelf by id those changes will be restored instead. This works\n"
4356
"best when the changes don't depend on each other."
4357
msgstr ""
4358
4359
# help of 'action' option of 'unshelve' command
4360
#: bzrlib/builtins.py:6509
4361
msgid "The action to perform."
4362
msgstr ""
4363
4364
# title of 'action' option of 'resolve' command
4365
# title of 'action' option of 'unshelve' command
4366
#: bzrlib/builtins.py:6509 bzrlib/conflicts.py:694
4367
msgid "action"
4368
msgstr ""
4369
4370
# help of 'action=apply' option of 'unshelve' command
4371
#: bzrlib/builtins.py:6511
4372
msgid "Apply changes and remove from the shelf."
4373
msgstr ""
4374
4375
# help of 'action=dry-run' option of 'unshelve' command
4376
#: bzrlib/builtins.py:6512
4377
msgid "Show changes, but do not apply or remove them."
4378
msgstr ""
4379
4380
# help of 'action=preview' option of 'unshelve' command
4381
#: bzrlib/builtins.py:6513
4382
msgid ""
4383
"Instead of unshelving the changes, show the diff that would result from "
4384
"unshelving."
4385
msgstr ""
4386
4387
# help of 'action=delete-only' option of 'unshelve' command
4388
#: bzrlib/builtins.py:6515
4389
msgid "Delete changes without applying them."
4390
msgstr ""
4391
4392
# help of 'action=keep' option of 'unshelve' command
4393
#: bzrlib/builtins.py:6516
4394
msgid "Apply changes but don't delete them."
4395
msgstr ""
4396
4397
#: bzrlib/builtins.py:6531
4398
msgid "Remove unwanted files from working tree."
4399
msgstr ""
4400
4401
#: bzrlib/builtins.py:6533
4402
msgid ""
4403
"By default, only unknown files, not ignored files, are deleted. Versioned\n"
4404
"files are never deleted."
4405
msgstr ""
4406
4407
#: bzrlib/builtins.py:6536
4408
msgid ""
4409
"Another class is 'detritus', which includes files emitted by bzr during\n"
4410
"normal operations and selftests. (The value of these files decreases with\n"
4411
"time.)"
4412
msgstr ""
4413
4414
#: bzrlib/builtins.py:6540
4415
msgid ""
4416
"If no options are specified, unknown files are deleted. Otherwise, option\n"
4417
"flags are respected, and may be combined."
4418
msgstr ""
4419
4420
#: bzrlib/builtins.py:6543
4421
msgid "To check what clean-tree will do, use --dry-run."
4422
msgstr ""
4423
4424
# help of 'ignored' option of 'clean-tree' command
4425
#: bzrlib/builtins.py:6546
4426
msgid "Delete all ignored files."
4427
msgstr ""
4428
4429
# help of 'detritus' option of 'clean-tree' command
4430
#: bzrlib/builtins.py:6547
4431
msgid ""
4432
"Delete conflict files, merge and revert backups, and failed selftest dirs."
4433
msgstr ""
4434
4435
# help of 'unknown' option of 'clean-tree' command
4436
#: bzrlib/builtins.py:6550
4437
msgid "Delete files unknown to bzr (default)."
4438
msgstr ""
4439
4440
# help of 'dry-run' option of 'clean-tree' command
4441
#: bzrlib/builtins.py:6551
4442
msgid "Show files to delete instead of deleting them."
4443
msgstr ""
4444
4445
# help of 'force' option of 'clean-tree' command
4446
#: bzrlib/builtins.py:6553
4447
msgid "Do not prompt before deleting."
4448
msgstr ""
4449
4450
#: bzrlib/bundle/__init__.py:59
4451
msgid "A directory cannot be a bundle"
4452
msgstr ""
4453
4454
#: bzrlib/bundle/apply_bundle.py:40
4455
msgid "Install revisions"
4456
msgstr ""
4457
4458
#: bzrlib/bundle/commands.py:64
4459
msgid "--verbose requires a merge directive"
4460
msgstr ""
4461
4462
#: bzrlib/bundle/commands.py:67
4463
msgid "Bundle format not supported"
4464
msgstr ""
4465
4466
#: bzrlib/bundle/commands.py:77
4467
msgid "Records\n"
4468
msgstr ""
4469
4470
#: bzrlib/bundle/commands.py:81
4471
msgid "{0}: {1} ({2} multiparent)\n"
4472
msgstr ""
4473
4474
#: bzrlib/bundle/commands.py:83
4475
#, python-format
4476
msgid "unique files: %d\n"
4477
msgstr ""
4478
4479
#: bzrlib/bundle/commands.py:92
4480
msgid "Revisions\n"
4481
msgstr ""
4482
4483
#: bzrlib/bundle/commands.py:93
4484
#, python-format
4485
msgid "nicks: %s\n"
4486
msgstr ""
4487
4488
#: bzrlib/bundle/commands.py:95
4489
#, python-format
4490
msgid ""
4491
"committers: \n"
4492
"%s\n"
4493
msgstr ""
4494
4495
#: bzrlib/bundle/commands.py:103
4496
msgid "Decoded contents\n"
4497
msgstr ""
4498
4499
#: bzrlib/bundle/serializer/v4.py:327
4500
#, python-format
4501
msgid "Bundling %d revision."
4502
msgid_plural "Bundling %d revisions."
4503
msgstr[0] ""
4504
msgstr[1] ""
4505
4506
#: bzrlib/bzrdir.py:489
4507
msgid ""
4508
"making backup of {0}\n"
4509
" to {1}"
4510
msgstr ""
4511
4512
#: bzrlib/bzrdir.py:512
4513
msgid "renamed {0} to {1}"
4514
msgstr ""
4515
4516
#: bzrlib/bzrdir.py:1663
4517
#, python-format
4518
msgid ""
4519
"Source repository format does not support stacking, using format:\n"
4520
" %s"
4521
msgstr ""
4522
4523
#: bzrlib/bzrdir.py:1683
4524
#, python-format
4525
msgid ""
4526
"Source branch format does not support stacking, using format:\n"
4527
" %s"
4528
msgstr ""
4529
4530
#: bzrlib/bzrdir.py:1829
4531
msgid "starting repository conversion"
4532
msgstr ""
4533
4534
#: bzrlib/bzrdir.py:2058
4535
msgid "Using default stacking branch {0} at {1}"
4536
msgstr ""
4537
4538
#: bzrlib/check.py:108
4539
msgid "check"
4540
msgstr ""
4541
4542
#: bzrlib/check.py:110
4543
msgid "checking revisions"
4544
msgstr ""
4545
4546
#: bzrlib/check.py:112
4547
msgid "checking commit contents"
4548
msgstr ""
4549
4550
#: bzrlib/check.py:114
4551
msgid "checking file graphs"
4552
msgstr ""
4553
4554
#: bzrlib/check.py:118
4555
msgid "checking branches and trees"
4556
msgstr ""
4557
4558
#: bzrlib/check.py:205
4559
msgid "checked repository {0} format {1}"
4560
msgstr ""
4561
4562
#: bzrlib/check.py:208
4563
#, python-format
4564
msgid "%6d revisions"
4565
msgstr ""
4566
4567
#: bzrlib/check.py:209
4568
#, python-format
4569
msgid "%6d file-ids"
4570
msgstr ""
4571
4572
#: bzrlib/check.py:211
4573
#, python-format
4574
msgid "%6d unreferenced text versions"
4575
msgstr ""
4576
4577
#: bzrlib/check.py:215
4578
msgid "unreferenced version: {{{0}}} in {1}"
4579
msgstr ""
4580
4581
#: bzrlib/check.py:218
4582
#, python-format
4583
msgid "%6d revisions are missing inventory_sha1"
4584
msgstr ""
4585
4586
#: bzrlib/check.py:221
4587
#, python-format
4588
msgid "%6d revisions are mentioned but not present"
4589
msgstr ""
4590
4591
#: bzrlib/check.py:224
4592
#, python-format
4593
msgid "%6d ghost revisions"
4594
msgstr ""
4595
4596
#: bzrlib/check.py:229
4597
#, python-format
4598
msgid "%6d revisions missing parents in ancestry"
4599
msgstr ""
4600
4601
#: bzrlib/check.py:233
4602
#, python-format
4603
msgid " %s should be in the ancestry for:"
4604
msgstr ""
4605
4606
#: bzrlib/check.py:237
4607
#, python-format
4608
msgid "%6d inconsistent parents"
4609
msgstr ""
4610
4611
#: bzrlib/check.py:241
4612
msgid " * {0} version {1} has parents {2!r} but should have {3!r}"
4613
msgstr ""
4614
4615
#: bzrlib/check.py:247
4616
#, python-format
4617
msgid "%6d revisions have incorrect parents in the revision index"
4618
msgstr ""
4619
4620
#: bzrlib/check.py:253
4621
msgid " {0} has wrong parents in index: {1!r} should be {2!r}"
4622
msgstr ""
4623
4624
#: bzrlib/check.py:267
4625
msgid "Mismatched internal revid {{{0}}} and index revid {{{1}}}"
4626
msgstr ""
4627
4628
#: bzrlib/check.py:296
4629
msgid ""
4630
"Multiple expected sha1s for {0}. {{{1}}} expects {{{2}}}, {{{3}}} expects "
4631
"{{{4}}}"
4632
msgstr ""
4633
4634
#: bzrlib/check.py:354
4635
#, python-format
4636
msgid "Checking branch at '%s'."
4637
msgstr ""
4638
4639
#: bzrlib/check.py:374
4640
#, python-format
4641
msgid "Checking working tree at '%s'."
4642
msgstr ""
4643
4644
#: bzrlib/check.py:427 bzrlib/check.py:441
4645
msgid "No branch found at specified location."
4646
msgstr ""
4647
4648
#: bzrlib/check.py:429 bzrlib/check.py:439
4649
msgid "No working tree found at specified location."
4650
msgstr ""
4651
4652
#: bzrlib/check.py:432
4653
#, python-format
4654
msgid "Checking repository at '%s'."
4655
msgstr ""
4656
4657
#: bzrlib/check.py:443
4658
msgid "No repository found at specified location."
4659
msgstr ""
4660
4661
#: bzrlib/clean_tree.py:63
4662
msgid "Nothing to delete."
4663
msgstr ""
4664
4665
#: bzrlib/clean_tree.py:68
4666
msgid "Are you sure you wish to delete these"
4667
msgstr ""
4668
4669
#: bzrlib/clean_tree.py:70
4670
msgid "Canceled"
4671
msgstr ""
4672
4673
#: bzrlib/clean_tree.py:107
4674
#, python-format
4675
msgid "unable to remove %s"
4676
msgstr ""
4677
4678
#: bzrlib/clean_tree.py:111
4679
msgid "deleting paths:"
4680
msgstr ""
4681
4682
#: bzrlib/clean_tree.py:125
4683
msgid "unable to remove \"{0}\": {1}."
4684
msgstr ""
4685
4686
#: bzrlib/clean_tree.py:130
4687
msgid "No files deleted."
4688
msgstr ""
4689
4690
#: bzrlib/cmd_version_info.py:47
4691
msgid "No known version info format {0}. Supported types are: {1}"
4692
msgstr ""
4693
4694
# help of 'format=custom' option of 'version-info' command
4695
#: bzrlib/cmd_version_info.py:52
4696
msgid "Version info in Custom template-based format."
4697
msgstr ""
4698
4699
# help of 'format=python' option of 'version-info' command
4700
#: bzrlib/cmd_version_info.py:52
4701
msgid "Version info in Python format."
4702
msgstr ""
4703
4704
# help of 'format=rio' option of 'version-info' command
4705
#: bzrlib/cmd_version_info.py:52
4706
msgid "Version info in RIO (simple text) format (default)."
4707
msgstr ""
4708
4709
#: bzrlib/cmd_version_info.py:53
4710
msgid "Show version information about this tree."
4711
msgstr ""
4712
4713
#: bzrlib/cmd_version_info.py:55
4714
msgid ""
4715
"You can use this command to add information about version into\n"
4716
"source code of an application. The output can be in one of the\n"
4717
"supported formats or in a custom format based on a template."
4718
msgstr ""
4719
4720
#: bzrlib/cmd_version_info.py:59 en/help_topics/configuration.txt:700
4721
#: en/help_topics/configuration.txt:710
4722
msgid "For example::"
4723
msgstr ""
4724
4725
#: bzrlib/cmd_version_info.py:61
4726
msgid ""
4727
" bzr version-info --custom \\\n"
4728
" --template=\"#define VERSION_INFO \\\"Project 1.2.3 (r{revno})\\\"\\n\""
4729
msgstr ""
4730
4731
#: bzrlib/cmd_version_info.py:64
4732
msgid ""
4733
"will produce a C header file with formatted string containing the\n"
4734
"current revision number. Other supported variables in templates are:"
4735
msgstr ""
4736
4737
#: bzrlib/cmd_version_info.py:67
4738
msgid ""
4739
" * {date} - date of the last revision\n"
4740
" * {build_date} - current date\n"
4741
" * {revno} - revision number\n"
4742
" * {revision_id} - revision id\n"
4743
" * {branch_nick} - branch nickname\n"
4744
" * {clean} - 0 if the source tree contains uncommitted changes,\n"
4745
" otherwise 1"
4746
msgstr ""
4747
4748
# help of 'format' option of 'version-info' command
4749
#: bzrlib/cmd_version_info.py:77
4750
msgid "Select the output format."
4751
msgstr ""
4752
4753
# help of 'all' option of 'version-info' command
4754
#: bzrlib/cmd_version_info.py:81
4755
msgid "Include all possible information."
4756
msgstr ""
4757
4758
# help of 'check-clean' option of 'version-info' command
4759
#: bzrlib/cmd_version_info.py:82
4760
msgid "Check if tree is clean."
4761
msgstr ""
4762
4763
# help of 'include-history' option of 'version-info' command
4764
#: bzrlib/cmd_version_info.py:84
4765
msgid "Include the revision-history."
4766
msgstr ""
4767
4768
# help of 'include-file-revisions' option of 'version-info' command
4769
#: bzrlib/cmd_version_info.py:86
4770
msgid "Include the last revision for each file."
4771
msgstr ""
4772
4773
# help of 'template' option of 'version-info' command
4774
#: bzrlib/cmd_version_info.py:87
4775
msgid "Template for the output."
4776
msgstr ""
4777
4778
#: bzrlib/cmd_version_info.py:101
4779
msgid "bzr version-info --revision takes exactly one revision specifier"
4780
msgstr ""
4781
4782
#: bzrlib/commands.py:228
4783
#, python-format
4784
msgid "unknown command \"%s\""
4785
msgstr ""
4786
4787
#: bzrlib/commands.py:475
4788
msgid "No help for this command."
4789
msgstr ""
4790
4791
#: bzrlib/commands.py:488
4792
#, python-format
4793
msgid ":Purpose: %s\n"
4794
msgstr ""
4795
4796
#: bzrlib/commands.py:490
4797
#, python-format
4798
msgid ""
4799
":Usage:\n"
4800
"%s\n"
4801
msgstr ""
4802
4803
#: bzrlib/commands.py:492
4804
#, python-format
4805
msgid ":Usage: %s\n"
4806
msgstr ""
4807
4808
#: bzrlib/commands.py:511
4809
#, python-format
4810
msgid ":Options:%s"
4811
msgstr ""
4812
4813
#: bzrlib/commands.py:522
4814
#, python-format
4815
msgid ""
4816
":Description:\n"
4817
" %s\n"
4818
"\n"
4819
msgstr ""
4820
4821
#: bzrlib/commands.py:532
4822
#, python-format
4823
msgid ""
4824
"See bzr help %s for more details and examples.\n"
4825
"\n"
4826
msgstr ""
4827
4828
#: bzrlib/commands.py:537
4829
msgid ":Aliases: "
4830
msgstr ""
4831
4832
#: bzrlib/commands.py:541
4833
#, python-format
4834
msgid ":From: plugin \"%s\"\n"
4835
msgstr ""
4836
4837
#: bzrlib/commands.py:553
4838
msgid ":doc:`{0} <{1}-help>`"
4839
msgstr ""
4840
4841
#: bzrlib/commands.py:557
4842
#, python-format
4843
msgid ":See also: %s"
4844
msgstr ""
4845
4846
#: bzrlib/commands.py:815 bzrlib/gpg.py:324
4847
msgid "Only ASCII permitted in option names"
4848
msgstr ""
4849
4850
#: bzrlib/commands.py:840 bzrlib/commands.py:848
4851
msgid "command {0!r} needs one or more {1}"
4852
msgstr ""
4853
4854
#: bzrlib/commands.py:857
4855
msgid "command {0!r} requires argument {1}"
4856
msgstr ""
4857
4858
#: bzrlib/commands.py:864
4859
msgid "extra argument to command {0}: {1}"
4860
msgstr ""
4861
4862
#: bzrlib/commands.py:961
4863
#, python-format
4864
msgid "Profile data written to \"%s\"."
4865
msgstr ""
4866
4867
#: bzrlib/commit.py:117 bzrlib/commit.py:740
4868
msgid "added"
4869
msgstr ""
4870
4871
#: bzrlib/commit.py:117 bzrlib/commit.py:748
4872
msgid "modified"
4873
msgstr ""
4874
4875
#: bzrlib/commit.py:131
4876
#, python-format
4877
msgid "Committing%s"
4878
msgstr ""
4879
4880
#: bzrlib/commit.py:134
4881
#, python-format
4882
msgid "Committed revision %d."
4883
msgstr ""
4884
4885
#: bzrlib/commit.py:143
4886
#, python-format
4887
msgid "deleted %s"
4888
msgstr ""
4889
4890
#: bzrlib/commit.py:146
4891
#, python-format
4892
msgid "missing %s"
4893
msgstr ""
4894
4895
#: bzrlib/commit.py:511
4896
msgid ""
4897
"Conflicting tags in bound branch:\n"
4898
"{0}"
4899
msgstr ""
4900
4901
#: bzrlib/commit.py:742
4902
msgid "renamed"
4903
msgstr ""
4904
4905
#: bzrlib/commit.py:977
4906
msgid "unchanged"
4907
msgstr ""
4908
4909
#: bzrlib/commit.py:999
4910
msgid "{0} [{1}] - Stage"
4911
msgstr ""
4912
4913
#: bzrlib/commit.py:1002
4914
#, python-format
4915
msgid "%s - Stage"
4916
msgstr ""
4917
4918
#: bzrlib/commit_signature_commands.py:36
4919
msgid "Sign all commits by a given committer."
4920
msgstr ""
4921
4922
#: bzrlib/commit_signature_commands.py:38
4923
msgid ""
4924
"If location is not specified the local tree is used.\n"
4925
"If committer is not specified the default committer is used."
4926
msgstr ""
4927
4928
#: bzrlib/commit_signature_commands.py:41
4929
msgid "This does not sign commits that already have signatures."
4930
msgstr ""
4931
4932
# help of 'dry-run' option of 'sign-my-commits' command
4933
#: bzrlib/commit_signature_commands.py:49
4934
msgid ""
4935
"Don't actually sign anything, just print the revisions that would be signed."
4936
msgstr ""
4937
4938
#: bzrlib/commit_signature_commands.py:103
4939
msgid "Verify all commit signatures."
4940
msgstr ""
4941
4942
#: bzrlib/commit_signature_commands.py:105
4943
msgid "Verifies that all commits in the branch are signed by known GnuPG keys."
4944
msgstr ""
4945
4946
# help of 'acceptable-keys' option of 'verify-signatures' command
4947
#: bzrlib/commit_signature_commands.py:110
4948
msgid ""
4949
"Comma separated list of GPG key patterns which are acceptable for "
4950
"verification."
4951
msgstr ""
4952
4953
#: bzrlib/commit_signature_commands.py:147
4954
msgid "Cannot verify a range of non-revision-history revisions"
4955
msgstr ""
4956
4957
#: bzrlib/commit_signature_commands.py:168
4958
msgid "All commits signed with verifiable keys"
4959
msgstr ""
4960
4961
#: bzrlib/config.py:475
4962
msgid "Invalid config value for \"{0}\" value {1!r} is not an SI unit."
4963
msgstr ""
4964
4965
#: bzrlib/config.py:2499
4966
msgid "{0} is not an SI unit."
4967
msgstr ""
4968
4969
#: bzrlib/config.py:2956
4970
msgid ""
4971
"Option {0} in section {1} of {2} was changed from {3} to {4}. The {5} value "
4972
"will be saved."
4973
msgstr ""
4974
4975
#: bzrlib/config.py:3100
4976
#, python-format
4977
msgid "Invalid '%s', should be of the form 'name=value'"
4978
msgstr ""
4979
4980
#: bzrlib/config.py:3969
4981
msgid "Display, set or remove a configuration option."
4982
msgstr ""
4983
4984
#: bzrlib/config.py:3971
4985
msgid "Display the active value for a given option."
4986
msgstr ""
4987
4988
#: bzrlib/config.py:3973
4989
msgid ""
4990
"If --all is specified, NAME is interpreted as a regular expression and all\n"
4991
"matching options are displayed mentioning their scope. The active value\n"
4992
"that bzr will take into account is the first one displayed for each option."
4993
msgstr ""
4994
4995
#: bzrlib/config.py:3977
4996
msgid "If no NAME is given, --all .* is implied."
4997
msgstr ""
4998
4999
#: bzrlib/config.py:3979
5000
msgid ""
5001
"Setting a value is achieved by using name=value without spaces. The value\n"
5002
"is set in the most relevant scope and can be checked by displaying the\n"
5003
"option again."
5004
msgstr ""
5005
5006
# help of 'scope' option of 'config' command
5007
#: bzrlib/config.py:3991
5008
msgid "Reduce the scope to the specified configuration file."
5009
msgstr ""
5010
5011
# help of 'all' option of 'config' command
5012
#: bzrlib/config.py:3995
5013
msgid "Display all the defined values for the matching options."
5014
msgstr ""
5015
5016
# help of 'remove' option of 'config' command
5017
#: bzrlib/config.py:3997
5018
msgid "Remove the option from the configuration file."
5019
msgstr ""
5020
5021
#: bzrlib/conflicts.py:50
5022
msgid "List files with conflicts."
5023
msgstr ""
5024
5025
#: bzrlib/conflicts.py:57
5026
msgid ""
5027
"Conflicts normally are listed as short, human-readable messages. If --text\n"
5028
"is supplied, the pathnames of files with text conflicts are listed,\n"
5029
"instead. (This is useful for editing all files with text conflicts.)"
5030
msgstr ""
5031
5032
#: bzrlib/conflicts.py:61
5033
msgid "Use bzr resolve when you have fixed a problem."
5034
msgstr ""
5035
5036
# help of 'text' option of 'conflicts' command
5037
#: bzrlib/conflicts.py:66
5038
msgid "List paths of files with text conflicts."
5039
msgstr ""
5040
5041
# help of 'action=done' option of 'resolve' command
5042
#: bzrlib/conflicts.py:85
5043
msgid "Marks the conflict as resolved."
5044
msgstr ""
5045
5046
# help of 'action=take-this' option of 'resolve' command
5047
#: bzrlib/conflicts.py:88
5048
msgid "Resolve the conflict preserving the version in the working tree."
5049
msgstr ""
5050
5051
# help of 'action=take-other' option of 'resolve' command
5052
#: bzrlib/conflicts.py:91
5053
msgid "Resolve the conflict taking the merged version into account."
5054
msgstr ""
5055
5056
# help of 'action' option of 'resolve' command
5057
#: bzrlib/conflicts.py:98
5058
msgid "How to resolve the conflict."
5059
msgstr ""
5060
5061
#: bzrlib/conflicts.py:104
5062
msgid "Mark a conflict as resolved."
5063
msgstr ""
5064
5065
#: bzrlib/conflicts.py:111
5066
msgid ""
5067
"Once you have fixed a problem, use \"bzr resolve\" to automatically mark\n"
5068
"text conflicts as fixed, \"bzr resolve FILE\" to mark a specific conflict "
5069
"as\n"
5070
"resolved, or \"bzr resolve --all\" to mark all conflicts as resolved."
5071
msgstr ""
5072
5073
# help of 'all' option of 'resolve' command
5074
#: bzrlib/conflicts.py:119
5075
msgid "Resolve all conflicts in this tree."
5076
msgstr ""
5077
5078
#: bzrlib/conflicts.py:126
5079
msgid "If --all is specified, no FILE may be provided"
5080
msgstr ""
5081
5082
#: bzrlib/conflicts.py:151
5083
#, python-format
5084
msgid "%d conflict auto-resolved."
5085
msgid_plural "%d conflicts auto-resolved."
5086
msgstr[0] ""
5087
msgstr[1] ""
5088
5089
#: bzrlib/conflicts.py:154
5090
msgid "Remaining conflicts:"
5091
msgstr ""
5092
5093
#: bzrlib/conflicts.py:159
5094
msgid "All conflicts resolved."
5095
msgstr ""
5096
5097
#: bzrlib/conflicts.py:168
5098
msgid "{0} conflict resolved, {1} remaining"
5099
msgid_plural "{0} conflicts resolved, {1} remaining"
5100
msgstr[0] ""
5101
msgstr[1] ""
5102
5103
#: bzrlib/controldir.py:698
5104
msgid "{0} is{1} redirected to {2}"
5105
msgstr ""
5106
5107
#: bzrlib/diff.py:399
5108
#, python-format
5109
msgid "*** Ignoring files outside view. View is %s"
5110
msgstr ""
5111
5112
#: bzrlib/errors.py:157
5113
msgid "The tree builder is already building a tree."
5114
msgstr ""
5115
5116
#: bzrlib/errors.py:178
5117
msgid "The dirstate file (%(state)s) appears to be corrupt: %(msg)s"
5118
msgstr ""
5119
5120
#: bzrlib/errors.py:197
5121
msgid ""
5122
"The API for \"%(api)s\" is not compatible with \"%(wanted)s\". It supports "
5123
"versions \"%(minimum)s\" to \"%(current)s\"."
5124
msgstr ""
5125
5126
#: bzrlib/errors.py:209
5127
msgid "The transport '%(transport)s' is only accessible within this process."
5128
msgstr ""
5129
5130
#: bzrlib/errors.py:227
5131
msgid "Invalid revision number %(revno)s"
5132
msgstr ""
5133
5134
#: bzrlib/errors.py:236
5135
msgid "Invalid revision-id {%(revision_id)s} in %(branch)s"
5136
msgstr ""
5137
5138
#: bzrlib/errors.py:247
5139
msgid "Reserved revision-id {%(revision_id)s}"
5140
msgstr ""
5141
5142
#: bzrlib/errors.py:261
5143
msgid "There is no public branch set for \"%(branch_url)s\"."
5144
msgstr ""
5145
5146
#: bzrlib/errors.py:271
5147
msgid ""
5148
"No help could be found for '%(topic)s'. Please use 'bzr help topics' to "
5149
"obtain a list of topics."
5150
msgstr ""
5151
5152
#: bzrlib/errors.py:280
5153
msgid "The file id \"%(file_id)s\" is not present in the tree %(tree)s."
5154
msgstr ""
5155
5156
#: bzrlib/errors.py:290
5157
msgid ""
5158
"The file id \"%(file_id)s\" is not present in the repository %(repository)r"
5159
msgstr ""
5160
5161
#: bzrlib/errors.py:299
5162
msgid "The branch '%(branch)s' is not stacked."
5163
msgstr ""
5164
5165
#: bzrlib/errors.py:313
5166
msgid "No WorkingTree exists for \"%(base)s\"."
5167
msgstr ""
5168
5169
#: bzrlib/errors.py:322
5170
msgid "Not currently building a tree."
5171
msgstr ""
5172
5173
#: bzrlib/errors.py:327
5174
msgid "%(url)s is not a local path."
5175
msgstr ""
5176
5177
#: bzrlib/errors.py:355
5178
msgid "%(not_locked)r is not write locked but needs to be."
5179
msgstr ""
5180
5181
#: bzrlib/errors.py:363
5182
msgid "Error in command line options"
5183
msgstr ""
5184
5185
#: bzrlib/errors.py:368
5186
msgid "%(value)s is not an index of type %(_type)s."
5187
msgstr ""
5188
5189
#: bzrlib/errors.py:378
5190
msgid "Error in data for index %(value)s."
5191
msgstr ""
5192
5193
#: bzrlib/errors.py:387
5194
msgid "The key '%(key)s' is already in index '%(index)s'."
5195
msgstr ""
5196
5197
#: bzrlib/errors.py:397
5198
msgid "The key '%(key)s' is not a valid key."
5199
msgstr ""
5200
5201
#: bzrlib/errors.py:406
5202
msgid "Could not parse options for index %(value)s."
5203
msgstr ""
5204
5205
#: bzrlib/errors.py:415
5206
msgid "The value '%(value)s' is not a valid value."
5207
msgstr ""
5208
5209
#: bzrlib/errors.py:443
5210
msgid "Generic path error: %(path)r%(extra)s)"
5211
msgstr ""
5212
5213
#: bzrlib/errors.py:456
5214
msgid "No such file: %(path)r%(extra)s"
5215
msgstr ""
5216
5217
#: bzrlib/errors.py:461
5218
msgid "File exists: %(path)r%(extra)s"
5219
msgstr ""
5220
5221
#: bzrlib/errors.py:467
5222
msgid ""
5223
"Could not rename %(source)s => %(dest)s because both files exist. (Use --"
5224
"after to tell bzr about a rename that has already happened)%(extra)s"
5225
msgstr ""
5226
5227
#: bzrlib/errors.py:483
5228
msgid "\"%(path)s\" is not a directory %(extra)s"
5229
msgstr ""
5230
5231
#: bzrlib/errors.py:488
5232
msgid "\"%(path)s\" is not in the working directory %(extra)s"
5233
msgstr ""
5234
5235
#: bzrlib/errors.py:493
5236
msgid "Directory not empty: \"%(path)s\"%(extra)s"
5237
msgstr ""
5238
5239
#: bzrlib/errors.py:498
5240
msgid "Hard-linking \"%(path)s\" is not supported"
5241
msgstr ""
5242
5243
#: bzrlib/errors.py:513
5244
msgid "Device or resource busy: \"%(path)s\"%(extra)s"
5245
msgstr ""
5246
5247
#: bzrlib/errors.py:518
5248
msgid "Permission denied: \"%(path)s\"%(extra)s"
5249
msgstr ""
5250
5251
#: bzrlib/errors.py:523
5252
msgid "Invalid url supplied to transport: \"%(path)s\"%(extra)s"
5253
msgstr ""
5254
5255
#: bzrlib/errors.py:528
5256
msgid "Invalid URL join request: %(reason)s: %(base)r + %(join_args)r"
5257
msgstr ""
5258
5259
#: bzrlib/errors.py:539
5260
msgid "URLs differ by more than path: %(from_)r and %(to)r"
5261
msgstr ""
5262
5263
#: bzrlib/errors.py:561
5264
msgid "The %(type)s hook '%(hook)s' is unknown in this version of bzrlib."
5265
msgstr ""
5266
5267
#: bzrlib/errors.py:571
5268
msgid "Unsupported protocol for url \"%(path)s\"%(extra)s"
5269
msgstr ""
5270
5271
#: bzrlib/errors.py:579
5272
msgid ""
5273
"The branch '%(url)s'(%(format)s) is not a stackable format. You will need to "
5274
"upgrade the branch to permit branch stacking."
5275
msgstr ""
5276
5277
#: bzrlib/errors.py:590
5278
msgid "The branch '%(branch_url)s' cannot be stacked on '%(target_url)s'."
5279
msgstr ""
5280
5281
#: bzrlib/errors.py:600
5282
msgid ""
5283
"The repository '%(url)s'(%(format)s) is not a stackable format. You will "
5284
"need to upgrade the repository to permit branch stacking."
5285
msgstr ""
5286
5287
#: bzrlib/errors.py:611
5288
msgid "Error reading from %(path)r."
5289
msgstr ""
5290
5291
#: bzrlib/errors.py:630
5292
msgid "Path \"%(path)s\" is not a child of path \"%(base)s\"%(extra)s"
5293
msgstr ""
5294
5295
#: bzrlib/errors.py:646
5296
msgid "Path \"%(path)s\" is not unicode normalized"
5297
msgstr ""
5298
5299
#: bzrlib/errors.py:654
5300
msgid "Not a branch: \"%(path)s\"%(detail)s."
5301
msgstr ""
5302
5303
#: bzrlib/errors.py:696
5304
msgid "No submit branch available for branch \"%(path)s\""
5305
msgstr ""
5306
5307
#: bzrlib/errors.py:705
5308
msgid "Already a branch: \"%(path)s\"."
5309
msgstr ""
5310
5311
#: bzrlib/errors.py:711
5312
msgid ""
5313
"Directory contains a branch, but no working tree (use bzr checkout if you "
5314
"wish to build a working tree): \"%(path)s\""
5315
msgstr ""
5316
5317
#: bzrlib/errors.py:716
5318
msgid ""
5319
"\"%(function)s\" called on an AtomicFile after it was closed: \"%(path)s\""
5320
msgstr ""
5321
5322
#: bzrlib/errors.py:726
5323
msgid ""
5324
"Parent not accessible given base \"%(base)s\" and relative path \"%(path)s\""
5325
msgstr ""
5326
5327
#: bzrlib/errors.py:736
5328
msgid "No repository present: \"%(path)s\""
5329
msgstr ""
5330
5331
#: bzrlib/errors.py:743
5332
msgid ""
5333
"Unsupported branch format: %(format)s\n"
5334
"Please run 'bzr upgrade'"
5335
msgstr ""
5336
5337
#: bzrlib/errors.py:749
5338
msgid "Unknown %(kind)s format: %(format)r"
5339
msgstr ""
5340
5341
#: bzrlib/errors.py:758
5342
msgid "Format %(format)s is not compatible with .bzr version %(bzrdir)s."
5343
msgstr ""
5344
5345
#: bzrlib/errors.py:768
5346
msgid "Parse error on line %(lineno)d of %(format)s format: %(line)s"
5347
msgstr ""
5348
5349
#: bzrlib/errors.py:783
5350
msgid ""
5351
"%(target)s\n"
5352
"is not compatible with\n"
5353
"%(source)s\n"
5354
"%(details)s"
5355
msgstr ""
5356
5357
#: bzrlib/errors.py:799
5358
msgid "Revision is not compatible with %(repo_format)s"
5359
msgstr ""
5360
5361
#: bzrlib/errors.py:809
5362
msgid "%(context_info)s%(path)s is already versioned."
5363
msgstr ""
5364
5365
#: bzrlib/errors.py:830
5366
msgid "%(context_info)s%(path)s is not versioned."
5367
msgstr ""
5368
5369
#: bzrlib/errors.py:851
5370
msgid "Path(s) are not versioned: %(paths_as_string)s"
5371
msgstr ""
5372
5373
#: bzrlib/errors.py:862
5374
msgid "Path(s) do not exist: %(paths_as_string)s%(extra)s"
5375
msgstr ""
5376
5377
#: bzrlib/errors.py:881
5378
msgid "Cannot operate on \"%(filename)s\" of unsupported kind \"%(kind)s\""
5379
msgstr ""
5380
5381
#: bzrlib/errors.py:889
5382
msgid ""
5383
"Filename %(filename)r is not valid in your current filesystem encoding "
5384
"%(fs_encoding)s"
5385
msgstr ""
5386
5387
#: bzrlib/errors.py:900
5388
msgid "Cannot operate on \"%(filename)s\" because it is a control file"
5389
msgstr ""
5390
5391
#: bzrlib/errors.py:918
5392
msgid "The lock for '%(lock_description)s' is in use and cannot be broken."
5393
msgstr ""
5394
5395
#: bzrlib/errors.py:957
5396
msgid "Cannot lock %(lock)s: %(why)s"
5397
msgstr ""
5398
5399
#: bzrlib/errors.py:967
5400
msgid ""
5401
"A transaction related operation was attempted after the transaction finished."
5402
msgstr ""
5403
5404
#: bzrlib/errors.py:994
5405
msgid "Cannot lock: transport is read only: %(transport)s"
5406
msgstr ""
5407
5408
#: bzrlib/errors.py:1002
5409
msgid "Could not acquire lock \"%(lock)s\": %(msg)s"
5410
msgstr ""
5411
5412
#: bzrlib/errors.py:1013
5413
msgid "Lock was broken while still open: %(lock)s - check storage consistency!"
5414
msgstr ""
5415
5416
#: bzrlib/errors.py:1024
5417
msgid ""
5418
"Lock was released and re-acquired before being broken: %(lock)s: held by "
5419
"%(holder)r, wanted to break %(target)r"
5420
msgstr ""
5421
5422
#: bzrlib/errors.py:1036
5423
msgid ""
5424
"Lock is apparently held, but corrupted: %(corruption_info)s\n"
5425
"Use 'bzr break-lock' to clear it"
5426
msgstr ""
5427
5428
#: bzrlib/errors.py:1049
5429
msgid "Lock not held: %(lock)s"
5430
msgstr ""
5431
5432
#: bzrlib/errors.py:1078
5433
msgid "No changes to commit"
5434
msgstr ""
5435
5436
#: bzrlib/errors.py:1083
5437
msgid ""
5438
"Selected-file commit of merges is not supported yet: files %(files_str)s"
5439
msgstr ""
5440
5441
#: bzrlib/errors.py:1093
5442
msgid ""
5443
"Excluding paths during commit is not supported by repository at %(repository)"
5444
"r."
5445
msgstr ""
5446
5447
#: bzrlib/errors.py:1102
5448
msgid ""
5449
"The specified commit message contains characters unsupported by the current "
5450
"encoding."
5451
msgstr ""
5452
5453
#: bzrlib/errors.py:1108
5454
msgid "Upgrade URL cannot work with readonly URLs."
5455
msgstr ""
5456
5457
#: bzrlib/errors.py:1113
5458
msgid "The branch format %(format)s is already at the most recent format."
5459
msgstr ""
5460
5461
#: bzrlib/errors.py:1136
5462
msgid "Option --change does not accept revision ranges"
5463
msgstr ""
5464
5465
#: bzrlib/errors.py:1141
5466
msgid "No namespace registered for string: %(spec)r"
5467
msgstr ""
5468
5469
#: bzrlib/errors.py:1160
5470
msgid ""
5471
"Requested revision: '%(spec)s' does not exist in branch: %(branch_url)s"
5472
"%(extra)s"
5473
msgstr ""
5474
5475
#: bzrlib/errors.py:1174
5476
msgid ""
5477
"Operation denied because it would change the main history, which is not "
5478
"permitted by the append_revisions_only setting on branch \"%(location)s\"."
5479
msgstr ""
5480
5481
#: bzrlib/errors.py:1185
5482
msgid ""
5483
"These branches have diverged. Use the missing command to see how.\n"
5484
"Use the merge command to reconcile them."
5485
msgstr ""
5486
5487
#: bzrlib/errors.py:1205
5488
msgid ""
5489
"Branches have no common ancestor, and no merge base revision was specified."
5490
msgstr ""
5491
5492
#: bzrlib/errors.py:1211
5493
msgid ""
5494
"Selected merge cannot perform reverse cherrypicks. Try merge3 or diff3."
5495
msgstr ""
5496
5497
#: bzrlib/errors.py:1217
5498
msgid "Revisions have no common ancestor: %(revision_a)s %(revision_b)s"
5499
msgstr ""
5500
5501
#: bzrlib/errors.py:1226
5502
msgid ""
5503
"Revisions are not derived from the same root: %(revision_a)s %(revision_b)s."
5504
msgstr ""
5505
5506
#: bzrlib/errors.py:1235
5507
msgid "Revision %(rev_id)s is not an ancestor of %(not_ancestor_id)s"
5508
msgstr ""
5509
5510
#: bzrlib/errors.py:1244
5511
msgid "Branch %(branch)s has no commits."
5512
msgstr ""
5513
5514
#: bzrlib/errors.py:1262
5515
msgid ""
5516
"Bound branch %(branch)s is out of date with master branch %(master)s."
5517
"%(extra_help)s"
5518
msgstr ""
5519
5520
#: bzrlib/errors.py:1274
5521
msgid ""
5522
"Cannot commit to branch %(branch)s. It is bound to %(master)s, which is "
5523
"bound to %(remote)s."
5524
msgstr ""
5525
5526
#: bzrlib/errors.py:1286
5527
msgid "Cannot pull --overwrite to a branch which is bound %(branch)s"
5528
msgstr ""
5529
5530
#: bzrlib/errors.py:1295
5531
msgid ""
5532
"Unable to connect to target of bound branch %(branch)s => %(target)s: "
5533
"%(error)s"
5534
msgstr ""
5535
5536
#: bzrlib/errors.py:1307
5537
msgid "Error in processing weave: %(msg)s"
5538
msgstr ""
5539
5540
#: bzrlib/errors.py:1316
5541
msgid "Revision {%(revision_id)s} already present in %(weave)s"
5542
msgstr ""
5543
5544
#: bzrlib/errors.py:1327
5545
msgid "Revision {%(revision_id)s} not present in %(weave)s"
5546
msgstr ""
5547
5548
#: bzrlib/errors.py:1337
5549
msgid "Weave invariant violated: %(what)s"
5550
msgstr ""
5551
5552
#: bzrlib/errors.py:1346
5553
msgid "Parents are mismatched between two revisions. %(msg)s"
5554
msgstr ""
5555
5556
#: bzrlib/errors.py:1368
5557
msgid ""
5558
"Weaves differ on text content. Revision: {%(revision_id)s}, %(weave_a)s, "
5559
"%(weave_b)s"
5560
msgstr ""
5561
5562
#: bzrlib/errors.py:1380
5563
msgid "Versioned file error"
5564
msgstr ""
5565
5566
#: bzrlib/errors.py:1385
5567
msgid "Revision {%(revision_id)s} not present in \"%(file_id)s\"."
5568
msgstr ""
5569
5570
#: bzrlib/errors.py:1395
5571
msgid "Revision {%(revision_id)s} already present in \"%(file_id)s\"."
5572
msgstr ""
5573
5574
#: bzrlib/errors.py:1405
5575
msgid "Text did not match its checksum: %(msg)s"
5576
msgstr ""
5577
5578
#: bzrlib/errors.py:1531
5579
msgid "Export format %(format)r not supported"
5580
msgstr ""
5581
5582
#: bzrlib/errors.py:1540
5583
msgid "Transport error: %(msg)s %(orig_error)s"
5584
msgstr ""
5585
5586
#: bzrlib/errors.py:1566
5587
msgid "Generic bzr smart protocol error: %(details)s"
5588
msgstr ""
5589
5590
#: bzrlib/errors.py:1574
5591
msgid "Received bad protocol version marker: %(marker)r"
5592
msgstr ""
5593
5594
#: bzrlib/errors.py:1606
5595
msgid "Transport operation not possible: %(msg)s %(orig_error)s"
5596
msgstr ""
5597
5598
#: bzrlib/errors.py:1611
5599
msgid "Connection error: %(msg)s %(orig_error)s"
5600
msgstr ""
5601
5602
#: bzrlib/errors.py:1616
5603
msgid "%(msg)s %(host)s%(port)s%(orig_error)s"
5604
msgstr ""
5605
5606
#: bzrlib/errors.py:1637
5607
msgid "Connection closed: %(msg)s %(orig_error)s"
5608
msgstr ""
5609
5610
#: bzrlib/errors.py:1642
5611
msgid "Connection Timeout: %(msg)s%(orig_error)s"
5612
msgstr ""
5613
5614
#: bzrlib/errors.py:1647
5615
msgid "Invalid range access in %(path)s at %(offset)s: %(msg)s"
5616
msgstr ""
5617
5618
#: bzrlib/errors.py:1657
5619
msgid "Invalid http response for %(path)s: %(msg)s%(orig_error)s"
5620
msgstr ""
5621
5622
#: bzrlib/errors.py:1672
5623
msgid "Invalid http range %(range)r for %(path)s: %(msg)s"
5624
msgstr ""
5625
5626
#: bzrlib/errors.py:1686
5627
msgid "HTTP MIME Boundary missing for %(path)s: %(msg)s"
5628
msgstr ""
5629
5630
#: bzrlib/errors.py:1694
5631
msgid "Invalid http Content-type \"%(ctype)s\" for %(path)s: %(msg)s"
5632
msgstr ""
5633
5634
#: bzrlib/errors.py:1703
5635
msgid "%(source)s is%(permanently)s redirected to %(target)s"
5636
msgstr ""
5637
5638
#: bzrlib/errors.py:1717
5639
msgid "Too many redirections"
5640
msgstr ""
5641
5642
#: bzrlib/errors.py:1722
5643
msgid "Working tree has conflicts."
5644
msgstr ""
5645
5646
#: bzrlib/errors.py:1726
5647
msgid "Config file %(filename)s is not UTF-8 encoded\n"
5648
msgstr ""
5649
5650
#: bzrlib/errors.py:1735
5651
msgid ""
5652
"Error(s) parsing config file %(filename)s:\n"
5653
"%(errors)s"
5654
msgstr ""
5655
5656
#: bzrlib/errors.py:1746
5657
msgid "Bad value \"%(value)s\" for option \"%(name)s\"."
5658
msgstr ""
5659
5660
#: bzrlib/errors.py:1754
5661
msgid "%(username)r does not seem to contain a reasonable email address"
5662
msgstr ""
5663
5664
#: bzrlib/errors.py:1763
5665
msgid "Failed to GPG sign data with command \"%(command_line)s\""
5666
msgstr ""
5667
5668
#: bzrlib/errors.py:1771
5669
msgid "Failed to verify GPG signature data with error \"%(error)s\""
5670
msgstr ""
5671
5672
#: bzrlib/errors.py:1779
5673
msgid "Unable to import library \"%(library)s\": %(error)s"
5674
msgstr ""
5675
5676
#: bzrlib/errors.py:1787
5677
msgid "python-gpgme is not installed, it is needed to verify signatures"
5678
msgstr ""
5679
5680
#: bzrlib/errors.py:1795
5681
msgid ""
5682
"The working tree for %(basedir)s has changed since the last commit, but "
5683
"weave merge requires that it be unchanged"
5684
msgstr ""
5685
5686
#: bzrlib/errors.py:1805
5687
msgid ""
5688
"Can't reprocess and show base, because reprocessing obscures the "
5689
"relationship of conflicting lines to the base"
5690
msgstr ""
5691
5692
#: bzrlib/errors.py:1811
5693
msgid "Cycle in graph %(graph)r"
5694
msgstr ""
5695
5696
#: bzrlib/errors.py:1839
5697
msgid "File %(filename)s is not conflicted."
5698
msgstr ""
5699
5700
#: bzrlib/errors.py:1861
5701
msgid "No bundle was found in \"%(filename)s\"."
5702
msgstr ""
5703
5704
#: bzrlib/errors.py:1870
5705
msgid "Unable to handle bundle version %(version)s: %(msg)s"
5706
msgstr ""
5707
5708
#: bzrlib/errors.py:1880
5709
msgid "Branch %(base)s is missing revision %(text_revision)s of %(file_id)s"
5710
msgstr ""
5711
5712
#: bzrlib/errors.py:1893
5713
msgid "File id {%(file_id)s} already exists in inventory as %(entry)s"
5714
msgstr ""
5715
5716
#: bzrlib/errors.py:1903
5717
msgid "Key %(key)s is already present in map"
5718
msgstr ""
5719
5720
#: bzrlib/errors.py:1908
5721
msgid "The prefix %(prefix)s is in the help search path twice."
5722
msgstr ""
5723
5724
#: bzrlib/errors.py:1918
5725
msgid ""
5726
"No final name for trans_id %(trans_id)r\n"
5727
"file-id: %(file_id)r\n"
5728
"root trans-id: %(root_trans_id)r\n"
5729
msgstr ""
5730
5731
#: bzrlib/errors.py:1950
5732
msgid "Attempt to reuse a transform that has already been applied."
5733
msgstr ""
5734
5735
#: bzrlib/errors.py:1955
5736
msgid "Moving the root directory is not supported at this time"
5737
msgstr ""
5738
5739
#: bzrlib/errors.py:1960
5740
msgid "Failed to rename %(from_path)s to %(to_path)s: %(why)s"
5741
msgstr ""
5742
5743
#: bzrlib/errors.py:1971
5744
msgid ""
5745
"Could not move %(from_path)s%(operator)s %(to_path)s%(_has_extra)s%(extra)s"
5746
msgstr ""
5747
5748
#: bzrlib/errors.py:2007
5749
msgid ""
5750
"Could not rename %(from_path)s%(operator)s %(to_path)s%(_has_extra)s%(extra)s"
5751
msgstr ""
5752
5753
#: bzrlib/errors.py:2037
5754
msgid "Unable to import paramiko (required for sftp support): %(error)s"
5755
msgstr ""
5756
5757
#: bzrlib/errors.py:2045
5758
msgid "Nothing to merge."
5759
msgstr ""
5760
5761
#: bzrlib/errors.py:2050
5762
msgid "Format %(format)s cannot be initialised by this version of bzr."
5763
msgstr ""
5764
5765
#: bzrlib/errors.py:2059
5766
msgid ""
5767
"Cannot convert from format %(from_format)s to format %(format)s. "
5768
"%(problem)s"
5769
msgstr ""
5770
5771
#: bzrlib/errors.py:2071
5772
msgid "Could not find an appropriate Differ for file \"%(path)s\""
5773
msgstr ""
5774
5775
#: bzrlib/errors.py:2079
5776
msgid "%(exe_name)s could not be found on this machine"
5777
msgstr ""
5778
5779
#: bzrlib/errors.py:2087
5780
msgid "Diff is not installed on this machine: %(msg)s"
5781
msgstr ""
5782
5783
#: bzrlib/errors.py:2095
5784
msgid "Diff3 is not installed on this machine."
5785
msgstr ""
5786
5787
#: bzrlib/errors.py:2101
5788
msgid "The content being inserted is already present."
5789
msgstr ""
5790
5791
#: bzrlib/errors.py:2106
5792
msgid ""
5793
"This tree contains left-over files from a failed operation.\n"
5794
" Please examine %(limbo_dir)s to see if it contains any files you wish "
5795
"to\n"
5796
" keep, and delete it when you are done."
5797
msgstr ""
5798
5799
#: bzrlib/errors.py:2117
5800
msgid ""
5801
"This tree contains left-over files from a failed operation.\n"
5802
" Please examine %(pending_deletion)s to see if it contains any files you\n"
5803
" wish to keep, and delete it when you are done."
5804
msgstr ""
5805
5806
#: bzrlib/errors.py:2127
5807
msgid ""
5808
"Unable to delete transform temporary directory %(limbo_dir)s.\n"
5809
" Please examine %(limbo_dir)s to see if it contains any files you wish "
5810
"to\n"
5811
" keep, and delete it when you are done."
5812
msgstr ""
5813
5814
#: bzrlib/errors.py:2138
5815
msgid ""
5816
"Unable to delete transform temporary directory %(pending_deletion)s. Please "
5817
"examine %(pending_deletion)s to see if it contains any files you wish to "
5818
"keep, and delete it when you are done."
5819
msgstr ""
5820
5821
#: bzrlib/errors.py:2148
5822
msgid "Working tree is out of date, please run 'bzr update'.%(more)s"
5823
msgstr ""
5824
5825
#: bzrlib/errors.py:2162
5826
msgid "Public branch \"%(public_location)s\" lacks revision \"%(revstring)s\"."
5827
msgstr ""
5828
5829
#: bzrlib/errors.py:2175
5830
msgid "Error in merge modified format"
5831
msgstr ""
5832
5833
#: bzrlib/errors.py:2180
5834
msgid "Format error in conflict listings"
5835
msgstr ""
5836
5837
#: bzrlib/errors.py:2184
5838
msgid ""
5839
"Inconsistency in dirstate file %(dirstate_path)s.\n"
5840
"Error: %(description)s"
5841
msgstr ""
5842
5843
#: bzrlib/errors.py:2195
5844
msgid ""
5845
"An error has been detected in the repository %(repo_path)s.\n"
5846
"Please run bzr reconcile on this repository."
5847
msgstr ""
5848
5849
#: bzrlib/errors.py:2206
5850
msgid ""
5851
"An inconsistent delta was supplied involving %(path)r, %(file_id)r\n"
5852
"reason: %(reason)s"
5853
msgstr ""
5854
5855
#: bzrlib/errors.py:2219
5856
msgid ""
5857
"An inconsistent delta was supplied: %(delta)r\n"
5858
"reason: %(reason)s"
5859
msgstr ""
5860
5861
#: bzrlib/errors.py:2231
5862
msgid "To use this feature you must upgrade your branch at %(path)s."
5863
msgstr ""
5864
5865
#: bzrlib/errors.py:2240
5866
msgid "To use this feature you must upgrade your repository at %(path)s."
5867
msgstr ""
5868
5869
#: bzrlib/errors.py:2245
5870
msgid ""
5871
"To use this feature you must upgrade your branch at %(path)s to a format "
5872
"which supports rich roots."
5873
msgstr ""
5874
5875
#: bzrlib/errors.py:2251
5876
msgid "Cannot perform local-only commits on unbound branches."
5877
msgstr ""
5878
5879
#: bzrlib/errors.py:2256
5880
msgid "The method %(mname)s is not supported on objects of type %(tname)s."
5881
msgstr ""
5882
5883
#: bzrlib/errors.py:2277
5884
msgid "Ghost tags not supported by format %(format)r."
5885
msgstr ""
5886
5887
#: bzrlib/errors.py:2285
5888
msgid "File is binary but should be text."
5889
msgstr ""
5890
5891
#: bzrlib/errors.py:2290
5892
msgid "The path %(path)s is not permitted on this platform"
5893
msgstr ""
5894
5895
#: bzrlib/errors.py:2299
5896
msgid ""
5897
"Testament did not match expected value.\n"
5898
" For revision_id {%(revision_id)s}, expected {%(expected)s}, measured\n"
5899
" {%(measured)s}"
5900
msgstr ""
5901
5902
#: bzrlib/errors.py:2311
5903
msgid "Not a bzr revision-bundle: %(text)r"
5904
msgstr ""
5905
5906
#: bzrlib/errors.py:2320
5907
msgid "Bad bzr revision-bundle: %(text)r"
5908
msgstr ""
5909
5910
#: bzrlib/errors.py:2329
5911
msgid "Malformed bzr revision-bundle header: %(text)r"
5912
msgstr ""
5913
5914
#: bzrlib/errors.py:2334
5915
msgid "Malformed patches in bzr revision-bundle: %(text)r"
5916
msgstr ""
5917
5918
#: bzrlib/errors.py:2339
5919
msgid "Malformed footer in bzr revision-bundle: %(text)r"
5920
msgstr ""
5921
5922
#: bzrlib/errors.py:2344
5923
msgid "End of line marker was not \\n in bzr revision-bundle"
5924
msgstr ""
5925
5926
#: bzrlib/errors.py:2354
5927
msgid "Bundle format %(bundle_format)s is incompatible with %(other)s"
5928
msgstr ""
5929
5930
#: bzrlib/errors.py:2364
5931
msgid "Root class for inventory serialization errors"
5932
msgstr ""
5933
5934
#: bzrlib/errors.py:2368
5935
msgid ""
5936
"The inventory was not in the expected format:\n"
5937
" %(msg)s"
5938
msgstr ""
5939
5940
#: bzrlib/errors.py:2377
5941
msgid "This operation requires rich root data storage"
5942
msgstr ""
5943
5944
#: bzrlib/errors.py:2390
5945
msgid "Unrecognised value for BZR_SSH environment variable: %(vendor)s"
5946
msgstr ""
5947
5948
#: bzrlib/errors.py:2399
5949
msgid ""
5950
"Don't know how to handle SSH connections. Please set BZR_SSH environment "
5951
"variable."
5952
msgstr ""
5953
5954
#: bzrlib/errors.py:2406
5955
msgid ""
5956
"Could not determine revno for {%(revision_id)s} because its ancestry shows a "
5957
"ghost at {%(ghost_revision_id)s}"
5958
msgstr ""
5959
5960
#: bzrlib/errors.py:2416
5961
msgid "Ghost revision {%(revision_id)s} cannot be used here."
5962
msgstr ""
5963
5964
#: bzrlib/errors.py:2467
5965
msgid ""
5966
"A merge directive must provide either a bundle or a public branch location."
5967
msgstr ""
5968
5969
#: bzrlib/errors.py:2474
5970
msgid "Bad merge directive payload %(start)r"
5971
msgstr ""
5972
5973
#: bzrlib/errors.py:2484
5974
msgid "Preview patch does not match requested changes."
5975
msgstr ""
5976
5977
#: bzrlib/errors.py:2490
5978
msgid "Patch_type was %(patch_type)s, but no patch was supplied."
5979
msgstr ""
5980
5981
#: bzrlib/errors.py:2500
5982
msgid ""
5983
"Your branch does not have all of the revisions required in order to merge "
5984
"this merge directive and the target location specified in the merge "
5985
"directive is not a branch: %(location)s."
5986
msgstr ""
5987
5988
#: bzrlib/errors.py:2512
5989
msgid "Unsupported entry kind %(kind)s"
5990
msgstr ""
5991
5992
#: bzrlib/errors.py:2520
5993
msgid "Can't subsume %(other_tree)s into %(tree)s. %(reason)s"
5994
msgstr ""
5995
5996
#: bzrlib/errors.py:2530
5997
msgid "Subsume target %(other_tree)s needs to be upgraded."
5998
msgstr ""
5999
6000
#: bzrlib/errors.py:2549
6001
msgid "No such tag: %(tag_name)s"
6002
msgstr ""
6003
6004
#: bzrlib/errors.py:2557
6005
msgid "Tags not supported by %(branch)s; you may be able to use bzr upgrade."
6006
msgstr ""
6007
6008
#: bzrlib/errors.py:2566
6009
msgid "Tag %(tag_name)s already exists."
6010
msgstr ""
6011
6012
#: bzrlib/errors.py:2574
6013
msgid ""
6014
"Did not understand bug identifier %(bug_id)s: %(reason)s. See \"bzr help bugs"
6015
"\" for more information on this feature."
6016
msgstr ""
6017
6018
#: bzrlib/errors.py:2584
6019
msgid ""
6020
"The URL for bug tracker \"%(abbreviation)s\" doesn't contain {id}: %(url)s"
6021
msgstr ""
6022
6023
#: bzrlib/errors.py:2594
6024
msgid ""
6025
"Cannot find registered bug tracker called %(abbreviation)s on %(branch)s"
6026
msgstr ""
6027
6028
#: bzrlib/errors.py:2604
6029
msgid "Invalid line in bugs property: '%(line)s'"
6030
msgstr ""
6031
6032
#: bzrlib/errors.py:2612
6033
msgid "Invalid bug status: '%(status)s'"
6034
msgstr ""
6035
6036
#: bzrlib/errors.py:2620
6037
msgid "Could not understand response from smart server: %(response_tuple)r"
6038
msgstr ""
6039
6040
#: bzrlib/errors.py:2659
6041
msgid "Server sent an unexpected error: %(error_tuple)r"
6042
msgstr ""
6043
6044
#: bzrlib/errors.py:2678
6045
msgid "Unrecognised container format: %(container_format)r"
6046
msgstr ""
6047
6048
#: bzrlib/errors.py:2686
6049
msgid "Unexpected end of container stream"
6050
msgstr ""
6051
6052
#: bzrlib/errors.py:2691
6053
msgid "Unknown record type: %(record_type)r"
6054
msgstr ""
6055
6056
#: bzrlib/errors.py:2699
6057
msgid "Invalid record: %(reason)s"
6058
msgstr ""
6059
6060
#: bzrlib/errors.py:2707
6061
msgid "Container has data after end marker: %(excess)r"
6062
msgstr ""
6063
6064
#: bzrlib/errors.py:2715
6065
msgid "Container has multiple records with the same name: %(name)s"
6066
msgstr ""
6067
6068
#: bzrlib/errors.py:2728
6069
msgid "Corrupt or incompatible data stream: %(reason)s"
6070
msgstr ""
6071
6072
#: bzrlib/errors.py:2736
6073
msgid "SMTP error: %(error)s"
6074
msgstr ""
6075
6076
#: bzrlib/errors.py:2744
6077
msgid "No message supplied."
6078
msgstr ""
6079
6080
#: bzrlib/errors.py:2749
6081
msgid "No mail-to address (--mail-to) or output (-o) specified."
6082
msgstr ""
6083
6084
#: bzrlib/errors.py:2754
6085
msgid "Unknown mail client: %(mail_client)s"
6086
msgstr ""
6087
6088
#: bzrlib/errors.py:2762
6089
msgid ""
6090
"Unable to find mail client with the following names: "
6091
"%(mail_command_list_string)s"
6092
msgstr ""
6093
6094
#: bzrlib/errors.py:2772
6095
msgid "SMTP connection to %(host)s refused"
6096
msgstr ""
6097
6098
#: bzrlib/errors.py:2781
6099
msgid "Please specify smtp_server. No server at default %(host)s."
6100
msgstr ""
6101
6102
#: bzrlib/errors.py:2795
6103
msgid ""
6104
"'%(display_url)s' is not in sync with %(target_url)s. See bzr help sync-for-"
6105
"reconfigure."
6106
msgstr ""
6107
6108
#: bzrlib/errors.py:2807
6109
msgid "'%(display_url)s' is already a branch."
6110
msgstr ""
6111
6112
#: bzrlib/errors.py:2812
6113
msgid "'%(display_url)s' is already a tree."
6114
msgstr ""
6115
6116
#: bzrlib/errors.py:2817
6117
msgid "'%(display_url)s' is already a checkout."
6118
msgstr ""
6119
6120
#: bzrlib/errors.py:2822
6121
msgid "'%(display_url)s' is already a lightweight checkout."
6122
msgstr ""
6123
6124
#: bzrlib/errors.py:2827
6125
msgid "'%(display_url)s' is already using a shared repository."
6126
msgstr ""
6127
6128
#: bzrlib/errors.py:2832
6129
msgid "'%(display_url)s' is already standalone."
6130
msgstr ""
6131
6132
#: bzrlib/errors.py:2837
6133
msgid "Shared repository '%(display_url)s' already creates working trees."
6134
msgstr ""
6135
6136
#: bzrlib/errors.py:2843
6137
msgid ""
6138
"Shared repository '%(display_url)s' already doesn't create working trees."
6139
msgstr ""
6140
6141
#: bzrlib/errors.py:2849
6142
msgid "Requested reconfiguration of '%(display_url)s' is not supported."
6143
msgstr ""
6144
6145
#: bzrlib/errors.py:2854
6146
msgid "No location could be found to bind to at %(display_url)s."
6147
msgstr ""
6148
6149
#: bzrlib/errors.py:2859
6150
msgid ""
6151
"Working tree \"%(display_url)s\" has uncommitted changes (See bzr status)."
6152
"%(more)s"
6153
msgstr ""
6154
6155
#: bzrlib/errors.py:2878
6156
msgid ""
6157
"Working tree \"%(display_url)s\" has shelved changes (See bzr shelve --list)."
6158
"%(more)s"
6159
msgstr ""
6160
6161
#: bzrlib/errors.py:2884
6162
msgid "Variable {%(name)s} is not available."
6163
msgstr ""
6164
6165
#: bzrlib/errors.py:2892
6166
msgid "No template specified."
6167
msgstr ""
6168
6169
#: bzrlib/errors.py:2897
6170
msgid "Unable to create symlink %(path_str)son this platform"
6171
msgstr ""
6172
6173
#: bzrlib/errors.py:2912
6174
msgid ""
6175
"Unsupported timezone format \"%(timezone)s\", options are \"utc\", \"original"
6176
"\", \"local\"."
6177
msgstr ""
6178
6179
#: bzrlib/errors.py:2946
6180
msgid ""
6181
"Unable to encode %(kind)s path %(path)r in user encoding %(user_encoding)s"
6182
msgstr ""
6183
6184
#: bzrlib/errors.py:2958
6185
msgid "The \"%(config_id)s\" configuration does not exist."
6186
msgstr ""
6187
6188
#: bzrlib/errors.py:2966
6189
msgid "The \"%(option_name)s\" configuration option does not exist."
6190
msgstr ""
6191
6192
#: bzrlib/errors.py:2974
6193
msgid "The alias \"%(alias_name)s\" does not exist."
6194
msgstr ""
6195
6196
#: bzrlib/errors.py:2988
6197
msgid "\"%(alias_name)s\" is not a valid location alias."
6198
msgstr ""
6199
6200
#: bzrlib/errors.py:2996
6201
msgid "No %(alias_name)s location assigned."
6202
msgstr ""
6203
6204
#: bzrlib/errors.py:3004
6205
msgid "Cannot bind address \"%(host)s:%(port)i\": %(orig_error)s."
6206
msgstr ""
6207
6208
#: bzrlib/errors.py:3014
6209
msgid "Unknown rules detected: %(unknowns_str)s."
6210
msgstr ""
6211
6212
#: bzrlib/errors.py:3025
6213
msgid "Tip change rejected: %(msg)s"
6214
msgstr ""
6215
6216
#: bzrlib/errors.py:3033
6217
msgid "Shelf corrupt."
6218
msgstr ""
6219
6220
#: bzrlib/errors.py:3038
6221
msgid "Corruption while decompressing repository file%(orig_error)s"
6222
msgstr ""
6223
6224
#: bzrlib/errors.py:3050
6225
msgid "No changes are shelved with id \"%(shelf_id)d\"."
6226
msgstr ""
6227
6228
#: bzrlib/errors.py:3058
6229
msgid "\"%(invalid_id)s\" is not a valid shelf id, try a number instead."
6230
msgstr ""
6231
6232
#: bzrlib/errors.py:3066
6233
msgid "An attempt to access a url outside the server jail was made: '%(url)s'."
6234
msgstr ""
6235
6236
#: bzrlib/errors.py:3074
6237
msgid "The user aborted the operation."
6238
msgstr ""
6239
6240
#: bzrlib/errors.py:3079
6241
msgid "Branching '%(url)s'(%(format)s) must create a working tree."
6242
msgstr ""
6243
6244
#: bzrlib/errors.py:3089
6245
msgid "No such view: %(view_name)s."
6246
msgstr ""
6247
6248
#: bzrlib/errors.py:3099
6249
msgid ""
6250
"Views are not supported by %(tree)s; use 'bzr upgrade' to change your tree "
6251
"to a later format."
6252
msgstr ""
6253
6254
#: bzrlib/errors.py:3108
6255
msgid ""
6256
"Specified file \"%(file_name)s\" is outside the current view: %(view_str)s"
6257
msgstr ""
6258
6259
#: bzrlib/errors.py:3175
6260
msgid "%(bzrdir)r does not support co-located branches."
6261
msgstr ""
6262
6263
#: bzrlib/errors.py:3181
6264
msgid ""
6265
"Unable to determine your name.\n"
6266
"Please, set your name with the 'whoami' command.\n"
6267
"E.g. bzr whoami \"Your Name <name@example.com>\""
6268
msgstr ""
6269
6270
#: bzrlib/errors.py:3190
6271
msgid "Invalid pattern(s) found. %(msg)s"
6272
msgstr ""
6273
6274
#: bzrlib/errors.py:3198
6275
msgid ""
6276
"Branch \"%(branch_url)s\" appears to be bound to itself. Please use `bzr "
6277
"unbind` to fix."
6278
msgstr ""
6279
6280
#: bzrlib/errors.py:3209
6281
msgid "Loop involving %(refs)r while expanding \"%(string)s\"."
6282
msgstr ""
6283
6284
#: bzrlib/errors.py:3218
6285
msgid "Option %(name)s is not defined while expanding \"%(string)s\"."
6286
msgstr ""
6287
6288
#: bzrlib/errors.py:3227
6289
msgid ""
6290
"No compatible object available for operations from %(source)r to %(target)r."
6291
msgstr ""
6292
6293
#: bzrlib/errors.py:3237
6294
msgid ""
6295
"VFS requests over the smart server are not allowed. Encountered: %(method)s, "
6296
"%(arguments)s."
6297
msgstr ""
6298
6299
#: bzrlib/errors.py:3247
6300
msgid ""
6301
"Kind change from %(from_kind)s to %(to_kind)s for %(path)s not supported by "
6302
"format %(format)r"
6303
msgstr ""
6304
6305
#: bzrlib/errors.py:3259
6306
msgid ""
6307
"Missing feature %(feature)s not provided by this version of Bazaar or any "
6308
"plugin."
6309
msgstr ""
6310
6311
#: bzrlib/errors.py:3272
6312
msgid "Binary files section encountered."
6313
msgstr ""
6314
6315
#: bzrlib/errors.py:3280
6316
msgid ""
6317
"Malformed patch header. %(desc)s\n"
6318
"%(line)r"
6319
msgstr ""
6320
6321
#: bzrlib/errors.py:3289
6322
msgid ""
6323
"Malformed hunk header. %(desc)s\n"
6324
"%(line)r"
6325
msgstr ""
6326
6327
#: bzrlib/errors.py:3298
6328
msgid ""
6329
"Malformed line. %(desc)s\n"
6330
"%(line)r"
6331
msgstr ""
6332
6333
#: bzrlib/errors.py:3308
6334
msgid ""
6335
"Text contents mismatch at line %(line_no)d. Original has \"%(orig_line)s\", "
6336
"but patch says it should be \"%(patch_line)s\""
6337
msgstr ""
6338
6339
#: bzrlib/errors.py:3319
6340
msgid "The feature %(feature)s has already been registered."
6341
msgstr ""
6342
6343
#: bzrlib/export_pot.py:252
6344
#, python-format
6345
msgid "Exporting messages from builtin command: %s"
6346
msgstr ""
6347
6348
#: bzrlib/export_pot.py:271
6349
msgid "Exporting messages from plugin command: {0} in {1}"
6350
msgstr ""
6351
6352
#: bzrlib/export_pot.py:292
6353
#, python-format
6354
msgid "Exporting message from error: %s"
6355
msgstr ""
6356
6357
#: bzrlib/fetch.py:98
6358
msgid "Finding revisions"
6359
msgstr ""
6360
6361
#: bzrlib/fetch.py:103
6362
msgid "Fetching revisions"
6363
msgstr ""
6364
6365
#: bzrlib/foreign.py:262
6366
msgid "Push into a different VCS without any custom bzr metadata."
6367
msgstr ""
6368
6369
#: bzrlib/foreign.py:264
6370
msgid ""
6371
"This will afterwards rebase the local branch on the remote\n"
6372
"branch unless the --no-rebase option is used, in which case \n"
6373
"the two branches will be out of sync after the push. "
6374
msgstr ""
6375
6376
# help of 'no-rebase' option of 'dpush' command
6377
#: bzrlib/foreign.py:277
6378
msgid "Do not rebase after push."
6379
msgstr ""
6380
6381
#: bzrlib/foreign.py:311
6382
#, python-format
6383
msgid "Using saved location: %s\n"
6384
msgstr ""
6385
6386
#: bzrlib/foreign.py:321
6387
msgid ""
6388
"{0!r} and {1!r} are in the same VCS, lossy push not necessary. Please use "
6389
"regular push."
6390
msgstr ""
6391
6392
#: bzrlib/gpg.py:119 bzrlib/gpg.py:460
6393
msgid "{0} commits with valid signatures"
6394
msgstr ""
6395
6396
#: bzrlib/gpg.py:123 bzrlib/gpg.py:465
6397
msgid "{0} commit with unknown key"
6398
msgid_plural "{0} commits with unknown keys"
6399
msgstr[0] ""
6400
msgstr[1] ""
6401
6402
#: bzrlib/gpg.py:129 bzrlib/gpg.py:472
6403
msgid "{0} commit not valid"
6404
msgid_plural "{0} commits not valid"
6405
msgstr[0] ""
6406
msgstr[1] ""
6407
6408
#: bzrlib/gpg.py:135 bzrlib/gpg.py:479
6409
msgid "{0} commit not signed"
6410
msgid_plural "{0} commits not signed"
6411
msgstr[0] ""
6412
msgstr[1] ""
6413
6414
#: bzrlib/gpg.py:141 bzrlib/gpg.py:486
6415
msgid "{0} commit with key now expired"
6416
msgid_plural "{0} commits with key now expired"
6417
msgstr[0] ""
6418
msgstr[1] ""
6419
6420
#: bzrlib/gpg.py:343
6421
msgid "No GnuPG key results for pattern: {0}"
6422
msgstr ""
6423
6424
#: bzrlib/gpg.py:386
6425
msgid "{0} signed {1} commit"
6426
msgid_plural "{0} signed {1} commits"
6427
msgstr[0] ""
6428
msgstr[1] ""
6429
6430
#: bzrlib/gpg.py:403 bzrlib/gpg.py:419
6431
msgid "{0} commit by author {1}"
6432
msgid_plural "{0} commits by author {1}"
6433
msgstr[0] ""
6434
msgstr[1] ""
6435
6436
#: bzrlib/gpg.py:433
6437
msgid "Unknown key {0} signed {1} commit"
6438
msgid_plural "Unknown key {0} signed {1} commits"
6439
msgstr[0] ""
6440
msgstr[1] ""
6441
6442
#: bzrlib/gpg.py:452
6443
msgid "{0} commit by author {1} with key {2} now expired"
6444
msgid_plural "{0} commits by author {1} with key {2} now expired"
6445
msgstr[0] ""
6446
msgstr[1] ""
6447
6448
#: bzrlib/groupcompress.py:1739
6449
#, python-format
6450
msgid "Insert claimed random_id=True, but then inserted %r two times"
6451
msgstr ""
6452
6453
#: bzrlib/hooks.py:331
6454
#, python-format
6455
msgid "Introduced in: %s"
6456
msgstr ""
6457
6458
#: bzrlib/hooks.py:334
6459
#, python-format
6460
msgid "Deprecated in: %s"
6461
msgstr ""
6462
6463
#: bzrlib/knit.py:1766 bzrlib/knit.py:1802
6464
msgid "Walking content"
6465
msgstr ""
6466
6467
#: bzrlib/knit.py:3330
6468
msgid "annotating"
6469
msgstr ""
6470
6471
#: bzrlib/lock.py:548
6472
msgid "{0!r} was {1} locked again"
6473
msgstr ""
6474
6475
#: bzrlib/lockdir.py:321
6476
#, python-format
6477
msgid "error removing pending lock: %s"
6478
msgstr ""
6479
6480
#: bzrlib/lockdir.py:616
6481
msgid "Unable to obtain"
6482
msgstr ""
6483
6484
#: bzrlib/lockdir.py:618
6485
msgid "Lock owner changed for"
6486
msgstr ""
6487
6488
#: bzrlib/lockdir.py:620
6489
msgid "{0} lock {1} {2}."
6490
msgstr ""
6491
6492
#: bzrlib/lockdir.py:627
6493
#, python-format
6494
msgid "Will continue to try until %s, unless you press Ctrl-C."
6495
msgstr ""
6496
6497
#: bzrlib/lockdir.py:629
6498
msgid "See \"bzr help break-lock\" for more."
6499
msgstr ""
6500
6501
#: bzrlib/lockdir.py:739
6502
#, python-format
6503
msgid ""
6504
"held by %(user)s on %(hostname)s (process #%(pid)s), acquired %(time_ago)s"
6505
msgstr ""
6506
6507
#: bzrlib/log.py:572
6508
msgid "--exclude-common-ancestry requires two different revisions"
6509
msgstr ""
6510
6511
#: bzrlib/log.py:574
6512
#, python-format
6513
msgid "invalid direction %r"
6514
msgstr ""
6515
6516
#: bzrlib/log.py:662
6517
msgid "Start revision not found in history of end revision."
6518
msgstr ""
6519
6520
#: bzrlib/log.py:1080 bzrlib/log.py:1138
6521
msgid "Logging revision 0 is invalid."
6522
msgstr ""
6523
6524
#: bzrlib/log.py:1082 bzrlib/log.py:1140
6525
msgid "Start revision must be older than the end revision."
6526
msgstr ""
6527
6528
#: bzrlib/log.py:1827
6529
#, python-format
6530
msgid "unknown log formatter: %r"
6531
msgstr ""
6532
6533
#: bzrlib/log.py:2123
6534
msgid "fixes bug"
6535
msgid_plural "fixes bugs"
6536
msgstr[0] ""
6537
msgstr[1] ""
6538
6539
#: bzrlib/merge.py:689
6540
msgid "All changes applied successfully."
6541
msgstr ""
6542
6543
#: bzrlib/merge.py:691
6544
#, python-format
6545
msgid "%d conflicts encountered."
6546
msgstr ""
6547
6548
#: bzrlib/merge.py:845 bzrlib/merge.py:1933
6549
msgid "Preparing file merge"
6550
msgstr ""
6551
6552
#: bzrlib/multiparent.py:426
6553
msgid "Importing revisions"
6554
msgstr ""
6555
6556
# help of 'help' option
6557
#: bzrlib/option.py:526
6558
msgid "Show help message."
6559
msgstr ""
6560
6561
# help of 'quiet' option
6562
#: bzrlib/option.py:528
6563
msgid "Only display errors and warnings."
6564
msgstr ""
6565
6566
# help of 'usage' option
6567
#: bzrlib/option.py:531
6568
msgid "Show usage message and options."
6569
msgstr ""
6570
6571
# help of 'verbose' option
6572
#: bzrlib/option.py:533
6573
msgid "Display more information."
6574
msgstr ""
6575
6576
# help of 'change' option
6577
#: bzrlib/option.py:541
6578
msgid ""
6579
"Select changes introduced by the specified revision. See also \"help "
6580
"revisionspec\"."
6581
msgstr ""
6582
6583
# help of 'directory' option
6584
#: bzrlib/option.py:543
6585
msgid "Branch to operate on, instead of working directory."
6586
msgstr ""
6587
6588
# help of 'log-format=long' option
6589
#: bzrlib/option.py:545
6590
msgid "Detailed log format."
6591
msgstr ""
6592
6593
# help of 'log-format=gnu-changelog' option
6594
#: bzrlib/option.py:545
6595
msgid "Format used by GNU ChangeLog files."
6596
msgstr ""
6597
6598
# help of 'log-format=line' option
6599
#: bzrlib/option.py:545
6600
msgid "Log format with one line per revision."
6601
msgstr ""
6602
6603
# help of 'log-format=short' option
6604
#: bzrlib/option.py:545
6605
msgid "Moderately short log format."
6606
msgstr ""
6607
6608
# help of 'log-format' option
6609
#: bzrlib/option.py:545
6610
msgid "Use specified log format."
6611
msgstr ""
6612
6613
# title of 'log-format' option
6614
#: bzrlib/option.py:547
6615
msgid "Log format"
6616
msgstr ""
6617
6618
# help of 'merge-type=lca' option
6619
#: bzrlib/option.py:549
6620
msgid "LCA-newness merge."
6621
msgstr ""
6622
6623
# help of 'merge-type=diff3' option
6624
#: bzrlib/option.py:549
6625
msgid "Merge using external diff3."
6626
msgstr ""
6627
6628
# help of 'merge-type=merge3' option
6629
#: bzrlib/option.py:549
6630
msgid "Native diff3-style merge."
6631
msgstr ""
6632
6633
# help of 'merge-type' option
6634
#: bzrlib/option.py:549
6635
msgid "Select a particular merge algorithm."
6636
msgstr ""
6637
6638
# help of 'merge-type=weave' option
6639
#: bzrlib/option.py:549
6640
msgid "Weave-based merge."
6641
msgstr ""
6642
6643
# title of 'merge-type' option
6644
#: bzrlib/option.py:551
6645
msgid "Merge algorithm"
6646
msgstr ""
6647
6648
# help of 'message' option
6649
#: bzrlib/option.py:554
6650
msgid "Message string."
6651
msgstr ""
6652
6653
# help of 'null' option
6654
#: bzrlib/option.py:556
6655
msgid "Use an ASCII NUL (\\0) separator rather than a newline."
6656
msgstr ""
6657
6658
# help of 'overwrite' option
6659
#: bzrlib/option.py:558
6660
msgid "Ignore differences between branches and overwrite unconditionally."
6661
msgstr ""
6662
6663
# help of 'remember' option
6664
#: bzrlib/option.py:560
6665
msgid "Remember the specified location as a default."
6666
msgstr ""
6667
6668
# help of 'reprocess' option
6669
#: bzrlib/option.py:562
6670
msgid "Reprocess to reduce spurious conflicts."
6671
msgstr ""
6672
6673
# help of 'revision' option
6674
#: bzrlib/option.py:566
6675
msgid "See \"help revisionspec\" for details."
6676
msgstr ""
6677
6678
# help of 'show-ids' option
6679
#: bzrlib/option.py:568
6680
msgid "Show internal object ids."
6681
msgstr ""
6682
6683
# help of 'timezone' option
6684
#: bzrlib/option.py:571
6685
msgid "Display timezone as local, original, or utc."
6686
msgstr ""
6687
6688
#: bzrlib/osutils.py:100
6689
msgid "Parameter {0!r} encoding is unsupported by {1} application locale."
6690
msgstr ""
6691
6692
#: bzrlib/osutils.py:220
6693
msgid "lstat/stat of ({0!r}): {1!r}"
6694
msgstr ""
6695
6696
#: bzrlib/osutils.py:997 bzrlib/osutils.py:1008
6697
#, python-format
6698
msgid "sorry, %r not allowed in path"
6699
msgstr ""
6700
6701
#: bzrlib/osutils.py:1226
6702
#, python-format
6703
msgid "%r is too short to calculate a relative path"
6704
msgstr ""
6705
6706
#: bzrlib/plugin.py:143
6707
#, python-format
6708
msgid "\"%s\" is not a valid <plugin_name>@<plugin_path> description "
6709
msgstr ""
6710
6711
# help of 'plugin' option of 'bash-completion' command
6712
#: bzrlib/plugins/bash_completion/bashcomp.py:411
6713
msgid "Enable completions for the selected plugin (default: all plugins)"
6714
msgstr ""
6715
6716
#: bzrlib/plugins/bash_completion/bashcomp.py:412
6717
msgid "Generate a shell function for bash command line completion."
6718
msgstr ""
6719
6720
#: bzrlib/plugins/bash_completion/bashcomp.py:414
6721
msgid ""
6722
"This command generates a shell function which can be used by bash to\n"
6723
"automatically complete the currently typed command when the user presses\n"
6724
"the completion key (usually tab)."
6725
msgstr ""
6726
6727
#: bzrlib/plugins/bash_completion/bashcomp.py:418
6728
msgid ""
6729
"Commonly used like this:\n"
6730
" eval \"`bzr bash-completion`\""
6731
msgstr ""
6732
6733
# help of 'function-name' option of 'bash-completion' command
6734
#: bzrlib/plugins/bash_completion/bashcomp.py:424
6735
msgid "Name of the generated function (default: _bzr)"
6736
msgstr ""
6737
6738
# help of 'function-only' option of 'bash-completion' command
6739
#: bzrlib/plugins/bash_completion/bashcomp.py:426
6740
msgid "Generate only the shell function, don't enable it"
6741
msgstr ""
6742
6743
#: bzrlib/plugins/launchpad/__init__.py:81
6744
msgid "Register a branch with launchpad.net."
6745
msgstr ""
6746
6747
#: bzrlib/plugins/launchpad/__init__.py:83
6748
msgid ""
6749
"This command lists a bzr branch in the directory of branches on\n"
6750
"launchpad.net. Registration allows the branch to be associated with\n"
6751
"bugs or specifications."
6752
msgstr ""
6753
6754
#: bzrlib/plugins/launchpad/__init__.py:87
6755
msgid ""
6756
"Before using this command you must register the project to which the\n"
6757
"branch belongs, and create an account for yourself on launchpad.net."
6758
msgstr ""
6759
6760
#: bzrlib/plugins/launchpad/__init__.py:90
6761
msgid ""
6762
"arguments:\n"
6763
" public_url: The publicly visible url for the branch to register.\n"
6764
" This must be an http or https url (which Launchpad can read\n"
6765
" from to access the branch). Local file urls, SFTP urls, and\n"
6766
" bzr+ssh urls will not work.\n"
6767
" If no public_url is provided, bzr will use the configured\n"
6768
" public_url if there is one for the current branch, and\n"
6769
" otherwise error."
6770
msgstr ""
6771
6772
#: bzrlib/plugins/launchpad/__init__.py:99
6773
msgid ""
6774
"example:\n"
6775
" bzr register-branch http://foo.com/bzr/fooproject.mine \\\n"
6776
" --project fooproject"
6777
msgstr ""
6778
6779
# help of 'project' option of 'register-branch' command
6780
#: bzrlib/plugins/launchpad/__init__.py:106
6781
msgid "Launchpad project short name to associate with the branch."
6782
msgstr ""
6783
6784
# help of 'branch-name' option of 'register-branch' command
6785
#: bzrlib/plugins/launchpad/__init__.py:113
6786
msgid ""
6787
"Short name for the branch; by default taken from the last component of the "
6788
"url."
6789
msgstr ""
6790
6791
# help of 'branch-title' option of 'register-branch' command
6792
#: bzrlib/plugins/launchpad/__init__.py:117
6793
msgid "One-sentence description of the branch."
6794
msgstr ""
6795
6796
# help of 'branch-description' option of 'register-branch' command
6797
#: bzrlib/plugins/launchpad/__init__.py:120
6798
msgid "Longer description of the purpose or contents of the branch."
6799
msgstr ""
6800
6801
# help of 'author' option of 'register-branch' command
6802
#: bzrlib/plugins/launchpad/__init__.py:123
6803
msgid "Branch author's email address, if not yourself."
6804
msgstr ""
6805
6806
# help of 'link-bug' option of 'register-branch' command
6807
#: bzrlib/plugins/launchpad/__init__.py:126
6808
msgid "The bug this branch fixes."
6809
msgstr ""
6810
6811
# help of 'dry-run' option of 'register-branch' command
6812
#: bzrlib/plugins/launchpad/__init__.py:129
6813
msgid "Prepare the request but don't actually send it."
6814
msgstr ""
6815
6816
#: bzrlib/plugins/launchpad/__init__.py:151
6817
msgid ""
6818
"register-branch requires a public branch url - see bzr help register-branch."
6819
msgstr ""
6820
6821
#: bzrlib/plugins/launchpad/__init__.py:159
6822
msgid "--product is deprecated; please use --project."
6823
msgstr ""
6824
6825
#: bzrlib/plugins/launchpad/__init__.py:191
6826
msgid "Open a Launchpad branch page in your web browser."
6827
msgstr ""
6828
6829
# help of 'dry-run' option of 'launchpad-open' command
6830
#: bzrlib/plugins/launchpad/__init__.py:196
6831
msgid "Do not actually open the browser. Just say the URL we would use."
6832
msgstr ""
6833
6834
#: bzrlib/plugins/launchpad/__init__.py:231
6835
#, python-format
6836
msgid "Opening %s in web browser"
6837
msgstr ""
6838
6839
#: bzrlib/plugins/launchpad/__init__.py:241
6840
msgid "Show or set the Launchpad user ID."
6841
msgstr ""
6842
6843
#: bzrlib/plugins/launchpad/__init__.py:243
6844
msgid ""
6845
"When communicating with Launchpad, some commands need to know your\n"
6846
"Launchpad user ID. This command can be used to set or show the\n"
6847
"user ID that Bazaar will use for such communication."
6848
msgstr ""
6849
6850
#: bzrlib/plugins/launchpad/__init__.py:247
6851
msgid ""
6852
":Examples:\n"
6853
" Show the Launchpad ID of the current user::"
6854
msgstr ""
6855
6856
#: bzrlib/plugins/launchpad/__init__.py:250
6857
msgid " bzr launchpad-login"
6858
msgstr ""
6859
6860
#: bzrlib/plugins/launchpad/__init__.py:252
6861
msgid " Set the Launchpad ID of the current user to 'bob'::"
6862
msgstr ""
6863
6864
#: bzrlib/plugins/launchpad/__init__.py:254
6865
msgid " bzr launchpad-login bob"
6866
msgstr ""
6867
6868
# help of 'no-check' option of 'launchpad-login' command
6869
#: bzrlib/plugins/launchpad/__init__.py:261
6870
msgid "Don't check that the user name is valid."
6871
msgstr ""
6872
6873
#: bzrlib/plugins/launchpad/__init__.py:276
6874
#: bzrlib/plugins/launchpad/__init__.py:287
6875
msgid "Launchpad user ID exists and has SSH keys.\n"
6876
msgstr ""
6877
6878
#: bzrlib/plugins/launchpad/__init__.py:279
6879
msgid "No Launchpad user ID configured.\n"
6880
msgstr ""
6881
6882
#: bzrlib/plugins/launchpad/__init__.py:290
6883
#, python-format
6884
msgid "Launchpad user ID set to '%s'.\n"
6885
msgstr ""
6886
6887
#: bzrlib/plugins/launchpad/__init__.py:298
6888
msgid "Ask Launchpad to mirror a branch now."
6889
msgstr ""
6890
6891
#: bzrlib/plugins/launchpad/__init__.py:318
6892
msgid "Propose merging a branch on Launchpad."
6893
msgstr ""
6894
6895
#: bzrlib/plugins/launchpad/__init__.py:320
6896
msgid ""
6897
"This will open your usual editor to provide the initial comment. When it\n"
6898
"has created the proposal, it will open it in your default web browser."
6899
msgstr ""
6900
6901
#: bzrlib/plugins/launchpad/__init__.py:323
6902
msgid ""
6903
"The branch will be proposed to merge into SUBMIT_BRANCH. If SUBMIT_BRANCH\n"
6904
"is not supplied, the remembered submit branch will be used. If no submit\n"
6905
"branch is remembered, the development focus will be used."
6906
msgstr ""
6907
6908
#: bzrlib/plugins/launchpad/__init__.py:327
6909
msgid ""
6910
"By default, the SUBMIT_BRANCH's review team will be requested to review\n"
6911
"the merge proposal. This can be overriden by specifying --review (-R).\n"
6912
"The parameter the launchpad account name of the desired reviewer. This\n"
6913
"may optionally be followed by '=' and the review type. For example:"
6914
msgstr ""
6915
6916
#: bzrlib/plugins/launchpad/__init__.py:332
6917
msgid " bzr lp-propose-merge --review jrandom --review review-team=qa"
6918
msgstr ""
6919
6920
#: bzrlib/plugins/launchpad/__init__.py:334
6921
msgid ""
6922
"This will propose a merge, request \"jrandom\" to perform a review of\n"
6923
"unspecified type, and request \"review-team\" to perform a \"qa\" review."
6924
msgstr ""
6925
6926
# help of 'staging' option of 'lp-propose-merge' command
6927
#: bzrlib/plugins/launchpad/__init__.py:339
6928
msgid "Propose the merge on staging."
6929
msgstr ""
6930
6931
# help of 'message' option of 'lp-propose-merge' command
6932
#: bzrlib/plugins/launchpad/__init__.py:341
6933
msgid "Commit message."
6934
msgstr ""
6935
6936
# help of 'approve' option of 'lp-propose-merge' command
6937
#: bzrlib/plugins/launchpad/__init__.py:343
6938
msgid "Mark the proposal as approved immediately."
6939
msgstr ""
6940
6941
# help of 'review' option of 'lp-propose-merge' command
6942
#: bzrlib/plugins/launchpad/__init__.py:345
6943
msgid "Requested reviewer and optional type."
6944
msgstr ""
6945
6946
#: bzrlib/plugins/launchpad/__init__.py:382
6947
msgid "Find the proposal to merge this revision."
6948
msgstr ""
6949
6950
#: bzrlib/plugins/launchpad/__init__.py:384
6951
msgid ""
6952
"Finds the merge proposal(s) that discussed landing the specified revision.\n"
6953
"This works only if the selected branch was the merge proposal target, and\n"
6954
"if the merged_revno is recorded for the merge proposal. The proposal(s)\n"
6955
"are opened in a web browser."
6956
msgstr ""
6957
6958
#: bzrlib/plugins/launchpad/__init__.py:389
6959
msgid ""
6960
"Any revision involved in the merge may be specified-- the revision in\n"
6961
"which the merge was performed, or one of the revisions that was merged."
6962
msgstr ""
6963
6964
#: bzrlib/plugins/launchpad/__init__.py:392
6965
msgid "So, to find the merge proposal that reviewed line 1 of README::"
6966
msgstr ""
6967
6968
#: bzrlib/plugins/launchpad/__init__.py:394
6969
msgid " bzr lp-find-proposal -r annotate:README:1"
6970
msgstr ""
6971
6972
#: bzrlib/plugins/launchpad/__init__.py:409
6973
msgid "No review found."
6974
msgstr ""
6975
6976
#: bzrlib/plugins/launchpad/__init__.py:410
6977
#, python-format
6978
msgid "%d proposals(s) found."
6979
msgstr ""
6980
6981
#: bzrlib/plugins/launchpad/__init__.py:420
6982
msgid "Finding revision-id"
6983
msgstr ""
6984
6985
#: bzrlib/plugins/launchpad/__init__.py:427
6986
msgid "Finding merge"
6987
msgstr ""
6988
6989
#: bzrlib/plugins/launchpad/__init__.py:432
6990
msgid "Finding revno"
6991
msgstr ""
6992
6993
#: bzrlib/plugins/launchpad/__init__.py:437
6994
msgid "Finding Launchpad branch"
6995
msgstr ""
6996
6997
#: bzrlib/plugins/launchpad/__init__.py:440
6998
msgid "Finding proposals"
6999
msgstr ""
7000
7001
#: bzrlib/plugins/launchpad/account.py:66
7002
msgid "Setting ssh/sftp usernames for launchpad.net."
7003
msgstr ""
7004
7005
#: bzrlib/plugins/launchpad/lp_api.py:241
7006
#: bzrlib/plugins/launchpad/lp_api.py:246
7007
#, python-format
7008
msgid "%s is not registered on Launchpad"
7009
msgstr ""
7010
7011
#: bzrlib/plugins/launchpad/lp_api.py:256
7012
#, python-format
7013
msgid "%s has no development focus."
7014
msgstr ""
7015
7016
#: bzrlib/plugins/launchpad/lp_api.py:261
7017
#, python-format
7018
msgid "development focus %s has no branch."
7019
msgstr ""
7020
7021
#: bzrlib/plugins/launchpad/lp_api.py:266
7022
#, python-format
7023
msgid "source package %s has no branch."
7024
msgstr ""
7025
7026
#: bzrlib/plugins/launchpad/lp_api.py:270
7027
#, python-format
7028
msgid "%s has no associated product or source package."
7029
msgstr ""
7030
7031
#: bzrlib/plugins/launchpad/lp_api.py:282
7032
#, python-format
7033
msgid "%s is already up-to-date."
7034
msgstr ""
7035
7036
#: bzrlib/plugins/launchpad/lp_api.py:289
7037
#, python-format
7038
msgid "Pushing to %s"
7039
msgstr ""
7040
7041
#: bzrlib/plugins/launchpad/lp_directory.py:170
7042
msgid ""
7043
"resolution for {0}\n"
7044
" local: {1}\n"
7045
" remote: {2}"
7046
msgstr ""
7047
7048
#: bzrlib/plugins/launchpad/lp_propose.py:149
7049
#, python-format
7050
msgid "There is already a branch merge proposal: %s"
7051
msgstr ""
7052
7053
#: bzrlib/plugins/weave_fmt/bzrdir.py:236
7054
msgid "pb parameter to convert() is deprecated"
7055
msgstr ""
7056
7057
#: bzrlib/plugins/weave_fmt/bzrdir.py:239
7058
msgid "starting upgrade from format 4 to 5"
7059
msgstr ""
7060
7061
#: bzrlib/plugins/weave_fmt/bzrdir.py:249
7062
msgid "note: upgrade may be faster if all store files are ungzipped first"
7063
msgstr ""
7064
7065
#: bzrlib/plugins/weave_fmt/bzrdir.py:278
7066
msgid "converting revision"
7067
msgstr ""
7068
7069
#: bzrlib/plugins/weave_fmt/bzrdir.py:283
7070
msgid "upgraded to weaves:"
7071
msgstr ""
7072
7073
#: bzrlib/plugins/weave_fmt/bzrdir.py:284
7074
#, python-format
7075
msgid "%6d revisions and inventories"
7076
msgstr ""
7077
7078
#: bzrlib/plugins/weave_fmt/bzrdir.py:286
7079
#, python-format
7080
msgid "%6d revisions not present"
7081
msgstr ""
7082
7083
#: bzrlib/plugins/weave_fmt/bzrdir.py:288
7084
#, python-format
7085
msgid "%6d texts"
7086
msgstr ""
7087
7088
#: bzrlib/plugins/weave_fmt/bzrdir.py:324
7089
msgid "writing weave"
7090
msgstr ""
7091
7092
#: bzrlib/plugins/weave_fmt/bzrdir.py:328
7093
#: bzrlib/plugins/weave_fmt/bzrdir.py:330
7094
msgid "inventory"
7095
msgstr ""
7096
7097
#: bzrlib/plugins/weave_fmt/bzrdir.py:347
7098
msgid "write revision"
7099
msgstr ""
7100
7101
#: bzrlib/plugins/weave_fmt/bzrdir.py:361
7102
msgid "loading revision"
7103
msgstr ""
7104
7105
#: bzrlib/plugins/weave_fmt/bzrdir.py:366
7106
#, python-format
7107
msgid "revision {%s} not present in branch; will be converted as a ghost"
7108
msgstr ""
7109
7110
#: bzrlib/plugins/weave_fmt/bzrdir.py:506
7111
msgid "starting upgrade from format 5 to 6"
7112
msgstr ""
7113
7114
#: bzrlib/plugins/weave_fmt/bzrdir.py:516
7115
#, python-format
7116
msgid "adding prefixes to %s"
7117
msgstr ""
7118
7119
#: bzrlib/plugins/weave_fmt/bzrdir.py:556
7120
msgid "starting upgrade from format 6 to metadir"
7121
msgstr ""
7122
7123
#: bzrlib/plugins/weave_fmt/bzrdir.py:564
7124
msgid "Removing ancestry.weave"
7125
msgstr ""
7126
7127
#: bzrlib/plugins/weave_fmt/bzrdir.py:569
7128
msgid "Finding branch files"
7129
msgstr ""
7130
7131
#: bzrlib/plugins/weave_fmt/bzrdir.py:579
7132
msgid "Upgrading repository"
7133
msgstr ""
7134
7135
#: bzrlib/plugins/weave_fmt/bzrdir.py:589
7136
msgid "Upgrading branch"
7137
msgstr ""
7138
7139
#: bzrlib/plugins/weave_fmt/bzrdir.py:612
7140
msgid "No working tree."
7141
msgstr ""
7142
7143
#: bzrlib/plugins/weave_fmt/bzrdir.py:619
7144
msgid "Upgrading working tree"
7145
msgstr ""
7146
7147
#: bzrlib/plugins/weave_fmt/bzrdir.py:640
7148
#, python-format
7149
msgid "Make %s lock"
7150
msgstr ""
7151
7152
#: bzrlib/plugins/weave_fmt/bzrdir.py:651
7153
#, python-format
7154
msgid "Moving %s"
7155
msgstr ""
7156
7157
#: bzrlib/push.py:56
7158
msgid "Created new branch."
7159
msgstr ""
7160
7161
#: bzrlib/push.py:98
7162
#, python-format
7163
msgid ""
7164
"Target directory %s already contains a .bzr directory, but it is not valid."
7165
msgstr ""
7166
7167
#: bzrlib/push.py:101
7168
#, python-format
7169
msgid ""
7170
"Target directory %s already exists, but does not have a .bzr directory. "
7171
"Supply --use-existing-dir to push there anyway."
7172
msgstr ""
7173
7174
#: bzrlib/push.py:122
7175
#, python-format
7176
msgid "Too many redirections trying to make %s."
7177
msgstr ""
7178
7179
#: bzrlib/push.py:147
7180
msgid ""
7181
"These branches have diverged. See \"bzr help diverged-branches\" for more "
7182
"information."
7183
msgstr ""
7184
7185
#: bzrlib/push.py:151
7186
#, python-format
7187
msgid ""
7188
"It is not possible to losslessly push to %s. You may want to use dpush "
7189
"instead."
7190
msgstr ""
7191
7192
#: bzrlib/push.py:157
7193
#, python-format
7194
msgid ""
7195
"At %s you have a valid .bzr control directory, but not a branch or "
7196
"repository. This is an unsupported configuration. Please move the target "
7197
"directory out of the way and try again."
7198
msgstr ""
7199
7200
#: bzrlib/reconcile.py:97
7201
#, python-format
7202
msgid "Reconciling branch %s"
7203
msgstr ""
7204
7205
#: bzrlib/reconcile.py:103
7206
#, python-format
7207
msgid "Reconciling repository %s"
7208
msgstr ""
7209
7210
#: bzrlib/reconcile.py:105
7211
msgid "Reconciling repository"
7212
msgstr ""
7213
7214
#: bzrlib/reconcile.py:111
7215
#, python-format
7216
msgid "%s cannot canonicalize CHKs."
7217
msgstr ""
7218
7219
#: bzrlib/reconcile.py:119
7220
msgid "Reconcile aborted: revision index has inconsistent parents."
7221
msgstr ""
7222
7223
#: bzrlib/reconcile.py:121
7224
msgid "Run \"bzr check\" for more details."
7225
msgstr ""
7226
7227
#: bzrlib/reconcile.py:123
7228
msgid "Reconciliation complete."
7229
msgstr ""
7230
7231
#: bzrlib/reconcile.py:166
7232
msgid "Fixing last revision info {0} => {1}"
7233
msgstr ""
7234
7235
#: bzrlib/reconcile.py:173
7236
msgid "revision_history ok."
7237
msgstr ""
7238
7239
#: bzrlib/reconcile.py:234
7240
msgid "Reading inventory data"
7241
msgstr ""
7242
7243
#: bzrlib/reconcile.py:254 bzrlib/reconcile.py:384
7244
msgid "Inventory ok."
7245
msgstr ""
7246
7247
#: bzrlib/reconcile.py:256 bzrlib/reconcile.py:386
7248
msgid "Backing up inventory"
7249
msgstr ""
7250
7251
#: bzrlib/reconcile.py:258
7252
msgid "Backup inventory created."
7253
msgstr ""
7254
7255
#: bzrlib/reconcile.py:274 bzrlib/reconcile.py:405
7256
msgid "Writing weave"
7257
msgstr ""
7258
7259
#: bzrlib/reconcile.py:277 bzrlib/reconcile.py:408
7260
msgid "Inventory regenerated."
7261
msgstr ""
7262
7263
#: bzrlib/reconcile.py:371 bzrlib/reconcile.py:373 bzrlib/reconcile.py:376
7264
msgid "Reading indexes"
7265
msgstr ""
7266
7267
#: bzrlib/reconcile.py:380 bzrlib/reconcile.py:382
7268
msgid "Checking unused inventories"
7269
msgstr ""
7270
7271
#: bzrlib/reconcile.py:388
7272
msgid "Backup Inventory created"
7273
msgstr ""
7274
7275
#: bzrlib/reconcile.py:446
7276
msgid "Fixing text parents"
7277
msgstr ""
7278
7279
#: bzrlib/reconfigure.py:54
7280
msgid "{0} is now stacked on {1}\n"
7281
msgstr ""
7282
7283
#: bzrlib/reconfigure.py:69
7284
#, python-format
7285
msgid "%s is now not stacked\n"
7286
msgstr ""
7287
7288
#: bzrlib/remote.py:1180 bzrlib/repository.py:289
7289
#, python-format
7290
msgid "bzr: ERROR (ignored): %s"
7291
msgstr ""
7292
7293
#: bzrlib/remote.py:2493
7294
msgid "Copying repository content as tarball..."
7295
msgstr ""
7296
7297
#: bzrlib/rename_map.py:69
7298
msgid "Calculating hashes"
7299
msgstr ""
7300
7301
#: bzrlib/rename_map.py:107
7302
msgid "Determining hash hits"
7303
msgstr ""
7304
7305
#: bzrlib/rename_map.py:242
7306
msgid "{0} => {1}"
7307
msgstr ""
7308
7309
#: bzrlib/repository.py:1787
7310
msgid "Moving repository to repository.backup"
7311
msgstr ""
7312
7313
#: bzrlib/repository.py:1794
7314
msgid "Creating new repository"
7315
msgstr ""
7316
7317
#: bzrlib/repository.py:1799
7318
msgid "Copying content"
7319
msgstr ""
7320
7321
#: bzrlib/repository.py:1803
7322
msgid "Deleting old repository content"
7323
msgstr ""
7324
7325
#: bzrlib/repository.py:1805
7326
msgid "repository converted"
7327
msgstr ""
7328
7329
#: bzrlib/revisionspec.py:903
7330
msgid "Using {0} {1}"
7331
msgstr ""
7332
7333
#: bzrlib/send.py:58
7334
#, python-format
7335
msgid "Mail client \"%s\" does not support specifying body"
7336
msgstr ""
7337
7338
#: bzrlib/send.py:62
7339
msgid "--remember requires a branch to be specified."
7340
msgstr ""
7341
7342
#: bzrlib/send.py:77
7343
msgid "No submit branch known or specified"
7344
msgstr ""
7345
7346
#: bzrlib/send.py:80
7347
msgid "Using saved {0} location \"{1}\" to determine what changes to submit."
7348
msgstr ""
7349
7350
#: bzrlib/send.py:98
7351
#, python-format
7352
msgid "No such send format '%s'."
7353
msgstr ""
7354
7355
#: bzrlib/send.py:114
7356
msgid "bzr send takes at most two one revision identifiers"
7357
msgstr ""
7358
7359
#: bzrlib/send.py:127
7360
msgid "No revisions to submit."
7361
msgstr ""
7362
7363
#: bzrlib/send.py:139
7364
msgid ""
7365
"- not supported for merge directives that use more than one output file."
7366
msgstr ""
7367
7368
#: bzrlib/send.py:185
7369
msgid "Format 0.9 does not permit bundle with no patch"
7370
msgstr ""
7371
7372
#: bzrlib/shelf_ui.py:46
7373
#, python-format
7374
msgid "Shelve adding file \"%(path)s\"?"
7375
msgstr ""
7376
7377
#: bzrlib/shelf_ui.py:47
7378
msgid "Shelve binary changes?"
7379
msgstr ""
7380
7381
#: bzrlib/shelf_ui.py:48
7382
msgid "Shelve changing \"%s\" from %(other)s to %(this)s?"
7383
msgstr ""
7384
7385
#: bzrlib/shelf_ui.py:50
7386
#, python-format
7387
msgid "Shelve removing file \"%(path)s\"?"
7388
msgstr ""
7389
7390
#: bzrlib/shelf_ui.py:51
7391
#, python-format
7392
msgid "Shelve %d change(s)?"
7393
msgstr ""
7394
7395
#: bzrlib/shelf_ui.py:52
7396
msgid "Shelve?"
7397
msgstr ""
7398
7399
#: bzrlib/shelf_ui.py:53
7400
#, python-format
7401
msgid ""
7402
"Shelve changing target of \"%(path)s\" from \"%(other)s\" to \"%(this)s\"?"
7403
msgstr ""
7404
7405
#: bzrlib/shelf_ui.py:55
7406
#, python-format
7407
msgid "Shelve renaming \"%(other)s\" => \"%(this)s\"?"
7408
msgstr ""
7409
7410
#: bzrlib/shelf_ui.py:70
7411
#, python-format
7412
msgid "Changes shelved with id \"%d\"."
7413
msgstr ""
7414
7415
#: bzrlib/shelf_ui.py:74
7416
msgid "Selected changes destroyed."
7417
msgstr ""
7418
7419
#: bzrlib/shelf_ui.py:78
7420
msgid "Selected changes:"
7421
msgstr ""
7422
7423
#: bzrlib/shelf_ui.py:98
7424
#, python-format
7425
msgid "Delete file \"%(path)s\"?"
7426
msgstr ""
7427
7428
#: bzrlib/shelf_ui.py:99
7429
msgid "Apply binary changes?"
7430
msgstr ""
7431
7432
#: bzrlib/shelf_ui.py:100
7433
#, python-format
7434
msgid "Change \"%(path)s\" from %(this)s to %(other)s?"
7435
msgstr ""
7436
7437
#: bzrlib/shelf_ui.py:102
7438
#, python-format
7439
msgid "Add file \"%(path)s\"?"
7440
msgstr ""
7441
7442
#: bzrlib/shelf_ui.py:103
7443
#, python-format
7444
msgid "Apply %d change(s)?"
7445
msgstr ""
7446
7447
#: bzrlib/shelf_ui.py:104
7448
msgid "Apply change?"
7449
msgstr ""
7450
7451
#: bzrlib/shelf_ui.py:105
7452
#, python-format
7453
msgid "Change target of \"%(path)s\" from \"%(this)s\" to \"%(other)s\"?"
7454
msgstr ""
7455
7456
#: bzrlib/shelf_ui.py:107
7457
#, python-format
7458
msgid "Rename \"%(this)s\" => \"%(other)s\"?"
7459
msgstr ""
7460
7461
#: bzrlib/shelf_ui.py:402
7462
msgid "No changes are shelved."
7463
msgstr ""
7464
7465
#: bzrlib/shelf_ui.py:460
7466
#, python-format
7467
msgid "Using changes with id \"%d\"."
7468
msgstr ""
7469
7470
#: bzrlib/shelf_ui.py:464
7471
#, python-format
7472
msgid "Message: %s"
7473
msgstr ""
7474
7475
#: bzrlib/shelf_ui.py:476
7476
#, python-format
7477
msgid "Deleted changes with id \"%d\"."
7478
msgstr ""
7479
7480
#: bzrlib/smart/medium.py:714
7481
msgid "HPSS calls: {0} ({1} vfs) {2}"
7482
msgstr ""
7483
7484
#: bzrlib/smart/server.py:169
7485
msgid "Requested to stop gracefully"
7486
msgstr ""
7487
7488
#: bzrlib/smart/server.py:179
7489
#, python-format
7490
msgid "Waiting for %d client(s) to finish"
7491
msgstr ""
7492
7493
#: bzrlib/smart/server.py:185
7494
#, python-format
7495
msgid "Still waiting for %d client(s) to finish"
7496
msgstr ""
7497
7498
#: bzrlib/smart/server.py:219
7499
#, python-format
7500
msgid "listening socket error: %s"
7501
msgstr ""
7502
7503
#: bzrlib/smart/server.py:452
7504
#, python-format
7505
msgid "listening on port: %s"
7506
msgstr ""
7507
7508
#: bzrlib/switch.py:69
7509
msgid "Pending merges must be committed or reverted before using switch."
7510
msgstr ""
7511
7512
#: bzrlib/switch.py:96
7513
msgid ""
7514
"Cannot switch as local commits found in the checkout. Commit these to the "
7515
"bound branch or use --force to throw them away."
7516
msgstr ""
7517
7518
#: bzrlib/switch.py:101
7519
#, python-format
7520
msgid ""
7521
"Unable to connect to current master branch %(target)s: %(error)s To switch "
7522
"anyway, use --force."
7523
msgstr ""
7524
7525
#: bzrlib/switch.py:110
7526
msgid "Cannot switch a branch, only a checkout."
7527
msgstr ""
7528
7529
#: bzrlib/switch.py:146
7530
#, python-format
7531
msgid "Tree is up to date at revision %d."
7532
msgstr ""
7533
7534
#: bzrlib/switch.py:152
7535
#, python-format
7536
msgid "Updated to revision %d."
7537
msgstr ""
7538
7539
#: bzrlib/transform.py:1730 bzrlib/transform.py:1741 bzrlib/transform.py:1743
7540
msgid "Apply phase"
7541
msgstr ""
7542
7543
#: bzrlib/transform.py:1769 bzrlib/transform.py:1837
7544
msgid "removing file"
7545
msgstr ""
7546
7547
#: bzrlib/transform.py:1787 bzrlib/transform.py:1872
7548
msgid "adding file"
7549
msgstr ""
7550
7551
#: bzrlib/transform.py:2587
7552
msgid "Building tree"
7553
msgstr ""
7554
7555
#: bzrlib/transform.py:2677 bzrlib/transform.py:2704
7556
msgid "Adding file contents"
7557
msgstr ""
7558
7559
#: bzrlib/transform.py:3024
7560
msgid "Resolution pass"
7561
msgstr ""
7562
7563
#: bzrlib/transport/ftp/_gssapi.py:88
7564
#, python-format
7565
msgid "Authenticated as %s"
7566
msgstr ""
7567
7568
#: bzrlib/tree.py:634
7569
msgid "*** {0} content-filter: {1} => {2!r}"
7570
msgstr ""
7571
7572
#: bzrlib/upgrade.py:77
7573
#, python-format
7574
msgid "This is a checkout. The branch (%s) needs to be upgraded separately."
7575
msgstr ""
7576
7577
#: bzrlib/upgrade.py:100
7578
#, python-format
7579
msgid "cannot upgrade from bzrdir format %s"
7580
msgstr ""
7581
7582
#: bzrlib/upgrade.py:103
7583
#, python-format
7584
msgid "starting upgrade of %s"
7585
msgstr ""
7586
7587
#: bzrlib/upgrade.py:110
7588
msgid "finished"
7589
msgstr ""
7590
7591
#: bzrlib/upgrade.py:120
7592
msgid "Deleting backup.bzr"
7593
msgstr ""
7594
7595
#: bzrlib/upgrade.py:151
7596
msgid ""
7597
"\n"
7598
"SUMMARY: {0} upgrades attempted, {1} succeeded, {2} failed"
7599
msgstr ""
7600
7601
#: bzrlib/upgrade.py:208
7602
#, python-format
7603
msgid "Found %d dependent branches - upgrading ..."
7604
msgstr ""
7605
7606
#: bzrlib/upgrade.py:276
7607
msgid "Upgrading bzrdirs"
7608
msgstr ""
7609
7610
#: bzrlib/upgrade.py:282
7611
#, python-format
7612
msgid "Upgrading %s"
7613
msgstr ""
7614
7615
#: bzrlib/upgrade.py:283
7616
msgid "Upgrading {0} {1} ..."
7617
msgstr ""
7618
7619
#: bzrlib/upgrade.py:301
7620
msgid "Removing backup ..."
7621
msgstr ""
7622
7623
#: bzrlib/upgrade.py:305
7624
msgid "failed to clean-up {0}: {1}"
7625
msgstr ""
7626
7627
#: bzrlib/vf_repository.py:1090
7628
msgid "inventories"
7629
msgstr ""
7630
7631
#: bzrlib/vf_repository.py:1116
7632
msgid "texts"
7633
msgstr ""
7634
7635
#: bzrlib/vf_repository.py:1621 bzrlib/vf_repository.py:1630
7636
msgid "Calculating text parents"
7637
msgstr ""
7638
7639
#: bzrlib/vf_repository.py:1706
7640
msgid "Fetch texts"
7641
msgstr ""
7642
7643
#: bzrlib/vf_repository.py:2535
7644
msgid "loading text store"
7645
msgstr ""
7646
7647
#: bzrlib/vf_repository.py:2541
7648
msgid "checking text graph"
7649
msgstr ""
7650
7651
#: bzrlib/vf_repository.py:2995 bzrlib/vf_repository.py:3009
7652
#: bzrlib/vf_repository.py:3124
7653
msgid "Transferring revisions"
7654
msgstr ""
7655
7656
#: bzrlib/win32utils.py:146
7657
msgid "Failed to GetProcessMemoryInfo()"
7658
msgstr ""
7659
7660
#: bzrlib/win32utils.py:167
7661
msgid "Cannot debug memory on win32 without ctypes or win32process"
7662
msgstr ""
7663
7664
#: bzrlib/win32utils.py:172
7665
msgid "WorkingSize {0:>7}KiB\tPeakWorking {1:>7}KiB\t{2}"
7666
msgstr ""
7667
7668
#: bzrlib/win32utils.py:180
7669
#, python-format
7670
msgid "WorkingSize %8d KiB"
7671
msgstr ""
7672
7673
#: bzrlib/win32utils.py:181
7674
#, python-format
7675
msgid "PeakWorking %8d KiB"
7676
msgstr ""
7677
7678
#: bzrlib/win32utils.py:182
7679
#, python-format
7680
msgid "PagefileUsage %8d KiB"
7681
msgstr ""
7682
7683
#: bzrlib/win32utils.py:183
7684
#, python-format
7685
msgid "PeakPagefileUsage %8d KiB"
7686
msgstr ""
7687
7688
#: bzrlib/win32utils.py:185
7689
#, python-format
7690
msgid "PrivateUsage %8d KiB"
7691
msgstr ""
7692
7693
#: bzrlib/win32utils.py:186
7694
#, python-format
7695
msgid "PageFaultCount %8d"
7696
msgstr ""
7697
7698
#: bzrlib/workingtree.py:1478
7699
msgid "Rerun update after fixing the conflicts."
7700
msgstr ""
7701
7702
#: dummy/help_topics/authentication/summary.txt:1
7703
msgid "Information on configuring authentication"
7704
msgstr ""
7705
7706
#: dummy/help_topics/basic/detail.txt:1
7707
msgid ""
7708
"Bazaar 2.5b5 -- a free distributed version-control tool\n"
7709
"http://bazaar.canonical.com/"
7710
msgstr ""
7711
7712
#: dummy/help_topics/basic/detail.txt:4
7713
msgid ""
7714
"Basic commands:\n"
7715
" bzr init makes this directory a versioned branch\n"
7716
" bzr branch make a copy of another branch"
7717
msgstr ""
7718
7719
#: dummy/help_topics/basic/detail.txt:8
7720
msgid ""
7721
" bzr add make files or directories versioned\n"
7722
" bzr ignore ignore a file or pattern\n"
7723
" bzr mv move or rename a versioned file"
7724
msgstr ""
7725
7726
#: dummy/help_topics/basic/detail.txt:12
7727
msgid ""
7728
" bzr status summarize changes in working copy\n"
7729
" bzr diff show detailed diffs"
7730
msgstr ""
7731
7732
#: dummy/help_topics/basic/detail.txt:15
7733
msgid ""
7734
" bzr merge pull in changes from another branch\n"
7735
" bzr commit save some or all changes\n"
7736
" bzr send send changes via email"
7737
msgstr ""
7738
7739
#: dummy/help_topics/basic/detail.txt:19
7740
msgid ""
7741
" bzr log show history of changes\n"
7742
" bzr check validate storage"
7743
msgstr ""
7744
7745
#: dummy/help_topics/basic/detail.txt:22
7746
msgid ""
7747
" bzr help init more help on e.g. init command\n"
7748
" bzr help commands list all commands\n"
7749
" bzr help topics list all help topics\n"
7750
msgstr ""
7751
7752
#: dummy/help_topics/basic/summary.txt:1
7753
msgid "Basic commands"
7754
msgstr ""
7755
7756
#: dummy/help_topics/branches/detail.txt:1
7757
msgid "Branches"
7758
msgstr ""
7759
7760
#: dummy/help_topics/branches/detail.txt:3
7761
msgid ""
7762
"A branch consists of the state of a project, including all of its\n"
7763
"history. All branches have a repository associated (which is where the\n"
7764
"branch history is stored), but multiple branches may share the same\n"
7765
"repository (a shared repository). Branches can be copied and merged."
7766
msgstr ""
7767
7768
#: dummy/help_topics/branches/detail.txt:8
7769
msgid ""
7770
"In addition, one branch may be bound to another one. Binding to another\n"
7771
"branch indicates that commits which happen in this branch must also \n"
7772
"happen in the other branch. Bazaar ensures consistency by not allowing \n"
7773
"commits when the two branches are out of date. In order for a commit \n"
7774
"to succeed, it may be necessary to update the current branch using \n"
7775
"``bzr update``."
7776
msgstr ""
7777
7778
#: dummy/help_topics/branches/detail.txt:15
7779
#: dummy/help_topics/checkouts/detail.txt:66
7780
#: dummy/help_topics/repositories/detail.txt:36
7781
msgid "Related commands::"
7782
msgstr ""
7783
7784
#: dummy/help_topics/branches/detail.txt:17
7785
msgid ""
7786
" init Change a directory into a versioned branch.\n"
7787
" branch Create a new branch that is a copy of an existing branch.\n"
7788
" merge Perform a three-way merge.\n"
7789
" bind Bind a branch to another one.\n"
7790
msgstr ""
7791
7792
#: dummy/help_topics/branches/summary.txt:1
7793
msgid "Information on what a branch is"
7794
msgstr ""
7795
7796
#: dummy/help_topics/bugs/summary.txt:1
7797
msgid "Bug tracker settings"
7798
msgstr ""
7799
7800
#: dummy/help_topics/checkouts/detail.txt:1
7801
msgid "Checkouts"
7802
msgstr ""
7803
7804
#: dummy/help_topics/checkouts/detail.txt:3
7805
msgid ""
7806
"Checkouts are source trees that are connected to a branch, so that when\n"
7807
"you commit in the source tree, the commit goes into that branch. They\n"
7808
"allow you to use a simpler, more centralized workflow, ignoring some of\n"
7809
"Bazaar's decentralized features until you want them. Using checkouts\n"
7810
"with shared repositories is very similar to working with SVN or CVS, but\n"
7811
"doesn't have the same restrictions. And using checkouts still allows\n"
7812
"others working on the project to use whatever workflow they like."
7813
msgstr ""
7814
7815
#: dummy/help_topics/checkouts/detail.txt:11
7816
msgid ""
7817
"A checkout is created with the bzr checkout command (see \"help checkout"
7818
"\").\n"
7819
"You pass it a reference to another branch, and it will create a local copy\n"
7820
"for you that still contains a reference to the branch you created the\n"
7821
"checkout from (the master branch). Then if you make any commits they will "
7822
"be\n"
7823
"made on the other branch first. This creates an instant mirror of your work, "
7824
"or\n"
7825
"facilitates lockstep development, where each developer is working together,\n"
7826
"continuously integrating the changes of others."
7827
msgstr ""
7828
7829
#: dummy/help_topics/checkouts/detail.txt:19
7830
msgid ""
7831
"However the checkout is still a first class branch in Bazaar terms, so that\n"
7832
"you have the full history locally. As you have a first class branch you "
7833
"can\n"
7834
"also commit locally if you want, for instance due to the temporary loss af "
7835
"a\n"
7836
"network connection. Use the --local option to commit to do this. All the "
7837
"local\n"
7838
"commits will then be made on the master branch the next time you do a non-"
7839
"local\n"
7840
"commit."
7841
msgstr ""
7842
7843
#: dummy/help_topics/checkouts/detail.txt:26
7844
msgid ""
7845
"If you are using a checkout from a shared branch you will periodically want "
7846
"to\n"
7847
"pull in all the changes made by others. This is done using the \"update\"\n"
7848
"command. The changes need to be applied before any non-local commit, but\n"
7849
"Bazaar will tell you if there are any changes and suggest that you use this\n"
7850
"command when needed."
7851
msgstr ""
7852
7853
#: dummy/help_topics/checkouts/detail.txt:32
7854
msgid ""
7855
"It is also possible to create a \"lightweight\" checkout by passing the\n"
7856
"--lightweight flag to checkout. A lightweight checkout is even closer to an\n"
7857
"SVN checkout in that it is not a first class branch, it mainly consists of "
7858
"the\n"
7859
"working tree. This means that any history operations must query the master\n"
7860
"branch, which could be slow if a network connection is involved. Also, as "
7861
"you\n"
7862
"don't have a local branch, then you cannot commit locally."
7863
msgstr ""
7864
7865
#: dummy/help_topics/checkouts/detail.txt:39
7866
msgid ""
7867
"Lightweight checkouts work best when you have fast reliable access to the\n"
7868
"master branch. This means that if the master branch is on the same disk or "
7869
"LAN\n"
7870
"a lightweight checkout will be faster than a heavyweight one for any "
7871
"commands\n"
7872
"that modify the revision history (as only one copy of the branch needs to\n"
7873
"be updated). Heavyweight checkouts will generally be faster for any command\n"
7874
"that uses the history but does not change it, but if the master branch is "
7875
"on\n"
7876
"the same disk then there won't be a noticeable difference."
7877
msgstr ""
7878
7879
#: dummy/help_topics/checkouts/detail.txt:47
7880
msgid ""
7881
"Another possible use for a checkout is to use it with a treeless repository\n"
7882
"containing your branches, where you maintain only one working tree by\n"
7883
"switching the master branch that the checkout points to when you want to\n"
7884
"work on a different branch."
7885
msgstr ""
7886
7887
#: dummy/help_topics/checkouts/detail.txt:52
7888
msgid ""
7889
"Obviously to commit on a checkout you need to be able to write to the "
7890
"master\n"
7891
"branch. This means that the master branch must be accessible over a "
7892
"writeable\n"
7893
"protocol , such as sftp://, and that you have write permissions at the "
7894
"other\n"
7895
"end. Checkouts also work on the local file system, so that all that matters "
7896
"is\n"
7897
"file permissions."
7898
msgstr ""
7899
7900
#: dummy/help_topics/checkouts/detail.txt:58
7901
msgid ""
7902
"You can change the master of a checkout by using the \"switch\" command "
7903
"(see\n"
7904
"\"help switch\"). This will change the location that the commits are sent "
7905
"to.\n"
7906
"The \"bind\" command can also be used to turn a normal branch into a heavy\n"
7907
"checkout. If you would like to convert your heavy checkout into a normal\n"
7908
"branch so that every commit is local, you can use the \"unbind\" command. To "
7909
"see\n"
7910
"whether or not a branch is bound or not you can use the \"info\" command. If "
7911
"the\n"
7912
"branch is bound it will tell you the location of the bound branch."
7913
msgstr ""
7914
7915
#: dummy/help_topics/checkouts/detail.txt:68
7916
msgid ""
7917
" checkout Create a checkout. Pass --lightweight to get a lightweight\n"
7918
" checkout\n"
7919
" update Pull any changes in the master branch in to your checkout\n"
7920
" commit Make a commit that is sent to the master branch. If you have\n"
7921
" a heavy checkout then the --local option will commit to the\n"
7922
" checkout without sending the commit to the master\n"
7923
" switch Change the master branch that the commits in the checkout "
7924
"will\n"
7925
" be sent to\n"
7926
" bind Turn a standalone branch into a heavy checkout so that any\n"
7927
" commits will be sent to the master branch\n"
7928
" unbind Turn a heavy checkout into a standalone branch so that any\n"
7929
" commits are only made locally\n"
7930
" info Displays whether a branch is bound or unbound. If the branch "
7931
"is\n"
7932
" bound, then it will also display the location of the bound "
7933
"branch\n"
7934
msgstr ""
7935
7936
#: dummy/help_topics/checkouts/summary.txt:1
7937
msgid "Information on what a checkout is"
7938
msgstr ""
7939
7940
#: dummy/help_topics/commands/summary.txt:1
7941
msgid "Basic help for all commands"
7942
msgstr ""
7943
7944
#: dummy/help_topics/configuration/summary.txt:1
7945
msgid "Details on the configuration settings available"
7946
msgstr ""
7947
7948
#: dummy/help_topics/conflict-types/summary.txt:1
7949
msgid "Types of conflicts and what to do about them"
7950
msgstr ""
7951
7952
#: dummy/help_topics/content-filters/summary.txt:1
7953
msgid "Conversion of content into/from working trees"
7954
msgstr ""
7955
7956
#: dummy/help_topics/criss-cross/detail.txt:1
7957
msgid "Criss-Cross"
7958
msgstr ""
7959
7960
#: dummy/help_topics/criss-cross/detail.txt:3
7961
msgid ""
7962
"A criss-cross in the branch history can cause the default merge technique\n"
7963
"to emit more conflicts than would normally be expected."
7964
msgstr ""
7965
7966
#: dummy/help_topics/criss-cross/detail.txt:6
7967
msgid ""
7968
"In complex merge cases, ``bzr merge --lca`` or ``bzr merge --weave`` may "
7969
"give\n"
7970
"better results. You may wish to ``bzr revert`` the working tree and merge\n"
7971
"again. Alternatively, use ``bzr remerge`` on particular conflicted files."
7972
msgstr ""
7973
7974
#: dummy/help_topics/criss-cross/detail.txt:10
7975
msgid ""
7976
"Criss-crosses occur in a branch's history if two branches merge the same "
7977
"thing\n"
7978
"and then merge one another, or if two branches merge one another at the "
7979
"same\n"
7980
"time. They can be avoided by having each branch only merge from or into a\n"
7981
"designated central branch (a \"star topology\")."
7982
msgstr ""
7983
7984
#: dummy/help_topics/criss-cross/detail.txt:15
7985
msgid ""
7986
"Criss-crosses cause problems because of the way merge works. Bazaar's "
7987
"default\n"
7988
"merge is a three-way merger; in order to merge OTHER into THIS, it must\n"
7989
"find a basis for comparison, BASE. Using BASE, it can determine whether\n"
7990
"differences between THIS and OTHER are due to one side adding lines, or\n"
7991
"from another side removing lines."
7992
msgstr ""
7993
7994
#: dummy/help_topics/criss-cross/detail.txt:21
7995
msgid ""
7996
"Criss-crosses mean there is no good choice for a base. Selecting the "
7997
"recent\n"
7998
"merge points could cause one side's changes to be silently discarded.\n"
7999
"Selecting older merge points (which Bazaar does) mean that extra conflicts\n"
8000
"are emitted."
8001
msgstr ""
8002
8003
#: dummy/help_topics/criss-cross/detail.txt:26
8004
msgid ""
8005
"The ``weave`` merge type is not affected by this problem because it uses\n"
8006
"line-origin detection instead of a basis revision to determine the cause of\n"
8007
"differences.\n"
8008
msgstr ""
8009
8010
#: dummy/help_topics/criss-cross/summary.txt:1
8011
msgid "Information on criss-cross merging"
8012
msgstr ""
8013
8014
#: dummy/help_topics/current-formats/summary.txt:1
8015
msgid "Current storage formats"
8016
msgstr ""
8017
8018
#: dummy/help_topics/debug-flags/summary.txt:1
8019
msgid "Options to show or record debug information"
8020
msgstr ""
8021
8022
#: dummy/help_topics/diverged-branches/summary.txt:1
8023
msgid "How to fix diverged branches"
8024
msgstr ""
8025
8026
#: dummy/help_topics/env-variables/detail.txt:1
8027
msgid "Environment Variables"
8028
msgstr ""
8029
8030
#: dummy/help_topics/env-variables/detail.txt:3
8031
msgid ""
8032
"=================== "
8033
"===========================================================\n"
8034
"BZRPATH Path where bzr is to look for shell plugin external\n"
8035
" commands.\n"
8036
"BZR_EMAIL E-Mail address of the user. Overrides EMAIL.\n"
8037
"EMAIL E-Mail address of the user.\n"
8038
"BZR_EDITOR Editor for editing commit messages. Overrides EDITOR.\n"
8039
"EDITOR Editor for editing commit messages.\n"
8040
"BZR_PLUGIN_PATH Paths where bzr should look for plugins.\n"
8041
"BZR_DISABLE_PLUGINS Plugins that bzr should not load.\n"
8042
"BZR_PLUGINS_AT Plugins to load from a directory not in "
8043
"BZR_PLUGIN_PATH.\n"
8044
"BZR_HOME Directory holding .bazaar config dir. Overrides HOME.\n"
8045
"BZR_HOME (Win32) Directory holding bazaar config dir. Overrides APPDATA "
8046
"and\n"
8047
" HOME.\n"
8048
"BZR_REMOTE_PATH Full name of remote 'bzr' command (for bzr+ssh:// "
8049
"URLs).\n"
8050
"BZR_SSH Path to SSH client, or one of paramiko, openssh, "
8051
"sshcorp,\n"
8052
" plink or lsh.\n"
8053
"BZR_LOG Location of .bzr.log (use '/dev/null' to suppress log).\n"
8054
"BZR_LOG (Win32) Location of .bzr.log (use 'NUL' to suppress log).\n"
8055
"BZR_COLUMNS Override implicit terminal width.\n"
8056
"BZR_CONCURRENCY Number of processes that can be run concurrently "
8057
"(selftest)\n"
8058
"BZR_PROGRESS_BAR Override the progress display. Values are 'none' or "
8059
"'text'.\n"
8060
"BZR_PDB Control whether to launch a debugger on error.\n"
8061
"BZR_SIGQUIT_PDB Control whether SIGQUIT behaves normally or invokes a\n"
8062
" breakin debugger.\n"
8063
"BZR_TEXTUI_INPUT Force console input mode for prompts to line-based "
8064
"(instead\n"
8065
" of char-based).\n"
8066
"=================== "
8067
"===========================================================\n"
8068
msgstr ""
8069
8070
#: dummy/help_topics/env-variables/summary.txt:1
8071
msgid "Environment variable names and values"
8072
msgstr ""
8073
8074
#: dummy/help_topics/eol/summary.txt:1
8075
msgid "Information on end-of-line handling"
8076
msgstr ""
8077
8078
#: dummy/help_topics/files/detail.txt:1
8079
msgid "Files"
8080
msgstr ""
8081
8082
#: dummy/help_topics/files/detail.txt:3
8083
msgid ""
8084
":On Unix: ~/.bazaar/bazaar.conf\n"
8085
":On Windows: C:\\\\Documents and Settings\\\\username\\\\Application Data\\"
8086
"\\bazaar\\\\2.0\\\\bazaar.conf"
8087
msgstr ""
8088
8089
#: dummy/help_topics/files/detail.txt:6
8090
msgid ""
8091
"Contains the user's default configuration. The section ``[DEFAULT]`` is\n"
8092
"used to define general configuration that will be applied everywhere.\n"
8093
"The section ``[ALIASES]`` can be used to create command aliases for\n"
8094
"commonly used options."
8095
msgstr ""
8096
8097
#: dummy/help_topics/files/detail.txt:11
8098
msgid "A typical config file might look something like::"
8099
msgstr ""
8100
8101
#: dummy/help_topics/files/detail.txt:13
8102
msgid ""
8103
" [DEFAULT]\n"
8104
" email=John Doe <jdoe@isp.com>"
8105
msgstr ""
8106
8107
#: dummy/help_topics/files/detail.txt:16
8108
msgid ""
8109
" [ALIASES]\n"
8110
" commit = commit --strict\n"
8111
" log10 = log --short -r -10..-1\n"
8112
msgstr ""
8113
8114
#: dummy/help_topics/files/summary.txt:1
8115
msgid "Information on configuration and log files"
8116
msgstr ""
8117
8118
#: dummy/help_topics/formats/detail.txt:1
8119
msgid "Storage Formats"
8120
msgstr ""
8121
8122
#: dummy/help_topics/formats/detail.txt:3
8123
msgid ""
8124
"To ensure that older clients do not access data incorrectly,\n"
8125
"Bazaar's policy is to introduce a new storage format whenever\n"
8126
"new features requiring new metadata are added. New storage\n"
8127
"formats may also be introduced to improve performance and\n"
8128
"scalability."
8129
msgstr ""
8130
8131
#: dummy/help_topics/formats/detail.txt:9
8132
msgid ""
8133
"The newest format, 2a, is highly recommended. If your\n"
8134
"project is not using 2a, then you should suggest to the\n"
8135
"project owner to upgrade."
8136
msgstr ""
8137
8138
#: dummy/help_topics/formats/detail.txt:13
8139
msgid ""
8140
"\n"
8141
".. note::"
8142
msgstr ""
8143
8144
#: dummy/help_topics/formats/detail.txt:16
8145
msgid ""
8146
" Some of the older formats have two variants:\n"
8147
" a plain one and a rich-root one. The latter include an additional\n"
8148
" field about the root of the tree. There is no performance cost\n"
8149
" for using a rich-root format but you cannot easily merge changes\n"
8150
" from a rich-root format into a plain format. As a consequence,\n"
8151
" moving a project to a rich-root format takes some co-ordination\n"
8152
" in that all contributors need to upgrade their repositories\n"
8153
" around the same time. 2a and all future formats will be\n"
8154
" implicitly rich-root."
8155
msgstr ""
8156
8157
#: dummy/help_topics/formats/detail.txt:26
8158
msgid ""
8159
"See :doc:`current-formats-help` for the complete list of\n"
8160
"currently supported formats. See :doc:`other-formats-help` for\n"
8161
"descriptions of any available experimental and deprecated formats.\n"
8162
msgstr ""
8163
8164
#: dummy/help_topics/formats/summary.txt:1
8165
msgid "Information on choosing a storage format"
8166
msgstr ""
8167
8168
#: dummy/help_topics/global-options/detail.txt:1
8169
msgid "Global Options"
8170
msgstr ""
8171
8172
#: dummy/help_topics/global-options/detail.txt:3
8173
msgid ""
8174
"These options may be used with any command, and may appear in front of any\n"
8175
"command. (e.g. ``bzr --profile help``)."
8176
msgstr ""
8177
8178
#: dummy/help_topics/global-options/detail.txt:6
8179
msgid ""
8180
"--version Print the version number. Must be supplied before the "
8181
"command.\n"
8182
"--no-aliases Do not process command aliases when running this command.\n"
8183
"--builtin Use the built-in version of a command, not the plugin "
8184
"version.\n"
8185
" This does not suppress other plugin effects.\n"
8186
"--no-plugins Do not process any plugins.\n"
8187
"--no-l10n Do not translate messages.\n"
8188
"--concurrency Number of processes that can be run concurrently (selftest)."
8189
msgstr ""
8190
8191
#: dummy/help_topics/global-options/detail.txt:14
8192
msgid ""
8193
"--profile Profile execution using the hotshot profiler.\n"
8194
"--lsprof Profile execution using the lsprof profiler.\n"
8195
"--lsprof-file Profile execution using the lsprof profiler, and write the\n"
8196
" results to a specified file. If the filename ends with \".txt"
8197
"\",\n"
8198
" text format will be used. If the filename either starts "
8199
"with\n"
8200
" \"callgrind.out\" or end with \".callgrind\", the output will "
8201
"be\n"
8202
" formatted for use with KCacheGrind. Otherwise, the output\n"
8203
" will be a pickle.\n"
8204
"--coverage Generate line coverage report in the specified directory."
8205
msgstr ""
8206
8207
#: dummy/help_topics/global-options/detail.txt:24
8208
msgid ""
8209
"-Oname=value Override the ``name`` config option setting it to ``value`` "
8210
"for\n"
8211
" the duration of the command. This can be used multiple times "
8212
"if\n"
8213
" several options need to be overridden."
8214
msgstr ""
8215
8216
#: dummy/help_topics/global-options/detail.txt:28
8217
msgid ""
8218
"See http://doc.bazaar.canonical.com/developers/profiling.html for more\n"
8219
"information on profiling."
8220
msgstr ""
8221
8222
#: dummy/help_topics/global-options/detail.txt:31
8223
msgid ""
8224
"A number of debug flags are also available to assist troubleshooting and\n"
8225
"development. See :doc:`debug-flags-help`.\n"
8226
msgstr ""
8227
8228
#: dummy/help_topics/global-options/summary.txt:1
8229
msgid "Options that control how Bazaar runs"
8230
msgstr ""
8231
8232
#: dummy/help_topics/hidden-commands/summary.txt:1
8233
msgid "All hidden commands"
8234
msgstr ""
8235
8236
#: dummy/help_topics/hooks/summary.txt:1
8237
msgid "Points at which custom processing can be added"
8238
msgstr ""
8239
8240
#: dummy/help_topics/launchpad/detail.txt:1
8241
msgid "Integration with Launchpad.net"
8242
msgstr ""
8243
8244
#: dummy/help_topics/launchpad/detail.txt:3
8245
msgid ""
8246
"Launchpad.net provides free Bazaar branch hosting with integrated bug and\n"
8247
"specification tracking."
8248
msgstr ""
8249
8250
#: dummy/help_topics/launchpad/detail.txt:6
8251
msgid ""
8252
"The bzr client (through the plugin called 'launchpad') has special\n"
8253
"features to communicate with Launchpad:"
8254
msgstr ""
8255
8256
#: dummy/help_topics/launchpad/detail.txt:9
8257
msgid ""
8258
" * The launchpad-login command tells Bazaar your Launchpad user name. "
8259
"This\n"
8260
" is then used by the 'lp:' transport to download your branches using\n"
8261
" bzr+ssh://."
8262
msgstr ""
8263
8264
#: dummy/help_topics/launchpad/detail.txt:13
8265
msgid ""
8266
" * The 'lp:' transport uses Launchpad as a directory service: for "
8267
"example\n"
8268
" 'lp:bzr' and 'lp:python' refer to the main branches of the relevant\n"
8269
" projects and may be branched, logged, etc. You can also use the 'lp:'\n"
8270
" transport to refer to specific branches, e.g. lp:~bzr/bzr/trunk."
8271
msgstr ""
8272
8273
#: dummy/help_topics/launchpad/detail.txt:18
8274
msgid ""
8275
" * The 'lp:' bug tracker alias can expand launchpad bug numbers to their\n"
8276
" URLs for use with 'bzr commit --fixes', e.g. 'bzr commit --fixes "
8277
"lp:12345'\n"
8278
" will record a revision property that marks that revision as fixing\n"
8279
" Launchpad bug 12345. When you push that branch to Launchpad it will\n"
8280
" automatically be linked to the bug report."
8281
msgstr ""
8282
8283
#: dummy/help_topics/launchpad/detail.txt:24
8284
msgid ""
8285
" * The register-branch command tells Launchpad about the url of a\n"
8286
" public branch. Launchpad will then mirror the branch, display\n"
8287
" its contents and allow it to be attached to bugs and other\n"
8288
" objects."
8289
msgstr ""
8290
8291
#: dummy/help_topics/launchpad/detail.txt:29
8292
msgid "For more information see http://help.launchpad.net/\n"
8293
msgstr ""
8294
8295
#: dummy/help_topics/launchpad/summary.txt:1
8296
msgid "Using Bazaar with Launchpad.net"
8297
msgstr ""
8298
8299
#: dummy/help_topics/location-alias/summary.txt:1
8300
msgid "Aliases for remembered locations"
8301
msgstr ""
8302
8303
#: dummy/help_topics/log-formats/summary.txt:1
8304
msgid "Details on the logging formats available"
8305
msgstr ""
8306
8307
#: dummy/help_topics/other-formats/summary.txt:1
8308
msgid "Experimental and deprecated storage formats"
8309
msgstr ""
8310
8311
#: dummy/help_topics/patterns/summary.txt:1
8312
msgid "Information on the pattern syntax"
8313
msgstr ""
8314
8315
#: dummy/help_topics/repositories/detail.txt:1
8316
msgid "Repositories"
8317
msgstr ""
8318
8319
#: dummy/help_topics/repositories/detail.txt:3
8320
msgid ""
8321
"Repositories in Bazaar are where committed information is stored. There is\n"
8322
"a repository associated with every branch."
8323
msgstr ""
8324
8325
#: dummy/help_topics/repositories/detail.txt:6
8326
msgid ""
8327
"Repositories are a form of database. Bzr will usually maintain this for\n"
8328
"good performance automatically, but in some situations (e.g. when doing\n"
8329
"very many commits in a short time period) you may want to ask bzr to\n"
8330
"optimise the database indices. This can be done by the 'bzr pack' command."
8331
msgstr ""
8332
8333
#: dummy/help_topics/repositories/detail.txt:11
8334
msgid ""
8335
"By default just running 'bzr init' will create a repository within the new\n"
8336
"branch but it is possible to create a shared repository which allows "
8337
"multiple\n"
8338
"branches to share their information in the same location. When a new branch "
8339
"is\n"
8340
"created it will first look to see if there is a containing shared repository "
8341
"it\n"
8342
"can use."
8343
msgstr ""
8344
8345
#: dummy/help_topics/repositories/detail.txt:17
8346
msgid ""
8347
"When two branches of the same project share a repository, there is\n"
8348
"generally a large space saving. For some operations (e.g. branching\n"
8349
"within the repository) this translates in to a large time saving."
8350
msgstr ""
8351
8352
#: dummy/help_topics/repositories/detail.txt:21
8353
msgid ""
8354
"To create a shared repository use the init-repository command (or the alias\n"
8355
"init-repo). This command takes the location of the repository to create. "
8356
"This\n"
8357
"means that 'bzr init-repository repo' will create a directory named 'repo',\n"
8358
"which contains a shared repository. Any new branches that are created in "
8359
"this\n"
8360
"directory will then use it for storage."
8361
msgstr ""
8362
8363
#: dummy/help_topics/repositories/detail.txt:27
8364
msgid ""
8365
"It is a good idea to create a repository whenever you might create more\n"
8366
"than one branch of a project. This is true for both working areas where you\n"
8367
"are doing the development, and any server areas that you use for hosting\n"
8368
"projects. In the latter case, it is common to want branches without working\n"
8369
"trees. Since the files in the branch will not be edited directly there is "
8370
"no\n"
8371
"need to use up disk space for a working tree. To create a repository in "
8372
"which\n"
8373
"the branches will not have working trees pass the '--no-trees' option to\n"
8374
"'init-repository'."
8375
msgstr ""
8376
8377
#: dummy/help_topics/repositories/detail.txt:38
8378
msgid ""
8379
" init-repository Create a shared repository. Use --no-trees to create "
8380
"one\n"
8381
" in which new branches won't get a working tree.\n"
8382
msgstr ""
8383
8384
#: dummy/help_topics/repositories/summary.txt:1
8385
msgid "Basic information on shared repositories."
8386
msgstr ""
8387
8388
#: dummy/help_topics/revisionspec/summary.txt:1
8389
msgid "Explain how to use --revision"
8390
msgstr ""
8391
8392
#: dummy/help_topics/rules/summary.txt:1
8393
msgid "Information on defining rule-based preferences"
8394
msgstr ""
8395
8396
#: dummy/help_topics/standalone-trees/detail.txt:1
8397
msgid "Standalone Trees"
8398
msgstr ""
8399
8400
#: dummy/help_topics/standalone-trees/detail.txt:3
8401
msgid ""
8402
"A standalone tree is a working tree with an associated repository. It\n"
8403
"is an independently usable branch, with no dependencies on any other.\n"
8404
"Creating a standalone tree (via bzr init) is the quickest way to put\n"
8405
"an existing project under version control."
8406
msgstr ""
8407
8408
#: dummy/help_topics/standalone-trees/detail.txt:8
8409
msgid "Related Commands::"
8410
msgstr ""
8411
8412
#: dummy/help_topics/standalone-trees/detail.txt:10
8413
msgid " init Make a directory into a versioned branch.\n"
8414
msgstr ""
8415
8416
#: dummy/help_topics/standalone-trees/summary.txt:1
8417
msgid "Information on what a standalone tree is"
8418
msgstr ""
8419
8420
#: dummy/help_topics/standard-options/detail.txt:1
8421
msgid "Standard Options"
8422
msgstr ""
8423
8424
#: dummy/help_topics/standard-options/detail.txt:3
8425
msgid "Standard options are legal for all commands."
8426
msgstr ""
8427
8428
#: dummy/help_topics/standard-options/detail.txt:5
8429
msgid ""
8430
"--help, -h Show help message.\n"
8431
"--verbose, -v Display more information.\n"
8432
"--quiet, -q Only display errors and warnings."
8433
msgstr ""
8434
8435
#: dummy/help_topics/standard-options/detail.txt:9
8436
msgid "Unlike global options, standard options can be used in aliases.\n"
8437
msgstr ""
8438
8439
#: dummy/help_topics/standard-options/summary.txt:1
8440
msgid "Options that can be used with any command"
8441
msgstr ""
8442
8443
#: dummy/help_topics/status-flags/detail.txt:1
8444
msgid "Status Flags"
8445
msgstr ""
8446
8447
#: dummy/help_topics/status-flags/detail.txt:3
8448
msgid ""
8449
"Status flags are used to summarise changes to the working tree in a concise\n"
8450
"manner. They are in the form::"
8451
msgstr ""
8452
8453
#: dummy/help_topics/status-flags/detail.txt:6
8454
msgid " xxx <filename>"
8455
msgstr ""
8456
8457
#: dummy/help_topics/status-flags/detail.txt:8
8458
msgid "where the columns' meanings are as follows."
8459
msgstr ""
8460
8461
#: dummy/help_topics/status-flags/detail.txt:10
8462
msgid "Column 1 - versioning/renames::"
8463
msgstr ""
8464
8465
#: dummy/help_topics/status-flags/detail.txt:12
8466
msgid ""
8467
" + File versioned\n"
8468
" - File unversioned\n"
8469
" R File renamed\n"
8470
" ? File unknown\n"
8471
" X File nonexistent (and unknown to bzr)\n"
8472
" C File has conflicts\n"
8473
" P Entry for a pending merge (not a file)"
8474
msgstr ""
8475
8476
#: dummy/help_topics/status-flags/detail.txt:20
8477
msgid "Column 2 - contents::"
8478
msgstr ""
8479
8480
#: dummy/help_topics/status-flags/detail.txt:22
8481
msgid ""
8482
" N File created\n"
8483
" D File deleted\n"
8484
" K File kind changed\n"
8485
" M File modified"
8486
msgstr ""
8487
8488
#: dummy/help_topics/status-flags/detail.txt:27
8489
msgid "Column 3 - execute::"
8490
msgstr ""
8491
8492
#: dummy/help_topics/status-flags/detail.txt:29
8493
msgid " * The execute bit was changed\n"
8494
msgstr ""
8495
8496
#: dummy/help_topics/status-flags/summary.txt:1
8497
msgid "Help on status flags"
8498
msgstr ""
8499
8500
#: dummy/help_topics/sync-for-reconfigure/detail.txt:1
8501
msgid "Branches Out of Sync"
8502
msgstr ""
8503
8504
#: dummy/help_topics/sync-for-reconfigure/detail.txt:3
8505
msgid ""
8506
"When reconfiguring a checkout, tree or branch into a lightweight checkout,\n"
8507
"a local branch must be destroyed. (For checkouts, this is the local branch\n"
8508
"that serves primarily as a cache.) If the branch-to-be-destroyed does not\n"
8509
"have the same last revision as the new reference branch for the lightweight\n"
8510
"checkout, data could be lost, so Bazaar refuses."
8511
msgstr ""
8512
8513
#: dummy/help_topics/sync-for-reconfigure/detail.txt:9
8514
msgid "How you deal with this depends on *why* the branches are out of sync."
8515
msgstr ""
8516
8517
#: dummy/help_topics/sync-for-reconfigure/detail.txt:11
8518
msgid ""
8519
"If you have a checkout and have done local commits, you can get back in "
8520
"sync\n"
8521
"by running \"bzr update\" (and possibly \"bzr commit\")."
8522
msgstr ""
8523
8524
#: dummy/help_topics/sync-for-reconfigure/detail.txt:14
8525
msgid ""
8526
"If you have a branch and the remote branch is out-of-date, you can push\n"
8527
"the local changes using \"bzr push\". If the local branch is out of date, "
8528
"you\n"
8529
"can do \"bzr pull\". If both branches have had changes, you can merge, "
8530
"commit\n"
8531
"and then push your changes. If you decide that some of the changes aren't\n"
8532
"useful, you can \"push --overwrite\" or \"pull --overwrite\" instead.\n"
8533
msgstr ""
8534
8535
#: dummy/help_topics/sync-for-reconfigure/summary.txt:1
8536
msgid "Steps to resolve \"out-of-sync\" when reconfiguring"
8537
msgstr ""
8538
8539
#: dummy/help_topics/topics/summary.txt:1
8540
msgid "Topics list"
8541
msgstr ""
8542
8543
#: dummy/help_topics/url-special-chars/summary.txt:1
8544
msgid "Special character handling in URLs"
8545
msgstr ""
8546
8547
#: dummy/help_topics/urlspec/summary.txt:1
8548
msgid "Supported transport protocols"
8549
msgstr ""
8550
8551
#: dummy/help_topics/working-trees/detail.txt:1
8552
msgid "Working Trees"
8553
msgstr ""
8554
8555
#: dummy/help_topics/working-trees/detail.txt:3
8556
msgid ""
8557
"A working tree is the contents of a branch placed on disk so that you can\n"
8558
"see the files and edit them. The working tree is where you make changes to "
8559
"a\n"
8560
"branch, and when you commit the current state of the working tree is the\n"
8561
"snapshot that is recorded in the commit."
8562
msgstr ""
8563
8564
#: dummy/help_topics/working-trees/detail.txt:8
8565
msgid ""
8566
"When you push a branch to a remote system, a working tree will not be\n"
8567
"created. If one is already present the files will not be updated. The\n"
8568
"branch information will be updated and the working tree will be marked\n"
8569
"as out-of-date. Updating a working tree remotely is difficult, as there\n"
8570
"may be uncommitted changes or the update may cause content conflicts that "
8571
"are\n"
8572
"difficult to deal with remotely."
8573
msgstr ""
8574
8575
#: dummy/help_topics/working-trees/detail.txt:15
8576
msgid ""
8577
"If you have a branch with no working tree you can use the 'checkout' "
8578
"command\n"
8579
"to create a working tree. If you run 'bzr checkout .' from the branch it "
8580
"will\n"
8581
"create the working tree. If the branch is updated remotely, you can update "
8582
"the\n"
8583
"working tree by running 'bzr update' in that directory."
8584
msgstr ""
8585
8586
#: dummy/help_topics/working-trees/detail.txt:20
8587
msgid ""
8588
"If you have a branch with a working tree that you do not want the 'remove-"
8589
"tree'\n"
8590
"command will remove the tree if it is safe. This can be done to avoid the\n"
8591
"warning about the remote working tree not being updated when pushing to the\n"
8592
"branch. It can also be useful when working with a '--no-trees' repository\n"
8593
"(see 'bzr help repositories')."
8594
msgstr ""
8595
8596
#: dummy/help_topics/working-trees/detail.txt:26
8597
msgid ""
8598
"If you want to have a working tree on a remote machine that you push to you\n"
8599
"can either run 'bzr update' in the remote branch after each push, or use "
8600
"some\n"
8601
"other method to update the tree during the push. There is an 'rspush' "
8602
"plugin\n"
8603
"that will update the working tree using rsync as well as doing a push. "
8604
"There\n"
8605
"is also a 'push-and-update' plugin that automates running 'bzr update' via "
8606
"SSH\n"
8607
"after each push."
8608
msgstr ""
8609
8610
#: dummy/help_topics/working-trees/detail.txt:33
8611
msgid "Useful commands::"
8612
msgstr ""
8613
8614
#: dummy/help_topics/working-trees/detail.txt:35
8615
msgid ""
8616
" checkout Create a working tree when a branch does not have one.\n"
8617
" remove-tree Removes the working tree from a branch when it is safe to do "
8618
"so.\n"
8619
" update When a working tree is out of sync with its associated "
8620
"branch\n"
8621
" this will update the tree to match the branch.\n"
8622
msgstr ""
8623
8624
#: dummy/help_topics/working-trees/summary.txt:1
8625
msgid "Information on working trees"
8626
msgstr ""
8627
8628
#: en/help_topics/authentication.txt:1
8629
msgid ""
8630
"Authentication Settings\n"
8631
"======================="
8632
msgstr ""
8633
8634
#: en/help_topics/authentication.txt:4
8635
msgid ""
8636
"\n"
8637
"Intent\n"
8638
"------"
8639
msgstr ""
8640
8641
#: en/help_topics/authentication.txt:8
8642
msgid ""
8643
"Many different authentication policies can be described in the\n"
8644
"``authentication.conf`` file but a particular user should need only a few\n"
8645
"definitions to cover his needs without having to specify a user and a "
8646
"password\n"
8647
"for every branch he uses."
8648
msgstr ""
8649
8650
#: en/help_topics/authentication.txt:13
8651
msgid ""
8652
"The definitions found in this file are used to find the credentials to use "
8653
"for\n"
8654
"a given url. The same credentials can generally be used for as many branches "
8655
"as\n"
8656
"possible by grouping their declaration around the remote servers that need\n"
8657
"them. It's even possible to declare credentials that will be used by "
8658
"different\n"
8659
"servers."
8660
msgstr ""
8661
8662
#: en/help_topics/authentication.txt:19
8663
msgid ""
8664
"The intent is to make this file as small as possible to minimize maintenance."
8665
msgstr ""
8666
8667
#: en/help_topics/authentication.txt:21
8668
msgid ""
8669
"Once the relevant credentials are declared in this file you may use branch "
8670
"urls\n"
8671
"without embedding passwords (security hazard) or even users (enabling "
8672
"sharing\n"
8673
"of your urls with others)."
8674
msgstr ""
8675
8676
#: en/help_topics/authentication.txt:25
8677
msgid "Instead of using::"
8678
msgstr ""
8679
8680
#: en/help_topics/authentication.txt:27
8681
msgid " bzr branch ftp://joe:secret@host.com/path/to/my/branch"
8682
msgstr ""
8683
8684
#: en/help_topics/authentication.txt:29
8685
msgid "you simply use::"
8686
msgstr ""
8687
8688
#: en/help_topics/authentication.txt:31
8689
msgid " bzr branch ftp://host.com/path/to/my/branch"
8690
msgstr ""
8691
8692
#: en/help_topics/authentication.txt:33
8693
msgid "provided you have created the following ``authentication.conf`` file::"
8694
msgstr ""
8695
8696
#: en/help_topics/authentication.txt:35
8697
msgid ""
8698
" [myprojects]\n"
8699
" scheme=ftp\n"
8700
" host=host.com\n"
8701
" user=joe\n"
8702
" password=secret\n"
8703
" "
8704
msgstr ""
8705
8706
#: en/help_topics/authentication.txt:42
8707
msgid ""
8708
"Authentication definitions\n"
8709
"--------------------------"
8710
msgstr ""
8711
8712
#: en/help_topics/authentication.txt:45
8713
msgid ""
8714
"There are two kinds of authentication used by the various schemes supported "
8715
"by\n"
8716
"bzr:"
8717
msgstr ""
8718
8719
#: en/help_topics/authentication.txt:48
8720
msgid "1. user and password"
8721
msgstr ""
8722
8723
#: en/help_topics/authentication.txt:50
8724
msgid ""
8725
"``FTP`` needs a (``user``, ``password``) to authenticate against a ``host``\n"
8726
"``SFTP`` can use either a password or a host key to authenticate. However,\n"
8727
"ssh agents are a better, more secure solution. So we have chosen to not "
8728
"provide\n"
8729
"our own less secure method."
8730
msgstr ""
8731
8732
#: en/help_topics/authentication.txt:55
8733
msgid "2. user, realm and password"
8734
msgstr ""
8735
8736
#: en/help_topics/authentication.txt:57
8737
msgid ""
8738
"``HTTP`` and ``HTTPS`` needs a (``user, realm, password``) to authenticate\n"
8739
"against a host. But, by using ``.htaccess`` files, for example, it is "
8740
"possible\n"
8741
"to define several (``user, realm, password``) for a given ``host``. So what "
8742
"is\n"
8743
"really needed is (``user``, ``password``, ``host``, ``path``). The ``realm`` "
8744
"is\n"
8745
"not taken into account in the definitions, but will displayed if bzr "
8746
"prompts\n"
8747
"you for a password."
8748
msgstr ""
8749
8750
#: en/help_topics/authentication.txt:64
8751
msgid ""
8752
"``HTTP proxy`` can be handled as ``HTTP`` (or ``HTTPS``) by explicitly\n"
8753
"specifying the appropriate port."
8754
msgstr ""
8755
8756
#: en/help_topics/authentication.txt:67
8757
msgid ""
8758
"To take all schemes into account, the password will be deduced from a set "
8759
"of\n"
8760
"authentication definitions (``scheme``, ``host``, ``port``, ``path``, "
8761
"``user``,\n"
8762
"``password``)."
8763
msgstr ""
8764
8765
#: en/help_topics/authentication.txt:71
8766
msgid ""
8767
" * ``scheme``: can be empty (meaning the rest of the definition can be "
8768
"used\n"
8769
" for any scheme), ``SFTP`` and ``bzr+ssh`` should not be used here, "
8770
"``ssh``\n"
8771
" should be used instead since this is the real scheme regarding\n"
8772
" authentication,"
8773
msgstr ""
8774
8775
#: en/help_topics/authentication.txt:76
8776
msgid " * ``host``: can be empty (to act as a default for any host),"
8777
msgstr ""
8778
8779
#: en/help_topics/authentication.txt:78
8780
msgid ""
8781
" * ``port`` can be empty (useful when an host provides several servers for "
8782
"the\n"
8783
" same scheme), only numerical values are allowed, this should be used "
8784
"only\n"
8785
" when the server uses a port different than the scheme standard port,"
8786
msgstr ""
8787
8788
#: en/help_topics/authentication.txt:82
8789
msgid " * ``path``: can be empty (FTP or SFTP will never user it),"
8790
msgstr ""
8791
8792
#: en/help_topics/authentication.txt:84
8793
msgid ""
8794
" * ``user``: can be empty (``bzr`` will defaults to python's\n"
8795
" ``getpass.get_user()``),"
8796
msgstr ""
8797
8798
#: en/help_topics/authentication.txt:87
8799
msgid ""
8800
" * ``password``: can be empty if you prefer to always be prompted for your\n"
8801
" password."
8802
msgstr ""
8803
8804
#: en/help_topics/authentication.txt:90
8805
msgid ""
8806
"Multiple definitions can be provided and, for a given URL, bzr will select "
8807
"a\n"
8808
"(``user`` [, ``password``]) based on the following rules :"
8809
msgstr ""
8810
8811
#: en/help_topics/authentication.txt:93
8812
msgid " 1. the first match wins,"
8813
msgstr ""
8814
8815
#: en/help_topics/authentication.txt:95
8816
msgid " 2. empty fields match everything,"
8817
msgstr ""
8818
8819
#: en/help_topics/authentication.txt:97
8820
msgid ""
8821
" 3. ``scheme`` matches even if decorators are used in the requested URL,"
8822
msgstr ""
8823
8824
#: en/help_topics/authentication.txt:99
8825
msgid ""
8826
" 4. ``host`` matches exactly or act as a domain if it starts with '.'\n"
8827
" (``project.bzr.sf.net`` will match ``.bzr.sf.net`` but ``projectbzr.sf."
8828
"net``\n"
8829
" will not match ``bzr.sf.net``)."
8830
msgstr ""
8831
8832
#: en/help_topics/authentication.txt:103
8833
msgid ""
8834
" 5. ``port`` matches if included in the requested URL (exact matches only)"
8835
msgstr ""
8836
8837
#: en/help_topics/authentication.txt:105
8838
msgid ""
8839
" 6. ``path`` matches if included in the requested URL (and by rule #2 "
8840
"above,\n"
8841
" empty paths will match any provided path)."
8842
msgstr ""
8843
8844
#: en/help_topics/authentication.txt:110
8845
msgid ""
8846
"File format\n"
8847
"-----------"
8848
msgstr ""
8849
8850
#: en/help_topics/authentication.txt:113
8851
msgid ""
8852
"The general rules for :doc:`configuration files <configuration-help>`\n"
8853
"apply except for the variable policies."
8854
msgstr ""
8855
8856
#: en/help_topics/authentication.txt:116
8857
msgid "Each section describes an authentication definition."
8858
msgstr ""
8859
8860
#: en/help_topics/authentication.txt:118
8861
msgid ""
8862
"The section name is an arbitrary string, only the ``DEFAULT`` value is "
8863
"reserved\n"
8864
"and should appear as the *last* section."
8865
msgstr ""
8866
8867
#: en/help_topics/authentication.txt:121
8868
msgid "Each section should define:"
8869
msgstr ""
8870
8871
#: en/help_topics/authentication.txt:123
8872
msgid "* ``user``: the login to be used,"
8873
msgstr ""
8874
8875
#: en/help_topics/authentication.txt:125
8876
msgid "Each section could define:"
8877
msgstr ""
8878
8879
#: en/help_topics/authentication.txt:127
8880
msgid "* ``host``: the remote server,"
8881
msgstr ""
8882
8883
#: en/help_topics/authentication.txt:129
8884
msgid "* ``port``: the port the server is listening,"
8885
msgstr ""
8886
8887
#: en/help_topics/authentication.txt:131
8888
msgid "* ``path``: the branch location,"
8889
msgstr ""
8890
8891
#: en/help_topics/authentication.txt:133
8892
msgid "* ``password``: the password."
8893
msgstr ""
8894
8895
#: en/help_topics/authentication.txt:135
8896
msgid ""
8897
"\n"
8898
"Examples\n"
8899
"--------"
8900
msgstr ""
8901
8902
#: en/help_topics/authentication.txt:139
8903
msgid ""
8904
"\n"
8905
"Personal projects hosted outside\n"
8906
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
8907
msgstr ""
8908
8909
#: en/help_topics/authentication.txt:143
8910
msgid ""
8911
"All connections are done with the same ``user`` (the remote one for which "
8912
"the\n"
8913
"default bzr one is not appropriate) and the password is always prompted "
8914
"with\n"
8915
"some exceptions::"
8916
msgstr ""
8917
8918
#: en/help_topics/authentication.txt:147
8919
msgid ""
8920
" # Pet projects on hobby.net\n"
8921
" [hobby]\n"
8922
" host=r.hobby.net\n"
8923
" user=jim\n"
8924
" password=obvious1234\n"
8925
" \n"
8926
" # Home server\n"
8927
" [home]\n"
8928
" scheme=https\n"
8929
" host=home.net\n"
8930
" user=joe\n"
8931
" password=1essobV10us\n"
8932
" \n"
8933
" [DEFAULT]\n"
8934
" # Our local user is barbaz, on all remote sites we're known as "
8935
"foobar\n"
8936
" user=foobar"
8937
msgstr ""
8938
8939
#: en/help_topics/authentication.txt:164
8940
msgid ""
8941
"\n"
8942
"Source hosting provider\n"
8943
"~~~~~~~~~~~~~~~~~~~~~~~"
8944
msgstr ""
8945
8946
#: en/help_topics/authentication.txt:168
8947
msgid "In the shp.net (fictitious) domain, each project has its own site::"
8948
msgstr ""
8949
8950
#: en/help_topics/authentication.txt:170
8951
msgid ""
8952
" [shpnet domain]\n"
8953
" # we use sftp, but ssh is the scheme used for authentication\n"
8954
" scheme=ssh\n"
8955
" # The leading '.' ensures that 'shp.net' alone doesn't match\n"
8956
" host=.shp.net\n"
8957
" user=joe\n"
8958
" # bzr don't support supplying a password for sftp,\n"
8959
" # consider using an ssh agent if you don't want to supply\n"
8960
" # a password interactively. (pageant, ssh-agent, etc)"
8961
msgstr ""
8962
8963
#: en/help_topics/authentication.txt:180
8964
msgid ""
8965
"HTTPS, SFTP servers and their proxy\n"
8966
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
8967
msgstr ""
8968
8969
#: en/help_topics/authentication.txt:183
8970
msgid ""
8971
"At company.com, the server hosting release and integration branches is "
8972
"behind a\n"
8973
"proxy, and the two branches use different authentication policies::"
8974
msgstr ""
8975
8976
#: en/help_topics/authentication.txt:186
8977
msgid ""
8978
" [reference code]\n"
8979
" scheme=https\n"
8980
" host=dev.company.com\n"
8981
" path=/dev\n"
8982
" user=user1\n"
8983
" password=pass1"
8984
msgstr ""
8985
8986
#: en/help_topics/authentication.txt:193
8987
msgid ""
8988
" # development branches on dev server\n"
8989
" [dev]\n"
8990
" scheme=ssh # bzr+ssh and sftp are available here\n"
8991
" host=dev.company.com\n"
8992
" path=/dev/integration\n"
8993
" user=user2\n"
8994
" \n"
8995
" # proxy\n"
8996
" [proxy]\n"
8997
" scheme=http\n"
8998
" host=proxy.company.com\n"
8999
" port=3128\n"
9000
" user=proxyuser1\n"
9001
" password=proxypass1"
9002
msgstr ""
9003
9004
#: en/help_topics/authentication.txt:208
9005
msgid ""
9006
"\n"
9007
"Planned enhancements\n"
9008
"--------------------"
9009
msgstr ""
9010
9011
#: en/help_topics/authentication.txt:212
9012
msgid ""
9013
"The following are not yet implemented but planned as parts of a work in\n"
9014
"progress:"
9015
msgstr ""
9016
9017
#: en/help_topics/authentication.txt:215
9018
msgid "* add a ``password_encoding`` field allowing:"
9019
msgstr ""
9020
9021
#: en/help_topics/authentication.txt:217
9022
msgid ""
9023
" - storing the passwords in various obfuscating encodings (base64 for one),"
9024
msgstr ""
9025
9026
#: en/help_topics/authentication.txt:219
9027
msgid " - delegate password storage to plugins (.netrc for example)."
9028
msgstr ""
9029
9030
#: en/help_topics/authentication.txt:221
9031
msgid ""
9032
"* update the credentials when the user is prompted for user or password,"
9033
msgstr ""
9034
9035
#: en/help_topics/authentication.txt:223
9036
msgid "* add a ``verify_certificates`` field for ``HTTPS``."
9037
msgstr ""
9038
9039
#: en/help_topics/authentication.txt:225
9040
msgid ""
9041
"The ``password_encoding`` and ``verify_certificates`` fields are recognized "
9042
"but\n"
9043
"ignored in the actual implementation.\n"
9044
msgstr ""
9045
9046
#: en/help_topics/bugs.txt:1
9047
msgid "Bug Tracker Settings"
9048
msgstr ""
9049
9050
#: en/help_topics/bugs.txt:3
9051
msgid ""
9052
"When making a commit, metadata about bugs fixed by that change can be\n"
9053
"recorded by using the ``--fixes`` option. For each bug marked as fixed, an\n"
9054
"entry is included in the 'bugs' revision property stating '<url> <status>'.\n"
9055
"(The only ``status`` value currently supported is ``fixed.``)"
9056
msgstr ""
9057
9058
#: en/help_topics/bugs.txt:8
9059
msgid ""
9060
"The ``--fixes`` option allows you to specify a bug tracker and a bug "
9061
"identifier\n"
9062
"rather than a full URL. This looks like::"
9063
msgstr ""
9064
9065
#: en/help_topics/bugs.txt:11
9066
msgid " bzr commit --fixes <tracker>:<id>"
9067
msgstr ""
9068
9069
#: en/help_topics/bugs.txt:13 en/help_topics/configuration.txt:398
9070
msgid "or::"
9071
msgstr ""
9072
9073
#: en/help_topics/bugs.txt:15
9074
msgid " bzr commit --fixes <id>"
9075
msgstr ""
9076
9077
#: en/help_topics/bugs.txt:17
9078
msgid ""
9079
"where \"<tracker>\" is an identifier for the bug tracker, and \"<id>\" is "
9080
"the\n"
9081
"identifier for that bug within the bugtracker, usually the bug number.\n"
9082
"If \"<tracker>\" is not specified the ``bugtracker`` set in the branch\n"
9083
"or global configuration is used."
9084
msgstr ""
9085
9086
#: en/help_topics/bugs.txt:22
9087
msgid ""
9088
"Bazaar knows about a few bug trackers that have many users. If\n"
9089
"you use one of these bug trackers then there is no setup required to\n"
9090
"use this feature, you just need to know the tracker identifier to use.\n"
9091
"These are the bugtrackers that are built in:"
9092
msgstr ""
9093
9094
#: en/help_topics/bugs.txt:27
9095
msgid ""
9096
" ============================ ============ ============\n"
9097
" URL Abbreviation Example\n"
9098
" ============================ ============ ============\n"
9099
" https://bugs.launchpad.net/ lp lp:12345\n"
9100
" http://bugs.debian.org/ deb deb:12345\n"
9101
" http://bugzilla.gnome.org/ gnome gnome:12345\n"
9102
" ============================ ============ ============"
9103
msgstr ""
9104
9105
#: en/help_topics/bugs.txt:35
9106
msgid ""
9107
"For the bug trackers not listed above configuration is required.\n"
9108
"Support for generating the URLs for any project using Bugzilla or Trac\n"
9109
"is built in, along with a template mechanism for other bugtrackers with\n"
9110
"simple URL schemes. If your bug tracker can't be described by one\n"
9111
"of the schemes described below then you can write a plugin to support\n"
9112
"it."
9113
msgstr ""
9114
9115
#: en/help_topics/bugs.txt:42
9116
msgid ""
9117
"If you use Bugzilla or Trac, then you only need to set a configuration\n"
9118
"variable which contains the base URL of the bug tracker. These options\n"
9119
"can go into ``bazaar.conf``, ``branch.conf`` or into a branch-specific\n"
9120
"configuration section in ``locations.conf``. You can set up these values\n"
9121
"for each of the projects you work on."
9122
msgstr ""
9123
9124
#: en/help_topics/bugs.txt:48
9125
msgid ""
9126
"Note: As you provide a short name for each tracker, you can specify one or\n"
9127
"more bugs in one or more trackers at commit time if you wish."
9128
msgstr ""
9129
9130
#: en/help_topics/bugs.txt:51
9131
msgid ""
9132
"Launchpad\n"
9133
"---------"
9134
msgstr ""
9135
9136
#: en/help_topics/bugs.txt:54
9137
msgid "Use ``bzr commit --fixes lp:2`` to record that this commit fixes bug 2."
9138
msgstr ""
9139
9140
#: en/help_topics/bugs.txt:56
9141
msgid ""
9142
"bugzilla_<tracker>_url\n"
9143
"----------------------"
9144
msgstr ""
9145
9146
#: en/help_topics/bugs.txt:59
9147
msgid ""
9148
"If present, the location of the Bugzilla bug tracker referred to by\n"
9149
"<tracker>. This option can then be used together with ``bzr commit\n"
9150
"--fixes`` to mark bugs in that tracker as being fixed by that commit. For\n"
9151
"example::"
9152
msgstr ""
9153
9154
#: en/help_topics/bugs.txt:64
9155
msgid " bugzilla_squid_url = http://bugs.squid-cache.org"
9156
msgstr ""
9157
9158
#: en/help_topics/bugs.txt:66
9159
msgid ""
9160
"would allow ``bzr commit --fixes squid:1234`` to mark Squid's bug 1234 as\n"
9161
"fixed."
9162
msgstr ""
9163
9164
#: en/help_topics/bugs.txt:69
9165
msgid ""
9166
"trac_<tracker>_url\n"
9167
"------------------"
9168
msgstr ""
9169
9170
#: en/help_topics/bugs.txt:72
9171
msgid ""
9172
"If present, the location of the Trac instance referred to by\n"
9173
"<tracker>. This option can then be used together with ``bzr commit\n"
9174
"--fixes`` to mark bugs in that tracker as being fixed by that commit. For\n"
9175
"example::"
9176
msgstr ""
9177
9178
#: en/help_topics/bugs.txt:77
9179
msgid " trac_twisted_url = http://www.twistedmatrix.com/trac"
9180
msgstr ""
9181
9182
#: en/help_topics/bugs.txt:79
9183
msgid ""
9184
"would allow ``bzr commit --fixes twisted:1234`` to mark Twisted's bug 1234 "
9185
"as\n"
9186
"fixed."
9187
msgstr ""
9188
9189
#: en/help_topics/bugs.txt:82
9190
msgid ""
9191
"bugtracker_<tracker>_url\n"
9192
"------------------------"
9193
msgstr ""
9194
9195
#: en/help_topics/bugs.txt:85
9196
msgid ""
9197
"If present, the location of a generic bug tracker instance referred to by\n"
9198
"<tracker>. The location must contain an ``{id}`` placeholder,\n"
9199
"which will be replaced by a specific bug ID. This option can then be used\n"
9200
"together with ``bzr commit --fixes`` to mark bugs in that tracker as being\n"
9201
"fixed by that commit. For example::"
9202
msgstr ""
9203
9204
#: en/help_topics/bugs.txt:91
9205
msgid " bugtracker_python_url = http://bugs.python.org/issue{id}"
9206
msgstr ""
9207
9208
#: en/help_topics/bugs.txt:93
9209
msgid ""
9210
"would allow ``bzr commit --fixes python:1234`` to mark bug 1234 in Python's\n"
9211
"Roundup bug tracker as fixed, or::"
9212
msgstr ""
9213
9214
#: en/help_topics/bugs.txt:96
9215
msgid ""
9216
" bugtracker_cpan_url = http://rt.cpan.org/Public/Bug/Display.html?id={id}"
9217
msgstr ""
9218
9219
#: en/help_topics/bugs.txt:98
9220
msgid ""
9221
"would allow ``bzr commit --fixes cpan:1234`` to mark bug 1234 in CPAN's\n"
9222
"RT bug tracker as fixed, or::"
9223
msgstr ""
9224
9225
#: en/help_topics/bugs.txt:101
9226
msgid " bugtracker_hudson_url = http://issues.hudson-ci.org/browse/{id}"
9227
msgstr ""
9228
9229
#: en/help_topics/bugs.txt:103
9230
msgid ""
9231
"would allow ``bzr commit --fixes hudson:HUDSON-1234`` to mark bug "
9232
"HUDSON-1234\n"
9233
"in Hudson's JIRA bug tracker as fixed.\n"
9234
msgstr ""
9235
9236
#: en/help_topics/commands.txt:1
9237
msgid ""
9238
"add Add specified files or directories.\n"
9239
"alias Set/unset and display aliases.\n"
9240
"annotate Show the origin of each line in a file.\n"
9241
"bash-completion Generate a shell function for bash command line "
9242
"completion.\n"
9243
" [bash_completion]\n"
9244
"bind Convert the current branch into a checkout of the "
9245
"supplied\n"
9246
" branch.\n"
9247
"branch Create a new branch that is a copy of an existing branch.\n"
9248
"branches List the branches available at the current location.\n"
9249
"break-lock Break a dead lock.\n"
9250
"cat Write the contents of a file as of a given revision to\n"
9251
" standard output.\n"
9252
"check Validate working tree structure, branch consistency and\n"
9253
" repository history.\n"
9254
"checkout Create a new checkout of an existing branch.\n"
9255
"clean-tree Remove unwanted files from working tree.\n"
9256
"commit Commit changes into a new revision.\n"
9257
"config Display, set or remove a configuration option.\n"
9258
"conflicts List files with conflicts.\n"
9259
"deleted List files deleted in the working tree.\n"
9260
"diff Show differences in the working tree, between revisions "
9261
"or\n"
9262
" branches.\n"
9263
"dpush Push into a different VCS without any custom bzr "
9264
"metadata.\n"
9265
"export Export current or past revision to a destination directory "
9266
"or\n"
9267
" archive.\n"
9268
"help Show help on a command or other topic.\n"
9269
"ignore Ignore specified files or patterns.\n"
9270
"ignored List ignored files and the patterns that matched them.\n"
9271
"info Show information about a working tree, branch or "
9272
"repository.\n"
9273
"init Make a directory into a versioned branch.\n"
9274
"init-repository Create a shared repository for branches to share storage\n"
9275
" space.\n"
9276
"join Combine a tree into its containing tree.\n"
9277
"launchpad-login Show or set the Launchpad user ID. [launchpad]\n"
9278
"launchpad-mirror Ask Launchpad to mirror a branch now. [launchpad]\n"
9279
"launchpad-open Open a Launchpad branch page in your web browser. "
9280
"[launchpad]\n"
9281
"log Show historical log for a branch or subset of a branch.\n"
9282
"lp-find-proposal Find the proposal to merge this revision. [launchpad]\n"
9283
"lp-propose-merge Propose merging a branch on Launchpad. [launchpad]\n"
9284
"ls List files in a tree.\n"
9285
"merge Perform a three-way merge.\n"
9286
"missing Show unmerged/unpulled revisions between two branches.\n"
9287
"mkdir Create a new versioned directory.\n"
9288
"mv Move or rename a file.\n"
9289
"nick Print or set the branch nickname.\n"
9290
"pack Compress the data within a repository.\n"
9291
"plugins List the installed plugins.\n"
9292
"pull Turn this branch into a mirror of another branch.\n"
9293
"push Update a mirror of this branch.\n"
9294
"reconcile Reconcile bzr metadata in a branch.\n"
9295
"reconfigure Reconfigure the type of a bzr directory.\n"
9296
"register-branch Register a branch with launchpad.net. [launchpad]\n"
9297
"remerge Redo a merge.\n"
9298
"remove Remove files or directories.\n"
9299
"remove-branch Remove a branch.\n"
9300
"remove-tree Remove the working tree from a given branch/checkout.\n"
9301
"renames Show list of renamed files.\n"
9302
"resolve Mark a conflict as resolved.\n"
9303
"revert Revert files to a previous revision.\n"
9304
"revno Show current revision number.\n"
9305
"root Show the tree root directory.\n"
9306
"send Mail or create a merge-directive for submitting changes.\n"
9307
"serve Run the bzr server.\n"
9308
"shelve Temporarily set aside some changes from the current tree.\n"
9309
"sign-my-commits Sign all commits by a given committer.\n"
9310
"split Split a subdirectory of a tree into a separate tree.\n"
9311
"status Display status summary.\n"
9312
"switch Set the branch of a checkout and update.\n"
9313
"tag Create, remove or modify a tag naming a revision.\n"
9314
"tags List tags.\n"
9315
"testament Show testament (signing-form) of a revision.\n"
9316
"unbind Convert the current checkout into a regular branch.\n"
9317
"uncommit Remove the last committed revision.\n"
9318
"unshelve Restore shelved changes.\n"
9319
"update Update a working tree to a new revision.\n"
9320
"upgrade Upgrade a repository, branch or working tree to a newer\n"
9321
" format.\n"
9322
"verify-signatures Verify all commit signatures.\n"
9323
"version Show version of bzr.\n"
9324
"version-info Show version information about this tree.\n"
9325
"view Manage filtered views.\n"
9326
"whoami Show or set bzr user id.\n"
9327
msgstr ""
9328
9329
#: en/help_topics/configuration.txt:1
9330
msgid ""
9331
"Configuration Settings\n"
9332
"======================="
9333
msgstr ""
9334
9335
#: en/help_topics/configuration.txt:4
9336
msgid ""
9337
"Environment settings\n"
9338
"---------------------"
9339
msgstr ""
9340
9341
#: en/help_topics/configuration.txt:7
9342
msgid ""
9343
"While most configuration is handled by configuration files, some options\n"
9344
"which may be semi-permanent can also be controlled through the environment."
9345
msgstr ""
9346
9347
#: en/help_topics/configuration.txt:10
9348
msgid ""
9349
"BZR_EMAIL\n"
9350
"~~~~~~~~~"
9351
msgstr ""
9352
9353
#: en/help_topics/configuration.txt:13
9354
msgid "Override the email id used by Bazaar. Typical format::"
9355
msgstr ""
9356
9357
#: en/help_topics/configuration.txt:15
9358
msgid " \"John Doe <jdoe@example.com>\""
9359
msgstr ""
9360
9361
#: en/help_topics/configuration.txt:17
9362
msgid "See also the ``email`` configuration option."
9363
msgstr ""
9364
9365
#: en/help_topics/configuration.txt:19
9366
msgid ""
9367
"BZR_PROGRESS_BAR\n"
9368
"~~~~~~~~~~~~~~~~"
9369
msgstr ""
9370
9371
#: en/help_topics/configuration.txt:22
9372
msgid ""
9373
"Override the progress display. Possible values are \"none\" or \"text\". "
9374
"If\n"
9375
"the value is \"none\" then no progress bar is displayed. The value \"text\" "
9376
"draws\n"
9377
"the ordinary command line progress bar."
9378
msgstr ""
9379
9380
#: en/help_topics/configuration.txt:26
9381
msgid ""
9382
"BZR_SIGQUIT_PDB\n"
9383
"~~~~~~~~~~~~~~~"
9384
msgstr ""
9385
9386
#: en/help_topics/configuration.txt:29
9387
msgid "Control whether SIGQUIT behaves normally or invokes a breakin debugger."
9388
msgstr ""
9389
9390
#: en/help_topics/configuration.txt:31
9391
msgid ""
9392
"* 0 = Standard SIGQUIT behavior (normally, exit with a core dump)\n"
9393
"* 1 = Invoke breakin debugger (default)"
9394
msgstr ""
9395
9396
#: en/help_topics/configuration.txt:34
9397
msgid ""
9398
"BZR_HOME\n"
9399
"~~~~~~~~"
9400
msgstr ""
9401
9402
#: en/help_topics/configuration.txt:37
9403
msgid "Override the home directory used by Bazaar."
9404
msgstr ""
9405
9406
#: en/help_topics/configuration.txt:39
9407
msgid ""
9408
"BZR_SSH\n"
9409
"~~~~~~~"
9410
msgstr ""
9411
9412
#: en/help_topics/configuration.txt:42
9413
msgid "Select a different SSH implementation."
9414
msgstr ""
9415
9416
#: en/help_topics/configuration.txt:44
9417
msgid ""
9418
"BZR_PDB\n"
9419
"~~~~~~~"
9420
msgstr ""
9421
9422
#: en/help_topics/configuration.txt:47
9423
msgid "Control whether to launch a debugger on error."
9424
msgstr ""
9425
9426
#: en/help_topics/configuration.txt:49
9427
msgid ""
9428
"* 0 = Standard behavior\n"
9429
"* 1 = Launch debugger"
9430
msgstr ""
9431
9432
#: en/help_topics/configuration.txt:52
9433
msgid ""
9434
"BZR_REMOTE_PATH\n"
9435
"~~~~~~~~~~~~~~~"
9436
msgstr ""
9437
9438
#: en/help_topics/configuration.txt:55
9439
msgid "Path to the Bazaar executable to use when using the bzr+ssh protocol."
9440
msgstr ""
9441
9442
#: en/help_topics/configuration.txt:57
9443
msgid "See also the ``bzr_remote_path`` configuration option."
9444
msgstr ""
9445
9446
#: en/help_topics/configuration.txt:59
9447
msgid ""
9448
"BZR_EDITOR\n"
9449
"~~~~~~~~~~"
9450
msgstr ""
9451
9452
#: en/help_topics/configuration.txt:62
9453
msgid "Path to the editor Bazaar should use for commit messages, etc."
9454
msgstr ""
9455
9456
#: en/help_topics/configuration.txt:64
9457
msgid ""
9458
"BZR_LOG\n"
9459
"~~~~~~~"
9460
msgstr ""
9461
9462
#: en/help_topics/configuration.txt:67
9463
msgid ""
9464
"Location of the Bazaar log file. You can check the current location by\n"
9465
"running ``bzr version``."
9466
msgstr ""
9467
9468
#: en/help_topics/configuration.txt:70
9469
msgid ""
9470
"The log file contains debug information that is useful for diagnosing or\n"
9471
"reporting problems with Bazaar."
9472
msgstr ""
9473
9474
#: en/help_topics/configuration.txt:73
9475
msgid ""
9476
"Setting this to ``NUL`` on Windows or ``/dev/null`` on other platforms\n"
9477
"will disable logging."
9478
msgstr ""
9479
9480
#: en/help_topics/configuration.txt:76
9481
msgid ""
9482
"\n"
9483
"BZR_PLUGIN_PATH\n"
9484
"~~~~~~~~~~~~~~~"
9485
msgstr ""
9486
9487
#: en/help_topics/configuration.txt:80
9488
msgid ""
9489
"The path to the plugins directory that Bazaar should use.\n"
9490
"If not set, Bazaar will search for plugins in:"
9491
msgstr ""
9492
9493
#: en/help_topics/configuration.txt:83
9494
msgid "* the user specific plugin directory (containing the ``user`` plugins),"
9495
msgstr ""
9496
9497
#: en/help_topics/configuration.txt:85
9498
msgid "* the bzrlib directory (containing the ``core`` plugins),"
9499
msgstr ""
9500
9501
#: en/help_topics/configuration.txt:87
9502
msgid ""
9503
"* the site specific plugin directory if applicable (containing\n"
9504
" the ``site`` plugins)."
9505
msgstr ""
9506
9507
#: en/help_topics/configuration.txt:90
9508
msgid ""
9509
"If ``BZR_PLUGIN_PATH`` is set in any fashion, it will change the\n"
9510
"the way the plugin are searched. "
9511
msgstr ""
9512
9513
#: en/help_topics/configuration.txt:93
9514
msgid ""
9515
"As for the ``PATH`` variables, if multiple directories are\n"
9516
"specified in ``BZR_PLUGIN_PATH`` they should be separated by the\n"
9517
"platform specific appropriate character (':' on Unix,\n"
9518
"';' on windows)"
9519
msgstr ""
9520
9521
#: en/help_topics/configuration.txt:98
9522
msgid ""
9523
"By default if ``BZR_PLUGIN_PATH`` is set, it replaces searching\n"
9524
"in ``user``. However it will continue to search in ``core`` and\n"
9525
"``site`` unless they are explicitly removed."
9526
msgstr ""
9527
9528
#: en/help_topics/configuration.txt:102
9529
msgid ""
9530
"If you need to change the order or remove one of these\n"
9531
"directories, you should use special values:"
9532
msgstr ""
9533
9534
#: en/help_topics/configuration.txt:105
9535
msgid ""
9536
"* ``-user``, ``-core``, ``-site`` will remove the corresponding\n"
9537
" path from the default values,"
9538
msgstr ""
9539
9540
#: en/help_topics/configuration.txt:108
9541
msgid ""
9542
"* ``+user``, ``+core``, ``+site`` will add the corresponding path\n"
9543
" before the remaining default values (and also remove it from\n"
9544
" the default values)."
9545
msgstr ""
9546
9547
#: en/help_topics/configuration.txt:112
9548
msgid ""
9549
"Note that the special values 'user', 'core' and 'site' should be\n"
9550
"used literally, they will be substituted by the corresponding,\n"
9551
"platform specific, values."
9552
msgstr ""
9553
9554
#: en/help_topics/configuration.txt:116
9555
msgid ""
9556
"The examples below use ':' as the separator, windows users\n"
9557
"should use ';'."
9558
msgstr ""
9559
9560
#: en/help_topics/configuration.txt:119
9561
msgid "Overriding the default user plugin directory::"
9562
msgstr ""
9563
9564
#: en/help_topics/configuration.txt:121
9565
msgid " BZR_PLUGIN_PATH='/path/to/my/other/plugins'"
9566
msgstr ""
9567
9568
#: en/help_topics/configuration.txt:123
9569
msgid "Disabling the site directory while retaining the user directory::"
9570
msgstr ""
9571
9572
#: en/help_topics/configuration.txt:125
9573
msgid " BZR_PLUGIN_PATH='-site:+user'"
9574
msgstr ""
9575
9576
#: en/help_topics/configuration.txt:127
9577
msgid "Disabling all plugins (better achieved with --no-plugins)::"
9578
msgstr ""
9579
9580
#: en/help_topics/configuration.txt:129
9581
msgid " BZR_PLUGIN_PATH='-user:-core:-site'"
9582
msgstr ""
9583
9584
#: en/help_topics/configuration.txt:131
9585
msgid "Overriding the default site plugin directory::"
9586
msgstr ""
9587
9588
#: en/help_topics/configuration.txt:133
9589
msgid " BZR_PLUGIN_PATH='/path/to/my/site/plugins:-site':+user"
9590
msgstr ""
9591
9592
#: en/help_topics/configuration.txt:135
9593
msgid ""
9594
"BZR_DISABLE_PLUGINS\n"
9595
"~~~~~~~~~~~~~~~~~~~"
9596
msgstr ""
9597
9598
#: en/help_topics/configuration.txt:138
9599
msgid ""
9600
"Under special circumstances (mostly when trying to diagnose a\n"
9601
"bug), it's better to disable a plugin (or several) rather than\n"
9602
"uninstalling them completely. Such plugins can be specified in\n"
9603
"the ``BZR_DISABLE_PLUGINS`` environment variable."
9604
msgstr ""
9605
9606
#: en/help_topics/configuration.txt:143
9607
msgid ""
9608
"In that case, ``bzr`` will stop loading the specified plugins and\n"
9609
"will raise an import error if they are explicitly imported (by\n"
9610
"another plugin that depends on them for example)."
9611
msgstr ""
9612
9613
#: en/help_topics/configuration.txt:147
9614
msgid "Disabling ``myplugin`` and ``yourplugin`` is achieved by::"
9615
msgstr ""
9616
9617
#: en/help_topics/configuration.txt:149
9618
msgid " BZR_DISABLE_PLUGINS='myplugin:yourplugin'"
9619
msgstr ""
9620
9621
#: en/help_topics/configuration.txt:151
9622
msgid ""
9623
"BZR_PLUGINS_AT\n"
9624
"~~~~~~~~~~~~~~"
9625
msgstr ""
9626
9627
#: en/help_topics/configuration.txt:154
9628
msgid ""
9629
"When adding a new feature or working on a bug in a plugin,\n"
9630
"developers often need to use a specific version of a given\n"
9631
"plugin. Since python requires that the directory containing the\n"
9632
"code is named like the plugin itself this make it impossible to\n"
9633
"use arbitrary directory names (using a two-level directory scheme\n"
9634
"is inconvenient). ``BZR_PLUGINS_AT`` allows such directories even\n"
9635
"if they don't appear in ``BZR_PLUGIN_PATH`` ."
9636
msgstr ""
9637
9638
#: en/help_topics/configuration.txt:162
9639
msgid ""
9640
"Plugins specified in this environment variable takes precedence\n"
9641
"over the ones in ``BZR_PLUGIN_PATH``."
9642
msgstr ""
9643
9644
#: en/help_topics/configuration.txt:165
9645
msgid ""
9646
"The variable specified a list of ``plugin_name@plugin path``,\n"
9647
"``plugin_name`` being the name of the plugin as it appears in\n"
9648
"python module paths, ``plugin_path`` being the path to the\n"
9649
"directory containing the plugin code itself\n"
9650
"(i.e. ``plugins/myplugin`` not ``plugins``). Use ':' as the list\n"
9651
"separator, use ';' on windows."
9652
msgstr ""
9653
9654
#: en/help_topics/configuration.txt:172
9655
msgid ""
9656
"Example:\n"
9657
"~~~~~~~~"
9658
msgstr ""
9659
9660
#: en/help_topics/configuration.txt:175
9661
msgid ""
9662
"Using a specific version of ``myplugin``:\n"
9663
"``BZR_PLUGINS_AT='myplugin@/home/me/bugfixes/123456-myplugin``"
9664
msgstr ""
9665
9666
#: en/help_topics/configuration.txt:178
9667
msgid ""
9668
"BZRPATH\n"
9669
"~~~~~~~"
9670
msgstr ""
9671
9672
#: en/help_topics/configuration.txt:181
9673
msgid "The path where Bazaar should look for shell plugin external commands."
9674
msgstr ""
9675
9676
#: en/help_topics/configuration.txt:183
9677
msgid ""
9678
"\n"
9679
"http_proxy, https_proxy\n"
9680
"~~~~~~~~~~~~~~~~~~~~~~~"
9681
msgstr ""
9682
9683
#: en/help_topics/configuration.txt:187
9684
msgid "Specifies the network proxy for outgoing connections, for example::"
9685
msgstr ""
9686
9687
#: en/help_topics/configuration.txt:189
9688
msgid ""
9689
" http_proxy=http://proxy.example.com:3128/ \n"
9690
" https_proxy=http://proxy.example.com:3128/"
9691
msgstr ""
9692
9693
#: en/help_topics/configuration.txt:192
9694
msgid ""
9695
"\n"
9696
"Configuration files\n"
9697
"-------------------"
9698
msgstr ""
9699
9700
#: en/help_topics/configuration.txt:196
9701
msgid ""
9702
"Location\n"
9703
"~~~~~~~~"
9704
msgstr ""
9705
9706
#: en/help_topics/configuration.txt:199
9707
msgid ""
9708
"Configuration files are located in ``$HOME/.bazaar`` on Unix and\n"
9709
"``C:\\Documents and Settings\\<username>\\Application Data\\Bazaar\\2.0`` "
9710
"on\n"
9711
"Windows. (You can check the location for your system by using\n"
9712
"``bzr version``.)"
9713
msgstr ""
9714
9715
#: en/help_topics/configuration.txt:204
9716
msgid "There are three primary configuration files in this location:"
9717
msgstr ""
9718
9719
#: en/help_topics/configuration.txt:206
9720
msgid "* ``bazaar.conf`` describes default configuration options,"
9721
msgstr ""
9722
9723
#: en/help_topics/configuration.txt:208
9724
msgid ""
9725
"* ``locations.conf`` describes configuration information for\n"
9726
" specific branch locations,"
9727
msgstr ""
9728
9729
#: en/help_topics/configuration.txt:211
9730
msgid ""
9731
"* ``authentication.conf`` describes credential information for\n"
9732
" remote servers."
9733
msgstr ""
9734
9735
#: en/help_topics/configuration.txt:214
9736
msgid ""
9737
"Each branch can also contain a configuration file that sets values specific\n"
9738
"to that branch. This file is found at ``.bzr/branch/branch.conf`` within "
9739
"the\n"
9740
"branch. This file is visible to all users of a branch, if you wish to "
9741
"override\n"
9742
"one of the values for a branch with a setting that is specific to you then "
9743
"you\n"
9744
"can do so in ``locations.conf``."
9745
msgstr ""
9746
9747
#: en/help_topics/configuration.txt:220
9748
msgid ""
9749
"General format\n"
9750
"~~~~~~~~~~~~~~"
9751
msgstr ""
9752
9753
#: en/help_topics/configuration.txt:223
9754
msgid ""
9755
"An ini file has three types of contructs: section headers, section\n"
9756
"options and comments."
9757
msgstr ""
9758
9759
#: en/help_topics/configuration.txt:226
9760
msgid ""
9761
"Comments\n"
9762
"^^^^^^^^"
9763
msgstr ""
9764
9765
#: en/help_topics/configuration.txt:229
9766
msgid ""
9767
"A comment is any line that starts with a \"#\" (sometimes called a \"hash\n"
9768
"mark\", \"pound sign\" or \"number sign\"). Comment lines are ignored by\n"
9769
"Bazaar when parsing ini files."
9770
msgstr ""
9771
9772
#: en/help_topics/configuration.txt:233
9773
msgid ""
9774
"Section headers\n"
9775
"^^^^^^^^^^^^^^^"
9776
msgstr ""
9777
9778
#: en/help_topics/configuration.txt:236
9779
msgid ""
9780
"A section header is a word enclosed in brackets that starts at the begining\n"
9781
"of a line. A typical section header looks like this::"
9782
msgstr ""
9783
9784
#: en/help_topics/configuration.txt:239
9785
msgid " [DEFAULT]"
9786
msgstr ""
9787
9788
#: en/help_topics/configuration.txt:241
9789
msgid ""
9790
"The only valid section headers for bazaar.conf currently are [DEFAULT] and\n"
9791
"[ALIASES]. Section headers are case sensitive. The default section provides "
9792
"for\n"
9793
"setting options which can be overridden with the branch config file."
9794
msgstr ""
9795
9796
#: en/help_topics/configuration.txt:245
9797
msgid ""
9798
"For ``locations.conf``, the options from the section with the\n"
9799
"longest matching section header are used to the exclusion of other\n"
9800
"potentially valid section headers. A section header uses the path for\n"
9801
"the branch as the section header. Some examples include::"
9802
msgstr ""
9803
9804
#: en/help_topics/configuration.txt:250
9805
msgid ""
9806
" [http://mybranches.isp.com/~jdoe/branchdir]\n"
9807
" [/home/jdoe/branches/]"
9808
msgstr ""
9809
9810
#: en/help_topics/configuration.txt:253
9811
msgid ""
9812
"\n"
9813
"Section options\n"
9814
"^^^^^^^^^^^^^^^"
9815
msgstr ""
9816
9817
#: en/help_topics/configuration.txt:257
9818
msgid ""
9819
"A section option resides within a section. A section option contains an\n"
9820
"option name, an equals sign and a value. For example::"
9821
msgstr ""
9822
9823
#: en/help_topics/configuration.txt:260
9824
msgid ""
9825
" email = John Doe <jdoe@isp.com>\n"
9826
" gpg_signing_key = Amy Pond <amy@example.com>"
9827
msgstr ""
9828
9829
#: en/help_topics/configuration.txt:263
9830
msgid ""
9831
"A option can reference other options by enclosing them in curly brackets::"
9832
msgstr ""
9833
9834
#: en/help_topics/configuration.txt:265
9835
msgid ""
9836
" my_branch_name = feature_x\n"
9837
" my_server = bzr+ssh://example.com\n"
9838
" push_location = {my_server}/project/{my_branch_name}"
9839
msgstr ""
9840
9841
#: en/help_topics/configuration.txt:269
9842
msgid ""
9843
"Option policies\n"
9844
"^^^^^^^^^^^^^^^"
9845
msgstr ""
9846
9847
#: en/help_topics/configuration.txt:272
9848
msgid ""
9849
"Options defined in a section affect the named directory or URL plus\n"
9850
"any locations they contain. Policies can be used to change how an\n"
9851
"option value is interpreted for contained locations. Currently\n"
9852
"there are three policies available:"
9853
msgstr ""
9854
9855
#: en/help_topics/configuration.txt:277
9856
msgid ""
9857
" none:\n"
9858
" the value is interpreted the same for contained locations. This is\n"
9859
" the default behaviour.\n"
9860
" norecurse:\n"
9861
" the value is only used for the exact location specified by the\n"
9862
" section name.\n"
9863
" appendpath:\n"
9864
" for contained locations, any additional path components are\n"
9865
" appended to the value."
9866
msgstr ""
9867
9868
#: en/help_topics/configuration.txt:287
9869
msgid ""
9870
"Policies are specified by keys with names of the form \"<option_name>:policy"
9871
"\".\n"
9872
"For example, to define the push location for a tree of branches, the\n"
9873
"following could be used::"
9874
msgstr ""
9875
9876
#: en/help_topics/configuration.txt:291
9877
msgid ""
9878
" [/top/location]\n"
9879
" push_location = sftp://example.com/location\n"
9880
" push_location:policy = appendpath"
9881
msgstr ""
9882
9883
#: en/help_topics/configuration.txt:295
9884
msgid ""
9885
"With this configuration, the push location for ``/top/location/branch1``\n"
9886
"would be ``sftp://example.com/location/branch1``."
9887
msgstr ""
9888
9889
#: en/help_topics/configuration.txt:298
9890
msgid ""
9891
"Section local options\n"
9892
"^^^^^^^^^^^^^^^^^^^^^"
9893
msgstr ""
9894
9895
#: en/help_topics/configuration.txt:301
9896
msgid ""
9897
"Some options are defined automatically inside a given section and can be\n"
9898
"refered to in this section only. "
9899
msgstr ""
9900
9901
#: en/help_topics/configuration.txt:304
9902
msgid "For example, the ``appendpath`` policy can be used like this::"
9903
msgstr ""
9904
9905
#: en/help_topics/configuration.txt:306
9906
msgid ""
9907
" [/home/vila/src/bzr/bugs]\n"
9908
" mypush = lp:~vila/bzr\n"
9909
" mypush:policy=appendpath"
9910
msgstr ""
9911
9912
#: en/help_topics/configuration.txt:310
9913
msgid "Using ``relpath`` to achieve the same result is done like this::"
9914
msgstr ""
9915
9916
#: en/help_topics/configuration.txt:312
9917
msgid ""
9918
" [/home/vila/src/bzr/bugs]\n"
9919
" mypush = lp:~vila/bzr/{relpath}"
9920
msgstr ""
9921
9922
#: en/help_topics/configuration.txt:315
9923
msgid ""
9924
"In both cases, when used in a directory like\n"
9925
"``/home/vila/src/bzr/bugs/832013-expand-in-stack`` we'll get::"
9926
msgstr ""
9927
9928
#: en/help_topics/configuration.txt:318 en/help_topics/configuration.txt:329
9929
msgid ""
9930
" $ bzr config mypush\n"
9931
" lp:~vila/bzr/832013-expand-in-stack"
9932
msgstr ""
9933
9934
#: en/help_topics/configuration.txt:321
9935
msgid "Another such option is ``basename`` which can be used like this::"
9936
msgstr ""
9937
9938
#: en/help_topics/configuration.txt:323
9939
msgid ""
9940
" [/home/vila/src/bzr]\n"
9941
" mypush = lp:~vila/bzr/{basename}"
9942
msgstr ""
9943
9944
#: en/help_topics/configuration.txt:326
9945
msgid ""
9946
"When used in a directory like\n"
9947
"``/home/vila/src/bzr/bugs/832013-expand-in-stack`` we'll get::"
9948
msgstr ""
9949
9950
#: en/help_topics/configuration.txt:332
9951
msgid ""
9952
"Note that ``basename`` here refers to the base name of ``relpath`` which\n"
9953
"itself is defined as the relative path between the section name and the\n"
9954
"location it matches."
9955
msgstr ""
9956
9957
#: en/help_topics/configuration.txt:336
9958
msgid ""
9959
"When an option is local to a Section, it cannot be referred to from option\n"
9960
"values in any other section from the same ``Store`` nor from any other\n"
9961
"``Store``."
9962
msgstr ""
9963
9964
#: en/help_topics/configuration.txt:340
9965
msgid ""
9966
"\n"
9967
"The main configuration file, bazaar.conf\n"
9968
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
9969
msgstr ""
9970
9971
#: en/help_topics/configuration.txt:344
9972
msgid ""
9973
"``bazaar.conf`` allows two sections: ``[DEFAULT]`` and ``[ALIASES]``.\n"
9974
"The default section contains the default\n"
9975
"configuration options for all branches. The default section can be\n"
9976
"overriden by providing a branch-specific section in ``locations.conf``."
9977
msgstr ""
9978
9979
#: en/help_topics/configuration.txt:349
9980
msgid "A typical ``bazaar.conf`` section often looks like the following::"
9981
msgstr ""
9982
9983
#: en/help_topics/configuration.txt:351
9984
msgid ""
9985
" [DEFAULT]\n"
9986
" email = John Doe <jdoe@isp.com>\n"
9987
" editor = /usr/bin/vim\n"
9988
" create_signatures = when-required"
9989
msgstr ""
9990
9991
#: en/help_topics/configuration.txt:356
9992
msgid ""
9993
"\n"
9994
"The branch location configuration file, locations.conf\n"
9995
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
9996
msgstr ""
9997
9998
#: en/help_topics/configuration.txt:360
9999
msgid ""
10000
"``locations.conf`` allows one to specify overriding settings for\n"
10001
"a specific branch. The format is almost identical to the default section in\n"
10002
"bazaar.conf with one significant change: The section header, instead of "
10003
"saying\n"
10004
"default, will be the path to a branch that you wish to override a value\n"
10005
"for. The '?' and '*' wildcards are supported::"
10006
msgstr ""
10007
10008
#: en/help_topics/configuration.txt:366
10009
msgid ""
10010
" [/home/jdoe/branches/nethack]\n"
10011
" email = Nethack Admin <nethack@nethack.com>"
10012
msgstr ""
10013
10014
#: en/help_topics/configuration.txt:369
10015
msgid ""
10016
" [http://hypothetical.site.com/branches/devel-branch]\n"
10017
" create_signatures = always"
10018
msgstr ""
10019
10020
#: en/help_topics/configuration.txt:372
10021
msgid ""
10022
"The authentication configuration file, authentication.conf\n"
10023
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
10024
msgstr ""
10025
10026
#: en/help_topics/configuration.txt:375
10027
msgid ""
10028
"``authentication.conf`` allows one to specify credentials for\n"
10029
"remote servers. This can be used for all the supported transports and any "
10030
"part\n"
10031
"of bzr that requires authentication (smtp for example)."
10032
msgstr ""
10033
10034
#: en/help_topics/configuration.txt:379
10035
msgid ""
10036
"The syntax of the file obeys the same rules as the others except for the\n"
10037
"option policies which don't apply."
10038
msgstr ""
10039
10040
#: en/help_topics/configuration.txt:382
10041
msgid ""
10042
"For more information on the possible uses of the authentication "
10043
"configuration\n"
10044
"file see :doc:`authentication-help`."
10045
msgstr ""
10046
10047
#: en/help_topics/configuration.txt:385
10048
msgid ""
10049
"\n"
10050
"Common options\n"
10051
"--------------"
10052
msgstr ""
10053
10054
#: en/help_topics/configuration.txt:389
10055
msgid ""
10056
"debug_flags\n"
10057
"~~~~~~~~~~~"
10058
msgstr ""
10059
10060
#: en/help_topics/configuration.txt:392
10061
msgid ""
10062
"A comma-separated list of debugging options to turn on. The same values\n"
10063
"can be used as with the -D command-line option (see `help global-options`).\n"
10064
"For example::"
10065
msgstr ""
10066
10067
#: en/help_topics/configuration.txt:396
10068
msgid " debug_flags = hpss"
10069
msgstr ""
10070
10071
#: en/help_topics/configuration.txt:400
10072
msgid " debug_flags = hpss,evil"
10073
msgstr ""
10074
10075
#: en/help_topics/configuration.txt:402
10076
msgid ""
10077
"email\n"
10078
"~~~~~"
10079
msgstr ""
10080
10081
#: en/help_topics/configuration.txt:405
10082
msgid ""
10083
"The email address to use when committing a branch. Typically takes the form\n"
10084
"of::"
10085
msgstr ""
10086
10087
#: en/help_topics/configuration.txt:408
10088
msgid " email = Full Name <account@hostname.tld>"
10089
msgstr ""
10090
10091
#: en/help_topics/configuration.txt:410
10092
msgid ""
10093
"editor\n"
10094
"~~~~~~"
10095
msgstr ""
10096
10097
#: en/help_topics/configuration.txt:413
10098
msgid ""
10099
"The path of the editor that you wish to use if *bzr commit* is run without\n"
10100
"a commit message. This setting is trumped by the environment variable\n"
10101
"``BZR_EDITOR``, and overrides the ``VISUAL`` and ``EDITOR`` environment\n"
10102
"variables."
10103
msgstr ""
10104
10105
#: en/help_topics/configuration.txt:418
10106
msgid ""
10107
"log_format\n"
10108
"~~~~~~~~~~"
10109
msgstr ""
10110
10111
#: en/help_topics/configuration.txt:421
10112
msgid ""
10113
"The default log format to use. Standard log formats are ``long``, ``short``\n"
10114
"and ``line``. Additional formats may be provided by plugins. The default\n"
10115
"value is ``long``."
10116
msgstr ""
10117
10118
#: en/help_topics/configuration.txt:425
10119
msgid ""
10120
"check_signatures\n"
10121
"~~~~~~~~~~~~~~~~"
10122
msgstr ""
10123
10124
#: en/help_topics/configuration.txt:428
10125
msgid ""
10126
"Reserved for future use. These options will allow a policy for branches to\n"
10127
"require signatures."
10128
msgstr ""
10129
10130
#: en/help_topics/configuration.txt:431
10131
msgid ""
10132
"require\n"
10133
" The gnupg signature for revisions must be present and must be valid."
10134
msgstr ""
10135
10136
#: en/help_topics/configuration.txt:434
10137
msgid ""
10138
"ignore\n"
10139
" Do not check gnupg signatures of revisions."
10140
msgstr ""
10141
10142
#: en/help_topics/configuration.txt:437
10143
msgid ""
10144
"check-available\n"
10145
" (default) If gnupg signatures for revisions are present, check them.\n"
10146
" Bazaar will fail if it finds a bad signature, but will not fail if\n"
10147
" no signature is present."
10148
msgstr ""
10149
10150
#: en/help_topics/configuration.txt:442
10151
msgid ""
10152
"create_signatures\n"
10153
"~~~~~~~~~~~~~~~~~"
10154
msgstr ""
10155
10156
#: en/help_topics/configuration.txt:445
10157
msgid ""
10158
"Defines the behaviour of signing revisions on commits. By default bzr will "
10159
"not\n"
10160
"sign new commits."
10161
msgstr ""
10162
10163
#: en/help_topics/configuration.txt:448
10164
msgid ""
10165
"always\n"
10166
" Sign every new revision that is committed. If the signing fails then "
10167
"the\n"
10168
" commit will not be made."
10169
msgstr ""
10170
10171
#: en/help_topics/configuration.txt:452
10172
msgid ""
10173
"when-required\n"
10174
" Reserved for future use."
10175
msgstr ""
10176
10177
#: en/help_topics/configuration.txt:455
10178
msgid ""
10179
"never\n"
10180
" Reserved for future use."
10181
msgstr ""
10182
10183
#: en/help_topics/configuration.txt:458
10184
msgid ""
10185
"In future it is planned that ``when-required`` will sign newly\n"
10186
"committed revisions only when the branch requires them. ``never`` will "
10187
"refuse\n"
10188
"to sign newly committed revisions, even if the branch requires signatures."
10189
msgstr ""
10190
10191
#: en/help_topics/configuration.txt:462
10192
msgid ""
10193
"dirstate.fdatasync\n"
10194
"~~~~~~~~~~~~~~~~~~"
10195
msgstr ""
10196
10197
#: en/help_topics/configuration.txt:465
10198
msgid ""
10199
"If true (default), working tree metadata changes are flushed through the\n"
10200
"OS buffers to physical disk. This is somewhat slower, but means data\n"
10201
"should not be lost if the machine crashes. See also repository.fdatasync."
10202
msgstr ""
10203
10204
#: en/help_topics/configuration.txt:469
10205
msgid ""
10206
"gpg_signing_key\n"
10207
"~~~~~~~~~~~~~~~"
10208
msgstr ""
10209
10210
#: en/help_topics/configuration.txt:472
10211
msgid ""
10212
"The GnuPG user identity to use when signing commits. Can be an e-mail\n"
10213
"address, key fingerprint or full key ID. When unset or when set to\n"
10214
"\"default\" Bazaar will use the user e-mail set with ``whoami``."
10215
msgstr ""
10216
10217
#: en/help_topics/configuration.txt:476
10218
msgid ""
10219
"recurse\n"
10220
"~~~~~~~"
10221
msgstr ""
10222
10223
#: en/help_topics/configuration.txt:479
10224
msgid ""
10225
"Only useful in ``locations.conf``. Defines whether or not the\n"
10226
"configuration for this section applies to subdirectories:"
10227
msgstr ""
10228
10229
#: en/help_topics/configuration.txt:482
10230
msgid ""
10231
"true\n"
10232
" (default) This section applies to subdirectories as well."
10233
msgstr ""
10234
10235
#: en/help_topics/configuration.txt:485
10236
msgid ""
10237
"false\n"
10238
" This section only applies to the branch at this directory and not\n"
10239
" branches below it."
10240
msgstr ""
10241
10242
#: en/help_topics/configuration.txt:489
10243
msgid ""
10244
"gpg_signing_command\n"
10245
"~~~~~~~~~~~~~~~~~~~"
10246
msgstr ""
10247
10248
#: en/help_topics/configuration.txt:492
10249
msgid ""
10250
"(Default: \"gpg\"). Which program should be used to sign and check "
10251
"revisions.\n"
10252
"For example::"
10253
msgstr ""
10254
10255
#: en/help_topics/configuration.txt:495
10256
msgid " gpg_signing_command = /usr/bin/gnpg"
10257
msgstr ""
10258
10259
#: en/help_topics/configuration.txt:497
10260
msgid ""
10261
"The specified command must accept the options \"--clearsign\" and \"-u "
10262
"<email>\"."
10263
msgstr ""
10264
10265
#: en/help_topics/configuration.txt:499
10266
msgid ""
10267
"bzr_remote_path\n"
10268
"~~~~~~~~~~~~~~~"
10269
msgstr ""
10270
10271
#: en/help_topics/configuration.txt:502
10272
msgid ""
10273
"(Default: \"bzr\"). The path to the command that should be used to run the "
10274
"smart\n"
10275
"server for bzr. This value may only be specified in locations.conf, because:"
10276
msgstr ""
10277
10278
#: en/help_topics/configuration.txt:505
10279
msgid ""
10280
"- it's needed before branch.conf is accessible\n"
10281
"- allowing remote branch.conf files to specify commands would be a security\n"
10282
" risk"
10283
msgstr ""
10284
10285
#: en/help_topics/configuration.txt:509
10286
msgid "It is overridden by the BZR_REMOTE_PATH environment variable."
10287
msgstr ""
10288
10289
#: en/help_topics/configuration.txt:511
10290
msgid ""
10291
"smtp_server\n"
10292
"~~~~~~~~~~~"
10293
msgstr ""
10294
10295
#: en/help_topics/configuration.txt:514
10296
msgid ""
10297
"(Default: \"localhost\"). SMTP server to use when Bazaar needs to send\n"
10298
"email, eg. with ``merge-directive --mail-to``, or the bzr-email plugin."
10299
msgstr ""
10300
10301
#: en/help_topics/configuration.txt:517
10302
msgid ""
10303
"smtp_username, smtp_password\n"
10304
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
10305
msgstr ""
10306
10307
#: en/help_topics/configuration.txt:520
10308
msgid ""
10309
"User and password to authenticate to the SMTP server. If smtp_username\n"
10310
"is set, and smtp_password is not, Bazaar will prompt for a password.\n"
10311
"These settings are only needed if the SMTP server requires authentication\n"
10312
"to send mail."
10313
msgstr ""
10314
10315
#: en/help_topics/configuration.txt:525
10316
msgid ""
10317
"locks.steal_dead\n"
10318
"~~~~~~~~~~~~~~~~"
10319
msgstr ""
10320
10321
#: en/help_topics/configuration.txt:528
10322
msgid ""
10323
"If set to true, bzr will automatically break locks held by processes from\n"
10324
"the same machine and user that are no longer alive. Otherwise, it will\n"
10325
"print a message and you can break the lock manually, if you are satisfied\n"
10326
"the object is no longer in use."
10327
msgstr ""
10328
10329
#: en/help_topics/configuration.txt:533
10330
msgid ""
10331
"mail_client\n"
10332
"~~~~~~~~~~~"
10333
msgstr ""
10334
10335
#: en/help_topics/configuration.txt:536
10336
msgid ""
10337
"A mail client to use for sending merge requests.\n"
10338
"By default, bzr will try to use ``mapi`` on Windows. On other platforms, "
10339
"it\n"
10340
"will try ``xdg-email``. If either of these fails, it will fall back to\n"
10341
"``editor``."
10342
msgstr ""
10343
10344
#: en/help_topics/configuration.txt:541
10345
msgid "Supported values for specific clients:"
10346
msgstr ""
10347
10348
#: en/help_topics/configuration.txt:543
10349
msgid ""
10350
":claws: Use Claws. This skips a dialog for attaching files.\n"
10351
":evolution: Use Evolution.\n"
10352
":kmail: Use KMail.\n"
10353
":mutt: Use Mutt.\n"
10354
":thunderbird: Use Mozilla Thunderbird or Icedove. For Thunderbird/Icedove "
10355
"1.5,\n"
10356
" this works around some bugs that xdg-email doesn't handle."
10357
msgstr ""
10358
10359
#: en/help_topics/configuration.txt:550
10360
msgid "Supported generic values are:"
10361
msgstr ""
10362
10363
#: en/help_topics/configuration.txt:552
10364
msgid ""
10365
":default: See above.\n"
10366
":editor: Use your editor to compose the merge request. This also uses\n"
10367
" your commit id, (see ``bzr whoami``), smtp_server and (optionally)\n"
10368
" smtp_username and smtp_password.\n"
10369
":mapi: Use your preferred e-mail client on Windows.\n"
10370
":xdg-email: Use xdg-email to run your preferred mail program"
10371
msgstr ""
10372
10373
#: en/help_topics/configuration.txt:559
10374
msgid ""
10375
"repository.fdatasync\n"
10376
"~~~~~~~~~~~~~~~~~~~~"
10377
msgstr ""
10378
10379
#: en/help_topics/configuration.txt:562
10380
msgid ""
10381
"If true (default), repository changes are flushed through the OS buffers\n"
10382
"to physical disk. This is somewhat slower, but means data should not be\n"
10383
"lost if the machine crashes. See also dirstate.fdatasync."
10384
msgstr ""
10385
10386
#: en/help_topics/configuration.txt:566
10387
msgid ""
10388
"submit_branch\n"
10389
"~~~~~~~~~~~~~"
10390
msgstr ""
10391
10392
#: en/help_topics/configuration.txt:569
10393
msgid ""
10394
"The branch you intend to submit your current work to. This is "
10395
"automatically\n"
10396
"set by ``bzr send``, and is also used by the ``submit:`` revision spec. "
10397
"This\n"
10398
"should usually be set on a per-branch or per-location basis."
10399
msgstr ""
10400
10401
#: en/help_topics/configuration.txt:573
10402
msgid ""
10403
"public_branch\n"
10404
"~~~~~~~~~~~~~"
10405
msgstr ""
10406
10407
#: en/help_topics/configuration.txt:576
10408
msgid ""
10409
"A publically-accessible version of this branch (implying that this version "
10410
"is\n"
10411
"not publically-accessible). Used (and set) by ``bzr send``."
10412
msgstr ""
10413
10414
#: en/help_topics/configuration.txt:579
10415
msgid ""
10416
"suppress_warnings\n"
10417
"~~~~~~~~~~~~~~~~~"
10418
msgstr ""
10419
10420
#: en/help_topics/configuration.txt:582
10421
msgid ""
10422
"A list of strings, each string represent a warning that can be emitted by\n"
10423
"bzr. Mentioning a warning in this list tells bzr to not emit it."
10424
msgstr ""
10425
10426
#: en/help_topics/configuration.txt:585
10427
msgid "Valid values:"
10428
msgstr ""
10429
10430
#: en/help_topics/configuration.txt:587
10431
msgid ""
10432
"* ``format_deprecation``:\n"
10433
" whether the format deprecation warning is shown on repositories that "
10434
"are\n"
10435
" using deprecated formats."
10436
msgstr ""
10437
10438
#: en/help_topics/configuration.txt:591
10439
msgid ""
10440
"default_format\n"
10441
"~~~~~~~~~~~~~~"
10442
msgstr ""
10443
10444
#: en/help_topics/configuration.txt:594
10445
msgid ""
10446
"A format name for the default format used when creating branches. See "
10447
"``bzr\n"
10448
"help formats`` for possible values."
10449
msgstr ""
10450
10451
#: en/help_topics/configuration.txt:597
10452
msgid ""
10453
"\n"
10454
"Unicode options\n"
10455
"---------------"
10456
msgstr ""
10457
10458
#: en/help_topics/configuration.txt:601
10459
msgid ""
10460
"output_encoding\n"
10461
"~~~~~~~~~~~~~~~"
10462
msgstr ""
10463
10464
#: en/help_topics/configuration.txt:604
10465
msgid ""
10466
"A Python unicode encoding name for text output from bzr, such as log\n"
10467
"information. Values include: utf8, cp850, ascii, iso-8859-1. The default\n"
10468
"is the terminal encoding prefered by the operating system."
10469
msgstr ""
10470
10471
#: en/help_topics/configuration.txt:608
10472
msgid ""
10473
"\n"
10474
"Branch type specific options\n"
10475
"----------------------------"
10476
msgstr ""
10477
10478
#: en/help_topics/configuration.txt:612
10479
msgid ""
10480
"These options apply only to branches that use the ``dirstate-tags`` or\n"
10481
"later format. They\n"
10482
"are usually set in ``.bzr/branch/branch.conf`` automatically, but may be\n"
10483
"manually set in ``locations.conf`` or ``bazaar.conf``."
10484
msgstr ""
10485
10486
#: en/help_topics/configuration.txt:617
10487
msgid ""
10488
"append_revisions_only\n"
10489
"~~~~~~~~~~~~~~~~~~~~~"
10490
msgstr ""
10491
10492
#: en/help_topics/configuration.txt:620
10493
msgid ""
10494
"If set to \"True\" then revisions can only be appended to the log, not\n"
10495
"removed. A branch with this setting enabled can only pull from another\n"
10496
"branch if the other branch's log is a longer version of its own. This is\n"
10497
"normally set by ``bzr init --append-revisions-only``. If you set it\n"
10498
"manually, use either 'True' or 'False' (case-sensitive) to maintain\n"
10499
"compatibility with previous bzr versions (older than 2.2)."
10500
msgstr ""
10501
10502
#: en/help_topics/configuration.txt:627
10503
msgid ""
10504
"parent_location\n"
10505
"~~~~~~~~~~~~~~~"
10506
msgstr ""
10507
10508
#: en/help_topics/configuration.txt:630
10509
msgid ""
10510
"If present, the location of the default branch for pull or merge. This "
10511
"option\n"
10512
"is normally set when creating a branch, the first ``pull`` or by ``pull\n"
10513
"--remember``."
10514
msgstr ""
10515
10516
#: en/help_topics/configuration.txt:634
10517
msgid ""
10518
"push_location\n"
10519
"~~~~~~~~~~~~~"
10520
msgstr ""
10521
10522
#: en/help_topics/configuration.txt:637
10523
msgid ""
10524
"If present, the location of the default branch for push. This option\n"
10525
"is normally set by the first ``push`` or ``push --remember``."
10526
msgstr ""
10527
10528
#: en/help_topics/configuration.txt:640
10529
msgid ""
10530
"push_strict\n"
10531
"~~~~~~~~~~~"
10532
msgstr ""
10533
10534
#: en/help_topics/configuration.txt:643
10535
msgid ""
10536
"If present, defines the ``--strict`` option default value for checking\n"
10537
"uncommitted changes before pushing."
10538
msgstr ""
10539
10540
#: en/help_topics/configuration.txt:646
10541
msgid ""
10542
"dpush_strict\n"
10543
"~~~~~~~~~~~~"
10544
msgstr ""
10545
10546
#: en/help_topics/configuration.txt:649
10547
msgid ""
10548
"If present, defines the ``--strict`` option default value for checking\n"
10549
"uncommitted changes before pushing into a different VCS without any\n"
10550
"custom bzr metadata."
10551
msgstr ""
10552
10553
#: en/help_topics/configuration.txt:653
10554
msgid ""
10555
"bound_location\n"
10556
"~~~~~~~~~~~~~~"
10557
msgstr ""
10558
10559
#: en/help_topics/configuration.txt:656
10560
msgid ""
10561
"The location that commits should go to when acting as a checkout.\n"
10562
"This option is normally set by ``bind``."
10563
msgstr ""
10564
10565
#: en/help_topics/configuration.txt:659
10566
msgid ""
10567
"bound\n"
10568
"~~~~~"
10569
msgstr ""
10570
10571
#: en/help_topics/configuration.txt:662
10572
msgid ""
10573
"If set to \"True\", the branch should act as a checkout, and push each "
10574
"commit to\n"
10575
"the bound_location. This option is normally set by ``bind``/``unbind``."
10576
msgstr ""
10577
10578
#: en/help_topics/configuration.txt:665
10579
msgid ""
10580
"send_strict\n"
10581
"~~~~~~~~~~~"
10582
msgstr ""
10583
10584
#: en/help_topics/configuration.txt:668
10585
msgid ""
10586
"If present, defines the ``--strict`` option default value for checking\n"
10587
"uncommitted changes before sending a merge directive."
10588
msgstr ""
10589
10590
#: en/help_topics/configuration.txt:671
10591
msgid ""
10592
"add.maximum_file_size\n"
10593
"~~~~~~~~~~~~~~~~~~~~~"
10594
msgstr ""
10595
10596
#: en/help_topics/configuration.txt:674
10597
msgid ""
10598
"Defines the maximum file size the command line \"add\" operation will allow\n"
10599
"in recursive mode, with files larger than this value being skipped. You "
10600
"may \n"
10601
"specify this value as an integer (in which case it is interpreted as "
10602
"bytes), \n"
10603
"or you may specify the value using SI units, i.e. 10KB, 20MB, 1G. A value of "
10604
"0 \n"
10605
"will disable skipping."
10606
msgstr ""
10607
10608
#: en/help_topics/configuration.txt:680
10609
msgid ""
10610
"External Merge Tools\n"
10611
"--------------------"
10612
msgstr ""
10613
10614
#: en/help_topics/configuration.txt:683
10615
msgid ""
10616
"bzr.mergetool.<name>\n"
10617
"~~~~~~~~~~~~~~~~~~~~"
10618
msgstr ""
10619
10620
#: en/help_topics/configuration.txt:686
10621
msgid ""
10622
"Defines an external merge tool called <name> with the given command-line.\n"
10623
"Arguments containing spaces should be quoted using single or double quotes. "
10624
"The\n"
10625
"executable may omit its path if it can be found on the PATH."
10626
msgstr ""
10627
10628
#: en/help_topics/configuration.txt:690
10629
msgid ""
10630
"The following markers can be used in the command-line to substitute "
10631
"filenames\n"
10632
"involved in the merge conflict::"
10633
msgstr ""
10634
10635
#: en/help_topics/configuration.txt:693
10636
msgid ""
10637
" {base} file.BASE\n"
10638
" {this} file.THIS\n"
10639
" {other} file.OTHER\n"
10640
" {result} output file\n"
10641
" {this_temp} temp copy of file.THIS, used to overwrite output file if "
10642
"merge\n"
10643
" succeeds."
10644
msgstr ""
10645
10646
#: en/help_topics/configuration.txt:702
10647
msgid " bzr.mergetool.kdiff3 = kdiff3 {base} {this} {other} -o {result}"
10648
msgstr ""
10649
10650
#: en/help_topics/configuration.txt:704
10651
msgid ""
10652
"bzr.default_mergetool\n"
10653
"~~~~~~~~~~~~~~~~~~~~~"
10654
msgstr ""
10655
10656
#: en/help_topics/configuration.txt:707
10657
msgid ""
10658
"Specifies which external merge tool (as defined above) should be selected "
10659
"by\n"
10660
"default in tools such as ``bzr qconflicts``."
10661
msgstr ""
10662
10663
#: en/help_topics/configuration.txt:712
10664
msgid " bzr.default_mergetool = kdiff3\n"
10665
msgstr ""
10666
10667
#: en/help_topics/conflict-types.txt:1
10668
msgid ""
10669
"Conflict Types\n"
10670
"=============="
10671
msgstr ""
10672
10673
#: en/help_topics/conflict-types.txt:4
10674
msgid ""
10675
"Some operations, like merge, revert and pull, modify the contents of your\n"
10676
"working tree. These modifications are programmatically generated, and so "
10677
"they\n"
10678
"may conflict with the current state of your working tree. "
10679
msgstr ""
10680
10681
#: en/help_topics/conflict-types.txt:8
10682
msgid ""
10683
"When conflicts are present in your working tree (as shown by ``bzr\n"
10684
"conflicts``), you should resolve them and then inform bzr that the "
10685
"conflicts\n"
10686
"have been resolved."
10687
msgstr ""
10688
10689
#: en/help_topics/conflict-types.txt:12
10690
msgid ""
10691
"Resolving conflicts is sometimes not obvious. Either because the user that\n"
10692
"should resolve them is not the one responsible for their occurrence, as is "
10693
"the\n"
10694
"case when merging other people's work or because some conflicts are "
10695
"presented\n"
10696
"in a way that is not easy to understand."
10697
msgstr ""
10698
10699
#: en/help_topics/conflict-types.txt:17
10700
msgid ""
10701
"Bazaar tries to avoid conflicts ; its aim is to ask you to resolve the\n"
10702
"conflict if and only if there's an actual conceptual conflict in the source\n"
10703
"tree. Because Bazaar doesn't understand the real meaning of the files "
10704
"being\n"
10705
"versioned, it can, when faced with ambiguities, fall short in either "
10706
"direction\n"
10707
"trying to resolve the conflict itself. Many kinds of changes can be "
10708
"combined\n"
10709
"programmatically, but sometimes only a human can determine the right thing "
10710
"to\n"
10711
"do."
10712
msgstr ""
10713
10714
#: en/help_topics/conflict-types.txt:25
10715
msgid ""
10716
"When Bazaar generates a conflict, it adds information into the working tree "
10717
"to\n"
10718
"present the conflicting versions, and it's up to you to find the correct\n"
10719
"resolution."
10720
msgstr ""
10721
10722
#: en/help_topics/conflict-types.txt:29
10723
msgid "Whatever the conflict is, resolving it is roughly done in two steps:"
10724
msgstr ""
10725
10726
#: en/help_topics/conflict-types.txt:31
10727
msgid ""
10728
"1. Modify the working tree content so that the conflicted item is now in "
10729
"the\n"
10730
" state you want to keep, then"
10731
msgstr ""
10732
10733
#: en/help_topics/conflict-types.txt:34
10734
msgid ""
10735
"2. Inform Bazaar that the conflict is now solved and ask to cleanup any\n"
10736
" remaining generated information (``bzr resolve <item>``)."
10737
msgstr ""
10738
10739
#: en/help_topics/conflict-types.txt:37
10740
msgid ""
10741
"For most conflict types, there are some obvious ways to modify the working\n"
10742
"tree and put it into the desired state. For some types of conflicts, Bazaar\n"
10743
"itself already made a choice, when possible."
10744
msgstr ""
10745
10746
#: en/help_topics/conflict-types.txt:41
10747
msgid ""
10748
"Yet, whether Bazaar makes a choice or not, there are some other simple but\n"
10749
"different ways to resolve the conflict."
10750
msgstr ""
10751
10752
#: en/help_topics/conflict-types.txt:44
10753
msgid ""
10754
"Each type of conflict is explained below, and the action which must be done "
10755
"to\n"
10756
"resolve the conflict is outlined."
10757
msgstr ""
10758
10759
#: en/help_topics/conflict-types.txt:47
10760
msgid ""
10761
"Various actions are available depending on the kind of conflict, for some "
10762
"of\n"
10763
"these actions, Bazaar can provide some help. In the end you should at least\n"
10764
"inform Bazaar that you're done with the conflict with::"
10765
msgstr ""
10766
10767
#: en/help_topics/conflict-types.txt:51
10768
msgid " ``bzr resolve FILE --action=done'"
10769
msgstr ""
10770
10771
#: en/help_topics/conflict-types.txt:53
10772
msgid ""
10773
"Note that this is the default action when a single file is involved so you "
10774
"can\n"
10775
"simply use::"
10776
msgstr ""
10777
10778
#: en/help_topics/conflict-types.txt:56
10779
msgid " ``bzr resolve FILE``"
10780
msgstr ""
10781
10782
#: en/help_topics/conflict-types.txt:58
10783
msgid "See ``bzr help resolve`` for more details."
10784
msgstr ""
10785
10786
#: en/help_topics/conflict-types.txt:60
10787
msgid ""
10788
"Text conflicts\n"
10789
"--------------"
10790
msgstr ""
10791
10792
#: en/help_topics/conflict-types.txt:63 en/help_topics/conflict-types.txt:120
10793
#: en/help_topics/conflict-types.txt:151 en/help_topics/conflict-types.txt:175
10794
#: en/help_topics/conflict-types.txt:198 en/help_topics/conflict-types.txt:213
10795
#: en/help_topics/conflict-types.txt:239 en/help_topics/conflict-types.txt:281
10796
#: en/help_topics/conflict-types.txt:303 en/help_topics/conflict-types.txt:339
10797
msgid "Typical message::"
10798
msgstr ""
10799
10800
#: en/help_topics/conflict-types.txt:65
10801
msgid " Text conflict in FILE"
10802
msgstr ""
10803
10804
#: en/help_topics/conflict-types.txt:67
10805
msgid ""
10806
"These are produced when a text merge cannot completely reconcile two sets "
10807
"of\n"
10808
"text changes. Bazaar will emit files for each version with the extensions\n"
10809
"THIS, OTHER, and BASE. THIS is the version of the file from the target "
10810
"tree,\n"
10811
"i.e. the tree that you are merging changes into. OTHER is the version that "
10812
"you\n"
10813
"are merging into the target. BASE is an older version that is used as a "
10814
"basis\n"
10815
"for comparison."
10816
msgstr ""
10817
10818
#: en/help_topics/conflict-types.txt:74
10819
msgid ""
10820
"In the main copy of the file, Bazaar will include all the changes that it\n"
10821
"could reconcile, and any un-reconciled conflicts are surrounded by\n"
10822
"\"herringbone\" markers like ``<<<<<<<``."
10823
msgstr ""
10824
10825
#: en/help_topics/conflict-types.txt:78
10826
msgid ""
10827
"Say the initial text is \"The project leader released it.\", and THIS "
10828
"modifies it\n"
10829
"to \"Martin Pool released it.\", while OTHER modifies it to \"The project "
10830
"leader\n"
10831
"released Bazaar.\" A conflict would look like this::"
10832
msgstr ""
10833
10834
#: en/help_topics/conflict-types.txt:82
10835
msgid ""
10836
" <<<<<<< TREE\n"
10837
" Martin Pool released it.\n"
10838
" =======\n"
10839
" The project leader released Bazaar.\n"
10840
" >>>>>>> MERGE-SOURCE"
10841
msgstr ""
10842
10843
#: en/help_topics/conflict-types.txt:88
10844
msgid "The correct resolution would be \"Martin Pool released Bazaar.\""
10845
msgstr ""
10846
10847
#: en/help_topics/conflict-types.txt:90
10848
msgid ""
10849
"You can handle text conflicts either by editing the main copy of the file,\n"
10850
"or by invoking external tools on the THIS, OTHER and BASE versions. It's\n"
10851
"worth mentioning that resolving text conflicts rarely involves picking one\n"
10852
"set of changes over the other (but see below when you encounter these\n"
10853
"cases). More often, the two sets of changes must be intelligently combined."
10854
msgstr ""
10855
10856
#: en/help_topics/conflict-types.txt:96
10857
msgid ""
10858
"If you edit the main copy, be sure to remove the herringbone markers. When\n"
10859
"you are done editing, the file should look like it never had a conflict, and "
10860
"be\n"
10861
"ready to commit."
10862
msgstr ""
10863
10864
#: en/help_topics/conflict-types.txt:100
10865
msgid ""
10866
"When you have resolved text conflicts, just run ``bzr resolve --auto``, and\n"
10867
"Bazaar will auto-detect which conflicts you have resolved."
10868
msgstr ""
10869
10870
#: en/help_topics/conflict-types.txt:103
10871
msgid ""
10872
"When the conflict is resolved, Bazaar deletes the previously generated\n"
10873
"``.BASE``, ``.THIS`` and ``.OTHER`` files if they are still present in the\n"
10874
"working tree."
10875
msgstr ""
10876
10877
#: en/help_topics/conflict-types.txt:107
10878
msgid ""
10879
"\n"
10880
"When you want to pick one set of changes over the other, you can use ``bzr\n"
10881
"resolve`` with one of the following actions:"
10882
msgstr ""
10883
10884
#: en/help_topics/conflict-types.txt:111
10885
msgid ""
10886
"* ``--action=take-this`` will issue ``mv FILE.THIS FILE``,\n"
10887
"* ``--action=take-other`` will issue ``mv FILE.OTHER FILE``."
10888
msgstr ""
10889
10890
#: en/help_topics/conflict-types.txt:114
10891
msgid ""
10892
"Note that if you have modified ``FILE.THIS`` or ``FILE.OTHER``, these\n"
10893
"modifications will be taken into account."
10894
msgstr ""
10895
10896
#: en/help_topics/conflict-types.txt:117
10897
msgid ""
10898
"Content conflicts\n"
10899
"-----------------"
10900
msgstr ""
10901
10902
#: en/help_topics/conflict-types.txt:122
10903
msgid " Contents conflict in FILE"
10904
msgstr ""
10905
10906
#: en/help_topics/conflict-types.txt:124
10907
msgid ""
10908
"This conflict happens when there are conflicting changes in the working "
10909
"tree\n"
10910
"and the merge source, but the conflicted items are not text files. They "
10911
"may\n"
10912
"be binary files, or symlinks, or directories. It can even happen with "
10913
"files\n"
10914
"that are deleted on one side, and modified on the other."
10915
msgstr ""
10916
10917
#: en/help_topics/conflict-types.txt:129
10918
msgid ""
10919
"Like text conflicts, Bazaar will emit THIS, OTHER and BASE files. (They may "
10920
"be\n"
10921
"regular files, symlinks or directories). But it will not include a \"main "
10922
"copy\"\n"
10923
"of the file with herringbone conflict markers. It will appear that the "
10924
"\"main\n"
10925
"copy\" has been renamed to THIS or OTHER."
10926
msgstr ""
10927
10928
#: en/help_topics/conflict-types.txt:134 en/help_topics/conflict-types.txt:182
10929
msgid ""
10930
"To resolve that kind of conflict, you should rebuild FILE from either "
10931
"version\n"
10932
"or a combination of both."
10933
msgstr ""
10934
10935
#: en/help_topics/conflict-types.txt:137 en/help_topics/conflict-types.txt:185
10936
#: en/help_topics/conflict-types.txt:226 en/help_topics/conflict-types.txt:252
10937
#: en/help_topics/conflict-types.txt:291 en/help_topics/conflict-types.txt:326
10938
#: en/help_topics/conflict-types.txt:361
10939
msgid "``bzr resolve`` recognizes the following actions:"
10940
msgstr ""
10941
10942
#: en/help_topics/conflict-types.txt:139
10943
msgid ""
10944
"* ``--action=take-this`` will issue ``bzr mv FILE.THIS FILE``,\n"
10945
"* ``--action=take-other`` will issue ``bzr mv FILE.OTHER FILE``,\n"
10946
"* ``--action=done`` will just mark the conflict as resolved."
10947
msgstr ""
10948
10949
#: en/help_topics/conflict-types.txt:143
10950
msgid ""
10951
"Any action will also delete the previously generated ``.BASE``, ``.THIS`` "
10952
"and\n"
10953
"``.OTHER`` files if they are still present in the working tree."
10954
msgstr ""
10955
10956
#: en/help_topics/conflict-types.txt:146 en/help_topics/conflict-types.txt:193
10957
#: en/help_topics/conflict-types.txt:234 en/help_topics/conflict-types.txt:276
10958
#: en/help_topics/conflict-types.txt:298 en/help_topics/conflict-types.txt:334
10959
#: en/help_topics/conflict-types.txt:369
10960
msgid ""
10961
"Bazaar cannot auto-detect when conflicts of this kind have been resolved."
10962
msgstr ""
10963
10964
#: en/help_topics/conflict-types.txt:148
10965
msgid ""
10966
"Tag conflicts\n"
10967
"-------------"
10968
msgstr ""
10969
10970
#: en/help_topics/conflict-types.txt:153
10971
msgid ""
10972
" Conflicting tags:\n"
10973
" version-0.1"
10974
msgstr ""
10975
10976
#: en/help_topics/conflict-types.txt:156
10977
msgid ""
10978
"When pulling from or pushing to another branch, Bazaar informs you about "
10979
"tags\n"
10980
"that conflict between the two branches; that is the same tag points to two\n"
10981
"different revisions. You need not resolve these conflicts, but subsequent\n"
10982
"uses of pull or push will result in the same message."
10983
msgstr ""
10984
10985
#: en/help_topics/conflict-types.txt:161
10986
msgid ""
10987
"To resolve the conflict, you must apply the correct tags to either the "
10988
"target\n"
10989
"branch or the source branch as appropriate. Use \"bzr tags --show-ids -d\n"
10990
"SOURCE_URL\" to see the tags in the source branch. If you want to make the\n"
10991
"target branch's tags match the source branch, then in the target branch do\n"
10992
"``bzr tag --force -r revid:REVISION_ID CONFLICTING_TAG`` for each of the\n"
10993
"CONFLICTING_TAGs, where REVISION_ID comes from the list of tags in the "
10994
"source\n"
10995
"branch. You need not call \"bzr resolve\" after doing this. To resolve in\n"
10996
"favor of the target branch, you need to similarly use ``tag --force`` in "
10997
"the\n"
10998
"source branch. (Note that pulling or pushing using --overwrite will "
10999
"overwrite\n"
11000
"all tags as well.)"
11001
msgstr ""
11002
11003
#: en/help_topics/conflict-types.txt:172
11004
msgid ""
11005
"Duplicate paths\n"
11006
"---------------"
11007
msgstr ""
11008
11009
#: en/help_topics/conflict-types.txt:177
11010
msgid " Conflict adding file FILE. Moved existing file to FILE.moved."
11011
msgstr ""
11012
11013
#: en/help_topics/conflict-types.txt:179
11014
msgid ""
11015
"Sometimes Bazaar will attempt to create a file using a pathname that has\n"
11016
"already been used. The existing file will be renamed to \"FILE.moved\". "
11017
msgstr ""
11018
11019
#: en/help_topics/conflict-types.txt:187
11020
msgid ""
11021
"* ``--action=take-this`` will issue ``bzr rm FILE ; bzr mv FILE.moved "
11022
"FILE``,\n"
11023
"* ``--action=take-other`` will issue ``bzr rm FILE.moved``,\n"
11024
"* ``--action=done`` will just mark the conflict as resolved."
11025
msgstr ""
11026
11027
#: en/help_topics/conflict-types.txt:191
11028
msgid ""
11029
"Note that you must get rid of FILE.moved before using ``--action=done``."
11030
msgstr ""
11031
11032
#: en/help_topics/conflict-types.txt:195
11033
msgid ""
11034
"Unversioned parent\n"
11035
"------------------"
11036
msgstr ""
11037
11038
#: en/help_topics/conflict-types.txt:200
11039
msgid " Conflict because FILE is not versioned, but has versioned children."
11040
msgstr ""
11041
11042
#: en/help_topics/conflict-types.txt:202
11043
msgid ""
11044
"Sometimes Bazaar will attempt to create a file whose parent directory is "
11045
"not\n"
11046
"versioned. This happens when the directory has been deleted in the target,\n"
11047
"but has a new child in the source, or vice versa. In this situation, "
11048
"Bazaar\n"
11049
"will version the parent directory as well. Resolving this issue depends\n"
11050
"very much on the particular scenario. You may wish to rename or delete "
11051
"either\n"
11052
"the file or the directory. When you are satisfied, you can run \"bzr "
11053
"resolve\n"
11054
"FILE\" to mark the conflict as resolved."
11055
msgstr ""
11056
11057
#: en/help_topics/conflict-types.txt:210
11058
msgid ""
11059
"Missing parent\n"
11060
"--------------"
11061
msgstr ""
11062
11063
#: en/help_topics/conflict-types.txt:215
11064
msgid " Conflict adding files to FILE. Created directory."
11065
msgstr ""
11066
11067
#: en/help_topics/conflict-types.txt:217
11068
msgid ""
11069
"This happens when a directory has been deleted in the target, but has new\n"
11070
"children in the source. This is similar to the \"unversioned parent\" "
11071
"conflict,\n"
11072
"except that the parent directory does not *exist*, instead of just being\n"
11073
"unversioned. In this situation, Bazaar will create the missing parent.\n"
11074
"Resolving this issue depends very much on the particular scenario."
11075
msgstr ""
11076
11077
#: en/help_topics/conflict-types.txt:223 en/help_topics/conflict-types.txt:249
11078
msgid ""
11079
"To resolve that kind of conflict, you should either remove or rename the\n"
11080
"children or the directory or a combination of both."
11081
msgstr ""
11082
11083
#: en/help_topics/conflict-types.txt:228
11084
msgid ""
11085
"* ``--action=take-this`` will issue ``bzr rm directory`` including the\n"
11086
" children,\n"
11087
"* ``--action=take-other`` will acknowledge Bazaar choice to keep the "
11088
"children\n"
11089
" and restoring the directory,\n"
11090
"* ``--action=done`` will just mark the conflict as resolved."
11091
msgstr ""
11092
11093
#: en/help_topics/conflict-types.txt:236
11094
msgid ""
11095
"Deleting parent\n"
11096
"---------------"
11097
msgstr ""
11098
11099
#: en/help_topics/conflict-types.txt:241
11100
msgid " Conflict: can't delete DIR because it is not empty. Not deleting."
11101
msgstr ""
11102
11103
#: en/help_topics/conflict-types.txt:243
11104
msgid ""
11105
"This is the opposite of \"missing parent\". A directory is deleted in the\n"
11106
"source, but has new children in the target (either because a directory\n"
11107
"deletion is merged or because the merge introduce new children). Bazaar\n"
11108
"will retain the directory. Resolving this issue depends very much on the\n"
11109
"particular scenario."
11110
msgstr ""
11111
11112
#: en/help_topics/conflict-types.txt:254
11113
msgid ""
11114
"* ``--action=take-this`` will acknowledge Bazaar choice to keep the "
11115
"directory,"
11116
msgstr ""
11117
11118
#: en/help_topics/conflict-types.txt:256
11119
msgid ""
11120
"* ``--action=take-other`` will issue ``bzr rm directory`` including the \n"
11121
" children,"
11122
msgstr ""
11123
11124
#: en/help_topics/conflict-types.txt:259
11125
msgid "* ``--action=done`` will just mark the conflict as resolved."
11126
msgstr ""
11127
11128
#: en/help_topics/conflict-types.txt:261
11129
msgid ""
11130
"Note that when merging a directory deletion, if unversioned files are\n"
11131
"present, they become potential orphans has they don't have a directory\n"
11132
"parent anymore."
11133
msgstr ""
11134
11135
#: en/help_topics/conflict-types.txt:265
11136
msgid ""
11137
"Handling such orphans, *before* the conflict is created, is controlled by\n"
11138
"setting the ``bzr.transform.orphan_policy`` configuration option."
11139
msgstr ""
11140
11141
#: en/help_topics/conflict-types.txt:268
11142
msgid "There are two possible values for this option:"
11143
msgstr ""
11144
11145
#: en/help_topics/conflict-types.txt:270
11146
msgid ""
11147
"* ``conflict`` (the default): will leave the orphans in place and\n"
11148
" generate a conflicts,"
11149
msgstr ""
11150
11151
#: en/help_topics/conflict-types.txt:273
11152
msgid ""
11153
"* ``move``: will move the orphans to a ``bzr-orphans`` directory at the "
11154
"root\n"
11155
" of the working tree with names like ``<file>.~#~``."
11156
msgstr ""
11157
11158
#: en/help_topics/conflict-types.txt:278
11159
msgid ""
11160
"Path conflict\n"
11161
"-------------"
11162
msgstr ""
11163
11164
#: en/help_topics/conflict-types.txt:283
11165
msgid " Path conflict: PATH1 / PATH2"
11166
msgstr ""
11167
11168
#: en/help_topics/conflict-types.txt:285
11169
msgid ""
11170
"This happens when the source and target have each modified the name or "
11171
"parent\n"
11172
"directory of a file. Bazaar will use the path elements from the source."
11173
msgstr ""
11174
11175
#: en/help_topics/conflict-types.txt:288
11176
msgid ""
11177
"To resolve that kind of conflict, you just have to decide what name should "
11178
"be\n"
11179
"retained for the file involved."
11180
msgstr ""
11181
11182
#: en/help_topics/conflict-types.txt:293
11183
msgid ""
11184
"* ``--action=take-this`` will revert Bazaar choice and keep ``PATH1`` by\n"
11185
" issuing ``bzr mv PATH2 PATH1``,\n"
11186
"* ``--action=take-other`` will acknowledge Bazaar choice of keeping "
11187
"``PATH2``,\n"
11188
"* ``--action=done`` will just mark the conflict as resolved."
11189
msgstr ""
11190
11191
#: en/help_topics/conflict-types.txt:300
11192
msgid ""
11193
"Parent loop\n"
11194
"-----------"
11195
msgstr ""
11196
11197
#: en/help_topics/conflict-types.txt:305
11198
msgid " Conflict moving FILE into DIRECTORY. Cancelled move."
11199
msgstr ""
11200
11201
#: en/help_topics/conflict-types.txt:307
11202
msgid ""
11203
"This happens when the source and the target have each moved directories, so\n"
11204
"that, if the change could be applied, a directory would be contained by "
11205
"itself.\n"
11206
"For example::"
11207
msgstr ""
11208
11209
#: en/help_topics/conflict-types.txt:311
11210
msgid ""
11211
" $ bzr init\n"
11212
" $ bzr mkdir white\n"
11213
" $ bzr mkdir black\n"
11214
" $ bzr commit -m \"BASE\"\n"
11215
" $ bzr branch . ../other\n"
11216
" $ bzr mv white black\n"
11217
" $ bzr commit -m \"THIS\"\n"
11218
" $ bzr mv ../other/black ../other/white\n"
11219
" $ bzr commit ../other -m \"OTHER\"\n"
11220
" $ bzr merge ../other"
11221
msgstr ""
11222
11223
#: en/help_topics/conflict-types.txt:322
11224
msgid ""
11225
"In this situation, Bazaar will cancel the move, and leave ``white`` in\n"
11226
"``black``. To resolve that kind of conflict, you just have to decide what\n"
11227
"name should be retained for the directories involved."
11228
msgstr ""
11229
11230
#: en/help_topics/conflict-types.txt:328
11231
msgid ""
11232
"* ``--action=take-this`` will acknowledge Bazaar choice of leaving "
11233
"``white`` \n"
11234
" in ``black``,\n"
11235
"* ``--action=take-other`` will revert Bazaar choice and move ``black`` in\n"
11236
" ``white`` by issuing ``bzr mv black/white white ; bzr mv black white``,\n"
11237
"* ``--action=done`` will just mark the conflict as resolved."
11238
msgstr ""
11239
11240
#: en/help_topics/conflict-types.txt:336
11241
msgid ""
11242
"Non-directory parent\n"
11243
"--------------------"
11244
msgstr ""
11245
11246
#: en/help_topics/conflict-types.txt:341
11247
msgid ""
11248
" Conflict: foo.new is not a directory, but has files in it.\n"
11249
" Created directory."
11250
msgstr ""
11251
11252
#: en/help_topics/conflict-types.txt:344
11253
msgid ""
11254
"This happens when one side has added files to a directory, and the other "
11255
"side\n"
11256
"has changed the directory into a file or symlink. For example::"
11257
msgstr ""
11258
11259
#: en/help_topics/conflict-types.txt:347
11260
msgid ""
11261
" $ bzr init\n"
11262
" $ bzr mkdir foo\n"
11263
" $ bzr commit -m \"BASE\"\n"
11264
" $ bzr branch . ../other\n"
11265
" $ rmdir foo\n"
11266
" $ touch foo\n"
11267
" $ bzr commit -m \"THIS\"\n"
11268
" $ bzr mkdir ../other/foo/bar\n"
11269
" $ bzr commit ../other -m \"OTHER\"\n"
11270
" $ bzr merge ../other"
11271
msgstr ""
11272
11273
#: en/help_topics/conflict-types.txt:358
11274
msgid ""
11275
"To resolve that kind of conflict, you have to decide what name should be\n"
11276
"retained for the file, directory or symlink involved."
11277
msgstr ""
11278
11279
#: en/help_topics/conflict-types.txt:363
11280
msgid ""
11281
"* ``--action=take-this`` will issue ``bzr rm --force foo.new`` and \n"
11282
" ``bzr add foo``,\n"
11283
"* ``--action=take-other`` will issue ``bzr rm --force foo`` and \n"
11284
" ``bzr mv foo.new foo``,\n"
11285
"* ``--action=done`` will just mark the conflict as resolved."
11286
msgstr ""
11287
11288
#: en/help_topics/conflict-types.txt:371
11289
msgid ""
11290
"MalformedTransform\n"
11291
"------------------"
11292
msgstr ""
11293
11294
#: en/help_topics/conflict-types.txt:374
11295
msgid ""
11296
"It is possible (though very rare) for Bazaar to raise a MalformedTransform\n"
11297
"exception. This means that Bazaar encountered a filesystem conflict that it "
11298
"was\n"
11299
"unable to resolve. This usually indicates a bug. Please let us know if "
11300
"you\n"
11301
"encounter this. Our bug tracker is at https://launchpad.net/bzr/+bugs\n"
11302
msgstr ""
11303
11304
#: en/help_topics/content-filters.txt:1
11305
msgid ""
11306
"Content Filters\n"
11307
"==============="
11308
msgstr ""
11309
11310
#: en/help_topics/content-filters.txt:4
11311
msgid ""
11312
"Content formats\n"
11313
"---------------"
11314
msgstr ""
11315
11316
#: en/help_topics/content-filters.txt:7
11317
msgid ""
11318
"Bazaar's content filtering allows you to store files in a different\n"
11319
"format from the copy in your working tree. This lets you, or your\n"
11320
"co-developers, use Windows development tools that expect CRLF files\n"
11321
"on projects that use other line-ending conventions. Among other things,\n"
11322
"content filters also let Unix developers more easily work on projects\n"
11323
"using Windows line-ending conventions, keyword expansion/compression,\n"
11324
"and trailing spaces on lines in text files to be implicitly stripped\n"
11325
"when committed."
11326
msgstr ""
11327
11328
#: en/help_topics/content-filters.txt:16
11329
msgid "To generalize, there are two content formats supported by Bazaar:"
11330
msgstr ""
11331
11332
#: en/help_topics/content-filters.txt:18
11333
msgid ""
11334
"* a canonical format - how files are stored internally\n"
11335
"* a convenience format - how files are created in a working tree."
11336
msgstr ""
11337
11338
#: en/help_topics/content-filters.txt:21
11339
msgid ""
11340
"\n"
11341
"Format conversion\n"
11342
"-----------------"
11343
msgstr ""
11344
11345
#: en/help_topics/content-filters.txt:25
11346
msgid ""
11347
"The conversion between these formats is done by content filters.\n"
11348
"A content filter has two parts:"
11349
msgstr ""
11350
11351
#: en/help_topics/content-filters.txt:28
11352
msgid ""
11353
"* a read converter - converts from convenience to canonical format\n"
11354
"* a write converter - converts from canonical to convenience format."
11355
msgstr ""
11356
11357
#: en/help_topics/content-filters.txt:31
11358
msgid ""
11359
"Many of these converters will provide *round-trip* conversion,\n"
11360
"i.e. applying the read converter followed by the write converter\n"
11361
"gives back the original content. However, others may provide an\n"
11362
"asymmetric conversion. For example, a read converter might strip\n"
11363
"trailing whitespace off lines in source code while the matching\n"
11364
"write converter might pass content through unchanged."
11365
msgstr ""
11366
11367
#: en/help_topics/content-filters.txt:38
11368
msgid ""
11369
"\n"
11370
"Enabling content filters\n"
11371
"------------------------"
11372
msgstr ""
11373
11374
#: en/help_topics/content-filters.txt:42
11375
msgid ""
11376
"Content filters are typically provided by plugins, so the first step\n"
11377
"in using them is to install the relevant plugins and read their\n"
11378
"documentation. Some plugins may be very specific about which files\n"
11379
"they filter, e.g. only files ending in ``.java`` or ``.php``.\n"
11380
"In other cases, the plugin may leave it in the user's hands to\n"
11381
"define which files are to be filtered. This is typically done\n"
11382
"using rule-based preferences. See ``bzr help rules`` for general\n"
11383
"information about defining these."
11384
msgstr ""
11385
11386
#: en/help_topics/content-filters.txt:51
11387
msgid ""
11388
"\n"
11389
"Impact on commands\n"
11390
"------------------"
11391
msgstr ""
11392
11393
#: en/help_topics/content-filters.txt:55
11394
msgid ""
11395
"Read converters are only applied to commands that read content from\n"
11396
"a working tree, e.g. status, diff and commit. For example, ``bzr diff``\n"
11397
"will apply read converters to files in the working tree, then compare\n"
11398
"the results to the content last committed."
11399
msgstr ""
11400
11401
#: en/help_topics/content-filters.txt:60
11402
msgid ""
11403
"Write converters are only applied by commands that **create files in a\n"
11404
"working tree**, e.g. branch, checkout, update. If you wish to see the\n"
11405
"canonical format of a file or tree, use ``bzr cat`` or ``bzr export``\n"
11406
"respectively."
11407
msgstr ""
11408
11409
#: en/help_topics/content-filters.txt:65
11410
msgid ""
11411
"Note: ``bzr commit`` does not implicitly apply write converters after\n"
11412
"comitting files. If this makes sense for a given plugin providing\n"
11413
"a content filter, the plugin can usually achieve this effect by using a\n"
11414
"``start_commit`` or ``post_commit`` hook say. See :doc:`hooks-help`\n"
11415
"for more information on hooks."
11416
msgstr ""
11417
11418
#: en/help_topics/content-filters.txt:71
11419
msgid ""
11420
"\n"
11421
"Refreshing your working tree\n"
11422
"----------------------------"
11423
msgstr ""
11424
11425
#: en/help_topics/content-filters.txt:75
11426
msgid ""
11427
"For performance reasons, Bazaar caches the timestamps of files in\n"
11428
"a working tree, and assumes files are unchanged if their timestamps\n"
11429
"match the cached values. As a consequence, there are times when\n"
11430
"you may need to explicitly ask for content filtering to be reapplied\n"
11431
"in one or both directions, e.g. after installing or reconfiguring\n"
11432
"plugins providing it."
11433
msgstr ""
11434
11435
#: en/help_topics/content-filters.txt:82
11436
msgid "Here are some general guidelines for doing this:"
11437
msgstr ""
11438
11439
#: en/help_topics/content-filters.txt:84
11440
msgid ""
11441
" * To reapply read converters, ``touch`` files, i.e. update their\n"
11442
" timestamp. Operations like ``bzr status`` should then reapply the\n"
11443
" relevant read converters and compare the end result with the\n"
11444
" canonical format."
11445
msgstr ""
11446
11447
#: en/help_topics/content-filters.txt:89
11448
msgid ""
11449
" * To reapply write converters, ensure there are no local changes,\n"
11450
" delete the relevant files and run ``bzr revert`` on those files."
11451
msgstr ""
11452
11453
#: en/help_topics/content-filters.txt:92
11454
msgid ""
11455
"Note: In the future, it is likely that additional options will be added\n"
11456
"to commands to make this refreshing process faster and safer.\n"
11457
msgstr ""
11458
11459
#: en/help_topics/current-formats.txt:1
11460
msgid "Current Storage Formats"
11461
msgstr ""
11462
11463
#: en/help_topics/current-formats.txt:3
11464
msgid ""
11465
":2a:\n"
11466
" (native) (default) Format for the bzr 2.0 series. Uses group-\n"
11467
" compress storage. Provides rich roots which are a one-way\n"
11468
" transition."
11469
msgstr ""
11470
11471
#: en/help_topics/current-formats.txt:8 en/help_topics/other-formats.txt:17
11472
msgid ""
11473
"\n"
11474
"See :doc:`formats-help` for more about storage formats."
11475
msgstr ""
11476
11477
#: en/help_topics/debug-flags.txt:1
11478
msgid ""
11479
"Debug Flags\n"
11480
"==========="
11481
msgstr ""
11482
11483
#: en/help_topics/debug-flags.txt:4
11484
msgid ""
11485
"These flags can be passed on the bzr command line or (without the ``-D``\n"
11486
"prefix) put in the ``debug_flags`` variable in ``bazaar.conf``."
11487
msgstr ""
11488
11489
#: en/help_topics/debug-flags.txt:7
11490
msgid ""
11491
"-Dauth Trace authentication sections used.\n"
11492
"-Dbytes Print out how many bytes were transferred\n"
11493
"-Ddirstate Trace dirstate activity (verbose!)\n"
11494
"-Derror Instead of normal error handling, always print a "
11495
"traceback\n"
11496
" on error.\n"
11497
"-Devil Capture call sites that do expensive or badly-scaling\n"
11498
" operations.\n"
11499
"-Dfetch Trace history copying between repositories.\n"
11500
"-Dfilters Emit information for debugging content filtering.\n"
11501
"-Dforceinvdeltas Force use of inventory deltas during generic streaming "
11502
"fetch.\n"
11503
"-Dgraph Trace graph traversal.\n"
11504
"-Dhashcache Log every time a working file is read to determine its "
11505
"hash.\n"
11506
"-Dhooks Trace hook execution.\n"
11507
"-Dhpss Trace smart protocol requests and responses.\n"
11508
"-Dhpssdetail More hpss details.\n"
11509
"-Dhpssvfs Traceback on vfs access to Remote objects.\n"
11510
"-Dhttp Trace http connections, requests and responses.\n"
11511
"-Dindex Trace major index operations.\n"
11512
"-Dknit Trace knit operations.\n"
11513
"-Dlock Trace when lockdir locks are taken or released.\n"
11514
"-Dnoretry If a connection is reset, fail immediately rather than\n"
11515
" retrying the request.\n"
11516
"-Dprogress Trace progress bar operations.\n"
11517
"-Dmem_dump Dump memory to a file upon an out of memory error.\n"
11518
"-Dmerge Emit information for debugging merges.\n"
11519
"-Dno_apport Don't use apport to report crashes.\n"
11520
"-Dno_activity \t Don't show transport activity indicator in progress bar.\n"
11521
"-Dpack Emit information about pack operations.\n"
11522
"-Drelock Emit a message every time a branch or repository object "
11523
"is\n"
11524
" unlocked then relocked the same way.\n"
11525
"-Dsftp Trace SFTP internals.\n"
11526
"-Dstatic_tuple Error when a tuple is used where a StaticTuple is "
11527
"expected\n"
11528
"-Dstream Trace fetch streams.\n"
11529
"-Dstrict_locks Trace when OS locks are potentially used in a non-"
11530
"portable\n"
11531
" manner.\n"
11532
"-Dunlock Some errors during unlock are treated as warnings.\n"
11533
"-DIDS_never Never use InterDifferingSerializer when fetching.\n"
11534
"-DIDS_always Always use InterDifferingSerializer to fetch if "
11535
"appropriate\n"
11536
" for the format, even for non-local fetches.\n"
11537
msgstr ""
11538
11539
#: en/help_topics/diverged-branches.txt:1
11540
msgid ""
11541
"Diverged Branches\n"
11542
"================="
11543
msgstr ""
11544
11545
#: en/help_topics/diverged-branches.txt:4
11546
msgid ""
11547
"When Bazaar tries to push one branch onto another, it requires that the\n"
11548
"destination branch must be ready to receive the source branch. If this "
11549
"isn't\n"
11550
"the case, then we say that the branches have ``diverged``. Branches are\n"
11551
"considered diverged if the destination branch's most recent commit is one "
11552
"that\n"
11553
"has not been merged (directly or indirectly) by the source branch. To "
11554
"recover\n"
11555
"from diverged branches, one must merge the missing revisions into the "
11556
"source\n"
11557
"branch."
11558
msgstr ""
11559
11560
#: en/help_topics/diverged-branches.txt:12
11561
msgid ""
11562
"This situation commonly arises when using a centralized workflow with local\n"
11563
"commits. If someone else has committed new work to the mainline since your\n"
11564
"last pull and you have local commits that have not yet been pushed to the\n"
11565
"mainline, then your local branch and the mainline have diverged."
11566
msgstr ""
11567
11568
#: en/help_topics/diverged-branches.txt:17
11569
msgid ""
11570
"Discovering What Has Diverged\n"
11571
"-----------------------------"
11572
msgstr ""
11573
11574
#: en/help_topics/diverged-branches.txt:20
11575
msgid ""
11576
"The ``bzr missing`` command is used to find out what revisions are in "
11577
"another\n"
11578
"branch that are not present in the current branch, and vice-versa. It shows "
11579
"a\n"
11580
"summary of which extra revisions exist in each branch. If you want to see "
11581
"the\n"
11582
"precise effects of those revisions, you can use ``bzr diff --"
11583
"old=other_branch``\n"
11584
"to show the differences between other_branch and your current branch."
11585
msgstr ""
11586
11587
#: en/help_topics/diverged-branches.txt:26
11588
msgid ""
11589
"A Solution\n"
11590
"----------"
11591
msgstr ""
11592
11593
#: en/help_topics/diverged-branches.txt:29
11594
msgid ""
11595
"The solution is to merge the revisions from the mainline into your local\n"
11596
"branch. To do so, use ``bzr merge`` to get the new revisions from the\n"
11597
"mainline. This merge may result in conflicts if the other developer's "
11598
"changes\n"
11599
"overlap with your changes. These conflicts should be resolved before\n"
11600
"continuing. After any conflicts have been resolved, or even if there were "
11601
"no\n"
11602
"conflicts, Bazaar requires that you explicitly commit these new revisions\n"
11603
"to your local branch. This requirement gives you an opportunity to test "
11604
"the\n"
11605
"resulting working tree for correctness, since the merged revisions could "
11606
"have\n"
11607
"made arbitrary changes. After testing, you should commit the merge using\n"
11608
"``bzr commit``. This clears up the diverged branches situation. Your "
11609
"local\n"
11610
"branch can now be pushed to the mainline.\n"
11611
msgstr ""
11612
11613
#: en/help_topics/eol.txt:1
11614
msgid ""
11615
"End of Line Conversion\n"
11616
"======================"
11617
msgstr ""
11618
11619
#: en/help_topics/eol.txt:4
11620
msgid ""
11621
"EOL conversion is provided as a content filter where Bazaar internally\n"
11622
"stores a canonical format but outputs a convenience format. See\n"
11623
"``bzr help content-filters`` for general information about using these."
11624
msgstr ""
11625
11626
#: en/help_topics/eol.txt:8
11627
msgid ""
11628
"Note: Content filtering is only supported in recently added formats,\n"
11629
"e.g. 1.14. Be sure that both the repository *and* the branch are\n"
11630
"in a recent format. (Just setting the format on the repository\n"
11631
"is not enough.) If content filtering does not appear to be working, use\n"
11632
"'bzr info -v' to confirm that the branch is using \"Working tree format 5\"\n"
11633
"or later."
11634
msgstr ""
11635
11636
#: en/help_topics/eol.txt:15
11637
msgid ""
11638
"EOL conversion needs to be enabled for selected file patterns using\n"
11639
"rules. See ``bzr help rules`` for general information on defining rules.\n"
11640
"Currently, rules are only supported in $BZR_HOME/.bazaar/rules (or\n"
11641
"%BZR_HOME%/bazaar/2.0/rules on Windows). Branch specific rules will be\n"
11642
"supported in a future verison of Bazaar."
11643
msgstr ""
11644
11645
#: en/help_topics/eol.txt:21
11646
msgid ""
11647
"To configure which files to filter, set ``eol`` to one of the values below.\n"
11648
"(If a value is not set, ``exact`` is the default.)"
11649
msgstr ""
11650
11651
#: en/help_topics/eol.txt:24
11652
msgid ""
11653
" ========== ===================================== ======================\n"
11654
" Value Checkout end-of-lines as Commit end-of-lines as\n"
11655
" ========== ===================================== ======================\n"
11656
" ``native`` ``crlf`` on Windows, ``lf`` otherwise ``lf``\n"
11657
" ---------- ------------------------------------- ----------------------\n"
11658
" ``lf`` ``lf`` ``lf``\n"
11659
" ---------- ------------------------------------- ----------------------\n"
11660
" ``crlf`` ``crlf`` ``lf``\n"
11661
" ---------- ------------------------------------- ----------------------\n"
11662
" ``exact`` No conversion Exactly as in file\n"
11663
" ========== ===================================== ======================"
11664
msgstr ""
11665
11666
#: en/help_topics/eol.txt:36
11667
msgid ""
11668
"Note: For safety reasons, no conversion is applied to any file where a null\n"
11669
"byte is detected in the file."
11670
msgstr ""
11671
11672
#: en/help_topics/eol.txt:39
11673
msgid ""
11674
"For users working on a cross-platform project, here is a suggested rule\n"
11675
"to use as a starting point::"
11676
msgstr ""
11677
11678
#: en/help_topics/eol.txt:42 en/help_topics/eol.txt:52
11679
#: en/help_topics/eol.txt:67 en/help_topics/eol.txt:82
11680
msgid ""
11681
" [name *]\n"
11682
" eol = native"
11683
msgstr ""
11684
11685
#: en/help_topics/eol.txt:45
11686
msgid ""
11687
"If you have binary files that do not contain a null byte though, be\n"
11688
"sure to add ``eol = exact`` rules for those as well. You can do this\n"
11689
"by giving more explicit patterns earlier in the rules file. For example::"
11690
msgstr ""
11691
11692
#: en/help_topics/eol.txt:49
11693
msgid ""
11694
" [name *.png]\n"
11695
" eol = exact"
11696
msgstr ""
11697
11698
#: en/help_topics/eol.txt:55
11699
msgid ""
11700
"If your working tree is on a network drive shared by users on different\n"
11701
"operating systems, you typically want to force certain conventions for\n"
11702
"certain files. In that way, if a file is created with the wrong line\n"
11703
"endings or line endings get mixed during editing, it gets committed\n"
11704
"correctly and gets checked out correctly. For example::"
11705
msgstr ""
11706
11707
#: en/help_topics/eol.txt:61
11708
msgid ""
11709
" [name *.bat]\n"
11710
" eol = crlf"
11711
msgstr ""
11712
11713
#: en/help_topics/eol.txt:64
11714
msgid ""
11715
" [name *.sh]\n"
11716
" eol = lf"
11717
msgstr ""
11718
11719
#: en/help_topics/eol.txt:70
11720
msgid ""
11721
"If you take the care to create files with their required endings, you can\n"
11722
"achieve *almost* the same thing by using ``eol = exact``. It is slightly\n"
11723
"safer to use ``lf`` and ``crlf`` though because edits accidentally\n"
11724
"introducing mixed line endings will be corrected during commit for files\n"
11725
"with those settings."
11726
msgstr ""
11727
11728
#: en/help_topics/eol.txt:76
11729
msgid ""
11730
"If you have sample test data that deliberately has text files with mixed\n"
11731
"newline conventions, you can ask for those to be left alone like this::"
11732
msgstr ""
11733
11734
#: en/help_topics/eol.txt:79
11735
msgid ""
11736
" [name test_data/]\n"
11737
" eol = exact"
11738
msgstr ""
11739
11740
#: en/help_topics/eol.txt:85
11741
msgid ""
11742
"Note that ``exact`` does not imply the file is binary but it does mean\n"
11743
"that no conversion of end-of-lines will be done. (Bazaar currently relies\n"
11744
"of content analysis to detect binary files for commands like ``diff``.\n"
11745
"In the future, a ``binary = true`` rule may be added but it is not\n"
11746
"supported yet.)"
11747
msgstr ""
11748
11749
#: en/help_topics/eol.txt:91
11750
msgid ""
11751
"If you have an existing repository with text files already stored using\n"
11752
"Windows newline conventions (``crlf``), then you may want to keep using "
11753
"that\n"
11754
"convention in the repository. Forcing certain files to this convention\n"
11755
"may also help users who do not have rules configured. To do this, set\n"
11756
"``eol`` to one of the values below."
11757
msgstr ""
11758
11759
#: en/help_topics/eol.txt:97
11760
msgid ""
11761
" ============================ ======================== "
11762
"======================\n"
11763
" Value Checkout end-of-lines as Commit end-of-lines "
11764
"as\n"
11765
" ============================ ======================== "
11766
"======================\n"
11767
" ``native-with-crlf-in-repo`` ``crlf`` on Windows, ``crlf``\n"
11768
" ``lf`` otherwise\n"
11769
" ---------------------------- ------------------------ "
11770
"----------------------\n"
11771
" ``lf-with-crlf-in-repo`` ``lf`` ``crlf``\n"
11772
" ---------------------------- ------------------------ "
11773
"----------------------\n"
11774
" ``crlf-with-crlf-in-repo`` ``crlf`` ``crlf``\n"
11775
" ============================ ======================== ======================"
11776
msgstr ""
11777
11778
#: en/help_topics/eol.txt:108
11779
msgid ""
11780
"For users working on an existing project that uses Windows newline\n"
11781
"conventions in their Bazaar repository, this rule is suggested as a\n"
11782
"starting point::"
11783
msgstr ""
11784
11785
#: en/help_topics/eol.txt:112
11786
msgid ""
11787
" [name *]\n"
11788
" eol = native-with-crlf-in-repo"
11789
msgstr ""
11790
11791
#: en/help_topics/eol.txt:115
11792
msgid ""
11793
"For new projects, it is recommended that end-of-lines be stored as ``lf``\n"
11794
"and that users stick to the basic settings, i.e. ``native``, ``lf``,\n"
11795
"``crlf`` and ``exact``."
11796
msgstr ""
11797
11798
#: en/help_topics/eol.txt:119
11799
msgid ""
11800
"Note: Bazaar's EOL conversion will convert the content of files but\n"
11801
"never reject files because a given line ending or mixed line endings\n"
11802
"are found. A precommit hook should be used if you wish to validate\n"
11803
"(and not just convert) content before committing.\n"
11804
msgstr ""
11805
11806
#: en/help_topics/hidden-commands.txt:1
11807
msgid ""
11808
"added List files added in working tree.\n"
11809
"ancestry List all revisions merged into this branch.\n"
11810
"assert-fail Test reporting of assertion failures\n"
11811
"bundle-info Output interesting stats about a bundle\n"
11812
"bundle-revisions Create a merge-directive for submitting changes.\n"
11813
"cat-revision Write out metadata for a revision.\n"
11814
"dump-btree Dump the contents of a btree index file to stdout.\n"
11815
"export-pot Export command helps and error messages in po format.\n"
11816
"file-id Print file_id of a particular file or directory.\n"
11817
"file-path Print path of file_ids to a file or directory.\n"
11818
"find-merge-base Find and print a base revision for merging two "
11819
"branches.\n"
11820
"hooks Show hooks.\n"
11821
"inventory Show inventory of the current working copy or a "
11822
"revision.\n"
11823
"local-time-offset Show the offset in seconds from GMT to local time.\n"
11824
"lookup-revision Lookup the revision-id from a revision-number\n"
11825
"merge-directive Generate a merge directive for auto-merge tools.\n"
11826
"modified List files modified in working tree.\n"
11827
"re-sign Create a digital signature for an existing revision.\n"
11828
"reference list, view and set branch locations for nested trees.\n"
11829
"relpath Show path of a file relative to root\n"
11830
"repair-workingtree Reset the working tree state file.\n"
11831
"revision-history Display the list of revision ids on a branch.\n"
11832
"revision-info Show revision number and revision id for a given "
11833
"revision\n"
11834
" identifier.\n"
11835
"rocks Statement of optimism.\n"
11836
"selftest Run internal test suite.\n"
11837
"shell-complete Show appropriate completions for context.\n"
11838
"test-script Run a shell-like test from a file.\n"
11839
"touching-revisions Return revision-ids which affected a particular file.\n"
11840
"unknowns List unknown files.\n"
11841
"wait-until-signalled Test helper for\n"
11842
" test_start_and_stop_bzr_subprocess_send_signal.\n"
11843
msgstr ""
11844
11845
#: en/help_topics/hooks.txt:1
11846
msgid ""
11847
"\n"
11848
"Hooks\n"
11849
"====="
11850
msgstr ""
11851
11852
#: en/help_topics/hooks.txt:5 en/help_topics/rules.txt:4
11853
msgid ""
11854
"Introduction\n"
11855
"------------"
11856
msgstr ""
11857
11858
#: en/help_topics/hooks.txt:8
11859
msgid "A hook of type *xxx* of class *yyy* needs to be registered using::"
11860
msgstr ""
11861
11862
#: en/help_topics/hooks.txt:10
11863
msgid " yyy.hooks.install_named_hook(\"xxx\", ...)"
11864
msgstr ""
11865
11866
#: en/help_topics/hooks.txt:12
11867
msgid ""
11868
"See :doc:`Using hooks<../user-guide/hooks>` in the User Guide for examples."
11869
msgstr ""
11870
11871
#: en/help_topics/hooks.txt:14
11872
msgid ""
11873
"The class that contains each hook is given before the hooks it supplies. "
11874
"For\n"
11875
"instance, BranchHooks as the class is the hooks class for\n"
11876
"`bzrlib.branch.Branch.hooks`."
11877
msgstr ""
11878
11879
#: en/help_topics/hooks.txt:18
11880
msgid ""
11881
"Each description also indicates whether the hook runs on the client (the\n"
11882
"machine where bzr was invoked) or the server (the machine addressed by\n"
11883
"the branch URL). These may be, but are not necessarily, the same machine."
11884
msgstr ""
11885
11886
#: en/help_topics/hooks.txt:22
11887
msgid ""
11888
"Plugins (including hooks) are run on the server if all of these is true:"
11889
msgstr ""
11890
11891
#: en/help_topics/hooks.txt:24
11892
msgid ""
11893
" * The connection is via a smart server (accessed with a URL starting with\n"
11894
" \"bzr://\", \"bzr+ssh://\" or \"bzr+http://\", or accessed via a "
11895
"\"http://\"\n"
11896
" URL when a smart server is available via HTTP)."
11897
msgstr ""
11898
11899
#: en/help_topics/hooks.txt:28
11900
msgid ""
11901
" * The hook is either server specific or part of general infrastructure "
11902
"rather\n"
11903
" than client specific code (such as commit)."
11904
msgstr ""
11905
11906
#: en/help_topics/hooks.txt:31
11907
msgid ""
11908
"\n"
11909
"BranchHooks\n"
11910
"-----------"
11911
msgstr ""
11912
11913
#: en/help_topics/hooks.txt:35
11914
msgid ""
11915
"automatic_tag_name\n"
11916
"~~~~~~~~~~~~~~~~~~"
11917
msgstr ""
11918
11919
#: en/help_topics/hooks.txt:38 en/help_topics/hooks.txt:56
11920
#: en/help_topics/hooks.txt:102 en/help_topics/hooks.txt:259
11921
msgid "Introduced in: 2.2"
11922
msgstr ""
11923
11924
#: en/help_topics/hooks.txt:40
11925
msgid ""
11926
"Called to determine an automatic tag name for a revision.\n"
11927
"automatic_tag_name is called with (branch, revision_id) and should\n"
11928
"return a tag name or None if no tag name could be determined. The\n"
11929
"first non-None tag name returned will be used."
11930
msgstr ""
11931
11932
#: en/help_topics/hooks.txt:45
11933
msgid ""
11934
"open\n"
11935
"~~~~"
11936
msgstr ""
11937
11938
#: en/help_topics/hooks.txt:48 en/help_topics/hooks.txt:290
11939
#: en/help_topics/hooks.txt:304
11940
msgid "Introduced in: 1.8"
11941
msgstr ""
11942
11943
#: en/help_topics/hooks.txt:50
11944
msgid ""
11945
"Called with the Branch object that has been opened after a branch is\n"
11946
"opened."
11947
msgstr ""
11948
11949
#: en/help_topics/hooks.txt:53
11950
msgid ""
11951
"post_branch_init\n"
11952
"~~~~~~~~~~~~~~~~"
11953
msgstr ""
11954
11955
#: en/help_topics/hooks.txt:58
11956
msgid ""
11957
"Called after new branch initialization completes. post_branch_init is\n"
11958
"called with a bzrlib.branch.BranchInitHookParams. Note that init,\n"
11959
"branch and checkout (both heavyweight and lightweight) will all\n"
11960
"trigger this hook."
11961
msgstr ""
11962
11963
#: en/help_topics/hooks.txt:63
11964
msgid ""
11965
"post_change_branch_tip\n"
11966
"~~~~~~~~~~~~~~~~~~~~~~"
11967
msgstr ""
11968
11969
#: en/help_topics/hooks.txt:66 en/help_topics/hooks.txt:402
11970
msgid "Introduced in: 1.4"
11971
msgstr ""
11972
11973
#: en/help_topics/hooks.txt:68
11974
msgid ""
11975
"Called in bzr client and server after a change to the tip of a branch\n"
11976
"is made. post_change_branch_tip is called with a\n"
11977
"bzrlib.branch.ChangeBranchTipParams. Note that push, pull, commit,\n"
11978
"uncommit will all trigger this hook."
11979
msgstr ""
11980
11981
#: en/help_topics/hooks.txt:73 en/help_topics/hooks.txt:389
11982
msgid ""
11983
"post_commit\n"
11984
"~~~~~~~~~~~"
11985
msgstr ""
11986
11987
#: en/help_topics/hooks.txt:76 en/help_topics/hooks.txt:86
11988
#: en/help_topics/hooks.txt:94 en/help_topics/hooks.txt:110
11989
#: en/help_topics/hooks.txt:145
11990
msgid "Introduced in: 0.15"
11991
msgstr ""
11992
11993
#: en/help_topics/hooks.txt:78
11994
msgid ""
11995
"Called in the bzr client after a commit has completed. post_commit is\n"
11996
"called with (local, master, old_revno, old_revid, new_revno,\n"
11997
"new_revid). old_revid is NULL_REVISION for the first commit to a\n"
11998
"branch."
11999
msgstr ""
12000
12001
#: en/help_topics/hooks.txt:83
12002
msgid ""
12003
"post_pull\n"
12004
"~~~~~~~~~"
12005
msgstr ""
12006
12007
#: en/help_topics/hooks.txt:88
12008
msgid ""
12009
"Called after a pull operation completes. post_pull is called with a\n"
12010
"bzrlib.branch.PullResult object and only runs in the bzr client."
12011
msgstr ""
12012
12013
#: en/help_topics/hooks.txt:91
12014
msgid ""
12015
"post_push\n"
12016
"~~~~~~~~~"
12017
msgstr ""
12018
12019
#: en/help_topics/hooks.txt:96
12020
msgid ""
12021
"Called after a push operation completes. post_push is called with a\n"
12022
"bzrlib.branch.BranchPushResult object and only runs in the bzr client."
12023
msgstr ""
12024
12025
#: en/help_topics/hooks.txt:99
12026
msgid ""
12027
"post_switch\n"
12028
"~~~~~~~~~~~"
12029
msgstr ""
12030
12031
#: en/help_topics/hooks.txt:104
12032
msgid ""
12033
"Called after a checkout switches branch. post_switch is called with a\n"
12034
"bzrlib.branch.SwitchHookParams."
12035
msgstr ""
12036
12037
#: en/help_topics/hooks.txt:107
12038
msgid ""
12039
"post_uncommit\n"
12040
"~~~~~~~~~~~~~"
12041
msgstr ""
12042
12043
#: en/help_topics/hooks.txt:112
12044
msgid ""
12045
"Called in the bzr client after an uncommit completes. post_uncommit is\n"
12046
"called with (local, master, old_revno, old_revid, new_revno,\n"
12047
"new_revid) where local is the local branch or None, master is the\n"
12048
"target branch, and an empty branch receives new_revno of 0, new_revid\n"
12049
"of None."
12050
msgstr ""
12051
12052
#: en/help_topics/hooks.txt:118
12053
msgid ""
12054
"pre_change_branch_tip\n"
12055
"~~~~~~~~~~~~~~~~~~~~~"
12056
msgstr ""
12057
12058
#: en/help_topics/hooks.txt:121
12059
msgid "Introduced in: 1.6"
12060
msgstr ""
12061
12062
#: en/help_topics/hooks.txt:123
12063
msgid ""
12064
"Called in bzr client and server before a change to the tip of a branch\n"
12065
"is made. pre_change_branch_tip is called with a\n"
12066
"bzrlib.branch.ChangeBranchTipParams. Note that push, pull, commit,\n"
12067
"uncommit will all trigger this hook."
12068
msgstr ""
12069
12070
#: en/help_topics/hooks.txt:128
12071
msgid ""
12072
"pre_commit\n"
12073
"~~~~~~~~~~"
12074
msgstr ""
12075
12076
#: en/help_topics/hooks.txt:131
12077
msgid "Introduced in: 0.91"
12078
msgstr ""
12079
12080
#: en/help_topics/hooks.txt:133
12081
msgid ""
12082
"Called after a commit is calculated but before it is completed.\n"
12083
"pre_commit is called with (local, master, old_revno, old_revid,\n"
12084
"future_revno, future_revid, tree_delta, future_tree). old_revid is\n"
12085
"NULL_REVISION for the first commit to a branch, tree_delta is a\n"
12086
"TreeDelta object describing changes from the basis revision. hooks\n"
12087
"MUST NOT modify this delta. future_tree is an in-memory tree obtained\n"
12088
"from CommitBuilder.revision_tree() and hooks MUST NOT modify this\n"
12089
"tree."
12090
msgstr ""
12091
12092
#: en/help_topics/hooks.txt:142
12093
msgid ""
12094
"set_rh\n"
12095
"~~~~~~"
12096
msgstr ""
12097
12098
#: en/help_topics/hooks.txt:147
12099
msgid ""
12100
"Invoked whenever the revision history has been set via\n"
12101
"set_revision_history. The api signature is (branch, revision_history),\n"
12102
"and the branch will be write-locked. The set_rh hook can be expensive\n"
12103
"for bzr to trigger, a better hook to use is\n"
12104
"Branch.post_change_branch_tip."
12105
msgstr ""
12106
12107
#: en/help_topics/hooks.txt:153
12108
msgid ""
12109
"transform_fallback_location\n"
12110
"~~~~~~~~~~~~~~~~~~~~~~~~~~~"
12111
msgstr ""
12112
12113
#: en/help_topics/hooks.txt:156
12114
msgid "Introduced in: 1.9"
12115
msgstr ""
12116
12117
#: en/help_topics/hooks.txt:158
12118
msgid ""
12119
"Called when a stacked branch is activating its fallback locations.\n"
12120
"transform_fallback_location is called with (branch, url), and should\n"
12121
"return a new url. Returning the same url allows it to be used as-is,\n"
12122
"returning a different one can be used to cause the branch to stack on\n"
12123
"a closer copy of that fallback_location. Note that the branch cannot\n"
12124
"have history accessing methods called on it during this hook because\n"
12125
"the fallback locations have not been activated. When there are\n"
12126
"multiple hooks installed for transform_fallback_location, all are\n"
12127
"called with the url returned from the previous hook.The order is\n"
12128
"however undefined."
12129
msgstr ""
12130
12131
#: en/help_topics/hooks.txt:169
12132
msgid ""
12133
"CommandHooks\n"
12134
"------------"
12135
msgstr ""
12136
12137
#: en/help_topics/hooks.txt:172
12138
msgid ""
12139
"extend_command\n"
12140
"~~~~~~~~~~~~~~"
12141
msgstr ""
12142
12143
#: en/help_topics/hooks.txt:175
12144
msgid "Introduced in: 1.13"
12145
msgstr ""
12146
12147
#: en/help_topics/hooks.txt:177
12148
msgid ""
12149
"Called after creating a command object to allow modifications such as\n"
12150
"adding or removing options, docs etc. Called with the new\n"
12151
"bzrlib.commands.Command object."
12152
msgstr ""
12153
12154
#: en/help_topics/hooks.txt:181
12155
msgid ""
12156
"get_command\n"
12157
"~~~~~~~~~~~"
12158
msgstr ""
12159
12160
#: en/help_topics/hooks.txt:184 en/help_topics/hooks.txt:196
12161
#: en/help_topics/hooks.txt:205 en/help_topics/hooks.txt:448
12162
msgid "Introduced in: 1.17"
12163
msgstr ""
12164
12165
#: en/help_topics/hooks.txt:186
12166
msgid ""
12167
"Called when creating a single command. Called with (cmd_or_None,\n"
12168
"command_name). get_command should either return the cmd_or_None\n"
12169
"parameter, or a replacement Command object that should be used for the\n"
12170
"command. Note that the Command.hooks hooks are core infrastructure.\n"
12171
"Many users will prefer to use bzrlib.commands.register_command or\n"
12172
"plugin_cmds.register_lazy."
12173
msgstr ""
12174
12175
#: en/help_topics/hooks.txt:193
12176
msgid ""
12177
"get_missing_command\n"
12178
"~~~~~~~~~~~~~~~~~~~"
12179
msgstr ""
12180
12181
#: en/help_topics/hooks.txt:198
12182
msgid ""
12183
"Called when creating a single command if no command could be found.\n"
12184
"Called with (command_name). get_missing_command should either return\n"
12185
"None, or a Command object to be used for the command."
12186
msgstr ""
12187
12188
#: en/help_topics/hooks.txt:202
12189
msgid ""
12190
"list_commands\n"
12191
"~~~~~~~~~~~~~"
12192
msgstr ""
12193
12194
#: en/help_topics/hooks.txt:207
12195
msgid ""
12196
"Called when enumerating commands. Called with a set of cmd_name\n"
12197
"strings for all the commands found so far. This set is safe to mutate\n"
12198
"- e.g. to remove a command. list_commands should return the updated\n"
12199
"set of command names."
12200
msgstr ""
12201
12202
#: en/help_topics/hooks.txt:212
12203
msgid ""
12204
"_ConfigHooks\n"
12205
"------------"
12206
msgstr ""
12207
12208
#: en/help_topics/hooks.txt:215
12209
msgid ""
12210
"get\n"
12211
"~~~"
12212
msgstr ""
12213
12214
#: en/help_topics/hooks.txt:218 en/help_topics/hooks.txt:226
12215
#: en/help_topics/hooks.txt:233 en/help_topics/hooks.txt:241
12216
#: en/help_topics/hooks.txt:248 en/help_topics/hooks.txt:370
12217
#: en/help_topics/hooks.txt:427
12218
msgid "Introduced in: 2.4"
12219
msgstr ""
12220
12221
#: en/help_topics/hooks.txt:220
12222
msgid ""
12223
"Invoked when a config option is read. The signature is (stack, name,\n"
12224
"value)."
12225
msgstr ""
12226
12227
#: en/help_topics/hooks.txt:223
12228
msgid ""
12229
"load\n"
12230
"~~~~"
12231
msgstr ""
12232
12233
#: en/help_topics/hooks.txt:228
12234
msgid "Invoked when a config store is loaded. The signature is (store)."
12235
msgstr ""
12236
12237
#: en/help_topics/hooks.txt:230
12238
msgid ""
12239
"remove\n"
12240
"~~~~~~"
12241
msgstr ""
12242
12243
#: en/help_topics/hooks.txt:235
12244
msgid ""
12245
"Invoked when a config option is removed. The signature is (stack,\n"
12246
"name)."
12247
msgstr ""
12248
12249
#: en/help_topics/hooks.txt:238
12250
msgid ""
12251
"save\n"
12252
"~~~~"
12253
msgstr ""
12254
12255
#: en/help_topics/hooks.txt:243
12256
msgid "Invoked when a config store is saved. The signature is (store)."
12257
msgstr ""
12258
12259
#: en/help_topics/hooks.txt:245
12260
msgid ""
12261
"set\n"
12262
"~~~"
12263
msgstr ""
12264
12265
#: en/help_topics/hooks.txt:250
12266
msgid ""
12267
"Invoked when a config option is set. The signature is (stack, name,\n"
12268
"value)."
12269
msgstr ""
12270
12271
#: en/help_topics/hooks.txt:253
12272
msgid ""
12273
"ControlDirHooks\n"
12274
"---------------"
12275
msgstr ""
12276
12277
#: en/help_topics/hooks.txt:256
12278
msgid ""
12279
"post_repo_init\n"
12280
"~~~~~~~~~~~~~~"
12281
msgstr ""
12282
12283
#: en/help_topics/hooks.txt:261
12284
msgid ""
12285
"Invoked after a repository has been initialized. post_repo_init is\n"
12286
"called with a bzrlib.controldir.RepoInitHookParams."
12287
msgstr ""
12288
12289
#: en/help_topics/hooks.txt:264
12290
msgid ""
12291
"pre_open\n"
12292
"~~~~~~~~"
12293
msgstr ""
12294
12295
#: en/help_topics/hooks.txt:267
12296
msgid "Introduced in: 1.14"
12297
msgstr ""
12298
12299
#: en/help_topics/hooks.txt:269
12300
msgid ""
12301
"Invoked before attempting to open a ControlDir with the transport that\n"
12302
"the open will use."
12303
msgstr ""
12304
12305
#: en/help_topics/hooks.txt:272
12306
msgid ""
12307
"InfoHooks\n"
12308
"---------"
12309
msgstr ""
12310
12311
#: en/help_topics/hooks.txt:275
12312
msgid ""
12313
"repository\n"
12314
"~~~~~~~~~~"
12315
msgstr ""
12316
12317
#: en/help_topics/hooks.txt:278 en/help_topics/hooks.txt:297
12318
#: en/help_topics/hooks.txt:505
12319
msgid "Introduced in: 1.15"
12320
msgstr ""
12321
12322
#: en/help_topics/hooks.txt:280
12323
msgid ""
12324
"Invoked when displaying the statistics for a repository. repository is\n"
12325
"called with a statistics dictionary as returned by the repository and\n"
12326
"a file-like object to write to."
12327
msgstr ""
12328
12329
#: en/help_topics/hooks.txt:284
12330
msgid ""
12331
"LockHooks\n"
12332
"---------"
12333
msgstr ""
12334
12335
#: en/help_topics/hooks.txt:287
12336
msgid ""
12337
"lock_acquired\n"
12338
"~~~~~~~~~~~~~"
12339
msgstr ""
12340
12341
#: en/help_topics/hooks.txt:292
12342
msgid "Called with a bzrlib.lock.LockResult when a physical lock is acquired."
12343
msgstr ""
12344
12345
#: en/help_topics/hooks.txt:294
12346
msgid ""
12347
"lock_broken\n"
12348
"~~~~~~~~~~~"
12349
msgstr ""
12350
12351
#: en/help_topics/hooks.txt:299
12352
msgid "Called with a bzrlib.lock.LockResult when a physical lock is broken."
12353
msgstr ""
12354
12355
#: en/help_topics/hooks.txt:301
12356
msgid ""
12357
"lock_released\n"
12358
"~~~~~~~~~~~~~"
12359
msgstr ""
12360
12361
#: en/help_topics/hooks.txt:306
12362
msgid "Called with a bzrlib.lock.LockResult when a physical lock is released."
12363
msgstr ""
12364
12365
#: en/help_topics/hooks.txt:308
12366
msgid ""
12367
"MergeHooks\n"
12368
"----------"
12369
msgstr ""
12370
12371
#: en/help_topics/hooks.txt:311
12372
msgid ""
12373
"merge_file_content\n"
12374
"~~~~~~~~~~~~~~~~~~"
12375
msgstr ""
12376
12377
#: en/help_topics/hooks.txt:314
12378
msgid "Introduced in: 2.1"
12379
msgstr ""
12380
12381
#: en/help_topics/hooks.txt:316
12382
msgid ""
12383
"Called with a bzrlib.merge.Merger object to create a per file merge\n"
12384
"object when starting a merge. Should return either None or a subclass\n"
12385
"of ``bzrlib.merge.AbstractPerFileMerger``. Such objects will then be\n"
12386
"called per file that needs to be merged (including when one side has\n"
12387
"deleted the file and the other has changed it). See the\n"
12388
"AbstractPerFileMerger API docs for details on how it is used by merge."
12389
msgstr ""
12390
12391
#: en/help_topics/hooks.txt:323
12392
msgid ""
12393
"post_merge\n"
12394
"~~~~~~~~~~"
12395
msgstr ""
12396
12397
#: en/help_topics/hooks.txt:326 en/help_topics/hooks.txt:334
12398
#: en/help_topics/hooks.txt:384 en/help_topics/hooks.txt:493
12399
msgid "Introduced in: 2.5"
12400
msgstr ""
12401
12402
#: en/help_topics/hooks.txt:328
12403
msgid ""
12404
"Called after a merge. Receives a Merger object as the single argument.\n"
12405
"The return value is ignored."
12406
msgstr ""
12407
12408
#: en/help_topics/hooks.txt:331
12409
msgid ""
12410
"pre_merge\n"
12411
"~~~~~~~~~"
12412
msgstr ""
12413
12414
#: en/help_topics/hooks.txt:336
12415
msgid ""
12416
"Called before a merge. Receives a Merger object as the single\n"
12417
"argument."
12418
msgstr ""
12419
12420
#: en/help_topics/hooks.txt:339
12421
msgid ""
12422
"MergeDirectiveHooks\n"
12423
"-------------------"
12424
msgstr ""
12425
12426
#: en/help_topics/hooks.txt:342
12427
msgid ""
12428
"merge_request_body\n"
12429
"~~~~~~~~~~~~~~~~~~"
12430
msgstr ""
12431
12432
#: en/help_topics/hooks.txt:345
12433
msgid "Introduced in: 1.15.0"
12434
msgstr ""
12435
12436
#: en/help_topics/hooks.txt:347
12437
msgid ""
12438
"Called with a MergeRequestBodyParams when a body is needed for a merge\n"
12439
"request. Callbacks must return a body. If more than one callback is\n"
12440
"registered, the output of one callback is provided to the next."
12441
msgstr ""
12442
12443
#: en/help_topics/hooks.txt:351
12444
msgid ""
12445
"MessageEditorHooks\n"
12446
"------------------"
12447
msgstr ""
12448
12449
#: en/help_topics/hooks.txt:354
12450
msgid ""
12451
"commit_message_template\n"
12452
"~~~~~~~~~~~~~~~~~~~~~~~"
12453
msgstr ""
12454
12455
#: en/help_topics/hooks.txt:357
12456
msgid "Introduced in: 1.10"
12457
msgstr ""
12458
12459
#: en/help_topics/hooks.txt:359
12460
msgid ""
12461
"Called when a commit message is being generated.\n"
12462
"commit_message_template is called with the bzrlib.commit.Commit object\n"
12463
"and the message that is known so far. commit_message_template must\n"
12464
"return a new message to use (which could be the same as it was given).\n"
12465
"When there are multiple hooks registered for commit_message_template,\n"
12466
"they are chained with the result from the first passed into the\n"
12467
"second, and so on."
12468
msgstr ""
12469
12470
#: en/help_topics/hooks.txt:367
12471
msgid ""
12472
"set_commit_message\n"
12473
"~~~~~~~~~~~~~~~~~~"
12474
msgstr ""
12475
12476
#: en/help_topics/hooks.txt:372
12477
msgid ""
12478
"Set a fixed commit message. set_commit_message is called with the\n"
12479
"bzrlib.commit.Commit object (so you can also change e.g. revision\n"
12480
"properties by editing commit.builder._revprops) and the message so\n"
12481
"far. set_commit_message must return the message to use or None if it\n"
12482
"should use the message editor as normal."
12483
msgstr ""
12484
12485
#: en/help_topics/hooks.txt:378
12486
msgid ""
12487
"MutableTreeHooks\n"
12488
"----------------"
12489
msgstr ""
12490
12491
#: en/help_topics/hooks.txt:381
12492
msgid ""
12493
"post_build_tree\n"
12494
"~~~~~~~~~~~~~~~"
12495
msgstr ""
12496
12497
#: en/help_topics/hooks.txt:386
12498
msgid ""
12499
"Called after a completely new tree is built. The hook is called with\n"
12500
"the tree as its only argument."
12501
msgstr ""
12502
12503
#: en/help_topics/hooks.txt:392
12504
msgid "Introduced in: 2.0"
12505
msgstr ""
12506
12507
#: en/help_topics/hooks.txt:394
12508
msgid ""
12509
"Called after a commit is performed on a tree. The hook is called with\n"
12510
"a bzrlib.mutabletree.PostCommitHookParams object. The mutable tree the\n"
12511
"commit was performed on is available via the mutable_tree attribute of\n"
12512
"that object."
12513
msgstr ""
12514
12515
#: en/help_topics/hooks.txt:399
12516
msgid ""
12517
"start_commit\n"
12518
"~~~~~~~~~~~~"
12519
msgstr ""
12520
12521
#: en/help_topics/hooks.txt:404
12522
msgid ""
12523
"Called before a commit is performed on a tree. The start commit hook\n"
12524
"is able to change the tree before the commit takes place. start_commit\n"
12525
"is called with the bzrlib.mutabletree.MutableTree that the commit is\n"
12526
"being performed on."
12527
msgstr ""
12528
12529
#: en/help_topics/hooks.txt:409
12530
msgid ""
12531
"SmartClientHooks\n"
12532
"----------------"
12533
msgstr ""
12534
12535
#: en/help_topics/hooks.txt:412
12536
msgid ""
12537
"call\n"
12538
"~~~~"
12539
msgstr ""
12540
12541
#: en/help_topics/hooks.txt:415
12542
msgid "Introduced in: unknown"
12543
msgstr ""
12544
12545
#: en/help_topics/hooks.txt:417
12546
msgid ""
12547
"Called when the smart client is submitting a request to the smart\n"
12548
"server. Called with a bzrlib.smart.client.CallHookParams object.\n"
12549
"Streaming request bodies, and responses, are not accessible."
12550
msgstr ""
12551
12552
#: en/help_topics/hooks.txt:421
12553
msgid ""
12554
"SmartServerHooks\n"
12555
"----------------"
12556
msgstr ""
12557
12558
#: en/help_topics/hooks.txt:424
12559
msgid ""
12560
"server_exception\n"
12561
"~~~~~~~~~~~~~~~~"
12562
msgstr ""
12563
12564
#: en/help_topics/hooks.txt:429
12565
msgid ""
12566
"Called by the bzr server when an exception occurs. server_exception is\n"
12567
"called with the sys.exc_info() tuple return true for the hook if the\n"
12568
"exception has been handled, in which case the server will exit\n"
12569
"normally."
12570
msgstr ""
12571
12572
#: en/help_topics/hooks.txt:434
12573
msgid ""
12574
"server_started\n"
12575
"~~~~~~~~~~~~~~"
12576
msgstr ""
12577
12578
#: en/help_topics/hooks.txt:437 en/help_topics/hooks.txt:456
12579
msgid "Introduced in: 0.16"
12580
msgstr ""
12581
12582
#: en/help_topics/hooks.txt:439
12583
msgid ""
12584
"Called by the bzr server when it starts serving a directory.\n"
12585
"server_started is called with (backing urls, public url), where\n"
12586
"backing_url is a list of URLs giving the server-specific directory\n"
12587
"locations, and public_url is the public URL for the directory being\n"
12588
"served."
12589
msgstr ""
12590
12591
#: en/help_topics/hooks.txt:445
12592
msgid ""
12593
"server_started_ex\n"
12594
"~~~~~~~~~~~~~~~~~"
12595
msgstr ""
12596
12597
#: en/help_topics/hooks.txt:450
12598
msgid ""
12599
"Called by the bzr server when it starts serving a directory.\n"
12600
"server_started is called with (backing_urls, server_obj)."
12601
msgstr ""
12602
12603
#: en/help_topics/hooks.txt:453
12604
msgid ""
12605
"server_stopped\n"
12606
"~~~~~~~~~~~~~~"
12607
msgstr ""
12608
12609
#: en/help_topics/hooks.txt:458
12610
msgid ""
12611
"Called by the bzr server when it stops serving a directory.\n"
12612
"server_stopped is called with the same parameters as the\n"
12613
"server_started hook: (backing_urls, public_url)."
12614
msgstr ""
12615
12616
#: en/help_topics/hooks.txt:462
12617
msgid ""
12618
"StatusHooks\n"
12619
"-----------"
12620
msgstr ""
12621
12622
#: en/help_topics/hooks.txt:465
12623
msgid ""
12624
"post_status\n"
12625
"~~~~~~~~~~~"
12626
msgstr ""
12627
12628
#: en/help_topics/hooks.txt:468 en/help_topics/hooks.txt:479
12629
msgid "Introduced in: 2.3"
12630
msgstr ""
12631
12632
#: en/help_topics/hooks.txt:470
12633
msgid ""
12634
"Called with argument StatusHookParams after Bazaar has displayed the\n"
12635
"status. StatusHookParams has the attributes (old_tree, new_tree,\n"
12636
"to_file, versioned, show_ids, short, verbose). The last four arguments\n"
12637
"correspond to the command line options specified by the user for the\n"
12638
"status command. to_file is the output stream for writing."
12639
msgstr ""
12640
12641
#: en/help_topics/hooks.txt:476
12642
msgid ""
12643
"pre_status\n"
12644
"~~~~~~~~~~"
12645
msgstr ""
12646
12647
#: en/help_topics/hooks.txt:481
12648
msgid ""
12649
"Called with argument StatusHookParams before Bazaar displays the\n"
12650
"status. StatusHookParams has the attributes (old_tree, new_tree,\n"
12651
"to_file, versioned, show_ids, short, verbose). The last four arguments\n"
12652
"correspond to the command line options specified by the user for the\n"
12653
"status command. to_file is the output stream for writing."
12654
msgstr ""
12655
12656
#: en/help_topics/hooks.txt:487
12657
msgid ""
12658
"TransportHooks\n"
12659
"--------------"
12660
msgstr ""
12661
12662
#: en/help_topics/hooks.txt:490
12663
msgid ""
12664
"post_connect\n"
12665
"~~~~~~~~~~~~"
12666
msgstr ""
12667
12668
#: en/help_topics/hooks.txt:495
12669
msgid ""
12670
"Called after a new connection is established or a reconnect occurs.\n"
12671
"The sole argument passed is either the connected transport or smart\n"
12672
"medium instance."
12673
msgstr ""
12674
12675
#: en/help_topics/hooks.txt:499
12676
msgid ""
12677
"RioVersionInfoBuilderHooks\n"
12678
"--------------------------"
12679
msgstr ""
12680
12681
#: en/help_topics/hooks.txt:502
12682
msgid ""
12683
"revision\n"
12684
"~~~~~~~~"
12685
msgstr ""
12686
12687
#: en/help_topics/hooks.txt:507
12688
msgid ""
12689
"Invoked when adding information about a revision to the RIO stanza\n"
12690
"that is printed. revision is called with a revision object and a RIO\n"
12691
"stanza.\n"
12692
msgstr ""
12693
12694
#: en/help_topics/location-alias.txt:1
12695
msgid ""
12696
"Location aliases\n"
12697
"================"
12698
msgstr ""
12699
12700
#: en/help_topics/location-alias.txt:4
12701
msgid ""
12702
"Bazaar defines several aliases for locations associated with a branch. "
12703
"These\n"
12704
"can be used with most commands that expect a location, such as `bzr push`."
12705
msgstr ""
12706
12707
#: en/help_topics/location-alias.txt:7
12708
msgid "The aliases are::"
12709
msgstr ""
12710
12711
#: en/help_topics/location-alias.txt:9
12712
msgid ""
12713
" :bound The branch this branch is bound to, for bound branches.\n"
12714
" :parent The parent of this branch.\n"
12715
" :public The public location of this branch.\n"
12716
" :push The saved location used for `bzr push` with no arguments.\n"
12717
" :submit The submit branch for this branch.\n"
12718
" :this This branch."
12719
msgstr ""
12720
12721
#: en/help_topics/location-alias.txt:16
12722
msgid "For example, to push to the parent location::"
12723
msgstr ""
12724
12725
#: en/help_topics/location-alias.txt:18
12726
msgid " bzr push :parent\n"
12727
msgstr ""
12728
12729
#: en/help_topics/log-formats.txt:1
12730
msgid ""
12731
"Log Formats\n"
12732
"==========="
12733
msgstr ""
12734
12735
#: en/help_topics/log-formats.txt:4
12736
msgid ""
12737
"A log format controls how information about each revision is displayed.\n"
12738
"The standard log formats are compared below::"
12739
msgstr ""
12740
12741
#: en/help_topics/log-formats.txt:7
12742
msgid ""
12743
" Feature long short line\n"
12744
" ---------------------- ------------- ------------ -------------------\n"
12745
" design goal detailed view concise view 1 revision per line\n"
12746
" committer name+email name only name only\n"
12747
" author name+email - -\n"
12748
" date-time format full date only date only\n"
12749
" commit message full full top line\n"
12750
" tags yes yes yes\n"
12751
" merges indicator - yes -\n"
12752
" status/delta optional optional -\n"
12753
" diff/patch optional optional -\n"
12754
" revision-id optional optional -\n"
12755
" branch nick yes - -\n"
12756
" foreign vcs properties yes yes -\n"
12757
" preferred levels all 1 1\n"
12758
" digital signature optional - -"
12759
msgstr ""
12760
12761
#: en/help_topics/log-formats.txt:24
12762
msgid ""
12763
"The default format is ``long``. To change this, define the ``log_format``\n"
12764
"setting in the ``[DEFAULT]`` section of ``bazaar.conf`` like this (say)::"
12765
msgstr ""
12766
12767
#: en/help_topics/log-formats.txt:27
12768
msgid ""
12769
" [DEFAULT]\n"
12770
" log_format = short"
12771
msgstr ""
12772
12773
#: en/help_topics/log-formats.txt:30
12774
msgid ""
12775
"Alternatively, to change the log format used for a given query, use the\n"
12776
"--long, --short or --line options."
12777
msgstr ""
12778
12779
#: en/help_topics/log-formats.txt:33
12780
msgid ""
12781
"If one of the standard log formats does not meet your needs, additional\n"
12782
"formats can be provided by plugins.\n"
12783
msgstr ""
12784
12785
#: en/help_topics/other-formats.txt:1
12786
msgid "Other Storage Formats"
12787
msgstr ""
12788
12789
#: en/help_topics/other-formats.txt:3
12790
msgid "Experimental formats are shown below."
12791
msgstr ""
12792
12793
#: en/help_topics/other-formats.txt:5
12794
msgid ""
12795
":development-colo:\n"
12796
" (native) The 2a format with experimental support for colocated\n"
12797
" branches."
12798
msgstr ""
12799
12800
#: en/help_topics/other-formats.txt:9
12801
msgid ""
12802
"\n"
12803
"Deprecated formats are shown below."
12804
msgstr ""
12805
12806
#: en/help_topics/other-formats.txt:12
12807
msgid ""
12808
":pack-0.92:\n"
12809
" (native) Pack-based format used in 1.x series. Introduced in 0.92.\n"
12810
" Interoperates with bzr repositories before 0.92 but cannot be read\n"
12811
" by bzr < 0.92."
12812
msgstr ""
12813
12814
#: en/help_topics/patterns.txt:1
12815
msgid ""
12816
"Patterns\n"
12817
"========"
12818
msgstr ""
12819
12820
#: en/help_topics/patterns.txt:4
12821
msgid ""
12822
"Bazaar uses patterns to match files at various times. For example,\n"
12823
"the ``add`` command skips over files that match ignore patterns\n"
12824
"and preferences can be associated with files using rule patterns.\n"
12825
"The pattern syntax is described below."
12826
msgstr ""
12827
12828
#: en/help_topics/patterns.txt:9
12829
msgid ""
12830
"Trailing slashes on patterns are ignored. If the pattern contains a\n"
12831
"slash or is a regular expression, it is compared to the whole path\n"
12832
"from the branch root. Otherwise, it is compared to only the last\n"
12833
"component of the path. To match a file only in the root directory,\n"
12834
"prepend ``./``. Patterns specifying absolute paths are not allowed."
12835
msgstr ""
12836
12837
#: en/help_topics/patterns.txt:15
12838
msgid "Patterns may include globbing wildcards such as::"
12839
msgstr ""
12840
12841
#: en/help_topics/patterns.txt:17
12842
msgid ""
12843
" ? - Matches any single character except '/'\n"
12844
" * - Matches 0 or more characters except '/'\n"
12845
" /**/ - Matches 0 or more directories in a path\n"
12846
" [a-z] - Matches a single character from within a group of characters"
12847
msgstr ""
12848
12849
#: en/help_topics/patterns.txt:22
12850
msgid ""
12851
"Patterns may also be `Python regular expressions`_. Regular expression\n"
12852
"patterns are identified by a ``RE:`` prefix followed by the regular\n"
12853
"expression. Regular expression patterns may not include named or\n"
12854
"numbered groups."
12855
msgstr ""
12856
12857
#: en/help_topics/patterns.txt:27
12858
msgid ""
12859
"Case insensitive ignore patterns can be specified with regular expressions\n"
12860
"by using the ``i`` (for ignore case) flag in the pattern."
12861
msgstr ""
12862
12863
#: en/help_topics/patterns.txt:30
12864
msgid "For example, a case insensitive match for ``foo`` may be specified as::"
12865
msgstr ""
12866
12867
#: en/help_topics/patterns.txt:32
12868
msgid " RE:(?i)foo"
12869
msgstr ""
12870
12871
#: en/help_topics/patterns.txt:34
12872
msgid ""
12873
"Ignore patterns may be prefixed with ``!``, which means that a filename\n"
12874
"matched by that pattern will not be ignored."
12875
msgstr ""
12876
12877
#: en/help_topics/patterns.txt:37
12878
msgid ".. _Python regular expressions: http://docs.python.org/library/re.html"
12879
msgstr ""
12880
12881
#: en/help_topics/revisionspec.txt:1
12882
msgid "Revision Identifiers"
12883
msgstr ""
12884
12885
#: en/help_topics/revisionspec.txt:3
12886
msgid ""
12887
"A revision identifier refers to a specific state of a branch's history. It\n"
12888
"can be expressed in several ways. It can begin with a keyword to\n"
12889
"unambiguously specify a given lookup type; some examples are 'last:1',\n"
12890
"'before:yesterday' and 'submit:'."
12891
msgstr ""
12892
12893
#: en/help_topics/revisionspec.txt:8
12894
msgid ""
12895
"Alternately, it can be given without a keyword, in which case it will be\n"
12896
"checked as a revision number, a tag, a revision id, a date specification, or "
12897
"a\n"
12898
"branch specification, in that order. For example, 'date:today' could be\n"
12899
"written as simply 'today', though if you have a tag called 'today' that "
12900
"will\n"
12901
"be found first."
12902
msgstr ""
12903
12904
#: en/help_topics/revisionspec.txt:14
12905
msgid ""
12906
"If 'REV1' and 'REV2' are revision identifiers, then 'REV1..REV2' denotes a\n"
12907
"revision range. Examples: '3647..3649', 'date:yesterday..-1' and\n"
12908
"'branch:/path/to/branch1/..branch:/branch2' (note that there are no quotes "
12909
"or\n"
12910
"spaces around the '..')."
12911
msgstr ""
12912
12913
#: en/help_topics/revisionspec.txt:19
12914
msgid ""
12915
"Ranges are interpreted differently by different commands. To the \"log\" "
12916
"command,\n"
12917
"a range is a sequence of log messages, but to the \"diff\" command, the "
12918
"range\n"
12919
"denotes a change between revisions (and not a sequence of changes). In\n"
12920
"addition, \"log\" considers a closed range whereas \"diff\" and \"merge\" "
12921
"consider it\n"
12922
"to be open-ended, that is, they include one end but not the other. For "
12923
"example:\n"
12924
"\"bzr log -r 3647..3649\" shows the messages of revisions 3647, 3648 and "
12925
"3649,\n"
12926
"while \"bzr diff -r 3647..3649\" includes the changes done in revisions 3648 "
12927
"and\n"
12928
"3649, but not 3647."
12929
msgstr ""
12930
12931
#: en/help_topics/revisionspec.txt:28
12932
msgid "The keywords used as revision selection methods are the following:"
12933
msgstr ""
12934
12935
#: en/help_topics/revisionspec.txt:30
12936
msgid ""
12937
":revid:\n"
12938
"\tSelects a revision using the revision id.\n"
12939
":submit:\n"
12940
"\tSelects a common ancestor with the submit branch.\n"
12941
":ancestor:\n"
12942
"\tSelects a common ancestor with a second branch.\n"
12943
":date:\n"
12944
"\tSelects a revision on the basis of a datestamp.\n"
12945
":branch:\n"
12946
"\tSelects the last revision of a specified branch.\n"
12947
":tag:\n"
12948
"\tSelects a revision identified by a tag name.\n"
12949
":revno:\n"
12950
"\tSelects a revision using a number.\n"
12951
":before:\n"
12952
"\tSelects the parent of the revision specified.\n"
12953
":annotate:\n"
12954
"\tSelect the revision that last modified the specified line.\n"
12955
":mainline:\n"
12956
"\tSelect mainline revision that merged the specified revision.\n"
12957
":last:\n"
12958
"\tSelects the nth revision from the end."
12959
msgstr ""
12960
12961
#: en/help_topics/revisionspec.txt:53
12962
msgid "In addition, plugins can provide other keywords."
12963
msgstr ""
12964
12965
#: en/help_topics/revisionspec.txt:55
12966
msgid "A detailed description of each keyword is given below."
12967
msgstr ""
12968
12969
#: en/help_topics/revisionspec.txt:57
12970
msgid ":revid:"
12971
msgstr ""
12972
12973
#: en/help_topics/revisionspec.txt:59
12974
msgid ""
12975
" Supply a specific revision id, that can be used to specify any\n"
12976
" revision id in the ancestry of the branch.\n"
12977
" Including merges, and pending merges.\n"
12978
" Examples::"
12979
msgstr ""
12980
12981
#: en/help_topics/revisionspec.txt:64
12982
msgid ""
12983
" revid:aaaa@bbbb-123456789 -> Select revision 'aaaa@bbbb-123456789'"
12984
msgstr ""
12985
12986
#: en/help_topics/revisionspec.txt:66
12987
msgid ":submit:"
12988
msgstr ""
12989
12990
#: en/help_topics/revisionspec.txt:68
12991
msgid ""
12992
" Diffing against this shows all the changes that were made in this "
12993
"branch,\n"
12994
" and is a good predictor of what merge will do. The submit branch is\n"
12995
" used by the bundle and merge directive commands. If no submit branch\n"
12996
" is specified, the parent branch is used instead."
12997
msgstr ""
12998
12999
#: en/help_topics/revisionspec.txt:73 en/help_topics/revisionspec.txt:85
13000
msgid ""
13001
" The common ancestor is the last revision that existed in both\n"
13002
" branches. Usually this is the branch point, but it could also be\n"
13003
" a revision that was merged."
13004
msgstr ""
13005
13006
#: en/help_topics/revisionspec.txt:77 en/help_topics/revisionspec.txt:93
13007
#: en/help_topics/revisionspec.txt:109 en/help_topics/revisionspec.txt:119
13008
#: en/help_topics/revisionspec.txt:153
13009
msgid " Examples::"
13010
msgstr ""
13011
13012
#: en/help_topics/revisionspec.txt:79
13013
msgid " $ bzr diff -r submit:"
13014
msgstr ""
13015
13016
#: en/help_topics/revisionspec.txt:81
13017
msgid ":ancestor:"
13018
msgstr ""
13019
13020
#: en/help_topics/revisionspec.txt:83
13021
msgid " Supply the path to a branch to select the common ancestor."
13022
msgstr ""
13023
13024
#: en/help_topics/revisionspec.txt:89
13025
msgid ""
13026
" This is frequently used with 'diff' to return all of the changes\n"
13027
" that your branch introduces, while excluding the changes that you\n"
13028
" have not merged from the remote branch."
13029
msgstr ""
13030
13031
#: en/help_topics/revisionspec.txt:95
13032
msgid ""
13033
" ancestor:/path/to/branch\n"
13034
" $ bzr diff -r ancestor:../../mainline/branch"
13035
msgstr ""
13036
13037
#: en/help_topics/revisionspec.txt:98
13038
msgid ":date:"
13039
msgstr ""
13040
13041
#: en/help_topics/revisionspec.txt:100
13042
msgid ""
13043
" Supply a datestamp to select the first revision that matches the date.\n"
13044
" Date can be 'yesterday', 'today', 'tomorrow' or a YYYY-MM-DD string.\n"
13045
" Matches the first entry after a given date (either at midnight or\n"
13046
" at a specified time)."
13047
msgstr ""
13048
13049
#: en/help_topics/revisionspec.txt:105
13050
msgid " One way to display all the changes since yesterday would be::"
13051
msgstr ""
13052
13053
#: en/help_topics/revisionspec.txt:107
13054
msgid " bzr log -r date:yesterday.."
13055
msgstr ""
13056
13057
#: en/help_topics/revisionspec.txt:111
13058
msgid ""
13059
" date:yesterday -> select the first revision since "
13060
"yesterday\n"
13061
" date:2006-08-14,17:10:14 -> select the first revision after\n"
13062
" August 14th, 2006 at 5:10pm."
13063
msgstr ""
13064
13065
#: en/help_topics/revisionspec.txt:115
13066
msgid ":branch:"
13067
msgstr ""
13068
13069
#: en/help_topics/revisionspec.txt:117
13070
msgid " Supply the path to a branch to select its last revision."
13071
msgstr ""
13072
13073
#: en/help_topics/revisionspec.txt:121
13074
msgid " branch:/path/to/branch"
13075
msgstr ""
13076
13077
#: en/help_topics/revisionspec.txt:123
13078
msgid ":tag:"
13079
msgstr ""
13080
13081
#: en/help_topics/revisionspec.txt:125
13082
msgid " Tags are stored in the branch and created by the 'tag' command."
13083
msgstr ""
13084
13085
#: en/help_topics/revisionspec.txt:127
13086
msgid ":revno:"
13087
msgstr ""
13088
13089
#: en/help_topics/revisionspec.txt:129
13090
msgid ""
13091
" Use an integer to specify a revision in the history of the branch.\n"
13092
" Optionally a branch can be specified. A negative number will count\n"
13093
" from the end of the branch (-1 is the last revision, -2 the previous\n"
13094
" one). If the negative number is larger than the branch's history, the\n"
13095
" first revision is returned.\n"
13096
" Examples::"
13097
msgstr ""
13098
13099
#: en/help_topics/revisionspec.txt:136
13100
msgid ""
13101
" revno:1 -> return the first revision of this branch\n"
13102
" revno:3:/path/to/branch -> return the 3rd revision of\n"
13103
" the branch '/path/to/branch'\n"
13104
" revno:-1 -> The last revision in a branch.\n"
13105
" -2:http://other/branch -> The second to last revision in the\n"
13106
" remote branch.\n"
13107
" -1000000 -> Most likely the first revision, unless\n"
13108
" your history is very long."
13109
msgstr ""
13110
13111
#: en/help_topics/revisionspec.txt:145
13112
msgid ":before:"
13113
msgstr ""
13114
13115
#: en/help_topics/revisionspec.txt:147
13116
msgid ""
13117
" Supply any revision spec to return the parent of that revision. This "
13118
"is\n"
13119
" mostly useful when inspecting revisions that are not in the revision "
13120
"history\n"
13121
" of a branch."
13122
msgstr ""
13123
13124
#: en/help_topics/revisionspec.txt:151
13125
msgid ""
13126
" It is an error to request the parent of the null revision (before:0)."
13127
msgstr ""
13128
13129
#: en/help_topics/revisionspec.txt:155
13130
msgid ""
13131
" before:1913 -> Return the parent of revno 1913 (revno 1912)\n"
13132
" before:revid:aaaa@bbbb-1234567890 -> return the parent of revision\n"
13133
" aaaa@bbbb-1234567890\n"
13134
" bzr diff -r before:1913..1913\n"
13135
" -> Find the changes between revision 1913 and its parent "
13136
"(1912).\n"
13137
" (What changes did revision 1913 introduce).\n"
13138
" This is equivalent to: bzr diff -c 1913"
13139
msgstr ""
13140
13141
#: en/help_topics/revisionspec.txt:163
13142
msgid ":annotate:"
13143
msgstr ""
13144
13145
#: en/help_topics/revisionspec.txt:165
13146
msgid ""
13147
" Select the revision that last modified the specified line. Line is\n"
13148
" specified as path:number. Path is a relative path to the file. "
13149
"Numbers\n"
13150
" start at 1, and are relative to the current version, not the last-\n"
13151
" committed version of the file."
13152
msgstr ""
13153
13154
#: en/help_topics/revisionspec.txt:170
13155
msgid ":mainline:"
13156
msgstr ""
13157
13158
#: en/help_topics/revisionspec.txt:172
13159
msgid ""
13160
" Select the revision that merged the specified revision into mainline."
13161
msgstr ""
13162
13163
#: en/help_topics/revisionspec.txt:174
13164
msgid ":last:"
13165
msgstr ""
13166
13167
#: en/help_topics/revisionspec.txt:176
13168
msgid ""
13169
" Supply a positive number to get the nth revision from the end.\n"
13170
" This is the same as supplying negative numbers to the 'revno:' spec.\n"
13171
" Examples::"
13172
msgstr ""
13173
13174
#: en/help_topics/revisionspec.txt:180
13175
msgid ""
13176
" last:1 -> return the last revision\n"
13177
" last:3 -> return the revision 2 before the end.\n"
13178
msgstr ""
13179
13180
#: en/help_topics/rules.txt:1
13181
msgid ""
13182
"Rules\n"
13183
"====="
13184
msgstr ""
13185
13186
#: en/help_topics/rules.txt:7
13187
msgid ""
13188
"Rules are defined in ini file format where the sections are file glob\n"
13189
"patterns and the contents of each section are the preferences for files\n"
13190
"matching that pattern(s). For example::"
13191
msgstr ""
13192
13193
#: en/help_topics/rules.txt:11
13194
msgid ""
13195
" [name *.bat]\n"
13196
" eol = native"
13197
msgstr ""
13198
13199
#: en/help_topics/rules.txt:14
13200
msgid ""
13201
" [name *.html *.xml]\n"
13202
" keywords = xml_escape"
13203
msgstr ""
13204
13205
#: en/help_topics/rules.txt:17
13206
msgid ""
13207
"Preferences like these are useful for commands and plugins wishing to\n"
13208
"provide custom behaviour for selected files. For more information on \n"
13209
"end of line conversion see :doc:`eol-help`.\n"
13210
"Keyword support is provided by the `keywords plugin\n"
13211
"<http://doc.bazaar.canonical.com/plugins/en/keywords-plugin.html>`_."
13212
msgstr ""
13213
13214
#: en/help_topics/rules.txt:23
13215
msgid ""
13216
"Files\n"
13217
"-----"
13218
msgstr ""
13219
13220
#: en/help_topics/rules.txt:26
13221
msgid ""
13222
"Default rules for all branches are defined in the optional file\n"
13223
"``BZR_HOME/rules``. "
13224
msgstr ""
13225
13226
#: en/help_topics/rules.txt:29
13227
msgid ""
13228
"Rule Patterns\n"
13229
"-------------"
13230
msgstr ""
13231
13232
#: en/help_topics/rules.txt:32
13233
msgid ""
13234
"Patterns are ordered and searching stops as soon as one matches.\n"
13235
"As a consequence, more explicit patterns should be placed towards\n"
13236
"the top of the file. Rule patterns use exactly the same conventions\n"
13237
"as ignore patterns. See :doc:`patterns-help` for details."
13238
msgstr ""
13239
13240
#: en/help_topics/rules.txt:37
13241
msgid ".. note::"
13242
msgstr ""
13243
13244
#: en/help_topics/rules.txt:39
13245
msgid ""
13246
" Patterns containing square brackets or spaces should be\n"
13247
" surrounded in quotes to ensure they are correctly parsed.\n"
13248
msgstr ""
13249
13250
#: en/help_topics/topics.txt:1
13251
msgid ""
13252
"authentication Information on configuring authentication\n"
13253
"basic Basic commands\n"
13254
"branches Information on what a branch is\n"
13255
"bugs Bug tracker settings\n"
13256
"checkouts Information on what a checkout is\n"
13257
"commands Basic help for all commands\n"
13258
"configuration Details on the configuration settings available\n"
13259
"conflict-types Types of conflicts and what to do about them\n"
13260
"content-filters Conversion of content into/from working trees\n"
13261
"criss-cross Information on criss-cross merging\n"
13262
"current-formats Current storage formats\n"
13263
"debug-flags Options to show or record debug information\n"
13264
"diverged-branches How to fix diverged branches\n"
13265
"env-variables Environment variable names and values\n"
13266
"eol Information on end-of-line handling\n"
13267
"files Information on configuration and log files\n"
13268
"formats Information on choosing a storage format\n"
13269
"global-options Options that control how Bazaar runs\n"
13270
"hidden-commands All hidden commands\n"
13271
"hooks Points at which custom processing can be added\n"
13272
"launchpad Using Bazaar with Launchpad.net\n"
13273
"location-alias Aliases for remembered locations\n"
13274
"log-formats Details on the logging formats available\n"
13275
"other-formats Experimental and deprecated storage formats\n"
13276
"patterns Information on the pattern syntax\n"
13277
"repositories Basic information on shared repositories.\n"
13278
"revisionspec Explain how to use --revision\n"
13279
"rules Information on defining rule-based preferences\n"
13280
"standalone-trees Information on what a standalone tree is\n"
13281
"standard-options Options that can be used with any command\n"
13282
"status-flags Help on status flags\n"
13283
"sync-for-reconfigure Steps to resolve \"out-of-sync\" when reconfiguring\n"
13284
"topics Topics list\n"
13285
"url-special-chars Special character handling in URLs\n"
13286
"urlspec Supported transport protocols\n"
13287
"working-trees Information on working trees\n"
13288
msgstr ""
13289
13290
#: en/help_topics/url-special-chars.txt:1
13291
msgid ""
13292
"Special character handling in URLs\n"
13293
"=================================="
13294
msgstr ""
13295
13296
#: en/help_topics/url-special-chars.txt:4
13297
msgid "Bazaar allows locations to be specified in multiple ways, either:"
13298
msgstr ""
13299
13300
#: en/help_topics/url-special-chars.txt:6
13301
msgid " * Fully qualified URLs"
13302
msgstr ""
13303
13304
#: en/help_topics/url-special-chars.txt:8
13305
msgid " * File system paths, relative or absolute"
13306
msgstr ""
13307
13308
#: en/help_topics/url-special-chars.txt:10
13309
msgid ""
13310
"Internally bzr treats all locations as URLs. For any file system paths\n"
13311
"that are specified it will automatically determine the appropriate URL\n"
13312
"representation, and escape special characters where necessary."
13313
msgstr ""
13314
13315
#: en/help_topics/url-special-chars.txt:14
13316
msgid ""
13317
"There are a few characters which have special meaning in URLs and need "
13318
"careful\n"
13319
"handling to avoid ambiguities. Characters can be escaped with a % and a hex\n"
13320
"value in URLs. Any non-ASCII characters in a file path will automatically "
13321
"be\n"
13322
"urlencoded when the path is converted to a URL."
13323
msgstr ""
13324
13325
#: en/help_topics/url-special-chars.txt:19
13326
msgid ""
13327
"URLs represent non-ASCII characters in an encoding defined by the server, "
13328
"but\n"
13329
"usually UTF-8. The % escapes should be of the UTF-8 bytes. Bazaar tries to "
13330
"be\n"
13331
"generous in what it accepts as a URL and to print them in a way that\n"
13332
"will be readable."
13333
msgstr ""
13334
13335
#: en/help_topics/url-special-chars.txt:24
13336
msgid ""
13337
"For example, if you have a directory named '/tmp/%2False' these are all "
13338
"valid\n"
13339
"ways of accessing the content (0x2F, or 47, is the ASCII code for forward "
13340
"slash)::"
13341
msgstr ""
13342
13343
#: en/help_topics/url-special-chars.txt:27
13344
msgid ""
13345
" cd /tmp\n"
13346
" bzr log /tmp/%2False\n"
13347
" bzr log %2False\n"
13348
" bzr log file:///tmp/%252False\n"
13349
" bzr log file://localhost/tmp/%252False\n"
13350
" bzr log file:%252False"
13351
msgstr ""
13352
13353
#: en/help_topics/url-special-chars.txt:34
13354
msgid "These are valid but do not refer to the same file::"
13355
msgstr ""
13356
13357
#: en/help_topics/url-special-chars.txt:36
13358
msgid ""
13359
" bzr log file:///tmp/%2False (refers to a file called /tmp/\\/alse)\n"
13360
" bzr log %252False (refers to a file called /tmp/%252False)"
13361
msgstr ""
13362
13363
#: en/help_topics/url-special-chars.txt:39
13364
msgid ""
13365
"Comma also has special meaning in URLs, because it denotes `segment "
13366
"parameters`_"
13367
msgstr ""
13368
13369
#: en/help_topics/url-special-chars.txt:41
13370
msgid ""
13371
"_`segment parameters`: http://www.ietf.org/rfc/rfc3986.txt (section 3.3)"
13372
msgstr ""
13373
13374
#: en/help_topics/url-special-chars.txt:43
13375
msgid ""
13376
"Comma is also special in any file system paths that are specified. To use a "
13377
"literal\n"
13378
"comma in a file system path, specify a URL and URL encode the comma::"
13379
msgstr ""
13380
13381
#: en/help_topics/url-special-chars.txt:46
13382
msgid ""
13383
" bzr log foo,branch=bla # path \"foo\" with the segment parameter \"branch"
13384
"\" set to \"bla\"\n"
13385
" bzr log file:foo%2Cbranch=bla # path \"foo,branch=bla\"\n"
13386
" bzr log file:foo,branch=bla # path \"foo\" with segment parameter \"branch"
13387
"\" set to \"bla\"\n"
13388
msgstr ""
13389
13390
#: en/help_topics/urlspec.txt:1
13391
msgid "URL Identifiers"
13392
msgstr ""
13393
13394
#: en/help_topics/urlspec.txt:3
13395
msgid "Supported URL prefixes::"
13396
msgstr ""
13397
13398
#: en/help_topics/urlspec.txt:5
13399
msgid ""
13400
" aftp:// Access using active FTP.\n"
13401
" bzr:// Fast access using the Bazaar smart server.\n"
13402
" bzr+ssh:// Fast access using the Bazaar smart server over SSH.\n"
13403
" file:// Access using the standard filesystem (default)\n"
13404
" ftp:// Access using passive FTP.\n"
13405
" http:// Read-only access of branches exported on the web.\n"
13406
" https:// Read-only access of branches exported on the web using "
13407
"SSL.\n"
13408
" sftp:// Access using SFTP (most SSH servers provide SFTP)."
13409
msgstr ""
13410
13411
#: en/help_topics/urlspec.txt:14
13412
msgid "Supported modifiers::"
13413
msgstr ""
13414
13415
#: en/help_topics/urlspec.txt:16
13416
msgid " gio+ Access using any GIO supported protocols."
13417
msgstr ""
13418
13419
#: en/help_topics/urlspec.txt:18
13420
msgid "Bazaar supports all of the standard parts within the URL::"
13421
msgstr ""
13422
13423
#: en/help_topics/urlspec.txt:20
13424
msgid " <protocol>://[user[:password]@]host[:port]/[path]"
13425
msgstr ""
13426
13427
#: en/help_topics/urlspec.txt:22
13428
msgid "allowing URLs such as::"
13429
msgstr ""
13430
13431
#: en/help_topics/urlspec.txt:24
13432
msgid " http://bzruser:BadPass@bzr.example.com:8080/bzr/trunk"
13433
msgstr ""
13434
13435
#: en/help_topics/urlspec.txt:26
13436
msgid ""
13437
"For bzr+ssh:// and sftp:// URLs, Bazaar also supports paths that begin\n"
13438
"with '~' as meaning that the rest of the path should be interpreted\n"
13439
"relative to the remote user's home directory. For example if the user\n"
13440
"``remote`` has a home directory of ``/home/remote`` on the server\n"
13441
"shell.example.com, then::"
13442
msgstr ""
13443
13444
#: en/help_topics/urlspec.txt:32
13445
msgid " bzr+ssh://remote@shell.example.com/~/myproject/trunk"
13446
msgstr ""
13447
13448
#: en/help_topics/urlspec.txt:34
13449
msgid "would refer to ``/home/remote/myproject/trunk``."
13450
msgstr ""
13451
13452
#: en/help_topics/urlspec.txt:36
13453
msgid ""
13454
"Many commands that accept URLs also accept location aliases too.\n"
13455
"See :doc:`location-alias-help` and :doc:`url-special-chars-help`.\n"
13456
msgstr ""
Loggerhead is a web-based interface for Breezy
Version: 2.0.1