« back to all changes in this revision
Viewing changes to po/cs.po
- browse files at revision 6525
- compare with another revision
- compare with revision 6437.2.19
- download diff
- download tarball
- view history from revision 6525
- Committer: Patch Queue Manager
- Date: 2012-06-18 12:59:19 UTC
- mfrom: (6524.1.1 bzr.dev)
- Revision ID: pqm@pqm.ubuntu.com-20120618125919-jf2dy5p1apoljtan
(jelmer) Merge 2.5. (Jelmer Vernooij)
- files added:
- po/cs.po
- files modified:
- bzrlib/i18n.py
added
removed
po/cs.po
1
# Czech translation for bzr
2
# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
3
# This file is distributed under the same license as the bzr package.
4
# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
5
#
6
msgid ""
7
msgstr ""
8
"Project-Id-Version: bzr\n"
9
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
10
"POT-Creation-Date: 2012-02-02 17:39+0100\n"
11
"PO-Revision-Date: 2012-03-01 20:48+0000\n"
12
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
13
"Language-Team: Czech <cs@li.org>\n"
14
"MIME-Version: 1.0\n"
15
"Content-Type: text/plain; charset=UTF-8\n"
16
"Content-Transfer-Encoding: 8bit\n"
17
"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
18
"X-Launchpad-Export-Date: 2012-03-02 05:19+0000\n"
19
"X-Generator: Launchpad (build 14886)\n"
20
21
#: bzrlib/add.py:95
22
msgid "skipping {0} (larger than {1} of {2} bytes)"
23
msgstr "přeskakování {0} (větší než {1} z {2} bajtů)"
24
25
#: bzrlib/branch.py:872
26
msgid "Unstacking"
27
msgstr "Odstraňování ze zásobníku"
28
29
#: bzrlib/branch.py:3205
30
#, python-format
31
msgid "Pushed up to revision %d."
32
msgstr "Odesláno až na revizi %d"
33
34
#: bzrlib/branch.py:3207
35
#, python-format
36
msgid "%d tag updated."
37
msgid_plural "%d tags updated."
38
msgstr[0] "%d značka aktualizována"
39
msgstr[1] "%d značky aktualizovány"
40
msgstr[2] "%d značek aktualizováno"
41
42
#: bzrlib/branch.py:3210
43
msgid "No new revisions or tags to push."
44
msgstr "Žádné nové revize nebo značky k odeslání."
45
46
#: bzrlib/branch.py:3212
47
msgid "No new revisions to push."
48
msgstr "Žádné nové revize k odeslání."
49
50
#: bzrlib/branch.py:3232
51
msgid "checked branch {0} format {1}"
52
msgstr "zkontrolována větev {0} formát {1}"
53
54
#: bzrlib/branch.py:3235
55
#, python-format
56
msgid "found error:%s"
57
msgstr "nalezena chyba:%s"
58
59
#: bzrlib/builtins.py:209 bzrlib/builtins.py:3016 bzrlib/workingtree.py:315
60
#, python-format
61
msgid "Ignoring files outside view. View is %s"
62
msgstr "Ignorování souborů mimo zobrazení. Zobrazení je %s"
63
64
#: bzrlib/builtins.py:218
65
#, python-format
66
msgid "bzr %s --revision takes exactly one revision identifier"
67
msgstr "bzr %s --revision přijímá právě jeden identifikátor revize"
68
69
#: bzrlib/builtins.py:303
70
msgid "Display status summary."
71
msgstr "Zobrazit souhrn stavů."
72
73
#: bzrlib/builtins.py:305
74
msgid ""
75
"This reports on versioned and unknown files, reporting them\n"
76
"grouped by state. Possible states are:"
77
msgstr ""
78
"Toto zaznamenává neznámé soubory a soubory s verzí, nahlašuje je\n"
79
"seřazené podle stavu. Možné stavy jsou:"
80
81
#: bzrlib/builtins.py:308
82
msgid ""
83
"added\n"
84
" Versioned in the working copy but not in the previous revision."
85
msgstr ""
86
"přidáno\n"
87
" S verzí v pracovní kopii ale ne v předchozí revizi."
88
89
#: bzrlib/builtins.py:311
90
msgid ""
91
"removed\n"
92
" Versioned in the previous revision but removed or deleted\n"
93
" in the working copy."
94
msgstr ""
95
"odstraněno\n"
96
" S verzí v předchozí revizi ale odstraněno nebo smazáno\n"
97
" v pracovní kopii."
98
99
#: bzrlib/builtins.py:315
100
msgid ""
101
"renamed\n"
102
" Path of this file changed from the previous revision;\n"
103
" the text may also have changed. This includes files whose\n"
104
" parent directory was renamed."
105
msgstr ""
106
"přejmenováno\n"
107
" Cesta tohoto souboru byla od předchozí revize změněna;\n"
108
" text se také mohl změnit. To zahrnuje soubory, jejichž\n"
109
" nadřazená složka byla přejmenována."
110
111
#: bzrlib/builtins.py:320
112
msgid ""
113
"modified\n"
114
" Text has changed since the previous revision."
115
msgstr ""
116
"změněno\n"
117
" Text se od předchozí revize změnil."
118
119
#: bzrlib/builtins.py:323
120
msgid ""
121
"kind changed\n"
122
" File kind has been changed (e.g. from file to directory)."
123
msgstr ""
124
"druh se změnil\n"
125
" Druh souboru byl změněn (např. ze souboru na složku)."
126
127
#: bzrlib/builtins.py:326
128
msgid ""
129
"unknown\n"
130
" Not versioned and not matching an ignore pattern."
131
msgstr ""
132
"neznámé\n"
133
" Bez verze a neshoduje se se vzorcem ignorování."
134
135
#: bzrlib/builtins.py:329
136
msgid ""
137
"Additionally for directories, symlinks and files with a changed\n"
138
"executable bit, Bazaar indicates their type using a trailing\n"
139
"character: '/', '@' or '*' respectively. These decorations can be\n"
140
"disabled using the '--no-classify' option."
141
msgstr ""
142
"Dále Bazaar označuje typ pro adresáře, symbolické odkazy a\n"
143
"soubory se změněným bitem spuštění pomocí koncového\n"
144
"znaku: '/', '@' nebo '*' v tomto pořadí. Tato označení mohou\n"
145
"být zakázána pomocí možnosti '--no-classify'."
146
147
#: bzrlib/builtins.py:334
148
msgid ""
149
"To see ignored files use 'bzr ignored'. For details on the\n"
150
"changes to file texts, use 'bzr diff'."
151
msgstr ""
152
"Pro zobrazení ignorovaných souborů použijte 'bzr ignored'. Pro podrobnosti\n"
153
"o změnách provedených v textových souborech použijte 'bzr diff'."
154
155
#: bzrlib/builtins.py:337
156
msgid ""
157
"Note that --short or -S gives status flags for each item, similar\n"
158
"to Subversion's status command. To get output similar to svn -q,\n"
159
"use bzr status -SV."
160
msgstr ""
161
162
#: bzrlib/builtins.py:341
163
msgid ""
164
"If no arguments are specified, the status of the entire working\n"
165
"directory is shown. Otherwise, only the status of the specified\n"
166
"files or directories is reported. If a directory is given, status\n"
167
"is reported for everything inside that directory."
168
msgstr ""
169
170
#: bzrlib/builtins.py:346
171
msgid ""
172
"Before merges are committed, the pending merge tip revisions are\n"
173
"shown. To see all pending merge revisions, use the -v option.\n"
174
"To skip the display of pending merge information altogether, use\n"
175
"the no-pending option or specify a file/directory."
176
msgstr ""
177
178
#: bzrlib/builtins.py:351
179
msgid ""
180
"To compare the working directory to a specific revision, pass a\n"
181
"single revision to the revision argument."
182
msgstr ""
183
184
#: bzrlib/builtins.py:354
185
msgid ""
186
"To see which files have changed in a specific revision, or between\n"
187
"two revisions, pass a revision range to the revision argument.\n"
188
"This will produce the same results as calling 'bzr diff --summarize'."
189
msgstr ""
190
191
#: bzrlib/builtins.py:363
192
msgid "Use short status indicators."
193
msgstr ""
194
195
#: bzrlib/builtins.py:365
196
msgid "Only show versioned files."
197
msgstr ""
198
199
#: bzrlib/builtins.py:367
200
msgid "Don't show pending merges."
201
msgstr ""
202
203
#: bzrlib/builtins.py:370
204
msgid "Do not mark object type using indicator."
205
msgstr ""
206
207
#: bzrlib/builtins.py:385
208
msgid "bzr status --revision takes exactly one or two revision specifiers"
209
msgstr ""
210
211
#: bzrlib/builtins.py:429 bzrlib/builtins.py:5183
212
msgid "You can only supply one of revision_id or --revision"
213
msgstr ""
214
215
#: bzrlib/builtins.py:432 bzrlib/builtins.py:5185
216
msgid "You must supply either --revision or a revision_id"
217
msgstr ""
218
219
#: bzrlib/builtins.py:439
220
#, python-format
221
msgid "Repository %r does not support access to raw revision texts"
222
msgstr ""
223
224
#: bzrlib/builtins.py:450
225
msgid "The repository {0} contains no revision {1}."
226
msgstr ""
227
228
#: bzrlib/builtins.py:457
229
msgid "You cannot specify a NULL revision."
230
msgstr ""
231
232
#: bzrlib/builtins.py:549
233
msgid "Remove the working tree from a given branch/checkout."
234
msgstr ""
235
236
#: bzrlib/builtins.py:551
237
msgid ""
238
"Since a lightweight checkout is little more than a working tree\n"
239
"this will refuse to run against one."
240
msgstr ""
241
242
#: bzrlib/builtins.py:554
243
msgid "To re-create the working tree, use \"bzr checkout\"."
244
msgstr ""
245
246
#: bzrlib/builtins.py:560
247
msgid ""
248
"Remove the working tree even if it has uncommitted or shelved changes."
249
msgstr ""
250
251
#: bzrlib/builtins.py:574
252
msgid "No working tree to remove"
253
msgstr ""
254
255
#: bzrlib/builtins.py:576
256
msgid "You cannot remove the working tree of a remote path"
257
msgstr ""
258
259
#: bzrlib/builtins.py:585
260
msgid "You cannot remove the working tree from a lightweight checkout"
261
msgstr ""
262
263
#: bzrlib/builtins.py:625
264
msgid ""
265
"The tree does not appear to be corrupt. You probably want \"bzr revert\" "
266
"instead. Use \"--force\" if you are sure you want to reset the working tree."
267
msgstr ""
268
269
#: bzrlib/builtins.py:636
270
msgid ""
271
", the header appears corrupt, try passing -r -1 to set the state to the last "
272
"commit"
273
msgstr ""
274
275
#: bzrlib/builtins.py:640
276
msgid "failed to reset the tree state{0}"
277
msgstr ""
278
279
#: bzrlib/builtins.py:644
280
msgid "Show current revision number."
281
msgstr ""
282
283
#: bzrlib/builtins.py:646
284
msgid "This is equal to the number of revisions on this branch."
285
msgstr ""
286
287
#: bzrlib/builtins.py:659
288
msgid "--tree and --revision can not be used together"
289
msgstr ""
290
291
#: bzrlib/builtins.py:676 bzrlib/builtins.py:5967
292
msgid "Tags can only be placed on a single revision, not on a range"
293
msgstr ""
294
295
#: bzrlib/builtins.py:700
296
msgid "Show revno of working tree."
297
msgstr ""
298
299
#: bzrlib/builtins.py:748
300
msgid "Add specified files or directories."
301
msgstr ""
302
303
#: bzrlib/builtins.py:750
304
msgid ""
305
"In non-recursive mode, all the named items are added, regardless\n"
306
"of whether they were previously ignored. A warning is given if\n"
307
"any of the named files are already versioned."
308
msgstr ""
309
310
#: bzrlib/builtins.py:754
311
msgid ""
312
"In recursive mode (the default), files are treated the same way\n"
313
"but the behaviour for directories is different. Directories that\n"
314
"are already versioned do not give a warning. All directories,\n"
315
"whether already versioned or not, are searched for files or\n"
316
"subdirectories that are neither versioned or ignored, and these\n"
317
"are added. This search proceeds recursively into versioned\n"
318
"directories. If no names are given '.' is assumed."
319
msgstr ""
320
321
#: bzrlib/builtins.py:762
322
msgid ""
323
"A warning will be printed when nested trees are encountered,\n"
324
"unless they are explicitly ignored."
325
msgstr ""
326
327
#: bzrlib/builtins.py:765
328
msgid ""
329
"Therefore simply saying 'bzr add' will version all files that\n"
330
"are currently unknown."
331
msgstr ""
332
333
#: bzrlib/builtins.py:768
334
msgid ""
335
"Adding a file whose parent directory is not versioned will\n"
336
"implicitly add the parent, and so on up to the root. This means\n"
337
"you should never need to explicitly add a directory, they'll just\n"
338
"get added when you add a file in the directory."
339
msgstr ""
340
341
#: bzrlib/builtins.py:773
342
msgid ""
343
"--dry-run will show which files would be added, but not actually\n"
344
"add them."
345
msgstr ""
346
347
#: bzrlib/builtins.py:776
348
msgid ""
349
"--file-ids-from will try to use the file ids from the supplied path.\n"
350
"It looks up ids trying to find a matching parent directory with the\n"
351
"same filename, and then by pure path. This option is rarely needed\n"
352
"but can be useful when adding the same logical file into two\n"
353
"branches that will be merged later (without showing the two different\n"
354
"adds as a conflict). It is also useful when merging another project\n"
355
"into a subdirectory of this one."
356
msgstr ""
357
358
#: bzrlib/builtins.py:784
359
msgid ""
360
"Any files matching patterns in the ignore list will not be added\n"
361
"unless they are explicitly mentioned."
362
msgstr ""
363
364
#: bzrlib/builtins.py:787
365
msgid ""
366
"In recursive mode, files larger than the configuration option \n"
367
"add.maximum_file_size will be skipped. Named items are never skipped due\n"
368
"to file size."
369
msgstr ""
370
371
#: bzrlib/builtins.py:794
372
msgid "Don't recursively add the contents of directories."
373
msgstr ""
374
375
#: bzrlib/builtins.py:800
376
msgid "Lookup file ids from this tree."
377
msgstr ""
378
379
#: bzrlib/builtins.py:836
380
msgid "ignored {0} matching \"{1}\"\n"
381
msgstr ""
382
383
#: bzrlib/builtins.py:841
384
msgid "Create a new versioned directory."
385
msgstr ""
386
387
#: bzrlib/builtins.py:843
388
msgid "This is equivalent to creating the directory and then adding it."
389
msgstr ""
390
391
#: bzrlib/builtins.py:850
392
msgid "No error if existing, make parent directories as needed."
393
msgstr ""
394
395
#: bzrlib/builtins.py:884
396
#, python-format
397
msgid "added %s\n"
398
msgstr ""
399
400
#: bzrlib/builtins.py:926
401
#, python-format
402
msgid "invalid kind %r specified"
403
msgstr ""
404
405
#: bzrlib/builtins.py:963
406
msgid "Move or rename a file."
407
msgstr ""
408
409
#: bzrlib/builtins.py:965
410
msgid " bzr mv SOURCE... DESTINATION"
411
msgstr ""
412
413
#: bzrlib/builtins.py:967
414
msgid ""
415
"If the last argument is a versioned directory, all the other names\n"
416
"are moved into it. Otherwise, there must be exactly two arguments\n"
417
"and the file is changed to a new name."
418
msgstr ""
419
420
#: bzrlib/builtins.py:971
421
msgid ""
422
"If OLDNAME does not exist on the filesystem but is versioned and\n"
423
"NEWNAME does exist on the filesystem but is not versioned, mv\n"
424
"assumes that the file has been manually moved and only updates\n"
425
"its internal inventory to reflect that change.\n"
426
"The same is valid when moving many SOURCE files to a DESTINATION."
427
msgstr ""
428
429
#: bzrlib/builtins.py:977
430
msgid "Files cannot be moved between branches."
431
msgstr ""
432
433
#: bzrlib/builtins.py:984
434
msgid ""
435
"Move only the bzr identifier of the file, because the file has already been "
436
"moved."
437
msgstr ""
438
439
#: bzrlib/builtins.py:986
440
msgid "Automatically guess renames."
441
msgstr ""
442
443
#: bzrlib/builtins.py:987
444
msgid "Avoid making changes when guessing renames."
445
msgstr ""
446
447
#: bzrlib/builtins.py:996
448
msgid "--dry-run requires --auto."
449
msgstr ""
450
451
#: bzrlib/builtins.py:1000
452
msgid "missing file argument"
453
msgstr ""
454
455
#: bzrlib/builtins.py:1004
456
msgid "can not move root of branch"
457
msgstr ""
458
459
#: bzrlib/builtins.py:1010
460
msgid "Only one path may be specified to --auto."
461
msgstr ""
462
463
#: bzrlib/builtins.py:1013
464
msgid "--after cannot be specified with --auto."
465
msgstr ""
466
467
#: bzrlib/builtins.py:1050
468
msgid "to mv multiple files the destination must be a versioned directory"
469
msgstr ""
470
471
#: bzrlib/builtins.py:1102
472
msgid "Turn this branch into a mirror of another branch."
473
msgstr ""
474
475
#: bzrlib/builtins.py:1104
476
msgid ""
477
"By default, this command only works on branches that have not diverged.\n"
478
"Branches are considered diverged if the destination branch's most recent \n"
479
"commit is one that has not been merged (directly or indirectly) into the \n"
480
"parent."
481
msgstr ""
482
483
#: bzrlib/builtins.py:1109
484
msgid ""
485
"If branches have diverged, you can use 'bzr merge' to integrate the changes\n"
486
"from one into the other. Once one branch has merged, the other should\n"
487
"be able to pull it again."
488
msgstr ""
489
490
#: bzrlib/builtins.py:1113
491
msgid ""
492
"If you want to replace your local changes and just want your branch to\n"
493
"match the remote one, use pull --overwrite. This will work even if the two\n"
494
"branches have diverged."
495
msgstr ""
496
497
#: bzrlib/builtins.py:1117
498
msgid ""
499
"If there is no default location set, the first pull will set it (use\n"
500
"--no-remember to avoid setting it). After that, you can omit the\n"
501
"location to use the default. To change the default, use --remember. The\n"
502
"value will only be saved if the remote location can be accessed."
503
msgstr ""
504
505
#: bzrlib/builtins.py:1122
506
msgid ""
507
"The --verbose option will display the revisions pulled using the log_format\n"
508
"configuration option. You can use a different format by overriding it with\n"
509
"-Olog_format=<other_format>."
510
msgstr ""
511
512
#: bzrlib/builtins.py:1126
513
msgid ""
514
"Note: The location can be specified either in the form of a branch,\n"
515
"or in the form of a path to a file containing a merge directive generated\n"
516
"with bzr send."
517
msgstr ""
518
519
#: bzrlib/builtins.py:1134
520
msgid "Show logs of pulled revisions."
521
msgstr ""
522
523
#: bzrlib/builtins.py:1136
524
msgid ""
525
"Branch to pull into, rather than the one containing the working directory."
526
msgstr ""
527
528
#: bzrlib/builtins.py:1139
529
msgid ""
530
"Perform a local pull in a bound branch. Local pulls are not applied to the "
531
"master branch."
532
msgstr ""
533
534
#: bzrlib/builtins.py:1168
535
msgid "Need working tree for --show-base."
536
msgstr ""
537
538
#: bzrlib/builtins.py:1184
539
msgid "No pull location known or specified."
540
msgstr ""
541
542
#: bzrlib/builtins.py:1190
543
#, python-format
544
msgid "Using saved parent location: %s\n"
545
msgstr ""
546
547
#: bzrlib/builtins.py:1197 bzrlib/builtins.py:4393
548
msgid "Cannot use -r with merge directives or bundles"
549
msgstr ""
550
551
#: bzrlib/builtins.py:1238
552
msgid "Update a mirror of this branch."
553
msgstr ""
554
555
#: bzrlib/builtins.py:1240
556
msgid ""
557
"The target branch will not have its working tree populated because this\n"
558
"is both expensive, and is not supported on remote file systems."
559
msgstr ""
560
561
#: bzrlib/builtins.py:1243
562
msgid ""
563
"Some smart servers or protocols *may* put the working tree in place in\n"
564
"the future."
565
msgstr ""
566
567
#: bzrlib/builtins.py:1246
568
msgid ""
569
"This command only works on branches that have not diverged. Branches are\n"
570
"considered diverged if the destination branch's most recent commit is one\n"
571
"that has not been merged (directly or indirectly) by the source branch."
572
msgstr ""
573
574
#: bzrlib/builtins.py:1250
575
msgid ""
576
"If branches have diverged, you can use 'bzr push --overwrite' to replace\n"
577
"the other branch completely, discarding its unmerged changes."
578
msgstr ""
579
580
#: bzrlib/builtins.py:1253
581
msgid ""
582
"If you want to ensure you have the different changes in the other branch,\n"
583
"do a merge (see bzr help merge) from the other branch, and commit that.\n"
584
"After that you will be able to do a push without '--overwrite'."
585
msgstr ""
586
587
#: bzrlib/builtins.py:1257
588
msgid ""
589
"If there is no default push location set, the first push will set it (use\n"
590
"--no-remember to avoid setting it). After that, you can omit the\n"
591
"location to use the default. To change the default, use --remember. The\n"
592
"value will only be saved if the remote location can be accessed."
593
msgstr ""
594
595
#: bzrlib/builtins.py:1262
596
msgid ""
597
"The --verbose option will display the revisions pushed using the log_format\n"
598
"configuration option. You can use a different format by overriding it with\n"
599
"-Olog_format=<other_format>."
600
msgstr ""
601
602
#: bzrlib/builtins.py:1273 bzrlib/foreign.py:272
603
msgid ""
604
"Branch to push from, rather than the one containing the working directory."
605
msgstr ""
606
607
#: bzrlib/builtins.py:1276
608
msgid ""
609
"By default push will fail if the target directory exists, but does not "
610
"already have a control directory. This flag will allow push to proceed."
611
msgstr ""
612
613
#: bzrlib/builtins.py:1281
614
msgid ""
615
"Create a stacked branch that references the public location of the parent "
616
"branch."
617
msgstr ""
618
619
#: bzrlib/builtins.py:1284
620
msgid ""
621
"Create a stacked branch that refers to another branch for the commit "
622
"history. Only the work not present in the referenced branch is included in "
623
"the branch created."
624
msgstr ""
625
626
#: bzrlib/builtins.py:1289 bzrlib/foreign.py:279
627
msgid ""
628
"Refuse to push if there are uncommitted changes in the working tree, --no-"
629
"strict disables the check."
630
msgstr ""
631
632
#: bzrlib/builtins.py:1292
633
msgid "Don't populate the working tree, even for protocols that support it."
634
msgstr ""
635
636
#: bzrlib/builtins.py:1336
637
msgid "Could not determine branch to refer to."
638
msgstr ""
639
640
#: bzrlib/builtins.py:1345
641
#, python-format
642
msgid ""
643
"No push location known or specified. To push to the parent branch (at %s), "
644
"use 'bzr push :parent'."
645
msgstr ""
646
647
#: bzrlib/builtins.py:1351 bzrlib/foreign.py:306
648
msgid "No push location known or specified."
649
msgstr ""
650
651
#: bzrlib/builtins.py:1355
652
#, python-format
653
msgid "Using saved push location: %s"
654
msgstr ""
655
656
#: bzrlib/builtins.py:1365
657
msgid "Create a new branch that is a copy of an existing branch."
658
msgstr ""
659
660
#: bzrlib/builtins.py:1367
661
msgid ""
662
"If the TO_LOCATION is omitted, the last component of the FROM_LOCATION will\n"
663
"be used. In other words, \"branch ../foo/bar\" will attempt to create "
664
"./bar.\n"
665
"If the FROM_LOCATION has no / or path separator embedded, the TO_LOCATION\n"
666
"is derived from the FROM_LOCATION by stripping a leading scheme or drive\n"
667
"identifier, if any. For example, \"branch lp:foo-bar\" will attempt to\n"
668
"create ./foo-bar."
669
msgstr ""
670
671
#: bzrlib/builtins.py:1374
672
msgid ""
673
"To retrieve the branch as of a particular revision, supply the --revision\n"
674
"parameter, as in \"branch foo/bar -r 5\"."
675
msgstr ""
676
677
#: bzrlib/builtins.py:1377
678
msgid "The synonyms 'clone' and 'get' for this command are deprecated."
679
msgstr ""
680
681
#: bzrlib/builtins.py:1387
682
msgid "Create a branch without a working-tree."
683
msgstr ""
684
685
#: bzrlib/builtins.py:1389
686
msgid "Switch the checkout in the current directory to the new branch."
687
msgstr ""
688
689
#: bzrlib/builtins.py:1392
690
msgid ""
691
"Create a stacked branch referring to the source branch. The new branch will "
692
"depend on the availability of the source branch for all operations."
693
msgstr ""
694
695
#: bzrlib/builtins.py:1396
696
msgid "Do not use a shared repository, even if available."
697
msgstr ""
698
699
#: bzrlib/builtins.py:1398
700
msgid ""
701
"By default branch will fail if the target directory exists, but does not "
702
"already have a control directory. This flag will allow branch to proceed."
703
msgstr ""
704
705
#: bzrlib/builtins.py:1403
706
msgid "Bind new branch to from location."
707
msgstr ""
708
709
#: bzrlib/builtins.py:1450
710
#, python-format
711
msgid "Target directory \"%s\" already exists."
712
msgstr ""
713
714
#: bzrlib/builtins.py:1462
715
#, python-format
716
msgid "Parent of \"%s\" does not exist."
717
msgstr ""
718
719
#: bzrlib/builtins.py:1481
720
msgid "The branch {0} has no revision {1}."
721
msgstr ""
722
723
#: bzrlib/builtins.py:1496 bzrlib/push.py:53
724
#, python-format
725
msgid "Created new stacked branch referring to %s."
726
msgstr ""
727
728
#: bzrlib/builtins.py:1500
729
#, python-format
730
msgid "Branched %d revision."
731
msgid_plural "Branched %d revisions."
732
msgstr[0] ""
733
msgstr[1] ""
734
735
#: bzrlib/builtins.py:1505
736
#, python-format
737
msgid "New branch bound to %s"
738
msgstr ""
739
740
#: bzrlib/builtins.py:1510 bzrlib/builtins.py:6256
741
#, python-format
742
msgid "Switched to branch: %s"
743
msgstr ""
744
745
#: bzrlib/builtins.py:1515
746
msgid "List the branches available at the current location."
747
msgstr ""
748
749
#: bzrlib/builtins.py:1517
750
msgid ""
751
"This command will print the names of all the branches at the current\n"
752
"location."
753
msgstr ""
754
755
#: bzrlib/builtins.py:1524
756
msgid ""
757
"Recursively scan for branches rather than just looking in the specified "
758
"location."
759
msgstr ""
760
761
#: bzrlib/builtins.py:1554
762
msgid "(default)"
763
msgstr ""
764
765
#: bzrlib/builtins.py:1566
766
msgid "Create a new checkout of an existing branch."
767
msgstr ""
768
769
#: bzrlib/builtins.py:1568
770
msgid ""
771
"If BRANCH_LOCATION is omitted, checkout will reconstitute a working tree "
772
"for\n"
773
"the branch found in '.'. This is useful if you have removed the working "
774
"tree\n"
775
"or if it was never created - i.e. if you pushed the branch to its current\n"
776
"location using SFTP."
777
msgstr ""
778
779
#: bzrlib/builtins.py:1573
780
msgid ""
781
"If the TO_LOCATION is omitted, the last component of the BRANCH_LOCATION "
782
"will\n"
783
"be used. In other words, \"checkout ../foo/bar\" will attempt to create "
784
"./bar.\n"
785
"If the BRANCH_LOCATION has no / or path separator embedded, the TO_LOCATION\n"
786
"is derived from the BRANCH_LOCATION by stripping a leading scheme or drive\n"
787
"identifier, if any. For example, \"checkout lp:foo-bar\" will attempt to\n"
788
"create ./foo-bar."
789
msgstr ""
790
791
#: bzrlib/builtins.py:1580
792
msgid ""
793
"To retrieve the branch as of a particular revision, supply the --revision\n"
794
"parameter, as in \"checkout foo/bar -r 5\". Note that this will be "
795
"immediately\n"
796
"out of date [so you cannot commit] but it may be useful (i.e. to examine "
797
"old\n"
798
"code.)"
799
msgstr ""
800
801
#: bzrlib/builtins.py:1590
802
msgid ""
803
"Perform a lightweight checkout. Lightweight checkouts depend on access to "
804
"the branch for every operation. Normal checkouts can perform common "
805
"operations like diff and status without such access, and also support local "
806
"commits."
807
msgstr ""
808
809
#: bzrlib/builtins.py:1597
810
msgid "Get file contents from this tree."
811
msgstr ""
812
813
#: bzrlib/builtins.py:1599
814
msgid "Hard-link working tree files where possible."
815
msgstr ""
816
817
#: bzrlib/builtins.py:1640
818
msgid ""
819
"Show list of renamed files.\n"
820
" "
821
msgstr ""
822
823
#: bzrlib/builtins.py:1670
824
msgid "Update a working tree to a new revision."
825
msgstr ""
826
827
#: bzrlib/builtins.py:1672
828
msgid ""
829
"This will perform a merge of the destination revision (the tip of the\n"
830
"branch, or the specified revision) into the working tree, and then make\n"
831
"that revision the basis revision for the working tree. "
832
msgstr ""
833
834
#: bzrlib/builtins.py:1676
835
msgid ""
836
"You can use this to visit an older revision, or to update a working tree\n"
837
"that is out of date from its branch."
838
msgstr ""
839
840
#: bzrlib/builtins.py:1679
841
msgid ""
842
"If there are any uncommitted changes in the tree, they will be carried\n"
843
"across and remain as uncommitted changes after the update. To discard\n"
844
"these changes, use 'bzr revert'. The uncommitted changes may conflict\n"
845
"with the changes brought in by the change in basis revision."
846
msgstr ""
847
848
#: bzrlib/builtins.py:1684
849
msgid ""
850
"If the tree's branch is bound to a master branch, bzr will also update\n"
851
"the branch from the master."
852
msgstr ""
853
854
#: bzrlib/builtins.py:1687
855
msgid ""
856
"You cannot update just a single file or directory, because each Bazaar\n"
857
"working tree has just a single basis revision. If you want to restore a\n"
858
"file that has been removed locally, use 'bzr revert' instead of 'bzr\n"
859
"update'. If you want to restore a file to its state in a previous\n"
860
"revision, use 'bzr revert' with a '-r' option, or use 'bzr cat' to write\n"
861
"out the old content of that file to a new location."
862
msgstr ""
863
864
#: bzrlib/builtins.py:1694
865
msgid ""
866
"The 'dir' argument, if given, must be the location of the root of a\n"
867
"working tree to update. By default, the working tree that contains the \n"
868
"current working directory is used."
869
msgstr ""
870
871
#: bzrlib/builtins.py:1710
872
msgid "bzr update --revision takes exactly one revision"
873
msgstr ""
874
875
#: bzrlib/builtins.py:1718
876
msgid "bzr update can only update a whole tree, not a file or subdirectory"
877
msgstr ""
878
879
#: bzrlib/builtins.py:1749
880
msgid "Tree is up to date at revision {0} of branch {1}"
881
msgstr ""
882
883
#: bzrlib/builtins.py:1765
884
#, python-format
885
msgid ""
886
"branch has no revision %s\n"
887
"bzr update --revision only works for a revision in the branch history"
888
msgstr ""
889
890
#: bzrlib/builtins.py:1771
891
msgid "Updated to revision {0} of branch {1}"
892
msgstr ""
893
894
#: bzrlib/builtins.py:1775
895
msgid ""
896
"Your local commits will now show as pending merges with 'bzr status', and "
897
"can be committed with 'bzr commit'."
898
msgstr ""
899
900
#: bzrlib/builtins.py:1784
901
msgid "Show information about a working tree, branch or repository."
902
msgstr ""
903
904
#: bzrlib/builtins.py:1786
905
msgid ""
906
"This command will show all known locations and formats associated to the\n"
907
"tree, branch or repository."
908
msgstr ""
909
910
#: bzrlib/builtins.py:1789
911
msgid ""
912
"In verbose mode, statistical information is included with each report.\n"
913
"To see extended statistic information, use a verbosity level of 2 or\n"
914
"higher by specifying the verbose option multiple times, e.g. -vv."
915
msgstr ""
916
917
#: bzrlib/builtins.py:1793
918
msgid "Branches and working trees will also report any missing revisions."
919
msgstr ""
920
921
#: bzrlib/builtins.py:1795 bzrlib/builtins.py:3715 bzrlib/builtins.py:4845
922
#: bzrlib/builtins.py:6442
923
msgid ":Examples:"
924
msgstr ""
925
926
#: bzrlib/builtins.py:1797
927
msgid " Display information on the format and related locations:"
928
msgstr ""
929
930
#: bzrlib/builtins.py:1799
931
msgid " bzr info"
932
msgstr ""
933
934
#: bzrlib/builtins.py:1801
935
msgid ""
936
" Display the above together with extended format information and\n"
937
" basic statistics (like the number of files in the working tree and\n"
938
" number of revisions in the branch and repository):"
939
msgstr ""
940
941
#: bzrlib/builtins.py:1805
942
msgid " bzr info -v"
943
msgstr ""
944
945
#: bzrlib/builtins.py:1807
946
msgid " Display the above together with number of committers to the branch:"
947
msgstr ""
948
949
#: bzrlib/builtins.py:1809
950
msgid " bzr info -vv"
951
msgstr ""
952
953
#: bzrlib/builtins.py:1828
954
msgid "Remove files or directories."
955
msgstr ""
956
957
#: bzrlib/builtins.py:1830
958
msgid ""
959
"This makes Bazaar stop tracking changes to the specified files. Bazaar will\n"
960
"delete them if they can easily be recovered using revert otherwise they\n"
961
"will be backed up (adding an extention of the form .~#~). If no options or\n"
962
"parameters are given Bazaar will scan for files that are being tracked by\n"
963
"Bazaar but missing in your tree and stop tracking them for you."
964
msgstr ""
965
966
#: bzrlib/builtins.py:1838
967
msgid "Only remove files that have never been committed."
968
msgstr ""
969
970
#: bzrlib/builtins.py:1840
971
msgid "The file deletion mode to be used."
972
msgstr ""
973
974
#: bzrlib/builtins.py:1841
975
msgid "Deletion Strategy"
976
msgstr ""
977
978
#: bzrlib/builtins.py:1842
979
msgid "Backup changed files (default)."
980
msgstr ""
981
982
#: bzrlib/builtins.py:1843
983
msgid "Delete from bzr but leave the working copy."
984
msgstr ""
985
986
#: bzrlib/builtins.py:1844
987
msgid "Don't backup changed files."
988
msgstr ""
989
990
#: bzrlib/builtins.py:1845
991
msgid ""
992
"Delete all the specified files, even if they can not be recovered and even "
993
"if they are non-empty directories. (deprecated, use no-backup)"
994
msgstr ""
995
996
#: bzrlib/builtins.py:1854
997
msgid "(The --force option is deprecated, rather use --no-backup in future.)"
998
msgstr ""
999
1000
#: bzrlib/builtins.py:1871
1001
msgid "No matching files."
1002
msgstr ""
1003
1004
#: bzrlib/builtins.py:1932
1005
msgid "Reconcile bzr metadata in a branch."
1006
msgstr ""
1007
1008
#: bzrlib/builtins.py:1934
1009
msgid ""
1010
"This can correct data mismatches that may have been caused by\n"
1011
"previous ghost operations or bzr upgrades. You should only\n"
1012
"need to run this command if 'bzr check' or a bzr developer\n"
1013
"advises you to run it."
1014
msgstr ""
1015
1016
#: bzrlib/builtins.py:1939
1017
msgid ""
1018
"If a second branch is provided, cross-branch reconciliation is\n"
1019
"also attempted, which will check that data like the tree root\n"
1020
"id which was not present in very early bzr versions is represented\n"
1021
"correctly in both branches."
1022
msgstr ""
1023
1024
#: bzrlib/builtins.py:1944
1025
msgid ""
1026
"At the same time it is run it may recompress data resulting in\n"
1027
"a potential saving in disk space or performance gain."
1028
msgstr ""
1029
1030
#: bzrlib/builtins.py:1947
1031
msgid "The branch *MUST* be on a listable system such as local disk or sftp."
1032
msgstr ""
1033
1034
#: bzrlib/builtins.py:2014 bzrlib/builtins.py:2132 bzrlib/builtins.py:3750
1035
msgid ""
1036
"Format for the bzr 2.0 series.\n"
1037
"Uses group-compress storage.\n"
1038
"Provides rich roots which are a one-way transition.\n"
1039
msgstr ""
1040
1041
#: bzrlib/builtins.py:2014 bzrlib/builtins.py:2132 bzrlib/builtins.py:3750
1042
msgid ""
1043
"Pack-based format used in 1.x series. Introduced in 0.92. Interoperates with "
1044
"bzr repositories before 0.92 but cannot be read by bzr < 0.92. "
1045
msgstr ""
1046
1047
#: bzrlib/builtins.py:2014 bzrlib/builtins.py:2132 bzrlib/builtins.py:3750
1048
msgid "The 2a format with experimental support for colocated branches.\n"
1049
msgstr ""
1050
1051
#: bzrlib/builtins.py:2015
1052
msgid "Make a directory into a versioned branch."
1053
msgstr ""
1054
1055
#: bzrlib/builtins.py:2017
1056
msgid ""
1057
"Use this to create an empty branch, or before importing an\n"
1058
"existing project."
1059
msgstr ""
1060
1061
#: bzrlib/builtins.py:2020
1062
msgid ""
1063
"If there is a repository in a parent directory of the location, then\n"
1064
"the history of the branch will be stored in the repository. Otherwise\n"
1065
"init creates a standalone branch which carries its own history\n"
1066
"in the .bzr directory."
1067
msgstr ""
1068
1069
#: bzrlib/builtins.py:2025
1070
msgid ""
1071
"If there is already a branch at the location but it has no working tree,\n"
1072
"the tree can be populated with 'bzr checkout'."
1073
msgstr ""
1074
1075
#: bzrlib/builtins.py:2028
1076
msgid "Recipe for importing a tree of files::"
1077
msgstr ""
1078
1079
#: bzrlib/builtins.py:2030
1080
msgid ""
1081
" cd ~/project\n"
1082
" bzr init\n"
1083
" bzr add .\n"
1084
" bzr status\n"
1085
" bzr commit -m \"imported project\""
1086
msgstr ""
1087
1088
#: bzrlib/builtins.py:2041
1089
msgid ""
1090
"Create the path leading up to the branch if it does not already exist."
1091
msgstr ""
1092
1093
#: bzrlib/builtins.py:2044
1094
msgid "Specify a format for this branch. See \"help formats\"."
1095
msgstr ""
1096
1097
#: bzrlib/builtins.py:2052
1098
msgid ""
1099
"Never change revnos or the existing log. Append revisions to it only."
1100
msgstr ""
1101
1102
#: bzrlib/builtins.py:2055
1103
msgid "Create a branch without a working tree."
1104
msgstr ""
1105
1106
#: bzrlib/builtins.py:2075 bzrlib/push.py:110
1107
#, python-format
1108
msgid ""
1109
"Parent directory of %s does not exist.\n"
1110
"You may supply --create-prefix to create all leading parent directories."
1111
msgstr ""
1112
1113
#: bzrlib/builtins.py:2109
1114
msgid ""
1115
"This branch format cannot be set to append-revisions-only. Try --default."
1116
msgstr ""
1117
1118
#: bzrlib/builtins.py:2120
1119
msgid "Created a {0} (format: {1})\n"
1120
msgstr ""
1121
1122
#: bzrlib/builtins.py:2129
1123
#, python-format
1124
msgid "Using shared repository: %s\n"
1125
msgstr ""
1126
1127
#: bzrlib/builtins.py:2133
1128
msgid "Create a shared repository for branches to share storage space."
1129
msgstr ""
1130
1131
#: bzrlib/builtins.py:2135
1132
msgid ""
1133
"New branches created under the repository directory will store their\n"
1134
"revisions in the repository, not in the branch directory. For branches\n"
1135
"with shared history, this reduces the amount of storage needed and \n"
1136
"speeds up the creation of new branches."
1137
msgstr ""
1138
1139
#: bzrlib/builtins.py:2140
1140
msgid ""
1141
"If the --no-trees option is given then the branches in the repository\n"
1142
"will not have working trees by default. They will still exist as \n"
1143
"directories on disk, but they will not have separate copies of the \n"
1144
"files at a certain revision. This can be useful for repositories that\n"
1145
"store branches which are interacted with through checkouts or remote\n"
1146
"branches, such as on a server."
1147
msgstr ""
1148
1149
#: bzrlib/builtins.py:2147
1150
msgid ""
1151
":Examples:\n"
1152
" Create a shared repository holding just branches::"
1153
msgstr ""
1154
1155
#: bzrlib/builtins.py:2150
1156
msgid ""
1157
" bzr init-repo --no-trees repo\n"
1158
" bzr init repo/trunk"
1159
msgstr ""
1160
1161
#: bzrlib/builtins.py:2153
1162
msgid " Make a lightweight checkout elsewhere::"
1163
msgstr ""
1164
1165
#: bzrlib/builtins.py:2155
1166
msgid ""
1167
" bzr checkout --lightweight repo/trunk trunk-checkout\n"
1168
" cd trunk-checkout\n"
1169
" (add files here)"
1170
msgstr ""
1171
1172
#: bzrlib/builtins.py:2163
1173
msgid ""
1174
"Specify a format for this repository. See \"bzr help formats\" for details."
1175
msgstr ""
1176
1177
#: bzrlib/builtins.py:2167
1178
msgid "Repository format"
1179
msgstr ""
1180
1181
#: bzrlib/builtins.py:2169
1182
msgid "Branches in the repository will default to not having a working tree."
1183
msgstr ""
1184
1185
#: bzrlib/builtins.py:2195
1186
msgid "Show differences in the working tree, between revisions or branches."
1187
msgstr ""
1188
1189
#: bzrlib/builtins.py:2197
1190
msgid ""
1191
"If no arguments are given, all changes for the current tree are listed.\n"
1192
"If files are given, only the changes in those files are listed.\n"
1193
"Remote and multiple branches can be compared by using the --old and\n"
1194
"--new options. If not provided, the default for both is derived from\n"
1195
"the first argument, if any, or the current tree if no arguments are\n"
1196
"given."
1197
msgstr ""
1198
1199
#: bzrlib/builtins.py:2204
1200
msgid ""
1201
"\"bzr diff -p1\" is equivalent to \"bzr diff --prefix old/:new/\", and\n"
1202
"produces patches suitable for \"patch -p1\"."
1203
msgstr ""
1204
1205
#: bzrlib/builtins.py:2207
1206
msgid ""
1207
"Note that when using the -r argument with a range of revisions, the\n"
1208
"differences are computed between the two specified revisions. That\n"
1209
"is, the command does not show the changes introduced by the first \n"
1210
"revision in the range. This differs from the interpretation of \n"
1211
"revision ranges used by \"bzr log\" which includes the first revision\n"
1212
"in the range."
1213
msgstr ""
1214
1215
#: bzrlib/builtins.py:2214
1216
msgid ""
1217
":Exit values:\n"
1218
" 1 - changed\n"
1219
" 2 - unrepresentable changes\n"
1220
" 3 - error\n"
1221
" 0 - no change"
1222
msgstr ""
1223
1224
#: bzrlib/builtins.py:2220
1225
msgid ""
1226
":Examples:\n"
1227
" Shows the difference in the working tree versus the last commit::"
1228
msgstr ""
1229
1230
#: bzrlib/builtins.py:2223
1231
msgid " bzr diff"
1232
msgstr ""
1233
1234
#: bzrlib/builtins.py:2225
1235
msgid " Difference between the working tree and revision 1::"
1236
msgstr ""
1237
1238
#: bzrlib/builtins.py:2227
1239
msgid " bzr diff -r1"
1240
msgstr ""
1241
1242
#: bzrlib/builtins.py:2229
1243
msgid " Difference between revision 3 and revision 1::"
1244
msgstr ""
1245
1246
#: bzrlib/builtins.py:2231
1247
msgid " bzr diff -r1..3"
1248
msgstr ""
1249
1250
#: bzrlib/builtins.py:2233
1251
msgid " Difference between revision 3 and revision 1 for branch xxx::"
1252
msgstr ""
1253
1254
#: bzrlib/builtins.py:2235
1255
msgid " bzr diff -r1..3 xxx"
1256
msgstr ""
1257
1258
#: bzrlib/builtins.py:2237
1259
msgid " The changes introduced by revision 2 (equivalent to -r1..2)::"
1260
msgstr ""
1261
1262
#: bzrlib/builtins.py:2239
1263
msgid " bzr diff -c2"
1264
msgstr ""
1265
1266
#: bzrlib/builtins.py:2241
1267
msgid ""
1268
" To see the changes introduced by revision X::\n"
1269
" \n"
1270
" bzr diff -cX"
1271
msgstr ""
1272
1273
#: bzrlib/builtins.py:2245
1274
msgid ""
1275
" Note that in the case of a merge, the -c option shows the changes\n"
1276
" compared to the left hand parent. To see the changes against\n"
1277
" another parent, use::"
1278
msgstr ""
1279
1280
#: bzrlib/builtins.py:2249
1281
msgid " bzr diff -r<chosen_parent>..X"
1282
msgstr ""
1283
1284
#: bzrlib/builtins.py:2251
1285
msgid ""
1286
" The changes between the current revision and the previous revision\n"
1287
" (equivalent to -c-1 and -r-2..-1)"
1288
msgstr ""
1289
1290
#: bzrlib/builtins.py:2254
1291
msgid " bzr diff -r-2.."
1292
msgstr ""
1293
1294
#: bzrlib/builtins.py:2256
1295
msgid " Show just the differences for file NEWS::"
1296
msgstr ""
1297
1298
#: bzrlib/builtins.py:2258
1299
msgid " bzr diff NEWS"
1300
msgstr ""
1301
1302
#: bzrlib/builtins.py:2260
1303
msgid " Show the differences in working tree xxx for file NEWS::"
1304
msgstr ""
1305
1306
#: bzrlib/builtins.py:2262
1307
msgid " bzr diff xxx/NEWS"
1308
msgstr ""
1309
1310
#: bzrlib/builtins.py:2264
1311
msgid " Show the differences from branch xxx to this working tree:"
1312
msgstr ""
1313
1314
#: bzrlib/builtins.py:2266
1315
msgid " bzr diff --old xxx"
1316
msgstr ""
1317
1318
#: bzrlib/builtins.py:2268
1319
msgid " Show the differences between two branches for file NEWS::"
1320
msgstr ""
1321
1322
#: bzrlib/builtins.py:2270
1323
msgid " bzr diff --old xxx --new yyy NEWS"
1324
msgstr ""
1325
1326
#: bzrlib/builtins.py:2272
1327
msgid " Same as 'bzr diff' but prefix paths with old/ and new/::"
1328
msgstr ""
1329
1330
#: bzrlib/builtins.py:2274
1331
msgid ""
1332
" bzr diff --prefix old/:new/\n"
1333
" \n"
1334
" Show the differences using a custom diff program with options::\n"
1335
" \n"
1336
" bzr diff --using /usr/bin/diff --diff-options -wu"
1337
msgstr ""
1338
1339
#: bzrlib/builtins.py:2284
1340
msgid "Pass these options to the external diff program."
1341
msgstr ""
1342
1343
#: bzrlib/builtins.py:2287
1344
msgid ""
1345
"Set prefixes added to old and new filenames, as two values separated by a "
1346
"colon. (eg \"old/:new/\")."
1347
msgstr ""
1348
1349
#: bzrlib/builtins.py:2290
1350
msgid "Branch/tree to compare from."
1351
msgstr ""
1352
1353
#: bzrlib/builtins.py:2294
1354
msgid "Branch/tree to compare to."
1355
msgstr ""
1356
1357
#: bzrlib/builtins.py:2300
1358
msgid "Use this command to compare files."
1359
msgstr ""
1360
1361
#: bzrlib/builtins.py:2305
1362
msgid "Diff format to use."
1363
msgstr ""
1364
1365
#: bzrlib/builtins.py:2307
1366
msgid "Diff format"
1367
msgstr ""
1368
1369
#: bzrlib/builtins.py:2329
1370
msgid "--prefix expects two values separated by a colon (eg \"old/:new/\")"
1371
msgstr ""
1372
1373
#: bzrlib/builtins.py:2333
1374
msgid "bzr diff --revision takes exactly one or two revision specifiers"
1375
msgstr ""
1376
1377
#: bzrlib/builtins.py:2338 bzrlib/builtins.py:2736 bzrlib/builtins.py:2749
1378
#: bzrlib/builtins.py:2757 bzrlib/builtins.py:4919
1379
msgid "{0} and {1} are mutually exclusive"
1380
msgstr ""
1381
1382
#: bzrlib/builtins.py:2358
1383
msgid ""
1384
"List files deleted in the working tree.\n"
1385
" "
1386
msgstr ""
1387
1388
#: bzrlib/builtins.py:2436
1389
msgid "Show the tree root directory."
1390
msgstr ""
1391
1392
#: bzrlib/builtins.py:2438
1393
msgid ""
1394
"The root is the nearest enclosing directory with a .bzr control\n"
1395
"directory."
1396
msgstr ""
1397
1398
#: bzrlib/builtins.py:2453
1399
msgid "The limit argument must be an integer."
1400
msgstr ""
1401
1402
#: bzrlib/builtins.py:2461
1403
msgid "The levels argument must be an integer."
1404
msgstr ""
1405
1406
#: bzrlib/builtins.py:2466
1407
msgid "Show historical log for a branch or subset of a branch."
1408
msgstr ""
1409
1410
#: bzrlib/builtins.py:2468
1411
msgid ""
1412
"log is bzr's default tool for exploring the history of a branch.\n"
1413
"The branch to use is taken from the first parameter. If no parameters\n"
1414
"are given, the branch containing the working directory is logged.\n"
1415
"Here are some simple examples::"
1416
msgstr ""
1417
1418
#: bzrlib/builtins.py:2473
1419
msgid ""
1420
" bzr log log the current branch\n"
1421
" bzr log foo.py log a file in its branch\n"
1422
" bzr log http://server/branch log a branch on a server"
1423
msgstr ""
1424
1425
#: bzrlib/builtins.py:2477
1426
msgid ""
1427
"The filtering, ordering and information shown for each revision can\n"
1428
"be controlled as explained below. By default, all revisions are\n"
1429
"shown sorted (topologically) so that newer revisions appear before\n"
1430
"older ones and descendants always appear before ancestors. If displayed,\n"
1431
"merged revisions are shown indented under the revision in which they\n"
1432
"were merged."
1433
msgstr ""
1434
1435
#: bzrlib/builtins.py:2484
1436
msgid ":Output control:"
1437
msgstr ""
1438
1439
#: bzrlib/builtins.py:2486
1440
msgid ""
1441
" The log format controls how information about each revision is\n"
1442
" displayed. The standard log formats are called ``long``, ``short``\n"
1443
" and ``line``. The default is long. See ``bzr help log-formats``\n"
1444
" for more details on log formats."
1445
msgstr ""
1446
1447
#: bzrlib/builtins.py:2491
1448
msgid ""
1449
" The following options can be used to control what information is\n"
1450
" displayed::"
1451
msgstr ""
1452
1453
#: bzrlib/builtins.py:2494
1454
msgid ""
1455
" -l N display a maximum of N revisions\n"
1456
" -n N display N levels of revisions (0 for all, 1 for collapsed)\n"
1457
" -v display a status summary (delta) for each revision\n"
1458
" -p display a diff (patch) for each revision\n"
1459
" --show-ids display revision-ids (and file-ids), not just revnos"
1460
msgstr ""
1461
1462
#: bzrlib/builtins.py:2500
1463
msgid ""
1464
" Note that the default number of levels to display is a function of the\n"
1465
" log format. If the -n option is not used, the standard log formats show\n"
1466
" just the top level (mainline)."
1467
msgstr ""
1468
1469
#: bzrlib/builtins.py:2504
1470
msgid ""
1471
" Status summaries are shown using status flags like A, M, etc. To see\n"
1472
" the changes explained using words like ``added`` and ``modified``\n"
1473
" instead, use the -vv option."
1474
msgstr ""
1475
1476
#: bzrlib/builtins.py:2508
1477
msgid ":Ordering control:"
1478
msgstr ""
1479
1480
#: bzrlib/builtins.py:2510
1481
msgid ""
1482
" To display revisions from oldest to newest, use the --forward option.\n"
1483
" In most cases, using this option will have little impact on the total\n"
1484
" time taken to produce a log, though --forward does not incrementally\n"
1485
" display revisions like --reverse does when it can."
1486
msgstr ""
1487
1488
#: bzrlib/builtins.py:2515
1489
msgid ":Revision filtering:"
1490
msgstr ""
1491
1492
#: bzrlib/builtins.py:2517
1493
msgid ""
1494
" The -r option can be used to specify what revision or range of revisions\n"
1495
" to filter against. The various forms are shown below::"
1496
msgstr ""
1497
1498
#: bzrlib/builtins.py:2520
1499
msgid ""
1500
" -rX display revision X\n"
1501
" -rX.. display revision X and later\n"
1502
" -r..Y display up to and including revision Y\n"
1503
" -rX..Y display from X to Y inclusive"
1504
msgstr ""
1505
1506
#: bzrlib/builtins.py:2525
1507
msgid ""
1508
" See ``bzr help revisionspec`` for details on how to specify X and Y.\n"
1509
" Some common examples are given below::"
1510
msgstr ""
1511
1512
#: bzrlib/builtins.py:2528
1513
msgid ""
1514
" -r-1 show just the tip\n"
1515
" -r-10.. show the last 10 mainline revisions\n"
1516
" -rsubmit:.. show what's new on this branch\n"
1517
" -rancestor:path.. show changes since the common ancestor of this\n"
1518
" branch and the one at location path\n"
1519
" -rdate:yesterday.. show changes since yesterday"
1520
msgstr ""
1521
1522
#: bzrlib/builtins.py:2535
1523
msgid ""
1524
" When logging a range of revisions using -rX..Y, log starts at\n"
1525
" revision Y and searches back in history through the primary\n"
1526
" (\"left-hand\") parents until it finds X. When logging just the\n"
1527
" top level (using -n1), an error is reported if X is not found\n"
1528
" along the way. If multi-level logging is used (-n0), X may be\n"
1529
" a nested merge revision and the log will be truncated accordingly."
1530
msgstr ""
1531
1532
#: bzrlib/builtins.py:2542
1533
msgid ":Path filtering:"
1534
msgstr ""
1535
1536
#: bzrlib/builtins.py:2544
1537
msgid ""
1538
" If parameters are given and the first one is not a branch, the log\n"
1539
" will be filtered to show only those revisions that changed the\n"
1540
" nominated files or directories."
1541
msgstr ""
1542
1543
#: bzrlib/builtins.py:2548
1544
msgid ""
1545
" Filenames are interpreted within their historical context. To log a\n"
1546
" deleted file, specify a revision range so that the file existed at\n"
1547
" the end or start of the range."
1548
msgstr ""
1549
1550
#: bzrlib/builtins.py:2552
1551
msgid ""
1552
" Historical context is also important when interpreting pathnames of\n"
1553
" renamed files/directories. Consider the following example:"
1554
msgstr ""
1555
1556
#: bzrlib/builtins.py:2555
1557
msgid ""
1558
" * revision 1: add tutorial.txt\n"
1559
" * revision 2: modify tutorial.txt\n"
1560
" * revision 3: rename tutorial.txt to guide.txt; add tutorial.txt"
1561
msgstr ""
1562
1563
#: bzrlib/builtins.py:2559
1564
msgid " In this case:"
1565
msgstr ""
1566
1567
#: bzrlib/builtins.py:2561
1568
msgid " * ``bzr log guide.txt`` will log the file added in revision 1"
1569
msgstr ""
1570
1571
#: bzrlib/builtins.py:2563
1572
msgid ""
1573
" * ``bzr log tutorial.txt`` will log the new file added in revision 3"
1574
msgstr ""
1575
1576
#: bzrlib/builtins.py:2565
1577
msgid ""
1578
" * ``bzr log -r2 -p tutorial.txt`` will show the changes made to\n"
1579
" the original file in revision 2."
1580
msgstr ""
1581
1582
#: bzrlib/builtins.py:2568
1583
msgid ""
1584
" * ``bzr log -r2 -p guide.txt`` will display an error message as there\n"
1585
" was no file called guide.txt in revision 2."
1586
msgstr ""
1587
1588
#: bzrlib/builtins.py:2571
1589
msgid ""
1590
" Renames are always followed by log. By design, there is no need to\n"
1591
" explicitly ask for this (and no way to stop logging a file back\n"
1592
" until it was last renamed)."
1593
msgstr ""
1594
1595
#: bzrlib/builtins.py:2575
1596
msgid ":Other filtering:"
1597
msgstr ""
1598
1599
#: bzrlib/builtins.py:2577
1600
msgid ""
1601
" The --match option can be used for finding revisions that match a\n"
1602
" regular expression in a commit message, committer, author or bug.\n"
1603
" Specifying the option several times will match any of the supplied\n"
1604
" expressions. --match-author, --match-bugs, --match-committer and\n"
1605
" --match-message can be used to only match a specific field."
1606
msgstr ""
1607
1608
#: bzrlib/builtins.py:2583
1609
msgid ":Tips & tricks:"
1610
msgstr ""
1611
1612
#: bzrlib/builtins.py:2585
1613
msgid ""
1614
" GUI tools and IDEs are often better at exploring history than command\n"
1615
" line tools: you may prefer qlog or viz from qbzr or bzr-gtk, the\n"
1616
" bzr-explorer shell, or the Loggerhead web interface. See the Plugin\n"
1617
" Guide <http://doc.bazaar.canonical.com/plugins/en/> and\n"
1618
" <http://wiki.bazaar.canonical.com/IDEIntegration>. "
1619
msgstr ""
1620
1621
#: bzrlib/builtins.py:2591
1622
msgid ""
1623
" You may find it useful to add the aliases below to ``bazaar.conf``::"
1624
msgstr ""
1625
1626
#: bzrlib/builtins.py:2593
1627
msgid ""
1628
" [ALIASES]\n"
1629
" tip = log -r-1\n"
1630
" top = log -l10 --line\n"
1631
" show = log -v -p"
1632
msgstr ""
1633
1634
#: bzrlib/builtins.py:2598
1635
msgid ""
1636
" ``bzr tip`` will then show the latest revision while ``bzr top``\n"
1637
" will show the last 10 mainline revisions. To see the details of a\n"
1638
" particular revision X, ``bzr show -rX``."
1639
msgstr ""
1640
1641
#: bzrlib/builtins.py:2602
1642
msgid ""
1643
" If you are interested in looking deeper into a particular merge X,\n"
1644
" use ``bzr log -n0 -rX``."
1645
msgstr ""
1646
1647
#: bzrlib/builtins.py:2605
1648
msgid ""
1649
" ``bzr log -v`` on a branch with lots of history is currently\n"
1650
" very slow. A fix for this issue is currently under development.\n"
1651
" With or without that fix, it is recommended that a revision range\n"
1652
" be given when using the -v option."
1653
msgstr ""
1654
1655
#: bzrlib/builtins.py:2610
1656
msgid ""
1657
" bzr has a generic full-text matching plugin, bzr-search, that can be\n"
1658
" used to find revisions matching user names, commit messages, etc.\n"
1659
" Among other features, this plugin can find all revisions containing\n"
1660
" a list of words but not others."
1661
msgstr ""
1662
1663
#: bzrlib/builtins.py:2615
1664
msgid ""
1665
" When exploring non-mainline history on large projects with deep\n"
1666
" history, the performance of log can be greatly improved by installing\n"
1667
" the historycache plugin. This plugin buffers historical information\n"
1668
" trading disk space for faster speed."
1669
msgstr ""
1670
1671
#: bzrlib/builtins.py:2624
1672
msgid "Show from oldest to newest."
1673
msgstr ""
1674
1675
#: bzrlib/builtins.py:2627
1676
msgid "Show files changed in each revision."
1677
msgstr ""
1678
1679
#: bzrlib/builtins.py:2633
1680
msgid "Show just the specified revision. See also \"help revisionspec\"."
1681
msgstr ""
1682
1683
#: bzrlib/builtins.py:2637
1684
msgid "What names to list as authors - first, all or committer."
1685
msgstr ""
1686
1687
#: bzrlib/builtins.py:2638
1688
msgid "Authors"
1689
msgstr ""
1690
1691
#: bzrlib/builtins.py:2643
1692
msgid "Number of levels to display - 0 for all, 1 for flat."
1693
msgstr ""
1694
1695
#: bzrlib/builtins.py:2653
1696
msgid "Limit the output to the first N revisions."
1697
msgstr ""
1698
1699
#: bzrlib/builtins.py:2658
1700
msgid "Show changes made in each revision as a patch."
1701
msgstr ""
1702
1703
#: bzrlib/builtins.py:2660
1704
msgid "Show merged revisions like --levels 0 does."
1705
msgstr ""
1706
1707
#: bzrlib/builtins.py:2664
1708
msgid "Do not report commits with more than one parent."
1709
msgstr ""
1710
1711
#: bzrlib/builtins.py:2666
1712
msgid ""
1713
"Display only the revisions that are not part of both ancestries (require -"
1714
"rX..Y)."
1715
msgstr ""
1716
1717
#: bzrlib/builtins.py:2670
1718
msgid "Show digital signature validity."
1719
msgstr ""
1720
1721
#: bzrlib/builtins.py:2673
1722
msgid "Show revisions whose properties match this expression."
1723
msgstr ""
1724
1725
#: bzrlib/builtins.py:2677
1726
msgid "Show revisions whose message matches this expression."
1727
msgstr ""
1728
1729
#: bzrlib/builtins.py:2681
1730
msgid "Show revisions whose committer matches this expression."
1731
msgstr ""
1732
1733
#: bzrlib/builtins.py:2685
1734
msgid "Show revisions whose authors match this expression."
1735
msgstr ""
1736
1737
#: bzrlib/builtins.py:2689
1738
msgid "Show revisions whose bugs match this expression."
1739
msgstr ""
1740
1741
#: bzrlib/builtins.py:2743
1742
msgid "--exclude-common-ancestry requires -r with two revisions"
1743
msgstr ""
1744
1745
#: bzrlib/builtins.py:2771
1746
#, python-format
1747
msgid "Path unknown at end or start of revision range: %s"
1748
msgstr ""
1749
1750
#: bzrlib/builtins.py:2888
1751
#, python-format
1752
msgid "bzr %s doesn't accept two revisions in different branches."
1753
msgstr ""
1754
1755
#: bzrlib/builtins.py:2904
1756
#, python-format
1757
msgid "bzr %s --revision takes one or two values."
1758
msgstr ""
1759
1760
#: bzrlib/builtins.py:2949
1761
msgid ""
1762
"List files in a tree.\n"
1763
" "
1764
msgstr ""
1765
1766
#: bzrlib/builtins.py:2958
1767
msgid "Recurse into subdirectories."
1768
msgstr ""
1769
1770
#: bzrlib/builtins.py:2960
1771
msgid "Print paths relative to the root of the branch."
1772
msgstr ""
1773
1774
#: bzrlib/builtins.py:2962
1775
msgid "Print unknown files."
1776
msgstr ""
1777
1778
#: bzrlib/builtins.py:2963
1779
msgid "Print versioned files."
1780
msgstr ""
1781
1782
#: bzrlib/builtins.py:2966
1783
msgid "Print ignored files."
1784
msgstr ""
1785
1786
#: bzrlib/builtins.py:2968
1787
msgid "List entries of a particular kind: file, directory, symlink."
1788
msgstr ""
1789
1790
#: bzrlib/builtins.py:2981
1791
msgid "invalid kind specified"
1792
msgstr ""
1793
1794
#: bzrlib/builtins.py:2984
1795
msgid "Cannot set both --verbose and --null"
1796
msgstr ""
1797
1798
#: bzrlib/builtins.py:2993
1799
msgid "cannot specify both --from-root and PATH"
1800
msgstr ""
1801
1802
#: bzrlib/builtins.py:3080
1803
msgid "Ignore specified files or patterns."
1804
msgstr ""
1805
1806
#: bzrlib/builtins.py:3082
1807
msgid "See ``bzr help patterns`` for details on the syntax of patterns."
1808
msgstr ""
1809
1810
#: bzrlib/builtins.py:3084
1811
msgid ""
1812
"If a .bzrignore file does not exist, the ignore command\n"
1813
"will create one and add the specified files or patterns to the newly\n"
1814
"created file. The ignore command will also automatically add the \n"
1815
".bzrignore file to be versioned. Creating a .bzrignore file without\n"
1816
"the use of the ignore command will require an explicit add command."
1817
msgstr ""
1818
1819
#: bzrlib/builtins.py:3090
1820
msgid ""
1821
"To remove patterns from the ignore list, edit the .bzrignore file.\n"
1822
"After adding, editing or deleting that file either indirectly by\n"
1823
"using this command or directly by using an editor, be sure to commit\n"
1824
"it."
1825
msgstr ""
1826
1827
#: bzrlib/builtins.py:3095
1828
msgid ""
1829
"Bazaar also supports a global ignore file ~/.bazaar/ignore. On Windows\n"
1830
"the global ignore file can be found in the application data directory as\n"
1831
"C:\\Documents and Settings\\<user>\\Application Data\\Bazaar\\2.0\\ignore.\n"
1832
"Global ignores are not touched by this command. The global ignore file\n"
1833
"can be edited directly using an editor."
1834
msgstr ""
1835
1836
#: bzrlib/builtins.py:3101
1837
msgid ""
1838
"Patterns prefixed with '!' are exceptions to ignore patterns and take\n"
1839
"precedence over regular ignores. Such exceptions are used to specify\n"
1840
"files that should be versioned which would otherwise be ignored."
1841
msgstr ""
1842
1843
#: bzrlib/builtins.py:3105
1844
msgid ""
1845
"Patterns prefixed with '!!' act as regular ignore patterns, but have\n"
1846
"precedence over the '!' exception patterns."
1847
msgstr ""
1848
1849
#: bzrlib/builtins.py:3108
1850
msgid ""
1851
":Notes: \n"
1852
" \n"
1853
"* Ignore patterns containing shell wildcards must be quoted from\n"
1854
" the shell on Unix."
1855
msgstr ""
1856
1857
#: bzrlib/builtins.py:3113
1858
msgid ""
1859
"* Ignore patterns starting with \"#\" act as comments in the ignore file.\n"
1860
" To ignore patterns that begin with that character, use the \"RE:\" prefix."
1861
msgstr ""
1862
1863
#: bzrlib/builtins.py:3116
1864
msgid ""
1865
":Examples:\n"
1866
" Ignore the top level Makefile::"
1867
msgstr ""
1868
1869
#: bzrlib/builtins.py:3119
1870
msgid " bzr ignore ./Makefile"
1871
msgstr ""
1872
1873
#: bzrlib/builtins.py:3121
1874
msgid " Ignore .class files in all directories...::"
1875
msgstr ""
1876
1877
#: bzrlib/builtins.py:3123
1878
msgid " bzr ignore \"*.class\""
1879
msgstr ""
1880
1881
#: bzrlib/builtins.py:3125
1882
msgid " ...but do not ignore \"special.class\"::"
1883
msgstr ""
1884
1885
#: bzrlib/builtins.py:3127
1886
msgid " bzr ignore \"!special.class\""
1887
msgstr ""
1888
1889
#: bzrlib/builtins.py:3129
1890
msgid " Ignore files whose name begins with the \"#\" character::"
1891
msgstr ""
1892
1893
#: bzrlib/builtins.py:3131
1894
msgid " bzr ignore \"RE:^#\""
1895
msgstr ""
1896
1897
#: bzrlib/builtins.py:3133 bzrlib/builtins.py:3137
1898
msgid " Ignore .o files under the lib directory::"
1899
msgstr ""
1900
1901
#: bzrlib/builtins.py:3135
1902
msgid " bzr ignore \"lib/**/*.o\""
1903
msgstr ""
1904
1905
#: bzrlib/builtins.py:3139
1906
msgid " bzr ignore \"RE:lib/.*\\.o\""
1907
msgstr ""
1908
1909
#: bzrlib/builtins.py:3141
1910
msgid " Ignore everything but the \"debian\" toplevel directory::"
1911
msgstr ""
1912
1913
#: bzrlib/builtins.py:3143
1914
msgid ""
1915
" bzr ignore \"RE:(?!debian/).*\"\n"
1916
" \n"
1917
" Ignore everything except the \"local\" toplevel directory,\n"
1918
" but always ignore autosave files ending in ~, even under local/::\n"
1919
" \n"
1920
" bzr ignore \"*\"\n"
1921
" bzr ignore \"!./local\"\n"
1922
" bzr ignore \"!!*~\""
1923
msgstr ""
1924
1925
#: bzrlib/builtins.py:3157
1926
msgid "Display the default ignore rules that bzr uses."
1927
msgstr ""
1928
1929
#: bzrlib/builtins.py:3169
1930
msgid "ignore requires at least one NAME_PATTERN or --default-rules."
1931
msgstr ""
1932
1933
#: bzrlib/builtins.py:3180
1934
#, python-format
1935
msgid "Invalid ignore pattern found. %s"
1936
msgid_plural "Invalid ignore patterns found. %s"
1937
msgstr[0] ""
1938
msgstr[1] ""
1939
1940
#: bzrlib/builtins.py:3189
1941
msgid "NAME_PATTERN should not be an absolute path"
1942
msgstr ""
1943
1944
#: bzrlib/builtins.py:3202
1945
#, python-format
1946
msgid ""
1947
"Warning: the following files are version controlled and match your ignore "
1948
"pattern:\n"
1949
"%s\n"
1950
"These files will continue to be version controlled unless you 'bzr remove' "
1951
"them.\n"
1952
msgstr ""
1953
1954
#: bzrlib/builtins.py:3209
1955
msgid "List ignored files and the patterns that matched them."
1956
msgstr ""
1957
1958
#: bzrlib/builtins.py:3211
1959
msgid ""
1960
"List all the ignored files and the ignore pattern that caused the file to\n"
1961
"be ignored."
1962
msgstr ""
1963
1964
#: bzrlib/builtins.py:3214
1965
msgid "Alternatively, to list just the files::"
1966
msgstr ""
1967
1968
#: bzrlib/builtins.py:3216
1969
msgid " bzr ls --ignored"
1970
msgstr ""
1971
1972
#: bzrlib/builtins.py:3250
1973
#, python-format
1974
msgid "not a valid revision-number: %r"
1975
msgstr ""
1976
1977
#: bzrlib/builtins.py:3257
1978
msgid ""
1979
"Export current or past revision to a destination directory or archive."
1980
msgstr ""
1981
1982
#: bzrlib/builtins.py:3259
1983
msgid "If no revision is specified this exports the last committed revision."
1984
msgstr ""
1985
1986
#: bzrlib/builtins.py:3261
1987
msgid ""
1988
"Format may be an \"exporter\" name, such as tar, tgz, tbz2. If none is\n"
1989
"given, try to find the format with the extension. If no extension\n"
1990
"is found exports to a directory (equivalent to --format=dir)."
1991
msgstr ""
1992
1993
#: bzrlib/builtins.py:3265
1994
msgid ""
1995
"If root is supplied, it will be used as the root directory inside\n"
1996
"container formats (tar, zip, etc). If it is not supplied it will default\n"
1997
"to the exported filename. The root option has no effect for 'dir' format."
1998
msgstr ""
1999
2000
#: bzrlib/builtins.py:3269
2001
msgid ""
2002
"If branch is omitted then the branch containing the current working\n"
2003
"directory will be used."
2004
msgstr ""
2005
2006
#: bzrlib/builtins.py:3272
2007
msgid ""
2008
"Note: Export of tree with non-ASCII filenames to zip is not supported."
2009
msgstr ""
2010
2011
#: bzrlib/builtins.py:3274
2012
msgid ""
2013
" ================= =========================\n"
2014
" Supported formats Autodetected by extension\n"
2015
" ================= =========================\n"
2016
" dir (none)\n"
2017
" tar .tar\n"
2018
" tbz2 .tar.bz2, .tbz2\n"
2019
" tgz .tar.gz, .tgz\n"
2020
" zip .zip\n"
2021
" ================= ========================="
2022
msgstr ""
2023
2024
#: bzrlib/builtins.py:3288
2025
msgid "Type of file to export to."
2026
msgstr ""
2027
2028
#: bzrlib/builtins.py:3291
2029
msgid "Apply content filters to export the convenient form."
2030
msgstr ""
2031
2032
#: bzrlib/builtins.py:3295
2033
msgid "Name of the root directory inside the exported file."
2034
msgstr ""
2035
2036
#: bzrlib/builtins.py:3297
2037
msgid ""
2038
"Set modification time of files to that of the last revision in which it was "
2039
"changed."
2040
msgstr ""
2041
2042
#: bzrlib/builtins.py:3300
2043
msgid ""
2044
"Export the working tree contents rather than that of the last revision."
2045
msgstr ""
2046
2047
#: bzrlib/builtins.py:3319
2048
msgid "--uncommitted requires a working tree"
2049
msgstr ""
2050
2051
#: bzrlib/builtins.py:3328
2052
#, python-format
2053
msgid "Unsupported export format: %s"
2054
msgstr ""
2055
2056
#: bzrlib/builtins.py:3332
2057
msgid ""
2058
"Write the contents of a file as of a given revision to standard output."
2059
msgstr ""
2060
2061
#: bzrlib/builtins.py:3334
2062
msgid "If no revision is nominated, the last revision is used."
2063
msgstr ""
2064
2065
#: bzrlib/builtins.py:3336
2066
msgid ""
2067
"Note: Take care to redirect standard output when using this command on a\n"
2068
"binary file."
2069
msgstr ""
2070
2071
#: bzrlib/builtins.py:3342
2072
msgid "The path name in the old tree."
2073
msgstr ""
2074
2075
#: bzrlib/builtins.py:3343
2076
msgid "Apply content filters to display the convenience form."
2077
msgstr ""
2078
2079
#: bzrlib/builtins.py:3354
2080
msgid "bzr cat --revision takes exactly one revision specifier"
2081
msgstr ""
2082
2083
#: bzrlib/builtins.py:3379 bzrlib/builtins.py:3391
2084
msgid "{0!r} is not present in revision {1}"
2085
msgstr ""
2086
2087
#: bzrlib/builtins.py:3414
2088
msgid "Commit changes into a new revision."
2089
msgstr ""
2090
2091
#: bzrlib/builtins.py:3416
2092
msgid ""
2093
"An explanatory message needs to be given for each commit. This is\n"
2094
"often done by using the --message option (getting the message from the\n"
2095
"command line) or by using the --file option (getting the message from\n"
2096
"a file). If neither of these options is given, an editor is opened for\n"
2097
"the user to enter the message. To see the changed files in the\n"
2098
"boilerplate text loaded into the editor, use the --show-diff option."
2099
msgstr ""
2100
2101
#: bzrlib/builtins.py:3423
2102
msgid ""
2103
"By default, the entire tree is committed and the person doing the\n"
2104
"commit is assumed to be the author. These defaults can be overridden\n"
2105
"as explained below."
2106
msgstr ""
2107
2108
#: bzrlib/builtins.py:3427
2109
msgid ":Selective commits:"
2110
msgstr ""
2111
2112
#: bzrlib/builtins.py:3429
2113
msgid ""
2114
" If selected files are specified, only changes to those files are\n"
2115
" committed. If a directory is specified then the directory and\n"
2116
" everything within it is committed."
2117
msgstr ""
2118
2119
#: bzrlib/builtins.py:3433
2120
msgid ""
2121
" When excludes are given, they take precedence over selected files.\n"
2122
" For example, to commit only changes within foo, but not changes\n"
2123
" within foo/bar::"
2124
msgstr ""
2125
2126
#: bzrlib/builtins.py:3437
2127
msgid " bzr commit foo -x foo/bar"
2128
msgstr ""
2129
2130
#: bzrlib/builtins.py:3439
2131
msgid " A selective commit after a merge is not yet supported."
2132
msgstr ""
2133
2134
#: bzrlib/builtins.py:3441
2135
msgid ":Custom authors:"
2136
msgstr ""
2137
2138
#: bzrlib/builtins.py:3443
2139
msgid ""
2140
" If the author of the change is not the same person as the committer,\n"
2141
" you can specify the author's name using the --author option. The\n"
2142
" name should be in the same format as a committer-id, e.g.\n"
2143
" \"John Doe <jdoe@example.com>\". If there is more than one author of\n"
2144
" the change you can specify the option multiple times, once for each\n"
2145
" author."
2146
msgstr ""
2147
2148
#: bzrlib/builtins.py:3450
2149
msgid ":Checks:"
2150
msgstr ""
2151
2152
#: bzrlib/builtins.py:3452
2153
msgid ""
2154
" A common mistake is to forget to add a new file or directory before\n"
2155
" running the commit command. The --strict option checks for unknown\n"
2156
" files and aborts the commit if any are found. More advanced pre-commit\n"
2157
" checks can be implemented by defining hooks. See ``bzr help hooks``\n"
2158
" for details."
2159
msgstr ""
2160
2161
#: bzrlib/builtins.py:3458
2162
msgid ":Things to note:"
2163
msgstr ""
2164
2165
#: bzrlib/builtins.py:3460
2166
msgid ""
2167
" If you accidentially commit the wrong changes or make a spelling\n"
2168
" mistake in the commit message say, you can use the uncommit command\n"
2169
" to undo it. See ``bzr help uncommit`` for details."
2170
msgstr ""
2171
2172
#: bzrlib/builtins.py:3464
2173
msgid ""
2174
" Hooks can also be configured to run after a commit. This allows you\n"
2175
" to trigger updates to external systems like bug trackers. The --fixes\n"
2176
" option can be used to record the association between a revision and\n"
2177
" one or more bugs. See ``bzr help bugs`` for details."
2178
msgstr ""
2179
2180
#: bzrlib/builtins.py:3474
2181
msgid "Do not consider changes made to a given path."
2182
msgstr ""
2183
2184
#: bzrlib/builtins.py:3477
2185
msgid "Description of the new revision."
2186
msgstr ""
2187
2188
#: bzrlib/builtins.py:3480
2189
msgid "Commit even if nothing has changed."
2190
msgstr ""
2191
2192
#: bzrlib/builtins.py:3484
2193
msgid "Take commit message from this file."
2194
msgstr ""
2195
2196
#: bzrlib/builtins.py:3486
2197
msgid "Refuse to commit if there are unknown files in the working tree."
2198
msgstr ""
2199
2200
#: bzrlib/builtins.py:3489
2201
msgid ""
2202
"Manually set a commit time using commit date format, e.g. '2009-10-10 "
2203
"08:00:00 +0100'."
2204
msgstr ""
2205
2206
#: bzrlib/builtins.py:3492
2207
msgid "Mark a bug as being fixed by this revision (see \"bzr help bugs\")."
2208
msgstr ""
2209
2210
#: bzrlib/builtins.py:3495
2211
msgid "Set the author's name, if it's different from the committer."
2212
msgstr ""
2213
2214
#: bzrlib/builtins.py:3498
2215
msgid ""
2216
"Perform a local commit in a bound branch. Local commits are not pushed to "
2217
"the master branch until a normal commit is performed."
2218
msgstr ""
2219
2220
#: bzrlib/builtins.py:3504
2221
msgid ""
2222
"When no message is supplied, show the diff along with the status summary in "
2223
"the message editor."
2224
msgstr ""
2225
2226
#: bzrlib/builtins.py:3507
2227
msgid ""
2228
"When committing to a foreign version control system do not push data that "
2229
"can not be natively represented."
2230
msgstr ""
2231
2232
#: bzrlib/builtins.py:3525
2233
#, python-format
2234
msgid ""
2235
"No tracker specified for bug %s. Use the form 'tracker:id' or specify a "
2236
"default bug tracker using the `bugtracker` option.\n"
2237
"See \"bzr help bugs\" for more information on this feature. Commit refused."
2238
msgstr ""
2239
2240
#: bzrlib/builtins.py:3534
2241
#, python-format
2242
msgid ""
2243
"Invalid bug %s. Must be in the form of 'tracker:id'. See \"bzr help bugs\" "
2244
"for more information on this feature.\n"
2245
"Commit refused."
2246
msgstr ""
2247
2248
#: bzrlib/builtins.py:3543
2249
#, python-format
2250
msgid "Unrecognized bug %s. Commit refused."
2251
msgstr ""
2252
2253
#: bzrlib/builtins.py:3546
2254
#, python-format
2255
msgid ""
2256
"%s\n"
2257
"Commit refused."
2258
msgstr ""
2259
2260
#: bzrlib/builtins.py:3570
2261
msgid "Could not parse --commit-time: "
2262
msgstr ""
2263
2264
#: bzrlib/builtins.py:3610
2265
msgid "please specify either --message or --file"
2266
msgstr ""
2267
2268
#: bzrlib/builtins.py:3639
2269
msgid "please specify a commit message with either --message or --file"
2270
msgstr ""
2271
2272
#: bzrlib/builtins.py:3642
2273
msgid ""
2274
"Empty commit message specified. Please specify a commit message with either -"
2275
"-message or --file or leave a blank message with --message \"\"."
2276
msgstr ""
2277
2278
#: bzrlib/builtins.py:3662
2279
msgid ""
2280
"No changes to commit. Please 'bzr add' the files you want to commit, or use -"
2281
"-unchanged to force an empty commit."
2282
msgstr ""
2283
2284
#: bzrlib/builtins.py:3666
2285
msgid ""
2286
"Conflicts detected in working tree. Use \"bzr conflicts\" to list, \"bzr "
2287
"resolve FILE\" to resolve."
2288
msgstr ""
2289
2290
#: bzrlib/builtins.py:3670
2291
msgid "Commit refused because there are unknown files in the working tree."
2292
msgstr ""
2293
2294
#: bzrlib/builtins.py:3673
2295
msgid ""
2296
"\n"
2297
"To commit to master branch, run update and then commit.\n"
2298
"You can also pass --local to commit to continue working disconnected."
2299
msgstr ""
2300
2301
#: bzrlib/builtins.py:3681
2302
msgid ""
2303
"Validate working tree structure, branch consistency and repository history."
2304
msgstr ""
2305
2306
#: bzrlib/builtins.py:3683
2307
msgid ""
2308
"This command checks various invariants about branch and repository storage\n"
2309
"to detect data corruption or bzr bugs."
2310
msgstr ""
2311
2312
#: bzrlib/builtins.py:3686
2313
msgid ""
2314
"The working tree and branch checks will only give output if a problem is\n"
2315
"detected. The output fields of the repository check are:"
2316
msgstr ""
2317
2318
#: bzrlib/builtins.py:3689
2319
msgid ""
2320
"revisions\n"
2321
" This is just the number of revisions checked. It doesn't\n"
2322
" indicate a problem."
2323
msgstr ""
2324
2325
#: bzrlib/builtins.py:3693
2326
msgid ""
2327
"versionedfiles\n"
2328
" This is just the number of versionedfiles checked. It\n"
2329
" doesn't indicate a problem."
2330
msgstr ""
2331
2332
#: bzrlib/builtins.py:3697
2333
msgid ""
2334
"unreferenced ancestors\n"
2335
" Texts that are ancestors of other texts, but\n"
2336
" are not properly referenced by the revision ancestry. This is a\n"
2337
" subtle problem that Bazaar can work around."
2338
msgstr ""
2339
2340
#: bzrlib/builtins.py:3702
2341
msgid ""
2342
"unique file texts\n"
2343
" This is the total number of unique file contents\n"
2344
" seen in the checked revisions. It does not indicate a problem."
2345
msgstr ""
2346
2347
#: bzrlib/builtins.py:3706
2348
msgid ""
2349
"repeated file texts\n"
2350
" This is the total number of repeated texts seen\n"
2351
" in the checked revisions. Texts can be repeated when their file\n"
2352
" entries are modified, but the file contents are not. It does not\n"
2353
" indicate a problem."
2354
msgstr ""
2355
2356
#: bzrlib/builtins.py:3712
2357
msgid ""
2358
"If no restrictions are specified, all Bazaar data that is found at the "
2359
"given\n"
2360
"location will be checked."
2361
msgstr ""
2362
2363
#: bzrlib/builtins.py:3717
2364
msgid " Check the tree and branch at 'foo'::"
2365
msgstr ""
2366
2367
#: bzrlib/builtins.py:3719
2368
msgid " bzr check --tree --branch foo"
2369
msgstr ""
2370
2371
#: bzrlib/builtins.py:3721
2372
msgid " Check only the repository at 'bar'::"
2373
msgstr ""
2374
2375
#: bzrlib/builtins.py:3723
2376
msgid " bzr check --repo bar"
2377
msgstr ""
2378
2379
#: bzrlib/builtins.py:3725
2380
msgid " Check everything at 'baz'::"
2381
msgstr ""
2382
2383
#: bzrlib/builtins.py:3727
2384
msgid " bzr check baz"
2385
msgstr ""
2386
2387
#: bzrlib/builtins.py:3733
2388
msgid "Check the branch related to the current directory."
2389
msgstr ""
2390
2391
#: bzrlib/builtins.py:3735
2392
msgid "Check the repository related to the current directory."
2393
msgstr ""
2394
2395
#: bzrlib/builtins.py:3737
2396
msgid "Check the working tree related to the current directory."
2397
msgstr ""
2398
2399
#: bzrlib/builtins.py:3751
2400
msgid "Upgrade a repository, branch or working tree to a newer format."
2401
msgstr ""
2402
2403
#: bzrlib/builtins.py:3753
2404
msgid ""
2405
"When the default format has changed after a major new release of\n"
2406
"Bazaar, you may be informed during certain operations that you\n"
2407
"should upgrade. Upgrading to a newer format may improve performance\n"
2408
"or make new features available. It may however limit interoperability\n"
2409
"with older repositories or with older versions of Bazaar."
2410
msgstr ""
2411
2412
#: bzrlib/builtins.py:3759
2413
msgid ""
2414
"If you wish to upgrade to a particular format rather than the\n"
2415
"current default, that can be specified using the --format option.\n"
2416
"As a consequence, you can use the upgrade command this way to\n"
2417
"\"downgrade\" to an earlier format, though some conversions are\n"
2418
"a one way process (e.g. changing from the 1.x default to the\n"
2419
"2.x default) so downgrading is not always possible."
2420
msgstr ""
2421
2422
#: bzrlib/builtins.py:3766
2423
msgid ""
2424
"A backup.bzr.~#~ directory is created at the start of the conversion\n"
2425
"process (where # is a number). By default, this is left there on\n"
2426
"completion. If the conversion fails, delete the new .bzr directory\n"
2427
"and rename this one back in its place. Use the --clean option to ask\n"
2428
"for the backup.bzr directory to be removed on successful conversion.\n"
2429
"Alternatively, you can delete it by hand if everything looks good\n"
2430
"afterwards."
2431
msgstr ""
2432
2433
#: bzrlib/builtins.py:3774
2434
msgid ""
2435
"If the location given is a shared repository, dependent branches\n"
2436
"are also converted provided the repository converts successfully.\n"
2437
"If the conversion of a branch fails, remaining branches are still\n"
2438
"tried."
2439
msgstr ""
2440
2441
#: bzrlib/builtins.py:3779
2442
msgid ""
2443
"For more information on upgrades, see the Bazaar Upgrade Guide,\n"
2444
"http://doc.bazaar.canonical.com/latest/en/upgrade-guide/."
2445
msgstr ""
2446
2447
#: bzrlib/builtins.py:3787
2448
msgid "Upgrade to a specific format. See \"bzr help formats\" for details."
2449
msgstr ""
2450
2451
#: bzrlib/builtins.py:3791
2452
msgid "Branch format"
2453
msgstr ""
2454
2455
#: bzrlib/builtins.py:3793
2456
msgid "Remove the backup.bzr directory if successful."
2457
msgstr ""
2458
2459
#: bzrlib/builtins.py:3795
2460
msgid "Show what would be done, but don't actually do anything."
2461
msgstr ""
2462
2463
#: bzrlib/builtins.py:3810
2464
msgid "Show or set bzr user id."
2465
msgstr ""
2466
2467
#: bzrlib/builtins.py:3812
2468
msgid ""
2469
":Examples:\n"
2470
" Show the email of the current user::"
2471
msgstr ""
2472
2473
#: bzrlib/builtins.py:3815
2474
msgid " bzr whoami --email"
2475
msgstr ""
2476
2477
#: bzrlib/builtins.py:3817
2478
msgid " Set the current user::"
2479
msgstr ""
2480
2481
#: bzrlib/builtins.py:3819
2482
msgid " bzr whoami \"Frank Chu <fchu@example.com>\""
2483
msgstr ""
2484
2485
#: bzrlib/builtins.py:3823
2486
msgid "Display email address only."
2487
msgstr ""
2488
2489
#: bzrlib/builtins.py:3825
2490
msgid "Set identity for the current branch instead of globally."
2491
msgstr ""
2492
2493
#: bzrlib/builtins.py:3851
2494
msgid "--email can only be used to display existing identity"
2495
msgstr ""
2496
2497
#: bzrlib/builtins.py:3873
2498
msgid "Print or set the branch nickname."
2499
msgstr ""
2500
2501
#: bzrlib/builtins.py:3875
2502
msgid ""
2503
"If unset, the tree root directory name is used as the nickname.\n"
2504
"To print the current nickname, execute with no argument."
2505
msgstr ""
2506
2507
#: bzrlib/builtins.py:3878
2508
msgid ""
2509
"Bound branches use the nickname of its master branch unless it is set\n"
2510
"locally."
2511
msgstr ""
2512
2513
#: bzrlib/builtins.py:3898
2514
msgid "Set/unset and display aliases."
2515
msgstr ""
2516
2517
#: bzrlib/builtins.py:3900
2518
msgid ""
2519
":Examples:\n"
2520
" Show the current aliases::"
2521
msgstr ""
2522
2523
#: bzrlib/builtins.py:3903
2524
msgid " bzr alias"
2525
msgstr ""
2526
2527
#: bzrlib/builtins.py:3905
2528
msgid " Show the alias specified for 'll'::"
2529
msgstr ""
2530
2531
#: bzrlib/builtins.py:3907
2532
msgid " bzr alias ll"
2533
msgstr ""
2534
2535
#: bzrlib/builtins.py:3909
2536
msgid " Set an alias for 'll'::"
2537
msgstr ""
2538
2539
#: bzrlib/builtins.py:3911
2540
msgid " bzr alias ll=\"log --line -r-10..-1\""
2541
msgstr ""
2542
2543
#: bzrlib/builtins.py:3913
2544
msgid " To remove an alias for 'll'::"
2545
msgstr ""
2546
2547
#: bzrlib/builtins.py:3915
2548
msgid " bzr alias --remove ll"
2549
msgstr ""
2550
2551
#: bzrlib/builtins.py:3920
2552
msgid "Remove the alias."
2553
msgstr ""
2554
2555
#: bzrlib/builtins.py:3938
2556
msgid "bzr alias --remove expects an alias to remove."
2557
msgstr ""
2558
2559
#: bzrlib/builtins.py:4119
2560
msgid ""
2561
"subunit not available. subunit needs to be installed to use --subunit."
2562
msgstr ""
2563
2564
#: bzrlib/builtins.py:4136
2565
msgid ""
2566
"--benchmark is no longer supported from bzr 2.2; use bzr-usertest instead"
2567
msgstr ""
2568
2569
#: bzrlib/builtins.py:4183
2570
msgid "Show version of bzr."
2571
msgstr ""
2572
2573
#: bzrlib/builtins.py:4187
2574
msgid "Print just the version number."
2575
msgstr ""
2576
2577
#: bzrlib/builtins.py:4206
2578
msgid "It sure does!\n"
2579
msgstr ""
2580
2581
#: bzrlib/builtins.py:4230
2582
#, python-format
2583
msgid "merge base is revision %s\n"
2584
msgstr ""
2585
2586
#: bzrlib/builtins.py:4234
2587
msgid "Perform a three-way merge."
2588
msgstr ""
2589
2590
#: bzrlib/builtins.py:4236
2591
msgid ""
2592
"The source of the merge can be specified either in the form of a branch,\n"
2593
"or in the form of a path to a file containing a merge directive generated\n"
2594
"with bzr send. If neither is specified, the default is the upstream branch\n"
2595
"or the branch most recently merged using --remember. The source of the\n"
2596
"merge may also be specified in the form of a path to a file in another\n"
2597
"branch: in this case, only the modifications to that file are merged into\n"
2598
"the current working tree."
2599
msgstr ""
2600
2601
#: bzrlib/builtins.py:4244
2602
msgid ""
2603
"When merging from a branch, by default bzr will try to merge in all new\n"
2604
"work from the other branch, automatically determining an appropriate base\n"
2605
"revision. If this fails, you may need to give an explicit base."
2606
msgstr ""
2607
2608
#: bzrlib/builtins.py:4248
2609
msgid ""
2610
"To pick a different ending revision, pass \"--revision OTHER\". bzr will\n"
2611
"try to merge in all new work up to and including revision OTHER."
2612
msgstr ""
2613
2614
#: bzrlib/builtins.py:4251
2615
msgid ""
2616
"If you specify two values, \"--revision BASE..OTHER\", only revisions BASE\n"
2617
"through OTHER, excluding BASE but including OTHER, will be merged. If this\n"
2618
"causes some revisions to be skipped, i.e. if the destination branch does\n"
2619
"not already contain revision BASE, such a merge is commonly referred to as\n"
2620
"a \"cherrypick\". Unlike a normal merge, Bazaar does not currently track\n"
2621
"cherrypicks. The changes look like a normal commit, and the history of the\n"
2622
"changes from the other branch is not stored in the commit."
2623
msgstr ""
2624
2625
#: bzrlib/builtins.py:4259
2626
msgid "Revision numbers are always relative to the source branch."
2627
msgstr ""
2628
2629
#: bzrlib/builtins.py:4261 bzrlib/conflicts.py:52 bzrlib/conflicts.py:106
2630
msgid ""
2631
"Merge will do its best to combine the changes in two branches, but there\n"
2632
"are some kinds of problems only a human can fix. When it encounters those,\n"
2633
"it will mark a conflict. A conflict means that you need to fix something,\n"
2634
"before you can commit."
2635
msgstr ""
2636
2637
#: bzrlib/builtins.py:4266
2638
msgid ""
2639
"Use bzr resolve when you have fixed a problem. See also bzr conflicts."
2640
msgstr ""
2641
2642
#: bzrlib/builtins.py:4268
2643
msgid ""
2644
"If there is no default branch set, the first merge will set it (use\n"
2645
"--no-remember to avoid setting it). After that, you can omit the branch\n"
2646
"to use the default. To change the default, use --remember. The value will\n"
2647
"only be saved if the remote location can be accessed."
2648
msgstr ""
2649
2650
#: bzrlib/builtins.py:4273
2651
msgid ""
2652
"The results of the merge are placed into the destination working\n"
2653
"directory, where they can be reviewed (with bzr diff), tested, and then\n"
2654
"committed to record the result of the merge."
2655
msgstr ""
2656
2657
#: bzrlib/builtins.py:4277
2658
msgid ""
2659
"merge refuses to run if there are any uncommitted changes, unless\n"
2660
"--force is given. If --force is given, then the changes from the source \n"
2661
"will be merged with the current working tree, including any uncommitted\n"
2662
"changes in the tree. The --force option can also be used to create a\n"
2663
"merge revision which has more than two parents."
2664
msgstr ""
2665
2666
#: bzrlib/builtins.py:4283
2667
msgid ""
2668
"If one would like to merge changes from the working tree of the other\n"
2669
"branch without merging any committed revisions, the --uncommitted option\n"
2670
"can be given."
2671
msgstr ""
2672
2673
#: bzrlib/builtins.py:4287
2674
msgid ""
2675
"To select only some changes to merge, use \"merge -i\", which will prompt\n"
2676
"you to apply each diff hunk and file change, similar to \"shelve\"."
2677
msgstr ""
2678
2679
#: bzrlib/builtins.py:4290
2680
msgid ""
2681
":Examples:\n"
2682
" To merge all new revisions from bzr.dev::"
2683
msgstr ""
2684
2685
#: bzrlib/builtins.py:4293
2686
msgid " bzr merge ../bzr.dev"
2687
msgstr ""
2688
2689
#: bzrlib/builtins.py:4295
2690
msgid " To merge changes up to and including revision 82 from bzr.dev::"
2691
msgstr ""
2692
2693
#: bzrlib/builtins.py:4297
2694
msgid " bzr merge -r 82 ../bzr.dev"
2695
msgstr ""
2696
2697
#: bzrlib/builtins.py:4299
2698
msgid " To merge the changes introduced by 82, without previous changes::"
2699
msgstr ""
2700
2701
#: bzrlib/builtins.py:4301
2702
msgid " bzr merge -r 81..82 ../bzr.dev"
2703
msgstr ""
2704
2705
#: bzrlib/builtins.py:4303
2706
msgid " To apply a merge directive contained in /tmp/merge::"
2707
msgstr ""
2708
2709
#: bzrlib/builtins.py:4305
2710
msgid " bzr merge /tmp/merge"
2711
msgstr ""
2712
2713
#: bzrlib/builtins.py:4307
2714
msgid ""
2715
" To create a merge revision with three parents from two branches\n"
2716
" feature1a and feature1b:"
2717
msgstr ""
2718
2719
#: bzrlib/builtins.py:4310
2720
msgid ""
2721
" bzr merge ../feature1a\n"
2722
" bzr merge ../feature1b --force\n"
2723
" bzr commit -m 'revision with three parents'"
2724
msgstr ""
2725
2726
#: bzrlib/builtins.py:4322
2727
msgid "Merge even if the destination tree has uncommitted changes."
2728
msgstr ""
2729
2730
#: bzrlib/builtins.py:4328
2731
msgid ""
2732
"Apply uncommitted changes from a working copy, instead of branch changes."
2733
msgstr ""
2734
2735
#: bzrlib/builtins.py:4330
2736
msgid ""
2737
"If the destination is already completely merged into the source, pull from "
2738
"the source rather than merging. When this happens, you do not need to "
2739
"commit the result."
2740
msgstr ""
2741
2742
#: bzrlib/builtins.py:4335
2743
msgid ""
2744
"Branch to merge into, rather than the one containing the working directory."
2745
msgstr ""
2746
2747
#: bzrlib/builtins.py:4337
2748
msgid "Instead of merging, show a diff of the merge."
2749
msgstr ""
2750
2751
#: bzrlib/builtins.py:4339
2752
msgid "Select changes interactively."
2753
msgstr ""
2754
2755
#: bzrlib/builtins.py:4361
2756
msgid ""
2757
"Merging into empty branches not currently supported, "
2758
"https://bugs.launchpad.net/bzr/+bug/308562"
2759
msgstr ""
2760
2761
#: bzrlib/builtins.py:4388
2762
msgid "Cannot use --uncommitted with bundles or merge directives."
2763
msgstr ""
2764
2765
#: bzrlib/builtins.py:4399
2766
msgid "Cannot use --uncommitted and --revision at the same time."
2767
msgstr ""
2768
2769
#: bzrlib/builtins.py:4419
2770
msgid "merger: "
2771
msgstr ""
2772
2773
#: bzrlib/builtins.py:4421 bzrlib/bundle/apply_bundle.py:71
2774
msgid "Nothing to do."
2775
msgstr ""
2776
2777
#: bzrlib/builtins.py:4425
2778
msgid "Cannot pull individual files"
2779
msgstr ""
2780
2781
#: bzrlib/builtins.py:4433
2782
msgid "This branch has no commits. (perhaps you would prefer 'bzr pull')"
2783
msgstr ""
2784
2785
#: bzrlib/builtins.py:4491
2786
#, python-format
2787
msgid "Show-base is not supported for this merge type. %s"
2788
msgstr ""
2789
2790
#: bzrlib/builtins.py:4500
2791
#, python-format
2792
msgid "Conflict reduction is not supported for merge type %s."
2793
msgstr ""
2794
2795
#: bzrlib/builtins.py:4504
2796
msgid "Cannot do conflict reduction and show base."
2797
msgstr ""
2798
2799
#: bzrlib/builtins.py:4615
2800
msgid "No location specified or remembered"
2801
msgstr ""
2802
2803
#: bzrlib/builtins.py:4617
2804
msgid "{0} remembered {1} location {2}"
2805
msgstr ""
2806
2807
#: bzrlib/builtins.py:4623
2808
msgid "Redo a merge."
2809
msgstr ""
2810
2811
#: bzrlib/builtins.py:4625
2812
msgid ""
2813
"Use this if you want to try a different merge technique while resolving\n"
2814
"conflicts. Some merge techniques are better than others, and remerge\n"
2815
"lets you try different ones on different files."
2816
msgstr ""
2817
2818
#: bzrlib/builtins.py:4629
2819
msgid ""
2820
"The options for remerge have the same meaning and defaults as the ones for\n"
2821
"merge. The difference is that remerge can (only) be run when there is a\n"
2822
"pending merge, and it lets you specify particular files."
2823
msgstr ""
2824
2825
#: bzrlib/builtins.py:4633
2826
msgid ""
2827
":Examples:\n"
2828
" Re-do the merge of all conflicted files, and show the base text in\n"
2829
" conflict regions, in addition to the usual THIS and OTHER texts::"
2830
msgstr ""
2831
2832
#: bzrlib/builtins.py:4637
2833
msgid " bzr remerge --show-base"
2834
msgstr ""
2835
2836
#: bzrlib/builtins.py:4639
2837
msgid ""
2838
" Re-do the merge of \"foobar\", using the weave merge algorithm, with\n"
2839
" additional processing to reduce the size of conflict regions::"
2840
msgstr ""
2841
2842
#: bzrlib/builtins.py:4642
2843
msgid " bzr remerge --merge-type weave --reprocess foobar"
2844
msgstr ""
2845
2846
#: bzrlib/builtins.py:4649
2847
msgid "Show base revision text in conflicts."
2848
msgstr ""
2849
2850
#: bzrlib/builtins.py:4661
2851
msgid ""
2852
"Sorry, remerge only works after normal merges. Not cherrypicking or multi-"
2853
"merges."
2854
msgstr ""
2855
2856
#: bzrlib/builtins.py:4717
2857
msgid "Revert files to a previous revision."
2858
msgstr ""
2859
2860
#: bzrlib/builtins.py:4719
2861
msgid ""
2862
"Giving a list of files will revert only those files. Otherwise, all files\n"
2863
"will be reverted. If the revision is not specified with '--revision', the\n"
2864
"last committed revision is used."
2865
msgstr ""
2866
2867
#: bzrlib/builtins.py:4723
2868
msgid ""
2869
"To remove only some changes, without reverting to a prior version, use\n"
2870
"merge instead. For example, \"merge . -r -2..-3\" (don't forget the \".\")\n"
2871
"will remove the changes introduced by the second last commit (-2), without\n"
2872
"affecting the changes introduced by the last commit (-1). To remove\n"
2873
"certain changes on a hunk-by-hunk basis, see the shelve command."
2874
msgstr ""
2875
2876
#: bzrlib/builtins.py:4729
2877
msgid ""
2878
"By default, any files that have been manually changed will be backed up\n"
2879
"first. (Files changed only by merge are not backed up.) Backup files have\n"
2880
"'.~#~' appended to their name, where # is a number."
2881
msgstr ""
2882
2883
#: bzrlib/builtins.py:4733
2884
msgid ""
2885
"When you provide files, you can use their current pathname or the pathname\n"
2886
"from the target revision. So you can use revert to \"undelete\" a file by\n"
2887
"name. If you name a directory, all the contents of that directory will be\n"
2888
"reverted."
2889
msgstr ""
2890
2891
#: bzrlib/builtins.py:4738
2892
msgid ""
2893
"If you have newly added files since the target revision, they will be\n"
2894
"removed. If the files to be removed have been changed, backups will be\n"
2895
"created as above. Directories containing unknown files will not be\n"
2896
"deleted."
2897
msgstr ""
2898
2899
#: bzrlib/builtins.py:4743
2900
msgid ""
2901
"The working tree contains a list of revisions that have been merged but\n"
2902
"not yet committed. These revisions will be included as additional parents\n"
2903
"of the next commit. Normally, using revert clears that list as well as\n"
2904
"reverting the files. If any files are specified, revert leaves the list\n"
2905
"of uncommitted merges alone and reverts only the files. Use ``bzr revert\n"
2906
".`` in the tree root to revert all files but keep the recorded merges,\n"
2907
"and ``bzr revert --forget-merges`` to clear the pending merge list without\n"
2908
"reverting any files."
2909
msgstr ""
2910
2911
#: bzrlib/builtins.py:4752
2912
msgid ""
2913
"Using \"bzr revert --forget-merges\", it is possible to apply all of the\n"
2914
"changes from a branch in a single revision. To do this, perform the merge\n"
2915
"as desired. Then doing revert with the \"--forget-merges\" option will "
2916
"keep\n"
2917
"the content of the tree as it was, but it will clear the list of pending\n"
2918
"merges. The next commit will then contain all of the changes that are\n"
2919
"present in the other branch, but without any other parent revisions.\n"
2920
"Because this technique forgets where these changes originated, it may\n"
2921
"cause additional conflicts on later merges involving the same source and\n"
2922
"target branches."
2923
msgstr ""
2924
2925
#: bzrlib/builtins.py:4766
2926
msgid "Do not save backups of reverted files."
2927
msgstr ""
2928
2929
#: bzrlib/builtins.py:4768
2930
msgid "Remove pending merge marker, without changing any files."
2931
msgstr ""
2932
2933
#: bzrlib/builtins.py:4799
2934
msgid ""
2935
"Show help on a command or other topic.\n"
2936
" "
2937
msgstr ""
2938
2939
#: bzrlib/builtins.py:4804
2940
msgid "Show help on all commands."
2941
msgstr ""
2942
2943
#: bzrlib/builtins.py:4833
2944
msgid "Show unmerged/unpulled revisions between two branches."
2945
msgstr ""
2946
2947
#: bzrlib/builtins.py:4835
2948
msgid "OTHER_BRANCH may be local or remote."
2949
msgstr ""
2950
2951
#: bzrlib/builtins.py:4837
2952
msgid ""
2953
"To filter on a range of revisions, you can use the command -r begin..end\n"
2954
"-r revision requests a specific revision, -r ..end or -r begin.. are\n"
2955
"also valid.\n"
2956
" \n"
2957
":Exit values:\n"
2958
" 1 - some missing revisions\n"
2959
" 0 - no missing revisions"
2960
msgstr ""
2961
2962
#: bzrlib/builtins.py:4847
2963
msgid ""
2964
" Determine the missing revisions between this and the branch at the\n"
2965
" remembered pull location::"
2966
msgstr ""
2967
2968
#: bzrlib/builtins.py:4850
2969
msgid " bzr missing"
2970
msgstr ""
2971
2972
#: bzrlib/builtins.py:4852
2973
msgid " Determine the missing revisions between this and another branch::"
2974
msgstr ""
2975
2976
#: bzrlib/builtins.py:4854
2977
msgid " bzr missing http://server/branch"
2978
msgstr ""
2979
2980
#: bzrlib/builtins.py:4856
2981
msgid ""
2982
" Determine the missing revisions up to a specific revision on the other\n"
2983
" branch::"
2984
msgstr ""
2985
2986
#: bzrlib/builtins.py:4859
2987
msgid " bzr missing -r ..-10"
2988
msgstr ""
2989
2990
#: bzrlib/builtins.py:4861
2991
msgid ""
2992
" Determine the missing revisions up to a specific revision on this\n"
2993
" branch::"
2994
msgstr ""
2995
2996
#: bzrlib/builtins.py:4864
2997
msgid " bzr missing --my-revision ..-10"
2998
msgstr ""
2999
3000
#: bzrlib/builtins.py:4871
3001
msgid "Reverse the order of revisions."
3002
msgstr ""
3003
3004
#: bzrlib/builtins.py:4873
3005
msgid "Display changes in the local branch only."
3006
msgstr ""
3007
3008
#: bzrlib/builtins.py:4874
3009
msgid "Same as --mine-only."
3010
msgstr ""
3011
3012
#: bzrlib/builtins.py:4876
3013
msgid "Display changes in the remote branch only."
3014
msgstr ""
3015
3016
#: bzrlib/builtins.py:4877
3017
msgid "Same as --theirs-only."
3018
msgstr ""
3019
3020
#: bzrlib/builtins.py:4882
3021
msgid ""
3022
"Filter on other branch revisions (inclusive). See \"help revisionspec\" for "
3023
"details."
3024
msgstr ""
3025
3026
#: bzrlib/builtins.py:4886
3027
msgid ""
3028
"Filter on local branch revisions (inclusive). See \"help revisionspec\" for "
3029
"details."
3030
msgstr ""
3031
3032
#: bzrlib/builtins.py:4889
3033
msgid "Show all revisions in addition to the mainline ones."
3034
msgstr ""
3035
3036
#: bzrlib/builtins.py:4943
3037
msgid "No peer location known or specified."
3038
msgstr ""
3039
3040
#: bzrlib/builtins.py:4947
3041
msgid "Using saved parent location: {0}\n"
3042
msgstr ""
3043
3044
#: bzrlib/builtins.py:4980
3045
#, python-format
3046
msgid "You have %d extra revision:\n"
3047
msgid_plural "You have %d extra revisions:\n"
3048
msgstr[0] ""
3049
msgstr[1] ""
3050
3051
#: bzrlib/builtins.py:4996
3052
#, python-format
3053
msgid "You are missing %d revision:\n"
3054
msgid_plural "You are missing %d revisions:\n"
3055
msgstr[0] ""
3056
msgstr[1] ""
3057
3058
#: bzrlib/builtins.py:5008
3059
msgid "This branch has no new revisions.\n"
3060
msgstr ""
3061
3062
#: bzrlib/builtins.py:5011
3063
msgid "Other branch has no new revisions.\n"
3064
msgstr ""
3065
3066
#: bzrlib/builtins.py:5016
3067
msgid "Branches are up to date.\n"
3068
msgstr ""
3069
3070
#: bzrlib/builtins.py:5027
3071
msgid "Compress the data within a repository."
3072
msgstr ""
3073
3074
#: bzrlib/builtins.py:5029
3075
msgid ""
3076
"This operation compresses the data within a bazaar repository. As\n"
3077
"bazaar supports automatic packing of repository, this operation is\n"
3078
"normally not required to be done manually."
3079
msgstr ""
3080
3081
#: bzrlib/builtins.py:5033
3082
msgid ""
3083
"During the pack operation, bazaar takes a backup of existing repository\n"
3084
"data, i.e. pack files. This backup is eventually removed by bazaar\n"
3085
"automatically when it is safe to do so. To save disk space by removing\n"
3086
"the backed up pack files, the --clean-obsolete-packs option may be\n"
3087
"used."
3088
msgstr ""
3089
3090
#: bzrlib/builtins.py:5039
3091
msgid ""
3092
"Warning: If you use --clean-obsolete-packs and your machine crashes\n"
3093
"during or immediately after repacking, you may be left with a state\n"
3094
"where the deletion has been written to disk but the new packs have not\n"
3095
"been. In this case the repository may be unusable."
3096
msgstr ""
3097
3098
#: bzrlib/builtins.py:5048
3099
msgid "Delete obsolete packs to save disk space."
3100
msgstr ""
3101
3102
#: bzrlib/builtins.py:5062
3103
msgid "List the installed plugins."
3104
msgstr ""
3105
3106
#: bzrlib/builtins.py:5064
3107
msgid ""
3108
"This command displays the list of installed plugins including\n"
3109
"version of plugin and a short description of each."
3110
msgstr ""
3111
3112
#: bzrlib/builtins.py:5067
3113
msgid "--verbose shows the path where each plugin is located."
3114
msgstr ""
3115
3116
#: bzrlib/builtins.py:5069
3117
msgid ""
3118
"A plugin is an external component for Bazaar that extends the\n"
3119
"revision control system, by adding or replacing code in Bazaar.\n"
3120
"Plugins can do a variety of things, including overriding commands,\n"
3121
"adding new commands, providing additional network transports and\n"
3122
"customizing log output."
3123
msgstr ""
3124
3125
#: bzrlib/builtins.py:5075
3126
msgid ""
3127
"See the Bazaar Plugin Guide <http://doc.bazaar.canonical.com/plugins/en/>\n"
3128
"for further information on plugins including where to find them and how to\n"
3129
"install them. Instructions are also provided there on how to write new\n"
3130
"plugins using the Python programming language."
3131
msgstr ""
3132
3133
#: bzrlib/builtins.py:5091
3134
msgid "Show testament (signing-form) of a revision."
3135
msgstr ""
3136
3137
#: bzrlib/builtins.py:5094
3138
msgid "Produce long-format testament."
3139
msgstr ""
3140
3141
#: bzrlib/builtins.py:5096
3142
msgid "Produce a strict-format testament."
3143
msgstr ""
3144
3145
#: bzrlib/builtins.py:5122
3146
msgid "Show the origin of each line in a file."
3147
msgstr ""
3148
3149
#: bzrlib/builtins.py:5124
3150
msgid ""
3151
"This prints out the given file with an annotation on the left side\n"
3152
"indicating which revision, author and date introduced the change."
3153
msgstr ""
3154
3155
#: bzrlib/builtins.py:5127
3156
msgid ""
3157
"If the origin is the same for a run of consecutive lines, it is\n"
3158
"shown only at the top, unless the --all option is given."
3159
msgstr ""
3160
3161
#: bzrlib/builtins.py:5135
3162
msgid "Show annotations on all lines."
3163
msgstr ""
3164
3165
#: bzrlib/builtins.py:5136
3166
msgid "Show commit date in annotations."
3167
msgstr ""
3168
3169
#: bzrlib/builtins.py:5223
3170
msgid "Cannot sign a range of non-revision-history revisions"
3171
msgstr ""
3172
3173
#: bzrlib/builtins.py:5235
3174
msgid "Please supply either one revision, or a range."
3175
msgstr ""
3176
3177
#: bzrlib/builtins.py:5239
3178
msgid ""
3179
"Convert the current branch into a checkout of the supplied branch.\n"
3180
"If no branch is supplied, rebind to the last bound location."
3181
msgstr ""
3182
3183
#: bzrlib/builtins.py:5242
3184
msgid ""
3185
"Once converted into a checkout, commits must succeed on the master branch\n"
3186
"before they will be applied to the local branch."
3187
msgstr ""
3188
3189
#: bzrlib/builtins.py:5245
3190
msgid ""
3191
"Bound branches use the nickname of its master branch unless it is set\n"
3192
"locally, in which case binding will update the local nickname to be\n"
3193
"that of the master."
3194
msgstr ""
3195
3196
#: bzrlib/builtins.py:5260
3197
msgid "No location supplied. This format does not remember old locations."
3198
msgstr ""
3199
3200
#: bzrlib/builtins.py:5265
3201
msgid "Branch is already bound"
3202
msgstr ""
3203
3204
#: bzrlib/builtins.py:5267
3205
msgid "No location supplied and no previous location known"
3206
msgstr ""
3207
3208
#: bzrlib/builtins.py:5273
3209
msgid "These branches have diverged. Try merging, and then bind again."
3210
msgstr ""
3211
3212
#: bzrlib/builtins.py:5280
3213
msgid "Convert the current checkout into a regular branch."
3214
msgstr ""
3215
3216
#: bzrlib/builtins.py:5282
3217
msgid ""
3218
"After unbinding, the local branch is considered independent and subsequent\n"
3219
"commits will be local only."
3220
msgstr ""
3221
3222
#: bzrlib/builtins.py:5293
3223
msgid "Local branch is not bound"
3224
msgstr ""
3225
3226
#: bzrlib/builtins.py:5297
3227
msgid "Remove the last committed revision."
3228
msgstr ""
3229
3230
#: bzrlib/builtins.py:5299
3231
msgid ""
3232
"--verbose will print out what is being removed.\n"
3233
"--dry-run will go through all the motions, but not actually\n"
3234
"remove anything."
3235
msgstr ""
3236
3237
#: bzrlib/builtins.py:5303
3238
msgid ""
3239
"If --revision is specified, uncommit revisions to leave the branch at the\n"
3240
"specified revision. For example, \"bzr uncommit -r 15\" will leave the\n"
3241
"branch at revision 15."
3242
msgstr ""
3243
3244
#: bzrlib/builtins.py:5307
3245
msgid ""
3246
"Uncommit leaves the working tree ready for a new commit. The only change\n"
3247
"it may make is to restore any pending merges that were present before\n"
3248
"the commit."
3249
msgstr ""
3250
3251
#: bzrlib/builtins.py:5318
3252
msgid "Don't actually make changes."
3253
msgstr ""
3254
3255
#: bzrlib/builtins.py:5319
3256
msgid "Say yes to all questions."
3257
msgstr ""
3258
3259
#: bzrlib/builtins.py:5321
3260
msgid "Keep tags that point to removed revisions."
3261
msgstr ""
3262
3263
#: bzrlib/builtins.py:5323
3264
msgid "Only remove the commits from the local branch when in a checkout."
3265
msgstr ""
3266
3267
#: bzrlib/builtins.py:5372
3268
msgid "No revisions to uncommit.\n"
3269
msgstr ""
3270
3271
#: bzrlib/builtins.py:5387
3272
msgid "Dry-run, pretending to remove the above revisions.\n"
3273
msgstr ""
3274
3275
#: bzrlib/builtins.py:5390
3276
msgid "The above revision(s) will be removed.\n"
3277
msgstr ""
3278
3279
#: bzrlib/builtins.py:5394
3280
msgid "Uncommit these revisions"
3281
msgstr ""
3282
3283
#: bzrlib/builtins.py:5397
3284
msgid "Canceled\n"
3285
msgstr ""
3286
3287
#: bzrlib/builtins.py:5404
3288
#, python-format
3289
msgid ""
3290
"You can restore the old tip by running:\n"
3291
" bzr pull . -r revid:%s\n"
3292
msgstr ""
3293
3294
#: bzrlib/builtins.py:5409
3295
msgid "Break a dead lock."
3296
msgstr ""
3297
3298
#: bzrlib/builtins.py:5411
3299
msgid ""
3300
"This command breaks a lock on a repository, branch, working directory or\n"
3301
"config file."
3302
msgstr ""
3303
3304
#: bzrlib/builtins.py:5414
3305
msgid ""
3306
"CAUTION: Locks should only be broken when you are sure that the process\n"
3307
"holding the lock has been stopped."
3308
msgstr ""
3309
3310
#: bzrlib/builtins.py:5417
3311
msgid ""
3312
"You can get information on what locks are open via the 'bzr info\n"
3313
"[location]' command."
3314
msgstr ""
3315
3316
#: bzrlib/builtins.py:5420
3317
msgid ""
3318
":Examples:\n"
3319
" bzr break-lock\n"
3320
" bzr break-lock bzr+ssh://example.com/bzr/foo\n"
3321
" bzr break-lock --conf ~/.bazaar"
3322
msgstr ""
3323
3324
#: bzrlib/builtins.py:5429
3325
msgid "LOCATION is the directory where the config lock is."
3326
msgstr ""
3327
3328
#: bzrlib/builtins.py:5431
3329
msgid "Do not ask for confirmation before breaking the lock."
3330
msgstr ""
3331
3332
#: bzrlib/builtins.py:5466
3333
msgid "The Bazaar smart server protocol over TCP. (default port: 4155)"
3334
msgstr ""
3335
3336
#: bzrlib/builtins.py:5467
3337
msgid "Run the bzr server."
3338
msgstr ""
3339
3340
#: bzrlib/builtins.py:5473
3341
msgid "Serve on stdin/out for use from inetd or sshd."
3342
msgstr ""
3343
3344
#: bzrlib/builtins.py:5474
3345
msgid "protocol"
3346
msgstr ""
3347
3348
#: bzrlib/builtins.py:5475
3349
msgid "Protocol to serve."
3350
msgstr ""
3351
3352
#: bzrlib/builtins.py:5479
3353
msgid ""
3354
"Listen for connections on nominated port of the form [hostname:]portnumber. "
3355
"Passing 0 as the port number will result in a dynamically allocated port. "
3356
"The default port depends on the protocol."
3357
msgstr ""
3358
3359
#: bzrlib/builtins.py:5485
3360
msgid "Serve contents of this directory."
3361
msgstr ""
3362
3363
#: bzrlib/builtins.py:5487
3364
msgid ""
3365
"By default the server is a readonly server. Supplying --allow-writes "
3366
"enables write access to the contents of the served directory and below. "
3367
"Note that ``bzr serve`` does not perform authentication, so unless some form "
3368
"of external authentication is arranged supplying this option leads to global "
3369
"uncontrolled write access to your file system."
3370
msgstr ""
3371
3372
#: bzrlib/builtins.py:5496
3373
msgid "Override the default idle client timeout (5min)."
3374
msgstr ""
3375
3376
#: bzrlib/builtins.py:5546
3377
msgid "Combine a tree into its containing tree."
3378
msgstr ""
3379
3380
#: bzrlib/builtins.py:5548
3381
msgid "This command requires the target tree to be in a rich-root format."
3382
msgstr ""
3383
3384
#: bzrlib/builtins.py:5550
3385
msgid ""
3386
"The TREE argument should be an independent tree, inside another tree, but\n"
3387
"not part of it. (Such trees can be produced by \"bzr split\", but also by\n"
3388
"running \"bzr branch\" with the target inside a tree.)"
3389
msgstr ""
3390
3391
#: bzrlib/builtins.py:5554
3392
msgid ""
3393
"The result is a combined tree, with the subtree no longer an independent\n"
3394
"part. This is marked as a merge of the subtree into the containing tree,\n"
3395
"and all history is preserved."
3396
msgstr ""
3397
3398
#: bzrlib/builtins.py:5572
3399
#, python-format
3400
msgid ""
3401
"Can't join trees because %s doesn't support rich root data.\n"
3402
"You can use bzr upgrade on the repository."
3403
msgstr ""
3404
3405
#: bzrlib/builtins.py:5582 bzrlib/builtins.py:5588
3406
msgid "Cannot join {0}. {1}"
3407
msgstr ""
3408
3409
#: bzrlib/builtins.py:5592
3410
msgid "Split a subdirectory of a tree into a separate tree."
3411
msgstr ""
3412
3413
#: bzrlib/builtins.py:5594
3414
msgid ""
3415
"This command will produce a target tree in a format that supports\n"
3416
"rich roots, like 'rich-root' or 'rich-root-pack'. These formats cannot be\n"
3417
"converted into earlier formats like 'dirstate-tags'."
3418
msgstr ""
3419
3420
#: bzrlib/builtins.py:5598
3421
msgid ""
3422
"The TREE argument should be a subdirectory of a working tree. That\n"
3423
"subdirectory will be converted into an independent tree, with its own\n"
3424
"branch. Commits in the top-level tree will not apply to the new subtree."
3425
msgstr ""
3426
3427
#: bzrlib/builtins.py:5678
3428
msgid "No submit branch specified or known"
3429
msgstr ""
3430
3431
#: bzrlib/builtins.py:5686 bzrlib/send.py:108
3432
msgid "No public branch specified or known"
3433
msgstr ""
3434
3435
#: bzrlib/builtins.py:5691
3436
msgid "bzr merge-directive takes at most two one revision identifiers"
3437
msgstr ""
3438
3439
#: bzrlib/builtins.py:5700
3440
msgid "No revisions to bundle."
3441
msgstr ""
3442
3443
#: bzrlib/builtins.py:5719
3444
msgid "Mail or create a merge-directive for submitting changes."
3445
msgstr ""
3446
3447
#: bzrlib/builtins.py:5721
3448
msgid "A merge directive provides many things needed for requesting merges:"
3449
msgstr ""
3450
3451
#: bzrlib/builtins.py:5723
3452
msgid "* A machine-readable description of the merge to perform"
3453
msgstr ""
3454
3455
#: bzrlib/builtins.py:5725
3456
msgid "* An optional patch that is a preview of the changes requested"
3457
msgstr ""
3458
3459
#: bzrlib/builtins.py:5727
3460
msgid ""
3461
"* An optional bundle of revision data, so that the changes can be applied\n"
3462
" directly from the merge directive, without retrieving data from a\n"
3463
" branch."
3464
msgstr ""
3465
3466
#: bzrlib/builtins.py:5731
3467
msgid ""
3468
"`bzr send` creates a compact data set that, when applied using bzr\n"
3469
"merge, has the same effect as merging from the source branch. "
3470
msgstr ""
3471
3472
#: bzrlib/builtins.py:5734
3473
msgid ""
3474
"By default the merge directive is self-contained and can be applied to any\n"
3475
"branch containing submit_branch in its ancestory without needing access to\n"
3476
"the source branch."
3477
msgstr ""
3478
3479
#: bzrlib/builtins.py:5738
3480
msgid ""
3481
"If --no-bundle is specified, then Bazaar doesn't send the contents of the\n"
3482
"revisions, but only a structured request to merge from the\n"
3483
"public_location. In that case the public_branch is needed and it must be\n"
3484
"up-to-date and accessible to the recipient. The public_branch is always\n"
3485
"included if known, so that people can check it later."
3486
msgstr ""
3487
3488
#: bzrlib/builtins.py:5744
3489
msgid ""
3490
"The submit branch defaults to the parent of the source branch, but can be\n"
3491
"overridden. Both submit branch and public branch will be remembered in\n"
3492
"branch.conf the first time they are used for a particular branch. The\n"
3493
"source branch defaults to that containing the working directory, but can\n"
3494
"be changed using --from."
3495
msgstr ""
3496
3497
#: bzrlib/builtins.py:5750
3498
msgid ""
3499
"Both the submit branch and the public branch follow the usual behavior with\n"
3500
"respect to --remember: If there is no default location set, the first send\n"
3501
"will set it (use --no-remember to avoid setting it). After that, you can\n"
3502
"omit the location to use the default. To change the default, use\n"
3503
"--remember. The value will only be saved if the location can be accessed."
3504
msgstr ""
3505
3506
#: bzrlib/builtins.py:5756
3507
msgid ""
3508
"In order to calculate those changes, bzr must analyse the submit branch.\n"
3509
"Therefore it is most efficient for the submit branch to be a local mirror.\n"
3510
"If a public location is known for the submit_branch, that location is used\n"
3511
"in the merge directive."
3512
msgstr ""
3513
3514
#: bzrlib/builtins.py:5761
3515
msgid ""
3516
"The default behaviour is to send the merge directive by mail, unless -o is\n"
3517
"given, in which case it is sent to a file."
3518
msgstr ""
3519
3520
#: bzrlib/builtins.py:5764
3521
msgid ""
3522
"Mail is sent using your preferred mail program. This should be transparent\n"
3523
"on Windows (it uses MAPI). On Unix, it requires the xdg-email utility.\n"
3524
"If the preferred client can't be found (or used), your editor will be used."
3525
msgstr ""
3526
3527
#: bzrlib/builtins.py:5768
3528
msgid ""
3529
"To use a specific mail program, set the mail_client configuration option.\n"
3530
"(For Thunderbird 1.5, this works around some bugs.) Supported values for\n"
3531
"specific clients are \"claws\", \"evolution\", \"kmail\", \"mail.app\" "
3532
"(MacOS X's\n"
3533
"Mail.app), \"mutt\", and \"thunderbird\"; generic options are \"default\",\n"
3534
"\"editor\", \"emacsclient\", \"mapi\", and \"xdg-email\". Plugins may also "
3535
"add\n"
3536
"supported clients."
3537
msgstr ""
3538
3539
#: bzrlib/builtins.py:5775
3540
msgid ""
3541
"If mail is being sent, a to address is required. This can be supplied\n"
3542
"either on the commandline, by setting the submit_to configuration\n"
3543
"option in the branch itself or the child_submit_to configuration option\n"
3544
"in the submit branch."
3545
msgstr ""
3546
3547
#: bzrlib/builtins.py:5780
3548
msgid ""
3549
"Two formats are currently supported: \"4\" uses revision bundle format 4 "
3550
"and\n"
3551
"merge directive format 2. It is significantly faster and smaller than\n"
3552
"older formats. It is compatible with Bazaar 0.19 and later. It is the\n"
3553
"default. \"0.9\" uses revision bundle format 0.9 and merge directive\n"
3554
"format 1. It is compatible with Bazaar 0.12 - 0.18."
3555
msgstr ""
3556
3557
#: bzrlib/builtins.py:5786
3558
msgid ""
3559
"The merge directives created by bzr send may be applied using bzr merge or\n"
3560
"bzr pull by specifying a file containing a merge directive as the location."
3561
msgstr ""
3562
3563
#: bzrlib/builtins.py:5789
3564
msgid ""
3565
"bzr send makes extensive use of public locations to map local locations "
3566
"into\n"
3567
"URLs that can be used by other people. See `bzr help configuration` to\n"
3568
"set them, and use `bzr info` to display them."
3569
msgstr ""
3570
3571
#: bzrlib/builtins.py:5813
3572
msgid "Write merge directive to this file or directory; use - for stdout."
3573
msgstr ""
3574
3575
#: bzrlib/builtins.py:5817
3576
msgid ""
3577
"Refuse to send if there are uncommitted changes in the working tree, --no-"
3578
"strict disables the check."
3579
msgstr ""
3580
3581
#: bzrlib/builtins.py:5819
3582
msgid "Mail the request to this address."
3583
msgstr ""
3584
3585
#: bzrlib/builtins.py:5823
3586
msgid "Body for the email."
3587
msgstr ""
3588
3589
#: bzrlib/builtins.py:5876
3590
msgid "Do not include a bundle in the merge directive."
3591
msgstr ""
3592
3593
#: bzrlib/builtins.py:5877
3594
msgid "Do not include a preview patch in the merge directive."
3595
msgstr ""
3596
3597
#: bzrlib/builtins.py:5880
3598
msgid "Remember submit and public branch."
3599
msgstr ""
3600
3601
#: bzrlib/builtins.py:5882
3602
msgid ""
3603
"Branch to generate the submission from, rather than the one containing the "
3604
"working directory."
3605
msgstr ""
3606
3607
#: bzrlib/builtins.py:5892 bzrlib/cmd_version_info.py:76
3608
msgid "format"
3609
msgstr ""
3610
3611
#: bzrlib/builtins.py:5893
3612
msgid "Use the specified output format."
3613
msgstr ""
3614
3615
#: bzrlib/builtins.py:5915
3616
msgid "Create, remove or modify a tag naming a revision."
3617
msgstr ""
3618
3619
#: bzrlib/builtins.py:5917
3620
msgid ""
3621
"Tags give human-meaningful names to revisions. Commands that take a -r\n"
3622
"(--revision) option can be given -rtag:X, where X is any previously\n"
3623
"created tag."
3624
msgstr ""
3625
3626
#: bzrlib/builtins.py:5921
3627
msgid ""
3628
"Tags are stored in the branch. Tags are copied from one branch to another\n"
3629
"along when you branch, push, pull or merge."
3630
msgstr ""
3631
3632
#: bzrlib/builtins.py:5924
3633
msgid ""
3634
"It is an error to give a tag name that already exists unless you pass\n"
3635
"--force, in which case the tag is moved to point to the new revision."
3636
msgstr ""
3637
3638
#: bzrlib/builtins.py:5927
3639
msgid ""
3640
"To rename a tag (change the name but keep it on the same revsion), run "
3641
"``bzr\n"
3642
"tag new-name -r tag:old-name`` and then ``bzr tag --delete oldname``."
3643
msgstr ""
3644
3645
#: bzrlib/builtins.py:5930
3646
msgid ""
3647
"If no tag name is specified it will be determined through the \n"
3648
"'automatic_tag_name' hook. This can e.g. be used to automatically tag\n"
3649
"upstream releases by reading configure.ac. See ``bzr help hooks`` for\n"
3650
"details."
3651
msgstr ""
3652
3653
#: bzrlib/builtins.py:5940
3654
msgid "Delete this tag rather than placing it."
3655
msgstr ""
3656
3657
#: bzrlib/builtins.py:5943
3658
msgid "Branch in which to place the tag."
3659
msgstr ""
3660
3661
#: bzrlib/builtins.py:5945
3662
msgid "Replace existing tags."
3663
msgstr ""
3664
3665
#: bzrlib/builtins.py:5960
3666
msgid "No tag specified to delete."
3667
msgstr ""
3668
3669
#: bzrlib/builtins.py:5962
3670
#, python-format
3671
msgid "Deleted tag %s."
3672
msgstr ""
3673
3674
#: bzrlib/builtins.py:5976
3675
msgid "Please specify a tag name."
3676
msgstr ""
3677
3678
#: bzrlib/builtins.py:5984
3679
#, python-format
3680
msgid "Tag %s already exists for that revision."
3681
msgstr ""
3682
3683
#: bzrlib/builtins.py:5988
3684
#, python-format
3685
msgid "Created tag %s."
3686
msgstr ""
3687
3688
#: bzrlib/builtins.py:5990
3689
#, python-format
3690
msgid "Updated tag %s."
3691
msgstr ""
3692
3693
#: bzrlib/builtins.py:5994
3694
msgid "List tags."
3695
msgstr ""
3696
3697
#: bzrlib/builtins.py:5996
3698
msgid ""
3699
"This command shows a table of tag names and the revisions they reference."
3700
msgstr ""
3701
3702
#: bzrlib/builtins.py:6002
3703
msgid "Branch whose tags should be displayed."
3704
msgstr ""
3705
3706
#: bzrlib/builtins.py:6004
3707
msgid "Sort tags by different criteria."
3708
msgstr ""
3709
3710
#: bzrlib/builtins.py:6004
3711
msgid "Sorting"
3712
msgstr ""
3713
3714
#: bzrlib/builtins.py:6073
3715
msgid "Reconfigure the type of a bzr directory."
3716
msgstr ""
3717
3718
#: bzrlib/builtins.py:6075
3719
msgid "A target configuration must be specified."
3720
msgstr ""
3721
3722
#: bzrlib/builtins.py:6077
3723
msgid ""
3724
"For checkouts, the bind-to location will be auto-detected if not specified.\n"
3725
"The order of preference is\n"
3726
"1. For a lightweight checkout, the current bound location.\n"
3727
"2. For branches that used to be checkouts, the previously-bound location.\n"
3728
"3. The push location.\n"
3729
"4. The parent location.\n"
3730
"If none of these is available, --bind-to must be specified."
3731
msgstr ""
3732
3733
#: bzrlib/builtins.py:6091
3734
msgid "Tree type"
3735
msgstr ""
3736
3737
#: bzrlib/builtins.py:6092
3738
msgid "The relation between branch and tree."
3739
msgstr ""
3740
3741
#: bzrlib/builtins.py:6094
3742
msgid "Reconfigure to be an unbound branch with no working tree."
3743
msgstr ""
3744
3745
#: bzrlib/builtins.py:6095
3746
msgid "Reconfigure to be an unbound branch with a working tree."
3747
msgstr ""
3748
3749
#: bzrlib/builtins.py:6096
3750
msgid "Reconfigure to be a bound branch with a working tree."
3751
msgstr ""
3752
3753
#: bzrlib/builtins.py:6097
3754
msgid "Reconfigure to be a lightweight checkout (with no local history)."
3755
msgstr ""
3756
3757
#: bzrlib/builtins.py:6102
3758
msgid "Repository type"
3759
msgstr ""
3760
3761
#: bzrlib/builtins.py:6103
3762
msgid "Location fo the repository."
3763
msgstr ""
3764
3765
#: bzrlib/builtins.py:6105
3766
msgid ""
3767
"Reconfigure to be a standalone branch (i.e. stop using shared repository)."
3768
msgstr ""
3769
3770
#: bzrlib/builtins.py:6107
3771
msgid "Reconfigure to use a shared repository."
3772
msgstr ""
3773
3774
#: bzrlib/builtins.py:6111
3775
msgid "Trees in Repository"
3776
msgstr ""
3777
3778
#: bzrlib/builtins.py:6112
3779
msgid "Whether new branches in the repository have trees."
3780
msgstr ""
3781
3782
#: bzrlib/builtins.py:6114
3783
msgid ""
3784
"Reconfigure repository to create working trees on branches by default."
3785
msgstr ""
3786
3787
#: bzrlib/builtins.py:6116
3788
msgid ""
3789
"Reconfigure repository to not create working trees on branches by default."
3790
msgstr ""
3791
3792
#: bzrlib/builtins.py:6119
3793
msgid "Branch to bind checkout to."
3794
msgstr ""
3795
3796
#: bzrlib/builtins.py:6121
3797
msgid "Perform reconfiguration even if local changes will be lost."
3798
msgstr ""
3799
3800
#: bzrlib/builtins.py:6124
3801
msgid "Reconfigure a branch to be stacked on another branch."
3802
msgstr ""
3803
3804
#: bzrlib/builtins.py:6128
3805
msgid ""
3806
"Reconfigure a branch to be unstacked. This may require copying substantial "
3807
"data into it."
3808
msgstr ""
3809
3810
#: bzrlib/builtins.py:6138
3811
msgid "Can't use both --stacked-on and --unstacked"
3812
msgstr ""
3813
3814
#: bzrlib/builtins.py:6152
3815
msgid "No target configuration specified"
3816
msgstr ""
3817
3818
#: bzrlib/builtins.py:6187
3819
msgid "Set the branch of a checkout and update."
3820
msgstr ""
3821
3822
#: bzrlib/builtins.py:6189
3823
msgid ""
3824
"For lightweight checkouts, this changes the branch being referenced.\n"
3825
"For heavyweight checkouts, this checks that there are no local commits\n"
3826
"versus the current bound branch, then it makes the local branch a mirror\n"
3827
"of the new location and binds to it."
3828
msgstr ""
3829
3830
#: bzrlib/builtins.py:6194
3831
msgid ""
3832
"In both cases, the working tree is updated and uncommitted changes\n"
3833
"are merged. The user can commit or revert these as they desire."
3834
msgstr ""
3835
3836
#: bzrlib/builtins.py:6197
3837
msgid "Pending merges need to be committed or reverted before using switch."
3838
msgstr ""
3839
3840
#: bzrlib/builtins.py:6199
3841
msgid ""
3842
"The path to the branch to switch to can be specified relative to the parent\n"
3843
"directory of the current branch. For example, if you are currently in a\n"
3844
"checkout of /path/to/branch, specifying 'newbranch' will find a branch at\n"
3845
"/path/to/newbranch."
3846
msgstr ""
3847
3848
#: bzrlib/builtins.py:6204
3849
msgid ""
3850
"Bound branches use the nickname of its master branch unless it is set\n"
3851
"locally, in which case switching will update the local nickname to be\n"
3852
"that of the master."
3853
msgstr ""
3854
3855
#: bzrlib/builtins.py:6212
3856
msgid "Switch even if local commits will be lost."
3857
msgstr ""
3858
3859
#: bzrlib/builtins.py:6215
3860
msgid "Create the target branch from this one before switching to it."
3861
msgstr ""
3862
3863
#: bzrlib/builtins.py:6229
3864
msgid "You must supply either a revision or a location"
3865
msgstr ""
3866
3867
#: bzrlib/builtins.py:6242
3868
msgid "cannot create branch without source branch"
3869
msgstr ""
3870
3871
#: bzrlib/builtins.py:6262
3872
msgid "Manage filtered views."
3873
msgstr ""
3874
3875
#: bzrlib/builtins.py:6264
3876
msgid ""
3877
"Views provide a mask over the tree so that users can focus on\n"
3878
"a subset of a tree when doing their work. After creating a view,\n"
3879
"commands that support a list of files - status, diff, commit, etc -\n"
3880
"effectively have that list of files implicitly given each time.\n"
3881
"An explicit list of files can still be given but those files\n"
3882
"must be within the current view."
3883
msgstr ""
3884
3885
#: bzrlib/builtins.py:6271
3886
msgid ""
3887
"In most cases, a view has a short life-span: it is created to make\n"
3888
"a selected change and is deleted once that change is committed.\n"
3889
"At other times, you may wish to create one or more named views\n"
3890
"and switch between them."
3891
msgstr ""
3892
3893
#: bzrlib/builtins.py:6276
3894
msgid ""
3895
"To disable the current view without deleting it, you can switch to\n"
3896
"the pseudo view called ``off``. This can be useful when you need\n"
3897
"to see the whole tree for an operation or two (e.g. merge) but\n"
3898
"want to switch back to your view after that."
3899
msgstr ""
3900
3901
#: bzrlib/builtins.py:6281
3902
msgid ""
3903
":Examples:\n"
3904
" To define the current view::"
3905
msgstr ""
3906
3907
#: bzrlib/builtins.py:6284
3908
msgid " bzr view file1 dir1 ..."
3909
msgstr ""
3910
3911
#: bzrlib/builtins.py:6286
3912
msgid " To list the current view::"
3913
msgstr ""
3914
3915
#: bzrlib/builtins.py:6288
3916
msgid " bzr view"
3917
msgstr ""
3918
3919
#: bzrlib/builtins.py:6290
3920
msgid " To delete the current view::"
3921
msgstr ""
3922
3923
#: bzrlib/builtins.py:6292
3924
msgid " bzr view --delete"
3925
msgstr ""
3926
3927
#: bzrlib/builtins.py:6294
3928
msgid " To disable the current view without deleting it::"
3929
msgstr ""
3930
3931
#: bzrlib/builtins.py:6296
3932
msgid " bzr view --switch off"
3933
msgstr ""
3934
3935
#: bzrlib/builtins.py:6298
3936
msgid " To define a named view and switch to it::"
3937
msgstr ""
3938
3939
#: bzrlib/builtins.py:6300
3940
msgid " bzr view --name view-name file1 dir1 ..."
3941
msgstr ""
3942
3943
#: bzrlib/builtins.py:6302
3944
msgid " To list a named view::"
3945
msgstr ""
3946
3947
#: bzrlib/builtins.py:6304
3948
msgid " bzr view --name view-name"
3949
msgstr ""
3950
3951
#: bzrlib/builtins.py:6306
3952
msgid " To delete a named view::"
3953
msgstr ""
3954
3955
#: bzrlib/builtins.py:6308
3956
msgid " bzr view --name view-name --delete"
3957
msgstr ""
3958
3959
#: bzrlib/builtins.py:6310
3960
msgid " To switch to a named view::"
3961
msgstr ""
3962
3963
#: bzrlib/builtins.py:6312
3964
msgid " bzr view --switch view-name"
3965
msgstr ""
3966
3967
#: bzrlib/builtins.py:6314
3968
msgid " To list all views defined::"
3969
msgstr ""
3970
3971
#: bzrlib/builtins.py:6316
3972
msgid " bzr view --all"
3973
msgstr ""
3974
3975
#: bzrlib/builtins.py:6318
3976
msgid " To delete all views::"
3977
msgstr ""
3978
3979
#: bzrlib/builtins.py:6320
3980
msgid " bzr view --delete --all"
3981
msgstr ""
3982
3983
#: bzrlib/builtins.py:6327
3984
msgid "Apply list or delete action to all views."
3985
msgstr ""
3986
3987
#: bzrlib/builtins.py:6330
3988
msgid "Delete the view."
3989
msgstr ""
3990
3991
#: bzrlib/builtins.py:6333
3992
msgid "Name of the view to define, list or delete."
3993
msgstr ""
3994
3995
#: bzrlib/builtins.py:6337
3996
msgid "Name of the view to switch to."
3997
msgstr ""
3998
3999
#: bzrlib/builtins.py:6356
4000
msgid "Both --delete and a file list specified"
4001
msgstr ""
4002
4003
#: bzrlib/builtins.py:6359
4004
msgid "Both --delete and --switch specified"
4005
msgstr ""
4006
4007
#: bzrlib/builtins.py:6362
4008
msgid "Deleted all views.\n"
4009
msgstr ""
4010
4011
#: bzrlib/builtins.py:6364
4012
msgid "No current view to delete"
4013
msgstr ""
4014
4015
#: bzrlib/builtins.py:6367
4016
#, python-format
4017
msgid "Deleted '%s' view.\n"
4018
msgstr ""
4019
4020
#: bzrlib/builtins.py:6371
4021
msgid "Both --switch and a file list specified"
4022
msgstr ""
4023
4024
#: bzrlib/builtins.py:6374
4025
msgid "Both --switch and --all specified"
4026
msgstr ""
4027
4028
#: bzrlib/builtins.py:6377
4029
msgid "No current view to disable"
4030
msgstr ""
4031
4032
#: bzrlib/builtins.py:6379
4033
#, python-format
4034
msgid "Disabled '%s' view.\n"
4035
msgstr ""
4036
4037
#: bzrlib/builtins.py:6383 bzrlib/builtins.py:6405
4038
msgid "Using '{0}' view: {1}\n"
4039
msgstr ""
4040
4041
#: bzrlib/builtins.py:6386
4042
msgid "Views defined:\n"
4043
msgstr ""
4044
4045
#: bzrlib/builtins.py:6395
4046
msgid "No views defined.\n"
4047
msgstr ""
4048
4049
#: bzrlib/builtins.py:6402
4050
msgid "Cannot change the 'off' pseudo view"
4051
msgstr ""
4052
4053
#: bzrlib/builtins.py:6410
4054
msgid "No current view.\n"
4055
msgstr ""
4056
4057
#: bzrlib/builtins.py:6413
4058
msgid "'{0}' view is: {1}\n"
4059
msgstr ""
4060
4061
#: bzrlib/builtins.py:6433
4062
msgid " <no hooks installed>\n"
4063
msgstr ""
4064
4065
#: bzrlib/builtins.py:6437
4066
msgid "Remove a branch."
4067
msgstr ""
4068
4069
#: bzrlib/builtins.py:6439
4070
msgid ""
4071
"This will remove the branch from the specified location but \n"
4072
"will keep any working tree or repository in place."
4073
msgstr ""
4074
4075
#: bzrlib/builtins.py:6444
4076
msgid " Remove the branch at repo/trunk::"
4077
msgstr ""
4078
4079
#: bzrlib/builtins.py:6446
4080
msgid " bzr remove-branch repo/trunk"
4081
msgstr ""
4082
4083
#: bzrlib/builtins.py:6461
4084
msgid "Plaintext diff output."
4085
msgstr ""
4086
4087
#: bzrlib/builtins.py:6462
4088
msgid "Temporarily set aside some changes from the current tree."
4089
msgstr ""
4090
4091
#: bzrlib/builtins.py:6464
4092
msgid ""
4093
"Shelve allows you to temporarily put changes you've made \"on the shelf\",\n"
4094
"ie. out of the way, until a later time when you can bring them back from\n"
4095
"the shelf with the 'unshelve' command. The changes are stored alongside\n"
4096
"your working tree, and so they aren't propagated along with your branch nor\n"
4097
"will they survive its deletion."
4098
msgstr ""
4099
4100
#: bzrlib/builtins.py:6470
4101
msgid "If shelve --list is specified, previously-shelved changes are listed."
4102
msgstr ""
4103
4104
#: bzrlib/builtins.py:6472
4105
msgid ""
4106
"Shelve is intended to help separate several sets of changes that have\n"
4107
"been inappropriately mingled. If you just want to get rid of all changes\n"
4108
"and you don't need to restore them later, use revert. If you want to\n"
4109
"shelve all text changes at once, use shelve --all."
4110
msgstr ""
4111
4112
#: bzrlib/builtins.py:6477
4113
msgid ""
4114
"If filenames are specified, only the changes to those files will be\n"
4115
"shelved. Other files will be left untouched."
4116
msgstr ""
4117
4118
#: bzrlib/builtins.py:6480
4119
msgid ""
4120
"If a revision is specified, changes since that revision will be shelved."
4121
msgstr ""
4122
4123
#: bzrlib/builtins.py:6482
4124
msgid ""
4125
"You can put multiple items on the shelf, and by default, 'unshelve' will\n"
4126
"restore the most recently shelved changes."
4127
msgstr ""
4128
4129
#: bzrlib/builtins.py:6485
4130
msgid ""
4131
"For complicated changes, it is possible to edit the changes in a separate\n"
4132
"editor program to decide what the file remaining in the working copy\n"
4133
"should look like. To do this, add the configuration option"
4134
msgstr ""
4135
4136
#: bzrlib/builtins.py:6489
4137
msgid " change_editor = PROGRAM @new_path @old_path"
4138
msgstr ""
4139
4140
#: bzrlib/builtins.py:6491
4141
msgid ""
4142
"where @new_path is replaced with the path of the new version of the \n"
4143
"file and @old_path is replaced with the path of the old version of \n"
4144
"the file. The PROGRAM should save the new file with the desired \n"
4145
"contents of the file in the working tree.\n"
4146
" "
4147
msgstr ""
4148
4149
#: bzrlib/builtins.py:6503
4150
msgid "Shelve all changes."
4151
msgstr ""
4152
4153
#: bzrlib/builtins.py:6505
4154
msgid "Method to use for writing diffs."
4155
msgstr ""
4156
4157
#: bzrlib/builtins.py:6505
4158
msgid "writer"
4159
msgstr ""
4160
4161
#: bzrlib/builtins.py:6509
4162
msgid "List shelved changes."
4163
msgstr ""
4164
4165
#: bzrlib/builtins.py:6511
4166
msgid "Destroy removed changes instead of shelving them."
4167
msgstr ""
4168
4169
#: bzrlib/builtins.py:6540
4170
msgid "No shelved changes."
4171
msgstr ""
4172
4173
#: bzrlib/builtins.py:6551
4174
msgid "Restore shelved changes."
4175
msgstr ""
4176
4177
#: bzrlib/builtins.py:6553
4178
msgid ""
4179
"By default, the most recently shelved changes are restored. However if you\n"
4180
"specify a shelf by id those changes will be restored instead. This works\n"
4181
"best when the changes don't depend on each other."
4182
msgstr ""
4183
4184
#: bzrlib/builtins.py:6562
4185
msgid "The action to perform."
4186
msgstr ""
4187
4188
#: bzrlib/builtins.py:6562 bzrlib/conflicts.py:694
4189
msgid "action"
4190
msgstr ""
4191
4192
#: bzrlib/builtins.py:6564
4193
msgid "Apply changes and remove from the shelf."
4194
msgstr ""
4195
4196
#: bzrlib/builtins.py:6565
4197
msgid "Show changes, but do not apply or remove them."
4198
msgstr ""
4199
4200
#: bzrlib/builtins.py:6566
4201
msgid ""
4202
"Instead of unshelving the changes, show the diff that would result from "
4203
"unshelving."
4204
msgstr ""
4205
4206
#: bzrlib/builtins.py:6568
4207
msgid "Delete changes without applying them."
4208
msgstr ""
4209
4210
#: bzrlib/builtins.py:6569
4211
msgid "Apply changes but don't delete them."
4212
msgstr ""
4213
4214
#: bzrlib/builtins.py:6584
4215
msgid "Remove unwanted files from working tree."
4216
msgstr ""
4217
4218
#: bzrlib/builtins.py:6586
4219
msgid ""
4220
"By default, only unknown files, not ignored files, are deleted. Versioned\n"
4221
"files are never deleted."
4222
msgstr ""
4223
4224
#: bzrlib/builtins.py:6589
4225
msgid ""
4226
"Another class is 'detritus', which includes files emitted by bzr during\n"
4227
"normal operations and selftests. (The value of these files decreases with\n"
4228
"time.)"
4229
msgstr ""
4230
4231
#: bzrlib/builtins.py:6593
4232
msgid ""
4233
"If no options are specified, unknown files are deleted. Otherwise, option\n"
4234
"flags are respected, and may be combined."
4235
msgstr ""
4236
4237
#: bzrlib/builtins.py:6596
4238
msgid "To check what clean-tree will do, use --dry-run."
4239
msgstr ""
4240
4241
#: bzrlib/builtins.py:6599
4242
msgid "Delete all ignored files."
4243
msgstr ""
4244
4245
#: bzrlib/builtins.py:6600
4246
msgid ""
4247
"Delete conflict files, merge and revert backups, and failed selftest dirs."
4248
msgstr ""
4249
4250
#: bzrlib/builtins.py:6603
4251
msgid "Delete files unknown to bzr (default)."
4252
msgstr ""
4253
4254
#: bzrlib/builtins.py:6604
4255
msgid "Show files to delete instead of deleting them."
4256
msgstr ""
4257
4258
#: bzrlib/builtins.py:6606
4259
msgid "Do not prompt before deleting."
4260
msgstr ""
4261
4262
#: bzrlib/bundle/__init__.py:59
4263
msgid "A directory cannot be a bundle"
4264
msgstr ""
4265
4266
#: bzrlib/bundle/apply_bundle.py:40
4267
msgid "Install revisions"
4268
msgstr ""
4269
4270
#: bzrlib/bundle/commands.py:64
4271
msgid "--verbose requires a merge directive"
4272
msgstr ""
4273
4274
#: bzrlib/bundle/commands.py:67
4275
msgid "Bundle format not supported"
4276
msgstr ""
4277
4278
#: bzrlib/bundle/commands.py:77
4279
msgid "Records\n"
4280
msgstr ""
4281
4282
#: bzrlib/bundle/commands.py:81
4283
msgid "{0}: {1} ({2} multiparent)\n"
4284
msgstr ""
4285
4286
#: bzrlib/bundle/commands.py:83
4287
#, python-format
4288
msgid "unique files: %d\n"
4289
msgstr ""
4290
4291
#: bzrlib/bundle/commands.py:92
4292
msgid "Revisions\n"
4293
msgstr ""
4294
4295
#: bzrlib/bundle/commands.py:93
4296
#, python-format
4297
msgid "nicks: %s\n"
4298
msgstr ""
4299
4300
#: bzrlib/bundle/commands.py:95
4301
#, python-format
4302
msgid ""
4303
"committers: \n"
4304
"%s\n"
4305
msgstr ""
4306
4307
#: bzrlib/bundle/commands.py:103
4308
msgid "Decoded contents\n"
4309
msgstr ""
4310
4311
#: bzrlib/bundle/serializer/v4.py:327
4312
#, python-format
4313
msgid "Bundling %d revision."
4314
msgid_plural "Bundling %d revisions."
4315
msgstr[0] ""
4316
msgstr[1] ""
4317
4318
#: bzrlib/bzrdir.py:490
4319
msgid ""
4320
"making backup of {0}\n"
4321
" to {1}"
4322
msgstr ""
4323
4324
#: bzrlib/bzrdir.py:513
4325
msgid "renamed {0} to {1}"
4326
msgstr ""
4327
4328
#: bzrlib/bzrdir.py:1652
4329
#, python-format
4330
msgid ""
4331
"Source repository format does not support stacking, using format:\n"
4332
" %s"
4333
msgstr ""
4334
4335
#: bzrlib/bzrdir.py:1672
4336
#, python-format
4337
msgid ""
4338
"Source branch format does not support stacking, using format:\n"
4339
" %s"
4340
msgstr ""
4341
4342
#: bzrlib/bzrdir.py:1818
4343
msgid "starting repository conversion"
4344
msgstr ""
4345
4346
#: bzrlib/bzrdir.py:2039
4347
msgid "Using default stacking branch {0} at {1}"
4348
msgstr ""
4349
4350
#: bzrlib/check.py:108
4351
msgid "check"
4352
msgstr ""
4353
4354
#: bzrlib/check.py:110
4355
msgid "checking revisions"
4356
msgstr ""
4357
4358
#: bzrlib/check.py:112
4359
msgid "checking commit contents"
4360
msgstr ""
4361
4362
#: bzrlib/check.py:114
4363
msgid "checking file graphs"
4364
msgstr ""
4365
4366
#: bzrlib/check.py:118
4367
msgid "checking branches and trees"
4368
msgstr ""
4369
4370
#: bzrlib/check.py:205
4371
msgid "checked repository {0} format {1}"
4372
msgstr ""
4373
4374
#: bzrlib/check.py:208
4375
#, python-format
4376
msgid "%6d revisions"
4377
msgstr ""
4378
4379
#: bzrlib/check.py:209
4380
#, python-format
4381
msgid "%6d file-ids"
4382
msgstr ""
4383
4384
#: bzrlib/check.py:211
4385
#, python-format
4386
msgid "%6d unreferenced text versions"
4387
msgstr ""
4388
4389
#: bzrlib/check.py:215
4390
msgid "unreferenced version: {{{0}}} in {1}"
4391
msgstr ""
4392
4393
#: bzrlib/check.py:218
4394
#, python-format
4395
msgid "%6d revisions are missing inventory_sha1"
4396
msgstr ""
4397
4398
#: bzrlib/check.py:221
4399
#, python-format
4400
msgid "%6d revisions are mentioned but not present"
4401
msgstr ""
4402
4403
#: bzrlib/check.py:224
4404
#, python-format
4405
msgid "%6d ghost revisions"
4406
msgstr ""
4407
4408
#: bzrlib/check.py:229
4409
#, python-format
4410
msgid "%6d revisions missing parents in ancestry"
4411
msgstr ""
4412
4413
#: bzrlib/check.py:233
4414
#, python-format
4415
msgid " %s should be in the ancestry for:"
4416
msgstr ""
4417
4418
#: bzrlib/check.py:237
4419
#, python-format
4420
msgid "%6d inconsistent parents"
4421
msgstr ""
4422
4423
#: bzrlib/check.py:241
4424
msgid " * {0} version {1} has parents {2!r} but should have {3!r}"
4425
msgstr ""
4426
4427
#: bzrlib/check.py:247
4428
#, python-format
4429
msgid "%6d revisions have incorrect parents in the revision index"
4430
msgstr ""
4431
4432
#: bzrlib/check.py:253
4433
msgid " {0} has wrong parents in index: {1!r} should be {2!r}"
4434
msgstr ""
4435
4436
#: bzrlib/check.py:267
4437
msgid "Mismatched internal revid {{{0}}} and index revid {{{1}}}"
4438
msgstr ""
4439
4440
#: bzrlib/check.py:296
4441
msgid ""
4442
"Multiple expected sha1s for {0}. {{{1}}} expects {{{2}}}, {{{3}}} expects "
4443
"{{{4}}}"
4444
msgstr ""
4445
4446
#: bzrlib/check.py:354
4447
#, python-format
4448
msgid "Checking branch at '%s'."
4449
msgstr ""
4450
4451
#: bzrlib/check.py:374
4452
#, python-format
4453
msgid "Checking working tree at '%s'."
4454
msgstr ""
4455
4456
#: bzrlib/check.py:427 bzrlib/check.py:441
4457
msgid "No branch found at specified location."
4458
msgstr ""
4459
4460
#: bzrlib/check.py:429 bzrlib/check.py:439
4461
msgid "No working tree found at specified location."
4462
msgstr ""
4463
4464
#: bzrlib/check.py:432
4465
#, python-format
4466
msgid "Checking repository at '%s'."
4467
msgstr ""
4468
4469
#: bzrlib/check.py:443
4470
msgid "No repository found at specified location."
4471
msgstr ""
4472
4473
#: bzrlib/clean_tree.py:63
4474
msgid "Nothing to delete."
4475
msgstr ""
4476
4477
#: bzrlib/clean_tree.py:68
4478
msgid "Are you sure you wish to delete these"
4479
msgstr ""
4480
4481
#: bzrlib/clean_tree.py:70
4482
msgid "Canceled"
4483
msgstr ""
4484
4485
#: bzrlib/clean_tree.py:107
4486
#, python-format
4487
msgid "unable to remove %s"
4488
msgstr ""
4489
4490
#: bzrlib/clean_tree.py:111
4491
msgid "deleting paths:"
4492
msgstr ""
4493
4494
#: bzrlib/clean_tree.py:125
4495
msgid "unable to remove \"{0}\": {1}."
4496
msgstr ""
4497
4498
#: bzrlib/clean_tree.py:130
4499
msgid "No files deleted."
4500
msgstr ""
4501
4502
#: bzrlib/cmd_version_info.py:47
4503
msgid "No known version info format {0}. Supported types are: {1}"
4504
msgstr ""
4505
4506
#: bzrlib/cmd_version_info.py:52
4507
msgid "Version info in Custom template-based format."
4508
msgstr ""
4509
4510
#: bzrlib/cmd_version_info.py:52
4511
msgid "Version info in Python format."
4512
msgstr ""
4513
4514
#: bzrlib/cmd_version_info.py:52
4515
msgid "Version info in RIO (simple text) format (default)."
4516
msgstr ""
4517
4518
#: bzrlib/cmd_version_info.py:53
4519
msgid "Show version information about this tree."
4520
msgstr ""
4521
4522
#: bzrlib/cmd_version_info.py:55
4523
msgid ""
4524
"You can use this command to add information about version into\n"
4525
"source code of an application. The output can be in one of the\n"
4526
"supported formats or in a custom format based on a template."
4527
msgstr ""
4528
4529
#: bzrlib/cmd_version_info.py:59 en/help_topics/configuration.txt:700
4530
#: en/help_topics/configuration.txt:710
4531
msgid "For example::"
4532
msgstr ""
4533
4534
#: bzrlib/cmd_version_info.py:61
4535
msgid ""
4536
" bzr version-info --custom \\\n"
4537
" --template=\"#define VERSION_INFO \\\"Project 1.2.3 (r{revno})\\\"\\n\""
4538
msgstr ""
4539
4540
#: bzrlib/cmd_version_info.py:64
4541
msgid ""
4542
"will produce a C header file with formatted string containing the\n"
4543
"current revision number. Other supported variables in templates are:"
4544
msgstr ""
4545
4546
#: bzrlib/cmd_version_info.py:67
4547
msgid ""
4548
" * {date} - date of the last revision\n"
4549
" * {build_date} - current date\n"
4550
" * {revno} - revision number\n"
4551
" * {revision_id} - revision id\n"
4552
" * {branch_nick} - branch nickname\n"
4553
" * {clean} - 0 if the source tree contains uncommitted changes,\n"
4554
" otherwise 1"
4555
msgstr ""
4556
4557
#: bzrlib/cmd_version_info.py:77
4558
msgid "Select the output format."
4559
msgstr ""
4560
4561
#: bzrlib/cmd_version_info.py:81
4562
msgid "Include all possible information."
4563
msgstr ""
4564
4565
#: bzrlib/cmd_version_info.py:82
4566
msgid "Check if tree is clean."
4567
msgstr ""
4568
4569
#: bzrlib/cmd_version_info.py:84
4570
msgid "Include the revision-history."
4571
msgstr ""
4572
4573
#: bzrlib/cmd_version_info.py:86
4574
msgid "Include the last revision for each file."
4575
msgstr ""
4576
4577
#: bzrlib/cmd_version_info.py:87
4578
msgid "Template for the output."
4579
msgstr ""
4580
4581
#: bzrlib/cmd_version_info.py:101
4582
msgid "bzr version-info --revision takes exactly one revision specifier"
4583
msgstr ""
4584
4585
#: bzrlib/commands.py:229
4586
#, python-format
4587
msgid "unknown command \"%s\""
4588
msgstr ""
4589
4590
#: bzrlib/commands.py:476
4591
msgid "No help for this command."
4592
msgstr ""
4593
4594
#: bzrlib/commands.py:489
4595
#, python-format
4596
msgid ":Purpose: %s\n"
4597
msgstr ""
4598
4599
#: bzrlib/commands.py:491
4600
#, python-format
4601
msgid ""
4602
":Usage:\n"
4603
"%s\n"
4604
msgstr ""
4605
4606
#: bzrlib/commands.py:493
4607
#, python-format
4608
msgid ":Usage: %s\n"
4609
msgstr ""
4610
4611
#: bzrlib/commands.py:512
4612
#, python-format
4613
msgid ":Options:%s"
4614
msgstr ""
4615
4616
#: bzrlib/commands.py:523
4617
#, python-format
4618
msgid ""
4619
":Description:\n"
4620
" %s\n"
4621
"\n"
4622
msgstr ""
4623
4624
#: bzrlib/commands.py:533
4625
#, python-format
4626
msgid ""
4627
"See bzr help %s for more details and examples.\n"
4628
"\n"
4629
msgstr ""
4630
4631
#: bzrlib/commands.py:538
4632
msgid ":Aliases: "
4633
msgstr ""
4634
4635
#: bzrlib/commands.py:542
4636
#, python-format
4637
msgid ":From: plugin \"%s\"\n"
4638
msgstr ""
4639
4640
#: bzrlib/commands.py:554
4641
msgid ":doc:`{0} <{1}-help>`"
4642
msgstr ""
4643
4644
#: bzrlib/commands.py:558
4645
#, python-format
4646
msgid ":See also: %s"
4647
msgstr ""
4648
4649
#: bzrlib/commands.py:816 bzrlib/gpg.py:324
4650
msgid "Only ASCII permitted in option names"
4651
msgstr ""
4652
4653
#: bzrlib/commands.py:841 bzrlib/commands.py:849
4654
msgid "command {0!r} needs one or more {1}"
4655
msgstr ""
4656
4657
#: bzrlib/commands.py:858
4658
msgid "command {0!r} requires argument {1}"
4659
msgstr ""
4660
4661
#: bzrlib/commands.py:865
4662
msgid "extra argument to command {0}: {1}"
4663
msgstr ""
4664
4665
#: bzrlib/commands.py:962
4666
#, python-format
4667
msgid "Profile data written to \"%s\"."
4668
msgstr ""
4669
4670
#: bzrlib/commit.py:117 bzrlib/commit.py:740
4671
msgid "added"
4672
msgstr ""
4673
4674
#: bzrlib/commit.py:117 bzrlib/commit.py:748
4675
msgid "modified"
4676
msgstr ""
4677
4678
#: bzrlib/commit.py:131
4679
#, python-format
4680
msgid "Committing%s"
4681
msgstr ""
4682
4683
#: bzrlib/commit.py:134
4684
#, python-format
4685
msgid "Committed revision %d."
4686
msgstr ""
4687
4688
#: bzrlib/commit.py:143
4689
#, python-format
4690
msgid "deleted %s"
4691
msgstr ""
4692
4693
#: bzrlib/commit.py:146
4694
#, python-format
4695
msgid "missing %s"
4696
msgstr ""
4697
4698
#: bzrlib/commit.py:511
4699
msgid ""
4700
"Conflicting tags in bound branch:\n"
4701
"{0}"
4702
msgstr ""
4703
4704
#: bzrlib/commit.py:742
4705
msgid "renamed"
4706
msgstr ""
4707
4708
#: bzrlib/commit.py:977
4709
msgid "unchanged"
4710
msgstr ""
4711
4712
#: bzrlib/commit.py:999
4713
msgid "{0} [{1}] - Stage"
4714
msgstr ""
4715
4716
#: bzrlib/commit.py:1002
4717
#, python-format
4718
msgid "%s - Stage"
4719
msgstr ""
4720
4721
#: bzrlib/commit_signature_commands.py:36
4722
msgid "Sign all commits by a given committer."
4723
msgstr ""
4724
4725
#: bzrlib/commit_signature_commands.py:38
4726
msgid ""
4727
"If location is not specified the local tree is used.\n"
4728
"If committer is not specified the default committer is used."
4729
msgstr ""
4730
4731
#: bzrlib/commit_signature_commands.py:41
4732
msgid "This does not sign commits that already have signatures."
4733
msgstr ""
4734
4735
#: bzrlib/commit_signature_commands.py:49
4736
msgid ""
4737
"Don't actually sign anything, just print the revisions that would be signed."
4738
msgstr ""
4739
4740
#: bzrlib/commit_signature_commands.py:103
4741
msgid "Verify all commit signatures."
4742
msgstr ""
4743
4744
#: bzrlib/commit_signature_commands.py:105
4745
msgid ""
4746
"Verifies that all commits in the branch are signed by known GnuPG keys."
4747
msgstr ""
4748
4749
#: bzrlib/commit_signature_commands.py:110
4750
msgid ""
4751
"Comma separated list of GPG key patterns which are acceptable for "
4752
"verification."
4753
msgstr ""
4754
4755
#: bzrlib/commit_signature_commands.py:147
4756
msgid "Cannot verify a range of non-revision-history revisions"
4757
msgstr ""
4758
4759
#: bzrlib/commit_signature_commands.py:168
4760
msgid "All commits signed with verifiable keys"
4761
msgstr ""
4762
4763
#: bzrlib/config.py:475
4764
msgid "Invalid config value for \"{0}\" value {1!r} is not an SI unit."
4765
msgstr ""
4766
4767
#: bzrlib/config.py:2485
4768
msgid "{0} is not an SI unit."
4769
msgstr ""
4770
4771
#: bzrlib/config.py:2949
4772
msgid ""
4773
"Option {0} in section {1} of {2} was changed from {3} to {4}. The {5} value "
4774
"will be saved."
4775
msgstr ""
4776
4777
#: bzrlib/config.py:3093
4778
#, python-format
4779
msgid "Invalid '%s', should be of the form 'name=value'"
4780
msgstr ""
4781
4782
#: bzrlib/config.py:3962
4783
msgid "Display, set or remove a configuration option."
4784
msgstr ""
4785
4786
#: bzrlib/config.py:3964
4787
msgid "Display the active value for a given option."
4788
msgstr ""
4789
4790
#: bzrlib/config.py:3966
4791
msgid ""
4792
"If --all is specified, NAME is interpreted as a regular expression and all\n"
4793
"matching options are displayed mentioning their scope. The active value\n"
4794
"that bzr will take into account is the first one displayed for each option."
4795
msgstr ""
4796
4797
#: bzrlib/config.py:3970
4798
msgid "If no NAME is given, --all .* is implied."
4799
msgstr ""
4800
4801
#: bzrlib/config.py:3972
4802
msgid ""
4803
"Setting a value is achieved by using name=value without spaces. The value\n"
4804
"is set in the most relevant scope and can be checked by displaying the\n"
4805
"option again."
4806
msgstr ""
4807
4808
#: bzrlib/config.py:3984
4809
msgid "Reduce the scope to the specified configuration file."
4810
msgstr ""
4811
4812
#: bzrlib/config.py:3988
4813
msgid "Display all the defined values for the matching options."
4814
msgstr ""
4815
4816
#: bzrlib/config.py:3990
4817
msgid "Remove the option from the configuration file."
4818
msgstr ""
4819
4820
#: bzrlib/conflicts.py:50
4821
msgid "List files with conflicts."
4822
msgstr ""
4823
4824
#: bzrlib/conflicts.py:57
4825
msgid ""
4826
"Conflicts normally are listed as short, human-readable messages. If --text\n"
4827
"is supplied, the pathnames of files with text conflicts are listed,\n"
4828
"instead. (This is useful for editing all files with text conflicts.)"
4829
msgstr ""
4830
4831
#: bzrlib/conflicts.py:61
4832
msgid "Use bzr resolve when you have fixed a problem."
4833
msgstr ""
4834
4835
#: bzrlib/conflicts.py:66
4836
msgid "List paths of files with text conflicts."
4837
msgstr ""
4838
4839
#: bzrlib/conflicts.py:85
4840
msgid "Marks the conflict as resolved."
4841
msgstr ""
4842
4843
#: bzrlib/conflicts.py:88
4844
msgid "Resolve the conflict preserving the version in the working tree."
4845
msgstr ""
4846
4847
#: bzrlib/conflicts.py:91
4848
msgid "Resolve the conflict taking the merged version into account."
4849
msgstr ""
4850
4851
#: bzrlib/conflicts.py:98
4852
msgid "How to resolve the conflict."
4853
msgstr ""
4854
4855
#: bzrlib/conflicts.py:104
4856
msgid "Mark a conflict as resolved."
4857
msgstr ""
4858
4859
#: bzrlib/conflicts.py:111
4860
msgid ""
4861
"Once you have fixed a problem, use \"bzr resolve\" to automatically mark\n"
4862
"text conflicts as fixed, \"bzr resolve FILE\" to mark a specific conflict "
4863
"as\n"
4864
"resolved, or \"bzr resolve --all\" to mark all conflicts as resolved."
4865
msgstr ""
4866
4867
#: bzrlib/conflicts.py:119
4868
msgid "Resolve all conflicts in this tree."
4869
msgstr ""
4870
4871
#: bzrlib/conflicts.py:126
4872
msgid "If --all is specified, no FILE may be provided"
4873
msgstr ""
4874
4875
#: bzrlib/conflicts.py:151
4876
#, python-format
4877
msgid "%d conflict auto-resolved."
4878
msgid_plural "%d conflicts auto-resolved."
4879
msgstr[0] ""
4880
msgstr[1] ""
4881
4882
#: bzrlib/conflicts.py:154
4883
msgid "Remaining conflicts:"
4884
msgstr ""
4885
4886
#: bzrlib/conflicts.py:159
4887
msgid "All conflicts resolved."
4888
msgstr ""
4889
4890
#: bzrlib/conflicts.py:168
4891
msgid "{0} conflict resolved, {1} remaining"
4892
msgid_plural "{0} conflicts resolved, {1} remaining"
4893
msgstr[0] ""
4894
msgstr[1] ""
4895
4896
#: bzrlib/controldir.py:710
4897
msgid "{0} is{1} redirected to {2}"
4898
msgstr ""
4899
4900
#: bzrlib/diff.py:399
4901
#, python-format
4902
msgid "*** Ignoring files outside view. View is %s"
4903
msgstr ""
4904
4905
#: bzrlib/errors.py:157
4906
msgid "The tree builder is already building a tree."
4907
msgstr ""
4908
4909
#: bzrlib/errors.py:178
4910
msgid "The dirstate file (%(state)s) appears to be corrupt: %(msg)s"
4911
msgstr ""
4912
4913
#: bzrlib/errors.py:197
4914
msgid ""
4915
"The API for \"%(api)s\" is not compatible with \"%(wanted)s\". It supports "
4916
"versions \"%(minimum)s\" to \"%(current)s\"."
4917
msgstr ""
4918
4919
#: bzrlib/errors.py:209
4920
msgid "The transport '%(transport)s' is only accessible within this process."
4921
msgstr ""
4922
4923
#: bzrlib/errors.py:227
4924
msgid "Invalid revision number %(revno)s"
4925
msgstr ""
4926
4927
#: bzrlib/errors.py:236
4928
msgid "Invalid revision-id {%(revision_id)s} in %(branch)s"
4929
msgstr ""
4930
4931
#: bzrlib/errors.py:247
4932
msgid "Reserved revision-id {%(revision_id)s}"
4933
msgstr ""
4934
4935
#: bzrlib/errors.py:261
4936
msgid "There is no public branch set for \"%(branch_url)s\"."
4937
msgstr ""
4938
4939
#: bzrlib/errors.py:271
4940
msgid ""
4941
"No help could be found for '%(topic)s'. Please use 'bzr help topics' to "
4942
"obtain a list of topics."
4943
msgstr ""
4944
4945
#: bzrlib/errors.py:280
4946
msgid "The file id \"%(file_id)s\" is not present in the tree %(tree)s."
4947
msgstr ""
4948
4949
#: bzrlib/errors.py:290
4950
msgid ""
4951
"The file id \"%(file_id)s\" is not present in the repository %(repository)r"
4952
msgstr ""
4953
4954
#: bzrlib/errors.py:299
4955
msgid "The branch '%(branch)s' is not stacked."
4956
msgstr ""
4957
4958
#: bzrlib/errors.py:313
4959
msgid "No WorkingTree exists for \"%(base)s\"."
4960
msgstr ""
4961
4962
#: bzrlib/errors.py:322
4963
msgid "Not currently building a tree."
4964
msgstr ""
4965
4966
#: bzrlib/errors.py:327
4967
msgid "%(url)s is not a local path."
4968
msgstr ""
4969
4970
#: bzrlib/errors.py:355
4971
msgid "%(not_locked)r is not write locked but needs to be."
4972
msgstr ""
4973
4974
#: bzrlib/errors.py:363
4975
msgid "Error in command line options"
4976
msgstr ""
4977
4978
#: bzrlib/errors.py:368
4979
msgid "%(value)s is not an index of type %(_type)s."
4980
msgstr ""
4981
4982
#: bzrlib/errors.py:378
4983
msgid "Error in data for index %(value)s."
4984
msgstr ""
4985
4986
#: bzrlib/errors.py:387
4987
msgid "The key '%(key)s' is already in index '%(index)s'."
4988
msgstr ""
4989
4990
#: bzrlib/errors.py:397
4991
msgid "The key '%(key)s' is not a valid key."
4992
msgstr ""
4993
4994
#: bzrlib/errors.py:406
4995
msgid "Could not parse options for index %(value)s."
4996
msgstr ""
4997
4998
#: bzrlib/errors.py:415
4999
msgid "The value '%(value)s' is not a valid value."
5000
msgstr ""
5001
5002
#: bzrlib/errors.py:424
5003
msgid "Bad value \"%(value)s\" for option \"%(name)s\"."
5004
msgstr ""
5005
5006
#: bzrlib/errors.py:443
5007
msgid "Generic path error: %(path)r%(extra)s)"
5008
msgstr ""
5009
5010
#: bzrlib/errors.py:456
5011
msgid "No such file: %(path)r%(extra)s"
5012
msgstr ""
5013
5014
#: bzrlib/errors.py:461
5015
msgid "File exists: %(path)r%(extra)s"
5016
msgstr ""
5017
5018
#: bzrlib/errors.py:467
5019
msgid ""
5020
"Could not rename %(source)s => %(dest)s because both files exist. (Use --"
5021
"after to tell bzr about a rename that has already happened)%(extra)s"
5022
msgstr ""
5023
5024
#: bzrlib/errors.py:483
5025
msgid "\"%(path)s\" is not a directory %(extra)s"
5026
msgstr ""
5027
5028
#: bzrlib/errors.py:488
5029
msgid "\"%(path)s\" is not in the working directory %(extra)s"
5030
msgstr ""
5031
5032
#: bzrlib/errors.py:493
5033
msgid "Directory not empty: \"%(path)s\"%(extra)s"
5034
msgstr ""
5035
5036
#: bzrlib/errors.py:498
5037
msgid "Hard-linking \"%(path)s\" is not supported"
5038
msgstr ""
5039
5040
#: bzrlib/errors.py:513
5041
msgid "Device or resource busy: \"%(path)s\"%(extra)s"
5042
msgstr ""
5043
5044
#: bzrlib/errors.py:518
5045
msgid "Permission denied: \"%(path)s\"%(extra)s"
5046
msgstr ""
5047
5048
#: bzrlib/errors.py:523
5049
msgid "Invalid url supplied to transport: \"%(path)s\"%(extra)s"
5050
msgstr ""
5051
5052
#: bzrlib/errors.py:528
5053
msgid "Invalid URL join request: %(reason)s: %(base)r + %(join_args)r"
5054
msgstr ""
5055
5056
#: bzrlib/errors.py:539
5057
msgid "URLs differ by more than path: %(from_)r and %(to)r"
5058
msgstr ""
5059
5060
#: bzrlib/errors.py:561
5061
msgid "The %(type)s hook '%(hook)s' is unknown in this version of bzrlib."
5062
msgstr ""
5063
5064
#: bzrlib/errors.py:571
5065
msgid "Unsupported protocol for url \"%(path)s\"%(extra)s"
5066
msgstr ""
5067
5068
#: bzrlib/errors.py:579
5069
msgid ""
5070
"The branch '%(url)s'(%(format)s) is not a stackable format. You will need to "
5071
"upgrade the branch to permit branch stacking."
5072
msgstr ""
5073
5074
#: bzrlib/errors.py:590
5075
msgid "The branch '%(branch_url)s' cannot be stacked on '%(target_url)s'."
5076
msgstr ""
5077
5078
#: bzrlib/errors.py:600
5079
msgid ""
5080
"The repository '%(url)s'(%(format)s) is not a stackable format. You will "
5081
"need to upgrade the repository to permit branch stacking."
5082
msgstr ""
5083
5084
#: bzrlib/errors.py:611
5085
msgid "Error reading from %(path)r."
5086
msgstr ""
5087
5088
#: bzrlib/errors.py:630
5089
msgid "Path \"%(path)s\" is not a child of path \"%(base)s\"%(extra)s"
5090
msgstr ""
5091
5092
#: bzrlib/errors.py:646
5093
msgid "Path \"%(path)s\" is not unicode normalized"
5094
msgstr ""
5095
5096
#: bzrlib/errors.py:654
5097
msgid "Not a branch: \"%(path)s\"%(detail)s."
5098
msgstr ""
5099
5100
#: bzrlib/errors.py:696
5101
msgid "No submit branch available for branch \"%(path)s\""
5102
msgstr ""
5103
5104
#: bzrlib/errors.py:705
5105
msgid "A control directory already exists: \"%(path)s\"."
5106
msgstr ""
5107
5108
#: bzrlib/errors.py:710
5109
msgid "Already a branch: \"%(path)s\"."
5110
msgstr ""
5111
5112
#: bzrlib/errors.py:715
5113
msgid "Parent branch already exists: \"%(path)s\"."
5114
msgstr ""
5115
5116
#: bzrlib/errors.py:721
5117
msgid ""
5118
"Directory contains a branch, but no working tree (use bzr checkout if you "
5119
"wish to build a working tree): \"%(path)s\""
5120
msgstr ""
5121
5122
#: bzrlib/errors.py:726
5123
msgid ""
5124
"\"%(function)s\" called on an AtomicFile after it was closed: \"%(path)s\""
5125
msgstr ""
5126
5127
#: bzrlib/errors.py:736
5128
msgid ""
5129
"Parent not accessible given base \"%(base)s\" and relative path \"%(path)s\""
5130
msgstr ""
5131
5132
#: bzrlib/errors.py:746
5133
msgid "No repository present: \"%(path)s\""
5134
msgstr ""
5135
5136
#: bzrlib/errors.py:753
5137
msgid ""
5138
"Unsupported branch format: %(format)s\n"
5139
"Please run 'bzr upgrade'"
5140
msgstr ""
5141
5142
#: bzrlib/errors.py:759
5143
msgid "Unknown %(kind)s format: %(format)r"
5144
msgstr ""
5145
5146
#: bzrlib/errors.py:768
5147
msgid "Format %(format)s is not compatible with .bzr version %(bzrdir)s."
5148
msgstr ""
5149
5150
#: bzrlib/errors.py:778
5151
msgid "Parse error on line %(lineno)d of %(format)s format: %(line)s"
5152
msgstr ""
5153
5154
#: bzrlib/errors.py:793
5155
msgid ""
5156
"%(target)s\n"
5157
"is not compatible with\n"
5158
"%(source)s\n"
5159
"%(details)s"
5160
msgstr ""
5161
5162
#: bzrlib/errors.py:809
5163
msgid "Revision is not compatible with %(repo_format)s"
5164
msgstr ""
5165
5166
#: bzrlib/errors.py:819
5167
msgid "%(context_info)s%(path)s is already versioned."
5168
msgstr ""
5169
5170
#: bzrlib/errors.py:840
5171
msgid "%(context_info)s%(path)s is not versioned."
5172
msgstr ""
5173
5174
#: bzrlib/errors.py:861
5175
msgid "Path(s) are not versioned: %(paths_as_string)s"
5176
msgstr ""
5177
5178
#: bzrlib/errors.py:872
5179
msgid "Path(s) do not exist: %(paths_as_string)s%(extra)s"
5180
msgstr ""
5181
5182
#: bzrlib/errors.py:891
5183
msgid "Cannot operate on \"%(filename)s\" of unsupported kind \"%(kind)s\""
5184
msgstr ""
5185
5186
#: bzrlib/errors.py:899
5187
msgid ""
5188
"Filename %(filename)r is not valid in your current filesystem encoding "
5189
"%(fs_encoding)s"
5190
msgstr ""
5191
5192
#: bzrlib/errors.py:910
5193
msgid "Cannot operate on \"%(filename)s\" because it is a control file"
5194
msgstr ""
5195
5196
#: bzrlib/errors.py:928
5197
msgid "The lock for '%(lock_description)s' is in use and cannot be broken."
5198
msgstr ""
5199
5200
#: bzrlib/errors.py:967
5201
msgid "Cannot lock %(lock)s: %(why)s"
5202
msgstr ""
5203
5204
#: bzrlib/errors.py:977
5205
msgid ""
5206
"A transaction related operation was attempted after the transaction finished."
5207
msgstr ""
5208
5209
#: bzrlib/errors.py:1004
5210
msgid "Cannot lock: transport is read only: %(transport)s"
5211
msgstr ""
5212
5213
#: bzrlib/errors.py:1012
5214
msgid "Could not acquire lock \"%(lock)s\": %(msg)s"
5215
msgstr ""
5216
5217
#: bzrlib/errors.py:1023
5218
msgid ""
5219
"Lock was broken while still open: %(lock)s - check storage consistency!"
5220
msgstr ""
5221
5222
#: bzrlib/errors.py:1034
5223
msgid ""
5224
"Lock was released and re-acquired before being broken: %(lock)s: held by "
5225
"%(holder)r, wanted to break %(target)r"
5226
msgstr ""
5227
5228
#: bzrlib/errors.py:1046
5229
msgid ""
5230
"Lock is apparently held, but corrupted: %(corruption_info)s\n"
5231
"Use 'bzr break-lock' to clear it"
5232
msgstr ""
5233
5234
#: bzrlib/errors.py:1059
5235
msgid "Lock not held: %(lock)s"
5236
msgstr ""
5237
5238
#: bzrlib/errors.py:1088
5239
msgid "No changes to commit"
5240
msgstr ""
5241
5242
#: bzrlib/errors.py:1093
5243
msgid ""
5244
"Selected-file commit of merges is not supported yet: files %(files_str)s"
5245
msgstr ""
5246
5247
#: bzrlib/errors.py:1103
5248
msgid ""
5249
"Excluding paths during commit is not supported by repository at "
5250
"%(repository)r."
5251
msgstr ""
5252
5253
#: bzrlib/errors.py:1112
5254
msgid ""
5255
"The specified commit message contains characters unsupported by the current "
5256
"encoding."
5257
msgstr ""
5258
5259
#: bzrlib/errors.py:1118
5260
msgid "Upgrade URL cannot work with readonly URLs."
5261
msgstr ""
5262
5263
#: bzrlib/errors.py:1123
5264
msgid "The branch format %(format)s is already at the most recent format."
5265
msgstr ""
5266
5267
#: bzrlib/errors.py:1146
5268
msgid "Option --change does not accept revision ranges"
5269
msgstr ""
5270
5271
#: bzrlib/errors.py:1151
5272
msgid "No namespace registered for string: %(spec)r"
5273
msgstr ""
5274
5275
#: bzrlib/errors.py:1170
5276
msgid ""
5277
"Requested revision: '%(spec)s' does not exist in branch: "
5278
"%(branch_url)s%(extra)s"
5279
msgstr ""
5280
5281
#: bzrlib/errors.py:1184
5282
msgid ""
5283
"Operation denied because it would change the main history, which is not "
5284
"permitted by the append_revisions_only setting on branch \"%(location)s\"."
5285
msgstr ""
5286
5287
#: bzrlib/errors.py:1195
5288
msgid ""
5289
"These branches have diverged. Use the missing command to see how.\n"
5290
"Use the merge command to reconcile them."
5291
msgstr ""
5292
5293
#: bzrlib/errors.py:1215
5294
msgid ""
5295
"Branches have no common ancestor, and no merge base revision was specified."
5296
msgstr ""
5297
5298
#: bzrlib/errors.py:1221
5299
msgid ""
5300
"Selected merge cannot perform reverse cherrypicks. Try merge3 or diff3."
5301
msgstr ""
5302
5303
#: bzrlib/errors.py:1227
5304
msgid "Revisions have no common ancestor: %(revision_a)s %(revision_b)s"
5305
msgstr ""
5306
5307
#: bzrlib/errors.py:1236
5308
msgid ""
5309
"Revisions are not derived from the same root: %(revision_a)s %(revision_b)s."
5310
msgstr ""
5311
5312
#: bzrlib/errors.py:1245
5313
msgid "Revision %(rev_id)s is not an ancestor of %(not_ancestor_id)s"
5314
msgstr ""
5315
5316
#: bzrlib/errors.py:1254
5317
msgid "Branch %(branch)s has no commits."
5318
msgstr ""
5319
5320
#: bzrlib/errors.py:1272
5321
msgid ""
5322
"Bound branch %(branch)s is out of date with master branch "
5323
"%(master)s.%(extra_help)s"
5324
msgstr ""
5325
5326
#: bzrlib/errors.py:1284
5327
msgid ""
5328
"Cannot commit to branch %(branch)s. It is bound to %(master)s, which is "
5329
"bound to %(remote)s."
5330
msgstr ""
5331
5332
#: bzrlib/errors.py:1296
5333
msgid "Cannot pull --overwrite to a branch which is bound %(branch)s"
5334
msgstr ""
5335
5336
#: bzrlib/errors.py:1305
5337
msgid ""
5338
"Unable to connect to target of bound branch %(branch)s => %(target)s: "
5339
"%(error)s"
5340
msgstr ""
5341
5342
#: bzrlib/errors.py:1317
5343
msgid "Error in processing weave: %(msg)s"
5344
msgstr ""
5345
5346
#: bzrlib/errors.py:1326
5347
msgid "Revision {%(revision_id)s} already present in %(weave)s"
5348
msgstr ""
5349
5350
#: bzrlib/errors.py:1337
5351
msgid "Revision {%(revision_id)s} not present in %(weave)s"
5352
msgstr ""
5353
5354
#: bzrlib/errors.py:1347
5355
msgid "Weave invariant violated: %(what)s"
5356
msgstr ""
5357
5358
#: bzrlib/errors.py:1356
5359
msgid "Parents are mismatched between two revisions. %(msg)s"
5360
msgstr ""
5361
5362
#: bzrlib/errors.py:1378
5363
msgid ""
5364
"Weaves differ on text content. Revision: {%(revision_id)s}, %(weave_a)s, "
5365
"%(weave_b)s"
5366
msgstr ""
5367
5368
#: bzrlib/errors.py:1390
5369
msgid "Versioned file error"
5370
msgstr ""
5371
5372
#: bzrlib/errors.py:1395
5373
msgid "Revision {%(revision_id)s} not present in \"%(file_id)s\"."
5374
msgstr ""
5375
5376
#: bzrlib/errors.py:1405
5377
msgid "Revision {%(revision_id)s} already present in \"%(file_id)s\"."
5378
msgstr ""
5379
5380
#: bzrlib/errors.py:1415
5381
msgid "Text did not match its checksum: %(msg)s"
5382
msgstr ""
5383
5384
#: bzrlib/errors.py:1541
5385
msgid "Export format %(format)r not supported"
5386
msgstr ""
5387
5388
#: bzrlib/errors.py:1550
5389
msgid "Transport error: %(msg)s %(orig_error)s"
5390
msgstr ""
5391
5392
#: bzrlib/errors.py:1576
5393
msgid "Generic bzr smart protocol error: %(details)s"
5394
msgstr ""
5395
5396
#: bzrlib/errors.py:1584
5397
msgid "Received bad protocol version marker: %(marker)r"
5398
msgstr ""
5399
5400
#: bzrlib/errors.py:1616
5401
msgid "Transport operation not possible: %(msg)s %(orig_error)s"
5402
msgstr ""
5403
5404
#: bzrlib/errors.py:1621
5405
msgid "Connection error: %(msg)s %(orig_error)s"
5406
msgstr ""
5407
5408
#: bzrlib/errors.py:1626
5409
msgid "%(msg)s %(host)s%(port)s%(orig_error)s"
5410
msgstr ""
5411
5412
#: bzrlib/errors.py:1647
5413
msgid "Connection closed: %(msg)s %(orig_error)s"
5414
msgstr ""
5415
5416
#: bzrlib/errors.py:1652
5417
msgid "Connection Timeout: %(msg)s%(orig_error)s"
5418
msgstr ""
5419
5420
#: bzrlib/errors.py:1657
5421
msgid "Invalid range access in %(path)s at %(offset)s: %(msg)s"
5422
msgstr ""
5423
5424
#: bzrlib/errors.py:1667
5425
msgid "Invalid http response for %(path)s: %(msg)s%(orig_error)s"
5426
msgstr ""
5427
5428
#: bzrlib/errors.py:1682
5429
msgid "Certificate error: %(error)s"
5430
msgstr ""
5431
5432
#: bzrlib/errors.py:1690
5433
msgid "Invalid http range %(range)r for %(path)s: %(msg)s"
5434
msgstr ""
5435
5436
#: bzrlib/errors.py:1704
5437
msgid "HTTP MIME Boundary missing for %(path)s: %(msg)s"
5438
msgstr ""
5439
5440
#: bzrlib/errors.py:1712
5441
msgid "Invalid http Content-type \"%(ctype)s\" for %(path)s: %(msg)s"
5442
msgstr ""
5443
5444
#: bzrlib/errors.py:1721
5445
msgid "%(source)s is%(permanently)s redirected to %(target)s"
5446
msgstr ""
5447
5448
#: bzrlib/errors.py:1735
5449
msgid "Too many redirections"
5450
msgstr ""
5451
5452
#: bzrlib/errors.py:1740
5453
msgid "Working tree has conflicts."
5454
msgstr ""
5455
5456
#: bzrlib/errors.py:1744
5457
msgid "Config file %(filename)s is not UTF-8 encoded\n"
5458
msgstr ""
5459
5460
#: bzrlib/errors.py:1753
5461
msgid ""
5462
"Error(s) parsing config file %(filename)s:\n"
5463
"%(errors)s"
5464
msgstr ""
5465
5466
#: bzrlib/errors.py:1763
5467
msgid ""
5468
"Bad value \"%(value)s\" for option \"%(name)s\".\n"
5469
"See ``bzr help %(name)s``"
5470
msgstr ""
5471
5472
#: bzrlib/errors.py:1773
5473
msgid "%(username)r does not seem to contain a reasonable email address"
5474
msgstr ""
5475
5476
#: bzrlib/errors.py:1782
5477
msgid "Failed to GPG sign data with command \"%(command_line)s\""
5478
msgstr ""
5479
5480
#: bzrlib/errors.py:1790
5481
msgid "Failed to verify GPG signature data with error \"%(error)s\""
5482
msgstr ""
5483
5484
#: bzrlib/errors.py:1798
5485
msgid "Unable to import library \"%(library)s\": %(error)s"
5486
msgstr ""
5487
5488
#: bzrlib/errors.py:1806
5489
msgid "python-gpgme is not installed, it is needed to verify signatures"
5490
msgstr ""
5491
5492
#: bzrlib/errors.py:1814
5493
msgid ""
5494
"The working tree for %(basedir)s has changed since the last commit, but "
5495
"weave merge requires that it be unchanged"
5496
msgstr ""
5497
5498
#: bzrlib/errors.py:1824
5499
msgid ""
5500
"Can't reprocess and show base, because reprocessing obscures the "
5501
"relationship of conflicting lines to the base"
5502
msgstr ""
5503
5504
#: bzrlib/errors.py:1830
5505
msgid "Cycle in graph %(graph)r"
5506
msgstr ""
5507
5508
#: bzrlib/errors.py:1858
5509
msgid "File %(filename)s is not conflicted."
5510
msgstr ""
5511
5512
#: bzrlib/errors.py:1880
5513
msgid "No bundle was found in \"%(filename)s\"."
5514
msgstr ""
5515
5516
#: bzrlib/errors.py:1889
5517
msgid "Unable to handle bundle version %(version)s: %(msg)s"
5518
msgstr ""
5519
5520
#: bzrlib/errors.py:1899
5521
msgid "Branch %(base)s is missing revision %(text_revision)s of %(file_id)s"
5522
msgstr ""
5523
5524
#: bzrlib/errors.py:1912
5525
msgid "File id {%(file_id)s} already exists in inventory as %(entry)s"
5526
msgstr ""
5527
5528
#: bzrlib/errors.py:1922
5529
msgid "Key %(key)s is already present in map"
5530
msgstr ""
5531
5532
#: bzrlib/errors.py:1927
5533
msgid "The prefix %(prefix)s is in the help search path twice."
5534
msgstr ""
5535
5536
#: bzrlib/errors.py:1937
5537
msgid ""
5538
"No final name for trans_id %(trans_id)r\n"
5539
"file-id: %(file_id)r\n"
5540
"root trans-id: %(root_trans_id)r\n"
5541
msgstr ""
5542
5543
#: bzrlib/errors.py:1969
5544
msgid "Attempt to reuse a transform that has already been applied."
5545
msgstr ""
5546
5547
#: bzrlib/errors.py:1974
5548
msgid "Moving the root directory is not supported at this time"
5549
msgstr ""
5550
5551
#: bzrlib/errors.py:1979
5552
msgid "Failed to rename %(from_path)s to %(to_path)s: %(why)s"
5553
msgstr ""
5554
5555
#: bzrlib/errors.py:1990
5556
msgid ""
5557
"Could not move %(from_path)s%(operator)s %(to_path)s%(_has_extra)s%(extra)s"
5558
msgstr ""
5559
5560
#: bzrlib/errors.py:2026
5561
msgid ""
5562
"Could not rename %(from_path)s%(operator)s %(to_path)s%(_has_extra)s%(extra)s"
5563
msgstr ""
5564
5565
#: bzrlib/errors.py:2056
5566
msgid "Unable to import paramiko (required for sftp support): %(error)s"
5567
msgstr ""
5568
5569
#: bzrlib/errors.py:2064
5570
msgid "Nothing to merge."
5571
msgstr ""
5572
5573
#: bzrlib/errors.py:2069
5574
msgid "Format %(format)s cannot be initialised by this version of bzr."
5575
msgstr ""
5576
5577
#: bzrlib/errors.py:2078
5578
msgid ""
5579
"Cannot convert from format %(from_format)s to format %(format)s. "
5580
"%(problem)s"
5581
msgstr ""
5582
5583
#: bzrlib/errors.py:2090
5584
msgid "Could not find an appropriate Differ for file \"%(path)s\""
5585
msgstr ""
5586
5587
#: bzrlib/errors.py:2098
5588
msgid "%(exe_name)s could not be found on this machine"
5589
msgstr ""
5590
5591
#: bzrlib/errors.py:2106
5592
msgid "Diff is not installed on this machine: %(msg)s"
5593
msgstr ""
5594
5595
#: bzrlib/errors.py:2114
5596
msgid "Diff3 is not installed on this machine."
5597
msgstr ""
5598
5599
#: bzrlib/errors.py:2120
5600
msgid "The content being inserted is already present."
5601
msgstr ""
5602
5603
#: bzrlib/errors.py:2125
5604
msgid ""
5605
"This tree contains left-over files from a failed operation.\n"
5606
" Please examine %(limbo_dir)s to see if it contains any files you wish "
5607
"to\n"
5608
" keep, and delete it when you are done."
5609
msgstr ""
5610
5611
#: bzrlib/errors.py:2136
5612
msgid ""
5613
"This tree contains left-over files from a failed operation.\n"
5614
" Please examine %(pending_deletion)s to see if it contains any files you\n"
5615
" wish to keep, and delete it when you are done."
5616
msgstr ""
5617
5618
#: bzrlib/errors.py:2146
5619
msgid ""
5620
"Unable to delete transform temporary directory %(limbo_dir)s.\n"
5621
" Please examine %(limbo_dir)s to see if it contains any files you wish "
5622
"to\n"
5623
" keep, and delete it when you are done."
5624
msgstr ""
5625
5626
#: bzrlib/errors.py:2157
5627
msgid ""
5628
"Unable to delete transform temporary directory %(pending_deletion)s. Please "
5629
"examine %(pending_deletion)s to see if it contains any files you wish to "
5630
"keep, and delete it when you are done."
5631
msgstr ""
5632
5633
#: bzrlib/errors.py:2167
5634
msgid "Working tree is out of date, please run 'bzr update'.%(more)s"
5635
msgstr ""
5636
5637
#: bzrlib/errors.py:2181
5638
msgid ""
5639
"Public branch \"%(public_location)s\" lacks revision \"%(revstring)s\"."
5640
msgstr ""
5641
5642
#: bzrlib/errors.py:2194
5643
msgid "Error in merge modified format"
5644
msgstr ""
5645
5646
#: bzrlib/errors.py:2199
5647
msgid "Format error in conflict listings"
5648
msgstr ""
5649
5650
#: bzrlib/errors.py:2203
5651
msgid ""
5652
"Inconsistency in dirstate file %(dirstate_path)s.\n"
5653
"Error: %(description)s"
5654
msgstr ""
5655
5656
#: bzrlib/errors.py:2214
5657
msgid ""
5658
"An error has been detected in the repository %(repo_path)s.\n"
5659
"Please run bzr reconcile on this repository."
5660
msgstr ""
5661
5662
#: bzrlib/errors.py:2225
5663
msgid ""
5664
"An inconsistent delta was supplied involving %(path)r, %(file_id)r\n"
5665
"reason: %(reason)s"
5666
msgstr ""
5667
5668
#: bzrlib/errors.py:2238
5669
msgid ""
5670
"An inconsistent delta was supplied: %(delta)r\n"
5671
"reason: %(reason)s"
5672
msgstr ""
5673
5674
#: bzrlib/errors.py:2250
5675
msgid "To use this feature you must upgrade your branch at %(path)s."
5676
msgstr ""
5677
5678
#: bzrlib/errors.py:2259
5679
msgid "To use this feature you must upgrade your repository at %(path)s."
5680
msgstr ""
5681
5682
#: bzrlib/errors.py:2264
5683
msgid ""
5684
"To use this feature you must upgrade your branch at %(path)s to a format "
5685
"which supports rich roots."
5686
msgstr ""
5687
5688
#: bzrlib/errors.py:2270
5689
msgid "Cannot perform local-only commits on unbound branches."
5690
msgstr ""
5691
5692
#: bzrlib/errors.py:2275
5693
msgid "The method %(mname)s is not supported on objects of type %(tname)s."
5694
msgstr ""
5695
5696
#: bzrlib/errors.py:2296
5697
msgid "Ghost tags not supported by format %(format)r."
5698
msgstr ""
5699
5700
#: bzrlib/errors.py:2304
5701
msgid "File is binary but should be text."
5702
msgstr ""
5703
5704
#: bzrlib/errors.py:2309
5705
msgid "The path %(path)s is not permitted on this platform"
5706
msgstr ""
5707
5708
#: bzrlib/errors.py:2318
5709
msgid ""
5710
"Testament did not match expected value.\n"
5711
" For revision_id {%(revision_id)s}, expected {%(expected)s}, measured\n"
5712
" {%(measured)s}"
5713
msgstr ""
5714
5715
#: bzrlib/errors.py:2330
5716
msgid "Not a bzr revision-bundle: %(text)r"
5717
msgstr ""
5718
5719
#: bzrlib/errors.py:2339
5720
msgid "Bad bzr revision-bundle: %(text)r"
5721
msgstr ""
5722
5723
#: bzrlib/errors.py:2348
5724
msgid "Malformed bzr revision-bundle header: %(text)r"
5725
msgstr ""
5726
5727
#: bzrlib/errors.py:2353
5728
msgid "Malformed patches in bzr revision-bundle: %(text)r"
5729
msgstr ""
5730
5731
#: bzrlib/errors.py:2358
5732
msgid "Malformed footer in bzr revision-bundle: %(text)r"
5733
msgstr ""
5734
5735
#: bzrlib/errors.py:2363
5736
msgid "End of line marker was not \\n in bzr revision-bundle"
5737
msgstr ""
5738
5739
#: bzrlib/errors.py:2373
5740
msgid "Bundle format %(bundle_format)s is incompatible with %(other)s"
5741
msgstr ""
5742
5743
#: bzrlib/errors.py:2383
5744
msgid "Root class for inventory serialization errors"
5745
msgstr ""
5746
5747
#: bzrlib/errors.py:2387
5748
msgid ""
5749
"The inventory was not in the expected format:\n"
5750
" %(msg)s"
5751
msgstr ""
5752
5753
#: bzrlib/errors.py:2396
5754
msgid "This operation requires rich root data storage"
5755
msgstr ""
5756
5757
#: bzrlib/errors.py:2409
5758
msgid "Unrecognised value for BZR_SSH environment variable: %(vendor)s"
5759
msgstr ""
5760
5761
#: bzrlib/errors.py:2418
5762
msgid ""
5763
"Don't know how to handle SSH connections. Please set BZR_SSH environment "
5764
"variable."
5765
msgstr ""
5766
5767
#: bzrlib/errors.py:2425
5768
msgid ""
5769
"Could not determine revno for {%(revision_id)s} because its ancestry shows a "
5770
"ghost at {%(ghost_revision_id)s}"
5771
msgstr ""
5772
5773
#: bzrlib/errors.py:2435
5774
msgid "Ghost revision {%(revision_id)s} cannot be used here."
5775
msgstr ""
5776
5777
#: bzrlib/errors.py:2486
5778
msgid ""
5779
"A merge directive must provide either a bundle or a public branch location."
5780
msgstr ""
5781
5782
#: bzrlib/errors.py:2493
5783
msgid "Bad merge directive payload %(start)r"
5784
msgstr ""
5785
5786
#: bzrlib/errors.py:2503
5787
msgid "Preview patch does not match requested changes."
5788
msgstr ""
5789
5790
#: bzrlib/errors.py:2509
5791
msgid "Patch_type was %(patch_type)s, but no patch was supplied."
5792
msgstr ""
5793
5794
#: bzrlib/errors.py:2519
5795
msgid ""
5796
"Your branch does not have all of the revisions required in order to merge "
5797
"this merge directive and the target location specified in the merge "
5798
"directive is not a branch: %(location)s."
5799
msgstr ""
5800
5801
#: bzrlib/errors.py:2531
5802
msgid "Unsupported entry kind %(kind)s"
5803
msgstr ""
5804
5805
#: bzrlib/errors.py:2539
5806
msgid "Can't subsume %(other_tree)s into %(tree)s. %(reason)s"
5807
msgstr ""
5808
5809
#: bzrlib/errors.py:2549
5810
msgid "Subsume target %(other_tree)s needs to be upgraded."
5811
msgstr ""
5812
5813
#: bzrlib/errors.py:2568
5814
msgid "No such tag: %(tag_name)s"
5815
msgstr ""
5816
5817
#: bzrlib/errors.py:2576
5818
msgid "Tags not supported by %(branch)s; you may be able to use bzr upgrade."
5819
msgstr ""
5820
5821
#: bzrlib/errors.py:2585
5822
msgid "Tag %(tag_name)s already exists."
5823
msgstr ""
5824
5825
#: bzrlib/errors.py:2593
5826
msgid ""
5827
"Did not understand bug identifier %(bug_id)s: %(reason)s. See \"bzr help "
5828
"bugs\" for more information on this feature."
5829
msgstr ""
5830
5831
#: bzrlib/errors.py:2603
5832
msgid ""
5833
"The URL for bug tracker \"%(abbreviation)s\" doesn't contain {id}: %(url)s"
5834
msgstr ""
5835
5836
#: bzrlib/errors.py:2613
5837
msgid ""
5838
"Cannot find registered bug tracker called %(abbreviation)s on %(branch)s"
5839
msgstr ""
5840
5841
#: bzrlib/errors.py:2623
5842
msgid "Invalid line in bugs property: '%(line)s'"
5843
msgstr ""
5844
5845
#: bzrlib/errors.py:2631
5846
msgid "Invalid bug status: '%(status)s'"
5847
msgstr ""
5848
5849
#: bzrlib/errors.py:2639
5850
msgid "Could not understand response from smart server: %(response_tuple)r"
5851
msgstr ""
5852
5853
#: bzrlib/errors.py:2678
5854
msgid "Server sent an unexpected error: %(error_tuple)r"
5855
msgstr ""
5856
5857
#: bzrlib/errors.py:2697
5858
msgid "Unrecognised container format: %(container_format)r"
5859
msgstr ""
5860
5861
#: bzrlib/errors.py:2705
5862
msgid "Unexpected end of container stream"
5863
msgstr ""
5864
5865
#: bzrlib/errors.py:2710
5866
msgid "Unknown record type: %(record_type)r"
5867
msgstr ""
5868
5869
#: bzrlib/errors.py:2718
5870
msgid "Invalid record: %(reason)s"
5871
msgstr ""
5872
5873
#: bzrlib/errors.py:2726
5874
msgid "Container has data after end marker: %(excess)r"
5875
msgstr ""
5876
5877
#: bzrlib/errors.py:2734
5878
msgid "Container has multiple records with the same name: %(name)s"
5879
msgstr ""
5880
5881
#: bzrlib/errors.py:2747
5882
msgid "Corrupt or incompatible data stream: %(reason)s"
5883
msgstr ""
5884
5885
#: bzrlib/errors.py:2755
5886
msgid "SMTP error: %(error)s"
5887
msgstr ""
5888
5889
#: bzrlib/errors.py:2763
5890
msgid "No message supplied."
5891
msgstr ""
5892
5893
#: bzrlib/errors.py:2768
5894
msgid "No mail-to address (--mail-to) or output (-o) specified."
5895
msgstr ""
5896
5897
#: bzrlib/errors.py:2773
5898
msgid "Unknown mail client: %(mail_client)s"
5899
msgstr ""
5900
5901
#: bzrlib/errors.py:2781
5902
msgid ""
5903
"Unable to find mail client with the following names: "
5904
"%(mail_command_list_string)s"
5905
msgstr ""
5906
5907
#: bzrlib/errors.py:2791
5908
msgid "SMTP connection to %(host)s refused"
5909
msgstr ""
5910
5911
#: bzrlib/errors.py:2800
5912
msgid "Please specify smtp_server. No server at default %(host)s."
5913
msgstr ""
5914
5915
#: bzrlib/errors.py:2814
5916
msgid ""
5917
"'%(display_url)s' is not in sync with %(target_url)s. See bzr help sync-for-"
5918
"reconfigure."
5919
msgstr ""
5920
5921
#: bzrlib/errors.py:2826
5922
msgid "'%(display_url)s' is already a branch."
5923
msgstr ""
5924
5925
#: bzrlib/errors.py:2831
5926
msgid "'%(display_url)s' is already a tree."
5927
msgstr ""
5928
5929
#: bzrlib/errors.py:2836
5930
msgid "'%(display_url)s' is already a checkout."
5931
msgstr ""
5932
5933
#: bzrlib/errors.py:2841
5934
msgid "'%(display_url)s' is already a lightweight checkout."
5935
msgstr ""
5936
5937
#: bzrlib/errors.py:2846
5938
msgid "'%(display_url)s' is already using a shared repository."
5939
msgstr ""
5940
5941
#: bzrlib/errors.py:2851
5942
msgid "'%(display_url)s' is already standalone."
5943
msgstr ""
5944
5945
#: bzrlib/errors.py:2856
5946
msgid "Shared repository '%(display_url)s' already creates working trees."
5947
msgstr ""
5948
5949
#: bzrlib/errors.py:2862
5950
msgid ""
5951
"Shared repository '%(display_url)s' already doesn't create working trees."
5952
msgstr ""
5953
5954
#: bzrlib/errors.py:2868
5955
msgid "Requested reconfiguration of '%(display_url)s' is not supported."
5956
msgstr ""
5957
5958
#: bzrlib/errors.py:2873
5959
msgid "No location could be found to bind to at %(display_url)s."
5960
msgstr ""
5961
5962
#: bzrlib/errors.py:2878
5963
msgid ""
5964
"Working tree \"%(display_url)s\" has uncommitted changes (See bzr "
5965
"status).%(more)s"
5966
msgstr ""
5967
5968
#: bzrlib/errors.py:2897
5969
msgid ""
5970
"Working tree \"%(display_url)s\" has shelved changes (See bzr shelve --"
5971
"list).%(more)s"
5972
msgstr ""
5973
5974
#: bzrlib/errors.py:2903
5975
msgid "Variable {%(name)s} is not available."
5976
msgstr ""
5977
5978
#: bzrlib/errors.py:2911
5979
msgid "No template specified."
5980
msgstr ""
5981
5982
#: bzrlib/errors.py:2916
5983
msgid "Unable to create symlink %(path_str)son this platform"
5984
msgstr ""
5985
5986
#: bzrlib/errors.py:2931
5987
msgid ""
5988
"Unsupported timezone format \"%(timezone)s\", options are \"utc\", "
5989
"\"original\", \"local\"."
5990
msgstr ""
5991
5992
#: bzrlib/errors.py:2965
5993
msgid ""
5994
"Unable to encode %(kind)s path %(path)r in user encoding %(user_encoding)s"
5995
msgstr ""
5996
5997
#: bzrlib/errors.py:2977
5998
msgid "The \"%(config_id)s\" configuration does not exist."
5999
msgstr ""
6000
6001
#: bzrlib/errors.py:2985
6002
msgid "The \"%(option_name)s\" configuration option does not exist."
6003
msgstr ""
6004
6005
#: bzrlib/errors.py:2993
6006
msgid "The alias \"%(alias_name)s\" does not exist."
6007
msgstr ""
6008
6009
#: bzrlib/errors.py:3007
6010
msgid "\"%(alias_name)s\" is not a valid location alias."
6011
msgstr ""
6012
6013
#: bzrlib/errors.py:3015
6014
msgid "No %(alias_name)s location assigned."
6015
msgstr ""
6016
6017
#: bzrlib/errors.py:3023
6018
msgid "Cannot bind address \"%(host)s:%(port)i\": %(orig_error)s."
6019
msgstr ""
6020
6021
#: bzrlib/errors.py:3033
6022
msgid "Unknown rules detected: %(unknowns_str)s."
6023
msgstr ""
6024
6025
#: bzrlib/errors.py:3044
6026
msgid "Tip change rejected: %(msg)s"
6027
msgstr ""
6028
6029
#: bzrlib/errors.py:3052
6030
msgid "Shelf corrupt."
6031
msgstr ""
6032
6033
#: bzrlib/errors.py:3057
6034
msgid "Corruption while decompressing repository file%(orig_error)s"
6035
msgstr ""
6036
6037
#: bzrlib/errors.py:3069
6038
msgid "No changes are shelved with id \"%(shelf_id)d\"."
6039
msgstr ""
6040
6041
#: bzrlib/errors.py:3077
6042
msgid "\"%(invalid_id)s\" is not a valid shelf id, try a number instead."
6043
msgstr ""
6044
6045
#: bzrlib/errors.py:3085
6046
msgid ""
6047
"An attempt to access a url outside the server jail was made: '%(url)s'."
6048
msgstr ""
6049
6050
#: bzrlib/errors.py:3093
6051
msgid "The user aborted the operation."
6052
msgstr ""
6053
6054
#: bzrlib/errors.py:3098
6055
msgid "Branching '%(url)s'(%(format)s) must create a working tree."
6056
msgstr ""
6057
6058
#: bzrlib/errors.py:3108
6059
msgid "No such view: %(view_name)s."
6060
msgstr ""
6061
6062
#: bzrlib/errors.py:3118
6063
msgid ""
6064
"Views are not supported by %(tree)s; use 'bzr upgrade' to change your tree "
6065
"to a later format."
6066
msgstr ""
6067
6068
#: bzrlib/errors.py:3127
6069
msgid ""
6070
"Specified file \"%(file_name)s\" is outside the current view: %(view_str)s"
6071
msgstr ""
6072
6073
#: bzrlib/errors.py:3194
6074
msgid "%(bzrdir)r does not support co-located branches."
6075
msgstr ""
6076
6077
#: bzrlib/errors.py:3200
6078
msgid ""
6079
"Unable to determine your name.\n"
6080
"Please, set your name with the 'whoami' command.\n"
6081
"E.g. bzr whoami \"Your Name <name@example.com>\""
6082
msgstr ""
6083
6084
#: bzrlib/errors.py:3209
6085
msgid "Invalid pattern(s) found. %(msg)s"
6086
msgstr ""
6087
6088
#: bzrlib/errors.py:3217
6089
msgid ""
6090
"Branch \"%(branch_url)s\" appears to be bound to itself. Please use `bzr "
6091
"unbind` to fix."
6092
msgstr ""
6093
6094
#: bzrlib/errors.py:3228
6095
msgid "Loop involving %(refs)r while expanding \"%(string)s\"."
6096
msgstr ""
6097
6098
#: bzrlib/errors.py:3237
6099
msgid "Option %(name)s is not defined while expanding \"%(string)s\"."
6100
msgstr ""
6101
6102
#: bzrlib/errors.py:3246
6103
msgid ""
6104
"No compatible object available for operations from %(source)r to %(target)r."
6105
msgstr ""
6106
6107
#: bzrlib/errors.py:3256
6108
msgid ""
6109
"VFS requests over the smart server are not allowed. Encountered: %(method)s, "
6110
"%(arguments)s."
6111
msgstr ""
6112
6113
#: bzrlib/errors.py:3266
6114
msgid ""
6115
"Kind change from %(from_kind)s to %(to_kind)s for %(path)s not supported by "
6116
"format %(format)r"
6117
msgstr ""
6118
6119
#: bzrlib/errors.py:3278
6120
msgid ""
6121
"Missing feature %(feature)s not provided by this version of Bazaar or any "
6122
"plugin."
6123
msgstr ""
6124
6125
#: bzrlib/errors.py:3291
6126
msgid "Binary files section encountered."
6127
msgstr ""
6128
6129
#: bzrlib/errors.py:3299
6130
msgid ""
6131
"Malformed patch header. %(desc)s\n"
6132
"%(line)r"
6133
msgstr ""
6134
6135
#: bzrlib/errors.py:3308
6136
msgid ""
6137
"Malformed hunk header. %(desc)s\n"
6138
"%(line)r"
6139
msgstr ""
6140
6141
#: bzrlib/errors.py:3317
6142
msgid ""
6143
"Malformed line. %(desc)s\n"
6144
"%(line)r"
6145
msgstr ""
6146
6147
#: bzrlib/errors.py:3327
6148
msgid ""
6149
"Text contents mismatch at line %(line_no)d. Original has \"%(orig_line)s\", "
6150
"but patch says it should be \"%(patch_line)s\""
6151
msgstr ""
6152
6153
#: bzrlib/errors.py:3338
6154
msgid "The feature %(feature)s has already been registered."
6155
msgstr ""
6156
6157
#: bzrlib/export_pot.py:252
6158
#, python-format
6159
msgid "Exporting messages from builtin command: %s"
6160
msgstr ""
6161
6162
#: bzrlib/export_pot.py:271
6163
msgid "Exporting messages from plugin command: {0} in {1}"
6164
msgstr ""
6165
6166
#: bzrlib/export_pot.py:292
6167
#, python-format
6168
msgid "Exporting message from error: %s"
6169
msgstr ""
6170
6171
#: bzrlib/fetch.py:98
6172
msgid "Finding revisions"
6173
msgstr ""
6174
6175
#: bzrlib/fetch.py:103
6176
msgid "Fetching revisions"
6177
msgstr ""
6178
6179
#: bzrlib/foreign.py:262
6180
msgid "Push into a different VCS without any custom bzr metadata."
6181
msgstr ""
6182
6183
#: bzrlib/foreign.py:264
6184
msgid ""
6185
"This will afterwards rebase the local branch on the remote\n"
6186
"branch unless the --no-rebase option is used, in which case \n"
6187
"the two branches will be out of sync after the push. "
6188
msgstr ""
6189
6190
#: bzrlib/foreign.py:277
6191
msgid "Do not rebase after push."
6192
msgstr ""
6193
6194
#: bzrlib/foreign.py:311
6195
#, python-format
6196
msgid "Using saved location: %s\n"
6197
msgstr ""
6198
6199
#: bzrlib/foreign.py:321
6200
msgid ""
6201
"{0!r} and {1!r} are in the same VCS, lossy push not necessary. Please use "
6202
"regular push."
6203
msgstr ""
6204
6205
#: bzrlib/gpg.py:119 bzrlib/gpg.py:460
6206
msgid "{0} commits with valid signatures"
6207
msgstr ""
6208
6209
#: bzrlib/gpg.py:123 bzrlib/gpg.py:465
6210
msgid "{0} commit with unknown key"
6211
msgid_plural "{0} commits with unknown keys"
6212
msgstr[0] ""
6213
msgstr[1] ""
6214
6215
#: bzrlib/gpg.py:129 bzrlib/gpg.py:472
6216
msgid "{0} commit not valid"
6217
msgid_plural "{0} commits not valid"
6218
msgstr[0] ""
6219
msgstr[1] ""
6220
6221
#: bzrlib/gpg.py:135 bzrlib/gpg.py:479
6222
msgid "{0} commit not signed"
6223
msgid_plural "{0} commits not signed"
6224
msgstr[0] ""
6225
msgstr[1] ""
6226
6227
#: bzrlib/gpg.py:141 bzrlib/gpg.py:486
6228
msgid "{0} commit with key now expired"
6229
msgid_plural "{0} commits with key now expired"
6230
msgstr[0] ""
6231
msgstr[1] ""
6232
6233
#: bzrlib/gpg.py:343
6234
msgid "No GnuPG key results for pattern: {0}"
6235
msgstr ""
6236
6237
#: bzrlib/gpg.py:386
6238
msgid "{0} signed {1} commit"
6239
msgid_plural "{0} signed {1} commits"
6240
msgstr[0] ""
6241
msgstr[1] ""
6242
6243
#: bzrlib/gpg.py:403 bzrlib/gpg.py:419
6244
msgid "{0} commit by author {1}"
6245
msgid_plural "{0} commits by author {1}"
6246
msgstr[0] ""
6247
msgstr[1] ""
6248
6249
#: bzrlib/gpg.py:433
6250
msgid "Unknown key {0} signed {1} commit"
6251
msgid_plural "Unknown key {0} signed {1} commits"
6252
msgstr[0] ""
6253
msgstr[1] ""
6254
6255
#: bzrlib/gpg.py:452
6256
msgid "{0} commit by author {1} with key {2} now expired"
6257
msgid_plural "{0} commits by author {1} with key {2} now expired"
6258
msgstr[0] ""
6259
msgstr[1] ""
6260
6261
#: bzrlib/groupcompress.py:1739
6262
#, python-format
6263
msgid "Insert claimed random_id=True, but then inserted %r two times"
6264
msgstr ""
6265
6266
#: bzrlib/hooks.py:331
6267
#, python-format
6268
msgid "Introduced in: %s"
6269
msgstr ""
6270
6271
#: bzrlib/hooks.py:334
6272
#, python-format
6273
msgid "Deprecated in: %s"
6274
msgstr ""
6275
6276
#: bzrlib/knit.py:1766 bzrlib/knit.py:1802
6277
msgid "Walking content"
6278
msgstr ""
6279
6280
#: bzrlib/knit.py:3330
6281
msgid "annotating"
6282
msgstr ""
6283
6284
#: bzrlib/lock.py:548
6285
msgid "{0!r} was {1} locked again"
6286
msgstr ""
6287
6288
#: bzrlib/lockdir.py:321
6289
#, python-format
6290
msgid "error removing pending lock: %s"
6291
msgstr ""
6292
6293
#: bzrlib/lockdir.py:616
6294
msgid "Unable to obtain"
6295
msgstr ""
6296
6297
#: bzrlib/lockdir.py:618
6298
msgid "Lock owner changed for"
6299
msgstr ""
6300
6301
#: bzrlib/lockdir.py:620
6302
msgid "{0} lock {1} {2}."
6303
msgstr ""
6304
6305
#: bzrlib/lockdir.py:627
6306
#, python-format
6307
msgid "Will continue to try until %s, unless you press Ctrl-C."
6308
msgstr ""
6309
6310
#: bzrlib/lockdir.py:629
6311
msgid "See \"bzr help break-lock\" for more."
6312
msgstr ""
6313
6314
#: bzrlib/lockdir.py:739
6315
#, python-format
6316
msgid ""
6317
"held by %(user)s on %(hostname)s (process #%(pid)s), acquired %(time_ago)s"
6318
msgstr ""
6319
6320
#: bzrlib/log.py:572
6321
msgid "--exclude-common-ancestry requires two different revisions"
6322
msgstr ""
6323
6324
#: bzrlib/log.py:574
6325
#, python-format
6326
msgid "invalid direction %r"
6327
msgstr ""
6328
6329
#: bzrlib/log.py:662
6330
msgid "Start revision not found in history of end revision."
6331
msgstr ""
6332
6333
#: bzrlib/log.py:1080 bzrlib/log.py:1138
6334
msgid "Logging revision 0 is invalid."
6335
msgstr ""
6336
6337
#: bzrlib/log.py:1082 bzrlib/log.py:1140
6338
msgid "Start revision must be older than the end revision."
6339
msgstr ""
6340
6341
#: bzrlib/log.py:1827
6342
#, python-format
6343
msgid "unknown log formatter: %r"
6344
msgstr ""
6345
6346
#: bzrlib/log.py:2123
6347
msgid "fixes bug"
6348
msgid_plural "fixes bugs"
6349
msgstr[0] ""
6350
msgstr[1] ""
6351
6352
#: bzrlib/merge.py:689
6353
msgid "All changes applied successfully."
6354
msgstr ""
6355
6356
#: bzrlib/merge.py:691
6357
#, python-format
6358
msgid "%d conflicts encountered."
6359
msgstr ""
6360
6361
#: bzrlib/merge.py:845 bzrlib/merge.py:1933
6362
msgid "Preparing file merge"
6363
msgstr ""
6364
6365
#: bzrlib/multiparent.py:426
6366
msgid "Importing revisions"
6367
msgstr ""
6368
6369
#: bzrlib/option.py:526
6370
msgid "Show help message."
6371
msgstr ""
6372
6373
#: bzrlib/option.py:528
6374
msgid "Only display errors and warnings."
6375
msgstr ""
6376
6377
#: bzrlib/option.py:531
6378
msgid "Show usage message and options."
6379
msgstr ""
6380
6381
#: bzrlib/option.py:533
6382
msgid "Display more information."
6383
msgstr ""
6384
6385
#: bzrlib/option.py:541
6386
msgid ""
6387
"Select changes introduced by the specified revision. See also \"help "
6388
"revisionspec\"."
6389
msgstr ""
6390
6391
#: bzrlib/option.py:543
6392
msgid "Branch to operate on, instead of working directory."
6393
msgstr ""
6394
6395
#: bzrlib/option.py:545
6396
msgid "Detailed log format."
6397
msgstr ""
6398
6399
#: bzrlib/option.py:545
6400
msgid "Format used by GNU ChangeLog files."
6401
msgstr ""
6402
6403
#: bzrlib/option.py:545
6404
msgid "Log format with one line per revision."
6405
msgstr ""
6406
6407
#: bzrlib/option.py:545
6408
msgid "Moderately short log format."
6409
msgstr ""
6410
6411
#: bzrlib/option.py:545
6412
msgid "Use specified log format."
6413
msgstr ""
6414
6415
#: bzrlib/option.py:547
6416
msgid "Log format"
6417
msgstr ""
6418
6419
#: bzrlib/option.py:549
6420
msgid "LCA-newness merge."
6421
msgstr ""
6422
6423
#: bzrlib/option.py:549
6424
msgid "Merge using external diff3."
6425
msgstr ""
6426
6427
#: bzrlib/option.py:549
6428
msgid "Native diff3-style merge."
6429
msgstr ""
6430
6431
#: bzrlib/option.py:549
6432
msgid "Select a particular merge algorithm."
6433
msgstr ""
6434
6435
#: bzrlib/option.py:549
6436
msgid "Weave-based merge."
6437
msgstr ""
6438
6439
#: bzrlib/option.py:551
6440
msgid "Merge algorithm"
6441
msgstr ""
6442
6443
#: bzrlib/option.py:554
6444
msgid "Message string."
6445
msgstr ""
6446
6447
#: bzrlib/option.py:556
6448
msgid "Use an ASCII NUL (\\0) separator rather than a newline."
6449
msgstr ""
6450
6451
#: bzrlib/option.py:558
6452
msgid "Ignore differences between branches and overwrite unconditionally."
6453
msgstr ""
6454
6455
#: bzrlib/option.py:560
6456
msgid "Remember the specified location as a default."
6457
msgstr ""
6458
6459
#: bzrlib/option.py:562
6460
msgid "Reprocess to reduce spurious conflicts."
6461
msgstr ""
6462
6463
#: bzrlib/option.py:566
6464
msgid "See \"help revisionspec\" for details."
6465
msgstr ""
6466
6467
#: bzrlib/option.py:568
6468
msgid "Show internal object ids."
6469
msgstr ""
6470
6471
#: bzrlib/option.py:571
6472
msgid "Display timezone as local, original, or utc."
6473
msgstr ""
6474
6475
#: bzrlib/osutils.py:100
6476
msgid "Parameter {0!r} encoding is unsupported by {1} application locale."
6477
msgstr ""
6478
6479
#: bzrlib/osutils.py:220
6480
msgid "lstat/stat of ({0!r}): {1!r}"
6481
msgstr ""
6482
6483
#: bzrlib/osutils.py:1008 bzrlib/osutils.py:1019
6484
#, python-format
6485
msgid "sorry, %r not allowed in path"
6486
msgstr ""
6487
6488
#: bzrlib/osutils.py:1237
6489
#, python-format
6490
msgid "%r is too short to calculate a relative path"
6491
msgstr ""
6492
6493
#: bzrlib/plugin.py:143
6494
#, python-format
6495
msgid "\"%s\" is not a valid <plugin_name>@<plugin_path> description "
6496
msgstr ""
6497
6498
#: bzrlib/plugins/bash_completion/bashcomp.py:411
6499
msgid "Enable completions for the selected plugin (default: all plugins)"
6500
msgstr ""
6501
6502
#: bzrlib/plugins/bash_completion/bashcomp.py:412
6503
msgid "Generate a shell function for bash command line completion."
6504
msgstr ""
6505
6506
#: bzrlib/plugins/bash_completion/bashcomp.py:414
6507
msgid ""
6508
"This command generates a shell function which can be used by bash to\n"
6509
"automatically complete the currently typed command when the user presses\n"
6510
"the completion key (usually tab)."
6511
msgstr ""
6512
6513
#: bzrlib/plugins/bash_completion/bashcomp.py:418
6514
msgid ""
6515
"Commonly used like this:\n"
6516
" eval \"`bzr bash-completion`\""
6517
msgstr ""
6518
6519
#: bzrlib/plugins/bash_completion/bashcomp.py:424
6520
msgid "Name of the generated function (default: _bzr)"
6521
msgstr ""
6522
6523
#: bzrlib/plugins/bash_completion/bashcomp.py:426
6524
msgid "Generate only the shell function, don't enable it"
6525
msgstr ""
6526
6527
#: bzrlib/plugins/launchpad/__init__.py:81
6528
msgid "Register a branch with launchpad.net."
6529
msgstr ""
6530
6531
#: bzrlib/plugins/launchpad/__init__.py:83
6532
msgid ""
6533
"This command lists a bzr branch in the directory of branches on\n"
6534
"launchpad.net. Registration allows the branch to be associated with\n"
6535
"bugs or specifications."
6536
msgstr ""
6537
6538
#: bzrlib/plugins/launchpad/__init__.py:87
6539
msgid ""
6540
"Before using this command you must register the project to which the\n"
6541
"branch belongs, and create an account for yourself on launchpad.net."
6542
msgstr ""
6543
6544
#: bzrlib/plugins/launchpad/__init__.py:90
6545
msgid ""
6546
"arguments:\n"
6547
" public_url: The publicly visible url for the branch to register.\n"
6548
" This must be an http or https url (which Launchpad can read\n"
6549
" from to access the branch). Local file urls, SFTP urls, and\n"
6550
" bzr+ssh urls will not work.\n"
6551
" If no public_url is provided, bzr will use the configured\n"
6552
" public_url if there is one for the current branch, and\n"
6553
" otherwise error."
6554
msgstr ""
6555
6556
#: bzrlib/plugins/launchpad/__init__.py:99
6557
msgid ""
6558
"example:\n"
6559
" bzr register-branch http://foo.com/bzr/fooproject.mine \\\n"
6560
" --project fooproject"
6561
msgstr ""
6562
6563
#: bzrlib/plugins/launchpad/__init__.py:106
6564
msgid "Launchpad project short name to associate with the branch."
6565
msgstr ""
6566
6567
#: bzrlib/plugins/launchpad/__init__.py:113
6568
msgid ""
6569
"Short name for the branch; by default taken from the last component of the "
6570
"url."
6571
msgstr ""
6572
6573
#: bzrlib/plugins/launchpad/__init__.py:117
6574
msgid "One-sentence description of the branch."
6575
msgstr ""
6576
6577
#: bzrlib/plugins/launchpad/__init__.py:120
6578
msgid "Longer description of the purpose or contents of the branch."
6579
msgstr ""
6580
6581
#: bzrlib/plugins/launchpad/__init__.py:123
6582
msgid "Branch author's email address, if not yourself."
6583
msgstr ""
6584
6585
#: bzrlib/plugins/launchpad/__init__.py:126
6586
msgid "The bug this branch fixes."
6587
msgstr ""
6588
6589
#: bzrlib/plugins/launchpad/__init__.py:129
6590
msgid "Prepare the request but don't actually send it."
6591
msgstr ""
6592
6593
#: bzrlib/plugins/launchpad/__init__.py:151
6594
msgid ""
6595
"register-branch requires a public branch url - see bzr help register-branch."
6596
msgstr ""
6597
6598
#: bzrlib/plugins/launchpad/__init__.py:159
6599
msgid "--product is deprecated; please use --project."
6600
msgstr ""
6601
6602
#: bzrlib/plugins/launchpad/__init__.py:191
6603
msgid "Open a Launchpad branch page in your web browser."
6604
msgstr ""
6605
6606
#: bzrlib/plugins/launchpad/__init__.py:196
6607
msgid "Do not actually open the browser. Just say the URL we would use."
6608
msgstr ""
6609
6610
#: bzrlib/plugins/launchpad/__init__.py:231
6611
#, python-format
6612
msgid "Opening %s in web browser"
6613
msgstr ""
6614
6615
#: bzrlib/plugins/launchpad/__init__.py:241
6616
msgid "Show or set the Launchpad user ID."
6617
msgstr ""
6618
6619
#: bzrlib/plugins/launchpad/__init__.py:243
6620
msgid ""
6621
"When communicating with Launchpad, some commands need to know your\n"
6622
"Launchpad user ID. This command can be used to set or show the\n"
6623
"user ID that Bazaar will use for such communication."
6624
msgstr ""
6625
6626
#: bzrlib/plugins/launchpad/__init__.py:247
6627
msgid ""
6628
":Examples:\n"
6629
" Show the Launchpad ID of the current user::"
6630
msgstr ""
6631
6632
#: bzrlib/plugins/launchpad/__init__.py:250
6633
msgid " bzr launchpad-login"
6634
msgstr ""
6635
6636
#: bzrlib/plugins/launchpad/__init__.py:252
6637
msgid " Set the Launchpad ID of the current user to 'bob'::"
6638
msgstr ""
6639
6640
#: bzrlib/plugins/launchpad/__init__.py:254
6641
msgid " bzr launchpad-login bob"
6642
msgstr ""
6643
6644
#: bzrlib/plugins/launchpad/__init__.py:261
6645
msgid "Don't check that the user name is valid."
6646
msgstr ""
6647
6648
#: bzrlib/plugins/launchpad/__init__.py:276
6649
#: bzrlib/plugins/launchpad/__init__.py:287
6650
msgid "Launchpad user ID exists and has SSH keys.\n"
6651
msgstr ""
6652
6653
#: bzrlib/plugins/launchpad/__init__.py:279
6654
msgid "No Launchpad user ID configured.\n"
6655
msgstr ""
6656
6657
#: bzrlib/plugins/launchpad/__init__.py:290
6658
#, python-format
6659
msgid "Launchpad user ID set to '%s'.\n"
6660
msgstr ""
6661
6662
#: bzrlib/plugins/launchpad/__init__.py:298
6663
msgid "Ask Launchpad to mirror a branch now."
6664
msgstr ""
6665
6666
#: bzrlib/plugins/launchpad/__init__.py:318
6667
msgid "Propose merging a branch on Launchpad."
6668
msgstr ""
6669
6670
#: bzrlib/plugins/launchpad/__init__.py:320
6671
msgid ""
6672
"This will open your usual editor to provide the initial comment. When it\n"
6673
"has created the proposal, it will open it in your default web browser."
6674
msgstr ""
6675
6676
#: bzrlib/plugins/launchpad/__init__.py:323
6677
msgid ""
6678
"The branch will be proposed to merge into SUBMIT_BRANCH. If SUBMIT_BRANCH\n"
6679
"is not supplied, the remembered submit branch will be used. If no submit\n"
6680
"branch is remembered, the development focus will be used."
6681
msgstr ""
6682
6683
#: bzrlib/plugins/launchpad/__init__.py:327
6684
msgid ""
6685
"By default, the SUBMIT_BRANCH's review team will be requested to review\n"
6686
"the merge proposal. This can be overriden by specifying --review (-R).\n"
6687
"The parameter the launchpad account name of the desired reviewer. This\n"
6688
"may optionally be followed by '=' and the review type. For example:"
6689
msgstr ""
6690
6691
#: bzrlib/plugins/launchpad/__init__.py:332
6692
msgid " bzr lp-propose-merge --review jrandom --review review-team=qa"
6693
msgstr ""
6694
6695
#: bzrlib/plugins/launchpad/__init__.py:334
6696
msgid ""
6697
"This will propose a merge, request \"jrandom\" to perform a review of\n"
6698
"unspecified type, and request \"review-team\" to perform a \"qa\" review."
6699
msgstr ""
6700
6701
#: bzrlib/plugins/launchpad/__init__.py:339
6702
msgid "Propose the merge on staging."
6703
msgstr ""
6704
6705
#: bzrlib/plugins/launchpad/__init__.py:341
6706
msgid "Commit message."
6707
msgstr ""
6708
6709
#: bzrlib/plugins/launchpad/__init__.py:343
6710
msgid "Mark the proposal as approved immediately."
6711
msgstr ""
6712
6713
#: bzrlib/plugins/launchpad/__init__.py:345
6714
msgid "Requested reviewer and optional type."
6715
msgstr ""
6716
6717
#: bzrlib/plugins/launchpad/__init__.py:382
6718
msgid "Find the proposal to merge this revision."
6719
msgstr ""
6720
6721
#: bzrlib/plugins/launchpad/__init__.py:384
6722
msgid ""
6723
"Finds the merge proposal(s) that discussed landing the specified revision.\n"
6724
"This works only if the selected branch was the merge proposal target, and\n"
6725
"if the merged_revno is recorded for the merge proposal. The proposal(s)\n"
6726
"are opened in a web browser."
6727
msgstr ""
6728
6729
#: bzrlib/plugins/launchpad/__init__.py:389
6730
msgid ""
6731
"Any revision involved in the merge may be specified-- the revision in\n"
6732
"which the merge was performed, or one of the revisions that was merged."
6733
msgstr ""
6734
6735
#: bzrlib/plugins/launchpad/__init__.py:392
6736
msgid "So, to find the merge proposal that reviewed line 1 of README::"
6737
msgstr ""
6738
6739
#: bzrlib/plugins/launchpad/__init__.py:394
6740
msgid " bzr lp-find-proposal -r annotate:README:1"
6741
msgstr ""
6742
6743
#: bzrlib/plugins/launchpad/__init__.py:409
6744
msgid "No review found."
6745
msgstr ""
6746
6747
#: bzrlib/plugins/launchpad/__init__.py:410
6748
#, python-format
6749
msgid "%d proposals(s) found."
6750
msgstr ""
6751
6752
#: bzrlib/plugins/launchpad/__init__.py:420
6753
msgid "Finding revision-id"
6754
msgstr ""
6755
6756
#: bzrlib/plugins/launchpad/__init__.py:427
6757
msgid "Finding merge"
6758
msgstr ""
6759
6760
#: bzrlib/plugins/launchpad/__init__.py:432
6761
msgid "Finding revno"
6762
msgstr ""
6763
6764
#: bzrlib/plugins/launchpad/__init__.py:437
6765
msgid "Finding Launchpad branch"
6766
msgstr ""
6767
6768
#: bzrlib/plugins/launchpad/__init__.py:440
6769
msgid "Finding proposals"
6770
msgstr ""
6771
6772
#: bzrlib/plugins/launchpad/account.py:66
6773
msgid "Setting ssh/sftp usernames for launchpad.net."
6774
msgstr ""
6775
6776
#: bzrlib/plugins/launchpad/lp_api.py:241
6777
#: bzrlib/plugins/launchpad/lp_api.py:246
6778
#, python-format
6779
msgid "%s is not registered on Launchpad"
6780
msgstr ""
6781
6782
#: bzrlib/plugins/launchpad/lp_api.py:256
6783
#, python-format
6784
msgid "%s has no development focus."
6785
msgstr ""
6786
6787
#: bzrlib/plugins/launchpad/lp_api.py:261
6788
#, python-format
6789
msgid "development focus %s has no branch."
6790
msgstr ""
6791
6792
#: bzrlib/plugins/launchpad/lp_api.py:266
6793
#, python-format
6794
msgid "source package %s has no branch."
6795
msgstr ""
6796
6797
#: bzrlib/plugins/launchpad/lp_api.py:270
6798
#, python-format
6799
msgid "%s has no associated product or source package."
6800
msgstr ""
6801
6802
#: bzrlib/plugins/launchpad/lp_api.py:282
6803
#, python-format
6804
msgid "%s is already up-to-date."
6805
msgstr ""
6806
6807
#: bzrlib/plugins/launchpad/lp_api.py:289
6808
#, python-format
6809
msgid "Pushing to %s"
6810
msgstr ""
6811
6812
#: bzrlib/plugins/launchpad/lp_directory.py:170
6813
msgid ""
6814
"resolution for {0}\n"
6815
" local: {1}\n"
6816
" remote: {2}"
6817
msgstr ""
6818
6819
#: bzrlib/plugins/launchpad/lp_propose.py:149
6820
#, python-format
6821
msgid "There is already a branch merge proposal: %s"
6822
msgstr ""
6823
6824
#: bzrlib/plugins/weave_fmt/bzrdir.py:236
6825
msgid "pb parameter to convert() is deprecated"
6826
msgstr ""
6827
6828
#: bzrlib/plugins/weave_fmt/bzrdir.py:239
6829
msgid "starting upgrade from format 4 to 5"
6830
msgstr ""
6831
6832
#: bzrlib/plugins/weave_fmt/bzrdir.py:249
6833
msgid "note: upgrade may be faster if all store files are ungzipped first"
6834
msgstr ""
6835
6836
#: bzrlib/plugins/weave_fmt/bzrdir.py:278
6837
msgid "converting revision"
6838
msgstr ""
6839
6840
#: bzrlib/plugins/weave_fmt/bzrdir.py:283
6841
msgid "upgraded to weaves:"
6842
msgstr ""
6843
6844
#: bzrlib/plugins/weave_fmt/bzrdir.py:284
6845
#, python-format
6846
msgid "%6d revisions and inventories"
6847
msgstr ""
6848
6849
#: bzrlib/plugins/weave_fmt/bzrdir.py:286
6850
#, python-format
6851
msgid "%6d revisions not present"
6852
msgstr ""
6853
6854
#: bzrlib/plugins/weave_fmt/bzrdir.py:288
6855
#, python-format
6856
msgid "%6d texts"
6857
msgstr ""
6858
6859
#: bzrlib/plugins/weave_fmt/bzrdir.py:324
6860
msgid "writing weave"
6861
msgstr ""
6862
6863
#: bzrlib/plugins/weave_fmt/bzrdir.py:328
6864
#: bzrlib/plugins/weave_fmt/bzrdir.py:330
6865
msgid "inventory"
6866
msgstr ""
6867
6868
#: bzrlib/plugins/weave_fmt/bzrdir.py:347
6869
msgid "write revision"
6870
msgstr ""
6871
6872
#: bzrlib/plugins/weave_fmt/bzrdir.py:361
6873
msgid "loading revision"
6874
msgstr ""
6875
6876
#: bzrlib/plugins/weave_fmt/bzrdir.py:366
6877
#, python-format
6878
msgid "revision {%s} not present in branch; will be converted as a ghost"
6879
msgstr ""
6880
6881
#: bzrlib/plugins/weave_fmt/bzrdir.py:506
6882
msgid "starting upgrade from format 5 to 6"
6883
msgstr ""
6884
6885
#: bzrlib/plugins/weave_fmt/bzrdir.py:516
6886
#, python-format
6887
msgid "adding prefixes to %s"
6888
msgstr ""
6889
6890
#: bzrlib/plugins/weave_fmt/bzrdir.py:556
6891
msgid "starting upgrade from format 6 to metadir"
6892
msgstr ""
6893
6894
#: bzrlib/plugins/weave_fmt/bzrdir.py:564
6895
msgid "Removing ancestry.weave"
6896
msgstr ""
6897
6898
#: bzrlib/plugins/weave_fmt/bzrdir.py:569
6899
msgid "Finding branch files"
6900
msgstr ""
6901
6902
#: bzrlib/plugins/weave_fmt/bzrdir.py:579
6903
msgid "Upgrading repository"
6904
msgstr ""
6905
6906
#: bzrlib/plugins/weave_fmt/bzrdir.py:589
6907
msgid "Upgrading branch"
6908
msgstr ""
6909
6910
#: bzrlib/plugins/weave_fmt/bzrdir.py:612
6911
msgid "No working tree."
6912
msgstr ""
6913
6914
#: bzrlib/plugins/weave_fmt/bzrdir.py:619
6915
msgid "Upgrading working tree"
6916
msgstr ""
6917
6918
#: bzrlib/plugins/weave_fmt/bzrdir.py:640
6919
#, python-format
6920
msgid "Make %s lock"
6921
msgstr ""
6922
6923
#: bzrlib/plugins/weave_fmt/bzrdir.py:651
6924
#, python-format
6925
msgid "Moving %s"
6926
msgstr ""
6927
6928
#: bzrlib/push.py:56
6929
msgid "Created new branch."
6930
msgstr ""
6931
6932
#: bzrlib/push.py:97
6933
#, python-format
6934
msgid ""
6935
"Target directory %s already contains a .bzr directory, but it is not valid."
6936
msgstr ""
6937
6938
#: bzrlib/push.py:101
6939
#, python-format
6940
msgid ""
6941
"Target directory %s already exists, but does not have a .bzr directory. "
6942
"Supply --use-existing-dir to push there anyway."
6943
msgstr ""
6944
6945
#: bzrlib/push.py:122
6946
#, python-format
6947
msgid "Too many redirections trying to make %s."
6948
msgstr ""
6949
6950
#: bzrlib/push.py:147
6951
msgid ""
6952
"These branches have diverged. See \"bzr help diverged-branches\" for more "
6953
"information."
6954
msgstr ""
6955
6956
#: bzrlib/push.py:151
6957
#, python-format
6958
msgid ""
6959
"It is not possible to losslessly push to %s. You may want to use dpush "
6960
"instead."
6961
msgstr ""
6962
6963
#: bzrlib/push.py:157
6964
#, python-format
6965
msgid ""
6966
"At %s you have a valid .bzr control directory, but not a branch or "
6967
"repository. This is an unsupported configuration. Please move the target "
6968
"directory out of the way and try again."
6969
msgstr ""
6970
6971
#: bzrlib/reconcile.py:97
6972
#, python-format
6973
msgid "Reconciling branch %s"
6974
msgstr ""
6975
6976
#: bzrlib/reconcile.py:103
6977
#, python-format
6978
msgid "Reconciling repository %s"
6979
msgstr ""
6980
6981
#: bzrlib/reconcile.py:105
6982
msgid "Reconciling repository"
6983
msgstr ""
6984
6985
#: bzrlib/reconcile.py:111
6986
#, python-format
6987
msgid "%s cannot canonicalize CHKs."
6988
msgstr ""
6989
6990
#: bzrlib/reconcile.py:119
6991
msgid "Reconcile aborted: revision index has inconsistent parents."
6992
msgstr ""
6993
6994
#: bzrlib/reconcile.py:121
6995
msgid "Run \"bzr check\" for more details."
6996
msgstr ""
6997
6998
#: bzrlib/reconcile.py:123
6999
msgid "Reconciliation complete."
7000
msgstr ""
7001
7002
#: bzrlib/reconcile.py:166
7003
msgid "Fixing last revision info {0} => {1}"
7004
msgstr ""
7005
7006
#: bzrlib/reconcile.py:173
7007
msgid "revision_history ok."
7008
msgstr ""
7009
7010
#: bzrlib/reconcile.py:234
7011
msgid "Reading inventory data"
7012
msgstr ""
7013
7014
#: bzrlib/reconcile.py:254 bzrlib/reconcile.py:384
7015
msgid "Inventory ok."
7016
msgstr ""
7017
7018
#: bzrlib/reconcile.py:256 bzrlib/reconcile.py:386
7019
msgid "Backing up inventory"
7020
msgstr ""
7021
7022
#: bzrlib/reconcile.py:258
7023
msgid "Backup inventory created."
7024
msgstr ""
7025
7026
#: bzrlib/reconcile.py:274 bzrlib/reconcile.py:405
7027
msgid "Writing weave"
7028
msgstr ""
7029
7030
#: bzrlib/reconcile.py:277 bzrlib/reconcile.py:408
7031
msgid "Inventory regenerated."
7032
msgstr ""
7033
7034
#: bzrlib/reconcile.py:371 bzrlib/reconcile.py:373 bzrlib/reconcile.py:376
7035
msgid "Reading indexes"
7036
msgstr ""
7037
7038
#: bzrlib/reconcile.py:380 bzrlib/reconcile.py:382
7039
msgid "Checking unused inventories"
7040
msgstr ""
7041
7042
#: bzrlib/reconcile.py:388
7043
msgid "Backup Inventory created"
7044
msgstr ""
7045
7046
#: bzrlib/reconcile.py:446
7047
msgid "Fixing text parents"
7048
msgstr ""
7049
7050
#: bzrlib/reconfigure.py:54
7051
msgid "{0} is now stacked on {1}\n"
7052
msgstr ""
7053
7054
#: bzrlib/reconfigure.py:69
7055
#, python-format
7056
msgid "%s is now not stacked\n"
7057
msgstr ""
7058
7059
#: bzrlib/remote.py:1228 bzrlib/repository.py:289
7060
#, python-format
7061
msgid "bzr: ERROR (ignored): %s"
7062
msgstr ""
7063
7064
#: bzrlib/remote.py:2541
7065
msgid "Copying repository content as tarball..."
7066
msgstr ""
7067
7068
#: bzrlib/rename_map.py:69
7069
msgid "Calculating hashes"
7070
msgstr ""
7071
7072
#: bzrlib/rename_map.py:107
7073
msgid "Determining hash hits"
7074
msgstr ""
7075
7076
#: bzrlib/rename_map.py:242
7077
msgid "{0} => {1}"
7078
msgstr ""
7079
7080
#: bzrlib/repository.py:1787
7081
msgid "Moving repository to repository.backup"
7082
msgstr ""
7083
7084
#: bzrlib/repository.py:1794
7085
msgid "Creating new repository"
7086
msgstr ""
7087
7088
#: bzrlib/repository.py:1799
7089
msgid "Copying content"
7090
msgstr ""
7091
7092
#: bzrlib/repository.py:1803
7093
msgid "Deleting old repository content"
7094
msgstr ""
7095
7096
#: bzrlib/repository.py:1805
7097
msgid "repository converted"
7098
msgstr ""
7099
7100
#: bzrlib/revisionspec.py:903
7101
msgid "Using {0} {1}"
7102
msgstr ""
7103
7104
#: bzrlib/send.py:58
7105
#, python-format
7106
msgid "Mail client \"%s\" does not support specifying body"
7107
msgstr ""
7108
7109
#: bzrlib/send.py:62
7110
msgid "--remember requires a branch to be specified."
7111
msgstr ""
7112
7113
#: bzrlib/send.py:77
7114
msgid "No submit branch known or specified"
7115
msgstr ""
7116
7117
#: bzrlib/send.py:80
7118
msgid "Using saved {0} location \"{1}\" to determine what changes to submit."
7119
msgstr ""
7120
7121
#: bzrlib/send.py:98
7122
#, python-format
7123
msgid "No such send format '%s'."
7124
msgstr ""
7125
7126
#: bzrlib/send.py:114
7127
msgid "bzr send takes at most two one revision identifiers"
7128
msgstr ""
7129
7130
#: bzrlib/send.py:127
7131
msgid "No revisions to submit."
7132
msgstr ""
7133
7134
#: bzrlib/send.py:139
7135
msgid ""
7136
"- not supported for merge directives that use more than one output file."
7137
msgstr ""
7138
7139
#: bzrlib/send.py:185
7140
msgid "Format 0.9 does not permit bundle with no patch"
7141
msgstr ""
7142
7143
#: bzrlib/shelf_ui.py:46
7144
#, python-format
7145
msgid "Shelve adding file \"%(path)s\"?"
7146
msgstr ""
7147
7148
#: bzrlib/shelf_ui.py:47
7149
msgid "Shelve binary changes?"
7150
msgstr ""
7151
7152
#: bzrlib/shelf_ui.py:48
7153
msgid "Shelve changing \"%s\" from %(other)s to %(this)s?"
7154
msgstr ""
7155
7156
#: bzrlib/shelf_ui.py:50
7157
#, python-format
7158
msgid "Shelve removing file \"%(path)s\"?"
7159
msgstr ""
7160
7161
#: bzrlib/shelf_ui.py:51
7162
#, python-format
7163
msgid "Shelve %d change(s)?"
7164
msgstr ""
7165
7166
#: bzrlib/shelf_ui.py:52
7167
msgid "Shelve?"
7168
msgstr ""
7169
7170
#: bzrlib/shelf_ui.py:53
7171
#, python-format
7172
msgid ""
7173
"Shelve changing target of \"%(path)s\" from \"%(other)s\" to \"%(this)s\"?"
7174
msgstr ""
7175
7176
#: bzrlib/shelf_ui.py:55
7177
#, python-format
7178
msgid "Shelve renaming \"%(other)s\" => \"%(this)s\"?"
7179
msgstr ""
7180
7181
#: bzrlib/shelf_ui.py:70
7182
#, python-format
7183
msgid "Changes shelved with id \"%d\"."
7184
msgstr ""
7185
7186
#: bzrlib/shelf_ui.py:74
7187
msgid "Selected changes destroyed."
7188
msgstr ""
7189
7190
#: bzrlib/shelf_ui.py:78
7191
msgid "Selected changes:"
7192
msgstr ""
7193
7194
#: bzrlib/shelf_ui.py:98
7195
#, python-format
7196
msgid "Delete file \"%(path)s\"?"
7197
msgstr ""
7198
7199
#: bzrlib/shelf_ui.py:99
7200
msgid "Apply binary changes?"
7201
msgstr ""
7202
7203
#: bzrlib/shelf_ui.py:100
7204
#, python-format
7205
msgid "Change \"%(path)s\" from %(this)s to %(other)s?"
7206
msgstr ""
7207
7208
#: bzrlib/shelf_ui.py:102
7209
#, python-format
7210
msgid "Add file \"%(path)s\"?"
7211
msgstr ""
7212
7213
#: bzrlib/shelf_ui.py:103
7214
#, python-format
7215
msgid "Apply %d change(s)?"
7216
msgstr ""
7217
7218
#: bzrlib/shelf_ui.py:104
7219
msgid "Apply change?"
7220
msgstr ""
7221
7222
#: bzrlib/shelf_ui.py:105
7223
#, python-format
7224
msgid "Change target of \"%(path)s\" from \"%(this)s\" to \"%(other)s\"?"
7225
msgstr ""
7226
7227
#: bzrlib/shelf_ui.py:107
7228
#, python-format
7229
msgid "Rename \"%(this)s\" => \"%(other)s\"?"
7230
msgstr ""
7231
7232
#: bzrlib/shelf_ui.py:402
7233
msgid "No changes are shelved."
7234
msgstr ""
7235
7236
#: bzrlib/shelf_ui.py:460
7237
#, python-format
7238
msgid "Using changes with id \"%d\"."
7239
msgstr ""
7240
7241
#: bzrlib/shelf_ui.py:464
7242
#, python-format
7243
msgid "Message: %s"
7244
msgstr ""
7245
7246
#: bzrlib/shelf_ui.py:476
7247
#, python-format
7248
msgid "Deleted changes with id \"%d\"."
7249
msgstr ""
7250
7251
#: bzrlib/smart/medium.py:714
7252
msgid "HPSS calls: {0} ({1} vfs) {2}"
7253
msgstr ""
7254
7255
#: bzrlib/smart/server.py:169
7256
msgid "Requested to stop gracefully"
7257
msgstr ""
7258
7259
#: bzrlib/smart/server.py:179
7260
#, python-format
7261
msgid "Waiting for %d client(s) to finish"
7262
msgstr ""
7263
7264
#: bzrlib/smart/server.py:185
7265
#, python-format
7266
msgid "Still waiting for %d client(s) to finish"
7267
msgstr ""
7268
7269
#: bzrlib/smart/server.py:219
7270
#, python-format
7271
msgid "listening socket error: %s"
7272
msgstr ""
7273
7274
#: bzrlib/smart/server.py:452
7275
#, python-format
7276
msgid "listening on port: %s"
7277
msgstr ""
7278
7279
#: bzrlib/switch.py:73
7280
msgid "Pending merges must be committed or reverted before using switch."
7281
msgstr ""
7282
7283
#: bzrlib/switch.py:100
7284
msgid ""
7285
"Cannot switch as local commits found in the checkout. Commit these to the "
7286
"bound branch or use --force to throw them away."
7287
msgstr ""
7288
7289
#: bzrlib/switch.py:105
7290
#, python-format
7291
msgid ""
7292
"Unable to connect to current master branch %(target)s: %(error)s To switch "
7293
"anyway, use --force."
7294
msgstr ""
7295
7296
#: bzrlib/switch.py:125
7297
msgid "Cannot switch a branch, only a checkout."
7298
msgstr ""
7299
7300
#: bzrlib/switch.py:163
7301
#, python-format
7302
msgid "Tree is up to date at revision %d."
7303
msgstr ""
7304
7305
#: bzrlib/switch.py:169
7306
#, python-format
7307
msgid "Updated to revision %d."
7308
msgstr ""
7309
7310
#: bzrlib/transform.py:1734 bzrlib/transform.py:1745 bzrlib/transform.py:1747
7311
msgid "Apply phase"
7312
msgstr ""
7313
7314
#: bzrlib/transform.py:1773 bzrlib/transform.py:1841
7315
msgid "removing file"
7316
msgstr ""
7317
7318
#: bzrlib/transform.py:1791 bzrlib/transform.py:1876
7319
msgid "adding file"
7320
msgstr ""
7321
7322
#: bzrlib/transform.py:2591
7323
msgid "Building tree"
7324
msgstr ""
7325
7326
#: bzrlib/transform.py:2681 bzrlib/transform.py:2708
7327
msgid "Adding file contents"
7328
msgstr ""
7329
7330
#: bzrlib/transform.py:3028
7331
msgid "Resolution pass"
7332
msgstr ""
7333
7334
#: bzrlib/transport/ftp/_gssapi.py:88
7335
#, python-format
7336
msgid "Authenticated as %s"
7337
msgstr ""
7338
7339
#: bzrlib/tree.py:634
7340
msgid "*** {0} content-filter: {1} => {2!r}"
7341
msgstr ""
7342
7343
#: bzrlib/upgrade.py:77
7344
#, python-format
7345
msgid "This is a checkout. The branch (%s) needs to be upgraded separately."
7346
msgstr ""
7347
7348
#: bzrlib/upgrade.py:100
7349
#, python-format
7350
msgid "cannot upgrade from bzrdir format %s"
7351
msgstr ""
7352
7353
#: bzrlib/upgrade.py:103
7354
#, python-format
7355
msgid "starting upgrade of %s"
7356
msgstr ""
7357
7358
#: bzrlib/upgrade.py:110
7359
msgid "finished"
7360
msgstr ""
7361
7362
#: bzrlib/upgrade.py:120
7363
msgid "Deleting backup.bzr"
7364
msgstr ""
7365
7366
#: bzrlib/upgrade.py:151
7367
msgid ""
7368
"\n"
7369
"SUMMARY: {0} upgrades attempted, {1} succeeded, {2} failed"
7370
msgstr ""
7371
7372
#: bzrlib/upgrade.py:208
7373
#, python-format
7374
msgid "Found %d dependent branches - upgrading ..."
7375
msgstr ""
7376
7377
#: bzrlib/upgrade.py:276
7378
msgid "Upgrading bzrdirs"
7379
msgstr ""
7380
7381
#: bzrlib/upgrade.py:282
7382
#, python-format
7383
msgid "Upgrading %s"
7384
msgstr ""
7385
7386
#: bzrlib/upgrade.py:283
7387
msgid "Upgrading {0} {1} ..."
7388
msgstr ""
7389
7390
#: bzrlib/upgrade.py:301
7391
msgid "Removing backup ..."
7392
msgstr ""
7393
7394
#: bzrlib/upgrade.py:305
7395
msgid "failed to clean-up {0}: {1}"
7396
msgstr ""
7397
7398
#: bzrlib/vf_repository.py:1090
7399
msgid "inventories"
7400
msgstr ""
7401
7402
#: bzrlib/vf_repository.py:1116
7403
msgid "texts"
7404
msgstr ""
7405
7406
#: bzrlib/vf_repository.py:1621 bzrlib/vf_repository.py:1630
7407
msgid "Calculating text parents"
7408
msgstr ""
7409
7410
#: bzrlib/vf_repository.py:1706
7411
msgid "Fetch texts"
7412
msgstr ""
7413
7414
#: bzrlib/vf_repository.py:2535
7415
msgid "loading text store"
7416
msgstr ""
7417
7418
#: bzrlib/vf_repository.py:2541
7419
msgid "checking text graph"
7420
msgstr ""
7421
7422
#: bzrlib/vf_repository.py:2995 bzrlib/vf_repository.py:3009
7423
#: bzrlib/vf_repository.py:3124
7424
msgid "Transferring revisions"
7425
msgstr ""
7426
7427
#: bzrlib/win32utils.py:146
7428
msgid "Failed to GetProcessMemoryInfo()"
7429
msgstr ""
7430
7431
#: bzrlib/win32utils.py:167
7432
msgid "Cannot debug memory on win32 without ctypes or win32process"
7433
msgstr ""
7434
7435
#: bzrlib/win32utils.py:172
7436
msgid "WorkingSize {0:>7}KiB\tPeakWorking {1:>7}KiB\t{2}"
7437
msgstr ""
7438
7439
#: bzrlib/win32utils.py:180
7440
#, python-format
7441
msgid "WorkingSize %8d KiB"
7442
msgstr ""
7443
7444
#: bzrlib/win32utils.py:181
7445
#, python-format
7446
msgid "PeakWorking %8d KiB"
7447
msgstr ""
7448
7449
#: bzrlib/win32utils.py:182
7450
#, python-format
7451
msgid "PagefileUsage %8d KiB"
7452
msgstr ""
7453
7454
#: bzrlib/win32utils.py:183
7455
#, python-format
7456
msgid "PeakPagefileUsage %8d KiB"
7457
msgstr ""
7458
7459
#: bzrlib/win32utils.py:185
7460
#, python-format
7461
msgid "PrivateUsage %8d KiB"
7462
msgstr ""
7463
7464
#: bzrlib/win32utils.py:186
7465
#, python-format
7466
msgid "PageFaultCount %8d"
7467
msgstr ""
7468
7469
#: bzrlib/workingtree.py:1478
7470
msgid "Rerun update after fixing the conflicts."
7471
msgstr ""
7472
7473
#: dummy/help_topics/authentication/summary.txt:1
7474
msgid "Information on configuring authentication"
7475
msgstr ""
7476
7477
#: dummy/help_topics/basic/detail.txt:1
7478
msgid ""
7479
"Bazaar 2.5b6 -- a free distributed version-control tool\n"
7480
"http://bazaar.canonical.com/"
7481
msgstr ""
7482
7483
#: dummy/help_topics/basic/detail.txt:4
7484
msgid ""
7485
"Basic commands:\n"
7486
" bzr init makes this directory a versioned branch\n"
7487
" bzr branch make a copy of another branch"
7488
msgstr ""
7489
7490
#: dummy/help_topics/basic/detail.txt:8
7491
msgid ""
7492
" bzr add make files or directories versioned\n"
7493
" bzr ignore ignore a file or pattern\n"
7494
" bzr mv move or rename a versioned file"
7495
msgstr ""
7496
7497
#: dummy/help_topics/basic/detail.txt:12
7498
msgid ""
7499
" bzr status summarize changes in working copy\n"
7500
" bzr diff show detailed diffs"
7501
msgstr ""
7502
7503
#: dummy/help_topics/basic/detail.txt:15
7504
msgid ""
7505
" bzr merge pull in changes from another branch\n"
7506
" bzr commit save some or all changes\n"
7507
" bzr send send changes via email"
7508
msgstr ""
7509
7510
#: dummy/help_topics/basic/detail.txt:19
7511
msgid ""
7512
" bzr log show history of changes\n"
7513
" bzr check validate storage"
7514
msgstr ""
7515
7516
#: dummy/help_topics/basic/detail.txt:22
7517
msgid ""
7518
" bzr help init more help on e.g. init command\n"
7519
" bzr help commands list all commands\n"
7520
" bzr help topics list all help topics\n"
7521
msgstr ""
7522
7523
#: dummy/help_topics/basic/summary.txt:1
7524
msgid "Basic commands"
7525
msgstr ""
7526
7527
#: dummy/help_topics/branches/detail.txt:1
7528
msgid "Branches"
7529
msgstr ""
7530
7531
#: dummy/help_topics/branches/detail.txt:3
7532
msgid ""
7533
"A branch consists of the state of a project, including all of its\n"
7534
"history. All branches have a repository associated (which is where the\n"
7535
"branch history is stored), but multiple branches may share the same\n"
7536
"repository (a shared repository). Branches can be copied and merged."
7537
msgstr ""
7538
7539
#: dummy/help_topics/branches/detail.txt:8
7540
msgid ""
7541
"In addition, one branch may be bound to another one. Binding to another\n"
7542
"branch indicates that commits which happen in this branch must also \n"
7543
"happen in the other branch. Bazaar ensures consistency by not allowing \n"
7544
"commits when the two branches are out of date. In order for a commit \n"
7545
"to succeed, it may be necessary to update the current branch using \n"
7546
"``bzr update``."
7547
msgstr ""
7548
7549
#: dummy/help_topics/branches/detail.txt:15
7550
#: dummy/help_topics/checkouts/detail.txt:66
7551
#: dummy/help_topics/repositories/detail.txt:36
7552
msgid "Related commands::"
7553
msgstr ""
7554
7555
#: dummy/help_topics/branches/detail.txt:17
7556
msgid ""
7557
" init Change a directory into a versioned branch.\n"
7558
" branch Create a new branch that is a copy of an existing branch.\n"
7559
" merge Perform a three-way merge.\n"
7560
" bind Bind a branch to another one.\n"
7561
msgstr ""
7562
7563
#: dummy/help_topics/branches/summary.txt:1
7564
msgid "Information on what a branch is"
7565
msgstr ""
7566
7567
#: dummy/help_topics/bugs/summary.txt:1
7568
msgid "Bug tracker settings"
7569
msgstr ""
7570
7571
#: dummy/help_topics/checkouts/detail.txt:1
7572
msgid "Checkouts"
7573
msgstr ""
7574
7575
#: dummy/help_topics/checkouts/detail.txt:3
7576
msgid ""
7577
"Checkouts are source trees that are connected to a branch, so that when\n"
7578
"you commit in the source tree, the commit goes into that branch. They\n"
7579
"allow you to use a simpler, more centralized workflow, ignoring some of\n"
7580
"Bazaar's decentralized features until you want them. Using checkouts\n"
7581
"with shared repositories is very similar to working with SVN or CVS, but\n"
7582
"doesn't have the same restrictions. And using checkouts still allows\n"
7583
"others working on the project to use whatever workflow they like."
7584
msgstr ""
7585
7586
#: dummy/help_topics/checkouts/detail.txt:11
7587
msgid ""
7588
"A checkout is created with the bzr checkout command (see \"help "
7589
"checkout\").\n"
7590
"You pass it a reference to another branch, and it will create a local copy\n"
7591
"for you that still contains a reference to the branch you created the\n"
7592
"checkout from (the master branch). Then if you make any commits they will "
7593
"be\n"
7594
"made on the other branch first. This creates an instant mirror of your work, "
7595
"or\n"
7596
"facilitates lockstep development, where each developer is working together,\n"
7597
"continuously integrating the changes of others."
7598
msgstr ""
7599
7600
#: dummy/help_topics/checkouts/detail.txt:19
7601
msgid ""
7602
"However the checkout is still a first class branch in Bazaar terms, so that\n"
7603
"you have the full history locally. As you have a first class branch you "
7604
"can\n"
7605
"also commit locally if you want, for instance due to the temporary loss af "
7606
"a\n"
7607
"network connection. Use the --local option to commit to do this. All the "
7608
"local\n"
7609
"commits will then be made on the master branch the next time you do a non-"
7610
"local\n"
7611
"commit."
7612
msgstr ""
7613
7614
#: dummy/help_topics/checkouts/detail.txt:26
7615
msgid ""
7616
"If you are using a checkout from a shared branch you will periodically want "
7617
"to\n"
7618
"pull in all the changes made by others. This is done using the \"update\"\n"
7619
"command. The changes need to be applied before any non-local commit, but\n"
7620
"Bazaar will tell you if there are any changes and suggest that you use this\n"
7621
"command when needed."
7622
msgstr ""
7623
7624
#: dummy/help_topics/checkouts/detail.txt:32
7625
msgid ""
7626
"It is also possible to create a \"lightweight\" checkout by passing the\n"
7627
"--lightweight flag to checkout. A lightweight checkout is even closer to an\n"
7628
"SVN checkout in that it is not a first class branch, it mainly consists of "
7629
"the\n"
7630
"working tree. This means that any history operations must query the master\n"
7631
"branch, which could be slow if a network connection is involved. Also, as "
7632
"you\n"
7633
"don't have a local branch, then you cannot commit locally."
7634
msgstr ""
7635
7636
#: dummy/help_topics/checkouts/detail.txt:39
7637
msgid ""
7638
"Lightweight checkouts work best when you have fast reliable access to the\n"
7639
"master branch. This means that if the master branch is on the same disk or "
7640
"LAN\n"
7641
"a lightweight checkout will be faster than a heavyweight one for any "
7642
"commands\n"
7643
"that modify the revision history (as only one copy of the branch needs to\n"
7644
"be updated). Heavyweight checkouts will generally be faster for any command\n"
7645
"that uses the history but does not change it, but if the master branch is "
7646
"on\n"
7647
"the same disk then there won't be a noticeable difference."
7648
msgstr ""
7649
7650
#: dummy/help_topics/checkouts/detail.txt:47
7651
msgid ""
7652
"Another possible use for a checkout is to use it with a treeless repository\n"
7653
"containing your branches, where you maintain only one working tree by\n"
7654
"switching the master branch that the checkout points to when you want to\n"
7655
"work on a different branch."
7656
msgstr ""
7657
7658
#: dummy/help_topics/checkouts/detail.txt:52
7659
msgid ""
7660
"Obviously to commit on a checkout you need to be able to write to the "
7661
"master\n"
7662
"branch. This means that the master branch must be accessible over a "
7663
"writeable\n"
7664
"protocol , such as sftp://, and that you have write permissions at the "
7665
"other\n"
7666
"end. Checkouts also work on the local file system, so that all that matters "
7667
"is\n"
7668
"file permissions."
7669
msgstr ""
7670
7671
#: dummy/help_topics/checkouts/detail.txt:58
7672
msgid ""
7673
"You can change the master of a checkout by using the \"switch\" command "
7674
"(see\n"
7675
"\"help switch\"). This will change the location that the commits are sent "
7676
"to.\n"
7677
"The \"bind\" command can also be used to turn a normal branch into a heavy\n"
7678
"checkout. If you would like to convert your heavy checkout into a normal\n"
7679
"branch so that every commit is local, you can use the \"unbind\" command. To "
7680
"see\n"
7681
"whether or not a branch is bound or not you can use the \"info\" command. If "
7682
"the\n"
7683
"branch is bound it will tell you the location of the bound branch."
7684
msgstr ""
7685
7686
#: dummy/help_topics/checkouts/detail.txt:68
7687
msgid ""
7688
" checkout Create a checkout. Pass --lightweight to get a lightweight\n"
7689
" checkout\n"
7690
" update Pull any changes in the master branch in to your checkout\n"
7691
" commit Make a commit that is sent to the master branch. If you have\n"
7692
" a heavy checkout then the --local option will commit to the\n"
7693
" checkout without sending the commit to the master\n"
7694
" switch Change the master branch that the commits in the checkout "
7695
"will\n"
7696
" be sent to\n"
7697
" bind Turn a standalone branch into a heavy checkout so that any\n"
7698
" commits will be sent to the master branch\n"
7699
" unbind Turn a heavy checkout into a standalone branch so that any\n"
7700
" commits are only made locally\n"
7701
" info Displays whether a branch is bound or unbound. If the branch "
7702
"is\n"
7703
" bound, then it will also display the location of the bound "
7704
"branch\n"
7705
msgstr ""
7706
7707
#: dummy/help_topics/checkouts/summary.txt:1
7708
msgid "Information on what a checkout is"
7709
msgstr ""
7710
7711
#: dummy/help_topics/commands/summary.txt:1
7712
msgid "Basic help for all commands"
7713
msgstr ""
7714
7715
#: dummy/help_topics/configuration/summary.txt:1
7716
msgid "Details on the configuration settings available"
7717
msgstr ""
7718
7719
#: dummy/help_topics/conflict-types/summary.txt:1
7720
msgid "Types of conflicts and what to do about them"
7721
msgstr ""
7722
7723
#: dummy/help_topics/content-filters/summary.txt:1
7724
msgid "Conversion of content into/from working trees"
7725
msgstr ""
7726
7727
#: dummy/help_topics/criss-cross/detail.txt:1
7728
msgid "Criss-Cross"
7729
msgstr ""
7730
7731
#: dummy/help_topics/criss-cross/detail.txt:3
7732
msgid ""
7733
"A criss-cross in the branch history can cause the default merge technique\n"
7734
"to emit more conflicts than would normally be expected."
7735
msgstr ""
7736
7737
#: dummy/help_topics/criss-cross/detail.txt:6
7738
msgid ""
7739
"In complex merge cases, ``bzr merge --lca`` or ``bzr merge --weave`` may "
7740
"give\n"
7741
"better results. You may wish to ``bzr revert`` the working tree and merge\n"
7742
"again. Alternatively, use ``bzr remerge`` on particular conflicted files."
7743
msgstr ""
7744
7745
#: dummy/help_topics/criss-cross/detail.txt:10
7746
msgid ""
7747
"Criss-crosses occur in a branch's history if two branches merge the same "
7748
"thing\n"
7749
"and then merge one another, or if two branches merge one another at the "
7750
"same\n"
7751
"time. They can be avoided by having each branch only merge from or into a\n"
7752
"designated central branch (a \"star topology\")."
7753
msgstr ""
7754
7755
#: dummy/help_topics/criss-cross/detail.txt:15
7756
msgid ""
7757
"Criss-crosses cause problems because of the way merge works. Bazaar's "
7758
"default\n"
7759
"merge is a three-way merger; in order to merge OTHER into THIS, it must\n"
7760
"find a basis for comparison, BASE. Using BASE, it can determine whether\n"
7761
"differences between THIS and OTHER are due to one side adding lines, or\n"
7762
"from another side removing lines."
7763
msgstr ""
7764
7765
#: dummy/help_topics/criss-cross/detail.txt:21
7766
msgid ""
7767
"Criss-crosses mean there is no good choice for a base. Selecting the "
7768
"recent\n"
7769
"merge points could cause one side's changes to be silently discarded.\n"
7770
"Selecting older merge points (which Bazaar does) mean that extra conflicts\n"
7771
"are emitted."
7772
msgstr ""
7773
7774
#: dummy/help_topics/criss-cross/detail.txt:26
7775
msgid ""
7776
"The ``weave`` merge type is not affected by this problem because it uses\n"
7777
"line-origin detection instead of a basis revision to determine the cause of\n"
7778
"differences.\n"
7779
msgstr ""
7780
7781
#: dummy/help_topics/criss-cross/summary.txt:1
7782
msgid "Information on criss-cross merging"
7783
msgstr ""
7784
7785
#: dummy/help_topics/current-formats/summary.txt:1
7786
msgid "Current storage formats"
7787
msgstr ""
7788
7789
#: dummy/help_topics/debug-flags/summary.txt:1
7790
msgid "Options to show or record debug information"
7791
msgstr ""
7792
7793
#: dummy/help_topics/diverged-branches/summary.txt:1
7794
msgid "How to fix diverged branches"
7795
msgstr ""
7796
7797
#: dummy/help_topics/env-variables/detail.txt:1
7798
msgid "Environment Variables"
7799
msgstr ""
7800
7801
#: dummy/help_topics/env-variables/detail.txt:3
7802
msgid ""
7803
"=================== "
7804
"===========================================================\n"
7805
"BZRPATH Path where bzr is to look for shell plugin external\n"
7806
" commands.\n"
7807
"BZR_EMAIL E-Mail address of the user. Overrides EMAIL.\n"
7808
"EMAIL E-Mail address of the user.\n"
7809
"BZR_EDITOR Editor for editing commit messages. Overrides EDITOR.\n"
7810
"EDITOR Editor for editing commit messages.\n"
7811
"BZR_PLUGIN_PATH Paths where bzr should look for plugins.\n"
7812
"BZR_DISABLE_PLUGINS Plugins that bzr should not load.\n"
7813
"BZR_PLUGINS_AT Plugins to load from a directory not in "
7814
"BZR_PLUGIN_PATH.\n"
7815
"BZR_HOME Directory holding .bazaar config dir. Overrides HOME.\n"
7816
"BZR_HOME (Win32) Directory holding bazaar config dir. Overrides APPDATA "
7817
"and\n"
7818
" HOME.\n"
7819
"BZR_REMOTE_PATH Full name of remote 'bzr' command (for bzr+ssh:// "
7820
"URLs).\n"
7821
"BZR_SSH Path to SSH client, or one of paramiko, openssh, "
7822
"sshcorp,\n"
7823
" plink or lsh.\n"
7824
"BZR_LOG Location of .bzr.log (use '/dev/null' to suppress log).\n"
7825
"BZR_LOG (Win32) Location of .bzr.log (use 'NUL' to suppress log).\n"
7826
"BZR_COLUMNS Override implicit terminal width.\n"
7827
"BZR_CONCURRENCY Number of processes that can be run concurrently "
7828
"(selftest)\n"
7829
"BZR_PROGRESS_BAR Override the progress display. Values are 'none' or "
7830
"'text'.\n"
7831
"BZR_PDB Control whether to launch a debugger on error.\n"
7832
"BZR_SIGQUIT_PDB Control whether SIGQUIT behaves normally or invokes a\n"
7833
" breakin debugger.\n"
7834
"BZR_TEXTUI_INPUT Force console input mode for prompts to line-based "
7835
"(instead\n"
7836
" of char-based).\n"
7837
"=================== "
7838
"===========================================================\n"
7839
msgstr ""
7840
7841
#: dummy/help_topics/env-variables/summary.txt:1
7842
msgid "Environment variable names and values"
7843
msgstr ""
7844
7845
#: dummy/help_topics/eol/summary.txt:1
7846
msgid "Information on end-of-line handling"
7847
msgstr ""
7848
7849
#: dummy/help_topics/files/detail.txt:1
7850
msgid "Files"
7851
msgstr ""
7852
7853
#: dummy/help_topics/files/detail.txt:3
7854
msgid ""
7855
":On Unix: ~/.bazaar/bazaar.conf\n"
7856
":On Windows: C:\\\\Documents and Settings\\\\username\\\\Application Data\\\\"
7857
"bazaar\\\\2.0\\\\bazaar.conf"
7858
msgstr ""
7859
7860
#: dummy/help_topics/files/detail.txt:6
7861
msgid ""
7862
"Contains the user's default configuration. The section ``[DEFAULT]`` is\n"
7863
"used to define general configuration that will be applied everywhere.\n"
7864
"The section ``[ALIASES]`` can be used to create command aliases for\n"
7865
"commonly used options."
7866
msgstr ""
7867
7868
#: dummy/help_topics/files/detail.txt:11
7869
msgid "A typical config file might look something like::"
7870
msgstr ""
7871
7872
#: dummy/help_topics/files/detail.txt:13
7873
msgid ""
7874
" [DEFAULT]\n"
7875
" email=John Doe <jdoe@isp.com>"
7876
msgstr ""
7877
7878
#: dummy/help_topics/files/detail.txt:16
7879
msgid ""
7880
" [ALIASES]\n"
7881
" commit = commit --strict\n"
7882
" log10 = log --short -r -10..-1\n"
7883
msgstr ""
7884
7885
#: dummy/help_topics/files/summary.txt:1
7886
msgid "Information on configuration and log files"
7887
msgstr ""
7888
7889
#: dummy/help_topics/formats/detail.txt:1
7890
msgid "Storage Formats"
7891
msgstr ""
7892
7893
#: dummy/help_topics/formats/detail.txt:3
7894
msgid ""
7895
"To ensure that older clients do not access data incorrectly,\n"
7896
"Bazaar's policy is to introduce a new storage format whenever\n"
7897
"new features requiring new metadata are added. New storage\n"
7898
"formats may also be introduced to improve performance and\n"
7899
"scalability."
7900
msgstr ""
7901
7902
#: dummy/help_topics/formats/detail.txt:9
7903
msgid ""
7904
"The newest format, 2a, is highly recommended. If your\n"
7905
"project is not using 2a, then you should suggest to the\n"
7906
"project owner to upgrade."
7907
msgstr ""
7908
7909
#: dummy/help_topics/formats/detail.txt:13
7910
msgid ""
7911
"\n"
7912
".. note::"
7913
msgstr ""
7914
7915
#: dummy/help_topics/formats/detail.txt:16
7916
msgid ""
7917
" Some of the older formats have two variants:\n"
7918
" a plain one and a rich-root one. The latter include an additional\n"
7919
" field about the root of the tree. There is no performance cost\n"
7920
" for using a rich-root format but you cannot easily merge changes\n"
7921
" from a rich-root format into a plain format. As a consequence,\n"
7922
" moving a project to a rich-root format takes some co-ordination\n"
7923
" in that all contributors need to upgrade their repositories\n"
7924
" around the same time. 2a and all future formats will be\n"
7925
" implicitly rich-root."
7926
msgstr ""
7927
7928
#: dummy/help_topics/formats/detail.txt:26
7929
msgid ""
7930
"See :doc:`current-formats-help` for the complete list of\n"
7931
"currently supported formats. See :doc:`other-formats-help` for\n"
7932
"descriptions of any available experimental and deprecated formats.\n"
7933
msgstr ""
7934
7935
#: dummy/help_topics/formats/summary.txt:1
7936
msgid "Information on choosing a storage format"
7937
msgstr ""
7938
7939
#: dummy/help_topics/global-options/detail.txt:1
7940
msgid "Global Options"
7941
msgstr ""
7942
7943
#: dummy/help_topics/global-options/detail.txt:3
7944
msgid ""
7945
"These options may be used with any command, and may appear in front of any\n"
7946
"command. (e.g. ``bzr --profile help``)."
7947
msgstr ""
7948
7949
#: dummy/help_topics/global-options/detail.txt:6
7950
msgid ""
7951
"--version Print the version number. Must be supplied before the "
7952
"command.\n"
7953
"--no-aliases Do not process command aliases when running this command.\n"
7954
"--builtin Use the built-in version of a command, not the plugin "
7955
"version.\n"
7956
" This does not suppress other plugin effects.\n"
7957
"--no-plugins Do not process any plugins.\n"
7958
"--no-l10n Do not translate messages.\n"
7959
"--concurrency Number of processes that can be run concurrently (selftest)."
7960
msgstr ""
7961
7962
#: dummy/help_topics/global-options/detail.txt:14
7963
msgid ""
7964
"--profile Profile execution using the hotshot profiler.\n"
7965
"--lsprof Profile execution using the lsprof profiler.\n"
7966
"--lsprof-file Profile execution using the lsprof profiler, and write the\n"
7967
" results to a specified file. If the filename ends with "
7968
"\".txt\",\n"
7969
" text format will be used. If the filename either starts "
7970
"with\n"
7971
" \"callgrind.out\" or end with \".callgrind\", the output will "
7972
"be\n"
7973
" formatted for use with KCacheGrind. Otherwise, the output\n"
7974
" will be a pickle.\n"
7975
"--coverage Generate line coverage report in the specified directory."
7976
msgstr ""
7977
7978
#: dummy/help_topics/global-options/detail.txt:24
7979
msgid ""
7980
"-Oname=value Override the ``name`` config option setting it to ``value`` "
7981
"for\n"
7982
" the duration of the command. This can be used multiple times "
7983
"if\n"
7984
" several options need to be overridden."
7985
msgstr ""
7986
7987
#: dummy/help_topics/global-options/detail.txt:28
7988
msgid ""
7989
"See http://doc.bazaar.canonical.com/developers/profiling.html for more\n"
7990
"information on profiling."
7991
msgstr ""
7992
7993
#: dummy/help_topics/global-options/detail.txt:31
7994
msgid ""
7995
"A number of debug flags are also available to assist troubleshooting and\n"
7996
"development. See :doc:`debug-flags-help`.\n"
7997
msgstr ""
7998
7999
#: dummy/help_topics/global-options/summary.txt:1
8000
msgid "Options that control how Bazaar runs"
8001
msgstr ""
8002
8003
#: dummy/help_topics/hidden-commands/summary.txt:1
8004
msgid "All hidden commands"
8005
msgstr ""
8006
8007
#: dummy/help_topics/hooks/summary.txt:1
8008
msgid "Points at which custom processing can be added"
8009
msgstr ""
8010
8011
#: dummy/help_topics/launchpad/detail.txt:1
8012
msgid "Integration with Launchpad.net"
8013
msgstr ""
8014
8015
#: dummy/help_topics/launchpad/detail.txt:3
8016
msgid ""
8017
"Launchpad.net provides free Bazaar branch hosting with integrated bug and\n"
8018
"specification tracking."
8019
msgstr ""
8020
8021
#: dummy/help_topics/launchpad/detail.txt:6
8022
msgid ""
8023
"The bzr client (through the plugin called 'launchpad') has special\n"
8024
"features to communicate with Launchpad:"
8025
msgstr ""
8026
8027
#: dummy/help_topics/launchpad/detail.txt:9
8028
msgid ""
8029
" * The launchpad-login command tells Bazaar your Launchpad user name. "
8030
"This\n"
8031
" is then used by the 'lp:' transport to download your branches using\n"
8032
" bzr+ssh://."
8033
msgstr ""
8034
8035
#: dummy/help_topics/launchpad/detail.txt:13
8036
msgid ""
8037
" * The 'lp:' transport uses Launchpad as a directory service: for "
8038
"example\n"
8039
" 'lp:bzr' and 'lp:python' refer to the main branches of the relevant\n"
8040
" projects and may be branched, logged, etc. You can also use the 'lp:'\n"
8041
" transport to refer to specific branches, e.g. lp:~bzr/bzr/trunk."
8042
msgstr ""
8043
8044
#: dummy/help_topics/launchpad/detail.txt:18
8045
msgid ""
8046
" * The 'lp:' bug tracker alias can expand launchpad bug numbers to their\n"
8047
" URLs for use with 'bzr commit --fixes', e.g. 'bzr commit --fixes "
8048
"lp:12345'\n"
8049
" will record a revision property that marks that revision as fixing\n"
8050
" Launchpad bug 12345. When you push that branch to Launchpad it will\n"
8051
" automatically be linked to the bug report."
8052
msgstr ""
8053
8054
#: dummy/help_topics/launchpad/detail.txt:24
8055
msgid ""
8056
" * The register-branch command tells Launchpad about the url of a\n"
8057
" public branch. Launchpad will then mirror the branch, display\n"
8058
" its contents and allow it to be attached to bugs and other\n"
8059
" objects."
8060
msgstr ""
8061
8062
#: dummy/help_topics/launchpad/detail.txt:29
8063
msgid "For more information see http://help.launchpad.net/\n"
8064
msgstr ""
8065
8066
#: dummy/help_topics/launchpad/summary.txt:1
8067
msgid "Using Bazaar with Launchpad.net"
8068
msgstr ""
8069
8070
#: dummy/help_topics/location-alias/summary.txt:1
8071
msgid "Aliases for remembered locations"
8072
msgstr ""
8073
8074
#: dummy/help_topics/log-formats/summary.txt:1
8075
msgid "Details on the logging formats available"
8076
msgstr ""
8077
8078
#: dummy/help_topics/other-formats/summary.txt:1
8079
msgid "Experimental and deprecated storage formats"
8080
msgstr ""
8081
8082
#: dummy/help_topics/patterns/summary.txt:1
8083
msgid "Information on the pattern syntax"
8084
msgstr ""
8085
8086
#: dummy/help_topics/repositories/detail.txt:1
8087
msgid "Repositories"
8088
msgstr ""
8089
8090
#: dummy/help_topics/repositories/detail.txt:3
8091
msgid ""
8092
"Repositories in Bazaar are where committed information is stored. There is\n"
8093
"a repository associated with every branch."
8094
msgstr ""
8095
8096
#: dummy/help_topics/repositories/detail.txt:6
8097
msgid ""
8098
"Repositories are a form of database. Bzr will usually maintain this for\n"
8099
"good performance automatically, but in some situations (e.g. when doing\n"
8100
"very many commits in a short time period) you may want to ask bzr to\n"
8101
"optimise the database indices. This can be done by the 'bzr pack' command."
8102
msgstr ""
8103
8104
#: dummy/help_topics/repositories/detail.txt:11
8105
msgid ""
8106
"By default just running 'bzr init' will create a repository within the new\n"
8107
"branch but it is possible to create a shared repository which allows "
8108
"multiple\n"
8109
"branches to share their information in the same location. When a new branch "
8110
"is\n"
8111
"created it will first look to see if there is a containing shared repository "
8112
"it\n"
8113
"can use."
8114
msgstr ""
8115
8116
#: dummy/help_topics/repositories/detail.txt:17
8117
msgid ""
8118
"When two branches of the same project share a repository, there is\n"
8119
"generally a large space saving. For some operations (e.g. branching\n"
8120
"within the repository) this translates in to a large time saving."
8121
msgstr ""
8122
8123
#: dummy/help_topics/repositories/detail.txt:21
8124
msgid ""
8125
"To create a shared repository use the init-repository command (or the alias\n"
8126
"init-repo). This command takes the location of the repository to create. "
8127
"This\n"
8128
"means that 'bzr init-repository repo' will create a directory named 'repo',\n"
8129
"which contains a shared repository. Any new branches that are created in "
8130
"this\n"
8131
"directory will then use it for storage."
8132
msgstr ""
8133
8134
#: dummy/help_topics/repositories/detail.txt:27
8135
msgid ""
8136
"It is a good idea to create a repository whenever you might create more\n"
8137
"than one branch of a project. This is true for both working areas where you\n"
8138
"are doing the development, and any server areas that you use for hosting\n"
8139
"projects. In the latter case, it is common to want branches without working\n"
8140
"trees. Since the files in the branch will not be edited directly there is "
8141
"no\n"
8142
"need to use up disk space for a working tree. To create a repository in "
8143
"which\n"
8144
"the branches will not have working trees pass the '--no-trees' option to\n"
8145
"'init-repository'."
8146
msgstr ""
8147
8148
#: dummy/help_topics/repositories/detail.txt:38
8149
msgid ""
8150
" init-repository Create a shared repository. Use --no-trees to create "
8151
"one\n"
8152
" in which new branches won't get a working tree.\n"
8153
msgstr ""
8154
8155
#: dummy/help_topics/repositories/summary.txt:1
8156
msgid "Basic information on shared repositories."
8157
msgstr ""
8158
8159
#: dummy/help_topics/revisionspec/summary.txt:1
8160
msgid "Explain how to use --revision"
8161
msgstr ""
8162
8163
#: dummy/help_topics/rules/summary.txt:1
8164
msgid "Information on defining rule-based preferences"
8165
msgstr ""
8166
8167
#: dummy/help_topics/standalone-trees/detail.txt:1
8168
msgid "Standalone Trees"
8169
msgstr ""
8170
8171
#: dummy/help_topics/standalone-trees/detail.txt:3
8172
msgid ""
8173
"A standalone tree is a working tree with an associated repository. It\n"
8174
"is an independently usable branch, with no dependencies on any other.\n"
8175
"Creating a standalone tree (via bzr init) is the quickest way to put\n"
8176
"an existing project under version control."
8177
msgstr ""
8178
8179
#: dummy/help_topics/standalone-trees/detail.txt:8
8180
msgid "Related Commands::"
8181
msgstr ""
8182
8183
#: dummy/help_topics/standalone-trees/detail.txt:10
8184
msgid " init Make a directory into a versioned branch.\n"
8185
msgstr ""
8186
8187
#: dummy/help_topics/standalone-trees/summary.txt:1
8188
msgid "Information on what a standalone tree is"
8189
msgstr ""
8190
8191
#: dummy/help_topics/standard-options/detail.txt:1
8192
msgid "Standard Options"
8193
msgstr ""
8194
8195
#: dummy/help_topics/standard-options/detail.txt:3
8196
msgid "Standard options are legal for all commands."
8197
msgstr ""
8198
8199
#: dummy/help_topics/standard-options/detail.txt:5
8200
msgid ""
8201
"--help, -h Show help message.\n"
8202
"--verbose, -v Display more information.\n"
8203
"--quiet, -q Only display errors and warnings."
8204
msgstr ""
8205
8206
#: dummy/help_topics/standard-options/detail.txt:9
8207
msgid "Unlike global options, standard options can be used in aliases.\n"
8208
msgstr ""
8209
8210
#: dummy/help_topics/standard-options/summary.txt:1
8211
msgid "Options that can be used with any command"
8212
msgstr ""
8213
8214
#: dummy/help_topics/status-flags/detail.txt:1
8215
msgid "Status Flags"
8216
msgstr ""
8217
8218
#: dummy/help_topics/status-flags/detail.txt:3
8219
msgid ""
8220
"Status flags are used to summarise changes to the working tree in a concise\n"
8221
"manner. They are in the form::"
8222
msgstr ""
8223
8224
#: dummy/help_topics/status-flags/detail.txt:6
8225
msgid " xxx <filename>"
8226
msgstr ""
8227
8228
#: dummy/help_topics/status-flags/detail.txt:8
8229
msgid "where the columns' meanings are as follows."
8230
msgstr ""
8231
8232
#: dummy/help_topics/status-flags/detail.txt:10
8233
msgid "Column 1 - versioning/renames::"
8234
msgstr ""
8235
8236
#: dummy/help_topics/status-flags/detail.txt:12
8237
msgid ""
8238
" + File versioned\n"
8239
" - File unversioned\n"
8240
" R File renamed\n"
8241
" ? File unknown\n"
8242
" X File nonexistent (and unknown to bzr)\n"
8243
" C File has conflicts\n"
8244
" P Entry for a pending merge (not a file)"
8245
msgstr ""
8246
8247
#: dummy/help_topics/status-flags/detail.txt:20
8248
msgid "Column 2 - contents::"
8249
msgstr ""
8250
8251
#: dummy/help_topics/status-flags/detail.txt:22
8252
msgid ""
8253
" N File created\n"
8254
" D File deleted\n"
8255
" K File kind changed\n"
8256
" M File modified"
8257
msgstr ""
8258
8259
#: dummy/help_topics/status-flags/detail.txt:27
8260
msgid "Column 3 - execute::"
8261
msgstr ""
8262
8263
#: dummy/help_topics/status-flags/detail.txt:29
8264
msgid " * The execute bit was changed\n"
8265
msgstr ""
8266
8267
#: dummy/help_topics/status-flags/summary.txt:1
8268
msgid "Help on status flags"
8269
msgstr ""
8270
8271
#: dummy/help_topics/sync-for-reconfigure/detail.txt:1
8272
msgid "Branches Out of Sync"
8273
msgstr ""
8274
8275
#: dummy/help_topics/sync-for-reconfigure/detail.txt:3
8276
msgid ""
8277
"When reconfiguring a checkout, tree or branch into a lightweight checkout,\n"
8278
"a local branch must be destroyed. (For checkouts, this is the local branch\n"
8279
"that serves primarily as a cache.) If the branch-to-be-destroyed does not\n"
8280
"have the same last revision as the new reference branch for the lightweight\n"
8281
"checkout, data could be lost, so Bazaar refuses."
8282
msgstr ""
8283
8284
#: dummy/help_topics/sync-for-reconfigure/detail.txt:9
8285
msgid "How you deal with this depends on *why* the branches are out of sync."
8286
msgstr ""
8287
8288
#: dummy/help_topics/sync-for-reconfigure/detail.txt:11
8289
msgid ""
8290
"If you have a checkout and have done local commits, you can get back in "
8291
"sync\n"
8292
"by running \"bzr update\" (and possibly \"bzr commit\")."
8293
msgstr ""
8294
8295
#: dummy/help_topics/sync-for-reconfigure/detail.txt:14
8296
msgid ""
8297
"If you have a branch and the remote branch is out-of-date, you can push\n"
8298
"the local changes using \"bzr push\". If the local branch is out of date, "
8299
"you\n"
8300
"can do \"bzr pull\". If both branches have had changes, you can merge, "
8301
"commit\n"
8302
"and then push your changes. If you decide that some of the changes aren't\n"
8303
"useful, you can \"push --overwrite\" or \"pull --overwrite\" instead.\n"
8304
msgstr ""
8305
8306
#: dummy/help_topics/sync-for-reconfigure/summary.txt:1
8307
msgid "Steps to resolve \"out-of-sync\" when reconfiguring"
8308
msgstr ""
8309
8310
#: dummy/help_topics/topics/summary.txt:1
8311
msgid "Topics list"
8312
msgstr ""
8313
8314
#: dummy/help_topics/url-special-chars/summary.txt:1
8315
msgid "Special character handling in URLs"
8316
msgstr ""
8317
8318
#: dummy/help_topics/urlspec/summary.txt:1
8319
msgid "Supported transport protocols"
8320
msgstr ""
8321
8322
#: dummy/help_topics/working-trees/detail.txt:1
8323
msgid "Working Trees"
8324
msgstr ""
8325
8326
#: dummy/help_topics/working-trees/detail.txt:3
8327
msgid ""
8328
"A working tree is the contents of a branch placed on disk so that you can\n"
8329
"see the files and edit them. The working tree is where you make changes to "
8330
"a\n"
8331
"branch, and when you commit the current state of the working tree is the\n"
8332
"snapshot that is recorded in the commit."
8333
msgstr ""
8334
8335
#: dummy/help_topics/working-trees/detail.txt:8
8336
msgid ""
8337
"When you push a branch to a remote system, a working tree will not be\n"
8338
"created. If one is already present the files will not be updated. The\n"
8339
"branch information will be updated and the working tree will be marked\n"
8340
"as out-of-date. Updating a working tree remotely is difficult, as there\n"
8341
"may be uncommitted changes or the update may cause content conflicts that "
8342
"are\n"
8343
"difficult to deal with remotely."
8344
msgstr ""
8345
8346
#: dummy/help_topics/working-trees/detail.txt:15
8347
msgid ""
8348
"If you have a branch with no working tree you can use the 'checkout' "
8349
"command\n"
8350
"to create a working tree. If you run 'bzr checkout .' from the branch it "
8351
"will\n"
8352
"create the working tree. If the branch is updated remotely, you can update "
8353
"the\n"
8354
"working tree by running 'bzr update' in that directory."
8355
msgstr ""
8356
8357
#: dummy/help_topics/working-trees/detail.txt:20
8358
msgid ""
8359
"If you have a branch with a working tree that you do not want the 'remove-"
8360
"tree'\n"
8361
"command will remove the tree if it is safe. This can be done to avoid the\n"
8362
"warning about the remote working tree not being updated when pushing to the\n"
8363
"branch. It can also be useful when working with a '--no-trees' repository\n"
8364
"(see 'bzr help repositories')."
8365
msgstr ""
8366
8367
#: dummy/help_topics/working-trees/detail.txt:26
8368
msgid ""
8369
"If you want to have a working tree on a remote machine that you push to you\n"
8370
"can either run 'bzr update' in the remote branch after each push, or use "
8371
"some\n"
8372
"other method to update the tree during the push. There is an 'rspush' "
8373
"plugin\n"
8374
"that will update the working tree using rsync as well as doing a push. "
8375
"There\n"
8376
"is also a 'push-and-update' plugin that automates running 'bzr update' via "
8377
"SSH\n"
8378
"after each push."
8379
msgstr ""
8380
8381
#: dummy/help_topics/working-trees/detail.txt:33
8382
msgid "Useful commands::"
8383
msgstr ""
8384
8385
#: dummy/help_topics/working-trees/detail.txt:35
8386
msgid ""
8387
" checkout Create a working tree when a branch does not have one.\n"
8388
" remove-tree Removes the working tree from a branch when it is safe to do "
8389
"so.\n"
8390
" update When a working tree is out of sync with its associated "
8391
"branch\n"
8392
" this will update the tree to match the branch.\n"
8393
msgstr ""
8394
8395
#: dummy/help_topics/working-trees/summary.txt:1
8396
msgid "Information on working trees"
8397
msgstr ""
8398
8399
#: en/help_topics/authentication.txt:1
8400
msgid ""
8401
"Authentication Settings\n"
8402
"======================="
8403
msgstr ""
8404
8405
#: en/help_topics/authentication.txt:4
8406
msgid ""
8407
"\n"
8408
"Intent\n"
8409
"------"
8410
msgstr ""
8411
8412
#: en/help_topics/authentication.txt:8
8413
msgid ""
8414
"Many different authentication policies can be described in the\n"
8415
"``authentication.conf`` file but a particular user should need only a few\n"
8416
"definitions to cover his needs without having to specify a user and a "
8417
"password\n"
8418
"for every branch he uses."
8419
msgstr ""
8420
8421
#: en/help_topics/authentication.txt:13
8422
msgid ""
8423
"The definitions found in this file are used to find the credentials to use "
8424
"for\n"
8425
"a given url. The same credentials can generally be used for as many branches "
8426
"as\n"
8427
"possible by grouping their declaration around the remote servers that need\n"
8428
"them. It's even possible to declare credentials that will be used by "
8429
"different\n"
8430
"servers."
8431
msgstr ""
8432
8433
#: en/help_topics/authentication.txt:19
8434
msgid ""
8435
"The intent is to make this file as small as possible to minimize maintenance."
8436
msgstr ""
8437
8438
#: en/help_topics/authentication.txt:21
8439
msgid ""
8440
"Once the relevant credentials are declared in this file you may use branch "
8441
"urls\n"
8442
"without embedding passwords (security hazard) or even users (enabling "
8443
"sharing\n"
8444
"of your urls with others)."
8445
msgstr ""
8446
8447
#: en/help_topics/authentication.txt:25
8448
msgid "Instead of using::"
8449
msgstr ""
8450
8451
#: en/help_topics/authentication.txt:27
8452
msgid " bzr branch ftp://joe:secret@host.com/path/to/my/branch"
8453
msgstr ""
8454
8455
#: en/help_topics/authentication.txt:29
8456
msgid "you simply use::"
8457
msgstr ""
8458
8459
#: en/help_topics/authentication.txt:31
8460
msgid " bzr branch ftp://host.com/path/to/my/branch"
8461
msgstr ""
8462
8463
#: en/help_topics/authentication.txt:33
8464
msgid ""
8465
"provided you have created the following ``authentication.conf`` file::"
8466
msgstr ""
8467
8468
#: en/help_topics/authentication.txt:35
8469
msgid ""
8470
" [myprojects]\n"
8471
" scheme=ftp\n"
8472
" host=host.com\n"
8473
" user=joe\n"
8474
" password=secret\n"
8475
" "
8476
msgstr ""
8477
8478
#: en/help_topics/authentication.txt:42
8479
msgid ""
8480
"Authentication definitions\n"
8481
"--------------------------"
8482
msgstr ""
8483
8484
#: en/help_topics/authentication.txt:45
8485
msgid ""
8486
"There are two kinds of authentication used by the various schemes supported "
8487
"by\n"
8488
"bzr:"
8489
msgstr ""
8490
8491
#: en/help_topics/authentication.txt:48
8492
msgid "1. user and password"
8493
msgstr ""
8494
8495
#: en/help_topics/authentication.txt:50
8496
msgid ""
8497
"``FTP`` needs a (``user``, ``password``) to authenticate against a ``host``\n"
8498
"``SFTP`` can use either a password or a host key to authenticate. However,\n"
8499
"ssh agents are a better, more secure solution. So we have chosen to not "
8500
"provide\n"
8501
"our own less secure method."
8502
msgstr ""
8503
8504
#: en/help_topics/authentication.txt:55
8505
msgid "2. user, realm and password"
8506
msgstr ""
8507
8508
#: en/help_topics/authentication.txt:57
8509
msgid ""
8510
"``HTTP`` and ``HTTPS`` needs a (``user, realm, password``) to authenticate\n"
8511
"against a host. But, by using ``.htaccess`` files, for example, it is "
8512
"possible\n"
8513
"to define several (``user, realm, password``) for a given ``host``. So what "
8514
"is\n"
8515
"really needed is (``user``, ``password``, ``host``, ``path``). The ``realm`` "
8516
"is\n"
8517
"not taken into account in the definitions, but will displayed if bzr "
8518
"prompts\n"
8519
"you for a password."
8520
msgstr ""
8521
8522
#: en/help_topics/authentication.txt:64
8523
msgid ""
8524
"``HTTP proxy`` can be handled as ``HTTP`` (or ``HTTPS``) by explicitly\n"
8525
"specifying the appropriate port."
8526
msgstr ""
8527
8528
#: en/help_topics/authentication.txt:67
8529
msgid ""
8530
"To take all schemes into account, the password will be deduced from a set "
8531
"of\n"
8532
"authentication definitions (``scheme``, ``host``, ``port``, ``path``, "
8533
"``user``,\n"
8534
"``password``)."
8535
msgstr ""
8536
8537
#: en/help_topics/authentication.txt:71
8538
msgid ""
8539
" * ``scheme``: can be empty (meaning the rest of the definition can be "
8540
"used\n"
8541
" for any scheme), ``SFTP`` and ``bzr+ssh`` should not be used here, "
8542
"``ssh``\n"
8543
" should be used instead since this is the real scheme regarding\n"
8544
" authentication,"
8545
msgstr ""
8546
8547
#: en/help_topics/authentication.txt:76
8548
msgid " * ``host``: can be empty (to act as a default for any host),"
8549
msgstr ""
8550
8551
#: en/help_topics/authentication.txt:78
8552
msgid ""
8553
" * ``port`` can be empty (useful when an host provides several servers for "
8554
"the\n"
8555
" same scheme), only numerical values are allowed, this should be used "
8556
"only\n"
8557
" when the server uses a port different than the scheme standard port,"
8558
msgstr ""
8559
8560
#: en/help_topics/authentication.txt:82
8561
msgid " * ``path``: can be empty (FTP or SFTP will never user it),"
8562
msgstr ""
8563
8564
#: en/help_topics/authentication.txt:84
8565
msgid ""
8566
" * ``user``: can be empty (``bzr`` will defaults to python's\n"
8567
" ``getpass.get_user()``),"
8568
msgstr ""
8569
8570
#: en/help_topics/authentication.txt:87
8571
msgid ""
8572
" * ``password``: can be empty if you prefer to always be prompted for your\n"
8573
" password."
8574
msgstr ""
8575
8576
#: en/help_topics/authentication.txt:90
8577
msgid ""
8578
"Multiple definitions can be provided and, for a given URL, bzr will select "
8579
"a\n"
8580
"(``user`` [, ``password``]) based on the following rules :"
8581
msgstr ""
8582
8583
#: en/help_topics/authentication.txt:93
8584
msgid " 1. the first match wins,"
8585
msgstr ""
8586
8587
#: en/help_topics/authentication.txt:95
8588
msgid " 2. empty fields match everything,"
8589
msgstr ""
8590
8591
#: en/help_topics/authentication.txt:97
8592
msgid ""
8593
" 3. ``scheme`` matches even if decorators are used in the requested URL,"
8594
msgstr ""
8595
8596
#: en/help_topics/authentication.txt:99
8597
msgid ""
8598
" 4. ``host`` matches exactly or act as a domain if it starts with '.'\n"
8599
" (``project.bzr.sf.net`` will match ``.bzr.sf.net`` but "
8600
"``projectbzr.sf.net``\n"
8601
" will not match ``bzr.sf.net``)."
8602
msgstr ""
8603
8604
#: en/help_topics/authentication.txt:103
8605
msgid ""
8606
" 5. ``port`` matches if included in the requested URL (exact matches only)"
8607
msgstr ""
8608
8609
#: en/help_topics/authentication.txt:105
8610
msgid ""
8611
" 6. ``path`` matches if included in the requested URL (and by rule #2 "
8612
"above,\n"
8613
" empty paths will match any provided path)."
8614
msgstr ""
8615
8616
#: en/help_topics/authentication.txt:110
8617
msgid ""
8618
"File format\n"
8619
"-----------"
8620
msgstr ""
8621
8622
#: en/help_topics/authentication.txt:113
8623
msgid ""
8624
"The general rules for :doc:`configuration files <configuration-help>`\n"
8625
"apply except for the variable policies."
8626
msgstr ""
8627
8628
#: en/help_topics/authentication.txt:116
8629
msgid "Each section describes an authentication definition."
8630
msgstr ""
8631
8632
#: en/help_topics/authentication.txt:118
8633
msgid ""
8634
"The section name is an arbitrary string, only the ``DEFAULT`` value is "
8635
"reserved\n"
8636
"and should appear as the *last* section."
8637
msgstr ""
8638
8639
#: en/help_topics/authentication.txt:121
8640
msgid "Each section should define:"
8641
msgstr ""
8642
8643
#: en/help_topics/authentication.txt:123
8644
msgid "* ``user``: the login to be used,"
8645
msgstr ""
8646
8647
#: en/help_topics/authentication.txt:125
8648
msgid "Each section could define:"
8649
msgstr ""
8650
8651
#: en/help_topics/authentication.txt:127
8652
msgid "* ``host``: the remote server,"
8653
msgstr ""
8654
8655
#: en/help_topics/authentication.txt:129
8656
msgid "* ``port``: the port the server is listening,"
8657
msgstr ""
8658
8659
#: en/help_topics/authentication.txt:131
8660
msgid "* ``path``: the branch location,"
8661
msgstr ""
8662
8663
#: en/help_topics/authentication.txt:133
8664
msgid "* ``password``: the password."
8665
msgstr ""
8666
8667
#: en/help_topics/authentication.txt:135
8668
msgid ""
8669
"\n"
8670
"Examples\n"
8671
"--------"
8672
msgstr ""
8673
8674
#: en/help_topics/authentication.txt:139
8675
msgid ""
8676
"\n"
8677
"Personal projects hosted outside\n"
8678
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
8679
msgstr ""
8680
8681
#: en/help_topics/authentication.txt:143
8682
msgid ""
8683
"All connections are done with the same ``user`` (the remote one for which "
8684
"the\n"
8685
"default bzr one is not appropriate) and the password is always prompted "
8686
"with\n"
8687
"some exceptions::"
8688
msgstr ""
8689
8690
#: en/help_topics/authentication.txt:147
8691
msgid ""
8692
" # Pet projects on hobby.net\n"
8693
" [hobby]\n"
8694
" host=r.hobby.net\n"
8695
" user=jim\n"
8696
" password=obvious1234\n"
8697
" \n"
8698
" # Home server\n"
8699
" [home]\n"
8700
" scheme=https\n"
8701
" host=home.net\n"
8702
" user=joe\n"
8703
" password=1essobV10us\n"
8704
" \n"
8705
" [DEFAULT]\n"
8706
" # Our local user is barbaz, on all remote sites we're known as "
8707
"foobar\n"
8708
" user=foobar"
8709
msgstr ""
8710
8711
#: en/help_topics/authentication.txt:164
8712
msgid ""
8713
"\n"
8714
"Source hosting provider\n"
8715
"~~~~~~~~~~~~~~~~~~~~~~~"
8716
msgstr ""
8717
8718
#: en/help_topics/authentication.txt:168
8719
msgid "In the shp.net (fictitious) domain, each project has its own site::"
8720
msgstr ""
8721
8722
#: en/help_topics/authentication.txt:170
8723
msgid ""
8724
" [shpnet domain]\n"
8725
" # we use sftp, but ssh is the scheme used for authentication\n"
8726
" scheme=ssh\n"
8727
" # The leading '.' ensures that 'shp.net' alone doesn't match\n"
8728
" host=.shp.net\n"
8729
" user=joe\n"
8730
" # bzr don't support supplying a password for sftp,\n"
8731
" # consider using an ssh agent if you don't want to supply\n"
8732
" # a password interactively. (pageant, ssh-agent, etc)"
8733
msgstr ""
8734
8735
#: en/help_topics/authentication.txt:180
8736
msgid ""
8737
"HTTPS, SFTP servers and their proxy\n"
8738
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
8739
msgstr ""
8740
8741
#: en/help_topics/authentication.txt:183
8742
msgid ""
8743
"At company.com, the server hosting release and integration branches is "
8744
"behind a\n"
8745
"proxy, and the two branches use different authentication policies::"
8746
msgstr ""
8747
8748
#: en/help_topics/authentication.txt:186
8749
msgid ""
8750
" [reference code]\n"
8751
" scheme=https\n"
8752
" host=dev.company.com\n"
8753
" path=/dev\n"
8754
" user=user1\n"
8755
" password=pass1"
8756
msgstr ""
8757
8758
#: en/help_topics/authentication.txt:193
8759
msgid ""
8760
" # development branches on dev server\n"
8761
" [dev]\n"
8762
" scheme=ssh # bzr+ssh and sftp are available here\n"
8763
" host=dev.company.com\n"
8764
" path=/dev/integration\n"
8765
" user=user2\n"
8766
" \n"
8767
" # proxy\n"
8768
" [proxy]\n"
8769
" scheme=http\n"
8770
" host=proxy.company.com\n"
8771
" port=3128\n"
8772
" user=proxyuser1\n"
8773
" password=proxypass1"
8774
msgstr ""
8775
8776
#: en/help_topics/authentication.txt:208
8777
msgid ""
8778
"\n"
8779
"Planned enhancements\n"
8780
"--------------------"
8781
msgstr ""
8782
8783
#: en/help_topics/authentication.txt:212
8784
msgid ""
8785
"The following are not yet implemented but planned as parts of a work in\n"
8786
"progress:"
8787
msgstr ""
8788
8789
#: en/help_topics/authentication.txt:215
8790
msgid "* add a ``password_encoding`` field allowing:"
8791
msgstr ""
8792
8793
#: en/help_topics/authentication.txt:217
8794
msgid ""
8795
" - storing the passwords in various obfuscating encodings (base64 for one),"
8796
msgstr ""
8797
8798
#: en/help_topics/authentication.txt:219
8799
msgid " - delegate password storage to plugins (.netrc for example)."
8800
msgstr ""
8801
8802
#: en/help_topics/authentication.txt:221
8803
msgid ""
8804
"* update the credentials when the user is prompted for user or password,"
8805
msgstr ""
8806
8807
#: en/help_topics/authentication.txt:223
8808
msgid "* add a ``verify_certificates`` field for ``HTTPS``."
8809
msgstr ""
8810
8811
#: en/help_topics/authentication.txt:225
8812
msgid ""
8813
"The ``password_encoding`` and ``verify_certificates`` fields are recognized "
8814
"but\n"
8815
"ignored in the actual implementation.\n"
8816
msgstr ""
8817
8818
#: en/help_topics/bugs.txt:1
8819
msgid "Bug Tracker Settings"
8820
msgstr ""
8821
8822
#: en/help_topics/bugs.txt:3
8823
msgid ""
8824
"When making a commit, metadata about bugs fixed by that change can be\n"
8825
"recorded by using the ``--fixes`` option. For each bug marked as fixed, an\n"
8826
"entry is included in the 'bugs' revision property stating '<url> <status>'.\n"
8827
"(The only ``status`` value currently supported is ``fixed.``)"
8828
msgstr ""
8829
8830
#: en/help_topics/bugs.txt:8
8831
msgid ""
8832
"The ``--fixes`` option allows you to specify a bug tracker and a bug "
8833
"identifier\n"
8834
"rather than a full URL. This looks like::"
8835
msgstr ""
8836
8837
#: en/help_topics/bugs.txt:11
8838
msgid " bzr commit --fixes <tracker>:<id>"
8839
msgstr ""
8840
8841
#: en/help_topics/bugs.txt:13 en/help_topics/configuration.txt:398
8842
msgid "or::"
8843
msgstr ""
8844
8845
#: en/help_topics/bugs.txt:15
8846
msgid " bzr commit --fixes <id>"
8847
msgstr ""
8848
8849
#: en/help_topics/bugs.txt:17
8850
msgid ""
8851
"where \"<tracker>\" is an identifier for the bug tracker, and \"<id>\" is "
8852
"the\n"
8853
"identifier for that bug within the bugtracker, usually the bug number.\n"
8854
"If \"<tracker>\" is not specified the ``bugtracker`` set in the branch\n"
8855
"or global configuration is used."
8856
msgstr ""
8857
8858
#: en/help_topics/bugs.txt:22
8859
msgid ""
8860
"Bazaar knows about a few bug trackers that have many users. If\n"
8861
"you use one of these bug trackers then there is no setup required to\n"
8862
"use this feature, you just need to know the tracker identifier to use.\n"
8863
"These are the bugtrackers that are built in:"
8864
msgstr ""
8865
8866
#: en/help_topics/bugs.txt:27
8867
msgid ""
8868
" ============================ ============ ============\n"
8869
" URL Abbreviation Example\n"
8870
" ============================ ============ ============\n"
8871
" https://bugs.launchpad.net/ lp lp:12345\n"
8872
" http://bugs.debian.org/ deb deb:12345\n"
8873
" http://bugzilla.gnome.org/ gnome gnome:12345\n"
8874
" ============================ ============ ============"
8875
msgstr ""
8876
8877
#: en/help_topics/bugs.txt:35
8878
msgid ""
8879
"For the bug trackers not listed above configuration is required.\n"
8880
"Support for generating the URLs for any project using Bugzilla or Trac\n"
8881
"is built in, along with a template mechanism for other bugtrackers with\n"
8882
"simple URL schemes. If your bug tracker can't be described by one\n"
8883
"of the schemes described below then you can write a plugin to support\n"
8884
"it."
8885
msgstr ""
8886
8887
#: en/help_topics/bugs.txt:42
8888
msgid ""
8889
"If you use Bugzilla or Trac, then you only need to set a configuration\n"
8890
"variable which contains the base URL of the bug tracker. These options\n"
8891
"can go into ``bazaar.conf``, ``branch.conf`` or into a branch-specific\n"
8892
"configuration section in ``locations.conf``. You can set up these values\n"
8893
"for each of the projects you work on."
8894
msgstr ""
8895
8896
#: en/help_topics/bugs.txt:48
8897
msgid ""
8898
"Note: As you provide a short name for each tracker, you can specify one or\n"
8899
"more bugs in one or more trackers at commit time if you wish."
8900
msgstr ""
8901
8902
#: en/help_topics/bugs.txt:51
8903
msgid ""
8904
"Launchpad\n"
8905
"---------"
8906
msgstr ""
8907
8908
#: en/help_topics/bugs.txt:54
8909
msgid ""
8910
"Use ``bzr commit --fixes lp:2`` to record that this commit fixes bug 2."
8911
msgstr ""
8912
8913
#: en/help_topics/bugs.txt:56
8914
msgid ""
8915
"bugzilla_<tracker>_url\n"
8916
"----------------------"
8917
msgstr ""
8918
8919
#: en/help_topics/bugs.txt:59
8920
msgid ""
8921
"If present, the location of the Bugzilla bug tracker referred to by\n"
8922
"<tracker>. This option can then be used together with ``bzr commit\n"
8923
"--fixes`` to mark bugs in that tracker as being fixed by that commit. For\n"
8924
"example::"
8925
msgstr ""
8926
8927
#: en/help_topics/bugs.txt:64
8928
msgid " bugzilla_squid_url = http://bugs.squid-cache.org"
8929
msgstr ""
8930
8931
#: en/help_topics/bugs.txt:66
8932
msgid ""
8933
"would allow ``bzr commit --fixes squid:1234`` to mark Squid's bug 1234 as\n"
8934
"fixed."
8935
msgstr ""
8936
8937
#: en/help_topics/bugs.txt:69
8938
msgid ""
8939
"trac_<tracker>_url\n"
8940
"------------------"
8941
msgstr ""
8942
8943
#: en/help_topics/bugs.txt:72
8944
msgid ""
8945
"If present, the location of the Trac instance referred to by\n"
8946
"<tracker>. This option can then be used together with ``bzr commit\n"
8947
"--fixes`` to mark bugs in that tracker as being fixed by that commit. For\n"
8948
"example::"
8949
msgstr ""
8950
8951
#: en/help_topics/bugs.txt:77
8952
msgid " trac_twisted_url = http://www.twistedmatrix.com/trac"
8953
msgstr ""
8954
8955
#: en/help_topics/bugs.txt:79
8956
msgid ""
8957
"would allow ``bzr commit --fixes twisted:1234`` to mark Twisted's bug 1234 "
8958
"as\n"
8959
"fixed."
8960
msgstr ""
8961
8962
#: en/help_topics/bugs.txt:82
8963
msgid ""
8964
"bugtracker_<tracker>_url\n"
8965
"------------------------"
8966
msgstr ""
8967
8968
#: en/help_topics/bugs.txt:85
8969
msgid ""
8970
"If present, the location of a generic bug tracker instance referred to by\n"
8971
"<tracker>. The location must contain an ``{id}`` placeholder,\n"
8972
"which will be replaced by a specific bug ID. This option can then be used\n"
8973
"together with ``bzr commit --fixes`` to mark bugs in that tracker as being\n"
8974
"fixed by that commit. For example::"
8975
msgstr ""
8976
8977
#: en/help_topics/bugs.txt:91
8978
msgid " bugtracker_python_url = http://bugs.python.org/issue{id}"
8979
msgstr ""
8980
8981
#: en/help_topics/bugs.txt:93
8982
msgid ""
8983
"would allow ``bzr commit --fixes python:1234`` to mark bug 1234 in Python's\n"
8984
"Roundup bug tracker as fixed, or::"
8985
msgstr ""
8986
8987
#: en/help_topics/bugs.txt:96
8988
msgid ""
8989
" bugtracker_cpan_url = http://rt.cpan.org/Public/Bug/Display.html?id={id}"
8990
msgstr ""
8991
8992
#: en/help_topics/bugs.txt:98
8993
msgid ""
8994
"would allow ``bzr commit --fixes cpan:1234`` to mark bug 1234 in CPAN's\n"
8995
"RT bug tracker as fixed, or::"
8996
msgstr ""
8997
8998
#: en/help_topics/bugs.txt:101
8999
msgid " bugtracker_hudson_url = http://issues.hudson-ci.org/browse/{id}"
9000
msgstr ""
9001
9002
#: en/help_topics/bugs.txt:103
9003
msgid ""
9004
"would allow ``bzr commit --fixes hudson:HUDSON-1234`` to mark bug HUDSON-"
9005
"1234\n"
9006
"in Hudson's JIRA bug tracker as fixed.\n"
9007
msgstr ""
9008
9009
#: en/help_topics/commands.txt:1
9010
msgid ""
9011
"add Add specified files or directories.\n"
9012
"alias Set/unset and display aliases.\n"
9013
"annotate Show the origin of each line in a file.\n"
9014
"bash-completion Generate a shell function for bash command line "
9015
"completion.\n"
9016
" [bash_completion]\n"
9017
"bind Convert the current branch into a checkout of the "
9018
"supplied\n"
9019
" branch.\n"
9020
"branch Create a new branch that is a copy of an existing branch.\n"
9021
"branches List the branches available at the current location.\n"
9022
"break-lock Break a dead lock.\n"
9023
"cat Write the contents of a file as of a given revision to\n"
9024
" standard output.\n"
9025
"check Validate working tree structure, branch consistency and\n"
9026
" repository history.\n"
9027
"checkout Create a new checkout of an existing branch.\n"
9028
"clean-tree Remove unwanted files from working tree.\n"
9029
"commit Commit changes into a new revision.\n"
9030
"config Display, set or remove a configuration option.\n"
9031
"conflicts List files with conflicts.\n"
9032
"deleted List files deleted in the working tree.\n"
9033
"diff Show differences in the working tree, between revisions "
9034
"or\n"
9035
" branches.\n"
9036
"dpush Push into a different VCS without any custom bzr "
9037
"metadata.\n"
9038
"export Export current or past revision to a destination directory "
9039
"or\n"
9040
" archive.\n"
9041
"help Show help on a command or other topic.\n"
9042
"ignore Ignore specified files or patterns.\n"
9043
"ignored List ignored files and the patterns that matched them.\n"
9044
"info Show information about a working tree, branch or "
9045
"repository.\n"
9046
"init Make a directory into a versioned branch.\n"
9047
"init-repository Create a shared repository for branches to share storage\n"
9048
" space.\n"
9049
"join Combine a tree into its containing tree.\n"
9050
"launchpad-login Show or set the Launchpad user ID. [launchpad]\n"
9051
"launchpad-mirror Ask Launchpad to mirror a branch now. [launchpad]\n"
9052
"launchpad-open Open a Launchpad branch page in your web browser. "
9053
"[launchpad]\n"
9054
"log Show historical log for a branch or subset of a branch.\n"
9055
"lp-find-proposal Find the proposal to merge this revision. [launchpad]\n"
9056
"lp-propose-merge Propose merging a branch on Launchpad. [launchpad]\n"
9057
"ls List files in a tree.\n"
9058
"merge Perform a three-way merge.\n"
9059
"missing Show unmerged/unpulled revisions between two branches.\n"
9060
"mkdir Create a new versioned directory.\n"
9061
"mv Move or rename a file.\n"
9062
"nick Print or set the branch nickname.\n"
9063
"pack Compress the data within a repository.\n"
9064
"plugins List the installed plugins.\n"
9065
"pull Turn this branch into a mirror of another branch.\n"
9066
"push Update a mirror of this branch.\n"
9067
"reconcile Reconcile bzr metadata in a branch.\n"
9068
"reconfigure Reconfigure the type of a bzr directory.\n"
9069
"register-branch Register a branch with launchpad.net. [launchpad]\n"
9070
"remerge Redo a merge.\n"
9071
"remove Remove files or directories.\n"
9072
"remove-branch Remove a branch.\n"
9073
"remove-tree Remove the working tree from a given branch/checkout.\n"
9074
"renames Show list of renamed files.\n"
9075
"resolve Mark a conflict as resolved.\n"
9076
"revert Revert files to a previous revision.\n"
9077
"revno Show current revision number.\n"
9078
"root Show the tree root directory.\n"
9079
"send Mail or create a merge-directive for submitting changes.\n"
9080
"serve Run the bzr server.\n"
9081
"shelve Temporarily set aside some changes from the current tree.\n"
9082
"sign-my-commits Sign all commits by a given committer.\n"
9083
"split Split a subdirectory of a tree into a separate tree.\n"
9084
"status Display status summary.\n"
9085
"switch Set the branch of a checkout and update.\n"
9086
"tag Create, remove or modify a tag naming a revision.\n"
9087
"tags List tags.\n"
9088
"testament Show testament (signing-form) of a revision.\n"
9089
"unbind Convert the current checkout into a regular branch.\n"
9090
"uncommit Remove the last committed revision.\n"
9091
"unshelve Restore shelved changes.\n"
9092
"update Update a working tree to a new revision.\n"
9093
"upgrade Upgrade a repository, branch or working tree to a newer\n"
9094
" format.\n"
9095
"verify-signatures Verify all commit signatures.\n"
9096
"version Show version of bzr.\n"
9097
"version-info Show version information about this tree.\n"
9098
"view Manage filtered views.\n"
9099
"whoami Show or set bzr user id.\n"
9100
msgstr ""
9101
9102
#: en/help_topics/configuration.txt:1
9103
msgid ""
9104
"Configuration Settings\n"
9105
"======================="
9106
msgstr ""
9107
9108
#: en/help_topics/configuration.txt:4
9109
msgid ""
9110
"Environment settings\n"
9111
"---------------------"
9112
msgstr ""
9113
9114
#: en/help_topics/configuration.txt:7
9115
msgid ""
9116
"While most configuration is handled by configuration files, some options\n"
9117
"which may be semi-permanent can also be controlled through the environment."
9118
msgstr ""
9119
9120
#: en/help_topics/configuration.txt:10
9121
msgid ""
9122
"BZR_EMAIL\n"
9123
"~~~~~~~~~"
9124
msgstr ""
9125
9126
#: en/help_topics/configuration.txt:13
9127
msgid "Override the email id used by Bazaar. Typical format::"
9128
msgstr ""
9129
9130
#: en/help_topics/configuration.txt:15
9131
msgid " \"John Doe <jdoe@example.com>\""
9132
msgstr ""
9133
9134
#: en/help_topics/configuration.txt:17
9135
msgid "See also the ``email`` configuration option."
9136
msgstr ""
9137
9138
#: en/help_topics/configuration.txt:19
9139
msgid ""
9140
"BZR_PROGRESS_BAR\n"
9141
"~~~~~~~~~~~~~~~~"
9142
msgstr ""
9143
9144
#: en/help_topics/configuration.txt:22
9145
msgid ""
9146
"Override the progress display. Possible values are \"none\" or \"text\". "
9147
"If\n"
9148
"the value is \"none\" then no progress bar is displayed. The value \"text\" "
9149
"draws\n"
9150
"the ordinary command line progress bar."
9151
msgstr ""
9152
9153
#: en/help_topics/configuration.txt:26
9154
msgid ""
9155
"BZR_SIGQUIT_PDB\n"
9156
"~~~~~~~~~~~~~~~"
9157
msgstr ""
9158
9159
#: en/help_topics/configuration.txt:29
9160
msgid ""
9161
"Control whether SIGQUIT behaves normally or invokes a breakin debugger."
9162
msgstr ""
9163
9164
#: en/help_topics/configuration.txt:31
9165
msgid ""
9166
"* 0 = Standard SIGQUIT behavior (normally, exit with a core dump)\n"
9167
"* 1 = Invoke breakin debugger (default)"
9168
msgstr ""
9169
9170
#: en/help_topics/configuration.txt:34
9171
msgid ""
9172
"BZR_HOME\n"
9173
"~~~~~~~~"
9174
msgstr ""
9175
9176
#: en/help_topics/configuration.txt:37
9177
msgid "Override the home directory used by Bazaar."
9178
msgstr ""
9179
9180
#: en/help_topics/configuration.txt:39
9181
msgid ""
9182
"BZR_SSH\n"
9183
"~~~~~~~"
9184
msgstr ""
9185
9186
#: en/help_topics/configuration.txt:42
9187
msgid "Select a different SSH implementation."
9188
msgstr ""
9189
9190
#: en/help_topics/configuration.txt:44
9191
msgid ""
9192
"BZR_PDB\n"
9193
"~~~~~~~"
9194
msgstr ""
9195
9196
#: en/help_topics/configuration.txt:47
9197
msgid "Control whether to launch a debugger on error."
9198
msgstr ""
9199
9200
#: en/help_topics/configuration.txt:49
9201
msgid ""
9202
"* 0 = Standard behavior\n"
9203
"* 1 = Launch debugger"
9204
msgstr ""
9205
9206
#: en/help_topics/configuration.txt:52
9207
msgid ""
9208
"BZR_REMOTE_PATH\n"
9209
"~~~~~~~~~~~~~~~"
9210
msgstr ""
9211
9212
#: en/help_topics/configuration.txt:55
9213
msgid "Path to the Bazaar executable to use when using the bzr+ssh protocol."
9214
msgstr ""
9215
9216
#: en/help_topics/configuration.txt:57
9217
msgid "See also the ``bzr_remote_path`` configuration option."
9218
msgstr ""
9219
9220
#: en/help_topics/configuration.txt:59
9221
msgid ""
9222
"BZR_EDITOR\n"
9223
"~~~~~~~~~~"
9224
msgstr ""
9225
9226
#: en/help_topics/configuration.txt:62
9227
msgid "Path to the editor Bazaar should use for commit messages, etc."
9228
msgstr ""
9229
9230
#: en/help_topics/configuration.txt:64
9231
msgid ""
9232
"BZR_LOG\n"
9233
"~~~~~~~"
9234
msgstr ""
9235
9236
#: en/help_topics/configuration.txt:67
9237
msgid ""
9238
"Location of the Bazaar log file. You can check the current location by\n"
9239
"running ``bzr version``."
9240
msgstr ""
9241
9242
#: en/help_topics/configuration.txt:70
9243
msgid ""
9244
"The log file contains debug information that is useful for diagnosing or\n"
9245
"reporting problems with Bazaar."
9246
msgstr ""
9247
9248
#: en/help_topics/configuration.txt:73
9249
msgid ""
9250
"Setting this to ``NUL`` on Windows or ``/dev/null`` on other platforms\n"
9251
"will disable logging."
9252
msgstr ""
9253
9254
#: en/help_topics/configuration.txt:76
9255
msgid ""
9256
"\n"
9257
"BZR_PLUGIN_PATH\n"
9258
"~~~~~~~~~~~~~~~"
9259
msgstr ""
9260
9261
#: en/help_topics/configuration.txt:80
9262
msgid ""
9263
"The path to the plugins directory that Bazaar should use.\n"
9264
"If not set, Bazaar will search for plugins in:"
9265
msgstr ""
9266
9267
#: en/help_topics/configuration.txt:83
9268
msgid ""
9269
"* the user specific plugin directory (containing the ``user`` plugins),"
9270
msgstr ""
9271
9272
#: en/help_topics/configuration.txt:85
9273
msgid "* the bzrlib directory (containing the ``core`` plugins),"
9274
msgstr ""
9275
9276
#: en/help_topics/configuration.txt:87
9277
msgid ""
9278
"* the site specific plugin directory if applicable (containing\n"
9279
" the ``site`` plugins)."
9280
msgstr ""
9281
9282
#: en/help_topics/configuration.txt:90
9283
msgid ""
9284
"If ``BZR_PLUGIN_PATH`` is set in any fashion, it will change the\n"
9285
"the way the plugin are searched. "
9286
msgstr ""
9287
9288
#: en/help_topics/configuration.txt:93
9289
msgid ""
9290
"As for the ``PATH`` variables, if multiple directories are\n"
9291
"specified in ``BZR_PLUGIN_PATH`` they should be separated by the\n"
9292
"platform specific appropriate character (':' on Unix,\n"
9293
"';' on windows)"
9294
msgstr ""
9295
9296
#: en/help_topics/configuration.txt:98
9297
msgid ""
9298
"By default if ``BZR_PLUGIN_PATH`` is set, it replaces searching\n"
9299
"in ``user``. However it will continue to search in ``core`` and\n"
9300
"``site`` unless they are explicitly removed."
9301
msgstr ""
9302
9303
#: en/help_topics/configuration.txt:102
9304
msgid ""
9305
"If you need to change the order or remove one of these\n"
9306
"directories, you should use special values:"
9307
msgstr ""
9308
9309
#: en/help_topics/configuration.txt:105
9310
msgid ""
9311
"* ``-user``, ``-core``, ``-site`` will remove the corresponding\n"
9312
" path from the default values,"
9313
msgstr ""
9314
9315
#: en/help_topics/configuration.txt:108
9316
msgid ""
9317
"* ``+user``, ``+core``, ``+site`` will add the corresponding path\n"
9318
" before the remaining default values (and also remove it from\n"
9319
" the default values)."
9320
msgstr ""
9321
9322
#: en/help_topics/configuration.txt:112
9323
msgid ""
9324
"Note that the special values 'user', 'core' and 'site' should be\n"
9325
"used literally, they will be substituted by the corresponding,\n"
9326
"platform specific, values."
9327
msgstr ""
9328
9329
#: en/help_topics/configuration.txt:116
9330
msgid ""
9331
"The examples below use ':' as the separator, windows users\n"
9332
"should use ';'."
9333
msgstr ""
9334
9335
#: en/help_topics/configuration.txt:119
9336
msgid "Overriding the default user plugin directory::"
9337
msgstr ""
9338
9339
#: en/help_topics/configuration.txt:121
9340
msgid " BZR_PLUGIN_PATH='/path/to/my/other/plugins'"
9341
msgstr ""
9342
9343
#: en/help_topics/configuration.txt:123
9344
msgid "Disabling the site directory while retaining the user directory::"
9345
msgstr ""
9346
9347
#: en/help_topics/configuration.txt:125
9348
msgid " BZR_PLUGIN_PATH='-site:+user'"
9349
msgstr ""
9350
9351
#: en/help_topics/configuration.txt:127
9352
msgid "Disabling all plugins (better achieved with --no-plugins)::"
9353
msgstr ""
9354
9355
#: en/help_topics/configuration.txt:129
9356
msgid " BZR_PLUGIN_PATH='-user:-core:-site'"
9357
msgstr ""
9358
9359
#: en/help_topics/configuration.txt:131
9360
msgid "Overriding the default site plugin directory::"
9361
msgstr ""
9362
9363
#: en/help_topics/configuration.txt:133
9364
msgid " BZR_PLUGIN_PATH='/path/to/my/site/plugins:-site':+user"
9365
msgstr ""
9366
9367
#: en/help_topics/configuration.txt:135
9368
msgid ""
9369
"BZR_DISABLE_PLUGINS\n"
9370
"~~~~~~~~~~~~~~~~~~~"
9371
msgstr ""
9372
9373
#: en/help_topics/configuration.txt:138
9374
msgid ""
9375
"Under special circumstances (mostly when trying to diagnose a\n"
9376
"bug), it's better to disable a plugin (or several) rather than\n"
9377
"uninstalling them completely. Such plugins can be specified in\n"
9378
"the ``BZR_DISABLE_PLUGINS`` environment variable."
9379
msgstr ""
9380
9381
#: en/help_topics/configuration.txt:143
9382
msgid ""
9383
"In that case, ``bzr`` will stop loading the specified plugins and\n"
9384
"will raise an import error if they are explicitly imported (by\n"
9385
"another plugin that depends on them for example)."
9386
msgstr ""
9387
9388
#: en/help_topics/configuration.txt:147
9389
msgid "Disabling ``myplugin`` and ``yourplugin`` is achieved by::"
9390
msgstr ""
9391
9392
#: en/help_topics/configuration.txt:149
9393
msgid " BZR_DISABLE_PLUGINS='myplugin:yourplugin'"
9394
msgstr ""
9395
9396
#: en/help_topics/configuration.txt:151
9397
msgid ""
9398
"BZR_PLUGINS_AT\n"
9399
"~~~~~~~~~~~~~~"
9400
msgstr ""
9401
9402
#: en/help_topics/configuration.txt:154
9403
msgid ""
9404
"When adding a new feature or working on a bug in a plugin,\n"
9405
"developers often need to use a specific version of a given\n"
9406
"plugin. Since python requires that the directory containing the\n"
9407
"code is named like the plugin itself this make it impossible to\n"
9408
"use arbitrary directory names (using a two-level directory scheme\n"
9409
"is inconvenient). ``BZR_PLUGINS_AT`` allows such directories even\n"
9410
"if they don't appear in ``BZR_PLUGIN_PATH`` ."
9411
msgstr ""
9412
9413
#: en/help_topics/configuration.txt:162
9414
msgid ""
9415
"Plugins specified in this environment variable takes precedence\n"
9416
"over the ones in ``BZR_PLUGIN_PATH``."
9417
msgstr ""
9418
9419
#: en/help_topics/configuration.txt:165
9420
msgid ""
9421
"The variable specified a list of ``plugin_name@plugin path``,\n"
9422
"``plugin_name`` being the name of the plugin as it appears in\n"
9423
"python module paths, ``plugin_path`` being the path to the\n"
9424
"directory containing the plugin code itself\n"
9425
"(i.e. ``plugins/myplugin`` not ``plugins``). Use ':' as the list\n"
9426
"separator, use ';' on windows."
9427
msgstr ""
9428
9429
#: en/help_topics/configuration.txt:172
9430
msgid ""
9431
"Example:\n"
9432
"~~~~~~~~"
9433
msgstr ""
9434
9435
#: en/help_topics/configuration.txt:175
9436
msgid ""
9437
"Using a specific version of ``myplugin``:\n"
9438
"``BZR_PLUGINS_AT='myplugin@/home/me/bugfixes/123456-myplugin``"
9439
msgstr ""
9440
9441
#: en/help_topics/configuration.txt:178
9442
msgid ""
9443
"BZRPATH\n"
9444
"~~~~~~~"
9445
msgstr ""
9446
9447
#: en/help_topics/configuration.txt:181
9448
msgid "The path where Bazaar should look for shell plugin external commands."
9449
msgstr ""
9450
9451
#: en/help_topics/configuration.txt:183
9452
msgid ""
9453
"\n"
9454
"http_proxy, https_proxy\n"
9455
"~~~~~~~~~~~~~~~~~~~~~~~"
9456
msgstr ""
9457
9458
#: en/help_topics/configuration.txt:187
9459
msgid "Specifies the network proxy for outgoing connections, for example::"
9460
msgstr ""
9461
9462
#: en/help_topics/configuration.txt:189
9463
msgid ""
9464
" http_proxy=http://proxy.example.com:3128/ \n"
9465
" https_proxy=http://proxy.example.com:3128/"
9466
msgstr ""
9467
9468
#: en/help_topics/configuration.txt:192
9469
msgid ""
9470
"\n"
9471
"Configuration files\n"
9472
"-------------------"
9473
msgstr ""
9474
9475
#: en/help_topics/configuration.txt:196
9476
msgid ""
9477
"Location\n"
9478
"~~~~~~~~"
9479
msgstr ""
9480
9481
#: en/help_topics/configuration.txt:199
9482
msgid ""
9483
"Configuration files are located in ``$HOME/.bazaar`` on Unix and\n"
9484
"``C:\\Documents and Settings\\<username>\\Application Data\\Bazaar\\2.0`` "
9485
"on\n"
9486
"Windows. (You can check the location for your system by using\n"
9487
"``bzr version``.)"
9488
msgstr ""
9489
9490
#: en/help_topics/configuration.txt:204
9491
msgid "There are three primary configuration files in this location:"
9492
msgstr ""
9493
9494
#: en/help_topics/configuration.txt:206
9495
msgid "* ``bazaar.conf`` describes default configuration options,"
9496
msgstr ""
9497
9498
#: en/help_topics/configuration.txt:208
9499
msgid ""
9500
"* ``locations.conf`` describes configuration information for\n"
9501
" specific branch locations,"
9502
msgstr ""
9503
9504
#: en/help_topics/configuration.txt:211
9505
msgid ""
9506
"* ``authentication.conf`` describes credential information for\n"
9507
" remote servers."
9508
msgstr ""
9509
9510
#: en/help_topics/configuration.txt:214
9511
msgid ""
9512
"Each branch can also contain a configuration file that sets values specific\n"
9513
"to that branch. This file is found at ``.bzr/branch/branch.conf`` within "
9514
"the\n"
9515
"branch. This file is visible to all users of a branch, if you wish to "
9516
"override\n"
9517
"one of the values for a branch with a setting that is specific to you then "
9518
"you\n"
9519
"can do so in ``locations.conf``."
9520
msgstr ""
9521
9522
#: en/help_topics/configuration.txt:220
9523
msgid ""
9524
"General format\n"
9525
"~~~~~~~~~~~~~~"
9526
msgstr ""
9527
9528
#: en/help_topics/configuration.txt:223
9529
msgid ""
9530
"An ini file has three types of contructs: section headers, section\n"
9531
"options and comments."
9532
msgstr ""
9533
9534
#: en/help_topics/configuration.txt:226
9535
msgid ""
9536
"Comments\n"
9537
"^^^^^^^^"
9538
msgstr ""
9539
9540
#: en/help_topics/configuration.txt:229
9541
msgid ""
9542
"A comment is any line that starts with a \"#\" (sometimes called a \"hash\n"
9543
"mark\", \"pound sign\" or \"number sign\"). Comment lines are ignored by\n"
9544
"Bazaar when parsing ini files."
9545
msgstr ""
9546
9547
#: en/help_topics/configuration.txt:233
9548
msgid ""
9549
"Section headers\n"
9550
"^^^^^^^^^^^^^^^"
9551
msgstr ""
9552
9553
#: en/help_topics/configuration.txt:236
9554
msgid ""
9555
"A section header is a word enclosed in brackets that starts at the begining\n"
9556
"of a line. A typical section header looks like this::"
9557
msgstr ""
9558
9559
#: en/help_topics/configuration.txt:239
9560
msgid " [DEFAULT]"
9561
msgstr ""
9562
9563
#: en/help_topics/configuration.txt:241
9564
msgid ""
9565
"The only valid section headers for bazaar.conf currently are [DEFAULT] and\n"
9566
"[ALIASES]. Section headers are case sensitive. The default section provides "
9567
"for\n"
9568
"setting options which can be overridden with the branch config file."
9569
msgstr ""
9570
9571
#: en/help_topics/configuration.txt:245
9572
msgid ""
9573
"For ``locations.conf``, the options from the section with the\n"
9574
"longest matching section header are used to the exclusion of other\n"
9575
"potentially valid section headers. A section header uses the path for\n"
9576
"the branch as the section header. Some examples include::"
9577
msgstr ""
9578
9579
#: en/help_topics/configuration.txt:250
9580
msgid ""
9581
" [http://mybranches.isp.com/~jdoe/branchdir]\n"
9582
" [/home/jdoe/branches/]"
9583
msgstr ""
9584
9585
#: en/help_topics/configuration.txt:253
9586
msgid ""
9587
"\n"
9588
"Section options\n"
9589
"^^^^^^^^^^^^^^^"
9590
msgstr ""
9591
9592
#: en/help_topics/configuration.txt:257
9593
msgid ""
9594
"A section option resides within a section. A section option contains an\n"
9595
"option name, an equals sign and a value. For example::"
9596
msgstr ""
9597
9598
#: en/help_topics/configuration.txt:260
9599
msgid ""
9600
" email = John Doe <jdoe@isp.com>\n"
9601
" gpg_signing_key = Amy Pond <amy@example.com>"
9602
msgstr ""
9603
9604
#: en/help_topics/configuration.txt:263
9605
msgid ""
9606
"A option can reference other options by enclosing them in curly brackets::"
9607
msgstr ""
9608
9609
#: en/help_topics/configuration.txt:265
9610
msgid ""
9611
" my_branch_name = feature_x\n"
9612
" my_server = bzr+ssh://example.com\n"
9613
" push_location = {my_server}/project/{my_branch_name}"
9614
msgstr ""
9615
9616
#: en/help_topics/configuration.txt:269
9617
msgid ""
9618
"Option policies\n"
9619
"^^^^^^^^^^^^^^^"
9620
msgstr ""
9621
9622
#: en/help_topics/configuration.txt:272
9623
msgid ""
9624
"Options defined in a section affect the named directory or URL plus\n"
9625
"any locations they contain. Policies can be used to change how an\n"
9626
"option value is interpreted for contained locations. Currently\n"
9627
"there are three policies available:"
9628
msgstr ""
9629
9630
#: en/help_topics/configuration.txt:277
9631
msgid ""
9632
" none:\n"
9633
" the value is interpreted the same for contained locations. This is\n"
9634
" the default behaviour.\n"
9635
" norecurse:\n"
9636
" the value is only used for the exact location specified by the\n"
9637
" section name.\n"
9638
" appendpath:\n"
9639
" for contained locations, any additional path components are\n"
9640
" appended to the value."
9641
msgstr ""
9642
9643
#: en/help_topics/configuration.txt:287
9644
msgid ""
9645
"Policies are specified by keys with names of the form "
9646
"\"<option_name>:policy\".\n"
9647
"For example, to define the push location for a tree of branches, the\n"
9648
"following could be used::"
9649
msgstr ""
9650
9651
#: en/help_topics/configuration.txt:291
9652
msgid ""
9653
" [/top/location]\n"
9654
" push_location = sftp://example.com/location\n"
9655
" push_location:policy = appendpath"
9656
msgstr ""
9657
9658
#: en/help_topics/configuration.txt:295
9659
msgid ""
9660
"With this configuration, the push location for ``/top/location/branch1``\n"
9661
"would be ``sftp://example.com/location/branch1``."
9662
msgstr ""
9663
9664
#: en/help_topics/configuration.txt:298
9665
msgid ""
9666
"Section local options\n"
9667
"^^^^^^^^^^^^^^^^^^^^^"
9668
msgstr ""
9669
9670
#: en/help_topics/configuration.txt:301
9671
msgid ""
9672
"Some options are defined automatically inside a given section and can be\n"
9673
"refered to in this section only. "
9674
msgstr ""
9675
9676
#: en/help_topics/configuration.txt:304
9677
msgid "For example, the ``appendpath`` policy can be used like this::"
9678
msgstr ""
9679
9680
#: en/help_topics/configuration.txt:306
9681
msgid ""
9682
" [/home/vila/src/bzr/bugs]\n"
9683
" mypush = lp:~vila/bzr\n"
9684
" mypush:policy=appendpath"
9685
msgstr ""
9686
9687
#: en/help_topics/configuration.txt:310
9688
msgid "Using ``relpath`` to achieve the same result is done like this::"
9689
msgstr ""
9690
9691
#: en/help_topics/configuration.txt:312
9692
msgid ""
9693
" [/home/vila/src/bzr/bugs]\n"
9694
" mypush = lp:~vila/bzr/{relpath}"
9695
msgstr ""
9696
9697
#: en/help_topics/configuration.txt:315
9698
msgid ""
9699
"In both cases, when used in a directory like\n"
9700
"``/home/vila/src/bzr/bugs/832013-expand-in-stack`` we'll get::"
9701
msgstr ""
9702
9703
#: en/help_topics/configuration.txt:318 en/help_topics/configuration.txt:329
9704
msgid ""
9705
" $ bzr config mypush\n"
9706
" lp:~vila/bzr/832013-expand-in-stack"
9707
msgstr ""
9708
9709
#: en/help_topics/configuration.txt:321
9710
msgid "Another such option is ``basename`` which can be used like this::"
9711
msgstr ""
9712
9713
#: en/help_topics/configuration.txt:323
9714
msgid ""
9715
" [/home/vila/src/bzr]\n"
9716
" mypush = lp:~vila/bzr/{basename}"
9717
msgstr ""
9718
9719
#: en/help_topics/configuration.txt:326
9720
msgid ""
9721
"When used in a directory like\n"
9722
"``/home/vila/src/bzr/bugs/832013-expand-in-stack`` we'll get::"
9723
msgstr ""
9724
9725
#: en/help_topics/configuration.txt:332
9726
msgid ""
9727
"Note that ``basename`` here refers to the base name of ``relpath`` which\n"
9728
"itself is defined as the relative path between the section name and the\n"
9729
"location it matches."
9730
msgstr ""
9731
9732
#: en/help_topics/configuration.txt:336
9733
msgid ""
9734
"When an option is local to a Section, it cannot be referred to from option\n"
9735
"values in any other section from the same ``Store`` nor from any other\n"
9736
"``Store``."
9737
msgstr ""
9738
9739
#: en/help_topics/configuration.txt:340
9740
msgid ""
9741
"\n"
9742
"The main configuration file, bazaar.conf\n"
9743
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
9744
msgstr ""
9745
9746
#: en/help_topics/configuration.txt:344
9747
msgid ""
9748
"``bazaar.conf`` allows two sections: ``[DEFAULT]`` and ``[ALIASES]``.\n"
9749
"The default section contains the default\n"
9750
"configuration options for all branches. The default section can be\n"
9751
"overriden by providing a branch-specific section in ``locations.conf``."
9752
msgstr ""
9753
9754
#: en/help_topics/configuration.txt:349
9755
msgid "A typical ``bazaar.conf`` section often looks like the following::"
9756
msgstr ""
9757
9758
#: en/help_topics/configuration.txt:351
9759
msgid ""
9760
" [DEFAULT]\n"
9761
" email = John Doe <jdoe@isp.com>\n"
9762
" editor = /usr/bin/vim\n"
9763
" create_signatures = when-required"
9764
msgstr ""
9765
9766
#: en/help_topics/configuration.txt:356
9767
msgid ""
9768
"\n"
9769
"The branch location configuration file, locations.conf\n"
9770
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
9771
msgstr ""
9772
9773
#: en/help_topics/configuration.txt:360
9774
msgid ""
9775
"``locations.conf`` allows one to specify overriding settings for\n"
9776
"a specific branch. The format is almost identical to the default section in\n"
9777
"bazaar.conf with one significant change: The section header, instead of "
9778
"saying\n"
9779
"default, will be the path to a branch that you wish to override a value\n"
9780
"for. The '?' and '*' wildcards are supported::"
9781
msgstr ""
9782
9783
#: en/help_topics/configuration.txt:366
9784
msgid ""
9785
" [/home/jdoe/branches/nethack]\n"
9786
" email = Nethack Admin <nethack@nethack.com>"
9787
msgstr ""
9788
9789
#: en/help_topics/configuration.txt:369
9790
msgid ""
9791
" [http://hypothetical.site.com/branches/devel-branch]\n"
9792
" create_signatures = always"
9793
msgstr ""
9794
9795
#: en/help_topics/configuration.txt:372
9796
msgid ""
9797
"The authentication configuration file, authentication.conf\n"
9798
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
9799
msgstr ""
9800
9801
#: en/help_topics/configuration.txt:375
9802
msgid ""
9803
"``authentication.conf`` allows one to specify credentials for\n"
9804
"remote servers. This can be used for all the supported transports and any "
9805
"part\n"
9806
"of bzr that requires authentication (smtp for example)."
9807
msgstr ""
9808
9809
#: en/help_topics/configuration.txt:379
9810
msgid ""
9811
"The syntax of the file obeys the same rules as the others except for the\n"
9812
"option policies which don't apply."
9813
msgstr ""
9814
9815
#: en/help_topics/configuration.txt:382
9816
msgid ""
9817
"For more information on the possible uses of the authentication "
9818
"configuration\n"
9819
"file see :doc:`authentication-help`."
9820
msgstr ""
9821
9822
#: en/help_topics/configuration.txt:385
9823
msgid ""
9824
"\n"
9825
"Common options\n"
9826
"--------------"
9827
msgstr ""
9828
9829
#: en/help_topics/configuration.txt:389
9830
msgid ""
9831
"debug_flags\n"
9832
"~~~~~~~~~~~"
9833
msgstr ""
9834
9835
#: en/help_topics/configuration.txt:392
9836
msgid ""
9837
"A comma-separated list of debugging options to turn on. The same values\n"
9838
"can be used as with the -D command-line option (see `help global-options`).\n"
9839
"For example::"
9840
msgstr ""
9841
9842
#: en/help_topics/configuration.txt:396
9843
msgid " debug_flags = hpss"
9844
msgstr ""
9845
9846
#: en/help_topics/configuration.txt:400
9847
msgid " debug_flags = hpss,evil"
9848
msgstr ""
9849
9850
#: en/help_topics/configuration.txt:402
9851
msgid ""
9852
"email\n"
9853
"~~~~~"
9854
msgstr ""
9855
9856
#: en/help_topics/configuration.txt:405
9857
msgid ""
9858
"The email address to use when committing a branch. Typically takes the form\n"
9859
"of::"
9860
msgstr ""
9861
9862
#: en/help_topics/configuration.txt:408
9863
msgid " email = Full Name <account@hostname.tld>"
9864
msgstr ""
9865
9866
#: en/help_topics/configuration.txt:410
9867
msgid ""
9868
"editor\n"
9869
"~~~~~~"
9870
msgstr ""
9871
9872
#: en/help_topics/configuration.txt:413
9873
msgid ""
9874
"The path of the editor that you wish to use if *bzr commit* is run without\n"
9875
"a commit message. This setting is trumped by the environment variable\n"
9876
"``BZR_EDITOR``, and overrides the ``VISUAL`` and ``EDITOR`` environment\n"
9877
"variables."
9878
msgstr ""
9879
9880
#: en/help_topics/configuration.txt:418
9881
msgid ""
9882
"log_format\n"
9883
"~~~~~~~~~~"
9884
msgstr ""
9885
9886
#: en/help_topics/configuration.txt:421
9887
msgid ""
9888
"The default log format to use. Standard log formats are ``long``, ``short``\n"
9889
"and ``line``. Additional formats may be provided by plugins. The default\n"
9890
"value is ``long``."
9891
msgstr ""
9892
9893
#: en/help_topics/configuration.txt:425
9894
msgid ""
9895
"check_signatures\n"
9896
"~~~~~~~~~~~~~~~~"
9897
msgstr ""
9898
9899
#: en/help_topics/configuration.txt:428
9900
msgid ""
9901
"Reserved for future use. These options will allow a policy for branches to\n"
9902
"require signatures."
9903
msgstr ""
9904
9905
#: en/help_topics/configuration.txt:431
9906
msgid ""
9907
"require\n"
9908
" The gnupg signature for revisions must be present and must be valid."
9909
msgstr ""
9910
9911
#: en/help_topics/configuration.txt:434
9912
msgid ""
9913
"ignore\n"
9914
" Do not check gnupg signatures of revisions."
9915
msgstr ""
9916
9917
#: en/help_topics/configuration.txt:437
9918
msgid ""
9919
"check-available\n"
9920
" (default) If gnupg signatures for revisions are present, check them.\n"
9921
" Bazaar will fail if it finds a bad signature, but will not fail if\n"
9922
" no signature is present."
9923
msgstr ""
9924
9925
#: en/help_topics/configuration.txt:442
9926
msgid ""
9927
"create_signatures\n"
9928
"~~~~~~~~~~~~~~~~~"
9929
msgstr ""
9930
9931
#: en/help_topics/configuration.txt:445
9932
msgid ""
9933
"Defines the behaviour of signing revisions on commits. By default bzr will "
9934
"not\n"
9935
"sign new commits."
9936
msgstr ""
9937
9938
#: en/help_topics/configuration.txt:448
9939
msgid ""
9940
"always\n"
9941
" Sign every new revision that is committed. If the signing fails then "
9942
"the\n"
9943
" commit will not be made."
9944
msgstr ""
9945
9946
#: en/help_topics/configuration.txt:452
9947
msgid ""
9948
"when-required\n"
9949
" Reserved for future use."
9950
msgstr ""
9951
9952
#: en/help_topics/configuration.txt:455
9953
msgid ""
9954
"never\n"
9955
" Reserved for future use."
9956
msgstr ""
9957
9958
#: en/help_topics/configuration.txt:458
9959
msgid ""
9960
"In future it is planned that ``when-required`` will sign newly\n"
9961
"committed revisions only when the branch requires them. ``never`` will "
9962
"refuse\n"
9963
"to sign newly committed revisions, even if the branch requires signatures."
9964
msgstr ""
9965
9966
#: en/help_topics/configuration.txt:462
9967
msgid ""
9968
"dirstate.fdatasync\n"
9969
"~~~~~~~~~~~~~~~~~~"
9970
msgstr ""
9971
9972
#: en/help_topics/configuration.txt:465
9973
msgid ""
9974
"If true (default), working tree metadata changes are flushed through the\n"
9975
"OS buffers to physical disk. This is somewhat slower, but means data\n"
9976
"should not be lost if the machine crashes. See also repository.fdatasync."
9977
msgstr ""
9978
9979
#: en/help_topics/configuration.txt:469
9980
msgid ""
9981
"gpg_signing_key\n"
9982
"~~~~~~~~~~~~~~~"
9983
msgstr ""
9984
9985
#: en/help_topics/configuration.txt:472
9986
msgid ""
9987
"The GnuPG user identity to use when signing commits. Can be an e-mail\n"
9988
"address, key fingerprint or full key ID. When unset or when set to\n"
9989
"\"default\" Bazaar will use the user e-mail set with ``whoami``."
9990
msgstr ""
9991
9992
#: en/help_topics/configuration.txt:476
9993
msgid ""
9994
"recurse\n"
9995
"~~~~~~~"
9996
msgstr ""
9997
9998
#: en/help_topics/configuration.txt:479
9999
msgid ""
10000
"Only useful in ``locations.conf``. Defines whether or not the\n"
10001
"configuration for this section applies to subdirectories:"
10002
msgstr ""
10003
10004
#: en/help_topics/configuration.txt:482
10005
msgid ""
10006
"true\n"
10007
" (default) This section applies to subdirectories as well."
10008
msgstr ""
10009
10010
#: en/help_topics/configuration.txt:485
10011
msgid ""
10012
"false\n"
10013
" This section only applies to the branch at this directory and not\n"
10014
" branches below it."
10015
msgstr ""
10016
10017
#: en/help_topics/configuration.txt:489
10018
msgid ""
10019
"gpg_signing_command\n"
10020
"~~~~~~~~~~~~~~~~~~~"
10021
msgstr ""
10022
10023
#: en/help_topics/configuration.txt:492
10024
msgid ""
10025
"(Default: \"gpg\"). Which program should be used to sign and check "
10026
"revisions.\n"
10027
"For example::"
10028
msgstr ""
10029
10030
#: en/help_topics/configuration.txt:495
10031
msgid " gpg_signing_command = /usr/bin/gnpg"
10032
msgstr ""
10033
10034
#: en/help_topics/configuration.txt:497
10035
msgid ""
10036
"The specified command must accept the options \"--clearsign\" and \"-u "
10037
"<email>\"."
10038
msgstr ""
10039
10040
#: en/help_topics/configuration.txt:499
10041
msgid ""
10042
"bzr_remote_path\n"
10043
"~~~~~~~~~~~~~~~"
10044
msgstr ""
10045
10046
#: en/help_topics/configuration.txt:502
10047
msgid ""
10048
"(Default: \"bzr\"). The path to the command that should be used to run the "
10049
"smart\n"
10050
"server for bzr. This value may only be specified in locations.conf, because:"
10051
msgstr ""
10052
10053
#: en/help_topics/configuration.txt:505
10054
msgid ""
10055
"- it's needed before branch.conf is accessible\n"
10056
"- allowing remote branch.conf files to specify commands would be a security\n"
10057
" risk"
10058
msgstr ""
10059
10060
#: en/help_topics/configuration.txt:509
10061
msgid "It is overridden by the BZR_REMOTE_PATH environment variable."
10062
msgstr ""
10063
10064
#: en/help_topics/configuration.txt:511
10065
msgid ""
10066
"smtp_server\n"
10067
"~~~~~~~~~~~"
10068
msgstr ""
10069
10070
#: en/help_topics/configuration.txt:514
10071
msgid ""
10072
"(Default: \"localhost\"). SMTP server to use when Bazaar needs to send\n"
10073
"email, eg. with ``merge-directive --mail-to``, or the bzr-email plugin."
10074
msgstr ""
10075
10076
#: en/help_topics/configuration.txt:517
10077
msgid ""
10078
"smtp_username, smtp_password\n"
10079
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
10080
msgstr ""
10081
10082
#: en/help_topics/configuration.txt:520
10083
msgid ""
10084
"User and password to authenticate to the SMTP server. If smtp_username\n"
10085
"is set, and smtp_password is not, Bazaar will prompt for a password.\n"
10086
"These settings are only needed if the SMTP server requires authentication\n"
10087
"to send mail."
10088
msgstr ""
10089
10090
#: en/help_topics/configuration.txt:525
10091
msgid ""
10092
"locks.steal_dead\n"
10093
"~~~~~~~~~~~~~~~~"
10094
msgstr ""
10095
10096
#: en/help_topics/configuration.txt:528
10097
msgid ""
10098
"If set to true, bzr will automatically break locks held by processes from\n"
10099
"the same machine and user that are no longer alive. Otherwise, it will\n"
10100
"print a message and you can break the lock manually, if you are satisfied\n"
10101
"the object is no longer in use."
10102
msgstr ""
10103
10104
#: en/help_topics/configuration.txt:533
10105
msgid ""
10106
"mail_client\n"
10107
"~~~~~~~~~~~"
10108
msgstr ""
10109
10110
#: en/help_topics/configuration.txt:536
10111
msgid ""
10112
"A mail client to use for sending merge requests.\n"
10113
"By default, bzr will try to use ``mapi`` on Windows. On other platforms, "
10114
"it\n"
10115
"will try ``xdg-email``. If either of these fails, it will fall back to\n"
10116
"``editor``."
10117
msgstr ""
10118
10119
#: en/help_topics/configuration.txt:541
10120
msgid "Supported values for specific clients:"
10121
msgstr ""
10122
10123
#: en/help_topics/configuration.txt:543
10124
msgid ""
10125
":claws: Use Claws. This skips a dialog for attaching files.\n"
10126
":evolution: Use Evolution.\n"
10127
":kmail: Use KMail.\n"
10128
":mutt: Use Mutt.\n"
10129
":thunderbird: Use Mozilla Thunderbird or Icedove. For Thunderbird/Icedove "
10130
"1.5,\n"
10131
" this works around some bugs that xdg-email doesn't handle."
10132
msgstr ""
10133
10134
#: en/help_topics/configuration.txt:550
10135
msgid "Supported generic values are:"
10136
msgstr ""
10137
10138
#: en/help_topics/configuration.txt:552
10139
msgid ""
10140
":default: See above.\n"
10141
":editor: Use your editor to compose the merge request. This also uses\n"
10142
" your commit id, (see ``bzr whoami``), smtp_server and (optionally)\n"
10143
" smtp_username and smtp_password.\n"
10144
":mapi: Use your preferred e-mail client on Windows.\n"
10145
":xdg-email: Use xdg-email to run your preferred mail program"
10146
msgstr ""
10147
10148
#: en/help_topics/configuration.txt:559
10149
msgid ""
10150
"repository.fdatasync\n"
10151
"~~~~~~~~~~~~~~~~~~~~"
10152
msgstr ""
10153
10154
#: en/help_topics/configuration.txt:562
10155
msgid ""
10156
"If true (default), repository changes are flushed through the OS buffers\n"
10157
"to physical disk. This is somewhat slower, but means data should not be\n"
10158
"lost if the machine crashes. See also dirstate.fdatasync."
10159
msgstr ""
10160
10161
#: en/help_topics/configuration.txt:566
10162
msgid ""
10163
"submit_branch\n"
10164
"~~~~~~~~~~~~~"
10165
msgstr ""
10166
10167
#: en/help_topics/configuration.txt:569
10168
msgid ""
10169
"The branch you intend to submit your current work to. This is "
10170
"automatically\n"
10171
"set by ``bzr send``, and is also used by the ``submit:`` revision spec. "
10172
"This\n"
10173
"should usually be set on a per-branch or per-location basis."
10174
msgstr ""
10175
10176
#: en/help_topics/configuration.txt:573
10177
msgid ""
10178
"public_branch\n"
10179
"~~~~~~~~~~~~~"
10180
msgstr ""
10181
10182
#: en/help_topics/configuration.txt:576
10183
msgid ""
10184
"A publically-accessible version of this branch (implying that this version "
10185
"is\n"
10186
"not publically-accessible). Used (and set) by ``bzr send``."
10187
msgstr ""
10188
10189
#: en/help_topics/configuration.txt:579
10190
msgid ""
10191
"suppress_warnings\n"
10192
"~~~~~~~~~~~~~~~~~"
10193
msgstr ""
10194
10195
#: en/help_topics/configuration.txt:582
10196
msgid ""
10197
"A list of strings, each string represent a warning that can be emitted by\n"
10198
"bzr. Mentioning a warning in this list tells bzr to not emit it."
10199
msgstr ""
10200
10201
#: en/help_topics/configuration.txt:585
10202
msgid "Valid values:"
10203
msgstr ""
10204
10205
#: en/help_topics/configuration.txt:587
10206
msgid ""
10207
"* ``format_deprecation``:\n"
10208
" whether the format deprecation warning is shown on repositories that "
10209
"are\n"
10210
" using deprecated formats."
10211
msgstr ""
10212
10213
#: en/help_topics/configuration.txt:591
10214
msgid ""
10215
"default_format\n"
10216
"~~~~~~~~~~~~~~"
10217
msgstr ""
10218
10219
#: en/help_topics/configuration.txt:594
10220
msgid ""
10221
"A format name for the default format used when creating branches. See "
10222
"``bzr\n"
10223
"help formats`` for possible values."
10224
msgstr ""
10225
10226
#: en/help_topics/configuration.txt:597
10227
msgid ""
10228
"\n"
10229
"Unicode options\n"
10230
"---------------"
10231
msgstr ""
10232
10233
#: en/help_topics/configuration.txt:601
10234
msgid ""
10235
"output_encoding\n"
10236
"~~~~~~~~~~~~~~~"
10237
msgstr ""
10238
10239
#: en/help_topics/configuration.txt:604
10240
msgid ""
10241
"A Python unicode encoding name for text output from bzr, such as log\n"
10242
"information. Values include: utf8, cp850, ascii, iso-8859-1. The default\n"
10243
"is the terminal encoding prefered by the operating system."
10244
msgstr ""
10245
10246
#: en/help_topics/configuration.txt:608
10247
msgid ""
10248
"\n"
10249
"Branch type specific options\n"
10250
"----------------------------"
10251
msgstr ""
10252
10253
#: en/help_topics/configuration.txt:612
10254
msgid ""
10255
"These options apply only to branches that use the ``dirstate-tags`` or\n"
10256
"later format. They\n"
10257
"are usually set in ``.bzr/branch/branch.conf`` automatically, but may be\n"
10258
"manually set in ``locations.conf`` or ``bazaar.conf``."
10259
msgstr ""
10260
10261
#: en/help_topics/configuration.txt:617
10262
msgid ""
10263
"append_revisions_only\n"
10264
"~~~~~~~~~~~~~~~~~~~~~"
10265
msgstr ""
10266
10267
#: en/help_topics/configuration.txt:620
10268
msgid ""
10269
"If set to \"True\" then revisions can only be appended to the log, not\n"
10270
"removed. A branch with this setting enabled can only pull from another\n"
10271
"branch if the other branch's log is a longer version of its own. This is\n"
10272
"normally set by ``bzr init --append-revisions-only``. If you set it\n"
10273
"manually, use either 'True' or 'False' (case-sensitive) to maintain\n"
10274
"compatibility with previous bzr versions (older than 2.2)."
10275
msgstr ""
10276
10277
#: en/help_topics/configuration.txt:627
10278
msgid ""
10279
"parent_location\n"
10280
"~~~~~~~~~~~~~~~"
10281
msgstr ""
10282
10283
#: en/help_topics/configuration.txt:630
10284
msgid ""
10285
"If present, the location of the default branch for pull or merge. This "
10286
"option\n"
10287
"is normally set when creating a branch, the first ``pull`` or by ``pull\n"
10288
"--remember``."
10289
msgstr ""
10290
10291
#: en/help_topics/configuration.txt:634
10292
msgid ""
10293
"push_location\n"
10294
"~~~~~~~~~~~~~"
10295
msgstr ""
10296
10297
#: en/help_topics/configuration.txt:637
10298
msgid ""
10299
"If present, the location of the default branch for push. This option\n"
10300
"is normally set by the first ``push`` or ``push --remember``."
10301
msgstr ""
10302
10303
#: en/help_topics/configuration.txt:640
10304
msgid ""
10305
"push_strict\n"
10306
"~~~~~~~~~~~"
10307
msgstr ""
10308
10309
#: en/help_topics/configuration.txt:643
10310
msgid ""
10311
"If present, defines the ``--strict`` option default value for checking\n"
10312
"uncommitted changes before pushing."
10313
msgstr ""
10314
10315
#: en/help_topics/configuration.txt:646
10316
msgid ""
10317
"dpush_strict\n"
10318
"~~~~~~~~~~~~"
10319
msgstr ""
10320
10321
#: en/help_topics/configuration.txt:649
10322
msgid ""
10323
"If present, defines the ``--strict`` option default value for checking\n"
10324
"uncommitted changes before pushing into a different VCS without any\n"
10325
"custom bzr metadata."
10326
msgstr ""
10327
10328
#: en/help_topics/configuration.txt:653
10329
msgid ""
10330
"bound_location\n"
10331
"~~~~~~~~~~~~~~"
10332
msgstr ""
10333
10334
#: en/help_topics/configuration.txt:656
10335
msgid ""
10336
"The location that commits should go to when acting as a checkout.\n"
10337
"This option is normally set by ``bind``."
10338
msgstr ""
10339
10340
#: en/help_topics/configuration.txt:659
10341
msgid ""
10342
"bound\n"
10343
"~~~~~"
10344
msgstr ""
10345
10346
#: en/help_topics/configuration.txt:662
10347
msgid ""
10348
"If set to \"True\", the branch should act as a checkout, and push each "
10349
"commit to\n"
10350
"the bound_location. This option is normally set by ``bind``/``unbind``."
10351
msgstr ""
10352
10353
#: en/help_topics/configuration.txt:665
10354
msgid ""
10355
"send_strict\n"
10356
"~~~~~~~~~~~"
10357
msgstr ""
10358
10359
#: en/help_topics/configuration.txt:668
10360
msgid ""
10361
"If present, defines the ``--strict`` option default value for checking\n"
10362
"uncommitted changes before sending a merge directive."
10363
msgstr ""
10364
10365
#: en/help_topics/configuration.txt:671
10366
msgid ""
10367
"add.maximum_file_size\n"
10368
"~~~~~~~~~~~~~~~~~~~~~"
10369
msgstr ""
10370
10371
#: en/help_topics/configuration.txt:674
10372
msgid ""
10373
"Defines the maximum file size the command line \"add\" operation will allow\n"
10374
"in recursive mode, with files larger than this value being skipped. You may "
10375
"\n"
10376
"specify this value as an integer (in which case it is interpreted as bytes), "
10377
"\n"
10378
"or you may specify the value using SI units, i.e. 10KB, 20MB, 1G. A value of "
10379
"0 \n"
10380
"will disable skipping."
10381
msgstr ""
10382
10383
#: en/help_topics/configuration.txt:680
10384
msgid ""
10385
"External Merge Tools\n"
10386
"--------------------"
10387
msgstr ""
10388
10389
#: en/help_topics/configuration.txt:683
10390
msgid ""
10391
"bzr.mergetool.<name>\n"
10392
"~~~~~~~~~~~~~~~~~~~~"
10393
msgstr ""
10394
10395
#: en/help_topics/configuration.txt:686
10396
msgid ""
10397
"Defines an external merge tool called <name> with the given command-line.\n"
10398
"Arguments containing spaces should be quoted using single or double quotes. "
10399
"The\n"
10400
"executable may omit its path if it can be found on the PATH."
10401
msgstr ""
10402
10403
#: en/help_topics/configuration.txt:690
10404
msgid ""
10405
"The following markers can be used in the command-line to substitute "
10406
"filenames\n"
10407
"involved in the merge conflict::"
10408
msgstr ""
10409
10410
#: en/help_topics/configuration.txt:693
10411
msgid ""
10412
" {base} file.BASE\n"
10413
" {this} file.THIS\n"
10414
" {other} file.OTHER\n"
10415
" {result} output file\n"
10416
" {this_temp} temp copy of file.THIS, used to overwrite output file if "
10417
"merge\n"
10418
" succeeds."
10419
msgstr ""
10420
10421
#: en/help_topics/configuration.txt:702
10422
msgid " bzr.mergetool.kdiff3 = kdiff3 {base} {this} {other} -o {result}"
10423
msgstr ""
10424
10425
#: en/help_topics/configuration.txt:704
10426
msgid ""
10427
"bzr.default_mergetool\n"
10428
"~~~~~~~~~~~~~~~~~~~~~"
10429
msgstr ""
10430
10431
#: en/help_topics/configuration.txt:707
10432
msgid ""
10433
"Specifies which external merge tool (as defined above) should be selected "
10434
"by\n"
10435
"default in tools such as ``bzr qconflicts``."
10436
msgstr ""
10437
10438
#: en/help_topics/configuration.txt:712
10439
msgid " bzr.default_mergetool = kdiff3\n"
10440
msgstr ""
10441
10442
#: en/help_topics/conflict-types.txt:1
10443
msgid ""
10444
"Conflict Types\n"
10445
"=============="
10446
msgstr ""
10447
10448
#: en/help_topics/conflict-types.txt:4
10449
msgid ""
10450
"Some operations, like merge, revert and pull, modify the contents of your\n"
10451
"working tree. These modifications are programmatically generated, and so "
10452
"they\n"
10453
"may conflict with the current state of your working tree. "
10454
msgstr ""
10455
10456
#: en/help_topics/conflict-types.txt:8
10457
msgid ""
10458
"When conflicts are present in your working tree (as shown by ``bzr\n"
10459
"conflicts``), you should resolve them and then inform bzr that the "
10460
"conflicts\n"
10461
"have been resolved."
10462
msgstr ""
10463
10464
#: en/help_topics/conflict-types.txt:12
10465
msgid ""
10466
"Resolving conflicts is sometimes not obvious. Either because the user that\n"
10467
"should resolve them is not the one responsible for their occurrence, as is "
10468
"the\n"
10469
"case when merging other people's work or because some conflicts are "
10470
"presented\n"
10471
"in a way that is not easy to understand."
10472
msgstr ""
10473
10474
#: en/help_topics/conflict-types.txt:17
10475
msgid ""
10476
"Bazaar tries to avoid conflicts ; its aim is to ask you to resolve the\n"
10477
"conflict if and only if there's an actual conceptual conflict in the source\n"
10478
"tree. Because Bazaar doesn't understand the real meaning of the files "
10479
"being\n"
10480
"versioned, it can, when faced with ambiguities, fall short in either "
10481
"direction\n"
10482
"trying to resolve the conflict itself. Many kinds of changes can be "
10483
"combined\n"
10484
"programmatically, but sometimes only a human can determine the right thing "
10485
"to\n"
10486
"do."
10487
msgstr ""
10488
10489
#: en/help_topics/conflict-types.txt:25
10490
msgid ""
10491
"When Bazaar generates a conflict, it adds information into the working tree "
10492
"to\n"
10493
"present the conflicting versions, and it's up to you to find the correct\n"
10494
"resolution."
10495
msgstr ""
10496
10497
#: en/help_topics/conflict-types.txt:29
10498
msgid "Whatever the conflict is, resolving it is roughly done in two steps:"
10499
msgstr ""
10500
10501
#: en/help_topics/conflict-types.txt:31
10502
msgid ""
10503
"1. Modify the working tree content so that the conflicted item is now in "
10504
"the\n"
10505
" state you want to keep, then"
10506
msgstr ""
10507
10508
#: en/help_topics/conflict-types.txt:34
10509
msgid ""
10510
"2. Inform Bazaar that the conflict is now solved and ask to cleanup any\n"
10511
" remaining generated information (``bzr resolve <item>``)."
10512
msgstr ""
10513
10514
#: en/help_topics/conflict-types.txt:37
10515
msgid ""
10516
"For most conflict types, there are some obvious ways to modify the working\n"
10517
"tree and put it into the desired state. For some types of conflicts, Bazaar\n"
10518
"itself already made a choice, when possible."
10519
msgstr ""
10520
10521
#: en/help_topics/conflict-types.txt:41
10522
msgid ""
10523
"Yet, whether Bazaar makes a choice or not, there are some other simple but\n"
10524
"different ways to resolve the conflict."
10525
msgstr ""
10526
10527
#: en/help_topics/conflict-types.txt:44
10528
msgid ""
10529
"Each type of conflict is explained below, and the action which must be done "
10530
"to\n"
10531
"resolve the conflict is outlined."
10532
msgstr ""
10533
10534
#: en/help_topics/conflict-types.txt:47
10535
msgid ""
10536
"Various actions are available depending on the kind of conflict, for some "
10537
"of\n"
10538
"these actions, Bazaar can provide some help. In the end you should at least\n"
10539
"inform Bazaar that you're done with the conflict with::"
10540
msgstr ""
10541
10542
#: en/help_topics/conflict-types.txt:51
10543
msgid " ``bzr resolve FILE --action=done'"
10544
msgstr ""
10545
10546
#: en/help_topics/conflict-types.txt:53
10547
msgid ""
10548
"Note that this is the default action when a single file is involved so you "
10549
"can\n"
10550
"simply use::"
10551
msgstr ""
10552
10553
#: en/help_topics/conflict-types.txt:56
10554
msgid " ``bzr resolve FILE``"
10555
msgstr ""
10556
10557
#: en/help_topics/conflict-types.txt:58
10558
msgid "See ``bzr help resolve`` for more details."
10559
msgstr ""
10560
10561
#: en/help_topics/conflict-types.txt:60
10562
msgid ""
10563
"Text conflicts\n"
10564
"--------------"
10565
msgstr ""
10566
10567
#: en/help_topics/conflict-types.txt:63 en/help_topics/conflict-types.txt:120
10568
#: en/help_topics/conflict-types.txt:151 en/help_topics/conflict-types.txt:175
10569
#: en/help_topics/conflict-types.txt:198 en/help_topics/conflict-types.txt:213
10570
#: en/help_topics/conflict-types.txt:239 en/help_topics/conflict-types.txt:281
10571
#: en/help_topics/conflict-types.txt:303 en/help_topics/conflict-types.txt:339
10572
msgid "Typical message::"
10573
msgstr ""
10574
10575
#: en/help_topics/conflict-types.txt:65
10576
msgid " Text conflict in FILE"
10577
msgstr ""
10578
10579
#: en/help_topics/conflict-types.txt:67
10580
msgid ""
10581
"These are produced when a text merge cannot completely reconcile two sets "
10582
"of\n"
10583
"text changes. Bazaar will emit files for each version with the extensions\n"
10584
"THIS, OTHER, and BASE. THIS is the version of the file from the target "
10585
"tree,\n"
10586
"i.e. the tree that you are merging changes into. OTHER is the version that "
10587
"you\n"
10588
"are merging into the target. BASE is an older version that is used as a "
10589
"basis\n"
10590
"for comparison."
10591
msgstr ""
10592
10593
#: en/help_topics/conflict-types.txt:74
10594
msgid ""
10595
"In the main copy of the file, Bazaar will include all the changes that it\n"
10596
"could reconcile, and any un-reconciled conflicts are surrounded by\n"
10597
"\"herringbone\" markers like ``<<<<<<<``."
10598
msgstr ""
10599
10600
#: en/help_topics/conflict-types.txt:78
10601
msgid ""
10602
"Say the initial text is \"The project leader released it.\", and THIS "
10603
"modifies it\n"
10604
"to \"Martin Pool released it.\", while OTHER modifies it to \"The project "
10605
"leader\n"
10606
"released Bazaar.\" A conflict would look like this::"
10607
msgstr ""
10608
10609
#: en/help_topics/conflict-types.txt:82
10610
msgid ""
10611
" <<<<<<< TREE\n"
10612
" Martin Pool released it.\n"
10613
" =======\n"
10614
" The project leader released Bazaar.\n"
10615
" >>>>>>> MERGE-SOURCE"
10616
msgstr ""
10617
10618
#: en/help_topics/conflict-types.txt:88
10619
msgid "The correct resolution would be \"Martin Pool released Bazaar.\""
10620
msgstr ""
10621
10622
#: en/help_topics/conflict-types.txt:90
10623
msgid ""
10624
"You can handle text conflicts either by editing the main copy of the file,\n"
10625
"or by invoking external tools on the THIS, OTHER and BASE versions. It's\n"
10626
"worth mentioning that resolving text conflicts rarely involves picking one\n"
10627
"set of changes over the other (but see below when you encounter these\n"
10628
"cases). More often, the two sets of changes must be intelligently combined."
10629
msgstr ""
10630
10631
#: en/help_topics/conflict-types.txt:96
10632
msgid ""
10633
"If you edit the main copy, be sure to remove the herringbone markers. When\n"
10634
"you are done editing, the file should look like it never had a conflict, and "
10635
"be\n"
10636
"ready to commit."
10637
msgstr ""
10638
10639
#: en/help_topics/conflict-types.txt:100
10640
msgid ""
10641
"When you have resolved text conflicts, just run ``bzr resolve --auto``, and\n"
10642
"Bazaar will auto-detect which conflicts you have resolved."
10643
msgstr ""
10644
10645
#: en/help_topics/conflict-types.txt:103
10646
msgid ""
10647
"When the conflict is resolved, Bazaar deletes the previously generated\n"
10648
"``.BASE``, ``.THIS`` and ``.OTHER`` files if they are still present in the\n"
10649
"working tree."
10650
msgstr ""
10651
10652
#: en/help_topics/conflict-types.txt:107
10653
msgid ""
10654
"\n"
10655
"When you want to pick one set of changes over the other, you can use ``bzr\n"
10656
"resolve`` with one of the following actions:"
10657
msgstr ""
10658
10659
#: en/help_topics/conflict-types.txt:111
10660
msgid ""
10661
"* ``--action=take-this`` will issue ``mv FILE.THIS FILE``,\n"
10662
"* ``--action=take-other`` will issue ``mv FILE.OTHER FILE``."
10663
msgstr ""
10664
10665
#: en/help_topics/conflict-types.txt:114
10666
msgid ""
10667
"Note that if you have modified ``FILE.THIS`` or ``FILE.OTHER``, these\n"
10668
"modifications will be taken into account."
10669
msgstr ""
10670
10671
#: en/help_topics/conflict-types.txt:117
10672
msgid ""
10673
"Content conflicts\n"
10674
"-----------------"
10675
msgstr ""
10676
10677
#: en/help_topics/conflict-types.txt:122
10678
msgid " Contents conflict in FILE"
10679
msgstr ""
10680
10681
#: en/help_topics/conflict-types.txt:124
10682
msgid ""
10683
"This conflict happens when there are conflicting changes in the working "
10684
"tree\n"
10685
"and the merge source, but the conflicted items are not text files. They "
10686
"may\n"
10687
"be binary files, or symlinks, or directories. It can even happen with "
10688
"files\n"
10689
"that are deleted on one side, and modified on the other."
10690
msgstr ""
10691
10692
#: en/help_topics/conflict-types.txt:129
10693
msgid ""
10694
"Like text conflicts, Bazaar will emit THIS, OTHER and BASE files. (They may "
10695
"be\n"
10696
"regular files, symlinks or directories). But it will not include a \"main "
10697
"copy\"\n"
10698
"of the file with herringbone conflict markers. It will appear that the "
10699
"\"main\n"
10700
"copy\" has been renamed to THIS or OTHER."
10701
msgstr ""
10702
10703
#: en/help_topics/conflict-types.txt:134 en/help_topics/conflict-types.txt:182
10704
msgid ""
10705
"To resolve that kind of conflict, you should rebuild FILE from either "
10706
"version\n"
10707
"or a combination of both."
10708
msgstr ""
10709
10710
#: en/help_topics/conflict-types.txt:137 en/help_topics/conflict-types.txt:185
10711
#: en/help_topics/conflict-types.txt:226 en/help_topics/conflict-types.txt:252
10712
#: en/help_topics/conflict-types.txt:291 en/help_topics/conflict-types.txt:326
10713
#: en/help_topics/conflict-types.txt:361
10714
msgid "``bzr resolve`` recognizes the following actions:"
10715
msgstr ""
10716
10717
#: en/help_topics/conflict-types.txt:139
10718
msgid ""
10719
"* ``--action=take-this`` will issue ``bzr mv FILE.THIS FILE``,\n"
10720
"* ``--action=take-other`` will issue ``bzr mv FILE.OTHER FILE``,\n"
10721
"* ``--action=done`` will just mark the conflict as resolved."
10722
msgstr ""
10723
10724
#: en/help_topics/conflict-types.txt:143
10725
msgid ""
10726
"Any action will also delete the previously generated ``.BASE``, ``.THIS`` "
10727
"and\n"
10728
"``.OTHER`` files if they are still present in the working tree."
10729
msgstr ""
10730
10731
#: en/help_topics/conflict-types.txt:146 en/help_topics/conflict-types.txt:193
10732
#: en/help_topics/conflict-types.txt:234 en/help_topics/conflict-types.txt:276
10733
#: en/help_topics/conflict-types.txt:298 en/help_topics/conflict-types.txt:334
10734
#: en/help_topics/conflict-types.txt:369
10735
msgid ""
10736
"Bazaar cannot auto-detect when conflicts of this kind have been resolved."
10737
msgstr ""
10738
10739
#: en/help_topics/conflict-types.txt:148
10740
msgid ""
10741
"Tag conflicts\n"
10742
"-------------"
10743
msgstr ""
10744
10745
#: en/help_topics/conflict-types.txt:153
10746
msgid ""
10747
" Conflicting tags:\n"
10748
" version-0.1"
10749
msgstr ""
10750
10751
#: en/help_topics/conflict-types.txt:156
10752
msgid ""
10753
"When pulling from or pushing to another branch, Bazaar informs you about "
10754
"tags\n"
10755
"that conflict between the two branches; that is the same tag points to two\n"
10756
"different revisions. You need not resolve these conflicts, but subsequent\n"
10757
"uses of pull or push will result in the same message."
10758
msgstr ""
10759
10760
#: en/help_topics/conflict-types.txt:161
10761
msgid ""
10762
"To resolve the conflict, you must apply the correct tags to either the "
10763
"target\n"
10764
"branch or the source branch as appropriate. Use \"bzr tags --show-ids -d\n"
10765
"SOURCE_URL\" to see the tags in the source branch. If you want to make the\n"
10766
"target branch's tags match the source branch, then in the target branch do\n"
10767
"``bzr tag --force -r revid:REVISION_ID CONFLICTING_TAG`` for each of the\n"
10768
"CONFLICTING_TAGs, where REVISION_ID comes from the list of tags in the "
10769
"source\n"
10770
"branch. You need not call \"bzr resolve\" after doing this. To resolve in\n"
10771
"favor of the target branch, you need to similarly use ``tag --force`` in "
10772
"the\n"
10773
"source branch. (Note that pulling or pushing using --overwrite will "
10774
"overwrite\n"
10775
"all tags as well.)"
10776
msgstr ""
10777
10778
#: en/help_topics/conflict-types.txt:172
10779
msgid ""
10780
"Duplicate paths\n"
10781
"---------------"
10782
msgstr ""
10783
10784
#: en/help_topics/conflict-types.txt:177
10785
msgid " Conflict adding file FILE. Moved existing file to FILE.moved."
10786
msgstr ""
10787
10788
#: en/help_topics/conflict-types.txt:179
10789
msgid ""
10790
"Sometimes Bazaar will attempt to create a file using a pathname that has\n"
10791
"already been used. The existing file will be renamed to \"FILE.moved\". "
10792
msgstr ""
10793
10794
#: en/help_topics/conflict-types.txt:187
10795
msgid ""
10796
"* ``--action=take-this`` will issue ``bzr rm FILE ; bzr mv FILE.moved "
10797
"FILE``,\n"
10798
"* ``--action=take-other`` will issue ``bzr rm FILE.moved``,\n"
10799
"* ``--action=done`` will just mark the conflict as resolved."
10800
msgstr ""
10801
10802
#: en/help_topics/conflict-types.txt:191
10803
msgid ""
10804
"Note that you must get rid of FILE.moved before using ``--action=done``."
10805
msgstr ""
10806
10807
#: en/help_topics/conflict-types.txt:195
10808
msgid ""
10809
"Unversioned parent\n"
10810
"------------------"
10811
msgstr ""
10812
10813
#: en/help_topics/conflict-types.txt:200
10814
msgid ""
10815
" Conflict because FILE is not versioned, but has versioned children."
10816
msgstr ""
10817
10818
#: en/help_topics/conflict-types.txt:202
10819
msgid ""
10820
"Sometimes Bazaar will attempt to create a file whose parent directory is "
10821
"not\n"
10822
"versioned. This happens when the directory has been deleted in the target,\n"
10823
"but has a new child in the source, or vice versa. In this situation, "
10824
"Bazaar\n"
10825
"will version the parent directory as well. Resolving this issue depends\n"
10826
"very much on the particular scenario. You may wish to rename or delete "
10827
"either\n"
10828
"the file or the directory. When you are satisfied, you can run \"bzr "
10829
"resolve\n"
10830
"FILE\" to mark the conflict as resolved."
10831
msgstr ""
10832
10833
#: en/help_topics/conflict-types.txt:210
10834
msgid ""
10835
"Missing parent\n"
10836
"--------------"
10837
msgstr ""
10838
10839
#: en/help_topics/conflict-types.txt:215
10840
msgid " Conflict adding files to FILE. Created directory."
10841
msgstr ""
10842
10843
#: en/help_topics/conflict-types.txt:217
10844
msgid ""
10845
"This happens when a directory has been deleted in the target, but has new\n"
10846
"children in the source. This is similar to the \"unversioned parent\" "
10847
"conflict,\n"
10848
"except that the parent directory does not *exist*, instead of just being\n"
10849
"unversioned. In this situation, Bazaar will create the missing parent.\n"
10850
"Resolving this issue depends very much on the particular scenario."
10851
msgstr ""
10852
10853
#: en/help_topics/conflict-types.txt:223 en/help_topics/conflict-types.txt:249
10854
msgid ""
10855
"To resolve that kind of conflict, you should either remove or rename the\n"
10856
"children or the directory or a combination of both."
10857
msgstr ""
10858
10859
#: en/help_topics/conflict-types.txt:228
10860
msgid ""
10861
"* ``--action=take-this`` will issue ``bzr rm directory`` including the\n"
10862
" children,\n"
10863
"* ``--action=take-other`` will acknowledge Bazaar choice to keep the "
10864
"children\n"
10865
" and restoring the directory,\n"
10866
"* ``--action=done`` will just mark the conflict as resolved."
10867
msgstr ""
10868
10869
#: en/help_topics/conflict-types.txt:236
10870
msgid ""
10871
"Deleting parent\n"
10872
"---------------"
10873
msgstr ""
10874
10875
#: en/help_topics/conflict-types.txt:241
10876
msgid " Conflict: can't delete DIR because it is not empty. Not deleting."
10877
msgstr ""
10878
10879
#: en/help_topics/conflict-types.txt:243
10880
msgid ""
10881
"This is the opposite of \"missing parent\". A directory is deleted in the\n"
10882
"source, but has new children in the target (either because a directory\n"
10883
"deletion is merged or because the merge introduce new children). Bazaar\n"
10884
"will retain the directory. Resolving this issue depends very much on the\n"
10885
"particular scenario."
10886
msgstr ""
10887
10888
#: en/help_topics/conflict-types.txt:254
10889
msgid ""
10890
"* ``--action=take-this`` will acknowledge Bazaar choice to keep the "
10891
"directory,"
10892
msgstr ""
10893
10894
#: en/help_topics/conflict-types.txt:256
10895
msgid ""
10896
"* ``--action=take-other`` will issue ``bzr rm directory`` including the \n"
10897
" children,"
10898
msgstr ""
10899
10900
#: en/help_topics/conflict-types.txt:259
10901
msgid "* ``--action=done`` will just mark the conflict as resolved."
10902
msgstr ""
10903
10904
#: en/help_topics/conflict-types.txt:261
10905
msgid ""
10906
"Note that when merging a directory deletion, if unversioned files are\n"
10907
"present, they become potential orphans has they don't have a directory\n"
10908
"parent anymore."
10909
msgstr ""
10910
10911
#: en/help_topics/conflict-types.txt:265
10912
msgid ""
10913
"Handling such orphans, *before* the conflict is created, is controlled by\n"
10914
"setting the ``bzr.transform.orphan_policy`` configuration option."
10915
msgstr ""
10916
10917
#: en/help_topics/conflict-types.txt:268
10918
msgid "There are two possible values for this option:"
10919
msgstr ""
10920
10921
#: en/help_topics/conflict-types.txt:270
10922
msgid ""
10923
"* ``conflict`` (the default): will leave the orphans in place and\n"
10924
" generate a conflicts,"
10925
msgstr ""
10926
10927
#: en/help_topics/conflict-types.txt:273
10928
msgid ""
10929
"* ``move``: will move the orphans to a ``bzr-orphans`` directory at the "
10930
"root\n"
10931
" of the working tree with names like ``<file>.~#~``."
10932
msgstr ""
10933
10934
#: en/help_topics/conflict-types.txt:278
10935
msgid ""
10936
"Path conflict\n"
10937
"-------------"
10938
msgstr ""
10939
10940
#: en/help_topics/conflict-types.txt:283
10941
msgid " Path conflict: PATH1 / PATH2"
10942
msgstr ""
10943
10944
#: en/help_topics/conflict-types.txt:285
10945
msgid ""
10946
"This happens when the source and target have each modified the name or "
10947
"parent\n"
10948
"directory of a file. Bazaar will use the path elements from the source."
10949
msgstr ""
10950
10951
#: en/help_topics/conflict-types.txt:288
10952
msgid ""
10953
"To resolve that kind of conflict, you just have to decide what name should "
10954
"be\n"
10955
"retained for the file involved."
10956
msgstr ""
10957
10958
#: en/help_topics/conflict-types.txt:293
10959
msgid ""
10960
"* ``--action=take-this`` will revert Bazaar choice and keep ``PATH1`` by\n"
10961
" issuing ``bzr mv PATH2 PATH1``,\n"
10962
"* ``--action=take-other`` will acknowledge Bazaar choice of keeping "
10963
"``PATH2``,\n"
10964
"* ``--action=done`` will just mark the conflict as resolved."
10965
msgstr ""
10966
10967
#: en/help_topics/conflict-types.txt:300
10968
msgid ""
10969
"Parent loop\n"
10970
"-----------"
10971
msgstr ""
10972
10973
#: en/help_topics/conflict-types.txt:305
10974
msgid " Conflict moving FILE into DIRECTORY. Cancelled move."
10975
msgstr ""
10976
10977
#: en/help_topics/conflict-types.txt:307
10978
msgid ""
10979
"This happens when the source and the target have each moved directories, so\n"
10980
"that, if the change could be applied, a directory would be contained by "
10981
"itself.\n"
10982
"For example::"
10983
msgstr ""
10984
10985
#: en/help_topics/conflict-types.txt:311
10986
msgid ""
10987
" $ bzr init\n"
10988
" $ bzr mkdir white\n"
10989
" $ bzr mkdir black\n"
10990
" $ bzr commit -m \"BASE\"\n"
10991
" $ bzr branch . ../other\n"
10992
" $ bzr mv white black\n"
10993
" $ bzr commit -m \"THIS\"\n"
10994
" $ bzr mv ../other/black ../other/white\n"
10995
" $ bzr commit ../other -m \"OTHER\"\n"
10996
" $ bzr merge ../other"
10997
msgstr ""
10998
10999
#: en/help_topics/conflict-types.txt:322
11000
msgid ""
11001
"In this situation, Bazaar will cancel the move, and leave ``white`` in\n"
11002
"``black``. To resolve that kind of conflict, you just have to decide what\n"
11003
"name should be retained for the directories involved."
11004
msgstr ""
11005
11006
#: en/help_topics/conflict-types.txt:328
11007
msgid ""
11008
"* ``--action=take-this`` will acknowledge Bazaar choice of leaving ``white`` "
11009
"\n"
11010
" in ``black``,\n"
11011
"* ``--action=take-other`` will revert Bazaar choice and move ``black`` in\n"
11012
" ``white`` by issuing ``bzr mv black/white white ; bzr mv black white``,\n"
11013
"* ``--action=done`` will just mark the conflict as resolved."
11014
msgstr ""
11015
11016
#: en/help_topics/conflict-types.txt:336
11017
msgid ""
11018
"Non-directory parent\n"
11019
"--------------------"
11020
msgstr ""
11021
11022
#: en/help_topics/conflict-types.txt:341
11023
msgid ""
11024
" Conflict: foo.new is not a directory, but has files in it.\n"
11025
" Created directory."
11026
msgstr ""
11027
11028
#: en/help_topics/conflict-types.txt:344
11029
msgid ""
11030
"This happens when one side has added files to a directory, and the other "
11031
"side\n"
11032
"has changed the directory into a file or symlink. For example::"
11033
msgstr ""
11034
11035
#: en/help_topics/conflict-types.txt:347
11036
msgid ""
11037
" $ bzr init\n"
11038
" $ bzr mkdir foo\n"
11039
" $ bzr commit -m \"BASE\"\n"
11040
" $ bzr branch . ../other\n"
11041
" $ rmdir foo\n"
11042
" $ touch foo\n"
11043
" $ bzr commit -m \"THIS\"\n"
11044
" $ bzr mkdir ../other/foo/bar\n"
11045
" $ bzr commit ../other -m \"OTHER\"\n"
11046
" $ bzr merge ../other"
11047
msgstr ""
11048
11049
#: en/help_topics/conflict-types.txt:358
11050
msgid ""
11051
"To resolve that kind of conflict, you have to decide what name should be\n"
11052
"retained for the file, directory or symlink involved."
11053
msgstr ""
11054
11055
#: en/help_topics/conflict-types.txt:363
11056
msgid ""
11057
"* ``--action=take-this`` will issue ``bzr rm --force foo.new`` and \n"
11058
" ``bzr add foo``,\n"
11059
"* ``--action=take-other`` will issue ``bzr rm --force foo`` and \n"
11060
" ``bzr mv foo.new foo``,\n"
11061
"* ``--action=done`` will just mark the conflict as resolved."
11062
msgstr ""
11063
11064
#: en/help_topics/conflict-types.txt:371
11065
msgid ""
11066
"MalformedTransform\n"
11067
"------------------"
11068
msgstr ""
11069
11070
#: en/help_topics/conflict-types.txt:374
11071
msgid ""
11072
"It is possible (though very rare) for Bazaar to raise a MalformedTransform\n"
11073
"exception. This means that Bazaar encountered a filesystem conflict that it "
11074
"was\n"
11075
"unable to resolve. This usually indicates a bug. Please let us know if "
11076
"you\n"
11077
"encounter this. Our bug tracker is at https://launchpad.net/bzr/+bugs\n"
11078
msgstr ""
11079
11080
#: en/help_topics/content-filters.txt:1
11081
msgid ""
11082
"Content Filters\n"
11083
"==============="
11084
msgstr ""
11085
11086
#: en/help_topics/content-filters.txt:4
11087
msgid ""
11088
"Content formats\n"
11089
"---------------"
11090
msgstr ""
11091
11092
#: en/help_topics/content-filters.txt:7
11093
msgid ""
11094
"Bazaar's content filtering allows you to store files in a different\n"
11095
"format from the copy in your working tree. This lets you, or your\n"
11096
"co-developers, use Windows development tools that expect CRLF files\n"
11097
"on projects that use other line-ending conventions. Among other things,\n"
11098
"content filters also let Unix developers more easily work on projects\n"
11099
"using Windows line-ending conventions, keyword expansion/compression,\n"
11100
"and trailing spaces on lines in text files to be implicitly stripped\n"
11101
"when committed."
11102
msgstr ""
11103
11104
#: en/help_topics/content-filters.txt:16
11105
msgid "To generalize, there are two content formats supported by Bazaar:"
11106
msgstr ""
11107
11108
#: en/help_topics/content-filters.txt:18
11109
msgid ""
11110
"* a canonical format - how files are stored internally\n"
11111
"* a convenience format - how files are created in a working tree."
11112
msgstr ""
11113
11114
#: en/help_topics/content-filters.txt:21
11115
msgid ""
11116
"\n"
11117
"Format conversion\n"
11118
"-----------------"
11119
msgstr ""
11120
11121
#: en/help_topics/content-filters.txt:25
11122
msgid ""
11123
"The conversion between these formats is done by content filters.\n"
11124
"A content filter has two parts:"
11125
msgstr ""
11126
11127
#: en/help_topics/content-filters.txt:28
11128
msgid ""
11129
"* a read converter - converts from convenience to canonical format\n"
11130
"* a write converter - converts from canonical to convenience format."
11131
msgstr ""
11132
11133
#: en/help_topics/content-filters.txt:31
11134
msgid ""
11135
"Many of these converters will provide *round-trip* conversion,\n"
11136
"i.e. applying the read converter followed by the write converter\n"
11137
"gives back the original content. However, others may provide an\n"
11138
"asymmetric conversion. For example, a read converter might strip\n"
11139
"trailing whitespace off lines in source code while the matching\n"
11140
"write converter might pass content through unchanged."
11141
msgstr ""
11142
11143
#: en/help_topics/content-filters.txt:38
11144
msgid ""
11145
"\n"
11146
"Enabling content filters\n"
11147
"------------------------"
11148
msgstr ""
11149
11150
#: en/help_topics/content-filters.txt:42
11151
msgid ""
11152
"Content filters are typically provided by plugins, so the first step\n"
11153
"in using them is to install the relevant plugins and read their\n"
11154
"documentation. Some plugins may be very specific about which files\n"
11155
"they filter, e.g. only files ending in ``.java`` or ``.php``.\n"
11156
"In other cases, the plugin may leave it in the user's hands to\n"
11157
"define which files are to be filtered. This is typically done\n"
11158
"using rule-based preferences. See ``bzr help rules`` for general\n"
11159
"information about defining these."
11160
msgstr ""
11161
11162
#: en/help_topics/content-filters.txt:51
11163
msgid ""
11164
"\n"
11165
"Impact on commands\n"
11166
"------------------"
11167
msgstr ""
11168
11169
#: en/help_topics/content-filters.txt:55
11170
msgid ""
11171
"Read converters are only applied to commands that read content from\n"
11172
"a working tree, e.g. status, diff and commit. For example, ``bzr diff``\n"
11173
"will apply read converters to files in the working tree, then compare\n"
11174
"the results to the content last committed."
11175
msgstr ""
11176
11177
#: en/help_topics/content-filters.txt:60
11178
msgid ""
11179
"Write converters are only applied by commands that **create files in a\n"
11180
"working tree**, e.g. branch, checkout, update. If you wish to see the\n"
11181
"canonical format of a file or tree, use ``bzr cat`` or ``bzr export``\n"
11182
"respectively."
11183
msgstr ""
11184
11185
#: en/help_topics/content-filters.txt:65
11186
msgid ""
11187
"Note: ``bzr commit`` does not implicitly apply write converters after\n"
11188
"comitting files. If this makes sense for a given plugin providing\n"
11189
"a content filter, the plugin can usually achieve this effect by using a\n"
11190
"``start_commit`` or ``post_commit`` hook say. See :doc:`hooks-help`\n"
11191
"for more information on hooks."
11192
msgstr ""
11193
11194
#: en/help_topics/content-filters.txt:71
11195
msgid ""
11196
"\n"
11197
"Refreshing your working tree\n"
11198
"----------------------------"
11199
msgstr ""
11200
11201
#: en/help_topics/content-filters.txt:75
11202
msgid ""
11203
"For performance reasons, Bazaar caches the timestamps of files in\n"
11204
"a working tree, and assumes files are unchanged if their timestamps\n"
11205
"match the cached values. As a consequence, there are times when\n"
11206
"you may need to explicitly ask for content filtering to be reapplied\n"
11207
"in one or both directions, e.g. after installing or reconfiguring\n"
11208
"plugins providing it."
11209
msgstr ""
11210
11211
#: en/help_topics/content-filters.txt:82
11212
msgid "Here are some general guidelines for doing this:"
11213
msgstr ""
11214
11215
#: en/help_topics/content-filters.txt:84
11216
msgid ""
11217
" * To reapply read converters, ``touch`` files, i.e. update their\n"
11218
" timestamp. Operations like ``bzr status`` should then reapply the\n"
11219
" relevant read converters and compare the end result with the\n"
11220
" canonical format."
11221
msgstr ""
11222
11223
#: en/help_topics/content-filters.txt:89
11224
msgid ""
11225
" * To reapply write converters, ensure there are no local changes,\n"
11226
" delete the relevant files and run ``bzr revert`` on those files."
11227
msgstr ""
11228
11229
#: en/help_topics/content-filters.txt:92
11230
msgid ""
11231
"Note: In the future, it is likely that additional options will be added\n"
11232
"to commands to make this refreshing process faster and safer.\n"
11233
msgstr ""
11234
11235
#: en/help_topics/current-formats.txt:1
11236
msgid "Current Storage Formats"
11237
msgstr ""
11238
11239
#: en/help_topics/current-formats.txt:3
11240
msgid ""
11241
":2a:\n"
11242
" (native) (default) Format for the bzr 2.0 series. Uses group-\n"
11243
" compress storage. Provides rich roots which are a one-way\n"
11244
" transition."
11245
msgstr ""
11246
11247
#: en/help_topics/current-formats.txt:8 en/help_topics/other-formats.txt:17
11248
msgid ""
11249
"\n"
11250
"See :doc:`formats-help` for more about storage formats."
11251
msgstr ""
11252
11253
#: en/help_topics/debug-flags.txt:1
11254
msgid ""
11255
"Debug Flags\n"
11256
"==========="
11257
msgstr ""
11258
11259
#: en/help_topics/debug-flags.txt:4
11260
msgid ""
11261
"These flags can be passed on the bzr command line or (without the ``-D``\n"
11262
"prefix) put in the ``debug_flags`` variable in ``bazaar.conf``."
11263
msgstr ""
11264
11265
#: en/help_topics/debug-flags.txt:7
11266
msgid ""
11267
"-Dauth Trace authentication sections used.\n"
11268
"-Dbytes Print out how many bytes were transferred\n"
11269
"-Ddirstate Trace dirstate activity (verbose!)\n"
11270
"-Derror Instead of normal error handling, always print a "
11271
"traceback\n"
11272
" on error.\n"
11273
"-Devil Capture call sites that do expensive or badly-scaling\n"
11274
" operations.\n"
11275
"-Dfetch Trace history copying between repositories.\n"
11276
"-Dfilters Emit information for debugging content filtering.\n"
11277
"-Dforceinvdeltas Force use of inventory deltas during generic streaming "
11278
"fetch.\n"
11279
"-Dgraph Trace graph traversal.\n"
11280
"-Dhashcache Log every time a working file is read to determine its "
11281
"hash.\n"
11282
"-Dhooks Trace hook execution.\n"
11283
"-Dhpss Trace smart protocol requests and responses.\n"
11284
"-Dhpssdetail More hpss details.\n"
11285
"-Dhpssvfs Traceback on vfs access to Remote objects.\n"
11286
"-Dhttp Trace http connections, requests and responses.\n"
11287
"-Dindex Trace major index operations.\n"
11288
"-Dknit Trace knit operations.\n"
11289
"-Dlock Trace when lockdir locks are taken or released.\n"
11290
"-Dnoretry If a connection is reset, fail immediately rather than\n"
11291
" retrying the request.\n"
11292
"-Dprogress Trace progress bar operations.\n"
11293
"-Dmem_dump Dump memory to a file upon an out of memory error.\n"
11294
"-Dmerge Emit information for debugging merges.\n"
11295
"-Dno_apport Don't use apport to report crashes.\n"
11296
"-Dno_activity \t Don't show transport activity indicator in progress bar.\n"
11297
"-Dpack Emit information about pack operations.\n"
11298
"-Drelock Emit a message every time a branch or repository object "
11299
"is\n"
11300
" unlocked then relocked the same way.\n"
11301
"-Dsftp Trace SFTP internals.\n"
11302
"-Dstatic_tuple Error when a tuple is used where a StaticTuple is "
11303
"expected\n"
11304
"-Dstream Trace fetch streams.\n"
11305
"-Dstrict_locks Trace when OS locks are potentially used in a non-"
11306
"portable\n"
11307
" manner.\n"
11308
"-Dunlock Some errors during unlock are treated as warnings.\n"
11309
"-DIDS_never Never use InterDifferingSerializer when fetching.\n"
11310
"-DIDS_always Always use InterDifferingSerializer to fetch if "
11311
"appropriate\n"
11312
" for the format, even for non-local fetches.\n"
11313
msgstr ""
11314
11315
#: en/help_topics/diverged-branches.txt:1
11316
msgid ""
11317
"Diverged Branches\n"
11318
"================="
11319
msgstr ""
11320
11321
#: en/help_topics/diverged-branches.txt:4
11322
msgid ""
11323
"When Bazaar tries to push one branch onto another, it requires that the\n"
11324
"destination branch must be ready to receive the source branch. If this "
11325
"isn't\n"
11326
"the case, then we say that the branches have ``diverged``. Branches are\n"
11327
"considered diverged if the destination branch's most recent commit is one "
11328
"that\n"
11329
"has not been merged (directly or indirectly) by the source branch. To "
11330
"recover\n"
11331
"from diverged branches, one must merge the missing revisions into the "
11332
"source\n"
11333
"branch."
11334
msgstr ""
11335
11336
#: en/help_topics/diverged-branches.txt:12
11337
msgid ""
11338
"This situation commonly arises when using a centralized workflow with local\n"
11339
"commits. If someone else has committed new work to the mainline since your\n"
11340
"last pull and you have local commits that have not yet been pushed to the\n"
11341
"mainline, then your local branch and the mainline have diverged."
11342
msgstr ""
11343
11344
#: en/help_topics/diverged-branches.txt:17
11345
msgid ""
11346
"Discovering What Has Diverged\n"
11347
"-----------------------------"
11348
msgstr ""
11349
11350
#: en/help_topics/diverged-branches.txt:20
11351
msgid ""
11352
"The ``bzr missing`` command is used to find out what revisions are in "
11353
"another\n"
11354
"branch that are not present in the current branch, and vice-versa. It shows "
11355
"a\n"
11356
"summary of which extra revisions exist in each branch. If you want to see "
11357
"the\n"
11358
"precise effects of those revisions, you can use ``bzr diff --"
11359
"old=other_branch``\n"
11360
"to show the differences between other_branch and your current branch."
11361
msgstr ""
11362
11363
#: en/help_topics/diverged-branches.txt:26
11364
msgid ""
11365
"A Solution\n"
11366
"----------"
11367
msgstr ""
11368
11369
#: en/help_topics/diverged-branches.txt:29
11370
msgid ""
11371
"The solution is to merge the revisions from the mainline into your local\n"
11372
"branch. To do so, use ``bzr merge`` to get the new revisions from the\n"
11373
"mainline. This merge may result in conflicts if the other developer's "
11374
"changes\n"
11375
"overlap with your changes. These conflicts should be resolved before\n"
11376
"continuing. After any conflicts have been resolved, or even if there were "
11377
"no\n"
11378
"conflicts, Bazaar requires that you explicitly commit these new revisions\n"
11379
"to your local branch. This requirement gives you an opportunity to test "
11380
"the\n"
11381
"resulting working tree for correctness, since the merged revisions could "
11382
"have\n"
11383
"made arbitrary changes. After testing, you should commit the merge using\n"
11384
"``bzr commit``. This clears up the diverged branches situation. Your "
11385
"local\n"
11386
"branch can now be pushed to the mainline.\n"
11387
msgstr ""
11388
11389
#: en/help_topics/eol.txt:1
11390
msgid ""
11391
"End of Line Conversion\n"
11392
"======================"
11393
msgstr ""
11394
11395
#: en/help_topics/eol.txt:4
11396
msgid ""
11397
"EOL conversion is provided as a content filter where Bazaar internally\n"
11398
"stores a canonical format but outputs a convenience format. See\n"
11399
"``bzr help content-filters`` for general information about using these."
11400
msgstr ""
11401
11402
#: en/help_topics/eol.txt:8
11403
msgid ""
11404
"Note: Content filtering is only supported in recently added formats,\n"
11405
"e.g. 1.14. Be sure that both the repository *and* the branch are\n"
11406
"in a recent format. (Just setting the format on the repository\n"
11407
"is not enough.) If content filtering does not appear to be working, use\n"
11408
"'bzr info -v' to confirm that the branch is using \"Working tree format 5\"\n"
11409
"or later."
11410
msgstr ""
11411
11412
#: en/help_topics/eol.txt:15
11413
msgid ""
11414
"EOL conversion needs to be enabled for selected file patterns using\n"
11415
"rules. See ``bzr help rules`` for general information on defining rules.\n"
11416
"Currently, rules are only supported in $BZR_HOME/.bazaar/rules (or\n"
11417
"%BZR_HOME%/bazaar/2.0/rules on Windows). Branch specific rules will be\n"
11418
"supported in a future verison of Bazaar."
11419
msgstr ""
11420
11421
#: en/help_topics/eol.txt:21
11422
msgid ""
11423
"To configure which files to filter, set ``eol`` to one of the values below.\n"
11424
"(If a value is not set, ``exact`` is the default.)"
11425
msgstr ""
11426
11427
#: en/help_topics/eol.txt:24
11428
msgid ""
11429
" ========== ===================================== ======================\n"
11430
" Value Checkout end-of-lines as Commit end-of-lines as\n"
11431
" ========== ===================================== ======================\n"
11432
" ``native`` ``crlf`` on Windows, ``lf`` otherwise ``lf``\n"
11433
" ---------- ------------------------------------- ----------------------\n"
11434
" ``lf`` ``lf`` ``lf``\n"
11435
" ---------- ------------------------------------- ----------------------\n"
11436
" ``crlf`` ``crlf`` ``lf``\n"
11437
" ---------- ------------------------------------- ----------------------\n"
11438
" ``exact`` No conversion Exactly as in file\n"
11439
" ========== ===================================== ======================"
11440
msgstr ""
11441
11442
#: en/help_topics/eol.txt:36
11443
msgid ""
11444
"Note: For safety reasons, no conversion is applied to any file where a null\n"
11445
"byte is detected in the file."
11446
msgstr ""
11447
11448
#: en/help_topics/eol.txt:39
11449
msgid ""
11450
"For users working on a cross-platform project, here is a suggested rule\n"
11451
"to use as a starting point::"
11452
msgstr ""
11453
11454
#: en/help_topics/eol.txt:42 en/help_topics/eol.txt:52
11455
#: en/help_topics/eol.txt:67 en/help_topics/eol.txt:82
11456
msgid ""
11457
" [name *]\n"
11458
" eol = native"
11459
msgstr ""
11460
11461
#: en/help_topics/eol.txt:45
11462
msgid ""
11463
"If you have binary files that do not contain a null byte though, be\n"
11464
"sure to add ``eol = exact`` rules for those as well. You can do this\n"
11465
"by giving more explicit patterns earlier in the rules file. For example::"
11466
msgstr ""
11467
11468
#: en/help_topics/eol.txt:49
11469
msgid ""
11470
" [name *.png]\n"
11471
" eol = exact"
11472
msgstr ""
11473
11474
#: en/help_topics/eol.txt:55
11475
msgid ""
11476
"If your working tree is on a network drive shared by users on different\n"
11477
"operating systems, you typically want to force certain conventions for\n"
11478
"certain files. In that way, if a file is created with the wrong line\n"
11479
"endings or line endings get mixed during editing, it gets committed\n"
11480
"correctly and gets checked out correctly. For example::"
11481
msgstr ""
11482
11483
#: en/help_topics/eol.txt:61
11484
msgid ""
11485
" [name *.bat]\n"
11486
" eol = crlf"
11487
msgstr ""
11488
11489
#: en/help_topics/eol.txt:64
11490
msgid ""
11491
" [name *.sh]\n"
11492
" eol = lf"
11493
msgstr ""
11494
11495
#: en/help_topics/eol.txt:70
11496
msgid ""
11497
"If you take the care to create files with their required endings, you can\n"
11498
"achieve *almost* the same thing by using ``eol = exact``. It is slightly\n"
11499
"safer to use ``lf`` and ``crlf`` though because edits accidentally\n"
11500
"introducing mixed line endings will be corrected during commit for files\n"
11501
"with those settings."
11502
msgstr ""
11503
11504
#: en/help_topics/eol.txt:76
11505
msgid ""
11506
"If you have sample test data that deliberately has text files with mixed\n"
11507
"newline conventions, you can ask for those to be left alone like this::"
11508
msgstr ""
11509
11510
#: en/help_topics/eol.txt:79
11511
msgid ""
11512
" [name test_data/]\n"
11513
" eol = exact"
11514
msgstr ""
11515
11516
#: en/help_topics/eol.txt:85
11517
msgid ""
11518
"Note that ``exact`` does not imply the file is binary but it does mean\n"
11519
"that no conversion of end-of-lines will be done. (Bazaar currently relies\n"
11520
"of content analysis to detect binary files for commands like ``diff``.\n"
11521
"In the future, a ``binary = true`` rule may be added but it is not\n"
11522
"supported yet.)"
11523
msgstr ""
11524
11525
#: en/help_topics/eol.txt:91
11526
msgid ""
11527
"If you have an existing repository with text files already stored using\n"
11528
"Windows newline conventions (``crlf``), then you may want to keep using "
11529
"that\n"
11530
"convention in the repository. Forcing certain files to this convention\n"
11531
"may also help users who do not have rules configured. To do this, set\n"
11532
"``eol`` to one of the values below."
11533
msgstr ""
11534
11535
#: en/help_topics/eol.txt:97
11536
msgid ""
11537
" ============================ ======================== "
11538
"======================\n"
11539
" Value Checkout end-of-lines as Commit end-of-lines "
11540
"as\n"
11541
" ============================ ======================== "
11542
"======================\n"
11543
" ``native-with-crlf-in-repo`` ``crlf`` on Windows, ``crlf``\n"
11544
" ``lf`` otherwise\n"
11545
" ---------------------------- ------------------------ ----------------------"
11546
"\n"
11547
" ``lf-with-crlf-in-repo`` ``lf`` ``crlf``\n"
11548
" ---------------------------- ------------------------ ----------------------"
11549
"\n"
11550
" ``crlf-with-crlf-in-repo`` ``crlf`` ``crlf``\n"
11551
" ============================ ======================== ======================"
11552
msgstr ""
11553
11554
#: en/help_topics/eol.txt:108
11555
msgid ""
11556
"For users working on an existing project that uses Windows newline\n"
11557
"conventions in their Bazaar repository, this rule is suggested as a\n"
11558
"starting point::"
11559
msgstr ""
11560
11561
#: en/help_topics/eol.txt:112
11562
msgid ""
11563
" [name *]\n"
11564
" eol = native-with-crlf-in-repo"
11565
msgstr ""
11566
11567
#: en/help_topics/eol.txt:115
11568
msgid ""
11569
"For new projects, it is recommended that end-of-lines be stored as ``lf``\n"
11570
"and that users stick to the basic settings, i.e. ``native``, ``lf``,\n"
11571
"``crlf`` and ``exact``."
11572
msgstr ""
11573
11574
#: en/help_topics/eol.txt:119
11575
msgid ""
11576
"Note: Bazaar's EOL conversion will convert the content of files but\n"
11577
"never reject files because a given line ending or mixed line endings\n"
11578
"are found. A precommit hook should be used if you wish to validate\n"
11579
"(and not just convert) content before committing.\n"
11580
msgstr ""
11581
11582
#: en/help_topics/hidden-commands.txt:1
11583
msgid ""
11584
"added List files added in working tree.\n"
11585
"ancestry List all revisions merged into this branch.\n"
11586
"assert-fail Test reporting of assertion failures\n"
11587
"bundle-info Output interesting stats about a bundle\n"
11588
"bundle-revisions Create a merge-directive for submitting changes.\n"
11589
"cat-revision Write out metadata for a revision.\n"
11590
"dump-btree Dump the contents of a btree index file to stdout.\n"
11591
"export-pot Export command helps and error messages in po format.\n"
11592
"file-id Print file_id of a particular file or directory.\n"
11593
"file-path Print path of file_ids to a file or directory.\n"
11594
"find-merge-base Find and print a base revision for merging two "
11595
"branches.\n"
11596
"hooks Show hooks.\n"
11597
"inventory Show inventory of the current working copy or a "
11598
"revision.\n"
11599
"local-time-offset Show the offset in seconds from GMT to local time.\n"
11600
"lookup-revision Lookup the revision-id from a revision-number\n"
11601
"merge-directive Generate a merge directive for auto-merge tools.\n"
11602
"modified List files modified in working tree.\n"
11603
"re-sign Create a digital signature for an existing revision.\n"
11604
"reference list, view and set branch locations for nested trees.\n"
11605
"relpath Show path of a file relative to root\n"
11606
"repair-workingtree Reset the working tree state file.\n"
11607
"revision-history Display the list of revision ids on a branch.\n"
11608
"revision-info Show revision number and revision id for a given "
11609
"revision\n"
11610
" identifier.\n"
11611
"rocks Statement of optimism.\n"
11612
"selftest Run internal test suite.\n"
11613
"shell-complete Show appropriate completions for context.\n"
11614
"test-script Run a shell-like test from a file.\n"
11615
"touching-revisions Return revision-ids which affected a particular file.\n"
11616
"unknowns List unknown files.\n"
11617
"wait-until-signalled Test helper for\n"
11618
" test_start_and_stop_bzr_subprocess_send_signal.\n"
11619
msgstr ""
11620
11621
#: en/help_topics/hooks.txt:1
11622
msgid ""
11623
"\n"
11624
"Hooks\n"
11625
"====="
11626
msgstr ""
11627
11628
#: en/help_topics/hooks.txt:5 en/help_topics/rules.txt:4
11629
msgid ""
11630
"Introduction\n"
11631
"------------"
11632
msgstr ""
11633
11634
#: en/help_topics/hooks.txt:8
11635
msgid "A hook of type *xxx* of class *yyy* needs to be registered using::"
11636
msgstr ""
11637
11638
#: en/help_topics/hooks.txt:10
11639
msgid " yyy.hooks.install_named_hook(\"xxx\", ...)"
11640
msgstr ""
11641
11642
#: en/help_topics/hooks.txt:12
11643
msgid ""
11644
"See :doc:`Using hooks<../user-guide/hooks>` in the User Guide for examples."
11645
msgstr ""
11646
11647
#: en/help_topics/hooks.txt:14
11648
msgid ""
11649
"The class that contains each hook is given before the hooks it supplies. "
11650
"For\n"
11651
"instance, BranchHooks as the class is the hooks class for\n"
11652
"`bzrlib.branch.Branch.hooks`."
11653
msgstr ""
11654
11655
#: en/help_topics/hooks.txt:18
11656
msgid ""
11657
"Each description also indicates whether the hook runs on the client (the\n"
11658
"machine where bzr was invoked) or the server (the machine addressed by\n"
11659
"the branch URL). These may be, but are not necessarily, the same machine."
11660
msgstr ""
11661
11662
#: en/help_topics/hooks.txt:22
11663
msgid ""
11664
"Plugins (including hooks) are run on the server if all of these is true:"
11665
msgstr ""
11666
11667
#: en/help_topics/hooks.txt:24
11668
msgid ""
11669
" * The connection is via a smart server (accessed with a URL starting with\n"
11670
" \"bzr://\", \"bzr+ssh://\" or \"bzr+http://\", or accessed via a "
11671
"\"http://\"\n"
11672
" URL when a smart server is available via HTTP)."
11673
msgstr ""
11674
11675
#: en/help_topics/hooks.txt:28
11676
msgid ""
11677
" * The hook is either server specific or part of general infrastructure "
11678
"rather\n"
11679
" than client specific code (such as commit)."
11680
msgstr ""
11681
11682
#: en/help_topics/hooks.txt:31
11683
msgid ""
11684
"\n"
11685
"BranchHooks\n"
11686
"-----------"
11687
msgstr ""
11688
11689
#: en/help_topics/hooks.txt:35
11690
msgid ""
11691
"automatic_tag_name\n"
11692
"~~~~~~~~~~~~~~~~~~"
11693
msgstr ""
11694
11695
#: en/help_topics/hooks.txt:38 en/help_topics/hooks.txt:56
11696
#: en/help_topics/hooks.txt:102 en/help_topics/hooks.txt:259
11697
msgid "Introduced in: 2.2"
11698
msgstr ""
11699
11700
#: en/help_topics/hooks.txt:40
11701
msgid ""
11702
"Called to determine an automatic tag name for a revision.\n"
11703
"automatic_tag_name is called with (branch, revision_id) and should\n"
11704
"return a tag name or None if no tag name could be determined. The\n"
11705
"first non-None tag name returned will be used."
11706
msgstr ""
11707
11708
#: en/help_topics/hooks.txt:45
11709
msgid ""
11710
"open\n"
11711
"~~~~"
11712
msgstr ""
11713
11714
#: en/help_topics/hooks.txt:48 en/help_topics/hooks.txt:290
11715
#: en/help_topics/hooks.txt:304
11716
msgid "Introduced in: 1.8"
11717
msgstr ""
11718
11719
#: en/help_topics/hooks.txt:50
11720
msgid ""
11721
"Called with the Branch object that has been opened after a branch is\n"
11722
"opened."
11723
msgstr ""
11724
11725
#: en/help_topics/hooks.txt:53
11726
msgid ""
11727
"post_branch_init\n"
11728
"~~~~~~~~~~~~~~~~"
11729
msgstr ""
11730
11731
#: en/help_topics/hooks.txt:58
11732
msgid ""
11733
"Called after new branch initialization completes. post_branch_init is\n"
11734
"called with a bzrlib.branch.BranchInitHookParams. Note that init,\n"
11735
"branch and checkout (both heavyweight and lightweight) will all\n"
11736
"trigger this hook."
11737
msgstr ""
11738
11739
#: en/help_topics/hooks.txt:63
11740
msgid ""
11741
"post_change_branch_tip\n"
11742
"~~~~~~~~~~~~~~~~~~~~~~"
11743
msgstr ""
11744
11745
#: en/help_topics/hooks.txt:66 en/help_topics/hooks.txt:418
11746
msgid "Introduced in: 1.4"
11747
msgstr ""
11748
11749
#: en/help_topics/hooks.txt:68
11750
msgid ""
11751
"Called in bzr client and server after a change to the tip of a branch\n"
11752
"is made. post_change_branch_tip is called with a\n"
11753
"bzrlib.branch.ChangeBranchTipParams. Note that push, pull, commit,\n"
11754
"uncommit will all trigger this hook."
11755
msgstr ""
11756
11757
#: en/help_topics/hooks.txt:73 en/help_topics/hooks.txt:389
11758
msgid ""
11759
"post_commit\n"
11760
"~~~~~~~~~~~"
11761
msgstr ""
11762
11763
#: en/help_topics/hooks.txt:76 en/help_topics/hooks.txt:86
11764
#: en/help_topics/hooks.txt:94 en/help_topics/hooks.txt:110
11765
#: en/help_topics/hooks.txt:145
11766
msgid "Introduced in: 0.15"
11767
msgstr ""
11768
11769
#: en/help_topics/hooks.txt:78
11770
msgid ""
11771
"Called in the bzr client after a commit has completed. post_commit is\n"
11772
"called with (local, master, old_revno, old_revid, new_revno,\n"
11773
"new_revid). old_revid is NULL_REVISION for the first commit to a\n"
11774
"branch."
11775
msgstr ""
11776
11777
#: en/help_topics/hooks.txt:83
11778
msgid ""
11779
"post_pull\n"
11780
"~~~~~~~~~"
11781
msgstr ""
11782
11783
#: en/help_topics/hooks.txt:88
11784
msgid ""
11785
"Called after a pull operation completes. post_pull is called with a\n"
11786
"bzrlib.branch.PullResult object and only runs in the bzr client."
11787
msgstr ""
11788
11789
#: en/help_topics/hooks.txt:91
11790
msgid ""
11791
"post_push\n"
11792
"~~~~~~~~~"
11793
msgstr ""
11794
11795
#: en/help_topics/hooks.txt:96
11796
msgid ""
11797
"Called after a push operation completes. post_push is called with a\n"
11798
"bzrlib.branch.BranchPushResult object and only runs in the bzr client."
11799
msgstr ""
11800
11801
#: en/help_topics/hooks.txt:99
11802
msgid ""
11803
"post_switch\n"
11804
"~~~~~~~~~~~"
11805
msgstr ""
11806
11807
#: en/help_topics/hooks.txt:104
11808
msgid ""
11809
"Called after a checkout switches branch. post_switch is called with a\n"
11810
"bzrlib.branch.SwitchHookParams."
11811
msgstr ""
11812
11813
#: en/help_topics/hooks.txt:107
11814
msgid ""
11815
"post_uncommit\n"
11816
"~~~~~~~~~~~~~"
11817
msgstr ""
11818
11819
#: en/help_topics/hooks.txt:112
11820
msgid ""
11821
"Called in the bzr client after an uncommit completes. post_uncommit is\n"
11822
"called with (local, master, old_revno, old_revid, new_revno,\n"
11823
"new_revid) where local is the local branch or None, master is the\n"
11824
"target branch, and an empty branch receives new_revno of 0, new_revid\n"
11825
"of None."
11826
msgstr ""
11827
11828
#: en/help_topics/hooks.txt:118
11829
msgid ""
11830
"pre_change_branch_tip\n"
11831
"~~~~~~~~~~~~~~~~~~~~~"
11832
msgstr ""
11833
11834
#: en/help_topics/hooks.txt:121
11835
msgid "Introduced in: 1.6"
11836
msgstr ""
11837
11838
#: en/help_topics/hooks.txt:123
11839
msgid ""
11840
"Called in bzr client and server before a change to the tip of a branch\n"
11841
"is made. pre_change_branch_tip is called with a\n"
11842
"bzrlib.branch.ChangeBranchTipParams. Note that push, pull, commit,\n"
11843
"uncommit will all trigger this hook."
11844
msgstr ""
11845
11846
#: en/help_topics/hooks.txt:128
11847
msgid ""
11848
"pre_commit\n"
11849
"~~~~~~~~~~"
11850
msgstr ""
11851
11852
#: en/help_topics/hooks.txt:131
11853
msgid "Introduced in: 0.91"
11854
msgstr ""
11855
11856
#: en/help_topics/hooks.txt:133
11857
msgid ""
11858
"Called after a commit is calculated but before it is completed.\n"
11859
"pre_commit is called with (local, master, old_revno, old_revid,\n"
11860
"future_revno, future_revid, tree_delta, future_tree). old_revid is\n"
11861
"NULL_REVISION for the first commit to a branch, tree_delta is a\n"
11862
"TreeDelta object describing changes from the basis revision. hooks\n"
11863
"MUST NOT modify this delta. future_tree is an in-memory tree obtained\n"
11864
"from CommitBuilder.revision_tree() and hooks MUST NOT modify this\n"
11865
"tree."
11866
msgstr ""
11867
11868
#: en/help_topics/hooks.txt:142
11869
msgid ""
11870
"set_rh\n"
11871
"~~~~~~"
11872
msgstr ""
11873
11874
#: en/help_topics/hooks.txt:147
11875
msgid ""
11876
"Invoked whenever the revision history has been set via\n"
11877
"set_revision_history. The api signature is (branch, revision_history),\n"
11878
"and the branch will be write-locked. The set_rh hook can be expensive\n"
11879
"for bzr to trigger, a better hook to use is\n"
11880
"Branch.post_change_branch_tip."
11881
msgstr ""
11882
11883
#: en/help_topics/hooks.txt:153
11884
msgid ""
11885
"transform_fallback_location\n"
11886
"~~~~~~~~~~~~~~~~~~~~~~~~~~~"
11887
msgstr ""
11888
11889
#: en/help_topics/hooks.txt:156
11890
msgid "Introduced in: 1.9"
11891
msgstr ""
11892
11893
#: en/help_topics/hooks.txt:158
11894
msgid ""
11895
"Called when a stacked branch is activating its fallback locations.\n"
11896
"transform_fallback_location is called with (branch, url), and should\n"
11897
"return a new url. Returning the same url allows it to be used as-is,\n"
11898
"returning a different one can be used to cause the branch to stack on\n"
11899
"a closer copy of that fallback_location. Note that the branch cannot\n"
11900
"have history accessing methods called on it during this hook because\n"
11901
"the fallback locations have not been activated. When there are\n"
11902
"multiple hooks installed for transform_fallback_location, all are\n"
11903
"called with the url returned from the previous hook.The order is\n"
11904
"however undefined."
11905
msgstr ""
11906
11907
#: en/help_topics/hooks.txt:169
11908
msgid ""
11909
"CommandHooks\n"
11910
"------------"
11911
msgstr ""
11912
11913
#: en/help_topics/hooks.txt:172
11914
msgid ""
11915
"extend_command\n"
11916
"~~~~~~~~~~~~~~"
11917
msgstr ""
11918
11919
#: en/help_topics/hooks.txt:175
11920
msgid "Introduced in: 1.13"
11921
msgstr ""
11922
11923
#: en/help_topics/hooks.txt:177
11924
msgid ""
11925
"Called after creating a command object to allow modifications such as\n"
11926
"adding or removing options, docs etc. Called with the new\n"
11927
"bzrlib.commands.Command object."
11928
msgstr ""
11929
11930
#: en/help_topics/hooks.txt:181
11931
msgid ""
11932
"get_command\n"
11933
"~~~~~~~~~~~"
11934
msgstr ""
11935
11936
#: en/help_topics/hooks.txt:184 en/help_topics/hooks.txt:196
11937
#: en/help_topics/hooks.txt:205 en/help_topics/hooks.txt:464
11938
msgid "Introduced in: 1.17"
11939
msgstr ""
11940
11941
#: en/help_topics/hooks.txt:186
11942
msgid ""
11943
"Called when creating a single command. Called with (cmd_or_None,\n"
11944
"command_name). get_command should either return the cmd_or_None\n"
11945
"parameter, or a replacement Command object that should be used for the\n"
11946
"command. Note that the Command.hooks hooks are core infrastructure.\n"
11947
"Many users will prefer to use bzrlib.commands.register_command or\n"
11948
"plugin_cmds.register_lazy."
11949
msgstr ""
11950
11951
#: en/help_topics/hooks.txt:193
11952
msgid ""
11953
"get_missing_command\n"
11954
"~~~~~~~~~~~~~~~~~~~"
11955
msgstr ""
11956
11957
#: en/help_topics/hooks.txt:198
11958
msgid ""
11959
"Called when creating a single command if no command could be found.\n"
11960
"Called with (command_name). get_missing_command should either return\n"
11961
"None, or a Command object to be used for the command."
11962
msgstr ""
11963
11964
#: en/help_topics/hooks.txt:202
11965
msgid ""
11966
"list_commands\n"
11967
"~~~~~~~~~~~~~"
11968
msgstr ""
11969
11970
#: en/help_topics/hooks.txt:207
11971
msgid ""
11972
"Called when enumerating commands. Called with a set of cmd_name\n"
11973
"strings for all the commands found so far. This set is safe to mutate\n"
11974
"- e.g. to remove a command. list_commands should return the updated\n"
11975
"set of command names."
11976
msgstr ""
11977
11978
#: en/help_topics/hooks.txt:212
11979
msgid ""
11980
"_ConfigHooks\n"
11981
"------------"
11982
msgstr ""
11983
11984
#: en/help_topics/hooks.txt:215
11985
msgid ""
11986
"get\n"
11987
"~~~"
11988
msgstr ""
11989
11990
#: en/help_topics/hooks.txt:218 en/help_topics/hooks.txt:226
11991
#: en/help_topics/hooks.txt:233 en/help_topics/hooks.txt:241
11992
#: en/help_topics/hooks.txt:248 en/help_topics/hooks.txt:370
11993
#: en/help_topics/hooks.txt:443
11994
msgid "Introduced in: 2.4"
11995
msgstr ""
11996
11997
#: en/help_topics/hooks.txt:220
11998
msgid ""
11999
"Invoked when a config option is read. The signature is (stack, name,\n"
12000
"value)."
12001
msgstr ""
12002
12003
#: en/help_topics/hooks.txt:223
12004
msgid ""
12005
"load\n"
12006
"~~~~"
12007
msgstr ""
12008
12009
#: en/help_topics/hooks.txt:228
12010
msgid "Invoked when a config store is loaded. The signature is (store)."
12011
msgstr ""
12012
12013
#: en/help_topics/hooks.txt:230
12014
msgid ""
12015
"remove\n"
12016
"~~~~~~"
12017
msgstr ""
12018
12019
#: en/help_topics/hooks.txt:235
12020
msgid ""
12021
"Invoked when a config option is removed. The signature is (stack,\n"
12022
"name)."
12023
msgstr ""
12024
12025
#: en/help_topics/hooks.txt:238
12026
msgid ""
12027
"save\n"
12028
"~~~~"
12029
msgstr ""
12030
12031
#: en/help_topics/hooks.txt:243
12032
msgid "Invoked when a config store is saved. The signature is (store)."
12033
msgstr ""
12034
12035
#: en/help_topics/hooks.txt:245
12036
msgid ""
12037
"set\n"
12038
"~~~"
12039
msgstr ""
12040
12041
#: en/help_topics/hooks.txt:250
12042
msgid ""
12043
"Invoked when a config option is set. The signature is (stack, name,\n"
12044
"value)."
12045
msgstr ""
12046
12047
#: en/help_topics/hooks.txt:253
12048
msgid ""
12049
"ControlDirHooks\n"
12050
"---------------"
12051
msgstr ""
12052
12053
#: en/help_topics/hooks.txt:256
12054
msgid ""
12055
"post_repo_init\n"
12056
"~~~~~~~~~~~~~~"
12057
msgstr ""
12058
12059
#: en/help_topics/hooks.txt:261
12060
msgid ""
12061
"Invoked after a repository has been initialized. post_repo_init is\n"
12062
"called with a bzrlib.controldir.RepoInitHookParams."
12063
msgstr ""
12064
12065
#: en/help_topics/hooks.txt:264
12066
msgid ""
12067
"pre_open\n"
12068
"~~~~~~~~"
12069
msgstr ""
12070
12071
#: en/help_topics/hooks.txt:267
12072
msgid "Introduced in: 1.14"
12073
msgstr ""
12074
12075
#: en/help_topics/hooks.txt:269
12076
msgid ""
12077
"Invoked before attempting to open a ControlDir with the transport that\n"
12078
"the open will use."
12079
msgstr ""
12080
12081
#: en/help_topics/hooks.txt:272
12082
msgid ""
12083
"InfoHooks\n"
12084
"---------"
12085
msgstr ""
12086
12087
#: en/help_topics/hooks.txt:275
12088
msgid ""
12089
"repository\n"
12090
"~~~~~~~~~~"
12091
msgstr ""
12092
12093
#: en/help_topics/hooks.txt:278 en/help_topics/hooks.txt:297
12094
#: en/help_topics/hooks.txt:521
12095
msgid "Introduced in: 1.15"
12096
msgstr ""
12097
12098
#: en/help_topics/hooks.txt:280
12099
msgid ""
12100
"Invoked when displaying the statistics for a repository. repository is\n"
12101
"called with a statistics dictionary as returned by the repository and\n"
12102
"a file-like object to write to."
12103
msgstr ""
12104
12105
#: en/help_topics/hooks.txt:284
12106
msgid ""
12107
"LockHooks\n"
12108
"---------"
12109
msgstr ""
12110
12111
#: en/help_topics/hooks.txt:287
12112
msgid ""
12113
"lock_acquired\n"
12114
"~~~~~~~~~~~~~"
12115
msgstr ""
12116
12117
#: en/help_topics/hooks.txt:292
12118
msgid ""
12119
"Called with a bzrlib.lock.LockResult when a physical lock is acquired."
12120
msgstr ""
12121
12122
#: en/help_topics/hooks.txt:294
12123
msgid ""
12124
"lock_broken\n"
12125
"~~~~~~~~~~~"
12126
msgstr ""
12127
12128
#: en/help_topics/hooks.txt:299
12129
msgid "Called with a bzrlib.lock.LockResult when a physical lock is broken."
12130
msgstr ""
12131
12132
#: en/help_topics/hooks.txt:301
12133
msgid ""
12134
"lock_released\n"
12135
"~~~~~~~~~~~~~"
12136
msgstr ""
12137
12138
#: en/help_topics/hooks.txt:306
12139
msgid ""
12140
"Called with a bzrlib.lock.LockResult when a physical lock is released."
12141
msgstr ""
12142
12143
#: en/help_topics/hooks.txt:308
12144
msgid ""
12145
"MergeHooks\n"
12146
"----------"
12147
msgstr ""
12148
12149
#: en/help_topics/hooks.txt:311
12150
msgid ""
12151
"merge_file_content\n"
12152
"~~~~~~~~~~~~~~~~~~"
12153
msgstr ""
12154
12155
#: en/help_topics/hooks.txt:314
12156
msgid "Introduced in: 2.1"
12157
msgstr ""
12158
12159
#: en/help_topics/hooks.txt:316
12160
msgid ""
12161
"Called with a bzrlib.merge.Merger object to create a per file merge\n"
12162
"object when starting a merge. Should return either None or a subclass\n"
12163
"of ``bzrlib.merge.AbstractPerFileMerger``. Such objects will then be\n"
12164
"called per file that needs to be merged (including when one side has\n"
12165
"deleted the file and the other has changed it). See the\n"
12166
"AbstractPerFileMerger API docs for details on how it is used by merge."
12167
msgstr ""
12168
12169
#: en/help_topics/hooks.txt:323
12170
msgid ""
12171
"post_merge\n"
12172
"~~~~~~~~~~"
12173
msgstr ""
12174
12175
#: en/help_topics/hooks.txt:326 en/help_topics/hooks.txt:334
12176
#: en/help_topics/hooks.txt:384 en/help_topics/hooks.txt:402
12177
#: en/help_topics/hooks.txt:410 en/help_topics/hooks.txt:509
12178
msgid "Introduced in: 2.5"
12179
msgstr ""
12180
12181
#: en/help_topics/hooks.txt:328
12182
msgid ""
12183
"Called after a merge. Receives a Merger object as the single argument.\n"
12184
"The return value is ignored."
12185
msgstr ""
12186
12187
#: en/help_topics/hooks.txt:331
12188
msgid ""
12189
"pre_merge\n"
12190
"~~~~~~~~~"
12191
msgstr ""
12192
12193
#: en/help_topics/hooks.txt:336
12194
msgid ""
12195
"Called before a merge. Receives a Merger object as the single\n"
12196
"argument."
12197
msgstr ""
12198
12199
#: en/help_topics/hooks.txt:339
12200
msgid ""
12201
"MergeDirectiveHooks\n"
12202
"-------------------"
12203
msgstr ""
12204
12205
#: en/help_topics/hooks.txt:342
12206
msgid ""
12207
"merge_request_body\n"
12208
"~~~~~~~~~~~~~~~~~~"
12209
msgstr ""
12210
12211
#: en/help_topics/hooks.txt:345
12212
msgid "Introduced in: 1.15.0"
12213
msgstr ""
12214
12215
#: en/help_topics/hooks.txt:347
12216
msgid ""
12217
"Called with a MergeRequestBodyParams when a body is needed for a merge\n"
12218
"request. Callbacks must return a body. If more than one callback is\n"
12219
"registered, the output of one callback is provided to the next."
12220
msgstr ""
12221
12222
#: en/help_topics/hooks.txt:351
12223
msgid ""
12224
"MessageEditorHooks\n"
12225
"------------------"
12226
msgstr ""
12227
12228
#: en/help_topics/hooks.txt:354
12229
msgid ""
12230
"commit_message_template\n"
12231
"~~~~~~~~~~~~~~~~~~~~~~~"
12232
msgstr ""
12233
12234
#: en/help_topics/hooks.txt:357
12235
msgid "Introduced in: 1.10"
12236
msgstr ""
12237
12238
#: en/help_topics/hooks.txt:359
12239
msgid ""
12240
"Called when a commit message is being generated.\n"
12241
"commit_message_template is called with the bzrlib.commit.Commit object\n"
12242
"and the message that is known so far. commit_message_template must\n"
12243
"return a new message to use (which could be the same as it was given).\n"
12244
"When there are multiple hooks registered for commit_message_template,\n"
12245
"they are chained with the result from the first passed into the\n"
12246
"second, and so on."
12247
msgstr ""
12248
12249
#: en/help_topics/hooks.txt:367
12250
msgid ""
12251
"set_commit_message\n"
12252
"~~~~~~~~~~~~~~~~~~"
12253
msgstr ""
12254
12255
#: en/help_topics/hooks.txt:372
12256
msgid ""
12257
"Set a fixed commit message. set_commit_message is called with the\n"
12258
"bzrlib.commit.Commit object (so you can also change e.g. revision\n"
12259
"properties by editing commit.builder._revprops) and the message so\n"
12260
"far. set_commit_message must return the message to use or None if it\n"
12261
"should use the message editor as normal."
12262
msgstr ""
12263
12264
#: en/help_topics/hooks.txt:378
12265
msgid ""
12266
"MutableTreeHooks\n"
12267
"----------------"
12268
msgstr ""
12269
12270
#: en/help_topics/hooks.txt:381
12271
msgid ""
12272
"post_build_tree\n"
12273
"~~~~~~~~~~~~~~~"
12274
msgstr ""
12275
12276
#: en/help_topics/hooks.txt:386
12277
msgid ""
12278
"Called after a completely new tree is built. The hook is called with\n"
12279
"the tree as its only argument."
12280
msgstr ""
12281
12282
#: en/help_topics/hooks.txt:392
12283
msgid "Introduced in: 2.0"
12284
msgstr ""
12285
12286
#: en/help_topics/hooks.txt:394
12287
msgid ""
12288
"Called after a commit is performed on a tree. The hook is called with\n"
12289
"a bzrlib.mutabletree.PostCommitHookParams object. The mutable tree the\n"
12290
"commit was performed on is available via the mutable_tree attribute of\n"
12291
"that object."
12292
msgstr ""
12293
12294
#: en/help_topics/hooks.txt:399
12295
msgid ""
12296
"post_transform\n"
12297
"~~~~~~~~~~~~~~"
12298
msgstr ""
12299
12300
#: en/help_topics/hooks.txt:404
12301
msgid ""
12302
"Called after a tree transform has been performed on a tree. The hook\n"
12303
"is called with the tree that is being transformed and the transform."
12304
msgstr ""
12305
12306
#: en/help_topics/hooks.txt:407
12307
msgid ""
12308
"pre_transform\n"
12309
"~~~~~~~~~~~~~"
12310
msgstr ""
12311
12312
#: en/help_topics/hooks.txt:412
12313
msgid ""
12314
"Called before a tree transform on this tree. The hook is called with\n"
12315
"the tree that is being transformed and the transform."
12316
msgstr ""
12317
12318
#: en/help_topics/hooks.txt:415
12319
msgid ""
12320
"start_commit\n"
12321
"~~~~~~~~~~~~"
12322
msgstr ""
12323
12324
#: en/help_topics/hooks.txt:420
12325
msgid ""
12326
"Called before a commit is performed on a tree. The start commit hook\n"
12327
"is able to change the tree before the commit takes place. start_commit\n"
12328
"is called with the bzrlib.mutabletree.MutableTree that the commit is\n"
12329
"being performed on."
12330
msgstr ""
12331
12332
#: en/help_topics/hooks.txt:425
12333
msgid ""
12334
"SmartClientHooks\n"
12335
"----------------"
12336
msgstr ""
12337
12338
#: en/help_topics/hooks.txt:428
12339
msgid ""
12340
"call\n"
12341
"~~~~"
12342
msgstr ""
12343
12344
#: en/help_topics/hooks.txt:431
12345
msgid "Introduced in: unknown"
12346
msgstr ""
12347
12348
#: en/help_topics/hooks.txt:433
12349
msgid ""
12350
"Called when the smart client is submitting a request to the smart\n"
12351
"server. Called with a bzrlib.smart.client.CallHookParams object.\n"
12352
"Streaming request bodies, and responses, are not accessible."
12353
msgstr ""
12354
12355
#: en/help_topics/hooks.txt:437
12356
msgid ""
12357
"SmartServerHooks\n"
12358
"----------------"
12359
msgstr ""
12360
12361
#: en/help_topics/hooks.txt:440
12362
msgid ""
12363
"server_exception\n"
12364
"~~~~~~~~~~~~~~~~"
12365
msgstr ""
12366
12367
#: en/help_topics/hooks.txt:445
12368
msgid ""
12369
"Called by the bzr server when an exception occurs. server_exception is\n"
12370
"called with the sys.exc_info() tuple return true for the hook if the\n"
12371
"exception has been handled, in which case the server will exit\n"
12372
"normally."
12373
msgstr ""
12374
12375
#: en/help_topics/hooks.txt:450
12376
msgid ""
12377
"server_started\n"
12378
"~~~~~~~~~~~~~~"
12379
msgstr ""
12380
12381
#: en/help_topics/hooks.txt:453 en/help_topics/hooks.txt:472
12382
msgid "Introduced in: 0.16"
12383
msgstr ""
12384
12385
#: en/help_topics/hooks.txt:455
12386
msgid ""
12387
"Called by the bzr server when it starts serving a directory.\n"
12388
"server_started is called with (backing urls, public url), where\n"
12389
"backing_url is a list of URLs giving the server-specific directory\n"
12390
"locations, and public_url is the public URL for the directory being\n"
12391
"served."
12392
msgstr ""
12393
12394
#: en/help_topics/hooks.txt:461
12395
msgid ""
12396
"server_started_ex\n"
12397
"~~~~~~~~~~~~~~~~~"
12398
msgstr ""
12399
12400
#: en/help_topics/hooks.txt:466
12401
msgid ""
12402
"Called by the bzr server when it starts serving a directory.\n"
12403
"server_started is called with (backing_urls, server_obj)."
12404
msgstr ""
12405
12406
#: en/help_topics/hooks.txt:469
12407
msgid ""
12408
"server_stopped\n"
12409
"~~~~~~~~~~~~~~"
12410
msgstr ""
12411
12412
#: en/help_topics/hooks.txt:474
12413
msgid ""
12414
"Called by the bzr server when it stops serving a directory.\n"
12415
"server_stopped is called with the same parameters as the\n"
12416
"server_started hook: (backing_urls, public_url)."
12417
msgstr ""
12418
12419
#: en/help_topics/hooks.txt:478
12420
msgid ""
12421
"StatusHooks\n"
12422
"-----------"
12423
msgstr ""
12424
12425
#: en/help_topics/hooks.txt:481
12426
msgid ""
12427
"post_status\n"
12428
"~~~~~~~~~~~"
12429
msgstr ""
12430
12431
#: en/help_topics/hooks.txt:484 en/help_topics/hooks.txt:495
12432
msgid "Introduced in: 2.3"
12433
msgstr ""
12434
12435
#: en/help_topics/hooks.txt:486
12436
msgid ""
12437
"Called with argument StatusHookParams after Bazaar has displayed the\n"
12438
"status. StatusHookParams has the attributes (old_tree, new_tree,\n"
12439
"to_file, versioned, show_ids, short, verbose). The last four arguments\n"
12440
"correspond to the command line options specified by the user for the\n"
12441
"status command. to_file is the output stream for writing."
12442
msgstr ""
12443
12444
#: en/help_topics/hooks.txt:492
12445
msgid ""
12446
"pre_status\n"
12447
"~~~~~~~~~~"
12448
msgstr ""
12449
12450
#: en/help_topics/hooks.txt:497
12451
msgid ""
12452
"Called with argument StatusHookParams before Bazaar displays the\n"
12453
"status. StatusHookParams has the attributes (old_tree, new_tree,\n"
12454
"to_file, versioned, show_ids, short, verbose). The last four arguments\n"
12455
"correspond to the command line options specified by the user for the\n"
12456
"status command. to_file is the output stream for writing."
12457
msgstr ""
12458
12459
#: en/help_topics/hooks.txt:503
12460
msgid ""
12461
"TransportHooks\n"
12462
"--------------"
12463
msgstr ""
12464
12465
#: en/help_topics/hooks.txt:506
12466
msgid ""
12467
"post_connect\n"
12468
"~~~~~~~~~~~~"
12469
msgstr ""
12470
12471
#: en/help_topics/hooks.txt:511
12472
msgid ""
12473
"Called after a new connection is established or a reconnect occurs.\n"
12474
"The sole argument passed is either the connected transport or smart\n"
12475
"medium instance."
12476
msgstr ""
12477
12478
#: en/help_topics/hooks.txt:515
12479
msgid ""
12480
"RioVersionInfoBuilderHooks\n"
12481
"--------------------------"
12482
msgstr ""
12483
12484
#: en/help_topics/hooks.txt:518
12485
msgid ""
12486
"revision\n"
12487
"~~~~~~~~"
12488
msgstr ""
12489
12490
#: en/help_topics/hooks.txt:523
12491
msgid ""
12492
"Invoked when adding information about a revision to the RIO stanza\n"
12493
"that is printed. revision is called with a revision object and a RIO\n"
12494
"stanza.\n"
12495
msgstr ""
12496
12497
#: en/help_topics/location-alias.txt:1
12498
msgid ""
12499
"Location aliases\n"
12500
"================"
12501
msgstr ""
12502
12503
#: en/help_topics/location-alias.txt:4
12504
msgid ""
12505
"Bazaar defines several aliases for locations associated with a branch. "
12506
"These\n"
12507
"can be used with most commands that expect a location, such as `bzr push`."
12508
msgstr ""
12509
12510
#: en/help_topics/location-alias.txt:7
12511
msgid "The aliases are::"
12512
msgstr ""
12513
12514
#: en/help_topics/location-alias.txt:9
12515
msgid ""
12516
" :bound The branch this branch is bound to, for bound branches.\n"
12517
" :parent The parent of this branch.\n"
12518
" :public The public location of this branch.\n"
12519
" :push The saved location used for `bzr push` with no arguments.\n"
12520
" :submit The submit branch for this branch.\n"
12521
" :this This branch."
12522
msgstr ""
12523
12524
#: en/help_topics/location-alias.txt:16
12525
msgid "For example, to push to the parent location::"
12526
msgstr ""
12527
12528
#: en/help_topics/location-alias.txt:18
12529
msgid " bzr push :parent\n"
12530
msgstr ""
12531
12532
#: en/help_topics/log-formats.txt:1
12533
msgid ""
12534
"Log Formats\n"
12535
"==========="
12536
msgstr ""
12537
12538
#: en/help_topics/log-formats.txt:4
12539
msgid ""
12540
"A log format controls how information about each revision is displayed.\n"
12541
"The standard log formats are compared below::"
12542
msgstr ""
12543
12544
#: en/help_topics/log-formats.txt:7
12545
msgid ""
12546
" Feature long short line\n"
12547
" ---------------------- ------------- ------------ -------------------\n"
12548
" design goal detailed view concise view 1 revision per line\n"
12549
" committer name+email name only name only\n"
12550
" author name+email - -\n"
12551
" date-time format full date only date only\n"
12552
" commit message full full top line\n"
12553
" tags yes yes yes\n"
12554
" merges indicator - yes -\n"
12555
" status/delta optional optional -\n"
12556
" diff/patch optional optional -\n"
12557
" revision-id optional optional -\n"
12558
" branch nick yes - -\n"
12559
" foreign vcs properties yes yes -\n"
12560
" preferred levels all 1 1\n"
12561
" digital signature optional - -"
12562
msgstr ""
12563
12564
#: en/help_topics/log-formats.txt:24
12565
msgid ""
12566
"The default format is ``long``. To change this, define the ``log_format``\n"
12567
"setting in the ``[DEFAULT]`` section of ``bazaar.conf`` like this (say)::"
12568
msgstr ""
12569
12570
#: en/help_topics/log-formats.txt:27
12571
msgid ""
12572
" [DEFAULT]\n"
12573
" log_format = short"
12574
msgstr ""
12575
12576
#: en/help_topics/log-formats.txt:30
12577
msgid ""
12578
"Alternatively, to change the log format used for a given query, use the\n"
12579
"--long, --short or --line options."
12580
msgstr ""
12581
12582
#: en/help_topics/log-formats.txt:33
12583
msgid ""
12584
"If one of the standard log formats does not meet your needs, additional\n"
12585
"formats can be provided by plugins.\n"
12586
msgstr ""
12587
12588
#: en/help_topics/other-formats.txt:1
12589
msgid "Other Storage Formats"
12590
msgstr ""
12591
12592
#: en/help_topics/other-formats.txt:3
12593
msgid "Experimental formats are shown below."
12594
msgstr ""
12595
12596
#: en/help_topics/other-formats.txt:5
12597
msgid ""
12598
":development-colo:\n"
12599
" (native) The 2a format with experimental support for colocated\n"
12600
" branches."
12601
msgstr ""
12602
12603
#: en/help_topics/other-formats.txt:9
12604
msgid ""
12605
"\n"
12606
"Deprecated formats are shown below."
12607
msgstr ""
12608
12609
#: en/help_topics/other-formats.txt:12
12610
msgid ""
12611
":pack-0.92:\n"
12612
" (native) Pack-based format used in 1.x series. Introduced in 0.92.\n"
12613
" Interoperates with bzr repositories before 0.92 but cannot be read\n"
12614
" by bzr < 0.92."
12615
msgstr ""
12616
12617
#: en/help_topics/patterns.txt:1
12618
msgid ""
12619
"Patterns\n"
12620
"========"
12621
msgstr ""
12622
12623
#: en/help_topics/patterns.txt:4
12624
msgid ""
12625
"Bazaar uses patterns to match files at various times. For example,\n"
12626
"the ``add`` command skips over files that match ignore patterns\n"
12627
"and preferences can be associated with files using rule patterns.\n"
12628
"The pattern syntax is described below."
12629
msgstr ""
12630
12631
#: en/help_topics/patterns.txt:9
12632
msgid ""
12633
"Trailing slashes on patterns are ignored. If the pattern contains a\n"
12634
"slash or is a regular expression, it is compared to the whole path\n"
12635
"from the branch root. Otherwise, it is compared to only the last\n"
12636
"component of the path. To match a file only in the root directory,\n"
12637
"prepend ``./``. Patterns specifying absolute paths are not allowed."
12638
msgstr ""
12639
12640
#: en/help_topics/patterns.txt:15
12641
msgid "Patterns may include globbing wildcards such as::"
12642
msgstr ""
12643
12644
#: en/help_topics/patterns.txt:17
12645
msgid ""
12646
" ? - Matches any single character except '/'\n"
12647
" * - Matches 0 or more characters except '/'\n"
12648
" /**/ - Matches 0 or more directories in a path\n"
12649
" [a-z] - Matches a single character from within a group of characters"
12650
msgstr ""
12651
12652
#: en/help_topics/patterns.txt:22
12653
msgid ""
12654
"Patterns may also be `Python regular expressions`_. Regular expression\n"
12655
"patterns are identified by a ``RE:`` prefix followed by the regular\n"
12656
"expression. Regular expression patterns may not include named or\n"
12657
"numbered groups."
12658
msgstr ""
12659
12660
#: en/help_topics/patterns.txt:27
12661
msgid ""
12662
"Case insensitive ignore patterns can be specified with regular expressions\n"
12663
"by using the ``i`` (for ignore case) flag in the pattern."
12664
msgstr ""
12665
12666
#: en/help_topics/patterns.txt:30
12667
msgid ""
12668
"For example, a case insensitive match for ``foo`` may be specified as::"
12669
msgstr ""
12670
12671
#: en/help_topics/patterns.txt:32
12672
msgid " RE:(?i)foo"
12673
msgstr ""
12674
12675
#: en/help_topics/patterns.txt:34
12676
msgid ""
12677
"Ignore patterns may be prefixed with ``!``, which means that a filename\n"
12678
"matched by that pattern will not be ignored."
12679
msgstr ""
12680
12681
#: en/help_topics/patterns.txt:37
12682
msgid ""
12683
".. _Python regular expressions: http://docs.python.org/library/re.html"
12684
msgstr ""
12685
12686
#: en/help_topics/revisionspec.txt:1
12687
msgid "Revision Identifiers"
12688
msgstr ""
12689
12690
#: en/help_topics/revisionspec.txt:3
12691
msgid ""
12692
"A revision identifier refers to a specific state of a branch's history. It\n"
12693
"can be expressed in several ways. It can begin with a keyword to\n"
12694
"unambiguously specify a given lookup type; some examples are 'last:1',\n"
12695
"'before:yesterday' and 'submit:'."
12696
msgstr ""
12697
12698
#: en/help_topics/revisionspec.txt:8
12699
msgid ""
12700
"Alternately, it can be given without a keyword, in which case it will be\n"
12701
"checked as a revision number, a tag, a revision id, a date specification, or "
12702
"a\n"
12703
"branch specification, in that order. For example, 'date:today' could be\n"
12704
"written as simply 'today', though if you have a tag called 'today' that "
12705
"will\n"
12706
"be found first."
12707
msgstr ""
12708
12709
#: en/help_topics/revisionspec.txt:14
12710
msgid ""
12711
"If 'REV1' and 'REV2' are revision identifiers, then 'REV1..REV2' denotes a\n"
12712
"revision range. Examples: '3647..3649', 'date:yesterday..-1' and\n"
12713
"'branch:/path/to/branch1/..branch:/branch2' (note that there are no quotes "
12714
"or\n"
12715
"spaces around the '..')."
12716
msgstr ""
12717
12718
#: en/help_topics/revisionspec.txt:19
12719
msgid ""
12720
"Ranges are interpreted differently by different commands. To the \"log\" "
12721
"command,\n"
12722
"a range is a sequence of log messages, but to the \"diff\" command, the "
12723
"range\n"
12724
"denotes a change between revisions (and not a sequence of changes). In\n"
12725
"addition, \"log\" considers a closed range whereas \"diff\" and \"merge\" "
12726
"consider it\n"
12727
"to be open-ended, that is, they include one end but not the other. For "
12728
"example:\n"
12729
"\"bzr log -r 3647..3649\" shows the messages of revisions 3647, 3648 and "
12730
"3649,\n"
12731
"while \"bzr diff -r 3647..3649\" includes the changes done in revisions 3648 "
12732
"and\n"
12733
"3649, but not 3647."
12734
msgstr ""
12735
12736
#: en/help_topics/revisionspec.txt:28
12737
msgid "The keywords used as revision selection methods are the following:"
12738
msgstr ""
12739
12740
#: en/help_topics/revisionspec.txt:30
12741
msgid ""
12742
":revid:\n"
12743
"\tSelects a revision using the revision id.\n"
12744
":submit:\n"
12745
"\tSelects a common ancestor with the submit branch.\n"
12746
":ancestor:\n"
12747
"\tSelects a common ancestor with a second branch.\n"
12748
":date:\n"
12749
"\tSelects a revision on the basis of a datestamp.\n"
12750
":branch:\n"
12751
"\tSelects the last revision of a specified branch.\n"
12752
":tag:\n"
12753
"\tSelects a revision identified by a tag name.\n"
12754
":revno:\n"
12755
"\tSelects a revision using a number.\n"
12756
":before:\n"
12757
"\tSelects the parent of the revision specified.\n"
12758
":annotate:\n"
12759
"\tSelect the revision that last modified the specified line.\n"
12760
":mainline:\n"
12761
"\tSelect mainline revision that merged the specified revision.\n"
12762
":last:\n"
12763
"\tSelects the nth revision from the end."
12764
msgstr ""
12765
12766
#: en/help_topics/revisionspec.txt:53
12767
msgid "In addition, plugins can provide other keywords."
12768
msgstr ""
12769
12770
#: en/help_topics/revisionspec.txt:55
12771
msgid "A detailed description of each keyword is given below."
12772
msgstr ""
12773
12774
#: en/help_topics/revisionspec.txt:57
12775
msgid ":revid:"
12776
msgstr ""
12777
12778
#: en/help_topics/revisionspec.txt:59
12779
msgid ""
12780
" Supply a specific revision id, that can be used to specify any\n"
12781
" revision id in the ancestry of the branch.\n"
12782
" Including merges, and pending merges.\n"
12783
" Examples::"
12784
msgstr ""
12785
12786
#: en/help_topics/revisionspec.txt:64
12787
msgid ""
12788
" revid:aaaa@bbbb-123456789 -> Select revision 'aaaa@bbbb-123456789'"
12789
msgstr ""
12790
12791
#: en/help_topics/revisionspec.txt:66
12792
msgid ":submit:"
12793
msgstr ""
12794
12795
#: en/help_topics/revisionspec.txt:68
12796
msgid ""
12797
" Diffing against this shows all the changes that were made in this "
12798
"branch,\n"
12799
" and is a good predictor of what merge will do. The submit branch is\n"
12800
" used by the bundle and merge directive commands. If no submit branch\n"
12801
" is specified, the parent branch is used instead."
12802
msgstr ""
12803
12804
#: en/help_topics/revisionspec.txt:73 en/help_topics/revisionspec.txt:85
12805
msgid ""
12806
" The common ancestor is the last revision that existed in both\n"
12807
" branches. Usually this is the branch point, but it could also be\n"
12808
" a revision that was merged."
12809
msgstr ""
12810
12811
#: en/help_topics/revisionspec.txt:77 en/help_topics/revisionspec.txt:93
12812
#: en/help_topics/revisionspec.txt:109 en/help_topics/revisionspec.txt:119
12813
#: en/help_topics/revisionspec.txt:153
12814
msgid " Examples::"
12815
msgstr ""
12816
12817
#: en/help_topics/revisionspec.txt:79
12818
msgid " $ bzr diff -r submit:"
12819
msgstr ""
12820
12821
#: en/help_topics/revisionspec.txt:81
12822
msgid ":ancestor:"
12823
msgstr ""
12824
12825
#: en/help_topics/revisionspec.txt:83
12826
msgid " Supply the path to a branch to select the common ancestor."
12827
msgstr ""
12828
12829
#: en/help_topics/revisionspec.txt:89
12830
msgid ""
12831
" This is frequently used with 'diff' to return all of the changes\n"
12832
" that your branch introduces, while excluding the changes that you\n"
12833
" have not merged from the remote branch."
12834
msgstr ""
12835
12836
#: en/help_topics/revisionspec.txt:95
12837
msgid ""
12838
" ancestor:/path/to/branch\n"
12839
" $ bzr diff -r ancestor:../../mainline/branch"
12840
msgstr ""
12841
12842
#: en/help_topics/revisionspec.txt:98
12843
msgid ":date:"
12844
msgstr ""
12845
12846
#: en/help_topics/revisionspec.txt:100
12847
msgid ""
12848
" Supply a datestamp to select the first revision that matches the date.\n"
12849
" Date can be 'yesterday', 'today', 'tomorrow' or a YYYY-MM-DD string.\n"
12850
" Matches the first entry after a given date (either at midnight or\n"
12851
" at a specified time)."
12852
msgstr ""
12853
12854
#: en/help_topics/revisionspec.txt:105
12855
msgid " One way to display all the changes since yesterday would be::"
12856
msgstr ""
12857
12858
#: en/help_topics/revisionspec.txt:107
12859
msgid " bzr log -r date:yesterday.."
12860
msgstr ""
12861
12862
#: en/help_topics/revisionspec.txt:111
12863
msgid ""
12864
" date:yesterday -> select the first revision since "
12865
"yesterday\n"
12866
" date:2006-08-14,17:10:14 -> select the first revision after\n"
12867
" August 14th, 2006 at 5:10pm."
12868
msgstr ""
12869
12870
#: en/help_topics/revisionspec.txt:115
12871
msgid ":branch:"
12872
msgstr ""
12873
12874
#: en/help_topics/revisionspec.txt:117
12875
msgid " Supply the path to a branch to select its last revision."
12876
msgstr ""
12877
12878
#: en/help_topics/revisionspec.txt:121
12879
msgid " branch:/path/to/branch"
12880
msgstr ""
12881
12882
#: en/help_topics/revisionspec.txt:123
12883
msgid ":tag:"
12884
msgstr ""
12885
12886
#: en/help_topics/revisionspec.txt:125
12887
msgid " Tags are stored in the branch and created by the 'tag' command."
12888
msgstr ""
12889
12890
#: en/help_topics/revisionspec.txt:127
12891
msgid ":revno:"
12892
msgstr ""
12893
12894
#: en/help_topics/revisionspec.txt:129
12895
msgid ""
12896
" Use an integer to specify a revision in the history of the branch.\n"
12897
" Optionally a branch can be specified. A negative number will count\n"
12898
" from the end of the branch (-1 is the last revision, -2 the previous\n"
12899
" one). If the negative number is larger than the branch's history, the\n"
12900
" first revision is returned.\n"
12901
" Examples::"
12902
msgstr ""
12903
12904
#: en/help_topics/revisionspec.txt:136
12905
msgid ""
12906
" revno:1 -> return the first revision of this branch\n"
12907
" revno:3:/path/to/branch -> return the 3rd revision of\n"
12908
" the branch '/path/to/branch'\n"
12909
" revno:-1 -> The last revision in a branch.\n"
12910
" -2:http://other/branch -> The second to last revision in the\n"
12911
" remote branch.\n"
12912
" -1000000 -> Most likely the first revision, unless\n"
12913
" your history is very long."
12914
msgstr ""
12915
12916
#: en/help_topics/revisionspec.txt:145
12917
msgid ":before:"
12918
msgstr ""
12919
12920
#: en/help_topics/revisionspec.txt:147
12921
msgid ""
12922
" Supply any revision spec to return the parent of that revision. This "
12923
"is\n"
12924
" mostly useful when inspecting revisions that are not in the revision "
12925
"history\n"
12926
" of a branch."
12927
msgstr ""
12928
12929
#: en/help_topics/revisionspec.txt:151
12930
msgid ""
12931
" It is an error to request the parent of the null revision (before:0)."
12932
msgstr ""
12933
12934
#: en/help_topics/revisionspec.txt:155
12935
msgid ""
12936
" before:1913 -> Return the parent of revno 1913 (revno 1912)\n"
12937
" before:revid:aaaa@bbbb-1234567890 -> return the parent of revision\n"
12938
" aaaa@bbbb-1234567890\n"
12939
" bzr diff -r before:1913..1913\n"
12940
" -> Find the changes between revision 1913 and its parent "
12941
"(1912).\n"
12942
" (What changes did revision 1913 introduce).\n"
12943
" This is equivalent to: bzr diff -c 1913"
12944
msgstr ""
12945
12946
#: en/help_topics/revisionspec.txt:163
12947
msgid ":annotate:"
12948
msgstr ""
12949
12950
#: en/help_topics/revisionspec.txt:165
12951
msgid ""
12952
" Select the revision that last modified the specified line. Line is\n"
12953
" specified as path:number. Path is a relative path to the file. "
12954
"Numbers\n"
12955
" start at 1, and are relative to the current version, not the last-\n"
12956
" committed version of the file."
12957
msgstr ""
12958
12959
#: en/help_topics/revisionspec.txt:170
12960
msgid ":mainline:"
12961
msgstr ""
12962
12963
#: en/help_topics/revisionspec.txt:172
12964
msgid ""
12965
" Select the revision that merged the specified revision into mainline."
12966
msgstr ""
12967
12968
#: en/help_topics/revisionspec.txt:174
12969
msgid ":last:"
12970
msgstr ""
12971
12972
#: en/help_topics/revisionspec.txt:176
12973
msgid ""
12974
" Supply a positive number to get the nth revision from the end.\n"
12975
" This is the same as supplying negative numbers to the 'revno:' spec.\n"
12976
" Examples::"
12977
msgstr ""
12978
12979
#: en/help_topics/revisionspec.txt:180
12980
msgid ""
12981
" last:1 -> return the last revision\n"
12982
" last:3 -> return the revision 2 before the end.\n"
12983
msgstr ""
12984
12985
#: en/help_topics/rules.txt:1
12986
msgid ""
12987
"Rules\n"
12988
"====="
12989
msgstr ""
12990
12991
#: en/help_topics/rules.txt:7
12992
msgid ""
12993
"Rules are defined in ini file format where the sections are file glob\n"
12994
"patterns and the contents of each section are the preferences for files\n"
12995
"matching that pattern(s). For example::"
12996
msgstr ""
12997
12998
#: en/help_topics/rules.txt:11
12999
msgid ""
13000
" [name *.bat]\n"
13001
" eol = native"
13002
msgstr ""
13003
13004
#: en/help_topics/rules.txt:14
13005
msgid ""
13006
" [name *.html *.xml]\n"
13007
" keywords = xml_escape"
13008
msgstr ""
13009
13010
#: en/help_topics/rules.txt:17
13011
msgid ""
13012
"Preferences like these are useful for commands and plugins wishing to\n"
13013
"provide custom behaviour for selected files. For more information on \n"
13014
"end of line conversion see :doc:`eol-help`.\n"
13015
"Keyword support is provided by the `keywords plugin\n"
13016
"<http://doc.bazaar.canonical.com/plugins/en/keywords-plugin.html>`_."
13017
msgstr ""
13018
13019
#: en/help_topics/rules.txt:23
13020
msgid ""
13021
"Files\n"
13022
"-----"
13023
msgstr ""
13024
13025
#: en/help_topics/rules.txt:26
13026
msgid ""
13027
"Default rules for all branches are defined in the optional file\n"
13028
"``BZR_HOME/rules``. "
13029
msgstr ""
13030
13031
#: en/help_topics/rules.txt:29
13032
msgid ""
13033
"Rule Patterns\n"
13034
"-------------"
13035
msgstr ""
13036
13037
#: en/help_topics/rules.txt:32
13038
msgid ""
13039
"Patterns are ordered and searching stops as soon as one matches.\n"
13040
"As a consequence, more explicit patterns should be placed towards\n"
13041
"the top of the file. Rule patterns use exactly the same conventions\n"
13042
"as ignore patterns. See :doc:`patterns-help` for details."
13043
msgstr ""
13044
13045
#: en/help_topics/rules.txt:37
13046
msgid ".. note::"
13047
msgstr ""
13048
13049
#: en/help_topics/rules.txt:39
13050
msgid ""
13051
" Patterns containing square brackets or spaces should be\n"
13052
" surrounded in quotes to ensure they are correctly parsed.\n"
13053
msgstr ""
13054
13055
#: en/help_topics/topics.txt:1
13056
msgid ""
13057
"authentication Information on configuring authentication\n"
13058
"basic Basic commands\n"
13059
"branches Information on what a branch is\n"
13060
"bugs Bug tracker settings\n"
13061
"checkouts Information on what a checkout is\n"
13062
"commands Basic help for all commands\n"
13063
"configuration Details on the configuration settings available\n"
13064
"conflict-types Types of conflicts and what to do about them\n"
13065
"content-filters Conversion of content into/from working trees\n"
13066
"criss-cross Information on criss-cross merging\n"
13067
"current-formats Current storage formats\n"
13068
"debug-flags Options to show or record debug information\n"
13069
"diverged-branches How to fix diverged branches\n"
13070
"env-variables Environment variable names and values\n"
13071
"eol Information on end-of-line handling\n"
13072
"files Information on configuration and log files\n"
13073
"formats Information on choosing a storage format\n"
13074
"global-options Options that control how Bazaar runs\n"
13075
"hidden-commands All hidden commands\n"
13076
"hooks Points at which custom processing can be added\n"
13077
"launchpad Using Bazaar with Launchpad.net\n"
13078
"location-alias Aliases for remembered locations\n"
13079
"log-formats Details on the logging formats available\n"
13080
"other-formats Experimental and deprecated storage formats\n"
13081
"patterns Information on the pattern syntax\n"
13082
"repositories Basic information on shared repositories.\n"
13083
"revisionspec Explain how to use --revision\n"
13084
"rules Information on defining rule-based preferences\n"
13085
"standalone-trees Information on what a standalone tree is\n"
13086
"standard-options Options that can be used with any command\n"
13087
"status-flags Help on status flags\n"
13088
"sync-for-reconfigure Steps to resolve \"out-of-sync\" when reconfiguring\n"
13089
"topics Topics list\n"
13090
"url-special-chars Special character handling in URLs\n"
13091
"urlspec Supported transport protocols\n"
13092
"working-trees Information on working trees\n"
13093
msgstr ""
13094
13095
#: en/help_topics/url-special-chars.txt:1
13096
msgid ""
13097
"Special character handling in URLs\n"
13098
"=================================="
13099
msgstr ""
13100
13101
#: en/help_topics/url-special-chars.txt:4
13102
msgid "Bazaar allows locations to be specified in multiple ways, either:"
13103
msgstr ""
13104
13105
#: en/help_topics/url-special-chars.txt:6
13106
msgid " * Fully qualified URLs"
13107
msgstr ""
13108
13109
#: en/help_topics/url-special-chars.txt:8
13110
msgid " * File system paths, relative or absolute"
13111
msgstr ""
13112
13113
#: en/help_topics/url-special-chars.txt:10
13114
msgid ""
13115
"Internally bzr treats all locations as URLs. For any file system paths\n"
13116
"that are specified it will automatically determine the appropriate URL\n"
13117
"representation, and escape special characters where necessary."
13118
msgstr ""
13119
13120
#: en/help_topics/url-special-chars.txt:14
13121
msgid ""
13122
"There are a few characters which have special meaning in URLs and need "
13123
"careful\n"
13124
"handling to avoid ambiguities. Characters can be escaped with a % and a hex\n"
13125
"value in URLs. Any non-ASCII characters in a file path will automatically "
13126
"be\n"
13127
"urlencoded when the path is converted to a URL."
13128
msgstr ""
13129
13130
#: en/help_topics/url-special-chars.txt:19
13131
msgid ""
13132
"URLs represent non-ASCII characters in an encoding defined by the server, "
13133
"but\n"
13134
"usually UTF-8. The % escapes should be of the UTF-8 bytes. Bazaar tries to "
13135
"be\n"
13136
"generous in what it accepts as a URL and to print them in a way that\n"
13137
"will be readable."
13138
msgstr ""
13139
13140
#: en/help_topics/url-special-chars.txt:24
13141
msgid ""
13142
"For example, if you have a directory named '/tmp/%2False' these are all "
13143
"valid\n"
13144
"ways of accessing the content (0x2F, or 47, is the ASCII code for forward "
13145
"slash)::"
13146
msgstr ""
13147
13148
#: en/help_topics/url-special-chars.txt:27
13149
msgid ""
13150
" cd /tmp\n"
13151
" bzr log /tmp/%2False\n"
13152
" bzr log %2False\n"
13153
" bzr log file:///tmp/%252False\n"
13154
" bzr log file://localhost/tmp/%252False\n"
13155
" bzr log file:%252False"
13156
msgstr ""
13157
13158
#: en/help_topics/url-special-chars.txt:34
13159
msgid "These are valid but do not refer to the same file::"
13160
msgstr ""
13161
13162
#: en/help_topics/url-special-chars.txt:36
13163
msgid ""
13164
" bzr log file:///tmp/%2False (refers to a file called /tmp/\\/alse)\n"
13165
" bzr log %252False (refers to a file called /tmp/%252False)"
13166
msgstr ""
13167
13168
#: en/help_topics/url-special-chars.txt:39
13169
msgid ""
13170
"Comma also has special meaning in URLs, because it denotes `segment "
13171
"parameters`_"
13172
msgstr ""
13173
13174
#: en/help_topics/url-special-chars.txt:41
13175
msgid ""
13176
"_`segment parameters`: http://www.ietf.org/rfc/rfc3986.txt (section 3.3)"
13177
msgstr ""
13178
13179
#: en/help_topics/url-special-chars.txt:43
13180
msgid ""
13181
"Comma is also special in any file system paths that are specified. To use a "
13182
"literal\n"
13183
"comma in a file system path, specify a URL and URL encode the comma::"
13184
msgstr ""
13185
13186
#: en/help_topics/url-special-chars.txt:46
13187
msgid ""
13188
" bzr log foo,branch=bla # path \"foo\" with the segment parameter "
13189
"\"branch\" set to \"bla\"\n"
13190
" bzr log file:foo%2Cbranch=bla # path \"foo,branch=bla\"\n"
13191
" bzr log file:foo,branch=bla # path \"foo\" with segment parameter "
13192
"\"branch\" set to \"bla\"\n"
13193
msgstr ""
13194
13195
#: en/help_topics/urlspec.txt:1
13196
msgid "URL Identifiers"
13197
msgstr ""
13198
13199
#: en/help_topics/urlspec.txt:3
13200
msgid "Supported URL prefixes::"
13201
msgstr ""
13202
13203
#: en/help_topics/urlspec.txt:5
13204
msgid ""
13205
" aftp:// Access using active FTP.\n"
13206
" bzr:// Fast access using the Bazaar smart server.\n"
13207
" bzr+ssh:// Fast access using the Bazaar smart server over SSH.\n"
13208
" file:// Access using the standard filesystem (default)\n"
13209
" ftp:// Access using passive FTP.\n"
13210
" http:// Read-only access of branches exported on the web.\n"
13211
" https:// Read-only access of branches exported on the web using "
13212
"SSL.\n"
13213
" sftp:// Access using SFTP (most SSH servers provide SFTP)."
13214
msgstr ""
13215
13216
#: en/help_topics/urlspec.txt:14
13217
msgid "Supported modifiers::"
13218
msgstr ""
13219
13220
#: en/help_topics/urlspec.txt:16
13221
msgid " gio+ Access using any GIO supported protocols."
13222
msgstr ""
13223
13224
#: en/help_topics/urlspec.txt:18
13225
msgid "Bazaar supports all of the standard parts within the URL::"
13226
msgstr ""
13227
13228
#: en/help_topics/urlspec.txt:20
13229
msgid " <protocol>://[user[:password]@]host[:port]/[path]"
13230
msgstr ""
13231
13232
#: en/help_topics/urlspec.txt:22
13233
msgid "allowing URLs such as::"
13234
msgstr ""
13235
13236
#: en/help_topics/urlspec.txt:24
13237
msgid " http://bzruser:BadPass@bzr.example.com:8080/bzr/trunk"
13238
msgstr ""
13239
13240
#: en/help_topics/urlspec.txt:26
13241
msgid ""
13242
"For bzr+ssh:// and sftp:// URLs, Bazaar also supports paths that begin\n"
13243
"with '~' as meaning that the rest of the path should be interpreted\n"
13244
"relative to the remote user's home directory. For example if the user\n"
13245
"``remote`` has a home directory of ``/home/remote`` on the server\n"
13246
"shell.example.com, then::"
13247
msgstr ""
13248
13249
#: en/help_topics/urlspec.txt:32
13250
msgid " bzr+ssh://remote@shell.example.com/~/myproject/trunk"
13251
msgstr ""
13252
13253
#: en/help_topics/urlspec.txt:34
13254
msgid "would refer to ``/home/remote/myproject/trunk``."
13255
msgstr ""
13256
13257
#: en/help_topics/urlspec.txt:36
13258
msgid ""
13259
"Many commands that accept URLs also accept location aliases too.\n"
13260
"See :doc:`location-alias-help` and :doc:`url-special-chars-help`.\n"
13261
msgstr ""
Loggerhead is a web-based interface for Breezy
Version: 2.0.1