« back to all changes in this revision
Viewing changes to po/ast.po
- browse files at revision 6093.4.72
- compare with another revision
- compare with revision 6093.4.72
- download diff
- download tarball
- view history from revision 6093.4.72
- Committer: Jelmer Vernooij
- Date: 2012-02-20 12:19:29 UTC
- mfrom: (6437.23.11 2.5)
- mto: (6581.1.1 trunk)
- mto: This revision was merged to the branch mainline in revision 6582.
- Revision ID: jelmer@samba.org-20120220121929-7ni2psvjoatm1yp4
Merge bzr/2.5.
- files added:
- bzrlib/estimate_compressed_size.py
- bzrlib/plugins/po_merge
- bzrlib/plugins/po_merge/tests
- files removed:
- bzrlib/help_topics/en/location-alias.txt
- bzrlib/util/effbot
- bzrlib/util/effbot/org
- bzrlib/util/elementtree
- files renamed:
- tools/build_mo.py => bzrlib/bzr_distutils.py
- bzrlib/tests/per_repository/test_merge_directive.py => bzrlib/tests/per_repository_vf/test_merge_directive.py
- files modified:
- Makefile
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-02-02 17:39+0100\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-02-04 04:47+0000\n"
19
"X-Generator: Launchpad (build 14738)\n"
20
21
#: bzrlib/add.py:95
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:872
26
msgid "Unstacking"
27
msgstr ""
28
29
#: bzrlib/branch.py:3205
30
#, python-format
31
msgid "Pushed up to revision %d."
32
msgstr ""
33
34
#: bzrlib/branch.py:3207
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:3210
42
msgid "No new revisions or tags to push."
43
msgstr ""
44
45
#: bzrlib/branch.py:3212
46
msgid "No new revisions to push."
47
msgstr ""
48
49
#: bzrlib/branch.py:3232
50
msgid "checked branch {0} format {1}"
51
msgstr ""
52
53
#: bzrlib/branch.py:3235
54
#, python-format
55
msgid "found error:%s"
56
msgstr "error alcontráu: %s"
57
58
#: bzrlib/builtins.py:209 bzrlib/builtins.py:3016 bzrlib/workingtree.py:315
59
#, python-format
60
msgid "Ignoring files outside view. View is %s"
61
msgstr ""
62
63
#: bzrlib/builtins.py:218
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:303
69
msgid "Display status summary."
70
msgstr "Amosar resume d'estáu."
71
72
#: bzrlib/builtins.py:305
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:308
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:311
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:315
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:320
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:323
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:326
127
msgid ""
128
"unknown\n"
129
" Not versioned and not matching an ignore pattern."
130
msgstr ""
131
132
#: bzrlib/builtins.py:329
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:334
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:337
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:341
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:346
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:351
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:354
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:363
183
msgid "Use short status indicators."
184
msgstr ""
185
186
#: bzrlib/builtins.py:365
187
msgid "Only show versioned files."
188
msgstr ""
189
190
#: bzrlib/builtins.py:367
191
msgid "Don't show pending merges."
192
msgstr ""
193
194
#: bzrlib/builtins.py:370
195
msgid "Do not mark object type using indicator."
196
msgstr ""
197
198
#: bzrlib/builtins.py:385
199
msgid "bzr status --revision takes exactly one or two revision specifiers"
200
msgstr ""
201
202
#: bzrlib/builtins.py:429 bzrlib/builtins.py:5183
203
msgid "You can only supply one of revision_id or --revision"
204
msgstr ""
205
206
#: bzrlib/builtins.py:432 bzrlib/builtins.py:5185
207
msgid "You must supply either --revision or a revision_id"
208
msgstr ""
209
210
#: bzrlib/builtins.py:439
211
#, python-format
212
msgid "Repository %r does not support access to raw revision texts"
213
msgstr ""
214
215
#: bzrlib/builtins.py:450
216
msgid "The repository {0} contains no revision {1}."
217
msgstr ""
218
219
#: bzrlib/builtins.py:457
220
msgid "You cannot specify a NULL revision."
221
msgstr ""
222
223
#: bzrlib/builtins.py:549
224
msgid "Remove the working tree from a given branch/checkout."
225
msgstr ""
226
227
#: bzrlib/builtins.py:551
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:554
234
msgid "To re-create the working tree, use \"bzr checkout\"."
235
msgstr ""
236
237
#: bzrlib/builtins.py:560
238
msgid ""
239
"Remove the working tree even if it has uncommitted or shelved changes."
240
msgstr ""
241
242
#: bzrlib/builtins.py:574
243
msgid "No working tree to remove"
244
msgstr ""
245
246
#: bzrlib/builtins.py:576
247
msgid "You cannot remove the working tree of a remote path"
248
msgstr ""
249
250
#: bzrlib/builtins.py:585
251
msgid "You cannot remove the working tree from a lightweight checkout"
252
msgstr ""
253
254
#: bzrlib/builtins.py:625
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:636
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:640
267
msgid "failed to reset the tree state{0}"
268
msgstr ""
269
270
#: bzrlib/builtins.py:644
271
msgid "Show current revision number."
272
msgstr ""
273
274
#: bzrlib/builtins.py:646
275
msgid "This is equal to the number of revisions on this branch."
276
msgstr ""
277
278
#: bzrlib/builtins.py:659
279
msgid "--tree and --revision can not be used together"
280
msgstr ""
281
282
#: bzrlib/builtins.py:676 bzrlib/builtins.py:5967
283
msgid "Tags can only be placed on a single revision, not on a range"
284
msgstr ""
285
286
#: bzrlib/builtins.py:700
287
msgid "Show revno of working tree."
288
msgstr ""
289
290
#: bzrlib/builtins.py:748
291
msgid "Add specified files or directories."
292
msgstr ""
293
294
#: bzrlib/builtins.py:750
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:754
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:762
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:765
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:768
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:773
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:776
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:784
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:787
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:794
363
msgid "Don't recursively add the contents of directories."
364
msgstr ""
365
366
#: bzrlib/builtins.py:800
367
msgid "Lookup file ids from this tree."
368
msgstr ""
369
370
#: bzrlib/builtins.py:836
371
msgid "ignored {0} matching \"{1}\"\n"
372
msgstr ""
373
374
#: bzrlib/builtins.py:841
375
msgid "Create a new versioned directory."
376
msgstr ""
377
378
#: bzrlib/builtins.py:843
379
msgid "This is equivalent to creating the directory and then adding it."
380
msgstr ""
381
382
#: bzrlib/builtins.py:850
383
msgid "No error if existing, make parent directories as needed."
384
msgstr ""
385
386
#: bzrlib/builtins.py:884
387
#, python-format
388
msgid "added %s\n"
389
msgstr ""
390
391
#: bzrlib/builtins.py:926
392
#, python-format
393
msgid "invalid kind %r specified"
394
msgstr ""
395
396
#: bzrlib/builtins.py:963
397
msgid "Move or rename a file."
398
msgstr ""
399
400
#: bzrlib/builtins.py:965
401
msgid " bzr mv SOURCE... DESTINATION"
402
msgstr ""
403
404
#: bzrlib/builtins.py:967
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:971
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:977
421
msgid "Files cannot be moved between branches."
422
msgstr ""
423
424
#: bzrlib/builtins.py:984
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:986
431
msgid "Automatically guess renames."
432
msgstr ""
433
434
#: bzrlib/builtins.py:987
435
msgid "Avoid making changes when guessing renames."
436
msgstr ""
437
438
#: bzrlib/builtins.py:996
439
msgid "--dry-run requires --auto."
440
msgstr ""
441
442
#: bzrlib/builtins.py:1000
443
msgid "missing file argument"
444
msgstr ""
445
446
#: bzrlib/builtins.py:1004
447
msgid "can not move root of branch"
448
msgstr ""
449
450
#: bzrlib/builtins.py:1010
451
msgid "Only one path may be specified to --auto."
452
msgstr ""
453
454
#: bzrlib/builtins.py:1013
455
msgid "--after cannot be specified with --auto."
456
msgstr ""
457
458
#: bzrlib/builtins.py:1050
459
msgid "to mv multiple files the destination must be a versioned directory"
460
msgstr ""
461
462
#: bzrlib/builtins.py:1102
463
msgid "Turn this branch into a mirror of another branch."
464
msgstr ""
465
466
#: bzrlib/builtins.py:1104
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:1109
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:1113
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:1117
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:1122
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:1126
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:1134
511
msgid "Show logs of pulled revisions."
512
msgstr ""
513
514
#: bzrlib/builtins.py:1136
515
msgid ""
516
"Branch to pull into, rather than the one containing the working directory."
517
msgstr ""
518
519
#: bzrlib/builtins.py:1139
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:1168
526
msgid "Need working tree for --show-base."
527
msgstr ""
528
529
#: bzrlib/builtins.py:1184
530
msgid "No pull location known or specified."
531
msgstr ""
532
533
#: bzrlib/builtins.py:1190
534
#, python-format
535
msgid "Using saved parent location: %s\n"
536
msgstr ""
537
538
#: bzrlib/builtins.py:1197 bzrlib/builtins.py:4393
539
msgid "Cannot use -r with merge directives or bundles"
540
msgstr ""
541
542
#: bzrlib/builtins.py:1238
543
msgid "Update a mirror of this branch."
544
msgstr ""
545
546
#: bzrlib/builtins.py:1240
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:1243
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:1246
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:1250
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:1253
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:1257
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:1262
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:1273 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:1276
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:1281
605
msgid ""
606
"Create a stacked branch that references the public location of the parent "
607
"branch."
608
msgstr ""
609
610
#: bzrlib/builtins.py:1284
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:1289 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:1292
624
msgid "Don't populate the working tree, even for protocols that support it."
625
msgstr ""
626
627
#: bzrlib/builtins.py:1336
628
msgid "Could not determine branch to refer to."
629
msgstr ""
630
631
#: bzrlib/builtins.py:1345
632
#, python-format
633
msgid ""
634
"No push location known or specified. To push to the parent branch (at %s), "
635
"use 'bzr push :parent'."
636
msgstr ""
637
638
#: bzrlib/builtins.py:1351 bzrlib/foreign.py:306
639
msgid "No push location known or specified."
640
msgstr ""
641
642
#: bzrlib/builtins.py:1355
643
#, python-format
644
msgid "Using saved push location: %s"
645
msgstr ""
646
647
#: bzrlib/builtins.py:1365
648
msgid "Create a new branch that is a copy of an existing branch."
649
msgstr ""
650
651
#: bzrlib/builtins.py:1367
652
msgid ""
653
"If the TO_LOCATION is omitted, the last component of the FROM_LOCATION will\n"
654
"be used. In other words, \"branch ../foo/bar\" will attempt to create "
655
"./bar.\n"
656
"If the FROM_LOCATION has no / or path separator embedded, the TO_LOCATION\n"
657
"is derived from the FROM_LOCATION by stripping a leading scheme or drive\n"
658
"identifier, if any. For example, \"branch lp:foo-bar\" will attempt to\n"
659
"create ./foo-bar."
660
msgstr ""
661
662
#: bzrlib/builtins.py:1374
663
msgid ""
664
"To retrieve the branch as of a particular revision, supply the --revision\n"
665
"parameter, as in \"branch foo/bar -r 5\"."
666
msgstr ""
667
668
#: bzrlib/builtins.py:1377
669
msgid "The synonyms 'clone' and 'get' for this command are deprecated."
670
msgstr ""
671
672
#: bzrlib/builtins.py:1387
673
msgid "Create a branch without a working-tree."
674
msgstr ""
675
676
#: bzrlib/builtins.py:1389
677
msgid "Switch the checkout in the current directory to the new branch."
678
msgstr ""
679
680
#: bzrlib/builtins.py:1392
681
msgid ""
682
"Create a stacked branch referring to the source branch. The new branch will "
683
"depend on the availability of the source branch for all operations."
684
msgstr ""
685
686
#: bzrlib/builtins.py:1396
687
msgid "Do not use a shared repository, even if available."
688
msgstr ""
689
690
#: bzrlib/builtins.py:1398
691
msgid ""
692
"By default branch will fail if the target directory exists, but does not "
693
"already have a control directory. This flag will allow branch to proceed."
694
msgstr ""
695
696
#: bzrlib/builtins.py:1403
697
msgid "Bind new branch to from location."
698
msgstr ""
699
700
#: bzrlib/builtins.py:1450
701
#, python-format
702
msgid "Target directory \"%s\" already exists."
703
msgstr ""
704
705
#: bzrlib/builtins.py:1462
706
#, python-format
707
msgid "Parent of \"%s\" does not exist."
708
msgstr ""
709
710
#: bzrlib/builtins.py:1481
711
msgid "The branch {0} has no revision {1}."
712
msgstr ""
713
714
#: bzrlib/builtins.py:1496 bzrlib/push.py:53
715
#, python-format
716
msgid "Created new stacked branch referring to %s."
717
msgstr ""
718
719
#: bzrlib/builtins.py:1500
720
#, python-format
721
msgid "Branched %d revision."
722
msgid_plural "Branched %d revisions."
723
msgstr[0] ""
724
msgstr[1] ""
725
726
#: bzrlib/builtins.py:1505
727
#, python-format
728
msgid "New branch bound to %s"
729
msgstr ""
730
731
#: bzrlib/builtins.py:1510 bzrlib/builtins.py:6256
732
#, python-format
733
msgid "Switched to branch: %s"
734
msgstr ""
735
736
#: bzrlib/builtins.py:1515
737
msgid "List the branches available at the current location."
738
msgstr ""
739
740
#: bzrlib/builtins.py:1517
741
msgid ""
742
"This command will print the names of all the branches at the current\n"
743
"location."
744
msgstr ""
745
746
#: bzrlib/builtins.py:1524
747
msgid ""
748
"Recursively scan for branches rather than just looking in the specified "
749
"location."
750
msgstr ""
751
752
#: bzrlib/builtins.py:1554
753
msgid "(default)"
754
msgstr ""
755
756
#: bzrlib/builtins.py:1566
757
msgid "Create a new checkout of an existing branch."
758
msgstr ""
759
760
#: bzrlib/builtins.py:1568
761
msgid ""
762
"If BRANCH_LOCATION is omitted, checkout will reconstitute a working tree "
763
"for\n"
764
"the branch found in '.'. This is useful if you have removed the working "
765
"tree\n"
766
"or if it was never created - i.e. if you pushed the branch to its current\n"
767
"location using SFTP."
768
msgstr ""
769
770
#: bzrlib/builtins.py:1573
771
msgid ""
772
"If the TO_LOCATION is omitted, the last component of the BRANCH_LOCATION "
773
"will\n"
774
"be used. In other words, \"checkout ../foo/bar\" will attempt to create "
775
"./bar.\n"
776
"If the BRANCH_LOCATION has no / or path separator embedded, the TO_LOCATION\n"
777
"is derived from the BRANCH_LOCATION by stripping a leading scheme or drive\n"
778
"identifier, if any. For example, \"checkout lp:foo-bar\" will attempt to\n"
779
"create ./foo-bar."
780
msgstr ""
781
782
#: bzrlib/builtins.py:1580
783
msgid ""
784
"To retrieve the branch as of a particular revision, supply the --revision\n"
785
"parameter, as in \"checkout foo/bar -r 5\". Note that this will be "
786
"immediately\n"
787
"out of date [so you cannot commit] but it may be useful (i.e. to examine "
788
"old\n"
789
"code.)"
790
msgstr ""
791
792
#: bzrlib/builtins.py:1590
793
msgid ""
794
"Perform a lightweight checkout. Lightweight checkouts depend on access to "
795
"the branch for every operation. Normal checkouts can perform common "
796
"operations like diff and status without such access, and also support local "
797
"commits."
798
msgstr ""
799
800
#: bzrlib/builtins.py:1597
801
msgid "Get file contents from this tree."
802
msgstr ""
803
804
#: bzrlib/builtins.py:1599
805
msgid "Hard-link working tree files where possible."
806
msgstr ""
807
808
#: bzrlib/builtins.py:1640
809
msgid ""
810
"Show list of renamed files.\n"
811
" "
812
msgstr ""
813
814
#: bzrlib/builtins.py:1670
815
msgid "Update a working tree to a new revision."
816
msgstr ""
817
818
#: bzrlib/builtins.py:1672
819
msgid ""
820
"This will perform a merge of the destination revision (the tip of the\n"
821
"branch, or the specified revision) into the working tree, and then make\n"
822
"that revision the basis revision for the working tree. "
823
msgstr ""
824
825
#: bzrlib/builtins.py:1676
826
msgid ""
827
"You can use this to visit an older revision, or to update a working tree\n"
828
"that is out of date from its branch."
829
msgstr ""
830
831
#: bzrlib/builtins.py:1679
832
msgid ""
833
"If there are any uncommitted changes in the tree, they will be carried\n"
834
"across and remain as uncommitted changes after the update. To discard\n"
835
"these changes, use 'bzr revert'. The uncommitted changes may conflict\n"
836
"with the changes brought in by the change in basis revision."
837
msgstr ""
838
839
#: bzrlib/builtins.py:1684
840
msgid ""
841
"If the tree's branch is bound to a master branch, bzr will also update\n"
842
"the branch from the master."
843
msgstr ""
844
845
#: bzrlib/builtins.py:1687
846
msgid ""
847
"You cannot update just a single file or directory, because each Bazaar\n"
848
"working tree has just a single basis revision. If you want to restore a\n"
849
"file that has been removed locally, use 'bzr revert' instead of 'bzr\n"
850
"update'. If you want to restore a file to its state in a previous\n"
851
"revision, use 'bzr revert' with a '-r' option, or use 'bzr cat' to write\n"
852
"out the old content of that file to a new location."
853
msgstr ""
854
855
#: bzrlib/builtins.py:1694
856
msgid ""
857
"The 'dir' argument, if given, must be the location of the root of a\n"
858
"working tree to update. By default, the working tree that contains the \n"
859
"current working directory is used."
860
msgstr ""
861
862
#: bzrlib/builtins.py:1710
863
msgid "bzr update --revision takes exactly one revision"
864
msgstr ""
865
866
#: bzrlib/builtins.py:1718
867
msgid "bzr update can only update a whole tree, not a file or subdirectory"
868
msgstr ""
869
870
#: bzrlib/builtins.py:1749
871
msgid "Tree is up to date at revision {0} of branch {1}"
872
msgstr ""
873
874
#: bzrlib/builtins.py:1765
875
#, python-format
876
msgid ""
877
"branch has no revision %s\n"
878
"bzr update --revision only works for a revision in the branch history"
879
msgstr ""
880
881
#: bzrlib/builtins.py:1771
882
msgid "Updated to revision {0} of branch {1}"
883
msgstr ""
884
885
#: bzrlib/builtins.py:1775
886
msgid ""
887
"Your local commits will now show as pending merges with 'bzr status', and "
888
"can be committed with 'bzr commit'."
889
msgstr ""
890
891
#: bzrlib/builtins.py:1784
892
msgid "Show information about a working tree, branch or repository."
893
msgstr ""
894
895
#: bzrlib/builtins.py:1786
896
msgid ""
897
"This command will show all known locations and formats associated to the\n"
898
"tree, branch or repository."
899
msgstr ""
900
901
#: bzrlib/builtins.py:1789
902
msgid ""
903
"In verbose mode, statistical information is included with each report.\n"
904
"To see extended statistic information, use a verbosity level of 2 or\n"
905
"higher by specifying the verbose option multiple times, e.g. -vv."
906
msgstr ""
907
908
#: bzrlib/builtins.py:1793
909
msgid "Branches and working trees will also report any missing revisions."
910
msgstr ""
911
912
#: bzrlib/builtins.py:1795 bzrlib/builtins.py:3715 bzrlib/builtins.py:4845
913
#: bzrlib/builtins.py:6442
914
msgid ":Examples:"
915
msgstr ""
916
917
#: bzrlib/builtins.py:1797
918
msgid " Display information on the format and related locations:"
919
msgstr ""
920
921
#: bzrlib/builtins.py:1799
922
msgid " bzr info"
923
msgstr ""
924
925
#: bzrlib/builtins.py:1801
926
msgid ""
927
" Display the above together with extended format information and\n"
928
" basic statistics (like the number of files in the working tree and\n"
929
" number of revisions in the branch and repository):"
930
msgstr ""
931
932
#: bzrlib/builtins.py:1805
933
msgid " bzr info -v"
934
msgstr ""
935
936
#: bzrlib/builtins.py:1807
937
msgid " Display the above together with number of committers to the branch:"
938
msgstr ""
939
940
#: bzrlib/builtins.py:1809
941
msgid " bzr info -vv"
942
msgstr ""
943
944
#: bzrlib/builtins.py:1828
945
msgid "Remove files or directories."
946
msgstr ""
947
948
#: bzrlib/builtins.py:1830
949
msgid ""
950
"This makes Bazaar stop tracking changes to the specified files. Bazaar will\n"
951
"delete them if they can easily be recovered using revert otherwise they\n"
952
"will be backed up (adding an extention of the form .~#~). If no options or\n"
953
"parameters are given Bazaar will scan for files that are being tracked by\n"
954
"Bazaar but missing in your tree and stop tracking them for you."
955
msgstr ""
956
957
#: bzrlib/builtins.py:1838
958
msgid "Only remove files that have never been committed."
959
msgstr ""
960
961
#: bzrlib/builtins.py:1840
962
msgid "The file deletion mode to be used."
963
msgstr ""
964
965
#: bzrlib/builtins.py:1841
966
msgid "Deletion Strategy"
967
msgstr ""
968
969
#: bzrlib/builtins.py:1842
970
msgid "Backup changed files (default)."
971
msgstr ""
972
973
#: bzrlib/builtins.py:1843
974
msgid "Delete from bzr but leave the working copy."
975
msgstr ""
976
977
#: bzrlib/builtins.py:1844
978
msgid "Don't backup changed files."
979
msgstr ""
980
981
#: bzrlib/builtins.py:1845
982
msgid ""
983
"Delete all the specified files, even if they can not be recovered and even "
984
"if they are non-empty directories. (deprecated, use no-backup)"
985
msgstr ""
986
987
#: bzrlib/builtins.py:1854
988
msgid "(The --force option is deprecated, rather use --no-backup in future.)"
989
msgstr ""
990
991
#: bzrlib/builtins.py:1871
992
msgid "No matching files."
993
msgstr ""
994
995
#: bzrlib/builtins.py:1932
996
msgid "Reconcile bzr metadata in a branch."
997
msgstr ""
998
999
#: bzrlib/builtins.py:1934
1000
msgid ""
1001
"This can correct data mismatches that may have been caused by\n"
1002
"previous ghost operations or bzr upgrades. You should only\n"
1003
"need to run this command if 'bzr check' or a bzr developer\n"
1004
"advises you to run it."
1005
msgstr ""
1006
1007
#: bzrlib/builtins.py:1939
1008
msgid ""
1009
"If a second branch is provided, cross-branch reconciliation is\n"
1010
"also attempted, which will check that data like the tree root\n"
1011
"id which was not present in very early bzr versions is represented\n"
1012
"correctly in both branches."
1013
msgstr ""
1014
1015
#: bzrlib/builtins.py:1944
1016
msgid ""
1017
"At the same time it is run it may recompress data resulting in\n"
1018
"a potential saving in disk space or performance gain."
1019
msgstr ""
1020
1021
#: bzrlib/builtins.py:1947
1022
msgid "The branch *MUST* be on a listable system such as local disk or sftp."
1023
msgstr ""
1024
1025
#: bzrlib/builtins.py:2014 bzrlib/builtins.py:2132 bzrlib/builtins.py:3750
1026
msgid ""
1027
"Format for the bzr 2.0 series.\n"
1028
"Uses group-compress storage.\n"
1029
"Provides rich roots which are a one-way transition.\n"
1030
msgstr ""
1031
1032
#: bzrlib/builtins.py:2014 bzrlib/builtins.py:2132 bzrlib/builtins.py:3750
1033
msgid ""
1034
"Pack-based format used in 1.x series. Introduced in 0.92. Interoperates with "
1035
"bzr repositories before 0.92 but cannot be read by bzr < 0.92. "
1036
msgstr ""
1037
1038
#: bzrlib/builtins.py:2014 bzrlib/builtins.py:2132 bzrlib/builtins.py:3750
1039
msgid "The 2a format with experimental support for colocated branches.\n"
1040
msgstr ""
1041
1042
#: bzrlib/builtins.py:2015
1043
msgid "Make a directory into a versioned branch."
1044
msgstr ""
1045
1046
#: bzrlib/builtins.py:2017
1047
msgid ""
1048
"Use this to create an empty branch, or before importing an\n"
1049
"existing project."
1050
msgstr ""
1051
1052
#: bzrlib/builtins.py:2020
1053
msgid ""
1054
"If there is a repository in a parent directory of the location, then\n"
1055
"the history of the branch will be stored in the repository. Otherwise\n"
1056
"init creates a standalone branch which carries its own history\n"
1057
"in the .bzr directory."
1058
msgstr ""
1059
1060
#: bzrlib/builtins.py:2025
1061
msgid ""
1062
"If there is already a branch at the location but it has no working tree,\n"
1063
"the tree can be populated with 'bzr checkout'."
1064
msgstr ""
1065
1066
#: bzrlib/builtins.py:2028
1067
msgid "Recipe for importing a tree of files::"
1068
msgstr ""
1069
1070
#: bzrlib/builtins.py:2030
1071
msgid ""
1072
" cd ~/project\n"
1073
" bzr init\n"
1074
" bzr add .\n"
1075
" bzr status\n"
1076
" bzr commit -m \"imported project\""
1077
msgstr ""
1078
1079
#: bzrlib/builtins.py:2041
1080
msgid ""
1081
"Create the path leading up to the branch if it does not already exist."
1082
msgstr ""
1083
1084
#: bzrlib/builtins.py:2044
1085
msgid "Specify a format for this branch. See \"help formats\"."
1086
msgstr ""
1087
1088
#: bzrlib/builtins.py:2052
1089
msgid ""
1090
"Never change revnos or the existing log. Append revisions to it only."
1091
msgstr ""
1092
1093
#: bzrlib/builtins.py:2055
1094
msgid "Create a branch without a working tree."
1095
msgstr ""
1096
1097
#: bzrlib/builtins.py:2075 bzrlib/push.py:110
1098
#, python-format
1099
msgid ""
1100
"Parent directory of %s does not exist.\n"
1101
"You may supply --create-prefix to create all leading parent directories."
1102
msgstr ""
1103
1104
#: bzrlib/builtins.py:2109
1105
msgid ""
1106
"This branch format cannot be set to append-revisions-only. Try --default."
1107
msgstr ""
1108
1109
#: bzrlib/builtins.py:2120
1110
msgid "Created a {0} (format: {1})\n"
1111
msgstr ""
1112
1113
#: bzrlib/builtins.py:2129
1114
#, python-format
1115
msgid "Using shared repository: %s\n"
1116
msgstr ""
1117
1118
#: bzrlib/builtins.py:2133
1119
msgid "Create a shared repository for branches to share storage space."
1120
msgstr ""
1121
1122
#: bzrlib/builtins.py:2135
1123
msgid ""
1124
"New branches created under the repository directory will store their\n"
1125
"revisions in the repository, not in the branch directory. For branches\n"
1126
"with shared history, this reduces the amount of storage needed and \n"
1127
"speeds up the creation of new branches."
1128
msgstr ""
1129
1130
#: bzrlib/builtins.py:2140
1131
msgid ""
1132
"If the --no-trees option is given then the branches in the repository\n"
1133
"will not have working trees by default. They will still exist as \n"
1134
"directories on disk, but they will not have separate copies of the \n"
1135
"files at a certain revision. This can be useful for repositories that\n"
1136
"store branches which are interacted with through checkouts or remote\n"
1137
"branches, such as on a server."
1138
msgstr ""
1139
1140
#: bzrlib/builtins.py:2147
1141
msgid ""
1142
":Examples:\n"
1143
" Create a shared repository holding just branches::"
1144
msgstr ""
1145
1146
#: bzrlib/builtins.py:2150
1147
msgid ""
1148
" bzr init-repo --no-trees repo\n"
1149
" bzr init repo/trunk"
1150
msgstr ""
1151
1152
#: bzrlib/builtins.py:2153
1153
msgid " Make a lightweight checkout elsewhere::"
1154
msgstr ""
1155
1156
#: bzrlib/builtins.py:2155
1157
msgid ""
1158
" bzr checkout --lightweight repo/trunk trunk-checkout\n"
1159
" cd trunk-checkout\n"
1160
" (add files here)"
1161
msgstr ""
1162
1163
#: bzrlib/builtins.py:2163
1164
msgid ""
1165
"Specify a format for this repository. See \"bzr help formats\" for details."
1166
msgstr ""
1167
1168
#: bzrlib/builtins.py:2167
1169
msgid "Repository format"
1170
msgstr ""
1171
1172
#: bzrlib/builtins.py:2169
1173
msgid "Branches in the repository will default to not having a working tree."
1174
msgstr ""
1175
1176
#: bzrlib/builtins.py:2195
1177
msgid "Show differences in the working tree, between revisions or branches."
1178
msgstr ""
1179
1180
#: bzrlib/builtins.py:2197
1181
msgid ""
1182
"If no arguments are given, all changes for the current tree are listed.\n"
1183
"If files are given, only the changes in those files are listed.\n"
1184
"Remote and multiple branches can be compared by using the --old and\n"
1185
"--new options. If not provided, the default for both is derived from\n"
1186
"the first argument, if any, or the current tree if no arguments are\n"
1187
"given."
1188
msgstr ""
1189
1190
#: bzrlib/builtins.py:2204
1191
msgid ""
1192
"\"bzr diff -p1\" is equivalent to \"bzr diff --prefix old/:new/\", and\n"
1193
"produces patches suitable for \"patch -p1\"."
1194
msgstr ""
1195
1196
#: bzrlib/builtins.py:2207
1197
msgid ""
1198
"Note that when using the -r argument with a range of revisions, the\n"
1199
"differences are computed between the two specified revisions. That\n"
1200
"is, the command does not show the changes introduced by the first \n"
1201
"revision in the range. This differs from the interpretation of \n"
1202
"revision ranges used by \"bzr log\" which includes the first revision\n"
1203
"in the range."
1204
msgstr ""
1205
1206
#: bzrlib/builtins.py:2214
1207
msgid ""
1208
":Exit values:\n"
1209
" 1 - changed\n"
1210
" 2 - unrepresentable changes\n"
1211
" 3 - error\n"
1212
" 0 - no change"
1213
msgstr ""
1214
1215
#: bzrlib/builtins.py:2220
1216
msgid ""
1217
":Examples:\n"
1218
" Shows the difference in the working tree versus the last commit::"
1219
msgstr ""
1220
1221
#: bzrlib/builtins.py:2223
1222
msgid " bzr diff"
1223
msgstr ""
1224
1225
#: bzrlib/builtins.py:2225
1226
msgid " Difference between the working tree and revision 1::"
1227
msgstr ""
1228
1229
#: bzrlib/builtins.py:2227
1230
msgid " bzr diff -r1"
1231
msgstr ""
1232
1233
#: bzrlib/builtins.py:2229
1234
msgid " Difference between revision 3 and revision 1::"
1235
msgstr ""
1236
1237
#: bzrlib/builtins.py:2231
1238
msgid " bzr diff -r1..3"
1239
msgstr ""
1240
1241
#: bzrlib/builtins.py:2233
1242
msgid " Difference between revision 3 and revision 1 for branch xxx::"
1243
msgstr ""
1244
1245
#: bzrlib/builtins.py:2235
1246
msgid " bzr diff -r1..3 xxx"
1247
msgstr ""
1248
1249
#: bzrlib/builtins.py:2237
1250
msgid " The changes introduced by revision 2 (equivalent to -r1..2)::"
1251
msgstr ""
1252
1253
#: bzrlib/builtins.py:2239
1254
msgid " bzr diff -c2"
1255
msgstr ""
1256
1257
#: bzrlib/builtins.py:2241
1258
msgid ""
1259
" To see the changes introduced by revision X::\n"
1260
" \n"
1261
" bzr diff -cX"
1262
msgstr ""
1263
1264
#: bzrlib/builtins.py:2245
1265
msgid ""
1266
" Note that in the case of a merge, the -c option shows the changes\n"
1267
" compared to the left hand parent. To see the changes against\n"
1268
" another parent, use::"
1269
msgstr ""
1270
1271
#: bzrlib/builtins.py:2249
1272
msgid " bzr diff -r<chosen_parent>..X"
1273
msgstr ""
1274
1275
#: bzrlib/builtins.py:2251
1276
msgid ""
1277
" The changes between the current revision and the previous revision\n"
1278
" (equivalent to -c-1 and -r-2..-1)"
1279
msgstr ""
1280
1281
#: bzrlib/builtins.py:2254
1282
msgid " bzr diff -r-2.."
1283
msgstr ""
1284
1285
#: bzrlib/builtins.py:2256
1286
msgid " Show just the differences for file NEWS::"
1287
msgstr ""
1288
1289
#: bzrlib/builtins.py:2258
1290
msgid " bzr diff NEWS"
1291
msgstr ""
1292
1293
#: bzrlib/builtins.py:2260
1294
msgid " Show the differences in working tree xxx for file NEWS::"
1295
msgstr ""
1296
1297
#: bzrlib/builtins.py:2262
1298
msgid " bzr diff xxx/NEWS"
1299
msgstr ""
1300
1301
#: bzrlib/builtins.py:2264
1302
msgid " Show the differences from branch xxx to this working tree:"
1303
msgstr ""
1304
1305
#: bzrlib/builtins.py:2266
1306
msgid " bzr diff --old xxx"
1307
msgstr ""
1308
1309
#: bzrlib/builtins.py:2268
1310
msgid " Show the differences between two branches for file NEWS::"
1311
msgstr ""
1312
1313
#: bzrlib/builtins.py:2270
1314
msgid " bzr diff --old xxx --new yyy NEWS"
1315
msgstr ""
1316
1317
#: bzrlib/builtins.py:2272
1318
msgid " Same as 'bzr diff' but prefix paths with old/ and new/::"
1319
msgstr ""
1320
1321
#: bzrlib/builtins.py:2274
1322
msgid ""
1323
" bzr diff --prefix old/:new/\n"
1324
" \n"
1325
" Show the differences using a custom diff program with options::\n"
1326
" \n"
1327
" bzr diff --using /usr/bin/diff --diff-options -wu"
1328
msgstr ""
1329
1330
#: bzrlib/builtins.py:2284
1331
msgid "Pass these options to the external diff program."
1332
msgstr ""
1333
1334
#: bzrlib/builtins.py:2287
1335
msgid ""
1336
"Set prefixes added to old and new filenames, as two values separated by a "
1337
"colon. (eg \"old/:new/\")."
1338
msgstr ""
1339
1340
#: bzrlib/builtins.py:2290
1341
msgid "Branch/tree to compare from."
1342
msgstr ""
1343
1344
#: bzrlib/builtins.py:2294
1345
msgid "Branch/tree to compare to."
1346
msgstr ""
1347
1348
#: bzrlib/builtins.py:2300
1349
msgid "Use this command to compare files."
1350
msgstr ""
1351
1352
#: bzrlib/builtins.py:2305
1353
msgid "Diff format to use."
1354
msgstr ""
1355
1356
#: bzrlib/builtins.py:2307
1357
msgid "Diff format"
1358
msgstr ""
1359
1360
#: bzrlib/builtins.py:2329
1361
msgid "--prefix expects two values separated by a colon (eg \"old/:new/\")"
1362
msgstr ""
1363
1364
#: bzrlib/builtins.py:2333
1365
msgid "bzr diff --revision takes exactly one or two revision specifiers"
1366
msgstr ""
1367
1368
#: bzrlib/builtins.py:2338 bzrlib/builtins.py:2736 bzrlib/builtins.py:2749
1369
#: bzrlib/builtins.py:2757 bzrlib/builtins.py:4919
1370
msgid "{0} and {1} are mutually exclusive"
1371
msgstr ""
1372
1373
#: bzrlib/builtins.py:2358
1374
msgid ""
1375
"List files deleted in the working tree.\n"
1376
" "
1377
msgstr ""
1378
1379
#: bzrlib/builtins.py:2436
1380
msgid "Show the tree root directory."
1381
msgstr ""
1382
1383
#: bzrlib/builtins.py:2438
1384
msgid ""
1385
"The root is the nearest enclosing directory with a .bzr control\n"
1386
"directory."
1387
msgstr ""
1388
1389
#: bzrlib/builtins.py:2453
1390
msgid "The limit argument must be an integer."
1391
msgstr ""
1392
1393
#: bzrlib/builtins.py:2461
1394
msgid "The levels argument must be an integer."
1395
msgstr ""
1396
1397
#: bzrlib/builtins.py:2466
1398
msgid "Show historical log for a branch or subset of a branch."
1399
msgstr ""
1400
1401
#: bzrlib/builtins.py:2468
1402
msgid ""
1403
"log is bzr's default tool for exploring the history of a branch.\n"
1404
"The branch to use is taken from the first parameter. If no parameters\n"
1405
"are given, the branch containing the working directory is logged.\n"
1406
"Here are some simple examples::"
1407
msgstr ""
1408
1409
#: bzrlib/builtins.py:2473
1410
msgid ""
1411
" bzr log log the current branch\n"
1412
" bzr log foo.py log a file in its branch\n"
1413
" bzr log http://server/branch log a branch on a server"
1414
msgstr ""
1415
1416
#: bzrlib/builtins.py:2477
1417
msgid ""
1418
"The filtering, ordering and information shown for each revision can\n"
1419
"be controlled as explained below. By default, all revisions are\n"
1420
"shown sorted (topologically) so that newer revisions appear before\n"
1421
"older ones and descendants always appear before ancestors. If displayed,\n"
1422
"merged revisions are shown indented under the revision in which they\n"
1423
"were merged."
1424
msgstr ""
1425
1426
#: bzrlib/builtins.py:2484
1427
msgid ":Output control:"
1428
msgstr ""
1429
1430
#: bzrlib/builtins.py:2486
1431
msgid ""
1432
" The log format controls how information about each revision is\n"
1433
" displayed. The standard log formats are called ``long``, ``short``\n"
1434
" and ``line``. The default is long. See ``bzr help log-formats``\n"
1435
" for more details on log formats."
1436
msgstr ""
1437
1438
#: bzrlib/builtins.py:2491
1439
msgid ""
1440
" The following options can be used to control what information is\n"
1441
" displayed::"
1442
msgstr ""
1443
1444
#: bzrlib/builtins.py:2494
1445
msgid ""
1446
" -l N display a maximum of N revisions\n"
1447
" -n N display N levels of revisions (0 for all, 1 for collapsed)\n"
1448
" -v display a status summary (delta) for each revision\n"
1449
" -p display a diff (patch) for each revision\n"
1450
" --show-ids display revision-ids (and file-ids), not just revnos"
1451
msgstr ""
1452
1453
#: bzrlib/builtins.py:2500
1454
msgid ""
1455
" Note that the default number of levels to display is a function of the\n"
1456
" log format. If the -n option is not used, the standard log formats show\n"
1457
" just the top level (mainline)."
1458
msgstr ""
1459
1460
#: bzrlib/builtins.py:2504
1461
msgid ""
1462
" Status summaries are shown using status flags like A, M, etc. To see\n"
1463
" the changes explained using words like ``added`` and ``modified``\n"
1464
" instead, use the -vv option."
1465
msgstr ""
1466
1467
#: bzrlib/builtins.py:2508
1468
msgid ":Ordering control:"
1469
msgstr ""
1470
1471
#: bzrlib/builtins.py:2510
1472
msgid ""
1473
" To display revisions from oldest to newest, use the --forward option.\n"
1474
" In most cases, using this option will have little impact on the total\n"
1475
" time taken to produce a log, though --forward does not incrementally\n"
1476
" display revisions like --reverse does when it can."
1477
msgstr ""
1478
1479
#: bzrlib/builtins.py:2515
1480
msgid ":Revision filtering:"
1481
msgstr ""
1482
1483
#: bzrlib/builtins.py:2517
1484
msgid ""
1485
" The -r option can be used to specify what revision or range of revisions\n"
1486
" to filter against. The various forms are shown below::"
1487
msgstr ""
1488
1489
#: bzrlib/builtins.py:2520
1490
msgid ""
1491
" -rX display revision X\n"
1492
" -rX.. display revision X and later\n"
1493
" -r..Y display up to and including revision Y\n"
1494
" -rX..Y display from X to Y inclusive"
1495
msgstr ""
1496
1497
#: bzrlib/builtins.py:2525
1498
msgid ""
1499
" See ``bzr help revisionspec`` for details on how to specify X and Y.\n"
1500
" Some common examples are given below::"
1501
msgstr ""
1502
1503
#: bzrlib/builtins.py:2528
1504
msgid ""
1505
" -r-1 show just the tip\n"
1506
" -r-10.. show the last 10 mainline revisions\n"
1507
" -rsubmit:.. show what's new on this branch\n"
1508
" -rancestor:path.. show changes since the common ancestor of this\n"
1509
" branch and the one at location path\n"
1510
" -rdate:yesterday.. show changes since yesterday"
1511
msgstr ""
1512
1513
#: bzrlib/builtins.py:2535
1514
msgid ""
1515
" When logging a range of revisions using -rX..Y, log starts at\n"
1516
" revision Y and searches back in history through the primary\n"
1517
" (\"left-hand\") parents until it finds X. When logging just the\n"
1518
" top level (using -n1), an error is reported if X is not found\n"
1519
" along the way. If multi-level logging is used (-n0), X may be\n"
1520
" a nested merge revision and the log will be truncated accordingly."
1521
msgstr ""
1522
1523
#: bzrlib/builtins.py:2542
1524
msgid ":Path filtering:"
1525
msgstr ""
1526
1527
#: bzrlib/builtins.py:2544
1528
msgid ""
1529
" If parameters are given and the first one is not a branch, the log\n"
1530
" will be filtered to show only those revisions that changed the\n"
1531
" nominated files or directories."
1532
msgstr ""
1533
1534
#: bzrlib/builtins.py:2548
1535
msgid ""
1536
" Filenames are interpreted within their historical context. To log a\n"
1537
" deleted file, specify a revision range so that the file existed at\n"
1538
" the end or start of the range."
1539
msgstr ""
1540
1541
#: bzrlib/builtins.py:2552
1542
msgid ""
1543
" Historical context is also important when interpreting pathnames of\n"
1544
" renamed files/directories. Consider the following example:"
1545
msgstr ""
1546
1547
#: bzrlib/builtins.py:2555
1548
msgid ""
1549
" * revision 1: add tutorial.txt\n"
1550
" * revision 2: modify tutorial.txt\n"
1551
" * revision 3: rename tutorial.txt to guide.txt; add tutorial.txt"
1552
msgstr ""
1553
1554
#: bzrlib/builtins.py:2559
1555
msgid " In this case:"
1556
msgstr ""
1557
1558
#: bzrlib/builtins.py:2561
1559
msgid " * ``bzr log guide.txt`` will log the file added in revision 1"
1560
msgstr ""
1561
1562
#: bzrlib/builtins.py:2563
1563
msgid ""
1564
" * ``bzr log tutorial.txt`` will log the new file added in revision 3"
1565
msgstr ""
1566
1567
#: bzrlib/builtins.py:2565
1568
msgid ""
1569
" * ``bzr log -r2 -p tutorial.txt`` will show the changes made to\n"
1570
" the original file in revision 2."
1571
msgstr ""
1572
1573
#: bzrlib/builtins.py:2568
1574
msgid ""
1575
" * ``bzr log -r2 -p guide.txt`` will display an error message as there\n"
1576
" was no file called guide.txt in revision 2."
1577
msgstr ""
1578
1579
#: bzrlib/builtins.py:2571
1580
msgid ""
1581
" Renames are always followed by log. By design, there is no need to\n"
1582
" explicitly ask for this (and no way to stop logging a file back\n"
1583
" until it was last renamed)."
1584
msgstr ""
1585
1586
#: bzrlib/builtins.py:2575
1587
msgid ":Other filtering:"
1588
msgstr ""
1589
1590
#: bzrlib/builtins.py:2577
1591
msgid ""
1592
" The --match option can be used for finding revisions that match a\n"
1593
" regular expression in a commit message, committer, author or bug.\n"
1594
" Specifying the option several times will match any of the supplied\n"
1595
" expressions. --match-author, --match-bugs, --match-committer and\n"
1596
" --match-message can be used to only match a specific field."
1597
msgstr ""
1598
1599
#: bzrlib/builtins.py:2583
1600
msgid ":Tips & tricks:"
1601
msgstr ""
1602
1603
#: bzrlib/builtins.py:2585
1604
msgid ""
1605
" GUI tools and IDEs are often better at exploring history than command\n"
1606
" line tools: you may prefer qlog or viz from qbzr or bzr-gtk, the\n"
1607
" bzr-explorer shell, or the Loggerhead web interface. See the Plugin\n"
1608
" Guide <http://doc.bazaar.canonical.com/plugins/en/> and\n"
1609
" <http://wiki.bazaar.canonical.com/IDEIntegration>. "
1610
msgstr ""
1611
1612
#: bzrlib/builtins.py:2591
1613
msgid ""
1614
" You may find it useful to add the aliases below to ``bazaar.conf``::"
1615
msgstr ""
1616
1617
#: bzrlib/builtins.py:2593
1618
msgid ""
1619
" [ALIASES]\n"
1620
" tip = log -r-1\n"
1621
" top = log -l10 --line\n"
1622
" show = log -v -p"
1623
msgstr ""
1624
1625
#: bzrlib/builtins.py:2598
1626
msgid ""
1627
" ``bzr tip`` will then show the latest revision while ``bzr top``\n"
1628
" will show the last 10 mainline revisions. To see the details of a\n"
1629
" particular revision X, ``bzr show -rX``."
1630
msgstr ""
1631
1632
#: bzrlib/builtins.py:2602
1633
msgid ""
1634
" If you are interested in looking deeper into a particular merge X,\n"
1635
" use ``bzr log -n0 -rX``."
1636
msgstr ""
1637
1638
#: bzrlib/builtins.py:2605
1639
msgid ""
1640
" ``bzr log -v`` on a branch with lots of history is currently\n"
1641
" very slow. A fix for this issue is currently under development.\n"
1642
" With or without that fix, it is recommended that a revision range\n"
1643
" be given when using the -v option."
1644
msgstr ""
1645
1646
#: bzrlib/builtins.py:2610
1647
msgid ""
1648
" bzr has a generic full-text matching plugin, bzr-search, that can be\n"
1649
" used to find revisions matching user names, commit messages, etc.\n"
1650
" Among other features, this plugin can find all revisions containing\n"
1651
" a list of words but not others."
1652
msgstr ""
1653
1654
#: bzrlib/builtins.py:2615
1655
msgid ""
1656
" When exploring non-mainline history on large projects with deep\n"
1657
" history, the performance of log can be greatly improved by installing\n"
1658
" the historycache plugin. This plugin buffers historical information\n"
1659
" trading disk space for faster speed."
1660
msgstr ""
1661
1662
#: bzrlib/builtins.py:2624
1663
msgid "Show from oldest to newest."
1664
msgstr ""
1665
1666
#: bzrlib/builtins.py:2627
1667
msgid "Show files changed in each revision."
1668
msgstr ""
1669
1670
#: bzrlib/builtins.py:2633
1671
msgid "Show just the specified revision. See also \"help revisionspec\"."
1672
msgstr ""
1673
1674
#: bzrlib/builtins.py:2637
1675
msgid "What names to list as authors - first, all or committer."
1676
msgstr ""
1677
1678
#: bzrlib/builtins.py:2638
1679
msgid "Authors"
1680
msgstr ""
1681
1682
#: bzrlib/builtins.py:2643
1683
msgid "Number of levels to display - 0 for all, 1 for flat."
1684
msgstr ""
1685
1686
#: bzrlib/builtins.py:2653
1687
msgid "Limit the output to the first N revisions."
1688
msgstr ""
1689
1690
#: bzrlib/builtins.py:2658
1691
msgid "Show changes made in each revision as a patch."
1692
msgstr ""
1693
1694
#: bzrlib/builtins.py:2660
1695
msgid "Show merged revisions like --levels 0 does."
1696
msgstr ""
1697
1698
#: bzrlib/builtins.py:2664
1699
msgid "Do not report commits with more than one parent."
1700
msgstr ""
1701
1702
#: bzrlib/builtins.py:2666
1703
msgid ""
1704
"Display only the revisions that are not part of both ancestries (require -"
1705
"rX..Y)."
1706
msgstr ""
1707
1708
#: bzrlib/builtins.py:2670
1709
msgid "Show digital signature validity."
1710
msgstr ""
1711
1712
#: bzrlib/builtins.py:2673
1713
msgid "Show revisions whose properties match this expression."
1714
msgstr ""
1715
1716
#: bzrlib/builtins.py:2677
1717
msgid "Show revisions whose message matches this expression."
1718
msgstr ""
1719
1720
#: bzrlib/builtins.py:2681
1721
msgid "Show revisions whose committer matches this expression."
1722
msgstr ""
1723
1724
#: bzrlib/builtins.py:2685
1725
msgid "Show revisions whose authors match this expression."
1726
msgstr ""
1727
1728
#: bzrlib/builtins.py:2689
1729
msgid "Show revisions whose bugs match this expression."
1730
msgstr ""
1731
1732
#: bzrlib/builtins.py:2743
1733
msgid "--exclude-common-ancestry requires -r with two revisions"
1734
msgstr ""
1735
1736
#: bzrlib/builtins.py:2771
1737
#, python-format
1738
msgid "Path unknown at end or start of revision range: %s"
1739
msgstr ""
1740
1741
#: bzrlib/builtins.py:2888
1742
#, python-format
1743
msgid "bzr %s doesn't accept two revisions in different branches."
1744
msgstr ""
1745
1746
#: bzrlib/builtins.py:2904
1747
#, python-format
1748
msgid "bzr %s --revision takes one or two values."
1749
msgstr ""
1750
1751
#: bzrlib/builtins.py:2949
1752
msgid ""
1753
"List files in a tree.\n"
1754
" "
1755
msgstr ""
1756
1757
#: bzrlib/builtins.py:2958
1758
msgid "Recurse into subdirectories."
1759
msgstr ""
1760
1761
#: bzrlib/builtins.py:2960
1762
msgid "Print paths relative to the root of the branch."
1763
msgstr ""
1764
1765
#: bzrlib/builtins.py:2962
1766
msgid "Print unknown files."
1767
msgstr ""
1768
1769
#: bzrlib/builtins.py:2963
1770
msgid "Print versioned files."
1771
msgstr ""
1772
1773
#: bzrlib/builtins.py:2966
1774
msgid "Print ignored files."
1775
msgstr ""
1776
1777
#: bzrlib/builtins.py:2968
1778
msgid "List entries of a particular kind: file, directory, symlink."
1779
msgstr ""
1780
1781
#: bzrlib/builtins.py:2981
1782
msgid "invalid kind specified"
1783
msgstr ""
1784
1785
#: bzrlib/builtins.py:2984
1786
msgid "Cannot set both --verbose and --null"
1787
msgstr ""
1788
1789
#: bzrlib/builtins.py:2993
1790
msgid "cannot specify both --from-root and PATH"
1791
msgstr ""
1792
1793
#: bzrlib/builtins.py:3080
1794
msgid "Ignore specified files or patterns."
1795
msgstr ""
1796
1797
#: bzrlib/builtins.py:3082
1798
msgid "See ``bzr help patterns`` for details on the syntax of patterns."
1799
msgstr ""
1800
1801
#: bzrlib/builtins.py:3084
1802
msgid ""
1803
"If a .bzrignore file does not exist, the ignore command\n"
1804
"will create one and add the specified files or patterns to the newly\n"
1805
"created file. The ignore command will also automatically add the \n"
1806
".bzrignore file to be versioned. Creating a .bzrignore file without\n"
1807
"the use of the ignore command will require an explicit add command."
1808
msgstr ""
1809
1810
#: bzrlib/builtins.py:3090
1811
msgid ""
1812
"To remove patterns from the ignore list, edit the .bzrignore file.\n"
1813
"After adding, editing or deleting that file either indirectly by\n"
1814
"using this command or directly by using an editor, be sure to commit\n"
1815
"it."
1816
msgstr ""
1817
1818
#: bzrlib/builtins.py:3095
1819
msgid ""
1820
"Bazaar also supports a global ignore file ~/.bazaar/ignore. On Windows\n"
1821
"the global ignore file can be found in the application data directory as\n"
1822
"C:\\Documents and Settings\\<user>\\Application Data\\Bazaar\\2.0\\ignore.\n"
1823
"Global ignores are not touched by this command. The global ignore file\n"
1824
"can be edited directly using an editor."
1825
msgstr ""
1826
1827
#: bzrlib/builtins.py:3101
1828
msgid ""
1829
"Patterns prefixed with '!' are exceptions to ignore patterns and take\n"
1830
"precedence over regular ignores. Such exceptions are used to specify\n"
1831
"files that should be versioned which would otherwise be ignored."
1832
msgstr ""
1833
1834
#: bzrlib/builtins.py:3105
1835
msgid ""
1836
"Patterns prefixed with '!!' act as regular ignore patterns, but have\n"
1837
"precedence over the '!' exception patterns."
1838
msgstr ""
1839
1840
#: bzrlib/builtins.py:3108
1841
msgid ""
1842
":Notes: \n"
1843
" \n"
1844
"* Ignore patterns containing shell wildcards must be quoted from\n"
1845
" the shell on Unix."
1846
msgstr ""
1847
1848
#: bzrlib/builtins.py:3113
1849
msgid ""
1850
"* Ignore patterns starting with \"#\" act as comments in the ignore file.\n"
1851
" To ignore patterns that begin with that character, use the \"RE:\" prefix."
1852
msgstr ""
1853
1854
#: bzrlib/builtins.py:3116
1855
msgid ""
1856
":Examples:\n"
1857
" Ignore the top level Makefile::"
1858
msgstr ""
1859
1860
#: bzrlib/builtins.py:3119
1861
msgid " bzr ignore ./Makefile"
1862
msgstr ""
1863
1864
#: bzrlib/builtins.py:3121
1865
msgid " Ignore .class files in all directories...::"
1866
msgstr ""
1867
1868
#: bzrlib/builtins.py:3123
1869
msgid " bzr ignore \"*.class\""
1870
msgstr ""
1871
1872
#: bzrlib/builtins.py:3125
1873
msgid " ...but do not ignore \"special.class\"::"
1874
msgstr ""
1875
1876
#: bzrlib/builtins.py:3127
1877
msgid " bzr ignore \"!special.class\""
1878
msgstr ""
1879
1880
#: bzrlib/builtins.py:3129
1881
msgid " Ignore files whose name begins with the \"#\" character::"
1882
msgstr ""
1883
1884
#: bzrlib/builtins.py:3131
1885
msgid " bzr ignore \"RE:^#\""
1886
msgstr ""
1887
1888
#: bzrlib/builtins.py:3133 bzrlib/builtins.py:3137
1889
msgid " Ignore .o files under the lib directory::"
1890
msgstr ""
1891
1892
#: bzrlib/builtins.py:3135
1893
msgid " bzr ignore \"lib/**/*.o\""
1894
msgstr ""
1895
1896
#: bzrlib/builtins.py:3139
1897
msgid " bzr ignore \"RE:lib/.*\\.o\""
1898
msgstr ""
1899
1900
#: bzrlib/builtins.py:3141
1901
msgid " Ignore everything but the \"debian\" toplevel directory::"
1902
msgstr ""
1903
1904
#: bzrlib/builtins.py:3143
1905
msgid ""
1906
" bzr ignore \"RE:(?!debian/).*\"\n"
1907
" \n"
1908
" Ignore everything except the \"local\" toplevel directory,\n"
1909
" but always ignore autosave files ending in ~, even under local/::\n"
1910
" \n"
1911
" bzr ignore \"*\"\n"
1912
" bzr ignore \"!./local\"\n"
1913
" bzr ignore \"!!*~\""
1914
msgstr ""
1915
1916
#: bzrlib/builtins.py:3157
1917
msgid "Display the default ignore rules that bzr uses."
1918
msgstr ""
1919
1920
#: bzrlib/builtins.py:3169
1921
msgid "ignore requires at least one NAME_PATTERN or --default-rules."
1922
msgstr ""
1923
1924
#: bzrlib/builtins.py:3180
1925
#, python-format
1926
msgid "Invalid ignore pattern found. %s"
1927
msgid_plural "Invalid ignore patterns found. %s"
1928
msgstr[0] ""
1929
msgstr[1] ""
1930
1931
#: bzrlib/builtins.py:3189
1932
msgid "NAME_PATTERN should not be an absolute path"
1933
msgstr ""
1934
1935
#: bzrlib/builtins.py:3202
1936
#, python-format
1937
msgid ""
1938
"Warning: the following files are version controlled and match your ignore "
1939
"pattern:\n"
1940
"%s\n"
1941
"These files will continue to be version controlled unless you 'bzr remove' "
1942
"them.\n"
1943
msgstr ""
1944
1945
#: bzrlib/builtins.py:3209
1946
msgid "List ignored files and the patterns that matched them."
1947
msgstr ""
1948
1949
#: bzrlib/builtins.py:3211
1950
msgid ""
1951
"List all the ignored files and the ignore pattern that caused the file to\n"
1952
"be ignored."
1953
msgstr ""
1954
1955
#: bzrlib/builtins.py:3214
1956
msgid "Alternatively, to list just the files::"
1957
msgstr ""
1958
1959
#: bzrlib/builtins.py:3216
1960
msgid " bzr ls --ignored"
1961
msgstr ""
1962
1963
#: bzrlib/builtins.py:3250
1964
#, python-format
1965
msgid "not a valid revision-number: %r"
1966
msgstr ""
1967
1968
#: bzrlib/builtins.py:3257
1969
msgid ""
1970
"Export current or past revision to a destination directory or archive."
1971
msgstr ""
1972
1973
#: bzrlib/builtins.py:3259
1974
msgid "If no revision is specified this exports the last committed revision."
1975
msgstr ""
1976
1977
#: bzrlib/builtins.py:3261
1978
msgid ""
1979
"Format may be an \"exporter\" name, such as tar, tgz, tbz2. If none is\n"
1980
"given, try to find the format with the extension. If no extension\n"
1981
"is found exports to a directory (equivalent to --format=dir)."
1982
msgstr ""
1983
1984
#: bzrlib/builtins.py:3265
1985
msgid ""
1986
"If root is supplied, it will be used as the root directory inside\n"
1987
"container formats (tar, zip, etc). If it is not supplied it will default\n"
1988
"to the exported filename. The root option has no effect for 'dir' format."
1989
msgstr ""
1990
1991
#: bzrlib/builtins.py:3269
1992
msgid ""
1993
"If branch is omitted then the branch containing the current working\n"
1994
"directory will be used."
1995
msgstr ""
1996
1997
#: bzrlib/builtins.py:3272
1998
msgid ""
1999
"Note: Export of tree with non-ASCII filenames to zip is not supported."
2000
msgstr ""
2001
2002
#: bzrlib/builtins.py:3274
2003
msgid ""
2004
" ================= =========================\n"
2005
" Supported formats Autodetected by extension\n"
2006
" ================= =========================\n"
2007
" dir (none)\n"
2008
" tar .tar\n"
2009
" tbz2 .tar.bz2, .tbz2\n"
2010
" tgz .tar.gz, .tgz\n"
2011
" zip .zip\n"
2012
" ================= ========================="
2013
msgstr ""
2014
2015
#: bzrlib/builtins.py:3288
2016
msgid "Type of file to export to."
2017
msgstr ""
2018
2019
#: bzrlib/builtins.py:3291
2020
msgid "Apply content filters to export the convenient form."
2021
msgstr ""
2022
2023
#: bzrlib/builtins.py:3295
2024
msgid "Name of the root directory inside the exported file."
2025
msgstr ""
2026
2027
#: bzrlib/builtins.py:3297
2028
msgid ""
2029
"Set modification time of files to that of the last revision in which it was "
2030
"changed."
2031
msgstr ""
2032
2033
#: bzrlib/builtins.py:3300
2034
msgid ""
2035
"Export the working tree contents rather than that of the last revision."
2036
msgstr ""
2037
2038
#: bzrlib/builtins.py:3319
2039
msgid "--uncommitted requires a working tree"
2040
msgstr ""
2041
2042
#: bzrlib/builtins.py:3328
2043
#, python-format
2044
msgid "Unsupported export format: %s"
2045
msgstr ""
2046
2047
#: bzrlib/builtins.py:3332
2048
msgid ""
2049
"Write the contents of a file as of a given revision to standard output."
2050
msgstr ""
2051
2052
#: bzrlib/builtins.py:3334
2053
msgid "If no revision is nominated, the last revision is used."
2054
msgstr ""
2055
2056
#: bzrlib/builtins.py:3336
2057
msgid ""
2058
"Note: Take care to redirect standard output when using this command on a\n"
2059
"binary file."
2060
msgstr ""
2061
2062
#: bzrlib/builtins.py:3342
2063
msgid "The path name in the old tree."
2064
msgstr ""
2065
2066
#: bzrlib/builtins.py:3343
2067
msgid "Apply content filters to display the convenience form."
2068
msgstr ""
2069
2070
#: bzrlib/builtins.py:3354
2071
msgid "bzr cat --revision takes exactly one revision specifier"
2072
msgstr ""
2073
2074
#: bzrlib/builtins.py:3379 bzrlib/builtins.py:3391
2075
msgid "{0!r} is not present in revision {1}"
2076
msgstr ""
2077
2078
#: bzrlib/builtins.py:3414
2079
msgid "Commit changes into a new revision."
2080
msgstr ""
2081
2082
#: bzrlib/builtins.py:3416
2083
msgid ""
2084
"An explanatory message needs to be given for each commit. This is\n"
2085
"often done by using the --message option (getting the message from the\n"
2086
"command line) or by using the --file option (getting the message from\n"
2087
"a file). If neither of these options is given, an editor is opened for\n"
2088
"the user to enter the message. To see the changed files in the\n"
2089
"boilerplate text loaded into the editor, use the --show-diff option."
2090
msgstr ""
2091
2092
#: bzrlib/builtins.py:3423
2093
msgid ""
2094
"By default, the entire tree is committed and the person doing the\n"
2095
"commit is assumed to be the author. These defaults can be overridden\n"
2096
"as explained below."
2097
msgstr ""
2098
2099
#: bzrlib/builtins.py:3427
2100
msgid ":Selective commits:"
2101
msgstr ""
2102
2103
#: bzrlib/builtins.py:3429
2104
msgid ""
2105
" If selected files are specified, only changes to those files are\n"
2106
" committed. If a directory is specified then the directory and\n"
2107
" everything within it is committed."
2108
msgstr ""
2109
2110
#: bzrlib/builtins.py:3433
2111
msgid ""
2112
" When excludes are given, they take precedence over selected files.\n"
2113
" For example, to commit only changes within foo, but not changes\n"
2114
" within foo/bar::"
2115
msgstr ""
2116
2117
#: bzrlib/builtins.py:3437
2118
msgid " bzr commit foo -x foo/bar"
2119
msgstr ""
2120
2121
#: bzrlib/builtins.py:3439
2122
msgid " A selective commit after a merge is not yet supported."
2123
msgstr ""
2124
2125
#: bzrlib/builtins.py:3441
2126
msgid ":Custom authors:"
2127
msgstr ""
2128
2129
#: bzrlib/builtins.py:3443
2130
msgid ""
2131
" If the author of the change is not the same person as the committer,\n"
2132
" you can specify the author's name using the --author option. The\n"
2133
" name should be in the same format as a committer-id, e.g.\n"
2134
" \"John Doe <jdoe@example.com>\". If there is more than one author of\n"
2135
" the change you can specify the option multiple times, once for each\n"
2136
" author."
2137
msgstr ""
2138
2139
#: bzrlib/builtins.py:3450
2140
msgid ":Checks:"
2141
msgstr ""
2142
2143
#: bzrlib/builtins.py:3452
2144
msgid ""
2145
" A common mistake is to forget to add a new file or directory before\n"
2146
" running the commit command. The --strict option checks for unknown\n"
2147
" files and aborts the commit if any are found. More advanced pre-commit\n"
2148
" checks can be implemented by defining hooks. See ``bzr help hooks``\n"
2149
" for details."
2150
msgstr ""
2151
2152
#: bzrlib/builtins.py:3458
2153
msgid ":Things to note:"
2154
msgstr ""
2155
2156
#: bzrlib/builtins.py:3460
2157
msgid ""
2158
" If you accidentially commit the wrong changes or make a spelling\n"
2159
" mistake in the commit message say, you can use the uncommit command\n"
2160
" to undo it. See ``bzr help uncommit`` for details."
2161
msgstr ""
2162
2163
#: bzrlib/builtins.py:3464
2164
msgid ""
2165
" Hooks can also be configured to run after a commit. This allows you\n"
2166
" to trigger updates to external systems like bug trackers. The --fixes\n"
2167
" option can be used to record the association between a revision and\n"
2168
" one or more bugs. See ``bzr help bugs`` for details."
2169
msgstr ""
2170
2171
#: bzrlib/builtins.py:3474
2172
msgid "Do not consider changes made to a given path."
2173
msgstr ""
2174
2175
#: bzrlib/builtins.py:3477
2176
msgid "Description of the new revision."
2177
msgstr ""
2178
2179
#: bzrlib/builtins.py:3480
2180
msgid "Commit even if nothing has changed."
2181
msgstr ""
2182
2183
#: bzrlib/builtins.py:3484
2184
msgid "Take commit message from this file."
2185
msgstr ""
2186
2187
#: bzrlib/builtins.py:3486
2188
msgid "Refuse to commit if there are unknown files in the working tree."
2189
msgstr ""
2190
2191
#: bzrlib/builtins.py:3489
2192
msgid ""
2193
"Manually set a commit time using commit date format, e.g. '2009-10-10 "
2194
"08:00:00 +0100'."
2195
msgstr ""
2196
2197
#: bzrlib/builtins.py:3492
2198
msgid "Mark a bug as being fixed by this revision (see \"bzr help bugs\")."
2199
msgstr ""
2200
2201
#: bzrlib/builtins.py:3495
2202
msgid "Set the author's name, if it's different from the committer."
2203
msgstr ""
2204
2205
#: bzrlib/builtins.py:3498
2206
msgid ""
2207
"Perform a local commit in a bound branch. Local commits are not pushed to "
2208
"the master branch until a normal commit is performed."
2209
msgstr ""
2210
2211
#: bzrlib/builtins.py:3504
2212
msgid ""
2213
"When no message is supplied, show the diff along with the status summary in "
2214
"the message editor."
2215
msgstr ""
2216
2217
#: bzrlib/builtins.py:3507
2218
msgid ""
2219
"When committing to a foreign version control system do not push data that "
2220
"can not be natively represented."
2221
msgstr ""
2222
2223
#: bzrlib/builtins.py:3525
2224
#, python-format
2225
msgid ""
2226
"No tracker specified for bug %s. Use the form 'tracker:id' or specify a "
2227
"default bug tracker using the `bugtracker` option.\n"
2228
"See \"bzr help bugs\" for more information on this feature. Commit refused."
2229
msgstr ""
2230
2231
#: bzrlib/builtins.py:3534
2232
#, python-format
2233
msgid ""
2234
"Invalid bug %s. Must be in the form of 'tracker:id'. See \"bzr help bugs\" "
2235
"for more information on this feature.\n"
2236
"Commit refused."
2237
msgstr ""
2238
2239
#: bzrlib/builtins.py:3543
2240
#, python-format
2241
msgid "Unrecognized bug %s. Commit refused."
2242
msgstr ""
2243
2244
#: bzrlib/builtins.py:3546
2245
#, python-format
2246
msgid ""
2247
"%s\n"
2248
"Commit refused."
2249
msgstr ""
2250
2251
#: bzrlib/builtins.py:3570
2252
msgid "Could not parse --commit-time: "
2253
msgstr ""
2254
2255
#: bzrlib/builtins.py:3610
2256
msgid "please specify either --message or --file"
2257
msgstr ""
2258
2259
#: bzrlib/builtins.py:3639
2260
msgid "please specify a commit message with either --message or --file"
2261
msgstr ""
2262
2263
#: bzrlib/builtins.py:3642
2264
msgid ""
2265
"Empty commit message specified. Please specify a commit message with either -"
2266
"-message or --file or leave a blank message with --message \"\"."
2267
msgstr ""
2268
2269
#: bzrlib/builtins.py:3662
2270
msgid ""
2271
"No changes to commit. Please 'bzr add' the files you want to commit, or use -"
2272
"-unchanged to force an empty commit."
2273
msgstr ""
2274
2275
#: bzrlib/builtins.py:3666
2276
msgid ""
2277
"Conflicts detected in working tree. Use \"bzr conflicts\" to list, \"bzr "
2278
"resolve FILE\" to resolve."
2279
msgstr ""
2280
2281
#: bzrlib/builtins.py:3670
2282
msgid "Commit refused because there are unknown files in the working tree."
2283
msgstr ""
2284
2285
#: bzrlib/builtins.py:3673
2286
msgid ""
2287
"\n"
2288
"To commit to master branch, run update and then commit.\n"
2289
"You can also pass --local to commit to continue working disconnected."
2290
msgstr ""
2291
2292
#: bzrlib/builtins.py:3681
2293
msgid ""
2294
"Validate working tree structure, branch consistency and repository history."
2295
msgstr ""
2296
2297
#: bzrlib/builtins.py:3683
2298
msgid ""
2299
"This command checks various invariants about branch and repository storage\n"
2300
"to detect data corruption or bzr bugs."
2301
msgstr ""
2302
2303
#: bzrlib/builtins.py:3686
2304
msgid ""
2305
"The working tree and branch checks will only give output if a problem is\n"
2306
"detected. The output fields of the repository check are:"
2307
msgstr ""
2308
2309
#: bzrlib/builtins.py:3689
2310
msgid ""
2311
"revisions\n"
2312
" This is just the number of revisions checked. It doesn't\n"
2313
" indicate a problem."
2314
msgstr ""
2315
2316
#: bzrlib/builtins.py:3693
2317
msgid ""
2318
"versionedfiles\n"
2319
" This is just the number of versionedfiles checked. It\n"
2320
" doesn't indicate a problem."
2321
msgstr ""
2322
2323
#: bzrlib/builtins.py:3697
2324
msgid ""
2325
"unreferenced ancestors\n"
2326
" Texts that are ancestors of other texts, but\n"
2327
" are not properly referenced by the revision ancestry. This is a\n"
2328
" subtle problem that Bazaar can work around."
2329
msgstr ""
2330
2331
#: bzrlib/builtins.py:3702
2332
msgid ""
2333
"unique file texts\n"
2334
" This is the total number of unique file contents\n"
2335
" seen in the checked revisions. It does not indicate a problem."
2336
msgstr ""
2337
2338
#: bzrlib/builtins.py:3706
2339
msgid ""
2340
"repeated file texts\n"
2341
" This is the total number of repeated texts seen\n"
2342
" in the checked revisions. Texts can be repeated when their file\n"
2343
" entries are modified, but the file contents are not. It does not\n"
2344
" indicate a problem."
2345
msgstr ""
2346
2347
#: bzrlib/builtins.py:3712
2348
msgid ""
2349
"If no restrictions are specified, all Bazaar data that is found at the "
2350
"given\n"
2351
"location will be checked."
2352
msgstr ""
2353
2354
#: bzrlib/builtins.py:3717
2355
msgid " Check the tree and branch at 'foo'::"
2356
msgstr ""
2357
2358
#: bzrlib/builtins.py:3719
2359
msgid " bzr check --tree --branch foo"
2360
msgstr ""
2361
2362
#: bzrlib/builtins.py:3721
2363
msgid " Check only the repository at 'bar'::"
2364
msgstr ""
2365
2366
#: bzrlib/builtins.py:3723
2367
msgid " bzr check --repo bar"
2368
msgstr ""
2369
2370
#: bzrlib/builtins.py:3725
2371
msgid " Check everything at 'baz'::"
2372
msgstr ""
2373
2374
#: bzrlib/builtins.py:3727
2375
msgid " bzr check baz"
2376
msgstr ""
2377
2378
#: bzrlib/builtins.py:3733
2379
msgid "Check the branch related to the current directory."
2380
msgstr ""
2381
2382
#: bzrlib/builtins.py:3735
2383
msgid "Check the repository related to the current directory."
2384
msgstr ""
2385
2386
#: bzrlib/builtins.py:3737
2387
msgid "Check the working tree related to the current directory."
2388
msgstr ""
2389
2390
#: bzrlib/builtins.py:3751
2391
msgid "Upgrade a repository, branch or working tree to a newer format."
2392
msgstr ""
2393
2394
#: bzrlib/builtins.py:3753
2395
msgid ""
2396
"When the default format has changed after a major new release of\n"
2397
"Bazaar, you may be informed during certain operations that you\n"
2398
"should upgrade. Upgrading to a newer format may improve performance\n"
2399
"or make new features available. It may however limit interoperability\n"
2400
"with older repositories or with older versions of Bazaar."
2401
msgstr ""
2402
2403
#: bzrlib/builtins.py:3759
2404
msgid ""
2405
"If you wish to upgrade to a particular format rather than the\n"
2406
"current default, that can be specified using the --format option.\n"
2407
"As a consequence, you can use the upgrade command this way to\n"
2408
"\"downgrade\" to an earlier format, though some conversions are\n"
2409
"a one way process (e.g. changing from the 1.x default to the\n"
2410
"2.x default) so downgrading is not always possible."
2411
msgstr ""
2412
2413
#: bzrlib/builtins.py:3766
2414
msgid ""
2415
"A backup.bzr.~#~ directory is created at the start of the conversion\n"
2416
"process (where # is a number). By default, this is left there on\n"
2417
"completion. If the conversion fails, delete the new .bzr directory\n"
2418
"and rename this one back in its place. Use the --clean option to ask\n"
2419
"for the backup.bzr directory to be removed on successful conversion.\n"
2420
"Alternatively, you can delete it by hand if everything looks good\n"
2421
"afterwards."
2422
msgstr ""
2423
2424
#: bzrlib/builtins.py:3774
2425
msgid ""
2426
"If the location given is a shared repository, dependent branches\n"
2427
"are also converted provided the repository converts successfully.\n"
2428
"If the conversion of a branch fails, remaining branches are still\n"
2429
"tried."
2430
msgstr ""
2431
2432
#: bzrlib/builtins.py:3779
2433
msgid ""
2434
"For more information on upgrades, see the Bazaar Upgrade Guide,\n"
2435
"http://doc.bazaar.canonical.com/latest/en/upgrade-guide/."
2436
msgstr ""
2437
2438
#: bzrlib/builtins.py:3787
2439
msgid "Upgrade to a specific format. See \"bzr help formats\" for details."
2440
msgstr ""
2441
2442
#: bzrlib/builtins.py:3791
2443
msgid "Branch format"
2444
msgstr ""
2445
2446
#: bzrlib/builtins.py:3793
2447
msgid "Remove the backup.bzr directory if successful."
2448
msgstr ""
2449
2450
#: bzrlib/builtins.py:3795
2451
msgid "Show what would be done, but don't actually do anything."
2452
msgstr ""
2453
2454
#: bzrlib/builtins.py:3810
2455
msgid "Show or set bzr user id."
2456
msgstr ""
2457
2458
#: bzrlib/builtins.py:3812
2459
msgid ""
2460
":Examples:\n"
2461
" Show the email of the current user::"
2462
msgstr ""
2463
2464
#: bzrlib/builtins.py:3815
2465
msgid " bzr whoami --email"
2466
msgstr ""
2467
2468
#: bzrlib/builtins.py:3817
2469
msgid " Set the current user::"
2470
msgstr ""
2471
2472
#: bzrlib/builtins.py:3819
2473
msgid " bzr whoami \"Frank Chu <fchu@example.com>\""
2474
msgstr ""
2475
2476
#: bzrlib/builtins.py:3823
2477
msgid "Display email address only."
2478
msgstr ""
2479
2480
#: bzrlib/builtins.py:3825
2481
msgid "Set identity for the current branch instead of globally."
2482
msgstr ""
2483
2484
#: bzrlib/builtins.py:3851
2485
msgid "--email can only be used to display existing identity"
2486
msgstr ""
2487
2488
#: bzrlib/builtins.py:3873
2489
msgid "Print or set the branch nickname."
2490
msgstr ""
2491
2492
#: bzrlib/builtins.py:3875
2493
msgid ""
2494
"If unset, the tree root directory name is used as the nickname.\n"
2495
"To print the current nickname, execute with no argument."
2496
msgstr ""
2497
2498
#: bzrlib/builtins.py:3878
2499
msgid ""
2500
"Bound branches use the nickname of its master branch unless it is set\n"
2501
"locally."
2502
msgstr ""
2503
2504
#: bzrlib/builtins.py:3898
2505
msgid "Set/unset and display aliases."
2506
msgstr ""
2507
2508
#: bzrlib/builtins.py:3900
2509
msgid ""
2510
":Examples:\n"
2511
" Show the current aliases::"
2512
msgstr ""
2513
2514
#: bzrlib/builtins.py:3903
2515
msgid " bzr alias"
2516
msgstr ""
2517
2518
#: bzrlib/builtins.py:3905
2519
msgid " Show the alias specified for 'll'::"
2520
msgstr ""
2521
2522
#: bzrlib/builtins.py:3907
2523
msgid " bzr alias ll"
2524
msgstr ""
2525
2526
#: bzrlib/builtins.py:3909
2527
msgid " Set an alias for 'll'::"
2528
msgstr ""
2529
2530
#: bzrlib/builtins.py:3911
2531
msgid " bzr alias ll=\"log --line -r-10..-1\""
2532
msgstr ""
2533
2534
#: bzrlib/builtins.py:3913
2535
msgid " To remove an alias for 'll'::"
2536
msgstr ""
2537
2538
#: bzrlib/builtins.py:3915
2539
msgid " bzr alias --remove ll"
2540
msgstr ""
2541
2542
#: bzrlib/builtins.py:3920
2543
msgid "Remove the alias."
2544
msgstr ""
2545
2546
#: bzrlib/builtins.py:3938
2547
msgid "bzr alias --remove expects an alias to remove."
2548
msgstr ""
2549
2550
#: bzrlib/builtins.py:4119
2551
msgid ""
2552
"subunit not available. subunit needs to be installed to use --subunit."
2553
msgstr ""
2554
2555
#: bzrlib/builtins.py:4136
2556
msgid ""
2557
"--benchmark is no longer supported from bzr 2.2; use bzr-usertest instead"
2558
msgstr ""
2559
2560
#: bzrlib/builtins.py:4183
2561
msgid "Show version of bzr."
2562
msgstr ""
2563
2564
#: bzrlib/builtins.py:4187
2565
msgid "Print just the version number."
2566
msgstr ""
2567
2568
#: bzrlib/builtins.py:4206
2569
msgid "It sure does!\n"
2570
msgstr ""
2571
2572
#: bzrlib/builtins.py:4230
2573
#, python-format
2574
msgid "merge base is revision %s\n"
2575
msgstr ""
2576
2577
#: bzrlib/builtins.py:4234
2578
msgid "Perform a three-way merge."
2579
msgstr ""
2580
2581
#: bzrlib/builtins.py:4236
2582
msgid ""
2583
"The source of the merge can be specified either in the form of a branch,\n"
2584
"or in the form of a path to a file containing a merge directive generated\n"
2585
"with bzr send. If neither is specified, the default is the upstream branch\n"
2586
"or the branch most recently merged using --remember. The source of the\n"
2587
"merge may also be specified in the form of a path to a file in another\n"
2588
"branch: in this case, only the modifications to that file are merged into\n"
2589
"the current working tree."
2590
msgstr ""
2591
2592
#: bzrlib/builtins.py:4244
2593
msgid ""
2594
"When merging from a branch, by default bzr will try to merge in all new\n"
2595
"work from the other branch, automatically determining an appropriate base\n"
2596
"revision. If this fails, you may need to give an explicit base."
2597
msgstr ""
2598
2599
#: bzrlib/builtins.py:4248
2600
msgid ""
2601
"To pick a different ending revision, pass \"--revision OTHER\". bzr will\n"
2602
"try to merge in all new work up to and including revision OTHER."
2603
msgstr ""
2604
2605
#: bzrlib/builtins.py:4251
2606
msgid ""
2607
"If you specify two values, \"--revision BASE..OTHER\", only revisions BASE\n"
2608
"through OTHER, excluding BASE but including OTHER, will be merged. If this\n"
2609
"causes some revisions to be skipped, i.e. if the destination branch does\n"
2610
"not already contain revision BASE, such a merge is commonly referred to as\n"
2611
"a \"cherrypick\". Unlike a normal merge, Bazaar does not currently track\n"
2612
"cherrypicks. The changes look like a normal commit, and the history of the\n"
2613
"changes from the other branch is not stored in the commit."
2614
msgstr ""
2615
2616
#: bzrlib/builtins.py:4259
2617
msgid "Revision numbers are always relative to the source branch."
2618
msgstr ""
2619
2620
#: bzrlib/builtins.py:4261 bzrlib/conflicts.py:52 bzrlib/conflicts.py:106
2621
msgid ""
2622
"Merge will do its best to combine the changes in two branches, but there\n"
2623
"are some kinds of problems only a human can fix. When it encounters those,\n"
2624
"it will mark a conflict. A conflict means that you need to fix something,\n"
2625
"before you can commit."
2626
msgstr ""
2627
2628
#: bzrlib/builtins.py:4266
2629
msgid ""
2630
"Use bzr resolve when you have fixed a problem. See also bzr conflicts."
2631
msgstr ""
2632
2633
#: bzrlib/builtins.py:4268
2634
msgid ""
2635
"If there is no default branch set, the first merge will set it (use\n"
2636
"--no-remember to avoid setting it). After that, you can omit the branch\n"
2637
"to use the default. To change the default, use --remember. The value will\n"
2638
"only be saved if the remote location can be accessed."
2639
msgstr ""
2640
2641
#: bzrlib/builtins.py:4273
2642
msgid ""
2643
"The results of the merge are placed into the destination working\n"
2644
"directory, where they can be reviewed (with bzr diff), tested, and then\n"
2645
"committed to record the result of the merge."
2646
msgstr ""
2647
2648
#: bzrlib/builtins.py:4277
2649
msgid ""
2650
"merge refuses to run if there are any uncommitted changes, unless\n"
2651
"--force is given. If --force is given, then the changes from the source \n"
2652
"will be merged with the current working tree, including any uncommitted\n"
2653
"changes in the tree. The --force option can also be used to create a\n"
2654
"merge revision which has more than two parents."
2655
msgstr ""
2656
2657
#: bzrlib/builtins.py:4283
2658
msgid ""
2659
"If one would like to merge changes from the working tree of the other\n"
2660
"branch without merging any committed revisions, the --uncommitted option\n"
2661
"can be given."
2662
msgstr ""
2663
2664
#: bzrlib/builtins.py:4287
2665
msgid ""
2666
"To select only some changes to merge, use \"merge -i\", which will prompt\n"
2667
"you to apply each diff hunk and file change, similar to \"shelve\"."
2668
msgstr ""
2669
2670
#: bzrlib/builtins.py:4290
2671
msgid ""
2672
":Examples:\n"
2673
" To merge all new revisions from bzr.dev::"
2674
msgstr ""
2675
2676
#: bzrlib/builtins.py:4293
2677
msgid " bzr merge ../bzr.dev"
2678
msgstr ""
2679
2680
#: bzrlib/builtins.py:4295
2681
msgid " To merge changes up to and including revision 82 from bzr.dev::"
2682
msgstr ""
2683
2684
#: bzrlib/builtins.py:4297
2685
msgid " bzr merge -r 82 ../bzr.dev"
2686
msgstr ""
2687
2688
#: bzrlib/builtins.py:4299
2689
msgid " To merge the changes introduced by 82, without previous changes::"
2690
msgstr ""
2691
2692
#: bzrlib/builtins.py:4301
2693
msgid " bzr merge -r 81..82 ../bzr.dev"
2694
msgstr ""
2695
2696
#: bzrlib/builtins.py:4303
2697
msgid " To apply a merge directive contained in /tmp/merge::"
2698
msgstr ""
2699
2700
#: bzrlib/builtins.py:4305
2701
msgid " bzr merge /tmp/merge"
2702
msgstr ""
2703
2704
#: bzrlib/builtins.py:4307
2705
msgid ""
2706
" To create a merge revision with three parents from two branches\n"
2707
" feature1a and feature1b:"
2708
msgstr ""
2709
2710
#: bzrlib/builtins.py:4310
2711
msgid ""
2712
" bzr merge ../feature1a\n"
2713
" bzr merge ../feature1b --force\n"
2714
" bzr commit -m 'revision with three parents'"
2715
msgstr ""
2716
2717
#: bzrlib/builtins.py:4322
2718
msgid "Merge even if the destination tree has uncommitted changes."
2719
msgstr ""
2720
2721
#: bzrlib/builtins.py:4328
2722
msgid ""
2723
"Apply uncommitted changes from a working copy, instead of branch changes."
2724
msgstr ""
2725
2726
#: bzrlib/builtins.py:4330
2727
msgid ""
2728
"If the destination is already completely merged into the source, pull from "
2729
"the source rather than merging. When this happens, you do not need to "
2730
"commit the result."
2731
msgstr ""
2732
2733
#: bzrlib/builtins.py:4335
2734
msgid ""
2735
"Branch to merge into, rather than the one containing the working directory."
2736
msgstr ""
2737
2738
#: bzrlib/builtins.py:4337
2739
msgid "Instead of merging, show a diff of the merge."
2740
msgstr ""
2741
2742
#: bzrlib/builtins.py:4339
2743
msgid "Select changes interactively."
2744
msgstr ""
2745
2746
#: bzrlib/builtins.py:4361
2747
msgid ""
2748
"Merging into empty branches not currently supported, "
2749
"https://bugs.launchpad.net/bzr/+bug/308562"
2750
msgstr ""
2751
2752
#: bzrlib/builtins.py:4388
2753
msgid "Cannot use --uncommitted with bundles or merge directives."
2754
msgstr ""
2755
2756
#: bzrlib/builtins.py:4399
2757
msgid "Cannot use --uncommitted and --revision at the same time."
2758
msgstr ""
2759
2760
#: bzrlib/builtins.py:4419
2761
msgid "merger: "
2762
msgstr ""
2763
2764
#: bzrlib/builtins.py:4421 bzrlib/bundle/apply_bundle.py:71
2765
msgid "Nothing to do."
2766
msgstr ""
2767
2768
#: bzrlib/builtins.py:4425
2769
msgid "Cannot pull individual files"
2770
msgstr ""
2771
2772
#: bzrlib/builtins.py:4433
2773
msgid "This branch has no commits. (perhaps you would prefer 'bzr pull')"
2774
msgstr ""
2775
2776
#: bzrlib/builtins.py:4491
2777
#, python-format
2778
msgid "Show-base is not supported for this merge type. %s"
2779
msgstr ""
2780
2781
#: bzrlib/builtins.py:4500
2782
#, python-format
2783
msgid "Conflict reduction is not supported for merge type %s."
2784
msgstr ""
2785
2786
#: bzrlib/builtins.py:4504
2787
msgid "Cannot do conflict reduction and show base."
2788
msgstr ""
2789
2790
#: bzrlib/builtins.py:4615
2791
msgid "No location specified or remembered"
2792
msgstr ""
2793
2794
#: bzrlib/builtins.py:4617
2795
msgid "{0} remembered {1} location {2}"
2796
msgstr ""
2797
2798
#: bzrlib/builtins.py:4623
2799
msgid "Redo a merge."
2800
msgstr ""
2801
2802
#: bzrlib/builtins.py:4625
2803
msgid ""
2804
"Use this if you want to try a different merge technique while resolving\n"
2805
"conflicts. Some merge techniques are better than others, and remerge\n"
2806
"lets you try different ones on different files."
2807
msgstr ""
2808
2809
#: bzrlib/builtins.py:4629
2810
msgid ""
2811
"The options for remerge have the same meaning and defaults as the ones for\n"
2812
"merge. The difference is that remerge can (only) be run when there is a\n"
2813
"pending merge, and it lets you specify particular files."
2814
msgstr ""
2815
2816
#: bzrlib/builtins.py:4633
2817
msgid ""
2818
":Examples:\n"
2819
" Re-do the merge of all conflicted files, and show the base text in\n"
2820
" conflict regions, in addition to the usual THIS and OTHER texts::"
2821
msgstr ""
2822
2823
#: bzrlib/builtins.py:4637
2824
msgid " bzr remerge --show-base"
2825
msgstr ""
2826
2827
#: bzrlib/builtins.py:4639
2828
msgid ""
2829
" Re-do the merge of \"foobar\", using the weave merge algorithm, with\n"
2830
" additional processing to reduce the size of conflict regions::"
2831
msgstr ""
2832
2833
#: bzrlib/builtins.py:4642
2834
msgid " bzr remerge --merge-type weave --reprocess foobar"
2835
msgstr ""
2836
2837
#: bzrlib/builtins.py:4649
2838
msgid "Show base revision text in conflicts."
2839
msgstr ""
2840
2841
#: bzrlib/builtins.py:4661
2842
msgid ""
2843
"Sorry, remerge only works after normal merges. Not cherrypicking or multi-"
2844
"merges."
2845
msgstr ""
2846
2847
#: bzrlib/builtins.py:4717
2848
msgid "Revert files to a previous revision."
2849
msgstr ""
2850
2851
#: bzrlib/builtins.py:4719
2852
msgid ""
2853
"Giving a list of files will revert only those files. Otherwise, all files\n"
2854
"will be reverted. If the revision is not specified with '--revision', the\n"
2855
"last committed revision is used."
2856
msgstr ""
2857
2858
#: bzrlib/builtins.py:4723
2859
msgid ""
2860
"To remove only some changes, without reverting to a prior version, use\n"
2861
"merge instead. For example, \"merge . -r -2..-3\" (don't forget the \".\")\n"
2862
"will remove the changes introduced by the second last commit (-2), without\n"
2863
"affecting the changes introduced by the last commit (-1). To remove\n"
2864
"certain changes on a hunk-by-hunk basis, see the shelve command."
2865
msgstr ""
2866
2867
#: bzrlib/builtins.py:4729
2868
msgid ""
2869
"By default, any files that have been manually changed will be backed up\n"
2870
"first. (Files changed only by merge are not backed up.) Backup files have\n"
2871
"'.~#~' appended to their name, where # is a number."
2872
msgstr ""
2873
2874
#: bzrlib/builtins.py:4733
2875
msgid ""
2876
"When you provide files, you can use their current pathname or the pathname\n"
2877
"from the target revision. So you can use revert to \"undelete\" a file by\n"
2878
"name. If you name a directory, all the contents of that directory will be\n"
2879
"reverted."
2880
msgstr ""
2881
2882
#: bzrlib/builtins.py:4738
2883
msgid ""
2884
"If you have newly added files since the target revision, they will be\n"
2885
"removed. If the files to be removed have been changed, backups will be\n"
2886
"created as above. Directories containing unknown files will not be\n"
2887
"deleted."
2888
msgstr ""
2889
2890
#: bzrlib/builtins.py:4743
2891
msgid ""
2892
"The working tree contains a list of revisions that have been merged but\n"
2893
"not yet committed. These revisions will be included as additional parents\n"
2894
"of the next commit. Normally, using revert clears that list as well as\n"
2895
"reverting the files. If any files are specified, revert leaves the list\n"
2896
"of uncommitted merges alone and reverts only the files. Use ``bzr revert\n"
2897
".`` in the tree root to revert all files but keep the recorded merges,\n"
2898
"and ``bzr revert --forget-merges`` to clear the pending merge list without\n"
2899
"reverting any files."
2900
msgstr ""
2901
2902
#: bzrlib/builtins.py:4752
2903
msgid ""
2904
"Using \"bzr revert --forget-merges\", it is possible to apply all of the\n"
2905
"changes from a branch in a single revision. To do this, perform the merge\n"
2906
"as desired. Then doing revert with the \"--forget-merges\" option will "
2907
"keep\n"
2908
"the content of the tree as it was, but it will clear the list of pending\n"
2909
"merges. The next commit will then contain all of the changes that are\n"
2910
"present in the other branch, but without any other parent revisions.\n"
2911
"Because this technique forgets where these changes originated, it may\n"
2912
"cause additional conflicts on later merges involving the same source and\n"
2913
"target branches."
2914
msgstr ""
2915
2916
#: bzrlib/builtins.py:4766
2917
msgid "Do not save backups of reverted files."
2918
msgstr ""
2919
2920
#: bzrlib/builtins.py:4768
2921
msgid "Remove pending merge marker, without changing any files."
2922
msgstr ""
2923
2924
#: bzrlib/builtins.py:4799
2925
msgid ""
2926
"Show help on a command or other topic.\n"
2927
" "
2928
msgstr ""
2929
2930
#: bzrlib/builtins.py:4804
2931
msgid "Show help on all commands."
2932
msgstr ""
2933
2934
#: bzrlib/builtins.py:4833
2935
msgid "Show unmerged/unpulled revisions between two branches."
2936
msgstr ""
2937
2938
#: bzrlib/builtins.py:4835
2939
msgid "OTHER_BRANCH may be local or remote."
2940
msgstr ""
2941
2942
#: bzrlib/builtins.py:4837
2943
msgid ""
2944
"To filter on a range of revisions, you can use the command -r begin..end\n"
2945
"-r revision requests a specific revision, -r ..end or -r begin.. are\n"
2946
"also valid.\n"
2947
" \n"
2948
":Exit values:\n"
2949
" 1 - some missing revisions\n"
2950
" 0 - no missing revisions"
2951
msgstr ""
2952
2953
#: bzrlib/builtins.py:4847
2954
msgid ""
2955
" Determine the missing revisions between this and the branch at the\n"
2956
" remembered pull location::"
2957
msgstr ""
2958
2959
#: bzrlib/builtins.py:4850
2960
msgid " bzr missing"
2961
msgstr ""
2962
2963
#: bzrlib/builtins.py:4852
2964
msgid " Determine the missing revisions between this and another branch::"
2965
msgstr ""
2966
2967
#: bzrlib/builtins.py:4854
2968
msgid " bzr missing http://server/branch"
2969
msgstr ""
2970
2971
#: bzrlib/builtins.py:4856
2972
msgid ""
2973
" Determine the missing revisions up to a specific revision on the other\n"
2974
" branch::"
2975
msgstr ""
2976
2977
#: bzrlib/builtins.py:4859
2978
msgid " bzr missing -r ..-10"
2979
msgstr ""
2980
2981
#: bzrlib/builtins.py:4861
2982
msgid ""
2983
" Determine the missing revisions up to a specific revision on this\n"
2984
" branch::"
2985
msgstr ""
2986
2987
#: bzrlib/builtins.py:4864
2988
msgid " bzr missing --my-revision ..-10"
2989
msgstr ""
2990
2991
#: bzrlib/builtins.py:4871
2992
msgid "Reverse the order of revisions."
2993
msgstr ""
2994
2995
#: bzrlib/builtins.py:4873
2996
msgid "Display changes in the local branch only."
2997
msgstr ""
2998
2999
#: bzrlib/builtins.py:4874
3000
msgid "Same as --mine-only."
3001
msgstr ""
3002
3003
#: bzrlib/builtins.py:4876
3004
msgid "Display changes in the remote branch only."
3005
msgstr ""
3006
3007
#: bzrlib/builtins.py:4877
3008
msgid "Same as --theirs-only."
3009
msgstr ""
3010
3011
#: bzrlib/builtins.py:4882
3012
msgid ""
3013
"Filter on other branch revisions (inclusive). See \"help revisionspec\" for "
3014
"details."
3015
msgstr ""
3016
3017
#: bzrlib/builtins.py:4886
3018
msgid ""
3019
"Filter on local branch revisions (inclusive). See \"help revisionspec\" for "
3020
"details."
3021
msgstr ""
3022
3023
#: bzrlib/builtins.py:4889
3024
msgid "Show all revisions in addition to the mainline ones."
3025
msgstr ""
3026
3027
#: bzrlib/builtins.py:4943
3028
msgid "No peer location known or specified."
3029
msgstr ""
3030
3031
#: bzrlib/builtins.py:4947
3032
msgid "Using saved parent location: {0}\n"
3033
msgstr ""
3034
3035
#: bzrlib/builtins.py:4980
3036
#, python-format
3037
msgid "You have %d extra revision:\n"
3038
msgid_plural "You have %d extra revisions:\n"
3039
msgstr[0] ""
3040
msgstr[1] ""
3041
3042
#: bzrlib/builtins.py:4996
3043
#, python-format
3044
msgid "You are missing %d revision:\n"
3045
msgid_plural "You are missing %d revisions:\n"
3046
msgstr[0] ""
3047
msgstr[1] ""
3048
3049
#: bzrlib/builtins.py:5008
3050
msgid "This branch has no new revisions.\n"
3051
msgstr ""
3052
3053
#: bzrlib/builtins.py:5011
3054
msgid "Other branch has no new revisions.\n"
3055
msgstr ""
3056
3057
#: bzrlib/builtins.py:5016
3058
msgid "Branches are up to date.\n"
3059
msgstr ""
3060
3061
#: bzrlib/builtins.py:5027
3062
msgid "Compress the data within a repository."
3063
msgstr ""
3064
3065
#: bzrlib/builtins.py:5029
3066
msgid ""
3067
"This operation compresses the data within a bazaar repository. As\n"
3068
"bazaar supports automatic packing of repository, this operation is\n"
3069
"normally not required to be done manually."
3070
msgstr ""
3071
3072
#: bzrlib/builtins.py:5033
3073
msgid ""
3074
"During the pack operation, bazaar takes a backup of existing repository\n"
3075
"data, i.e. pack files. This backup is eventually removed by bazaar\n"
3076
"automatically when it is safe to do so. To save disk space by removing\n"
3077
"the backed up pack files, the --clean-obsolete-packs option may be\n"
3078
"used."
3079
msgstr ""
3080
3081
#: bzrlib/builtins.py:5039
3082
msgid ""
3083
"Warning: If you use --clean-obsolete-packs and your machine crashes\n"
3084
"during or immediately after repacking, you may be left with a state\n"
3085
"where the deletion has been written to disk but the new packs have not\n"
3086
"been. In this case the repository may be unusable."
3087
msgstr ""
3088
3089
#: bzrlib/builtins.py:5048
3090
msgid "Delete obsolete packs to save disk space."
3091
msgstr ""
3092
3093
#: bzrlib/builtins.py:5062
3094
msgid "List the installed plugins."
3095
msgstr ""
3096
3097
#: bzrlib/builtins.py:5064
3098
msgid ""
3099
"This command displays the list of installed plugins including\n"
3100
"version of plugin and a short description of each."
3101
msgstr ""
3102
3103
#: bzrlib/builtins.py:5067
3104
msgid "--verbose shows the path where each plugin is located."
3105
msgstr ""
3106
3107
#: bzrlib/builtins.py:5069
3108
msgid ""
3109
"A plugin is an external component for Bazaar that extends the\n"
3110
"revision control system, by adding or replacing code in Bazaar.\n"
3111
"Plugins can do a variety of things, including overriding commands,\n"
3112
"adding new commands, providing additional network transports and\n"
3113
"customizing log output."
3114
msgstr ""
3115
3116
#: bzrlib/builtins.py:5075
3117
msgid ""
3118
"See the Bazaar Plugin Guide <http://doc.bazaar.canonical.com/plugins/en/>\n"
3119
"for further information on plugins including where to find them and how to\n"
3120
"install them. Instructions are also provided there on how to write new\n"
3121
"plugins using the Python programming language."
3122
msgstr ""
3123
3124
#: bzrlib/builtins.py:5091
3125
msgid "Show testament (signing-form) of a revision."
3126
msgstr ""
3127
3128
#: bzrlib/builtins.py:5094
3129
msgid "Produce long-format testament."
3130
msgstr ""
3131
3132
#: bzrlib/builtins.py:5096
3133
msgid "Produce a strict-format testament."
3134
msgstr ""
3135
3136
#: bzrlib/builtins.py:5122
3137
msgid "Show the origin of each line in a file."
3138
msgstr ""
3139
3140
#: bzrlib/builtins.py:5124
3141
msgid ""
3142
"This prints out the given file with an annotation on the left side\n"
3143
"indicating which revision, author and date introduced the change."
3144
msgstr ""
3145
3146
#: bzrlib/builtins.py:5127
3147
msgid ""
3148
"If the origin is the same for a run of consecutive lines, it is\n"
3149
"shown only at the top, unless the --all option is given."
3150
msgstr ""
3151
3152
#: bzrlib/builtins.py:5135
3153
msgid "Show annotations on all lines."
3154
msgstr ""
3155
3156
#: bzrlib/builtins.py:5136
3157
msgid "Show commit date in annotations."
3158
msgstr ""
3159
3160
#: bzrlib/builtins.py:5223
3161
msgid "Cannot sign a range of non-revision-history revisions"
3162
msgstr ""
3163
3164
#: bzrlib/builtins.py:5235
3165
msgid "Please supply either one revision, or a range."
3166
msgstr ""
3167
3168
#: bzrlib/builtins.py:5239
3169
msgid ""
3170
"Convert the current branch into a checkout of the supplied branch.\n"
3171
"If no branch is supplied, rebind to the last bound location."
3172
msgstr ""
3173
3174
#: bzrlib/builtins.py:5242
3175
msgid ""
3176
"Once converted into a checkout, commits must succeed on the master branch\n"
3177
"before they will be applied to the local branch."
3178
msgstr ""
3179
3180
#: bzrlib/builtins.py:5245
3181
msgid ""
3182
"Bound branches use the nickname of its master branch unless it is set\n"
3183
"locally, in which case binding will update the local nickname to be\n"
3184
"that of the master."
3185
msgstr ""
3186
3187
#: bzrlib/builtins.py:5260
3188
msgid "No location supplied. This format does not remember old locations."
3189
msgstr ""
3190
3191
#: bzrlib/builtins.py:5265
3192
msgid "Branch is already bound"
3193
msgstr ""
3194
3195
#: bzrlib/builtins.py:5267
3196
msgid "No location supplied and no previous location known"
3197
msgstr ""
3198
3199
#: bzrlib/builtins.py:5273
3200
msgid "These branches have diverged. Try merging, and then bind again."
3201
msgstr ""
3202
3203
#: bzrlib/builtins.py:5280
3204
msgid "Convert the current checkout into a regular branch."
3205
msgstr ""
3206
3207
#: bzrlib/builtins.py:5282
3208
msgid ""
3209
"After unbinding, the local branch is considered independent and subsequent\n"
3210
"commits will be local only."
3211
msgstr ""
3212
3213
#: bzrlib/builtins.py:5293
3214
msgid "Local branch is not bound"
3215
msgstr ""
3216
3217
#: bzrlib/builtins.py:5297
3218
msgid "Remove the last committed revision."
3219
msgstr ""
3220
3221
#: bzrlib/builtins.py:5299
3222
msgid ""
3223
"--verbose will print out what is being removed.\n"
3224
"--dry-run will go through all the motions, but not actually\n"
3225
"remove anything."
3226
msgstr ""
3227
3228
#: bzrlib/builtins.py:5303
3229
msgid ""
3230
"If --revision is specified, uncommit revisions to leave the branch at the\n"
3231
"specified revision. For example, \"bzr uncommit -r 15\" will leave the\n"
3232
"branch at revision 15."
3233
msgstr ""
3234
3235
#: bzrlib/builtins.py:5307
3236
msgid ""
3237
"Uncommit leaves the working tree ready for a new commit. The only change\n"
3238
"it may make is to restore any pending merges that were present before\n"
3239
"the commit."
3240
msgstr ""
3241
3242
#: bzrlib/builtins.py:5318
3243
msgid "Don't actually make changes."
3244
msgstr ""
3245
3246
#: bzrlib/builtins.py:5319
3247
msgid "Say yes to all questions."
3248
msgstr ""
3249
3250
#: bzrlib/builtins.py:5321
3251
msgid "Keep tags that point to removed revisions."
3252
msgstr ""
3253
3254
#: bzrlib/builtins.py:5323
3255
msgid "Only remove the commits from the local branch when in a checkout."
3256
msgstr ""
3257
3258
#: bzrlib/builtins.py:5372
3259
msgid "No revisions to uncommit.\n"
3260
msgstr ""
3261
3262
#: bzrlib/builtins.py:5387
3263
msgid "Dry-run, pretending to remove the above revisions.\n"
3264
msgstr ""
3265
3266
#: bzrlib/builtins.py:5390
3267
msgid "The above revision(s) will be removed.\n"
3268
msgstr ""
3269
3270
#: bzrlib/builtins.py:5394
3271
msgid "Uncommit these revisions"
3272
msgstr ""
3273
3274
#: bzrlib/builtins.py:5397
3275
msgid "Canceled\n"
3276
msgstr ""
3277
3278
#: bzrlib/builtins.py:5404
3279
#, python-format
3280
msgid ""
3281
"You can restore the old tip by running:\n"
3282
" bzr pull . -r revid:%s\n"
3283
msgstr ""
3284
3285
#: bzrlib/builtins.py:5409
3286
msgid "Break a dead lock."
3287
msgstr ""
3288
3289
#: bzrlib/builtins.py:5411
3290
msgid ""
3291
"This command breaks a lock on a repository, branch, working directory or\n"
3292
"config file."
3293
msgstr ""
3294
3295
#: bzrlib/builtins.py:5414
3296
msgid ""
3297
"CAUTION: Locks should only be broken when you are sure that the process\n"
3298
"holding the lock has been stopped."
3299
msgstr ""
3300
3301
#: bzrlib/builtins.py:5417
3302
msgid ""
3303
"You can get information on what locks are open via the 'bzr info\n"
3304
"[location]' command."
3305
msgstr ""
3306
3307
#: bzrlib/builtins.py:5420
3308
msgid ""
3309
":Examples:\n"
3310
" bzr break-lock\n"
3311
" bzr break-lock bzr+ssh://example.com/bzr/foo\n"
3312
" bzr break-lock --conf ~/.bazaar"
3313
msgstr ""
3314
3315
#: bzrlib/builtins.py:5429
3316
msgid "LOCATION is the directory where the config lock is."
3317
msgstr ""
3318
3319
#: bzrlib/builtins.py:5431
3320
msgid "Do not ask for confirmation before breaking the lock."
3321
msgstr ""
3322
3323
#: bzrlib/builtins.py:5466
3324
msgid "The Bazaar smart server protocol over TCP. (default port: 4155)"
3325
msgstr ""
3326
3327
#: bzrlib/builtins.py:5467
3328
msgid "Run the bzr server."
3329
msgstr ""
3330
3331
#: bzrlib/builtins.py:5473
3332
msgid "Serve on stdin/out for use from inetd or sshd."
3333
msgstr ""
3334
3335
#: bzrlib/builtins.py:5474
3336
msgid "protocol"
3337
msgstr ""
3338
3339
#: bzrlib/builtins.py:5475
3340
msgid "Protocol to serve."
3341
msgstr ""
3342
3343
#: bzrlib/builtins.py:5479
3344
msgid ""
3345
"Listen for connections on nominated port of the form [hostname:]portnumber. "
3346
"Passing 0 as the port number will result in a dynamically allocated port. "
3347
"The default port depends on the protocol."
3348
msgstr ""
3349
3350
#: bzrlib/builtins.py:5485
3351
msgid "Serve contents of this directory."
3352
msgstr ""
3353
3354
#: bzrlib/builtins.py:5487
3355
msgid ""
3356
"By default the server is a readonly server. Supplying --allow-writes "
3357
"enables write access to the contents of the served directory and below. "
3358
"Note that ``bzr serve`` does not perform authentication, so unless some form "
3359
"of external authentication is arranged supplying this option leads to global "
3360
"uncontrolled write access to your file system."
3361
msgstr ""
3362
3363
#: bzrlib/builtins.py:5496
3364
msgid "Override the default idle client timeout (5min)."
3365
msgstr ""
3366
3367
#: bzrlib/builtins.py:5546
3368
msgid "Combine a tree into its containing tree."
3369
msgstr ""
3370
3371
#: bzrlib/builtins.py:5548
3372
msgid "This command requires the target tree to be in a rich-root format."
3373
msgstr ""
3374
3375
#: bzrlib/builtins.py:5550
3376
msgid ""
3377
"The TREE argument should be an independent tree, inside another tree, but\n"
3378
"not part of it. (Such trees can be produced by \"bzr split\", but also by\n"
3379
"running \"bzr branch\" with the target inside a tree.)"
3380
msgstr ""
3381
3382
#: bzrlib/builtins.py:5554
3383
msgid ""
3384
"The result is a combined tree, with the subtree no longer an independent\n"
3385
"part. This is marked as a merge of the subtree into the containing tree,\n"
3386
"and all history is preserved."
3387
msgstr ""
3388
3389
#: bzrlib/builtins.py:5572
3390
#, python-format
3391
msgid ""
3392
"Can't join trees because %s doesn't support rich root data.\n"
3393
"You can use bzr upgrade on the repository."
3394
msgstr ""
3395
3396
#: bzrlib/builtins.py:5582 bzrlib/builtins.py:5588
3397
msgid "Cannot join {0}. {1}"
3398
msgstr ""
3399
3400
#: bzrlib/builtins.py:5592
3401
msgid "Split a subdirectory of a tree into a separate tree."
3402
msgstr ""
3403
3404
#: bzrlib/builtins.py:5594
3405
msgid ""
3406
"This command will produce a target tree in a format that supports\n"
3407
"rich roots, like 'rich-root' or 'rich-root-pack'. These formats cannot be\n"
3408
"converted into earlier formats like 'dirstate-tags'."
3409
msgstr ""
3410
3411
#: bzrlib/builtins.py:5598
3412
msgid ""
3413
"The TREE argument should be a subdirectory of a working tree. That\n"
3414
"subdirectory will be converted into an independent tree, with its own\n"
3415
"branch. Commits in the top-level tree will not apply to the new subtree."
3416
msgstr ""
3417
3418
#: bzrlib/builtins.py:5678
3419
msgid "No submit branch specified or known"
3420
msgstr ""
3421
3422
#: bzrlib/builtins.py:5686 bzrlib/send.py:108
3423
msgid "No public branch specified or known"
3424
msgstr ""
3425
3426
#: bzrlib/builtins.py:5691
3427
msgid "bzr merge-directive takes at most two one revision identifiers"
3428
msgstr ""
3429
3430
#: bzrlib/builtins.py:5700
3431
msgid "No revisions to bundle."
3432
msgstr ""
3433
3434
#: bzrlib/builtins.py:5719
3435
msgid "Mail or create a merge-directive for submitting changes."
3436
msgstr ""
3437
3438
#: bzrlib/builtins.py:5721
3439
msgid "A merge directive provides many things needed for requesting merges:"
3440
msgstr ""
3441
3442
#: bzrlib/builtins.py:5723
3443
msgid "* A machine-readable description of the merge to perform"
3444
msgstr ""
3445
3446
#: bzrlib/builtins.py:5725
3447
msgid "* An optional patch that is a preview of the changes requested"
3448
msgstr ""
3449
3450
#: bzrlib/builtins.py:5727
3451
msgid ""
3452
"* An optional bundle of revision data, so that the changes can be applied\n"
3453
" directly from the merge directive, without retrieving data from a\n"
3454
" branch."
3455
msgstr ""
3456
3457
#: bzrlib/builtins.py:5731
3458
msgid ""
3459
"`bzr send` creates a compact data set that, when applied using bzr\n"
3460
"merge, has the same effect as merging from the source branch. "
3461
msgstr ""
3462
3463
#: bzrlib/builtins.py:5734
3464
msgid ""
3465
"By default the merge directive is self-contained and can be applied to any\n"
3466
"branch containing submit_branch in its ancestory without needing access to\n"
3467
"the source branch."
3468
msgstr ""
3469
3470
#: bzrlib/builtins.py:5738
3471
msgid ""
3472
"If --no-bundle is specified, then Bazaar doesn't send the contents of the\n"
3473
"revisions, but only a structured request to merge from the\n"
3474
"public_location. In that case the public_branch is needed and it must be\n"
3475
"up-to-date and accessible to the recipient. The public_branch is always\n"
3476
"included if known, so that people can check it later."
3477
msgstr ""
3478
3479
#: bzrlib/builtins.py:5744
3480
msgid ""
3481
"The submit branch defaults to the parent of the source branch, but can be\n"
3482
"overridden. Both submit branch and public branch will be remembered in\n"
3483
"branch.conf the first time they are used for a particular branch. The\n"
3484
"source branch defaults to that containing the working directory, but can\n"
3485
"be changed using --from."
3486
msgstr ""
3487
3488
#: bzrlib/builtins.py:5750
3489
msgid ""
3490
"Both the submit branch and the public branch follow the usual behavior with\n"
3491
"respect to --remember: If there is no default location set, the first send\n"
3492
"will set it (use --no-remember to avoid setting it). After that, you can\n"
3493
"omit the location to use the default. To change the default, use\n"
3494
"--remember. The value will only be saved if the location can be accessed."
3495
msgstr ""
3496
3497
#: bzrlib/builtins.py:5756
3498
msgid ""
3499
"In order to calculate those changes, bzr must analyse the submit branch.\n"
3500
"Therefore it is most efficient for the submit branch to be a local mirror.\n"
3501
"If a public location is known for the submit_branch, that location is used\n"
3502
"in the merge directive."
3503
msgstr ""
3504
3505
#: bzrlib/builtins.py:5761
3506
msgid ""
3507
"The default behaviour is to send the merge directive by mail, unless -o is\n"
3508
"given, in which case it is sent to a file."
3509
msgstr ""
3510
3511
#: bzrlib/builtins.py:5764
3512
msgid ""
3513
"Mail is sent using your preferred mail program. This should be transparent\n"
3514
"on Windows (it uses MAPI). On Unix, it requires the xdg-email utility.\n"
3515
"If the preferred client can't be found (or used), your editor will be used."
3516
msgstr ""
3517
3518
#: bzrlib/builtins.py:5768
3519
msgid ""
3520
"To use a specific mail program, set the mail_client configuration option.\n"
3521
"(For Thunderbird 1.5, this works around some bugs.) Supported values for\n"
3522
"specific clients are \"claws\", \"evolution\", \"kmail\", \"mail.app\" "
3523
"(MacOS X's\n"
3524
"Mail.app), \"mutt\", and \"thunderbird\"; generic options are \"default\",\n"
3525
"\"editor\", \"emacsclient\", \"mapi\", and \"xdg-email\". Plugins may also "
3526
"add\n"
3527
"supported clients."
3528
msgstr ""
3529
3530
#: bzrlib/builtins.py:5775
3531
msgid ""
3532
"If mail is being sent, a to address is required. This can be supplied\n"
3533
"either on the commandline, by setting the submit_to configuration\n"
3534
"option in the branch itself or the child_submit_to configuration option\n"
3535
"in the submit branch."
3536
msgstr ""
3537
3538
#: bzrlib/builtins.py:5780
3539
msgid ""
3540
"Two formats are currently supported: \"4\" uses revision bundle format 4 "
3541
"and\n"
3542
"merge directive format 2. It is significantly faster and smaller than\n"
3543
"older formats. It is compatible with Bazaar 0.19 and later. It is the\n"
3544
"default. \"0.9\" uses revision bundle format 0.9 and merge directive\n"
3545
"format 1. It is compatible with Bazaar 0.12 - 0.18."
3546
msgstr ""
3547
3548
#: bzrlib/builtins.py:5786
3549
msgid ""
3550
"The merge directives created by bzr send may be applied using bzr merge or\n"
3551
"bzr pull by specifying a file containing a merge directive as the location."
3552
msgstr ""
3553
3554
#: bzrlib/builtins.py:5789
3555
msgid ""
3556
"bzr send makes extensive use of public locations to map local locations "
3557
"into\n"
3558
"URLs that can be used by other people. See `bzr help configuration` to\n"
3559
"set them, and use `bzr info` to display them."
3560
msgstr ""
3561
3562
#: bzrlib/builtins.py:5813
3563
msgid "Write merge directive to this file or directory; use - for stdout."
3564
msgstr ""
3565
3566
#: bzrlib/builtins.py:5817
3567
msgid ""
3568
"Refuse to send if there are uncommitted changes in the working tree, --no-"
3569
"strict disables the check."
3570
msgstr ""
3571
3572
#: bzrlib/builtins.py:5819
3573
msgid "Mail the request to this address."
3574
msgstr ""
3575
3576
#: bzrlib/builtins.py:5823
3577
msgid "Body for the email."
3578
msgstr ""
3579
3580
#: bzrlib/builtins.py:5876
3581
msgid "Do not include a bundle in the merge directive."
3582
msgstr ""
3583
3584
#: bzrlib/builtins.py:5877
3585
msgid "Do not include a preview patch in the merge directive."
3586
msgstr ""
3587
3588
#: bzrlib/builtins.py:5880
3589
msgid "Remember submit and public branch."
3590
msgstr ""
3591
3592
#: bzrlib/builtins.py:5882
3593
msgid ""
3594
"Branch to generate the submission from, rather than the one containing the "
3595
"working directory."
3596
msgstr ""
3597
3598
#: bzrlib/builtins.py:5892 bzrlib/cmd_version_info.py:76
3599
msgid "format"
3600
msgstr ""
3601
3602
#: bzrlib/builtins.py:5893
3603
msgid "Use the specified output format."
3604
msgstr ""
3605
3606
#: bzrlib/builtins.py:5915
3607
msgid "Create, remove or modify a tag naming a revision."
3608
msgstr ""
3609
3610
#: bzrlib/builtins.py:5917
3611
msgid ""
3612
"Tags give human-meaningful names to revisions. Commands that take a -r\n"
3613
"(--revision) option can be given -rtag:X, where X is any previously\n"
3614
"created tag."
3615
msgstr ""
3616
3617
#: bzrlib/builtins.py:5921
3618
msgid ""
3619
"Tags are stored in the branch. Tags are copied from one branch to another\n"
3620
"along when you branch, push, pull or merge."
3621
msgstr ""
3622
3623
#: bzrlib/builtins.py:5924
3624
msgid ""
3625
"It is an error to give a tag name that already exists unless you pass\n"
3626
"--force, in which case the tag is moved to point to the new revision."
3627
msgstr ""
3628
3629
#: bzrlib/builtins.py:5927
3630
msgid ""
3631
"To rename a tag (change the name but keep it on the same revsion), run "
3632
"``bzr\n"
3633
"tag new-name -r tag:old-name`` and then ``bzr tag --delete oldname``."
3634
msgstr ""
3635
3636
#: bzrlib/builtins.py:5930
3637
msgid ""
3638
"If no tag name is specified it will be determined through the \n"
3639
"'automatic_tag_name' hook. This can e.g. be used to automatically tag\n"
3640
"upstream releases by reading configure.ac. See ``bzr help hooks`` for\n"
3641
"details."
3642
msgstr ""
3643
3644
#: bzrlib/builtins.py:5940
3645
msgid "Delete this tag rather than placing it."
3646
msgstr ""
3647
3648
#: bzrlib/builtins.py:5943
3649
msgid "Branch in which to place the tag."
3650
msgstr ""
3651
3652
#: bzrlib/builtins.py:5945
3653
msgid "Replace existing tags."
3654
msgstr ""
3655
3656
#: bzrlib/builtins.py:5960
3657
msgid "No tag specified to delete."
3658
msgstr ""
3659
3660
#: bzrlib/builtins.py:5962
3661
#, python-format
3662
msgid "Deleted tag %s."
3663
msgstr ""
3664
3665
#: bzrlib/builtins.py:5976
3666
msgid "Please specify a tag name."
3667
msgstr ""
3668
3669
#: bzrlib/builtins.py:5984
3670
#, python-format
3671
msgid "Tag %s already exists for that revision."
3672
msgstr ""
3673
3674
#: bzrlib/builtins.py:5988
3675
#, python-format
3676
msgid "Created tag %s."
3677
msgstr ""
3678
3679
#: bzrlib/builtins.py:5990
3680
#, python-format
3681
msgid "Updated tag %s."
3682
msgstr ""
3683
3684
#: bzrlib/builtins.py:5994
3685
msgid "List tags."
3686
msgstr ""
3687
3688
#: bzrlib/builtins.py:5996
3689
msgid ""
3690
"This command shows a table of tag names and the revisions they reference."
3691
msgstr ""
3692
3693
#: bzrlib/builtins.py:6002
3694
msgid "Branch whose tags should be displayed."
3695
msgstr ""
3696
3697
#: bzrlib/builtins.py:6004
3698
msgid "Sort tags by different criteria."
3699
msgstr ""
3700
3701
#: bzrlib/builtins.py:6004
3702
msgid "Sorting"
3703
msgstr ""
3704
3705
#: bzrlib/builtins.py:6073
3706
msgid "Reconfigure the type of a bzr directory."
3707
msgstr ""
3708
3709
#: bzrlib/builtins.py:6075
3710
msgid "A target configuration must be specified."
3711
msgstr ""
3712
3713
#: bzrlib/builtins.py:6077
3714
msgid ""
3715
"For checkouts, the bind-to location will be auto-detected if not specified.\n"
3716
"The order of preference is\n"
3717
"1. For a lightweight checkout, the current bound location.\n"
3718
"2. For branches that used to be checkouts, the previously-bound location.\n"
3719
"3. The push location.\n"
3720
"4. The parent location.\n"
3721
"If none of these is available, --bind-to must be specified."
3722
msgstr ""
3723
3724
#: bzrlib/builtins.py:6091
3725
msgid "Tree type"
3726
msgstr ""
3727
3728
#: bzrlib/builtins.py:6092
3729
msgid "The relation between branch and tree."
3730
msgstr ""
3731
3732
#: bzrlib/builtins.py:6094
3733
msgid "Reconfigure to be an unbound branch with no working tree."
3734
msgstr ""
3735
3736
#: bzrlib/builtins.py:6095
3737
msgid "Reconfigure to be an unbound branch with a working tree."
3738
msgstr ""
3739
3740
#: bzrlib/builtins.py:6096
3741
msgid "Reconfigure to be a bound branch with a working tree."
3742
msgstr ""
3743
3744
#: bzrlib/builtins.py:6097
3745
msgid "Reconfigure to be a lightweight checkout (with no local history)."
3746
msgstr ""
3747
3748
#: bzrlib/builtins.py:6102
3749
msgid "Repository type"
3750
msgstr ""
3751
3752
#: bzrlib/builtins.py:6103
3753
msgid "Location fo the repository."
3754
msgstr ""
3755
3756
#: bzrlib/builtins.py:6105
3757
msgid ""
3758
"Reconfigure to be a standalone branch (i.e. stop using shared repository)."
3759
msgstr ""
3760
3761
#: bzrlib/builtins.py:6107
3762
msgid "Reconfigure to use a shared repository."
3763
msgstr ""
3764
3765
#: bzrlib/builtins.py:6111
3766
msgid "Trees in Repository"
3767
msgstr ""
3768
3769
#: bzrlib/builtins.py:6112
3770
msgid "Whether new branches in the repository have trees."
3771
msgstr ""
3772
3773
#: bzrlib/builtins.py:6114
3774
msgid ""
3775
"Reconfigure repository to create working trees on branches by default."
3776
msgstr ""
3777
3778
#: bzrlib/builtins.py:6116
3779
msgid ""
3780
"Reconfigure repository to not create working trees on branches by default."
3781
msgstr ""
3782
3783
#: bzrlib/builtins.py:6119
3784
msgid "Branch to bind checkout to."
3785
msgstr ""
3786
3787
#: bzrlib/builtins.py:6121
3788
msgid "Perform reconfiguration even if local changes will be lost."
3789
msgstr ""
3790
3791
#: bzrlib/builtins.py:6124
3792
msgid "Reconfigure a branch to be stacked on another branch."
3793
msgstr ""
3794
3795
#: bzrlib/builtins.py:6128
3796
msgid ""
3797
"Reconfigure a branch to be unstacked. This may require copying substantial "
3798
"data into it."
3799
msgstr ""
3800
3801
#: bzrlib/builtins.py:6138
3802
msgid "Can't use both --stacked-on and --unstacked"
3803
msgstr ""
3804
3805
#: bzrlib/builtins.py:6152
3806
msgid "No target configuration specified"
3807
msgstr ""
3808
3809
#: bzrlib/builtins.py:6187
3810
msgid "Set the branch of a checkout and update."
3811
msgstr ""
3812
3813
#: bzrlib/builtins.py:6189
3814
msgid ""
3815
"For lightweight checkouts, this changes the branch being referenced.\n"
3816
"For heavyweight checkouts, this checks that there are no local commits\n"
3817
"versus the current bound branch, then it makes the local branch a mirror\n"
3818
"of the new location and binds to it."
3819
msgstr ""
3820
3821
#: bzrlib/builtins.py:6194
3822
msgid ""
3823
"In both cases, the working tree is updated and uncommitted changes\n"
3824
"are merged. The user can commit or revert these as they desire."
3825
msgstr ""
3826
3827
#: bzrlib/builtins.py:6197
3828
msgid "Pending merges need to be committed or reverted before using switch."
3829
msgstr ""
3830
3831
#: bzrlib/builtins.py:6199
3832
msgid ""
3833
"The path to the branch to switch to can be specified relative to the parent\n"
3834
"directory of the current branch. For example, if you are currently in a\n"
3835
"checkout of /path/to/branch, specifying 'newbranch' will find a branch at\n"
3836
"/path/to/newbranch."
3837
msgstr ""
3838
3839
#: bzrlib/builtins.py:6204
3840
msgid ""
3841
"Bound branches use the nickname of its master branch unless it is set\n"
3842
"locally, in which case switching will update the local nickname to be\n"
3843
"that of the master."
3844
msgstr ""
3845
3846
#: bzrlib/builtins.py:6212
3847
msgid "Switch even if local commits will be lost."
3848
msgstr ""
3849
3850
#: bzrlib/builtins.py:6215
3851
msgid "Create the target branch from this one before switching to it."
3852
msgstr ""
3853
3854
#: bzrlib/builtins.py:6229
3855
msgid "You must supply either a revision or a location"
3856
msgstr ""
3857
3858
#: bzrlib/builtins.py:6242
3859
msgid "cannot create branch without source branch"
3860
msgstr ""
3861
3862
#: bzrlib/builtins.py:6262
3863
msgid "Manage filtered views."
3864
msgstr ""
3865
3866
#: bzrlib/builtins.py:6264
3867
msgid ""
3868
"Views provide a mask over the tree so that users can focus on\n"
3869
"a subset of a tree when doing their work. After creating a view,\n"
3870
"commands that support a list of files - status, diff, commit, etc -\n"
3871
"effectively have that list of files implicitly given each time.\n"
3872
"An explicit list of files can still be given but those files\n"
3873
"must be within the current view."
3874
msgstr ""
3875
3876
#: bzrlib/builtins.py:6271
3877
msgid ""
3878
"In most cases, a view has a short life-span: it is created to make\n"
3879
"a selected change and is deleted once that change is committed.\n"
3880
"At other times, you may wish to create one or more named views\n"
3881
"and switch between them."
3882
msgstr ""
3883
3884
#: bzrlib/builtins.py:6276
3885
msgid ""
3886
"To disable the current view without deleting it, you can switch to\n"
3887
"the pseudo view called ``off``. This can be useful when you need\n"
3888
"to see the whole tree for an operation or two (e.g. merge) but\n"
3889
"want to switch back to your view after that."
3890
msgstr ""
3891
3892
#: bzrlib/builtins.py:6281
3893
msgid ""
3894
":Examples:\n"
3895
" To define the current view::"
3896
msgstr ""
3897
3898
#: bzrlib/builtins.py:6284
3899
msgid " bzr view file1 dir1 ..."
3900
msgstr ""
3901
3902
#: bzrlib/builtins.py:6286
3903
msgid " To list the current view::"
3904
msgstr ""
3905
3906
#: bzrlib/builtins.py:6288
3907
msgid " bzr view"
3908
msgstr ""
3909
3910
#: bzrlib/builtins.py:6290
3911
msgid " To delete the current view::"
3912
msgstr ""
3913
3914
#: bzrlib/builtins.py:6292
3915
msgid " bzr view --delete"
3916
msgstr ""
3917
3918
#: bzrlib/builtins.py:6294
3919
msgid " To disable the current view without deleting it::"
3920
msgstr ""
3921
3922
#: bzrlib/builtins.py:6296
3923
msgid " bzr view --switch off"
3924
msgstr ""
3925
3926
#: bzrlib/builtins.py:6298
3927
msgid " To define a named view and switch to it::"
3928
msgstr ""
3929
3930
#: bzrlib/builtins.py:6300
3931
msgid " bzr view --name view-name file1 dir1 ..."
3932
msgstr ""
3933
3934
#: bzrlib/builtins.py:6302
3935
msgid " To list a named view::"
3936
msgstr ""
3937
3938
#: bzrlib/builtins.py:6304
3939
msgid " bzr view --name view-name"
3940
msgstr ""
3941
3942
#: bzrlib/builtins.py:6306
3943
msgid " To delete a named view::"
3944
msgstr ""
3945
3946
#: bzrlib/builtins.py:6308
3947
msgid " bzr view --name view-name --delete"
3948
msgstr ""
3949
3950
#: bzrlib/builtins.py:6310
3951
msgid " To switch to a named view::"
3952
msgstr ""
3953
3954
#: bzrlib/builtins.py:6312
3955
msgid " bzr view --switch view-name"
3956
msgstr ""
3957
3958
#: bzrlib/builtins.py:6314
3959
msgid " To list all views defined::"
3960
msgstr ""
3961
3962
#: bzrlib/builtins.py:6316
3963
msgid " bzr view --all"
3964
msgstr ""
3965
3966
#: bzrlib/builtins.py:6318
3967
msgid " To delete all views::"
3968
msgstr ""
3969
3970
#: bzrlib/builtins.py:6320
3971
msgid " bzr view --delete --all"
3972
msgstr ""
3973
3974
#: bzrlib/builtins.py:6327
3975
msgid "Apply list or delete action to all views."
3976
msgstr ""
3977
3978
#: bzrlib/builtins.py:6330
3979
msgid "Delete the view."
3980
msgstr ""
3981
3982
#: bzrlib/builtins.py:6333
3983
msgid "Name of the view to define, list or delete."
3984
msgstr ""
3985
3986
#: bzrlib/builtins.py:6337
3987
msgid "Name of the view to switch to."
3988
msgstr ""
3989
3990
#: bzrlib/builtins.py:6356
3991
msgid "Both --delete and a file list specified"
3992
msgstr ""
3993
3994
#: bzrlib/builtins.py:6359
3995
msgid "Both --delete and --switch specified"
3996
msgstr ""
3997
3998
#: bzrlib/builtins.py:6362
3999
msgid "Deleted all views.\n"
4000
msgstr ""
4001
4002
#: bzrlib/builtins.py:6364
4003
msgid "No current view to delete"
4004
msgstr ""
4005
4006
#: bzrlib/builtins.py:6367
4007
#, python-format
4008
msgid "Deleted '%s' view.\n"
4009
msgstr ""
4010
4011
#: bzrlib/builtins.py:6371
4012
msgid "Both --switch and a file list specified"
4013
msgstr ""
4014
4015
#: bzrlib/builtins.py:6374
4016
msgid "Both --switch and --all specified"
4017
msgstr ""
4018
4019
#: bzrlib/builtins.py:6377
4020
msgid "No current view to disable"
4021
msgstr ""
4022
4023
#: bzrlib/builtins.py:6379
4024
#, python-format
4025
msgid "Disabled '%s' view.\n"
4026
msgstr ""
4027
4028
#: bzrlib/builtins.py:6383 bzrlib/builtins.py:6405
4029
msgid "Using '{0}' view: {1}\n"
4030
msgstr ""
4031
4032
#: bzrlib/builtins.py:6386
4033
msgid "Views defined:\n"
4034
msgstr ""
4035
4036
#: bzrlib/builtins.py:6395
4037
msgid "No views defined.\n"
4038
msgstr ""
4039
4040
#: bzrlib/builtins.py:6402
4041
msgid "Cannot change the 'off' pseudo view"
4042
msgstr ""
4043
4044
#: bzrlib/builtins.py:6410
4045
msgid "No current view.\n"
4046
msgstr ""
4047
4048
#: bzrlib/builtins.py:6413
4049
msgid "'{0}' view is: {1}\n"
4050
msgstr ""
4051
4052
#: bzrlib/builtins.py:6433
4053
msgid " <no hooks installed>\n"
4054
msgstr ""
4055
4056
#: bzrlib/builtins.py:6437
4057
msgid "Remove a branch."
4058
msgstr ""
4059
4060
#: bzrlib/builtins.py:6439
4061
msgid ""
4062
"This will remove the branch from the specified location but \n"
4063
"will keep any working tree or repository in place."
4064
msgstr ""
4065
4066
#: bzrlib/builtins.py:6444
4067
msgid " Remove the branch at repo/trunk::"
4068
msgstr ""
4069
4070
#: bzrlib/builtins.py:6446
4071
msgid " bzr remove-branch repo/trunk"
4072
msgstr ""
4073
4074
#: bzrlib/builtins.py:6461
4075
msgid "Plaintext diff output."
4076
msgstr ""
4077
4078
#: bzrlib/builtins.py:6462
4079
msgid "Temporarily set aside some changes from the current tree."
4080
msgstr ""
4081
4082
#: bzrlib/builtins.py:6464
4083
msgid ""
4084
"Shelve allows you to temporarily put changes you've made \"on the shelf\",\n"
4085
"ie. out of the way, until a later time when you can bring them back from\n"
4086
"the shelf with the 'unshelve' command. The changes are stored alongside\n"
4087
"your working tree, and so they aren't propagated along with your branch nor\n"
4088
"will they survive its deletion."
4089
msgstr ""
4090
4091
#: bzrlib/builtins.py:6470
4092
msgid "If shelve --list is specified, previously-shelved changes are listed."
4093
msgstr ""
4094
4095
#: bzrlib/builtins.py:6472
4096
msgid ""
4097
"Shelve is intended to help separate several sets of changes that have\n"
4098
"been inappropriately mingled. If you just want to get rid of all changes\n"
4099
"and you don't need to restore them later, use revert. If you want to\n"
4100
"shelve all text changes at once, use shelve --all."
4101
msgstr ""
4102
4103
#: bzrlib/builtins.py:6477
4104
msgid ""
4105
"If filenames are specified, only the changes to those files will be\n"
4106
"shelved. Other files will be left untouched."
4107
msgstr ""
4108
4109
#: bzrlib/builtins.py:6480
4110
msgid ""
4111
"If a revision is specified, changes since that revision will be shelved."
4112
msgstr ""
4113
4114
#: bzrlib/builtins.py:6482
4115
msgid ""
4116
"You can put multiple items on the shelf, and by default, 'unshelve' will\n"
4117
"restore the most recently shelved changes."
4118
msgstr ""
4119
4120
#: bzrlib/builtins.py:6485
4121
msgid ""
4122
"For complicated changes, it is possible to edit the changes in a separate\n"
4123
"editor program to decide what the file remaining in the working copy\n"
4124
"should look like. To do this, add the configuration option"
4125
msgstr ""
4126
4127
#: bzrlib/builtins.py:6489
4128
msgid " change_editor = PROGRAM @new_path @old_path"
4129
msgstr ""
4130
4131
#: bzrlib/builtins.py:6491
4132
msgid ""
4133
"where @new_path is replaced with the path of the new version of the \n"
4134
"file and @old_path is replaced with the path of the old version of \n"
4135
"the file. The PROGRAM should save the new file with the desired \n"
4136
"contents of the file in the working tree.\n"
4137
" "
4138
msgstr ""
4139
4140
#: bzrlib/builtins.py:6503
4141
msgid "Shelve all changes."
4142
msgstr ""
4143
4144
#: bzrlib/builtins.py:6505
4145
msgid "Method to use for writing diffs."
4146
msgstr ""
4147
4148
#: bzrlib/builtins.py:6505
4149
msgid "writer"
4150
msgstr ""
4151
4152
#: bzrlib/builtins.py:6509
4153
msgid "List shelved changes."
4154
msgstr ""
4155
4156
#: bzrlib/builtins.py:6511
4157
msgid "Destroy removed changes instead of shelving them."
4158
msgstr ""
4159
4160
#: bzrlib/builtins.py:6540
4161
msgid "No shelved changes."
4162
msgstr ""
4163
4164
#: bzrlib/builtins.py:6551
4165
msgid "Restore shelved changes."
4166
msgstr ""
4167
4168
#: bzrlib/builtins.py:6553
4169
msgid ""
4170
"By default, the most recently shelved changes are restored. However if you\n"
4171
"specify a shelf by id those changes will be restored instead. This works\n"
4172
"best when the changes don't depend on each other."
4173
msgstr ""
4174
4175
#: bzrlib/builtins.py:6562
4176
msgid "The action to perform."
4177
msgstr ""
4178
4179
#: bzrlib/builtins.py:6562 bzrlib/conflicts.py:694
4180
msgid "action"
4181
msgstr ""
4182
4183
#: bzrlib/builtins.py:6564
4184
msgid "Apply changes and remove from the shelf."
4185
msgstr ""
4186
4187
#: bzrlib/builtins.py:6565
4188
msgid "Show changes, but do not apply or remove them."
4189
msgstr ""
4190
4191
#: bzrlib/builtins.py:6566
4192
msgid ""
4193
"Instead of unshelving the changes, show the diff that would result from "
4194
"unshelving."
4195
msgstr ""
4196
4197
#: bzrlib/builtins.py:6568
4198
msgid "Delete changes without applying them."
4199
msgstr ""
4200
4201
#: bzrlib/builtins.py:6569
4202
msgid "Apply changes but don't delete them."
4203
msgstr ""
4204
4205
#: bzrlib/builtins.py:6584
4206
msgid "Remove unwanted files from working tree."
4207
msgstr ""
4208
4209
#: bzrlib/builtins.py:6586
4210
msgid ""
4211
"By default, only unknown files, not ignored files, are deleted. Versioned\n"
4212
"files are never deleted."
4213
msgstr ""
4214
4215
#: bzrlib/builtins.py:6589
4216
msgid ""
4217
"Another class is 'detritus', which includes files emitted by bzr during\n"
4218
"normal operations and selftests. (The value of these files decreases with\n"
4219
"time.)"
4220
msgstr ""
4221
4222
#: bzrlib/builtins.py:6593
4223
msgid ""
4224
"If no options are specified, unknown files are deleted. Otherwise, option\n"
4225
"flags are respected, and may be combined."
4226
msgstr ""
4227
4228
#: bzrlib/builtins.py:6596
4229
msgid "To check what clean-tree will do, use --dry-run."
4230
msgstr ""
4231
4232
#: bzrlib/builtins.py:6599
4233
msgid "Delete all ignored files."
4234
msgstr ""
4235
4236
#: bzrlib/builtins.py:6600
4237
msgid ""
4238
"Delete conflict files, merge and revert backups, and failed selftest dirs."
4239
msgstr ""
4240
4241
#: bzrlib/builtins.py:6603
4242
msgid "Delete files unknown to bzr (default)."
4243
msgstr ""
4244
4245
#: bzrlib/builtins.py:6604
4246
msgid "Show files to delete instead of deleting them."
4247
msgstr ""
4248
4249
#: bzrlib/builtins.py:6606
4250
msgid "Do not prompt before deleting."
4251
msgstr ""
4252
4253
#: bzrlib/bundle/__init__.py:59
4254
msgid "A directory cannot be a bundle"
4255
msgstr ""
4256
4257
#: bzrlib/bundle/apply_bundle.py:40
4258
msgid "Install revisions"
4259
msgstr ""
4260
4261
#: bzrlib/bundle/commands.py:64
4262
msgid "--verbose requires a merge directive"
4263
msgstr ""
4264
4265
#: bzrlib/bundle/commands.py:67
4266
msgid "Bundle format not supported"
4267
msgstr ""
4268
4269
#: bzrlib/bundle/commands.py:77
4270
msgid "Records\n"
4271
msgstr ""
4272
4273
#: bzrlib/bundle/commands.py:81
4274
msgid "{0}: {1} ({2} multiparent)\n"
4275
msgstr ""
4276
4277
#: bzrlib/bundle/commands.py:83
4278
#, python-format
4279
msgid "unique files: %d\n"
4280
msgstr ""
4281
4282
#: bzrlib/bundle/commands.py:92
4283
msgid "Revisions\n"
4284
msgstr ""
4285
4286
#: bzrlib/bundle/commands.py:93
4287
#, python-format
4288
msgid "nicks: %s\n"
4289
msgstr ""
4290
4291
#: bzrlib/bundle/commands.py:95
4292
#, python-format
4293
msgid ""
4294
"committers: \n"
4295
"%s\n"
4296
msgstr ""
4297
4298
#: bzrlib/bundle/commands.py:103
4299
msgid "Decoded contents\n"
4300
msgstr ""
4301
4302
#: bzrlib/bundle/serializer/v4.py:327
4303
#, python-format
4304
msgid "Bundling %d revision."
4305
msgid_plural "Bundling %d revisions."
4306
msgstr[0] ""
4307
msgstr[1] ""
4308
4309
#: bzrlib/bzrdir.py:490
4310
msgid ""
4311
"making backup of {0}\n"
4312
" to {1}"
4313
msgstr ""
4314
4315
#: bzrlib/bzrdir.py:513
4316
msgid "renamed {0} to {1}"
4317
msgstr ""
4318
4319
#: bzrlib/bzrdir.py:1652
4320
#, python-format
4321
msgid ""
4322
"Source repository format does not support stacking, using format:\n"
4323
" %s"
4324
msgstr ""
4325
4326
#: bzrlib/bzrdir.py:1672
4327
#, python-format
4328
msgid ""
4329
"Source branch format does not support stacking, using format:\n"
4330
" %s"
4331
msgstr ""
4332
4333
#: bzrlib/bzrdir.py:1818
4334
msgid "starting repository conversion"
4335
msgstr ""
4336
4337
#: bzrlib/bzrdir.py:2039
4338
msgid "Using default stacking branch {0} at {1}"
4339
msgstr ""
4340
4341
#: bzrlib/check.py:108
4342
msgid "check"
4343
msgstr ""
4344
4345
#: bzrlib/check.py:110
4346
msgid "checking revisions"
4347
msgstr ""
4348
4349
#: bzrlib/check.py:112
4350
msgid "checking commit contents"
4351
msgstr ""
4352
4353
#: bzrlib/check.py:114
4354
msgid "checking file graphs"
4355
msgstr ""
4356
4357
#: bzrlib/check.py:118
4358
msgid "checking branches and trees"
4359
msgstr ""
4360
4361
#: bzrlib/check.py:205
4362
msgid "checked repository {0} format {1}"
4363
msgstr ""
4364
4365
#: bzrlib/check.py:208
4366
#, python-format
4367
msgid "%6d revisions"
4368
msgstr ""
4369
4370
#: bzrlib/check.py:209
4371
#, python-format
4372
msgid "%6d file-ids"
4373
msgstr ""
4374
4375
#: bzrlib/check.py:211
4376
#, python-format
4377
msgid "%6d unreferenced text versions"
4378
msgstr ""
4379
4380
#: bzrlib/check.py:215
4381
msgid "unreferenced version: {{{0}}} in {1}"
4382
msgstr ""
4383
4384
#: bzrlib/check.py:218
4385
#, python-format
4386
msgid "%6d revisions are missing inventory_sha1"
4387
msgstr ""
4388
4389
#: bzrlib/check.py:221
4390
#, python-format
4391
msgid "%6d revisions are mentioned but not present"
4392
msgstr ""
4393
4394
#: bzrlib/check.py:224
4395
#, python-format
4396
msgid "%6d ghost revisions"
4397
msgstr ""
4398
4399
#: bzrlib/check.py:229
4400
#, python-format
4401
msgid "%6d revisions missing parents in ancestry"
4402
msgstr ""
4403
4404
#: bzrlib/check.py:233
4405
#, python-format
4406
msgid " %s should be in the ancestry for:"
4407
msgstr ""
4408
4409
#: bzrlib/check.py:237
4410
#, python-format
4411
msgid "%6d inconsistent parents"
4412
msgstr ""
4413
4414
#: bzrlib/check.py:241
4415
msgid " * {0} version {1} has parents {2!r} but should have {3!r}"
4416
msgstr ""
4417
4418
#: bzrlib/check.py:247
4419
#, python-format
4420
msgid "%6d revisions have incorrect parents in the revision index"
4421
msgstr ""
4422
4423
#: bzrlib/check.py:253
4424
msgid " {0} has wrong parents in index: {1!r} should be {2!r}"
4425
msgstr ""
4426
4427
#: bzrlib/check.py:267
4428
msgid "Mismatched internal revid {{{0}}} and index revid {{{1}}}"
4429
msgstr ""
4430
4431
#: bzrlib/check.py:296
4432
msgid ""
4433
"Multiple expected sha1s for {0}. {{{1}}} expects {{{2}}}, {{{3}}} expects "
4434
"{{{4}}}"
4435
msgstr ""
4436
4437
#: bzrlib/check.py:354
4438
#, python-format
4439
msgid "Checking branch at '%s'."
4440
msgstr ""
4441
4442
#: bzrlib/check.py:374
4443
#, python-format
4444
msgid "Checking working tree at '%s'."
4445
msgstr ""
4446
4447
#: bzrlib/check.py:427 bzrlib/check.py:441
4448
msgid "No branch found at specified location."
4449
msgstr ""
4450
4451
#: bzrlib/check.py:429 bzrlib/check.py:439
4452
msgid "No working tree found at specified location."
4453
msgstr ""
4454
4455
#: bzrlib/check.py:432
4456
#, python-format
4457
msgid "Checking repository at '%s'."
4458
msgstr ""
4459
4460
#: bzrlib/check.py:443
4461
msgid "No repository found at specified location."
4462
msgstr ""
4463
4464
#: bzrlib/clean_tree.py:63
4465
msgid "Nothing to delete."
4466
msgstr ""
4467
4468
#: bzrlib/clean_tree.py:68
4469
msgid "Are you sure you wish to delete these"
4470
msgstr ""
4471
4472
#: bzrlib/clean_tree.py:70
4473
msgid "Canceled"
4474
msgstr ""
4475
4476
#: bzrlib/clean_tree.py:107
4477
#, python-format
4478
msgid "unable to remove %s"
4479
msgstr ""
4480
4481
#: bzrlib/clean_tree.py:111
4482
msgid "deleting paths:"
4483
msgstr ""
4484
4485
#: bzrlib/clean_tree.py:125
4486
msgid "unable to remove \"{0}\": {1}."
4487
msgstr ""
4488
4489
#: bzrlib/clean_tree.py:130
4490
msgid "No files deleted."
4491
msgstr ""
4492
4493
#: bzrlib/cmd_version_info.py:47
4494
msgid "No known version info format {0}. Supported types are: {1}"
4495
msgstr ""
4496
4497
#: bzrlib/cmd_version_info.py:52
4498
msgid "Version info in Custom template-based format."
4499
msgstr ""
4500
4501
#: bzrlib/cmd_version_info.py:52
4502
msgid "Version info in Python format."
4503
msgstr ""
4504
4505
#: bzrlib/cmd_version_info.py:52
4506
msgid "Version info in RIO (simple text) format (default)."
4507
msgstr ""
4508
4509
#: bzrlib/cmd_version_info.py:53
4510
msgid "Show version information about this tree."
4511
msgstr ""
4512
4513
#: bzrlib/cmd_version_info.py:55
4514
msgid ""
4515
"You can use this command to add information about version into\n"
4516
"source code of an application. The output can be in one of the\n"
4517
"supported formats or in a custom format based on a template."
4518
msgstr ""
4519
4520
#: bzrlib/cmd_version_info.py:59 en/help_topics/configuration.txt:700
4521
#: en/help_topics/configuration.txt:710
4522
msgid "For example::"
4523
msgstr ""
4524
4525
#: bzrlib/cmd_version_info.py:61
4526
msgid ""
4527
" bzr version-info --custom \\\n"
4528
" --template=\"#define VERSION_INFO \\\"Project 1.2.3 (r{revno})\\\"\\n\""
4529
msgstr ""
4530
4531
#: bzrlib/cmd_version_info.py:64
4532
msgid ""
4533
"will produce a C header file with formatted string containing the\n"
4534
"current revision number. Other supported variables in templates are:"
4535
msgstr ""
4536
4537
#: bzrlib/cmd_version_info.py:67
4538
msgid ""
4539
" * {date} - date of the last revision\n"
4540
" * {build_date} - current date\n"
4541
" * {revno} - revision number\n"
4542
" * {revision_id} - revision id\n"
4543
" * {branch_nick} - branch nickname\n"
4544
" * {clean} - 0 if the source tree contains uncommitted changes,\n"
4545
" otherwise 1"
4546
msgstr ""
4547
4548
#: bzrlib/cmd_version_info.py:77
4549
msgid "Select the output format."
4550
msgstr ""
4551
4552
#: bzrlib/cmd_version_info.py:81
4553
msgid "Include all possible information."
4554
msgstr ""
4555
4556
#: bzrlib/cmd_version_info.py:82
4557
msgid "Check if tree is clean."
4558
msgstr ""
4559
4560
#: bzrlib/cmd_version_info.py:84
4561
msgid "Include the revision-history."
4562
msgstr ""
4563
4564
#: bzrlib/cmd_version_info.py:86
4565
msgid "Include the last revision for each file."
4566
msgstr ""
4567
4568
#: bzrlib/cmd_version_info.py:87
4569
msgid "Template for the output."
4570
msgstr ""
4571
4572
#: bzrlib/cmd_version_info.py:101
4573
msgid "bzr version-info --revision takes exactly one revision specifier"
4574
msgstr ""
4575
4576
#: bzrlib/commands.py:229
4577
#, python-format
4578
msgid "unknown command \"%s\""
4579
msgstr ""
4580
4581
#: bzrlib/commands.py:476
4582
msgid "No help for this command."
4583
msgstr ""
4584
4585
#: bzrlib/commands.py:489
4586
#, python-format
4587
msgid ":Purpose: %s\n"
4588
msgstr ""
4589
4590
#: bzrlib/commands.py:491
4591
#, python-format
4592
msgid ""
4593
":Usage:\n"
4594
"%s\n"
4595
msgstr ""
4596
4597
#: bzrlib/commands.py:493
4598
#, python-format
4599
msgid ":Usage: %s\n"
4600
msgstr ""
4601
4602
#: bzrlib/commands.py:512
4603
#, python-format
4604
msgid ":Options:%s"
4605
msgstr ""
4606
4607
#: bzrlib/commands.py:523
4608
#, python-format
4609
msgid ""
4610
":Description:\n"
4611
" %s\n"
4612
"\n"
4613
msgstr ""
4614
4615
#: bzrlib/commands.py:533
4616
#, python-format
4617
msgid ""
4618
"See bzr help %s for more details and examples.\n"
4619
"\n"
4620
msgstr ""
4621
4622
#: bzrlib/commands.py:538
4623
msgid ":Aliases: "
4624
msgstr ""
4625
4626
#: bzrlib/commands.py:542
4627
#, python-format
4628
msgid ":From: plugin \"%s\"\n"
4629
msgstr ""
4630
4631
#: bzrlib/commands.py:554
4632
msgid ":doc:`{0} <{1}-help>`"
4633
msgstr ""
4634
4635
#: bzrlib/commands.py:558
4636
#, python-format
4637
msgid ":See also: %s"
4638
msgstr ""
4639
4640
#: bzrlib/commands.py:816 bzrlib/gpg.py:324
4641
msgid "Only ASCII permitted in option names"
4642
msgstr ""
4643
4644
#: bzrlib/commands.py:841 bzrlib/commands.py:849
4645
msgid "command {0!r} needs one or more {1}"
4646
msgstr ""
4647
4648
#: bzrlib/commands.py:858
4649
msgid "command {0!r} requires argument {1}"
4650
msgstr ""
4651
4652
#: bzrlib/commands.py:865
4653
msgid "extra argument to command {0}: {1}"
4654
msgstr ""
4655
4656
#: bzrlib/commands.py:962
4657
#, python-format
4658
msgid "Profile data written to \"%s\"."
4659
msgstr ""
4660
4661
#: bzrlib/commit.py:117 bzrlib/commit.py:740
4662
msgid "added"
4663
msgstr ""
4664
4665
#: bzrlib/commit.py:117 bzrlib/commit.py:748
4666
msgid "modified"
4667
msgstr ""
4668
4669
#: bzrlib/commit.py:131
4670
#, python-format
4671
msgid "Committing%s"
4672
msgstr ""
4673
4674
#: bzrlib/commit.py:134
4675
#, python-format
4676
msgid "Committed revision %d."
4677
msgstr ""
4678
4679
#: bzrlib/commit.py:143
4680
#, python-format
4681
msgid "deleted %s"
4682
msgstr ""
4683
4684
#: bzrlib/commit.py:146
4685
#, python-format
4686
msgid "missing %s"
4687
msgstr ""
4688
4689
#: bzrlib/commit.py:511
4690
msgid ""
4691
"Conflicting tags in bound branch:\n"
4692
"{0}"
4693
msgstr ""
4694
4695
#: bzrlib/commit.py:742
4696
msgid "renamed"
4697
msgstr ""
4698
4699
#: bzrlib/commit.py:977
4700
msgid "unchanged"
4701
msgstr ""
4702
4703
#: bzrlib/commit.py:999
4704
msgid "{0} [{1}] - Stage"
4705
msgstr ""
4706
4707
#: bzrlib/commit.py:1002
4708
#, python-format
4709
msgid "%s - Stage"
4710
msgstr ""
4711
4712
#: bzrlib/commit_signature_commands.py:36
4713
msgid "Sign all commits by a given committer."
4714
msgstr ""
4715
4716
#: bzrlib/commit_signature_commands.py:38
4717
msgid ""
4718
"If location is not specified the local tree is used.\n"
4719
"If committer is not specified the default committer is used."
4720
msgstr ""
4721
4722
#: bzrlib/commit_signature_commands.py:41
4723
msgid "This does not sign commits that already have signatures."
4724
msgstr ""
4725
4726
#: bzrlib/commit_signature_commands.py:49
4727
msgid ""
4728
"Don't actually sign anything, just print the revisions that would be signed."
4729
msgstr ""
4730
4731
#: bzrlib/commit_signature_commands.py:103
4732
msgid "Verify all commit signatures."
4733
msgstr ""
4734
4735
#: bzrlib/commit_signature_commands.py:105
4736
msgid ""
4737
"Verifies that all commits in the branch are signed by known GnuPG keys."
4738
msgstr ""
4739
4740
#: bzrlib/commit_signature_commands.py:110
4741
msgid ""
4742
"Comma separated list of GPG key patterns which are acceptable for "
4743
"verification."
4744
msgstr ""
4745
4746
#: bzrlib/commit_signature_commands.py:147
4747
msgid "Cannot verify a range of non-revision-history revisions"
4748
msgstr ""
4749
4750
#: bzrlib/commit_signature_commands.py:168
4751
msgid "All commits signed with verifiable keys"
4752
msgstr ""
4753
4754
#: bzrlib/config.py:475
4755
msgid "Invalid config value for \"{0}\" value {1!r} is not an SI unit."
4756
msgstr ""
4757
4758
#: bzrlib/config.py:2485
4759
msgid "{0} is not an SI unit."
4760
msgstr ""
4761
4762
#: bzrlib/config.py:2949
4763
msgid ""
4764
"Option {0} in section {1} of {2} was changed from {3} to {4}. The {5} value "
4765
"will be saved."
4766
msgstr ""
4767
4768
#: bzrlib/config.py:3093
4769
#, python-format
4770
msgid "Invalid '%s', should be of the form 'name=value'"
4771
msgstr ""
4772
4773
#: bzrlib/config.py:3962
4774
msgid "Display, set or remove a configuration option."
4775
msgstr ""
4776
4777
#: bzrlib/config.py:3964
4778
msgid "Display the active value for a given option."
4779
msgstr ""
4780
4781
#: bzrlib/config.py:3966
4782
msgid ""
4783
"If --all is specified, NAME is interpreted as a regular expression and all\n"
4784
"matching options are displayed mentioning their scope. The active value\n"
4785
"that bzr will take into account is the first one displayed for each option."
4786
msgstr ""
4787
4788
#: bzrlib/config.py:3970
4789
msgid "If no NAME is given, --all .* is implied."
4790
msgstr ""
4791
4792
#: bzrlib/config.py:3972
4793
msgid ""
4794
"Setting a value is achieved by using name=value without spaces. The value\n"
4795
"is set in the most relevant scope and can be checked by displaying the\n"
4796
"option again."
4797
msgstr ""
4798
4799
#: bzrlib/config.py:3984
4800
msgid "Reduce the scope to the specified configuration file."
4801
msgstr ""
4802
4803
#: bzrlib/config.py:3988
4804
msgid "Display all the defined values for the matching options."
4805
msgstr ""
4806
4807
#: bzrlib/config.py:3990
4808
msgid "Remove the option from the configuration file."
4809
msgstr ""
4810
4811
#: bzrlib/conflicts.py:50
4812
msgid "List files with conflicts."
4813
msgstr ""
4814
4815
#: bzrlib/conflicts.py:57
4816
msgid ""
4817
"Conflicts normally are listed as short, human-readable messages. If --text\n"
4818
"is supplied, the pathnames of files with text conflicts are listed,\n"
4819
"instead. (This is useful for editing all files with text conflicts.)"
4820
msgstr ""
4821
4822
#: bzrlib/conflicts.py:61
4823
msgid "Use bzr resolve when you have fixed a problem."
4824
msgstr ""
4825
4826
#: bzrlib/conflicts.py:66
4827
msgid "List paths of files with text conflicts."
4828
msgstr ""
4829
4830
#: bzrlib/conflicts.py:85
4831
msgid "Marks the conflict as resolved."
4832
msgstr ""
4833
4834
#: bzrlib/conflicts.py:88
4835
msgid "Resolve the conflict preserving the version in the working tree."
4836
msgstr ""
4837
4838
#: bzrlib/conflicts.py:91
4839
msgid "Resolve the conflict taking the merged version into account."
4840
msgstr ""
4841
4842
#: bzrlib/conflicts.py:98
4843
msgid "How to resolve the conflict."
4844
msgstr ""
4845
4846
#: bzrlib/conflicts.py:104
4847
msgid "Mark a conflict as resolved."
4848
msgstr ""
4849
4850
#: bzrlib/conflicts.py:111
4851
msgid ""
4852
"Once you have fixed a problem, use \"bzr resolve\" to automatically mark\n"
4853
"text conflicts as fixed, \"bzr resolve FILE\" to mark a specific conflict "
4854
"as\n"
4855
"resolved, or \"bzr resolve --all\" to mark all conflicts as resolved."
4856
msgstr ""
4857
4858
#: bzrlib/conflicts.py:119
4859
msgid "Resolve all conflicts in this tree."
4860
msgstr ""
4861
4862
#: bzrlib/conflicts.py:126
4863
msgid "If --all is specified, no FILE may be provided"
4864
msgstr ""
4865
4866
#: bzrlib/conflicts.py:151
4867
#, python-format
4868
msgid "%d conflict auto-resolved."
4869
msgid_plural "%d conflicts auto-resolved."
4870
msgstr[0] ""
4871
msgstr[1] ""
4872
4873
#: bzrlib/conflicts.py:154
4874
msgid "Remaining conflicts:"
4875
msgstr ""
4876
4877
#: bzrlib/conflicts.py:159
4878
msgid "All conflicts resolved."
4879
msgstr ""
4880
4881
#: bzrlib/conflicts.py:168
4882
msgid "{0} conflict resolved, {1} remaining"
4883
msgid_plural "{0} conflicts resolved, {1} remaining"
4884
msgstr[0] ""
4885
msgstr[1] ""
4886
4887
#: bzrlib/controldir.py:710
4888
msgid "{0} is{1} redirected to {2}"
4889
msgstr ""
4890
4891
#: bzrlib/diff.py:399
4892
#, python-format
4893
msgid "*** Ignoring files outside view. View is %s"
4894
msgstr ""
4895
4896
#: bzrlib/errors.py:157
4897
msgid "The tree builder is already building a tree."
4898
msgstr ""
4899
4900
#: bzrlib/errors.py:178
4901
msgid "The dirstate file (%(state)s) appears to be corrupt: %(msg)s"
4902
msgstr ""
4903
4904
#: bzrlib/errors.py:197
4905
msgid ""
4906
"The API for \"%(api)s\" is not compatible with \"%(wanted)s\". It supports "
4907
"versions \"%(minimum)s\" to \"%(current)s\"."
4908
msgstr ""
4909
4910
#: bzrlib/errors.py:209
4911
msgid "The transport '%(transport)s' is only accessible within this process."
4912
msgstr ""
4913
4914
#: bzrlib/errors.py:227
4915
msgid "Invalid revision number %(revno)s"
4916
msgstr ""
4917
4918
#: bzrlib/errors.py:236
4919
msgid "Invalid revision-id {%(revision_id)s} in %(branch)s"
4920
msgstr ""
4921
4922
#: bzrlib/errors.py:247
4923
msgid "Reserved revision-id {%(revision_id)s}"
4924
msgstr ""
4925
4926
#: bzrlib/errors.py:261
4927
msgid "There is no public branch set for \"%(branch_url)s\"."
4928
msgstr ""
4929
4930
#: bzrlib/errors.py:271
4931
msgid ""
4932
"No help could be found for '%(topic)s'. Please use 'bzr help topics' to "
4933
"obtain a list of topics."
4934
msgstr ""
4935
4936
#: bzrlib/errors.py:280
4937
msgid "The file id \"%(file_id)s\" is not present in the tree %(tree)s."
4938
msgstr ""
4939
4940
#: bzrlib/errors.py:290
4941
msgid ""
4942
"The file id \"%(file_id)s\" is not present in the repository %(repository)r"
4943
msgstr ""
4944
4945
#: bzrlib/errors.py:299
4946
msgid "The branch '%(branch)s' is not stacked."
4947
msgstr ""
4948
4949
#: bzrlib/errors.py:313
4950
msgid "No WorkingTree exists for \"%(base)s\"."
4951
msgstr ""
4952
4953
#: bzrlib/errors.py:322
4954
msgid "Not currently building a tree."
4955
msgstr ""
4956
4957
#: bzrlib/errors.py:327
4958
msgid "%(url)s is not a local path."
4959
msgstr ""
4960
4961
#: bzrlib/errors.py:355
4962
msgid "%(not_locked)r is not write locked but needs to be."
4963
msgstr ""
4964
4965
#: bzrlib/errors.py:363
4966
msgid "Error in command line options"
4967
msgstr ""
4968
4969
#: bzrlib/errors.py:368
4970
msgid "%(value)s is not an index of type %(_type)s."
4971
msgstr ""
4972
4973
#: bzrlib/errors.py:378
4974
msgid "Error in data for index %(value)s."
4975
msgstr ""
4976
4977
#: bzrlib/errors.py:387
4978
msgid "The key '%(key)s' is already in index '%(index)s'."
4979
msgstr ""
4980
4981
#: bzrlib/errors.py:397
4982
msgid "The key '%(key)s' is not a valid key."
4983
msgstr ""
4984
4985
#: bzrlib/errors.py:406
4986
msgid "Could not parse options for index %(value)s."
4987
msgstr ""
4988
4989
#: bzrlib/errors.py:415
4990
msgid "The value '%(value)s' is not a valid value."
4991
msgstr ""
4992
4993
#: bzrlib/errors.py:424
4994
msgid "Bad value \"%(value)s\" for option \"%(name)s\"."
4995
msgstr ""
4996
4997
#: bzrlib/errors.py:443
4998
msgid "Generic path error: %(path)r%(extra)s)"
4999
msgstr ""
5000
5001
#: bzrlib/errors.py:456
5002
msgid "No such file: %(path)r%(extra)s"
5003
msgstr ""
5004
5005
#: bzrlib/errors.py:461
5006
msgid "File exists: %(path)r%(extra)s"
5007
msgstr ""
5008
5009
#: bzrlib/errors.py:467
5010
msgid ""
5011
"Could not rename %(source)s => %(dest)s because both files exist. (Use --"
5012
"after to tell bzr about a rename that has already happened)%(extra)s"
5013
msgstr ""
5014
5015
#: bzrlib/errors.py:483
5016
msgid "\"%(path)s\" is not a directory %(extra)s"
5017
msgstr ""
5018
5019
#: bzrlib/errors.py:488
5020
msgid "\"%(path)s\" is not in the working directory %(extra)s"
5021
msgstr ""
5022
5023
#: bzrlib/errors.py:493
5024
msgid "Directory not empty: \"%(path)s\"%(extra)s"
5025
msgstr ""
5026
5027
#: bzrlib/errors.py:498
5028
msgid "Hard-linking \"%(path)s\" is not supported"
5029
msgstr ""
5030
5031
#: bzrlib/errors.py:513
5032
msgid "Device or resource busy: \"%(path)s\"%(extra)s"
5033
msgstr ""
5034
5035
#: bzrlib/errors.py:518
5036
msgid "Permission denied: \"%(path)s\"%(extra)s"
5037
msgstr ""
5038
5039
#: bzrlib/errors.py:523
5040
msgid "Invalid url supplied to transport: \"%(path)s\"%(extra)s"
5041
msgstr ""
5042
5043
#: bzrlib/errors.py:528
5044
msgid "Invalid URL join request: %(reason)s: %(base)r + %(join_args)r"
5045
msgstr ""
5046
5047
#: bzrlib/errors.py:539
5048
msgid "URLs differ by more than path: %(from_)r and %(to)r"
5049
msgstr ""
5050
5051
#: bzrlib/errors.py:561
5052
msgid "The %(type)s hook '%(hook)s' is unknown in this version of bzrlib."
5053
msgstr ""
5054
5055
#: bzrlib/errors.py:571
5056
msgid "Unsupported protocol for url \"%(path)s\"%(extra)s"
5057
msgstr ""
5058
5059
#: bzrlib/errors.py:579
5060
msgid ""
5061
"The branch '%(url)s'(%(format)s) is not a stackable format. You will need to "
5062
"upgrade the branch to permit branch stacking."
5063
msgstr ""
5064
5065
#: bzrlib/errors.py:590
5066
msgid "The branch '%(branch_url)s' cannot be stacked on '%(target_url)s'."
5067
msgstr ""
5068
5069
#: bzrlib/errors.py:600
5070
msgid ""
5071
"The repository '%(url)s'(%(format)s) is not a stackable format. You will "
5072
"need to upgrade the repository to permit branch stacking."
5073
msgstr ""
5074
5075
#: bzrlib/errors.py:611
5076
msgid "Error reading from %(path)r."
5077
msgstr ""
5078
5079
#: bzrlib/errors.py:630
5080
msgid "Path \"%(path)s\" is not a child of path \"%(base)s\"%(extra)s"
5081
msgstr ""
5082
5083
#: bzrlib/errors.py:646
5084
msgid "Path \"%(path)s\" is not unicode normalized"
5085
msgstr ""
5086
5087
#: bzrlib/errors.py:654
5088
msgid "Not a branch: \"%(path)s\"%(detail)s."
5089
msgstr ""
5090
5091
#: bzrlib/errors.py:696
5092
msgid "No submit branch available for branch \"%(path)s\""
5093
msgstr ""
5094
5095
#: bzrlib/errors.py:705
5096
msgid "A control directory already exists: \"%(path)s\"."
5097
msgstr ""
5098
5099
#: bzrlib/errors.py:710
5100
msgid "Already a branch: \"%(path)s\"."
5101
msgstr ""
5102
5103
#: bzrlib/errors.py:715
5104
msgid "Parent branch already exists: \"%(path)s\"."
5105
msgstr ""
5106
5107
#: bzrlib/errors.py:721
5108
msgid ""
5109
"Directory contains a branch, but no working tree (use bzr checkout if you "
5110
"wish to build a working tree): \"%(path)s\""
5111
msgstr ""
5112
5113
#: bzrlib/errors.py:726
5114
msgid ""
5115
"\"%(function)s\" called on an AtomicFile after it was closed: \"%(path)s\""
5116
msgstr ""
5117
5118
#: bzrlib/errors.py:736
5119
msgid ""
5120
"Parent not accessible given base \"%(base)s\" and relative path \"%(path)s\""
5121
msgstr ""
5122
5123
#: bzrlib/errors.py:746
5124
msgid "No repository present: \"%(path)s\""
5125
msgstr ""
5126
5127
#: bzrlib/errors.py:753
5128
msgid ""
5129
"Unsupported branch format: %(format)s\n"
5130
"Please run 'bzr upgrade'"
5131
msgstr ""
5132
5133
#: bzrlib/errors.py:759
5134
msgid "Unknown %(kind)s format: %(format)r"
5135
msgstr ""
5136
5137
#: bzrlib/errors.py:768
5138
msgid "Format %(format)s is not compatible with .bzr version %(bzrdir)s."
5139
msgstr ""
5140
5141
#: bzrlib/errors.py:778
5142
msgid "Parse error on line %(lineno)d of %(format)s format: %(line)s"
5143
msgstr ""
5144
5145
#: bzrlib/errors.py:793
5146
msgid ""
5147
"%(target)s\n"
5148
"is not compatible with\n"
5149
"%(source)s\n"
5150
"%(details)s"
5151
msgstr ""
5152
5153
#: bzrlib/errors.py:809
5154
msgid "Revision is not compatible with %(repo_format)s"
5155
msgstr ""
5156
5157
#: bzrlib/errors.py:819
5158
msgid "%(context_info)s%(path)s is already versioned."
5159
msgstr ""
5160
5161
#: bzrlib/errors.py:840
5162
msgid "%(context_info)s%(path)s is not versioned."
5163
msgstr ""
5164
5165
#: bzrlib/errors.py:861
5166
msgid "Path(s) are not versioned: %(paths_as_string)s"
5167
msgstr ""
5168
5169
#: bzrlib/errors.py:872
5170
msgid "Path(s) do not exist: %(paths_as_string)s%(extra)s"
5171
msgstr ""
5172
5173
#: bzrlib/errors.py:891
5174
msgid "Cannot operate on \"%(filename)s\" of unsupported kind \"%(kind)s\""
5175
msgstr ""
5176
5177
#: bzrlib/errors.py:899
5178
msgid ""
5179
"Filename %(filename)r is not valid in your current filesystem encoding "
5180
"%(fs_encoding)s"
5181
msgstr ""
5182
5183
#: bzrlib/errors.py:910
5184
msgid "Cannot operate on \"%(filename)s\" because it is a control file"
5185
msgstr ""
5186
5187
#: bzrlib/errors.py:928
5188
msgid "The lock for '%(lock_description)s' is in use and cannot be broken."
5189
msgstr ""
5190
5191
#: bzrlib/errors.py:967
5192
msgid "Cannot lock %(lock)s: %(why)s"
5193
msgstr ""
5194
5195
#: bzrlib/errors.py:977
5196
msgid ""
5197
"A transaction related operation was attempted after the transaction finished."
5198
msgstr ""
5199
5200
#: bzrlib/errors.py:1004
5201
msgid "Cannot lock: transport is read only: %(transport)s"
5202
msgstr ""
5203
5204
#: bzrlib/errors.py:1012
5205
msgid "Could not acquire lock \"%(lock)s\": %(msg)s"
5206
msgstr ""
5207
5208
#: bzrlib/errors.py:1023
5209
msgid ""
5210
"Lock was broken while still open: %(lock)s - check storage consistency!"
5211
msgstr ""
5212
5213
#: bzrlib/errors.py:1034
5214
msgid ""
5215
"Lock was released and re-acquired before being broken: %(lock)s: held by "
5216
"%(holder)r, wanted to break %(target)r"
5217
msgstr ""
5218
5219
#: bzrlib/errors.py:1046
5220
msgid ""
5221
"Lock is apparently held, but corrupted: %(corruption_info)s\n"
5222
"Use 'bzr break-lock' to clear it"
5223
msgstr ""
5224
5225
#: bzrlib/errors.py:1059
5226
msgid "Lock not held: %(lock)s"
5227
msgstr ""
5228
5229
#: bzrlib/errors.py:1088
5230
msgid "No changes to commit"
5231
msgstr ""
5232
5233
#: bzrlib/errors.py:1093
5234
msgid ""
5235
"Selected-file commit of merges is not supported yet: files %(files_str)s"
5236
msgstr ""
5237
5238
#: bzrlib/errors.py:1103
5239
msgid ""
5240
"Excluding paths during commit is not supported by repository at "
5241
"%(repository)r."
5242
msgstr ""
5243
5244
#: bzrlib/errors.py:1112
5245
msgid ""
5246
"The specified commit message contains characters unsupported by the current "
5247
"encoding."
5248
msgstr ""
5249
5250
#: bzrlib/errors.py:1118
5251
msgid "Upgrade URL cannot work with readonly URLs."
5252
msgstr ""
5253
5254
#: bzrlib/errors.py:1123
5255
msgid "The branch format %(format)s is already at the most recent format."
5256
msgstr ""
5257
5258
#: bzrlib/errors.py:1146
5259
msgid "Option --change does not accept revision ranges"
5260
msgstr ""
5261
5262
#: bzrlib/errors.py:1151
5263
msgid "No namespace registered for string: %(spec)r"
5264
msgstr ""
5265
5266
#: bzrlib/errors.py:1170
5267
msgid ""
5268
"Requested revision: '%(spec)s' does not exist in branch: "
5269
"%(branch_url)s%(extra)s"
5270
msgstr ""
5271
5272
#: bzrlib/errors.py:1184
5273
msgid ""
5274
"Operation denied because it would change the main history, which is not "
5275
"permitted by the append_revisions_only setting on branch \"%(location)s\"."
5276
msgstr ""
5277
5278
#: bzrlib/errors.py:1195
5279
msgid ""
5280
"These branches have diverged. Use the missing command to see how.\n"
5281
"Use the merge command to reconcile them."
5282
msgstr ""
5283
5284
#: bzrlib/errors.py:1215
5285
msgid ""
5286
"Branches have no common ancestor, and no merge base revision was specified."
5287
msgstr ""
5288
5289
#: bzrlib/errors.py:1221
5290
msgid ""
5291
"Selected merge cannot perform reverse cherrypicks. Try merge3 or diff3."
5292
msgstr ""
5293
5294
#: bzrlib/errors.py:1227
5295
msgid "Revisions have no common ancestor: %(revision_a)s %(revision_b)s"
5296
msgstr ""
5297
5298
#: bzrlib/errors.py:1236
5299
msgid ""
5300
"Revisions are not derived from the same root: %(revision_a)s %(revision_b)s."
5301
msgstr ""
5302
5303
#: bzrlib/errors.py:1245
5304
msgid "Revision %(rev_id)s is not an ancestor of %(not_ancestor_id)s"
5305
msgstr ""
5306
5307
#: bzrlib/errors.py:1254
5308
msgid "Branch %(branch)s has no commits."
5309
msgstr ""
5310
5311
#: bzrlib/errors.py:1272
5312
msgid ""
5313
"Bound branch %(branch)s is out of date with master branch "
5314
"%(master)s.%(extra_help)s"
5315
msgstr ""
5316
5317
#: bzrlib/errors.py:1284
5318
msgid ""
5319
"Cannot commit to branch %(branch)s. It is bound to %(master)s, which is "
5320
"bound to %(remote)s."
5321
msgstr ""
5322
5323
#: bzrlib/errors.py:1296
5324
msgid "Cannot pull --overwrite to a branch which is bound %(branch)s"
5325
msgstr ""
5326
5327
#: bzrlib/errors.py:1305
5328
msgid ""
5329
"Unable to connect to target of bound branch %(branch)s => %(target)s: "
5330
"%(error)s"
5331
msgstr ""
5332
5333
#: bzrlib/errors.py:1317
5334
msgid "Error in processing weave: %(msg)s"
5335
msgstr ""
5336
5337
#: bzrlib/errors.py:1326
5338
msgid "Revision {%(revision_id)s} already present in %(weave)s"
5339
msgstr ""
5340
5341
#: bzrlib/errors.py:1337
5342
msgid "Revision {%(revision_id)s} not present in %(weave)s"
5343
msgstr ""
5344
5345
#: bzrlib/errors.py:1347
5346
msgid "Weave invariant violated: %(what)s"
5347
msgstr ""
5348
5349
#: bzrlib/errors.py:1356
5350
msgid "Parents are mismatched between two revisions. %(msg)s"
5351
msgstr ""
5352
5353
#: bzrlib/errors.py:1378
5354
msgid ""
5355
"Weaves differ on text content. Revision: {%(revision_id)s}, %(weave_a)s, "
5356
"%(weave_b)s"
5357
msgstr ""
5358
5359
#: bzrlib/errors.py:1390
5360
msgid "Versioned file error"
5361
msgstr ""
5362
5363
#: bzrlib/errors.py:1395
5364
msgid "Revision {%(revision_id)s} not present in \"%(file_id)s\"."
5365
msgstr ""
5366
5367
#: bzrlib/errors.py:1405
5368
msgid "Revision {%(revision_id)s} already present in \"%(file_id)s\"."
5369
msgstr ""
5370
5371
#: bzrlib/errors.py:1415
5372
msgid "Text did not match its checksum: %(msg)s"
5373
msgstr ""
5374
5375
#: bzrlib/errors.py:1541
5376
msgid "Export format %(format)r not supported"
5377
msgstr ""
5378
5379
#: bzrlib/errors.py:1550
5380
msgid "Transport error: %(msg)s %(orig_error)s"
5381
msgstr ""
5382
5383
#: bzrlib/errors.py:1576
5384
msgid "Generic bzr smart protocol error: %(details)s"
5385
msgstr ""
5386
5387
#: bzrlib/errors.py:1584
5388
msgid "Received bad protocol version marker: %(marker)r"
5389
msgstr ""
5390
5391
#: bzrlib/errors.py:1616
5392
msgid "Transport operation not possible: %(msg)s %(orig_error)s"
5393
msgstr ""
5394
5395
#: bzrlib/errors.py:1621
5396
msgid "Connection error: %(msg)s %(orig_error)s"
5397
msgstr ""
5398
5399
#: bzrlib/errors.py:1626
5400
msgid "%(msg)s %(host)s%(port)s%(orig_error)s"
5401
msgstr ""
5402
5403
#: bzrlib/errors.py:1647
5404
msgid "Connection closed: %(msg)s %(orig_error)s"
5405
msgstr ""
5406
5407
#: bzrlib/errors.py:1652
5408
msgid "Connection Timeout: %(msg)s%(orig_error)s"
5409
msgstr ""
5410
5411
#: bzrlib/errors.py:1657
5412
msgid "Invalid range access in %(path)s at %(offset)s: %(msg)s"
5413
msgstr ""
5414
5415
#: bzrlib/errors.py:1667
5416
msgid "Invalid http response for %(path)s: %(msg)s%(orig_error)s"
5417
msgstr ""
5418
5419
#: bzrlib/errors.py:1682
5420
msgid "Certificate error: %(error)s"
5421
msgstr ""
5422
5423
#: bzrlib/errors.py:1690
5424
msgid "Invalid http range %(range)r for %(path)s: %(msg)s"
5425
msgstr ""
5426
5427
#: bzrlib/errors.py:1704
5428
msgid "HTTP MIME Boundary missing for %(path)s: %(msg)s"
5429
msgstr ""
5430
5431
#: bzrlib/errors.py:1712
5432
msgid "Invalid http Content-type \"%(ctype)s\" for %(path)s: %(msg)s"
5433
msgstr ""
5434
5435
#: bzrlib/errors.py:1721
5436
msgid "%(source)s is%(permanently)s redirected to %(target)s"
5437
msgstr ""
5438
5439
#: bzrlib/errors.py:1735
5440
msgid "Too many redirections"
5441
msgstr ""
5442
5443
#: bzrlib/errors.py:1740
5444
msgid "Working tree has conflicts."
5445
msgstr ""
5446
5447
#: bzrlib/errors.py:1744
5448
msgid "Config file %(filename)s is not UTF-8 encoded\n"
5449
msgstr ""
5450
5451
#: bzrlib/errors.py:1753
5452
msgid ""
5453
"Error(s) parsing config file %(filename)s:\n"
5454
"%(errors)s"
5455
msgstr ""
5456
5457
#: bzrlib/errors.py:1763
5458
msgid ""
5459
"Bad value \"%(value)s\" for option \"%(name)s\".\n"
5460
"See ``bzr help %(name)s``"
5461
msgstr ""
5462
5463
#: bzrlib/errors.py:1773
5464
msgid "%(username)r does not seem to contain a reasonable email address"
5465
msgstr ""
5466
5467
#: bzrlib/errors.py:1782
5468
msgid "Failed to GPG sign data with command \"%(command_line)s\""
5469
msgstr ""
5470
5471
#: bzrlib/errors.py:1790
5472
msgid "Failed to verify GPG signature data with error \"%(error)s\""
5473
msgstr ""
5474
5475
#: bzrlib/errors.py:1798
5476
msgid "Unable to import library \"%(library)s\": %(error)s"
5477
msgstr ""
5478
5479
#: bzrlib/errors.py:1806
5480
msgid "python-gpgme is not installed, it is needed to verify signatures"
5481
msgstr ""
5482
5483
#: bzrlib/errors.py:1814
5484
msgid ""
5485
"The working tree for %(basedir)s has changed since the last commit, but "
5486
"weave merge requires that it be unchanged"
5487
msgstr ""
5488
5489
#: bzrlib/errors.py:1824
5490
msgid ""
5491
"Can't reprocess and show base, because reprocessing obscures the "
5492
"relationship of conflicting lines to the base"
5493
msgstr ""
5494
5495
#: bzrlib/errors.py:1830
5496
msgid "Cycle in graph %(graph)r"
5497
msgstr ""
5498
5499
#: bzrlib/errors.py:1858
5500
msgid "File %(filename)s is not conflicted."
5501
msgstr ""
5502
5503
#: bzrlib/errors.py:1880
5504
msgid "No bundle was found in \"%(filename)s\"."
5505
msgstr ""
5506
5507
#: bzrlib/errors.py:1889
5508
msgid "Unable to handle bundle version %(version)s: %(msg)s"
5509
msgstr ""
5510
5511
#: bzrlib/errors.py:1899
5512
msgid "Branch %(base)s is missing revision %(text_revision)s of %(file_id)s"
5513
msgstr ""
5514
5515
#: bzrlib/errors.py:1912
5516
msgid "File id {%(file_id)s} already exists in inventory as %(entry)s"
5517
msgstr ""
5518
5519
#: bzrlib/errors.py:1922
5520
msgid "Key %(key)s is already present in map"
5521
msgstr ""
5522
5523
#: bzrlib/errors.py:1927
5524
msgid "The prefix %(prefix)s is in the help search path twice."
5525
msgstr ""
5526
5527
#: bzrlib/errors.py:1937
5528
msgid ""
5529
"No final name for trans_id %(trans_id)r\n"
5530
"file-id: %(file_id)r\n"
5531
"root trans-id: %(root_trans_id)r\n"
5532
msgstr ""
5533
5534
#: bzrlib/errors.py:1969
5535
msgid "Attempt to reuse a transform that has already been applied."
5536
msgstr ""
5537
5538
#: bzrlib/errors.py:1974
5539
msgid "Moving the root directory is not supported at this time"
5540
msgstr ""
5541
5542
#: bzrlib/errors.py:1979
5543
msgid "Failed to rename %(from_path)s to %(to_path)s: %(why)s"
5544
msgstr ""
5545
5546
#: bzrlib/errors.py:1990
5547
msgid ""
5548
"Could not move %(from_path)s%(operator)s %(to_path)s%(_has_extra)s%(extra)s"
5549
msgstr ""
5550
5551
#: bzrlib/errors.py:2026
5552
msgid ""
5553
"Could not rename %(from_path)s%(operator)s %(to_path)s%(_has_extra)s%(extra)s"
5554
msgstr ""
5555
5556
#: bzrlib/errors.py:2056
5557
msgid "Unable to import paramiko (required for sftp support): %(error)s"
5558
msgstr ""
5559
5560
#: bzrlib/errors.py:2064
5561
msgid "Nothing to merge."
5562
msgstr ""
5563
5564
#: bzrlib/errors.py:2069
5565
msgid "Format %(format)s cannot be initialised by this version of bzr."
5566
msgstr ""
5567
5568
#: bzrlib/errors.py:2078
5569
msgid ""
5570
"Cannot convert from format %(from_format)s to format %(format)s. "
5571
"%(problem)s"
5572
msgstr ""
5573
5574
#: bzrlib/errors.py:2090
5575
msgid "Could not find an appropriate Differ for file \"%(path)s\""
5576
msgstr ""
5577
5578
#: bzrlib/errors.py:2098
5579
msgid "%(exe_name)s could not be found on this machine"
5580
msgstr ""
5581
5582
#: bzrlib/errors.py:2106
5583
msgid "Diff is not installed on this machine: %(msg)s"
5584
msgstr ""
5585
5586
#: bzrlib/errors.py:2114
5587
msgid "Diff3 is not installed on this machine."
5588
msgstr ""
5589
5590
#: bzrlib/errors.py:2120
5591
msgid "The content being inserted is already present."
5592
msgstr ""
5593
5594
#: bzrlib/errors.py:2125
5595
msgid ""
5596
"This tree contains left-over files from a failed operation.\n"
5597
" Please examine %(limbo_dir)s to see if it contains any files you wish "
5598
"to\n"
5599
" keep, and delete it when you are done."
5600
msgstr ""
5601
5602
#: bzrlib/errors.py:2136
5603
msgid ""
5604
"This tree contains left-over files from a failed operation.\n"
5605
" Please examine %(pending_deletion)s to see if it contains any files you\n"
5606
" wish to keep, and delete it when you are done."
5607
msgstr ""
5608
5609
#: bzrlib/errors.py:2146
5610
msgid ""
5611
"Unable to delete transform temporary directory %(limbo_dir)s.\n"
5612
" Please examine %(limbo_dir)s to see if it contains any files you wish "
5613
"to\n"
5614
" keep, and delete it when you are done."
5615
msgstr ""
5616
5617
#: bzrlib/errors.py:2157
5618
msgid ""
5619
"Unable to delete transform temporary directory %(pending_deletion)s. Please "
5620
"examine %(pending_deletion)s to see if it contains any files you wish to "
5621
"keep, and delete it when you are done."
5622
msgstr ""
5623
5624
#: bzrlib/errors.py:2167
5625
msgid "Working tree is out of date, please run 'bzr update'.%(more)s"
5626
msgstr ""
5627
5628
#: bzrlib/errors.py:2181
5629
msgid ""
5630
"Public branch \"%(public_location)s\" lacks revision \"%(revstring)s\"."
5631
msgstr ""
5632
5633
#: bzrlib/errors.py:2194
5634
msgid "Error in merge modified format"
5635
msgstr ""
5636
5637
#: bzrlib/errors.py:2199
5638
msgid "Format error in conflict listings"
5639
msgstr ""
5640
5641
#: bzrlib/errors.py:2203
5642
msgid ""
5643
"Inconsistency in dirstate file %(dirstate_path)s.\n"
5644
"Error: %(description)s"
5645
msgstr ""
5646
5647
#: bzrlib/errors.py:2214
5648
msgid ""
5649
"An error has been detected in the repository %(repo_path)s.\n"
5650
"Please run bzr reconcile on this repository."
5651
msgstr ""
5652
5653
#: bzrlib/errors.py:2225
5654
msgid ""
5655
"An inconsistent delta was supplied involving %(path)r, %(file_id)r\n"
5656
"reason: %(reason)s"
5657
msgstr ""
5658
5659
#: bzrlib/errors.py:2238
5660
msgid ""
5661
"An inconsistent delta was supplied: %(delta)r\n"
5662
"reason: %(reason)s"
5663
msgstr ""
5664
5665
#: bzrlib/errors.py:2250
5666
msgid "To use this feature you must upgrade your branch at %(path)s."
5667
msgstr ""
5668
5669
#: bzrlib/errors.py:2259
5670
msgid "To use this feature you must upgrade your repository at %(path)s."
5671
msgstr ""
5672
5673
#: bzrlib/errors.py:2264
5674
msgid ""
5675
"To use this feature you must upgrade your branch at %(path)s to a format "
5676
"which supports rich roots."
5677
msgstr ""
5678
5679
#: bzrlib/errors.py:2270
5680
msgid "Cannot perform local-only commits on unbound branches."
5681
msgstr ""
5682
5683
#: bzrlib/errors.py:2275
5684
msgid "The method %(mname)s is not supported on objects of type %(tname)s."
5685
msgstr ""
5686
5687
#: bzrlib/errors.py:2296
5688
msgid "Ghost tags not supported by format %(format)r."
5689
msgstr ""
5690
5691
#: bzrlib/errors.py:2304
5692
msgid "File is binary but should be text."
5693
msgstr ""
5694
5695
#: bzrlib/errors.py:2309
5696
msgid "The path %(path)s is not permitted on this platform"
5697
msgstr ""
5698
5699
#: bzrlib/errors.py:2318
5700
msgid ""
5701
"Testament did not match expected value.\n"
5702
" For revision_id {%(revision_id)s}, expected {%(expected)s}, measured\n"
5703
" {%(measured)s}"
5704
msgstr ""
5705
5706
#: bzrlib/errors.py:2330
5707
msgid "Not a bzr revision-bundle: %(text)r"
5708
msgstr ""
5709
5710
#: bzrlib/errors.py:2339
5711
msgid "Bad bzr revision-bundle: %(text)r"
5712
msgstr ""
5713
5714
#: bzrlib/errors.py:2348
5715
msgid "Malformed bzr revision-bundle header: %(text)r"
5716
msgstr ""
5717
5718
#: bzrlib/errors.py:2353
5719
msgid "Malformed patches in bzr revision-bundle: %(text)r"
5720
msgstr ""
5721
5722
#: bzrlib/errors.py:2358
5723
msgid "Malformed footer in bzr revision-bundle: %(text)r"
5724
msgstr ""
5725
5726
#: bzrlib/errors.py:2363
5727
msgid "End of line marker was not \\n in bzr revision-bundle"
5728
msgstr ""
5729
5730
#: bzrlib/errors.py:2373
5731
msgid "Bundle format %(bundle_format)s is incompatible with %(other)s"
5732
msgstr ""
5733
5734
#: bzrlib/errors.py:2383
5735
msgid "Root class for inventory serialization errors"
5736
msgstr ""
5737
5738
#: bzrlib/errors.py:2387
5739
msgid ""
5740
"The inventory was not in the expected format:\n"
5741
" %(msg)s"
5742
msgstr ""
5743
5744
#: bzrlib/errors.py:2396
5745
msgid "This operation requires rich root data storage"
5746
msgstr ""
5747
5748
#: bzrlib/errors.py:2409
5749
msgid "Unrecognised value for BZR_SSH environment variable: %(vendor)s"
5750
msgstr ""
5751
5752
#: bzrlib/errors.py:2418
5753
msgid ""
5754
"Don't know how to handle SSH connections. Please set BZR_SSH environment "
5755
"variable."
5756
msgstr ""
5757
5758
#: bzrlib/errors.py:2425
5759
msgid ""
5760
"Could not determine revno for {%(revision_id)s} because its ancestry shows a "
5761
"ghost at {%(ghost_revision_id)s}"
5762
msgstr ""
5763
5764
#: bzrlib/errors.py:2435
5765
msgid "Ghost revision {%(revision_id)s} cannot be used here."
5766
msgstr ""
5767
5768
#: bzrlib/errors.py:2486
5769
msgid ""
5770
"A merge directive must provide either a bundle or a public branch location."
5771
msgstr ""
5772
5773
#: bzrlib/errors.py:2493
5774
msgid "Bad merge directive payload %(start)r"
5775
msgstr ""
5776
5777
#: bzrlib/errors.py:2503
5778
msgid "Preview patch does not match requested changes."
5779
msgstr ""
5780
5781
#: bzrlib/errors.py:2509
5782
msgid "Patch_type was %(patch_type)s, but no patch was supplied."
5783
msgstr ""
5784
5785
#: bzrlib/errors.py:2519
5786
msgid ""
5787
"Your branch does not have all of the revisions required in order to merge "
5788
"this merge directive and the target location specified in the merge "
5789
"directive is not a branch: %(location)s."
5790
msgstr ""
5791
5792
#: bzrlib/errors.py:2531
5793
msgid "Unsupported entry kind %(kind)s"
5794
msgstr ""
5795
5796
#: bzrlib/errors.py:2539
5797
msgid "Can't subsume %(other_tree)s into %(tree)s. %(reason)s"
5798
msgstr ""
5799
5800
#: bzrlib/errors.py:2549
5801
msgid "Subsume target %(other_tree)s needs to be upgraded."
5802
msgstr ""
5803
5804
#: bzrlib/errors.py:2568
5805
msgid "No such tag: %(tag_name)s"
5806
msgstr ""
5807
5808
#: bzrlib/errors.py:2576
5809
msgid "Tags not supported by %(branch)s; you may be able to use bzr upgrade."
5810
msgstr ""
5811
5812
#: bzrlib/errors.py:2585
5813
msgid "Tag %(tag_name)s already exists."
5814
msgstr ""
5815
5816
#: bzrlib/errors.py:2593
5817
msgid ""
5818
"Did not understand bug identifier %(bug_id)s: %(reason)s. See \"bzr help "
5819
"bugs\" for more information on this feature."
5820
msgstr ""
5821
5822
#: bzrlib/errors.py:2603
5823
msgid ""
5824
"The URL for bug tracker \"%(abbreviation)s\" doesn't contain {id}: %(url)s"
5825
msgstr ""
5826
5827
#: bzrlib/errors.py:2613
5828
msgid ""
5829
"Cannot find registered bug tracker called %(abbreviation)s on %(branch)s"
5830
msgstr ""
5831
5832
#: bzrlib/errors.py:2623
5833
msgid "Invalid line in bugs property: '%(line)s'"
5834
msgstr ""
5835
5836
#: bzrlib/errors.py:2631
5837
msgid "Invalid bug status: '%(status)s'"
5838
msgstr ""
5839
5840
#: bzrlib/errors.py:2639
5841
msgid "Could not understand response from smart server: %(response_tuple)r"
5842
msgstr ""
5843
5844
#: bzrlib/errors.py:2678
5845
msgid "Server sent an unexpected error: %(error_tuple)r"
5846
msgstr ""
5847
5848
#: bzrlib/errors.py:2697
5849
msgid "Unrecognised container format: %(container_format)r"
5850
msgstr ""
5851
5852
#: bzrlib/errors.py:2705
5853
msgid "Unexpected end of container stream"
5854
msgstr ""
5855
5856
#: bzrlib/errors.py:2710
5857
msgid "Unknown record type: %(record_type)r"
5858
msgstr ""
5859
5860
#: bzrlib/errors.py:2718
5861
msgid "Invalid record: %(reason)s"
5862
msgstr ""
5863
5864
#: bzrlib/errors.py:2726
5865
msgid "Container has data after end marker: %(excess)r"
5866
msgstr ""
5867
5868
#: bzrlib/errors.py:2734
5869
msgid "Container has multiple records with the same name: %(name)s"
5870
msgstr ""
5871
5872
#: bzrlib/errors.py:2747
5873
msgid "Corrupt or incompatible data stream: %(reason)s"
5874
msgstr ""
5875
5876
#: bzrlib/errors.py:2755
5877
msgid "SMTP error: %(error)s"
5878
msgstr ""
5879
5880
#: bzrlib/errors.py:2763
5881
msgid "No message supplied."
5882
msgstr ""
5883
5884
#: bzrlib/errors.py:2768
5885
msgid "No mail-to address (--mail-to) or output (-o) specified."
5886
msgstr ""
5887
5888
#: bzrlib/errors.py:2773
5889
msgid "Unknown mail client: %(mail_client)s"
5890
msgstr ""
5891
5892
#: bzrlib/errors.py:2781
5893
msgid ""
5894
"Unable to find mail client with the following names: "
5895
"%(mail_command_list_string)s"
5896
msgstr ""
5897
5898
#: bzrlib/errors.py:2791
5899
msgid "SMTP connection to %(host)s refused"
5900
msgstr ""
5901
5902
#: bzrlib/errors.py:2800
5903
msgid "Please specify smtp_server. No server at default %(host)s."
5904
msgstr ""
5905
5906
#: bzrlib/errors.py:2814
5907
msgid ""
5908
"'%(display_url)s' is not in sync with %(target_url)s. See bzr help sync-for-"
5909
"reconfigure."
5910
msgstr ""
5911
5912
#: bzrlib/errors.py:2826
5913
msgid "'%(display_url)s' is already a branch."
5914
msgstr ""
5915
5916
#: bzrlib/errors.py:2831
5917
msgid "'%(display_url)s' is already a tree."
5918
msgstr ""
5919
5920
#: bzrlib/errors.py:2836
5921
msgid "'%(display_url)s' is already a checkout."
5922
msgstr ""
5923
5924
#: bzrlib/errors.py:2841
5925
msgid "'%(display_url)s' is already a lightweight checkout."
5926
msgstr ""
5927
5928
#: bzrlib/errors.py:2846
5929
msgid "'%(display_url)s' is already using a shared repository."
5930
msgstr ""
5931
5932
#: bzrlib/errors.py:2851
5933
msgid "'%(display_url)s' is already standalone."
5934
msgstr ""
5935
5936
#: bzrlib/errors.py:2856
5937
msgid "Shared repository '%(display_url)s' already creates working trees."
5938
msgstr ""
5939
5940
#: bzrlib/errors.py:2862
5941
msgid ""
5942
"Shared repository '%(display_url)s' already doesn't create working trees."
5943
msgstr ""
5944
5945
#: bzrlib/errors.py:2868
5946
msgid "Requested reconfiguration of '%(display_url)s' is not supported."
5947
msgstr ""
5948
5949
#: bzrlib/errors.py:2873
5950
msgid "No location could be found to bind to at %(display_url)s."
5951
msgstr ""
5952
5953
#: bzrlib/errors.py:2878
5954
msgid ""
5955
"Working tree \"%(display_url)s\" has uncommitted changes (See bzr "
5956
"status).%(more)s"
5957
msgstr ""
5958
5959
#: bzrlib/errors.py:2897
5960
msgid ""
5961
"Working tree \"%(display_url)s\" has shelved changes (See bzr shelve --"
5962
"list).%(more)s"
5963
msgstr ""
5964
5965
#: bzrlib/errors.py:2903
5966
msgid "Variable {%(name)s} is not available."
5967
msgstr ""
5968
5969
#: bzrlib/errors.py:2911
5970
msgid "No template specified."
5971
msgstr ""
5972
5973
#: bzrlib/errors.py:2916
5974
msgid "Unable to create symlink %(path_str)son this platform"
5975
msgstr ""
5976
5977
#: bzrlib/errors.py:2931
5978
msgid ""
5979
"Unsupported timezone format \"%(timezone)s\", options are \"utc\", "
5980
"\"original\", \"local\"."
5981
msgstr ""
5982
5983
#: bzrlib/errors.py:2965
5984
msgid ""
5985
"Unable to encode %(kind)s path %(path)r in user encoding %(user_encoding)s"
5986
msgstr ""
5987
5988
#: bzrlib/errors.py:2977
5989
msgid "The \"%(config_id)s\" configuration does not exist."
5990
msgstr ""
5991
5992
#: bzrlib/errors.py:2985
5993
msgid "The \"%(option_name)s\" configuration option does not exist."
5994
msgstr ""
5995
5996
#: bzrlib/errors.py:2993
5997
msgid "The alias \"%(alias_name)s\" does not exist."
5998
msgstr ""
5999
6000
#: bzrlib/errors.py:3007
6001
msgid "\"%(alias_name)s\" is not a valid location alias."
6002
msgstr ""
6003
6004
#: bzrlib/errors.py:3015
6005
msgid "No %(alias_name)s location assigned."
6006
msgstr ""
6007
6008
#: bzrlib/errors.py:3023
6009
msgid "Cannot bind address \"%(host)s:%(port)i\": %(orig_error)s."
6010
msgstr ""
6011
6012
#: bzrlib/errors.py:3033
6013
msgid "Unknown rules detected: %(unknowns_str)s."
6014
msgstr ""
6015
6016
#: bzrlib/errors.py:3044
6017
msgid "Tip change rejected: %(msg)s"
6018
msgstr ""
6019
6020
#: bzrlib/errors.py:3052
6021
msgid "Shelf corrupt."
6022
msgstr ""
6023
6024
#: bzrlib/errors.py:3057
6025
msgid "Corruption while decompressing repository file%(orig_error)s"
6026
msgstr ""
6027
6028
#: bzrlib/errors.py:3069
6029
msgid "No changes are shelved with id \"%(shelf_id)d\"."
6030
msgstr ""
6031
6032
#: bzrlib/errors.py:3077
6033
msgid "\"%(invalid_id)s\" is not a valid shelf id, try a number instead."
6034
msgstr ""
6035
6036
#: bzrlib/errors.py:3085
6037
msgid ""
6038
"An attempt to access a url outside the server jail was made: '%(url)s'."
6039
msgstr ""
6040
6041
#: bzrlib/errors.py:3093
6042
msgid "The user aborted the operation."
6043
msgstr ""
6044
6045
#: bzrlib/errors.py:3098
6046
msgid "Branching '%(url)s'(%(format)s) must create a working tree."
6047
msgstr ""
6048
6049
#: bzrlib/errors.py:3108
6050
msgid "No such view: %(view_name)s."
6051
msgstr ""
6052
6053
#: bzrlib/errors.py:3118
6054
msgid ""
6055
"Views are not supported by %(tree)s; use 'bzr upgrade' to change your tree "
6056
"to a later format."
6057
msgstr ""
6058
6059
#: bzrlib/errors.py:3127
6060
msgid ""
6061
"Specified file \"%(file_name)s\" is outside the current view: %(view_str)s"
6062
msgstr ""
6063
6064
#: bzrlib/errors.py:3194
6065
msgid "%(bzrdir)r does not support co-located branches."
6066
msgstr ""
6067
6068
#: bzrlib/errors.py:3200
6069
msgid ""
6070
"Unable to determine your name.\n"
6071
"Please, set your name with the 'whoami' command.\n"
6072
"E.g. bzr whoami \"Your Name <name@example.com>\""
6073
msgstr ""
6074
6075
#: bzrlib/errors.py:3209
6076
msgid "Invalid pattern(s) found. %(msg)s"
6077
msgstr ""
6078
6079
#: bzrlib/errors.py:3217
6080
msgid ""
6081
"Branch \"%(branch_url)s\" appears to be bound to itself. Please use `bzr "
6082
"unbind` to fix."
6083
msgstr ""
6084
6085
#: bzrlib/errors.py:3228
6086
msgid "Loop involving %(refs)r while expanding \"%(string)s\"."
6087
msgstr ""
6088
6089
#: bzrlib/errors.py:3237
6090
msgid "Option %(name)s is not defined while expanding \"%(string)s\"."
6091
msgstr ""
6092
6093
#: bzrlib/errors.py:3246
6094
msgid ""
6095
"No compatible object available for operations from %(source)r to %(target)r."
6096
msgstr ""
6097
6098
#: bzrlib/errors.py:3256
6099
msgid ""
6100
"VFS requests over the smart server are not allowed. Encountered: %(method)s, "
6101
"%(arguments)s."
6102
msgstr ""
6103
6104
#: bzrlib/errors.py:3266
6105
msgid ""
6106
"Kind change from %(from_kind)s to %(to_kind)s for %(path)s not supported by "
6107
"format %(format)r"
6108
msgstr ""
6109
6110
#: bzrlib/errors.py:3278
6111
msgid ""
6112
"Missing feature %(feature)s not provided by this version of Bazaar or any "
6113
"plugin."
6114
msgstr ""
6115
6116
#: bzrlib/errors.py:3291
6117
msgid "Binary files section encountered."
6118
msgstr ""
6119
6120
#: bzrlib/errors.py:3299
6121
msgid ""
6122
"Malformed patch header. %(desc)s\n"
6123
"%(line)r"
6124
msgstr ""
6125
6126
#: bzrlib/errors.py:3308
6127
msgid ""
6128
"Malformed hunk header. %(desc)s\n"
6129
"%(line)r"
6130
msgstr ""
6131
6132
#: bzrlib/errors.py:3317
6133
msgid ""
6134
"Malformed line. %(desc)s\n"
6135
"%(line)r"
6136
msgstr ""
6137
6138
#: bzrlib/errors.py:3327
6139
msgid ""
6140
"Text contents mismatch at line %(line_no)d. Original has \"%(orig_line)s\", "
6141
"but patch says it should be \"%(patch_line)s\""
6142
msgstr ""
6143
6144
#: bzrlib/errors.py:3338
6145
msgid "The feature %(feature)s has already been registered."
6146
msgstr ""
6147
6148
#: bzrlib/export_pot.py:252
6149
#, python-format
6150
msgid "Exporting messages from builtin command: %s"
6151
msgstr ""
6152
6153
#: bzrlib/export_pot.py:271
6154
msgid "Exporting messages from plugin command: {0} in {1}"
6155
msgstr ""
6156
6157
#: bzrlib/export_pot.py:292
6158
#, python-format
6159
msgid "Exporting message from error: %s"
6160
msgstr ""
6161
6162
#: bzrlib/fetch.py:98
6163
msgid "Finding revisions"
6164
msgstr ""
6165
6166
#: bzrlib/fetch.py:103
6167
msgid "Fetching revisions"
6168
msgstr ""
6169
6170
#: bzrlib/foreign.py:262
6171
msgid "Push into a different VCS without any custom bzr metadata."
6172
msgstr ""
6173
6174
#: bzrlib/foreign.py:264
6175
msgid ""
6176
"This will afterwards rebase the local branch on the remote\n"
6177
"branch unless the --no-rebase option is used, in which case \n"
6178
"the two branches will be out of sync after the push. "
6179
msgstr ""
6180
6181
#: bzrlib/foreign.py:277
6182
msgid "Do not rebase after push."
6183
msgstr ""
6184
6185
#: bzrlib/foreign.py:311
6186
#, python-format
6187
msgid "Using saved location: %s\n"
6188
msgstr ""
6189
6190
#: bzrlib/foreign.py:321
6191
msgid ""
6192
"{0!r} and {1!r} are in the same VCS, lossy push not necessary. Please use "
6193
"regular push."
6194
msgstr ""
6195
6196
#: bzrlib/gpg.py:119 bzrlib/gpg.py:460
6197
msgid "{0} commits with valid signatures"
6198
msgstr ""
6199
6200
#: bzrlib/gpg.py:123 bzrlib/gpg.py:465
6201
msgid "{0} commit with unknown key"
6202
msgid_plural "{0} commits with unknown keys"
6203
msgstr[0] ""
6204
msgstr[1] ""
6205
6206
#: bzrlib/gpg.py:129 bzrlib/gpg.py:472
6207
msgid "{0} commit not valid"
6208
msgid_plural "{0} commits not valid"
6209
msgstr[0] ""
6210
msgstr[1] ""
6211
6212
#: bzrlib/gpg.py:135 bzrlib/gpg.py:479
6213
msgid "{0} commit not signed"
6214
msgid_plural "{0} commits not signed"
6215
msgstr[0] ""
6216
msgstr[1] ""
6217
6218
#: bzrlib/gpg.py:141 bzrlib/gpg.py:486
6219
msgid "{0} commit with key now expired"
6220
msgid_plural "{0} commits with key now expired"
6221
msgstr[0] ""
6222
msgstr[1] ""
6223
6224
#: bzrlib/gpg.py:343
6225
msgid "No GnuPG key results for pattern: {0}"
6226
msgstr ""
6227
6228
#: bzrlib/gpg.py:386
6229
msgid "{0} signed {1} commit"
6230
msgid_plural "{0} signed {1} commits"
6231
msgstr[0] ""
6232
msgstr[1] ""
6233
6234
#: bzrlib/gpg.py:403 bzrlib/gpg.py:419
6235
msgid "{0} commit by author {1}"
6236
msgid_plural "{0} commits by author {1}"
6237
msgstr[0] ""
6238
msgstr[1] ""
6239
6240
#: bzrlib/gpg.py:433
6241
msgid "Unknown key {0} signed {1} commit"
6242
msgid_plural "Unknown key {0} signed {1} commits"
6243
msgstr[0] ""
6244
msgstr[1] ""
6245
6246
#: bzrlib/gpg.py:452
6247
msgid "{0} commit by author {1} with key {2} now expired"
6248
msgid_plural "{0} commits by author {1} with key {2} now expired"
6249
msgstr[0] ""
6250
msgstr[1] ""
6251
6252
#: bzrlib/groupcompress.py:1739
6253
#, python-format
6254
msgid "Insert claimed random_id=True, but then inserted %r two times"
6255
msgstr ""
6256
6257
#: bzrlib/hooks.py:331
6258
#, python-format
6259
msgid "Introduced in: %s"
6260
msgstr ""
6261
6262
#: bzrlib/hooks.py:334
6263
#, python-format
6264
msgid "Deprecated in: %s"
6265
msgstr ""
6266
6267
#: bzrlib/knit.py:1766 bzrlib/knit.py:1802
6268
msgid "Walking content"
6269
msgstr ""
6270
6271
#: bzrlib/knit.py:3330
6272
msgid "annotating"
6273
msgstr ""
6274
6275
#: bzrlib/lock.py:548
6276
msgid "{0!r} was {1} locked again"
6277
msgstr ""
6278
6279
#: bzrlib/lockdir.py:321
6280
#, python-format
6281
msgid "error removing pending lock: %s"
6282
msgstr ""
6283
6284
#: bzrlib/lockdir.py:616
6285
msgid "Unable to obtain"
6286
msgstr ""
6287
6288
#: bzrlib/lockdir.py:618
6289
msgid "Lock owner changed for"
6290
msgstr ""
6291
6292
#: bzrlib/lockdir.py:620
6293
msgid "{0} lock {1} {2}."
6294
msgstr ""
6295
6296
#: bzrlib/lockdir.py:627
6297
#, python-format
6298
msgid "Will continue to try until %s, unless you press Ctrl-C."
6299
msgstr ""
6300
6301
#: bzrlib/lockdir.py:629
6302
msgid "See \"bzr help break-lock\" for more."
6303
msgstr ""
6304
6305
#: bzrlib/lockdir.py:739
6306
#, python-format
6307
msgid ""
6308
"held by %(user)s on %(hostname)s (process #%(pid)s), acquired %(time_ago)s"
6309
msgstr ""
6310
6311
#: bzrlib/log.py:572
6312
msgid "--exclude-common-ancestry requires two different revisions"
6313
msgstr ""
6314
6315
#: bzrlib/log.py:574
6316
#, python-format
6317
msgid "invalid direction %r"
6318
msgstr ""
6319
6320
#: bzrlib/log.py:662
6321
msgid "Start revision not found in history of end revision."
6322
msgstr ""
6323
6324
#: bzrlib/log.py:1080 bzrlib/log.py:1138
6325
msgid "Logging revision 0 is invalid."
6326
msgstr ""
6327
6328
#: bzrlib/log.py:1082 bzrlib/log.py:1140
6329
msgid "Start revision must be older than the end revision."
6330
msgstr ""
6331
6332
#: bzrlib/log.py:1827
6333
#, python-format
6334
msgid "unknown log formatter: %r"
6335
msgstr ""
6336
6337
#: bzrlib/log.py:2123
6338
msgid "fixes bug"
6339
msgid_plural "fixes bugs"
6340
msgstr[0] ""
6341
msgstr[1] ""
6342
6343
#: bzrlib/merge.py:689
6344
msgid "All changes applied successfully."
6345
msgstr ""
6346
6347
#: bzrlib/merge.py:691
6348
#, python-format
6349
msgid "%d conflicts encountered."
6350
msgstr ""
6351
6352
#: bzrlib/merge.py:845 bzrlib/merge.py:1933
6353
msgid "Preparing file merge"
6354
msgstr ""
6355
6356
#: bzrlib/multiparent.py:426
6357
msgid "Importing revisions"
6358
msgstr ""
6359
6360
#: bzrlib/option.py:526
6361
msgid "Show help message."
6362
msgstr ""
6363
6364
#: bzrlib/option.py:528
6365
msgid "Only display errors and warnings."
6366
msgstr ""
6367
6368
#: bzrlib/option.py:531
6369
msgid "Show usage message and options."
6370
msgstr ""
6371
6372
#: bzrlib/option.py:533
6373
msgid "Display more information."
6374
msgstr ""
6375
6376
#: bzrlib/option.py:541
6377
msgid ""
6378
"Select changes introduced by the specified revision. See also \"help "
6379
"revisionspec\"."
6380
msgstr ""
6381
6382
#: bzrlib/option.py:543
6383
msgid "Branch to operate on, instead of working directory."
6384
msgstr ""
6385
6386
#: bzrlib/option.py:545
6387
msgid "Detailed log format."
6388
msgstr ""
6389
6390
#: bzrlib/option.py:545
6391
msgid "Format used by GNU ChangeLog files."
6392
msgstr ""
6393
6394
#: bzrlib/option.py:545
6395
msgid "Log format with one line per revision."
6396
msgstr ""
6397
6398
#: bzrlib/option.py:545
6399
msgid "Moderately short log format."
6400
msgstr ""
6401
6402
#: bzrlib/option.py:545
6403
msgid "Use specified log format."
6404
msgstr ""
6405
6406
#: bzrlib/option.py:547
6407
msgid "Log format"
6408
msgstr ""
6409
6410
#: bzrlib/option.py:549
6411
msgid "LCA-newness merge."
6412
msgstr ""
6413
6414
#: bzrlib/option.py:549
6415
msgid "Merge using external diff3."
6416
msgstr ""
6417
6418
#: bzrlib/option.py:549
6419
msgid "Native diff3-style merge."
6420
msgstr ""
6421
6422
#: bzrlib/option.py:549
6423
msgid "Select a particular merge algorithm."
6424
msgstr ""
6425
6426
#: bzrlib/option.py:549
6427
msgid "Weave-based merge."
6428
msgstr ""
6429
6430
#: bzrlib/option.py:551
6431
msgid "Merge algorithm"
6432
msgstr ""
6433
6434
#: bzrlib/option.py:554
6435
msgid "Message string."
6436
msgstr ""
6437
6438
#: bzrlib/option.py:556
6439
msgid "Use an ASCII NUL (\\0) separator rather than a newline."
6440
msgstr ""
6441
6442
#: bzrlib/option.py:558
6443
msgid "Ignore differences between branches and overwrite unconditionally."
6444
msgstr ""
6445
6446
#: bzrlib/option.py:560
6447
msgid "Remember the specified location as a default."
6448
msgstr ""
6449
6450
#: bzrlib/option.py:562
6451
msgid "Reprocess to reduce spurious conflicts."
6452
msgstr ""
6453
6454
#: bzrlib/option.py:566
6455
msgid "See \"help revisionspec\" for details."
6456
msgstr ""
6457
6458
#: bzrlib/option.py:568
6459
msgid "Show internal object ids."
6460
msgstr ""
6461
6462
#: bzrlib/option.py:571
6463
msgid "Display timezone as local, original, or utc."
6464
msgstr ""
6465
6466
#: bzrlib/osutils.py:100
6467
msgid "Parameter {0!r} encoding is unsupported by {1} application locale."
6468
msgstr ""
6469
6470
#: bzrlib/osutils.py:220
6471
msgid "lstat/stat of ({0!r}): {1!r}"
6472
msgstr ""
6473
6474
#: bzrlib/osutils.py:1008 bzrlib/osutils.py:1019
6475
#, python-format
6476
msgid "sorry, %r not allowed in path"
6477
msgstr ""
6478
6479
#: bzrlib/osutils.py:1237
6480
#, python-format
6481
msgid "%r is too short to calculate a relative path"
6482
msgstr ""
6483
6484
#: bzrlib/plugin.py:143
6485
#, python-format
6486
msgid "\"%s\" is not a valid <plugin_name>@<plugin_path> description "
6487
msgstr ""
6488
6489
#: bzrlib/plugins/bash_completion/bashcomp.py:411
6490
msgid "Enable completions for the selected plugin (default: all plugins)"
6491
msgstr ""
6492
6493
#: bzrlib/plugins/bash_completion/bashcomp.py:412
6494
msgid "Generate a shell function for bash command line completion."
6495
msgstr ""
6496
6497
#: bzrlib/plugins/bash_completion/bashcomp.py:414
6498
msgid ""
6499
"This command generates a shell function which can be used by bash to\n"
6500
"automatically complete the currently typed command when the user presses\n"
6501
"the completion key (usually tab)."
6502
msgstr ""
6503
6504
#: bzrlib/plugins/bash_completion/bashcomp.py:418
6505
msgid ""
6506
"Commonly used like this:\n"
6507
" eval \"`bzr bash-completion`\""
6508
msgstr ""
6509
6510
#: bzrlib/plugins/bash_completion/bashcomp.py:424
6511
msgid "Name of the generated function (default: _bzr)"
6512
msgstr ""
6513
6514
#: bzrlib/plugins/bash_completion/bashcomp.py:426
6515
msgid "Generate only the shell function, don't enable it"
6516
msgstr ""
6517
6518
#: bzrlib/plugins/launchpad/__init__.py:81
6519
msgid "Register a branch with launchpad.net."
6520
msgstr ""
6521
6522
#: bzrlib/plugins/launchpad/__init__.py:83
6523
msgid ""
6524
"This command lists a bzr branch in the directory of branches on\n"
6525
"launchpad.net. Registration allows the branch to be associated with\n"
6526
"bugs or specifications."
6527
msgstr ""
6528
6529
#: bzrlib/plugins/launchpad/__init__.py:87
6530
msgid ""
6531
"Before using this command you must register the project to which the\n"
6532
"branch belongs, and create an account for yourself on launchpad.net."
6533
msgstr ""
6534
6535
#: bzrlib/plugins/launchpad/__init__.py:90
6536
msgid ""
6537
"arguments:\n"
6538
" public_url: The publicly visible url for the branch to register.\n"
6539
" This must be an http or https url (which Launchpad can read\n"
6540
" from to access the branch). Local file urls, SFTP urls, and\n"
6541
" bzr+ssh urls will not work.\n"
6542
" If no public_url is provided, bzr will use the configured\n"
6543
" public_url if there is one for the current branch, and\n"
6544
" otherwise error."
6545
msgstr ""
6546
6547
#: bzrlib/plugins/launchpad/__init__.py:99
6548
msgid ""
6549
"example:\n"
6550
" bzr register-branch http://foo.com/bzr/fooproject.mine \\\n"
6551
" --project fooproject"
6552
msgstr ""
6553
6554
#: bzrlib/plugins/launchpad/__init__.py:106
6555
msgid "Launchpad project short name to associate with the branch."
6556
msgstr ""
6557
6558
#: bzrlib/plugins/launchpad/__init__.py:113
6559
msgid ""
6560
"Short name for the branch; by default taken from the last component of the "
6561
"url."
6562
msgstr ""
6563
6564
#: bzrlib/plugins/launchpad/__init__.py:117
6565
msgid "One-sentence description of the branch."
6566
msgstr ""
6567
6568
#: bzrlib/plugins/launchpad/__init__.py:120
6569
msgid "Longer description of the purpose or contents of the branch."
6570
msgstr ""
6571
6572
#: bzrlib/plugins/launchpad/__init__.py:123
6573
msgid "Branch author's email address, if not yourself."
6574
msgstr ""
6575
6576
#: bzrlib/plugins/launchpad/__init__.py:126
6577
msgid "The bug this branch fixes."
6578
msgstr ""
6579
6580
#: bzrlib/plugins/launchpad/__init__.py:129
6581
msgid "Prepare the request but don't actually send it."
6582
msgstr ""
6583
6584
#: bzrlib/plugins/launchpad/__init__.py:151
6585
msgid ""
6586
"register-branch requires a public branch url - see bzr help register-branch."
6587
msgstr ""
6588
6589
#: bzrlib/plugins/launchpad/__init__.py:159
6590
msgid "--product is deprecated; please use --project."
6591
msgstr ""
6592
6593
#: bzrlib/plugins/launchpad/__init__.py:191
6594
msgid "Open a Launchpad branch page in your web browser."
6595
msgstr ""
6596
6597
#: bzrlib/plugins/launchpad/__init__.py:196
6598
msgid "Do not actually open the browser. Just say the URL we would use."
6599
msgstr ""
6600
6601
#: bzrlib/plugins/launchpad/__init__.py:231
6602
#, python-format
6603
msgid "Opening %s in web browser"
6604
msgstr ""
6605
6606
#: bzrlib/plugins/launchpad/__init__.py:241
6607
msgid "Show or set the Launchpad user ID."
6608
msgstr ""
6609
6610
#: bzrlib/plugins/launchpad/__init__.py:243
6611
msgid ""
6612
"When communicating with Launchpad, some commands need to know your\n"
6613
"Launchpad user ID. This command can be used to set or show the\n"
6614
"user ID that Bazaar will use for such communication."
6615
msgstr ""
6616
6617
#: bzrlib/plugins/launchpad/__init__.py:247
6618
msgid ""
6619
":Examples:\n"
6620
" Show the Launchpad ID of the current user::"
6621
msgstr ""
6622
6623
#: bzrlib/plugins/launchpad/__init__.py:250
6624
msgid " bzr launchpad-login"
6625
msgstr ""
6626
6627
#: bzrlib/plugins/launchpad/__init__.py:252
6628
msgid " Set the Launchpad ID of the current user to 'bob'::"
6629
msgstr ""
6630
6631
#: bzrlib/plugins/launchpad/__init__.py:254
6632
msgid " bzr launchpad-login bob"
6633
msgstr ""
6634
6635
#: bzrlib/plugins/launchpad/__init__.py:261
6636
msgid "Don't check that the user name is valid."
6637
msgstr ""
6638
6639
#: bzrlib/plugins/launchpad/__init__.py:276
6640
#: bzrlib/plugins/launchpad/__init__.py:287
6641
msgid "Launchpad user ID exists and has SSH keys.\n"
6642
msgstr ""
6643
6644
#: bzrlib/plugins/launchpad/__init__.py:279
6645
msgid "No Launchpad user ID configured.\n"
6646
msgstr ""
6647
6648
#: bzrlib/plugins/launchpad/__init__.py:290
6649
#, python-format
6650
msgid "Launchpad user ID set to '%s'.\n"
6651
msgstr ""
6652
6653
#: bzrlib/plugins/launchpad/__init__.py:298
6654
msgid "Ask Launchpad to mirror a branch now."
6655
msgstr ""
6656
6657
#: bzrlib/plugins/launchpad/__init__.py:318
6658
msgid "Propose merging a branch on Launchpad."
6659
msgstr ""
6660
6661
#: bzrlib/plugins/launchpad/__init__.py:320
6662
msgid ""
6663
"This will open your usual editor to provide the initial comment. When it\n"
6664
"has created the proposal, it will open it in your default web browser."
6665
msgstr ""
6666
6667
#: bzrlib/plugins/launchpad/__init__.py:323
6668
msgid ""
6669
"The branch will be proposed to merge into SUBMIT_BRANCH. If SUBMIT_BRANCH\n"
6670
"is not supplied, the remembered submit branch will be used. If no submit\n"
6671
"branch is remembered, the development focus will be used."
6672
msgstr ""
6673
6674
#: bzrlib/plugins/launchpad/__init__.py:327
6675
msgid ""
6676
"By default, the SUBMIT_BRANCH's review team will be requested to review\n"
6677
"the merge proposal. This can be overriden by specifying --review (-R).\n"
6678
"The parameter the launchpad account name of the desired reviewer. This\n"
6679
"may optionally be followed by '=' and the review type. For example:"
6680
msgstr ""
6681
6682
#: bzrlib/plugins/launchpad/__init__.py:332
6683
msgid " bzr lp-propose-merge --review jrandom --review review-team=qa"
6684
msgstr ""
6685
6686
#: bzrlib/plugins/launchpad/__init__.py:334
6687
msgid ""
6688
"This will propose a merge, request \"jrandom\" to perform a review of\n"
6689
"unspecified type, and request \"review-team\" to perform a \"qa\" review."
6690
msgstr ""
6691
6692
#: bzrlib/plugins/launchpad/__init__.py:339
6693
msgid "Propose the merge on staging."
6694
msgstr ""
6695
6696
#: bzrlib/plugins/launchpad/__init__.py:341
6697
msgid "Commit message."
6698
msgstr ""
6699
6700
#: bzrlib/plugins/launchpad/__init__.py:343
6701
msgid "Mark the proposal as approved immediately."
6702
msgstr ""
6703
6704
#: bzrlib/plugins/launchpad/__init__.py:345
6705
msgid "Requested reviewer and optional type."
6706
msgstr ""
6707
6708
#: bzrlib/plugins/launchpad/__init__.py:382
6709
msgid "Find the proposal to merge this revision."
6710
msgstr ""
6711
6712
#: bzrlib/plugins/launchpad/__init__.py:384
6713
msgid ""
6714
"Finds the merge proposal(s) that discussed landing the specified revision.\n"
6715
"This works only if the selected branch was the merge proposal target, and\n"
6716
"if the merged_revno is recorded for the merge proposal. The proposal(s)\n"
6717
"are opened in a web browser."
6718
msgstr ""
6719
6720
#: bzrlib/plugins/launchpad/__init__.py:389
6721
msgid ""
6722
"Any revision involved in the merge may be specified-- the revision in\n"
6723
"which the merge was performed, or one of the revisions that was merged."
6724
msgstr ""
6725
6726
#: bzrlib/plugins/launchpad/__init__.py:392
6727
msgid "So, to find the merge proposal that reviewed line 1 of README::"
6728
msgstr ""
6729
6730
#: bzrlib/plugins/launchpad/__init__.py:394
6731
msgid " bzr lp-find-proposal -r annotate:README:1"
6732
msgstr ""
6733
6734
#: bzrlib/plugins/launchpad/__init__.py:409
6735
msgid "No review found."
6736
msgstr ""
6737
6738
#: bzrlib/plugins/launchpad/__init__.py:410
6739
#, python-format
6740
msgid "%d proposals(s) found."
6741
msgstr ""
6742
6743
#: bzrlib/plugins/launchpad/__init__.py:420
6744
msgid "Finding revision-id"
6745
msgstr ""
6746
6747
#: bzrlib/plugins/launchpad/__init__.py:427
6748
msgid "Finding merge"
6749
msgstr ""
6750
6751
#: bzrlib/plugins/launchpad/__init__.py:432
6752
msgid "Finding revno"
6753
msgstr ""
6754
6755
#: bzrlib/plugins/launchpad/__init__.py:437
6756
msgid "Finding Launchpad branch"
6757
msgstr ""
6758
6759
#: bzrlib/plugins/launchpad/__init__.py:440
6760
msgid "Finding proposals"
6761
msgstr ""
6762
6763
#: bzrlib/plugins/launchpad/account.py:66
6764
msgid "Setting ssh/sftp usernames for launchpad.net."
6765
msgstr ""
6766
6767
#: bzrlib/plugins/launchpad/lp_api.py:241
6768
#: bzrlib/plugins/launchpad/lp_api.py:246
6769
#, python-format
6770
msgid "%s is not registered on Launchpad"
6771
msgstr ""
6772
6773
#: bzrlib/plugins/launchpad/lp_api.py:256
6774
#, python-format
6775
msgid "%s has no development focus."
6776
msgstr ""
6777
6778
#: bzrlib/plugins/launchpad/lp_api.py:261
6779
#, python-format
6780
msgid "development focus %s has no branch."
6781
msgstr ""
6782
6783
#: bzrlib/plugins/launchpad/lp_api.py:266
6784
#, python-format
6785
msgid "source package %s has no branch."
6786
msgstr ""
6787
6788
#: bzrlib/plugins/launchpad/lp_api.py:270
6789
#, python-format
6790
msgid "%s has no associated product or source package."
6791
msgstr ""
6792
6793
#: bzrlib/plugins/launchpad/lp_api.py:282
6794
#, python-format
6795
msgid "%s is already up-to-date."
6796
msgstr ""
6797
6798
#: bzrlib/plugins/launchpad/lp_api.py:289
6799
#, python-format
6800
msgid "Pushing to %s"
6801
msgstr ""
6802
6803
#: bzrlib/plugins/launchpad/lp_directory.py:170
6804
msgid ""
6805
"resolution for {0}\n"
6806
" local: {1}\n"
6807
" remote: {2}"
6808
msgstr ""
6809
6810
#: bzrlib/plugins/launchpad/lp_propose.py:149
6811
#, python-format
6812
msgid "There is already a branch merge proposal: %s"
6813
msgstr ""
6814
6815
#: bzrlib/plugins/weave_fmt/bzrdir.py:236
6816
msgid "pb parameter to convert() is deprecated"
6817
msgstr ""
6818
6819
#: bzrlib/plugins/weave_fmt/bzrdir.py:239
6820
msgid "starting upgrade from format 4 to 5"
6821
msgstr ""
6822
6823
#: bzrlib/plugins/weave_fmt/bzrdir.py:249
6824
msgid "note: upgrade may be faster if all store files are ungzipped first"
6825
msgstr ""
6826
6827
#: bzrlib/plugins/weave_fmt/bzrdir.py:278
6828
msgid "converting revision"
6829
msgstr ""
6830
6831
#: bzrlib/plugins/weave_fmt/bzrdir.py:283
6832
msgid "upgraded to weaves:"
6833
msgstr ""
6834
6835
#: bzrlib/plugins/weave_fmt/bzrdir.py:284
6836
#, python-format
6837
msgid "%6d revisions and inventories"
6838
msgstr ""
6839
6840
#: bzrlib/plugins/weave_fmt/bzrdir.py:286
6841
#, python-format
6842
msgid "%6d revisions not present"
6843
msgstr ""
6844
6845
#: bzrlib/plugins/weave_fmt/bzrdir.py:288
6846
#, python-format
6847
msgid "%6d texts"
6848
msgstr ""
6849
6850
#: bzrlib/plugins/weave_fmt/bzrdir.py:324
6851
msgid "writing weave"
6852
msgstr ""
6853
6854
#: bzrlib/plugins/weave_fmt/bzrdir.py:328
6855
#: bzrlib/plugins/weave_fmt/bzrdir.py:330
6856
msgid "inventory"
6857
msgstr ""
6858
6859
#: bzrlib/plugins/weave_fmt/bzrdir.py:347
6860
msgid "write revision"
6861
msgstr ""
6862
6863
#: bzrlib/plugins/weave_fmt/bzrdir.py:361
6864
msgid "loading revision"
6865
msgstr ""
6866
6867
#: bzrlib/plugins/weave_fmt/bzrdir.py:366
6868
#, python-format
6869
msgid "revision {%s} not present in branch; will be converted as a ghost"
6870
msgstr ""
6871
6872
#: bzrlib/plugins/weave_fmt/bzrdir.py:506
6873
msgid "starting upgrade from format 5 to 6"
6874
msgstr ""
6875
6876
#: bzrlib/plugins/weave_fmt/bzrdir.py:516
6877
#, python-format
6878
msgid "adding prefixes to %s"
6879
msgstr ""
6880
6881
#: bzrlib/plugins/weave_fmt/bzrdir.py:556
6882
msgid "starting upgrade from format 6 to metadir"
6883
msgstr ""
6884
6885
#: bzrlib/plugins/weave_fmt/bzrdir.py:564
6886
msgid "Removing ancestry.weave"
6887
msgstr ""
6888
6889
#: bzrlib/plugins/weave_fmt/bzrdir.py:569
6890
msgid "Finding branch files"
6891
msgstr ""
6892
6893
#: bzrlib/plugins/weave_fmt/bzrdir.py:579
6894
msgid "Upgrading repository"
6895
msgstr ""
6896
6897
#: bzrlib/plugins/weave_fmt/bzrdir.py:589
6898
msgid "Upgrading branch"
6899
msgstr ""
6900
6901
#: bzrlib/plugins/weave_fmt/bzrdir.py:612
6902
msgid "No working tree."
6903
msgstr ""
6904
6905
#: bzrlib/plugins/weave_fmt/bzrdir.py:619
6906
msgid "Upgrading working tree"
6907
msgstr ""
6908
6909
#: bzrlib/plugins/weave_fmt/bzrdir.py:640
6910
#, python-format
6911
msgid "Make %s lock"
6912
msgstr ""
6913
6914
#: bzrlib/plugins/weave_fmt/bzrdir.py:651
6915
#, python-format
6916
msgid "Moving %s"
6917
msgstr ""
6918
6919
#: bzrlib/push.py:56
6920
msgid "Created new branch."
6921
msgstr ""
6922
6923
#: bzrlib/push.py:97
6924
#, python-format
6925
msgid ""
6926
"Target directory %s already contains a .bzr directory, but it is not valid."
6927
msgstr ""
6928
6929
#: bzrlib/push.py:101
6930
#, python-format
6931
msgid ""
6932
"Target directory %s already exists, but does not have a .bzr directory. "
6933
"Supply --use-existing-dir to push there anyway."
6934
msgstr ""
6935
6936
#: bzrlib/push.py:122
6937
#, python-format
6938
msgid "Too many redirections trying to make %s."
6939
msgstr ""
6940
6941
#: bzrlib/push.py:147
6942
msgid ""
6943
"These branches have diverged. See \"bzr help diverged-branches\" for more "
6944
"information."
6945
msgstr ""
6946
6947
#: bzrlib/push.py:151
6948
#, python-format
6949
msgid ""
6950
"It is not possible to losslessly push to %s. You may want to use dpush "
6951
"instead."
6952
msgstr ""
6953
6954
#: bzrlib/push.py:157
6955
#, python-format
6956
msgid ""
6957
"At %s you have a valid .bzr control directory, but not a branch or "
6958
"repository. This is an unsupported configuration. Please move the target "
6959
"directory out of the way and try again."
6960
msgstr ""
6961
6962
#: bzrlib/reconcile.py:97
6963
#, python-format
6964
msgid "Reconciling branch %s"
6965
msgstr ""
6966
6967
#: bzrlib/reconcile.py:103
6968
#, python-format
6969
msgid "Reconciling repository %s"
6970
msgstr ""
6971
6972
#: bzrlib/reconcile.py:105
6973
msgid "Reconciling repository"
6974
msgstr ""
6975
6976
#: bzrlib/reconcile.py:111
6977
#, python-format
6978
msgid "%s cannot canonicalize CHKs."
6979
msgstr ""
6980
6981
#: bzrlib/reconcile.py:119
6982
msgid "Reconcile aborted: revision index has inconsistent parents."
6983
msgstr ""
6984
6985
#: bzrlib/reconcile.py:121
6986
msgid "Run \"bzr check\" for more details."
6987
msgstr ""
6988
6989
#: bzrlib/reconcile.py:123
6990
msgid "Reconciliation complete."
6991
msgstr ""
6992
6993
#: bzrlib/reconcile.py:166
6994
msgid "Fixing last revision info {0} => {1}"
6995
msgstr ""
6996
6997
#: bzrlib/reconcile.py:173
6998
msgid "revision_history ok."
6999
msgstr ""
7000
7001
#: bzrlib/reconcile.py:234
7002
msgid "Reading inventory data"
7003
msgstr ""
7004
7005
#: bzrlib/reconcile.py:254 bzrlib/reconcile.py:384
7006
msgid "Inventory ok."
7007
msgstr ""
7008
7009
#: bzrlib/reconcile.py:256 bzrlib/reconcile.py:386
7010
msgid "Backing up inventory"
7011
msgstr ""
7012
7013
#: bzrlib/reconcile.py:258
7014
msgid "Backup inventory created."
7015
msgstr ""
7016
7017
#: bzrlib/reconcile.py:274 bzrlib/reconcile.py:405
7018
msgid "Writing weave"
7019
msgstr ""
7020
7021
#: bzrlib/reconcile.py:277 bzrlib/reconcile.py:408
7022
msgid "Inventory regenerated."
7023
msgstr ""
7024
7025
#: bzrlib/reconcile.py:371 bzrlib/reconcile.py:373 bzrlib/reconcile.py:376
7026
msgid "Reading indexes"
7027
msgstr ""
7028
7029
#: bzrlib/reconcile.py:380 bzrlib/reconcile.py:382
7030
msgid "Checking unused inventories"
7031
msgstr ""
7032
7033
#: bzrlib/reconcile.py:388
7034
msgid "Backup Inventory created"
7035
msgstr ""
7036
7037
#: bzrlib/reconcile.py:446
7038
msgid "Fixing text parents"
7039
msgstr ""
7040
7041
#: bzrlib/reconfigure.py:54
7042
msgid "{0} is now stacked on {1}\n"
7043
msgstr ""
7044
7045
#: bzrlib/reconfigure.py:69
7046
#, python-format
7047
msgid "%s is now not stacked\n"
7048
msgstr ""
7049
7050
#: bzrlib/remote.py:1228 bzrlib/repository.py:289
7051
#, python-format
7052
msgid "bzr: ERROR (ignored): %s"
7053
msgstr ""
7054
7055
#: bzrlib/remote.py:2541
7056
msgid "Copying repository content as tarball..."
7057
msgstr ""
7058
7059
#: bzrlib/rename_map.py:69
7060
msgid "Calculating hashes"
7061
msgstr ""
7062
7063
#: bzrlib/rename_map.py:107
7064
msgid "Determining hash hits"
7065
msgstr ""
7066
7067
#: bzrlib/rename_map.py:242
7068
msgid "{0} => {1}"
7069
msgstr ""
7070
7071
#: bzrlib/repository.py:1787
7072
msgid "Moving repository to repository.backup"
7073
msgstr ""
7074
7075
#: bzrlib/repository.py:1794
7076
msgid "Creating new repository"
7077
msgstr ""
7078
7079
#: bzrlib/repository.py:1799
7080
msgid "Copying content"
7081
msgstr ""
7082
7083
#: bzrlib/repository.py:1803
7084
msgid "Deleting old repository content"
7085
msgstr ""
7086
7087
#: bzrlib/repository.py:1805
7088
msgid "repository converted"
7089
msgstr ""
7090
7091
#: bzrlib/revisionspec.py:903
7092
msgid "Using {0} {1}"
7093
msgstr ""
7094
7095
#: bzrlib/send.py:58
7096
#, python-format
7097
msgid "Mail client \"%s\" does not support specifying body"
7098
msgstr ""
7099
7100
#: bzrlib/send.py:62
7101
msgid "--remember requires a branch to be specified."
7102
msgstr ""
7103
7104
#: bzrlib/send.py:77
7105
msgid "No submit branch known or specified"
7106
msgstr ""
7107
7108
#: bzrlib/send.py:80
7109
msgid "Using saved {0} location \"{1}\" to determine what changes to submit."
7110
msgstr ""
7111
7112
#: bzrlib/send.py:98
7113
#, python-format
7114
msgid "No such send format '%s'."
7115
msgstr ""
7116
7117
#: bzrlib/send.py:114
7118
msgid "bzr send takes at most two one revision identifiers"
7119
msgstr ""
7120
7121
#: bzrlib/send.py:127
7122
msgid "No revisions to submit."
7123
msgstr ""
7124
7125
#: bzrlib/send.py:139
7126
msgid ""
7127
"- not supported for merge directives that use more than one output file."
7128
msgstr ""
7129
7130
#: bzrlib/send.py:185
7131
msgid "Format 0.9 does not permit bundle with no patch"
7132
msgstr ""
7133
7134
#: bzrlib/shelf_ui.py:46
7135
#, python-format
7136
msgid "Shelve adding file \"%(path)s\"?"
7137
msgstr ""
7138
7139
#: bzrlib/shelf_ui.py:47
7140
msgid "Shelve binary changes?"
7141
msgstr ""
7142
7143
#: bzrlib/shelf_ui.py:48
7144
msgid "Shelve changing \"%s\" from %(other)s to %(this)s?"
7145
msgstr ""
7146
7147
#: bzrlib/shelf_ui.py:50
7148
#, python-format
7149
msgid "Shelve removing file \"%(path)s\"?"
7150
msgstr ""
7151
7152
#: bzrlib/shelf_ui.py:51
7153
#, python-format
7154
msgid "Shelve %d change(s)?"
7155
msgstr ""
7156
7157
#: bzrlib/shelf_ui.py:52
7158
msgid "Shelve?"
7159
msgstr ""
7160
7161
#: bzrlib/shelf_ui.py:53
7162
#, python-format
7163
msgid ""
7164
"Shelve changing target of \"%(path)s\" from \"%(other)s\" to \"%(this)s\"?"
7165
msgstr ""
7166
7167
#: bzrlib/shelf_ui.py:55
7168
#, python-format
7169
msgid "Shelve renaming \"%(other)s\" => \"%(this)s\"?"
7170
msgstr ""
7171
7172
#: bzrlib/shelf_ui.py:70
7173
#, python-format
7174
msgid "Changes shelved with id \"%d\"."
7175
msgstr ""
7176
7177
#: bzrlib/shelf_ui.py:74
7178
msgid "Selected changes destroyed."
7179
msgstr ""
7180
7181
#: bzrlib/shelf_ui.py:78
7182
msgid "Selected changes:"
7183
msgstr ""
7184
7185
#: bzrlib/shelf_ui.py:98
7186
#, python-format
7187
msgid "Delete file \"%(path)s\"?"
7188
msgstr ""
7189
7190
#: bzrlib/shelf_ui.py:99
7191
msgid "Apply binary changes?"
7192
msgstr ""
7193
7194
#: bzrlib/shelf_ui.py:100
7195
#, python-format
7196
msgid "Change \"%(path)s\" from %(this)s to %(other)s?"
7197
msgstr ""
7198
7199
#: bzrlib/shelf_ui.py:102
7200
#, python-format
7201
msgid "Add file \"%(path)s\"?"
7202
msgstr ""
7203
7204
#: bzrlib/shelf_ui.py:103
7205
#, python-format
7206
msgid "Apply %d change(s)?"
7207
msgstr ""
7208
7209
#: bzrlib/shelf_ui.py:104
7210
msgid "Apply change?"
7211
msgstr ""
7212
7213
#: bzrlib/shelf_ui.py:105
7214
#, python-format
7215
msgid "Change target of \"%(path)s\" from \"%(this)s\" to \"%(other)s\"?"
7216
msgstr ""
7217
7218
#: bzrlib/shelf_ui.py:107
7219
#, python-format
7220
msgid "Rename \"%(this)s\" => \"%(other)s\"?"
7221
msgstr ""
7222
7223
#: bzrlib/shelf_ui.py:402
7224
msgid "No changes are shelved."
7225
msgstr ""
7226
7227
#: bzrlib/shelf_ui.py:460
7228
#, python-format
7229
msgid "Using changes with id \"%d\"."
7230
msgstr ""
7231
7232
#: bzrlib/shelf_ui.py:464
7233
#, python-format
7234
msgid "Message: %s"
7235
msgstr ""
7236
7237
#: bzrlib/shelf_ui.py:476
7238
#, python-format
7239
msgid "Deleted changes with id \"%d\"."
7240
msgstr ""
7241
7242
#: bzrlib/smart/medium.py:714
7243
msgid "HPSS calls: {0} ({1} vfs) {2}"
7244
msgstr ""
7245
7246
#: bzrlib/smart/server.py:169
7247
msgid "Requested to stop gracefully"
7248
msgstr ""
7249
7250
#: bzrlib/smart/server.py:179
7251
#, python-format
7252
msgid "Waiting for %d client(s) to finish"
7253
msgstr ""
7254
7255
#: bzrlib/smart/server.py:185
7256
#, python-format
7257
msgid "Still waiting for %d client(s) to finish"
7258
msgstr ""
7259
7260
#: bzrlib/smart/server.py:219
7261
#, python-format
7262
msgid "listening socket error: %s"
7263
msgstr ""
7264
7265
#: bzrlib/smart/server.py:452
7266
#, python-format
7267
msgid "listening on port: %s"
7268
msgstr ""
7269
7270
#: bzrlib/switch.py:73
7271
msgid "Pending merges must be committed or reverted before using switch."
7272
msgstr ""
7273
7274
#: bzrlib/switch.py:100
7275
msgid ""
7276
"Cannot switch as local commits found in the checkout. Commit these to the "
7277
"bound branch or use --force to throw them away."
7278
msgstr ""
7279
7280
#: bzrlib/switch.py:105
7281
#, python-format
7282
msgid ""
7283
"Unable to connect to current master branch %(target)s: %(error)s To switch "
7284
"anyway, use --force."
7285
msgstr ""
7286
7287
#: bzrlib/switch.py:125
7288
msgid "Cannot switch a branch, only a checkout."
7289
msgstr ""
7290
7291
#: bzrlib/switch.py:163
7292
#, python-format
7293
msgid "Tree is up to date at revision %d."
7294
msgstr ""
7295
7296
#: bzrlib/switch.py:169
7297
#, python-format
7298
msgid "Updated to revision %d."
7299
msgstr ""
7300
7301
#: bzrlib/transform.py:1734 bzrlib/transform.py:1745 bzrlib/transform.py:1747
7302
msgid "Apply phase"
7303
msgstr ""
7304
7305
#: bzrlib/transform.py:1773 bzrlib/transform.py:1841
7306
msgid "removing file"
7307
msgstr ""
7308
7309
#: bzrlib/transform.py:1791 bzrlib/transform.py:1876
7310
msgid "adding file"
7311
msgstr ""
7312
7313
#: bzrlib/transform.py:2591
7314
msgid "Building tree"
7315
msgstr ""
7316
7317
#: bzrlib/transform.py:2681 bzrlib/transform.py:2708
7318
msgid "Adding file contents"
7319
msgstr ""
7320
7321
#: bzrlib/transform.py:3028
7322
msgid "Resolution pass"
7323
msgstr ""
7324
7325
#: bzrlib/transport/ftp/_gssapi.py:88
7326
#, python-format
7327
msgid "Authenticated as %s"
7328
msgstr ""
7329
7330
#: bzrlib/tree.py:634
7331
msgid "*** {0} content-filter: {1} => {2!r}"
7332
msgstr ""
7333
7334
#: bzrlib/upgrade.py:77
7335
#, python-format
7336
msgid "This is a checkout. The branch (%s) needs to be upgraded separately."
7337
msgstr ""
7338
7339
#: bzrlib/upgrade.py:100
7340
#, python-format
7341
msgid "cannot upgrade from bzrdir format %s"
7342
msgstr ""
7343
7344
#: bzrlib/upgrade.py:103
7345
#, python-format
7346
msgid "starting upgrade of %s"
7347
msgstr ""
7348
7349
#: bzrlib/upgrade.py:110
7350
msgid "finished"
7351
msgstr ""
7352
7353
#: bzrlib/upgrade.py:120
7354
msgid "Deleting backup.bzr"
7355
msgstr ""
7356
7357
#: bzrlib/upgrade.py:151
7358
msgid ""
7359
"\n"
7360
"SUMMARY: {0} upgrades attempted, {1} succeeded, {2} failed"
7361
msgstr ""
7362
7363
#: bzrlib/upgrade.py:208
7364
#, python-format
7365
msgid "Found %d dependent branches - upgrading ..."
7366
msgstr ""
7367
7368
#: bzrlib/upgrade.py:276
7369
msgid "Upgrading bzrdirs"
7370
msgstr ""
7371
7372
#: bzrlib/upgrade.py:282
7373
#, python-format
7374
msgid "Upgrading %s"
7375
msgstr ""
7376
7377
#: bzrlib/upgrade.py:283
7378
msgid "Upgrading {0} {1} ..."
7379
msgstr ""
7380
7381
#: bzrlib/upgrade.py:301
7382
msgid "Removing backup ..."
7383
msgstr ""
7384
7385
#: bzrlib/upgrade.py:305
7386
msgid "failed to clean-up {0}: {1}"
7387
msgstr ""
7388
7389
#: bzrlib/vf_repository.py:1090
7390
msgid "inventories"
7391
msgstr ""
7392
7393
#: bzrlib/vf_repository.py:1116
7394
msgid "texts"
7395
msgstr ""
7396
7397
#: bzrlib/vf_repository.py:1621 bzrlib/vf_repository.py:1630
7398
msgid "Calculating text parents"
7399
msgstr ""
7400
7401
#: bzrlib/vf_repository.py:1706
7402
msgid "Fetch texts"
7403
msgstr ""
7404
7405
#: bzrlib/vf_repository.py:2535
7406
msgid "loading text store"
7407
msgstr ""
7408
7409
#: bzrlib/vf_repository.py:2541
7410
msgid "checking text graph"
7411
msgstr ""
7412
7413
#: bzrlib/vf_repository.py:2995 bzrlib/vf_repository.py:3009
7414
#: bzrlib/vf_repository.py:3124
7415
msgid "Transferring revisions"
7416
msgstr ""
7417
7418
#: bzrlib/win32utils.py:146
7419
msgid "Failed to GetProcessMemoryInfo()"
7420
msgstr ""
7421
7422
#: bzrlib/win32utils.py:167
7423
msgid "Cannot debug memory on win32 without ctypes or win32process"
7424
msgstr ""
7425
7426
#: bzrlib/win32utils.py:172
7427
msgid "WorkingSize {0:>7}KiB\tPeakWorking {1:>7}KiB\t{2}"
7428
msgstr ""
7429
7430
#: bzrlib/win32utils.py:180
7431
#, python-format
7432
msgid "WorkingSize %8d KiB"
7433
msgstr ""
7434
7435
#: bzrlib/win32utils.py:181
7436
#, python-format
7437
msgid "PeakWorking %8d KiB"
7438
msgstr ""
7439
7440
#: bzrlib/win32utils.py:182
7441
#, python-format
7442
msgid "PagefileUsage %8d KiB"
7443
msgstr ""
7444
7445
#: bzrlib/win32utils.py:183
7446
#, python-format
7447
msgid "PeakPagefileUsage %8d KiB"
7448
msgstr ""
7449
7450
#: bzrlib/win32utils.py:185
7451
#, python-format
7452
msgid "PrivateUsage %8d KiB"
7453
msgstr ""
7454
7455
#: bzrlib/win32utils.py:186
7456
#, python-format
7457
msgid "PageFaultCount %8d"
7458
msgstr ""
7459
7460
#: bzrlib/workingtree.py:1478
7461
msgid "Rerun update after fixing the conflicts."
7462
msgstr ""
7463
7464
#: dummy/help_topics/authentication/summary.txt:1
7465
msgid "Information on configuring authentication"
7466
msgstr ""
7467
7468
#: dummy/help_topics/basic/detail.txt:1
7469
msgid ""
7470
"Bazaar 2.5b6 -- a free distributed version-control tool\n"
7471
"http://bazaar.canonical.com/"
7472
msgstr ""
7473
7474
#: dummy/help_topics/basic/detail.txt:4
7475
msgid ""
7476
"Basic commands:\n"
7477
" bzr init makes this directory a versioned branch\n"
7478
" bzr branch make a copy of another branch"
7479
msgstr ""
7480
7481
#: dummy/help_topics/basic/detail.txt:8
7482
msgid ""
7483
" bzr add make files or directories versioned\n"
7484
" bzr ignore ignore a file or pattern\n"
7485
" bzr mv move or rename a versioned file"
7486
msgstr ""
7487
7488
#: dummy/help_topics/basic/detail.txt:12
7489
msgid ""
7490
" bzr status summarize changes in working copy\n"
7491
" bzr diff show detailed diffs"
7492
msgstr ""
7493
7494
#: dummy/help_topics/basic/detail.txt:15
7495
msgid ""
7496
" bzr merge pull in changes from another branch\n"
7497
" bzr commit save some or all changes\n"
7498
" bzr send send changes via email"
7499
msgstr ""
7500
7501
#: dummy/help_topics/basic/detail.txt:19
7502
msgid ""
7503
" bzr log show history of changes\n"
7504
" bzr check validate storage"
7505
msgstr ""
7506
7507
#: dummy/help_topics/basic/detail.txt:22
7508
msgid ""
7509
" bzr help init more help on e.g. init command\n"
7510
" bzr help commands list all commands\n"
7511
" bzr help topics list all help topics\n"
7512
msgstr ""
7513
7514
#: dummy/help_topics/basic/summary.txt:1
7515
msgid "Basic commands"
7516
msgstr ""
7517
7518
#: dummy/help_topics/branches/detail.txt:1
7519
msgid "Branches"
7520
msgstr ""
7521
7522
#: dummy/help_topics/branches/detail.txt:3
7523
msgid ""
7524
"A branch consists of the state of a project, including all of its\n"
7525
"history. All branches have a repository associated (which is where the\n"
7526
"branch history is stored), but multiple branches may share the same\n"
7527
"repository (a shared repository). Branches can be copied and merged."
7528
msgstr ""
7529
7530
#: dummy/help_topics/branches/detail.txt:8
7531
msgid ""
7532
"In addition, one branch may be bound to another one. Binding to another\n"
7533
"branch indicates that commits which happen in this branch must also \n"
7534
"happen in the other branch. Bazaar ensures consistency by not allowing \n"
7535
"commits when the two branches are out of date. In order for a commit \n"
7536
"to succeed, it may be necessary to update the current branch using \n"
7537
"``bzr update``."
7538
msgstr ""
7539
7540
#: dummy/help_topics/branches/detail.txt:15
7541
#: dummy/help_topics/checkouts/detail.txt:66
7542
#: dummy/help_topics/repositories/detail.txt:36
7543
msgid "Related commands::"
7544
msgstr ""
7545
7546
#: dummy/help_topics/branches/detail.txt:17
7547
msgid ""
7548
" init Change a directory into a versioned branch.\n"
7549
" branch Create a new branch that is a copy of an existing branch.\n"
7550
" merge Perform a three-way merge.\n"
7551
" bind Bind a branch to another one.\n"
7552
msgstr ""
7553
7554
#: dummy/help_topics/branches/summary.txt:1
7555
msgid "Information on what a branch is"
7556
msgstr ""
7557
7558
#: dummy/help_topics/bugs/summary.txt:1
7559
msgid "Bug tracker settings"
7560
msgstr ""
7561
7562
#: dummy/help_topics/checkouts/detail.txt:1
7563
msgid "Checkouts"
7564
msgstr ""
7565
7566
#: dummy/help_topics/checkouts/detail.txt:3
7567
msgid ""
7568
"Checkouts are source trees that are connected to a branch, so that when\n"
7569
"you commit in the source tree, the commit goes into that branch. They\n"
7570
"allow you to use a simpler, more centralized workflow, ignoring some of\n"
7571
"Bazaar's decentralized features until you want them. Using checkouts\n"
7572
"with shared repositories is very similar to working with SVN or CVS, but\n"
7573
"doesn't have the same restrictions. And using checkouts still allows\n"
7574
"others working on the project to use whatever workflow they like."
7575
msgstr ""
7576
7577
#: dummy/help_topics/checkouts/detail.txt:11
7578
msgid ""
7579
"A checkout is created with the bzr checkout command (see \"help "
7580
"checkout\").\n"
7581
"You pass it a reference to another branch, and it will create a local copy\n"
7582
"for you that still contains a reference to the branch you created the\n"
7583
"checkout from (the master branch). Then if you make any commits they will "
7584
"be\n"
7585
"made on the other branch first. This creates an instant mirror of your work, "
7586
"or\n"
7587
"facilitates lockstep development, where each developer is working together,\n"
7588
"continuously integrating the changes of others."
7589
msgstr ""
7590
7591
#: dummy/help_topics/checkouts/detail.txt:19
7592
msgid ""
7593
"However the checkout is still a first class branch in Bazaar terms, so that\n"
7594
"you have the full history locally. As you have a first class branch you "
7595
"can\n"
7596
"also commit locally if you want, for instance due to the temporary loss af "
7597
"a\n"
7598
"network connection. Use the --local option to commit to do this. All the "
7599
"local\n"
7600
"commits will then be made on the master branch the next time you do a non-"
7601
"local\n"
7602
"commit."
7603
msgstr ""
7604
7605
#: dummy/help_topics/checkouts/detail.txt:26
7606
msgid ""
7607
"If you are using a checkout from a shared branch you will periodically want "
7608
"to\n"
7609
"pull in all the changes made by others. This is done using the \"update\"\n"
7610
"command. The changes need to be applied before any non-local commit, but\n"
7611
"Bazaar will tell you if there are any changes and suggest that you use this\n"
7612
"command when needed."
7613
msgstr ""
7614
7615
#: dummy/help_topics/checkouts/detail.txt:32
7616
msgid ""
7617
"It is also possible to create a \"lightweight\" checkout by passing the\n"
7618
"--lightweight flag to checkout. A lightweight checkout is even closer to an\n"
7619
"SVN checkout in that it is not a first class branch, it mainly consists of "
7620
"the\n"
7621
"working tree. This means that any history operations must query the master\n"
7622
"branch, which could be slow if a network connection is involved. Also, as "
7623
"you\n"
7624
"don't have a local branch, then you cannot commit locally."
7625
msgstr ""
7626
7627
#: dummy/help_topics/checkouts/detail.txt:39
7628
msgid ""
7629
"Lightweight checkouts work best when you have fast reliable access to the\n"
7630
"master branch. This means that if the master branch is on the same disk or "
7631
"LAN\n"
7632
"a lightweight checkout will be faster than a heavyweight one for any "
7633
"commands\n"
7634
"that modify the revision history (as only one copy of the branch needs to\n"
7635
"be updated). Heavyweight checkouts will generally be faster for any command\n"
7636
"that uses the history but does not change it, but if the master branch is "
7637
"on\n"
7638
"the same disk then there won't be a noticeable difference."
7639
msgstr ""
7640
7641
#: dummy/help_topics/checkouts/detail.txt:47
7642
msgid ""
7643
"Another possible use for a checkout is to use it with a treeless repository\n"
7644
"containing your branches, where you maintain only one working tree by\n"
7645
"switching the master branch that the checkout points to when you want to\n"
7646
"work on a different branch."
7647
msgstr ""
7648
7649
#: dummy/help_topics/checkouts/detail.txt:52
7650
msgid ""
7651
"Obviously to commit on a checkout you need to be able to write to the "
7652
"master\n"
7653
"branch. This means that the master branch must be accessible over a "
7654
"writeable\n"
7655
"protocol , such as sftp://, and that you have write permissions at the "
7656
"other\n"
7657
"end. Checkouts also work on the local file system, so that all that matters "
7658
"is\n"
7659
"file permissions."
7660
msgstr ""
7661
7662
#: dummy/help_topics/checkouts/detail.txt:58
7663
msgid ""
7664
"You can change the master of a checkout by using the \"switch\" command "
7665
"(see\n"
7666
"\"help switch\"). This will change the location that the commits are sent "
7667
"to.\n"
7668
"The \"bind\" command can also be used to turn a normal branch into a heavy\n"
7669
"checkout. If you would like to convert your heavy checkout into a normal\n"
7670
"branch so that every commit is local, you can use the \"unbind\" command. To "
7671
"see\n"
7672
"whether or not a branch is bound or not you can use the \"info\" command. If "
7673
"the\n"
7674
"branch is bound it will tell you the location of the bound branch."
7675
msgstr ""
7676
7677
#: dummy/help_topics/checkouts/detail.txt:68
7678
msgid ""
7679
" checkout Create a checkout. Pass --lightweight to get a lightweight\n"
7680
" checkout\n"
7681
" update Pull any changes in the master branch in to your checkout\n"
7682
" commit Make a commit that is sent to the master branch. If you have\n"
7683
" a heavy checkout then the --local option will commit to the\n"
7684
" checkout without sending the commit to the master\n"
7685
" switch Change the master branch that the commits in the checkout "
7686
"will\n"
7687
" be sent to\n"
7688
" bind Turn a standalone branch into a heavy checkout so that any\n"
7689
" commits will be sent to the master branch\n"
7690
" unbind Turn a heavy checkout into a standalone branch so that any\n"
7691
" commits are only made locally\n"
7692
" info Displays whether a branch is bound or unbound. If the branch "
7693
"is\n"
7694
" bound, then it will also display the location of the bound "
7695
"branch\n"
7696
msgstr ""
7697
7698
#: dummy/help_topics/checkouts/summary.txt:1
7699
msgid "Information on what a checkout is"
7700
msgstr ""
7701
7702
#: dummy/help_topics/commands/summary.txt:1
7703
msgid "Basic help for all commands"
7704
msgstr ""
7705
7706
#: dummy/help_topics/configuration/summary.txt:1
7707
msgid "Details on the configuration settings available"
7708
msgstr ""
7709
7710
#: dummy/help_topics/conflict-types/summary.txt:1
7711
msgid "Types of conflicts and what to do about them"
7712
msgstr ""
7713
7714
#: dummy/help_topics/content-filters/summary.txt:1
7715
msgid "Conversion of content into/from working trees"
7716
msgstr ""
7717
7718
#: dummy/help_topics/criss-cross/detail.txt:1
7719
msgid "Criss-Cross"
7720
msgstr ""
7721
7722
#: dummy/help_topics/criss-cross/detail.txt:3
7723
msgid ""
7724
"A criss-cross in the branch history can cause the default merge technique\n"
7725
"to emit more conflicts than would normally be expected."
7726
msgstr ""
7727
7728
#: dummy/help_topics/criss-cross/detail.txt:6
7729
msgid ""
7730
"In complex merge cases, ``bzr merge --lca`` or ``bzr merge --weave`` may "
7731
"give\n"
7732
"better results. You may wish to ``bzr revert`` the working tree and merge\n"
7733
"again. Alternatively, use ``bzr remerge`` on particular conflicted files."
7734
msgstr ""
7735
7736
#: dummy/help_topics/criss-cross/detail.txt:10
7737
msgid ""
7738
"Criss-crosses occur in a branch's history if two branches merge the same "
7739
"thing\n"
7740
"and then merge one another, or if two branches merge one another at the "
7741
"same\n"
7742
"time. They can be avoided by having each branch only merge from or into a\n"
7743
"designated central branch (a \"star topology\")."
7744
msgstr ""
7745
7746
#: dummy/help_topics/criss-cross/detail.txt:15
7747
msgid ""
7748
"Criss-crosses cause problems because of the way merge works. Bazaar's "
7749
"default\n"
7750
"merge is a three-way merger; in order to merge OTHER into THIS, it must\n"
7751
"find a basis for comparison, BASE. Using BASE, it can determine whether\n"
7752
"differences between THIS and OTHER are due to one side adding lines, or\n"
7753
"from another side removing lines."
7754
msgstr ""
7755
7756
#: dummy/help_topics/criss-cross/detail.txt:21
7757
msgid ""
7758
"Criss-crosses mean there is no good choice for a base. Selecting the "
7759
"recent\n"
7760
"merge points could cause one side's changes to be silently discarded.\n"
7761
"Selecting older merge points (which Bazaar does) mean that extra conflicts\n"
7762
"are emitted."
7763
msgstr ""
7764
7765
#: dummy/help_topics/criss-cross/detail.txt:26
7766
msgid ""
7767
"The ``weave`` merge type is not affected by this problem because it uses\n"
7768
"line-origin detection instead of a basis revision to determine the cause of\n"
7769
"differences.\n"
7770
msgstr ""
7771
7772
#: dummy/help_topics/criss-cross/summary.txt:1
7773
msgid "Information on criss-cross merging"
7774
msgstr ""
7775
7776
#: dummy/help_topics/current-formats/summary.txt:1
7777
msgid "Current storage formats"
7778
msgstr ""
7779
7780
#: dummy/help_topics/debug-flags/summary.txt:1
7781
msgid "Options to show or record debug information"
7782
msgstr ""
7783
7784
#: dummy/help_topics/diverged-branches/summary.txt:1
7785
msgid "How to fix diverged branches"
7786
msgstr ""
7787
7788
#: dummy/help_topics/env-variables/detail.txt:1
7789
msgid "Environment Variables"
7790
msgstr ""
7791
7792
#: dummy/help_topics/env-variables/detail.txt:3
7793
msgid ""
7794
"=================== "
7795
"===========================================================\n"
7796
"BZRPATH Path where bzr is to look for shell plugin external\n"
7797
" commands.\n"
7798
"BZR_EMAIL E-Mail address of the user. Overrides EMAIL.\n"
7799
"EMAIL E-Mail address of the user.\n"
7800
"BZR_EDITOR Editor for editing commit messages. Overrides EDITOR.\n"
7801
"EDITOR Editor for editing commit messages.\n"
7802
"BZR_PLUGIN_PATH Paths where bzr should look for plugins.\n"
7803
"BZR_DISABLE_PLUGINS Plugins that bzr should not load.\n"
7804
"BZR_PLUGINS_AT Plugins to load from a directory not in "
7805
"BZR_PLUGIN_PATH.\n"
7806
"BZR_HOME Directory holding .bazaar config dir. Overrides HOME.\n"
7807
"BZR_HOME (Win32) Directory holding bazaar config dir. Overrides APPDATA "
7808
"and\n"
7809
" HOME.\n"
7810
"BZR_REMOTE_PATH Full name of remote 'bzr' command (for bzr+ssh:// "
7811
"URLs).\n"
7812
"BZR_SSH Path to SSH client, or one of paramiko, openssh, "
7813
"sshcorp,\n"
7814
" plink or lsh.\n"
7815
"BZR_LOG Location of .bzr.log (use '/dev/null' to suppress log).\n"
7816
"BZR_LOG (Win32) Location of .bzr.log (use 'NUL' to suppress log).\n"
7817
"BZR_COLUMNS Override implicit terminal width.\n"
7818
"BZR_CONCURRENCY Number of processes that can be run concurrently "
7819
"(selftest)\n"
7820
"BZR_PROGRESS_BAR Override the progress display. Values are 'none' or "
7821
"'text'.\n"
7822
"BZR_PDB Control whether to launch a debugger on error.\n"
7823
"BZR_SIGQUIT_PDB Control whether SIGQUIT behaves normally or invokes a\n"
7824
" breakin debugger.\n"
7825
"BZR_TEXTUI_INPUT Force console input mode for prompts to line-based "
7826
"(instead\n"
7827
" of char-based).\n"
7828
"=================== "
7829
"===========================================================\n"
7830
msgstr ""
7831
7832
#: dummy/help_topics/env-variables/summary.txt:1
7833
msgid "Environment variable names and values"
7834
msgstr ""
7835
7836
#: dummy/help_topics/eol/summary.txt:1
7837
msgid "Information on end-of-line handling"
7838
msgstr ""
7839
7840
#: dummy/help_topics/files/detail.txt:1
7841
msgid "Files"
7842
msgstr ""
7843
7844
#: dummy/help_topics/files/detail.txt:3
7845
msgid ""
7846
":On Unix: ~/.bazaar/bazaar.conf\n"
7847
":On Windows: C:\\\\Documents and Settings\\\\username\\\\Application Data\\\\"
7848
"bazaar\\\\2.0\\\\bazaar.conf"
7849
msgstr ""
7850
7851
#: dummy/help_topics/files/detail.txt:6
7852
msgid ""
7853
"Contains the user's default configuration. The section ``[DEFAULT]`` is\n"
7854
"used to define general configuration that will be applied everywhere.\n"
7855
"The section ``[ALIASES]`` can be used to create command aliases for\n"
7856
"commonly used options."
7857
msgstr ""
7858
7859
#: dummy/help_topics/files/detail.txt:11
7860
msgid "A typical config file might look something like::"
7861
msgstr ""
7862
7863
#: dummy/help_topics/files/detail.txt:13
7864
msgid ""
7865
" [DEFAULT]\n"
7866
" email=John Doe <jdoe@isp.com>"
7867
msgstr ""
7868
7869
#: dummy/help_topics/files/detail.txt:16
7870
msgid ""
7871
" [ALIASES]\n"
7872
" commit = commit --strict\n"
7873
" log10 = log --short -r -10..-1\n"
7874
msgstr ""
7875
7876
#: dummy/help_topics/files/summary.txt:1
7877
msgid "Information on configuration and log files"
7878
msgstr ""
7879
7880
#: dummy/help_topics/formats/detail.txt:1
7881
msgid "Storage Formats"
7882
msgstr ""
7883
7884
#: dummy/help_topics/formats/detail.txt:3
7885
msgid ""
7886
"To ensure that older clients do not access data incorrectly,\n"
7887
"Bazaar's policy is to introduce a new storage format whenever\n"
7888
"new features requiring new metadata are added. New storage\n"
7889
"formats may also be introduced to improve performance and\n"
7890
"scalability."
7891
msgstr ""
7892
7893
#: dummy/help_topics/formats/detail.txt:9
7894
msgid ""
7895
"The newest format, 2a, is highly recommended. If your\n"
7896
"project is not using 2a, then you should suggest to the\n"
7897
"project owner to upgrade."
7898
msgstr ""
7899
7900
#: dummy/help_topics/formats/detail.txt:13
7901
msgid ""
7902
"\n"
7903
".. note::"
7904
msgstr ""
7905
7906
#: dummy/help_topics/formats/detail.txt:16
7907
msgid ""
7908
" Some of the older formats have two variants:\n"
7909
" a plain one and a rich-root one. The latter include an additional\n"
7910
" field about the root of the tree. There is no performance cost\n"
7911
" for using a rich-root format but you cannot easily merge changes\n"
7912
" from a rich-root format into a plain format. As a consequence,\n"
7913
" moving a project to a rich-root format takes some co-ordination\n"
7914
" in that all contributors need to upgrade their repositories\n"
7915
" around the same time. 2a and all future formats will be\n"
7916
" implicitly rich-root."
7917
msgstr ""
7918
7919
#: dummy/help_topics/formats/detail.txt:26
7920
msgid ""
7921
"See :doc:`current-formats-help` for the complete list of\n"
7922
"currently supported formats. See :doc:`other-formats-help` for\n"
7923
"descriptions of any available experimental and deprecated formats.\n"
7924
msgstr ""
7925
7926
#: dummy/help_topics/formats/summary.txt:1
7927
msgid "Information on choosing a storage format"
7928
msgstr ""
7929
7930
#: dummy/help_topics/global-options/detail.txt:1
7931
msgid "Global Options"
7932
msgstr ""
7933
7934
#: dummy/help_topics/global-options/detail.txt:3
7935
msgid ""
7936
"These options may be used with any command, and may appear in front of any\n"
7937
"command. (e.g. ``bzr --profile help``)."
7938
msgstr ""
7939
7940
#: dummy/help_topics/global-options/detail.txt:6
7941
msgid ""
7942
"--version Print the version number. Must be supplied before the "
7943
"command.\n"
7944
"--no-aliases Do not process command aliases when running this command.\n"
7945
"--builtin Use the built-in version of a command, not the plugin "
7946
"version.\n"
7947
" This does not suppress other plugin effects.\n"
7948
"--no-plugins Do not process any plugins.\n"
7949
"--no-l10n Do not translate messages.\n"
7950
"--concurrency Number of processes that can be run concurrently (selftest)."
7951
msgstr ""
7952
7953
#: dummy/help_topics/global-options/detail.txt:14
7954
msgid ""
7955
"--profile Profile execution using the hotshot profiler.\n"
7956
"--lsprof Profile execution using the lsprof profiler.\n"
7957
"--lsprof-file Profile execution using the lsprof profiler, and write the\n"
7958
" results to a specified file. If the filename ends with "
7959
"\".txt\",\n"
7960
" text format will be used. If the filename either starts "
7961
"with\n"
7962
" \"callgrind.out\" or end with \".callgrind\", the output will "
7963
"be\n"
7964
" formatted for use with KCacheGrind. Otherwise, the output\n"
7965
" will be a pickle.\n"
7966
"--coverage Generate line coverage report in the specified directory."
7967
msgstr ""
7968
7969
#: dummy/help_topics/global-options/detail.txt:24
7970
msgid ""
7971
"-Oname=value Override the ``name`` config option setting it to ``value`` "
7972
"for\n"
7973
" the duration of the command. This can be used multiple times "
7974
"if\n"
7975
" several options need to be overridden."
7976
msgstr ""
7977
7978
#: dummy/help_topics/global-options/detail.txt:28
7979
msgid ""
7980
"See http://doc.bazaar.canonical.com/developers/profiling.html for more\n"
7981
"information on profiling."
7982
msgstr ""
7983
7984
#: dummy/help_topics/global-options/detail.txt:31
7985
msgid ""
7986
"A number of debug flags are also available to assist troubleshooting and\n"
7987
"development. See :doc:`debug-flags-help`.\n"
7988
msgstr ""
7989
7990
#: dummy/help_topics/global-options/summary.txt:1
7991
msgid "Options that control how Bazaar runs"
7992
msgstr ""
7993
7994
#: dummy/help_topics/hidden-commands/summary.txt:1
7995
msgid "All hidden commands"
7996
msgstr ""
7997
7998
#: dummy/help_topics/hooks/summary.txt:1
7999
msgid "Points at which custom processing can be added"
8000
msgstr ""
8001
8002
#: dummy/help_topics/launchpad/detail.txt:1
8003
msgid "Integration with Launchpad.net"
8004
msgstr ""
8005
8006
#: dummy/help_topics/launchpad/detail.txt:3
8007
msgid ""
8008
"Launchpad.net provides free Bazaar branch hosting with integrated bug and\n"
8009
"specification tracking."
8010
msgstr ""
8011
8012
#: dummy/help_topics/launchpad/detail.txt:6
8013
msgid ""
8014
"The bzr client (through the plugin called 'launchpad') has special\n"
8015
"features to communicate with Launchpad:"
8016
msgstr ""
8017
8018
#: dummy/help_topics/launchpad/detail.txt:9
8019
msgid ""
8020
" * The launchpad-login command tells Bazaar your Launchpad user name. "
8021
"This\n"
8022
" is then used by the 'lp:' transport to download your branches using\n"
8023
" bzr+ssh://."
8024
msgstr ""
8025
8026
#: dummy/help_topics/launchpad/detail.txt:13
8027
msgid ""
8028
" * The 'lp:' transport uses Launchpad as a directory service: for "
8029
"example\n"
8030
" 'lp:bzr' and 'lp:python' refer to the main branches of the relevant\n"
8031
" projects and may be branched, logged, etc. You can also use the 'lp:'\n"
8032
" transport to refer to specific branches, e.g. lp:~bzr/bzr/trunk."
8033
msgstr ""
8034
8035
#: dummy/help_topics/launchpad/detail.txt:18
8036
msgid ""
8037
" * The 'lp:' bug tracker alias can expand launchpad bug numbers to their\n"
8038
" URLs for use with 'bzr commit --fixes', e.g. 'bzr commit --fixes "
8039
"lp:12345'\n"
8040
" will record a revision property that marks that revision as fixing\n"
8041
" Launchpad bug 12345. When you push that branch to Launchpad it will\n"
8042
" automatically be linked to the bug report."
8043
msgstr ""
8044
8045
#: dummy/help_topics/launchpad/detail.txt:24
8046
msgid ""
8047
" * The register-branch command tells Launchpad about the url of a\n"
8048
" public branch. Launchpad will then mirror the branch, display\n"
8049
" its contents and allow it to be attached to bugs and other\n"
8050
" objects."
8051
msgstr ""
8052
8053
#: dummy/help_topics/launchpad/detail.txt:29
8054
msgid "For more information see http://help.launchpad.net/\n"
8055
msgstr ""
8056
8057
#: dummy/help_topics/launchpad/summary.txt:1
8058
msgid "Using Bazaar with Launchpad.net"
8059
msgstr ""
8060
8061
#: dummy/help_topics/location-alias/summary.txt:1
8062
msgid "Aliases for remembered locations"
8063
msgstr ""
8064
8065
#: dummy/help_topics/log-formats/summary.txt:1
8066
msgid "Details on the logging formats available"
8067
msgstr ""
8068
8069
#: dummy/help_topics/other-formats/summary.txt:1
8070
msgid "Experimental and deprecated storage formats"
8071
msgstr ""
8072
8073
#: dummy/help_topics/patterns/summary.txt:1
8074
msgid "Information on the pattern syntax"
8075
msgstr ""
8076
8077
#: dummy/help_topics/repositories/detail.txt:1
8078
msgid "Repositories"
8079
msgstr ""
8080
8081
#: dummy/help_topics/repositories/detail.txt:3
8082
msgid ""
8083
"Repositories in Bazaar are where committed information is stored. There is\n"
8084
"a repository associated with every branch."
8085
msgstr ""
8086
8087
#: dummy/help_topics/repositories/detail.txt:6
8088
msgid ""
8089
"Repositories are a form of database. Bzr will usually maintain this for\n"
8090
"good performance automatically, but in some situations (e.g. when doing\n"
8091
"very many commits in a short time period) you may want to ask bzr to\n"
8092
"optimise the database indices. This can be done by the 'bzr pack' command."
8093
msgstr ""
8094
8095
#: dummy/help_topics/repositories/detail.txt:11
8096
msgid ""
8097
"By default just running 'bzr init' will create a repository within the new\n"
8098
"branch but it is possible to create a shared repository which allows "
8099
"multiple\n"
8100
"branches to share their information in the same location. When a new branch "
8101
"is\n"
8102
"created it will first look to see if there is a containing shared repository "
8103
"it\n"
8104
"can use."
8105
msgstr ""
8106
8107
#: dummy/help_topics/repositories/detail.txt:17
8108
msgid ""
8109
"When two branches of the same project share a repository, there is\n"
8110
"generally a large space saving. For some operations (e.g. branching\n"
8111
"within the repository) this translates in to a large time saving."
8112
msgstr ""
8113
8114
#: dummy/help_topics/repositories/detail.txt:21
8115
msgid ""
8116
"To create a shared repository use the init-repository command (or the alias\n"
8117
"init-repo). This command takes the location of the repository to create. "
8118
"This\n"
8119
"means that 'bzr init-repository repo' will create a directory named 'repo',\n"
8120
"which contains a shared repository. Any new branches that are created in "
8121
"this\n"
8122
"directory will then use it for storage."
8123
msgstr ""
8124
8125
#: dummy/help_topics/repositories/detail.txt:27
8126
msgid ""
8127
"It is a good idea to create a repository whenever you might create more\n"
8128
"than one branch of a project. This is true for both working areas where you\n"
8129
"are doing the development, and any server areas that you use for hosting\n"
8130
"projects. In the latter case, it is common to want branches without working\n"
8131
"trees. Since the files in the branch will not be edited directly there is "
8132
"no\n"
8133
"need to use up disk space for a working tree. To create a repository in "
8134
"which\n"
8135
"the branches will not have working trees pass the '--no-trees' option to\n"
8136
"'init-repository'."
8137
msgstr ""
8138
8139
#: dummy/help_topics/repositories/detail.txt:38
8140
msgid ""
8141
" init-repository Create a shared repository. Use --no-trees to create "
8142
"one\n"
8143
" in which new branches won't get a working tree.\n"
8144
msgstr ""
8145
8146
#: dummy/help_topics/repositories/summary.txt:1
8147
msgid "Basic information on shared repositories."
8148
msgstr ""
8149
8150
#: dummy/help_topics/revisionspec/summary.txt:1
8151
msgid "Explain how to use --revision"
8152
msgstr ""
8153
8154
#: dummy/help_topics/rules/summary.txt:1
8155
msgid "Information on defining rule-based preferences"
8156
msgstr ""
8157
8158
#: dummy/help_topics/standalone-trees/detail.txt:1
8159
msgid "Standalone Trees"
8160
msgstr ""
8161
8162
#: dummy/help_topics/standalone-trees/detail.txt:3
8163
msgid ""
8164
"A standalone tree is a working tree with an associated repository. It\n"
8165
"is an independently usable branch, with no dependencies on any other.\n"
8166
"Creating a standalone tree (via bzr init) is the quickest way to put\n"
8167
"an existing project under version control."
8168
msgstr ""
8169
8170
#: dummy/help_topics/standalone-trees/detail.txt:8
8171
msgid "Related Commands::"
8172
msgstr ""
8173
8174
#: dummy/help_topics/standalone-trees/detail.txt:10
8175
msgid " init Make a directory into a versioned branch.\n"
8176
msgstr ""
8177
8178
#: dummy/help_topics/standalone-trees/summary.txt:1
8179
msgid "Information on what a standalone tree is"
8180
msgstr ""
8181
8182
#: dummy/help_topics/standard-options/detail.txt:1
8183
msgid "Standard Options"
8184
msgstr ""
8185
8186
#: dummy/help_topics/standard-options/detail.txt:3
8187
msgid "Standard options are legal for all commands."
8188
msgstr ""
8189
8190
#: dummy/help_topics/standard-options/detail.txt:5
8191
msgid ""
8192
"--help, -h Show help message.\n"
8193
"--verbose, -v Display more information.\n"
8194
"--quiet, -q Only display errors and warnings."
8195
msgstr ""
8196
8197
#: dummy/help_topics/standard-options/detail.txt:9
8198
msgid "Unlike global options, standard options can be used in aliases.\n"
8199
msgstr ""
8200
8201
#: dummy/help_topics/standard-options/summary.txt:1
8202
msgid "Options that can be used with any command"
8203
msgstr ""
8204
8205
#: dummy/help_topics/status-flags/detail.txt:1
8206
msgid "Status Flags"
8207
msgstr ""
8208
8209
#: dummy/help_topics/status-flags/detail.txt:3
8210
msgid ""
8211
"Status flags are used to summarise changes to the working tree in a concise\n"
8212
"manner. They are in the form::"
8213
msgstr ""
8214
8215
#: dummy/help_topics/status-flags/detail.txt:6
8216
msgid " xxx <filename>"
8217
msgstr ""
8218
8219
#: dummy/help_topics/status-flags/detail.txt:8
8220
msgid "where the columns' meanings are as follows."
8221
msgstr ""
8222
8223
#: dummy/help_topics/status-flags/detail.txt:10
8224
msgid "Column 1 - versioning/renames::"
8225
msgstr ""
8226
8227
#: dummy/help_topics/status-flags/detail.txt:12
8228
msgid ""
8229
" + File versioned\n"
8230
" - File unversioned\n"
8231
" R File renamed\n"
8232
" ? File unknown\n"
8233
" X File nonexistent (and unknown to bzr)\n"
8234
" C File has conflicts\n"
8235
" P Entry for a pending merge (not a file)"
8236
msgstr ""
8237
8238
#: dummy/help_topics/status-flags/detail.txt:20
8239
msgid "Column 2 - contents::"
8240
msgstr ""
8241
8242
#: dummy/help_topics/status-flags/detail.txt:22
8243
msgid ""
8244
" N File created\n"
8245
" D File deleted\n"
8246
" K File kind changed\n"
8247
" M File modified"
8248
msgstr ""
8249
8250
#: dummy/help_topics/status-flags/detail.txt:27
8251
msgid "Column 3 - execute::"
8252
msgstr ""
8253
8254
#: dummy/help_topics/status-flags/detail.txt:29
8255
msgid " * The execute bit was changed\n"
8256
msgstr ""
8257
8258
#: dummy/help_topics/status-flags/summary.txt:1
8259
msgid "Help on status flags"
8260
msgstr ""
8261
8262
#: dummy/help_topics/sync-for-reconfigure/detail.txt:1
8263
msgid "Branches Out of Sync"
8264
msgstr ""
8265
8266
#: dummy/help_topics/sync-for-reconfigure/detail.txt:3
8267
msgid ""
8268
"When reconfiguring a checkout, tree or branch into a lightweight checkout,\n"
8269
"a local branch must be destroyed. (For checkouts, this is the local branch\n"
8270
"that serves primarily as a cache.) If the branch-to-be-destroyed does not\n"
8271
"have the same last revision as the new reference branch for the lightweight\n"
8272
"checkout, data could be lost, so Bazaar refuses."
8273
msgstr ""
8274
8275
#: dummy/help_topics/sync-for-reconfigure/detail.txt:9
8276
msgid "How you deal with this depends on *why* the branches are out of sync."
8277
msgstr ""
8278
8279
#: dummy/help_topics/sync-for-reconfigure/detail.txt:11
8280
msgid ""
8281
"If you have a checkout and have done local commits, you can get back in "
8282
"sync\n"
8283
"by running \"bzr update\" (and possibly \"bzr commit\")."
8284
msgstr ""
8285
8286
#: dummy/help_topics/sync-for-reconfigure/detail.txt:14
8287
msgid ""
8288
"If you have a branch and the remote branch is out-of-date, you can push\n"
8289
"the local changes using \"bzr push\". If the local branch is out of date, "
8290
"you\n"
8291
"can do \"bzr pull\". If both branches have had changes, you can merge, "
8292
"commit\n"
8293
"and then push your changes. If you decide that some of the changes aren't\n"
8294
"useful, you can \"push --overwrite\" or \"pull --overwrite\" instead.\n"
8295
msgstr ""
8296
8297
#: dummy/help_topics/sync-for-reconfigure/summary.txt:1
8298
msgid "Steps to resolve \"out-of-sync\" when reconfiguring"
8299
msgstr ""
8300
8301
#: dummy/help_topics/topics/summary.txt:1
8302
msgid "Topics list"
8303
msgstr ""
8304
8305
#: dummy/help_topics/url-special-chars/summary.txt:1
8306
msgid "Special character handling in URLs"
8307
msgstr ""
8308
8309
#: dummy/help_topics/urlspec/summary.txt:1
8310
msgid "Supported transport protocols"
8311
msgstr ""
8312
8313
#: dummy/help_topics/working-trees/detail.txt:1
8314
msgid "Working Trees"
8315
msgstr ""
8316
8317
#: dummy/help_topics/working-trees/detail.txt:3
8318
msgid ""
8319
"A working tree is the contents of a branch placed on disk so that you can\n"
8320
"see the files and edit them. The working tree is where you make changes to "
8321
"a\n"
8322
"branch, and when you commit the current state of the working tree is the\n"
8323
"snapshot that is recorded in the commit."
8324
msgstr ""
8325
8326
#: dummy/help_topics/working-trees/detail.txt:8
8327
msgid ""
8328
"When you push a branch to a remote system, a working tree will not be\n"
8329
"created. If one is already present the files will not be updated. The\n"
8330
"branch information will be updated and the working tree will be marked\n"
8331
"as out-of-date. Updating a working tree remotely is difficult, as there\n"
8332
"may be uncommitted changes or the update may cause content conflicts that "
8333
"are\n"
8334
"difficult to deal with remotely."
8335
msgstr ""
8336
8337
#: dummy/help_topics/working-trees/detail.txt:15
8338
msgid ""
8339
"If you have a branch with no working tree you can use the 'checkout' "
8340
"command\n"
8341
"to create a working tree. If you run 'bzr checkout .' from the branch it "
8342
"will\n"
8343
"create the working tree. If the branch is updated remotely, you can update "
8344
"the\n"
8345
"working tree by running 'bzr update' in that directory."
8346
msgstr ""
8347
8348
#: dummy/help_topics/working-trees/detail.txt:20
8349
msgid ""
8350
"If you have a branch with a working tree that you do not want the 'remove-"
8351
"tree'\n"
8352
"command will remove the tree if it is safe. This can be done to avoid the\n"
8353
"warning about the remote working tree not being updated when pushing to the\n"
8354
"branch. It can also be useful when working with a '--no-trees' repository\n"
8355
"(see 'bzr help repositories')."
8356
msgstr ""
8357
8358
#: dummy/help_topics/working-trees/detail.txt:26
8359
msgid ""
8360
"If you want to have a working tree on a remote machine that you push to you\n"
8361
"can either run 'bzr update' in the remote branch after each push, or use "
8362
"some\n"
8363
"other method to update the tree during the push. There is an 'rspush' "
8364
"plugin\n"
8365
"that will update the working tree using rsync as well as doing a push. "
8366
"There\n"
8367
"is also a 'push-and-update' plugin that automates running 'bzr update' via "
8368
"SSH\n"
8369
"after each push."
8370
msgstr ""
8371
8372
#: dummy/help_topics/working-trees/detail.txt:33
8373
msgid "Useful commands::"
8374
msgstr ""
8375
8376
#: dummy/help_topics/working-trees/detail.txt:35
8377
msgid ""
8378
" checkout Create a working tree when a branch does not have one.\n"
8379
" remove-tree Removes the working tree from a branch when it is safe to do "
8380
"so.\n"
8381
" update When a working tree is out of sync with its associated "
8382
"branch\n"
8383
" this will update the tree to match the branch.\n"
8384
msgstr ""
8385
8386
#: dummy/help_topics/working-trees/summary.txt:1
8387
msgid "Information on working trees"
8388
msgstr ""
8389
8390
#: en/help_topics/authentication.txt:1
8391
msgid ""
8392
"Authentication Settings\n"
8393
"======================="
8394
msgstr ""
8395
8396
#: en/help_topics/authentication.txt:4
8397
msgid ""
8398
"\n"
8399
"Intent\n"
8400
"------"
8401
msgstr ""
8402
8403
#: en/help_topics/authentication.txt:8
8404
msgid ""
8405
"Many different authentication policies can be described in the\n"
8406
"``authentication.conf`` file but a particular user should need only a few\n"
8407
"definitions to cover his needs without having to specify a user and a "
8408
"password\n"
8409
"for every branch he uses."
8410
msgstr ""
8411
8412
#: en/help_topics/authentication.txt:13
8413
msgid ""
8414
"The definitions found in this file are used to find the credentials to use "
8415
"for\n"
8416
"a given url. The same credentials can generally be used for as many branches "
8417
"as\n"
8418
"possible by grouping their declaration around the remote servers that need\n"
8419
"them. It's even possible to declare credentials that will be used by "
8420
"different\n"
8421
"servers."
8422
msgstr ""
8423
8424
#: en/help_topics/authentication.txt:19
8425
msgid ""
8426
"The intent is to make this file as small as possible to minimize maintenance."
8427
msgstr ""
8428
8429
#: en/help_topics/authentication.txt:21
8430
msgid ""
8431
"Once the relevant credentials are declared in this file you may use branch "
8432
"urls\n"
8433
"without embedding passwords (security hazard) or even users (enabling "
8434
"sharing\n"
8435
"of your urls with others)."
8436
msgstr ""
8437
8438
#: en/help_topics/authentication.txt:25
8439
msgid "Instead of using::"
8440
msgstr ""
8441
8442
#: en/help_topics/authentication.txt:27
8443
msgid " bzr branch ftp://joe:secret@host.com/path/to/my/branch"
8444
msgstr ""
8445
8446
#: en/help_topics/authentication.txt:29
8447
msgid "you simply use::"
8448
msgstr ""
8449
8450
#: en/help_topics/authentication.txt:31
8451
msgid " bzr branch ftp://host.com/path/to/my/branch"
8452
msgstr ""
8453
8454
#: en/help_topics/authentication.txt:33
8455
msgid ""
8456
"provided you have created the following ``authentication.conf`` file::"
8457
msgstr ""
8458
8459
#: en/help_topics/authentication.txt:35
8460
msgid ""
8461
" [myprojects]\n"
8462
" scheme=ftp\n"
8463
" host=host.com\n"
8464
" user=joe\n"
8465
" password=secret\n"
8466
" "
8467
msgstr ""
8468
8469
#: en/help_topics/authentication.txt:42
8470
msgid ""
8471
"Authentication definitions\n"
8472
"--------------------------"
8473
msgstr ""
8474
8475
#: en/help_topics/authentication.txt:45
8476
msgid ""
8477
"There are two kinds of authentication used by the various schemes supported "
8478
"by\n"
8479
"bzr:"
8480
msgstr ""
8481
8482
#: en/help_topics/authentication.txt:48
8483
msgid "1. user and password"
8484
msgstr ""
8485
8486
#: en/help_topics/authentication.txt:50
8487
msgid ""
8488
"``FTP`` needs a (``user``, ``password``) to authenticate against a ``host``\n"
8489
"``SFTP`` can use either a password or a host key to authenticate. However,\n"
8490
"ssh agents are a better, more secure solution. So we have chosen to not "
8491
"provide\n"
8492
"our own less secure method."
8493
msgstr ""
8494
8495
#: en/help_topics/authentication.txt:55
8496
msgid "2. user, realm and password"
8497
msgstr ""
8498
8499
#: en/help_topics/authentication.txt:57
8500
msgid ""
8501
"``HTTP`` and ``HTTPS`` needs a (``user, realm, password``) to authenticate\n"
8502
"against a host. But, by using ``.htaccess`` files, for example, it is "
8503
"possible\n"
8504
"to define several (``user, realm, password``) for a given ``host``. So what "
8505
"is\n"
8506
"really needed is (``user``, ``password``, ``host``, ``path``). The ``realm`` "
8507
"is\n"
8508
"not taken into account in the definitions, but will displayed if bzr "
8509
"prompts\n"
8510
"you for a password."
8511
msgstr ""
8512
8513
#: en/help_topics/authentication.txt:64
8514
msgid ""
8515
"``HTTP proxy`` can be handled as ``HTTP`` (or ``HTTPS``) by explicitly\n"
8516
"specifying the appropriate port."
8517
msgstr ""
8518
8519
#: en/help_topics/authentication.txt:67
8520
msgid ""
8521
"To take all schemes into account, the password will be deduced from a set "
8522
"of\n"
8523
"authentication definitions (``scheme``, ``host``, ``port``, ``path``, "
8524
"``user``,\n"
8525
"``password``)."
8526
msgstr ""
8527
8528
#: en/help_topics/authentication.txt:71
8529
msgid ""
8530
" * ``scheme``: can be empty (meaning the rest of the definition can be "
8531
"used\n"
8532
" for any scheme), ``SFTP`` and ``bzr+ssh`` should not be used here, "
8533
"``ssh``\n"
8534
" should be used instead since this is the real scheme regarding\n"
8535
" authentication,"
8536
msgstr ""
8537
8538
#: en/help_topics/authentication.txt:76
8539
msgid " * ``host``: can be empty (to act as a default for any host),"
8540
msgstr ""
8541
8542
#: en/help_topics/authentication.txt:78
8543
msgid ""
8544
" * ``port`` can be empty (useful when an host provides several servers for "
8545
"the\n"
8546
" same scheme), only numerical values are allowed, this should be used "
8547
"only\n"
8548
" when the server uses a port different than the scheme standard port,"
8549
msgstr ""
8550
8551
#: en/help_topics/authentication.txt:82
8552
msgid " * ``path``: can be empty (FTP or SFTP will never user it),"
8553
msgstr ""
8554
8555
#: en/help_topics/authentication.txt:84
8556
msgid ""
8557
" * ``user``: can be empty (``bzr`` will defaults to python's\n"
8558
" ``getpass.get_user()``),"
8559
msgstr ""
8560
8561
#: en/help_topics/authentication.txt:87
8562
msgid ""
8563
" * ``password``: can be empty if you prefer to always be prompted for your\n"
8564
" password."
8565
msgstr ""
8566
8567
#: en/help_topics/authentication.txt:90
8568
msgid ""
8569
"Multiple definitions can be provided and, for a given URL, bzr will select "
8570
"a\n"
8571
"(``user`` [, ``password``]) based on the following rules :"
8572
msgstr ""
8573
8574
#: en/help_topics/authentication.txt:93
8575
msgid " 1. the first match wins,"
8576
msgstr ""
8577
8578
#: en/help_topics/authentication.txt:95
8579
msgid " 2. empty fields match everything,"
8580
msgstr ""
8581
8582
#: en/help_topics/authentication.txt:97
8583
msgid ""
8584
" 3. ``scheme`` matches even if decorators are used in the requested URL,"
8585
msgstr ""
8586
8587
#: en/help_topics/authentication.txt:99
8588
msgid ""
8589
" 4. ``host`` matches exactly or act as a domain if it starts with '.'\n"
8590
" (``project.bzr.sf.net`` will match ``.bzr.sf.net`` but "
8591
"``projectbzr.sf.net``\n"
8592
" will not match ``bzr.sf.net``)."
8593
msgstr ""
8594
8595
#: en/help_topics/authentication.txt:103
8596
msgid ""
8597
" 5. ``port`` matches if included in the requested URL (exact matches only)"
8598
msgstr ""
8599
8600
#: en/help_topics/authentication.txt:105
8601
msgid ""
8602
" 6. ``path`` matches if included in the requested URL (and by rule #2 "
8603
"above,\n"
8604
" empty paths will match any provided path)."
8605
msgstr ""
8606
8607
#: en/help_topics/authentication.txt:110
8608
msgid ""
8609
"File format\n"
8610
"-----------"
8611
msgstr ""
8612
8613
#: en/help_topics/authentication.txt:113
8614
msgid ""
8615
"The general rules for :doc:`configuration files <configuration-help>`\n"
8616
"apply except for the variable policies."
8617
msgstr ""
8618
8619
#: en/help_topics/authentication.txt:116
8620
msgid "Each section describes an authentication definition."
8621
msgstr ""
8622
8623
#: en/help_topics/authentication.txt:118
8624
msgid ""
8625
"The section name is an arbitrary string, only the ``DEFAULT`` value is "
8626
"reserved\n"
8627
"and should appear as the *last* section."
8628
msgstr ""
8629
8630
#: en/help_topics/authentication.txt:121
8631
msgid "Each section should define:"
8632
msgstr ""
8633
8634
#: en/help_topics/authentication.txt:123
8635
msgid "* ``user``: the login to be used,"
8636
msgstr ""
8637
8638
#: en/help_topics/authentication.txt:125
8639
msgid "Each section could define:"
8640
msgstr ""
8641
8642
#: en/help_topics/authentication.txt:127
8643
msgid "* ``host``: the remote server,"
8644
msgstr ""
8645
8646
#: en/help_topics/authentication.txt:129
8647
msgid "* ``port``: the port the server is listening,"
8648
msgstr ""
8649
8650
#: en/help_topics/authentication.txt:131
8651
msgid "* ``path``: the branch location,"
8652
msgstr ""
8653
8654
#: en/help_topics/authentication.txt:133
8655
msgid "* ``password``: the password."
8656
msgstr ""
8657
8658
#: en/help_topics/authentication.txt:135
8659
msgid ""
8660
"\n"
8661
"Examples\n"
8662
"--------"
8663
msgstr ""
8664
8665
#: en/help_topics/authentication.txt:139
8666
msgid ""
8667
"\n"
8668
"Personal projects hosted outside\n"
8669
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
8670
msgstr ""
8671
8672
#: en/help_topics/authentication.txt:143
8673
msgid ""
8674
"All connections are done with the same ``user`` (the remote one for which "
8675
"the\n"
8676
"default bzr one is not appropriate) and the password is always prompted "
8677
"with\n"
8678
"some exceptions::"
8679
msgstr ""
8680
8681
#: en/help_topics/authentication.txt:147
8682
msgid ""
8683
" # Pet projects on hobby.net\n"
8684
" [hobby]\n"
8685
" host=r.hobby.net\n"
8686
" user=jim\n"
8687
" password=obvious1234\n"
8688
" \n"
8689
" # Home server\n"
8690
" [home]\n"
8691
" scheme=https\n"
8692
" host=home.net\n"
8693
" user=joe\n"
8694
" password=1essobV10us\n"
8695
" \n"
8696
" [DEFAULT]\n"
8697
" # Our local user is barbaz, on all remote sites we're known as "
8698
"foobar\n"
8699
" user=foobar"
8700
msgstr ""
8701
8702
#: en/help_topics/authentication.txt:164
8703
msgid ""
8704
"\n"
8705
"Source hosting provider\n"
8706
"~~~~~~~~~~~~~~~~~~~~~~~"
8707
msgstr ""
8708
8709
#: en/help_topics/authentication.txt:168
8710
msgid "In the shp.net (fictitious) domain, each project has its own site::"
8711
msgstr ""
8712
8713
#: en/help_topics/authentication.txt:170
8714
msgid ""
8715
" [shpnet domain]\n"
8716
" # we use sftp, but ssh is the scheme used for authentication\n"
8717
" scheme=ssh\n"
8718
" # The leading '.' ensures that 'shp.net' alone doesn't match\n"
8719
" host=.shp.net\n"
8720
" user=joe\n"
8721
" # bzr don't support supplying a password for sftp,\n"
8722
" # consider using an ssh agent if you don't want to supply\n"
8723
" # a password interactively. (pageant, ssh-agent, etc)"
8724
msgstr ""
8725
8726
#: en/help_topics/authentication.txt:180
8727
msgid ""
8728
"HTTPS, SFTP servers and their proxy\n"
8729
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
8730
msgstr ""
8731
8732
#: en/help_topics/authentication.txt:183
8733
msgid ""
8734
"At company.com, the server hosting release and integration branches is "
8735
"behind a\n"
8736
"proxy, and the two branches use different authentication policies::"
8737
msgstr ""
8738
8739
#: en/help_topics/authentication.txt:186
8740
msgid ""
8741
" [reference code]\n"
8742
" scheme=https\n"
8743
" host=dev.company.com\n"
8744
" path=/dev\n"
8745
" user=user1\n"
8746
" password=pass1"
8747
msgstr ""
8748
8749
#: en/help_topics/authentication.txt:193
8750
msgid ""
8751
" # development branches on dev server\n"
8752
" [dev]\n"
8753
" scheme=ssh # bzr+ssh and sftp are available here\n"
8754
" host=dev.company.com\n"
8755
" path=/dev/integration\n"
8756
" user=user2\n"
8757
" \n"
8758
" # proxy\n"
8759
" [proxy]\n"
8760
" scheme=http\n"
8761
" host=proxy.company.com\n"
8762
" port=3128\n"
8763
" user=proxyuser1\n"
8764
" password=proxypass1"
8765
msgstr ""
8766
8767
#: en/help_topics/authentication.txt:208
8768
msgid ""
8769
"\n"
8770
"Planned enhancements\n"
8771
"--------------------"
8772
msgstr ""
8773
8774
#: en/help_topics/authentication.txt:212
8775
msgid ""
8776
"The following are not yet implemented but planned as parts of a work in\n"
8777
"progress:"
8778
msgstr ""
8779
8780
#: en/help_topics/authentication.txt:215
8781
msgid "* add a ``password_encoding`` field allowing:"
8782
msgstr ""
8783
8784
#: en/help_topics/authentication.txt:217
8785
msgid ""
8786
" - storing the passwords in various obfuscating encodings (base64 for one),"
8787
msgstr ""
8788
8789
#: en/help_topics/authentication.txt:219
8790
msgid " - delegate password storage to plugins (.netrc for example)."
8791
msgstr ""
8792
8793
#: en/help_topics/authentication.txt:221
8794
msgid ""
8795
"* update the credentials when the user is prompted for user or password,"
8796
msgstr ""
8797
8798
#: en/help_topics/authentication.txt:223
8799
msgid "* add a ``verify_certificates`` field for ``HTTPS``."
8800
msgstr ""
8801
8802
#: en/help_topics/authentication.txt:225
8803
msgid ""
8804
"The ``password_encoding`` and ``verify_certificates`` fields are recognized "
8805
"but\n"
8806
"ignored in the actual implementation.\n"
8807
msgstr ""
8808
8809
#: en/help_topics/bugs.txt:1
8810
msgid "Bug Tracker Settings"
8811
msgstr ""
8812
8813
#: en/help_topics/bugs.txt:3
8814
msgid ""
8815
"When making a commit, metadata about bugs fixed by that change can be\n"
8816
"recorded by using the ``--fixes`` option. For each bug marked as fixed, an\n"
8817
"entry is included in the 'bugs' revision property stating '<url> <status>'.\n"
8818
"(The only ``status`` value currently supported is ``fixed.``)"
8819
msgstr ""
8820
8821
#: en/help_topics/bugs.txt:8
8822
msgid ""
8823
"The ``--fixes`` option allows you to specify a bug tracker and a bug "
8824
"identifier\n"
8825
"rather than a full URL. This looks like::"
8826
msgstr ""
8827
8828
#: en/help_topics/bugs.txt:11
8829
msgid " bzr commit --fixes <tracker>:<id>"
8830
msgstr ""
8831
8832
#: en/help_topics/bugs.txt:13 en/help_topics/configuration.txt:398
8833
msgid "or::"
8834
msgstr ""
8835
8836
#: en/help_topics/bugs.txt:15
8837
msgid " bzr commit --fixes <id>"
8838
msgstr ""
8839
8840
#: en/help_topics/bugs.txt:17
8841
msgid ""
8842
"where \"<tracker>\" is an identifier for the bug tracker, and \"<id>\" is "
8843
"the\n"
8844
"identifier for that bug within the bugtracker, usually the bug number.\n"
8845
"If \"<tracker>\" is not specified the ``bugtracker`` set in the branch\n"
8846
"or global configuration is used."
8847
msgstr ""
8848
8849
#: en/help_topics/bugs.txt:22
8850
msgid ""
8851
"Bazaar knows about a few bug trackers that have many users. If\n"
8852
"you use one of these bug trackers then there is no setup required to\n"
8853
"use this feature, you just need to know the tracker identifier to use.\n"
8854
"These are the bugtrackers that are built in:"
8855
msgstr ""
8856
8857
#: en/help_topics/bugs.txt:27
8858
msgid ""
8859
" ============================ ============ ============\n"
8860
" URL Abbreviation Example\n"
8861
" ============================ ============ ============\n"
8862
" https://bugs.launchpad.net/ lp lp:12345\n"
8863
" http://bugs.debian.org/ deb deb:12345\n"
8864
" http://bugzilla.gnome.org/ gnome gnome:12345\n"
8865
" ============================ ============ ============"
8866
msgstr ""
8867
8868
#: en/help_topics/bugs.txt:35
8869
msgid ""
8870
"For the bug trackers not listed above configuration is required.\n"
8871
"Support for generating the URLs for any project using Bugzilla or Trac\n"
8872
"is built in, along with a template mechanism for other bugtrackers with\n"
8873
"simple URL schemes. If your bug tracker can't be described by one\n"
8874
"of the schemes described below then you can write a plugin to support\n"
8875
"it."
8876
msgstr ""
8877
8878
#: en/help_topics/bugs.txt:42
8879
msgid ""
8880
"If you use Bugzilla or Trac, then you only need to set a configuration\n"
8881
"variable which contains the base URL of the bug tracker. These options\n"
8882
"can go into ``bazaar.conf``, ``branch.conf`` or into a branch-specific\n"
8883
"configuration section in ``locations.conf``. You can set up these values\n"
8884
"for each of the projects you work on."
8885
msgstr ""
8886
8887
#: en/help_topics/bugs.txt:48
8888
msgid ""
8889
"Note: As you provide a short name for each tracker, you can specify one or\n"
8890
"more bugs in one or more trackers at commit time if you wish."
8891
msgstr ""
8892
8893
#: en/help_topics/bugs.txt:51
8894
msgid ""
8895
"Launchpad\n"
8896
"---------"
8897
msgstr ""
8898
8899
#: en/help_topics/bugs.txt:54
8900
msgid ""
8901
"Use ``bzr commit --fixes lp:2`` to record that this commit fixes bug 2."
8902
msgstr ""
8903
8904
#: en/help_topics/bugs.txt:56
8905
msgid ""
8906
"bugzilla_<tracker>_url\n"
8907
"----------------------"
8908
msgstr ""
8909
8910
#: en/help_topics/bugs.txt:59
8911
msgid ""
8912
"If present, the location of the Bugzilla bug tracker referred to by\n"
8913
"<tracker>. This option can then be used together with ``bzr commit\n"
8914
"--fixes`` to mark bugs in that tracker as being fixed by that commit. For\n"
8915
"example::"
8916
msgstr ""
8917
8918
#: en/help_topics/bugs.txt:64
8919
msgid " bugzilla_squid_url = http://bugs.squid-cache.org"
8920
msgstr ""
8921
8922
#: en/help_topics/bugs.txt:66
8923
msgid ""
8924
"would allow ``bzr commit --fixes squid:1234`` to mark Squid's bug 1234 as\n"
8925
"fixed."
8926
msgstr ""
8927
8928
#: en/help_topics/bugs.txt:69
8929
msgid ""
8930
"trac_<tracker>_url\n"
8931
"------------------"
8932
msgstr ""
8933
8934
#: en/help_topics/bugs.txt:72
8935
msgid ""
8936
"If present, the location of the Trac instance referred to by\n"
8937
"<tracker>. This option can then be used together with ``bzr commit\n"
8938
"--fixes`` to mark bugs in that tracker as being fixed by that commit. For\n"
8939
"example::"
8940
msgstr ""
8941
8942
#: en/help_topics/bugs.txt:77
8943
msgid " trac_twisted_url = http://www.twistedmatrix.com/trac"
8944
msgstr ""
8945
8946
#: en/help_topics/bugs.txt:79
8947
msgid ""
8948
"would allow ``bzr commit --fixes twisted:1234`` to mark Twisted's bug 1234 "
8949
"as\n"
8950
"fixed."
8951
msgstr ""
8952
8953
#: en/help_topics/bugs.txt:82
8954
msgid ""
8955
"bugtracker_<tracker>_url\n"
8956
"------------------------"
8957
msgstr ""
8958
8959
#: en/help_topics/bugs.txt:85
8960
msgid ""
8961
"If present, the location of a generic bug tracker instance referred to by\n"
8962
"<tracker>. The location must contain an ``{id}`` placeholder,\n"
8963
"which will be replaced by a specific bug ID. This option can then be used\n"
8964
"together with ``bzr commit --fixes`` to mark bugs in that tracker as being\n"
8965
"fixed by that commit. For example::"
8966
msgstr ""
8967
8968
#: en/help_topics/bugs.txt:91
8969
msgid " bugtracker_python_url = http://bugs.python.org/issue{id}"
8970
msgstr ""
8971
8972
#: en/help_topics/bugs.txt:93
8973
msgid ""
8974
"would allow ``bzr commit --fixes python:1234`` to mark bug 1234 in Python's\n"
8975
"Roundup bug tracker as fixed, or::"
8976
msgstr ""
8977
8978
#: en/help_topics/bugs.txt:96
8979
msgid ""
8980
" bugtracker_cpan_url = http://rt.cpan.org/Public/Bug/Display.html?id={id}"
8981
msgstr ""
8982
8983
#: en/help_topics/bugs.txt:98
8984
msgid ""
8985
"would allow ``bzr commit --fixes cpan:1234`` to mark bug 1234 in CPAN's\n"
8986
"RT bug tracker as fixed, or::"
8987
msgstr ""
8988
8989
#: en/help_topics/bugs.txt:101
8990
msgid " bugtracker_hudson_url = http://issues.hudson-ci.org/browse/{id}"
8991
msgstr ""
8992
8993
#: en/help_topics/bugs.txt:103
8994
msgid ""
8995
"would allow ``bzr commit --fixes hudson:HUDSON-1234`` to mark bug HUDSON-"
8996
"1234\n"
8997
"in Hudson's JIRA bug tracker as fixed.\n"
8998
msgstr ""
8999
9000
#: en/help_topics/commands.txt:1
9001
msgid ""
9002
"add Add specified files or directories.\n"
9003
"alias Set/unset and display aliases.\n"
9004
"annotate Show the origin of each line in a file.\n"
9005
"bash-completion Generate a shell function for bash command line "
9006
"completion.\n"
9007
" [bash_completion]\n"
9008
"bind Convert the current branch into a checkout of the "
9009
"supplied\n"
9010
" branch.\n"
9011
"branch Create a new branch that is a copy of an existing branch.\n"
9012
"branches List the branches available at the current location.\n"
9013
"break-lock Break a dead lock.\n"
9014
"cat Write the contents of a file as of a given revision to\n"
9015
" standard output.\n"
9016
"check Validate working tree structure, branch consistency and\n"
9017
" repository history.\n"
9018
"checkout Create a new checkout of an existing branch.\n"
9019
"clean-tree Remove unwanted files from working tree.\n"
9020
"commit Commit changes into a new revision.\n"
9021
"config Display, set or remove a configuration option.\n"
9022
"conflicts List files with conflicts.\n"
9023
"deleted List files deleted in the working tree.\n"
9024
"diff Show differences in the working tree, between revisions "
9025
"or\n"
9026
" branches.\n"
9027
"dpush Push into a different VCS without any custom bzr "
9028
"metadata.\n"
9029
"export Export current or past revision to a destination directory "
9030
"or\n"
9031
" archive.\n"
9032
"help Show help on a command or other topic.\n"
9033
"ignore Ignore specified files or patterns.\n"
9034
"ignored List ignored files and the patterns that matched them.\n"
9035
"info Show information about a working tree, branch or "
9036
"repository.\n"
9037
"init Make a directory into a versioned branch.\n"
9038
"init-repository Create a shared repository for branches to share storage\n"
9039
" space.\n"
9040
"join Combine a tree into its containing tree.\n"
9041
"launchpad-login Show or set the Launchpad user ID. [launchpad]\n"
9042
"launchpad-mirror Ask Launchpad to mirror a branch now. [launchpad]\n"
9043
"launchpad-open Open a Launchpad branch page in your web browser. "
9044
"[launchpad]\n"
9045
"log Show historical log for a branch or subset of a branch.\n"
9046
"lp-find-proposal Find the proposal to merge this revision. [launchpad]\n"
9047
"lp-propose-merge Propose merging a branch on Launchpad. [launchpad]\n"
9048
"ls List files in a tree.\n"
9049
"merge Perform a three-way merge.\n"
9050
"missing Show unmerged/unpulled revisions between two branches.\n"
9051
"mkdir Create a new versioned directory.\n"
9052
"mv Move or rename a file.\n"
9053
"nick Print or set the branch nickname.\n"
9054
"pack Compress the data within a repository.\n"
9055
"plugins List the installed plugins.\n"
9056
"pull Turn this branch into a mirror of another branch.\n"
9057
"push Update a mirror of this branch.\n"
9058
"reconcile Reconcile bzr metadata in a branch.\n"
9059
"reconfigure Reconfigure the type of a bzr directory.\n"
9060
"register-branch Register a branch with launchpad.net. [launchpad]\n"
9061
"remerge Redo a merge.\n"
9062
"remove Remove files or directories.\n"
9063
"remove-branch Remove a branch.\n"
9064
"remove-tree Remove the working tree from a given branch/checkout.\n"
9065
"renames Show list of renamed files.\n"
9066
"resolve Mark a conflict as resolved.\n"
9067
"revert Revert files to a previous revision.\n"
9068
"revno Show current revision number.\n"
9069
"root Show the tree root directory.\n"
9070
"send Mail or create a merge-directive for submitting changes.\n"
9071
"serve Run the bzr server.\n"
9072
"shelve Temporarily set aside some changes from the current tree.\n"
9073
"sign-my-commits Sign all commits by a given committer.\n"
9074
"split Split a subdirectory of a tree into a separate tree.\n"
9075
"status Display status summary.\n"
9076
"switch Set the branch of a checkout and update.\n"
9077
"tag Create, remove or modify a tag naming a revision.\n"
9078
"tags List tags.\n"
9079
"testament Show testament (signing-form) of a revision.\n"
9080
"unbind Convert the current checkout into a regular branch.\n"
9081
"uncommit Remove the last committed revision.\n"
9082
"unshelve Restore shelved changes.\n"
9083
"update Update a working tree to a new revision.\n"
9084
"upgrade Upgrade a repository, branch or working tree to a newer\n"
9085
" format.\n"
9086
"verify-signatures Verify all commit signatures.\n"
9087
"version Show version of bzr.\n"
9088
"version-info Show version information about this tree.\n"
9089
"view Manage filtered views.\n"
9090
"whoami Show or set bzr user id.\n"
9091
msgstr ""
9092
9093
#: en/help_topics/configuration.txt:1
9094
msgid ""
9095
"Configuration Settings\n"
9096
"======================="
9097
msgstr ""
9098
9099
#: en/help_topics/configuration.txt:4
9100
msgid ""
9101
"Environment settings\n"
9102
"---------------------"
9103
msgstr ""
9104
9105
#: en/help_topics/configuration.txt:7
9106
msgid ""
9107
"While most configuration is handled by configuration files, some options\n"
9108
"which may be semi-permanent can also be controlled through the environment."
9109
msgstr ""
9110
9111
#: en/help_topics/configuration.txt:10
9112
msgid ""
9113
"BZR_EMAIL\n"
9114
"~~~~~~~~~"
9115
msgstr ""
9116
9117
#: en/help_topics/configuration.txt:13
9118
msgid "Override the email id used by Bazaar. Typical format::"
9119
msgstr ""
9120
9121
#: en/help_topics/configuration.txt:15
9122
msgid " \"John Doe <jdoe@example.com>\""
9123
msgstr ""
9124
9125
#: en/help_topics/configuration.txt:17
9126
msgid "See also the ``email`` configuration option."
9127
msgstr ""
9128
9129
#: en/help_topics/configuration.txt:19
9130
msgid ""
9131
"BZR_PROGRESS_BAR\n"
9132
"~~~~~~~~~~~~~~~~"
9133
msgstr ""
9134
9135
#: en/help_topics/configuration.txt:22
9136
msgid ""
9137
"Override the progress display. Possible values are \"none\" or \"text\". "
9138
"If\n"
9139
"the value is \"none\" then no progress bar is displayed. The value \"text\" "
9140
"draws\n"
9141
"the ordinary command line progress bar."
9142
msgstr ""
9143
9144
#: en/help_topics/configuration.txt:26
9145
msgid ""
9146
"BZR_SIGQUIT_PDB\n"
9147
"~~~~~~~~~~~~~~~"
9148
msgstr ""
9149
9150
#: en/help_topics/configuration.txt:29
9151
msgid ""
9152
"Control whether SIGQUIT behaves normally or invokes a breakin debugger."
9153
msgstr ""
9154
9155
#: en/help_topics/configuration.txt:31
9156
msgid ""
9157
"* 0 = Standard SIGQUIT behavior (normally, exit with a core dump)\n"
9158
"* 1 = Invoke breakin debugger (default)"
9159
msgstr ""
9160
9161
#: en/help_topics/configuration.txt:34
9162
msgid ""
9163
"BZR_HOME\n"
9164
"~~~~~~~~"
9165
msgstr ""
9166
9167
#: en/help_topics/configuration.txt:37
9168
msgid "Override the home directory used by Bazaar."
9169
msgstr ""
9170
9171
#: en/help_topics/configuration.txt:39
9172
msgid ""
9173
"BZR_SSH\n"
9174
"~~~~~~~"
9175
msgstr ""
9176
9177
#: en/help_topics/configuration.txt:42
9178
msgid "Select a different SSH implementation."
9179
msgstr ""
9180
9181
#: en/help_topics/configuration.txt:44
9182
msgid ""
9183
"BZR_PDB\n"
9184
"~~~~~~~"
9185
msgstr ""
9186
9187
#: en/help_topics/configuration.txt:47
9188
msgid "Control whether to launch a debugger on error."
9189
msgstr ""
9190
9191
#: en/help_topics/configuration.txt:49
9192
msgid ""
9193
"* 0 = Standard behavior\n"
9194
"* 1 = Launch debugger"
9195
msgstr ""
9196
9197
#: en/help_topics/configuration.txt:52
9198
msgid ""
9199
"BZR_REMOTE_PATH\n"
9200
"~~~~~~~~~~~~~~~"
9201
msgstr ""
9202
9203
#: en/help_topics/configuration.txt:55
9204
msgid "Path to the Bazaar executable to use when using the bzr+ssh protocol."
9205
msgstr ""
9206
9207
#: en/help_topics/configuration.txt:57
9208
msgid "See also the ``bzr_remote_path`` configuration option."
9209
msgstr ""
9210
9211
#: en/help_topics/configuration.txt:59
9212
msgid ""
9213
"BZR_EDITOR\n"
9214
"~~~~~~~~~~"
9215
msgstr ""
9216
9217
#: en/help_topics/configuration.txt:62
9218
msgid "Path to the editor Bazaar should use for commit messages, etc."
9219
msgstr ""
9220
9221
#: en/help_topics/configuration.txt:64
9222
msgid ""
9223
"BZR_LOG\n"
9224
"~~~~~~~"
9225
msgstr ""
9226
9227
#: en/help_topics/configuration.txt:67
9228
msgid ""
9229
"Location of the Bazaar log file. You can check the current location by\n"
9230
"running ``bzr version``."
9231
msgstr ""
9232
9233
#: en/help_topics/configuration.txt:70
9234
msgid ""
9235
"The log file contains debug information that is useful for diagnosing or\n"
9236
"reporting problems with Bazaar."
9237
msgstr ""
9238
9239
#: en/help_topics/configuration.txt:73
9240
msgid ""
9241
"Setting this to ``NUL`` on Windows or ``/dev/null`` on other platforms\n"
9242
"will disable logging."
9243
msgstr ""
9244
9245
#: en/help_topics/configuration.txt:76
9246
msgid ""
9247
"\n"
9248
"BZR_PLUGIN_PATH\n"
9249
"~~~~~~~~~~~~~~~"
9250
msgstr ""
9251
9252
#: en/help_topics/configuration.txt:80
9253
msgid ""
9254
"The path to the plugins directory that Bazaar should use.\n"
9255
"If not set, Bazaar will search for plugins in:"
9256
msgstr ""
9257
9258
#: en/help_topics/configuration.txt:83
9259
msgid ""
9260
"* the user specific plugin directory (containing the ``user`` plugins),"
9261
msgstr ""
9262
9263
#: en/help_topics/configuration.txt:85
9264
msgid "* the bzrlib directory (containing the ``core`` plugins),"
9265
msgstr ""
9266
9267
#: en/help_topics/configuration.txt:87
9268
msgid ""
9269
"* the site specific plugin directory if applicable (containing\n"
9270
" the ``site`` plugins)."
9271
msgstr ""
9272
9273
#: en/help_topics/configuration.txt:90
9274
msgid ""
9275
"If ``BZR_PLUGIN_PATH`` is set in any fashion, it will change the\n"
9276
"the way the plugin are searched. "
9277
msgstr ""
9278
9279
#: en/help_topics/configuration.txt:93
9280
msgid ""
9281
"As for the ``PATH`` variables, if multiple directories are\n"
9282
"specified in ``BZR_PLUGIN_PATH`` they should be separated by the\n"
9283
"platform specific appropriate character (':' on Unix,\n"
9284
"';' on windows)"
9285
msgstr ""
9286
9287
#: en/help_topics/configuration.txt:98
9288
msgid ""
9289
"By default if ``BZR_PLUGIN_PATH`` is set, it replaces searching\n"
9290
"in ``user``. However it will continue to search in ``core`` and\n"
9291
"``site`` unless they are explicitly removed."
9292
msgstr ""
9293
9294
#: en/help_topics/configuration.txt:102
9295
msgid ""
9296
"If you need to change the order or remove one of these\n"
9297
"directories, you should use special values:"
9298
msgstr ""
9299
9300
#: en/help_topics/configuration.txt:105
9301
msgid ""
9302
"* ``-user``, ``-core``, ``-site`` will remove the corresponding\n"
9303
" path from the default values,"
9304
msgstr ""
9305
9306
#: en/help_topics/configuration.txt:108
9307
msgid ""
9308
"* ``+user``, ``+core``, ``+site`` will add the corresponding path\n"
9309
" before the remaining default values (and also remove it from\n"
9310
" the default values)."
9311
msgstr ""
9312
9313
#: en/help_topics/configuration.txt:112
9314
msgid ""
9315
"Note that the special values 'user', 'core' and 'site' should be\n"
9316
"used literally, they will be substituted by the corresponding,\n"
9317
"platform specific, values."
9318
msgstr ""
9319
9320
#: en/help_topics/configuration.txt:116
9321
msgid ""
9322
"The examples below use ':' as the separator, windows users\n"
9323
"should use ';'."
9324
msgstr ""
9325
9326
#: en/help_topics/configuration.txt:119
9327
msgid "Overriding the default user plugin directory::"
9328
msgstr ""
9329
9330
#: en/help_topics/configuration.txt:121
9331
msgid " BZR_PLUGIN_PATH='/path/to/my/other/plugins'"
9332
msgstr ""
9333
9334
#: en/help_topics/configuration.txt:123
9335
msgid "Disabling the site directory while retaining the user directory::"
9336
msgstr ""
9337
9338
#: en/help_topics/configuration.txt:125
9339
msgid " BZR_PLUGIN_PATH='-site:+user'"
9340
msgstr ""
9341
9342
#: en/help_topics/configuration.txt:127
9343
msgid "Disabling all plugins (better achieved with --no-plugins)::"
9344
msgstr ""
9345
9346
#: en/help_topics/configuration.txt:129
9347
msgid " BZR_PLUGIN_PATH='-user:-core:-site'"
9348
msgstr ""
9349
9350
#: en/help_topics/configuration.txt:131
9351
msgid "Overriding the default site plugin directory::"
9352
msgstr ""
9353
9354
#: en/help_topics/configuration.txt:133
9355
msgid " BZR_PLUGIN_PATH='/path/to/my/site/plugins:-site':+user"
9356
msgstr ""
9357
9358
#: en/help_topics/configuration.txt:135
9359
msgid ""
9360
"BZR_DISABLE_PLUGINS\n"
9361
"~~~~~~~~~~~~~~~~~~~"
9362
msgstr ""
9363
9364
#: en/help_topics/configuration.txt:138
9365
msgid ""
9366
"Under special circumstances (mostly when trying to diagnose a\n"
9367
"bug), it's better to disable a plugin (or several) rather than\n"
9368
"uninstalling them completely. Such plugins can be specified in\n"
9369
"the ``BZR_DISABLE_PLUGINS`` environment variable."
9370
msgstr ""
9371
9372
#: en/help_topics/configuration.txt:143
9373
msgid ""
9374
"In that case, ``bzr`` will stop loading the specified plugins and\n"
9375
"will raise an import error if they are explicitly imported (by\n"
9376
"another plugin that depends on them for example)."
9377
msgstr ""
9378
9379
#: en/help_topics/configuration.txt:147
9380
msgid "Disabling ``myplugin`` and ``yourplugin`` is achieved by::"
9381
msgstr ""
9382
9383
#: en/help_topics/configuration.txt:149
9384
msgid " BZR_DISABLE_PLUGINS='myplugin:yourplugin'"
9385
msgstr ""
9386
9387
#: en/help_topics/configuration.txt:151
9388
msgid ""
9389
"BZR_PLUGINS_AT\n"
9390
"~~~~~~~~~~~~~~"
9391
msgstr ""
9392
9393
#: en/help_topics/configuration.txt:154
9394
msgid ""
9395
"When adding a new feature or working on a bug in a plugin,\n"
9396
"developers often need to use a specific version of a given\n"
9397
"plugin. Since python requires that the directory containing the\n"
9398
"code is named like the plugin itself this make it impossible to\n"
9399
"use arbitrary directory names (using a two-level directory scheme\n"
9400
"is inconvenient). ``BZR_PLUGINS_AT`` allows such directories even\n"
9401
"if they don't appear in ``BZR_PLUGIN_PATH`` ."
9402
msgstr ""
9403
9404
#: en/help_topics/configuration.txt:162
9405
msgid ""
9406
"Plugins specified in this environment variable takes precedence\n"
9407
"over the ones in ``BZR_PLUGIN_PATH``."
9408
msgstr ""
9409
9410
#: en/help_topics/configuration.txt:165
9411
msgid ""
9412
"The variable specified a list of ``plugin_name@plugin path``,\n"
9413
"``plugin_name`` being the name of the plugin as it appears in\n"
9414
"python module paths, ``plugin_path`` being the path to the\n"
9415
"directory containing the plugin code itself\n"
9416
"(i.e. ``plugins/myplugin`` not ``plugins``). Use ':' as the list\n"
9417
"separator, use ';' on windows."
9418
msgstr ""
9419
9420
#: en/help_topics/configuration.txt:172
9421
msgid ""
9422
"Example:\n"
9423
"~~~~~~~~"
9424
msgstr ""
9425
9426
#: en/help_topics/configuration.txt:175
9427
msgid ""
9428
"Using a specific version of ``myplugin``:\n"
9429
"``BZR_PLUGINS_AT='myplugin@/home/me/bugfixes/123456-myplugin``"
9430
msgstr ""
9431
9432
#: en/help_topics/configuration.txt:178
9433
msgid ""
9434
"BZRPATH\n"
9435
"~~~~~~~"
9436
msgstr ""
9437
9438
#: en/help_topics/configuration.txt:181
9439
msgid "The path where Bazaar should look for shell plugin external commands."
9440
msgstr ""
9441
9442
#: en/help_topics/configuration.txt:183
9443
msgid ""
9444
"\n"
9445
"http_proxy, https_proxy\n"
9446
"~~~~~~~~~~~~~~~~~~~~~~~"
9447
msgstr ""
9448
9449
#: en/help_topics/configuration.txt:187
9450
msgid "Specifies the network proxy for outgoing connections, for example::"
9451
msgstr ""
9452
9453
#: en/help_topics/configuration.txt:189
9454
msgid ""
9455
" http_proxy=http://proxy.example.com:3128/ \n"
9456
" https_proxy=http://proxy.example.com:3128/"
9457
msgstr ""
9458
9459
#: en/help_topics/configuration.txt:192
9460
msgid ""
9461
"\n"
9462
"Configuration files\n"
9463
"-------------------"
9464
msgstr ""
9465
9466
#: en/help_topics/configuration.txt:196
9467
msgid ""
9468
"Location\n"
9469
"~~~~~~~~"
9470
msgstr ""
9471
9472
#: en/help_topics/configuration.txt:199
9473
msgid ""
9474
"Configuration files are located in ``$HOME/.bazaar`` on Unix and\n"
9475
"``C:\\Documents and Settings\\<username>\\Application Data\\Bazaar\\2.0`` "
9476
"on\n"
9477
"Windows. (You can check the location for your system by using\n"
9478
"``bzr version``.)"
9479
msgstr ""
9480
9481
#: en/help_topics/configuration.txt:204
9482
msgid "There are three primary configuration files in this location:"
9483
msgstr ""
9484
9485
#: en/help_topics/configuration.txt:206
9486
msgid "* ``bazaar.conf`` describes default configuration options,"
9487
msgstr ""
9488
9489
#: en/help_topics/configuration.txt:208
9490
msgid ""
9491
"* ``locations.conf`` describes configuration information for\n"
9492
" specific branch locations,"
9493
msgstr ""
9494
9495
#: en/help_topics/configuration.txt:211
9496
msgid ""
9497
"* ``authentication.conf`` describes credential information for\n"
9498
" remote servers."
9499
msgstr ""
9500
9501
#: en/help_topics/configuration.txt:214
9502
msgid ""
9503
"Each branch can also contain a configuration file that sets values specific\n"
9504
"to that branch. This file is found at ``.bzr/branch/branch.conf`` within "
9505
"the\n"
9506
"branch. This file is visible to all users of a branch, if you wish to "
9507
"override\n"
9508
"one of the values for a branch with a setting that is specific to you then "
9509
"you\n"
9510
"can do so in ``locations.conf``."
9511
msgstr ""
9512
9513
#: en/help_topics/configuration.txt:220
9514
msgid ""
9515
"General format\n"
9516
"~~~~~~~~~~~~~~"
9517
msgstr ""
9518
9519
#: en/help_topics/configuration.txt:223
9520
msgid ""
9521
"An ini file has three types of contructs: section headers, section\n"
9522
"options and comments."
9523
msgstr ""
9524
9525
#: en/help_topics/configuration.txt:226
9526
msgid ""
9527
"Comments\n"
9528
"^^^^^^^^"
9529
msgstr ""
9530
9531
#: en/help_topics/configuration.txt:229
9532
msgid ""
9533
"A comment is any line that starts with a \"#\" (sometimes called a \"hash\n"
9534
"mark\", \"pound sign\" or \"number sign\"). Comment lines are ignored by\n"
9535
"Bazaar when parsing ini files."
9536
msgstr ""
9537
9538
#: en/help_topics/configuration.txt:233
9539
msgid ""
9540
"Section headers\n"
9541
"^^^^^^^^^^^^^^^"
9542
msgstr ""
9543
9544
#: en/help_topics/configuration.txt:236
9545
msgid ""
9546
"A section header is a word enclosed in brackets that starts at the begining\n"
9547
"of a line. A typical section header looks like this::"
9548
msgstr ""
9549
9550
#: en/help_topics/configuration.txt:239
9551
msgid " [DEFAULT]"
9552
msgstr ""
9553
9554
#: en/help_topics/configuration.txt:241
9555
msgid ""
9556
"The only valid section headers for bazaar.conf currently are [DEFAULT] and\n"
9557
"[ALIASES]. Section headers are case sensitive. The default section provides "
9558
"for\n"
9559
"setting options which can be overridden with the branch config file."
9560
msgstr ""
9561
9562
#: en/help_topics/configuration.txt:245
9563
msgid ""
9564
"For ``locations.conf``, the options from the section with the\n"
9565
"longest matching section header are used to the exclusion of other\n"
9566
"potentially valid section headers. A section header uses the path for\n"
9567
"the branch as the section header. Some examples include::"
9568
msgstr ""
9569
9570
#: en/help_topics/configuration.txt:250
9571
msgid ""
9572
" [http://mybranches.isp.com/~jdoe/branchdir]\n"
9573
" [/home/jdoe/branches/]"
9574
msgstr ""
9575
9576
#: en/help_topics/configuration.txt:253
9577
msgid ""
9578
"\n"
9579
"Section options\n"
9580
"^^^^^^^^^^^^^^^"
9581
msgstr ""
9582
9583
#: en/help_topics/configuration.txt:257
9584
msgid ""
9585
"A section option resides within a section. A section option contains an\n"
9586
"option name, an equals sign and a value. For example::"
9587
msgstr ""
9588
9589
#: en/help_topics/configuration.txt:260
9590
msgid ""
9591
" email = John Doe <jdoe@isp.com>\n"
9592
" gpg_signing_key = Amy Pond <amy@example.com>"
9593
msgstr ""
9594
9595
#: en/help_topics/configuration.txt:263
9596
msgid ""
9597
"A option can reference other options by enclosing them in curly brackets::"
9598
msgstr ""
9599
9600
#: en/help_topics/configuration.txt:265
9601
msgid ""
9602
" my_branch_name = feature_x\n"
9603
" my_server = bzr+ssh://example.com\n"
9604
" push_location = {my_server}/project/{my_branch_name}"
9605
msgstr ""
9606
9607
#: en/help_topics/configuration.txt:269
9608
msgid ""
9609
"Option policies\n"
9610
"^^^^^^^^^^^^^^^"
9611
msgstr ""
9612
9613
#: en/help_topics/configuration.txt:272
9614
msgid ""
9615
"Options defined in a section affect the named directory or URL plus\n"
9616
"any locations they contain. Policies can be used to change how an\n"
9617
"option value is interpreted for contained locations. Currently\n"
9618
"there are three policies available:"
9619
msgstr ""
9620
9621
#: en/help_topics/configuration.txt:277
9622
msgid ""
9623
" none:\n"
9624
" the value is interpreted the same for contained locations. This is\n"
9625
" the default behaviour.\n"
9626
" norecurse:\n"
9627
" the value is only used for the exact location specified by the\n"
9628
" section name.\n"
9629
" appendpath:\n"
9630
" for contained locations, any additional path components are\n"
9631
" appended to the value."
9632
msgstr ""
9633
9634
#: en/help_topics/configuration.txt:287
9635
msgid ""
9636
"Policies are specified by keys with names of the form "
9637
"\"<option_name>:policy\".\n"
9638
"For example, to define the push location for a tree of branches, the\n"
9639
"following could be used::"
9640
msgstr ""
9641
9642
#: en/help_topics/configuration.txt:291
9643
msgid ""
9644
" [/top/location]\n"
9645
" push_location = sftp://example.com/location\n"
9646
" push_location:policy = appendpath"
9647
msgstr ""
9648
9649
#: en/help_topics/configuration.txt:295
9650
msgid ""
9651
"With this configuration, the push location for ``/top/location/branch1``\n"
9652
"would be ``sftp://example.com/location/branch1``."
9653
msgstr ""
9654
9655
#: en/help_topics/configuration.txt:298
9656
msgid ""
9657
"Section local options\n"
9658
"^^^^^^^^^^^^^^^^^^^^^"
9659
msgstr ""
9660
9661
#: en/help_topics/configuration.txt:301
9662
msgid ""
9663
"Some options are defined automatically inside a given section and can be\n"
9664
"refered to in this section only. "
9665
msgstr ""
9666
9667
#: en/help_topics/configuration.txt:304
9668
msgid "For example, the ``appendpath`` policy can be used like this::"
9669
msgstr ""
9670
9671
#: en/help_topics/configuration.txt:306
9672
msgid ""
9673
" [/home/vila/src/bzr/bugs]\n"
9674
" mypush = lp:~vila/bzr\n"
9675
" mypush:policy=appendpath"
9676
msgstr ""
9677
9678
#: en/help_topics/configuration.txt:310
9679
msgid "Using ``relpath`` to achieve the same result is done like this::"
9680
msgstr ""
9681
9682
#: en/help_topics/configuration.txt:312
9683
msgid ""
9684
" [/home/vila/src/bzr/bugs]\n"
9685
" mypush = lp:~vila/bzr/{relpath}"
9686
msgstr ""
9687
9688
#: en/help_topics/configuration.txt:315
9689
msgid ""
9690
"In both cases, when used in a directory like\n"
9691
"``/home/vila/src/bzr/bugs/832013-expand-in-stack`` we'll get::"
9692
msgstr ""
9693
9694
#: en/help_topics/configuration.txt:318 en/help_topics/configuration.txt:329
9695
msgid ""
9696
" $ bzr config mypush\n"
9697
" lp:~vila/bzr/832013-expand-in-stack"
9698
msgstr ""
9699
9700
#: en/help_topics/configuration.txt:321
9701
msgid "Another such option is ``basename`` which can be used like this::"
9702
msgstr ""
9703
9704
#: en/help_topics/configuration.txt:323
9705
msgid ""
9706
" [/home/vila/src/bzr]\n"
9707
" mypush = lp:~vila/bzr/{basename}"
9708
msgstr ""
9709
9710
#: en/help_topics/configuration.txt:326
9711
msgid ""
9712
"When used in a directory like\n"
9713
"``/home/vila/src/bzr/bugs/832013-expand-in-stack`` we'll get::"
9714
msgstr ""
9715
9716
#: en/help_topics/configuration.txt:332
9717
msgid ""
9718
"Note that ``basename`` here refers to the base name of ``relpath`` which\n"
9719
"itself is defined as the relative path between the section name and the\n"
9720
"location it matches."
9721
msgstr ""
9722
9723
#: en/help_topics/configuration.txt:336
9724
msgid ""
9725
"When an option is local to a Section, it cannot be referred to from option\n"
9726
"values in any other section from the same ``Store`` nor from any other\n"
9727
"``Store``."
9728
msgstr ""
9729
9730
#: en/help_topics/configuration.txt:340
9731
msgid ""
9732
"\n"
9733
"The main configuration file, bazaar.conf\n"
9734
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
9735
msgstr ""
9736
9737
#: en/help_topics/configuration.txt:344
9738
msgid ""
9739
"``bazaar.conf`` allows two sections: ``[DEFAULT]`` and ``[ALIASES]``.\n"
9740
"The default section contains the default\n"
9741
"configuration options for all branches. The default section can be\n"
9742
"overriden by providing a branch-specific section in ``locations.conf``."
9743
msgstr ""
9744
9745
#: en/help_topics/configuration.txt:349
9746
msgid "A typical ``bazaar.conf`` section often looks like the following::"
9747
msgstr ""
9748
9749
#: en/help_topics/configuration.txt:351
9750
msgid ""
9751
" [DEFAULT]\n"
9752
" email = John Doe <jdoe@isp.com>\n"
9753
" editor = /usr/bin/vim\n"
9754
" create_signatures = when-required"
9755
msgstr ""
9756
9757
#: en/help_topics/configuration.txt:356
9758
msgid ""
9759
"\n"
9760
"The branch location configuration file, locations.conf\n"
9761
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
9762
msgstr ""
9763
9764
#: en/help_topics/configuration.txt:360
9765
msgid ""
9766
"``locations.conf`` allows one to specify overriding settings for\n"
9767
"a specific branch. The format is almost identical to the default section in\n"
9768
"bazaar.conf with one significant change: The section header, instead of "
9769
"saying\n"
9770
"default, will be the path to a branch that you wish to override a value\n"
9771
"for. The '?' and '*' wildcards are supported::"
9772
msgstr ""
9773
9774
#: en/help_topics/configuration.txt:366
9775
msgid ""
9776
" [/home/jdoe/branches/nethack]\n"
9777
" email = Nethack Admin <nethack@nethack.com>"
9778
msgstr ""
9779
9780
#: en/help_topics/configuration.txt:369
9781
msgid ""
9782
" [http://hypothetical.site.com/branches/devel-branch]\n"
9783
" create_signatures = always"
9784
msgstr ""
9785
9786
#: en/help_topics/configuration.txt:372
9787
msgid ""
9788
"The authentication configuration file, authentication.conf\n"
9789
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
9790
msgstr ""
9791
9792
#: en/help_topics/configuration.txt:375
9793
msgid ""
9794
"``authentication.conf`` allows one to specify credentials for\n"
9795
"remote servers. This can be used for all the supported transports and any "
9796
"part\n"
9797
"of bzr that requires authentication (smtp for example)."
9798
msgstr ""
9799
9800
#: en/help_topics/configuration.txt:379
9801
msgid ""
9802
"The syntax of the file obeys the same rules as the others except for the\n"
9803
"option policies which don't apply."
9804
msgstr ""
9805
9806
#: en/help_topics/configuration.txt:382
9807
msgid ""
9808
"For more information on the possible uses of the authentication "
9809
"configuration\n"
9810
"file see :doc:`authentication-help`."
9811
msgstr ""
9812
9813
#: en/help_topics/configuration.txt:385
9814
msgid ""
9815
"\n"
9816
"Common options\n"
9817
"--------------"
9818
msgstr ""
9819
9820
#: en/help_topics/configuration.txt:389
9821
msgid ""
9822
"debug_flags\n"
9823
"~~~~~~~~~~~"
9824
msgstr ""
9825
9826
#: en/help_topics/configuration.txt:392
9827
msgid ""
9828
"A comma-separated list of debugging options to turn on. The same values\n"
9829
"can be used as with the -D command-line option (see `help global-options`).\n"
9830
"For example::"
9831
msgstr ""
9832
9833
#: en/help_topics/configuration.txt:396
9834
msgid " debug_flags = hpss"
9835
msgstr ""
9836
9837
#: en/help_topics/configuration.txt:400
9838
msgid " debug_flags = hpss,evil"
9839
msgstr ""
9840
9841
#: en/help_topics/configuration.txt:402
9842
msgid ""
9843
"email\n"
9844
"~~~~~"
9845
msgstr ""
9846
9847
#: en/help_topics/configuration.txt:405
9848
msgid ""
9849
"The email address to use when committing a branch. Typically takes the form\n"
9850
"of::"
9851
msgstr ""
9852
9853
#: en/help_topics/configuration.txt:408
9854
msgid " email = Full Name <account@hostname.tld>"
9855
msgstr ""
9856
9857
#: en/help_topics/configuration.txt:410
9858
msgid ""
9859
"editor\n"
9860
"~~~~~~"
9861
msgstr ""
9862
9863
#: en/help_topics/configuration.txt:413
9864
msgid ""
9865
"The path of the editor that you wish to use if *bzr commit* is run without\n"
9866
"a commit message. This setting is trumped by the environment variable\n"
9867
"``BZR_EDITOR``, and overrides the ``VISUAL`` and ``EDITOR`` environment\n"
9868
"variables."
9869
msgstr ""
9870
9871
#: en/help_topics/configuration.txt:418
9872
msgid ""
9873
"log_format\n"
9874
"~~~~~~~~~~"
9875
msgstr ""
9876
9877
#: en/help_topics/configuration.txt:421
9878
msgid ""
9879
"The default log format to use. Standard log formats are ``long``, ``short``\n"
9880
"and ``line``. Additional formats may be provided by plugins. The default\n"
9881
"value is ``long``."
9882
msgstr ""
9883
9884
#: en/help_topics/configuration.txt:425
9885
msgid ""
9886
"check_signatures\n"
9887
"~~~~~~~~~~~~~~~~"
9888
msgstr ""
9889
9890
#: en/help_topics/configuration.txt:428
9891
msgid ""
9892
"Reserved for future use. These options will allow a policy for branches to\n"
9893
"require signatures."
9894
msgstr ""
9895
9896
#: en/help_topics/configuration.txt:431
9897
msgid ""
9898
"require\n"
9899
" The gnupg signature for revisions must be present and must be valid."
9900
msgstr ""
9901
9902
#: en/help_topics/configuration.txt:434
9903
msgid ""
9904
"ignore\n"
9905
" Do not check gnupg signatures of revisions."
9906
msgstr ""
9907
9908
#: en/help_topics/configuration.txt:437
9909
msgid ""
9910
"check-available\n"
9911
" (default) If gnupg signatures for revisions are present, check them.\n"
9912
" Bazaar will fail if it finds a bad signature, but will not fail if\n"
9913
" no signature is present."
9914
msgstr ""
9915
9916
#: en/help_topics/configuration.txt:442
9917
msgid ""
9918
"create_signatures\n"
9919
"~~~~~~~~~~~~~~~~~"
9920
msgstr ""
9921
9922
#: en/help_topics/configuration.txt:445
9923
msgid ""
9924
"Defines the behaviour of signing revisions on commits. By default bzr will "
9925
"not\n"
9926
"sign new commits."
9927
msgstr ""
9928
9929
#: en/help_topics/configuration.txt:448
9930
msgid ""
9931
"always\n"
9932
" Sign every new revision that is committed. If the signing fails then "
9933
"the\n"
9934
" commit will not be made."
9935
msgstr ""
9936
9937
#: en/help_topics/configuration.txt:452
9938
msgid ""
9939
"when-required\n"
9940
" Reserved for future use."
9941
msgstr ""
9942
9943
#: en/help_topics/configuration.txt:455
9944
msgid ""
9945
"never\n"
9946
" Reserved for future use."
9947
msgstr ""
9948
9949
#: en/help_topics/configuration.txt:458
9950
msgid ""
9951
"In future it is planned that ``when-required`` will sign newly\n"
9952
"committed revisions only when the branch requires them. ``never`` will "
9953
"refuse\n"
9954
"to sign newly committed revisions, even if the branch requires signatures."
9955
msgstr ""
9956
9957
#: en/help_topics/configuration.txt:462
9958
msgid ""
9959
"dirstate.fdatasync\n"
9960
"~~~~~~~~~~~~~~~~~~"
9961
msgstr ""
9962
9963
#: en/help_topics/configuration.txt:465
9964
msgid ""
9965
"If true (default), working tree metadata changes are flushed through the\n"
9966
"OS buffers to physical disk. This is somewhat slower, but means data\n"
9967
"should not be lost if the machine crashes. See also repository.fdatasync."
9968
msgstr ""
9969
9970
#: en/help_topics/configuration.txt:469
9971
msgid ""
9972
"gpg_signing_key\n"
9973
"~~~~~~~~~~~~~~~"
9974
msgstr ""
9975
9976
#: en/help_topics/configuration.txt:472
9977
msgid ""
9978
"The GnuPG user identity to use when signing commits. Can be an e-mail\n"
9979
"address, key fingerprint or full key ID. When unset or when set to\n"
9980
"\"default\" Bazaar will use the user e-mail set with ``whoami``."
9981
msgstr ""
9982
9983
#: en/help_topics/configuration.txt:476
9984
msgid ""
9985
"recurse\n"
9986
"~~~~~~~"
9987
msgstr ""
9988
9989
#: en/help_topics/configuration.txt:479
9990
msgid ""
9991
"Only useful in ``locations.conf``. Defines whether or not the\n"
9992
"configuration for this section applies to subdirectories:"
9993
msgstr ""
9994
9995
#: en/help_topics/configuration.txt:482
9996
msgid ""
9997
"true\n"
9998
" (default) This section applies to subdirectories as well."
9999
msgstr ""
10000
10001
#: en/help_topics/configuration.txt:485
10002
msgid ""
10003
"false\n"
10004
" This section only applies to the branch at this directory and not\n"
10005
" branches below it."
10006
msgstr ""
10007
10008
#: en/help_topics/configuration.txt:489
10009
msgid ""
10010
"gpg_signing_command\n"
10011
"~~~~~~~~~~~~~~~~~~~"
10012
msgstr ""
10013
10014
#: en/help_topics/configuration.txt:492
10015
msgid ""
10016
"(Default: \"gpg\"). Which program should be used to sign and check "
10017
"revisions.\n"
10018
"For example::"
10019
msgstr ""
10020
10021
#: en/help_topics/configuration.txt:495
10022
msgid " gpg_signing_command = /usr/bin/gnpg"
10023
msgstr ""
10024
10025
#: en/help_topics/configuration.txt:497
10026
msgid ""
10027
"The specified command must accept the options \"--clearsign\" and \"-u "
10028
"<email>\"."
10029
msgstr ""
10030
10031
#: en/help_topics/configuration.txt:499
10032
msgid ""
10033
"bzr_remote_path\n"
10034
"~~~~~~~~~~~~~~~"
10035
msgstr ""
10036
10037
#: en/help_topics/configuration.txt:502
10038
msgid ""
10039
"(Default: \"bzr\"). The path to the command that should be used to run the "
10040
"smart\n"
10041
"server for bzr. This value may only be specified in locations.conf, because:"
10042
msgstr ""
10043
10044
#: en/help_topics/configuration.txt:505
10045
msgid ""
10046
"- it's needed before branch.conf is accessible\n"
10047
"- allowing remote branch.conf files to specify commands would be a security\n"
10048
" risk"
10049
msgstr ""
10050
10051
#: en/help_topics/configuration.txt:509
10052
msgid "It is overridden by the BZR_REMOTE_PATH environment variable."
10053
msgstr ""
10054
10055
#: en/help_topics/configuration.txt:511
10056
msgid ""
10057
"smtp_server\n"
10058
"~~~~~~~~~~~"
10059
msgstr ""
10060
10061
#: en/help_topics/configuration.txt:514
10062
msgid ""
10063
"(Default: \"localhost\"). SMTP server to use when Bazaar needs to send\n"
10064
"email, eg. with ``merge-directive --mail-to``, or the bzr-email plugin."
10065
msgstr ""
10066
10067
#: en/help_topics/configuration.txt:517
10068
msgid ""
10069
"smtp_username, smtp_password\n"
10070
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
10071
msgstr ""
10072
10073
#: en/help_topics/configuration.txt:520
10074
msgid ""
10075
"User and password to authenticate to the SMTP server. If smtp_username\n"
10076
"is set, and smtp_password is not, Bazaar will prompt for a password.\n"
10077
"These settings are only needed if the SMTP server requires authentication\n"
10078
"to send mail."
10079
msgstr ""
10080
10081
#: en/help_topics/configuration.txt:525
10082
msgid ""
10083
"locks.steal_dead\n"
10084
"~~~~~~~~~~~~~~~~"
10085
msgstr ""
10086
10087
#: en/help_topics/configuration.txt:528
10088
msgid ""
10089
"If set to true, bzr will automatically break locks held by processes from\n"
10090
"the same machine and user that are no longer alive. Otherwise, it will\n"
10091
"print a message and you can break the lock manually, if you are satisfied\n"
10092
"the object is no longer in use."
10093
msgstr ""
10094
10095
#: en/help_topics/configuration.txt:533
10096
msgid ""
10097
"mail_client\n"
10098
"~~~~~~~~~~~"
10099
msgstr ""
10100
10101
#: en/help_topics/configuration.txt:536
10102
msgid ""
10103
"A mail client to use for sending merge requests.\n"
10104
"By default, bzr will try to use ``mapi`` on Windows. On other platforms, "
10105
"it\n"
10106
"will try ``xdg-email``. If either of these fails, it will fall back to\n"
10107
"``editor``."
10108
msgstr ""
10109
10110
#: en/help_topics/configuration.txt:541
10111
msgid "Supported values for specific clients:"
10112
msgstr ""
10113
10114
#: en/help_topics/configuration.txt:543
10115
msgid ""
10116
":claws: Use Claws. This skips a dialog for attaching files.\n"
10117
":evolution: Use Evolution.\n"
10118
":kmail: Use KMail.\n"
10119
":mutt: Use Mutt.\n"
10120
":thunderbird: Use Mozilla Thunderbird or Icedove. For Thunderbird/Icedove "
10121
"1.5,\n"
10122
" this works around some bugs that xdg-email doesn't handle."
10123
msgstr ""
10124
10125
#: en/help_topics/configuration.txt:550
10126
msgid "Supported generic values are:"
10127
msgstr ""
10128
10129
#: en/help_topics/configuration.txt:552
10130
msgid ""
10131
":default: See above.\n"
10132
":editor: Use your editor to compose the merge request. This also uses\n"
10133
" your commit id, (see ``bzr whoami``), smtp_server and (optionally)\n"
10134
" smtp_username and smtp_password.\n"
10135
":mapi: Use your preferred e-mail client on Windows.\n"
10136
":xdg-email: Use xdg-email to run your preferred mail program"
10137
msgstr ""
10138
10139
#: en/help_topics/configuration.txt:559
10140
msgid ""
10141
"repository.fdatasync\n"
10142
"~~~~~~~~~~~~~~~~~~~~"
10143
msgstr ""
10144
10145
#: en/help_topics/configuration.txt:562
10146
msgid ""
10147
"If true (default), repository changes are flushed through the OS buffers\n"
10148
"to physical disk. This is somewhat slower, but means data should not be\n"
10149
"lost if the machine crashes. See also dirstate.fdatasync."
10150
msgstr ""
10151
10152
#: en/help_topics/configuration.txt:566
10153
msgid ""
10154
"submit_branch\n"
10155
"~~~~~~~~~~~~~"
10156
msgstr ""
10157
10158
#: en/help_topics/configuration.txt:569
10159
msgid ""
10160
"The branch you intend to submit your current work to. This is "
10161
"automatically\n"
10162
"set by ``bzr send``, and is also used by the ``submit:`` revision spec. "
10163
"This\n"
10164
"should usually be set on a per-branch or per-location basis."
10165
msgstr ""
10166
10167
#: en/help_topics/configuration.txt:573
10168
msgid ""
10169
"public_branch\n"
10170
"~~~~~~~~~~~~~"
10171
msgstr ""
10172
10173
#: en/help_topics/configuration.txt:576
10174
msgid ""
10175
"A publically-accessible version of this branch (implying that this version "
10176
"is\n"
10177
"not publically-accessible). Used (and set) by ``bzr send``."
10178
msgstr ""
10179
10180
#: en/help_topics/configuration.txt:579
10181
msgid ""
10182
"suppress_warnings\n"
10183
"~~~~~~~~~~~~~~~~~"
10184
msgstr ""
10185
10186
#: en/help_topics/configuration.txt:582
10187
msgid ""
10188
"A list of strings, each string represent a warning that can be emitted by\n"
10189
"bzr. Mentioning a warning in this list tells bzr to not emit it."
10190
msgstr ""
10191
10192
#: en/help_topics/configuration.txt:585
10193
msgid "Valid values:"
10194
msgstr ""
10195
10196
#: en/help_topics/configuration.txt:587
10197
msgid ""
10198
"* ``format_deprecation``:\n"
10199
" whether the format deprecation warning is shown on repositories that "
10200
"are\n"
10201
" using deprecated formats."
10202
msgstr ""
10203
10204
#: en/help_topics/configuration.txt:591
10205
msgid ""
10206
"default_format\n"
10207
"~~~~~~~~~~~~~~"
10208
msgstr ""
10209
10210
#: en/help_topics/configuration.txt:594
10211
msgid ""
10212
"A format name for the default format used when creating branches. See "
10213
"``bzr\n"
10214
"help formats`` for possible values."
10215
msgstr ""
10216
10217
#: en/help_topics/configuration.txt:597
10218
msgid ""
10219
"\n"
10220
"Unicode options\n"
10221
"---------------"
10222
msgstr ""
10223
10224
#: en/help_topics/configuration.txt:601
10225
msgid ""
10226
"output_encoding\n"
10227
"~~~~~~~~~~~~~~~"
10228
msgstr ""
10229
10230
#: en/help_topics/configuration.txt:604
10231
msgid ""
10232
"A Python unicode encoding name for text output from bzr, such as log\n"
10233
"information. Values include: utf8, cp850, ascii, iso-8859-1. The default\n"
10234
"is the terminal encoding prefered by the operating system."
10235
msgstr ""
10236
10237
#: en/help_topics/configuration.txt:608
10238
msgid ""
10239
"\n"
10240
"Branch type specific options\n"
10241
"----------------------------"
10242
msgstr ""
10243
10244
#: en/help_topics/configuration.txt:612
10245
msgid ""
10246
"These options apply only to branches that use the ``dirstate-tags`` or\n"
10247
"later format. They\n"
10248
"are usually set in ``.bzr/branch/branch.conf`` automatically, but may be\n"
10249
"manually set in ``locations.conf`` or ``bazaar.conf``."
10250
msgstr ""
10251
10252
#: en/help_topics/configuration.txt:617
10253
msgid ""
10254
"append_revisions_only\n"
10255
"~~~~~~~~~~~~~~~~~~~~~"
10256
msgstr ""
10257
10258
#: en/help_topics/configuration.txt:620
10259
msgid ""
10260
"If set to \"True\" then revisions can only be appended to the log, not\n"
10261
"removed. A branch with this setting enabled can only pull from another\n"
10262
"branch if the other branch's log is a longer version of its own. This is\n"
10263
"normally set by ``bzr init --append-revisions-only``. If you set it\n"
10264
"manually, use either 'True' or 'False' (case-sensitive) to maintain\n"
10265
"compatibility with previous bzr versions (older than 2.2)."
10266
msgstr ""
10267
10268
#: en/help_topics/configuration.txt:627
10269
msgid ""
10270
"parent_location\n"
10271
"~~~~~~~~~~~~~~~"
10272
msgstr ""
10273
10274
#: en/help_topics/configuration.txt:630
10275
msgid ""
10276
"If present, the location of the default branch for pull or merge. This "
10277
"option\n"
10278
"is normally set when creating a branch, the first ``pull`` or by ``pull\n"
10279
"--remember``."
10280
msgstr ""
10281
10282
#: en/help_topics/configuration.txt:634
10283
msgid ""
10284
"push_location\n"
10285
"~~~~~~~~~~~~~"
10286
msgstr ""
10287
10288
#: en/help_topics/configuration.txt:637
10289
msgid ""
10290
"If present, the location of the default branch for push. This option\n"
10291
"is normally set by the first ``push`` or ``push --remember``."
10292
msgstr ""
10293
10294
#: en/help_topics/configuration.txt:640
10295
msgid ""
10296
"push_strict\n"
10297
"~~~~~~~~~~~"
10298
msgstr ""
10299
10300
#: en/help_topics/configuration.txt:643
10301
msgid ""
10302
"If present, defines the ``--strict`` option default value for checking\n"
10303
"uncommitted changes before pushing."
10304
msgstr ""
10305
10306
#: en/help_topics/configuration.txt:646
10307
msgid ""
10308
"dpush_strict\n"
10309
"~~~~~~~~~~~~"
10310
msgstr ""
10311
10312
#: en/help_topics/configuration.txt:649
10313
msgid ""
10314
"If present, defines the ``--strict`` option default value for checking\n"
10315
"uncommitted changes before pushing into a different VCS without any\n"
10316
"custom bzr metadata."
10317
msgstr ""
10318
10319
#: en/help_topics/configuration.txt:653
10320
msgid ""
10321
"bound_location\n"
10322
"~~~~~~~~~~~~~~"
10323
msgstr ""
10324
10325
#: en/help_topics/configuration.txt:656
10326
msgid ""
10327
"The location that commits should go to when acting as a checkout.\n"
10328
"This option is normally set by ``bind``."
10329
msgstr ""
10330
10331
#: en/help_topics/configuration.txt:659
10332
msgid ""
10333
"bound\n"
10334
"~~~~~"
10335
msgstr ""
10336
10337
#: en/help_topics/configuration.txt:662
10338
msgid ""
10339
"If set to \"True\", the branch should act as a checkout, and push each "
10340
"commit to\n"
10341
"the bound_location. This option is normally set by ``bind``/``unbind``."
10342
msgstr ""
10343
10344
#: en/help_topics/configuration.txt:665
10345
msgid ""
10346
"send_strict\n"
10347
"~~~~~~~~~~~"
10348
msgstr ""
10349
10350
#: en/help_topics/configuration.txt:668
10351
msgid ""
10352
"If present, defines the ``--strict`` option default value for checking\n"
10353
"uncommitted changes before sending a merge directive."
10354
msgstr ""
10355
10356
#: en/help_topics/configuration.txt:671
10357
msgid ""
10358
"add.maximum_file_size\n"
10359
"~~~~~~~~~~~~~~~~~~~~~"
10360
msgstr ""
10361
10362
#: en/help_topics/configuration.txt:674
10363
msgid ""
10364
"Defines the maximum file size the command line \"add\" operation will allow\n"
10365
"in recursive mode, with files larger than this value being skipped. You may "
10366
"\n"
10367
"specify this value as an integer (in which case it is interpreted as bytes), "
10368
"\n"
10369
"or you may specify the value using SI units, i.e. 10KB, 20MB, 1G. A value of "
10370
"0 \n"
10371
"will disable skipping."
10372
msgstr ""
10373
10374
#: en/help_topics/configuration.txt:680
10375
msgid ""
10376
"External Merge Tools\n"
10377
"--------------------"
10378
msgstr ""
10379
10380
#: en/help_topics/configuration.txt:683
10381
msgid ""
10382
"bzr.mergetool.<name>\n"
10383
"~~~~~~~~~~~~~~~~~~~~"
10384
msgstr ""
10385
10386
#: en/help_topics/configuration.txt:686
10387
msgid ""
10388
"Defines an external merge tool called <name> with the given command-line.\n"
10389
"Arguments containing spaces should be quoted using single or double quotes. "
10390
"The\n"
10391
"executable may omit its path if it can be found on the PATH."
10392
msgstr ""
10393
10394
#: en/help_topics/configuration.txt:690
10395
msgid ""
10396
"The following markers can be used in the command-line to substitute "
10397
"filenames\n"
10398
"involved in the merge conflict::"
10399
msgstr ""
10400
10401
#: en/help_topics/configuration.txt:693
10402
msgid ""
10403
" {base} file.BASE\n"
10404
" {this} file.THIS\n"
10405
" {other} file.OTHER\n"
10406
" {result} output file\n"
10407
" {this_temp} temp copy of file.THIS, used to overwrite output file if "
10408
"merge\n"
10409
" succeeds."
10410
msgstr ""
10411
10412
#: en/help_topics/configuration.txt:702
10413
msgid " bzr.mergetool.kdiff3 = kdiff3 {base} {this} {other} -o {result}"
10414
msgstr ""
10415
10416
#: en/help_topics/configuration.txt:704
10417
msgid ""
10418
"bzr.default_mergetool\n"
10419
"~~~~~~~~~~~~~~~~~~~~~"
10420
msgstr ""
10421
10422
#: en/help_topics/configuration.txt:707
10423
msgid ""
10424
"Specifies which external merge tool (as defined above) should be selected "
10425
"by\n"
10426
"default in tools such as ``bzr qconflicts``."
10427
msgstr ""
10428
10429
#: en/help_topics/configuration.txt:712
10430
msgid " bzr.default_mergetool = kdiff3\n"
10431
msgstr ""
10432
10433
#: en/help_topics/conflict-types.txt:1
10434
msgid ""
10435
"Conflict Types\n"
10436
"=============="
10437
msgstr ""
10438
10439
#: en/help_topics/conflict-types.txt:4
10440
msgid ""
10441
"Some operations, like merge, revert and pull, modify the contents of your\n"
10442
"working tree. These modifications are programmatically generated, and so "
10443
"they\n"
10444
"may conflict with the current state of your working tree. "
10445
msgstr ""
10446
10447
#: en/help_topics/conflict-types.txt:8
10448
msgid ""
10449
"When conflicts are present in your working tree (as shown by ``bzr\n"
10450
"conflicts``), you should resolve them and then inform bzr that the "
10451
"conflicts\n"
10452
"have been resolved."
10453
msgstr ""
10454
10455
#: en/help_topics/conflict-types.txt:12
10456
msgid ""
10457
"Resolving conflicts is sometimes not obvious. Either because the user that\n"
10458
"should resolve them is not the one responsible for their occurrence, as is "
10459
"the\n"
10460
"case when merging other people's work or because some conflicts are "
10461
"presented\n"
10462
"in a way that is not easy to understand."
10463
msgstr ""
10464
10465
#: en/help_topics/conflict-types.txt:17
10466
msgid ""
10467
"Bazaar tries to avoid conflicts ; its aim is to ask you to resolve the\n"
10468
"conflict if and only if there's an actual conceptual conflict in the source\n"
10469
"tree. Because Bazaar doesn't understand the real meaning of the files "
10470
"being\n"
10471
"versioned, it can, when faced with ambiguities, fall short in either "
10472
"direction\n"
10473
"trying to resolve the conflict itself. Many kinds of changes can be "
10474
"combined\n"
10475
"programmatically, but sometimes only a human can determine the right thing "
10476
"to\n"
10477
"do."
10478
msgstr ""
10479
10480
#: en/help_topics/conflict-types.txt:25
10481
msgid ""
10482
"When Bazaar generates a conflict, it adds information into the working tree "
10483
"to\n"
10484
"present the conflicting versions, and it's up to you to find the correct\n"
10485
"resolution."
10486
msgstr ""
10487
10488
#: en/help_topics/conflict-types.txt:29
10489
msgid "Whatever the conflict is, resolving it is roughly done in two steps:"
10490
msgstr ""
10491
10492
#: en/help_topics/conflict-types.txt:31
10493
msgid ""
10494
"1. Modify the working tree content so that the conflicted item is now in "
10495
"the\n"
10496
" state you want to keep, then"
10497
msgstr ""
10498
10499
#: en/help_topics/conflict-types.txt:34
10500
msgid ""
10501
"2. Inform Bazaar that the conflict is now solved and ask to cleanup any\n"
10502
" remaining generated information (``bzr resolve <item>``)."
10503
msgstr ""
10504
10505
#: en/help_topics/conflict-types.txt:37
10506
msgid ""
10507
"For most conflict types, there are some obvious ways to modify the working\n"
10508
"tree and put it into the desired state. For some types of conflicts, Bazaar\n"
10509
"itself already made a choice, when possible."
10510
msgstr ""
10511
10512
#: en/help_topics/conflict-types.txt:41
10513
msgid ""
10514
"Yet, whether Bazaar makes a choice or not, there are some other simple but\n"
10515
"different ways to resolve the conflict."
10516
msgstr ""
10517
10518
#: en/help_topics/conflict-types.txt:44
10519
msgid ""
10520
"Each type of conflict is explained below, and the action which must be done "
10521
"to\n"
10522
"resolve the conflict is outlined."
10523
msgstr ""
10524
10525
#: en/help_topics/conflict-types.txt:47
10526
msgid ""
10527
"Various actions are available depending on the kind of conflict, for some "
10528
"of\n"
10529
"these actions, Bazaar can provide some help. In the end you should at least\n"
10530
"inform Bazaar that you're done with the conflict with::"
10531
msgstr ""
10532
10533
#: en/help_topics/conflict-types.txt:51
10534
msgid " ``bzr resolve FILE --action=done'"
10535
msgstr ""
10536
10537
#: en/help_topics/conflict-types.txt:53
10538
msgid ""
10539
"Note that this is the default action when a single file is involved so you "
10540
"can\n"
10541
"simply use::"
10542
msgstr ""
10543
10544
#: en/help_topics/conflict-types.txt:56
10545
msgid " ``bzr resolve FILE``"
10546
msgstr ""
10547
10548
#: en/help_topics/conflict-types.txt:58
10549
msgid "See ``bzr help resolve`` for more details."
10550
msgstr ""
10551
10552
#: en/help_topics/conflict-types.txt:60
10553
msgid ""
10554
"Text conflicts\n"
10555
"--------------"
10556
msgstr ""
10557
10558
#: en/help_topics/conflict-types.txt:63 en/help_topics/conflict-types.txt:120
10559
#: en/help_topics/conflict-types.txt:151 en/help_topics/conflict-types.txt:175
10560
#: en/help_topics/conflict-types.txt:198 en/help_topics/conflict-types.txt:213
10561
#: en/help_topics/conflict-types.txt:239 en/help_topics/conflict-types.txt:281
10562
#: en/help_topics/conflict-types.txt:303 en/help_topics/conflict-types.txt:339
10563
msgid "Typical message::"
10564
msgstr ""
10565
10566
#: en/help_topics/conflict-types.txt:65
10567
msgid " Text conflict in FILE"
10568
msgstr ""
10569
10570
#: en/help_topics/conflict-types.txt:67
10571
msgid ""
10572
"These are produced when a text merge cannot completely reconcile two sets "
10573
"of\n"
10574
"text changes. Bazaar will emit files for each version with the extensions\n"
10575
"THIS, OTHER, and BASE. THIS is the version of the file from the target "
10576
"tree,\n"
10577
"i.e. the tree that you are merging changes into. OTHER is the version that "
10578
"you\n"
10579
"are merging into the target. BASE is an older version that is used as a "
10580
"basis\n"
10581
"for comparison."
10582
msgstr ""
10583
10584
#: en/help_topics/conflict-types.txt:74
10585
msgid ""
10586
"In the main copy of the file, Bazaar will include all the changes that it\n"
10587
"could reconcile, and any un-reconciled conflicts are surrounded by\n"
10588
"\"herringbone\" markers like ``<<<<<<<``."
10589
msgstr ""
10590
10591
#: en/help_topics/conflict-types.txt:78
10592
msgid ""
10593
"Say the initial text is \"The project leader released it.\", and THIS "
10594
"modifies it\n"
10595
"to \"Martin Pool released it.\", while OTHER modifies it to \"The project "
10596
"leader\n"
10597
"released Bazaar.\" A conflict would look like this::"
10598
msgstr ""
10599
10600
#: en/help_topics/conflict-types.txt:82
10601
msgid ""
10602
" <<<<<<< TREE\n"
10603
" Martin Pool released it.\n"
10604
" =======\n"
10605
" The project leader released Bazaar.\n"
10606
" >>>>>>> MERGE-SOURCE"
10607
msgstr ""
10608
10609
#: en/help_topics/conflict-types.txt:88
10610
msgid "The correct resolution would be \"Martin Pool released Bazaar.\""
10611
msgstr ""
10612
10613
#: en/help_topics/conflict-types.txt:90
10614
msgid ""
10615
"You can handle text conflicts either by editing the main copy of the file,\n"
10616
"or by invoking external tools on the THIS, OTHER and BASE versions. It's\n"
10617
"worth mentioning that resolving text conflicts rarely involves picking one\n"
10618
"set of changes over the other (but see below when you encounter these\n"
10619
"cases). More often, the two sets of changes must be intelligently combined."
10620
msgstr ""
10621
10622
#: en/help_topics/conflict-types.txt:96
10623
msgid ""
10624
"If you edit the main copy, be sure to remove the herringbone markers. When\n"
10625
"you are done editing, the file should look like it never had a conflict, and "
10626
"be\n"
10627
"ready to commit."
10628
msgstr ""
10629
10630
#: en/help_topics/conflict-types.txt:100
10631
msgid ""
10632
"When you have resolved text conflicts, just run ``bzr resolve --auto``, and\n"
10633
"Bazaar will auto-detect which conflicts you have resolved."
10634
msgstr ""
10635
10636
#: en/help_topics/conflict-types.txt:103
10637
msgid ""
10638
"When the conflict is resolved, Bazaar deletes the previously generated\n"
10639
"``.BASE``, ``.THIS`` and ``.OTHER`` files if they are still present in the\n"
10640
"working tree."
10641
msgstr ""
10642
10643
#: en/help_topics/conflict-types.txt:107
10644
msgid ""
10645
"\n"
10646
"When you want to pick one set of changes over the other, you can use ``bzr\n"
10647
"resolve`` with one of the following actions:"
10648
msgstr ""
10649
10650
#: en/help_topics/conflict-types.txt:111
10651
msgid ""
10652
"* ``--action=take-this`` will issue ``mv FILE.THIS FILE``,\n"
10653
"* ``--action=take-other`` will issue ``mv FILE.OTHER FILE``."
10654
msgstr ""
10655
10656
#: en/help_topics/conflict-types.txt:114
10657
msgid ""
10658
"Note that if you have modified ``FILE.THIS`` or ``FILE.OTHER``, these\n"
10659
"modifications will be taken into account."
10660
msgstr ""
10661
10662
#: en/help_topics/conflict-types.txt:117
10663
msgid ""
10664
"Content conflicts\n"
10665
"-----------------"
10666
msgstr ""
10667
10668
#: en/help_topics/conflict-types.txt:122
10669
msgid " Contents conflict in FILE"
10670
msgstr ""
10671
10672
#: en/help_topics/conflict-types.txt:124
10673
msgid ""
10674
"This conflict happens when there are conflicting changes in the working "
10675
"tree\n"
10676
"and the merge source, but the conflicted items are not text files. They "
10677
"may\n"
10678
"be binary files, or symlinks, or directories. It can even happen with "
10679
"files\n"
10680
"that are deleted on one side, and modified on the other."
10681
msgstr ""
10682
10683
#: en/help_topics/conflict-types.txt:129
10684
msgid ""
10685
"Like text conflicts, Bazaar will emit THIS, OTHER and BASE files. (They may "
10686
"be\n"
10687
"regular files, symlinks or directories). But it will not include a \"main "
10688
"copy\"\n"
10689
"of the file with herringbone conflict markers. It will appear that the "
10690
"\"main\n"
10691
"copy\" has been renamed to THIS or OTHER."
10692
msgstr ""
10693
10694
#: en/help_topics/conflict-types.txt:134 en/help_topics/conflict-types.txt:182
10695
msgid ""
10696
"To resolve that kind of conflict, you should rebuild FILE from either "
10697
"version\n"
10698
"or a combination of both."
10699
msgstr ""
10700
10701
#: en/help_topics/conflict-types.txt:137 en/help_topics/conflict-types.txt:185
10702
#: en/help_topics/conflict-types.txt:226 en/help_topics/conflict-types.txt:252
10703
#: en/help_topics/conflict-types.txt:291 en/help_topics/conflict-types.txt:326
10704
#: en/help_topics/conflict-types.txt:361
10705
msgid "``bzr resolve`` recognizes the following actions:"
10706
msgstr ""
10707
10708
#: en/help_topics/conflict-types.txt:139
10709
msgid ""
10710
"* ``--action=take-this`` will issue ``bzr mv FILE.THIS FILE``,\n"
10711
"* ``--action=take-other`` will issue ``bzr mv FILE.OTHER FILE``,\n"
10712
"* ``--action=done`` will just mark the conflict as resolved."
10713
msgstr ""
10714
10715
#: en/help_topics/conflict-types.txt:143
10716
msgid ""
10717
"Any action will also delete the previously generated ``.BASE``, ``.THIS`` "
10718
"and\n"
10719
"``.OTHER`` files if they are still present in the working tree."
10720
msgstr ""
10721
10722
#: en/help_topics/conflict-types.txt:146 en/help_topics/conflict-types.txt:193
10723
#: en/help_topics/conflict-types.txt:234 en/help_topics/conflict-types.txt:276
10724
#: en/help_topics/conflict-types.txt:298 en/help_topics/conflict-types.txt:334
10725
#: en/help_topics/conflict-types.txt:369
10726
msgid ""
10727
"Bazaar cannot auto-detect when conflicts of this kind have been resolved."
10728
msgstr ""
10729
10730
#: en/help_topics/conflict-types.txt:148
10731
msgid ""
10732
"Tag conflicts\n"
10733
"-------------"
10734
msgstr ""
10735
10736
#: en/help_topics/conflict-types.txt:153
10737
msgid ""
10738
" Conflicting tags:\n"
10739
" version-0.1"
10740
msgstr ""
10741
10742
#: en/help_topics/conflict-types.txt:156
10743
msgid ""
10744
"When pulling from or pushing to another branch, Bazaar informs you about "
10745
"tags\n"
10746
"that conflict between the two branches; that is the same tag points to two\n"
10747
"different revisions. You need not resolve these conflicts, but subsequent\n"
10748
"uses of pull or push will result in the same message."
10749
msgstr ""
10750
10751
#: en/help_topics/conflict-types.txt:161
10752
msgid ""
10753
"To resolve the conflict, you must apply the correct tags to either the "
10754
"target\n"
10755
"branch or the source branch as appropriate. Use \"bzr tags --show-ids -d\n"
10756
"SOURCE_URL\" to see the tags in the source branch. If you want to make the\n"
10757
"target branch's tags match the source branch, then in the target branch do\n"
10758
"``bzr tag --force -r revid:REVISION_ID CONFLICTING_TAG`` for each of the\n"
10759
"CONFLICTING_TAGs, where REVISION_ID comes from the list of tags in the "
10760
"source\n"
10761
"branch. You need not call \"bzr resolve\" after doing this. To resolve in\n"
10762
"favor of the target branch, you need to similarly use ``tag --force`` in "
10763
"the\n"
10764
"source branch. (Note that pulling or pushing using --overwrite will "
10765
"overwrite\n"
10766
"all tags as well.)"
10767
msgstr ""
10768
10769
#: en/help_topics/conflict-types.txt:172
10770
msgid ""
10771
"Duplicate paths\n"
10772
"---------------"
10773
msgstr ""
10774
10775
#: en/help_topics/conflict-types.txt:177
10776
msgid " Conflict adding file FILE. Moved existing file to FILE.moved."
10777
msgstr ""
10778
10779
#: en/help_topics/conflict-types.txt:179
10780
msgid ""
10781
"Sometimes Bazaar will attempt to create a file using a pathname that has\n"
10782
"already been used. The existing file will be renamed to \"FILE.moved\". "
10783
msgstr ""
10784
10785
#: en/help_topics/conflict-types.txt:187
10786
msgid ""
10787
"* ``--action=take-this`` will issue ``bzr rm FILE ; bzr mv FILE.moved "
10788
"FILE``,\n"
10789
"* ``--action=take-other`` will issue ``bzr rm FILE.moved``,\n"
10790
"* ``--action=done`` will just mark the conflict as resolved."
10791
msgstr ""
10792
10793
#: en/help_topics/conflict-types.txt:191
10794
msgid ""
10795
"Note that you must get rid of FILE.moved before using ``--action=done``."
10796
msgstr ""
10797
10798
#: en/help_topics/conflict-types.txt:195
10799
msgid ""
10800
"Unversioned parent\n"
10801
"------------------"
10802
msgstr ""
10803
10804
#: en/help_topics/conflict-types.txt:200
10805
msgid ""
10806
" Conflict because FILE is not versioned, but has versioned children."
10807
msgstr ""
10808
10809
#: en/help_topics/conflict-types.txt:202
10810
msgid ""
10811
"Sometimes Bazaar will attempt to create a file whose parent directory is "
10812
"not\n"
10813
"versioned. This happens when the directory has been deleted in the target,\n"
10814
"but has a new child in the source, or vice versa. In this situation, "
10815
"Bazaar\n"
10816
"will version the parent directory as well. Resolving this issue depends\n"
10817
"very much on the particular scenario. You may wish to rename or delete "
10818
"either\n"
10819
"the file or the directory. When you are satisfied, you can run \"bzr "
10820
"resolve\n"
10821
"FILE\" to mark the conflict as resolved."
10822
msgstr ""
10823
10824
#: en/help_topics/conflict-types.txt:210
10825
msgid ""
10826
"Missing parent\n"
10827
"--------------"
10828
msgstr ""
10829
10830
#: en/help_topics/conflict-types.txt:215
10831
msgid " Conflict adding files to FILE. Created directory."
10832
msgstr ""
10833
10834
#: en/help_topics/conflict-types.txt:217
10835
msgid ""
10836
"This happens when a directory has been deleted in the target, but has new\n"
10837
"children in the source. This is similar to the \"unversioned parent\" "
10838
"conflict,\n"
10839
"except that the parent directory does not *exist*, instead of just being\n"
10840
"unversioned. In this situation, Bazaar will create the missing parent.\n"
10841
"Resolving this issue depends very much on the particular scenario."
10842
msgstr ""
10843
10844
#: en/help_topics/conflict-types.txt:223 en/help_topics/conflict-types.txt:249
10845
msgid ""
10846
"To resolve that kind of conflict, you should either remove or rename the\n"
10847
"children or the directory or a combination of both."
10848
msgstr ""
10849
10850
#: en/help_topics/conflict-types.txt:228
10851
msgid ""
10852
"* ``--action=take-this`` will issue ``bzr rm directory`` including the\n"
10853
" children,\n"
10854
"* ``--action=take-other`` will acknowledge Bazaar choice to keep the "
10855
"children\n"
10856
" and restoring the directory,\n"
10857
"* ``--action=done`` will just mark the conflict as resolved."
10858
msgstr ""
10859
10860
#: en/help_topics/conflict-types.txt:236
10861
msgid ""
10862
"Deleting parent\n"
10863
"---------------"
10864
msgstr ""
10865
10866
#: en/help_topics/conflict-types.txt:241
10867
msgid " Conflict: can't delete DIR because it is not empty. Not deleting."
10868
msgstr ""
10869
10870
#: en/help_topics/conflict-types.txt:243
10871
msgid ""
10872
"This is the opposite of \"missing parent\". A directory is deleted in the\n"
10873
"source, but has new children in the target (either because a directory\n"
10874
"deletion is merged or because the merge introduce new children). Bazaar\n"
10875
"will retain the directory. Resolving this issue depends very much on the\n"
10876
"particular scenario."
10877
msgstr ""
10878
10879
#: en/help_topics/conflict-types.txt:254
10880
msgid ""
10881
"* ``--action=take-this`` will acknowledge Bazaar choice to keep the "
10882
"directory,"
10883
msgstr ""
10884
10885
#: en/help_topics/conflict-types.txt:256
10886
msgid ""
10887
"* ``--action=take-other`` will issue ``bzr rm directory`` including the \n"
10888
" children,"
10889
msgstr ""
10890
10891
#: en/help_topics/conflict-types.txt:259
10892
msgid "* ``--action=done`` will just mark the conflict as resolved."
10893
msgstr ""
10894
10895
#: en/help_topics/conflict-types.txt:261
10896
msgid ""
10897
"Note that when merging a directory deletion, if unversioned files are\n"
10898
"present, they become potential orphans has they don't have a directory\n"
10899
"parent anymore."
10900
msgstr ""
10901
10902
#: en/help_topics/conflict-types.txt:265
10903
msgid ""
10904
"Handling such orphans, *before* the conflict is created, is controlled by\n"
10905
"setting the ``bzr.transform.orphan_policy`` configuration option."
10906
msgstr ""
10907
10908
#: en/help_topics/conflict-types.txt:268
10909
msgid "There are two possible values for this option:"
10910
msgstr ""
10911
10912
#: en/help_topics/conflict-types.txt:270
10913
msgid ""
10914
"* ``conflict`` (the default): will leave the orphans in place and\n"
10915
" generate a conflicts,"
10916
msgstr ""
10917
10918
#: en/help_topics/conflict-types.txt:273
10919
msgid ""
10920
"* ``move``: will move the orphans to a ``bzr-orphans`` directory at the "
10921
"root\n"
10922
" of the working tree with names like ``<file>.~#~``."
10923
msgstr ""
10924
10925
#: en/help_topics/conflict-types.txt:278
10926
msgid ""
10927
"Path conflict\n"
10928
"-------------"
10929
msgstr ""
10930
10931
#: en/help_topics/conflict-types.txt:283
10932
msgid " Path conflict: PATH1 / PATH2"
10933
msgstr ""
10934
10935
#: en/help_topics/conflict-types.txt:285
10936
msgid ""
10937
"This happens when the source and target have each modified the name or "
10938
"parent\n"
10939
"directory of a file. Bazaar will use the path elements from the source."
10940
msgstr ""
10941
10942
#: en/help_topics/conflict-types.txt:288
10943
msgid ""
10944
"To resolve that kind of conflict, you just have to decide what name should "
10945
"be\n"
10946
"retained for the file involved."
10947
msgstr ""
10948
10949
#: en/help_topics/conflict-types.txt:293
10950
msgid ""
10951
"* ``--action=take-this`` will revert Bazaar choice and keep ``PATH1`` by\n"
10952
" issuing ``bzr mv PATH2 PATH1``,\n"
10953
"* ``--action=take-other`` will acknowledge Bazaar choice of keeping "
10954
"``PATH2``,\n"
10955
"* ``--action=done`` will just mark the conflict as resolved."
10956
msgstr ""
10957
10958
#: en/help_topics/conflict-types.txt:300
10959
msgid ""
10960
"Parent loop\n"
10961
"-----------"
10962
msgstr ""
10963
10964
#: en/help_topics/conflict-types.txt:305
10965
msgid " Conflict moving FILE into DIRECTORY. Cancelled move."
10966
msgstr ""
10967
10968
#: en/help_topics/conflict-types.txt:307
10969
msgid ""
10970
"This happens when the source and the target have each moved directories, so\n"
10971
"that, if the change could be applied, a directory would be contained by "
10972
"itself.\n"
10973
"For example::"
10974
msgstr ""
10975
10976
#: en/help_topics/conflict-types.txt:311
10977
msgid ""
10978
" $ bzr init\n"
10979
" $ bzr mkdir white\n"
10980
" $ bzr mkdir black\n"
10981
" $ bzr commit -m \"BASE\"\n"
10982
" $ bzr branch . ../other\n"
10983
" $ bzr mv white black\n"
10984
" $ bzr commit -m \"THIS\"\n"
10985
" $ bzr mv ../other/black ../other/white\n"
10986
" $ bzr commit ../other -m \"OTHER\"\n"
10987
" $ bzr merge ../other"
10988
msgstr ""
10989
10990
#: en/help_topics/conflict-types.txt:322
10991
msgid ""
10992
"In this situation, Bazaar will cancel the move, and leave ``white`` in\n"
10993
"``black``. To resolve that kind of conflict, you just have to decide what\n"
10994
"name should be retained for the directories involved."
10995
msgstr ""
10996
10997
#: en/help_topics/conflict-types.txt:328
10998
msgid ""
10999
"* ``--action=take-this`` will acknowledge Bazaar choice of leaving ``white`` "
11000
"\n"
11001
" in ``black``,\n"
11002
"* ``--action=take-other`` will revert Bazaar choice and move ``black`` in\n"
11003
" ``white`` by issuing ``bzr mv black/white white ; bzr mv black white``,\n"
11004
"* ``--action=done`` will just mark the conflict as resolved."
11005
msgstr ""
11006
11007
#: en/help_topics/conflict-types.txt:336
11008
msgid ""
11009
"Non-directory parent\n"
11010
"--------------------"
11011
msgstr ""
11012
11013
#: en/help_topics/conflict-types.txt:341
11014
msgid ""
11015
" Conflict: foo.new is not a directory, but has files in it.\n"
11016
" Created directory."
11017
msgstr ""
11018
11019
#: en/help_topics/conflict-types.txt:344
11020
msgid ""
11021
"This happens when one side has added files to a directory, and the other "
11022
"side\n"
11023
"has changed the directory into a file or symlink. For example::"
11024
msgstr ""
11025
11026
#: en/help_topics/conflict-types.txt:347
11027
msgid ""
11028
" $ bzr init\n"
11029
" $ bzr mkdir foo\n"
11030
" $ bzr commit -m \"BASE\"\n"
11031
" $ bzr branch . ../other\n"
11032
" $ rmdir foo\n"
11033
" $ touch foo\n"
11034
" $ bzr commit -m \"THIS\"\n"
11035
" $ bzr mkdir ../other/foo/bar\n"
11036
" $ bzr commit ../other -m \"OTHER\"\n"
11037
" $ bzr merge ../other"
11038
msgstr ""
11039
11040
#: en/help_topics/conflict-types.txt:358
11041
msgid ""
11042
"To resolve that kind of conflict, you have to decide what name should be\n"
11043
"retained for the file, directory or symlink involved."
11044
msgstr ""
11045
11046
#: en/help_topics/conflict-types.txt:363
11047
msgid ""
11048
"* ``--action=take-this`` will issue ``bzr rm --force foo.new`` and \n"
11049
" ``bzr add foo``,\n"
11050
"* ``--action=take-other`` will issue ``bzr rm --force foo`` and \n"
11051
" ``bzr mv foo.new foo``,\n"
11052
"* ``--action=done`` will just mark the conflict as resolved."
11053
msgstr ""
11054
11055
#: en/help_topics/conflict-types.txt:371
11056
msgid ""
11057
"MalformedTransform\n"
11058
"------------------"
11059
msgstr ""
11060
11061
#: en/help_topics/conflict-types.txt:374
11062
msgid ""
11063
"It is possible (though very rare) for Bazaar to raise a MalformedTransform\n"
11064
"exception. This means that Bazaar encountered a filesystem conflict that it "
11065
"was\n"
11066
"unable to resolve. This usually indicates a bug. Please let us know if "
11067
"you\n"
11068
"encounter this. Our bug tracker is at https://launchpad.net/bzr/+bugs\n"
11069
msgstr ""
11070
11071
#: en/help_topics/content-filters.txt:1
11072
msgid ""
11073
"Content Filters\n"
11074
"==============="
11075
msgstr ""
11076
11077
#: en/help_topics/content-filters.txt:4
11078
msgid ""
11079
"Content formats\n"
11080
"---------------"
11081
msgstr ""
11082
11083
#: en/help_topics/content-filters.txt:7
11084
msgid ""
11085
"Bazaar's content filtering allows you to store files in a different\n"
11086
"format from the copy in your working tree. This lets you, or your\n"
11087
"co-developers, use Windows development tools that expect CRLF files\n"
11088
"on projects that use other line-ending conventions. Among other things,\n"
11089
"content filters also let Unix developers more easily work on projects\n"
11090
"using Windows line-ending conventions, keyword expansion/compression,\n"
11091
"and trailing spaces on lines in text files to be implicitly stripped\n"
11092
"when committed."
11093
msgstr ""
11094
11095
#: en/help_topics/content-filters.txt:16
11096
msgid "To generalize, there are two content formats supported by Bazaar:"
11097
msgstr ""
11098
11099
#: en/help_topics/content-filters.txt:18
11100
msgid ""
11101
"* a canonical format - how files are stored internally\n"
11102
"* a convenience format - how files are created in a working tree."
11103
msgstr ""
11104
11105
#: en/help_topics/content-filters.txt:21
11106
msgid ""
11107
"\n"
11108
"Format conversion\n"
11109
"-----------------"
11110
msgstr ""
11111
11112
#: en/help_topics/content-filters.txt:25
11113
msgid ""
11114
"The conversion between these formats is done by content filters.\n"
11115
"A content filter has two parts:"
11116
msgstr ""
11117
11118
#: en/help_topics/content-filters.txt:28
11119
msgid ""
11120
"* a read converter - converts from convenience to canonical format\n"
11121
"* a write converter - converts from canonical to convenience format."
11122
msgstr ""
11123
11124
#: en/help_topics/content-filters.txt:31
11125
msgid ""
11126
"Many of these converters will provide *round-trip* conversion,\n"
11127
"i.e. applying the read converter followed by the write converter\n"
11128
"gives back the original content. However, others may provide an\n"
11129
"asymmetric conversion. For example, a read converter might strip\n"
11130
"trailing whitespace off lines in source code while the matching\n"
11131
"write converter might pass content through unchanged."
11132
msgstr ""
11133
11134
#: en/help_topics/content-filters.txt:38
11135
msgid ""
11136
"\n"
11137
"Enabling content filters\n"
11138
"------------------------"
11139
msgstr ""
11140
11141
#: en/help_topics/content-filters.txt:42
11142
msgid ""
11143
"Content filters are typically provided by plugins, so the first step\n"
11144
"in using them is to install the relevant plugins and read their\n"
11145
"documentation. Some plugins may be very specific about which files\n"
11146
"they filter, e.g. only files ending in ``.java`` or ``.php``.\n"
11147
"In other cases, the plugin may leave it in the user's hands to\n"
11148
"define which files are to be filtered. This is typically done\n"
11149
"using rule-based preferences. See ``bzr help rules`` for general\n"
11150
"information about defining these."
11151
msgstr ""
11152
11153
#: en/help_topics/content-filters.txt:51
11154
msgid ""
11155
"\n"
11156
"Impact on commands\n"
11157
"------------------"
11158
msgstr ""
11159
11160
#: en/help_topics/content-filters.txt:55
11161
msgid ""
11162
"Read converters are only applied to commands that read content from\n"
11163
"a working tree, e.g. status, diff and commit. For example, ``bzr diff``\n"
11164
"will apply read converters to files in the working tree, then compare\n"
11165
"the results to the content last committed."
11166
msgstr ""
11167
11168
#: en/help_topics/content-filters.txt:60
11169
msgid ""
11170
"Write converters are only applied by commands that **create files in a\n"
11171
"working tree**, e.g. branch, checkout, update. If you wish to see the\n"
11172
"canonical format of a file or tree, use ``bzr cat`` or ``bzr export``\n"
11173
"respectively."
11174
msgstr ""
11175
11176
#: en/help_topics/content-filters.txt:65
11177
msgid ""
11178
"Note: ``bzr commit`` does not implicitly apply write converters after\n"
11179
"comitting files. If this makes sense for a given plugin providing\n"
11180
"a content filter, the plugin can usually achieve this effect by using a\n"
11181
"``start_commit`` or ``post_commit`` hook say. See :doc:`hooks-help`\n"
11182
"for more information on hooks."
11183
msgstr ""
11184
11185
#: en/help_topics/content-filters.txt:71
11186
msgid ""
11187
"\n"
11188
"Refreshing your working tree\n"
11189
"----------------------------"
11190
msgstr ""
11191
11192
#: en/help_topics/content-filters.txt:75
11193
msgid ""
11194
"For performance reasons, Bazaar caches the timestamps of files in\n"
11195
"a working tree, and assumes files are unchanged if their timestamps\n"
11196
"match the cached values. As a consequence, there are times when\n"
11197
"you may need to explicitly ask for content filtering to be reapplied\n"
11198
"in one or both directions, e.g. after installing or reconfiguring\n"
11199
"plugins providing it."
11200
msgstr ""
11201
11202
#: en/help_topics/content-filters.txt:82
11203
msgid "Here are some general guidelines for doing this:"
11204
msgstr ""
11205
11206
#: en/help_topics/content-filters.txt:84
11207
msgid ""
11208
" * To reapply read converters, ``touch`` files, i.e. update their\n"
11209
" timestamp. Operations like ``bzr status`` should then reapply the\n"
11210
" relevant read converters and compare the end result with the\n"
11211
" canonical format."
11212
msgstr ""
11213
11214
#: en/help_topics/content-filters.txt:89
11215
msgid ""
11216
" * To reapply write converters, ensure there are no local changes,\n"
11217
" delete the relevant files and run ``bzr revert`` on those files."
11218
msgstr ""
11219
11220
#: en/help_topics/content-filters.txt:92
11221
msgid ""
11222
"Note: In the future, it is likely that additional options will be added\n"
11223
"to commands to make this refreshing process faster and safer.\n"
11224
msgstr ""
11225
11226
#: en/help_topics/current-formats.txt:1
11227
msgid "Current Storage Formats"
11228
msgstr ""
11229
11230
#: en/help_topics/current-formats.txt:3
11231
msgid ""
11232
":2a:\n"
11233
" (native) (default) Format for the bzr 2.0 series. Uses group-\n"
11234
" compress storage. Provides rich roots which are a one-way\n"
11235
" transition."
11236
msgstr ""
11237
11238
#: en/help_topics/current-formats.txt:8 en/help_topics/other-formats.txt:17
11239
msgid ""
11240
"\n"
11241
"See :doc:`formats-help` for more about storage formats."
11242
msgstr ""
11243
11244
#: en/help_topics/debug-flags.txt:1
11245
msgid ""
11246
"Debug Flags\n"
11247
"==========="
11248
msgstr ""
11249
11250
#: en/help_topics/debug-flags.txt:4
11251
msgid ""
11252
"These flags can be passed on the bzr command line or (without the ``-D``\n"
11253
"prefix) put in the ``debug_flags`` variable in ``bazaar.conf``."
11254
msgstr ""
11255
11256
#: en/help_topics/debug-flags.txt:7
11257
msgid ""
11258
"-Dauth Trace authentication sections used.\n"
11259
"-Dbytes Print out how many bytes were transferred\n"
11260
"-Ddirstate Trace dirstate activity (verbose!)\n"
11261
"-Derror Instead of normal error handling, always print a "
11262
"traceback\n"
11263
" on error.\n"
11264
"-Devil Capture call sites that do expensive or badly-scaling\n"
11265
" operations.\n"
11266
"-Dfetch Trace history copying between repositories.\n"
11267
"-Dfilters Emit information for debugging content filtering.\n"
11268
"-Dforceinvdeltas Force use of inventory deltas during generic streaming "
11269
"fetch.\n"
11270
"-Dgraph Trace graph traversal.\n"
11271
"-Dhashcache Log every time a working file is read to determine its "
11272
"hash.\n"
11273
"-Dhooks Trace hook execution.\n"
11274
"-Dhpss Trace smart protocol requests and responses.\n"
11275
"-Dhpssdetail More hpss details.\n"
11276
"-Dhpssvfs Traceback on vfs access to Remote objects.\n"
11277
"-Dhttp Trace http connections, requests and responses.\n"
11278
"-Dindex Trace major index operations.\n"
11279
"-Dknit Trace knit operations.\n"
11280
"-Dlock Trace when lockdir locks are taken or released.\n"
11281
"-Dnoretry If a connection is reset, fail immediately rather than\n"
11282
" retrying the request.\n"
11283
"-Dprogress Trace progress bar operations.\n"
11284
"-Dmem_dump Dump memory to a file upon an out of memory error.\n"
11285
"-Dmerge Emit information for debugging merges.\n"
11286
"-Dno_apport Don't use apport to report crashes.\n"
11287
"-Dno_activity \t Don't show transport activity indicator in progress bar.\n"
11288
"-Dpack Emit information about pack operations.\n"
11289
"-Drelock Emit a message every time a branch or repository object "
11290
"is\n"
11291
" unlocked then relocked the same way.\n"
11292
"-Dsftp Trace SFTP internals.\n"
11293
"-Dstatic_tuple Error when a tuple is used where a StaticTuple is "
11294
"expected\n"
11295
"-Dstream Trace fetch streams.\n"
11296
"-Dstrict_locks Trace when OS locks are potentially used in a non-"
11297
"portable\n"
11298
" manner.\n"
11299
"-Dunlock Some errors during unlock are treated as warnings.\n"
11300
"-DIDS_never Never use InterDifferingSerializer when fetching.\n"
11301
"-DIDS_always Always use InterDifferingSerializer to fetch if "
11302
"appropriate\n"
11303
" for the format, even for non-local fetches.\n"
11304
msgstr ""
11305
11306
#: en/help_topics/diverged-branches.txt:1
11307
msgid ""
11308
"Diverged Branches\n"
11309
"================="
11310
msgstr ""
11311
11312
#: en/help_topics/diverged-branches.txt:4
11313
msgid ""
11314
"When Bazaar tries to push one branch onto another, it requires that the\n"
11315
"destination branch must be ready to receive the source branch. If this "
11316
"isn't\n"
11317
"the case, then we say that the branches have ``diverged``. Branches are\n"
11318
"considered diverged if the destination branch's most recent commit is one "
11319
"that\n"
11320
"has not been merged (directly or indirectly) by the source branch. To "
11321
"recover\n"
11322
"from diverged branches, one must merge the missing revisions into the "
11323
"source\n"
11324
"branch."
11325
msgstr ""
11326
11327
#: en/help_topics/diverged-branches.txt:12
11328
msgid ""
11329
"This situation commonly arises when using a centralized workflow with local\n"
11330
"commits. If someone else has committed new work to the mainline since your\n"
11331
"last pull and you have local commits that have not yet been pushed to the\n"
11332
"mainline, then your local branch and the mainline have diverged."
11333
msgstr ""
11334
11335
#: en/help_topics/diverged-branches.txt:17
11336
msgid ""
11337
"Discovering What Has Diverged\n"
11338
"-----------------------------"
11339
msgstr ""
11340
11341
#: en/help_topics/diverged-branches.txt:20
11342
msgid ""
11343
"The ``bzr missing`` command is used to find out what revisions are in "
11344
"another\n"
11345
"branch that are not present in the current branch, and vice-versa. It shows "
11346
"a\n"
11347
"summary of which extra revisions exist in each branch. If you want to see "
11348
"the\n"
11349
"precise effects of those revisions, you can use ``bzr diff --"
11350
"old=other_branch``\n"
11351
"to show the differences between other_branch and your current branch."
11352
msgstr ""
11353
11354
#: en/help_topics/diverged-branches.txt:26
11355
msgid ""
11356
"A Solution\n"
11357
"----------"
11358
msgstr ""
11359
11360
#: en/help_topics/diverged-branches.txt:29
11361
msgid ""
11362
"The solution is to merge the revisions from the mainline into your local\n"
11363
"branch. To do so, use ``bzr merge`` to get the new revisions from the\n"
11364
"mainline. This merge may result in conflicts if the other developer's "
11365
"changes\n"
11366
"overlap with your changes. These conflicts should be resolved before\n"
11367
"continuing. After any conflicts have been resolved, or even if there were "
11368
"no\n"
11369
"conflicts, Bazaar requires that you explicitly commit these new revisions\n"
11370
"to your local branch. This requirement gives you an opportunity to test "
11371
"the\n"
11372
"resulting working tree for correctness, since the merged revisions could "
11373
"have\n"
11374
"made arbitrary changes. After testing, you should commit the merge using\n"
11375
"``bzr commit``. This clears up the diverged branches situation. Your "
11376
"local\n"
11377
"branch can now be pushed to the mainline.\n"
11378
msgstr ""
11379
11380
#: en/help_topics/eol.txt:1
11381
msgid ""
11382
"End of Line Conversion\n"
11383
"======================"
11384
msgstr ""
11385
11386
#: en/help_topics/eol.txt:4
11387
msgid ""
11388
"EOL conversion is provided as a content filter where Bazaar internally\n"
11389
"stores a canonical format but outputs a convenience format. See\n"
11390
"``bzr help content-filters`` for general information about using these."
11391
msgstr ""
11392
11393
#: en/help_topics/eol.txt:8
11394
msgid ""
11395
"Note: Content filtering is only supported in recently added formats,\n"
11396
"e.g. 1.14. Be sure that both the repository *and* the branch are\n"
11397
"in a recent format. (Just setting the format on the repository\n"
11398
"is not enough.) If content filtering does not appear to be working, use\n"
11399
"'bzr info -v' to confirm that the branch is using \"Working tree format 5\"\n"
11400
"or later."
11401
msgstr ""
11402
11403
#: en/help_topics/eol.txt:15
11404
msgid ""
11405
"EOL conversion needs to be enabled for selected file patterns using\n"
11406
"rules. See ``bzr help rules`` for general information on defining rules.\n"
11407
"Currently, rules are only supported in $BZR_HOME/.bazaar/rules (or\n"
11408
"%BZR_HOME%/bazaar/2.0/rules on Windows). Branch specific rules will be\n"
11409
"supported in a future verison of Bazaar."
11410
msgstr ""
11411
11412
#: en/help_topics/eol.txt:21
11413
msgid ""
11414
"To configure which files to filter, set ``eol`` to one of the values below.\n"
11415
"(If a value is not set, ``exact`` is the default.)"
11416
msgstr ""
11417
11418
#: en/help_topics/eol.txt:24
11419
msgid ""
11420
" ========== ===================================== ======================\n"
11421
" Value Checkout end-of-lines as Commit end-of-lines as\n"
11422
" ========== ===================================== ======================\n"
11423
" ``native`` ``crlf`` on Windows, ``lf`` otherwise ``lf``\n"
11424
" ---------- ------------------------------------- ----------------------\n"
11425
" ``lf`` ``lf`` ``lf``\n"
11426
" ---------- ------------------------------------- ----------------------\n"
11427
" ``crlf`` ``crlf`` ``lf``\n"
11428
" ---------- ------------------------------------- ----------------------\n"
11429
" ``exact`` No conversion Exactly as in file\n"
11430
" ========== ===================================== ======================"
11431
msgstr ""
11432
11433
#: en/help_topics/eol.txt:36
11434
msgid ""
11435
"Note: For safety reasons, no conversion is applied to any file where a null\n"
11436
"byte is detected in the file."
11437
msgstr ""
11438
11439
#: en/help_topics/eol.txt:39
11440
msgid ""
11441
"For users working on a cross-platform project, here is a suggested rule\n"
11442
"to use as a starting point::"
11443
msgstr ""
11444
11445
#: en/help_topics/eol.txt:42 en/help_topics/eol.txt:52
11446
#: en/help_topics/eol.txt:67 en/help_topics/eol.txt:82
11447
msgid ""
11448
" [name *]\n"
11449
" eol = native"
11450
msgstr ""
11451
11452
#: en/help_topics/eol.txt:45
11453
msgid ""
11454
"If you have binary files that do not contain a null byte though, be\n"
11455
"sure to add ``eol = exact`` rules for those as well. You can do this\n"
11456
"by giving more explicit patterns earlier in the rules file. For example::"
11457
msgstr ""
11458
11459
#: en/help_topics/eol.txt:49
11460
msgid ""
11461
" [name *.png]\n"
11462
" eol = exact"
11463
msgstr ""
11464
11465
#: en/help_topics/eol.txt:55
11466
msgid ""
11467
"If your working tree is on a network drive shared by users on different\n"
11468
"operating systems, you typically want to force certain conventions for\n"
11469
"certain files. In that way, if a file is created with the wrong line\n"
11470
"endings or line endings get mixed during editing, it gets committed\n"
11471
"correctly and gets checked out correctly. For example::"
11472
msgstr ""
11473
11474
#: en/help_topics/eol.txt:61
11475
msgid ""
11476
" [name *.bat]\n"
11477
" eol = crlf"
11478
msgstr ""
11479
11480
#: en/help_topics/eol.txt:64
11481
msgid ""
11482
" [name *.sh]\n"
11483
" eol = lf"
11484
msgstr ""
11485
11486
#: en/help_topics/eol.txt:70
11487
msgid ""
11488
"If you take the care to create files with their required endings, you can\n"
11489
"achieve *almost* the same thing by using ``eol = exact``. It is slightly\n"
11490
"safer to use ``lf`` and ``crlf`` though because edits accidentally\n"
11491
"introducing mixed line endings will be corrected during commit for files\n"
11492
"with those settings."
11493
msgstr ""
11494
11495
#: en/help_topics/eol.txt:76
11496
msgid ""
11497
"If you have sample test data that deliberately has text files with mixed\n"
11498
"newline conventions, you can ask for those to be left alone like this::"
11499
msgstr ""
11500
11501
#: en/help_topics/eol.txt:79
11502
msgid ""
11503
" [name test_data/]\n"
11504
" eol = exact"
11505
msgstr ""
11506
11507
#: en/help_topics/eol.txt:85
11508
msgid ""
11509
"Note that ``exact`` does not imply the file is binary but it does mean\n"
11510
"that no conversion of end-of-lines will be done. (Bazaar currently relies\n"
11511
"of content analysis to detect binary files for commands like ``diff``.\n"
11512
"In the future, a ``binary = true`` rule may be added but it is not\n"
11513
"supported yet.)"
11514
msgstr ""
11515
11516
#: en/help_topics/eol.txt:91
11517
msgid ""
11518
"If you have an existing repository with text files already stored using\n"
11519
"Windows newline conventions (``crlf``), then you may want to keep using "
11520
"that\n"
11521
"convention in the repository. Forcing certain files to this convention\n"
11522
"may also help users who do not have rules configured. To do this, set\n"
11523
"``eol`` to one of the values below."
11524
msgstr ""
11525
11526
#: en/help_topics/eol.txt:97
11527
msgid ""
11528
" ============================ ======================== "
11529
"======================\n"
11530
" Value Checkout end-of-lines as Commit end-of-lines "
11531
"as\n"
11532
" ============================ ======================== "
11533
"======================\n"
11534
" ``native-with-crlf-in-repo`` ``crlf`` on Windows, ``crlf``\n"
11535
" ``lf`` otherwise\n"
11536
" ---------------------------- ------------------------ ----------------------"
11537
"\n"
11538
" ``lf-with-crlf-in-repo`` ``lf`` ``crlf``\n"
11539
" ---------------------------- ------------------------ ----------------------"
11540
"\n"
11541
" ``crlf-with-crlf-in-repo`` ``crlf`` ``crlf``\n"
11542
" ============================ ======================== ======================"
11543
msgstr ""
11544
11545
#: en/help_topics/eol.txt:108
11546
msgid ""
11547
"For users working on an existing project that uses Windows newline\n"
11548
"conventions in their Bazaar repository, this rule is suggested as a\n"
11549
"starting point::"
11550
msgstr ""
11551
11552
#: en/help_topics/eol.txt:112
11553
msgid ""
11554
" [name *]\n"
11555
" eol = native-with-crlf-in-repo"
11556
msgstr ""
11557
11558
#: en/help_topics/eol.txt:115
11559
msgid ""
11560
"For new projects, it is recommended that end-of-lines be stored as ``lf``\n"
11561
"and that users stick to the basic settings, i.e. ``native``, ``lf``,\n"
11562
"``crlf`` and ``exact``."
11563
msgstr ""
11564
11565
#: en/help_topics/eol.txt:119
11566
msgid ""
11567
"Note: Bazaar's EOL conversion will convert the content of files but\n"
11568
"never reject files because a given line ending or mixed line endings\n"
11569
"are found. A precommit hook should be used if you wish to validate\n"
11570
"(and not just convert) content before committing.\n"
11571
msgstr ""
11572
11573
#: en/help_topics/hidden-commands.txt:1
11574
msgid ""
11575
"added List files added in working tree.\n"
11576
"ancestry List all revisions merged into this branch.\n"
11577
"assert-fail Test reporting of assertion failures\n"
11578
"bundle-info Output interesting stats about a bundle\n"
11579
"bundle-revisions Create a merge-directive for submitting changes.\n"
11580
"cat-revision Write out metadata for a revision.\n"
11581
"dump-btree Dump the contents of a btree index file to stdout.\n"
11582
"export-pot Export command helps and error messages in po format.\n"
11583
"file-id Print file_id of a particular file or directory.\n"
11584
"file-path Print path of file_ids to a file or directory.\n"
11585
"find-merge-base Find and print a base revision for merging two "
11586
"branches.\n"
11587
"hooks Show hooks.\n"
11588
"inventory Show inventory of the current working copy or a "
11589
"revision.\n"
11590
"local-time-offset Show the offset in seconds from GMT to local time.\n"
11591
"lookup-revision Lookup the revision-id from a revision-number\n"
11592
"merge-directive Generate a merge directive for auto-merge tools.\n"
11593
"modified List files modified in working tree.\n"
11594
"re-sign Create a digital signature for an existing revision.\n"
11595
"reference list, view and set branch locations for nested trees.\n"
11596
"relpath Show path of a file relative to root\n"
11597
"repair-workingtree Reset the working tree state file.\n"
11598
"revision-history Display the list of revision ids on a branch.\n"
11599
"revision-info Show revision number and revision id for a given "
11600
"revision\n"
11601
" identifier.\n"
11602
"rocks Statement of optimism.\n"
11603
"selftest Run internal test suite.\n"
11604
"shell-complete Show appropriate completions for context.\n"
11605
"test-script Run a shell-like test from a file.\n"
11606
"touching-revisions Return revision-ids which affected a particular file.\n"
11607
"unknowns List unknown files.\n"
11608
"wait-until-signalled Test helper for\n"
11609
" test_start_and_stop_bzr_subprocess_send_signal.\n"
11610
msgstr ""
11611
11612
#: en/help_topics/hooks.txt:1
11613
msgid ""
11614
"\n"
11615
"Hooks\n"
11616
"====="
11617
msgstr ""
11618
11619
#: en/help_topics/hooks.txt:5 en/help_topics/rules.txt:4
11620
msgid ""
11621
"Introduction\n"
11622
"------------"
11623
msgstr ""
11624
11625
#: en/help_topics/hooks.txt:8
11626
msgid "A hook of type *xxx* of class *yyy* needs to be registered using::"
11627
msgstr ""
11628
11629
#: en/help_topics/hooks.txt:10
11630
msgid " yyy.hooks.install_named_hook(\"xxx\", ...)"
11631
msgstr ""
11632
11633
#: en/help_topics/hooks.txt:12
11634
msgid ""
11635
"See :doc:`Using hooks<../user-guide/hooks>` in the User Guide for examples."
11636
msgstr ""
11637
11638
#: en/help_topics/hooks.txt:14
11639
msgid ""
11640
"The class that contains each hook is given before the hooks it supplies. "
11641
"For\n"
11642
"instance, BranchHooks as the class is the hooks class for\n"
11643
"`bzrlib.branch.Branch.hooks`."
11644
msgstr ""
11645
11646
#: en/help_topics/hooks.txt:18
11647
msgid ""
11648
"Each description also indicates whether the hook runs on the client (the\n"
11649
"machine where bzr was invoked) or the server (the machine addressed by\n"
11650
"the branch URL). These may be, but are not necessarily, the same machine."
11651
msgstr ""
11652
11653
#: en/help_topics/hooks.txt:22
11654
msgid ""
11655
"Plugins (including hooks) are run on the server if all of these is true:"
11656
msgstr ""
11657
11658
#: en/help_topics/hooks.txt:24
11659
msgid ""
11660
" * The connection is via a smart server (accessed with a URL starting with\n"
11661
" \"bzr://\", \"bzr+ssh://\" or \"bzr+http://\", or accessed via a "
11662
"\"http://\"\n"
11663
" URL when a smart server is available via HTTP)."
11664
msgstr ""
11665
11666
#: en/help_topics/hooks.txt:28
11667
msgid ""
11668
" * The hook is either server specific or part of general infrastructure "
11669
"rather\n"
11670
" than client specific code (such as commit)."
11671
msgstr ""
11672
11673
#: en/help_topics/hooks.txt:31
11674
msgid ""
11675
"\n"
11676
"BranchHooks\n"
11677
"-----------"
11678
msgstr ""
11679
11680
#: en/help_topics/hooks.txt:35
11681
msgid ""
11682
"automatic_tag_name\n"
11683
"~~~~~~~~~~~~~~~~~~"
11684
msgstr ""
11685
11686
#: en/help_topics/hooks.txt:38 en/help_topics/hooks.txt:56
11687
#: en/help_topics/hooks.txt:102 en/help_topics/hooks.txt:259
11688
msgid "Introduced in: 2.2"
11689
msgstr ""
11690
11691
#: en/help_topics/hooks.txt:40
11692
msgid ""
11693
"Called to determine an automatic tag name for a revision.\n"
11694
"automatic_tag_name is called with (branch, revision_id) and should\n"
11695
"return a tag name or None if no tag name could be determined. The\n"
11696
"first non-None tag name returned will be used."
11697
msgstr ""
11698
11699
#: en/help_topics/hooks.txt:45
11700
msgid ""
11701
"open\n"
11702
"~~~~"
11703
msgstr ""
11704
11705
#: en/help_topics/hooks.txt:48 en/help_topics/hooks.txt:290
11706
#: en/help_topics/hooks.txt:304
11707
msgid "Introduced in: 1.8"
11708
msgstr ""
11709
11710
#: en/help_topics/hooks.txt:50
11711
msgid ""
11712
"Called with the Branch object that has been opened after a branch is\n"
11713
"opened."
11714
msgstr ""
11715
11716
#: en/help_topics/hooks.txt:53
11717
msgid ""
11718
"post_branch_init\n"
11719
"~~~~~~~~~~~~~~~~"
11720
msgstr ""
11721
11722
#: en/help_topics/hooks.txt:58
11723
msgid ""
11724
"Called after new branch initialization completes. post_branch_init is\n"
11725
"called with a bzrlib.branch.BranchInitHookParams. Note that init,\n"
11726
"branch and checkout (both heavyweight and lightweight) will all\n"
11727
"trigger this hook."
11728
msgstr ""
11729
11730
#: en/help_topics/hooks.txt:63
11731
msgid ""
11732
"post_change_branch_tip\n"
11733
"~~~~~~~~~~~~~~~~~~~~~~"
11734
msgstr ""
11735
11736
#: en/help_topics/hooks.txt:66 en/help_topics/hooks.txt:418
11737
msgid "Introduced in: 1.4"
11738
msgstr ""
11739
11740
#: en/help_topics/hooks.txt:68
11741
msgid ""
11742
"Called in bzr client and server after a change to the tip of a branch\n"
11743
"is made. post_change_branch_tip is called with a\n"
11744
"bzrlib.branch.ChangeBranchTipParams. Note that push, pull, commit,\n"
11745
"uncommit will all trigger this hook."
11746
msgstr ""
11747
11748
#: en/help_topics/hooks.txt:73 en/help_topics/hooks.txt:389
11749
msgid ""
11750
"post_commit\n"
11751
"~~~~~~~~~~~"
11752
msgstr ""
11753
11754
#: en/help_topics/hooks.txt:76 en/help_topics/hooks.txt:86
11755
#: en/help_topics/hooks.txt:94 en/help_topics/hooks.txt:110
11756
#: en/help_topics/hooks.txt:145
11757
msgid "Introduced in: 0.15"
11758
msgstr ""
11759
11760
#: en/help_topics/hooks.txt:78
11761
msgid ""
11762
"Called in the bzr client after a commit has completed. post_commit is\n"
11763
"called with (local, master, old_revno, old_revid, new_revno,\n"
11764
"new_revid). old_revid is NULL_REVISION for the first commit to a\n"
11765
"branch."
11766
msgstr ""
11767
11768
#: en/help_topics/hooks.txt:83
11769
msgid ""
11770
"post_pull\n"
11771
"~~~~~~~~~"
11772
msgstr ""
11773
11774
#: en/help_topics/hooks.txt:88
11775
msgid ""
11776
"Called after a pull operation completes. post_pull is called with a\n"
11777
"bzrlib.branch.PullResult object and only runs in the bzr client."
11778
msgstr ""
11779
11780
#: en/help_topics/hooks.txt:91
11781
msgid ""
11782
"post_push\n"
11783
"~~~~~~~~~"
11784
msgstr ""
11785
11786
#: en/help_topics/hooks.txt:96
11787
msgid ""
11788
"Called after a push operation completes. post_push is called with a\n"
11789
"bzrlib.branch.BranchPushResult object and only runs in the bzr client."
11790
msgstr ""
11791
11792
#: en/help_topics/hooks.txt:99
11793
msgid ""
11794
"post_switch\n"
11795
"~~~~~~~~~~~"
11796
msgstr ""
11797
11798
#: en/help_topics/hooks.txt:104
11799
msgid ""
11800
"Called after a checkout switches branch. post_switch is called with a\n"
11801
"bzrlib.branch.SwitchHookParams."
11802
msgstr ""
11803
11804
#: en/help_topics/hooks.txt:107
11805
msgid ""
11806
"post_uncommit\n"
11807
"~~~~~~~~~~~~~"
11808
msgstr ""
11809
11810
#: en/help_topics/hooks.txt:112
11811
msgid ""
11812
"Called in the bzr client after an uncommit completes. post_uncommit is\n"
11813
"called with (local, master, old_revno, old_revid, new_revno,\n"
11814
"new_revid) where local is the local branch or None, master is the\n"
11815
"target branch, and an empty branch receives new_revno of 0, new_revid\n"
11816
"of None."
11817
msgstr ""
11818
11819
#: en/help_topics/hooks.txt:118
11820
msgid ""
11821
"pre_change_branch_tip\n"
11822
"~~~~~~~~~~~~~~~~~~~~~"
11823
msgstr ""
11824
11825
#: en/help_topics/hooks.txt:121
11826
msgid "Introduced in: 1.6"
11827
msgstr ""
11828
11829
#: en/help_topics/hooks.txt:123
11830
msgid ""
11831
"Called in bzr client and server before a change to the tip of a branch\n"
11832
"is made. pre_change_branch_tip is called with a\n"
11833
"bzrlib.branch.ChangeBranchTipParams. Note that push, pull, commit,\n"
11834
"uncommit will all trigger this hook."
11835
msgstr ""
11836
11837
#: en/help_topics/hooks.txt:128
11838
msgid ""
11839
"pre_commit\n"
11840
"~~~~~~~~~~"
11841
msgstr ""
11842
11843
#: en/help_topics/hooks.txt:131
11844
msgid "Introduced in: 0.91"
11845
msgstr ""
11846
11847
#: en/help_topics/hooks.txt:133
11848
msgid ""
11849
"Called after a commit is calculated but before it is completed.\n"
11850
"pre_commit is called with (local, master, old_revno, old_revid,\n"
11851
"future_revno, future_revid, tree_delta, future_tree). old_revid is\n"
11852
"NULL_REVISION for the first commit to a branch, tree_delta is a\n"
11853
"TreeDelta object describing changes from the basis revision. hooks\n"
11854
"MUST NOT modify this delta. future_tree is an in-memory tree obtained\n"
11855
"from CommitBuilder.revision_tree() and hooks MUST NOT modify this\n"
11856
"tree."
11857
msgstr ""
11858
11859
#: en/help_topics/hooks.txt:142
11860
msgid ""
11861
"set_rh\n"
11862
"~~~~~~"
11863
msgstr ""
11864
11865
#: en/help_topics/hooks.txt:147
11866
msgid ""
11867
"Invoked whenever the revision history has been set via\n"
11868
"set_revision_history. The api signature is (branch, revision_history),\n"
11869
"and the branch will be write-locked. The set_rh hook can be expensive\n"
11870
"for bzr to trigger, a better hook to use is\n"
11871
"Branch.post_change_branch_tip."
11872
msgstr ""
11873
11874
#: en/help_topics/hooks.txt:153
11875
msgid ""
11876
"transform_fallback_location\n"
11877
"~~~~~~~~~~~~~~~~~~~~~~~~~~~"
11878
msgstr ""
11879
11880
#: en/help_topics/hooks.txt:156
11881
msgid "Introduced in: 1.9"
11882
msgstr ""
11883
11884
#: en/help_topics/hooks.txt:158
11885
msgid ""
11886
"Called when a stacked branch is activating its fallback locations.\n"
11887
"transform_fallback_location is called with (branch, url), and should\n"
11888
"return a new url. Returning the same url allows it to be used as-is,\n"
11889
"returning a different one can be used to cause the branch to stack on\n"
11890
"a closer copy of that fallback_location. Note that the branch cannot\n"
11891
"have history accessing methods called on it during this hook because\n"
11892
"the fallback locations have not been activated. When there are\n"
11893
"multiple hooks installed for transform_fallback_location, all are\n"
11894
"called with the url returned from the previous hook.The order is\n"
11895
"however undefined."
11896
msgstr ""
11897
11898
#: en/help_topics/hooks.txt:169
11899
msgid ""
11900
"CommandHooks\n"
11901
"------------"
11902
msgstr ""
11903
11904
#: en/help_topics/hooks.txt:172
11905
msgid ""
11906
"extend_command\n"
11907
"~~~~~~~~~~~~~~"
11908
msgstr ""
11909
11910
#: en/help_topics/hooks.txt:175
11911
msgid "Introduced in: 1.13"
11912
msgstr ""
11913
11914
#: en/help_topics/hooks.txt:177
11915
msgid ""
11916
"Called after creating a command object to allow modifications such as\n"
11917
"adding or removing options, docs etc. Called with the new\n"
11918
"bzrlib.commands.Command object."
11919
msgstr ""
11920
11921
#: en/help_topics/hooks.txt:181
11922
msgid ""
11923
"get_command\n"
11924
"~~~~~~~~~~~"
11925
msgstr ""
11926
11927
#: en/help_topics/hooks.txt:184 en/help_topics/hooks.txt:196
11928
#: en/help_topics/hooks.txt:205 en/help_topics/hooks.txt:464
11929
msgid "Introduced in: 1.17"
11930
msgstr ""
11931
11932
#: en/help_topics/hooks.txt:186
11933
msgid ""
11934
"Called when creating a single command. Called with (cmd_or_None,\n"
11935
"command_name). get_command should either return the cmd_or_None\n"
11936
"parameter, or a replacement Command object that should be used for the\n"
11937
"command. Note that the Command.hooks hooks are core infrastructure.\n"
11938
"Many users will prefer to use bzrlib.commands.register_command or\n"
11939
"plugin_cmds.register_lazy."
11940
msgstr ""
11941
11942
#: en/help_topics/hooks.txt:193
11943
msgid ""
11944
"get_missing_command\n"
11945
"~~~~~~~~~~~~~~~~~~~"
11946
msgstr ""
11947
11948
#: en/help_topics/hooks.txt:198
11949
msgid ""
11950
"Called when creating a single command if no command could be found.\n"
11951
"Called with (command_name). get_missing_command should either return\n"
11952
"None, or a Command object to be used for the command."
11953
msgstr ""
11954
11955
#: en/help_topics/hooks.txt:202
11956
msgid ""
11957
"list_commands\n"
11958
"~~~~~~~~~~~~~"
11959
msgstr ""
11960
11961
#: en/help_topics/hooks.txt:207
11962
msgid ""
11963
"Called when enumerating commands. Called with a set of cmd_name\n"
11964
"strings for all the commands found so far. This set is safe to mutate\n"
11965
"- e.g. to remove a command. list_commands should return the updated\n"
11966
"set of command names."
11967
msgstr ""
11968
11969
#: en/help_topics/hooks.txt:212
11970
msgid ""
11971
"_ConfigHooks\n"
11972
"------------"
11973
msgstr ""
11974
11975
#: en/help_topics/hooks.txt:215
11976
msgid ""
11977
"get\n"
11978
"~~~"
11979
msgstr ""
11980
11981
#: en/help_topics/hooks.txt:218 en/help_topics/hooks.txt:226
11982
#: en/help_topics/hooks.txt:233 en/help_topics/hooks.txt:241
11983
#: en/help_topics/hooks.txt:248 en/help_topics/hooks.txt:370
11984
#: en/help_topics/hooks.txt:443
11985
msgid "Introduced in: 2.4"
11986
msgstr ""
11987
11988
#: en/help_topics/hooks.txt:220
11989
msgid ""
11990
"Invoked when a config option is read. The signature is (stack, name,\n"
11991
"value)."
11992
msgstr ""
11993
11994
#: en/help_topics/hooks.txt:223
11995
msgid ""
11996
"load\n"
11997
"~~~~"
11998
msgstr ""
11999
12000
#: en/help_topics/hooks.txt:228
12001
msgid "Invoked when a config store is loaded. The signature is (store)."
12002
msgstr ""
12003
12004
#: en/help_topics/hooks.txt:230
12005
msgid ""
12006
"remove\n"
12007
"~~~~~~"
12008
msgstr ""
12009
12010
#: en/help_topics/hooks.txt:235
12011
msgid ""
12012
"Invoked when a config option is removed. The signature is (stack,\n"
12013
"name)."
12014
msgstr ""
12015
12016
#: en/help_topics/hooks.txt:238
12017
msgid ""
12018
"save\n"
12019
"~~~~"
12020
msgstr ""
12021
12022
#: en/help_topics/hooks.txt:243
12023
msgid "Invoked when a config store is saved. The signature is (store)."
12024
msgstr ""
12025
12026
#: en/help_topics/hooks.txt:245
12027
msgid ""
12028
"set\n"
12029
"~~~"
12030
msgstr ""
12031
12032
#: en/help_topics/hooks.txt:250
12033
msgid ""
12034
"Invoked when a config option is set. The signature is (stack, name,\n"
12035
"value)."
12036
msgstr ""
12037
12038
#: en/help_topics/hooks.txt:253
12039
msgid ""
12040
"ControlDirHooks\n"
12041
"---------------"
12042
msgstr ""
12043
12044
#: en/help_topics/hooks.txt:256
12045
msgid ""
12046
"post_repo_init\n"
12047
"~~~~~~~~~~~~~~"
12048
msgstr ""
12049
12050
#: en/help_topics/hooks.txt:261
12051
msgid ""
12052
"Invoked after a repository has been initialized. post_repo_init is\n"
12053
"called with a bzrlib.controldir.RepoInitHookParams."
12054
msgstr ""
12055
12056
#: en/help_topics/hooks.txt:264
12057
msgid ""
12058
"pre_open\n"
12059
"~~~~~~~~"
12060
msgstr ""
12061
12062
#: en/help_topics/hooks.txt:267
12063
msgid "Introduced in: 1.14"
12064
msgstr ""
12065
12066
#: en/help_topics/hooks.txt:269
12067
msgid ""
12068
"Invoked before attempting to open a ControlDir with the transport that\n"
12069
"the open will use."
12070
msgstr ""
12071
12072
#: en/help_topics/hooks.txt:272
12073
msgid ""
12074
"InfoHooks\n"
12075
"---------"
12076
msgstr ""
12077
12078
#: en/help_topics/hooks.txt:275
12079
msgid ""
12080
"repository\n"
12081
"~~~~~~~~~~"
12082
msgstr ""
12083
12084
#: en/help_topics/hooks.txt:278 en/help_topics/hooks.txt:297
12085
#: en/help_topics/hooks.txt:521
12086
msgid "Introduced in: 1.15"
12087
msgstr ""
12088
12089
#: en/help_topics/hooks.txt:280
12090
msgid ""
12091
"Invoked when displaying the statistics for a repository. repository is\n"
12092
"called with a statistics dictionary as returned by the repository and\n"
12093
"a file-like object to write to."
12094
msgstr ""
12095
12096
#: en/help_topics/hooks.txt:284
12097
msgid ""
12098
"LockHooks\n"
12099
"---------"
12100
msgstr ""
12101
12102
#: en/help_topics/hooks.txt:287
12103
msgid ""
12104
"lock_acquired\n"
12105
"~~~~~~~~~~~~~"
12106
msgstr ""
12107
12108
#: en/help_topics/hooks.txt:292
12109
msgid ""
12110
"Called with a bzrlib.lock.LockResult when a physical lock is acquired."
12111
msgstr ""
12112
12113
#: en/help_topics/hooks.txt:294
12114
msgid ""
12115
"lock_broken\n"
12116
"~~~~~~~~~~~"
12117
msgstr ""
12118
12119
#: en/help_topics/hooks.txt:299
12120
msgid "Called with a bzrlib.lock.LockResult when a physical lock is broken."
12121
msgstr ""
12122
12123
#: en/help_topics/hooks.txt:301
12124
msgid ""
12125
"lock_released\n"
12126
"~~~~~~~~~~~~~"
12127
msgstr ""
12128
12129
#: en/help_topics/hooks.txt:306
12130
msgid ""
12131
"Called with a bzrlib.lock.LockResult when a physical lock is released."
12132
msgstr ""
12133
12134
#: en/help_topics/hooks.txt:308
12135
msgid ""
12136
"MergeHooks\n"
12137
"----------"
12138
msgstr ""
12139
12140
#: en/help_topics/hooks.txt:311
12141
msgid ""
12142
"merge_file_content\n"
12143
"~~~~~~~~~~~~~~~~~~"
12144
msgstr ""
12145
12146
#: en/help_topics/hooks.txt:314
12147
msgid "Introduced in: 2.1"
12148
msgstr ""
12149
12150
#: en/help_topics/hooks.txt:316
12151
msgid ""
12152
"Called with a bzrlib.merge.Merger object to create a per file merge\n"
12153
"object when starting a merge. Should return either None or a subclass\n"
12154
"of ``bzrlib.merge.AbstractPerFileMerger``. Such objects will then be\n"
12155
"called per file that needs to be merged (including when one side has\n"
12156
"deleted the file and the other has changed it). See the\n"
12157
"AbstractPerFileMerger API docs for details on how it is used by merge."
12158
msgstr ""
12159
12160
#: en/help_topics/hooks.txt:323
12161
msgid ""
12162
"post_merge\n"
12163
"~~~~~~~~~~"
12164
msgstr ""
12165
12166
#: en/help_topics/hooks.txt:326 en/help_topics/hooks.txt:334
12167
#: en/help_topics/hooks.txt:384 en/help_topics/hooks.txt:402
12168
#: en/help_topics/hooks.txt:410 en/help_topics/hooks.txt:509
12169
msgid "Introduced in: 2.5"
12170
msgstr ""
12171
12172
#: en/help_topics/hooks.txt:328
12173
msgid ""
12174
"Called after a merge. Receives a Merger object as the single argument.\n"
12175
"The return value is ignored."
12176
msgstr ""
12177
12178
#: en/help_topics/hooks.txt:331
12179
msgid ""
12180
"pre_merge\n"
12181
"~~~~~~~~~"
12182
msgstr ""
12183
12184
#: en/help_topics/hooks.txt:336
12185
msgid ""
12186
"Called before a merge. Receives a Merger object as the single\n"
12187
"argument."
12188
msgstr ""
12189
12190
#: en/help_topics/hooks.txt:339
12191
msgid ""
12192
"MergeDirectiveHooks\n"
12193
"-------------------"
12194
msgstr ""
12195
12196
#: en/help_topics/hooks.txt:342
12197
msgid ""
12198
"merge_request_body\n"
12199
"~~~~~~~~~~~~~~~~~~"
12200
msgstr ""
12201
12202
#: en/help_topics/hooks.txt:345
12203
msgid "Introduced in: 1.15.0"
12204
msgstr ""
12205
12206
#: en/help_topics/hooks.txt:347
12207
msgid ""
12208
"Called with a MergeRequestBodyParams when a body is needed for a merge\n"
12209
"request. Callbacks must return a body. If more than one callback is\n"
12210
"registered, the output of one callback is provided to the next."
12211
msgstr ""
12212
12213
#: en/help_topics/hooks.txt:351
12214
msgid ""
12215
"MessageEditorHooks\n"
12216
"------------------"
12217
msgstr ""
12218
12219
#: en/help_topics/hooks.txt:354
12220
msgid ""
12221
"commit_message_template\n"
12222
"~~~~~~~~~~~~~~~~~~~~~~~"
12223
msgstr ""
12224
12225
#: en/help_topics/hooks.txt:357
12226
msgid "Introduced in: 1.10"
12227
msgstr ""
12228
12229
#: en/help_topics/hooks.txt:359
12230
msgid ""
12231
"Called when a commit message is being generated.\n"
12232
"commit_message_template is called with the bzrlib.commit.Commit object\n"
12233
"and the message that is known so far. commit_message_template must\n"
12234
"return a new message to use (which could be the same as it was given).\n"
12235
"When there are multiple hooks registered for commit_message_template,\n"
12236
"they are chained with the result from the first passed into the\n"
12237
"second, and so on."
12238
msgstr ""
12239
12240
#: en/help_topics/hooks.txt:367
12241
msgid ""
12242
"set_commit_message\n"
12243
"~~~~~~~~~~~~~~~~~~"
12244
msgstr ""
12245
12246
#: en/help_topics/hooks.txt:372
12247
msgid ""
12248
"Set a fixed commit message. set_commit_message is called with the\n"
12249
"bzrlib.commit.Commit object (so you can also change e.g. revision\n"
12250
"properties by editing commit.builder._revprops) and the message so\n"
12251
"far. set_commit_message must return the message to use or None if it\n"
12252
"should use the message editor as normal."
12253
msgstr ""
12254
12255
#: en/help_topics/hooks.txt:378
12256
msgid ""
12257
"MutableTreeHooks\n"
12258
"----------------"
12259
msgstr ""
12260
12261
#: en/help_topics/hooks.txt:381
12262
msgid ""
12263
"post_build_tree\n"
12264
"~~~~~~~~~~~~~~~"
12265
msgstr ""
12266
12267
#: en/help_topics/hooks.txt:386
12268
msgid ""
12269
"Called after a completely new tree is built. The hook is called with\n"
12270
"the tree as its only argument."
12271
msgstr ""
12272
12273
#: en/help_topics/hooks.txt:392
12274
msgid "Introduced in: 2.0"
12275
msgstr ""
12276
12277
#: en/help_topics/hooks.txt:394
12278
msgid ""
12279
"Called after a commit is performed on a tree. The hook is called with\n"
12280
"a bzrlib.mutabletree.PostCommitHookParams object. The mutable tree the\n"
12281
"commit was performed on is available via the mutable_tree attribute of\n"
12282
"that object."
12283
msgstr ""
12284
12285
#: en/help_topics/hooks.txt:399
12286
msgid ""
12287
"post_transform\n"
12288
"~~~~~~~~~~~~~~"
12289
msgstr ""
12290
12291
#: en/help_topics/hooks.txt:404
12292
msgid ""
12293
"Called after a tree transform has been performed on a tree. The hook\n"
12294
"is called with the tree that is being transformed and the transform."
12295
msgstr ""
12296
12297
#: en/help_topics/hooks.txt:407
12298
msgid ""
12299
"pre_transform\n"
12300
"~~~~~~~~~~~~~"
12301
msgstr ""
12302
12303
#: en/help_topics/hooks.txt:412
12304
msgid ""
12305
"Called before a tree transform on this tree. The hook is called with\n"
12306
"the tree that is being transformed and the transform."
12307
msgstr ""
12308
12309
#: en/help_topics/hooks.txt:415
12310
msgid ""
12311
"start_commit\n"
12312
"~~~~~~~~~~~~"
12313
msgstr ""
12314
12315
#: en/help_topics/hooks.txt:420
12316
msgid ""
12317
"Called before a commit is performed on a tree. The start commit hook\n"
12318
"is able to change the tree before the commit takes place. start_commit\n"
12319
"is called with the bzrlib.mutabletree.MutableTree that the commit is\n"
12320
"being performed on."
12321
msgstr ""
12322
12323
#: en/help_topics/hooks.txt:425
12324
msgid ""
12325
"SmartClientHooks\n"
12326
"----------------"
12327
msgstr ""
12328
12329
#: en/help_topics/hooks.txt:428
12330
msgid ""
12331
"call\n"
12332
"~~~~"
12333
msgstr ""
12334
12335
#: en/help_topics/hooks.txt:431
12336
msgid "Introduced in: unknown"
12337
msgstr ""
12338
12339
#: en/help_topics/hooks.txt:433
12340
msgid ""
12341
"Called when the smart client is submitting a request to the smart\n"
12342
"server. Called with a bzrlib.smart.client.CallHookParams object.\n"
12343
"Streaming request bodies, and responses, are not accessible."
12344
msgstr ""
12345
12346
#: en/help_topics/hooks.txt:437
12347
msgid ""
12348
"SmartServerHooks\n"
12349
"----------------"
12350
msgstr ""
12351
12352
#: en/help_topics/hooks.txt:440
12353
msgid ""
12354
"server_exception\n"
12355
"~~~~~~~~~~~~~~~~"
12356
msgstr ""
12357
12358
#: en/help_topics/hooks.txt:445
12359
msgid ""
12360
"Called by the bzr server when an exception occurs. server_exception is\n"
12361
"called with the sys.exc_info() tuple return true for the hook if the\n"
12362
"exception has been handled, in which case the server will exit\n"
12363
"normally."
12364
msgstr ""
12365
12366
#: en/help_topics/hooks.txt:450
12367
msgid ""
12368
"server_started\n"
12369
"~~~~~~~~~~~~~~"
12370
msgstr ""
12371
12372
#: en/help_topics/hooks.txt:453 en/help_topics/hooks.txt:472
12373
msgid "Introduced in: 0.16"
12374
msgstr ""
12375
12376
#: en/help_topics/hooks.txt:455
12377
msgid ""
12378
"Called by the bzr server when it starts serving a directory.\n"
12379
"server_started is called with (backing urls, public url), where\n"
12380
"backing_url is a list of URLs giving the server-specific directory\n"
12381
"locations, and public_url is the public URL for the directory being\n"
12382
"served."
12383
msgstr ""
12384
12385
#: en/help_topics/hooks.txt:461
12386
msgid ""
12387
"server_started_ex\n"
12388
"~~~~~~~~~~~~~~~~~"
12389
msgstr ""
12390
12391
#: en/help_topics/hooks.txt:466
12392
msgid ""
12393
"Called by the bzr server when it starts serving a directory.\n"
12394
"server_started is called with (backing_urls, server_obj)."
12395
msgstr ""
12396
12397
#: en/help_topics/hooks.txt:469
12398
msgid ""
12399
"server_stopped\n"
12400
"~~~~~~~~~~~~~~"
12401
msgstr ""
12402
12403
#: en/help_topics/hooks.txt:474
12404
msgid ""
12405
"Called by the bzr server when it stops serving a directory.\n"
12406
"server_stopped is called with the same parameters as the\n"
12407
"server_started hook: (backing_urls, public_url)."
12408
msgstr ""
12409
12410
#: en/help_topics/hooks.txt:478
12411
msgid ""
12412
"StatusHooks\n"
12413
"-----------"
12414
msgstr ""
12415
12416
#: en/help_topics/hooks.txt:481
12417
msgid ""
12418
"post_status\n"
12419
"~~~~~~~~~~~"
12420
msgstr ""
12421
12422
#: en/help_topics/hooks.txt:484 en/help_topics/hooks.txt:495
12423
msgid "Introduced in: 2.3"
12424
msgstr ""
12425
12426
#: en/help_topics/hooks.txt:486
12427
msgid ""
12428
"Called with argument StatusHookParams after Bazaar has displayed the\n"
12429
"status. StatusHookParams has the attributes (old_tree, new_tree,\n"
12430
"to_file, versioned, show_ids, short, verbose). The last four arguments\n"
12431
"correspond to the command line options specified by the user for the\n"
12432
"status command. to_file is the output stream for writing."
12433
msgstr ""
12434
12435
#: en/help_topics/hooks.txt:492
12436
msgid ""
12437
"pre_status\n"
12438
"~~~~~~~~~~"
12439
msgstr ""
12440
12441
#: en/help_topics/hooks.txt:497
12442
msgid ""
12443
"Called with argument StatusHookParams before Bazaar displays the\n"
12444
"status. StatusHookParams has the attributes (old_tree, new_tree,\n"
12445
"to_file, versioned, show_ids, short, verbose). The last four arguments\n"
12446
"correspond to the command line options specified by the user for the\n"
12447
"status command. to_file is the output stream for writing."
12448
msgstr ""
12449
12450
#: en/help_topics/hooks.txt:503
12451
msgid ""
12452
"TransportHooks\n"
12453
"--------------"
12454
msgstr ""
12455
12456
#: en/help_topics/hooks.txt:506
12457
msgid ""
12458
"post_connect\n"
12459
"~~~~~~~~~~~~"
12460
msgstr ""
12461
12462
#: en/help_topics/hooks.txt:511
12463
msgid ""
12464
"Called after a new connection is established or a reconnect occurs.\n"
12465
"The sole argument passed is either the connected transport or smart\n"
12466
"medium instance."
12467
msgstr ""
12468
12469
#: en/help_topics/hooks.txt:515
12470
msgid ""
12471
"RioVersionInfoBuilderHooks\n"
12472
"--------------------------"
12473
msgstr ""
12474
12475
#: en/help_topics/hooks.txt:518
12476
msgid ""
12477
"revision\n"
12478
"~~~~~~~~"
12479
msgstr ""
12480
12481
#: en/help_topics/hooks.txt:523
12482
msgid ""
12483
"Invoked when adding information about a revision to the RIO stanza\n"
12484
"that is printed. revision is called with a revision object and a RIO\n"
12485
"stanza.\n"
12486
msgstr ""
12487
12488
#: en/help_topics/location-alias.txt:1
12489
msgid ""
12490
"Location aliases\n"
12491
"================"
12492
msgstr ""
12493
12494
#: en/help_topics/location-alias.txt:4
12495
msgid ""
12496
"Bazaar defines several aliases for locations associated with a branch. "
12497
"These\n"
12498
"can be used with most commands that expect a location, such as `bzr push`."
12499
msgstr ""
12500
12501
#: en/help_topics/location-alias.txt:7
12502
msgid "The aliases are::"
12503
msgstr ""
12504
12505
#: en/help_topics/location-alias.txt:9
12506
msgid ""
12507
" :bound The branch this branch is bound to, for bound branches.\n"
12508
" :parent The parent of this branch.\n"
12509
" :public The public location of this branch.\n"
12510
" :push The saved location used for `bzr push` with no arguments.\n"
12511
" :submit The submit branch for this branch.\n"
12512
" :this This branch."
12513
msgstr ""
12514
12515
#: en/help_topics/location-alias.txt:16
12516
msgid "For example, to push to the parent location::"
12517
msgstr ""
12518
12519
#: en/help_topics/location-alias.txt:18
12520
msgid " bzr push :parent\n"
12521
msgstr ""
12522
12523
#: en/help_topics/log-formats.txt:1
12524
msgid ""
12525
"Log Formats\n"
12526
"==========="
12527
msgstr ""
12528
12529
#: en/help_topics/log-formats.txt:4
12530
msgid ""
12531
"A log format controls how information about each revision is displayed.\n"
12532
"The standard log formats are compared below::"
12533
msgstr ""
12534
12535
#: en/help_topics/log-formats.txt:7
12536
msgid ""
12537
" Feature long short line\n"
12538
" ---------------------- ------------- ------------ -------------------\n"
12539
" design goal detailed view concise view 1 revision per line\n"
12540
" committer name+email name only name only\n"
12541
" author name+email - -\n"
12542
" date-time format full date only date only\n"
12543
" commit message full full top line\n"
12544
" tags yes yes yes\n"
12545
" merges indicator - yes -\n"
12546
" status/delta optional optional -\n"
12547
" diff/patch optional optional -\n"
12548
" revision-id optional optional -\n"
12549
" branch nick yes - -\n"
12550
" foreign vcs properties yes yes -\n"
12551
" preferred levels all 1 1\n"
12552
" digital signature optional - -"
12553
msgstr ""
12554
12555
#: en/help_topics/log-formats.txt:24
12556
msgid ""
12557
"The default format is ``long``. To change this, define the ``log_format``\n"
12558
"setting in the ``[DEFAULT]`` section of ``bazaar.conf`` like this (say)::"
12559
msgstr ""
12560
12561
#: en/help_topics/log-formats.txt:27
12562
msgid ""
12563
" [DEFAULT]\n"
12564
" log_format = short"
12565
msgstr ""
12566
12567
#: en/help_topics/log-formats.txt:30
12568
msgid ""
12569
"Alternatively, to change the log format used for a given query, use the\n"
12570
"--long, --short or --line options."
12571
msgstr ""
12572
12573
#: en/help_topics/log-formats.txt:33
12574
msgid ""
12575
"If one of the standard log formats does not meet your needs, additional\n"
12576
"formats can be provided by plugins.\n"
12577
msgstr ""
12578
12579
#: en/help_topics/other-formats.txt:1
12580
msgid "Other Storage Formats"
12581
msgstr ""
12582
12583
#: en/help_topics/other-formats.txt:3
12584
msgid "Experimental formats are shown below."
12585
msgstr ""
12586
12587
#: en/help_topics/other-formats.txt:5
12588
msgid ""
12589
":development-colo:\n"
12590
" (native) The 2a format with experimental support for colocated\n"
12591
" branches."
12592
msgstr ""
12593
12594
#: en/help_topics/other-formats.txt:9
12595
msgid ""
12596
"\n"
12597
"Deprecated formats are shown below."
12598
msgstr ""
12599
12600
#: en/help_topics/other-formats.txt:12
12601
msgid ""
12602
":pack-0.92:\n"
12603
" (native) Pack-based format used in 1.x series. Introduced in 0.92.\n"
12604
" Interoperates with bzr repositories before 0.92 but cannot be read\n"
12605
" by bzr < 0.92."
12606
msgstr ""
12607
12608
#: en/help_topics/patterns.txt:1
12609
msgid ""
12610
"Patterns\n"
12611
"========"
12612
msgstr ""
12613
12614
#: en/help_topics/patterns.txt:4
12615
msgid ""
12616
"Bazaar uses patterns to match files at various times. For example,\n"
12617
"the ``add`` command skips over files that match ignore patterns\n"
12618
"and preferences can be associated with files using rule patterns.\n"
12619
"The pattern syntax is described below."
12620
msgstr ""
12621
12622
#: en/help_topics/patterns.txt:9
12623
msgid ""
12624
"Trailing slashes on patterns are ignored. If the pattern contains a\n"
12625
"slash or is a regular expression, it is compared to the whole path\n"
12626
"from the branch root. Otherwise, it is compared to only the last\n"
12627
"component of the path. To match a file only in the root directory,\n"
12628
"prepend ``./``. Patterns specifying absolute paths are not allowed."
12629
msgstr ""
12630
12631
#: en/help_topics/patterns.txt:15
12632
msgid "Patterns may include globbing wildcards such as::"
12633
msgstr ""
12634
12635
#: en/help_topics/patterns.txt:17
12636
msgid ""
12637
" ? - Matches any single character except '/'\n"
12638
" * - Matches 0 or more characters except '/'\n"
12639
" /**/ - Matches 0 or more directories in a path\n"
12640
" [a-z] - Matches a single character from within a group of characters"
12641
msgstr ""
12642
12643
#: en/help_topics/patterns.txt:22
12644
msgid ""
12645
"Patterns may also be `Python regular expressions`_. Regular expression\n"
12646
"patterns are identified by a ``RE:`` prefix followed by the regular\n"
12647
"expression. Regular expression patterns may not include named or\n"
12648
"numbered groups."
12649
msgstr ""
12650
12651
#: en/help_topics/patterns.txt:27
12652
msgid ""
12653
"Case insensitive ignore patterns can be specified with regular expressions\n"
12654
"by using the ``i`` (for ignore case) flag in the pattern."
12655
msgstr ""
12656
12657
#: en/help_topics/patterns.txt:30
12658
msgid ""
12659
"For example, a case insensitive match for ``foo`` may be specified as::"
12660
msgstr ""
12661
12662
#: en/help_topics/patterns.txt:32
12663
msgid " RE:(?i)foo"
12664
msgstr ""
12665
12666
#: en/help_topics/patterns.txt:34
12667
msgid ""
12668
"Ignore patterns may be prefixed with ``!``, which means that a filename\n"
12669
"matched by that pattern will not be ignored."
12670
msgstr ""
12671
12672
#: en/help_topics/patterns.txt:37
12673
msgid ""
12674
".. _Python regular expressions: http://docs.python.org/library/re.html"
12675
msgstr ""
12676
12677
#: en/help_topics/revisionspec.txt:1
12678
msgid "Revision Identifiers"
12679
msgstr ""
12680
12681
#: en/help_topics/revisionspec.txt:3
12682
msgid ""
12683
"A revision identifier refers to a specific state of a branch's history. It\n"
12684
"can be expressed in several ways. It can begin with a keyword to\n"
12685
"unambiguously specify a given lookup type; some examples are 'last:1',\n"
12686
"'before:yesterday' and 'submit:'."
12687
msgstr ""
12688
12689
#: en/help_topics/revisionspec.txt:8
12690
msgid ""
12691
"Alternately, it can be given without a keyword, in which case it will be\n"
12692
"checked as a revision number, a tag, a revision id, a date specification, or "
12693
"a\n"
12694
"branch specification, in that order. For example, 'date:today' could be\n"
12695
"written as simply 'today', though if you have a tag called 'today' that "
12696
"will\n"
12697
"be found first."
12698
msgstr ""
12699
12700
#: en/help_topics/revisionspec.txt:14
12701
msgid ""
12702
"If 'REV1' and 'REV2' are revision identifiers, then 'REV1..REV2' denotes a\n"
12703
"revision range. Examples: '3647..3649', 'date:yesterday..-1' and\n"
12704
"'branch:/path/to/branch1/..branch:/branch2' (note that there are no quotes "
12705
"or\n"
12706
"spaces around the '..')."
12707
msgstr ""
12708
12709
#: en/help_topics/revisionspec.txt:19
12710
msgid ""
12711
"Ranges are interpreted differently by different commands. To the \"log\" "
12712
"command,\n"
12713
"a range is a sequence of log messages, but to the \"diff\" command, the "
12714
"range\n"
12715
"denotes a change between revisions (and not a sequence of changes). In\n"
12716
"addition, \"log\" considers a closed range whereas \"diff\" and \"merge\" "
12717
"consider it\n"
12718
"to be open-ended, that is, they include one end but not the other. For "
12719
"example:\n"
12720
"\"bzr log -r 3647..3649\" shows the messages of revisions 3647, 3648 and "
12721
"3649,\n"
12722
"while \"bzr diff -r 3647..3649\" includes the changes done in revisions 3648 "
12723
"and\n"
12724
"3649, but not 3647."
12725
msgstr ""
12726
12727
#: en/help_topics/revisionspec.txt:28
12728
msgid "The keywords used as revision selection methods are the following:"
12729
msgstr ""
12730
12731
#: en/help_topics/revisionspec.txt:30
12732
msgid ""
12733
":revid:\n"
12734
"\tSelects a revision using the revision id.\n"
12735
":submit:\n"
12736
"\tSelects a common ancestor with the submit branch.\n"
12737
":ancestor:\n"
12738
"\tSelects a common ancestor with a second branch.\n"
12739
":date:\n"
12740
"\tSelects a revision on the basis of a datestamp.\n"
12741
":branch:\n"
12742
"\tSelects the last revision of a specified branch.\n"
12743
":tag:\n"
12744
"\tSelects a revision identified by a tag name.\n"
12745
":revno:\n"
12746
"\tSelects a revision using a number.\n"
12747
":before:\n"
12748
"\tSelects the parent of the revision specified.\n"
12749
":annotate:\n"
12750
"\tSelect the revision that last modified the specified line.\n"
12751
":mainline:\n"
12752
"\tSelect mainline revision that merged the specified revision.\n"
12753
":last:\n"
12754
"\tSelects the nth revision from the end."
12755
msgstr ""
12756
12757
#: en/help_topics/revisionspec.txt:53
12758
msgid "In addition, plugins can provide other keywords."
12759
msgstr ""
12760
12761
#: en/help_topics/revisionspec.txt:55
12762
msgid "A detailed description of each keyword is given below."
12763
msgstr ""
12764
12765
#: en/help_topics/revisionspec.txt:57
12766
msgid ":revid:"
12767
msgstr ""
12768
12769
#: en/help_topics/revisionspec.txt:59
12770
msgid ""
12771
" Supply a specific revision id, that can be used to specify any\n"
12772
" revision id in the ancestry of the branch.\n"
12773
" Including merges, and pending merges.\n"
12774
" Examples::"
12775
msgstr ""
12776
12777
#: en/help_topics/revisionspec.txt:64
12778
msgid ""
12779
" revid:aaaa@bbbb-123456789 -> Select revision 'aaaa@bbbb-123456789'"
12780
msgstr ""
12781
12782
#: en/help_topics/revisionspec.txt:66
12783
msgid ":submit:"
12784
msgstr ""
12785
12786
#: en/help_topics/revisionspec.txt:68
12787
msgid ""
12788
" Diffing against this shows all the changes that were made in this "
12789
"branch,\n"
12790
" and is a good predictor of what merge will do. The submit branch is\n"
12791
" used by the bundle and merge directive commands. If no submit branch\n"
12792
" is specified, the parent branch is used instead."
12793
msgstr ""
12794
12795
#: en/help_topics/revisionspec.txt:73 en/help_topics/revisionspec.txt:85
12796
msgid ""
12797
" The common ancestor is the last revision that existed in both\n"
12798
" branches. Usually this is the branch point, but it could also be\n"
12799
" a revision that was merged."
12800
msgstr ""
12801
12802
#: en/help_topics/revisionspec.txt:77 en/help_topics/revisionspec.txt:93
12803
#: en/help_topics/revisionspec.txt:109 en/help_topics/revisionspec.txt:119
12804
#: en/help_topics/revisionspec.txt:153
12805
msgid " Examples::"
12806
msgstr ""
12807
12808
#: en/help_topics/revisionspec.txt:79
12809
msgid " $ bzr diff -r submit:"
12810
msgstr ""
12811
12812
#: en/help_topics/revisionspec.txt:81
12813
msgid ":ancestor:"
12814
msgstr ""
12815
12816
#: en/help_topics/revisionspec.txt:83
12817
msgid " Supply the path to a branch to select the common ancestor."
12818
msgstr ""
12819
12820
#: en/help_topics/revisionspec.txt:89
12821
msgid ""
12822
" This is frequently used with 'diff' to return all of the changes\n"
12823
" that your branch introduces, while excluding the changes that you\n"
12824
" have not merged from the remote branch."
12825
msgstr ""
12826
12827
#: en/help_topics/revisionspec.txt:95
12828
msgid ""
12829
" ancestor:/path/to/branch\n"
12830
" $ bzr diff -r ancestor:../../mainline/branch"
12831
msgstr ""
12832
12833
#: en/help_topics/revisionspec.txt:98
12834
msgid ":date:"
12835
msgstr ""
12836
12837
#: en/help_topics/revisionspec.txt:100
12838
msgid ""
12839
" Supply a datestamp to select the first revision that matches the date.\n"
12840
" Date can be 'yesterday', 'today', 'tomorrow' or a YYYY-MM-DD string.\n"
12841
" Matches the first entry after a given date (either at midnight or\n"
12842
" at a specified time)."
12843
msgstr ""
12844
12845
#: en/help_topics/revisionspec.txt:105
12846
msgid " One way to display all the changes since yesterday would be::"
12847
msgstr ""
12848
12849
#: en/help_topics/revisionspec.txt:107
12850
msgid " bzr log -r date:yesterday.."
12851
msgstr ""
12852
12853
#: en/help_topics/revisionspec.txt:111
12854
msgid ""
12855
" date:yesterday -> select the first revision since "
12856
"yesterday\n"
12857
" date:2006-08-14,17:10:14 -> select the first revision after\n"
12858
" August 14th, 2006 at 5:10pm."
12859
msgstr ""
12860
12861
#: en/help_topics/revisionspec.txt:115
12862
msgid ":branch:"
12863
msgstr ""
12864
12865
#: en/help_topics/revisionspec.txt:117
12866
msgid " Supply the path to a branch to select its last revision."
12867
msgstr ""
12868
12869
#: en/help_topics/revisionspec.txt:121
12870
msgid " branch:/path/to/branch"
12871
msgstr ""
12872
12873
#: en/help_topics/revisionspec.txt:123
12874
msgid ":tag:"
12875
msgstr ""
12876
12877
#: en/help_topics/revisionspec.txt:125
12878
msgid " Tags are stored in the branch and created by the 'tag' command."
12879
msgstr ""
12880
12881
#: en/help_topics/revisionspec.txt:127
12882
msgid ":revno:"
12883
msgstr ""
12884
12885
#: en/help_topics/revisionspec.txt:129
12886
msgid ""
12887
" Use an integer to specify a revision in the history of the branch.\n"
12888
" Optionally a branch can be specified. A negative number will count\n"
12889
" from the end of the branch (-1 is the last revision, -2 the previous\n"
12890
" one). If the negative number is larger than the branch's history, the\n"
12891
" first revision is returned.\n"
12892
" Examples::"
12893
msgstr ""
12894
12895
#: en/help_topics/revisionspec.txt:136
12896
msgid ""
12897
" revno:1 -> return the first revision of this branch\n"
12898
" revno:3:/path/to/branch -> return the 3rd revision of\n"
12899
" the branch '/path/to/branch'\n"
12900
" revno:-1 -> The last revision in a branch.\n"
12901
" -2:http://other/branch -> The second to last revision in the\n"
12902
" remote branch.\n"
12903
" -1000000 -> Most likely the first revision, unless\n"
12904
" your history is very long."
12905
msgstr ""
12906
12907
#: en/help_topics/revisionspec.txt:145
12908
msgid ":before:"
12909
msgstr ""
12910
12911
#: en/help_topics/revisionspec.txt:147
12912
msgid ""
12913
" Supply any revision spec to return the parent of that revision. This "
12914
"is\n"
12915
" mostly useful when inspecting revisions that are not in the revision "
12916
"history\n"
12917
" of a branch."
12918
msgstr ""
12919
12920
#: en/help_topics/revisionspec.txt:151
12921
msgid ""
12922
" It is an error to request the parent of the null revision (before:0)."
12923
msgstr ""
12924
12925
#: en/help_topics/revisionspec.txt:155
12926
msgid ""
12927
" before:1913 -> Return the parent of revno 1913 (revno 1912)\n"
12928
" before:revid:aaaa@bbbb-1234567890 -> return the parent of revision\n"
12929
" aaaa@bbbb-1234567890\n"
12930
" bzr diff -r before:1913..1913\n"
12931
" -> Find the changes between revision 1913 and its parent "
12932
"(1912).\n"
12933
" (What changes did revision 1913 introduce).\n"
12934
" This is equivalent to: bzr diff -c 1913"
12935
msgstr ""
12936
12937
#: en/help_topics/revisionspec.txt:163
12938
msgid ":annotate:"
12939
msgstr ""
12940
12941
#: en/help_topics/revisionspec.txt:165
12942
msgid ""
12943
" Select the revision that last modified the specified line. Line is\n"
12944
" specified as path:number. Path is a relative path to the file. "
12945
"Numbers\n"
12946
" start at 1, and are relative to the current version, not the last-\n"
12947
" committed version of the file."
12948
msgstr ""
12949
12950
#: en/help_topics/revisionspec.txt:170
12951
msgid ":mainline:"
12952
msgstr ""
12953
12954
#: en/help_topics/revisionspec.txt:172
12955
msgid ""
12956
" Select the revision that merged the specified revision into mainline."
12957
msgstr ""
12958
12959
#: en/help_topics/revisionspec.txt:174
12960
msgid ":last:"
12961
msgstr ""
12962
12963
#: en/help_topics/revisionspec.txt:176
12964
msgid ""
12965
" Supply a positive number to get the nth revision from the end.\n"
12966
" This is the same as supplying negative numbers to the 'revno:' spec.\n"
12967
" Examples::"
12968
msgstr ""
12969
12970
#: en/help_topics/revisionspec.txt:180
12971
msgid ""
12972
" last:1 -> return the last revision\n"
12973
" last:3 -> return the revision 2 before the end.\n"
12974
msgstr ""
12975
12976
#: en/help_topics/rules.txt:1
12977
msgid ""
12978
"Rules\n"
12979
"====="
12980
msgstr ""
12981
12982
#: en/help_topics/rules.txt:7
12983
msgid ""
12984
"Rules are defined in ini file format where the sections are file glob\n"
12985
"patterns and the contents of each section are the preferences for files\n"
12986
"matching that pattern(s). For example::"
12987
msgstr ""
12988
12989
#: en/help_topics/rules.txt:11
12990
msgid ""
12991
" [name *.bat]\n"
12992
" eol = native"
12993
msgstr ""
12994
12995
#: en/help_topics/rules.txt:14
12996
msgid ""
12997
" [name *.html *.xml]\n"
12998
" keywords = xml_escape"
12999
msgstr ""
13000
13001
#: en/help_topics/rules.txt:17
13002
msgid ""
13003
"Preferences like these are useful for commands and plugins wishing to\n"
13004
"provide custom behaviour for selected files. For more information on \n"
13005
"end of line conversion see :doc:`eol-help`.\n"
13006
"Keyword support is provided by the `keywords plugin\n"
13007
"<http://doc.bazaar.canonical.com/plugins/en/keywords-plugin.html>`_."
13008
msgstr ""
13009
13010
#: en/help_topics/rules.txt:23
13011
msgid ""
13012
"Files\n"
13013
"-----"
13014
msgstr ""
13015
13016
#: en/help_topics/rules.txt:26
13017
msgid ""
13018
"Default rules for all branches are defined in the optional file\n"
13019
"``BZR_HOME/rules``. "
13020
msgstr ""
13021
13022
#: en/help_topics/rules.txt:29
13023
msgid ""
13024
"Rule Patterns\n"
13025
"-------------"
13026
msgstr ""
13027
13028
#: en/help_topics/rules.txt:32
13029
msgid ""
13030
"Patterns are ordered and searching stops as soon as one matches.\n"
13031
"As a consequence, more explicit patterns should be placed towards\n"
13032
"the top of the file. Rule patterns use exactly the same conventions\n"
13033
"as ignore patterns. See :doc:`patterns-help` for details."
13034
msgstr ""
13035
13036
#: en/help_topics/rules.txt:37
13037
msgid ".. note::"
13038
msgstr ""
13039
13040
#: en/help_topics/rules.txt:39
13041
msgid ""
13042
" Patterns containing square brackets or spaces should be\n"
13043
" surrounded in quotes to ensure they are correctly parsed.\n"
13044
msgstr ""
13045
13046
#: en/help_topics/topics.txt:1
13047
msgid ""
13048
"authentication Information on configuring authentication\n"
13049
"basic Basic commands\n"
13050
"branches Information on what a branch is\n"
13051
"bugs Bug tracker settings\n"
13052
"checkouts Information on what a checkout is\n"
13053
"commands Basic help for all commands\n"
13054
"configuration Details on the configuration settings available\n"
13055
"conflict-types Types of conflicts and what to do about them\n"
13056
"content-filters Conversion of content into/from working trees\n"
13057
"criss-cross Information on criss-cross merging\n"
13058
"current-formats Current storage formats\n"
13059
"debug-flags Options to show or record debug information\n"
13060
"diverged-branches How to fix diverged branches\n"
13061
"env-variables Environment variable names and values\n"
13062
"eol Information on end-of-line handling\n"
13063
"files Information on configuration and log files\n"
13064
"formats Information on choosing a storage format\n"
13065
"global-options Options that control how Bazaar runs\n"
13066
"hidden-commands All hidden commands\n"
13067
"hooks Points at which custom processing can be added\n"
13068
"launchpad Using Bazaar with Launchpad.net\n"
13069
"location-alias Aliases for remembered locations\n"
13070
"log-formats Details on the logging formats available\n"
13071
"other-formats Experimental and deprecated storage formats\n"
13072
"patterns Information on the pattern syntax\n"
13073
"repositories Basic information on shared repositories.\n"
13074
"revisionspec Explain how to use --revision\n"
13075
"rules Information on defining rule-based preferences\n"
13076
"standalone-trees Information on what a standalone tree is\n"
13077
"standard-options Options that can be used with any command\n"
13078
"status-flags Help on status flags\n"
13079
"sync-for-reconfigure Steps to resolve \"out-of-sync\" when reconfiguring\n"
13080
"topics Topics list\n"
13081
"url-special-chars Special character handling in URLs\n"
13082
"urlspec Supported transport protocols\n"
13083
"working-trees Information on working trees\n"
13084
msgstr ""
13085
13086
#: en/help_topics/url-special-chars.txt:1
13087
msgid ""
13088
"Special character handling in URLs\n"
13089
"=================================="
13090
msgstr ""
13091
13092
#: en/help_topics/url-special-chars.txt:4
13093
msgid "Bazaar allows locations to be specified in multiple ways, either:"
13094
msgstr ""
13095
13096
#: en/help_topics/url-special-chars.txt:6
13097
msgid " * Fully qualified URLs"
13098
msgstr ""
13099
13100
#: en/help_topics/url-special-chars.txt:8
13101
msgid " * File system paths, relative or absolute"
13102
msgstr ""
13103
13104
#: en/help_topics/url-special-chars.txt:10
13105
msgid ""
13106
"Internally bzr treats all locations as URLs. For any file system paths\n"
13107
"that are specified it will automatically determine the appropriate URL\n"
13108
"representation, and escape special characters where necessary."
13109
msgstr ""
13110
13111
#: en/help_topics/url-special-chars.txt:14
13112
msgid ""
13113
"There are a few characters which have special meaning in URLs and need "
13114
"careful\n"
13115
"handling to avoid ambiguities. Characters can be escaped with a % and a hex\n"
13116
"value in URLs. Any non-ASCII characters in a file path will automatically "
13117
"be\n"
13118
"urlencoded when the path is converted to a URL."
13119
msgstr ""
13120
13121
#: en/help_topics/url-special-chars.txt:19
13122
msgid ""
13123
"URLs represent non-ASCII characters in an encoding defined by the server, "
13124
"but\n"
13125
"usually UTF-8. The % escapes should be of the UTF-8 bytes. Bazaar tries to "
13126
"be\n"
13127
"generous in what it accepts as a URL and to print them in a way that\n"
13128
"will be readable."
13129
msgstr ""
13130
13131
#: en/help_topics/url-special-chars.txt:24
13132
msgid ""
13133
"For example, if you have a directory named '/tmp/%2False' these are all "
13134
"valid\n"
13135
"ways of accessing the content (0x2F, or 47, is the ASCII code for forward "
13136
"slash)::"
13137
msgstr ""
13138
13139
#: en/help_topics/url-special-chars.txt:27
13140
msgid ""
13141
" cd /tmp\n"
13142
" bzr log /tmp/%2False\n"
13143
" bzr log %2False\n"
13144
" bzr log file:///tmp/%252False\n"
13145
" bzr log file://localhost/tmp/%252False\n"
13146
" bzr log file:%252False"
13147
msgstr ""
13148
13149
#: en/help_topics/url-special-chars.txt:34
13150
msgid "These are valid but do not refer to the same file::"
13151
msgstr ""
13152
13153
#: en/help_topics/url-special-chars.txt:36
13154
msgid ""
13155
" bzr log file:///tmp/%2False (refers to a file called /tmp/\\/alse)\n"
13156
" bzr log %252False (refers to a file called /tmp/%252False)"
13157
msgstr ""
13158
13159
#: en/help_topics/url-special-chars.txt:39
13160
msgid ""
13161
"Comma also has special meaning in URLs, because it denotes `segment "
13162
"parameters`_"
13163
msgstr ""
13164
13165
#: en/help_topics/url-special-chars.txt:41
13166
msgid ""
13167
"_`segment parameters`: http://www.ietf.org/rfc/rfc3986.txt (section 3.3)"
13168
msgstr ""
13169
13170
#: en/help_topics/url-special-chars.txt:43
13171
msgid ""
13172
"Comma is also special in any file system paths that are specified. To use a "
13173
"literal\n"
13174
"comma in a file system path, specify a URL and URL encode the comma::"
13175
msgstr ""
13176
13177
#: en/help_topics/url-special-chars.txt:46
13178
msgid ""
13179
" bzr log foo,branch=bla # path \"foo\" with the segment parameter "
13180
"\"branch\" set to \"bla\"\n"
13181
" bzr log file:foo%2Cbranch=bla # path \"foo,branch=bla\"\n"
13182
" bzr log file:foo,branch=bla # path \"foo\" with segment parameter "
13183
"\"branch\" set to \"bla\"\n"
13184
msgstr ""
13185
13186
#: en/help_topics/urlspec.txt:1
13187
msgid "URL Identifiers"
13188
msgstr ""
13189
13190
#: en/help_topics/urlspec.txt:3
13191
msgid "Supported URL prefixes::"
13192
msgstr ""
13193
13194
#: en/help_topics/urlspec.txt:5
13195
msgid ""
13196
" aftp:// Access using active FTP.\n"
13197
" bzr:// Fast access using the Bazaar smart server.\n"
13198
" bzr+ssh:// Fast access using the Bazaar smart server over SSH.\n"
13199
" file:// Access using the standard filesystem (default)\n"
13200
" ftp:// Access using passive FTP.\n"
13201
" http:// Read-only access of branches exported on the web.\n"
13202
" https:// Read-only access of branches exported on the web using "
13203
"SSL.\n"
13204
" sftp:// Access using SFTP (most SSH servers provide SFTP)."
13205
msgstr ""
13206
13207
#: en/help_topics/urlspec.txt:14
13208
msgid "Supported modifiers::"
13209
msgstr ""
13210
13211
#: en/help_topics/urlspec.txt:16
13212
msgid " gio+ Access using any GIO supported protocols."
13213
msgstr ""
13214
13215
#: en/help_topics/urlspec.txt:18
13216
msgid "Bazaar supports all of the standard parts within the URL::"
13217
msgstr ""
13218
13219
#: en/help_topics/urlspec.txt:20
13220
msgid " <protocol>://[user[:password]@]host[:port]/[path]"
13221
msgstr ""
13222
13223
#: en/help_topics/urlspec.txt:22
13224
msgid "allowing URLs such as::"
13225
msgstr ""
13226
13227
#: en/help_topics/urlspec.txt:24
13228
msgid " http://bzruser:BadPass@bzr.example.com:8080/bzr/trunk"
13229
msgstr ""
13230
13231
#: en/help_topics/urlspec.txt:26
13232
msgid ""
13233
"For bzr+ssh:// and sftp:// URLs, Bazaar also supports paths that begin\n"
13234
"with '~' as meaning that the rest of the path should be interpreted\n"
13235
"relative to the remote user's home directory. For example if the user\n"
13236
"``remote`` has a home directory of ``/home/remote`` on the server\n"
13237
"shell.example.com, then::"
13238
msgstr ""
13239
13240
#: en/help_topics/urlspec.txt:32
13241
msgid " bzr+ssh://remote@shell.example.com/~/myproject/trunk"
13242
msgstr ""
13243
13244
#: en/help_topics/urlspec.txt:34
13245
msgid "would refer to ``/home/remote/myproject/trunk``."
13246
msgstr ""
13247
13248
#: en/help_topics/urlspec.txt:36
13249
msgid ""
13250
"Many commands that accept URLs also accept location aliases too.\n"
13251
"See :doc:`location-alias-help` and :doc:`url-special-chars-help`.\n"
13252
msgstr ""
Loggerhead is a web-based interface for Breezy
Version: 2.0.1