« back to all changes in this revision
Viewing changes to po/sr.po
- browse files at revision 5110
- compare with another revision
- download diff
- download tarball
- view history from revision 5110
- Committer: Canonical.com Patch Queue Manager
- Date: 2010-03-25 00:02:51 UTC
- mfrom: (5106.1.1 version-bump)
- Revision ID: pqm@pqm.ubuntu.com-20100325000251-bwsv5c5d3l9x3lnn
(Jelmer) Bump API version for 2.2.0.
- files added:
- bzrlib/benchmarks
- bzrlib/benchmarks/tree_creator
- bzrlib/util/effbot
- bzrlib/util/effbot/org
- bzrlib/util/elementtree
- files removed:
- NEWS
- bzrlib/branchfmt
- bzrlib/plugins/bash_completion
- bzrlib/plugins/bash_completion/tests
- bzrlib/plugins/changelog_merge
- bzrlib/plugins/changelog_merge/tests
- bzrlib/plugins/grep
- bzrlib/plugins/po_merge
- bzrlib/plugins/po_merge/tests
- bzrlib/plugins/weave_fmt
- bzrlib/plugins/weave_fmt/tests
- bzrlib/tests/per_bzrdir
- bzrlib/tests/per_controldir_colo
- bzrlib/tests/per_repository_vf
- po
- files renamed:
- doc/en/release-notes/bzr-2.3.txt => NEWS
- doc/en/release-notes/release-template.txt => NEWS-template.txt
- bzrlib/doc_generate/conf.py => bzrlib/doc_generate/sphinx_conf.py
- bzrlib/plugins/weave_fmt/repository.py => bzrlib/repofmt/weaverepo.py
- bzrlib/commit_signature_commands.py => bzrlib/sign_my_commits.py
- bzrlib/tests/per_controldir/ => bzrlib/tests/per_bzrdir/
- bzrlib/tests/per_controldir/test_controldir.py => bzrlib/tests/per_bzrdir/test_bzrdir.py
- bzrlib/tests/per_repository_vf/helpers.py => bzrlib/tests/per_repository/helpers.py
- bzrlib/tests/per_repository_vf/test__generate_text_key_index.py => bzrlib/tests/per_repository/test__generate_text_key_index.py
- bzrlib/tests/per_repository_vf/test_add_inventory_by_delta.py => bzrlib/tests/per_repository/test_add_inventory_by_delta.py
- bzrlib/tests/per_repository_vf/test_check_reconcile.py => bzrlib/tests/per_repository/test_check_reconcile.py
- bzrlib/tests/per_repository_vf/test_find_text_key_references.py => bzrlib/tests/per_repository/test_find_text_key_references.py
- bzrlib/tests/per_repository/test_locking.py => bzrlib/tests/per_repository/test_is_write_locked.py
- bzrlib/tests/per_repository_vf/test_merge_directive.py => bzrlib/tests/per_repository/test_merge_directive.py
- bzrlib/plugins/weave_fmt/xml4.py => bzrlib/xml4.py
- apport/ => contrib/apport/
- apport/bzr-crashdb.conf => contrib/apport/bzr.conf
- files modified:
- .bzrignore
added
removed
po/sr.po
1
# Serbian translation for bzr
2
# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
3
# This file is distributed under the same license as the bzr package.
4
# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
5
#
6
msgid ""
7
msgstr ""
8
"Project-Id-Version: bzr\n"
9
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
10
"POT-Creation-Date: 2012-07-10 11:35+0200\n"
11
"PO-Revision-Date: 2012-12-23 18:32+0000\n"
12
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
13
"Language-Team: Serbian <sr@li.org>\n"
14
"MIME-Version: 1.0\n"
15
"Content-Type: text/plain; charset=UTF-8\n"
16
"Content-Transfer-Encoding: 8bit\n"
17
"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && "
18
"n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
19
"X-Launchpad-Export-Date: 2012-12-24 04:30+0000\n"
20
"X-Generator: Launchpad (build 16378)\n"
21
22
#: bzrlib/add.py:93
23
msgid "skipping {0} (larger than {1} of {2} bytes)"
24
msgstr ""
25
26
#: bzrlib/branch.py:854
27
msgid "Unstacking"
28
msgstr ""
29
30
#: bzrlib/branch.py:2955
31
#, python-format
32
msgid "Pushed up to revision %d."
33
msgstr ""
34
35
#: bzrlib/branch.py:2957
36
#, python-format
37
msgid "%d tag updated."
38
msgid_plural "%d tags updated."
39
msgstr[0] ""
40
msgstr[1] ""
41
42
#: bzrlib/branch.py:2960
43
msgid "No new revisions or tags to push."
44
msgstr ""
45
46
#: bzrlib/branch.py:2962
47
msgid "No new revisions to push."
48
msgstr ""
49
50
#: bzrlib/branch.py:2982
51
msgid "checked branch {0} format {1}"
52
msgstr ""
53
54
#: bzrlib/branch.py:2985
55
#, python-format
56
msgid "found error:%s"
57
msgstr ""
58
59
#: bzrlib/builtins.py:251 bzrlib/builtins.py:3045 bzrlib/workingtree.py:323
60
#, python-format
61
msgid "Ignoring files outside view. View is %s"
62
msgstr ""
63
64
#: bzrlib/builtins.py:260
65
#, python-format
66
msgid "bzr %s --revision takes exactly one revision identifier"
67
msgstr ""
68
69
#: bzrlib/builtins.py:315
70
msgid "Display status summary."
71
msgstr ""
72
73
#: bzrlib/builtins.py:317
74
msgid ""
75
"This reports on versioned and unknown files, reporting them\n"
76
"grouped by state. Possible states are:"
77
msgstr ""
78
79
#: bzrlib/builtins.py:320
80
msgid ""
81
"added\n"
82
" Versioned in the working copy but not in the previous revision."
83
msgstr ""
84
85
#: bzrlib/builtins.py:323
86
msgid ""
87
"removed\n"
88
" Versioned in the previous revision but removed or deleted\n"
89
" in the working copy."
90
msgstr ""
91
92
#: bzrlib/builtins.py:327
93
msgid ""
94
"renamed\n"
95
" Path of this file changed from the previous revision;\n"
96
" the text may also have changed. This includes files whose\n"
97
" parent directory was renamed."
98
msgstr ""
99
100
#: bzrlib/builtins.py:332
101
msgid ""
102
"modified\n"
103
" Text has changed since the previous revision."
104
msgstr ""
105
106
#: bzrlib/builtins.py:335
107
msgid ""
108
"kind changed\n"
109
" File kind has been changed (e.g. from file to directory)."
110
msgstr ""
111
112
#: bzrlib/builtins.py:338
113
msgid ""
114
"unknown\n"
115
" Not versioned and not matching an ignore pattern."
116
msgstr ""
117
118
#: bzrlib/builtins.py:341
119
msgid ""
120
"Additionally for directories, symlinks and files with a changed\n"
121
"executable bit, Bazaar indicates their type using a trailing\n"
122
"character: '/', '@' or '*' respectively. These decorations can be\n"
123
"disabled using the '--no-classify' option."
124
msgstr ""
125
126
#: bzrlib/builtins.py:346
127
msgid ""
128
"To see ignored files use 'bzr ignored'. For details on the\n"
129
"changes to file texts, use 'bzr diff'."
130
msgstr ""
131
132
#: bzrlib/builtins.py:349
133
msgid ""
134
"Note that --short or -S gives status flags for each item, similar\n"
135
"to Subversion's status command. To get output similar to svn -q,\n"
136
"use bzr status -SV."
137
msgstr ""
138
139
#: bzrlib/builtins.py:353
140
msgid ""
141
"If no arguments are specified, the status of the entire working\n"
142
"directory is shown. Otherwise, only the status of the specified\n"
143
"files or directories is reported. If a directory is given, status\n"
144
"is reported for everything inside that directory."
145
msgstr ""
146
147
#: bzrlib/builtins.py:358
148
msgid ""
149
"Before merges are committed, the pending merge tip revisions are\n"
150
"shown. To see all pending merge revisions, use the -v option.\n"
151
"To skip the display of pending merge information altogether, use\n"
152
"the no-pending option or specify a file/directory."
153
msgstr ""
154
155
#: bzrlib/builtins.py:363
156
msgid ""
157
"To compare the working directory to a specific revision, pass a\n"
158
"single revision to the revision argument."
159
msgstr ""
160
161
#: bzrlib/builtins.py:366
162
msgid ""
163
"To see which files have changed in a specific revision, or between\n"
164
"two revisions, pass a revision range to the revision argument.\n"
165
"This will produce the same results as calling 'bzr diff --summarize'."
166
msgstr ""
167
168
#: bzrlib/builtins.py:375
169
msgid "Use short status indicators."
170
msgstr ""
171
172
#: bzrlib/builtins.py:377
173
msgid "Only show versioned files."
174
msgstr ""
175
176
#: bzrlib/builtins.py:379
177
msgid "Don't show pending merges."
178
msgstr ""
179
180
#: bzrlib/builtins.py:382
181
msgid "Do not mark object type using indicator."
182
msgstr ""
183
184
#: bzrlib/builtins.py:397
185
msgid "bzr status --revision takes exactly one or two revision specifiers"
186
msgstr ""
187
188
#: bzrlib/builtins.py:441 bzrlib/builtins.py:5230
189
msgid "You can only supply one of revision_id or --revision"
190
msgstr ""
191
192
#: bzrlib/builtins.py:444 bzrlib/builtins.py:5232
193
msgid "You must supply either --revision or a revision_id"
194
msgstr ""
195
196
#: bzrlib/builtins.py:451
197
#, python-format
198
msgid "Repository %r does not support access to raw revision texts"
199
msgstr ""
200
201
#: bzrlib/builtins.py:462
202
msgid "The repository {0} contains no revision {1}."
203
msgstr ""
204
205
#: bzrlib/builtins.py:469
206
msgid "You cannot specify a NULL revision."
207
msgstr ""
208
209
#: bzrlib/builtins.py:561
210
msgid "Remove the working tree from a given branch/checkout."
211
msgstr ""
212
213
#: bzrlib/builtins.py:563
214
msgid ""
215
"Since a lightweight checkout is little more than a working tree\n"
216
"this will refuse to run against one."
217
msgstr ""
218
219
#: bzrlib/builtins.py:566
220
msgid "To re-create the working tree, use \"bzr checkout\"."
221
msgstr ""
222
223
#: bzrlib/builtins.py:572
224
msgid ""
225
"Remove the working tree even if it has uncommitted or shelved changes."
226
msgstr ""
227
228
#: bzrlib/builtins.py:586
229
msgid "No working tree to remove"
230
msgstr ""
231
232
#: bzrlib/builtins.py:588
233
msgid "You cannot remove the working tree of a remote path"
234
msgstr ""
235
236
#: bzrlib/builtins.py:597
237
msgid "You cannot remove the working tree from a lightweight checkout"
238
msgstr ""
239
240
#: bzrlib/builtins.py:637
241
msgid ""
242
"The tree does not appear to be corrupt. You probably want \"bzr revert\" "
243
"instead. Use \"--force\" if you are sure you want to reset the working tree."
244
msgstr ""
245
246
#: bzrlib/builtins.py:648
247
msgid ""
248
", the header appears corrupt, try passing -r -1 to set the state to the last "
249
"commit"
250
msgstr ""
251
252
#: bzrlib/builtins.py:652
253
msgid "failed to reset the tree state{0}"
254
msgstr ""
255
256
#: bzrlib/builtins.py:656
257
msgid "Show current revision number."
258
msgstr ""
259
260
#: bzrlib/builtins.py:658
261
msgid "This is equal to the number of revisions on this branch."
262
msgstr ""
263
264
#: bzrlib/builtins.py:671
265
msgid "--tree and --revision can not be used together"
266
msgstr ""
267
268
#: bzrlib/builtins.py:688 bzrlib/builtins.py:5986
269
msgid "Tags can only be placed on a single revision, not on a range"
270
msgstr ""
271
272
#: bzrlib/builtins.py:712
273
msgid "Show revno of working tree."
274
msgstr ""
275
276
#: bzrlib/builtins.py:760
277
msgid "Add specified files or directories."
278
msgstr ""
279
280
#: bzrlib/builtins.py:762
281
msgid ""
282
"In non-recursive mode, all the named items are added, regardless\n"
283
"of whether they were previously ignored. A warning is given if\n"
284
"any of the named files are already versioned."
285
msgstr ""
286
287
#: bzrlib/builtins.py:766
288
msgid ""
289
"In recursive mode (the default), files are treated the same way\n"
290
"but the behaviour for directories is different. Directories that\n"
291
"are already versioned do not give a warning. All directories,\n"
292
"whether already versioned or not, are searched for files or\n"
293
"subdirectories that are neither versioned or ignored, and these\n"
294
"are added. This search proceeds recursively into versioned\n"
295
"directories. If no names are given '.' is assumed."
296
msgstr ""
297
298
#: bzrlib/builtins.py:774
299
msgid ""
300
"A warning will be printed when nested trees are encountered,\n"
301
"unless they are explicitly ignored."
302
msgstr ""
303
304
#: bzrlib/builtins.py:777
305
msgid ""
306
"Therefore simply saying 'bzr add' will version all files that\n"
307
"are currently unknown."
308
msgstr ""
309
310
#: bzrlib/builtins.py:780
311
msgid ""
312
"Adding a file whose parent directory is not versioned will\n"
313
"implicitly add the parent, and so on up to the root. This means\n"
314
"you should never need to explicitly add a directory, they'll just\n"
315
"get added when you add a file in the directory."
316
msgstr ""
317
318
#: bzrlib/builtins.py:785
319
msgid ""
320
"--dry-run will show which files would be added, but not actually\n"
321
"add them."
322
msgstr ""
323
324
#: bzrlib/builtins.py:788
325
msgid ""
326
"--file-ids-from will try to use the file ids from the supplied path.\n"
327
"It looks up ids trying to find a matching parent directory with the\n"
328
"same filename, and then by pure path. This option is rarely needed\n"
329
"but can be useful when adding the same logical file into two\n"
330
"branches that will be merged later (without showing the two different\n"
331
"adds as a conflict). It is also useful when merging another project\n"
332
"into a subdirectory of this one."
333
msgstr ""
334
335
#: bzrlib/builtins.py:796
336
msgid ""
337
"Any files matching patterns in the ignore list will not be added\n"
338
"unless they are explicitly mentioned."
339
msgstr ""
340
341
#: bzrlib/builtins.py:799
342
msgid ""
343
"In recursive mode, files larger than the configuration option \n"
344
"add.maximum_file_size will be skipped. Named items are never skipped due\n"
345
"to file size."
346
msgstr ""
347
348
#: bzrlib/builtins.py:806
349
msgid "Don't recursively add the contents of directories."
350
msgstr ""
351
352
#: bzrlib/builtins.py:813
353
msgid "Lookup file ids from this tree."
354
msgstr ""
355
356
#: bzrlib/builtins.py:849
357
msgid "ignored {0} matching \"{1}\"\n"
358
msgstr ""
359
360
#: bzrlib/builtins.py:854
361
msgid "Create a new versioned directory."
362
msgstr ""
363
364
#: bzrlib/builtins.py:856
365
msgid "This is equivalent to creating the directory and then adding it."
366
msgstr ""
367
368
#: bzrlib/builtins.py:863
369
msgid "No error if existing, make parent directories as needed."
370
msgstr ""
371
372
#: bzrlib/builtins.py:897
373
#, python-format
374
msgid "added %s\n"
375
msgstr ""
376
377
#: bzrlib/builtins.py:939
378
#, python-format
379
msgid "invalid kind %r specified"
380
msgstr ""
381
382
#: bzrlib/builtins.py:976
383
msgid "Move or rename a file."
384
msgstr ""
385
386
#: bzrlib/builtins.py:978
387
msgid " bzr mv SOURCE... DESTINATION"
388
msgstr ""
389
390
#: bzrlib/builtins.py:980
391
msgid ""
392
"If the last argument is a versioned directory, all the other names\n"
393
"are moved into it. Otherwise, there must be exactly two arguments\n"
394
"and the file is changed to a new name."
395
msgstr ""
396
397
#: bzrlib/builtins.py:984
398
msgid ""
399
"If OLDNAME does not exist on the filesystem but is versioned and\n"
400
"NEWNAME does exist on the filesystem but is not versioned, mv\n"
401
"assumes that the file has been manually moved and only updates\n"
402
"its internal inventory to reflect that change.\n"
403
"The same is valid when moving many SOURCE files to a DESTINATION."
404
msgstr ""
405
406
#: bzrlib/builtins.py:990
407
msgid "Files cannot be moved between branches."
408
msgstr ""
409
410
#: bzrlib/builtins.py:997
411
msgid ""
412
"Move only the bzr identifier of the file, because the file has already been "
413
"moved."
414
msgstr ""
415
416
#: bzrlib/builtins.py:999
417
msgid "Automatically guess renames."
418
msgstr ""
419
420
#: bzrlib/builtins.py:1000
421
msgid "Avoid making changes when guessing renames."
422
msgstr ""
423
424
#: bzrlib/builtins.py:1009
425
msgid "--dry-run requires --auto."
426
msgstr ""
427
428
#: bzrlib/builtins.py:1013
429
msgid "missing file argument"
430
msgstr ""
431
432
#: bzrlib/builtins.py:1017
433
msgid "can not move root of branch"
434
msgstr ""
435
436
#: bzrlib/builtins.py:1023
437
msgid "Only one path may be specified to --auto."
438
msgstr ""
439
440
#: bzrlib/builtins.py:1026
441
msgid "--after cannot be specified with --auto."
442
msgstr ""
443
444
#: bzrlib/builtins.py:1062
445
msgid "to mv multiple files the destination must be a versioned directory"
446
msgstr ""
447
448
#: bzrlib/builtins.py:1114
449
msgid "Turn this branch into a mirror of another branch."
450
msgstr ""
451
452
#: bzrlib/builtins.py:1116
453
msgid ""
454
"By default, this command only works on branches that have not diverged.\n"
455
"Branches are considered diverged if the destination branch's most recent \n"
456
"commit is one that has not been merged (directly or indirectly) into the \n"
457
"parent."
458
msgstr ""
459
460
#: bzrlib/builtins.py:1121
461
msgid ""
462
"If branches have diverged, you can use 'bzr merge' to integrate the changes\n"
463
"from one into the other. Once one branch has merged, the other should\n"
464
"be able to pull it again."
465
msgstr ""
466
467
#: bzrlib/builtins.py:1125
468
msgid ""
469
"If you want to replace your local changes and just want your branch to\n"
470
"match the remote one, use pull --overwrite. This will work even if the two\n"
471
"branches have diverged."
472
msgstr ""
473
474
#: bzrlib/builtins.py:1129
475
msgid ""
476
"If there is no default location set, the first pull will set it (use\n"
477
"--no-remember to avoid setting it). After that, you can omit the\n"
478
"location to use the default. To change the default, use --remember. The\n"
479
"value will only be saved if the remote location can be accessed."
480
msgstr ""
481
482
#: bzrlib/builtins.py:1134
483
msgid ""
484
"The --verbose option will display the revisions pulled using the log_format\n"
485
"configuration option. You can use a different format by overriding it with\n"
486
"-Olog_format=<other_format>."
487
msgstr ""
488
489
#: bzrlib/builtins.py:1138
490
msgid ""
491
"Note: The location can be specified either in the form of a branch,\n"
492
"or in the form of a path to a file containing a merge directive generated\n"
493
"with bzr send."
494
msgstr ""
495
496
#: bzrlib/builtins.py:1146
497
msgid "Show logs of pulled revisions."
498
msgstr ""
499
500
#: bzrlib/builtins.py:1148
501
msgid ""
502
"Branch to pull into, rather than the one containing the working directory."
503
msgstr ""
504
505
#: bzrlib/builtins.py:1151
506
msgid ""
507
"Perform a local pull in a bound branch. Local pulls are not applied to the "
508
"master branch."
509
msgstr ""
510
511
#: bzrlib/builtins.py:1189
512
msgid "Need working tree for --show-base."
513
msgstr ""
514
515
#: bzrlib/builtins.py:1205
516
msgid "No pull location known or specified."
517
msgstr ""
518
519
#: bzrlib/builtins.py:1211
520
#, python-format
521
msgid "Using saved parent location: %s\n"
522
msgstr ""
523
524
#: bzrlib/builtins.py:1218 bzrlib/builtins.py:4425
525
msgid "Cannot use -r with merge directives or bundles"
526
msgstr ""
527
528
#: bzrlib/builtins.py:1261
529
msgid "Update a mirror of this branch."
530
msgstr ""
531
532
#: bzrlib/builtins.py:1263
533
msgid ""
534
"The target branch will not have its working tree populated because this\n"
535
"is both expensive, and is not supported on remote file systems."
536
msgstr ""
537
538
#: bzrlib/builtins.py:1266
539
msgid ""
540
"Some smart servers or protocols *may* put the working tree in place in\n"
541
"the future."
542
msgstr ""
543
544
#: bzrlib/builtins.py:1269
545
msgid ""
546
"This command only works on branches that have not diverged. Branches are\n"
547
"considered diverged if the destination branch's most recent commit is one\n"
548
"that has not been merged (directly or indirectly) by the source branch."
549
msgstr ""
550
551
#: bzrlib/builtins.py:1273
552
msgid ""
553
"If branches have diverged, you can use 'bzr push --overwrite' to replace\n"
554
"the other branch completely, discarding its unmerged changes."
555
msgstr ""
556
557
#: bzrlib/builtins.py:1276
558
msgid ""
559
"If you want to ensure you have the different changes in the other branch,\n"
560
"do a merge (see bzr help merge) from the other branch, and commit that.\n"
561
"After that you will be able to do a push without '--overwrite'."
562
msgstr ""
563
564
#: bzrlib/builtins.py:1280
565
msgid ""
566
"If there is no default push location set, the first push will set it (use\n"
567
"--no-remember to avoid setting it). After that, you can omit the\n"
568
"location to use the default. To change the default, use --remember. The\n"
569
"value will only be saved if the remote location can be accessed."
570
msgstr ""
571
572
#: bzrlib/builtins.py:1285
573
msgid ""
574
"The --verbose option will display the revisions pushed using the log_format\n"
575
"configuration option. You can use a different format by overriding it with\n"
576
"-Olog_format=<other_format>."
577
msgstr ""
578
579
#: bzrlib/builtins.py:1296 bzrlib/foreign.py:272
580
msgid ""
581
"Branch to push from, rather than the one containing the working directory."
582
msgstr ""
583
584
#: bzrlib/builtins.py:1299
585
msgid ""
586
"By default push will fail if the target directory exists, but does not "
587
"already have a control directory. This flag will allow push to proceed."
588
msgstr ""
589
590
#: bzrlib/builtins.py:1304
591
msgid ""
592
"Create a stacked branch that references the public location of the parent "
593
"branch."
594
msgstr ""
595
596
#: bzrlib/builtins.py:1307
597
msgid ""
598
"Create a stacked branch that refers to another branch for the commit "
599
"history. Only the work not present in the referenced branch is included in "
600
"the branch created."
601
msgstr ""
602
603
#: bzrlib/builtins.py:1312 bzrlib/foreign.py:279
604
msgid ""
605
"Refuse to push if there are uncommitted changes in the working tree, --no-"
606
"strict disables the check."
607
msgstr ""
608
609
#: bzrlib/builtins.py:1315
610
msgid "Don't populate the working tree, even for protocols that support it."
611
msgstr ""
612
613
#: bzrlib/builtins.py:1318
614
msgid "Overwrite tags only."
615
msgstr ""
616
617
#: bzrlib/builtins.py:1369
618
msgid "Could not determine branch to refer to."
619
msgstr ""
620
621
#: bzrlib/builtins.py:1378
622
#, python-format
623
msgid ""
624
"No push location known or specified. To push to the parent branch (at %s), "
625
"use 'bzr push :parent'."
626
msgstr ""
627
628
#: bzrlib/builtins.py:1384 bzrlib/foreign.py:306
629
msgid "No push location known or specified."
630
msgstr ""
631
632
#: bzrlib/builtins.py:1388
633
#, python-format
634
msgid "Using saved push location: %s"
635
msgstr ""
636
637
#: bzrlib/builtins.py:1398
638
msgid "Create a new branch that is a copy of an existing branch."
639
msgstr ""
640
641
#: bzrlib/builtins.py:1400
642
msgid ""
643
"If the TO_LOCATION is omitted, the last component of the FROM_LOCATION will\n"
644
"be used. In other words, \"branch ../foo/bar\" will attempt to create "
645
"./bar.\n"
646
"If the FROM_LOCATION has no / or path separator embedded, the TO_LOCATION\n"
647
"is derived from the FROM_LOCATION by stripping a leading scheme or drive\n"
648
"identifier, if any. For example, \"branch lp:foo-bar\" will attempt to\n"
649
"create ./foo-bar."
650
msgstr ""
651
652
#: bzrlib/builtins.py:1407
653
msgid ""
654
"To retrieve the branch as of a particular revision, supply the --revision\n"
655
"parameter, as in \"branch foo/bar -r 5\"."
656
msgstr ""
657
658
#: bzrlib/builtins.py:1410
659
msgid "The synonyms 'clone' and 'get' for this command are deprecated."
660
msgstr ""
661
662
#: bzrlib/builtins.py:1420
663
msgid "Create a branch without a working-tree."
664
msgstr ""
665
666
#: bzrlib/builtins.py:1422
667
msgid "Switch the checkout in the current directory to the new branch."
668
msgstr ""
669
670
#: bzrlib/builtins.py:1425
671
msgid ""
672
"Create a stacked branch referring to the source branch. The new branch will "
673
"depend on the availability of the source branch for all operations."
674
msgstr ""
675
676
#: bzrlib/builtins.py:1429
677
msgid "Do not use a shared repository, even if available."
678
msgstr ""
679
680
#: bzrlib/builtins.py:1431
681
msgid ""
682
"By default branch will fail if the target directory exists, but does not "
683
"already have a control directory. This flag will allow branch to proceed."
684
msgstr ""
685
686
#: bzrlib/builtins.py:1436
687
msgid "Bind new branch to from location."
688
msgstr ""
689
690
#: bzrlib/builtins.py:1483
691
#, python-format
692
msgid "Target directory \"%s\" already exists."
693
msgstr ""
694
695
#: bzrlib/builtins.py:1495
696
#, python-format
697
msgid "Parent of \"%s\" does not exist."
698
msgstr ""
699
700
#: bzrlib/builtins.py:1514
701
msgid "The branch {0} has no revision {1}."
702
msgstr ""
703
704
#: bzrlib/builtins.py:1529 bzrlib/push.py:53
705
#, python-format
706
msgid "Created new stacked branch referring to %s."
707
msgstr ""
708
709
#: bzrlib/builtins.py:1533
710
#, python-format
711
msgid "Branched %d revision."
712
msgid_plural "Branched %d revisions."
713
msgstr[0] ""
714
msgstr[1] ""
715
716
#: bzrlib/builtins.py:1538
717
#, python-format
718
msgid "New branch bound to %s"
719
msgstr ""
720
721
#: bzrlib/builtins.py:1543 bzrlib/builtins.py:6280
722
#, python-format
723
msgid "Switched to branch: %s"
724
msgstr ""
725
726
#: bzrlib/builtins.py:1548
727
msgid "List the branches available at the current location."
728
msgstr ""
729
730
#: bzrlib/builtins.py:1550
731
msgid ""
732
"This command will print the names of all the branches at the current\n"
733
"location."
734
msgstr ""
735
736
#: bzrlib/builtins.py:1557
737
msgid ""
738
"Recursively scan for branches rather than just looking in the specified "
739
"location."
740
msgstr ""
741
742
#: bzrlib/builtins.py:1586
743
msgid "(default)"
744
msgstr ""
745
746
#: bzrlib/builtins.py:1598
747
msgid "Create a new checkout of an existing branch."
748
msgstr ""
749
750
#: bzrlib/builtins.py:1600
751
msgid ""
752
"If BRANCH_LOCATION is omitted, checkout will reconstitute a working tree "
753
"for\n"
754
"the branch found in '.'. This is useful if you have removed the working "
755
"tree\n"
756
"or if it was never created - i.e. if you pushed the branch to its current\n"
757
"location using SFTP."
758
msgstr ""
759
760
#: bzrlib/builtins.py:1605
761
msgid ""
762
"If the TO_LOCATION is omitted, the last component of the BRANCH_LOCATION "
763
"will\n"
764
"be used. In other words, \"checkout ../foo/bar\" will attempt to create "
765
"./bar.\n"
766
"If the BRANCH_LOCATION has no / or path separator embedded, the TO_LOCATION\n"
767
"is derived from the BRANCH_LOCATION by stripping a leading scheme or drive\n"
768
"identifier, if any. For example, \"checkout lp:foo-bar\" will attempt to\n"
769
"create ./foo-bar."
770
msgstr ""
771
772
#: bzrlib/builtins.py:1612
773
msgid ""
774
"To retrieve the branch as of a particular revision, supply the --revision\n"
775
"parameter, as in \"checkout foo/bar -r 5\". Note that this will be "
776
"immediately\n"
777
"out of date [so you cannot commit] but it may be useful (i.e. to examine "
778
"old\n"
779
"code.)"
780
msgstr ""
781
782
#: bzrlib/builtins.py:1622
783
msgid ""
784
"Perform a lightweight checkout. Lightweight checkouts depend on access to "
785
"the branch for every operation. Normal checkouts can perform common "
786
"operations like diff and status without such access, and also support local "
787
"commits."
788
msgstr ""
789
790
#: bzrlib/builtins.py:1629
791
msgid "Get file contents from this tree."
792
msgstr ""
793
794
#: bzrlib/builtins.py:1631
795
msgid "Hard-link working tree files where possible."
796
msgstr ""
797
798
#: bzrlib/builtins.py:1672
799
msgid ""
800
"Show list of renamed files.\n"
801
" "
802
msgstr ""
803
804
#: bzrlib/builtins.py:1700
805
msgid "Update a working tree to a new revision."
806
msgstr ""
807
808
#: bzrlib/builtins.py:1702
809
msgid ""
810
"This will perform a merge of the destination revision (the tip of the\n"
811
"branch, or the specified revision) into the working tree, and then make\n"
812
"that revision the basis revision for the working tree. "
813
msgstr ""
814
815
#: bzrlib/builtins.py:1706
816
msgid ""
817
"You can use this to visit an older revision, or to update a working tree\n"
818
"that is out of date from its branch."
819
msgstr ""
820
821
#: bzrlib/builtins.py:1709
822
msgid ""
823
"If there are any uncommitted changes in the tree, they will be carried\n"
824
"across and remain as uncommitted changes after the update. To discard\n"
825
"these changes, use 'bzr revert'. The uncommitted changes may conflict\n"
826
"with the changes brought in by the change in basis revision."
827
msgstr ""
828
829
#: bzrlib/builtins.py:1714
830
msgid ""
831
"If the tree's branch is bound to a master branch, bzr will also update\n"
832
"the branch from the master."
833
msgstr ""
834
835
#: bzrlib/builtins.py:1717
836
msgid ""
837
"You cannot update just a single file or directory, because each Bazaar\n"
838
"working tree has just a single basis revision. If you want to restore a\n"
839
"file that has been removed locally, use 'bzr revert' instead of 'bzr\n"
840
"update'. If you want to restore a file to its state in a previous\n"
841
"revision, use 'bzr revert' with a '-r' option, or use 'bzr cat' to write\n"
842
"out the old content of that file to a new location."
843
msgstr ""
844
845
#: bzrlib/builtins.py:1724
846
msgid ""
847
"The 'dir' argument, if given, must be the location of the root of a\n"
848
"working tree to update. By default, the working tree that contains the \n"
849
"current working directory is used."
850
msgstr ""
851
852
#: bzrlib/builtins.py:1740
853
msgid "bzr update --revision takes exactly one revision"
854
msgstr ""
855
856
#: bzrlib/builtins.py:1748
857
msgid "bzr update can only update a whole tree, not a file or subdirectory"
858
msgstr ""
859
860
#: bzrlib/builtins.py:1779
861
msgid "Tree is up to date at revision {0} of branch {1}"
862
msgstr ""
863
864
#: bzrlib/builtins.py:1795
865
#, python-format
866
msgid ""
867
"branch has no revision %s\n"
868
"bzr update --revision only works for a revision in the branch history"
869
msgstr ""
870
871
#: bzrlib/builtins.py:1801
872
msgid "Updated to revision {0} of branch {1}"
873
msgstr ""
874
875
#: bzrlib/builtins.py:1805
876
msgid ""
877
"Your local commits will now show as pending merges with 'bzr status', and "
878
"can be committed with 'bzr commit'."
879
msgstr ""
880
881
#: bzrlib/builtins.py:1814
882
msgid "Show information about a working tree, branch or repository."
883
msgstr ""
884
885
#: bzrlib/builtins.py:1816
886
msgid ""
887
"This command will show all known locations and formats associated to the\n"
888
"tree, branch or repository."
889
msgstr ""
890
891
#: bzrlib/builtins.py:1819
892
msgid ""
893
"In verbose mode, statistical information is included with each report.\n"
894
"To see extended statistic information, use a verbosity level of 2 or\n"
895
"higher by specifying the verbose option multiple times, e.g. -vv."
896
msgstr ""
897
898
#: bzrlib/builtins.py:1823
899
msgid "Branches and working trees will also report any missing revisions."
900
msgstr ""
901
902
#: bzrlib/builtins.py:1825 bzrlib/builtins.py:3744 bzrlib/builtins.py:4885
903
#: bzrlib/builtins.py:6466
904
msgid ":Examples:"
905
msgstr ""
906
907
#: bzrlib/builtins.py:1827
908
msgid " Display information on the format and related locations:"
909
msgstr ""
910
911
#: bzrlib/builtins.py:1829
912
msgid " bzr info"
913
msgstr ""
914
915
#: bzrlib/builtins.py:1831
916
msgid ""
917
" Display the above together with extended format information and\n"
918
" basic statistics (like the number of files in the working tree and\n"
919
" number of revisions in the branch and repository):"
920
msgstr ""
921
922
#: bzrlib/builtins.py:1835
923
msgid " bzr info -v"
924
msgstr ""
925
926
#: bzrlib/builtins.py:1837
927
msgid " Display the above together with number of committers to the branch:"
928
msgstr ""
929
930
#: bzrlib/builtins.py:1839
931
msgid " bzr info -vv"
932
msgstr ""
933
934
#: bzrlib/builtins.py:1858
935
msgid "Remove files or directories."
936
msgstr ""
937
938
#: bzrlib/builtins.py:1860
939
msgid ""
940
"This makes Bazaar stop tracking changes to the specified files. Bazaar will\n"
941
"delete them if they can easily be recovered using revert otherwise they\n"
942
"will be backed up (adding an extension of the form .~#~). If no options or\n"
943
"parameters are given Bazaar will scan for files that are being tracked by\n"
944
"Bazaar but missing in your tree and stop tracking them for you."
945
msgstr ""
946
947
#: bzrlib/builtins.py:1868
948
msgid "Only remove files that have never been committed."
949
msgstr ""
950
951
#: bzrlib/builtins.py:1870
952
msgid "The file deletion mode to be used."
953
msgstr ""
954
955
#: bzrlib/builtins.py:1871
956
msgid "Deletion Strategy"
957
msgstr ""
958
959
#: bzrlib/builtins.py:1872
960
msgid "Backup changed files (default)."
961
msgstr ""
962
963
#: bzrlib/builtins.py:1873
964
msgid "Delete from bzr but leave the working copy."
965
msgstr ""
966
967
#: bzrlib/builtins.py:1874
968
msgid "Don't backup changed files."
969
msgstr ""
970
971
#: bzrlib/builtins.py:1875
972
msgid ""
973
"Delete all the specified files, even if they can not be recovered and even "
974
"if they are non-empty directories. (deprecated, use no-backup)"
975
msgstr ""
976
977
#: bzrlib/builtins.py:1884
978
msgid "(The --force option is deprecated, rather use --no-backup in future.)"
979
msgstr ""
980
981
#: bzrlib/builtins.py:1901
982
msgid "No matching files."
983
msgstr ""
984
985
#: bzrlib/builtins.py:1962
986
msgid "Reconcile bzr metadata in a branch."
987
msgstr ""
988
989
#: bzrlib/builtins.py:1964
990
msgid ""
991
"This can correct data mismatches that may have been caused by\n"
992
"previous ghost operations or bzr upgrades. You should only\n"
993
"need to run this command if 'bzr check' or a bzr developer\n"
994
"advises you to run it."
995
msgstr ""
996
997
#: bzrlib/builtins.py:1969
998
msgid ""
999
"If a second branch is provided, cross-branch reconciliation is\n"
1000
"also attempted, which will check that data like the tree root\n"
1001
"id which was not present in very early bzr versions is represented\n"
1002
"correctly in both branches."
1003
msgstr ""
1004
1005
#: bzrlib/builtins.py:1974
1006
msgid ""
1007
"At the same time it is run it may recompress data resulting in\n"
1008
"a potential saving in disk space or performance gain."
1009
msgstr ""
1010
1011
#: bzrlib/builtins.py:1977
1012
msgid "The branch *MUST* be on a listable system such as local disk or sftp."
1013
msgstr ""
1014
1015
#: bzrlib/builtins.py:2044 bzrlib/builtins.py:2162 bzrlib/builtins.py:3779
1016
msgid ""
1017
"Format for the bzr 2.0 series.\n"
1018
"Uses group-compress storage.\n"
1019
"Provides rich roots which are a one-way transition.\n"
1020
msgstr ""
1021
1022
#: bzrlib/builtins.py:2044 bzrlib/builtins.py:2162 bzrlib/builtins.py:3779
1023
msgid ""
1024
"Pack-based format used in 1.x series. Introduced in 0.92. Interoperates with "
1025
"bzr repositories before 0.92 but cannot be read by bzr < 0.92. "
1026
msgstr ""
1027
1028
#: bzrlib/builtins.py:2044 bzrlib/builtins.py:2162 bzrlib/builtins.py:3779
1029
msgid "The 2a format with experimental support for colocated branches.\n"
1030
msgstr ""
1031
1032
#: bzrlib/builtins.py:2045
1033
msgid "Make a directory into a versioned branch."
1034
msgstr ""
1035
1036
#: bzrlib/builtins.py:2047
1037
msgid ""
1038
"Use this to create an empty branch, or before importing an\n"
1039
"existing project."
1040
msgstr ""
1041
1042
#: bzrlib/builtins.py:2050
1043
msgid ""
1044
"If there is a repository in a parent directory of the location, then\n"
1045
"the history of the branch will be stored in the repository. Otherwise\n"
1046
"init creates a standalone branch which carries its own history\n"
1047
"in the .bzr directory."
1048
msgstr ""
1049
1050
#: bzrlib/builtins.py:2055
1051
msgid ""
1052
"If there is already a branch at the location but it has no working tree,\n"
1053
"the tree can be populated with 'bzr checkout'."
1054
msgstr ""
1055
1056
#: bzrlib/builtins.py:2058
1057
msgid "Recipe for importing a tree of files::"
1058
msgstr ""
1059
1060
#: bzrlib/builtins.py:2060
1061
msgid ""
1062
" cd ~/project\n"
1063
" bzr init\n"
1064
" bzr add .\n"
1065
" bzr status\n"
1066
" bzr commit -m \"imported project\""
1067
msgstr ""
1068
1069
#: bzrlib/builtins.py:2071
1070
msgid ""
1071
"Create the path leading up to the branch if it does not already exist."
1072
msgstr ""
1073
1074
#: bzrlib/builtins.py:2074
1075
msgid "Specify a format for this branch. See \"help formats\"."
1076
msgstr ""
1077
1078
#: bzrlib/builtins.py:2082
1079
msgid ""
1080
"Never change revnos or the existing log. Append revisions to it only."
1081
msgstr ""
1082
1083
#: bzrlib/builtins.py:2085
1084
msgid "Create a branch without a working tree."
1085
msgstr ""
1086
1087
#: bzrlib/builtins.py:2105 bzrlib/push.py:110
1088
#, python-format
1089
msgid ""
1090
"Parent directory of %s does not exist.\n"
1091
"You may supply --create-prefix to create all leading parent directories."
1092
msgstr ""
1093
1094
#: bzrlib/builtins.py:2139
1095
msgid ""
1096
"This branch format cannot be set to append-revisions-only. Try --default."
1097
msgstr ""
1098
1099
#: bzrlib/builtins.py:2150
1100
msgid "Created a {0} (format: {1})\n"
1101
msgstr ""
1102
1103
#: bzrlib/builtins.py:2159
1104
#, python-format
1105
msgid "Using shared repository: %s\n"
1106
msgstr ""
1107
1108
#: bzrlib/builtins.py:2163
1109
msgid "Create a shared repository for branches to share storage space."
1110
msgstr ""
1111
1112
#: bzrlib/builtins.py:2165
1113
msgid ""
1114
"New branches created under the repository directory will store their\n"
1115
"revisions in the repository, not in the branch directory. For branches\n"
1116
"with shared history, this reduces the amount of storage needed and \n"
1117
"speeds up the creation of new branches."
1118
msgstr ""
1119
1120
#: bzrlib/builtins.py:2170
1121
msgid ""
1122
"If the --no-trees option is given then the branches in the repository\n"
1123
"will not have working trees by default. They will still exist as \n"
1124
"directories on disk, but they will not have separate copies of the \n"
1125
"files at a certain revision. This can be useful for repositories that\n"
1126
"store branches which are interacted with through checkouts or remote\n"
1127
"branches, such as on a server."
1128
msgstr ""
1129
1130
#: bzrlib/builtins.py:2177
1131
msgid ""
1132
":Examples:\n"
1133
" Create a shared repository holding just branches::"
1134
msgstr ""
1135
1136
#: bzrlib/builtins.py:2180
1137
msgid ""
1138
" bzr init-repo --no-trees repo\n"
1139
" bzr init repo/trunk"
1140
msgstr ""
1141
1142
#: bzrlib/builtins.py:2183
1143
msgid " Make a lightweight checkout elsewhere::"
1144
msgstr ""
1145
1146
#: bzrlib/builtins.py:2185
1147
msgid ""
1148
" bzr checkout --lightweight repo/trunk trunk-checkout\n"
1149
" cd trunk-checkout\n"
1150
" (add files here)"
1151
msgstr ""
1152
1153
#: bzrlib/builtins.py:2193
1154
msgid ""
1155
"Specify a format for this repository. See \"bzr help formats\" for details."
1156
msgstr ""
1157
1158
#: bzrlib/builtins.py:2197
1159
msgid "Repository format"
1160
msgstr ""
1161
1162
#: bzrlib/builtins.py:2199
1163
msgid "Branches in the repository will default to not having a working tree."
1164
msgstr ""
1165
1166
#: bzrlib/builtins.py:2225
1167
msgid "Show differences in the working tree, between revisions or branches."
1168
msgstr ""
1169
1170
#: bzrlib/builtins.py:2227
1171
msgid ""
1172
"If no arguments are given, all changes for the current tree are listed.\n"
1173
"If files are given, only the changes in those files are listed.\n"
1174
"Remote and multiple branches can be compared by using the --old and\n"
1175
"--new options. If not provided, the default for both is derived from\n"
1176
"the first argument, if any, or the current tree if no arguments are\n"
1177
"given."
1178
msgstr ""
1179
1180
#: bzrlib/builtins.py:2234
1181
msgid ""
1182
"\"bzr diff -p1\" is equivalent to \"bzr diff --prefix old/:new/\", and\n"
1183
"produces patches suitable for \"patch -p1\"."
1184
msgstr ""
1185
1186
#: bzrlib/builtins.py:2237
1187
msgid ""
1188
"Note that when using the -r argument with a range of revisions, the\n"
1189
"differences are computed between the two specified revisions. That\n"
1190
"is, the command does not show the changes introduced by the first \n"
1191
"revision in the range. This differs from the interpretation of \n"
1192
"revision ranges used by \"bzr log\" which includes the first revision\n"
1193
"in the range."
1194
msgstr ""
1195
1196
#: bzrlib/builtins.py:2244
1197
msgid ""
1198
":Exit values:\n"
1199
" 1 - changed\n"
1200
" 2 - unrepresentable changes\n"
1201
" 3 - error\n"
1202
" 0 - no change"
1203
msgstr ""
1204
1205
#: bzrlib/builtins.py:2250
1206
msgid ""
1207
":Examples:\n"
1208
" Shows the difference in the working tree versus the last commit::"
1209
msgstr ""
1210
1211
#: bzrlib/builtins.py:2253
1212
msgid " bzr diff"
1213
msgstr ""
1214
1215
#: bzrlib/builtins.py:2255
1216
msgid " Difference between the working tree and revision 1::"
1217
msgstr ""
1218
1219
#: bzrlib/builtins.py:2257
1220
msgid " bzr diff -r1"
1221
msgstr ""
1222
1223
#: bzrlib/builtins.py:2259
1224
msgid " Difference between revision 3 and revision 1::"
1225
msgstr ""
1226
1227
#: bzrlib/builtins.py:2261
1228
msgid " bzr diff -r1..3"
1229
msgstr ""
1230
1231
#: bzrlib/builtins.py:2263
1232
msgid " Difference between revision 3 and revision 1 for branch xxx::"
1233
msgstr ""
1234
1235
#: bzrlib/builtins.py:2265
1236
msgid " bzr diff -r1..3 xxx"
1237
msgstr ""
1238
1239
#: bzrlib/builtins.py:2267
1240
msgid " The changes introduced by revision 2 (equivalent to -r1..2)::"
1241
msgstr ""
1242
1243
#: bzrlib/builtins.py:2269
1244
msgid " bzr diff -c2"
1245
msgstr ""
1246
1247
#: bzrlib/builtins.py:2271
1248
msgid ""
1249
" To see the changes introduced by revision X::\n"
1250
" \n"
1251
" bzr diff -cX"
1252
msgstr ""
1253
1254
#: bzrlib/builtins.py:2275
1255
msgid ""
1256
" Note that in the case of a merge, the -c option shows the changes\n"
1257
" compared to the left hand parent. To see the changes against\n"
1258
" another parent, use::"
1259
msgstr ""
1260
1261
#: bzrlib/builtins.py:2279
1262
msgid " bzr diff -r<chosen_parent>..X"
1263
msgstr ""
1264
1265
#: bzrlib/builtins.py:2281
1266
msgid ""
1267
" The changes between the current revision and the previous revision\n"
1268
" (equivalent to -c-1 and -r-2..-1)"
1269
msgstr ""
1270
1271
#: bzrlib/builtins.py:2284
1272
msgid " bzr diff -r-2.."
1273
msgstr ""
1274
1275
#: bzrlib/builtins.py:2286
1276
msgid " Show just the differences for file NEWS::"
1277
msgstr ""
1278
1279
#: bzrlib/builtins.py:2288
1280
msgid " bzr diff NEWS"
1281
msgstr ""
1282
1283
#: bzrlib/builtins.py:2290
1284
msgid " Show the differences in working tree xxx for file NEWS::"
1285
msgstr ""
1286
1287
#: bzrlib/builtins.py:2292
1288
msgid " bzr diff xxx/NEWS"
1289
msgstr ""
1290
1291
#: bzrlib/builtins.py:2294
1292
msgid " Show the differences from branch xxx to this working tree:"
1293
msgstr ""
1294
1295
#: bzrlib/builtins.py:2296
1296
msgid " bzr diff --old xxx"
1297
msgstr ""
1298
1299
#: bzrlib/builtins.py:2298
1300
msgid " Show the differences between two branches for file NEWS::"
1301
msgstr ""
1302
1303
#: bzrlib/builtins.py:2300
1304
msgid " bzr diff --old xxx --new yyy NEWS"
1305
msgstr ""
1306
1307
#: bzrlib/builtins.py:2302
1308
msgid " Same as 'bzr diff' but prefix paths with old/ and new/::"
1309
msgstr ""
1310
1311
#: bzrlib/builtins.py:2304
1312
msgid ""
1313
" bzr diff --prefix old/:new/\n"
1314
" \n"
1315
" Show the differences using a custom diff program with options::\n"
1316
" \n"
1317
" bzr diff --using /usr/bin/diff --diff-options -wu"
1318
msgstr ""
1319
1320
#: bzrlib/builtins.py:2314
1321
msgid "Pass these options to the external diff program."
1322
msgstr ""
1323
1324
#: bzrlib/builtins.py:2317
1325
msgid ""
1326
"Set prefixes added to old and new filenames, as two values separated by a "
1327
"colon. (eg \"old/:new/\")."
1328
msgstr ""
1329
1330
#: bzrlib/builtins.py:2320
1331
msgid "Branch/tree to compare from."
1332
msgstr ""
1333
1334
#: bzrlib/builtins.py:2324
1335
msgid "Branch/tree to compare to."
1336
msgstr ""
1337
1338
#: bzrlib/builtins.py:2330
1339
msgid "Use this command to compare files."
1340
msgstr ""
1341
1342
#: bzrlib/builtins.py:2335
1343
msgid "Diff format to use."
1344
msgstr ""
1345
1346
#: bzrlib/builtins.py:2337
1347
msgid "Diff format"
1348
msgstr ""
1349
1350
#: bzrlib/builtins.py:2359
1351
msgid "--prefix expects two values separated by a colon (eg \"old/:new/\")"
1352
msgstr ""
1353
1354
#: bzrlib/builtins.py:2363
1355
msgid "bzr diff --revision takes exactly one or two revision specifiers"
1356
msgstr ""
1357
1358
#: bzrlib/builtins.py:2368 bzrlib/builtins.py:2765 bzrlib/builtins.py:2778
1359
#: bzrlib/builtins.py:2786 bzrlib/builtins.py:4959
1360
msgid "{0} and {1} are mutually exclusive"
1361
msgstr ""
1362
1363
#: bzrlib/builtins.py:2388
1364
msgid ""
1365
"List files deleted in the working tree.\n"
1366
" "
1367
msgstr ""
1368
1369
#: bzrlib/builtins.py:2465
1370
msgid "Show the tree root directory."
1371
msgstr ""
1372
1373
#: bzrlib/builtins.py:2467
1374
msgid ""
1375
"The root is the nearest enclosing directory with a .bzr control\n"
1376
"directory."
1377
msgstr ""
1378
1379
#: bzrlib/builtins.py:2482
1380
msgid "The limit argument must be an integer."
1381
msgstr ""
1382
1383
#: bzrlib/builtins.py:2490
1384
msgid "The levels argument must be an integer."
1385
msgstr ""
1386
1387
#: bzrlib/builtins.py:2495
1388
msgid "Show historical log for a branch or subset of a branch."
1389
msgstr ""
1390
1391
#: bzrlib/builtins.py:2497
1392
msgid ""
1393
"log is bzr's default tool for exploring the history of a branch.\n"
1394
"The branch to use is taken from the first parameter. If no parameters\n"
1395
"are given, the branch containing the working directory is logged.\n"
1396
"Here are some simple examples::"
1397
msgstr ""
1398
1399
#: bzrlib/builtins.py:2502
1400
msgid ""
1401
" bzr log log the current branch\n"
1402
" bzr log foo.py log a file in its branch\n"
1403
" bzr log http://server/branch log a branch on a server"
1404
msgstr ""
1405
1406
#: bzrlib/builtins.py:2506
1407
msgid ""
1408
"The filtering, ordering and information shown for each revision can\n"
1409
"be controlled as explained below. By default, all revisions are\n"
1410
"shown sorted (topologically) so that newer revisions appear before\n"
1411
"older ones and descendants always appear before ancestors. If displayed,\n"
1412
"merged revisions are shown indented under the revision in which they\n"
1413
"were merged."
1414
msgstr ""
1415
1416
#: bzrlib/builtins.py:2513
1417
msgid ":Output control:"
1418
msgstr ""
1419
1420
#: bzrlib/builtins.py:2515
1421
msgid ""
1422
" The log format controls how information about each revision is\n"
1423
" displayed. The standard log formats are called ``long``, ``short``\n"
1424
" and ``line``. The default is long. See ``bzr help log-formats``\n"
1425
" for more details on log formats."
1426
msgstr ""
1427
1428
#: bzrlib/builtins.py:2520
1429
msgid ""
1430
" The following options can be used to control what information is\n"
1431
" displayed::"
1432
msgstr ""
1433
1434
#: bzrlib/builtins.py:2523
1435
msgid ""
1436
" -l N display a maximum of N revisions\n"
1437
" -n N display N levels of revisions (0 for all, 1 for collapsed)\n"
1438
" -v display a status summary (delta) for each revision\n"
1439
" -p display a diff (patch) for each revision\n"
1440
" --show-ids display revision-ids (and file-ids), not just revnos"
1441
msgstr ""
1442
1443
#: bzrlib/builtins.py:2529
1444
msgid ""
1445
" Note that the default number of levels to display is a function of the\n"
1446
" log format. If the -n option is not used, the standard log formats show\n"
1447
" just the top level (mainline)."
1448
msgstr ""
1449
1450
#: bzrlib/builtins.py:2533
1451
msgid ""
1452
" Status summaries are shown using status flags like A, M, etc. To see\n"
1453
" the changes explained using words like ``added`` and ``modified``\n"
1454
" instead, use the -vv option."
1455
msgstr ""
1456
1457
#: bzrlib/builtins.py:2537
1458
msgid ":Ordering control:"
1459
msgstr ""
1460
1461
#: bzrlib/builtins.py:2539
1462
msgid ""
1463
" To display revisions from oldest to newest, use the --forward option.\n"
1464
" In most cases, using this option will have little impact on the total\n"
1465
" time taken to produce a log, though --forward does not incrementally\n"
1466
" display revisions like --reverse does when it can."
1467
msgstr ""
1468
1469
#: bzrlib/builtins.py:2544
1470
msgid ":Revision filtering:"
1471
msgstr ""
1472
1473
#: bzrlib/builtins.py:2546
1474
msgid ""
1475
" The -r option can be used to specify what revision or range of revisions\n"
1476
" to filter against. The various forms are shown below::"
1477
msgstr ""
1478
1479
#: bzrlib/builtins.py:2549
1480
msgid ""
1481
" -rX display revision X\n"
1482
" -rX.. display revision X and later\n"
1483
" -r..Y display up to and including revision Y\n"
1484
" -rX..Y display from X to Y inclusive"
1485
msgstr ""
1486
1487
#: bzrlib/builtins.py:2554
1488
msgid ""
1489
" See ``bzr help revisionspec`` for details on how to specify X and Y.\n"
1490
" Some common examples are given below::"
1491
msgstr ""
1492
1493
#: bzrlib/builtins.py:2557
1494
msgid ""
1495
" -r-1 show just the tip\n"
1496
" -r-10.. show the last 10 mainline revisions\n"
1497
" -rsubmit:.. show what's new on this branch\n"
1498
" -rancestor:path.. show changes since the common ancestor of this\n"
1499
" branch and the one at location path\n"
1500
" -rdate:yesterday.. show changes since yesterday"
1501
msgstr ""
1502
1503
#: bzrlib/builtins.py:2564
1504
msgid ""
1505
" When logging a range of revisions using -rX..Y, log starts at\n"
1506
" revision Y and searches back in history through the primary\n"
1507
" (\"left-hand\") parents until it finds X. When logging just the\n"
1508
" top level (using -n1), an error is reported if X is not found\n"
1509
" along the way. If multi-level logging is used (-n0), X may be\n"
1510
" a nested merge revision and the log will be truncated accordingly."
1511
msgstr ""
1512
1513
#: bzrlib/builtins.py:2571
1514
msgid ":Path filtering:"
1515
msgstr ""
1516
1517
#: bzrlib/builtins.py:2573
1518
msgid ""
1519
" If parameters are given and the first one is not a branch, the log\n"
1520
" will be filtered to show only those revisions that changed the\n"
1521
" nominated files or directories."
1522
msgstr ""
1523
1524
#: bzrlib/builtins.py:2577
1525
msgid ""
1526
" Filenames are interpreted within their historical context. To log a\n"
1527
" deleted file, specify a revision range so that the file existed at\n"
1528
" the end or start of the range."
1529
msgstr ""
1530
1531
#: bzrlib/builtins.py:2581
1532
msgid ""
1533
" Historical context is also important when interpreting pathnames of\n"
1534
" renamed files/directories. Consider the following example:"
1535
msgstr ""
1536
1537
#: bzrlib/builtins.py:2584
1538
msgid ""
1539
" * revision 1: add tutorial.txt\n"
1540
" * revision 2: modify tutorial.txt\n"
1541
" * revision 3: rename tutorial.txt to guide.txt; add tutorial.txt"
1542
msgstr ""
1543
1544
#: bzrlib/builtins.py:2588
1545
msgid " In this case:"
1546
msgstr ""
1547
1548
#: bzrlib/builtins.py:2590
1549
msgid " * ``bzr log guide.txt`` will log the file added in revision 1"
1550
msgstr ""
1551
1552
#: bzrlib/builtins.py:2592
1553
msgid ""
1554
" * ``bzr log tutorial.txt`` will log the new file added in revision 3"
1555
msgstr ""
1556
1557
#: bzrlib/builtins.py:2594
1558
msgid ""
1559
" * ``bzr log -r2 -p tutorial.txt`` will show the changes made to\n"
1560
" the original file in revision 2."
1561
msgstr ""
1562
1563
#: bzrlib/builtins.py:2597
1564
msgid ""
1565
" * ``bzr log -r2 -p guide.txt`` will display an error message as there\n"
1566
" was no file called guide.txt in revision 2."
1567
msgstr ""
1568
1569
#: bzrlib/builtins.py:2600
1570
msgid ""
1571
" Renames are always followed by log. By design, there is no need to\n"
1572
" explicitly ask for this (and no way to stop logging a file back\n"
1573
" until it was last renamed)."
1574
msgstr ""
1575
1576
#: bzrlib/builtins.py:2604
1577
msgid ":Other filtering:"
1578
msgstr ""
1579
1580
#: bzrlib/builtins.py:2606
1581
msgid ""
1582
" The --match option can be used for finding revisions that match a\n"
1583
" regular expression in a commit message, committer, author or bug.\n"
1584
" Specifying the option several times will match any of the supplied\n"
1585
" expressions. --match-author, --match-bugs, --match-committer and\n"
1586
" --match-message can be used to only match a specific field."
1587
msgstr ""
1588
1589
#: bzrlib/builtins.py:2612
1590
msgid ":Tips & tricks:"
1591
msgstr ""
1592
1593
#: bzrlib/builtins.py:2614
1594
msgid ""
1595
" GUI tools and IDEs are often better at exploring history than command\n"
1596
" line tools: you may prefer qlog or viz from qbzr or bzr-gtk, the\n"
1597
" bzr-explorer shell, or the Loggerhead web interface. See the Plugin\n"
1598
" Guide <http://doc.bazaar.canonical.com/plugins/en/> and\n"
1599
" <http://wiki.bazaar.canonical.com/IDEIntegration>. "
1600
msgstr ""
1601
1602
#: bzrlib/builtins.py:2620
1603
msgid ""
1604
" You may find it useful to add the aliases below to ``bazaar.conf``::"
1605
msgstr ""
1606
1607
#: bzrlib/builtins.py:2622
1608
msgid ""
1609
" [ALIASES]\n"
1610
" tip = log -r-1\n"
1611
" top = log -l10 --line\n"
1612
" show = log -v -p"
1613
msgstr ""
1614
1615
#: bzrlib/builtins.py:2627
1616
msgid ""
1617
" ``bzr tip`` will then show the latest revision while ``bzr top``\n"
1618
" will show the last 10 mainline revisions. To see the details of a\n"
1619
" particular revision X, ``bzr show -rX``."
1620
msgstr ""
1621
1622
#: bzrlib/builtins.py:2631
1623
msgid ""
1624
" If you are interested in looking deeper into a particular merge X,\n"
1625
" use ``bzr log -n0 -rX``."
1626
msgstr ""
1627
1628
#: bzrlib/builtins.py:2634
1629
msgid ""
1630
" ``bzr log -v`` on a branch with lots of history is currently\n"
1631
" very slow. A fix for this issue is currently under development.\n"
1632
" With or without that fix, it is recommended that a revision range\n"
1633
" be given when using the -v option."
1634
msgstr ""
1635
1636
#: bzrlib/builtins.py:2639
1637
msgid ""
1638
" bzr has a generic full-text matching plugin, bzr-search, that can be\n"
1639
" used to find revisions matching user names, commit messages, etc.\n"
1640
" Among other features, this plugin can find all revisions containing\n"
1641
" a list of words but not others."
1642
msgstr ""
1643
1644
#: bzrlib/builtins.py:2644
1645
msgid ""
1646
" When exploring non-mainline history on large projects with deep\n"
1647
" history, the performance of log can be greatly improved by installing\n"
1648
" the historycache plugin. This plugin buffers historical information\n"
1649
" trading disk space for faster speed."
1650
msgstr ""
1651
1652
#: bzrlib/builtins.py:2653
1653
msgid "Show from oldest to newest."
1654
msgstr ""
1655
1656
#: bzrlib/builtins.py:2656
1657
msgid "Show files changed in each revision."
1658
msgstr ""
1659
1660
#: bzrlib/builtins.py:2662
1661
msgid "Show just the specified revision. See also \"help revisionspec\"."
1662
msgstr ""
1663
1664
#: bzrlib/builtins.py:2666
1665
msgid "What names to list as authors - first, all or committer."
1666
msgstr ""
1667
1668
#: bzrlib/builtins.py:2667
1669
msgid "Authors"
1670
msgstr ""
1671
1672
#: bzrlib/builtins.py:2672
1673
msgid "Number of levels to display - 0 for all, 1 for flat."
1674
msgstr ""
1675
1676
#: bzrlib/builtins.py:2682
1677
msgid "Limit the output to the first N revisions."
1678
msgstr ""
1679
1680
#: bzrlib/builtins.py:2687
1681
msgid "Show changes made in each revision as a patch."
1682
msgstr ""
1683
1684
#: bzrlib/builtins.py:2689
1685
msgid "Show merged revisions like --levels 0 does."
1686
msgstr ""
1687
1688
#: bzrlib/builtins.py:2693
1689
msgid "Do not report commits with more than one parent."
1690
msgstr ""
1691
1692
#: bzrlib/builtins.py:2695
1693
msgid ""
1694
"Display only the revisions that are not part of both ancestries (require -"
1695
"rX..Y)."
1696
msgstr ""
1697
1698
#: bzrlib/builtins.py:2699
1699
msgid "Show digital signature validity."
1700
msgstr ""
1701
1702
#: bzrlib/builtins.py:2702
1703
msgid "Show revisions whose properties match this expression."
1704
msgstr ""
1705
1706
#: bzrlib/builtins.py:2706
1707
msgid "Show revisions whose message matches this expression."
1708
msgstr ""
1709
1710
#: bzrlib/builtins.py:2710
1711
msgid "Show revisions whose committer matches this expression."
1712
msgstr ""
1713
1714
#: bzrlib/builtins.py:2714
1715
msgid "Show revisions whose authors match this expression."
1716
msgstr ""
1717
1718
#: bzrlib/builtins.py:2718
1719
msgid "Show revisions whose bugs match this expression."
1720
msgstr ""
1721
1722
#: bzrlib/builtins.py:2772
1723
msgid "--exclude-common-ancestry requires -r with two revisions"
1724
msgstr ""
1725
1726
#: bzrlib/builtins.py:2800
1727
#, python-format
1728
msgid "Path unknown at end or start of revision range: %s"
1729
msgstr ""
1730
1731
#: bzrlib/builtins.py:2917
1732
#, python-format
1733
msgid "bzr %s doesn't accept two revisions in different branches."
1734
msgstr ""
1735
1736
#: bzrlib/builtins.py:2933
1737
#, python-format
1738
msgid "bzr %s --revision takes one or two values."
1739
msgstr ""
1740
1741
#: bzrlib/builtins.py:2978
1742
msgid ""
1743
"List files in a tree.\n"
1744
" "
1745
msgstr ""
1746
1747
#: bzrlib/builtins.py:2987
1748
msgid "Recurse into subdirectories."
1749
msgstr ""
1750
1751
#: bzrlib/builtins.py:2989
1752
msgid "Print paths relative to the root of the branch."
1753
msgstr ""
1754
1755
#: bzrlib/builtins.py:2991
1756
msgid "Print unknown files."
1757
msgstr ""
1758
1759
#: bzrlib/builtins.py:2992
1760
msgid "Print versioned files."
1761
msgstr ""
1762
1763
#: bzrlib/builtins.py:2995
1764
msgid "Print ignored files."
1765
msgstr ""
1766
1767
#: bzrlib/builtins.py:2997
1768
msgid "List entries of a particular kind: file, directory, symlink."
1769
msgstr ""
1770
1771
#: bzrlib/builtins.py:3010
1772
msgid "invalid kind specified"
1773
msgstr ""
1774
1775
#: bzrlib/builtins.py:3013
1776
msgid "Cannot set both --verbose and --null"
1777
msgstr ""
1778
1779
#: bzrlib/builtins.py:3022
1780
msgid "cannot specify both --from-root and PATH"
1781
msgstr ""
1782
1783
#: bzrlib/builtins.py:3109
1784
msgid "Ignore specified files or patterns."
1785
msgstr ""
1786
1787
#: bzrlib/builtins.py:3111
1788
msgid "See ``bzr help patterns`` for details on the syntax of patterns."
1789
msgstr ""
1790
1791
#: bzrlib/builtins.py:3113
1792
msgid ""
1793
"If a .bzrignore file does not exist, the ignore command\n"
1794
"will create one and add the specified files or patterns to the newly\n"
1795
"created file. The ignore command will also automatically add the \n"
1796
".bzrignore file to be versioned. Creating a .bzrignore file without\n"
1797
"the use of the ignore command will require an explicit add command."
1798
msgstr ""
1799
1800
#: bzrlib/builtins.py:3119
1801
msgid ""
1802
"To remove patterns from the ignore list, edit the .bzrignore file.\n"
1803
"After adding, editing or deleting that file either indirectly by\n"
1804
"using this command or directly by using an editor, be sure to commit\n"
1805
"it."
1806
msgstr ""
1807
1808
#: bzrlib/builtins.py:3124
1809
msgid ""
1810
"Bazaar also supports a global ignore file ~/.bazaar/ignore. On Windows\n"
1811
"the global ignore file can be found in the application data directory as\n"
1812
"C:\\Documents and Settings\\<user>\\Application Data\\Bazaar\\2.0\\ignore.\n"
1813
"Global ignores are not touched by this command. The global ignore file\n"
1814
"can be edited directly using an editor."
1815
msgstr ""
1816
1817
#: bzrlib/builtins.py:3130
1818
msgid ""
1819
"Patterns prefixed with '!' are exceptions to ignore patterns and take\n"
1820
"precedence over regular ignores. Such exceptions are used to specify\n"
1821
"files that should be versioned which would otherwise be ignored."
1822
msgstr ""
1823
1824
#: bzrlib/builtins.py:3134
1825
msgid ""
1826
"Patterns prefixed with '!!' act as regular ignore patterns, but have\n"
1827
"precedence over the '!' exception patterns."
1828
msgstr ""
1829
1830
#: bzrlib/builtins.py:3137
1831
msgid ""
1832
":Notes: \n"
1833
" \n"
1834
"* Ignore patterns containing shell wildcards must be quoted from\n"
1835
" the shell on Unix."
1836
msgstr ""
1837
1838
#: bzrlib/builtins.py:3142
1839
msgid ""
1840
"* Ignore patterns starting with \"#\" act as comments in the ignore file.\n"
1841
" To ignore patterns that begin with that character, use the \"RE:\" prefix."
1842
msgstr ""
1843
1844
#: bzrlib/builtins.py:3145
1845
msgid ""
1846
":Examples:\n"
1847
" Ignore the top level Makefile::"
1848
msgstr ""
1849
1850
#: bzrlib/builtins.py:3148
1851
msgid " bzr ignore ./Makefile"
1852
msgstr ""
1853
1854
#: bzrlib/builtins.py:3150
1855
msgid " Ignore .class files in all directories...::"
1856
msgstr ""
1857
1858
#: bzrlib/builtins.py:3152
1859
msgid " bzr ignore \"*.class\""
1860
msgstr ""
1861
1862
#: bzrlib/builtins.py:3154
1863
msgid " ...but do not ignore \"special.class\"::"
1864
msgstr ""
1865
1866
#: bzrlib/builtins.py:3156
1867
msgid " bzr ignore \"!special.class\""
1868
msgstr ""
1869
1870
#: bzrlib/builtins.py:3158
1871
msgid " Ignore files whose name begins with the \"#\" character::"
1872
msgstr ""
1873
1874
#: bzrlib/builtins.py:3160
1875
msgid " bzr ignore \"RE:^#\""
1876
msgstr ""
1877
1878
#: bzrlib/builtins.py:3162 bzrlib/builtins.py:3166
1879
msgid " Ignore .o files under the lib directory::"
1880
msgstr ""
1881
1882
#: bzrlib/builtins.py:3164
1883
msgid " bzr ignore \"lib/**/*.o\""
1884
msgstr ""
1885
1886
#: bzrlib/builtins.py:3168
1887
msgid " bzr ignore \"RE:lib/.*\\.o\""
1888
msgstr ""
1889
1890
#: bzrlib/builtins.py:3170
1891
msgid " Ignore everything but the \"debian\" toplevel directory::"
1892
msgstr ""
1893
1894
#: bzrlib/builtins.py:3172
1895
msgid ""
1896
" bzr ignore \"RE:(?!debian/).*\"\n"
1897
" \n"
1898
" Ignore everything except the \"local\" toplevel directory,\n"
1899
" but always ignore autosave files ending in ~, even under local/::\n"
1900
" \n"
1901
" bzr ignore \"*\"\n"
1902
" bzr ignore \"!./local\"\n"
1903
" bzr ignore \"!!*~\""
1904
msgstr ""
1905
1906
#: bzrlib/builtins.py:3186
1907
msgid "Display the default ignore rules that bzr uses."
1908
msgstr ""
1909
1910
#: bzrlib/builtins.py:3198
1911
msgid "ignore requires at least one NAME_PATTERN or --default-rules."
1912
msgstr ""
1913
1914
#: bzrlib/builtins.py:3209
1915
#, python-format
1916
msgid "Invalid ignore pattern found. %s"
1917
msgid_plural "Invalid ignore patterns found. %s"
1918
msgstr[0] ""
1919
msgstr[1] ""
1920
1921
#: bzrlib/builtins.py:3218
1922
msgid "NAME_PATTERN should not be an absolute path"
1923
msgstr ""
1924
1925
#: bzrlib/builtins.py:3231
1926
#, python-format
1927
msgid ""
1928
"Warning: the following files are version controlled and match your ignore "
1929
"pattern:\n"
1930
"%s\n"
1931
"These files will continue to be version controlled unless you 'bzr remove' "
1932
"them.\n"
1933
msgstr ""
1934
1935
#: bzrlib/builtins.py:3238
1936
msgid "List ignored files and the patterns that matched them."
1937
msgstr ""
1938
1939
#: bzrlib/builtins.py:3240
1940
msgid ""
1941
"List all the ignored files and the ignore pattern that caused the file to\n"
1942
"be ignored."
1943
msgstr ""
1944
1945
#: bzrlib/builtins.py:3243
1946
msgid "Alternatively, to list just the files::"
1947
msgstr ""
1948
1949
#: bzrlib/builtins.py:3245
1950
msgid " bzr ls --ignored"
1951
msgstr ""
1952
1953
#: bzrlib/builtins.py:3279
1954
#, python-format
1955
msgid "not a valid revision-number: %r"
1956
msgstr ""
1957
1958
#: bzrlib/builtins.py:3286
1959
msgid ""
1960
"Export current or past revision to a destination directory or archive."
1961
msgstr ""
1962
1963
#: bzrlib/builtins.py:3288
1964
msgid "If no revision is specified this exports the last committed revision."
1965
msgstr ""
1966
1967
#: bzrlib/builtins.py:3290
1968
msgid ""
1969
"Format may be an \"exporter\" name, such as tar, tgz, tbz2. If none is\n"
1970
"given, try to find the format with the extension. If no extension\n"
1971
"is found exports to a directory (equivalent to --format=dir)."
1972
msgstr ""
1973
1974
#: bzrlib/builtins.py:3294
1975
msgid ""
1976
"If root is supplied, it will be used as the root directory inside\n"
1977
"container formats (tar, zip, etc). If it is not supplied it will default\n"
1978
"to the exported filename. The root option has no effect for 'dir' format."
1979
msgstr ""
1980
1981
#: bzrlib/builtins.py:3298
1982
msgid ""
1983
"If branch is omitted then the branch containing the current working\n"
1984
"directory will be used."
1985
msgstr ""
1986
1987
#: bzrlib/builtins.py:3301
1988
msgid ""
1989
"Note: Export of tree with non-ASCII filenames to zip is not supported."
1990
msgstr ""
1991
1992
#: bzrlib/builtins.py:3303
1993
msgid ""
1994
" ================= =========================\n"
1995
" Supported formats Autodetected by extension\n"
1996
" ================= =========================\n"
1997
" dir (none)\n"
1998
" tar .tar\n"
1999
" tbz2 .tar.bz2, .tbz2\n"
2000
" tgz .tar.gz, .tgz\n"
2001
" zip .zip\n"
2002
" ================= ========================="
2003
msgstr ""
2004
2005
#: bzrlib/builtins.py:3317
2006
msgid "Type of file to export to."
2007
msgstr ""
2008
2009
#: bzrlib/builtins.py:3320
2010
msgid "Apply content filters to export the convenient form."
2011
msgstr ""
2012
2013
#: bzrlib/builtins.py:3324
2014
msgid "Name of the root directory inside the exported file."
2015
msgstr ""
2016
2017
#: bzrlib/builtins.py:3326
2018
msgid ""
2019
"Set modification time of files to that of the last revision in which it was "
2020
"changed."
2021
msgstr ""
2022
2023
#: bzrlib/builtins.py:3329
2024
msgid ""
2025
"Export the working tree contents rather than that of the last revision."
2026
msgstr ""
2027
2028
#: bzrlib/builtins.py:3348
2029
msgid "--uncommitted requires a working tree"
2030
msgstr ""
2031
2032
#: bzrlib/builtins.py:3357
2033
#, python-format
2034
msgid "Unsupported export format: %s"
2035
msgstr ""
2036
2037
#: bzrlib/builtins.py:3361
2038
msgid ""
2039
"Write the contents of a file as of a given revision to standard output."
2040
msgstr ""
2041
2042
#: bzrlib/builtins.py:3363
2043
msgid "If no revision is nominated, the last revision is used."
2044
msgstr ""
2045
2046
#: bzrlib/builtins.py:3365
2047
msgid ""
2048
"Note: Take care to redirect standard output when using this command on a\n"
2049
"binary file."
2050
msgstr ""
2051
2052
#: bzrlib/builtins.py:3371
2053
msgid "The path name in the old tree."
2054
msgstr ""
2055
2056
#: bzrlib/builtins.py:3372
2057
msgid "Apply content filters to display the convenience form."
2058
msgstr ""
2059
2060
#: bzrlib/builtins.py:3383
2061
msgid "bzr cat --revision takes exactly one revision specifier"
2062
msgstr ""
2063
2064
#: bzrlib/builtins.py:3408 bzrlib/builtins.py:3420
2065
msgid "{0!r} is not present in revision {1}"
2066
msgstr ""
2067
2068
#: bzrlib/builtins.py:3443
2069
msgid "Commit changes into a new revision."
2070
msgstr ""
2071
2072
#: bzrlib/builtins.py:3445
2073
msgid ""
2074
"An explanatory message needs to be given for each commit. This is\n"
2075
"often done by using the --message option (getting the message from the\n"
2076
"command line) or by using the --file option (getting the message from\n"
2077
"a file). If neither of these options is given, an editor is opened for\n"
2078
"the user to enter the message. To see the changed files in the\n"
2079
"boilerplate text loaded into the editor, use the --show-diff option."
2080
msgstr ""
2081
2082
#: bzrlib/builtins.py:3452
2083
msgid ""
2084
"By default, the entire tree is committed and the person doing the\n"
2085
"commit is assumed to be the author. These defaults can be overridden\n"
2086
"as explained below."
2087
msgstr ""
2088
2089
#: bzrlib/builtins.py:3456
2090
msgid ":Selective commits:"
2091
msgstr ""
2092
2093
#: bzrlib/builtins.py:3458
2094
msgid ""
2095
" If selected files are specified, only changes to those files are\n"
2096
" committed. If a directory is specified then the directory and\n"
2097
" everything within it is committed."
2098
msgstr ""
2099
2100
#: bzrlib/builtins.py:3462
2101
msgid ""
2102
" When excludes are given, they take precedence over selected files.\n"
2103
" For example, to commit only changes within foo, but not changes\n"
2104
" within foo/bar::"
2105
msgstr ""
2106
2107
#: bzrlib/builtins.py:3466
2108
msgid " bzr commit foo -x foo/bar"
2109
msgstr ""
2110
2111
#: bzrlib/builtins.py:3468
2112
msgid " A selective commit after a merge is not yet supported."
2113
msgstr ""
2114
2115
#: bzrlib/builtins.py:3470
2116
msgid ":Custom authors:"
2117
msgstr ""
2118
2119
#: bzrlib/builtins.py:3472
2120
msgid ""
2121
" If the author of the change is not the same person as the committer,\n"
2122
" you can specify the author's name using the --author option. The\n"
2123
" name should be in the same format as a committer-id, e.g.\n"
2124
" \"John Doe <jdoe@example.com>\". If there is more than one author of\n"
2125
" the change you can specify the option multiple times, once for each\n"
2126
" author."
2127
msgstr ""
2128
2129
#: bzrlib/builtins.py:3479
2130
msgid ":Checks:"
2131
msgstr ""
2132
2133
#: bzrlib/builtins.py:3481
2134
msgid ""
2135
" A common mistake is to forget to add a new file or directory before\n"
2136
" running the commit command. The --strict option checks for unknown\n"
2137
" files and aborts the commit if any are found. More advanced pre-commit\n"
2138
" checks can be implemented by defining hooks. See ``bzr help hooks``\n"
2139
" for details."
2140
msgstr ""
2141
2142
#: bzrlib/builtins.py:3487
2143
msgid ":Things to note:"
2144
msgstr ""
2145
2146
#: bzrlib/builtins.py:3489
2147
msgid ""
2148
" If you accidentially commit the wrong changes or make a spelling\n"
2149
" mistake in the commit message say, you can use the uncommit command\n"
2150
" to undo it. See ``bzr help uncommit`` for details."
2151
msgstr ""
2152
2153
#: bzrlib/builtins.py:3493
2154
msgid ""
2155
" Hooks can also be configured to run after a commit. This allows you\n"
2156
" to trigger updates to external systems like bug trackers. The --fixes\n"
2157
" option can be used to record the association between a revision and\n"
2158
" one or more bugs. See ``bzr help bugs`` for details."
2159
msgstr ""
2160
2161
#: bzrlib/builtins.py:3503
2162
msgid "Do not consider changes made to a given path."
2163
msgstr ""
2164
2165
#: bzrlib/builtins.py:3506
2166
msgid "Description of the new revision."
2167
msgstr ""
2168
2169
#: bzrlib/builtins.py:3509
2170
msgid "Commit even if nothing has changed."
2171
msgstr ""
2172
2173
#: bzrlib/builtins.py:3513
2174
msgid "Take commit message from this file."
2175
msgstr ""
2176
2177
#: bzrlib/builtins.py:3515
2178
msgid "Refuse to commit if there are unknown files in the working tree."
2179
msgstr ""
2180
2181
#: bzrlib/builtins.py:3518
2182
msgid ""
2183
"Manually set a commit time using commit date format, e.g. '2009-10-10 "
2184
"08:00:00 +0100'."
2185
msgstr ""
2186
2187
#: bzrlib/builtins.py:3521
2188
msgid "Mark a bug as being fixed by this revision (see \"bzr help bugs\")."
2189
msgstr ""
2190
2191
#: bzrlib/builtins.py:3524
2192
msgid "Set the author's name, if it's different from the committer."
2193
msgstr ""
2194
2195
#: bzrlib/builtins.py:3527
2196
msgid ""
2197
"Perform a local commit in a bound branch. Local commits are not pushed to "
2198
"the master branch until a normal commit is performed."
2199
msgstr ""
2200
2201
#: bzrlib/builtins.py:3533
2202
msgid ""
2203
"When no message is supplied, show the diff along with the status summary in "
2204
"the message editor."
2205
msgstr ""
2206
2207
#: bzrlib/builtins.py:3536
2208
msgid ""
2209
"When committing to a foreign version control system do not push data that "
2210
"can not be natively represented."
2211
msgstr ""
2212
2213
#: bzrlib/builtins.py:3554
2214
#, python-format
2215
msgid ""
2216
"No tracker specified for bug %s. Use the form 'tracker:id' or specify a "
2217
"default bug tracker using the `bugtracker` option.\n"
2218
"See \"bzr help bugs\" for more information on this feature. Commit refused."
2219
msgstr ""
2220
2221
#: bzrlib/builtins.py:3563
2222
#, python-format
2223
msgid ""
2224
"Invalid bug %s. Must be in the form of 'tracker:id'. See \"bzr help bugs\" "
2225
"for more information on this feature.\n"
2226
"Commit refused."
2227
msgstr ""
2228
2229
#: bzrlib/builtins.py:3572
2230
#, python-format
2231
msgid "Unrecognized bug %s. Commit refused."
2232
msgstr ""
2233
2234
#: bzrlib/builtins.py:3575
2235
#, python-format
2236
msgid ""
2237
"%s\n"
2238
"Commit refused."
2239
msgstr ""
2240
2241
#: bzrlib/builtins.py:3599
2242
msgid "Could not parse --commit-time: "
2243
msgstr ""
2244
2245
#: bzrlib/builtins.py:3639
2246
msgid "please specify either --message or --file"
2247
msgstr ""
2248
2249
#: bzrlib/builtins.py:3668
2250
msgid "please specify a commit message with either --message or --file"
2251
msgstr ""
2252
2253
#: bzrlib/builtins.py:3671
2254
msgid ""
2255
"Empty commit message specified. Please specify a commit message with either -"
2256
"-message or --file or leave a blank message with --message \"\"."
2257
msgstr ""
2258
2259
#: bzrlib/builtins.py:3691
2260
msgid ""
2261
"No changes to commit. Please 'bzr add' the files you want to commit, or use -"
2262
"-unchanged to force an empty commit."
2263
msgstr ""
2264
2265
#: bzrlib/builtins.py:3695
2266
msgid ""
2267
"Conflicts detected in working tree. Use \"bzr conflicts\" to list, \"bzr "
2268
"resolve FILE\" to resolve."
2269
msgstr ""
2270
2271
#: bzrlib/builtins.py:3699
2272
msgid "Commit refused because there are unknown files in the working tree."
2273
msgstr ""
2274
2275
#: bzrlib/builtins.py:3702
2276
msgid ""
2277
"\n"
2278
"To commit to master branch, run update and then commit.\n"
2279
"You can also pass --local to commit to continue working disconnected."
2280
msgstr ""
2281
2282
#: bzrlib/builtins.py:3710
2283
msgid ""
2284
"Validate working tree structure, branch consistency and repository history."
2285
msgstr ""
2286
2287
#: bzrlib/builtins.py:3712
2288
msgid ""
2289
"This command checks various invariants about branch and repository storage\n"
2290
"to detect data corruption or bzr bugs."
2291
msgstr ""
2292
2293
#: bzrlib/builtins.py:3715
2294
msgid ""
2295
"The working tree and branch checks will only give output if a problem is\n"
2296
"detected. The output fields of the repository check are:"
2297
msgstr ""
2298
2299
#: bzrlib/builtins.py:3718
2300
msgid ""
2301
"revisions\n"
2302
" This is just the number of revisions checked. It doesn't\n"
2303
" indicate a problem."
2304
msgstr ""
2305
2306
#: bzrlib/builtins.py:3722
2307
msgid ""
2308
"versionedfiles\n"
2309
" This is just the number of versionedfiles checked. It\n"
2310
" doesn't indicate a problem."
2311
msgstr ""
2312
2313
#: bzrlib/builtins.py:3726
2314
msgid ""
2315
"unreferenced ancestors\n"
2316
" Texts that are ancestors of other texts, but\n"
2317
" are not properly referenced by the revision ancestry. This is a\n"
2318
" subtle problem that Bazaar can work around."
2319
msgstr ""
2320
2321
#: bzrlib/builtins.py:3731
2322
msgid ""
2323
"unique file texts\n"
2324
" This is the total number of unique file contents\n"
2325
" seen in the checked revisions. It does not indicate a problem."
2326
msgstr ""
2327
2328
#: bzrlib/builtins.py:3735
2329
msgid ""
2330
"repeated file texts\n"
2331
" This is the total number of repeated texts seen\n"
2332
" in the checked revisions. Texts can be repeated when their file\n"
2333
" entries are modified, but the file contents are not. It does not\n"
2334
" indicate a problem."
2335
msgstr ""
2336
2337
#: bzrlib/builtins.py:3741
2338
msgid ""
2339
"If no restrictions are specified, all Bazaar data that is found at the "
2340
"given\n"
2341
"location will be checked."
2342
msgstr ""
2343
2344
#: bzrlib/builtins.py:3746
2345
msgid " Check the tree and branch at 'foo'::"
2346
msgstr ""
2347
2348
#: bzrlib/builtins.py:3748
2349
msgid " bzr check --tree --branch foo"
2350
msgstr ""
2351
2352
#: bzrlib/builtins.py:3750
2353
msgid " Check only the repository at 'bar'::"
2354
msgstr ""
2355
2356
#: bzrlib/builtins.py:3752
2357
msgid " bzr check --repo bar"
2358
msgstr ""
2359
2360
#: bzrlib/builtins.py:3754
2361
msgid " Check everything at 'baz'::"
2362
msgstr ""
2363
2364
#: bzrlib/builtins.py:3756
2365
msgid " bzr check baz"
2366
msgstr ""
2367
2368
#: bzrlib/builtins.py:3762
2369
msgid "Check the branch related to the current directory."
2370
msgstr ""
2371
2372
#: bzrlib/builtins.py:3764
2373
msgid "Check the repository related to the current directory."
2374
msgstr ""
2375
2376
#: bzrlib/builtins.py:3766
2377
msgid "Check the working tree related to the current directory."
2378
msgstr ""
2379
2380
#: bzrlib/builtins.py:3780
2381
msgid "Upgrade a repository, branch or working tree to a newer format."
2382
msgstr ""
2383
2384
#: bzrlib/builtins.py:3782
2385
msgid ""
2386
"When the default format has changed after a major new release of\n"
2387
"Bazaar, you may be informed during certain operations that you\n"
2388
"should upgrade. Upgrading to a newer format may improve performance\n"
2389
"or make new features available. It may however limit interoperability\n"
2390
"with older repositories or with older versions of Bazaar."
2391
msgstr ""
2392
2393
#: bzrlib/builtins.py:3788
2394
msgid ""
2395
"If you wish to upgrade to a particular format rather than the\n"
2396
"current default, that can be specified using the --format option.\n"
2397
"As a consequence, you can use the upgrade command this way to\n"
2398
"\"downgrade\" to an earlier format, though some conversions are\n"
2399
"a one way process (e.g. changing from the 1.x default to the\n"
2400
"2.x default) so downgrading is not always possible."
2401
msgstr ""
2402
2403
#: bzrlib/builtins.py:3795
2404
msgid ""
2405
"A backup.bzr.~#~ directory is created at the start of the conversion\n"
2406
"process (where # is a number). By default, this is left there on\n"
2407
"completion. If the conversion fails, delete the new .bzr directory\n"
2408
"and rename this one back in its place. Use the --clean option to ask\n"
2409
"for the backup.bzr directory to be removed on successful conversion.\n"
2410
"Alternatively, you can delete it by hand if everything looks good\n"
2411
"afterwards."
2412
msgstr ""
2413
2414
#: bzrlib/builtins.py:3803
2415
msgid ""
2416
"If the location given is a shared repository, dependent branches\n"
2417
"are also converted provided the repository converts successfully.\n"
2418
"If the conversion of a branch fails, remaining branches are still\n"
2419
"tried."
2420
msgstr ""
2421
2422
#: bzrlib/builtins.py:3808
2423
msgid ""
2424
"For more information on upgrades, see the Bazaar Upgrade Guide,\n"
2425
"http://doc.bazaar.canonical.com/latest/en/upgrade-guide/."
2426
msgstr ""
2427
2428
#: bzrlib/builtins.py:3816
2429
msgid "Upgrade to a specific format. See \"bzr help formats\" for details."
2430
msgstr ""
2431
2432
#: bzrlib/builtins.py:3820
2433
msgid "Branch format"
2434
msgstr ""
2435
2436
#: bzrlib/builtins.py:3822
2437
msgid "Remove the backup.bzr directory if successful."
2438
msgstr ""
2439
2440
#: bzrlib/builtins.py:3824
2441
msgid "Show what would be done, but don't actually do anything."
2442
msgstr ""
2443
2444
#: bzrlib/builtins.py:3839
2445
msgid "Show or set bzr user id."
2446
msgstr ""
2447
2448
#: bzrlib/builtins.py:3841
2449
msgid ""
2450
":Examples:\n"
2451
" Show the email of the current user::"
2452
msgstr ""
2453
2454
#: bzrlib/builtins.py:3844
2455
msgid " bzr whoami --email"
2456
msgstr ""
2457
2458
#: bzrlib/builtins.py:3846
2459
msgid " Set the current user::"
2460
msgstr ""
2461
2462
#: bzrlib/builtins.py:3848
2463
msgid " bzr whoami \"Frank Chu <fchu@example.com>\""
2464
msgstr ""
2465
2466
#: bzrlib/builtins.py:3852
2467
msgid "Display email address only."
2468
msgstr ""
2469
2470
#: bzrlib/builtins.py:3854
2471
msgid "Set identity for the current branch instead of globally."
2472
msgstr ""
2473
2474
#: bzrlib/builtins.py:3880
2475
msgid "--email can only be used to display existing identity"
2476
msgstr ""
2477
2478
#: bzrlib/builtins.py:3904
2479
msgid "Print or set the branch nickname."
2480
msgstr ""
2481
2482
#: bzrlib/builtins.py:3906
2483
msgid ""
2484
"If unset, the colocated branch name is used for colocated branches, and\n"
2485
"the branch directory name is used for other branches. To print the\n"
2486
"current nickname, execute with no argument."
2487
msgstr ""
2488
2489
#: bzrlib/builtins.py:3910
2490
msgid ""
2491
"Bound branches use the nickname of its master branch unless it is set\n"
2492
"locally."
2493
msgstr ""
2494
2495
#: bzrlib/builtins.py:3930
2496
msgid "Set/unset and display aliases."
2497
msgstr ""
2498
2499
#: bzrlib/builtins.py:3932
2500
msgid ""
2501
":Examples:\n"
2502
" Show the current aliases::"
2503
msgstr ""
2504
2505
#: bzrlib/builtins.py:3935
2506
msgid " bzr alias"
2507
msgstr ""
2508
2509
#: bzrlib/builtins.py:3937
2510
msgid " Show the alias specified for 'll'::"
2511
msgstr ""
2512
2513
#: bzrlib/builtins.py:3939
2514
msgid " bzr alias ll"
2515
msgstr ""
2516
2517
#: bzrlib/builtins.py:3941
2518
msgid " Set an alias for 'll'::"
2519
msgstr ""
2520
2521
#: bzrlib/builtins.py:3943
2522
msgid " bzr alias ll=\"log --line -r-10..-1\""
2523
msgstr ""
2524
2525
#: bzrlib/builtins.py:3945
2526
msgid " To remove an alias for 'll'::"
2527
msgstr ""
2528
2529
#: bzrlib/builtins.py:3947
2530
msgid " bzr alias --remove ll"
2531
msgstr ""
2532
2533
#: bzrlib/builtins.py:3952
2534
msgid "Remove the alias."
2535
msgstr ""
2536
2537
#: bzrlib/builtins.py:3970
2538
msgid "bzr alias --remove expects an alias to remove."
2539
msgstr ""
2540
2541
#: bzrlib/builtins.py:4151
2542
msgid ""
2543
"subunit not available. subunit needs to be installed to use --subunit."
2544
msgstr ""
2545
2546
#: bzrlib/builtins.py:4168
2547
msgid ""
2548
"--benchmark is no longer supported from bzr 2.2; use bzr-usertest instead"
2549
msgstr ""
2550
2551
#: bzrlib/builtins.py:4215
2552
msgid "Show version of bzr."
2553
msgstr ""
2554
2555
#: bzrlib/builtins.py:4219
2556
msgid "Print just the version number."
2557
msgstr ""
2558
2559
#: bzrlib/builtins.py:4238
2560
msgid "It sure does!\n"
2561
msgstr ""
2562
2563
#: bzrlib/builtins.py:4262
2564
#, python-format
2565
msgid "merge base is revision %s\n"
2566
msgstr ""
2567
2568
#: bzrlib/builtins.py:4266
2569
msgid "Perform a three-way merge."
2570
msgstr ""
2571
2572
#: bzrlib/builtins.py:4268
2573
msgid ""
2574
"The source of the merge can be specified either in the form of a branch,\n"
2575
"or in the form of a path to a file containing a merge directive generated\n"
2576
"with bzr send. If neither is specified, the default is the upstream branch\n"
2577
"or the branch most recently merged using --remember. The source of the\n"
2578
"merge may also be specified in the form of a path to a file in another\n"
2579
"branch: in this case, only the modifications to that file are merged into\n"
2580
"the current working tree."
2581
msgstr ""
2582
2583
#: bzrlib/builtins.py:4276
2584
msgid ""
2585
"When merging from a branch, by default bzr will try to merge in all new\n"
2586
"work from the other branch, automatically determining an appropriate base\n"
2587
"revision. If this fails, you may need to give an explicit base."
2588
msgstr ""
2589
2590
#: bzrlib/builtins.py:4280
2591
msgid ""
2592
"To pick a different ending revision, pass \"--revision OTHER\". bzr will\n"
2593
"try to merge in all new work up to and including revision OTHER."
2594
msgstr ""
2595
2596
#: bzrlib/builtins.py:4283
2597
msgid ""
2598
"If you specify two values, \"--revision BASE..OTHER\", only revisions BASE\n"
2599
"through OTHER, excluding BASE but including OTHER, will be merged. If this\n"
2600
"causes some revisions to be skipped, i.e. if the destination branch does\n"
2601
"not already contain revision BASE, such a merge is commonly referred to as\n"
2602
"a \"cherrypick\". Unlike a normal merge, Bazaar does not currently track\n"
2603
"cherrypicks. The changes look like a normal commit, and the history of the\n"
2604
"changes from the other branch is not stored in the commit."
2605
msgstr ""
2606
2607
#: bzrlib/builtins.py:4291
2608
msgid "Revision numbers are always relative to the source branch."
2609
msgstr ""
2610
2611
#: bzrlib/builtins.py:4293 bzrlib/conflicts.py:52 bzrlib/conflicts.py:106
2612
msgid ""
2613
"Merge will do its best to combine the changes in two branches, but there\n"
2614
"are some kinds of problems only a human can fix. When it encounters those,\n"
2615
"it will mark a conflict. A conflict means that you need to fix something,\n"
2616
"before you can commit."
2617
msgstr ""
2618
2619
#: bzrlib/builtins.py:4298
2620
msgid ""
2621
"Use bzr resolve when you have fixed a problem. See also bzr conflicts."
2622
msgstr ""
2623
2624
#: bzrlib/builtins.py:4300
2625
msgid ""
2626
"If there is no default branch set, the first merge will set it (use\n"
2627
"--no-remember to avoid setting it). After that, you can omit the branch\n"
2628
"to use the default. To change the default, use --remember. The value will\n"
2629
"only be saved if the remote location can be accessed."
2630
msgstr ""
2631
2632
#: bzrlib/builtins.py:4305
2633
msgid ""
2634
"The results of the merge are placed into the destination working\n"
2635
"directory, where they can be reviewed (with bzr diff), tested, and then\n"
2636
"committed to record the result of the merge."
2637
msgstr ""
2638
2639
#: bzrlib/builtins.py:4309
2640
msgid ""
2641
"merge refuses to run if there are any uncommitted changes, unless\n"
2642
"--force is given. If --force is given, then the changes from the source \n"
2643
"will be merged with the current working tree, including any uncommitted\n"
2644
"changes in the tree. The --force option can also be used to create a\n"
2645
"merge revision which has more than two parents."
2646
msgstr ""
2647
2648
#: bzrlib/builtins.py:4315
2649
msgid ""
2650
"If one would like to merge changes from the working tree of the other\n"
2651
"branch without merging any committed revisions, the --uncommitted option\n"
2652
"can be given."
2653
msgstr ""
2654
2655
#: bzrlib/builtins.py:4319
2656
msgid ""
2657
"To select only some changes to merge, use \"merge -i\", which will prompt\n"
2658
"you to apply each diff hunk and file change, similar to \"shelve\"."
2659
msgstr ""
2660
2661
#: bzrlib/builtins.py:4322
2662
msgid ""
2663
":Examples:\n"
2664
" To merge all new revisions from bzr.dev::"
2665
msgstr ""
2666
2667
#: bzrlib/builtins.py:4325
2668
msgid " bzr merge ../bzr.dev"
2669
msgstr ""
2670
2671
#: bzrlib/builtins.py:4327
2672
msgid " To merge changes up to and including revision 82 from bzr.dev::"
2673
msgstr ""
2674
2675
#: bzrlib/builtins.py:4329
2676
msgid " bzr merge -r 82 ../bzr.dev"
2677
msgstr ""
2678
2679
#: bzrlib/builtins.py:4331
2680
msgid " To merge the changes introduced by 82, without previous changes::"
2681
msgstr ""
2682
2683
#: bzrlib/builtins.py:4333
2684
msgid " bzr merge -r 81..82 ../bzr.dev"
2685
msgstr ""
2686
2687
#: bzrlib/builtins.py:4335
2688
msgid " To apply a merge directive contained in /tmp/merge::"
2689
msgstr ""
2690
2691
#: bzrlib/builtins.py:4337
2692
msgid " bzr merge /tmp/merge"
2693
msgstr ""
2694
2695
#: bzrlib/builtins.py:4339
2696
msgid ""
2697
" To create a merge revision with three parents from two branches\n"
2698
" feature1a and feature1b:"
2699
msgstr ""
2700
2701
#: bzrlib/builtins.py:4342
2702
msgid ""
2703
" bzr merge ../feature1a\n"
2704
" bzr merge ../feature1b --force\n"
2705
" bzr commit -m 'revision with three parents'"
2706
msgstr ""
2707
2708
#: bzrlib/builtins.py:4354
2709
msgid "Merge even if the destination tree has uncommitted changes."
2710
msgstr ""
2711
2712
#: bzrlib/builtins.py:4360
2713
msgid ""
2714
"Apply uncommitted changes from a working copy, instead of branch changes."
2715
msgstr ""
2716
2717
#: bzrlib/builtins.py:4362
2718
msgid ""
2719
"If the destination is already completely merged into the source, pull from "
2720
"the source rather than merging. When this happens, you do not need to "
2721
"commit the result."
2722
msgstr ""
2723
2724
#: bzrlib/builtins.py:4367
2725
msgid ""
2726
"Branch to merge into, rather than the one containing the working directory."
2727
msgstr ""
2728
2729
#: bzrlib/builtins.py:4369
2730
msgid "Instead of merging, show a diff of the merge."
2731
msgstr ""
2732
2733
#: bzrlib/builtins.py:4371
2734
msgid "Select changes interactively."
2735
msgstr ""
2736
2737
#: bzrlib/builtins.py:4393
2738
msgid ""
2739
"Merging into empty branches not currently supported, "
2740
"https://bugs.launchpad.net/bzr/+bug/308562"
2741
msgstr ""
2742
2743
#: bzrlib/builtins.py:4420
2744
msgid "Cannot use --uncommitted with bundles or merge directives."
2745
msgstr ""
2746
2747
#: bzrlib/builtins.py:4431
2748
msgid "Cannot use --uncommitted and --revision at the same time."
2749
msgstr ""
2750
2751
#: bzrlib/builtins.py:4451
2752
msgid "merger: "
2753
msgstr ""
2754
2755
#: bzrlib/builtins.py:4453 bzrlib/bundle/apply_bundle.py:71
2756
msgid "Nothing to do."
2757
msgstr ""
2758
2759
#: bzrlib/builtins.py:4457
2760
msgid "Cannot pull individual files"
2761
msgstr ""
2762
2763
#: bzrlib/builtins.py:4465
2764
msgid "This branch has no commits. (perhaps you would prefer 'bzr pull')"
2765
msgstr ""
2766
2767
#: bzrlib/builtins.py:4523
2768
#, python-format
2769
msgid "Show-base is not supported for this merge type. %s"
2770
msgstr ""
2771
2772
#: bzrlib/builtins.py:4532
2773
#, python-format
2774
msgid "Conflict reduction is not supported for merge type %s."
2775
msgstr ""
2776
2777
#: bzrlib/builtins.py:4536
2778
msgid "Cannot do conflict reduction and show base."
2779
msgstr ""
2780
2781
#: bzrlib/builtins.py:4647
2782
msgid "No location specified or remembered"
2783
msgstr ""
2784
2785
#: bzrlib/builtins.py:4649
2786
msgid "{0} remembered {1} location {2}"
2787
msgstr ""
2788
2789
#: bzrlib/builtins.py:4655
2790
msgid "Redo a merge."
2791
msgstr ""
2792
2793
#: bzrlib/builtins.py:4657
2794
msgid ""
2795
"Use this if you want to try a different merge technique while resolving\n"
2796
"conflicts. Some merge techniques are better than others, and remerge\n"
2797
"lets you try different ones on different files."
2798
msgstr ""
2799
2800
#: bzrlib/builtins.py:4661
2801
msgid ""
2802
"The options for remerge have the same meaning and defaults as the ones for\n"
2803
"merge. The difference is that remerge can (only) be run when there is a\n"
2804
"pending merge, and it lets you specify particular files."
2805
msgstr ""
2806
2807
#: bzrlib/builtins.py:4665
2808
msgid ""
2809
":Examples:\n"
2810
" Re-do the merge of all conflicted files, and show the base text in\n"
2811
" conflict regions, in addition to the usual THIS and OTHER texts::"
2812
msgstr ""
2813
2814
#: bzrlib/builtins.py:4669
2815
msgid " bzr remerge --show-base"
2816
msgstr ""
2817
2818
#: bzrlib/builtins.py:4671
2819
msgid ""
2820
" Re-do the merge of \"foobar\", using the weave merge algorithm, with\n"
2821
" additional processing to reduce the size of conflict regions::"
2822
msgstr ""
2823
2824
#: bzrlib/builtins.py:4674
2825
msgid " bzr remerge --merge-type weave --reprocess foobar"
2826
msgstr ""
2827
2828
#: bzrlib/builtins.py:4681
2829
msgid "Show base revision text in conflicts."
2830
msgstr ""
2831
2832
#: bzrlib/builtins.py:4693
2833
msgid ""
2834
"Sorry, remerge only works after normal merges. Not cherrypicking or multi-"
2835
"merges."
2836
msgstr ""
2837
2838
#: bzrlib/builtins.py:4751
2839
msgid ""
2840
"Set files in the working tree back to the contents of a previous revision."
2841
msgstr ""
2842
2843
#: bzrlib/builtins.py:4753
2844
msgid ""
2845
"Giving a list of files will revert only those files. Otherwise, all files\n"
2846
"will be reverted. If the revision is not specified with '--revision', the\n"
2847
"working tree basis revision is used. A revert operation affects only the\n"
2848
"working tree, not any revision history like the branch and repository or\n"
2849
"the working tree basis revision."
2850
msgstr ""
2851
2852
#: bzrlib/builtins.py:4759
2853
msgid ""
2854
"To remove only some changes, without reverting to a prior version, use\n"
2855
"merge instead. For example, \"merge . -r -2..-3\" (don't forget the \".\")\n"
2856
"will remove the changes introduced by the second last commit (-2), without\n"
2857
"affecting the changes introduced by the last commit (-1). To remove\n"
2858
"certain changes on a hunk-by-hunk basis, see the shelve command.\n"
2859
"To update the branch to a specific revision or the latest revision and\n"
2860
"update the working tree accordingly while preserving local changes, see the\n"
2861
"update command."
2862
msgstr ""
2863
2864
#: bzrlib/builtins.py:4768
2865
msgid ""
2866
"Uncommitted changes to files that are reverted will be discarded.\n"
2867
"Howver, by default, any files that have been manually changed will be\n"
2868
"backed up first. (Files changed only by merge are not backed up.) Backup\n"
2869
"files have '.~#~' appended to their name, where # is a number."
2870
msgstr ""
2871
2872
#: bzrlib/builtins.py:4773
2873
msgid ""
2874
"When you provide files, you can use their current pathname or the pathname\n"
2875
"from the target revision. So you can use revert to \"undelete\" a file by\n"
2876
"name. If you name a directory, all the contents of that directory will be\n"
2877
"reverted."
2878
msgstr ""
2879
2880
#: bzrlib/builtins.py:4778
2881
msgid ""
2882
"If you have newly added files since the target revision, they will be\n"
2883
"removed. If the files to be removed have been changed, backups will be\n"
2884
"created as above. Directories containing unknown files will not be\n"
2885
"deleted."
2886
msgstr ""
2887
2888
#: bzrlib/builtins.py:4783
2889
msgid ""
2890
"The working tree contains a list of revisions that have been merged but\n"
2891
"not yet committed. These revisions will be included as additional parents\n"
2892
"of the next commit. Normally, using revert clears that list as well as\n"
2893
"reverting the files. If any files are specified, revert leaves the list\n"
2894
"of uncommitted merges alone and reverts only the files. Use ``bzr revert\n"
2895
".`` in the tree root to revert all files but keep the recorded merges,\n"
2896
"and ``bzr revert --forget-merges`` to clear the pending merge list without\n"
2897
"reverting any files."
2898
msgstr ""
2899
2900
#: bzrlib/builtins.py:4792
2901
msgid ""
2902
"Using \"bzr revert --forget-merges\", it is possible to apply all of the\n"
2903
"changes from a branch in a single revision. To do this, perform the merge\n"
2904
"as desired. Then doing revert with the \"--forget-merges\" option will "
2905
"keep\n"
2906
"the content of the tree as it was, but it will clear the list of pending\n"
2907
"merges. The next commit will then contain all of the changes that are\n"
2908
"present in the other branch, but without any other parent revisions.\n"
2909
"Because this technique forgets where these changes originated, it may\n"
2910
"cause additional conflicts on later merges involving the same source and\n"
2911
"target branches."
2912
msgstr ""
2913
2914
#: bzrlib/builtins.py:4806
2915
msgid "Do not save backups of reverted files."
2916
msgstr ""
2917
2918
#: bzrlib/builtins.py:4808
2919
msgid "Remove pending merge marker, without changing any files."
2920
msgstr ""
2921
2922
#: bzrlib/builtins.py:4839
2923
msgid ""
2924
"Show help on a command or other topic.\n"
2925
" "
2926
msgstr ""
2927
2928
#: bzrlib/builtins.py:4844
2929
msgid "Show help on all commands."
2930
msgstr ""
2931
2932
#: bzrlib/builtins.py:4873
2933
msgid "Show unmerged/unpulled revisions between two branches."
2934
msgstr ""
2935
2936
#: bzrlib/builtins.py:4875
2937
msgid "OTHER_BRANCH may be local or remote."
2938
msgstr ""
2939
2940
#: bzrlib/builtins.py:4877
2941
msgid ""
2942
"To filter on a range of revisions, you can use the command -r begin..end\n"
2943
"-r revision requests a specific revision, -r ..end or -r begin.. are\n"
2944
"also valid.\n"
2945
" \n"
2946
":Exit values:\n"
2947
" 1 - some missing revisions\n"
2948
" 0 - no missing revisions"
2949
msgstr ""
2950
2951
#: bzrlib/builtins.py:4887
2952
msgid ""
2953
" Determine the missing revisions between this and the branch at the\n"
2954
" remembered pull location::"
2955
msgstr ""
2956
2957
#: bzrlib/builtins.py:4890
2958
msgid " bzr missing"
2959
msgstr ""
2960
2961
#: bzrlib/builtins.py:4892
2962
msgid " Determine the missing revisions between this and another branch::"
2963
msgstr ""
2964
2965
#: bzrlib/builtins.py:4894
2966
msgid " bzr missing http://server/branch"
2967
msgstr ""
2968
2969
#: bzrlib/builtins.py:4896
2970
msgid ""
2971
" Determine the missing revisions up to a specific revision on the other\n"
2972
" branch::"
2973
msgstr ""
2974
2975
#: bzrlib/builtins.py:4899
2976
msgid " bzr missing -r ..-10"
2977
msgstr ""
2978
2979
#: bzrlib/builtins.py:4901
2980
msgid ""
2981
" Determine the missing revisions up to a specific revision on this\n"
2982
" branch::"
2983
msgstr ""
2984
2985
#: bzrlib/builtins.py:4904
2986
msgid " bzr missing --my-revision ..-10"
2987
msgstr ""
2988
2989
#: bzrlib/builtins.py:4911
2990
msgid "Reverse the order of revisions."
2991
msgstr ""
2992
2993
#: bzrlib/builtins.py:4913
2994
msgid "Display changes in the local branch only."
2995
msgstr ""
2996
2997
#: bzrlib/builtins.py:4914
2998
msgid "Same as --mine-only."
2999
msgstr ""
3000
3001
#: bzrlib/builtins.py:4916
3002
msgid "Display changes in the remote branch only."
3003
msgstr ""
3004
3005
#: bzrlib/builtins.py:4917
3006
msgid "Same as --theirs-only."
3007
msgstr ""
3008
3009
#: bzrlib/builtins.py:4922
3010
msgid ""
3011
"Filter on other branch revisions (inclusive). See \"help revisionspec\" for "
3012
"details."
3013
msgstr ""
3014
3015
#: bzrlib/builtins.py:4926
3016
msgid ""
3017
"Filter on local branch revisions (inclusive). See \"help revisionspec\" for "
3018
"details."
3019
msgstr ""
3020
3021
#: bzrlib/builtins.py:4929
3022
msgid "Show all revisions in addition to the mainline ones."
3023
msgstr ""
3024
3025
#: bzrlib/builtins.py:4983
3026
msgid "No peer location known or specified."
3027
msgstr ""
3028
3029
#: bzrlib/builtins.py:4987
3030
msgid "Using saved parent location: {0}\n"
3031
msgstr ""
3032
3033
#: bzrlib/builtins.py:5020
3034
#, python-format
3035
msgid "You have %d extra revision:\n"
3036
msgid_plural "You have %d extra revisions:\n"
3037
msgstr[0] ""
3038
msgstr[1] ""
3039
3040
#: bzrlib/builtins.py:5040
3041
#, python-format
3042
msgid "You are missing %d revision:\n"
3043
msgid_plural "You are missing %d revisions:\n"
3044
msgstr[0] ""
3045
msgstr[1] ""
3046
3047
#: bzrlib/builtins.py:5055
3048
msgid "This branch has no new revisions.\n"
3049
msgstr ""
3050
3051
#: bzrlib/builtins.py:5058
3052
msgid "Other branch has no new revisions.\n"
3053
msgstr ""
3054
3055
#: bzrlib/builtins.py:5063
3056
msgid "Branches are up to date.\n"
3057
msgstr ""
3058
3059
#: bzrlib/builtins.py:5074
3060
msgid "Compress the data within a repository."
3061
msgstr ""
3062
3063
#: bzrlib/builtins.py:5076
3064
msgid ""
3065
"This operation compresses the data within a bazaar repository. As\n"
3066
"bazaar supports automatic packing of repository, this operation is\n"
3067
"normally not required to be done manually."
3068
msgstr ""
3069
3070
#: bzrlib/builtins.py:5080
3071
msgid ""
3072
"During the pack operation, bazaar takes a backup of existing repository\n"
3073
"data, i.e. pack files. This backup is eventually removed by bazaar\n"
3074
"automatically when it is safe to do so. To save disk space by removing\n"
3075
"the backed up pack files, the --clean-obsolete-packs option may be\n"
3076
"used."
3077
msgstr ""
3078
3079
#: bzrlib/builtins.py:5086
3080
msgid ""
3081
"Warning: If you use --clean-obsolete-packs and your machine crashes\n"
3082
"during or immediately after repacking, you may be left with a state\n"
3083
"where the deletion has been written to disk but the new packs have not\n"
3084
"been. In this case the repository may be unusable."
3085
msgstr ""
3086
3087
#: bzrlib/builtins.py:5095
3088
msgid "Delete obsolete packs to save disk space."
3089
msgstr ""
3090
3091
#: bzrlib/builtins.py:5109
3092
msgid "List the installed plugins."
3093
msgstr ""
3094
3095
#: bzrlib/builtins.py:5111
3096
msgid ""
3097
"This command displays the list of installed plugins including\n"
3098
"version of plugin and a short description of each."
3099
msgstr ""
3100
3101
#: bzrlib/builtins.py:5114
3102
msgid "--verbose shows the path where each plugin is located."
3103
msgstr ""
3104
3105
#: bzrlib/builtins.py:5116
3106
msgid ""
3107
"A plugin is an external component for Bazaar that extends the\n"
3108
"revision control system, by adding or replacing code in Bazaar.\n"
3109
"Plugins can do a variety of things, including overriding commands,\n"
3110
"adding new commands, providing additional network transports and\n"
3111
"customizing log output."
3112
msgstr ""
3113
3114
#: bzrlib/builtins.py:5122
3115
msgid ""
3116
"See the Bazaar Plugin Guide <http://doc.bazaar.canonical.com/plugins/en/>\n"
3117
"for further information on plugins including where to find them and how to\n"
3118
"install them. Instructions are also provided there on how to write new\n"
3119
"plugins using the Python programming language."
3120
msgstr ""
3121
3122
#: bzrlib/builtins.py:5138
3123
msgid "Show testament (signing-form) of a revision."
3124
msgstr ""
3125
3126
#: bzrlib/builtins.py:5141
3127
msgid "Produce long-format testament."
3128
msgstr ""
3129
3130
#: bzrlib/builtins.py:5143
3131
msgid "Produce a strict-format testament."
3132
msgstr ""
3133
3134
#: bzrlib/builtins.py:5169
3135
msgid "Show the origin of each line in a file."
3136
msgstr ""
3137
3138
#: bzrlib/builtins.py:5171
3139
msgid ""
3140
"This prints out the given file with an annotation on the left side\n"
3141
"indicating which revision, author and date introduced the change."
3142
msgstr ""
3143
3144
#: bzrlib/builtins.py:5174
3145
msgid ""
3146
"If the origin is the same for a run of consecutive lines, it is\n"
3147
"shown only at the top, unless the --all option is given."
3148
msgstr ""
3149
3150
#: bzrlib/builtins.py:5182
3151
msgid "Show annotations on all lines."
3152
msgstr ""
3153
3154
#: bzrlib/builtins.py:5183
3155
msgid "Show commit date in annotations."
3156
msgstr ""
3157
3158
#: bzrlib/builtins.py:5270
3159
msgid "Cannot sign a range of non-revision-history revisions"
3160
msgstr ""
3161
3162
#: bzrlib/builtins.py:5282
3163
msgid "Please supply either one revision, or a range."
3164
msgstr ""
3165
3166
#: bzrlib/builtins.py:5286
3167
msgid ""
3168
"Convert the current branch into a checkout of the supplied branch.\n"
3169
"If no branch is supplied, rebind to the last bound location."
3170
msgstr ""
3171
3172
#: bzrlib/builtins.py:5289
3173
msgid ""
3174
"Once converted into a checkout, commits must succeed on the master branch\n"
3175
"before they will be applied to the local branch."
3176
msgstr ""
3177
3178
#: bzrlib/builtins.py:5292
3179
msgid ""
3180
"Bound branches use the nickname of its master branch unless it is set\n"
3181
"locally, in which case binding will update the local nickname to be\n"
3182
"that of the master."
3183
msgstr ""
3184
3185
#: bzrlib/builtins.py:5307
3186
msgid "No location supplied. This format does not remember old locations."
3187
msgstr ""
3188
3189
#: bzrlib/builtins.py:5313
3190
msgid "Branch is already bound"
3191
msgstr ""
3192
3193
#: bzrlib/builtins.py:5316
3194
msgid "No location supplied and no previous location known"
3195
msgstr ""
3196
3197
#: bzrlib/builtins.py:5322
3198
msgid "These branches have diverged. Try merging, and then bind again."
3199
msgstr ""
3200
3201
#: bzrlib/builtins.py:5329
3202
msgid "Convert the current checkout into a regular branch."
3203
msgstr ""
3204
3205
#: bzrlib/builtins.py:5331
3206
msgid ""
3207
"After unbinding, the local branch is considered independent and subsequent\n"
3208
"commits will be local only."
3209
msgstr ""
3210
3211
#: bzrlib/builtins.py:5342
3212
msgid "Local branch is not bound"
3213
msgstr ""
3214
3215
#: bzrlib/builtins.py:5346
3216
msgid "Remove the last committed revision."
3217
msgstr ""
3218
3219
#: bzrlib/builtins.py:5348
3220
msgid ""
3221
"--verbose will print out what is being removed.\n"
3222
"--dry-run will go through all the motions, but not actually\n"
3223
"remove anything."
3224
msgstr ""
3225
3226
#: bzrlib/builtins.py:5352
3227
msgid ""
3228
"If --revision is specified, uncommit revisions to leave the branch at the\n"
3229
"specified revision. For example, \"bzr uncommit -r 15\" will leave the\n"
3230
"branch at revision 15."
3231
msgstr ""
3232
3233
#: bzrlib/builtins.py:5356
3234
msgid ""
3235
"Uncommit leaves the working tree ready for a new commit. The only change\n"
3236
"it may make is to restore any pending merges that were present before\n"
3237
"the commit."
3238
msgstr ""
3239
3240
#: bzrlib/builtins.py:5367
3241
msgid "Don't actually make changes."
3242
msgstr ""
3243
3244
#: bzrlib/builtins.py:5368
3245
msgid "Say yes to all questions."
3246
msgstr ""
3247
3248
#: bzrlib/builtins.py:5370
3249
msgid "Keep tags that point to removed revisions."
3250
msgstr ""
3251
3252
#: bzrlib/builtins.py:5372
3253
msgid "Only remove the commits from the local branch when in a checkout."
3254
msgstr ""
3255
3256
#: bzrlib/builtins.py:5421
3257
msgid "No revisions to uncommit.\n"
3258
msgstr ""
3259
3260
#: bzrlib/builtins.py:5436
3261
msgid "Dry-run, pretending to remove the above revisions.\n"
3262
msgstr ""
3263
3264
#: bzrlib/builtins.py:5439
3265
msgid "The above revision(s) will be removed.\n"
3266
msgstr ""
3267
3268
#: bzrlib/builtins.py:5443
3269
msgid "Uncommit these revisions"
3270
msgstr ""
3271
3272
#: bzrlib/builtins.py:5446
3273
msgid "Canceled\n"
3274
msgstr ""
3275
3276
#: bzrlib/builtins.py:5453
3277
#, python-format
3278
msgid ""
3279
"You can restore the old tip by running:\n"
3280
" bzr pull . -r revid:%s\n"
3281
msgstr ""
3282
3283
#: bzrlib/builtins.py:5458
3284
msgid "Break a dead lock."
3285
msgstr ""
3286
3287
#: bzrlib/builtins.py:5460
3288
msgid ""
3289
"This command breaks a lock on a repository, branch, working directory or\n"
3290
"config file."
3291
msgstr ""
3292
3293
#: bzrlib/builtins.py:5463
3294
msgid ""
3295
"CAUTION: Locks should only be broken when you are sure that the process\n"
3296
"holding the lock has been stopped."
3297
msgstr ""
3298
3299
#: bzrlib/builtins.py:5466
3300
msgid ""
3301
"You can get information on what locks are open via the 'bzr info\n"
3302
"[location]' command."
3303
msgstr ""
3304
3305
#: bzrlib/builtins.py:5469
3306
msgid ""
3307
":Examples:\n"
3308
" bzr break-lock\n"
3309
" bzr break-lock bzr+ssh://example.com/bzr/foo\n"
3310
" bzr break-lock --conf ~/.bazaar"
3311
msgstr ""
3312
3313
#: bzrlib/builtins.py:5478
3314
msgid "LOCATION is the directory where the config lock is."
3315
msgstr ""
3316
3317
#: bzrlib/builtins.py:5480
3318
msgid "Do not ask for confirmation before breaking the lock."
3319
msgstr ""
3320
3321
#: bzrlib/builtins.py:5515
3322
msgid "The Bazaar smart server protocol over TCP. (default port: 4155)"
3323
msgstr ""
3324
3325
#: bzrlib/builtins.py:5516
3326
msgid "Run the bzr server."
3327
msgstr ""
3328
3329
#: bzrlib/builtins.py:5522
3330
msgid "Serve on stdin/out for use from inetd or sshd."
3331
msgstr ""
3332
3333
#: bzrlib/builtins.py:5523
3334
msgid "protocol"
3335
msgstr ""
3336
3337
#: bzrlib/builtins.py:5524
3338
msgid "Protocol to serve."
3339
msgstr ""
3340
3341
#: bzrlib/builtins.py:5528
3342
msgid "Listen for connections on nominated address."
3343
msgstr ""
3344
3345
#: bzrlib/builtins.py:5530
3346
msgid ""
3347
"Listen for connections on nominated port. Passing 0 as the port number will "
3348
"result in a dynamically allocated port. The default port depends on the "
3349
"protocol."
3350
msgstr ""
3351
3352
#: bzrlib/builtins.py:5535
3353
msgid "Serve contents of this directory."
3354
msgstr ""
3355
3356
#: bzrlib/builtins.py:5537
3357
msgid ""
3358
"By default the server is a readonly server. Supplying --allow-writes "
3359
"enables write access to the contents of the served directory and below. "
3360
"Note that ``bzr serve`` does not perform authentication, so unless some form "
3361
"of external authentication is arranged supplying this option leads to global "
3362
"uncontrolled write access to your file system."
3363
msgstr ""
3364
3365
#: bzrlib/builtins.py:5546
3366
msgid "Override the default idle client timeout (5min)."
3367
msgstr ""
3368
3369
#: bzrlib/builtins.py:5564
3370
msgid "Combine a tree into its containing tree."
3371
msgstr ""
3372
3373
#: bzrlib/builtins.py:5566
3374
msgid "This command requires the target tree to be in a rich-root format."
3375
msgstr ""
3376
3377
#: bzrlib/builtins.py:5568
3378
msgid ""
3379
"The TREE argument should be an independent tree, inside another tree, but\n"
3380
"not part of it. (Such trees can be produced by \"bzr split\", but also by\n"
3381
"running \"bzr branch\" with the target inside a tree.)"
3382
msgstr ""
3383
3384
#: bzrlib/builtins.py:5572
3385
msgid ""
3386
"The result is a combined tree, with the subtree no longer an independent\n"
3387
"part. This is marked as a merge of the subtree into the containing tree,\n"
3388
"and all history is preserved."
3389
msgstr ""
3390
3391
#: bzrlib/builtins.py:5590
3392
#, python-format
3393
msgid ""
3394
"Can't join trees because %s doesn't support rich root data.\n"
3395
"You can use bzr upgrade on the repository."
3396
msgstr ""
3397
3398
#: bzrlib/builtins.py:5600 bzrlib/builtins.py:5606
3399
msgid "Cannot join {0}. {1}"
3400
msgstr ""
3401
3402
#: bzrlib/builtins.py:5610
3403
msgid "Split a subdirectory of a tree into a separate tree."
3404
msgstr ""
3405
3406
#: bzrlib/builtins.py:5612
3407
msgid ""
3408
"This command will produce a target tree in a format that supports\n"
3409
"rich roots, like 'rich-root' or 'rich-root-pack'. These formats cannot be\n"
3410
"converted into earlier formats like 'dirstate-tags'."
3411
msgstr ""
3412
3413
#: bzrlib/builtins.py:5616
3414
msgid ""
3415
"The TREE argument should be a subdirectory of a working tree. That\n"
3416
"subdirectory will be converted into an independent tree, with its own\n"
3417
"branch. Commits in the top-level tree will not apply to the new subtree."
3418
msgstr ""
3419
3420
#: bzrlib/builtins.py:5696
3421
msgid "No submit branch specified or known"
3422
msgstr ""
3423
3424
#: bzrlib/builtins.py:5705 bzrlib/send.py:109
3425
msgid "No public branch specified or known"
3426
msgstr ""
3427
3428
#: bzrlib/builtins.py:5710
3429
msgid "bzr merge-directive takes at most two one revision identifiers"
3430
msgstr ""
3431
3432
#: bzrlib/builtins.py:5719
3433
msgid "No revisions to bundle."
3434
msgstr ""
3435
3436
#: bzrlib/builtins.py:5738
3437
msgid "Mail or create a merge-directive for submitting changes."
3438
msgstr ""
3439
3440
#: bzrlib/builtins.py:5740
3441
msgid "A merge directive provides many things needed for requesting merges:"
3442
msgstr ""
3443
3444
#: bzrlib/builtins.py:5742
3445
msgid "* A machine-readable description of the merge to perform"
3446
msgstr ""
3447
3448
#: bzrlib/builtins.py:5744
3449
msgid "* An optional patch that is a preview of the changes requested"
3450
msgstr ""
3451
3452
#: bzrlib/builtins.py:5746
3453
msgid ""
3454
"* An optional bundle of revision data, so that the changes can be applied\n"
3455
" directly from the merge directive, without retrieving data from a\n"
3456
" branch."
3457
msgstr ""
3458
3459
#: bzrlib/builtins.py:5750
3460
msgid ""
3461
"`bzr send` creates a compact data set that, when applied using bzr\n"
3462
"merge, has the same effect as merging from the source branch. "
3463
msgstr ""
3464
3465
#: bzrlib/builtins.py:5753
3466
msgid ""
3467
"By default the merge directive is self-contained and can be applied to any\n"
3468
"branch containing submit_branch in its ancestory without needing access to\n"
3469
"the source branch."
3470
msgstr ""
3471
3472
#: bzrlib/builtins.py:5757
3473
msgid ""
3474
"If --no-bundle is specified, then Bazaar doesn't send the contents of the\n"
3475
"revisions, but only a structured request to merge from the\n"
3476
"public_location. In that case the public_branch is needed and it must be\n"
3477
"up-to-date and accessible to the recipient. The public_branch is always\n"
3478
"included if known, so that people can check it later."
3479
msgstr ""
3480
3481
#: bzrlib/builtins.py:5763
3482
msgid ""
3483
"The submit branch defaults to the parent of the source branch, but can be\n"
3484
"overridden. Both submit branch and public branch will be remembered in\n"
3485
"branch.conf the first time they are used for a particular branch. The\n"
3486
"source branch defaults to that containing the working directory, but can\n"
3487
"be changed using --from."
3488
msgstr ""
3489
3490
#: bzrlib/builtins.py:5769
3491
msgid ""
3492
"Both the submit branch and the public branch follow the usual behavior with\n"
3493
"respect to --remember: If there is no default location set, the first send\n"
3494
"will set it (use --no-remember to avoid setting it). After that, you can\n"
3495
"omit the location to use the default. To change the default, use\n"
3496
"--remember. The value will only be saved if the location can be accessed."
3497
msgstr ""
3498
3499
#: bzrlib/builtins.py:5775
3500
msgid ""
3501
"In order to calculate those changes, bzr must analyse the submit branch.\n"
3502
"Therefore it is most efficient for the submit branch to be a local mirror.\n"
3503
"If a public location is known for the submit_branch, that location is used\n"
3504
"in the merge directive."
3505
msgstr ""
3506
3507
#: bzrlib/builtins.py:5780
3508
msgid ""
3509
"The default behaviour is to send the merge directive by mail, unless -o is\n"
3510
"given, in which case it is sent to a file."
3511
msgstr ""
3512
3513
#: bzrlib/builtins.py:5783
3514
msgid ""
3515
"Mail is sent using your preferred mail program. This should be transparent\n"
3516
"on Windows (it uses MAPI). On Unix, it requires the xdg-email utility.\n"
3517
"If the preferred client can't be found (or used), your editor will be used."
3518
msgstr ""
3519
3520
#: bzrlib/builtins.py:5787
3521
msgid ""
3522
"To use a specific mail program, set the mail_client configuration option.\n"
3523
"(For Thunderbird 1.5, this works around some bugs.) Supported values for\n"
3524
"specific clients are \"claws\", \"evolution\", \"kmail\", \"mail.app\" "
3525
"(MacOS X's\n"
3526
"Mail.app), \"mutt\", and \"thunderbird\"; generic options are \"default\",\n"
3527
"\"editor\", \"emacsclient\", \"mapi\", and \"xdg-email\". Plugins may also "
3528
"add\n"
3529
"supported clients."
3530
msgstr ""
3531
3532
#: bzrlib/builtins.py:5794
3533
msgid ""
3534
"If mail is being sent, a to address is required. This can be supplied\n"
3535
"either on the commandline, by setting the submit_to configuration\n"
3536
"option in the branch itself or the child_submit_to configuration option\n"
3537
"in the submit branch."
3538
msgstr ""
3539
3540
#: bzrlib/builtins.py:5799
3541
msgid ""
3542
"Two formats are currently supported: \"4\" uses revision bundle format 4 "
3543
"and\n"
3544
"merge directive format 2. It is significantly faster and smaller than\n"
3545
"older formats. It is compatible with Bazaar 0.19 and later. It is the\n"
3546
"default. \"0.9\" uses revision bundle format 0.9 and merge directive\n"
3547
"format 1. It is compatible with Bazaar 0.12 - 0.18."
3548
msgstr ""
3549
3550
#: bzrlib/builtins.py:5805
3551
msgid ""
3552
"The merge directives created by bzr send may be applied using bzr merge or\n"
3553
"bzr pull by specifying a file containing a merge directive as the location."
3554
msgstr ""
3555
3556
#: bzrlib/builtins.py:5808
3557
msgid ""
3558
"bzr send makes extensive use of public locations to map local locations "
3559
"into\n"
3560
"URLs that can be used by other people. See `bzr help configuration` to\n"
3561
"set them, and use `bzr info` to display them."
3562
msgstr ""
3563
3564
#: bzrlib/builtins.py:5832
3565
msgid "Write merge directive to this file or directory; use - for stdout."
3566
msgstr ""
3567
3568
#: bzrlib/builtins.py:5836
3569
msgid ""
3570
"Refuse to send if there are uncommitted changes in the working tree, --no-"
3571
"strict disables the check."
3572
msgstr ""
3573
3574
#: bzrlib/builtins.py:5838
3575
msgid "Mail the request to this address."
3576
msgstr ""
3577
3578
#: bzrlib/builtins.py:5842
3579
msgid "Body for the email."
3580
msgstr ""
3581
3582
#: bzrlib/builtins.py:5895
3583
msgid "Do not include a bundle in the merge directive."
3584
msgstr ""
3585
3586
#: bzrlib/builtins.py:5896
3587
msgid "Do not include a preview patch in the merge directive."
3588
msgstr ""
3589
3590
#: bzrlib/builtins.py:5899
3591
msgid "Remember submit and public branch."
3592
msgstr ""
3593
3594
#: bzrlib/builtins.py:5901
3595
msgid ""
3596
"Branch to generate the submission from, rather than the one containing the "
3597
"working directory."
3598
msgstr ""
3599
3600
#: bzrlib/builtins.py:5911 bzrlib/cmd_version_info.py:76
3601
msgid "format"
3602
msgstr ""
3603
3604
#: bzrlib/builtins.py:5912
3605
msgid "Use the specified output format."
3606
msgstr ""
3607
3608
#: bzrlib/builtins.py:5934
3609
msgid "Create, remove or modify a tag naming a revision."
3610
msgstr ""
3611
3612
#: bzrlib/builtins.py:5936
3613
msgid ""
3614
"Tags give human-meaningful names to revisions. Commands that take a -r\n"
3615
"(--revision) option can be given -rtag:X, where X is any previously\n"
3616
"created tag."
3617
msgstr ""
3618
3619
#: bzrlib/builtins.py:5940
3620
msgid ""
3621
"Tags are stored in the branch. Tags are copied from one branch to another\n"
3622
"along when you branch, push, pull or merge."
3623
msgstr ""
3624
3625
#: bzrlib/builtins.py:5943
3626
msgid ""
3627
"It is an error to give a tag name that already exists unless you pass\n"
3628
"--force, in which case the tag is moved to point to the new revision."
3629
msgstr ""
3630
3631
#: bzrlib/builtins.py:5946
3632
msgid ""
3633
"To rename a tag (change the name but keep it on the same revsion), run "
3634
"``bzr\n"
3635
"tag new-name -r tag:old-name`` and then ``bzr tag --delete oldname``."
3636
msgstr ""
3637
3638
#: bzrlib/builtins.py:5949
3639
msgid ""
3640
"If no tag name is specified it will be determined through the \n"
3641
"'automatic_tag_name' hook. This can e.g. be used to automatically tag\n"
3642
"upstream releases by reading configure.ac. See ``bzr help hooks`` for\n"
3643
"details."
3644
msgstr ""
3645
3646
#: bzrlib/builtins.py:5959
3647
msgid "Delete this tag rather than placing it."
3648
msgstr ""
3649
3650
#: bzrlib/builtins.py:5962
3651
msgid "Branch in which to place the tag."
3652
msgstr ""
3653
3654
#: bzrlib/builtins.py:5964
3655
msgid "Replace existing tags."
3656
msgstr ""
3657
3658
#: bzrlib/builtins.py:5979
3659
msgid "No tag specified to delete."
3660
msgstr ""
3661
3662
#: bzrlib/builtins.py:5981
3663
#, python-format
3664
msgid "Deleted tag %s."
3665
msgstr ""
3666
3667
#: bzrlib/builtins.py:5995
3668
msgid "Please specify a tag name."
3669
msgstr ""
3670
3671
#: bzrlib/builtins.py:6003
3672
#, python-format
3673
msgid "Tag %s already exists for that revision."
3674
msgstr ""
3675
3676
#: bzrlib/builtins.py:6007
3677
#, python-format
3678
msgid "Created tag %s."
3679
msgstr ""
3680
3681
#: bzrlib/builtins.py:6009
3682
#, python-format
3683
msgid "Updated tag %s."
3684
msgstr ""
3685
3686
#: bzrlib/builtins.py:6013
3687
msgid "List tags."
3688
msgstr ""
3689
3690
#: bzrlib/builtins.py:6015
3691
msgid ""
3692
"This command shows a table of tag names and the revisions they reference."
3693
msgstr ""
3694
3695
#: bzrlib/builtins.py:6021
3696
msgid "Branch whose tags should be displayed."
3697
msgstr ""
3698
3699
#: bzrlib/builtins.py:6023
3700
msgid "Sort tags by different criteria."
3701
msgstr ""
3702
3703
#: bzrlib/builtins.py:6023
3704
msgid "Sorting"
3705
msgstr ""
3706
3707
#: bzrlib/builtins.py:6092
3708
msgid "Reconfigure the type of a bzr directory."
3709
msgstr ""
3710
3711
#: bzrlib/builtins.py:6094
3712
msgid "A target configuration must be specified."
3713
msgstr ""
3714
3715
#: bzrlib/builtins.py:6096
3716
msgid ""
3717
"For checkouts, the bind-to location will be auto-detected if not specified.\n"
3718
"The order of preference is\n"
3719
"1. For a lightweight checkout, the current bound location.\n"
3720
"2. For branches that used to be checkouts, the previously-bound location.\n"
3721
"3. The push location.\n"
3722
"4. The parent location.\n"
3723
"If none of these is available, --bind-to must be specified."
3724
msgstr ""
3725
3726
#: bzrlib/builtins.py:6110
3727
msgid "Tree type"
3728
msgstr ""
3729
3730
#: bzrlib/builtins.py:6111
3731
msgid "The relation between branch and tree."
3732
msgstr ""
3733
3734
#: bzrlib/builtins.py:6113
3735
msgid "Reconfigure to be an unbound branch with no working tree."
3736
msgstr ""
3737
3738
#: bzrlib/builtins.py:6114
3739
msgid "Reconfigure to be an unbound branch with a working tree."
3740
msgstr ""
3741
3742
#: bzrlib/builtins.py:6115
3743
msgid "Reconfigure to be a bound branch with a working tree."
3744
msgstr ""
3745
3746
#: bzrlib/builtins.py:6116
3747
msgid "Reconfigure to be a lightweight checkout (with no local history)."
3748
msgstr ""
3749
3750
#: bzrlib/builtins.py:6121
3751
msgid "Repository type"
3752
msgstr ""
3753
3754
#: bzrlib/builtins.py:6122
3755
msgid "Location fo the repository."
3756
msgstr ""
3757
3758
#: bzrlib/builtins.py:6124
3759
msgid ""
3760
"Reconfigure to be a standalone branch (i.e. stop using shared repository)."
3761
msgstr ""
3762
3763
#: bzrlib/builtins.py:6126
3764
msgid "Reconfigure to use a shared repository."
3765
msgstr ""
3766
3767
#: bzrlib/builtins.py:6130
3768
msgid "Trees in Repository"
3769
msgstr ""
3770
3771
#: bzrlib/builtins.py:6131
3772
msgid "Whether new branches in the repository have trees."
3773
msgstr ""
3774
3775
#: bzrlib/builtins.py:6133
3776
msgid ""
3777
"Reconfigure repository to create working trees on branches by default."
3778
msgstr ""
3779
3780
#: bzrlib/builtins.py:6135
3781
msgid ""
3782
"Reconfigure repository to not create working trees on branches by default."
3783
msgstr ""
3784
3785
#: bzrlib/builtins.py:6138
3786
msgid "Branch to bind checkout to."
3787
msgstr ""
3788
3789
#: bzrlib/builtins.py:6140
3790
msgid "Perform reconfiguration even if local changes will be lost."
3791
msgstr ""
3792
3793
#: bzrlib/builtins.py:6143
3794
msgid "Reconfigure a branch to be stacked on another branch."
3795
msgstr ""
3796
3797
#: bzrlib/builtins.py:6147
3798
msgid ""
3799
"Reconfigure a branch to be unstacked. This may require copying substantial "
3800
"data into it."
3801
msgstr ""
3802
3803
#: bzrlib/builtins.py:6157
3804
msgid "Can't use both --stacked-on and --unstacked"
3805
msgstr ""
3806
3807
#: bzrlib/builtins.py:6171
3808
msgid "No target configuration specified"
3809
msgstr ""
3810
3811
#: bzrlib/builtins.py:6206
3812
msgid "Set the branch of a checkout and update."
3813
msgstr ""
3814
3815
#: bzrlib/builtins.py:6208
3816
msgid ""
3817
"For lightweight checkouts, this changes the branch being referenced.\n"
3818
"For heavyweight checkouts, this checks that there are no local commits\n"
3819
"versus the current bound branch, then it makes the local branch a mirror\n"
3820
"of the new location and binds to it."
3821
msgstr ""
3822
3823
#: bzrlib/builtins.py:6213
3824
msgid ""
3825
"In both cases, the working tree is updated and uncommitted changes\n"
3826
"are merged. The user can commit or revert these as they desire."
3827
msgstr ""
3828
3829
#: bzrlib/builtins.py:6216
3830
msgid "Pending merges need to be committed or reverted before using switch."
3831
msgstr ""
3832
3833
#: bzrlib/builtins.py:6218
3834
msgid ""
3835
"The path to the branch to switch to can be specified relative to the parent\n"
3836
"directory of the current branch. For example, if you are currently in a\n"
3837
"checkout of /path/to/branch, specifying 'newbranch' will find a branch at\n"
3838
"/path/to/newbranch."
3839
msgstr ""
3840
3841
#: bzrlib/builtins.py:6223
3842
msgid ""
3843
"Bound branches use the nickname of its master branch unless it is set\n"
3844
"locally, in which case switching will update the local nickname to be\n"
3845
"that of the master."
3846
msgstr ""
3847
3848
#: bzrlib/builtins.py:6231
3849
msgid "Switch even if local commits will be lost."
3850
msgstr ""
3851
3852
#: bzrlib/builtins.py:6234
3853
msgid "Create the target branch from this one before switching to it."
3854
msgstr ""
3855
3856
#: bzrlib/builtins.py:6248
3857
msgid "You must supply either a revision or a location"
3858
msgstr ""
3859
3860
#: bzrlib/builtins.py:6261
3861
msgid "cannot create branch without source branch"
3862
msgstr ""
3863
3864
#: bzrlib/builtins.py:6286
3865
msgid "Manage filtered views."
3866
msgstr ""
3867
3868
#: bzrlib/builtins.py:6288
3869
msgid ""
3870
"Views provide a mask over the tree so that users can focus on\n"
3871
"a subset of a tree when doing their work. After creating a view,\n"
3872
"commands that support a list of files - status, diff, commit, etc -\n"
3873
"effectively have that list of files implicitly given each time.\n"
3874
"An explicit list of files can still be given but those files\n"
3875
"must be within the current view."
3876
msgstr ""
3877
3878
#: bzrlib/builtins.py:6295
3879
msgid ""
3880
"In most cases, a view has a short life-span: it is created to make\n"
3881
"a selected change and is deleted once that change is committed.\n"
3882
"At other times, you may wish to create one or more named views\n"
3883
"and switch between them."
3884
msgstr ""
3885
3886
#: bzrlib/builtins.py:6300
3887
msgid ""
3888
"To disable the current view without deleting it, you can switch to\n"
3889
"the pseudo view called ``off``. This can be useful when you need\n"
3890
"to see the whole tree for an operation or two (e.g. merge) but\n"
3891
"want to switch back to your view after that."
3892
msgstr ""
3893
3894
#: bzrlib/builtins.py:6305
3895
msgid ""
3896
":Examples:\n"
3897
" To define the current view::"
3898
msgstr ""
3899
3900
#: bzrlib/builtins.py:6308
3901
msgid " bzr view file1 dir1 ..."
3902
msgstr ""
3903
3904
#: bzrlib/builtins.py:6310
3905
msgid " To list the current view::"
3906
msgstr ""
3907
3908
#: bzrlib/builtins.py:6312
3909
msgid " bzr view"
3910
msgstr ""
3911
3912
#: bzrlib/builtins.py:6314
3913
msgid " To delete the current view::"
3914
msgstr ""
3915
3916
#: bzrlib/builtins.py:6316
3917
msgid " bzr view --delete"
3918
msgstr ""
3919
3920
#: bzrlib/builtins.py:6318
3921
msgid " To disable the current view without deleting it::"
3922
msgstr ""
3923
3924
#: bzrlib/builtins.py:6320
3925
msgid " bzr view --switch off"
3926
msgstr ""
3927
3928
#: bzrlib/builtins.py:6322
3929
msgid " To define a named view and switch to it::"
3930
msgstr ""
3931
3932
#: bzrlib/builtins.py:6324
3933
msgid " bzr view --name view-name file1 dir1 ..."
3934
msgstr ""
3935
3936
#: bzrlib/builtins.py:6326
3937
msgid " To list a named view::"
3938
msgstr ""
3939
3940
#: bzrlib/builtins.py:6328
3941
msgid " bzr view --name view-name"
3942
msgstr ""
3943
3944
#: bzrlib/builtins.py:6330
3945
msgid " To delete a named view::"
3946
msgstr ""
3947
3948
#: bzrlib/builtins.py:6332
3949
msgid " bzr view --name view-name --delete"
3950
msgstr ""
3951
3952
#: bzrlib/builtins.py:6334
3953
msgid " To switch to a named view::"
3954
msgstr ""
3955
3956
#: bzrlib/builtins.py:6336
3957
msgid " bzr view --switch view-name"
3958
msgstr ""
3959
3960
#: bzrlib/builtins.py:6338
3961
msgid " To list all views defined::"
3962
msgstr ""
3963
3964
#: bzrlib/builtins.py:6340
3965
msgid " bzr view --all"
3966
msgstr ""
3967
3968
#: bzrlib/builtins.py:6342
3969
msgid " To delete all views::"
3970
msgstr ""
3971
3972
#: bzrlib/builtins.py:6344
3973
msgid " bzr view --delete --all"
3974
msgstr ""
3975
3976
#: bzrlib/builtins.py:6351
3977
msgid "Apply list or delete action to all views."
3978
msgstr ""
3979
3980
#: bzrlib/builtins.py:6354
3981
msgid "Delete the view."
3982
msgstr ""
3983
3984
#: bzrlib/builtins.py:6357
3985
msgid "Name of the view to define, list or delete."
3986
msgstr ""
3987
3988
#: bzrlib/builtins.py:6361
3989
msgid "Name of the view to switch to."
3990
msgstr ""
3991
3992
#: bzrlib/builtins.py:6380
3993
msgid "Both --delete and a file list specified"
3994
msgstr ""
3995
3996
#: bzrlib/builtins.py:6383
3997
msgid "Both --delete and --switch specified"
3998
msgstr ""
3999
4000
#: bzrlib/builtins.py:6386
4001
msgid "Deleted all views.\n"
4002
msgstr ""
4003
4004
#: bzrlib/builtins.py:6388
4005
msgid "No current view to delete"
4006
msgstr ""
4007
4008
#: bzrlib/builtins.py:6391
4009
#, python-format
4010
msgid "Deleted '%s' view.\n"
4011
msgstr ""
4012
4013
#: bzrlib/builtins.py:6395
4014
msgid "Both --switch and a file list specified"
4015
msgstr ""
4016
4017
#: bzrlib/builtins.py:6398
4018
msgid "Both --switch and --all specified"
4019
msgstr ""
4020
4021
#: bzrlib/builtins.py:6401
4022
msgid "No current view to disable"
4023
msgstr ""
4024
4025
#: bzrlib/builtins.py:6403
4026
#, python-format
4027
msgid "Disabled '%s' view.\n"
4028
msgstr ""
4029
4030
#: bzrlib/builtins.py:6407 bzrlib/builtins.py:6429
4031
msgid "Using '{0}' view: {1}\n"
4032
msgstr ""
4033
4034
#: bzrlib/builtins.py:6410
4035
msgid "Views defined:\n"
4036
msgstr ""
4037
4038
#: bzrlib/builtins.py:6419
4039
msgid "No views defined.\n"
4040
msgstr ""
4041
4042
#: bzrlib/builtins.py:6426
4043
msgid "Cannot change the 'off' pseudo view"
4044
msgstr ""
4045
4046
#: bzrlib/builtins.py:6434
4047
msgid "No current view.\n"
4048
msgstr ""
4049
4050
#: bzrlib/builtins.py:6437
4051
msgid "'{0}' view is: {1}\n"
4052
msgstr ""
4053
4054
#: bzrlib/builtins.py:6457
4055
msgid " <no hooks installed>\n"
4056
msgstr ""
4057
4058
#: bzrlib/builtins.py:6461
4059
msgid "Remove a branch."
4060
msgstr ""
4061
4062
#: bzrlib/builtins.py:6463
4063
msgid ""
4064
"This will remove the branch from the specified location but \n"
4065
"will keep any working tree or repository in place."
4066
msgstr ""
4067
4068
#: bzrlib/builtins.py:6468
4069
msgid " Remove the branch at repo/trunk::"
4070
msgstr ""
4071
4072
#: bzrlib/builtins.py:6470
4073
msgid " bzr remove-branch repo/trunk"
4074
msgstr ""
4075
4076
#: bzrlib/builtins.py:6477
4077
msgid "Remove branch even if it is the active branch."
4078
msgstr ""
4079
4080
#: bzrlib/builtins.py:6491
4081
msgid "Branch is active. Use --force to remove it."
4082
msgstr ""
4083
4084
#: bzrlib/builtins.py:6495
4085
msgid "Plaintext diff output."
4086
msgstr ""
4087
4088
#: bzrlib/builtins.py:6496
4089
msgid "Temporarily set aside some changes from the current tree."
4090
msgstr ""
4091
4092
#: bzrlib/builtins.py:6498
4093
msgid ""
4094
"Shelve allows you to temporarily put changes you've made \"on the shelf\",\n"
4095
"ie. out of the way, until a later time when you can bring them back from\n"
4096
"the shelf with the 'unshelve' command. The changes are stored alongside\n"
4097
"your working tree, and so they aren't propagated along with your branch nor\n"
4098
"will they survive its deletion."
4099
msgstr ""
4100
4101
#: bzrlib/builtins.py:6504
4102
msgid "If shelve --list is specified, previously-shelved changes are listed."
4103
msgstr ""
4104
4105
#: bzrlib/builtins.py:6506
4106
msgid ""
4107
"Shelve is intended to help separate several sets of changes that have\n"
4108
"been inappropriately mingled. If you just want to get rid of all changes\n"
4109
"and you don't need to restore them later, use revert. If you want to\n"
4110
"shelve all text changes at once, use shelve --all."
4111
msgstr ""
4112
4113
#: bzrlib/builtins.py:6511
4114
msgid ""
4115
"If filenames are specified, only the changes to those files will be\n"
4116
"shelved. Other files will be left untouched."
4117
msgstr ""
4118
4119
#: bzrlib/builtins.py:6514
4120
msgid ""
4121
"If a revision is specified, changes since that revision will be shelved."
4122
msgstr ""
4123
4124
#: bzrlib/builtins.py:6516
4125
msgid ""
4126
"You can put multiple items on the shelf, and by default, 'unshelve' will\n"
4127
"restore the most recently shelved changes."
4128
msgstr ""
4129
4130
#: bzrlib/builtins.py:6519
4131
msgid ""
4132
"For complicated changes, it is possible to edit the changes in a separate\n"
4133
"editor program to decide what the file remaining in the working copy\n"
4134
"should look like. To do this, add the configuration option"
4135
msgstr ""
4136
4137
#: bzrlib/builtins.py:6523
4138
msgid " change_editor = PROGRAM @new_path @old_path"
4139
msgstr ""
4140
4141
#: bzrlib/builtins.py:6525
4142
msgid ""
4143
"where @new_path is replaced with the path of the new version of the \n"
4144
"file and @old_path is replaced with the path of the old version of \n"
4145
"the file. The PROGRAM should save the new file with the desired \n"
4146
"contents of the file in the working tree.\n"
4147
" "
4148
msgstr ""
4149
4150
#: bzrlib/builtins.py:6537
4151
msgid "Shelve all changes."
4152
msgstr ""
4153
4154
#: bzrlib/builtins.py:6539
4155
msgid "Method to use for writing diffs."
4156
msgstr ""
4157
4158
#: bzrlib/builtins.py:6539
4159
msgid "writer"
4160
msgstr ""
4161
4162
#: bzrlib/builtins.py:6543
4163
msgid "List shelved changes."
4164
msgstr ""
4165
4166
#: bzrlib/builtins.py:6545
4167
msgid "Destroy removed changes instead of shelving them."
4168
msgstr ""
4169
4170
#: bzrlib/builtins.py:6574
4171
msgid "No shelved changes."
4172
msgstr ""
4173
4174
#: bzrlib/builtins.py:6585
4175
msgid "Restore shelved changes."
4176
msgstr ""
4177
4178
#: bzrlib/builtins.py:6587
4179
msgid ""
4180
"By default, the most recently shelved changes are restored. However if you\n"
4181
"specify a shelf by id those changes will be restored instead. This works\n"
4182
"best when the changes don't depend on each other."
4183
msgstr ""
4184
4185
#: bzrlib/builtins.py:6596
4186
msgid "The action to perform."
4187
msgstr ""
4188
4189
#: bzrlib/builtins.py:6596 bzrlib/conflicts.py:694
4190
msgid "action"
4191
msgstr ""
4192
4193
#: bzrlib/builtins.py:6598
4194
msgid "Apply changes and remove from the shelf."
4195
msgstr ""
4196
4197
#: bzrlib/builtins.py:6599
4198
msgid "Show changes, but do not apply or remove them."
4199
msgstr ""
4200
4201
#: bzrlib/builtins.py:6600
4202
msgid ""
4203
"Instead of unshelving the changes, show the diff that would result from "
4204
"unshelving."
4205
msgstr ""
4206
4207
#: bzrlib/builtins.py:6602
4208
msgid "Delete changes without applying them."
4209
msgstr ""
4210
4211
#: bzrlib/builtins.py:6603
4212
msgid "Apply changes but don't delete them."
4213
msgstr ""
4214
4215
#: bzrlib/builtins.py:6618
4216
msgid "Remove unwanted files from working tree."
4217
msgstr ""
4218
4219
#: bzrlib/builtins.py:6620
4220
msgid ""
4221
"By default, only unknown files, not ignored files, are deleted. Versioned\n"
4222
"files are never deleted."
4223
msgstr ""
4224
4225
#: bzrlib/builtins.py:6623
4226
msgid ""
4227
"Another class is 'detritus', which includes files emitted by bzr during\n"
4228
"normal operations and selftests. (The value of these files decreases with\n"
4229
"time.)"
4230
msgstr ""
4231
4232
#: bzrlib/builtins.py:6627
4233
msgid ""
4234
"If no options are specified, unknown files are deleted. Otherwise, option\n"
4235
"flags are respected, and may be combined."
4236
msgstr ""
4237
4238
#: bzrlib/builtins.py:6630
4239
msgid "To check what clean-tree will do, use --dry-run."
4240
msgstr ""
4241
4242
#: bzrlib/builtins.py:6633
4243
msgid "Delete all ignored files."
4244
msgstr ""
4245
4246
#: bzrlib/builtins.py:6634
4247
msgid ""
4248
"Delete conflict files, merge and revert backups, and failed selftest dirs."
4249
msgstr ""
4250
4251
#: bzrlib/builtins.py:6637
4252
msgid "Delete files unknown to bzr (default)."
4253
msgstr ""
4254
4255
#: bzrlib/builtins.py:6638
4256
msgid "Show files to delete instead of deleting them."
4257
msgstr ""
4258
4259
#: bzrlib/builtins.py:6640
4260
msgid "Do not prompt before deleting."
4261
msgstr ""
4262
4263
#: bzrlib/bundle/__init__.py:59
4264
msgid "A directory cannot be a bundle"
4265
msgstr ""
4266
4267
#: bzrlib/bundle/apply_bundle.py:40
4268
msgid "Install revisions"
4269
msgstr ""
4270
4271
#: bzrlib/bundle/commands.py:64
4272
msgid "--verbose requires a merge directive"
4273
msgstr ""
4274
4275
#: bzrlib/bundle/commands.py:67
4276
msgid "Bundle format not supported"
4277
msgstr ""
4278
4279
#: bzrlib/bundle/commands.py:77
4280
msgid "Records\n"
4281
msgstr ""
4282
4283
#: bzrlib/bundle/commands.py:81
4284
msgid "{0}: {1} ({2} multiparent)\n"
4285
msgstr ""
4286
4287
#: bzrlib/bundle/commands.py:83
4288
#, python-format
4289
msgid "unique files: %d\n"
4290
msgstr ""
4291
4292
#: bzrlib/bundle/commands.py:92
4293
msgid "Revisions\n"
4294
msgstr ""
4295
4296
#: bzrlib/bundle/commands.py:93
4297
#, python-format
4298
msgid "nicks: %s\n"
4299
msgstr ""
4300
4301
#: bzrlib/bundle/commands.py:95
4302
#, python-format
4303
msgid ""
4304
"committers: \n"
4305
"%s\n"
4306
msgstr ""
4307
4308
#: bzrlib/bundle/commands.py:103
4309
msgid "Decoded contents\n"
4310
msgstr ""
4311
4312
#: bzrlib/bundle/serializer/v4.py:327
4313
#, python-format
4314
msgid "Bundling %d revision."
4315
msgid_plural "Bundling %d revisions."
4316
msgstr[0] ""
4317
msgstr[1] ""
4318
4319
#: bzrlib/bzrdir.py:487
4320
msgid ""
4321
"making backup of {0}\n"
4322
" to {1}"
4323
msgstr ""
4324
4325
#: bzrlib/bzrdir.py:510
4326
msgid "renamed {0} to {1}"
4327
msgstr ""
4328
4329
#: bzrlib/bzrdir.py:1639
4330
#, python-format
4331
msgid ""
4332
"Source repository format does not support stacking, using format:\n"
4333
" %s"
4334
msgstr ""
4335
4336
#: bzrlib/bzrdir.py:1659
4337
#, python-format
4338
msgid ""
4339
"Source branch format does not support stacking, using format:\n"
4340
" %s"
4341
msgstr ""
4342
4343
#: bzrlib/bzrdir.py:1805
4344
msgid "starting repository conversion"
4345
msgstr ""
4346
4347
#: bzrlib/bzrdir.py:2026
4348
msgid "Using default stacking branch {0} at {1}"
4349
msgstr ""
4350
4351
#: bzrlib/check.py:108
4352
msgid "check"
4353
msgstr ""
4354
4355
#: bzrlib/check.py:110
4356
msgid "checking revisions"
4357
msgstr ""
4358
4359
#: bzrlib/check.py:112
4360
msgid "checking commit contents"
4361
msgstr ""
4362
4363
#: bzrlib/check.py:114
4364
msgid "checking file graphs"
4365
msgstr ""
4366
4367
#: bzrlib/check.py:118
4368
msgid "checking branches and trees"
4369
msgstr ""
4370
4371
#: bzrlib/check.py:205
4372
msgid "checked repository {0} format {1}"
4373
msgstr ""
4374
4375
#: bzrlib/check.py:208
4376
#, python-format
4377
msgid "%6d revisions"
4378
msgstr ""
4379
4380
#: bzrlib/check.py:209
4381
#, python-format
4382
msgid "%6d file-ids"
4383
msgstr ""
4384
4385
#: bzrlib/check.py:211
4386
#, python-format
4387
msgid "%6d unreferenced text versions"
4388
msgstr ""
4389
4390
#: bzrlib/check.py:215
4391
msgid "unreferenced version: {{{0}}} in {1}"
4392
msgstr ""
4393
4394
#: bzrlib/check.py:218
4395
#, python-format
4396
msgid "%6d revisions are missing inventory_sha1"
4397
msgstr ""
4398
4399
#: bzrlib/check.py:221
4400
#, python-format
4401
msgid "%6d revisions are mentioned but not present"
4402
msgstr ""
4403
4404
#: bzrlib/check.py:224
4405
#, python-format
4406
msgid "%6d ghost revisions"
4407
msgstr ""
4408
4409
#: bzrlib/check.py:229
4410
#, python-format
4411
msgid "%6d revisions missing parents in ancestry"
4412
msgstr ""
4413
4414
#: bzrlib/check.py:233
4415
#, python-format
4416
msgid " %s should be in the ancestry for:"
4417
msgstr ""
4418
4419
#: bzrlib/check.py:237
4420
#, python-format
4421
msgid "%6d inconsistent parents"
4422
msgstr ""
4423
4424
#: bzrlib/check.py:241
4425
msgid " * {0} version {1} has parents {2!r} but should have {3!r}"
4426
msgstr ""
4427
4428
#: bzrlib/check.py:247
4429
#, python-format
4430
msgid "%6d revisions have incorrect parents in the revision index"
4431
msgstr ""
4432
4433
#: bzrlib/check.py:253
4434
msgid " {0} has wrong parents in index: {1!r} should be {2!r}"
4435
msgstr ""
4436
4437
#: bzrlib/check.py:267
4438
msgid "Mismatched internal revid {{{0}}} and index revid {{{1}}}"
4439
msgstr ""
4440
4441
#: bzrlib/check.py:296
4442
msgid ""
4443
"Multiple expected sha1s for {0}. {{{1}}} expects {{{2}}}, {{{3}}} expects "
4444
"{{{4}}}"
4445
msgstr ""
4446
4447
#: bzrlib/check.py:354
4448
#, python-format
4449
msgid "Checking branch at '%s'."
4450
msgstr ""
4451
4452
#: bzrlib/check.py:374
4453
#, python-format
4454
msgid "Checking working tree at '%s'."
4455
msgstr ""
4456
4457
#: bzrlib/check.py:427 bzrlib/check.py:441
4458
msgid "No branch found at specified location."
4459
msgstr ""
4460
4461
#: bzrlib/check.py:429 bzrlib/check.py:439
4462
msgid "No working tree found at specified location."
4463
msgstr ""
4464
4465
#: bzrlib/check.py:432
4466
#, python-format
4467
msgid "Checking repository at '%s'."
4468
msgstr ""
4469
4470
#: bzrlib/check.py:443
4471
msgid "No repository found at specified location."
4472
msgstr ""
4473
4474
#: bzrlib/clean_tree.py:63
4475
msgid "Nothing to delete."
4476
msgstr ""
4477
4478
#: bzrlib/clean_tree.py:68
4479
msgid "Are you sure you wish to delete these"
4480
msgstr ""
4481
4482
#: bzrlib/clean_tree.py:70
4483
msgid "Canceled"
4484
msgstr ""
4485
4486
#: bzrlib/clean_tree.py:107
4487
#, python-format
4488
msgid "unable to remove %s"
4489
msgstr ""
4490
4491
#: bzrlib/clean_tree.py:111
4492
msgid "deleting paths:"
4493
msgstr ""
4494
4495
#: bzrlib/clean_tree.py:125
4496
msgid "unable to remove \"{0}\": {1}."
4497
msgstr ""
4498
4499
#: bzrlib/clean_tree.py:130
4500
msgid "No files deleted."
4501
msgstr ""
4502
4503
#: bzrlib/cmd_version_info.py:47
4504
msgid "No known version info format {0}. Supported types are: {1}"
4505
msgstr ""
4506
4507
#: bzrlib/cmd_version_info.py:52
4508
msgid "Version info in Custom template-based format."
4509
msgstr ""
4510
4511
#: bzrlib/cmd_version_info.py:52
4512
msgid "Version info in Python format."
4513
msgstr ""
4514
4515
#: bzrlib/cmd_version_info.py:52
4516
msgid "Version info in RIO (simple text) format (default)."
4517
msgstr ""
4518
4519
#: bzrlib/cmd_version_info.py:53
4520
msgid "Show version information about this tree."
4521
msgstr ""
4522
4523
#: bzrlib/cmd_version_info.py:55
4524
msgid ""
4525
"You can use this command to add information about version into\n"
4526
"source code of an application. The output can be in one of the\n"
4527
"supported formats or in a custom format based on a template."
4528
msgstr ""
4529
4530
#: bzrlib/cmd_version_info.py:59 en/help_topics/configuration.txt:712
4531
#: en/help_topics/configuration.txt:722
4532
msgid "For example::"
4533
msgstr ""
4534
4535
#: bzrlib/cmd_version_info.py:61
4536
msgid ""
4537
" bzr version-info --custom \\\n"
4538
" --template=\"#define VERSION_INFO \\\"Project 1.2.3 (r{revno})\\\"\\n\""
4539
msgstr ""
4540
4541
#: bzrlib/cmd_version_info.py:64
4542
msgid ""
4543
"will produce a C header file with formatted string containing the\n"
4544
"current revision number. Other supported variables in templates are:"
4545
msgstr ""
4546
4547
#: bzrlib/cmd_version_info.py:67
4548
msgid ""
4549
" * {date} - date of the last revision\n"
4550
" * {build_date} - current date\n"
4551
" * {revno} - revision number\n"
4552
" * {revision_id} - revision id\n"
4553
" * {branch_nick} - branch nickname\n"
4554
" * {clean} - 0 if the source tree contains uncommitted changes,\n"
4555
" otherwise 1"
4556
msgstr ""
4557
4558
#: bzrlib/cmd_version_info.py:77
4559
msgid "Select the output format."
4560
msgstr ""
4561
4562
#: bzrlib/cmd_version_info.py:81
4563
msgid "Include all possible information."
4564
msgstr ""
4565
4566
#: bzrlib/cmd_version_info.py:82
4567
msgid "Check if tree is clean."
4568
msgstr ""
4569
4570
#: bzrlib/cmd_version_info.py:84
4571
msgid "Include the revision-history."
4572
msgstr ""
4573
4574
#: bzrlib/cmd_version_info.py:86
4575
msgid "Include the last revision for each file."
4576
msgstr ""
4577
4578
#: bzrlib/cmd_version_info.py:87
4579
msgid "Template for the output."
4580
msgstr ""
4581
4582
#: bzrlib/cmd_version_info.py:101
4583
msgid "bzr version-info --revision takes exactly one revision specifier"
4584
msgstr ""
4585
4586
#: bzrlib/commands.py:229
4587
#, python-format
4588
msgid "unknown command \"%s\""
4589
msgstr ""
4590
4591
#: bzrlib/commands.py:476
4592
msgid "No help for this command."
4593
msgstr ""
4594
4595
#: bzrlib/commands.py:489
4596
#, python-format
4597
msgid ":Purpose: %s\n"
4598
msgstr ""
4599
4600
#: bzrlib/commands.py:491
4601
#, python-format
4602
msgid ""
4603
":Usage:\n"
4604
"%s\n"
4605
msgstr ""
4606
4607
#: bzrlib/commands.py:493
4608
#, python-format
4609
msgid ":Usage: %s\n"
4610
msgstr ""
4611
4612
#: bzrlib/commands.py:512
4613
#, python-format
4614
msgid ":Options:%s"
4615
msgstr ""
4616
4617
#: bzrlib/commands.py:523
4618
#, python-format
4619
msgid ""
4620
":Description:\n"
4621
" %s\n"
4622
"\n"
4623
msgstr ""
4624
4625
#: bzrlib/commands.py:533
4626
#, python-format
4627
msgid ""
4628
"See bzr help %s for more details and examples.\n"
4629
"\n"
4630
msgstr ""
4631
4632
#: bzrlib/commands.py:538
4633
msgid ":Aliases: "
4634
msgstr ""
4635
4636
#: bzrlib/commands.py:542
4637
#, python-format
4638
msgid ":From: plugin \"%s\"\n"
4639
msgstr ""
4640
4641
#: bzrlib/commands.py:554
4642
msgid ":doc:`{0} <{1}-help>`"
4643
msgstr ""
4644
4645
#: bzrlib/commands.py:558
4646
#, python-format
4647
msgid ":See also: %s"
4648
msgstr ""
4649
4650
#: bzrlib/commands.py:826 bzrlib/gpg.py:347
4651
msgid "Only ASCII permitted in option names"
4652
msgstr ""
4653
4654
#: bzrlib/commands.py:851 bzrlib/commands.py:859
4655
msgid "command {0!r} needs one or more {1}"
4656
msgstr ""
4657
4658
#: bzrlib/commands.py:868
4659
msgid "command {0!r} requires argument {1}"
4660
msgstr ""
4661
4662
#: bzrlib/commands.py:875
4663
msgid "extra argument to command {0}: {1}"
4664
msgstr ""
4665
4666
#: bzrlib/commands.py:972
4667
#, python-format
4668
msgid "Profile data written to \"%s\"."
4669
msgstr ""
4670
4671
#: bzrlib/commit.py:117 bzrlib/commit.py:740
4672
msgid "added"
4673
msgstr ""
4674
4675
#: bzrlib/commit.py:117 bzrlib/commit.py:748
4676
msgid "modified"
4677
msgstr ""
4678
4679
#: bzrlib/commit.py:131
4680
#, python-format
4681
msgid "Committing%s"
4682
msgstr ""
4683
4684
#: bzrlib/commit.py:134
4685
#, python-format
4686
msgid "Committed revision %d."
4687
msgstr ""
4688
4689
#: bzrlib/commit.py:143
4690
#, python-format
4691
msgid "deleted %s"
4692
msgstr ""
4693
4694
#: bzrlib/commit.py:146
4695
#, python-format
4696
msgid "missing %s"
4697
msgstr ""
4698
4699
#: bzrlib/commit.py:511
4700
msgid ""
4701
"Conflicting tags in bound branch:\n"
4702
"{0}"
4703
msgstr ""
4704
4705
#: bzrlib/commit.py:742
4706
msgid "renamed"
4707
msgstr ""
4708
4709
#: bzrlib/commit.py:976
4710
msgid "unchanged"
4711
msgstr ""
4712
4713
#: bzrlib/commit.py:998
4714
msgid "{0} [{1}] - Stage"
4715
msgstr ""
4716
4717
#: bzrlib/commit.py:1001
4718
#, python-format
4719
msgid "%s - Stage"
4720
msgstr ""
4721
4722
#: bzrlib/commit_signature_commands.py:34
4723
msgid "Sign all commits by a given committer."
4724
msgstr ""
4725
4726
#: bzrlib/commit_signature_commands.py:36
4727
msgid ""
4728
"If location is not specified the local tree is used.\n"
4729
"If committer is not specified the default committer is used."
4730
msgstr ""
4731
4732
#: bzrlib/commit_signature_commands.py:39
4733
msgid "This does not sign commits that already have signatures."
4734
msgstr ""
4735
4736
#: bzrlib/commit_signature_commands.py:47
4737
msgid ""
4738
"Don't actually sign anything, just print the revisions that would be signed."
4739
msgstr ""
4740
4741
#: bzrlib/commit_signature_commands.py:98
4742
#, python-format
4743
msgid "Signed %d revision.\n"
4744
msgid_plural "Signed %d revisions.\n"
4745
msgstr[0] ""
4746
msgstr[1] ""
4747
4748
#: bzrlib/commit_signature_commands.py:103
4749
msgid "Verify all commit signatures."
4750
msgstr ""
4751
4752
#: bzrlib/commit_signature_commands.py:105
4753
msgid ""
4754
"Verifies that all commits in the branch are signed by known GnuPG keys."
4755
msgstr ""
4756
4757
#: bzrlib/commit_signature_commands.py:110
4758
msgid ""
4759
"Comma separated list of GPG key patterns which are acceptable for "
4760
"verification."
4761
msgstr ""
4762
4763
#: bzrlib/commit_signature_commands.py:148
4764
msgid "Cannot verify a range of non-revision-history revisions"
4765
msgstr ""
4766
4767
#: bzrlib/commit_signature_commands.py:166
4768
msgid "All commits signed with verifiable keys"
4769
msgstr ""
4770
4771
#: bzrlib/config.py:436
4772
msgid "Invalid config value for \"{0}\" value {1!r} is not an SI unit."
4773
msgstr ""
4774
4775
#: bzrlib/config.py:2452
4776
msgid "{0} is not an SI unit."
4777
msgstr ""
4778
4779
#: bzrlib/config.py:2971
4780
msgid ""
4781
"Option {0} in section {1} of {2} was changed from {3} to {4}. The {5} value "
4782
"will be saved."
4783
msgstr ""
4784
4785
#: bzrlib/config.py:3116
4786
#, python-format
4787
msgid "Invalid '%s', should be of the form 'name=value'"
4788
msgstr ""
4789
4790
#: bzrlib/config.py:4018
4791
msgid "Display, set or remove a configuration option."
4792
msgstr ""
4793
4794
#: bzrlib/config.py:4020
4795
msgid "Display the active value for a given option."
4796
msgstr ""
4797
4798
#: bzrlib/config.py:4022
4799
msgid ""
4800
"If --all is specified, NAME is interpreted as a regular expression and all\n"
4801
"matching options are displayed mentioning their scope. The active value\n"
4802
"that bzr will take into account is the first one displayed for each option."
4803
msgstr ""
4804
4805
#: bzrlib/config.py:4026
4806
msgid "If no NAME is given, --all .* is implied."
4807
msgstr ""
4808
4809
#: bzrlib/config.py:4028
4810
msgid ""
4811
"Setting a value is achieved by using name=value without spaces. The value\n"
4812
"is set in the most relevant scope and can be checked by displaying the\n"
4813
"option again."
4814
msgstr ""
4815
4816
#: bzrlib/config.py:4040
4817
msgid "Reduce the scope to the specified configuration file."
4818
msgstr ""
4819
4820
#: bzrlib/config.py:4044
4821
msgid "Display all the defined values for the matching options."
4822
msgstr ""
4823
4824
#: bzrlib/config.py:4046
4825
msgid "Remove the option from the configuration file."
4826
msgstr ""
4827
4828
#: bzrlib/conflicts.py:50
4829
msgid "List files with conflicts."
4830
msgstr ""
4831
4832
#: bzrlib/conflicts.py:57
4833
msgid ""
4834
"Conflicts normally are listed as short, human-readable messages. If --text\n"
4835
"is supplied, the pathnames of files with text conflicts are listed,\n"
4836
"instead. (This is useful for editing all files with text conflicts.)"
4837
msgstr ""
4838
4839
#: bzrlib/conflicts.py:61
4840
msgid "Use bzr resolve when you have fixed a problem."
4841
msgstr ""
4842
4843
#: bzrlib/conflicts.py:66
4844
msgid "List paths of files with text conflicts."
4845
msgstr ""
4846
4847
#: bzrlib/conflicts.py:85
4848
msgid "Marks the conflict as resolved."
4849
msgstr ""
4850
4851
#: bzrlib/conflicts.py:88
4852
msgid "Resolve the conflict preserving the version in the working tree."
4853
msgstr ""
4854
4855
#: bzrlib/conflicts.py:91
4856
msgid "Resolve the conflict taking the merged version into account."
4857
msgstr ""
4858
4859
#: bzrlib/conflicts.py:98
4860
msgid "How to resolve the conflict."
4861
msgstr ""
4862
4863
#: bzrlib/conflicts.py:104
4864
msgid "Mark a conflict as resolved."
4865
msgstr ""
4866
4867
#: bzrlib/conflicts.py:111
4868
msgid ""
4869
"Once you have fixed a problem, use \"bzr resolve\" to automatically mark\n"
4870
"text conflicts as fixed, \"bzr resolve FILE\" to mark a specific conflict "
4871
"as\n"
4872
"resolved, or \"bzr resolve --all\" to mark all conflicts as resolved."
4873
msgstr ""
4874
4875
#: bzrlib/conflicts.py:119
4876
msgid "Resolve all conflicts in this tree."
4877
msgstr ""
4878
4879
#: bzrlib/conflicts.py:126
4880
msgid "If --all is specified, no FILE may be provided"
4881
msgstr ""
4882
4883
#: bzrlib/conflicts.py:151
4884
#, python-format
4885
msgid "%d conflict auto-resolved."
4886
msgid_plural "%d conflicts auto-resolved."
4887
msgstr[0] ""
4888
msgstr[1] ""
4889
4890
#: bzrlib/conflicts.py:154
4891
msgid "Remaining conflicts:"
4892
msgstr ""
4893
4894
#: bzrlib/conflicts.py:159
4895
msgid "All conflicts resolved."
4896
msgstr ""
4897
4898
#: bzrlib/conflicts.py:168
4899
msgid "{0} conflict resolved, {1} remaining"
4900
msgid_plural "{0} conflicts resolved, {1} remaining"
4901
msgstr[0] ""
4902
msgstr[1] ""
4903
4904
#: bzrlib/controldir.py:712
4905
msgid "{0} is{1} redirected to {2}"
4906
msgstr ""
4907
4908
#: bzrlib/diff.py:399
4909
#, python-format
4910
msgid "*** Ignoring files outside view. View is %s"
4911
msgstr ""
4912
4913
#: bzrlib/errors.py:157
4914
msgid "The tree builder is already building a tree."
4915
msgstr ""
4916
4917
#: bzrlib/errors.py:178
4918
msgid "The dirstate file (%(state)s) appears to be corrupt: %(msg)s"
4919
msgstr ""
4920
4921
#: bzrlib/errors.py:197
4922
msgid ""
4923
"The API for \"%(api)s\" is not compatible with \"%(wanted)s\". It supports "
4924
"versions \"%(minimum)s\" to \"%(current)s\"."
4925
msgstr ""
4926
4927
#: bzrlib/errors.py:209
4928
msgid "The transport '%(transport)s' is only accessible within this process."
4929
msgstr ""
4930
4931
#: bzrlib/errors.py:227
4932
msgid "Invalid revision number %(revno)s"
4933
msgstr ""
4934
4935
#: bzrlib/errors.py:236
4936
msgid "Invalid revision-id {%(revision_id)s} in %(branch)s"
4937
msgstr ""
4938
4939
#: bzrlib/errors.py:247
4940
msgid "Reserved revision-id {%(revision_id)s}"
4941
msgstr ""
4942
4943
#: bzrlib/errors.py:261
4944
msgid "There is no public branch set for \"%(branch_url)s\"."
4945
msgstr ""
4946
4947
#: bzrlib/errors.py:271
4948
msgid ""
4949
"No help could be found for '%(topic)s'. Please use 'bzr help topics' to "
4950
"obtain a list of topics."
4951
msgstr ""
4952
4953
#: bzrlib/errors.py:280
4954
msgid "The file id \"%(file_id)s\" is not present in the tree %(tree)s."
4955
msgstr ""
4956
4957
#: bzrlib/errors.py:290
4958
msgid ""
4959
"The file id \"%(file_id)s\" is not present in the repository %(repository)r"
4960
msgstr ""
4961
4962
#: bzrlib/errors.py:299
4963
msgid "The branch '%(branch)s' is not stacked."
4964
msgstr ""
4965
4966
#: bzrlib/errors.py:313
4967
msgid "No WorkingTree exists for \"%(base)s\"."
4968
msgstr ""
4969
4970
#: bzrlib/errors.py:322
4971
msgid "Not currently building a tree."
4972
msgstr ""
4973
4974
#: bzrlib/errors.py:327
4975
msgid "%(url)s is not a local path."
4976
msgstr ""
4977
4978
#: bzrlib/errors.py:355
4979
msgid "%(not_locked)r is not write locked but needs to be."
4980
msgstr ""
4981
4982
#: bzrlib/errors.py:363
4983
msgid "Error in command line options"
4984
msgstr ""
4985
4986
#: bzrlib/errors.py:368
4987
msgid "%(value)s is not an index of type %(_type)s."
4988
msgstr ""
4989
4990
#: bzrlib/errors.py:378
4991
msgid "Error in data for index %(value)s."
4992
msgstr ""
4993
4994
#: bzrlib/errors.py:387
4995
msgid "The key '%(key)s' is already in index '%(index)s'."
4996
msgstr ""
4997
4998
#: bzrlib/errors.py:397
4999
msgid "The key '%(key)s' is not a valid key."
5000
msgstr ""
5001
5002
#: bzrlib/errors.py:406
5003
msgid "Could not parse options for index %(value)s."
5004
msgstr ""
5005
5006
#: bzrlib/errors.py:415
5007
msgid "The value '%(value)s' is not a valid value."
5008
msgstr ""
5009
5010
#: bzrlib/errors.py:424
5011
msgid "Bad value \"%(value)s\" for option \"%(name)s\"."
5012
msgstr ""
5013
5014
#: bzrlib/errors.py:443
5015
msgid "Generic path error: %(path)r%(extra)s)"
5016
msgstr ""
5017
5018
#: bzrlib/errors.py:456
5019
msgid "No such file: %(path)r%(extra)s"
5020
msgstr ""
5021
5022
#: bzrlib/errors.py:461
5023
msgid "File exists: %(path)r%(extra)s"
5024
msgstr ""
5025
5026
#: bzrlib/errors.py:467
5027
msgid ""
5028
"Could not rename %(source)s => %(dest)s because both files exist. (Use --"
5029
"after to tell bzr about a rename that has already happened)%(extra)s"
5030
msgstr ""
5031
5032
#: bzrlib/errors.py:483
5033
msgid "\"%(path)s\" is not a directory %(extra)s"
5034
msgstr ""
5035
5036
#: bzrlib/errors.py:488
5037
msgid "\"%(path)s\" is not in the working directory %(extra)s"
5038
msgstr ""
5039
5040
#: bzrlib/errors.py:493
5041
msgid "Directory not empty: \"%(path)s\"%(extra)s"
5042
msgstr ""
5043
5044
#: bzrlib/errors.py:498
5045
msgid "Hard-linking \"%(path)s\" is not supported"
5046
msgstr ""
5047
5048
#: bzrlib/errors.py:513
5049
msgid "Device or resource busy: \"%(path)s\"%(extra)s"
5050
msgstr ""
5051
5052
#: bzrlib/errors.py:518
5053
msgid "Permission denied: \"%(path)s\"%(extra)s"
5054
msgstr ""
5055
5056
#: bzrlib/errors.py:523
5057
msgid "Invalid url supplied to transport: \"%(path)s\"%(extra)s"
5058
msgstr ""
5059
5060
#: bzrlib/errors.py:528
5061
msgid "Invalid URL join request: %(reason)s: %(base)r + %(join_args)r"
5062
msgstr ""
5063
5064
#: bzrlib/errors.py:539
5065
msgid "URLs differ by more than path: %(from_)r and %(to)r"
5066
msgstr ""
5067
5068
#: bzrlib/errors.py:561
5069
msgid "The %(type)s hook '%(hook)s' is unknown in this version of bzrlib."
5070
msgstr ""
5071
5072
#: bzrlib/errors.py:571
5073
msgid "Unsupported protocol for url \"%(path)s\"%(extra)s"
5074
msgstr ""
5075
5076
#: bzrlib/errors.py:579
5077
msgid ""
5078
"The branch '%(url)s'(%(format)s) is not a stackable format. You will need to "
5079
"upgrade the branch to permit branch stacking."
5080
msgstr ""
5081
5082
#: bzrlib/errors.py:590
5083
msgid "The branch '%(branch_url)s' cannot be stacked on '%(target_url)s'."
5084
msgstr ""
5085
5086
#: bzrlib/errors.py:600
5087
msgid ""
5088
"The repository '%(url)s'(%(format)s) is not a stackable format. You will "
5089
"need to upgrade the repository to permit branch stacking."
5090
msgstr ""
5091
5092
#: bzrlib/errors.py:611
5093
msgid "Error reading from %(path)r."
5094
msgstr ""
5095
5096
#: bzrlib/errors.py:630
5097
msgid "Path \"%(path)s\" is not a child of path \"%(base)s\"%(extra)s"
5098
msgstr ""
5099
5100
#: bzrlib/errors.py:646
5101
msgid "Path \"%(path)s\" is not unicode normalized"
5102
msgstr ""
5103
5104
#: bzrlib/errors.py:654
5105
msgid "Not a branch: \"%(path)s\"%(detail)s."
5106
msgstr ""
5107
5108
#: bzrlib/errors.py:696
5109
msgid "No submit branch available for branch \"%(path)s\""
5110
msgstr ""
5111
5112
#: bzrlib/errors.py:705
5113
msgid "A control directory already exists: \"%(path)s\"."
5114
msgstr ""
5115
5116
#: bzrlib/errors.py:710
5117
msgid "Already a branch: \"%(path)s\"."
5118
msgstr ""
5119
5120
#: bzrlib/errors.py:715
5121
msgid "Invalid branch name: %(name)s"
5122
msgstr ""
5123
5124
#: bzrlib/errors.py:724
5125
msgid "Parent branch already exists: \"%(path)s\"."
5126
msgstr ""
5127
5128
#: bzrlib/errors.py:730
5129
msgid ""
5130
"Directory contains a branch, but no working tree (use bzr checkout if you "
5131
"wish to build a working tree): \"%(path)s\""
5132
msgstr ""
5133
5134
#: bzrlib/errors.py:735
5135
msgid ""
5136
"\"%(function)s\" called on an AtomicFile after it was closed: \"%(path)s\""
5137
msgstr ""
5138
5139
#: bzrlib/errors.py:745
5140
msgid ""
5141
"Parent not accessible given base \"%(base)s\" and relative path \"%(path)s\""
5142
msgstr ""
5143
5144
#: bzrlib/errors.py:755
5145
msgid "No repository present: \"%(path)s\""
5146
msgstr ""
5147
5148
#: bzrlib/errors.py:762
5149
msgid ""
5150
"Unsupported branch format: %(format)s\n"
5151
"Please run 'bzr upgrade'"
5152
msgstr ""
5153
5154
#: bzrlib/errors.py:768
5155
msgid "Unknown %(kind)s format: %(format)r"
5156
msgstr ""
5157
5158
#: bzrlib/errors.py:777
5159
msgid "Format %(format)s is not compatible with .bzr version %(bzrdir)s."
5160
msgstr ""
5161
5162
#: bzrlib/errors.py:787
5163
msgid "Parse error on line %(lineno)d of %(format)s format: %(line)s"
5164
msgstr ""
5165
5166
#: bzrlib/errors.py:802
5167
msgid ""
5168
"%(target)s\n"
5169
"is not compatible with\n"
5170
"%(source)s\n"
5171
"%(details)s"
5172
msgstr ""
5173
5174
#: bzrlib/errors.py:818
5175
msgid "Revision is not compatible with %(repo_format)s"
5176
msgstr ""
5177
5178
#: bzrlib/errors.py:828
5179
msgid "%(context_info)s%(path)s is already versioned."
5180
msgstr ""
5181
5182
#: bzrlib/errors.py:849
5183
msgid "%(context_info)s%(path)s is not versioned."
5184
msgstr ""
5185
5186
#: bzrlib/errors.py:870
5187
msgid "Path(s) are not versioned: %(paths_as_string)s"
5188
msgstr ""
5189
5190
#: bzrlib/errors.py:881
5191
msgid "Path(s) do not exist: %(paths_as_string)s%(extra)s"
5192
msgstr ""
5193
5194
#: bzrlib/errors.py:900
5195
msgid "Cannot operate on \"%(filename)s\" of unsupported kind \"%(kind)s\""
5196
msgstr ""
5197
5198
#: bzrlib/errors.py:908
5199
msgid ""
5200
"Filename %(filename)r is not valid in your current filesystem encoding "
5201
"%(fs_encoding)s"
5202
msgstr ""
5203
5204
#: bzrlib/errors.py:919
5205
msgid "Cannot operate on \"%(filename)s\" because it is a control file"
5206
msgstr ""
5207
5208
#: bzrlib/errors.py:937
5209
msgid "The lock for '%(lock_description)s' is in use and cannot be broken."
5210
msgstr ""
5211
5212
#: bzrlib/errors.py:976
5213
msgid "Cannot lock %(lock)s: %(why)s"
5214
msgstr ""
5215
5216
#: bzrlib/errors.py:986
5217
msgid ""
5218
"A transaction related operation was attempted after the transaction finished."
5219
msgstr ""
5220
5221
#: bzrlib/errors.py:1013
5222
msgid "Cannot lock: transport is read only: %(transport)s"
5223
msgstr ""
5224
5225
#: bzrlib/errors.py:1021
5226
msgid "Could not acquire lock \"%(lock)s\": %(msg)s"
5227
msgstr ""
5228
5229
#: bzrlib/errors.py:1032
5230
msgid ""
5231
"Lock was broken while still open: %(lock)s - check storage consistency!"
5232
msgstr ""
5233
5234
#: bzrlib/errors.py:1043
5235
msgid ""
5236
"Lock was released and re-acquired before being broken: %(lock)s: held by "
5237
"%(holder)r, wanted to break %(target)r"
5238
msgstr ""
5239
5240
#: bzrlib/errors.py:1055
5241
msgid ""
5242
"Lock is apparently held, but corrupted: %(corruption_info)s\n"
5243
"Use 'bzr break-lock' to clear it"
5244
msgstr ""
5245
5246
#: bzrlib/errors.py:1068
5247
msgid "Lock not held: %(lock)s"
5248
msgstr ""
5249
5250
#: bzrlib/errors.py:1097
5251
msgid "No changes to commit"
5252
msgstr ""
5253
5254
#: bzrlib/errors.py:1102
5255
msgid ""
5256
"Selected-file commit of merges is not supported yet: files %(files_str)s"
5257
msgstr ""
5258
5259
#: bzrlib/errors.py:1112
5260
msgid ""
5261
"Excluding paths during commit is not supported by repository at "
5262
"%(repository)r."
5263
msgstr ""
5264
5265
#: bzrlib/errors.py:1121
5266
msgid ""
5267
"The specified commit message contains characters unsupported by the current "
5268
"encoding."
5269
msgstr ""
5270
5271
#: bzrlib/errors.py:1127
5272
msgid "Upgrade URL cannot work with readonly URLs."
5273
msgstr ""
5274
5275
#: bzrlib/errors.py:1132
5276
msgid "The branch format %(format)s is already at the most recent format."
5277
msgstr ""
5278
5279
#: bzrlib/errors.py:1155
5280
msgid "Option --change does not accept revision ranges"
5281
msgstr ""
5282
5283
#: bzrlib/errors.py:1160
5284
msgid "No namespace registered for string: %(spec)r"
5285
msgstr ""
5286
5287
#: bzrlib/errors.py:1179
5288
msgid ""
5289
"Requested revision: '%(spec)s' does not exist in branch: "
5290
"%(branch_url)s%(extra)s"
5291
msgstr ""
5292
5293
#: bzrlib/errors.py:1193
5294
msgid ""
5295
"Operation denied because it would change the main history, which is not "
5296
"permitted by the append_revisions_only setting on branch \"%(location)s\"."
5297
msgstr ""
5298
5299
#: bzrlib/errors.py:1204
5300
msgid ""
5301
"These branches have diverged. Use the missing command to see how.\n"
5302
"Use the merge command to reconcile them."
5303
msgstr ""
5304
5305
#: bzrlib/errors.py:1224
5306
msgid ""
5307
"Branches have no common ancestor, and no merge base revision was specified."
5308
msgstr ""
5309
5310
#: bzrlib/errors.py:1230
5311
msgid ""
5312
"Selected merge cannot perform reverse cherrypicks. Try merge3 or diff3."
5313
msgstr ""
5314
5315
#: bzrlib/errors.py:1236
5316
msgid "Revisions have no common ancestor: %(revision_a)s %(revision_b)s"
5317
msgstr ""
5318
5319
#: bzrlib/errors.py:1245
5320
msgid ""
5321
"Revisions are not derived from the same root: %(revision_a)s %(revision_b)s."
5322
msgstr ""
5323
5324
#: bzrlib/errors.py:1254
5325
msgid "Revision %(rev_id)s is not an ancestor of %(not_ancestor_id)s"
5326
msgstr ""
5327
5328
#: bzrlib/errors.py:1263
5329
msgid "Branch %(branch)s has no commits."
5330
msgstr ""
5331
5332
#: bzrlib/errors.py:1281
5333
msgid ""
5334
"Bound branch %(branch)s is out of date with master branch "
5335
"%(master)s.%(extra_help)s"
5336
msgstr ""
5337
5338
#: bzrlib/errors.py:1293
5339
msgid ""
5340
"Cannot commit to branch %(branch)s. It is bound to %(master)s, which is "
5341
"bound to %(remote)s."
5342
msgstr ""
5343
5344
#: bzrlib/errors.py:1305
5345
msgid "Cannot pull --overwrite to a branch which is bound %(branch)s"
5346
msgstr ""
5347
5348
#: bzrlib/errors.py:1314
5349
msgid ""
5350
"Unable to connect to target of bound branch %(branch)s => %(target)s: "
5351
"%(error)s"
5352
msgstr ""
5353
5354
#: bzrlib/errors.py:1326
5355
msgid "Error in processing weave: %(msg)s"
5356
msgstr ""
5357
5358
#: bzrlib/errors.py:1335
5359
msgid "Revision {%(revision_id)s} already present in %(weave)s"
5360
msgstr ""
5361
5362
#: bzrlib/errors.py:1346
5363
msgid "Revision {%(revision_id)s} not present in %(weave)s"
5364
msgstr ""
5365
5366
#: bzrlib/errors.py:1356
5367
msgid "Weave invariant violated: %(what)s"
5368
msgstr ""
5369
5370
#: bzrlib/errors.py:1365
5371
msgid "Parents are mismatched between two revisions. %(msg)s"
5372
msgstr ""
5373
5374
#: bzrlib/errors.py:1387
5375
msgid ""
5376
"Weaves differ on text content. Revision: {%(revision_id)s}, %(weave_a)s, "
5377
"%(weave_b)s"
5378
msgstr ""
5379
5380
#: bzrlib/errors.py:1399
5381
msgid "Versioned file error"
5382
msgstr ""
5383
5384
#: bzrlib/errors.py:1404
5385
msgid "Revision {%(revision_id)s} not present in \"%(file_id)s\"."
5386
msgstr ""
5387
5388
#: bzrlib/errors.py:1414
5389
msgid "Revision {%(revision_id)s} already present in \"%(file_id)s\"."
5390
msgstr ""
5391
5392
#: bzrlib/errors.py:1424
5393
msgid "Text did not match its checksum: %(msg)s"
5394
msgstr ""
5395
5396
#: bzrlib/errors.py:1550
5397
msgid "Export format %(format)r not supported"
5398
msgstr ""
5399
5400
#: bzrlib/errors.py:1559
5401
msgid "Transport error: %(msg)s %(orig_error)s"
5402
msgstr ""
5403
5404
#: bzrlib/errors.py:1585
5405
msgid "Generic bzr smart protocol error: %(details)s"
5406
msgstr ""
5407
5408
#: bzrlib/errors.py:1593
5409
msgid "Received bad protocol version marker: %(marker)r"
5410
msgstr ""
5411
5412
#: bzrlib/errors.py:1625
5413
msgid "Transport operation not possible: %(msg)s %(orig_error)s"
5414
msgstr ""
5415
5416
#: bzrlib/errors.py:1630
5417
msgid "Connection error: %(msg)s %(orig_error)s"
5418
msgstr ""
5419
5420
#: bzrlib/errors.py:1635
5421
msgid "%(msg)s %(host)s%(port)s%(orig_error)s"
5422
msgstr ""
5423
5424
#: bzrlib/errors.py:1656
5425
msgid "Connection closed: %(msg)s %(orig_error)s"
5426
msgstr ""
5427
5428
#: bzrlib/errors.py:1661
5429
msgid "Connection Timeout: %(msg)s%(orig_error)s"
5430
msgstr ""
5431
5432
#: bzrlib/errors.py:1666
5433
msgid "Invalid range access in %(path)s at %(offset)s: %(msg)s"
5434
msgstr ""
5435
5436
#: bzrlib/errors.py:1676
5437
msgid "Invalid http response for %(path)s: %(msg)s%(orig_error)s"
5438
msgstr ""
5439
5440
#: bzrlib/errors.py:1691
5441
msgid "Certificate error: %(error)s"
5442
msgstr ""
5443
5444
#: bzrlib/errors.py:1699
5445
msgid "Invalid http range %(range)r for %(path)s: %(msg)s"
5446
msgstr ""
5447
5448
#: bzrlib/errors.py:1713
5449
msgid "HTTP MIME Boundary missing for %(path)s: %(msg)s"
5450
msgstr ""
5451
5452
#: bzrlib/errors.py:1721
5453
msgid "Invalid http Content-type \"%(ctype)s\" for %(path)s: %(msg)s"
5454
msgstr ""
5455
5456
#: bzrlib/errors.py:1730
5457
msgid "%(source)s is%(permanently)s redirected to %(target)s"
5458
msgstr ""
5459
5460
#: bzrlib/errors.py:1744
5461
msgid "Too many redirections"
5462
msgstr ""
5463
5464
#: bzrlib/errors.py:1749
5465
msgid "Working tree has conflicts."
5466
msgstr ""
5467
5468
#: bzrlib/errors.py:1753
5469
msgid "Config file %(filename)s is not UTF-8 encoded\n"
5470
msgstr ""
5471
5472
#: bzrlib/errors.py:1762
5473
msgid ""
5474
"Error(s) parsing config file %(filename)s:\n"
5475
"%(errors)s"
5476
msgstr ""
5477
5478
#: bzrlib/errors.py:1772
5479
msgid ""
5480
"Bad value \"%(value)s\" for option \"%(name)s\".\n"
5481
"See ``bzr help %(name)s``"
5482
msgstr ""
5483
5484
#: bzrlib/errors.py:1782
5485
msgid "%(username)r does not seem to contain a reasonable email address"
5486
msgstr ""
5487
5488
#: bzrlib/errors.py:1791
5489
msgid "Failed to GPG sign data with command \"%(command_line)s\""
5490
msgstr ""
5491
5492
#: bzrlib/errors.py:1799
5493
msgid "Failed to verify GPG signature data with error \"%(error)s\""
5494
msgstr ""
5495
5496
#: bzrlib/errors.py:1807
5497
msgid "Unable to import library \"%(library)s\": %(error)s"
5498
msgstr ""
5499
5500
#: bzrlib/errors.py:1815
5501
msgid "python-gpgme is not installed, it is needed to verify signatures"
5502
msgstr ""
5503
5504
#: bzrlib/errors.py:1823
5505
msgid ""
5506
"The working tree for %(basedir)s has changed since the last commit, but "
5507
"weave merge requires that it be unchanged"
5508
msgstr ""
5509
5510
#: bzrlib/errors.py:1833
5511
msgid ""
5512
"Can't reprocess and show base, because reprocessing obscures the "
5513
"relationship of conflicting lines to the base"
5514
msgstr ""
5515
5516
#: bzrlib/errors.py:1839
5517
msgid "Cycle in graph %(graph)r"
5518
msgstr ""
5519
5520
#: bzrlib/errors.py:1867
5521
msgid "File %(filename)s is not conflicted."
5522
msgstr ""
5523
5524
#: bzrlib/errors.py:1889
5525
msgid "No bundle was found in \"%(filename)s\"."
5526
msgstr ""
5527
5528
#: bzrlib/errors.py:1898
5529
msgid "Unable to handle bundle version %(version)s: %(msg)s"
5530
msgstr ""
5531
5532
#: bzrlib/errors.py:1908
5533
msgid "Branch %(base)s is missing revision %(text_revision)s of %(file_id)s"
5534
msgstr ""
5535
5536
#: bzrlib/errors.py:1921
5537
msgid "File id {%(file_id)s} already exists in inventory as %(entry)s"
5538
msgstr ""
5539
5540
#: bzrlib/errors.py:1931
5541
msgid "Key %(key)s is already present in map"
5542
msgstr ""
5543
5544
#: bzrlib/errors.py:1936
5545
msgid "The prefix %(prefix)s is in the help search path twice."
5546
msgstr ""
5547
5548
#: bzrlib/errors.py:1946
5549
msgid ""
5550
"No final name for trans_id %(trans_id)r\n"
5551
"file-id: %(file_id)r\n"
5552
"root trans-id: %(root_trans_id)r\n"
5553
msgstr ""
5554
5555
#: bzrlib/errors.py:1978
5556
msgid "Attempt to reuse a transform that has already been applied."
5557
msgstr ""
5558
5559
#: bzrlib/errors.py:1983
5560
msgid "Moving the root directory is not supported at this time"
5561
msgstr ""
5562
5563
#: bzrlib/errors.py:1988
5564
msgid "Failed to rename %(from_path)s to %(to_path)s: %(why)s"
5565
msgstr ""
5566
5567
#: bzrlib/errors.py:1999
5568
msgid ""
5569
"Could not move %(from_path)s%(operator)s %(to_path)s%(_has_extra)s%(extra)s"
5570
msgstr ""
5571
5572
#: bzrlib/errors.py:2035
5573
msgid ""
5574
"Could not rename %(from_path)s%(operator)s %(to_path)s%(_has_extra)s%(extra)s"
5575
msgstr ""
5576
5577
#: bzrlib/errors.py:2065
5578
msgid "Unable to import paramiko (required for sftp support): %(error)s"
5579
msgstr ""
5580
5581
#: bzrlib/errors.py:2073
5582
msgid "Nothing to merge."
5583
msgstr ""
5584
5585
#: bzrlib/errors.py:2078
5586
msgid "Format %(format)s cannot be initialised by this version of bzr."
5587
msgstr ""
5588
5589
#: bzrlib/errors.py:2087
5590
msgid ""
5591
"Cannot convert from format %(from_format)s to format %(format)s. "
5592
"%(problem)s"
5593
msgstr ""
5594
5595
#: bzrlib/errors.py:2099
5596
msgid "Could not find an appropriate Differ for file \"%(path)s\""
5597
msgstr ""
5598
5599
#: bzrlib/errors.py:2107
5600
msgid "%(exe_name)s could not be found on this machine"
5601
msgstr ""
5602
5603
#: bzrlib/errors.py:2115
5604
msgid "Diff is not installed on this machine: %(msg)s"
5605
msgstr ""
5606
5607
#: bzrlib/errors.py:2123
5608
msgid "Diff3 is not installed on this machine."
5609
msgstr ""
5610
5611
#: bzrlib/errors.py:2129
5612
msgid "The content being inserted is already present."
5613
msgstr ""
5614
5615
#: bzrlib/errors.py:2134
5616
msgid ""
5617
"This tree contains left-over files from a failed operation.\n"
5618
" Please examine %(limbo_dir)s to see if it contains any files you wish "
5619
"to\n"
5620
" keep, and delete it when you are done."
5621
msgstr ""
5622
5623
#: bzrlib/errors.py:2145
5624
msgid ""
5625
"This tree contains left-over files from a failed operation.\n"
5626
" Please examine %(pending_deletion)s to see if it contains any files you\n"
5627
" wish to keep, and delete it when you are done."
5628
msgstr ""
5629
5630
#: bzrlib/errors.py:2155
5631
msgid ""
5632
"Unable to delete transform temporary directory %(limbo_dir)s.\n"
5633
" Please examine %(limbo_dir)s to see if it contains any files you wish "
5634
"to\n"
5635
" keep, and delete it when you are done."
5636
msgstr ""
5637
5638
#: bzrlib/errors.py:2166
5639
msgid ""
5640
"Unable to delete transform temporary directory %(pending_deletion)s. Please "
5641
"examine %(pending_deletion)s to see if it contains any files you wish to "
5642
"keep, and delete it when you are done."
5643
msgstr ""
5644
5645
#: bzrlib/errors.py:2176
5646
msgid "Working tree is out of date, please run 'bzr update'.%(more)s"
5647
msgstr ""
5648
5649
#: bzrlib/errors.py:2190
5650
msgid ""
5651
"Public branch \"%(public_location)s\" lacks revision \"%(revstring)s\"."
5652
msgstr ""
5653
5654
#: bzrlib/errors.py:2203
5655
msgid "Error in merge modified format"
5656
msgstr ""
5657
5658
#: bzrlib/errors.py:2208
5659
msgid "Format error in conflict listings"
5660
msgstr ""
5661
5662
#: bzrlib/errors.py:2212
5663
msgid ""
5664
"Inconsistency in dirstate file %(dirstate_path)s.\n"
5665
"Error: %(description)s"
5666
msgstr ""
5667
5668
#: bzrlib/errors.py:2223
5669
msgid ""
5670
"An error has been detected in the repository %(repo_path)s.\n"
5671
"Please run bzr reconcile on this repository."
5672
msgstr ""
5673
5674
#: bzrlib/errors.py:2234
5675
msgid ""
5676
"An inconsistent delta was supplied involving %(path)r, %(file_id)r\n"
5677
"reason: %(reason)s"
5678
msgstr ""
5679
5680
#: bzrlib/errors.py:2247
5681
msgid ""
5682
"An inconsistent delta was supplied: %(delta)r\n"
5683
"reason: %(reason)s"
5684
msgstr ""
5685
5686
#: bzrlib/errors.py:2259
5687
msgid "To use this feature you must upgrade your branch at %(path)s."
5688
msgstr ""
5689
5690
#: bzrlib/errors.py:2268
5691
msgid "To use this feature you must upgrade your repository at %(path)s."
5692
msgstr ""
5693
5694
#: bzrlib/errors.py:2273
5695
msgid ""
5696
"To use this feature you must upgrade your branch at %(path)s to a format "
5697
"which supports rich roots."
5698
msgstr ""
5699
5700
#: bzrlib/errors.py:2279
5701
msgid "Cannot perform local-only commits on unbound branches."
5702
msgstr ""
5703
5704
#: bzrlib/errors.py:2284
5705
msgid "The method %(mname)s is not supported on objects of type %(tname)s."
5706
msgstr ""
5707
5708
#: bzrlib/errors.py:2305
5709
msgid "Ghost tags not supported by format %(format)r."
5710
msgstr ""
5711
5712
#: bzrlib/errors.py:2313
5713
msgid "File is binary but should be text."
5714
msgstr ""
5715
5716
#: bzrlib/errors.py:2318
5717
msgid "The path %(path)s is not permitted on this platform"
5718
msgstr ""
5719
5720
#: bzrlib/errors.py:2327
5721
msgid ""
5722
"Testament did not match expected value.\n"
5723
" For revision_id {%(revision_id)s}, expected {%(expected)s}, measured\n"
5724
" {%(measured)s}"
5725
msgstr ""
5726
5727
#: bzrlib/errors.py:2339
5728
msgid "Not a bzr revision-bundle: %(text)r"
5729
msgstr ""
5730
5731
#: bzrlib/errors.py:2348
5732
msgid "Bad bzr revision-bundle: %(text)r"
5733
msgstr ""
5734
5735
#: bzrlib/errors.py:2357
5736
msgid "Malformed bzr revision-bundle header: %(text)r"
5737
msgstr ""
5738
5739
#: bzrlib/errors.py:2362
5740
msgid "Malformed patches in bzr revision-bundle: %(text)r"
5741
msgstr ""
5742
5743
#: bzrlib/errors.py:2367
5744
msgid "Malformed footer in bzr revision-bundle: %(text)r"
5745
msgstr ""
5746
5747
#: bzrlib/errors.py:2372
5748
msgid "End of line marker was not \\n in bzr revision-bundle"
5749
msgstr ""
5750
5751
#: bzrlib/errors.py:2382
5752
msgid "Bundle format %(bundle_format)s is incompatible with %(other)s"
5753
msgstr ""
5754
5755
#: bzrlib/errors.py:2392
5756
msgid "Root class for inventory serialization errors"
5757
msgstr ""
5758
5759
#: bzrlib/errors.py:2396
5760
msgid ""
5761
"The inventory was not in the expected format:\n"
5762
" %(msg)s"
5763
msgstr ""
5764
5765
#: bzrlib/errors.py:2405
5766
msgid "This operation requires rich root data storage"
5767
msgstr ""
5768
5769
#: bzrlib/errors.py:2418
5770
msgid "Unrecognised value for BZR_SSH environment variable: %(vendor)s"
5771
msgstr ""
5772
5773
#: bzrlib/errors.py:2427
5774
msgid ""
5775
"Don't know how to handle SSH connections. Please set BZR_SSH environment "
5776
"variable."
5777
msgstr ""
5778
5779
#: bzrlib/errors.py:2434
5780
msgid ""
5781
"Could not determine revno for {%(revision_id)s} because its ancestry shows a "
5782
"ghost at {%(ghost_revision_id)s}"
5783
msgstr ""
5784
5785
#: bzrlib/errors.py:2444
5786
msgid "Ghost revision {%(revision_id)s} cannot be used here."
5787
msgstr ""
5788
5789
#: bzrlib/errors.py:2495
5790
msgid ""
5791
"A merge directive must provide either a bundle or a public branch location."
5792
msgstr ""
5793
5794
#: bzrlib/errors.py:2502
5795
msgid "Bad merge directive payload %(start)r"
5796
msgstr ""
5797
5798
#: bzrlib/errors.py:2512
5799
msgid "Preview patch does not match requested changes."
5800
msgstr ""
5801
5802
#: bzrlib/errors.py:2518
5803
msgid "Patch_type was %(patch_type)s, but no patch was supplied."
5804
msgstr ""
5805
5806
#: bzrlib/errors.py:2528
5807
msgid ""
5808
"Your branch does not have all of the revisions required in order to merge "
5809
"this merge directive and the target location specified in the merge "
5810
"directive is not a branch: %(location)s."
5811
msgstr ""
5812
5813
#: bzrlib/errors.py:2540
5814
msgid "Unsupported entry kind %(kind)s"
5815
msgstr ""
5816
5817
#: bzrlib/errors.py:2548
5818
msgid "Can't subsume %(other_tree)s into %(tree)s. %(reason)s"
5819
msgstr ""
5820
5821
#: bzrlib/errors.py:2558
5822
msgid "Subsume target %(other_tree)s needs to be upgraded."
5823
msgstr ""
5824
5825
#: bzrlib/errors.py:2577
5826
msgid "No such tag: %(tag_name)s"
5827
msgstr ""
5828
5829
#: bzrlib/errors.py:2585
5830
msgid "Tags not supported by %(branch)s; you may be able to use bzr upgrade."
5831
msgstr ""
5832
5833
#: bzrlib/errors.py:2594
5834
msgid "Tag %(tag_name)s already exists."
5835
msgstr ""
5836
5837
#: bzrlib/errors.py:2602
5838
msgid ""
5839
"Did not understand bug identifier %(bug_id)s: %(reason)s. See \"bzr help "
5840
"bugs\" for more information on this feature."
5841
msgstr ""
5842
5843
#: bzrlib/errors.py:2612
5844
msgid ""
5845
"The URL for bug tracker \"%(abbreviation)s\" doesn't contain {id}: %(url)s"
5846
msgstr ""
5847
5848
#: bzrlib/errors.py:2622
5849
msgid ""
5850
"Cannot find registered bug tracker called %(abbreviation)s on %(branch)s"
5851
msgstr ""
5852
5853
#: bzrlib/errors.py:2632
5854
msgid "Invalid line in bugs property: '%(line)s'"
5855
msgstr ""
5856
5857
#: bzrlib/errors.py:2640
5858
msgid "Invalid bug status: '%(status)s'"
5859
msgstr ""
5860
5861
#: bzrlib/errors.py:2648
5862
msgid "Could not understand response from smart server: %(response_tuple)r"
5863
msgstr ""
5864
5865
#: bzrlib/errors.py:2687
5866
msgid "Server sent an unexpected error: %(error_tuple)r"
5867
msgstr ""
5868
5869
#: bzrlib/errors.py:2706
5870
msgid "Unrecognised container format: %(container_format)r"
5871
msgstr ""
5872
5873
#: bzrlib/errors.py:2714
5874
msgid "Unexpected end of container stream"
5875
msgstr ""
5876
5877
#: bzrlib/errors.py:2719
5878
msgid "Unknown record type: %(record_type)r"
5879
msgstr ""
5880
5881
#: bzrlib/errors.py:2727
5882
msgid "Invalid record: %(reason)s"
5883
msgstr ""
5884
5885
#: bzrlib/errors.py:2735
5886
msgid "Container has data after end marker: %(excess)r"
5887
msgstr ""
5888
5889
#: bzrlib/errors.py:2743
5890
msgid "Container has multiple records with the same name: %(name)s"
5891
msgstr ""
5892
5893
#: bzrlib/errors.py:2756
5894
msgid "Corrupt or incompatible data stream: %(reason)s"
5895
msgstr ""
5896
5897
#: bzrlib/errors.py:2764
5898
msgid "SMTP error: %(error)s"
5899
msgstr ""
5900
5901
#: bzrlib/errors.py:2772
5902
msgid "No message supplied."
5903
msgstr ""
5904
5905
#: bzrlib/errors.py:2777
5906
msgid "No mail-to address (--mail-to) or output (-o) specified."
5907
msgstr ""
5908
5909
#: bzrlib/errors.py:2782
5910
msgid ""
5911
"Unable to find mail client with the following names: "
5912
"%(mail_command_list_string)s"
5913
msgstr ""
5914
5915
#: bzrlib/errors.py:2792
5916
msgid "SMTP connection to %(host)s refused"
5917
msgstr ""
5918
5919
#: bzrlib/errors.py:2801
5920
msgid "Please specify smtp_server. No server at default %(host)s."
5921
msgstr ""
5922
5923
#: bzrlib/errors.py:2815
5924
msgid ""
5925
"'%(display_url)s' is not in sync with %(target_url)s. See bzr help sync-for-"
5926
"reconfigure."
5927
msgstr ""
5928
5929
#: bzrlib/errors.py:2827
5930
msgid "'%(display_url)s' is already a branch."
5931
msgstr ""
5932
5933
#: bzrlib/errors.py:2832
5934
msgid "'%(display_url)s' is already a tree."
5935
msgstr ""
5936
5937
#: bzrlib/errors.py:2837
5938
msgid "'%(display_url)s' is already a checkout."
5939
msgstr ""
5940
5941
#: bzrlib/errors.py:2842
5942
msgid "'%(display_url)s' is already a lightweight checkout."
5943
msgstr ""
5944
5945
#: bzrlib/errors.py:2847
5946
msgid "'%(display_url)s' is already using a shared repository."
5947
msgstr ""
5948
5949
#: bzrlib/errors.py:2852
5950
msgid "'%(display_url)s' is already standalone."
5951
msgstr ""
5952
5953
#: bzrlib/errors.py:2857
5954
msgid "Shared repository '%(display_url)s' already creates working trees."
5955
msgstr ""
5956
5957
#: bzrlib/errors.py:2863
5958
msgid ""
5959
"Shared repository '%(display_url)s' already doesn't create working trees."
5960
msgstr ""
5961
5962
#: bzrlib/errors.py:2869
5963
msgid "Requested reconfiguration of '%(display_url)s' is not supported."
5964
msgstr ""
5965
5966
#: bzrlib/errors.py:2874
5967
msgid "No location could be found to bind to at %(display_url)s."
5968
msgstr ""
5969
5970
#: bzrlib/errors.py:2879
5971
msgid ""
5972
"Working tree \"%(display_url)s\" has uncommitted changes (See bzr "
5973
"status).%(more)s"
5974
msgstr ""
5975
5976
#: bzrlib/errors.py:2898
5977
msgid ""
5978
"Working tree \"%(display_url)s\" has shelved changes (See bzr shelve --"
5979
"list).%(more)s"
5980
msgstr ""
5981
5982
#: bzrlib/errors.py:2904
5983
msgid "Variable {%(name)s} is not available."
5984
msgstr ""
5985
5986
#: bzrlib/errors.py:2912
5987
msgid "No template specified."
5988
msgstr ""
5989
5990
#: bzrlib/errors.py:2917
5991
msgid "Unable to create symlink %(path_str)son this platform"
5992
msgstr ""
5993
5994
#: bzrlib/errors.py:2932
5995
msgid ""
5996
"Unsupported timezone format \"%(timezone)s\", options are \"utc\", "
5997
"\"original\", \"local\"."
5998
msgstr ""
5999
6000
#: bzrlib/errors.py:2966
6001
msgid ""
6002
"Unable to encode %(kind)s path %(path)r in user encoding %(user_encoding)s"
6003
msgstr ""
6004
6005
#: bzrlib/errors.py:2978
6006
msgid "The \"%(config_id)s\" configuration does not exist."
6007
msgstr ""
6008
6009
#: bzrlib/errors.py:2986
6010
msgid "The \"%(option_name)s\" configuration option does not exist."
6011
msgstr ""
6012
6013
#: bzrlib/errors.py:2994
6014
msgid "The alias \"%(alias_name)s\" does not exist."
6015
msgstr ""
6016
6017
#: bzrlib/errors.py:3008
6018
msgid "\"%(alias_name)s\" is not a valid location alias."
6019
msgstr ""
6020
6021
#: bzrlib/errors.py:3016
6022
msgid "No %(alias_name)s location assigned."
6023
msgstr ""
6024
6025
#: bzrlib/errors.py:3024
6026
msgid "Cannot bind address \"%(host)s:%(port)i\": %(orig_error)s."
6027
msgstr ""
6028
6029
#: bzrlib/errors.py:3034
6030
msgid "Unknown rules detected: %(unknowns_str)s."
6031
msgstr ""
6032
6033
#: bzrlib/errors.py:3045
6034
msgid "Tip change rejected: %(msg)s"
6035
msgstr ""
6036
6037
#: bzrlib/errors.py:3053
6038
msgid "Shelf corrupt."
6039
msgstr ""
6040
6041
#: bzrlib/errors.py:3058
6042
msgid "Corruption while decompressing repository file%(orig_error)s"
6043
msgstr ""
6044
6045
#: bzrlib/errors.py:3070
6046
msgid "No changes are shelved with id \"%(shelf_id)d\"."
6047
msgstr ""
6048
6049
#: bzrlib/errors.py:3078
6050
msgid "\"%(invalid_id)s\" is not a valid shelf id, try a number instead."
6051
msgstr ""
6052
6053
#: bzrlib/errors.py:3086
6054
msgid ""
6055
"An attempt to access a url outside the server jail was made: '%(url)s'."
6056
msgstr ""
6057
6058
#: bzrlib/errors.py:3094
6059
msgid "The user aborted the operation."
6060
msgstr ""
6061
6062
#: bzrlib/errors.py:3099
6063
msgid "Branching '%(url)s'(%(format)s) must create a working tree."
6064
msgstr ""
6065
6066
#: bzrlib/errors.py:3109
6067
msgid "No such view: %(view_name)s."
6068
msgstr ""
6069
6070
#: bzrlib/errors.py:3119
6071
msgid ""
6072
"Views are not supported by %(tree)s; use 'bzr upgrade' to change your tree "
6073
"to a later format."
6074
msgstr ""
6075
6076
#: bzrlib/errors.py:3128
6077
msgid ""
6078
"Specified file \"%(file_name)s\" is outside the current view: %(view_str)s"
6079
msgstr ""
6080
6081
#: bzrlib/errors.py:3195
6082
msgid "%(bzrdir)r does not support co-located branches."
6083
msgstr ""
6084
6085
#: bzrlib/errors.py:3201
6086
msgid ""
6087
"Unable to determine your name.\n"
6088
"Please, set your name with the 'whoami' command.\n"
6089
"E.g. bzr whoami \"Your Name <name@example.com>\""
6090
msgstr ""
6091
6092
#: bzrlib/errors.py:3210
6093
msgid "Invalid pattern(s) found. %(msg)s"
6094
msgstr ""
6095
6096
#: bzrlib/errors.py:3218
6097
msgid ""
6098
"Branch \"%(branch_url)s\" appears to be bound to itself. Please use `bzr "
6099
"unbind` to fix."
6100
msgstr ""
6101
6102
#: bzrlib/errors.py:3229
6103
msgid "Loop involving %(refs)r while expanding \"%(string)s\"."
6104
msgstr ""
6105
6106
#: bzrlib/errors.py:3238
6107
msgid "Option %(name)s is not defined while expanding \"%(string)s\"."
6108
msgstr ""
6109
6110
#: bzrlib/errors.py:3247
6111
msgid ""
6112
"No compatible object available for operations from %(source)r to %(target)r."
6113
msgstr ""
6114
6115
#: bzrlib/errors.py:3257
6116
msgid ""
6117
"VFS requests over the smart server are not allowed. Encountered: %(method)s, "
6118
"%(arguments)s."
6119
msgstr ""
6120
6121
#: bzrlib/errors.py:3267
6122
msgid ""
6123
"Kind change from %(from_kind)s to %(to_kind)s for %(path)s not supported by "
6124
"format %(format)r"
6125
msgstr ""
6126
6127
#: bzrlib/errors.py:3279
6128
msgid ""
6129
"Missing feature %(feature)s not provided by this version of Bazaar or any "
6130
"plugin."
6131
msgstr ""
6132
6133
#: bzrlib/errors.py:3292
6134
msgid "Binary files section encountered."
6135
msgstr ""
6136
6137
#: bzrlib/errors.py:3300
6138
msgid ""
6139
"Malformed patch header. %(desc)s\n"
6140
"%(line)r"
6141
msgstr ""
6142
6143
#: bzrlib/errors.py:3309
6144
msgid ""
6145
"Malformed hunk header. %(desc)s\n"
6146
"%(line)r"
6147
msgstr ""
6148
6149
#: bzrlib/errors.py:3318
6150
msgid ""
6151
"Malformed line. %(desc)s\n"
6152
"%(line)r"
6153
msgstr ""
6154
6155
#: bzrlib/errors.py:3328
6156
msgid ""
6157
"Text contents mismatch at line %(line_no)d. Original has \"%(orig_line)s\", "
6158
"but patch says it should be \"%(patch_line)s\""
6159
msgstr ""
6160
6161
#: bzrlib/errors.py:3339
6162
msgid "The feature %(feature)s has already been registered."
6163
msgstr ""
6164
6165
#: bzrlib/export_pot.py:252
6166
#, python-format
6167
msgid "Exporting messages from builtin command: %s"
6168
msgstr ""
6169
6170
#: bzrlib/export_pot.py:271
6171
msgid "Exporting messages from plugin command: {0} in {1}"
6172
msgstr ""
6173
6174
#: bzrlib/export_pot.py:292
6175
#, python-format
6176
msgid "Exporting message from error: %s"
6177
msgstr ""
6178
6179
#: bzrlib/fetch.py:98
6180
msgid "Finding revisions"
6181
msgstr ""
6182
6183
#: bzrlib/fetch.py:103
6184
msgid "Fetching revisions"
6185
msgstr ""
6186
6187
#: bzrlib/foreign.py:262
6188
msgid "Push into a different VCS without any custom bzr metadata."
6189
msgstr ""
6190
6191
#: bzrlib/foreign.py:264
6192
msgid ""
6193
"This will afterwards rebase the local branch on the remote\n"
6194
"branch unless the --no-rebase option is used, in which case \n"
6195
"the two branches will be out of sync after the push. "
6196
msgstr ""
6197
6198
#: bzrlib/foreign.py:277
6199
msgid "Do not rebase after push."
6200
msgstr ""
6201
6202
#: bzrlib/foreign.py:311
6203
#, python-format
6204
msgid "Using saved location: %s\n"
6205
msgstr ""
6206
6207
#: bzrlib/foreign.py:321
6208
msgid ""
6209
"{0!r} and {1!r} are in the same VCS, lossy push not necessary. Please use "
6210
"regular push."
6211
msgstr ""
6212
6213
#: bzrlib/gpg.py:366
6214
msgid "No GnuPG key results for pattern: {0}"
6215
msgstr ""
6216
6217
#: bzrlib/gpg.py:439
6218
msgid "{0} commits with valid signatures"
6219
msgstr ""
6220
6221
#: bzrlib/gpg.py:445
6222
msgid "{0} commit with unknown key"
6223
msgid_plural "{0} commits with unknown keys"
6224
msgstr[0] ""
6225
msgstr[1] ""
6226
6227
#: bzrlib/gpg.py:453
6228
msgid "{0} commit not valid"
6229
msgid_plural "{0} commits not valid"
6230
msgstr[0] ""
6231
msgstr[1] ""
6232
6233
#: bzrlib/gpg.py:461
6234
msgid "{0} commit not signed"
6235
msgid_plural "{0} commits not signed"
6236
msgstr[0] ""
6237
msgstr[1] ""
6238
6239
#: bzrlib/gpg.py:469
6240
msgid "{0} commit with key now expired"
6241
msgid_plural "{0} commits with key now expired"
6242
msgstr[0] ""
6243
msgstr[1] ""
6244
6245
#: bzrlib/gpg.py:489
6246
msgid "{0} commit by author {1} with key {2} now expired"
6247
msgid_plural "{0} commits by author {1} with key {2} now expired"
6248
msgstr[0] ""
6249
msgstr[1] ""
6250
6251
#: bzrlib/gpg.py:505
6252
msgid "{0} signed {1} commit"
6253
msgid_plural "{0} signed {1} commits"
6254
msgstr[0] ""
6255
msgstr[1] ""
6256
6257
#: bzrlib/gpg.py:522 bzrlib/gpg.py:539
6258
msgid "{0} commit by author {1}"
6259
msgid_plural "{0} commits by author {1}"
6260
msgstr[0] ""
6261
msgstr[1] ""
6262
6263
#: bzrlib/gpg.py:554
6264
msgid "Unknown key {0} signed {1} commit"
6265
msgid_plural "Unknown key {0} signed {1} commits"
6266
msgstr[0] ""
6267
msgstr[1] ""
6268
6269
#: bzrlib/groupcompress.py:1739
6270
#, python-format
6271
msgid "Insert claimed random_id=True, but then inserted %r two times"
6272
msgstr ""
6273
6274
#: bzrlib/hooks.py:313
6275
#, python-format
6276
msgid "Introduced in: %s"
6277
msgstr ""
6278
6279
#: bzrlib/hooks.py:316
6280
#, python-format
6281
msgid "Deprecated in: %s"
6282
msgstr ""
6283
6284
#: bzrlib/knit.py:1766 bzrlib/knit.py:1802
6285
msgid "Walking content"
6286
msgstr ""
6287
6288
#: bzrlib/knit.py:3330
6289
msgid "annotating"
6290
msgstr ""
6291
6292
#: bzrlib/lock.py:548
6293
msgid "{0!r} was {1} locked again"
6294
msgstr ""
6295
6296
#: bzrlib/lockdir.py:321
6297
#, python-format
6298
msgid "error removing pending lock: %s"
6299
msgstr ""
6300
6301
#: bzrlib/lockdir.py:616
6302
msgid "Unable to obtain"
6303
msgstr ""
6304
6305
#: bzrlib/lockdir.py:618
6306
msgid "Lock owner changed for"
6307
msgstr ""
6308
6309
#: bzrlib/lockdir.py:620
6310
msgid "{0} lock {1} {2}."
6311
msgstr ""
6312
6313
#: bzrlib/lockdir.py:627
6314
#, python-format
6315
msgid "Will continue to try until %s, unless you press Ctrl-C."
6316
msgstr ""
6317
6318
#: bzrlib/lockdir.py:629
6319
msgid "See \"bzr help break-lock\" for more."
6320
msgstr ""
6321
6322
#: bzrlib/lockdir.py:739
6323
#, python-format
6324
msgid ""
6325
"held by %(user)s on %(hostname)s (process #%(pid)s), acquired %(time_ago)s"
6326
msgstr ""
6327
6328
#: bzrlib/log.py:563
6329
msgid "--exclude-common-ancestry requires two different revisions"
6330
msgstr ""
6331
6332
#: bzrlib/log.py:565
6333
#, python-format
6334
msgid "invalid direction %r"
6335
msgstr ""
6336
6337
#: bzrlib/log.py:653
6338
msgid "Start revision not found in history of end revision."
6339
msgstr ""
6340
6341
#: bzrlib/log.py:1071 bzrlib/log.py:1129
6342
msgid "Logging revision 0 is invalid."
6343
msgstr ""
6344
6345
#: bzrlib/log.py:1073 bzrlib/log.py:1131
6346
msgid "Start revision must be older than the end revision."
6347
msgstr ""
6348
6349
#: bzrlib/log.py:1818
6350
#, python-format
6351
msgid "unknown log formatter: %r"
6352
msgstr ""
6353
6354
#: bzrlib/log.py:2114
6355
msgid "fixes bug"
6356
msgid_plural "fixes bugs"
6357
msgstr[0] ""
6358
msgstr[1] ""
6359
6360
#: bzrlib/merge.py:689
6361
msgid "All changes applied successfully."
6362
msgstr ""
6363
6364
#: bzrlib/merge.py:691
6365
#, python-format
6366
msgid "%d conflicts encountered."
6367
msgstr ""
6368
6369
#: bzrlib/merge.py:845 bzrlib/merge.py:1868
6370
msgid "Preparing file merge"
6371
msgstr ""
6372
6373
#: bzrlib/multiparent.py:426
6374
msgid "Importing revisions"
6375
msgstr ""
6376
6377
#: bzrlib/option.py:526
6378
msgid "Show help message."
6379
msgstr ""
6380
6381
#: bzrlib/option.py:528
6382
msgid "Only display errors and warnings."
6383
msgstr ""
6384
6385
#: bzrlib/option.py:531
6386
msgid "Show usage message and options."
6387
msgstr ""
6388
6389
#: bzrlib/option.py:533
6390
msgid "Display more information."
6391
msgstr ""
6392
6393
#: bzrlib/option.py:541
6394
msgid ""
6395
"Select changes introduced by the specified revision. See also \"help "
6396
"revisionspec\"."
6397
msgstr ""
6398
6399
#: bzrlib/option.py:543
6400
msgid "Branch to operate on, instead of working directory."
6401
msgstr ""
6402
6403
#: bzrlib/option.py:545
6404
msgid "Detailed log format."
6405
msgstr ""
6406
6407
#: bzrlib/option.py:545
6408
msgid "Format used by GNU ChangeLog files."
6409
msgstr ""
6410
6411
#: bzrlib/option.py:545
6412
msgid "Log format with one line per revision."
6413
msgstr ""
6414
6415
#: bzrlib/option.py:545
6416
msgid "Moderately short log format."
6417
msgstr ""
6418
6419
#: bzrlib/option.py:545
6420
msgid "Use specified log format."
6421
msgstr ""
6422
6423
#: bzrlib/option.py:547
6424
msgid "Log format"
6425
msgstr ""
6426
6427
#: bzrlib/option.py:549
6428
msgid "LCA-newness merge."
6429
msgstr ""
6430
6431
#: bzrlib/option.py:549
6432
msgid "Merge using external diff3."
6433
msgstr ""
6434
6435
#: bzrlib/option.py:549
6436
msgid "Native diff3-style merge."
6437
msgstr ""
6438
6439
#: bzrlib/option.py:549
6440
msgid "Select a particular merge algorithm."
6441
msgstr ""
6442
6443
#: bzrlib/option.py:549
6444
msgid "Weave-based merge."
6445
msgstr ""
6446
6447
#: bzrlib/option.py:551
6448
msgid "Merge algorithm"
6449
msgstr ""
6450
6451
#: bzrlib/option.py:554
6452
msgid "Message string."
6453
msgstr ""
6454
6455
#: bzrlib/option.py:556
6456
msgid "Use an ASCII NUL (\\0) separator rather than a newline."
6457
msgstr ""
6458
6459
#: bzrlib/option.py:558
6460
msgid "Ignore differences between branches and overwrite unconditionally."
6461
msgstr ""
6462
6463
#: bzrlib/option.py:560
6464
msgid "Remember the specified location as a default."
6465
msgstr ""
6466
6467
#: bzrlib/option.py:562
6468
msgid "Reprocess to reduce spurious conflicts."
6469
msgstr ""
6470
6471
#: bzrlib/option.py:566
6472
msgid "See \"help revisionspec\" for details."
6473
msgstr ""
6474
6475
#: bzrlib/option.py:568
6476
msgid "Show internal object ids."
6477
msgstr ""
6478
6479
#: bzrlib/option.py:571
6480
msgid "Display timezone as local, original, or utc."
6481
msgstr ""
6482
6483
#: bzrlib/osutils.py:100
6484
msgid "Parameter {0!r} encoding is unsupported by {1} application locale."
6485
msgstr ""
6486
6487
#: bzrlib/osutils.py:220
6488
msgid "lstat/stat of ({0!r}): {1!r}"
6489
msgstr ""
6490
6491
#: bzrlib/osutils.py:1030 bzrlib/osutils.py:1041
6492
#, python-format
6493
msgid "sorry, %r not allowed in path"
6494
msgstr ""
6495
6496
#: bzrlib/osutils.py:1259
6497
#, python-format
6498
msgid "%r is too short to calculate a relative path"
6499
msgstr ""
6500
6501
#: bzrlib/plugin.py:143
6502
#, python-format
6503
msgid "\"%s\" is not a valid <plugin_name>@<plugin_path> description "
6504
msgstr ""
6505
6506
#: bzrlib/plugins/bash_completion/bashcomp.py:411
6507
msgid "Enable completions for the selected plugin (default: all plugins)"
6508
msgstr ""
6509
6510
#: bzrlib/plugins/bash_completion/bashcomp.py:412
6511
msgid "Generate a shell function for bash command line completion."
6512
msgstr ""
6513
6514
#: bzrlib/plugins/bash_completion/bashcomp.py:414
6515
msgid ""
6516
"This command generates a shell function which can be used by bash to\n"
6517
"automatically complete the currently typed command when the user presses\n"
6518
"the completion key (usually tab)."
6519
msgstr ""
6520
6521
#: bzrlib/plugins/bash_completion/bashcomp.py:418
6522
msgid ""
6523
"Commonly used like this:\n"
6524
" eval \"`bzr bash-completion`\""
6525
msgstr ""
6526
6527
#: bzrlib/plugins/bash_completion/bashcomp.py:424
6528
msgid "Name of the generated function (default: _bzr)"
6529
msgstr ""
6530
6531
#: bzrlib/plugins/bash_completion/bashcomp.py:426
6532
msgid "Generate only the shell function, don't enable it"
6533
msgstr ""
6534
6535
#: bzrlib/plugins/launchpad/account.py:66
6536
msgid "Setting ssh/sftp usernames for launchpad.net."
6537
msgstr ""
6538
6539
#: bzrlib/plugins/launchpad/cmds.py:44
6540
msgid "Register a branch with launchpad.net."
6541
msgstr ""
6542
6543
#: bzrlib/plugins/launchpad/cmds.py:46
6544
msgid ""
6545
"This command lists a bzr branch in the directory of branches on\n"
6546
"launchpad.net. Registration allows the branch to be associated with\n"
6547
"bugs or specifications."
6548
msgstr ""
6549
6550
#: bzrlib/plugins/launchpad/cmds.py:50
6551
msgid ""
6552
"Before using this command you must register the project to which the\n"
6553
"branch belongs, and create an account for yourself on launchpad.net."
6554
msgstr ""
6555
6556
#: bzrlib/plugins/launchpad/cmds.py:53
6557
msgid ""
6558
"arguments:\n"
6559
" public_url: The publicly visible url for the branch to register.\n"
6560
" This must be an http or https url (which Launchpad can read\n"
6561
" from to access the branch). Local file urls, SFTP urls, and\n"
6562
" bzr+ssh urls will not work.\n"
6563
" If no public_url is provided, bzr will use the configured\n"
6564
" public_url if there is one for the current branch, and\n"
6565
" otherwise error."
6566
msgstr ""
6567
6568
#: bzrlib/plugins/launchpad/cmds.py:62
6569
msgid ""
6570
"example:\n"
6571
" bzr register-branch http://foo.com/bzr/fooproject.mine \\\n"
6572
" --project fooproject"
6573
msgstr ""
6574
6575
#: bzrlib/plugins/launchpad/cmds.py:69
6576
msgid "Launchpad project short name to associate with the branch."
6577
msgstr ""
6578
6579
#: bzrlib/plugins/launchpad/cmds.py:76
6580
msgid ""
6581
"Short name for the branch; by default taken from the last component of the "
6582
"url."
6583
msgstr ""
6584
6585
#: bzrlib/plugins/launchpad/cmds.py:80
6586
msgid "One-sentence description of the branch."
6587
msgstr ""
6588
6589
#: bzrlib/plugins/launchpad/cmds.py:83
6590
msgid "Longer description of the purpose or contents of the branch."
6591
msgstr ""
6592
6593
#: bzrlib/plugins/launchpad/cmds.py:86
6594
msgid "Branch author's email address, if not yourself."
6595
msgstr ""
6596
6597
#: bzrlib/plugins/launchpad/cmds.py:89
6598
msgid "The bug this branch fixes."
6599
msgstr ""
6600
6601
#: bzrlib/plugins/launchpad/cmds.py:92
6602
msgid "Prepare the request but don't actually send it."
6603
msgstr ""
6604
6605
#: bzrlib/plugins/launchpad/cmds.py:114
6606
msgid ""
6607
"register-branch requires a public branch url - see bzr help register-branch."
6608
msgstr ""
6609
6610
#: bzrlib/plugins/launchpad/cmds.py:122
6611
msgid "--product is deprecated; please use --project."
6612
msgstr ""
6613
6614
#: bzrlib/plugins/launchpad/cmds.py:152
6615
msgid "Open a Launchpad branch page in your web browser."
6616
msgstr ""
6617
6618
#: bzrlib/plugins/launchpad/cmds.py:157
6619
msgid "Do not actually open the browser. Just say the URL we would use."
6620
msgstr ""
6621
6622
#: bzrlib/plugins/launchpad/cmds.py:192
6623
#, python-format
6624
msgid "Opening %s in web browser"
6625
msgstr ""
6626
6627
#: bzrlib/plugins/launchpad/cmds.py:200
6628
msgid "Show or set the Launchpad user ID."
6629
msgstr ""
6630
6631
#: bzrlib/plugins/launchpad/cmds.py:202
6632
msgid ""
6633
"When communicating with Launchpad, some commands need to know your\n"
6634
"Launchpad user ID. This command can be used to set or show the\n"
6635
"user ID that Bazaar will use for such communication."
6636
msgstr ""
6637
6638
#: bzrlib/plugins/launchpad/cmds.py:206
6639
msgid ""
6640
":Examples:\n"
6641
" Show the Launchpad ID of the current user::"
6642
msgstr ""
6643
6644
#: bzrlib/plugins/launchpad/cmds.py:209
6645
msgid " bzr launchpad-login"
6646
msgstr ""
6647
6648
#: bzrlib/plugins/launchpad/cmds.py:211
6649
msgid " Set the Launchpad ID of the current user to 'bob'::"
6650
msgstr ""
6651
6652
#: bzrlib/plugins/launchpad/cmds.py:213
6653
msgid " bzr launchpad-login bob"
6654
msgstr ""
6655
6656
#: bzrlib/plugins/launchpad/cmds.py:220
6657
msgid "Don't check that the user name is valid."
6658
msgstr ""
6659
6660
#: bzrlib/plugins/launchpad/cmds.py:235 bzrlib/plugins/launchpad/cmds.py:246
6661
msgid "Launchpad user ID exists and has SSH keys.\n"
6662
msgstr ""
6663
6664
#: bzrlib/plugins/launchpad/cmds.py:238
6665
msgid "No Launchpad user ID configured.\n"
6666
msgstr ""
6667
6668
#: bzrlib/plugins/launchpad/cmds.py:249
6669
#, python-format
6670
msgid "Launchpad user ID set to '%s'.\n"
6671
msgstr ""
6672
6673
#: bzrlib/plugins/launchpad/cmds.py:255
6674
msgid "Ask Launchpad to mirror a branch now."
6675
msgstr ""
6676
6677
#: bzrlib/plugins/launchpad/cmds.py:272
6678
msgid "Propose merging a branch on Launchpad."
6679
msgstr ""
6680
6681
#: bzrlib/plugins/launchpad/cmds.py:274
6682
msgid ""
6683
"This will open your usual editor to provide the initial comment. When it\n"
6684
"has created the proposal, it will open it in your default web browser."
6685
msgstr ""
6686
6687
#: bzrlib/plugins/launchpad/cmds.py:277
6688
msgid ""
6689
"The branch will be proposed to merge into SUBMIT_BRANCH. If SUBMIT_BRANCH\n"
6690
"is not supplied, the remembered submit branch will be used. If no submit\n"
6691
"branch is remembered, the development focus will be used."
6692
msgstr ""
6693
6694
#: bzrlib/plugins/launchpad/cmds.py:281
6695
msgid ""
6696
"By default, the SUBMIT_BRANCH's review team will be requested to review\n"
6697
"the merge proposal. This can be overriden by specifying --review (-R).\n"
6698
"The parameter the launchpad account name of the desired reviewer. This\n"
6699
"may optionally be followed by '=' and the review type. For example:"
6700
msgstr ""
6701
6702
#: bzrlib/plugins/launchpad/cmds.py:286
6703
msgid " bzr lp-propose-merge --review jrandom --review review-team=qa"
6704
msgstr ""
6705
6706
#: bzrlib/plugins/launchpad/cmds.py:288
6707
msgid ""
6708
"This will propose a merge, request \"jrandom\" to perform a review of\n"
6709
"unspecified type, and request \"review-team\" to perform a \"qa\" review."
6710
msgstr ""
6711
6712
#: bzrlib/plugins/launchpad/cmds.py:293
6713
msgid "Propose the merge on staging."
6714
msgstr ""
6715
6716
#: bzrlib/plugins/launchpad/cmds.py:295
6717
msgid "Commit message."
6718
msgstr ""
6719
6720
#: bzrlib/plugins/launchpad/cmds.py:297
6721
msgid "Mark the proposal as approved immediately."
6722
msgstr ""
6723
6724
#: bzrlib/plugins/launchpad/cmds.py:298
6725
msgid "The bug this proposal fixes."
6726
msgstr ""
6727
6728
#: bzrlib/plugins/launchpad/cmds.py:300
6729
msgid "Requested reviewer and optional type."
6730
msgstr ""
6731
6732
#: bzrlib/plugins/launchpad/cmds.py:335
6733
msgid "Find the proposal to merge this revision."
6734
msgstr ""
6735
6736
#: bzrlib/plugins/launchpad/cmds.py:337
6737
msgid ""
6738
"Finds the merge proposal(s) that discussed landing the specified revision.\n"
6739
"This works only if the selected branch was the merge proposal target, and\n"
6740
"if the merged_revno is recorded for the merge proposal. The proposal(s)\n"
6741
"are opened in a web browser."
6742
msgstr ""
6743
6744
#: bzrlib/plugins/launchpad/cmds.py:342
6745
msgid ""
6746
"Any revision involved in the merge may be specified-- the revision in\n"
6747
"which the merge was performed, or one of the revisions that was merged."
6748
msgstr ""
6749
6750
#: bzrlib/plugins/launchpad/cmds.py:345
6751
msgid "So, to find the merge proposal that reviewed line 1 of README::"
6752
msgstr ""
6753
6754
#: bzrlib/plugins/launchpad/cmds.py:347
6755
msgid " bzr lp-find-proposal -r annotate:README:1"
6756
msgstr ""
6757
6758
#: bzrlib/plugins/launchpad/cmds.py:363
6759
msgid "No review found."
6760
msgstr ""
6761
6762
#: bzrlib/plugins/launchpad/cmds.py:364
6763
#, python-format
6764
msgid "%d proposals(s) found."
6765
msgstr ""
6766
6767
#: bzrlib/plugins/launchpad/cmds.py:374
6768
msgid "Finding revision-id"
6769
msgstr ""
6770
6771
#: bzrlib/plugins/launchpad/cmds.py:381
6772
msgid "Finding merge"
6773
msgstr ""
6774
6775
#: bzrlib/plugins/launchpad/cmds.py:386
6776
msgid "Finding revno"
6777
msgstr ""
6778
6779
#: bzrlib/plugins/launchpad/cmds.py:392
6780
msgid "Finding Launchpad branch"
6781
msgstr ""
6782
6783
#: bzrlib/plugins/launchpad/cmds.py:395
6784
msgid "Finding proposals"
6785
msgstr ""
6786
6787
#: bzrlib/plugins/launchpad/lp_api.py:241
6788
#: bzrlib/plugins/launchpad/lp_api.py:246
6789
#, python-format
6790
msgid "%s is not registered on Launchpad"
6791
msgstr ""
6792
6793
#: bzrlib/plugins/launchpad/lp_api.py:256
6794
#, python-format
6795
msgid "%s has no development focus."
6796
msgstr ""
6797
6798
#: bzrlib/plugins/launchpad/lp_api.py:261
6799
#, python-format
6800
msgid "development focus %s has no branch."
6801
msgstr ""
6802
6803
#: bzrlib/plugins/launchpad/lp_api.py:266
6804
#, python-format
6805
msgid "source package %s has no branch."
6806
msgstr ""
6807
6808
#: bzrlib/plugins/launchpad/lp_api.py:270
6809
#, python-format
6810
msgid "%s has no associated product or source package."
6811
msgstr ""
6812
6813
#: bzrlib/plugins/launchpad/lp_api.py:282
6814
#, python-format
6815
msgid "%s is already up-to-date."
6816
msgstr ""
6817
6818
#: bzrlib/plugins/launchpad/lp_api.py:289
6819
#, python-format
6820
msgid "Pushing to %s"
6821
msgstr ""
6822
6823
#: bzrlib/plugins/launchpad/lp_directory.py:170
6824
msgid ""
6825
"resolution for {0}\n"
6826
" local: {1}\n"
6827
" remote: {2}"
6828
msgstr ""
6829
6830
#: bzrlib/plugins/launchpad/lp_propose.py:150
6831
#, python-format
6832
msgid "There is already a branch merge proposal: %s"
6833
msgstr ""
6834
6835
#: bzrlib/plugins/weave_fmt/bzrdir.py:237
6836
msgid "pb parameter to convert() is deprecated"
6837
msgstr ""
6838
6839
#: bzrlib/plugins/weave_fmt/bzrdir.py:240
6840
msgid "starting upgrade from format 4 to 5"
6841
msgstr ""
6842
6843
#: bzrlib/plugins/weave_fmt/bzrdir.py:250
6844
msgid "note: upgrade may be faster if all store files are ungzipped first"
6845
msgstr ""
6846
6847
#: bzrlib/plugins/weave_fmt/bzrdir.py:279
6848
msgid "converting revision"
6849
msgstr ""
6850
6851
#: bzrlib/plugins/weave_fmt/bzrdir.py:284
6852
msgid "upgraded to weaves:"
6853
msgstr ""
6854
6855
#: bzrlib/plugins/weave_fmt/bzrdir.py:285
6856
#, python-format
6857
msgid "%6d revisions and inventories"
6858
msgstr ""
6859
6860
#: bzrlib/plugins/weave_fmt/bzrdir.py:287
6861
#, python-format
6862
msgid "%6d revisions not present"
6863
msgstr ""
6864
6865
#: bzrlib/plugins/weave_fmt/bzrdir.py:289
6866
#, python-format
6867
msgid "%6d texts"
6868
msgstr ""
6869
6870
#: bzrlib/plugins/weave_fmt/bzrdir.py:325
6871
msgid "writing weave"
6872
msgstr ""
6873
6874
#: bzrlib/plugins/weave_fmt/bzrdir.py:329
6875
#: bzrlib/plugins/weave_fmt/bzrdir.py:331
6876
msgid "inventory"
6877
msgstr ""
6878
6879
#: bzrlib/plugins/weave_fmt/bzrdir.py:348
6880
msgid "write revision"
6881
msgstr ""
6882
6883
#: bzrlib/plugins/weave_fmt/bzrdir.py:362
6884
msgid "loading revision"
6885
msgstr ""
6886
6887
#: bzrlib/plugins/weave_fmt/bzrdir.py:367
6888
#, python-format
6889
msgid "revision {%s} not present in branch; will be converted as a ghost"
6890
msgstr ""
6891
6892
#: bzrlib/plugins/weave_fmt/bzrdir.py:507
6893
msgid "starting upgrade from format 5 to 6"
6894
msgstr ""
6895
6896
#: bzrlib/plugins/weave_fmt/bzrdir.py:517
6897
#, python-format
6898
msgid "adding prefixes to %s"
6899
msgstr ""
6900
6901
#: bzrlib/plugins/weave_fmt/bzrdir.py:557
6902
msgid "starting upgrade from format 6 to metadir"
6903
msgstr ""
6904
6905
#: bzrlib/plugins/weave_fmt/bzrdir.py:565
6906
msgid "Removing ancestry.weave"
6907
msgstr ""
6908
6909
#: bzrlib/plugins/weave_fmt/bzrdir.py:570
6910
msgid "Finding branch files"
6911
msgstr ""
6912
6913
#: bzrlib/plugins/weave_fmt/bzrdir.py:580
6914
msgid "Upgrading repository"
6915
msgstr ""
6916
6917
#: bzrlib/plugins/weave_fmt/bzrdir.py:590
6918
msgid "Upgrading branch"
6919
msgstr ""
6920
6921
#: bzrlib/plugins/weave_fmt/bzrdir.py:613
6922
msgid "No working tree."
6923
msgstr ""
6924
6925
#: bzrlib/plugins/weave_fmt/bzrdir.py:620
6926
msgid "Upgrading working tree"
6927
msgstr ""
6928
6929
#: bzrlib/plugins/weave_fmt/bzrdir.py:641
6930
#, python-format
6931
msgid "Make %s lock"
6932
msgstr ""
6933
6934
#: bzrlib/plugins/weave_fmt/bzrdir.py:652
6935
#, python-format
6936
msgid "Moving %s"
6937
msgstr ""
6938
6939
#: bzrlib/push.py:56
6940
msgid "Created new branch."
6941
msgstr ""
6942
6943
#: bzrlib/push.py:97
6944
#, python-format
6945
msgid ""
6946
"Target directory %s already contains a .bzr directory, but it is not valid."
6947
msgstr ""
6948
6949
#: bzrlib/push.py:101
6950
#, python-format
6951
msgid ""
6952
"Target directory %s already exists, but does not have a .bzr directory. "
6953
"Supply --use-existing-dir to push there anyway."
6954
msgstr ""
6955
6956
#: bzrlib/push.py:122
6957
#, python-format
6958
msgid "Too many redirections trying to make %s."
6959
msgstr ""
6960
6961
#: bzrlib/push.py:148
6962
msgid ""
6963
"These branches have diverged. See \"bzr help diverged-branches\" for more "
6964
"information."
6965
msgstr ""
6966
6967
#: bzrlib/push.py:152
6968
#, python-format
6969
msgid ""
6970
"It is not possible to losslessly push to %s. You may want to use dpush "
6971
"instead."
6972
msgstr ""
6973
6974
#: bzrlib/push.py:158
6975
#, python-format
6976
msgid ""
6977
"At %s you have a valid .bzr control directory, but not a branch or "
6978
"repository. This is an unsupported configuration. Please move the target "
6979
"directory out of the way and try again."
6980
msgstr ""
6981
6982
#: bzrlib/reconcile.py:97
6983
#, python-format
6984
msgid "Reconciling branch %s"
6985
msgstr ""
6986
6987
#: bzrlib/reconcile.py:103
6988
#, python-format
6989
msgid "Reconciling repository %s"
6990
msgstr ""
6991
6992
#: bzrlib/reconcile.py:105
6993
msgid "Reconciling repository"
6994
msgstr ""
6995
6996
#: bzrlib/reconcile.py:111
6997
#, python-format
6998
msgid "%s cannot canonicalize CHKs."
6999
msgstr ""
7000
7001
#: bzrlib/reconcile.py:119
7002
msgid "Reconcile aborted: revision index has inconsistent parents."
7003
msgstr ""
7004
7005
#: bzrlib/reconcile.py:121
7006
msgid "Run \"bzr check\" for more details."
7007
msgstr ""
7008
7009
#: bzrlib/reconcile.py:123
7010
msgid "Reconciliation complete."
7011
msgstr ""
7012
7013
#: bzrlib/reconcile.py:166
7014
msgid "Fixing last revision info {0} => {1}"
7015
msgstr ""
7016
7017
#: bzrlib/reconcile.py:173
7018
msgid "revision_history ok."
7019
msgstr ""
7020
7021
#: bzrlib/reconcile.py:234
7022
msgid "Reading inventory data"
7023
msgstr ""
7024
7025
#: bzrlib/reconcile.py:254 bzrlib/reconcile.py:384
7026
msgid "Inventory ok."
7027
msgstr ""
7028
7029
#: bzrlib/reconcile.py:256 bzrlib/reconcile.py:386
7030
msgid "Backing up inventory"
7031
msgstr ""
7032
7033
#: bzrlib/reconcile.py:258
7034
msgid "Backup inventory created."
7035
msgstr ""
7036
7037
#: bzrlib/reconcile.py:274 bzrlib/reconcile.py:405
7038
msgid "Writing weave"
7039
msgstr ""
7040
7041
#: bzrlib/reconcile.py:277 bzrlib/reconcile.py:408
7042
msgid "Inventory regenerated."
7043
msgstr ""
7044
7045
#: bzrlib/reconcile.py:371 bzrlib/reconcile.py:373 bzrlib/reconcile.py:376
7046
msgid "Reading indexes"
7047
msgstr ""
7048
7049
#: bzrlib/reconcile.py:380 bzrlib/reconcile.py:382
7050
msgid "Checking unused inventories"
7051
msgstr ""
7052
7053
#: bzrlib/reconcile.py:388
7054
msgid "Backup Inventory created"
7055
msgstr ""
7056
7057
#: bzrlib/reconcile.py:446
7058
msgid "Fixing text parents"
7059
msgstr ""
7060
7061
#: bzrlib/reconfigure.py:54
7062
msgid "{0} is now stacked on {1}\n"
7063
msgstr ""
7064
7065
#: bzrlib/reconfigure.py:69
7066
#, python-format
7067
msgid "%s is now not stacked\n"
7068
msgstr ""
7069
7070
#: bzrlib/remote.py:1228 bzrlib/repository.py:289
7071
#, python-format
7072
msgid "bzr: ERROR (ignored): %s"
7073
msgstr ""
7074
7075
#: bzrlib/remote.py:2534
7076
msgid "Copying repository content as tarball..."
7077
msgstr ""
7078
7079
#: bzrlib/rename_map.py:69
7080
msgid "Calculating hashes"
7081
msgstr ""
7082
7083
#: bzrlib/rename_map.py:107
7084
msgid "Determining hash hits"
7085
msgstr ""
7086
7087
#: bzrlib/rename_map.py:242
7088
msgid "{0} => {1}"
7089
msgstr ""
7090
7091
#: bzrlib/repository.py:1738
7092
msgid "Moving repository to repository.backup"
7093
msgstr ""
7094
7095
#: bzrlib/repository.py:1745
7096
msgid "Creating new repository"
7097
msgstr ""
7098
7099
#: bzrlib/repository.py:1750
7100
msgid "Copying content"
7101
msgstr ""
7102
7103
#: bzrlib/repository.py:1754
7104
msgid "Deleting old repository content"
7105
msgstr ""
7106
7107
#: bzrlib/repository.py:1756
7108
msgid "repository converted"
7109
msgstr ""
7110
7111
#: bzrlib/revisionspec.py:903
7112
msgid "Using {0} {1}"
7113
msgstr ""
7114
7115
#: bzrlib/send.py:59
7116
#, python-format
7117
msgid "Mail client \"%s\" does not support specifying body"
7118
msgstr ""
7119
7120
#: bzrlib/send.py:63
7121
msgid "--remember requires a branch to be specified."
7122
msgstr ""
7123
7124
#: bzrlib/send.py:78
7125
msgid "No submit branch known or specified"
7126
msgstr ""
7127
7128
#: bzrlib/send.py:81
7129
msgid "Using saved {0} location \"{1}\" to determine what changes to submit."
7130
msgstr ""
7131
7132
#: bzrlib/send.py:99
7133
#, python-format
7134
msgid "No such send format '%s'."
7135
msgstr ""
7136
7137
#: bzrlib/send.py:115
7138
msgid "bzr send takes at most two one revision identifiers"
7139
msgstr ""
7140
7141
#: bzrlib/send.py:128
7142
msgid "No revisions to submit."
7143
msgstr ""
7144
7145
#: bzrlib/send.py:140
7146
msgid ""
7147
"- not supported for merge directives that use more than one output file."
7148
msgstr ""
7149
7150
#: bzrlib/send.py:186
7151
msgid "Format 0.9 does not permit bundle with no patch"
7152
msgstr ""
7153
7154
#: bzrlib/shelf_ui.py:46
7155
#, python-format
7156
msgid "Shelve adding file \"%(path)s\"?"
7157
msgstr ""
7158
7159
#: bzrlib/shelf_ui.py:47
7160
msgid "Shelve binary changes?"
7161
msgstr ""
7162
7163
#: bzrlib/shelf_ui.py:48
7164
msgid "Shelve changing \"%s\" from %(other)s to %(this)s?"
7165
msgstr ""
7166
7167
#: bzrlib/shelf_ui.py:50
7168
#, python-format
7169
msgid "Shelve removing file \"%(path)s\"?"
7170
msgstr ""
7171
7172
#: bzrlib/shelf_ui.py:51
7173
#, python-format
7174
msgid "Shelve %d change(s)?"
7175
msgstr ""
7176
7177
#: bzrlib/shelf_ui.py:52
7178
msgid "Shelve?"
7179
msgstr ""
7180
7181
#: bzrlib/shelf_ui.py:53
7182
#, python-format
7183
msgid ""
7184
"Shelve changing target of \"%(path)s\" from \"%(other)s\" to \"%(this)s\"?"
7185
msgstr ""
7186
7187
#: bzrlib/shelf_ui.py:55
7188
#, python-format
7189
msgid "Shelve renaming \"%(other)s\" => \"%(this)s\"?"
7190
msgstr ""
7191
7192
#: bzrlib/shelf_ui.py:70
7193
#, python-format
7194
msgid "Changes shelved with id \"%d\"."
7195
msgstr ""
7196
7197
#: bzrlib/shelf_ui.py:74
7198
msgid "Selected changes destroyed."
7199
msgstr ""
7200
7201
#: bzrlib/shelf_ui.py:78
7202
msgid "Selected changes:"
7203
msgstr ""
7204
7205
#: bzrlib/shelf_ui.py:98
7206
#, python-format
7207
msgid "Delete file \"%(path)s\"?"
7208
msgstr ""
7209
7210
#: bzrlib/shelf_ui.py:99
7211
msgid "Apply binary changes?"
7212
msgstr ""
7213
7214
#: bzrlib/shelf_ui.py:100
7215
#, python-format
7216
msgid "Change \"%(path)s\" from %(this)s to %(other)s?"
7217
msgstr ""
7218
7219
#: bzrlib/shelf_ui.py:102
7220
#, python-format
7221
msgid "Add file \"%(path)s\"?"
7222
msgstr ""
7223
7224
#: bzrlib/shelf_ui.py:103
7225
#, python-format
7226
msgid "Apply %d change(s)?"
7227
msgstr ""
7228
7229
#: bzrlib/shelf_ui.py:104
7230
msgid "Apply change?"
7231
msgstr ""
7232
7233
#: bzrlib/shelf_ui.py:105
7234
#, python-format
7235
msgid "Change target of \"%(path)s\" from \"%(this)s\" to \"%(other)s\"?"
7236
msgstr ""
7237
7238
#: bzrlib/shelf_ui.py:107
7239
#, python-format
7240
msgid "Rename \"%(this)s\" => \"%(other)s\"?"
7241
msgstr ""
7242
7243
#: bzrlib/shelf_ui.py:402
7244
msgid "No changes are shelved."
7245
msgstr ""
7246
7247
#: bzrlib/shelf_ui.py:460
7248
#, python-format
7249
msgid "Using changes with id \"%d\"."
7250
msgstr ""
7251
7252
#: bzrlib/shelf_ui.py:464
7253
#, python-format
7254
msgid "Message: %s"
7255
msgstr ""
7256
7257
#: bzrlib/shelf_ui.py:476
7258
#, python-format
7259
msgid "Deleted changes with id \"%d\"."
7260
msgstr ""
7261
7262
#: bzrlib/smart/medium.py:714
7263
msgid "HPSS calls: {0} ({1} vfs) {2}"
7264
msgstr ""
7265
7266
#: bzrlib/smart/server.py:169
7267
msgid "Requested to stop gracefully"
7268
msgstr ""
7269
7270
#: bzrlib/smart/server.py:179
7271
#, python-format
7272
msgid "Waiting for %d client(s) to finish"
7273
msgstr ""
7274
7275
#: bzrlib/smart/server.py:185
7276
#, python-format
7277
msgid "Still waiting for %d client(s) to finish"
7278
msgstr ""
7279
7280
#: bzrlib/smart/server.py:219
7281
#, python-format
7282
msgid "listening socket error: %s"
7283
msgstr ""
7284
7285
#: bzrlib/smart/server.py:452
7286
#, python-format
7287
msgid "listening on port: %s"
7288
msgstr ""
7289
7290
#: bzrlib/switch.py:73
7291
msgid "Pending merges must be committed or reverted before using switch."
7292
msgstr ""
7293
7294
#: bzrlib/switch.py:100
7295
msgid ""
7296
"Cannot switch as local commits found in the checkout. Commit these to the "
7297
"bound branch or use --force to throw them away."
7298
msgstr ""
7299
7300
#: bzrlib/switch.py:105
7301
#, python-format
7302
msgid ""
7303
"Unable to connect to current master branch %(target)s: %(error)s To switch "
7304
"anyway, use --force."
7305
msgstr ""
7306
7307
#: bzrlib/switch.py:129
7308
msgid "Cannot switch a branch, only a checkout."
7309
msgstr ""
7310
7311
#: bzrlib/switch.py:167
7312
#, python-format
7313
msgid "Tree is up to date at revision %d."
7314
msgstr ""
7315
7316
#: bzrlib/switch.py:173
7317
#, python-format
7318
msgid "Updated to revision %d."
7319
msgstr ""
7320
7321
#: bzrlib/transform.py:1723 bzrlib/transform.py:1734 bzrlib/transform.py:1736
7322
msgid "Apply phase"
7323
msgstr ""
7324
7325
#: bzrlib/transform.py:1762 bzrlib/transform.py:1830
7326
msgid "removing file"
7327
msgstr ""
7328
7329
#: bzrlib/transform.py:1780 bzrlib/transform.py:1865
7330
msgid "adding file"
7331
msgstr ""
7332
7333
#: bzrlib/transform.py:2598
7334
msgid "Building tree"
7335
msgstr ""
7336
7337
#: bzrlib/transform.py:2688 bzrlib/transform.py:2715
7338
msgid "Adding file contents"
7339
msgstr ""
7340
7341
#: bzrlib/transform.py:3017
7342
msgid "Resolution pass"
7343
msgstr ""
7344
7345
#: bzrlib/transport/ftp/_gssapi.py:88
7346
#, python-format
7347
msgid "Authenticated as %s"
7348
msgstr ""
7349
7350
#: bzrlib/tree.py:647
7351
msgid "*** {0} content-filter: {1} => {2!r}"
7352
msgstr ""
7353
7354
#: bzrlib/upgrade.py:77
7355
#, python-format
7356
msgid "This is a checkout. The branch (%s) needs to be upgraded separately."
7357
msgstr ""
7358
7359
#: bzrlib/upgrade.py:100
7360
#, python-format
7361
msgid "cannot upgrade from bzrdir format %s"
7362
msgstr ""
7363
7364
#: bzrlib/upgrade.py:103
7365
#, python-format
7366
msgid "starting upgrade of %s"
7367
msgstr ""
7368
7369
#: bzrlib/upgrade.py:110
7370
msgid "finished"
7371
msgstr ""
7372
7373
#: bzrlib/upgrade.py:120
7374
msgid "Deleting backup.bzr"
7375
msgstr ""
7376
7377
#: bzrlib/upgrade.py:151
7378
msgid ""
7379
"\n"
7380
"SUMMARY: {0} upgrades attempted, {1} succeeded, {2} failed"
7381
msgstr ""
7382
7383
#: bzrlib/upgrade.py:208
7384
#, python-format
7385
msgid "Found %d dependent branches - upgrading ..."
7386
msgstr ""
7387
7388
#: bzrlib/upgrade.py:276
7389
msgid "Upgrading bzrdirs"
7390
msgstr ""
7391
7392
#: bzrlib/upgrade.py:282
7393
#, python-format
7394
msgid "Upgrading %s"
7395
msgstr ""
7396
7397
#: bzrlib/upgrade.py:283
7398
msgid "Upgrading {0} {1} ..."
7399
msgstr ""
7400
7401
#: bzrlib/upgrade.py:301
7402
msgid "Removing backup ..."
7403
msgstr ""
7404
7405
#: bzrlib/upgrade.py:305
7406
msgid "failed to clean-up {0}: {1}"
7407
msgstr ""
7408
7409
#: bzrlib/vf_repository.py:1091
7410
msgid "inventories"
7411
msgstr ""
7412
7413
#: bzrlib/vf_repository.py:1117
7414
msgid "texts"
7415
msgstr ""
7416
7417
#: bzrlib/vf_repository.py:1622 bzrlib/vf_repository.py:1631
7418
msgid "Calculating text parents"
7419
msgstr ""
7420
7421
#: bzrlib/vf_repository.py:1707
7422
msgid "Fetch texts"
7423
msgstr ""
7424
7425
#: bzrlib/vf_repository.py:2536
7426
msgid "loading text store"
7427
msgstr ""
7428
7429
#: bzrlib/vf_repository.py:2542
7430
msgid "checking text graph"
7431
msgstr ""
7432
7433
#: bzrlib/vf_repository.py:2998 bzrlib/vf_repository.py:3012
7434
#: bzrlib/vf_repository.py:3127
7435
msgid "Transferring revisions"
7436
msgstr ""
7437
7438
#: bzrlib/win32utils.py:146
7439
msgid "Failed to GetProcessMemoryInfo()"
7440
msgstr ""
7441
7442
#: bzrlib/win32utils.py:167
7443
msgid "Cannot debug memory on win32 without ctypes or win32process"
7444
msgstr ""
7445
7446
#: bzrlib/win32utils.py:172
7447
msgid "WorkingSize {0:>7}KiB\tPeakWorking {1:>7}KiB\t{2}"
7448
msgstr ""
7449
7450
#: bzrlib/win32utils.py:180
7451
#, python-format
7452
msgid "WorkingSize %8d KiB"
7453
msgstr ""
7454
7455
#: bzrlib/win32utils.py:181
7456
#, python-format
7457
msgid "PeakWorking %8d KiB"
7458
msgstr ""
7459
7460
#: bzrlib/win32utils.py:182
7461
#, python-format
7462
msgid "PagefileUsage %8d KiB"
7463
msgstr ""
7464
7465
#: bzrlib/win32utils.py:183
7466
#, python-format
7467
msgid "PeakPagefileUsage %8d KiB"
7468
msgstr ""
7469
7470
#: bzrlib/win32utils.py:185
7471
#, python-format
7472
msgid "PrivateUsage %8d KiB"
7473
msgstr ""
7474
7475
#: bzrlib/win32utils.py:186
7476
#, python-format
7477
msgid "PageFaultCount %8d"
7478
msgstr ""
7479
7480
#: bzrlib/workingtree.py:1482
7481
msgid "Rerun update after fixing the conflicts."
7482
msgstr ""
7483
7484
#: dummy/help_topics/authentication/summary.txt:1
7485
msgid "Information on configuring authentication"
7486
msgstr ""
7487
7488
#: dummy/help_topics/basic/detail.txt:1
7489
msgid ""
7490
"Bazaar 2.6b2 -- a free distributed version-control tool\n"
7491
"http://bazaar.canonical.com/"
7492
msgstr ""
7493
7494
#: dummy/help_topics/basic/detail.txt:4
7495
msgid ""
7496
"Basic commands:\n"
7497
" bzr init makes this directory a versioned branch\n"
7498
" bzr branch make a copy of another branch"
7499
msgstr ""
7500
7501
#: dummy/help_topics/basic/detail.txt:8
7502
msgid ""
7503
" bzr add make files or directories versioned\n"
7504
" bzr ignore ignore a file or pattern\n"
7505
" bzr mv move or rename a versioned file"
7506
msgstr ""
7507
7508
#: dummy/help_topics/basic/detail.txt:12
7509
msgid ""
7510
" bzr status summarize changes in working copy\n"
7511
" bzr diff show detailed diffs"
7512
msgstr ""
7513
7514
#: dummy/help_topics/basic/detail.txt:15
7515
msgid ""
7516
" bzr merge pull in changes from another branch\n"
7517
" bzr commit save some or all changes\n"
7518
" bzr send send changes via email"
7519
msgstr ""
7520
7521
#: dummy/help_topics/basic/detail.txt:19
7522
msgid ""
7523
" bzr log show history of changes\n"
7524
" bzr check validate storage"
7525
msgstr ""
7526
7527
#: dummy/help_topics/basic/detail.txt:22
7528
msgid ""
7529
" bzr help init more help on e.g. init command\n"
7530
" bzr help commands list all commands\n"
7531
" bzr help topics list all help topics\n"
7532
msgstr ""
7533
7534
#: dummy/help_topics/basic/summary.txt:1
7535
msgid "Basic commands"
7536
msgstr ""
7537
7538
#: dummy/help_topics/branches/detail.txt:1
7539
msgid "Branches"
7540
msgstr ""
7541
7542
#: dummy/help_topics/branches/detail.txt:3
7543
msgid ""
7544
"A branch consists of the state of a project, including all of its\n"
7545
"history. All branches have a repository associated (which is where the\n"
7546
"branch history is stored), but multiple branches may share the same\n"
7547
"repository (a shared repository). Branches can be copied and merged."
7548
msgstr ""
7549
7550
#: dummy/help_topics/branches/detail.txt:8
7551
msgid ""
7552
"In addition, one branch may be bound to another one. Binding to another\n"
7553
"branch indicates that commits which happen in this branch must also \n"
7554
"happen in the other branch. Bazaar ensures consistency by not allowing \n"
7555
"commits when the two branches are out of date. In order for a commit \n"
7556
"to succeed, it may be necessary to update the current branch using \n"
7557
"``bzr update``."
7558
msgstr ""
7559
7560
#: dummy/help_topics/branches/detail.txt:15
7561
#: dummy/help_topics/checkouts/detail.txt:66
7562
#: dummy/help_topics/repositories/detail.txt:36
7563
msgid "Related commands::"
7564
msgstr ""
7565
7566
#: dummy/help_topics/branches/detail.txt:17
7567
msgid ""
7568
" init Change a directory into a versioned branch.\n"
7569
" branch Create a new branch that is a copy of an existing branch.\n"
7570
" merge Perform a three-way merge.\n"
7571
" bind Bind a branch to another one.\n"
7572
msgstr ""
7573
7574
#: dummy/help_topics/branches/summary.txt:1
7575
msgid "Information on what a branch is"
7576
msgstr ""
7577
7578
#: dummy/help_topics/bugs/summary.txt:1
7579
msgid "Bug tracker settings"
7580
msgstr ""
7581
7582
#: dummy/help_topics/checkouts/detail.txt:1
7583
msgid "Checkouts"
7584
msgstr ""
7585
7586
#: dummy/help_topics/checkouts/detail.txt:3
7587
msgid ""
7588
"Checkouts are source trees that are connected to a branch, so that when\n"
7589
"you commit in the source tree, the commit goes into that branch. They\n"
7590
"allow you to use a simpler, more centralized workflow, ignoring some of\n"
7591
"Bazaar's decentralized features until you want them. Using checkouts\n"
7592
"with shared repositories is very similar to working with SVN or CVS, but\n"
7593
"doesn't have the same restrictions. And using checkouts still allows\n"
7594
"others working on the project to use whatever workflow they like."
7595
msgstr ""
7596
7597
#: dummy/help_topics/checkouts/detail.txt:11
7598
msgid ""
7599
"A checkout is created with the bzr checkout command (see \"help "
7600
"checkout\").\n"
7601
"You pass it a reference to another branch, and it will create a local copy\n"
7602
"for you that still contains a reference to the branch you created the\n"
7603
"checkout from (the master branch). Then if you make any commits they will "
7604
"be\n"
7605
"made on the other branch first. This creates an instant mirror of your work, "
7606
"or\n"
7607
"facilitates lockstep development, where each developer is working together,\n"
7608
"continuously integrating the changes of others."
7609
msgstr ""
7610
7611
#: dummy/help_topics/checkouts/detail.txt:19
7612
msgid ""
7613
"However the checkout is still a first class branch in Bazaar terms, so that\n"
7614
"you have the full history locally. As you have a first class branch you "
7615
"can\n"
7616
"also commit locally if you want, for instance due to the temporary loss af "
7617
"a\n"
7618
"network connection. Use the --local option to commit to do this. All the "
7619
"local\n"
7620
"commits will then be made on the master branch the next time you do a non-"
7621
"local\n"
7622
"commit."
7623
msgstr ""
7624
7625
#: dummy/help_topics/checkouts/detail.txt:26
7626
msgid ""
7627
"If you are using a checkout from a shared branch you will periodically want "
7628
"to\n"
7629
"pull in all the changes made by others. This is done using the \"update\"\n"
7630
"command. The changes need to be applied before any non-local commit, but\n"
7631
"Bazaar will tell you if there are any changes and suggest that you use this\n"
7632
"command when needed."
7633
msgstr ""
7634
7635
#: dummy/help_topics/checkouts/detail.txt:32
7636
msgid ""
7637
"It is also possible to create a \"lightweight\" checkout by passing the\n"
7638
"--lightweight flag to checkout. A lightweight checkout is even closer to an\n"
7639
"SVN checkout in that it is not a first class branch, it mainly consists of "
7640
"the\n"
7641
"working tree. This means that any history operations must query the master\n"
7642
"branch, which could be slow if a network connection is involved. Also, as "
7643
"you\n"
7644
"don't have a local branch, then you cannot commit locally."
7645
msgstr ""
7646
7647
#: dummy/help_topics/checkouts/detail.txt:39
7648
msgid ""
7649
"Lightweight checkouts work best when you have fast reliable access to the\n"
7650
"master branch. This means that if the master branch is on the same disk or "
7651
"LAN\n"
7652
"a lightweight checkout will be faster than a heavyweight one for any "
7653
"commands\n"
7654
"that modify the revision history (as only one copy of the branch needs to\n"
7655
"be updated). Heavyweight checkouts will generally be faster for any command\n"
7656
"that uses the history but does not change it, but if the master branch is "
7657
"on\n"
7658
"the same disk then there won't be a noticeable difference."
7659
msgstr ""
7660
7661
#: dummy/help_topics/checkouts/detail.txt:47
7662
msgid ""
7663
"Another possible use for a checkout is to use it with a treeless repository\n"
7664
"containing your branches, where you maintain only one working tree by\n"
7665
"switching the master branch that the checkout points to when you want to\n"
7666
"work on a different branch."
7667
msgstr ""
7668
7669
#: dummy/help_topics/checkouts/detail.txt:52
7670
msgid ""
7671
"Obviously to commit on a checkout you need to be able to write to the "
7672
"master\n"
7673
"branch. This means that the master branch must be accessible over a "
7674
"writeable\n"
7675
"protocol , such as sftp://, and that you have write permissions at the "
7676
"other\n"
7677
"end. Checkouts also work on the local file system, so that all that matters "
7678
"is\n"
7679
"file permissions."
7680
msgstr ""
7681
7682
#: dummy/help_topics/checkouts/detail.txt:58
7683
msgid ""
7684
"You can change the master of a checkout by using the \"switch\" command "
7685
"(see\n"
7686
"\"help switch\"). This will change the location that the commits are sent "
7687
"to.\n"
7688
"The \"bind\" command can also be used to turn a normal branch into a heavy\n"
7689
"checkout. If you would like to convert your heavy checkout into a normal\n"
7690
"branch so that every commit is local, you can use the \"unbind\" command. To "
7691
"see\n"
7692
"whether or not a branch is bound or not you can use the \"info\" command. If "
7693
"the\n"
7694
"branch is bound it will tell you the location of the bound branch."
7695
msgstr ""
7696
7697
#: dummy/help_topics/checkouts/detail.txt:68
7698
msgid ""
7699
" checkout Create a checkout. Pass --lightweight to get a lightweight\n"
7700
" checkout\n"
7701
" update Pull any changes in the master branch in to your checkout\n"
7702
" commit Make a commit that is sent to the master branch. If you have\n"
7703
" a heavy checkout then the --local option will commit to the\n"
7704
" checkout without sending the commit to the master\n"
7705
" switch Change the master branch that the commits in the checkout "
7706
"will\n"
7707
" be sent to\n"
7708
" bind Turn a standalone branch into a heavy checkout so that any\n"
7709
" commits will be sent to the master branch\n"
7710
" unbind Turn a heavy checkout into a standalone branch so that any\n"
7711
" commits are only made locally\n"
7712
" info Displays whether a branch is bound or unbound. If the branch "
7713
"is\n"
7714
" bound, then it will also display the location of the bound "
7715
"branch\n"
7716
msgstr ""
7717
7718
#: dummy/help_topics/checkouts/summary.txt:1
7719
msgid "Information on what a checkout is"
7720
msgstr ""
7721
7722
#: dummy/help_topics/commands/summary.txt:1
7723
msgid "Basic help for all commands"
7724
msgstr ""
7725
7726
#: dummy/help_topics/configuration/summary.txt:1
7727
msgid "Details on the configuration settings available"
7728
msgstr ""
7729
7730
#: dummy/help_topics/conflict-types/summary.txt:1
7731
msgid "Types of conflicts and what to do about them"
7732
msgstr ""
7733
7734
#: dummy/help_topics/content-filters/summary.txt:1
7735
msgid "Conversion of content into/from working trees"
7736
msgstr ""
7737
7738
#: dummy/help_topics/criss-cross/detail.txt:1
7739
msgid "Criss-Cross"
7740
msgstr ""
7741
7742
#: dummy/help_topics/criss-cross/detail.txt:3
7743
msgid ""
7744
"A criss-cross in the branch history can cause the default merge technique\n"
7745
"to emit more conflicts than would normally be expected."
7746
msgstr ""
7747
7748
#: dummy/help_topics/criss-cross/detail.txt:6
7749
msgid ""
7750
"In complex merge cases, ``bzr merge --lca`` or ``bzr merge --weave`` may "
7751
"give\n"
7752
"better results. You may wish to ``bzr revert`` the working tree and merge\n"
7753
"again. Alternatively, use ``bzr remerge`` on particular conflicted files."
7754
msgstr ""
7755
7756
#: dummy/help_topics/criss-cross/detail.txt:10
7757
msgid ""
7758
"Criss-crosses occur in a branch's history if two branches merge the same "
7759
"thing\n"
7760
"and then merge one another, or if two branches merge one another at the "
7761
"same\n"
7762
"time. They can be avoided by having each branch only merge from or into a\n"
7763
"designated central branch (a \"star topology\")."
7764
msgstr ""
7765
7766
#: dummy/help_topics/criss-cross/detail.txt:15
7767
msgid ""
7768
"Criss-crosses cause problems because of the way merge works. Bazaar's "
7769
"default\n"
7770
"merge is a three-way merger; in order to merge OTHER into THIS, it must\n"
7771
"find a basis for comparison, BASE. Using BASE, it can determine whether\n"
7772
"differences between THIS and OTHER are due to one side adding lines, or\n"
7773
"from another side removing lines."
7774
msgstr ""
7775
7776
#: dummy/help_topics/criss-cross/detail.txt:21
7777
msgid ""
7778
"Criss-crosses mean there is no good choice for a base. Selecting the "
7779
"recent\n"
7780
"merge points could cause one side's changes to be silently discarded.\n"
7781
"Selecting older merge points (which Bazaar does) mean that extra conflicts\n"
7782
"are emitted."
7783
msgstr ""
7784
7785
#: dummy/help_topics/criss-cross/detail.txt:26
7786
msgid ""
7787
"The ``weave`` merge type is not affected by this problem because it uses\n"
7788
"line-origin detection instead of a basis revision to determine the cause of\n"
7789
"differences.\n"
7790
msgstr ""
7791
7792
#: dummy/help_topics/criss-cross/summary.txt:1
7793
msgid "Information on criss-cross merging"
7794
msgstr ""
7795
7796
#: dummy/help_topics/current-formats/summary.txt:1
7797
msgid "Current storage formats"
7798
msgstr ""
7799
7800
#: dummy/help_topics/debug-flags/summary.txt:1
7801
msgid "Options to show or record debug information"
7802
msgstr ""
7803
7804
#: dummy/help_topics/diverged-branches/summary.txt:1
7805
msgid "How to fix diverged branches"
7806
msgstr ""
7807
7808
#: dummy/help_topics/env-variables/summary.txt:1
7809
msgid "Environment variable names and values"
7810
msgstr ""
7811
7812
#: dummy/help_topics/eol/summary.txt:1
7813
msgid "Information on end-of-line handling"
7814
msgstr ""
7815
7816
#: dummy/help_topics/files/detail.txt:1
7817
msgid "Files"
7818
msgstr ""
7819
7820
#: dummy/help_topics/files/detail.txt:3
7821
msgid ""
7822
":On Unix: ~/.bazaar/bazaar.conf\n"
7823
":On Windows: C:\\\\Documents and Settings\\\\username\\\\Application Data\\\\"
7824
"bazaar\\\\2.0\\\\bazaar.conf"
7825
msgstr ""
7826
7827
#: dummy/help_topics/files/detail.txt:6
7828
msgid ""
7829
"Contains the user's default configuration. The section ``[DEFAULT]`` is\n"
7830
"used to define general configuration that will be applied everywhere.\n"
7831
"The section ``[ALIASES]`` can be used to create command aliases for\n"
7832
"commonly used options."
7833
msgstr ""
7834
7835
#: dummy/help_topics/files/detail.txt:11
7836
msgid "A typical config file might look something like::"
7837
msgstr ""
7838
7839
#: dummy/help_topics/files/detail.txt:13
7840
msgid ""
7841
" [DEFAULT]\n"
7842
" email=John Doe <jdoe@isp.com>"
7843
msgstr ""
7844
7845
#: dummy/help_topics/files/detail.txt:16
7846
msgid ""
7847
" [ALIASES]\n"
7848
" commit = commit --strict\n"
7849
" log10 = log --short -r -10..-1\n"
7850
msgstr ""
7851
7852
#: dummy/help_topics/files/summary.txt:1
7853
msgid "Information on configuration and log files"
7854
msgstr ""
7855
7856
#: dummy/help_topics/formats/detail.txt:1
7857
msgid "Storage Formats"
7858
msgstr ""
7859
7860
#: dummy/help_topics/formats/detail.txt:3
7861
msgid ""
7862
"To ensure that older clients do not access data incorrectly,\n"
7863
"Bazaar's policy is to introduce a new storage format whenever\n"
7864
"new features requiring new metadata are added. New storage\n"
7865
"formats may also be introduced to improve performance and\n"
7866
"scalability."
7867
msgstr ""
7868
7869
#: dummy/help_topics/formats/detail.txt:9
7870
msgid ""
7871
"The newest format, 2a, is highly recommended. If your\n"
7872
"project is not using 2a, then you should suggest to the\n"
7873
"project owner to upgrade."
7874
msgstr ""
7875
7876
#: dummy/help_topics/formats/detail.txt:13
7877
msgid ""
7878
"\n"
7879
".. note::"
7880
msgstr ""
7881
7882
#: dummy/help_topics/formats/detail.txt:16
7883
msgid ""
7884
" Some of the older formats have two variants:\n"
7885
" a plain one and a rich-root one. The latter include an additional\n"
7886
" field about the root of the tree. There is no performance cost\n"
7887
" for using a rich-root format but you cannot easily merge changes\n"
7888
" from a rich-root format into a plain format. As a consequence,\n"
7889
" moving a project to a rich-root format takes some co-ordination\n"
7890
" in that all contributors need to upgrade their repositories\n"
7891
" around the same time. 2a and all future formats will be\n"
7892
" implicitly rich-root."
7893
msgstr ""
7894
7895
#: dummy/help_topics/formats/detail.txt:26
7896
msgid ""
7897
"See :doc:`current-formats-help` for the complete list of\n"
7898
"currently supported formats. See :doc:`other-formats-help` for\n"
7899
"descriptions of any available experimental and deprecated formats.\n"
7900
msgstr ""
7901
7902
#: dummy/help_topics/formats/summary.txt:1
7903
msgid "Information on choosing a storage format"
7904
msgstr ""
7905
7906
#: dummy/help_topics/global-options/detail.txt:1
7907
msgid "Global Options"
7908
msgstr ""
7909
7910
#: dummy/help_topics/global-options/detail.txt:3
7911
msgid ""
7912
"These options may be used with any command, and may appear in front of any\n"
7913
"command. (e.g. ``bzr --profile help``)."
7914
msgstr ""
7915
7916
#: dummy/help_topics/global-options/detail.txt:6
7917
msgid ""
7918
"--version Print the version number. Must be supplied before the "
7919
"command.\n"
7920
"--no-aliases Do not process command aliases when running this command.\n"
7921
"--builtin Use the built-in version of a command, not the plugin "
7922
"version.\n"
7923
" This does not suppress other plugin effects.\n"
7924
"--no-plugins Do not process any plugins.\n"
7925
"--no-l10n Do not translate messages.\n"
7926
"--concurrency Number of processes that can be run concurrently (selftest)."
7927
msgstr ""
7928
7929
#: dummy/help_topics/global-options/detail.txt:14
7930
msgid ""
7931
"--profile Profile execution using the hotshot profiler.\n"
7932
"--lsprof Profile execution using the lsprof profiler.\n"
7933
"--lsprof-file Profile execution using the lsprof profiler, and write the\n"
7934
" results to a specified file. If the filename ends with "
7935
"\".txt\",\n"
7936
" text format will be used. If the filename either starts "
7937
"with\n"
7938
" \"callgrind.out\" or end with \".callgrind\", the output will "
7939
"be\n"
7940
" formatted for use with KCacheGrind. Otherwise, the output\n"
7941
" will be a pickle.\n"
7942
"--coverage Generate line coverage report in the specified directory."
7943
msgstr ""
7944
7945
#: dummy/help_topics/global-options/detail.txt:24
7946
msgid ""
7947
"-Oname=value Override the ``name`` config option setting it to ``value`` "
7948
"for\n"
7949
" the duration of the command. This can be used multiple times "
7950
"if\n"
7951
" several options need to be overridden."
7952
msgstr ""
7953
7954
#: dummy/help_topics/global-options/detail.txt:28
7955
msgid ""
7956
"See http://doc.bazaar.canonical.com/developers/profiling.html for more\n"
7957
"information on profiling."
7958
msgstr ""
7959
7960
#: dummy/help_topics/global-options/detail.txt:31
7961
msgid ""
7962
"A number of debug flags are also available to assist troubleshooting and\n"
7963
"development. See :doc:`debug-flags-help`.\n"
7964
msgstr ""
7965
7966
#: dummy/help_topics/global-options/summary.txt:1
7967
msgid "Options that control how Bazaar runs"
7968
msgstr ""
7969
7970
#: dummy/help_topics/hidden-commands/summary.txt:1
7971
msgid "All hidden commands"
7972
msgstr ""
7973
7974
#: dummy/help_topics/hooks/summary.txt:1
7975
msgid "Points at which custom processing can be added"
7976
msgstr ""
7977
7978
#: dummy/help_topics/launchpad/detail.txt:1
7979
msgid "Integration with Launchpad.net"
7980
msgstr ""
7981
7982
#: dummy/help_topics/launchpad/detail.txt:3
7983
msgid ""
7984
"Launchpad.net provides free Bazaar branch hosting with integrated bug and\n"
7985
"specification tracking."
7986
msgstr ""
7987
7988
#: dummy/help_topics/launchpad/detail.txt:6
7989
msgid ""
7990
"The bzr client (through the plugin called 'launchpad') has special\n"
7991
"features to communicate with Launchpad:"
7992
msgstr ""
7993
7994
#: dummy/help_topics/launchpad/detail.txt:9
7995
msgid ""
7996
" * The launchpad-login command tells Bazaar your Launchpad user name. "
7997
"This\n"
7998
" is then used by the 'lp:' transport to download your branches using\n"
7999
" bzr+ssh://."
8000
msgstr ""
8001
8002
#: dummy/help_topics/launchpad/detail.txt:13
8003
msgid ""
8004
" * The 'lp:' transport uses Launchpad as a directory service: for "
8005
"example\n"
8006
" 'lp:bzr' and 'lp:python' refer to the main branches of the relevant\n"
8007
" projects and may be branched, logged, etc. You can also use the 'lp:'\n"
8008
" transport to refer to specific branches, e.g. lp:~bzr/bzr/trunk."
8009
msgstr ""
8010
8011
#: dummy/help_topics/launchpad/detail.txt:18
8012
msgid ""
8013
" * The 'lp:' bug tracker alias can expand launchpad bug numbers to their\n"
8014
" URLs for use with 'bzr commit --fixes', e.g. 'bzr commit --fixes "
8015
"lp:12345'\n"
8016
" will record a revision property that marks that revision as fixing\n"
8017
" Launchpad bug 12345. When you push that branch to Launchpad it will\n"
8018
" automatically be linked to the bug report."
8019
msgstr ""
8020
8021
#: dummy/help_topics/launchpad/detail.txt:24
8022
msgid ""
8023
" * The register-branch command tells Launchpad about the url of a\n"
8024
" public branch. Launchpad will then mirror the branch, display\n"
8025
" its contents and allow it to be attached to bugs and other\n"
8026
" objects."
8027
msgstr ""
8028
8029
#: dummy/help_topics/launchpad/detail.txt:29
8030
msgid "For more information see http://help.launchpad.net/\n"
8031
msgstr ""
8032
8033
#: dummy/help_topics/launchpad/summary.txt:1
8034
msgid "Using Bazaar with Launchpad.net"
8035
msgstr ""
8036
8037
#: dummy/help_topics/location-alias/summary.txt:1
8038
msgid "Aliases for remembered locations"
8039
msgstr ""
8040
8041
#: dummy/help_topics/log-formats/summary.txt:1
8042
msgid "Details on the logging formats available"
8043
msgstr ""
8044
8045
#: dummy/help_topics/other-formats/summary.txt:1
8046
msgid "Experimental and deprecated storage formats"
8047
msgstr ""
8048
8049
#: dummy/help_topics/patterns/summary.txt:1
8050
msgid "Information on the pattern syntax"
8051
msgstr ""
8052
8053
#: dummy/help_topics/repositories/detail.txt:1
8054
msgid "Repositories"
8055
msgstr ""
8056
8057
#: dummy/help_topics/repositories/detail.txt:3
8058
msgid ""
8059
"Repositories in Bazaar are where committed information is stored. There is\n"
8060
"a repository associated with every branch."
8061
msgstr ""
8062
8063
#: dummy/help_topics/repositories/detail.txt:6
8064
msgid ""
8065
"Repositories are a form of database. Bzr will usually maintain this for\n"
8066
"good performance automatically, but in some situations (e.g. when doing\n"
8067
"very many commits in a short time period) you may want to ask bzr to\n"
8068
"optimise the database indices. This can be done by the 'bzr pack' command."
8069
msgstr ""
8070
8071
#: dummy/help_topics/repositories/detail.txt:11
8072
msgid ""
8073
"By default just running 'bzr init' will create a repository within the new\n"
8074
"branch but it is possible to create a shared repository which allows "
8075
"multiple\n"
8076
"branches to share their information in the same location. When a new branch "
8077
"is\n"
8078
"created it will first look to see if there is a containing shared repository "
8079
"it\n"
8080
"can use."
8081
msgstr ""
8082
8083
#: dummy/help_topics/repositories/detail.txt:17
8084
msgid ""
8085
"When two branches of the same project share a repository, there is\n"
8086
"generally a large space saving. For some operations (e.g. branching\n"
8087
"within the repository) this translates in to a large time saving."
8088
msgstr ""
8089
8090
#: dummy/help_topics/repositories/detail.txt:21
8091
msgid ""
8092
"To create a shared repository use the init-repository command (or the alias\n"
8093
"init-repo). This command takes the location of the repository to create. "
8094
"This\n"
8095
"means that 'bzr init-repository repo' will create a directory named 'repo',\n"
8096
"which contains a shared repository. Any new branches that are created in "
8097
"this\n"
8098
"directory will then use it for storage."
8099
msgstr ""
8100
8101
#: dummy/help_topics/repositories/detail.txt:27
8102
msgid ""
8103
"It is a good idea to create a repository whenever you might create more\n"
8104
"than one branch of a project. This is true for both working areas where you\n"
8105
"are doing the development, and any server areas that you use for hosting\n"
8106
"projects. In the latter case, it is common to want branches without working\n"
8107
"trees. Since the files in the branch will not be edited directly there is "
8108
"no\n"
8109
"need to use up disk space for a working tree. To create a repository in "
8110
"which\n"
8111
"the branches will not have working trees pass the '--no-trees' option to\n"
8112
"'init-repository'."
8113
msgstr ""
8114
8115
#: dummy/help_topics/repositories/detail.txt:38
8116
msgid ""
8117
" init-repository Create a shared repository. Use --no-trees to create "
8118
"one\n"
8119
" in which new branches won't get a working tree.\n"
8120
msgstr ""
8121
8122
#: dummy/help_topics/repositories/summary.txt:1
8123
msgid "Basic information on shared repositories."
8124
msgstr ""
8125
8126
#: dummy/help_topics/revisionspec/summary.txt:1
8127
msgid "Explain how to use --revision"
8128
msgstr ""
8129
8130
#: dummy/help_topics/rules/summary.txt:1
8131
msgid "Information on defining rule-based preferences"
8132
msgstr ""
8133
8134
#: dummy/help_topics/standalone-trees/detail.txt:1
8135
msgid "Standalone Trees"
8136
msgstr ""
8137
8138
#: dummy/help_topics/standalone-trees/detail.txt:3
8139
msgid ""
8140
"A standalone tree is a working tree with an associated repository. It\n"
8141
"is an independently usable branch, with no dependencies on any other.\n"
8142
"Creating a standalone tree (via bzr init) is the quickest way to put\n"
8143
"an existing project under version control."
8144
msgstr ""
8145
8146
#: dummy/help_topics/standalone-trees/detail.txt:8
8147
msgid "Related Commands::"
8148
msgstr ""
8149
8150
#: dummy/help_topics/standalone-trees/detail.txt:10
8151
msgid " init Make a directory into a versioned branch.\n"
8152
msgstr ""
8153
8154
#: dummy/help_topics/standalone-trees/summary.txt:1
8155
msgid "Information on what a standalone tree is"
8156
msgstr ""
8157
8158
#: dummy/help_topics/standard-options/detail.txt:1
8159
msgid "Standard Options"
8160
msgstr ""
8161
8162
#: dummy/help_topics/standard-options/detail.txt:3
8163
msgid "Standard options are legal for all commands."
8164
msgstr ""
8165
8166
#: dummy/help_topics/standard-options/detail.txt:5
8167
msgid ""
8168
"--help, -h Show help message.\n"
8169
"--verbose, -v Display more information.\n"
8170
"--quiet, -q Only display errors and warnings."
8171
msgstr ""
8172
8173
#: dummy/help_topics/standard-options/detail.txt:9
8174
msgid "Unlike global options, standard options can be used in aliases.\n"
8175
msgstr ""
8176
8177
#: dummy/help_topics/standard-options/summary.txt:1
8178
msgid "Options that can be used with any command"
8179
msgstr ""
8180
8181
#: dummy/help_topics/status-flags/detail.txt:1
8182
msgid "Status Flags"
8183
msgstr ""
8184
8185
#: dummy/help_topics/status-flags/detail.txt:3
8186
msgid ""
8187
"Status flags are used to summarise changes to the working tree in a concise\n"
8188
"manner. They are in the form::"
8189
msgstr ""
8190
8191
#: dummy/help_topics/status-flags/detail.txt:6
8192
msgid " xxx <filename>"
8193
msgstr ""
8194
8195
#: dummy/help_topics/status-flags/detail.txt:8
8196
msgid "where the columns' meanings are as follows."
8197
msgstr ""
8198
8199
#: dummy/help_topics/status-flags/detail.txt:10
8200
msgid "Column 1 - versioning/renames::"
8201
msgstr ""
8202
8203
#: dummy/help_topics/status-flags/detail.txt:12
8204
msgid ""
8205
" + File versioned\n"
8206
" - File unversioned\n"
8207
" R File renamed\n"
8208
" ? File unknown\n"
8209
" X File nonexistent (and unknown to bzr)\n"
8210
" C File has conflicts\n"
8211
" P Entry for a pending merge (not a file)"
8212
msgstr ""
8213
8214
#: dummy/help_topics/status-flags/detail.txt:20
8215
msgid "Column 2 - contents::"
8216
msgstr ""
8217
8218
#: dummy/help_topics/status-flags/detail.txt:22
8219
msgid ""
8220
" N File created\n"
8221
" D File deleted\n"
8222
" K File kind changed\n"
8223
" M File modified"
8224
msgstr ""
8225
8226
#: dummy/help_topics/status-flags/detail.txt:27
8227
msgid "Column 3 - execute::"
8228
msgstr ""
8229
8230
#: dummy/help_topics/status-flags/detail.txt:29
8231
msgid " * The execute bit was changed\n"
8232
msgstr ""
8233
8234
#: dummy/help_topics/status-flags/summary.txt:1
8235
msgid "Help on status flags"
8236
msgstr ""
8237
8238
#: dummy/help_topics/sync-for-reconfigure/detail.txt:1
8239
msgid "Branches Out of Sync"
8240
msgstr ""
8241
8242
#: dummy/help_topics/sync-for-reconfigure/detail.txt:3
8243
msgid ""
8244
"When reconfiguring a checkout, tree or branch into a lightweight checkout,\n"
8245
"a local branch must be destroyed. (For checkouts, this is the local branch\n"
8246
"that serves primarily as a cache.) If the branch-to-be-destroyed does not\n"
8247
"have the same last revision as the new reference branch for the lightweight\n"
8248
"checkout, data could be lost, so Bazaar refuses."
8249
msgstr ""
8250
8251
#: dummy/help_topics/sync-for-reconfigure/detail.txt:9
8252
msgid "How you deal with this depends on *why* the branches are out of sync."
8253
msgstr ""
8254
8255
#: dummy/help_topics/sync-for-reconfigure/detail.txt:11
8256
msgid ""
8257
"If you have a checkout and have done local commits, you can get back in "
8258
"sync\n"
8259
"by running \"bzr update\" (and possibly \"bzr commit\")."
8260
msgstr ""
8261
8262
#: dummy/help_topics/sync-for-reconfigure/detail.txt:14
8263
msgid ""
8264
"If you have a branch and the remote branch is out-of-date, you can push\n"
8265
"the local changes using \"bzr push\". If the local branch is out of date, "
8266
"you\n"
8267
"can do \"bzr pull\". If both branches have had changes, you can merge, "
8268
"commit\n"
8269
"and then push your changes. If you decide that some of the changes aren't\n"
8270
"useful, you can \"push --overwrite\" or \"pull --overwrite\" instead.\n"
8271
msgstr ""
8272
8273
#: dummy/help_topics/sync-for-reconfigure/summary.txt:1
8274
msgid "Steps to resolve \"out-of-sync\" when reconfiguring"
8275
msgstr ""
8276
8277
#: dummy/help_topics/topics/summary.txt:1
8278
msgid "Topics list"
8279
msgstr ""
8280
8281
#: dummy/help_topics/url-special-chars/summary.txt:1
8282
msgid "Special character handling in URLs"
8283
msgstr ""
8284
8285
#: dummy/help_topics/urlspec/summary.txt:1
8286
msgid "Supported transport protocols"
8287
msgstr ""
8288
8289
#: dummy/help_topics/working-trees/detail.txt:1
8290
msgid "Working Trees"
8291
msgstr ""
8292
8293
#: dummy/help_topics/working-trees/detail.txt:3
8294
msgid ""
8295
"A working tree is the contents of a branch placed on disk so that you can\n"
8296
"see the files and edit them. The working tree is where you make changes to "
8297
"a\n"
8298
"branch, and when you commit the current state of the working tree is the\n"
8299
"snapshot that is recorded in the commit."
8300
msgstr ""
8301
8302
#: dummy/help_topics/working-trees/detail.txt:8
8303
msgid ""
8304
"When you push a branch to a remote system, a working tree will not be\n"
8305
"created. If one is already present the files will not be updated. The\n"
8306
"branch information will be updated and the working tree will be marked\n"
8307
"as out-of-date. Updating a working tree remotely is difficult, as there\n"
8308
"may be uncommitted changes or the update may cause content conflicts that "
8309
"are\n"
8310
"difficult to deal with remotely."
8311
msgstr ""
8312
8313
#: dummy/help_topics/working-trees/detail.txt:15
8314
msgid ""
8315
"If you have a branch with no working tree you can use the 'checkout' "
8316
"command\n"
8317
"to create a working tree. If you run 'bzr checkout .' from the branch it "
8318
"will\n"
8319
"create the working tree. If the branch is updated remotely, you can update "
8320
"the\n"
8321
"working tree by running 'bzr update' in that directory."
8322
msgstr ""
8323
8324
#: dummy/help_topics/working-trees/detail.txt:20
8325
msgid ""
8326
"If you have a branch with a working tree that you do not want the 'remove-"
8327
"tree'\n"
8328
"command will remove the tree if it is safe. This can be done to avoid the\n"
8329
"warning about the remote working tree not being updated when pushing to the\n"
8330
"branch. It can also be useful when working with a '--no-trees' repository\n"
8331
"(see 'bzr help repositories')."
8332
msgstr ""
8333
8334
#: dummy/help_topics/working-trees/detail.txt:26
8335
msgid ""
8336
"If you want to have a working tree on a remote machine that you push to you\n"
8337
"can either run 'bzr update' in the remote branch after each push, or use "
8338
"some\n"
8339
"other method to update the tree during the push. There is an 'rspush' "
8340
"plugin\n"
8341
"that will update the working tree using rsync as well as doing a push. "
8342
"There\n"
8343
"is also a 'push-and-update' plugin that automates running 'bzr update' via "
8344
"SSH\n"
8345
"after each push."
8346
msgstr ""
8347
8348
#: dummy/help_topics/working-trees/detail.txt:33
8349
msgid "Useful commands::"
8350
msgstr ""
8351
8352
#: dummy/help_topics/working-trees/detail.txt:35
8353
msgid ""
8354
" checkout Create a working tree when a branch does not have one.\n"
8355
" remove-tree Removes the working tree from a branch when it is safe to do "
8356
"so.\n"
8357
" update When a working tree is out of sync with its associated "
8358
"branch\n"
8359
" this will update the tree to match the branch.\n"
8360
msgstr ""
8361
8362
#: dummy/help_topics/working-trees/summary.txt:1
8363
msgid "Information on working trees"
8364
msgstr ""
8365
8366
#: en/help_topics/authentication.txt:1
8367
msgid ""
8368
"Authentication Settings\n"
8369
"======================="
8370
msgstr ""
8371
8372
#: en/help_topics/authentication.txt:4
8373
msgid ""
8374
"\n"
8375
"Intent\n"
8376
"------"
8377
msgstr ""
8378
8379
#: en/help_topics/authentication.txt:8
8380
msgid ""
8381
"Many different authentication policies can be described in the\n"
8382
"``authentication.conf`` file but a particular user should need only a few\n"
8383
"definitions to cover his needs without having to specify a user and a "
8384
"password\n"
8385
"for every branch he uses."
8386
msgstr ""
8387
8388
#: en/help_topics/authentication.txt:13
8389
msgid ""
8390
"The definitions found in this file are used to find the credentials to use "
8391
"for\n"
8392
"a given url. The same credentials can generally be used for as many branches "
8393
"as\n"
8394
"possible by grouping their declaration around the remote servers that need\n"
8395
"them. It's even possible to declare credentials that will be used by "
8396
"different\n"
8397
"servers."
8398
msgstr ""
8399
8400
#: en/help_topics/authentication.txt:19
8401
msgid ""
8402
"The intent is to make this file as small as possible to minimize maintenance."
8403
msgstr ""
8404
8405
#: en/help_topics/authentication.txt:21
8406
msgid ""
8407
"Once the relevant credentials are declared in this file you may use branch "
8408
"urls\n"
8409
"without embedding passwords (security hazard) or even users (enabling "
8410
"sharing\n"
8411
"of your urls with others)."
8412
msgstr ""
8413
8414
#: en/help_topics/authentication.txt:25
8415
msgid "Instead of using::"
8416
msgstr ""
8417
8418
#: en/help_topics/authentication.txt:27
8419
msgid " bzr branch ftp://joe:secret@host.com/path/to/my/branch"
8420
msgstr ""
8421
8422
#: en/help_topics/authentication.txt:29
8423
msgid "you simply use::"
8424
msgstr ""
8425
8426
#: en/help_topics/authentication.txt:31
8427
msgid " bzr branch ftp://host.com/path/to/my/branch"
8428
msgstr ""
8429
8430
#: en/help_topics/authentication.txt:33
8431
msgid ""
8432
"provided you have created the following ``authentication.conf`` file::"
8433
msgstr ""
8434
8435
#: en/help_topics/authentication.txt:35
8436
msgid ""
8437
" [myprojects]\n"
8438
" scheme=ftp\n"
8439
" host=host.com\n"
8440
" user=joe\n"
8441
" password=secret\n"
8442
" "
8443
msgstr ""
8444
8445
#: en/help_topics/authentication.txt:42
8446
msgid ""
8447
"Authentication definitions\n"
8448
"--------------------------"
8449
msgstr ""
8450
8451
#: en/help_topics/authentication.txt:45
8452
msgid ""
8453
"There are two kinds of authentication used by the various schemes supported "
8454
"by\n"
8455
"bzr:"
8456
msgstr ""
8457
8458
#: en/help_topics/authentication.txt:48
8459
msgid "1. user and password"
8460
msgstr ""
8461
8462
#: en/help_topics/authentication.txt:50
8463
msgid ""
8464
"``FTP`` needs a (``user``, ``password``) to authenticate against a ``host``\n"
8465
"``SFTP`` can use either a password or a host key to authenticate. However,\n"
8466
"ssh agents are a better, more secure solution. So we have chosen to not "
8467
"provide\n"
8468
"our own less secure method."
8469
msgstr ""
8470
8471
#: en/help_topics/authentication.txt:55
8472
msgid "2. user, realm and password"
8473
msgstr ""
8474
8475
#: en/help_topics/authentication.txt:57
8476
msgid ""
8477
"``HTTP`` and ``HTTPS`` needs a (``user, realm, password``) to authenticate\n"
8478
"against a host. But, by using ``.htaccess`` files, for example, it is "
8479
"possible\n"
8480
"to define several (``user, realm, password``) for a given ``host``. So what "
8481
"is\n"
8482
"really needed is (``user``, ``password``, ``host``, ``path``). The ``realm`` "
8483
"is\n"
8484
"not taken into account in the definitions, but will displayed if bzr "
8485
"prompts\n"
8486
"you for a password."
8487
msgstr ""
8488
8489
#: en/help_topics/authentication.txt:64
8490
msgid ""
8491
"``HTTP proxy`` can be handled as ``HTTP`` (or ``HTTPS``) by explicitly\n"
8492
"specifying the appropriate port."
8493
msgstr ""
8494
8495
#: en/help_topics/authentication.txt:67
8496
msgid ""
8497
"To take all schemes into account, the password will be deduced from a set "
8498
"of\n"
8499
"authentication definitions (``scheme``, ``host``, ``port``, ``path``, "
8500
"``user``,\n"
8501
"``password``)."
8502
msgstr ""
8503
8504
#: en/help_topics/authentication.txt:71
8505
msgid ""
8506
" * ``scheme``: can be empty (meaning the rest of the definition can be "
8507
"used\n"
8508
" for any scheme), ``SFTP`` and ``bzr+ssh`` should not be used here, "
8509
"``ssh``\n"
8510
" should be used instead since this is the real scheme regarding\n"
8511
" authentication,"
8512
msgstr ""
8513
8514
#: en/help_topics/authentication.txt:76
8515
msgid " * ``host``: can be empty (to act as a default for any host),"
8516
msgstr ""
8517
8518
#: en/help_topics/authentication.txt:78
8519
msgid ""
8520
" * ``port`` can be empty (useful when an host provides several servers for "
8521
"the\n"
8522
" same scheme), only numerical values are allowed, this should be used "
8523
"only\n"
8524
" when the server uses a port different than the scheme standard port,"
8525
msgstr ""
8526
8527
#: en/help_topics/authentication.txt:82
8528
msgid " * ``path``: can be empty (FTP or SFTP will never user it),"
8529
msgstr ""
8530
8531
#: en/help_topics/authentication.txt:84
8532
msgid ""
8533
" * ``user``: can be empty (``bzr`` will defaults to python's\n"
8534
" ``getpass.get_user()``),"
8535
msgstr ""
8536
8537
#: en/help_topics/authentication.txt:87
8538
msgid ""
8539
" * ``password``: can be empty if you prefer to always be prompted for your\n"
8540
" password."
8541
msgstr ""
8542
8543
#: en/help_topics/authentication.txt:90
8544
msgid ""
8545
"Multiple definitions can be provided and, for a given URL, bzr will select "
8546
"a\n"
8547
"(``user`` [, ``password``]) based on the following rules :"
8548
msgstr ""
8549
8550
#: en/help_topics/authentication.txt:93
8551
msgid " 1. the first match wins,"
8552
msgstr ""
8553
8554
#: en/help_topics/authentication.txt:95
8555
msgid " 2. empty fields match everything,"
8556
msgstr ""
8557
8558
#: en/help_topics/authentication.txt:97
8559
msgid ""
8560
" 3. ``scheme`` matches even if decorators are used in the requested URL,"
8561
msgstr ""
8562
8563
#: en/help_topics/authentication.txt:99
8564
msgid ""
8565
" 4. ``host`` matches exactly or act as a domain if it starts with '.'\n"
8566
" (``project.bzr.sf.net`` will match ``.bzr.sf.net`` but "
8567
"``projectbzr.sf.net``\n"
8568
" will not match ``bzr.sf.net``)."
8569
msgstr ""
8570
8571
#: en/help_topics/authentication.txt:103
8572
msgid ""
8573
" 5. ``port`` matches if included in the requested URL (exact matches only)"
8574
msgstr ""
8575
8576
#: en/help_topics/authentication.txt:105
8577
msgid ""
8578
" 6. ``path`` matches if included in the requested URL (and by rule #2 "
8579
"above,\n"
8580
" empty paths will match any provided path)."
8581
msgstr ""
8582
8583
#: en/help_topics/authentication.txt:110
8584
msgid ""
8585
"File format\n"
8586
"-----------"
8587
msgstr ""
8588
8589
#: en/help_topics/authentication.txt:113
8590
msgid ""
8591
"The general rules for :doc:`configuration files <configuration-help>`\n"
8592
"apply except for the variable policies."
8593
msgstr ""
8594
8595
#: en/help_topics/authentication.txt:116
8596
msgid "Each section describes an authentication definition."
8597
msgstr ""
8598
8599
#: en/help_topics/authentication.txt:118
8600
msgid ""
8601
"The section name is an arbitrary string, only the ``DEFAULT`` value is "
8602
"reserved\n"
8603
"and should appear as the *last* section."
8604
msgstr ""
8605
8606
#: en/help_topics/authentication.txt:121
8607
msgid "Each section should define:"
8608
msgstr ""
8609
8610
#: en/help_topics/authentication.txt:123
8611
msgid "* ``user``: the login to be used,"
8612
msgstr ""
8613
8614
#: en/help_topics/authentication.txt:125
8615
msgid "Each section could define:"
8616
msgstr ""
8617
8618
#: en/help_topics/authentication.txt:127
8619
msgid "* ``host``: the remote server,"
8620
msgstr ""
8621
8622
#: en/help_topics/authentication.txt:129
8623
msgid "* ``port``: the port the server is listening,"
8624
msgstr ""
8625
8626
#: en/help_topics/authentication.txt:131
8627
msgid "* ``path``: the branch location,"
8628
msgstr ""
8629
8630
#: en/help_topics/authentication.txt:133
8631
msgid "* ``password``: the password."
8632
msgstr ""
8633
8634
#: en/help_topics/authentication.txt:135
8635
msgid ""
8636
"\n"
8637
"Examples\n"
8638
"--------"
8639
msgstr ""
8640
8641
#: en/help_topics/authentication.txt:139
8642
msgid ""
8643
"\n"
8644
"Personal projects hosted outside\n"
8645
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
8646
msgstr ""
8647
8648
#: en/help_topics/authentication.txt:143
8649
msgid ""
8650
"All connections are done with the same ``user`` (the remote one for which "
8651
"the\n"
8652
"default bzr one is not appropriate) and the password is always prompted "
8653
"with\n"
8654
"some exceptions::"
8655
msgstr ""
8656
8657
#: en/help_topics/authentication.txt:147
8658
msgid ""
8659
" # Pet projects on hobby.net\n"
8660
" [hobby]\n"
8661
" host=r.hobby.net\n"
8662
" user=jim\n"
8663
" password=obvious1234\n"
8664
" \n"
8665
" # Home server\n"
8666
" [home]\n"
8667
" scheme=https\n"
8668
" host=home.net\n"
8669
" user=joe\n"
8670
" password=1essobV10us\n"
8671
" \n"
8672
" [DEFAULT]\n"
8673
" # Our local user is barbaz, on all remote sites we're known as "
8674
"foobar\n"
8675
" user=foobar"
8676
msgstr ""
8677
8678
#: en/help_topics/authentication.txt:164
8679
msgid ""
8680
"\n"
8681
"Source hosting provider\n"
8682
"~~~~~~~~~~~~~~~~~~~~~~~"
8683
msgstr ""
8684
8685
#: en/help_topics/authentication.txt:168
8686
msgid "In the shp.net (fictitious) domain, each project has its own site::"
8687
msgstr ""
8688
8689
#: en/help_topics/authentication.txt:170
8690
msgid ""
8691
" [shpnet domain]\n"
8692
" # we use sftp, but ssh is the scheme used for authentication\n"
8693
" scheme=ssh\n"
8694
" # The leading '.' ensures that 'shp.net' alone doesn't match\n"
8695
" host=.shp.net\n"
8696
" user=joe\n"
8697
" # bzr don't support supplying a password for sftp,\n"
8698
" # consider using an ssh agent if you don't want to supply\n"
8699
" # a password interactively. (pageant, ssh-agent, etc)"
8700
msgstr ""
8701
8702
#: en/help_topics/authentication.txt:180
8703
msgid ""
8704
"HTTPS, SFTP servers and their proxy\n"
8705
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
8706
msgstr ""
8707
8708
#: en/help_topics/authentication.txt:183
8709
msgid ""
8710
"At company.com, the server hosting release and integration branches is "
8711
"behind a\n"
8712
"proxy, and the two branches use different authentication policies::"
8713
msgstr ""
8714
8715
#: en/help_topics/authentication.txt:186
8716
msgid ""
8717
" [reference code]\n"
8718
" scheme=https\n"
8719
" host=dev.company.com\n"
8720
" path=/dev\n"
8721
" user=user1\n"
8722
" password=pass1"
8723
msgstr ""
8724
8725
#: en/help_topics/authentication.txt:193
8726
msgid ""
8727
" # development branches on dev server\n"
8728
" [dev]\n"
8729
" scheme=ssh # bzr+ssh and sftp are available here\n"
8730
" host=dev.company.com\n"
8731
" path=/dev/integration\n"
8732
" user=user2\n"
8733
" \n"
8734
" # proxy\n"
8735
" [proxy]\n"
8736
" scheme=http\n"
8737
" host=proxy.company.com\n"
8738
" port=3128\n"
8739
" user=proxyuser1\n"
8740
" password=proxypass1"
8741
msgstr ""
8742
8743
#: en/help_topics/authentication.txt:208
8744
msgid ""
8745
"\n"
8746
"Planned enhancements\n"
8747
"--------------------"
8748
msgstr ""
8749
8750
#: en/help_topics/authentication.txt:212
8751
msgid ""
8752
"The following are not yet implemented but planned as parts of a work in\n"
8753
"progress:"
8754
msgstr ""
8755
8756
#: en/help_topics/authentication.txt:215
8757
msgid "* add a ``password_encoding`` field allowing:"
8758
msgstr ""
8759
8760
#: en/help_topics/authentication.txt:217
8761
msgid ""
8762
" - storing the passwords in various obfuscating encodings (base64 for one),"
8763
msgstr ""
8764
8765
#: en/help_topics/authentication.txt:219
8766
msgid " - delegate password storage to plugins (.netrc for example)."
8767
msgstr ""
8768
8769
#: en/help_topics/authentication.txt:221
8770
msgid ""
8771
"* update the credentials when the user is prompted for user or password,"
8772
msgstr ""
8773
8774
#: en/help_topics/authentication.txt:223
8775
msgid "* add a ``verify_certificates`` field for ``HTTPS``."
8776
msgstr ""
8777
8778
#: en/help_topics/authentication.txt:225
8779
msgid ""
8780
"The ``password_encoding`` and ``verify_certificates`` fields are recognized "
8781
"but\n"
8782
"ignored in the actual implementation.\n"
8783
msgstr ""
8784
8785
#: en/help_topics/bugs.txt:1
8786
msgid "Bug Tracker Settings"
8787
msgstr ""
8788
8789
#: en/help_topics/bugs.txt:3
8790
msgid ""
8791
"When making a commit, metadata about bugs fixed by that change can be\n"
8792
"recorded by using the ``--fixes`` option. For each bug marked as fixed, an\n"
8793
"entry is included in the 'bugs' revision property stating '<url> <status>'.\n"
8794
"(The only ``status`` value currently supported is ``fixed.``)"
8795
msgstr ""
8796
8797
#: en/help_topics/bugs.txt:8
8798
msgid ""
8799
"The ``--fixes`` option allows you to specify a bug tracker and a bug "
8800
"identifier\n"
8801
"rather than a full URL. This looks like::"
8802
msgstr ""
8803
8804
#: en/help_topics/bugs.txt:11
8805
msgid " bzr commit --fixes <tracker>:<id>"
8806
msgstr ""
8807
8808
#: en/help_topics/bugs.txt:13 en/help_topics/configuration.txt:410
8809
msgid "or::"
8810
msgstr ""
8811
8812
#: en/help_topics/bugs.txt:15
8813
msgid " bzr commit --fixes <id>"
8814
msgstr ""
8815
8816
#: en/help_topics/bugs.txt:17
8817
msgid ""
8818
"where \"<tracker>\" is an identifier for the bug tracker, and \"<id>\" is "
8819
"the\n"
8820
"identifier for that bug within the bugtracker, usually the bug number.\n"
8821
"If \"<tracker>\" is not specified the ``bugtracker`` set in the branch\n"
8822
"or global configuration is used."
8823
msgstr ""
8824
8825
#: en/help_topics/bugs.txt:22
8826
msgid ""
8827
"Bazaar knows about a few bug trackers that have many users. If\n"
8828
"you use one of these bug trackers then there is no setup required to\n"
8829
"use this feature, you just need to know the tracker identifier to use.\n"
8830
"These are the bugtrackers that are built in:"
8831
msgstr ""
8832
8833
#: en/help_topics/bugs.txt:27
8834
msgid ""
8835
" ============================ ============ ============\n"
8836
" URL Abbreviation Example\n"
8837
" ============================ ============ ============\n"
8838
" https://bugs.launchpad.net/ lp lp:12345\n"
8839
" http://bugs.debian.org/ deb deb:12345\n"
8840
" http://bugzilla.gnome.org/ gnome gnome:12345\n"
8841
" ============================ ============ ============"
8842
msgstr ""
8843
8844
#: en/help_topics/bugs.txt:35
8845
msgid ""
8846
"For the bug trackers not listed above configuration is required.\n"
8847
"Support for generating the URLs for any project using Bugzilla or Trac\n"
8848
"is built in, along with a template mechanism for other bugtrackers with\n"
8849
"simple URL schemes. If your bug tracker can't be described by one\n"
8850
"of the schemes described below then you can write a plugin to support\n"
8851
"it."
8852
msgstr ""
8853
8854
#: en/help_topics/bugs.txt:42
8855
msgid ""
8856
"If you use Bugzilla or Trac, then you only need to set a configuration\n"
8857
"variable which contains the base URL of the bug tracker. These options\n"
8858
"can go into ``bazaar.conf``, ``branch.conf`` or into a branch-specific\n"
8859
"configuration section in ``locations.conf``. You can set up these values\n"
8860
"for each of the projects you work on."
8861
msgstr ""
8862
8863
#: en/help_topics/bugs.txt:48
8864
msgid ""
8865
"Note: As you provide a short name for each tracker, you can specify one or\n"
8866
"more bugs in one or more trackers at commit time if you wish."
8867
msgstr ""
8868
8869
#: en/help_topics/bugs.txt:51
8870
msgid ""
8871
"Launchpad\n"
8872
"---------"
8873
msgstr ""
8874
8875
#: en/help_topics/bugs.txt:54
8876
msgid ""
8877
"Use ``bzr commit --fixes lp:2`` to record that this commit fixes bug 2."
8878
msgstr ""
8879
8880
#: en/help_topics/bugs.txt:56
8881
msgid ""
8882
"bugzilla_<tracker>_url\n"
8883
"----------------------"
8884
msgstr ""
8885
8886
#: en/help_topics/bugs.txt:59
8887
msgid ""
8888
"If present, the location of the Bugzilla bug tracker referred to by\n"
8889
"<tracker>. This option can then be used together with ``bzr commit\n"
8890
"--fixes`` to mark bugs in that tracker as being fixed by that commit. For\n"
8891
"example::"
8892
msgstr ""
8893
8894
#: en/help_topics/bugs.txt:64
8895
msgid " bugzilla_squid_url = http://bugs.squid-cache.org"
8896
msgstr ""
8897
8898
#: en/help_topics/bugs.txt:66
8899
msgid ""
8900
"would allow ``bzr commit --fixes squid:1234`` to mark Squid's bug 1234 as\n"
8901
"fixed."
8902
msgstr ""
8903
8904
#: en/help_topics/bugs.txt:69
8905
msgid ""
8906
"trac_<tracker>_url\n"
8907
"------------------"
8908
msgstr ""
8909
8910
#: en/help_topics/bugs.txt:72
8911
msgid ""
8912
"If present, the location of the Trac instance referred to by\n"
8913
"<tracker>. This option can then be used together with ``bzr commit\n"
8914
"--fixes`` to mark bugs in that tracker as being fixed by that commit. For\n"
8915
"example::"
8916
msgstr ""
8917
8918
#: en/help_topics/bugs.txt:77
8919
msgid " trac_twisted_url = http://www.twistedmatrix.com/trac"
8920
msgstr ""
8921
8922
#: en/help_topics/bugs.txt:79
8923
msgid ""
8924
"would allow ``bzr commit --fixes twisted:1234`` to mark Twisted's bug 1234 "
8925
"as\n"
8926
"fixed."
8927
msgstr ""
8928
8929
#: en/help_topics/bugs.txt:82
8930
msgid ""
8931
"bugtracker_<tracker>_url\n"
8932
"------------------------"
8933
msgstr ""
8934
8935
#: en/help_topics/bugs.txt:85
8936
msgid ""
8937
"If present, the location of a generic bug tracker instance referred to by\n"
8938
"<tracker>. The location must contain an ``{id}`` placeholder,\n"
8939
"which will be replaced by a specific bug ID. This option can then be used\n"
8940
"together with ``bzr commit --fixes`` to mark bugs in that tracker as being\n"
8941
"fixed by that commit. For example::"
8942
msgstr ""
8943
8944
#: en/help_topics/bugs.txt:91
8945
msgid " bugtracker_python_url = http://bugs.python.org/issue{id}"
8946
msgstr ""
8947
8948
#: en/help_topics/bugs.txt:93
8949
msgid ""
8950
"would allow ``bzr commit --fixes python:1234`` to mark bug 1234 in Python's\n"
8951
"Roundup bug tracker as fixed, or::"
8952
msgstr ""
8953
8954
#: en/help_topics/bugs.txt:96
8955
msgid ""
8956
" bugtracker_cpan_url = http://rt.cpan.org/Public/Bug/Display.html?id={id}"
8957
msgstr ""
8958
8959
#: en/help_topics/bugs.txt:98
8960
msgid ""
8961
"would allow ``bzr commit --fixes cpan:1234`` to mark bug 1234 in CPAN's\n"
8962
"RT bug tracker as fixed, or::"
8963
msgstr ""
8964
8965
#: en/help_topics/bugs.txt:101
8966
msgid " bugtracker_hudson_url = http://issues.hudson-ci.org/browse/{id}"
8967
msgstr ""
8968
8969
#: en/help_topics/bugs.txt:103
8970
msgid ""
8971
"would allow ``bzr commit --fixes hudson:HUDSON-1234`` to mark bug HUDSON-"
8972
"1234\n"
8973
"in Hudson's JIRA bug tracker as fixed.\n"
8974
msgstr ""
8975
8976
#: en/help_topics/commands.txt:1
8977
msgid ""
8978
"add Add specified files or directories.\n"
8979
"alias Set/unset and display aliases.\n"
8980
"annotate Show the origin of each line in a file.\n"
8981
"bash-completion Generate a shell function for bash command line "
8982
"completion.\n"
8983
" [bash_completion]\n"
8984
"bind Convert the current branch into a checkout of the "
8985
"supplied\n"
8986
" branch.\n"
8987
"branch Create a new branch that is a copy of an existing branch.\n"
8988
"branches List the branches available at the current location.\n"
8989
"break-lock Break a dead lock.\n"
8990
"cat Write the contents of a file as of a given revision to\n"
8991
" standard output.\n"
8992
"check Validate working tree structure, branch consistency and\n"
8993
" repository history.\n"
8994
"checkout Create a new checkout of an existing branch.\n"
8995
"clean-tree Remove unwanted files from working tree.\n"
8996
"commit Commit changes into a new revision.\n"
8997
"config Display, set or remove a configuration option.\n"
8998
"conflicts List files with conflicts.\n"
8999
"deleted List files deleted in the working tree.\n"
9000
"diff Show differences in the working tree, between revisions "
9001
"or\n"
9002
" branches.\n"
9003
"dpush Push into a different VCS without any custom bzr "
9004
"metadata.\n"
9005
"export Export current or past revision to a destination directory "
9006
"or\n"
9007
" archive.\n"
9008
"help Show help on a command or other topic.\n"
9009
"ignore Ignore specified files or patterns.\n"
9010
"ignored List ignored files and the patterns that matched them.\n"
9011
"info Show information about a working tree, branch or "
9012
"repository.\n"
9013
"init Make a directory into a versioned branch.\n"
9014
"init-repository Create a shared repository for branches to share storage\n"
9015
" space.\n"
9016
"join Combine a tree into its containing tree.\n"
9017
"launchpad-login Show or set the Launchpad user ID. [launchpad]\n"
9018
"launchpad-mirror Ask Launchpad to mirror a branch now. [launchpad]\n"
9019
"launchpad-open Open a Launchpad branch page in your web browser. "
9020
"[launchpad]\n"
9021
"log Show historical log for a branch or subset of a branch.\n"
9022
"lp-find-proposal Find the proposal to merge this revision. [launchpad]\n"
9023
"lp-propose-merge Propose merging a branch on Launchpad. [launchpad]\n"
9024
"ls List files in a tree.\n"
9025
"merge Perform a three-way merge.\n"
9026
"missing Show unmerged/unpulled revisions between two branches.\n"
9027
"mkdir Create a new versioned directory.\n"
9028
"mv Move or rename a file.\n"
9029
"nick Print or set the branch nickname.\n"
9030
"pack Compress the data within a repository.\n"
9031
"plugins List the installed plugins.\n"
9032
"pull Turn this branch into a mirror of another branch.\n"
9033
"push Update a mirror of this branch.\n"
9034
"reconcile Reconcile bzr metadata in a branch.\n"
9035
"reconfigure Reconfigure the type of a bzr directory.\n"
9036
"register-branch Register a branch with launchpad.net. [launchpad]\n"
9037
"remerge Redo a merge.\n"
9038
"remove Remove files or directories.\n"
9039
"remove-branch Remove a branch.\n"
9040
"remove-tree Remove the working tree from a given branch/checkout.\n"
9041
"renames Show list of renamed files.\n"
9042
"resolve Mark a conflict as resolved.\n"
9043
"revert Set files in the working tree back to the contents of a\n"
9044
" previous revision.\n"
9045
"revno Show current revision number.\n"
9046
"root Show the tree root directory.\n"
9047
"send Mail or create a merge-directive for submitting changes.\n"
9048
"serve Run the bzr server.\n"
9049
"shelve Temporarily set aside some changes from the current tree.\n"
9050
"sign-my-commits Sign all commits by a given committer.\n"
9051
"split Split a subdirectory of a tree into a separate tree.\n"
9052
"status Display status summary.\n"
9053
"switch Set the branch of a checkout and update.\n"
9054
"tag Create, remove or modify a tag naming a revision.\n"
9055
"tags List tags.\n"
9056
"testament Show testament (signing-form) of a revision.\n"
9057
"unbind Convert the current checkout into a regular branch.\n"
9058
"uncommit Remove the last committed revision.\n"
9059
"unshelve Restore shelved changes.\n"
9060
"update Update a working tree to a new revision.\n"
9061
"upgrade Upgrade a repository, branch or working tree to a newer\n"
9062
" format.\n"
9063
"verify-signatures Verify all commit signatures.\n"
9064
"version Show version of bzr.\n"
9065
"version-info Show version information about this tree.\n"
9066
"view Manage filtered views.\n"
9067
"whoami Show or set bzr user id.\n"
9068
msgstr ""
9069
9070
#: en/help_topics/configuration.txt:1
9071
msgid ""
9072
"Configuration Settings\n"
9073
"======================="
9074
msgstr ""
9075
9076
#: en/help_topics/configuration.txt:4
9077
msgid ""
9078
"Environment settings\n"
9079
"---------------------"
9080
msgstr ""
9081
9082
#: en/help_topics/configuration.txt:7
9083
msgid ""
9084
"While most configuration is handled by configuration files, some options\n"
9085
"which may be semi-permanent can also be controlled through the environment."
9086
msgstr ""
9087
9088
#: en/help_topics/configuration.txt:10
9089
msgid ""
9090
"BZR_EMAIL\n"
9091
"~~~~~~~~~"
9092
msgstr ""
9093
9094
#: en/help_topics/configuration.txt:13
9095
msgid "Override the email id used by Bazaar. Typical format::"
9096
msgstr ""
9097
9098
#: en/help_topics/configuration.txt:15
9099
msgid " \"John Doe <jdoe@example.com>\""
9100
msgstr ""
9101
9102
#: en/help_topics/configuration.txt:17
9103
msgid "See also the ``email`` configuration option."
9104
msgstr ""
9105
9106
#: en/help_topics/configuration.txt:19
9107
msgid ""
9108
"BZR_PROGRESS_BAR\n"
9109
"~~~~~~~~~~~~~~~~"
9110
msgstr ""
9111
9112
#: en/help_topics/configuration.txt:22
9113
msgid ""
9114
"Override the progress display. Possible values are \"none\" or \"text\". "
9115
"If\n"
9116
"the value is \"none\" then no progress bar is displayed. The value \"text\" "
9117
"draws\n"
9118
"the ordinary command line progress bar."
9119
msgstr ""
9120
9121
#: en/help_topics/configuration.txt:26
9122
msgid ""
9123
"BZR_SIGQUIT_PDB\n"
9124
"~~~~~~~~~~~~~~~"
9125
msgstr ""
9126
9127
#: en/help_topics/configuration.txt:29
9128
msgid ""
9129
"Control whether SIGQUIT behaves normally or invokes a breakin debugger."
9130
msgstr ""
9131
9132
#: en/help_topics/configuration.txt:31
9133
msgid ""
9134
"* 0 = Standard SIGQUIT behavior (normally, exit with a core dump)\n"
9135
"* 1 = Invoke breakin debugger (default)"
9136
msgstr ""
9137
9138
#: en/help_topics/configuration.txt:34
9139
msgid ""
9140
"BZR_HOME\n"
9141
"~~~~~~~~"
9142
msgstr ""
9143
9144
#: en/help_topics/configuration.txt:37
9145
msgid "Override the home directory used by Bazaar."
9146
msgstr ""
9147
9148
#: en/help_topics/configuration.txt:39
9149
msgid ""
9150
"BZR_SSH\n"
9151
"~~~~~~~"
9152
msgstr ""
9153
9154
#: en/help_topics/configuration.txt:42
9155
msgid "Select a different SSH implementation."
9156
msgstr ""
9157
9158
#: en/help_topics/configuration.txt:44
9159
msgid ""
9160
"BZR_PDB\n"
9161
"~~~~~~~"
9162
msgstr ""
9163
9164
#: en/help_topics/configuration.txt:47
9165
msgid "Control whether to launch a debugger on error."
9166
msgstr ""
9167
9168
#: en/help_topics/configuration.txt:49
9169
msgid ""
9170
"* 0 = Standard behavior\n"
9171
"* 1 = Launch debugger"
9172
msgstr ""
9173
9174
#: en/help_topics/configuration.txt:52
9175
msgid ""
9176
"BZR_REMOTE_PATH\n"
9177
"~~~~~~~~~~~~~~~"
9178
msgstr ""
9179
9180
#: en/help_topics/configuration.txt:55
9181
msgid "Path to the Bazaar executable to use when using the bzr+ssh protocol."
9182
msgstr ""
9183
9184
#: en/help_topics/configuration.txt:57
9185
msgid "See also the ``bzr_remote_path`` configuration option."
9186
msgstr ""
9187
9188
#: en/help_topics/configuration.txt:59
9189
msgid ""
9190
"BZR_EDITOR\n"
9191
"~~~~~~~~~~"
9192
msgstr ""
9193
9194
#: en/help_topics/configuration.txt:62
9195
msgid "Path to the editor Bazaar should use for commit messages, etc."
9196
msgstr ""
9197
9198
#: en/help_topics/configuration.txt:64
9199
msgid ""
9200
"BZR_LOG\n"
9201
"~~~~~~~"
9202
msgstr ""
9203
9204
#: en/help_topics/configuration.txt:67
9205
msgid ""
9206
"Location of the Bazaar log file. You can check the current location by\n"
9207
"running ``bzr version``."
9208
msgstr ""
9209
9210
#: en/help_topics/configuration.txt:70
9211
msgid ""
9212
"The log file contains debug information that is useful for diagnosing or\n"
9213
"reporting problems with Bazaar."
9214
msgstr ""
9215
9216
#: en/help_topics/configuration.txt:73
9217
msgid ""
9218
"Setting this to ``NUL`` on Windows or ``/dev/null`` on other platforms\n"
9219
"will disable logging."
9220
msgstr ""
9221
9222
#: en/help_topics/configuration.txt:76
9223
msgid ""
9224
"\n"
9225
"BZR_PLUGIN_PATH\n"
9226
"~~~~~~~~~~~~~~~"
9227
msgstr ""
9228
9229
#: en/help_topics/configuration.txt:80
9230
msgid ""
9231
"The path to the plugins directory that Bazaar should use.\n"
9232
"If not set, Bazaar will search for plugins in:"
9233
msgstr ""
9234
9235
#: en/help_topics/configuration.txt:83
9236
msgid ""
9237
"* the user specific plugin directory (containing the ``user`` plugins),"
9238
msgstr ""
9239
9240
#: en/help_topics/configuration.txt:85
9241
msgid "* the bzrlib directory (containing the ``core`` plugins),"
9242
msgstr ""
9243
9244
#: en/help_topics/configuration.txt:87
9245
msgid ""
9246
"* the site specific plugin directory if applicable (containing\n"
9247
" the ``site`` plugins)."
9248
msgstr ""
9249
9250
#: en/help_topics/configuration.txt:90
9251
msgid ""
9252
"If ``BZR_PLUGIN_PATH`` is set in any fashion, it will change the\n"
9253
"the way the plugin are searched. "
9254
msgstr ""
9255
9256
#: en/help_topics/configuration.txt:93
9257
msgid ""
9258
"As for the ``PATH`` variables, if multiple directories are\n"
9259
"specified in ``BZR_PLUGIN_PATH`` they should be separated by the\n"
9260
"platform specific appropriate character (':' on Unix,\n"
9261
"';' on windows)"
9262
msgstr ""
9263
9264
#: en/help_topics/configuration.txt:98
9265
msgid ""
9266
"By default if ``BZR_PLUGIN_PATH`` is set, it replaces searching\n"
9267
"in ``user``. However it will continue to search in ``core`` and\n"
9268
"``site`` unless they are explicitly removed."
9269
msgstr ""
9270
9271
#: en/help_topics/configuration.txt:102
9272
msgid ""
9273
"If you need to change the order or remove one of these\n"
9274
"directories, you should use special values:"
9275
msgstr ""
9276
9277
#: en/help_topics/configuration.txt:105
9278
msgid ""
9279
"* ``-user``, ``-core``, ``-site`` will remove the corresponding\n"
9280
" path from the default values,"
9281
msgstr ""
9282
9283
#: en/help_topics/configuration.txt:108
9284
msgid ""
9285
"* ``+user``, ``+core``, ``+site`` will add the corresponding path\n"
9286
" before the remaining default values (and also remove it from\n"
9287
" the default values)."
9288
msgstr ""
9289
9290
#: en/help_topics/configuration.txt:112
9291
msgid ""
9292
"Note that the special values 'user', 'core' and 'site' should be\n"
9293
"used literally, they will be substituted by the corresponding,\n"
9294
"platform specific, values."
9295
msgstr ""
9296
9297
#: en/help_topics/configuration.txt:116
9298
msgid ""
9299
"The examples below use ':' as the separator, windows users\n"
9300
"should use ';'."
9301
msgstr ""
9302
9303
#: en/help_topics/configuration.txt:119
9304
msgid "Overriding the default user plugin directory::"
9305
msgstr ""
9306
9307
#: en/help_topics/configuration.txt:121
9308
msgid " BZR_PLUGIN_PATH='/path/to/my/other/plugins'"
9309
msgstr ""
9310
9311
#: en/help_topics/configuration.txt:123
9312
msgid "Disabling the site directory while retaining the user directory::"
9313
msgstr ""
9314
9315
#: en/help_topics/configuration.txt:125
9316
msgid " BZR_PLUGIN_PATH='-site:+user'"
9317
msgstr ""
9318
9319
#: en/help_topics/configuration.txt:127
9320
msgid "Disabling all plugins (better achieved with --no-plugins)::"
9321
msgstr ""
9322
9323
#: en/help_topics/configuration.txt:129
9324
msgid " BZR_PLUGIN_PATH='-user:-core:-site'"
9325
msgstr ""
9326
9327
#: en/help_topics/configuration.txt:131
9328
msgid "Overriding the default site plugin directory::"
9329
msgstr ""
9330
9331
#: en/help_topics/configuration.txt:133
9332
msgid " BZR_PLUGIN_PATH='/path/to/my/site/plugins:-site':+user"
9333
msgstr ""
9334
9335
#: en/help_topics/configuration.txt:135
9336
msgid ""
9337
"BZR_DISABLE_PLUGINS\n"
9338
"~~~~~~~~~~~~~~~~~~~"
9339
msgstr ""
9340
9341
#: en/help_topics/configuration.txt:138
9342
msgid ""
9343
"Under special circumstances (mostly when trying to diagnose a\n"
9344
"bug), it's better to disable a plugin (or several) rather than\n"
9345
"uninstalling them completely. Such plugins can be specified in\n"
9346
"the ``BZR_DISABLE_PLUGINS`` environment variable."
9347
msgstr ""
9348
9349
#: en/help_topics/configuration.txt:143
9350
msgid ""
9351
"In that case, ``bzr`` will stop loading the specified plugins and\n"
9352
"will raise an import error if they are explicitly imported (by\n"
9353
"another plugin that depends on them for example)."
9354
msgstr ""
9355
9356
#: en/help_topics/configuration.txt:147
9357
msgid "Disabling ``myplugin`` and ``yourplugin`` is achieved by::"
9358
msgstr ""
9359
9360
#: en/help_topics/configuration.txt:149
9361
msgid " BZR_DISABLE_PLUGINS='myplugin:yourplugin'"
9362
msgstr ""
9363
9364
#: en/help_topics/configuration.txt:151
9365
msgid ""
9366
"BZR_PLUGINS_AT\n"
9367
"~~~~~~~~~~~~~~"
9368
msgstr ""
9369
9370
#: en/help_topics/configuration.txt:154
9371
msgid ""
9372
"When adding a new feature or working on a bug in a plugin,\n"
9373
"developers often need to use a specific version of a given\n"
9374
"plugin. Since python requires that the directory containing the\n"
9375
"code is named like the plugin itself this make it impossible to\n"
9376
"use arbitrary directory names (using a two-level directory scheme\n"
9377
"is inconvenient). ``BZR_PLUGINS_AT`` allows such directories even\n"
9378
"if they don't appear in ``BZR_PLUGIN_PATH`` ."
9379
msgstr ""
9380
9381
#: en/help_topics/configuration.txt:162
9382
msgid ""
9383
"Plugins specified in this environment variable takes precedence\n"
9384
"over the ones in ``BZR_PLUGIN_PATH``."
9385
msgstr ""
9386
9387
#: en/help_topics/configuration.txt:165
9388
msgid ""
9389
"The variable specified a list of ``plugin_name@plugin path``,\n"
9390
"``plugin_name`` being the name of the plugin as it appears in\n"
9391
"python module paths, ``plugin_path`` being the path to the\n"
9392
"directory containing the plugin code itself\n"
9393
"(i.e. ``plugins/myplugin`` not ``plugins``). Use ':' as the list\n"
9394
"separator, use ';' on windows."
9395
msgstr ""
9396
9397
#: en/help_topics/configuration.txt:172
9398
msgid ""
9399
"Example:\n"
9400
"~~~~~~~~"
9401
msgstr ""
9402
9403
#: en/help_topics/configuration.txt:175
9404
msgid ""
9405
"Using a specific version of ``myplugin``:\n"
9406
"``BZR_PLUGINS_AT='myplugin@/home/me/bugfixes/123456-myplugin``"
9407
msgstr ""
9408
9409
#: en/help_topics/configuration.txt:178
9410
msgid ""
9411
"BZRPATH\n"
9412
"~~~~~~~"
9413
msgstr ""
9414
9415
#: en/help_topics/configuration.txt:181
9416
msgid "The path where Bazaar should look for shell plugin external commands."
9417
msgstr ""
9418
9419
#: en/help_topics/configuration.txt:183
9420
msgid ""
9421
"\n"
9422
"http_proxy, https_proxy\n"
9423
"~~~~~~~~~~~~~~~~~~~~~~~"
9424
msgstr ""
9425
9426
#: en/help_topics/configuration.txt:187
9427
msgid "Specifies the network proxy for outgoing connections, for example::"
9428
msgstr ""
9429
9430
#: en/help_topics/configuration.txt:189
9431
msgid ""
9432
" http_proxy=http://proxy.example.com:3128/ \n"
9433
" https_proxy=http://proxy.example.com:3128/"
9434
msgstr ""
9435
9436
#: en/help_topics/configuration.txt:192
9437
msgid ""
9438
"\n"
9439
"Configuration files\n"
9440
"-------------------"
9441
msgstr ""
9442
9443
#: en/help_topics/configuration.txt:196
9444
msgid ""
9445
"Location\n"
9446
"~~~~~~~~"
9447
msgstr ""
9448
9449
#: en/help_topics/configuration.txt:199
9450
msgid ""
9451
"Configuration files are located in ``$HOME/.bazaar`` on Unix and\n"
9452
"``C:\\Documents and Settings\\<username>\\Application Data\\Bazaar\\2.0`` "
9453
"on\n"
9454
"Windows. (You can check the location for your system by using\n"
9455
"``bzr version``.)"
9456
msgstr ""
9457
9458
#: en/help_topics/configuration.txt:204
9459
msgid "There are three primary configuration files in this location:"
9460
msgstr ""
9461
9462
#: en/help_topics/configuration.txt:206
9463
msgid "* ``bazaar.conf`` describes default configuration options,"
9464
msgstr ""
9465
9466
#: en/help_topics/configuration.txt:208
9467
msgid ""
9468
"* ``locations.conf`` describes configuration information for\n"
9469
" specific branch locations,"
9470
msgstr ""
9471
9472
#: en/help_topics/configuration.txt:211
9473
msgid ""
9474
"* ``authentication.conf`` describes credential information for\n"
9475
" remote servers."
9476
msgstr ""
9477
9478
#: en/help_topics/configuration.txt:214
9479
msgid ""
9480
"Each branch can also contain a configuration file that sets values specific\n"
9481
"to that branch. This file is found at ``.bzr/branch/branch.conf`` within "
9482
"the\n"
9483
"branch. This file is visible to all users of a branch, if you wish to "
9484
"override\n"
9485
"one of the values for a branch with a setting that is specific to you then "
9486
"you\n"
9487
"can do so in ``locations.conf``."
9488
msgstr ""
9489
9490
#: en/help_topics/configuration.txt:220
9491
msgid ""
9492
"General format\n"
9493
"~~~~~~~~~~~~~~"
9494
msgstr ""
9495
9496
#: en/help_topics/configuration.txt:223
9497
msgid ""
9498
"An ini file has three types of contructs: section headers, section\n"
9499
"options and comments."
9500
msgstr ""
9501
9502
#: en/help_topics/configuration.txt:226
9503
msgid ""
9504
"Comments\n"
9505
"^^^^^^^^"
9506
msgstr ""
9507
9508
#: en/help_topics/configuration.txt:229
9509
msgid ""
9510
"A comment is any line that starts with a \"#\" (sometimes called a \"hash\n"
9511
"mark\", \"pound sign\" or \"number sign\"). Comment lines are ignored by\n"
9512
"Bazaar when parsing ini files."
9513
msgstr ""
9514
9515
#: en/help_topics/configuration.txt:233
9516
msgid ""
9517
"Section headers\n"
9518
"^^^^^^^^^^^^^^^"
9519
msgstr ""
9520
9521
#: en/help_topics/configuration.txt:236
9522
msgid ""
9523
"A section header is a word enclosed in brackets that starts at the begining\n"
9524
"of a line. A typical section header looks like this::"
9525
msgstr ""
9526
9527
#: en/help_topics/configuration.txt:239
9528
msgid " [DEFAULT]"
9529
msgstr ""
9530
9531
#: en/help_topics/configuration.txt:241
9532
msgid ""
9533
"The only valid section headers for bazaar.conf currently are [DEFAULT] and\n"
9534
"[ALIASES]. Section headers are case sensitive. The default section provides "
9535
"for\n"
9536
"setting options which can be overridden with the branch config file."
9537
msgstr ""
9538
9539
#: en/help_topics/configuration.txt:245
9540
msgid ""
9541
"For ``locations.conf``, the options from the section with the\n"
9542
"longest matching section header are used to the exclusion of other\n"
9543
"potentially valid section headers. A section header uses the path for\n"
9544
"the branch as the section header. Some examples include::"
9545
msgstr ""
9546
9547
#: en/help_topics/configuration.txt:250
9548
msgid ""
9549
" [http://mybranches.isp.com/~jdoe/branchdir]\n"
9550
" [/home/jdoe/branches/]"
9551
msgstr ""
9552
9553
#: en/help_topics/configuration.txt:253
9554
msgid ""
9555
"\n"
9556
"Section options\n"
9557
"^^^^^^^^^^^^^^^"
9558
msgstr ""
9559
9560
#: en/help_topics/configuration.txt:257
9561
msgid ""
9562
"A section option resides within a section. A section option contains an\n"
9563
"option name, an equals sign and a value. For example::"
9564
msgstr ""
9565
9566
#: en/help_topics/configuration.txt:260
9567
msgid ""
9568
" email = John Doe <jdoe@isp.com>\n"
9569
" gpg_signing_key = Amy Pond <amy@example.com>"
9570
msgstr ""
9571
9572
#: en/help_topics/configuration.txt:263
9573
msgid ""
9574
"A option can reference other options by enclosing them in curly brackets::"
9575
msgstr ""
9576
9577
#: en/help_topics/configuration.txt:265
9578
msgid ""
9579
" my_branch_name = feature_x\n"
9580
" my_server = bzr+ssh://example.com\n"
9581
" push_location = {my_server}/project/{my_branch_name}"
9582
msgstr ""
9583
9584
#: en/help_topics/configuration.txt:269
9585
msgid ""
9586
"Option policies\n"
9587
"^^^^^^^^^^^^^^^"
9588
msgstr ""
9589
9590
#: en/help_topics/configuration.txt:272
9591
msgid ""
9592
"Options defined in a section affect the named directory or URL plus\n"
9593
"any locations they contain. Policies can be used to change how an\n"
9594
"option value is interpreted for contained locations. Currently\n"
9595
"there are three policies available:"
9596
msgstr ""
9597
9598
#: en/help_topics/configuration.txt:277
9599
msgid ""
9600
" none:\n"
9601
" the value is interpreted the same for contained locations. This is\n"
9602
" the default behaviour.\n"
9603
" norecurse:\n"
9604
" the value is only used for the exact location specified by the\n"
9605
" section name.\n"
9606
" appendpath:\n"
9607
" for contained locations, any additional path components are\n"
9608
" appended to the value."
9609
msgstr ""
9610
9611
#: en/help_topics/configuration.txt:287
9612
msgid ""
9613
"Policies are specified by keys with names of the form "
9614
"\"<option_name>:policy\".\n"
9615
"For example, to define the push location for a tree of branches, the\n"
9616
"following could be used::"
9617
msgstr ""
9618
9619
#: en/help_topics/configuration.txt:291
9620
msgid ""
9621
" [/top/location]\n"
9622
" push_location = sftp://example.com/location\n"
9623
" push_location:policy = appendpath"
9624
msgstr ""
9625
9626
#: en/help_topics/configuration.txt:295
9627
msgid ""
9628
"With this configuration, the push location for ``/top/location/branch1``\n"
9629
"would be ``sftp://example.com/location/branch1``."
9630
msgstr ""
9631
9632
#: en/help_topics/configuration.txt:298
9633
msgid ""
9634
"Section local options\n"
9635
"^^^^^^^^^^^^^^^^^^^^^"
9636
msgstr ""
9637
9638
#: en/help_topics/configuration.txt:301
9639
msgid ""
9640
"Some options are defined automatically inside a given section and can be\n"
9641
"refered to in this section only. "
9642
msgstr ""
9643
9644
#: en/help_topics/configuration.txt:304
9645
msgid "For example, the ``appendpath`` policy can be used like this::"
9646
msgstr ""
9647
9648
#: en/help_topics/configuration.txt:306
9649
msgid ""
9650
" [/home/vila/src/bzr/bugs]\n"
9651
" mypush = lp:~vila/bzr\n"
9652
" mypush:policy=appendpath"
9653
msgstr ""
9654
9655
#: en/help_topics/configuration.txt:310
9656
msgid "Using ``relpath`` to achieve the same result is done like this::"
9657
msgstr ""
9658
9659
#: en/help_topics/configuration.txt:312
9660
msgid ""
9661
" [/home/vila/src/bzr/bugs]\n"
9662
" mypush = lp:~vila/bzr/{relpath}"
9663
msgstr ""
9664
9665
#: en/help_topics/configuration.txt:315
9666
msgid ""
9667
"In both cases, when used in a directory like\n"
9668
"``/home/vila/src/bzr/bugs/832013-expand-in-stack`` we'll get::"
9669
msgstr ""
9670
9671
#: en/help_topics/configuration.txt:318 en/help_topics/configuration.txt:329
9672
msgid ""
9673
" $ bzr config mypush\n"
9674
" lp:~vila/bzr/832013-expand-in-stack"
9675
msgstr ""
9676
9677
#: en/help_topics/configuration.txt:321
9678
msgid "Another such option is ``basename`` which can be used like this::"
9679
msgstr ""
9680
9681
#: en/help_topics/configuration.txt:323
9682
msgid ""
9683
" [/home/vila/src/bzr]\n"
9684
" mypush = lp:~vila/bzr/{basename}"
9685
msgstr ""
9686
9687
#: en/help_topics/configuration.txt:326
9688
msgid ""
9689
"When used in a directory like\n"
9690
"``/home/vila/src/bzr/bugs/832013-expand-in-stack`` we'll get::"
9691
msgstr ""
9692
9693
#: en/help_topics/configuration.txt:332
9694
msgid ""
9695
"Note that ``basename`` here refers to the base name of ``relpath`` which\n"
9696
"itself is defined as the relative path between the section name and the\n"
9697
"location it matches."
9698
msgstr ""
9699
9700
#: en/help_topics/configuration.txt:336
9701
msgid ""
9702
"Another such option is ``branchname``, which refers to the name of a "
9703
"colocated\n"
9704
"branch. For non-colocated branches, it behaves like basename. It can be "
9705
"used\n"
9706
"like this::"
9707
msgstr ""
9708
9709
#: en/help_topics/configuration.txt:340
9710
msgid ""
9711
" [/home/vila/src/bzr/bugs]\n"
9712
" mypush = lp:~vila/bzr/{branchname}"
9713
msgstr ""
9714
9715
#: en/help_topics/configuration.txt:343
9716
msgid ""
9717
"When used with a colocated branch named ``832013-expand-in-stack``, we'll "
9718
"get::"
9719
msgstr ""
9720
9721
#: en/help_topics/configuration.txt:345
9722
msgid ""
9723
" bzr config mypush\n"
9724
" lp:~vila/bzr/832013-expand-in-stack"
9725
msgstr ""
9726
9727
#: en/help_topics/configuration.txt:348
9728
msgid ""
9729
"When an option is local to a Section, it cannot be referred to from option\n"
9730
"values in any other section from the same ``Store`` nor from any other\n"
9731
"``Store``."
9732
msgstr ""
9733
9734
#: en/help_topics/configuration.txt:352
9735
msgid ""
9736
"\n"
9737
"The main configuration file, bazaar.conf\n"
9738
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
9739
msgstr ""
9740
9741
#: en/help_topics/configuration.txt:356
9742
msgid ""
9743
"``bazaar.conf`` allows two sections: ``[DEFAULT]`` and ``[ALIASES]``.\n"
9744
"The default section contains the default\n"
9745
"configuration options for all branches. The default section can be\n"
9746
"overriden by providing a branch-specific section in ``locations.conf``."
9747
msgstr ""
9748
9749
#: en/help_topics/configuration.txt:361
9750
msgid "A typical ``bazaar.conf`` section often looks like the following::"
9751
msgstr ""
9752
9753
#: en/help_topics/configuration.txt:363
9754
msgid ""
9755
" [DEFAULT]\n"
9756
" email = John Doe <jdoe@isp.com>\n"
9757
" editor = /usr/bin/vim\n"
9758
" create_signatures = when-required"
9759
msgstr ""
9760
9761
#: en/help_topics/configuration.txt:368
9762
msgid ""
9763
"\n"
9764
"The branch location configuration file, locations.conf\n"
9765
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
9766
msgstr ""
9767
9768
#: en/help_topics/configuration.txt:372
9769
msgid ""
9770
"``locations.conf`` allows one to specify overriding settings for\n"
9771
"a specific branch. The format is almost identical to the default section in\n"
9772
"bazaar.conf with one significant change: The section header, instead of "
9773
"saying\n"
9774
"default, will be the path to a branch that you wish to override a value\n"
9775
"for. The '?' and '*' wildcards are supported::"
9776
msgstr ""
9777
9778
#: en/help_topics/configuration.txt:378
9779
msgid ""
9780
" [/home/jdoe/branches/nethack]\n"
9781
" email = Nethack Admin <nethack@nethack.com>"
9782
msgstr ""
9783
9784
#: en/help_topics/configuration.txt:381
9785
msgid ""
9786
" [http://hypothetical.site.com/branches/devel-branch]\n"
9787
" create_signatures = always"
9788
msgstr ""
9789
9790
#: en/help_topics/configuration.txt:384
9791
msgid ""
9792
"The authentication configuration file, authentication.conf\n"
9793
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
9794
msgstr ""
9795
9796
#: en/help_topics/configuration.txt:387
9797
msgid ""
9798
"``authentication.conf`` allows one to specify credentials for\n"
9799
"remote servers. This can be used for all the supported transports and any "
9800
"part\n"
9801
"of bzr that requires authentication (smtp for example)."
9802
msgstr ""
9803
9804
#: en/help_topics/configuration.txt:391
9805
msgid ""
9806
"The syntax of the file obeys the same rules as the others except for the\n"
9807
"option policies which don't apply."
9808
msgstr ""
9809
9810
#: en/help_topics/configuration.txt:394
9811
msgid ""
9812
"For more information on the possible uses of the authentication "
9813
"configuration\n"
9814
"file see :doc:`authentication-help`."
9815
msgstr ""
9816
9817
#: en/help_topics/configuration.txt:397
9818
msgid ""
9819
"\n"
9820
"Common options\n"
9821
"--------------"
9822
msgstr ""
9823
9824
#: en/help_topics/configuration.txt:401
9825
msgid ""
9826
"debug_flags\n"
9827
"~~~~~~~~~~~"
9828
msgstr ""
9829
9830
#: en/help_topics/configuration.txt:404
9831
msgid ""
9832
"A comma-separated list of debugging options to turn on. The same values\n"
9833
"can be used as with the -D command-line option (see `help global-options`).\n"
9834
"For example::"
9835
msgstr ""
9836
9837
#: en/help_topics/configuration.txt:408
9838
msgid " debug_flags = hpss"
9839
msgstr ""
9840
9841
#: en/help_topics/configuration.txt:412
9842
msgid " debug_flags = hpss,evil"
9843
msgstr ""
9844
9845
#: en/help_topics/configuration.txt:414
9846
msgid ""
9847
"email\n"
9848
"~~~~~"
9849
msgstr ""
9850
9851
#: en/help_topics/configuration.txt:417
9852
msgid ""
9853
"The email address to use when committing a branch. Typically takes the form\n"
9854
"of::"
9855
msgstr ""
9856
9857
#: en/help_topics/configuration.txt:420
9858
msgid " email = Full Name <account@hostname.tld>"
9859
msgstr ""
9860
9861
#: en/help_topics/configuration.txt:422
9862
msgid ""
9863
"editor\n"
9864
"~~~~~~"
9865
msgstr ""
9866
9867
#: en/help_topics/configuration.txt:425
9868
msgid ""
9869
"The path of the editor that you wish to use if *bzr commit* is run without\n"
9870
"a commit message. This setting is trumped by the environment variable\n"
9871
"``BZR_EDITOR``, and overrides the ``VISUAL`` and ``EDITOR`` environment\n"
9872
"variables."
9873
msgstr ""
9874
9875
#: en/help_topics/configuration.txt:430
9876
msgid ""
9877
"log_format\n"
9878
"~~~~~~~~~~"
9879
msgstr ""
9880
9881
#: en/help_topics/configuration.txt:433
9882
msgid ""
9883
"The default log format to use. Standard log formats are ``long``, ``short``\n"
9884
"and ``line``. Additional formats may be provided by plugins. The default\n"
9885
"value is ``long``."
9886
msgstr ""
9887
9888
#: en/help_topics/configuration.txt:437
9889
msgid ""
9890
"check_signatures\n"
9891
"~~~~~~~~~~~~~~~~"
9892
msgstr ""
9893
9894
#: en/help_topics/configuration.txt:440
9895
msgid ""
9896
"Reserved for future use. These options will allow a policy for branches to\n"
9897
"require signatures."
9898
msgstr ""
9899
9900
#: en/help_topics/configuration.txt:443
9901
msgid ""
9902
"require\n"
9903
" The gnupg signature for revisions must be present and must be valid."
9904
msgstr ""
9905
9906
#: en/help_topics/configuration.txt:446
9907
msgid ""
9908
"ignore\n"
9909
" Do not check gnupg signatures of revisions."
9910
msgstr ""
9911
9912
#: en/help_topics/configuration.txt:449
9913
msgid ""
9914
"check-available\n"
9915
" (default) If gnupg signatures for revisions are present, check them.\n"
9916
" Bazaar will fail if it finds a bad signature, but will not fail if\n"
9917
" no signature is present."
9918
msgstr ""
9919
9920
#: en/help_topics/configuration.txt:454
9921
msgid ""
9922
"create_signatures\n"
9923
"~~~~~~~~~~~~~~~~~"
9924
msgstr ""
9925
9926
#: en/help_topics/configuration.txt:457
9927
msgid ""
9928
"Defines the behaviour of signing revisions on commits. By default bzr will "
9929
"not\n"
9930
"sign new commits."
9931
msgstr ""
9932
9933
#: en/help_topics/configuration.txt:460
9934
msgid ""
9935
"always\n"
9936
" Sign every new revision that is committed. If the signing fails then "
9937
"the\n"
9938
" commit will not be made."
9939
msgstr ""
9940
9941
#: en/help_topics/configuration.txt:464
9942
msgid ""
9943
"when-required\n"
9944
" Reserved for future use."
9945
msgstr ""
9946
9947
#: en/help_topics/configuration.txt:467
9948
msgid ""
9949
"never\n"
9950
" Reserved for future use."
9951
msgstr ""
9952
9953
#: en/help_topics/configuration.txt:470
9954
msgid ""
9955
"In future it is planned that ``when-required`` will sign newly\n"
9956
"committed revisions only when the branch requires them. ``never`` will "
9957
"refuse\n"
9958
"to sign newly committed revisions, even if the branch requires signatures."
9959
msgstr ""
9960
9961
#: en/help_topics/configuration.txt:474
9962
msgid ""
9963
"dirstate.fdatasync\n"
9964
"~~~~~~~~~~~~~~~~~~"
9965
msgstr ""
9966
9967
#: en/help_topics/configuration.txt:477
9968
msgid ""
9969
"If true (default), working tree metadata changes are flushed through the\n"
9970
"OS buffers to physical disk. This is somewhat slower, but means data\n"
9971
"should not be lost if the machine crashes. See also repository.fdatasync."
9972
msgstr ""
9973
9974
#: en/help_topics/configuration.txt:481
9975
msgid ""
9976
"gpg_signing_key\n"
9977
"~~~~~~~~~~~~~~~"
9978
msgstr ""
9979
9980
#: en/help_topics/configuration.txt:484
9981
msgid ""
9982
"The GnuPG user identity to use when signing commits. Can be an e-mail\n"
9983
"address, key fingerprint or full key ID. When unset or when set to\n"
9984
"\"default\" Bazaar will use the user e-mail set with ``whoami``."
9985
msgstr ""
9986
9987
#: en/help_topics/configuration.txt:488
9988
msgid ""
9989
"recurse\n"
9990
"~~~~~~~"
9991
msgstr ""
9992
9993
#: en/help_topics/configuration.txt:491
9994
msgid ""
9995
"Only useful in ``locations.conf``. Defines whether or not the\n"
9996
"configuration for this section applies to subdirectories:"
9997
msgstr ""
9998
9999
#: en/help_topics/configuration.txt:494
10000
msgid ""
10001
"true\n"
10002
" (default) This section applies to subdirectories as well."
10003
msgstr ""
10004
10005
#: en/help_topics/configuration.txt:497
10006
msgid ""
10007
"false\n"
10008
" This section only applies to the branch at this directory and not\n"
10009
" branches below it."
10010
msgstr ""
10011
10012
#: en/help_topics/configuration.txt:501
10013
msgid ""
10014
"gpg_signing_command\n"
10015
"~~~~~~~~~~~~~~~~~~~"
10016
msgstr ""
10017
10018
#: en/help_topics/configuration.txt:504
10019
msgid ""
10020
"(Default: \"gpg\"). Which program should be used to sign and check "
10021
"revisions.\n"
10022
"For example::"
10023
msgstr ""
10024
10025
#: en/help_topics/configuration.txt:507
10026
msgid " gpg_signing_command = /usr/bin/gnpg"
10027
msgstr ""
10028
10029
#: en/help_topics/configuration.txt:509
10030
msgid ""
10031
"The specified command must accept the options \"--clearsign\" and \"-u "
10032
"<email>\"."
10033
msgstr ""
10034
10035
#: en/help_topics/configuration.txt:511
10036
msgid ""
10037
"bzr_remote_path\n"
10038
"~~~~~~~~~~~~~~~"
10039
msgstr ""
10040
10041
#: en/help_topics/configuration.txt:514
10042
msgid ""
10043
"(Default: \"bzr\"). The path to the command that should be used to run the "
10044
"smart\n"
10045
"server for bzr. This value may only be specified in locations.conf, because:"
10046
msgstr ""
10047
10048
#: en/help_topics/configuration.txt:517
10049
msgid ""
10050
"- it's needed before branch.conf is accessible\n"
10051
"- allowing remote branch.conf files to specify commands would be a security\n"
10052
" risk"
10053
msgstr ""
10054
10055
#: en/help_topics/configuration.txt:521
10056
msgid "It is overridden by the BZR_REMOTE_PATH environment variable."
10057
msgstr ""
10058
10059
#: en/help_topics/configuration.txt:523
10060
msgid ""
10061
"smtp_server\n"
10062
"~~~~~~~~~~~"
10063
msgstr ""
10064
10065
#: en/help_topics/configuration.txt:526
10066
msgid ""
10067
"(Default: \"localhost\"). SMTP server to use when Bazaar needs to send\n"
10068
"email, eg. with ``merge-directive --mail-to``, or the bzr-email plugin."
10069
msgstr ""
10070
10071
#: en/help_topics/configuration.txt:529
10072
msgid ""
10073
"smtp_username, smtp_password\n"
10074
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
10075
msgstr ""
10076
10077
#: en/help_topics/configuration.txt:532
10078
msgid ""
10079
"User and password to authenticate to the SMTP server. If smtp_username\n"
10080
"is set, and smtp_password is not, Bazaar will prompt for a password.\n"
10081
"These settings are only needed if the SMTP server requires authentication\n"
10082
"to send mail."
10083
msgstr ""
10084
10085
#: en/help_topics/configuration.txt:537
10086
msgid ""
10087
"locks.steal_dead\n"
10088
"~~~~~~~~~~~~~~~~"
10089
msgstr ""
10090
10091
#: en/help_topics/configuration.txt:540
10092
msgid ""
10093
"If set to true, bzr will automatically break locks held by processes from\n"
10094
"the same machine and user that are no longer alive. Otherwise, it will\n"
10095
"print a message and you can break the lock manually, if you are satisfied\n"
10096
"the object is no longer in use."
10097
msgstr ""
10098
10099
#: en/help_topics/configuration.txt:545
10100
msgid ""
10101
"mail_client\n"
10102
"~~~~~~~~~~~"
10103
msgstr ""
10104
10105
#: en/help_topics/configuration.txt:548
10106
msgid ""
10107
"A mail client to use for sending merge requests.\n"
10108
"By default, bzr will try to use ``mapi`` on Windows. On other platforms, "
10109
"it\n"
10110
"will try ``xdg-email``. If either of these fails, it will fall back to\n"
10111
"``editor``."
10112
msgstr ""
10113
10114
#: en/help_topics/configuration.txt:553
10115
msgid "Supported values for specific clients:"
10116
msgstr ""
10117
10118
#: en/help_topics/configuration.txt:555
10119
msgid ""
10120
":claws: Use Claws. This skips a dialog for attaching files.\n"
10121
":evolution: Use Evolution.\n"
10122
":kmail: Use KMail.\n"
10123
":mutt: Use Mutt.\n"
10124
":thunderbird: Use Mozilla Thunderbird or Icedove. For Thunderbird/Icedove "
10125
"1.5,\n"
10126
" this works around some bugs that xdg-email doesn't handle."
10127
msgstr ""
10128
10129
#: en/help_topics/configuration.txt:562
10130
msgid "Supported generic values are:"
10131
msgstr ""
10132
10133
#: en/help_topics/configuration.txt:564
10134
msgid ""
10135
":default: See above.\n"
10136
":editor: Use your editor to compose the merge request. This also uses\n"
10137
" your commit id, (see ``bzr whoami``), smtp_server and (optionally)\n"
10138
" smtp_username and smtp_password.\n"
10139
":mapi: Use your preferred e-mail client on Windows.\n"
10140
":xdg-email: Use xdg-email to run your preferred mail program"
10141
msgstr ""
10142
10143
#: en/help_topics/configuration.txt:571
10144
msgid ""
10145
"repository.fdatasync\n"
10146
"~~~~~~~~~~~~~~~~~~~~"
10147
msgstr ""
10148
10149
#: en/help_topics/configuration.txt:574
10150
msgid ""
10151
"If true (default), repository changes are flushed through the OS buffers\n"
10152
"to physical disk. This is somewhat slower, but means data should not be\n"
10153
"lost if the machine crashes. See also dirstate.fdatasync."
10154
msgstr ""
10155
10156
#: en/help_topics/configuration.txt:578
10157
msgid ""
10158
"submit_branch\n"
10159
"~~~~~~~~~~~~~"
10160
msgstr ""
10161
10162
#: en/help_topics/configuration.txt:581
10163
msgid ""
10164
"The branch you intend to submit your current work to. This is "
10165
"automatically\n"
10166
"set by ``bzr send``, and is also used by the ``submit:`` revision spec. "
10167
"This\n"
10168
"should usually be set on a per-branch or per-location basis."
10169
msgstr ""
10170
10171
#: en/help_topics/configuration.txt:585
10172
msgid ""
10173
"public_branch\n"
10174
"~~~~~~~~~~~~~"
10175
msgstr ""
10176
10177
#: en/help_topics/configuration.txt:588
10178
msgid ""
10179
"A publically-accessible version of this branch (implying that this version "
10180
"is\n"
10181
"not publically-accessible). Used (and set) by ``bzr send``."
10182
msgstr ""
10183
10184
#: en/help_topics/configuration.txt:591
10185
msgid ""
10186
"suppress_warnings\n"
10187
"~~~~~~~~~~~~~~~~~"
10188
msgstr ""
10189
10190
#: en/help_topics/configuration.txt:594
10191
msgid ""
10192
"A list of strings, each string represent a warning that can be emitted by\n"
10193
"bzr. Mentioning a warning in this list tells bzr to not emit it."
10194
msgstr ""
10195
10196
#: en/help_topics/configuration.txt:597
10197
msgid "Valid values:"
10198
msgstr ""
10199
10200
#: en/help_topics/configuration.txt:599
10201
msgid ""
10202
"* ``format_deprecation``:\n"
10203
" whether the format deprecation warning is shown on repositories that "
10204
"are\n"
10205
" using deprecated formats."
10206
msgstr ""
10207
10208
#: en/help_topics/configuration.txt:603
10209
msgid ""
10210
"default_format\n"
10211
"~~~~~~~~~~~~~~"
10212
msgstr ""
10213
10214
#: en/help_topics/configuration.txt:606
10215
msgid ""
10216
"A format name for the default format used when creating branches. See "
10217
"``bzr\n"
10218
"help formats`` for possible values."
10219
msgstr ""
10220
10221
#: en/help_topics/configuration.txt:609
10222
msgid ""
10223
"\n"
10224
"Unicode options\n"
10225
"---------------"
10226
msgstr ""
10227
10228
#: en/help_topics/configuration.txt:613
10229
msgid ""
10230
"output_encoding\n"
10231
"~~~~~~~~~~~~~~~"
10232
msgstr ""
10233
10234
#: en/help_topics/configuration.txt:616
10235
msgid ""
10236
"A Python unicode encoding name for text output from bzr, such as log\n"
10237
"information. Values include: utf8, cp850, ascii, iso-8859-1. The default\n"
10238
"is the terminal encoding prefered by the operating system."
10239
msgstr ""
10240
10241
#: en/help_topics/configuration.txt:620
10242
msgid ""
10243
"\n"
10244
"Branch type specific options\n"
10245
"----------------------------"
10246
msgstr ""
10247
10248
#: en/help_topics/configuration.txt:624
10249
msgid ""
10250
"These options apply only to branches that use the ``dirstate-tags`` or\n"
10251
"later format. They\n"
10252
"are usually set in ``.bzr/branch/branch.conf`` automatically, but may be\n"
10253
"manually set in ``locations.conf`` or ``bazaar.conf``."
10254
msgstr ""
10255
10256
#: en/help_topics/configuration.txt:629
10257
msgid ""
10258
"append_revisions_only\n"
10259
"~~~~~~~~~~~~~~~~~~~~~"
10260
msgstr ""
10261
10262
#: en/help_topics/configuration.txt:632
10263
msgid ""
10264
"If set to \"True\" then revisions can only be appended to the log, not\n"
10265
"removed. A branch with this setting enabled can only pull from another\n"
10266
"branch if the other branch's log is a longer version of its own. This is\n"
10267
"normally set by ``bzr init --append-revisions-only``. If you set it\n"
10268
"manually, use either 'True' or 'False' (case-sensitive) to maintain\n"
10269
"compatibility with previous bzr versions (older than 2.2)."
10270
msgstr ""
10271
10272
#: en/help_topics/configuration.txt:639
10273
msgid ""
10274
"parent_location\n"
10275
"~~~~~~~~~~~~~~~"
10276
msgstr ""
10277
10278
#: en/help_topics/configuration.txt:642
10279
msgid ""
10280
"If present, the location of the default branch for pull or merge. This "
10281
"option\n"
10282
"is normally set when creating a branch, the first ``pull`` or by ``pull\n"
10283
"--remember``."
10284
msgstr ""
10285
10286
#: en/help_topics/configuration.txt:646
10287
msgid ""
10288
"push_location\n"
10289
"~~~~~~~~~~~~~"
10290
msgstr ""
10291
10292
#: en/help_topics/configuration.txt:649
10293
msgid ""
10294
"If present, the location of the default branch for push. This option\n"
10295
"is normally set by the first ``push`` or ``push --remember``."
10296
msgstr ""
10297
10298
#: en/help_topics/configuration.txt:652
10299
msgid ""
10300
"push_strict\n"
10301
"~~~~~~~~~~~"
10302
msgstr ""
10303
10304
#: en/help_topics/configuration.txt:655
10305
msgid ""
10306
"If present, defines the ``--strict`` option default value for checking\n"
10307
"uncommitted changes before pushing."
10308
msgstr ""
10309
10310
#: en/help_topics/configuration.txt:658
10311
msgid ""
10312
"dpush_strict\n"
10313
"~~~~~~~~~~~~"
10314
msgstr ""
10315
10316
#: en/help_topics/configuration.txt:661
10317
msgid ""
10318
"If present, defines the ``--strict`` option default value for checking\n"
10319
"uncommitted changes before pushing into a different VCS without any\n"
10320
"custom bzr metadata."
10321
msgstr ""
10322
10323
#: en/help_topics/configuration.txt:665
10324
msgid ""
10325
"bound_location\n"
10326
"~~~~~~~~~~~~~~"
10327
msgstr ""
10328
10329
#: en/help_topics/configuration.txt:668
10330
msgid ""
10331
"The location that commits should go to when acting as a checkout.\n"
10332
"This option is normally set by ``bind``."
10333
msgstr ""
10334
10335
#: en/help_topics/configuration.txt:671
10336
msgid ""
10337
"bound\n"
10338
"~~~~~"
10339
msgstr ""
10340
10341
#: en/help_topics/configuration.txt:674
10342
msgid ""
10343
"If set to \"True\", the branch should act as a checkout, and push each "
10344
"commit to\n"
10345
"the bound_location. This option is normally set by ``bind``/``unbind``."
10346
msgstr ""
10347
10348
#: en/help_topics/configuration.txt:677
10349
msgid ""
10350
"send_strict\n"
10351
"~~~~~~~~~~~"
10352
msgstr ""
10353
10354
#: en/help_topics/configuration.txt:680
10355
msgid ""
10356
"If present, defines the ``--strict`` option default value for checking\n"
10357
"uncommitted changes before sending a merge directive."
10358
msgstr ""
10359
10360
#: en/help_topics/configuration.txt:683
10361
msgid ""
10362
"add.maximum_file_size\n"
10363
"~~~~~~~~~~~~~~~~~~~~~"
10364
msgstr ""
10365
10366
#: en/help_topics/configuration.txt:686
10367
msgid ""
10368
"Defines the maximum file size the command line \"add\" operation will allow\n"
10369
"in recursive mode, with files larger than this value being skipped. You may "
10370
"\n"
10371
"specify this value as an integer (in which case it is interpreted as bytes), "
10372
"\n"
10373
"or you may specify the value using SI units, i.e. 10KB, 20MB, 1G. A value of "
10374
"0 \n"
10375
"will disable skipping."
10376
msgstr ""
10377
10378
#: en/help_topics/configuration.txt:692
10379
msgid ""
10380
"External Merge Tools\n"
10381
"--------------------"
10382
msgstr ""
10383
10384
#: en/help_topics/configuration.txt:695
10385
msgid ""
10386
"bzr.mergetool.<name>\n"
10387
"~~~~~~~~~~~~~~~~~~~~"
10388
msgstr ""
10389
10390
#: en/help_topics/configuration.txt:698
10391
msgid ""
10392
"Defines an external merge tool called <name> with the given command-line.\n"
10393
"Arguments containing spaces should be quoted using single or double quotes. "
10394
"The\n"
10395
"executable may omit its path if it can be found on the PATH."
10396
msgstr ""
10397
10398
#: en/help_topics/configuration.txt:702
10399
msgid ""
10400
"The following markers can be used in the command-line to substitute "
10401
"filenames\n"
10402
"involved in the merge conflict::"
10403
msgstr ""
10404
10405
#: en/help_topics/configuration.txt:705
10406
msgid ""
10407
" {base} file.BASE\n"
10408
" {this} file.THIS\n"
10409
" {other} file.OTHER\n"
10410
" {result} output file\n"
10411
" {this_temp} temp copy of file.THIS, used to overwrite output file if "
10412
"merge\n"
10413
" succeeds."
10414
msgstr ""
10415
10416
#: en/help_topics/configuration.txt:714
10417
msgid " bzr.mergetool.kdiff3 = kdiff3 {base} {this} {other} -o {result}"
10418
msgstr ""
10419
10420
#: en/help_topics/configuration.txt:716
10421
msgid ""
10422
"bzr.default_mergetool\n"
10423
"~~~~~~~~~~~~~~~~~~~~~"
10424
msgstr ""
10425
10426
#: en/help_topics/configuration.txt:719
10427
msgid ""
10428
"Specifies which external merge tool (as defined above) should be selected "
10429
"by\n"
10430
"default in tools such as ``bzr qconflicts``."
10431
msgstr ""
10432
10433
#: en/help_topics/configuration.txt:724
10434
msgid " bzr.default_mergetool = kdiff3\n"
10435
msgstr ""
10436
10437
#: en/help_topics/conflict-types.txt:1
10438
msgid ""
10439
"Conflict Types\n"
10440
"=============="
10441
msgstr ""
10442
10443
#: en/help_topics/conflict-types.txt:4
10444
msgid ""
10445
"Some operations, like merge, revert and pull, modify the contents of your\n"
10446
"working tree. These modifications are programmatically generated, and so "
10447
"they\n"
10448
"may conflict with the current state of your working tree. "
10449
msgstr ""
10450
10451
#: en/help_topics/conflict-types.txt:8
10452
msgid ""
10453
"When conflicts are present in your working tree (as shown by ``bzr\n"
10454
"conflicts``), you should resolve them and then inform bzr that the "
10455
"conflicts\n"
10456
"have been resolved."
10457
msgstr ""
10458
10459
#: en/help_topics/conflict-types.txt:12
10460
msgid ""
10461
"Resolving conflicts is sometimes not obvious. Either because the user that\n"
10462
"should resolve them is not the one responsible for their occurrence, as is "
10463
"the\n"
10464
"case when merging other people's work or because some conflicts are "
10465
"presented\n"
10466
"in a way that is not easy to understand."
10467
msgstr ""
10468
10469
#: en/help_topics/conflict-types.txt:17
10470
msgid ""
10471
"Bazaar tries to avoid conflicts ; its aim is to ask you to resolve the\n"
10472
"conflict if and only if there's an actual conceptual conflict in the source\n"
10473
"tree. Because Bazaar doesn't understand the real meaning of the files "
10474
"being\n"
10475
"versioned, it can, when faced with ambiguities, fall short in either "
10476
"direction\n"
10477
"trying to resolve the conflict itself. Many kinds of changes can be "
10478
"combined\n"
10479
"programmatically, but sometimes only a human can determine the right thing "
10480
"to\n"
10481
"do."
10482
msgstr ""
10483
10484
#: en/help_topics/conflict-types.txt:25
10485
msgid ""
10486
"When Bazaar generates a conflict, it adds information into the working tree "
10487
"to\n"
10488
"present the conflicting versions, and it's up to you to find the correct\n"
10489
"resolution."
10490
msgstr ""
10491
10492
#: en/help_topics/conflict-types.txt:29
10493
msgid "Whatever the conflict is, resolving it is roughly done in two steps:"
10494
msgstr ""
10495
10496
#: en/help_topics/conflict-types.txt:31
10497
msgid ""
10498
"1. Modify the working tree content so that the conflicted item is now in "
10499
"the\n"
10500
" state you want to keep, then"
10501
msgstr ""
10502
10503
#: en/help_topics/conflict-types.txt:34
10504
msgid ""
10505
"2. Inform Bazaar that the conflict is now solved and ask to cleanup any\n"
10506
" remaining generated information (``bzr resolve <item>``)."
10507
msgstr ""
10508
10509
#: en/help_topics/conflict-types.txt:37
10510
msgid ""
10511
"For most conflict types, there are some obvious ways to modify the working\n"
10512
"tree and put it into the desired state. For some types of conflicts, Bazaar\n"
10513
"itself already made a choice, when possible."
10514
msgstr ""
10515
10516
#: en/help_topics/conflict-types.txt:41
10517
msgid ""
10518
"Yet, whether Bazaar makes a choice or not, there are some other simple but\n"
10519
"different ways to resolve the conflict."
10520
msgstr ""
10521
10522
#: en/help_topics/conflict-types.txt:44
10523
msgid ""
10524
"Each type of conflict is explained below, and the action which must be done "
10525
"to\n"
10526
"resolve the conflict is outlined."
10527
msgstr ""
10528
10529
#: en/help_topics/conflict-types.txt:47
10530
msgid ""
10531
"Various actions are available depending on the kind of conflict, for some "
10532
"of\n"
10533
"these actions, Bazaar can provide some help. In the end you should at least\n"
10534
"inform Bazaar that you're done with the conflict with::"
10535
msgstr ""
10536
10537
#: en/help_topics/conflict-types.txt:51
10538
msgid " ``bzr resolve FILE --action=done'"
10539
msgstr ""
10540
10541
#: en/help_topics/conflict-types.txt:53
10542
msgid ""
10543
"Note that this is the default action when a single file is involved so you "
10544
"can\n"
10545
"simply use::"
10546
msgstr ""
10547
10548
#: en/help_topics/conflict-types.txt:56
10549
msgid " ``bzr resolve FILE``"
10550
msgstr ""
10551
10552
#: en/help_topics/conflict-types.txt:58
10553
msgid "See ``bzr help resolve`` for more details."
10554
msgstr ""
10555
10556
#: en/help_topics/conflict-types.txt:60
10557
msgid ""
10558
"Text conflicts\n"
10559
"--------------"
10560
msgstr ""
10561
10562
#: en/help_topics/conflict-types.txt:63 en/help_topics/conflict-types.txt:120
10563
#: en/help_topics/conflict-types.txt:151 en/help_topics/conflict-types.txt:175
10564
#: en/help_topics/conflict-types.txt:198 en/help_topics/conflict-types.txt:213
10565
#: en/help_topics/conflict-types.txt:239 en/help_topics/conflict-types.txt:281
10566
#: en/help_topics/conflict-types.txt:303 en/help_topics/conflict-types.txt:339
10567
msgid "Typical message::"
10568
msgstr ""
10569
10570
#: en/help_topics/conflict-types.txt:65
10571
msgid " Text conflict in FILE"
10572
msgstr ""
10573
10574
#: en/help_topics/conflict-types.txt:67
10575
msgid ""
10576
"These are produced when a text merge cannot completely reconcile two sets "
10577
"of\n"
10578
"text changes. Bazaar will emit files for each version with the extensions\n"
10579
"THIS, OTHER, and BASE. THIS is the version of the file from the target "
10580
"tree,\n"
10581
"i.e. the tree that you are merging changes into. OTHER is the version that "
10582
"you\n"
10583
"are merging into the target. BASE is an older version that is used as a "
10584
"basis\n"
10585
"for comparison."
10586
msgstr ""
10587
10588
#: en/help_topics/conflict-types.txt:74
10589
msgid ""
10590
"In the main copy of the file, Bazaar will include all the changes that it\n"
10591
"could reconcile, and any un-reconciled conflicts are surrounded by\n"
10592
"\"herringbone\" markers like ``<<<<<<<``."
10593
msgstr ""
10594
10595
#: en/help_topics/conflict-types.txt:78
10596
msgid ""
10597
"Say the initial text is \"The project leader released it.\", and THIS "
10598
"modifies it\n"
10599
"to \"Martin Pool released it.\", while OTHER modifies it to \"The project "
10600
"leader\n"
10601
"released Bazaar.\" A conflict would look like this::"
10602
msgstr ""
10603
10604
#: en/help_topics/conflict-types.txt:82
10605
msgid ""
10606
" <<<<<<< TREE\n"
10607
" Martin Pool released it.\n"
10608
" =======\n"
10609
" The project leader released Bazaar.\n"
10610
" >>>>>>> MERGE-SOURCE"
10611
msgstr ""
10612
10613
#: en/help_topics/conflict-types.txt:88
10614
msgid "The correct resolution would be \"Martin Pool released Bazaar.\""
10615
msgstr ""
10616
10617
#: en/help_topics/conflict-types.txt:90
10618
msgid ""
10619
"You can handle text conflicts either by editing the main copy of the file,\n"
10620
"or by invoking external tools on the THIS, OTHER and BASE versions. It's\n"
10621
"worth mentioning that resolving text conflicts rarely involves picking one\n"
10622
"set of changes over the other (but see below when you encounter these\n"
10623
"cases). More often, the two sets of changes must be intelligently combined."
10624
msgstr ""
10625
10626
#: en/help_topics/conflict-types.txt:96
10627
msgid ""
10628
"If you edit the main copy, be sure to remove the herringbone markers. When\n"
10629
"you are done editing, the file should look like it never had a conflict, and "
10630
"be\n"
10631
"ready to commit."
10632
msgstr ""
10633
10634
#: en/help_topics/conflict-types.txt:100
10635
msgid ""
10636
"When you have resolved text conflicts, just run ``bzr resolve --auto``, and\n"
10637
"Bazaar will auto-detect which conflicts you have resolved."
10638
msgstr ""
10639
10640
#: en/help_topics/conflict-types.txt:103
10641
msgid ""
10642
"When the conflict is resolved, Bazaar deletes the previously generated\n"
10643
"``.BASE``, ``.THIS`` and ``.OTHER`` files if they are still present in the\n"
10644
"working tree."
10645
msgstr ""
10646
10647
#: en/help_topics/conflict-types.txt:107
10648
msgid ""
10649
"\n"
10650
"When you want to pick one set of changes over the other, you can use ``bzr\n"
10651
"resolve`` with one of the following actions:"
10652
msgstr ""
10653
10654
#: en/help_topics/conflict-types.txt:111
10655
msgid ""
10656
"* ``--action=take-this`` will issue ``mv FILE.THIS FILE``,\n"
10657
"* ``--action=take-other`` will issue ``mv FILE.OTHER FILE``."
10658
msgstr ""
10659
10660
#: en/help_topics/conflict-types.txt:114
10661
msgid ""
10662
"Note that if you have modified ``FILE.THIS`` or ``FILE.OTHER``, these\n"
10663
"modifications will be taken into account."
10664
msgstr ""
10665
10666
#: en/help_topics/conflict-types.txt:117
10667
msgid ""
10668
"Content conflicts\n"
10669
"-----------------"
10670
msgstr ""
10671
10672
#: en/help_topics/conflict-types.txt:122
10673
msgid " Contents conflict in FILE"
10674
msgstr ""
10675
10676
#: en/help_topics/conflict-types.txt:124
10677
msgid ""
10678
"This conflict happens when there are conflicting changes in the working "
10679
"tree\n"
10680
"and the merge source, but the conflicted items are not text files. They "
10681
"may\n"
10682
"be binary files, or symlinks, or directories. It can even happen with "
10683
"files\n"
10684
"that are deleted on one side, and modified on the other."
10685
msgstr ""
10686
10687
#: en/help_topics/conflict-types.txt:129
10688
msgid ""
10689
"Like text conflicts, Bazaar will emit THIS, OTHER and BASE files. (They may "
10690
"be\n"
10691
"regular files, symlinks or directories). But it will not include a \"main "
10692
"copy\"\n"
10693
"of the file with herringbone conflict markers. It will appear that the "
10694
"\"main\n"
10695
"copy\" has been renamed to THIS or OTHER."
10696
msgstr ""
10697
10698
#: en/help_topics/conflict-types.txt:134 en/help_topics/conflict-types.txt:182
10699
msgid ""
10700
"To resolve that kind of conflict, you should rebuild FILE from either "
10701
"version\n"
10702
"or a combination of both."
10703
msgstr ""
10704
10705
#: en/help_topics/conflict-types.txt:137 en/help_topics/conflict-types.txt:185
10706
#: en/help_topics/conflict-types.txt:226 en/help_topics/conflict-types.txt:252
10707
#: en/help_topics/conflict-types.txt:291 en/help_topics/conflict-types.txt:326
10708
#: en/help_topics/conflict-types.txt:361
10709
msgid "``bzr resolve`` recognizes the following actions:"
10710
msgstr ""
10711
10712
#: en/help_topics/conflict-types.txt:139
10713
msgid ""
10714
"* ``--action=take-this`` will issue ``bzr mv FILE.THIS FILE``,\n"
10715
"* ``--action=take-other`` will issue ``bzr mv FILE.OTHER FILE``,\n"
10716
"* ``--action=done`` will just mark the conflict as resolved."
10717
msgstr ""
10718
10719
#: en/help_topics/conflict-types.txt:143
10720
msgid ""
10721
"Any action will also delete the previously generated ``.BASE``, ``.THIS`` "
10722
"and\n"
10723
"``.OTHER`` files if they are still present in the working tree."
10724
msgstr ""
10725
10726
#: en/help_topics/conflict-types.txt:146 en/help_topics/conflict-types.txt:193
10727
#: en/help_topics/conflict-types.txt:234 en/help_topics/conflict-types.txt:276
10728
#: en/help_topics/conflict-types.txt:298 en/help_topics/conflict-types.txt:334
10729
#: en/help_topics/conflict-types.txt:369
10730
msgid ""
10731
"Bazaar cannot auto-detect when conflicts of this kind have been resolved."
10732
msgstr ""
10733
10734
#: en/help_topics/conflict-types.txt:148
10735
msgid ""
10736
"Tag conflicts\n"
10737
"-------------"
10738
msgstr ""
10739
10740
#: en/help_topics/conflict-types.txt:153
10741
msgid ""
10742
" Conflicting tags:\n"
10743
" version-0.1"
10744
msgstr ""
10745
10746
#: en/help_topics/conflict-types.txt:156
10747
msgid ""
10748
"When pulling from or pushing to another branch, Bazaar informs you about "
10749
"tags\n"
10750
"that conflict between the two branches; that is the same tag points to two\n"
10751
"different revisions. You need not resolve these conflicts, but subsequent\n"
10752
"uses of pull or push will result in the same message."
10753
msgstr ""
10754
10755
#: en/help_topics/conflict-types.txt:161
10756
msgid ""
10757
"To resolve the conflict, you must apply the correct tags to either the "
10758
"target\n"
10759
"branch or the source branch as appropriate. Use \"bzr tags --show-ids -d\n"
10760
"SOURCE_URL\" to see the tags in the source branch. If you want to make the\n"
10761
"target branch's tags match the source branch, then in the target branch do\n"
10762
"``bzr tag --force -r revid:REVISION_ID CONFLICTING_TAG`` for each of the\n"
10763
"CONFLICTING_TAGs, where REVISION_ID comes from the list of tags in the "
10764
"source\n"
10765
"branch. You need not call \"bzr resolve\" after doing this. To resolve in\n"
10766
"favor of the target branch, you need to similarly use ``tag --force`` in "
10767
"the\n"
10768
"source branch. (Note that pulling or pushing using --overwrite will "
10769
"overwrite\n"
10770
"all tags as well.)"
10771
msgstr ""
10772
10773
#: en/help_topics/conflict-types.txt:172
10774
msgid ""
10775
"Duplicate paths\n"
10776
"---------------"
10777
msgstr ""
10778
10779
#: en/help_topics/conflict-types.txt:177
10780
msgid " Conflict adding file FILE. Moved existing file to FILE.moved."
10781
msgstr ""
10782
10783
#: en/help_topics/conflict-types.txt:179
10784
msgid ""
10785
"Sometimes Bazaar will attempt to create a file using a pathname that has\n"
10786
"already been used. The existing file will be renamed to \"FILE.moved\". "
10787
msgstr ""
10788
10789
#: en/help_topics/conflict-types.txt:187
10790
msgid ""
10791
"* ``--action=take-this`` will issue ``bzr rm FILE ; bzr mv FILE.moved "
10792
"FILE``,\n"
10793
"* ``--action=take-other`` will issue ``bzr rm FILE.moved``,\n"
10794
"* ``--action=done`` will just mark the conflict as resolved."
10795
msgstr ""
10796
10797
#: en/help_topics/conflict-types.txt:191
10798
msgid ""
10799
"Note that you must get rid of FILE.moved before using ``--action=done``."
10800
msgstr ""
10801
10802
#: en/help_topics/conflict-types.txt:195
10803
msgid ""
10804
"Unversioned parent\n"
10805
"------------------"
10806
msgstr ""
10807
10808
#: en/help_topics/conflict-types.txt:200
10809
msgid ""
10810
" Conflict because FILE is not versioned, but has versioned children."
10811
msgstr ""
10812
10813
#: en/help_topics/conflict-types.txt:202
10814
msgid ""
10815
"Sometimes Bazaar will attempt to create a file whose parent directory is "
10816
"not\n"
10817
"versioned. This happens when the directory has been deleted in the target,\n"
10818
"but has a new child in the source, or vice versa. In this situation, "
10819
"Bazaar\n"
10820
"will version the parent directory as well. Resolving this issue depends\n"
10821
"very much on the particular scenario. You may wish to rename or delete "
10822
"either\n"
10823
"the file or the directory. When you are satisfied, you can run \"bzr "
10824
"resolve\n"
10825
"FILE\" to mark the conflict as resolved."
10826
msgstr ""
10827
10828
#: en/help_topics/conflict-types.txt:210
10829
msgid ""
10830
"Missing parent\n"
10831
"--------------"
10832
msgstr ""
10833
10834
#: en/help_topics/conflict-types.txt:215
10835
msgid " Conflict adding files to FILE. Created directory."
10836
msgstr ""
10837
10838
#: en/help_topics/conflict-types.txt:217
10839
msgid ""
10840
"This happens when a directory has been deleted in the target, but has new\n"
10841
"children in the source. This is similar to the \"unversioned parent\" "
10842
"conflict,\n"
10843
"except that the parent directory does not *exist*, instead of just being\n"
10844
"unversioned. In this situation, Bazaar will create the missing parent.\n"
10845
"Resolving this issue depends very much on the particular scenario."
10846
msgstr ""
10847
10848
#: en/help_topics/conflict-types.txt:223 en/help_topics/conflict-types.txt:249
10849
msgid ""
10850
"To resolve that kind of conflict, you should either remove or rename the\n"
10851
"children or the directory or a combination of both."
10852
msgstr ""
10853
10854
#: en/help_topics/conflict-types.txt:228
10855
msgid ""
10856
"* ``--action=take-this`` will issue ``bzr rm directory`` including the\n"
10857
" children,\n"
10858
"* ``--action=take-other`` will acknowledge Bazaar choice to keep the "
10859
"children\n"
10860
" and restoring the directory,\n"
10861
"* ``--action=done`` will just mark the conflict as resolved."
10862
msgstr ""
10863
10864
#: en/help_topics/conflict-types.txt:236
10865
msgid ""
10866
"Deleting parent\n"
10867
"---------------"
10868
msgstr ""
10869
10870
#: en/help_topics/conflict-types.txt:241
10871
msgid " Conflict: can't delete DIR because it is not empty. Not deleting."
10872
msgstr ""
10873
10874
#: en/help_topics/conflict-types.txt:243
10875
msgid ""
10876
"This is the opposite of \"missing parent\". A directory is deleted in the\n"
10877
"source, but has new children in the target (either because a directory\n"
10878
"deletion is merged or because the merge introduce new children). Bazaar\n"
10879
"will retain the directory. Resolving this issue depends very much on the\n"
10880
"particular scenario."
10881
msgstr ""
10882
10883
#: en/help_topics/conflict-types.txt:254
10884
msgid ""
10885
"* ``--action=take-this`` will acknowledge Bazaar choice to keep the "
10886
"directory,"
10887
msgstr ""
10888
10889
#: en/help_topics/conflict-types.txt:256
10890
msgid ""
10891
"* ``--action=take-other`` will issue ``bzr rm directory`` including the \n"
10892
" children,"
10893
msgstr ""
10894
10895
#: en/help_topics/conflict-types.txt:259
10896
msgid "* ``--action=done`` will just mark the conflict as resolved."
10897
msgstr ""
10898
10899
#: en/help_topics/conflict-types.txt:261
10900
msgid ""
10901
"Note that when merging a directory deletion, if unversioned files are\n"
10902
"present, they become potential orphans has they don't have a directory\n"
10903
"parent anymore."
10904
msgstr ""
10905
10906
#: en/help_topics/conflict-types.txt:265
10907
msgid ""
10908
"Handling such orphans, *before* the conflict is created, is controlled by\n"
10909
"setting the ``bzr.transform.orphan_policy`` configuration option."
10910
msgstr ""
10911
10912
#: en/help_topics/conflict-types.txt:268
10913
msgid "There are two possible values for this option:"
10914
msgstr ""
10915
10916
#: en/help_topics/conflict-types.txt:270
10917
msgid ""
10918
"* ``conflict`` (the default): will leave the orphans in place and\n"
10919
" generate a conflicts,"
10920
msgstr ""
10921
10922
#: en/help_topics/conflict-types.txt:273
10923
msgid ""
10924
"* ``move``: will move the orphans to a ``bzr-orphans`` directory at the "
10925
"root\n"
10926
" of the working tree with names like ``<file>.~#~``."
10927
msgstr ""
10928
10929
#: en/help_topics/conflict-types.txt:278
10930
msgid ""
10931
"Path conflict\n"
10932
"-------------"
10933
msgstr ""
10934
10935
#: en/help_topics/conflict-types.txt:283
10936
msgid " Path conflict: PATH1 / PATH2"
10937
msgstr ""
10938
10939
#: en/help_topics/conflict-types.txt:285
10940
msgid ""
10941
"This happens when the source and target have each modified the name or "
10942
"parent\n"
10943
"directory of a file. Bazaar will use the path elements from the source."
10944
msgstr ""
10945
10946
#: en/help_topics/conflict-types.txt:288
10947
msgid ""
10948
"To resolve that kind of conflict, you just have to decide what name should "
10949
"be\n"
10950
"retained for the file involved."
10951
msgstr ""
10952
10953
#: en/help_topics/conflict-types.txt:293
10954
msgid ""
10955
"* ``--action=take-this`` will revert Bazaar choice and keep ``PATH1`` by\n"
10956
" issuing ``bzr mv PATH2 PATH1``,\n"
10957
"* ``--action=take-other`` will acknowledge Bazaar choice of keeping "
10958
"``PATH2``,\n"
10959
"* ``--action=done`` will just mark the conflict as resolved."
10960
msgstr ""
10961
10962
#: en/help_topics/conflict-types.txt:300
10963
msgid ""
10964
"Parent loop\n"
10965
"-----------"
10966
msgstr ""
10967
10968
#: en/help_topics/conflict-types.txt:305
10969
msgid " Conflict moving FILE into DIRECTORY. Cancelled move."
10970
msgstr ""
10971
10972
#: en/help_topics/conflict-types.txt:307
10973
msgid ""
10974
"This happens when the source and the target have each moved directories, so\n"
10975
"that, if the change could be applied, a directory would be contained by "
10976
"itself.\n"
10977
"For example::"
10978
msgstr ""
10979
10980
#: en/help_topics/conflict-types.txt:311
10981
msgid ""
10982
" $ bzr init\n"
10983
" $ bzr mkdir white\n"
10984
" $ bzr mkdir black\n"
10985
" $ bzr commit -m \"BASE\"\n"
10986
" $ bzr branch . ../other\n"
10987
" $ bzr mv white black\n"
10988
" $ bzr commit -m \"THIS\"\n"
10989
" $ bzr mv ../other/black ../other/white\n"
10990
" $ bzr commit ../other -m \"OTHER\"\n"
10991
" $ bzr merge ../other"
10992
msgstr ""
10993
10994
#: en/help_topics/conflict-types.txt:322
10995
msgid ""
10996
"In this situation, Bazaar will cancel the move, and leave ``white`` in\n"
10997
"``black``. To resolve that kind of conflict, you just have to decide what\n"
10998
"name should be retained for the directories involved."
10999
msgstr ""
11000
11001
#: en/help_topics/conflict-types.txt:328
11002
msgid ""
11003
"* ``--action=take-this`` will acknowledge Bazaar choice of leaving ``white`` "
11004
"\n"
11005
" in ``black``,\n"
11006
"* ``--action=take-other`` will revert Bazaar choice and move ``black`` in\n"
11007
" ``white`` by issuing ``bzr mv black/white white ; bzr mv black white``,\n"
11008
"* ``--action=done`` will just mark the conflict as resolved."
11009
msgstr ""
11010
11011
#: en/help_topics/conflict-types.txt:336
11012
msgid ""
11013
"Non-directory parent\n"
11014
"--------------------"
11015
msgstr ""
11016
11017
#: en/help_topics/conflict-types.txt:341
11018
msgid ""
11019
" Conflict: foo.new is not a directory, but has files in it.\n"
11020
" Created directory."
11021
msgstr ""
11022
11023
#: en/help_topics/conflict-types.txt:344
11024
msgid ""
11025
"This happens when one side has added files to a directory, and the other "
11026
"side\n"
11027
"has changed the directory into a file or symlink. For example::"
11028
msgstr ""
11029
11030
#: en/help_topics/conflict-types.txt:347
11031
msgid ""
11032
" $ bzr init\n"
11033
" $ bzr mkdir foo\n"
11034
" $ bzr commit -m \"BASE\"\n"
11035
" $ bzr branch . ../other\n"
11036
" $ rmdir foo\n"
11037
" $ touch foo\n"
11038
" $ bzr commit -m \"THIS\"\n"
11039
" $ bzr mkdir ../other/foo/bar\n"
11040
" $ bzr commit ../other -m \"OTHER\"\n"
11041
" $ bzr merge ../other"
11042
msgstr ""
11043
11044
#: en/help_topics/conflict-types.txt:358
11045
msgid ""
11046
"To resolve that kind of conflict, you have to decide what name should be\n"
11047
"retained for the file, directory or symlink involved."
11048
msgstr ""
11049
11050
#: en/help_topics/conflict-types.txt:363
11051
msgid ""
11052
"* ``--action=take-this`` will issue ``bzr rm --force foo.new`` and \n"
11053
" ``bzr add foo``,\n"
11054
"* ``--action=take-other`` will issue ``bzr rm --force foo`` and \n"
11055
" ``bzr mv foo.new foo``,\n"
11056
"* ``--action=done`` will just mark the conflict as resolved."
11057
msgstr ""
11058
11059
#: en/help_topics/conflict-types.txt:371
11060
msgid ""
11061
"MalformedTransform\n"
11062
"------------------"
11063
msgstr ""
11064
11065
#: en/help_topics/conflict-types.txt:374
11066
msgid ""
11067
"It is possible (though very rare) for Bazaar to raise a MalformedTransform\n"
11068
"exception. This means that Bazaar encountered a filesystem conflict that it "
11069
"was\n"
11070
"unable to resolve. This usually indicates a bug. Please let us know if "
11071
"you\n"
11072
"encounter this. Our bug tracker is at https://launchpad.net/bzr/+bugs\n"
11073
msgstr ""
11074
11075
#: en/help_topics/content-filters.txt:1
11076
msgid ""
11077
"Content Filters\n"
11078
"==============="
11079
msgstr ""
11080
11081
#: en/help_topics/content-filters.txt:4
11082
msgid ""
11083
"Content formats\n"
11084
"---------------"
11085
msgstr ""
11086
11087
#: en/help_topics/content-filters.txt:7
11088
msgid ""
11089
"Bazaar's content filtering allows you to store files in a different\n"
11090
"format from the copy in your working tree. This lets you, or your\n"
11091
"co-developers, use Windows development tools that expect CRLF files\n"
11092
"on projects that use other line-ending conventions. Among other things,\n"
11093
"content filters also let Unix developers more easily work on projects\n"
11094
"using Windows line-ending conventions, keyword expansion/compression,\n"
11095
"and trailing spaces on lines in text files to be implicitly stripped\n"
11096
"when committed."
11097
msgstr ""
11098
11099
#: en/help_topics/content-filters.txt:16
11100
msgid "To generalize, there are two content formats supported by Bazaar:"
11101
msgstr ""
11102
11103
#: en/help_topics/content-filters.txt:18
11104
msgid ""
11105
"* a canonical format - how files are stored internally\n"
11106
"* a convenience format - how files are created in a working tree."
11107
msgstr ""
11108
11109
#: en/help_topics/content-filters.txt:21
11110
msgid ""
11111
"\n"
11112
"Format conversion\n"
11113
"-----------------"
11114
msgstr ""
11115
11116
#: en/help_topics/content-filters.txt:25
11117
msgid ""
11118
"The conversion between these formats is done by content filters.\n"
11119
"A content filter has two parts:"
11120
msgstr ""
11121
11122
#: en/help_topics/content-filters.txt:28
11123
msgid ""
11124
"* a read converter - converts from convenience to canonical format\n"
11125
"* a write converter - converts from canonical to convenience format."
11126
msgstr ""
11127
11128
#: en/help_topics/content-filters.txt:31
11129
msgid ""
11130
"Many of these converters will provide *round-trip* conversion,\n"
11131
"i.e. applying the read converter followed by the write converter\n"
11132
"gives back the original content. However, others may provide an\n"
11133
"asymmetric conversion. For example, a read converter might strip\n"
11134
"trailing whitespace off lines in source code while the matching\n"
11135
"write converter might pass content through unchanged."
11136
msgstr ""
11137
11138
#: en/help_topics/content-filters.txt:38
11139
msgid ""
11140
"\n"
11141
"Enabling content filters\n"
11142
"------------------------"
11143
msgstr ""
11144
11145
#: en/help_topics/content-filters.txt:42
11146
msgid ""
11147
"Content filters are typically provided by plugins, so the first step\n"
11148
"in using them is to install the relevant plugins and read their\n"
11149
"documentation. Some plugins may be very specific about which files\n"
11150
"they filter, e.g. only files ending in ``.java`` or ``.php``.\n"
11151
"In other cases, the plugin may leave it in the user's hands to\n"
11152
"define which files are to be filtered. This is typically done\n"
11153
"using rule-based preferences. See ``bzr help rules`` for general\n"
11154
"information about defining these."
11155
msgstr ""
11156
11157
#: en/help_topics/content-filters.txt:51
11158
msgid ""
11159
"\n"
11160
"Impact on commands\n"
11161
"------------------"
11162
msgstr ""
11163
11164
#: en/help_topics/content-filters.txt:55
11165
msgid ""
11166
"Read converters are only applied to commands that read content from\n"
11167
"a working tree, e.g. status, diff and commit. For example, ``bzr diff``\n"
11168
"will apply read converters to files in the working tree, then compare\n"
11169
"the results to the content last committed."
11170
msgstr ""
11171
11172
#: en/help_topics/content-filters.txt:60
11173
msgid ""
11174
"Write converters are only applied by commands that **create files in a\n"
11175
"working tree**, e.g. branch, checkout, update. If you wish to see the\n"
11176
"canonical format of a file or tree, use ``bzr cat`` or ``bzr export``\n"
11177
"respectively."
11178
msgstr ""
11179
11180
#: en/help_topics/content-filters.txt:65
11181
msgid ""
11182
"Note: ``bzr commit`` does not implicitly apply write converters after\n"
11183
"comitting files. If this makes sense for a given plugin providing\n"
11184
"a content filter, the plugin can usually achieve this effect by using a\n"
11185
"``start_commit`` or ``post_commit`` hook say. See :doc:`hooks-help`\n"
11186
"for more information on hooks."
11187
msgstr ""
11188
11189
#: en/help_topics/content-filters.txt:71
11190
msgid ""
11191
"\n"
11192
"Refreshing your working tree\n"
11193
"----------------------------"
11194
msgstr ""
11195
11196
#: en/help_topics/content-filters.txt:75
11197
msgid ""
11198
"For performance reasons, Bazaar caches the timestamps of files in\n"
11199
"a working tree, and assumes files are unchanged if their timestamps\n"
11200
"match the cached values. As a consequence, there are times when\n"
11201
"you may need to explicitly ask for content filtering to be reapplied\n"
11202
"in one or both directions, e.g. after installing or reconfiguring\n"
11203
"plugins providing it."
11204
msgstr ""
11205
11206
#: en/help_topics/content-filters.txt:82
11207
msgid "Here are some general guidelines for doing this:"
11208
msgstr ""
11209
11210
#: en/help_topics/content-filters.txt:84
11211
msgid ""
11212
" * To reapply read converters, ``touch`` files, i.e. update their\n"
11213
" timestamp. Operations like ``bzr status`` should then reapply the\n"
11214
" relevant read converters and compare the end result with the\n"
11215
" canonical format."
11216
msgstr ""
11217
11218
#: en/help_topics/content-filters.txt:89
11219
msgid ""
11220
" * To reapply write converters, ensure there are no local changes,\n"
11221
" delete the relevant files and run ``bzr revert`` on those files."
11222
msgstr ""
11223
11224
#: en/help_topics/content-filters.txt:92
11225
msgid ""
11226
"Note: In the future, it is likely that additional options will be added\n"
11227
"to commands to make this refreshing process faster and safer.\n"
11228
msgstr ""
11229
11230
#: en/help_topics/current-formats.txt:1
11231
msgid "Current Storage Formats"
11232
msgstr ""
11233
11234
#: en/help_topics/current-formats.txt:3
11235
msgid ""
11236
":2a:\n"
11237
" (native) (default) Format for the bzr 2.0 series. Uses group-\n"
11238
" compress storage. Provides rich roots which are a one-way\n"
11239
" transition."
11240
msgstr ""
11241
11242
#: en/help_topics/current-formats.txt:8 en/help_topics/other-formats.txt:17
11243
msgid ""
11244
"\n"
11245
"See :doc:`formats-help` for more about storage formats."
11246
msgstr ""
11247
11248
#: en/help_topics/debug-flags.txt:1
11249
msgid ""
11250
"Debug Flags\n"
11251
"==========="
11252
msgstr ""
11253
11254
#: en/help_topics/debug-flags.txt:4
11255
msgid ""
11256
"These flags can be passed on the bzr command line or (without the ``-D``\n"
11257
"prefix) put in the ``debug_flags`` variable in ``bazaar.conf``."
11258
msgstr ""
11259
11260
#: en/help_topics/debug-flags.txt:7
11261
msgid ""
11262
"-Dauth Trace authentication sections used.\n"
11263
"-Dbytes Print out how many bytes were transferred\n"
11264
"-Ddirstate Trace dirstate activity (verbose!)\n"
11265
"-Derror Instead of normal error handling, always print a "
11266
"traceback\n"
11267
" on error.\n"
11268
"-Devil Capture call sites that do expensive or badly-scaling\n"
11269
" operations.\n"
11270
"-Dfetch Trace history copying between repositories.\n"
11271
"-Dfilters Emit information for debugging content filtering.\n"
11272
"-Dforceinvdeltas Force use of inventory deltas during generic streaming "
11273
"fetch.\n"
11274
"-Dgraph Trace graph traversal.\n"
11275
"-Dhashcache Log every time a working file is read to determine its "
11276
"hash.\n"
11277
"-Dhooks Trace hook execution.\n"
11278
"-Dhpss Trace smart protocol requests and responses.\n"
11279
"-Dhpssdetail More hpss details.\n"
11280
"-Dhpssvfs Traceback on vfs access to Remote objects.\n"
11281
"-Dhttp Trace http connections, requests and responses.\n"
11282
"-Dindex Trace major index operations.\n"
11283
"-Dknit Trace knit operations.\n"
11284
"-Dlock Trace when lockdir locks are taken or released.\n"
11285
"-Dnoretry If a connection is reset, fail immediately rather than\n"
11286
" retrying the request.\n"
11287
"-Dprogress Trace progress bar operations.\n"
11288
"-Dmem_dump Dump memory to a file upon an out of memory error.\n"
11289
"-Dmerge Emit information for debugging merges.\n"
11290
"-Dno_apport Don't use apport to report crashes.\n"
11291
"-Dno_activity \t Don't show transport activity indicator in progress bar.\n"
11292
"-Dpack Emit information about pack operations.\n"
11293
"-Drelock Emit a message every time a branch or repository object "
11294
"is\n"
11295
" unlocked then relocked the same way.\n"
11296
"-Dsftp Trace SFTP internals.\n"
11297
"-Dstatic_tuple Error when a tuple is used where a StaticTuple is "
11298
"expected\n"
11299
"-Dstream Trace fetch streams.\n"
11300
"-Dstrict_locks Trace when OS locks are potentially used in a non-"
11301
"portable\n"
11302
" manner.\n"
11303
"-Dunlock Some errors during unlock are treated as warnings.\n"
11304
"-DIDS_never Never use InterDifferingSerializer when fetching.\n"
11305
"-DIDS_always Always use InterDifferingSerializer to fetch if "
11306
"appropriate\n"
11307
" for the format, even for non-local fetches.\n"
11308
msgstr ""
11309
11310
#: en/help_topics/diverged-branches.txt:1
11311
msgid ""
11312
"Diverged Branches\n"
11313
"================="
11314
msgstr ""
11315
11316
#: en/help_topics/diverged-branches.txt:4
11317
msgid ""
11318
"When Bazaar tries to push one branch onto another, it requires that the\n"
11319
"destination branch must be ready to receive the source branch. If this "
11320
"isn't\n"
11321
"the case, then we say that the branches have ``diverged``. Branches are\n"
11322
"considered diverged if the destination branch's most recent commit is one "
11323
"that\n"
11324
"has not been merged (directly or indirectly) by the source branch. To "
11325
"recover\n"
11326
"from diverged branches, one must merge the missing revisions into the "
11327
"source\n"
11328
"branch."
11329
msgstr ""
11330
11331
#: en/help_topics/diverged-branches.txt:12
11332
msgid ""
11333
"This situation commonly arises when using a centralized workflow with local\n"
11334
"commits. If someone else has committed new work to the mainline since your\n"
11335
"last pull and you have local commits that have not yet been pushed to the\n"
11336
"mainline, then your local branch and the mainline have diverged."
11337
msgstr ""
11338
11339
#: en/help_topics/diverged-branches.txt:17
11340
msgid ""
11341
"Discovering What Has Diverged\n"
11342
"-----------------------------"
11343
msgstr ""
11344
11345
#: en/help_topics/diverged-branches.txt:20
11346
msgid ""
11347
"The ``bzr missing`` command is used to find out what revisions are in "
11348
"another\n"
11349
"branch that are not present in the current branch, and vice-versa. It shows "
11350
"a\n"
11351
"summary of which extra revisions exist in each branch. If you want to see "
11352
"the\n"
11353
"precise effects of those revisions, you can use ``bzr diff --"
11354
"old=other_branch``\n"
11355
"to show the differences between other_branch and your current branch."
11356
msgstr ""
11357
11358
#: en/help_topics/diverged-branches.txt:26
11359
msgid ""
11360
"A Solution\n"
11361
"----------"
11362
msgstr ""
11363
11364
#: en/help_topics/diverged-branches.txt:29
11365
msgid ""
11366
"The solution is to merge the revisions from the mainline into your local\n"
11367
"branch. To do so, use ``bzr merge`` to get the new revisions from the\n"
11368
"mainline. This merge may result in conflicts if the other developer's "
11369
"changes\n"
11370
"overlap with your changes. These conflicts should be resolved before\n"
11371
"continuing. After any conflicts have been resolved, or even if there were "
11372
"no\n"
11373
"conflicts, Bazaar requires that you explicitly commit these new revisions\n"
11374
"to your local branch. This requirement gives you an opportunity to test "
11375
"the\n"
11376
"resulting working tree for correctness, since the merged revisions could "
11377
"have\n"
11378
"made arbitrary changes. After testing, you should commit the merge using\n"
11379
"``bzr commit``. This clears up the diverged branches situation. Your "
11380
"local\n"
11381
"branch can now be pushed to the mainline.\n"
11382
msgstr ""
11383
11384
#: en/help_topics/env-variables.txt:1
11385
msgid "Environment Variables"
11386
msgstr ""
11387
11388
#: en/help_topics/env-variables.txt:3
11389
msgid ""
11390
"=================== "
11391
"===========================================================\n"
11392
"BZRPATH Path where bzr is to look for shell plugin external\n"
11393
" commands.\n"
11394
"BZR_EMAIL E-Mail address of the user. Overrides EMAIL.\n"
11395
"EMAIL E-Mail address of the user.\n"
11396
"BZR_EDITOR Editor for editing commit messages. Overrides EDITOR.\n"
11397
"EDITOR Editor for editing commit messages.\n"
11398
"BZR_PLUGIN_PATH Paths where bzr should look for plugins.\n"
11399
"BZR_DISABLE_PLUGINS Plugins that bzr should not load.\n"
11400
"BZR_PLUGINS_AT Plugins to load from a directory not in "
11401
"BZR_PLUGIN_PATH.\n"
11402
"BZR_HOME Directory holding .bazaar config dir. Overrides HOME.\n"
11403
"BZR_HOME (Win32) Directory holding bazaar config dir. Overrides APPDATA "
11404
"and\n"
11405
" HOME.\n"
11406
"BZR_REMOTE_PATH Full name of remote 'bzr' command (for bzr+ssh:// "
11407
"URLs).\n"
11408
"BZR_SSH Path to SSH client, or one of paramiko, openssh, "
11409
"sshcorp,\n"
11410
" plink or lsh.\n"
11411
"BZR_LOG Location of .bzr.log (use '/dev/null' to suppress log).\n"
11412
"BZR_LOG (Win32) Location of .bzr.log (use 'NUL' to suppress log).\n"
11413
"BZR_COLUMNS Override implicit terminal width.\n"
11414
"BZR_CONCURRENCY Number of processes that can be run concurrently "
11415
"(selftest)\n"
11416
"BZR_PROGRESS_BAR Override the progress display. Values are 'none' or "
11417
"'text'.\n"
11418
"BZR_PDB Control whether to launch a debugger on error.\n"
11419
"BZR_SIGQUIT_PDB Control whether SIGQUIT behaves normally or invokes a\n"
11420
" breakin debugger.\n"
11421
"BZR_TEXTUI_INPUT Force console input mode for prompts to line-based "
11422
"(instead\n"
11423
" of char-based).\n"
11424
"=================== "
11425
"===========================================================\n"
11426
msgstr ""
11427
11428
#: en/help_topics/eol.txt:1
11429
msgid ""
11430
"End of Line Conversion\n"
11431
"======================"
11432
msgstr ""
11433
11434
#: en/help_topics/eol.txt:4
11435
msgid ""
11436
"EOL conversion is provided as a content filter where Bazaar internally\n"
11437
"stores a canonical format but outputs a convenience format. See\n"
11438
"``bzr help content-filters`` for general information about using these."
11439
msgstr ""
11440
11441
#: en/help_topics/eol.txt:8
11442
msgid ""
11443
"Note: Content filtering is only supported in recently added formats,\n"
11444
"e.g. 1.14. Be sure that both the repository *and* the branch are\n"
11445
"in a recent format. (Just setting the format on the repository\n"
11446
"is not enough.) If content filtering does not appear to be working, use\n"
11447
"'bzr info -v' to confirm that the branch is using \"Working tree format 5\"\n"
11448
"or later."
11449
msgstr ""
11450
11451
#: en/help_topics/eol.txt:15
11452
msgid ""
11453
"EOL conversion needs to be enabled for selected file patterns using\n"
11454
"rules. See ``bzr help rules`` for general information on defining rules.\n"
11455
"Currently, rules are only supported in $BZR_HOME/.bazaar/rules (or\n"
11456
"%BZR_HOME%/bazaar/2.0/rules on Windows). Branch specific rules will be\n"
11457
"supported in a future verison of Bazaar."
11458
msgstr ""
11459
11460
#: en/help_topics/eol.txt:21
11461
msgid ""
11462
"To configure which files to filter, set ``eol`` to one of the values below.\n"
11463
"(If a value is not set, ``exact`` is the default.)"
11464
msgstr ""
11465
11466
#: en/help_topics/eol.txt:24
11467
msgid ""
11468
" ========== ===================================== ======================\n"
11469
" Value Checkout end-of-lines as Commit end-of-lines as\n"
11470
" ========== ===================================== ======================\n"
11471
" ``native`` ``crlf`` on Windows, ``lf`` otherwise ``lf``\n"
11472
" ---------- ------------------------------------- ----------------------\n"
11473
" ``lf`` ``lf`` ``lf``\n"
11474
" ---------- ------------------------------------- ----------------------\n"
11475
" ``crlf`` ``crlf`` ``lf``\n"
11476
" ---------- ------------------------------------- ----------------------\n"
11477
" ``exact`` No conversion Exactly as in file\n"
11478
" ========== ===================================== ======================"
11479
msgstr ""
11480
11481
#: en/help_topics/eol.txt:36
11482
msgid ""
11483
"Note: For safety reasons, no conversion is applied to any file where a null\n"
11484
"byte is detected in the file."
11485
msgstr ""
11486
11487
#: en/help_topics/eol.txt:39
11488
msgid ""
11489
"For users working on a cross-platform project, here is a suggested rule\n"
11490
"to use as a starting point::"
11491
msgstr ""
11492
11493
#: en/help_topics/eol.txt:42 en/help_topics/eol.txt:52
11494
#: en/help_topics/eol.txt:67 en/help_topics/eol.txt:82
11495
msgid ""
11496
" [name *]\n"
11497
" eol = native"
11498
msgstr ""
11499
11500
#: en/help_topics/eol.txt:45
11501
msgid ""
11502
"If you have binary files that do not contain a null byte though, be\n"
11503
"sure to add ``eol = exact`` rules for those as well. You can do this\n"
11504
"by giving more explicit patterns earlier in the rules file. For example::"
11505
msgstr ""
11506
11507
#: en/help_topics/eol.txt:49
11508
msgid ""
11509
" [name *.png]\n"
11510
" eol = exact"
11511
msgstr ""
11512
11513
#: en/help_topics/eol.txt:55
11514
msgid ""
11515
"If your working tree is on a network drive shared by users on different\n"
11516
"operating systems, you typically want to force certain conventions for\n"
11517
"certain files. In that way, if a file is created with the wrong line\n"
11518
"endings or line endings get mixed during editing, it gets committed\n"
11519
"correctly and gets checked out correctly. For example::"
11520
msgstr ""
11521
11522
#: en/help_topics/eol.txt:61
11523
msgid ""
11524
" [name *.bat]\n"
11525
" eol = crlf"
11526
msgstr ""
11527
11528
#: en/help_topics/eol.txt:64
11529
msgid ""
11530
" [name *.sh]\n"
11531
" eol = lf"
11532
msgstr ""
11533
11534
#: en/help_topics/eol.txt:70
11535
msgid ""
11536
"If you take the care to create files with their required endings, you can\n"
11537
"achieve *almost* the same thing by using ``eol = exact``. It is slightly\n"
11538
"safer to use ``lf`` and ``crlf`` though because edits accidentally\n"
11539
"introducing mixed line endings will be corrected during commit for files\n"
11540
"with those settings."
11541
msgstr ""
11542
11543
#: en/help_topics/eol.txt:76
11544
msgid ""
11545
"If you have sample test data that deliberately has text files with mixed\n"
11546
"newline conventions, you can ask for those to be left alone like this::"
11547
msgstr ""
11548
11549
#: en/help_topics/eol.txt:79
11550
msgid ""
11551
" [name test_data/]\n"
11552
" eol = exact"
11553
msgstr ""
11554
11555
#: en/help_topics/eol.txt:85
11556
msgid ""
11557
"Note that ``exact`` does not imply the file is binary but it does mean\n"
11558
"that no conversion of end-of-lines will be done. (Bazaar currently relies\n"
11559
"of content analysis to detect binary files for commands like ``diff``.\n"
11560
"In the future, a ``binary = true`` rule may be added but it is not\n"
11561
"supported yet.)"
11562
msgstr ""
11563
11564
#: en/help_topics/eol.txt:91
11565
msgid ""
11566
"If you have an existing repository with text files already stored using\n"
11567
"Windows newline conventions (``crlf``), then you may want to keep using "
11568
"that\n"
11569
"convention in the repository. Forcing certain files to this convention\n"
11570
"may also help users who do not have rules configured. To do this, set\n"
11571
"``eol`` to one of the values below."
11572
msgstr ""
11573
11574
#: en/help_topics/eol.txt:97
11575
msgid ""
11576
" ============================ ======================== "
11577
"======================\n"
11578
" Value Checkout end-of-lines as Commit end-of-lines "
11579
"as\n"
11580
" ============================ ======================== "
11581
"======================\n"
11582
" ``native-with-crlf-in-repo`` ``crlf`` on Windows, ``crlf``\n"
11583
" ``lf`` otherwise\n"
11584
" ---------------------------- ------------------------ ----------------------"
11585
"\n"
11586
" ``lf-with-crlf-in-repo`` ``lf`` ``crlf``\n"
11587
" ---------------------------- ------------------------ ----------------------"
11588
"\n"
11589
" ``crlf-with-crlf-in-repo`` ``crlf`` ``crlf``\n"
11590
" ============================ ======================== ======================"
11591
msgstr ""
11592
11593
#: en/help_topics/eol.txt:108
11594
msgid ""
11595
"For users working on an existing project that uses Windows newline\n"
11596
"conventions in their Bazaar repository, this rule is suggested as a\n"
11597
"starting point::"
11598
msgstr ""
11599
11600
#: en/help_topics/eol.txt:112
11601
msgid ""
11602
" [name *]\n"
11603
" eol = native-with-crlf-in-repo"
11604
msgstr ""
11605
11606
#: en/help_topics/eol.txt:115
11607
msgid ""
11608
"For new projects, it is recommended that end-of-lines be stored as ``lf``\n"
11609
"and that users stick to the basic settings, i.e. ``native``, ``lf``,\n"
11610
"``crlf`` and ``exact``."
11611
msgstr ""
11612
11613
#: en/help_topics/eol.txt:119
11614
msgid ""
11615
"Note: Bazaar's EOL conversion will convert the content of files but\n"
11616
"never reject files because a given line ending or mixed line endings\n"
11617
"are found. A precommit hook should be used if you wish to validate\n"
11618
"(and not just convert) content before committing.\n"
11619
msgstr ""
11620
11621
#: en/help_topics/hidden-commands.txt:1
11622
msgid ""
11623
"added List files added in working tree.\n"
11624
"ancestry List all revisions merged into this branch.\n"
11625
"assert-fail Test reporting of assertion failures\n"
11626
"bundle-info Output interesting stats about a bundle\n"
11627
"bundle-revisions Create a merge-directive for submitting changes.\n"
11628
"cat-revision Write out metadata for a revision.\n"
11629
"dump-btree Dump the contents of a btree index file to stdout.\n"
11630
"export-pot Export command helps and error messages in po format.\n"
11631
"file-id Print file_id of a particular file or directory.\n"
11632
"file-path Print path of file_ids to a file or directory.\n"
11633
"find-merge-base Find and print a base revision for merging two "
11634
"branches.\n"
11635
"hooks Show hooks.\n"
11636
"inventory Show inventory of the current working copy or a "
11637
"revision.\n"
11638
"local-time-offset Show the offset in seconds from GMT to local time.\n"
11639
"lookup-revision Lookup the revision-id from a revision-number\n"
11640
"merge-directive Generate a merge directive for auto-merge tools.\n"
11641
"modified List files modified in working tree.\n"
11642
"re-sign Create a digital signature for an existing revision.\n"
11643
"reference list, view and set branch locations for nested trees.\n"
11644
"relpath Show path of a file relative to root\n"
11645
"repair-workingtree Reset the working tree state file.\n"
11646
"revision-history Display the list of revision ids on a branch.\n"
11647
"revision-info Show revision number and revision id for a given "
11648
"revision\n"
11649
" identifier.\n"
11650
"rocks Statement of optimism.\n"
11651
"selftest Run internal test suite.\n"
11652
"shell-complete Show appropriate completions for context.\n"
11653
"test-script Run a shell-like test from a file.\n"
11654
"touching-revisions Return revision-ids which affected a particular file.\n"
11655
"unknowns List unknown files.\n"
11656
"wait-until-signalled Test helper for\n"
11657
" test_start_and_stop_bzr_subprocess_send_signal.\n"
11658
msgstr ""
11659
11660
#: en/help_topics/hooks.txt:1
11661
msgid ""
11662
"\n"
11663
"Hooks\n"
11664
"====="
11665
msgstr ""
11666
11667
#: en/help_topics/hooks.txt:5 en/help_topics/rules.txt:4
11668
msgid ""
11669
"Introduction\n"
11670
"------------"
11671
msgstr ""
11672
11673
#: en/help_topics/hooks.txt:8
11674
msgid "A hook of type *xxx* of class *yyy* needs to be registered using::"
11675
msgstr ""
11676
11677
#: en/help_topics/hooks.txt:10
11678
msgid " yyy.hooks.install_named_hook(\"xxx\", ...)"
11679
msgstr ""
11680
11681
#: en/help_topics/hooks.txt:12
11682
msgid ""
11683
"See :doc:`Using hooks<../user-guide/hooks>` in the User Guide for examples."
11684
msgstr ""
11685
11686
#: en/help_topics/hooks.txt:14
11687
msgid ""
11688
"The class that contains each hook is given before the hooks it supplies. "
11689
"For\n"
11690
"instance, BranchHooks as the class is the hooks class for\n"
11691
"`bzrlib.branch.Branch.hooks`."
11692
msgstr ""
11693
11694
#: en/help_topics/hooks.txt:18
11695
msgid ""
11696
"Each description also indicates whether the hook runs on the client (the\n"
11697
"machine where bzr was invoked) or the server (the machine addressed by\n"
11698
"the branch URL). These may be, but are not necessarily, the same machine."
11699
msgstr ""
11700
11701
#: en/help_topics/hooks.txt:22
11702
msgid ""
11703
"Plugins (including hooks) are run on the server if all of these is true:"
11704
msgstr ""
11705
11706
#: en/help_topics/hooks.txt:24
11707
msgid ""
11708
" * The connection is via a smart server (accessed with a URL starting with\n"
11709
" \"bzr://\", \"bzr+ssh://\" or \"bzr+http://\", or accessed via a "
11710
"\"http://\"\n"
11711
" URL when a smart server is available via HTTP)."
11712
msgstr ""
11713
11714
#: en/help_topics/hooks.txt:28
11715
msgid ""
11716
" * The hook is either server specific or part of general infrastructure "
11717
"rather\n"
11718
" than client specific code (such as commit)."
11719
msgstr ""
11720
11721
#: en/help_topics/hooks.txt:31
11722
msgid ""
11723
"\n"
11724
"BranchHooks\n"
11725
"-----------"
11726
msgstr ""
11727
11728
#: en/help_topics/hooks.txt:35
11729
msgid ""
11730
"automatic_tag_name\n"
11731
"~~~~~~~~~~~~~~~~~~"
11732
msgstr ""
11733
11734
#: en/help_topics/hooks.txt:38 en/help_topics/hooks.txt:56
11735
#: en/help_topics/hooks.txt:102 en/help_topics/hooks.txt:262
11736
msgid "Introduced in: 2.2"
11737
msgstr ""
11738
11739
#: en/help_topics/hooks.txt:40
11740
msgid ""
11741
"Called to determine an automatic tag name for a revision.\n"
11742
"automatic_tag_name is called with (branch, revision_id) and should\n"
11743
"return a tag name or None if no tag name could be determined. The\n"
11744
"first non-None tag name returned will be used."
11745
msgstr ""
11746
11747
#: en/help_topics/hooks.txt:45
11748
msgid ""
11749
"open\n"
11750
"~~~~"
11751
msgstr ""
11752
11753
#: en/help_topics/hooks.txt:48 en/help_topics/hooks.txt:293
11754
#: en/help_topics/hooks.txt:307
11755
msgid "Introduced in: 1.8"
11756
msgstr ""
11757
11758
#: en/help_topics/hooks.txt:50
11759
msgid ""
11760
"Called with the Branch object that has been opened after a branch is\n"
11761
"opened."
11762
msgstr ""
11763
11764
#: en/help_topics/hooks.txt:53
11765
msgid ""
11766
"post_branch_init\n"
11767
"~~~~~~~~~~~~~~~~"
11768
msgstr ""
11769
11770
#: en/help_topics/hooks.txt:58
11771
msgid ""
11772
"Called after new branch initialization completes. post_branch_init is\n"
11773
"called with a bzrlib.branch.BranchInitHookParams. Note that init,\n"
11774
"branch and checkout (both heavyweight and lightweight) will all\n"
11775
"trigger this hook."
11776
msgstr ""
11777
11778
#: en/help_topics/hooks.txt:63
11779
msgid ""
11780
"post_change_branch_tip\n"
11781
"~~~~~~~~~~~~~~~~~~~~~~"
11782
msgstr ""
11783
11784
#: en/help_topics/hooks.txt:66 en/help_topics/hooks.txt:421
11785
msgid "Introduced in: 1.4"
11786
msgstr ""
11787
11788
#: en/help_topics/hooks.txt:68
11789
msgid ""
11790
"Called in bzr client and server after a change to the tip of a branch\n"
11791
"is made. post_change_branch_tip is called with a\n"
11792
"bzrlib.branch.ChangeBranchTipParams. Note that push, pull, commit,\n"
11793
"uncommit will all trigger this hook."
11794
msgstr ""
11795
11796
#: en/help_topics/hooks.txt:73 en/help_topics/hooks.txt:392
11797
msgid ""
11798
"post_commit\n"
11799
"~~~~~~~~~~~"
11800
msgstr ""
11801
11802
#: en/help_topics/hooks.txt:76 en/help_topics/hooks.txt:86
11803
#: en/help_topics/hooks.txt:94 en/help_topics/hooks.txt:110
11804
msgid "Introduced in: 0.15"
11805
msgstr ""
11806
11807
#: en/help_topics/hooks.txt:78
11808
msgid ""
11809
"Called in the bzr client after a commit has completed. post_commit is\n"
11810
"called with (local, master, old_revno, old_revid, new_revno,\n"
11811
"new_revid). old_revid is NULL_REVISION for the first commit to a\n"
11812
"branch."
11813
msgstr ""
11814
11815
#: en/help_topics/hooks.txt:83
11816
msgid ""
11817
"post_pull\n"
11818
"~~~~~~~~~"
11819
msgstr ""
11820
11821
#: en/help_topics/hooks.txt:88
11822
msgid ""
11823
"Called after a pull operation completes. post_pull is called with a\n"
11824
"bzrlib.branch.PullResult object and only runs in the bzr client."
11825
msgstr ""
11826
11827
#: en/help_topics/hooks.txt:91
11828
msgid ""
11829
"post_push\n"
11830
"~~~~~~~~~"
11831
msgstr ""
11832
11833
#: en/help_topics/hooks.txt:96
11834
msgid ""
11835
"Called after a push operation completes. post_push is called with a\n"
11836
"bzrlib.branch.BranchPushResult object and only runs in the bzr client."
11837
msgstr ""
11838
11839
#: en/help_topics/hooks.txt:99
11840
msgid ""
11841
"post_switch\n"
11842
"~~~~~~~~~~~"
11843
msgstr ""
11844
11845
#: en/help_topics/hooks.txt:104
11846
msgid ""
11847
"Called after a checkout switches branch. post_switch is called with a\n"
11848
"bzrlib.branch.SwitchHookParams."
11849
msgstr ""
11850
11851
#: en/help_topics/hooks.txt:107
11852
msgid ""
11853
"post_uncommit\n"
11854
"~~~~~~~~~~~~~"
11855
msgstr ""
11856
11857
#: en/help_topics/hooks.txt:112
11858
msgid ""
11859
"Called in the bzr client after an uncommit completes. post_uncommit is\n"
11860
"called with (local, master, old_revno, old_revid, new_revno,\n"
11861
"new_revid) where local is the local branch or None, master is the\n"
11862
"target branch, and an empty branch receives new_revno of 0, new_revid\n"
11863
"of None."
11864
msgstr ""
11865
11866
#: en/help_topics/hooks.txt:118
11867
msgid ""
11868
"pre_change_branch_tip\n"
11869
"~~~~~~~~~~~~~~~~~~~~~"
11870
msgstr ""
11871
11872
#: en/help_topics/hooks.txt:121
11873
msgid "Introduced in: 1.6"
11874
msgstr ""
11875
11876
#: en/help_topics/hooks.txt:123
11877
msgid ""
11878
"Called in bzr client and server before a change to the tip of a branch\n"
11879
"is made. pre_change_branch_tip is called with a\n"
11880
"bzrlib.branch.ChangeBranchTipParams. Note that push, pull, commit,\n"
11881
"uncommit will all trigger this hook."
11882
msgstr ""
11883
11884
#: en/help_topics/hooks.txt:128
11885
msgid ""
11886
"pre_commit\n"
11887
"~~~~~~~~~~"
11888
msgstr ""
11889
11890
#: en/help_topics/hooks.txt:131
11891
msgid "Introduced in: 0.91"
11892
msgstr ""
11893
11894
#: en/help_topics/hooks.txt:133
11895
msgid ""
11896
"Called after a commit is calculated but before it is completed.\n"
11897
"pre_commit is called with (local, master, old_revno, old_revid,\n"
11898
"future_revno, future_revid, tree_delta, future_tree). old_revid is\n"
11899
"NULL_REVISION for the first commit to a branch, tree_delta is a\n"
11900
"TreeDelta object describing changes from the basis revision. hooks\n"
11901
"MUST NOT modify this delta. future_tree is an in-memory tree obtained\n"
11902
"from CommitBuilder.revision_tree() and hooks MUST NOT modify this\n"
11903
"tree."
11904
msgstr ""
11905
11906
#: en/help_topics/hooks.txt:142
11907
msgid ""
11908
"transform_fallback_location\n"
11909
"~~~~~~~~~~~~~~~~~~~~~~~~~~~"
11910
msgstr ""
11911
11912
#: en/help_topics/hooks.txt:145
11913
msgid "Introduced in: 1.9"
11914
msgstr ""
11915
11916
#: en/help_topics/hooks.txt:147
11917
msgid ""
11918
"Called when a stacked branch is activating its fallback locations.\n"
11919
"transform_fallback_location is called with (branch, url), and should\n"
11920
"return a new url. Returning the same url allows it to be used as-is,\n"
11921
"returning a different one can be used to cause the branch to stack on\n"
11922
"a closer copy of that fallback_location. Note that the branch cannot\n"
11923
"have history accessing methods called on it during this hook because\n"
11924
"the fallback locations have not been activated. When there are\n"
11925
"multiple hooks installed for transform_fallback_location, all are\n"
11926
"called with the url returned from the previous hook.The order is\n"
11927
"however undefined."
11928
msgstr ""
11929
11930
#: en/help_topics/hooks.txt:158
11931
msgid ""
11932
"CommandHooks\n"
11933
"------------"
11934
msgstr ""
11935
11936
#: en/help_topics/hooks.txt:161
11937
msgid ""
11938
"extend_command\n"
11939
"~~~~~~~~~~~~~~"
11940
msgstr ""
11941
11942
#: en/help_topics/hooks.txt:164
11943
msgid "Introduced in: 1.13"
11944
msgstr ""
11945
11946
#: en/help_topics/hooks.txt:166
11947
msgid ""
11948
"Called after creating a command object to allow modifications such as\n"
11949
"adding or removing options, docs etc. Called with the new\n"
11950
"bzrlib.commands.Command object."
11951
msgstr ""
11952
11953
#: en/help_topics/hooks.txt:170
11954
msgid ""
11955
"get_command\n"
11956
"~~~~~~~~~~~"
11957
msgstr ""
11958
11959
#: en/help_topics/hooks.txt:173 en/help_topics/hooks.txt:185
11960
#: en/help_topics/hooks.txt:194 en/help_topics/hooks.txt:467
11961
msgid "Introduced in: 1.17"
11962
msgstr ""
11963
11964
#: en/help_topics/hooks.txt:175
11965
msgid ""
11966
"Called when creating a single command. Called with (cmd_or_None,\n"
11967
"command_name). get_command should either return the cmd_or_None\n"
11968
"parameter, or a replacement Command object that should be used for the\n"
11969
"command. Note that the Command.hooks hooks are core infrastructure.\n"
11970
"Many users will prefer to use bzrlib.commands.register_command or\n"
11971
"plugin_cmds.register_lazy."
11972
msgstr ""
11973
11974
#: en/help_topics/hooks.txt:182
11975
msgid ""
11976
"get_missing_command\n"
11977
"~~~~~~~~~~~~~~~~~~~"
11978
msgstr ""
11979
11980
#: en/help_topics/hooks.txt:187
11981
msgid ""
11982
"Called when creating a single command if no command could be found.\n"
11983
"Called with (command_name). get_missing_command should either return\n"
11984
"None, or a Command object to be used for the command."
11985
msgstr ""
11986
11987
#: en/help_topics/hooks.txt:191
11988
msgid ""
11989
"list_commands\n"
11990
"~~~~~~~~~~~~~"
11991
msgstr ""
11992
11993
#: en/help_topics/hooks.txt:196
11994
msgid ""
11995
"Called when enumerating commands. Called with a set of cmd_name\n"
11996
"strings for all the commands found so far. This set is safe to mutate\n"
11997
"- e.g. to remove a command. list_commands should return the updated\n"
11998
"set of command names."
11999
msgstr ""
12000
12001
#: en/help_topics/hooks.txt:201
12002
msgid ""
12003
"post_command\n"
12004
"~~~~~~~~~~~~"
12005
msgstr ""
12006
12007
#: en/help_topics/hooks.txt:204 en/help_topics/hooks.txt:211
12008
msgid "Introduced in: 2.6"
12009
msgstr ""
12010
12011
#: en/help_topics/hooks.txt:206
12012
msgid "Called after executing a command. Called with the command object."
12013
msgstr ""
12014
12015
#: en/help_topics/hooks.txt:208
12016
msgid ""
12017
"pre_command\n"
12018
"~~~~~~~~~~~"
12019
msgstr ""
12020
12021
#: en/help_topics/hooks.txt:213
12022
msgid "Called prior to executing a command. Called with the command object."
12023
msgstr ""
12024
12025
#: en/help_topics/hooks.txt:215
12026
msgid ""
12027
"_ConfigHooks\n"
12028
"------------"
12029
msgstr ""
12030
12031
#: en/help_topics/hooks.txt:218
12032
msgid ""
12033
"get\n"
12034
"~~~"
12035
msgstr ""
12036
12037
#: en/help_topics/hooks.txt:221 en/help_topics/hooks.txt:229
12038
#: en/help_topics/hooks.txt:236 en/help_topics/hooks.txt:244
12039
#: en/help_topics/hooks.txt:251 en/help_topics/hooks.txt:373
12040
#: en/help_topics/hooks.txt:446
12041
msgid "Introduced in: 2.4"
12042
msgstr ""
12043
12044
#: en/help_topics/hooks.txt:223
12045
msgid ""
12046
"Invoked when a config option is read. The signature is (stack, name,\n"
12047
"value)."
12048
msgstr ""
12049
12050
#: en/help_topics/hooks.txt:226
12051
msgid ""
12052
"load\n"
12053
"~~~~"
12054
msgstr ""
12055
12056
#: en/help_topics/hooks.txt:231
12057
msgid "Invoked when a config store is loaded. The signature is (store)."
12058
msgstr ""
12059
12060
#: en/help_topics/hooks.txt:233
12061
msgid ""
12062
"remove\n"
12063
"~~~~~~"
12064
msgstr ""
12065
12066
#: en/help_topics/hooks.txt:238
12067
msgid ""
12068
"Invoked when a config option is removed. The signature is (stack,\n"
12069
"name)."
12070
msgstr ""
12071
12072
#: en/help_topics/hooks.txt:241
12073
msgid ""
12074
"save\n"
12075
"~~~~"
12076
msgstr ""
12077
12078
#: en/help_topics/hooks.txt:246
12079
msgid "Invoked when a config store is saved. The signature is (store)."
12080
msgstr ""
12081
12082
#: en/help_topics/hooks.txt:248
12083
msgid ""
12084
"set\n"
12085
"~~~"
12086
msgstr ""
12087
12088
#: en/help_topics/hooks.txt:253
12089
msgid ""
12090
"Invoked when a config option is set. The signature is (stack, name,\n"
12091
"value)."
12092
msgstr ""
12093
12094
#: en/help_topics/hooks.txt:256
12095
msgid ""
12096
"ControlDirHooks\n"
12097
"---------------"
12098
msgstr ""
12099
12100
#: en/help_topics/hooks.txt:259
12101
msgid ""
12102
"post_repo_init\n"
12103
"~~~~~~~~~~~~~~"
12104
msgstr ""
12105
12106
#: en/help_topics/hooks.txt:264
12107
msgid ""
12108
"Invoked after a repository has been initialized. post_repo_init is\n"
12109
"called with a bzrlib.controldir.RepoInitHookParams."
12110
msgstr ""
12111
12112
#: en/help_topics/hooks.txt:267
12113
msgid ""
12114
"pre_open\n"
12115
"~~~~~~~~"
12116
msgstr ""
12117
12118
#: en/help_topics/hooks.txt:270
12119
msgid "Introduced in: 1.14"
12120
msgstr ""
12121
12122
#: en/help_topics/hooks.txt:272
12123
msgid ""
12124
"Invoked before attempting to open a ControlDir with the transport that\n"
12125
"the open will use."
12126
msgstr ""
12127
12128
#: en/help_topics/hooks.txt:275
12129
msgid ""
12130
"InfoHooks\n"
12131
"---------"
12132
msgstr ""
12133
12134
#: en/help_topics/hooks.txt:278
12135
msgid ""
12136
"repository\n"
12137
"~~~~~~~~~~"
12138
msgstr ""
12139
12140
#: en/help_topics/hooks.txt:281 en/help_topics/hooks.txt:300
12141
#: en/help_topics/hooks.txt:524
12142
msgid "Introduced in: 1.15"
12143
msgstr ""
12144
12145
#: en/help_topics/hooks.txt:283
12146
msgid ""
12147
"Invoked when displaying the statistics for a repository. repository is\n"
12148
"called with a statistics dictionary as returned by the repository and\n"
12149
"a file-like object to write to."
12150
msgstr ""
12151
12152
#: en/help_topics/hooks.txt:287
12153
msgid ""
12154
"LockHooks\n"
12155
"---------"
12156
msgstr ""
12157
12158
#: en/help_topics/hooks.txt:290
12159
msgid ""
12160
"lock_acquired\n"
12161
"~~~~~~~~~~~~~"
12162
msgstr ""
12163
12164
#: en/help_topics/hooks.txt:295
12165
msgid ""
12166
"Called with a bzrlib.lock.LockResult when a physical lock is acquired."
12167
msgstr ""
12168
12169
#: en/help_topics/hooks.txt:297
12170
msgid ""
12171
"lock_broken\n"
12172
"~~~~~~~~~~~"
12173
msgstr ""
12174
12175
#: en/help_topics/hooks.txt:302
12176
msgid "Called with a bzrlib.lock.LockResult when a physical lock is broken."
12177
msgstr ""
12178
12179
#: en/help_topics/hooks.txt:304
12180
msgid ""
12181
"lock_released\n"
12182
"~~~~~~~~~~~~~"
12183
msgstr ""
12184
12185
#: en/help_topics/hooks.txt:309
12186
msgid ""
12187
"Called with a bzrlib.lock.LockResult when a physical lock is released."
12188
msgstr ""
12189
12190
#: en/help_topics/hooks.txt:311
12191
msgid ""
12192
"MergeHooks\n"
12193
"----------"
12194
msgstr ""
12195
12196
#: en/help_topics/hooks.txt:314
12197
msgid ""
12198
"merge_file_content\n"
12199
"~~~~~~~~~~~~~~~~~~"
12200
msgstr ""
12201
12202
#: en/help_topics/hooks.txt:317
12203
msgid "Introduced in: 2.1"
12204
msgstr ""
12205
12206
#: en/help_topics/hooks.txt:319
12207
msgid ""
12208
"Called with a bzrlib.merge.Merger object to create a per file merge\n"
12209
"object when starting a merge. Should return either None or a subclass\n"
12210
"of ``bzrlib.merge.AbstractPerFileMerger``. Such objects will then be\n"
12211
"called per file that needs to be merged (including when one side has\n"
12212
"deleted the file and the other has changed it). See the\n"
12213
"AbstractPerFileMerger API docs for details on how it is used by merge."
12214
msgstr ""
12215
12216
#: en/help_topics/hooks.txt:326
12217
msgid ""
12218
"post_merge\n"
12219
"~~~~~~~~~~"
12220
msgstr ""
12221
12222
#: en/help_topics/hooks.txt:329 en/help_topics/hooks.txt:337
12223
#: en/help_topics/hooks.txt:387 en/help_topics/hooks.txt:405
12224
#: en/help_topics/hooks.txt:413 en/help_topics/hooks.txt:512
12225
msgid "Introduced in: 2.5"
12226
msgstr ""
12227
12228
#: en/help_topics/hooks.txt:331
12229
msgid ""
12230
"Called after a merge. Receives a Merger object as the single argument.\n"
12231
"The return value is ignored."
12232
msgstr ""
12233
12234
#: en/help_topics/hooks.txt:334
12235
msgid ""
12236
"pre_merge\n"
12237
"~~~~~~~~~"
12238
msgstr ""
12239
12240
#: en/help_topics/hooks.txt:339
12241
msgid ""
12242
"Called before a merge. Receives a Merger object as the single\n"
12243
"argument."
12244
msgstr ""
12245
12246
#: en/help_topics/hooks.txt:342
12247
msgid ""
12248
"MergeDirectiveHooks\n"
12249
"-------------------"
12250
msgstr ""
12251
12252
#: en/help_topics/hooks.txt:345
12253
msgid ""
12254
"merge_request_body\n"
12255
"~~~~~~~~~~~~~~~~~~"
12256
msgstr ""
12257
12258
#: en/help_topics/hooks.txt:348
12259
msgid "Introduced in: 1.15.0"
12260
msgstr ""
12261
12262
#: en/help_topics/hooks.txt:350
12263
msgid ""
12264
"Called with a MergeRequestBodyParams when a body is needed for a merge\n"
12265
"request. Callbacks must return a body. If more than one callback is\n"
12266
"registered, the output of one callback is provided to the next."
12267
msgstr ""
12268
12269
#: en/help_topics/hooks.txt:354
12270
msgid ""
12271
"MessageEditorHooks\n"
12272
"------------------"
12273
msgstr ""
12274
12275
#: en/help_topics/hooks.txt:357
12276
msgid ""
12277
"commit_message_template\n"
12278
"~~~~~~~~~~~~~~~~~~~~~~~"
12279
msgstr ""
12280
12281
#: en/help_topics/hooks.txt:360
12282
msgid "Introduced in: 1.10"
12283
msgstr ""
12284
12285
#: en/help_topics/hooks.txt:362
12286
msgid ""
12287
"Called when a commit message is being generated.\n"
12288
"commit_message_template is called with the bzrlib.commit.Commit object\n"
12289
"and the message that is known so far. commit_message_template must\n"
12290
"return a new message to use (which could be the same as it was given).\n"
12291
"When there are multiple hooks registered for commit_message_template,\n"
12292
"they are chained with the result from the first passed into the\n"
12293
"second, and so on."
12294
msgstr ""
12295
12296
#: en/help_topics/hooks.txt:370
12297
msgid ""
12298
"set_commit_message\n"
12299
"~~~~~~~~~~~~~~~~~~"
12300
msgstr ""
12301
12302
#: en/help_topics/hooks.txt:375
12303
msgid ""
12304
"Set a fixed commit message. set_commit_message is called with the\n"
12305
"bzrlib.commit.Commit object (so you can also change e.g. revision\n"
12306
"properties by editing commit.builder._revprops) and the message so\n"
12307
"far. set_commit_message must return the message to use or None if it\n"
12308
"should use the message editor as normal."
12309
msgstr ""
12310
12311
#: en/help_topics/hooks.txt:381
12312
msgid ""
12313
"MutableTreeHooks\n"
12314
"----------------"
12315
msgstr ""
12316
12317
#: en/help_topics/hooks.txt:384
12318
msgid ""
12319
"post_build_tree\n"
12320
"~~~~~~~~~~~~~~~"
12321
msgstr ""
12322
12323
#: en/help_topics/hooks.txt:389
12324
msgid ""
12325
"Called after a completely new tree is built. The hook is called with\n"
12326
"the tree as its only argument."
12327
msgstr ""
12328
12329
#: en/help_topics/hooks.txt:395
12330
msgid "Introduced in: 2.0"
12331
msgstr ""
12332
12333
#: en/help_topics/hooks.txt:397
12334
msgid ""
12335
"Called after a commit is performed on a tree. The hook is called with\n"
12336
"a bzrlib.mutabletree.PostCommitHookParams object. The mutable tree the\n"
12337
"commit was performed on is available via the mutable_tree attribute of\n"
12338
"that object."
12339
msgstr ""
12340
12341
#: en/help_topics/hooks.txt:402
12342
msgid ""
12343
"post_transform\n"
12344
"~~~~~~~~~~~~~~"
12345
msgstr ""
12346
12347
#: en/help_topics/hooks.txt:407
12348
msgid ""
12349
"Called after a tree transform has been performed on a tree. The hook\n"
12350
"is called with the tree that is being transformed and the transform."
12351
msgstr ""
12352
12353
#: en/help_topics/hooks.txt:410
12354
msgid ""
12355
"pre_transform\n"
12356
"~~~~~~~~~~~~~"
12357
msgstr ""
12358
12359
#: en/help_topics/hooks.txt:415
12360
msgid ""
12361
"Called before a tree transform on this tree. The hook is called with\n"
12362
"the tree that is being transformed and the transform."
12363
msgstr ""
12364
12365
#: en/help_topics/hooks.txt:418
12366
msgid ""
12367
"start_commit\n"
12368
"~~~~~~~~~~~~"
12369
msgstr ""
12370
12371
#: en/help_topics/hooks.txt:423
12372
msgid ""
12373
"Called before a commit is performed on a tree. The start commit hook\n"
12374
"is able to change the tree before the commit takes place. start_commit\n"
12375
"is called with the bzrlib.mutabletree.MutableTree that the commit is\n"
12376
"being performed on."
12377
msgstr ""
12378
12379
#: en/help_topics/hooks.txt:428
12380
msgid ""
12381
"SmartClientHooks\n"
12382
"----------------"
12383
msgstr ""
12384
12385
#: en/help_topics/hooks.txt:431
12386
msgid ""
12387
"call\n"
12388
"~~~~"
12389
msgstr ""
12390
12391
#: en/help_topics/hooks.txt:434
12392
msgid "Introduced in: unknown"
12393
msgstr ""
12394
12395
#: en/help_topics/hooks.txt:436
12396
msgid ""
12397
"Called when the smart client is submitting a request to the smart\n"
12398
"server. Called with a bzrlib.smart.client.CallHookParams object.\n"
12399
"Streaming request bodies, and responses, are not accessible."
12400
msgstr ""
12401
12402
#: en/help_topics/hooks.txt:440
12403
msgid ""
12404
"SmartServerHooks\n"
12405
"----------------"
12406
msgstr ""
12407
12408
#: en/help_topics/hooks.txt:443
12409
msgid ""
12410
"server_exception\n"
12411
"~~~~~~~~~~~~~~~~"
12412
msgstr ""
12413
12414
#: en/help_topics/hooks.txt:448
12415
msgid ""
12416
"Called by the bzr server when an exception occurs. server_exception is\n"
12417
"called with the sys.exc_info() tuple return true for the hook if the\n"
12418
"exception has been handled, in which case the server will exit\n"
12419
"normally."
12420
msgstr ""
12421
12422
#: en/help_topics/hooks.txt:453
12423
msgid ""
12424
"server_started\n"
12425
"~~~~~~~~~~~~~~"
12426
msgstr ""
12427
12428
#: en/help_topics/hooks.txt:456 en/help_topics/hooks.txt:475
12429
msgid "Introduced in: 0.16"
12430
msgstr ""
12431
12432
#: en/help_topics/hooks.txt:458
12433
msgid ""
12434
"Called by the bzr server when it starts serving a directory.\n"
12435
"server_started is called with (backing urls, public url), where\n"
12436
"backing_url is a list of URLs giving the server-specific directory\n"
12437
"locations, and public_url is the public URL for the directory being\n"
12438
"served."
12439
msgstr ""
12440
12441
#: en/help_topics/hooks.txt:464
12442
msgid ""
12443
"server_started_ex\n"
12444
"~~~~~~~~~~~~~~~~~"
12445
msgstr ""
12446
12447
#: en/help_topics/hooks.txt:469
12448
msgid ""
12449
"Called by the bzr server when it starts serving a directory.\n"
12450
"server_started is called with (backing_urls, server_obj)."
12451
msgstr ""
12452
12453
#: en/help_topics/hooks.txt:472
12454
msgid ""
12455
"server_stopped\n"
12456
"~~~~~~~~~~~~~~"
12457
msgstr ""
12458
12459
#: en/help_topics/hooks.txt:477
12460
msgid ""
12461
"Called by the bzr server when it stops serving a directory.\n"
12462
"server_stopped is called with the same parameters as the\n"
12463
"server_started hook: (backing_urls, public_url)."
12464
msgstr ""
12465
12466
#: en/help_topics/hooks.txt:481
12467
msgid ""
12468
"StatusHooks\n"
12469
"-----------"
12470
msgstr ""
12471
12472
#: en/help_topics/hooks.txt:484
12473
msgid ""
12474
"post_status\n"
12475
"~~~~~~~~~~~"
12476
msgstr ""
12477
12478
#: en/help_topics/hooks.txt:487 en/help_topics/hooks.txt:498
12479
msgid "Introduced in: 2.3"
12480
msgstr ""
12481
12482
#: en/help_topics/hooks.txt:489
12483
msgid ""
12484
"Called with argument StatusHookParams after Bazaar has displayed the\n"
12485
"status. StatusHookParams has the attributes (old_tree, new_tree,\n"
12486
"to_file, versioned, show_ids, short, verbose). The last four arguments\n"
12487
"correspond to the command line options specified by the user for the\n"
12488
"status command. to_file is the output stream for writing."
12489
msgstr ""
12490
12491
#: en/help_topics/hooks.txt:495
12492
msgid ""
12493
"pre_status\n"
12494
"~~~~~~~~~~"
12495
msgstr ""
12496
12497
#: en/help_topics/hooks.txt:500
12498
msgid ""
12499
"Called with argument StatusHookParams before Bazaar displays the\n"
12500
"status. StatusHookParams has the attributes (old_tree, new_tree,\n"
12501
"to_file, versioned, show_ids, short, verbose). The last four arguments\n"
12502
"correspond to the command line options specified by the user for the\n"
12503
"status command. to_file is the output stream for writing."
12504
msgstr ""
12505
12506
#: en/help_topics/hooks.txt:506
12507
msgid ""
12508
"TransportHooks\n"
12509
"--------------"
12510
msgstr ""
12511
12512
#: en/help_topics/hooks.txt:509
12513
msgid ""
12514
"post_connect\n"
12515
"~~~~~~~~~~~~"
12516
msgstr ""
12517
12518
#: en/help_topics/hooks.txt:514
12519
msgid ""
12520
"Called after a new connection is established or a reconnect occurs.\n"
12521
"The sole argument passed is either the connected transport or smart\n"
12522
"medium instance."
12523
msgstr ""
12524
12525
#: en/help_topics/hooks.txt:518
12526
msgid ""
12527
"RioVersionInfoBuilderHooks\n"
12528
"--------------------------"
12529
msgstr ""
12530
12531
#: en/help_topics/hooks.txt:521
12532
msgid ""
12533
"revision\n"
12534
"~~~~~~~~"
12535
msgstr ""
12536
12537
#: en/help_topics/hooks.txt:526
12538
msgid ""
12539
"Invoked when adding information about a revision to the RIO stanza\n"
12540
"that is printed. revision is called with a revision object and a RIO\n"
12541
"stanza.\n"
12542
msgstr ""
12543
12544
#: en/help_topics/location-alias.txt:1
12545
msgid ""
12546
"Location aliases\n"
12547
"================"
12548
msgstr ""
12549
12550
#: en/help_topics/location-alias.txt:4
12551
msgid ""
12552
"Bazaar defines several aliases for locations associated with a branch. "
12553
"These\n"
12554
"can be used with most commands that expect a location, such as `bzr push`."
12555
msgstr ""
12556
12557
#: en/help_topics/location-alias.txt:7
12558
msgid "The aliases are::"
12559
msgstr ""
12560
12561
#: en/help_topics/location-alias.txt:9
12562
msgid ""
12563
" :bound The branch this branch is bound to, for bound branches.\n"
12564
" :parent The parent of this branch.\n"
12565
" :public The public location of this branch.\n"
12566
" :push The saved location used for `bzr push` with no arguments.\n"
12567
" :submit The submit branch for this branch.\n"
12568
" :this This branch."
12569
msgstr ""
12570
12571
#: en/help_topics/location-alias.txt:16
12572
msgid "For example, to push to the parent location::"
12573
msgstr ""
12574
12575
#: en/help_topics/location-alias.txt:18
12576
msgid " bzr push :parent\n"
12577
msgstr ""
12578
12579
#: en/help_topics/log-formats.txt:1
12580
msgid ""
12581
"Log Formats\n"
12582
"==========="
12583
msgstr ""
12584
12585
#: en/help_topics/log-formats.txt:4
12586
msgid ""
12587
"A log format controls how information about each revision is displayed.\n"
12588
"The standard log formats are compared below::"
12589
msgstr ""
12590
12591
#: en/help_topics/log-formats.txt:7
12592
msgid ""
12593
" Feature long short line\n"
12594
" ---------------------- ------------- ------------ -------------------\n"
12595
" design goal detailed view concise view 1 revision per line\n"
12596
" committer name+email name only name only\n"
12597
" author name+email - -\n"
12598
" date-time format full date only date only\n"
12599
" commit message full full top line\n"
12600
" tags yes yes yes\n"
12601
" merges indicator - yes -\n"
12602
" status/delta optional optional -\n"
12603
" diff/patch optional optional -\n"
12604
" revision-id optional optional -\n"
12605
" branch nick yes - -\n"
12606
" foreign vcs properties yes yes -\n"
12607
" preferred levels all 1 1\n"
12608
" digital signature optional - -"
12609
msgstr ""
12610
12611
#: en/help_topics/log-formats.txt:24
12612
msgid ""
12613
"The default format is ``long``. To change this, define the ``log_format``\n"
12614
"setting in the ``[DEFAULT]`` section of ``bazaar.conf`` like this (say)::"
12615
msgstr ""
12616
12617
#: en/help_topics/log-formats.txt:27
12618
msgid ""
12619
" [DEFAULT]\n"
12620
" log_format = short"
12621
msgstr ""
12622
12623
#: en/help_topics/log-formats.txt:30
12624
msgid ""
12625
"Alternatively, to change the log format used for a given query, use the\n"
12626
"--long, --short or --line options."
12627
msgstr ""
12628
12629
#: en/help_topics/log-formats.txt:33
12630
msgid ""
12631
"If one of the standard log formats does not meet your needs, additional\n"
12632
"formats can be provided by plugins.\n"
12633
msgstr ""
12634
12635
#: en/help_topics/other-formats.txt:1
12636
msgid "Other Storage Formats"
12637
msgstr ""
12638
12639
#: en/help_topics/other-formats.txt:3
12640
msgid "Experimental formats are shown below."
12641
msgstr ""
12642
12643
#: en/help_topics/other-formats.txt:5
12644
msgid ""
12645
":development-colo:\n"
12646
" (native) The 2a format with experimental support for colocated\n"
12647
" branches."
12648
msgstr ""
12649
12650
#: en/help_topics/other-formats.txt:9
12651
msgid ""
12652
"\n"
12653
"Deprecated formats are shown below."
12654
msgstr ""
12655
12656
#: en/help_topics/other-formats.txt:12
12657
msgid ""
12658
":pack-0.92:\n"
12659
" (native) Pack-based format used in 1.x series. Introduced in 0.92.\n"
12660
" Interoperates with bzr repositories before 0.92 but cannot be read\n"
12661
" by bzr < 0.92."
12662
msgstr ""
12663
12664
#: en/help_topics/patterns.txt:1
12665
msgid ""
12666
"Patterns\n"
12667
"========"
12668
msgstr ""
12669
12670
#: en/help_topics/patterns.txt:4
12671
msgid ""
12672
"Bazaar uses patterns to match files at various times. For example,\n"
12673
"the ``add`` command skips over files that match ignore patterns\n"
12674
"and preferences can be associated with files using rule patterns.\n"
12675
"The pattern syntax is described below."
12676
msgstr ""
12677
12678
#: en/help_topics/patterns.txt:9
12679
msgid ""
12680
"Trailing slashes on patterns are ignored. If the pattern contains a\n"
12681
"slash or is a regular expression, it is compared to the whole path\n"
12682
"from the branch root. Otherwise, it is compared to only the last\n"
12683
"component of the path. To match a file only in the root directory,\n"
12684
"prepend ``./``. Patterns specifying absolute paths are not allowed."
12685
msgstr ""
12686
12687
#: en/help_topics/patterns.txt:15
12688
msgid "Patterns may include globbing wildcards such as::"
12689
msgstr ""
12690
12691
#: en/help_topics/patterns.txt:17
12692
msgid ""
12693
" ? - Matches any single character except '/'\n"
12694
" * - Matches 0 or more characters except '/'\n"
12695
" /**/ - Matches 0 or more directories in a path\n"
12696
" [a-z] - Matches a single character from within a group of characters"
12697
msgstr ""
12698
12699
#: en/help_topics/patterns.txt:22
12700
msgid ""
12701
"Patterns may also be `Python regular expressions`_. Regular expression\n"
12702
"patterns are identified by a ``RE:`` prefix followed by the regular\n"
12703
"expression. Regular expression patterns may not include named or\n"
12704
"numbered groups."
12705
msgstr ""
12706
12707
#: en/help_topics/patterns.txt:27
12708
msgid ""
12709
"Case insensitive ignore patterns can be specified with regular expressions\n"
12710
"by using the ``i`` (for ignore case) flag in the pattern."
12711
msgstr ""
12712
12713
#: en/help_topics/patterns.txt:30
12714
msgid ""
12715
"For example, a case insensitive match for ``foo`` may be specified as::"
12716
msgstr ""
12717
12718
#: en/help_topics/patterns.txt:32
12719
msgid " RE:(?i)foo"
12720
msgstr ""
12721
12722
#: en/help_topics/patterns.txt:34
12723
msgid ""
12724
"Ignore patterns may be prefixed with ``!``, which means that a filename\n"
12725
"matched by that pattern will not be ignored."
12726
msgstr ""
12727
12728
#: en/help_topics/patterns.txt:37
12729
msgid ""
12730
".. _Python regular expressions: http://docs.python.org/library/re.html"
12731
msgstr ""
12732
12733
#: en/help_topics/revisionspec.txt:1
12734
msgid "Revision Identifiers"
12735
msgstr ""
12736
12737
#: en/help_topics/revisionspec.txt:3
12738
msgid ""
12739
"A revision identifier refers to a specific state of a branch's history. It\n"
12740
"can be expressed in several ways. It can begin with a keyword to\n"
12741
"unambiguously specify a given lookup type; some examples are 'last:1',\n"
12742
"'before:yesterday' and 'submit:'."
12743
msgstr ""
12744
12745
#: en/help_topics/revisionspec.txt:8
12746
msgid ""
12747
"Alternately, it can be given without a keyword, in which case it will be\n"
12748
"checked as a revision number, a tag, a revision id, a date specification, or "
12749
"a\n"
12750
"branch specification, in that order. For example, 'date:today' could be\n"
12751
"written as simply 'today', though if you have a tag called 'today' that "
12752
"will\n"
12753
"be found first."
12754
msgstr ""
12755
12756
#: en/help_topics/revisionspec.txt:14
12757
msgid ""
12758
"If 'REV1' and 'REV2' are revision identifiers, then 'REV1..REV2' denotes a\n"
12759
"revision range. Examples: '3647..3649', 'date:yesterday..-1' and\n"
12760
"'branch:/path/to/branch1/..branch:/branch2' (note that there are no quotes "
12761
"or\n"
12762
"spaces around the '..')."
12763
msgstr ""
12764
12765
#: en/help_topics/revisionspec.txt:19
12766
msgid ""
12767
"Ranges are interpreted differently by different commands. To the \"log\" "
12768
"command,\n"
12769
"a range is a sequence of log messages, but to the \"diff\" command, the "
12770
"range\n"
12771
"denotes a change between revisions (and not a sequence of changes). In\n"
12772
"addition, \"log\" considers a closed range whereas \"diff\" and \"merge\" "
12773
"consider it\n"
12774
"to be open-ended, that is, they include one end but not the other. For "
12775
"example:\n"
12776
"\"bzr log -r 3647..3649\" shows the messages of revisions 3647, 3648 and "
12777
"3649,\n"
12778
"while \"bzr diff -r 3647..3649\" includes the changes done in revisions 3648 "
12779
"and\n"
12780
"3649, but not 3647."
12781
msgstr ""
12782
12783
#: en/help_topics/revisionspec.txt:28
12784
msgid "The keywords used as revision selection methods are the following:"
12785
msgstr ""
12786
12787
#: en/help_topics/revisionspec.txt:30
12788
msgid ""
12789
":revid:\n"
12790
"\tSelects a revision using the revision id.\n"
12791
":submit:\n"
12792
"\tSelects a common ancestor with the submit branch.\n"
12793
":ancestor:\n"
12794
"\tSelects a common ancestor with a second branch.\n"
12795
":date:\n"
12796
"\tSelects a revision on the basis of a datestamp.\n"
12797
":branch:\n"
12798
"\tSelects the last revision of a specified branch.\n"
12799
":tag:\n"
12800
"\tSelects a revision identified by a tag name.\n"
12801
":revno:\n"
12802
"\tSelects a revision using a number.\n"
12803
":before:\n"
12804
"\tSelects the parent of the revision specified.\n"
12805
":annotate:\n"
12806
"\tSelect the revision that last modified the specified line.\n"
12807
":mainline:\n"
12808
"\tSelect mainline revision that merged the specified revision.\n"
12809
":last:\n"
12810
"\tSelects the nth revision from the end."
12811
msgstr ""
12812
12813
#: en/help_topics/revisionspec.txt:53
12814
msgid "In addition, plugins can provide other keywords."
12815
msgstr ""
12816
12817
#: en/help_topics/revisionspec.txt:55
12818
msgid "A detailed description of each keyword is given below."
12819
msgstr ""
12820
12821
#: en/help_topics/revisionspec.txt:57
12822
msgid ":revid:"
12823
msgstr ""
12824
12825
#: en/help_topics/revisionspec.txt:59
12826
msgid ""
12827
" Supply a specific revision id, that can be used to specify any\n"
12828
" revision id in the ancestry of the branch.\n"
12829
" Including merges, and pending merges.\n"
12830
" Examples::"
12831
msgstr ""
12832
12833
#: en/help_topics/revisionspec.txt:64
12834
msgid ""
12835
" revid:aaaa@bbbb-123456789 -> Select revision 'aaaa@bbbb-123456789'"
12836
msgstr ""
12837
12838
#: en/help_topics/revisionspec.txt:66
12839
msgid ":submit:"
12840
msgstr ""
12841
12842
#: en/help_topics/revisionspec.txt:68
12843
msgid ""
12844
" Diffing against this shows all the changes that were made in this "
12845
"branch,\n"
12846
" and is a good predictor of what merge will do. The submit branch is\n"
12847
" used by the bundle and merge directive commands. If no submit branch\n"
12848
" is specified, the parent branch is used instead."
12849
msgstr ""
12850
12851
#: en/help_topics/revisionspec.txt:73 en/help_topics/revisionspec.txt:85
12852
msgid ""
12853
" The common ancestor is the last revision that existed in both\n"
12854
" branches. Usually this is the branch point, but it could also be\n"
12855
" a revision that was merged."
12856
msgstr ""
12857
12858
#: en/help_topics/revisionspec.txt:77 en/help_topics/revisionspec.txt:93
12859
#: en/help_topics/revisionspec.txt:109 en/help_topics/revisionspec.txt:119
12860
#: en/help_topics/revisionspec.txt:153
12861
msgid " Examples::"
12862
msgstr ""
12863
12864
#: en/help_topics/revisionspec.txt:79
12865
msgid " $ bzr diff -r submit:"
12866
msgstr ""
12867
12868
#: en/help_topics/revisionspec.txt:81
12869
msgid ":ancestor:"
12870
msgstr ""
12871
12872
#: en/help_topics/revisionspec.txt:83
12873
msgid " Supply the path to a branch to select the common ancestor."
12874
msgstr ""
12875
12876
#: en/help_topics/revisionspec.txt:89
12877
msgid ""
12878
" This is frequently used with 'diff' to return all of the changes\n"
12879
" that your branch introduces, while excluding the changes that you\n"
12880
" have not merged from the remote branch."
12881
msgstr ""
12882
12883
#: en/help_topics/revisionspec.txt:95
12884
msgid ""
12885
" ancestor:/path/to/branch\n"
12886
" $ bzr diff -r ancestor:../../mainline/branch"
12887
msgstr ""
12888
12889
#: en/help_topics/revisionspec.txt:98
12890
msgid ":date:"
12891
msgstr ""
12892
12893
#: en/help_topics/revisionspec.txt:100
12894
msgid ""
12895
" Supply a datestamp to select the first revision that matches the date.\n"
12896
" Date can be 'yesterday', 'today', 'tomorrow' or a YYYY-MM-DD string.\n"
12897
" Matches the first entry after a given date (either at midnight or\n"
12898
" at a specified time)."
12899
msgstr ""
12900
12901
#: en/help_topics/revisionspec.txt:105
12902
msgid " One way to display all the changes since yesterday would be::"
12903
msgstr ""
12904
12905
#: en/help_topics/revisionspec.txt:107
12906
msgid " bzr log -r date:yesterday.."
12907
msgstr ""
12908
12909
#: en/help_topics/revisionspec.txt:111
12910
msgid ""
12911
" date:yesterday -> select the first revision since "
12912
"yesterday\n"
12913
" date:2006-08-14,17:10:14 -> select the first revision after\n"
12914
" August 14th, 2006 at 5:10pm."
12915
msgstr ""
12916
12917
#: en/help_topics/revisionspec.txt:115
12918
msgid ":branch:"
12919
msgstr ""
12920
12921
#: en/help_topics/revisionspec.txt:117
12922
msgid " Supply the path to a branch to select its last revision."
12923
msgstr ""
12924
12925
#: en/help_topics/revisionspec.txt:121
12926
msgid " branch:/path/to/branch"
12927
msgstr ""
12928
12929
#: en/help_topics/revisionspec.txt:123
12930
msgid ":tag:"
12931
msgstr ""
12932
12933
#: en/help_topics/revisionspec.txt:125
12934
msgid " Tags are stored in the branch and created by the 'tag' command."
12935
msgstr ""
12936
12937
#: en/help_topics/revisionspec.txt:127
12938
msgid ":revno:"
12939
msgstr ""
12940
12941
#: en/help_topics/revisionspec.txt:129
12942
msgid ""
12943
" Use an integer to specify a revision in the history of the branch.\n"
12944
" Optionally a branch can be specified. A negative number will count\n"
12945
" from the end of the branch (-1 is the last revision, -2 the previous\n"
12946
" one). If the negative number is larger than the branch's history, the\n"
12947
" first revision is returned.\n"
12948
" Examples::"
12949
msgstr ""
12950
12951
#: en/help_topics/revisionspec.txt:136
12952
msgid ""
12953
" revno:1 -> return the first revision of this branch\n"
12954
" revno:3:/path/to/branch -> return the 3rd revision of\n"
12955
" the branch '/path/to/branch'\n"
12956
" revno:-1 -> The last revision in a branch.\n"
12957
" -2:http://other/branch -> The second to last revision in the\n"
12958
" remote branch.\n"
12959
" -1000000 -> Most likely the first revision, unless\n"
12960
" your history is very long."
12961
msgstr ""
12962
12963
#: en/help_topics/revisionspec.txt:145
12964
msgid ":before:"
12965
msgstr ""
12966
12967
#: en/help_topics/revisionspec.txt:147
12968
msgid ""
12969
" Supply any revision spec to return the parent of that revision. This "
12970
"is\n"
12971
" mostly useful when inspecting revisions that are not in the revision "
12972
"history\n"
12973
" of a branch."
12974
msgstr ""
12975
12976
#: en/help_topics/revisionspec.txt:151
12977
msgid ""
12978
" It is an error to request the parent of the null revision (before:0)."
12979
msgstr ""
12980
12981
#: en/help_topics/revisionspec.txt:155
12982
msgid ""
12983
" before:1913 -> Return the parent of revno 1913 (revno 1912)\n"
12984
" before:revid:aaaa@bbbb-1234567890 -> return the parent of revision\n"
12985
" aaaa@bbbb-1234567890\n"
12986
" bzr diff -r before:1913..1913\n"
12987
" -> Find the changes between revision 1913 and its parent "
12988
"(1912).\n"
12989
" (What changes did revision 1913 introduce).\n"
12990
" This is equivalent to: bzr diff -c 1913"
12991
msgstr ""
12992
12993
#: en/help_topics/revisionspec.txt:163
12994
msgid ":annotate:"
12995
msgstr ""
12996
12997
#: en/help_topics/revisionspec.txt:165
12998
msgid ""
12999
" Select the revision that last modified the specified line. Line is\n"
13000
" specified as path:number. Path is a relative path to the file. "
13001
"Numbers\n"
13002
" start at 1, and are relative to the current version, not the last-\n"
13003
" committed version of the file."
13004
msgstr ""
13005
13006
#: en/help_topics/revisionspec.txt:170
13007
msgid ":mainline:"
13008
msgstr ""
13009
13010
#: en/help_topics/revisionspec.txt:172
13011
msgid ""
13012
" Select the revision that merged the specified revision into mainline."
13013
msgstr ""
13014
13015
#: en/help_topics/revisionspec.txt:174
13016
msgid ":last:"
13017
msgstr ""
13018
13019
#: en/help_topics/revisionspec.txt:176
13020
msgid ""
13021
" Supply a positive number to get the nth revision from the end.\n"
13022
" This is the same as supplying negative numbers to the 'revno:' spec.\n"
13023
" Examples::"
13024
msgstr ""
13025
13026
#: en/help_topics/revisionspec.txt:180
13027
msgid ""
13028
" last:1 -> return the last revision\n"
13029
" last:3 -> return the revision 2 before the end.\n"
13030
msgstr ""
13031
13032
#: en/help_topics/rules.txt:1
13033
msgid ""
13034
"Rules\n"
13035
"====="
13036
msgstr ""
13037
13038
#: en/help_topics/rules.txt:7
13039
msgid ""
13040
"Rules are defined in ini file format where the sections are file glob\n"
13041
"patterns and the contents of each section are the preferences for files\n"
13042
"matching that pattern(s). For example::"
13043
msgstr ""
13044
13045
#: en/help_topics/rules.txt:11
13046
msgid ""
13047
" [name *.bat]\n"
13048
" eol = native"
13049
msgstr ""
13050
13051
#: en/help_topics/rules.txt:14
13052
msgid ""
13053
" [name *.html *.xml]\n"
13054
" keywords = xml_escape"
13055
msgstr ""
13056
13057
#: en/help_topics/rules.txt:17
13058
msgid ""
13059
"Preferences like these are useful for commands and plugins wishing to\n"
13060
"provide custom behaviour for selected files. For more information on \n"
13061
"end of line conversion see :doc:`eol-help`.\n"
13062
"Keyword support is provided by the `keywords plugin\n"
13063
"<http://doc.bazaar.canonical.com/plugins/en/keywords-plugin.html>`_."
13064
msgstr ""
13065
13066
#: en/help_topics/rules.txt:23
13067
msgid ""
13068
"Files\n"
13069
"-----"
13070
msgstr ""
13071
13072
#: en/help_topics/rules.txt:26
13073
msgid ""
13074
"Default rules for all branches are defined in the optional file\n"
13075
"``BZR_HOME/rules``. "
13076
msgstr ""
13077
13078
#: en/help_topics/rules.txt:29
13079
msgid ""
13080
"Rule Patterns\n"
13081
"-------------"
13082
msgstr ""
13083
13084
#: en/help_topics/rules.txt:32
13085
msgid ""
13086
"Patterns are ordered and searching stops as soon as one matches.\n"
13087
"As a consequence, more explicit patterns should be placed towards\n"
13088
"the top of the file. Rule patterns use exactly the same conventions\n"
13089
"as ignore patterns. See :doc:`patterns-help` for details."
13090
msgstr ""
13091
13092
#: en/help_topics/rules.txt:37
13093
msgid ".. note::"
13094
msgstr ""
13095
13096
#: en/help_topics/rules.txt:39
13097
msgid ""
13098
" Patterns containing square brackets or spaces should be\n"
13099
" surrounded in quotes to ensure they are correctly parsed.\n"
13100
msgstr ""
13101
13102
#: en/help_topics/topics.txt:1
13103
msgid ""
13104
"authentication Information on configuring authentication\n"
13105
"basic Basic commands\n"
13106
"branches Information on what a branch is\n"
13107
"bugs Bug tracker settings\n"
13108
"checkouts Information on what a checkout is\n"
13109
"commands Basic help for all commands\n"
13110
"configuration Details on the configuration settings available\n"
13111
"conflict-types Types of conflicts and what to do about them\n"
13112
"content-filters Conversion of content into/from working trees\n"
13113
"criss-cross Information on criss-cross merging\n"
13114
"current-formats Current storage formats\n"
13115
"debug-flags Options to show or record debug information\n"
13116
"diverged-branches How to fix diverged branches\n"
13117
"env-variables Environment variable names and values\n"
13118
"eol Information on end-of-line handling\n"
13119
"files Information on configuration and log files\n"
13120
"formats Information on choosing a storage format\n"
13121
"global-options Options that control how Bazaar runs\n"
13122
"hidden-commands All hidden commands\n"
13123
"hooks Points at which custom processing can be added\n"
13124
"launchpad Using Bazaar with Launchpad.net\n"
13125
"location-alias Aliases for remembered locations\n"
13126
"log-formats Details on the logging formats available\n"
13127
"other-formats Experimental and deprecated storage formats\n"
13128
"patterns Information on the pattern syntax\n"
13129
"repositories Basic information on shared repositories.\n"
13130
"revisionspec Explain how to use --revision\n"
13131
"rules Information on defining rule-based preferences\n"
13132
"standalone-trees Information on what a standalone tree is\n"
13133
"standard-options Options that can be used with any command\n"
13134
"status-flags Help on status flags\n"
13135
"sync-for-reconfigure Steps to resolve \"out-of-sync\" when reconfiguring\n"
13136
"topics Topics list\n"
13137
"url-special-chars Special character handling in URLs\n"
13138
"urlspec Supported transport protocols\n"
13139
"working-trees Information on working trees\n"
13140
msgstr ""
13141
13142
#: en/help_topics/url-special-chars.txt:1
13143
msgid ""
13144
"Special character handling in URLs\n"
13145
"=================================="
13146
msgstr ""
13147
13148
#: en/help_topics/url-special-chars.txt:4
13149
msgid "Bazaar allows locations to be specified in multiple ways, either:"
13150
msgstr ""
13151
13152
#: en/help_topics/url-special-chars.txt:6
13153
msgid " * Fully qualified URLs"
13154
msgstr ""
13155
13156
#: en/help_topics/url-special-chars.txt:8
13157
msgid " * File system paths, relative or absolute"
13158
msgstr ""
13159
13160
#: en/help_topics/url-special-chars.txt:10
13161
msgid ""
13162
"Internally bzr treats all locations as URLs. For any file system paths\n"
13163
"that are specified it will automatically determine the appropriate URL\n"
13164
"representation, and escape special characters where necessary."
13165
msgstr ""
13166
13167
#: en/help_topics/url-special-chars.txt:14
13168
msgid ""
13169
"There are a few characters which have special meaning in URLs and need "
13170
"careful\n"
13171
"handling to avoid ambiguities. Characters can be escaped with a % and a hex\n"
13172
"value in URLs. Any non-ASCII characters in a file path will automatically "
13173
"be\n"
13174
"urlencoded when the path is converted to a URL."
13175
msgstr ""
13176
13177
#: en/help_topics/url-special-chars.txt:19
13178
msgid ""
13179
"URLs represent non-ASCII characters in an encoding defined by the server, "
13180
"but\n"
13181
"usually UTF-8. The % escapes should be of the UTF-8 bytes. Bazaar tries to "
13182
"be\n"
13183
"generous in what it accepts as a URL and to print them in a way that\n"
13184
"will be readable."
13185
msgstr ""
13186
13187
#: en/help_topics/url-special-chars.txt:24
13188
msgid ""
13189
"For example, if you have a directory named '/tmp/%2False' these are all "
13190
"valid\n"
13191
"ways of accessing the content (0x2F, or 47, is the ASCII code for forward "
13192
"slash)::"
13193
msgstr ""
13194
13195
#: en/help_topics/url-special-chars.txt:27
13196
msgid ""
13197
" cd /tmp\n"
13198
" bzr log /tmp/%2False\n"
13199
" bzr log %2False\n"
13200
" bzr log file:///tmp/%252False\n"
13201
" bzr log file://localhost/tmp/%252False\n"
13202
" bzr log file:%252False"
13203
msgstr ""
13204
13205
#: en/help_topics/url-special-chars.txt:34
13206
msgid "These are valid but do not refer to the same file::"
13207
msgstr ""
13208
13209
#: en/help_topics/url-special-chars.txt:36
13210
msgid ""
13211
" bzr log file:///tmp/%2False (refers to a file called /tmp/\\/alse)\n"
13212
" bzr log %252False (refers to a file called /tmp/%252False)"
13213
msgstr ""
13214
13215
#: en/help_topics/url-special-chars.txt:39
13216
msgid ""
13217
"Comma also has special meaning in URLs, because it denotes `segment "
13218
"parameters`_"
13219
msgstr ""
13220
13221
#: en/help_topics/url-special-chars.txt:41
13222
msgid ""
13223
"_`segment parameters`: http://www.ietf.org/rfc/rfc3986.txt (section 3.3)"
13224
msgstr ""
13225
13226
#: en/help_topics/url-special-chars.txt:43
13227
msgid ""
13228
"Comma is also special in any file system paths that are specified. To use a "
13229
"literal\n"
13230
"comma in a file system path, specify a URL and URL encode the comma::"
13231
msgstr ""
13232
13233
#: en/help_topics/url-special-chars.txt:46
13234
msgid ""
13235
" bzr log foo,branch=bla # path \"foo\" with the segment parameter "
13236
"\"branch\" set to \"bla\"\n"
13237
" bzr log file:foo%2Cbranch=bla # path \"foo,branch=bla\"\n"
13238
" bzr log file:foo,branch=bla # path \"foo\" with segment parameter "
13239
"\"branch\" set to \"bla\"\n"
13240
msgstr ""
13241
13242
#: en/help_topics/urlspec.txt:1
13243
msgid "URL Identifiers"
13244
msgstr ""
13245
13246
#: en/help_topics/urlspec.txt:3
13247
msgid "Supported URL prefixes::"
13248
msgstr ""
13249
13250
#: en/help_topics/urlspec.txt:5
13251
msgid ""
13252
" aftp:// Access using active FTP.\n"
13253
" bzr:// Fast access using the Bazaar smart server.\n"
13254
" bzr+ssh:// Fast access using the Bazaar smart server over SSH.\n"
13255
" file:// Access using the standard filesystem (default)\n"
13256
" ftp:// Access using passive FTP.\n"
13257
" http:// Read-only access of branches exported on the web.\n"
13258
" https:// Read-only access of branches exported on the web using "
13259
"SSL.\n"
13260
" sftp:// Access using SFTP (most SSH servers provide SFTP)."
13261
msgstr ""
13262
13263
#: en/help_topics/urlspec.txt:14
13264
msgid "Supported modifiers::"
13265
msgstr ""
13266
13267
#: en/help_topics/urlspec.txt:16
13268
msgid " gio+ Access using any GIO supported protocols."
13269
msgstr ""
13270
13271
#: en/help_topics/urlspec.txt:18
13272
msgid "Bazaar supports all of the standard parts within the URL::"
13273
msgstr ""
13274
13275
#: en/help_topics/urlspec.txt:20
13276
msgid " <protocol>://[user[:password]@]host[:port]/[path]"
13277
msgstr ""
13278
13279
#: en/help_topics/urlspec.txt:22
13280
msgid "allowing URLs such as::"
13281
msgstr ""
13282
13283
#: en/help_topics/urlspec.txt:24
13284
msgid " http://bzruser:BadPass@bzr.example.com:8080/bzr/trunk"
13285
msgstr ""
13286
13287
#: en/help_topics/urlspec.txt:26
13288
msgid ""
13289
"For bzr+ssh:// and sftp:// URLs, Bazaar also supports paths that begin\n"
13290
"with '~' as meaning that the rest of the path should be interpreted\n"
13291
"relative to the remote user's home directory. For example if the user\n"
13292
"``remote`` has a home directory of ``/home/remote`` on the server\n"
13293
"shell.example.com, then::"
13294
msgstr ""
13295
13296
#: en/help_topics/urlspec.txt:32
13297
msgid " bzr+ssh://remote@shell.example.com/~/myproject/trunk"
13298
msgstr ""
13299
13300
#: en/help_topics/urlspec.txt:34
13301
msgid "would refer to ``/home/remote/myproject/trunk``."
13302
msgstr ""
13303
13304
#: en/help_topics/urlspec.txt:36
13305
msgid ""
13306
"Many commands that accept URLs also accept location aliases too.\n"
13307
"See :doc:`location-alias-help` and :doc:`url-special-chars-help`.\n"
13308
msgstr ""
Loggerhead is a web-based interface for Breezy
Version: 2.0.1