« back to all changes in this revision
Viewing changes to po/ast.po
- browse files at revision 6613.2.1
- compare with another revision
- download diff
- download tarball
- view history from revision 6613.2.1
- Committer: Richard Wilbur
- Date: 2016-02-04 19:07:28 UTC
- mto: This revision was merged to the branch mainline in revision 6618.
- Revision ID: richard.wilbur@gmail.com-20160204190728-p0zvfii6zase0fw7
Update COPYING.txt from the original http://www.gnu.org/licenses/gpl-2.0.txt (Only differences were in whitespace.) Thanks to Petr Stodulka for pointing out the discrepancy.
- files added:
- bzrlib/_termcolor.py
- bzrlib/branchfmt
- bzrlib/plugins/grep
- bzrlib/plugins/po_merge
- bzrlib/plugins/po_merge/tests
- po
- files removed:
- bzrlib/deprecated_graph.py
- bzrlib/doc_generate/builders
- bzrlib/doc_generate/writers
- bzrlib/tests/doc_generate
- bzrlib/tests/doc_generate/builders
- bzrlib/tests/doc_generate/writers
- bzrlib/util/effbot
- bzrlib/util/effbot/org
- bzrlib/util/elementtree
- files renamed:
- bzrlib/sign_my_commits.py => bzrlib/commit_signature_commands.py
- bzrlib/tests/per_repository/test_is_write_locked.py => bzrlib/tests/per_repository/test_locking.py
- bzrlib/tests/per_repository/test__generate_text_key_index.py => bzrlib/tests/per_repository_vf/test__generate_text_key_index.py
- bzrlib/tests/per_repository/test_add_inventory_by_delta.py => bzrlib/tests/per_repository_vf/test_add_inventory_by_delta.py
- bzrlib/tests/per_repository/test_find_text_key_references.py => bzrlib/tests/per_repository_vf/test_find_text_key_references.py
- bzrlib/tests/per_repository/test_merge_directive.py => bzrlib/tests/per_repository_vf/test_merge_directive.py
- files modified:
- .bzrignore
added
removed
po/ast.po
1
# Asturian translation for bzr
2
# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
3
# This file is distributed under the same license as the bzr package.
4
# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
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: 2011-09-16 19:20+0000\n"
12
"Last-Translator: Xuacu Saturio <xuacusk8@gmail.com>\n"
13
"Language-Team: Asturian <ast@li.org>\n"
14
"MIME-Version: 1.0\n"
15
"Content-Type: text/plain; charset=UTF-8\n"
16
"Content-Transfer-Encoding: 8bit\n"
17
"Plural-Forms: nplurals=2; plural=n != 1;\n"
18
"X-Launchpad-Export-Date: 2012-07-11 04:30+0000\n"
19
"X-Generator: Launchpad (build 15593)\n"
20
21
#: bzrlib/add.py:93
22
msgid "skipping {0} (larger than {1} of {2} bytes)"
23
msgstr "saltando {0} (mayor que {1} de {2} bytes)"
24
25
#: bzrlib/branch.py:854
26
msgid "Unstacking"
27
msgstr ""
28
29
#: bzrlib/branch.py:2955
30
#, python-format
31
msgid "Pushed up to revision %d."
32
msgstr ""
33
34
#: bzrlib/branch.py:2957
35
#, python-format
36
msgid "%d tag updated."
37
msgid_plural "%d tags updated."
38
msgstr[0] ""
39
msgstr[1] ""
40
41
#: bzrlib/branch.py:2960
42
msgid "No new revisions or tags to push."
43
msgstr ""
44
45
#: bzrlib/branch.py:2962
46
msgid "No new revisions to push."
47
msgstr ""
48
49
#: bzrlib/branch.py:2982
50
msgid "checked branch {0} format {1}"
51
msgstr ""
52
53
#: bzrlib/branch.py:2985
54
#, python-format
55
msgid "found error:%s"
56
msgstr "error alcontráu: %s"
57
58
#: bzrlib/builtins.py:251 bzrlib/builtins.py:3045 bzrlib/workingtree.py:323
59
#, python-format
60
msgid "Ignoring files outside view. View is %s"
61
msgstr ""
62
63
#: bzrlib/builtins.py:260
64
#, python-format
65
msgid "bzr %s --revision takes exactly one revision identifier"
66
msgstr "bzr %s --revision toma exactamente un identificador de revisión"
67
68
#: bzrlib/builtins.py:315
69
msgid "Display status summary."
70
msgstr "Amosar resume d'estáu."
71
72
#: bzrlib/builtins.py:317
73
msgid ""
74
"This reports on versioned and unknown files, reporting them\n"
75
"grouped by state. Possible states are:"
76
msgstr ""
77
"Esto ye un informe de ficheros con versiones y desconocíos,\n"
78
"presentándolos agrupaos pol estáu. Los estaos posibles son:"
79
80
#: bzrlib/builtins.py:320
81
msgid ""
82
"added\n"
83
" Versioned in the working copy but not in the previous revision."
84
msgstr ""
85
"amestáu\n"
86
" Con versión na copia de trabayu pero non na revisión anterior."
87
88
#: bzrlib/builtins.py:323
89
msgid ""
90
"removed\n"
91
" Versioned in the previous revision but removed or deleted\n"
92
" in the working copy."
93
msgstr ""
94
"desaniciáu\n"
95
" Con versión na revisión anterior pero quitáu o desaniciáu\n"
96
" na copia de trabayu."
97
98
#: bzrlib/builtins.py:327
99
msgid ""
100
"renamed\n"
101
" Path of this file changed from the previous revision;\n"
102
" the text may also have changed. This includes files whose\n"
103
" parent directory was renamed."
104
msgstr ""
105
"renomáu\n"
106
" El camín a esti ficheru camudó dende la revisión anterior;\n"
107
" seique camudara tamién el testu. Esto incluye los ficheros\n"
108
" pa los que camudó'l nome del direutoriu pá."
109
110
#: bzrlib/builtins.py:332
111
msgid ""
112
"modified\n"
113
" Text has changed since the previous revision."
114
msgstr ""
115
"camudáu\n"
116
" El testu camudó dende la cabera revisión."
117
118
#: bzrlib/builtins.py:335
119
msgid ""
120
"kind changed\n"
121
" File kind has been changed (e.g. from file to directory)."
122
msgstr ""
123
"camudó la clase\n"
124
" La clase de ficheru camudó (p.ex. de ficheru a direutoriu)."
125
126
#: bzrlib/builtins.py:338
127
msgid ""
128
"unknown\n"
129
" Not versioned and not matching an ignore pattern."
130
msgstr ""
131
132
#: bzrlib/builtins.py:341
133
msgid ""
134
"Additionally for directories, symlinks and files with a changed\n"
135
"executable bit, Bazaar indicates their type using a trailing\n"
136
"character: '/', '@' or '*' respectively. These decorations can be\n"
137
"disabled using the '--no-classify' option."
138
msgstr ""
139
140
#: bzrlib/builtins.py:346
141
msgid ""
142
"To see ignored files use 'bzr ignored'. For details on the\n"
143
"changes to file texts, use 'bzr diff'."
144
msgstr ""
145
146
#: bzrlib/builtins.py:349
147
msgid ""
148
"Note that --short or -S gives status flags for each item, similar\n"
149
"to Subversion's status command. To get output similar to svn -q,\n"
150
"use bzr status -SV."
151
msgstr ""
152
153
#: bzrlib/builtins.py:353
154
msgid ""
155
"If no arguments are specified, the status of the entire working\n"
156
"directory is shown. Otherwise, only the status of the specified\n"
157
"files or directories is reported. If a directory is given, status\n"
158
"is reported for everything inside that directory."
159
msgstr ""
160
161
#: bzrlib/builtins.py:358
162
msgid ""
163
"Before merges are committed, the pending merge tip revisions are\n"
164
"shown. To see all pending merge revisions, use the -v option.\n"
165
"To skip the display of pending merge information altogether, use\n"
166
"the no-pending option or specify a file/directory."
167
msgstr ""
168
169
#: bzrlib/builtins.py:363
170
msgid ""
171
"To compare the working directory to a specific revision, pass a\n"
172
"single revision to the revision argument."
173
msgstr ""
174
175
#: bzrlib/builtins.py:366
176
msgid ""
177
"To see which files have changed in a specific revision, or between\n"
178
"two revisions, pass a revision range to the revision argument.\n"
179
"This will produce the same results as calling 'bzr diff --summarize'."
180
msgstr ""
181
182
#: bzrlib/builtins.py:375
183
msgid "Use short status indicators."
184
msgstr ""
185
186
#: bzrlib/builtins.py:377
187
msgid "Only show versioned files."
188
msgstr ""
189
190
#: bzrlib/builtins.py:379
191
msgid "Don't show pending merges."
192
msgstr ""
193
194
#: bzrlib/builtins.py:382
195
msgid "Do not mark object type using indicator."
196
msgstr ""
197
198
#: bzrlib/builtins.py:397
199
msgid "bzr status --revision takes exactly one or two revision specifiers"
200
msgstr ""
201
202
#: bzrlib/builtins.py:441 bzrlib/builtins.py:5230
203
msgid "You can only supply one of revision_id or --revision"
204
msgstr ""
205
206
#: bzrlib/builtins.py:444 bzrlib/builtins.py:5232
207
msgid "You must supply either --revision or a revision_id"
208
msgstr ""
209
210
#: bzrlib/builtins.py:451
211
#, python-format
212
msgid "Repository %r does not support access to raw revision texts"
213
msgstr ""
214
215
#: bzrlib/builtins.py:462
216
msgid "The repository {0} contains no revision {1}."
217
msgstr ""
218
219
#: bzrlib/builtins.py:469
220
msgid "You cannot specify a NULL revision."
221
msgstr ""
222
223
#: bzrlib/builtins.py:561
224
msgid "Remove the working tree from a given branch/checkout."
225
msgstr ""
226
227
#: bzrlib/builtins.py:563
228
msgid ""
229
"Since a lightweight checkout is little more than a working tree\n"
230
"this will refuse to run against one."
231
msgstr ""
232
233
#: bzrlib/builtins.py:566
234
msgid "To re-create the working tree, use \"bzr checkout\"."
235
msgstr ""
236
237
#: bzrlib/builtins.py:572
238
msgid ""
239
"Remove the working tree even if it has uncommitted or shelved changes."
240
msgstr ""
241
242
#: bzrlib/builtins.py:586
243
msgid "No working tree to remove"
244
msgstr ""
245
246
#: bzrlib/builtins.py:588
247
msgid "You cannot remove the working tree of a remote path"
248
msgstr ""
249
250
#: bzrlib/builtins.py:597
251
msgid "You cannot remove the working tree from a lightweight checkout"
252
msgstr ""
253
254
#: bzrlib/builtins.py:637
255
msgid ""
256
"The tree does not appear to be corrupt. You probably want \"bzr revert\" "
257
"instead. Use \"--force\" if you are sure you want to reset the working tree."
258
msgstr ""
259
260
#: bzrlib/builtins.py:648
261
msgid ""
262
", the header appears corrupt, try passing -r -1 to set the state to the last "
263
"commit"
264
msgstr ""
265
266
#: bzrlib/builtins.py:652
267
msgid "failed to reset the tree state{0}"
268
msgstr ""
269
270
#: bzrlib/builtins.py:656
271
msgid "Show current revision number."
272
msgstr ""
273
274
#: bzrlib/builtins.py:658
275
msgid "This is equal to the number of revisions on this branch."
276
msgstr ""
277
278
#: bzrlib/builtins.py:671
279
msgid "--tree and --revision can not be used together"
280
msgstr ""
281
282
#: bzrlib/builtins.py:688 bzrlib/builtins.py:5986
283
msgid "Tags can only be placed on a single revision, not on a range"
284
msgstr ""
285
286
#: bzrlib/builtins.py:712
287
msgid "Show revno of working tree."
288
msgstr ""
289
290
#: bzrlib/builtins.py:760
291
msgid "Add specified files or directories."
292
msgstr ""
293
294
#: bzrlib/builtins.py:762
295
msgid ""
296
"In non-recursive mode, all the named items are added, regardless\n"
297
"of whether they were previously ignored. A warning is given if\n"
298
"any of the named files are already versioned."
299
msgstr ""
300
301
#: bzrlib/builtins.py:766
302
msgid ""
303
"In recursive mode (the default), files are treated the same way\n"
304
"but the behaviour for directories is different. Directories that\n"
305
"are already versioned do not give a warning. All directories,\n"
306
"whether already versioned or not, are searched for files or\n"
307
"subdirectories that are neither versioned or ignored, and these\n"
308
"are added. This search proceeds recursively into versioned\n"
309
"directories. If no names are given '.' is assumed."
310
msgstr ""
311
312
#: bzrlib/builtins.py:774
313
msgid ""
314
"A warning will be printed when nested trees are encountered,\n"
315
"unless they are explicitly ignored."
316
msgstr ""
317
318
#: bzrlib/builtins.py:777
319
msgid ""
320
"Therefore simply saying 'bzr add' will version all files that\n"
321
"are currently unknown."
322
msgstr ""
323
324
#: bzrlib/builtins.py:780
325
msgid ""
326
"Adding a file whose parent directory is not versioned will\n"
327
"implicitly add the parent, and so on up to the root. This means\n"
328
"you should never need to explicitly add a directory, they'll just\n"
329
"get added when you add a file in the directory."
330
msgstr ""
331
332
#: bzrlib/builtins.py:785
333
msgid ""
334
"--dry-run will show which files would be added, but not actually\n"
335
"add them."
336
msgstr ""
337
338
#: bzrlib/builtins.py:788
339
msgid ""
340
"--file-ids-from will try to use the file ids from the supplied path.\n"
341
"It looks up ids trying to find a matching parent directory with the\n"
342
"same filename, and then by pure path. This option is rarely needed\n"
343
"but can be useful when adding the same logical file into two\n"
344
"branches that will be merged later (without showing the two different\n"
345
"adds as a conflict). It is also useful when merging another project\n"
346
"into a subdirectory of this one."
347
msgstr ""
348
349
#: bzrlib/builtins.py:796
350
msgid ""
351
"Any files matching patterns in the ignore list will not be added\n"
352
"unless they are explicitly mentioned."
353
msgstr ""
354
355
#: bzrlib/builtins.py:799
356
msgid ""
357
"In recursive mode, files larger than the configuration option \n"
358
"add.maximum_file_size will be skipped. Named items are never skipped due\n"
359
"to file size."
360
msgstr ""
361
362
#: bzrlib/builtins.py:806
363
msgid "Don't recursively add the contents of directories."
364
msgstr ""
365
366
#: bzrlib/builtins.py:813
367
msgid "Lookup file ids from this tree."
368
msgstr ""
369
370
#: bzrlib/builtins.py:849
371
msgid "ignored {0} matching \"{1}\"\n"
372
msgstr ""
373
374
#: bzrlib/builtins.py:854
375
msgid "Create a new versioned directory."
376
msgstr ""
377
378
#: bzrlib/builtins.py:856
379
msgid "This is equivalent to creating the directory and then adding it."
380
msgstr ""
381
382
#: bzrlib/builtins.py:863
383
msgid "No error if existing, make parent directories as needed."
384
msgstr ""
385
386
#: bzrlib/builtins.py:897
387
#, python-format
388
msgid "added %s\n"
389
msgstr ""
390
391
#: bzrlib/builtins.py:939
392
#, python-format
393
msgid "invalid kind %r specified"
394
msgstr ""
395
396
#: bzrlib/builtins.py:976
397
msgid "Move or rename a file."
398
msgstr ""
399
400
#: bzrlib/builtins.py:978
401
msgid " bzr mv SOURCE... DESTINATION"
402
msgstr ""
403
404
#: bzrlib/builtins.py:980
405
msgid ""
406
"If the last argument is a versioned directory, all the other names\n"
407
"are moved into it. Otherwise, there must be exactly two arguments\n"
408
"and the file is changed to a new name."
409
msgstr ""
410
411
#: bzrlib/builtins.py:984
412
msgid ""
413
"If OLDNAME does not exist on the filesystem but is versioned and\n"
414
"NEWNAME does exist on the filesystem but is not versioned, mv\n"
415
"assumes that the file has been manually moved and only updates\n"
416
"its internal inventory to reflect that change.\n"
417
"The same is valid when moving many SOURCE files to a DESTINATION."
418
msgstr ""
419
420
#: bzrlib/builtins.py:990
421
msgid "Files cannot be moved between branches."
422
msgstr ""
423
424
#: bzrlib/builtins.py:997
425
msgid ""
426
"Move only the bzr identifier of the file, because the file has already been "
427
"moved."
428
msgstr ""
429
430
#: bzrlib/builtins.py:999
431
msgid "Automatically guess renames."
432
msgstr ""
433
434
#: bzrlib/builtins.py:1000
435
msgid "Avoid making changes when guessing renames."
436
msgstr ""
437
438
#: bzrlib/builtins.py:1009
439
msgid "--dry-run requires --auto."
440
msgstr ""
441
442
#: bzrlib/builtins.py:1013
443
msgid "missing file argument"
444
msgstr ""
445
446
#: bzrlib/builtins.py:1017
447
msgid "can not move root of branch"
448
msgstr ""
449
450
#: bzrlib/builtins.py:1023
451
msgid "Only one path may be specified to --auto."
452
msgstr ""
453
454
#: bzrlib/builtins.py:1026
455
msgid "--after cannot be specified with --auto."
456
msgstr ""
457
458
#: bzrlib/builtins.py:1062
459
msgid "to mv multiple files the destination must be a versioned directory"
460
msgstr ""
461
462
#: bzrlib/builtins.py:1114
463
msgid "Turn this branch into a mirror of another branch."
464
msgstr ""
465
466
#: bzrlib/builtins.py:1116
467
msgid ""
468
"By default, this command only works on branches that have not diverged.\n"
469
"Branches are considered diverged if the destination branch's most recent \n"
470
"commit is one that has not been merged (directly or indirectly) into the \n"
471
"parent."
472
msgstr ""
473
474
#: bzrlib/builtins.py:1121
475
msgid ""
476
"If branches have diverged, you can use 'bzr merge' to integrate the changes\n"
477
"from one into the other. Once one branch has merged, the other should\n"
478
"be able to pull it again."
479
msgstr ""
480
481
#: bzrlib/builtins.py:1125
482
msgid ""
483
"If you want to replace your local changes and just want your branch to\n"
484
"match the remote one, use pull --overwrite. This will work even if the two\n"
485
"branches have diverged."
486
msgstr ""
487
488
#: bzrlib/builtins.py:1129
489
msgid ""
490
"If there is no default location set, the first pull will set it (use\n"
491
"--no-remember to avoid setting it). After that, you can omit the\n"
492
"location to use the default. To change the default, use --remember. The\n"
493
"value will only be saved if the remote location can be accessed."
494
msgstr ""
495
496
#: bzrlib/builtins.py:1134
497
msgid ""
498
"The --verbose option will display the revisions pulled using the log_format\n"
499
"configuration option. You can use a different format by overriding it with\n"
500
"-Olog_format=<other_format>."
501
msgstr ""
502
503
#: bzrlib/builtins.py:1138
504
msgid ""
505
"Note: The location can be specified either in the form of a branch,\n"
506
"or in the form of a path to a file containing a merge directive generated\n"
507
"with bzr send."
508
msgstr ""
509
510
#: bzrlib/builtins.py:1146
511
msgid "Show logs of pulled revisions."
512
msgstr ""
513
514
#: bzrlib/builtins.py:1148
515
msgid ""
516
"Branch to pull into, rather than the one containing the working directory."
517
msgstr ""
518
519
#: bzrlib/builtins.py:1151
520
msgid ""
521
"Perform a local pull in a bound branch. Local pulls are not applied to the "
522
"master branch."
523
msgstr ""
524
525
#: bzrlib/builtins.py:1189
526
msgid "Need working tree for --show-base."
527
msgstr ""
528
529
#: bzrlib/builtins.py:1205
530
msgid "No pull location known or specified."
531
msgstr ""
532
533
#: bzrlib/builtins.py:1211
534
#, python-format
535
msgid "Using saved parent location: %s\n"
536
msgstr ""
537
538
#: bzrlib/builtins.py:1218 bzrlib/builtins.py:4425
539
msgid "Cannot use -r with merge directives or bundles"
540
msgstr ""
541
542
#: bzrlib/builtins.py:1261
543
msgid "Update a mirror of this branch."
544
msgstr ""
545
546
#: bzrlib/builtins.py:1263
547
msgid ""
548
"The target branch will not have its working tree populated because this\n"
549
"is both expensive, and is not supported on remote file systems."
550
msgstr ""
551
552
#: bzrlib/builtins.py:1266
553
msgid ""
554
"Some smart servers or protocols *may* put the working tree in place in\n"
555
"the future."
556
msgstr ""
557
558
#: bzrlib/builtins.py:1269
559
msgid ""
560
"This command only works on branches that have not diverged. Branches are\n"
561
"considered diverged if the destination branch's most recent commit is one\n"
562
"that has not been merged (directly or indirectly) by the source branch."
563
msgstr ""
564
565
#: bzrlib/builtins.py:1273
566
msgid ""
567
"If branches have diverged, you can use 'bzr push --overwrite' to replace\n"
568
"the other branch completely, discarding its unmerged changes."
569
msgstr ""
570
571
#: bzrlib/builtins.py:1276
572
msgid ""
573
"If you want to ensure you have the different changes in the other branch,\n"
574
"do a merge (see bzr help merge) from the other branch, and commit that.\n"
575
"After that you will be able to do a push without '--overwrite'."
576
msgstr ""
577
578
#: bzrlib/builtins.py:1280
579
msgid ""
580
"If there is no default push location set, the first push will set it (use\n"
581
"--no-remember to avoid setting it). After that, you can omit the\n"
582
"location to use the default. To change the default, use --remember. The\n"
583
"value will only be saved if the remote location can be accessed."
584
msgstr ""
585
586
#: bzrlib/builtins.py:1285
587
msgid ""
588
"The --verbose option will display the revisions pushed using the log_format\n"
589
"configuration option. You can use a different format by overriding it with\n"
590
"-Olog_format=<other_format>."
591
msgstr ""
592
593
#: bzrlib/builtins.py:1296 bzrlib/foreign.py:272
594
msgid ""
595
"Branch to push from, rather than the one containing the working directory."
596
msgstr ""
597
598
#: bzrlib/builtins.py:1299
599
msgid ""
600
"By default push will fail if the target directory exists, but does not "
601
"already have a control directory. This flag will allow push to proceed."
602
msgstr ""
603
604
#: bzrlib/builtins.py:1304
605
msgid ""
606
"Create a stacked branch that references the public location of the parent "
607
"branch."
608
msgstr ""
609
610
#: bzrlib/builtins.py:1307
611
msgid ""
612
"Create a stacked branch that refers to another branch for the commit "
613
"history. Only the work not present in the referenced branch is included in "
614
"the branch created."
615
msgstr ""
616
617
#: bzrlib/builtins.py:1312 bzrlib/foreign.py:279
618
msgid ""
619
"Refuse to push if there are uncommitted changes in the working tree, --no-"
620
"strict disables the check."
621
msgstr ""
622
623
#: bzrlib/builtins.py:1315
624
msgid "Don't populate the working tree, even for protocols that support it."
625
msgstr ""
626
627
#: bzrlib/builtins.py:1318
628
msgid "Overwrite tags only."
629
msgstr ""
630
631
#: bzrlib/builtins.py:1369
632
msgid "Could not determine branch to refer to."
633
msgstr ""
634
635
#: bzrlib/builtins.py:1378
636
#, python-format
637
msgid ""
638
"No push location known or specified. To push to the parent branch (at %s), "
639
"use 'bzr push :parent'."
640
msgstr ""
641
642
#: bzrlib/builtins.py:1384 bzrlib/foreign.py:306
643
msgid "No push location known or specified."
644
msgstr ""
645
646
#: bzrlib/builtins.py:1388
647
#, python-format
648
msgid "Using saved push location: %s"
649
msgstr ""
650
651
#: bzrlib/builtins.py:1398
652
msgid "Create a new branch that is a copy of an existing branch."
653
msgstr ""
654
655
#: bzrlib/builtins.py:1400
656
msgid ""
657
"If the TO_LOCATION is omitted, the last component of the FROM_LOCATION will\n"
658
"be used. In other words, \"branch ../foo/bar\" will attempt to create "
659
"./bar.\n"
660
"If the FROM_LOCATION has no / or path separator embedded, the TO_LOCATION\n"
661
"is derived from the FROM_LOCATION by stripping a leading scheme or drive\n"
662
"identifier, if any. For example, \"branch lp:foo-bar\" will attempt to\n"
663
"create ./foo-bar."
664
msgstr ""
665
666
#: bzrlib/builtins.py:1407
667
msgid ""
668
"To retrieve the branch as of a particular revision, supply the --revision\n"
669
"parameter, as in \"branch foo/bar -r 5\"."
670
msgstr ""
671
672
#: bzrlib/builtins.py:1410
673
msgid "The synonyms 'clone' and 'get' for this command are deprecated."
674
msgstr ""
675
676
#: bzrlib/builtins.py:1420
677
msgid "Create a branch without a working-tree."
678
msgstr ""
679
680
#: bzrlib/builtins.py:1422
681
msgid "Switch the checkout in the current directory to the new branch."
682
msgstr ""
683
684
#: bzrlib/builtins.py:1425
685
msgid ""
686
"Create a stacked branch referring to the source branch. The new branch will "
687
"depend on the availability of the source branch for all operations."
688
msgstr ""
689
690
#: bzrlib/builtins.py:1429
691
msgid "Do not use a shared repository, even if available."
692
msgstr ""
693
694
#: bzrlib/builtins.py:1431
695
msgid ""
696
"By default branch will fail if the target directory exists, but does not "
697
"already have a control directory. This flag will allow branch to proceed."
698
msgstr ""
699
700
#: bzrlib/builtins.py:1436
701
msgid "Bind new branch to from location."
702
msgstr ""
703
704
#: bzrlib/builtins.py:1483
705
#, python-format
706
msgid "Target directory \"%s\" already exists."
707
msgstr ""
708
709
#: bzrlib/builtins.py:1495
710
#, python-format
711
msgid "Parent of \"%s\" does not exist."
712
msgstr ""
713
714
#: bzrlib/builtins.py:1514
715
msgid "The branch {0} has no revision {1}."
716
msgstr ""
717
718
#: bzrlib/builtins.py:1529 bzrlib/push.py:53
719
#, python-format
720
msgid "Created new stacked branch referring to %s."
721
msgstr ""
722
723
#: bzrlib/builtins.py:1533
724
#, python-format
725
msgid "Branched %d revision."
726
msgid_plural "Branched %d revisions."
727
msgstr[0] ""
728
msgstr[1] ""
729
730
#: bzrlib/builtins.py:1538
731
#, python-format
732
msgid "New branch bound to %s"
733
msgstr ""
734
735
#: bzrlib/builtins.py:1543 bzrlib/builtins.py:6280
736
#, python-format
737
msgid "Switched to branch: %s"
738
msgstr ""
739
740
#: bzrlib/builtins.py:1548
741
msgid "List the branches available at the current location."
742
msgstr ""
743
744
#: bzrlib/builtins.py:1550
745
msgid ""
746
"This command will print the names of all the branches at the current\n"
747
"location."
748
msgstr ""
749
750
#: bzrlib/builtins.py:1557
751
msgid ""
752
"Recursively scan for branches rather than just looking in the specified "
753
"location."
754
msgstr ""
755
756
#: bzrlib/builtins.py:1586
757
msgid "(default)"
758
msgstr ""
759
760
#: bzrlib/builtins.py:1598
761
msgid "Create a new checkout of an existing branch."
762
msgstr ""
763
764
#: bzrlib/builtins.py:1600
765
msgid ""
766
"If BRANCH_LOCATION is omitted, checkout will reconstitute a working tree "
767
"for\n"
768
"the branch found in '.'. This is useful if you have removed the working "
769
"tree\n"
770
"or if it was never created - i.e. if you pushed the branch to its current\n"
771
"location using SFTP."
772
msgstr ""
773
774
#: bzrlib/builtins.py:1605
775
msgid ""
776
"If the TO_LOCATION is omitted, the last component of the BRANCH_LOCATION "
777
"will\n"
778
"be used. In other words, \"checkout ../foo/bar\" will attempt to create "
779
"./bar.\n"
780
"If the BRANCH_LOCATION has no / or path separator embedded, the TO_LOCATION\n"
781
"is derived from the BRANCH_LOCATION by stripping a leading scheme or drive\n"
782
"identifier, if any. For example, \"checkout lp:foo-bar\" will attempt to\n"
783
"create ./foo-bar."
784
msgstr ""
785
786
#: bzrlib/builtins.py:1612
787
msgid ""
788
"To retrieve the branch as of a particular revision, supply the --revision\n"
789
"parameter, as in \"checkout foo/bar -r 5\". Note that this will be "
790
"immediately\n"
791
"out of date [so you cannot commit] but it may be useful (i.e. to examine "
792
"old\n"
793
"code.)"
794
msgstr ""
795
796
#: bzrlib/builtins.py:1622
797
msgid ""
798
"Perform a lightweight checkout. Lightweight checkouts depend on access to "
799
"the branch for every operation. Normal checkouts can perform common "
800
"operations like diff and status without such access, and also support local "
801
"commits."
802
msgstr ""
803
804
#: bzrlib/builtins.py:1629
805
msgid "Get file contents from this tree."
806
msgstr ""
807
808
#: bzrlib/builtins.py:1631
809
msgid "Hard-link working tree files where possible."
810
msgstr ""
811
812
#: bzrlib/builtins.py:1672
813
msgid ""
814
"Show list of renamed files.\n"
815
" "
816
msgstr ""
817
818
#: bzrlib/builtins.py:1700
819
msgid "Update a working tree to a new revision."
820
msgstr ""
821
822
#: bzrlib/builtins.py:1702
823
msgid ""
824
"This will perform a merge of the destination revision (the tip of the\n"
825
"branch, or the specified revision) into the working tree, and then make\n"
826
"that revision the basis revision for the working tree. "
827
msgstr ""
828
829
#: bzrlib/builtins.py:1706
830
msgid ""
831
"You can use this to visit an older revision, or to update a working tree\n"
832
"that is out of date from its branch."
833
msgstr ""
834
835
#: bzrlib/builtins.py:1709
836
msgid ""
837
"If there are any uncommitted changes in the tree, they will be carried\n"
838
"across and remain as uncommitted changes after the update. To discard\n"
839
"these changes, use 'bzr revert'. The uncommitted changes may conflict\n"
840
"with the changes brought in by the change in basis revision."
841
msgstr ""
842
843
#: bzrlib/builtins.py:1714
844
msgid ""
845
"If the tree's branch is bound to a master branch, bzr will also update\n"
846
"the branch from the master."
847
msgstr ""
848
849
#: bzrlib/builtins.py:1717
850
msgid ""
851
"You cannot update just a single file or directory, because each Bazaar\n"
852
"working tree has just a single basis revision. If you want to restore a\n"
853
"file that has been removed locally, use 'bzr revert' instead of 'bzr\n"
854
"update'. If you want to restore a file to its state in a previous\n"
855
"revision, use 'bzr revert' with a '-r' option, or use 'bzr cat' to write\n"
856
"out the old content of that file to a new location."
857
msgstr ""
858
859
#: bzrlib/builtins.py:1724
860
msgid ""
861
"The 'dir' argument, if given, must be the location of the root of a\n"
862
"working tree to update. By default, the working tree that contains the \n"
863
"current working directory is used."
864
msgstr ""
865
866
#: bzrlib/builtins.py:1740
867
msgid "bzr update --revision takes exactly one revision"
868
msgstr ""
869
870
#: bzrlib/builtins.py:1748
871
msgid "bzr update can only update a whole tree, not a file or subdirectory"
872
msgstr ""
873
874
#: bzrlib/builtins.py:1779
875
msgid "Tree is up to date at revision {0} of branch {1}"
876
msgstr ""
877
878
#: bzrlib/builtins.py:1795
879
#, python-format
880
msgid ""
881
"branch has no revision %s\n"
882
"bzr update --revision only works for a revision in the branch history"
883
msgstr ""
884
885
#: bzrlib/builtins.py:1801
886
msgid "Updated to revision {0} of branch {1}"
887
msgstr ""
888
889
#: bzrlib/builtins.py:1805
890
msgid ""
891
"Your local commits will now show as pending merges with 'bzr status', and "
892
"can be committed with 'bzr commit'."
893
msgstr ""
894
895
#: bzrlib/builtins.py:1814
896
msgid "Show information about a working tree, branch or repository."
897
msgstr ""
898
899
#: bzrlib/builtins.py:1816
900
msgid ""
901
"This command will show all known locations and formats associated to the\n"
902
"tree, branch or repository."
903
msgstr ""
904
905
#: bzrlib/builtins.py:1819
906
msgid ""
907
"In verbose mode, statistical information is included with each report.\n"
908
"To see extended statistic information, use a verbosity level of 2 or\n"
909
"higher by specifying the verbose option multiple times, e.g. -vv."
910
msgstr ""
911
912
#: bzrlib/builtins.py:1823
913
msgid "Branches and working trees will also report any missing revisions."
914
msgstr ""
915
916
#: bzrlib/builtins.py:1825 bzrlib/builtins.py:3744 bzrlib/builtins.py:4885
917
#: bzrlib/builtins.py:6466
918
msgid ":Examples:"
919
msgstr ""
920
921
#: bzrlib/builtins.py:1827
922
msgid " Display information on the format and related locations:"
923
msgstr ""
924
925
#: bzrlib/builtins.py:1829
926
msgid " bzr info"
927
msgstr ""
928
929
#: bzrlib/builtins.py:1831
930
msgid ""
931
" Display the above together with extended format information and\n"
932
" basic statistics (like the number of files in the working tree and\n"
933
" number of revisions in the branch and repository):"
934
msgstr ""
935
936
#: bzrlib/builtins.py:1835
937
msgid " bzr info -v"
938
msgstr ""
939
940
#: bzrlib/builtins.py:1837
941
msgid " Display the above together with number of committers to the branch:"
942
msgstr ""
943
944
#: bzrlib/builtins.py:1839
945
msgid " bzr info -vv"
946
msgstr ""
947
948
#: bzrlib/builtins.py:1858
949
msgid "Remove files or directories."
950
msgstr ""
951
952
#: bzrlib/builtins.py:1860
953
msgid ""
954
"This makes Bazaar stop tracking changes to the specified files. Bazaar will\n"
955
"delete them if they can easily be recovered using revert otherwise they\n"
956
"will be backed up (adding an extension of the form .~#~). If no options or\n"
957
"parameters are given Bazaar will scan for files that are being tracked by\n"
958
"Bazaar but missing in your tree and stop tracking them for you."
959
msgstr ""
960
961
#: bzrlib/builtins.py:1868
962
msgid "Only remove files that have never been committed."
963
msgstr ""
964
965
#: bzrlib/builtins.py:1870
966
msgid "The file deletion mode to be used."
967
msgstr ""
968
969
#: bzrlib/builtins.py:1871
970
msgid "Deletion Strategy"
971
msgstr ""
972
973
#: bzrlib/builtins.py:1872
974
msgid "Backup changed files (default)."
975
msgstr ""
976
977
#: bzrlib/builtins.py:1873
978
msgid "Delete from bzr but leave the working copy."
979
msgstr ""
980
981
#: bzrlib/builtins.py:1874
982
msgid "Don't backup changed files."
983
msgstr ""
984
985
#: bzrlib/builtins.py:1875
986
msgid ""
987
"Delete all the specified files, even if they can not be recovered and even "
988
"if they are non-empty directories. (deprecated, use no-backup)"
989
msgstr ""
990
991
#: bzrlib/builtins.py:1884
992
msgid "(The --force option is deprecated, rather use --no-backup in future.)"
993
msgstr ""
994
995
#: bzrlib/builtins.py:1901
996
msgid "No matching files."
997
msgstr ""
998
999
#: bzrlib/builtins.py:1962
1000
msgid "Reconcile bzr metadata in a branch."
1001
msgstr ""
1002
1003
#: bzrlib/builtins.py:1964
1004
msgid ""
1005
"This can correct data mismatches that may have been caused by\n"
1006
"previous ghost operations or bzr upgrades. You should only\n"
1007
"need to run this command if 'bzr check' or a bzr developer\n"
1008
"advises you to run it."
1009
msgstr ""
1010
1011
#: bzrlib/builtins.py:1969
1012
msgid ""
1013
"If a second branch is provided, cross-branch reconciliation is\n"
1014
"also attempted, which will check that data like the tree root\n"
1015
"id which was not present in very early bzr versions is represented\n"
1016
"correctly in both branches."
1017
msgstr ""
1018
1019
#: bzrlib/builtins.py:1974
1020
msgid ""
1021
"At the same time it is run it may recompress data resulting in\n"
1022
"a potential saving in disk space or performance gain."
1023
msgstr ""
1024
1025
#: bzrlib/builtins.py:1977
1026
msgid "The branch *MUST* be on a listable system such as local disk or sftp."
1027
msgstr ""
1028
1029
#: bzrlib/builtins.py:2044 bzrlib/builtins.py:2162 bzrlib/builtins.py:3779
1030
msgid ""
1031
"Format for the bzr 2.0 series.\n"
1032
"Uses group-compress storage.\n"
1033
"Provides rich roots which are a one-way transition.\n"
1034
msgstr ""
1035
1036
#: bzrlib/builtins.py:2044 bzrlib/builtins.py:2162 bzrlib/builtins.py:3779
1037
msgid ""
1038
"Pack-based format used in 1.x series. Introduced in 0.92. Interoperates with "
1039
"bzr repositories before 0.92 but cannot be read by bzr < 0.92. "
1040
msgstr ""
1041
1042
#: bzrlib/builtins.py:2044 bzrlib/builtins.py:2162 bzrlib/builtins.py:3779
1043
msgid "The 2a format with experimental support for colocated branches.\n"
1044
msgstr ""
1045
1046
#: bzrlib/builtins.py:2045
1047
msgid "Make a directory into a versioned branch."
1048
msgstr ""
1049
1050
#: bzrlib/builtins.py:2047
1051
msgid ""
1052
"Use this to create an empty branch, or before importing an\n"
1053
"existing project."
1054
msgstr ""
1055
1056
#: bzrlib/builtins.py:2050
1057
msgid ""
1058
"If there is a repository in a parent directory of the location, then\n"
1059
"the history of the branch will be stored in the repository. Otherwise\n"
1060
"init creates a standalone branch which carries its own history\n"
1061
"in the .bzr directory."
1062
msgstr ""
1063
1064
#: bzrlib/builtins.py:2055
1065
msgid ""
1066
"If there is already a branch at the location but it has no working tree,\n"
1067
"the tree can be populated with 'bzr checkout'."
1068
msgstr ""
1069
1070
#: bzrlib/builtins.py:2058
1071
msgid "Recipe for importing a tree of files::"
1072
msgstr ""
1073
1074
#: bzrlib/builtins.py:2060
1075
msgid ""
1076
" cd ~/project\n"
1077
" bzr init\n"
1078
" bzr add .\n"
1079
" bzr status\n"
1080
" bzr commit -m \"imported project\""
1081
msgstr ""
1082
1083
#: bzrlib/builtins.py:2071
1084
msgid ""
1085
"Create the path leading up to the branch if it does not already exist."
1086
msgstr ""
1087
1088
#: bzrlib/builtins.py:2074
1089
msgid "Specify a format for this branch. See \"help formats\"."
1090
msgstr ""
1091
1092
#: bzrlib/builtins.py:2082
1093
msgid ""
1094
"Never change revnos or the existing log. Append revisions to it only."
1095
msgstr ""
1096
1097
#: bzrlib/builtins.py:2085
1098
msgid "Create a branch without a working tree."
1099
msgstr ""
1100
1101
#: bzrlib/builtins.py:2105 bzrlib/push.py:110
1102
#, python-format
1103
msgid ""
1104
"Parent directory of %s does not exist.\n"
1105
"You may supply --create-prefix to create all leading parent directories."
1106
msgstr ""
1107
1108
#: bzrlib/builtins.py:2139
1109
msgid ""
1110
"This branch format cannot be set to append-revisions-only. Try --default."
1111
msgstr ""
1112
1113
#: bzrlib/builtins.py:2150
1114
msgid "Created a {0} (format: {1})\n"
1115
msgstr ""
1116
1117
#: bzrlib/builtins.py:2159
1118
#, python-format
1119
msgid "Using shared repository: %s\n"
1120
msgstr ""
1121
1122
#: bzrlib/builtins.py:2163
1123
msgid "Create a shared repository for branches to share storage space."
1124
msgstr ""
1125
1126
#: bzrlib/builtins.py:2165
1127
msgid ""
1128
"New branches created under the repository directory will store their\n"
1129
"revisions in the repository, not in the branch directory. For branches\n"
1130
"with shared history, this reduces the amount of storage needed and \n"
1131
"speeds up the creation of new branches."
1132
msgstr ""
1133
1134
#: bzrlib/builtins.py:2170
1135
msgid ""
1136
"If the --no-trees option is given then the branches in the repository\n"
1137
"will not have working trees by default. They will still exist as \n"
1138
"directories on disk, but they will not have separate copies of the \n"
1139
"files at a certain revision. This can be useful for repositories that\n"
1140
"store branches which are interacted with through checkouts or remote\n"
1141
"branches, such as on a server."
1142
msgstr ""
1143
1144
#: bzrlib/builtins.py:2177
1145
msgid ""
1146
":Examples:\n"
1147
" Create a shared repository holding just branches::"
1148
msgstr ""
1149
1150
#: bzrlib/builtins.py:2180
1151
msgid ""
1152
" bzr init-repo --no-trees repo\n"
1153
" bzr init repo/trunk"
1154
msgstr ""
1155
1156
#: bzrlib/builtins.py:2183
1157
msgid " Make a lightweight checkout elsewhere::"
1158
msgstr ""
1159
1160
#: bzrlib/builtins.py:2185
1161
msgid ""
1162
" bzr checkout --lightweight repo/trunk trunk-checkout\n"
1163
" cd trunk-checkout\n"
1164
" (add files here)"
1165
msgstr ""
1166
1167
#: bzrlib/builtins.py:2193
1168
msgid ""
1169
"Specify a format for this repository. See \"bzr help formats\" for details."
1170
msgstr ""
1171
1172
#: bzrlib/builtins.py:2197
1173
msgid "Repository format"
1174
msgstr ""
1175
1176
#: bzrlib/builtins.py:2199
1177
msgid "Branches in the repository will default to not having a working tree."
1178
msgstr ""
1179
1180
#: bzrlib/builtins.py:2225
1181
msgid "Show differences in the working tree, between revisions or branches."
1182
msgstr ""
1183
1184
#: bzrlib/builtins.py:2227
1185
msgid ""
1186
"If no arguments are given, all changes for the current tree are listed.\n"
1187
"If files are given, only the changes in those files are listed.\n"
1188
"Remote and multiple branches can be compared by using the --old and\n"
1189
"--new options. If not provided, the default for both is derived from\n"
1190
"the first argument, if any, or the current tree if no arguments are\n"
1191
"given."
1192
msgstr ""
1193
1194
#: bzrlib/builtins.py:2234
1195
msgid ""
1196
"\"bzr diff -p1\" is equivalent to \"bzr diff --prefix old/:new/\", and\n"
1197
"produces patches suitable for \"patch -p1\"."
1198
msgstr ""
1199
1200
#: bzrlib/builtins.py:2237
1201
msgid ""
1202
"Note that when using the -r argument with a range of revisions, the\n"
1203
"differences are computed between the two specified revisions. That\n"
1204
"is, the command does not show the changes introduced by the first \n"
1205
"revision in the range. This differs from the interpretation of \n"
1206
"revision ranges used by \"bzr log\" which includes the first revision\n"
1207
"in the range."
1208
msgstr ""
1209
1210
#: bzrlib/builtins.py:2244
1211
msgid ""
1212
":Exit values:\n"
1213
" 1 - changed\n"
1214
" 2 - unrepresentable changes\n"
1215
" 3 - error\n"
1216
" 0 - no change"
1217
msgstr ""
1218
1219
#: bzrlib/builtins.py:2250
1220
msgid ""
1221
":Examples:\n"
1222
" Shows the difference in the working tree versus the last commit::"
1223
msgstr ""
1224
1225
#: bzrlib/builtins.py:2253
1226
msgid " bzr diff"
1227
msgstr ""
1228
1229
#: bzrlib/builtins.py:2255
1230
msgid " Difference between the working tree and revision 1::"
1231
msgstr ""
1232
1233
#: bzrlib/builtins.py:2257
1234
msgid " bzr diff -r1"
1235
msgstr ""
1236
1237
#: bzrlib/builtins.py:2259
1238
msgid " Difference between revision 3 and revision 1::"
1239
msgstr ""
1240
1241
#: bzrlib/builtins.py:2261
1242
msgid " bzr diff -r1..3"
1243
msgstr ""
1244
1245
#: bzrlib/builtins.py:2263
1246
msgid " Difference between revision 3 and revision 1 for branch xxx::"
1247
msgstr ""
1248
1249
#: bzrlib/builtins.py:2265
1250
msgid " bzr diff -r1..3 xxx"
1251
msgstr ""
1252
1253
#: bzrlib/builtins.py:2267
1254
msgid " The changes introduced by revision 2 (equivalent to -r1..2)::"
1255
msgstr ""
1256
1257
#: bzrlib/builtins.py:2269
1258
msgid " bzr diff -c2"
1259
msgstr ""
1260
1261
#: bzrlib/builtins.py:2271
1262
msgid ""
1263
" To see the changes introduced by revision X::\n"
1264
" \n"
1265
" bzr diff -cX"
1266
msgstr ""
1267
1268
#: bzrlib/builtins.py:2275
1269
msgid ""
1270
" Note that in the case of a merge, the -c option shows the changes\n"
1271
" compared to the left hand parent. To see the changes against\n"
1272
" another parent, use::"
1273
msgstr ""
1274
1275
#: bzrlib/builtins.py:2279
1276
msgid " bzr diff -r<chosen_parent>..X"
1277
msgstr ""
1278
1279
#: bzrlib/builtins.py:2281
1280
msgid ""
1281
" The changes between the current revision and the previous revision\n"
1282
" (equivalent to -c-1 and -r-2..-1)"
1283
msgstr ""
1284
1285
#: bzrlib/builtins.py:2284
1286
msgid " bzr diff -r-2.."
1287
msgstr ""
1288
1289
#: bzrlib/builtins.py:2286
1290
msgid " Show just the differences for file NEWS::"
1291
msgstr ""
1292
1293
#: bzrlib/builtins.py:2288
1294
msgid " bzr diff NEWS"
1295
msgstr ""
1296
1297
#: bzrlib/builtins.py:2290
1298
msgid " Show the differences in working tree xxx for file NEWS::"
1299
msgstr ""
1300
1301
#: bzrlib/builtins.py:2292
1302
msgid " bzr diff xxx/NEWS"
1303
msgstr ""
1304
1305
#: bzrlib/builtins.py:2294
1306
msgid " Show the differences from branch xxx to this working tree:"
1307
msgstr ""
1308
1309
#: bzrlib/builtins.py:2296
1310
msgid " bzr diff --old xxx"
1311
msgstr ""
1312
1313
#: bzrlib/builtins.py:2298
1314
msgid " Show the differences between two branches for file NEWS::"
1315
msgstr ""
1316
1317
#: bzrlib/builtins.py:2300
1318
msgid " bzr diff --old xxx --new yyy NEWS"
1319
msgstr ""
1320
1321
#: bzrlib/builtins.py:2302
1322
msgid " Same as 'bzr diff' but prefix paths with old/ and new/::"
1323
msgstr ""
1324
1325
#: bzrlib/builtins.py:2304
1326
msgid ""
1327
" bzr diff --prefix old/:new/\n"
1328
" \n"
1329
" Show the differences using a custom diff program with options::\n"
1330
" \n"
1331
" bzr diff --using /usr/bin/diff --diff-options -wu"
1332
msgstr ""
1333
1334
#: bzrlib/builtins.py:2314
1335
msgid "Pass these options to the external diff program."
1336
msgstr ""
1337
1338
#: bzrlib/builtins.py:2317
1339
msgid ""
1340
"Set prefixes added to old and new filenames, as two values separated by a "
1341
"colon. (eg \"old/:new/\")."
1342
msgstr ""
1343
1344
#: bzrlib/builtins.py:2320
1345
msgid "Branch/tree to compare from."
1346
msgstr ""
1347
1348
#: bzrlib/builtins.py:2324
1349
msgid "Branch/tree to compare to."
1350
msgstr ""
1351
1352
#: bzrlib/builtins.py:2330
1353
msgid "Use this command to compare files."
1354
msgstr ""
1355
1356
#: bzrlib/builtins.py:2335
1357
msgid "Diff format to use."
1358
msgstr ""
1359
1360
#: bzrlib/builtins.py:2337
1361
msgid "Diff format"
1362
msgstr ""
1363
1364
#: bzrlib/builtins.py:2359
1365
msgid "--prefix expects two values separated by a colon (eg \"old/:new/\")"
1366
msgstr ""
1367
1368
#: bzrlib/builtins.py:2363
1369
msgid "bzr diff --revision takes exactly one or two revision specifiers"
1370
msgstr ""
1371
1372
#: bzrlib/builtins.py:2368 bzrlib/builtins.py:2765 bzrlib/builtins.py:2778
1373
#: bzrlib/builtins.py:2786 bzrlib/builtins.py:4959
1374
msgid "{0} and {1} are mutually exclusive"
1375
msgstr ""
1376
1377
#: bzrlib/builtins.py:2388
1378
msgid ""
1379
"List files deleted in the working tree.\n"
1380
" "
1381
msgstr ""
1382
1383
#: bzrlib/builtins.py:2465
1384
msgid "Show the tree root directory."
1385
msgstr ""
1386
1387
#: bzrlib/builtins.py:2467
1388
msgid ""
1389
"The root is the nearest enclosing directory with a .bzr control\n"
1390
"directory."
1391
msgstr ""
1392
1393
#: bzrlib/builtins.py:2482
1394
msgid "The limit argument must be an integer."
1395
msgstr ""
1396
1397
#: bzrlib/builtins.py:2490
1398
msgid "The levels argument must be an integer."
1399
msgstr ""
1400
1401
#: bzrlib/builtins.py:2495
1402
msgid "Show historical log for a branch or subset of a branch."
1403
msgstr ""
1404
1405
#: bzrlib/builtins.py:2497
1406
msgid ""
1407
"log is bzr's default tool for exploring the history of a branch.\n"
1408
"The branch to use is taken from the first parameter. If no parameters\n"
1409
"are given, the branch containing the working directory is logged.\n"
1410
"Here are some simple examples::"
1411
msgstr ""
1412
1413
#: bzrlib/builtins.py:2502
1414
msgid ""
1415
" bzr log log the current branch\n"
1416
" bzr log foo.py log a file in its branch\n"
1417
" bzr log http://server/branch log a branch on a server"
1418
msgstr ""
1419
1420
#: bzrlib/builtins.py:2506
1421
msgid ""
1422
"The filtering, ordering and information shown for each revision can\n"
1423
"be controlled as explained below. By default, all revisions are\n"
1424
"shown sorted (topologically) so that newer revisions appear before\n"
1425
"older ones and descendants always appear before ancestors. If displayed,\n"
1426
"merged revisions are shown indented under the revision in which they\n"
1427
"were merged."
1428
msgstr ""
1429
1430
#: bzrlib/builtins.py:2513
1431
msgid ":Output control:"
1432
msgstr ""
1433
1434
#: bzrlib/builtins.py:2515
1435
msgid ""
1436
" The log format controls how information about each revision is\n"
1437
" displayed. The standard log formats are called ``long``, ``short``\n"
1438
" and ``line``. The default is long. See ``bzr help log-formats``\n"
1439
" for more details on log formats."
1440
msgstr ""
1441
1442
#: bzrlib/builtins.py:2520
1443
msgid ""
1444
" The following options can be used to control what information is\n"
1445
" displayed::"
1446
msgstr ""
1447
1448
#: bzrlib/builtins.py:2523
1449
msgid ""
1450
" -l N display a maximum of N revisions\n"
1451
" -n N display N levels of revisions (0 for all, 1 for collapsed)\n"
1452
" -v display a status summary (delta) for each revision\n"
1453
" -p display a diff (patch) for each revision\n"
1454
" --show-ids display revision-ids (and file-ids), not just revnos"
1455
msgstr ""
1456
1457
#: bzrlib/builtins.py:2529
1458
msgid ""
1459
" Note that the default number of levels to display is a function of the\n"
1460
" log format. If the -n option is not used, the standard log formats show\n"
1461
" just the top level (mainline)."
1462
msgstr ""
1463
1464
#: bzrlib/builtins.py:2533
1465
msgid ""
1466
" Status summaries are shown using status flags like A, M, etc. To see\n"
1467
" the changes explained using words like ``added`` and ``modified``\n"
1468
" instead, use the -vv option."
1469
msgstr ""
1470
1471
#: bzrlib/builtins.py:2537
1472
msgid ":Ordering control:"
1473
msgstr ""
1474
1475
#: bzrlib/builtins.py:2539
1476
msgid ""
1477
" To display revisions from oldest to newest, use the --forward option.\n"
1478
" In most cases, using this option will have little impact on the total\n"
1479
" time taken to produce a log, though --forward does not incrementally\n"
1480
" display revisions like --reverse does when it can."
1481
msgstr ""
1482
1483
#: bzrlib/builtins.py:2544
1484
msgid ":Revision filtering:"
1485
msgstr ""
1486
1487
#: bzrlib/builtins.py:2546
1488
msgid ""
1489
" The -r option can be used to specify what revision or range of revisions\n"
1490
" to filter against. The various forms are shown below::"
1491
msgstr ""
1492
1493
#: bzrlib/builtins.py:2549
1494
msgid ""
1495
" -rX display revision X\n"
1496
" -rX.. display revision X and later\n"
1497
" -r..Y display up to and including revision Y\n"
1498
" -rX..Y display from X to Y inclusive"
1499
msgstr ""
1500
1501
#: bzrlib/builtins.py:2554
1502
msgid ""
1503
" See ``bzr help revisionspec`` for details on how to specify X and Y.\n"
1504
" Some common examples are given below::"
1505
msgstr ""
1506
1507
#: bzrlib/builtins.py:2557
1508
msgid ""
1509
" -r-1 show just the tip\n"
1510
" -r-10.. show the last 10 mainline revisions\n"
1511
" -rsubmit:.. show what's new on this branch\n"
1512
" -rancestor:path.. show changes since the common ancestor of this\n"
1513
" branch and the one at location path\n"
1514
" -rdate:yesterday.. show changes since yesterday"
1515
msgstr ""
1516
1517
#: bzrlib/builtins.py:2564
1518
msgid ""
1519
" When logging a range of revisions using -rX..Y, log starts at\n"
1520
" revision Y and searches back in history through the primary\n"
1521
" (\"left-hand\") parents until it finds X. When logging just the\n"
1522
" top level (using -n1), an error is reported if X is not found\n"
1523
" along the way. If multi-level logging is used (-n0), X may be\n"
1524
" a nested merge revision and the log will be truncated accordingly."
1525
msgstr ""
1526
1527
#: bzrlib/builtins.py:2571
1528
msgid ":Path filtering:"
1529
msgstr ""
1530
1531
#: bzrlib/builtins.py:2573
1532
msgid ""
1533
" If parameters are given and the first one is not a branch, the log\n"
1534
" will be filtered to show only those revisions that changed the\n"
1535
" nominated files or directories."
1536
msgstr ""
1537
1538
#: bzrlib/builtins.py:2577
1539
msgid ""
1540
" Filenames are interpreted within their historical context. To log a\n"
1541
" deleted file, specify a revision range so that the file existed at\n"
1542
" the end or start of the range."
1543
msgstr ""
1544
1545
#: bzrlib/builtins.py:2581
1546
msgid ""
1547
" Historical context is also important when interpreting pathnames of\n"
1548
" renamed files/directories. Consider the following example:"
1549
msgstr ""
1550
1551
#: bzrlib/builtins.py:2584
1552
msgid ""
1553
" * revision 1: add tutorial.txt\n"
1554
" * revision 2: modify tutorial.txt\n"
1555
" * revision 3: rename tutorial.txt to guide.txt; add tutorial.txt"
1556
msgstr ""
1557
1558
#: bzrlib/builtins.py:2588
1559
msgid " In this case:"
1560
msgstr ""
1561
1562
#: bzrlib/builtins.py:2590
1563
msgid " * ``bzr log guide.txt`` will log the file added in revision 1"
1564
msgstr ""
1565
1566
#: bzrlib/builtins.py:2592
1567
msgid ""
1568
" * ``bzr log tutorial.txt`` will log the new file added in revision 3"
1569
msgstr ""
1570
1571
#: bzrlib/builtins.py:2594
1572
msgid ""
1573
" * ``bzr log -r2 -p tutorial.txt`` will show the changes made to\n"
1574
" the original file in revision 2."
1575
msgstr ""
1576
1577
#: bzrlib/builtins.py:2597
1578
msgid ""
1579
" * ``bzr log -r2 -p guide.txt`` will display an error message as there\n"
1580
" was no file called guide.txt in revision 2."
1581
msgstr ""
1582
1583
#: bzrlib/builtins.py:2600
1584
msgid ""
1585
" Renames are always followed by log. By design, there is no need to\n"
1586
" explicitly ask for this (and no way to stop logging a file back\n"
1587
" until it was last renamed)."
1588
msgstr ""
1589
1590
#: bzrlib/builtins.py:2604
1591
msgid ":Other filtering:"
1592
msgstr ""
1593
1594
#: bzrlib/builtins.py:2606
1595
msgid ""
1596
" The --match option can be used for finding revisions that match a\n"
1597
" regular expression in a commit message, committer, author or bug.\n"
1598
" Specifying the option several times will match any of the supplied\n"
1599
" expressions. --match-author, --match-bugs, --match-committer and\n"
1600
" --match-message can be used to only match a specific field."
1601
msgstr ""
1602
1603
#: bzrlib/builtins.py:2612
1604
msgid ":Tips & tricks:"
1605
msgstr ""
1606
1607
#: bzrlib/builtins.py:2614
1608
msgid ""
1609
" GUI tools and IDEs are often better at exploring history than command\n"
1610
" line tools: you may prefer qlog or viz from qbzr or bzr-gtk, the\n"
1611
" bzr-explorer shell, or the Loggerhead web interface. See the Plugin\n"
1612
" Guide <http://doc.bazaar.canonical.com/plugins/en/> and\n"
1613
" <http://wiki.bazaar.canonical.com/IDEIntegration>. "
1614
msgstr ""
1615
1616
#: bzrlib/builtins.py:2620
1617
msgid ""
1618
" You may find it useful to add the aliases below to ``bazaar.conf``::"
1619
msgstr ""
1620
1621
#: bzrlib/builtins.py:2622
1622
msgid ""
1623
" [ALIASES]\n"
1624
" tip = log -r-1\n"
1625
" top = log -l10 --line\n"
1626
" show = log -v -p"
1627
msgstr ""
1628
1629
#: bzrlib/builtins.py:2627
1630
msgid ""
1631
" ``bzr tip`` will then show the latest revision while ``bzr top``\n"
1632
" will show the last 10 mainline revisions. To see the details of a\n"
1633
" particular revision X, ``bzr show -rX``."
1634
msgstr ""
1635
1636
#: bzrlib/builtins.py:2631
1637
msgid ""
1638
" If you are interested in looking deeper into a particular merge X,\n"
1639
" use ``bzr log -n0 -rX``."
1640
msgstr ""
1641
1642
#: bzrlib/builtins.py:2634
1643
msgid ""
1644
" ``bzr log -v`` on a branch with lots of history is currently\n"
1645
" very slow. A fix for this issue is currently under development.\n"
1646
" With or without that fix, it is recommended that a revision range\n"
1647
" be given when using the -v option."
1648
msgstr ""
1649
1650
#: bzrlib/builtins.py:2639
1651
msgid ""
1652
" bzr has a generic full-text matching plugin, bzr-search, that can be\n"
1653
" used to find revisions matching user names, commit messages, etc.\n"
1654
" Among other features, this plugin can find all revisions containing\n"
1655
" a list of words but not others."
1656
msgstr ""
1657
1658
#: bzrlib/builtins.py:2644
1659
msgid ""
1660
" When exploring non-mainline history on large projects with deep\n"
1661
" history, the performance of log can be greatly improved by installing\n"
1662
" the historycache plugin. This plugin buffers historical information\n"
1663
" trading disk space for faster speed."
1664
msgstr ""
1665
1666
#: bzrlib/builtins.py:2653
1667
msgid "Show from oldest to newest."
1668
msgstr ""
1669
1670
#: bzrlib/builtins.py:2656
1671
msgid "Show files changed in each revision."
1672
msgstr ""
1673
1674
#: bzrlib/builtins.py:2662
1675
msgid "Show just the specified revision. See also \"help revisionspec\"."
1676
msgstr ""
1677
1678
#: bzrlib/builtins.py:2666
1679
msgid "What names to list as authors - first, all or committer."
1680
msgstr ""
1681
1682
#: bzrlib/builtins.py:2667
1683
msgid "Authors"
1684
msgstr ""
1685
1686
#: bzrlib/builtins.py:2672
1687
msgid "Number of levels to display - 0 for all, 1 for flat."
1688
msgstr ""
1689
1690
#: bzrlib/builtins.py:2682
1691
msgid "Limit the output to the first N revisions."
1692
msgstr ""
1693
1694
#: bzrlib/builtins.py:2687
1695
msgid "Show changes made in each revision as a patch."
1696
msgstr ""
1697
1698
#: bzrlib/builtins.py:2689
1699
msgid "Show merged revisions like --levels 0 does."
1700
msgstr ""
1701
1702
#: bzrlib/builtins.py:2693
1703
msgid "Do not report commits with more than one parent."
1704
msgstr ""
1705
1706
#: bzrlib/builtins.py:2695
1707
msgid ""
1708
"Display only the revisions that are not part of both ancestries (require -"
1709
"rX..Y)."
1710
msgstr ""
1711
1712
#: bzrlib/builtins.py:2699
1713
msgid "Show digital signature validity."
1714
msgstr ""
1715
1716
#: bzrlib/builtins.py:2702
1717
msgid "Show revisions whose properties match this expression."
1718
msgstr ""
1719
1720
#: bzrlib/builtins.py:2706
1721
msgid "Show revisions whose message matches this expression."
1722
msgstr ""
1723
1724
#: bzrlib/builtins.py:2710
1725
msgid "Show revisions whose committer matches this expression."
1726
msgstr ""
1727
1728
#: bzrlib/builtins.py:2714
1729
msgid "Show revisions whose authors match this expression."
1730
msgstr ""
1731
1732
#: bzrlib/builtins.py:2718
1733
msgid "Show revisions whose bugs match this expression."
1734
msgstr ""
1735
1736
#: bzrlib/builtins.py:2772
1737
msgid "--exclude-common-ancestry requires -r with two revisions"
1738
msgstr ""
1739
1740
#: bzrlib/builtins.py:2800
1741
#, python-format
1742
msgid "Path unknown at end or start of revision range: %s"
1743
msgstr ""
1744
1745
#: bzrlib/builtins.py:2917
1746
#, python-format
1747
msgid "bzr %s doesn't accept two revisions in different branches."
1748
msgstr ""
1749
1750
#: bzrlib/builtins.py:2933
1751
#, python-format
1752
msgid "bzr %s --revision takes one or two values."
1753
msgstr ""
1754
1755
#: bzrlib/builtins.py:2978
1756
msgid ""
1757
"List files in a tree.\n"
1758
" "
1759
msgstr ""
1760
1761
#: bzrlib/builtins.py:2987
1762
msgid "Recurse into subdirectories."
1763
msgstr ""
1764
1765
#: bzrlib/builtins.py:2989
1766
msgid "Print paths relative to the root of the branch."
1767
msgstr ""
1768
1769
#: bzrlib/builtins.py:2991
1770
msgid "Print unknown files."
1771
msgstr ""
1772
1773
#: bzrlib/builtins.py:2992
1774
msgid "Print versioned files."
1775
msgstr ""
1776
1777
#: bzrlib/builtins.py:2995
1778
msgid "Print ignored files."
1779
msgstr ""
1780
1781
#: bzrlib/builtins.py:2997
1782
msgid "List entries of a particular kind: file, directory, symlink."
1783
msgstr ""
1784
1785
#: bzrlib/builtins.py:3010
1786
msgid "invalid kind specified"
1787
msgstr ""
1788
1789
#: bzrlib/builtins.py:3013
1790
msgid "Cannot set both --verbose and --null"
1791
msgstr ""
1792
1793
#: bzrlib/builtins.py:3022
1794
msgid "cannot specify both --from-root and PATH"
1795
msgstr ""
1796
1797
#: bzrlib/builtins.py:3109
1798
msgid "Ignore specified files or patterns."
1799
msgstr ""
1800
1801
#: bzrlib/builtins.py:3111
1802
msgid "See ``bzr help patterns`` for details on the syntax of patterns."
1803
msgstr ""
1804
1805
#: bzrlib/builtins.py:3113
1806
msgid ""
1807
"If a .bzrignore file does not exist, the ignore command\n"
1808
"will create one and add the specified files or patterns to the newly\n"
1809
"created file. The ignore command will also automatically add the \n"
1810
".bzrignore file to be versioned. Creating a .bzrignore file without\n"
1811
"the use of the ignore command will require an explicit add command."
1812
msgstr ""
1813
1814
#: bzrlib/builtins.py:3119
1815
msgid ""
1816
"To remove patterns from the ignore list, edit the .bzrignore file.\n"
1817
"After adding, editing or deleting that file either indirectly by\n"
1818
"using this command or directly by using an editor, be sure to commit\n"
1819
"it."
1820
msgstr ""
1821
1822
#: bzrlib/builtins.py:3124
1823
msgid ""
1824
"Bazaar also supports a global ignore file ~/.bazaar/ignore. On Windows\n"
1825
"the global ignore file can be found in the application data directory as\n"
1826
"C:\\Documents and Settings\\<user>\\Application Data\\Bazaar\\2.0\\ignore.\n"
1827
"Global ignores are not touched by this command. The global ignore file\n"
1828
"can be edited directly using an editor."
1829
msgstr ""
1830
1831
#: bzrlib/builtins.py:3130
1832
msgid ""
1833
"Patterns prefixed with '!' are exceptions to ignore patterns and take\n"
1834
"precedence over regular ignores. Such exceptions are used to specify\n"
1835
"files that should be versioned which would otherwise be ignored."
1836
msgstr ""
1837
1838
#: bzrlib/builtins.py:3134
1839
msgid ""
1840
"Patterns prefixed with '!!' act as regular ignore patterns, but have\n"
1841
"precedence over the '!' exception patterns."
1842
msgstr ""
1843
1844
#: bzrlib/builtins.py:3137
1845
msgid ""
1846
":Notes: \n"
1847
" \n"
1848
"* Ignore patterns containing shell wildcards must be quoted from\n"
1849
" the shell on Unix."
1850
msgstr ""
1851
1852
#: bzrlib/builtins.py:3142
1853
msgid ""
1854
"* Ignore patterns starting with \"#\" act as comments in the ignore file.\n"
1855
" To ignore patterns that begin with that character, use the \"RE:\" prefix."
1856
msgstr ""
1857
1858
#: bzrlib/builtins.py:3145
1859
msgid ""
1860
":Examples:\n"
1861
" Ignore the top level Makefile::"
1862
msgstr ""
1863
1864
#: bzrlib/builtins.py:3148
1865
msgid " bzr ignore ./Makefile"
1866
msgstr ""
1867
1868
#: bzrlib/builtins.py:3150
1869
msgid " Ignore .class files in all directories...::"
1870
msgstr ""
1871
1872
#: bzrlib/builtins.py:3152
1873
msgid " bzr ignore \"*.class\""
1874
msgstr ""
1875
1876
#: bzrlib/builtins.py:3154
1877
msgid " ...but do not ignore \"special.class\"::"
1878
msgstr ""
1879
1880
#: bzrlib/builtins.py:3156
1881
msgid " bzr ignore \"!special.class\""
1882
msgstr ""
1883
1884
#: bzrlib/builtins.py:3158
1885
msgid " Ignore files whose name begins with the \"#\" character::"
1886
msgstr ""
1887
1888
#: bzrlib/builtins.py:3160
1889
msgid " bzr ignore \"RE:^#\""
1890
msgstr ""
1891
1892
#: bzrlib/builtins.py:3162 bzrlib/builtins.py:3166
1893
msgid " Ignore .o files under the lib directory::"
1894
msgstr ""
1895
1896
#: bzrlib/builtins.py:3164
1897
msgid " bzr ignore \"lib/**/*.o\""
1898
msgstr ""
1899
1900
#: bzrlib/builtins.py:3168
1901
msgid " bzr ignore \"RE:lib/.*\\.o\""
1902
msgstr ""
1903
1904
#: bzrlib/builtins.py:3170
1905
msgid " Ignore everything but the \"debian\" toplevel directory::"
1906
msgstr ""
1907
1908
#: bzrlib/builtins.py:3172
1909
msgid ""
1910
" bzr ignore \"RE:(?!debian/).*\"\n"
1911
" \n"
1912
" Ignore everything except the \"local\" toplevel directory,\n"
1913
" but always ignore autosave files ending in ~, even under local/::\n"
1914
" \n"
1915
" bzr ignore \"*\"\n"
1916
" bzr ignore \"!./local\"\n"
1917
" bzr ignore \"!!*~\""
1918
msgstr ""
1919
1920
#: bzrlib/builtins.py:3186
1921
msgid "Display the default ignore rules that bzr uses."
1922
msgstr ""
1923
1924
#: bzrlib/builtins.py:3198
1925
msgid "ignore requires at least one NAME_PATTERN or --default-rules."
1926
msgstr ""
1927
1928
#: bzrlib/builtins.py:3209
1929
#, python-format
1930
msgid "Invalid ignore pattern found. %s"
1931
msgid_plural "Invalid ignore patterns found. %s"
1932
msgstr[0] ""
1933
msgstr[1] ""
1934
1935
#: bzrlib/builtins.py:3218
1936
msgid "NAME_PATTERN should not be an absolute path"
1937
msgstr ""
1938
1939
#: bzrlib/builtins.py:3231
1940
#, python-format
1941
msgid ""
1942
"Warning: the following files are version controlled and match your ignore "
1943
"pattern:\n"
1944
"%s\n"
1945
"These files will continue to be version controlled unless you 'bzr remove' "
1946
"them.\n"
1947
msgstr ""
1948
1949
#: bzrlib/builtins.py:3238
1950
msgid "List ignored files and the patterns that matched them."
1951
msgstr ""
1952
1953
#: bzrlib/builtins.py:3240
1954
msgid ""
1955
"List all the ignored files and the ignore pattern that caused the file to\n"
1956
"be ignored."
1957
msgstr ""
1958
1959
#: bzrlib/builtins.py:3243
1960
msgid "Alternatively, to list just the files::"
1961
msgstr ""
1962
1963
#: bzrlib/builtins.py:3245
1964
msgid " bzr ls --ignored"
1965
msgstr ""
1966
1967
#: bzrlib/builtins.py:3279
1968
#, python-format
1969
msgid "not a valid revision-number: %r"
1970
msgstr ""
1971
1972
#: bzrlib/builtins.py:3286
1973
msgid ""
1974
"Export current or past revision to a destination directory or archive."
1975
msgstr ""
1976
1977
#: bzrlib/builtins.py:3288
1978
msgid "If no revision is specified this exports the last committed revision."
1979
msgstr ""
1980
1981
#: bzrlib/builtins.py:3290
1982
msgid ""
1983
"Format may be an \"exporter\" name, such as tar, tgz, tbz2. If none is\n"
1984
"given, try to find the format with the extension. If no extension\n"
1985
"is found exports to a directory (equivalent to --format=dir)."
1986
msgstr ""
1987
1988
#: bzrlib/builtins.py:3294
1989
msgid ""
1990
"If root is supplied, it will be used as the root directory inside\n"
1991
"container formats (tar, zip, etc). If it is not supplied it will default\n"
1992
"to the exported filename. The root option has no effect for 'dir' format."
1993
msgstr ""
1994
1995
#: bzrlib/builtins.py:3298
1996
msgid ""
1997
"If branch is omitted then the branch containing the current working\n"
1998
"directory will be used."
1999
msgstr ""
2000
2001
#: bzrlib/builtins.py:3301
2002
msgid ""
2003
"Note: Export of tree with non-ASCII filenames to zip is not supported."
2004
msgstr ""
2005
2006
#: bzrlib/builtins.py:3303
2007
msgid ""
2008
" ================= =========================\n"
2009
" Supported formats Autodetected by extension\n"
2010
" ================= =========================\n"
2011
" dir (none)\n"
2012
" tar .tar\n"
2013
" tbz2 .tar.bz2, .tbz2\n"
2014
" tgz .tar.gz, .tgz\n"
2015
" zip .zip\n"
2016
" ================= ========================="
2017
msgstr ""
2018
2019
#: bzrlib/builtins.py:3317
2020
msgid "Type of file to export to."
2021
msgstr ""
2022
2023
#: bzrlib/builtins.py:3320
2024
msgid "Apply content filters to export the convenient form."
2025
msgstr ""
2026
2027
#: bzrlib/builtins.py:3324
2028
msgid "Name of the root directory inside the exported file."
2029
msgstr ""
2030
2031
#: bzrlib/builtins.py:3326
2032
msgid ""
2033
"Set modification time of files to that of the last revision in which it was "
2034
"changed."
2035
msgstr ""
2036
2037
#: bzrlib/builtins.py:3329
2038
msgid ""
2039
"Export the working tree contents rather than that of the last revision."
2040
msgstr ""
2041
2042
#: bzrlib/builtins.py:3348
2043
msgid "--uncommitted requires a working tree"
2044
msgstr ""
2045
2046
#: bzrlib/builtins.py:3357
2047
#, python-format
2048
msgid "Unsupported export format: %s"
2049
msgstr ""
2050
2051
#: bzrlib/builtins.py:3361
2052
msgid ""
2053
"Write the contents of a file as of a given revision to standard output."
2054
msgstr ""
2055
2056
#: bzrlib/builtins.py:3363
2057
msgid "If no revision is nominated, the last revision is used."
2058
msgstr ""
2059
2060
#: bzrlib/builtins.py:3365
2061
msgid ""
2062
"Note: Take care to redirect standard output when using this command on a\n"
2063
"binary file."
2064
msgstr ""
2065
2066
#: bzrlib/builtins.py:3371
2067
msgid "The path name in the old tree."
2068
msgstr ""
2069
2070
#: bzrlib/builtins.py:3372
2071
msgid "Apply content filters to display the convenience form."
2072
msgstr ""
2073
2074
#: bzrlib/builtins.py:3383
2075
msgid "bzr cat --revision takes exactly one revision specifier"
2076
msgstr ""
2077
2078
#: bzrlib/builtins.py:3408 bzrlib/builtins.py:3420
2079
msgid "{0!r} is not present in revision {1}"
2080
msgstr ""
2081
2082
#: bzrlib/builtins.py:3443
2083
msgid "Commit changes into a new revision."
2084
msgstr ""
2085
2086
#: bzrlib/builtins.py:3445
2087
msgid ""
2088
"An explanatory message needs to be given for each commit. This is\n"
2089
"often done by using the --message option (getting the message from the\n"
2090
"command line) or by using the --file option (getting the message from\n"
2091
"a file). If neither of these options is given, an editor is opened for\n"
2092
"the user to enter the message. To see the changed files in the\n"
2093
"boilerplate text loaded into the editor, use the --show-diff option."
2094
msgstr ""
2095
2096
#: bzrlib/builtins.py:3452
2097
msgid ""
2098
"By default, the entire tree is committed and the person doing the\n"
2099
"commit is assumed to be the author. These defaults can be overridden\n"
2100
"as explained below."
2101
msgstr ""
2102
2103
#: bzrlib/builtins.py:3456
2104
msgid ":Selective commits:"
2105
msgstr ""
2106
2107
#: bzrlib/builtins.py:3458
2108
msgid ""
2109
" If selected files are specified, only changes to those files are\n"
2110
" committed. If a directory is specified then the directory and\n"
2111
" everything within it is committed."
2112
msgstr ""
2113
2114
#: bzrlib/builtins.py:3462
2115
msgid ""
2116
" When excludes are given, they take precedence over selected files.\n"
2117
" For example, to commit only changes within foo, but not changes\n"
2118
" within foo/bar::"
2119
msgstr ""
2120
2121
#: bzrlib/builtins.py:3466
2122
msgid " bzr commit foo -x foo/bar"
2123
msgstr ""
2124
2125
#: bzrlib/builtins.py:3468
2126
msgid " A selective commit after a merge is not yet supported."
2127
msgstr ""
2128
2129
#: bzrlib/builtins.py:3470
2130
msgid ":Custom authors:"
2131
msgstr ""
2132
2133
#: bzrlib/builtins.py:3472
2134
msgid ""
2135
" If the author of the change is not the same person as the committer,\n"
2136
" you can specify the author's name using the --author option. The\n"
2137
" name should be in the same format as a committer-id, e.g.\n"
2138
" \"John Doe <jdoe@example.com>\". If there is more than one author of\n"
2139
" the change you can specify the option multiple times, once for each\n"
2140
" author."
2141
msgstr ""
2142
2143
#: bzrlib/builtins.py:3479
2144
msgid ":Checks:"
2145
msgstr ""
2146
2147
#: bzrlib/builtins.py:3481
2148
msgid ""
2149
" A common mistake is to forget to add a new file or directory before\n"
2150
" running the commit command. The --strict option checks for unknown\n"
2151
" files and aborts the commit if any are found. More advanced pre-commit\n"
2152
" checks can be implemented by defining hooks. See ``bzr help hooks``\n"
2153
" for details."
2154
msgstr ""
2155
2156
#: bzrlib/builtins.py:3487
2157
msgid ":Things to note:"
2158
msgstr ""
2159
2160
#: bzrlib/builtins.py:3489
2161
msgid ""
2162
" If you accidentially commit the wrong changes or make a spelling\n"
2163
" mistake in the commit message say, you can use the uncommit command\n"
2164
" to undo it. See ``bzr help uncommit`` for details."
2165
msgstr ""
2166
2167
#: bzrlib/builtins.py:3493
2168
msgid ""
2169
" Hooks can also be configured to run after a commit. This allows you\n"
2170
" to trigger updates to external systems like bug trackers. The --fixes\n"
2171
" option can be used to record the association between a revision and\n"
2172
" one or more bugs. See ``bzr help bugs`` for details."
2173
msgstr ""
2174
2175
#: bzrlib/builtins.py:3503
2176
msgid "Do not consider changes made to a given path."
2177
msgstr ""
2178
2179
#: bzrlib/builtins.py:3506
2180
msgid "Description of the new revision."
2181
msgstr ""
2182
2183
#: bzrlib/builtins.py:3509
2184
msgid "Commit even if nothing has changed."
2185
msgstr ""
2186
2187
#: bzrlib/builtins.py:3513
2188
msgid "Take commit message from this file."
2189
msgstr ""
2190
2191
#: bzrlib/builtins.py:3515
2192
msgid "Refuse to commit if there are unknown files in the working tree."
2193
msgstr ""
2194
2195
#: bzrlib/builtins.py:3518
2196
msgid ""
2197
"Manually set a commit time using commit date format, e.g. '2009-10-10 "
2198
"08:00:00 +0100'."
2199
msgstr ""
2200
2201
#: bzrlib/builtins.py:3521
2202
msgid "Mark a bug as being fixed by this revision (see \"bzr help bugs\")."
2203
msgstr ""
2204
2205
#: bzrlib/builtins.py:3524
2206
msgid "Set the author's name, if it's different from the committer."
2207
msgstr ""
2208
2209
#: bzrlib/builtins.py:3527
2210
msgid ""
2211
"Perform a local commit in a bound branch. Local commits are not pushed to "
2212
"the master branch until a normal commit is performed."
2213
msgstr ""
2214
2215
#: bzrlib/builtins.py:3533
2216
msgid ""
2217
"When no message is supplied, show the diff along with the status summary in "
2218
"the message editor."
2219
msgstr ""
2220
2221
#: bzrlib/builtins.py:3536
2222
msgid ""
2223
"When committing to a foreign version control system do not push data that "
2224
"can not be natively represented."
2225
msgstr ""
2226
2227
#: bzrlib/builtins.py:3554
2228
#, python-format
2229
msgid ""
2230
"No tracker specified for bug %s. Use the form 'tracker:id' or specify a "
2231
"default bug tracker using the `bugtracker` option.\n"
2232
"See \"bzr help bugs\" for more information on this feature. Commit refused."
2233
msgstr ""
2234
2235
#: bzrlib/builtins.py:3563
2236
#, python-format
2237
msgid ""
2238
"Invalid bug %s. Must be in the form of 'tracker:id'. See \"bzr help bugs\" "
2239
"for more information on this feature.\n"
2240
"Commit refused."
2241
msgstr ""
2242
2243
#: bzrlib/builtins.py:3572
2244
#, python-format
2245
msgid "Unrecognized bug %s. Commit refused."
2246
msgstr ""
2247
2248
#: bzrlib/builtins.py:3575
2249
#, python-format
2250
msgid ""
2251
"%s\n"
2252
"Commit refused."
2253
msgstr ""
2254
2255
#: bzrlib/builtins.py:3599
2256
msgid "Could not parse --commit-time: "
2257
msgstr ""
2258
2259
#: bzrlib/builtins.py:3639
2260
msgid "please specify either --message or --file"
2261
msgstr ""
2262
2263
#: bzrlib/builtins.py:3668
2264
msgid "please specify a commit message with either --message or --file"
2265
msgstr ""
2266
2267
#: bzrlib/builtins.py:3671
2268
msgid ""
2269
"Empty commit message specified. Please specify a commit message with either -"
2270
"-message or --file or leave a blank message with --message \"\"."
2271
msgstr ""
2272
2273
#: bzrlib/builtins.py:3691
2274
msgid ""
2275
"No changes to commit. Please 'bzr add' the files you want to commit, or use -"
2276
"-unchanged to force an empty commit."
2277
msgstr ""
2278
2279
#: bzrlib/builtins.py:3695
2280
msgid ""
2281
"Conflicts detected in working tree. Use \"bzr conflicts\" to list, \"bzr "
2282
"resolve FILE\" to resolve."
2283
msgstr ""
2284
2285
#: bzrlib/builtins.py:3699
2286
msgid "Commit refused because there are unknown files in the working tree."
2287
msgstr ""
2288
2289
#: bzrlib/builtins.py:3702
2290
msgid ""
2291
"\n"
2292
"To commit to master branch, run update and then commit.\n"
2293
"You can also pass --local to commit to continue working disconnected."
2294
msgstr ""
2295
2296
#: bzrlib/builtins.py:3710
2297
msgid ""
2298
"Validate working tree structure, branch consistency and repository history."
2299
msgstr ""
2300
2301
#: bzrlib/builtins.py:3712
2302
msgid ""
2303
"This command checks various invariants about branch and repository storage\n"
2304
"to detect data corruption or bzr bugs."
2305
msgstr ""
2306
2307
#: bzrlib/builtins.py:3715
2308
msgid ""
2309
"The working tree and branch checks will only give output if a problem is\n"
2310
"detected. The output fields of the repository check are:"
2311
msgstr ""
2312
2313
#: bzrlib/builtins.py:3718
2314
msgid ""
2315
"revisions\n"
2316
" This is just the number of revisions checked. It doesn't\n"
2317
" indicate a problem."
2318
msgstr ""
2319
2320
#: bzrlib/builtins.py:3722
2321
msgid ""
2322
"versionedfiles\n"
2323
" This is just the number of versionedfiles checked. It\n"
2324
" doesn't indicate a problem."
2325
msgstr ""
2326
2327
#: bzrlib/builtins.py:3726
2328
msgid ""
2329
"unreferenced ancestors\n"
2330
" Texts that are ancestors of other texts, but\n"
2331
" are not properly referenced by the revision ancestry. This is a\n"
2332
" subtle problem that Bazaar can work around."
2333
msgstr ""
2334
2335
#: bzrlib/builtins.py:3731
2336
msgid ""
2337
"unique file texts\n"
2338
" This is the total number of unique file contents\n"
2339
" seen in the checked revisions. It does not indicate a problem."
2340
msgstr ""
2341
2342
#: bzrlib/builtins.py:3735
2343
msgid ""
2344
"repeated file texts\n"
2345
" This is the total number of repeated texts seen\n"
2346
" in the checked revisions. Texts can be repeated when their file\n"
2347
" entries are modified, but the file contents are not. It does not\n"
2348
" indicate a problem."
2349
msgstr ""
2350
2351
#: bzrlib/builtins.py:3741
2352
msgid ""
2353
"If no restrictions are specified, all Bazaar data that is found at the "
2354
"given\n"
2355
"location will be checked."
2356
msgstr ""
2357
2358
#: bzrlib/builtins.py:3746
2359
msgid " Check the tree and branch at 'foo'::"
2360
msgstr ""
2361
2362
#: bzrlib/builtins.py:3748
2363
msgid " bzr check --tree --branch foo"
2364
msgstr ""
2365
2366
#: bzrlib/builtins.py:3750
2367
msgid " Check only the repository at 'bar'::"
2368
msgstr ""
2369
2370
#: bzrlib/builtins.py:3752
2371
msgid " bzr check --repo bar"
2372
msgstr ""
2373
2374
#: bzrlib/builtins.py:3754
2375
msgid " Check everything at 'baz'::"
2376
msgstr ""
2377
2378
#: bzrlib/builtins.py:3756
2379
msgid " bzr check baz"
2380
msgstr ""
2381
2382
#: bzrlib/builtins.py:3762
2383
msgid "Check the branch related to the current directory."
2384
msgstr ""
2385
2386
#: bzrlib/builtins.py:3764
2387
msgid "Check the repository related to the current directory."
2388
msgstr ""
2389
2390
#: bzrlib/builtins.py:3766
2391
msgid "Check the working tree related to the current directory."
2392
msgstr ""
2393
2394
#: bzrlib/builtins.py:3780
2395
msgid "Upgrade a repository, branch or working tree to a newer format."
2396
msgstr ""
2397
2398
#: bzrlib/builtins.py:3782
2399
msgid ""
2400
"When the default format has changed after a major new release of\n"
2401
"Bazaar, you may be informed during certain operations that you\n"
2402
"should upgrade. Upgrading to a newer format may improve performance\n"
2403
"or make new features available. It may however limit interoperability\n"
2404
"with older repositories or with older versions of Bazaar."
2405
msgstr ""
2406
2407
#: bzrlib/builtins.py:3788
2408
msgid ""
2409
"If you wish to upgrade to a particular format rather than the\n"
2410
"current default, that can be specified using the --format option.\n"
2411
"As a consequence, you can use the upgrade command this way to\n"
2412
"\"downgrade\" to an earlier format, though some conversions are\n"
2413
"a one way process (e.g. changing from the 1.x default to the\n"
2414
"2.x default) so downgrading is not always possible."
2415
msgstr ""
2416
2417
#: bzrlib/builtins.py:3795
2418
msgid ""
2419
"A backup.bzr.~#~ directory is created at the start of the conversion\n"
2420
"process (where # is a number). By default, this is left there on\n"
2421
"completion. If the conversion fails, delete the new .bzr directory\n"
2422
"and rename this one back in its place. Use the --clean option to ask\n"
2423
"for the backup.bzr directory to be removed on successful conversion.\n"
2424
"Alternatively, you can delete it by hand if everything looks good\n"
2425
"afterwards."
2426
msgstr ""
2427
2428
#: bzrlib/builtins.py:3803
2429
msgid ""
2430
"If the location given is a shared repository, dependent branches\n"
2431
"are also converted provided the repository converts successfully.\n"
2432
"If the conversion of a branch fails, remaining branches are still\n"
2433
"tried."
2434
msgstr ""
2435
2436
#: bzrlib/builtins.py:3808
2437
msgid ""
2438
"For more information on upgrades, see the Bazaar Upgrade Guide,\n"
2439
"http://doc.bazaar.canonical.com/latest/en/upgrade-guide/."
2440
msgstr ""
2441
2442
#: bzrlib/builtins.py:3816
2443
msgid "Upgrade to a specific format. See \"bzr help formats\" for details."
2444
msgstr ""
2445
2446
#: bzrlib/builtins.py:3820
2447
msgid "Branch format"
2448
msgstr ""
2449
2450
#: bzrlib/builtins.py:3822
2451
msgid "Remove the backup.bzr directory if successful."
2452
msgstr ""
2453
2454
#: bzrlib/builtins.py:3824
2455
msgid "Show what would be done, but don't actually do anything."
2456
msgstr ""
2457
2458
#: bzrlib/builtins.py:3839
2459
msgid "Show or set bzr user id."
2460
msgstr ""
2461
2462
#: bzrlib/builtins.py:3841
2463
msgid ""
2464
":Examples:\n"
2465
" Show the email of the current user::"
2466
msgstr ""
2467
2468
#: bzrlib/builtins.py:3844
2469
msgid " bzr whoami --email"
2470
msgstr ""
2471
2472
#: bzrlib/builtins.py:3846
2473
msgid " Set the current user::"
2474
msgstr ""
2475
2476
#: bzrlib/builtins.py:3848
2477
msgid " bzr whoami \"Frank Chu <fchu@example.com>\""
2478
msgstr ""
2479
2480
#: bzrlib/builtins.py:3852
2481
msgid "Display email address only."
2482
msgstr ""
2483
2484
#: bzrlib/builtins.py:3854
2485
msgid "Set identity for the current branch instead of globally."
2486
msgstr ""
2487
2488
#: bzrlib/builtins.py:3880
2489
msgid "--email can only be used to display existing identity"
2490
msgstr ""
2491
2492
#: bzrlib/builtins.py:3904
2493
msgid "Print or set the branch nickname."
2494
msgstr ""
2495
2496
#: bzrlib/builtins.py:3906
2497
msgid ""
2498
"If unset, the colocated branch name is used for colocated branches, and\n"
2499
"the branch directory name is used for other branches. To print the\n"
2500
"current nickname, execute with no argument."
2501
msgstr ""
2502
2503
#: bzrlib/builtins.py:3910
2504
msgid ""
2505
"Bound branches use the nickname of its master branch unless it is set\n"
2506
"locally."
2507
msgstr ""
2508
2509
#: bzrlib/builtins.py:3930
2510
msgid "Set/unset and display aliases."
2511
msgstr ""
2512
2513
#: bzrlib/builtins.py:3932
2514
msgid ""
2515
":Examples:\n"
2516
" Show the current aliases::"
2517
msgstr ""
2518
2519
#: bzrlib/builtins.py:3935
2520
msgid " bzr alias"
2521
msgstr ""
2522
2523
#: bzrlib/builtins.py:3937
2524
msgid " Show the alias specified for 'll'::"
2525
msgstr ""
2526
2527
#: bzrlib/builtins.py:3939
2528
msgid " bzr alias ll"
2529
msgstr ""
2530
2531
#: bzrlib/builtins.py:3941
2532
msgid " Set an alias for 'll'::"
2533
msgstr ""
2534
2535
#: bzrlib/builtins.py:3943
2536
msgid " bzr alias ll=\"log --line -r-10..-1\""
2537
msgstr ""
2538
2539
#: bzrlib/builtins.py:3945
2540
msgid " To remove an alias for 'll'::"
2541
msgstr ""
2542
2543
#: bzrlib/builtins.py:3947
2544
msgid " bzr alias --remove ll"
2545
msgstr ""
2546
2547
#: bzrlib/builtins.py:3952
2548
msgid "Remove the alias."
2549
msgstr ""
2550
2551
#: bzrlib/builtins.py:3970
2552
msgid "bzr alias --remove expects an alias to remove."
2553
msgstr ""
2554
2555
#: bzrlib/builtins.py:4151
2556
msgid ""
2557
"subunit not available. subunit needs to be installed to use --subunit."
2558
msgstr ""
2559
2560
#: bzrlib/builtins.py:4168
2561
msgid ""
2562
"--benchmark is no longer supported from bzr 2.2; use bzr-usertest instead"
2563
msgstr ""
2564
2565
#: bzrlib/builtins.py:4215
2566
msgid "Show version of bzr."
2567
msgstr ""
2568
2569
#: bzrlib/builtins.py:4219
2570
msgid "Print just the version number."
2571
msgstr ""
2572
2573
#: bzrlib/builtins.py:4238
2574
msgid "It sure does!\n"
2575
msgstr ""
2576
2577
#: bzrlib/builtins.py:4262
2578
#, python-format
2579
msgid "merge base is revision %s\n"
2580
msgstr ""
2581
2582
#: bzrlib/builtins.py:4266
2583
msgid "Perform a three-way merge."
2584
msgstr ""
2585
2586
#: bzrlib/builtins.py:4268
2587
msgid ""
2588
"The source of the merge can be specified either in the form of a branch,\n"
2589
"or in the form of a path to a file containing a merge directive generated\n"
2590
"with bzr send. If neither is specified, the default is the upstream branch\n"
2591
"or the branch most recently merged using --remember. The source of the\n"
2592
"merge may also be specified in the form of a path to a file in another\n"
2593
"branch: in this case, only the modifications to that file are merged into\n"
2594
"the current working tree."
2595
msgstr ""
2596
2597
#: bzrlib/builtins.py:4276
2598
msgid ""
2599
"When merging from a branch, by default bzr will try to merge in all new\n"
2600
"work from the other branch, automatically determining an appropriate base\n"
2601
"revision. If this fails, you may need to give an explicit base."
2602
msgstr ""
2603
2604
#: bzrlib/builtins.py:4280
2605
msgid ""
2606
"To pick a different ending revision, pass \"--revision OTHER\". bzr will\n"
2607
"try to merge in all new work up to and including revision OTHER."
2608
msgstr ""
2609
2610
#: bzrlib/builtins.py:4283
2611
msgid ""
2612
"If you specify two values, \"--revision BASE..OTHER\", only revisions BASE\n"
2613
"through OTHER, excluding BASE but including OTHER, will be merged. If this\n"
2614
"causes some revisions to be skipped, i.e. if the destination branch does\n"
2615
"not already contain revision BASE, such a merge is commonly referred to as\n"
2616
"a \"cherrypick\". Unlike a normal merge, Bazaar does not currently track\n"
2617
"cherrypicks. The changes look like a normal commit, and the history of the\n"
2618
"changes from the other branch is not stored in the commit."
2619
msgstr ""
2620
2621
#: bzrlib/builtins.py:4291
2622
msgid "Revision numbers are always relative to the source branch."
2623
msgstr ""
2624
2625
#: bzrlib/builtins.py:4293 bzrlib/conflicts.py:52 bzrlib/conflicts.py:106
2626
msgid ""
2627
"Merge will do its best to combine the changes in two branches, but there\n"
2628
"are some kinds of problems only a human can fix. When it encounters those,\n"
2629
"it will mark a conflict. A conflict means that you need to fix something,\n"
2630
"before you can commit."
2631
msgstr ""
2632
2633
#: bzrlib/builtins.py:4298
2634
msgid ""
2635
"Use bzr resolve when you have fixed a problem. See also bzr conflicts."
2636
msgstr ""
2637
2638
#: bzrlib/builtins.py:4300
2639
msgid ""
2640
"If there is no default branch set, the first merge will set it (use\n"
2641
"--no-remember to avoid setting it). After that, you can omit the branch\n"
2642
"to use the default. To change the default, use --remember. The value will\n"
2643
"only be saved if the remote location can be accessed."
2644
msgstr ""
2645
2646
#: bzrlib/builtins.py:4305
2647
msgid ""
2648
"The results of the merge are placed into the destination working\n"
2649
"directory, where they can be reviewed (with bzr diff), tested, and then\n"
2650
"committed to record the result of the merge."
2651
msgstr ""
2652
2653
#: bzrlib/builtins.py:4309
2654
msgid ""
2655
"merge refuses to run if there are any uncommitted changes, unless\n"
2656
"--force is given. If --force is given, then the changes from the source \n"
2657
"will be merged with the current working tree, including any uncommitted\n"
2658
"changes in the tree. The --force option can also be used to create a\n"
2659
"merge revision which has more than two parents."
2660
msgstr ""
2661
2662
#: bzrlib/builtins.py:4315
2663
msgid ""
2664
"If one would like to merge changes from the working tree of the other\n"
2665
"branch without merging any committed revisions, the --uncommitted option\n"
2666
"can be given."
2667
msgstr ""
2668
2669
#: bzrlib/builtins.py:4319
2670
msgid ""
2671
"To select only some changes to merge, use \"merge -i\", which will prompt\n"
2672
"you to apply each diff hunk and file change, similar to \"shelve\"."
2673
msgstr ""
2674
2675
#: bzrlib/builtins.py:4322
2676
msgid ""
2677
":Examples:\n"
2678
" To merge all new revisions from bzr.dev::"
2679
msgstr ""
2680
2681
#: bzrlib/builtins.py:4325
2682
msgid " bzr merge ../bzr.dev"
2683
msgstr ""
2684
2685
#: bzrlib/builtins.py:4327
2686
msgid " To merge changes up to and including revision 82 from bzr.dev::"
2687
msgstr ""
2688
2689
#: bzrlib/builtins.py:4329
2690
msgid " bzr merge -r 82 ../bzr.dev"
2691
msgstr ""
2692
2693
#: bzrlib/builtins.py:4331
2694
msgid " To merge the changes introduced by 82, without previous changes::"
2695
msgstr ""
2696
2697
#: bzrlib/builtins.py:4333
2698
msgid " bzr merge -r 81..82 ../bzr.dev"
2699
msgstr ""
2700
2701
#: bzrlib/builtins.py:4335
2702
msgid " To apply a merge directive contained in /tmp/merge::"
2703
msgstr ""
2704
2705
#: bzrlib/builtins.py:4337
2706
msgid " bzr merge /tmp/merge"
2707
msgstr ""
2708
2709
#: bzrlib/builtins.py:4339
2710
msgid ""
2711
" To create a merge revision with three parents from two branches\n"
2712
" feature1a and feature1b:"
2713
msgstr ""
2714
2715
#: bzrlib/builtins.py:4342
2716
msgid ""
2717
" bzr merge ../feature1a\n"
2718
" bzr merge ../feature1b --force\n"
2719
" bzr commit -m 'revision with three parents'"
2720
msgstr ""
2721
2722
#: bzrlib/builtins.py:4354
2723
msgid "Merge even if the destination tree has uncommitted changes."
2724
msgstr ""
2725
2726
#: bzrlib/builtins.py:4360
2727
msgid ""
2728
"Apply uncommitted changes from a working copy, instead of branch changes."
2729
msgstr ""
2730
2731
#: bzrlib/builtins.py:4362
2732
msgid ""
2733
"If the destination is already completely merged into the source, pull from "
2734
"the source rather than merging. When this happens, you do not need to "
2735
"commit the result."
2736
msgstr ""
2737
2738
#: bzrlib/builtins.py:4367
2739
msgid ""
2740
"Branch to merge into, rather than the one containing the working directory."
2741
msgstr ""
2742
2743
#: bzrlib/builtins.py:4369
2744
msgid "Instead of merging, show a diff of the merge."
2745
msgstr ""
2746
2747
#: bzrlib/builtins.py:4371
2748
msgid "Select changes interactively."
2749
msgstr ""
2750
2751
#: bzrlib/builtins.py:4393
2752
msgid ""
2753
"Merging into empty branches not currently supported, "
2754
"https://bugs.launchpad.net/bzr/+bug/308562"
2755
msgstr ""
2756
2757
#: bzrlib/builtins.py:4420
2758
msgid "Cannot use --uncommitted with bundles or merge directives."
2759
msgstr ""
2760
2761
#: bzrlib/builtins.py:4431
2762
msgid "Cannot use --uncommitted and --revision at the same time."
2763
msgstr ""
2764
2765
#: bzrlib/builtins.py:4451
2766
msgid "merger: "
2767
msgstr ""
2768
2769
#: bzrlib/builtins.py:4453 bzrlib/bundle/apply_bundle.py:71
2770
msgid "Nothing to do."
2771
msgstr ""
2772
2773
#: bzrlib/builtins.py:4457
2774
msgid "Cannot pull individual files"
2775
msgstr ""
2776
2777
#: bzrlib/builtins.py:4465
2778
msgid "This branch has no commits. (perhaps you would prefer 'bzr pull')"
2779
msgstr ""
2780
2781
#: bzrlib/builtins.py:4523
2782
#, python-format
2783
msgid "Show-base is not supported for this merge type. %s"
2784
msgstr ""
2785
2786
#: bzrlib/builtins.py:4532
2787
#, python-format
2788
msgid "Conflict reduction is not supported for merge type %s."
2789
msgstr ""
2790
2791
#: bzrlib/builtins.py:4536
2792
msgid "Cannot do conflict reduction and show base."
2793
msgstr ""
2794
2795
#: bzrlib/builtins.py:4647
2796
msgid "No location specified or remembered"
2797
msgstr ""
2798
2799
#: bzrlib/builtins.py:4649
2800
msgid "{0} remembered {1} location {2}"
2801
msgstr ""
2802
2803
#: bzrlib/builtins.py:4655
2804
msgid "Redo a merge."
2805
msgstr ""
2806
2807
#: bzrlib/builtins.py:4657
2808
msgid ""
2809
"Use this if you want to try a different merge technique while resolving\n"
2810
"conflicts. Some merge techniques are better than others, and remerge\n"
2811
"lets you try different ones on different files."
2812
msgstr ""
2813
2814
#: bzrlib/builtins.py:4661
2815
msgid ""
2816
"The options for remerge have the same meaning and defaults as the ones for\n"
2817
"merge. The difference is that remerge can (only) be run when there is a\n"
2818
"pending merge, and it lets you specify particular files."
2819
msgstr ""
2820
2821
#: bzrlib/builtins.py:4665
2822
msgid ""
2823
":Examples:\n"
2824
" Re-do the merge of all conflicted files, and show the base text in\n"
2825
" conflict regions, in addition to the usual THIS and OTHER texts::"
2826
msgstr ""
2827
2828
#: bzrlib/builtins.py:4669
2829
msgid " bzr remerge --show-base"
2830
msgstr ""
2831
2832
#: bzrlib/builtins.py:4671
2833
msgid ""
2834
" Re-do the merge of \"foobar\", using the weave merge algorithm, with\n"
2835
" additional processing to reduce the size of conflict regions::"
2836
msgstr ""
2837
2838
#: bzrlib/builtins.py:4674
2839
msgid " bzr remerge --merge-type weave --reprocess foobar"
2840
msgstr ""
2841
2842
#: bzrlib/builtins.py:4681
2843
msgid "Show base revision text in conflicts."
2844
msgstr ""
2845
2846
#: bzrlib/builtins.py:4693
2847
msgid ""
2848
"Sorry, remerge only works after normal merges. Not cherrypicking or multi-"
2849
"merges."
2850
msgstr ""
2851
2852
#: bzrlib/builtins.py:4751
2853
msgid ""
2854
"Set files in the working tree back to the contents of a previous revision."
2855
msgstr ""
2856
2857
#: bzrlib/builtins.py:4753
2858
msgid ""
2859
"Giving a list of files will revert only those files. Otherwise, all files\n"
2860
"will be reverted. If the revision is not specified with '--revision', the\n"
2861
"working tree basis revision is used. A revert operation affects only the\n"
2862
"working tree, not any revision history like the branch and repository or\n"
2863
"the working tree basis revision."
2864
msgstr ""
2865
2866
#: bzrlib/builtins.py:4759
2867
msgid ""
2868
"To remove only some changes, without reverting to a prior version, use\n"
2869
"merge instead. For example, \"merge . -r -2..-3\" (don't forget the \".\")\n"
2870
"will remove the changes introduced by the second last commit (-2), without\n"
2871
"affecting the changes introduced by the last commit (-1). To remove\n"
2872
"certain changes on a hunk-by-hunk basis, see the shelve command.\n"
2873
"To update the branch to a specific revision or the latest revision and\n"
2874
"update the working tree accordingly while preserving local changes, see the\n"
2875
"update command."
2876
msgstr ""
2877
2878
#: bzrlib/builtins.py:4768
2879
msgid ""
2880
"Uncommitted changes to files that are reverted will be discarded.\n"
2881
"Howver, by default, any files that have been manually changed will be\n"
2882
"backed up first. (Files changed only by merge are not backed up.) Backup\n"
2883
"files have '.~#~' appended to their name, where # is a number."
2884
msgstr ""
2885
2886
#: bzrlib/builtins.py:4773
2887
msgid ""
2888
"When you provide files, you can use their current pathname or the pathname\n"
2889
"from the target revision. So you can use revert to \"undelete\" a file by\n"
2890
"name. If you name a directory, all the contents of that directory will be\n"
2891
"reverted."
2892
msgstr ""
2893
2894
#: bzrlib/builtins.py:4778
2895
msgid ""
2896
"If you have newly added files since the target revision, they will be\n"
2897
"removed. If the files to be removed have been changed, backups will be\n"
2898
"created as above. Directories containing unknown files will not be\n"
2899
"deleted."
2900
msgstr ""
2901
2902
#: bzrlib/builtins.py:4783
2903
msgid ""
2904
"The working tree contains a list of revisions that have been merged but\n"
2905
"not yet committed. These revisions will be included as additional parents\n"
2906
"of the next commit. Normally, using revert clears that list as well as\n"
2907
"reverting the files. If any files are specified, revert leaves the list\n"
2908
"of uncommitted merges alone and reverts only the files. Use ``bzr revert\n"
2909
".`` in the tree root to revert all files but keep the recorded merges,\n"
2910
"and ``bzr revert --forget-merges`` to clear the pending merge list without\n"
2911
"reverting any files."
2912
msgstr ""
2913
2914
#: bzrlib/builtins.py:4792
2915
msgid ""
2916
"Using \"bzr revert --forget-merges\", it is possible to apply all of the\n"
2917
"changes from a branch in a single revision. To do this, perform the merge\n"
2918
"as desired. Then doing revert with the \"--forget-merges\" option will "
2919
"keep\n"
2920
"the content of the tree as it was, but it will clear the list of pending\n"
2921
"merges. The next commit will then contain all of the changes that are\n"
2922
"present in the other branch, but without any other parent revisions.\n"
2923
"Because this technique forgets where these changes originated, it may\n"
2924
"cause additional conflicts on later merges involving the same source and\n"
2925
"target branches."
2926
msgstr ""
2927
2928
#: bzrlib/builtins.py:4806
2929
msgid "Do not save backups of reverted files."
2930
msgstr ""
2931
2932
#: bzrlib/builtins.py:4808
2933
msgid "Remove pending merge marker, without changing any files."
2934
msgstr ""
2935
2936
#: bzrlib/builtins.py:4839
2937
msgid ""
2938
"Show help on a command or other topic.\n"
2939
" "
2940
msgstr ""
2941
2942
#: bzrlib/builtins.py:4844
2943
msgid "Show help on all commands."
2944
msgstr ""
2945
2946
#: bzrlib/builtins.py:4873
2947
msgid "Show unmerged/unpulled revisions between two branches."
2948
msgstr ""
2949
2950
#: bzrlib/builtins.py:4875
2951
msgid "OTHER_BRANCH may be local or remote."
2952
msgstr ""
2953
2954
#: bzrlib/builtins.py:4877
2955
msgid ""
2956
"To filter on a range of revisions, you can use the command -r begin..end\n"
2957
"-r revision requests a specific revision, -r ..end or -r begin.. are\n"
2958
"also valid.\n"
2959
" \n"
2960
":Exit values:\n"
2961
" 1 - some missing revisions\n"
2962
" 0 - no missing revisions"
2963
msgstr ""
2964
2965
#: bzrlib/builtins.py:4887
2966
msgid ""
2967
" Determine the missing revisions between this and the branch at the\n"
2968
" remembered pull location::"
2969
msgstr ""
2970
2971
#: bzrlib/builtins.py:4890
2972
msgid " bzr missing"
2973
msgstr ""
2974
2975
#: bzrlib/builtins.py:4892
2976
msgid " Determine the missing revisions between this and another branch::"
2977
msgstr ""
2978
2979
#: bzrlib/builtins.py:4894
2980
msgid " bzr missing http://server/branch"
2981
msgstr ""
2982
2983
#: bzrlib/builtins.py:4896
2984
msgid ""
2985
" Determine the missing revisions up to a specific revision on the other\n"
2986
" branch::"
2987
msgstr ""
2988
2989
#: bzrlib/builtins.py:4899
2990
msgid " bzr missing -r ..-10"
2991
msgstr ""
2992
2993
#: bzrlib/builtins.py:4901
2994
msgid ""
2995
" Determine the missing revisions up to a specific revision on this\n"
2996
" branch::"
2997
msgstr ""
2998
2999
#: bzrlib/builtins.py:4904
3000
msgid " bzr missing --my-revision ..-10"
3001
msgstr ""
3002
3003
#: bzrlib/builtins.py:4911
3004
msgid "Reverse the order of revisions."
3005
msgstr ""
3006
3007
#: bzrlib/builtins.py:4913
3008
msgid "Display changes in the local branch only."
3009
msgstr ""
3010
3011
#: bzrlib/builtins.py:4914
3012
msgid "Same as --mine-only."
3013
msgstr ""
3014
3015
#: bzrlib/builtins.py:4916
3016
msgid "Display changes in the remote branch only."
3017
msgstr ""
3018
3019
#: bzrlib/builtins.py:4917
3020
msgid "Same as --theirs-only."
3021
msgstr ""
3022
3023
#: bzrlib/builtins.py:4922
3024
msgid ""
3025
"Filter on other branch revisions (inclusive). See \"help revisionspec\" for "
3026
"details."
3027
msgstr ""
3028
3029
#: bzrlib/builtins.py:4926
3030
msgid ""
3031
"Filter on local branch revisions (inclusive). See \"help revisionspec\" for "
3032
"details."
3033
msgstr ""
3034
3035
#: bzrlib/builtins.py:4929
3036
msgid "Show all revisions in addition to the mainline ones."
3037
msgstr ""
3038
3039
#: bzrlib/builtins.py:4983
3040
msgid "No peer location known or specified."
3041
msgstr ""
3042
3043
#: bzrlib/builtins.py:4987
3044
msgid "Using saved parent location: {0}\n"
3045
msgstr ""
3046
3047
#: bzrlib/builtins.py:5020
3048
#, python-format
3049
msgid "You have %d extra revision:\n"
3050
msgid_plural "You have %d extra revisions:\n"
3051
msgstr[0] ""
3052
msgstr[1] ""
3053
3054
#: bzrlib/builtins.py:5040
3055
#, python-format
3056
msgid "You are missing %d revision:\n"
3057
msgid_plural "You are missing %d revisions:\n"
3058
msgstr[0] ""
3059
msgstr[1] ""
3060
3061
#: bzrlib/builtins.py:5055
3062
msgid "This branch has no new revisions.\n"
3063
msgstr ""
3064
3065
#: bzrlib/builtins.py:5058
3066
msgid "Other branch has no new revisions.\n"
3067
msgstr ""
3068
3069
#: bzrlib/builtins.py:5063
3070
msgid "Branches are up to date.\n"
3071
msgstr ""
3072
3073
#: bzrlib/builtins.py:5074
3074
msgid "Compress the data within a repository."
3075
msgstr ""
3076
3077
#: bzrlib/builtins.py:5076
3078
msgid ""
3079
"This operation compresses the data within a bazaar repository. As\n"
3080
"bazaar supports automatic packing of repository, this operation is\n"
3081
"normally not required to be done manually."
3082
msgstr ""
3083
3084
#: bzrlib/builtins.py:5080
3085
msgid ""
3086
"During the pack operation, bazaar takes a backup of existing repository\n"
3087
"data, i.e. pack files. This backup is eventually removed by bazaar\n"
3088
"automatically when it is safe to do so. To save disk space by removing\n"
3089
"the backed up pack files, the --clean-obsolete-packs option may be\n"
3090
"used."
3091
msgstr ""
3092
3093
#: bzrlib/builtins.py:5086
3094
msgid ""
3095
"Warning: If you use --clean-obsolete-packs and your machine crashes\n"
3096
"during or immediately after repacking, you may be left with a state\n"
3097
"where the deletion has been written to disk but the new packs have not\n"
3098
"been. In this case the repository may be unusable."
3099
msgstr ""
3100
3101
#: bzrlib/builtins.py:5095
3102
msgid "Delete obsolete packs to save disk space."
3103
msgstr ""
3104
3105
#: bzrlib/builtins.py:5109
3106
msgid "List the installed plugins."
3107
msgstr ""
3108
3109
#: bzrlib/builtins.py:5111
3110
msgid ""
3111
"This command displays the list of installed plugins including\n"
3112
"version of plugin and a short description of each."
3113
msgstr ""
3114
3115
#: bzrlib/builtins.py:5114
3116
msgid "--verbose shows the path where each plugin is located."
3117
msgstr ""
3118
3119
#: bzrlib/builtins.py:5116
3120
msgid ""
3121
"A plugin is an external component for Bazaar that extends the\n"
3122
"revision control system, by adding or replacing code in Bazaar.\n"
3123
"Plugins can do a variety of things, including overriding commands,\n"
3124
"adding new commands, providing additional network transports and\n"
3125
"customizing log output."
3126
msgstr ""
3127
3128
#: bzrlib/builtins.py:5122
3129
msgid ""
3130
"See the Bazaar Plugin Guide <http://doc.bazaar.canonical.com/plugins/en/>\n"
3131
"for further information on plugins including where to find them and how to\n"
3132
"install them. Instructions are also provided there on how to write new\n"
3133
"plugins using the Python programming language."
3134
msgstr ""
3135
3136
#: bzrlib/builtins.py:5138
3137
msgid "Show testament (signing-form) of a revision."
3138
msgstr ""
3139
3140
#: bzrlib/builtins.py:5141
3141
msgid "Produce long-format testament."
3142
msgstr ""
3143
3144
#: bzrlib/builtins.py:5143
3145
msgid "Produce a strict-format testament."
3146
msgstr ""
3147
3148
#: bzrlib/builtins.py:5169
3149
msgid "Show the origin of each line in a file."
3150
msgstr ""
3151
3152
#: bzrlib/builtins.py:5171
3153
msgid ""
3154
"This prints out the given file with an annotation on the left side\n"
3155
"indicating which revision, author and date introduced the change."
3156
msgstr ""
3157
3158
#: bzrlib/builtins.py:5174
3159
msgid ""
3160
"If the origin is the same for a run of consecutive lines, it is\n"
3161
"shown only at the top, unless the --all option is given."
3162
msgstr ""
3163
3164
#: bzrlib/builtins.py:5182
3165
msgid "Show annotations on all lines."
3166
msgstr ""
3167
3168
#: bzrlib/builtins.py:5183
3169
msgid "Show commit date in annotations."
3170
msgstr ""
3171
3172
#: bzrlib/builtins.py:5270
3173
msgid "Cannot sign a range of non-revision-history revisions"
3174
msgstr ""
3175
3176
#: bzrlib/builtins.py:5282
3177
msgid "Please supply either one revision, or a range."
3178
msgstr ""
3179
3180
#: bzrlib/builtins.py:5286
3181
msgid ""
3182
"Convert the current branch into a checkout of the supplied branch.\n"
3183
"If no branch is supplied, rebind to the last bound location."
3184
msgstr ""
3185
3186
#: bzrlib/builtins.py:5289
3187
msgid ""
3188
"Once converted into a checkout, commits must succeed on the master branch\n"
3189
"before they will be applied to the local branch."
3190
msgstr ""
3191
3192
#: bzrlib/builtins.py:5292
3193
msgid ""
3194
"Bound branches use the nickname of its master branch unless it is set\n"
3195
"locally, in which case binding will update the local nickname to be\n"
3196
"that of the master."
3197
msgstr ""
3198
3199
#: bzrlib/builtins.py:5307
3200
msgid "No location supplied. This format does not remember old locations."
3201
msgstr ""
3202
3203
#: bzrlib/builtins.py:5313
3204
msgid "Branch is already bound"
3205
msgstr ""
3206
3207
#: bzrlib/builtins.py:5316
3208
msgid "No location supplied and no previous location known"
3209
msgstr ""
3210
3211
#: bzrlib/builtins.py:5322
3212
msgid "These branches have diverged. Try merging, and then bind again."
3213
msgstr ""
3214
3215
#: bzrlib/builtins.py:5329
3216
msgid "Convert the current checkout into a regular branch."
3217
msgstr ""
3218
3219
#: bzrlib/builtins.py:5331
3220
msgid ""
3221
"After unbinding, the local branch is considered independent and subsequent\n"
3222
"commits will be local only."
3223
msgstr ""
3224
3225
#: bzrlib/builtins.py:5342
3226
msgid "Local branch is not bound"
3227
msgstr ""
3228
3229
#: bzrlib/builtins.py:5346
3230
msgid "Remove the last committed revision."
3231
msgstr ""
3232
3233
#: bzrlib/builtins.py:5348
3234
msgid ""
3235
"--verbose will print out what is being removed.\n"
3236
"--dry-run will go through all the motions, but not actually\n"
3237
"remove anything."
3238
msgstr ""
3239
3240
#: bzrlib/builtins.py:5352
3241
msgid ""
3242
"If --revision is specified, uncommit revisions to leave the branch at the\n"
3243
"specified revision. For example, \"bzr uncommit -r 15\" will leave the\n"
3244
"branch at revision 15."
3245
msgstr ""
3246
3247
#: bzrlib/builtins.py:5356
3248
msgid ""
3249
"Uncommit leaves the working tree ready for a new commit. The only change\n"
3250
"it may make is to restore any pending merges that were present before\n"
3251
"the commit."
3252
msgstr ""
3253
3254
#: bzrlib/builtins.py:5367
3255
msgid "Don't actually make changes."
3256
msgstr ""
3257
3258
#: bzrlib/builtins.py:5368
3259
msgid "Say yes to all questions."
3260
msgstr ""
3261
3262
#: bzrlib/builtins.py:5370
3263
msgid "Keep tags that point to removed revisions."
3264
msgstr ""
3265
3266
#: bzrlib/builtins.py:5372
3267
msgid "Only remove the commits from the local branch when in a checkout."
3268
msgstr ""
3269
3270
#: bzrlib/builtins.py:5421
3271
msgid "No revisions to uncommit.\n"
3272
msgstr ""
3273
3274
#: bzrlib/builtins.py:5436
3275
msgid "Dry-run, pretending to remove the above revisions.\n"
3276
msgstr ""
3277
3278
#: bzrlib/builtins.py:5439
3279
msgid "The above revision(s) will be removed.\n"
3280
msgstr ""
3281
3282
#: bzrlib/builtins.py:5443
3283
msgid "Uncommit these revisions"
3284
msgstr ""
3285
3286
#: bzrlib/builtins.py:5446
3287
msgid "Canceled\n"
3288
msgstr ""
3289
3290
#: bzrlib/builtins.py:5453
3291
#, python-format
3292
msgid ""
3293
"You can restore the old tip by running:\n"
3294
" bzr pull . -r revid:%s\n"
3295
msgstr ""
3296
3297
#: bzrlib/builtins.py:5458
3298
msgid "Break a dead lock."
3299
msgstr ""
3300
3301
#: bzrlib/builtins.py:5460
3302
msgid ""
3303
"This command breaks a lock on a repository, branch, working directory or\n"
3304
"config file."
3305
msgstr ""
3306
3307
#: bzrlib/builtins.py:5463
3308
msgid ""
3309
"CAUTION: Locks should only be broken when you are sure that the process\n"
3310
"holding the lock has been stopped."
3311
msgstr ""
3312
3313
#: bzrlib/builtins.py:5466
3314
msgid ""
3315
"You can get information on what locks are open via the 'bzr info\n"
3316
"[location]' command."
3317
msgstr ""
3318
3319
#: bzrlib/builtins.py:5469
3320
msgid ""
3321
":Examples:\n"
3322
" bzr break-lock\n"
3323
" bzr break-lock bzr+ssh://example.com/bzr/foo\n"
3324
" bzr break-lock --conf ~/.bazaar"
3325
msgstr ""
3326
3327
#: bzrlib/builtins.py:5478
3328
msgid "LOCATION is the directory where the config lock is."
3329
msgstr ""
3330
3331
#: bzrlib/builtins.py:5480
3332
msgid "Do not ask for confirmation before breaking the lock."
3333
msgstr ""
3334
3335
#: bzrlib/builtins.py:5515
3336
msgid "The Bazaar smart server protocol over TCP. (default port: 4155)"
3337
msgstr ""
3338
3339
#: bzrlib/builtins.py:5516
3340
msgid "Run the bzr server."
3341
msgstr ""
3342
3343
#: bzrlib/builtins.py:5522
3344
msgid "Serve on stdin/out for use from inetd or sshd."
3345
msgstr ""
3346
3347
#: bzrlib/builtins.py:5523
3348
msgid "protocol"
3349
msgstr ""
3350
3351
#: bzrlib/builtins.py:5524
3352
msgid "Protocol to serve."
3353
msgstr ""
3354
3355
#: bzrlib/builtins.py:5528
3356
msgid "Listen for connections on nominated address."
3357
msgstr ""
3358
3359
#: bzrlib/builtins.py:5530
3360
msgid ""
3361
"Listen for connections on nominated port. Passing 0 as the port number will "
3362
"result in a dynamically allocated port. The default port depends on the "
3363
"protocol."
3364
msgstr ""
3365
3366
#: bzrlib/builtins.py:5535
3367
msgid "Serve contents of this directory."
3368
msgstr ""
3369
3370
#: bzrlib/builtins.py:5537
3371
msgid ""
3372
"By default the server is a readonly server. Supplying --allow-writes "
3373
"enables write access to the contents of the served directory and below. "
3374
"Note that ``bzr serve`` does not perform authentication, so unless some form "
3375
"of external authentication is arranged supplying this option leads to global "
3376
"uncontrolled write access to your file system."
3377
msgstr ""
3378
3379
#: bzrlib/builtins.py:5546
3380
msgid "Override the default idle client timeout (5min)."
3381
msgstr ""
3382
3383
#: bzrlib/builtins.py:5564
3384
msgid "Combine a tree into its containing tree."
3385
msgstr ""
3386
3387
#: bzrlib/builtins.py:5566
3388
msgid "This command requires the target tree to be in a rich-root format."
3389
msgstr ""
3390
3391
#: bzrlib/builtins.py:5568
3392
msgid ""
3393
"The TREE argument should be an independent tree, inside another tree, but\n"
3394
"not part of it. (Such trees can be produced by \"bzr split\", but also by\n"
3395
"running \"bzr branch\" with the target inside a tree.)"
3396
msgstr ""
3397
3398
#: bzrlib/builtins.py:5572
3399
msgid ""
3400
"The result is a combined tree, with the subtree no longer an independent\n"
3401
"part. This is marked as a merge of the subtree into the containing tree,\n"
3402
"and all history is preserved."
3403
msgstr ""
3404
3405
#: bzrlib/builtins.py:5590
3406
#, python-format
3407
msgid ""
3408
"Can't join trees because %s doesn't support rich root data.\n"
3409
"You can use bzr upgrade on the repository."
3410
msgstr ""
3411
3412
#: bzrlib/builtins.py:5600 bzrlib/builtins.py:5606
3413
msgid "Cannot join {0}. {1}"
3414
msgstr ""
3415
3416
#: bzrlib/builtins.py:5610
3417
msgid "Split a subdirectory of a tree into a separate tree."
3418
msgstr ""
3419
3420
#: bzrlib/builtins.py:5612
3421
msgid ""
3422
"This command will produce a target tree in a format that supports\n"
3423
"rich roots, like 'rich-root' or 'rich-root-pack'. These formats cannot be\n"
3424
"converted into earlier formats like 'dirstate-tags'."
3425
msgstr ""
3426
3427
#: bzrlib/builtins.py:5616
3428
msgid ""
3429
"The TREE argument should be a subdirectory of a working tree. That\n"
3430
"subdirectory will be converted into an independent tree, with its own\n"
3431
"branch. Commits in the top-level tree will not apply to the new subtree."
3432
msgstr ""
3433
3434
#: bzrlib/builtins.py:5696
3435
msgid "No submit branch specified or known"
3436
msgstr ""
3437
3438
#: bzrlib/builtins.py:5705 bzrlib/send.py:109
3439
msgid "No public branch specified or known"
3440
msgstr ""
3441
3442
#: bzrlib/builtins.py:5710
3443
msgid "bzr merge-directive takes at most two one revision identifiers"
3444
msgstr ""
3445
3446
#: bzrlib/builtins.py:5719
3447
msgid "No revisions to bundle."
3448
msgstr ""
3449
3450
#: bzrlib/builtins.py:5738
3451
msgid "Mail or create a merge-directive for submitting changes."
3452
msgstr ""
3453
3454
#: bzrlib/builtins.py:5740
3455
msgid "A merge directive provides many things needed for requesting merges:"
3456
msgstr ""
3457
3458
#: bzrlib/builtins.py:5742
3459
msgid "* A machine-readable description of the merge to perform"
3460
msgstr ""
3461
3462
#: bzrlib/builtins.py:5744
3463
msgid "* An optional patch that is a preview of the changes requested"
3464
msgstr ""
3465
3466
#: bzrlib/builtins.py:5746
3467
msgid ""
3468
"* An optional bundle of revision data, so that the changes can be applied\n"
3469
" directly from the merge directive, without retrieving data from a\n"
3470
" branch."
3471
msgstr ""
3472
3473
#: bzrlib/builtins.py:5750
3474
msgid ""
3475
"`bzr send` creates a compact data set that, when applied using bzr\n"
3476
"merge, has the same effect as merging from the source branch. "
3477
msgstr ""
3478
3479
#: bzrlib/builtins.py:5753
3480
msgid ""
3481
"By default the merge directive is self-contained and can be applied to any\n"
3482
"branch containing submit_branch in its ancestory without needing access to\n"
3483
"the source branch."
3484
msgstr ""
3485
3486
#: bzrlib/builtins.py:5757
3487
msgid ""
3488
"If --no-bundle is specified, then Bazaar doesn't send the contents of the\n"
3489
"revisions, but only a structured request to merge from the\n"
3490
"public_location. In that case the public_branch is needed and it must be\n"
3491
"up-to-date and accessible to the recipient. The public_branch is always\n"
3492
"included if known, so that people can check it later."
3493
msgstr ""
3494
3495
#: bzrlib/builtins.py:5763
3496
msgid ""
3497
"The submit branch defaults to the parent of the source branch, but can be\n"
3498
"overridden. Both submit branch and public branch will be remembered in\n"
3499
"branch.conf the first time they are used for a particular branch. The\n"
3500
"source branch defaults to that containing the working directory, but can\n"
3501
"be changed using --from."
3502
msgstr ""
3503
3504
#: bzrlib/builtins.py:5769
3505
msgid ""
3506
"Both the submit branch and the public branch follow the usual behavior with\n"
3507
"respect to --remember: If there is no default location set, the first send\n"
3508
"will set it (use --no-remember to avoid setting it). After that, you can\n"
3509
"omit the location to use the default. To change the default, use\n"
3510
"--remember. The value will only be saved if the location can be accessed."
3511
msgstr ""
3512
3513
#: bzrlib/builtins.py:5775
3514
msgid ""
3515
"In order to calculate those changes, bzr must analyse the submit branch.\n"
3516
"Therefore it is most efficient for the submit branch to be a local mirror.\n"
3517
"If a public location is known for the submit_branch, that location is used\n"
3518
"in the merge directive."
3519
msgstr ""
3520
3521
#: bzrlib/builtins.py:5780
3522
msgid ""
3523
"The default behaviour is to send the merge directive by mail, unless -o is\n"
3524
"given, in which case it is sent to a file."
3525
msgstr ""
3526
3527
#: bzrlib/builtins.py:5783
3528
msgid ""
3529
"Mail is sent using your preferred mail program. This should be transparent\n"
3530
"on Windows (it uses MAPI). On Unix, it requires the xdg-email utility.\n"
3531
"If the preferred client can't be found (or used), your editor will be used."
3532
msgstr ""
3533
3534
#: bzrlib/builtins.py:5787
3535
msgid ""
3536
"To use a specific mail program, set the mail_client configuration option.\n"
3537
"(For Thunderbird 1.5, this works around some bugs.) Supported values for\n"
3538
"specific clients are \"claws\", \"evolution\", \"kmail\", \"mail.app\" "
3539
"(MacOS X's\n"
3540
"Mail.app), \"mutt\", and \"thunderbird\"; generic options are \"default\",\n"
3541
"\"editor\", \"emacsclient\", \"mapi\", and \"xdg-email\". Plugins may also "
3542
"add\n"
3543
"supported clients."
3544
msgstr ""
3545
3546
#: bzrlib/builtins.py:5794
3547
msgid ""
3548
"If mail is being sent, a to address is required. This can be supplied\n"
3549
"either on the commandline, by setting the submit_to configuration\n"
3550
"option in the branch itself or the child_submit_to configuration option\n"
3551
"in the submit branch."
3552
msgstr ""
3553
3554
#: bzrlib/builtins.py:5799
3555
msgid ""
3556
"Two formats are currently supported: \"4\" uses revision bundle format 4 "
3557
"and\n"
3558
"merge directive format 2. It is significantly faster and smaller than\n"
3559
"older formats. It is compatible with Bazaar 0.19 and later. It is the\n"
3560
"default. \"0.9\" uses revision bundle format 0.9 and merge directive\n"
3561
"format 1. It is compatible with Bazaar 0.12 - 0.18."
3562
msgstr ""
3563
3564
#: bzrlib/builtins.py:5805
3565
msgid ""
3566
"The merge directives created by bzr send may be applied using bzr merge or\n"
3567
"bzr pull by specifying a file containing a merge directive as the location."
3568
msgstr ""
3569
3570
#: bzrlib/builtins.py:5808
3571
msgid ""
3572
"bzr send makes extensive use of public locations to map local locations "
3573
"into\n"
3574
"URLs that can be used by other people. See `bzr help configuration` to\n"
3575
"set them, and use `bzr info` to display them."
3576
msgstr ""
3577
3578
#: bzrlib/builtins.py:5832
3579
msgid "Write merge directive to this file or directory; use - for stdout."
3580
msgstr ""
3581
3582
#: bzrlib/builtins.py:5836
3583
msgid ""
3584
"Refuse to send if there are uncommitted changes in the working tree, --no-"
3585
"strict disables the check."
3586
msgstr ""
3587
3588
#: bzrlib/builtins.py:5838
3589
msgid "Mail the request to this address."
3590
msgstr ""
3591
3592
#: bzrlib/builtins.py:5842
3593
msgid "Body for the email."
3594
msgstr ""
3595
3596
#: bzrlib/builtins.py:5895
3597
msgid "Do not include a bundle in the merge directive."
3598
msgstr ""
3599
3600
#: bzrlib/builtins.py:5896
3601
msgid "Do not include a preview patch in the merge directive."
3602
msgstr ""
3603
3604
#: bzrlib/builtins.py:5899
3605
msgid "Remember submit and public branch."
3606
msgstr ""
3607
3608
#: bzrlib/builtins.py:5901
3609
msgid ""
3610
"Branch to generate the submission from, rather than the one containing the "
3611
"working directory."
3612
msgstr ""
3613
3614
#: bzrlib/builtins.py:5911 bzrlib/cmd_version_info.py:76
3615
msgid "format"
3616
msgstr ""
3617
3618
#: bzrlib/builtins.py:5912
3619
msgid "Use the specified output format."
3620
msgstr ""
3621
3622
#: bzrlib/builtins.py:5934
3623
msgid "Create, remove or modify a tag naming a revision."
3624
msgstr ""
3625
3626
#: bzrlib/builtins.py:5936
3627
msgid ""
3628
"Tags give human-meaningful names to revisions. Commands that take a -r\n"
3629
"(--revision) option can be given -rtag:X, where X is any previously\n"
3630
"created tag."
3631
msgstr ""
3632
3633
#: bzrlib/builtins.py:5940
3634
msgid ""
3635
"Tags are stored in the branch. Tags are copied from one branch to another\n"
3636
"along when you branch, push, pull or merge."
3637
msgstr ""
3638
3639
#: bzrlib/builtins.py:5943
3640
msgid ""
3641
"It is an error to give a tag name that already exists unless you pass\n"
3642
"--force, in which case the tag is moved to point to the new revision."
3643
msgstr ""
3644
3645
#: bzrlib/builtins.py:5946
3646
msgid ""
3647
"To rename a tag (change the name but keep it on the same revsion), run "
3648
"``bzr\n"
3649
"tag new-name -r tag:old-name`` and then ``bzr tag --delete oldname``."
3650
msgstr ""
3651
3652
#: bzrlib/builtins.py:5949
3653
msgid ""
3654
"If no tag name is specified it will be determined through the \n"
3655
"'automatic_tag_name' hook. This can e.g. be used to automatically tag\n"
3656
"upstream releases by reading configure.ac. See ``bzr help hooks`` for\n"
3657
"details."
3658
msgstr ""
3659
3660
#: bzrlib/builtins.py:5959
3661
msgid "Delete this tag rather than placing it."
3662
msgstr ""
3663
3664
#: bzrlib/builtins.py:5962
3665
msgid "Branch in which to place the tag."
3666
msgstr ""
3667
3668
#: bzrlib/builtins.py:5964
3669
msgid "Replace existing tags."
3670
msgstr ""
3671
3672
#: bzrlib/builtins.py:5979
3673
msgid "No tag specified to delete."
3674
msgstr ""
3675
3676
#: bzrlib/builtins.py:5981
3677
#, python-format
3678
msgid "Deleted tag %s."
3679
msgstr ""
3680
3681
#: bzrlib/builtins.py:5995
3682
msgid "Please specify a tag name."
3683
msgstr ""
3684
3685
#: bzrlib/builtins.py:6003
3686
#, python-format
3687
msgid "Tag %s already exists for that revision."
3688
msgstr ""
3689
3690
#: bzrlib/builtins.py:6007
3691
#, python-format
3692
msgid "Created tag %s."
3693
msgstr ""
3694
3695
#: bzrlib/builtins.py:6009
3696
#, python-format
3697
msgid "Updated tag %s."
3698
msgstr ""
3699
3700
#: bzrlib/builtins.py:6013
3701
msgid "List tags."
3702
msgstr ""
3703
3704
#: bzrlib/builtins.py:6015
3705
msgid ""
3706
"This command shows a table of tag names and the revisions they reference."
3707
msgstr ""
3708
3709
#: bzrlib/builtins.py:6021
3710
msgid "Branch whose tags should be displayed."
3711
msgstr ""
3712
3713
#: bzrlib/builtins.py:6023
3714
msgid "Sort tags by different criteria."
3715
msgstr ""
3716
3717
#: bzrlib/builtins.py:6023
3718
msgid "Sorting"
3719
msgstr ""
3720
3721
#: bzrlib/builtins.py:6092
3722
msgid "Reconfigure the type of a bzr directory."
3723
msgstr ""
3724
3725
#: bzrlib/builtins.py:6094
3726
msgid "A target configuration must be specified."
3727
msgstr ""
3728
3729
#: bzrlib/builtins.py:6096
3730
msgid ""
3731
"For checkouts, the bind-to location will be auto-detected if not specified.\n"
3732
"The order of preference is\n"
3733
"1. For a lightweight checkout, the current bound location.\n"
3734
"2. For branches that used to be checkouts, the previously-bound location.\n"
3735
"3. The push location.\n"
3736
"4. The parent location.\n"
3737
"If none of these is available, --bind-to must be specified."
3738
msgstr ""
3739
3740
#: bzrlib/builtins.py:6110
3741
msgid "Tree type"
3742
msgstr ""
3743
3744
#: bzrlib/builtins.py:6111
3745
msgid "The relation between branch and tree."
3746
msgstr ""
3747
3748
#: bzrlib/builtins.py:6113
3749
msgid "Reconfigure to be an unbound branch with no working tree."
3750
msgstr ""
3751
3752
#: bzrlib/builtins.py:6114
3753
msgid "Reconfigure to be an unbound branch with a working tree."
3754
msgstr ""
3755
3756
#: bzrlib/builtins.py:6115
3757
msgid "Reconfigure to be a bound branch with a working tree."
3758
msgstr ""
3759
3760
#: bzrlib/builtins.py:6116
3761
msgid "Reconfigure to be a lightweight checkout (with no local history)."
3762
msgstr ""
3763
3764
#: bzrlib/builtins.py:6121
3765
msgid "Repository type"
3766
msgstr ""
3767
3768
#: bzrlib/builtins.py:6122
3769
msgid "Location fo the repository."
3770
msgstr ""
3771
3772
#: bzrlib/builtins.py:6124
3773
msgid ""
3774
"Reconfigure to be a standalone branch (i.e. stop using shared repository)."
3775
msgstr ""
3776
3777
#: bzrlib/builtins.py:6126
3778
msgid "Reconfigure to use a shared repository."
3779
msgstr ""
3780
3781
#: bzrlib/builtins.py:6130
3782
msgid "Trees in Repository"
3783
msgstr ""
3784
3785
#: bzrlib/builtins.py:6131
3786
msgid "Whether new branches in the repository have trees."
3787
msgstr ""
3788
3789
#: bzrlib/builtins.py:6133
3790
msgid ""
3791
"Reconfigure repository to create working trees on branches by default."
3792
msgstr ""
3793
3794
#: bzrlib/builtins.py:6135
3795
msgid ""
3796
"Reconfigure repository to not create working trees on branches by default."
3797
msgstr ""
3798
3799
#: bzrlib/builtins.py:6138
3800
msgid "Branch to bind checkout to."
3801
msgstr ""
3802
3803
#: bzrlib/builtins.py:6140
3804
msgid "Perform reconfiguration even if local changes will be lost."
3805
msgstr ""
3806
3807
#: bzrlib/builtins.py:6143
3808
msgid "Reconfigure a branch to be stacked on another branch."
3809
msgstr ""
3810
3811
#: bzrlib/builtins.py:6147
3812
msgid ""
3813
"Reconfigure a branch to be unstacked. This may require copying substantial "
3814
"data into it."
3815
msgstr ""
3816
3817
#: bzrlib/builtins.py:6157
3818
msgid "Can't use both --stacked-on and --unstacked"
3819
msgstr ""
3820
3821
#: bzrlib/builtins.py:6171
3822
msgid "No target configuration specified"
3823
msgstr ""
3824
3825
#: bzrlib/builtins.py:6206
3826
msgid "Set the branch of a checkout and update."
3827
msgstr ""
3828
3829
#: bzrlib/builtins.py:6208
3830
msgid ""
3831
"For lightweight checkouts, this changes the branch being referenced.\n"
3832
"For heavyweight checkouts, this checks that there are no local commits\n"
3833
"versus the current bound branch, then it makes the local branch a mirror\n"
3834
"of the new location and binds to it."
3835
msgstr ""
3836
3837
#: bzrlib/builtins.py:6213
3838
msgid ""
3839
"In both cases, the working tree is updated and uncommitted changes\n"
3840
"are merged. The user can commit or revert these as they desire."
3841
msgstr ""
3842
3843
#: bzrlib/builtins.py:6216
3844
msgid "Pending merges need to be committed or reverted before using switch."
3845
msgstr ""
3846
3847
#: bzrlib/builtins.py:6218
3848
msgid ""
3849
"The path to the branch to switch to can be specified relative to the parent\n"
3850
"directory of the current branch. For example, if you are currently in a\n"
3851
"checkout of /path/to/branch, specifying 'newbranch' will find a branch at\n"
3852
"/path/to/newbranch."
3853
msgstr ""
3854
3855
#: bzrlib/builtins.py:6223
3856
msgid ""
3857
"Bound branches use the nickname of its master branch unless it is set\n"
3858
"locally, in which case switching will update the local nickname to be\n"
3859
"that of the master."
3860
msgstr ""
3861
3862
#: bzrlib/builtins.py:6231
3863
msgid "Switch even if local commits will be lost."
3864
msgstr ""
3865
3866
#: bzrlib/builtins.py:6234
3867
msgid "Create the target branch from this one before switching to it."
3868
msgstr ""
3869
3870
#: bzrlib/builtins.py:6248
3871
msgid "You must supply either a revision or a location"
3872
msgstr ""
3873
3874
#: bzrlib/builtins.py:6261
3875
msgid "cannot create branch without source branch"
3876
msgstr ""
3877
3878
#: bzrlib/builtins.py:6286
3879
msgid "Manage filtered views."
3880
msgstr ""
3881
3882
#: bzrlib/builtins.py:6288
3883
msgid ""
3884
"Views provide a mask over the tree so that users can focus on\n"
3885
"a subset of a tree when doing their work. After creating a view,\n"
3886
"commands that support a list of files - status, diff, commit, etc -\n"
3887
"effectively have that list of files implicitly given each time.\n"
3888
"An explicit list of files can still be given but those files\n"
3889
"must be within the current view."
3890
msgstr ""
3891
3892
#: bzrlib/builtins.py:6295
3893
msgid ""
3894
"In most cases, a view has a short life-span: it is created to make\n"
3895
"a selected change and is deleted once that change is committed.\n"
3896
"At other times, you may wish to create one or more named views\n"
3897
"and switch between them."
3898
msgstr ""
3899
3900
#: bzrlib/builtins.py:6300
3901
msgid ""
3902
"To disable the current view without deleting it, you can switch to\n"
3903
"the pseudo view called ``off``. This can be useful when you need\n"
3904
"to see the whole tree for an operation or two (e.g. merge) but\n"
3905
"want to switch back to your view after that."
3906
msgstr ""
3907
3908
#: bzrlib/builtins.py:6305
3909
msgid ""
3910
":Examples:\n"
3911
" To define the current view::"
3912
msgstr ""
3913
3914
#: bzrlib/builtins.py:6308
3915
msgid " bzr view file1 dir1 ..."
3916
msgstr ""
3917
3918
#: bzrlib/builtins.py:6310
3919
msgid " To list the current view::"
3920
msgstr ""
3921
3922
#: bzrlib/builtins.py:6312
3923
msgid " bzr view"
3924
msgstr ""
3925
3926
#: bzrlib/builtins.py:6314
3927
msgid " To delete the current view::"
3928
msgstr ""
3929
3930
#: bzrlib/builtins.py:6316
3931
msgid " bzr view --delete"
3932
msgstr ""
3933
3934
#: bzrlib/builtins.py:6318
3935
msgid " To disable the current view without deleting it::"
3936
msgstr ""
3937
3938
#: bzrlib/builtins.py:6320
3939
msgid " bzr view --switch off"
3940
msgstr ""
3941
3942
#: bzrlib/builtins.py:6322
3943
msgid " To define a named view and switch to it::"
3944
msgstr ""
3945
3946
#: bzrlib/builtins.py:6324
3947
msgid " bzr view --name view-name file1 dir1 ..."
3948
msgstr ""
3949
3950
#: bzrlib/builtins.py:6326
3951
msgid " To list a named view::"
3952
msgstr ""
3953
3954
#: bzrlib/builtins.py:6328
3955
msgid " bzr view --name view-name"
3956
msgstr ""
3957
3958
#: bzrlib/builtins.py:6330
3959
msgid " To delete a named view::"
3960
msgstr ""
3961
3962
#: bzrlib/builtins.py:6332
3963
msgid " bzr view --name view-name --delete"
3964
msgstr ""
3965
3966
#: bzrlib/builtins.py:6334
3967
msgid " To switch to a named view::"
3968
msgstr ""
3969
3970
#: bzrlib/builtins.py:6336
3971
msgid " bzr view --switch view-name"
3972
msgstr ""
3973
3974
#: bzrlib/builtins.py:6338
3975
msgid " To list all views defined::"
3976
msgstr ""
3977
3978
#: bzrlib/builtins.py:6340
3979
msgid " bzr view --all"
3980
msgstr ""
3981
3982
#: bzrlib/builtins.py:6342
3983
msgid " To delete all views::"
3984
msgstr ""
3985
3986
#: bzrlib/builtins.py:6344
3987
msgid " bzr view --delete --all"
3988
msgstr ""
3989
3990
#: bzrlib/builtins.py:6351
3991
msgid "Apply list or delete action to all views."
3992
msgstr ""
3993
3994
#: bzrlib/builtins.py:6354
3995
msgid "Delete the view."
3996
msgstr ""
3997
3998
#: bzrlib/builtins.py:6357
3999
msgid "Name of the view to define, list or delete."
4000
msgstr ""
4001
4002
#: bzrlib/builtins.py:6361
4003
msgid "Name of the view to switch to."
4004
msgstr ""
4005
4006
#: bzrlib/builtins.py:6380
4007
msgid "Both --delete and a file list specified"
4008
msgstr ""
4009
4010
#: bzrlib/builtins.py:6383
4011
msgid "Both --delete and --switch specified"
4012
msgstr ""
4013
4014
#: bzrlib/builtins.py:6386
4015
msgid "Deleted all views.\n"
4016
msgstr ""
4017
4018
#: bzrlib/builtins.py:6388
4019
msgid "No current view to delete"
4020
msgstr ""
4021
4022
#: bzrlib/builtins.py:6391
4023
#, python-format
4024
msgid "Deleted '%s' view.\n"
4025
msgstr ""
4026
4027
#: bzrlib/builtins.py:6395
4028
msgid "Both --switch and a file list specified"
4029
msgstr ""
4030
4031
#: bzrlib/builtins.py:6398
4032
msgid "Both --switch and --all specified"
4033
msgstr ""
4034
4035
#: bzrlib/builtins.py:6401
4036
msgid "No current view to disable"
4037
msgstr ""
4038
4039
#: bzrlib/builtins.py:6403
4040
#, python-format
4041
msgid "Disabled '%s' view.\n"
4042
msgstr ""
4043
4044
#: bzrlib/builtins.py:6407 bzrlib/builtins.py:6429
4045
msgid "Using '{0}' view: {1}\n"
4046
msgstr ""
4047
4048
#: bzrlib/builtins.py:6410
4049
msgid "Views defined:\n"
4050
msgstr ""
4051
4052
#: bzrlib/builtins.py:6419
4053
msgid "No views defined.\n"
4054
msgstr ""
4055
4056
#: bzrlib/builtins.py:6426
4057
msgid "Cannot change the 'off' pseudo view"
4058
msgstr ""
4059
4060
#: bzrlib/builtins.py:6434
4061
msgid "No current view.\n"
4062
msgstr ""
4063
4064
#: bzrlib/builtins.py:6437
4065
msgid "'{0}' view is: {1}\n"
4066
msgstr ""
4067
4068
#: bzrlib/builtins.py:6457
4069
msgid " <no hooks installed>\n"
4070
msgstr ""
4071
4072
#: bzrlib/builtins.py:6461
4073
msgid "Remove a branch."
4074
msgstr ""
4075
4076
#: bzrlib/builtins.py:6463
4077
msgid ""
4078
"This will remove the branch from the specified location but \n"
4079
"will keep any working tree or repository in place."
4080
msgstr ""
4081
4082
#: bzrlib/builtins.py:6468
4083
msgid " Remove the branch at repo/trunk::"
4084
msgstr ""
4085
4086
#: bzrlib/builtins.py:6470
4087
msgid " bzr remove-branch repo/trunk"
4088
msgstr ""
4089
4090
#: bzrlib/builtins.py:6477
4091
msgid "Remove branch even if it is the active branch."
4092
msgstr ""
4093
4094
#: bzrlib/builtins.py:6491
4095
msgid "Branch is active. Use --force to remove it."
4096
msgstr ""
4097
4098
#: bzrlib/builtins.py:6495
4099
msgid "Plaintext diff output."
4100
msgstr ""
4101
4102
#: bzrlib/builtins.py:6496
4103
msgid "Temporarily set aside some changes from the current tree."
4104
msgstr ""
4105
4106
#: bzrlib/builtins.py:6498
4107
msgid ""
4108
"Shelve allows you to temporarily put changes you've made \"on the shelf\",\n"
4109
"ie. out of the way, until a later time when you can bring them back from\n"
4110
"the shelf with the 'unshelve' command. The changes are stored alongside\n"
4111
"your working tree, and so they aren't propagated along with your branch nor\n"
4112
"will they survive its deletion."
4113
msgstr ""
4114
4115
#: bzrlib/builtins.py:6504
4116
msgid "If shelve --list is specified, previously-shelved changes are listed."
4117
msgstr ""
4118
4119
#: bzrlib/builtins.py:6506
4120
msgid ""
4121
"Shelve is intended to help separate several sets of changes that have\n"
4122
"been inappropriately mingled. If you just want to get rid of all changes\n"
4123
"and you don't need to restore them later, use revert. If you want to\n"
4124
"shelve all text changes at once, use shelve --all."
4125
msgstr ""
4126
4127
#: bzrlib/builtins.py:6511
4128
msgid ""
4129
"If filenames are specified, only the changes to those files will be\n"
4130
"shelved. Other files will be left untouched."
4131
msgstr ""
4132
4133
#: bzrlib/builtins.py:6514
4134
msgid ""
4135
"If a revision is specified, changes since that revision will be shelved."
4136
msgstr ""
4137
4138
#: bzrlib/builtins.py:6516
4139
msgid ""
4140
"You can put multiple items on the shelf, and by default, 'unshelve' will\n"
4141
"restore the most recently shelved changes."
4142
msgstr ""
4143
4144
#: bzrlib/builtins.py:6519
4145
msgid ""
4146
"For complicated changes, it is possible to edit the changes in a separate\n"
4147
"editor program to decide what the file remaining in the working copy\n"
4148
"should look like. To do this, add the configuration option"
4149
msgstr ""
4150
4151
#: bzrlib/builtins.py:6523
4152
msgid " change_editor = PROGRAM @new_path @old_path"
4153
msgstr ""
4154
4155
#: bzrlib/builtins.py:6525
4156
msgid ""
4157
"where @new_path is replaced with the path of the new version of the \n"
4158
"file and @old_path is replaced with the path of the old version of \n"
4159
"the file. The PROGRAM should save the new file with the desired \n"
4160
"contents of the file in the working tree.\n"
4161
" "
4162
msgstr ""
4163
4164
#: bzrlib/builtins.py:6537
4165
msgid "Shelve all changes."
4166
msgstr ""
4167
4168
#: bzrlib/builtins.py:6539
4169
msgid "Method to use for writing diffs."
4170
msgstr ""
4171
4172
#: bzrlib/builtins.py:6539
4173
msgid "writer"
4174
msgstr ""
4175
4176
#: bzrlib/builtins.py:6543
4177
msgid "List shelved changes."
4178
msgstr ""
4179
4180
#: bzrlib/builtins.py:6545
4181
msgid "Destroy removed changes instead of shelving them."
4182
msgstr ""
4183
4184
#: bzrlib/builtins.py:6574
4185
msgid "No shelved changes."
4186
msgstr ""
4187
4188
#: bzrlib/builtins.py:6585
4189
msgid "Restore shelved changes."
4190
msgstr ""
4191
4192
#: bzrlib/builtins.py:6587
4193
msgid ""
4194
"By default, the most recently shelved changes are restored. However if you\n"
4195
"specify a shelf by id those changes will be restored instead. This works\n"
4196
"best when the changes don't depend on each other."
4197
msgstr ""
4198
4199
#: bzrlib/builtins.py:6596
4200
msgid "The action to perform."
4201
msgstr ""
4202
4203
#: bzrlib/builtins.py:6596 bzrlib/conflicts.py:694
4204
msgid "action"
4205
msgstr ""
4206
4207
#: bzrlib/builtins.py:6598
4208
msgid "Apply changes and remove from the shelf."
4209
msgstr ""
4210
4211
#: bzrlib/builtins.py:6599
4212
msgid "Show changes, but do not apply or remove them."
4213
msgstr ""
4214
4215
#: bzrlib/builtins.py:6600
4216
msgid ""
4217
"Instead of unshelving the changes, show the diff that would result from "
4218
"unshelving."
4219
msgstr ""
4220
4221
#: bzrlib/builtins.py:6602
4222
msgid "Delete changes without applying them."
4223
msgstr ""
4224
4225
#: bzrlib/builtins.py:6603
4226
msgid "Apply changes but don't delete them."
4227
msgstr ""
4228
4229
#: bzrlib/builtins.py:6618
4230
msgid "Remove unwanted files from working tree."
4231
msgstr ""
4232
4233
#: bzrlib/builtins.py:6620
4234
msgid ""
4235
"By default, only unknown files, not ignored files, are deleted. Versioned\n"
4236
"files are never deleted."
4237
msgstr ""
4238
4239
#: bzrlib/builtins.py:6623
4240
msgid ""
4241
"Another class is 'detritus', which includes files emitted by bzr during\n"
4242
"normal operations and selftests. (The value of these files decreases with\n"
4243
"time.)"
4244
msgstr ""
4245
4246
#: bzrlib/builtins.py:6627
4247
msgid ""
4248
"If no options are specified, unknown files are deleted. Otherwise, option\n"
4249
"flags are respected, and may be combined."
4250
msgstr ""
4251
4252
#: bzrlib/builtins.py:6630
4253
msgid "To check what clean-tree will do, use --dry-run."
4254
msgstr ""
4255
4256
#: bzrlib/builtins.py:6633
4257
msgid "Delete all ignored files."
4258
msgstr ""
4259
4260
#: bzrlib/builtins.py:6634
4261
msgid ""
4262
"Delete conflict files, merge and revert backups, and failed selftest dirs."
4263
msgstr ""
4264
4265
#: bzrlib/builtins.py:6637
4266
msgid "Delete files unknown to bzr (default)."
4267
msgstr ""
4268
4269
#: bzrlib/builtins.py:6638
4270
msgid "Show files to delete instead of deleting them."
4271
msgstr ""
4272
4273
#: bzrlib/builtins.py:6640
4274
msgid "Do not prompt before deleting."
4275
msgstr ""
4276
4277
#: bzrlib/bundle/__init__.py:59
4278
msgid "A directory cannot be a bundle"
4279
msgstr ""
4280
4281
#: bzrlib/bundle/apply_bundle.py:40
4282
msgid "Install revisions"
4283
msgstr ""
4284
4285
#: bzrlib/bundle/commands.py:64
4286
msgid "--verbose requires a merge directive"
4287
msgstr ""
4288
4289
#: bzrlib/bundle/commands.py:67
4290
msgid "Bundle format not supported"
4291
msgstr ""
4292
4293
#: bzrlib/bundle/commands.py:77
4294
msgid "Records\n"
4295
msgstr ""
4296
4297
#: bzrlib/bundle/commands.py:81
4298
msgid "{0}: {1} ({2} multiparent)\n"
4299
msgstr ""
4300
4301
#: bzrlib/bundle/commands.py:83
4302
#, python-format
4303
msgid "unique files: %d\n"
4304
msgstr ""
4305
4306
#: bzrlib/bundle/commands.py:92
4307
msgid "Revisions\n"
4308
msgstr ""
4309
4310
#: bzrlib/bundle/commands.py:93
4311
#, python-format
4312
msgid "nicks: %s\n"
4313
msgstr ""
4314
4315
#: bzrlib/bundle/commands.py:95
4316
#, python-format
4317
msgid ""
4318
"committers: \n"
4319
"%s\n"
4320
msgstr ""
4321
4322
#: bzrlib/bundle/commands.py:103
4323
msgid "Decoded contents\n"
4324
msgstr ""
4325
4326
#: bzrlib/bundle/serializer/v4.py:327
4327
#, python-format
4328
msgid "Bundling %d revision."
4329
msgid_plural "Bundling %d revisions."
4330
msgstr[0] ""
4331
msgstr[1] ""
4332
4333
#: bzrlib/bzrdir.py:487
4334
msgid ""
4335
"making backup of {0}\n"
4336
" to {1}"
4337
msgstr ""
4338
4339
#: bzrlib/bzrdir.py:510
4340
msgid "renamed {0} to {1}"
4341
msgstr ""
4342
4343
#: bzrlib/bzrdir.py:1639
4344
#, python-format
4345
msgid ""
4346
"Source repository format does not support stacking, using format:\n"
4347
" %s"
4348
msgstr ""
4349
4350
#: bzrlib/bzrdir.py:1659
4351
#, python-format
4352
msgid ""
4353
"Source branch format does not support stacking, using format:\n"
4354
" %s"
4355
msgstr ""
4356
4357
#: bzrlib/bzrdir.py:1805
4358
msgid "starting repository conversion"
4359
msgstr ""
4360
4361
#: bzrlib/bzrdir.py:2026
4362
msgid "Using default stacking branch {0} at {1}"
4363
msgstr ""
4364
4365
#: bzrlib/check.py:108
4366
msgid "check"
4367
msgstr ""
4368
4369
#: bzrlib/check.py:110
4370
msgid "checking revisions"
4371
msgstr ""
4372
4373
#: bzrlib/check.py:112
4374
msgid "checking commit contents"
4375
msgstr ""
4376
4377
#: bzrlib/check.py:114
4378
msgid "checking file graphs"
4379
msgstr ""
4380
4381
#: bzrlib/check.py:118
4382
msgid "checking branches and trees"
4383
msgstr ""
4384
4385
#: bzrlib/check.py:205
4386
msgid "checked repository {0} format {1}"
4387
msgstr ""
4388
4389
#: bzrlib/check.py:208
4390
#, python-format
4391
msgid "%6d revisions"
4392
msgstr ""
4393
4394
#: bzrlib/check.py:209
4395
#, python-format
4396
msgid "%6d file-ids"
4397
msgstr ""
4398
4399
#: bzrlib/check.py:211
4400
#, python-format
4401
msgid "%6d unreferenced text versions"
4402
msgstr ""
4403
4404
#: bzrlib/check.py:215
4405
msgid "unreferenced version: {{{0}}} in {1}"
4406
msgstr ""
4407
4408
#: bzrlib/check.py:218
4409
#, python-format
4410
msgid "%6d revisions are missing inventory_sha1"
4411
msgstr ""
4412
4413
#: bzrlib/check.py:221
4414
#, python-format
4415
msgid "%6d revisions are mentioned but not present"
4416
msgstr ""
4417
4418
#: bzrlib/check.py:224
4419
#, python-format
4420
msgid "%6d ghost revisions"
4421
msgstr ""
4422
4423
#: bzrlib/check.py:229
4424
#, python-format
4425
msgid "%6d revisions missing parents in ancestry"
4426
msgstr ""
4427
4428
#: bzrlib/check.py:233
4429
#, python-format
4430
msgid " %s should be in the ancestry for:"
4431
msgstr ""
4432
4433
#: bzrlib/check.py:237
4434
#, python-format
4435
msgid "%6d inconsistent parents"
4436
msgstr ""
4437
4438
#: bzrlib/check.py:241
4439
msgid " * {0} version {1} has parents {2!r} but should have {3!r}"
4440
msgstr ""
4441
4442
#: bzrlib/check.py:247
4443
#, python-format
4444
msgid "%6d revisions have incorrect parents in the revision index"
4445
msgstr ""
4446
4447
#: bzrlib/check.py:253
4448
msgid " {0} has wrong parents in index: {1!r} should be {2!r}"
4449
msgstr ""
4450
4451
#: bzrlib/check.py:267
4452
msgid "Mismatched internal revid {{{0}}} and index revid {{{1}}}"
4453
msgstr ""
4454
4455
#: bzrlib/check.py:296
4456
msgid ""
4457
"Multiple expected sha1s for {0}. {{{1}}} expects {{{2}}}, {{{3}}} expects "
4458
"{{{4}}}"
4459
msgstr ""
4460
4461
#: bzrlib/check.py:354
4462
#, python-format
4463
msgid "Checking branch at '%s'."
4464
msgstr ""
4465
4466
#: bzrlib/check.py:374
4467
#, python-format
4468
msgid "Checking working tree at '%s'."
4469
msgstr ""
4470
4471
#: bzrlib/check.py:427 bzrlib/check.py:441
4472
msgid "No branch found at specified location."
4473
msgstr ""
4474
4475
#: bzrlib/check.py:429 bzrlib/check.py:439
4476
msgid "No working tree found at specified location."
4477
msgstr ""
4478
4479
#: bzrlib/check.py:432
4480
#, python-format
4481
msgid "Checking repository at '%s'."
4482
msgstr ""
4483
4484
#: bzrlib/check.py:443
4485
msgid "No repository found at specified location."
4486
msgstr ""
4487
4488
#: bzrlib/clean_tree.py:63
4489
msgid "Nothing to delete."
4490
msgstr ""
4491
4492
#: bzrlib/clean_tree.py:68
4493
msgid "Are you sure you wish to delete these"
4494
msgstr ""
4495
4496
#: bzrlib/clean_tree.py:70
4497
msgid "Canceled"
4498
msgstr ""
4499
4500
#: bzrlib/clean_tree.py:107
4501
#, python-format
4502
msgid "unable to remove %s"
4503
msgstr ""
4504
4505
#: bzrlib/clean_tree.py:111
4506
msgid "deleting paths:"
4507
msgstr ""
4508
4509
#: bzrlib/clean_tree.py:125
4510
msgid "unable to remove \"{0}\": {1}."
4511
msgstr ""
4512
4513
#: bzrlib/clean_tree.py:130
4514
msgid "No files deleted."
4515
msgstr ""
4516
4517
#: bzrlib/cmd_version_info.py:47
4518
msgid "No known version info format {0}. Supported types are: {1}"
4519
msgstr ""
4520
4521
#: bzrlib/cmd_version_info.py:52
4522
msgid "Version info in Custom template-based format."
4523
msgstr ""
4524
4525
#: bzrlib/cmd_version_info.py:52
4526
msgid "Version info in Python format."
4527
msgstr ""
4528
4529
#: bzrlib/cmd_version_info.py:52
4530
msgid "Version info in RIO (simple text) format (default)."
4531
msgstr ""
4532
4533
#: bzrlib/cmd_version_info.py:53
4534
msgid "Show version information about this tree."
4535
msgstr ""
4536
4537
#: bzrlib/cmd_version_info.py:55
4538
msgid ""
4539
"You can use this command to add information about version into\n"
4540
"source code of an application. The output can be in one of the\n"
4541
"supported formats or in a custom format based on a template."
4542
msgstr ""
4543
4544
#: bzrlib/cmd_version_info.py:59 en/help_topics/configuration.txt:712
4545
#: en/help_topics/configuration.txt:722
4546
msgid "For example::"
4547
msgstr ""
4548
4549
#: bzrlib/cmd_version_info.py:61
4550
msgid ""
4551
" bzr version-info --custom \\\n"
4552
" --template=\"#define VERSION_INFO \\\"Project 1.2.3 (r{revno})\\\"\\n\""
4553
msgstr ""
4554
4555
#: bzrlib/cmd_version_info.py:64
4556
msgid ""
4557
"will produce a C header file with formatted string containing the\n"
4558
"current revision number. Other supported variables in templates are:"
4559
msgstr ""
4560
4561
#: bzrlib/cmd_version_info.py:67
4562
msgid ""
4563
" * {date} - date of the last revision\n"
4564
" * {build_date} - current date\n"
4565
" * {revno} - revision number\n"
4566
" * {revision_id} - revision id\n"
4567
" * {branch_nick} - branch nickname\n"
4568
" * {clean} - 0 if the source tree contains uncommitted changes,\n"
4569
" otherwise 1"
4570
msgstr ""
4571
4572
#: bzrlib/cmd_version_info.py:77
4573
msgid "Select the output format."
4574
msgstr ""
4575
4576
#: bzrlib/cmd_version_info.py:81
4577
msgid "Include all possible information."
4578
msgstr ""
4579
4580
#: bzrlib/cmd_version_info.py:82
4581
msgid "Check if tree is clean."
4582
msgstr ""
4583
4584
#: bzrlib/cmd_version_info.py:84
4585
msgid "Include the revision-history."
4586
msgstr ""
4587
4588
#: bzrlib/cmd_version_info.py:86
4589
msgid "Include the last revision for each file."
4590
msgstr ""
4591
4592
#: bzrlib/cmd_version_info.py:87
4593
msgid "Template for the output."
4594
msgstr ""
4595
4596
#: bzrlib/cmd_version_info.py:101
4597
msgid "bzr version-info --revision takes exactly one revision specifier"
4598
msgstr ""
4599
4600
#: bzrlib/commands.py:229
4601
#, python-format
4602
msgid "unknown command \"%s\""
4603
msgstr ""
4604
4605
#: bzrlib/commands.py:476
4606
msgid "No help for this command."
4607
msgstr ""
4608
4609
#: bzrlib/commands.py:489
4610
#, python-format
4611
msgid ":Purpose: %s\n"
4612
msgstr ""
4613
4614
#: bzrlib/commands.py:491
4615
#, python-format
4616
msgid ""
4617
":Usage:\n"
4618
"%s\n"
4619
msgstr ""
4620
4621
#: bzrlib/commands.py:493
4622
#, python-format
4623
msgid ":Usage: %s\n"
4624
msgstr ""
4625
4626
#: bzrlib/commands.py:512
4627
#, python-format
4628
msgid ":Options:%s"
4629
msgstr ""
4630
4631
#: bzrlib/commands.py:523
4632
#, python-format
4633
msgid ""
4634
":Description:\n"
4635
" %s\n"
4636
"\n"
4637
msgstr ""
4638
4639
#: bzrlib/commands.py:533
4640
#, python-format
4641
msgid ""
4642
"See bzr help %s for more details and examples.\n"
4643
"\n"
4644
msgstr ""
4645
4646
#: bzrlib/commands.py:538
4647
msgid ":Aliases: "
4648
msgstr ""
4649
4650
#: bzrlib/commands.py:542
4651
#, python-format
4652
msgid ":From: plugin \"%s\"\n"
4653
msgstr ""
4654
4655
#: bzrlib/commands.py:554
4656
msgid ":doc:`{0} <{1}-help>`"
4657
msgstr ""
4658
4659
#: bzrlib/commands.py:558
4660
#, python-format
4661
msgid ":See also: %s"
4662
msgstr ""
4663
4664
#: bzrlib/commands.py:826 bzrlib/gpg.py:347
4665
msgid "Only ASCII permitted in option names"
4666
msgstr ""
4667
4668
#: bzrlib/commands.py:851 bzrlib/commands.py:859
4669
msgid "command {0!r} needs one or more {1}"
4670
msgstr ""
4671
4672
#: bzrlib/commands.py:868
4673
msgid "command {0!r} requires argument {1}"
4674
msgstr ""
4675
4676
#: bzrlib/commands.py:875
4677
msgid "extra argument to command {0}: {1}"
4678
msgstr ""
4679
4680
#: bzrlib/commands.py:972
4681
#, python-format
4682
msgid "Profile data written to \"%s\"."
4683
msgstr ""
4684
4685
#: bzrlib/commit.py:117 bzrlib/commit.py:740
4686
msgid "added"
4687
msgstr ""
4688
4689
#: bzrlib/commit.py:117 bzrlib/commit.py:748
4690
msgid "modified"
4691
msgstr ""
4692
4693
#: bzrlib/commit.py:131
4694
#, python-format
4695
msgid "Committing%s"
4696
msgstr ""
4697
4698
#: bzrlib/commit.py:134
4699
#, python-format
4700
msgid "Committed revision %d."
4701
msgstr ""
4702
4703
#: bzrlib/commit.py:143
4704
#, python-format
4705
msgid "deleted %s"
4706
msgstr ""
4707
4708
#: bzrlib/commit.py:146
4709
#, python-format
4710
msgid "missing %s"
4711
msgstr ""
4712
4713
#: bzrlib/commit.py:511
4714
msgid ""
4715
"Conflicting tags in bound branch:\n"
4716
"{0}"
4717
msgstr ""
4718
4719
#: bzrlib/commit.py:742
4720
msgid "renamed"
4721
msgstr ""
4722
4723
#: bzrlib/commit.py:976
4724
msgid "unchanged"
4725
msgstr ""
4726
4727
#: bzrlib/commit.py:998
4728
msgid "{0} [{1}] - Stage"
4729
msgstr ""
4730
4731
#: bzrlib/commit.py:1001
4732
#, python-format
4733
msgid "%s - Stage"
4734
msgstr ""
4735
4736
#: bzrlib/commit_signature_commands.py:34
4737
msgid "Sign all commits by a given committer."
4738
msgstr ""
4739
4740
#: bzrlib/commit_signature_commands.py:36
4741
msgid ""
4742
"If location is not specified the local tree is used.\n"
4743
"If committer is not specified the default committer is used."
4744
msgstr ""
4745
4746
#: bzrlib/commit_signature_commands.py:39
4747
msgid "This does not sign commits that already have signatures."
4748
msgstr ""
4749
4750
#: bzrlib/commit_signature_commands.py:47
4751
msgid ""
4752
"Don't actually sign anything, just print the revisions that would be signed."
4753
msgstr ""
4754
4755
#: bzrlib/commit_signature_commands.py:98
4756
#, python-format
4757
msgid "Signed %d revision.\n"
4758
msgid_plural "Signed %d revisions.\n"
4759
msgstr[0] ""
4760
msgstr[1] ""
4761
4762
#: bzrlib/commit_signature_commands.py:103
4763
msgid "Verify all commit signatures."
4764
msgstr ""
4765
4766
#: bzrlib/commit_signature_commands.py:105
4767
msgid ""
4768
"Verifies that all commits in the branch are signed by known GnuPG keys."
4769
msgstr ""
4770
4771
#: bzrlib/commit_signature_commands.py:110
4772
msgid ""
4773
"Comma separated list of GPG key patterns which are acceptable for "
4774
"verification."
4775
msgstr ""
4776
4777
#: bzrlib/commit_signature_commands.py:148
4778
msgid "Cannot verify a range of non-revision-history revisions"
4779
msgstr ""
4780
4781
#: bzrlib/commit_signature_commands.py:166
4782
msgid "All commits signed with verifiable keys"
4783
msgstr ""
4784
4785
#: bzrlib/config.py:436
4786
msgid "Invalid config value for \"{0}\" value {1!r} is not an SI unit."
4787
msgstr ""
4788
4789
#: bzrlib/config.py:2452
4790
msgid "{0} is not an SI unit."
4791
msgstr ""
4792
4793
#: bzrlib/config.py:2971
4794
msgid ""
4795
"Option {0} in section {1} of {2} was changed from {3} to {4}. The {5} value "
4796
"will be saved."
4797
msgstr ""
4798
4799
#: bzrlib/config.py:3116
4800
#, python-format
4801
msgid "Invalid '%s', should be of the form 'name=value'"
4802
msgstr ""
4803
4804
#: bzrlib/config.py:4018
4805
msgid "Display, set or remove a configuration option."
4806
msgstr ""
4807
4808
#: bzrlib/config.py:4020
4809
msgid "Display the active value for a given option."
4810
msgstr ""
4811
4812
#: bzrlib/config.py:4022
4813
msgid ""
4814
"If --all is specified, NAME is interpreted as a regular expression and all\n"
4815
"matching options are displayed mentioning their scope. The active value\n"
4816
"that bzr will take into account is the first one displayed for each option."
4817
msgstr ""
4818
4819
#: bzrlib/config.py:4026
4820
msgid "If no NAME is given, --all .* is implied."
4821
msgstr ""
4822
4823
#: bzrlib/config.py:4028
4824
msgid ""
4825
"Setting a value is achieved by using name=value without spaces. The value\n"
4826
"is set in the most relevant scope and can be checked by displaying the\n"
4827
"option again."
4828
msgstr ""
4829
4830
#: bzrlib/config.py:4040
4831
msgid "Reduce the scope to the specified configuration file."
4832
msgstr ""
4833
4834
#: bzrlib/config.py:4044
4835
msgid "Display all the defined values for the matching options."
4836
msgstr ""
4837
4838
#: bzrlib/config.py:4046
4839
msgid "Remove the option from the configuration file."
4840
msgstr ""
4841
4842
#: bzrlib/conflicts.py:50
4843
msgid "List files with conflicts."
4844
msgstr ""
4845
4846
#: bzrlib/conflicts.py:57
4847
msgid ""
4848
"Conflicts normally are listed as short, human-readable messages. If --text\n"
4849
"is supplied, the pathnames of files with text conflicts are listed,\n"
4850
"instead. (This is useful for editing all files with text conflicts.)"
4851
msgstr ""
4852
4853
#: bzrlib/conflicts.py:61
4854
msgid "Use bzr resolve when you have fixed a problem."
4855
msgstr ""
4856
4857
#: bzrlib/conflicts.py:66
4858
msgid "List paths of files with text conflicts."
4859
msgstr ""
4860
4861
#: bzrlib/conflicts.py:85
4862
msgid "Marks the conflict as resolved."
4863
msgstr ""
4864
4865
#: bzrlib/conflicts.py:88
4866
msgid "Resolve the conflict preserving the version in the working tree."
4867
msgstr ""
4868
4869
#: bzrlib/conflicts.py:91
4870
msgid "Resolve the conflict taking the merged version into account."
4871
msgstr ""
4872
4873
#: bzrlib/conflicts.py:98
4874
msgid "How to resolve the conflict."
4875
msgstr ""
4876
4877
#: bzrlib/conflicts.py:104
4878
msgid "Mark a conflict as resolved."
4879
msgstr ""
4880
4881
#: bzrlib/conflicts.py:111
4882
msgid ""
4883
"Once you have fixed a problem, use \"bzr resolve\" to automatically mark\n"
4884
"text conflicts as fixed, \"bzr resolve FILE\" to mark a specific conflict "
4885
"as\n"
4886
"resolved, or \"bzr resolve --all\" to mark all conflicts as resolved."
4887
msgstr ""
4888
4889
#: bzrlib/conflicts.py:119
4890
msgid "Resolve all conflicts in this tree."
4891
msgstr ""
4892
4893
#: bzrlib/conflicts.py:126
4894
msgid "If --all is specified, no FILE may be provided"
4895
msgstr ""
4896
4897
#: bzrlib/conflicts.py:151
4898
#, python-format
4899
msgid "%d conflict auto-resolved."
4900
msgid_plural "%d conflicts auto-resolved."
4901
msgstr[0] ""
4902
msgstr[1] ""
4903
4904
#: bzrlib/conflicts.py:154
4905
msgid "Remaining conflicts:"
4906
msgstr ""
4907
4908
#: bzrlib/conflicts.py:159
4909
msgid "All conflicts resolved."
4910
msgstr ""
4911
4912
#: bzrlib/conflicts.py:168
4913
msgid "{0} conflict resolved, {1} remaining"
4914
msgid_plural "{0} conflicts resolved, {1} remaining"
4915
msgstr[0] ""
4916
msgstr[1] ""
4917
4918
#: bzrlib/controldir.py:712
4919
msgid "{0} is{1} redirected to {2}"
4920
msgstr ""
4921
4922
#: bzrlib/diff.py:399
4923
#, python-format
4924
msgid "*** Ignoring files outside view. View is %s"
4925
msgstr ""
4926
4927
#: bzrlib/errors.py:157
4928
msgid "The tree builder is already building a tree."
4929
msgstr ""
4930
4931
#: bzrlib/errors.py:178
4932
msgid "The dirstate file (%(state)s) appears to be corrupt: %(msg)s"
4933
msgstr ""
4934
4935
#: bzrlib/errors.py:197
4936
msgid ""
4937
"The API for \"%(api)s\" is not compatible with \"%(wanted)s\". It supports "
4938
"versions \"%(minimum)s\" to \"%(current)s\"."
4939
msgstr ""
4940
4941
#: bzrlib/errors.py:209
4942
msgid "The transport '%(transport)s' is only accessible within this process."
4943
msgstr ""
4944
4945
#: bzrlib/errors.py:227
4946
msgid "Invalid revision number %(revno)s"
4947
msgstr ""
4948
4949
#: bzrlib/errors.py:236
4950
msgid "Invalid revision-id {%(revision_id)s} in %(branch)s"
4951
msgstr ""
4952
4953
#: bzrlib/errors.py:247
4954
msgid "Reserved revision-id {%(revision_id)s}"
4955
msgstr ""
4956
4957
#: bzrlib/errors.py:261
4958
msgid "There is no public branch set for \"%(branch_url)s\"."
4959
msgstr ""
4960
4961
#: bzrlib/errors.py:271
4962
msgid ""
4963
"No help could be found for '%(topic)s'. Please use 'bzr help topics' to "
4964
"obtain a list of topics."
4965
msgstr ""
4966
4967
#: bzrlib/errors.py:280
4968
msgid "The file id \"%(file_id)s\" is not present in the tree %(tree)s."
4969
msgstr ""
4970
4971
#: bzrlib/errors.py:290
4972
msgid ""
4973
"The file id \"%(file_id)s\" is not present in the repository %(repository)r"
4974
msgstr ""
4975
4976
#: bzrlib/errors.py:299
4977
msgid "The branch '%(branch)s' is not stacked."
4978
msgstr ""
4979
4980
#: bzrlib/errors.py:313
4981
msgid "No WorkingTree exists for \"%(base)s\"."
4982
msgstr ""
4983
4984
#: bzrlib/errors.py:322
4985
msgid "Not currently building a tree."
4986
msgstr ""
4987
4988
#: bzrlib/errors.py:327
4989
msgid "%(url)s is not a local path."
4990
msgstr ""
4991
4992
#: bzrlib/errors.py:355
4993
msgid "%(not_locked)r is not write locked but needs to be."
4994
msgstr ""
4995
4996
#: bzrlib/errors.py:363
4997
msgid "Error in command line options"
4998
msgstr ""
4999
5000
#: bzrlib/errors.py:368
5001
msgid "%(value)s is not an index of type %(_type)s."
5002
msgstr ""
5003
5004
#: bzrlib/errors.py:378
5005
msgid "Error in data for index %(value)s."
5006
msgstr ""
5007
5008
#: bzrlib/errors.py:387
5009
msgid "The key '%(key)s' is already in index '%(index)s'."
5010
msgstr ""
5011
5012
#: bzrlib/errors.py:397
5013
msgid "The key '%(key)s' is not a valid key."
5014
msgstr ""
5015
5016
#: bzrlib/errors.py:406
5017
msgid "Could not parse options for index %(value)s."
5018
msgstr ""
5019
5020
#: bzrlib/errors.py:415
5021
msgid "The value '%(value)s' is not a valid value."
5022
msgstr ""
5023
5024
#: bzrlib/errors.py:424
5025
msgid "Bad value \"%(value)s\" for option \"%(name)s\"."
5026
msgstr ""
5027
5028
#: bzrlib/errors.py:443
5029
msgid "Generic path error: %(path)r%(extra)s)"
5030
msgstr ""
5031
5032
#: bzrlib/errors.py:456
5033
msgid "No such file: %(path)r%(extra)s"
5034
msgstr ""
5035
5036
#: bzrlib/errors.py:461
5037
msgid "File exists: %(path)r%(extra)s"
5038
msgstr ""
5039
5040
#: bzrlib/errors.py:467
5041
msgid ""
5042
"Could not rename %(source)s => %(dest)s because both files exist. (Use --"
5043
"after to tell bzr about a rename that has already happened)%(extra)s"
5044
msgstr ""
5045
5046
#: bzrlib/errors.py:483
5047
msgid "\"%(path)s\" is not a directory %(extra)s"
5048
msgstr ""
5049
5050
#: bzrlib/errors.py:488
5051
msgid "\"%(path)s\" is not in the working directory %(extra)s"
5052
msgstr ""
5053
5054
#: bzrlib/errors.py:493
5055
msgid "Directory not empty: \"%(path)s\"%(extra)s"
5056
msgstr ""
5057
5058
#: bzrlib/errors.py:498
5059
msgid "Hard-linking \"%(path)s\" is not supported"
5060
msgstr ""
5061
5062
#: bzrlib/errors.py:513
5063
msgid "Device or resource busy: \"%(path)s\"%(extra)s"
5064
msgstr ""
5065
5066
#: bzrlib/errors.py:518
5067
msgid "Permission denied: \"%(path)s\"%(extra)s"
5068
msgstr ""
5069
5070
#: bzrlib/errors.py:523
5071
msgid "Invalid url supplied to transport: \"%(path)s\"%(extra)s"
5072
msgstr ""
5073
5074
#: bzrlib/errors.py:528
5075
msgid "Invalid URL join request: %(reason)s: %(base)r + %(join_args)r"
5076
msgstr ""
5077
5078
#: bzrlib/errors.py:539
5079
msgid "URLs differ by more than path: %(from_)r and %(to)r"
5080
msgstr ""
5081
5082
#: bzrlib/errors.py:561
5083
msgid "The %(type)s hook '%(hook)s' is unknown in this version of bzrlib."
5084
msgstr ""
5085
5086
#: bzrlib/errors.py:571
5087
msgid "Unsupported protocol for url \"%(path)s\"%(extra)s"
5088
msgstr ""
5089
5090
#: bzrlib/errors.py:579
5091
msgid ""
5092
"The branch '%(url)s'(%(format)s) is not a stackable format. You will need to "
5093
"upgrade the branch to permit branch stacking."
5094
msgstr ""
5095
5096
#: bzrlib/errors.py:590
5097
msgid "The branch '%(branch_url)s' cannot be stacked on '%(target_url)s'."
5098
msgstr ""
5099
5100
#: bzrlib/errors.py:600
5101
msgid ""
5102
"The repository '%(url)s'(%(format)s) is not a stackable format. You will "
5103
"need to upgrade the repository to permit branch stacking."
5104
msgstr ""
5105
5106
#: bzrlib/errors.py:611
5107
msgid "Error reading from %(path)r."
5108
msgstr ""
5109
5110
#: bzrlib/errors.py:630
5111
msgid "Path \"%(path)s\" is not a child of path \"%(base)s\"%(extra)s"
5112
msgstr ""
5113
5114
#: bzrlib/errors.py:646
5115
msgid "Path \"%(path)s\" is not unicode normalized"
5116
msgstr ""
5117
5118
#: bzrlib/errors.py:654
5119
msgid "Not a branch: \"%(path)s\"%(detail)s."
5120
msgstr ""
5121
5122
#: bzrlib/errors.py:696
5123
msgid "No submit branch available for branch \"%(path)s\""
5124
msgstr ""
5125
5126
#: bzrlib/errors.py:705
5127
msgid "A control directory already exists: \"%(path)s\"."
5128
msgstr ""
5129
5130
#: bzrlib/errors.py:710
5131
msgid "Already a branch: \"%(path)s\"."
5132
msgstr ""
5133
5134
#: bzrlib/errors.py:715
5135
msgid "Invalid branch name: %(name)s"
5136
msgstr ""
5137
5138
#: bzrlib/errors.py:724
5139
msgid "Parent branch already exists: \"%(path)s\"."
5140
msgstr ""
5141
5142
#: bzrlib/errors.py:730
5143
msgid ""
5144
"Directory contains a branch, but no working tree (use bzr checkout if you "
5145
"wish to build a working tree): \"%(path)s\""
5146
msgstr ""
5147
5148
#: bzrlib/errors.py:735
5149
msgid ""
5150
"\"%(function)s\" called on an AtomicFile after it was closed: \"%(path)s\""
5151
msgstr ""
5152
5153
#: bzrlib/errors.py:745
5154
msgid ""
5155
"Parent not accessible given base \"%(base)s\" and relative path \"%(path)s\""
5156
msgstr ""
5157
5158
#: bzrlib/errors.py:755
5159
msgid "No repository present: \"%(path)s\""
5160
msgstr ""
5161
5162
#: bzrlib/errors.py:762
5163
msgid ""
5164
"Unsupported branch format: %(format)s\n"
5165
"Please run 'bzr upgrade'"
5166
msgstr ""
5167
5168
#: bzrlib/errors.py:768
5169
msgid "Unknown %(kind)s format: %(format)r"
5170
msgstr ""
5171
5172
#: bzrlib/errors.py:777
5173
msgid "Format %(format)s is not compatible with .bzr version %(bzrdir)s."
5174
msgstr ""
5175
5176
#: bzrlib/errors.py:787
5177
msgid "Parse error on line %(lineno)d of %(format)s format: %(line)s"
5178
msgstr ""
5179
5180
#: bzrlib/errors.py:802
5181
msgid ""
5182
"%(target)s\n"
5183
"is not compatible with\n"
5184
"%(source)s\n"
5185
"%(details)s"
5186
msgstr ""
5187
5188
#: bzrlib/errors.py:818
5189
msgid "Revision is not compatible with %(repo_format)s"
5190
msgstr ""
5191
5192
#: bzrlib/errors.py:828
5193
msgid "%(context_info)s%(path)s is already versioned."
5194
msgstr ""
5195
5196
#: bzrlib/errors.py:849
5197
msgid "%(context_info)s%(path)s is not versioned."
5198
msgstr ""
5199
5200
#: bzrlib/errors.py:870
5201
msgid "Path(s) are not versioned: %(paths_as_string)s"
5202
msgstr ""
5203
5204
#: bzrlib/errors.py:881
5205
msgid "Path(s) do not exist: %(paths_as_string)s%(extra)s"
5206
msgstr ""
5207
5208
#: bzrlib/errors.py:900
5209
msgid "Cannot operate on \"%(filename)s\" of unsupported kind \"%(kind)s\""
5210
msgstr ""
5211
5212
#: bzrlib/errors.py:908
5213
msgid ""
5214
"Filename %(filename)r is not valid in your current filesystem encoding "
5215
"%(fs_encoding)s"
5216
msgstr ""
5217
5218
#: bzrlib/errors.py:919
5219
msgid "Cannot operate on \"%(filename)s\" because it is a control file"
5220
msgstr ""
5221
5222
#: bzrlib/errors.py:937
5223
msgid "The lock for '%(lock_description)s' is in use and cannot be broken."
5224
msgstr ""
5225
5226
#: bzrlib/errors.py:976
5227
msgid "Cannot lock %(lock)s: %(why)s"
5228
msgstr ""
5229
5230
#: bzrlib/errors.py:986
5231
msgid ""
5232
"A transaction related operation was attempted after the transaction finished."
5233
msgstr ""
5234
5235
#: bzrlib/errors.py:1013
5236
msgid "Cannot lock: transport is read only: %(transport)s"
5237
msgstr ""
5238
5239
#: bzrlib/errors.py:1021
5240
msgid "Could not acquire lock \"%(lock)s\": %(msg)s"
5241
msgstr ""
5242
5243
#: bzrlib/errors.py:1032
5244
msgid ""
5245
"Lock was broken while still open: %(lock)s - check storage consistency!"
5246
msgstr ""
5247
5248
#: bzrlib/errors.py:1043
5249
msgid ""
5250
"Lock was released and re-acquired before being broken: %(lock)s: held by "
5251
"%(holder)r, wanted to break %(target)r"
5252
msgstr ""
5253
5254
#: bzrlib/errors.py:1055
5255
msgid ""
5256
"Lock is apparently held, but corrupted: %(corruption_info)s\n"
5257
"Use 'bzr break-lock' to clear it"
5258
msgstr ""
5259
5260
#: bzrlib/errors.py:1068
5261
msgid "Lock not held: %(lock)s"
5262
msgstr ""
5263
5264
#: bzrlib/errors.py:1097
5265
msgid "No changes to commit"
5266
msgstr ""
5267
5268
#: bzrlib/errors.py:1102
5269
msgid ""
5270
"Selected-file commit of merges is not supported yet: files %(files_str)s"
5271
msgstr ""
5272
5273
#: bzrlib/errors.py:1112
5274
msgid ""
5275
"Excluding paths during commit is not supported by repository at "
5276
"%(repository)r."
5277
msgstr ""
5278
5279
#: bzrlib/errors.py:1121
5280
msgid ""
5281
"The specified commit message contains characters unsupported by the current "
5282
"encoding."
5283
msgstr ""
5284
5285
#: bzrlib/errors.py:1127
5286
msgid "Upgrade URL cannot work with readonly URLs."
5287
msgstr ""
5288
5289
#: bzrlib/errors.py:1132
5290
msgid "The branch format %(format)s is already at the most recent format."
5291
msgstr ""
5292
5293
#: bzrlib/errors.py:1155
5294
msgid "Option --change does not accept revision ranges"
5295
msgstr ""
5296
5297
#: bzrlib/errors.py:1160
5298
msgid "No namespace registered for string: %(spec)r"
5299
msgstr ""
5300
5301
#: bzrlib/errors.py:1179
5302
msgid ""
5303
"Requested revision: '%(spec)s' does not exist in branch: "
5304
"%(branch_url)s%(extra)s"
5305
msgstr ""
5306
5307
#: bzrlib/errors.py:1193
5308
msgid ""
5309
"Operation denied because it would change the main history, which is not "
5310
"permitted by the append_revisions_only setting on branch \"%(location)s\"."
5311
msgstr ""
5312
5313
#: bzrlib/errors.py:1204
5314
msgid ""
5315
"These branches have diverged. Use the missing command to see how.\n"
5316
"Use the merge command to reconcile them."
5317
msgstr ""
5318
5319
#: bzrlib/errors.py:1224
5320
msgid ""
5321
"Branches have no common ancestor, and no merge base revision was specified."
5322
msgstr ""
5323
5324
#: bzrlib/errors.py:1230
5325
msgid ""
5326
"Selected merge cannot perform reverse cherrypicks. Try merge3 or diff3."
5327
msgstr ""
5328
5329
#: bzrlib/errors.py:1236
5330
msgid "Revisions have no common ancestor: %(revision_a)s %(revision_b)s"
5331
msgstr ""
5332
5333
#: bzrlib/errors.py:1245
5334
msgid ""
5335
"Revisions are not derived from the same root: %(revision_a)s %(revision_b)s."
5336
msgstr ""
5337
5338
#: bzrlib/errors.py:1254
5339
msgid "Revision %(rev_id)s is not an ancestor of %(not_ancestor_id)s"
5340
msgstr ""
5341
5342
#: bzrlib/errors.py:1263
5343
msgid "Branch %(branch)s has no commits."
5344
msgstr ""
5345
5346
#: bzrlib/errors.py:1281
5347
msgid ""
5348
"Bound branch %(branch)s is out of date with master branch "
5349
"%(master)s.%(extra_help)s"
5350
msgstr ""
5351
5352
#: bzrlib/errors.py:1293
5353
msgid ""
5354
"Cannot commit to branch %(branch)s. It is bound to %(master)s, which is "
5355
"bound to %(remote)s."
5356
msgstr ""
5357
5358
#: bzrlib/errors.py:1305
5359
msgid "Cannot pull --overwrite to a branch which is bound %(branch)s"
5360
msgstr ""
5361
5362
#: bzrlib/errors.py:1314
5363
msgid ""
5364
"Unable to connect to target of bound branch %(branch)s => %(target)s: "
5365
"%(error)s"
5366
msgstr ""
5367
5368
#: bzrlib/errors.py:1326
5369
msgid "Error in processing weave: %(msg)s"
5370
msgstr ""
5371
5372
#: bzrlib/errors.py:1335
5373
msgid "Revision {%(revision_id)s} already present in %(weave)s"
5374
msgstr ""
5375
5376
#: bzrlib/errors.py:1346
5377
msgid "Revision {%(revision_id)s} not present in %(weave)s"
5378
msgstr ""
5379
5380
#: bzrlib/errors.py:1356
5381
msgid "Weave invariant violated: %(what)s"
5382
msgstr ""
5383
5384
#: bzrlib/errors.py:1365
5385
msgid "Parents are mismatched between two revisions. %(msg)s"
5386
msgstr ""
5387
5388
#: bzrlib/errors.py:1387
5389
msgid ""
5390
"Weaves differ on text content. Revision: {%(revision_id)s}, %(weave_a)s, "
5391
"%(weave_b)s"
5392
msgstr ""
5393
5394
#: bzrlib/errors.py:1399
5395
msgid "Versioned file error"
5396
msgstr ""
5397
5398
#: bzrlib/errors.py:1404
5399
msgid "Revision {%(revision_id)s} not present in \"%(file_id)s\"."
5400
msgstr ""
5401
5402
#: bzrlib/errors.py:1414
5403
msgid "Revision {%(revision_id)s} already present in \"%(file_id)s\"."
5404
msgstr ""
5405
5406
#: bzrlib/errors.py:1424
5407
msgid "Text did not match its checksum: %(msg)s"
5408
msgstr ""
5409
5410
#: bzrlib/errors.py:1550
5411
msgid "Export format %(format)r not supported"
5412
msgstr ""
5413
5414
#: bzrlib/errors.py:1559
5415
msgid "Transport error: %(msg)s %(orig_error)s"
5416
msgstr ""
5417
5418
#: bzrlib/errors.py:1585
5419
msgid "Generic bzr smart protocol error: %(details)s"
5420
msgstr ""
5421
5422
#: bzrlib/errors.py:1593
5423
msgid "Received bad protocol version marker: %(marker)r"
5424
msgstr ""
5425
5426
#: bzrlib/errors.py:1625
5427
msgid "Transport operation not possible: %(msg)s %(orig_error)s"
5428
msgstr ""
5429
5430
#: bzrlib/errors.py:1630
5431
msgid "Connection error: %(msg)s %(orig_error)s"
5432
msgstr ""
5433
5434
#: bzrlib/errors.py:1635
5435
msgid "%(msg)s %(host)s%(port)s%(orig_error)s"
5436
msgstr ""
5437
5438
#: bzrlib/errors.py:1656
5439
msgid "Connection closed: %(msg)s %(orig_error)s"
5440
msgstr ""
5441
5442
#: bzrlib/errors.py:1661
5443
msgid "Connection Timeout: %(msg)s%(orig_error)s"
5444
msgstr ""
5445
5446
#: bzrlib/errors.py:1666
5447
msgid "Invalid range access in %(path)s at %(offset)s: %(msg)s"
5448
msgstr ""
5449
5450
#: bzrlib/errors.py:1676
5451
msgid "Invalid http response for %(path)s: %(msg)s%(orig_error)s"
5452
msgstr ""
5453
5454
#: bzrlib/errors.py:1691
5455
msgid "Certificate error: %(error)s"
5456
msgstr ""
5457
5458
#: bzrlib/errors.py:1699
5459
msgid "Invalid http range %(range)r for %(path)s: %(msg)s"
5460
msgstr ""
5461
5462
#: bzrlib/errors.py:1713
5463
msgid "HTTP MIME Boundary missing for %(path)s: %(msg)s"
5464
msgstr ""
5465
5466
#: bzrlib/errors.py:1721
5467
msgid "Invalid http Content-type \"%(ctype)s\" for %(path)s: %(msg)s"
5468
msgstr ""
5469
5470
#: bzrlib/errors.py:1730
5471
msgid "%(source)s is%(permanently)s redirected to %(target)s"
5472
msgstr ""
5473
5474
#: bzrlib/errors.py:1744
5475
msgid "Too many redirections"
5476
msgstr ""
5477
5478
#: bzrlib/errors.py:1749
5479
msgid "Working tree has conflicts."
5480
msgstr ""
5481
5482
#: bzrlib/errors.py:1753
5483
msgid "Config file %(filename)s is not UTF-8 encoded\n"
5484
msgstr ""
5485
5486
#: bzrlib/errors.py:1762
5487
msgid ""
5488
"Error(s) parsing config file %(filename)s:\n"
5489
"%(errors)s"
5490
msgstr ""
5491
5492
#: bzrlib/errors.py:1772
5493
msgid ""
5494
"Bad value \"%(value)s\" for option \"%(name)s\".\n"
5495
"See ``bzr help %(name)s``"
5496
msgstr ""
5497
5498
#: bzrlib/errors.py:1782
5499
msgid "%(username)r does not seem to contain a reasonable email address"
5500
msgstr ""
5501
5502
#: bzrlib/errors.py:1791
5503
msgid "Failed to GPG sign data with command \"%(command_line)s\""
5504
msgstr ""
5505
5506
#: bzrlib/errors.py:1799
5507
msgid "Failed to verify GPG signature data with error \"%(error)s\""
5508
msgstr ""
5509
5510
#: bzrlib/errors.py:1807
5511
msgid "Unable to import library \"%(library)s\": %(error)s"
5512
msgstr ""
5513
5514
#: bzrlib/errors.py:1815
5515
msgid "python-gpgme is not installed, it is needed to verify signatures"
5516
msgstr ""
5517
5518
#: bzrlib/errors.py:1823
5519
msgid ""
5520
"The working tree for %(basedir)s has changed since the last commit, but "
5521
"weave merge requires that it be unchanged"
5522
msgstr ""
5523
5524
#: bzrlib/errors.py:1833
5525
msgid ""
5526
"Can't reprocess and show base, because reprocessing obscures the "
5527
"relationship of conflicting lines to the base"
5528
msgstr ""
5529
5530
#: bzrlib/errors.py:1839
5531
msgid "Cycle in graph %(graph)r"
5532
msgstr ""
5533
5534
#: bzrlib/errors.py:1867
5535
msgid "File %(filename)s is not conflicted."
5536
msgstr ""
5537
5538
#: bzrlib/errors.py:1889
5539
msgid "No bundle was found in \"%(filename)s\"."
5540
msgstr ""
5541
5542
#: bzrlib/errors.py:1898
5543
msgid "Unable to handle bundle version %(version)s: %(msg)s"
5544
msgstr ""
5545
5546
#: bzrlib/errors.py:1908
5547
msgid "Branch %(base)s is missing revision %(text_revision)s of %(file_id)s"
5548
msgstr ""
5549
5550
#: bzrlib/errors.py:1921
5551
msgid "File id {%(file_id)s} already exists in inventory as %(entry)s"
5552
msgstr ""
5553
5554
#: bzrlib/errors.py:1931
5555
msgid "Key %(key)s is already present in map"
5556
msgstr ""
5557
5558
#: bzrlib/errors.py:1936
5559
msgid "The prefix %(prefix)s is in the help search path twice."
5560
msgstr ""
5561
5562
#: bzrlib/errors.py:1946
5563
msgid ""
5564
"No final name for trans_id %(trans_id)r\n"
5565
"file-id: %(file_id)r\n"
5566
"root trans-id: %(root_trans_id)r\n"
5567
msgstr ""
5568
5569
#: bzrlib/errors.py:1978
5570
msgid "Attempt to reuse a transform that has already been applied."
5571
msgstr ""
5572
5573
#: bzrlib/errors.py:1983
5574
msgid "Moving the root directory is not supported at this time"
5575
msgstr ""
5576
5577
#: bzrlib/errors.py:1988
5578
msgid "Failed to rename %(from_path)s to %(to_path)s: %(why)s"
5579
msgstr ""
5580
5581
#: bzrlib/errors.py:1999
5582
msgid ""
5583
"Could not move %(from_path)s%(operator)s %(to_path)s%(_has_extra)s%(extra)s"
5584
msgstr ""
5585
5586
#: bzrlib/errors.py:2035
5587
msgid ""
5588
"Could not rename %(from_path)s%(operator)s %(to_path)s%(_has_extra)s%(extra)s"
5589
msgstr ""
5590
5591
#: bzrlib/errors.py:2065
5592
msgid "Unable to import paramiko (required for sftp support): %(error)s"
5593
msgstr ""
5594
5595
#: bzrlib/errors.py:2073
5596
msgid "Nothing to merge."
5597
msgstr ""
5598
5599
#: bzrlib/errors.py:2078
5600
msgid "Format %(format)s cannot be initialised by this version of bzr."
5601
msgstr ""
5602
5603
#: bzrlib/errors.py:2087
5604
msgid ""
5605
"Cannot convert from format %(from_format)s to format %(format)s. "
5606
"%(problem)s"
5607
msgstr ""
5608
5609
#: bzrlib/errors.py:2099
5610
msgid "Could not find an appropriate Differ for file \"%(path)s\""
5611
msgstr ""
5612
5613
#: bzrlib/errors.py:2107
5614
msgid "%(exe_name)s could not be found on this machine"
5615
msgstr ""
5616
5617
#: bzrlib/errors.py:2115
5618
msgid "Diff is not installed on this machine: %(msg)s"
5619
msgstr ""
5620
5621
#: bzrlib/errors.py:2123
5622
msgid "Diff3 is not installed on this machine."
5623
msgstr ""
5624
5625
#: bzrlib/errors.py:2129
5626
msgid "The content being inserted is already present."
5627
msgstr ""
5628
5629
#: bzrlib/errors.py:2134
5630
msgid ""
5631
"This tree contains left-over files from a failed operation.\n"
5632
" Please examine %(limbo_dir)s to see if it contains any files you wish "
5633
"to\n"
5634
" keep, and delete it when you are done."
5635
msgstr ""
5636
5637
#: bzrlib/errors.py:2145
5638
msgid ""
5639
"This tree contains left-over files from a failed operation.\n"
5640
" Please examine %(pending_deletion)s to see if it contains any files you\n"
5641
" wish to keep, and delete it when you are done."
5642
msgstr ""
5643
5644
#: bzrlib/errors.py:2155
5645
msgid ""
5646
"Unable to delete transform temporary directory %(limbo_dir)s.\n"
5647
" Please examine %(limbo_dir)s to see if it contains any files you wish "
5648
"to\n"
5649
" keep, and delete it when you are done."
5650
msgstr ""
5651
5652
#: bzrlib/errors.py:2166
5653
msgid ""
5654
"Unable to delete transform temporary directory %(pending_deletion)s. Please "
5655
"examine %(pending_deletion)s to see if it contains any files you wish to "
5656
"keep, and delete it when you are done."
5657
msgstr ""
5658
5659
#: bzrlib/errors.py:2176
5660
msgid "Working tree is out of date, please run 'bzr update'.%(more)s"
5661
msgstr ""
5662
5663
#: bzrlib/errors.py:2190
5664
msgid ""
5665
"Public branch \"%(public_location)s\" lacks revision \"%(revstring)s\"."
5666
msgstr ""
5667
5668
#: bzrlib/errors.py:2203
5669
msgid "Error in merge modified format"
5670
msgstr ""
5671
5672
#: bzrlib/errors.py:2208
5673
msgid "Format error in conflict listings"
5674
msgstr ""
5675
5676
#: bzrlib/errors.py:2212
5677
msgid ""
5678
"Inconsistency in dirstate file %(dirstate_path)s.\n"
5679
"Error: %(description)s"
5680
msgstr ""
5681
5682
#: bzrlib/errors.py:2223
5683
msgid ""
5684
"An error has been detected in the repository %(repo_path)s.\n"
5685
"Please run bzr reconcile on this repository."
5686
msgstr ""
5687
5688
#: bzrlib/errors.py:2234
5689
msgid ""
5690
"An inconsistent delta was supplied involving %(path)r, %(file_id)r\n"
5691
"reason: %(reason)s"
5692
msgstr ""
5693
5694
#: bzrlib/errors.py:2247
5695
msgid ""
5696
"An inconsistent delta was supplied: %(delta)r\n"
5697
"reason: %(reason)s"
5698
msgstr ""
5699
5700
#: bzrlib/errors.py:2259
5701
msgid "To use this feature you must upgrade your branch at %(path)s."
5702
msgstr ""
5703
5704
#: bzrlib/errors.py:2268
5705
msgid "To use this feature you must upgrade your repository at %(path)s."
5706
msgstr ""
5707
5708
#: bzrlib/errors.py:2273
5709
msgid ""
5710
"To use this feature you must upgrade your branch at %(path)s to a format "
5711
"which supports rich roots."
5712
msgstr ""
5713
5714
#: bzrlib/errors.py:2279
5715
msgid "Cannot perform local-only commits on unbound branches."
5716
msgstr ""
5717
5718
#: bzrlib/errors.py:2284
5719
msgid "The method %(mname)s is not supported on objects of type %(tname)s."
5720
msgstr ""
5721
5722
#: bzrlib/errors.py:2305
5723
msgid "Ghost tags not supported by format %(format)r."
5724
msgstr ""
5725
5726
#: bzrlib/errors.py:2313
5727
msgid "File is binary but should be text."
5728
msgstr ""
5729
5730
#: bzrlib/errors.py:2318
5731
msgid "The path %(path)s is not permitted on this platform"
5732
msgstr ""
5733
5734
#: bzrlib/errors.py:2327
5735
msgid ""
5736
"Testament did not match expected value.\n"
5737
" For revision_id {%(revision_id)s}, expected {%(expected)s}, measured\n"
5738
" {%(measured)s}"
5739
msgstr ""
5740
5741
#: bzrlib/errors.py:2339
5742
msgid "Not a bzr revision-bundle: %(text)r"
5743
msgstr ""
5744
5745
#: bzrlib/errors.py:2348
5746
msgid "Bad bzr revision-bundle: %(text)r"
5747
msgstr ""
5748
5749
#: bzrlib/errors.py:2357
5750
msgid "Malformed bzr revision-bundle header: %(text)r"
5751
msgstr ""
5752
5753
#: bzrlib/errors.py:2362
5754
msgid "Malformed patches in bzr revision-bundle: %(text)r"
5755
msgstr ""
5756
5757
#: bzrlib/errors.py:2367
5758
msgid "Malformed footer in bzr revision-bundle: %(text)r"
5759
msgstr ""
5760
5761
#: bzrlib/errors.py:2372
5762
msgid "End of line marker was not \\n in bzr revision-bundle"
5763
msgstr ""
5764
5765
#: bzrlib/errors.py:2382
5766
msgid "Bundle format %(bundle_format)s is incompatible with %(other)s"
5767
msgstr ""
5768
5769
#: bzrlib/errors.py:2392
5770
msgid "Root class for inventory serialization errors"
5771
msgstr ""
5772
5773
#: bzrlib/errors.py:2396
5774
msgid ""
5775
"The inventory was not in the expected format:\n"
5776
" %(msg)s"
5777
msgstr ""
5778
5779
#: bzrlib/errors.py:2405
5780
msgid "This operation requires rich root data storage"
5781
msgstr ""
5782
5783
#: bzrlib/errors.py:2418
5784
msgid "Unrecognised value for BZR_SSH environment variable: %(vendor)s"
5785
msgstr ""
5786
5787
#: bzrlib/errors.py:2427
5788
msgid ""
5789
"Don't know how to handle SSH connections. Please set BZR_SSH environment "
5790
"variable."
5791
msgstr ""
5792
5793
#: bzrlib/errors.py:2434
5794
msgid ""
5795
"Could not determine revno for {%(revision_id)s} because its ancestry shows a "
5796
"ghost at {%(ghost_revision_id)s}"
5797
msgstr ""
5798
5799
#: bzrlib/errors.py:2444
5800
msgid "Ghost revision {%(revision_id)s} cannot be used here."
5801
msgstr ""
5802
5803
#: bzrlib/errors.py:2495
5804
msgid ""
5805
"A merge directive must provide either a bundle or a public branch location."
5806
msgstr ""
5807
5808
#: bzrlib/errors.py:2502
5809
msgid "Bad merge directive payload %(start)r"
5810
msgstr ""
5811
5812
#: bzrlib/errors.py:2512
5813
msgid "Preview patch does not match requested changes."
5814
msgstr ""
5815
5816
#: bzrlib/errors.py:2518
5817
msgid "Patch_type was %(patch_type)s, but no patch was supplied."
5818
msgstr ""
5819
5820
#: bzrlib/errors.py:2528
5821
msgid ""
5822
"Your branch does not have all of the revisions required in order to merge "
5823
"this merge directive and the target location specified in the merge "
5824
"directive is not a branch: %(location)s."
5825
msgstr ""
5826
5827
#: bzrlib/errors.py:2540
5828
msgid "Unsupported entry kind %(kind)s"
5829
msgstr ""
5830
5831
#: bzrlib/errors.py:2548
5832
msgid "Can't subsume %(other_tree)s into %(tree)s. %(reason)s"
5833
msgstr ""
5834
5835
#: bzrlib/errors.py:2558
5836
msgid "Subsume target %(other_tree)s needs to be upgraded."
5837
msgstr ""
5838
5839
#: bzrlib/errors.py:2577
5840
msgid "No such tag: %(tag_name)s"
5841
msgstr ""
5842
5843
#: bzrlib/errors.py:2585
5844
msgid "Tags not supported by %(branch)s; you may be able to use bzr upgrade."
5845
msgstr ""
5846
5847
#: bzrlib/errors.py:2594
5848
msgid "Tag %(tag_name)s already exists."
5849
msgstr ""
5850
5851
#: bzrlib/errors.py:2602
5852
msgid ""
5853
"Did not understand bug identifier %(bug_id)s: %(reason)s. See \"bzr help "
5854
"bugs\" for more information on this feature."
5855
msgstr ""
5856
5857
#: bzrlib/errors.py:2612
5858
msgid ""
5859
"The URL for bug tracker \"%(abbreviation)s\" doesn't contain {id}: %(url)s"
5860
msgstr ""
5861
5862
#: bzrlib/errors.py:2622
5863
msgid ""
5864
"Cannot find registered bug tracker called %(abbreviation)s on %(branch)s"
5865
msgstr ""
5866
5867
#: bzrlib/errors.py:2632
5868
msgid "Invalid line in bugs property: '%(line)s'"
5869
msgstr ""
5870
5871
#: bzrlib/errors.py:2640
5872
msgid "Invalid bug status: '%(status)s'"
5873
msgstr ""
5874
5875
#: bzrlib/errors.py:2648
5876
msgid "Could not understand response from smart server: %(response_tuple)r"
5877
msgstr ""
5878
5879
#: bzrlib/errors.py:2687
5880
msgid "Server sent an unexpected error: %(error_tuple)r"
5881
msgstr ""
5882
5883
#: bzrlib/errors.py:2706
5884
msgid "Unrecognised container format: %(container_format)r"
5885
msgstr ""
5886
5887
#: bzrlib/errors.py:2714
5888
msgid "Unexpected end of container stream"
5889
msgstr ""
5890
5891
#: bzrlib/errors.py:2719
5892
msgid "Unknown record type: %(record_type)r"
5893
msgstr ""
5894
5895
#: bzrlib/errors.py:2727
5896
msgid "Invalid record: %(reason)s"
5897
msgstr ""
5898
5899
#: bzrlib/errors.py:2735
5900
msgid "Container has data after end marker: %(excess)r"
5901
msgstr ""
5902
5903
#: bzrlib/errors.py:2743
5904
msgid "Container has multiple records with the same name: %(name)s"
5905
msgstr ""
5906
5907
#: bzrlib/errors.py:2756
5908
msgid "Corrupt or incompatible data stream: %(reason)s"
5909
msgstr ""
5910
5911
#: bzrlib/errors.py:2764
5912
msgid "SMTP error: %(error)s"
5913
msgstr ""
5914
5915
#: bzrlib/errors.py:2772
5916
msgid "No message supplied."
5917
msgstr ""
5918
5919
#: bzrlib/errors.py:2777
5920
msgid "No mail-to address (--mail-to) or output (-o) specified."
5921
msgstr ""
5922
5923
#: bzrlib/errors.py:2782
5924
msgid ""
5925
"Unable to find mail client with the following names: "
5926
"%(mail_command_list_string)s"
5927
msgstr ""
5928
5929
#: bzrlib/errors.py:2792
5930
msgid "SMTP connection to %(host)s refused"
5931
msgstr ""
5932
5933
#: bzrlib/errors.py:2801
5934
msgid "Please specify smtp_server. No server at default %(host)s."
5935
msgstr ""
5936
5937
#: bzrlib/errors.py:2815
5938
msgid ""
5939
"'%(display_url)s' is not in sync with %(target_url)s. See bzr help sync-for-"
5940
"reconfigure."
5941
msgstr ""
5942
5943
#: bzrlib/errors.py:2827
5944
msgid "'%(display_url)s' is already a branch."
5945
msgstr ""
5946
5947
#: bzrlib/errors.py:2832
5948
msgid "'%(display_url)s' is already a tree."
5949
msgstr ""
5950
5951
#: bzrlib/errors.py:2837
5952
msgid "'%(display_url)s' is already a checkout."
5953
msgstr ""
5954
5955
#: bzrlib/errors.py:2842
5956
msgid "'%(display_url)s' is already a lightweight checkout."
5957
msgstr ""
5958
5959
#: bzrlib/errors.py:2847
5960
msgid "'%(display_url)s' is already using a shared repository."
5961
msgstr ""
5962
5963
#: bzrlib/errors.py:2852
5964
msgid "'%(display_url)s' is already standalone."
5965
msgstr ""
5966
5967
#: bzrlib/errors.py:2857
5968
msgid "Shared repository '%(display_url)s' already creates working trees."
5969
msgstr ""
5970
5971
#: bzrlib/errors.py:2863
5972
msgid ""
5973
"Shared repository '%(display_url)s' already doesn't create working trees."
5974
msgstr ""
5975
5976
#: bzrlib/errors.py:2869
5977
msgid "Requested reconfiguration of '%(display_url)s' is not supported."
5978
msgstr ""
5979
5980
#: bzrlib/errors.py:2874
5981
msgid "No location could be found to bind to at %(display_url)s."
5982
msgstr ""
5983
5984
#: bzrlib/errors.py:2879
5985
msgid ""
5986
"Working tree \"%(display_url)s\" has uncommitted changes (See bzr "
5987
"status).%(more)s"
5988
msgstr ""
5989
5990
#: bzrlib/errors.py:2898
5991
msgid ""
5992
"Working tree \"%(display_url)s\" has shelved changes (See bzr shelve --"
5993
"list).%(more)s"
5994
msgstr ""
5995
5996
#: bzrlib/errors.py:2904
5997
msgid "Variable {%(name)s} is not available."
5998
msgstr ""
5999
6000
#: bzrlib/errors.py:2912
6001
msgid "No template specified."
6002
msgstr ""
6003
6004
#: bzrlib/errors.py:2917
6005
msgid "Unable to create symlink %(path_str)son this platform"
6006
msgstr ""
6007
6008
#: bzrlib/errors.py:2932
6009
msgid ""
6010
"Unsupported timezone format \"%(timezone)s\", options are \"utc\", "
6011
"\"original\", \"local\"."
6012
msgstr ""
6013
6014
#: bzrlib/errors.py:2966
6015
msgid ""
6016
"Unable to encode %(kind)s path %(path)r in user encoding %(user_encoding)s"
6017
msgstr ""
6018
6019
#: bzrlib/errors.py:2978
6020
msgid "The \"%(config_id)s\" configuration does not exist."
6021
msgstr ""
6022
6023
#: bzrlib/errors.py:2986
6024
msgid "The \"%(option_name)s\" configuration option does not exist."
6025
msgstr ""
6026
6027
#: bzrlib/errors.py:2994
6028
msgid "The alias \"%(alias_name)s\" does not exist."
6029
msgstr ""
6030
6031
#: bzrlib/errors.py:3008
6032
msgid "\"%(alias_name)s\" is not a valid location alias."
6033
msgstr ""
6034
6035
#: bzrlib/errors.py:3016
6036
msgid "No %(alias_name)s location assigned."
6037
msgstr ""
6038
6039
#: bzrlib/errors.py:3024
6040
msgid "Cannot bind address \"%(host)s:%(port)i\": %(orig_error)s."
6041
msgstr ""
6042
6043
#: bzrlib/errors.py:3034
6044
msgid "Unknown rules detected: %(unknowns_str)s."
6045
msgstr ""
6046
6047
#: bzrlib/errors.py:3045
6048
msgid "Tip change rejected: %(msg)s"
6049
msgstr ""
6050
6051
#: bzrlib/errors.py:3053
6052
msgid "Shelf corrupt."
6053
msgstr ""
6054
6055
#: bzrlib/errors.py:3058
6056
msgid "Corruption while decompressing repository file%(orig_error)s"
6057
msgstr ""
6058
6059
#: bzrlib/errors.py:3070
6060
msgid "No changes are shelved with id \"%(shelf_id)d\"."
6061
msgstr ""
6062
6063
#: bzrlib/errors.py:3078
6064
msgid "\"%(invalid_id)s\" is not a valid shelf id, try a number instead."
6065
msgstr ""
6066
6067
#: bzrlib/errors.py:3086
6068
msgid ""
6069
"An attempt to access a url outside the server jail was made: '%(url)s'."
6070
msgstr ""
6071
6072
#: bzrlib/errors.py:3094
6073
msgid "The user aborted the operation."
6074
msgstr ""
6075
6076
#: bzrlib/errors.py:3099
6077
msgid "Branching '%(url)s'(%(format)s) must create a working tree."
6078
msgstr ""
6079
6080
#: bzrlib/errors.py:3109
6081
msgid "No such view: %(view_name)s."
6082
msgstr ""
6083
6084
#: bzrlib/errors.py:3119
6085
msgid ""
6086
"Views are not supported by %(tree)s; use 'bzr upgrade' to change your tree "
6087
"to a later format."
6088
msgstr ""
6089
6090
#: bzrlib/errors.py:3128
6091
msgid ""
6092
"Specified file \"%(file_name)s\" is outside the current view: %(view_str)s"
6093
msgstr ""
6094
6095
#: bzrlib/errors.py:3195
6096
msgid "%(bzrdir)r does not support co-located branches."
6097
msgstr ""
6098
6099
#: bzrlib/errors.py:3201
6100
msgid ""
6101
"Unable to determine your name.\n"
6102
"Please, set your name with the 'whoami' command.\n"
6103
"E.g. bzr whoami \"Your Name <name@example.com>\""
6104
msgstr ""
6105
6106
#: bzrlib/errors.py:3210
6107
msgid "Invalid pattern(s) found. %(msg)s"
6108
msgstr ""
6109
6110
#: bzrlib/errors.py:3218
6111
msgid ""
6112
"Branch \"%(branch_url)s\" appears to be bound to itself. Please use `bzr "
6113
"unbind` to fix."
6114
msgstr ""
6115
6116
#: bzrlib/errors.py:3229
6117
msgid "Loop involving %(refs)r while expanding \"%(string)s\"."
6118
msgstr ""
6119
6120
#: bzrlib/errors.py:3238
6121
msgid "Option %(name)s is not defined while expanding \"%(string)s\"."
6122
msgstr ""
6123
6124
#: bzrlib/errors.py:3247
6125
msgid ""
6126
"No compatible object available for operations from %(source)r to %(target)r."
6127
msgstr ""
6128
6129
#: bzrlib/errors.py:3257
6130
msgid ""
6131
"VFS requests over the smart server are not allowed. Encountered: %(method)s, "
6132
"%(arguments)s."
6133
msgstr ""
6134
6135
#: bzrlib/errors.py:3267
6136
msgid ""
6137
"Kind change from %(from_kind)s to %(to_kind)s for %(path)s not supported by "
6138
"format %(format)r"
6139
msgstr ""
6140
6141
#: bzrlib/errors.py:3279
6142
msgid ""
6143
"Missing feature %(feature)s not provided by this version of Bazaar or any "
6144
"plugin."
6145
msgstr ""
6146
6147
#: bzrlib/errors.py:3292
6148
msgid "Binary files section encountered."
6149
msgstr ""
6150
6151
#: bzrlib/errors.py:3300
6152
msgid ""
6153
"Malformed patch header. %(desc)s\n"
6154
"%(line)r"
6155
msgstr ""
6156
6157
#: bzrlib/errors.py:3309
6158
msgid ""
6159
"Malformed hunk header. %(desc)s\n"
6160
"%(line)r"
6161
msgstr ""
6162
6163
#: bzrlib/errors.py:3318
6164
msgid ""
6165
"Malformed line. %(desc)s\n"
6166
"%(line)r"
6167
msgstr ""
6168
6169
#: bzrlib/errors.py:3328
6170
msgid ""
6171
"Text contents mismatch at line %(line_no)d. Original has \"%(orig_line)s\", "
6172
"but patch says it should be \"%(patch_line)s\""
6173
msgstr ""
6174
6175
#: bzrlib/errors.py:3339
6176
msgid "The feature %(feature)s has already been registered."
6177
msgstr ""
6178
6179
#: bzrlib/export_pot.py:252
6180
#, python-format
6181
msgid "Exporting messages from builtin command: %s"
6182
msgstr ""
6183
6184
#: bzrlib/export_pot.py:271
6185
msgid "Exporting messages from plugin command: {0} in {1}"
6186
msgstr ""
6187
6188
#: bzrlib/export_pot.py:292
6189
#, python-format
6190
msgid "Exporting message from error: %s"
6191
msgstr ""
6192
6193
#: bzrlib/fetch.py:98
6194
msgid "Finding revisions"
6195
msgstr ""
6196
6197
#: bzrlib/fetch.py:103
6198
msgid "Fetching revisions"
6199
msgstr ""
6200
6201
#: bzrlib/foreign.py:262
6202
msgid "Push into a different VCS without any custom bzr metadata."
6203
msgstr ""
6204
6205
#: bzrlib/foreign.py:264
6206
msgid ""
6207
"This will afterwards rebase the local branch on the remote\n"
6208
"branch unless the --no-rebase option is used, in which case \n"
6209
"the two branches will be out of sync after the push. "
6210
msgstr ""
6211
6212
#: bzrlib/foreign.py:277
6213
msgid "Do not rebase after push."
6214
msgstr ""
6215
6216
#: bzrlib/foreign.py:311
6217
#, python-format
6218
msgid "Using saved location: %s\n"
6219
msgstr ""
6220
6221
#: bzrlib/foreign.py:321
6222
msgid ""
6223
"{0!r} and {1!r} are in the same VCS, lossy push not necessary. Please use "
6224
"regular push."
6225
msgstr ""
6226
6227
#: bzrlib/gpg.py:366
6228
msgid "No GnuPG key results for pattern: {0}"
6229
msgstr ""
6230
6231
#: bzrlib/gpg.py:439
6232
msgid "{0} commits with valid signatures"
6233
msgstr ""
6234
6235
#: bzrlib/gpg.py:445
6236
msgid "{0} commit with unknown key"
6237
msgid_plural "{0} commits with unknown keys"
6238
msgstr[0] ""
6239
msgstr[1] ""
6240
6241
#: bzrlib/gpg.py:453
6242
msgid "{0} commit not valid"
6243
msgid_plural "{0} commits not valid"
6244
msgstr[0] ""
6245
msgstr[1] ""
6246
6247
#: bzrlib/gpg.py:461
6248
msgid "{0} commit not signed"
6249
msgid_plural "{0} commits not signed"
6250
msgstr[0] ""
6251
msgstr[1] ""
6252
6253
#: bzrlib/gpg.py:469
6254
msgid "{0} commit with key now expired"
6255
msgid_plural "{0} commits with key now expired"
6256
msgstr[0] ""
6257
msgstr[1] ""
6258
6259
#: bzrlib/gpg.py:489
6260
msgid "{0} commit by author {1} with key {2} now expired"
6261
msgid_plural "{0} commits by author {1} with key {2} now expired"
6262
msgstr[0] ""
6263
msgstr[1] ""
6264
6265
#: bzrlib/gpg.py:505
6266
msgid "{0} signed {1} commit"
6267
msgid_plural "{0} signed {1} commits"
6268
msgstr[0] ""
6269
msgstr[1] ""
6270
6271
#: bzrlib/gpg.py:522 bzrlib/gpg.py:539
6272
msgid "{0} commit by author {1}"
6273
msgid_plural "{0} commits by author {1}"
6274
msgstr[0] ""
6275
msgstr[1] ""
6276
6277
#: bzrlib/gpg.py:554
6278
msgid "Unknown key {0} signed {1} commit"
6279
msgid_plural "Unknown key {0} signed {1} commits"
6280
msgstr[0] ""
6281
msgstr[1] ""
6282
6283
#: bzrlib/groupcompress.py:1739
6284
#, python-format
6285
msgid "Insert claimed random_id=True, but then inserted %r two times"
6286
msgstr ""
6287
6288
#: bzrlib/hooks.py:313
6289
#, python-format
6290
msgid "Introduced in: %s"
6291
msgstr ""
6292
6293
#: bzrlib/hooks.py:316
6294
#, python-format
6295
msgid "Deprecated in: %s"
6296
msgstr ""
6297
6298
#: bzrlib/knit.py:1766 bzrlib/knit.py:1802
6299
msgid "Walking content"
6300
msgstr ""
6301
6302
#: bzrlib/knit.py:3330
6303
msgid "annotating"
6304
msgstr ""
6305
6306
#: bzrlib/lock.py:548
6307
msgid "{0!r} was {1} locked again"
6308
msgstr ""
6309
6310
#: bzrlib/lockdir.py:321
6311
#, python-format
6312
msgid "error removing pending lock: %s"
6313
msgstr ""
6314
6315
#: bzrlib/lockdir.py:616
6316
msgid "Unable to obtain"
6317
msgstr ""
6318
6319
#: bzrlib/lockdir.py:618
6320
msgid "Lock owner changed for"
6321
msgstr ""
6322
6323
#: bzrlib/lockdir.py:620
6324
msgid "{0} lock {1} {2}."
6325
msgstr ""
6326
6327
#: bzrlib/lockdir.py:627
6328
#, python-format
6329
msgid "Will continue to try until %s, unless you press Ctrl-C."
6330
msgstr ""
6331
6332
#: bzrlib/lockdir.py:629
6333
msgid "See \"bzr help break-lock\" for more."
6334
msgstr ""
6335
6336
#: bzrlib/lockdir.py:739
6337
#, python-format
6338
msgid ""
6339
"held by %(user)s on %(hostname)s (process #%(pid)s), acquired %(time_ago)s"
6340
msgstr ""
6341
6342
#: bzrlib/log.py:563
6343
msgid "--exclude-common-ancestry requires two different revisions"
6344
msgstr ""
6345
6346
#: bzrlib/log.py:565
6347
#, python-format
6348
msgid "invalid direction %r"
6349
msgstr ""
6350
6351
#: bzrlib/log.py:653
6352
msgid "Start revision not found in history of end revision."
6353
msgstr ""
6354
6355
#: bzrlib/log.py:1071 bzrlib/log.py:1129
6356
msgid "Logging revision 0 is invalid."
6357
msgstr ""
6358
6359
#: bzrlib/log.py:1073 bzrlib/log.py:1131
6360
msgid "Start revision must be older than the end revision."
6361
msgstr ""
6362
6363
#: bzrlib/log.py:1818
6364
#, python-format
6365
msgid "unknown log formatter: %r"
6366
msgstr ""
6367
6368
#: bzrlib/log.py:2114
6369
msgid "fixes bug"
6370
msgid_plural "fixes bugs"
6371
msgstr[0] ""
6372
msgstr[1] ""
6373
6374
#: bzrlib/merge.py:689
6375
msgid "All changes applied successfully."
6376
msgstr ""
6377
6378
#: bzrlib/merge.py:691
6379
#, python-format
6380
msgid "%d conflicts encountered."
6381
msgstr ""
6382
6383
#: bzrlib/merge.py:845 bzrlib/merge.py:1868
6384
msgid "Preparing file merge"
6385
msgstr ""
6386
6387
#: bzrlib/multiparent.py:426
6388
msgid "Importing revisions"
6389
msgstr ""
6390
6391
#: bzrlib/option.py:526
6392
msgid "Show help message."
6393
msgstr ""
6394
6395
#: bzrlib/option.py:528
6396
msgid "Only display errors and warnings."
6397
msgstr ""
6398
6399
#: bzrlib/option.py:531
6400
msgid "Show usage message and options."
6401
msgstr ""
6402
6403
#: bzrlib/option.py:533
6404
msgid "Display more information."
6405
msgstr ""
6406
6407
#: bzrlib/option.py:541
6408
msgid ""
6409
"Select changes introduced by the specified revision. See also \"help "
6410
"revisionspec\"."
6411
msgstr ""
6412
6413
#: bzrlib/option.py:543
6414
msgid "Branch to operate on, instead of working directory."
6415
msgstr ""
6416
6417
#: bzrlib/option.py:545
6418
msgid "Detailed log format."
6419
msgstr ""
6420
6421
#: bzrlib/option.py:545
6422
msgid "Format used by GNU ChangeLog files."
6423
msgstr ""
6424
6425
#: bzrlib/option.py:545
6426
msgid "Log format with one line per revision."
6427
msgstr ""
6428
6429
#: bzrlib/option.py:545
6430
msgid "Moderately short log format."
6431
msgstr ""
6432
6433
#: bzrlib/option.py:545
6434
msgid "Use specified log format."
6435
msgstr ""
6436
6437
#: bzrlib/option.py:547
6438
msgid "Log format"
6439
msgstr ""
6440
6441
#: bzrlib/option.py:549
6442
msgid "LCA-newness merge."
6443
msgstr ""
6444
6445
#: bzrlib/option.py:549
6446
msgid "Merge using external diff3."
6447
msgstr ""
6448
6449
#: bzrlib/option.py:549
6450
msgid "Native diff3-style merge."
6451
msgstr ""
6452
6453
#: bzrlib/option.py:549
6454
msgid "Select a particular merge algorithm."
6455
msgstr ""
6456
6457
#: bzrlib/option.py:549
6458
msgid "Weave-based merge."
6459
msgstr ""
6460
6461
#: bzrlib/option.py:551
6462
msgid "Merge algorithm"
6463
msgstr ""
6464
6465
#: bzrlib/option.py:554
6466
msgid "Message string."
6467
msgstr ""
6468
6469
#: bzrlib/option.py:556
6470
msgid "Use an ASCII NUL (\\0) separator rather than a newline."
6471
msgstr ""
6472
6473
#: bzrlib/option.py:558
6474
msgid "Ignore differences between branches and overwrite unconditionally."
6475
msgstr ""
6476
6477
#: bzrlib/option.py:560
6478
msgid "Remember the specified location as a default."
6479
msgstr ""
6480
6481
#: bzrlib/option.py:562
6482
msgid "Reprocess to reduce spurious conflicts."
6483
msgstr ""
6484
6485
#: bzrlib/option.py:566
6486
msgid "See \"help revisionspec\" for details."
6487
msgstr ""
6488
6489
#: bzrlib/option.py:568
6490
msgid "Show internal object ids."
6491
msgstr ""
6492
6493
#: bzrlib/option.py:571
6494
msgid "Display timezone as local, original, or utc."
6495
msgstr ""
6496
6497
#: bzrlib/osutils.py:100
6498
msgid "Parameter {0!r} encoding is unsupported by {1} application locale."
6499
msgstr ""
6500
6501
#: bzrlib/osutils.py:220
6502
msgid "lstat/stat of ({0!r}): {1!r}"
6503
msgstr ""
6504
6505
#: bzrlib/osutils.py:1030 bzrlib/osutils.py:1041
6506
#, python-format
6507
msgid "sorry, %r not allowed in path"
6508
msgstr ""
6509
6510
#: bzrlib/osutils.py:1259
6511
#, python-format
6512
msgid "%r is too short to calculate a relative path"
6513
msgstr ""
6514
6515
#: bzrlib/plugin.py:143
6516
#, python-format
6517
msgid "\"%s\" is not a valid <plugin_name>@<plugin_path> description "
6518
msgstr ""
6519
6520
#: bzrlib/plugins/bash_completion/bashcomp.py:411
6521
msgid "Enable completions for the selected plugin (default: all plugins)"
6522
msgstr ""
6523
6524
#: bzrlib/plugins/bash_completion/bashcomp.py:412
6525
msgid "Generate a shell function for bash command line completion."
6526
msgstr ""
6527
6528
#: bzrlib/plugins/bash_completion/bashcomp.py:414
6529
msgid ""
6530
"This command generates a shell function which can be used by bash to\n"
6531
"automatically complete the currently typed command when the user presses\n"
6532
"the completion key (usually tab)."
6533
msgstr ""
6534
6535
#: bzrlib/plugins/bash_completion/bashcomp.py:418
6536
msgid ""
6537
"Commonly used like this:\n"
6538
" eval \"`bzr bash-completion`\""
6539
msgstr ""
6540
6541
#: bzrlib/plugins/bash_completion/bashcomp.py:424
6542
msgid "Name of the generated function (default: _bzr)"
6543
msgstr ""
6544
6545
#: bzrlib/plugins/bash_completion/bashcomp.py:426
6546
msgid "Generate only the shell function, don't enable it"
6547
msgstr ""
6548
6549
#: bzrlib/plugins/launchpad/account.py:66
6550
msgid "Setting ssh/sftp usernames for launchpad.net."
6551
msgstr ""
6552
6553
#: bzrlib/plugins/launchpad/cmds.py:44
6554
msgid "Register a branch with launchpad.net."
6555
msgstr ""
6556
6557
#: bzrlib/plugins/launchpad/cmds.py:46
6558
msgid ""
6559
"This command lists a bzr branch in the directory of branches on\n"
6560
"launchpad.net. Registration allows the branch to be associated with\n"
6561
"bugs or specifications."
6562
msgstr ""
6563
6564
#: bzrlib/plugins/launchpad/cmds.py:50
6565
msgid ""
6566
"Before using this command you must register the project to which the\n"
6567
"branch belongs, and create an account for yourself on launchpad.net."
6568
msgstr ""
6569
6570
#: bzrlib/plugins/launchpad/cmds.py:53
6571
msgid ""
6572
"arguments:\n"
6573
" public_url: The publicly visible url for the branch to register.\n"
6574
" This must be an http or https url (which Launchpad can read\n"
6575
" from to access the branch). Local file urls, SFTP urls, and\n"
6576
" bzr+ssh urls will not work.\n"
6577
" If no public_url is provided, bzr will use the configured\n"
6578
" public_url if there is one for the current branch, and\n"
6579
" otherwise error."
6580
msgstr ""
6581
6582
#: bzrlib/plugins/launchpad/cmds.py:62
6583
msgid ""
6584
"example:\n"
6585
" bzr register-branch http://foo.com/bzr/fooproject.mine \\\n"
6586
" --project fooproject"
6587
msgstr ""
6588
6589
#: bzrlib/plugins/launchpad/cmds.py:69
6590
msgid "Launchpad project short name to associate with the branch."
6591
msgstr ""
6592
6593
#: bzrlib/plugins/launchpad/cmds.py:76
6594
msgid ""
6595
"Short name for the branch; by default taken from the last component of the "
6596
"url."
6597
msgstr ""
6598
6599
#: bzrlib/plugins/launchpad/cmds.py:80
6600
msgid "One-sentence description of the branch."
6601
msgstr ""
6602
6603
#: bzrlib/plugins/launchpad/cmds.py:83
6604
msgid "Longer description of the purpose or contents of the branch."
6605
msgstr ""
6606
6607
#: bzrlib/plugins/launchpad/cmds.py:86
6608
msgid "Branch author's email address, if not yourself."
6609
msgstr ""
6610
6611
#: bzrlib/plugins/launchpad/cmds.py:89
6612
msgid "The bug this branch fixes."
6613
msgstr ""
6614
6615
#: bzrlib/plugins/launchpad/cmds.py:92
6616
msgid "Prepare the request but don't actually send it."
6617
msgstr ""
6618
6619
#: bzrlib/plugins/launchpad/cmds.py:114
6620
msgid ""
6621
"register-branch requires a public branch url - see bzr help register-branch."
6622
msgstr ""
6623
6624
#: bzrlib/plugins/launchpad/cmds.py:122
6625
msgid "--product is deprecated; please use --project."
6626
msgstr ""
6627
6628
#: bzrlib/plugins/launchpad/cmds.py:152
6629
msgid "Open a Launchpad branch page in your web browser."
6630
msgstr ""
6631
6632
#: bzrlib/plugins/launchpad/cmds.py:157
6633
msgid "Do not actually open the browser. Just say the URL we would use."
6634
msgstr ""
6635
6636
#: bzrlib/plugins/launchpad/cmds.py:192
6637
#, python-format
6638
msgid "Opening %s in web browser"
6639
msgstr ""
6640
6641
#: bzrlib/plugins/launchpad/cmds.py:200
6642
msgid "Show or set the Launchpad user ID."
6643
msgstr ""
6644
6645
#: bzrlib/plugins/launchpad/cmds.py:202
6646
msgid ""
6647
"When communicating with Launchpad, some commands need to know your\n"
6648
"Launchpad user ID. This command can be used to set or show the\n"
6649
"user ID that Bazaar will use for such communication."
6650
msgstr ""
6651
6652
#: bzrlib/plugins/launchpad/cmds.py:206
6653
msgid ""
6654
":Examples:\n"
6655
" Show the Launchpad ID of the current user::"
6656
msgstr ""
6657
6658
#: bzrlib/plugins/launchpad/cmds.py:209
6659
msgid " bzr launchpad-login"
6660
msgstr ""
6661
6662
#: bzrlib/plugins/launchpad/cmds.py:211
6663
msgid " Set the Launchpad ID of the current user to 'bob'::"
6664
msgstr ""
6665
6666
#: bzrlib/plugins/launchpad/cmds.py:213
6667
msgid " bzr launchpad-login bob"
6668
msgstr ""
6669
6670
#: bzrlib/plugins/launchpad/cmds.py:220
6671
msgid "Don't check that the user name is valid."
6672
msgstr ""
6673
6674
#: bzrlib/plugins/launchpad/cmds.py:235 bzrlib/plugins/launchpad/cmds.py:246
6675
msgid "Launchpad user ID exists and has SSH keys.\n"
6676
msgstr ""
6677
6678
#: bzrlib/plugins/launchpad/cmds.py:238
6679
msgid "No Launchpad user ID configured.\n"
6680
msgstr ""
6681
6682
#: bzrlib/plugins/launchpad/cmds.py:249
6683
#, python-format
6684
msgid "Launchpad user ID set to '%s'.\n"
6685
msgstr ""
6686
6687
#: bzrlib/plugins/launchpad/cmds.py:255
6688
msgid "Ask Launchpad to mirror a branch now."
6689
msgstr ""
6690
6691
#: bzrlib/plugins/launchpad/cmds.py:272
6692
msgid "Propose merging a branch on Launchpad."
6693
msgstr ""
6694
6695
#: bzrlib/plugins/launchpad/cmds.py:274
6696
msgid ""
6697
"This will open your usual editor to provide the initial comment. When it\n"
6698
"has created the proposal, it will open it in your default web browser."
6699
msgstr ""
6700
6701
#: bzrlib/plugins/launchpad/cmds.py:277
6702
msgid ""
6703
"The branch will be proposed to merge into SUBMIT_BRANCH. If SUBMIT_BRANCH\n"
6704
"is not supplied, the remembered submit branch will be used. If no submit\n"
6705
"branch is remembered, the development focus will be used."
6706
msgstr ""
6707
6708
#: bzrlib/plugins/launchpad/cmds.py:281
6709
msgid ""
6710
"By default, the SUBMIT_BRANCH's review team will be requested to review\n"
6711
"the merge proposal. This can be overriden by specifying --review (-R).\n"
6712
"The parameter the launchpad account name of the desired reviewer. This\n"
6713
"may optionally be followed by '=' and the review type. For example:"
6714
msgstr ""
6715
6716
#: bzrlib/plugins/launchpad/cmds.py:286
6717
msgid " bzr lp-propose-merge --review jrandom --review review-team=qa"
6718
msgstr ""
6719
6720
#: bzrlib/plugins/launchpad/cmds.py:288
6721
msgid ""
6722
"This will propose a merge, request \"jrandom\" to perform a review of\n"
6723
"unspecified type, and request \"review-team\" to perform a \"qa\" review."
6724
msgstr ""
6725
6726
#: bzrlib/plugins/launchpad/cmds.py:293
6727
msgid "Propose the merge on staging."
6728
msgstr ""
6729
6730
#: bzrlib/plugins/launchpad/cmds.py:295
6731
msgid "Commit message."
6732
msgstr ""
6733
6734
#: bzrlib/plugins/launchpad/cmds.py:297
6735
msgid "Mark the proposal as approved immediately."
6736
msgstr ""
6737
6738
#: bzrlib/plugins/launchpad/cmds.py:298
6739
msgid "The bug this proposal fixes."
6740
msgstr ""
6741
6742
#: bzrlib/plugins/launchpad/cmds.py:300
6743
msgid "Requested reviewer and optional type."
6744
msgstr ""
6745
6746
#: bzrlib/plugins/launchpad/cmds.py:335
6747
msgid "Find the proposal to merge this revision."
6748
msgstr ""
6749
6750
#: bzrlib/plugins/launchpad/cmds.py:337
6751
msgid ""
6752
"Finds the merge proposal(s) that discussed landing the specified revision.\n"
6753
"This works only if the selected branch was the merge proposal target, and\n"
6754
"if the merged_revno is recorded for the merge proposal. The proposal(s)\n"
6755
"are opened in a web browser."
6756
msgstr ""
6757
6758
#: bzrlib/plugins/launchpad/cmds.py:342
6759
msgid ""
6760
"Any revision involved in the merge may be specified-- the revision in\n"
6761
"which the merge was performed, or one of the revisions that was merged."
6762
msgstr ""
6763
6764
#: bzrlib/plugins/launchpad/cmds.py:345
6765
msgid "So, to find the merge proposal that reviewed line 1 of README::"
6766
msgstr ""
6767
6768
#: bzrlib/plugins/launchpad/cmds.py:347
6769
msgid " bzr lp-find-proposal -r annotate:README:1"
6770
msgstr ""
6771
6772
#: bzrlib/plugins/launchpad/cmds.py:363
6773
msgid "No review found."
6774
msgstr ""
6775
6776
#: bzrlib/plugins/launchpad/cmds.py:364
6777
#, python-format
6778
msgid "%d proposals(s) found."
6779
msgstr ""
6780
6781
#: bzrlib/plugins/launchpad/cmds.py:374
6782
msgid "Finding revision-id"
6783
msgstr ""
6784
6785
#: bzrlib/plugins/launchpad/cmds.py:381
6786
msgid "Finding merge"
6787
msgstr ""
6788
6789
#: bzrlib/plugins/launchpad/cmds.py:386
6790
msgid "Finding revno"
6791
msgstr ""
6792
6793
#: bzrlib/plugins/launchpad/cmds.py:392
6794
msgid "Finding Launchpad branch"
6795
msgstr ""
6796
6797
#: bzrlib/plugins/launchpad/cmds.py:395
6798
msgid "Finding proposals"
6799
msgstr ""
6800
6801
#: bzrlib/plugins/launchpad/lp_api.py:241
6802
#: bzrlib/plugins/launchpad/lp_api.py:246
6803
#, python-format
6804
msgid "%s is not registered on Launchpad"
6805
msgstr ""
6806
6807
#: bzrlib/plugins/launchpad/lp_api.py:256
6808
#, python-format
6809
msgid "%s has no development focus."
6810
msgstr ""
6811
6812
#: bzrlib/plugins/launchpad/lp_api.py:261
6813
#, python-format
6814
msgid "development focus %s has no branch."
6815
msgstr ""
6816
6817
#: bzrlib/plugins/launchpad/lp_api.py:266
6818
#, python-format
6819
msgid "source package %s has no branch."
6820
msgstr ""
6821
6822
#: bzrlib/plugins/launchpad/lp_api.py:270
6823
#, python-format
6824
msgid "%s has no associated product or source package."
6825
msgstr ""
6826
6827
#: bzrlib/plugins/launchpad/lp_api.py:282
6828
#, python-format
6829
msgid "%s is already up-to-date."
6830
msgstr ""
6831
6832
#: bzrlib/plugins/launchpad/lp_api.py:289
6833
#, python-format
6834
msgid "Pushing to %s"
6835
msgstr ""
6836
6837
#: bzrlib/plugins/launchpad/lp_directory.py:170
6838
msgid ""
6839
"resolution for {0}\n"
6840
" local: {1}\n"
6841
" remote: {2}"
6842
msgstr ""
6843
6844
#: bzrlib/plugins/launchpad/lp_propose.py:150
6845
#, python-format
6846
msgid "There is already a branch merge proposal: %s"
6847
msgstr ""
6848
6849
#: bzrlib/plugins/weave_fmt/bzrdir.py:237
6850
msgid "pb parameter to convert() is deprecated"
6851
msgstr ""
6852
6853
#: bzrlib/plugins/weave_fmt/bzrdir.py:240
6854
msgid "starting upgrade from format 4 to 5"
6855
msgstr ""
6856
6857
#: bzrlib/plugins/weave_fmt/bzrdir.py:250
6858
msgid "note: upgrade may be faster if all store files are ungzipped first"
6859
msgstr ""
6860
6861
#: bzrlib/plugins/weave_fmt/bzrdir.py:279
6862
msgid "converting revision"
6863
msgstr ""
6864
6865
#: bzrlib/plugins/weave_fmt/bzrdir.py:284
6866
msgid "upgraded to weaves:"
6867
msgstr ""
6868
6869
#: bzrlib/plugins/weave_fmt/bzrdir.py:285
6870
#, python-format
6871
msgid "%6d revisions and inventories"
6872
msgstr ""
6873
6874
#: bzrlib/plugins/weave_fmt/bzrdir.py:287
6875
#, python-format
6876
msgid "%6d revisions not present"
6877
msgstr ""
6878
6879
#: bzrlib/plugins/weave_fmt/bzrdir.py:289
6880
#, python-format
6881
msgid "%6d texts"
6882
msgstr ""
6883
6884
#: bzrlib/plugins/weave_fmt/bzrdir.py:325
6885
msgid "writing weave"
6886
msgstr ""
6887
6888
#: bzrlib/plugins/weave_fmt/bzrdir.py:329
6889
#: bzrlib/plugins/weave_fmt/bzrdir.py:331
6890
msgid "inventory"
6891
msgstr ""
6892
6893
#: bzrlib/plugins/weave_fmt/bzrdir.py:348
6894
msgid "write revision"
6895
msgstr ""
6896
6897
#: bzrlib/plugins/weave_fmt/bzrdir.py:362
6898
msgid "loading revision"
6899
msgstr ""
6900
6901
#: bzrlib/plugins/weave_fmt/bzrdir.py:367
6902
#, python-format
6903
msgid "revision {%s} not present in branch; will be converted as a ghost"
6904
msgstr ""
6905
6906
#: bzrlib/plugins/weave_fmt/bzrdir.py:507
6907
msgid "starting upgrade from format 5 to 6"
6908
msgstr ""
6909
6910
#: bzrlib/plugins/weave_fmt/bzrdir.py:517
6911
#, python-format
6912
msgid "adding prefixes to %s"
6913
msgstr ""
6914
6915
#: bzrlib/plugins/weave_fmt/bzrdir.py:557
6916
msgid "starting upgrade from format 6 to metadir"
6917
msgstr ""
6918
6919
#: bzrlib/plugins/weave_fmt/bzrdir.py:565
6920
msgid "Removing ancestry.weave"
6921
msgstr ""
6922
6923
#: bzrlib/plugins/weave_fmt/bzrdir.py:570
6924
msgid "Finding branch files"
6925
msgstr ""
6926
6927
#: bzrlib/plugins/weave_fmt/bzrdir.py:580
6928
msgid "Upgrading repository"
6929
msgstr ""
6930
6931
#: bzrlib/plugins/weave_fmt/bzrdir.py:590
6932
msgid "Upgrading branch"
6933
msgstr ""
6934
6935
#: bzrlib/plugins/weave_fmt/bzrdir.py:613
6936
msgid "No working tree."
6937
msgstr ""
6938
6939
#: bzrlib/plugins/weave_fmt/bzrdir.py:620
6940
msgid "Upgrading working tree"
6941
msgstr ""
6942
6943
#: bzrlib/plugins/weave_fmt/bzrdir.py:641
6944
#, python-format
6945
msgid "Make %s lock"
6946
msgstr ""
6947
6948
#: bzrlib/plugins/weave_fmt/bzrdir.py:652
6949
#, python-format
6950
msgid "Moving %s"
6951
msgstr ""
6952
6953
#: bzrlib/push.py:56
6954
msgid "Created new branch."
6955
msgstr ""
6956
6957
#: bzrlib/push.py:97
6958
#, python-format
6959
msgid ""
6960
"Target directory %s already contains a .bzr directory, but it is not valid."
6961
msgstr ""
6962
6963
#: bzrlib/push.py:101
6964
#, python-format
6965
msgid ""
6966
"Target directory %s already exists, but does not have a .bzr directory. "
6967
"Supply --use-existing-dir to push there anyway."
6968
msgstr ""
6969
6970
#: bzrlib/push.py:122
6971
#, python-format
6972
msgid "Too many redirections trying to make %s."
6973
msgstr ""
6974
6975
#: bzrlib/push.py:148
6976
msgid ""
6977
"These branches have diverged. See \"bzr help diverged-branches\" for more "
6978
"information."
6979
msgstr ""
6980
6981
#: bzrlib/push.py:152
6982
#, python-format
6983
msgid ""
6984
"It is not possible to losslessly push to %s. You may want to use dpush "
6985
"instead."
6986
msgstr ""
6987
6988
#: bzrlib/push.py:158
6989
#, python-format
6990
msgid ""
6991
"At %s you have a valid .bzr control directory, but not a branch or "
6992
"repository. This is an unsupported configuration. Please move the target "
6993
"directory out of the way and try again."
6994
msgstr ""
6995
6996
#: bzrlib/reconcile.py:97
6997
#, python-format
6998
msgid "Reconciling branch %s"
6999
msgstr ""
7000
7001
#: bzrlib/reconcile.py:103
7002
#, python-format
7003
msgid "Reconciling repository %s"
7004
msgstr ""
7005
7006
#: bzrlib/reconcile.py:105
7007
msgid "Reconciling repository"
7008
msgstr ""
7009
7010
#: bzrlib/reconcile.py:111
7011
#, python-format
7012
msgid "%s cannot canonicalize CHKs."
7013
msgstr ""
7014
7015
#: bzrlib/reconcile.py:119
7016
msgid "Reconcile aborted: revision index has inconsistent parents."
7017
msgstr ""
7018
7019
#: bzrlib/reconcile.py:121
7020
msgid "Run \"bzr check\" for more details."
7021
msgstr ""
7022
7023
#: bzrlib/reconcile.py:123
7024
msgid "Reconciliation complete."
7025
msgstr ""
7026
7027
#: bzrlib/reconcile.py:166
7028
msgid "Fixing last revision info {0} => {1}"
7029
msgstr ""
7030
7031
#: bzrlib/reconcile.py:173
7032
msgid "revision_history ok."
7033
msgstr ""
7034
7035
#: bzrlib/reconcile.py:234
7036
msgid "Reading inventory data"
7037
msgstr ""
7038
7039
#: bzrlib/reconcile.py:254 bzrlib/reconcile.py:384
7040
msgid "Inventory ok."
7041
msgstr ""
7042
7043
#: bzrlib/reconcile.py:256 bzrlib/reconcile.py:386
7044
msgid "Backing up inventory"
7045
msgstr ""
7046
7047
#: bzrlib/reconcile.py:258
7048
msgid "Backup inventory created."
7049
msgstr ""
7050
7051
#: bzrlib/reconcile.py:274 bzrlib/reconcile.py:405
7052
msgid "Writing weave"
7053
msgstr ""
7054
7055
#: bzrlib/reconcile.py:277 bzrlib/reconcile.py:408
7056
msgid "Inventory regenerated."
7057
msgstr ""
7058
7059
#: bzrlib/reconcile.py:371 bzrlib/reconcile.py:373 bzrlib/reconcile.py:376
7060
msgid "Reading indexes"
7061
msgstr ""
7062
7063
#: bzrlib/reconcile.py:380 bzrlib/reconcile.py:382
7064
msgid "Checking unused inventories"
7065
msgstr ""
7066
7067
#: bzrlib/reconcile.py:388
7068
msgid "Backup Inventory created"
7069
msgstr ""
7070
7071
#: bzrlib/reconcile.py:446
7072
msgid "Fixing text parents"
7073
msgstr ""
7074
7075
#: bzrlib/reconfigure.py:54
7076
msgid "{0} is now stacked on {1}\n"
7077
msgstr ""
7078
7079
#: bzrlib/reconfigure.py:69
7080
#, python-format
7081
msgid "%s is now not stacked\n"
7082
msgstr ""
7083
7084
#: bzrlib/remote.py:1228 bzrlib/repository.py:289
7085
#, python-format
7086
msgid "bzr: ERROR (ignored): %s"
7087
msgstr ""
7088
7089
#: bzrlib/remote.py:2534
7090
msgid "Copying repository content as tarball..."
7091
msgstr ""
7092
7093
#: bzrlib/rename_map.py:69
7094
msgid "Calculating hashes"
7095
msgstr ""
7096
7097
#: bzrlib/rename_map.py:107
7098
msgid "Determining hash hits"
7099
msgstr ""
7100
7101
#: bzrlib/rename_map.py:242
7102
msgid "{0} => {1}"
7103
msgstr ""
7104
7105
#: bzrlib/repository.py:1738
7106
msgid "Moving repository to repository.backup"
7107
msgstr ""
7108
7109
#: bzrlib/repository.py:1745
7110
msgid "Creating new repository"
7111
msgstr ""
7112
7113
#: bzrlib/repository.py:1750
7114
msgid "Copying content"
7115
msgstr ""
7116
7117
#: bzrlib/repository.py:1754
7118
msgid "Deleting old repository content"
7119
msgstr ""
7120
7121
#: bzrlib/repository.py:1756
7122
msgid "repository converted"
7123
msgstr ""
7124
7125
#: bzrlib/revisionspec.py:903
7126
msgid "Using {0} {1}"
7127
msgstr ""
7128
7129
#: bzrlib/send.py:59
7130
#, python-format
7131
msgid "Mail client \"%s\" does not support specifying body"
7132
msgstr ""
7133
7134
#: bzrlib/send.py:63
7135
msgid "--remember requires a branch to be specified."
7136
msgstr ""
7137
7138
#: bzrlib/send.py:78
7139
msgid "No submit branch known or specified"
7140
msgstr ""
7141
7142
#: bzrlib/send.py:81
7143
msgid "Using saved {0} location \"{1}\" to determine what changes to submit."
7144
msgstr ""
7145
7146
#: bzrlib/send.py:99
7147
#, python-format
7148
msgid "No such send format '%s'."
7149
msgstr ""
7150
7151
#: bzrlib/send.py:115
7152
msgid "bzr send takes at most two one revision identifiers"
7153
msgstr ""
7154
7155
#: bzrlib/send.py:128
7156
msgid "No revisions to submit."
7157
msgstr ""
7158
7159
#: bzrlib/send.py:140
7160
msgid ""
7161
"- not supported for merge directives that use more than one output file."
7162
msgstr ""
7163
7164
#: bzrlib/send.py:186
7165
msgid "Format 0.9 does not permit bundle with no patch"
7166
msgstr ""
7167
7168
#: bzrlib/shelf_ui.py:46
7169
#, python-format
7170
msgid "Shelve adding file \"%(path)s\"?"
7171
msgstr ""
7172
7173
#: bzrlib/shelf_ui.py:47
7174
msgid "Shelve binary changes?"
7175
msgstr ""
7176
7177
#: bzrlib/shelf_ui.py:48
7178
msgid "Shelve changing \"%s\" from %(other)s to %(this)s?"
7179
msgstr ""
7180
7181
#: bzrlib/shelf_ui.py:50
7182
#, python-format
7183
msgid "Shelve removing file \"%(path)s\"?"
7184
msgstr ""
7185
7186
#: bzrlib/shelf_ui.py:51
7187
#, python-format
7188
msgid "Shelve %d change(s)?"
7189
msgstr ""
7190
7191
#: bzrlib/shelf_ui.py:52
7192
msgid "Shelve?"
7193
msgstr ""
7194
7195
#: bzrlib/shelf_ui.py:53
7196
#, python-format
7197
msgid ""
7198
"Shelve changing target of \"%(path)s\" from \"%(other)s\" to \"%(this)s\"?"
7199
msgstr ""
7200
7201
#: bzrlib/shelf_ui.py:55
7202
#, python-format
7203
msgid "Shelve renaming \"%(other)s\" => \"%(this)s\"?"
7204
msgstr ""
7205
7206
#: bzrlib/shelf_ui.py:70
7207
#, python-format
7208
msgid "Changes shelved with id \"%d\"."
7209
msgstr ""
7210
7211
#: bzrlib/shelf_ui.py:74
7212
msgid "Selected changes destroyed."
7213
msgstr ""
7214
7215
#: bzrlib/shelf_ui.py:78
7216
msgid "Selected changes:"
7217
msgstr ""
7218
7219
#: bzrlib/shelf_ui.py:98
7220
#, python-format
7221
msgid "Delete file \"%(path)s\"?"
7222
msgstr ""
7223
7224
#: bzrlib/shelf_ui.py:99
7225
msgid "Apply binary changes?"
7226
msgstr ""
7227
7228
#: bzrlib/shelf_ui.py:100
7229
#, python-format
7230
msgid "Change \"%(path)s\" from %(this)s to %(other)s?"
7231
msgstr ""
7232
7233
#: bzrlib/shelf_ui.py:102
7234
#, python-format
7235
msgid "Add file \"%(path)s\"?"
7236
msgstr ""
7237
7238
#: bzrlib/shelf_ui.py:103
7239
#, python-format
7240
msgid "Apply %d change(s)?"
7241
msgstr ""
7242
7243
#: bzrlib/shelf_ui.py:104
7244
msgid "Apply change?"
7245
msgstr ""
7246
7247
#: bzrlib/shelf_ui.py:105
7248
#, python-format
7249
msgid "Change target of \"%(path)s\" from \"%(this)s\" to \"%(other)s\"?"
7250
msgstr ""
7251
7252
#: bzrlib/shelf_ui.py:107
7253
#, python-format
7254
msgid "Rename \"%(this)s\" => \"%(other)s\"?"
7255
msgstr ""
7256
7257
#: bzrlib/shelf_ui.py:402
7258
msgid "No changes are shelved."
7259
msgstr ""
7260
7261
#: bzrlib/shelf_ui.py:460
7262
#, python-format
7263
msgid "Using changes with id \"%d\"."
7264
msgstr ""
7265
7266
#: bzrlib/shelf_ui.py:464
7267
#, python-format
7268
msgid "Message: %s"
7269
msgstr ""
7270
7271
#: bzrlib/shelf_ui.py:476
7272
#, python-format
7273
msgid "Deleted changes with id \"%d\"."
7274
msgstr ""
7275
7276
#: bzrlib/smart/medium.py:714
7277
msgid "HPSS calls: {0} ({1} vfs) {2}"
7278
msgstr ""
7279
7280
#: bzrlib/smart/server.py:169
7281
msgid "Requested to stop gracefully"
7282
msgstr ""
7283
7284
#: bzrlib/smart/server.py:179
7285
#, python-format
7286
msgid "Waiting for %d client(s) to finish"
7287
msgstr ""
7288
7289
#: bzrlib/smart/server.py:185
7290
#, python-format
7291
msgid "Still waiting for %d client(s) to finish"
7292
msgstr ""
7293
7294
#: bzrlib/smart/server.py:219
7295
#, python-format
7296
msgid "listening socket error: %s"
7297
msgstr ""
7298
7299
#: bzrlib/smart/server.py:452
7300
#, python-format
7301
msgid "listening on port: %s"
7302
msgstr ""
7303
7304
#: bzrlib/switch.py:73
7305
msgid "Pending merges must be committed or reverted before using switch."
7306
msgstr ""
7307
7308
#: bzrlib/switch.py:100
7309
msgid ""
7310
"Cannot switch as local commits found in the checkout. Commit these to the "
7311
"bound branch or use --force to throw them away."
7312
msgstr ""
7313
7314
#: bzrlib/switch.py:105
7315
#, python-format
7316
msgid ""
7317
"Unable to connect to current master branch %(target)s: %(error)s To switch "
7318
"anyway, use --force."
7319
msgstr ""
7320
7321
#: bzrlib/switch.py:129
7322
msgid "Cannot switch a branch, only a checkout."
7323
msgstr ""
7324
7325
#: bzrlib/switch.py:167
7326
#, python-format
7327
msgid "Tree is up to date at revision %d."
7328
msgstr ""
7329
7330
#: bzrlib/switch.py:173
7331
#, python-format
7332
msgid "Updated to revision %d."
7333
msgstr ""
7334
7335
#: bzrlib/transform.py:1723 bzrlib/transform.py:1734 bzrlib/transform.py:1736
7336
msgid "Apply phase"
7337
msgstr ""
7338
7339
#: bzrlib/transform.py:1762 bzrlib/transform.py:1830
7340
msgid "removing file"
7341
msgstr ""
7342
7343
#: bzrlib/transform.py:1780 bzrlib/transform.py:1865
7344
msgid "adding file"
7345
msgstr ""
7346
7347
#: bzrlib/transform.py:2598
7348
msgid "Building tree"
7349
msgstr ""
7350
7351
#: bzrlib/transform.py:2688 bzrlib/transform.py:2715
7352
msgid "Adding file contents"
7353
msgstr ""
7354
7355
#: bzrlib/transform.py:3017
7356
msgid "Resolution pass"
7357
msgstr ""
7358
7359
#: bzrlib/transport/ftp/_gssapi.py:88
7360
#, python-format
7361
msgid "Authenticated as %s"
7362
msgstr ""
7363
7364
#: bzrlib/tree.py:647
7365
msgid "*** {0} content-filter: {1} => {2!r}"
7366
msgstr ""
7367
7368
#: bzrlib/upgrade.py:77
7369
#, python-format
7370
msgid "This is a checkout. The branch (%s) needs to be upgraded separately."
7371
msgstr ""
7372
7373
#: bzrlib/upgrade.py:100
7374
#, python-format
7375
msgid "cannot upgrade from bzrdir format %s"
7376
msgstr ""
7377
7378
#: bzrlib/upgrade.py:103
7379
#, python-format
7380
msgid "starting upgrade of %s"
7381
msgstr ""
7382
7383
#: bzrlib/upgrade.py:110
7384
msgid "finished"
7385
msgstr ""
7386
7387
#: bzrlib/upgrade.py:120
7388
msgid "Deleting backup.bzr"
7389
msgstr ""
7390
7391
#: bzrlib/upgrade.py:151
7392
msgid ""
7393
"\n"
7394
"SUMMARY: {0} upgrades attempted, {1} succeeded, {2} failed"
7395
msgstr ""
7396
7397
#: bzrlib/upgrade.py:208
7398
#, python-format
7399
msgid "Found %d dependent branches - upgrading ..."
7400
msgstr ""
7401
7402
#: bzrlib/upgrade.py:276
7403
msgid "Upgrading bzrdirs"
7404
msgstr ""
7405
7406
#: bzrlib/upgrade.py:282
7407
#, python-format
7408
msgid "Upgrading %s"
7409
msgstr ""
7410
7411
#: bzrlib/upgrade.py:283
7412
msgid "Upgrading {0} {1} ..."
7413
msgstr ""
7414
7415
#: bzrlib/upgrade.py:301
7416
msgid "Removing backup ..."
7417
msgstr ""
7418
7419
#: bzrlib/upgrade.py:305
7420
msgid "failed to clean-up {0}: {1}"
7421
msgstr ""
7422
7423
#: bzrlib/vf_repository.py:1091
7424
msgid "inventories"
7425
msgstr ""
7426
7427
#: bzrlib/vf_repository.py:1117
7428
msgid "texts"
7429
msgstr ""
7430
7431
#: bzrlib/vf_repository.py:1622 bzrlib/vf_repository.py:1631
7432
msgid "Calculating text parents"
7433
msgstr ""
7434
7435
#: bzrlib/vf_repository.py:1707
7436
msgid "Fetch texts"
7437
msgstr ""
7438
7439
#: bzrlib/vf_repository.py:2536
7440
msgid "loading text store"
7441
msgstr ""
7442
7443
#: bzrlib/vf_repository.py:2542
7444
msgid "checking text graph"
7445
msgstr ""
7446
7447
#: bzrlib/vf_repository.py:2998 bzrlib/vf_repository.py:3012
7448
#: bzrlib/vf_repository.py:3127
7449
msgid "Transferring revisions"
7450
msgstr ""
7451
7452
#: bzrlib/win32utils.py:146
7453
msgid "Failed to GetProcessMemoryInfo()"
7454
msgstr ""
7455
7456
#: bzrlib/win32utils.py:167
7457
msgid "Cannot debug memory on win32 without ctypes or win32process"
7458
msgstr ""
7459
7460
#: bzrlib/win32utils.py:172
7461
msgid "WorkingSize {0:>7}KiB\tPeakWorking {1:>7}KiB\t{2}"
7462
msgstr ""
7463
7464
#: bzrlib/win32utils.py:180
7465
#, python-format
7466
msgid "WorkingSize %8d KiB"
7467
msgstr ""
7468
7469
#: bzrlib/win32utils.py:181
7470
#, python-format
7471
msgid "PeakWorking %8d KiB"
7472
msgstr ""
7473
7474
#: bzrlib/win32utils.py:182
7475
#, python-format
7476
msgid "PagefileUsage %8d KiB"
7477
msgstr ""
7478
7479
#: bzrlib/win32utils.py:183
7480
#, python-format
7481
msgid "PeakPagefileUsage %8d KiB"
7482
msgstr ""
7483
7484
#: bzrlib/win32utils.py:185
7485
#, python-format
7486
msgid "PrivateUsage %8d KiB"
7487
msgstr ""
7488
7489
#: bzrlib/win32utils.py:186
7490
#, python-format
7491
msgid "PageFaultCount %8d"
7492
msgstr ""
7493
7494
#: bzrlib/workingtree.py:1482
7495
msgid "Rerun update after fixing the conflicts."
7496
msgstr ""
7497
7498
#: dummy/help_topics/authentication/summary.txt:1
7499
msgid "Information on configuring authentication"
7500
msgstr ""
7501
7502
#: dummy/help_topics/basic/detail.txt:1
7503
msgid ""
7504
"Bazaar 2.6b2 -- a free distributed version-control tool\n"
7505
"http://bazaar.canonical.com/"
7506
msgstr ""
7507
7508
#: dummy/help_topics/basic/detail.txt:4
7509
msgid ""
7510
"Basic commands:\n"
7511
" bzr init makes this directory a versioned branch\n"
7512
" bzr branch make a copy of another branch"
7513
msgstr ""
7514
7515
#: dummy/help_topics/basic/detail.txt:8
7516
msgid ""
7517
" bzr add make files or directories versioned\n"
7518
" bzr ignore ignore a file or pattern\n"
7519
" bzr mv move or rename a versioned file"
7520
msgstr ""
7521
7522
#: dummy/help_topics/basic/detail.txt:12
7523
msgid ""
7524
" bzr status summarize changes in working copy\n"
7525
" bzr diff show detailed diffs"
7526
msgstr ""
7527
7528
#: dummy/help_topics/basic/detail.txt:15
7529
msgid ""
7530
" bzr merge pull in changes from another branch\n"
7531
" bzr commit save some or all changes\n"
7532
" bzr send send changes via email"
7533
msgstr ""
7534
7535
#: dummy/help_topics/basic/detail.txt:19
7536
msgid ""
7537
" bzr log show history of changes\n"
7538
" bzr check validate storage"
7539
msgstr ""
7540
7541
#: dummy/help_topics/basic/detail.txt:22
7542
msgid ""
7543
" bzr help init more help on e.g. init command\n"
7544
" bzr help commands list all commands\n"
7545
" bzr help topics list all help topics\n"
7546
msgstr ""
7547
7548
#: dummy/help_topics/basic/summary.txt:1
7549
msgid "Basic commands"
7550
msgstr ""
7551
7552
#: dummy/help_topics/branches/detail.txt:1
7553
msgid "Branches"
7554
msgstr ""
7555
7556
#: dummy/help_topics/branches/detail.txt:3
7557
msgid ""
7558
"A branch consists of the state of a project, including all of its\n"
7559
"history. All branches have a repository associated (which is where the\n"
7560
"branch history is stored), but multiple branches may share the same\n"
7561
"repository (a shared repository). Branches can be copied and merged."
7562
msgstr ""
7563
7564
#: dummy/help_topics/branches/detail.txt:8
7565
msgid ""
7566
"In addition, one branch may be bound to another one. Binding to another\n"
7567
"branch indicates that commits which happen in this branch must also \n"
7568
"happen in the other branch. Bazaar ensures consistency by not allowing \n"
7569
"commits when the two branches are out of date. In order for a commit \n"
7570
"to succeed, it may be necessary to update the current branch using \n"
7571
"``bzr update``."
7572
msgstr ""
7573
7574
#: dummy/help_topics/branches/detail.txt:15
7575
#: dummy/help_topics/checkouts/detail.txt:66
7576
#: dummy/help_topics/repositories/detail.txt:36
7577
msgid "Related commands::"
7578
msgstr ""
7579
7580
#: dummy/help_topics/branches/detail.txt:17
7581
msgid ""
7582
" init Change a directory into a versioned branch.\n"
7583
" branch Create a new branch that is a copy of an existing branch.\n"
7584
" merge Perform a three-way merge.\n"
7585
" bind Bind a branch to another one.\n"
7586
msgstr ""
7587
7588
#: dummy/help_topics/branches/summary.txt:1
7589
msgid "Information on what a branch is"
7590
msgstr ""
7591
7592
#: dummy/help_topics/bugs/summary.txt:1
7593
msgid "Bug tracker settings"
7594
msgstr ""
7595
7596
#: dummy/help_topics/checkouts/detail.txt:1
7597
msgid "Checkouts"
7598
msgstr ""
7599
7600
#: dummy/help_topics/checkouts/detail.txt:3
7601
msgid ""
7602
"Checkouts are source trees that are connected to a branch, so that when\n"
7603
"you commit in the source tree, the commit goes into that branch. They\n"
7604
"allow you to use a simpler, more centralized workflow, ignoring some of\n"
7605
"Bazaar's decentralized features until you want them. Using checkouts\n"
7606
"with shared repositories is very similar to working with SVN or CVS, but\n"
7607
"doesn't have the same restrictions. And using checkouts still allows\n"
7608
"others working on the project to use whatever workflow they like."
7609
msgstr ""
7610
7611
#: dummy/help_topics/checkouts/detail.txt:11
7612
msgid ""
7613
"A checkout is created with the bzr checkout command (see \"help "
7614
"checkout\").\n"
7615
"You pass it a reference to another branch, and it will create a local copy\n"
7616
"for you that still contains a reference to the branch you created the\n"
7617
"checkout from (the master branch). Then if you make any commits they will "
7618
"be\n"
7619
"made on the other branch first. This creates an instant mirror of your work, "
7620
"or\n"
7621
"facilitates lockstep development, where each developer is working together,\n"
7622
"continuously integrating the changes of others."
7623
msgstr ""
7624
7625
#: dummy/help_topics/checkouts/detail.txt:19
7626
msgid ""
7627
"However the checkout is still a first class branch in Bazaar terms, so that\n"
7628
"you have the full history locally. As you have a first class branch you "
7629
"can\n"
7630
"also commit locally if you want, for instance due to the temporary loss af "
7631
"a\n"
7632
"network connection. Use the --local option to commit to do this. All the "
7633
"local\n"
7634
"commits will then be made on the master branch the next time you do a non-"
7635
"local\n"
7636
"commit."
7637
msgstr ""
7638
7639
#: dummy/help_topics/checkouts/detail.txt:26
7640
msgid ""
7641
"If you are using a checkout from a shared branch you will periodically want "
7642
"to\n"
7643
"pull in all the changes made by others. This is done using the \"update\"\n"
7644
"command. The changes need to be applied before any non-local commit, but\n"
7645
"Bazaar will tell you if there are any changes and suggest that you use this\n"
7646
"command when needed."
7647
msgstr ""
7648
7649
#: dummy/help_topics/checkouts/detail.txt:32
7650
msgid ""
7651
"It is also possible to create a \"lightweight\" checkout by passing the\n"
7652
"--lightweight flag to checkout. A lightweight checkout is even closer to an\n"
7653
"SVN checkout in that it is not a first class branch, it mainly consists of "
7654
"the\n"
7655
"working tree. This means that any history operations must query the master\n"
7656
"branch, which could be slow if a network connection is involved. Also, as "
7657
"you\n"
7658
"don't have a local branch, then you cannot commit locally."
7659
msgstr ""
7660
7661
#: dummy/help_topics/checkouts/detail.txt:39
7662
msgid ""
7663
"Lightweight checkouts work best when you have fast reliable access to the\n"
7664
"master branch. This means that if the master branch is on the same disk or "
7665
"LAN\n"
7666
"a lightweight checkout will be faster than a heavyweight one for any "
7667
"commands\n"
7668
"that modify the revision history (as only one copy of the branch needs to\n"
7669
"be updated). Heavyweight checkouts will generally be faster for any command\n"
7670
"that uses the history but does not change it, but if the master branch is "
7671
"on\n"
7672
"the same disk then there won't be a noticeable difference."
7673
msgstr ""
7674
7675
#: dummy/help_topics/checkouts/detail.txt:47
7676
msgid ""
7677
"Another possible use for a checkout is to use it with a treeless repository\n"
7678
"containing your branches, where you maintain only one working tree by\n"
7679
"switching the master branch that the checkout points to when you want to\n"
7680
"work on a different branch."
7681
msgstr ""
7682
7683
#: dummy/help_topics/checkouts/detail.txt:52
7684
msgid ""
7685
"Obviously to commit on a checkout you need to be able to write to the "
7686
"master\n"
7687
"branch. This means that the master branch must be accessible over a "
7688
"writeable\n"
7689
"protocol , such as sftp://, and that you have write permissions at the "
7690
"other\n"
7691
"end. Checkouts also work on the local file system, so that all that matters "
7692
"is\n"
7693
"file permissions."
7694
msgstr ""
7695
7696
#: dummy/help_topics/checkouts/detail.txt:58
7697
msgid ""
7698
"You can change the master of a checkout by using the \"switch\" command "
7699
"(see\n"
7700
"\"help switch\"). This will change the location that the commits are sent "
7701
"to.\n"
7702
"The \"bind\" command can also be used to turn a normal branch into a heavy\n"
7703
"checkout. If you would like to convert your heavy checkout into a normal\n"
7704
"branch so that every commit is local, you can use the \"unbind\" command. To "
7705
"see\n"
7706
"whether or not a branch is bound or not you can use the \"info\" command. If "
7707
"the\n"
7708
"branch is bound it will tell you the location of the bound branch."
7709
msgstr ""
7710
7711
#: dummy/help_topics/checkouts/detail.txt:68
7712
msgid ""
7713
" checkout Create a checkout. Pass --lightweight to get a lightweight\n"
7714
" checkout\n"
7715
" update Pull any changes in the master branch in to your checkout\n"
7716
" commit Make a commit that is sent to the master branch. If you have\n"
7717
" a heavy checkout then the --local option will commit to the\n"
7718
" checkout without sending the commit to the master\n"
7719
" switch Change the master branch that the commits in the checkout "
7720
"will\n"
7721
" be sent to\n"
7722
" bind Turn a standalone branch into a heavy checkout so that any\n"
7723
" commits will be sent to the master branch\n"
7724
" unbind Turn a heavy checkout into a standalone branch so that any\n"
7725
" commits are only made locally\n"
7726
" info Displays whether a branch is bound or unbound. If the branch "
7727
"is\n"
7728
" bound, then it will also display the location of the bound "
7729
"branch\n"
7730
msgstr ""
7731
7732
#: dummy/help_topics/checkouts/summary.txt:1
7733
msgid "Information on what a checkout is"
7734
msgstr ""
7735
7736
#: dummy/help_topics/commands/summary.txt:1
7737
msgid "Basic help for all commands"
7738
msgstr ""
7739
7740
#: dummy/help_topics/configuration/summary.txt:1
7741
msgid "Details on the configuration settings available"
7742
msgstr ""
7743
7744
#: dummy/help_topics/conflict-types/summary.txt:1
7745
msgid "Types of conflicts and what to do about them"
7746
msgstr ""
7747
7748
#: dummy/help_topics/content-filters/summary.txt:1
7749
msgid "Conversion of content into/from working trees"
7750
msgstr ""
7751
7752
#: dummy/help_topics/criss-cross/detail.txt:1
7753
msgid "Criss-Cross"
7754
msgstr ""
7755
7756
#: dummy/help_topics/criss-cross/detail.txt:3
7757
msgid ""
7758
"A criss-cross in the branch history can cause the default merge technique\n"
7759
"to emit more conflicts than would normally be expected."
7760
msgstr ""
7761
7762
#: dummy/help_topics/criss-cross/detail.txt:6
7763
msgid ""
7764
"In complex merge cases, ``bzr merge --lca`` or ``bzr merge --weave`` may "
7765
"give\n"
7766
"better results. You may wish to ``bzr revert`` the working tree and merge\n"
7767
"again. Alternatively, use ``bzr remerge`` on particular conflicted files."
7768
msgstr ""
7769
7770
#: dummy/help_topics/criss-cross/detail.txt:10
7771
msgid ""
7772
"Criss-crosses occur in a branch's history if two branches merge the same "
7773
"thing\n"
7774
"and then merge one another, or if two branches merge one another at the "
7775
"same\n"
7776
"time. They can be avoided by having each branch only merge from or into a\n"
7777
"designated central branch (a \"star topology\")."
7778
msgstr ""
7779
7780
#: dummy/help_topics/criss-cross/detail.txt:15
7781
msgid ""
7782
"Criss-crosses cause problems because of the way merge works. Bazaar's "
7783
"default\n"
7784
"merge is a three-way merger; in order to merge OTHER into THIS, it must\n"
7785
"find a basis for comparison, BASE. Using BASE, it can determine whether\n"
7786
"differences between THIS and OTHER are due to one side adding lines, or\n"
7787
"from another side removing lines."
7788
msgstr ""
7789
7790
#: dummy/help_topics/criss-cross/detail.txt:21
7791
msgid ""
7792
"Criss-crosses mean there is no good choice for a base. Selecting the "
7793
"recent\n"
7794
"merge points could cause one side's changes to be silently discarded.\n"
7795
"Selecting older merge points (which Bazaar does) mean that extra conflicts\n"
7796
"are emitted."
7797
msgstr ""
7798
7799
#: dummy/help_topics/criss-cross/detail.txt:26
7800
msgid ""
7801
"The ``weave`` merge type is not affected by this problem because it uses\n"
7802
"line-origin detection instead of a basis revision to determine the cause of\n"
7803
"differences.\n"
7804
msgstr ""
7805
7806
#: dummy/help_topics/criss-cross/summary.txt:1
7807
msgid "Information on criss-cross merging"
7808
msgstr ""
7809
7810
#: dummy/help_topics/current-formats/summary.txt:1
7811
msgid "Current storage formats"
7812
msgstr ""
7813
7814
#: dummy/help_topics/debug-flags/summary.txt:1
7815
msgid "Options to show or record debug information"
7816
msgstr ""
7817
7818
#: dummy/help_topics/diverged-branches/summary.txt:1
7819
msgid "How to fix diverged branches"
7820
msgstr ""
7821
7822
#: dummy/help_topics/env-variables/summary.txt:1
7823
msgid "Environment variable names and values"
7824
msgstr ""
7825
7826
#: dummy/help_topics/eol/summary.txt:1
7827
msgid "Information on end-of-line handling"
7828
msgstr ""
7829
7830
#: dummy/help_topics/files/detail.txt:1
7831
msgid "Files"
7832
msgstr ""
7833
7834
#: dummy/help_topics/files/detail.txt:3
7835
msgid ""
7836
":On Unix: ~/.bazaar/bazaar.conf\n"
7837
":On Windows: C:\\\\Documents and Settings\\\\username\\\\Application Data\\\\"
7838
"bazaar\\\\2.0\\\\bazaar.conf"
7839
msgstr ""
7840
7841
#: dummy/help_topics/files/detail.txt:6
7842
msgid ""
7843
"Contains the user's default configuration. The section ``[DEFAULT]`` is\n"
7844
"used to define general configuration that will be applied everywhere.\n"
7845
"The section ``[ALIASES]`` can be used to create command aliases for\n"
7846
"commonly used options."
7847
msgstr ""
7848
7849
#: dummy/help_topics/files/detail.txt:11
7850
msgid "A typical config file might look something like::"
7851
msgstr ""
7852
7853
#: dummy/help_topics/files/detail.txt:13
7854
msgid ""
7855
" [DEFAULT]\n"
7856
" email=John Doe <jdoe@isp.com>"
7857
msgstr ""
7858
7859
#: dummy/help_topics/files/detail.txt:16
7860
msgid ""
7861
" [ALIASES]\n"
7862
" commit = commit --strict\n"
7863
" log10 = log --short -r -10..-1\n"
7864
msgstr ""
7865
7866
#: dummy/help_topics/files/summary.txt:1
7867
msgid "Information on configuration and log files"
7868
msgstr ""
7869
7870
#: dummy/help_topics/formats/detail.txt:1
7871
msgid "Storage Formats"
7872
msgstr ""
7873
7874
#: dummy/help_topics/formats/detail.txt:3
7875
msgid ""
7876
"To ensure that older clients do not access data incorrectly,\n"
7877
"Bazaar's policy is to introduce a new storage format whenever\n"
7878
"new features requiring new metadata are added. New storage\n"
7879
"formats may also be introduced to improve performance and\n"
7880
"scalability."
7881
msgstr ""
7882
7883
#: dummy/help_topics/formats/detail.txt:9
7884
msgid ""
7885
"The newest format, 2a, is highly recommended. If your\n"
7886
"project is not using 2a, then you should suggest to the\n"
7887
"project owner to upgrade."
7888
msgstr ""
7889
7890
#: dummy/help_topics/formats/detail.txt:13
7891
msgid ""
7892
"\n"
7893
".. note::"
7894
msgstr ""
7895
7896
#: dummy/help_topics/formats/detail.txt:16
7897
msgid ""
7898
" Some of the older formats have two variants:\n"
7899
" a plain one and a rich-root one. The latter include an additional\n"
7900
" field about the root of the tree. There is no performance cost\n"
7901
" for using a rich-root format but you cannot easily merge changes\n"
7902
" from a rich-root format into a plain format. As a consequence,\n"
7903
" moving a project to a rich-root format takes some co-ordination\n"
7904
" in that all contributors need to upgrade their repositories\n"
7905
" around the same time. 2a and all future formats will be\n"
7906
" implicitly rich-root."
7907
msgstr ""
7908
7909
#: dummy/help_topics/formats/detail.txt:26
7910
msgid ""
7911
"See :doc:`current-formats-help` for the complete list of\n"
7912
"currently supported formats. See :doc:`other-formats-help` for\n"
7913
"descriptions of any available experimental and deprecated formats.\n"
7914
msgstr ""
7915
7916
#: dummy/help_topics/formats/summary.txt:1
7917
msgid "Information on choosing a storage format"
7918
msgstr ""
7919
7920
#: dummy/help_topics/global-options/detail.txt:1
7921
msgid "Global Options"
7922
msgstr ""
7923
7924
#: dummy/help_topics/global-options/detail.txt:3
7925
msgid ""
7926
"These options may be used with any command, and may appear in front of any\n"
7927
"command. (e.g. ``bzr --profile help``)."
7928
msgstr ""
7929
7930
#: dummy/help_topics/global-options/detail.txt:6
7931
msgid ""
7932
"--version Print the version number. Must be supplied before the "
7933
"command.\n"
7934
"--no-aliases Do not process command aliases when running this command.\n"
7935
"--builtin Use the built-in version of a command, not the plugin "
7936
"version.\n"
7937
" This does not suppress other plugin effects.\n"
7938
"--no-plugins Do not process any plugins.\n"
7939
"--no-l10n Do not translate messages.\n"
7940
"--concurrency Number of processes that can be run concurrently (selftest)."
7941
msgstr ""
7942
7943
#: dummy/help_topics/global-options/detail.txt:14
7944
msgid ""
7945
"--profile Profile execution using the hotshot profiler.\n"
7946
"--lsprof Profile execution using the lsprof profiler.\n"
7947
"--lsprof-file Profile execution using the lsprof profiler, and write the\n"
7948
" results to a specified file. If the filename ends with "
7949
"\".txt\",\n"
7950
" text format will be used. If the filename either starts "
7951
"with\n"
7952
" \"callgrind.out\" or end with \".callgrind\", the output will "
7953
"be\n"
7954
" formatted for use with KCacheGrind. Otherwise, the output\n"
7955
" will be a pickle.\n"
7956
"--coverage Generate line coverage report in the specified directory."
7957
msgstr ""
7958
7959
#: dummy/help_topics/global-options/detail.txt:24
7960
msgid ""
7961
"-Oname=value Override the ``name`` config option setting it to ``value`` "
7962
"for\n"
7963
" the duration of the command. This can be used multiple times "
7964
"if\n"
7965
" several options need to be overridden."
7966
msgstr ""
7967
7968
#: dummy/help_topics/global-options/detail.txt:28
7969
msgid ""
7970
"See http://doc.bazaar.canonical.com/developers/profiling.html for more\n"
7971
"information on profiling."
7972
msgstr ""
7973
7974
#: dummy/help_topics/global-options/detail.txt:31
7975
msgid ""
7976
"A number of debug flags are also available to assist troubleshooting and\n"
7977
"development. See :doc:`debug-flags-help`.\n"
7978
msgstr ""
7979
7980
#: dummy/help_topics/global-options/summary.txt:1
7981
msgid "Options that control how Bazaar runs"
7982
msgstr ""
7983
7984
#: dummy/help_topics/hidden-commands/summary.txt:1
7985
msgid "All hidden commands"
7986
msgstr ""
7987
7988
#: dummy/help_topics/hooks/summary.txt:1
7989
msgid "Points at which custom processing can be added"
7990
msgstr ""
7991
7992
#: dummy/help_topics/launchpad/detail.txt:1
7993
msgid "Integration with Launchpad.net"
7994
msgstr ""
7995
7996
#: dummy/help_topics/launchpad/detail.txt:3
7997
msgid ""
7998
"Launchpad.net provides free Bazaar branch hosting with integrated bug and\n"
7999
"specification tracking."
8000
msgstr ""
8001
8002
#: dummy/help_topics/launchpad/detail.txt:6
8003
msgid ""
8004
"The bzr client (through the plugin called 'launchpad') has special\n"
8005
"features to communicate with Launchpad:"
8006
msgstr ""
8007
8008
#: dummy/help_topics/launchpad/detail.txt:9
8009
msgid ""
8010
" * The launchpad-login command tells Bazaar your Launchpad user name. "
8011
"This\n"
8012
" is then used by the 'lp:' transport to download your branches using\n"
8013
" bzr+ssh://."
8014
msgstr ""
8015
8016
#: dummy/help_topics/launchpad/detail.txt:13
8017
msgid ""
8018
" * The 'lp:' transport uses Launchpad as a directory service: for "
8019
"example\n"
8020
" 'lp:bzr' and 'lp:python' refer to the main branches of the relevant\n"
8021
" projects and may be branched, logged, etc. You can also use the 'lp:'\n"
8022
" transport to refer to specific branches, e.g. lp:~bzr/bzr/trunk."
8023
msgstr ""
8024
8025
#: dummy/help_topics/launchpad/detail.txt:18
8026
msgid ""
8027
" * The 'lp:' bug tracker alias can expand launchpad bug numbers to their\n"
8028
" URLs for use with 'bzr commit --fixes', e.g. 'bzr commit --fixes "
8029
"lp:12345'\n"
8030
" will record a revision property that marks that revision as fixing\n"
8031
" Launchpad bug 12345. When you push that branch to Launchpad it will\n"
8032
" automatically be linked to the bug report."
8033
msgstr ""
8034
8035
#: dummy/help_topics/launchpad/detail.txt:24
8036
msgid ""
8037
" * The register-branch command tells Launchpad about the url of a\n"
8038
" public branch. Launchpad will then mirror the branch, display\n"
8039
" its contents and allow it to be attached to bugs and other\n"
8040
" objects."
8041
msgstr ""
8042
8043
#: dummy/help_topics/launchpad/detail.txt:29
8044
msgid "For more information see http://help.launchpad.net/\n"
8045
msgstr ""
8046
8047
#: dummy/help_topics/launchpad/summary.txt:1
8048
msgid "Using Bazaar with Launchpad.net"
8049
msgstr ""
8050
8051
#: dummy/help_topics/location-alias/summary.txt:1
8052
msgid "Aliases for remembered locations"
8053
msgstr ""
8054
8055
#: dummy/help_topics/log-formats/summary.txt:1
8056
msgid "Details on the logging formats available"
8057
msgstr ""
8058
8059
#: dummy/help_topics/other-formats/summary.txt:1
8060
msgid "Experimental and deprecated storage formats"
8061
msgstr ""
8062
8063
#: dummy/help_topics/patterns/summary.txt:1
8064
msgid "Information on the pattern syntax"
8065
msgstr ""
8066
8067
#: dummy/help_topics/repositories/detail.txt:1
8068
msgid "Repositories"
8069
msgstr ""
8070
8071
#: dummy/help_topics/repositories/detail.txt:3
8072
msgid ""
8073
"Repositories in Bazaar are where committed information is stored. There is\n"
8074
"a repository associated with every branch."
8075
msgstr ""
8076
8077
#: dummy/help_topics/repositories/detail.txt:6
8078
msgid ""
8079
"Repositories are a form of database. Bzr will usually maintain this for\n"
8080
"good performance automatically, but in some situations (e.g. when doing\n"
8081
"very many commits in a short time period) you may want to ask bzr to\n"
8082
"optimise the database indices. This can be done by the 'bzr pack' command."
8083
msgstr ""
8084
8085
#: dummy/help_topics/repositories/detail.txt:11
8086
msgid ""
8087
"By default just running 'bzr init' will create a repository within the new\n"
8088
"branch but it is possible to create a shared repository which allows "
8089
"multiple\n"
8090
"branches to share their information in the same location. When a new branch "
8091
"is\n"
8092
"created it will first look to see if there is a containing shared repository "
8093
"it\n"
8094
"can use."
8095
msgstr ""
8096
8097
#: dummy/help_topics/repositories/detail.txt:17
8098
msgid ""
8099
"When two branches of the same project share a repository, there is\n"
8100
"generally a large space saving. For some operations (e.g. branching\n"
8101
"within the repository) this translates in to a large time saving."
8102
msgstr ""
8103
8104
#: dummy/help_topics/repositories/detail.txt:21
8105
msgid ""
8106
"To create a shared repository use the init-repository command (or the alias\n"
8107
"init-repo). This command takes the location of the repository to create. "
8108
"This\n"
8109
"means that 'bzr init-repository repo' will create a directory named 'repo',\n"
8110
"which contains a shared repository. Any new branches that are created in "
8111
"this\n"
8112
"directory will then use it for storage."
8113
msgstr ""
8114
8115
#: dummy/help_topics/repositories/detail.txt:27
8116
msgid ""
8117
"It is a good idea to create a repository whenever you might create more\n"
8118
"than one branch of a project. This is true for both working areas where you\n"
8119
"are doing the development, and any server areas that you use for hosting\n"
8120
"projects. In the latter case, it is common to want branches without working\n"
8121
"trees. Since the files in the branch will not be edited directly there is "
8122
"no\n"
8123
"need to use up disk space for a working tree. To create a repository in "
8124
"which\n"
8125
"the branches will not have working trees pass the '--no-trees' option to\n"
8126
"'init-repository'."
8127
msgstr ""
8128
8129
#: dummy/help_topics/repositories/detail.txt:38
8130
msgid ""
8131
" init-repository Create a shared repository. Use --no-trees to create "
8132
"one\n"
8133
" in which new branches won't get a working tree.\n"
8134
msgstr ""
8135
8136
#: dummy/help_topics/repositories/summary.txt:1
8137
msgid "Basic information on shared repositories."
8138
msgstr ""
8139
8140
#: dummy/help_topics/revisionspec/summary.txt:1
8141
msgid "Explain how to use --revision"
8142
msgstr ""
8143
8144
#: dummy/help_topics/rules/summary.txt:1
8145
msgid "Information on defining rule-based preferences"
8146
msgstr ""
8147
8148
#: dummy/help_topics/standalone-trees/detail.txt:1
8149
msgid "Standalone Trees"
8150
msgstr ""
8151
8152
#: dummy/help_topics/standalone-trees/detail.txt:3
8153
msgid ""
8154
"A standalone tree is a working tree with an associated repository. It\n"
8155
"is an independently usable branch, with no dependencies on any other.\n"
8156
"Creating a standalone tree (via bzr init) is the quickest way to put\n"
8157
"an existing project under version control."
8158
msgstr ""
8159
8160
#: dummy/help_topics/standalone-trees/detail.txt:8
8161
msgid "Related Commands::"
8162
msgstr ""
8163
8164
#: dummy/help_topics/standalone-trees/detail.txt:10
8165
msgid " init Make a directory into a versioned branch.\n"
8166
msgstr ""
8167
8168
#: dummy/help_topics/standalone-trees/summary.txt:1
8169
msgid "Information on what a standalone tree is"
8170
msgstr ""
8171
8172
#: dummy/help_topics/standard-options/detail.txt:1
8173
msgid "Standard Options"
8174
msgstr ""
8175
8176
#: dummy/help_topics/standard-options/detail.txt:3
8177
msgid "Standard options are legal for all commands."
8178
msgstr ""
8179
8180
#: dummy/help_topics/standard-options/detail.txt:5
8181
msgid ""
8182
"--help, -h Show help message.\n"
8183
"--verbose, -v Display more information.\n"
8184
"--quiet, -q Only display errors and warnings."
8185
msgstr ""
8186
8187
#: dummy/help_topics/standard-options/detail.txt:9
8188
msgid "Unlike global options, standard options can be used in aliases.\n"
8189
msgstr ""
8190
8191
#: dummy/help_topics/standard-options/summary.txt:1
8192
msgid "Options that can be used with any command"
8193
msgstr ""
8194
8195
#: dummy/help_topics/status-flags/detail.txt:1
8196
msgid "Status Flags"
8197
msgstr ""
8198
8199
#: dummy/help_topics/status-flags/detail.txt:3
8200
msgid ""
8201
"Status flags are used to summarise changes to the working tree in a concise\n"
8202
"manner. They are in the form::"
8203
msgstr ""
8204
8205
#: dummy/help_topics/status-flags/detail.txt:6
8206
msgid " xxx <filename>"
8207
msgstr ""
8208
8209
#: dummy/help_topics/status-flags/detail.txt:8
8210
msgid "where the columns' meanings are as follows."
8211
msgstr ""
8212
8213
#: dummy/help_topics/status-flags/detail.txt:10
8214
msgid "Column 1 - versioning/renames::"
8215
msgstr ""
8216
8217
#: dummy/help_topics/status-flags/detail.txt:12
8218
msgid ""
8219
" + File versioned\n"
8220
" - File unversioned\n"
8221
" R File renamed\n"
8222
" ? File unknown\n"
8223
" X File nonexistent (and unknown to bzr)\n"
8224
" C File has conflicts\n"
8225
" P Entry for a pending merge (not a file)"
8226
msgstr ""
8227
8228
#: dummy/help_topics/status-flags/detail.txt:20
8229
msgid "Column 2 - contents::"
8230
msgstr ""
8231
8232
#: dummy/help_topics/status-flags/detail.txt:22
8233
msgid ""
8234
" N File created\n"
8235
" D File deleted\n"
8236
" K File kind changed\n"
8237
" M File modified"
8238
msgstr ""
8239
8240
#: dummy/help_topics/status-flags/detail.txt:27
8241
msgid "Column 3 - execute::"
8242
msgstr ""
8243
8244
#: dummy/help_topics/status-flags/detail.txt:29
8245
msgid " * The execute bit was changed\n"
8246
msgstr ""
8247
8248
#: dummy/help_topics/status-flags/summary.txt:1
8249
msgid "Help on status flags"
8250
msgstr ""
8251
8252
#: dummy/help_topics/sync-for-reconfigure/detail.txt:1
8253
msgid "Branches Out of Sync"
8254
msgstr ""
8255
8256
#: dummy/help_topics/sync-for-reconfigure/detail.txt:3
8257
msgid ""
8258
"When reconfiguring a checkout, tree or branch into a lightweight checkout,\n"
8259
"a local branch must be destroyed. (For checkouts, this is the local branch\n"
8260
"that serves primarily as a cache.) If the branch-to-be-destroyed does not\n"
8261
"have the same last revision as the new reference branch for the lightweight\n"
8262
"checkout, data could be lost, so Bazaar refuses."
8263
msgstr ""
8264
8265
#: dummy/help_topics/sync-for-reconfigure/detail.txt:9
8266
msgid "How you deal with this depends on *why* the branches are out of sync."
8267
msgstr ""
8268
8269
#: dummy/help_topics/sync-for-reconfigure/detail.txt:11
8270
msgid ""
8271
"If you have a checkout and have done local commits, you can get back in "
8272
"sync\n"
8273
"by running \"bzr update\" (and possibly \"bzr commit\")."
8274
msgstr ""
8275
8276
#: dummy/help_topics/sync-for-reconfigure/detail.txt:14
8277
msgid ""
8278
"If you have a branch and the remote branch is out-of-date, you can push\n"
8279
"the local changes using \"bzr push\". If the local branch is out of date, "
8280
"you\n"
8281
"can do \"bzr pull\". If both branches have had changes, you can merge, "
8282
"commit\n"
8283
"and then push your changes. If you decide that some of the changes aren't\n"
8284
"useful, you can \"push --overwrite\" or \"pull --overwrite\" instead.\n"
8285
msgstr ""
8286
8287
#: dummy/help_topics/sync-for-reconfigure/summary.txt:1
8288
msgid "Steps to resolve \"out-of-sync\" when reconfiguring"
8289
msgstr ""
8290
8291
#: dummy/help_topics/topics/summary.txt:1
8292
msgid "Topics list"
8293
msgstr ""
8294
8295
#: dummy/help_topics/url-special-chars/summary.txt:1
8296
msgid "Special character handling in URLs"
8297
msgstr ""
8298
8299
#: dummy/help_topics/urlspec/summary.txt:1
8300
msgid "Supported transport protocols"
8301
msgstr ""
8302
8303
#: dummy/help_topics/working-trees/detail.txt:1
8304
msgid "Working Trees"
8305
msgstr ""
8306
8307
#: dummy/help_topics/working-trees/detail.txt:3
8308
msgid ""
8309
"A working tree is the contents of a branch placed on disk so that you can\n"
8310
"see the files and edit them. The working tree is where you make changes to "
8311
"a\n"
8312
"branch, and when you commit the current state of the working tree is the\n"
8313
"snapshot that is recorded in the commit."
8314
msgstr ""
8315
8316
#: dummy/help_topics/working-trees/detail.txt:8
8317
msgid ""
8318
"When you push a branch to a remote system, a working tree will not be\n"
8319
"created. If one is already present the files will not be updated. The\n"
8320
"branch information will be updated and the working tree will be marked\n"
8321
"as out-of-date. Updating a working tree remotely is difficult, as there\n"
8322
"may be uncommitted changes or the update may cause content conflicts that "
8323
"are\n"
8324
"difficult to deal with remotely."
8325
msgstr ""
8326
8327
#: dummy/help_topics/working-trees/detail.txt:15
8328
msgid ""
8329
"If you have a branch with no working tree you can use the 'checkout' "
8330
"command\n"
8331
"to create a working tree. If you run 'bzr checkout .' from the branch it "
8332
"will\n"
8333
"create the working tree. If the branch is updated remotely, you can update "
8334
"the\n"
8335
"working tree by running 'bzr update' in that directory."
8336
msgstr ""
8337
8338
#: dummy/help_topics/working-trees/detail.txt:20
8339
msgid ""
8340
"If you have a branch with a working tree that you do not want the 'remove-"
8341
"tree'\n"
8342
"command will remove the tree if it is safe. This can be done to avoid the\n"
8343
"warning about the remote working tree not being updated when pushing to the\n"
8344
"branch. It can also be useful when working with a '--no-trees' repository\n"
8345
"(see 'bzr help repositories')."
8346
msgstr ""
8347
8348
#: dummy/help_topics/working-trees/detail.txt:26
8349
msgid ""
8350
"If you want to have a working tree on a remote machine that you push to you\n"
8351
"can either run 'bzr update' in the remote branch after each push, or use "
8352
"some\n"
8353
"other method to update the tree during the push. There is an 'rspush' "
8354
"plugin\n"
8355
"that will update the working tree using rsync as well as doing a push. "
8356
"There\n"
8357
"is also a 'push-and-update' plugin that automates running 'bzr update' via "
8358
"SSH\n"
8359
"after each push."
8360
msgstr ""
8361
8362
#: dummy/help_topics/working-trees/detail.txt:33
8363
msgid "Useful commands::"
8364
msgstr ""
8365
8366
#: dummy/help_topics/working-trees/detail.txt:35
8367
msgid ""
8368
" checkout Create a working tree when a branch does not have one.\n"
8369
" remove-tree Removes the working tree from a branch when it is safe to do "
8370
"so.\n"
8371
" update When a working tree is out of sync with its associated "
8372
"branch\n"
8373
" this will update the tree to match the branch.\n"
8374
msgstr ""
8375
8376
#: dummy/help_topics/working-trees/summary.txt:1
8377
msgid "Information on working trees"
8378
msgstr ""
8379
8380
#: en/help_topics/authentication.txt:1
8381
msgid ""
8382
"Authentication Settings\n"
8383
"======================="
8384
msgstr ""
8385
8386
#: en/help_topics/authentication.txt:4
8387
msgid ""
8388
"\n"
8389
"Intent\n"
8390
"------"
8391
msgstr ""
8392
8393
#: en/help_topics/authentication.txt:8
8394
msgid ""
8395
"Many different authentication policies can be described in the\n"
8396
"``authentication.conf`` file but a particular user should need only a few\n"
8397
"definitions to cover his needs without having to specify a user and a "
8398
"password\n"
8399
"for every branch he uses."
8400
msgstr ""
8401
8402
#: en/help_topics/authentication.txt:13
8403
msgid ""
8404
"The definitions found in this file are used to find the credentials to use "
8405
"for\n"
8406
"a given url. The same credentials can generally be used for as many branches "
8407
"as\n"
8408
"possible by grouping their declaration around the remote servers that need\n"
8409
"them. It's even possible to declare credentials that will be used by "
8410
"different\n"
8411
"servers."
8412
msgstr ""
8413
8414
#: en/help_topics/authentication.txt:19
8415
msgid ""
8416
"The intent is to make this file as small as possible to minimize maintenance."
8417
msgstr ""
8418
8419
#: en/help_topics/authentication.txt:21
8420
msgid ""
8421
"Once the relevant credentials are declared in this file you may use branch "
8422
"urls\n"
8423
"without embedding passwords (security hazard) or even users (enabling "
8424
"sharing\n"
8425
"of your urls with others)."
8426
msgstr ""
8427
8428
#: en/help_topics/authentication.txt:25
8429
msgid "Instead of using::"
8430
msgstr ""
8431
8432
#: en/help_topics/authentication.txt:27
8433
msgid " bzr branch ftp://joe:secret@host.com/path/to/my/branch"
8434
msgstr ""
8435
8436
#: en/help_topics/authentication.txt:29
8437
msgid "you simply use::"
8438
msgstr ""
8439
8440
#: en/help_topics/authentication.txt:31
8441
msgid " bzr branch ftp://host.com/path/to/my/branch"
8442
msgstr ""
8443
8444
#: en/help_topics/authentication.txt:33
8445
msgid ""
8446
"provided you have created the following ``authentication.conf`` file::"
8447
msgstr ""
8448
8449
#: en/help_topics/authentication.txt:35
8450
msgid ""
8451
" [myprojects]\n"
8452
" scheme=ftp\n"
8453
" host=host.com\n"
8454
" user=joe\n"
8455
" password=secret\n"
8456
" "
8457
msgstr ""
8458
8459
#: en/help_topics/authentication.txt:42
8460
msgid ""
8461
"Authentication definitions\n"
8462
"--------------------------"
8463
msgstr ""
8464
8465
#: en/help_topics/authentication.txt:45
8466
msgid ""
8467
"There are two kinds of authentication used by the various schemes supported "
8468
"by\n"
8469
"bzr:"
8470
msgstr ""
8471
8472
#: en/help_topics/authentication.txt:48
8473
msgid "1. user and password"
8474
msgstr ""
8475
8476
#: en/help_topics/authentication.txt:50
8477
msgid ""
8478
"``FTP`` needs a (``user``, ``password``) to authenticate against a ``host``\n"
8479
"``SFTP`` can use either a password or a host key to authenticate. However,\n"
8480
"ssh agents are a better, more secure solution. So we have chosen to not "
8481
"provide\n"
8482
"our own less secure method."
8483
msgstr ""
8484
8485
#: en/help_topics/authentication.txt:55
8486
msgid "2. user, realm and password"
8487
msgstr ""
8488
8489
#: en/help_topics/authentication.txt:57
8490
msgid ""
8491
"``HTTP`` and ``HTTPS`` needs a (``user, realm, password``) to authenticate\n"
8492
"against a host. But, by using ``.htaccess`` files, for example, it is "
8493
"possible\n"
8494
"to define several (``user, realm, password``) for a given ``host``. So what "
8495
"is\n"
8496
"really needed is (``user``, ``password``, ``host``, ``path``). The ``realm`` "
8497
"is\n"
8498
"not taken into account in the definitions, but will displayed if bzr "
8499
"prompts\n"
8500
"you for a password."
8501
msgstr ""
8502
8503
#: en/help_topics/authentication.txt:64
8504
msgid ""
8505
"``HTTP proxy`` can be handled as ``HTTP`` (or ``HTTPS``) by explicitly\n"
8506
"specifying the appropriate port."
8507
msgstr ""
8508
8509
#: en/help_topics/authentication.txt:67
8510
msgid ""
8511
"To take all schemes into account, the password will be deduced from a set "
8512
"of\n"
8513
"authentication definitions (``scheme``, ``host``, ``port``, ``path``, "
8514
"``user``,\n"
8515
"``password``)."
8516
msgstr ""
8517
8518
#: en/help_topics/authentication.txt:71
8519
msgid ""
8520
" * ``scheme``: can be empty (meaning the rest of the definition can be "
8521
"used\n"
8522
" for any scheme), ``SFTP`` and ``bzr+ssh`` should not be used here, "
8523
"``ssh``\n"
8524
" should be used instead since this is the real scheme regarding\n"
8525
" authentication,"
8526
msgstr ""
8527
8528
#: en/help_topics/authentication.txt:76
8529
msgid " * ``host``: can be empty (to act as a default for any host),"
8530
msgstr ""
8531
8532
#: en/help_topics/authentication.txt:78
8533
msgid ""
8534
" * ``port`` can be empty (useful when an host provides several servers for "
8535
"the\n"
8536
" same scheme), only numerical values are allowed, this should be used "
8537
"only\n"
8538
" when the server uses a port different than the scheme standard port,"
8539
msgstr ""
8540
8541
#: en/help_topics/authentication.txt:82
8542
msgid " * ``path``: can be empty (FTP or SFTP will never user it),"
8543
msgstr ""
8544
8545
#: en/help_topics/authentication.txt:84
8546
msgid ""
8547
" * ``user``: can be empty (``bzr`` will defaults to python's\n"
8548
" ``getpass.get_user()``),"
8549
msgstr ""
8550
8551
#: en/help_topics/authentication.txt:87
8552
msgid ""
8553
" * ``password``: can be empty if you prefer to always be prompted for your\n"
8554
" password."
8555
msgstr ""
8556
8557
#: en/help_topics/authentication.txt:90
8558
msgid ""
8559
"Multiple definitions can be provided and, for a given URL, bzr will select "
8560
"a\n"
8561
"(``user`` [, ``password``]) based on the following rules :"
8562
msgstr ""
8563
8564
#: en/help_topics/authentication.txt:93
8565
msgid " 1. the first match wins,"
8566
msgstr ""
8567
8568
#: en/help_topics/authentication.txt:95
8569
msgid " 2. empty fields match everything,"
8570
msgstr ""
8571
8572
#: en/help_topics/authentication.txt:97
8573
msgid ""
8574
" 3. ``scheme`` matches even if decorators are used in the requested URL,"
8575
msgstr ""
8576
8577
#: en/help_topics/authentication.txt:99
8578
msgid ""
8579
" 4. ``host`` matches exactly or act as a domain if it starts with '.'\n"
8580
" (``project.bzr.sf.net`` will match ``.bzr.sf.net`` but "
8581
"``projectbzr.sf.net``\n"
8582
" will not match ``bzr.sf.net``)."
8583
msgstr ""
8584
8585
#: en/help_topics/authentication.txt:103
8586
msgid ""
8587
" 5. ``port`` matches if included in the requested URL (exact matches only)"
8588
msgstr ""
8589
8590
#: en/help_topics/authentication.txt:105
8591
msgid ""
8592
" 6. ``path`` matches if included in the requested URL (and by rule #2 "
8593
"above,\n"
8594
" empty paths will match any provided path)."
8595
msgstr ""
8596
8597
#: en/help_topics/authentication.txt:110
8598
msgid ""
8599
"File format\n"
8600
"-----------"
8601
msgstr ""
8602
8603
#: en/help_topics/authentication.txt:113
8604
msgid ""
8605
"The general rules for :doc:`configuration files <configuration-help>`\n"
8606
"apply except for the variable policies."
8607
msgstr ""
8608
8609
#: en/help_topics/authentication.txt:116
8610
msgid "Each section describes an authentication definition."
8611
msgstr ""
8612
8613
#: en/help_topics/authentication.txt:118
8614
msgid ""
8615
"The section name is an arbitrary string, only the ``DEFAULT`` value is "
8616
"reserved\n"
8617
"and should appear as the *last* section."
8618
msgstr ""
8619
8620
#: en/help_topics/authentication.txt:121
8621
msgid "Each section should define:"
8622
msgstr ""
8623
8624
#: en/help_topics/authentication.txt:123
8625
msgid "* ``user``: the login to be used,"
8626
msgstr ""
8627
8628
#: en/help_topics/authentication.txt:125
8629
msgid "Each section could define:"
8630
msgstr ""
8631
8632
#: en/help_topics/authentication.txt:127
8633
msgid "* ``host``: the remote server,"
8634
msgstr ""
8635
8636
#: en/help_topics/authentication.txt:129
8637
msgid "* ``port``: the port the server is listening,"
8638
msgstr ""
8639
8640
#: en/help_topics/authentication.txt:131
8641
msgid "* ``path``: the branch location,"
8642
msgstr ""
8643
8644
#: en/help_topics/authentication.txt:133
8645
msgid "* ``password``: the password."
8646
msgstr ""
8647
8648
#: en/help_topics/authentication.txt:135
8649
msgid ""
8650
"\n"
8651
"Examples\n"
8652
"--------"
8653
msgstr ""
8654
8655
#: en/help_topics/authentication.txt:139
8656
msgid ""
8657
"\n"
8658
"Personal projects hosted outside\n"
8659
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
8660
msgstr ""
8661
8662
#: en/help_topics/authentication.txt:143
8663
msgid ""
8664
"All connections are done with the same ``user`` (the remote one for which "
8665
"the\n"
8666
"default bzr one is not appropriate) and the password is always prompted "
8667
"with\n"
8668
"some exceptions::"
8669
msgstr ""
8670
8671
#: en/help_topics/authentication.txt:147
8672
msgid ""
8673
" # Pet projects on hobby.net\n"
8674
" [hobby]\n"
8675
" host=r.hobby.net\n"
8676
" user=jim\n"
8677
" password=obvious1234\n"
8678
" \n"
8679
" # Home server\n"
8680
" [home]\n"
8681
" scheme=https\n"
8682
" host=home.net\n"
8683
" user=joe\n"
8684
" password=1essobV10us\n"
8685
" \n"
8686
" [DEFAULT]\n"
8687
" # Our local user is barbaz, on all remote sites we're known as "
8688
"foobar\n"
8689
" user=foobar"
8690
msgstr ""
8691
8692
#: en/help_topics/authentication.txt:164
8693
msgid ""
8694
"\n"
8695
"Source hosting provider\n"
8696
"~~~~~~~~~~~~~~~~~~~~~~~"
8697
msgstr ""
8698
8699
#: en/help_topics/authentication.txt:168
8700
msgid "In the shp.net (fictitious) domain, each project has its own site::"
8701
msgstr ""
8702
8703
#: en/help_topics/authentication.txt:170
8704
msgid ""
8705
" [shpnet domain]\n"
8706
" # we use sftp, but ssh is the scheme used for authentication\n"
8707
" scheme=ssh\n"
8708
" # The leading '.' ensures that 'shp.net' alone doesn't match\n"
8709
" host=.shp.net\n"
8710
" user=joe\n"
8711
" # bzr don't support supplying a password for sftp,\n"
8712
" # consider using an ssh agent if you don't want to supply\n"
8713
" # a password interactively. (pageant, ssh-agent, etc)"
8714
msgstr ""
8715
8716
#: en/help_topics/authentication.txt:180
8717
msgid ""
8718
"HTTPS, SFTP servers and their proxy\n"
8719
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
8720
msgstr ""
8721
8722
#: en/help_topics/authentication.txt:183
8723
msgid ""
8724
"At company.com, the server hosting release and integration branches is "
8725
"behind a\n"
8726
"proxy, and the two branches use different authentication policies::"
8727
msgstr ""
8728
8729
#: en/help_topics/authentication.txt:186
8730
msgid ""
8731
" [reference code]\n"
8732
" scheme=https\n"
8733
" host=dev.company.com\n"
8734
" path=/dev\n"
8735
" user=user1\n"
8736
" password=pass1"
8737
msgstr ""
8738
8739
#: en/help_topics/authentication.txt:193
8740
msgid ""
8741
" # development branches on dev server\n"
8742
" [dev]\n"
8743
" scheme=ssh # bzr+ssh and sftp are available here\n"
8744
" host=dev.company.com\n"
8745
" path=/dev/integration\n"
8746
" user=user2\n"
8747
" \n"
8748
" # proxy\n"
8749
" [proxy]\n"
8750
" scheme=http\n"
8751
" host=proxy.company.com\n"
8752
" port=3128\n"
8753
" user=proxyuser1\n"
8754
" password=proxypass1"
8755
msgstr ""
8756
8757
#: en/help_topics/authentication.txt:208
8758
msgid ""
8759
"\n"
8760
"Planned enhancements\n"
8761
"--------------------"
8762
msgstr ""
8763
8764
#: en/help_topics/authentication.txt:212
8765
msgid ""
8766
"The following are not yet implemented but planned as parts of a work in\n"
8767
"progress:"
8768
msgstr ""
8769
8770
#: en/help_topics/authentication.txt:215
8771
msgid "* add a ``password_encoding`` field allowing:"
8772
msgstr ""
8773
8774
#: en/help_topics/authentication.txt:217
8775
msgid ""
8776
" - storing the passwords in various obfuscating encodings (base64 for one),"
8777
msgstr ""
8778
8779
#: en/help_topics/authentication.txt:219
8780
msgid " - delegate password storage to plugins (.netrc for example)."
8781
msgstr ""
8782
8783
#: en/help_topics/authentication.txt:221
8784
msgid ""
8785
"* update the credentials when the user is prompted for user or password,"
8786
msgstr ""
8787
8788
#: en/help_topics/authentication.txt:223
8789
msgid "* add a ``verify_certificates`` field for ``HTTPS``."
8790
msgstr ""
8791
8792
#: en/help_topics/authentication.txt:225
8793
msgid ""
8794
"The ``password_encoding`` and ``verify_certificates`` fields are recognized "
8795
"but\n"
8796
"ignored in the actual implementation.\n"
8797
msgstr ""
8798
8799
#: en/help_topics/bugs.txt:1
8800
msgid "Bug Tracker Settings"
8801
msgstr ""
8802
8803
#: en/help_topics/bugs.txt:3
8804
msgid ""
8805
"When making a commit, metadata about bugs fixed by that change can be\n"
8806
"recorded by using the ``--fixes`` option. For each bug marked as fixed, an\n"
8807
"entry is included in the 'bugs' revision property stating '<url> <status>'.\n"
8808
"(The only ``status`` value currently supported is ``fixed.``)"
8809
msgstr ""
8810
8811
#: en/help_topics/bugs.txt:8
8812
msgid ""
8813
"The ``--fixes`` option allows you to specify a bug tracker and a bug "
8814
"identifier\n"
8815
"rather than a full URL. This looks like::"
8816
msgstr ""
8817
8818
#: en/help_topics/bugs.txt:11
8819
msgid " bzr commit --fixes <tracker>:<id>"
8820
msgstr ""
8821
8822
#: en/help_topics/bugs.txt:13 en/help_topics/configuration.txt:410
8823
msgid "or::"
8824
msgstr ""
8825
8826
#: en/help_topics/bugs.txt:15
8827
msgid " bzr commit --fixes <id>"
8828
msgstr ""
8829
8830
#: en/help_topics/bugs.txt:17
8831
msgid ""
8832
"where \"<tracker>\" is an identifier for the bug tracker, and \"<id>\" is "
8833
"the\n"
8834
"identifier for that bug within the bugtracker, usually the bug number.\n"
8835
"If \"<tracker>\" is not specified the ``bugtracker`` set in the branch\n"
8836
"or global configuration is used."
8837
msgstr ""
8838
8839
#: en/help_topics/bugs.txt:22
8840
msgid ""
8841
"Bazaar knows about a few bug trackers that have many users. If\n"
8842
"you use one of these bug trackers then there is no setup required to\n"
8843
"use this feature, you just need to know the tracker identifier to use.\n"
8844
"These are the bugtrackers that are built in:"
8845
msgstr ""
8846
8847
#: en/help_topics/bugs.txt:27
8848
msgid ""
8849
" ============================ ============ ============\n"
8850
" URL Abbreviation Example\n"
8851
" ============================ ============ ============\n"
8852
" https://bugs.launchpad.net/ lp lp:12345\n"
8853
" http://bugs.debian.org/ deb deb:12345\n"
8854
" http://bugzilla.gnome.org/ gnome gnome:12345\n"
8855
" ============================ ============ ============"
8856
msgstr ""
8857
8858
#: en/help_topics/bugs.txt:35
8859
msgid ""
8860
"For the bug trackers not listed above configuration is required.\n"
8861
"Support for generating the URLs for any project using Bugzilla or Trac\n"
8862
"is built in, along with a template mechanism for other bugtrackers with\n"
8863
"simple URL schemes. If your bug tracker can't be described by one\n"
8864
"of the schemes described below then you can write a plugin to support\n"
8865
"it."
8866
msgstr ""
8867
8868
#: en/help_topics/bugs.txt:42
8869
msgid ""
8870
"If you use Bugzilla or Trac, then you only need to set a configuration\n"
8871
"variable which contains the base URL of the bug tracker. These options\n"
8872
"can go into ``bazaar.conf``, ``branch.conf`` or into a branch-specific\n"
8873
"configuration section in ``locations.conf``. You can set up these values\n"
8874
"for each of the projects you work on."
8875
msgstr ""
8876
8877
#: en/help_topics/bugs.txt:48
8878
msgid ""
8879
"Note: As you provide a short name for each tracker, you can specify one or\n"
8880
"more bugs in one or more trackers at commit time if you wish."
8881
msgstr ""
8882
8883
#: en/help_topics/bugs.txt:51
8884
msgid ""
8885
"Launchpad\n"
8886
"---------"
8887
msgstr ""
8888
8889
#: en/help_topics/bugs.txt:54
8890
msgid ""
8891
"Use ``bzr commit --fixes lp:2`` to record that this commit fixes bug 2."
8892
msgstr ""
8893
8894
#: en/help_topics/bugs.txt:56
8895
msgid ""
8896
"bugzilla_<tracker>_url\n"
8897
"----------------------"
8898
msgstr ""
8899
8900
#: en/help_topics/bugs.txt:59
8901
msgid ""
8902
"If present, the location of the Bugzilla bug tracker referred to by\n"
8903
"<tracker>. This option can then be used together with ``bzr commit\n"
8904
"--fixes`` to mark bugs in that tracker as being fixed by that commit. For\n"
8905
"example::"
8906
msgstr ""
8907
8908
#: en/help_topics/bugs.txt:64
8909
msgid " bugzilla_squid_url = http://bugs.squid-cache.org"
8910
msgstr ""
8911
8912
#: en/help_topics/bugs.txt:66
8913
msgid ""
8914
"would allow ``bzr commit --fixes squid:1234`` to mark Squid's bug 1234 as\n"
8915
"fixed."
8916
msgstr ""
8917
8918
#: en/help_topics/bugs.txt:69
8919
msgid ""
8920
"trac_<tracker>_url\n"
8921
"------------------"
8922
msgstr ""
8923
8924
#: en/help_topics/bugs.txt:72
8925
msgid ""
8926
"If present, the location of the Trac instance referred to by\n"
8927
"<tracker>. This option can then be used together with ``bzr commit\n"
8928
"--fixes`` to mark bugs in that tracker as being fixed by that commit. For\n"
8929
"example::"
8930
msgstr ""
8931
8932
#: en/help_topics/bugs.txt:77
8933
msgid " trac_twisted_url = http://www.twistedmatrix.com/trac"
8934
msgstr ""
8935
8936
#: en/help_topics/bugs.txt:79
8937
msgid ""
8938
"would allow ``bzr commit --fixes twisted:1234`` to mark Twisted's bug 1234 "
8939
"as\n"
8940
"fixed."
8941
msgstr ""
8942
8943
#: en/help_topics/bugs.txt:82
8944
msgid ""
8945
"bugtracker_<tracker>_url\n"
8946
"------------------------"
8947
msgstr ""
8948
8949
#: en/help_topics/bugs.txt:85
8950
msgid ""
8951
"If present, the location of a generic bug tracker instance referred to by\n"
8952
"<tracker>. The location must contain an ``{id}`` placeholder,\n"
8953
"which will be replaced by a specific bug ID. This option can then be used\n"
8954
"together with ``bzr commit --fixes`` to mark bugs in that tracker as being\n"
8955
"fixed by that commit. For example::"
8956
msgstr ""
8957
8958
#: en/help_topics/bugs.txt:91
8959
msgid " bugtracker_python_url = http://bugs.python.org/issue{id}"
8960
msgstr ""
8961
8962
#: en/help_topics/bugs.txt:93
8963
msgid ""
8964
"would allow ``bzr commit --fixes python:1234`` to mark bug 1234 in Python's\n"
8965
"Roundup bug tracker as fixed, or::"
8966
msgstr ""
8967
8968
#: en/help_topics/bugs.txt:96
8969
msgid ""
8970
" bugtracker_cpan_url = http://rt.cpan.org/Public/Bug/Display.html?id={id}"
8971
msgstr ""
8972
8973
#: en/help_topics/bugs.txt:98
8974
msgid ""
8975
"would allow ``bzr commit --fixes cpan:1234`` to mark bug 1234 in CPAN's\n"
8976
"RT bug tracker as fixed, or::"
8977
msgstr ""
8978
8979
#: en/help_topics/bugs.txt:101
8980
msgid " bugtracker_hudson_url = http://issues.hudson-ci.org/browse/{id}"
8981
msgstr ""
8982
8983
#: en/help_topics/bugs.txt:103
8984
msgid ""
8985
"would allow ``bzr commit --fixes hudson:HUDSON-1234`` to mark bug HUDSON-"
8986
"1234\n"
8987
"in Hudson's JIRA bug tracker as fixed.\n"
8988
msgstr ""
8989
8990
#: en/help_topics/commands.txt:1
8991
msgid ""
8992
"add Add specified files or directories.\n"
8993
"alias Set/unset and display aliases.\n"
8994
"annotate Show the origin of each line in a file.\n"
8995
"bash-completion Generate a shell function for bash command line "
8996
"completion.\n"
8997
" [bash_completion]\n"
8998
"bind Convert the current branch into a checkout of the "
8999
"supplied\n"
9000
" branch.\n"
9001
"branch Create a new branch that is a copy of an existing branch.\n"
9002
"branches List the branches available at the current location.\n"
9003
"break-lock Break a dead lock.\n"
9004
"cat Write the contents of a file as of a given revision to\n"
9005
" standard output.\n"
9006
"check Validate working tree structure, branch consistency and\n"
9007
" repository history.\n"
9008
"checkout Create a new checkout of an existing branch.\n"
9009
"clean-tree Remove unwanted files from working tree.\n"
9010
"commit Commit changes into a new revision.\n"
9011
"config Display, set or remove a configuration option.\n"
9012
"conflicts List files with conflicts.\n"
9013
"deleted List files deleted in the working tree.\n"
9014
"diff Show differences in the working tree, between revisions "
9015
"or\n"
9016
" branches.\n"
9017
"dpush Push into a different VCS without any custom bzr "
9018
"metadata.\n"
9019
"export Export current or past revision to a destination directory "
9020
"or\n"
9021
" archive.\n"
9022
"help Show help on a command or other topic.\n"
9023
"ignore Ignore specified files or patterns.\n"
9024
"ignored List ignored files and the patterns that matched them.\n"
9025
"info Show information about a working tree, branch or "
9026
"repository.\n"
9027
"init Make a directory into a versioned branch.\n"
9028
"init-repository Create a shared repository for branches to share storage\n"
9029
" space.\n"
9030
"join Combine a tree into its containing tree.\n"
9031
"launchpad-login Show or set the Launchpad user ID. [launchpad]\n"
9032
"launchpad-mirror Ask Launchpad to mirror a branch now. [launchpad]\n"
9033
"launchpad-open Open a Launchpad branch page in your web browser. "
9034
"[launchpad]\n"
9035
"log Show historical log for a branch or subset of a branch.\n"
9036
"lp-find-proposal Find the proposal to merge this revision. [launchpad]\n"
9037
"lp-propose-merge Propose merging a branch on Launchpad. [launchpad]\n"
9038
"ls List files in a tree.\n"
9039
"merge Perform a three-way merge.\n"
9040
"missing Show unmerged/unpulled revisions between two branches.\n"
9041
"mkdir Create a new versioned directory.\n"
9042
"mv Move or rename a file.\n"
9043
"nick Print or set the branch nickname.\n"
9044
"pack Compress the data within a repository.\n"
9045
"plugins List the installed plugins.\n"
9046
"pull Turn this branch into a mirror of another branch.\n"
9047
"push Update a mirror of this branch.\n"
9048
"reconcile Reconcile bzr metadata in a branch.\n"
9049
"reconfigure Reconfigure the type of a bzr directory.\n"
9050
"register-branch Register a branch with launchpad.net. [launchpad]\n"
9051
"remerge Redo a merge.\n"
9052
"remove Remove files or directories.\n"
9053
"remove-branch Remove a branch.\n"
9054
"remove-tree Remove the working tree from a given branch/checkout.\n"
9055
"renames Show list of renamed files.\n"
9056
"resolve Mark a conflict as resolved.\n"
9057
"revert Set files in the working tree back to the contents of a\n"
9058
" previous revision.\n"
9059
"revno Show current revision number.\n"
9060
"root Show the tree root directory.\n"
9061
"send Mail or create a merge-directive for submitting changes.\n"
9062
"serve Run the bzr server.\n"
9063
"shelve Temporarily set aside some changes from the current tree.\n"
9064
"sign-my-commits Sign all commits by a given committer.\n"
9065
"split Split a subdirectory of a tree into a separate tree.\n"
9066
"status Display status summary.\n"
9067
"switch Set the branch of a checkout and update.\n"
9068
"tag Create, remove or modify a tag naming a revision.\n"
9069
"tags List tags.\n"
9070
"testament Show testament (signing-form) of a revision.\n"
9071
"unbind Convert the current checkout into a regular branch.\n"
9072
"uncommit Remove the last committed revision.\n"
9073
"unshelve Restore shelved changes.\n"
9074
"update Update a working tree to a new revision.\n"
9075
"upgrade Upgrade a repository, branch or working tree to a newer\n"
9076
" format.\n"
9077
"verify-signatures Verify all commit signatures.\n"
9078
"version Show version of bzr.\n"
9079
"version-info Show version information about this tree.\n"
9080
"view Manage filtered views.\n"
9081
"whoami Show or set bzr user id.\n"
9082
msgstr ""
9083
9084
#: en/help_topics/configuration.txt:1
9085
msgid ""
9086
"Configuration Settings\n"
9087
"======================="
9088
msgstr ""
9089
9090
#: en/help_topics/configuration.txt:4
9091
msgid ""
9092
"Environment settings\n"
9093
"---------------------"
9094
msgstr ""
9095
9096
#: en/help_topics/configuration.txt:7
9097
msgid ""
9098
"While most configuration is handled by configuration files, some options\n"
9099
"which may be semi-permanent can also be controlled through the environment."
9100
msgstr ""
9101
9102
#: en/help_topics/configuration.txt:10
9103
msgid ""
9104
"BZR_EMAIL\n"
9105
"~~~~~~~~~"
9106
msgstr ""
9107
9108
#: en/help_topics/configuration.txt:13
9109
msgid "Override the email id used by Bazaar. Typical format::"
9110
msgstr ""
9111
9112
#: en/help_topics/configuration.txt:15
9113
msgid " \"John Doe <jdoe@example.com>\""
9114
msgstr ""
9115
9116
#: en/help_topics/configuration.txt:17
9117
msgid "See also the ``email`` configuration option."
9118
msgstr ""
9119
9120
#: en/help_topics/configuration.txt:19
9121
msgid ""
9122
"BZR_PROGRESS_BAR\n"
9123
"~~~~~~~~~~~~~~~~"
9124
msgstr ""
9125
9126
#: en/help_topics/configuration.txt:22
9127
msgid ""
9128
"Override the progress display. Possible values are \"none\" or \"text\". "
9129
"If\n"
9130
"the value is \"none\" then no progress bar is displayed. The value \"text\" "
9131
"draws\n"
9132
"the ordinary command line progress bar."
9133
msgstr ""
9134
9135
#: en/help_topics/configuration.txt:26
9136
msgid ""
9137
"BZR_SIGQUIT_PDB\n"
9138
"~~~~~~~~~~~~~~~"
9139
msgstr ""
9140
9141
#: en/help_topics/configuration.txt:29
9142
msgid ""
9143
"Control whether SIGQUIT behaves normally or invokes a breakin debugger."
9144
msgstr ""
9145
9146
#: en/help_topics/configuration.txt:31
9147
msgid ""
9148
"* 0 = Standard SIGQUIT behavior (normally, exit with a core dump)\n"
9149
"* 1 = Invoke breakin debugger (default)"
9150
msgstr ""
9151
9152
#: en/help_topics/configuration.txt:34
9153
msgid ""
9154
"BZR_HOME\n"
9155
"~~~~~~~~"
9156
msgstr ""
9157
9158
#: en/help_topics/configuration.txt:37
9159
msgid "Override the home directory used by Bazaar."
9160
msgstr ""
9161
9162
#: en/help_topics/configuration.txt:39
9163
msgid ""
9164
"BZR_SSH\n"
9165
"~~~~~~~"
9166
msgstr ""
9167
9168
#: en/help_topics/configuration.txt:42
9169
msgid "Select a different SSH implementation."
9170
msgstr ""
9171
9172
#: en/help_topics/configuration.txt:44
9173
msgid ""
9174
"BZR_PDB\n"
9175
"~~~~~~~"
9176
msgstr ""
9177
9178
#: en/help_topics/configuration.txt:47
9179
msgid "Control whether to launch a debugger on error."
9180
msgstr ""
9181
9182
#: en/help_topics/configuration.txt:49
9183
msgid ""
9184
"* 0 = Standard behavior\n"
9185
"* 1 = Launch debugger"
9186
msgstr ""
9187
9188
#: en/help_topics/configuration.txt:52
9189
msgid ""
9190
"BZR_REMOTE_PATH\n"
9191
"~~~~~~~~~~~~~~~"
9192
msgstr ""
9193
9194
#: en/help_topics/configuration.txt:55
9195
msgid "Path to the Bazaar executable to use when using the bzr+ssh protocol."
9196
msgstr ""
9197
9198
#: en/help_topics/configuration.txt:57
9199
msgid "See also the ``bzr_remote_path`` configuration option."
9200
msgstr ""
9201
9202
#: en/help_topics/configuration.txt:59
9203
msgid ""
9204
"BZR_EDITOR\n"
9205
"~~~~~~~~~~"
9206
msgstr ""
9207
9208
#: en/help_topics/configuration.txt:62
9209
msgid "Path to the editor Bazaar should use for commit messages, etc."
9210
msgstr ""
9211
9212
#: en/help_topics/configuration.txt:64
9213
msgid ""
9214
"BZR_LOG\n"
9215
"~~~~~~~"
9216
msgstr ""
9217
9218
#: en/help_topics/configuration.txt:67
9219
msgid ""
9220
"Location of the Bazaar log file. You can check the current location by\n"
9221
"running ``bzr version``."
9222
msgstr ""
9223
9224
#: en/help_topics/configuration.txt:70
9225
msgid ""
9226
"The log file contains debug information that is useful for diagnosing or\n"
9227
"reporting problems with Bazaar."
9228
msgstr ""
9229
9230
#: en/help_topics/configuration.txt:73
9231
msgid ""
9232
"Setting this to ``NUL`` on Windows or ``/dev/null`` on other platforms\n"
9233
"will disable logging."
9234
msgstr ""
9235
9236
#: en/help_topics/configuration.txt:76
9237
msgid ""
9238
"\n"
9239
"BZR_PLUGIN_PATH\n"
9240
"~~~~~~~~~~~~~~~"
9241
msgstr ""
9242
9243
#: en/help_topics/configuration.txt:80
9244
msgid ""
9245
"The path to the plugins directory that Bazaar should use.\n"
9246
"If not set, Bazaar will search for plugins in:"
9247
msgstr ""
9248
9249
#: en/help_topics/configuration.txt:83
9250
msgid ""
9251
"* the user specific plugin directory (containing the ``user`` plugins),"
9252
msgstr ""
9253
9254
#: en/help_topics/configuration.txt:85
9255
msgid "* the bzrlib directory (containing the ``core`` plugins),"
9256
msgstr ""
9257
9258
#: en/help_topics/configuration.txt:87
9259
msgid ""
9260
"* the site specific plugin directory if applicable (containing\n"
9261
" the ``site`` plugins)."
9262
msgstr ""
9263
9264
#: en/help_topics/configuration.txt:90
9265
msgid ""
9266
"If ``BZR_PLUGIN_PATH`` is set in any fashion, it will change the\n"
9267
"the way the plugin are searched. "
9268
msgstr ""
9269
9270
#: en/help_topics/configuration.txt:93
9271
msgid ""
9272
"As for the ``PATH`` variables, if multiple directories are\n"
9273
"specified in ``BZR_PLUGIN_PATH`` they should be separated by the\n"
9274
"platform specific appropriate character (':' on Unix,\n"
9275
"';' on windows)"
9276
msgstr ""
9277
9278
#: en/help_topics/configuration.txt:98
9279
msgid ""
9280
"By default if ``BZR_PLUGIN_PATH`` is set, it replaces searching\n"
9281
"in ``user``. However it will continue to search in ``core`` and\n"
9282
"``site`` unless they are explicitly removed."
9283
msgstr ""
9284
9285
#: en/help_topics/configuration.txt:102
9286
msgid ""
9287
"If you need to change the order or remove one of these\n"
9288
"directories, you should use special values:"
9289
msgstr ""
9290
9291
#: en/help_topics/configuration.txt:105
9292
msgid ""
9293
"* ``-user``, ``-core``, ``-site`` will remove the corresponding\n"
9294
" path from the default values,"
9295
msgstr ""
9296
9297
#: en/help_topics/configuration.txt:108
9298
msgid ""
9299
"* ``+user``, ``+core``, ``+site`` will add the corresponding path\n"
9300
" before the remaining default values (and also remove it from\n"
9301
" the default values)."
9302
msgstr ""
9303
9304
#: en/help_topics/configuration.txt:112
9305
msgid ""
9306
"Note that the special values 'user', 'core' and 'site' should be\n"
9307
"used literally, they will be substituted by the corresponding,\n"
9308
"platform specific, values."
9309
msgstr ""
9310
9311
#: en/help_topics/configuration.txt:116
9312
msgid ""
9313
"The examples below use ':' as the separator, windows users\n"
9314
"should use ';'."
9315
msgstr ""
9316
9317
#: en/help_topics/configuration.txt:119
9318
msgid "Overriding the default user plugin directory::"
9319
msgstr ""
9320
9321
#: en/help_topics/configuration.txt:121
9322
msgid " BZR_PLUGIN_PATH='/path/to/my/other/plugins'"
9323
msgstr ""
9324
9325
#: en/help_topics/configuration.txt:123
9326
msgid "Disabling the site directory while retaining the user directory::"
9327
msgstr ""
9328
9329
#: en/help_topics/configuration.txt:125
9330
msgid " BZR_PLUGIN_PATH='-site:+user'"
9331
msgstr ""
9332
9333
#: en/help_topics/configuration.txt:127
9334
msgid "Disabling all plugins (better achieved with --no-plugins)::"
9335
msgstr ""
9336
9337
#: en/help_topics/configuration.txt:129
9338
msgid " BZR_PLUGIN_PATH='-user:-core:-site'"
9339
msgstr ""
9340
9341
#: en/help_topics/configuration.txt:131
9342
msgid "Overriding the default site plugin directory::"
9343
msgstr ""
9344
9345
#: en/help_topics/configuration.txt:133
9346
msgid " BZR_PLUGIN_PATH='/path/to/my/site/plugins:-site':+user"
9347
msgstr ""
9348
9349
#: en/help_topics/configuration.txt:135
9350
msgid ""
9351
"BZR_DISABLE_PLUGINS\n"
9352
"~~~~~~~~~~~~~~~~~~~"
9353
msgstr ""
9354
9355
#: en/help_topics/configuration.txt:138
9356
msgid ""
9357
"Under special circumstances (mostly when trying to diagnose a\n"
9358
"bug), it's better to disable a plugin (or several) rather than\n"
9359
"uninstalling them completely. Such plugins can be specified in\n"
9360
"the ``BZR_DISABLE_PLUGINS`` environment variable."
9361
msgstr ""
9362
9363
#: en/help_topics/configuration.txt:143
9364
msgid ""
9365
"In that case, ``bzr`` will stop loading the specified plugins and\n"
9366
"will raise an import error if they are explicitly imported (by\n"
9367
"another plugin that depends on them for example)."
9368
msgstr ""
9369
9370
#: en/help_topics/configuration.txt:147
9371
msgid "Disabling ``myplugin`` and ``yourplugin`` is achieved by::"
9372
msgstr ""
9373
9374
#: en/help_topics/configuration.txt:149
9375
msgid " BZR_DISABLE_PLUGINS='myplugin:yourplugin'"
9376
msgstr ""
9377
9378
#: en/help_topics/configuration.txt:151
9379
msgid ""
9380
"BZR_PLUGINS_AT\n"
9381
"~~~~~~~~~~~~~~"
9382
msgstr ""
9383
9384
#: en/help_topics/configuration.txt:154
9385
msgid ""
9386
"When adding a new feature or working on a bug in a plugin,\n"
9387
"developers often need to use a specific version of a given\n"
9388
"plugin. Since python requires that the directory containing the\n"
9389
"code is named like the plugin itself this make it impossible to\n"
9390
"use arbitrary directory names (using a two-level directory scheme\n"
9391
"is inconvenient). ``BZR_PLUGINS_AT`` allows such directories even\n"
9392
"if they don't appear in ``BZR_PLUGIN_PATH`` ."
9393
msgstr ""
9394
9395
#: en/help_topics/configuration.txt:162
9396
msgid ""
9397
"Plugins specified in this environment variable takes precedence\n"
9398
"over the ones in ``BZR_PLUGIN_PATH``."
9399
msgstr ""
9400
9401
#: en/help_topics/configuration.txt:165
9402
msgid ""
9403
"The variable specified a list of ``plugin_name@plugin path``,\n"
9404
"``plugin_name`` being the name of the plugin as it appears in\n"
9405
"python module paths, ``plugin_path`` being the path to the\n"
9406
"directory containing the plugin code itself\n"
9407
"(i.e. ``plugins/myplugin`` not ``plugins``). Use ':' as the list\n"
9408
"separator, use ';' on windows."
9409
msgstr ""
9410
9411
#: en/help_topics/configuration.txt:172
9412
msgid ""
9413
"Example:\n"
9414
"~~~~~~~~"
9415
msgstr ""
9416
9417
#: en/help_topics/configuration.txt:175
9418
msgid ""
9419
"Using a specific version of ``myplugin``:\n"
9420
"``BZR_PLUGINS_AT='myplugin@/home/me/bugfixes/123456-myplugin``"
9421
msgstr ""
9422
9423
#: en/help_topics/configuration.txt:178
9424
msgid ""
9425
"BZRPATH\n"
9426
"~~~~~~~"
9427
msgstr ""
9428
9429
#: en/help_topics/configuration.txt:181
9430
msgid "The path where Bazaar should look for shell plugin external commands."
9431
msgstr ""
9432
9433
#: en/help_topics/configuration.txt:183
9434
msgid ""
9435
"\n"
9436
"http_proxy, https_proxy\n"
9437
"~~~~~~~~~~~~~~~~~~~~~~~"
9438
msgstr ""
9439
9440
#: en/help_topics/configuration.txt:187
9441
msgid "Specifies the network proxy for outgoing connections, for example::"
9442
msgstr ""
9443
9444
#: en/help_topics/configuration.txt:189
9445
msgid ""
9446
" http_proxy=http://proxy.example.com:3128/ \n"
9447
" https_proxy=http://proxy.example.com:3128/"
9448
msgstr ""
9449
9450
#: en/help_topics/configuration.txt:192
9451
msgid ""
9452
"\n"
9453
"Configuration files\n"
9454
"-------------------"
9455
msgstr ""
9456
9457
#: en/help_topics/configuration.txt:196
9458
msgid ""
9459
"Location\n"
9460
"~~~~~~~~"
9461
msgstr ""
9462
9463
#: en/help_topics/configuration.txt:199
9464
msgid ""
9465
"Configuration files are located in ``$HOME/.bazaar`` on Unix and\n"
9466
"``C:\\Documents and Settings\\<username>\\Application Data\\Bazaar\\2.0`` "
9467
"on\n"
9468
"Windows. (You can check the location for your system by using\n"
9469
"``bzr version``.)"
9470
msgstr ""
9471
9472
#: en/help_topics/configuration.txt:204
9473
msgid "There are three primary configuration files in this location:"
9474
msgstr ""
9475
9476
#: en/help_topics/configuration.txt:206
9477
msgid "* ``bazaar.conf`` describes default configuration options,"
9478
msgstr ""
9479
9480
#: en/help_topics/configuration.txt:208
9481
msgid ""
9482
"* ``locations.conf`` describes configuration information for\n"
9483
" specific branch locations,"
9484
msgstr ""
9485
9486
#: en/help_topics/configuration.txt:211
9487
msgid ""
9488
"* ``authentication.conf`` describes credential information for\n"
9489
" remote servers."
9490
msgstr ""
9491
9492
#: en/help_topics/configuration.txt:214
9493
msgid ""
9494
"Each branch can also contain a configuration file that sets values specific\n"
9495
"to that branch. This file is found at ``.bzr/branch/branch.conf`` within "
9496
"the\n"
9497
"branch. This file is visible to all users of a branch, if you wish to "
9498
"override\n"
9499
"one of the values for a branch with a setting that is specific to you then "
9500
"you\n"
9501
"can do so in ``locations.conf``."
9502
msgstr ""
9503
9504
#: en/help_topics/configuration.txt:220
9505
msgid ""
9506
"General format\n"
9507
"~~~~~~~~~~~~~~"
9508
msgstr ""
9509
9510
#: en/help_topics/configuration.txt:223
9511
msgid ""
9512
"An ini file has three types of contructs: section headers, section\n"
9513
"options and comments."
9514
msgstr ""
9515
9516
#: en/help_topics/configuration.txt:226
9517
msgid ""
9518
"Comments\n"
9519
"^^^^^^^^"
9520
msgstr ""
9521
9522
#: en/help_topics/configuration.txt:229
9523
msgid ""
9524
"A comment is any line that starts with a \"#\" (sometimes called a \"hash\n"
9525
"mark\", \"pound sign\" or \"number sign\"). Comment lines are ignored by\n"
9526
"Bazaar when parsing ini files."
9527
msgstr ""
9528
9529
#: en/help_topics/configuration.txt:233
9530
msgid ""
9531
"Section headers\n"
9532
"^^^^^^^^^^^^^^^"
9533
msgstr ""
9534
9535
#: en/help_topics/configuration.txt:236
9536
msgid ""
9537
"A section header is a word enclosed in brackets that starts at the begining\n"
9538
"of a line. A typical section header looks like this::"
9539
msgstr ""
9540
9541
#: en/help_topics/configuration.txt:239
9542
msgid " [DEFAULT]"
9543
msgstr ""
9544
9545
#: en/help_topics/configuration.txt:241
9546
msgid ""
9547
"The only valid section headers for bazaar.conf currently are [DEFAULT] and\n"
9548
"[ALIASES]. Section headers are case sensitive. The default section provides "
9549
"for\n"
9550
"setting options which can be overridden with the branch config file."
9551
msgstr ""
9552
9553
#: en/help_topics/configuration.txt:245
9554
msgid ""
9555
"For ``locations.conf``, the options from the section with the\n"
9556
"longest matching section header are used to the exclusion of other\n"
9557
"potentially valid section headers. A section header uses the path for\n"
9558
"the branch as the section header. Some examples include::"
9559
msgstr ""
9560
9561
#: en/help_topics/configuration.txt:250
9562
msgid ""
9563
" [http://mybranches.isp.com/~jdoe/branchdir]\n"
9564
" [/home/jdoe/branches/]"
9565
msgstr ""
9566
9567
#: en/help_topics/configuration.txt:253
9568
msgid ""
9569
"\n"
9570
"Section options\n"
9571
"^^^^^^^^^^^^^^^"
9572
msgstr ""
9573
9574
#: en/help_topics/configuration.txt:257
9575
msgid ""
9576
"A section option resides within a section. A section option contains an\n"
9577
"option name, an equals sign and a value. For example::"
9578
msgstr ""
9579
9580
#: en/help_topics/configuration.txt:260
9581
msgid ""
9582
" email = John Doe <jdoe@isp.com>\n"
9583
" gpg_signing_key = Amy Pond <amy@example.com>"
9584
msgstr ""
9585
9586
#: en/help_topics/configuration.txt:263
9587
msgid ""
9588
"A option can reference other options by enclosing them in curly brackets::"
9589
msgstr ""
9590
9591
#: en/help_topics/configuration.txt:265
9592
msgid ""
9593
" my_branch_name = feature_x\n"
9594
" my_server = bzr+ssh://example.com\n"
9595
" push_location = {my_server}/project/{my_branch_name}"
9596
msgstr ""
9597
9598
#: en/help_topics/configuration.txt:269
9599
msgid ""
9600
"Option policies\n"
9601
"^^^^^^^^^^^^^^^"
9602
msgstr ""
9603
9604
#: en/help_topics/configuration.txt:272
9605
msgid ""
9606
"Options defined in a section affect the named directory or URL plus\n"
9607
"any locations they contain. Policies can be used to change how an\n"
9608
"option value is interpreted for contained locations. Currently\n"
9609
"there are three policies available:"
9610
msgstr ""
9611
9612
#: en/help_topics/configuration.txt:277
9613
msgid ""
9614
" none:\n"
9615
" the value is interpreted the same for contained locations. This is\n"
9616
" the default behaviour.\n"
9617
" norecurse:\n"
9618
" the value is only used for the exact location specified by the\n"
9619
" section name.\n"
9620
" appendpath:\n"
9621
" for contained locations, any additional path components are\n"
9622
" appended to the value."
9623
msgstr ""
9624
9625
#: en/help_topics/configuration.txt:287
9626
msgid ""
9627
"Policies are specified by keys with names of the form "
9628
"\"<option_name>:policy\".\n"
9629
"For example, to define the push location for a tree of branches, the\n"
9630
"following could be used::"
9631
msgstr ""
9632
9633
#: en/help_topics/configuration.txt:291
9634
msgid ""
9635
" [/top/location]\n"
9636
" push_location = sftp://example.com/location\n"
9637
" push_location:policy = appendpath"
9638
msgstr ""
9639
9640
#: en/help_topics/configuration.txt:295
9641
msgid ""
9642
"With this configuration, the push location for ``/top/location/branch1``\n"
9643
"would be ``sftp://example.com/location/branch1``."
9644
msgstr ""
9645
9646
#: en/help_topics/configuration.txt:298
9647
msgid ""
9648
"Section local options\n"
9649
"^^^^^^^^^^^^^^^^^^^^^"
9650
msgstr ""
9651
9652
#: en/help_topics/configuration.txt:301
9653
msgid ""
9654
"Some options are defined automatically inside a given section and can be\n"
9655
"refered to in this section only. "
9656
msgstr ""
9657
9658
#: en/help_topics/configuration.txt:304
9659
msgid "For example, the ``appendpath`` policy can be used like this::"
9660
msgstr ""
9661
9662
#: en/help_topics/configuration.txt:306
9663
msgid ""
9664
" [/home/vila/src/bzr/bugs]\n"
9665
" mypush = lp:~vila/bzr\n"
9666
" mypush:policy=appendpath"
9667
msgstr ""
9668
9669
#: en/help_topics/configuration.txt:310
9670
msgid "Using ``relpath`` to achieve the same result is done like this::"
9671
msgstr ""
9672
9673
#: en/help_topics/configuration.txt:312
9674
msgid ""
9675
" [/home/vila/src/bzr/bugs]\n"
9676
" mypush = lp:~vila/bzr/{relpath}"
9677
msgstr ""
9678
9679
#: en/help_topics/configuration.txt:315
9680
msgid ""
9681
"In both cases, when used in a directory like\n"
9682
"``/home/vila/src/bzr/bugs/832013-expand-in-stack`` we'll get::"
9683
msgstr ""
9684
9685
#: en/help_topics/configuration.txt:318 en/help_topics/configuration.txt:329
9686
msgid ""
9687
" $ bzr config mypush\n"
9688
" lp:~vila/bzr/832013-expand-in-stack"
9689
msgstr ""
9690
9691
#: en/help_topics/configuration.txt:321
9692
msgid "Another such option is ``basename`` which can be used like this::"
9693
msgstr ""
9694
9695
#: en/help_topics/configuration.txt:323
9696
msgid ""
9697
" [/home/vila/src/bzr]\n"
9698
" mypush = lp:~vila/bzr/{basename}"
9699
msgstr ""
9700
9701
#: en/help_topics/configuration.txt:326
9702
msgid ""
9703
"When used in a directory like\n"
9704
"``/home/vila/src/bzr/bugs/832013-expand-in-stack`` we'll get::"
9705
msgstr ""
9706
9707
#: en/help_topics/configuration.txt:332
9708
msgid ""
9709
"Note that ``basename`` here refers to the base name of ``relpath`` which\n"
9710
"itself is defined as the relative path between the section name and the\n"
9711
"location it matches."
9712
msgstr ""
9713
9714
#: en/help_topics/configuration.txt:336
9715
msgid ""
9716
"Another such option is ``branchname``, which refers to the name of a "
9717
"colocated\n"
9718
"branch. For non-colocated branches, it behaves like basename. It can be "
9719
"used\n"
9720
"like this::"
9721
msgstr ""
9722
9723
#: en/help_topics/configuration.txt:340
9724
msgid ""
9725
" [/home/vila/src/bzr/bugs]\n"
9726
" mypush = lp:~vila/bzr/{branchname}"
9727
msgstr ""
9728
9729
#: en/help_topics/configuration.txt:343
9730
msgid ""
9731
"When used with a colocated branch named ``832013-expand-in-stack``, we'll "
9732
"get::"
9733
msgstr ""
9734
9735
#: en/help_topics/configuration.txt:345
9736
msgid ""
9737
" bzr config mypush\n"
9738
" lp:~vila/bzr/832013-expand-in-stack"
9739
msgstr ""
9740
9741
#: en/help_topics/configuration.txt:348
9742
msgid ""
9743
"When an option is local to a Section, it cannot be referred to from option\n"
9744
"values in any other section from the same ``Store`` nor from any other\n"
9745
"``Store``."
9746
msgstr ""
9747
9748
#: en/help_topics/configuration.txt:352
9749
msgid ""
9750
"\n"
9751
"The main configuration file, bazaar.conf\n"
9752
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
9753
msgstr ""
9754
9755
#: en/help_topics/configuration.txt:356
9756
msgid ""
9757
"``bazaar.conf`` allows two sections: ``[DEFAULT]`` and ``[ALIASES]``.\n"
9758
"The default section contains the default\n"
9759
"configuration options for all branches. The default section can be\n"
9760
"overriden by providing a branch-specific section in ``locations.conf``."
9761
msgstr ""
9762
9763
#: en/help_topics/configuration.txt:361
9764
msgid "A typical ``bazaar.conf`` section often looks like the following::"
9765
msgstr ""
9766
9767
#: en/help_topics/configuration.txt:363
9768
msgid ""
9769
" [DEFAULT]\n"
9770
" email = John Doe <jdoe@isp.com>\n"
9771
" editor = /usr/bin/vim\n"
9772
" create_signatures = when-required"
9773
msgstr ""
9774
9775
#: en/help_topics/configuration.txt:368
9776
msgid ""
9777
"\n"
9778
"The branch location configuration file, locations.conf\n"
9779
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
9780
msgstr ""
9781
9782
#: en/help_topics/configuration.txt:372
9783
msgid ""
9784
"``locations.conf`` allows one to specify overriding settings for\n"
9785
"a specific branch. The format is almost identical to the default section in\n"
9786
"bazaar.conf with one significant change: The section header, instead of "
9787
"saying\n"
9788
"default, will be the path to a branch that you wish to override a value\n"
9789
"for. The '?' and '*' wildcards are supported::"
9790
msgstr ""
9791
9792
#: en/help_topics/configuration.txt:378
9793
msgid ""
9794
" [/home/jdoe/branches/nethack]\n"
9795
" email = Nethack Admin <nethack@nethack.com>"
9796
msgstr ""
9797
9798
#: en/help_topics/configuration.txt:381
9799
msgid ""
9800
" [http://hypothetical.site.com/branches/devel-branch]\n"
9801
" create_signatures = always"
9802
msgstr ""
9803
9804
#: en/help_topics/configuration.txt:384
9805
msgid ""
9806
"The authentication configuration file, authentication.conf\n"
9807
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
9808
msgstr ""
9809
9810
#: en/help_topics/configuration.txt:387
9811
msgid ""
9812
"``authentication.conf`` allows one to specify credentials for\n"
9813
"remote servers. This can be used for all the supported transports and any "
9814
"part\n"
9815
"of bzr that requires authentication (smtp for example)."
9816
msgstr ""
9817
9818
#: en/help_topics/configuration.txt:391
9819
msgid ""
9820
"The syntax of the file obeys the same rules as the others except for the\n"
9821
"option policies which don't apply."
9822
msgstr ""
9823
9824
#: en/help_topics/configuration.txt:394
9825
msgid ""
9826
"For more information on the possible uses of the authentication "
9827
"configuration\n"
9828
"file see :doc:`authentication-help`."
9829
msgstr ""
9830
9831
#: en/help_topics/configuration.txt:397
9832
msgid ""
9833
"\n"
9834
"Common options\n"
9835
"--------------"
9836
msgstr ""
9837
9838
#: en/help_topics/configuration.txt:401
9839
msgid ""
9840
"debug_flags\n"
9841
"~~~~~~~~~~~"
9842
msgstr ""
9843
9844
#: en/help_topics/configuration.txt:404
9845
msgid ""
9846
"A comma-separated list of debugging options to turn on. The same values\n"
9847
"can be used as with the -D command-line option (see `help global-options`).\n"
9848
"For example::"
9849
msgstr ""
9850
9851
#: en/help_topics/configuration.txt:408
9852
msgid " debug_flags = hpss"
9853
msgstr ""
9854
9855
#: en/help_topics/configuration.txt:412
9856
msgid " debug_flags = hpss,evil"
9857
msgstr ""
9858
9859
#: en/help_topics/configuration.txt:414
9860
msgid ""
9861
"email\n"
9862
"~~~~~"
9863
msgstr ""
9864
9865
#: en/help_topics/configuration.txt:417
9866
msgid ""
9867
"The email address to use when committing a branch. Typically takes the form\n"
9868
"of::"
9869
msgstr ""
9870
9871
#: en/help_topics/configuration.txt:420
9872
msgid " email = Full Name <account@hostname.tld>"
9873
msgstr ""
9874
9875
#: en/help_topics/configuration.txt:422
9876
msgid ""
9877
"editor\n"
9878
"~~~~~~"
9879
msgstr ""
9880
9881
#: en/help_topics/configuration.txt:425
9882
msgid ""
9883
"The path of the editor that you wish to use if *bzr commit* is run without\n"
9884
"a commit message. This setting is trumped by the environment variable\n"
9885
"``BZR_EDITOR``, and overrides the ``VISUAL`` and ``EDITOR`` environment\n"
9886
"variables."
9887
msgstr ""
9888
9889
#: en/help_topics/configuration.txt:430
9890
msgid ""
9891
"log_format\n"
9892
"~~~~~~~~~~"
9893
msgstr ""
9894
9895
#: en/help_topics/configuration.txt:433
9896
msgid ""
9897
"The default log format to use. Standard log formats are ``long``, ``short``\n"
9898
"and ``line``. Additional formats may be provided by plugins. The default\n"
9899
"value is ``long``."
9900
msgstr ""
9901
9902
#: en/help_topics/configuration.txt:437
9903
msgid ""
9904
"check_signatures\n"
9905
"~~~~~~~~~~~~~~~~"
9906
msgstr ""
9907
9908
#: en/help_topics/configuration.txt:440
9909
msgid ""
9910
"Reserved for future use. These options will allow a policy for branches to\n"
9911
"require signatures."
9912
msgstr ""
9913
9914
#: en/help_topics/configuration.txt:443
9915
msgid ""
9916
"require\n"
9917
" The gnupg signature for revisions must be present and must be valid."
9918
msgstr ""
9919
9920
#: en/help_topics/configuration.txt:446
9921
msgid ""
9922
"ignore\n"
9923
" Do not check gnupg signatures of revisions."
9924
msgstr ""
9925
9926
#: en/help_topics/configuration.txt:449
9927
msgid ""
9928
"check-available\n"
9929
" (default) If gnupg signatures for revisions are present, check them.\n"
9930
" Bazaar will fail if it finds a bad signature, but will not fail if\n"
9931
" no signature is present."
9932
msgstr ""
9933
9934
#: en/help_topics/configuration.txt:454
9935
msgid ""
9936
"create_signatures\n"
9937
"~~~~~~~~~~~~~~~~~"
9938
msgstr ""
9939
9940
#: en/help_topics/configuration.txt:457
9941
msgid ""
9942
"Defines the behaviour of signing revisions on commits. By default bzr will "
9943
"not\n"
9944
"sign new commits."
9945
msgstr ""
9946
9947
#: en/help_topics/configuration.txt:460
9948
msgid ""
9949
"always\n"
9950
" Sign every new revision that is committed. If the signing fails then "
9951
"the\n"
9952
" commit will not be made."
9953
msgstr ""
9954
9955
#: en/help_topics/configuration.txt:464
9956
msgid ""
9957
"when-required\n"
9958
" Reserved for future use."
9959
msgstr ""
9960
9961
#: en/help_topics/configuration.txt:467
9962
msgid ""
9963
"never\n"
9964
" Reserved for future use."
9965
msgstr ""
9966
9967
#: en/help_topics/configuration.txt:470
9968
msgid ""
9969
"In future it is planned that ``when-required`` will sign newly\n"
9970
"committed revisions only when the branch requires them. ``never`` will "
9971
"refuse\n"
9972
"to sign newly committed revisions, even if the branch requires signatures."
9973
msgstr ""
9974
9975
#: en/help_topics/configuration.txt:474
9976
msgid ""
9977
"dirstate.fdatasync\n"
9978
"~~~~~~~~~~~~~~~~~~"
9979
msgstr ""
9980
9981
#: en/help_topics/configuration.txt:477
9982
msgid ""
9983
"If true (default), working tree metadata changes are flushed through the\n"
9984
"OS buffers to physical disk. This is somewhat slower, but means data\n"
9985
"should not be lost if the machine crashes. See also repository.fdatasync."
9986
msgstr ""
9987
9988
#: en/help_topics/configuration.txt:481
9989
msgid ""
9990
"gpg_signing_key\n"
9991
"~~~~~~~~~~~~~~~"
9992
msgstr ""
9993
9994
#: en/help_topics/configuration.txt:484
9995
msgid ""
9996
"The GnuPG user identity to use when signing commits. Can be an e-mail\n"
9997
"address, key fingerprint or full key ID. When unset or when set to\n"
9998
"\"default\" Bazaar will use the user e-mail set with ``whoami``."
9999
msgstr ""
10000
10001
#: en/help_topics/configuration.txt:488
10002
msgid ""
10003
"recurse\n"
10004
"~~~~~~~"
10005
msgstr ""
10006
10007
#: en/help_topics/configuration.txt:491
10008
msgid ""
10009
"Only useful in ``locations.conf``. Defines whether or not the\n"
10010
"configuration for this section applies to subdirectories:"
10011
msgstr ""
10012
10013
#: en/help_topics/configuration.txt:494
10014
msgid ""
10015
"true\n"
10016
" (default) This section applies to subdirectories as well."
10017
msgstr ""
10018
10019
#: en/help_topics/configuration.txt:497
10020
msgid ""
10021
"false\n"
10022
" This section only applies to the branch at this directory and not\n"
10023
" branches below it."
10024
msgstr ""
10025
10026
#: en/help_topics/configuration.txt:501
10027
msgid ""
10028
"gpg_signing_command\n"
10029
"~~~~~~~~~~~~~~~~~~~"
10030
msgstr ""
10031
10032
#: en/help_topics/configuration.txt:504
10033
msgid ""
10034
"(Default: \"gpg\"). Which program should be used to sign and check "
10035
"revisions.\n"
10036
"For example::"
10037
msgstr ""
10038
10039
#: en/help_topics/configuration.txt:507
10040
msgid " gpg_signing_command = /usr/bin/gnpg"
10041
msgstr ""
10042
10043
#: en/help_topics/configuration.txt:509
10044
msgid ""
10045
"The specified command must accept the options \"--clearsign\" and \"-u "
10046
"<email>\"."
10047
msgstr ""
10048
10049
#: en/help_topics/configuration.txt:511
10050
msgid ""
10051
"bzr_remote_path\n"
10052
"~~~~~~~~~~~~~~~"
10053
msgstr ""
10054
10055
#: en/help_topics/configuration.txt:514
10056
msgid ""
10057
"(Default: \"bzr\"). The path to the command that should be used to run the "
10058
"smart\n"
10059
"server for bzr. This value may only be specified in locations.conf, because:"
10060
msgstr ""
10061
10062
#: en/help_topics/configuration.txt:517
10063
msgid ""
10064
"- it's needed before branch.conf is accessible\n"
10065
"- allowing remote branch.conf files to specify commands would be a security\n"
10066
" risk"
10067
msgstr ""
10068
10069
#: en/help_topics/configuration.txt:521
10070
msgid "It is overridden by the BZR_REMOTE_PATH environment variable."
10071
msgstr ""
10072
10073
#: en/help_topics/configuration.txt:523
10074
msgid ""
10075
"smtp_server\n"
10076
"~~~~~~~~~~~"
10077
msgstr ""
10078
10079
#: en/help_topics/configuration.txt:526
10080
msgid ""
10081
"(Default: \"localhost\"). SMTP server to use when Bazaar needs to send\n"
10082
"email, eg. with ``merge-directive --mail-to``, or the bzr-email plugin."
10083
msgstr ""
10084
10085
#: en/help_topics/configuration.txt:529
10086
msgid ""
10087
"smtp_username, smtp_password\n"
10088
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
10089
msgstr ""
10090
10091
#: en/help_topics/configuration.txt:532
10092
msgid ""
10093
"User and password to authenticate to the SMTP server. If smtp_username\n"
10094
"is set, and smtp_password is not, Bazaar will prompt for a password.\n"
10095
"These settings are only needed if the SMTP server requires authentication\n"
10096
"to send mail."
10097
msgstr ""
10098
10099
#: en/help_topics/configuration.txt:537
10100
msgid ""
10101
"locks.steal_dead\n"
10102
"~~~~~~~~~~~~~~~~"
10103
msgstr ""
10104
10105
#: en/help_topics/configuration.txt:540
10106
msgid ""
10107
"If set to true, bzr will automatically break locks held by processes from\n"
10108
"the same machine and user that are no longer alive. Otherwise, it will\n"
10109
"print a message and you can break the lock manually, if you are satisfied\n"
10110
"the object is no longer in use."
10111
msgstr ""
10112
10113
#: en/help_topics/configuration.txt:545
10114
msgid ""
10115
"mail_client\n"
10116
"~~~~~~~~~~~"
10117
msgstr ""
10118
10119
#: en/help_topics/configuration.txt:548
10120
msgid ""
10121
"A mail client to use for sending merge requests.\n"
10122
"By default, bzr will try to use ``mapi`` on Windows. On other platforms, "
10123
"it\n"
10124
"will try ``xdg-email``. If either of these fails, it will fall back to\n"
10125
"``editor``."
10126
msgstr ""
10127
10128
#: en/help_topics/configuration.txt:553
10129
msgid "Supported values for specific clients:"
10130
msgstr ""
10131
10132
#: en/help_topics/configuration.txt:555
10133
msgid ""
10134
":claws: Use Claws. This skips a dialog for attaching files.\n"
10135
":evolution: Use Evolution.\n"
10136
":kmail: Use KMail.\n"
10137
":mutt: Use Mutt.\n"
10138
":thunderbird: Use Mozilla Thunderbird or Icedove. For Thunderbird/Icedove "
10139
"1.5,\n"
10140
" this works around some bugs that xdg-email doesn't handle."
10141
msgstr ""
10142
10143
#: en/help_topics/configuration.txt:562
10144
msgid "Supported generic values are:"
10145
msgstr ""
10146
10147
#: en/help_topics/configuration.txt:564
10148
msgid ""
10149
":default: See above.\n"
10150
":editor: Use your editor to compose the merge request. This also uses\n"
10151
" your commit id, (see ``bzr whoami``), smtp_server and (optionally)\n"
10152
" smtp_username and smtp_password.\n"
10153
":mapi: Use your preferred e-mail client on Windows.\n"
10154
":xdg-email: Use xdg-email to run your preferred mail program"
10155
msgstr ""
10156
10157
#: en/help_topics/configuration.txt:571
10158
msgid ""
10159
"repository.fdatasync\n"
10160
"~~~~~~~~~~~~~~~~~~~~"
10161
msgstr ""
10162
10163
#: en/help_topics/configuration.txt:574
10164
msgid ""
10165
"If true (default), repository changes are flushed through the OS buffers\n"
10166
"to physical disk. This is somewhat slower, but means data should not be\n"
10167
"lost if the machine crashes. See also dirstate.fdatasync."
10168
msgstr ""
10169
10170
#: en/help_topics/configuration.txt:578
10171
msgid ""
10172
"submit_branch\n"
10173
"~~~~~~~~~~~~~"
10174
msgstr ""
10175
10176
#: en/help_topics/configuration.txt:581
10177
msgid ""
10178
"The branch you intend to submit your current work to. This is "
10179
"automatically\n"
10180
"set by ``bzr send``, and is also used by the ``submit:`` revision spec. "
10181
"This\n"
10182
"should usually be set on a per-branch or per-location basis."
10183
msgstr ""
10184
10185
#: en/help_topics/configuration.txt:585
10186
msgid ""
10187
"public_branch\n"
10188
"~~~~~~~~~~~~~"
10189
msgstr ""
10190
10191
#: en/help_topics/configuration.txt:588
10192
msgid ""
10193
"A publically-accessible version of this branch (implying that this version "
10194
"is\n"
10195
"not publically-accessible). Used (and set) by ``bzr send``."
10196
msgstr ""
10197
10198
#: en/help_topics/configuration.txt:591
10199
msgid ""
10200
"suppress_warnings\n"
10201
"~~~~~~~~~~~~~~~~~"
10202
msgstr ""
10203
10204
#: en/help_topics/configuration.txt:594
10205
msgid ""
10206
"A list of strings, each string represent a warning that can be emitted by\n"
10207
"bzr. Mentioning a warning in this list tells bzr to not emit it."
10208
msgstr ""
10209
10210
#: en/help_topics/configuration.txt:597
10211
msgid "Valid values:"
10212
msgstr ""
10213
10214
#: en/help_topics/configuration.txt:599
10215
msgid ""
10216
"* ``format_deprecation``:\n"
10217
" whether the format deprecation warning is shown on repositories that "
10218
"are\n"
10219
" using deprecated formats."
10220
msgstr ""
10221
10222
#: en/help_topics/configuration.txt:603
10223
msgid ""
10224
"default_format\n"
10225
"~~~~~~~~~~~~~~"
10226
msgstr ""
10227
10228
#: en/help_topics/configuration.txt:606
10229
msgid ""
10230
"A format name for the default format used when creating branches. See "
10231
"``bzr\n"
10232
"help formats`` for possible values."
10233
msgstr ""
10234
10235
#: en/help_topics/configuration.txt:609
10236
msgid ""
10237
"\n"
10238
"Unicode options\n"
10239
"---------------"
10240
msgstr ""
10241
10242
#: en/help_topics/configuration.txt:613
10243
msgid ""
10244
"output_encoding\n"
10245
"~~~~~~~~~~~~~~~"
10246
msgstr ""
10247
10248
#: en/help_topics/configuration.txt:616
10249
msgid ""
10250
"A Python unicode encoding name for text output from bzr, such as log\n"
10251
"information. Values include: utf8, cp850, ascii, iso-8859-1. The default\n"
10252
"is the terminal encoding prefered by the operating system."
10253
msgstr ""
10254
10255
#: en/help_topics/configuration.txt:620
10256
msgid ""
10257
"\n"
10258
"Branch type specific options\n"
10259
"----------------------------"
10260
msgstr ""
10261
10262
#: en/help_topics/configuration.txt:624
10263
msgid ""
10264
"These options apply only to branches that use the ``dirstate-tags`` or\n"
10265
"later format. They\n"
10266
"are usually set in ``.bzr/branch/branch.conf`` automatically, but may be\n"
10267
"manually set in ``locations.conf`` or ``bazaar.conf``."
10268
msgstr ""
10269
10270
#: en/help_topics/configuration.txt:629
10271
msgid ""
10272
"append_revisions_only\n"
10273
"~~~~~~~~~~~~~~~~~~~~~"
10274
msgstr ""
10275
10276
#: en/help_topics/configuration.txt:632
10277
msgid ""
10278
"If set to \"True\" then revisions can only be appended to the log, not\n"
10279
"removed. A branch with this setting enabled can only pull from another\n"
10280
"branch if the other branch's log is a longer version of its own. This is\n"
10281
"normally set by ``bzr init --append-revisions-only``. If you set it\n"
10282
"manually, use either 'True' or 'False' (case-sensitive) to maintain\n"
10283
"compatibility with previous bzr versions (older than 2.2)."
10284
msgstr ""
10285
10286
#: en/help_topics/configuration.txt:639
10287
msgid ""
10288
"parent_location\n"
10289
"~~~~~~~~~~~~~~~"
10290
msgstr ""
10291
10292
#: en/help_topics/configuration.txt:642
10293
msgid ""
10294
"If present, the location of the default branch for pull or merge. This "
10295
"option\n"
10296
"is normally set when creating a branch, the first ``pull`` or by ``pull\n"
10297
"--remember``."
10298
msgstr ""
10299
10300
#: en/help_topics/configuration.txt:646
10301
msgid ""
10302
"push_location\n"
10303
"~~~~~~~~~~~~~"
10304
msgstr ""
10305
10306
#: en/help_topics/configuration.txt:649
10307
msgid ""
10308
"If present, the location of the default branch for push. This option\n"
10309
"is normally set by the first ``push`` or ``push --remember``."
10310
msgstr ""
10311
10312
#: en/help_topics/configuration.txt:652
10313
msgid ""
10314
"push_strict\n"
10315
"~~~~~~~~~~~"
10316
msgstr ""
10317
10318
#: en/help_topics/configuration.txt:655
10319
msgid ""
10320
"If present, defines the ``--strict`` option default value for checking\n"
10321
"uncommitted changes before pushing."
10322
msgstr ""
10323
10324
#: en/help_topics/configuration.txt:658
10325
msgid ""
10326
"dpush_strict\n"
10327
"~~~~~~~~~~~~"
10328
msgstr ""
10329
10330
#: en/help_topics/configuration.txt:661
10331
msgid ""
10332
"If present, defines the ``--strict`` option default value for checking\n"
10333
"uncommitted changes before pushing into a different VCS without any\n"
10334
"custom bzr metadata."
10335
msgstr ""
10336
10337
#: en/help_topics/configuration.txt:665
10338
msgid ""
10339
"bound_location\n"
10340
"~~~~~~~~~~~~~~"
10341
msgstr ""
10342
10343
#: en/help_topics/configuration.txt:668
10344
msgid ""
10345
"The location that commits should go to when acting as a checkout.\n"
10346
"This option is normally set by ``bind``."
10347
msgstr ""
10348
10349
#: en/help_topics/configuration.txt:671
10350
msgid ""
10351
"bound\n"
10352
"~~~~~"
10353
msgstr ""
10354
10355
#: en/help_topics/configuration.txt:674
10356
msgid ""
10357
"If set to \"True\", the branch should act as a checkout, and push each "
10358
"commit to\n"
10359
"the bound_location. This option is normally set by ``bind``/``unbind``."
10360
msgstr ""
10361
10362
#: en/help_topics/configuration.txt:677
10363
msgid ""
10364
"send_strict\n"
10365
"~~~~~~~~~~~"
10366
msgstr ""
10367
10368
#: en/help_topics/configuration.txt:680
10369
msgid ""
10370
"If present, defines the ``--strict`` option default value for checking\n"
10371
"uncommitted changes before sending a merge directive."
10372
msgstr ""
10373
10374
#: en/help_topics/configuration.txt:683
10375
msgid ""
10376
"add.maximum_file_size\n"
10377
"~~~~~~~~~~~~~~~~~~~~~"
10378
msgstr ""
10379
10380
#: en/help_topics/configuration.txt:686
10381
msgid ""
10382
"Defines the maximum file size the command line \"add\" operation will allow\n"
10383
"in recursive mode, with files larger than this value being skipped. You may "
10384
"\n"
10385
"specify this value as an integer (in which case it is interpreted as bytes), "
10386
"\n"
10387
"or you may specify the value using SI units, i.e. 10KB, 20MB, 1G. A value of "
10388
"0 \n"
10389
"will disable skipping."
10390
msgstr ""
10391
10392
#: en/help_topics/configuration.txt:692
10393
msgid ""
10394
"External Merge Tools\n"
10395
"--------------------"
10396
msgstr ""
10397
10398
#: en/help_topics/configuration.txt:695
10399
msgid ""
10400
"bzr.mergetool.<name>\n"
10401
"~~~~~~~~~~~~~~~~~~~~"
10402
msgstr ""
10403
10404
#: en/help_topics/configuration.txt:698
10405
msgid ""
10406
"Defines an external merge tool called <name> with the given command-line.\n"
10407
"Arguments containing spaces should be quoted using single or double quotes. "
10408
"The\n"
10409
"executable may omit its path if it can be found on the PATH."
10410
msgstr ""
10411
10412
#: en/help_topics/configuration.txt:702
10413
msgid ""
10414
"The following markers can be used in the command-line to substitute "
10415
"filenames\n"
10416
"involved in the merge conflict::"
10417
msgstr ""
10418
10419
#: en/help_topics/configuration.txt:705
10420
msgid ""
10421
" {base} file.BASE\n"
10422
" {this} file.THIS\n"
10423
" {other} file.OTHER\n"
10424
" {result} output file\n"
10425
" {this_temp} temp copy of file.THIS, used to overwrite output file if "
10426
"merge\n"
10427
" succeeds."
10428
msgstr ""
10429
10430
#: en/help_topics/configuration.txt:714
10431
msgid " bzr.mergetool.kdiff3 = kdiff3 {base} {this} {other} -o {result}"
10432
msgstr ""
10433
10434
#: en/help_topics/configuration.txt:716
10435
msgid ""
10436
"bzr.default_mergetool\n"
10437
"~~~~~~~~~~~~~~~~~~~~~"
10438
msgstr ""
10439
10440
#: en/help_topics/configuration.txt:719
10441
msgid ""
10442
"Specifies which external merge tool (as defined above) should be selected "
10443
"by\n"
10444
"default in tools such as ``bzr qconflicts``."
10445
msgstr ""
10446
10447
#: en/help_topics/configuration.txt:724
10448
msgid " bzr.default_mergetool = kdiff3\n"
10449
msgstr ""
10450
10451
#: en/help_topics/conflict-types.txt:1
10452
msgid ""
10453
"Conflict Types\n"
10454
"=============="
10455
msgstr ""
10456
10457
#: en/help_topics/conflict-types.txt:4
10458
msgid ""
10459
"Some operations, like merge, revert and pull, modify the contents of your\n"
10460
"working tree. These modifications are programmatically generated, and so "
10461
"they\n"
10462
"may conflict with the current state of your working tree. "
10463
msgstr ""
10464
10465
#: en/help_topics/conflict-types.txt:8
10466
msgid ""
10467
"When conflicts are present in your working tree (as shown by ``bzr\n"
10468
"conflicts``), you should resolve them and then inform bzr that the "
10469
"conflicts\n"
10470
"have been resolved."
10471
msgstr ""
10472
10473
#: en/help_topics/conflict-types.txt:12
10474
msgid ""
10475
"Resolving conflicts is sometimes not obvious. Either because the user that\n"
10476
"should resolve them is not the one responsible for their occurrence, as is "
10477
"the\n"
10478
"case when merging other people's work or because some conflicts are "
10479
"presented\n"
10480
"in a way that is not easy to understand."
10481
msgstr ""
10482
10483
#: en/help_topics/conflict-types.txt:17
10484
msgid ""
10485
"Bazaar tries to avoid conflicts ; its aim is to ask you to resolve the\n"
10486
"conflict if and only if there's an actual conceptual conflict in the source\n"
10487
"tree. Because Bazaar doesn't understand the real meaning of the files "
10488
"being\n"
10489
"versioned, it can, when faced with ambiguities, fall short in either "
10490
"direction\n"
10491
"trying to resolve the conflict itself. Many kinds of changes can be "
10492
"combined\n"
10493
"programmatically, but sometimes only a human can determine the right thing "
10494
"to\n"
10495
"do."
10496
msgstr ""
10497
10498
#: en/help_topics/conflict-types.txt:25
10499
msgid ""
10500
"When Bazaar generates a conflict, it adds information into the working tree "
10501
"to\n"
10502
"present the conflicting versions, and it's up to you to find the correct\n"
10503
"resolution."
10504
msgstr ""
10505
10506
#: en/help_topics/conflict-types.txt:29
10507
msgid "Whatever the conflict is, resolving it is roughly done in two steps:"
10508
msgstr ""
10509
10510
#: en/help_topics/conflict-types.txt:31
10511
msgid ""
10512
"1. Modify the working tree content so that the conflicted item is now in "
10513
"the\n"
10514
" state you want to keep, then"
10515
msgstr ""
10516
10517
#: en/help_topics/conflict-types.txt:34
10518
msgid ""
10519
"2. Inform Bazaar that the conflict is now solved and ask to cleanup any\n"
10520
" remaining generated information (``bzr resolve <item>``)."
10521
msgstr ""
10522
10523
#: en/help_topics/conflict-types.txt:37
10524
msgid ""
10525
"For most conflict types, there are some obvious ways to modify the working\n"
10526
"tree and put it into the desired state. For some types of conflicts, Bazaar\n"
10527
"itself already made a choice, when possible."
10528
msgstr ""
10529
10530
#: en/help_topics/conflict-types.txt:41
10531
msgid ""
10532
"Yet, whether Bazaar makes a choice or not, there are some other simple but\n"
10533
"different ways to resolve the conflict."
10534
msgstr ""
10535
10536
#: en/help_topics/conflict-types.txt:44
10537
msgid ""
10538
"Each type of conflict is explained below, and the action which must be done "
10539
"to\n"
10540
"resolve the conflict is outlined."
10541
msgstr ""
10542
10543
#: en/help_topics/conflict-types.txt:47
10544
msgid ""
10545
"Various actions are available depending on the kind of conflict, for some "
10546
"of\n"
10547
"these actions, Bazaar can provide some help. In the end you should at least\n"
10548
"inform Bazaar that you're done with the conflict with::"
10549
msgstr ""
10550
10551
#: en/help_topics/conflict-types.txt:51
10552
msgid " ``bzr resolve FILE --action=done'"
10553
msgstr ""
10554
10555
#: en/help_topics/conflict-types.txt:53
10556
msgid ""
10557
"Note that this is the default action when a single file is involved so you "
10558
"can\n"
10559
"simply use::"
10560
msgstr ""
10561
10562
#: en/help_topics/conflict-types.txt:56
10563
msgid " ``bzr resolve FILE``"
10564
msgstr ""
10565
10566
#: en/help_topics/conflict-types.txt:58
10567
msgid "See ``bzr help resolve`` for more details."
10568
msgstr ""
10569
10570
#: en/help_topics/conflict-types.txt:60
10571
msgid ""
10572
"Text conflicts\n"
10573
"--------------"
10574
msgstr ""
10575
10576
#: en/help_topics/conflict-types.txt:63 en/help_topics/conflict-types.txt:120
10577
#: en/help_topics/conflict-types.txt:151 en/help_topics/conflict-types.txt:175
10578
#: en/help_topics/conflict-types.txt:198 en/help_topics/conflict-types.txt:213
10579
#: en/help_topics/conflict-types.txt:239 en/help_topics/conflict-types.txt:281
10580
#: en/help_topics/conflict-types.txt:303 en/help_topics/conflict-types.txt:339
10581
msgid "Typical message::"
10582
msgstr ""
10583
10584
#: en/help_topics/conflict-types.txt:65
10585
msgid " Text conflict in FILE"
10586
msgstr ""
10587
10588
#: en/help_topics/conflict-types.txt:67
10589
msgid ""
10590
"These are produced when a text merge cannot completely reconcile two sets "
10591
"of\n"
10592
"text changes. Bazaar will emit files for each version with the extensions\n"
10593
"THIS, OTHER, and BASE. THIS is the version of the file from the target "
10594
"tree,\n"
10595
"i.e. the tree that you are merging changes into. OTHER is the version that "
10596
"you\n"
10597
"are merging into the target. BASE is an older version that is used as a "
10598
"basis\n"
10599
"for comparison."
10600
msgstr ""
10601
10602
#: en/help_topics/conflict-types.txt:74
10603
msgid ""
10604
"In the main copy of the file, Bazaar will include all the changes that it\n"
10605
"could reconcile, and any un-reconciled conflicts are surrounded by\n"
10606
"\"herringbone\" markers like ``<<<<<<<``."
10607
msgstr ""
10608
10609
#: en/help_topics/conflict-types.txt:78
10610
msgid ""
10611
"Say the initial text is \"The project leader released it.\", and THIS "
10612
"modifies it\n"
10613
"to \"Martin Pool released it.\", while OTHER modifies it to \"The project "
10614
"leader\n"
10615
"released Bazaar.\" A conflict would look like this::"
10616
msgstr ""
10617
10618
#: en/help_topics/conflict-types.txt:82
10619
msgid ""
10620
" <<<<<<< TREE\n"
10621
" Martin Pool released it.\n"
10622
" =======\n"
10623
" The project leader released Bazaar.\n"
10624
" >>>>>>> MERGE-SOURCE"
10625
msgstr ""
10626
10627
#: en/help_topics/conflict-types.txt:88
10628
msgid "The correct resolution would be \"Martin Pool released Bazaar.\""
10629
msgstr ""
10630
10631
#: en/help_topics/conflict-types.txt:90
10632
msgid ""
10633
"You can handle text conflicts either by editing the main copy of the file,\n"
10634
"or by invoking external tools on the THIS, OTHER and BASE versions. It's\n"
10635
"worth mentioning that resolving text conflicts rarely involves picking one\n"
10636
"set of changes over the other (but see below when you encounter these\n"
10637
"cases). More often, the two sets of changes must be intelligently combined."
10638
msgstr ""
10639
10640
#: en/help_topics/conflict-types.txt:96
10641
msgid ""
10642
"If you edit the main copy, be sure to remove the herringbone markers. When\n"
10643
"you are done editing, the file should look like it never had a conflict, and "
10644
"be\n"
10645
"ready to commit."
10646
msgstr ""
10647
10648
#: en/help_topics/conflict-types.txt:100
10649
msgid ""
10650
"When you have resolved text conflicts, just run ``bzr resolve --auto``, and\n"
10651
"Bazaar will auto-detect which conflicts you have resolved."
10652
msgstr ""
10653
10654
#: en/help_topics/conflict-types.txt:103
10655
msgid ""
10656
"When the conflict is resolved, Bazaar deletes the previously generated\n"
10657
"``.BASE``, ``.THIS`` and ``.OTHER`` files if they are still present in the\n"
10658
"working tree."
10659
msgstr ""
10660
10661
#: en/help_topics/conflict-types.txt:107
10662
msgid ""
10663
"\n"
10664
"When you want to pick one set of changes over the other, you can use ``bzr\n"
10665
"resolve`` with one of the following actions:"
10666
msgstr ""
10667
10668
#: en/help_topics/conflict-types.txt:111
10669
msgid ""
10670
"* ``--action=take-this`` will issue ``mv FILE.THIS FILE``,\n"
10671
"* ``--action=take-other`` will issue ``mv FILE.OTHER FILE``."
10672
msgstr ""
10673
10674
#: en/help_topics/conflict-types.txt:114
10675
msgid ""
10676
"Note that if you have modified ``FILE.THIS`` or ``FILE.OTHER``, these\n"
10677
"modifications will be taken into account."
10678
msgstr ""
10679
10680
#: en/help_topics/conflict-types.txt:117
10681
msgid ""
10682
"Content conflicts\n"
10683
"-----------------"
10684
msgstr ""
10685
10686
#: en/help_topics/conflict-types.txt:122
10687
msgid " Contents conflict in FILE"
10688
msgstr ""
10689
10690
#: en/help_topics/conflict-types.txt:124
10691
msgid ""
10692
"This conflict happens when there are conflicting changes in the working "
10693
"tree\n"
10694
"and the merge source, but the conflicted items are not text files. They "
10695
"may\n"
10696
"be binary files, or symlinks, or directories. It can even happen with "
10697
"files\n"
10698
"that are deleted on one side, and modified on the other."
10699
msgstr ""
10700
10701
#: en/help_topics/conflict-types.txt:129
10702
msgid ""
10703
"Like text conflicts, Bazaar will emit THIS, OTHER and BASE files. (They may "
10704
"be\n"
10705
"regular files, symlinks or directories). But it will not include a \"main "
10706
"copy\"\n"
10707
"of the file with herringbone conflict markers. It will appear that the "
10708
"\"main\n"
10709
"copy\" has been renamed to THIS or OTHER."
10710
msgstr ""
10711
10712
#: en/help_topics/conflict-types.txt:134 en/help_topics/conflict-types.txt:182
10713
msgid ""
10714
"To resolve that kind of conflict, you should rebuild FILE from either "
10715
"version\n"
10716
"or a combination of both."
10717
msgstr ""
10718
10719
#: en/help_topics/conflict-types.txt:137 en/help_topics/conflict-types.txt:185
10720
#: en/help_topics/conflict-types.txt:226 en/help_topics/conflict-types.txt:252
10721
#: en/help_topics/conflict-types.txt:291 en/help_topics/conflict-types.txt:326
10722
#: en/help_topics/conflict-types.txt:361
10723
msgid "``bzr resolve`` recognizes the following actions:"
10724
msgstr ""
10725
10726
#: en/help_topics/conflict-types.txt:139
10727
msgid ""
10728
"* ``--action=take-this`` will issue ``bzr mv FILE.THIS FILE``,\n"
10729
"* ``--action=take-other`` will issue ``bzr mv FILE.OTHER FILE``,\n"
10730
"* ``--action=done`` will just mark the conflict as resolved."
10731
msgstr ""
10732
10733
#: en/help_topics/conflict-types.txt:143
10734
msgid ""
10735
"Any action will also delete the previously generated ``.BASE``, ``.THIS`` "
10736
"and\n"
10737
"``.OTHER`` files if they are still present in the working tree."
10738
msgstr ""
10739
10740
#: en/help_topics/conflict-types.txt:146 en/help_topics/conflict-types.txt:193
10741
#: en/help_topics/conflict-types.txt:234 en/help_topics/conflict-types.txt:276
10742
#: en/help_topics/conflict-types.txt:298 en/help_topics/conflict-types.txt:334
10743
#: en/help_topics/conflict-types.txt:369
10744
msgid ""
10745
"Bazaar cannot auto-detect when conflicts of this kind have been resolved."
10746
msgstr ""
10747
10748
#: en/help_topics/conflict-types.txt:148
10749
msgid ""
10750
"Tag conflicts\n"
10751
"-------------"
10752
msgstr ""
10753
10754
#: en/help_topics/conflict-types.txt:153
10755
msgid ""
10756
" Conflicting tags:\n"
10757
" version-0.1"
10758
msgstr ""
10759
10760
#: en/help_topics/conflict-types.txt:156
10761
msgid ""
10762
"When pulling from or pushing to another branch, Bazaar informs you about "
10763
"tags\n"
10764
"that conflict between the two branches; that is the same tag points to two\n"
10765
"different revisions. You need not resolve these conflicts, but subsequent\n"
10766
"uses of pull or push will result in the same message."
10767
msgstr ""
10768
10769
#: en/help_topics/conflict-types.txt:161
10770
msgid ""
10771
"To resolve the conflict, you must apply the correct tags to either the "
10772
"target\n"
10773
"branch or the source branch as appropriate. Use \"bzr tags --show-ids -d\n"
10774
"SOURCE_URL\" to see the tags in the source branch. If you want to make the\n"
10775
"target branch's tags match the source branch, then in the target branch do\n"
10776
"``bzr tag --force -r revid:REVISION_ID CONFLICTING_TAG`` for each of the\n"
10777
"CONFLICTING_TAGs, where REVISION_ID comes from the list of tags in the "
10778
"source\n"
10779
"branch. You need not call \"bzr resolve\" after doing this. To resolve in\n"
10780
"favor of the target branch, you need to similarly use ``tag --force`` in "
10781
"the\n"
10782
"source branch. (Note that pulling or pushing using --overwrite will "
10783
"overwrite\n"
10784
"all tags as well.)"
10785
msgstr ""
10786
10787
#: en/help_topics/conflict-types.txt:172
10788
msgid ""
10789
"Duplicate paths\n"
10790
"---------------"
10791
msgstr ""
10792
10793
#: en/help_topics/conflict-types.txt:177
10794
msgid " Conflict adding file FILE. Moved existing file to FILE.moved."
10795
msgstr ""
10796
10797
#: en/help_topics/conflict-types.txt:179
10798
msgid ""
10799
"Sometimes Bazaar will attempt to create a file using a pathname that has\n"
10800
"already been used. The existing file will be renamed to \"FILE.moved\". "
10801
msgstr ""
10802
10803
#: en/help_topics/conflict-types.txt:187
10804
msgid ""
10805
"* ``--action=take-this`` will issue ``bzr rm FILE ; bzr mv FILE.moved "
10806
"FILE``,\n"
10807
"* ``--action=take-other`` will issue ``bzr rm FILE.moved``,\n"
10808
"* ``--action=done`` will just mark the conflict as resolved."
10809
msgstr ""
10810
10811
#: en/help_topics/conflict-types.txt:191
10812
msgid ""
10813
"Note that you must get rid of FILE.moved before using ``--action=done``."
10814
msgstr ""
10815
10816
#: en/help_topics/conflict-types.txt:195
10817
msgid ""
10818
"Unversioned parent\n"
10819
"------------------"
10820
msgstr ""
10821
10822
#: en/help_topics/conflict-types.txt:200
10823
msgid ""
10824
" Conflict because FILE is not versioned, but has versioned children."
10825
msgstr ""
10826
10827
#: en/help_topics/conflict-types.txt:202
10828
msgid ""
10829
"Sometimes Bazaar will attempt to create a file whose parent directory is "
10830
"not\n"
10831
"versioned. This happens when the directory has been deleted in the target,\n"
10832
"but has a new child in the source, or vice versa. In this situation, "
10833
"Bazaar\n"
10834
"will version the parent directory as well. Resolving this issue depends\n"
10835
"very much on the particular scenario. You may wish to rename or delete "
10836
"either\n"
10837
"the file or the directory. When you are satisfied, you can run \"bzr "
10838
"resolve\n"
10839
"FILE\" to mark the conflict as resolved."
10840
msgstr ""
10841
10842
#: en/help_topics/conflict-types.txt:210
10843
msgid ""
10844
"Missing parent\n"
10845
"--------------"
10846
msgstr ""
10847
10848
#: en/help_topics/conflict-types.txt:215
10849
msgid " Conflict adding files to FILE. Created directory."
10850
msgstr ""
10851
10852
#: en/help_topics/conflict-types.txt:217
10853
msgid ""
10854
"This happens when a directory has been deleted in the target, but has new\n"
10855
"children in the source. This is similar to the \"unversioned parent\" "
10856
"conflict,\n"
10857
"except that the parent directory does not *exist*, instead of just being\n"
10858
"unversioned. In this situation, Bazaar will create the missing parent.\n"
10859
"Resolving this issue depends very much on the particular scenario."
10860
msgstr ""
10861
10862
#: en/help_topics/conflict-types.txt:223 en/help_topics/conflict-types.txt:249
10863
msgid ""
10864
"To resolve that kind of conflict, you should either remove or rename the\n"
10865
"children or the directory or a combination of both."
10866
msgstr ""
10867
10868
#: en/help_topics/conflict-types.txt:228
10869
msgid ""
10870
"* ``--action=take-this`` will issue ``bzr rm directory`` including the\n"
10871
" children,\n"
10872
"* ``--action=take-other`` will acknowledge Bazaar choice to keep the "
10873
"children\n"
10874
" and restoring the directory,\n"
10875
"* ``--action=done`` will just mark the conflict as resolved."
10876
msgstr ""
10877
10878
#: en/help_topics/conflict-types.txt:236
10879
msgid ""
10880
"Deleting parent\n"
10881
"---------------"
10882
msgstr ""
10883
10884
#: en/help_topics/conflict-types.txt:241
10885
msgid " Conflict: can't delete DIR because it is not empty. Not deleting."
10886
msgstr ""
10887
10888
#: en/help_topics/conflict-types.txt:243
10889
msgid ""
10890
"This is the opposite of \"missing parent\". A directory is deleted in the\n"
10891
"source, but has new children in the target (either because a directory\n"
10892
"deletion is merged or because the merge introduce new children). Bazaar\n"
10893
"will retain the directory. Resolving this issue depends very much on the\n"
10894
"particular scenario."
10895
msgstr ""
10896
10897
#: en/help_topics/conflict-types.txt:254
10898
msgid ""
10899
"* ``--action=take-this`` will acknowledge Bazaar choice to keep the "
10900
"directory,"
10901
msgstr ""
10902
10903
#: en/help_topics/conflict-types.txt:256
10904
msgid ""
10905
"* ``--action=take-other`` will issue ``bzr rm directory`` including the \n"
10906
" children,"
10907
msgstr ""
10908
10909
#: en/help_topics/conflict-types.txt:259
10910
msgid "* ``--action=done`` will just mark the conflict as resolved."
10911
msgstr ""
10912
10913
#: en/help_topics/conflict-types.txt:261
10914
msgid ""
10915
"Note that when merging a directory deletion, if unversioned files are\n"
10916
"present, they become potential orphans has they don't have a directory\n"
10917
"parent anymore."
10918
msgstr ""
10919
10920
#: en/help_topics/conflict-types.txt:265
10921
msgid ""
10922
"Handling such orphans, *before* the conflict is created, is controlled by\n"
10923
"setting the ``bzr.transform.orphan_policy`` configuration option."
10924
msgstr ""
10925
10926
#: en/help_topics/conflict-types.txt:268
10927
msgid "There are two possible values for this option:"
10928
msgstr ""
10929
10930
#: en/help_topics/conflict-types.txt:270
10931
msgid ""
10932
"* ``conflict`` (the default): will leave the orphans in place and\n"
10933
" generate a conflicts,"
10934
msgstr ""
10935
10936
#: en/help_topics/conflict-types.txt:273
10937
msgid ""
10938
"* ``move``: will move the orphans to a ``bzr-orphans`` directory at the "
10939
"root\n"
10940
" of the working tree with names like ``<file>.~#~``."
10941
msgstr ""
10942
10943
#: en/help_topics/conflict-types.txt:278
10944
msgid ""
10945
"Path conflict\n"
10946
"-------------"
10947
msgstr ""
10948
10949
#: en/help_topics/conflict-types.txt:283
10950
msgid " Path conflict: PATH1 / PATH2"
10951
msgstr ""
10952
10953
#: en/help_topics/conflict-types.txt:285
10954
msgid ""
10955
"This happens when the source and target have each modified the name or "
10956
"parent\n"
10957
"directory of a file. Bazaar will use the path elements from the source."
10958
msgstr ""
10959
10960
#: en/help_topics/conflict-types.txt:288
10961
msgid ""
10962
"To resolve that kind of conflict, you just have to decide what name should "
10963
"be\n"
10964
"retained for the file involved."
10965
msgstr ""
10966
10967
#: en/help_topics/conflict-types.txt:293
10968
msgid ""
10969
"* ``--action=take-this`` will revert Bazaar choice and keep ``PATH1`` by\n"
10970
" issuing ``bzr mv PATH2 PATH1``,\n"
10971
"* ``--action=take-other`` will acknowledge Bazaar choice of keeping "
10972
"``PATH2``,\n"
10973
"* ``--action=done`` will just mark the conflict as resolved."
10974
msgstr ""
10975
10976
#: en/help_topics/conflict-types.txt:300
10977
msgid ""
10978
"Parent loop\n"
10979
"-----------"
10980
msgstr ""
10981
10982
#: en/help_topics/conflict-types.txt:305
10983
msgid " Conflict moving FILE into DIRECTORY. Cancelled move."
10984
msgstr ""
10985
10986
#: en/help_topics/conflict-types.txt:307
10987
msgid ""
10988
"This happens when the source and the target have each moved directories, so\n"
10989
"that, if the change could be applied, a directory would be contained by "
10990
"itself.\n"
10991
"For example::"
10992
msgstr ""
10993
10994
#: en/help_topics/conflict-types.txt:311
10995
msgid ""
10996
" $ bzr init\n"
10997
" $ bzr mkdir white\n"
10998
" $ bzr mkdir black\n"
10999
" $ bzr commit -m \"BASE\"\n"
11000
" $ bzr branch . ../other\n"
11001
" $ bzr mv white black\n"
11002
" $ bzr commit -m \"THIS\"\n"
11003
" $ bzr mv ../other/black ../other/white\n"
11004
" $ bzr commit ../other -m \"OTHER\"\n"
11005
" $ bzr merge ../other"
11006
msgstr ""
11007
11008
#: en/help_topics/conflict-types.txt:322
11009
msgid ""
11010
"In this situation, Bazaar will cancel the move, and leave ``white`` in\n"
11011
"``black``. To resolve that kind of conflict, you just have to decide what\n"
11012
"name should be retained for the directories involved."
11013
msgstr ""
11014
11015
#: en/help_topics/conflict-types.txt:328
11016
msgid ""
11017
"* ``--action=take-this`` will acknowledge Bazaar choice of leaving ``white`` "
11018
"\n"
11019
" in ``black``,\n"
11020
"* ``--action=take-other`` will revert Bazaar choice and move ``black`` in\n"
11021
" ``white`` by issuing ``bzr mv black/white white ; bzr mv black white``,\n"
11022
"* ``--action=done`` will just mark the conflict as resolved."
11023
msgstr ""
11024
11025
#: en/help_topics/conflict-types.txt:336
11026
msgid ""
11027
"Non-directory parent\n"
11028
"--------------------"
11029
msgstr ""
11030
11031
#: en/help_topics/conflict-types.txt:341
11032
msgid ""
11033
" Conflict: foo.new is not a directory, but has files in it.\n"
11034
" Created directory."
11035
msgstr ""
11036
11037
#: en/help_topics/conflict-types.txt:344
11038
msgid ""
11039
"This happens when one side has added files to a directory, and the other "
11040
"side\n"
11041
"has changed the directory into a file or symlink. For example::"
11042
msgstr ""
11043
11044
#: en/help_topics/conflict-types.txt:347
11045
msgid ""
11046
" $ bzr init\n"
11047
" $ bzr mkdir foo\n"
11048
" $ bzr commit -m \"BASE\"\n"
11049
" $ bzr branch . ../other\n"
11050
" $ rmdir foo\n"
11051
" $ touch foo\n"
11052
" $ bzr commit -m \"THIS\"\n"
11053
" $ bzr mkdir ../other/foo/bar\n"
11054
" $ bzr commit ../other -m \"OTHER\"\n"
11055
" $ bzr merge ../other"
11056
msgstr ""
11057
11058
#: en/help_topics/conflict-types.txt:358
11059
msgid ""
11060
"To resolve that kind of conflict, you have to decide what name should be\n"
11061
"retained for the file, directory or symlink involved."
11062
msgstr ""
11063
11064
#: en/help_topics/conflict-types.txt:363
11065
msgid ""
11066
"* ``--action=take-this`` will issue ``bzr rm --force foo.new`` and \n"
11067
" ``bzr add foo``,\n"
11068
"* ``--action=take-other`` will issue ``bzr rm --force foo`` and \n"
11069
" ``bzr mv foo.new foo``,\n"
11070
"* ``--action=done`` will just mark the conflict as resolved."
11071
msgstr ""
11072
11073
#: en/help_topics/conflict-types.txt:371
11074
msgid ""
11075
"MalformedTransform\n"
11076
"------------------"
11077
msgstr ""
11078
11079
#: en/help_topics/conflict-types.txt:374
11080
msgid ""
11081
"It is possible (though very rare) for Bazaar to raise a MalformedTransform\n"
11082
"exception. This means that Bazaar encountered a filesystem conflict that it "
11083
"was\n"
11084
"unable to resolve. This usually indicates a bug. Please let us know if "
11085
"you\n"
11086
"encounter this. Our bug tracker is at https://launchpad.net/bzr/+bugs\n"
11087
msgstr ""
11088
11089
#: en/help_topics/content-filters.txt:1
11090
msgid ""
11091
"Content Filters\n"
11092
"==============="
11093
msgstr ""
11094
11095
#: en/help_topics/content-filters.txt:4
11096
msgid ""
11097
"Content formats\n"
11098
"---------------"
11099
msgstr ""
11100
11101
#: en/help_topics/content-filters.txt:7
11102
msgid ""
11103
"Bazaar's content filtering allows you to store files in a different\n"
11104
"format from the copy in your working tree. This lets you, or your\n"
11105
"co-developers, use Windows development tools that expect CRLF files\n"
11106
"on projects that use other line-ending conventions. Among other things,\n"
11107
"content filters also let Unix developers more easily work on projects\n"
11108
"using Windows line-ending conventions, keyword expansion/compression,\n"
11109
"and trailing spaces on lines in text files to be implicitly stripped\n"
11110
"when committed."
11111
msgstr ""
11112
11113
#: en/help_topics/content-filters.txt:16
11114
msgid "To generalize, there are two content formats supported by Bazaar:"
11115
msgstr ""
11116
11117
#: en/help_topics/content-filters.txt:18
11118
msgid ""
11119
"* a canonical format - how files are stored internally\n"
11120
"* a convenience format - how files are created in a working tree."
11121
msgstr ""
11122
11123
#: en/help_topics/content-filters.txt:21
11124
msgid ""
11125
"\n"
11126
"Format conversion\n"
11127
"-----------------"
11128
msgstr ""
11129
11130
#: en/help_topics/content-filters.txt:25
11131
msgid ""
11132
"The conversion between these formats is done by content filters.\n"
11133
"A content filter has two parts:"
11134
msgstr ""
11135
11136
#: en/help_topics/content-filters.txt:28
11137
msgid ""
11138
"* a read converter - converts from convenience to canonical format\n"
11139
"* a write converter - converts from canonical to convenience format."
11140
msgstr ""
11141
11142
#: en/help_topics/content-filters.txt:31
11143
msgid ""
11144
"Many of these converters will provide *round-trip* conversion,\n"
11145
"i.e. applying the read converter followed by the write converter\n"
11146
"gives back the original content. However, others may provide an\n"
11147
"asymmetric conversion. For example, a read converter might strip\n"
11148
"trailing whitespace off lines in source code while the matching\n"
11149
"write converter might pass content through unchanged."
11150
msgstr ""
11151
11152
#: en/help_topics/content-filters.txt:38
11153
msgid ""
11154
"\n"
11155
"Enabling content filters\n"
11156
"------------------------"
11157
msgstr ""
11158
11159
#: en/help_topics/content-filters.txt:42
11160
msgid ""
11161
"Content filters are typically provided by plugins, so the first step\n"
11162
"in using them is to install the relevant plugins and read their\n"
11163
"documentation. Some plugins may be very specific about which files\n"
11164
"they filter, e.g. only files ending in ``.java`` or ``.php``.\n"
11165
"In other cases, the plugin may leave it in the user's hands to\n"
11166
"define which files are to be filtered. This is typically done\n"
11167
"using rule-based preferences. See ``bzr help rules`` for general\n"
11168
"information about defining these."
11169
msgstr ""
11170
11171
#: en/help_topics/content-filters.txt:51
11172
msgid ""
11173
"\n"
11174
"Impact on commands\n"
11175
"------------------"
11176
msgstr ""
11177
11178
#: en/help_topics/content-filters.txt:55
11179
msgid ""
11180
"Read converters are only applied to commands that read content from\n"
11181
"a working tree, e.g. status, diff and commit. For example, ``bzr diff``\n"
11182
"will apply read converters to files in the working tree, then compare\n"
11183
"the results to the content last committed."
11184
msgstr ""
11185
11186
#: en/help_topics/content-filters.txt:60
11187
msgid ""
11188
"Write converters are only applied by commands that **create files in a\n"
11189
"working tree**, e.g. branch, checkout, update. If you wish to see the\n"
11190
"canonical format of a file or tree, use ``bzr cat`` or ``bzr export``\n"
11191
"respectively."
11192
msgstr ""
11193
11194
#: en/help_topics/content-filters.txt:65
11195
msgid ""
11196
"Note: ``bzr commit`` does not implicitly apply write converters after\n"
11197
"comitting files. If this makes sense for a given plugin providing\n"
11198
"a content filter, the plugin can usually achieve this effect by using a\n"
11199
"``start_commit`` or ``post_commit`` hook say. See :doc:`hooks-help`\n"
11200
"for more information on hooks."
11201
msgstr ""
11202
11203
#: en/help_topics/content-filters.txt:71
11204
msgid ""
11205
"\n"
11206
"Refreshing your working tree\n"
11207
"----------------------------"
11208
msgstr ""
11209
11210
#: en/help_topics/content-filters.txt:75
11211
msgid ""
11212
"For performance reasons, Bazaar caches the timestamps of files in\n"
11213
"a working tree, and assumes files are unchanged if their timestamps\n"
11214
"match the cached values. As a consequence, there are times when\n"
11215
"you may need to explicitly ask for content filtering to be reapplied\n"
11216
"in one or both directions, e.g. after installing or reconfiguring\n"
11217
"plugins providing it."
11218
msgstr ""
11219
11220
#: en/help_topics/content-filters.txt:82
11221
msgid "Here are some general guidelines for doing this:"
11222
msgstr ""
11223
11224
#: en/help_topics/content-filters.txt:84
11225
msgid ""
11226
" * To reapply read converters, ``touch`` files, i.e. update their\n"
11227
" timestamp. Operations like ``bzr status`` should then reapply the\n"
11228
" relevant read converters and compare the end result with the\n"
11229
" canonical format."
11230
msgstr ""
11231
11232
#: en/help_topics/content-filters.txt:89
11233
msgid ""
11234
" * To reapply write converters, ensure there are no local changes,\n"
11235
" delete the relevant files and run ``bzr revert`` on those files."
11236
msgstr ""
11237
11238
#: en/help_topics/content-filters.txt:92
11239
msgid ""
11240
"Note: In the future, it is likely that additional options will be added\n"
11241
"to commands to make this refreshing process faster and safer.\n"
11242
msgstr ""
11243
11244
#: en/help_topics/current-formats.txt:1
11245
msgid "Current Storage Formats"
11246
msgstr ""
11247
11248
#: en/help_topics/current-formats.txt:3
11249
msgid ""
11250
":2a:\n"
11251
" (native) (default) Format for the bzr 2.0 series. Uses group-\n"
11252
" compress storage. Provides rich roots which are a one-way\n"
11253
" transition."
11254
msgstr ""
11255
11256
#: en/help_topics/current-formats.txt:8 en/help_topics/other-formats.txt:17
11257
msgid ""
11258
"\n"
11259
"See :doc:`formats-help` for more about storage formats."
11260
msgstr ""
11261
11262
#: en/help_topics/debug-flags.txt:1
11263
msgid ""
11264
"Debug Flags\n"
11265
"==========="
11266
msgstr ""
11267
11268
#: en/help_topics/debug-flags.txt:4
11269
msgid ""
11270
"These flags can be passed on the bzr command line or (without the ``-D``\n"
11271
"prefix) put in the ``debug_flags`` variable in ``bazaar.conf``."
11272
msgstr ""
11273
11274
#: en/help_topics/debug-flags.txt:7
11275
msgid ""
11276
"-Dauth Trace authentication sections used.\n"
11277
"-Dbytes Print out how many bytes were transferred\n"
11278
"-Ddirstate Trace dirstate activity (verbose!)\n"
11279
"-Derror Instead of normal error handling, always print a "
11280
"traceback\n"
11281
" on error.\n"
11282
"-Devil Capture call sites that do expensive or badly-scaling\n"
11283
" operations.\n"
11284
"-Dfetch Trace history copying between repositories.\n"
11285
"-Dfilters Emit information for debugging content filtering.\n"
11286
"-Dforceinvdeltas Force use of inventory deltas during generic streaming "
11287
"fetch.\n"
11288
"-Dgraph Trace graph traversal.\n"
11289
"-Dhashcache Log every time a working file is read to determine its "
11290
"hash.\n"
11291
"-Dhooks Trace hook execution.\n"
11292
"-Dhpss Trace smart protocol requests and responses.\n"
11293
"-Dhpssdetail More hpss details.\n"
11294
"-Dhpssvfs Traceback on vfs access to Remote objects.\n"
11295
"-Dhttp Trace http connections, requests and responses.\n"
11296
"-Dindex Trace major index operations.\n"
11297
"-Dknit Trace knit operations.\n"
11298
"-Dlock Trace when lockdir locks are taken or released.\n"
11299
"-Dnoretry If a connection is reset, fail immediately rather than\n"
11300
" retrying the request.\n"
11301
"-Dprogress Trace progress bar operations.\n"
11302
"-Dmem_dump Dump memory to a file upon an out of memory error.\n"
11303
"-Dmerge Emit information for debugging merges.\n"
11304
"-Dno_apport Don't use apport to report crashes.\n"
11305
"-Dno_activity \t Don't show transport activity indicator in progress bar.\n"
11306
"-Dpack Emit information about pack operations.\n"
11307
"-Drelock Emit a message every time a branch or repository object "
11308
"is\n"
11309
" unlocked then relocked the same way.\n"
11310
"-Dsftp Trace SFTP internals.\n"
11311
"-Dstatic_tuple Error when a tuple is used where a StaticTuple is "
11312
"expected\n"
11313
"-Dstream Trace fetch streams.\n"
11314
"-Dstrict_locks Trace when OS locks are potentially used in a non-"
11315
"portable\n"
11316
" manner.\n"
11317
"-Dunlock Some errors during unlock are treated as warnings.\n"
11318
"-DIDS_never Never use InterDifferingSerializer when fetching.\n"
11319
"-DIDS_always Always use InterDifferingSerializer to fetch if "
11320
"appropriate\n"
11321
" for the format, even for non-local fetches.\n"
11322
msgstr ""
11323
11324
#: en/help_topics/diverged-branches.txt:1
11325
msgid ""
11326
"Diverged Branches\n"
11327
"================="
11328
msgstr ""
11329
11330
#: en/help_topics/diverged-branches.txt:4
11331
msgid ""
11332
"When Bazaar tries to push one branch onto another, it requires that the\n"
11333
"destination branch must be ready to receive the source branch. If this "
11334
"isn't\n"
11335
"the case, then we say that the branches have ``diverged``. Branches are\n"
11336
"considered diverged if the destination branch's most recent commit is one "
11337
"that\n"
11338
"has not been merged (directly or indirectly) by the source branch. To "
11339
"recover\n"
11340
"from diverged branches, one must merge the missing revisions into the "
11341
"source\n"
11342
"branch."
11343
msgstr ""
11344
11345
#: en/help_topics/diverged-branches.txt:12
11346
msgid ""
11347
"This situation commonly arises when using a centralized workflow with local\n"
11348
"commits. If someone else has committed new work to the mainline since your\n"
11349
"last pull and you have local commits that have not yet been pushed to the\n"
11350
"mainline, then your local branch and the mainline have diverged."
11351
msgstr ""
11352
11353
#: en/help_topics/diverged-branches.txt:17
11354
msgid ""
11355
"Discovering What Has Diverged\n"
11356
"-----------------------------"
11357
msgstr ""
11358
11359
#: en/help_topics/diverged-branches.txt:20
11360
msgid ""
11361
"The ``bzr missing`` command is used to find out what revisions are in "
11362
"another\n"
11363
"branch that are not present in the current branch, and vice-versa. It shows "
11364
"a\n"
11365
"summary of which extra revisions exist in each branch. If you want to see "
11366
"the\n"
11367
"precise effects of those revisions, you can use ``bzr diff --"
11368
"old=other_branch``\n"
11369
"to show the differences between other_branch and your current branch."
11370
msgstr ""
11371
11372
#: en/help_topics/diverged-branches.txt:26
11373
msgid ""
11374
"A Solution\n"
11375
"----------"
11376
msgstr ""
11377
11378
#: en/help_topics/diverged-branches.txt:29
11379
msgid ""
11380
"The solution is to merge the revisions from the mainline into your local\n"
11381
"branch. To do so, use ``bzr merge`` to get the new revisions from the\n"
11382
"mainline. This merge may result in conflicts if the other developer's "
11383
"changes\n"
11384
"overlap with your changes. These conflicts should be resolved before\n"
11385
"continuing. After any conflicts have been resolved, or even if there were "
11386
"no\n"
11387
"conflicts, Bazaar requires that you explicitly commit these new revisions\n"
11388
"to your local branch. This requirement gives you an opportunity to test "
11389
"the\n"
11390
"resulting working tree for correctness, since the merged revisions could "
11391
"have\n"
11392
"made arbitrary changes. After testing, you should commit the merge using\n"
11393
"``bzr commit``. This clears up the diverged branches situation. Your "
11394
"local\n"
11395
"branch can now be pushed to the mainline.\n"
11396
msgstr ""
11397
11398
#: en/help_topics/env-variables.txt:1
11399
msgid "Environment Variables"
11400
msgstr ""
11401
11402
#: en/help_topics/env-variables.txt:3
11403
msgid ""
11404
"=================== "
11405
"===========================================================\n"
11406
"BZRPATH Path where bzr is to look for shell plugin external\n"
11407
" commands.\n"
11408
"BZR_EMAIL E-Mail address of the user. Overrides EMAIL.\n"
11409
"EMAIL E-Mail address of the user.\n"
11410
"BZR_EDITOR Editor for editing commit messages. Overrides EDITOR.\n"
11411
"EDITOR Editor for editing commit messages.\n"
11412
"BZR_PLUGIN_PATH Paths where bzr should look for plugins.\n"
11413
"BZR_DISABLE_PLUGINS Plugins that bzr should not load.\n"
11414
"BZR_PLUGINS_AT Plugins to load from a directory not in "
11415
"BZR_PLUGIN_PATH.\n"
11416
"BZR_HOME Directory holding .bazaar config dir. Overrides HOME.\n"
11417
"BZR_HOME (Win32) Directory holding bazaar config dir. Overrides APPDATA "
11418
"and\n"
11419
" HOME.\n"
11420
"BZR_REMOTE_PATH Full name of remote 'bzr' command (for bzr+ssh:// "
11421
"URLs).\n"
11422
"BZR_SSH Path to SSH client, or one of paramiko, openssh, "
11423
"sshcorp,\n"
11424
" plink or lsh.\n"
11425
"BZR_LOG Location of .bzr.log (use '/dev/null' to suppress log).\n"
11426
"BZR_LOG (Win32) Location of .bzr.log (use 'NUL' to suppress log).\n"
11427
"BZR_COLUMNS Override implicit terminal width.\n"
11428
"BZR_CONCURRENCY Number of processes that can be run concurrently "
11429
"(selftest)\n"
11430
"BZR_PROGRESS_BAR Override the progress display. Values are 'none' or "
11431
"'text'.\n"
11432
"BZR_PDB Control whether to launch a debugger on error.\n"
11433
"BZR_SIGQUIT_PDB Control whether SIGQUIT behaves normally or invokes a\n"
11434
" breakin debugger.\n"
11435
"BZR_TEXTUI_INPUT Force console input mode for prompts to line-based "
11436
"(instead\n"
11437
" of char-based).\n"
11438
"=================== "
11439
"===========================================================\n"
11440
msgstr ""
11441
11442
#: en/help_topics/eol.txt:1
11443
msgid ""
11444
"End of Line Conversion\n"
11445
"======================"
11446
msgstr ""
11447
11448
#: en/help_topics/eol.txt:4
11449
msgid ""
11450
"EOL conversion is provided as a content filter where Bazaar internally\n"
11451
"stores a canonical format but outputs a convenience format. See\n"
11452
"``bzr help content-filters`` for general information about using these."
11453
msgstr ""
11454
11455
#: en/help_topics/eol.txt:8
11456
msgid ""
11457
"Note: Content filtering is only supported in recently added formats,\n"
11458
"e.g. 1.14. Be sure that both the repository *and* the branch are\n"
11459
"in a recent format. (Just setting the format on the repository\n"
11460
"is not enough.) If content filtering does not appear to be working, use\n"
11461
"'bzr info -v' to confirm that the branch is using \"Working tree format 5\"\n"
11462
"or later."
11463
msgstr ""
11464
11465
#: en/help_topics/eol.txt:15
11466
msgid ""
11467
"EOL conversion needs to be enabled for selected file patterns using\n"
11468
"rules. See ``bzr help rules`` for general information on defining rules.\n"
11469
"Currently, rules are only supported in $BZR_HOME/.bazaar/rules (or\n"
11470
"%BZR_HOME%/bazaar/2.0/rules on Windows). Branch specific rules will be\n"
11471
"supported in a future verison of Bazaar."
11472
msgstr ""
11473
11474
#: en/help_topics/eol.txt:21
11475
msgid ""
11476
"To configure which files to filter, set ``eol`` to one of the values below.\n"
11477
"(If a value is not set, ``exact`` is the default.)"
11478
msgstr ""
11479
11480
#: en/help_topics/eol.txt:24
11481
msgid ""
11482
" ========== ===================================== ======================\n"
11483
" Value Checkout end-of-lines as Commit end-of-lines as\n"
11484
" ========== ===================================== ======================\n"
11485
" ``native`` ``crlf`` on Windows, ``lf`` otherwise ``lf``\n"
11486
" ---------- ------------------------------------- ----------------------\n"
11487
" ``lf`` ``lf`` ``lf``\n"
11488
" ---------- ------------------------------------- ----------------------\n"
11489
" ``crlf`` ``crlf`` ``lf``\n"
11490
" ---------- ------------------------------------- ----------------------\n"
11491
" ``exact`` No conversion Exactly as in file\n"
11492
" ========== ===================================== ======================"
11493
msgstr ""
11494
11495
#: en/help_topics/eol.txt:36
11496
msgid ""
11497
"Note: For safety reasons, no conversion is applied to any file where a null\n"
11498
"byte is detected in the file."
11499
msgstr ""
11500
11501
#: en/help_topics/eol.txt:39
11502
msgid ""
11503
"For users working on a cross-platform project, here is a suggested rule\n"
11504
"to use as a starting point::"
11505
msgstr ""
11506
11507
#: en/help_topics/eol.txt:42 en/help_topics/eol.txt:52
11508
#: en/help_topics/eol.txt:67 en/help_topics/eol.txt:82
11509
msgid ""
11510
" [name *]\n"
11511
" eol = native"
11512
msgstr ""
11513
11514
#: en/help_topics/eol.txt:45
11515
msgid ""
11516
"If you have binary files that do not contain a null byte though, be\n"
11517
"sure to add ``eol = exact`` rules for those as well. You can do this\n"
11518
"by giving more explicit patterns earlier in the rules file. For example::"
11519
msgstr ""
11520
11521
#: en/help_topics/eol.txt:49
11522
msgid ""
11523
" [name *.png]\n"
11524
" eol = exact"
11525
msgstr ""
11526
11527
#: en/help_topics/eol.txt:55
11528
msgid ""
11529
"If your working tree is on a network drive shared by users on different\n"
11530
"operating systems, you typically want to force certain conventions for\n"
11531
"certain files. In that way, if a file is created with the wrong line\n"
11532
"endings or line endings get mixed during editing, it gets committed\n"
11533
"correctly and gets checked out correctly. For example::"
11534
msgstr ""
11535
11536
#: en/help_topics/eol.txt:61
11537
msgid ""
11538
" [name *.bat]\n"
11539
" eol = crlf"
11540
msgstr ""
11541
11542
#: en/help_topics/eol.txt:64
11543
msgid ""
11544
" [name *.sh]\n"
11545
" eol = lf"
11546
msgstr ""
11547
11548
#: en/help_topics/eol.txt:70
11549
msgid ""
11550
"If you take the care to create files with their required endings, you can\n"
11551
"achieve *almost* the same thing by using ``eol = exact``. It is slightly\n"
11552
"safer to use ``lf`` and ``crlf`` though because edits accidentally\n"
11553
"introducing mixed line endings will be corrected during commit for files\n"
11554
"with those settings."
11555
msgstr ""
11556
11557
#: en/help_topics/eol.txt:76
11558
msgid ""
11559
"If you have sample test data that deliberately has text files with mixed\n"
11560
"newline conventions, you can ask for those to be left alone like this::"
11561
msgstr ""
11562
11563
#: en/help_topics/eol.txt:79
11564
msgid ""
11565
" [name test_data/]\n"
11566
" eol = exact"
11567
msgstr ""
11568
11569
#: en/help_topics/eol.txt:85
11570
msgid ""
11571
"Note that ``exact`` does not imply the file is binary but it does mean\n"
11572
"that no conversion of end-of-lines will be done. (Bazaar currently relies\n"
11573
"of content analysis to detect binary files for commands like ``diff``.\n"
11574
"In the future, a ``binary = true`` rule may be added but it is not\n"
11575
"supported yet.)"
11576
msgstr ""
11577
11578
#: en/help_topics/eol.txt:91
11579
msgid ""
11580
"If you have an existing repository with text files already stored using\n"
11581
"Windows newline conventions (``crlf``), then you may want to keep using "
11582
"that\n"
11583
"convention in the repository. Forcing certain files to this convention\n"
11584
"may also help users who do not have rules configured. To do this, set\n"
11585
"``eol`` to one of the values below."
11586
msgstr ""
11587
11588
#: en/help_topics/eol.txt:97
11589
msgid ""
11590
" ============================ ======================== "
11591
"======================\n"
11592
" Value Checkout end-of-lines as Commit end-of-lines "
11593
"as\n"
11594
" ============================ ======================== "
11595
"======================\n"
11596
" ``native-with-crlf-in-repo`` ``crlf`` on Windows, ``crlf``\n"
11597
" ``lf`` otherwise\n"
11598
" ---------------------------- ------------------------ ----------------------"
11599
"\n"
11600
" ``lf-with-crlf-in-repo`` ``lf`` ``crlf``\n"
11601
" ---------------------------- ------------------------ ----------------------"
11602
"\n"
11603
" ``crlf-with-crlf-in-repo`` ``crlf`` ``crlf``\n"
11604
" ============================ ======================== ======================"
11605
msgstr ""
11606
11607
#: en/help_topics/eol.txt:108
11608
msgid ""
11609
"For users working on an existing project that uses Windows newline\n"
11610
"conventions in their Bazaar repository, this rule is suggested as a\n"
11611
"starting point::"
11612
msgstr ""
11613
11614
#: en/help_topics/eol.txt:112
11615
msgid ""
11616
" [name *]\n"
11617
" eol = native-with-crlf-in-repo"
11618
msgstr ""
11619
11620
#: en/help_topics/eol.txt:115
11621
msgid ""
11622
"For new projects, it is recommended that end-of-lines be stored as ``lf``\n"
11623
"and that users stick to the basic settings, i.e. ``native``, ``lf``,\n"
11624
"``crlf`` and ``exact``."
11625
msgstr ""
11626
11627
#: en/help_topics/eol.txt:119
11628
msgid ""
11629
"Note: Bazaar's EOL conversion will convert the content of files but\n"
11630
"never reject files because a given line ending or mixed line endings\n"
11631
"are found. A precommit hook should be used if you wish to validate\n"
11632
"(and not just convert) content before committing.\n"
11633
msgstr ""
11634
11635
#: en/help_topics/hidden-commands.txt:1
11636
msgid ""
11637
"added List files added in working tree.\n"
11638
"ancestry List all revisions merged into this branch.\n"
11639
"assert-fail Test reporting of assertion failures\n"
11640
"bundle-info Output interesting stats about a bundle\n"
11641
"bundle-revisions Create a merge-directive for submitting changes.\n"
11642
"cat-revision Write out metadata for a revision.\n"
11643
"dump-btree Dump the contents of a btree index file to stdout.\n"
11644
"export-pot Export command helps and error messages in po format.\n"
11645
"file-id Print file_id of a particular file or directory.\n"
11646
"file-path Print path of file_ids to a file or directory.\n"
11647
"find-merge-base Find and print a base revision for merging two "
11648
"branches.\n"
11649
"hooks Show hooks.\n"
11650
"inventory Show inventory of the current working copy or a "
11651
"revision.\n"
11652
"local-time-offset Show the offset in seconds from GMT to local time.\n"
11653
"lookup-revision Lookup the revision-id from a revision-number\n"
11654
"merge-directive Generate a merge directive for auto-merge tools.\n"
11655
"modified List files modified in working tree.\n"
11656
"re-sign Create a digital signature for an existing revision.\n"
11657
"reference list, view and set branch locations for nested trees.\n"
11658
"relpath Show path of a file relative to root\n"
11659
"repair-workingtree Reset the working tree state file.\n"
11660
"revision-history Display the list of revision ids on a branch.\n"
11661
"revision-info Show revision number and revision id for a given "
11662
"revision\n"
11663
" identifier.\n"
11664
"rocks Statement of optimism.\n"
11665
"selftest Run internal test suite.\n"
11666
"shell-complete Show appropriate completions for context.\n"
11667
"test-script Run a shell-like test from a file.\n"
11668
"touching-revisions Return revision-ids which affected a particular file.\n"
11669
"unknowns List unknown files.\n"
11670
"wait-until-signalled Test helper for\n"
11671
" test_start_and_stop_bzr_subprocess_send_signal.\n"
11672
msgstr ""
11673
11674
#: en/help_topics/hooks.txt:1
11675
msgid ""
11676
"\n"
11677
"Hooks\n"
11678
"====="
11679
msgstr ""
11680
11681
#: en/help_topics/hooks.txt:5 en/help_topics/rules.txt:4
11682
msgid ""
11683
"Introduction\n"
11684
"------------"
11685
msgstr ""
11686
11687
#: en/help_topics/hooks.txt:8
11688
msgid "A hook of type *xxx* of class *yyy* needs to be registered using::"
11689
msgstr ""
11690
11691
#: en/help_topics/hooks.txt:10
11692
msgid " yyy.hooks.install_named_hook(\"xxx\", ...)"
11693
msgstr ""
11694
11695
#: en/help_topics/hooks.txt:12
11696
msgid ""
11697
"See :doc:`Using hooks<../user-guide/hooks>` in the User Guide for examples."
11698
msgstr ""
11699
11700
#: en/help_topics/hooks.txt:14
11701
msgid ""
11702
"The class that contains each hook is given before the hooks it supplies. "
11703
"For\n"
11704
"instance, BranchHooks as the class is the hooks class for\n"
11705
"`bzrlib.branch.Branch.hooks`."
11706
msgstr ""
11707
11708
#: en/help_topics/hooks.txt:18
11709
msgid ""
11710
"Each description also indicates whether the hook runs on the client (the\n"
11711
"machine where bzr was invoked) or the server (the machine addressed by\n"
11712
"the branch URL). These may be, but are not necessarily, the same machine."
11713
msgstr ""
11714
11715
#: en/help_topics/hooks.txt:22
11716
msgid ""
11717
"Plugins (including hooks) are run on the server if all of these is true:"
11718
msgstr ""
11719
11720
#: en/help_topics/hooks.txt:24
11721
msgid ""
11722
" * The connection is via a smart server (accessed with a URL starting with\n"
11723
" \"bzr://\", \"bzr+ssh://\" or \"bzr+http://\", or accessed via a "
11724
"\"http://\"\n"
11725
" URL when a smart server is available via HTTP)."
11726
msgstr ""
11727
11728
#: en/help_topics/hooks.txt:28
11729
msgid ""
11730
" * The hook is either server specific or part of general infrastructure "
11731
"rather\n"
11732
" than client specific code (such as commit)."
11733
msgstr ""
11734
11735
#: en/help_topics/hooks.txt:31
11736
msgid ""
11737
"\n"
11738
"BranchHooks\n"
11739
"-----------"
11740
msgstr ""
11741
11742
#: en/help_topics/hooks.txt:35
11743
msgid ""
11744
"automatic_tag_name\n"
11745
"~~~~~~~~~~~~~~~~~~"
11746
msgstr ""
11747
11748
#: en/help_topics/hooks.txt:38 en/help_topics/hooks.txt:56
11749
#: en/help_topics/hooks.txt:102 en/help_topics/hooks.txt:262
11750
msgid "Introduced in: 2.2"
11751
msgstr ""
11752
11753
#: en/help_topics/hooks.txt:40
11754
msgid ""
11755
"Called to determine an automatic tag name for a revision.\n"
11756
"automatic_tag_name is called with (branch, revision_id) and should\n"
11757
"return a tag name or None if no tag name could be determined. The\n"
11758
"first non-None tag name returned will be used."
11759
msgstr ""
11760
11761
#: en/help_topics/hooks.txt:45
11762
msgid ""
11763
"open\n"
11764
"~~~~"
11765
msgstr ""
11766
11767
#: en/help_topics/hooks.txt:48 en/help_topics/hooks.txt:293
11768
#: en/help_topics/hooks.txt:307
11769
msgid "Introduced in: 1.8"
11770
msgstr ""
11771
11772
#: en/help_topics/hooks.txt:50
11773
msgid ""
11774
"Called with the Branch object that has been opened after a branch is\n"
11775
"opened."
11776
msgstr ""
11777
11778
#: en/help_topics/hooks.txt:53
11779
msgid ""
11780
"post_branch_init\n"
11781
"~~~~~~~~~~~~~~~~"
11782
msgstr ""
11783
11784
#: en/help_topics/hooks.txt:58
11785
msgid ""
11786
"Called after new branch initialization completes. post_branch_init is\n"
11787
"called with a bzrlib.branch.BranchInitHookParams. Note that init,\n"
11788
"branch and checkout (both heavyweight and lightweight) will all\n"
11789
"trigger this hook."
11790
msgstr ""
11791
11792
#: en/help_topics/hooks.txt:63
11793
msgid ""
11794
"post_change_branch_tip\n"
11795
"~~~~~~~~~~~~~~~~~~~~~~"
11796
msgstr ""
11797
11798
#: en/help_topics/hooks.txt:66 en/help_topics/hooks.txt:421
11799
msgid "Introduced in: 1.4"
11800
msgstr ""
11801
11802
#: en/help_topics/hooks.txt:68
11803
msgid ""
11804
"Called in bzr client and server after a change to the tip of a branch\n"
11805
"is made. post_change_branch_tip is called with a\n"
11806
"bzrlib.branch.ChangeBranchTipParams. Note that push, pull, commit,\n"
11807
"uncommit will all trigger this hook."
11808
msgstr ""
11809
11810
#: en/help_topics/hooks.txt:73 en/help_topics/hooks.txt:392
11811
msgid ""
11812
"post_commit\n"
11813
"~~~~~~~~~~~"
11814
msgstr ""
11815
11816
#: en/help_topics/hooks.txt:76 en/help_topics/hooks.txt:86
11817
#: en/help_topics/hooks.txt:94 en/help_topics/hooks.txt:110
11818
msgid "Introduced in: 0.15"
11819
msgstr ""
11820
11821
#: en/help_topics/hooks.txt:78
11822
msgid ""
11823
"Called in the bzr client after a commit has completed. post_commit is\n"
11824
"called with (local, master, old_revno, old_revid, new_revno,\n"
11825
"new_revid). old_revid is NULL_REVISION for the first commit to a\n"
11826
"branch."
11827
msgstr ""
11828
11829
#: en/help_topics/hooks.txt:83
11830
msgid ""
11831
"post_pull\n"
11832
"~~~~~~~~~"
11833
msgstr ""
11834
11835
#: en/help_topics/hooks.txt:88
11836
msgid ""
11837
"Called after a pull operation completes. post_pull is called with a\n"
11838
"bzrlib.branch.PullResult object and only runs in the bzr client."
11839
msgstr ""
11840
11841
#: en/help_topics/hooks.txt:91
11842
msgid ""
11843
"post_push\n"
11844
"~~~~~~~~~"
11845
msgstr ""
11846
11847
#: en/help_topics/hooks.txt:96
11848
msgid ""
11849
"Called after a push operation completes. post_push is called with a\n"
11850
"bzrlib.branch.BranchPushResult object and only runs in the bzr client."
11851
msgstr ""
11852
11853
#: en/help_topics/hooks.txt:99
11854
msgid ""
11855
"post_switch\n"
11856
"~~~~~~~~~~~"
11857
msgstr ""
11858
11859
#: en/help_topics/hooks.txt:104
11860
msgid ""
11861
"Called after a checkout switches branch. post_switch is called with a\n"
11862
"bzrlib.branch.SwitchHookParams."
11863
msgstr ""
11864
11865
#: en/help_topics/hooks.txt:107
11866
msgid ""
11867
"post_uncommit\n"
11868
"~~~~~~~~~~~~~"
11869
msgstr ""
11870
11871
#: en/help_topics/hooks.txt:112
11872
msgid ""
11873
"Called in the bzr client after an uncommit completes. post_uncommit is\n"
11874
"called with (local, master, old_revno, old_revid, new_revno,\n"
11875
"new_revid) where local is the local branch or None, master is the\n"
11876
"target branch, and an empty branch receives new_revno of 0, new_revid\n"
11877
"of None."
11878
msgstr ""
11879
11880
#: en/help_topics/hooks.txt:118
11881
msgid ""
11882
"pre_change_branch_tip\n"
11883
"~~~~~~~~~~~~~~~~~~~~~"
11884
msgstr ""
11885
11886
#: en/help_topics/hooks.txt:121
11887
msgid "Introduced in: 1.6"
11888
msgstr ""
11889
11890
#: en/help_topics/hooks.txt:123
11891
msgid ""
11892
"Called in bzr client and server before a change to the tip of a branch\n"
11893
"is made. pre_change_branch_tip is called with a\n"
11894
"bzrlib.branch.ChangeBranchTipParams. Note that push, pull, commit,\n"
11895
"uncommit will all trigger this hook."
11896
msgstr ""
11897
11898
#: en/help_topics/hooks.txt:128
11899
msgid ""
11900
"pre_commit\n"
11901
"~~~~~~~~~~"
11902
msgstr ""
11903
11904
#: en/help_topics/hooks.txt:131
11905
msgid "Introduced in: 0.91"
11906
msgstr ""
11907
11908
#: en/help_topics/hooks.txt:133
11909
msgid ""
11910
"Called after a commit is calculated but before it is completed.\n"
11911
"pre_commit is called with (local, master, old_revno, old_revid,\n"
11912
"future_revno, future_revid, tree_delta, future_tree). old_revid is\n"
11913
"NULL_REVISION for the first commit to a branch, tree_delta is a\n"
11914
"TreeDelta object describing changes from the basis revision. hooks\n"
11915
"MUST NOT modify this delta. future_tree is an in-memory tree obtained\n"
11916
"from CommitBuilder.revision_tree() and hooks MUST NOT modify this\n"
11917
"tree."
11918
msgstr ""
11919
11920
#: en/help_topics/hooks.txt:142
11921
msgid ""
11922
"transform_fallback_location\n"
11923
"~~~~~~~~~~~~~~~~~~~~~~~~~~~"
11924
msgstr ""
11925
11926
#: en/help_topics/hooks.txt:145
11927
msgid "Introduced in: 1.9"
11928
msgstr ""
11929
11930
#: en/help_topics/hooks.txt:147
11931
msgid ""
11932
"Called when a stacked branch is activating its fallback locations.\n"
11933
"transform_fallback_location is called with (branch, url), and should\n"
11934
"return a new url. Returning the same url allows it to be used as-is,\n"
11935
"returning a different one can be used to cause the branch to stack on\n"
11936
"a closer copy of that fallback_location. Note that the branch cannot\n"
11937
"have history accessing methods called on it during this hook because\n"
11938
"the fallback locations have not been activated. When there are\n"
11939
"multiple hooks installed for transform_fallback_location, all are\n"
11940
"called with the url returned from the previous hook.The order is\n"
11941
"however undefined."
11942
msgstr ""
11943
11944
#: en/help_topics/hooks.txt:158
11945
msgid ""
11946
"CommandHooks\n"
11947
"------------"
11948
msgstr ""
11949
11950
#: en/help_topics/hooks.txt:161
11951
msgid ""
11952
"extend_command\n"
11953
"~~~~~~~~~~~~~~"
11954
msgstr ""
11955
11956
#: en/help_topics/hooks.txt:164
11957
msgid "Introduced in: 1.13"
11958
msgstr ""
11959
11960
#: en/help_topics/hooks.txt:166
11961
msgid ""
11962
"Called after creating a command object to allow modifications such as\n"
11963
"adding or removing options, docs etc. Called with the new\n"
11964
"bzrlib.commands.Command object."
11965
msgstr ""
11966
11967
#: en/help_topics/hooks.txt:170
11968
msgid ""
11969
"get_command\n"
11970
"~~~~~~~~~~~"
11971
msgstr ""
11972
11973
#: en/help_topics/hooks.txt:173 en/help_topics/hooks.txt:185
11974
#: en/help_topics/hooks.txt:194 en/help_topics/hooks.txt:467
11975
msgid "Introduced in: 1.17"
11976
msgstr ""
11977
11978
#: en/help_topics/hooks.txt:175
11979
msgid ""
11980
"Called when creating a single command. Called with (cmd_or_None,\n"
11981
"command_name). get_command should either return the cmd_or_None\n"
11982
"parameter, or a replacement Command object that should be used for the\n"
11983
"command. Note that the Command.hooks hooks are core infrastructure.\n"
11984
"Many users will prefer to use bzrlib.commands.register_command or\n"
11985
"plugin_cmds.register_lazy."
11986
msgstr ""
11987
11988
#: en/help_topics/hooks.txt:182
11989
msgid ""
11990
"get_missing_command\n"
11991
"~~~~~~~~~~~~~~~~~~~"
11992
msgstr ""
11993
11994
#: en/help_topics/hooks.txt:187
11995
msgid ""
11996
"Called when creating a single command if no command could be found.\n"
11997
"Called with (command_name). get_missing_command should either return\n"
11998
"None, or a Command object to be used for the command."
11999
msgstr ""
12000
12001
#: en/help_topics/hooks.txt:191
12002
msgid ""
12003
"list_commands\n"
12004
"~~~~~~~~~~~~~"
12005
msgstr ""
12006
12007
#: en/help_topics/hooks.txt:196
12008
msgid ""
12009
"Called when enumerating commands. Called with a set of cmd_name\n"
12010
"strings for all the commands found so far. This set is safe to mutate\n"
12011
"- e.g. to remove a command. list_commands should return the updated\n"
12012
"set of command names."
12013
msgstr ""
12014
12015
#: en/help_topics/hooks.txt:201
12016
msgid ""
12017
"post_command\n"
12018
"~~~~~~~~~~~~"
12019
msgstr ""
12020
12021
#: en/help_topics/hooks.txt:204 en/help_topics/hooks.txt:211
12022
msgid "Introduced in: 2.6"
12023
msgstr ""
12024
12025
#: en/help_topics/hooks.txt:206
12026
msgid "Called after executing a command. Called with the command object."
12027
msgstr ""
12028
12029
#: en/help_topics/hooks.txt:208
12030
msgid ""
12031
"pre_command\n"
12032
"~~~~~~~~~~~"
12033
msgstr ""
12034
12035
#: en/help_topics/hooks.txt:213
12036
msgid "Called prior to executing a command. Called with the command object."
12037
msgstr ""
12038
12039
#: en/help_topics/hooks.txt:215
12040
msgid ""
12041
"_ConfigHooks\n"
12042
"------------"
12043
msgstr ""
12044
12045
#: en/help_topics/hooks.txt:218
12046
msgid ""
12047
"get\n"
12048
"~~~"
12049
msgstr ""
12050
12051
#: en/help_topics/hooks.txt:221 en/help_topics/hooks.txt:229
12052
#: en/help_topics/hooks.txt:236 en/help_topics/hooks.txt:244
12053
#: en/help_topics/hooks.txt:251 en/help_topics/hooks.txt:373
12054
#: en/help_topics/hooks.txt:446
12055
msgid "Introduced in: 2.4"
12056
msgstr ""
12057
12058
#: en/help_topics/hooks.txt:223
12059
msgid ""
12060
"Invoked when a config option is read. The signature is (stack, name,\n"
12061
"value)."
12062
msgstr ""
12063
12064
#: en/help_topics/hooks.txt:226
12065
msgid ""
12066
"load\n"
12067
"~~~~"
12068
msgstr ""
12069
12070
#: en/help_topics/hooks.txt:231
12071
msgid "Invoked when a config store is loaded. The signature is (store)."
12072
msgstr ""
12073
12074
#: en/help_topics/hooks.txt:233
12075
msgid ""
12076
"remove\n"
12077
"~~~~~~"
12078
msgstr ""
12079
12080
#: en/help_topics/hooks.txt:238
12081
msgid ""
12082
"Invoked when a config option is removed. The signature is (stack,\n"
12083
"name)."
12084
msgstr ""
12085
12086
#: en/help_topics/hooks.txt:241
12087
msgid ""
12088
"save\n"
12089
"~~~~"
12090
msgstr ""
12091
12092
#: en/help_topics/hooks.txt:246
12093
msgid "Invoked when a config store is saved. The signature is (store)."
12094
msgstr ""
12095
12096
#: en/help_topics/hooks.txt:248
12097
msgid ""
12098
"set\n"
12099
"~~~"
12100
msgstr ""
12101
12102
#: en/help_topics/hooks.txt:253
12103
msgid ""
12104
"Invoked when a config option is set. The signature is (stack, name,\n"
12105
"value)."
12106
msgstr ""
12107
12108
#: en/help_topics/hooks.txt:256
12109
msgid ""
12110
"ControlDirHooks\n"
12111
"---------------"
12112
msgstr ""
12113
12114
#: en/help_topics/hooks.txt:259
12115
msgid ""
12116
"post_repo_init\n"
12117
"~~~~~~~~~~~~~~"
12118
msgstr ""
12119
12120
#: en/help_topics/hooks.txt:264
12121
msgid ""
12122
"Invoked after a repository has been initialized. post_repo_init is\n"
12123
"called with a bzrlib.controldir.RepoInitHookParams."
12124
msgstr ""
12125
12126
#: en/help_topics/hooks.txt:267
12127
msgid ""
12128
"pre_open\n"
12129
"~~~~~~~~"
12130
msgstr ""
12131
12132
#: en/help_topics/hooks.txt:270
12133
msgid "Introduced in: 1.14"
12134
msgstr ""
12135
12136
#: en/help_topics/hooks.txt:272
12137
msgid ""
12138
"Invoked before attempting to open a ControlDir with the transport that\n"
12139
"the open will use."
12140
msgstr ""
12141
12142
#: en/help_topics/hooks.txt:275
12143
msgid ""
12144
"InfoHooks\n"
12145
"---------"
12146
msgstr ""
12147
12148
#: en/help_topics/hooks.txt:278
12149
msgid ""
12150
"repository\n"
12151
"~~~~~~~~~~"
12152
msgstr ""
12153
12154
#: en/help_topics/hooks.txt:281 en/help_topics/hooks.txt:300
12155
#: en/help_topics/hooks.txt:524
12156
msgid "Introduced in: 1.15"
12157
msgstr ""
12158
12159
#: en/help_topics/hooks.txt:283
12160
msgid ""
12161
"Invoked when displaying the statistics for a repository. repository is\n"
12162
"called with a statistics dictionary as returned by the repository and\n"
12163
"a file-like object to write to."
12164
msgstr ""
12165
12166
#: en/help_topics/hooks.txt:287
12167
msgid ""
12168
"LockHooks\n"
12169
"---------"
12170
msgstr ""
12171
12172
#: en/help_topics/hooks.txt:290
12173
msgid ""
12174
"lock_acquired\n"
12175
"~~~~~~~~~~~~~"
12176
msgstr ""
12177
12178
#: en/help_topics/hooks.txt:295
12179
msgid ""
12180
"Called with a bzrlib.lock.LockResult when a physical lock is acquired."
12181
msgstr ""
12182
12183
#: en/help_topics/hooks.txt:297
12184
msgid ""
12185
"lock_broken\n"
12186
"~~~~~~~~~~~"
12187
msgstr ""
12188
12189
#: en/help_topics/hooks.txt:302
12190
msgid "Called with a bzrlib.lock.LockResult when a physical lock is broken."
12191
msgstr ""
12192
12193
#: en/help_topics/hooks.txt:304
12194
msgid ""
12195
"lock_released\n"
12196
"~~~~~~~~~~~~~"
12197
msgstr ""
12198
12199
#: en/help_topics/hooks.txt:309
12200
msgid ""
12201
"Called with a bzrlib.lock.LockResult when a physical lock is released."
12202
msgstr ""
12203
12204
#: en/help_topics/hooks.txt:311
12205
msgid ""
12206
"MergeHooks\n"
12207
"----------"
12208
msgstr ""
12209
12210
#: en/help_topics/hooks.txt:314
12211
msgid ""
12212
"merge_file_content\n"
12213
"~~~~~~~~~~~~~~~~~~"
12214
msgstr ""
12215
12216
#: en/help_topics/hooks.txt:317
12217
msgid "Introduced in: 2.1"
12218
msgstr ""
12219
12220
#: en/help_topics/hooks.txt:319
12221
msgid ""
12222
"Called with a bzrlib.merge.Merger object to create a per file merge\n"
12223
"object when starting a merge. Should return either None or a subclass\n"
12224
"of ``bzrlib.merge.AbstractPerFileMerger``. Such objects will then be\n"
12225
"called per file that needs to be merged (including when one side has\n"
12226
"deleted the file and the other has changed it). See the\n"
12227
"AbstractPerFileMerger API docs for details on how it is used by merge."
12228
msgstr ""
12229
12230
#: en/help_topics/hooks.txt:326
12231
msgid ""
12232
"post_merge\n"
12233
"~~~~~~~~~~"
12234
msgstr ""
12235
12236
#: en/help_topics/hooks.txt:329 en/help_topics/hooks.txt:337
12237
#: en/help_topics/hooks.txt:387 en/help_topics/hooks.txt:405
12238
#: en/help_topics/hooks.txt:413 en/help_topics/hooks.txt:512
12239
msgid "Introduced in: 2.5"
12240
msgstr ""
12241
12242
#: en/help_topics/hooks.txt:331
12243
msgid ""
12244
"Called after a merge. Receives a Merger object as the single argument.\n"
12245
"The return value is ignored."
12246
msgstr ""
12247
12248
#: en/help_topics/hooks.txt:334
12249
msgid ""
12250
"pre_merge\n"
12251
"~~~~~~~~~"
12252
msgstr ""
12253
12254
#: en/help_topics/hooks.txt:339
12255
msgid ""
12256
"Called before a merge. Receives a Merger object as the single\n"
12257
"argument."
12258
msgstr ""
12259
12260
#: en/help_topics/hooks.txt:342
12261
msgid ""
12262
"MergeDirectiveHooks\n"
12263
"-------------------"
12264
msgstr ""
12265
12266
#: en/help_topics/hooks.txt:345
12267
msgid ""
12268
"merge_request_body\n"
12269
"~~~~~~~~~~~~~~~~~~"
12270
msgstr ""
12271
12272
#: en/help_topics/hooks.txt:348
12273
msgid "Introduced in: 1.15.0"
12274
msgstr ""
12275
12276
#: en/help_topics/hooks.txt:350
12277
msgid ""
12278
"Called with a MergeRequestBodyParams when a body is needed for a merge\n"
12279
"request. Callbacks must return a body. If more than one callback is\n"
12280
"registered, the output of one callback is provided to the next."
12281
msgstr ""
12282
12283
#: en/help_topics/hooks.txt:354
12284
msgid ""
12285
"MessageEditorHooks\n"
12286
"------------------"
12287
msgstr ""
12288
12289
#: en/help_topics/hooks.txt:357
12290
msgid ""
12291
"commit_message_template\n"
12292
"~~~~~~~~~~~~~~~~~~~~~~~"
12293
msgstr ""
12294
12295
#: en/help_topics/hooks.txt:360
12296
msgid "Introduced in: 1.10"
12297
msgstr ""
12298
12299
#: en/help_topics/hooks.txt:362
12300
msgid ""
12301
"Called when a commit message is being generated.\n"
12302
"commit_message_template is called with the bzrlib.commit.Commit object\n"
12303
"and the message that is known so far. commit_message_template must\n"
12304
"return a new message to use (which could be the same as it was given).\n"
12305
"When there are multiple hooks registered for commit_message_template,\n"
12306
"they are chained with the result from the first passed into the\n"
12307
"second, and so on."
12308
msgstr ""
12309
12310
#: en/help_topics/hooks.txt:370
12311
msgid ""
12312
"set_commit_message\n"
12313
"~~~~~~~~~~~~~~~~~~"
12314
msgstr ""
12315
12316
#: en/help_topics/hooks.txt:375
12317
msgid ""
12318
"Set a fixed commit message. set_commit_message is called with the\n"
12319
"bzrlib.commit.Commit object (so you can also change e.g. revision\n"
12320
"properties by editing commit.builder._revprops) and the message so\n"
12321
"far. set_commit_message must return the message to use or None if it\n"
12322
"should use the message editor as normal."
12323
msgstr ""
12324
12325
#: en/help_topics/hooks.txt:381
12326
msgid ""
12327
"MutableTreeHooks\n"
12328
"----------------"
12329
msgstr ""
12330
12331
#: en/help_topics/hooks.txt:384
12332
msgid ""
12333
"post_build_tree\n"
12334
"~~~~~~~~~~~~~~~"
12335
msgstr ""
12336
12337
#: en/help_topics/hooks.txt:389
12338
msgid ""
12339
"Called after a completely new tree is built. The hook is called with\n"
12340
"the tree as its only argument."
12341
msgstr ""
12342
12343
#: en/help_topics/hooks.txt:395
12344
msgid "Introduced in: 2.0"
12345
msgstr ""
12346
12347
#: en/help_topics/hooks.txt:397
12348
msgid ""
12349
"Called after a commit is performed on a tree. The hook is called with\n"
12350
"a bzrlib.mutabletree.PostCommitHookParams object. The mutable tree the\n"
12351
"commit was performed on is available via the mutable_tree attribute of\n"
12352
"that object."
12353
msgstr ""
12354
12355
#: en/help_topics/hooks.txt:402
12356
msgid ""
12357
"post_transform\n"
12358
"~~~~~~~~~~~~~~"
12359
msgstr ""
12360
12361
#: en/help_topics/hooks.txt:407
12362
msgid ""
12363
"Called after a tree transform has been performed on a tree. The hook\n"
12364
"is called with the tree that is being transformed and the transform."
12365
msgstr ""
12366
12367
#: en/help_topics/hooks.txt:410
12368
msgid ""
12369
"pre_transform\n"
12370
"~~~~~~~~~~~~~"
12371
msgstr ""
12372
12373
#: en/help_topics/hooks.txt:415
12374
msgid ""
12375
"Called before a tree transform on this tree. The hook is called with\n"
12376
"the tree that is being transformed and the transform."
12377
msgstr ""
12378
12379
#: en/help_topics/hooks.txt:418
12380
msgid ""
12381
"start_commit\n"
12382
"~~~~~~~~~~~~"
12383
msgstr ""
12384
12385
#: en/help_topics/hooks.txt:423
12386
msgid ""
12387
"Called before a commit is performed on a tree. The start commit hook\n"
12388
"is able to change the tree before the commit takes place. start_commit\n"
12389
"is called with the bzrlib.mutabletree.MutableTree that the commit is\n"
12390
"being performed on."
12391
msgstr ""
12392
12393
#: en/help_topics/hooks.txt:428
12394
msgid ""
12395
"SmartClientHooks\n"
12396
"----------------"
12397
msgstr ""
12398
12399
#: en/help_topics/hooks.txt:431
12400
msgid ""
12401
"call\n"
12402
"~~~~"
12403
msgstr ""
12404
12405
#: en/help_topics/hooks.txt:434
12406
msgid "Introduced in: unknown"
12407
msgstr ""
12408
12409
#: en/help_topics/hooks.txt:436
12410
msgid ""
12411
"Called when the smart client is submitting a request to the smart\n"
12412
"server. Called with a bzrlib.smart.client.CallHookParams object.\n"
12413
"Streaming request bodies, and responses, are not accessible."
12414
msgstr ""
12415
12416
#: en/help_topics/hooks.txt:440
12417
msgid ""
12418
"SmartServerHooks\n"
12419
"----------------"
12420
msgstr ""
12421
12422
#: en/help_topics/hooks.txt:443
12423
msgid ""
12424
"server_exception\n"
12425
"~~~~~~~~~~~~~~~~"
12426
msgstr ""
12427
12428
#: en/help_topics/hooks.txt:448
12429
msgid ""
12430
"Called by the bzr server when an exception occurs. server_exception is\n"
12431
"called with the sys.exc_info() tuple return true for the hook if the\n"
12432
"exception has been handled, in which case the server will exit\n"
12433
"normally."
12434
msgstr ""
12435
12436
#: en/help_topics/hooks.txt:453
12437
msgid ""
12438
"server_started\n"
12439
"~~~~~~~~~~~~~~"
12440
msgstr ""
12441
12442
#: en/help_topics/hooks.txt:456 en/help_topics/hooks.txt:475
12443
msgid "Introduced in: 0.16"
12444
msgstr ""
12445
12446
#: en/help_topics/hooks.txt:458
12447
msgid ""
12448
"Called by the bzr server when it starts serving a directory.\n"
12449
"server_started is called with (backing urls, public url), where\n"
12450
"backing_url is a list of URLs giving the server-specific directory\n"
12451
"locations, and public_url is the public URL for the directory being\n"
12452
"served."
12453
msgstr ""
12454
12455
#: en/help_topics/hooks.txt:464
12456
msgid ""
12457
"server_started_ex\n"
12458
"~~~~~~~~~~~~~~~~~"
12459
msgstr ""
12460
12461
#: en/help_topics/hooks.txt:469
12462
msgid ""
12463
"Called by the bzr server when it starts serving a directory.\n"
12464
"server_started is called with (backing_urls, server_obj)."
12465
msgstr ""
12466
12467
#: en/help_topics/hooks.txt:472
12468
msgid ""
12469
"server_stopped\n"
12470
"~~~~~~~~~~~~~~"
12471
msgstr ""
12472
12473
#: en/help_topics/hooks.txt:477
12474
msgid ""
12475
"Called by the bzr server when it stops serving a directory.\n"
12476
"server_stopped is called with the same parameters as the\n"
12477
"server_started hook: (backing_urls, public_url)."
12478
msgstr ""
12479
12480
#: en/help_topics/hooks.txt:481
12481
msgid ""
12482
"StatusHooks\n"
12483
"-----------"
12484
msgstr ""
12485
12486
#: en/help_topics/hooks.txt:484
12487
msgid ""
12488
"post_status\n"
12489
"~~~~~~~~~~~"
12490
msgstr ""
12491
12492
#: en/help_topics/hooks.txt:487 en/help_topics/hooks.txt:498
12493
msgid "Introduced in: 2.3"
12494
msgstr ""
12495
12496
#: en/help_topics/hooks.txt:489
12497
msgid ""
12498
"Called with argument StatusHookParams after Bazaar has displayed the\n"
12499
"status. StatusHookParams has the attributes (old_tree, new_tree,\n"
12500
"to_file, versioned, show_ids, short, verbose). The last four arguments\n"
12501
"correspond to the command line options specified by the user for the\n"
12502
"status command. to_file is the output stream for writing."
12503
msgstr ""
12504
12505
#: en/help_topics/hooks.txt:495
12506
msgid ""
12507
"pre_status\n"
12508
"~~~~~~~~~~"
12509
msgstr ""
12510
12511
#: en/help_topics/hooks.txt:500
12512
msgid ""
12513
"Called with argument StatusHookParams before Bazaar displays the\n"
12514
"status. StatusHookParams has the attributes (old_tree, new_tree,\n"
12515
"to_file, versioned, show_ids, short, verbose). The last four arguments\n"
12516
"correspond to the command line options specified by the user for the\n"
12517
"status command. to_file is the output stream for writing."
12518
msgstr ""
12519
12520
#: en/help_topics/hooks.txt:506
12521
msgid ""
12522
"TransportHooks\n"
12523
"--------------"
12524
msgstr ""
12525
12526
#: en/help_topics/hooks.txt:509
12527
msgid ""
12528
"post_connect\n"
12529
"~~~~~~~~~~~~"
12530
msgstr ""
12531
12532
#: en/help_topics/hooks.txt:514
12533
msgid ""
12534
"Called after a new connection is established or a reconnect occurs.\n"
12535
"The sole argument passed is either the connected transport or smart\n"
12536
"medium instance."
12537
msgstr ""
12538
12539
#: en/help_topics/hooks.txt:518
12540
msgid ""
12541
"RioVersionInfoBuilderHooks\n"
12542
"--------------------------"
12543
msgstr ""
12544
12545
#: en/help_topics/hooks.txt:521
12546
msgid ""
12547
"revision\n"
12548
"~~~~~~~~"
12549
msgstr ""
12550
12551
#: en/help_topics/hooks.txt:526
12552
msgid ""
12553
"Invoked when adding information about a revision to the RIO stanza\n"
12554
"that is printed. revision is called with a revision object and a RIO\n"
12555
"stanza.\n"
12556
msgstr ""
12557
12558
#: en/help_topics/location-alias.txt:1
12559
msgid ""
12560
"Location aliases\n"
12561
"================"
12562
msgstr ""
12563
12564
#: en/help_topics/location-alias.txt:4
12565
msgid ""
12566
"Bazaar defines several aliases for locations associated with a branch. "
12567
"These\n"
12568
"can be used with most commands that expect a location, such as `bzr push`."
12569
msgstr ""
12570
12571
#: en/help_topics/location-alias.txt:7
12572
msgid "The aliases are::"
12573
msgstr ""
12574
12575
#: en/help_topics/location-alias.txt:9
12576
msgid ""
12577
" :bound The branch this branch is bound to, for bound branches.\n"
12578
" :parent The parent of this branch.\n"
12579
" :public The public location of this branch.\n"
12580
" :push The saved location used for `bzr push` with no arguments.\n"
12581
" :submit The submit branch for this branch.\n"
12582
" :this This branch."
12583
msgstr ""
12584
12585
#: en/help_topics/location-alias.txt:16
12586
msgid "For example, to push to the parent location::"
12587
msgstr ""
12588
12589
#: en/help_topics/location-alias.txt:18
12590
msgid " bzr push :parent\n"
12591
msgstr ""
12592
12593
#: en/help_topics/log-formats.txt:1
12594
msgid ""
12595
"Log Formats\n"
12596
"==========="
12597
msgstr ""
12598
12599
#: en/help_topics/log-formats.txt:4
12600
msgid ""
12601
"A log format controls how information about each revision is displayed.\n"
12602
"The standard log formats are compared below::"
12603
msgstr ""
12604
12605
#: en/help_topics/log-formats.txt:7
12606
msgid ""
12607
" Feature long short line\n"
12608
" ---------------------- ------------- ------------ -------------------\n"
12609
" design goal detailed view concise view 1 revision per line\n"
12610
" committer name+email name only name only\n"
12611
" author name+email - -\n"
12612
" date-time format full date only date only\n"
12613
" commit message full full top line\n"
12614
" tags yes yes yes\n"
12615
" merges indicator - yes -\n"
12616
" status/delta optional optional -\n"
12617
" diff/patch optional optional -\n"
12618
" revision-id optional optional -\n"
12619
" branch nick yes - -\n"
12620
" foreign vcs properties yes yes -\n"
12621
" preferred levels all 1 1\n"
12622
" digital signature optional - -"
12623
msgstr ""
12624
12625
#: en/help_topics/log-formats.txt:24
12626
msgid ""
12627
"The default format is ``long``. To change this, define the ``log_format``\n"
12628
"setting in the ``[DEFAULT]`` section of ``bazaar.conf`` like this (say)::"
12629
msgstr ""
12630
12631
#: en/help_topics/log-formats.txt:27
12632
msgid ""
12633
" [DEFAULT]\n"
12634
" log_format = short"
12635
msgstr ""
12636
12637
#: en/help_topics/log-formats.txt:30
12638
msgid ""
12639
"Alternatively, to change the log format used for a given query, use the\n"
12640
"--long, --short or --line options."
12641
msgstr ""
12642
12643
#: en/help_topics/log-formats.txt:33
12644
msgid ""
12645
"If one of the standard log formats does not meet your needs, additional\n"
12646
"formats can be provided by plugins.\n"
12647
msgstr ""
12648
12649
#: en/help_topics/other-formats.txt:1
12650
msgid "Other Storage Formats"
12651
msgstr ""
12652
12653
#: en/help_topics/other-formats.txt:3
12654
msgid "Experimental formats are shown below."
12655
msgstr ""
12656
12657
#: en/help_topics/other-formats.txt:5
12658
msgid ""
12659
":development-colo:\n"
12660
" (native) The 2a format with experimental support for colocated\n"
12661
" branches."
12662
msgstr ""
12663
12664
#: en/help_topics/other-formats.txt:9
12665
msgid ""
12666
"\n"
12667
"Deprecated formats are shown below."
12668
msgstr ""
12669
12670
#: en/help_topics/other-formats.txt:12
12671
msgid ""
12672
":pack-0.92:\n"
12673
" (native) Pack-based format used in 1.x series. Introduced in 0.92.\n"
12674
" Interoperates with bzr repositories before 0.92 but cannot be read\n"
12675
" by bzr < 0.92."
12676
msgstr ""
12677
12678
#: en/help_topics/patterns.txt:1
12679
msgid ""
12680
"Patterns\n"
12681
"========"
12682
msgstr ""
12683
12684
#: en/help_topics/patterns.txt:4
12685
msgid ""
12686
"Bazaar uses patterns to match files at various times. For example,\n"
12687
"the ``add`` command skips over files that match ignore patterns\n"
12688
"and preferences can be associated with files using rule patterns.\n"
12689
"The pattern syntax is described below."
12690
msgstr ""
12691
12692
#: en/help_topics/patterns.txt:9
12693
msgid ""
12694
"Trailing slashes on patterns are ignored. If the pattern contains a\n"
12695
"slash or is a regular expression, it is compared to the whole path\n"
12696
"from the branch root. Otherwise, it is compared to only the last\n"
12697
"component of the path. To match a file only in the root directory,\n"
12698
"prepend ``./``. Patterns specifying absolute paths are not allowed."
12699
msgstr ""
12700
12701
#: en/help_topics/patterns.txt:15
12702
msgid "Patterns may include globbing wildcards such as::"
12703
msgstr ""
12704
12705
#: en/help_topics/patterns.txt:17
12706
msgid ""
12707
" ? - Matches any single character except '/'\n"
12708
" * - Matches 0 or more characters except '/'\n"
12709
" /**/ - Matches 0 or more directories in a path\n"
12710
" [a-z] - Matches a single character from within a group of characters"
12711
msgstr ""
12712
12713
#: en/help_topics/patterns.txt:22
12714
msgid ""
12715
"Patterns may also be `Python regular expressions`_. Regular expression\n"
12716
"patterns are identified by a ``RE:`` prefix followed by the regular\n"
12717
"expression. Regular expression patterns may not include named or\n"
12718
"numbered groups."
12719
msgstr ""
12720
12721
#: en/help_topics/patterns.txt:27
12722
msgid ""
12723
"Case insensitive ignore patterns can be specified with regular expressions\n"
12724
"by using the ``i`` (for ignore case) flag in the pattern."
12725
msgstr ""
12726
12727
#: en/help_topics/patterns.txt:30
12728
msgid ""
12729
"For example, a case insensitive match for ``foo`` may be specified as::"
12730
msgstr ""
12731
12732
#: en/help_topics/patterns.txt:32
12733
msgid " RE:(?i)foo"
12734
msgstr ""
12735
12736
#: en/help_topics/patterns.txt:34
12737
msgid ""
12738
"Ignore patterns may be prefixed with ``!``, which means that a filename\n"
12739
"matched by that pattern will not be ignored."
12740
msgstr ""
12741
12742
#: en/help_topics/patterns.txt:37
12743
msgid ""
12744
".. _Python regular expressions: http://docs.python.org/library/re.html"
12745
msgstr ""
12746
12747
#: en/help_topics/revisionspec.txt:1
12748
msgid "Revision Identifiers"
12749
msgstr ""
12750
12751
#: en/help_topics/revisionspec.txt:3
12752
msgid ""
12753
"A revision identifier refers to a specific state of a branch's history. It\n"
12754
"can be expressed in several ways. It can begin with a keyword to\n"
12755
"unambiguously specify a given lookup type; some examples are 'last:1',\n"
12756
"'before:yesterday' and 'submit:'."
12757
msgstr ""
12758
12759
#: en/help_topics/revisionspec.txt:8
12760
msgid ""
12761
"Alternately, it can be given without a keyword, in which case it will be\n"
12762
"checked as a revision number, a tag, a revision id, a date specification, or "
12763
"a\n"
12764
"branch specification, in that order. For example, 'date:today' could be\n"
12765
"written as simply 'today', though if you have a tag called 'today' that "
12766
"will\n"
12767
"be found first."
12768
msgstr ""
12769
12770
#: en/help_topics/revisionspec.txt:14
12771
msgid ""
12772
"If 'REV1' and 'REV2' are revision identifiers, then 'REV1..REV2' denotes a\n"
12773
"revision range. Examples: '3647..3649', 'date:yesterday..-1' and\n"
12774
"'branch:/path/to/branch1/..branch:/branch2' (note that there are no quotes "
12775
"or\n"
12776
"spaces around the '..')."
12777
msgstr ""
12778
12779
#: en/help_topics/revisionspec.txt:19
12780
msgid ""
12781
"Ranges are interpreted differently by different commands. To the \"log\" "
12782
"command,\n"
12783
"a range is a sequence of log messages, but to the \"diff\" command, the "
12784
"range\n"
12785
"denotes a change between revisions (and not a sequence of changes). In\n"
12786
"addition, \"log\" considers a closed range whereas \"diff\" and \"merge\" "
12787
"consider it\n"
12788
"to be open-ended, that is, they include one end but not the other. For "
12789
"example:\n"
12790
"\"bzr log -r 3647..3649\" shows the messages of revisions 3647, 3648 and "
12791
"3649,\n"
12792
"while \"bzr diff -r 3647..3649\" includes the changes done in revisions 3648 "
12793
"and\n"
12794
"3649, but not 3647."
12795
msgstr ""
12796
12797
#: en/help_topics/revisionspec.txt:28
12798
msgid "The keywords used as revision selection methods are the following:"
12799
msgstr ""
12800
12801
#: en/help_topics/revisionspec.txt:30
12802
msgid ""
12803
":revid:\n"
12804
"\tSelects a revision using the revision id.\n"
12805
":submit:\n"
12806
"\tSelects a common ancestor with the submit branch.\n"
12807
":ancestor:\n"
12808
"\tSelects a common ancestor with a second branch.\n"
12809
":date:\n"
12810
"\tSelects a revision on the basis of a datestamp.\n"
12811
":branch:\n"
12812
"\tSelects the last revision of a specified branch.\n"
12813
":tag:\n"
12814
"\tSelects a revision identified by a tag name.\n"
12815
":revno:\n"
12816
"\tSelects a revision using a number.\n"
12817
":before:\n"
12818
"\tSelects the parent of the revision specified.\n"
12819
":annotate:\n"
12820
"\tSelect the revision that last modified the specified line.\n"
12821
":mainline:\n"
12822
"\tSelect mainline revision that merged the specified revision.\n"
12823
":last:\n"
12824
"\tSelects the nth revision from the end."
12825
msgstr ""
12826
12827
#: en/help_topics/revisionspec.txt:53
12828
msgid "In addition, plugins can provide other keywords."
12829
msgstr ""
12830
12831
#: en/help_topics/revisionspec.txt:55
12832
msgid "A detailed description of each keyword is given below."
12833
msgstr ""
12834
12835
#: en/help_topics/revisionspec.txt:57
12836
msgid ":revid:"
12837
msgstr ""
12838
12839
#: en/help_topics/revisionspec.txt:59
12840
msgid ""
12841
" Supply a specific revision id, that can be used to specify any\n"
12842
" revision id in the ancestry of the branch.\n"
12843
" Including merges, and pending merges.\n"
12844
" Examples::"
12845
msgstr ""
12846
12847
#: en/help_topics/revisionspec.txt:64
12848
msgid ""
12849
" revid:aaaa@bbbb-123456789 -> Select revision 'aaaa@bbbb-123456789'"
12850
msgstr ""
12851
12852
#: en/help_topics/revisionspec.txt:66
12853
msgid ":submit:"
12854
msgstr ""
12855
12856
#: en/help_topics/revisionspec.txt:68
12857
msgid ""
12858
" Diffing against this shows all the changes that were made in this "
12859
"branch,\n"
12860
" and is a good predictor of what merge will do. The submit branch is\n"
12861
" used by the bundle and merge directive commands. If no submit branch\n"
12862
" is specified, the parent branch is used instead."
12863
msgstr ""
12864
12865
#: en/help_topics/revisionspec.txt:73 en/help_topics/revisionspec.txt:85
12866
msgid ""
12867
" The common ancestor is the last revision that existed in both\n"
12868
" branches. Usually this is the branch point, but it could also be\n"
12869
" a revision that was merged."
12870
msgstr ""
12871
12872
#: en/help_topics/revisionspec.txt:77 en/help_topics/revisionspec.txt:93
12873
#: en/help_topics/revisionspec.txt:109 en/help_topics/revisionspec.txt:119
12874
#: en/help_topics/revisionspec.txt:153
12875
msgid " Examples::"
12876
msgstr ""
12877
12878
#: en/help_topics/revisionspec.txt:79
12879
msgid " $ bzr diff -r submit:"
12880
msgstr ""
12881
12882
#: en/help_topics/revisionspec.txt:81
12883
msgid ":ancestor:"
12884
msgstr ""
12885
12886
#: en/help_topics/revisionspec.txt:83
12887
msgid " Supply the path to a branch to select the common ancestor."
12888
msgstr ""
12889
12890
#: en/help_topics/revisionspec.txt:89
12891
msgid ""
12892
" This is frequently used with 'diff' to return all of the changes\n"
12893
" that your branch introduces, while excluding the changes that you\n"
12894
" have not merged from the remote branch."
12895
msgstr ""
12896
12897
#: en/help_topics/revisionspec.txt:95
12898
msgid ""
12899
" ancestor:/path/to/branch\n"
12900
" $ bzr diff -r ancestor:../../mainline/branch"
12901
msgstr ""
12902
12903
#: en/help_topics/revisionspec.txt:98
12904
msgid ":date:"
12905
msgstr ""
12906
12907
#: en/help_topics/revisionspec.txt:100
12908
msgid ""
12909
" Supply a datestamp to select the first revision that matches the date.\n"
12910
" Date can be 'yesterday', 'today', 'tomorrow' or a YYYY-MM-DD string.\n"
12911
" Matches the first entry after a given date (either at midnight or\n"
12912
" at a specified time)."
12913
msgstr ""
12914
12915
#: en/help_topics/revisionspec.txt:105
12916
msgid " One way to display all the changes since yesterday would be::"
12917
msgstr ""
12918
12919
#: en/help_topics/revisionspec.txt:107
12920
msgid " bzr log -r date:yesterday.."
12921
msgstr ""
12922
12923
#: en/help_topics/revisionspec.txt:111
12924
msgid ""
12925
" date:yesterday -> select the first revision since "
12926
"yesterday\n"
12927
" date:2006-08-14,17:10:14 -> select the first revision after\n"
12928
" August 14th, 2006 at 5:10pm."
12929
msgstr ""
12930
12931
#: en/help_topics/revisionspec.txt:115
12932
msgid ":branch:"
12933
msgstr ""
12934
12935
#: en/help_topics/revisionspec.txt:117
12936
msgid " Supply the path to a branch to select its last revision."
12937
msgstr ""
12938
12939
#: en/help_topics/revisionspec.txt:121
12940
msgid " branch:/path/to/branch"
12941
msgstr ""
12942
12943
#: en/help_topics/revisionspec.txt:123
12944
msgid ":tag:"
12945
msgstr ""
12946
12947
#: en/help_topics/revisionspec.txt:125
12948
msgid " Tags are stored in the branch and created by the 'tag' command."
12949
msgstr ""
12950
12951
#: en/help_topics/revisionspec.txt:127
12952
msgid ":revno:"
12953
msgstr ""
12954
12955
#: en/help_topics/revisionspec.txt:129
12956
msgid ""
12957
" Use an integer to specify a revision in the history of the branch.\n"
12958
" Optionally a branch can be specified. A negative number will count\n"
12959
" from the end of the branch (-1 is the last revision, -2 the previous\n"
12960
" one). If the negative number is larger than the branch's history, the\n"
12961
" first revision is returned.\n"
12962
" Examples::"
12963
msgstr ""
12964
12965
#: en/help_topics/revisionspec.txt:136
12966
msgid ""
12967
" revno:1 -> return the first revision of this branch\n"
12968
" revno:3:/path/to/branch -> return the 3rd revision of\n"
12969
" the branch '/path/to/branch'\n"
12970
" revno:-1 -> The last revision in a branch.\n"
12971
" -2:http://other/branch -> The second to last revision in the\n"
12972
" remote branch.\n"
12973
" -1000000 -> Most likely the first revision, unless\n"
12974
" your history is very long."
12975
msgstr ""
12976
12977
#: en/help_topics/revisionspec.txt:145
12978
msgid ":before:"
12979
msgstr ""
12980
12981
#: en/help_topics/revisionspec.txt:147
12982
msgid ""
12983
" Supply any revision spec to return the parent of that revision. This "
12984
"is\n"
12985
" mostly useful when inspecting revisions that are not in the revision "
12986
"history\n"
12987
" of a branch."
12988
msgstr ""
12989
12990
#: en/help_topics/revisionspec.txt:151
12991
msgid ""
12992
" It is an error to request the parent of the null revision (before:0)."
12993
msgstr ""
12994
12995
#: en/help_topics/revisionspec.txt:155
12996
msgid ""
12997
" before:1913 -> Return the parent of revno 1913 (revno 1912)\n"
12998
" before:revid:aaaa@bbbb-1234567890 -> return the parent of revision\n"
12999
" aaaa@bbbb-1234567890\n"
13000
" bzr diff -r before:1913..1913\n"
13001
" -> Find the changes between revision 1913 and its parent "
13002
"(1912).\n"
13003
" (What changes did revision 1913 introduce).\n"
13004
" This is equivalent to: bzr diff -c 1913"
13005
msgstr ""
13006
13007
#: en/help_topics/revisionspec.txt:163
13008
msgid ":annotate:"
13009
msgstr ""
13010
13011
#: en/help_topics/revisionspec.txt:165
13012
msgid ""
13013
" Select the revision that last modified the specified line. Line is\n"
13014
" specified as path:number. Path is a relative path to the file. "
13015
"Numbers\n"
13016
" start at 1, and are relative to the current version, not the last-\n"
13017
" committed version of the file."
13018
msgstr ""
13019
13020
#: en/help_topics/revisionspec.txt:170
13021
msgid ":mainline:"
13022
msgstr ""
13023
13024
#: en/help_topics/revisionspec.txt:172
13025
msgid ""
13026
" Select the revision that merged the specified revision into mainline."
13027
msgstr ""
13028
13029
#: en/help_topics/revisionspec.txt:174
13030
msgid ":last:"
13031
msgstr ""
13032
13033
#: en/help_topics/revisionspec.txt:176
13034
msgid ""
13035
" Supply a positive number to get the nth revision from the end.\n"
13036
" This is the same as supplying negative numbers to the 'revno:' spec.\n"
13037
" Examples::"
13038
msgstr ""
13039
13040
#: en/help_topics/revisionspec.txt:180
13041
msgid ""
13042
" last:1 -> return the last revision\n"
13043
" last:3 -> return the revision 2 before the end.\n"
13044
msgstr ""
13045
13046
#: en/help_topics/rules.txt:1
13047
msgid ""
13048
"Rules\n"
13049
"====="
13050
msgstr ""
13051
13052
#: en/help_topics/rules.txt:7
13053
msgid ""
13054
"Rules are defined in ini file format where the sections are file glob\n"
13055
"patterns and the contents of each section are the preferences for files\n"
13056
"matching that pattern(s). For example::"
13057
msgstr ""
13058
13059
#: en/help_topics/rules.txt:11
13060
msgid ""
13061
" [name *.bat]\n"
13062
" eol = native"
13063
msgstr ""
13064
13065
#: en/help_topics/rules.txt:14
13066
msgid ""
13067
" [name *.html *.xml]\n"
13068
" keywords = xml_escape"
13069
msgstr ""
13070
13071
#: en/help_topics/rules.txt:17
13072
msgid ""
13073
"Preferences like these are useful for commands and plugins wishing to\n"
13074
"provide custom behaviour for selected files. For more information on \n"
13075
"end of line conversion see :doc:`eol-help`.\n"
13076
"Keyword support is provided by the `keywords plugin\n"
13077
"<http://doc.bazaar.canonical.com/plugins/en/keywords-plugin.html>`_."
13078
msgstr ""
13079
13080
#: en/help_topics/rules.txt:23
13081
msgid ""
13082
"Files\n"
13083
"-----"
13084
msgstr ""
13085
13086
#: en/help_topics/rules.txt:26
13087
msgid ""
13088
"Default rules for all branches are defined in the optional file\n"
13089
"``BZR_HOME/rules``. "
13090
msgstr ""
13091
13092
#: en/help_topics/rules.txt:29
13093
msgid ""
13094
"Rule Patterns\n"
13095
"-------------"
13096
msgstr ""
13097
13098
#: en/help_topics/rules.txt:32
13099
msgid ""
13100
"Patterns are ordered and searching stops as soon as one matches.\n"
13101
"As a consequence, more explicit patterns should be placed towards\n"
13102
"the top of the file. Rule patterns use exactly the same conventions\n"
13103
"as ignore patterns. See :doc:`patterns-help` for details."
13104
msgstr ""
13105
13106
#: en/help_topics/rules.txt:37
13107
msgid ".. note::"
13108
msgstr ""
13109
13110
#: en/help_topics/rules.txt:39
13111
msgid ""
13112
" Patterns containing square brackets or spaces should be\n"
13113
" surrounded in quotes to ensure they are correctly parsed.\n"
13114
msgstr ""
13115
13116
#: en/help_topics/topics.txt:1
13117
msgid ""
13118
"authentication Information on configuring authentication\n"
13119
"basic Basic commands\n"
13120
"branches Information on what a branch is\n"
13121
"bugs Bug tracker settings\n"
13122
"checkouts Information on what a checkout is\n"
13123
"commands Basic help for all commands\n"
13124
"configuration Details on the configuration settings available\n"
13125
"conflict-types Types of conflicts and what to do about them\n"
13126
"content-filters Conversion of content into/from working trees\n"
13127
"criss-cross Information on criss-cross merging\n"
13128
"current-formats Current storage formats\n"
13129
"debug-flags Options to show or record debug information\n"
13130
"diverged-branches How to fix diverged branches\n"
13131
"env-variables Environment variable names and values\n"
13132
"eol Information on end-of-line handling\n"
13133
"files Information on configuration and log files\n"
13134
"formats Information on choosing a storage format\n"
13135
"global-options Options that control how Bazaar runs\n"
13136
"hidden-commands All hidden commands\n"
13137
"hooks Points at which custom processing can be added\n"
13138
"launchpad Using Bazaar with Launchpad.net\n"
13139
"location-alias Aliases for remembered locations\n"
13140
"log-formats Details on the logging formats available\n"
13141
"other-formats Experimental and deprecated storage formats\n"
13142
"patterns Information on the pattern syntax\n"
13143
"repositories Basic information on shared repositories.\n"
13144
"revisionspec Explain how to use --revision\n"
13145
"rules Information on defining rule-based preferences\n"
13146
"standalone-trees Information on what a standalone tree is\n"
13147
"standard-options Options that can be used with any command\n"
13148
"status-flags Help on status flags\n"
13149
"sync-for-reconfigure Steps to resolve \"out-of-sync\" when reconfiguring\n"
13150
"topics Topics list\n"
13151
"url-special-chars Special character handling in URLs\n"
13152
"urlspec Supported transport protocols\n"
13153
"working-trees Information on working trees\n"
13154
msgstr ""
13155
13156
#: en/help_topics/url-special-chars.txt:1
13157
msgid ""
13158
"Special character handling in URLs\n"
13159
"=================================="
13160
msgstr ""
13161
13162
#: en/help_topics/url-special-chars.txt:4
13163
msgid "Bazaar allows locations to be specified in multiple ways, either:"
13164
msgstr ""
13165
13166
#: en/help_topics/url-special-chars.txt:6
13167
msgid " * Fully qualified URLs"
13168
msgstr ""
13169
13170
#: en/help_topics/url-special-chars.txt:8
13171
msgid " * File system paths, relative or absolute"
13172
msgstr ""
13173
13174
#: en/help_topics/url-special-chars.txt:10
13175
msgid ""
13176
"Internally bzr treats all locations as URLs. For any file system paths\n"
13177
"that are specified it will automatically determine the appropriate URL\n"
13178
"representation, and escape special characters where necessary."
13179
msgstr ""
13180
13181
#: en/help_topics/url-special-chars.txt:14
13182
msgid ""
13183
"There are a few characters which have special meaning in URLs and need "
13184
"careful\n"
13185
"handling to avoid ambiguities. Characters can be escaped with a % and a hex\n"
13186
"value in URLs. Any non-ASCII characters in a file path will automatically "
13187
"be\n"
13188
"urlencoded when the path is converted to a URL."
13189
msgstr ""
13190
13191
#: en/help_topics/url-special-chars.txt:19
13192
msgid ""
13193
"URLs represent non-ASCII characters in an encoding defined by the server, "
13194
"but\n"
13195
"usually UTF-8. The % escapes should be of the UTF-8 bytes. Bazaar tries to "
13196
"be\n"
13197
"generous in what it accepts as a URL and to print them in a way that\n"
13198
"will be readable."
13199
msgstr ""
13200
13201
#: en/help_topics/url-special-chars.txt:24
13202
msgid ""
13203
"For example, if you have a directory named '/tmp/%2False' these are all "
13204
"valid\n"
13205
"ways of accessing the content (0x2F, or 47, is the ASCII code for forward "
13206
"slash)::"
13207
msgstr ""
13208
13209
#: en/help_topics/url-special-chars.txt:27
13210
msgid ""
13211
" cd /tmp\n"
13212
" bzr log /tmp/%2False\n"
13213
" bzr log %2False\n"
13214
" bzr log file:///tmp/%252False\n"
13215
" bzr log file://localhost/tmp/%252False\n"
13216
" bzr log file:%252False"
13217
msgstr ""
13218
13219
#: en/help_topics/url-special-chars.txt:34
13220
msgid "These are valid but do not refer to the same file::"
13221
msgstr ""
13222
13223
#: en/help_topics/url-special-chars.txt:36
13224
msgid ""
13225
" bzr log file:///tmp/%2False (refers to a file called /tmp/\\/alse)\n"
13226
" bzr log %252False (refers to a file called /tmp/%252False)"
13227
msgstr ""
13228
13229
#: en/help_topics/url-special-chars.txt:39
13230
msgid ""
13231
"Comma also has special meaning in URLs, because it denotes `segment "
13232
"parameters`_"
13233
msgstr ""
13234
13235
#: en/help_topics/url-special-chars.txt:41
13236
msgid ""
13237
"_`segment parameters`: http://www.ietf.org/rfc/rfc3986.txt (section 3.3)"
13238
msgstr ""
13239
13240
#: en/help_topics/url-special-chars.txt:43
13241
msgid ""
13242
"Comma is also special in any file system paths that are specified. To use a "
13243
"literal\n"
13244
"comma in a file system path, specify a URL and URL encode the comma::"
13245
msgstr ""
13246
13247
#: en/help_topics/url-special-chars.txt:46
13248
msgid ""
13249
" bzr log foo,branch=bla # path \"foo\" with the segment parameter "
13250
"\"branch\" set to \"bla\"\n"
13251
" bzr log file:foo%2Cbranch=bla # path \"foo,branch=bla\"\n"
13252
" bzr log file:foo,branch=bla # path \"foo\" with segment parameter "
13253
"\"branch\" set to \"bla\"\n"
13254
msgstr ""
13255
13256
#: en/help_topics/urlspec.txt:1
13257
msgid "URL Identifiers"
13258
msgstr ""
13259
13260
#: en/help_topics/urlspec.txt:3
13261
msgid "Supported URL prefixes::"
13262
msgstr ""
13263
13264
#: en/help_topics/urlspec.txt:5
13265
msgid ""
13266
" aftp:// Access using active FTP.\n"
13267
" bzr:// Fast access using the Bazaar smart server.\n"
13268
" bzr+ssh:// Fast access using the Bazaar smart server over SSH.\n"
13269
" file:// Access using the standard filesystem (default)\n"
13270
" ftp:// Access using passive FTP.\n"
13271
" http:// Read-only access of branches exported on the web.\n"
13272
" https:// Read-only access of branches exported on the web using "
13273
"SSL.\n"
13274
" sftp:// Access using SFTP (most SSH servers provide SFTP)."
13275
msgstr ""
13276
13277
#: en/help_topics/urlspec.txt:14
13278
msgid "Supported modifiers::"
13279
msgstr ""
13280
13281
#: en/help_topics/urlspec.txt:16
13282
msgid " gio+ Access using any GIO supported protocols."
13283
msgstr ""
13284
13285
#: en/help_topics/urlspec.txt:18
13286
msgid "Bazaar supports all of the standard parts within the URL::"
13287
msgstr ""
13288
13289
#: en/help_topics/urlspec.txt:20
13290
msgid " <protocol>://[user[:password]@]host[:port]/[path]"
13291
msgstr ""
13292
13293
#: en/help_topics/urlspec.txt:22
13294
msgid "allowing URLs such as::"
13295
msgstr ""
13296
13297
#: en/help_topics/urlspec.txt:24
13298
msgid " http://bzruser:BadPass@bzr.example.com:8080/bzr/trunk"
13299
msgstr ""
13300
13301
#: en/help_topics/urlspec.txt:26
13302
msgid ""
13303
"For bzr+ssh:// and sftp:// URLs, Bazaar also supports paths that begin\n"
13304
"with '~' as meaning that the rest of the path should be interpreted\n"
13305
"relative to the remote user's home directory. For example if the user\n"
13306
"``remote`` has a home directory of ``/home/remote`` on the server\n"
13307
"shell.example.com, then::"
13308
msgstr ""
13309
13310
#: en/help_topics/urlspec.txt:32
13311
msgid " bzr+ssh://remote@shell.example.com/~/myproject/trunk"
13312
msgstr ""
13313
13314
#: en/help_topics/urlspec.txt:34
13315
msgid "would refer to ``/home/remote/myproject/trunk``."
13316
msgstr ""
13317
13318
#: en/help_topics/urlspec.txt:36
13319
msgid ""
13320
"Many commands that accept URLs also accept location aliases too.\n"
13321
"See :doc:`location-alias-help` and :doc:`url-special-chars-help`.\n"
13322
msgstr ""
Loggerhead is a web-based interface for Breezy
Version: 2.0.1