To get this branch, use:
bzr branch
http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar
« back to all changes in this revision
Viewing changes to po/bzr.pot
- browse files at revision 6123.11.14
- compare with another revision
- download diff
- download tarball
- view history from revision 6123.11.14
- Committer: Martin von Gagern
- Date: 2011-09-19 08:49:15 UTC
- mto: This revision was merged to the branch mainline in revision 6148.
- Revision ID: martin.vgagern@gmx.net-20110919084915-vbumflqq3xqm1vez
Avoid using deprecated api in the unit tests for bzrlib.missing.
- files added:
- NEWS
- bzrlib/doc_generate/builders
- bzrlib/doc_generate/writers
- bzrlib/plugins/bash_completion
- bzrlib/plugins/bash_completion/tests
- bzrlib/plugins/changelog_merge
- bzrlib/plugins/changelog_merge/tests
- bzrlib/plugins/weave_fmt
- bzrlib/plugins/weave_fmt/tests
- bzrlib/tests/doc_generate
- bzrlib/tests/doc_generate/builders
- bzrlib/tests/doc_generate/writers
- bzrlib/tests/per_bzrdir
- bzrlib/tests/per_repository_vf
- po
- files removed:
- bzrlib/benchmarks
- bzrlib/benchmarks/tree_creator
- files renamed:
- bzrlib/sign_my_commits.py => bzrlib/commit_signature_commands.py
- bzrlib/doc_generate/sphinx_conf.py => bzrlib/doc_generate/conf.py
- bzrlib/repofmt/weaverepo.py => bzrlib/plugins/weave_fmt/repository.py
- bzrlib/xml4.py => bzrlib/plugins/weave_fmt/xml4.py
- bzrlib/tests/per_bzrdir/ => bzrlib/tests/per_controldir/
- bzrlib/tests/per_bzrdir/test_bzrdir.py => bzrlib/tests/per_controldir/test_controldir.py
- bzrlib/tests/per_bzrdir_colo/ => bzrlib/tests/per_controldir_colo/
- 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: 2011-09-07 15:32+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/builtins.py:209
22
msgid "Display status summary."
23
msgstr ""
24
25
#: bzrlib/builtins.py:211
26
msgid ""
27
"This reports on versioned and unknown files, reporting them\n"
28
"grouped by state. Possible states are:"
29
msgstr ""
30
31
#: bzrlib/builtins.py:214
32
msgid ""
33
"added\n"
34
" Versioned in the working copy but not in the previous revision."
35
msgstr ""
36
37
#: bzrlib/builtins.py:217
38
msgid ""
39
"removed\n"
40
" Versioned in the previous revision but removed or deleted\n"
41
" in the working copy."
42
msgstr ""
43
44
#: bzrlib/builtins.py:221
45
msgid ""
46
"renamed\n"
47
" Path of this file changed from the previous revision;\n"
48
" the text may also have changed. This includes files whose\n"
49
" parent directory was renamed."
50
msgstr ""
51
52
#: bzrlib/builtins.py:226
53
msgid ""
54
"modified\n"
55
" Text has changed since the previous revision."
56
msgstr ""
57
58
#: bzrlib/builtins.py:229
59
msgid ""
60
"kind changed\n"
61
" File kind has been changed (e.g. from file to directory)."
62
msgstr ""
63
64
#: bzrlib/builtins.py:232
65
msgid ""
66
"unknown\n"
67
" Not versioned and not matching an ignore pattern."
68
msgstr ""
69
70
#: bzrlib/builtins.py:235
71
msgid ""
72
"Additionally for directories, symlinks and files with a changed\n"
73
"executable bit, Bazaar indicates their type using a trailing\n"
74
"character: '/', '@' or '*' respectively. These decorations can be\n"
75
"disabled using the '--no-classify' option."
76
msgstr ""
77
78
#: bzrlib/builtins.py:240
79
msgid ""
80
"To see ignored files use 'bzr ignored'. For details on the\n"
81
"changes to file texts, use 'bzr diff'."
82
msgstr ""
83
84
#: bzrlib/builtins.py:243
85
msgid ""
86
"Note that --short or -S gives status flags for each item, similar\n"
87
"to Subversion's status command. To get output similar to svn -q,\n"
88
"use bzr status -SV."
89
msgstr ""
90
91
#: bzrlib/builtins.py:247
92
msgid ""
93
"If no arguments are specified, the status of the entire working\n"
94
"directory is shown. Otherwise, only the status of the specified\n"
95
"files or directories is reported. If a directory is given, status\n"
96
"is reported for everything inside that directory."
97
msgstr ""
98
99
#: bzrlib/builtins.py:252
100
msgid ""
101
"Before merges are committed, the pending merge tip revisions are\n"
102
"shown. To see all pending merge revisions, use the -v option.\n"
103
"To skip the display of pending merge information altogether, use\n"
104
"the no-pending option or specify a file/directory."
105
msgstr ""
106
107
#: bzrlib/builtins.py:257
108
msgid ""
109
"To compare the working directory to a specific revision, pass a\n"
110
"single revision to the revision argument."
111
msgstr ""
112
113
#: bzrlib/builtins.py:260
114
msgid ""
115
"To see which files have changed in a specific revision, or between\n"
116
"two revisions, pass a revision range to the revision argument.\n"
117
"This will produce the same results as calling 'bzr diff --summarize'."
118
msgstr ""
119
120
# help of 'short' option of 'status' command
121
#: bzrlib/builtins.py:269
122
msgid "Use short status indicators."
123
msgstr ""
124
125
# help of 'versioned' option of 'status' command
126
#: bzrlib/builtins.py:271
127
msgid "Only show versioned files."
128
msgstr ""
129
130
# help of 'no-pending' option of 'status' command
131
#: bzrlib/builtins.py:273
132
msgid "Don't show pending merges."
133
msgstr ""
134
135
# help of 'no-classify' option of 'status' command
136
#: bzrlib/builtins.py:276
137
msgid "Do not mark object type using indicator."
138
msgstr ""
139
140
#: bzrlib/builtins.py:455
141
msgid "Remove the working tree from a given branch/checkout."
142
msgstr ""
143
144
#: bzrlib/builtins.py:457
145
msgid ""
146
"Since a lightweight checkout is little more than a working tree\n"
147
"this will refuse to run against one."
148
msgstr ""
149
150
#: bzrlib/builtins.py:460
151
msgid "To re-create the working tree, use \"bzr checkout\"."
152
msgstr ""
153
154
# help of 'force' option of 'remove-tree' command
155
#: bzrlib/builtins.py:466
156
msgid "Remove the working tree even if it has uncommitted or shelved changes."
157
msgstr ""
158
159
#: bzrlib/builtins.py:551
160
msgid "Show current revision number."
161
msgstr ""
162
163
#: bzrlib/builtins.py:553
164
msgid "This is equal to the number of revisions on this branch."
165
msgstr ""
166
167
# help of 'tree' option of 'revno' command
168
#: bzrlib/builtins.py:594
169
msgid "Show revno of working tree"
170
msgstr ""
171
172
#: bzrlib/builtins.py:642
173
msgid "Add specified files or directories."
174
msgstr ""
175
176
#: bzrlib/builtins.py:644
177
msgid ""
178
"In non-recursive mode, all the named items are added, regardless\n"
179
"of whether they were previously ignored. A warning is given if\n"
180
"any of the named files are already versioned."
181
msgstr ""
182
183
#: bzrlib/builtins.py:648
184
msgid ""
185
"In recursive mode (the default), files are treated the same way\n"
186
"but the behaviour for directories is different. Directories that\n"
187
"are already versioned do not give a warning. All directories,\n"
188
"whether already versioned or not, are searched for files or\n"
189
"subdirectories that are neither versioned or ignored, and these\n"
190
"are added. This search proceeds recursively into versioned\n"
191
"directories. If no names are given '.' is assumed."
192
msgstr ""
193
194
#: bzrlib/builtins.py:656
195
msgid ""
196
"Therefore simply saying 'bzr add' will version all files that\n"
197
"are currently unknown."
198
msgstr ""
199
200
#: bzrlib/builtins.py:659
201
msgid ""
202
"Adding a file whose parent directory is not versioned will\n"
203
"implicitly add the parent, and so on up to the root. This means\n"
204
"you should never need to explicitly add a directory, they'll just\n"
205
"get added when you add a file in the directory."
206
msgstr ""
207
208
#: bzrlib/builtins.py:664
209
msgid ""
210
"--dry-run will show which files would be added, but not actually\n"
211
"add them."
212
msgstr ""
213
214
#: bzrlib/builtins.py:667
215
msgid ""
216
"--file-ids-from will try to use the file ids from the supplied path.\n"
217
"It looks up ids trying to find a matching parent directory with the\n"
218
"same filename, and then by pure path. This option is rarely needed\n"
219
"but can be useful when adding the same logical file into two\n"
220
"branches that will be merged later (without showing the two different\n"
221
"adds as a conflict). It is also useful when merging another project\n"
222
"into a subdirectory of this one."
223
msgstr ""
224
225
#: bzrlib/builtins.py:675
226
msgid ""
227
"Any files matching patterns in the ignore list will not be added\n"
228
"unless they are explicitly mentioned."
229
msgstr ""
230
231
#: bzrlib/builtins.py:678
232
msgid ""
233
"In recursive mode, files larger than the configuration option \n"
234
"add.maximum_file_size will be skipped. Named items are never skipped due\n"
235
"to file size."
236
msgstr ""
237
238
# help of 'no-recurse' option of 'add' command
239
#: bzrlib/builtins.py:685
240
msgid "Don't recursively add the contents of directories."
241
msgstr ""
242
243
# help of 'file-ids-from' option of 'add' command
244
#: bzrlib/builtins.py:691
245
msgid "Lookup file ids from this tree."
246
msgstr ""
247
248
#: bzrlib/builtins.py:731
249
msgid "Create a new versioned directory."
250
msgstr ""
251
252
#: bzrlib/builtins.py:733
253
msgid "This is equivalent to creating the directory and then adding it."
254
msgstr ""
255
256
#: bzrlib/builtins.py:828
257
msgid "Move or rename a file."
258
msgstr ""
259
260
#: bzrlib/builtins.py:830
261
msgid " bzr mv SOURCE... DESTINATION"
262
msgstr ""
263
264
#: bzrlib/builtins.py:832
265
msgid ""
266
"If the last argument is a versioned directory, all the other names\n"
267
"are moved into it. Otherwise, there must be exactly two arguments\n"
268
"and the file is changed to a new name."
269
msgstr ""
270
271
#: bzrlib/builtins.py:836
272
msgid ""
273
"If OLDNAME does not exist on the filesystem but is versioned and\n"
274
"NEWNAME does exist on the filesystem but is not versioned, mv\n"
275
"assumes that the file has been manually moved and only updates\n"
276
"its internal inventory to reflect that change.\n"
277
"The same is valid when moving many SOURCE files to a DESTINATION."
278
msgstr ""
279
280
#: bzrlib/builtins.py:842
281
msgid "Files cannot be moved between branches."
282
msgstr ""
283
284
# help of 'after' option of 'mv' command
285
#: bzrlib/builtins.py:849
286
msgid ""
287
"Move only the bzr identifier of the file, because the file has already been "
288
"moved."
289
msgstr ""
290
291
# help of 'auto' option of 'mv' command
292
#: bzrlib/builtins.py:851
293
msgid "Automatically guess renames."
294
msgstr ""
295
296
# help of 'dry-run' option of 'mv' command
297
#: bzrlib/builtins.py:852
298
msgid "Avoid making changes when guessing renames."
299
msgstr ""
300
301
#: bzrlib/builtins.py:964
302
msgid "Turn this branch into a mirror of another branch."
303
msgstr ""
304
305
#: bzrlib/builtins.py:966
306
msgid ""
307
"By default, this command only works on branches that have not diverged.\n"
308
"Branches are considered diverged if the destination branch's most recent \n"
309
"commit is one that has not been merged (directly or indirectly) into the \n"
310
"parent."
311
msgstr ""
312
313
#: bzrlib/builtins.py:971
314
msgid ""
315
"If branches have diverged, you can use 'bzr merge' to integrate the changes\n"
316
"from one into the other. Once one branch has merged, the other should\n"
317
"be able to pull it again."
318
msgstr ""
319
320
#: bzrlib/builtins.py:975
321
msgid ""
322
"If you want to replace your local changes and just want your branch to\n"
323
"match the remote one, use pull --overwrite. This will work even if the two\n"
324
"branches have diverged."
325
msgstr ""
326
327
#: bzrlib/builtins.py:979
328
msgid ""
329
"If there is no default location set, the first pull will set it (use\n"
330
"--no-remember to avoid setting it). After that, you can omit the\n"
331
"location to use the default. To change the default, use --remember. The\n"
332
"value will only be saved if the remote location can be accessed."
333
msgstr ""
334
335
#: bzrlib/builtins.py:984
336
msgid ""
337
"Note: The location can be specified either in the form of a branch,\n"
338
"or in the form of a path to a file containing a merge directive generated\n"
339
"with bzr send."
340
msgstr ""
341
342
# help of 'verbose' option of 'pull' command
343
#: bzrlib/builtins.py:992
344
msgid "Show logs of pulled revisions."
345
msgstr ""
346
347
# help of 'directory' option of 'pull' command
348
#: bzrlib/builtins.py:994
349
msgid ""
350
"Branch to pull into, rather than the one containing the working directory."
351
msgstr ""
352
353
# help of 'local' option of 'pull' command
354
#: bzrlib/builtins.py:997
355
msgid ""
356
"Perform a local pull in a bound branch. Local pulls are not applied to the "
357
"master branch."
358
msgstr ""
359
360
#: bzrlib/builtins.py:1096
361
msgid "Update a mirror of this branch."
362
msgstr ""
363
364
#: bzrlib/builtins.py:1098
365
msgid ""
366
"The target branch will not have its working tree populated because this\n"
367
"is both expensive, and is not supported on remote file systems."
368
msgstr ""
369
370
#: bzrlib/builtins.py:1101
371
msgid ""
372
"Some smart servers or protocols *may* put the working tree in place in\n"
373
"the future."
374
msgstr ""
375
376
#: bzrlib/builtins.py:1104
377
msgid ""
378
"This command only works on branches that have not diverged. Branches are\n"
379
"considered diverged if the destination branch's most recent commit is one\n"
380
"that has not been merged (directly or indirectly) by the source branch."
381
msgstr ""
382
383
#: bzrlib/builtins.py:1108
384
msgid ""
385
"If branches have diverged, you can use 'bzr push --overwrite' to replace\n"
386
"the other branch completely, discarding its unmerged changes."
387
msgstr ""
388
389
#: bzrlib/builtins.py:1111
390
msgid ""
391
"If you want to ensure you have the different changes in the other branch,\n"
392
"do a merge (see bzr help merge) from the other branch, and commit that.\n"
393
"After that you will be able to do a push without '--overwrite'."
394
msgstr ""
395
396
#: bzrlib/builtins.py:1115
397
msgid ""
398
"If there is no default push location set, the first push will set it (use\n"
399
"--no-remember to avoid setting it). After that, you can omit the\n"
400
"location to use the default. To change the default, use --remember. The\n"
401
"value will only be saved if the remote location can be accessed."
402
msgstr ""
403
404
# help of 'directory' option of 'push' command
405
#: bzrlib/builtins.py:1127
406
msgid ""
407
"Branch to push from, rather than the one containing the working directory."
408
msgstr ""
409
410
# help of 'use-existing-dir' option of 'push' command
411
#: bzrlib/builtins.py:1130
412
msgid ""
413
"By default push will fail if the target directory exists, but does not "
414
"already have a control directory. This flag will allow push to proceed."
415
msgstr ""
416
417
# help of 'stacked' option of 'push' command
418
#: bzrlib/builtins.py:1135
419
msgid ""
420
"Create a stacked branch that references the public location of the parent "
421
"branch."
422
msgstr ""
423
424
# help of 'stacked-on' option of 'push' command
425
#: bzrlib/builtins.py:1138
426
msgid ""
427
"Create a stacked branch that refers to another branch for the commit "
428
"history. Only the work not present in the referenced branch is included in "
429
"the branch created."
430
msgstr ""
431
432
# help of 'strict' option of 'push' command
433
#: bzrlib/builtins.py:1143
434
msgid ""
435
"Refuse to push if there are uncommitted changes in the working tree, --no-"
436
"strict disables the check."
437
msgstr ""
438
439
# help of 'no-tree' option of 'push' command
440
#: bzrlib/builtins.py:1146
441
msgid "Don't populate the working tree, even for protocols that support it."
442
msgstr ""
443
444
#: bzrlib/builtins.py:1211
445
msgid "Create a new branch that is a copy of an existing branch."
446
msgstr ""
447
448
#: bzrlib/builtins.py:1213
449
msgid ""
450
"If the TO_LOCATION is omitted, the last component of the FROM_LOCATION will\n"
451
"be used. In other words, \"branch ../foo/bar\" will attempt to create ./"
452
"bar.\n"
453
"If the FROM_LOCATION has no / or path separator embedded, the TO_LOCATION\n"
454
"is derived from the FROM_LOCATION by stripping a leading scheme or drive\n"
455
"identifier, if any. For example, \"branch lp:foo-bar\" will attempt to\n"
456
"create ./foo-bar."
457
msgstr ""
458
459
#: bzrlib/builtins.py:1220
460
msgid ""
461
"To retrieve the branch as of a particular revision, supply the --revision\n"
462
"parameter, as in \"branch foo/bar -r 5\"."
463
msgstr ""
464
465
#: bzrlib/builtins.py:1223
466
msgid "The synonyms 'clone' and 'get' for this command are deprecated."
467
msgstr ""
468
469
# help of 'no-tree' option of 'branch' command
470
#: bzrlib/builtins.py:1233
471
msgid "Create a branch without a working-tree."
472
msgstr ""
473
474
# help of 'switch' option of 'branch' command
475
#: bzrlib/builtins.py:1235
476
msgid "Switch the checkout in the current directory to the new branch."
477
msgstr ""
478
479
# help of 'stacked' option of 'branch' command
480
#: bzrlib/builtins.py:1238
481
msgid ""
482
"Create a stacked branch referring to the source branch. The new branch will "
483
"depend on the availability of the source branch for all operations."
484
msgstr ""
485
486
# help of 'standalone' option of 'branch' command
487
#: bzrlib/builtins.py:1242
488
msgid "Do not use a shared repository, even if available."
489
msgstr ""
490
491
# help of 'use-existing-dir' option of 'branch' command
492
#: bzrlib/builtins.py:1244
493
msgid ""
494
"By default branch will fail if the target directory exists, but does not "
495
"already have a control directory. This flag will allow branch to proceed."
496
msgstr ""
497
498
# help of 'bind' option of 'branch' command
499
#: bzrlib/builtins.py:1249
500
msgid "Bind new branch to from location."
501
msgstr ""
502
503
#: bzrlib/builtins.py:1341
504
msgid "List the branches available at the current location."
505
msgstr ""
506
507
#: bzrlib/builtins.py:1343
508
msgid ""
509
"This command will print the names of all the branches at the current "
510
"location."
511
msgstr ""
512
513
#: bzrlib/builtins.py:1358
514
msgid "Create a new checkout of an existing branch."
515
msgstr ""
516
517
#: bzrlib/builtins.py:1360
518
msgid ""
519
"If BRANCH_LOCATION is omitted, checkout will reconstitute a working tree "
520
"for\n"
521
"the branch found in '.'. This is useful if you have removed the working "
522
"tree\n"
523
"or if it was never created - i.e. if you pushed the branch to its current\n"
524
"location using SFTP."
525
msgstr ""
526
527
#: bzrlib/builtins.py:1365
528
msgid ""
529
"If the TO_LOCATION is omitted, the last component of the BRANCH_LOCATION "
530
"will\n"
531
"be used. In other words, \"checkout ../foo/bar\" will attempt to create ./"
532
"bar.\n"
533
"If the BRANCH_LOCATION has no / or path separator embedded, the TO_LOCATION\n"
534
"is derived from the BRANCH_LOCATION by stripping a leading scheme or drive\n"
535
"identifier, if any. For example, \"checkout lp:foo-bar\" will attempt to\n"
536
"create ./foo-bar."
537
msgstr ""
538
539
#: bzrlib/builtins.py:1372
540
msgid ""
541
"To retrieve the branch as of a particular revision, supply the --revision\n"
542
"parameter, as in \"checkout foo/bar -r 5\". Note that this will be "
543
"immediately\n"
544
"out of date [so you cannot commit] but it may be useful (i.e. to examine "
545
"old\n"
546
"code.)"
547
msgstr ""
548
549
# help of 'lightweight' option of 'checkout' command
550
#: bzrlib/builtins.py:1382
551
msgid ""
552
"Perform a lightweight checkout. Lightweight checkouts depend on access to "
553
"the branch for every operation. Normal checkouts can perform common "
554
"operations like diff and status without such access, and also support local "
555
"commits."
556
msgstr ""
557
558
# help of 'files-from' option of 'branch' command
559
#: bzrlib/builtins.py:1389
560
msgid "Get file contents from this tree."
561
msgstr ""
562
563
# help of 'hardlink' option of 'branch' command
564
#: bzrlib/builtins.py:1391
565
msgid "Hard-link working tree files where possible."
566
msgstr ""
567
568
#: bzrlib/builtins.py:1432
569
msgid ""
570
"Show list of renamed files.\n"
571
" "
572
msgstr ""
573
574
#: bzrlib/builtins.py:1462
575
msgid "Update a tree to have the latest code committed to its branch."
576
msgstr ""
577
578
#: bzrlib/builtins.py:1464
579
msgid ""
580
"This will perform a merge into the working tree, and may generate\n"
581
"conflicts. If you have any local changes, you will still\n"
582
"need to commit them after the update for the update to be complete."
583
msgstr ""
584
585
#: bzrlib/builtins.py:1468
586
msgid ""
587
"If you want to discard your local changes, you can just do a\n"
588
"'bzr revert' instead of 'bzr commit' after the update."
589
msgstr ""
590
591
#: bzrlib/builtins.py:1471
592
msgid ""
593
"If you want to restore a file that has been removed locally, use\n"
594
"'bzr revert' instead of 'bzr update'."
595
msgstr ""
596
597
#: bzrlib/builtins.py:1474
598
msgid ""
599
"If the tree's branch is bound to a master branch, it will also update\n"
600
"the branch from the master."
601
msgstr ""
602
603
#: bzrlib/builtins.py:1555
604
msgid "Show information about a working tree, branch or repository."
605
msgstr ""
606
607
#: bzrlib/builtins.py:1557
608
msgid ""
609
"This command will show all known locations and formats associated to the\n"
610
"tree, branch or repository."
611
msgstr ""
612
613
#: bzrlib/builtins.py:1560
614
msgid ""
615
"In verbose mode, statistical information is included with each report.\n"
616
"To see extended statistic information, use a verbosity level of 2 or\n"
617
"higher by specifying the verbose option multiple times, e.g. -vv."
618
msgstr ""
619
620
#: bzrlib/builtins.py:1564
621
msgid "Branches and working trees will also report any missing revisions."
622
msgstr ""
623
624
#: bzrlib/builtins.py:1568
625
msgid " Display information on the format and related locations:"
626
msgstr ""
627
628
#: bzrlib/builtins.py:1570
629
msgid " bzr info"
630
msgstr ""
631
632
#: bzrlib/builtins.py:1572
633
msgid ""
634
" Display the above together with extended format information and\n"
635
" basic statistics (like the number of files in the working tree and\n"
636
" number of revisions in the branch and repository):"
637
msgstr ""
638
639
#: bzrlib/builtins.py:1576
640
msgid " bzr info -v"
641
msgstr ""
642
643
#: bzrlib/builtins.py:1578
644
msgid " Display the above together with number of committers to the branch:"
645
msgstr ""
646
647
#: bzrlib/builtins.py:1580
648
msgid " bzr info -vv"
649
msgstr ""
650
651
#: bzrlib/builtins.py:1599
652
msgid "Remove files or directories."
653
msgstr ""
654
655
#: bzrlib/builtins.py:1601
656
msgid ""
657
"This makes Bazaar stop tracking changes to the specified files. Bazaar will\n"
658
"delete them if they can easily be recovered using revert otherwise they\n"
659
"will be backed up (adding an extention of the form .~#~). If no options or\n"
660
"parameters are given Bazaar will scan for files that are being tracked by\n"
661
"Bazaar but missing in your tree and stop tracking them for you."
662
msgstr ""
663
664
# help of 'new' option of 'remove' command
665
#: bzrlib/builtins.py:1609
666
msgid "Only remove files that have never been committed."
667
msgstr ""
668
669
# help of 'file-deletion-strategy' option of 'remove' command
670
#: bzrlib/builtins.py:1611
671
msgid "The file deletion mode to be used."
672
msgstr ""
673
674
# title of 'file-deletion-strategy' option of 'remove' command
675
#: bzrlib/builtins.py:1612
676
msgid "Deletion Strategy"
677
msgstr ""
678
679
#: bzrlib/builtins.py:1703
680
msgid "Reconcile bzr metadata in a branch."
681
msgstr ""
682
683
#: bzrlib/builtins.py:1705
684
msgid ""
685
"This can correct data mismatches that may have been caused by\n"
686
"previous ghost operations or bzr upgrades. You should only\n"
687
"need to run this command if 'bzr check' or a bzr developer\n"
688
"advises you to run it."
689
msgstr ""
690
691
#: bzrlib/builtins.py:1710
692
msgid ""
693
"If a second branch is provided, cross-branch reconciliation is\n"
694
"also attempted, which will check that data like the tree root\n"
695
"id which was not present in very early bzr versions is represented\n"
696
"correctly in both branches."
697
msgstr ""
698
699
#: bzrlib/builtins.py:1715
700
msgid ""
701
"At the same time it is run it may recompress data resulting in\n"
702
"a potential saving in disk space or performance gain."
703
msgstr ""
704
705
#: bzrlib/builtins.py:1718
706
msgid "The branch *MUST* be on a listable system such as local disk or sftp."
707
msgstr ""
708
709
#: bzrlib/builtins.py:1782
710
msgid "Make a directory into a versioned branch."
711
msgstr ""
712
713
#: bzrlib/builtins.py:1784
714
msgid ""
715
"Use this to create an empty branch, or before importing an\n"
716
"existing project."
717
msgstr ""
718
719
#: bzrlib/builtins.py:1787
720
msgid ""
721
"If there is a repository in a parent directory of the location, then\n"
722
"the history of the branch will be stored in the repository. Otherwise\n"
723
"init creates a standalone branch which carries its own history\n"
724
"in the .bzr directory."
725
msgstr ""
726
727
#: bzrlib/builtins.py:1792
728
msgid ""
729
"If there is already a branch at the location but it has no working tree,\n"
730
"the tree can be populated with 'bzr checkout'."
731
msgstr ""
732
733
#: bzrlib/builtins.py:1795
734
msgid "Recipe for importing a tree of files::"
735
msgstr ""
736
737
#: bzrlib/builtins.py:1797
738
msgid ""
739
" cd ~/project\n"
740
" bzr init\n"
741
" bzr add .\n"
742
" bzr status\n"
743
" bzr commit -m \"imported project\""
744
msgstr ""
745
746
# help of 'create-prefix' option of 'init' command
747
#: bzrlib/builtins.py:1808
748
msgid "Create the path leading up to the branch if it does not already exist."
749
msgstr ""
750
751
# help of 'format' option of 'init' command
752
#: bzrlib/builtins.py:1811
753
msgid "Specify a format for this branch. See \"help formats\"."
754
msgstr ""
755
756
# help of 'append-revisions-only' option of 'init' command
757
#: bzrlib/builtins.py:1819
758
msgid "Never change revnos or the existing log. Append revisions to it only."
759
msgstr ""
760
761
# help of 'no-tree' option of 'init' command
762
#: bzrlib/builtins.py:1822
763
msgid "Create a branch without a working tree."
764
msgstr ""
765
766
#: bzrlib/builtins.py:1899
767
msgid "Create a shared repository for branches to share storage space."
768
msgstr ""
769
770
#: bzrlib/builtins.py:1901
771
msgid ""
772
"New branches created under the repository directory will store their\n"
773
"revisions in the repository, not in the branch directory. For branches\n"
774
"with shared history, this reduces the amount of storage needed and \n"
775
"speeds up the creation of new branches."
776
msgstr ""
777
778
#: bzrlib/builtins.py:1906
779
msgid ""
780
"If the --no-trees option is given then the branches in the repository\n"
781
"will not have working trees by default. They will still exist as \n"
782
"directories on disk, but they will not have separate copies of the \n"
783
"files at a certain revision. This can be useful for repositories that\n"
784
"store branches which are interacted with through checkouts or remote\n"
785
"branches, such as on a server."
786
msgstr ""
787
788
#: bzrlib/builtins.py:1913
789
msgid ""
790
":Examples:\n"
791
" Create a shared repository holding just branches::"
792
msgstr ""
793
794
#: bzrlib/builtins.py:1916
795
msgid ""
796
" bzr init-repo --no-trees repo\n"
797
" bzr init repo/trunk"
798
msgstr ""
799
800
#: bzrlib/builtins.py:1919
801
msgid " Make a lightweight checkout elsewhere::"
802
msgstr ""
803
804
#: bzrlib/builtins.py:1921
805
msgid ""
806
" bzr checkout --lightweight repo/trunk trunk-checkout\n"
807
" cd trunk-checkout\n"
808
" (add files here)"
809
msgstr ""
810
811
# help of 'format' option of 'init-repository' command
812
#: bzrlib/builtins.py:1929
813
msgid ""
814
"Specify a format for this repository. See \"bzr help formats\" for details."
815
msgstr ""
816
817
# title of 'format' option of 'init-repository' command
818
#: bzrlib/builtins.py:1933
819
msgid "Repository format"
820
msgstr ""
821
822
# help of 'no-trees' option of 'init-repository' command
823
#: bzrlib/builtins.py:1935
824
msgid "Branches in the repository will default to not having a working tree."
825
msgstr ""
826
827
#: bzrlib/builtins.py:1959
828
msgid "Show differences in the working tree, between revisions or branches."
829
msgstr ""
830
831
#: bzrlib/builtins.py:1961
832
msgid ""
833
"If no arguments are given, all changes for the current tree are listed.\n"
834
"If files are given, only the changes in those files are listed.\n"
835
"Remote and multiple branches can be compared by using the --old and\n"
836
"--new options. If not provided, the default for both is derived from\n"
837
"the first argument, if any, or the current tree if no arguments are\n"
838
"given."
839
msgstr ""
840
841
#: bzrlib/builtins.py:1968
842
msgid ""
843
"\"bzr diff -p1\" is equivalent to \"bzr diff --prefix old/:new/\", and\n"
844
"produces patches suitable for \"patch -p1\"."
845
msgstr ""
846
847
#: bzrlib/builtins.py:1971
848
msgid ""
849
"Note that when using the -r argument with a range of revisions, the\n"
850
"differences are computed between the two specified revisions. That\n"
851
"is, the command does not show the changes introduced by the first \n"
852
"revision in the range. This differs from the interpretation of \n"
853
"revision ranges used by \"bzr log\" which includes the first revision\n"
854
"in the range."
855
msgstr ""
856
857
#: bzrlib/builtins.py:1978
858
msgid ""
859
":Exit values:\n"
860
" 1 - changed\n"
861
" 2 - unrepresentable changes\n"
862
" 3 - error\n"
863
" 0 - no change"
864
msgstr ""
865
866
#: bzrlib/builtins.py:1984
867
msgid ""
868
":Examples:\n"
869
" Shows the difference in the working tree versus the last commit::"
870
msgstr ""
871
872
#: bzrlib/builtins.py:1987
873
msgid " bzr diff"
874
msgstr ""
875
876
#: bzrlib/builtins.py:1989
877
msgid " Difference between the working tree and revision 1::"
878
msgstr ""
879
880
#: bzrlib/builtins.py:1991
881
msgid " bzr diff -r1"
882
msgstr ""
883
884
#: bzrlib/builtins.py:1993
885
msgid " Difference between revision 3 and revision 1::"
886
msgstr ""
887
888
#: bzrlib/builtins.py:1995
889
msgid " bzr diff -r1..3"
890
msgstr ""
891
892
#: bzrlib/builtins.py:1997
893
msgid " Difference between revision 3 and revision 1 for branch xxx::"
894
msgstr ""
895
896
#: bzrlib/builtins.py:1999
897
msgid " bzr diff -r1..3 xxx"
898
msgstr ""
899
900
#: bzrlib/builtins.py:2001
901
msgid " The changes introduced by revision 2 (equivalent to -r1..2)::"
902
msgstr ""
903
904
#: bzrlib/builtins.py:2003
905
msgid " bzr diff -c2"
906
msgstr ""
907
908
#: bzrlib/builtins.py:2005
909
msgid ""
910
" To see the changes introduced by revision X::\n"
911
" \n"
912
" bzr diff -cX"
913
msgstr ""
914
915
#: bzrlib/builtins.py:2009
916
msgid ""
917
" Note that in the case of a merge, the -c option shows the changes\n"
918
" compared to the left hand parent. To see the changes against\n"
919
" another parent, use::"
920
msgstr ""
921
922
#: bzrlib/builtins.py:2013
923
msgid " bzr diff -r<chosen_parent>..X"
924
msgstr ""
925
926
#: bzrlib/builtins.py:2015
927
msgid ""
928
" The changes between the current revision and the previous revision\n"
929
" (equivalent to -c-1 and -r-2..-1)"
930
msgstr ""
931
932
#: bzrlib/builtins.py:2018
933
msgid " bzr diff -r-2.."
934
msgstr ""
935
936
#: bzrlib/builtins.py:2020
937
msgid " Show just the differences for file NEWS::"
938
msgstr ""
939
940
#: bzrlib/builtins.py:2022
941
msgid " bzr diff NEWS"
942
msgstr ""
943
944
#: bzrlib/builtins.py:2024
945
msgid " Show the differences in working tree xxx for file NEWS::"
946
msgstr ""
947
948
#: bzrlib/builtins.py:2026
949
msgid " bzr diff xxx/NEWS"
950
msgstr ""
951
952
#: bzrlib/builtins.py:2028
953
msgid " Show the differences from branch xxx to this working tree:"
954
msgstr ""
955
956
#: bzrlib/builtins.py:2030
957
msgid " bzr diff --old xxx"
958
msgstr ""
959
960
#: bzrlib/builtins.py:2032
961
msgid " Show the differences between two branches for file NEWS::"
962
msgstr ""
963
964
#: bzrlib/builtins.py:2034
965
msgid " bzr diff --old xxx --new yyy NEWS"
966
msgstr ""
967
968
#: bzrlib/builtins.py:2036
969
msgid " Same as 'bzr diff' but prefix paths with old/ and new/::"
970
msgstr ""
971
972
#: bzrlib/builtins.py:2038
973
msgid ""
974
" bzr diff --prefix old/:new/\n"
975
" \n"
976
" Show the differences using a custom diff program with options::\n"
977
" \n"
978
" bzr diff --using /usr/bin/diff --diff-options -wu"
979
msgstr ""
980
981
# help of 'diff-options' option of 'diff' command
982
#: bzrlib/builtins.py:2048
983
msgid "Pass these options to the external diff program."
984
msgstr ""
985
986
# help of 'prefix' option of 'diff' command
987
#: bzrlib/builtins.py:2051
988
msgid ""
989
"Set prefixes added to old and new filenames, as two values separated by a "
990
"colon. (eg \"old/:new/\")."
991
msgstr ""
992
993
# help of 'old' option of 'diff' command
994
#: bzrlib/builtins.py:2054
995
msgid "Branch/tree to compare from."
996
msgstr ""
997
998
# help of 'new' option of 'diff' command
999
#: bzrlib/builtins.py:2058
1000
msgid "Branch/tree to compare to."
1001
msgstr ""
1002
1003
# help of 'using' option of 'diff' command
1004
#: bzrlib/builtins.py:2064
1005
msgid "Use this command to compare files."
1006
msgstr ""
1007
1008
# help of 'format' option of 'diff' command
1009
#: bzrlib/builtins.py:2069
1010
msgid "Diff format to use."
1011
msgstr ""
1012
1013
# title of 'format' option of 'diff' command
1014
#: bzrlib/builtins.py:2071
1015
msgid "Diff format"
1016
msgstr ""
1017
1018
#: bzrlib/builtins.py:2121
1019
msgid ""
1020
"List files deleted in the working tree.\n"
1021
" "
1022
msgstr ""
1023
1024
#: bzrlib/builtins.py:2199
1025
msgid "Show the tree root directory."
1026
msgstr ""
1027
1028
#: bzrlib/builtins.py:2201
1029
msgid ""
1030
"The root is the nearest enclosing directory with a .bzr control\n"
1031
"directory."
1032
msgstr ""
1033
1034
#: bzrlib/builtins.py:2229
1035
msgid "Show historical log for a branch or subset of a branch."
1036
msgstr ""
1037
1038
#: bzrlib/builtins.py:2231
1039
msgid ""
1040
"log is bzr's default tool for exploring the history of a branch.\n"
1041
"The branch to use is taken from the first parameter. If no parameters\n"
1042
"are given, the branch containing the working directory is logged.\n"
1043
"Here are some simple examples::"
1044
msgstr ""
1045
1046
#: bzrlib/builtins.py:2236
1047
msgid ""
1048
" bzr log log the current branch\n"
1049
" bzr log foo.py log a file in its branch\n"
1050
" bzr log http://server/branch log a branch on a server"
1051
msgstr ""
1052
1053
#: bzrlib/builtins.py:2240
1054
msgid ""
1055
"The filtering, ordering and information shown for each revision can\n"
1056
"be controlled as explained below. By default, all revisions are\n"
1057
"shown sorted (topologically) so that newer revisions appear before\n"
1058
"older ones and descendants always appear before ancestors. If displayed,\n"
1059
"merged revisions are shown indented under the revision in which they\n"
1060
"were merged."
1061
msgstr ""
1062
1063
#: bzrlib/builtins.py:2247
1064
msgid ":Output control:"
1065
msgstr ""
1066
1067
#: bzrlib/builtins.py:2249
1068
msgid ""
1069
" The log format controls how information about each revision is\n"
1070
" displayed. The standard log formats are called ``long``, ``short``\n"
1071
" and ``line``. The default is long. See ``bzr help log-formats``\n"
1072
" for more details on log formats."
1073
msgstr ""
1074
1075
#: bzrlib/builtins.py:2254
1076
msgid ""
1077
" The following options can be used to control what information is\n"
1078
" displayed::"
1079
msgstr ""
1080
1081
#: bzrlib/builtins.py:2257
1082
msgid ""
1083
" -l N display a maximum of N revisions\n"
1084
" -n N display N levels of revisions (0 for all, 1 for collapsed)\n"
1085
" -v display a status summary (delta) for each revision\n"
1086
" -p display a diff (patch) for each revision\n"
1087
" --show-ids display revision-ids (and file-ids), not just revnos"
1088
msgstr ""
1089
1090
#: bzrlib/builtins.py:2263
1091
msgid ""
1092
" Note that the default number of levels to display is a function of the\n"
1093
" log format. If the -n option is not used, the standard log formats show\n"
1094
" just the top level (mainline)."
1095
msgstr ""
1096
1097
#: bzrlib/builtins.py:2267
1098
msgid ""
1099
" Status summaries are shown using status flags like A, M, etc. To see\n"
1100
" the changes explained using words like ``added`` and ``modified``\n"
1101
" instead, use the -vv option."
1102
msgstr ""
1103
1104
#: bzrlib/builtins.py:2271
1105
msgid ":Ordering control:"
1106
msgstr ""
1107
1108
#: bzrlib/builtins.py:2273
1109
msgid ""
1110
" To display revisions from oldest to newest, use the --forward option.\n"
1111
" In most cases, using this option will have little impact on the total\n"
1112
" time taken to produce a log, though --forward does not incrementally\n"
1113
" display revisions like --reverse does when it can."
1114
msgstr ""
1115
1116
#: bzrlib/builtins.py:2278
1117
msgid ":Revision filtering:"
1118
msgstr ""
1119
1120
#: bzrlib/builtins.py:2280
1121
msgid ""
1122
" The -r option can be used to specify what revision or range of revisions\n"
1123
" to filter against. The various forms are shown below::"
1124
msgstr ""
1125
1126
#: bzrlib/builtins.py:2283
1127
msgid ""
1128
" -rX display revision X\n"
1129
" -rX.. display revision X and later\n"
1130
" -r..Y display up to and including revision Y\n"
1131
" -rX..Y display from X to Y inclusive"
1132
msgstr ""
1133
1134
#: bzrlib/builtins.py:2288
1135
msgid ""
1136
" See ``bzr help revisionspec`` for details on how to specify X and Y.\n"
1137
" Some common examples are given below::"
1138
msgstr ""
1139
1140
#: bzrlib/builtins.py:2291
1141
msgid ""
1142
" -r-1 show just the tip\n"
1143
" -r-10.. show the last 10 mainline revisions\n"
1144
" -rsubmit:.. show what's new on this branch\n"
1145
" -rancestor:path.. show changes since the common ancestor of this\n"
1146
" branch and the one at location path\n"
1147
" -rdate:yesterday.. show changes since yesterday"
1148
msgstr ""
1149
1150
#: bzrlib/builtins.py:2298
1151
msgid ""
1152
" When logging a range of revisions using -rX..Y, log starts at\n"
1153
" revision Y and searches back in history through the primary\n"
1154
" (\"left-hand\") parents until it finds X. When logging just the\n"
1155
" top level (using -n1), an error is reported if X is not found\n"
1156
" along the way. If multi-level logging is used (-n0), X may be\n"
1157
" a nested merge revision and the log will be truncated accordingly."
1158
msgstr ""
1159
1160
#: bzrlib/builtins.py:2305
1161
msgid ":Path filtering:"
1162
msgstr ""
1163
1164
#: bzrlib/builtins.py:2307
1165
msgid ""
1166
" If parameters are given and the first one is not a branch, the log\n"
1167
" will be filtered to show only those revisions that changed the\n"
1168
" nominated files or directories."
1169
msgstr ""
1170
1171
#: bzrlib/builtins.py:2311
1172
msgid ""
1173
" Filenames are interpreted within their historical context. To log a\n"
1174
" deleted file, specify a revision range so that the file existed at\n"
1175
" the end or start of the range."
1176
msgstr ""
1177
1178
#: bzrlib/builtins.py:2315
1179
msgid ""
1180
" Historical context is also important when interpreting pathnames of\n"
1181
" renamed files/directories. Consider the following example:"
1182
msgstr ""
1183
1184
#: bzrlib/builtins.py:2318
1185
msgid ""
1186
" * revision 1: add tutorial.txt\n"
1187
" * revision 2: modify tutorial.txt\n"
1188
" * revision 3: rename tutorial.txt to guide.txt; add tutorial.txt"
1189
msgstr ""
1190
1191
#: bzrlib/builtins.py:2322
1192
msgid " In this case:"
1193
msgstr ""
1194
1195
#: bzrlib/builtins.py:2324
1196
msgid " * ``bzr log guide.txt`` will log the file added in revision 1"
1197
msgstr ""
1198
1199
#: bzrlib/builtins.py:2326
1200
msgid " * ``bzr log tutorial.txt`` will log the new file added in revision 3"
1201
msgstr ""
1202
1203
#: bzrlib/builtins.py:2328
1204
msgid ""
1205
" * ``bzr log -r2 -p tutorial.txt`` will show the changes made to\n"
1206
" the original file in revision 2."
1207
msgstr ""
1208
1209
#: bzrlib/builtins.py:2331
1210
msgid ""
1211
" * ``bzr log -r2 -p guide.txt`` will display an error message as there\n"
1212
" was no file called guide.txt in revision 2."
1213
msgstr ""
1214
1215
#: bzrlib/builtins.py:2334
1216
msgid ""
1217
" Renames are always followed by log. By design, there is no need to\n"
1218
" explicitly ask for this (and no way to stop logging a file back\n"
1219
" until it was last renamed)."
1220
msgstr ""
1221
1222
#: bzrlib/builtins.py:2338
1223
msgid ":Other filtering:"
1224
msgstr ""
1225
1226
#: bzrlib/builtins.py:2340
1227
msgid ""
1228
" The --match option can be used for finding revisions that match a\n"
1229
" regular expression in a commit message, committer, author or bug.\n"
1230
" Specifying the option several times will match any of the supplied\n"
1231
" expressions. --match-author, --match-bugs, --match-committer and\n"
1232
" --match-message can be used to only match a specific field."
1233
msgstr ""
1234
1235
#: bzrlib/builtins.py:2346
1236
msgid ":Tips & tricks:"
1237
msgstr ""
1238
1239
#: bzrlib/builtins.py:2348
1240
msgid ""
1241
" GUI tools and IDEs are often better at exploring history than command\n"
1242
" line tools: you may prefer qlog or viz from qbzr or bzr-gtk, the\n"
1243
" bzr-explorer shell, or the Loggerhead web interface. See the Plugin\n"
1244
" Guide <http://doc.bazaar.canonical.com/plugins/en/> and\n"
1245
" <http://wiki.bazaar.canonical.com/IDEIntegration>. "
1246
msgstr ""
1247
1248
#: bzrlib/builtins.py:2354
1249
msgid " You may find it useful to add the aliases below to ``bazaar.conf``::"
1250
msgstr ""
1251
1252
#: bzrlib/builtins.py:2356
1253
msgid ""
1254
" [ALIASES]\n"
1255
" tip = log -r-1\n"
1256
" top = log -l10 --line\n"
1257
" show = log -v -p"
1258
msgstr ""
1259
1260
#: bzrlib/builtins.py:2361
1261
msgid ""
1262
" ``bzr tip`` will then show the latest revision while ``bzr top``\n"
1263
" will show the last 10 mainline revisions. To see the details of a\n"
1264
" particular revision X, ``bzr show -rX``."
1265
msgstr ""
1266
1267
#: bzrlib/builtins.py:2365
1268
msgid ""
1269
" If you are interested in looking deeper into a particular merge X,\n"
1270
" use ``bzr log -n0 -rX``."
1271
msgstr ""
1272
1273
#: bzrlib/builtins.py:2368
1274
msgid ""
1275
" ``bzr log -v`` on a branch with lots of history is currently\n"
1276
" very slow. A fix for this issue is currently under development.\n"
1277
" With or without that fix, it is recommended that a revision range\n"
1278
" be given when using the -v option."
1279
msgstr ""
1280
1281
#: bzrlib/builtins.py:2373
1282
msgid ""
1283
" bzr has a generic full-text matching plugin, bzr-search, that can be\n"
1284
" used to find revisions matching user names, commit messages, etc.\n"
1285
" Among other features, this plugin can find all revisions containing\n"
1286
" a list of words but not others."
1287
msgstr ""
1288
1289
#: bzrlib/builtins.py:2378
1290
msgid ""
1291
" When exploring non-mainline history on large projects with deep\n"
1292
" history, the performance of log can be greatly improved by installing\n"
1293
" the historycache plugin. This plugin buffers historical information\n"
1294
" trading disk space for faster speed."
1295
msgstr ""
1296
1297
# help of 'forward' option of 'log' command
1298
#: bzrlib/builtins.py:2387
1299
msgid "Show from oldest to newest."
1300
msgstr ""
1301
1302
# help of 'verbose' option of 'log' command
1303
#: bzrlib/builtins.py:2390
1304
msgid "Show files changed in each revision."
1305
msgstr ""
1306
1307
# help of 'change' option of 'log' command
1308
#: bzrlib/builtins.py:2396
1309
msgid "Show just the specified revision. See also \"help revisionspec\"."
1310
msgstr ""
1311
1312
# help of 'authors' option of 'log' command
1313
#: bzrlib/builtins.py:2400
1314
msgid "What names to list as authors - first, all or committer."
1315
msgstr ""
1316
1317
# title of 'authors' option of 'log' command
1318
#: bzrlib/builtins.py:2401
1319
msgid "Authors"
1320
msgstr ""
1321
1322
# help of 'levels' option of 'log' command
1323
#: bzrlib/builtins.py:2406
1324
msgid "Number of levels to display - 0 for all, 1 for flat."
1325
msgstr ""
1326
1327
# help of 'limit' option of 'log' command
1328
#: bzrlib/builtins.py:2416
1329
msgid "Limit the output to the first N revisions."
1330
msgstr ""
1331
1332
# help of 'show-diff' option of 'log' command
1333
#: bzrlib/builtins.py:2421
1334
msgid "Show changes made in each revision as a patch."
1335
msgstr ""
1336
1337
# help of 'include-merges' option of 'log' command
1338
#: bzrlib/builtins.py:2423
1339
msgid "Show merged revisions like --levels 0 does."
1340
msgstr ""
1341
1342
# help of 'exclude-common-ancestry' option of 'log' command
1343
#: bzrlib/builtins.py:2425
1344
msgid ""
1345
"Display only the revisions that are not part of both ancestries (require -"
1346
"rX..Y)"
1347
msgstr ""
1348
1349
# help of 'signatures' option of 'log' command
1350
#: bzrlib/builtins.py:2429
1351
msgid "Show digital signature validity"
1352
msgstr ""
1353
1354
# help of 'match' option of 'log' command
1355
#: bzrlib/builtins.py:2432
1356
msgid "Show revisions whose properties match this expression."
1357
msgstr ""
1358
1359
# help of 'match-message' option of 'log' command
1360
#: bzrlib/builtins.py:2436
1361
msgid "Show revisions whose message matches this expression."
1362
msgstr ""
1363
1364
# help of 'match-committer' option of 'log' command
1365
#: bzrlib/builtins.py:2440
1366
msgid "Show revisions whose committer matches this expression."
1367
msgstr ""
1368
1369
# help of 'match-author' option of 'log' command
1370
#: bzrlib/builtins.py:2444
1371
msgid "Show revisions whose authors match this expression."
1372
msgstr ""
1373
1374
# help of 'match-bugs' option of 'log' command
1375
#: bzrlib/builtins.py:2448
1376
msgid "Show revisions whose bugs match this expression."
1377
msgstr ""
1378
1379
#: bzrlib/builtins.py:2689
1380
msgid ""
1381
"List files in a tree.\n"
1382
" "
1383
msgstr ""
1384
1385
# help of 'recursive' option of 'ls' command
1386
#: bzrlib/builtins.py:2698
1387
msgid "Recurse into subdirectories."
1388
msgstr ""
1389
1390
# help of 'from-root' option of 'ls' command
1391
#: bzrlib/builtins.py:2700
1392
msgid "Print paths relative to the root of the branch."
1393
msgstr ""
1394
1395
# help of 'unknown' option of 'ls' command
1396
#: bzrlib/builtins.py:2702
1397
msgid "Print unknown files."
1398
msgstr ""
1399
1400
# help of 'versioned' option of 'ls' command
1401
#: bzrlib/builtins.py:2703
1402
msgid "Print versioned files."
1403
msgstr ""
1404
1405
# help of 'ignored' option of 'ls' command
1406
#: bzrlib/builtins.py:2706
1407
msgid "Print ignored files."
1408
msgstr ""
1409
1410
# help of 'kind' option of 'ls' command
1411
#: bzrlib/builtins.py:2708
1412
msgid "List entries of a particular kind: file, directory, symlink."
1413
msgstr ""
1414
1415
#: bzrlib/builtins.py:2820
1416
msgid "Ignore specified files or patterns."
1417
msgstr ""
1418
1419
#: bzrlib/builtins.py:2822
1420
msgid "See ``bzr help patterns`` for details on the syntax of patterns."
1421
msgstr ""
1422
1423
#: bzrlib/builtins.py:2824
1424
msgid ""
1425
"If a .bzrignore file does not exist, the ignore command\n"
1426
"will create one and add the specified files or patterns to the newly\n"
1427
"created file. The ignore command will also automatically add the \n"
1428
".bzrignore file to be versioned. Creating a .bzrignore file without\n"
1429
"the use of the ignore command will require an explicit add command."
1430
msgstr ""
1431
1432
#: bzrlib/builtins.py:2830
1433
msgid ""
1434
"To remove patterns from the ignore list, edit the .bzrignore file.\n"
1435
"After adding, editing or deleting that file either indirectly by\n"
1436
"using this command or directly by using an editor, be sure to commit\n"
1437
"it."
1438
msgstr ""
1439
1440
#: bzrlib/builtins.py:2835
1441
msgid ""
1442
"Bazaar also supports a global ignore file ~/.bazaar/ignore. On Windows\n"
1443
"the global ignore file can be found in the application data directory as\n"
1444
"C:\\Documents and Settings\\<user>\\Application Data\\Bazaar\\2.0\\ignore.\n"
1445
"Global ignores are not touched by this command. The global ignore file\n"
1446
"can be edited directly using an editor."
1447
msgstr ""
1448
1449
#: bzrlib/builtins.py:2841
1450
msgid ""
1451
"Patterns prefixed with '!' are exceptions to ignore patterns and take\n"
1452
"precedence over regular ignores. Such exceptions are used to specify\n"
1453
"files that should be versioned which would otherwise be ignored."
1454
msgstr ""
1455
1456
#: bzrlib/builtins.py:2845
1457
msgid ""
1458
"Patterns prefixed with '!!' act as regular ignore patterns, but have\n"
1459
"precedence over the '!' exception patterns."
1460
msgstr ""
1461
1462
#: bzrlib/builtins.py:2848
1463
msgid ""
1464
":Notes: \n"
1465
" \n"
1466
"* Ignore patterns containing shell wildcards must be quoted from\n"
1467
" the shell on Unix."
1468
msgstr ""
1469
1470
#: bzrlib/builtins.py:2853
1471
msgid ""
1472
"* Ignore patterns starting with \"#\" act as comments in the ignore file.\n"
1473
" To ignore patterns that begin with that character, use the \"RE:\" prefix."
1474
msgstr ""
1475
1476
#: bzrlib/builtins.py:2856
1477
msgid ""
1478
":Examples:\n"
1479
" Ignore the top level Makefile::"
1480
msgstr ""
1481
1482
#: bzrlib/builtins.py:2859
1483
msgid " bzr ignore ./Makefile"
1484
msgstr ""
1485
1486
#: bzrlib/builtins.py:2861
1487
msgid " Ignore .class files in all directories...::"
1488
msgstr ""
1489
1490
#: bzrlib/builtins.py:2863
1491
msgid " bzr ignore \"*.class\""
1492
msgstr ""
1493
1494
#: bzrlib/builtins.py:2865
1495
msgid " ...but do not ignore \"special.class\"::"
1496
msgstr ""
1497
1498
#: bzrlib/builtins.py:2867
1499
msgid " bzr ignore \"!special.class\""
1500
msgstr ""
1501
1502
#: bzrlib/builtins.py:2869
1503
msgid " Ignore files whose name begins with the \"#\" character::"
1504
msgstr ""
1505
1506
#: bzrlib/builtins.py:2871
1507
msgid " bzr ignore \"RE:^#\""
1508
msgstr ""
1509
1510
#: bzrlib/builtins.py:2873
1511
msgid " Ignore .o files under the lib directory::"
1512
msgstr ""
1513
1514
#: bzrlib/builtins.py:2875
1515
msgid " bzr ignore \"lib/**/*.o\""
1516
msgstr ""
1517
1518
#: bzrlib/builtins.py:2879
1519
msgid " bzr ignore \"RE:lib/.*\\.o\""
1520
msgstr ""
1521
1522
#: bzrlib/builtins.py:2881
1523
msgid " Ignore everything but the \"debian\" toplevel directory::"
1524
msgstr ""
1525
1526
#: bzrlib/builtins.py:2883
1527
msgid ""
1528
" bzr ignore \"RE:(?!debian/).*\"\n"
1529
" \n"
1530
" Ignore everything except the \"local\" toplevel directory,\n"
1531
" but always ignore autosave files ending in ~, even under local/::\n"
1532
" \n"
1533
" bzr ignore \"*\"\n"
1534
" bzr ignore \"!./local\"\n"
1535
" bzr ignore \"!!*~\""
1536
msgstr ""
1537
1538
# help of 'default-rules' option of 'ignore' command
1539
#: bzrlib/builtins.py:2897
1540
msgid "Display the default ignore rules that bzr uses."
1541
msgstr ""
1542
1543
#: bzrlib/builtins.py:2945
1544
msgid "List ignored files and the patterns that matched them."
1545
msgstr ""
1546
1547
#: bzrlib/builtins.py:2947
1548
msgid ""
1549
"List all the ignored files and the ignore pattern that caused the file to\n"
1550
"be ignored."
1551
msgstr ""
1552
1553
#: bzrlib/builtins.py:2950
1554
msgid "Alternatively, to list just the files::"
1555
msgstr ""
1556
1557
#: bzrlib/builtins.py:2952
1558
msgid " bzr ls --ignored"
1559
msgstr ""
1560
1561
#: bzrlib/builtins.py:2993
1562
msgid "Export current or past revision to a destination directory or archive."
1563
msgstr ""
1564
1565
#: bzrlib/builtins.py:2995
1566
msgid "If no revision is specified this exports the last committed revision."
1567
msgstr ""
1568
1569
#: bzrlib/builtins.py:2997
1570
msgid ""
1571
"Format may be an \"exporter\" name, such as tar, tgz, tbz2. If none is\n"
1572
"given, try to find the format with the extension. If no extension\n"
1573
"is found exports to a directory (equivalent to --format=dir)."
1574
msgstr ""
1575
1576
#: bzrlib/builtins.py:3001
1577
msgid ""
1578
"If root is supplied, it will be used as the root directory inside\n"
1579
"container formats (tar, zip, etc). If it is not supplied it will default\n"
1580
"to the exported filename. The root option has no effect for 'dir' format."
1581
msgstr ""
1582
1583
#: bzrlib/builtins.py:3005
1584
msgid ""
1585
"If branch is omitted then the branch containing the current working\n"
1586
"directory will be used."
1587
msgstr ""
1588
1589
#: bzrlib/builtins.py:3008
1590
msgid "Note: Export of tree with non-ASCII filenames to zip is not supported."
1591
msgstr ""
1592
1593
#: bzrlib/builtins.py:3010
1594
msgid ""
1595
" ================= =========================\n"
1596
" Supported formats Autodetected by extension\n"
1597
" ================= =========================\n"
1598
" dir (none)\n"
1599
" tar .tar\n"
1600
" tbz2 .tar.bz2, .tbz2\n"
1601
" tgz .tar.gz, .tgz\n"
1602
" zip .zip\n"
1603
" ================= ========================="
1604
msgstr ""
1605
1606
# help of 'format' option of 'export' command
1607
#: bzrlib/builtins.py:3024
1608
msgid "Type of file to export to."
1609
msgstr ""
1610
1611
# help of 'filters' option of 'export' command
1612
#: bzrlib/builtins.py:3027
1613
msgid "Apply content filters to export the convenient form."
1614
msgstr ""
1615
1616
# help of 'root' option of 'export' command
1617
#: bzrlib/builtins.py:3031
1618
msgid "Name of the root directory inside the exported file."
1619
msgstr ""
1620
1621
# help of 'per-file-timestamps' option of 'export' command
1622
#: bzrlib/builtins.py:3033
1623
msgid ""
1624
"Set modification time of files to that of the last revision in which it was "
1625
"changed."
1626
msgstr ""
1627
1628
#: bzrlib/builtins.py:3057
1629
msgid "Write the contents of a file as of a given revision to standard output."
1630
msgstr ""
1631
1632
#: bzrlib/builtins.py:3059
1633
msgid "If no revision is nominated, the last revision is used."
1634
msgstr ""
1635
1636
#: bzrlib/builtins.py:3061
1637
msgid ""
1638
"Note: Take care to redirect standard output when using this command on a\n"
1639
"binary file."
1640
msgstr ""
1641
1642
# help of 'filters' option of 'cat' command
1643
#: bzrlib/builtins.py:3068
1644
msgid "Apply content filters to display the convenience form."
1645
msgstr ""
1646
1647
#: bzrlib/builtins.py:3139
1648
msgid "Commit changes into a new revision."
1649
msgstr ""
1650
1651
#: bzrlib/builtins.py:3141
1652
msgid ""
1653
"An explanatory message needs to be given for each commit. This is\n"
1654
"often done by using the --message option (getting the message from the\n"
1655
"command line) or by using the --file option (getting the message from\n"
1656
"a file). If neither of these options is given, an editor is opened for\n"
1657
"the user to enter the message. To see the changed files in the\n"
1658
"boilerplate text loaded into the editor, use the --show-diff option."
1659
msgstr ""
1660
1661
#: bzrlib/builtins.py:3148
1662
msgid ""
1663
"By default, the entire tree is committed and the person doing the\n"
1664
"commit is assumed to be the author. These defaults can be overridden\n"
1665
"as explained below."
1666
msgstr ""
1667
1668
#: bzrlib/builtins.py:3152
1669
msgid ":Selective commits:"
1670
msgstr ""
1671
1672
#: bzrlib/builtins.py:3154
1673
msgid ""
1674
" If selected files are specified, only changes to those files are\n"
1675
" committed. If a directory is specified then the directory and\n"
1676
" everything within it is committed."
1677
msgstr ""
1678
1679
#: bzrlib/builtins.py:3158
1680
msgid ""
1681
" When excludes are given, they take precedence over selected files.\n"
1682
" For example, to commit only changes within foo, but not changes\n"
1683
" within foo/bar::"
1684
msgstr ""
1685
1686
#: bzrlib/builtins.py:3162
1687
msgid " bzr commit foo -x foo/bar"
1688
msgstr ""
1689
1690
#: bzrlib/builtins.py:3164
1691
msgid " A selective commit after a merge is not yet supported."
1692
msgstr ""
1693
1694
#: bzrlib/builtins.py:3166
1695
msgid ":Custom authors:"
1696
msgstr ""
1697
1698
#: bzrlib/builtins.py:3168
1699
msgid ""
1700
" If the author of the change is not the same person as the committer,\n"
1701
" you can specify the author's name using the --author option. The\n"
1702
" name should be in the same format as a committer-id, e.g.\n"
1703
" \"John Doe <jdoe@example.com>\". If there is more than one author of\n"
1704
" the change you can specify the option multiple times, once for each\n"
1705
" author."
1706
msgstr ""
1707
1708
#: bzrlib/builtins.py:3175
1709
msgid ":Checks:"
1710
msgstr ""
1711
1712
#: bzrlib/builtins.py:3177
1713
msgid ""
1714
" A common mistake is to forget to add a new file or directory before\n"
1715
" running the commit command. The --strict option checks for unknown\n"
1716
" files and aborts the commit if any are found. More advanced pre-commit\n"
1717
" checks can be implemented by defining hooks. See ``bzr help hooks``\n"
1718
" for details."
1719
msgstr ""
1720
1721
#: bzrlib/builtins.py:3183
1722
msgid ":Things to note:"
1723
msgstr ""
1724
1725
#: bzrlib/builtins.py:3185
1726
msgid ""
1727
" If you accidentially commit the wrong changes or make a spelling\n"
1728
" mistake in the commit message say, you can use the uncommit command\n"
1729
" to undo it. See ``bzr help uncommit`` for details."
1730
msgstr ""
1731
1732
#: bzrlib/builtins.py:3189
1733
msgid ""
1734
" Hooks can also be configured to run after a commit. This allows you\n"
1735
" to trigger updates to external systems like bug trackers. The --fixes\n"
1736
" option can be used to record the association between a revision and\n"
1737
" one or more bugs. See ``bzr help bugs`` for details."
1738
msgstr ""
1739
1740
# help of 'exclude' option of 'commit' command
1741
#: bzrlib/builtins.py:3199
1742
msgid "Do not consider changes made to a given path."
1743
msgstr ""
1744
1745
# help of 'message' option of 'commit' command
1746
#: bzrlib/builtins.py:3202
1747
msgid "Description of the new revision."
1748
msgstr ""
1749
1750
# help of 'unchanged' option of 'commit' command
1751
#: bzrlib/builtins.py:3205
1752
msgid "Commit even if nothing has changed."
1753
msgstr ""
1754
1755
# help of 'file' option of 'commit' command
1756
#: bzrlib/builtins.py:3209
1757
msgid "Take commit message from this file."
1758
msgstr ""
1759
1760
# help of 'strict' option of 'commit' command
1761
#: bzrlib/builtins.py:3211
1762
msgid "Refuse to commit if there are unknown files in the working tree."
1763
msgstr ""
1764
1765
# help of 'commit-time' option of 'commit' command
1766
#: bzrlib/builtins.py:3214
1767
msgid ""
1768
"Manually set a commit time using commit date format, e.g. '2009-10-10 "
1769
"08:00:00 +0100'."
1770
msgstr ""
1771
1772
# help of 'fixes' option of 'commit' command
1773
#: bzrlib/builtins.py:3217
1774
msgid "Mark a bug as being fixed by this revision (see \"bzr help bugs\")."
1775
msgstr ""
1776
1777
# help of 'author' option of 'commit' command
1778
#: bzrlib/builtins.py:3220
1779
msgid "Set the author's name, if it's different from the committer."
1780
msgstr ""
1781
1782
# help of 'local' option of 'commit' command
1783
#: bzrlib/builtins.py:3223
1784
msgid ""
1785
"Perform a local commit in a bound branch. Local commits are not pushed to "
1786
"the master branch until a normal commit is performed."
1787
msgstr ""
1788
1789
# help of 'show-diff' option of 'commit' command
1790
#: bzrlib/builtins.py:3229
1791
msgid ""
1792
"When no message is supplied, show the diff along with the status summary in "
1793
"the message editor."
1794
msgstr ""
1795
1796
# help of 'lossy' option of 'commit' command
1797
#: bzrlib/builtins.py:3232
1798
msgid ""
1799
"When committing to a foreign version control system do not push data that "
1800
"can not be natively represented."
1801
msgstr ""
1802
1803
#: bzrlib/builtins.py:3406
1804
msgid ""
1805
"Validate working tree structure, branch consistency and repository history."
1806
msgstr ""
1807
1808
#: bzrlib/builtins.py:3408
1809
msgid ""
1810
"This command checks various invariants about branch and repository storage\n"
1811
"to detect data corruption or bzr bugs."
1812
msgstr ""
1813
1814
#: bzrlib/builtins.py:3411
1815
msgid ""
1816
"The working tree and branch checks will only give output if a problem is\n"
1817
"detected. The output fields of the repository check are:"
1818
msgstr ""
1819
1820
#: bzrlib/builtins.py:3414
1821
msgid ""
1822
"revisions\n"
1823
" This is just the number of revisions checked. It doesn't\n"
1824
" indicate a problem."
1825
msgstr ""
1826
1827
#: bzrlib/builtins.py:3418
1828
msgid ""
1829
"versionedfiles\n"
1830
" This is just the number of versionedfiles checked. It\n"
1831
" doesn't indicate a problem."
1832
msgstr ""
1833
1834
#: bzrlib/builtins.py:3422
1835
msgid ""
1836
"unreferenced ancestors\n"
1837
" Texts that are ancestors of other texts, but\n"
1838
" are not properly referenced by the revision ancestry. This is a\n"
1839
" subtle problem that Bazaar can work around."
1840
msgstr ""
1841
1842
#: bzrlib/builtins.py:3427
1843
msgid ""
1844
"unique file texts\n"
1845
" This is the total number of unique file contents\n"
1846
" seen in the checked revisions. It does not indicate a problem."
1847
msgstr ""
1848
1849
#: bzrlib/builtins.py:3431
1850
msgid ""
1851
"repeated file texts\n"
1852
" This is the total number of repeated texts seen\n"
1853
" in the checked revisions. Texts can be repeated when their file\n"
1854
" entries are modified, but the file contents are not. It does not\n"
1855
" indicate a problem."
1856
msgstr ""
1857
1858
#: bzrlib/builtins.py:3437
1859
msgid ""
1860
"If no restrictions are specified, all Bazaar data that is found at the "
1861
"given\n"
1862
"location will be checked."
1863
msgstr ""
1864
1865
#: bzrlib/builtins.py:3440
1866
msgid ":Examples:"
1867
msgstr ""
1868
1869
#: bzrlib/builtins.py:3442
1870
msgid " Check the tree and branch at 'foo'::"
1871
msgstr ""
1872
1873
#: bzrlib/builtins.py:3444
1874
msgid " bzr check --tree --branch foo"
1875
msgstr ""
1876
1877
#: bzrlib/builtins.py:3446
1878
msgid " Check only the repository at 'bar'::"
1879
msgstr ""
1880
1881
#: bzrlib/builtins.py:3448
1882
msgid " bzr check --repo bar"
1883
msgstr ""
1884
1885
#: bzrlib/builtins.py:3450
1886
msgid " Check everything at 'baz'::"
1887
msgstr ""
1888
1889
#: bzrlib/builtins.py:3452
1890
msgid " bzr check baz"
1891
msgstr ""
1892
1893
# help of 'branch' option of 'check' command
1894
#: bzrlib/builtins.py:3458
1895
msgid "Check the branch related to the current directory."
1896
msgstr ""
1897
1898
# help of 'repo' option of 'check' command
1899
#: bzrlib/builtins.py:3460
1900
msgid "Check the repository related to the current directory."
1901
msgstr ""
1902
1903
# help of 'tree' option of 'check' command
1904
#: bzrlib/builtins.py:3462
1905
msgid "Check the working tree related to the current directory."
1906
msgstr ""
1907
1908
#: bzrlib/builtins.py:3476
1909
msgid "Upgrade a repository, branch or working tree to a newer format."
1910
msgstr ""
1911
1912
#: bzrlib/builtins.py:3478
1913
msgid ""
1914
"When the default format has changed after a major new release of\n"
1915
"Bazaar, you may be informed during certain operations that you\n"
1916
"should upgrade. Upgrading to a newer format may improve performance\n"
1917
"or make new features available. It may however limit interoperability\n"
1918
"with older repositories or with older versions of Bazaar."
1919
msgstr ""
1920
1921
#: bzrlib/builtins.py:3484
1922
msgid ""
1923
"If you wish to upgrade to a particular format rather than the\n"
1924
"current default, that can be specified using the --format option.\n"
1925
"As a consequence, you can use the upgrade command this way to\n"
1926
"\"downgrade\" to an earlier format, though some conversions are\n"
1927
"a one way process (e.g. changing from the 1.x default to the\n"
1928
"2.x default) so downgrading is not always possible."
1929
msgstr ""
1930
1931
#: bzrlib/builtins.py:3491
1932
msgid ""
1933
"A backup.bzr.~#~ directory is created at the start of the conversion\n"
1934
"process (where # is a number). By default, this is left there on\n"
1935
"completion. If the conversion fails, delete the new .bzr directory\n"
1936
"and rename this one back in its place. Use the --clean option to ask\n"
1937
"for the backup.bzr directory to be removed on successful conversion.\n"
1938
"Alternatively, you can delete it by hand if everything looks good\n"
1939
"afterwards."
1940
msgstr ""
1941
1942
#: bzrlib/builtins.py:3499
1943
msgid ""
1944
"If the location given is a shared repository, dependent branches\n"
1945
"are also converted provided the repository converts successfully.\n"
1946
"If the conversion of a branch fails, remaining branches are still\n"
1947
"tried."
1948
msgstr ""
1949
1950
#: bzrlib/builtins.py:3504
1951
msgid ""
1952
"For more information on upgrades, see the Bazaar Upgrade Guide,\n"
1953
"http://doc.bazaar.canonical.com/latest/en/upgrade-guide/."
1954
msgstr ""
1955
1956
# help of 'format' option of 'upgrade' command
1957
#: bzrlib/builtins.py:3512
1958
msgid "Upgrade to a specific format. See \"bzr help formats\" for details."
1959
msgstr ""
1960
1961
# title of 'format' option of 'init' command
1962
#: bzrlib/builtins.py:3516
1963
msgid "Branch format"
1964
msgstr ""
1965
1966
# help of 'clean' option of 'upgrade' command
1967
#: bzrlib/builtins.py:3518
1968
msgid "Remove the backup.bzr directory if successful."
1969
msgstr ""
1970
1971
#: bzrlib/builtins.py:3535
1972
msgid "Show or set bzr user id."
1973
msgstr ""
1974
1975
#: bzrlib/builtins.py:3537
1976
msgid ""
1977
":Examples:\n"
1978
" Show the email of the current user::"
1979
msgstr ""
1980
1981
#: bzrlib/builtins.py:3540
1982
msgid " bzr whoami --email"
1983
msgstr ""
1984
1985
#: bzrlib/builtins.py:3542
1986
msgid " Set the current user::"
1987
msgstr ""
1988
1989
#: bzrlib/builtins.py:3544
1990
msgid " bzr whoami \"Frank Chu <fchu@example.com>\""
1991
msgstr ""
1992
1993
# help of 'email' option of 'whoami' command
1994
#: bzrlib/builtins.py:3548
1995
msgid "Display email address only."
1996
msgstr ""
1997
1998
# help of 'branch' option of 'whoami' command
1999
#: bzrlib/builtins.py:3550
2000
msgid "Set identity for the current branch instead of globally."
2001
msgstr ""
2002
2003
#: bzrlib/builtins.py:3596
2004
msgid "Print or set the branch nickname."
2005
msgstr ""
2006
2007
#: bzrlib/builtins.py:3598
2008
msgid ""
2009
"If unset, the tree root directory name is used as the nickname.\n"
2010
"To print the current nickname, execute with no argument."
2011
msgstr ""
2012
2013
#: bzrlib/builtins.py:3601
2014
msgid ""
2015
"Bound branches use the nickname of its master branch unless it is set\n"
2016
"locally."
2017
msgstr ""
2018
2019
#: bzrlib/builtins.py:3621
2020
msgid "Set/unset and display aliases."
2021
msgstr ""
2022
2023
#: bzrlib/builtins.py:3623
2024
msgid ""
2025
":Examples:\n"
2026
" Show the current aliases::"
2027
msgstr ""
2028
2029
#: bzrlib/builtins.py:3626
2030
msgid " bzr alias"
2031
msgstr ""
2032
2033
#: bzrlib/builtins.py:3628
2034
msgid " Show the alias specified for 'll'::"
2035
msgstr ""
2036
2037
#: bzrlib/builtins.py:3630
2038
msgid " bzr alias ll"
2039
msgstr ""
2040
2041
#: bzrlib/builtins.py:3632
2042
msgid " Set an alias for 'll'::"
2043
msgstr ""
2044
2045
#: bzrlib/builtins.py:3634
2046
msgid " bzr alias ll=\"log --line -r-10..-1\""
2047
msgstr ""
2048
2049
#: bzrlib/builtins.py:3636
2050
msgid " To remove an alias for 'll'::"
2051
msgstr ""
2052
2053
#: bzrlib/builtins.py:3638
2054
msgid " bzr alias --remove ll"
2055
msgstr ""
2056
2057
# help of 'remove' option of 'alias' command
2058
#: bzrlib/builtins.py:3643
2059
msgid "Remove the alias."
2060
msgstr ""
2061
2062
#: bzrlib/builtins.py:3897
2063
msgid "Show version of bzr."
2064
msgstr ""
2065
2066
# help of 'short' option of 'version' command
2067
#: bzrlib/builtins.py:3901
2068
msgid "Print just the version number."
2069
msgstr ""
2070
2071
#: bzrlib/builtins.py:3948
2072
msgid "Perform a three-way merge."
2073
msgstr ""
2074
2075
#: bzrlib/builtins.py:3950
2076
msgid ""
2077
"The source of the merge can be specified either in the form of a branch,\n"
2078
"or in the form of a path to a file containing a merge directive generated\n"
2079
"with bzr send. If neither is specified, the default is the upstream branch\n"
2080
"or the branch most recently merged using --remember. The source of the\n"
2081
"merge may also be specified in the form of a path to a file in another\n"
2082
"branch: in this case, only the modifications to that file are merged into\n"
2083
"the current working tree."
2084
msgstr ""
2085
2086
#: bzrlib/builtins.py:3958
2087
msgid ""
2088
"When merging from a branch, by default bzr will try to merge in all new\n"
2089
"work from the other branch, automatically determining an appropriate base\n"
2090
"revision. If this fails, you may need to give an explicit base."
2091
msgstr ""
2092
2093
#: bzrlib/builtins.py:3962
2094
msgid ""
2095
"To pick a different ending revision, pass \"--revision OTHER\". bzr will\n"
2096
"try to merge in all new work up to and including revision OTHER."
2097
msgstr ""
2098
2099
#: bzrlib/builtins.py:3965
2100
msgid ""
2101
"If you specify two values, \"--revision BASE..OTHER\", only revisions BASE\n"
2102
"through OTHER, excluding BASE but including OTHER, will be merged. If this\n"
2103
"causes some revisions to be skipped, i.e. if the destination branch does\n"
2104
"not already contain revision BASE, such a merge is commonly referred to as\n"
2105
"a \"cherrypick\". Unlike a normal merge, Bazaar does not currently track\n"
2106
"cherrypicks. The changes look like a normal commit, and the history of the\n"
2107
"changes from the other branch is not stored in the commit."
2108
msgstr ""
2109
2110
#: bzrlib/builtins.py:3973
2111
msgid "Revision numbers are always relative to the source branch."
2112
msgstr ""
2113
2114
#: bzrlib/builtins.py:3980
2115
msgid "Use bzr resolve when you have fixed a problem. See also bzr conflicts."
2116
msgstr ""
2117
2118
#: bzrlib/builtins.py:3982
2119
msgid ""
2120
"If there is no default branch set, the first merge will set it (use\n"
2121
"--no-remember to avoid setting it). After that, you can omit the branch\n"
2122
"to use the default. To change the default, use --remember. The value will\n"
2123
"only be saved if the remote location can be accessed."
2124
msgstr ""
2125
2126
#: bzrlib/builtins.py:3987
2127
msgid ""
2128
"The results of the merge are placed into the destination working\n"
2129
"directory, where they can be reviewed (with bzr diff), tested, and then\n"
2130
"committed to record the result of the merge."
2131
msgstr ""
2132
2133
#: bzrlib/builtins.py:3991
2134
msgid ""
2135
"merge refuses to run if there are any uncommitted changes, unless\n"
2136
"--force is given. If --force is given, then the changes from the source \n"
2137
"will be merged with the current working tree, including any uncommitted\n"
2138
"changes in the tree. The --force option can also be used to create a\n"
2139
"merge revision which has more than two parents."
2140
msgstr ""
2141
2142
#: bzrlib/builtins.py:3997
2143
msgid ""
2144
"If one would like to merge changes from the working tree of the other\n"
2145
"branch without merging any committed revisions, the --uncommitted option\n"
2146
"can be given."
2147
msgstr ""
2148
2149
#: bzrlib/builtins.py:4001
2150
msgid ""
2151
"To select only some changes to merge, use \"merge -i\", which will prompt\n"
2152
"you to apply each diff hunk and file change, similar to \"shelve\"."
2153
msgstr ""
2154
2155
#: bzrlib/builtins.py:4004
2156
msgid ""
2157
":Examples:\n"
2158
" To merge all new revisions from bzr.dev::"
2159
msgstr ""
2160
2161
#: bzrlib/builtins.py:4007
2162
msgid " bzr merge ../bzr.dev"
2163
msgstr ""
2164
2165
#: bzrlib/builtins.py:4009
2166
msgid " To merge changes up to and including revision 82 from bzr.dev::"
2167
msgstr ""
2168
2169
#: bzrlib/builtins.py:4011
2170
msgid " bzr merge -r 82 ../bzr.dev"
2171
msgstr ""
2172
2173
#: bzrlib/builtins.py:4013
2174
msgid " To merge the changes introduced by 82, without previous changes::"
2175
msgstr ""
2176
2177
#: bzrlib/builtins.py:4015
2178
msgid " bzr merge -r 81..82 ../bzr.dev"
2179
msgstr ""
2180
2181
#: bzrlib/builtins.py:4017
2182
msgid " To apply a merge directive contained in /tmp/merge::"
2183
msgstr ""
2184
2185
#: bzrlib/builtins.py:4019
2186
msgid " bzr merge /tmp/merge"
2187
msgstr ""
2188
2189
#: bzrlib/builtins.py:4021
2190
msgid ""
2191
" To create a merge revision with three parents from two branches\n"
2192
" feature1a and feature1b:"
2193
msgstr ""
2194
2195
#: bzrlib/builtins.py:4024
2196
msgid ""
2197
" bzr merge ../feature1a\n"
2198
" bzr merge ../feature1b --force\n"
2199
" bzr commit -m 'revision with three parents'"
2200
msgstr ""
2201
2202
# help of 'force' option of 'merge' command
2203
#: bzrlib/builtins.py:4036
2204
msgid "Merge even if the destination tree has uncommitted changes."
2205
msgstr ""
2206
2207
# help of 'uncommitted' option of 'merge' command
2208
#: bzrlib/builtins.py:4042
2209
msgid ""
2210
"Apply uncommitted changes from a working copy, instead of branch changes."
2211
msgstr ""
2212
2213
# help of 'pull' option of 'merge' command
2214
#: bzrlib/builtins.py:4044
2215
msgid ""
2216
"If the destination is already completely merged into the source, pull from "
2217
"the source rather than merging. When this happens, you do not need to "
2218
"commit the result."
2219
msgstr ""
2220
2221
# help of 'directory' option of 'merge' command
2222
#: bzrlib/builtins.py:4049
2223
msgid ""
2224
"Branch to merge into, rather than the one containing the working directory."
2225
msgstr ""
2226
2227
# help of 'preview' option of 'merge' command
2228
#: bzrlib/builtins.py:4051
2229
msgid "Instead of merging, show a diff of the merge."
2230
msgstr ""
2231
2232
# help of 'interactive' option of 'merge' command
2233
#: bzrlib/builtins.py:4053
2234
msgid "Select changes interactively."
2235
msgstr ""
2236
2237
#: bzrlib/builtins.py:4337
2238
msgid "Redo a merge."
2239
msgstr ""
2240
2241
#: bzrlib/builtins.py:4339
2242
msgid ""
2243
"Use this if you want to try a different merge technique while resolving\n"
2244
"conflicts. Some merge techniques are better than others, and remerge\n"
2245
"lets you try different ones on different files."
2246
msgstr ""
2247
2248
#: bzrlib/builtins.py:4343
2249
msgid ""
2250
"The options for remerge have the same meaning and defaults as the ones for\n"
2251
"merge. The difference is that remerge can (only) be run when there is a\n"
2252
"pending merge, and it lets you specify particular files."
2253
msgstr ""
2254
2255
#: bzrlib/builtins.py:4347
2256
msgid ""
2257
":Examples:\n"
2258
" Re-do the merge of all conflicted files, and show the base text in\n"
2259
" conflict regions, in addition to the usual THIS and OTHER texts::"
2260
msgstr ""
2261
2262
#: bzrlib/builtins.py:4351
2263
msgid " bzr remerge --show-base"
2264
msgstr ""
2265
2266
#: bzrlib/builtins.py:4353
2267
msgid ""
2268
" Re-do the merge of \"foobar\", using the weave merge algorithm, with\n"
2269
" additional processing to reduce the size of conflict regions::"
2270
msgstr ""
2271
2272
#: bzrlib/builtins.py:4356
2273
msgid " bzr remerge --merge-type weave --reprocess foobar"
2274
msgstr ""
2275
2276
# help of 'show-base' option of 'merge' command
2277
#: bzrlib/builtins.py:4363
2278
msgid "Show base revision text in conflicts."
2279
msgstr ""
2280
2281
#: bzrlib/builtins.py:4431
2282
msgid "Revert files to a previous revision."
2283
msgstr ""
2284
2285
#: bzrlib/builtins.py:4433
2286
msgid ""
2287
"Giving a list of files will revert only those files. Otherwise, all files\n"
2288
"will be reverted. If the revision is not specified with '--revision', the\n"
2289
"last committed revision is used."
2290
msgstr ""
2291
2292
#: bzrlib/builtins.py:4437
2293
msgid ""
2294
"To remove only some changes, without reverting to a prior version, use\n"
2295
"merge instead. For example, \"merge . -r -2..-3\" (don't forget the \".\")\n"
2296
"will remove the changes introduced by the second last commit (-2), without\n"
2297
"affecting the changes introduced by the last commit (-1). To remove\n"
2298
"certain changes on a hunk-by-hunk basis, see the shelve command."
2299
msgstr ""
2300
2301
#: bzrlib/builtins.py:4443
2302
msgid ""
2303
"By default, any files that have been manually changed will be backed up\n"
2304
"first. (Files changed only by merge are not backed up.) Backup files have\n"
2305
"'.~#~' appended to their name, where # is a number."
2306
msgstr ""
2307
2308
#: bzrlib/builtins.py:4447
2309
msgid ""
2310
"When you provide files, you can use their current pathname or the pathname\n"
2311
"from the target revision. So you can use revert to \"undelete\" a file by\n"
2312
"name. If you name a directory, all the contents of that directory will be\n"
2313
"reverted."
2314
msgstr ""
2315
2316
#: bzrlib/builtins.py:4452
2317
msgid ""
2318
"If you have newly added files since the target revision, they will be\n"
2319
"removed. If the files to be removed have been changed, backups will be\n"
2320
"created as above. Directories containing unknown files will not be\n"
2321
"deleted."
2322
msgstr ""
2323
2324
#: bzrlib/builtins.py:4457
2325
msgid ""
2326
"The working tree contains a list of revisions that have been merged but\n"
2327
"not yet committed. These revisions will be included as additional parents\n"
2328
"of the next commit. Normally, using revert clears that list as well as\n"
2329
"reverting the files. If any files are specified, revert leaves the list\n"
2330
"of uncommitted merges alone and reverts only the files. Use ``bzr revert\n"
2331
".`` in the tree root to revert all files but keep the recorded merges,\n"
2332
"and ``bzr revert --forget-merges`` to clear the pending merge list without\n"
2333
"reverting any files."
2334
msgstr ""
2335
2336
#: bzrlib/builtins.py:4466
2337
msgid ""
2338
"Using \"bzr revert --forget-merges\", it is possible to apply all of the\n"
2339
"changes from a branch in a single revision. To do this, perform the merge\n"
2340
"as desired. Then doing revert with the \"--forget-merges\" option will "
2341
"keep\n"
2342
"the content of the tree as it was, but it will clear the list of pending\n"
2343
"merges. The next commit will then contain all of the changes that are\n"
2344
"present in the other branch, but without any other parent revisions.\n"
2345
"Because this technique forgets where these changes originated, it may\n"
2346
"cause additional conflicts on later merges involving the same source and\n"
2347
"target branches."
2348
msgstr ""
2349
2350
# help of 'no-backup' option of 'revert' command
2351
#: bzrlib/builtins.py:4480
2352
msgid "Do not save backups of reverted files."
2353
msgstr ""
2354
2355
# help of 'forget-merges' option of 'revert' command
2356
#: bzrlib/builtins.py:4482
2357
msgid "Remove pending merge marker, without changing any files."
2358
msgstr ""
2359
2360
#: bzrlib/builtins.py:4513
2361
msgid ""
2362
"Show help on a command or other topic.\n"
2363
" "
2364
msgstr ""
2365
2366
# help of 'long' option of 'help' command
2367
#: bzrlib/builtins.py:4518
2368
msgid "Show help on all commands."
2369
msgstr ""
2370
2371
#: bzrlib/builtins.py:4547
2372
msgid "Show unmerged/unpulled revisions between two branches."
2373
msgstr ""
2374
2375
#: bzrlib/builtins.py:4549
2376
msgid "OTHER_BRANCH may be local or remote."
2377
msgstr ""
2378
2379
#: bzrlib/builtins.py:4551
2380
msgid ""
2381
"To filter on a range of revisions, you can use the command -r begin..end\n"
2382
"-r revision requests a specific revision, -r ..end or -r begin.. are\n"
2383
"also valid.\n"
2384
" \n"
2385
":Exit values:\n"
2386
" 1 - some missing revisions\n"
2387
" 0 - no missing revisions"
2388
msgstr ""
2389
2390
#: bzrlib/builtins.py:4561
2391
msgid ""
2392
" Determine the missing revisions between this and the branch at the\n"
2393
" remembered pull location::"
2394
msgstr ""
2395
2396
#: bzrlib/builtins.py:4564
2397
msgid " bzr missing"
2398
msgstr ""
2399
2400
#: bzrlib/builtins.py:4566
2401
msgid " Determine the missing revisions between this and another branch::"
2402
msgstr ""
2403
2404
#: bzrlib/builtins.py:4568
2405
msgid " bzr missing http://server/branch"
2406
msgstr ""
2407
2408
#: bzrlib/builtins.py:4570
2409
msgid ""
2410
" Determine the missing revisions up to a specific revision on the other\n"
2411
" branch::"
2412
msgstr ""
2413
2414
#: bzrlib/builtins.py:4573
2415
msgid " bzr missing -r ..-10"
2416
msgstr ""
2417
2418
#: bzrlib/builtins.py:4575
2419
msgid ""
2420
" Determine the missing revisions up to a specific revision on this\n"
2421
" branch::"
2422
msgstr ""
2423
2424
#: bzrlib/builtins.py:4578
2425
msgid " bzr missing --my-revision ..-10"
2426
msgstr ""
2427
2428
# help of 'reverse' option of 'missing' command
2429
#: bzrlib/builtins.py:4585
2430
msgid "Reverse the order of revisions."
2431
msgstr ""
2432
2433
# help of 'mine-only' option of 'missing' command
2434
#: bzrlib/builtins.py:4587
2435
msgid "Display changes in the local branch only."
2436
msgstr ""
2437
2438
# help of 'this' option of 'missing' command
2439
#: bzrlib/builtins.py:4588
2440
msgid "Same as --mine-only."
2441
msgstr ""
2442
2443
# help of 'theirs-only' option of 'missing' command
2444
#: bzrlib/builtins.py:4590
2445
msgid "Display changes in the remote branch only."
2446
msgstr ""
2447
2448
# help of 'other' option of 'missing' command
2449
#: bzrlib/builtins.py:4591
2450
msgid "Same as --theirs-only."
2451
msgstr ""
2452
2453
# help of 'revision' option of 'missing' command
2454
#: bzrlib/builtins.py:4596
2455
msgid ""
2456
"Filter on other branch revisions (inclusive). See \"help revisionspec\" for "
2457
"details."
2458
msgstr ""
2459
2460
# help of 'my-revision' option of 'missing' command
2461
#: bzrlib/builtins.py:4600
2462
msgid ""
2463
"Filter on local branch revisions (inclusive). See \"help revisionspec\" for "
2464
"details."
2465
msgstr ""
2466
2467
# help of 'include-merges' option of 'missing' command
2468
#: bzrlib/builtins.py:4603
2469
msgid "Show all revisions in addition to the mainline ones."
2470
msgstr ""
2471
2472
#: bzrlib/builtins.py:4719
2473
msgid "Compress the data within a repository."
2474
msgstr ""
2475
2476
#: bzrlib/builtins.py:4721
2477
msgid ""
2478
"This operation compresses the data within a bazaar repository. As\n"
2479
"bazaar supports automatic packing of repository, this operation is\n"
2480
"normally not required to be done manually."
2481
msgstr ""
2482
2483
#: bzrlib/builtins.py:4725
2484
msgid ""
2485
"During the pack operation, bazaar takes a backup of existing repository\n"
2486
"data, i.e. pack files. This backup is eventually removed by bazaar\n"
2487
"automatically when it is safe to do so. To save disk space by removing\n"
2488
"the backed up pack files, the --clean-obsolete-packs option may be\n"
2489
"used."
2490
msgstr ""
2491
2492
#: bzrlib/builtins.py:4731
2493
msgid ""
2494
"Warning: If you use --clean-obsolete-packs and your machine crashes\n"
2495
"during or immediately after repacking, you may be left with a state\n"
2496
"where the deletion has been written to disk but the new packs have not\n"
2497
"been. In this case the repository may be unusable."
2498
msgstr ""
2499
2500
# help of 'clean-obsolete-packs' option of 'pack' command
2501
#: bzrlib/builtins.py:4740
2502
msgid "Delete obsolete packs to save disk space."
2503
msgstr ""
2504
2505
#: bzrlib/builtins.py:4754
2506
msgid "List the installed plugins."
2507
msgstr ""
2508
2509
#: bzrlib/builtins.py:4756
2510
msgid ""
2511
"This command displays the list of installed plugins including\n"
2512
"version of plugin and a short description of each."
2513
msgstr ""
2514
2515
#: bzrlib/builtins.py:4759
2516
msgid "--verbose shows the path where each plugin is located."
2517
msgstr ""
2518
2519
#: bzrlib/builtins.py:4761
2520
msgid ""
2521
"A plugin is an external component for Bazaar that extends the\n"
2522
"revision control system, by adding or replacing code in Bazaar.\n"
2523
"Plugins can do a variety of things, including overriding commands,\n"
2524
"adding new commands, providing additional network transports and\n"
2525
"customizing log output."
2526
msgstr ""
2527
2528
#: bzrlib/builtins.py:4767
2529
msgid ""
2530
"See the Bazaar Plugin Guide <http://doc.bazaar.canonical.com/plugins/en/>\n"
2531
"for further information on plugins including where to find them and how to\n"
2532
"install them. Instructions are also provided there on how to write new\n"
2533
"plugins using the Python programming language."
2534
msgstr ""
2535
2536
#: bzrlib/builtins.py:4783
2537
msgid "Show testament (signing-form) of a revision."
2538
msgstr ""
2539
2540
# help of 'long' option of 'testament' command
2541
#: bzrlib/builtins.py:4786
2542
msgid "Produce long-format testament."
2543
msgstr ""
2544
2545
# help of 'strict' option of 'testament' command
2546
#: bzrlib/builtins.py:4788
2547
msgid "Produce a strict-format testament."
2548
msgstr ""
2549
2550
#: bzrlib/builtins.py:4814
2551
msgid "Show the origin of each line in a file."
2552
msgstr ""
2553
2554
#: bzrlib/builtins.py:4816
2555
msgid ""
2556
"This prints out the given file with an annotation on the left side\n"
2557
"indicating which revision, author and date introduced the change."
2558
msgstr ""
2559
2560
#: bzrlib/builtins.py:4819
2561
msgid ""
2562
"If the origin is the same for a run of consecutive lines, it is\n"
2563
"shown only at the top, unless the --all option is given."
2564
msgstr ""
2565
2566
# help of 'all' option of 'annotate' command
2567
#: bzrlib/builtins.py:4827
2568
msgid "Show annotations on all lines."
2569
msgstr ""
2570
2571
# help of 'long' option of 'annotate' command
2572
#: bzrlib/builtins.py:4828
2573
msgid "Show commit date in annotations."
2574
msgstr ""
2575
2576
#: bzrlib/builtins.py:4931
2577
msgid ""
2578
"Convert the current branch into a checkout of the supplied branch.\n"
2579
"If no branch is supplied, rebind to the last bound location."
2580
msgstr ""
2581
2582
#: bzrlib/builtins.py:4934
2583
msgid ""
2584
"Once converted into a checkout, commits must succeed on the master branch\n"
2585
"before they will be applied to the local branch."
2586
msgstr ""
2587
2588
#: bzrlib/builtins.py:4937
2589
msgid ""
2590
"Bound branches use the nickname of its master branch unless it is set\n"
2591
"locally, in which case binding will update the local nickname to be\n"
2592
"that of the master."
2593
msgstr ""
2594
2595
#: bzrlib/builtins.py:4972
2596
msgid "Convert the current checkout into a regular branch."
2597
msgstr ""
2598
2599
#: bzrlib/builtins.py:4974
2600
msgid ""
2601
"After unbinding, the local branch is considered independent and subsequent\n"
2602
"commits will be local only."
2603
msgstr ""
2604
2605
#: bzrlib/builtins.py:4989
2606
msgid "Remove the last committed revision."
2607
msgstr ""
2608
2609
#: bzrlib/builtins.py:4991
2610
msgid ""
2611
"--verbose will print out what is being removed.\n"
2612
"--dry-run will go through all the motions, but not actually\n"
2613
"remove anything."
2614
msgstr ""
2615
2616
#: bzrlib/builtins.py:4995
2617
msgid ""
2618
"If --revision is specified, uncommit revisions to leave the branch at the\n"
2619
"specified revision. For example, \"bzr uncommit -r 15\" will leave the\n"
2620
"branch at revision 15."
2621
msgstr ""
2622
2623
#: bzrlib/builtins.py:4999
2624
msgid ""
2625
"Uncommit leaves the working tree ready for a new commit. The only change\n"
2626
"it may make is to restore any pending merges that were present before\n"
2627
"the commit."
2628
msgstr ""
2629
2630
# help of 'dry-run' option of 'uncommit' command
2631
#: bzrlib/builtins.py:5010
2632
msgid "Don't actually make changes."
2633
msgstr ""
2634
2635
# help of 'force' option of 'uncommit' command
2636
#: bzrlib/builtins.py:5011
2637
msgid "Say yes to all questions."
2638
msgstr ""
2639
2640
# help of 'keep-tags' option of 'uncommit' command
2641
#: bzrlib/builtins.py:5013
2642
msgid "Keep tags that point to removed revisions."
2643
msgstr ""
2644
2645
# help of 'local' option of 'uncommit' command
2646
#: bzrlib/builtins.py:5015
2647
msgid "Only remove the commits from the local branch when in a checkout."
2648
msgstr ""
2649
2650
#: bzrlib/builtins.py:5101
2651
msgid "Break a dead lock."
2652
msgstr ""
2653
2654
#: bzrlib/builtins.py:5103
2655
msgid ""
2656
"This command breaks a lock on a repository, branch, working directory or\n"
2657
"config file."
2658
msgstr ""
2659
2660
#: bzrlib/builtins.py:5106
2661
msgid ""
2662
"CAUTION: Locks should only be broken when you are sure that the process\n"
2663
"holding the lock has been stopped."
2664
msgstr ""
2665
2666
#: bzrlib/builtins.py:5109
2667
msgid ""
2668
"You can get information on what locks are open via the 'bzr info\n"
2669
"[location]' command."
2670
msgstr ""
2671
2672
#: bzrlib/builtins.py:5112
2673
msgid ""
2674
":Examples:\n"
2675
" bzr break-lock\n"
2676
" bzr break-lock bzr+ssh://example.com/bzr/foo\n"
2677
" bzr break-lock --conf ~/.bazaar"
2678
msgstr ""
2679
2680
# help of 'config' option of 'break-lock' command
2681
#: bzrlib/builtins.py:5121
2682
msgid "LOCATION is the directory where the config lock is."
2683
msgstr ""
2684
2685
# help of 'force' option of 'break-lock' command
2686
#: bzrlib/builtins.py:5123
2687
msgid "Do not ask for confirmation before breaking the lock."
2688
msgstr ""
2689
2690
#: bzrlib/builtins.py:5159
2691
msgid "Run the bzr server."
2692
msgstr ""
2693
2694
# help of 'inet' option of 'serve' command
2695
#: bzrlib/builtins.py:5165
2696
msgid "Serve on stdin/out for use from inetd or sshd."
2697
msgstr ""
2698
2699
# title of 'protocol' option of 'serve' command
2700
#: bzrlib/builtins.py:5166
2701
msgid "protocol"
2702
msgstr ""
2703
2704
# help of 'protocol' option of 'serve' command
2705
#: bzrlib/builtins.py:5167
2706
msgid "Protocol to serve."
2707
msgstr ""
2708
2709
# help of 'port' option of 'serve' command
2710
#: bzrlib/builtins.py:5171
2711
msgid ""
2712
"Listen for connections on nominated port of the form [hostname:]portnumber. "
2713
"Passing 0 as the port number will result in a dynamically allocated port. "
2714
"The default port depends on the protocol."
2715
msgstr ""
2716
2717
# help of 'directory' option of 'serve' command
2718
#: bzrlib/builtins.py:5177
2719
msgid "Serve contents of this directory."
2720
msgstr ""
2721
2722
# help of 'allow-writes' option of 'serve' command
2723
#: bzrlib/builtins.py:5179
2724
msgid ""
2725
"By default the server is a readonly server. Supplying --allow-writes "
2726
"enables write access to the contents of the served directory and below. "
2727
"Note that ``bzr serve`` does not perform authentication, so unless some form "
2728
"of external authentication is arranged supplying this option leads to global "
2729
"uncontrolled write access to your file system."
2730
msgstr ""
2731
2732
#: bzrlib/builtins.py:5224
2733
msgid "Combine a tree into its containing tree."
2734
msgstr ""
2735
2736
#: bzrlib/builtins.py:5226
2737
msgid "This command requires the target tree to be in a rich-root format."
2738
msgstr ""
2739
2740
#: bzrlib/builtins.py:5228
2741
msgid ""
2742
"The TREE argument should be an independent tree, inside another tree, but\n"
2743
"not part of it. (Such trees can be produced by \"bzr split\", but also by\n"
2744
"running \"bzr branch\" with the target inside a tree.)"
2745
msgstr ""
2746
2747
#: bzrlib/builtins.py:5232
2748
msgid ""
2749
"The result is a combined tree, with the subtree no longer an independent\n"
2750
"part. This is marked as a merge of the subtree into the containing tree,\n"
2751
"and all history is preserved."
2752
msgstr ""
2753
2754
#: bzrlib/builtins.py:5270
2755
msgid "Split a subdirectory of a tree into a separate tree."
2756
msgstr ""
2757
2758
#: bzrlib/builtins.py:5272
2759
msgid ""
2760
"This command will produce a target tree in a format that supports\n"
2761
"rich roots, like 'rich-root' or 'rich-root-pack'. These formats cannot be\n"
2762
"converted into earlier formats like 'dirstate-tags'."
2763
msgstr ""
2764
2765
#: bzrlib/builtins.py:5276
2766
msgid ""
2767
"The TREE argument should be a subdirectory of a working tree. That\n"
2768
"subdirectory will be converted into an independent tree, with its own\n"
2769
"branch. Commits in the top-level tree will not apply to the new subtree."
2770
msgstr ""
2771
2772
#: bzrlib/builtins.py:5397
2773
msgid "Mail or create a merge-directive for submitting changes."
2774
msgstr ""
2775
2776
#: bzrlib/builtins.py:5399
2777
msgid "A merge directive provides many things needed for requesting merges:"
2778
msgstr ""
2779
2780
#: bzrlib/builtins.py:5401
2781
msgid "* A machine-readable description of the merge to perform"
2782
msgstr ""
2783
2784
#: bzrlib/builtins.py:5403
2785
msgid "* An optional patch that is a preview of the changes requested"
2786
msgstr ""
2787
2788
#: bzrlib/builtins.py:5405
2789
msgid ""
2790
"* An optional bundle of revision data, so that the changes can be applied\n"
2791
" directly from the merge directive, without retrieving data from a\n"
2792
" branch."
2793
msgstr ""
2794
2795
#: bzrlib/builtins.py:5409
2796
msgid ""
2797
"`bzr send` creates a compact data set that, when applied using bzr\n"
2798
"merge, has the same effect as merging from the source branch. "
2799
msgstr ""
2800
2801
#: bzrlib/builtins.py:5412
2802
msgid ""
2803
"By default the merge directive is self-contained and can be applied to any\n"
2804
"branch containing submit_branch in its ancestory without needing access to\n"
2805
"the source branch."
2806
msgstr ""
2807
2808
#: bzrlib/builtins.py:5416
2809
msgid ""
2810
"If --no-bundle is specified, then Bazaar doesn't send the contents of the\n"
2811
"revisions, but only a structured request to merge from the\n"
2812
"public_location. In that case the public_branch is needed and it must be\n"
2813
"up-to-date and accessible to the recipient. The public_branch is always\n"
2814
"included if known, so that people can check it later."
2815
msgstr ""
2816
2817
#: bzrlib/builtins.py:5422
2818
msgid ""
2819
"The submit branch defaults to the parent of the source branch, but can be\n"
2820
"overridden. Both submit branch and public branch will be remembered in\n"
2821
"branch.conf the first time they are used for a particular branch. The\n"
2822
"source branch defaults to that containing the working directory, but can\n"
2823
"be changed using --from."
2824
msgstr ""
2825
2826
#: bzrlib/builtins.py:5428
2827
msgid ""
2828
"Both the submit branch and the public branch follow the usual behavior with\n"
2829
"respect to --remember: If there is no default location set, the first send\n"
2830
"will set it (use --no-remember to avoid setting it). After that, you can\n"
2831
"omit the location to use the default. To change the default, use\n"
2832
"--remember. The value will only be saved if the location can be accessed."
2833
msgstr ""
2834
2835
#: bzrlib/builtins.py:5434
2836
msgid ""
2837
"In order to calculate those changes, bzr must analyse the submit branch.\n"
2838
"Therefore it is most efficient for the submit branch to be a local mirror.\n"
2839
"If a public location is known for the submit_branch, that location is used\n"
2840
"in the merge directive."
2841
msgstr ""
2842
2843
#: bzrlib/builtins.py:5439
2844
msgid ""
2845
"The default behaviour is to send the merge directive by mail, unless -o is\n"
2846
"given, in which case it is sent to a file."
2847
msgstr ""
2848
2849
#: bzrlib/builtins.py:5442
2850
msgid ""
2851
"Mail is sent using your preferred mail program. This should be transparent\n"
2852
"on Windows (it uses MAPI). On Unix, it requires the xdg-email utility.\n"
2853
"If the preferred client can't be found (or used), your editor will be used."
2854
msgstr ""
2855
2856
#: bzrlib/builtins.py:5446
2857
msgid ""
2858
"To use a specific mail program, set the mail_client configuration option.\n"
2859
"(For Thunderbird 1.5, this works around some bugs.) Supported values for\n"
2860
"specific clients are \"claws\", \"evolution\", \"kmail\", \"mail.app"
2861
"\" (MacOS X's\n"
2862
"Mail.app), \"mutt\", and \"thunderbird\"; generic options are \"default\",\n"
2863
"\"editor\", \"emacsclient\", \"mapi\", and \"xdg-email\". Plugins may also "
2864
"add\n"
2865
"supported clients."
2866
msgstr ""
2867
2868
#: bzrlib/builtins.py:5453
2869
msgid ""
2870
"If mail is being sent, a to address is required. This can be supplied\n"
2871
"either on the commandline, by setting the submit_to configuration\n"
2872
"option in the branch itself or the child_submit_to configuration option\n"
2873
"in the submit branch."
2874
msgstr ""
2875
2876
#: bzrlib/builtins.py:5458
2877
msgid ""
2878
"Two formats are currently supported: \"4\" uses revision bundle format 4 "
2879
"and\n"
2880
"merge directive format 2. It is significantly faster and smaller than\n"
2881
"older formats. It is compatible with Bazaar 0.19 and later. It is the\n"
2882
"default. \"0.9\" uses revision bundle format 0.9 and merge directive\n"
2883
"format 1. It is compatible with Bazaar 0.12 - 0.18."
2884
msgstr ""
2885
2886
#: bzrlib/builtins.py:5464
2887
msgid ""
2888
"The merge directives created by bzr send may be applied using bzr merge or\n"
2889
"bzr pull by specifying a file containing a merge directive as the location."
2890
msgstr ""
2891
2892
#: bzrlib/builtins.py:5467
2893
msgid ""
2894
"bzr send makes extensive use of public locations to map local locations "
2895
"into\n"
2896
"URLs that can be used by other people. See `bzr help configuration` to\n"
2897
"set them, and use `bzr info` to display them."
2898
msgstr ""
2899
2900
# help of 'output' option of 'send' command
2901
#: bzrlib/builtins.py:5491
2902
msgid "Write merge directive to this file or directory; use - for stdout."
2903
msgstr ""
2904
2905
# help of 'strict' option of 'send' command
2906
#: bzrlib/builtins.py:5495
2907
msgid ""
2908
"Refuse to send if there are uncommitted changes in the working tree, --no-"
2909
"strict disables the check."
2910
msgstr ""
2911
2912
# help of 'mail-to' option of 'send' command
2913
#: bzrlib/builtins.py:5497
2914
msgid "Mail the request to this address."
2915
msgstr ""
2916
2917
# help of 'body' option of 'send' command
2918
#: bzrlib/builtins.py:5501
2919
msgid "Body for the email."
2920
msgstr ""
2921
2922
# help of 'no-bundle' option of 'send' command
2923
#: bzrlib/builtins.py:5554
2924
msgid "Do not include a bundle in the merge directive."
2925
msgstr ""
2926
2927
# help of 'no-patch' option of 'send' command
2928
#: bzrlib/builtins.py:5555
2929
msgid "Do not include a preview patch in the merge directive."
2930
msgstr ""
2931
2932
# help of 'remember' option of 'send' command
2933
#: bzrlib/builtins.py:5558
2934
msgid "Remember submit and public branch."
2935
msgstr ""
2936
2937
# help of 'from' option of 'send' command
2938
#: bzrlib/builtins.py:5560
2939
msgid ""
2940
"Branch to generate the submission from, rather than the one containing the "
2941
"working directory."
2942
msgstr ""
2943
2944
# title of 'format' option of 'send' command
2945
#: bzrlib/builtins.py:5570
2946
msgid "format"
2947
msgstr ""
2948
2949
# help of 'format' option of 'send' command
2950
#: bzrlib/builtins.py:5571
2951
msgid "Use the specified output format."
2952
msgstr ""
2953
2954
#: bzrlib/builtins.py:5593
2955
msgid "Create, remove or modify a tag naming a revision."
2956
msgstr ""
2957
2958
#: bzrlib/builtins.py:5595
2959
msgid ""
2960
"Tags give human-meaningful names to revisions. Commands that take a -r\n"
2961
"(--revision) option can be given -rtag:X, where X is any previously\n"
2962
"created tag."
2963
msgstr ""
2964
2965
#: bzrlib/builtins.py:5599
2966
msgid ""
2967
"Tags are stored in the branch. Tags are copied from one branch to another\n"
2968
"along when you branch, push, pull or merge."
2969
msgstr ""
2970
2971
#: bzrlib/builtins.py:5602
2972
msgid ""
2973
"It is an error to give a tag name that already exists unless you pass\n"
2974
"--force, in which case the tag is moved to point to the new revision."
2975
msgstr ""
2976
2977
#: bzrlib/builtins.py:5605
2978
msgid ""
2979
"To rename a tag (change the name but keep it on the same revsion), run "
2980
"``bzr\n"
2981
"tag new-name -r tag:old-name`` and then ``bzr tag --delete oldname``."
2982
msgstr ""
2983
2984
#: bzrlib/builtins.py:5608
2985
msgid ""
2986
"If no tag name is specified it will be determined through the \n"
2987
"'automatic_tag_name' hook. This can e.g. be used to automatically tag\n"
2988
"upstream releases by reading configure.ac. See ``bzr help hooks`` for\n"
2989
"details."
2990
msgstr ""
2991
2992
# help of 'delete' option of 'tag' command
2993
#: bzrlib/builtins.py:5618
2994
msgid "Delete this tag rather than placing it."
2995
msgstr ""
2996
2997
# help of 'directory' option of 'tag' command
2998
#: bzrlib/builtins.py:5621
2999
msgid "Branch in which to place the tag."
3000
msgstr ""
3001
3002
# help of 'force' option of 'tag' command
3003
#: bzrlib/builtins.py:5623
3004
msgid "Replace existing tags."
3005
msgstr ""
3006
3007
#: bzrlib/builtins.py:5672
3008
msgid "List tags."
3009
msgstr ""
3010
3011
#: bzrlib/builtins.py:5674
3012
msgid ""
3013
"This command shows a table of tag names and the revisions they reference."
3014
msgstr ""
3015
3016
# help of 'directory' option of 'tags' command
3017
#: bzrlib/builtins.py:5680
3018
msgid "Branch whose tags should be displayed."
3019
msgstr ""
3020
3021
# help of 'sort' option of 'tags' command
3022
#: bzrlib/builtins.py:5682
3023
msgid "Sort tags by different criteria."
3024
msgstr ""
3025
3026
# title of 'sort' option of 'tags' command
3027
#: bzrlib/builtins.py:5682
3028
msgid "Sorting"
3029
msgstr ""
3030
3031
#: bzrlib/builtins.py:5727
3032
msgid "Reconfigure the type of a bzr directory."
3033
msgstr ""
3034
3035
#: bzrlib/builtins.py:5729
3036
msgid "A target configuration must be specified."
3037
msgstr ""
3038
3039
#: bzrlib/builtins.py:5731
3040
msgid ""
3041
"For checkouts, the bind-to location will be auto-detected if not specified.\n"
3042
"The order of preference is\n"
3043
"1. For a lightweight checkout, the current bound location.\n"
3044
"2. For branches that used to be checkouts, the previously-bound location.\n"
3045
"3. The push location.\n"
3046
"4. The parent location.\n"
3047
"If none of these is available, --bind-to must be specified."
3048
msgstr ""
3049
3050
# title of 'target_type' option of 'reconfigure' command
3051
#: bzrlib/builtins.py:5745
3052
msgid "Target type"
3053
msgstr ""
3054
3055
# help of 'target_type' option of 'reconfigure' command
3056
#: bzrlib/builtins.py:5746
3057
msgid "The type to reconfigure the directory to."
3058
msgstr ""
3059
3060
# help of 'bind-to' option of 'reconfigure' command
3061
#: bzrlib/builtins.py:5761
3062
msgid "Branch to bind checkout to."
3063
msgstr ""
3064
3065
# help of 'force' option of 'reconfigure' command
3066
#: bzrlib/builtins.py:5763
3067
msgid "Perform reconfiguration even if local changes will be lost."
3068
msgstr ""
3069
3070
# help of 'stacked-on' option of 'reconfigure' command
3071
#: bzrlib/builtins.py:5766
3072
msgid "Reconfigure a branch to be stacked on another branch."
3073
msgstr ""
3074
3075
# help of 'unstacked' option of 'reconfigure' command
3076
#: bzrlib/builtins.py:5770
3077
msgid ""
3078
"Reconfigure a branch to be unstacked. This may require copying substantial "
3079
"data into it."
3080
msgstr ""
3081
3082
#: bzrlib/builtins.py:5818
3083
msgid "Set the branch of a checkout and update."
3084
msgstr ""
3085
3086
#: bzrlib/builtins.py:5820
3087
msgid ""
3088
"For lightweight checkouts, this changes the branch being referenced.\n"
3089
"For heavyweight checkouts, this checks that there are no local commits\n"
3090
"versus the current bound branch, then it makes the local branch a mirror\n"
3091
"of the new location and binds to it."
3092
msgstr ""
3093
3094
#: bzrlib/builtins.py:5825
3095
msgid ""
3096
"In both cases, the working tree is updated and uncommitted changes\n"
3097
"are merged. The user can commit or revert these as they desire."
3098
msgstr ""
3099
3100
#: bzrlib/builtins.py:5828
3101
msgid "Pending merges need to be committed or reverted before using switch."
3102
msgstr ""
3103
3104
#: bzrlib/builtins.py:5830
3105
msgid ""
3106
"The path to the branch to switch to can be specified relative to the parent\n"
3107
"directory of the current branch. For example, if you are currently in a\n"
3108
"checkout of /path/to/branch, specifying 'newbranch' will find a branch at\n"
3109
"/path/to/newbranch."
3110
msgstr ""
3111
3112
#: bzrlib/builtins.py:5835
3113
msgid ""
3114
"Bound branches use the nickname of its master branch unless it is set\n"
3115
"locally, in which case switching will update the local nickname to be\n"
3116
"that of the master."
3117
msgstr ""
3118
3119
# help of 'force' option of 'switch' command
3120
#: bzrlib/builtins.py:5843
3121
msgid "Switch even if local commits will be lost."
3122
msgstr ""
3123
3124
# help of 'create-branch' option of 'switch' command
3125
#: bzrlib/builtins.py:5846
3126
msgid "Create the target branch from this one before switching to it."
3127
msgstr ""
3128
3129
#: bzrlib/builtins.py:5915
3130
msgid "Manage filtered views."
3131
msgstr ""
3132
3133
#: bzrlib/builtins.py:5917
3134
msgid ""
3135
"Views provide a mask over the tree so that users can focus on\n"
3136
"a subset of a tree when doing their work. After creating a view,\n"
3137
"commands that support a list of files - status, diff, commit, etc -\n"
3138
"effectively have that list of files implicitly given each time.\n"
3139
"An explicit list of files can still be given but those files\n"
3140
"must be within the current view."
3141
msgstr ""
3142
3143
#: bzrlib/builtins.py:5924
3144
msgid ""
3145
"In most cases, a view has a short life-span: it is created to make\n"
3146
"a selected change and is deleted once that change is committed.\n"
3147
"At other times, you may wish to create one or more named views\n"
3148
"and switch between them."
3149
msgstr ""
3150
3151
#: bzrlib/builtins.py:5929
3152
msgid ""
3153
"To disable the current view without deleting it, you can switch to\n"
3154
"the pseudo view called ``off``. This can be useful when you need\n"
3155
"to see the whole tree for an operation or two (e.g. merge) but\n"
3156
"want to switch back to your view after that."
3157
msgstr ""
3158
3159
#: bzrlib/builtins.py:5934
3160
msgid ""
3161
":Examples:\n"
3162
" To define the current view::"
3163
msgstr ""
3164
3165
#: bzrlib/builtins.py:5937
3166
msgid " bzr view file1 dir1 ..."
3167
msgstr ""
3168
3169
#: bzrlib/builtins.py:5939
3170
msgid " To list the current view::"
3171
msgstr ""
3172
3173
#: bzrlib/builtins.py:5941
3174
msgid " bzr view"
3175
msgstr ""
3176
3177
#: bzrlib/builtins.py:5943
3178
msgid " To delete the current view::"
3179
msgstr ""
3180
3181
#: bzrlib/builtins.py:5945
3182
msgid " bzr view --delete"
3183
msgstr ""
3184
3185
#: bzrlib/builtins.py:5947
3186
msgid " To disable the current view without deleting it::"
3187
msgstr ""
3188
3189
#: bzrlib/builtins.py:5949
3190
msgid " bzr view --switch off"
3191
msgstr ""
3192
3193
#: bzrlib/builtins.py:5951
3194
msgid " To define a named view and switch to it::"
3195
msgstr ""
3196
3197
#: bzrlib/builtins.py:5953
3198
msgid " bzr view --name view-name file1 dir1 ..."
3199
msgstr ""
3200
3201
#: bzrlib/builtins.py:5955
3202
msgid " To list a named view::"
3203
msgstr ""
3204
3205
#: bzrlib/builtins.py:5957
3206
msgid " bzr view --name view-name"
3207
msgstr ""
3208
3209
#: bzrlib/builtins.py:5959
3210
msgid " To delete a named view::"
3211
msgstr ""
3212
3213
#: bzrlib/builtins.py:5961
3214
msgid " bzr view --name view-name --delete"
3215
msgstr ""
3216
3217
#: bzrlib/builtins.py:5963
3218
msgid " To switch to a named view::"
3219
msgstr ""
3220
3221
#: bzrlib/builtins.py:5965
3222
msgid " bzr view --switch view-name"
3223
msgstr ""
3224
3225
#: bzrlib/builtins.py:5967
3226
msgid " To list all views defined::"
3227
msgstr ""
3228
3229
#: bzrlib/builtins.py:5969
3230
msgid " bzr view --all"
3231
msgstr ""
3232
3233
#: bzrlib/builtins.py:5971
3234
msgid " To delete all views::"
3235
msgstr ""
3236
3237
#: bzrlib/builtins.py:5973
3238
msgid " bzr view --delete --all"
3239
msgstr ""
3240
3241
# help of 'all' option of 'view' command
3242
#: bzrlib/builtins.py:5980
3243
msgid "Apply list or delete action to all views."
3244
msgstr ""
3245
3246
# help of 'delete' option of 'view' command
3247
#: bzrlib/builtins.py:5983
3248
msgid "Delete the view."
3249
msgstr ""
3250
3251
# help of 'name' option of 'view' command
3252
#: bzrlib/builtins.py:5986
3253
msgid "Name of the view to define, list or delete."
3254
msgstr ""
3255
3256
# help of 'switch' option of 'view' command
3257
#: bzrlib/builtins.py:5990
3258
msgid "Name of the view to switch to."
3259
msgstr ""
3260
3261
#: bzrlib/builtins.py:6090
3262
msgid "Remove a branch."
3263
msgstr ""
3264
3265
#: bzrlib/builtins.py:6092
3266
msgid ""
3267
"This will remove the branch from the specified location but \n"
3268
"will keep any working tree or repository in place."
3269
msgstr ""
3270
3271
#: bzrlib/builtins.py:6097
3272
msgid " Remove the branch at repo/trunk::"
3273
msgstr ""
3274
3275
#: bzrlib/builtins.py:6099
3276
msgid " bzr remove-branch repo/trunk"
3277
msgstr ""
3278
3279
#: bzrlib/builtins.py:6115
3280
msgid "Temporarily set aside some changes from the current tree."
3281
msgstr ""
3282
3283
#: bzrlib/builtins.py:6117
3284
msgid ""
3285
"Shelve allows you to temporarily put changes you've made \"on the shelf\",\n"
3286
"ie. out of the way, until a later time when you can bring them back from\n"
3287
"the shelf with the 'unshelve' command. The changes are stored alongside\n"
3288
"your working tree, and so they aren't propagated along with your branch nor\n"
3289
"will they survive its deletion."
3290
msgstr ""
3291
3292
#: bzrlib/builtins.py:6123
3293
msgid "If shelve --list is specified, previously-shelved changes are listed."
3294
msgstr ""
3295
3296
#: bzrlib/builtins.py:6125
3297
msgid ""
3298
"Shelve is intended to help separate several sets of changes that have\n"
3299
"been inappropriately mingled. If you just want to get rid of all changes\n"
3300
"and you don't need to restore them later, use revert. If you want to\n"
3301
"shelve all text changes at once, use shelve --all."
3302
msgstr ""
3303
3304
#: bzrlib/builtins.py:6130
3305
msgid ""
3306
"If filenames are specified, only the changes to those files will be\n"
3307
"shelved. Other files will be left untouched."
3308
msgstr ""
3309
3310
#: bzrlib/builtins.py:6133
3311
msgid ""
3312
"If a revision is specified, changes since that revision will be shelved."
3313
msgstr ""
3314
3315
#: bzrlib/builtins.py:6135
3316
msgid ""
3317
"You can put multiple items on the shelf, and by default, 'unshelve' will\n"
3318
"restore the most recently shelved changes."
3319
msgstr ""
3320
3321
#: bzrlib/builtins.py:6138
3322
msgid ""
3323
"For complicated changes, it is possible to edit the changes in a separate\n"
3324
"editor program to decide what the file remaining in the working copy\n"
3325
"should look like. To do this, add the configuration option"
3326
msgstr ""
3327
3328
#: bzrlib/builtins.py:6142
3329
msgid " change_editor = PROGRAM @new_path @old_path"
3330
msgstr ""
3331
3332
#: bzrlib/builtins.py:6144
3333
msgid ""
3334
"where @new_path is replaced with the path of the new version of the \n"
3335
"file and @old_path is replaced with the path of the old version of \n"
3336
"the file. The PROGRAM should save the new file with the desired \n"
3337
"contents of the file in the working tree.\n"
3338
" "
3339
msgstr ""
3340
3341
# help of 'all' option of 'shelve' command
3342
#: bzrlib/builtins.py:6156
3343
msgid "Shelve all changes."
3344
msgstr ""
3345
3346
# help of 'writer' option of 'shelve' command
3347
#: bzrlib/builtins.py:6158
3348
msgid "Method to use for writing diffs."
3349
msgstr ""
3350
3351
# title of 'writer' option of 'shelve' command
3352
#: bzrlib/builtins.py:6158
3353
msgid "writer"
3354
msgstr ""
3355
3356
# help of 'list' option of 'shelve' command
3357
#: bzrlib/builtins.py:6162
3358
msgid "List shelved changes."
3359
msgstr ""
3360
3361
# help of 'destroy' option of 'shelve' command
3362
#: bzrlib/builtins.py:6164
3363
msgid "Destroy removed changes instead of shelving them."
3364
msgstr ""
3365
3366
#: bzrlib/builtins.py:6204
3367
msgid "Restore shelved changes."
3368
msgstr ""
3369
3370
#: bzrlib/builtins.py:6206
3371
msgid ""
3372
"By default, the most recently shelved changes are restored. However if you\n"
3373
"specify a shelf by id those changes will be restored instead. This works\n"
3374
"best when the changes don't depend on each other."
3375
msgstr ""
3376
3377
# help of 'action' option of 'unshelve' command
3378
#: bzrlib/builtins.py:6215
3379
msgid "The action to perform."
3380
msgstr ""
3381
3382
#: bzrlib/builtins.py:6237
3383
msgid "Remove unwanted files from working tree."
3384
msgstr ""
3385
3386
#: bzrlib/builtins.py:6239
3387
msgid ""
3388
"By default, only unknown files, not ignored files, are deleted. Versioned\n"
3389
"files are never deleted."
3390
msgstr ""
3391
3392
#: bzrlib/builtins.py:6242
3393
msgid ""
3394
"Another class is 'detritus', which includes files emitted by bzr during\n"
3395
"normal operations and selftests. (The value of these files decreases with\n"
3396
"time.)"
3397
msgstr ""
3398
3399
#: bzrlib/builtins.py:6246
3400
msgid ""
3401
"If no options are specified, unknown files are deleted. Otherwise, option\n"
3402
"flags are respected, and may be combined."
3403
msgstr ""
3404
3405
#: bzrlib/builtins.py:6249
3406
msgid "To check what clean-tree will do, use --dry-run."
3407
msgstr ""
3408
3409
# help of 'ignored' option of 'clean-tree' command
3410
#: bzrlib/builtins.py:6252
3411
msgid "Delete all ignored files."
3412
msgstr ""
3413
3414
# help of 'detritus' option of 'clean-tree' command
3415
#: bzrlib/builtins.py:6253
3416
msgid ""
3417
"Delete conflict files, merge and revert backups, and failed selftest dirs."
3418
msgstr ""
3419
3420
# help of 'unknown' option of 'clean-tree' command
3421
#: bzrlib/builtins.py:6256
3422
msgid "Delete files unknown to bzr (default)."
3423
msgstr ""
3424
3425
# help of 'dry-run' option of 'clean-tree' command
3426
#: bzrlib/builtins.py:6257
3427
msgid "Show files to delete instead of deleting them."
3428
msgstr ""
3429
3430
# help of 'force' option of 'clean-tree' command
3431
#: bzrlib/builtins.py:6259
3432
msgid "Do not prompt before deleting."
3433
msgstr ""
3434
3435
#: bzrlib/cmd_version_info.py:50
3436
msgid "Show version information about this tree."
3437
msgstr ""
3438
3439
#: bzrlib/cmd_version_info.py:52
3440
msgid ""
3441
"You can use this command to add information about version into\n"
3442
"source code of an application. The output can be in one of the\n"
3443
"supported formats or in a custom format based on a template."
3444
msgstr ""
3445
3446
#: bzrlib/cmd_version_info.py:56
3447
msgid "For example::"
3448
msgstr ""
3449
3450
#: bzrlib/cmd_version_info.py:58
3451
msgid ""
3452
" bzr version-info --custom \\\n"
3453
" --template=\"#define VERSION_INFO \\\"Project 1.2.3 (r{revno})\\\"\\n\""
3454
msgstr ""
3455
3456
#: bzrlib/cmd_version_info.py:61
3457
msgid ""
3458
"will produce a C header file with formatted string containing the\n"
3459
"current revision number. Other supported variables in templates are:"
3460
msgstr ""
3461
3462
#: bzrlib/cmd_version_info.py:64
3463
msgid ""
3464
" * {date} - date of the last revision\n"
3465
" * {build_date} - current date\n"
3466
" * {revno} - revision number\n"
3467
" * {revision_id} - revision id\n"
3468
" * {branch_nick} - branch nickname\n"
3469
" * {clean} - 0 if the source tree contains uncommitted changes,\n"
3470
" otherwise 1"
3471
msgstr ""
3472
3473
# help of 'format' option of 'version-info' command
3474
#: bzrlib/cmd_version_info.py:74
3475
msgid "Select the output format."
3476
msgstr ""
3477
3478
# help of 'all' option of 'version-info' command
3479
#: bzrlib/cmd_version_info.py:78
3480
msgid "Include all possible information."
3481
msgstr ""
3482
3483
# help of 'check-clean' option of 'version-info' command
3484
#: bzrlib/cmd_version_info.py:79
3485
msgid "Check if tree is clean."
3486
msgstr ""
3487
3488
# help of 'include-history' option of 'version-info' command
3489
#: bzrlib/cmd_version_info.py:81
3490
msgid "Include the revision-history."
3491
msgstr ""
3492
3493
# help of 'include-file-revisions' option of 'version-info' command
3494
#: bzrlib/cmd_version_info.py:83
3495
msgid "Include the last revision for each file."
3496
msgstr ""
3497
3498
# help of 'template' option of 'version-info' command
3499
#: bzrlib/cmd_version_info.py:84
3500
msgid "Template for the output."
3501
msgstr ""
3502
3503
#: bzrlib/commands.py:479
3504
msgid "No help for this command."
3505
msgstr ""
3506
3507
#: bzrlib/commands.py:492
3508
#, python-format
3509
msgid ":Purpose: %s\n"
3510
msgstr ""
3511
3512
#: bzrlib/commands.py:494
3513
#, python-format
3514
msgid ""
3515
":Usage:\n"
3516
"%s\n"
3517
msgstr ""
3518
3519
#: bzrlib/commands.py:496
3520
#, python-format
3521
msgid ":Usage: %s\n"
3522
msgstr ""
3523
3524
#: bzrlib/commands.py:515
3525
#, python-format
3526
msgid ":Options:%s"
3527
msgstr ""
3528
3529
#: bzrlib/commands.py:526
3530
#, python-format
3531
msgid ""
3532
":Description:\n"
3533
" %s\n"
3534
"\n"
3535
msgstr ""
3536
3537
#: bzrlib/commands.py:536
3538
#, python-format
3539
msgid ""
3540
"See bzr help %s for more details and examples.\n"
3541
"\n"
3542
msgstr ""
3543
3544
#: bzrlib/commands.py:541
3545
msgid ":Aliases: "
3546
msgstr ""
3547
3548
#: bzrlib/commands.py:545
3549
#, python-format
3550
msgid ":From: plugin \"%s\"\n"
3551
msgstr ""
3552
3553
#: bzrlib/commands.py:557
3554
#, python-format
3555
msgid ":doc:`%s <%s-help>`"
3556
msgstr ""
3557
3558
#: bzrlib/commands.py:560
3559
#, python-format
3560
msgid ":See also: %s"
3561
msgstr ""
3562
3563
#: bzrlib/commit_signature_commands.py:34
3564
msgid "Sign all commits by a given committer."
3565
msgstr ""
3566
3567
#: bzrlib/commit_signature_commands.py:36
3568
msgid ""
3569
"If location is not specified the local tree is used.\n"
3570
"If committer is not specified the default committer is used."
3571
msgstr ""
3572
3573
#: bzrlib/commit_signature_commands.py:39
3574
msgid "This does not sign commits that already have signatures."
3575
msgstr ""
3576
3577
# help of 'dry-run' option of 'sign-my-commits' command
3578
#: bzrlib/commit_signature_commands.py:47
3579
msgid ""
3580
"Don't actually sign anything, just print the revisions that would be signed."
3581
msgstr ""
3582
3583
#: bzrlib/commit_signature_commands.py:101
3584
msgid "Verify all commit signatures."
3585
msgstr ""
3586
3587
#: bzrlib/commit_signature_commands.py:103
3588
msgid "Verifies that all commits in the branch are signed by known GnuPG keys."
3589
msgstr ""
3590
3591
# help of 'acceptable-keys' option of 'verify-signatures' command
3592
#: bzrlib/commit_signature_commands.py:108
3593
msgid ""
3594
"Comma separated list of GPG key patterns which are acceptable for "
3595
"verification."
3596
msgstr ""
3597
3598
#: bzrlib/commit_signature_commands.py:166
3599
msgid "All commits signed with verifiable keys"
3600
msgstr ""
3601
3602
#: bzrlib/config.py:3277
3603
msgid "Display, set or remove a configuration option."
3604
msgstr ""
3605
3606
#: bzrlib/config.py:3279
3607
msgid "Display the active value for a given option."
3608
msgstr ""
3609
3610
#: bzrlib/config.py:3281
3611
msgid ""
3612
"If --all is specified, NAME is interpreted as a regular expression and all\n"
3613
"matching options are displayed mentioning their scope. The active value\n"
3614
"that bzr will take into account is the first one displayed for each option."
3615
msgstr ""
3616
3617
#: bzrlib/config.py:3285
3618
msgid "If no NAME is given, --all .* is implied."
3619
msgstr ""
3620
3621
#: bzrlib/config.py:3287
3622
msgid ""
3623
"Setting a value is achieved by using name=value without spaces. The value\n"
3624
"is set in the most relevant scope and can be checked by displaying the\n"
3625
"option again."
3626
msgstr ""
3627
3628
# help of 'scope' option of 'config' command
3629
#: bzrlib/config.py:3298
3630
msgid "Reduce the scope to the specified configuration file"
3631
msgstr ""
3632
3633
# help of 'all' option of 'config' command
3634
#: bzrlib/config.py:3302
3635
msgid "Display all the defined values for the matching options."
3636
msgstr ""
3637
3638
# help of 'remove' option of 'config' command
3639
#: bzrlib/config.py:3304
3640
msgid "Remove the option from the configuration file"
3641
msgstr ""
3642
3643
#: bzrlib/conflicts.py:47
3644
msgid "List files with conflicts."
3645
msgstr ""
3646
3647
#: bzrlib/conflicts.py:49
3648
msgid ""
3649
"Merge will do its best to combine the changes in two branches, but there\n"
3650
"are some kinds of problems only a human can fix. When it encounters those,\n"
3651
"it will mark a conflict. A conflict means that you need to fix something,\n"
3652
"before you should commit."
3653
msgstr ""
3654
3655
#: bzrlib/conflicts.py:54
3656
msgid ""
3657
"Conflicts normally are listed as short, human-readable messages. If --text\n"
3658
"is supplied, the pathnames of files with text conflicts are listed,\n"
3659
"instead. (This is useful for editing all files with text conflicts.)"
3660
msgstr ""
3661
3662
#: bzrlib/conflicts.py:58
3663
msgid "Use bzr resolve when you have fixed a problem."
3664
msgstr ""
3665
3666
# help of 'text' option of 'conflicts' command
3667
#: bzrlib/conflicts.py:63
3668
msgid "List paths of files with text conflicts."
3669
msgstr ""
3670
3671
# help of 'action' option of 'resolve' command
3672
#: bzrlib/conflicts.py:95
3673
msgid "How to resolve the conflict."
3674
msgstr ""
3675
3676
#: bzrlib/conflicts.py:101
3677
msgid "Mark a conflict as resolved."
3678
msgstr ""
3679
3680
#: bzrlib/conflicts.py:108
3681
msgid ""
3682
"Once you have fixed a problem, use \"bzr resolve\" to automatically mark\n"
3683
"text conflicts as fixed, \"bzr resolve FILE\" to mark a specific conflict "
3684
"as\n"
3685
"resolved, or \"bzr resolve --all\" to mark all conflicts as resolved."
3686
msgstr ""
3687
3688
# help of 'all' option of 'resolve' command
3689
#: bzrlib/conflicts.py:116
3690
msgid "Resolve all conflicts in this tree."
3691
msgstr ""
3692
3693
# title of 'action' option of 'resolve' command
3694
#: bzrlib/conflicts.py:688
3695
msgid "action"
3696
msgstr ""
3697
3698
#: bzrlib/errors.py:215
3699
msgid "The tree builder is already building a tree."
3700
msgstr ""
3701
3702
#: bzrlib/errors.py:236
3703
msgid "The dirstate file (%(state)s) appears to be corrupt: %(msg)s"
3704
msgstr ""
3705
3706
#: bzrlib/errors.py:255
3707
msgid ""
3708
"The API for \"%(api)s\" is not compatible with \"%(wanted)s\". It supports "
3709
"versions \"%(minimum)s\" to \"%(current)s\"."
3710
msgstr ""
3711
3712
#: bzrlib/errors.py:267
3713
msgid "The transport '%(transport)s' is only accessible within this process."
3714
msgstr ""
3715
3716
#: bzrlib/errors.py:285
3717
msgid "Invalid revision number %(revno)s"
3718
msgstr ""
3719
3720
#: bzrlib/errors.py:294
3721
msgid "Invalid revision-id {%(revision_id)s} in %(branch)s"
3722
msgstr ""
3723
3724
#: bzrlib/errors.py:305
3725
msgid "Reserved revision-id {%(revision_id)s}"
3726
msgstr ""
3727
3728
#: bzrlib/errors.py:319
3729
msgid "There is no public branch set for \"%(branch_url)s\"."
3730
msgstr ""
3731
3732
#: bzrlib/errors.py:329
3733
msgid ""
3734
"No help could be found for '%(topic)s'. Please use 'bzr help topics' to "
3735
"obtain a list of topics."
3736
msgstr ""
3737
3738
#: bzrlib/errors.py:338
3739
msgid "The file id \"%(file_id)s\" is not present in the tree %(tree)s."
3740
msgstr ""
3741
3742
#: bzrlib/errors.py:348
3743
msgid ""
3744
"The file id \"%(file_id)s\" is not present in the repository %(repository)r"
3745
msgstr ""
3746
3747
#: bzrlib/errors.py:357
3748
msgid "The branch '%(branch)s' is not stacked."
3749
msgstr ""
3750
3751
#: bzrlib/errors.py:371
3752
msgid "No WorkingTree exists for \"%(base)s\"."
3753
msgstr ""
3754
3755
#: bzrlib/errors.py:380
3756
msgid "Not currently building a tree."
3757
msgstr ""
3758
3759
#: bzrlib/errors.py:385
3760
msgid "%(url)s is not a local path."
3761
msgstr ""
3762
3763
#: bzrlib/errors.py:413
3764
msgid "%(not_locked)r is not write locked but needs to be."
3765
msgstr ""
3766
3767
#: bzrlib/errors.py:421
3768
msgid "Error in command line options"
3769
msgstr ""
3770
3771
#: bzrlib/errors.py:426
3772
msgid "%(value)s is not an index of type %(_type)s."
3773
msgstr ""
3774
3775
#: bzrlib/errors.py:436
3776
msgid "Error in data for index %(value)s."
3777
msgstr ""
3778
3779
#: bzrlib/errors.py:445
3780
msgid "The key '%(key)s' is already in index '%(index)s'."
3781
msgstr ""
3782
3783
#: bzrlib/errors.py:455
3784
msgid "The key '%(key)s' is not a valid key."
3785
msgstr ""
3786
3787
#: bzrlib/errors.py:464
3788
msgid "Could not parse options for index %(value)s."
3789
msgstr ""
3790
3791
#: bzrlib/errors.py:473
3792
msgid "The value '%(value)s' is not a valid value."
3793
msgstr ""
3794
3795
#: bzrlib/errors.py:501
3796
msgid "Generic path error: %(path)r%(extra)s)"
3797
msgstr ""
3798
3799
#: bzrlib/errors.py:514
3800
msgid "No such file: %(path)r%(extra)s"
3801
msgstr ""
3802
3803
#: bzrlib/errors.py:519
3804
msgid "File exists: %(path)r%(extra)s"
3805
msgstr ""
3806
3807
#: bzrlib/errors.py:525
3808
msgid ""
3809
"Could not rename %(source)s => %(dest)s because both files exist. (Use --"
3810
"after to tell bzr about a rename that has already happened)%(extra)s"
3811
msgstr ""
3812
3813
#: bzrlib/errors.py:541
3814
msgid "\"%(path)s\" is not a directory %(extra)s"
3815
msgstr ""
3816
3817
#: bzrlib/errors.py:546
3818
msgid "\"%(path)s\" is not in the working directory %(extra)s"
3819
msgstr ""
3820
3821
#: bzrlib/errors.py:551
3822
msgid "Directory not empty: \"%(path)s\"%(extra)s"
3823
msgstr ""
3824
3825
#: bzrlib/errors.py:556
3826
msgid "Hard-linking \"%(path)s\" is not supported"
3827
msgstr ""
3828
3829
#: bzrlib/errors.py:571
3830
msgid "Device or resource busy: \"%(path)s\"%(extra)s"
3831
msgstr ""
3832
3833
#: bzrlib/errors.py:576
3834
msgid "Permission denied: \"%(path)s\"%(extra)s"
3835
msgstr ""
3836
3837
#: bzrlib/errors.py:581
3838
msgid "Invalid url supplied to transport: \"%(path)s\"%(extra)s"
3839
msgstr ""
3840
3841
#: bzrlib/errors.py:586
3842
msgid "Invalid URL join request: %(reason)s: %(base)r + %(join_args)r"
3843
msgstr ""
3844
3845
#: bzrlib/errors.py:597
3846
msgid "URLs differ by more than path: %(from_)r and %(to)r"
3847
msgstr ""
3848
3849
#: bzrlib/errors.py:619
3850
msgid "The %(type)s hook '%(hook)s' is unknown in this version of bzrlib."
3851
msgstr ""
3852
3853
#: bzrlib/errors.py:629
3854
msgid "Unsupported protocol for url \"%(path)s\"%(extra)s"
3855
msgstr ""
3856
3857
#: bzrlib/errors.py:637
3858
msgid ""
3859
"The branch '%(url)s'(%(format)s) is not a stackable format. You will need to "
3860
"upgrade the branch to permit branch stacking."
3861
msgstr ""
3862
3863
#: bzrlib/errors.py:648
3864
msgid "The branch '%(branch_url)s' cannot be stacked on '%(target_url)s'."
3865
msgstr ""
3866
3867
#: bzrlib/errors.py:658
3868
msgid ""
3869
"The repository '%(url)s'(%(format)s) is not a stackable format. You will "
3870
"need to upgrade the repository to permit branch stacking."
3871
msgstr ""
3872
3873
#: bzrlib/errors.py:669
3874
msgid "Error reading from %(path)r."
3875
msgstr ""
3876
3877
#: bzrlib/errors.py:688
3878
msgid "Path \"%(path)s\" is not a child of path \"%(base)s\"%(extra)s"
3879
msgstr ""
3880
3881
#: bzrlib/errors.py:704
3882
msgid "Path \"%(path)s\" is not unicode normalized"
3883
msgstr ""
3884
3885
#: bzrlib/errors.py:712
3886
msgid "Not a branch: \"%(path)s\"%(detail)s."
3887
msgstr ""
3888
3889
#: bzrlib/errors.py:754
3890
msgid "No submit branch available for branch \"%(path)s\""
3891
msgstr ""
3892
3893
#: bzrlib/errors.py:763
3894
msgid "Already a branch: \"%(path)s\"."
3895
msgstr ""
3896
3897
#: bzrlib/errors.py:769
3898
msgid ""
3899
"Directory contains a branch, but no working tree (use bzr checkout if you "
3900
"wish to build a working tree): \"%(path)s\""
3901
msgstr ""
3902
3903
#: bzrlib/errors.py:774
3904
msgid ""
3905
"\"%(function)s\" called on an AtomicFile after it was closed: \"%(path)s\""
3906
msgstr ""
3907
3908
#: bzrlib/errors.py:784
3909
msgid ""
3910
"Parent not accessible given base \"%(base)s\" and relative path \"%(path)s\""
3911
msgstr ""
3912
3913
#: bzrlib/errors.py:794
3914
msgid "No repository present: \"%(path)s\""
3915
msgstr ""
3916
3917
#: bzrlib/errors.py:802
3918
msgid "File \"%(path)s\" is not in branch %(branch_base)s."
3919
msgstr ""
3920
3921
#: bzrlib/errors.py:814
3922
msgid ""
3923
"Unsupported branch format: %(format)s\n"
3924
"Please run 'bzr upgrade'"
3925
msgstr ""
3926
3927
#: bzrlib/errors.py:820
3928
msgid "Unknown %(kind)s format: %(format)r"
3929
msgstr ""
3930
3931
#: bzrlib/errors.py:829
3932
msgid "Format %(format)s is not compatible with .bzr version %(bzrdir)s."
3933
msgstr ""
3934
3935
#: bzrlib/errors.py:842
3936
msgid ""
3937
"%(target)s\n"
3938
"is not compatible with\n"
3939
"%(source)s\n"
3940
"%(details)s"
3941
msgstr ""
3942
3943
#: bzrlib/errors.py:858
3944
msgid "Revision is not compatible with %(repo_format)s"
3945
msgstr ""
3946
3947
#: bzrlib/errors.py:868
3948
msgid "%(context_info)s%(path)s is already versioned."
3949
msgstr ""
3950
3951
#: bzrlib/errors.py:889
3952
msgid "%(context_info)s%(path)s is not versioned."
3953
msgstr ""
3954
3955
#: bzrlib/errors.py:910
3956
msgid "Path(s) are not versioned: %(paths_as_string)s"
3957
msgstr ""
3958
3959
#: bzrlib/errors.py:921
3960
msgid "Path(s) do not exist: %(paths_as_string)s%(extra)s"
3961
msgstr ""
3962
3963
#: bzrlib/errors.py:940
3964
msgid "Cannot operate on \"%(filename)s\" of unsupported kind \"%(kind)s\""
3965
msgstr ""
3966
3967
#: bzrlib/errors.py:948
3968
msgid ""
3969
"Filename %(filename)r is not valid in your current filesystem encoding "
3970
"%(fs_encoding)s"
3971
msgstr ""
3972
3973
#: bzrlib/errors.py:959
3974
msgid "Cannot operate on \"%(filename)s\" because it is a control file"
3975
msgstr ""
3976
3977
#: bzrlib/errors.py:977
3978
msgid "The lock for '%(lock_description)s' is in use and cannot be broken."
3979
msgstr ""
3980
3981
#: bzrlib/errors.py:1016
3982
msgid "Cannot lock %(lock)s: %(why)s"
3983
msgstr ""
3984
3985
#: bzrlib/errors.py:1026
3986
msgid ""
3987
"A transaction related operation was attempted after the transaction finished."
3988
msgstr ""
3989
3990
#: bzrlib/errors.py:1053
3991
msgid "Cannot lock: transport is read only: %(transport)s"
3992
msgstr ""
3993
3994
#: bzrlib/errors.py:1061
3995
msgid "Could not acquire lock \"%(lock)s\": %(msg)s"
3996
msgstr ""
3997
3998
#: bzrlib/errors.py:1072
3999
msgid "Lock was broken while still open: %(lock)s - check storage consistency!"
4000
msgstr ""
4001
4002
#: bzrlib/errors.py:1083
4003
msgid ""
4004
"Lock was released and re-acquired before being broken: %(lock)s: held by "
4005
"%(holder)r, wanted to break %(target)r"
4006
msgstr ""
4007
4008
#: bzrlib/errors.py:1095
4009
msgid ""
4010
"Lock is apparently held, but corrupted: %(corruption_info)s\n"
4011
"Use 'bzr break-lock' to clear it"
4012
msgstr ""
4013
4014
#: bzrlib/errors.py:1108
4015
msgid "Lock not held: %(lock)s"
4016
msgstr ""
4017
4018
#: bzrlib/errors.py:1137
4019
msgid "No changes to commit"
4020
msgstr ""
4021
4022
#: bzrlib/errors.py:1142
4023
msgid ""
4024
"Selected-file commit of merges is not supported yet: files %(files_str)s"
4025
msgstr ""
4026
4027
#: bzrlib/errors.py:1152
4028
msgid ""
4029
"Excluding paths during commit is not supported by repository at %(repository)"
4030
"r."
4031
msgstr ""
4032
4033
#: bzrlib/errors.py:1161
4034
msgid ""
4035
"The specified commit message contains characters unsupported by the current "
4036
"encoding."
4037
msgstr ""
4038
4039
#: bzrlib/errors.py:1167
4040
msgid "Upgrade URL cannot work with readonly URLs."
4041
msgstr ""
4042
4043
#: bzrlib/errors.py:1172
4044
msgid "The branch format %(format)s is already at the most recent format."
4045
msgstr ""
4046
4047
#: bzrlib/errors.py:1195
4048
msgid "Option --change does not accept revision ranges"
4049
msgstr ""
4050
4051
#: bzrlib/errors.py:1200
4052
msgid "No namespace registered for string: %(spec)r"
4053
msgstr ""
4054
4055
#: bzrlib/errors.py:1219
4056
msgid ""
4057
"Requested revision: '%(spec)s' does not exist in branch: %(branch_url)s"
4058
"%(extra)s"
4059
msgstr ""
4060
4061
#: bzrlib/errors.py:1233
4062
msgid "%(branch)s is missing %(object_type)s {%(object_id)s}"
4063
msgstr ""
4064
4065
#: bzrlib/errors.py:1238
4066
msgid ""
4067
"Operation denied because it would change the main history, which is not "
4068
"permitted by the append_revisions_only setting on branch \"%(location)s\"."
4069
msgstr ""
4070
4071
#: bzrlib/errors.py:1249
4072
msgid ""
4073
"These branches have diverged. Use the missing command to see how.\n"
4074
"Use the merge command to reconcile them."
4075
msgstr ""
4076
4077
#: bzrlib/errors.py:1269
4078
msgid ""
4079
"Branches have no common ancestor, and no merge base revision was specified."
4080
msgstr ""
4081
4082
#: bzrlib/errors.py:1275
4083
msgid ""
4084
"Selected merge cannot perform reverse cherrypicks. Try merge3 or diff3."
4085
msgstr ""
4086
4087
#: bzrlib/errors.py:1281
4088
msgid "Revisions have no common ancestor: %(revision_a)s %(revision_b)s"
4089
msgstr ""
4090
4091
#: bzrlib/errors.py:1290
4092
msgid ""
4093
"Revisions are not derived from the same root: %(revision_a)s %(revision_b)s."
4094
msgstr ""
4095
4096
#: bzrlib/errors.py:1299
4097
msgid "Revision %(rev_id)s is not an ancestor of %(not_ancestor_id)s"
4098
msgstr ""
4099
4100
#: bzrlib/errors.py:1319
4101
msgid "Branch %(branch)s has no commits."
4102
msgstr ""
4103
4104
#: bzrlib/errors.py:1337
4105
msgid ""
4106
"Bound branch %(branch)s is out of date with master branch %(master)s."
4107
"%(extra_help)s"
4108
msgstr ""
4109
4110
#: bzrlib/errors.py:1349
4111
msgid ""
4112
"Cannot commit to branch %(branch)s. It is bound to %(master)s, which is "
4113
"bound to %(remote)s."
4114
msgstr ""
4115
4116
#: bzrlib/errors.py:1361
4117
msgid "Cannot pull --overwrite to a branch which is bound %(branch)s"
4118
msgstr ""
4119
4120
#: bzrlib/errors.py:1370
4121
msgid ""
4122
"Unable to connect to target of bound branch %(branch)s => %(target)s: "
4123
"%(error)s"
4124
msgstr ""
4125
4126
#: bzrlib/errors.py:1382
4127
msgid "Error in processing weave: %(msg)s"
4128
msgstr ""
4129
4130
#: bzrlib/errors.py:1391
4131
msgid "Revision {%(revision_id)s} already present in %(weave)s"
4132
msgstr ""
4133
4134
#: bzrlib/errors.py:1402
4135
msgid "Revision {%(revision_id)s} not present in %(weave)s"
4136
msgstr ""
4137
4138
#: bzrlib/errors.py:1412
4139
msgid "Weave invariant violated: %(what)s"
4140
msgstr ""
4141
4142
#: bzrlib/errors.py:1421
4143
msgid "Parents are mismatched between two revisions. %(msg)s"
4144
msgstr ""
4145
4146
#: bzrlib/errors.py:1443
4147
msgid ""
4148
"Weaves differ on text content. Revision: {%(revision_id)s}, %(weave_a)s, "
4149
"%(weave_b)s"
4150
msgstr ""
4151
4152
#: bzrlib/errors.py:1455
4153
msgid "Versioned file error"
4154
msgstr ""
4155
4156
#: bzrlib/errors.py:1460
4157
msgid "Revision {%(revision_id)s} not present in \"%(file_id)s\"."
4158
msgstr ""
4159
4160
#: bzrlib/errors.py:1470
4161
msgid "Revision {%(revision_id)s} already present in \"%(file_id)s\"."
4162
msgstr ""
4163
4164
#: bzrlib/errors.py:1480
4165
msgid "Text did not match its checksum: %(msg)s"
4166
msgstr ""
4167
4168
#: bzrlib/errors.py:1605
4169
msgid "Export format %(format)r not supported"
4170
msgstr ""
4171
4172
#: bzrlib/errors.py:1614
4173
msgid "Transport error: %(msg)s %(orig_error)s"
4174
msgstr ""
4175
4176
#: bzrlib/errors.py:1640
4177
msgid "Generic bzr smart protocol error: %(details)s"
4178
msgstr ""
4179
4180
#: bzrlib/errors.py:1648
4181
msgid "Received bad protocol version marker: %(marker)r"
4182
msgstr ""
4183
4184
#: bzrlib/errors.py:1679
4185
msgid "Transport operation not possible: %(msg)s %(orig_error)s"
4186
msgstr ""
4187
4188
#: bzrlib/errors.py:1684
4189
msgid "Connection error: %(msg)s %(orig_error)s"
4190
msgstr ""
4191
4192
#: bzrlib/errors.py:1689
4193
msgid "%(msg)s %(host)s%(port)s%(orig_error)s"
4194
msgstr ""
4195
4196
#: bzrlib/errors.py:1710
4197
msgid "Connection closed: %(msg)s %(orig_error)s"
4198
msgstr ""
4199
4200
#: bzrlib/errors.py:1715
4201
msgid "Invalid range access in %(path)s at %(offset)s: %(msg)s"
4202
msgstr ""
4203
4204
#: bzrlib/errors.py:1725
4205
msgid "Invalid http response for %(path)s: %(msg)s%(orig_error)s"
4206
msgstr ""
4207
4208
#: bzrlib/errors.py:1740
4209
msgid "Invalid http range %(range)r for %(path)s: %(msg)s"
4210
msgstr ""
4211
4212
#: bzrlib/errors.py:1754
4213
msgid "HTTP MIME Boundary missing for %(path)s: %(msg)s"
4214
msgstr ""
4215
4216
#: bzrlib/errors.py:1762
4217
msgid "Invalid http Content-type \"%(ctype)s\" for %(path)s: %(msg)s"
4218
msgstr ""
4219
4220
#: bzrlib/errors.py:1771
4221
msgid "%(source)s is%(permanently)s redirected to %(target)s"
4222
msgstr ""
4223
4224
#: bzrlib/errors.py:1785
4225
msgid "Too many redirections"
4226
msgstr ""
4227
4228
#: bzrlib/errors.py:1790
4229
msgid "Working tree has conflicts."
4230
msgstr ""
4231
4232
#: bzrlib/errors.py:1794
4233
msgid "Config file %(filename)s is not UTF-8 encoded\n"
4234
msgstr ""
4235
4236
#: bzrlib/errors.py:1803
4237
msgid ""
4238
"Error(s) parsing config file %(filename)s:\n"
4239
"%(errors)s"
4240
msgstr ""
4241
4242
#: bzrlib/errors.py:1814
4243
msgid "Bad value \"%(value)s\" for option \"%(name)s\"."
4244
msgstr ""
4245
4246
#: bzrlib/errors.py:1822
4247
msgid "%(username)r does not seem to contain a reasonable email address"
4248
msgstr ""
4249
4250
#: bzrlib/errors.py:1831
4251
msgid "Failed to GPG sign data with command \"%(command_line)s\""
4252
msgstr ""
4253
4254
#: bzrlib/errors.py:1839
4255
msgid "Failed to verify GPG signature data with error \"%(error)s\""
4256
msgstr ""
4257
4258
#: bzrlib/errors.py:1847
4259
msgid "Unable to import library \"%(library)s\": %(error)s"
4260
msgstr ""
4261
4262
#: bzrlib/errors.py:1855
4263
msgid "python-gpgme is not installed, it is needed to verify signatures"
4264
msgstr ""
4265
4266
#: bzrlib/errors.py:1863
4267
msgid ""
4268
"The working tree for %(basedir)s has changed since the last commit, but "
4269
"weave merge requires that it be unchanged"
4270
msgstr ""
4271
4272
#: bzrlib/errors.py:1873
4273
msgid ""
4274
"Can't reprocess and show base, because reprocessing obscures the "
4275
"relationship of conflicting lines to the base"
4276
msgstr ""
4277
4278
#: bzrlib/errors.py:1879
4279
msgid "Cycle in graph %(graph)r"
4280
msgstr ""
4281
4282
#: bzrlib/errors.py:1907
4283
msgid "File %(filename)s is not conflicted."
4284
msgstr ""
4285
4286
#: bzrlib/errors.py:1929
4287
msgid "No bundle was found in \"%(filename)s\"."
4288
msgstr ""
4289
4290
#: bzrlib/errors.py:1938
4291
msgid "Unable to handle bundle version %(version)s: %(msg)s"
4292
msgstr ""
4293
4294
#: bzrlib/errors.py:1948
4295
msgid "Branch %(base)s is missing revision %(text_revision)s of %(file_id)s"
4296
msgstr ""
4297
4298
#: bzrlib/errors.py:1961
4299
msgid "File id {%(file_id)s} already exists in inventory as %(entry)s"
4300
msgstr ""
4301
4302
#: bzrlib/errors.py:1971
4303
msgid "Key %(key)s is already present in map"
4304
msgstr ""
4305
4306
#: bzrlib/errors.py:1976
4307
msgid "The prefix %(prefix)s is in the help search path twice."
4308
msgstr ""
4309
4310
#: bzrlib/errors.py:1984
4311
msgid "Tree transform is malformed %(conflicts)r"
4312
msgstr ""
4313
4314
#: bzrlib/errors.py:1986
4315
msgid ""
4316
"No final name for trans_id %(trans_id)r\n"
4317
"file-id: %(file_id)r\n"
4318
"root trans-id: %(root_trans_id)r\n"
4319
msgstr ""
4320
4321
#: bzrlib/errors.py:2018
4322
msgid "Attempt to reuse a transform that has already been applied."
4323
msgstr ""
4324
4325
#: bzrlib/errors.py:2023
4326
msgid "Moving the root directory is not supported at this time"
4327
msgstr ""
4328
4329
#: bzrlib/errors.py:2028
4330
msgid "Failed to rename %(from_path)s to %(to_path)s: %(why)s"
4331
msgstr ""
4332
4333
#: bzrlib/errors.py:2039
4334
msgid ""
4335
"Could not move %(from_path)s%(operator)s %(to_path)s%(_has_extra)s%(extra)s"
4336
msgstr ""
4337
4338
#: bzrlib/errors.py:2075
4339
msgid ""
4340
"Could not rename %(from_path)s%(operator)s %(to_path)s%(_has_extra)s%(extra)s"
4341
msgstr ""
4342
4343
#: bzrlib/errors.py:2084
4344
msgid ""
4345
"Can't safely remove modified or unknown files:\n"
4346
"%(changes_as_text)sUse --keep to not delete them, or --force to delete them "
4347
"regardless."
4348
msgstr ""
4349
4350
#: bzrlib/errors.py:2121
4351
msgid "Unable to import paramiko (required for sftp support): %(error)s"
4352
msgstr ""
4353
4354
#: bzrlib/errors.py:2129
4355
msgid "Nothing to merge."
4356
msgstr ""
4357
4358
#: bzrlib/errors.py:2134
4359
msgid "Format %(format)s cannot be initialised by this version of bzr."
4360
msgstr ""
4361
4362
#: bzrlib/errors.py:2143
4363
msgid ""
4364
"Cannot convert from format %(from_format)s to format %(format)s. "
4365
"%(problem)s"
4366
msgstr ""
4367
4368
#: bzrlib/errors.py:2155
4369
msgid "Could not find an appropriate Differ for file \"%(path)s\""
4370
msgstr ""
4371
4372
#: bzrlib/errors.py:2163
4373
msgid "%(exe_name)s could not be found on this machine"
4374
msgstr ""
4375
4376
#: bzrlib/errors.py:2171
4377
msgid "Diff is not installed on this machine: %(msg)s"
4378
msgstr ""
4379
4380
#: bzrlib/errors.py:2179
4381
msgid "Diff3 is not installed on this machine."
4382
msgstr ""
4383
4384
#: bzrlib/errors.py:2185
4385
msgid "The content being inserted is already present."
4386
msgstr ""
4387
4388
#: bzrlib/errors.py:2190
4389
msgid ""
4390
"This tree contains left-over files from a failed operation.\n"
4391
" Please examine %(limbo_dir)s to see if it contains any files you wish "
4392
"to\n"
4393
" keep, and delete it when you are done."
4394
msgstr ""
4395
4396
#: bzrlib/errors.py:2201
4397
msgid ""
4398
"This tree contains left-over files from a failed operation.\n"
4399
" Please examine %(pending_deletion)s to see if it contains any files you\n"
4400
" wish to keep, and delete it when you are done."
4401
msgstr ""
4402
4403
#: bzrlib/errors.py:2211
4404
msgid ""
4405
"Unable to delete transform temporary directory %(limbo_dir)s.\n"
4406
" Please examine %(limbo_dir)s to see if it contains any files you wish "
4407
"to\n"
4408
" keep, and delete it when you are done."
4409
msgstr ""
4410
4411
#: bzrlib/errors.py:2222
4412
msgid ""
4413
"Unable to delete transform temporary directory %(pending_deletion)s. Please "
4414
"examine %(pending_deletion)s to see if it contains any files you wish to "
4415
"keep, and delete it when you are done."
4416
msgstr ""
4417
4418
#: bzrlib/errors.py:2232
4419
msgid "Working tree is out of date, please run 'bzr update'.%(more)s"
4420
msgstr ""
4421
4422
#: bzrlib/errors.py:2246
4423
msgid "Public branch \"%(public_location)s\" lacks revision \"%(revstring)s\"."
4424
msgstr ""
4425
4426
#: bzrlib/errors.py:2259
4427
msgid "Error in merge modified format"
4428
msgstr ""
4429
4430
#: bzrlib/errors.py:2264
4431
msgid "Format error in conflict listings"
4432
msgstr ""
4433
4434
#: bzrlib/errors.py:2268
4435
msgid ""
4436
"Inconsistency in dirstate file %(dirstate_path)s.\n"
4437
"Error: %(description)s"
4438
msgstr ""
4439
4440
#: bzrlib/errors.py:2279
4441
msgid ""
4442
"An error has been detected in the repository %(repo_path)s.\n"
4443
"Please run bzr reconcile on this repository."
4444
msgstr ""
4445
4446
#: bzrlib/errors.py:2290
4447
msgid ""
4448
"An inconsistent delta was supplied involving %(path)r, %(file_id)r\n"
4449
"reason: %(reason)s"
4450
msgstr ""
4451
4452
#: bzrlib/errors.py:2303
4453
msgid ""
4454
"An inconsistent delta was supplied: %(delta)r\n"
4455
"reason: %(reason)s"
4456
msgstr ""
4457
4458
#: bzrlib/errors.py:2315
4459
msgid "To use this feature you must upgrade your branch at %(path)s."
4460
msgstr ""
4461
4462
#: bzrlib/errors.py:2324
4463
msgid "To use this feature you must upgrade your repository at %(path)s."
4464
msgstr ""
4465
4466
#: bzrlib/errors.py:2329
4467
msgid ""
4468
"To use this feature you must upgrade your branch at %(path)s to a format "
4469
"which supports rich roots."
4470
msgstr ""
4471
4472
#: bzrlib/errors.py:2335
4473
msgid "Cannot perform local-only commits on unbound branches."
4474
msgstr ""
4475
4476
#: bzrlib/errors.py:2340
4477
msgid "The method %(mname)s is not supported on objects of type %(tname)s."
4478
msgstr ""
4479
4480
#: bzrlib/errors.py:2361
4481
msgid "Ghost tags not supported by format %(format)r."
4482
msgstr ""
4483
4484
#: bzrlib/errors.py:2369
4485
msgid "File is binary but should be text."
4486
msgstr ""
4487
4488
#: bzrlib/errors.py:2374
4489
msgid "The path %(path)s is not permitted on this platform"
4490
msgstr ""
4491
4492
#: bzrlib/errors.py:2383
4493
msgid ""
4494
"Testament did not match expected value.\n"
4495
" For revision_id {%(revision_id)s}, expected {%(expected)s}, measured\n"
4496
" {%(measured)s}"
4497
msgstr ""
4498
4499
#: bzrlib/errors.py:2395
4500
msgid "Not a bzr revision-bundle: %(text)r"
4501
msgstr ""
4502
4503
#: bzrlib/errors.py:2404
4504
msgid "Bad bzr revision-bundle: %(text)r"
4505
msgstr ""
4506
4507
#: bzrlib/errors.py:2413
4508
msgid "Malformed bzr revision-bundle header: %(text)r"
4509
msgstr ""
4510
4511
#: bzrlib/errors.py:2418
4512
msgid "Malformed patches in bzr revision-bundle: %(text)r"
4513
msgstr ""
4514
4515
#: bzrlib/errors.py:2423
4516
msgid "Malformed footer in bzr revision-bundle: %(text)r"
4517
msgstr ""
4518
4519
#: bzrlib/errors.py:2428
4520
msgid "End of line marker was not \\n in bzr revision-bundle"
4521
msgstr ""
4522
4523
#: bzrlib/errors.py:2438
4524
msgid "Bundle format %(bundle_format)s is incompatible with %(other)s"
4525
msgstr ""
4526
4527
#: bzrlib/errors.py:2448
4528
msgid "Root class for inventory serialization errors"
4529
msgstr ""
4530
4531
#: bzrlib/errors.py:2452
4532
msgid ""
4533
"The inventory was not in the expected format:\n"
4534
" %(msg)s"
4535
msgstr ""
4536
4537
#: bzrlib/errors.py:2461
4538
msgid "This operation requires rich root data storage"
4539
msgstr ""
4540
4541
#: bzrlib/errors.py:2474
4542
msgid "Unrecognised value for BZR_SSH environment variable: %(vendor)s"
4543
msgstr ""
4544
4545
#: bzrlib/errors.py:2483
4546
msgid ""
4547
"Don't know how to handle SSH connections. Please set BZR_SSH environment "
4548
"variable."
4549
msgstr ""
4550
4551
#: bzrlib/errors.py:2490
4552
msgid ""
4553
"Could not determine revno for {%(revision_id)s} because its ancestry shows a "
4554
"ghost at {%(ghost_revision_id)s}"
4555
msgstr ""
4556
4557
#: bzrlib/errors.py:2500
4558
msgid "Ghost revision {%(revision_id)s} cannot be used here."
4559
msgstr ""
4560
4561
#: bzrlib/errors.py:2551
4562
msgid ""
4563
"A merge directive must provide either a bundle or a public branch location."
4564
msgstr ""
4565
4566
#: bzrlib/errors.py:2558
4567
msgid "Bad merge directive payload %(start)r"
4568
msgstr ""
4569
4570
#: bzrlib/errors.py:2568
4571
msgid "Preview patch does not match requested changes."
4572
msgstr ""
4573
4574
#: bzrlib/errors.py:2574
4575
msgid "Patch_type was %(patch_type)s, but no patch was supplied."
4576
msgstr ""
4577
4578
#: bzrlib/errors.py:2584
4579
msgid ""
4580
"Your branch does not have all of the revisions required in order to merge "
4581
"this merge directive and the target location specified in the merge "
4582
"directive is not a branch: %(location)s."
4583
msgstr ""
4584
4585
#: bzrlib/errors.py:2596
4586
msgid "Unsupported entry kind %(kind)s"
4587
msgstr ""
4588
4589
#: bzrlib/errors.py:2604
4590
msgid "Can't subsume %(other_tree)s into %(tree)s. %(reason)s"
4591
msgstr ""
4592
4593
#: bzrlib/errors.py:2614
4594
msgid "Subsume target %(other_tree)s needs to be upgraded."
4595
msgstr ""
4596
4597
#: bzrlib/errors.py:2633
4598
msgid "No such tag: %(tag_name)s"
4599
msgstr ""
4600
4601
#: bzrlib/errors.py:2641
4602
msgid "Tags not supported by %(branch)s; you may be able to use bzr upgrade."
4603
msgstr ""
4604
4605
#: bzrlib/errors.py:2650
4606
msgid "Tag %(tag_name)s already exists."
4607
msgstr ""
4608
4609
#: bzrlib/errors.py:2658
4610
msgid ""
4611
"Did not understand bug identifier %(bug_id)s: %(reason)s. See \"bzr help bugs"
4612
"\" for more information on this feature."
4613
msgstr ""
4614
4615
#: bzrlib/errors.py:2668
4616
msgid ""
4617
"The URL for bug tracker \"%(abbreviation)s\" doesn't contain {id}: %(url)s"
4618
msgstr ""
4619
4620
#: bzrlib/errors.py:2678
4621
msgid ""
4622
"Cannot find registered bug tracker called %(abbreviation)s on %(branch)s"
4623
msgstr ""
4624
4625
#: bzrlib/errors.py:2688
4626
msgid "Invalid line in bugs property: '%(line)s'"
4627
msgstr ""
4628
4629
#: bzrlib/errors.py:2696
4630
msgid "Invalid bug status: '%(status)s'"
4631
msgstr ""
4632
4633
#: bzrlib/errors.py:2704
4634
msgid "Could not understand response from smart server: %(response_tuple)r"
4635
msgstr ""
4636
4637
#: bzrlib/errors.py:2743
4638
msgid "Server sent an unexpected error: %(error_tuple)r"
4639
msgstr ""
4640
4641
#: bzrlib/errors.py:2762
4642
msgid "Unrecognised container format: %(container_format)r"
4643
msgstr ""
4644
4645
#: bzrlib/errors.py:2770
4646
msgid "Unexpected end of container stream"
4647
msgstr ""
4648
4649
#: bzrlib/errors.py:2775
4650
msgid "Unknown record type: %(record_type)r"
4651
msgstr ""
4652
4653
#: bzrlib/errors.py:2783
4654
msgid "Invalid record: %(reason)s"
4655
msgstr ""
4656
4657
#: bzrlib/errors.py:2791
4658
msgid "Container has data after end marker: %(excess)r"
4659
msgstr ""
4660
4661
#: bzrlib/errors.py:2799
4662
msgid "Container has multiple records with the same name: %(name)s"
4663
msgstr ""
4664
4665
#: bzrlib/errors.py:2812
4666
msgid "Corrupt or incompatible data stream: %(reason)s"
4667
msgstr ""
4668
4669
#: bzrlib/errors.py:2820
4670
msgid "SMTP error: %(error)s"
4671
msgstr ""
4672
4673
#: bzrlib/errors.py:2828
4674
msgid "No message supplied."
4675
msgstr ""
4676
4677
#: bzrlib/errors.py:2833
4678
msgid "No mail-to address (--mail-to) or output (-o) specified."
4679
msgstr ""
4680
4681
#: bzrlib/errors.py:2838
4682
msgid "Unknown mail client: %(mail_client)s"
4683
msgstr ""
4684
4685
#: bzrlib/errors.py:2846
4686
msgid ""
4687
"Unable to find mail client with the following names: "
4688
"%(mail_command_list_string)s"
4689
msgstr ""
4690
4691
#: bzrlib/errors.py:2856
4692
msgid "SMTP connection to %(host)s refused"
4693
msgstr ""
4694
4695
#: bzrlib/errors.py:2865
4696
msgid "Please specify smtp_server. No server at default %(host)s."
4697
msgstr ""
4698
4699
#: bzrlib/errors.py:2879
4700
msgid ""
4701
"'%(display_url)s' is not in sync with %(target_url)s. See bzr help sync-for-"
4702
"reconfigure."
4703
msgstr ""
4704
4705
#: bzrlib/errors.py:2891
4706
msgid "'%(display_url)s' is already a branch."
4707
msgstr ""
4708
4709
#: bzrlib/errors.py:2896
4710
msgid "'%(display_url)s' is already a tree."
4711
msgstr ""
4712
4713
#: bzrlib/errors.py:2901
4714
msgid "'%(display_url)s' is already a checkout."
4715
msgstr ""
4716
4717
#: bzrlib/errors.py:2906
4718
msgid "'%(display_url)s' is already a lightweight checkout."
4719
msgstr ""
4720
4721
#: bzrlib/errors.py:2911
4722
msgid "'%(display_url)s' is already using a shared repository."
4723
msgstr ""
4724
4725
#: bzrlib/errors.py:2916
4726
msgid "'%(display_url)s' is already standalone."
4727
msgstr ""
4728
4729
#: bzrlib/errors.py:2921
4730
msgid "Shared repository '%(display_url)s' already creates working trees."
4731
msgstr ""
4732
4733
#: bzrlib/errors.py:2927
4734
msgid ""
4735
"Shared repository '%(display_url)s' already doesn't create working trees."
4736
msgstr ""
4737
4738
#: bzrlib/errors.py:2933
4739
msgid "Requested reconfiguration of '%(display_url)s' is not supported."
4740
msgstr ""
4741
4742
#: bzrlib/errors.py:2938
4743
msgid "No location could be found to bind to at %(display_url)s."
4744
msgstr ""
4745
4746
#: bzrlib/errors.py:2943
4747
msgid ""
4748
"Working tree \"%(display_url)s\" has uncommitted changes (See bzr status)."
4749
"%(more)s"
4750
msgstr ""
4751
4752
#: bzrlib/errors.py:2962
4753
msgid ""
4754
"Working tree \"%(display_url)s\" has shelved changes (See bzr shelve --list)."
4755
"%(more)s"
4756
msgstr ""
4757
4758
#: bzrlib/errors.py:2968
4759
msgid "Variable {%(name)s} is not available."
4760
msgstr ""
4761
4762
#: bzrlib/errors.py:2976
4763
msgid "No template specified."
4764
msgstr ""
4765
4766
#: bzrlib/errors.py:2981
4767
msgid "Unable to create symlink %(path_str)son this platform"
4768
msgstr ""
4769
4770
#: bzrlib/errors.py:2996
4771
msgid ""
4772
"Unsupported timezone format \"%(timezone)s\", options are \"utc\", \"original"
4773
"\", \"local\"."
4774
msgstr ""
4775
4776
#: bzrlib/errors.py:3030
4777
msgid ""
4778
"Unable to encode %(kind)s path %(path)r in user encoding %(user_encoding)s"
4779
msgstr ""
4780
4781
#: bzrlib/errors.py:3042
4782
msgid "The \"%(config_id)s\" configuration does not exist."
4783
msgstr ""
4784
4785
#: bzrlib/errors.py:3050
4786
msgid "The \"%(option_name)s\" configuration option does not exist."
4787
msgstr ""
4788
4789
#: bzrlib/errors.py:3058
4790
msgid "The alias \"%(alias_name)s\" does not exist."
4791
msgstr ""
4792
4793
#: bzrlib/errors.py:3072
4794
msgid "\"%(alias_name)s\" is not a valid location alias."
4795
msgstr ""
4796
4797
#: bzrlib/errors.py:3080
4798
msgid "No %(alias_name)s location assigned."
4799
msgstr ""
4800
4801
#: bzrlib/errors.py:3088
4802
msgid "Cannot bind address \"%(host)s:%(port)i\": %(orig_error)s."
4803
msgstr ""
4804
4805
#: bzrlib/errors.py:3098
4806
msgid "Unknown rules detected: %(unknowns_str)s."
4807
msgstr ""
4808
4809
#: bzrlib/errors.py:3111
4810
msgid ""
4811
"Hook '%(hook_name)s' during %(hook_stage)s failed:\n"
4812
"%(traceback_text)s%(exc_value)s"
4813
msgstr ""
4814
4815
#: bzrlib/errors.py:3134
4816
msgid "Tip change rejected: %(msg)s"
4817
msgstr ""
4818
4819
#: bzrlib/errors.py:3142
4820
msgid "Shelf corrupt."
4821
msgstr ""
4822
4823
#: bzrlib/errors.py:3147
4824
msgid "Corruption while decompressing repository file%(orig_error)s"
4825
msgstr ""
4826
4827
#: bzrlib/errors.py:3159
4828
msgid "No changes are shelved with id \"%(shelf_id)d\"."
4829
msgstr ""
4830
4831
#: bzrlib/errors.py:3167
4832
msgid "\"%(invalid_id)s\" is not a valid shelf id, try a number instead."
4833
msgstr ""
4834
4835
#: bzrlib/errors.py:3175
4836
msgid "An attempt to access a url outside the server jail was made: '%(url)s'."
4837
msgstr ""
4838
4839
#: bzrlib/errors.py:3183
4840
msgid "The user aborted the operation."
4841
msgstr ""
4842
4843
#: bzrlib/errors.py:3188
4844
msgid "Branching '%(url)s'(%(format)s) must create a working tree."
4845
msgstr ""
4846
4847
#: bzrlib/errors.py:3198
4848
msgid "No such view: %(view_name)s."
4849
msgstr ""
4850
4851
#: bzrlib/errors.py:3208
4852
msgid ""
4853
"Views are not supported by %(tree)s; use 'bzr upgrade' to change your tree "
4854
"to a later format."
4855
msgstr ""
4856
4857
#: bzrlib/errors.py:3217
4858
msgid ""
4859
"Specified file \"%(file_name)s\" is outside the current view: %(view_str)s"
4860
msgstr ""
4861
4862
#: bzrlib/errors.py:3284
4863
msgid "%(bzrdir)r does not support co-located branches."
4864
msgstr ""
4865
4866
#: bzrlib/errors.py:3290
4867
msgid ""
4868
"Unable to determine your name.\n"
4869
"Please, set your name with the 'whoami' command.\n"
4870
"E.g. bzr whoami \"Your Name <name@example.com>\""
4871
msgstr ""
4872
4873
#: bzrlib/errors.py:3299
4874
msgid "Invalid pattern(s) found. %(msg)s"
4875
msgstr ""
4876
4877
#: bzrlib/errors.py:3307
4878
msgid ""
4879
"Branch \"%(branch_url)s\" appears to be bound to itself. Please use `bzr "
4880
"unbind` to fix."
4881
msgstr ""
4882
4883
#: bzrlib/errors.py:3318
4884
msgid "Loop involving %(refs)r while expanding \"%(string)s\"."
4885
msgstr ""
4886
4887
#: bzrlib/errors.py:3327
4888
msgid "Option %(name)s is not defined while expanding \"%(string)s\"."
4889
msgstr ""
4890
4891
#: bzrlib/errors.py:3336
4892
msgid ""
4893
"No compatible object available for operations from %(source)r to %(target)r."
4894
msgstr ""
4895
4896
#: bzrlib/errors.py:3346
4897
msgid ""
4898
"VFS requests over the smart server are not allowed. Encountered: %(method)s, "
4899
"%(arguments)s."
4900
msgstr ""
4901
4902
#: bzrlib/gpg.py:126 bzrlib/gpg.py:464
4903
msgid "{0} commits with valid signatures"
4904
msgstr ""
4905
4906
#: bzrlib/gpg.py:130 bzrlib/gpg.py:469
4907
msgid "{0} commit with unknown key"
4908
msgid_plural "{0} commits with unknown keys"
4909
msgstr[0] ""
4910
msgstr[1] ""
4911
4912
#: bzrlib/gpg.py:136 bzrlib/gpg.py:476
4913
msgid "{0} commit not valid"
4914
msgid_plural "{0} commits not valid"
4915
msgstr[0] ""
4916
msgstr[1] ""
4917
4918
#: bzrlib/gpg.py:142 bzrlib/gpg.py:483
4919
msgid "{0} commit not signed"
4920
msgid_plural "{0} commits not signed"
4921
msgstr[0] ""
4922
msgstr[1] ""
4923
4924
#: bzrlib/gpg.py:148 bzrlib/gpg.py:490
4925
msgid "{0} commit with key now expired"
4926
msgid_plural "{0} commits with key now expired"
4927
msgstr[0] ""
4928
msgstr[1] ""
4929
4930
#: bzrlib/gpg.py:346
4931
msgid "No GnuPG key results for pattern: {}"
4932
msgstr ""
4933
4934
#: bzrlib/gpg.py:389
4935
msgid "{0} signed {1} commit"
4936
msgid_plural "{0} signed {1} commits"
4937
msgstr[0] ""
4938
msgstr[1] ""
4939
4940
#: bzrlib/gpg.py:406 bzrlib/gpg.py:422
4941
msgid "{0} commit by author {1}"
4942
msgid_plural "{0} commits by author {1}"
4943
msgstr[0] ""
4944
msgstr[1] ""
4945
4946
#: bzrlib/gpg.py:436
4947
msgid "Unknown key {0} signed {1} commit"
4948
msgid_plural "Unknown key {0} signed {1} commits"
4949
msgstr[0] ""
4950
msgstr[1] ""
4951
4952
#: bzrlib/gpg.py:454
4953
msgid "{0} commit by author {1} with key {2} now expired"
4954
msgid_plural "{0} commits by author {1} with key {2} now expired"
4955
msgstr[0] ""
4956
msgstr[1] ""
4957
4958
# help of 'help' option
4959
#: bzrlib/option.py:515
4960
msgid "Show help message."
4961
msgstr ""
4962
4963
# help of 'usage' option
4964
#: bzrlib/option.py:517
4965
msgid "Show usage message and options."
4966
msgstr ""
4967
4968
# help of 'verbose' option
4969
#: bzrlib/option.py:519
4970
msgid "Display more information."
4971
msgstr ""
4972
4973
# help of 'quiet' option
4974
#: bzrlib/option.py:522
4975
msgid "Only display errors and warnings."
4976
msgstr ""
4977
4978
# help of 'overwrite' option
4979
#: bzrlib/option.py:527
4980
msgid "Ignore differences between branches and overwrite unconditionally."
4981
msgstr ""
4982
4983
# help of 'message' option
4984
#: bzrlib/option.py:538
4985
msgid "Message string."
4986
msgstr ""
4987
4988
# help of 'null' option
4989
#: bzrlib/option.py:541
4990
msgid "Use an ASCII NUL (\\0) separator rather than a newline."
4991
msgstr ""
4992
4993
# help of 'profile' option
4994
#: bzrlib/option.py:544
4995
msgid "Show performance profiling information."
4996
msgstr ""
4997
4998
# help of 'revision' option
4999
#: bzrlib/option.py:548
5000
msgid "See \"help revisionspec\" for details."
5001
msgstr ""
5002
5003
# help of 'change' option
5004
#: bzrlib/option.py:553
5005
msgid ""
5006
"Select changes introduced by the specified revision. See also \"help "
5007
"revisionspec\"."
5008
msgstr ""
5009
5010
# help of 'show-ids' option
5011
#: bzrlib/option.py:555
5012
msgid "Show internal object ids."
5013
msgstr ""
5014
5015
# help of 'timezone' option
5016
#: bzrlib/option.py:558
5017
msgid "Display timezone as local, original, or utc."
5018
msgstr ""
5019
5020
# help of 'log-format' option
5021
#: bzrlib/option.py:563
5022
msgid "Use specified log format."
5023
msgstr ""
5024
5025
# title of 'log-format' option
5026
#: bzrlib/option.py:565
5027
msgid "Log format"
5028
msgstr ""
5029
5030
# help of 'long' option
5031
#: bzrlib/option.py:567
5032
msgid "Use detailed log format. Same as --log-format long"
5033
msgstr ""
5034
5035
# help of 'short' option
5036
#: bzrlib/option.py:569
5037
msgid "Use moderately short log format. Same as --log-format short"
5038
msgstr ""
5039
5040
# help of 'line' option
5041
#: bzrlib/option.py:570
5042
msgid "Use log format with one line per revision. Same as --log-format line"
5043
msgstr ""
5044
5045
# help of 'merge-type' option
5046
#: bzrlib/option.py:573
5047
msgid "Select a particular merge algorithm."
5048
msgstr ""
5049
5050
# title of 'merge-type' option
5051
#: bzrlib/option.py:575
5052
msgid "Merge algorithm"
5053
msgstr ""
5054
5055
# help of 'remember' option
5056
#: bzrlib/option.py:577
5057
msgid "Remember the specified location as a default."
5058
msgstr ""
5059
5060
# help of 'reprocess' option
5061
#: bzrlib/option.py:579
5062
msgid "Reprocess to reduce spurious conflicts."
5063
msgstr ""
5064
5065
# help of 'dry-run' option
5066
#: bzrlib/option.py:582
5067
msgid "Show what would be done, but don't actually do anything."
5068
msgstr ""
5069
5070
# help of 'name-from-revision' option
5071
#: bzrlib/option.py:583
5072
msgid "The path name in the old tree."
5073
msgstr ""
5074
5075
# help of 'directory' option
5076
#: bzrlib/option.py:585
5077
msgid "Branch to operate on, instead of working directory"
5078
msgstr ""
5079
5080
# help of 'plugin' option of 'bash-completion' command
5081
#: bzrlib/plugins/bash_completion/bashcomp.py:407
5082
msgid "Enable completions for the selected plugin (default: all plugins)"
5083
msgstr ""
5084
5085
#: bzrlib/plugins/bash_completion/bashcomp.py:409
5086
msgid "Generate a shell function for bash command line completion."
5087
msgstr ""
5088
5089
#: bzrlib/plugins/bash_completion/bashcomp.py:411
5090
msgid ""
5091
"This command generates a shell function which can be used by bash to\n"
5092
"automatically complete the currently typed command when the user presses\n"
5093
"the completion key (usually tab)."
5094
msgstr ""
5095
5096
#: bzrlib/plugins/bash_completion/bashcomp.py:415
5097
msgid ""
5098
"Commonly used like this:\n"
5099
" eval \"`bzr bash-completion`\""
5100
msgstr ""
5101
5102
# help of 'function-name' option of 'bash-completion' command
5103
#: bzrlib/plugins/bash_completion/bashcomp.py:421
5104
msgid "Name of the generated function (default: _bzr)"
5105
msgstr ""
5106
5107
# help of 'function-only' option of 'bash-completion' command
5108
#: bzrlib/plugins/bash_completion/bashcomp.py:423
5109
msgid "Generate only the shell function, don't enable it"
5110
msgstr ""
5111
5112
#: bzrlib/plugins/launchpad/__init__.py:78
5113
msgid "Register a branch with launchpad.net."
5114
msgstr ""
5115
5116
#: bzrlib/plugins/launchpad/__init__.py:80
5117
msgid ""
5118
"This command lists a bzr branch in the directory of branches on\n"
5119
"launchpad.net. Registration allows the branch to be associated with\n"
5120
"bugs or specifications."
5121
msgstr ""
5122
5123
#: bzrlib/plugins/launchpad/__init__.py:84
5124
msgid ""
5125
"Before using this command you must register the project to which the\n"
5126
"branch belongs, and create an account for yourself on launchpad.net."
5127
msgstr ""
5128
5129
#: bzrlib/plugins/launchpad/__init__.py:87
5130
msgid ""
5131
"arguments:\n"
5132
" public_url: The publicly visible url for the branch to register.\n"
5133
" This must be an http or https url (which Launchpad can read\n"
5134
" from to access the branch). Local file urls, SFTP urls, and\n"
5135
" bzr+ssh urls will not work.\n"
5136
" If no public_url is provided, bzr will use the configured\n"
5137
" public_url if there is one for the current branch, and\n"
5138
" otherwise error."
5139
msgstr ""
5140
5141
#: bzrlib/plugins/launchpad/__init__.py:96
5142
msgid ""
5143
"example:\n"
5144
" bzr register-branch http://foo.com/bzr/fooproject.mine \\\n"
5145
" --project fooproject"
5146
msgstr ""
5147
5148
# help of 'project' option of 'register-branch' command
5149
#: bzrlib/plugins/launchpad/__init__.py:103
5150
msgid "Launchpad project short name to associate with the branch."
5151
msgstr ""
5152
5153
# help of 'branch-name' option of 'register-branch' command
5154
#: bzrlib/plugins/launchpad/__init__.py:110
5155
msgid ""
5156
"Short name for the branch; by default taken from the last component of the "
5157
"url."
5158
msgstr ""
5159
5160
# help of 'branch-title' option of 'register-branch' command
5161
#: bzrlib/plugins/launchpad/__init__.py:114
5162
msgid "One-sentence description of the branch."
5163
msgstr ""
5164
5165
# help of 'branch-description' option of 'register-branch' command
5166
#: bzrlib/plugins/launchpad/__init__.py:117
5167
msgid "Longer description of the purpose or contents of the branch."
5168
msgstr ""
5169
5170
# help of 'author' option of 'register-branch' command
5171
#: bzrlib/plugins/launchpad/__init__.py:120
5172
msgid "Branch author's email address, if not yourself."
5173
msgstr ""
5174
5175
# help of 'link-bug' option of 'register-branch' command
5176
#: bzrlib/plugins/launchpad/__init__.py:123
5177
msgid "The bug this branch fixes."
5178
msgstr ""
5179
5180
# help of 'dry-run' option of 'register-branch' command
5181
#: bzrlib/plugins/launchpad/__init__.py:126
5182
msgid "Prepare the request but don't actually send it."
5183
msgstr ""
5184
5185
#: bzrlib/plugins/launchpad/__init__.py:186
5186
msgid "Open a Launchpad branch page in your web browser."
5187
msgstr ""
5188
5189
# help of 'dry-run' option of 'launchpad-open' command
5190
#: bzrlib/plugins/launchpad/__init__.py:191
5191
msgid "Do not actually open the browser. Just say the URL we would use."
5192
msgstr ""
5193
5194
#: bzrlib/plugins/launchpad/__init__.py:236
5195
msgid "Show or set the Launchpad user ID."
5196
msgstr ""
5197
5198
#: bzrlib/plugins/launchpad/__init__.py:238
5199
msgid ""
5200
"When communicating with Launchpad, some commands need to know your\n"
5201
"Launchpad user ID. This command can be used to set or show the\n"
5202
"user ID that Bazaar will use for such communication."
5203
msgstr ""
5204
5205
#: bzrlib/plugins/launchpad/__init__.py:242
5206
msgid ""
5207
":Examples:\n"
5208
" Show the Launchpad ID of the current user::"
5209
msgstr ""
5210
5211
#: bzrlib/plugins/launchpad/__init__.py:245
5212
msgid " bzr launchpad-login"
5213
msgstr ""
5214
5215
#: bzrlib/plugins/launchpad/__init__.py:247
5216
msgid " Set the Launchpad ID of the current user to 'bob'::"
5217
msgstr ""
5218
5219
#: bzrlib/plugins/launchpad/__init__.py:249
5220
msgid " bzr launchpad-login bob"
5221
msgstr ""
5222
5223
# help of 'no-check' option of 'launchpad-login' command
5224
#: bzrlib/plugins/launchpad/__init__.py:256
5225
msgid "Don't check that the user name is valid."
5226
msgstr ""
5227
5228
#: bzrlib/plugins/launchpad/__init__.py:292
5229
msgid "Ask Launchpad to mirror a branch now."
5230
msgstr ""
5231
5232
#: bzrlib/plugins/launchpad/__init__.py:312
5233
msgid "Propose merging a branch on Launchpad."
5234
msgstr ""
5235
5236
#: bzrlib/plugins/launchpad/__init__.py:314
5237
msgid ""
5238
"This will open your usual editor to provide the initial comment. When it\n"
5239
"has created the proposal, it will open it in your default web browser."
5240
msgstr ""
5241
5242
#: bzrlib/plugins/launchpad/__init__.py:317
5243
msgid ""
5244
"The branch will be proposed to merge into SUBMIT_BRANCH. If SUBMIT_BRANCH\n"
5245
"is not supplied, the remembered submit branch will be used. If no submit\n"
5246
"branch is remembered, the development focus will be used."
5247
msgstr ""
5248
5249
#: bzrlib/plugins/launchpad/__init__.py:321
5250
msgid ""
5251
"By default, the SUBMIT_BRANCH's review team will be requested to review\n"
5252
"the merge proposal. This can be overriden by specifying --review (-R).\n"
5253
"The parameter the launchpad account name of the desired reviewer. This\n"
5254
"may optionally be followed by '=' and the review type. For example:"
5255
msgstr ""
5256
5257
#: bzrlib/plugins/launchpad/__init__.py:326
5258
msgid " bzr lp-propose-merge --review jrandom --review review-team=qa"
5259
msgstr ""
5260
5261
#: bzrlib/plugins/launchpad/__init__.py:328
5262
msgid ""
5263
"This will propose a merge, request \"jrandom\" to perform a review of\n"
5264
"unspecified type, and request \"review-team\" to perform a \"qa\" review."
5265
msgstr ""
5266
5267
# help of 'staging' option of 'lp-propose-merge' command
5268
#: bzrlib/plugins/launchpad/__init__.py:333
5269
msgid "Propose the merge on staging."
5270
msgstr ""
5271
5272
# help of 'message' option of 'lp-propose-merge' command
5273
#: bzrlib/plugins/launchpad/__init__.py:335
5274
msgid "Commit message."
5275
msgstr ""
5276
5277
# help of 'approve' option of 'lp-propose-merge' command
5278
#: bzrlib/plugins/launchpad/__init__.py:337
5279
msgid "Mark the proposal as approved immediately."
5280
msgstr ""
5281
5282
# help of 'review' option of 'lp-propose-merge' command
5283
#: bzrlib/plugins/launchpad/__init__.py:339
5284
msgid "Requested reviewer and optional type."
5285
msgstr ""
5286
5287
#: bzrlib/plugins/launchpad/__init__.py:376
5288
msgid "Find the proposal to merge this revision."
5289
msgstr ""
5290
5291
#: bzrlib/plugins/launchpad/__init__.py:378
5292
msgid ""
5293
"Finds the merge proposal(s) that discussed landing the specified revision.\n"
5294
"This works only if the selected branch was the merge proposal target, and\n"
5295
"if the merged_revno is recorded for the merge proposal. The proposal(s)\n"
5296
"are opened in a web browser."
5297
msgstr ""
5298
5299
#: bzrlib/plugins/launchpad/__init__.py:383
5300
msgid ""
5301
"Any revision involved in the merge may be specified-- the revision in\n"
5302
"which the merge was performed, or one of the revisions that was merged."
5303
msgstr ""
5304
5305
#: bzrlib/plugins/launchpad/__init__.py:386
5306
msgid "So, to find the merge proposal that reviewed line 1 of README::"
5307
msgstr ""
5308
5309
#: bzrlib/plugins/launchpad/__init__.py:388
5310
msgid " bzr lp-find-proposal -r annotate:README:1"
5311
msgstr ""
5312
5313
#: dummy/help_topics/authentication/summary.txt:1
5314
msgid "Information on configuring authentication"
5315
msgstr ""
5316
5317
#: dummy/help_topics/basic/detail.txt:1
5318
msgid ""
5319
"Bazaar 2.5.0dev1 -- a free distributed version-control tool\n"
5320
"http://bazaar.canonical.com/"
5321
msgstr ""
5322
5323
#: dummy/help_topics/basic/detail.txt:4
5324
msgid ""
5325
"Basic commands:\n"
5326
" bzr init makes this directory a versioned branch\n"
5327
" bzr branch make a copy of another branch"
5328
msgstr ""
5329
5330
#: dummy/help_topics/basic/detail.txt:8
5331
msgid ""
5332
" bzr add make files or directories versioned\n"
5333
" bzr ignore ignore a file or pattern\n"
5334
" bzr mv move or rename a versioned file"
5335
msgstr ""
5336
5337
#: dummy/help_topics/basic/detail.txt:12
5338
msgid ""
5339
" bzr status summarize changes in working copy\n"
5340
" bzr diff show detailed diffs"
5341
msgstr ""
5342
5343
#: dummy/help_topics/basic/detail.txt:15
5344
msgid ""
5345
" bzr merge pull in changes from another branch\n"
5346
" bzr commit save some or all changes\n"
5347
" bzr send send changes via email"
5348
msgstr ""
5349
5350
#: dummy/help_topics/basic/detail.txt:19
5351
msgid ""
5352
" bzr log show history of changes\n"
5353
" bzr check validate storage"
5354
msgstr ""
5355
5356
#: dummy/help_topics/basic/detail.txt:22
5357
msgid ""
5358
" bzr help init more help on e.g. init command\n"
5359
" bzr help commands list all commands\n"
5360
" bzr help topics list all help topics\n"
5361
msgstr ""
5362
5363
#: dummy/help_topics/basic/summary.txt:1
5364
msgid "Basic commands"
5365
msgstr ""
5366
5367
#: dummy/help_topics/branches/detail.txt:1
5368
msgid "Branches"
5369
msgstr ""
5370
5371
#: dummy/help_topics/branches/detail.txt:3
5372
msgid ""
5373
"A branch consists of the state of a project, including all of its\n"
5374
"history. All branches have a repository associated (which is where the\n"
5375
"branch history is stored), but multiple branches may share the same\n"
5376
"repository (a shared repository). Branches can be copied and merged."
5377
msgstr ""
5378
5379
#: dummy/help_topics/branches/detail.txt:8
5380
msgid ""
5381
"In addition, one branch may be bound to another one. Binding to another\n"
5382
"branch indicates that commits which happen in this branch must also \n"
5383
"happen in the other branch. Bazaar ensures consistency by not allowing \n"
5384
"commits when the two branches are out of date. In order for a commit \n"
5385
"to succeed, it may be necessary to update the current branch using \n"
5386
"``bzr update``."
5387
msgstr ""
5388
5389
#: dummy/help_topics/branches/detail.txt:15
5390
msgid "Related commands::"
5391
msgstr ""
5392
5393
#: dummy/help_topics/branches/detail.txt:17
5394
msgid ""
5395
" init Change a directory into a versioned branch.\n"
5396
" branch Create a new branch that is a copy of an existing branch.\n"
5397
" merge Perform a three-way merge.\n"
5398
" bind Bind a branch to another one.\n"
5399
msgstr ""
5400
5401
#: dummy/help_topics/branches/summary.txt:1
5402
msgid "Information on what a branch is"
5403
msgstr ""
5404
5405
#: dummy/help_topics/bugs/summary.txt:1
5406
msgid "Bug tracker settings"
5407
msgstr ""
5408
5409
#: dummy/help_topics/checkouts/detail.txt:1
5410
msgid "Checkouts"
5411
msgstr ""
5412
5413
#: dummy/help_topics/checkouts/detail.txt:3
5414
msgid ""
5415
"Checkouts are source trees that are connected to a branch, so that when\n"
5416
"you commit in the source tree, the commit goes into that branch. They\n"
5417
"allow you to use a simpler, more centralized workflow, ignoring some of\n"
5418
"Bazaar's decentralized features until you want them. Using checkouts\n"
5419
"with shared repositories is very similar to working with SVN or CVS, but\n"
5420
"doesn't have the same restrictions. And using checkouts still allows\n"
5421
"others working on the project to use whatever workflow they like."
5422
msgstr ""
5423
5424
#: dummy/help_topics/checkouts/detail.txt:11
5425
msgid ""
5426
"A checkout is created with the bzr checkout command (see \"help checkout"
5427
"\").\n"
5428
"You pass it a reference to another branch, and it will create a local copy\n"
5429
"for you that still contains a reference to the branch you created the\n"
5430
"checkout from (the master branch). Then if you make any commits they will "
5431
"be\n"
5432
"made on the other branch first. This creates an instant mirror of your work, "
5433
"or\n"
5434
"facilitates lockstep development, where each developer is working together,\n"
5435
"continuously integrating the changes of others."
5436
msgstr ""
5437
5438
#: dummy/help_topics/checkouts/detail.txt:19
5439
msgid ""
5440
"However the checkout is still a first class branch in Bazaar terms, so that\n"
5441
"you have the full history locally. As you have a first class branch you "
5442
"can\n"
5443
"also commit locally if you want, for instance due to the temporary loss af "
5444
"a\n"
5445
"network connection. Use the --local option to commit to do this. All the "
5446
"local\n"
5447
"commits will then be made on the master branch the next time you do a non-"
5448
"local\n"
5449
"commit."
5450
msgstr ""
5451
5452
#: dummy/help_topics/checkouts/detail.txt:26
5453
msgid ""
5454
"If you are using a checkout from a shared branch you will periodically want "
5455
"to\n"
5456
"pull in all the changes made by others. This is done using the \"update\"\n"
5457
"command. The changes need to be applied before any non-local commit, but\n"
5458
"Bazaar will tell you if there are any changes and suggest that you use this\n"
5459
"command when needed."
5460
msgstr ""
5461
5462
#: dummy/help_topics/checkouts/detail.txt:32
5463
msgid ""
5464
"It is also possible to create a \"lightweight\" checkout by passing the\n"
5465
"--lightweight flag to checkout. A lightweight checkout is even closer to an\n"
5466
"SVN checkout in that it is not a first class branch, it mainly consists of "
5467
"the\n"
5468
"working tree. This means that any history operations must query the master\n"
5469
"branch, which could be slow if a network connection is involved. Also, as "
5470
"you\n"
5471
"don't have a local branch, then you cannot commit locally."
5472
msgstr ""
5473
5474
#: dummy/help_topics/checkouts/detail.txt:39
5475
msgid ""
5476
"Lightweight checkouts work best when you have fast reliable access to the\n"
5477
"master branch. This means that if the master branch is on the same disk or "
5478
"LAN\n"
5479
"a lightweight checkout will be faster than a heavyweight one for any "
5480
"commands\n"
5481
"that modify the revision history (as only one copy of the branch needs to\n"
5482
"be updated). Heavyweight checkouts will generally be faster for any command\n"
5483
"that uses the history but does not change it, but if the master branch is "
5484
"on\n"
5485
"the same disk then there won't be a noticeable difference."
5486
msgstr ""
5487
5488
#: dummy/help_topics/checkouts/detail.txt:47
5489
msgid ""
5490
"Another possible use for a checkout is to use it with a treeless repository\n"
5491
"containing your branches, where you maintain only one working tree by\n"
5492
"switching the master branch that the checkout points to when you want to\n"
5493
"work on a different branch."
5494
msgstr ""
5495
5496
#: dummy/help_topics/checkouts/detail.txt:52
5497
msgid ""
5498
"Obviously to commit on a checkout you need to be able to write to the "
5499
"master\n"
5500
"branch. This means that the master branch must be accessible over a "
5501
"writeable\n"
5502
"protocol , such as sftp://, and that you have write permissions at the "
5503
"other\n"
5504
"end. Checkouts also work on the local file system, so that all that matters "
5505
"is\n"
5506
"file permissions."
5507
msgstr ""
5508
5509
#: dummy/help_topics/checkouts/detail.txt:58
5510
msgid ""
5511
"You can change the master of a checkout by using the \"switch\" command "
5512
"(see\n"
5513
"\"help switch\"). This will change the location that the commits are sent "
5514
"to.\n"
5515
"The \"bind\" command can also be used to turn a normal branch into a heavy\n"
5516
"checkout. If you would like to convert your heavy checkout into a normal\n"
5517
"branch so that every commit is local, you can use the \"unbind\" command. To "
5518
"see\n"
5519
"whether or not a branch is bound or not you can use the \"info\" command. If "
5520
"the\n"
5521
"branch is bound it will tell you the location of the bound branch."
5522
msgstr ""
5523
5524
#: dummy/help_topics/checkouts/detail.txt:68
5525
msgid ""
5526
" checkout Create a checkout. Pass --lightweight to get a lightweight\n"
5527
" checkout\n"
5528
" update Pull any changes in the master branch in to your checkout\n"
5529
" commit Make a commit that is sent to the master branch. If you have\n"
5530
" a heavy checkout then the --local option will commit to the\n"
5531
" checkout without sending the commit to the master\n"
5532
" switch Change the master branch that the commits in the checkout "
5533
"will\n"
5534
" be sent to\n"
5535
" bind Turn a standalone branch into a heavy checkout so that any\n"
5536
" commits will be sent to the master branch\n"
5537
" unbind Turn a heavy checkout into a standalone branch so that any\n"
5538
" commits are only made locally\n"
5539
" info Displays whether a branch is bound or unbound. If the branch "
5540
"is\n"
5541
" bound, then it will also display the location of the bound "
5542
"branch\n"
5543
msgstr ""
5544
5545
#: dummy/help_topics/checkouts/summary.txt:1
5546
msgid "Information on what a checkout is"
5547
msgstr ""
5548
5549
#: dummy/help_topics/commands/summary.txt:1
5550
msgid "Basic help for all commands"
5551
msgstr ""
5552
5553
#: dummy/help_topics/configuration/summary.txt:1
5554
msgid "Details on the configuration settings available"
5555
msgstr ""
5556
5557
#: dummy/help_topics/conflict-types/summary.txt:1
5558
msgid "Types of conflicts and what to do about them"
5559
msgstr ""
5560
5561
#: dummy/help_topics/content-filters/summary.txt:1
5562
msgid "Conversion of content into/from working trees"
5563
msgstr ""
5564
5565
#: dummy/help_topics/criss-cross/detail.txt:1
5566
msgid "Criss-Cross"
5567
msgstr ""
5568
5569
#: dummy/help_topics/criss-cross/detail.txt:3
5570
msgid ""
5571
"A criss-cross in the branch history can cause the default merge technique\n"
5572
"to emit more conflicts than would normally be expected."
5573
msgstr ""
5574
5575
#: dummy/help_topics/criss-cross/detail.txt:6
5576
msgid ""
5577
"In complex merge cases, ``bzr merge --lca`` or ``bzr merge --weave`` may "
5578
"give\n"
5579
"better results. You may wish to ``bzr revert`` the working tree and merge\n"
5580
"again. Alternatively, use ``bzr remerge`` on particular conflicted files."
5581
msgstr ""
5582
5583
#: dummy/help_topics/criss-cross/detail.txt:10
5584
msgid ""
5585
"Criss-crosses occur in a branch's history if two branches merge the same "
5586
"thing\n"
5587
"and then merge one another, or if two branches merge one another at the "
5588
"same\n"
5589
"time. They can be avoided by having each branch only merge from or into a\n"
5590
"designated central branch (a \"star topology\")."
5591
msgstr ""
5592
5593
#: dummy/help_topics/criss-cross/detail.txt:15
5594
msgid ""
5595
"Criss-crosses cause problems because of the way merge works. Bazaar's "
5596
"default\n"
5597
"merge is a three-way merger; in order to merge OTHER into THIS, it must\n"
5598
"find a basis for comparison, BASE. Using BASE, it can determine whether\n"
5599
"differences between THIS and OTHER are due to one side adding lines, or\n"
5600
"from another side removing lines."
5601
msgstr ""
5602
5603
#: dummy/help_topics/criss-cross/detail.txt:21
5604
msgid ""
5605
"Criss-crosses mean there is no good choice for a base. Selecting the "
5606
"recent\n"
5607
"merge points could cause one side's changes to be silently discarded.\n"
5608
"Selecting older merge points (which Bazaar does) mean that extra conflicts\n"
5609
"are emitted."
5610
msgstr ""
5611
5612
#: dummy/help_topics/criss-cross/detail.txt:26
5613
msgid ""
5614
"The ``weave`` merge type is not affected by this problem because it uses\n"
5615
"line-origin detection instead of a basis revision to determine the cause of\n"
5616
"differences.\n"
5617
msgstr ""
5618
5619
#: dummy/help_topics/criss-cross/summary.txt:1
5620
msgid "Information on criss-cross merging"
5621
msgstr ""
5622
5623
#: dummy/help_topics/current-formats/summary.txt:1
5624
msgid "Current storage formats"
5625
msgstr ""
5626
5627
#: dummy/help_topics/debug-flags/summary.txt:1
5628
msgid "Options to show or record debug information"
5629
msgstr ""
5630
5631
#: dummy/help_topics/diverged-branches/summary.txt:1
5632
msgid "How to fix diverged branches"
5633
msgstr ""
5634
5635
#: dummy/help_topics/env-variables/detail.txt:1
5636
msgid "Environment Variables"
5637
msgstr ""
5638
5639
#: dummy/help_topics/env-variables/detail.txt:3
5640
msgid ""
5641
"=================== "
5642
"===========================================================\n"
5643
"BZRPATH Path where bzr is to look for shell plugin external\n"
5644
" commands.\n"
5645
"BZR_EMAIL E-Mail address of the user. Overrides EMAIL.\n"
5646
"EMAIL E-Mail address of the user.\n"
5647
"BZR_EDITOR Editor for editing commit messages. Overrides EDITOR.\n"
5648
"EDITOR Editor for editing commit messages.\n"
5649
"BZR_PLUGIN_PATH Paths where bzr should look for plugins.\n"
5650
"BZR_DISABLE_PLUGINS Plugins that bzr should not load.\n"
5651
"BZR_PLUGINS_AT Plugins to load from a directory not in "
5652
"BZR_PLUGIN_PATH.\n"
5653
"BZR_HOME Directory holding .bazaar config dir. Overrides HOME.\n"
5654
"BZR_HOME (Win32) Directory holding bazaar config dir. Overrides APPDATA "
5655
"and\n"
5656
" HOME.\n"
5657
"BZR_REMOTE_PATH Full name of remote 'bzr' command (for bzr+ssh:// "
5658
"URLs).\n"
5659
"BZR_SSH Path to SSH client, or one of paramiko, openssh, "
5660
"sshcorp,\n"
5661
" plink or lsh.\n"
5662
"BZR_LOG Location of .bzr.log (use '/dev/null' to suppress log).\n"
5663
"BZR_LOG (Win32) Location of .bzr.log (use 'NUL' to suppress log).\n"
5664
"BZR_COLUMNS Override implicit terminal width.\n"
5665
"BZR_CONCURRENCY Number of processes that can be run concurrently "
5666
"(selftest)\n"
5667
"BZR_PROGRESS_BAR Override the progress display. Values are 'none' or "
5668
"'text'.\n"
5669
"BZR_PDB Control whether to launch a debugger on error.\n"
5670
"BZR_SIGQUIT_PDB Control whether SIGQUIT behaves normally or invokes a\n"
5671
" breakin debugger.\n"
5672
"=================== "
5673
"===========================================================\n"
5674
msgstr ""
5675
5676
#: dummy/help_topics/env-variables/summary.txt:1
5677
msgid "Environment variable names and values"
5678
msgstr ""
5679
5680
#: dummy/help_topics/eol/summary.txt:1
5681
msgid "Information on end-of-line handling"
5682
msgstr ""
5683
5684
#: dummy/help_topics/files/detail.txt:1
5685
msgid "Files"
5686
msgstr ""
5687
5688
#: dummy/help_topics/files/detail.txt:3
5689
msgid ""
5690
":On Unix: ~/.bazaar/bazaar.conf\n"
5691
":On Windows: C:\\\\Documents and Settings\\\\username\\\\Application Data\\"
5692
"\\bazaar\\\\2.0\\\\bazaar.conf"
5693
msgstr ""
5694
5695
#: dummy/help_topics/files/detail.txt:6
5696
msgid ""
5697
"Contains the user's default configuration. The section ``[DEFAULT]`` is\n"
5698
"used to define general configuration that will be applied everywhere.\n"
5699
"The section ``[ALIASES]`` can be used to create command aliases for\n"
5700
"commonly used options."
5701
msgstr ""
5702
5703
#: dummy/help_topics/files/detail.txt:11
5704
msgid "A typical config file might look something like::"
5705
msgstr ""
5706
5707
#: dummy/help_topics/files/detail.txt:13
5708
msgid ""
5709
" [DEFAULT]\n"
5710
" email=John Doe <jdoe@isp.com>"
5711
msgstr ""
5712
5713
#: dummy/help_topics/files/detail.txt:16
5714
msgid ""
5715
" [ALIASES]\n"
5716
" commit = commit --strict\n"
5717
" log10 = log --short -r -10..-1\n"
5718
msgstr ""
5719
5720
#: dummy/help_topics/files/summary.txt:1
5721
msgid "Information on configuration and log files"
5722
msgstr ""
5723
5724
#: dummy/help_topics/formats/detail.txt:1
5725
msgid "Storage Formats"
5726
msgstr ""
5727
5728
#: dummy/help_topics/formats/detail.txt:3
5729
msgid ""
5730
"To ensure that older clients do not access data incorrectly,\n"
5731
"Bazaar's policy is to introduce a new storage format whenever\n"
5732
"new features requiring new metadata are added. New storage\n"
5733
"formats may also be introduced to improve performance and\n"
5734
"scalability."
5735
msgstr ""
5736
5737
#: dummy/help_topics/formats/detail.txt:9
5738
msgid ""
5739
"The newest format, 2a, is highly recommended. If your\n"
5740
"project is not using 2a, then you should suggest to the\n"
5741
"project owner to upgrade."
5742
msgstr ""
5743
5744
#: dummy/help_topics/formats/detail.txt:13
5745
msgid ""
5746
"\n"
5747
".. note::"
5748
msgstr ""
5749
5750
#: dummy/help_topics/formats/detail.txt:16
5751
msgid ""
5752
" Some of the older formats have two variants:\n"
5753
" a plain one and a rich-root one. The latter include an additional\n"
5754
" field about the root of the tree. There is no performance cost\n"
5755
" for using a rich-root format but you cannot easily merge changes\n"
5756
" from a rich-root format into a plain format. As a consequence,\n"
5757
" moving a project to a rich-root format takes some co-ordination\n"
5758
" in that all contributors need to upgrade their repositories\n"
5759
" around the same time. 2a and all future formats will be\n"
5760
" implicitly rich-root."
5761
msgstr ""
5762
5763
#: dummy/help_topics/formats/detail.txt:26
5764
msgid ""
5765
"See :doc:`current-formats-help` for the complete list of\n"
5766
"currently supported formats. See :doc:`other-formats-help` for\n"
5767
"descriptions of any available experimental and deprecated formats.\n"
5768
msgstr ""
5769
5770
#: dummy/help_topics/formats/summary.txt:1
5771
msgid "Information on choosing a storage format"
5772
msgstr ""
5773
5774
#: dummy/help_topics/global-options/detail.txt:1
5775
msgid "Global Options"
5776
msgstr ""
5777
5778
#: dummy/help_topics/global-options/detail.txt:3
5779
msgid ""
5780
"These options may be used with any command, and may appear in front of any\n"
5781
"command. (e.g. ``bzr --profile help``)."
5782
msgstr ""
5783
5784
#: dummy/help_topics/global-options/detail.txt:6
5785
msgid ""
5786
"--version Print the version number. Must be supplied before the "
5787
"command.\n"
5788
"--no-aliases Do not process command aliases when running this command.\n"
5789
"--builtin Use the built-in version of a command, not the plugin "
5790
"version.\n"
5791
" This does not suppress other plugin effects.\n"
5792
"--no-plugins Do not process any plugins.\n"
5793
"--no-l10n Do not translate messages.\n"
5794
"--concurrency Number of processes that can be run concurrently (selftest)."
5795
msgstr ""
5796
5797
#: dummy/help_topics/global-options/detail.txt:14
5798
msgid ""
5799
"--profile Profile execution using the hotshot profiler.\n"
5800
"--lsprof Profile execution using the lsprof profiler.\n"
5801
"--lsprof-file Profile execution using the lsprof profiler, and write the\n"
5802
" results to a specified file. If the filename ends with \".txt"
5803
"\",\n"
5804
" text format will be used. If the filename either starts "
5805
"with\n"
5806
" \"callgrind.out\" or end with \".callgrind\", the output will "
5807
"be\n"
5808
" formatted for use with KCacheGrind. Otherwise, the output\n"
5809
" will be a pickle.\n"
5810
"--coverage Generate line coverage report in the specified directory."
5811
msgstr ""
5812
5813
#: dummy/help_topics/global-options/detail.txt:24
5814
msgid ""
5815
"See http://doc.bazaar.canonical.com/developers/profiling.html for more\n"
5816
"information on profiling."
5817
msgstr ""
5818
5819
#: dummy/help_topics/global-options/detail.txt:27
5820
msgid ""
5821
"A number of debug flags are also available to assist troubleshooting and\n"
5822
"development. See :doc:`debug-flags-help`.\n"
5823
msgstr ""
5824
5825
#: dummy/help_topics/global-options/summary.txt:1
5826
msgid "Options that control how Bazaar runs"
5827
msgstr ""
5828
5829
#: dummy/help_topics/hidden-commands/summary.txt:1
5830
msgid "All hidden commands"
5831
msgstr ""
5832
5833
#: dummy/help_topics/hooks/summary.txt:1
5834
msgid "Points at which custom processing can be added"
5835
msgstr ""
5836
5837
#: dummy/help_topics/launchpad/detail.txt:1
5838
msgid "Integration with Launchpad.net"
5839
msgstr ""
5840
5841
#: dummy/help_topics/launchpad/detail.txt:3
5842
msgid ""
5843
"Launchpad.net provides free Bazaar branch hosting with integrated bug and\n"
5844
"specification tracking."
5845
msgstr ""
5846
5847
#: dummy/help_topics/launchpad/detail.txt:6
5848
msgid ""
5849
"The bzr client (through the plugin called 'launchpad') has special\n"
5850
"features to communicate with Launchpad:"
5851
msgstr ""
5852
5853
#: dummy/help_topics/launchpad/detail.txt:9
5854
msgid ""
5855
" * The launchpad-login command tells Bazaar your Launchpad user name. "
5856
"This\n"
5857
" is then used by the 'lp:' transport to download your branches using\n"
5858
" bzr+ssh://."
5859
msgstr ""
5860
5861
#: dummy/help_topics/launchpad/detail.txt:13
5862
msgid ""
5863
" * The 'lp:' transport uses Launchpad as a directory service: for "
5864
"example\n"
5865
" 'lp:bzr' and 'lp:python' refer to the main branches of the relevant\n"
5866
" projects and may be branched, logged, etc. You can also use the 'lp:'\n"
5867
" transport to refer to specific branches, e.g. lp:~bzr/bzr/trunk."
5868
msgstr ""
5869
5870
#: dummy/help_topics/launchpad/detail.txt:18
5871
msgid ""
5872
" * The 'lp:' bug tracker alias can expand launchpad bug numbers to their\n"
5873
" URLs for use with 'bzr commit --fixes', e.g. 'bzr commit --fixes "
5874
"lp:12345'\n"
5875
" will record a revision property that marks that revision as fixing\n"
5876
" Launchpad bug 12345. When you push that branch to Launchpad it will\n"
5877
" automatically be linked to the bug report."
5878
msgstr ""
5879
5880
#: dummy/help_topics/launchpad/detail.txt:24
5881
msgid ""
5882
" * The register-branch command tells Launchpad about the url of a\n"
5883
" public branch. Launchpad will then mirror the branch, display\n"
5884
" its contents and allow it to be attached to bugs and other\n"
5885
" objects."
5886
msgstr ""
5887
5888
#: dummy/help_topics/launchpad/detail.txt:29
5889
msgid "For more information see http://help.launchpad.net/\n"
5890
msgstr ""
5891
5892
#: dummy/help_topics/launchpad/summary.txt:1
5893
msgid "Using Bazaar with Launchpad.net"
5894
msgstr ""
5895
5896
#: dummy/help_topics/location-alias/summary.txt:1
5897
msgid "Aliases for remembered locations"
5898
msgstr ""
5899
5900
#: dummy/help_topics/log-formats/summary.txt:1
5901
msgid "Details on the logging formats available"
5902
msgstr ""
5903
5904
#: dummy/help_topics/other-formats/summary.txt:1
5905
msgid "Experimental and deprecated storage formats"
5906
msgstr ""
5907
5908
#: dummy/help_topics/patterns/summary.txt:1
5909
msgid "Information on the pattern syntax"
5910
msgstr ""
5911
5912
#: dummy/help_topics/repositories/detail.txt:1
5913
msgid "Repositories"
5914
msgstr ""
5915
5916
#: dummy/help_topics/repositories/detail.txt:3
5917
msgid ""
5918
"Repositories in Bazaar are where committed information is stored. There is\n"
5919
"a repository associated with every branch."
5920
msgstr ""
5921
5922
#: dummy/help_topics/repositories/detail.txt:6
5923
msgid ""
5924
"Repositories are a form of database. Bzr will usually maintain this for\n"
5925
"good performance automatically, but in some situations (e.g. when doing\n"
5926
"very many commits in a short time period) you may want to ask bzr to\n"
5927
"optimise the database indices. This can be done by the 'bzr pack' command."
5928
msgstr ""
5929
5930
#: dummy/help_topics/repositories/detail.txt:11
5931
msgid ""
5932
"By default just running 'bzr init' will create a repository within the new\n"
5933
"branch but it is possible to create a shared repository which allows "
5934
"multiple\n"
5935
"branches to share their information in the same location. When a new branch "
5936
"is\n"
5937
"created it will first look to see if there is a containing shared repository "
5938
"it\n"
5939
"can use."
5940
msgstr ""
5941
5942
#: dummy/help_topics/repositories/detail.txt:17
5943
msgid ""
5944
"When two branches of the same project share a repository, there is\n"
5945
"generally a large space saving. For some operations (e.g. branching\n"
5946
"within the repository) this translates in to a large time saving."
5947
msgstr ""
5948
5949
#: dummy/help_topics/repositories/detail.txt:21
5950
msgid ""
5951
"To create a shared repository use the init-repository command (or the alias\n"
5952
"init-repo). This command takes the location of the repository to create. "
5953
"This\n"
5954
"means that 'bzr init-repository repo' will create a directory named 'repo',\n"
5955
"which contains a shared repository. Any new branches that are created in "
5956
"this\n"
5957
"directory will then use it for storage."
5958
msgstr ""
5959
5960
#: dummy/help_topics/repositories/detail.txt:27
5961
msgid ""
5962
"It is a good idea to create a repository whenever you might create more\n"
5963
"than one branch of a project. This is true for both working areas where you\n"
5964
"are doing the development, and any server areas that you use for hosting\n"
5965
"projects. In the latter case, it is common to want branches without working\n"
5966
"trees. Since the files in the branch will not be edited directly there is "
5967
"no\n"
5968
"need to use up disk space for a working tree. To create a repository in "
5969
"which\n"
5970
"the branches will not have working trees pass the '--no-trees' option to\n"
5971
"'init-repository'."
5972
msgstr ""
5973
5974
#: dummy/help_topics/repositories/detail.txt:38
5975
msgid ""
5976
" init-repository Create a shared repository. Use --no-trees to create "
5977
"one\n"
5978
" in which new branches won't get a working tree.\n"
5979
msgstr ""
5980
5981
#: dummy/help_topics/repositories/summary.txt:1
5982
msgid "Basic information on shared repositories."
5983
msgstr ""
5984
5985
#: dummy/help_topics/revisionspec/summary.txt:1
5986
msgid "Explain how to use --revision"
5987
msgstr ""
5988
5989
#: dummy/help_topics/rules/summary.txt:1
5990
msgid "Information on defining rule-based preferences"
5991
msgstr ""
5992
5993
#: dummy/help_topics/standalone-trees/detail.txt:1
5994
msgid "Standalone Trees"
5995
msgstr ""
5996
5997
#: dummy/help_topics/standalone-trees/detail.txt:3
5998
msgid ""
5999
"A standalone tree is a working tree with an associated repository. It\n"
6000
"is an independently usable branch, with no dependencies on any other.\n"
6001
"Creating a standalone tree (via bzr init) is the quickest way to put\n"
6002
"an existing project under version control."
6003
msgstr ""
6004
6005
#: dummy/help_topics/standalone-trees/detail.txt:8
6006
msgid "Related Commands::"
6007
msgstr ""
6008
6009
#: dummy/help_topics/standalone-trees/detail.txt:10
6010
msgid " init Make a directory into a versioned branch.\n"
6011
msgstr ""
6012
6013
#: dummy/help_topics/standalone-trees/summary.txt:1
6014
msgid "Information on what a standalone tree is"
6015
msgstr ""
6016
6017
#: dummy/help_topics/standard-options/detail.txt:1
6018
msgid "Standard Options"
6019
msgstr ""
6020
6021
#: dummy/help_topics/standard-options/detail.txt:3
6022
msgid "Standard options are legal for all commands."
6023
msgstr ""
6024
6025
#: dummy/help_topics/standard-options/detail.txt:5
6026
msgid ""
6027
"--help, -h Show help message.\n"
6028
"--verbose, -v Display more information.\n"
6029
"--quiet, -q Only display errors and warnings."
6030
msgstr ""
6031
6032
#: dummy/help_topics/standard-options/detail.txt:9
6033
msgid "Unlike global options, standard options can be used in aliases.\n"
6034
msgstr ""
6035
6036
#: dummy/help_topics/standard-options/summary.txt:1
6037
msgid "Options that can be used with any command"
6038
msgstr ""
6039
6040
#: dummy/help_topics/status-flags/detail.txt:1
6041
msgid "Status Flags"
6042
msgstr ""
6043
6044
#: dummy/help_topics/status-flags/detail.txt:3
6045
msgid ""
6046
"Status flags are used to summarise changes to the working tree in a concise\n"
6047
"manner. They are in the form::"
6048
msgstr ""
6049
6050
#: dummy/help_topics/status-flags/detail.txt:6
6051
msgid " xxx <filename>"
6052
msgstr ""
6053
6054
#: dummy/help_topics/status-flags/detail.txt:8
6055
msgid "where the columns' meanings are as follows."
6056
msgstr ""
6057
6058
#: dummy/help_topics/status-flags/detail.txt:10
6059
msgid "Column 1 - versioning/renames::"
6060
msgstr ""
6061
6062
#: dummy/help_topics/status-flags/detail.txt:12
6063
msgid ""
6064
" + File versioned\n"
6065
" - File unversioned\n"
6066
" R File renamed\n"
6067
" ? File unknown\n"
6068
" X File nonexistent (and unknown to bzr)\n"
6069
" C File has conflicts\n"
6070
" P Entry for a pending merge (not a file)"
6071
msgstr ""
6072
6073
#: dummy/help_topics/status-flags/detail.txt:20
6074
msgid "Column 2 - contents::"
6075
msgstr ""
6076
6077
#: dummy/help_topics/status-flags/detail.txt:22
6078
msgid ""
6079
" N File created\n"
6080
" D File deleted\n"
6081
" K File kind changed\n"
6082
" M File modified"
6083
msgstr ""
6084
6085
#: dummy/help_topics/status-flags/detail.txt:27
6086
msgid "Column 3 - execute::"
6087
msgstr ""
6088
6089
#: dummy/help_topics/status-flags/detail.txt:29
6090
msgid " * The execute bit was changed\n"
6091
msgstr ""
6092
6093
#: dummy/help_topics/status-flags/summary.txt:1
6094
msgid "Help on status flags"
6095
msgstr ""
6096
6097
#: dummy/help_topics/sync-for-reconfigure/detail.txt:1
6098
msgid "Branches Out of Sync"
6099
msgstr ""
6100
6101
#: dummy/help_topics/sync-for-reconfigure/detail.txt:3
6102
msgid ""
6103
"When reconfiguring a checkout, tree or branch into a lightweight checkout,\n"
6104
"a local branch must be destroyed. (For checkouts, this is the local branch\n"
6105
"that serves primarily as a cache.) If the branch-to-be-destroyed does not\n"
6106
"have the same last revision as the new reference branch for the lightweight\n"
6107
"checkout, data could be lost, so Bazaar refuses."
6108
msgstr ""
6109
6110
#: dummy/help_topics/sync-for-reconfigure/detail.txt:9
6111
msgid "How you deal with this depends on *why* the branches are out of sync."
6112
msgstr ""
6113
6114
#: dummy/help_topics/sync-for-reconfigure/detail.txt:11
6115
msgid ""
6116
"If you have a checkout and have done local commits, you can get back in "
6117
"sync\n"
6118
"by running \"bzr update\" (and possibly \"bzr commit\")."
6119
msgstr ""
6120
6121
#: dummy/help_topics/sync-for-reconfigure/detail.txt:14
6122
msgid ""
6123
"If you have a branch and the remote branch is out-of-date, you can push\n"
6124
"the local changes using \"bzr push\". If the local branch is out of date, "
6125
"you\n"
6126
"can do \"bzr pull\". If both branches have had changes, you can merge, "
6127
"commit\n"
6128
"and then push your changes. If you decide that some of the changes aren't\n"
6129
"useful, you can \"push --overwrite\" or \"pull --overwrite\" instead.\n"
6130
msgstr ""
6131
6132
#: dummy/help_topics/sync-for-reconfigure/summary.txt:1
6133
msgid "Steps to resolve \"out-of-sync\" when reconfiguring"
6134
msgstr ""
6135
6136
#: dummy/help_topics/topics/summary.txt:1
6137
msgid "Topics list"
6138
msgstr ""
6139
6140
#: dummy/help_topics/url-special-chars/summary.txt:1
6141
msgid "Special character handling in URLs"
6142
msgstr ""
6143
6144
#: dummy/help_topics/urlspec/summary.txt:1
6145
msgid "Supported transport protocols"
6146
msgstr ""
6147
6148
#: dummy/help_topics/working-trees/detail.txt:1
6149
msgid "Working Trees"
6150
msgstr ""
6151
6152
#: dummy/help_topics/working-trees/detail.txt:3
6153
msgid ""
6154
"A working tree is the contents of a branch placed on disk so that you can\n"
6155
"see the files and edit them. The working tree is where you make changes to "
6156
"a\n"
6157
"branch, and when you commit the current state of the working tree is the\n"
6158
"snapshot that is recorded in the commit."
6159
msgstr ""
6160
6161
#: dummy/help_topics/working-trees/detail.txt:8
6162
msgid ""
6163
"When you push a branch to a remote system, a working tree will not be\n"
6164
"created. If one is already present the files will not be updated. The\n"
6165
"branch information will be updated and the working tree will be marked\n"
6166
"as out-of-date. Updating a working tree remotely is difficult, as there\n"
6167
"may be uncommitted changes or the update may cause content conflicts that "
6168
"are\n"
6169
"difficult to deal with remotely."
6170
msgstr ""
6171
6172
#: dummy/help_topics/working-trees/detail.txt:15
6173
msgid ""
6174
"If you have a branch with no working tree you can use the 'checkout' "
6175
"command\n"
6176
"to create a working tree. If you run 'bzr checkout .' from the branch it "
6177
"will\n"
6178
"create the working tree. If the branch is updated remotely, you can update "
6179
"the\n"
6180
"working tree by running 'bzr update' in that directory."
6181
msgstr ""
6182
6183
#: dummy/help_topics/working-trees/detail.txt:20
6184
msgid ""
6185
"If you have a branch with a working tree that you do not want the 'remove-"
6186
"tree'\n"
6187
"command will remove the tree if it is safe. This can be done to avoid the\n"
6188
"warning about the remote working tree not being updated when pushing to the\n"
6189
"branch. It can also be useful when working with a '--no-trees' repository\n"
6190
"(see 'bzr help repositories')."
6191
msgstr ""
6192
6193
#: dummy/help_topics/working-trees/detail.txt:26
6194
msgid ""
6195
"If you want to have a working tree on a remote machine that you push to you\n"
6196
"can either run 'bzr update' in the remote branch after each push, or use "
6197
"some\n"
6198
"other method to update the tree during the push. There is an 'rspush' "
6199
"plugin\n"
6200
"that will update the working tree using rsync as well as doing a push. "
6201
"There\n"
6202
"is also a 'push-and-update' plugin that automates running 'bzr update' via "
6203
"SSH\n"
6204
"after each push."
6205
msgstr ""
6206
6207
#: dummy/help_topics/working-trees/detail.txt:33
6208
msgid "Useful commands::"
6209
msgstr ""
6210
6211
#: dummy/help_topics/working-trees/detail.txt:35
6212
msgid ""
6213
" checkout Create a working tree when a branch does not have one.\n"
6214
" remove-tree Removes the working tree from a branch when it is safe to do "
6215
"so.\n"
6216
" update When a working tree is out of sync with its associated "
6217
"branch\n"
6218
" this will update the tree to match the branch.\n"
6219
msgstr ""
6220
6221
#: dummy/help_topics/working-trees/summary.txt:1
6222
msgid "Information on working trees"
6223
msgstr ""
6224
6225
#: en/help_topics/authentication.txt:1
6226
msgid ""
6227
"Authentication Settings\n"
6228
"======================="
6229
msgstr ""
6230
6231
#: en/help_topics/authentication.txt:4
6232
msgid ""
6233
"\n"
6234
"Intent\n"
6235
"------"
6236
msgstr ""
6237
6238
#: en/help_topics/authentication.txt:8
6239
msgid ""
6240
"Many different authentication policies can be described in the\n"
6241
"``authentication.conf`` file but a particular user should need only a few\n"
6242
"definitions to cover his needs without having to specify a user and a "
6243
"password\n"
6244
"for every branch he uses."
6245
msgstr ""
6246
6247
#: en/help_topics/authentication.txt:13
6248
msgid ""
6249
"The definitions found in this file are used to find the credentials to use "
6250
"for\n"
6251
"a given url. The same credentials can generally be used for as many branches "
6252
"as\n"
6253
"possible by grouping their declaration around the remote servers that need\n"
6254
"them. It's even possible to declare credentials that will be used by "
6255
"different\n"
6256
"servers."
6257
msgstr ""
6258
6259
#: en/help_topics/authentication.txt:19
6260
msgid ""
6261
"The intent is to make this file as small as possible to minimize maintenance."
6262
msgstr ""
6263
6264
#: en/help_topics/authentication.txt:21
6265
msgid ""
6266
"Once the relevant credentials are declared in this file you may use branch "
6267
"urls\n"
6268
"without embedding passwords (security hazard) or even users (enabling "
6269
"sharing\n"
6270
"of your urls with others)."
6271
msgstr ""
6272
6273
#: en/help_topics/authentication.txt:25
6274
msgid "Instead of using::"
6275
msgstr ""
6276
6277
#: en/help_topics/authentication.txt:27
6278
msgid " bzr branch ftp://joe:secret@host.com/path/to/my/branch"
6279
msgstr ""
6280
6281
#: en/help_topics/authentication.txt:29
6282
msgid "you simply use::"
6283
msgstr ""
6284
6285
#: en/help_topics/authentication.txt:31
6286
msgid " bzr branch ftp://host.com/path/to/my/branch"
6287
msgstr ""
6288
6289
#: en/help_topics/authentication.txt:33
6290
msgid "provided you have created the following ``authentication.conf`` file::"
6291
msgstr ""
6292
6293
#: en/help_topics/authentication.txt:35
6294
msgid ""
6295
" [myprojects]\n"
6296
" scheme=ftp\n"
6297
" host=host.com\n"
6298
" user=joe\n"
6299
" password=secret\n"
6300
" "
6301
msgstr ""
6302
6303
#: en/help_topics/authentication.txt:42
6304
msgid ""
6305
"Authentication definitions\n"
6306
"--------------------------"
6307
msgstr ""
6308
6309
#: en/help_topics/authentication.txt:45
6310
msgid ""
6311
"There are two kinds of authentication used by the various schemes supported "
6312
"by\n"
6313
"bzr:"
6314
msgstr ""
6315
6316
#: en/help_topics/authentication.txt:48
6317
msgid "1. user and password"
6318
msgstr ""
6319
6320
#: en/help_topics/authentication.txt:50
6321
msgid ""
6322
"``FTP`` needs a (``user``, ``password``) to authenticate against a ``host``\n"
6323
"``SFTP`` can use either a password or a host key to authenticate. However,\n"
6324
"ssh agents are a better, more secure solution. So we have chosen to not "
6325
"provide\n"
6326
"our own less secure method."
6327
msgstr ""
6328
6329
#: en/help_topics/authentication.txt:55
6330
msgid "2. user, realm and password"
6331
msgstr ""
6332
6333
#: en/help_topics/authentication.txt:57
6334
msgid ""
6335
"``HTTP`` and ``HTTPS`` needs a (``user, realm, password``) to authenticate\n"
6336
"against a host. But, by using ``.htaccess`` files, for example, it is "
6337
"possible\n"
6338
"to define several (``user, realm, password``) for a given ``host``. So what "
6339
"is\n"
6340
"really needed is (``user``, ``password``, ``host``, ``path``). The ``realm`` "
6341
"is\n"
6342
"not taken into account in the definitions, but will displayed if bzr "
6343
"prompts\n"
6344
"you for a password."
6345
msgstr ""
6346
6347
#: en/help_topics/authentication.txt:64
6348
msgid ""
6349
"``HTTP proxy`` can be handled as ``HTTP`` (or ``HTTPS``) by explicitly\n"
6350
"specifying the appropriate port."
6351
msgstr ""
6352
6353
#: en/help_topics/authentication.txt:67
6354
msgid ""
6355
"To take all schemes into account, the password will be deduced from a set "
6356
"of\n"
6357
"authentication definitions (``scheme``, ``host``, ``port``, ``path``, "
6358
"``user``,\n"
6359
"``password``)."
6360
msgstr ""
6361
6362
#: en/help_topics/authentication.txt:71
6363
msgid ""
6364
" * ``scheme``: can be empty (meaning the rest of the definition can be "
6365
"used\n"
6366
" for any scheme), ``SFTP`` and ``bzr+ssh`` should not be used here, "
6367
"``ssh``\n"
6368
" should be used instead since this is the real scheme regarding\n"
6369
" authentication,"
6370
msgstr ""
6371
6372
#: en/help_topics/authentication.txt:76
6373
msgid " * ``host``: can be empty (to act as a default for any host),"
6374
msgstr ""
6375
6376
#: en/help_topics/authentication.txt:78
6377
msgid ""
6378
" * ``port`` can be empty (useful when an host provides several servers for "
6379
"the\n"
6380
" same scheme), only numerical values are allowed, this should be used "
6381
"only\n"
6382
" when the server uses a port different than the scheme standard port,"
6383
msgstr ""
6384
6385
#: en/help_topics/authentication.txt:82
6386
msgid " * ``path``: can be empty (FTP or SFTP will never user it),"
6387
msgstr ""
6388
6389
#: en/help_topics/authentication.txt:84
6390
msgid ""
6391
" * ``user``: can be empty (``bzr`` will defaults to python's\n"
6392
" ``getpass.get_user()``),"
6393
msgstr ""
6394
6395
#: en/help_topics/authentication.txt:87
6396
msgid ""
6397
" * ``password``: can be empty if you prefer to always be prompted for your\n"
6398
" password."
6399
msgstr ""
6400
6401
#: en/help_topics/authentication.txt:90
6402
msgid ""
6403
"Multiple definitions can be provided and, for a given URL, bzr will select "
6404
"a\n"
6405
"(``user`` [, ``password``]) based on the following rules :"
6406
msgstr ""
6407
6408
#: en/help_topics/authentication.txt:93
6409
msgid " 1. the first match wins,"
6410
msgstr ""
6411
6412
#: en/help_topics/authentication.txt:95
6413
msgid " 2. empty fields match everything,"
6414
msgstr ""
6415
6416
#: en/help_topics/authentication.txt:97
6417
msgid ""
6418
" 3. ``scheme`` matches even if decorators are used in the requested URL,"
6419
msgstr ""
6420
6421
#: en/help_topics/authentication.txt:99
6422
msgid ""
6423
" 4. ``host`` matches exactly or act as a domain if it starts with '.'\n"
6424
" (``project.bzr.sf.net`` will match ``.bzr.sf.net`` but ``projectbzr.sf."
6425
"net``\n"
6426
" will not match ``bzr.sf.net``)."
6427
msgstr ""
6428
6429
#: en/help_topics/authentication.txt:103
6430
msgid ""
6431
" 5. ``port`` matches if included in the requested URL (exact matches only)"
6432
msgstr ""
6433
6434
#: en/help_topics/authentication.txt:105
6435
msgid ""
6436
" 6. ``path`` matches if included in the requested URL (and by rule #2 "
6437
"above,\n"
6438
" empty paths will match any provided path)."
6439
msgstr ""
6440
6441
#: en/help_topics/authentication.txt:110
6442
msgid ""
6443
"File format\n"
6444
"-----------"
6445
msgstr ""
6446
6447
#: en/help_topics/authentication.txt:113
6448
msgid ""
6449
"The general rules for :doc:`configuration files <configuration-help>`\n"
6450
"apply except for the variable policies."
6451
msgstr ""
6452
6453
#: en/help_topics/authentication.txt:116
6454
msgid "Each section describes an authentication definition."
6455
msgstr ""
6456
6457
#: en/help_topics/authentication.txt:118
6458
msgid ""
6459
"The section name is an arbitrary string, only the ``DEFAULT`` value is "
6460
"reserved\n"
6461
"and should appear as the *last* section."
6462
msgstr ""
6463
6464
#: en/help_topics/authentication.txt:121
6465
msgid "Each section should define:"
6466
msgstr ""
6467
6468
#: en/help_topics/authentication.txt:123
6469
msgid "* ``user``: the login to be used,"
6470
msgstr ""
6471
6472
#: en/help_topics/authentication.txt:125
6473
msgid "Each section could define:"
6474
msgstr ""
6475
6476
#: en/help_topics/authentication.txt:127
6477
msgid "* ``host``: the remote server,"
6478
msgstr ""
6479
6480
#: en/help_topics/authentication.txt:129
6481
msgid "* ``port``: the port the server is listening,"
6482
msgstr ""
6483
6484
#: en/help_topics/authentication.txt:131
6485
msgid "* ``path``: the branch location,"
6486
msgstr ""
6487
6488
#: en/help_topics/authentication.txt:133
6489
msgid "* ``password``: the password."
6490
msgstr ""
6491
6492
#: en/help_topics/authentication.txt:135
6493
msgid ""
6494
"\n"
6495
"Examples\n"
6496
"--------"
6497
msgstr ""
6498
6499
#: en/help_topics/authentication.txt:139
6500
msgid ""
6501
"\n"
6502
"Personal projects hosted outside\n"
6503
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
6504
msgstr ""
6505
6506
#: en/help_topics/authentication.txt:143
6507
msgid ""
6508
"All connections are done with the same ``user`` (the remote one for which "
6509
"the\n"
6510
"default bzr one is not appropriate) and the password is always prompted "
6511
"with\n"
6512
"some exceptions::"
6513
msgstr ""
6514
6515
#: en/help_topics/authentication.txt:147
6516
msgid ""
6517
" # Pet projects on hobby.net\n"
6518
" [hobby]\n"
6519
" host=r.hobby.net\n"
6520
" user=jim\n"
6521
" password=obvious1234\n"
6522
" \n"
6523
" # Home server\n"
6524
" [home]\n"
6525
" scheme=https\n"
6526
" host=home.net\n"
6527
" user=joe\n"
6528
" password=1essobV10us\n"
6529
" \n"
6530
" [DEFAULT]\n"
6531
" # Our local user is barbaz, on all remote sites we're known as "
6532
"foobar\n"
6533
" user=foobar"
6534
msgstr ""
6535
6536
#: en/help_topics/authentication.txt:164
6537
msgid ""
6538
"\n"
6539
"Source hosting provider\n"
6540
"~~~~~~~~~~~~~~~~~~~~~~~"
6541
msgstr ""
6542
6543
#: en/help_topics/authentication.txt:168
6544
msgid "In the shp.net (fictitious) domain, each project has its own site::"
6545
msgstr ""
6546
6547
#: en/help_topics/authentication.txt:170
6548
msgid ""
6549
" [shpnet domain]\n"
6550
" # we use sftp, but ssh is the scheme used for authentication\n"
6551
" scheme=ssh\n"
6552
" # The leading '.' ensures that 'shp.net' alone doesn't match\n"
6553
" host=.shp.net\n"
6554
" user=joe\n"
6555
" # bzr don't support supplying a password for sftp,\n"
6556
" # consider using an ssh agent if you don't want to supply\n"
6557
" # a password interactively. (pageant, ssh-agent, etc)"
6558
msgstr ""
6559
6560
#: en/help_topics/authentication.txt:180
6561
msgid ""
6562
"HTTPS, SFTP servers and their proxy\n"
6563
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
6564
msgstr ""
6565
6566
#: en/help_topics/authentication.txt:183
6567
msgid ""
6568
"At company.com, the server hosting release and integration branches is "
6569
"behind a\n"
6570
"proxy, and the two branches use different authentication policies::"
6571
msgstr ""
6572
6573
#: en/help_topics/authentication.txt:186
6574
msgid ""
6575
" [reference code]\n"
6576
" scheme=https\n"
6577
" host=dev.company.com\n"
6578
" path=/dev\n"
6579
" user=user1\n"
6580
" password=pass1"
6581
msgstr ""
6582
6583
#: en/help_topics/authentication.txt:193
6584
msgid ""
6585
" # development branches on dev server\n"
6586
" [dev]\n"
6587
" scheme=ssh # bzr+ssh and sftp are available here\n"
6588
" host=dev.company.com\n"
6589
" path=/dev/integration\n"
6590
" user=user2\n"
6591
" \n"
6592
" # proxy\n"
6593
" [proxy]\n"
6594
" scheme=http\n"
6595
" host=proxy.company.com\n"
6596
" port=3128\n"
6597
" user=proxyuser1\n"
6598
" password=proxypass1"
6599
msgstr ""
6600
6601
#: en/help_topics/authentication.txt:208
6602
msgid ""
6603
"\n"
6604
"Planned enhancements\n"
6605
"--------------------"
6606
msgstr ""
6607
6608
#: en/help_topics/authentication.txt:212
6609
msgid ""
6610
"The following are not yet implemented but planned as parts of a work in\n"
6611
"progress:"
6612
msgstr ""
6613
6614
#: en/help_topics/authentication.txt:215
6615
msgid "* add a ``password_encoding`` field allowing:"
6616
msgstr ""
6617
6618
#: en/help_topics/authentication.txt:217
6619
msgid ""
6620
" - storing the passwords in various obfuscating encodings (base64 for one),"
6621
msgstr ""
6622
6623
#: en/help_topics/authentication.txt:219
6624
msgid " - delegate password storage to plugins (.netrc for example)."
6625
msgstr ""
6626
6627
#: en/help_topics/authentication.txt:221
6628
msgid ""
6629
"* update the credentials when the user is prompted for user or password,"
6630
msgstr ""
6631
6632
#: en/help_topics/authentication.txt:223
6633
msgid "* add a ``verify_certificates`` field for ``HTTPS``."
6634
msgstr ""
6635
6636
#: en/help_topics/authentication.txt:225
6637
msgid ""
6638
"The ``password_encoding`` and ``verify_certificates`` fields are recognized "
6639
"but\n"
6640
"ignored in the actual implementation.\n"
6641
msgstr ""
6642
6643
#: en/help_topics/bugs.txt:1
6644
msgid "Bug Tracker Settings"
6645
msgstr ""
6646
6647
#: en/help_topics/bugs.txt:3
6648
msgid ""
6649
"When making a commit, metadata about bugs fixed by that change can be\n"
6650
"recorded by using the ``--fixes`` option. For each bug marked as fixed, an\n"
6651
"entry is included in the 'bugs' revision property stating '<url> <status>'.\n"
6652
"(The only ``status`` value currently supported is ``fixed.``)"
6653
msgstr ""
6654
6655
#: en/help_topics/bugs.txt:8
6656
msgid ""
6657
"The ``--fixes`` option allows you to specify a bug tracker and a bug "
6658
"identifier\n"
6659
"rather than a full URL. This looks like::"
6660
msgstr ""
6661
6662
#: en/help_topics/bugs.txt:11
6663
msgid " bzr commit --fixes <tracker>:<id>"
6664
msgstr ""
6665
6666
#: en/help_topics/bugs.txt:13
6667
msgid "or::"
6668
msgstr ""
6669
6670
#: en/help_topics/bugs.txt:15
6671
msgid " bzr commit --fixes <id>"
6672
msgstr ""
6673
6674
#: en/help_topics/bugs.txt:17
6675
msgid ""
6676
"where \"<tracker>\" is an identifier for the bug tracker, and \"<id>\" is "
6677
"the\n"
6678
"identifier for that bug within the bugtracker, usually the bug number.\n"
6679
"If \"<tracker>\" is not specified the ``bugtracker`` set in the branch\n"
6680
"or global configuration is used."
6681
msgstr ""
6682
6683
#: en/help_topics/bugs.txt:22
6684
msgid ""
6685
"Bazaar knows about a few bug trackers that have many users. If\n"
6686
"you use one of these bug trackers then there is no setup required to\n"
6687
"use this feature, you just need to know the tracker identifier to use.\n"
6688
"These are the bugtrackers that are built in:"
6689
msgstr ""
6690
6691
#: en/help_topics/bugs.txt:27
6692
msgid ""
6693
" ============================ ============ ============\n"
6694
" URL Abbreviation Example\n"
6695
" ============================ ============ ============\n"
6696
" https://bugs.launchpad.net/ lp lp:12345\n"
6697
" http://bugs.debian.org/ deb deb:12345\n"
6698
" http://bugzilla.gnome.org/ gnome gnome:12345\n"
6699
" ============================ ============ ============"
6700
msgstr ""
6701
6702
#: en/help_topics/bugs.txt:35
6703
msgid ""
6704
"For the bug trackers not listed above configuration is required.\n"
6705
"Support for generating the URLs for any project using Bugzilla or Trac\n"
6706
"is built in, along with a template mechanism for other bugtrackers with\n"
6707
"simple URL schemes. If your bug tracker can't be described by one\n"
6708
"of the schemes described below then you can write a plugin to support\n"
6709
"it."
6710
msgstr ""
6711
6712
#: en/help_topics/bugs.txt:42
6713
msgid ""
6714
"If you use Bugzilla or Trac, then you only need to set a configuration\n"
6715
"variable which contains the base URL of the bug tracker. These options\n"
6716
"can go into ``bazaar.conf``, ``branch.conf`` or into a branch-specific\n"
6717
"configuration section in ``locations.conf``. You can set up these values\n"
6718
"for each of the projects you work on."
6719
msgstr ""
6720
6721
#: en/help_topics/bugs.txt:48
6722
msgid ""
6723
"Note: As you provide a short name for each tracker, you can specify one or\n"
6724
"more bugs in one or more trackers at commit time if you wish."
6725
msgstr ""
6726
6727
#: en/help_topics/bugs.txt:51
6728
msgid ""
6729
"Launchpad\n"
6730
"---------"
6731
msgstr ""
6732
6733
#: en/help_topics/bugs.txt:54
6734
msgid "Use ``bzr commit --fixes lp:2`` to record that this commit fixes bug 2."
6735
msgstr ""
6736
6737
#: en/help_topics/bugs.txt:56
6738
msgid ""
6739
"bugzilla_<tracker>_url\n"
6740
"----------------------"
6741
msgstr ""
6742
6743
#: en/help_topics/bugs.txt:59
6744
msgid ""
6745
"If present, the location of the Bugzilla bug tracker referred to by\n"
6746
"<tracker>. This option can then be used together with ``bzr commit\n"
6747
"--fixes`` to mark bugs in that tracker as being fixed by that commit. For\n"
6748
"example::"
6749
msgstr ""
6750
6751
#: en/help_topics/bugs.txt:64
6752
msgid " bugzilla_squid_url = http://bugs.squid-cache.org"
6753
msgstr ""
6754
6755
#: en/help_topics/bugs.txt:66
6756
msgid ""
6757
"would allow ``bzr commit --fixes squid:1234`` to mark Squid's bug 1234 as\n"
6758
"fixed."
6759
msgstr ""
6760
6761
#: en/help_topics/bugs.txt:69
6762
msgid ""
6763
"trac_<tracker>_url\n"
6764
"------------------"
6765
msgstr ""
6766
6767
#: en/help_topics/bugs.txt:72
6768
msgid ""
6769
"If present, the location of the Trac instance referred to by\n"
6770
"<tracker>. This option can then be used together with ``bzr commit\n"
6771
"--fixes`` to mark bugs in that tracker as being fixed by that commit. For\n"
6772
"example::"
6773
msgstr ""
6774
6775
#: en/help_topics/bugs.txt:77
6776
msgid " trac_twisted_url = http://www.twistedmatrix.com/trac"
6777
msgstr ""
6778
6779
#: en/help_topics/bugs.txt:79
6780
msgid ""
6781
"would allow ``bzr commit --fixes twisted:1234`` to mark Twisted's bug 1234 "
6782
"as\n"
6783
"fixed."
6784
msgstr ""
6785
6786
#: en/help_topics/bugs.txt:82
6787
msgid ""
6788
"bugtracker_<tracker>_url\n"
6789
"------------------------"
6790
msgstr ""
6791
6792
#: en/help_topics/bugs.txt:85
6793
msgid ""
6794
"If present, the location of a generic bug tracker instance referred to by\n"
6795
"<tracker>. The location must contain an ``{id}`` placeholder,\n"
6796
"which will be replaced by a specific bug ID. This option can then be used\n"
6797
"together with ``bzr commit --fixes`` to mark bugs in that tracker as being\n"
6798
"fixed by that commit. For example::"
6799
msgstr ""
6800
6801
#: en/help_topics/bugs.txt:91
6802
msgid " bugtracker_python_url = http://bugs.python.org/issue{id}"
6803
msgstr ""
6804
6805
#: en/help_topics/bugs.txt:93
6806
msgid ""
6807
"would allow ``bzr commit --fixes python:1234`` to mark bug 1234 in Python's\n"
6808
"Roundup bug tracker as fixed, or::"
6809
msgstr ""
6810
6811
#: en/help_topics/bugs.txt:96
6812
msgid ""
6813
" bugtracker_cpan_url = http://rt.cpan.org/Public/Bug/Display.html?id={id}"
6814
msgstr ""
6815
6816
#: en/help_topics/bugs.txt:98
6817
msgid ""
6818
"would allow ``bzr commit --fixes cpan:1234`` to mark bug 1234 in CPAN's\n"
6819
"RT bug tracker as fixed, or::"
6820
msgstr ""
6821
6822
#: en/help_topics/bugs.txt:101
6823
msgid " bugtracker_hudson_url = http://issues.hudson-ci.org/browse/{id}"
6824
msgstr ""
6825
6826
#: en/help_topics/bugs.txt:103
6827
msgid ""
6828
"would allow ``bzr commit --fixes hudson:HUDSON-1234`` to mark bug "
6829
"HUDSON-1234\n"
6830
"in Hudson's JIRA bug tracker as fixed.\n"
6831
msgstr ""
6832
6833
#: en/help_topics/commands.txt:1
6834
msgid ""
6835
"add Add specified files or directories.\n"
6836
"alias Set/unset and display aliases.\n"
6837
"annotate Show the origin of each line in a file.\n"
6838
"bash-completion Generate a shell function for bash command line "
6839
"completion.\n"
6840
" [bash_completion]\n"
6841
"bd-do Run a command in an exported package, copying the result\n"
6842
" back. [builddeb]\n"
6843
"bind Convert the current branch into a checkout of the "
6844
"supplied\n"
6845
" branch.\n"
6846
"branch Create a new branch that is a copy of an existing "
6847
"branch.\n"
6848
"branch-history Display the development history of a branch. [bzrtools]\n"
6849
"branches Scan a location for branches [bzrtools]\n"
6850
"break-lock Break a dead lock.\n"
6851
"bug-url Print full URL to a specific bug, or open it in your\n"
6852
" browser. [qbzr]\n"
6853
"builddeb Builds a Debian package from a branch. [builddeb]\n"
6854
"cat Write the contents of a file as of a given revision to\n"
6855
" standard output.\n"
6856
"cbranch Create a new checkout, associated with a new repository\n"
6857
" branch. [bzrtools]\n"
6858
"cdiff A color version of bzr's diff [bzrtools]\n"
6859
"check Validate working tree structure, branch consistency and\n"
6860
" repository history.\n"
6861
"checkout Create a new checkout of an existing branch.\n"
6862
"clean-tree Remove unwanted files from working tree.\n"
6863
"commit Commit changes into a new revision.\n"
6864
"config Display, set or remove a configuration option.\n"
6865
"conflict-diff Compare a conflicted file against BASE. [bzrtools]\n"
6866
"conflicts List files with conflicts.\n"
6867
"create-mirror Create a mirror of another branch. [bzrtools]\n"
6868
"deleted List files deleted in the working tree.\n"
6869
"dep3-patch Format the changes in a branch as a DEP-3 patch. "
6870
"[builddeb]\n"
6871
"dh-make Helps you create a new package. [builddeb]\n"
6872
"diff Show differences in the working tree, between revisions "
6873
"or\n"
6874
" branches.\n"
6875
"explorer Desktop application for Bazaar. [explorer]\n"
6876
"export Export current or past revision to a destination "
6877
"directory\n"
6878
" or archive.\n"
6879
"fetch-ghosts Attempt to retrieve ghosts from another branch. "
6880
"[bzrtools]\n"
6881
"graph-ancestry Produce ancestry graphs using dot. [bzrtools]\n"
6882
"grep Print lines matching PATTERN for specified files and\n"
6883
" revisions. [grep]\n"
6884
"heads Show all revisions in a repository not having "
6885
"descendants.\n"
6886
" [bzrtools]\n"
6887
"help Show help on a command or other topic.\n"
6888
"ignore Ignore specified files or patterns.\n"
6889
"ignored List ignored files and the patterns that matched them.\n"
6890
"import Import sources from a directory, tarball or zip file\n"
6891
" [bzrtools]\n"
6892
"import-dsc Import a series of source packages. [builddeb]\n"
6893
"import-upstream Imports an upstream tarball. [builddeb]\n"
6894
"info Show information about a working tree, branch or "
6895
"repository.\n"
6896
"init Make a directory into a versioned branch.\n"
6897
"init-repository Create a shared repository for branches to share storage\n"
6898
" space.\n"
6899
"init-workspace Start a new workspace. [explorer]\n"
6900
"join Combine a tree into its containing tree.\n"
6901
"launchpad-login Show or set the Launchpad user ID. [launchpad]\n"
6902
"launchpad-mirror Ask Launchpad to mirror a branch now. [launchpad]\n"
6903
"launchpad-open Open a Launchpad branch page in your web browser.\n"
6904
" [launchpad]\n"
6905
"link-tree Hardlink matching files to another tree. [bzrtools]\n"
6906
"log Show historical log for a branch or subset of a branch.\n"
6907
"lp-find-proposal Find the proposal to merge this revision. [launchpad]\n"
6908
"lp-propose-merge Propose merging a branch on Launchpad. [launchpad]\n"
6909
"ls List files in a tree.\n"
6910
"mark-uploaded Mark that this branch has been uploaded, prior to "
6911
"pushing\n"
6912
" it. [builddeb]\n"
6913
"merge Perform a three-way merge.\n"
6914
"merge-package Merges source packaging branch into target packaging "
6915
"branch.\n"
6916
" [builddeb]\n"
6917
"merge-upstream Merges a new upstream version into the current branch.\n"
6918
" [builddeb]\n"
6919
"missing Show unmerged/unpulled revisions between two branches.\n"
6920
"mkdir Create a new versioned directory.\n"
6921
"multi-pull Pull all the branches under a location, e.g. a "
6922
"repository.\n"
6923
" [bzrtools]\n"
6924
"mv Move or rename a file.\n"
6925
"nick Print or set the branch nickname.\n"
6926
"pack Compress the data within a repository.\n"
6927
"patch Apply a named patch to the current tree. [bzrtools]\n"
6928
"plugins List the installed plugins.\n"
6929
"pull Turn this branch into a mirror of another branch.\n"
6930
"push Update a mirror of this branch.\n"
6931
"qadd GUI for adding files or directories. [qbzr]\n"
6932
"qannotate Show the origin of each line in a file. [qbzr]\n"
6933
"qbind Convert the current branch into a checkout of the "
6934
"supplied\n"
6935
" branch. [qbzr]\n"
6936
"qbranch Create a new copy of a branch. [qbzr]\n"
6937
"qbrowse Show inventory or working tree. [qbzr]\n"
6938
"qcat View the contents of a file as of a given revision. "
6939
"[qbzr]\n"
6940
"qcommit GUI for committing revisions. [qbzr]\n"
6941
"qconfig Configure Bazaar and QBzr. [qbzr]\n"
6942
"qconflicts Show conflicts. [qbzr]\n"
6943
"qdiff Show differences in working tree in a GUI window. [qbzr]\n"
6944
"qexport Export current or past revision to a destination "
6945
"directory\n"
6946
" or archive. [qbzr]\n"
6947
"qgetnew Creates a new working tree (either a checkout or full\n"
6948
" branch). [qbzr]\n"
6949
"qgetupdates Fetches external changes into the working tree. [qbzr]\n"
6950
"qinfo Shows information about the current location. [qbzr]\n"
6951
"qinit Initializes a new branch or shared repository. [qbzr]\n"
6952
"qinit-workspace Start a new workspace using a GUI. [explorer]\n"
6953
"qlog Show log of a repository, branch, file, or directory in a "
6954
"Qt\n"
6955
" window. [qbzr]\n"
6956
"qmerge Perform a three-way merge. [qbzr]\n"
6957
"qplugins Show information about installed plugins. [qbzr]\n"
6958
"qpull Turn this branch into a mirror of another branch. [qbzr]\n"
6959
"qpush Update a mirror of this branch. [qbzr]\n"
6960
"qrevert Revert changes files. [qbzr]\n"
6961
"qrun Run arbitrary bzr command. [qbzr]\n"
6962
"qsend Mail or create a merge-directive for submitting changes.\n"
6963
" [qbzr]\n"
6964
"qshelve Shelve selected changes away. [qbzr]\n"
6965
"qswitch Set the branch of a checkout and update. [qbzr]\n"
6966
"qtag Edit tags. [qbzr]\n"
6967
"qunbind Convert the current checkout into a regular branch. "
6968
"[qbzr]\n"
6969
"quncommit Move the tip of a branch to an earlier revision. [qbzr]\n"
6970
"qunshelve Restore shalved changes. [qbzr]\n"
6971
"qupdate Update working tree with latest changes in the branch.\n"
6972
" [qbzr]\n"
6973
"qverify-signatures Shows digital signature statuses for branch commits "
6974
"[qbzr]\n"
6975
"qversion Show version/system information. [qbzr]\n"
6976
"qviewer Simple file viewer. [qbzr]\n"
6977
"reconcile Reconcile bzr metadata in a branch.\n"
6978
"reconfigure Reconfigure the type of a bzr directory.\n"
6979
"register-branch Register a branch with launchpad.net. [launchpad]\n"
6980
"remerge Redo a merge.\n"
6981
"remove Remove files or directories.\n"
6982
"remove-branch Remove a branch.\n"
6983
"remove-tree Remove the working tree from a given branch/checkout.\n"
6984
"renames Show list of renamed files.\n"
6985
"resolve Mark a conflict as resolved.\n"
6986
"revert Revert files to a previous revision.\n"
6987
"revno Show current revision number.\n"
6988
"root Show the tree root directory.\n"
6989
"rspush Upload this branch to another location using rsync.\n"
6990
" [bzrtools]\n"
6991
"send Mail or create a merge-directive for submitting changes.\n"
6992
"serve Run the bzr server.\n"
6993
"shelf1 Perform various operations on your shelved patches. See "
6994
"also\n"
6995
" shelve1. [bzrtools]\n"
6996
"shell Begin an interactive shell tailored for bzr. [bzrtools]\n"
6997
"shelve Temporarily set aside some changes from the current "
6998
"tree.\n"
6999
"shelve1 Temporarily set aside some changes from the current "
7000
"tree.\n"
7001
" [bzrtools]\n"
7002
"sign-my-commits Sign all commits by a given committer.\n"
7003
"split Split a subdirectory of a tree into a separate tree.\n"
7004
"status Display status summary.\n"
7005
"switch Set the branch of a checkout and update.\n"
7006
"tag Create, remove or modify a tag naming a revision.\n"
7007
"tags List tags.\n"
7008
"testament Show testament (signing-form) of a revision.\n"
7009
"trees Scan a location for trees [bzrtools]\n"
7010
"unbind Convert the current checkout into a regular branch.\n"
7011
"uncommit Remove the last committed revision.\n"
7012
"unshelve Restore shelved changes.\n"
7013
"unshelve1 Restore shelved changes. [bzrtools]\n"
7014
"update Update a tree to have the latest code committed to its\n"
7015
" branch.\n"
7016
"upgrade Upgrade a repository, branch or working tree to a newer\n"
7017
" format.\n"
7018
"verify-signatures Verify all commit signatures.\n"
7019
"version Show version of bzr.\n"
7020
"version-info Show version information about this tree.\n"
7021
"view Manage filtered views.\n"
7022
"whoami Show or set bzr user id.\n"
7023
"zap Remove a lightweight checkout, if it can be done safely.\n"
7024
" [bzrtools]\n"
7025
msgstr ""
7026
7027
#: en/help_topics/configuration.txt:1
7028
msgid ""
7029
"Configuration Settings\n"
7030
"======================="
7031
msgstr ""
7032
7033
#: en/help_topics/configuration.txt:4
7034
msgid ""
7035
"Environment settings\n"
7036
"---------------------"
7037
msgstr ""
7038
7039
#: en/help_topics/configuration.txt:7
7040
msgid ""
7041
"While most configuration is handled by configuration files, some options\n"
7042
"which may be semi-permanent can also be controlled through the environment."
7043
msgstr ""
7044
7045
#: en/help_topics/configuration.txt:10
7046
msgid ""
7047
"BZR_EMAIL\n"
7048
"~~~~~~~~~"
7049
msgstr ""
7050
7051
#: en/help_topics/configuration.txt:13
7052
msgid "Override the email id used by Bazaar. Typical format::"
7053
msgstr ""
7054
7055
#: en/help_topics/configuration.txt:15
7056
msgid " \"John Doe <jdoe@example.com>\""
7057
msgstr ""
7058
7059
#: en/help_topics/configuration.txt:17
7060
msgid "See also the ``email`` configuration option."
7061
msgstr ""
7062
7063
#: en/help_topics/configuration.txt:19
7064
msgid ""
7065
"BZR_PROGRESS_BAR\n"
7066
"~~~~~~~~~~~~~~~~"
7067
msgstr ""
7068
7069
#: en/help_topics/configuration.txt:22
7070
msgid ""
7071
"Override the progress display. Possible values are \"none\" or \"text\". "
7072
"If\n"
7073
"the value is \"none\" then no progress bar is displayed. The value \"text\" "
7074
"draws\n"
7075
"the ordinary command line progress bar."
7076
msgstr ""
7077
7078
#: en/help_topics/configuration.txt:26
7079
msgid ""
7080
"BZR_SIGQUIT_PDB\n"
7081
"~~~~~~~~~~~~~~~"
7082
msgstr ""
7083
7084
#: en/help_topics/configuration.txt:29
7085
msgid "Control whether SIGQUIT behaves normally or invokes a breakin debugger."
7086
msgstr ""
7087
7088
#: en/help_topics/configuration.txt:31
7089
msgid ""
7090
"* 0 = Standard SIGQUIT behavior (normally, exit with a core dump)\n"
7091
"* 1 = Invoke breakin debugger (default)"
7092
msgstr ""
7093
7094
#: en/help_topics/configuration.txt:34
7095
msgid ""
7096
"BZR_HOME\n"
7097
"~~~~~~~~"
7098
msgstr ""
7099
7100
#: en/help_topics/configuration.txt:37
7101
msgid "Override the home directory used by Bazaar."
7102
msgstr ""
7103
7104
#: en/help_topics/configuration.txt:39
7105
msgid ""
7106
"BZR_SSH\n"
7107
"~~~~~~~"
7108
msgstr ""
7109
7110
#: en/help_topics/configuration.txt:42
7111
msgid "Select a different SSH implementation."
7112
msgstr ""
7113
7114
#: en/help_topics/configuration.txt:44
7115
msgid ""
7116
"BZR_PDB\n"
7117
"~~~~~~~"
7118
msgstr ""
7119
7120
#: en/help_topics/configuration.txt:47
7121
msgid "Control whether to launch a debugger on error."
7122
msgstr ""
7123
7124
#: en/help_topics/configuration.txt:49
7125
msgid ""
7126
"* 0 = Standard behavior\n"
7127
"* 1 = Launch debugger"
7128
msgstr ""
7129
7130
#: en/help_topics/configuration.txt:52
7131
msgid ""
7132
"BZR_REMOTE_PATH\n"
7133
"~~~~~~~~~~~~~~~"
7134
msgstr ""
7135
7136
#: en/help_topics/configuration.txt:55
7137
msgid "Path to the Bazaar executable to use when using the bzr+ssh protocol."
7138
msgstr ""
7139
7140
#: en/help_topics/configuration.txt:57
7141
msgid "See also the ``bzr_remote_path`` configuration option."
7142
msgstr ""
7143
7144
#: en/help_topics/configuration.txt:59
7145
msgid ""
7146
"BZR_EDITOR\n"
7147
"~~~~~~~~~~"
7148
msgstr ""
7149
7150
#: en/help_topics/configuration.txt:62
7151
msgid "Path to the editor Bazaar should use for commit messages, etc."
7152
msgstr ""
7153
7154
#: en/help_topics/configuration.txt:64
7155
msgid ""
7156
"BZR_LOG\n"
7157
"~~~~~~~"
7158
msgstr ""
7159
7160
#: en/help_topics/configuration.txt:67
7161
msgid ""
7162
"Location of the Bazaar log file. You can check the current location by\n"
7163
"running ``bzr version``."
7164
msgstr ""
7165
7166
#: en/help_topics/configuration.txt:70
7167
msgid ""
7168
"The log file contains debug information that is useful for diagnosing or\n"
7169
"reporting problems with Bazaar."
7170
msgstr ""
7171
7172
#: en/help_topics/configuration.txt:73
7173
msgid ""
7174
"Setting this to ``NUL`` on Windows or ``/dev/null`` on other platforms\n"
7175
"will disable logging."
7176
msgstr ""
7177
7178
#: en/help_topics/configuration.txt:76
7179
msgid ""
7180
"\n"
7181
"BZR_PLUGIN_PATH\n"
7182
"~~~~~~~~~~~~~~~"
7183
msgstr ""
7184
7185
#: en/help_topics/configuration.txt:80
7186
msgid ""
7187
"The path to the plugins directory that Bazaar should use.\n"
7188
"If not set, Bazaar will search for plugins in:"
7189
msgstr ""
7190
7191
#: en/help_topics/configuration.txt:83
7192
msgid "* the user specific plugin directory (containing the ``user`` plugins),"
7193
msgstr ""
7194
7195
#: en/help_topics/configuration.txt:85
7196
msgid "* the bzrlib directory (containing the ``core`` plugins),"
7197
msgstr ""
7198
7199
#: en/help_topics/configuration.txt:87
7200
msgid ""
7201
"* the site specific plugin directory if applicable (containing\n"
7202
" the ``site`` plugins)."
7203
msgstr ""
7204
7205
#: en/help_topics/configuration.txt:90
7206
msgid ""
7207
"If ``BZR_PLUGIN_PATH`` is set in any fashion, it will change the\n"
7208
"the way the plugin are searched. "
7209
msgstr ""
7210
7211
#: en/help_topics/configuration.txt:93
7212
msgid ""
7213
"As for the ``PATH`` variables, if multiple directories are\n"
7214
"specified in ``BZR_PLUGIN_PATH`` they should be separated by the\n"
7215
"platform specific appropriate character (':' on Unix,\n"
7216
"';' on windows)"
7217
msgstr ""
7218
7219
#: en/help_topics/configuration.txt:98
7220
msgid ""
7221
"By default if ``BZR_PLUGIN_PATH`` is set, it replaces searching\n"
7222
"in ``user``. However it will continue to search in ``core`` and\n"
7223
"``site`` unless they are explicitly removed."
7224
msgstr ""
7225
7226
#: en/help_topics/configuration.txt:102
7227
msgid ""
7228
"If you need to change the order or remove one of these\n"
7229
"directories, you should use special values:"
7230
msgstr ""
7231
7232
#: en/help_topics/configuration.txt:105
7233
msgid ""
7234
"* ``-user``, ``-core``, ``-site`` will remove the corresponding\n"
7235
" path from the default values,"
7236
msgstr ""
7237
7238
#: en/help_topics/configuration.txt:108
7239
msgid ""
7240
"* ``+user``, ``+core``, ``+site`` will add the corresponding path\n"
7241
" before the remaining default values (and also remove it from\n"
7242
" the default values)."
7243
msgstr ""
7244
7245
#: en/help_topics/configuration.txt:112
7246
msgid ""
7247
"Note that the special values 'user', 'core' and 'site' should be\n"
7248
"used literally, they will be substituted by the corresponding,\n"
7249
"platform specific, values."
7250
msgstr ""
7251
7252
#: en/help_topics/configuration.txt:116
7253
msgid ""
7254
"The examples below use ':' as the separator, windows users\n"
7255
"should use ';'."
7256
msgstr ""
7257
7258
#: en/help_topics/configuration.txt:119
7259
msgid "Overriding the default user plugin directory::"
7260
msgstr ""
7261
7262
#: en/help_topics/configuration.txt:121
7263
msgid " BZR_PLUGIN_PATH='/path/to/my/other/plugins'"
7264
msgstr ""
7265
7266
#: en/help_topics/configuration.txt:123
7267
msgid "Disabling the site directory while retaining the user directory::"
7268
msgstr ""
7269
7270
#: en/help_topics/configuration.txt:125
7271
msgid " BZR_PLUGIN_PATH='-site:+user'"
7272
msgstr ""
7273
7274
#: en/help_topics/configuration.txt:127
7275
msgid "Disabling all plugins (better achieved with --no-plugins)::"
7276
msgstr ""
7277
7278
#: en/help_topics/configuration.txt:129
7279
msgid " BZR_PLUGIN_PATH='-user:-core:-site'"
7280
msgstr ""
7281
7282
#: en/help_topics/configuration.txt:131
7283
msgid "Overriding the default site plugin directory::"
7284
msgstr ""
7285
7286
#: en/help_topics/configuration.txt:133
7287
msgid " BZR_PLUGIN_PATH='/path/to/my/site/plugins:-site':+user"
7288
msgstr ""
7289
7290
#: en/help_topics/configuration.txt:135
7291
msgid ""
7292
"BZR_DISABLE_PLUGINS\n"
7293
"~~~~~~~~~~~~~~~~~~~"
7294
msgstr ""
7295
7296
#: en/help_topics/configuration.txt:138
7297
msgid ""
7298
"Under special circumstances (mostly when trying to diagnose a\n"
7299
"bug), it's better to disable a plugin (or several) rather than\n"
7300
"uninstalling them completely. Such plugins can be specified in\n"
7301
"the ``BZR_DISABLE_PLUGINS`` environment variable."
7302
msgstr ""
7303
7304
#: en/help_topics/configuration.txt:143
7305
msgid ""
7306
"In that case, ``bzr`` will stop loading the specified plugins and\n"
7307
"will raise an import error if they are explicitly imported (by\n"
7308
"another plugin that depends on them for example)."
7309
msgstr ""
7310
7311
#: en/help_topics/configuration.txt:147
7312
msgid "Disabling ``myplugin`` and ``yourplugin`` is achieved by::"
7313
msgstr ""
7314
7315
#: en/help_topics/configuration.txt:149
7316
msgid " BZR_DISABLE_PLUGINS='myplugin:yourplugin'"
7317
msgstr ""
7318
7319
#: en/help_topics/configuration.txt:151
7320
msgid ""
7321
"BZR_PLUGINS_AT\n"
7322
"~~~~~~~~~~~~~~"
7323
msgstr ""
7324
7325
#: en/help_topics/configuration.txt:154
7326
msgid ""
7327
"When adding a new feature or working on a bug in a plugin,\n"
7328
"developers often need to use a specific version of a given\n"
7329
"plugin. Since python requires that the directory containing the\n"
7330
"code is named like the plugin itself this make it impossible to\n"
7331
"use arbitrary directory names (using a two-level directory scheme\n"
7332
"is inconvenient). ``BZR_PLUGINS_AT`` allows such directories even\n"
7333
"if they don't appear in ``BZR_PLUGIN_PATH`` ."
7334
msgstr ""
7335
7336
#: en/help_topics/configuration.txt:162
7337
msgid ""
7338
"Plugins specified in this environment variable takes precedence\n"
7339
"over the ones in ``BZR_PLUGIN_PATH``."
7340
msgstr ""
7341
7342
#: en/help_topics/configuration.txt:165
7343
msgid ""
7344
"The variable specified a list of ``plugin_name@plugin path``,\n"
7345
"``plugin_name`` being the name of the plugin as it appears in\n"
7346
"python module paths, ``plugin_path`` being the path to the\n"
7347
"directory containing the plugin code itself\n"
7348
"(i.e. ``plugins/myplugin`` not ``plugins``). Use ':' as the list\n"
7349
"separator, use ';' on windows."
7350
msgstr ""
7351
7352
#: en/help_topics/configuration.txt:172
7353
msgid ""
7354
"Example:\n"
7355
"~~~~~~~~"
7356
msgstr ""
7357
7358
#: en/help_topics/configuration.txt:175
7359
msgid ""
7360
"Using a specific version of ``myplugin``:\n"
7361
"``BZR_PLUGINS_AT='myplugin@/home/me/bugfixes/123456-myplugin``"
7362
msgstr ""
7363
7364
#: en/help_topics/configuration.txt:178
7365
msgid ""
7366
"BZRPATH\n"
7367
"~~~~~~~"
7368
msgstr ""
7369
7370
#: en/help_topics/configuration.txt:181
7371
msgid "The path where Bazaar should look for shell plugin external commands."
7372
msgstr ""
7373
7374
#: en/help_topics/configuration.txt:183
7375
msgid ""
7376
"\n"
7377
"http_proxy, https_proxy\n"
7378
"~~~~~~~~~~~~~~~~~~~~~~~"
7379
msgstr ""
7380
7381
#: en/help_topics/configuration.txt:187
7382
msgid "Specifies the network proxy for outgoing connections, for example::"
7383
msgstr ""
7384
7385
#: en/help_topics/configuration.txt:189
7386
msgid ""
7387
" http_proxy=http://proxy.example.com:3128/ \n"
7388
" https_proxy=http://proxy.example.com:3128/"
7389
msgstr ""
7390
7391
#: en/help_topics/configuration.txt:192
7392
msgid ""
7393
"\n"
7394
"Configuration files\n"
7395
"-------------------"
7396
msgstr ""
7397
7398
#: en/help_topics/configuration.txt:196
7399
msgid ""
7400
"Location\n"
7401
"~~~~~~~~"
7402
msgstr ""
7403
7404
#: en/help_topics/configuration.txt:199
7405
msgid ""
7406
"Configuration files are located in ``$HOME/.bazaar`` on Unix and\n"
7407
"``C:\\Documents and Settings\\<username>\\Application Data\\Bazaar\\2.0`` "
7408
"on\n"
7409
"Windows. (You can check the location for your system by using\n"
7410
"``bzr version``.)"
7411
msgstr ""
7412
7413
#: en/help_topics/configuration.txt:204
7414
msgid "There are three primary configuration files in this location:"
7415
msgstr ""
7416
7417
#: en/help_topics/configuration.txt:206
7418
msgid "* ``bazaar.conf`` describes default configuration options,"
7419
msgstr ""
7420
7421
#: en/help_topics/configuration.txt:208
7422
msgid ""
7423
"* ``locations.conf`` describes configuration information for\n"
7424
" specific branch locations,"
7425
msgstr ""
7426
7427
#: en/help_topics/configuration.txt:211
7428
msgid ""
7429
"* ``authentication.conf`` describes credential information for\n"
7430
" remote servers."
7431
msgstr ""
7432
7433
#: en/help_topics/configuration.txt:214
7434
msgid ""
7435
"Each branch can also contain a configuration file that sets values specific\n"
7436
"to that branch. This file is found at ``.bzr/branch/branch.conf`` within "
7437
"the\n"
7438
"branch. This file is visible to all users of a branch, if you wish to "
7439
"override\n"
7440
"one of the values for a branch with a setting that is specific to you then "
7441
"you\n"
7442
"can do so in ``locations.conf``."
7443
msgstr ""
7444
7445
#: en/help_topics/configuration.txt:220
7446
msgid ""
7447
"General format\n"
7448
"~~~~~~~~~~~~~~"
7449
msgstr ""
7450
7451
#: en/help_topics/configuration.txt:223
7452
msgid ""
7453
"An ini file has three types of contructs: section headers, section\n"
7454
"variables and comments."
7455
msgstr ""
7456
7457
#: en/help_topics/configuration.txt:226
7458
msgid ""
7459
"Comments\n"
7460
"^^^^^^^^"
7461
msgstr ""
7462
7463
#: en/help_topics/configuration.txt:229
7464
msgid ""
7465
"A comment is any line that starts with a \"#\" (sometimes called a \"hash\n"
7466
"mark\", \"pound sign\" or \"number sign\"). Comment lines are ignored by\n"
7467
"Bazaar when parsing ini files."
7468
msgstr ""
7469
7470
#: en/help_topics/configuration.txt:233
7471
msgid ""
7472
"Section headers\n"
7473
"^^^^^^^^^^^^^^^"
7474
msgstr ""
7475
7476
#: en/help_topics/configuration.txt:236
7477
msgid ""
7478
"A section header is a word enclosed in brackets that starts at the begining\n"
7479
"of a line. A typical section header looks like this::"
7480
msgstr ""
7481
7482
#: en/help_topics/configuration.txt:239
7483
msgid " [DEFAULT]"
7484
msgstr ""
7485
7486
#: en/help_topics/configuration.txt:241
7487
msgid ""
7488
"The only valid section headers for bazaar.conf currently are [DEFAULT] and\n"
7489
"[ALIASES]. Section headers are case sensitive. The default section provides "
7490
"for\n"
7491
"setting variables which can be overridden with the branch config file."
7492
msgstr ""
7493
7494
#: en/help_topics/configuration.txt:245
7495
msgid ""
7496
"For ``locations.conf``, the variables from the section with the\n"
7497
"longest matching section header are used to the exclusion of other\n"
7498
"potentially valid section headers. A section header uses the path for\n"
7499
"the branch as the section header. Some examples include::"
7500
msgstr ""
7501
7502
#: en/help_topics/configuration.txt:250
7503
msgid ""
7504
" [http://mybranches.isp.com/~jdoe/branchdir]\n"
7505
" [/home/jdoe/branches/]"
7506
msgstr ""
7507
7508
#: en/help_topics/configuration.txt:253
7509
msgid ""
7510
"\n"
7511
"Section variables\n"
7512
"^^^^^^^^^^^^^^^^^"
7513
msgstr ""
7514
7515
#: en/help_topics/configuration.txt:257
7516
msgid ""
7517
"A section variable resides within a section. A section variable contains a\n"
7518
"variable name, an equals sign and a value. For example::"
7519
msgstr ""
7520
7521
#: en/help_topics/configuration.txt:260
7522
msgid ""
7523
" email = John Doe <jdoe@isp.com>\n"
7524
" gpg_signing_key = Amy Pond <amy@example.com>"
7525
msgstr ""
7526
7527
#: en/help_topics/configuration.txt:263
7528
msgid ""
7529
"A variable can reference other variables **in the same configuration file** "
7530
"by\n"
7531
"enclosing them in curly brackets::"
7532
msgstr ""
7533
7534
#: en/help_topics/configuration.txt:266
7535
msgid ""
7536
" my_branch_name = feature_x\n"
7537
" my_server = bzr+ssh://example.com\n"
7538
" push_location = {my_server}/project/{my_branch_name}"
7539
msgstr ""
7540
7541
#: en/help_topics/configuration.txt:270
7542
msgid ""
7543
"\n"
7544
"Variable policies\n"
7545
"^^^^^^^^^^^^^^^^^"
7546
msgstr ""
7547
7548
#: en/help_topics/configuration.txt:274
7549
msgid ""
7550
"Variables defined in a section affect the named directory or URL plus\n"
7551
"any locations they contain. Policies can be used to change how a\n"
7552
"variable value is interpreted for contained locations. Currently\n"
7553
"there are three policies available:"
7554
msgstr ""
7555
7556
#: en/help_topics/configuration.txt:279
7557
msgid ""
7558
" none:\n"
7559
" the value is interpreted the same for contained locations. This is\n"
7560
" the default behaviour.\n"
7561
" norecurse:\n"
7562
" the value is only used for the exact location specified by the\n"
7563
" section name.\n"
7564
" appendpath:\n"
7565
" for contained locations, any additional path components are\n"
7566
" appended to the value."
7567
msgstr ""
7568
7569
#: en/help_topics/configuration.txt:289
7570
msgid ""
7571
"Policies are specified by keys with names of the form \"$var:policy\".\n"
7572
"For example, to define the push location for a tree of branches, the\n"
7573
"following could be used::"
7574
msgstr ""
7575
7576
#: en/help_topics/configuration.txt:293
7577
msgid ""
7578
" [/top/location]\n"
7579
" push_location = sftp://example.com/location\n"
7580
" push_location:policy = appendpath"
7581
msgstr ""
7582
7583
#: en/help_topics/configuration.txt:297
7584
msgid ""
7585
"With this configuration, the push location for ``/top/location/branch1``\n"
7586
"would be ``sftp://example.com/location/branch1``."
7587
msgstr ""
7588
7589
#: en/help_topics/configuration.txt:300
7590
msgid ""
7591
"\n"
7592
"The main configuration file, bazaar.conf\n"
7593
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
7594
msgstr ""
7595
7596
#: en/help_topics/configuration.txt:304
7597
msgid ""
7598
"``bazaar.conf`` allows two sections: ``[DEFAULT]`` and ``[ALIASES]``.\n"
7599
"The default section contains the default\n"
7600
"configuration options for all branches. The default section can be\n"
7601
"overriden by providing a branch-specific section in ``locations.conf``."
7602
msgstr ""
7603
7604
#: en/help_topics/configuration.txt:309
7605
msgid "A typical ``bazaar.conf`` section often looks like the following::"
7606
msgstr ""
7607
7608
#: en/help_topics/configuration.txt:311
7609
msgid ""
7610
" [DEFAULT]\n"
7611
" email = John Doe <jdoe@isp.com>\n"
7612
" editor = /usr/bin/vim\n"
7613
" create_signatures = when-required"
7614
msgstr ""
7615
7616
#: en/help_topics/configuration.txt:316
7617
msgid ""
7618
"\n"
7619
"The branch location configuration file, locations.conf\n"
7620
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
7621
msgstr ""
7622
7623
#: en/help_topics/configuration.txt:320
7624
msgid ""
7625
"``locations.conf`` allows one to specify overriding settings for\n"
7626
"a specific branch. The format is almost identical to the default section in\n"
7627
"bazaar.conf with one significant change: The section header, instead of "
7628
"saying\n"
7629
"default, will be the path to a branch that you wish to override a value\n"
7630
"for. The '?' and '*' wildcards are supported::"
7631
msgstr ""
7632
7633
#: en/help_topics/configuration.txt:326
7634
msgid ""
7635
" [/home/jdoe/branches/nethack]\n"
7636
" email = Nethack Admin <nethack@nethack.com>"
7637
msgstr ""
7638
7639
#: en/help_topics/configuration.txt:329
7640
msgid ""
7641
" [http://hypothetical.site.com/branches/devel-branch]\n"
7642
" create_signatures = always"
7643
msgstr ""
7644
7645
#: en/help_topics/configuration.txt:332
7646
msgid ""
7647
"The authentication configuration file, authentication.conf\n"
7648
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
7649
msgstr ""
7650
7651
#: en/help_topics/configuration.txt:335
7652
msgid ""
7653
"``authentication.conf`` allows one to specify credentials for\n"
7654
"remote servers. This can be used for all the supported transports and any "
7655
"part\n"
7656
"of bzr that requires authentication (smtp for example)."
7657
msgstr ""
7658
7659
#: en/help_topics/configuration.txt:339
7660
msgid ""
7661
"The syntax of the file obeys the same rules as the others except for the\n"
7662
"variable policies which don't apply."
7663
msgstr ""
7664
7665
#: en/help_topics/configuration.txt:342
7666
msgid ""
7667
"For more information on the possible uses of the authentication "
7668
"configuration\n"
7669
"file see :doc:`authentication-help`."
7670
msgstr ""
7671
7672
#: en/help_topics/configuration.txt:345
7673
msgid ""
7674
"\n"
7675
"Common variable options\n"
7676
"-----------------------"
7677
msgstr ""
7678
7679
#: en/help_topics/configuration.txt:349
7680
msgid ""
7681
"debug_flags\n"
7682
"~~~~~~~~~~~"
7683
msgstr ""
7684
7685
#: en/help_topics/configuration.txt:352
7686
msgid ""
7687
"A comma-separated list of debugging options to turn on. The same values\n"
7688
"can be used as with the -D command-line option (see `help global-options`).\n"
7689
"For example::"
7690
msgstr ""
7691
7692
#: en/help_topics/configuration.txt:356
7693
msgid " debug_flags = hpss"
7694
msgstr ""
7695
7696
#: en/help_topics/configuration.txt:360
7697
msgid " debug_flags = hpss,evil"
7698
msgstr ""
7699
7700
#: en/help_topics/configuration.txt:362
7701
msgid ""
7702
"email\n"
7703
"~~~~~"
7704
msgstr ""
7705
7706
#: en/help_topics/configuration.txt:365
7707
msgid ""
7708
"The email address to use when committing a branch. Typically takes the form\n"
7709
"of::"
7710
msgstr ""
7711
7712
#: en/help_topics/configuration.txt:368
7713
msgid " email = Full Name <account@hostname.tld>"
7714
msgstr ""
7715
7716
#: en/help_topics/configuration.txt:370
7717
msgid ""
7718
"editor\n"
7719
"~~~~~~"
7720
msgstr ""
7721
7722
#: en/help_topics/configuration.txt:373
7723
msgid ""
7724
"The path of the editor that you wish to use if *bzr commit* is run without\n"
7725
"a commit message. This setting is trumped by the environment variable\n"
7726
"``BZR_EDITOR``, and overrides the ``VISUAL`` and ``EDITOR`` environment\n"
7727
"variables."
7728
msgstr ""
7729
7730
#: en/help_topics/configuration.txt:378
7731
msgid ""
7732
"log_format\n"
7733
"~~~~~~~~~~"
7734
msgstr ""
7735
7736
#: en/help_topics/configuration.txt:381
7737
msgid ""
7738
"The default log format to use. Standard log formats are ``long``, ``short``\n"
7739
"and ``line``. Additional formats may be provided by plugins. The default\n"
7740
"value is ``long``."
7741
msgstr ""
7742
7743
#: en/help_topics/configuration.txt:385
7744
msgid ""
7745
"check_signatures\n"
7746
"~~~~~~~~~~~~~~~~"
7747
msgstr ""
7748
7749
#: en/help_topics/configuration.txt:388
7750
msgid ""
7751
"Reserved for future use. These options will allow a policy for branches to\n"
7752
"require signatures."
7753
msgstr ""
7754
7755
#: en/help_topics/configuration.txt:391
7756
msgid ""
7757
"require\n"
7758
" The gnupg signature for revisions must be present and must be valid."
7759
msgstr ""
7760
7761
#: en/help_topics/configuration.txt:394
7762
msgid ""
7763
"ignore\n"
7764
" Do not check gnupg signatures of revisions."
7765
msgstr ""
7766
7767
#: en/help_topics/configuration.txt:397
7768
msgid ""
7769
"check-available\n"
7770
" (default) If gnupg signatures for revisions are present, check them.\n"
7771
" Bazaar will fail if it finds a bad signature, but will not fail if\n"
7772
" no signature is present."
7773
msgstr ""
7774
7775
#: en/help_topics/configuration.txt:402
7776
msgid ""
7777
"create_signatures\n"
7778
"~~~~~~~~~~~~~~~~~"
7779
msgstr ""
7780
7781
#: en/help_topics/configuration.txt:405
7782
msgid ""
7783
"Defines the behaviour of signing revisions on commits. By default bzr will "
7784
"not\n"
7785
"sign new commits."
7786
msgstr ""
7787
7788
#: en/help_topics/configuration.txt:408
7789
msgid ""
7790
"always\n"
7791
" Sign every new revision that is committed. If the signing fails then "
7792
"the\n"
7793
" commit will not be made."
7794
msgstr ""
7795
7796
#: en/help_topics/configuration.txt:412
7797
msgid ""
7798
"when-required\n"
7799
" Reserved for future use."
7800
msgstr ""
7801
7802
#: en/help_topics/configuration.txt:415
7803
msgid ""
7804
"never\n"
7805
" Reserved for future use."
7806
msgstr ""
7807
7808
#: en/help_topics/configuration.txt:418
7809
msgid ""
7810
"In future it is planned that ``when-required`` will sign newly\n"
7811
"committed revisions only when the branch requires them. ``never`` will "
7812
"refuse\n"
7813
"to sign newly committed revisions, even if the branch requires signatures."
7814
msgstr ""
7815
7816
#: en/help_topics/configuration.txt:422
7817
msgid ""
7818
"dirstate.fdatasync\n"
7819
"~~~~~~~~~~~~~~~~~~"
7820
msgstr ""
7821
7822
#: en/help_topics/configuration.txt:425
7823
msgid ""
7824
"If true (default), working tree metadata changes are flushed through the\n"
7825
"OS buffers to physical disk. This is somewhat slower, but means data\n"
7826
"should not be lost if the machine crashes. See also repository.fdatasync."
7827
msgstr ""
7828
7829
#: en/help_topics/configuration.txt:429
7830
msgid ""
7831
"gpg_signing_key\n"
7832
"~~~~~~~~~~~~~~~"
7833
msgstr ""
7834
7835
#: en/help_topics/configuration.txt:432
7836
msgid ""
7837
"The GnuPG user identity to use when signing commits. Can be an e-mail\n"
7838
"address, key fingerprint or full key ID. When unset or when set to\n"
7839
"\"default\" Bazaar will use the user e-mail set with ``whoami``."
7840
msgstr ""
7841
7842
#: en/help_topics/configuration.txt:436
7843
msgid ""
7844
"recurse\n"
7845
"~~~~~~~"
7846
msgstr ""
7847
7848
#: en/help_topics/configuration.txt:439
7849
msgid ""
7850
"Only useful in ``locations.conf``. Defines whether or not the\n"
7851
"configuration for this section applies to subdirectories:"
7852
msgstr ""
7853
7854
#: en/help_topics/configuration.txt:442
7855
msgid ""
7856
"true\n"
7857
" (default) This section applies to subdirectories as well."
7858
msgstr ""
7859
7860
#: en/help_topics/configuration.txt:445
7861
msgid ""
7862
"false\n"
7863
" This section only applies to the branch at this directory and not\n"
7864
" branches below it."
7865
msgstr ""
7866
7867
#: en/help_topics/configuration.txt:449
7868
msgid ""
7869
"gpg_signing_command\n"
7870
"~~~~~~~~~~~~~~~~~~~"
7871
msgstr ""
7872
7873
#: en/help_topics/configuration.txt:452
7874
msgid ""
7875
"(Default: \"gpg\"). Which program should be used to sign and check "
7876
"revisions.\n"
7877
"For example::"
7878
msgstr ""
7879
7880
#: en/help_topics/configuration.txt:455
7881
msgid " gpg_signing_command = /usr/bin/gnpg"
7882
msgstr ""
7883
7884
#: en/help_topics/configuration.txt:457
7885
msgid ""
7886
"The specified command must accept the options \"--clearsign\" and \"-u "
7887
"<email>\"."
7888
msgstr ""
7889
7890
#: en/help_topics/configuration.txt:459
7891
msgid ""
7892
"bzr_remote_path\n"
7893
"~~~~~~~~~~~~~~~"
7894
msgstr ""
7895
7896
#: en/help_topics/configuration.txt:462
7897
msgid ""
7898
"(Default: \"bzr\"). The path to the command that should be used to run the "
7899
"smart\n"
7900
"server for bzr. This value may only be specified in locations.conf, because:"
7901
msgstr ""
7902
7903
#: en/help_topics/configuration.txt:465
7904
msgid ""
7905
"- it's needed before branch.conf is accessible\n"
7906
"- allowing remote branch.conf files to specify commands would be a security\n"
7907
" risk"
7908
msgstr ""
7909
7910
#: en/help_topics/configuration.txt:469
7911
msgid "It is overridden by the BZR_REMOTE_PATH environment variable."
7912
msgstr ""
7913
7914
#: en/help_topics/configuration.txt:471
7915
msgid ""
7916
"smtp_server\n"
7917
"~~~~~~~~~~~"
7918
msgstr ""
7919
7920
#: en/help_topics/configuration.txt:474
7921
msgid ""
7922
"(Default: \"localhost\"). SMTP server to use when Bazaar needs to send\n"
7923
"email, eg. with ``merge-directive --mail-to``, or the bzr-email plugin."
7924
msgstr ""
7925
7926
#: en/help_topics/configuration.txt:477
7927
msgid ""
7928
"smtp_username, smtp_password\n"
7929
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
7930
msgstr ""
7931
7932
#: en/help_topics/configuration.txt:480
7933
msgid ""
7934
"User and password to authenticate to the SMTP server. If smtp_username\n"
7935
"is set, and smtp_password is not, Bazaar will prompt for a password.\n"
7936
"These settings are only needed if the SMTP server requires authentication\n"
7937
"to send mail."
7938
msgstr ""
7939
7940
#: en/help_topics/configuration.txt:485
7941
msgid ""
7942
"locks.steal_dead\n"
7943
"~~~~~~~~~~~~~~~~"
7944
msgstr ""
7945
7946
#: en/help_topics/configuration.txt:488
7947
msgid ""
7948
"If set to true, bzr will automatically break locks held by processes from\n"
7949
"the same machine and user that are no longer alive. Otherwise, it will\n"
7950
"print a message and you can break the lock manually, if you are satisfied\n"
7951
"the object is no longer in use."
7952
msgstr ""
7953
7954
#: en/help_topics/configuration.txt:493
7955
msgid ""
7956
"mail_client\n"
7957
"~~~~~~~~~~~"
7958
msgstr ""
7959
7960
#: en/help_topics/configuration.txt:496
7961
msgid ""
7962
"A mail client to use for sending merge requests.\n"
7963
"By default, bzr will try to use ``mapi`` on Windows. On other platforms, "
7964
"it\n"
7965
"will try ``xdg-email``. If either of these fails, it will fall back to\n"
7966
"``editor``."
7967
msgstr ""
7968
7969
#: en/help_topics/configuration.txt:501
7970
msgid "Supported values for specific clients:"
7971
msgstr ""
7972
7973
#: en/help_topics/configuration.txt:503
7974
msgid ""
7975
":claws: Use Claws. This skips a dialog for attaching files.\n"
7976
":evolution: Use Evolution.\n"
7977
":kmail: Use KMail.\n"
7978
":mutt: Use Mutt.\n"
7979
":thunderbird: Use Mozilla Thunderbird or Icedove. For Thunderbird/Icedove "
7980
"1.5,\n"
7981
" this works around some bugs that xdg-email doesn't handle."
7982
msgstr ""
7983
7984
#: en/help_topics/configuration.txt:510
7985
msgid "Supported generic values are:"
7986
msgstr ""
7987
7988
#: en/help_topics/configuration.txt:512
7989
msgid ""
7990
":default: See above.\n"
7991
":editor: Use your editor to compose the merge request. This also uses\n"
7992
" your commit id, (see ``bzr whoami``), smtp_server and (optionally)\n"
7993
" smtp_username and smtp_password.\n"
7994
":mapi: Use your preferred e-mail client on Windows.\n"
7995
":xdg-email: Use xdg-email to run your preferred mail program"
7996
msgstr ""
7997
7998
#: en/help_topics/configuration.txt:519
7999
msgid ""
8000
"repository.fdatasync\n"
8001
"~~~~~~~~~~~~~~~~~~~~"
8002
msgstr ""
8003
8004
#: en/help_topics/configuration.txt:522
8005
msgid ""
8006
"If true (default), repository changes are flushed through the OS buffers\n"
8007
"to physical disk. This is somewhat slower, but means data should not be\n"
8008
"lost if the machine crashes. See also dirstate.fdatasync."
8009
msgstr ""
8010
8011
#: en/help_topics/configuration.txt:526
8012
msgid ""
8013
"submit_branch\n"
8014
"~~~~~~~~~~~~~"
8015
msgstr ""
8016
8017
#: en/help_topics/configuration.txt:529
8018
msgid ""
8019
"The branch you intend to submit your current work to. This is "
8020
"automatically\n"
8021
"set by ``bzr send``, and is also used by the ``submit:`` revision spec. "
8022
"This\n"
8023
"should usually be set on a per-branch or per-location basis."
8024
msgstr ""
8025
8026
#: en/help_topics/configuration.txt:533
8027
msgid ""
8028
"public_branch\n"
8029
"~~~~~~~~~~~~~"
8030
msgstr ""
8031
8032
#: en/help_topics/configuration.txt:536
8033
msgid ""
8034
"A publically-accessible version of this branch (implying that this version "
8035
"is\n"
8036
"not publically-accessible). Used (and set) by ``bzr send``."
8037
msgstr ""
8038
8039
#: en/help_topics/configuration.txt:539
8040
msgid ""
8041
"suppress_warnings\n"
8042
"~~~~~~~~~~~~~~~~~"
8043
msgstr ""
8044
8045
#: en/help_topics/configuration.txt:542
8046
msgid ""
8047
"A list of strings, each string represent a warning that can be emitted by\n"
8048
"bzr. Mentioning a warning in this list tells bzr to not emit it."
8049
msgstr ""
8050
8051
#: en/help_topics/configuration.txt:545
8052
msgid "Valid values:"
8053
msgstr ""
8054
8055
#: en/help_topics/configuration.txt:547
8056
msgid ""
8057
"* ``format_deprecation``:\n"
8058
" whether the format deprecation warning is shown on repositories that "
8059
"are\n"
8060
" using deprecated formats."
8061
msgstr ""
8062
8063
#: en/help_topics/configuration.txt:551
8064
msgid ""
8065
"default_format\n"
8066
"~~~~~~~~~~~~~~"
8067
msgstr ""
8068
8069
#: en/help_topics/configuration.txt:554
8070
msgid ""
8071
"A format name for the default format used when creating branches. See "
8072
"``bzr\n"
8073
"help formats`` for possible values."
8074
msgstr ""
8075
8076
#: en/help_topics/configuration.txt:557
8077
msgid ""
8078
"\n"
8079
"Unicode options\n"
8080
"---------------"
8081
msgstr ""
8082
8083
#: en/help_topics/configuration.txt:561
8084
msgid ""
8085
"output_encoding\n"
8086
"~~~~~~~~~~~~~~~"
8087
msgstr ""
8088
8089
#: en/help_topics/configuration.txt:564
8090
msgid ""
8091
"A Python unicode encoding name for text output from bzr, such as log\n"
8092
"information. Values include: utf8, cp850, ascii, iso-8859-1. The default\n"
8093
"is the terminal encoding prefered by the operating system."
8094
msgstr ""
8095
8096
#: en/help_topics/configuration.txt:568
8097
msgid ""
8098
"\n"
8099
"Branch type specific options\n"
8100
"----------------------------"
8101
msgstr ""
8102
8103
#: en/help_topics/configuration.txt:572
8104
msgid ""
8105
"These options apply only to branches that use the ``dirstate-tags`` or\n"
8106
"later format. They\n"
8107
"are usually set in ``.bzr/branch/branch.conf`` automatically, but may be\n"
8108
"manually set in ``locations.conf`` or ``bazaar.conf``."
8109
msgstr ""
8110
8111
#: en/help_topics/configuration.txt:577
8112
msgid ""
8113
"append_revisions_only\n"
8114
"~~~~~~~~~~~~~~~~~~~~~"
8115
msgstr ""
8116
8117
#: en/help_topics/configuration.txt:580
8118
msgid ""
8119
"If set to \"True\" then revisions can only be appended to the log, not\n"
8120
"removed. A branch with this setting enabled can only pull from another\n"
8121
"branch if the other branch's log is a longer version of its own. This is\n"
8122
"normally set by ``bzr init --append-revisions-only``. If you set it\n"
8123
"manually, use either 'True' or 'False' (case-sensitive) to maintain\n"
8124
"compatibility with previous bzr versions (older than 2.2)."
8125
msgstr ""
8126
8127
#: en/help_topics/configuration.txt:587
8128
msgid ""
8129
"parent_location\n"
8130
"~~~~~~~~~~~~~~~"
8131
msgstr ""
8132
8133
#: en/help_topics/configuration.txt:590
8134
msgid ""
8135
"If present, the location of the default branch for pull or merge. This "
8136
"option\n"
8137
"is normally set when creating a branch, the first ``pull`` or by ``pull\n"
8138
"--remember``."
8139
msgstr ""
8140
8141
#: en/help_topics/configuration.txt:594
8142
msgid ""
8143
"push_location\n"
8144
"~~~~~~~~~~~~~"
8145
msgstr ""
8146
8147
#: en/help_topics/configuration.txt:597
8148
msgid ""
8149
"If present, the location of the default branch for push. This option\n"
8150
"is normally set by the first ``push`` or ``push --remember``."
8151
msgstr ""
8152
8153
#: en/help_topics/configuration.txt:600
8154
msgid ""
8155
"push_strict\n"
8156
"~~~~~~~~~~~"
8157
msgstr ""
8158
8159
#: en/help_topics/configuration.txt:603
8160
msgid ""
8161
"If present, defines the ``--strict`` option default value for checking\n"
8162
"uncommitted changes before pushing."
8163
msgstr ""
8164
8165
#: en/help_topics/configuration.txt:606
8166
msgid ""
8167
"dpush_strict\n"
8168
"~~~~~~~~~~~~"
8169
msgstr ""
8170
8171
#: en/help_topics/configuration.txt:609
8172
msgid ""
8173
"If present, defines the ``--strict`` option default value for checking\n"
8174
"uncommitted changes before pushing into a different VCS without any\n"
8175
"custom bzr metadata."
8176
msgstr ""
8177
8178
#: en/help_topics/configuration.txt:613
8179
msgid ""
8180
"bound_location\n"
8181
"~~~~~~~~~~~~~~"
8182
msgstr ""
8183
8184
#: en/help_topics/configuration.txt:616
8185
msgid ""
8186
"The location that commits should go to when acting as a checkout.\n"
8187
"This option is normally set by ``bind``."
8188
msgstr ""
8189
8190
#: en/help_topics/configuration.txt:619
8191
msgid ""
8192
"bound\n"
8193
"~~~~~"
8194
msgstr ""
8195
8196
#: en/help_topics/configuration.txt:622
8197
msgid ""
8198
"If set to \"True\", the branch should act as a checkout, and push each "
8199
"commit to\n"
8200
"the bound_location. This option is normally set by ``bind``/``unbind``."
8201
msgstr ""
8202
8203
#: en/help_topics/configuration.txt:625
8204
msgid ""
8205
"send_strict\n"
8206
"~~~~~~~~~~~"
8207
msgstr ""
8208
8209
#: en/help_topics/configuration.txt:628
8210
msgid ""
8211
"If present, defines the ``--strict`` option default value for checking\n"
8212
"uncommitted changes before sending a merge directive."
8213
msgstr ""
8214
8215
#: en/help_topics/configuration.txt:631
8216
msgid ""
8217
"add.maximum_file_size\n"
8218
"~~~~~~~~~~~~~~~~~~~~~"
8219
msgstr ""
8220
8221
#: en/help_topics/configuration.txt:634
8222
msgid ""
8223
"Defines the maximum file size the command line \"add\" operation will allow\n"
8224
"in recursive mode, with files larger than this value being skipped. You "
8225
"may \n"
8226
"specify this value as an integer (in which case it is interpreted as "
8227
"bytes), \n"
8228
"or you may specify the value using SI units, i.e. 10KB, 20MB, 1G. A value of "
8229
"0 \n"
8230
"will disable skipping."
8231
msgstr ""
8232
8233
#: en/help_topics/configuration.txt:640
8234
msgid ""
8235
"External Merge Tools\n"
8236
"--------------------"
8237
msgstr ""
8238
8239
#: en/help_topics/configuration.txt:643
8240
msgid ""
8241
"bzr.mergetool.<name>\n"
8242
"~~~~~~~~~~~~~~~~~~~~"
8243
msgstr ""
8244
8245
#: en/help_topics/configuration.txt:646
8246
msgid ""
8247
"Defines an external merge tool called <name> with the given command-line.\n"
8248
"Arguments containing spaces should be quoted using single or double quotes. "
8249
"The\n"
8250
"executable may omit its path if it can be found on the PATH."
8251
msgstr ""
8252
8253
#: en/help_topics/configuration.txt:650
8254
msgid ""
8255
"The following markers can be used in the command-line to substitute "
8256
"filenames\n"
8257
"involved in the merge conflict::"
8258
msgstr ""
8259
8260
#: en/help_topics/configuration.txt:653
8261
msgid ""
8262
" {base} file.BASE\n"
8263
" {this} file.THIS\n"
8264
" {other} file.OTHER\n"
8265
" {result} output file\n"
8266
" {this_temp} temp copy of file.THIS, used to overwrite output file if "
8267
"merge\n"
8268
" succeeds."
8269
msgstr ""
8270
8271
#: en/help_topics/configuration.txt:662
8272
msgid " bzr.mergetool.kdiff3 = kdiff3 {base} {this} {other} -o {result}"
8273
msgstr ""
8274
8275
#: en/help_topics/configuration.txt:664
8276
msgid ""
8277
"bzr.default_mergetool\n"
8278
"~~~~~~~~~~~~~~~~~~~~~"
8279
msgstr ""
8280
8281
#: en/help_topics/configuration.txt:667
8282
msgid ""
8283
"Specifies which external merge tool (as defined above) should be selected "
8284
"by\n"
8285
"default in tools such as ``bzr qconflicts``."
8286
msgstr ""
8287
8288
#: en/help_topics/configuration.txt:672
8289
msgid " bzr.default_mergetool = kdiff3\n"
8290
msgstr ""
8291
8292
#: en/help_topics/conflict-types.txt:1
8293
msgid ""
8294
"Conflict Types\n"
8295
"=============="
8296
msgstr ""
8297
8298
#: en/help_topics/conflict-types.txt:4
8299
msgid ""
8300
"Some operations, like merge, revert and pull, modify the contents of your\n"
8301
"working tree. These modifications are programmatically generated, and so "
8302
"they\n"
8303
"may conflict with the current state of your working tree. "
8304
msgstr ""
8305
8306
#: en/help_topics/conflict-types.txt:8
8307
msgid ""
8308
"When conflicts are present in your working tree (as shown by ``bzr\n"
8309
"conflicts``), you should resolve them and then inform bzr that the "
8310
"conflicts\n"
8311
"have been resolved."
8312
msgstr ""
8313
8314
#: en/help_topics/conflict-types.txt:12
8315
msgid ""
8316
"Resolving conflicts is sometimes not obvious. Either because the user that\n"
8317
"should resolve them is not the one responsible for their occurrence, as is "
8318
"the\n"
8319
"case when merging other people's work or because some conflicts are "
8320
"presented\n"
8321
"in a way that is not easy to understand."
8322
msgstr ""
8323
8324
#: en/help_topics/conflict-types.txt:17
8325
msgid ""
8326
"Bazaar tries to avoid conflicts ; its aim is to ask you to resolve the\n"
8327
"conflict if and only if there's an actual conceptual conflict in the source\n"
8328
"tree. Because Bazaar doesn't understand the real meaning of the files "
8329
"being\n"
8330
"versioned, it can, when faced with ambiguities, fall short in either "
8331
"direction\n"
8332
"trying to resolve the conflict itself. Many kinds of changes can be "
8333
"combined\n"
8334
"programmatically, but sometimes only a human can determine the right thing "
8335
"to\n"
8336
"do."
8337
msgstr ""
8338
8339
#: en/help_topics/conflict-types.txt:25
8340
msgid ""
8341
"When Bazaar generates a conflict, it adds information into the working tree "
8342
"to\n"
8343
"present the conflicting versions, and it's up to you to find the correct\n"
8344
"resolution."
8345
msgstr ""
8346
8347
#: en/help_topics/conflict-types.txt:29
8348
msgid "Whatever the conflict is, resolving it is roughly done in two steps:"
8349
msgstr ""
8350
8351
#: en/help_topics/conflict-types.txt:31
8352
msgid ""
8353
"1. Modify the working tree content so that the conflicted item is now in "
8354
"the\n"
8355
" state you want to keep, then"
8356
msgstr ""
8357
8358
#: en/help_topics/conflict-types.txt:34
8359
msgid ""
8360
"2. Inform Bazaar that the conflict is now solved and ask to cleanup any\n"
8361
" remaining generated information (``bzr resolve <item>``)."
8362
msgstr ""
8363
8364
#: en/help_topics/conflict-types.txt:37
8365
msgid ""
8366
"For most conflict types, there are some obvious ways to modify the working\n"
8367
"tree and put it into the desired state. For some types of conflicts, Bazaar\n"
8368
"itself already made a choice, when possible."
8369
msgstr ""
8370
8371
#: en/help_topics/conflict-types.txt:41
8372
msgid ""
8373
"Yet, whether Bazaar makes a choice or not, there are some other simple but\n"
8374
"different ways to resolve the conflict."
8375
msgstr ""
8376
8377
#: en/help_topics/conflict-types.txt:44
8378
msgid ""
8379
"Each type of conflict is explained below, and the action which must be done "
8380
"to\n"
8381
"resolve the conflict is outlined."
8382
msgstr ""
8383
8384
#: en/help_topics/conflict-types.txt:47
8385
msgid ""
8386
"Various actions are available depending on the kind of conflict, for some "
8387
"of\n"
8388
"these actions, Bazaar can provide some help. In the end you should at least\n"
8389
"inform Bazaar that you're done with the conflict with::"
8390
msgstr ""
8391
8392
#: en/help_topics/conflict-types.txt:51
8393
msgid " ``bzr resolve FILE --action=done'"
8394
msgstr ""
8395
8396
#: en/help_topics/conflict-types.txt:53
8397
msgid ""
8398
"Note that this is the default action when a single file is involved so you "
8399
"can\n"
8400
"simply use::"
8401
msgstr ""
8402
8403
#: en/help_topics/conflict-types.txt:56
8404
msgid " ``bzr resolve FILE``"
8405
msgstr ""
8406
8407
#: en/help_topics/conflict-types.txt:58
8408
msgid "See ``bzr help resolve`` for more details."
8409
msgstr ""
8410
8411
#: en/help_topics/conflict-types.txt:60
8412
msgid ""
8413
"Text conflicts\n"
8414
"--------------"
8415
msgstr ""
8416
8417
#: en/help_topics/conflict-types.txt:63
8418
msgid "Typical message::"
8419
msgstr ""
8420
8421
#: en/help_topics/conflict-types.txt:65
8422
msgid " Text conflict in FILE"
8423
msgstr ""
8424
8425
#: en/help_topics/conflict-types.txt:67
8426
msgid ""
8427
"These are produced when a text merge cannot completely reconcile two sets "
8428
"of\n"
8429
"text changes. Bazaar will emit files for each version with the extensions\n"
8430
"THIS, OTHER, and BASE. THIS is the version of the file from the target "
8431
"tree,\n"
8432
"i.e. the tree that you are merging changes into. OTHER is the version that "
8433
"you\n"
8434
"are merging into the target. BASE is an older version that is used as a "
8435
"basis\n"
8436
"for comparison."
8437
msgstr ""
8438
8439
#: en/help_topics/conflict-types.txt:74
8440
msgid ""
8441
"In the main copy of the file, Bazaar will include all the changes that it\n"
8442
"could reconcile, and any un-reconciled conflicts are surrounded by\n"
8443
"\"herringbone\" markers like ``<<<<<<<``."
8444
msgstr ""
8445
8446
#: en/help_topics/conflict-types.txt:78
8447
msgid ""
8448
"Say the initial text is \"The project leader released it.\", and THIS "
8449
"modifies it\n"
8450
"to \"Martin Pool released it.\", while OTHER modifies it to \"The project "
8451
"leader\n"
8452
"released Bazaar.\" A conflict would look like this::"
8453
msgstr ""
8454
8455
#: en/help_topics/conflict-types.txt:82
8456
msgid ""
8457
" <<<<<<< TREE\n"
8458
" Martin Pool released it.\n"
8459
" =======\n"
8460
" The project leader released Bazaar.\n"
8461
" >>>>>>> MERGE-SOURCE"
8462
msgstr ""
8463
8464
#: en/help_topics/conflict-types.txt:88
8465
msgid "The correct resolution would be \"Martin Pool released Bazaar.\""
8466
msgstr ""
8467
8468
#: en/help_topics/conflict-types.txt:90
8469
msgid ""
8470
"You can handle text conflicts either by editing the main copy of the file,\n"
8471
"or by invoking external tools on the THIS, OTHER and BASE versions. It's\n"
8472
"worth mentioning that resolving text conflicts rarely involves picking one\n"
8473
"set of changes over the other (but see below when you encounter these\n"
8474
"cases). More often, the two sets of changes must be intelligently combined."
8475
msgstr ""
8476
8477
#: en/help_topics/conflict-types.txt:96
8478
msgid ""
8479
"If you edit the main copy, be sure to remove the herringbone markers. When\n"
8480
"you are done editing, the file should look like it never had a conflict, and "
8481
"be\n"
8482
"ready to commit."
8483
msgstr ""
8484
8485
#: en/help_topics/conflict-types.txt:100
8486
msgid ""
8487
"When you have resolved text conflicts, just run ``bzr resolve --auto``, and\n"
8488
"Bazaar will auto-detect which conflicts you have resolved."
8489
msgstr ""
8490
8491
#: en/help_topics/conflict-types.txt:103
8492
msgid ""
8493
"When the conflict is resolved, Bazaar deletes the previously generated\n"
8494
"``.BASE``, ``.THIS`` and ``.OTHER`` files if they are still present in the\n"
8495
"working tree."
8496
msgstr ""
8497
8498
#: en/help_topics/conflict-types.txt:107
8499
msgid ""
8500
"\n"
8501
"When you want to pick one set of changes over the other, you can use ``bzr\n"
8502
"resolve`` with one of the following actions:"
8503
msgstr ""
8504
8505
#: en/help_topics/conflict-types.txt:111
8506
msgid ""
8507
"* ``--action=take-this`` will issue ``mv FILE.THIS FILE``,\n"
8508
"* ``--action=take-other`` will issue ``mv FILE.OTHER FILE``."
8509
msgstr ""
8510
8511
#: en/help_topics/conflict-types.txt:114
8512
msgid ""
8513
"Note that if you have modified ``FILE.THIS`` or ``FILE.OTHER``, these\n"
8514
"modifications will be taken into account."
8515
msgstr ""
8516
8517
#: en/help_topics/conflict-types.txt:117
8518
msgid ""
8519
"Content conflicts\n"
8520
"-----------------"
8521
msgstr ""
8522
8523
#: en/help_topics/conflict-types.txt:122
8524
msgid " Contents conflict in FILE"
8525
msgstr ""
8526
8527
#: en/help_topics/conflict-types.txt:124
8528
msgid ""
8529
"This conflict happens when there are conflicting changes in the working "
8530
"tree\n"
8531
"and the merge source, but the conflicted items are not text files. They "
8532
"may\n"
8533
"be binary files, or symlinks, or directories. It can even happen with "
8534
"files\n"
8535
"that are deleted on one side, and modified on the other."
8536
msgstr ""
8537
8538
#: en/help_topics/conflict-types.txt:129
8539
msgid ""
8540
"Like text conflicts, Bazaar will emit THIS, OTHER and BASE files. (They may "
8541
"be\n"
8542
"regular files, symlinks or directories). But it will not include a \"main "
8543
"copy\"\n"
8544
"of the file with herringbone conflict markers. It will appear that the "
8545
"\"main\n"
8546
"copy\" has been renamed to THIS or OTHER."
8547
msgstr ""
8548
8549
#: en/help_topics/conflict-types.txt:134
8550
msgid ""
8551
"To resolve that kind of conflict, you should rebuild FILE from either "
8552
"version\n"
8553
"or a combination of both."
8554
msgstr ""
8555
8556
#: en/help_topics/conflict-types.txt:137
8557
msgid "``bzr resolve`` recognizes the following actions:"
8558
msgstr ""
8559
8560
#: en/help_topics/conflict-types.txt:139
8561
msgid ""
8562
"* ``--action=take-this`` will issue ``bzr mv FILE.THIS FILE``,\n"
8563
"* ``--action=take-other`` will issue ``bzr mv FILE.OTHER FILE``,\n"
8564
"* ``--action=done`` will just mark the conflict as resolved."
8565
msgstr ""
8566
8567
#: en/help_topics/conflict-types.txt:143
8568
msgid ""
8569
"Any action will also delete the previously generated ``.BASE``, ``.THIS`` "
8570
"and\n"
8571
"``.OTHER`` files if they are still present in the working tree."
8572
msgstr ""
8573
8574
#: en/help_topics/conflict-types.txt:146
8575
msgid ""
8576
"Bazaar cannot auto-detect when conflicts of this kind have been resolved."
8577
msgstr ""
8578
8579
#: en/help_topics/conflict-types.txt:148
8580
msgid ""
8581
"Tag conflicts\n"
8582
"-------------"
8583
msgstr ""
8584
8585
#: en/help_topics/conflict-types.txt:153
8586
msgid ""
8587
" Conflicting tags:\n"
8588
" version-0.1"
8589
msgstr ""
8590
8591
#: en/help_topics/conflict-types.txt:156
8592
msgid ""
8593
"When pulling from or pushing to another branch, Bazaar informs you about "
8594
"tags\n"
8595
"that conflict between the two branches; that is the same tag points to two\n"
8596
"different revisions. You need not resolve these conflicts, but subsequent\n"
8597
"uses of pull or push will result in the same message."
8598
msgstr ""
8599
8600
#: en/help_topics/conflict-types.txt:161
8601
msgid ""
8602
"To resolve the conflict, you must apply the correct tags to either the "
8603
"target\n"
8604
"branch or the source branch as appropriate. Use \"bzr tags --show-ids -d\n"
8605
"SOURCE_URL\" to see the tags in the source branch. If you want to make the\n"
8606
"target branch's tags match the source branch, then in the target branch do\n"
8607
"``bzr tag --force -r revid:REVISION_ID CONFLICTING_TAG`` for each of the\n"
8608
"CONFLICTING_TAGs, where REVISION_ID comes from the list of tags in the "
8609
"source\n"
8610
"branch. You need not call \"bzr resolve\" after doing this. To resolve in\n"
8611
"favor of the target branch, you need to similarly use ``tag --force`` in "
8612
"the\n"
8613
"source branch. (Note that pulling or pushing using --overwrite will "
8614
"overwrite\n"
8615
"all tags as well.)"
8616
msgstr ""
8617
8618
#: en/help_topics/conflict-types.txt:172
8619
msgid ""
8620
"Duplicate paths\n"
8621
"---------------"
8622
msgstr ""
8623
8624
#: en/help_topics/conflict-types.txt:177
8625
msgid " Conflict adding file FILE. Moved existing file to FILE.moved."
8626
msgstr ""
8627
8628
#: en/help_topics/conflict-types.txt:179
8629
msgid ""
8630
"Sometimes Bazaar will attempt to create a file using a pathname that has\n"
8631
"already been used. The existing file will be renamed to \"FILE.moved\". "
8632
msgstr ""
8633
8634
#: en/help_topics/conflict-types.txt:187
8635
msgid ""
8636
"* ``--action=take-this`` will issue ``bzr rm FILE ; bzr mv FILE.moved "
8637
"FILE``,\n"
8638
"* ``--action=take-other`` will issue ``bzr rm FILE.moved``,\n"
8639
"* ``--action=done`` will just mark the conflict as resolved."
8640
msgstr ""
8641
8642
#: en/help_topics/conflict-types.txt:191
8643
msgid ""
8644
"Note that you must get rid of FILE.moved before using ``--action=done``."
8645
msgstr ""
8646
8647
#: en/help_topics/conflict-types.txt:195
8648
msgid ""
8649
"Unversioned parent\n"
8650
"------------------"
8651
msgstr ""
8652
8653
#: en/help_topics/conflict-types.txt:200
8654
msgid " Conflict because FILE is not versioned, but has versioned children."
8655
msgstr ""
8656
8657
#: en/help_topics/conflict-types.txt:202
8658
msgid ""
8659
"Sometimes Bazaar will attempt to create a file whose parent directory is "
8660
"not\n"
8661
"versioned. This happens when the directory has been deleted in the target,\n"
8662
"but has a new child in the source, or vice versa. In this situation, "
8663
"Bazaar\n"
8664
"will version the parent directory as well. Resolving this issue depends\n"
8665
"very much on the particular scenario. You may wish to rename or delete "
8666
"either\n"
8667
"the file or the directory. When you are satisfied, you can run \"bzr "
8668
"resolve\n"
8669
"FILE\" to mark the conflict as resolved."
8670
msgstr ""
8671
8672
#: en/help_topics/conflict-types.txt:210
8673
msgid ""
8674
"Missing parent\n"
8675
"--------------"
8676
msgstr ""
8677
8678
#: en/help_topics/conflict-types.txt:215
8679
msgid " Conflict adding files to FILE. Created directory."
8680
msgstr ""
8681
8682
#: en/help_topics/conflict-types.txt:217
8683
msgid ""
8684
"This happens when a directory has been deleted in the target, but has new\n"
8685
"children in the source. This is similar to the \"unversioned parent\" "
8686
"conflict,\n"
8687
"except that the parent directory does not *exist*, instead of just being\n"
8688
"unversioned. In this situation, Bazaar will create the missing parent.\n"
8689
"Resolving this issue depends very much on the particular scenario."
8690
msgstr ""
8691
8692
#: en/help_topics/conflict-types.txt:223
8693
msgid ""
8694
"To resolve that kind of conflict, you should either remove or rename the\n"
8695
"children or the directory or a combination of both."
8696
msgstr ""
8697
8698
#: en/help_topics/conflict-types.txt:228
8699
msgid ""
8700
"* ``--action=take-this`` will issue ``bzr rm directory`` including the\n"
8701
" children,\n"
8702
"* ``--action=take-other`` will acknowledge Bazaar choice to keep the "
8703
"children\n"
8704
" and restoring the directory,\n"
8705
"* ``--action=done`` will just mark the conflict as resolved."
8706
msgstr ""
8707
8708
#: en/help_topics/conflict-types.txt:236
8709
msgid ""
8710
"Deleting parent\n"
8711
"---------------"
8712
msgstr ""
8713
8714
#: en/help_topics/conflict-types.txt:241
8715
msgid " Conflict: can't delete DIR because it is not empty. Not deleting."
8716
msgstr ""
8717
8718
#: en/help_topics/conflict-types.txt:243
8719
msgid ""
8720
"This is the opposite of \"missing parent\". A directory is deleted in the\n"
8721
"source, but has new children in the target (either because a directory\n"
8722
"deletion is merged or because the merge introduce new children). Bazaar\n"
8723
"will retain the directory. Resolving this issue depends very much on the\n"
8724
"particular scenario."
8725
msgstr ""
8726
8727
#: en/help_topics/conflict-types.txt:254
8728
msgid ""
8729
"* ``--action=take-this`` will acknowledge Bazaar choice to keep the "
8730
"directory,"
8731
msgstr ""
8732
8733
#: en/help_topics/conflict-types.txt:256
8734
msgid ""
8735
"* ``--action=take-other`` will issue ``bzr rm directory`` including the \n"
8736
" children,"
8737
msgstr ""
8738
8739
#: en/help_topics/conflict-types.txt:259
8740
msgid "* ``--action=done`` will just mark the conflict as resolved."
8741
msgstr ""
8742
8743
#: en/help_topics/conflict-types.txt:261
8744
msgid ""
8745
"Note that when merging a directory deletion, if unversioned files are\n"
8746
"present, they become potential orphans has they don't have a directory\n"
8747
"parent anymore."
8748
msgstr ""
8749
8750
#: en/help_topics/conflict-types.txt:265
8751
msgid ""
8752
"Handling such orphans, *before* the conflict is created, is controlled by\n"
8753
"setting the ``bzr.transform.orphan_policy`` configuration option."
8754
msgstr ""
8755
8756
#: en/help_topics/conflict-types.txt:268
8757
msgid "There are two possible values for this option:"
8758
msgstr ""
8759
8760
#: en/help_topics/conflict-types.txt:270
8761
msgid ""
8762
"* ``conflict`` (the default): will leave the orphans in place and\n"
8763
" generate a conflicts,"
8764
msgstr ""
8765
8766
#: en/help_topics/conflict-types.txt:273
8767
msgid ""
8768
"* ``move``: will move the orphans to a ``bzr-orphans`` directory at the "
8769
"root\n"
8770
" of the working tree with names like ``<file>.~#~``."
8771
msgstr ""
8772
8773
#: en/help_topics/conflict-types.txt:278
8774
msgid ""
8775
"Path conflict\n"
8776
"-------------"
8777
msgstr ""
8778
8779
#: en/help_topics/conflict-types.txt:283
8780
msgid " Path conflict: PATH1 / PATH2"
8781
msgstr ""
8782
8783
#: en/help_topics/conflict-types.txt:285
8784
msgid ""
8785
"This happens when the source and target have each modified the name or "
8786
"parent\n"
8787
"directory of a file. Bazaar will use the path elements from the source."
8788
msgstr ""
8789
8790
#: en/help_topics/conflict-types.txt:288
8791
msgid ""
8792
"To resolve that kind of conflict, you just have to decide what name should "
8793
"be\n"
8794
"retained for the file involved."
8795
msgstr ""
8796
8797
#: en/help_topics/conflict-types.txt:293
8798
msgid ""
8799
"* ``--action=take-this`` will revert Bazaar choice and keep ``PATH1`` by\n"
8800
" issuing ``bzr mv PATH2 PATH1``,\n"
8801
"* ``--action=take-other`` will acknowledge Bazaar choice of keeping "
8802
"``PATH2``,\n"
8803
"* ``--action=done`` will just mark the conflict as resolved."
8804
msgstr ""
8805
8806
#: en/help_topics/conflict-types.txt:300
8807
msgid ""
8808
"Parent loop\n"
8809
"-----------"
8810
msgstr ""
8811
8812
#: en/help_topics/conflict-types.txt:305
8813
msgid " Conflict moving FILE into DIRECTORY. Cancelled move."
8814
msgstr ""
8815
8816
#: en/help_topics/conflict-types.txt:307
8817
msgid ""
8818
"This happens when the source and the target have each moved directories, so\n"
8819
"that, if the change could be applied, a directory would be contained by "
8820
"itself.\n"
8821
"For example::"
8822
msgstr ""
8823
8824
#: en/help_topics/conflict-types.txt:311
8825
msgid ""
8826
" $ bzr init\n"
8827
" $ bzr mkdir white\n"
8828
" $ bzr mkdir black\n"
8829
" $ bzr commit -m \"BASE\"\n"
8830
" $ bzr branch . ../other\n"
8831
" $ bzr mv white black\n"
8832
" $ bzr commit -m \"THIS\"\n"
8833
" $ bzr mv ../other/black ../other/white\n"
8834
" $ bzr commit ../other -m \"OTHER\"\n"
8835
" $ bzr merge ../other"
8836
msgstr ""
8837
8838
#: en/help_topics/conflict-types.txt:322
8839
msgid ""
8840
"In this situation, Bazaar will cancel the move, and leave ``white`` in\n"
8841
"``black``. To resolve that kind of conflict, you just have to decide what\n"
8842
"name should be retained for the directories involved."
8843
msgstr ""
8844
8845
#: en/help_topics/conflict-types.txt:328
8846
msgid ""
8847
"* ``--action=take-this`` will acknowledge Bazaar choice of leaving "
8848
"``white`` \n"
8849
" in ``black``,\n"
8850
"* ``--action=take-other`` will revert Bazaar choice and move ``black`` in\n"
8851
" ``white`` by issuing ``bzr mv black/white white ; bzr mv black white``,\n"
8852
"* ``--action=done`` will just mark the conflict as resolved."
8853
msgstr ""
8854
8855
#: en/help_topics/conflict-types.txt:336
8856
msgid ""
8857
"Non-directory parent\n"
8858
"--------------------"
8859
msgstr ""
8860
8861
#: en/help_topics/conflict-types.txt:341
8862
msgid ""
8863
" Conflict: foo.new is not a directory, but has files in it.\n"
8864
" Created directory."
8865
msgstr ""
8866
8867
#: en/help_topics/conflict-types.txt:344
8868
msgid ""
8869
"This happens when one side has added files to a directory, and the other "
8870
"side\n"
8871
"has changed the directory into a file or symlink. For example::"
8872
msgstr ""
8873
8874
#: en/help_topics/conflict-types.txt:347
8875
msgid ""
8876
" $ bzr init\n"
8877
" $ bzr mkdir foo\n"
8878
" $ bzr commit -m \"BASE\"\n"
8879
" $ bzr branch . ../other\n"
8880
" $ rmdir foo\n"
8881
" $ touch foo\n"
8882
" $ bzr commit -m \"THIS\"\n"
8883
" $ bzr mkdir ../other/foo/bar\n"
8884
" $ bzr commit ../other -m \"OTHER\"\n"
8885
" $ bzr merge ../other"
8886
msgstr ""
8887
8888
#: en/help_topics/conflict-types.txt:358
8889
msgid ""
8890
"To resolve that kind of conflict, you have to decide what name should be\n"
8891
"retained for the file, directory or symlink involved."
8892
msgstr ""
8893
8894
#: en/help_topics/conflict-types.txt:363
8895
msgid ""
8896
"* ``--action=take-this`` will issue ``bzr rm --force foo.new`` and \n"
8897
" ``bzr add foo``,\n"
8898
"* ``--action=take-other`` will issue ``bzr rm --force foo`` and \n"
8899
" ``bzr mv foo.new foo``,\n"
8900
"* ``--action=done`` will just mark the conflict as resolved."
8901
msgstr ""
8902
8903
#: en/help_topics/conflict-types.txt:371
8904
msgid ""
8905
"MalformedTransform\n"
8906
"------------------"
8907
msgstr ""
8908
8909
#: en/help_topics/conflict-types.txt:374
8910
msgid ""
8911
"It is possible (though very rare) for Bazaar to raise a MalformedTransform\n"
8912
"exception. This means that Bazaar encountered a filesystem conflict that it "
8913
"was\n"
8914
"unable to resolve. This usually indicates a bug. Please let us know if "
8915
"you\n"
8916
"encounter this. Our bug tracker is at https://launchpad.net/bzr/+bugs\n"
8917
msgstr ""
8918
8919
#: en/help_topics/content-filters.txt:1
8920
msgid ""
8921
"Content Filters\n"
8922
"==============="
8923
msgstr ""
8924
8925
#: en/help_topics/content-filters.txt:4
8926
msgid ""
8927
"Content formats\n"
8928
"---------------"
8929
msgstr ""
8930
8931
#: en/help_topics/content-filters.txt:7
8932
msgid ""
8933
"Bazaar's content filtering allows you to store files in a different\n"
8934
"format from the copy in your working tree. This lets you, or your\n"
8935
"co-developers, use Windows development tools that expect CRLF files\n"
8936
"on projects that use other line-ending conventions. Among other things,\n"
8937
"content filters also let Unix developers more easily work on projects\n"
8938
"using Windows line-ending conventions, keyword expansion/compression,\n"
8939
"and trailing spaces on lines in text files to be implicitly stripped\n"
8940
"when committed."
8941
msgstr ""
8942
8943
#: en/help_topics/content-filters.txt:16
8944
msgid "To generalize, there are two content formats supported by Bazaar:"
8945
msgstr ""
8946
8947
#: en/help_topics/content-filters.txt:18
8948
msgid ""
8949
"* a canonical format - how files are stored internally\n"
8950
"* a convenience format - how files are created in a working tree."
8951
msgstr ""
8952
8953
#: en/help_topics/content-filters.txt:21
8954
msgid ""
8955
"\n"
8956
"Format conversion\n"
8957
"-----------------"
8958
msgstr ""
8959
8960
#: en/help_topics/content-filters.txt:25
8961
msgid ""
8962
"The conversion between these formats is done by content filters.\n"
8963
"A content filter has two parts:"
8964
msgstr ""
8965
8966
#: en/help_topics/content-filters.txt:28
8967
msgid ""
8968
"* a read converter - converts from convenience to canonical format\n"
8969
"* a write converter - converts from canonical to convenience format."
8970
msgstr ""
8971
8972
#: en/help_topics/content-filters.txt:31
8973
msgid ""
8974
"Many of these converters will provide *round-trip* conversion,\n"
8975
"i.e. applying the read converter followed by the write converter\n"
8976
"gives back the original content. However, others may provide an\n"
8977
"asymmetric conversion. For example, a read converter might strip\n"
8978
"trailing whitespace off lines in source code while the matching\n"
8979
"write converter might pass content through unchanged."
8980
msgstr ""
8981
8982
#: en/help_topics/content-filters.txt:38
8983
msgid ""
8984
"\n"
8985
"Enabling content filters\n"
8986
"------------------------"
8987
msgstr ""
8988
8989
#: en/help_topics/content-filters.txt:42
8990
msgid ""
8991
"Content filters are typically provided by plugins, so the first step\n"
8992
"in using them is to install the relevant plugins and read their\n"
8993
"documentation. Some plugins may be very specific about which files\n"
8994
"they filter, e.g. only files ending in ``.java`` or ``.php``.\n"
8995
"In other cases, the plugin may leave it in the user's hands to\n"
8996
"define which files are to be filtered. This is typically done\n"
8997
"using rule-based preferences. See ``bzr help rules`` for general\n"
8998
"information about defining these."
8999
msgstr ""
9000
9001
#: en/help_topics/content-filters.txt:51
9002
msgid ""
9003
"\n"
9004
"Impact on commands\n"
9005
"------------------"
9006
msgstr ""
9007
9008
#: en/help_topics/content-filters.txt:55
9009
msgid ""
9010
"Read converters are only applied to commands that read content from\n"
9011
"a working tree, e.g. status, diff and commit. For example, ``bzr diff``\n"
9012
"will apply read converters to files in the working tree, then compare\n"
9013
"the results to the content last committed."
9014
msgstr ""
9015
9016
#: en/help_topics/content-filters.txt:60
9017
msgid ""
9018
"Write converters are only applied by commands that **create files in a\n"
9019
"working tree**, e.g. branch, checkout, update. If you wish to see the\n"
9020
"canonical format of a file or tree, use ``bzr cat`` or ``bzr export``\n"
9021
"respectively."
9022
msgstr ""
9023
9024
#: en/help_topics/content-filters.txt:65
9025
msgid ""
9026
"Note: ``bzr commit`` does not implicitly apply write converters after\n"
9027
"comitting files. If this makes sense for a given plugin providing\n"
9028
"a content filter, the plugin can usually achieve this effect by using a\n"
9029
"``start_commit`` or ``post_commit`` hook say. See :doc:`hooks-help`\n"
9030
"for more information on hooks."
9031
msgstr ""
9032
9033
#: en/help_topics/content-filters.txt:71
9034
msgid ""
9035
"\n"
9036
"Refreshing your working tree\n"
9037
"----------------------------"
9038
msgstr ""
9039
9040
#: en/help_topics/content-filters.txt:75
9041
msgid ""
9042
"For performance reasons, Bazaar caches the timestamps of files in\n"
9043
"a working tree, and assumes files are unchanged if their timestamps\n"
9044
"match the cached values. As a consequence, there are times when\n"
9045
"you may need to explicitly ask for content filtering to be reapplied\n"
9046
"in one or both directions, e.g. after installing or reconfiguring\n"
9047
"plugins providing it."
9048
msgstr ""
9049
9050
#: en/help_topics/content-filters.txt:82
9051
msgid "Here are some general guidelines for doing this:"
9052
msgstr ""
9053
9054
#: en/help_topics/content-filters.txt:84
9055
msgid ""
9056
" * To reapply read converters, ``touch`` files, i.e. update their\n"
9057
" timestamp. Operations like ``bzr status`` should then reapply the\n"
9058
" relevant read converters and compare the end result with the\n"
9059
" canonical format."
9060
msgstr ""
9061
9062
#: en/help_topics/content-filters.txt:89
9063
msgid ""
9064
" * To reapply write converters, ensure there are no local changes,\n"
9065
" delete the relevant files and run ``bzr revert`` on those files."
9066
msgstr ""
9067
9068
#: en/help_topics/content-filters.txt:92
9069
msgid ""
9070
"Note: In the future, it is likely that additional options will be added\n"
9071
"to commands to make this refreshing process faster and safer.\n"
9072
msgstr ""
9073
9074
#: en/help_topics/current-formats.txt:1
9075
msgid "Current Storage Formats"
9076
msgstr ""
9077
9078
#: en/help_topics/current-formats.txt:3
9079
msgid ""
9080
":2a:\n"
9081
" (native) (default) First format for bzr 2.0 series. Uses group-\n"
9082
" compress storage. Provides rich roots which are a one-way\n"
9083
" transition."
9084
msgstr ""
9085
9086
#: en/help_topics/current-formats.txt:8
9087
msgid ""
9088
":pack-0.92:\n"
9089
" (native) New in 0.92: Pack-based format with data compatible with\n"
9090
" dirstate-tags format repositories. Interoperates with bzr\n"
9091
" repositories before 0.92 but cannot be read by bzr < 0.92."
9092
msgstr ""
9093
9094
#: en/help_topics/current-formats.txt:13
9095
msgid ""
9096
":1.14:\n"
9097
" (native) A working-tree format that supports content filtering."
9098
msgstr ""
9099
9100
#: en/help_topics/current-formats.txt:16
9101
msgid ""
9102
":1.14-rich-root:\n"
9103
" (native) A variant of 1.14 that supports rich-root data (needed\n"
9104
" for bzr-svn and bzr-git)."
9105
msgstr ""
9106
9107
#: en/help_topics/current-formats.txt:20
9108
msgid ""
9109
"\n"
9110
"See :doc:`formats-help` for more about storage formats."
9111
msgstr ""
9112
9113
#: en/help_topics/debug-flags.txt:1
9114
msgid ""
9115
"Debug Flags\n"
9116
"==========="
9117
msgstr ""
9118
9119
#: en/help_topics/debug-flags.txt:4
9120
msgid ""
9121
"These flags can be passed on the bzr command line or (without the ``-D``\n"
9122
"prefix) put in the ``debug_flags`` variable in ``bazaar.conf``."
9123
msgstr ""
9124
9125
#: en/help_topics/debug-flags.txt:7
9126
msgid ""
9127
"-Dauth Trace authentication sections used.\n"
9128
"-Dbytes Print out how many bytes were transferred\n"
9129
"-Ddirstate Trace dirstate activity (verbose!)\n"
9130
"-Derror Instead of normal error handling, always print a "
9131
"traceback\n"
9132
" on error.\n"
9133
"-Devil Capture call sites that do expensive or badly-scaling\n"
9134
" operations.\n"
9135
"-Dfetch Trace history copying between repositories.\n"
9136
"-Dfilters Emit information for debugging content filtering.\n"
9137
"-Dforceinvdeltas Force use of inventory deltas during generic streaming "
9138
"fetch.\n"
9139
"-Dgraph Trace graph traversal.\n"
9140
"-Dhashcache Log every time a working file is read to determine its "
9141
"hash.\n"
9142
"-Dhooks Trace hook execution.\n"
9143
"-Dhpss Trace smart protocol requests and responses.\n"
9144
"-Dhpssdetail More hpss details.\n"
9145
"-Dhpssvfs Traceback on vfs access to Remote objects.\n"
9146
"-Dhttp Trace http connections, requests and responses.\n"
9147
"-Dindex Trace major index operations.\n"
9148
"-Dknit Trace knit operations.\n"
9149
"-Dlock Trace when lockdir locks are taken or released.\n"
9150
"-Dprogress Trace progress bar operations.\n"
9151
"-Dmem_dump Dump memory to a file upon an out of memory error.\n"
9152
"-Dmerge Emit information for debugging merges.\n"
9153
"-Dno_apport Don't use apport to report crashes.\n"
9154
"-Dno_activity \t Don't show transport activity indicator in progress bar.\n"
9155
"-Dpack Emit information about pack operations.\n"
9156
"-Drelock Emit a message every time a branch or repository object "
9157
"is\n"
9158
" unlocked then relocked the same way.\n"
9159
"-Dsftp Trace SFTP internals.\n"
9160
"-Dstatic_tuple Error when a tuple is used where a StaticTuple is "
9161
"expected\n"
9162
"-Dstream Trace fetch streams.\n"
9163
"-Dstrict_locks Trace when OS locks are potentially used in a non-"
9164
"portable\n"
9165
" manner.\n"
9166
"-Dunlock Some errors during unlock are treated as warnings.\n"
9167
"-DIDS_never Never use InterDifferingSerializer when fetching.\n"
9168
"-DIDS_always Always use InterDifferingSerializer to fetch if "
9169
"appropriate\n"
9170
" for the format, even for non-local fetches.\n"
9171
msgstr ""
9172
9173
#: en/help_topics/diverged-branches.txt:1
9174
msgid ""
9175
"Diverged Branches\n"
9176
"================="
9177
msgstr ""
9178
9179
#: en/help_topics/diverged-branches.txt:4
9180
msgid ""
9181
"When Bazaar tries to push one branch onto another, it requires that the\n"
9182
"destination branch must be ready to receive the source branch. If this "
9183
"isn't\n"
9184
"the case, then we say that the branches have ``diverged``. Branches are\n"
9185
"considered diverged if the destination branch's most recent commit is one "
9186
"that\n"
9187
"has not been merged (directly or indirectly) by the source branch. To "
9188
"recover\n"
9189
"from diverged branches, one must merge the missing revisions into the "
9190
"source\n"
9191
"branch."
9192
msgstr ""
9193
9194
#: en/help_topics/diverged-branches.txt:12
9195
msgid ""
9196
"This situation commonly arises when using a centralized workflow with local\n"
9197
"commits. If someone else has committed new work to the mainline since your\n"
9198
"last pull and you have local commits that have not yet been pushed to the\n"
9199
"mainline, then your local branch and the mainline have diverged."
9200
msgstr ""
9201
9202
#: en/help_topics/diverged-branches.txt:17
9203
msgid ""
9204
"Discovering What Has Diverged\n"
9205
"-----------------------------"
9206
msgstr ""
9207
9208
#: en/help_topics/diverged-branches.txt:20
9209
msgid ""
9210
"The ``bzr missing`` command is used to find out what revisions are in "
9211
"another\n"
9212
"branch that are not present in the current branch, and vice-versa. It shows "
9213
"a\n"
9214
"summary of which extra revisions exist in each branch. If you want to see "
9215
"the\n"
9216
"precise effects of those revisions, you can use ``bzr diff --"
9217
"old=other_branch``\n"
9218
"to show the differences between other_branch and your current branch."
9219
msgstr ""
9220
9221
#: en/help_topics/diverged-branches.txt:26
9222
msgid ""
9223
"A Solution\n"
9224
"----------"
9225
msgstr ""
9226
9227
#: en/help_topics/diverged-branches.txt:29
9228
msgid ""
9229
"The solution is to merge the revisions from the mainline into your local\n"
9230
"branch. To do so, use ``bzr merge`` to get the new revisions from the\n"
9231
"mainline. This merge may result in conflicts if the other developer's "
9232
"changes\n"
9233
"overlap with your changes. These conflicts should be resolved before\n"
9234
"continuing. After any conflicts have been resolved, or even if there were "
9235
"no\n"
9236
"conflicts, Bazaar requires that you explicitly commit these new revisions\n"
9237
"to your local branch. This requirement gives you an opportunity to test "
9238
"the\n"
9239
"resulting working tree for correctness, since the merged revisions could "
9240
"have\n"
9241
"made arbitrary changes. After testing, you should commit the merge using\n"
9242
"``bzr commit``. This clears up the diverged branches situation. Your "
9243
"local\n"
9244
"branch can now be pushed to the mainline.\n"
9245
msgstr ""
9246
9247
#: en/help_topics/eol.txt:1
9248
msgid ""
9249
"End of Line Conversion\n"
9250
"======================"
9251
msgstr ""
9252
9253
#: en/help_topics/eol.txt:4
9254
msgid ""
9255
"EOL conversion is provided as a content filter where Bazaar internally\n"
9256
"stores a canonical format but outputs a convenience format. See\n"
9257
"``bzr help content-filters`` for general information about using these."
9258
msgstr ""
9259
9260
#: en/help_topics/eol.txt:8
9261
msgid ""
9262
"Note: Content filtering is only supported in recently added formats,\n"
9263
"e.g. 1.14. Be sure that both the repository *and* the branch are\n"
9264
"in a recent format. (Just setting the format on the repository\n"
9265
"is not enough.) If content filtering does not appear to be working, use\n"
9266
"'bzr info -v' to confirm that the branch is using \"Working tree format 5\"\n"
9267
"or later."
9268
msgstr ""
9269
9270
#: en/help_topics/eol.txt:15
9271
msgid ""
9272
"EOL conversion needs to be enabled for selected file patterns using\n"
9273
"rules. See ``bzr help rules`` for general information on defining rules.\n"
9274
"Currently, rules are only supported in $BZR_HOME/.bazaar/rules (or\n"
9275
"%BZR_HOME%/bazaar/2.0/rules on Windows). Branch specific rules will be\n"
9276
"supported in a future verison of Bazaar."
9277
msgstr ""
9278
9279
#: en/help_topics/eol.txt:21
9280
msgid ""
9281
"To configure which files to filter, set ``eol`` to one of the values below.\n"
9282
"(If a value is not set, ``exact`` is the default.)"
9283
msgstr ""
9284
9285
#: en/help_topics/eol.txt:24
9286
msgid ""
9287
" ========== ===================================== ======================\n"
9288
" Value Checkout end-of-lines as Commit end-of-lines as\n"
9289
" ========== ===================================== ======================\n"
9290
" ``native`` ``crlf`` on Windows, ``lf`` otherwise ``lf``\n"
9291
" ---------- ------------------------------------- ----------------------\n"
9292
" ``lf`` ``lf`` ``lf``\n"
9293
" ---------- ------------------------------------- ----------------------\n"
9294
" ``crlf`` ``crlf`` ``lf``\n"
9295
" ---------- ------------------------------------- ----------------------\n"
9296
" ``exact`` No conversion Exactly as in file\n"
9297
" ========== ===================================== ======================"
9298
msgstr ""
9299
9300
#: en/help_topics/eol.txt:36
9301
msgid ""
9302
"Note: For safety reasons, no conversion is applied to any file where a null\n"
9303
"byte is detected in the file."
9304
msgstr ""
9305
9306
#: en/help_topics/eol.txt:39
9307
msgid ""
9308
"For users working on a cross-platform project, here is a suggested rule\n"
9309
"to use as a starting point::"
9310
msgstr ""
9311
9312
#: en/help_topics/eol.txt:42
9313
msgid ""
9314
" [name *]\n"
9315
" eol = native"
9316
msgstr ""
9317
9318
#: en/help_topics/eol.txt:45
9319
msgid ""
9320
"If you have binary files that do not contain a null byte though, be\n"
9321
"sure to add ``eol = exact`` rules for those as well. You can do this\n"
9322
"by giving more explicit patterns earlier in the rules file. For example::"
9323
msgstr ""
9324
9325
#: en/help_topics/eol.txt:49
9326
msgid ""
9327
" [name *.png]\n"
9328
" eol = exact"
9329
msgstr ""
9330
9331
#: en/help_topics/eol.txt:55
9332
msgid ""
9333
"If your working tree is on a network drive shared by users on different\n"
9334
"operating systems, you typically want to force certain conventions for\n"
9335
"certain files. In that way, if a file is created with the wrong line\n"
9336
"endings or line endings get mixed during editing, it gets committed\n"
9337
"correctly and gets checked out correctly. For example::"
9338
msgstr ""
9339
9340
#: en/help_topics/eol.txt:61
9341
msgid ""
9342
" [name *.bat]\n"
9343
" eol = crlf"
9344
msgstr ""
9345
9346
#: en/help_topics/eol.txt:64
9347
msgid ""
9348
" [name *.sh]\n"
9349
" eol = lf"
9350
msgstr ""
9351
9352
#: en/help_topics/eol.txt:70
9353
msgid ""
9354
"If you take the care to create files with their required endings, you can\n"
9355
"achieve *almost* the same thing by using ``eol = exact``. It is slightly\n"
9356
"safer to use ``lf`` and ``crlf`` though because edits accidentally\n"
9357
"introducing mixed line endings will be corrected during commit for files\n"
9358
"with those settings."
9359
msgstr ""
9360
9361
#: en/help_topics/eol.txt:76
9362
msgid ""
9363
"If you have sample test data that deliberately has text files with mixed\n"
9364
"newline conventions, you can ask for those to be left alone like this::"
9365
msgstr ""
9366
9367
#: en/help_topics/eol.txt:79
9368
msgid ""
9369
" [name test_data/]\n"
9370
" eol = exact"
9371
msgstr ""
9372
9373
#: en/help_topics/eol.txt:85
9374
msgid ""
9375
"Note that ``exact`` does not imply the file is binary but it does mean\n"
9376
"that no conversion of end-of-lines will be done. (Bazaar currently relies\n"
9377
"of content analysis to detect binary files for commands like ``diff``.\n"
9378
"In the future, a ``binary = true`` rule may be added but it is not\n"
9379
"supported yet.)"
9380
msgstr ""
9381
9382
#: en/help_topics/eol.txt:91
9383
msgid ""
9384
"If you have an existing repository with text files already stored using\n"
9385
"Windows newline conventions (``crlf``), then you may want to keep using "
9386
"that\n"
9387
"convention in the repository. Forcing certain files to this convention\n"
9388
"may also help users who do not have rules configured. To do this, set\n"
9389
"``eol`` to one of the values below."
9390
msgstr ""
9391
9392
#: en/help_topics/eol.txt:97
9393
msgid ""
9394
" ============================ ======================== "
9395
"======================\n"
9396
" Value Checkout end-of-lines as Commit end-of-lines "
9397
"as\n"
9398
" ============================ ======================== "
9399
"======================\n"
9400
" ``native-with-crlf-in-repo`` ``crlf`` on Windows, ``crlf``\n"
9401
" ``lf`` otherwise\n"
9402
" ---------------------------- ------------------------ "
9403
"----------------------\n"
9404
" ``lf-with-crlf-in-repo`` ``lf`` ``crlf``\n"
9405
" ---------------------------- ------------------------ "
9406
"----------------------\n"
9407
" ``crlf-with-crlf-in-repo`` ``crlf`` ``crlf``\n"
9408
" ============================ ======================== ======================"
9409
msgstr ""
9410
9411
#: en/help_topics/eol.txt:108
9412
msgid ""
9413
"For users working on an existing project that uses Windows newline\n"
9414
"conventions in their Bazaar repository, this rule is suggested as a\n"
9415
"starting point::"
9416
msgstr ""
9417
9418
#: en/help_topics/eol.txt:112
9419
msgid ""
9420
" [name *]\n"
9421
" eol = native-with-crlf-in-repo"
9422
msgstr ""
9423
9424
#: en/help_topics/eol.txt:115
9425
msgid ""
9426
"For new projects, it is recommended that end-of-lines be stored as ``lf``\n"
9427
"and that users stick to the basic settings, i.e. ``native``, ``lf``,\n"
9428
"``crlf`` and ``exact``."
9429
msgstr ""
9430
9431
#: en/help_topics/eol.txt:119
9432
msgid ""
9433
"Note: Bazaar's EOL conversion will convert the content of files but\n"
9434
"never reject files because a given line ending or mixed line endings\n"
9435
"are found. A precommit hook should be used if you wish to validate\n"
9436
"(and not just convert) content before committing.\n"
9437
msgstr ""
9438
9439
#: en/help_topics/hidden-commands.txt:1
9440
msgid ""
9441
"added List files added in working tree.\n"
9442
"ancestry List all revisions merged into this branch.\n"
9443
"assert-fail Test reporting of assertion failures\n"
9444
"bundle-info Output interesting stats about a bundle\n"
9445
"bundle-revisions Create a merge-directive for submitting changes.\n"
9446
"cat-revision Write out metadata for a revision.\n"
9447
"dpush Push into a different VCS without any custom bzr\n"
9448
" metadata.\n"
9449
"dump-btree Dump the contents of a btree index file to stdout.\n"
9450
"export-pot Export command helps and error messages in po "
9451
"format.\n"
9452
"file-id Print file_id of a particular file or directory.\n"
9453
"file-path Print path of file_ids to a file or directory.\n"
9454
"find-merge-base Find and print a base revision for merging two "
9455
"branches.\n"
9456
"hooks Show hooks.\n"
9457
"inventory Show inventory of the current working copy or a\n"
9458
" revision.\n"
9459
"is-ignored Check if a path is ignored. [qbzr]\n"
9460
"is-versioned Check if a path is versioned. [qbzr]\n"
9461
"local-time-offset Show the offset in seconds from GMT to local time.\n"
9462
"lookup-revision Lookup the revision-id from a revision-number\n"
9463
"merge-directive Generate a merge directive for auto-merge tools.\n"
9464
"modified List files modified in working tree.\n"
9465
"qcheckout-ala-explorer Checkout a branch. The checkout is always "
9466
"lightweight.\n"
9467
" [explorer]\n"
9468
"qhelp Shows a help window [qbzr]\n"
9469
"qmain The QBzr main application. [qbzr]\n"
9470
"qsubprocess Run some bzr command as subprocess. [qbzr]\n"
9471
"re-sign Create a digital signature for an existing revision.\n"
9472
"reference list, view and set branch locations for nested "
9473
"trees.\n"
9474
"relpath Show path of a file relative to root\n"
9475
"repair-workingtree Reset the working tree state file.\n"
9476
"revision-history Display the list of revision ids on a branch.\n"
9477
"revision-info Show revision number and revision id for a given\n"
9478
" revision identifier.\n"
9479
"rocks Statement of optimism.\n"
9480
"selftest Run internal test suite.\n"
9481
"shell-complete Show appropriate completions for context.\n"
9482
"test-script Run a shell-like test from a file.\n"
9483
"touching-revisions Return revision-ids which affected a particular "
9484
"file.\n"
9485
"unknowns List unknown files.\n"
9486
"wait-until-signalled Test helper for\n"
9487
" test_start_and_stop_bzr_subprocess_send_signal.\n"
9488
msgstr ""
9489
9490
#: en/help_topics/hooks.txt:1
9491
msgid ""
9492
"\n"
9493
"Hooks\n"
9494
"====="
9495
msgstr ""
9496
9497
#: en/help_topics/hooks.txt:5
9498
msgid ""
9499
"Introduction\n"
9500
"------------"
9501
msgstr ""
9502
9503
#: en/help_topics/hooks.txt:8
9504
msgid "A hook of type *xxx* of class *yyy* needs to be registered using::"
9505
msgstr ""
9506
9507
#: en/help_topics/hooks.txt:10
9508
msgid " yyy.hooks.install_named_hook(\"xxx\", ...)"
9509
msgstr ""
9510
9511
#: en/help_topics/hooks.txt:12
9512
msgid ""
9513
"See :doc:`Using hooks<../user-guide/hooks>` in the User Guide for examples."
9514
msgstr ""
9515
9516
#: en/help_topics/hooks.txt:14
9517
msgid ""
9518
"The class that contains each hook is given before the hooks it supplies. "
9519
"For\n"
9520
"instance, BranchHooks as the class is the hooks class for\n"
9521
"`bzrlib.branch.Branch.hooks`."
9522
msgstr ""
9523
9524
#: en/help_topics/hooks.txt:18
9525
msgid ""
9526
"Each description also indicates whether the hook runs on the client (the\n"
9527
"machine where bzr was invoked) or the server (the machine addressed by\n"
9528
"the branch URL). These may be, but are not necessarily, the same machine."
9529
msgstr ""
9530
9531
#: en/help_topics/hooks.txt:22
9532
msgid ""
9533
"Plugins (including hooks) are run on the server if all of these is true:"
9534
msgstr ""
9535
9536
#: en/help_topics/hooks.txt:24
9537
msgid ""
9538
" * The connection is via a smart server (accessed with a URL starting with\n"
9539
" \"bzr://\", \"bzr+ssh://\" or \"bzr+http://\", or accessed via a "
9540
"\"http://\"\n"
9541
" URL when a smart server is available via HTTP)."
9542
msgstr ""
9543
9544
#: en/help_topics/hooks.txt:28
9545
msgid ""
9546
" * The hook is either server specific or part of general infrastructure "
9547
"rather\n"
9548
" than client specific code (such as commit)."
9549
msgstr ""
9550
9551
#: en/help_topics/hooks.txt:31
9552
msgid ""
9553
"\n"
9554
"BranchHooks\n"
9555
"-----------"
9556
msgstr ""
9557
9558
#: en/help_topics/hooks.txt:35
9559
msgid ""
9560
"automatic_tag_name\n"
9561
"~~~~~~~~~~~~~~~~~~"
9562
msgstr ""
9563
9564
#: en/help_topics/hooks.txt:38
9565
msgid "Introduced in: 2.2"
9566
msgstr ""
9567
9568
#: en/help_topics/hooks.txt:40
9569
msgid ""
9570
"Called to determine an automatic tag name for a revision.\n"
9571
"automatic_tag_name is called with (branch, revision_id) and should\n"
9572
"return a tag name or None if no tag name could be determined. The\n"
9573
"first non-None tag name returned will be used."
9574
msgstr ""
9575
9576
#: en/help_topics/hooks.txt:45
9577
msgid ""
9578
"open\n"
9579
"~~~~"
9580
msgstr ""
9581
9582
#: en/help_topics/hooks.txt:48
9583
msgid "Introduced in: 1.8"
9584
msgstr ""
9585
9586
#: en/help_topics/hooks.txt:50
9587
msgid ""
9588
"Called with the Branch object that has been opened after a branch is\n"
9589
"opened."
9590
msgstr ""
9591
9592
#: en/help_topics/hooks.txt:53
9593
msgid ""
9594
"post_branch_init\n"
9595
"~~~~~~~~~~~~~~~~"
9596
msgstr ""
9597
9598
#: en/help_topics/hooks.txt:58
9599
msgid ""
9600
"Called after new branch initialization completes. post_branch_init is\n"
9601
"called with a bzrlib.branch.BranchInitHookParams. Note that init,\n"
9602
"branch and checkout (both heavyweight and lightweight) will all\n"
9603
"trigger this hook."
9604
msgstr ""
9605
9606
#: en/help_topics/hooks.txt:63
9607
msgid ""
9608
"post_change_branch_tip\n"
9609
"~~~~~~~~~~~~~~~~~~~~~~"
9610
msgstr ""
9611
9612
#: en/help_topics/hooks.txt:66
9613
msgid "Introduced in: 1.4"
9614
msgstr ""
9615
9616
#: en/help_topics/hooks.txt:68
9617
msgid ""
9618
"Called in bzr client and server after a change to the tip of a branch\n"
9619
"is made. post_change_branch_tip is called with a\n"
9620
"bzrlib.branch.ChangeBranchTipParams. Note that push, pull, commit,\n"
9621
"uncommit will all trigger this hook."
9622
msgstr ""
9623
9624
#: en/help_topics/hooks.txt:73
9625
msgid ""
9626
"post_commit\n"
9627
"~~~~~~~~~~~"
9628
msgstr ""
9629
9630
#: en/help_topics/hooks.txt:76
9631
msgid "Introduced in: 0.15"
9632
msgstr ""
9633
9634
#: en/help_topics/hooks.txt:78
9635
msgid ""
9636
"Called in the bzr client after a commit has completed. post_commit is\n"
9637
"called with (local, master, old_revno, old_revid, new_revno,\n"
9638
"new_revid). old_revid is NULL_REVISION for the first commit to a\n"
9639
"branch."
9640
msgstr ""
9641
9642
#: en/help_topics/hooks.txt:83
9643
msgid ""
9644
"post_pull\n"
9645
"~~~~~~~~~"
9646
msgstr ""
9647
9648
#: en/help_topics/hooks.txt:88
9649
msgid ""
9650
"Called after a pull operation completes. post_pull is called with a\n"
9651
"bzrlib.branch.PullResult object and only runs in the bzr client."
9652
msgstr ""
9653
9654
#: en/help_topics/hooks.txt:91
9655
msgid ""
9656
"post_push\n"
9657
"~~~~~~~~~"
9658
msgstr ""
9659
9660
#: en/help_topics/hooks.txt:96
9661
msgid ""
9662
"Called after a push operation completes. post_push is called with a\n"
9663
"bzrlib.branch.BranchPushResult object and only runs in the bzr client."
9664
msgstr ""
9665
9666
#: en/help_topics/hooks.txt:99
9667
msgid ""
9668
"post_switch\n"
9669
"~~~~~~~~~~~"
9670
msgstr ""
9671
9672
#: en/help_topics/hooks.txt:104
9673
msgid ""
9674
"Called after a checkout switches branch. post_switch is called with a\n"
9675
"bzrlib.branch.SwitchHookParams."
9676
msgstr ""
9677
9678
#: en/help_topics/hooks.txt:107
9679
msgid ""
9680
"post_uncommit\n"
9681
"~~~~~~~~~~~~~"
9682
msgstr ""
9683
9684
#: en/help_topics/hooks.txt:112
9685
msgid ""
9686
"Called in the bzr client after an uncommit completes. post_uncommit is\n"
9687
"called with (local, master, old_revno, old_revid, new_revno,\n"
9688
"new_revid) where local is the local branch or None, master is the\n"
9689
"target branch, and an empty branch receives new_revno of 0, new_revid\n"
9690
"of None."
9691
msgstr ""
9692
9693
#: en/help_topics/hooks.txt:118
9694
msgid ""
9695
"pre_change_branch_tip\n"
9696
"~~~~~~~~~~~~~~~~~~~~~"
9697
msgstr ""
9698
9699
#: en/help_topics/hooks.txt:121
9700
msgid "Introduced in: 1.6"
9701
msgstr ""
9702
9703
#: en/help_topics/hooks.txt:123
9704
msgid ""
9705
"Called in bzr client and server before a change to the tip of a branch\n"
9706
"is made. pre_change_branch_tip is called with a\n"
9707
"bzrlib.branch.ChangeBranchTipParams. Note that push, pull, commit,\n"
9708
"uncommit will all trigger this hook."
9709
msgstr ""
9710
9711
#: en/help_topics/hooks.txt:128
9712
msgid ""
9713
"pre_commit\n"
9714
"~~~~~~~~~~"
9715
msgstr ""
9716
9717
#: en/help_topics/hooks.txt:131
9718
msgid "Introduced in: 0.91"
9719
msgstr ""
9720
9721
#: en/help_topics/hooks.txt:133
9722
msgid ""
9723
"Called after a commit is calculated but before it is completed.\n"
9724
"pre_commit is called with (local, master, old_revno, old_revid,\n"
9725
"future_revno, future_revid, tree_delta, future_tree). old_revid is\n"
9726
"NULL_REVISION for the first commit to a branch, tree_delta is a\n"
9727
"TreeDelta object describing changes from the basis revision. hooks\n"
9728
"MUST NOT modify this delta. future_tree is an in-memory tree obtained\n"
9729
"from CommitBuilder.revision_tree() and hooks MUST NOT modify this\n"
9730
"tree."
9731
msgstr ""
9732
9733
#: en/help_topics/hooks.txt:142
9734
msgid ""
9735
"set_rh\n"
9736
"~~~~~~"
9737
msgstr ""
9738
9739
#: en/help_topics/hooks.txt:147
9740
msgid ""
9741
"Invoked whenever the revision history has been set via\n"
9742
"set_revision_history. The api signature is (branch, revision_history),\n"
9743
"and the branch will be write-locked. The set_rh hook can be expensive\n"
9744
"for bzr to trigger, a better hook to use is\n"
9745
"Branch.post_change_branch_tip."
9746
msgstr ""
9747
9748
#: en/help_topics/hooks.txt:153
9749
msgid ""
9750
"transform_fallback_location\n"
9751
"~~~~~~~~~~~~~~~~~~~~~~~~~~~"
9752
msgstr ""
9753
9754
#: en/help_topics/hooks.txt:156
9755
msgid "Introduced in: 1.9"
9756
msgstr ""
9757
9758
#: en/help_topics/hooks.txt:158
9759
msgid ""
9760
"Called when a stacked branch is activating its fallback locations.\n"
9761
"transform_fallback_location is called with (branch, url), and should\n"
9762
"return a new url. Returning the same url allows it to be used as-is,\n"
9763
"returning a different one can be used to cause the branch to stack on\n"
9764
"a closer copy of that fallback_location. Note that the branch cannot\n"
9765
"have history accessing methods called on it during this hook because\n"
9766
"the fallback locations have not been activated. When there are\n"
9767
"multiple hooks installed for transform_fallback_location, all are\n"
9768
"called with the url returned from the previous hook.The order is\n"
9769
"however undefined."
9770
msgstr ""
9771
9772
#: en/help_topics/hooks.txt:169
9773
msgid ""
9774
"BzrDirHooks\n"
9775
"-----------"
9776
msgstr ""
9777
9778
#: en/help_topics/hooks.txt:172
9779
msgid ""
9780
"post_repo_init\n"
9781
"~~~~~~~~~~~~~~"
9782
msgstr ""
9783
9784
#: en/help_topics/hooks.txt:177
9785
msgid ""
9786
"Invoked after a repository has been initialized. post_repo_init is\n"
9787
"called with a bzrlib.bzrdir.RepoInitHookParams."
9788
msgstr ""
9789
9790
#: en/help_topics/hooks.txt:180
9791
msgid ""
9792
"pre_open\n"
9793
"~~~~~~~~"
9794
msgstr ""
9795
9796
#: en/help_topics/hooks.txt:183
9797
msgid "Introduced in: 1.14"
9798
msgstr ""
9799
9800
#: en/help_topics/hooks.txt:185
9801
msgid ""
9802
"Invoked before attempting to open a BzrDir with the transport that the\n"
9803
"open will use."
9804
msgstr ""
9805
9806
#: en/help_topics/hooks.txt:188
9807
msgid ""
9808
"CommandHooks\n"
9809
"------------"
9810
msgstr ""
9811
9812
#: en/help_topics/hooks.txt:191
9813
msgid ""
9814
"extend_command\n"
9815
"~~~~~~~~~~~~~~"
9816
msgstr ""
9817
9818
#: en/help_topics/hooks.txt:194
9819
msgid "Introduced in: 1.13"
9820
msgstr ""
9821
9822
#: en/help_topics/hooks.txt:196
9823
msgid ""
9824
"Called after creating a command object to allow modifications such as\n"
9825
"adding or removing options, docs etc. Called with the new\n"
9826
"bzrlib.commands.Command object."
9827
msgstr ""
9828
9829
#: en/help_topics/hooks.txt:200
9830
msgid ""
9831
"get_command\n"
9832
"~~~~~~~~~~~"
9833
msgstr ""
9834
9835
#: en/help_topics/hooks.txt:203
9836
msgid "Introduced in: 1.17"
9837
msgstr ""
9838
9839
#: en/help_topics/hooks.txt:205
9840
msgid ""
9841
"Called when creating a single command. Called with (cmd_or_None,\n"
9842
"command_name). get_command should either return the cmd_or_None\n"
9843
"parameter, or a replacement Command object that should be used for the\n"
9844
"command. Note that the Command.hooks hooks are core infrastructure.\n"
9845
"Many users will prefer to use bzrlib.commands.register_command or\n"
9846
"plugin_cmds.register_lazy."
9847
msgstr ""
9848
9849
#: en/help_topics/hooks.txt:212
9850
msgid ""
9851
"get_missing_command\n"
9852
"~~~~~~~~~~~~~~~~~~~"
9853
msgstr ""
9854
9855
#: en/help_topics/hooks.txt:217
9856
msgid ""
9857
"Called when creating a single command if no command could be found.\n"
9858
"Called with (command_name). get_missing_command should either return\n"
9859
"None, or a Command object to be used for the command."
9860
msgstr ""
9861
9862
#: en/help_topics/hooks.txt:221
9863
msgid ""
9864
"list_commands\n"
9865
"~~~~~~~~~~~~~"
9866
msgstr ""
9867
9868
#: en/help_topics/hooks.txt:226
9869
msgid ""
9870
"Called when enumerating commands. Called with a set of cmd_name\n"
9871
"strings for all the commands found so far. This set is safe to mutate\n"
9872
"- e.g. to remove a command. list_commands should return the updated\n"
9873
"set of command names."
9874
msgstr ""
9875
9876
#: en/help_topics/hooks.txt:231
9877
msgid ""
9878
"_ConfigHooks\n"
9879
"------------"
9880
msgstr ""
9881
9882
#: en/help_topics/hooks.txt:234
9883
msgid ""
9884
"get\n"
9885
"~~~"
9886
msgstr ""
9887
9888
#: en/help_topics/hooks.txt:237
9889
msgid "Introduced in: 2.4"
9890
msgstr ""
9891
9892
#: en/help_topics/hooks.txt:239
9893
msgid ""
9894
"Invoked when a config option is read. The signature is (stack, name,\n"
9895
"value)."
9896
msgstr ""
9897
9898
#: en/help_topics/hooks.txt:242
9899
msgid ""
9900
"load\n"
9901
"~~~~"
9902
msgstr ""
9903
9904
#: en/help_topics/hooks.txt:247
9905
msgid "Invoked when a config store is loaded. The signature is (store)."
9906
msgstr ""
9907
9908
#: en/help_topics/hooks.txt:249
9909
msgid ""
9910
"remove\n"
9911
"~~~~~~"
9912
msgstr ""
9913
9914
#: en/help_topics/hooks.txt:254
9915
msgid ""
9916
"Invoked when a config option is removed. The signature is (stack,\n"
9917
"name)."
9918
msgstr ""
9919
9920
#: en/help_topics/hooks.txt:257
9921
msgid ""
9922
"save\n"
9923
"~~~~"
9924
msgstr ""
9925
9926
#: en/help_topics/hooks.txt:262
9927
msgid "Invoked when a config store is saved. The signature is (store)."
9928
msgstr ""
9929
9930
#: en/help_topics/hooks.txt:264
9931
msgid ""
9932
"set\n"
9933
"~~~"
9934
msgstr ""
9935
9936
#: en/help_topics/hooks.txt:269
9937
msgid ""
9938
"Invoked when a config option is set. The signature is (stack, name,\n"
9939
"value)."
9940
msgstr ""
9941
9942
#: en/help_topics/hooks.txt:272
9943
msgid ""
9944
"InfoHooks\n"
9945
"---------"
9946
msgstr ""
9947
9948
#: en/help_topics/hooks.txt:275
9949
msgid ""
9950
"repository\n"
9951
"~~~~~~~~~~"
9952
msgstr ""
9953
9954
#: en/help_topics/hooks.txt:278
9955
msgid "Introduced in: 1.15"
9956
msgstr ""
9957
9958
#: en/help_topics/hooks.txt:280
9959
msgid ""
9960
"Invoked when displaying the statistics for a repository. repository is\n"
9961
"called with a statistics dictionary as returned by the repository and\n"
9962
"a file-like object to write to."
9963
msgstr ""
9964
9965
#: en/help_topics/hooks.txt:284
9966
msgid ""
9967
"LockHooks\n"
9968
"---------"
9969
msgstr ""
9970
9971
#: en/help_topics/hooks.txt:287
9972
msgid ""
9973
"lock_acquired\n"
9974
"~~~~~~~~~~~~~"
9975
msgstr ""
9976
9977
#: en/help_topics/hooks.txt:292
9978
msgid "Called with a bzrlib.lock.LockResult when a physical lock is acquired."
9979
msgstr ""
9980
9981
#: en/help_topics/hooks.txt:294
9982
msgid ""
9983
"lock_broken\n"
9984
"~~~~~~~~~~~"
9985
msgstr ""
9986
9987
#: en/help_topics/hooks.txt:299
9988
msgid "Called with a bzrlib.lock.LockResult when a physical lock is broken."
9989
msgstr ""
9990
9991
#: en/help_topics/hooks.txt:301
9992
msgid ""
9993
"lock_released\n"
9994
"~~~~~~~~~~~~~"
9995
msgstr ""
9996
9997
#: en/help_topics/hooks.txt:306
9998
msgid "Called with a bzrlib.lock.LockResult when a physical lock is released."
9999
msgstr ""
10000
10001
#: en/help_topics/hooks.txt:308
10002
msgid ""
10003
"MergeHooks\n"
10004
"----------"
10005
msgstr ""
10006
10007
#: en/help_topics/hooks.txt:311
10008
msgid ""
10009
"merge_file_content\n"
10010
"~~~~~~~~~~~~~~~~~~"
10011
msgstr ""
10012
10013
#: en/help_topics/hooks.txt:314
10014
msgid "Introduced in: 2.1"
10015
msgstr ""
10016
10017
#: en/help_topics/hooks.txt:316
10018
msgid ""
10019
"Called with a bzrlib.merge.Merger object to create a per file merge\n"
10020
"object when starting a merge. Should return either None or a subclass\n"
10021
"of ``bzrlib.merge.AbstractPerFileMerger``. Such objects will then be\n"
10022
"called per file that needs to be merged (including when one side has\n"
10023
"deleted the file and the other has changed it). See the\n"
10024
"AbstractPerFileMerger API docs for details on how it is used by merge."
10025
msgstr ""
10026
10027
#: en/help_topics/hooks.txt:323
10028
msgid ""
10029
"MergeDirectiveHooks\n"
10030
"-------------------"
10031
msgstr ""
10032
10033
#: en/help_topics/hooks.txt:326
10034
msgid ""
10035
"merge_request_body\n"
10036
"~~~~~~~~~~~~~~~~~~"
10037
msgstr ""
10038
10039
#: en/help_topics/hooks.txt:329
10040
msgid "Introduced in: 1.15.0"
10041
msgstr ""
10042
10043
#: en/help_topics/hooks.txt:331
10044
msgid ""
10045
"Called with a MergeRequestBodyParams when a body is needed for a merge\n"
10046
"request. Callbacks must return a body. If more than one callback is\n"
10047
"registered, the output of one callback is provided to the next."
10048
msgstr ""
10049
10050
#: en/help_topics/hooks.txt:335
10051
msgid ""
10052
"MessageEditorHooks\n"
10053
"------------------"
10054
msgstr ""
10055
10056
#: en/help_topics/hooks.txt:338
10057
msgid ""
10058
"commit_message_template\n"
10059
"~~~~~~~~~~~~~~~~~~~~~~~"
10060
msgstr ""
10061
10062
#: en/help_topics/hooks.txt:341
10063
msgid "Introduced in: 1.10"
10064
msgstr ""
10065
10066
#: en/help_topics/hooks.txt:343
10067
msgid ""
10068
"Called when a commit message is being generated.\n"
10069
"commit_message_template is called with the bzrlib.commit.Commit object\n"
10070
"and the message that is known so far. commit_message_template must\n"
10071
"return a new message to use (which could be the same as it was given).\n"
10072
"When there are multiple hooks registered for commit_message_template,\n"
10073
"they are chained with the result from the first passed into the\n"
10074
"second, and so on."
10075
msgstr ""
10076
10077
#: en/help_topics/hooks.txt:351
10078
msgid ""
10079
"set_commit_message\n"
10080
"~~~~~~~~~~~~~~~~~~"
10081
msgstr ""
10082
10083
#: en/help_topics/hooks.txt:356
10084
msgid ""
10085
"Set a fixed commit message. set_commit_message is called with the\n"
10086
"bzrlib.commit.Commit object (so you can also change e.g. revision\n"
10087
"properties by editing commit.builder._revprops) and the message so\n"
10088
"far. set_commit_message must return the message to use or None if it\n"
10089
"should use the message editor as normal."
10090
msgstr ""
10091
10092
#: en/help_topics/hooks.txt:362
10093
msgid ""
10094
"MutableTreeHooks\n"
10095
"----------------"
10096
msgstr ""
10097
10098
#: en/help_topics/hooks.txt:368
10099
msgid "Introduced in: 2.0"
10100
msgstr ""
10101
10102
#: en/help_topics/hooks.txt:370
10103
msgid ""
10104
"Called after a commit is performed on a tree. The hook is called with\n"
10105
"a bzrlib.mutabletree.PostCommitHookParams object. The mutable tree the\n"
10106
"commit was performed on is available via the mutable_tree attribute of\n"
10107
"that object."
10108
msgstr ""
10109
10110
#: en/help_topics/hooks.txt:375
10111
msgid ""
10112
"start_commit\n"
10113
"~~~~~~~~~~~~"
10114
msgstr ""
10115
10116
#: en/help_topics/hooks.txt:380
10117
msgid ""
10118
"Called before a commit is performed on a tree. The start commit hook\n"
10119
"is able to change the tree before the commit takes place. start_commit\n"
10120
"is called with the bzrlib.mutabletree.MutableTree that the commit is\n"
10121
"being performed on."
10122
msgstr ""
10123
10124
#: en/help_topics/hooks.txt:385
10125
msgid ""
10126
"SmartClientHooks\n"
10127
"----------------"
10128
msgstr ""
10129
10130
#: en/help_topics/hooks.txt:388
10131
msgid ""
10132
"call\n"
10133
"~~~~"
10134
msgstr ""
10135
10136
#: en/help_topics/hooks.txt:391
10137
msgid "Introduced in: unknown"
10138
msgstr ""
10139
10140
#: en/help_topics/hooks.txt:393
10141
msgid ""
10142
"Called when the smart client is submitting a request to the smart\n"
10143
"server. Called with a bzrlib.smart.client.CallHookParams object.\n"
10144
"Streaming request bodies, and responses, are not accessible."
10145
msgstr ""
10146
10147
#: en/help_topics/hooks.txt:397
10148
msgid ""
10149
"SmartServerHooks\n"
10150
"----------------"
10151
msgstr ""
10152
10153
#: en/help_topics/hooks.txt:400
10154
msgid ""
10155
"server_exception\n"
10156
"~~~~~~~~~~~~~~~~"
10157
msgstr ""
10158
10159
#: en/help_topics/hooks.txt:405
10160
msgid ""
10161
"Called by the bzr server when an exception occurs. server_exception is\n"
10162
"called with the sys.exc_info() tuple return true for the hook if the\n"
10163
"exception has been handled, in which case the server will exit\n"
10164
"normally."
10165
msgstr ""
10166
10167
#: en/help_topics/hooks.txt:410
10168
msgid ""
10169
"server_started\n"
10170
"~~~~~~~~~~~~~~"
10171
msgstr ""
10172
10173
#: en/help_topics/hooks.txt:413
10174
msgid "Introduced in: 0.16"
10175
msgstr ""
10176
10177
#: en/help_topics/hooks.txt:415
10178
msgid ""
10179
"Called by the bzr server when it starts serving a directory.\n"
10180
"server_started is called with (backing urls, public url), where\n"
10181
"backing_url is a list of URLs giving the server-specific directory\n"
10182
"locations, and public_url is the public URL for the directory being\n"
10183
"served."
10184
msgstr ""
10185
10186
#: en/help_topics/hooks.txt:421
10187
msgid ""
10188
"server_started_ex\n"
10189
"~~~~~~~~~~~~~~~~~"
10190
msgstr ""
10191
10192
#: en/help_topics/hooks.txt:426
10193
msgid ""
10194
"Called by the bzr server when it starts serving a directory.\n"
10195
"server_started is called with (backing_urls, server_obj)."
10196
msgstr ""
10197
10198
#: en/help_topics/hooks.txt:429
10199
msgid ""
10200
"server_stopped\n"
10201
"~~~~~~~~~~~~~~"
10202
msgstr ""
10203
10204
#: en/help_topics/hooks.txt:434
10205
msgid ""
10206
"Called by the bzr server when it stops serving a directory.\n"
10207
"server_stopped is called with the same parameters as the\n"
10208
"server_started hook: (backing_urls, public_url)."
10209
msgstr ""
10210
10211
#: en/help_topics/hooks.txt:438
10212
msgid ""
10213
"StatusHooks\n"
10214
"-----------"
10215
msgstr ""
10216
10217
#: en/help_topics/hooks.txt:441
10218
msgid ""
10219
"post_status\n"
10220
"~~~~~~~~~~~"
10221
msgstr ""
10222
10223
#: en/help_topics/hooks.txt:444
10224
msgid "Introduced in: 2.3"
10225
msgstr ""
10226
10227
#: en/help_topics/hooks.txt:446
10228
msgid ""
10229
"Called with argument StatusHookParams after Bazaar has displayed the\n"
10230
"status. StatusHookParams has the attributes (old_tree, new_tree,\n"
10231
"to_file, versioned, show_ids, short, verbose). The last four arguments\n"
10232
"correspond to the command line options specified by the user for the\n"
10233
"status command. to_file is the output stream for writing."
10234
msgstr ""
10235
10236
#: en/help_topics/hooks.txt:452
10237
msgid ""
10238
"pre_status\n"
10239
"~~~~~~~~~~"
10240
msgstr ""
10241
10242
#: en/help_topics/hooks.txt:457
10243
msgid ""
10244
"Called with argument StatusHookParams before Bazaar displays the\n"
10245
"status. StatusHookParams has the attributes (old_tree, new_tree,\n"
10246
"to_file, versioned, show_ids, short, verbose). The last four arguments\n"
10247
"correspond to the command line options specified by the user for the\n"
10248
"status command. to_file is the output stream for writing."
10249
msgstr ""
10250
10251
#: en/help_topics/hooks.txt:463
10252
msgid ""
10253
"RioVersionInfoBuilderHooks\n"
10254
"--------------------------"
10255
msgstr ""
10256
10257
#: en/help_topics/hooks.txt:466
10258
msgid ""
10259
"revision\n"
10260
"~~~~~~~~"
10261
msgstr ""
10262
10263
#: en/help_topics/hooks.txt:471
10264
msgid ""
10265
"Invoked when adding information about a revision to the RIO stanza\n"
10266
"that is printed. revision is called with a revision object and a RIO\n"
10267
"stanza.\n"
10268
msgstr ""
10269
10270
#: en/help_topics/location-alias.txt:1
10271
msgid ""
10272
"Location aliases\n"
10273
"================"
10274
msgstr ""
10275
10276
#: en/help_topics/location-alias.txt:4
10277
msgid ""
10278
"Bazaar defines several aliases for locations associated with a branch. "
10279
"These\n"
10280
"can be used with most commands that expect a location, such as `bzr push`."
10281
msgstr ""
10282
10283
#: en/help_topics/location-alias.txt:7
10284
msgid "The aliases are::"
10285
msgstr ""
10286
10287
#: en/help_topics/location-alias.txt:9
10288
msgid ""
10289
" :parent the parent of this branch\n"
10290
" :submit the submit branch for this branch\n"
10291
" :public the public location of this branch\n"
10292
" :bound the branch this branch is bound to, for bound branches\n"
10293
" :push the saved location used for `bzr push` with no arguments\n"
10294
" :this this branch"
10295
msgstr ""
10296
10297
#: en/help_topics/location-alias.txt:16
10298
msgid "For example, to push to the parent location::"
10299
msgstr ""
10300
10301
#: en/help_topics/location-alias.txt:18
10302
msgid " bzr push :parent"
10303
msgstr ""
10304
10305
#: en/help_topics/log-formats.txt:1
10306
msgid ""
10307
"Log Formats\n"
10308
"==========="
10309
msgstr ""
10310
10311
#: en/help_topics/log-formats.txt:4
10312
msgid ""
10313
"A log format controls how information about each revision is displayed.\n"
10314
"The standard log formats are compared below::"
10315
msgstr ""
10316
10317
#: en/help_topics/log-formats.txt:7
10318
msgid ""
10319
" Feature long short line\n"
10320
" ---------------------- ------------- ------------ -------------------\n"
10321
" design goal detailed view concise view 1 revision per line\n"
10322
" committer name+email name only name only\n"
10323
" author name+email - -\n"
10324
" date-time format full date only date only\n"
10325
" commit message full full top line\n"
10326
" tags yes yes yes\n"
10327
" merges indicator - yes -\n"
10328
" status/delta optional optional -\n"
10329
" diff/patch optional optional -\n"
10330
" revision-id optional optional -\n"
10331
" branch nick yes - -\n"
10332
" foreign vcs properties yes yes -\n"
10333
" preferred levels all 1 1\n"
10334
" digital signature optional - -"
10335
msgstr ""
10336
10337
#: en/help_topics/log-formats.txt:24
10338
msgid ""
10339
"The default format is ``long``. To change this, define the ``log_format``\n"
10340
"setting in the ``[DEFAULT]`` section of ``bazaar.conf`` like this (say)::"
10341
msgstr ""
10342
10343
#: en/help_topics/log-formats.txt:27
10344
msgid ""
10345
" [DEFAULT]\n"
10346
" log_format = short"
10347
msgstr ""
10348
10349
#: en/help_topics/log-formats.txt:30
10350
msgid ""
10351
"Alternatively, to change the log format used for a given query, use the\n"
10352
"--long, --short or --line options."
10353
msgstr ""
10354
10355
#: en/help_topics/log-formats.txt:33
10356
msgid ""
10357
"If one of the standard log formats does not meet your needs, additional\n"
10358
"formats can be provided by plugins.\n"
10359
msgstr ""
10360
10361
#: en/help_topics/other-formats.txt:1
10362
msgid "Other Storage Formats"
10363
msgstr ""
10364
10365
#: en/help_topics/other-formats.txt:3
10366
msgid "No experimental formats are available."
10367
msgstr ""
10368
10369
#: en/help_topics/other-formats.txt:5
10370
msgid ""
10371
"\n"
10372
"No deprecated formats are available."
10373
msgstr ""
10374
10375
#: en/help_topics/patterns.txt:1
10376
msgid ""
10377
"Patterns\n"
10378
"========"
10379
msgstr ""
10380
10381
#: en/help_topics/patterns.txt:4
10382
msgid ""
10383
"Bazaar uses patterns to match files at various times. For example,\n"
10384
"the ``add`` command skips over files that match ignore patterns\n"
10385
"and preferences can be associated with files using rule patterns.\n"
10386
"The pattern syntax is described below."
10387
msgstr ""
10388
10389
#: en/help_topics/patterns.txt:9
10390
msgid ""
10391
"Trailing slashes on patterns are ignored. If the pattern contains a\n"
10392
"slash or is a regular expression, it is compared to the whole path\n"
10393
"from the branch root. Otherwise, it is compared to only the last\n"
10394
"component of the path. To match a file only in the root directory,\n"
10395
"prepend ``./``. Patterns specifying absolute paths are not allowed."
10396
msgstr ""
10397
10398
#: en/help_topics/patterns.txt:15
10399
msgid "Patterns may include globbing wildcards such as::"
10400
msgstr ""
10401
10402
#: en/help_topics/patterns.txt:17
10403
msgid ""
10404
" ? - Matches any single character except '/'\n"
10405
" * - Matches 0 or more characters except '/'\n"
10406
" /**/ - Matches 0 or more directories in a path\n"
10407
" [a-z] - Matches a single character from within a group of characters"
10408
msgstr ""
10409
10410
#: en/help_topics/patterns.txt:22
10411
msgid ""
10412
"Patterns may also be `Python regular expressions`_. Regular expression\n"
10413
"patterns are identified by a ``RE:`` prefix followed by the regular\n"
10414
"expression. Regular expression patterns may not include named or\n"
10415
"numbered groups."
10416
msgstr ""
10417
10418
#: en/help_topics/patterns.txt:27
10419
msgid ""
10420
"Case insensitive ignore patterns can be specified with regular expressions\n"
10421
"by using the ``i`` (for ignore case) flag in the pattern."
10422
msgstr ""
10423
10424
#: en/help_topics/patterns.txt:30
10425
msgid "For example, a case insensitive match for ``foo`` may be specified as::"
10426
msgstr ""
10427
10428
#: en/help_topics/patterns.txt:32
10429
msgid " RE:(?i)foo"
10430
msgstr ""
10431
10432
#: en/help_topics/patterns.txt:34
10433
msgid ""
10434
"Ignore patterns may be prefixed with ``!``, which means that a filename\n"
10435
"matched by that pattern will not be ignored."
10436
msgstr ""
10437
10438
#: en/help_topics/patterns.txt:37
10439
msgid ".. _Python regular expressions: http://docs.python.org/library/re.html"
10440
msgstr ""
10441
10442
#: en/help_topics/revisionspec.txt:1
10443
msgid "Revision Identifiers"
10444
msgstr ""
10445
10446
#: en/help_topics/revisionspec.txt:3
10447
msgid ""
10448
"A revision identifier refers to a specific state of a branch's history. It\n"
10449
"can be expressed in several ways. It can begin with a keyword to\n"
10450
"unambiguously specify a given lookup type; some examples are 'last:1',\n"
10451
"'before:yesterday' and 'submit:'."
10452
msgstr ""
10453
10454
#: en/help_topics/revisionspec.txt:8
10455
msgid ""
10456
"Alternately, it can be given without a keyword, in which case it will be\n"
10457
"checked as a revision number, a tag, a revision id, a date specification, or "
10458
"a\n"
10459
"branch specification, in that order. For example, 'date:today' could be\n"
10460
"written as simply 'today', though if you have a tag called 'today' that "
10461
"will\n"
10462
"be found first."
10463
msgstr ""
10464
10465
#: en/help_topics/revisionspec.txt:14
10466
msgid ""
10467
"If 'REV1' and 'REV2' are revision identifiers, then 'REV1..REV2' denotes a\n"
10468
"revision range. Examples: '3647..3649', 'date:yesterday..-1' and\n"
10469
"'branch:/path/to/branch1/..branch:/branch2' (note that there are no quotes "
10470
"or\n"
10471
"spaces around the '..')."
10472
msgstr ""
10473
10474
#: en/help_topics/revisionspec.txt:19
10475
msgid ""
10476
"Ranges are interpreted differently by different commands. To the \"log\" "
10477
"command,\n"
10478
"a range is a sequence of log messages, but to the \"diff\" command, the "
10479
"range\n"
10480
"denotes a change between revisions (and not a sequence of changes). In\n"
10481
"addition, \"log\" considers a closed range whereas \"diff\" and \"merge\" "
10482
"consider it\n"
10483
"to be open-ended, that is, they include one end but not the other. For "
10484
"example:\n"
10485
"\"bzr log -r 3647..3649\" shows the messages of revisions 3647, 3648 and "
10486
"3649,\n"
10487
"while \"bzr diff -r 3647..3649\" includes the changes done in revisions 3648 "
10488
"and\n"
10489
"3649, but not 3647."
10490
msgstr ""
10491
10492
#: en/help_topics/revisionspec.txt:28
10493
msgid "The keywords used as revision selection methods are the following:"
10494
msgstr ""
10495
10496
#: en/help_topics/revisionspec.txt:30
10497
msgid ""
10498
":revid:\n"
10499
"\tSelects a revision using the revision id.\n"
10500
":submit:\n"
10501
"\tSelects a common ancestor with the submit branch.\n"
10502
":ancestor:\n"
10503
"\tSelects a common ancestor with a second branch.\n"
10504
":date:\n"
10505
"\tSelects a revision on the basis of a datestamp.\n"
10506
":branch:\n"
10507
"\tSelects the last revision of a specified branch.\n"
10508
":tag:\n"
10509
"\tSelects a revision identified by a tag name.\n"
10510
":package:\n"
10511
"\tSelects the revision corresponding to a version of a package.\n"
10512
":revno:\n"
10513
"\tSelects a revision using a number.\n"
10514
":before:\n"
10515
"\tSelects the parent of the revision specified.\n"
10516
":annotate:\n"
10517
"\tSelect the revision that last modified the specified line.\n"
10518
":mainline:\n"
10519
"\tSelect mainline revision that merged the specified revision.\n"
10520
":last:\n"
10521
"\tSelects the nth revision from the end."
10522
msgstr ""
10523
10524
#: en/help_topics/revisionspec.txt:55
10525
msgid "In addition, plugins can provide other keywords."
10526
msgstr ""
10527
10528
#: en/help_topics/revisionspec.txt:57
10529
msgid "A detailed description of each keyword is given below."
10530
msgstr ""
10531
10532
#: en/help_topics/revisionspec.txt:59
10533
msgid ":revid:"
10534
msgstr ""
10535
10536
#: en/help_topics/revisionspec.txt:61
10537
msgid ""
10538
" Supply a specific revision id, that can be used to specify any\n"
10539
" revision id in the ancestry of the branch.\n"
10540
" Including merges, and pending merges.\n"
10541
" Examples::"
10542
msgstr ""
10543
10544
#: en/help_topics/revisionspec.txt:66
10545
msgid ""
10546
" revid:aaaa@bbbb-123456789 -> Select revision 'aaaa@bbbb-123456789'"
10547
msgstr ""
10548
10549
#: en/help_topics/revisionspec.txt:68
10550
msgid ":submit:"
10551
msgstr ""
10552
10553
#: en/help_topics/revisionspec.txt:70
10554
msgid ""
10555
" Diffing against this shows all the changes that were made in this "
10556
"branch,\n"
10557
" and is a good predictor of what merge will do. The submit branch is\n"
10558
" used by the bundle and merge directive commands. If no submit branch\n"
10559
" is specified, the parent branch is used instead."
10560
msgstr ""
10561
10562
#: en/help_topics/revisionspec.txt:75
10563
msgid ""
10564
" The common ancestor is the last revision that existed in both\n"
10565
" branches. Usually this is the branch point, but it could also be\n"
10566
" a revision that was merged."
10567
msgstr ""
10568
10569
#: en/help_topics/revisionspec.txt:79
10570
msgid " Examples::"
10571
msgstr ""
10572
10573
#: en/help_topics/revisionspec.txt:81
10574
msgid " $ bzr diff -r submit:"
10575
msgstr ""
10576
10577
#: en/help_topics/revisionspec.txt:83
10578
msgid ":ancestor:"
10579
msgstr ""
10580
10581
#: en/help_topics/revisionspec.txt:85
10582
msgid " Supply the path to a branch to select the common ancestor."
10583
msgstr ""
10584
10585
#: en/help_topics/revisionspec.txt:91
10586
msgid ""
10587
" This is frequently used with 'diff' to return all of the changes\n"
10588
" that your branch introduces, while excluding the changes that you\n"
10589
" have not merged from the remote branch."
10590
msgstr ""
10591
10592
#: en/help_topics/revisionspec.txt:97
10593
msgid ""
10594
" ancestor:/path/to/branch\n"
10595
" $ bzr diff -r ancestor:../../mainline/branch"
10596
msgstr ""
10597
10598
#: en/help_topics/revisionspec.txt:100
10599
msgid ":date:"
10600
msgstr ""
10601
10602
#: en/help_topics/revisionspec.txt:102
10603
msgid ""
10604
" Supply a datestamp to select the first revision that matches the date.\n"
10605
" Date can be 'yesterday', 'today', 'tomorrow' or a YYYY-MM-DD string.\n"
10606
" Matches the first entry after a given date (either at midnight or\n"
10607
" at a specified time)."
10608
msgstr ""
10609
10610
#: en/help_topics/revisionspec.txt:107
10611
msgid " One way to display all the changes since yesterday would be::"
10612
msgstr ""
10613
10614
#: en/help_topics/revisionspec.txt:109
10615
msgid " bzr log -r date:yesterday.."
10616
msgstr ""
10617
10618
#: en/help_topics/revisionspec.txt:113
10619
msgid ""
10620
" date:yesterday -> select the first revision since "
10621
"yesterday\n"
10622
" date:2006-08-14,17:10:14 -> select the first revision after\n"
10623
" August 14th, 2006 at 5:10pm."
10624
msgstr ""
10625
10626
#: en/help_topics/revisionspec.txt:117
10627
msgid ":branch:"
10628
msgstr ""
10629
10630
#: en/help_topics/revisionspec.txt:119
10631
msgid " Supply the path to a branch to select its last revision."
10632
msgstr ""
10633
10634
#: en/help_topics/revisionspec.txt:123
10635
msgid " branch:/path/to/branch"
10636
msgstr ""
10637
10638
#: en/help_topics/revisionspec.txt:125
10639
msgid ":tag:"
10640
msgstr ""
10641
10642
#: en/help_topics/revisionspec.txt:127
10643
msgid " Tags are stored in the branch and created by the 'tag' command."
10644
msgstr ""
10645
10646
#: en/help_topics/revisionspec.txt:129
10647
msgid ":package:"
10648
msgstr ""
10649
10650
#: en/help_topics/revisionspec.txt:131
10651
msgid ""
10652
" Given a package version number this revision specifier will allow you\n"
10653
" specify the revision corresponding to the upload of that version of\n"
10654
" the package."
10655
msgstr ""
10656
10657
#: en/help_topics/revisionspec.txt:135
10658
msgid ":revno:"
10659
msgstr ""
10660
10661
#: en/help_topics/revisionspec.txt:137
10662
msgid ""
10663
" Use an integer to specify a revision in the history of the branch.\n"
10664
" Optionally a branch can be specified. A negative number will count\n"
10665
" from the end of the branch (-1 is the last revision, -2 the previous\n"
10666
" one). If the negative number is larger than the branch's history, the\n"
10667
" first revision is returned.\n"
10668
" Examples::"
10669
msgstr ""
10670
10671
#: en/help_topics/revisionspec.txt:144
10672
msgid ""
10673
" revno:1 -> return the first revision of this branch\n"
10674
" revno:3:/path/to/branch -> return the 3rd revision of\n"
10675
" the branch '/path/to/branch'\n"
10676
" revno:-1 -> The last revision in a branch.\n"
10677
" -2:http://other/branch -> The second to last revision in the\n"
10678
" remote branch.\n"
10679
" -1000000 -> Most likely the first revision, unless\n"
10680
" your history is very long."
10681
msgstr ""
10682
10683
#: en/help_topics/revisionspec.txt:153
10684
msgid ":before:"
10685
msgstr ""
10686
10687
#: en/help_topics/revisionspec.txt:155
10688
msgid ""
10689
" Supply any revision spec to return the parent of that revision. This "
10690
"is\n"
10691
" mostly useful when inspecting revisions that are not in the revision "
10692
"history\n"
10693
" of a branch."
10694
msgstr ""
10695
10696
#: en/help_topics/revisionspec.txt:159
10697
msgid ""
10698
" It is an error to request the parent of the null revision (before:0)."
10699
msgstr ""
10700
10701
#: en/help_topics/revisionspec.txt:163
10702
msgid ""
10703
" before:1913 -> Return the parent of revno 1913 (revno 1912)\n"
10704
" before:revid:aaaa@bbbb-1234567890 -> return the parent of revision\n"
10705
" aaaa@bbbb-1234567890\n"
10706
" bzr diff -r before:1913..1913\n"
10707
" -> Find the changes between revision 1913 and its parent "
10708
"(1912).\n"
10709
" (What changes did revision 1913 introduce).\n"
10710
" This is equivalent to: bzr diff -c 1913"
10711
msgstr ""
10712
10713
#: en/help_topics/revisionspec.txt:171
10714
msgid ":annotate:"
10715
msgstr ""
10716
10717
#: en/help_topics/revisionspec.txt:173
10718
msgid ""
10719
" Select the revision that last modified the specified line. Line is\n"
10720
" specified as path:number. Path is a relative path to the file. "
10721
"Numbers\n"
10722
" start at 1, and are relative to the current version, not the last-\n"
10723
" committed version of the file."
10724
msgstr ""
10725
10726
#: en/help_topics/revisionspec.txt:178
10727
msgid ":mainline:"
10728
msgstr ""
10729
10730
#: en/help_topics/revisionspec.txt:180
10731
msgid ""
10732
" Select the revision that merged the specified revision into mainline."
10733
msgstr ""
10734
10735
#: en/help_topics/revisionspec.txt:182
10736
msgid ":last:"
10737
msgstr ""
10738
10739
#: en/help_topics/revisionspec.txt:184
10740
msgid ""
10741
" Supply a positive number to get the nth revision from the end.\n"
10742
" This is the same as supplying negative numbers to the 'revno:' spec.\n"
10743
" Examples::"
10744
msgstr ""
10745
10746
#: en/help_topics/revisionspec.txt:188
10747
msgid ""
10748
" last:1 -> return the last revision\n"
10749
" last:3 -> return the revision 2 before the end.\n"
10750
msgstr ""
10751
10752
#: en/help_topics/rules.txt:1
10753
msgid ""
10754
"Rules\n"
10755
"====="
10756
msgstr ""
10757
10758
#: en/help_topics/rules.txt:7
10759
msgid ""
10760
"Rules are defined in ini file format where the sections are file glob\n"
10761
"patterns and the contents of each section are the preferences for files\n"
10762
"matching that pattern(s). For example::"
10763
msgstr ""
10764
10765
#: en/help_topics/rules.txt:11
10766
msgid ""
10767
" [name *.bat]\n"
10768
" eol = native"
10769
msgstr ""
10770
10771
#: en/help_topics/rules.txt:14
10772
msgid ""
10773
" [name *.html *.xml]\n"
10774
" keywords = xml_escape"
10775
msgstr ""
10776
10777
#: en/help_topics/rules.txt:17
10778
msgid ""
10779
"Preferences like these are useful for commands and plugins wishing to\n"
10780
"provide custom behaviour for selected files. For more information on \n"
10781
"end of line conversion see :doc:`eol-help`.\n"
10782
"Keyword support is provided by the `keywords plugin\n"
10783
"<http://doc.bazaar.canonical.com/plugins/en/keywords-plugin.html>`_."
10784
msgstr ""
10785
10786
#: en/help_topics/rules.txt:23
10787
msgid ""
10788
"Files\n"
10789
"-----"
10790
msgstr ""
10791
10792
#: en/help_topics/rules.txt:26
10793
msgid ""
10794
"Default rules for all branches are defined in the optional file\n"
10795
"``BZR_HOME/rules``. "
10796
msgstr ""
10797
10798
#: en/help_topics/rules.txt:29
10799
msgid ""
10800
"Rule Patterns\n"
10801
"-------------"
10802
msgstr ""
10803
10804
#: en/help_topics/rules.txt:32
10805
msgid ""
10806
"Patterns are ordered and searching stops as soon as one matches.\n"
10807
"As a consequence, more explicit patterns should be placed towards\n"
10808
"the top of the file. Rule patterns use exactly the same conventions\n"
10809
"as ignore patterns. See :doc:`patterns-help` for details."
10810
msgstr ""
10811
10812
#: en/help_topics/rules.txt:37
10813
msgid ".. note::"
10814
msgstr ""
10815
10816
#: en/help_topics/rules.txt:39
10817
msgid ""
10818
" Patterns containing square brackets or spaces should be\n"
10819
" surrounded in quotes to ensure they are correctly parsed.\n"
10820
msgstr ""
10821
10822
#: en/help_topics/topics.txt:1
10823
msgid ""
10824
"authentication Information on configuring authentication\n"
10825
"basic Basic commands\n"
10826
"branches Information on what a branch is\n"
10827
"bugs Bug tracker settings\n"
10828
"checkouts Information on what a checkout is\n"
10829
"commands Basic help for all commands\n"
10830
"configuration Details on the configuration settings available\n"
10831
"conflict-types Types of conflicts and what to do about them\n"
10832
"content-filters Conversion of content into/from working trees\n"
10833
"criss-cross Information on criss-cross merging\n"
10834
"current-formats Current storage formats\n"
10835
"debug-flags Options to show or record debug information\n"
10836
"diverged-branches How to fix diverged branches\n"
10837
"env-variables Environment variable names and values\n"
10838
"eol Information on end-of-line handling\n"
10839
"files Information on configuration and log files\n"
10840
"formats Information on choosing a storage format\n"
10841
"global-options Options that control how Bazaar runs\n"
10842
"hidden-commands All hidden commands\n"
10843
"hooks Points at which custom processing can be added\n"
10844
"launchpad Using Bazaar with Launchpad.net\n"
10845
"location-alias Aliases for remembered locations\n"
10846
"log-formats Details on the logging formats available\n"
10847
"other-formats Experimental and deprecated storage formats\n"
10848
"patterns Information on the pattern syntax\n"
10849
"repositories Basic information on shared repositories.\n"
10850
"revisionspec Explain how to use --revision\n"
10851
"rules Information on defining rule-based preferences\n"
10852
"standalone-trees Information on what a standalone tree is\n"
10853
"standard-options Options that can be used with any command\n"
10854
"status-flags Help on status flags\n"
10855
"sync-for-reconfigure Steps to resolve \"out-of-sync\" when reconfiguring\n"
10856
"topics Topics list\n"
10857
"url-special-chars Special character handling in URLs\n"
10858
"urlspec Supported transport protocols\n"
10859
"working-trees Information on working trees\n"
10860
msgstr ""
10861
10862
#: en/help_topics/url-special-chars.txt:1
10863
msgid ""
10864
"Special character handling in URLs\n"
10865
"=================================="
10866
msgstr ""
10867
10868
#: en/help_topics/url-special-chars.txt:4
10869
msgid "Bazaar allows locations to be specified in multiple ways, either:"
10870
msgstr ""
10871
10872
#: en/help_topics/url-special-chars.txt:6
10873
msgid " * Fully qualified URLs"
10874
msgstr ""
10875
10876
#: en/help_topics/url-special-chars.txt:8
10877
msgid " * File system paths, relative or absolute"
10878
msgstr ""
10879
10880
#: en/help_topics/url-special-chars.txt:10
10881
msgid ""
10882
"Internally bzr treats all locations as URLs. For any file system paths\n"
10883
"that are specified it will automatically determine the appropriate URL\n"
10884
"representation, and escape special characters where necessary."
10885
msgstr ""
10886
10887
#: en/help_topics/url-special-chars.txt:14
10888
msgid ""
10889
"There are a few characters which have special meaning in URLs and need "
10890
"careful\n"
10891
"handling to avoid ambiguities. Characters can be escaped with a % and a hex\n"
10892
"value in URLs. Any non-ASCII characters in a file path will automatically "
10893
"be\n"
10894
"urlencoded when the path is converted to a URL."
10895
msgstr ""
10896
10897
#: en/help_topics/url-special-chars.txt:19
10898
msgid ""
10899
"URLs represent non-ASCII characters in an encoding defined by the server, "
10900
"but\n"
10901
"usually UTF-8. The % escapes should be of the UTF-8 bytes. Bazaar tries to "
10902
"be\n"
10903
"generous in what it accepts as a URL and to print them in a way that\n"
10904
"will be readable."
10905
msgstr ""
10906
10907
#: en/help_topics/url-special-chars.txt:24
10908
msgid ""
10909
"For example, if you have a directory named '/tmp/%2False' these are all "
10910
"valid\n"
10911
"ways of accessing the content (0x2F, or 47, is the ASCII code for forward "
10912
"slash)::"
10913
msgstr ""
10914
10915
#: en/help_topics/url-special-chars.txt:27
10916
msgid ""
10917
" cd /tmp\n"
10918
" bzr log /tmp/%2False\n"
10919
" bzr log %2False\n"
10920
" bzr log file:///tmp/%252False\n"
10921
" bzr log file://localhost/tmp/%252False\n"
10922
" bzr log file:%252False"
10923
msgstr ""
10924
10925
#: en/help_topics/url-special-chars.txt:34
10926
msgid "These are valid but do not refer to the same file::"
10927
msgstr ""
10928
10929
#: en/help_topics/url-special-chars.txt:36
10930
msgid ""
10931
" bzr log file:///tmp/%2False (refers to a file called /tmp/\\/alse)\n"
10932
" bzr log %252False (refers to a file called /tmp/%252False)"
10933
msgstr ""
10934
10935
#: en/help_topics/url-special-chars.txt:39
10936
msgid ""
10937
"Comma also has special meaning in URLs, because it denotes `segment "
10938
"parameters`_"
10939
msgstr ""
10940
10941
#: en/help_topics/url-special-chars.txt:41
10942
msgid ""
10943
"_`segment parameters`: http://www.ietf.org/rfc/rfc3986.txt (section 3.3)"
10944
msgstr ""
10945
10946
#: en/help_topics/url-special-chars.txt:43
10947
msgid ""
10948
"Comma is also special in any file system paths that are specified. To use a "
10949
"literal\n"
10950
"comma in a file system path, specify a URL and URL encode the comma::"
10951
msgstr ""
10952
10953
#: en/help_topics/url-special-chars.txt:46
10954
msgid ""
10955
" bzr log foo,branch=bla # path \"foo\" with the segment parameter \"branch"
10956
"\" set to \"bla\"\n"
10957
" bzr log file:foo%2Cbranch=bla # path \"foo,branch=bla\"\n"
10958
" bzr log file:foo,branch=bla # path \"foo\" with segment parameter \"branch"
10959
"\" set to \"bla\"\n"
10960
msgstr ""
10961
10962
#: en/help_topics/urlspec.txt:1
10963
msgid "URL Identifiers"
10964
msgstr ""
10965
10966
#: en/help_topics/urlspec.txt:3
10967
msgid "Supported URL prefixes::"
10968
msgstr ""
10969
10970
#: en/help_topics/urlspec.txt:5
10971
msgid ""
10972
" aftp:// Access using active FTP.\n"
10973
" bzr:// Fast access using the Bazaar smart server.\n"
10974
" bzr+ssh:// Fast access using the Bazaar smart server over SSH.\n"
10975
" file:// Access using the standard filesystem (default)\n"
10976
" ftp:// Access using passive FTP.\n"
10977
" http:// Read-only access of branches exported on the web.\n"
10978
" https:// Read-only access of branches exported on the web using "
10979
"SSL.\n"
10980
" sftp:// Access using SFTP (most SSH servers provide SFTP)."
10981
msgstr ""
10982
10983
#: en/help_topics/urlspec.txt:14
10984
msgid "Supported modifiers::"
10985
msgstr ""
10986
10987
#: en/help_topics/urlspec.txt:16
10988
msgid " gio+ Access using any GIO supported protocols."
10989
msgstr ""
10990
10991
#: en/help_topics/urlspec.txt:18
10992
msgid "Bazaar supports all of the standard parts within the URL::"
10993
msgstr ""
10994
10995
#: en/help_topics/urlspec.txt:20
10996
msgid " <protocol>://[user[:password]@]host[:port]/[path]"
10997
msgstr ""
10998
10999
#: en/help_topics/urlspec.txt:22
11000
msgid "allowing URLs such as::"
11001
msgstr ""
11002
11003
#: en/help_topics/urlspec.txt:24
11004
msgid " http://bzruser:BadPass@bzr.example.com:8080/bzr/trunk"
11005
msgstr ""
11006
11007
#: en/help_topics/urlspec.txt:26
11008
msgid ""
11009
"For bzr+ssh:// and sftp:// URLs, Bazaar also supports paths that begin\n"
11010
"with '~' as meaning that the rest of the path should be interpreted\n"
11011
"relative to the remote user's home directory. For example if the user\n"
11012
"``remote`` has a home directory of ``/home/remote`` on the server\n"
11013
"shell.example.com, then::"
11014
msgstr ""
11015
11016
#: en/help_topics/urlspec.txt:32
11017
msgid " bzr+ssh://remote@shell.example.com/~/myproject/trunk"
11018
msgstr ""
11019
11020
#: en/help_topics/urlspec.txt:34
11021
msgid "would refer to ``/home/remote/myproject/trunk``."
11022
msgstr ""
11023
11024
#: en/help_topics/urlspec.txt:36
11025
msgid ""
11026
"Many commands that accept URLs also accept location aliases too.\n"
11027
"See :doc:`location-alias-help` and :doc:`url-special-chars-help`.\n"
11028
msgstr ""
Loggerhead is a web-based interface for Breezy
Version: 2.0.2.dev0