« back to all changes in this revision
Viewing changes to po/gl.po
- browse files at revision 6404.6.10
- compare with another revision
- compare with revision 2520.4.6
- download diff
- download tarball
- view history from revision 6404.6.10
- Committer: Vincent Ladeuil
- Date: 2012-02-14 17:22:37 UTC
- mfrom: (6466 +trunk)
- mto: This revision was merged to the branch mainline in revision 6468.
- Revision ID: v.ladeuil+lp@free.fr-20120214172237-7dv7er3n4uy8d5m4
Merge trunk
- files added:
- bzrlib/tests/test_https_urllib.py
- files modified:
- bzr
added
removed
po/gl.po
1
# Galician 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-01-16 15:18+0100\n"
11
"PO-Revision-Date: 2012-01-16 16:40+0000\n"
12
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
13
"Language-Team: Galician <gl@li.org>\n"
14
"MIME-Version: 1.0\n"
15
"Content-Type: text/plain; charset=UTF-8\n"
16
"Content-Transfer-Encoding: 8bit\n"
17
"Plural-Forms: nplurals=2; plural=n != 1;\n"
18
"X-Launchpad-Export-Date: 2012-01-17 05:16+0000\n"
19
"X-Generator: Launchpad (build 14676)\n"
20
21
#: bzrlib/add.py:95
22
msgid "skipping {0} (larger than {1} of {2} bytes)"
23
msgstr ""
24
25
#: bzrlib/branch.py:872
26
msgid "Unstacking"
27
msgstr ""
28
29
#: bzrlib/branch.py:3183
30
#, python-format
31
msgid "Pushed up to revision %d."
32
msgstr ""
33
34
#: bzrlib/branch.py:3185
35
#, python-format
36
msgid "%d tag updated."
37
msgid_plural "%d tags updated."
38
msgstr[0] ""
39
msgstr[1] ""
40
41
#: bzrlib/branch.py:3188
42
msgid "No new revisions or tags to push."
43
msgstr "Non hai revisións ou etiquetas para empurar (push)."
44
45
#: bzrlib/branch.py:3190
46
msgid "No new revisions to push."
47
msgstr "Non hai revisións novas para empurrar (push)."
48
49
#: bzrlib/branch.py:3210
50
msgid "checked branch {0} format {1}"
51
msgstr ""
52
53
#: bzrlib/branch.py:3213
54
#, python-format
55
msgid "found error:%s"
56
msgstr "atopouse un erro: %s"
57
58
#: bzrlib/builtins.py:121 bzrlib/builtins.py:2923 bzrlib/workingtree.py:315
59
#, python-format
60
msgid "Ignoring files outside view. View is %s"
61
msgstr "Ignorando os ficheiros fóra da vista. A vista é %s"
62
63
#: bzrlib/builtins.py:130
64
#, python-format
65
msgid "bzr %s --revision takes exactly one revision identifier"
66
msgstr "bzr %s --revision toma exactamente un identificador de revisión"
67
68
#: bzrlib/builtins.py:215
69
msgid "Display status summary."
70
msgstr "Mostrar o resumo do estado."
71
72
#: bzrlib/builtins.py:217
73
msgid ""
74
"This reports on versioned and unknown files, reporting them\n"
75
"grouped by state. Possible states are:"
76
msgstr ""
77
"Isto informa sobre ficheiros versionados e descoñecidos, informando\n"
78
"deles agrupados por estado. Os estados posíbeis son:"
79
80
#: bzrlib/builtins.py:220
81
msgid ""
82
"added\n"
83
" Versioned in the working copy but not in the previous revision."
84
msgstr ""
85
"engadido\n"
86
" Versionado na copia de traballo pero non na revisión anterior."
87
88
#: bzrlib/builtins.py:223
89
msgid ""
90
"removed\n"
91
" Versioned in the previous revision but removed or deleted\n"
92
" in the working copy."
93
msgstr ""
94
"eliminado\n"
95
" Versionado na revisión anterior pero quitado ou eliminado\n"
96
" na copia de traballo."
97
98
#: bzrlib/builtins.py:227
99
msgid ""
100
"renamed\n"
101
" Path of this file changed from the previous revision;\n"
102
" the text may also have changed. This includes files whose\n"
103
" parent directory was renamed."
104
msgstr ""
105
"renomeado\n"
106
" A ruta a este ficheiro cambiou desde a revisión anterior;\n"
107
" o texto semella que cambiou. Isto inclúe os ficheiros cuxo\n"
108
" cartafol pai foi renomeado."
109
110
#: bzrlib/builtins.py:232
111
msgid ""
112
"modified\n"
113
" Text has changed since the previous revision."
114
msgstr ""
115
"modificado\n"
116
" O texto cambiou desde a última revisión."
117
118
#: bzrlib/builtins.py:235
119
msgid ""
120
"kind changed\n"
121
" File kind has been changed (e.g. from file to directory)."
122
msgstr ""
123
"semella cambiado\n"
124
" O ficheiro semella que foi cambiado (p.ex. de ficheiro a cartafol)"
125
126
#: bzrlib/builtins.py:238
127
msgid ""
128
"unknown\n"
129
" Not versioned and not matching an ignore pattern."
130
msgstr ""
131
"descoñecido\n"
132
" Non versionado e non coincide cun patrón de ignorado."
133
134
#: bzrlib/builtins.py:241
135
msgid ""
136
"Additionally for directories, symlinks and files with a changed\n"
137
"executable bit, Bazaar indicates their type using a trailing\n"
138
"character: '/', '@' or '*' respectively. These decorations can be\n"
139
"disabled using the '--no-classify' option."
140
msgstr ""
141
142
#: bzrlib/builtins.py:246
143
msgid ""
144
"To see ignored files use 'bzr ignored'. For details on the\n"
145
"changes to file texts, use 'bzr diff'."
146
msgstr ""
147
"Para ver os ficheiros use «bzr ignored». Para máis información\n"
148
"sobre os cambios nos textos dos ficheiros use «bzr diff»."
149
150
#: bzrlib/builtins.py:249
151
msgid ""
152
"Note that --short or -S gives status flags for each item, similar\n"
153
"to Subversion's status command. To get output similar to svn -q,\n"
154
"use bzr status -SV."
155
msgstr ""
156
157
#: bzrlib/builtins.py:253
158
msgid ""
159
"If no arguments are specified, the status of the entire working\n"
160
"directory is shown. Otherwise, only the status of the specified\n"
161
"files or directories is reported. If a directory is given, status\n"
162
"is reported for everything inside that directory."
163
msgstr ""
164
165
#: bzrlib/builtins.py:258
166
msgid ""
167
"Before merges are committed, the pending merge tip revisions are\n"
168
"shown. To see all pending merge revisions, use the -v option.\n"
169
"To skip the display of pending merge information altogether, use\n"
170
"the no-pending option or specify a file/directory."
171
msgstr ""
172
173
#: bzrlib/builtins.py:263
174
msgid ""
175
"To compare the working directory to a specific revision, pass a\n"
176
"single revision to the revision argument."
177
msgstr ""
178
"Para comparar o cartafol de traballo con unha revisión específica, pase\n"
179
"unha revisión ao argumento «revision»."
180
181
#: bzrlib/builtins.py:266
182
msgid ""
183
"To see which files have changed in a specific revision, or between\n"
184
"two revisions, pass a revision range to the revision argument.\n"
185
"This will produce the same results as calling 'bzr diff --summarize'."
186
msgstr ""
187
188
#: bzrlib/builtins.py:275
189
msgid "Use short status indicators."
190
msgstr "Usar os indicadores de estado curtos"
191
192
#: bzrlib/builtins.py:277
193
msgid "Only show versioned files."
194
msgstr "Mostrar só os ficheiros versionados."
195
196
#: bzrlib/builtins.py:279
197
msgid "Don't show pending merges."
198
msgstr "Non mostrar as combinacións (merge) pendentes"
199
200
#: bzrlib/builtins.py:282
201
msgid "Do not mark object type using indicator."
202
msgstr ""
203
204
#: bzrlib/builtins.py:297
205
msgid "bzr status --revision takes exactly one or two revision specifiers"
206
msgstr ""
207
208
#: bzrlib/builtins.py:341 bzrlib/builtins.py:5090
209
msgid "You can only supply one of revision_id or --revision"
210
msgstr ""
211
212
#: bzrlib/builtins.py:344 bzrlib/builtins.py:5092
213
msgid "You must supply either --revision or a revision_id"
214
msgstr "Debe fornecer ou --revision ou un id_de_revision"
215
216
#: bzrlib/builtins.py:351
217
#, python-format
218
msgid "Repository %r does not support access to raw revision texts"
219
msgstr ""
220
221
#: bzrlib/builtins.py:362
222
msgid "The repository {0} contains no revision {1}."
223
msgstr ""
224
225
#: bzrlib/builtins.py:369
226
msgid "You cannot specify a NULL revision."
227
msgstr ""
228
229
#: bzrlib/builtins.py:461
230
msgid "Remove the working tree from a given branch/checkout."
231
msgstr ""
232
233
#: bzrlib/builtins.py:463
234
msgid ""
235
"Since a lightweight checkout is little more than a working tree\n"
236
"this will refuse to run against one."
237
msgstr ""
238
239
#: bzrlib/builtins.py:466
240
msgid "To re-create the working tree, use \"bzr checkout\"."
241
msgstr ""
242
243
#: bzrlib/builtins.py:472
244
msgid ""
245
"Remove the working tree even if it has uncommitted or shelved changes."
246
msgstr ""
247
248
#: bzrlib/builtins.py:486
249
msgid "No working tree to remove"
250
msgstr ""
251
252
#: bzrlib/builtins.py:488
253
msgid "You cannot remove the working tree of a remote path"
254
msgstr "Non pode eliminar o cartafol de traballo desde unha ruta remota"
255
256
#: bzrlib/builtins.py:497
257
msgid "You cannot remove the working tree from a lightweight checkout"
258
msgstr ""
259
260
#: bzrlib/builtins.py:537
261
msgid ""
262
"The tree does not appear to be corrupt. You probably want \"bzr revert\" "
263
"instead. Use \"--force\" if you are sure you want to reset the working tree."
264
msgstr ""
265
266
#: bzrlib/builtins.py:548
267
msgid ""
268
", the header appears corrupt, try passing -r -1 to set the state to the last "
269
"commit"
270
msgstr ""
271
272
#: bzrlib/builtins.py:552
273
msgid "failed to reset the tree state{0}"
274
msgstr ""
275
276
#: bzrlib/builtins.py:556
277
msgid "Show current revision number."
278
msgstr ""
279
280
#: bzrlib/builtins.py:558
281
msgid "This is equal to the number of revisions on this branch."
282
msgstr ""
283
284
#: bzrlib/builtins.py:571
285
msgid "--tree and --revision can not be used together"
286
msgstr ""
287
288
#: bzrlib/builtins.py:588 bzrlib/builtins.py:5874
289
msgid "Tags can only be placed on a single revision, not on a range"
290
msgstr ""
291
292
#: bzrlib/builtins.py:612
293
msgid "Show revno of working tree."
294
msgstr ""
295
296
#: bzrlib/builtins.py:660
297
msgid "Add specified files or directories."
298
msgstr ""
299
300
#: bzrlib/builtins.py:662
301
msgid ""
302
"In non-recursive mode, all the named items are added, regardless\n"
303
"of whether they were previously ignored. A warning is given if\n"
304
"any of the named files are already versioned."
305
msgstr ""
306
307
#: bzrlib/builtins.py:666
308
msgid ""
309
"In recursive mode (the default), files are treated the same way\n"
310
"but the behaviour for directories is different. Directories that\n"
311
"are already versioned do not give a warning. All directories,\n"
312
"whether already versioned or not, are searched for files or\n"
313
"subdirectories that are neither versioned or ignored, and these\n"
314
"are added. This search proceeds recursively into versioned\n"
315
"directories. If no names are given '.' is assumed."
316
msgstr ""
317
318
#: bzrlib/builtins.py:674
319
msgid ""
320
"A warning will be printed when nested trees are encountered,\n"
321
"unless they are explicitly ignored."
322
msgstr ""
323
324
#: bzrlib/builtins.py:677
325
msgid ""
326
"Therefore simply saying 'bzr add' will version all files that\n"
327
"are currently unknown."
328
msgstr ""
329
330
#: bzrlib/builtins.py:680
331
msgid ""
332
"Adding a file whose parent directory is not versioned will\n"
333
"implicitly add the parent, and so on up to the root. This means\n"
334
"you should never need to explicitly add a directory, they'll just\n"
335
"get added when you add a file in the directory."
336
msgstr ""
337
338
#: bzrlib/builtins.py:685
339
msgid ""
340
"--dry-run will show which files would be added, but not actually\n"
341
"add them."
342
msgstr ""
343
344
#: bzrlib/builtins.py:688
345
msgid ""
346
"--file-ids-from will try to use the file ids from the supplied path.\n"
347
"It looks up ids trying to find a matching parent directory with the\n"
348
"same filename, and then by pure path. This option is rarely needed\n"
349
"but can be useful when adding the same logical file into two\n"
350
"branches that will be merged later (without showing the two different\n"
351
"adds as a conflict). It is also useful when merging another project\n"
352
"into a subdirectory of this one."
353
msgstr ""
354
355
#: bzrlib/builtins.py:696
356
msgid ""
357
"Any files matching patterns in the ignore list will not be added\n"
358
"unless they are explicitly mentioned."
359
msgstr ""
360
361
#: bzrlib/builtins.py:699
362
msgid ""
363
"In recursive mode, files larger than the configuration option \n"
364
"add.maximum_file_size will be skipped. Named items are never skipped due\n"
365
"to file size."
366
msgstr ""
367
368
#: bzrlib/builtins.py:706
369
msgid "Don't recursively add the contents of directories."
370
msgstr ""
371
372
#: bzrlib/builtins.py:712
373
msgid "Lookup file ids from this tree."
374
msgstr ""
375
376
#: bzrlib/builtins.py:748
377
msgid "ignored {0} matching \"{1}\"\n"
378
msgstr ""
379
380
#: bzrlib/builtins.py:753
381
msgid "Create a new versioned directory."
382
msgstr ""
383
384
#: bzrlib/builtins.py:755
385
msgid "This is equivalent to creating the directory and then adding it."
386
msgstr ""
387
388
#: bzrlib/builtins.py:762
389
msgid "No error if existing, make parent directories as needed."
390
msgstr ""
391
392
#: bzrlib/builtins.py:796
393
#, python-format
394
msgid "added %s\n"
395
msgstr ""
396
397
#: bzrlib/builtins.py:838
398
#, python-format
399
msgid "invalid kind %r specified"
400
msgstr ""
401
402
#: bzrlib/builtins.py:875
403
msgid "Move or rename a file."
404
msgstr ""
405
406
#: bzrlib/builtins.py:877
407
msgid " bzr mv SOURCE... DESTINATION"
408
msgstr ""
409
410
#: bzrlib/builtins.py:879
411
msgid ""
412
"If the last argument is a versioned directory, all the other names\n"
413
"are moved into it. Otherwise, there must be exactly two arguments\n"
414
"and the file is changed to a new name."
415
msgstr ""
416
417
#: bzrlib/builtins.py:883
418
msgid ""
419
"If OLDNAME does not exist on the filesystem but is versioned and\n"
420
"NEWNAME does exist on the filesystem but is not versioned, mv\n"
421
"assumes that the file has been manually moved and only updates\n"
422
"its internal inventory to reflect that change.\n"
423
"The same is valid when moving many SOURCE files to a DESTINATION."
424
msgstr ""
425
426
#: bzrlib/builtins.py:889
427
msgid "Files cannot be moved between branches."
428
msgstr ""
429
430
#: bzrlib/builtins.py:896
431
msgid ""
432
"Move only the bzr identifier of the file, because the file has already been "
433
"moved."
434
msgstr ""
435
436
#: bzrlib/builtins.py:898
437
msgid "Automatically guess renames."
438
msgstr ""
439
440
#: bzrlib/builtins.py:899
441
msgid "Avoid making changes when guessing renames."
442
msgstr ""
443
444
#: bzrlib/builtins.py:908
445
msgid "--dry-run requires --auto."
446
msgstr ""
447
448
#: bzrlib/builtins.py:912
449
msgid "missing file argument"
450
msgstr ""
451
452
#: bzrlib/builtins.py:916
453
msgid "can not move root of branch"
454
msgstr ""
455
456
#: bzrlib/builtins.py:922
457
msgid "Only one path may be specified to --auto."
458
msgstr ""
459
460
#: bzrlib/builtins.py:925
461
msgid "--after cannot be specified with --auto."
462
msgstr ""
463
464
#: bzrlib/builtins.py:962
465
msgid "to mv multiple files the destination must be a versioned directory"
466
msgstr ""
467
468
#: bzrlib/builtins.py:1014
469
msgid "Turn this branch into a mirror of another branch."
470
msgstr ""
471
472
#: bzrlib/builtins.py:1016
473
msgid ""
474
"By default, this command only works on branches that have not diverged.\n"
475
"Branches are considered diverged if the destination branch's most recent \n"
476
"commit is one that has not been merged (directly or indirectly) into the \n"
477
"parent."
478
msgstr ""
479
480
#: bzrlib/builtins.py:1021
481
msgid ""
482
"If branches have diverged, you can use 'bzr merge' to integrate the changes\n"
483
"from one into the other. Once one branch has merged, the other should\n"
484
"be able to pull it again."
485
msgstr ""
486
487
#: bzrlib/builtins.py:1025
488
msgid ""
489
"If you want to replace your local changes and just want your branch to\n"
490
"match the remote one, use pull --overwrite. This will work even if the two\n"
491
"branches have diverged."
492
msgstr ""
493
494
#: bzrlib/builtins.py:1029
495
msgid ""
496
"If there is no default location set, the first pull will set it (use\n"
497
"--no-remember to avoid setting it). After that, you can omit the\n"
498
"location to use the default. To change the default, use --remember. The\n"
499
"value will only be saved if the remote location can be accessed."
500
msgstr ""
501
502
#: bzrlib/builtins.py:1034
503
msgid ""
504
"The --verbose option will display the revisions pulled using the log_format\n"
505
"configuration option. You can use a different format by overriding it with\n"
506
"-Olog_format=<other_format>."
507
msgstr ""
508
509
#: bzrlib/builtins.py:1038
510
msgid ""
511
"Note: The location can be specified either in the form of a branch,\n"
512
"or in the form of a path to a file containing a merge directive generated\n"
513
"with bzr send."
514
msgstr ""
515
516
#: bzrlib/builtins.py:1046
517
msgid "Show logs of pulled revisions."
518
msgstr ""
519
520
#: bzrlib/builtins.py:1048
521
msgid ""
522
"Branch to pull into, rather than the one containing the working directory."
523
msgstr ""
524
525
#: bzrlib/builtins.py:1051
526
msgid ""
527
"Perform a local pull in a bound branch. Local pulls are not applied to the "
528
"master branch."
529
msgstr ""
530
531
#: bzrlib/builtins.py:1080
532
msgid "Need working tree for --show-base."
533
msgstr ""
534
535
#: bzrlib/builtins.py:1096
536
msgid "No pull location known or specified."
537
msgstr ""
538
539
#: bzrlib/builtins.py:1102
540
#, python-format
541
msgid "Using saved parent location: %s\n"
542
msgstr ""
543
544
#: bzrlib/builtins.py:1109 bzrlib/builtins.py:4300
545
msgid "Cannot use -r with merge directives or bundles"
546
msgstr ""
547
548
#: bzrlib/builtins.py:1150
549
msgid "Update a mirror of this branch."
550
msgstr ""
551
552
#: bzrlib/builtins.py:1152
553
msgid ""
554
"The target branch will not have its working tree populated because this\n"
555
"is both expensive, and is not supported on remote file systems."
556
msgstr ""
557
558
#: bzrlib/builtins.py:1155
559
msgid ""
560
"Some smart servers or protocols *may* put the working tree in place in\n"
561
"the future."
562
msgstr ""
563
564
#: bzrlib/builtins.py:1158
565
msgid ""
566
"This command only works on branches that have not diverged. Branches are\n"
567
"considered diverged if the destination branch's most recent commit is one\n"
568
"that has not been merged (directly or indirectly) by the source branch."
569
msgstr ""
570
571
#: bzrlib/builtins.py:1162
572
msgid ""
573
"If branches have diverged, you can use 'bzr push --overwrite' to replace\n"
574
"the other branch completely, discarding its unmerged changes."
575
msgstr ""
576
577
#: bzrlib/builtins.py:1165
578
msgid ""
579
"If you want to ensure you have the different changes in the other branch,\n"
580
"do a merge (see bzr help merge) from the other branch, and commit that.\n"
581
"After that you will be able to do a push without '--overwrite'."
582
msgstr ""
583
584
#: bzrlib/builtins.py:1169
585
msgid ""
586
"If there is no default push location set, the first push will set it (use\n"
587
"--no-remember to avoid setting it). After that, you can omit the\n"
588
"location to use the default. To change the default, use --remember. The\n"
589
"value will only be saved if the remote location can be accessed."
590
msgstr ""
591
592
#: bzrlib/builtins.py:1174
593
msgid ""
594
"The --verbose option will display the revisions pushed using the log_format\n"
595
"configuration option. You can use a different format by overriding it with\n"
596
"-Olog_format=<other_format>."
597
msgstr ""
598
599
#: bzrlib/builtins.py:1185 bzrlib/foreign.py:272
600
msgid ""
601
"Branch to push from, rather than the one containing the working directory."
602
msgstr ""
603
604
#: bzrlib/builtins.py:1188
605
msgid ""
606
"By default push will fail if the target directory exists, but does not "
607
"already have a control directory. This flag will allow push to proceed."
608
msgstr ""
609
610
#: bzrlib/builtins.py:1193
611
msgid ""
612
"Create a stacked branch that references the public location of the parent "
613
"branch."
614
msgstr ""
615
616
#: bzrlib/builtins.py:1196
617
msgid ""
618
"Create a stacked branch that refers to another branch for the commit "
619
"history. Only the work not present in the referenced branch is included in "
620
"the branch created."
621
msgstr ""
622
623
#: bzrlib/builtins.py:1201 bzrlib/foreign.py:279
624
msgid ""
625
"Refuse to push if there are uncommitted changes in the working tree, --no-"
626
"strict disables the check."
627
msgstr ""
628
629
#: bzrlib/builtins.py:1204
630
msgid "Don't populate the working tree, even for protocols that support it."
631
msgstr ""
632
633
#: bzrlib/builtins.py:1248
634
msgid "Could not determine branch to refer to."
635
msgstr ""
636
637
#: bzrlib/builtins.py:1257
638
#, python-format
639
msgid ""
640
"No push location known or specified. To push to the parent branch (at %s), "
641
"use 'bzr push :parent'."
642
msgstr ""
643
644
#: bzrlib/builtins.py:1263 bzrlib/foreign.py:306
645
msgid "No push location known or specified."
646
msgstr ""
647
648
#: bzrlib/builtins.py:1267
649
#, python-format
650
msgid "Using saved push location: %s"
651
msgstr ""
652
653
#: bzrlib/builtins.py:1277
654
msgid "Create a new branch that is a copy of an existing branch."
655
msgstr ""
656
657
#: bzrlib/builtins.py:1279
658
msgid ""
659
"If the TO_LOCATION is omitted, the last component of the FROM_LOCATION will\n"
660
"be used. In other words, \"branch ../foo/bar\" will attempt to create "
661
"./bar.\n"
662
"If the FROM_LOCATION has no / or path separator embedded, the TO_LOCATION\n"
663
"is derived from the FROM_LOCATION by stripping a leading scheme or drive\n"
664
"identifier, if any. For example, \"branch lp:foo-bar\" will attempt to\n"
665
"create ./foo-bar."
666
msgstr ""
667
668
#: bzrlib/builtins.py:1286
669
msgid ""
670
"To retrieve the branch as of a particular revision, supply the --revision\n"
671
"parameter, as in \"branch foo/bar -r 5\"."
672
msgstr ""
673
674
#: bzrlib/builtins.py:1289
675
msgid "The synonyms 'clone' and 'get' for this command are deprecated."
676
msgstr ""
677
678
#: bzrlib/builtins.py:1299
679
msgid "Create a branch without a working-tree."
680
msgstr ""
681
682
#: bzrlib/builtins.py:1301
683
msgid "Switch the checkout in the current directory to the new branch."
684
msgstr ""
685
686
#: bzrlib/builtins.py:1304
687
msgid ""
688
"Create a stacked branch referring to the source branch. The new branch will "
689
"depend on the availability of the source branch for all operations."
690
msgstr ""
691
692
#: bzrlib/builtins.py:1308
693
msgid "Do not use a shared repository, even if available."
694
msgstr ""
695
696
#: bzrlib/builtins.py:1310
697
msgid ""
698
"By default branch will fail if the target directory exists, but does not "
699
"already have a control directory. This flag will allow branch to proceed."
700
msgstr ""
701
702
#: bzrlib/builtins.py:1315
703
msgid "Bind new branch to from location."
704
msgstr ""
705
706
#: bzrlib/builtins.py:1362
707
#, python-format
708
msgid "Target directory \"%s\" already exists."
709
msgstr ""
710
711
#: bzrlib/builtins.py:1374
712
#, python-format
713
msgid "Parent of \"%s\" does not exist."
714
msgstr ""
715
716
#: bzrlib/builtins.py:1393
717
msgid "The branch {0} has no revision {1}."
718
msgstr ""
719
720
#: bzrlib/builtins.py:1403 bzrlib/push.py:53
721
#, python-format
722
msgid "Created new stacked branch referring to %s."
723
msgstr ""
724
725
#: bzrlib/builtins.py:1407
726
#, python-format
727
msgid "Branched %d revision."
728
msgid_plural "Branched %d revisions."
729
msgstr[0] ""
730
msgstr[1] ""
731
732
#: bzrlib/builtins.py:1412
733
#, python-format
734
msgid "New branch bound to %s"
735
msgstr ""
736
737
#: bzrlib/builtins.py:1417 bzrlib/builtins.py:6187
738
#, python-format
739
msgid "Switched to branch: %s"
740
msgstr ""
741
742
#: bzrlib/builtins.py:1422
743
msgid "List the branches available at the current location."
744
msgstr ""
745
746
#: bzrlib/builtins.py:1424
747
msgid ""
748
"This command will print the names of all the branches at the current\n"
749
"location."
750
msgstr ""
751
752
#: bzrlib/builtins.py:1431
753
msgid ""
754
"Recursively scan for branches rather than just looking in the specified "
755
"location."
756
msgstr ""
757
758
#: bzrlib/builtins.py:1461
759
msgid "(default)"
760
msgstr ""
761
762
#: bzrlib/builtins.py:1473
763
msgid "Create a new checkout of an existing branch."
764
msgstr ""
765
766
#: bzrlib/builtins.py:1475
767
msgid ""
768
"If BRANCH_LOCATION is omitted, checkout will reconstitute a working tree "
769
"for\n"
770
"the branch found in '.'. This is useful if you have removed the working "
771
"tree\n"
772
"or if it was never created - i.e. if you pushed the branch to its current\n"
773
"location using SFTP."
774
msgstr ""
775
776
#: bzrlib/builtins.py:1480
777
msgid ""
778
"If the TO_LOCATION is omitted, the last component of the BRANCH_LOCATION "
779
"will\n"
780
"be used. In other words, \"checkout ../foo/bar\" will attempt to create "
781
"./bar.\n"
782
"If the BRANCH_LOCATION has no / or path separator embedded, the TO_LOCATION\n"
783
"is derived from the BRANCH_LOCATION by stripping a leading scheme or drive\n"
784
"identifier, if any. For example, \"checkout lp:foo-bar\" will attempt to\n"
785
"create ./foo-bar."
786
msgstr ""
787
788
#: bzrlib/builtins.py:1487
789
msgid ""
790
"To retrieve the branch as of a particular revision, supply the --revision\n"
791
"parameter, as in \"checkout foo/bar -r 5\". Note that this will be "
792
"immediately\n"
793
"out of date [so you cannot commit] but it may be useful (i.e. to examine "
794
"old\n"
795
"code.)"
796
msgstr ""
797
798
#: bzrlib/builtins.py:1497
799
msgid ""
800
"Perform a lightweight checkout. Lightweight checkouts depend on access to "
801
"the branch for every operation. Normal checkouts can perform common "
802
"operations like diff and status without such access, and also support local "
803
"commits."
804
msgstr ""
805
806
#: bzrlib/builtins.py:1504
807
msgid "Get file contents from this tree."
808
msgstr ""
809
810
#: bzrlib/builtins.py:1506
811
msgid "Hard-link working tree files where possible."
812
msgstr ""
813
814
#: bzrlib/builtins.py:1547
815
msgid ""
816
"Show list of renamed files.\n"
817
" "
818
msgstr ""
819
820
#: bzrlib/builtins.py:1577
821
msgid "Update a working tree to a new revision."
822
msgstr ""
823
824
#: bzrlib/builtins.py:1579
825
msgid ""
826
"This will perform a merge of the destination revision (the tip of the\n"
827
"branch, or the specified revision) into the working tree, and then make\n"
828
"that revision the basis revision for the working tree. "
829
msgstr ""
830
831
#: bzrlib/builtins.py:1583
832
msgid ""
833
"You can use this to visit an older revision, or to update a working tree\n"
834
"that is out of date from its branch."
835
msgstr ""
836
837
#: bzrlib/builtins.py:1586
838
msgid ""
839
"If there are any uncommitted changes in the tree, they will be carried\n"
840
"across and remain as uncommitted changes after the update. To discard\n"
841
"these changes, use 'bzr revert'. The uncommitted changes may conflict\n"
842
"with the changes brought in by the change in basis revision."
843
msgstr ""
844
845
#: bzrlib/builtins.py:1591
846
msgid ""
847
"If the tree's branch is bound to a master branch, bzr will also update\n"
848
"the branch from the master."
849
msgstr ""
850
851
#: bzrlib/builtins.py:1594
852
msgid ""
853
"You cannot update just a single file or directory, because each Bazaar\n"
854
"working tree has just a single basis revision. If you want to restore a\n"
855
"file that has been removed locally, use 'bzr revert' instead of 'bzr\n"
856
"update'. If you want to restore a file to its state in a previous\n"
857
"revision, use 'bzr revert' with a '-r' option, or use 'bzr cat' to write\n"
858
"out the old content of that file to a new location."
859
msgstr ""
860
861
#: bzrlib/builtins.py:1601
862
msgid ""
863
"The 'dir' argument, if given, must be the location of the root of a\n"
864
"working tree to update. By default, the working tree that contains the \n"
865
"current working directory is used."
866
msgstr ""
867
868
#: bzrlib/builtins.py:1617
869
msgid "bzr update --revision takes exactly one revision"
870
msgstr ""
871
872
#: bzrlib/builtins.py:1625
873
msgid "bzr update can only update a whole tree, not a file or subdirectory"
874
msgstr ""
875
876
#: bzrlib/builtins.py:1656
877
msgid "Tree is up to date at revision {0} of branch {1}"
878
msgstr ""
879
880
#: bzrlib/builtins.py:1672
881
#, python-format
882
msgid ""
883
"branch has no revision %s\n"
884
"bzr update --revision only works for a revision in the branch history"
885
msgstr ""
886
887
#: bzrlib/builtins.py:1678
888
msgid "Updated to revision {0} of branch {1}"
889
msgstr ""
890
891
#: bzrlib/builtins.py:1682
892
msgid ""
893
"Your local commits will now show as pending merges with 'bzr status', and "
894
"can be committed with 'bzr commit'."
895
msgstr ""
896
897
#: bzrlib/builtins.py:1691
898
msgid "Show information about a working tree, branch or repository."
899
msgstr ""
900
901
#: bzrlib/builtins.py:1693
902
msgid ""
903
"This command will show all known locations and formats associated to the\n"
904
"tree, branch or repository."
905
msgstr ""
906
907
#: bzrlib/builtins.py:1696
908
msgid ""
909
"In verbose mode, statistical information is included with each report.\n"
910
"To see extended statistic information, use a verbosity level of 2 or\n"
911
"higher by specifying the verbose option multiple times, e.g. -vv."
912
msgstr ""
913
914
#: bzrlib/builtins.py:1700
915
msgid "Branches and working trees will also report any missing revisions."
916
msgstr ""
917
918
#: bzrlib/builtins.py:1702 bzrlib/builtins.py:3622 bzrlib/builtins.py:4752
919
#: bzrlib/builtins.py:6389
920
msgid ":Examples:"
921
msgstr ""
922
923
#: bzrlib/builtins.py:1704
924
msgid " Display information on the format and related locations:"
925
msgstr ""
926
927
#: bzrlib/builtins.py:1706
928
msgid " bzr info"
929
msgstr ""
930
931
#: bzrlib/builtins.py:1708
932
msgid ""
933
" Display the above together with extended format information and\n"
934
" basic statistics (like the number of files in the working tree and\n"
935
" number of revisions in the branch and repository):"
936
msgstr ""
937
938
#: bzrlib/builtins.py:1712
939
msgid " bzr info -v"
940
msgstr ""
941
942
#: bzrlib/builtins.py:1714
943
msgid " Display the above together with number of committers to the branch:"
944
msgstr ""
945
946
#: bzrlib/builtins.py:1716
947
msgid " bzr info -vv"
948
msgstr ""
949
950
#: bzrlib/builtins.py:1735
951
msgid "Remove files or directories."
952
msgstr ""
953
954
#: bzrlib/builtins.py:1737
955
msgid ""
956
"This makes Bazaar stop tracking changes to the specified files. Bazaar will\n"
957
"delete them if they can easily be recovered using revert otherwise they\n"
958
"will be backed up (adding an extention of the form .~#~). If no options or\n"
959
"parameters are given Bazaar will scan for files that are being tracked by\n"
960
"Bazaar but missing in your tree and stop tracking them for you."
961
msgstr ""
962
963
#: bzrlib/builtins.py:1745
964
msgid "Only remove files that have never been committed."
965
msgstr ""
966
967
#: bzrlib/builtins.py:1747
968
msgid "The file deletion mode to be used."
969
msgstr ""
970
971
#: bzrlib/builtins.py:1748
972
msgid "Deletion Strategy"
973
msgstr ""
974
975
#: bzrlib/builtins.py:1749
976
msgid "Backup changed files (default)."
977
msgstr ""
978
979
#: bzrlib/builtins.py:1750
980
msgid "Delete from bzr but leave the working copy."
981
msgstr ""
982
983
#: bzrlib/builtins.py:1751
984
msgid "Don't backup changed files."
985
msgstr ""
986
987
#: bzrlib/builtins.py:1752
988
msgid ""
989
"Delete all the specified files, even if they can not be recovered and even "
990
"if they are non-empty directories. (deprecated, use no-backup)"
991
msgstr ""
992
993
#: bzrlib/builtins.py:1761
994
msgid "(The --force option is deprecated, rather use --no-backup in future.)"
995
msgstr ""
996
997
#: bzrlib/builtins.py:1778
998
msgid "No matching files."
999
msgstr ""
1000
1001
#: bzrlib/builtins.py:1839
1002
msgid "Reconcile bzr metadata in a branch."
1003
msgstr ""
1004
1005
#: bzrlib/builtins.py:1841
1006
msgid ""
1007
"This can correct data mismatches that may have been caused by\n"
1008
"previous ghost operations or bzr upgrades. You should only\n"
1009
"need to run this command if 'bzr check' or a bzr developer\n"
1010
"advises you to run it."
1011
msgstr ""
1012
1013
#: bzrlib/builtins.py:1846
1014
msgid ""
1015
"If a second branch is provided, cross-branch reconciliation is\n"
1016
"also attempted, which will check that data like the tree root\n"
1017
"id which was not present in very early bzr versions is represented\n"
1018
"correctly in both branches."
1019
msgstr ""
1020
1021
#: bzrlib/builtins.py:1851
1022
msgid ""
1023
"At the same time it is run it may recompress data resulting in\n"
1024
"a potential saving in disk space or performance gain."
1025
msgstr ""
1026
1027
#: bzrlib/builtins.py:1854
1028
msgid "The branch *MUST* be on a listable system such as local disk or sftp."
1029
msgstr ""
1030
1031
#: bzrlib/builtins.py:1921 bzrlib/builtins.py:2039 bzrlib/builtins.py:3657
1032
msgid ""
1033
"Format for the bzr 2.0 series.\n"
1034
"Uses group-compress storage.\n"
1035
"Provides rich roots which are a one-way transition.\n"
1036
msgstr ""
1037
1038
#: bzrlib/builtins.py:1921 bzrlib/builtins.py:2039 bzrlib/builtins.py:3657
1039
msgid ""
1040
"Pack-based format used in 1.x series. Introduced in 0.92. Interoperates with "
1041
"bzr repositories before 0.92 but cannot be read by bzr < 0.92. "
1042
msgstr ""
1043
1044
#: bzrlib/builtins.py:1921 bzrlib/builtins.py:2039 bzrlib/builtins.py:3657
1045
msgid "The 2a format with experimental support for colocated branches.\n"
1046
msgstr ""
1047
1048
#: bzrlib/builtins.py:1922
1049
msgid "Make a directory into a versioned branch."
1050
msgstr ""
1051
1052
#: bzrlib/builtins.py:1924
1053
msgid ""
1054
"Use this to create an empty branch, or before importing an\n"
1055
"existing project."
1056
msgstr ""
1057
1058
#: bzrlib/builtins.py:1927
1059
msgid ""
1060
"If there is a repository in a parent directory of the location, then\n"
1061
"the history of the branch will be stored in the repository. Otherwise\n"
1062
"init creates a standalone branch which carries its own history\n"
1063
"in the .bzr directory."
1064
msgstr ""
1065
1066
#: bzrlib/builtins.py:1932
1067
msgid ""
1068
"If there is already a branch at the location but it has no working tree,\n"
1069
"the tree can be populated with 'bzr checkout'."
1070
msgstr ""
1071
1072
#: bzrlib/builtins.py:1935
1073
msgid "Recipe for importing a tree of files::"
1074
msgstr ""
1075
1076
#: bzrlib/builtins.py:1937
1077
msgid ""
1078
" cd ~/project\n"
1079
" bzr init\n"
1080
" bzr add .\n"
1081
" bzr status\n"
1082
" bzr commit -m \"imported project\""
1083
msgstr ""
1084
1085
#: bzrlib/builtins.py:1948
1086
msgid ""
1087
"Create the path leading up to the branch if it does not already exist."
1088
msgstr ""
1089
1090
#: bzrlib/builtins.py:1951
1091
msgid "Specify a format for this branch. See \"help formats\"."
1092
msgstr ""
1093
1094
#: bzrlib/builtins.py:1959
1095
msgid ""
1096
"Never change revnos or the existing log. Append revisions to it only."
1097
msgstr ""
1098
1099
#: bzrlib/builtins.py:1962
1100
msgid "Create a branch without a working tree."
1101
msgstr ""
1102
1103
#: bzrlib/builtins.py:1982 bzrlib/push.py:110
1104
#, python-format
1105
msgid ""
1106
"Parent directory of %s does not exist.\n"
1107
"You may supply --create-prefix to create all leading parent directories."
1108
msgstr ""
1109
1110
#: bzrlib/builtins.py:2016
1111
msgid ""
1112
"This branch format cannot be set to append-revisions-only. Try --default."
1113
msgstr ""
1114
1115
#: bzrlib/builtins.py:2027
1116
msgid "Created a {0} (format: {1})\n"
1117
msgstr ""
1118
1119
#: bzrlib/builtins.py:2036
1120
#, python-format
1121
msgid "Using shared repository: %s\n"
1122
msgstr ""
1123
1124
#: bzrlib/builtins.py:2040
1125
msgid "Create a shared repository for branches to share storage space."
1126
msgstr ""
1127
1128
#: bzrlib/builtins.py:2042
1129
msgid ""
1130
"New branches created under the repository directory will store their\n"
1131
"revisions in the repository, not in the branch directory. For branches\n"
1132
"with shared history, this reduces the amount of storage needed and \n"
1133
"speeds up the creation of new branches."
1134
msgstr ""
1135
1136
#: bzrlib/builtins.py:2047
1137
msgid ""
1138
"If the --no-trees option is given then the branches in the repository\n"
1139
"will not have working trees by default. They will still exist as \n"
1140
"directories on disk, but they will not have separate copies of the \n"
1141
"files at a certain revision. This can be useful for repositories that\n"
1142
"store branches which are interacted with through checkouts or remote\n"
1143
"branches, such as on a server."
1144
msgstr ""
1145
1146
#: bzrlib/builtins.py:2054
1147
msgid ""
1148
":Examples:\n"
1149
" Create a shared repository holding just branches::"
1150
msgstr ""
1151
1152
#: bzrlib/builtins.py:2057
1153
msgid ""
1154
" bzr init-repo --no-trees repo\n"
1155
" bzr init repo/trunk"
1156
msgstr ""
1157
1158
#: bzrlib/builtins.py:2060
1159
msgid " Make a lightweight checkout elsewhere::"
1160
msgstr ""
1161
1162
#: bzrlib/builtins.py:2062
1163
msgid ""
1164
" bzr checkout --lightweight repo/trunk trunk-checkout\n"
1165
" cd trunk-checkout\n"
1166
" (add files here)"
1167
msgstr ""
1168
1169
#: bzrlib/builtins.py:2070
1170
msgid ""
1171
"Specify a format for this repository. See \"bzr help formats\" for details."
1172
msgstr ""
1173
1174
#: bzrlib/builtins.py:2074
1175
msgid "Repository format"
1176
msgstr ""
1177
1178
#: bzrlib/builtins.py:2076
1179
msgid "Branches in the repository will default to not having a working tree."
1180
msgstr ""
1181
1182
#: bzrlib/builtins.py:2102
1183
msgid "Show differences in the working tree, between revisions or branches."
1184
msgstr ""
1185
1186
#: bzrlib/builtins.py:2104
1187
msgid ""
1188
"If no arguments are given, all changes for the current tree are listed.\n"
1189
"If files are given, only the changes in those files are listed.\n"
1190
"Remote and multiple branches can be compared by using the --old and\n"
1191
"--new options. If not provided, the default for both is derived from\n"
1192
"the first argument, if any, or the current tree if no arguments are\n"
1193
"given."
1194
msgstr ""
1195
1196
#: bzrlib/builtins.py:2111
1197
msgid ""
1198
"\"bzr diff -p1\" is equivalent to \"bzr diff --prefix old/:new/\", and\n"
1199
"produces patches suitable for \"patch -p1\"."
1200
msgstr ""
1201
1202
#: bzrlib/builtins.py:2114
1203
msgid ""
1204
"Note that when using the -r argument with a range of revisions, the\n"
1205
"differences are computed between the two specified revisions. That\n"
1206
"is, the command does not show the changes introduced by the first \n"
1207
"revision in the range. This differs from the interpretation of \n"
1208
"revision ranges used by \"bzr log\" which includes the first revision\n"
1209
"in the range."
1210
msgstr ""
1211
1212
#: bzrlib/builtins.py:2121
1213
msgid ""
1214
":Exit values:\n"
1215
" 1 - changed\n"
1216
" 2 - unrepresentable changes\n"
1217
" 3 - error\n"
1218
" 0 - no change"
1219
msgstr ""
1220
1221
#: bzrlib/builtins.py:2127
1222
msgid ""
1223
":Examples:\n"
1224
" Shows the difference in the working tree versus the last commit::"
1225
msgstr ""
1226
1227
#: bzrlib/builtins.py:2130
1228
msgid " bzr diff"
1229
msgstr ""
1230
1231
#: bzrlib/builtins.py:2132
1232
msgid " Difference between the working tree and revision 1::"
1233
msgstr ""
1234
1235
#: bzrlib/builtins.py:2134
1236
msgid " bzr diff -r1"
1237
msgstr ""
1238
1239
#: bzrlib/builtins.py:2136
1240
msgid " Difference between revision 3 and revision 1::"
1241
msgstr ""
1242
1243
#: bzrlib/builtins.py:2138
1244
msgid " bzr diff -r1..3"
1245
msgstr ""
1246
1247
#: bzrlib/builtins.py:2140
1248
msgid " Difference between revision 3 and revision 1 for branch xxx::"
1249
msgstr ""
1250
1251
#: bzrlib/builtins.py:2142
1252
msgid " bzr diff -r1..3 xxx"
1253
msgstr ""
1254
1255
#: bzrlib/builtins.py:2144
1256
msgid " The changes introduced by revision 2 (equivalent to -r1..2)::"
1257
msgstr ""
1258
1259
#: bzrlib/builtins.py:2146
1260
msgid " bzr diff -c2"
1261
msgstr ""
1262
1263
#: bzrlib/builtins.py:2148
1264
msgid ""
1265
" To see the changes introduced by revision X::\n"
1266
" \n"
1267
" bzr diff -cX"
1268
msgstr ""
1269
1270
#: bzrlib/builtins.py:2152
1271
msgid ""
1272
" Note that in the case of a merge, the -c option shows the changes\n"
1273
" compared to the left hand parent. To see the changes against\n"
1274
" another parent, use::"
1275
msgstr ""
1276
1277
#: bzrlib/builtins.py:2156
1278
msgid " bzr diff -r<chosen_parent>..X"
1279
msgstr ""
1280
1281
#: bzrlib/builtins.py:2158
1282
msgid ""
1283
" The changes between the current revision and the previous revision\n"
1284
" (equivalent to -c-1 and -r-2..-1)"
1285
msgstr ""
1286
1287
#: bzrlib/builtins.py:2161
1288
msgid " bzr diff -r-2.."
1289
msgstr ""
1290
1291
#: bzrlib/builtins.py:2163
1292
msgid " Show just the differences for file NEWS::"
1293
msgstr ""
1294
1295
#: bzrlib/builtins.py:2165
1296
msgid " bzr diff NEWS"
1297
msgstr ""
1298
1299
#: bzrlib/builtins.py:2167
1300
msgid " Show the differences in working tree xxx for file NEWS::"
1301
msgstr ""
1302
1303
#: bzrlib/builtins.py:2169
1304
msgid " bzr diff xxx/NEWS"
1305
msgstr ""
1306
1307
#: bzrlib/builtins.py:2171
1308
msgid " Show the differences from branch xxx to this working tree:"
1309
msgstr ""
1310
1311
#: bzrlib/builtins.py:2173
1312
msgid " bzr diff --old xxx"
1313
msgstr ""
1314
1315
#: bzrlib/builtins.py:2175
1316
msgid " Show the differences between two branches for file NEWS::"
1317
msgstr ""
1318
1319
#: bzrlib/builtins.py:2177
1320
msgid " bzr diff --old xxx --new yyy NEWS"
1321
msgstr ""
1322
1323
#: bzrlib/builtins.py:2179
1324
msgid " Same as 'bzr diff' but prefix paths with old/ and new/::"
1325
msgstr ""
1326
1327
#: bzrlib/builtins.py:2181
1328
msgid ""
1329
" bzr diff --prefix old/:new/\n"
1330
" \n"
1331
" Show the differences using a custom diff program with options::\n"
1332
" \n"
1333
" bzr diff --using /usr/bin/diff --diff-options -wu"
1334
msgstr ""
1335
1336
#: bzrlib/builtins.py:2191
1337
msgid "Pass these options to the external diff program."
1338
msgstr ""
1339
1340
#: bzrlib/builtins.py:2194
1341
msgid ""
1342
"Set prefixes added to old and new filenames, as two values separated by a "
1343
"colon. (eg \"old/:new/\")."
1344
msgstr ""
1345
1346
#: bzrlib/builtins.py:2197
1347
msgid "Branch/tree to compare from."
1348
msgstr ""
1349
1350
#: bzrlib/builtins.py:2201
1351
msgid "Branch/tree to compare to."
1352
msgstr ""
1353
1354
#: bzrlib/builtins.py:2207
1355
msgid "Use this command to compare files."
1356
msgstr ""
1357
1358
#: bzrlib/builtins.py:2212
1359
msgid "Diff format to use."
1360
msgstr ""
1361
1362
#: bzrlib/builtins.py:2214
1363
msgid "Diff format"
1364
msgstr ""
1365
1366
#: bzrlib/builtins.py:2236
1367
msgid "--prefix expects two values separated by a colon (eg \"old/:new/\")"
1368
msgstr ""
1369
1370
#: bzrlib/builtins.py:2240
1371
msgid "bzr diff --revision takes exactly one or two revision specifiers"
1372
msgstr ""
1373
1374
#: bzrlib/builtins.py:2245 bzrlib/builtins.py:2643 bzrlib/builtins.py:2656
1375
#: bzrlib/builtins.py:2664 bzrlib/builtins.py:4826
1376
msgid "{0} and {1} are mutually exclusive"
1377
msgstr ""
1378
1379
#: bzrlib/builtins.py:2265
1380
msgid ""
1381
"List files deleted in the working tree.\n"
1382
" "
1383
msgstr ""
1384
1385
#: bzrlib/builtins.py:2343
1386
msgid "Show the tree root directory."
1387
msgstr ""
1388
1389
#: bzrlib/builtins.py:2345
1390
msgid ""
1391
"The root is the nearest enclosing directory with a .bzr control\n"
1392
"directory."
1393
msgstr ""
1394
1395
#: bzrlib/builtins.py:2360
1396
msgid "The limit argument must be an integer."
1397
msgstr ""
1398
1399
#: bzrlib/builtins.py:2368
1400
msgid "The levels argument must be an integer."
1401
msgstr ""
1402
1403
#: bzrlib/builtins.py:2373
1404
msgid "Show historical log for a branch or subset of a branch."
1405
msgstr ""
1406
1407
#: bzrlib/builtins.py:2375
1408
msgid ""
1409
"log is bzr's default tool for exploring the history of a branch.\n"
1410
"The branch to use is taken from the first parameter. If no parameters\n"
1411
"are given, the branch containing the working directory is logged.\n"
1412
"Here are some simple examples::"
1413
msgstr ""
1414
1415
#: bzrlib/builtins.py:2380
1416
msgid ""
1417
" bzr log log the current branch\n"
1418
" bzr log foo.py log a file in its branch\n"
1419
" bzr log http://server/branch log a branch on a server"
1420
msgstr ""
1421
1422
#: bzrlib/builtins.py:2384
1423
msgid ""
1424
"The filtering, ordering and information shown for each revision can\n"
1425
"be controlled as explained below. By default, all revisions are\n"
1426
"shown sorted (topologically) so that newer revisions appear before\n"
1427
"older ones and descendants always appear before ancestors. If displayed,\n"
1428
"merged revisions are shown indented under the revision in which they\n"
1429
"were merged."
1430
msgstr ""
1431
1432
#: bzrlib/builtins.py:2391
1433
msgid ":Output control:"
1434
msgstr ""
1435
1436
#: bzrlib/builtins.py:2393
1437
msgid ""
1438
" The log format controls how information about each revision is\n"
1439
" displayed. The standard log formats are called ``long``, ``short``\n"
1440
" and ``line``. The default is long. See ``bzr help log-formats``\n"
1441
" for more details on log formats."
1442
msgstr ""
1443
1444
#: bzrlib/builtins.py:2398
1445
msgid ""
1446
" The following options can be used to control what information is\n"
1447
" displayed::"
1448
msgstr ""
1449
1450
#: bzrlib/builtins.py:2401
1451
msgid ""
1452
" -l N display a maximum of N revisions\n"
1453
" -n N display N levels of revisions (0 for all, 1 for collapsed)\n"
1454
" -v display a status summary (delta) for each revision\n"
1455
" -p display a diff (patch) for each revision\n"
1456
" --show-ids display revision-ids (and file-ids), not just revnos"
1457
msgstr ""
1458
1459
#: bzrlib/builtins.py:2407
1460
msgid ""
1461
" Note that the default number of levels to display is a function of the\n"
1462
" log format. If the -n option is not used, the standard log formats show\n"
1463
" just the top level (mainline)."
1464
msgstr ""
1465
1466
#: bzrlib/builtins.py:2411
1467
msgid ""
1468
" Status summaries are shown using status flags like A, M, etc. To see\n"
1469
" the changes explained using words like ``added`` and ``modified``\n"
1470
" instead, use the -vv option."
1471
msgstr ""
1472
1473
#: bzrlib/builtins.py:2415
1474
msgid ":Ordering control:"
1475
msgstr ""
1476
1477
#: bzrlib/builtins.py:2417
1478
msgid ""
1479
" To display revisions from oldest to newest, use the --forward option.\n"
1480
" In most cases, using this option will have little impact on the total\n"
1481
" time taken to produce a log, though --forward does not incrementally\n"
1482
" display revisions like --reverse does when it can."
1483
msgstr ""
1484
1485
#: bzrlib/builtins.py:2422
1486
msgid ":Revision filtering:"
1487
msgstr ""
1488
1489
#: bzrlib/builtins.py:2424
1490
msgid ""
1491
" The -r option can be used to specify what revision or range of revisions\n"
1492
" to filter against. The various forms are shown below::"
1493
msgstr ""
1494
1495
#: bzrlib/builtins.py:2427
1496
msgid ""
1497
" -rX display revision X\n"
1498
" -rX.. display revision X and later\n"
1499
" -r..Y display up to and including revision Y\n"
1500
" -rX..Y display from X to Y inclusive"
1501
msgstr ""
1502
1503
#: bzrlib/builtins.py:2432
1504
msgid ""
1505
" See ``bzr help revisionspec`` for details on how to specify X and Y.\n"
1506
" Some common examples are given below::"
1507
msgstr ""
1508
1509
#: bzrlib/builtins.py:2435
1510
msgid ""
1511
" -r-1 show just the tip\n"
1512
" -r-10.. show the last 10 mainline revisions\n"
1513
" -rsubmit:.. show what's new on this branch\n"
1514
" -rancestor:path.. show changes since the common ancestor of this\n"
1515
" branch and the one at location path\n"
1516
" -rdate:yesterday.. show changes since yesterday"
1517
msgstr ""
1518
1519
#: bzrlib/builtins.py:2442
1520
msgid ""
1521
" When logging a range of revisions using -rX..Y, log starts at\n"
1522
" revision Y and searches back in history through the primary\n"
1523
" (\"left-hand\") parents until it finds X. When logging just the\n"
1524
" top level (using -n1), an error is reported if X is not found\n"
1525
" along the way. If multi-level logging is used (-n0), X may be\n"
1526
" a nested merge revision and the log will be truncated accordingly."
1527
msgstr ""
1528
1529
#: bzrlib/builtins.py:2449
1530
msgid ":Path filtering:"
1531
msgstr ""
1532
1533
#: bzrlib/builtins.py:2451
1534
msgid ""
1535
" If parameters are given and the first one is not a branch, the log\n"
1536
" will be filtered to show only those revisions that changed the\n"
1537
" nominated files or directories."
1538
msgstr ""
1539
1540
#: bzrlib/builtins.py:2455
1541
msgid ""
1542
" Filenames are interpreted within their historical context. To log a\n"
1543
" deleted file, specify a revision range so that the file existed at\n"
1544
" the end or start of the range."
1545
msgstr ""
1546
1547
#: bzrlib/builtins.py:2459
1548
msgid ""
1549
" Historical context is also important when interpreting pathnames of\n"
1550
" renamed files/directories. Consider the following example:"
1551
msgstr ""
1552
1553
#: bzrlib/builtins.py:2462
1554
msgid ""
1555
" * revision 1: add tutorial.txt\n"
1556
" * revision 2: modify tutorial.txt\n"
1557
" * revision 3: rename tutorial.txt to guide.txt; add tutorial.txt"
1558
msgstr ""
1559
1560
#: bzrlib/builtins.py:2466
1561
msgid " In this case:"
1562
msgstr ""
1563
1564
#: bzrlib/builtins.py:2468
1565
msgid " * ``bzr log guide.txt`` will log the file added in revision 1"
1566
msgstr ""
1567
1568
#: bzrlib/builtins.py:2470
1569
msgid ""
1570
" * ``bzr log tutorial.txt`` will log the new file added in revision 3"
1571
msgstr ""
1572
1573
#: bzrlib/builtins.py:2472
1574
msgid ""
1575
" * ``bzr log -r2 -p tutorial.txt`` will show the changes made to\n"
1576
" the original file in revision 2."
1577
msgstr ""
1578
1579
#: bzrlib/builtins.py:2475
1580
msgid ""
1581
" * ``bzr log -r2 -p guide.txt`` will display an error message as there\n"
1582
" was no file called guide.txt in revision 2."
1583
msgstr ""
1584
1585
#: bzrlib/builtins.py:2478
1586
msgid ""
1587
" Renames are always followed by log. By design, there is no need to\n"
1588
" explicitly ask for this (and no way to stop logging a file back\n"
1589
" until it was last renamed)."
1590
msgstr ""
1591
1592
#: bzrlib/builtins.py:2482
1593
msgid ":Other filtering:"
1594
msgstr ""
1595
1596
#: bzrlib/builtins.py:2484
1597
msgid ""
1598
" The --match option can be used for finding revisions that match a\n"
1599
" regular expression in a commit message, committer, author or bug.\n"
1600
" Specifying the option several times will match any of the supplied\n"
1601
" expressions. --match-author, --match-bugs, --match-committer and\n"
1602
" --match-message can be used to only match a specific field."
1603
msgstr ""
1604
1605
#: bzrlib/builtins.py:2490
1606
msgid ":Tips & tricks:"
1607
msgstr ""
1608
1609
#: bzrlib/builtins.py:2492
1610
msgid ""
1611
" GUI tools and IDEs are often better at exploring history than command\n"
1612
" line tools: you may prefer qlog or viz from qbzr or bzr-gtk, the\n"
1613
" bzr-explorer shell, or the Loggerhead web interface. See the Plugin\n"
1614
" Guide <http://doc.bazaar.canonical.com/plugins/en/> and\n"
1615
" <http://wiki.bazaar.canonical.com/IDEIntegration>. "
1616
msgstr ""
1617
1618
#: bzrlib/builtins.py:2498
1619
msgid ""
1620
" You may find it useful to add the aliases below to ``bazaar.conf``::"
1621
msgstr ""
1622
1623
#: bzrlib/builtins.py:2500
1624
msgid ""
1625
" [ALIASES]\n"
1626
" tip = log -r-1\n"
1627
" top = log -l10 --line\n"
1628
" show = log -v -p"
1629
msgstr ""
1630
1631
#: bzrlib/builtins.py:2505
1632
msgid ""
1633
" ``bzr tip`` will then show the latest revision while ``bzr top``\n"
1634
" will show the last 10 mainline revisions. To see the details of a\n"
1635
" particular revision X, ``bzr show -rX``."
1636
msgstr ""
1637
1638
#: bzrlib/builtins.py:2509
1639
msgid ""
1640
" If you are interested in looking deeper into a particular merge X,\n"
1641
" use ``bzr log -n0 -rX``."
1642
msgstr ""
1643
1644
#: bzrlib/builtins.py:2512
1645
msgid ""
1646
" ``bzr log -v`` on a branch with lots of history is currently\n"
1647
" very slow. A fix for this issue is currently under development.\n"
1648
" With or without that fix, it is recommended that a revision range\n"
1649
" be given when using the -v option."
1650
msgstr ""
1651
1652
#: bzrlib/builtins.py:2517
1653
msgid ""
1654
" bzr has a generic full-text matching plugin, bzr-search, that can be\n"
1655
" used to find revisions matching user names, commit messages, etc.\n"
1656
" Among other features, this plugin can find all revisions containing\n"
1657
" a list of words but not others."
1658
msgstr ""
1659
1660
#: bzrlib/builtins.py:2522
1661
msgid ""
1662
" When exploring non-mainline history on large projects with deep\n"
1663
" history, the performance of log can be greatly improved by installing\n"
1664
" the historycache plugin. This plugin buffers historical information\n"
1665
" trading disk space for faster speed."
1666
msgstr ""
1667
1668
#: bzrlib/builtins.py:2531
1669
msgid "Show from oldest to newest."
1670
msgstr ""
1671
1672
#: bzrlib/builtins.py:2534
1673
msgid "Show files changed in each revision."
1674
msgstr ""
1675
1676
#: bzrlib/builtins.py:2540
1677
msgid "Show just the specified revision. See also \"help revisionspec\"."
1678
msgstr ""
1679
1680
#: bzrlib/builtins.py:2544
1681
msgid "What names to list as authors - first, all or committer."
1682
msgstr ""
1683
1684
#: bzrlib/builtins.py:2545
1685
msgid "Authors"
1686
msgstr ""
1687
1688
#: bzrlib/builtins.py:2550
1689
msgid "Number of levels to display - 0 for all, 1 for flat."
1690
msgstr ""
1691
1692
#: bzrlib/builtins.py:2560
1693
msgid "Limit the output to the first N revisions."
1694
msgstr ""
1695
1696
#: bzrlib/builtins.py:2565
1697
msgid "Show changes made in each revision as a patch."
1698
msgstr ""
1699
1700
#: bzrlib/builtins.py:2567
1701
msgid "Show merged revisions like --levels 0 does."
1702
msgstr ""
1703
1704
#: bzrlib/builtins.py:2571
1705
msgid "Do not report commits with more than one parent."
1706
msgstr ""
1707
1708
#: bzrlib/builtins.py:2573
1709
msgid ""
1710
"Display only the revisions that are not part of both ancestries (require -"
1711
"rX..Y)."
1712
msgstr ""
1713
1714
#: bzrlib/builtins.py:2577
1715
msgid "Show digital signature validity."
1716
msgstr ""
1717
1718
#: bzrlib/builtins.py:2580
1719
msgid "Show revisions whose properties match this expression."
1720
msgstr ""
1721
1722
#: bzrlib/builtins.py:2584
1723
msgid "Show revisions whose message matches this expression."
1724
msgstr ""
1725
1726
#: bzrlib/builtins.py:2588
1727
msgid "Show revisions whose committer matches this expression."
1728
msgstr ""
1729
1730
#: bzrlib/builtins.py:2592
1731
msgid "Show revisions whose authors match this expression."
1732
msgstr ""
1733
1734
#: bzrlib/builtins.py:2596
1735
msgid "Show revisions whose bugs match this expression."
1736
msgstr ""
1737
1738
#: bzrlib/builtins.py:2650
1739
msgid "--exclude-common-ancestry requires -r with two revisions"
1740
msgstr ""
1741
1742
#: bzrlib/builtins.py:2678
1743
#, python-format
1744
msgid "Path unknown at end or start of revision range: %s"
1745
msgstr ""
1746
1747
#: bzrlib/builtins.py:2795
1748
#, python-format
1749
msgid "bzr %s doesn't accept two revisions in different branches."
1750
msgstr ""
1751
1752
#: bzrlib/builtins.py:2811
1753
#, python-format
1754
msgid "bzr %s --revision takes one or two values."
1755
msgstr ""
1756
1757
#: bzrlib/builtins.py:2856
1758
msgid ""
1759
"List files in a tree.\n"
1760
" "
1761
msgstr ""
1762
1763
#: bzrlib/builtins.py:2865
1764
msgid "Recurse into subdirectories."
1765
msgstr ""
1766
1767
#: bzrlib/builtins.py:2867
1768
msgid "Print paths relative to the root of the branch."
1769
msgstr ""
1770
1771
#: bzrlib/builtins.py:2869
1772
msgid "Print unknown files."
1773
msgstr ""
1774
1775
#: bzrlib/builtins.py:2870
1776
msgid "Print versioned files."
1777
msgstr ""
1778
1779
#: bzrlib/builtins.py:2873
1780
msgid "Print ignored files."
1781
msgstr ""
1782
1783
#: bzrlib/builtins.py:2875
1784
msgid "List entries of a particular kind: file, directory, symlink."
1785
msgstr ""
1786
1787
#: bzrlib/builtins.py:2888
1788
msgid "invalid kind specified"
1789
msgstr ""
1790
1791
#: bzrlib/builtins.py:2891
1792
msgid "Cannot set both --verbose and --null"
1793
msgstr ""
1794
1795
#: bzrlib/builtins.py:2900
1796
msgid "cannot specify both --from-root and PATH"
1797
msgstr ""
1798
1799
#: bzrlib/builtins.py:2987
1800
msgid "Ignore specified files or patterns."
1801
msgstr ""
1802
1803
#: bzrlib/builtins.py:2989
1804
msgid "See ``bzr help patterns`` for details on the syntax of patterns."
1805
msgstr ""
1806
1807
#: bzrlib/builtins.py:2991
1808
msgid ""
1809
"If a .bzrignore file does not exist, the ignore command\n"
1810
"will create one and add the specified files or patterns to the newly\n"
1811
"created file. The ignore command will also automatically add the \n"
1812
".bzrignore file to be versioned. Creating a .bzrignore file without\n"
1813
"the use of the ignore command will require an explicit add command."
1814
msgstr ""
1815
1816
#: bzrlib/builtins.py:2997
1817
msgid ""
1818
"To remove patterns from the ignore list, edit the .bzrignore file.\n"
1819
"After adding, editing or deleting that file either indirectly by\n"
1820
"using this command or directly by using an editor, be sure to commit\n"
1821
"it."
1822
msgstr ""
1823
1824
#: bzrlib/builtins.py:3002
1825
msgid ""
1826
"Bazaar also supports a global ignore file ~/.bazaar/ignore. On Windows\n"
1827
"the global ignore file can be found in the application data directory as\n"
1828
"C:\\Documents and Settings\\<user>\\Application Data\\Bazaar\\2.0\\ignore.\n"
1829
"Global ignores are not touched by this command. The global ignore file\n"
1830
"can be edited directly using an editor."
1831
msgstr ""
1832
1833
#: bzrlib/builtins.py:3008
1834
msgid ""
1835
"Patterns prefixed with '!' are exceptions to ignore patterns and take\n"
1836
"precedence over regular ignores. Such exceptions are used to specify\n"
1837
"files that should be versioned which would otherwise be ignored."
1838
msgstr ""
1839
1840
#: bzrlib/builtins.py:3012
1841
msgid ""
1842
"Patterns prefixed with '!!' act as regular ignore patterns, but have\n"
1843
"precedence over the '!' exception patterns."
1844
msgstr ""
1845
1846
#: bzrlib/builtins.py:3015
1847
msgid ""
1848
":Notes: \n"
1849
" \n"
1850
"* Ignore patterns containing shell wildcards must be quoted from\n"
1851
" the shell on Unix."
1852
msgstr ""
1853
1854
#: bzrlib/builtins.py:3020
1855
msgid ""
1856
"* Ignore patterns starting with \"#\" act as comments in the ignore file.\n"
1857
" To ignore patterns that begin with that character, use the \"RE:\" prefix."
1858
msgstr ""
1859
1860
#: bzrlib/builtins.py:3023
1861
msgid ""
1862
":Examples:\n"
1863
" Ignore the top level Makefile::"
1864
msgstr ""
1865
1866
#: bzrlib/builtins.py:3026
1867
msgid " bzr ignore ./Makefile"
1868
msgstr ""
1869
1870
#: bzrlib/builtins.py:3028
1871
msgid " Ignore .class files in all directories...::"
1872
msgstr ""
1873
1874
#: bzrlib/builtins.py:3030
1875
msgid " bzr ignore \"*.class\""
1876
msgstr ""
1877
1878
#: bzrlib/builtins.py:3032
1879
msgid " ...but do not ignore \"special.class\"::"
1880
msgstr ""
1881
1882
#: bzrlib/builtins.py:3034
1883
msgid " bzr ignore \"!special.class\""
1884
msgstr ""
1885
1886
#: bzrlib/builtins.py:3036
1887
msgid " Ignore files whose name begins with the \"#\" character::"
1888
msgstr ""
1889
1890
#: bzrlib/builtins.py:3038
1891
msgid " bzr ignore \"RE:^#\""
1892
msgstr ""
1893
1894
#: bzrlib/builtins.py:3040 bzrlib/builtins.py:3044
1895
msgid " Ignore .o files under the lib directory::"
1896
msgstr ""
1897
1898
#: bzrlib/builtins.py:3042
1899
msgid " bzr ignore \"lib/**/*.o\""
1900
msgstr ""
1901
1902
#: bzrlib/builtins.py:3046
1903
msgid " bzr ignore \"RE:lib/.*\\.o\""
1904
msgstr ""
1905
1906
#: bzrlib/builtins.py:3048
1907
msgid " Ignore everything but the \"debian\" toplevel directory::"
1908
msgstr ""
1909
1910
#: bzrlib/builtins.py:3050
1911
msgid ""
1912
" bzr ignore \"RE:(?!debian/).*\"\n"
1913
" \n"
1914
" Ignore everything except the \"local\" toplevel directory,\n"
1915
" but always ignore autosave files ending in ~, even under local/::\n"
1916
" \n"
1917
" bzr ignore \"*\"\n"
1918
" bzr ignore \"!./local\"\n"
1919
" bzr ignore \"!!*~\""
1920
msgstr ""
1921
1922
#: bzrlib/builtins.py:3064
1923
msgid "Display the default ignore rules that bzr uses."
1924
msgstr ""
1925
1926
#: bzrlib/builtins.py:3076
1927
msgid "ignore requires at least one NAME_PATTERN or --default-rules."
1928
msgstr ""
1929
1930
#: bzrlib/builtins.py:3087
1931
#, python-format
1932
msgid "Invalid ignore pattern found. %s"
1933
msgid_plural "Invalid ignore patterns found. %s"
1934
msgstr[0] ""
1935
msgstr[1] ""
1936
1937
#: bzrlib/builtins.py:3096
1938
msgid "NAME_PATTERN should not be an absolute path"
1939
msgstr ""
1940
1941
#: bzrlib/builtins.py:3109
1942
#, python-format
1943
msgid ""
1944
"Warning: the following files are version controlled and match your ignore "
1945
"pattern:\n"
1946
"%s\n"
1947
"These files will continue to be version controlled unless you 'bzr remove' "
1948
"them.\n"
1949
msgstr ""
1950
1951
#: bzrlib/builtins.py:3116
1952
msgid "List ignored files and the patterns that matched them."
1953
msgstr ""
1954
1955
#: bzrlib/builtins.py:3118
1956
msgid ""
1957
"List all the ignored files and the ignore pattern that caused the file to\n"
1958
"be ignored."
1959
msgstr ""
1960
1961
#: bzrlib/builtins.py:3121
1962
msgid "Alternatively, to list just the files::"
1963
msgstr ""
1964
1965
#: bzrlib/builtins.py:3123
1966
msgid " bzr ls --ignored"
1967
msgstr ""
1968
1969
#: bzrlib/builtins.py:3157
1970
#, python-format
1971
msgid "not a valid revision-number: %r"
1972
msgstr ""
1973
1974
#: bzrlib/builtins.py:3164
1975
msgid ""
1976
"Export current or past revision to a destination directory or archive."
1977
msgstr ""
1978
1979
#: bzrlib/builtins.py:3166
1980
msgid "If no revision is specified this exports the last committed revision."
1981
msgstr ""
1982
1983
#: bzrlib/builtins.py:3168
1984
msgid ""
1985
"Format may be an \"exporter\" name, such as tar, tgz, tbz2. If none is\n"
1986
"given, try to find the format with the extension. If no extension\n"
1987
"is found exports to a directory (equivalent to --format=dir)."
1988
msgstr ""
1989
1990
#: bzrlib/builtins.py:3172
1991
msgid ""
1992
"If root is supplied, it will be used as the root directory inside\n"
1993
"container formats (tar, zip, etc). If it is not supplied it will default\n"
1994
"to the exported filename. The root option has no effect for 'dir' format."
1995
msgstr ""
1996
1997
#: bzrlib/builtins.py:3176
1998
msgid ""
1999
"If branch is omitted then the branch containing the current working\n"
2000
"directory will be used."
2001
msgstr ""
2002
2003
#: bzrlib/builtins.py:3179
2004
msgid ""
2005
"Note: Export of tree with non-ASCII filenames to zip is not supported."
2006
msgstr ""
2007
2008
#: bzrlib/builtins.py:3181
2009
msgid ""
2010
" ================= =========================\n"
2011
" Supported formats Autodetected by extension\n"
2012
" ================= =========================\n"
2013
" dir (none)\n"
2014
" tar .tar\n"
2015
" tbz2 .tar.bz2, .tbz2\n"
2016
" tgz .tar.gz, .tgz\n"
2017
" zip .zip\n"
2018
" ================= ========================="
2019
msgstr ""
2020
2021
#: bzrlib/builtins.py:3195
2022
msgid "Type of file to export to."
2023
msgstr ""
2024
2025
#: bzrlib/builtins.py:3198
2026
msgid "Apply content filters to export the convenient form."
2027
msgstr ""
2028
2029
#: bzrlib/builtins.py:3202
2030
msgid "Name of the root directory inside the exported file."
2031
msgstr ""
2032
2033
#: bzrlib/builtins.py:3204
2034
msgid ""
2035
"Set modification time of files to that of the last revision in which it was "
2036
"changed."
2037
msgstr ""
2038
2039
#: bzrlib/builtins.py:3207
2040
msgid ""
2041
"Export the working tree contents rather than that of the last revision."
2042
msgstr ""
2043
2044
#: bzrlib/builtins.py:3226
2045
msgid "--uncommitted requires a working tree"
2046
msgstr ""
2047
2048
#: bzrlib/builtins.py:3235
2049
#, python-format
2050
msgid "Unsupported export format: %s"
2051
msgstr ""
2052
2053
#: bzrlib/builtins.py:3239
2054
msgid ""
2055
"Write the contents of a file as of a given revision to standard output."
2056
msgstr ""
2057
2058
#: bzrlib/builtins.py:3241
2059
msgid "If no revision is nominated, the last revision is used."
2060
msgstr ""
2061
2062
#: bzrlib/builtins.py:3243
2063
msgid ""
2064
"Note: Take care to redirect standard output when using this command on a\n"
2065
"binary file."
2066
msgstr ""
2067
2068
#: bzrlib/builtins.py:3249
2069
msgid "The path name in the old tree."
2070
msgstr ""
2071
2072
#: bzrlib/builtins.py:3250
2073
msgid "Apply content filters to display the convenience form."
2074
msgstr ""
2075
2076
#: bzrlib/builtins.py:3261
2077
msgid "bzr cat --revision takes exactly one revision specifier"
2078
msgstr ""
2079
2080
#: bzrlib/builtins.py:3286 bzrlib/builtins.py:3298
2081
msgid "{0!r} is not present in revision {1}"
2082
msgstr ""
2083
2084
#: bzrlib/builtins.py:3321
2085
msgid "Commit changes into a new revision."
2086
msgstr ""
2087
2088
#: bzrlib/builtins.py:3323
2089
msgid ""
2090
"An explanatory message needs to be given for each commit. This is\n"
2091
"often done by using the --message option (getting the message from the\n"
2092
"command line) or by using the --file option (getting the message from\n"
2093
"a file). If neither of these options is given, an editor is opened for\n"
2094
"the user to enter the message. To see the changed files in the\n"
2095
"boilerplate text loaded into the editor, use the --show-diff option."
2096
msgstr ""
2097
2098
#: bzrlib/builtins.py:3330
2099
msgid ""
2100
"By default, the entire tree is committed and the person doing the\n"
2101
"commit is assumed to be the author. These defaults can be overridden\n"
2102
"as explained below."
2103
msgstr ""
2104
2105
#: bzrlib/builtins.py:3334
2106
msgid ":Selective commits:"
2107
msgstr ""
2108
2109
#: bzrlib/builtins.py:3336
2110
msgid ""
2111
" If selected files are specified, only changes to those files are\n"
2112
" committed. If a directory is specified then the directory and\n"
2113
" everything within it is committed."
2114
msgstr ""
2115
2116
#: bzrlib/builtins.py:3340
2117
msgid ""
2118
" When excludes are given, they take precedence over selected files.\n"
2119
" For example, to commit only changes within foo, but not changes\n"
2120
" within foo/bar::"
2121
msgstr ""
2122
2123
#: bzrlib/builtins.py:3344
2124
msgid " bzr commit foo -x foo/bar"
2125
msgstr ""
2126
2127
#: bzrlib/builtins.py:3346
2128
msgid " A selective commit after a merge is not yet supported."
2129
msgstr ""
2130
2131
#: bzrlib/builtins.py:3348
2132
msgid ":Custom authors:"
2133
msgstr ""
2134
2135
#: bzrlib/builtins.py:3350
2136
msgid ""
2137
" If the author of the change is not the same person as the committer,\n"
2138
" you can specify the author's name using the --author option. The\n"
2139
" name should be in the same format as a committer-id, e.g.\n"
2140
" \"John Doe <jdoe@example.com>\". If there is more than one author of\n"
2141
" the change you can specify the option multiple times, once for each\n"
2142
" author."
2143
msgstr ""
2144
2145
#: bzrlib/builtins.py:3357
2146
msgid ":Checks:"
2147
msgstr ""
2148
2149
#: bzrlib/builtins.py:3359
2150
msgid ""
2151
" A common mistake is to forget to add a new file or directory before\n"
2152
" running the commit command. The --strict option checks for unknown\n"
2153
" files and aborts the commit if any are found. More advanced pre-commit\n"
2154
" checks can be implemented by defining hooks. See ``bzr help hooks``\n"
2155
" for details."
2156
msgstr ""
2157
2158
#: bzrlib/builtins.py:3365
2159
msgid ":Things to note:"
2160
msgstr ""
2161
2162
#: bzrlib/builtins.py:3367
2163
msgid ""
2164
" If you accidentially commit the wrong changes or make a spelling\n"
2165
" mistake in the commit message say, you can use the uncommit command\n"
2166
" to undo it. See ``bzr help uncommit`` for details."
2167
msgstr ""
2168
2169
#: bzrlib/builtins.py:3371
2170
msgid ""
2171
" Hooks can also be configured to run after a commit. This allows you\n"
2172
" to trigger updates to external systems like bug trackers. The --fixes\n"
2173
" option can be used to record the association between a revision and\n"
2174
" one or more bugs. See ``bzr help bugs`` for details."
2175
msgstr ""
2176
2177
#: bzrlib/builtins.py:3381
2178
msgid "Do not consider changes made to a given path."
2179
msgstr ""
2180
2181
#: bzrlib/builtins.py:3384
2182
msgid "Description of the new revision."
2183
msgstr ""
2184
2185
#: bzrlib/builtins.py:3387
2186
msgid "Commit even if nothing has changed."
2187
msgstr ""
2188
2189
#: bzrlib/builtins.py:3391
2190
msgid "Take commit message from this file."
2191
msgstr ""
2192
2193
#: bzrlib/builtins.py:3393
2194
msgid "Refuse to commit if there are unknown files in the working tree."
2195
msgstr ""
2196
2197
#: bzrlib/builtins.py:3396
2198
msgid ""
2199
"Manually set a commit time using commit date format, e.g. '2009-10-10 "
2200
"08:00:00 +0100'."
2201
msgstr ""
2202
2203
#: bzrlib/builtins.py:3399
2204
msgid "Mark a bug as being fixed by this revision (see \"bzr help bugs\")."
2205
msgstr ""
2206
2207
#: bzrlib/builtins.py:3402
2208
msgid "Set the author's name, if it's different from the committer."
2209
msgstr ""
2210
2211
#: bzrlib/builtins.py:3405
2212
msgid ""
2213
"Perform a local commit in a bound branch. Local commits are not pushed to "
2214
"the master branch until a normal commit is performed."
2215
msgstr ""
2216
2217
#: bzrlib/builtins.py:3411
2218
msgid ""
2219
"When no message is supplied, show the diff along with the status summary in "
2220
"the message editor."
2221
msgstr ""
2222
2223
#: bzrlib/builtins.py:3414
2224
msgid ""
2225
"When committing to a foreign version control system do not push data that "
2226
"can not be natively represented."
2227
msgstr ""
2228
2229
#: bzrlib/builtins.py:3432
2230
#, python-format
2231
msgid ""
2232
"No tracker specified for bug %s. Use the form 'tracker:id' or specify a "
2233
"default bug tracker using the `bugtracker` option.\n"
2234
"See \"bzr help bugs\" for more information on this feature. Commit refused."
2235
msgstr ""
2236
2237
#: bzrlib/builtins.py:3441
2238
#, python-format
2239
msgid ""
2240
"Invalid bug %s. Must be in the form of 'tracker:id'. See \"bzr help bugs\" "
2241
"for more information on this feature.\n"
2242
"Commit refused."
2243
msgstr ""
2244
2245
#: bzrlib/builtins.py:3450
2246
#, python-format
2247
msgid "Unrecognized bug %s. Commit refused."
2248
msgstr ""
2249
2250
#: bzrlib/builtins.py:3453
2251
#, python-format
2252
msgid ""
2253
"%s\n"
2254
"Commit refused."
2255
msgstr ""
2256
2257
#: bzrlib/builtins.py:3477
2258
msgid "Could not parse --commit-time: "
2259
msgstr ""
2260
2261
#: bzrlib/builtins.py:3517
2262
msgid "please specify either --message or --file"
2263
msgstr ""
2264
2265
#: bzrlib/builtins.py:3546
2266
msgid "please specify a commit message with either --message or --file"
2267
msgstr ""
2268
2269
#: bzrlib/builtins.py:3549
2270
msgid ""
2271
"Empty commit message specified. Please specify a commit message with either -"
2272
"-message or --file or leave a blank message with --message \"\"."
2273
msgstr ""
2274
2275
#: bzrlib/builtins.py:3569
2276
msgid ""
2277
"No changes to commit. Please 'bzr add' the files you want to commit, or use -"
2278
"-unchanged to force an empty commit."
2279
msgstr ""
2280
2281
#: bzrlib/builtins.py:3573
2282
msgid ""
2283
"Conflicts detected in working tree. Use \"bzr conflicts\" to list, \"bzr "
2284
"resolve FILE\" to resolve."
2285
msgstr ""
2286
2287
#: bzrlib/builtins.py:3577
2288
msgid "Commit refused because there are unknown files in the working tree."
2289
msgstr ""
2290
2291
#: bzrlib/builtins.py:3580
2292
msgid ""
2293
"\n"
2294
"To commit to master branch, run update and then commit.\n"
2295
"You can also pass --local to commit to continue working disconnected."
2296
msgstr ""
2297
2298
#: bzrlib/builtins.py:3588
2299
msgid ""
2300
"Validate working tree structure, branch consistency and repository history."
2301
msgstr ""
2302
2303
#: bzrlib/builtins.py:3590
2304
msgid ""
2305
"This command checks various invariants about branch and repository storage\n"
2306
"to detect data corruption or bzr bugs."
2307
msgstr ""
2308
2309
#: bzrlib/builtins.py:3593
2310
msgid ""
2311
"The working tree and branch checks will only give output if a problem is\n"
2312
"detected. The output fields of the repository check are:"
2313
msgstr ""
2314
2315
#: bzrlib/builtins.py:3596
2316
msgid ""
2317
"revisions\n"
2318
" This is just the number of revisions checked. It doesn't\n"
2319
" indicate a problem."
2320
msgstr ""
2321
2322
#: bzrlib/builtins.py:3600
2323
msgid ""
2324
"versionedfiles\n"
2325
" This is just the number of versionedfiles checked. It\n"
2326
" doesn't indicate a problem."
2327
msgstr ""
2328
2329
#: bzrlib/builtins.py:3604
2330
msgid ""
2331
"unreferenced ancestors\n"
2332
" Texts that are ancestors of other texts, but\n"
2333
" are not properly referenced by the revision ancestry. This is a\n"
2334
" subtle problem that Bazaar can work around."
2335
msgstr ""
2336
2337
#: bzrlib/builtins.py:3609
2338
msgid ""
2339
"unique file texts\n"
2340
" This is the total number of unique file contents\n"
2341
" seen in the checked revisions. It does not indicate a problem."
2342
msgstr ""
2343
2344
#: bzrlib/builtins.py:3613
2345
msgid ""
2346
"repeated file texts\n"
2347
" This is the total number of repeated texts seen\n"
2348
" in the checked revisions. Texts can be repeated when their file\n"
2349
" entries are modified, but the file contents are not. It does not\n"
2350
" indicate a problem."
2351
msgstr ""
2352
2353
#: bzrlib/builtins.py:3619
2354
msgid ""
2355
"If no restrictions are specified, all Bazaar data that is found at the "
2356
"given\n"
2357
"location will be checked."
2358
msgstr ""
2359
2360
#: bzrlib/builtins.py:3624
2361
msgid " Check the tree and branch at 'foo'::"
2362
msgstr ""
2363
2364
#: bzrlib/builtins.py:3626
2365
msgid " bzr check --tree --branch foo"
2366
msgstr ""
2367
2368
#: bzrlib/builtins.py:3628
2369
msgid " Check only the repository at 'bar'::"
2370
msgstr ""
2371
2372
#: bzrlib/builtins.py:3630
2373
msgid " bzr check --repo bar"
2374
msgstr ""
2375
2376
#: bzrlib/builtins.py:3632
2377
msgid " Check everything at 'baz'::"
2378
msgstr ""
2379
2380
#: bzrlib/builtins.py:3634
2381
msgid " bzr check baz"
2382
msgstr ""
2383
2384
#: bzrlib/builtins.py:3640
2385
msgid "Check the branch related to the current directory."
2386
msgstr ""
2387
2388
#: bzrlib/builtins.py:3642
2389
msgid "Check the repository related to the current directory."
2390
msgstr ""
2391
2392
#: bzrlib/builtins.py:3644
2393
msgid "Check the working tree related to the current directory."
2394
msgstr ""
2395
2396
#: bzrlib/builtins.py:3658
2397
msgid "Upgrade a repository, branch or working tree to a newer format."
2398
msgstr ""
2399
2400
#: bzrlib/builtins.py:3660
2401
msgid ""
2402
"When the default format has changed after a major new release of\n"
2403
"Bazaar, you may be informed during certain operations that you\n"
2404
"should upgrade. Upgrading to a newer format may improve performance\n"
2405
"or make new features available. It may however limit interoperability\n"
2406
"with older repositories or with older versions of Bazaar."
2407
msgstr ""
2408
2409
#: bzrlib/builtins.py:3666
2410
msgid ""
2411
"If you wish to upgrade to a particular format rather than the\n"
2412
"current default, that can be specified using the --format option.\n"
2413
"As a consequence, you can use the upgrade command this way to\n"
2414
"\"downgrade\" to an earlier format, though some conversions are\n"
2415
"a one way process (e.g. changing from the 1.x default to the\n"
2416
"2.x default) so downgrading is not always possible."
2417
msgstr ""
2418
2419
#: bzrlib/builtins.py:3673
2420
msgid ""
2421
"A backup.bzr.~#~ directory is created at the start of the conversion\n"
2422
"process (where # is a number). By default, this is left there on\n"
2423
"completion. If the conversion fails, delete the new .bzr directory\n"
2424
"and rename this one back in its place. Use the --clean option to ask\n"
2425
"for the backup.bzr directory to be removed on successful conversion.\n"
2426
"Alternatively, you can delete it by hand if everything looks good\n"
2427
"afterwards."
2428
msgstr ""
2429
2430
#: bzrlib/builtins.py:3681
2431
msgid ""
2432
"If the location given is a shared repository, dependent branches\n"
2433
"are also converted provided the repository converts successfully.\n"
2434
"If the conversion of a branch fails, remaining branches are still\n"
2435
"tried."
2436
msgstr ""
2437
2438
#: bzrlib/builtins.py:3686
2439
msgid ""
2440
"For more information on upgrades, see the Bazaar Upgrade Guide,\n"
2441
"http://doc.bazaar.canonical.com/latest/en/upgrade-guide/."
2442
msgstr ""
2443
2444
#: bzrlib/builtins.py:3694
2445
msgid "Upgrade to a specific format. See \"bzr help formats\" for details."
2446
msgstr ""
2447
2448
#: bzrlib/builtins.py:3698
2449
msgid "Branch format"
2450
msgstr ""
2451
2452
#: bzrlib/builtins.py:3700
2453
msgid "Remove the backup.bzr directory if successful."
2454
msgstr ""
2455
2456
#: bzrlib/builtins.py:3702
2457
msgid "Show what would be done, but don't actually do anything."
2458
msgstr ""
2459
2460
#: bzrlib/builtins.py:3717
2461
msgid "Show or set bzr user id."
2462
msgstr ""
2463
2464
#: bzrlib/builtins.py:3719
2465
msgid ""
2466
":Examples:\n"
2467
" Show the email of the current user::"
2468
msgstr ""
2469
2470
#: bzrlib/builtins.py:3722
2471
msgid " bzr whoami --email"
2472
msgstr ""
2473
2474
#: bzrlib/builtins.py:3724
2475
msgid " Set the current user::"
2476
msgstr ""
2477
2478
#: bzrlib/builtins.py:3726
2479
msgid " bzr whoami \"Frank Chu <fchu@example.com>\""
2480
msgstr ""
2481
2482
#: bzrlib/builtins.py:3730
2483
msgid "Display email address only."
2484
msgstr ""
2485
2486
#: bzrlib/builtins.py:3732
2487
msgid "Set identity for the current branch instead of globally."
2488
msgstr ""
2489
2490
#: bzrlib/builtins.py:3758
2491
msgid "--email can only be used to display existing identity"
2492
msgstr ""
2493
2494
#: bzrlib/builtins.py:3780
2495
msgid "Print or set the branch nickname."
2496
msgstr ""
2497
2498
#: bzrlib/builtins.py:3782
2499
msgid ""
2500
"If unset, the tree root directory name is used as the nickname.\n"
2501
"To print the current nickname, execute with no argument."
2502
msgstr ""
2503
2504
#: bzrlib/builtins.py:3785
2505
msgid ""
2506
"Bound branches use the nickname of its master branch unless it is set\n"
2507
"locally."
2508
msgstr ""
2509
2510
#: bzrlib/builtins.py:3805
2511
msgid "Set/unset and display aliases."
2512
msgstr ""
2513
2514
#: bzrlib/builtins.py:3807
2515
msgid ""
2516
":Examples:\n"
2517
" Show the current aliases::"
2518
msgstr ""
2519
2520
#: bzrlib/builtins.py:3810
2521
msgid " bzr alias"
2522
msgstr ""
2523
2524
#: bzrlib/builtins.py:3812
2525
msgid " Show the alias specified for 'll'::"
2526
msgstr ""
2527
2528
#: bzrlib/builtins.py:3814
2529
msgid " bzr alias ll"
2530
msgstr ""
2531
2532
#: bzrlib/builtins.py:3816
2533
msgid " Set an alias for 'll'::"
2534
msgstr ""
2535
2536
#: bzrlib/builtins.py:3818
2537
msgid " bzr alias ll=\"log --line -r-10..-1\""
2538
msgstr ""
2539
2540
#: bzrlib/builtins.py:3820
2541
msgid " To remove an alias for 'll'::"
2542
msgstr ""
2543
2544
#: bzrlib/builtins.py:3822
2545
msgid " bzr alias --remove ll"
2546
msgstr ""
2547
2548
#: bzrlib/builtins.py:3827
2549
msgid "Remove the alias."
2550
msgstr ""
2551
2552
#: bzrlib/builtins.py:3845
2553
msgid "bzr alias --remove expects an alias to remove."
2554
msgstr ""
2555
2556
#: bzrlib/builtins.py:4026
2557
msgid ""
2558
"subunit not available. subunit needs to be installed to use --subunit."
2559
msgstr ""
2560
2561
#: bzrlib/builtins.py:4043
2562
msgid ""
2563
"--benchmark is no longer supported from bzr 2.2; use bzr-usertest instead"
2564
msgstr ""
2565
2566
#: bzrlib/builtins.py:4090
2567
msgid "Show version of bzr."
2568
msgstr ""
2569
2570
#: bzrlib/builtins.py:4094
2571
msgid "Print just the version number."
2572
msgstr ""
2573
2574
#: bzrlib/builtins.py:4113
2575
msgid "It sure does!\n"
2576
msgstr ""
2577
2578
#: bzrlib/builtins.py:4137
2579
#, python-format
2580
msgid "merge base is revision %s\n"
2581
msgstr ""
2582
2583
#: bzrlib/builtins.py:4141
2584
msgid "Perform a three-way merge."
2585
msgstr ""
2586
2587
#: bzrlib/builtins.py:4143
2588
msgid ""
2589
"The source of the merge can be specified either in the form of a branch,\n"
2590
"or in the form of a path to a file containing a merge directive generated\n"
2591
"with bzr send. If neither is specified, the default is the upstream branch\n"
2592
"or the branch most recently merged using --remember. The source of the\n"
2593
"merge may also be specified in the form of a path to a file in another\n"
2594
"branch: in this case, only the modifications to that file are merged into\n"
2595
"the current working tree."
2596
msgstr ""
2597
2598
#: bzrlib/builtins.py:4151
2599
msgid ""
2600
"When merging from a branch, by default bzr will try to merge in all new\n"
2601
"work from the other branch, automatically determining an appropriate base\n"
2602
"revision. If this fails, you may need to give an explicit base."
2603
msgstr ""
2604
2605
#: bzrlib/builtins.py:4155
2606
msgid ""
2607
"To pick a different ending revision, pass \"--revision OTHER\". bzr will\n"
2608
"try to merge in all new work up to and including revision OTHER."
2609
msgstr ""
2610
2611
#: bzrlib/builtins.py:4158
2612
msgid ""
2613
"If you specify two values, \"--revision BASE..OTHER\", only revisions BASE\n"
2614
"through OTHER, excluding BASE but including OTHER, will be merged. If this\n"
2615
"causes some revisions to be skipped, i.e. if the destination branch does\n"
2616
"not already contain revision BASE, such a merge is commonly referred to as\n"
2617
"a \"cherrypick\". Unlike a normal merge, Bazaar does not currently track\n"
2618
"cherrypicks. The changes look like a normal commit, and the history of the\n"
2619
"changes from the other branch is not stored in the commit."
2620
msgstr ""
2621
2622
#: bzrlib/builtins.py:4166
2623
msgid "Revision numbers are always relative to the source branch."
2624
msgstr ""
2625
2626
#: bzrlib/builtins.py:4168 bzrlib/conflicts.py:52 bzrlib/conflicts.py:106
2627
msgid ""
2628
"Merge will do its best to combine the changes in two branches, but there\n"
2629
"are some kinds of problems only a human can fix. When it encounters those,\n"
2630
"it will mark a conflict. A conflict means that you need to fix something,\n"
2631
"before you should commit."
2632
msgstr ""
2633
2634
#: bzrlib/builtins.py:4173
2635
msgid ""
2636
"Use bzr resolve when you have fixed a problem. See also bzr conflicts."
2637
msgstr ""
2638
2639
#: bzrlib/builtins.py:4175
2640
msgid ""
2641
"If there is no default branch set, the first merge will set it (use\n"
2642
"--no-remember to avoid setting it). After that, you can omit the branch\n"
2643
"to use the default. To change the default, use --remember. The value will\n"
2644
"only be saved if the remote location can be accessed."
2645
msgstr ""
2646
2647
#: bzrlib/builtins.py:4180
2648
msgid ""
2649
"The results of the merge are placed into the destination working\n"
2650
"directory, where they can be reviewed (with bzr diff), tested, and then\n"
2651
"committed to record the result of the merge."
2652
msgstr ""
2653
2654
#: bzrlib/builtins.py:4184
2655
msgid ""
2656
"merge refuses to run if there are any uncommitted changes, unless\n"
2657
"--force is given. If --force is given, then the changes from the source \n"
2658
"will be merged with the current working tree, including any uncommitted\n"
2659
"changes in the tree. The --force option can also be used to create a\n"
2660
"merge revision which has more than two parents."
2661
msgstr ""
2662
2663
#: bzrlib/builtins.py:4190
2664
msgid ""
2665
"If one would like to merge changes from the working tree of the other\n"
2666
"branch without merging any committed revisions, the --uncommitted option\n"
2667
"can be given."
2668
msgstr ""
2669
2670
#: bzrlib/builtins.py:4194
2671
msgid ""
2672
"To select only some changes to merge, use \"merge -i\", which will prompt\n"
2673
"you to apply each diff hunk and file change, similar to \"shelve\"."
2674
msgstr ""
2675
2676
#: bzrlib/builtins.py:4197
2677
msgid ""
2678
":Examples:\n"
2679
" To merge all new revisions from bzr.dev::"
2680
msgstr ""
2681
2682
#: bzrlib/builtins.py:4200
2683
msgid " bzr merge ../bzr.dev"
2684
msgstr ""
2685
2686
#: bzrlib/builtins.py:4202
2687
msgid " To merge changes up to and including revision 82 from bzr.dev::"
2688
msgstr ""
2689
2690
#: bzrlib/builtins.py:4204
2691
msgid " bzr merge -r 82 ../bzr.dev"
2692
msgstr ""
2693
2694
#: bzrlib/builtins.py:4206
2695
msgid " To merge the changes introduced by 82, without previous changes::"
2696
msgstr ""
2697
2698
#: bzrlib/builtins.py:4208
2699
msgid " bzr merge -r 81..82 ../bzr.dev"
2700
msgstr ""
2701
2702
#: bzrlib/builtins.py:4210
2703
msgid " To apply a merge directive contained in /tmp/merge::"
2704
msgstr ""
2705
2706
#: bzrlib/builtins.py:4212
2707
msgid " bzr merge /tmp/merge"
2708
msgstr ""
2709
2710
#: bzrlib/builtins.py:4214
2711
msgid ""
2712
" To create a merge revision with three parents from two branches\n"
2713
" feature1a and feature1b:"
2714
msgstr ""
2715
2716
#: bzrlib/builtins.py:4217
2717
msgid ""
2718
" bzr merge ../feature1a\n"
2719
" bzr merge ../feature1b --force\n"
2720
" bzr commit -m 'revision with three parents'"
2721
msgstr ""
2722
2723
#: bzrlib/builtins.py:4229
2724
msgid "Merge even if the destination tree has uncommitted changes."
2725
msgstr ""
2726
2727
#: bzrlib/builtins.py:4235
2728
msgid ""
2729
"Apply uncommitted changes from a working copy, instead of branch changes."
2730
msgstr ""
2731
2732
#: bzrlib/builtins.py:4237
2733
msgid ""
2734
"If the destination is already completely merged into the source, pull from "
2735
"the source rather than merging. When this happens, you do not need to "
2736
"commit the result."
2737
msgstr ""
2738
2739
#: bzrlib/builtins.py:4242
2740
msgid ""
2741
"Branch to merge into, rather than the one containing the working directory."
2742
msgstr ""
2743
2744
#: bzrlib/builtins.py:4244
2745
msgid "Instead of merging, show a diff of the merge."
2746
msgstr ""
2747
2748
#: bzrlib/builtins.py:4246
2749
msgid "Select changes interactively."
2750
msgstr ""
2751
2752
#: bzrlib/builtins.py:4268
2753
msgid ""
2754
"Merging into empty branches not currently supported, "
2755
"https://bugs.launchpad.net/bzr/+bug/308562"
2756
msgstr ""
2757
2758
#: bzrlib/builtins.py:4295
2759
msgid "Cannot use --uncommitted with bundles or merge directives."
2760
msgstr ""
2761
2762
#: bzrlib/builtins.py:4306
2763
msgid "Cannot use --uncommitted and --revision at the same time."
2764
msgstr ""
2765
2766
#: bzrlib/builtins.py:4326
2767
msgid "merger: "
2768
msgstr ""
2769
2770
#: bzrlib/builtins.py:4328 bzrlib/bundle/apply_bundle.py:71
2771
msgid "Nothing to do."
2772
msgstr ""
2773
2774
#: bzrlib/builtins.py:4332
2775
msgid "Cannot pull individual files"
2776
msgstr ""
2777
2778
#: bzrlib/builtins.py:4340
2779
msgid "This branch has no commits. (perhaps you would prefer 'bzr pull')"
2780
msgstr ""
2781
2782
#: bzrlib/builtins.py:4398
2783
#, python-format
2784
msgid "Show-base is not supported for this merge type. %s"
2785
msgstr ""
2786
2787
#: bzrlib/builtins.py:4407
2788
#, python-format
2789
msgid "Conflict reduction is not supported for merge type %s."
2790
msgstr ""
2791
2792
#: bzrlib/builtins.py:4411
2793
msgid "Cannot do conflict reduction and show base."
2794
msgstr ""
2795
2796
#: bzrlib/builtins.py:4522
2797
msgid "No location specified or remembered"
2798
msgstr ""
2799
2800
#: bzrlib/builtins.py:4524
2801
msgid "{0} remembered {1} location {2}"
2802
msgstr ""
2803
2804
#: bzrlib/builtins.py:4530
2805
msgid "Redo a merge."
2806
msgstr ""
2807
2808
#: bzrlib/builtins.py:4532
2809
msgid ""
2810
"Use this if you want to try a different merge technique while resolving\n"
2811
"conflicts. Some merge techniques are better than others, and remerge\n"
2812
"lets you try different ones on different files."
2813
msgstr ""
2814
2815
#: bzrlib/builtins.py:4536
2816
msgid ""
2817
"The options for remerge have the same meaning and defaults as the ones for\n"
2818
"merge. The difference is that remerge can (only) be run when there is a\n"
2819
"pending merge, and it lets you specify particular files."
2820
msgstr ""
2821
2822
#: bzrlib/builtins.py:4540
2823
msgid ""
2824
":Examples:\n"
2825
" Re-do the merge of all conflicted files, and show the base text in\n"
2826
" conflict regions, in addition to the usual THIS and OTHER texts::"
2827
msgstr ""
2828
2829
#: bzrlib/builtins.py:4544
2830
msgid " bzr remerge --show-base"
2831
msgstr ""
2832
2833
#: bzrlib/builtins.py:4546
2834
msgid ""
2835
" Re-do the merge of \"foobar\", using the weave merge algorithm, with\n"
2836
" additional processing to reduce the size of conflict regions::"
2837
msgstr ""
2838
2839
#: bzrlib/builtins.py:4549
2840
msgid " bzr remerge --merge-type weave --reprocess foobar"
2841
msgstr ""
2842
2843
#: bzrlib/builtins.py:4556
2844
msgid "Show base revision text in conflicts."
2845
msgstr ""
2846
2847
#: bzrlib/builtins.py:4568
2848
msgid ""
2849
"Sorry, remerge only works after normal merges. Not cherrypicking or multi-"
2850
"merges."
2851
msgstr ""
2852
2853
#: bzrlib/builtins.py:4624
2854
msgid "Revert files to a previous revision."
2855
msgstr ""
2856
2857
#: bzrlib/builtins.py:4626
2858
msgid ""
2859
"Giving a list of files will revert only those files. Otherwise, all files\n"
2860
"will be reverted. If the revision is not specified with '--revision', the\n"
2861
"last committed revision is used."
2862
msgstr ""
2863
2864
#: bzrlib/builtins.py:4630
2865
msgid ""
2866
"To remove only some changes, without reverting to a prior version, use\n"
2867
"merge instead. For example, \"merge . -r -2..-3\" (don't forget the \".\")\n"
2868
"will remove the changes introduced by the second last commit (-2), without\n"
2869
"affecting the changes introduced by the last commit (-1). To remove\n"
2870
"certain changes on a hunk-by-hunk basis, see the shelve command."
2871
msgstr ""
2872
2873
#: bzrlib/builtins.py:4636
2874
msgid ""
2875
"By default, any files that have been manually changed will be backed up\n"
2876
"first. (Files changed only by merge are not backed up.) Backup files have\n"
2877
"'.~#~' appended to their name, where # is a number."
2878
msgstr ""
2879
2880
#: bzrlib/builtins.py:4640
2881
msgid ""
2882
"When you provide files, you can use their current pathname or the pathname\n"
2883
"from the target revision. So you can use revert to \"undelete\" a file by\n"
2884
"name. If you name a directory, all the contents of that directory will be\n"
2885
"reverted."
2886
msgstr ""
2887
2888
#: bzrlib/builtins.py:4645
2889
msgid ""
2890
"If you have newly added files since the target revision, they will be\n"
2891
"removed. If the files to be removed have been changed, backups will be\n"
2892
"created as above. Directories containing unknown files will not be\n"
2893
"deleted."
2894
msgstr ""
2895
2896
#: bzrlib/builtins.py:4650
2897
msgid ""
2898
"The working tree contains a list of revisions that have been merged but\n"
2899
"not yet committed. These revisions will be included as additional parents\n"
2900
"of the next commit. Normally, using revert clears that list as well as\n"
2901
"reverting the files. If any files are specified, revert leaves the list\n"
2902
"of uncommitted merges alone and reverts only the files. Use ``bzr revert\n"
2903
".`` in the tree root to revert all files but keep the recorded merges,\n"
2904
"and ``bzr revert --forget-merges`` to clear the pending merge list without\n"
2905
"reverting any files."
2906
msgstr ""
2907
2908
#: bzrlib/builtins.py:4659
2909
msgid ""
2910
"Using \"bzr revert --forget-merges\", it is possible to apply all of the\n"
2911
"changes from a branch in a single revision. To do this, perform the merge\n"
2912
"as desired. Then doing revert with the \"--forget-merges\" option will "
2913
"keep\n"
2914
"the content of the tree as it was, but it will clear the list of pending\n"
2915
"merges. The next commit will then contain all of the changes that are\n"
2916
"present in the other branch, but without any other parent revisions.\n"
2917
"Because this technique forgets where these changes originated, it may\n"
2918
"cause additional conflicts on later merges involving the same source and\n"
2919
"target branches."
2920
msgstr ""
2921
2922
#: bzrlib/builtins.py:4673
2923
msgid "Do not save backups of reverted files."
2924
msgstr ""
2925
2926
#: bzrlib/builtins.py:4675
2927
msgid "Remove pending merge marker, without changing any files."
2928
msgstr ""
2929
2930
#: bzrlib/builtins.py:4706
2931
msgid ""
2932
"Show help on a command or other topic.\n"
2933
" "
2934
msgstr ""
2935
2936
#: bzrlib/builtins.py:4711
2937
msgid "Show help on all commands."
2938
msgstr ""
2939
2940
#: bzrlib/builtins.py:4740
2941
msgid "Show unmerged/unpulled revisions between two branches."
2942
msgstr ""
2943
2944
#: bzrlib/builtins.py:4742
2945
msgid "OTHER_BRANCH may be local or remote."
2946
msgstr ""
2947
2948
#: bzrlib/builtins.py:4744
2949
msgid ""
2950
"To filter on a range of revisions, you can use the command -r begin..end\n"
2951
"-r revision requests a specific revision, -r ..end or -r begin.. are\n"
2952
"also valid.\n"
2953
" \n"
2954
":Exit values:\n"
2955
" 1 - some missing revisions\n"
2956
" 0 - no missing revisions"
2957
msgstr ""
2958
2959
#: bzrlib/builtins.py:4754
2960
msgid ""
2961
" Determine the missing revisions between this and the branch at the\n"
2962
" remembered pull location::"
2963
msgstr ""
2964
2965
#: bzrlib/builtins.py:4757
2966
msgid " bzr missing"
2967
msgstr ""
2968
2969
#: bzrlib/builtins.py:4759
2970
msgid " Determine the missing revisions between this and another branch::"
2971
msgstr ""
2972
2973
#: bzrlib/builtins.py:4761
2974
msgid " bzr missing http://server/branch"
2975
msgstr ""
2976
2977
#: bzrlib/builtins.py:4763
2978
msgid ""
2979
" Determine the missing revisions up to a specific revision on the other\n"
2980
" branch::"
2981
msgstr ""
2982
2983
#: bzrlib/builtins.py:4766
2984
msgid " bzr missing -r ..-10"
2985
msgstr ""
2986
2987
#: bzrlib/builtins.py:4768
2988
msgid ""
2989
" Determine the missing revisions up to a specific revision on this\n"
2990
" branch::"
2991
msgstr ""
2992
2993
#: bzrlib/builtins.py:4771
2994
msgid " bzr missing --my-revision ..-10"
2995
msgstr ""
2996
2997
#: bzrlib/builtins.py:4778
2998
msgid "Reverse the order of revisions."
2999
msgstr ""
3000
3001
#: bzrlib/builtins.py:4780
3002
msgid "Display changes in the local branch only."
3003
msgstr ""
3004
3005
#: bzrlib/builtins.py:4781
3006
msgid "Same as --mine-only."
3007
msgstr ""
3008
3009
#: bzrlib/builtins.py:4783
3010
msgid "Display changes in the remote branch only."
3011
msgstr ""
3012
3013
#: bzrlib/builtins.py:4784
3014
msgid "Same as --theirs-only."
3015
msgstr ""
3016
3017
#: bzrlib/builtins.py:4789
3018
msgid ""
3019
"Filter on other branch revisions (inclusive). See \"help revisionspec\" for "
3020
"details."
3021
msgstr ""
3022
3023
#: bzrlib/builtins.py:4793
3024
msgid ""
3025
"Filter on local branch revisions (inclusive). See \"help revisionspec\" for "
3026
"details."
3027
msgstr ""
3028
3029
#: bzrlib/builtins.py:4796
3030
msgid "Show all revisions in addition to the mainline ones."
3031
msgstr ""
3032
3033
#: bzrlib/builtins.py:4850
3034
msgid "No peer location known or specified."
3035
msgstr ""
3036
3037
#: bzrlib/builtins.py:4854
3038
msgid "Using saved parent location: {0}\n"
3039
msgstr ""
3040
3041
#: bzrlib/builtins.py:4887
3042
#, python-format
3043
msgid "You have %d extra revision:\n"
3044
msgid_plural "You have %d extra revisions:\n"
3045
msgstr[0] ""
3046
msgstr[1] ""
3047
3048
#: bzrlib/builtins.py:4903
3049
#, python-format
3050
msgid "You are missing %d revision:\n"
3051
msgid_plural "You are missing %d revisions:\n"
3052
msgstr[0] ""
3053
msgstr[1] ""
3054
3055
#: bzrlib/builtins.py:4915
3056
msgid "This branch has no new revisions.\n"
3057
msgstr ""
3058
3059
#: bzrlib/builtins.py:4918
3060
msgid "Other branch has no new revisions.\n"
3061
msgstr ""
3062
3063
#: bzrlib/builtins.py:4923
3064
msgid "Branches are up to date.\n"
3065
msgstr ""
3066
3067
#: bzrlib/builtins.py:4934
3068
msgid "Compress the data within a repository."
3069
msgstr ""
3070
3071
#: bzrlib/builtins.py:4936
3072
msgid ""
3073
"This operation compresses the data within a bazaar repository. As\n"
3074
"bazaar supports automatic packing of repository, this operation is\n"
3075
"normally not required to be done manually."
3076
msgstr ""
3077
3078
#: bzrlib/builtins.py:4940
3079
msgid ""
3080
"During the pack operation, bazaar takes a backup of existing repository\n"
3081
"data, i.e. pack files. This backup is eventually removed by bazaar\n"
3082
"automatically when it is safe to do so. To save disk space by removing\n"
3083
"the backed up pack files, the --clean-obsolete-packs option may be\n"
3084
"used."
3085
msgstr ""
3086
3087
#: bzrlib/builtins.py:4946
3088
msgid ""
3089
"Warning: If you use --clean-obsolete-packs and your machine crashes\n"
3090
"during or immediately after repacking, you may be left with a state\n"
3091
"where the deletion has been written to disk but the new packs have not\n"
3092
"been. In this case the repository may be unusable."
3093
msgstr ""
3094
3095
#: bzrlib/builtins.py:4955
3096
msgid "Delete obsolete packs to save disk space."
3097
msgstr ""
3098
3099
#: bzrlib/builtins.py:4969
3100
msgid "List the installed plugins."
3101
msgstr ""
3102
3103
#: bzrlib/builtins.py:4971
3104
msgid ""
3105
"This command displays the list of installed plugins including\n"
3106
"version of plugin and a short description of each."
3107
msgstr ""
3108
3109
#: bzrlib/builtins.py:4974
3110
msgid "--verbose shows the path where each plugin is located."
3111
msgstr ""
3112
3113
#: bzrlib/builtins.py:4976
3114
msgid ""
3115
"A plugin is an external component for Bazaar that extends the\n"
3116
"revision control system, by adding or replacing code in Bazaar.\n"
3117
"Plugins can do a variety of things, including overriding commands,\n"
3118
"adding new commands, providing additional network transports and\n"
3119
"customizing log output."
3120
msgstr ""
3121
3122
#: bzrlib/builtins.py:4982
3123
msgid ""
3124
"See the Bazaar Plugin Guide <http://doc.bazaar.canonical.com/plugins/en/>\n"
3125
"for further information on plugins including where to find them and how to\n"
3126
"install them. Instructions are also provided there on how to write new\n"
3127
"plugins using the Python programming language."
3128
msgstr ""
3129
3130
#: bzrlib/builtins.py:4998
3131
msgid "Show testament (signing-form) of a revision."
3132
msgstr ""
3133
3134
#: bzrlib/builtins.py:5001
3135
msgid "Produce long-format testament."
3136
msgstr ""
3137
3138
#: bzrlib/builtins.py:5003
3139
msgid "Produce a strict-format testament."
3140
msgstr ""
3141
3142
#: bzrlib/builtins.py:5029
3143
msgid "Show the origin of each line in a file."
3144
msgstr ""
3145
3146
#: bzrlib/builtins.py:5031
3147
msgid ""
3148
"This prints out the given file with an annotation on the left side\n"
3149
"indicating which revision, author and date introduced the change."
3150
msgstr ""
3151
3152
#: bzrlib/builtins.py:5034
3153
msgid ""
3154
"If the origin is the same for a run of consecutive lines, it is\n"
3155
"shown only at the top, unless the --all option is given."
3156
msgstr ""
3157
3158
#: bzrlib/builtins.py:5042
3159
msgid "Show annotations on all lines."
3160
msgstr ""
3161
3162
#: bzrlib/builtins.py:5043
3163
msgid "Show commit date in annotations."
3164
msgstr ""
3165
3166
#: bzrlib/builtins.py:5130
3167
msgid "Cannot sign a range of non-revision-history revisions"
3168
msgstr ""
3169
3170
#: bzrlib/builtins.py:5142
3171
msgid "Please supply either one revision, or a range."
3172
msgstr ""
3173
3174
#: bzrlib/builtins.py:5146
3175
msgid ""
3176
"Convert the current branch into a checkout of the supplied branch.\n"
3177
"If no branch is supplied, rebind to the last bound location."
3178
msgstr ""
3179
3180
#: bzrlib/builtins.py:5149
3181
msgid ""
3182
"Once converted into a checkout, commits must succeed on the master branch\n"
3183
"before they will be applied to the local branch."
3184
msgstr ""
3185
3186
#: bzrlib/builtins.py:5152
3187
msgid ""
3188
"Bound branches use the nickname of its master branch unless it is set\n"
3189
"locally, in which case binding will update the local nickname to be\n"
3190
"that of the master."
3191
msgstr ""
3192
3193
#: bzrlib/builtins.py:5167
3194
msgid "No location supplied. This format does not remember old locations."
3195
msgstr ""
3196
3197
#: bzrlib/builtins.py:5172
3198
msgid "Branch is already bound"
3199
msgstr ""
3200
3201
#: bzrlib/builtins.py:5174
3202
msgid "No location supplied and no previous location known"
3203
msgstr ""
3204
3205
#: bzrlib/builtins.py:5180
3206
msgid "These branches have diverged. Try merging, and then bind again."
3207
msgstr ""
3208
3209
#: bzrlib/builtins.py:5187
3210
msgid "Convert the current checkout into a regular branch."
3211
msgstr ""
3212
3213
#: bzrlib/builtins.py:5189
3214
msgid ""
3215
"After unbinding, the local branch is considered independent and subsequent\n"
3216
"commits will be local only."
3217
msgstr ""
3218
3219
#: bzrlib/builtins.py:5200
3220
msgid "Local branch is not bound"
3221
msgstr ""
3222
3223
#: bzrlib/builtins.py:5204
3224
msgid "Remove the last committed revision."
3225
msgstr ""
3226
3227
#: bzrlib/builtins.py:5206
3228
msgid ""
3229
"--verbose will print out what is being removed.\n"
3230
"--dry-run will go through all the motions, but not actually\n"
3231
"remove anything."
3232
msgstr ""
3233
3234
#: bzrlib/builtins.py:5210
3235
msgid ""
3236
"If --revision is specified, uncommit revisions to leave the branch at the\n"
3237
"specified revision. For example, \"bzr uncommit -r 15\" will leave the\n"
3238
"branch at revision 15."
3239
msgstr ""
3240
3241
#: bzrlib/builtins.py:5214
3242
msgid ""
3243
"Uncommit leaves the working tree ready for a new commit. The only change\n"
3244
"it may make is to restore any pending merges that were present before\n"
3245
"the commit."
3246
msgstr ""
3247
3248
#: bzrlib/builtins.py:5225
3249
msgid "Don't actually make changes."
3250
msgstr ""
3251
3252
#: bzrlib/builtins.py:5226
3253
msgid "Say yes to all questions."
3254
msgstr ""
3255
3256
#: bzrlib/builtins.py:5228
3257
msgid "Keep tags that point to removed revisions."
3258
msgstr ""
3259
3260
#: bzrlib/builtins.py:5230
3261
msgid "Only remove the commits from the local branch when in a checkout."
3262
msgstr ""
3263
3264
#: bzrlib/builtins.py:5279
3265
msgid "No revisions to uncommit.\n"
3266
msgstr ""
3267
3268
#: bzrlib/builtins.py:5294
3269
msgid "Dry-run, pretending to remove the above revisions.\n"
3270
msgstr ""
3271
3272
#: bzrlib/builtins.py:5297
3273
msgid "The above revision(s) will be removed.\n"
3274
msgstr ""
3275
3276
#: bzrlib/builtins.py:5301
3277
msgid "Uncommit these revisions"
3278
msgstr ""
3279
3280
#: bzrlib/builtins.py:5304
3281
msgid "Canceled\n"
3282
msgstr ""
3283
3284
#: bzrlib/builtins.py:5311
3285
#, python-format
3286
msgid ""
3287
"You can restore the old tip by running:\n"
3288
" bzr pull . -r revid:%s\n"
3289
msgstr ""
3290
3291
#: bzrlib/builtins.py:5316
3292
msgid "Break a dead lock."
3293
msgstr ""
3294
3295
#: bzrlib/builtins.py:5318
3296
msgid ""
3297
"This command breaks a lock on a repository, branch, working directory or\n"
3298
"config file."
3299
msgstr ""
3300
3301
#: bzrlib/builtins.py:5321
3302
msgid ""
3303
"CAUTION: Locks should only be broken when you are sure that the process\n"
3304
"holding the lock has been stopped."
3305
msgstr ""
3306
3307
#: bzrlib/builtins.py:5324
3308
msgid ""
3309
"You can get information on what locks are open via the 'bzr info\n"
3310
"[location]' command."
3311
msgstr ""
3312
3313
#: bzrlib/builtins.py:5327
3314
msgid ""
3315
":Examples:\n"
3316
" bzr break-lock\n"
3317
" bzr break-lock bzr+ssh://example.com/bzr/foo\n"
3318
" bzr break-lock --conf ~/.bazaar"
3319
msgstr ""
3320
3321
#: bzrlib/builtins.py:5336
3322
msgid "LOCATION is the directory where the config lock is."
3323
msgstr ""
3324
3325
#: bzrlib/builtins.py:5338
3326
msgid "Do not ask for confirmation before breaking the lock."
3327
msgstr ""
3328
3329
#: bzrlib/builtins.py:5373
3330
msgid "The Bazaar smart server protocol over TCP. (default port: 4155)"
3331
msgstr ""
3332
3333
#: bzrlib/builtins.py:5374
3334
msgid "Run the bzr server."
3335
msgstr ""
3336
3337
#: bzrlib/builtins.py:5380
3338
msgid "Serve on stdin/out for use from inetd or sshd."
3339
msgstr ""
3340
3341
#: bzrlib/builtins.py:5381
3342
msgid "protocol"
3343
msgstr ""
3344
3345
#: bzrlib/builtins.py:5382
3346
msgid "Protocol to serve."
3347
msgstr ""
3348
3349
#: bzrlib/builtins.py:5386
3350
msgid ""
3351
"Listen for connections on nominated port of the form [hostname:]portnumber. "
3352
"Passing 0 as the port number will result in a dynamically allocated port. "
3353
"The default port depends on the protocol."
3354
msgstr ""
3355
3356
#: bzrlib/builtins.py:5392
3357
msgid "Serve contents of this directory."
3358
msgstr ""
3359
3360
#: bzrlib/builtins.py:5394
3361
msgid ""
3362
"By default the server is a readonly server. Supplying --allow-writes "
3363
"enables write access to the contents of the served directory and below. "
3364
"Note that ``bzr serve`` does not perform authentication, so unless some form "
3365
"of external authentication is arranged supplying this option leads to global "
3366
"uncontrolled write access to your file system."
3367
msgstr ""
3368
3369
#: bzrlib/builtins.py:5403
3370
msgid "Override the default idle client timeout (5min)."
3371
msgstr ""
3372
3373
#: bzrlib/builtins.py:5453
3374
msgid "Combine a tree into its containing tree."
3375
msgstr ""
3376
3377
#: bzrlib/builtins.py:5455
3378
msgid "This command requires the target tree to be in a rich-root format."
3379
msgstr ""
3380
3381
#: bzrlib/builtins.py:5457
3382
msgid ""
3383
"The TREE argument should be an independent tree, inside another tree, but\n"
3384
"not part of it. (Such trees can be produced by \"bzr split\", but also by\n"
3385
"running \"bzr branch\" with the target inside a tree.)"
3386
msgstr ""
3387
3388
#: bzrlib/builtins.py:5461
3389
msgid ""
3390
"The result is a combined tree, with the subtree no longer an independent\n"
3391
"part. This is marked as a merge of the subtree into the containing tree,\n"
3392
"and all history is preserved."
3393
msgstr ""
3394
3395
#: bzrlib/builtins.py:5479
3396
#, python-format
3397
msgid ""
3398
"Can't join trees because %s doesn't support rich root data.\n"
3399
"You can use bzr upgrade on the repository."
3400
msgstr ""
3401
3402
#: bzrlib/builtins.py:5489 bzrlib/builtins.py:5495
3403
msgid "Cannot join {0}. {1}"
3404
msgstr ""
3405
3406
#: bzrlib/builtins.py:5499
3407
msgid "Split a subdirectory of a tree into a separate tree."
3408
msgstr ""
3409
3410
#: bzrlib/builtins.py:5501
3411
msgid ""
3412
"This command will produce a target tree in a format that supports\n"
3413
"rich roots, like 'rich-root' or 'rich-root-pack'. These formats cannot be\n"
3414
"converted into earlier formats like 'dirstate-tags'."
3415
msgstr ""
3416
3417
#: bzrlib/builtins.py:5505
3418
msgid ""
3419
"The TREE argument should be a subdirectory of a working tree. That\n"
3420
"subdirectory will be converted into an independent tree, with its own\n"
3421
"branch. Commits in the top-level tree will not apply to the new subtree."
3422
msgstr ""
3423
3424
#: bzrlib/builtins.py:5585
3425
msgid "No submit branch specified or known"
3426
msgstr ""
3427
3428
#: bzrlib/builtins.py:5593 bzrlib/send.py:108
3429
msgid "No public branch specified or known"
3430
msgstr ""
3431
3432
#: bzrlib/builtins.py:5598
3433
msgid "bzr merge-directive takes at most two one revision identifiers"
3434
msgstr ""
3435
3436
#: bzrlib/builtins.py:5607
3437
msgid "No revisions to bundle."
3438
msgstr ""
3439
3440
#: bzrlib/builtins.py:5626
3441
msgid "Mail or create a merge-directive for submitting changes."
3442
msgstr ""
3443
3444
#: bzrlib/builtins.py:5628
3445
msgid "A merge directive provides many things needed for requesting merges:"
3446
msgstr ""
3447
3448
#: bzrlib/builtins.py:5630
3449
msgid "* A machine-readable description of the merge to perform"
3450
msgstr ""
3451
3452
#: bzrlib/builtins.py:5632
3453
msgid "* An optional patch that is a preview of the changes requested"
3454
msgstr ""
3455
3456
#: bzrlib/builtins.py:5634
3457
msgid ""
3458
"* An optional bundle of revision data, so that the changes can be applied\n"
3459
" directly from the merge directive, without retrieving data from a\n"
3460
" branch."
3461
msgstr ""
3462
3463
#: bzrlib/builtins.py:5638
3464
msgid ""
3465
"`bzr send` creates a compact data set that, when applied using bzr\n"
3466
"merge, has the same effect as merging from the source branch. "
3467
msgstr ""
3468
3469
#: bzrlib/builtins.py:5641
3470
msgid ""
3471
"By default the merge directive is self-contained and can be applied to any\n"
3472
"branch containing submit_branch in its ancestory without needing access to\n"
3473
"the source branch."
3474
msgstr ""
3475
3476
#: bzrlib/builtins.py:5645
3477
msgid ""
3478
"If --no-bundle is specified, then Bazaar doesn't send the contents of the\n"
3479
"revisions, but only a structured request to merge from the\n"
3480
"public_location. In that case the public_branch is needed and it must be\n"
3481
"up-to-date and accessible to the recipient. The public_branch is always\n"
3482
"included if known, so that people can check it later."
3483
msgstr ""
3484
3485
#: bzrlib/builtins.py:5651
3486
msgid ""
3487
"The submit branch defaults to the parent of the source branch, but can be\n"
3488
"overridden. Both submit branch and public branch will be remembered in\n"
3489
"branch.conf the first time they are used for a particular branch. The\n"
3490
"source branch defaults to that containing the working directory, but can\n"
3491
"be changed using --from."
3492
msgstr ""
3493
3494
#: bzrlib/builtins.py:5657
3495
msgid ""
3496
"Both the submit branch and the public branch follow the usual behavior with\n"
3497
"respect to --remember: If there is no default location set, the first send\n"
3498
"will set it (use --no-remember to avoid setting it). After that, you can\n"
3499
"omit the location to use the default. To change the default, use\n"
3500
"--remember. The value will only be saved if the location can be accessed."
3501
msgstr ""
3502
3503
#: bzrlib/builtins.py:5663
3504
msgid ""
3505
"In order to calculate those changes, bzr must analyse the submit branch.\n"
3506
"Therefore it is most efficient for the submit branch to be a local mirror.\n"
3507
"If a public location is known for the submit_branch, that location is used\n"
3508
"in the merge directive."
3509
msgstr ""
3510
3511
#: bzrlib/builtins.py:5668
3512
msgid ""
3513
"The default behaviour is to send the merge directive by mail, unless -o is\n"
3514
"given, in which case it is sent to a file."
3515
msgstr ""
3516
3517
#: bzrlib/builtins.py:5671
3518
msgid ""
3519
"Mail is sent using your preferred mail program. This should be transparent\n"
3520
"on Windows (it uses MAPI). On Unix, it requires the xdg-email utility.\n"
3521
"If the preferred client can't be found (or used), your editor will be used."
3522
msgstr ""
3523
3524
#: bzrlib/builtins.py:5675
3525
msgid ""
3526
"To use a specific mail program, set the mail_client configuration option.\n"
3527
"(For Thunderbird 1.5, this works around some bugs.) Supported values for\n"
3528
"specific clients are \"claws\", \"evolution\", \"kmail\", \"mail.app\" "
3529
"(MacOS X's\n"
3530
"Mail.app), \"mutt\", and \"thunderbird\"; generic options are \"default\",\n"
3531
"\"editor\", \"emacsclient\", \"mapi\", and \"xdg-email\". Plugins may also "
3532
"add\n"
3533
"supported clients."
3534
msgstr ""
3535
3536
#: bzrlib/builtins.py:5682
3537
msgid ""
3538
"If mail is being sent, a to address is required. This can be supplied\n"
3539
"either on the commandline, by setting the submit_to configuration\n"
3540
"option in the branch itself or the child_submit_to configuration option\n"
3541
"in the submit branch."
3542
msgstr ""
3543
3544
#: bzrlib/builtins.py:5687
3545
msgid ""
3546
"Two formats are currently supported: \"4\" uses revision bundle format 4 "
3547
"and\n"
3548
"merge directive format 2. It is significantly faster and smaller than\n"
3549
"older formats. It is compatible with Bazaar 0.19 and later. It is the\n"
3550
"default. \"0.9\" uses revision bundle format 0.9 and merge directive\n"
3551
"format 1. It is compatible with Bazaar 0.12 - 0.18."
3552
msgstr ""
3553
3554
#: bzrlib/builtins.py:5693
3555
msgid ""
3556
"The merge directives created by bzr send may be applied using bzr merge or\n"
3557
"bzr pull by specifying a file containing a merge directive as the location."
3558
msgstr ""
3559
3560
#: bzrlib/builtins.py:5696
3561
msgid ""
3562
"bzr send makes extensive use of public locations to map local locations "
3563
"into\n"
3564
"URLs that can be used by other people. See `bzr help configuration` to\n"
3565
"set them, and use `bzr info` to display them."
3566
msgstr ""
3567
3568
#: bzrlib/builtins.py:5720
3569
msgid "Write merge directive to this file or directory; use - for stdout."
3570
msgstr ""
3571
3572
#: bzrlib/builtins.py:5724
3573
msgid ""
3574
"Refuse to send if there are uncommitted changes in the working tree, --no-"
3575
"strict disables the check."
3576
msgstr ""
3577
3578
#: bzrlib/builtins.py:5726
3579
msgid "Mail the request to this address."
3580
msgstr ""
3581
3582
#: bzrlib/builtins.py:5730
3583
msgid "Body for the email."
3584
msgstr ""
3585
3586
#: bzrlib/builtins.py:5783
3587
msgid "Do not include a bundle in the merge directive."
3588
msgstr ""
3589
3590
#: bzrlib/builtins.py:5784
3591
msgid "Do not include a preview patch in the merge directive."
3592
msgstr ""
3593
3594
#: bzrlib/builtins.py:5787
3595
msgid "Remember submit and public branch."
3596
msgstr ""
3597
3598
#: bzrlib/builtins.py:5789
3599
msgid ""
3600
"Branch to generate the submission from, rather than the one containing the "
3601
"working directory."
3602
msgstr ""
3603
3604
#: bzrlib/builtins.py:5799 bzrlib/cmd_version_info.py:76
3605
msgid "format"
3606
msgstr ""
3607
3608
#: bzrlib/builtins.py:5800
3609
msgid "Use the specified output format."
3610
msgstr ""
3611
3612
#: bzrlib/builtins.py:5822
3613
msgid "Create, remove or modify a tag naming a revision."
3614
msgstr ""
3615
3616
#: bzrlib/builtins.py:5824
3617
msgid ""
3618
"Tags give human-meaningful names to revisions. Commands that take a -r\n"
3619
"(--revision) option can be given -rtag:X, where X is any previously\n"
3620
"created tag."
3621
msgstr ""
3622
3623
#: bzrlib/builtins.py:5828
3624
msgid ""
3625
"Tags are stored in the branch. Tags are copied from one branch to another\n"
3626
"along when you branch, push, pull or merge."
3627
msgstr ""
3628
3629
#: bzrlib/builtins.py:5831
3630
msgid ""
3631
"It is an error to give a tag name that already exists unless you pass\n"
3632
"--force, in which case the tag is moved to point to the new revision."
3633
msgstr ""
3634
3635
#: bzrlib/builtins.py:5834
3636
msgid ""
3637
"To rename a tag (change the name but keep it on the same revsion), run "
3638
"``bzr\n"
3639
"tag new-name -r tag:old-name`` and then ``bzr tag --delete oldname``."
3640
msgstr ""
3641
3642
#: bzrlib/builtins.py:5837
3643
msgid ""
3644
"If no tag name is specified it will be determined through the \n"
3645
"'automatic_tag_name' hook. This can e.g. be used to automatically tag\n"
3646
"upstream releases by reading configure.ac. See ``bzr help hooks`` for\n"
3647
"details."
3648
msgstr ""
3649
3650
#: bzrlib/builtins.py:5847
3651
msgid "Delete this tag rather than placing it."
3652
msgstr ""
3653
3654
#: bzrlib/builtins.py:5850
3655
msgid "Branch in which to place the tag."
3656
msgstr ""
3657
3658
#: bzrlib/builtins.py:5852
3659
msgid "Replace existing tags."
3660
msgstr ""
3661
3662
#: bzrlib/builtins.py:5867
3663
msgid "No tag specified to delete."
3664
msgstr ""
3665
3666
#: bzrlib/builtins.py:5869
3667
#, python-format
3668
msgid "Deleted tag %s."
3669
msgstr ""
3670
3671
#: bzrlib/builtins.py:5883
3672
msgid "Please specify a tag name."
3673
msgstr ""
3674
3675
#: bzrlib/builtins.py:5891
3676
#, python-format
3677
msgid "Tag %s already exists for that revision."
3678
msgstr ""
3679
3680
#: bzrlib/builtins.py:5895
3681
#, python-format
3682
msgid "Created tag %s."
3683
msgstr ""
3684
3685
#: bzrlib/builtins.py:5897
3686
#, python-format
3687
msgid "Updated tag %s."
3688
msgstr ""
3689
3690
#: bzrlib/builtins.py:5901
3691
msgid "List tags."
3692
msgstr ""
3693
3694
#: bzrlib/builtins.py:5903
3695
msgid ""
3696
"This command shows a table of tag names and the revisions they reference."
3697
msgstr ""
3698
3699
#: bzrlib/builtins.py:5909
3700
msgid "Branch whose tags should be displayed."
3701
msgstr ""
3702
3703
#: bzrlib/builtins.py:5911
3704
msgid "Sort tags by different criteria."
3705
msgstr ""
3706
3707
#: bzrlib/builtins.py:5911
3708
msgid "Sorting"
3709
msgstr ""
3710
3711
#: bzrlib/builtins.py:5980
3712
msgid "Reconfigure the type of a bzr directory."
3713
msgstr ""
3714
3715
#: bzrlib/builtins.py:5982
3716
msgid "A target configuration must be specified."
3717
msgstr ""
3718
3719
#: bzrlib/builtins.py:5984
3720
msgid ""
3721
"For checkouts, the bind-to location will be auto-detected if not specified.\n"
3722
"The order of preference is\n"
3723
"1. For a lightweight checkout, the current bound location.\n"
3724
"2. For branches that used to be checkouts, the previously-bound location.\n"
3725
"3. The push location.\n"
3726
"4. The parent location.\n"
3727
"If none of these is available, --bind-to must be specified."
3728
msgstr ""
3729
3730
#: bzrlib/builtins.py:5998
3731
msgid "Tree type"
3732
msgstr ""
3733
3734
#: bzrlib/builtins.py:5999
3735
msgid "The relation between branch and tree."
3736
msgstr ""
3737
3738
#: bzrlib/builtins.py:6001
3739
msgid "Reconfigure to be an unbound branch with no working tree."
3740
msgstr ""
3741
3742
#: bzrlib/builtins.py:6002
3743
msgid "Reconfigure to be an unbound branch with a working tree."
3744
msgstr ""
3745
3746
#: bzrlib/builtins.py:6003
3747
msgid "Reconfigure to be a bound branch with a working tree."
3748
msgstr ""
3749
3750
#: bzrlib/builtins.py:6004
3751
msgid "Reconfigure to be a lightweight checkout (with no local history)."
3752
msgstr ""
3753
3754
#: bzrlib/builtins.py:6009
3755
msgid "Repository type"
3756
msgstr ""
3757
3758
#: bzrlib/builtins.py:6010
3759
msgid "Location fo the repository."
3760
msgstr ""
3761
3762
#: bzrlib/builtins.py:6012
3763
msgid ""
3764
"Reconfigure to be a standalone branch (i.e. stop using shared repository)."
3765
msgstr ""
3766
3767
#: bzrlib/builtins.py:6014
3768
msgid "Reconfigure to use a shared repository."
3769
msgstr ""
3770
3771
#: bzrlib/builtins.py:6018
3772
msgid "Trees in Repository"
3773
msgstr ""
3774
3775
#: bzrlib/builtins.py:6019
3776
msgid "Whether new branches in the repository have trees."
3777
msgstr ""
3778
3779
#: bzrlib/builtins.py:6021
3780
msgid ""
3781
"Reconfigure repository to create working trees on branches by default."
3782
msgstr ""
3783
3784
#: bzrlib/builtins.py:6023
3785
msgid ""
3786
"Reconfigure repository to not create working trees on branches by default."
3787
msgstr ""
3788
3789
#: bzrlib/builtins.py:6026
3790
msgid "Branch to bind checkout to."
3791
msgstr ""
3792
3793
#: bzrlib/builtins.py:6028
3794
msgid "Perform reconfiguration even if local changes will be lost."
3795
msgstr ""
3796
3797
#: bzrlib/builtins.py:6031
3798
msgid "Reconfigure a branch to be stacked on another branch."
3799
msgstr ""
3800
3801
#: bzrlib/builtins.py:6035
3802
msgid ""
3803
"Reconfigure a branch to be unstacked. This may require copying substantial "
3804
"data into it."
3805
msgstr ""
3806
3807
#: bzrlib/builtins.py:6045
3808
msgid "Can't use both --stacked-on and --unstacked"
3809
msgstr ""
3810
3811
#: bzrlib/builtins.py:6059
3812
msgid "No target configuration specified"
3813
msgstr ""
3814
3815
#: bzrlib/builtins.py:6094
3816
msgid "Set the branch of a checkout and update."
3817
msgstr ""
3818
3819
#: bzrlib/builtins.py:6096
3820
msgid ""
3821
"For lightweight checkouts, this changes the branch being referenced.\n"
3822
"For heavyweight checkouts, this checks that there are no local commits\n"
3823
"versus the current bound branch, then it makes the local branch a mirror\n"
3824
"of the new location and binds to it."
3825
msgstr ""
3826
3827
#: bzrlib/builtins.py:6101
3828
msgid ""
3829
"In both cases, the working tree is updated and uncommitted changes\n"
3830
"are merged. The user can commit or revert these as they desire."
3831
msgstr ""
3832
3833
#: bzrlib/builtins.py:6104
3834
msgid "Pending merges need to be committed or reverted before using switch."
3835
msgstr ""
3836
3837
#: bzrlib/builtins.py:6106
3838
msgid ""
3839
"The path to the branch to switch to can be specified relative to the parent\n"
3840
"directory of the current branch. For example, if you are currently in a\n"
3841
"checkout of /path/to/branch, specifying 'newbranch' will find a branch at\n"
3842
"/path/to/newbranch."
3843
msgstr ""
3844
3845
#: bzrlib/builtins.py:6111
3846
msgid ""
3847
"Bound branches use the nickname of its master branch unless it is set\n"
3848
"locally, in which case switching will update the local nickname to be\n"
3849
"that of the master."
3850
msgstr ""
3851
3852
#: bzrlib/builtins.py:6119
3853
msgid "Switch even if local commits will be lost."
3854
msgstr ""
3855
3856
#: bzrlib/builtins.py:6122
3857
msgid "Create the target branch from this one before switching to it."
3858
msgstr ""
3859
3860
#: bzrlib/builtins.py:6134
3861
msgid "You must supply either a revision or a location"
3862
msgstr ""
3863
3864
#: bzrlib/builtins.py:6145
3865
msgid "cannot create branch without source branch"
3866
msgstr ""
3867
3868
#: bzrlib/builtins.py:6209
3869
msgid "Manage filtered views."
3870
msgstr ""
3871
3872
#: bzrlib/builtins.py:6211
3873
msgid ""
3874
"Views provide a mask over the tree so that users can focus on\n"
3875
"a subset of a tree when doing their work. After creating a view,\n"
3876
"commands that support a list of files - status, diff, commit, etc -\n"
3877
"effectively have that list of files implicitly given each time.\n"
3878
"An explicit list of files can still be given but those files\n"
3879
"must be within the current view."
3880
msgstr ""
3881
3882
#: bzrlib/builtins.py:6218
3883
msgid ""
3884
"In most cases, a view has a short life-span: it is created to make\n"
3885
"a selected change and is deleted once that change is committed.\n"
3886
"At other times, you may wish to create one or more named views\n"
3887
"and switch between them."
3888
msgstr ""
3889
3890
#: bzrlib/builtins.py:6223
3891
msgid ""
3892
"To disable the current view without deleting it, you can switch to\n"
3893
"the pseudo view called ``off``. This can be useful when you need\n"
3894
"to see the whole tree for an operation or two (e.g. merge) but\n"
3895
"want to switch back to your view after that."
3896
msgstr ""
3897
3898
#: bzrlib/builtins.py:6228
3899
msgid ""
3900
":Examples:\n"
3901
" To define the current view::"
3902
msgstr ""
3903
3904
#: bzrlib/builtins.py:6231
3905
msgid " bzr view file1 dir1 ..."
3906
msgstr ""
3907
3908
#: bzrlib/builtins.py:6233
3909
msgid " To list the current view::"
3910
msgstr ""
3911
3912
#: bzrlib/builtins.py:6235
3913
msgid " bzr view"
3914
msgstr ""
3915
3916
#: bzrlib/builtins.py:6237
3917
msgid " To delete the current view::"
3918
msgstr ""
3919
3920
#: bzrlib/builtins.py:6239
3921
msgid " bzr view --delete"
3922
msgstr ""
3923
3924
#: bzrlib/builtins.py:6241
3925
msgid " To disable the current view without deleting it::"
3926
msgstr ""
3927
3928
#: bzrlib/builtins.py:6243
3929
msgid " bzr view --switch off"
3930
msgstr ""
3931
3932
#: bzrlib/builtins.py:6245
3933
msgid " To define a named view and switch to it::"
3934
msgstr ""
3935
3936
#: bzrlib/builtins.py:6247
3937
msgid " bzr view --name view-name file1 dir1 ..."
3938
msgstr ""
3939
3940
#: bzrlib/builtins.py:6249
3941
msgid " To list a named view::"
3942
msgstr ""
3943
3944
#: bzrlib/builtins.py:6251
3945
msgid " bzr view --name view-name"
3946
msgstr ""
3947
3948
#: bzrlib/builtins.py:6253
3949
msgid " To delete a named view::"
3950
msgstr ""
3951
3952
#: bzrlib/builtins.py:6255
3953
msgid " bzr view --name view-name --delete"
3954
msgstr ""
3955
3956
#: bzrlib/builtins.py:6257
3957
msgid " To switch to a named view::"
3958
msgstr ""
3959
3960
#: bzrlib/builtins.py:6259
3961
msgid " bzr view --switch view-name"
3962
msgstr ""
3963
3964
#: bzrlib/builtins.py:6261
3965
msgid " To list all views defined::"
3966
msgstr ""
3967
3968
#: bzrlib/builtins.py:6263
3969
msgid " bzr view --all"
3970
msgstr ""
3971
3972
#: bzrlib/builtins.py:6265
3973
msgid " To delete all views::"
3974
msgstr ""
3975
3976
#: bzrlib/builtins.py:6267
3977
msgid " bzr view --delete --all"
3978
msgstr ""
3979
3980
#: bzrlib/builtins.py:6274
3981
msgid "Apply list or delete action to all views."
3982
msgstr ""
3983
3984
#: bzrlib/builtins.py:6277
3985
msgid "Delete the view."
3986
msgstr ""
3987
3988
#: bzrlib/builtins.py:6280
3989
msgid "Name of the view to define, list or delete."
3990
msgstr ""
3991
3992
#: bzrlib/builtins.py:6284
3993
msgid "Name of the view to switch to."
3994
msgstr ""
3995
3996
#: bzrlib/builtins.py:6303
3997
msgid "Both --delete and a file list specified"
3998
msgstr ""
3999
4000
#: bzrlib/builtins.py:6306
4001
msgid "Both --delete and --switch specified"
4002
msgstr ""
4003
4004
#: bzrlib/builtins.py:6309
4005
msgid "Deleted all views.\n"
4006
msgstr ""
4007
4008
#: bzrlib/builtins.py:6311
4009
msgid "No current view to delete"
4010
msgstr ""
4011
4012
#: bzrlib/builtins.py:6314
4013
#, python-format
4014
msgid "Deleted '%s' view.\n"
4015
msgstr ""
4016
4017
#: bzrlib/builtins.py:6318
4018
msgid "Both --switch and a file list specified"
4019
msgstr ""
4020
4021
#: bzrlib/builtins.py:6321
4022
msgid "Both --switch and --all specified"
4023
msgstr ""
4024
4025
#: bzrlib/builtins.py:6324
4026
msgid "No current view to disable"
4027
msgstr ""
4028
4029
#: bzrlib/builtins.py:6326
4030
#, python-format
4031
msgid "Disabled '%s' view.\n"
4032
msgstr ""
4033
4034
#: bzrlib/builtins.py:6330 bzrlib/builtins.py:6352
4035
msgid "Using '{0}' view: {1}\n"
4036
msgstr ""
4037
4038
#: bzrlib/builtins.py:6333
4039
msgid "Views defined:\n"
4040
msgstr ""
4041
4042
#: bzrlib/builtins.py:6342
4043
msgid "No views defined.\n"
4044
msgstr ""
4045
4046
#: bzrlib/builtins.py:6349
4047
msgid "Cannot change the 'off' pseudo view"
4048
msgstr ""
4049
4050
#: bzrlib/builtins.py:6357
4051
msgid "No current view.\n"
4052
msgstr ""
4053
4054
#: bzrlib/builtins.py:6360
4055
msgid "'{0}' view is: {1}\n"
4056
msgstr ""
4057
4058
#: bzrlib/builtins.py:6380
4059
msgid " <no hooks installed>\n"
4060
msgstr ""
4061
4062
#: bzrlib/builtins.py:6384
4063
msgid "Remove a branch."
4064
msgstr ""
4065
4066
#: bzrlib/builtins.py:6386
4067
msgid ""
4068
"This will remove the branch from the specified location but \n"
4069
"will keep any working tree or repository in place."
4070
msgstr ""
4071
4072
#: bzrlib/builtins.py:6391
4073
msgid " Remove the branch at repo/trunk::"
4074
msgstr ""
4075
4076
#: bzrlib/builtins.py:6393
4077
msgid " bzr remove-branch repo/trunk"
4078
msgstr ""
4079
4080
#: bzrlib/builtins.py:6408
4081
msgid "Plaintext diff output."
4082
msgstr ""
4083
4084
#: bzrlib/builtins.py:6409
4085
msgid "Temporarily set aside some changes from the current tree."
4086
msgstr ""
4087
4088
#: bzrlib/builtins.py:6411
4089
msgid ""
4090
"Shelve allows you to temporarily put changes you've made \"on the shelf\",\n"
4091
"ie. out of the way, until a later time when you can bring them back from\n"
4092
"the shelf with the 'unshelve' command. The changes are stored alongside\n"
4093
"your working tree, and so they aren't propagated along with your branch nor\n"
4094
"will they survive its deletion."
4095
msgstr ""
4096
4097
#: bzrlib/builtins.py:6417
4098
msgid "If shelve --list is specified, previously-shelved changes are listed."
4099
msgstr ""
4100
4101
#: bzrlib/builtins.py:6419
4102
msgid ""
4103
"Shelve is intended to help separate several sets of changes that have\n"
4104
"been inappropriately mingled. If you just want to get rid of all changes\n"
4105
"and you don't need to restore them later, use revert. If you want to\n"
4106
"shelve all text changes at once, use shelve --all."
4107
msgstr ""
4108
4109
#: bzrlib/builtins.py:6424
4110
msgid ""
4111
"If filenames are specified, only the changes to those files will be\n"
4112
"shelved. Other files will be left untouched."
4113
msgstr ""
4114
4115
#: bzrlib/builtins.py:6427
4116
msgid ""
4117
"If a revision is specified, changes since that revision will be shelved."
4118
msgstr ""
4119
4120
#: bzrlib/builtins.py:6429
4121
msgid ""
4122
"You can put multiple items on the shelf, and by default, 'unshelve' will\n"
4123
"restore the most recently shelved changes."
4124
msgstr ""
4125
4126
#: bzrlib/builtins.py:6432
4127
msgid ""
4128
"For complicated changes, it is possible to edit the changes in a separate\n"
4129
"editor program to decide what the file remaining in the working copy\n"
4130
"should look like. To do this, add the configuration option"
4131
msgstr ""
4132
4133
#: bzrlib/builtins.py:6436
4134
msgid " change_editor = PROGRAM @new_path @old_path"
4135
msgstr ""
4136
4137
#: bzrlib/builtins.py:6438
4138
msgid ""
4139
"where @new_path is replaced with the path of the new version of the \n"
4140
"file and @old_path is replaced with the path of the old version of \n"
4141
"the file. The PROGRAM should save the new file with the desired \n"
4142
"contents of the file in the working tree.\n"
4143
" "
4144
msgstr ""
4145
4146
#: bzrlib/builtins.py:6450
4147
msgid "Shelve all changes."
4148
msgstr ""
4149
4150
#: bzrlib/builtins.py:6452
4151
msgid "Method to use for writing diffs."
4152
msgstr ""
4153
4154
#: bzrlib/builtins.py:6452
4155
msgid "writer"
4156
msgstr ""
4157
4158
#: bzrlib/builtins.py:6456
4159
msgid "List shelved changes."
4160
msgstr ""
4161
4162
#: bzrlib/builtins.py:6458
4163
msgid "Destroy removed changes instead of shelving them."
4164
msgstr ""
4165
4166
#: bzrlib/builtins.py:6487
4167
msgid "No shelved changes."
4168
msgstr ""
4169
4170
#: bzrlib/builtins.py:6498
4171
msgid "Restore shelved changes."
4172
msgstr ""
4173
4174
#: bzrlib/builtins.py:6500
4175
msgid ""
4176
"By default, the most recently shelved changes are restored. However if you\n"
4177
"specify a shelf by id those changes will be restored instead. This works\n"
4178
"best when the changes don't depend on each other."
4179
msgstr ""
4180
4181
#: bzrlib/builtins.py:6509
4182
msgid "The action to perform."
4183
msgstr ""
4184
4185
#: bzrlib/builtins.py:6509 bzrlib/conflicts.py:694
4186
msgid "action"
4187
msgstr ""
4188
4189
#: bzrlib/builtins.py:6511
4190
msgid "Apply changes and remove from the shelf."
4191
msgstr ""
4192
4193
#: bzrlib/builtins.py:6512
4194
msgid "Show changes, but do not apply or remove them."
4195
msgstr ""
4196
4197
#: bzrlib/builtins.py:6513
4198
msgid ""
4199
"Instead of unshelving the changes, show the diff that would result from "
4200
"unshelving."
4201
msgstr ""
4202
4203
#: bzrlib/builtins.py:6515
4204
msgid "Delete changes without applying them."
4205
msgstr ""
4206
4207
#: bzrlib/builtins.py:6516
4208
msgid "Apply changes but don't delete them."
4209
msgstr ""
4210
4211
#: bzrlib/builtins.py:6531
4212
msgid "Remove unwanted files from working tree."
4213
msgstr ""
4214
4215
#: bzrlib/builtins.py:6533
4216
msgid ""
4217
"By default, only unknown files, not ignored files, are deleted. Versioned\n"
4218
"files are never deleted."
4219
msgstr ""
4220
4221
#: bzrlib/builtins.py:6536
4222
msgid ""
4223
"Another class is 'detritus', which includes files emitted by bzr during\n"
4224
"normal operations and selftests. (The value of these files decreases with\n"
4225
"time.)"
4226
msgstr ""
4227
4228
#: bzrlib/builtins.py:6540
4229
msgid ""
4230
"If no options are specified, unknown files are deleted. Otherwise, option\n"
4231
"flags are respected, and may be combined."
4232
msgstr ""
4233
4234
#: bzrlib/builtins.py:6543
4235
msgid "To check what clean-tree will do, use --dry-run."
4236
msgstr ""
4237
4238
#: bzrlib/builtins.py:6546
4239
msgid "Delete all ignored files."
4240
msgstr ""
4241
4242
#: bzrlib/builtins.py:6547
4243
msgid ""
4244
"Delete conflict files, merge and revert backups, and failed selftest dirs."
4245
msgstr ""
4246
4247
#: bzrlib/builtins.py:6550
4248
msgid "Delete files unknown to bzr (default)."
4249
msgstr ""
4250
4251
#: bzrlib/builtins.py:6551
4252
msgid "Show files to delete instead of deleting them."
4253
msgstr ""
4254
4255
#: bzrlib/builtins.py:6553
4256
msgid "Do not prompt before deleting."
4257
msgstr ""
4258
4259
#: bzrlib/bundle/__init__.py:59
4260
msgid "A directory cannot be a bundle"
4261
msgstr ""
4262
4263
#: bzrlib/bundle/apply_bundle.py:40
4264
msgid "Install revisions"
4265
msgstr ""
4266
4267
#: bzrlib/bundle/commands.py:64
4268
msgid "--verbose requires a merge directive"
4269
msgstr ""
4270
4271
#: bzrlib/bundle/commands.py:67
4272
msgid "Bundle format not supported"
4273
msgstr ""
4274
4275
#: bzrlib/bundle/commands.py:77
4276
msgid "Records\n"
4277
msgstr ""
4278
4279
#: bzrlib/bundle/commands.py:81
4280
msgid "{0}: {1} ({2} multiparent)\n"
4281
msgstr ""
4282
4283
#: bzrlib/bundle/commands.py:83
4284
#, python-format
4285
msgid "unique files: %d\n"
4286
msgstr ""
4287
4288
#: bzrlib/bundle/commands.py:92
4289
msgid "Revisions\n"
4290
msgstr ""
4291
4292
#: bzrlib/bundle/commands.py:93
4293
#, python-format
4294
msgid "nicks: %s\n"
4295
msgstr ""
4296
4297
#: bzrlib/bundle/commands.py:95
4298
#, python-format
4299
msgid ""
4300
"committers: \n"
4301
"%s\n"
4302
msgstr ""
4303
4304
#: bzrlib/bundle/commands.py:103
4305
msgid "Decoded contents\n"
4306
msgstr ""
4307
4308
#: bzrlib/bundle/serializer/v4.py:327
4309
#, python-format
4310
msgid "Bundling %d revision."
4311
msgid_plural "Bundling %d revisions."
4312
msgstr[0] ""
4313
msgstr[1] ""
4314
4315
#: bzrlib/bzrdir.py:489
4316
msgid ""
4317
"making backup of {0}\n"
4318
" to {1}"
4319
msgstr ""
4320
4321
#: bzrlib/bzrdir.py:512
4322
msgid "renamed {0} to {1}"
4323
msgstr ""
4324
4325
#: bzrlib/bzrdir.py:1663
4326
#, python-format
4327
msgid ""
4328
"Source repository format does not support stacking, using format:\n"
4329
" %s"
4330
msgstr ""
4331
4332
#: bzrlib/bzrdir.py:1683
4333
#, python-format
4334
msgid ""
4335
"Source branch format does not support stacking, using format:\n"
4336
" %s"
4337
msgstr ""
4338
4339
#: bzrlib/bzrdir.py:1829
4340
msgid "starting repository conversion"
4341
msgstr ""
4342
4343
#: bzrlib/bzrdir.py:2058
4344
msgid "Using default stacking branch {0} at {1}"
4345
msgstr ""
4346
4347
#: bzrlib/check.py:108
4348
msgid "check"
4349
msgstr ""
4350
4351
#: bzrlib/check.py:110
4352
msgid "checking revisions"
4353
msgstr ""
4354
4355
#: bzrlib/check.py:112
4356
msgid "checking commit contents"
4357
msgstr ""
4358
4359
#: bzrlib/check.py:114
4360
msgid "checking file graphs"
4361
msgstr ""
4362
4363
#: bzrlib/check.py:118
4364
msgid "checking branches and trees"
4365
msgstr ""
4366
4367
#: bzrlib/check.py:205
4368
msgid "checked repository {0} format {1}"
4369
msgstr ""
4370
4371
#: bzrlib/check.py:208
4372
#, python-format
4373
msgid "%6d revisions"
4374
msgstr ""
4375
4376
#: bzrlib/check.py:209
4377
#, python-format
4378
msgid "%6d file-ids"
4379
msgstr ""
4380
4381
#: bzrlib/check.py:211
4382
#, python-format
4383
msgid "%6d unreferenced text versions"
4384
msgstr ""
4385
4386
#: bzrlib/check.py:215
4387
msgid "unreferenced version: {{{0}}} in {1}"
4388
msgstr ""
4389
4390
#: bzrlib/check.py:218
4391
#, python-format
4392
msgid "%6d revisions are missing inventory_sha1"
4393
msgstr ""
4394
4395
#: bzrlib/check.py:221
4396
#, python-format
4397
msgid "%6d revisions are mentioned but not present"
4398
msgstr ""
4399
4400
#: bzrlib/check.py:224
4401
#, python-format
4402
msgid "%6d ghost revisions"
4403
msgstr ""
4404
4405
#: bzrlib/check.py:229
4406
#, python-format
4407
msgid "%6d revisions missing parents in ancestry"
4408
msgstr ""
4409
4410
#: bzrlib/check.py:233
4411
#, python-format
4412
msgid " %s should be in the ancestry for:"
4413
msgstr ""
4414
4415
#: bzrlib/check.py:237
4416
#, python-format
4417
msgid "%6d inconsistent parents"
4418
msgstr ""
4419
4420
#: bzrlib/check.py:241
4421
msgid " * {0} version {1} has parents {2!r} but should have {3!r}"
4422
msgstr ""
4423
4424
#: bzrlib/check.py:247
4425
#, python-format
4426
msgid "%6d revisions have incorrect parents in the revision index"
4427
msgstr ""
4428
4429
#: bzrlib/check.py:253
4430
msgid " {0} has wrong parents in index: {1!r} should be {2!r}"
4431
msgstr ""
4432
4433
#: bzrlib/check.py:267
4434
msgid "Mismatched internal revid {{{0}}} and index revid {{{1}}}"
4435
msgstr ""
4436
4437
#: bzrlib/check.py:296
4438
msgid ""
4439
"Multiple expected sha1s for {0}. {{{1}}} expects {{{2}}}, {{{3}}} expects "
4440
"{{{4}}}"
4441
msgstr ""
4442
4443
#: bzrlib/check.py:354
4444
#, python-format
4445
msgid "Checking branch at '%s'."
4446
msgstr ""
4447
4448
#: bzrlib/check.py:374
4449
#, python-format
4450
msgid "Checking working tree at '%s'."
4451
msgstr ""
4452
4453
#: bzrlib/check.py:427 bzrlib/check.py:441
4454
msgid "No branch found at specified location."
4455
msgstr ""
4456
4457
#: bzrlib/check.py:429 bzrlib/check.py:439
4458
msgid "No working tree found at specified location."
4459
msgstr ""
4460
4461
#: bzrlib/check.py:432
4462
#, python-format
4463
msgid "Checking repository at '%s'."
4464
msgstr ""
4465
4466
#: bzrlib/check.py:443
4467
msgid "No repository found at specified location."
4468
msgstr ""
4469
4470
#: bzrlib/clean_tree.py:63
4471
msgid "Nothing to delete."
4472
msgstr ""
4473
4474
#: bzrlib/clean_tree.py:68
4475
msgid "Are you sure you wish to delete these"
4476
msgstr ""
4477
4478
#: bzrlib/clean_tree.py:70
4479
msgid "Canceled"
4480
msgstr ""
4481
4482
#: bzrlib/clean_tree.py:107
4483
#, python-format
4484
msgid "unable to remove %s"
4485
msgstr ""
4486
4487
#: bzrlib/clean_tree.py:111
4488
msgid "deleting paths:"
4489
msgstr ""
4490
4491
#: bzrlib/clean_tree.py:125
4492
msgid "unable to remove \"{0}\": {1}."
4493
msgstr ""
4494
4495
#: bzrlib/clean_tree.py:130
4496
msgid "No files deleted."
4497
msgstr ""
4498
4499
#: bzrlib/cmd_version_info.py:47
4500
msgid "No known version info format {0}. Supported types are: {1}"
4501
msgstr ""
4502
4503
#: bzrlib/cmd_version_info.py:52
4504
msgid "Version info in Custom template-based format."
4505
msgstr ""
4506
4507
#: bzrlib/cmd_version_info.py:52
4508
msgid "Version info in Python format."
4509
msgstr ""
4510
4511
#: bzrlib/cmd_version_info.py:52
4512
msgid "Version info in RIO (simple text) format (default)."
4513
msgstr ""
4514
4515
#: bzrlib/cmd_version_info.py:53
4516
msgid "Show version information about this tree."
4517
msgstr ""
4518
4519
#: bzrlib/cmd_version_info.py:55
4520
msgid ""
4521
"You can use this command to add information about version into\n"
4522
"source code of an application. The output can be in one of the\n"
4523
"supported formats or in a custom format based on a template."
4524
msgstr ""
4525
4526
#: bzrlib/cmd_version_info.py:59 en/help_topics/configuration.txt:700
4527
#: en/help_topics/configuration.txt:710
4528
msgid "For example::"
4529
msgstr ""
4530
4531
#: bzrlib/cmd_version_info.py:61
4532
msgid ""
4533
" bzr version-info --custom \\\n"
4534
" --template=\"#define VERSION_INFO \\\"Project 1.2.3 (r{revno})\\\"\\n\""
4535
msgstr ""
4536
4537
#: bzrlib/cmd_version_info.py:64
4538
msgid ""
4539
"will produce a C header file with formatted string containing the\n"
4540
"current revision number. Other supported variables in templates are:"
4541
msgstr ""
4542
4543
#: bzrlib/cmd_version_info.py:67
4544
msgid ""
4545
" * {date} - date of the last revision\n"
4546
" * {build_date} - current date\n"
4547
" * {revno} - revision number\n"
4548
" * {revision_id} - revision id\n"
4549
" * {branch_nick} - branch nickname\n"
4550
" * {clean} - 0 if the source tree contains uncommitted changes,\n"
4551
" otherwise 1"
4552
msgstr ""
4553
4554
#: bzrlib/cmd_version_info.py:77
4555
msgid "Select the output format."
4556
msgstr ""
4557
4558
#: bzrlib/cmd_version_info.py:81
4559
msgid "Include all possible information."
4560
msgstr ""
4561
4562
#: bzrlib/cmd_version_info.py:82
4563
msgid "Check if tree is clean."
4564
msgstr ""
4565
4566
#: bzrlib/cmd_version_info.py:84
4567
msgid "Include the revision-history."
4568
msgstr ""
4569
4570
#: bzrlib/cmd_version_info.py:86
4571
msgid "Include the last revision for each file."
4572
msgstr ""
4573
4574
#: bzrlib/cmd_version_info.py:87
4575
msgid "Template for the output."
4576
msgstr ""
4577
4578
#: bzrlib/cmd_version_info.py:101
4579
msgid "bzr version-info --revision takes exactly one revision specifier"
4580
msgstr ""
4581
4582
#: bzrlib/commands.py:228
4583
#, python-format
4584
msgid "unknown command \"%s\""
4585
msgstr ""
4586
4587
#: bzrlib/commands.py:475
4588
msgid "No help for this command."
4589
msgstr ""
4590
4591
#: bzrlib/commands.py:488
4592
#, python-format
4593
msgid ":Purpose: %s\n"
4594
msgstr ""
4595
4596
#: bzrlib/commands.py:490
4597
#, python-format
4598
msgid ""
4599
":Usage:\n"
4600
"%s\n"
4601
msgstr ""
4602
4603
#: bzrlib/commands.py:492
4604
#, python-format
4605
msgid ":Usage: %s\n"
4606
msgstr ""
4607
4608
#: bzrlib/commands.py:511
4609
#, python-format
4610
msgid ":Options:%s"
4611
msgstr ""
4612
4613
#: bzrlib/commands.py:522
4614
#, python-format
4615
msgid ""
4616
":Description:\n"
4617
" %s\n"
4618
"\n"
4619
msgstr ""
4620
4621
#: bzrlib/commands.py:532
4622
#, python-format
4623
msgid ""
4624
"See bzr help %s for more details and examples.\n"
4625
"\n"
4626
msgstr ""
4627
4628
#: bzrlib/commands.py:537
4629
msgid ":Aliases: "
4630
msgstr ""
4631
4632
#: bzrlib/commands.py:541
4633
#, python-format
4634
msgid ":From: plugin \"%s\"\n"
4635
msgstr ""
4636
4637
#: bzrlib/commands.py:553
4638
msgid ":doc:`{0} <{1}-help>`"
4639
msgstr ""
4640
4641
#: bzrlib/commands.py:557
4642
#, python-format
4643
msgid ":See also: %s"
4644
msgstr ""
4645
4646
#: bzrlib/commands.py:815 bzrlib/gpg.py:324
4647
msgid "Only ASCII permitted in option names"
4648
msgstr ""
4649
4650
#: bzrlib/commands.py:840 bzrlib/commands.py:848
4651
msgid "command {0!r} needs one or more {1}"
4652
msgstr ""
4653
4654
#: bzrlib/commands.py:857
4655
msgid "command {0!r} requires argument {1}"
4656
msgstr ""
4657
4658
#: bzrlib/commands.py:864
4659
msgid "extra argument to command {0}: {1}"
4660
msgstr ""
4661
4662
#: bzrlib/commands.py:961
4663
#, python-format
4664
msgid "Profile data written to \"%s\"."
4665
msgstr ""
4666
4667
#: bzrlib/commit.py:117 bzrlib/commit.py:740
4668
msgid "added"
4669
msgstr ""
4670
4671
#: bzrlib/commit.py:117 bzrlib/commit.py:748
4672
msgid "modified"
4673
msgstr ""
4674
4675
#: bzrlib/commit.py:131
4676
#, python-format
4677
msgid "Committing%s"
4678
msgstr ""
4679
4680
#: bzrlib/commit.py:134
4681
#, python-format
4682
msgid "Committed revision %d."
4683
msgstr ""
4684
4685
#: bzrlib/commit.py:143
4686
#, python-format
4687
msgid "deleted %s"
4688
msgstr ""
4689
4690
#: bzrlib/commit.py:146
4691
#, python-format
4692
msgid "missing %s"
4693
msgstr ""
4694
4695
#: bzrlib/commit.py:511
4696
msgid ""
4697
"Conflicting tags in bound branch:\n"
4698
"{0}"
4699
msgstr ""
4700
4701
#: bzrlib/commit.py:742
4702
msgid "renamed"
4703
msgstr ""
4704
4705
#: bzrlib/commit.py:977
4706
msgid "unchanged"
4707
msgstr ""
4708
4709
#: bzrlib/commit.py:999
4710
msgid "{0} [{1}] - Stage"
4711
msgstr ""
4712
4713
#: bzrlib/commit.py:1002
4714
#, python-format
4715
msgid "%s - Stage"
4716
msgstr ""
4717
4718
#: bzrlib/commit_signature_commands.py:36
4719
msgid "Sign all commits by a given committer."
4720
msgstr ""
4721
4722
#: bzrlib/commit_signature_commands.py:38
4723
msgid ""
4724
"If location is not specified the local tree is used.\n"
4725
"If committer is not specified the default committer is used."
4726
msgstr ""
4727
4728
#: bzrlib/commit_signature_commands.py:41
4729
msgid "This does not sign commits that already have signatures."
4730
msgstr ""
4731
4732
#: bzrlib/commit_signature_commands.py:49
4733
msgid ""
4734
"Don't actually sign anything, just print the revisions that would be signed."
4735
msgstr ""
4736
4737
#: bzrlib/commit_signature_commands.py:103
4738
msgid "Verify all commit signatures."
4739
msgstr ""
4740
4741
#: bzrlib/commit_signature_commands.py:105
4742
msgid ""
4743
"Verifies that all commits in the branch are signed by known GnuPG keys."
4744
msgstr ""
4745
4746
#: bzrlib/commit_signature_commands.py:110
4747
msgid ""
4748
"Comma separated list of GPG key patterns which are acceptable for "
4749
"verification."
4750
msgstr ""
4751
4752
#: bzrlib/commit_signature_commands.py:147
4753
msgid "Cannot verify a range of non-revision-history revisions"
4754
msgstr ""
4755
4756
#: bzrlib/commit_signature_commands.py:168
4757
msgid "All commits signed with verifiable keys"
4758
msgstr ""
4759
4760
#: bzrlib/config.py:475
4761
msgid "Invalid config value for \"{0}\" value {1!r} is not an SI unit."
4762
msgstr ""
4763
4764
#: bzrlib/config.py:2499
4765
msgid "{0} is not an SI unit."
4766
msgstr ""
4767
4768
#: bzrlib/config.py:2956
4769
msgid ""
4770
"Option {0} in section {1} of {2} was changed from {3} to {4}. The {5} value "
4771
"will be saved."
4772
msgstr ""
4773
4774
#: bzrlib/config.py:3100
4775
#, python-format
4776
msgid "Invalid '%s', should be of the form 'name=value'"
4777
msgstr ""
4778
4779
#: bzrlib/config.py:3969
4780
msgid "Display, set or remove a configuration option."
4781
msgstr ""
4782
4783
#: bzrlib/config.py:3971
4784
msgid "Display the active value for a given option."
4785
msgstr ""
4786
4787
#: bzrlib/config.py:3973
4788
msgid ""
4789
"If --all is specified, NAME is interpreted as a regular expression and all\n"
4790
"matching options are displayed mentioning their scope. The active value\n"
4791
"that bzr will take into account is the first one displayed for each option."
4792
msgstr ""
4793
4794
#: bzrlib/config.py:3977
4795
msgid "If no NAME is given, --all .* is implied."
4796
msgstr ""
4797
4798
#: bzrlib/config.py:3979
4799
msgid ""
4800
"Setting a value is achieved by using name=value without spaces. The value\n"
4801
"is set in the most relevant scope and can be checked by displaying the\n"
4802
"option again."
4803
msgstr ""
4804
4805
#: bzrlib/config.py:3991
4806
msgid "Reduce the scope to the specified configuration file."
4807
msgstr ""
4808
4809
#: bzrlib/config.py:3995
4810
msgid "Display all the defined values for the matching options."
4811
msgstr ""
4812
4813
#: bzrlib/config.py:3997
4814
msgid "Remove the option from the configuration file."
4815
msgstr ""
4816
4817
#: bzrlib/conflicts.py:50
4818
msgid "List files with conflicts."
4819
msgstr ""
4820
4821
#: bzrlib/conflicts.py:57
4822
msgid ""
4823
"Conflicts normally are listed as short, human-readable messages. If --text\n"
4824
"is supplied, the pathnames of files with text conflicts are listed,\n"
4825
"instead. (This is useful for editing all files with text conflicts.)"
4826
msgstr ""
4827
4828
#: bzrlib/conflicts.py:61
4829
msgid "Use bzr resolve when you have fixed a problem."
4830
msgstr ""
4831
4832
#: bzrlib/conflicts.py:66
4833
msgid "List paths of files with text conflicts."
4834
msgstr ""
4835
4836
#: bzrlib/conflicts.py:85
4837
msgid "Marks the conflict as resolved."
4838
msgstr ""
4839
4840
#: bzrlib/conflicts.py:88
4841
msgid "Resolve the conflict preserving the version in the working tree."
4842
msgstr ""
4843
4844
#: bzrlib/conflicts.py:91
4845
msgid "Resolve the conflict taking the merged version into account."
4846
msgstr ""
4847
4848
#: bzrlib/conflicts.py:98
4849
msgid "How to resolve the conflict."
4850
msgstr ""
4851
4852
#: bzrlib/conflicts.py:104
4853
msgid "Mark a conflict as resolved."
4854
msgstr ""
4855
4856
#: bzrlib/conflicts.py:111
4857
msgid ""
4858
"Once you have fixed a problem, use \"bzr resolve\" to automatically mark\n"
4859
"text conflicts as fixed, \"bzr resolve FILE\" to mark a specific conflict "
4860
"as\n"
4861
"resolved, or \"bzr resolve --all\" to mark all conflicts as resolved."
4862
msgstr ""
4863
4864
#: bzrlib/conflicts.py:119
4865
msgid "Resolve all conflicts in this tree."
4866
msgstr ""
4867
4868
#: bzrlib/conflicts.py:126
4869
msgid "If --all is specified, no FILE may be provided"
4870
msgstr ""
4871
4872
#: bzrlib/conflicts.py:151
4873
#, python-format
4874
msgid "%d conflict auto-resolved."
4875
msgid_plural "%d conflicts auto-resolved."
4876
msgstr[0] ""
4877
msgstr[1] ""
4878
4879
#: bzrlib/conflicts.py:154
4880
msgid "Remaining conflicts:"
4881
msgstr ""
4882
4883
#: bzrlib/conflicts.py:159
4884
msgid "All conflicts resolved."
4885
msgstr ""
4886
4887
#: bzrlib/conflicts.py:168
4888
msgid "{0} conflict resolved, {1} remaining"
4889
msgid_plural "{0} conflicts resolved, {1} remaining"
4890
msgstr[0] ""
4891
msgstr[1] ""
4892
4893
#: bzrlib/controldir.py:698
4894
msgid "{0} is{1} redirected to {2}"
4895
msgstr ""
4896
4897
#: bzrlib/diff.py:399
4898
#, python-format
4899
msgid "*** Ignoring files outside view. View is %s"
4900
msgstr ""
4901
4902
#: bzrlib/errors.py:157
4903
msgid "The tree builder is already building a tree."
4904
msgstr ""
4905
4906
#: bzrlib/errors.py:178
4907
msgid "The dirstate file (%(state)s) appears to be corrupt: %(msg)s"
4908
msgstr ""
4909
4910
#: bzrlib/errors.py:197
4911
msgid ""
4912
"The API for \"%(api)s\" is not compatible with \"%(wanted)s\". It supports "
4913
"versions \"%(minimum)s\" to \"%(current)s\"."
4914
msgstr ""
4915
4916
#: bzrlib/errors.py:209
4917
msgid "The transport '%(transport)s' is only accessible within this process."
4918
msgstr ""
4919
4920
#: bzrlib/errors.py:227
4921
msgid "Invalid revision number %(revno)s"
4922
msgstr ""
4923
4924
#: bzrlib/errors.py:236
4925
msgid "Invalid revision-id {%(revision_id)s} in %(branch)s"
4926
msgstr ""
4927
4928
#: bzrlib/errors.py:247
4929
msgid "Reserved revision-id {%(revision_id)s}"
4930
msgstr ""
4931
4932
#: bzrlib/errors.py:261
4933
msgid "There is no public branch set for \"%(branch_url)s\"."
4934
msgstr ""
4935
4936
#: bzrlib/errors.py:271
4937
msgid ""
4938
"No help could be found for '%(topic)s'. Please use 'bzr help topics' to "
4939
"obtain a list of topics."
4940
msgstr ""
4941
4942
#: bzrlib/errors.py:280
4943
msgid "The file id \"%(file_id)s\" is not present in the tree %(tree)s."
4944
msgstr ""
4945
4946
#: bzrlib/errors.py:290
4947
msgid ""
4948
"The file id \"%(file_id)s\" is not present in the repository %(repository)r"
4949
msgstr ""
4950
4951
#: bzrlib/errors.py:299
4952
msgid "The branch '%(branch)s' is not stacked."
4953
msgstr ""
4954
4955
#: bzrlib/errors.py:313
4956
msgid "No WorkingTree exists for \"%(base)s\"."
4957
msgstr ""
4958
4959
#: bzrlib/errors.py:322
4960
msgid "Not currently building a tree."
4961
msgstr ""
4962
4963
#: bzrlib/errors.py:327
4964
msgid "%(url)s is not a local path."
4965
msgstr ""
4966
4967
#: bzrlib/errors.py:355
4968
msgid "%(not_locked)r is not write locked but needs to be."
4969
msgstr ""
4970
4971
#: bzrlib/errors.py:363
4972
msgid "Error in command line options"
4973
msgstr ""
4974
4975
#: bzrlib/errors.py:368
4976
msgid "%(value)s is not an index of type %(_type)s."
4977
msgstr ""
4978
4979
#: bzrlib/errors.py:378
4980
msgid "Error in data for index %(value)s."
4981
msgstr ""
4982
4983
#: bzrlib/errors.py:387
4984
msgid "The key '%(key)s' is already in index '%(index)s'."
4985
msgstr ""
4986
4987
#: bzrlib/errors.py:397
4988
msgid "The key '%(key)s' is not a valid key."
4989
msgstr ""
4990
4991
#: bzrlib/errors.py:406
4992
msgid "Could not parse options for index %(value)s."
4993
msgstr ""
4994
4995
#: bzrlib/errors.py:415
4996
msgid "The value '%(value)s' is not a valid value."
4997
msgstr ""
4998
4999
#: bzrlib/errors.py:443
5000
msgid "Generic path error: %(path)r%(extra)s)"
5001
msgstr ""
5002
5003
#: bzrlib/errors.py:456
5004
msgid "No such file: %(path)r%(extra)s"
5005
msgstr ""
5006
5007
#: bzrlib/errors.py:461
5008
msgid "File exists: %(path)r%(extra)s"
5009
msgstr ""
5010
5011
#: bzrlib/errors.py:467
5012
msgid ""
5013
"Could not rename %(source)s => %(dest)s because both files exist. (Use --"
5014
"after to tell bzr about a rename that has already happened)%(extra)s"
5015
msgstr ""
5016
5017
#: bzrlib/errors.py:483
5018
msgid "\"%(path)s\" is not a directory %(extra)s"
5019
msgstr ""
5020
5021
#: bzrlib/errors.py:488
5022
msgid "\"%(path)s\" is not in the working directory %(extra)s"
5023
msgstr ""
5024
5025
#: bzrlib/errors.py:493
5026
msgid "Directory not empty: \"%(path)s\"%(extra)s"
5027
msgstr ""
5028
5029
#: bzrlib/errors.py:498
5030
msgid "Hard-linking \"%(path)s\" is not supported"
5031
msgstr ""
5032
5033
#: bzrlib/errors.py:513
5034
msgid "Device or resource busy: \"%(path)s\"%(extra)s"
5035
msgstr ""
5036
5037
#: bzrlib/errors.py:518
5038
msgid "Permission denied: \"%(path)s\"%(extra)s"
5039
msgstr ""
5040
5041
#: bzrlib/errors.py:523
5042
msgid "Invalid url supplied to transport: \"%(path)s\"%(extra)s"
5043
msgstr ""
5044
5045
#: bzrlib/errors.py:528
5046
msgid "Invalid URL join request: %(reason)s: %(base)r + %(join_args)r"
5047
msgstr ""
5048
5049
#: bzrlib/errors.py:539
5050
msgid "URLs differ by more than path: %(from_)r and %(to)r"
5051
msgstr ""
5052
5053
#: bzrlib/errors.py:561
5054
msgid "The %(type)s hook '%(hook)s' is unknown in this version of bzrlib."
5055
msgstr ""
5056
5057
#: bzrlib/errors.py:571
5058
msgid "Unsupported protocol for url \"%(path)s\"%(extra)s"
5059
msgstr ""
5060
5061
#: bzrlib/errors.py:579
5062
msgid ""
5063
"The branch '%(url)s'(%(format)s) is not a stackable format. You will need to "
5064
"upgrade the branch to permit branch stacking."
5065
msgstr ""
5066
5067
#: bzrlib/errors.py:590
5068
msgid "The branch '%(branch_url)s' cannot be stacked on '%(target_url)s'."
5069
msgstr ""
5070
5071
#: bzrlib/errors.py:600
5072
msgid ""
5073
"The repository '%(url)s'(%(format)s) is not a stackable format. You will "
5074
"need to upgrade the repository to permit branch stacking."
5075
msgstr ""
5076
5077
#: bzrlib/errors.py:611
5078
msgid "Error reading from %(path)r."
5079
msgstr ""
5080
5081
#: bzrlib/errors.py:630
5082
msgid "Path \"%(path)s\" is not a child of path \"%(base)s\"%(extra)s"
5083
msgstr ""
5084
5085
#: bzrlib/errors.py:646
5086
msgid "Path \"%(path)s\" is not unicode normalized"
5087
msgstr ""
5088
5089
#: bzrlib/errors.py:654
5090
msgid "Not a branch: \"%(path)s\"%(detail)s."
5091
msgstr ""
5092
5093
#: bzrlib/errors.py:696
5094
msgid "No submit branch available for branch \"%(path)s\""
5095
msgstr ""
5096
5097
#: bzrlib/errors.py:705
5098
msgid "Already a branch: \"%(path)s\"."
5099
msgstr ""
5100
5101
#: bzrlib/errors.py:711
5102
msgid ""
5103
"Directory contains a branch, but no working tree (use bzr checkout if you "
5104
"wish to build a working tree): \"%(path)s\""
5105
msgstr ""
5106
5107
#: bzrlib/errors.py:716
5108
msgid ""
5109
"\"%(function)s\" called on an AtomicFile after it was closed: \"%(path)s\""
5110
msgstr ""
5111
5112
#: bzrlib/errors.py:726
5113
msgid ""
5114
"Parent not accessible given base \"%(base)s\" and relative path \"%(path)s\""
5115
msgstr ""
5116
5117
#: bzrlib/errors.py:736
5118
msgid "No repository present: \"%(path)s\""
5119
msgstr ""
5120
5121
#: bzrlib/errors.py:743
5122
msgid ""
5123
"Unsupported branch format: %(format)s\n"
5124
"Please run 'bzr upgrade'"
5125
msgstr ""
5126
5127
#: bzrlib/errors.py:749
5128
msgid "Unknown %(kind)s format: %(format)r"
5129
msgstr ""
5130
5131
#: bzrlib/errors.py:758
5132
msgid "Format %(format)s is not compatible with .bzr version %(bzrdir)s."
5133
msgstr ""
5134
5135
#: bzrlib/errors.py:768
5136
msgid "Parse error on line %(lineno)d of %(format)s format: %(line)s"
5137
msgstr ""
5138
5139
#: bzrlib/errors.py:783
5140
msgid ""
5141
"%(target)s\n"
5142
"is not compatible with\n"
5143
"%(source)s\n"
5144
"%(details)s"
5145
msgstr ""
5146
5147
#: bzrlib/errors.py:799
5148
msgid "Revision is not compatible with %(repo_format)s"
5149
msgstr ""
5150
5151
#: bzrlib/errors.py:809
5152
msgid "%(context_info)s%(path)s is already versioned."
5153
msgstr ""
5154
5155
#: bzrlib/errors.py:830
5156
msgid "%(context_info)s%(path)s is not versioned."
5157
msgstr ""
5158
5159
#: bzrlib/errors.py:851
5160
msgid "Path(s) are not versioned: %(paths_as_string)s"
5161
msgstr ""
5162
5163
#: bzrlib/errors.py:862
5164
msgid "Path(s) do not exist: %(paths_as_string)s%(extra)s"
5165
msgstr ""
5166
5167
#: bzrlib/errors.py:881
5168
msgid "Cannot operate on \"%(filename)s\" of unsupported kind \"%(kind)s\""
5169
msgstr ""
5170
5171
#: bzrlib/errors.py:889
5172
msgid ""
5173
"Filename %(filename)r is not valid in your current filesystem encoding "
5174
"%(fs_encoding)s"
5175
msgstr ""
5176
5177
#: bzrlib/errors.py:900
5178
msgid "Cannot operate on \"%(filename)s\" because it is a control file"
5179
msgstr ""
5180
5181
#: bzrlib/errors.py:918
5182
msgid "The lock for '%(lock_description)s' is in use and cannot be broken."
5183
msgstr ""
5184
5185
#: bzrlib/errors.py:957
5186
msgid "Cannot lock %(lock)s: %(why)s"
5187
msgstr ""
5188
5189
#: bzrlib/errors.py:967
5190
msgid ""
5191
"A transaction related operation was attempted after the transaction finished."
5192
msgstr ""
5193
5194
#: bzrlib/errors.py:994
5195
msgid "Cannot lock: transport is read only: %(transport)s"
5196
msgstr ""
5197
5198
#: bzrlib/errors.py:1002
5199
msgid "Could not acquire lock \"%(lock)s\": %(msg)s"
5200
msgstr ""
5201
5202
#: bzrlib/errors.py:1013
5203
msgid ""
5204
"Lock was broken while still open: %(lock)s - check storage consistency!"
5205
msgstr ""
5206
5207
#: bzrlib/errors.py:1024
5208
msgid ""
5209
"Lock was released and re-acquired before being broken: %(lock)s: held by "
5210
"%(holder)r, wanted to break %(target)r"
5211
msgstr ""
5212
5213
#: bzrlib/errors.py:1036
5214
msgid ""
5215
"Lock is apparently held, but corrupted: %(corruption_info)s\n"
5216
"Use 'bzr break-lock' to clear it"
5217
msgstr ""
5218
5219
#: bzrlib/errors.py:1049
5220
msgid "Lock not held: %(lock)s"
5221
msgstr ""
5222
5223
#: bzrlib/errors.py:1078
5224
msgid "No changes to commit"
5225
msgstr ""
5226
5227
#: bzrlib/errors.py:1083
5228
msgid ""
5229
"Selected-file commit of merges is not supported yet: files %(files_str)s"
5230
msgstr ""
5231
5232
#: bzrlib/errors.py:1093
5233
msgid ""
5234
"Excluding paths during commit is not supported by repository at "
5235
"%(repository)r."
5236
msgstr ""
5237
5238
#: bzrlib/errors.py:1102
5239
msgid ""
5240
"The specified commit message contains characters unsupported by the current "
5241
"encoding."
5242
msgstr ""
5243
5244
#: bzrlib/errors.py:1108
5245
msgid "Upgrade URL cannot work with readonly URLs."
5246
msgstr ""
5247
5248
#: bzrlib/errors.py:1113
5249
msgid "The branch format %(format)s is already at the most recent format."
5250
msgstr ""
5251
5252
#: bzrlib/errors.py:1136
5253
msgid "Option --change does not accept revision ranges"
5254
msgstr ""
5255
5256
#: bzrlib/errors.py:1141
5257
msgid "No namespace registered for string: %(spec)r"
5258
msgstr ""
5259
5260
#: bzrlib/errors.py:1160
5261
msgid ""
5262
"Requested revision: '%(spec)s' does not exist in branch: "
5263
"%(branch_url)s%(extra)s"
5264
msgstr ""
5265
5266
#: bzrlib/errors.py:1174
5267
msgid ""
5268
"Operation denied because it would change the main history, which is not "
5269
"permitted by the append_revisions_only setting on branch \"%(location)s\"."
5270
msgstr ""
5271
5272
#: bzrlib/errors.py:1185
5273
msgid ""
5274
"These branches have diverged. Use the missing command to see how.\n"
5275
"Use the merge command to reconcile them."
5276
msgstr ""
5277
5278
#: bzrlib/errors.py:1205
5279
msgid ""
5280
"Branches have no common ancestor, and no merge base revision was specified."
5281
msgstr ""
5282
5283
#: bzrlib/errors.py:1211
5284
msgid ""
5285
"Selected merge cannot perform reverse cherrypicks. Try merge3 or diff3."
5286
msgstr ""
5287
5288
#: bzrlib/errors.py:1217
5289
msgid "Revisions have no common ancestor: %(revision_a)s %(revision_b)s"
5290
msgstr ""
5291
5292
#: bzrlib/errors.py:1226
5293
msgid ""
5294
"Revisions are not derived from the same root: %(revision_a)s %(revision_b)s."
5295
msgstr ""
5296
5297
#: bzrlib/errors.py:1235
5298
msgid "Revision %(rev_id)s is not an ancestor of %(not_ancestor_id)s"
5299
msgstr ""
5300
5301
#: bzrlib/errors.py:1244
5302
msgid "Branch %(branch)s has no commits."
5303
msgstr ""
5304
5305
#: bzrlib/errors.py:1262
5306
msgid ""
5307
"Bound branch %(branch)s is out of date with master branch "
5308
"%(master)s.%(extra_help)s"
5309
msgstr ""
5310
5311
#: bzrlib/errors.py:1274
5312
msgid ""
5313
"Cannot commit to branch %(branch)s. It is bound to %(master)s, which is "
5314
"bound to %(remote)s."
5315
msgstr ""
5316
5317
#: bzrlib/errors.py:1286
5318
msgid "Cannot pull --overwrite to a branch which is bound %(branch)s"
5319
msgstr ""
5320
5321
#: bzrlib/errors.py:1295
5322
msgid ""
5323
"Unable to connect to target of bound branch %(branch)s => %(target)s: "
5324
"%(error)s"
5325
msgstr ""
5326
5327
#: bzrlib/errors.py:1307
5328
msgid "Error in processing weave: %(msg)s"
5329
msgstr ""
5330
5331
#: bzrlib/errors.py:1316
5332
msgid "Revision {%(revision_id)s} already present in %(weave)s"
5333
msgstr ""
5334
5335
#: bzrlib/errors.py:1327
5336
msgid "Revision {%(revision_id)s} not present in %(weave)s"
5337
msgstr ""
5338
5339
#: bzrlib/errors.py:1337
5340
msgid "Weave invariant violated: %(what)s"
5341
msgstr ""
5342
5343
#: bzrlib/errors.py:1346
5344
msgid "Parents are mismatched between two revisions. %(msg)s"
5345
msgstr ""
5346
5347
#: bzrlib/errors.py:1368
5348
msgid ""
5349
"Weaves differ on text content. Revision: {%(revision_id)s}, %(weave_a)s, "
5350
"%(weave_b)s"
5351
msgstr ""
5352
5353
#: bzrlib/errors.py:1380
5354
msgid "Versioned file error"
5355
msgstr ""
5356
5357
#: bzrlib/errors.py:1385
5358
msgid "Revision {%(revision_id)s} not present in \"%(file_id)s\"."
5359
msgstr ""
5360
5361
#: bzrlib/errors.py:1395
5362
msgid "Revision {%(revision_id)s} already present in \"%(file_id)s\"."
5363
msgstr ""
5364
5365
#: bzrlib/errors.py:1405
5366
msgid "Text did not match its checksum: %(msg)s"
5367
msgstr ""
5368
5369
#: bzrlib/errors.py:1531
5370
msgid "Export format %(format)r not supported"
5371
msgstr ""
5372
5373
#: bzrlib/errors.py:1540
5374
msgid "Transport error: %(msg)s %(orig_error)s"
5375
msgstr ""
5376
5377
#: bzrlib/errors.py:1566
5378
msgid "Generic bzr smart protocol error: %(details)s"
5379
msgstr ""
5380
5381
#: bzrlib/errors.py:1574
5382
msgid "Received bad protocol version marker: %(marker)r"
5383
msgstr ""
5384
5385
#: bzrlib/errors.py:1606
5386
msgid "Transport operation not possible: %(msg)s %(orig_error)s"
5387
msgstr ""
5388
5389
#: bzrlib/errors.py:1611
5390
msgid "Connection error: %(msg)s %(orig_error)s"
5391
msgstr ""
5392
5393
#: bzrlib/errors.py:1616
5394
msgid "%(msg)s %(host)s%(port)s%(orig_error)s"
5395
msgstr ""
5396
5397
#: bzrlib/errors.py:1637
5398
msgid "Connection closed: %(msg)s %(orig_error)s"
5399
msgstr ""
5400
5401
#: bzrlib/errors.py:1642
5402
msgid "Connection Timeout: %(msg)s%(orig_error)s"
5403
msgstr ""
5404
5405
#: bzrlib/errors.py:1647
5406
msgid "Invalid range access in %(path)s at %(offset)s: %(msg)s"
5407
msgstr ""
5408
5409
#: bzrlib/errors.py:1657
5410
msgid "Invalid http response for %(path)s: %(msg)s%(orig_error)s"
5411
msgstr ""
5412
5413
#: bzrlib/errors.py:1672
5414
msgid "Invalid http range %(range)r for %(path)s: %(msg)s"
5415
msgstr ""
5416
5417
#: bzrlib/errors.py:1686
5418
msgid "HTTP MIME Boundary missing for %(path)s: %(msg)s"
5419
msgstr ""
5420
5421
#: bzrlib/errors.py:1694
5422
msgid "Invalid http Content-type \"%(ctype)s\" for %(path)s: %(msg)s"
5423
msgstr ""
5424
5425
#: bzrlib/errors.py:1703
5426
msgid "%(source)s is%(permanently)s redirected to %(target)s"
5427
msgstr ""
5428
5429
#: bzrlib/errors.py:1717
5430
msgid "Too many redirections"
5431
msgstr ""
5432
5433
#: bzrlib/errors.py:1722
5434
msgid "Working tree has conflicts."
5435
msgstr ""
5436
5437
#: bzrlib/errors.py:1726
5438
msgid "Config file %(filename)s is not UTF-8 encoded\n"
5439
msgstr ""
5440
5441
#: bzrlib/errors.py:1735
5442
msgid ""
5443
"Error(s) parsing config file %(filename)s:\n"
5444
"%(errors)s"
5445
msgstr ""
5446
5447
#: bzrlib/errors.py:1746
5448
msgid "Bad value \"%(value)s\" for option \"%(name)s\"."
5449
msgstr ""
5450
5451
#: bzrlib/errors.py:1754
5452
msgid "%(username)r does not seem to contain a reasonable email address"
5453
msgstr ""
5454
5455
#: bzrlib/errors.py:1763
5456
msgid "Failed to GPG sign data with command \"%(command_line)s\""
5457
msgstr ""
5458
5459
#: bzrlib/errors.py:1771
5460
msgid "Failed to verify GPG signature data with error \"%(error)s\""
5461
msgstr ""
5462
5463
#: bzrlib/errors.py:1779
5464
msgid "Unable to import library \"%(library)s\": %(error)s"
5465
msgstr ""
5466
5467
#: bzrlib/errors.py:1787
5468
msgid "python-gpgme is not installed, it is needed to verify signatures"
5469
msgstr ""
5470
5471
#: bzrlib/errors.py:1795
5472
msgid ""
5473
"The working tree for %(basedir)s has changed since the last commit, but "
5474
"weave merge requires that it be unchanged"
5475
msgstr ""
5476
5477
#: bzrlib/errors.py:1805
5478
msgid ""
5479
"Can't reprocess and show base, because reprocessing obscures the "
5480
"relationship of conflicting lines to the base"
5481
msgstr ""
5482
5483
#: bzrlib/errors.py:1811
5484
msgid "Cycle in graph %(graph)r"
5485
msgstr ""
5486
5487
#: bzrlib/errors.py:1839
5488
msgid "File %(filename)s is not conflicted."
5489
msgstr ""
5490
5491
#: bzrlib/errors.py:1861
5492
msgid "No bundle was found in \"%(filename)s\"."
5493
msgstr ""
5494
5495
#: bzrlib/errors.py:1870
5496
msgid "Unable to handle bundle version %(version)s: %(msg)s"
5497
msgstr ""
5498
5499
#: bzrlib/errors.py:1880
5500
msgid "Branch %(base)s is missing revision %(text_revision)s of %(file_id)s"
5501
msgstr ""
5502
5503
#: bzrlib/errors.py:1893
5504
msgid "File id {%(file_id)s} already exists in inventory as %(entry)s"
5505
msgstr ""
5506
5507
#: bzrlib/errors.py:1903
5508
msgid "Key %(key)s is already present in map"
5509
msgstr ""
5510
5511
#: bzrlib/errors.py:1908
5512
msgid "The prefix %(prefix)s is in the help search path twice."
5513
msgstr ""
5514
5515
#: bzrlib/errors.py:1918
5516
msgid ""
5517
"No final name for trans_id %(trans_id)r\n"
5518
"file-id: %(file_id)r\n"
5519
"root trans-id: %(root_trans_id)r\n"
5520
msgstr ""
5521
5522
#: bzrlib/errors.py:1950
5523
msgid "Attempt to reuse a transform that has already been applied."
5524
msgstr ""
5525
5526
#: bzrlib/errors.py:1955
5527
msgid "Moving the root directory is not supported at this time"
5528
msgstr ""
5529
5530
#: bzrlib/errors.py:1960
5531
msgid "Failed to rename %(from_path)s to %(to_path)s: %(why)s"
5532
msgstr ""
5533
5534
#: bzrlib/errors.py:1971
5535
msgid ""
5536
"Could not move %(from_path)s%(operator)s %(to_path)s%(_has_extra)s%(extra)s"
5537
msgstr ""
5538
5539
#: bzrlib/errors.py:2007
5540
msgid ""
5541
"Could not rename %(from_path)s%(operator)s %(to_path)s%(_has_extra)s%(extra)s"
5542
msgstr ""
5543
5544
#: bzrlib/errors.py:2037
5545
msgid "Unable to import paramiko (required for sftp support): %(error)s"
5546
msgstr ""
5547
5548
#: bzrlib/errors.py:2045
5549
msgid "Nothing to merge."
5550
msgstr ""
5551
5552
#: bzrlib/errors.py:2050
5553
msgid "Format %(format)s cannot be initialised by this version of bzr."
5554
msgstr ""
5555
5556
#: bzrlib/errors.py:2059
5557
msgid ""
5558
"Cannot convert from format %(from_format)s to format %(format)s. "
5559
"%(problem)s"
5560
msgstr ""
5561
5562
#: bzrlib/errors.py:2071
5563
msgid "Could not find an appropriate Differ for file \"%(path)s\""
5564
msgstr ""
5565
5566
#: bzrlib/errors.py:2079
5567
msgid "%(exe_name)s could not be found on this machine"
5568
msgstr ""
5569
5570
#: bzrlib/errors.py:2087
5571
msgid "Diff is not installed on this machine: %(msg)s"
5572
msgstr ""
5573
5574
#: bzrlib/errors.py:2095
5575
msgid "Diff3 is not installed on this machine."
5576
msgstr ""
5577
5578
#: bzrlib/errors.py:2101
5579
msgid "The content being inserted is already present."
5580
msgstr ""
5581
5582
#: bzrlib/errors.py:2106
5583
msgid ""
5584
"This tree contains left-over files from a failed operation.\n"
5585
" Please examine %(limbo_dir)s to see if it contains any files you wish "
5586
"to\n"
5587
" keep, and delete it when you are done."
5588
msgstr ""
5589
5590
#: bzrlib/errors.py:2117
5591
msgid ""
5592
"This tree contains left-over files from a failed operation.\n"
5593
" Please examine %(pending_deletion)s to see if it contains any files you\n"
5594
" wish to keep, and delete it when you are done."
5595
msgstr ""
5596
5597
#: bzrlib/errors.py:2127
5598
msgid ""
5599
"Unable to delete transform temporary directory %(limbo_dir)s.\n"
5600
" Please examine %(limbo_dir)s to see if it contains any files you wish "
5601
"to\n"
5602
" keep, and delete it when you are done."
5603
msgstr ""
5604
5605
#: bzrlib/errors.py:2138
5606
msgid ""
5607
"Unable to delete transform temporary directory %(pending_deletion)s. Please "
5608
"examine %(pending_deletion)s to see if it contains any files you wish to "
5609
"keep, and delete it when you are done."
5610
msgstr ""
5611
5612
#: bzrlib/errors.py:2148
5613
msgid "Working tree is out of date, please run 'bzr update'.%(more)s"
5614
msgstr ""
5615
5616
#: bzrlib/errors.py:2162
5617
msgid ""
5618
"Public branch \"%(public_location)s\" lacks revision \"%(revstring)s\"."
5619
msgstr ""
5620
5621
#: bzrlib/errors.py:2175
5622
msgid "Error in merge modified format"
5623
msgstr ""
5624
5625
#: bzrlib/errors.py:2180
5626
msgid "Format error in conflict listings"
5627
msgstr ""
5628
5629
#: bzrlib/errors.py:2184
5630
msgid ""
5631
"Inconsistency in dirstate file %(dirstate_path)s.\n"
5632
"Error: %(description)s"
5633
msgstr ""
5634
5635
#: bzrlib/errors.py:2195
5636
msgid ""
5637
"An error has been detected in the repository %(repo_path)s.\n"
5638
"Please run bzr reconcile on this repository."
5639
msgstr ""
5640
5641
#: bzrlib/errors.py:2206
5642
msgid ""
5643
"An inconsistent delta was supplied involving %(path)r, %(file_id)r\n"
5644
"reason: %(reason)s"
5645
msgstr ""
5646
5647
#: bzrlib/errors.py:2219
5648
msgid ""
5649
"An inconsistent delta was supplied: %(delta)r\n"
5650
"reason: %(reason)s"
5651
msgstr ""
5652
5653
#: bzrlib/errors.py:2231
5654
msgid "To use this feature you must upgrade your branch at %(path)s."
5655
msgstr ""
5656
5657
#: bzrlib/errors.py:2240
5658
msgid "To use this feature you must upgrade your repository at %(path)s."
5659
msgstr ""
5660
5661
#: bzrlib/errors.py:2245
5662
msgid ""
5663
"To use this feature you must upgrade your branch at %(path)s to a format "
5664
"which supports rich roots."
5665
msgstr ""
5666
5667
#: bzrlib/errors.py:2251
5668
msgid "Cannot perform local-only commits on unbound branches."
5669
msgstr ""
5670
5671
#: bzrlib/errors.py:2256
5672
msgid "The method %(mname)s is not supported on objects of type %(tname)s."
5673
msgstr ""
5674
5675
#: bzrlib/errors.py:2277
5676
msgid "Ghost tags not supported by format %(format)r."
5677
msgstr ""
5678
5679
#: bzrlib/errors.py:2285
5680
msgid "File is binary but should be text."
5681
msgstr ""
5682
5683
#: bzrlib/errors.py:2290
5684
msgid "The path %(path)s is not permitted on this platform"
5685
msgstr ""
5686
5687
#: bzrlib/errors.py:2299
5688
msgid ""
5689
"Testament did not match expected value.\n"
5690
" For revision_id {%(revision_id)s}, expected {%(expected)s}, measured\n"
5691
" {%(measured)s}"
5692
msgstr ""
5693
5694
#: bzrlib/errors.py:2311
5695
msgid "Not a bzr revision-bundle: %(text)r"
5696
msgstr ""
5697
5698
#: bzrlib/errors.py:2320
5699
msgid "Bad bzr revision-bundle: %(text)r"
5700
msgstr ""
5701
5702
#: bzrlib/errors.py:2329
5703
msgid "Malformed bzr revision-bundle header: %(text)r"
5704
msgstr ""
5705
5706
#: bzrlib/errors.py:2334
5707
msgid "Malformed patches in bzr revision-bundle: %(text)r"
5708
msgstr ""
5709
5710
#: bzrlib/errors.py:2339
5711
msgid "Malformed footer in bzr revision-bundle: %(text)r"
5712
msgstr ""
5713
5714
#: bzrlib/errors.py:2344
5715
msgid "End of line marker was not \\n in bzr revision-bundle"
5716
msgstr ""
5717
5718
#: bzrlib/errors.py:2354
5719
msgid "Bundle format %(bundle_format)s is incompatible with %(other)s"
5720
msgstr ""
5721
5722
#: bzrlib/errors.py:2364
5723
msgid "Root class for inventory serialization errors"
5724
msgstr ""
5725
5726
#: bzrlib/errors.py:2368
5727
msgid ""
5728
"The inventory was not in the expected format:\n"
5729
" %(msg)s"
5730
msgstr ""
5731
5732
#: bzrlib/errors.py:2377
5733
msgid "This operation requires rich root data storage"
5734
msgstr ""
5735
5736
#: bzrlib/errors.py:2390
5737
msgid "Unrecognised value for BZR_SSH environment variable: %(vendor)s"
5738
msgstr ""
5739
5740
#: bzrlib/errors.py:2399
5741
msgid ""
5742
"Don't know how to handle SSH connections. Please set BZR_SSH environment "
5743
"variable."
5744
msgstr ""
5745
5746
#: bzrlib/errors.py:2406
5747
msgid ""
5748
"Could not determine revno for {%(revision_id)s} because its ancestry shows a "
5749
"ghost at {%(ghost_revision_id)s}"
5750
msgstr ""
5751
5752
#: bzrlib/errors.py:2416
5753
msgid "Ghost revision {%(revision_id)s} cannot be used here."
5754
msgstr ""
5755
5756
#: bzrlib/errors.py:2467
5757
msgid ""
5758
"A merge directive must provide either a bundle or a public branch location."
5759
msgstr ""
5760
5761
#: bzrlib/errors.py:2474
5762
msgid "Bad merge directive payload %(start)r"
5763
msgstr ""
5764
5765
#: bzrlib/errors.py:2484
5766
msgid "Preview patch does not match requested changes."
5767
msgstr ""
5768
5769
#: bzrlib/errors.py:2490
5770
msgid "Patch_type was %(patch_type)s, but no patch was supplied."
5771
msgstr ""
5772
5773
#: bzrlib/errors.py:2500
5774
msgid ""
5775
"Your branch does not have all of the revisions required in order to merge "
5776
"this merge directive and the target location specified in the merge "
5777
"directive is not a branch: %(location)s."
5778
msgstr ""
5779
5780
#: bzrlib/errors.py:2512
5781
msgid "Unsupported entry kind %(kind)s"
5782
msgstr ""
5783
5784
#: bzrlib/errors.py:2520
5785
msgid "Can't subsume %(other_tree)s into %(tree)s. %(reason)s"
5786
msgstr ""
5787
5788
#: bzrlib/errors.py:2530
5789
msgid "Subsume target %(other_tree)s needs to be upgraded."
5790
msgstr ""
5791
5792
#: bzrlib/errors.py:2549
5793
msgid "No such tag: %(tag_name)s"
5794
msgstr ""
5795
5796
#: bzrlib/errors.py:2557
5797
msgid "Tags not supported by %(branch)s; you may be able to use bzr upgrade."
5798
msgstr ""
5799
5800
#: bzrlib/errors.py:2566
5801
msgid "Tag %(tag_name)s already exists."
5802
msgstr ""
5803
5804
#: bzrlib/errors.py:2574
5805
msgid ""
5806
"Did not understand bug identifier %(bug_id)s: %(reason)s. See \"bzr help "
5807
"bugs\" for more information on this feature."
5808
msgstr ""
5809
5810
#: bzrlib/errors.py:2584
5811
msgid ""
5812
"The URL for bug tracker \"%(abbreviation)s\" doesn't contain {id}: %(url)s"
5813
msgstr ""
5814
5815
#: bzrlib/errors.py:2594
5816
msgid ""
5817
"Cannot find registered bug tracker called %(abbreviation)s on %(branch)s"
5818
msgstr ""
5819
5820
#: bzrlib/errors.py:2604
5821
msgid "Invalid line in bugs property: '%(line)s'"
5822
msgstr ""
5823
5824
#: bzrlib/errors.py:2612
5825
msgid "Invalid bug status: '%(status)s'"
5826
msgstr ""
5827
5828
#: bzrlib/errors.py:2620
5829
msgid "Could not understand response from smart server: %(response_tuple)r"
5830
msgstr ""
5831
5832
#: bzrlib/errors.py:2659
5833
msgid "Server sent an unexpected error: %(error_tuple)r"
5834
msgstr ""
5835
5836
#: bzrlib/errors.py:2678
5837
msgid "Unrecognised container format: %(container_format)r"
5838
msgstr ""
5839
5840
#: bzrlib/errors.py:2686
5841
msgid "Unexpected end of container stream"
5842
msgstr ""
5843
5844
#: bzrlib/errors.py:2691
5845
msgid "Unknown record type: %(record_type)r"
5846
msgstr ""
5847
5848
#: bzrlib/errors.py:2699
5849
msgid "Invalid record: %(reason)s"
5850
msgstr ""
5851
5852
#: bzrlib/errors.py:2707
5853
msgid "Container has data after end marker: %(excess)r"
5854
msgstr ""
5855
5856
#: bzrlib/errors.py:2715
5857
msgid "Container has multiple records with the same name: %(name)s"
5858
msgstr ""
5859
5860
#: bzrlib/errors.py:2728
5861
msgid "Corrupt or incompatible data stream: %(reason)s"
5862
msgstr ""
5863
5864
#: bzrlib/errors.py:2736
5865
msgid "SMTP error: %(error)s"
5866
msgstr ""
5867
5868
#: bzrlib/errors.py:2744
5869
msgid "No message supplied."
5870
msgstr ""
5871
5872
#: bzrlib/errors.py:2749
5873
msgid "No mail-to address (--mail-to) or output (-o) specified."
5874
msgstr ""
5875
5876
#: bzrlib/errors.py:2754
5877
msgid "Unknown mail client: %(mail_client)s"
5878
msgstr ""
5879
5880
#: bzrlib/errors.py:2762
5881
msgid ""
5882
"Unable to find mail client with the following names: "
5883
"%(mail_command_list_string)s"
5884
msgstr ""
5885
5886
#: bzrlib/errors.py:2772
5887
msgid "SMTP connection to %(host)s refused"
5888
msgstr ""
5889
5890
#: bzrlib/errors.py:2781
5891
msgid "Please specify smtp_server. No server at default %(host)s."
5892
msgstr ""
5893
5894
#: bzrlib/errors.py:2795
5895
msgid ""
5896
"'%(display_url)s' is not in sync with %(target_url)s. See bzr help sync-for-"
5897
"reconfigure."
5898
msgstr ""
5899
5900
#: bzrlib/errors.py:2807
5901
msgid "'%(display_url)s' is already a branch."
5902
msgstr ""
5903
5904
#: bzrlib/errors.py:2812
5905
msgid "'%(display_url)s' is already a tree."
5906
msgstr ""
5907
5908
#: bzrlib/errors.py:2817
5909
msgid "'%(display_url)s' is already a checkout."
5910
msgstr ""
5911
5912
#: bzrlib/errors.py:2822
5913
msgid "'%(display_url)s' is already a lightweight checkout."
5914
msgstr ""
5915
5916
#: bzrlib/errors.py:2827
5917
msgid "'%(display_url)s' is already using a shared repository."
5918
msgstr ""
5919
5920
#: bzrlib/errors.py:2832
5921
msgid "'%(display_url)s' is already standalone."
5922
msgstr ""
5923
5924
#: bzrlib/errors.py:2837
5925
msgid "Shared repository '%(display_url)s' already creates working trees."
5926
msgstr ""
5927
5928
#: bzrlib/errors.py:2843
5929
msgid ""
5930
"Shared repository '%(display_url)s' already doesn't create working trees."
5931
msgstr ""
5932
5933
#: bzrlib/errors.py:2849
5934
msgid "Requested reconfiguration of '%(display_url)s' is not supported."
5935
msgstr ""
5936
5937
#: bzrlib/errors.py:2854
5938
msgid "No location could be found to bind to at %(display_url)s."
5939
msgstr ""
5940
5941
#: bzrlib/errors.py:2859
5942
msgid ""
5943
"Working tree \"%(display_url)s\" has uncommitted changes (See bzr "
5944
"status).%(more)s"
5945
msgstr ""
5946
5947
#: bzrlib/errors.py:2878
5948
msgid ""
5949
"Working tree \"%(display_url)s\" has shelved changes (See bzr shelve --"
5950
"list).%(more)s"
5951
msgstr ""
5952
5953
#: bzrlib/errors.py:2884
5954
msgid "Variable {%(name)s} is not available."
5955
msgstr ""
5956
5957
#: bzrlib/errors.py:2892
5958
msgid "No template specified."
5959
msgstr ""
5960
5961
#: bzrlib/errors.py:2897
5962
msgid "Unable to create symlink %(path_str)son this platform"
5963
msgstr ""
5964
5965
#: bzrlib/errors.py:2912
5966
msgid ""
5967
"Unsupported timezone format \"%(timezone)s\", options are \"utc\", "
5968
"\"original\", \"local\"."
5969
msgstr ""
5970
5971
#: bzrlib/errors.py:2946
5972
msgid ""
5973
"Unable to encode %(kind)s path %(path)r in user encoding %(user_encoding)s"
5974
msgstr ""
5975
5976
#: bzrlib/errors.py:2958
5977
msgid "The \"%(config_id)s\" configuration does not exist."
5978
msgstr ""
5979
5980
#: bzrlib/errors.py:2966
5981
msgid "The \"%(option_name)s\" configuration option does not exist."
5982
msgstr ""
5983
5984
#: bzrlib/errors.py:2974
5985
msgid "The alias \"%(alias_name)s\" does not exist."
5986
msgstr ""
5987
5988
#: bzrlib/errors.py:2988
5989
msgid "\"%(alias_name)s\" is not a valid location alias."
5990
msgstr ""
5991
5992
#: bzrlib/errors.py:2996
5993
msgid "No %(alias_name)s location assigned."
5994
msgstr ""
5995
5996
#: bzrlib/errors.py:3004
5997
msgid "Cannot bind address \"%(host)s:%(port)i\": %(orig_error)s."
5998
msgstr ""
5999
6000
#: bzrlib/errors.py:3014
6001
msgid "Unknown rules detected: %(unknowns_str)s."
6002
msgstr ""
6003
6004
#: bzrlib/errors.py:3025
6005
msgid "Tip change rejected: %(msg)s"
6006
msgstr ""
6007
6008
#: bzrlib/errors.py:3033
6009
msgid "Shelf corrupt."
6010
msgstr ""
6011
6012
#: bzrlib/errors.py:3038
6013
msgid "Corruption while decompressing repository file%(orig_error)s"
6014
msgstr ""
6015
6016
#: bzrlib/errors.py:3050
6017
msgid "No changes are shelved with id \"%(shelf_id)d\"."
6018
msgstr ""
6019
6020
#: bzrlib/errors.py:3058
6021
msgid "\"%(invalid_id)s\" is not a valid shelf id, try a number instead."
6022
msgstr ""
6023
6024
#: bzrlib/errors.py:3066
6025
msgid ""
6026
"An attempt to access a url outside the server jail was made: '%(url)s'."
6027
msgstr ""
6028
6029
#: bzrlib/errors.py:3074
6030
msgid "The user aborted the operation."
6031
msgstr ""
6032
6033
#: bzrlib/errors.py:3079
6034
msgid "Branching '%(url)s'(%(format)s) must create a working tree."
6035
msgstr ""
6036
6037
#: bzrlib/errors.py:3089
6038
msgid "No such view: %(view_name)s."
6039
msgstr ""
6040
6041
#: bzrlib/errors.py:3099
6042
msgid ""
6043
"Views are not supported by %(tree)s; use 'bzr upgrade' to change your tree "
6044
"to a later format."
6045
msgstr ""
6046
6047
#: bzrlib/errors.py:3108
6048
msgid ""
6049
"Specified file \"%(file_name)s\" is outside the current view: %(view_str)s"
6050
msgstr ""
6051
6052
#: bzrlib/errors.py:3175
6053
msgid "%(bzrdir)r does not support co-located branches."
6054
msgstr ""
6055
6056
#: bzrlib/errors.py:3181
6057
msgid ""
6058
"Unable to determine your name.\n"
6059
"Please, set your name with the 'whoami' command.\n"
6060
"E.g. bzr whoami \"Your Name <name@example.com>\""
6061
msgstr ""
6062
6063
#: bzrlib/errors.py:3190
6064
msgid "Invalid pattern(s) found. %(msg)s"
6065
msgstr ""
6066
6067
#: bzrlib/errors.py:3198
6068
msgid ""
6069
"Branch \"%(branch_url)s\" appears to be bound to itself. Please use `bzr "
6070
"unbind` to fix."
6071
msgstr ""
6072
6073
#: bzrlib/errors.py:3209
6074
msgid "Loop involving %(refs)r while expanding \"%(string)s\"."
6075
msgstr ""
6076
6077
#: bzrlib/errors.py:3218
6078
msgid "Option %(name)s is not defined while expanding \"%(string)s\"."
6079
msgstr ""
6080
6081
#: bzrlib/errors.py:3227
6082
msgid ""
6083
"No compatible object available for operations from %(source)r to %(target)r."
6084
msgstr ""
6085
6086
#: bzrlib/errors.py:3237
6087
msgid ""
6088
"VFS requests over the smart server are not allowed. Encountered: %(method)s, "
6089
"%(arguments)s."
6090
msgstr ""
6091
6092
#: bzrlib/errors.py:3247
6093
msgid ""
6094
"Kind change from %(from_kind)s to %(to_kind)s for %(path)s not supported by "
6095
"format %(format)r"
6096
msgstr ""
6097
6098
#: bzrlib/errors.py:3259
6099
msgid ""
6100
"Missing feature %(feature)s not provided by this version of Bazaar or any "
6101
"plugin."
6102
msgstr ""
6103
6104
#: bzrlib/errors.py:3272
6105
msgid "Binary files section encountered."
6106
msgstr ""
6107
6108
#: bzrlib/errors.py:3280
6109
msgid ""
6110
"Malformed patch header. %(desc)s\n"
6111
"%(line)r"
6112
msgstr ""
6113
6114
#: bzrlib/errors.py:3289
6115
msgid ""
6116
"Malformed hunk header. %(desc)s\n"
6117
"%(line)r"
6118
msgstr ""
6119
6120
#: bzrlib/errors.py:3298
6121
msgid ""
6122
"Malformed line. %(desc)s\n"
6123
"%(line)r"
6124
msgstr ""
6125
6126
#: bzrlib/errors.py:3308
6127
msgid ""
6128
"Text contents mismatch at line %(line_no)d. Original has \"%(orig_line)s\", "
6129
"but patch says it should be \"%(patch_line)s\""
6130
msgstr ""
6131
6132
#: bzrlib/errors.py:3319
6133
msgid "The feature %(feature)s has already been registered."
6134
msgstr ""
6135
6136
#: bzrlib/export_pot.py:252
6137
#, python-format
6138
msgid "Exporting messages from builtin command: %s"
6139
msgstr ""
6140
6141
#: bzrlib/export_pot.py:271
6142
msgid "Exporting messages from plugin command: {0} in {1}"
6143
msgstr ""
6144
6145
#: bzrlib/export_pot.py:292
6146
#, python-format
6147
msgid "Exporting message from error: %s"
6148
msgstr ""
6149
6150
#: bzrlib/fetch.py:98
6151
msgid "Finding revisions"
6152
msgstr ""
6153
6154
#: bzrlib/fetch.py:103
6155
msgid "Fetching revisions"
6156
msgstr ""
6157
6158
#: bzrlib/foreign.py:262
6159
msgid "Push into a different VCS without any custom bzr metadata."
6160
msgstr ""
6161
6162
#: bzrlib/foreign.py:264
6163
msgid ""
6164
"This will afterwards rebase the local branch on the remote\n"
6165
"branch unless the --no-rebase option is used, in which case \n"
6166
"the two branches will be out of sync after the push. "
6167
msgstr ""
6168
6169
#: bzrlib/foreign.py:277
6170
msgid "Do not rebase after push."
6171
msgstr ""
6172
6173
#: bzrlib/foreign.py:311
6174
#, python-format
6175
msgid "Using saved location: %s\n"
6176
msgstr ""
6177
6178
#: bzrlib/foreign.py:321
6179
msgid ""
6180
"{0!r} and {1!r} are in the same VCS, lossy push not necessary. Please use "
6181
"regular push."
6182
msgstr ""
6183
6184
#: bzrlib/gpg.py:119 bzrlib/gpg.py:460
6185
msgid "{0} commits with valid signatures"
6186
msgstr ""
6187
6188
#: bzrlib/gpg.py:123 bzrlib/gpg.py:465
6189
msgid "{0} commit with unknown key"
6190
msgid_plural "{0} commits with unknown keys"
6191
msgstr[0] ""
6192
msgstr[1] ""
6193
6194
#: bzrlib/gpg.py:129 bzrlib/gpg.py:472
6195
msgid "{0} commit not valid"
6196
msgid_plural "{0} commits not valid"
6197
msgstr[0] ""
6198
msgstr[1] ""
6199
6200
#: bzrlib/gpg.py:135 bzrlib/gpg.py:479
6201
msgid "{0} commit not signed"
6202
msgid_plural "{0} commits not signed"
6203
msgstr[0] ""
6204
msgstr[1] ""
6205
6206
#: bzrlib/gpg.py:141 bzrlib/gpg.py:486
6207
msgid "{0} commit with key now expired"
6208
msgid_plural "{0} commits with key now expired"
6209
msgstr[0] ""
6210
msgstr[1] ""
6211
6212
#: bzrlib/gpg.py:343
6213
msgid "No GnuPG key results for pattern: {0}"
6214
msgstr ""
6215
6216
#: bzrlib/gpg.py:386
6217
msgid "{0} signed {1} commit"
6218
msgid_plural "{0} signed {1} commits"
6219
msgstr[0] ""
6220
msgstr[1] ""
6221
6222
#: bzrlib/gpg.py:403 bzrlib/gpg.py:419
6223
msgid "{0} commit by author {1}"
6224
msgid_plural "{0} commits by author {1}"
6225
msgstr[0] ""
6226
msgstr[1] ""
6227
6228
#: bzrlib/gpg.py:433
6229
msgid "Unknown key {0} signed {1} commit"
6230
msgid_plural "Unknown key {0} signed {1} commits"
6231
msgstr[0] ""
6232
msgstr[1] ""
6233
6234
#: bzrlib/gpg.py:452
6235
msgid "{0} commit by author {1} with key {2} now expired"
6236
msgid_plural "{0} commits by author {1} with key {2} now expired"
6237
msgstr[0] ""
6238
msgstr[1] ""
6239
6240
#: bzrlib/groupcompress.py:1739
6241
#, python-format
6242
msgid "Insert claimed random_id=True, but then inserted %r two times"
6243
msgstr ""
6244
6245
#: bzrlib/hooks.py:331
6246
#, python-format
6247
msgid "Introduced in: %s"
6248
msgstr ""
6249
6250
#: bzrlib/hooks.py:334
6251
#, python-format
6252
msgid "Deprecated in: %s"
6253
msgstr ""
6254
6255
#: bzrlib/knit.py:1766 bzrlib/knit.py:1802
6256
msgid "Walking content"
6257
msgstr ""
6258
6259
#: bzrlib/knit.py:3330
6260
msgid "annotating"
6261
msgstr ""
6262
6263
#: bzrlib/lock.py:548
6264
msgid "{0!r} was {1} locked again"
6265
msgstr ""
6266
6267
#: bzrlib/lockdir.py:321
6268
#, python-format
6269
msgid "error removing pending lock: %s"
6270
msgstr ""
6271
6272
#: bzrlib/lockdir.py:616
6273
msgid "Unable to obtain"
6274
msgstr ""
6275
6276
#: bzrlib/lockdir.py:618
6277
msgid "Lock owner changed for"
6278
msgstr ""
6279
6280
#: bzrlib/lockdir.py:620
6281
msgid "{0} lock {1} {2}."
6282
msgstr ""
6283
6284
#: bzrlib/lockdir.py:627
6285
#, python-format
6286
msgid "Will continue to try until %s, unless you press Ctrl-C."
6287
msgstr ""
6288
6289
#: bzrlib/lockdir.py:629
6290
msgid "See \"bzr help break-lock\" for more."
6291
msgstr ""
6292
6293
#: bzrlib/lockdir.py:739
6294
#, python-format
6295
msgid ""
6296
"held by %(user)s on %(hostname)s (process #%(pid)s), acquired %(time_ago)s"
6297
msgstr ""
6298
6299
#: bzrlib/log.py:572
6300
msgid "--exclude-common-ancestry requires two different revisions"
6301
msgstr ""
6302
6303
#: bzrlib/log.py:574
6304
#, python-format
6305
msgid "invalid direction %r"
6306
msgstr ""
6307
6308
#: bzrlib/log.py:662
6309
msgid "Start revision not found in history of end revision."
6310
msgstr ""
6311
6312
#: bzrlib/log.py:1080 bzrlib/log.py:1138
6313
msgid "Logging revision 0 is invalid."
6314
msgstr ""
6315
6316
#: bzrlib/log.py:1082 bzrlib/log.py:1140
6317
msgid "Start revision must be older than the end revision."
6318
msgstr ""
6319
6320
#: bzrlib/log.py:1827
6321
#, python-format
6322
msgid "unknown log formatter: %r"
6323
msgstr ""
6324
6325
#: bzrlib/log.py:2123
6326
msgid "fixes bug"
6327
msgid_plural "fixes bugs"
6328
msgstr[0] ""
6329
msgstr[1] ""
6330
6331
#: bzrlib/merge.py:689
6332
msgid "All changes applied successfully."
6333
msgstr ""
6334
6335
#: bzrlib/merge.py:691
6336
#, python-format
6337
msgid "%d conflicts encountered."
6338
msgstr ""
6339
6340
#: bzrlib/merge.py:845 bzrlib/merge.py:1933
6341
msgid "Preparing file merge"
6342
msgstr ""
6343
6344
#: bzrlib/multiparent.py:426
6345
msgid "Importing revisions"
6346
msgstr ""
6347
6348
#: bzrlib/option.py:526
6349
msgid "Show help message."
6350
msgstr ""
6351
6352
#: bzrlib/option.py:528
6353
msgid "Only display errors and warnings."
6354
msgstr ""
6355
6356
#: bzrlib/option.py:531
6357
msgid "Show usage message and options."
6358
msgstr ""
6359
6360
#: bzrlib/option.py:533
6361
msgid "Display more information."
6362
msgstr ""
6363
6364
#: bzrlib/option.py:541
6365
msgid ""
6366
"Select changes introduced by the specified revision. See also \"help "
6367
"revisionspec\"."
6368
msgstr ""
6369
6370
#: bzrlib/option.py:543
6371
msgid "Branch to operate on, instead of working directory."
6372
msgstr ""
6373
6374
#: bzrlib/option.py:545
6375
msgid "Detailed log format."
6376
msgstr ""
6377
6378
#: bzrlib/option.py:545
6379
msgid "Format used by GNU ChangeLog files."
6380
msgstr ""
6381
6382
#: bzrlib/option.py:545
6383
msgid "Log format with one line per revision."
6384
msgstr ""
6385
6386
#: bzrlib/option.py:545
6387
msgid "Moderately short log format."
6388
msgstr ""
6389
6390
#: bzrlib/option.py:545
6391
msgid "Use specified log format."
6392
msgstr ""
6393
6394
#: bzrlib/option.py:547
6395
msgid "Log format"
6396
msgstr ""
6397
6398
#: bzrlib/option.py:549
6399
msgid "LCA-newness merge."
6400
msgstr ""
6401
6402
#: bzrlib/option.py:549
6403
msgid "Merge using external diff3."
6404
msgstr ""
6405
6406
#: bzrlib/option.py:549
6407
msgid "Native diff3-style merge."
6408
msgstr ""
6409
6410
#: bzrlib/option.py:549
6411
msgid "Select a particular merge algorithm."
6412
msgstr ""
6413
6414
#: bzrlib/option.py:549
6415
msgid "Weave-based merge."
6416
msgstr ""
6417
6418
#: bzrlib/option.py:551
6419
msgid "Merge algorithm"
6420
msgstr ""
6421
6422
#: bzrlib/option.py:554
6423
msgid "Message string."
6424
msgstr ""
6425
6426
#: bzrlib/option.py:556
6427
msgid "Use an ASCII NUL (\\0) separator rather than a newline."
6428
msgstr ""
6429
6430
#: bzrlib/option.py:558
6431
msgid "Ignore differences between branches and overwrite unconditionally."
6432
msgstr ""
6433
6434
#: bzrlib/option.py:560
6435
msgid "Remember the specified location as a default."
6436
msgstr ""
6437
6438
#: bzrlib/option.py:562
6439
msgid "Reprocess to reduce spurious conflicts."
6440
msgstr ""
6441
6442
#: bzrlib/option.py:566
6443
msgid "See \"help revisionspec\" for details."
6444
msgstr ""
6445
6446
#: bzrlib/option.py:568
6447
msgid "Show internal object ids."
6448
msgstr ""
6449
6450
#: bzrlib/option.py:571
6451
msgid "Display timezone as local, original, or utc."
6452
msgstr ""
6453
6454
#: bzrlib/osutils.py:100
6455
msgid "Parameter {0!r} encoding is unsupported by {1} application locale."
6456
msgstr ""
6457
6458
#: bzrlib/osutils.py:220
6459
msgid "lstat/stat of ({0!r}): {1!r}"
6460
msgstr ""
6461
6462
#: bzrlib/osutils.py:997 bzrlib/osutils.py:1008
6463
#, python-format
6464
msgid "sorry, %r not allowed in path"
6465
msgstr ""
6466
6467
#: bzrlib/osutils.py:1226
6468
#, python-format
6469
msgid "%r is too short to calculate a relative path"
6470
msgstr ""
6471
6472
#: bzrlib/plugin.py:143
6473
#, python-format
6474
msgid "\"%s\" is not a valid <plugin_name>@<plugin_path> description "
6475
msgstr ""
6476
6477
#: bzrlib/plugins/bash_completion/bashcomp.py:411
6478
msgid "Enable completions for the selected plugin (default: all plugins)"
6479
msgstr ""
6480
6481
#: bzrlib/plugins/bash_completion/bashcomp.py:412
6482
msgid "Generate a shell function for bash command line completion."
6483
msgstr ""
6484
6485
#: bzrlib/plugins/bash_completion/bashcomp.py:414
6486
msgid ""
6487
"This command generates a shell function which can be used by bash to\n"
6488
"automatically complete the currently typed command when the user presses\n"
6489
"the completion key (usually tab)."
6490
msgstr ""
6491
6492
#: bzrlib/plugins/bash_completion/bashcomp.py:418
6493
msgid ""
6494
"Commonly used like this:\n"
6495
" eval \"`bzr bash-completion`\""
6496
msgstr ""
6497
6498
#: bzrlib/plugins/bash_completion/bashcomp.py:424
6499
msgid "Name of the generated function (default: _bzr)"
6500
msgstr ""
6501
6502
#: bzrlib/plugins/bash_completion/bashcomp.py:426
6503
msgid "Generate only the shell function, don't enable it"
6504
msgstr ""
6505
6506
#: bzrlib/plugins/launchpad/__init__.py:81
6507
msgid "Register a branch with launchpad.net."
6508
msgstr ""
6509
6510
#: bzrlib/plugins/launchpad/__init__.py:83
6511
msgid ""
6512
"This command lists a bzr branch in the directory of branches on\n"
6513
"launchpad.net. Registration allows the branch to be associated with\n"
6514
"bugs or specifications."
6515
msgstr ""
6516
6517
#: bzrlib/plugins/launchpad/__init__.py:87
6518
msgid ""
6519
"Before using this command you must register the project to which the\n"
6520
"branch belongs, and create an account for yourself on launchpad.net."
6521
msgstr ""
6522
6523
#: bzrlib/plugins/launchpad/__init__.py:90
6524
msgid ""
6525
"arguments:\n"
6526
" public_url: The publicly visible url for the branch to register.\n"
6527
" This must be an http or https url (which Launchpad can read\n"
6528
" from to access the branch). Local file urls, SFTP urls, and\n"
6529
" bzr+ssh urls will not work.\n"
6530
" If no public_url is provided, bzr will use the configured\n"
6531
" public_url if there is one for the current branch, and\n"
6532
" otherwise error."
6533
msgstr ""
6534
6535
#: bzrlib/plugins/launchpad/__init__.py:99
6536
msgid ""
6537
"example:\n"
6538
" bzr register-branch http://foo.com/bzr/fooproject.mine \\\n"
6539
" --project fooproject"
6540
msgstr ""
6541
6542
#: bzrlib/plugins/launchpad/__init__.py:106
6543
msgid "Launchpad project short name to associate with the branch."
6544
msgstr ""
6545
6546
#: bzrlib/plugins/launchpad/__init__.py:113
6547
msgid ""
6548
"Short name for the branch; by default taken from the last component of the "
6549
"url."
6550
msgstr ""
6551
6552
#: bzrlib/plugins/launchpad/__init__.py:117
6553
msgid "One-sentence description of the branch."
6554
msgstr ""
6555
6556
#: bzrlib/plugins/launchpad/__init__.py:120
6557
msgid "Longer description of the purpose or contents of the branch."
6558
msgstr ""
6559
6560
#: bzrlib/plugins/launchpad/__init__.py:123
6561
msgid "Branch author's email address, if not yourself."
6562
msgstr ""
6563
6564
#: bzrlib/plugins/launchpad/__init__.py:126
6565
msgid "The bug this branch fixes."
6566
msgstr ""
6567
6568
#: bzrlib/plugins/launchpad/__init__.py:129
6569
msgid "Prepare the request but don't actually send it."
6570
msgstr ""
6571
6572
#: bzrlib/plugins/launchpad/__init__.py:151
6573
msgid ""
6574
"register-branch requires a public branch url - see bzr help register-branch."
6575
msgstr ""
6576
6577
#: bzrlib/plugins/launchpad/__init__.py:159
6578
msgid "--product is deprecated; please use --project."
6579
msgstr ""
6580
6581
#: bzrlib/plugins/launchpad/__init__.py:191
6582
msgid "Open a Launchpad branch page in your web browser."
6583
msgstr ""
6584
6585
#: bzrlib/plugins/launchpad/__init__.py:196
6586
msgid "Do not actually open the browser. Just say the URL we would use."
6587
msgstr ""
6588
6589
#: bzrlib/plugins/launchpad/__init__.py:231
6590
#, python-format
6591
msgid "Opening %s in web browser"
6592
msgstr ""
6593
6594
#: bzrlib/plugins/launchpad/__init__.py:241
6595
msgid "Show or set the Launchpad user ID."
6596
msgstr ""
6597
6598
#: bzrlib/plugins/launchpad/__init__.py:243
6599
msgid ""
6600
"When communicating with Launchpad, some commands need to know your\n"
6601
"Launchpad user ID. This command can be used to set or show the\n"
6602
"user ID that Bazaar will use for such communication."
6603
msgstr ""
6604
6605
#: bzrlib/plugins/launchpad/__init__.py:247
6606
msgid ""
6607
":Examples:\n"
6608
" Show the Launchpad ID of the current user::"
6609
msgstr ""
6610
6611
#: bzrlib/plugins/launchpad/__init__.py:250
6612
msgid " bzr launchpad-login"
6613
msgstr ""
6614
6615
#: bzrlib/plugins/launchpad/__init__.py:252
6616
msgid " Set the Launchpad ID of the current user to 'bob'::"
6617
msgstr ""
6618
6619
#: bzrlib/plugins/launchpad/__init__.py:254
6620
msgid " bzr launchpad-login bob"
6621
msgstr ""
6622
6623
#: bzrlib/plugins/launchpad/__init__.py:261
6624
msgid "Don't check that the user name is valid."
6625
msgstr ""
6626
6627
#: bzrlib/plugins/launchpad/__init__.py:276
6628
#: bzrlib/plugins/launchpad/__init__.py:287
6629
msgid "Launchpad user ID exists and has SSH keys.\n"
6630
msgstr ""
6631
6632
#: bzrlib/plugins/launchpad/__init__.py:279
6633
msgid "No Launchpad user ID configured.\n"
6634
msgstr ""
6635
6636
#: bzrlib/plugins/launchpad/__init__.py:290
6637
#, python-format
6638
msgid "Launchpad user ID set to '%s'.\n"
6639
msgstr ""
6640
6641
#: bzrlib/plugins/launchpad/__init__.py:298
6642
msgid "Ask Launchpad to mirror a branch now."
6643
msgstr ""
6644
6645
#: bzrlib/plugins/launchpad/__init__.py:318
6646
msgid "Propose merging a branch on Launchpad."
6647
msgstr ""
6648
6649
#: bzrlib/plugins/launchpad/__init__.py:320
6650
msgid ""
6651
"This will open your usual editor to provide the initial comment. When it\n"
6652
"has created the proposal, it will open it in your default web browser."
6653
msgstr ""
6654
6655
#: bzrlib/plugins/launchpad/__init__.py:323
6656
msgid ""
6657
"The branch will be proposed to merge into SUBMIT_BRANCH. If SUBMIT_BRANCH\n"
6658
"is not supplied, the remembered submit branch will be used. If no submit\n"
6659
"branch is remembered, the development focus will be used."
6660
msgstr ""
6661
6662
#: bzrlib/plugins/launchpad/__init__.py:327
6663
msgid ""
6664
"By default, the SUBMIT_BRANCH's review team will be requested to review\n"
6665
"the merge proposal. This can be overriden by specifying --review (-R).\n"
6666
"The parameter the launchpad account name of the desired reviewer. This\n"
6667
"may optionally be followed by '=' and the review type. For example:"
6668
msgstr ""
6669
6670
#: bzrlib/plugins/launchpad/__init__.py:332
6671
msgid " bzr lp-propose-merge --review jrandom --review review-team=qa"
6672
msgstr ""
6673
6674
#: bzrlib/plugins/launchpad/__init__.py:334
6675
msgid ""
6676
"This will propose a merge, request \"jrandom\" to perform a review of\n"
6677
"unspecified type, and request \"review-team\" to perform a \"qa\" review."
6678
msgstr ""
6679
6680
#: bzrlib/plugins/launchpad/__init__.py:339
6681
msgid "Propose the merge on staging."
6682
msgstr ""
6683
6684
#: bzrlib/plugins/launchpad/__init__.py:341
6685
msgid "Commit message."
6686
msgstr ""
6687
6688
#: bzrlib/plugins/launchpad/__init__.py:343
6689
msgid "Mark the proposal as approved immediately."
6690
msgstr ""
6691
6692
#: bzrlib/plugins/launchpad/__init__.py:345
6693
msgid "Requested reviewer and optional type."
6694
msgstr ""
6695
6696
#: bzrlib/plugins/launchpad/__init__.py:382
6697
msgid "Find the proposal to merge this revision."
6698
msgstr ""
6699
6700
#: bzrlib/plugins/launchpad/__init__.py:384
6701
msgid ""
6702
"Finds the merge proposal(s) that discussed landing the specified revision.\n"
6703
"This works only if the selected branch was the merge proposal target, and\n"
6704
"if the merged_revno is recorded for the merge proposal. The proposal(s)\n"
6705
"are opened in a web browser."
6706
msgstr ""
6707
6708
#: bzrlib/plugins/launchpad/__init__.py:389
6709
msgid ""
6710
"Any revision involved in the merge may be specified-- the revision in\n"
6711
"which the merge was performed, or one of the revisions that was merged."
6712
msgstr ""
6713
6714
#: bzrlib/plugins/launchpad/__init__.py:392
6715
msgid "So, to find the merge proposal that reviewed line 1 of README::"
6716
msgstr ""
6717
6718
#: bzrlib/plugins/launchpad/__init__.py:394
6719
msgid " bzr lp-find-proposal -r annotate:README:1"
6720
msgstr ""
6721
6722
#: bzrlib/plugins/launchpad/__init__.py:409
6723
msgid "No review found."
6724
msgstr ""
6725
6726
#: bzrlib/plugins/launchpad/__init__.py:410
6727
#, python-format
6728
msgid "%d proposals(s) found."
6729
msgstr ""
6730
6731
#: bzrlib/plugins/launchpad/__init__.py:420
6732
msgid "Finding revision-id"
6733
msgstr ""
6734
6735
#: bzrlib/plugins/launchpad/__init__.py:427
6736
msgid "Finding merge"
6737
msgstr ""
6738
6739
#: bzrlib/plugins/launchpad/__init__.py:432
6740
msgid "Finding revno"
6741
msgstr ""
6742
6743
#: bzrlib/plugins/launchpad/__init__.py:437
6744
msgid "Finding Launchpad branch"
6745
msgstr ""
6746
6747
#: bzrlib/plugins/launchpad/__init__.py:440
6748
msgid "Finding proposals"
6749
msgstr ""
6750
6751
#: bzrlib/plugins/launchpad/account.py:66
6752
msgid "Setting ssh/sftp usernames for launchpad.net."
6753
msgstr ""
6754
6755
#: bzrlib/plugins/launchpad/lp_api.py:241
6756
#: bzrlib/plugins/launchpad/lp_api.py:246
6757
#, python-format
6758
msgid "%s is not registered on Launchpad"
6759
msgstr ""
6760
6761
#: bzrlib/plugins/launchpad/lp_api.py:256
6762
#, python-format
6763
msgid "%s has no development focus."
6764
msgstr ""
6765
6766
#: bzrlib/plugins/launchpad/lp_api.py:261
6767
#, python-format
6768
msgid "development focus %s has no branch."
6769
msgstr ""
6770
6771
#: bzrlib/plugins/launchpad/lp_api.py:266
6772
#, python-format
6773
msgid "source package %s has no branch."
6774
msgstr ""
6775
6776
#: bzrlib/plugins/launchpad/lp_api.py:270
6777
#, python-format
6778
msgid "%s has no associated product or source package."
6779
msgstr ""
6780
6781
#: bzrlib/plugins/launchpad/lp_api.py:282
6782
#, python-format
6783
msgid "%s is already up-to-date."
6784
msgstr ""
6785
6786
#: bzrlib/plugins/launchpad/lp_api.py:289
6787
#, python-format
6788
msgid "Pushing to %s"
6789
msgstr ""
6790
6791
#: bzrlib/plugins/launchpad/lp_directory.py:170
6792
msgid ""
6793
"resolution for {0}\n"
6794
" local: {1}\n"
6795
" remote: {2}"
6796
msgstr ""
6797
6798
#: bzrlib/plugins/launchpad/lp_propose.py:149
6799
#, python-format
6800
msgid "There is already a branch merge proposal: %s"
6801
msgstr ""
6802
6803
#: bzrlib/plugins/weave_fmt/bzrdir.py:236
6804
msgid "pb parameter to convert() is deprecated"
6805
msgstr ""
6806
6807
#: bzrlib/plugins/weave_fmt/bzrdir.py:239
6808
msgid "starting upgrade from format 4 to 5"
6809
msgstr ""
6810
6811
#: bzrlib/plugins/weave_fmt/bzrdir.py:249
6812
msgid "note: upgrade may be faster if all store files are ungzipped first"
6813
msgstr ""
6814
6815
#: bzrlib/plugins/weave_fmt/bzrdir.py:278
6816
msgid "converting revision"
6817
msgstr ""
6818
6819
#: bzrlib/plugins/weave_fmt/bzrdir.py:283
6820
msgid "upgraded to weaves:"
6821
msgstr ""
6822
6823
#: bzrlib/plugins/weave_fmt/bzrdir.py:284
6824
#, python-format
6825
msgid "%6d revisions and inventories"
6826
msgstr ""
6827
6828
#: bzrlib/plugins/weave_fmt/bzrdir.py:286
6829
#, python-format
6830
msgid "%6d revisions not present"
6831
msgstr ""
6832
6833
#: bzrlib/plugins/weave_fmt/bzrdir.py:288
6834
#, python-format
6835
msgid "%6d texts"
6836
msgstr ""
6837
6838
#: bzrlib/plugins/weave_fmt/bzrdir.py:324
6839
msgid "writing weave"
6840
msgstr ""
6841
6842
#: bzrlib/plugins/weave_fmt/bzrdir.py:328
6843
#: bzrlib/plugins/weave_fmt/bzrdir.py:330
6844
msgid "inventory"
6845
msgstr ""
6846
6847
#: bzrlib/plugins/weave_fmt/bzrdir.py:347
6848
msgid "write revision"
6849
msgstr ""
6850
6851
#: bzrlib/plugins/weave_fmt/bzrdir.py:361
6852
msgid "loading revision"
6853
msgstr ""
6854
6855
#: bzrlib/plugins/weave_fmt/bzrdir.py:366
6856
#, python-format
6857
msgid "revision {%s} not present in branch; will be converted as a ghost"
6858
msgstr ""
6859
6860
#: bzrlib/plugins/weave_fmt/bzrdir.py:506
6861
msgid "starting upgrade from format 5 to 6"
6862
msgstr ""
6863
6864
#: bzrlib/plugins/weave_fmt/bzrdir.py:516
6865
#, python-format
6866
msgid "adding prefixes to %s"
6867
msgstr ""
6868
6869
#: bzrlib/plugins/weave_fmt/bzrdir.py:556
6870
msgid "starting upgrade from format 6 to metadir"
6871
msgstr ""
6872
6873
#: bzrlib/plugins/weave_fmt/bzrdir.py:564
6874
msgid "Removing ancestry.weave"
6875
msgstr ""
6876
6877
#: bzrlib/plugins/weave_fmt/bzrdir.py:569
6878
msgid "Finding branch files"
6879
msgstr ""
6880
6881
#: bzrlib/plugins/weave_fmt/bzrdir.py:579
6882
msgid "Upgrading repository"
6883
msgstr ""
6884
6885
#: bzrlib/plugins/weave_fmt/bzrdir.py:589
6886
msgid "Upgrading branch"
6887
msgstr ""
6888
6889
#: bzrlib/plugins/weave_fmt/bzrdir.py:612
6890
msgid "No working tree."
6891
msgstr ""
6892
6893
#: bzrlib/plugins/weave_fmt/bzrdir.py:619
6894
msgid "Upgrading working tree"
6895
msgstr ""
6896
6897
#: bzrlib/plugins/weave_fmt/bzrdir.py:640
6898
#, python-format
6899
msgid "Make %s lock"
6900
msgstr ""
6901
6902
#: bzrlib/plugins/weave_fmt/bzrdir.py:651
6903
#, python-format
6904
msgid "Moving %s"
6905
msgstr ""
6906
6907
#: bzrlib/push.py:56
6908
msgid "Created new branch."
6909
msgstr ""
6910
6911
#: bzrlib/push.py:98
6912
#, python-format
6913
msgid ""
6914
"Target directory %s already contains a .bzr directory, but it is not valid."
6915
msgstr ""
6916
6917
#: bzrlib/push.py:101
6918
#, python-format
6919
msgid ""
6920
"Target directory %s already exists, but does not have a .bzr directory. "
6921
"Supply --use-existing-dir to push there anyway."
6922
msgstr ""
6923
6924
#: bzrlib/push.py:122
6925
#, python-format
6926
msgid "Too many redirections trying to make %s."
6927
msgstr ""
6928
6929
#: bzrlib/push.py:147
6930
msgid ""
6931
"These branches have diverged. See \"bzr help diverged-branches\" for more "
6932
"information."
6933
msgstr ""
6934
6935
#: bzrlib/push.py:151
6936
#, python-format
6937
msgid ""
6938
"It is not possible to losslessly push to %s. You may want to use dpush "
6939
"instead."
6940
msgstr ""
6941
6942
#: bzrlib/push.py:157
6943
#, python-format
6944
msgid ""
6945
"At %s you have a valid .bzr control directory, but not a branch or "
6946
"repository. This is an unsupported configuration. Please move the target "
6947
"directory out of the way and try again."
6948
msgstr ""
6949
6950
#: bzrlib/reconcile.py:97
6951
#, python-format
6952
msgid "Reconciling branch %s"
6953
msgstr ""
6954
6955
#: bzrlib/reconcile.py:103
6956
#, python-format
6957
msgid "Reconciling repository %s"
6958
msgstr ""
6959
6960
#: bzrlib/reconcile.py:105
6961
msgid "Reconciling repository"
6962
msgstr ""
6963
6964
#: bzrlib/reconcile.py:111
6965
#, python-format
6966
msgid "%s cannot canonicalize CHKs."
6967
msgstr ""
6968
6969
#: bzrlib/reconcile.py:119
6970
msgid "Reconcile aborted: revision index has inconsistent parents."
6971
msgstr ""
6972
6973
#: bzrlib/reconcile.py:121
6974
msgid "Run \"bzr check\" for more details."
6975
msgstr ""
6976
6977
#: bzrlib/reconcile.py:123
6978
msgid "Reconciliation complete."
6979
msgstr ""
6980
6981
#: bzrlib/reconcile.py:166
6982
msgid "Fixing last revision info {0} => {1}"
6983
msgstr ""
6984
6985
#: bzrlib/reconcile.py:173
6986
msgid "revision_history ok."
6987
msgstr ""
6988
6989
#: bzrlib/reconcile.py:234
6990
msgid "Reading inventory data"
6991
msgstr ""
6992
6993
#: bzrlib/reconcile.py:254 bzrlib/reconcile.py:384
6994
msgid "Inventory ok."
6995
msgstr ""
6996
6997
#: bzrlib/reconcile.py:256 bzrlib/reconcile.py:386
6998
msgid "Backing up inventory"
6999
msgstr ""
7000
7001
#: bzrlib/reconcile.py:258
7002
msgid "Backup inventory created."
7003
msgstr ""
7004
7005
#: bzrlib/reconcile.py:274 bzrlib/reconcile.py:405
7006
msgid "Writing weave"
7007
msgstr ""
7008
7009
#: bzrlib/reconcile.py:277 bzrlib/reconcile.py:408
7010
msgid "Inventory regenerated."
7011
msgstr ""
7012
7013
#: bzrlib/reconcile.py:371 bzrlib/reconcile.py:373 bzrlib/reconcile.py:376
7014
msgid "Reading indexes"
7015
msgstr ""
7016
7017
#: bzrlib/reconcile.py:380 bzrlib/reconcile.py:382
7018
msgid "Checking unused inventories"
7019
msgstr ""
7020
7021
#: bzrlib/reconcile.py:388
7022
msgid "Backup Inventory created"
7023
msgstr ""
7024
7025
#: bzrlib/reconcile.py:446
7026
msgid "Fixing text parents"
7027
msgstr ""
7028
7029
#: bzrlib/reconfigure.py:54
7030
msgid "{0} is now stacked on {1}\n"
7031
msgstr ""
7032
7033
#: bzrlib/reconfigure.py:69
7034
#, python-format
7035
msgid "%s is now not stacked\n"
7036
msgstr ""
7037
7038
#: bzrlib/remote.py:1180 bzrlib/repository.py:289
7039
#, python-format
7040
msgid "bzr: ERROR (ignored): %s"
7041
msgstr ""
7042
7043
#: bzrlib/remote.py:2493
7044
msgid "Copying repository content as tarball..."
7045
msgstr ""
7046
7047
#: bzrlib/rename_map.py:69
7048
msgid "Calculating hashes"
7049
msgstr ""
7050
7051
#: bzrlib/rename_map.py:107
7052
msgid "Determining hash hits"
7053
msgstr ""
7054
7055
#: bzrlib/rename_map.py:242
7056
msgid "{0} => {1}"
7057
msgstr ""
7058
7059
#: bzrlib/repository.py:1787
7060
msgid "Moving repository to repository.backup"
7061
msgstr ""
7062
7063
#: bzrlib/repository.py:1794
7064
msgid "Creating new repository"
7065
msgstr ""
7066
7067
#: bzrlib/repository.py:1799
7068
msgid "Copying content"
7069
msgstr ""
7070
7071
#: bzrlib/repository.py:1803
7072
msgid "Deleting old repository content"
7073
msgstr ""
7074
7075
#: bzrlib/repository.py:1805
7076
msgid "repository converted"
7077
msgstr ""
7078
7079
#: bzrlib/revisionspec.py:903
7080
msgid "Using {0} {1}"
7081
msgstr ""
7082
7083
#: bzrlib/send.py:58
7084
#, python-format
7085
msgid "Mail client \"%s\" does not support specifying body"
7086
msgstr ""
7087
7088
#: bzrlib/send.py:62
7089
msgid "--remember requires a branch to be specified."
7090
msgstr ""
7091
7092
#: bzrlib/send.py:77
7093
msgid "No submit branch known or specified"
7094
msgstr ""
7095
7096
#: bzrlib/send.py:80
7097
msgid "Using saved {0} location \"{1}\" to determine what changes to submit."
7098
msgstr ""
7099
7100
#: bzrlib/send.py:98
7101
#, python-format
7102
msgid "No such send format '%s'."
7103
msgstr ""
7104
7105
#: bzrlib/send.py:114
7106
msgid "bzr send takes at most two one revision identifiers"
7107
msgstr ""
7108
7109
#: bzrlib/send.py:127
7110
msgid "No revisions to submit."
7111
msgstr ""
7112
7113
#: bzrlib/send.py:139
7114
msgid ""
7115
"- not supported for merge directives that use more than one output file."
7116
msgstr ""
7117
7118
#: bzrlib/send.py:185
7119
msgid "Format 0.9 does not permit bundle with no patch"
7120
msgstr ""
7121
7122
#: bzrlib/shelf_ui.py:46
7123
#, python-format
7124
msgid "Shelve adding file \"%(path)s\"?"
7125
msgstr ""
7126
7127
#: bzrlib/shelf_ui.py:47
7128
msgid "Shelve binary changes?"
7129
msgstr ""
7130
7131
#: bzrlib/shelf_ui.py:48
7132
msgid "Shelve changing \"%s\" from %(other)s to %(this)s?"
7133
msgstr ""
7134
7135
#: bzrlib/shelf_ui.py:50
7136
#, python-format
7137
msgid "Shelve removing file \"%(path)s\"?"
7138
msgstr ""
7139
7140
#: bzrlib/shelf_ui.py:51
7141
#, python-format
7142
msgid "Shelve %d change(s)?"
7143
msgstr ""
7144
7145
#: bzrlib/shelf_ui.py:52
7146
msgid "Shelve?"
7147
msgstr ""
7148
7149
#: bzrlib/shelf_ui.py:53
7150
#, python-format
7151
msgid ""
7152
"Shelve changing target of \"%(path)s\" from \"%(other)s\" to \"%(this)s\"?"
7153
msgstr ""
7154
7155
#: bzrlib/shelf_ui.py:55
7156
#, python-format
7157
msgid "Shelve renaming \"%(other)s\" => \"%(this)s\"?"
7158
msgstr ""
7159
7160
#: bzrlib/shelf_ui.py:70
7161
#, python-format
7162
msgid "Changes shelved with id \"%d\"."
7163
msgstr ""
7164
7165
#: bzrlib/shelf_ui.py:74
7166
msgid "Selected changes destroyed."
7167
msgstr ""
7168
7169
#: bzrlib/shelf_ui.py:78
7170
msgid "Selected changes:"
7171
msgstr ""
7172
7173
#: bzrlib/shelf_ui.py:98
7174
#, python-format
7175
msgid "Delete file \"%(path)s\"?"
7176
msgstr ""
7177
7178
#: bzrlib/shelf_ui.py:99
7179
msgid "Apply binary changes?"
7180
msgstr ""
7181
7182
#: bzrlib/shelf_ui.py:100
7183
#, python-format
7184
msgid "Change \"%(path)s\" from %(this)s to %(other)s?"
7185
msgstr ""
7186
7187
#: bzrlib/shelf_ui.py:102
7188
#, python-format
7189
msgid "Add file \"%(path)s\"?"
7190
msgstr ""
7191
7192
#: bzrlib/shelf_ui.py:103
7193
#, python-format
7194
msgid "Apply %d change(s)?"
7195
msgstr ""
7196
7197
#: bzrlib/shelf_ui.py:104
7198
msgid "Apply change?"
7199
msgstr ""
7200
7201
#: bzrlib/shelf_ui.py:105
7202
#, python-format
7203
msgid "Change target of \"%(path)s\" from \"%(this)s\" to \"%(other)s\"?"
7204
msgstr ""
7205
7206
#: bzrlib/shelf_ui.py:107
7207
#, python-format
7208
msgid "Rename \"%(this)s\" => \"%(other)s\"?"
7209
msgstr ""
7210
7211
#: bzrlib/shelf_ui.py:402
7212
msgid "No changes are shelved."
7213
msgstr ""
7214
7215
#: bzrlib/shelf_ui.py:460
7216
#, python-format
7217
msgid "Using changes with id \"%d\"."
7218
msgstr ""
7219
7220
#: bzrlib/shelf_ui.py:464
7221
#, python-format
7222
msgid "Message: %s"
7223
msgstr ""
7224
7225
#: bzrlib/shelf_ui.py:476
7226
#, python-format
7227
msgid "Deleted changes with id \"%d\"."
7228
msgstr ""
7229
7230
#: bzrlib/smart/medium.py:714
7231
msgid "HPSS calls: {0} ({1} vfs) {2}"
7232
msgstr ""
7233
7234
#: bzrlib/smart/server.py:169
7235
msgid "Requested to stop gracefully"
7236
msgstr ""
7237
7238
#: bzrlib/smart/server.py:179
7239
#, python-format
7240
msgid "Waiting for %d client(s) to finish"
7241
msgstr ""
7242
7243
#: bzrlib/smart/server.py:185
7244
#, python-format
7245
msgid "Still waiting for %d client(s) to finish"
7246
msgstr ""
7247
7248
#: bzrlib/smart/server.py:219
7249
#, python-format
7250
msgid "listening socket error: %s"
7251
msgstr ""
7252
7253
#: bzrlib/smart/server.py:452
7254
#, python-format
7255
msgid "listening on port: %s"
7256
msgstr ""
7257
7258
#: bzrlib/switch.py:69
7259
msgid "Pending merges must be committed or reverted before using switch."
7260
msgstr ""
7261
7262
#: bzrlib/switch.py:96
7263
msgid ""
7264
"Cannot switch as local commits found in the checkout. Commit these to the "
7265
"bound branch or use --force to throw them away."
7266
msgstr ""
7267
7268
#: bzrlib/switch.py:101
7269
#, python-format
7270
msgid ""
7271
"Unable to connect to current master branch %(target)s: %(error)s To switch "
7272
"anyway, use --force."
7273
msgstr ""
7274
7275
#: bzrlib/switch.py:110
7276
msgid "Cannot switch a branch, only a checkout."
7277
msgstr ""
7278
7279
#: bzrlib/switch.py:146
7280
#, python-format
7281
msgid "Tree is up to date at revision %d."
7282
msgstr ""
7283
7284
#: bzrlib/switch.py:152
7285
#, python-format
7286
msgid "Updated to revision %d."
7287
msgstr ""
7288
7289
#: bzrlib/transform.py:1730 bzrlib/transform.py:1741 bzrlib/transform.py:1743
7290
msgid "Apply phase"
7291
msgstr ""
7292
7293
#: bzrlib/transform.py:1769 bzrlib/transform.py:1837
7294
msgid "removing file"
7295
msgstr ""
7296
7297
#: bzrlib/transform.py:1787 bzrlib/transform.py:1872
7298
msgid "adding file"
7299
msgstr ""
7300
7301
#: bzrlib/transform.py:2587
7302
msgid "Building tree"
7303
msgstr ""
7304
7305
#: bzrlib/transform.py:2677 bzrlib/transform.py:2704
7306
msgid "Adding file contents"
7307
msgstr ""
7308
7309
#: bzrlib/transform.py:3024
7310
msgid "Resolution pass"
7311
msgstr ""
7312
7313
#: bzrlib/transport/ftp/_gssapi.py:88
7314
#, python-format
7315
msgid "Authenticated as %s"
7316
msgstr ""
7317
7318
#: bzrlib/tree.py:634
7319
msgid "*** {0} content-filter: {1} => {2!r}"
7320
msgstr ""
7321
7322
#: bzrlib/upgrade.py:77
7323
#, python-format
7324
msgid "This is a checkout. The branch (%s) needs to be upgraded separately."
7325
msgstr ""
7326
7327
#: bzrlib/upgrade.py:100
7328
#, python-format
7329
msgid "cannot upgrade from bzrdir format %s"
7330
msgstr ""
7331
7332
#: bzrlib/upgrade.py:103
7333
#, python-format
7334
msgid "starting upgrade of %s"
7335
msgstr ""
7336
7337
#: bzrlib/upgrade.py:110
7338
msgid "finished"
7339
msgstr ""
7340
7341
#: bzrlib/upgrade.py:120
7342
msgid "Deleting backup.bzr"
7343
msgstr ""
7344
7345
#: bzrlib/upgrade.py:151
7346
msgid ""
7347
"\n"
7348
"SUMMARY: {0} upgrades attempted, {1} succeeded, {2} failed"
7349
msgstr ""
7350
7351
#: bzrlib/upgrade.py:208
7352
#, python-format
7353
msgid "Found %d dependent branches - upgrading ..."
7354
msgstr ""
7355
7356
#: bzrlib/upgrade.py:276
7357
msgid "Upgrading bzrdirs"
7358
msgstr ""
7359
7360
#: bzrlib/upgrade.py:282
7361
#, python-format
7362
msgid "Upgrading %s"
7363
msgstr ""
7364
7365
#: bzrlib/upgrade.py:283
7366
msgid "Upgrading {0} {1} ..."
7367
msgstr ""
7368
7369
#: bzrlib/upgrade.py:301
7370
msgid "Removing backup ..."
7371
msgstr ""
7372
7373
#: bzrlib/upgrade.py:305
7374
msgid "failed to clean-up {0}: {1}"
7375
msgstr ""
7376
7377
#: bzrlib/vf_repository.py:1090
7378
msgid "inventories"
7379
msgstr ""
7380
7381
#: bzrlib/vf_repository.py:1116
7382
msgid "texts"
7383
msgstr ""
7384
7385
#: bzrlib/vf_repository.py:1621 bzrlib/vf_repository.py:1630
7386
msgid "Calculating text parents"
7387
msgstr ""
7388
7389
#: bzrlib/vf_repository.py:1706
7390
msgid "Fetch texts"
7391
msgstr ""
7392
7393
#: bzrlib/vf_repository.py:2535
7394
msgid "loading text store"
7395
msgstr ""
7396
7397
#: bzrlib/vf_repository.py:2541
7398
msgid "checking text graph"
7399
msgstr ""
7400
7401
#: bzrlib/vf_repository.py:2995 bzrlib/vf_repository.py:3009
7402
#: bzrlib/vf_repository.py:3124
7403
msgid "Transferring revisions"
7404
msgstr ""
7405
7406
#: bzrlib/win32utils.py:146
7407
msgid "Failed to GetProcessMemoryInfo()"
7408
msgstr ""
7409
7410
#: bzrlib/win32utils.py:167
7411
msgid "Cannot debug memory on win32 without ctypes or win32process"
7412
msgstr ""
7413
7414
#: bzrlib/win32utils.py:172
7415
msgid "WorkingSize {0:>7}KiB\tPeakWorking {1:>7}KiB\t{2}"
7416
msgstr ""
7417
7418
#: bzrlib/win32utils.py:180
7419
#, python-format
7420
msgid "WorkingSize %8d KiB"
7421
msgstr ""
7422
7423
#: bzrlib/win32utils.py:181
7424
#, python-format
7425
msgid "PeakWorking %8d KiB"
7426
msgstr ""
7427
7428
#: bzrlib/win32utils.py:182
7429
#, python-format
7430
msgid "PagefileUsage %8d KiB"
7431
msgstr ""
7432
7433
#: bzrlib/win32utils.py:183
7434
#, python-format
7435
msgid "PeakPagefileUsage %8d KiB"
7436
msgstr ""
7437
7438
#: bzrlib/win32utils.py:185
7439
#, python-format
7440
msgid "PrivateUsage %8d KiB"
7441
msgstr ""
7442
7443
#: bzrlib/win32utils.py:186
7444
#, python-format
7445
msgid "PageFaultCount %8d"
7446
msgstr ""
7447
7448
#: bzrlib/workingtree.py:1478
7449
msgid "Rerun update after fixing the conflicts."
7450
msgstr ""
7451
7452
#: dummy/help_topics/authentication/summary.txt:1
7453
msgid "Information on configuring authentication"
7454
msgstr ""
7455
7456
#: dummy/help_topics/basic/detail.txt:1
7457
msgid ""
7458
"Bazaar 2.5b5 -- a free distributed version-control tool\n"
7459
"http://bazaar.canonical.com/"
7460
msgstr ""
7461
7462
#: dummy/help_topics/basic/detail.txt:4
7463
msgid ""
7464
"Basic commands:\n"
7465
" bzr init makes this directory a versioned branch\n"
7466
" bzr branch make a copy of another branch"
7467
msgstr ""
7468
7469
#: dummy/help_topics/basic/detail.txt:8
7470
msgid ""
7471
" bzr add make files or directories versioned\n"
7472
" bzr ignore ignore a file or pattern\n"
7473
" bzr mv move or rename a versioned file"
7474
msgstr ""
7475
7476
#: dummy/help_topics/basic/detail.txt:12
7477
msgid ""
7478
" bzr status summarize changes in working copy\n"
7479
" bzr diff show detailed diffs"
7480
msgstr ""
7481
7482
#: dummy/help_topics/basic/detail.txt:15
7483
msgid ""
7484
" bzr merge pull in changes from another branch\n"
7485
" bzr commit save some or all changes\n"
7486
" bzr send send changes via email"
7487
msgstr ""
7488
7489
#: dummy/help_topics/basic/detail.txt:19
7490
msgid ""
7491
" bzr log show history of changes\n"
7492
" bzr check validate storage"
7493
msgstr ""
7494
7495
#: dummy/help_topics/basic/detail.txt:22
7496
msgid ""
7497
" bzr help init more help on e.g. init command\n"
7498
" bzr help commands list all commands\n"
7499
" bzr help topics list all help topics\n"
7500
msgstr ""
7501
7502
#: dummy/help_topics/basic/summary.txt:1
7503
msgid "Basic commands"
7504
msgstr ""
7505
7506
#: dummy/help_topics/branches/detail.txt:1
7507
msgid "Branches"
7508
msgstr ""
7509
7510
#: dummy/help_topics/branches/detail.txt:3
7511
msgid ""
7512
"A branch consists of the state of a project, including all of its\n"
7513
"history. All branches have a repository associated (which is where the\n"
7514
"branch history is stored), but multiple branches may share the same\n"
7515
"repository (a shared repository). Branches can be copied and merged."
7516
msgstr ""
7517
7518
#: dummy/help_topics/branches/detail.txt:8
7519
msgid ""
7520
"In addition, one branch may be bound to another one. Binding to another\n"
7521
"branch indicates that commits which happen in this branch must also \n"
7522
"happen in the other branch. Bazaar ensures consistency by not allowing \n"
7523
"commits when the two branches are out of date. In order for a commit \n"
7524
"to succeed, it may be necessary to update the current branch using \n"
7525
"``bzr update``."
7526
msgstr ""
7527
7528
#: dummy/help_topics/branches/detail.txt:15
7529
#: dummy/help_topics/checkouts/detail.txt:66
7530
#: dummy/help_topics/repositories/detail.txt:36
7531
msgid "Related commands::"
7532
msgstr ""
7533
7534
#: dummy/help_topics/branches/detail.txt:17
7535
msgid ""
7536
" init Change a directory into a versioned branch.\n"
7537
" branch Create a new branch that is a copy of an existing branch.\n"
7538
" merge Perform a three-way merge.\n"
7539
" bind Bind a branch to another one.\n"
7540
msgstr ""
7541
7542
#: dummy/help_topics/branches/summary.txt:1
7543
msgid "Information on what a branch is"
7544
msgstr ""
7545
7546
#: dummy/help_topics/bugs/summary.txt:1
7547
msgid "Bug tracker settings"
7548
msgstr ""
7549
7550
#: dummy/help_topics/checkouts/detail.txt:1
7551
msgid "Checkouts"
7552
msgstr ""
7553
7554
#: dummy/help_topics/checkouts/detail.txt:3
7555
msgid ""
7556
"Checkouts are source trees that are connected to a branch, so that when\n"
7557
"you commit in the source tree, the commit goes into that branch. They\n"
7558
"allow you to use a simpler, more centralized workflow, ignoring some of\n"
7559
"Bazaar's decentralized features until you want them. Using checkouts\n"
7560
"with shared repositories is very similar to working with SVN or CVS, but\n"
7561
"doesn't have the same restrictions. And using checkouts still allows\n"
7562
"others working on the project to use whatever workflow they like."
7563
msgstr ""
7564
7565
#: dummy/help_topics/checkouts/detail.txt:11
7566
msgid ""
7567
"A checkout is created with the bzr checkout command (see \"help "
7568
"checkout\").\n"
7569
"You pass it a reference to another branch, and it will create a local copy\n"
7570
"for you that still contains a reference to the branch you created the\n"
7571
"checkout from (the master branch). Then if you make any commits they will "
7572
"be\n"
7573
"made on the other branch first. This creates an instant mirror of your work, "
7574
"or\n"
7575
"facilitates lockstep development, where each developer is working together,\n"
7576
"continuously integrating the changes of others."
7577
msgstr ""
7578
7579
#: dummy/help_topics/checkouts/detail.txt:19
7580
msgid ""
7581
"However the checkout is still a first class branch in Bazaar terms, so that\n"
7582
"you have the full history locally. As you have a first class branch you "
7583
"can\n"
7584
"also commit locally if you want, for instance due to the temporary loss af "
7585
"a\n"
7586
"network connection. Use the --local option to commit to do this. All the "
7587
"local\n"
7588
"commits will then be made on the master branch the next time you do a non-"
7589
"local\n"
7590
"commit."
7591
msgstr ""
7592
7593
#: dummy/help_topics/checkouts/detail.txt:26
7594
msgid ""
7595
"If you are using a checkout from a shared branch you will periodically want "
7596
"to\n"
7597
"pull in all the changes made by others. This is done using the \"update\"\n"
7598
"command. The changes need to be applied before any non-local commit, but\n"
7599
"Bazaar will tell you if there are any changes and suggest that you use this\n"
7600
"command when needed."
7601
msgstr ""
7602
7603
#: dummy/help_topics/checkouts/detail.txt:32
7604
msgid ""
7605
"It is also possible to create a \"lightweight\" checkout by passing the\n"
7606
"--lightweight flag to checkout. A lightweight checkout is even closer to an\n"
7607
"SVN checkout in that it is not a first class branch, it mainly consists of "
7608
"the\n"
7609
"working tree. This means that any history operations must query the master\n"
7610
"branch, which could be slow if a network connection is involved. Also, as "
7611
"you\n"
7612
"don't have a local branch, then you cannot commit locally."
7613
msgstr ""
7614
7615
#: dummy/help_topics/checkouts/detail.txt:39
7616
msgid ""
7617
"Lightweight checkouts work best when you have fast reliable access to the\n"
7618
"master branch. This means that if the master branch is on the same disk or "
7619
"LAN\n"
7620
"a lightweight checkout will be faster than a heavyweight one for any "
7621
"commands\n"
7622
"that modify the revision history (as only one copy of the branch needs to\n"
7623
"be updated). Heavyweight checkouts will generally be faster for any command\n"
7624
"that uses the history but does not change it, but if the master branch is "
7625
"on\n"
7626
"the same disk then there won't be a noticeable difference."
7627
msgstr ""
7628
7629
#: dummy/help_topics/checkouts/detail.txt:47
7630
msgid ""
7631
"Another possible use for a checkout is to use it with a treeless repository\n"
7632
"containing your branches, where you maintain only one working tree by\n"
7633
"switching the master branch that the checkout points to when you want to\n"
7634
"work on a different branch."
7635
msgstr ""
7636
7637
#: dummy/help_topics/checkouts/detail.txt:52
7638
msgid ""
7639
"Obviously to commit on a checkout you need to be able to write to the "
7640
"master\n"
7641
"branch. This means that the master branch must be accessible over a "
7642
"writeable\n"
7643
"protocol , such as sftp://, and that you have write permissions at the "
7644
"other\n"
7645
"end. Checkouts also work on the local file system, so that all that matters "
7646
"is\n"
7647
"file permissions."
7648
msgstr ""
7649
7650
#: dummy/help_topics/checkouts/detail.txt:58
7651
msgid ""
7652
"You can change the master of a checkout by using the \"switch\" command "
7653
"(see\n"
7654
"\"help switch\"). This will change the location that the commits are sent "
7655
"to.\n"
7656
"The \"bind\" command can also be used to turn a normal branch into a heavy\n"
7657
"checkout. If you would like to convert your heavy checkout into a normal\n"
7658
"branch so that every commit is local, you can use the \"unbind\" command. To "
7659
"see\n"
7660
"whether or not a branch is bound or not you can use the \"info\" command. If "
7661
"the\n"
7662
"branch is bound it will tell you the location of the bound branch."
7663
msgstr ""
7664
7665
#: dummy/help_topics/checkouts/detail.txt:68
7666
msgid ""
7667
" checkout Create a checkout. Pass --lightweight to get a lightweight\n"
7668
" checkout\n"
7669
" update Pull any changes in the master branch in to your checkout\n"
7670
" commit Make a commit that is sent to the master branch. If you have\n"
7671
" a heavy checkout then the --local option will commit to the\n"
7672
" checkout without sending the commit to the master\n"
7673
" switch Change the master branch that the commits in the checkout "
7674
"will\n"
7675
" be sent to\n"
7676
" bind Turn a standalone branch into a heavy checkout so that any\n"
7677
" commits will be sent to the master branch\n"
7678
" unbind Turn a heavy checkout into a standalone branch so that any\n"
7679
" commits are only made locally\n"
7680
" info Displays whether a branch is bound or unbound. If the branch "
7681
"is\n"
7682
" bound, then it will also display the location of the bound "
7683
"branch\n"
7684
msgstr ""
7685
7686
#: dummy/help_topics/checkouts/summary.txt:1
7687
msgid "Information on what a checkout is"
7688
msgstr ""
7689
7690
#: dummy/help_topics/commands/summary.txt:1
7691
msgid "Basic help for all commands"
7692
msgstr ""
7693
7694
#: dummy/help_topics/configuration/summary.txt:1
7695
msgid "Details on the configuration settings available"
7696
msgstr ""
7697
7698
#: dummy/help_topics/conflict-types/summary.txt:1
7699
msgid "Types of conflicts and what to do about them"
7700
msgstr ""
7701
7702
#: dummy/help_topics/content-filters/summary.txt:1
7703
msgid "Conversion of content into/from working trees"
7704
msgstr ""
7705
7706
#: dummy/help_topics/criss-cross/detail.txt:1
7707
msgid "Criss-Cross"
7708
msgstr ""
7709
7710
#: dummy/help_topics/criss-cross/detail.txt:3
7711
msgid ""
7712
"A criss-cross in the branch history can cause the default merge technique\n"
7713
"to emit more conflicts than would normally be expected."
7714
msgstr ""
7715
7716
#: dummy/help_topics/criss-cross/detail.txt:6
7717
msgid ""
7718
"In complex merge cases, ``bzr merge --lca`` or ``bzr merge --weave`` may "
7719
"give\n"
7720
"better results. You may wish to ``bzr revert`` the working tree and merge\n"
7721
"again. Alternatively, use ``bzr remerge`` on particular conflicted files."
7722
msgstr ""
7723
7724
#: dummy/help_topics/criss-cross/detail.txt:10
7725
msgid ""
7726
"Criss-crosses occur in a branch's history if two branches merge the same "
7727
"thing\n"
7728
"and then merge one another, or if two branches merge one another at the "
7729
"same\n"
7730
"time. They can be avoided by having each branch only merge from or into a\n"
7731
"designated central branch (a \"star topology\")."
7732
msgstr ""
7733
7734
#: dummy/help_topics/criss-cross/detail.txt:15
7735
msgid ""
7736
"Criss-crosses cause problems because of the way merge works. Bazaar's "
7737
"default\n"
7738
"merge is a three-way merger; in order to merge OTHER into THIS, it must\n"
7739
"find a basis for comparison, BASE. Using BASE, it can determine whether\n"
7740
"differences between THIS and OTHER are due to one side adding lines, or\n"
7741
"from another side removing lines."
7742
msgstr ""
7743
7744
#: dummy/help_topics/criss-cross/detail.txt:21
7745
msgid ""
7746
"Criss-crosses mean there is no good choice for a base. Selecting the "
7747
"recent\n"
7748
"merge points could cause one side's changes to be silently discarded.\n"
7749
"Selecting older merge points (which Bazaar does) mean that extra conflicts\n"
7750
"are emitted."
7751
msgstr ""
7752
7753
#: dummy/help_topics/criss-cross/detail.txt:26
7754
msgid ""
7755
"The ``weave`` merge type is not affected by this problem because it uses\n"
7756
"line-origin detection instead of a basis revision to determine the cause of\n"
7757
"differences.\n"
7758
msgstr ""
7759
7760
#: dummy/help_topics/criss-cross/summary.txt:1
7761
msgid "Information on criss-cross merging"
7762
msgstr ""
7763
7764
#: dummy/help_topics/current-formats/summary.txt:1
7765
msgid "Current storage formats"
7766
msgstr ""
7767
7768
#: dummy/help_topics/debug-flags/summary.txt:1
7769
msgid "Options to show or record debug information"
7770
msgstr ""
7771
7772
#: dummy/help_topics/diverged-branches/summary.txt:1
7773
msgid "How to fix diverged branches"
7774
msgstr ""
7775
7776
#: dummy/help_topics/env-variables/detail.txt:1
7777
msgid "Environment Variables"
7778
msgstr ""
7779
7780
#: dummy/help_topics/env-variables/detail.txt:3
7781
msgid ""
7782
"=================== "
7783
"===========================================================\n"
7784
"BZRPATH Path where bzr is to look for shell plugin external\n"
7785
" commands.\n"
7786
"BZR_EMAIL E-Mail address of the user. Overrides EMAIL.\n"
7787
"EMAIL E-Mail address of the user.\n"
7788
"BZR_EDITOR Editor for editing commit messages. Overrides EDITOR.\n"
7789
"EDITOR Editor for editing commit messages.\n"
7790
"BZR_PLUGIN_PATH Paths where bzr should look for plugins.\n"
7791
"BZR_DISABLE_PLUGINS Plugins that bzr should not load.\n"
7792
"BZR_PLUGINS_AT Plugins to load from a directory not in "
7793
"BZR_PLUGIN_PATH.\n"
7794
"BZR_HOME Directory holding .bazaar config dir. Overrides HOME.\n"
7795
"BZR_HOME (Win32) Directory holding bazaar config dir. Overrides APPDATA "
7796
"and\n"
7797
" HOME.\n"
7798
"BZR_REMOTE_PATH Full name of remote 'bzr' command (for bzr+ssh:// "
7799
"URLs).\n"
7800
"BZR_SSH Path to SSH client, or one of paramiko, openssh, "
7801
"sshcorp,\n"
7802
" plink or lsh.\n"
7803
"BZR_LOG Location of .bzr.log (use '/dev/null' to suppress log).\n"
7804
"BZR_LOG (Win32) Location of .bzr.log (use 'NUL' to suppress log).\n"
7805
"BZR_COLUMNS Override implicit terminal width.\n"
7806
"BZR_CONCURRENCY Number of processes that can be run concurrently "
7807
"(selftest)\n"
7808
"BZR_PROGRESS_BAR Override the progress display. Values are 'none' or "
7809
"'text'.\n"
7810
"BZR_PDB Control whether to launch a debugger on error.\n"
7811
"BZR_SIGQUIT_PDB Control whether SIGQUIT behaves normally or invokes a\n"
7812
" breakin debugger.\n"
7813
"BZR_TEXTUI_INPUT Force console input mode for prompts to line-based "
7814
"(instead\n"
7815
" of char-based).\n"
7816
"=================== "
7817
"===========================================================\n"
7818
msgstr ""
7819
7820
#: dummy/help_topics/env-variables/summary.txt:1
7821
msgid "Environment variable names and values"
7822
msgstr ""
7823
7824
#: dummy/help_topics/eol/summary.txt:1
7825
msgid "Information on end-of-line handling"
7826
msgstr ""
7827
7828
#: dummy/help_topics/files/detail.txt:1
7829
msgid "Files"
7830
msgstr ""
7831
7832
#: dummy/help_topics/files/detail.txt:3
7833
msgid ""
7834
":On Unix: ~/.bazaar/bazaar.conf\n"
7835
":On Windows: C:\\\\Documents and Settings\\\\username\\\\Application Data\\\\"
7836
"bazaar\\\\2.0\\\\bazaar.conf"
7837
msgstr ""
7838
7839
#: dummy/help_topics/files/detail.txt:6
7840
msgid ""
7841
"Contains the user's default configuration. The section ``[DEFAULT]`` is\n"
7842
"used to define general configuration that will be applied everywhere.\n"
7843
"The section ``[ALIASES]`` can be used to create command aliases for\n"
7844
"commonly used options."
7845
msgstr ""
7846
7847
#: dummy/help_topics/files/detail.txt:11
7848
msgid "A typical config file might look something like::"
7849
msgstr ""
7850
7851
#: dummy/help_topics/files/detail.txt:13
7852
msgid ""
7853
" [DEFAULT]\n"
7854
" email=John Doe <jdoe@isp.com>"
7855
msgstr ""
7856
7857
#: dummy/help_topics/files/detail.txt:16
7858
msgid ""
7859
" [ALIASES]\n"
7860
" commit = commit --strict\n"
7861
" log10 = log --short -r -10..-1\n"
7862
msgstr ""
7863
7864
#: dummy/help_topics/files/summary.txt:1
7865
msgid "Information on configuration and log files"
7866
msgstr ""
7867
7868
#: dummy/help_topics/formats/detail.txt:1
7869
msgid "Storage Formats"
7870
msgstr ""
7871
7872
#: dummy/help_topics/formats/detail.txt:3
7873
msgid ""
7874
"To ensure that older clients do not access data incorrectly,\n"
7875
"Bazaar's policy is to introduce a new storage format whenever\n"
7876
"new features requiring new metadata are added. New storage\n"
7877
"formats may also be introduced to improve performance and\n"
7878
"scalability."
7879
msgstr ""
7880
7881
#: dummy/help_topics/formats/detail.txt:9
7882
msgid ""
7883
"The newest format, 2a, is highly recommended. If your\n"
7884
"project is not using 2a, then you should suggest to the\n"
7885
"project owner to upgrade."
7886
msgstr ""
7887
7888
#: dummy/help_topics/formats/detail.txt:13
7889
msgid ""
7890
"\n"
7891
".. note::"
7892
msgstr ""
7893
7894
#: dummy/help_topics/formats/detail.txt:16
7895
msgid ""
7896
" Some of the older formats have two variants:\n"
7897
" a plain one and a rich-root one. The latter include an additional\n"
7898
" field about the root of the tree. There is no performance cost\n"
7899
" for using a rich-root format but you cannot easily merge changes\n"
7900
" from a rich-root format into a plain format. As a consequence,\n"
7901
" moving a project to a rich-root format takes some co-ordination\n"
7902
" in that all contributors need to upgrade their repositories\n"
7903
" around the same time. 2a and all future formats will be\n"
7904
" implicitly rich-root."
7905
msgstr ""
7906
7907
#: dummy/help_topics/formats/detail.txt:26
7908
msgid ""
7909
"See :doc:`current-formats-help` for the complete list of\n"
7910
"currently supported formats. See :doc:`other-formats-help` for\n"
7911
"descriptions of any available experimental and deprecated formats.\n"
7912
msgstr ""
7913
7914
#: dummy/help_topics/formats/summary.txt:1
7915
msgid "Information on choosing a storage format"
7916
msgstr ""
7917
7918
#: dummy/help_topics/global-options/detail.txt:1
7919
msgid "Global Options"
7920
msgstr ""
7921
7922
#: dummy/help_topics/global-options/detail.txt:3
7923
msgid ""
7924
"These options may be used with any command, and may appear in front of any\n"
7925
"command. (e.g. ``bzr --profile help``)."
7926
msgstr ""
7927
7928
#: dummy/help_topics/global-options/detail.txt:6
7929
msgid ""
7930
"--version Print the version number. Must be supplied before the "
7931
"command.\n"
7932
"--no-aliases Do not process command aliases when running this command.\n"
7933
"--builtin Use the built-in version of a command, not the plugin "
7934
"version.\n"
7935
" This does not suppress other plugin effects.\n"
7936
"--no-plugins Do not process any plugins.\n"
7937
"--no-l10n Do not translate messages.\n"
7938
"--concurrency Number of processes that can be run concurrently (selftest)."
7939
msgstr ""
7940
7941
#: dummy/help_topics/global-options/detail.txt:14
7942
msgid ""
7943
"--profile Profile execution using the hotshot profiler.\n"
7944
"--lsprof Profile execution using the lsprof profiler.\n"
7945
"--lsprof-file Profile execution using the lsprof profiler, and write the\n"
7946
" results to a specified file. If the filename ends with "
7947
"\".txt\",\n"
7948
" text format will be used. If the filename either starts "
7949
"with\n"
7950
" \"callgrind.out\" or end with \".callgrind\", the output will "
7951
"be\n"
7952
" formatted for use with KCacheGrind. Otherwise, the output\n"
7953
" will be a pickle.\n"
7954
"--coverage Generate line coverage report in the specified directory."
7955
msgstr ""
7956
7957
#: dummy/help_topics/global-options/detail.txt:24
7958
msgid ""
7959
"-Oname=value Override the ``name`` config option setting it to ``value`` "
7960
"for\n"
7961
" the duration of the command. This can be used multiple times "
7962
"if\n"
7963
" several options need to be overridden."
7964
msgstr ""
7965
7966
#: dummy/help_topics/global-options/detail.txt:28
7967
msgid ""
7968
"See http://doc.bazaar.canonical.com/developers/profiling.html for more\n"
7969
"information on profiling."
7970
msgstr ""
7971
7972
#: dummy/help_topics/global-options/detail.txt:31
7973
msgid ""
7974
"A number of debug flags are also available to assist troubleshooting and\n"
7975
"development. See :doc:`debug-flags-help`.\n"
7976
msgstr ""
7977
7978
#: dummy/help_topics/global-options/summary.txt:1
7979
msgid "Options that control how Bazaar runs"
7980
msgstr ""
7981
7982
#: dummy/help_topics/hidden-commands/summary.txt:1
7983
msgid "All hidden commands"
7984
msgstr ""
7985
7986
#: dummy/help_topics/hooks/summary.txt:1
7987
msgid "Points at which custom processing can be added"
7988
msgstr ""
7989
7990
#: dummy/help_topics/launchpad/detail.txt:1
7991
msgid "Integration with Launchpad.net"
7992
msgstr ""
7993
7994
#: dummy/help_topics/launchpad/detail.txt:3
7995
msgid ""
7996
"Launchpad.net provides free Bazaar branch hosting with integrated bug and\n"
7997
"specification tracking."
7998
msgstr ""
7999
8000
#: dummy/help_topics/launchpad/detail.txt:6
8001
msgid ""
8002
"The bzr client (through the plugin called 'launchpad') has special\n"
8003
"features to communicate with Launchpad:"
8004
msgstr ""
8005
8006
#: dummy/help_topics/launchpad/detail.txt:9
8007
msgid ""
8008
" * The launchpad-login command tells Bazaar your Launchpad user name. "
8009
"This\n"
8010
" is then used by the 'lp:' transport to download your branches using\n"
8011
" bzr+ssh://."
8012
msgstr ""
8013
8014
#: dummy/help_topics/launchpad/detail.txt:13
8015
msgid ""
8016
" * The 'lp:' transport uses Launchpad as a directory service: for "
8017
"example\n"
8018
" 'lp:bzr' and 'lp:python' refer to the main branches of the relevant\n"
8019
" projects and may be branched, logged, etc. You can also use the 'lp:'\n"
8020
" transport to refer to specific branches, e.g. lp:~bzr/bzr/trunk."
8021
msgstr ""
8022
8023
#: dummy/help_topics/launchpad/detail.txt:18
8024
msgid ""
8025
" * The 'lp:' bug tracker alias can expand launchpad bug numbers to their\n"
8026
" URLs for use with 'bzr commit --fixes', e.g. 'bzr commit --fixes "
8027
"lp:12345'\n"
8028
" will record a revision property that marks that revision as fixing\n"
8029
" Launchpad bug 12345. When you push that branch to Launchpad it will\n"
8030
" automatically be linked to the bug report."
8031
msgstr ""
8032
8033
#: dummy/help_topics/launchpad/detail.txt:24
8034
msgid ""
8035
" * The register-branch command tells Launchpad about the url of a\n"
8036
" public branch. Launchpad will then mirror the branch, display\n"
8037
" its contents and allow it to be attached to bugs and other\n"
8038
" objects."
8039
msgstr ""
8040
8041
#: dummy/help_topics/launchpad/detail.txt:29
8042
msgid "For more information see http://help.launchpad.net/\n"
8043
msgstr ""
8044
8045
#: dummy/help_topics/launchpad/summary.txt:1
8046
msgid "Using Bazaar with Launchpad.net"
8047
msgstr ""
8048
8049
#: dummy/help_topics/location-alias/summary.txt:1
8050
msgid "Aliases for remembered locations"
8051
msgstr ""
8052
8053
#: dummy/help_topics/log-formats/summary.txt:1
8054
msgid "Details on the logging formats available"
8055
msgstr ""
8056
8057
#: dummy/help_topics/other-formats/summary.txt:1
8058
msgid "Experimental and deprecated storage formats"
8059
msgstr ""
8060
8061
#: dummy/help_topics/patterns/summary.txt:1
8062
msgid "Information on the pattern syntax"
8063
msgstr ""
8064
8065
#: dummy/help_topics/repositories/detail.txt:1
8066
msgid "Repositories"
8067
msgstr ""
8068
8069
#: dummy/help_topics/repositories/detail.txt:3
8070
msgid ""
8071
"Repositories in Bazaar are where committed information is stored. There is\n"
8072
"a repository associated with every branch."
8073
msgstr ""
8074
8075
#: dummy/help_topics/repositories/detail.txt:6
8076
msgid ""
8077
"Repositories are a form of database. Bzr will usually maintain this for\n"
8078
"good performance automatically, but in some situations (e.g. when doing\n"
8079
"very many commits in a short time period) you may want to ask bzr to\n"
8080
"optimise the database indices. This can be done by the 'bzr pack' command."
8081
msgstr ""
8082
8083
#: dummy/help_topics/repositories/detail.txt:11
8084
msgid ""
8085
"By default just running 'bzr init' will create a repository within the new\n"
8086
"branch but it is possible to create a shared repository which allows "
8087
"multiple\n"
8088
"branches to share their information in the same location. When a new branch "
8089
"is\n"
8090
"created it will first look to see if there is a containing shared repository "
8091
"it\n"
8092
"can use."
8093
msgstr ""
8094
8095
#: dummy/help_topics/repositories/detail.txt:17
8096
msgid ""
8097
"When two branches of the same project share a repository, there is\n"
8098
"generally a large space saving. For some operations (e.g. branching\n"
8099
"within the repository) this translates in to a large time saving."
8100
msgstr ""
8101
8102
#: dummy/help_topics/repositories/detail.txt:21
8103
msgid ""
8104
"To create a shared repository use the init-repository command (or the alias\n"
8105
"init-repo). This command takes the location of the repository to create. "
8106
"This\n"
8107
"means that 'bzr init-repository repo' will create a directory named 'repo',\n"
8108
"which contains a shared repository. Any new branches that are created in "
8109
"this\n"
8110
"directory will then use it for storage."
8111
msgstr ""
8112
8113
#: dummy/help_topics/repositories/detail.txt:27
8114
msgid ""
8115
"It is a good idea to create a repository whenever you might create more\n"
8116
"than one branch of a project. This is true for both working areas where you\n"
8117
"are doing the development, and any server areas that you use for hosting\n"
8118
"projects. In the latter case, it is common to want branches without working\n"
8119
"trees. Since the files in the branch will not be edited directly there is "
8120
"no\n"
8121
"need to use up disk space for a working tree. To create a repository in "
8122
"which\n"
8123
"the branches will not have working trees pass the '--no-trees' option to\n"
8124
"'init-repository'."
8125
msgstr ""
8126
8127
#: dummy/help_topics/repositories/detail.txt:38
8128
msgid ""
8129
" init-repository Create a shared repository. Use --no-trees to create "
8130
"one\n"
8131
" in which new branches won't get a working tree.\n"
8132
msgstr ""
8133
8134
#: dummy/help_topics/repositories/summary.txt:1
8135
msgid "Basic information on shared repositories."
8136
msgstr ""
8137
8138
#: dummy/help_topics/revisionspec/summary.txt:1
8139
msgid "Explain how to use --revision"
8140
msgstr ""
8141
8142
#: dummy/help_topics/rules/summary.txt:1
8143
msgid "Information on defining rule-based preferences"
8144
msgstr ""
8145
8146
#: dummy/help_topics/standalone-trees/detail.txt:1
8147
msgid "Standalone Trees"
8148
msgstr ""
8149
8150
#: dummy/help_topics/standalone-trees/detail.txt:3
8151
msgid ""
8152
"A standalone tree is a working tree with an associated repository. It\n"
8153
"is an independently usable branch, with no dependencies on any other.\n"
8154
"Creating a standalone tree (via bzr init) is the quickest way to put\n"
8155
"an existing project under version control."
8156
msgstr ""
8157
8158
#: dummy/help_topics/standalone-trees/detail.txt:8
8159
msgid "Related Commands::"
8160
msgstr ""
8161
8162
#: dummy/help_topics/standalone-trees/detail.txt:10
8163
msgid " init Make a directory into a versioned branch.\n"
8164
msgstr ""
8165
8166
#: dummy/help_topics/standalone-trees/summary.txt:1
8167
msgid "Information on what a standalone tree is"
8168
msgstr ""
8169
8170
#: dummy/help_topics/standard-options/detail.txt:1
8171
msgid "Standard Options"
8172
msgstr ""
8173
8174
#: dummy/help_topics/standard-options/detail.txt:3
8175
msgid "Standard options are legal for all commands."
8176
msgstr ""
8177
8178
#: dummy/help_topics/standard-options/detail.txt:5
8179
msgid ""
8180
"--help, -h Show help message.\n"
8181
"--verbose, -v Display more information.\n"
8182
"--quiet, -q Only display errors and warnings."
8183
msgstr ""
8184
8185
#: dummy/help_topics/standard-options/detail.txt:9
8186
msgid "Unlike global options, standard options can be used in aliases.\n"
8187
msgstr ""
8188
8189
#: dummy/help_topics/standard-options/summary.txt:1
8190
msgid "Options that can be used with any command"
8191
msgstr ""
8192
8193
#: dummy/help_topics/status-flags/detail.txt:1
8194
msgid "Status Flags"
8195
msgstr ""
8196
8197
#: dummy/help_topics/status-flags/detail.txt:3
8198
msgid ""
8199
"Status flags are used to summarise changes to the working tree in a concise\n"
8200
"manner. They are in the form::"
8201
msgstr ""
8202
8203
#: dummy/help_topics/status-flags/detail.txt:6
8204
msgid " xxx <filename>"
8205
msgstr ""
8206
8207
#: dummy/help_topics/status-flags/detail.txt:8
8208
msgid "where the columns' meanings are as follows."
8209
msgstr ""
8210
8211
#: dummy/help_topics/status-flags/detail.txt:10
8212
msgid "Column 1 - versioning/renames::"
8213
msgstr ""
8214
8215
#: dummy/help_topics/status-flags/detail.txt:12
8216
msgid ""
8217
" + File versioned\n"
8218
" - File unversioned\n"
8219
" R File renamed\n"
8220
" ? File unknown\n"
8221
" X File nonexistent (and unknown to bzr)\n"
8222
" C File has conflicts\n"
8223
" P Entry for a pending merge (not a file)"
8224
msgstr ""
8225
8226
#: dummy/help_topics/status-flags/detail.txt:20
8227
msgid "Column 2 - contents::"
8228
msgstr ""
8229
8230
#: dummy/help_topics/status-flags/detail.txt:22
8231
msgid ""
8232
" N File created\n"
8233
" D File deleted\n"
8234
" K File kind changed\n"
8235
" M File modified"
8236
msgstr ""
8237
8238
#: dummy/help_topics/status-flags/detail.txt:27
8239
msgid "Column 3 - execute::"
8240
msgstr ""
8241
8242
#: dummy/help_topics/status-flags/detail.txt:29
8243
msgid " * The execute bit was changed\n"
8244
msgstr ""
8245
8246
#: dummy/help_topics/status-flags/summary.txt:1
8247
msgid "Help on status flags"
8248
msgstr ""
8249
8250
#: dummy/help_topics/sync-for-reconfigure/detail.txt:1
8251
msgid "Branches Out of Sync"
8252
msgstr ""
8253
8254
#: dummy/help_topics/sync-for-reconfigure/detail.txt:3
8255
msgid ""
8256
"When reconfiguring a checkout, tree or branch into a lightweight checkout,\n"
8257
"a local branch must be destroyed. (For checkouts, this is the local branch\n"
8258
"that serves primarily as a cache.) If the branch-to-be-destroyed does not\n"
8259
"have the same last revision as the new reference branch for the lightweight\n"
8260
"checkout, data could be lost, so Bazaar refuses."
8261
msgstr ""
8262
8263
#: dummy/help_topics/sync-for-reconfigure/detail.txt:9
8264
msgid "How you deal with this depends on *why* the branches are out of sync."
8265
msgstr ""
8266
8267
#: dummy/help_topics/sync-for-reconfigure/detail.txt:11
8268
msgid ""
8269
"If you have a checkout and have done local commits, you can get back in "
8270
"sync\n"
8271
"by running \"bzr update\" (and possibly \"bzr commit\")."
8272
msgstr ""
8273
8274
#: dummy/help_topics/sync-for-reconfigure/detail.txt:14
8275
msgid ""
8276
"If you have a branch and the remote branch is out-of-date, you can push\n"
8277
"the local changes using \"bzr push\". If the local branch is out of date, "
8278
"you\n"
8279
"can do \"bzr pull\". If both branches have had changes, you can merge, "
8280
"commit\n"
8281
"and then push your changes. If you decide that some of the changes aren't\n"
8282
"useful, you can \"push --overwrite\" or \"pull --overwrite\" instead.\n"
8283
msgstr ""
8284
8285
#: dummy/help_topics/sync-for-reconfigure/summary.txt:1
8286
msgid "Steps to resolve \"out-of-sync\" when reconfiguring"
8287
msgstr ""
8288
8289
#: dummy/help_topics/topics/summary.txt:1
8290
msgid "Topics list"
8291
msgstr ""
8292
8293
#: dummy/help_topics/url-special-chars/summary.txt:1
8294
msgid "Special character handling in URLs"
8295
msgstr ""
8296
8297
#: dummy/help_topics/urlspec/summary.txt:1
8298
msgid "Supported transport protocols"
8299
msgstr ""
8300
8301
#: dummy/help_topics/working-trees/detail.txt:1
8302
msgid "Working Trees"
8303
msgstr ""
8304
8305
#: dummy/help_topics/working-trees/detail.txt:3
8306
msgid ""
8307
"A working tree is the contents of a branch placed on disk so that you can\n"
8308
"see the files and edit them. The working tree is where you make changes to "
8309
"a\n"
8310
"branch, and when you commit the current state of the working tree is the\n"
8311
"snapshot that is recorded in the commit."
8312
msgstr ""
8313
8314
#: dummy/help_topics/working-trees/detail.txt:8
8315
msgid ""
8316
"When you push a branch to a remote system, a working tree will not be\n"
8317
"created. If one is already present the files will not be updated. The\n"
8318
"branch information will be updated and the working tree will be marked\n"
8319
"as out-of-date. Updating a working tree remotely is difficult, as there\n"
8320
"may be uncommitted changes or the update may cause content conflicts that "
8321
"are\n"
8322
"difficult to deal with remotely."
8323
msgstr ""
8324
8325
#: dummy/help_topics/working-trees/detail.txt:15
8326
msgid ""
8327
"If you have a branch with no working tree you can use the 'checkout' "
8328
"command\n"
8329
"to create a working tree. If you run 'bzr checkout .' from the branch it "
8330
"will\n"
8331
"create the working tree. If the branch is updated remotely, you can update "
8332
"the\n"
8333
"working tree by running 'bzr update' in that directory."
8334
msgstr ""
8335
8336
#: dummy/help_topics/working-trees/detail.txt:20
8337
msgid ""
8338
"If you have a branch with a working tree that you do not want the 'remove-"
8339
"tree'\n"
8340
"command will remove the tree if it is safe. This can be done to avoid the\n"
8341
"warning about the remote working tree not being updated when pushing to the\n"
8342
"branch. It can also be useful when working with a '--no-trees' repository\n"
8343
"(see 'bzr help repositories')."
8344
msgstr ""
8345
8346
#: dummy/help_topics/working-trees/detail.txt:26
8347
msgid ""
8348
"If you want to have a working tree on a remote machine that you push to you\n"
8349
"can either run 'bzr update' in the remote branch after each push, or use "
8350
"some\n"
8351
"other method to update the tree during the push. There is an 'rspush' "
8352
"plugin\n"
8353
"that will update the working tree using rsync as well as doing a push. "
8354
"There\n"
8355
"is also a 'push-and-update' plugin that automates running 'bzr update' via "
8356
"SSH\n"
8357
"after each push."
8358
msgstr ""
8359
8360
#: dummy/help_topics/working-trees/detail.txt:33
8361
msgid "Useful commands::"
8362
msgstr ""
8363
8364
#: dummy/help_topics/working-trees/detail.txt:35
8365
msgid ""
8366
" checkout Create a working tree when a branch does not have one.\n"
8367
" remove-tree Removes the working tree from a branch when it is safe to do "
8368
"so.\n"
8369
" update When a working tree is out of sync with its associated "
8370
"branch\n"
8371
" this will update the tree to match the branch.\n"
8372
msgstr ""
8373
8374
#: dummy/help_topics/working-trees/summary.txt:1
8375
msgid "Information on working trees"
8376
msgstr ""
8377
8378
#: en/help_topics/authentication.txt:1
8379
msgid ""
8380
"Authentication Settings\n"
8381
"======================="
8382
msgstr ""
8383
8384
#: en/help_topics/authentication.txt:4
8385
msgid ""
8386
"\n"
8387
"Intent\n"
8388
"------"
8389
msgstr ""
8390
8391
#: en/help_topics/authentication.txt:8
8392
msgid ""
8393
"Many different authentication policies can be described in the\n"
8394
"``authentication.conf`` file but a particular user should need only a few\n"
8395
"definitions to cover his needs without having to specify a user and a "
8396
"password\n"
8397
"for every branch he uses."
8398
msgstr ""
8399
8400
#: en/help_topics/authentication.txt:13
8401
msgid ""
8402
"The definitions found in this file are used to find the credentials to use "
8403
"for\n"
8404
"a given url. The same credentials can generally be used for as many branches "
8405
"as\n"
8406
"possible by grouping their declaration around the remote servers that need\n"
8407
"them. It's even possible to declare credentials that will be used by "
8408
"different\n"
8409
"servers."
8410
msgstr ""
8411
8412
#: en/help_topics/authentication.txt:19
8413
msgid ""
8414
"The intent is to make this file as small as possible to minimize maintenance."
8415
msgstr ""
8416
8417
#: en/help_topics/authentication.txt:21
8418
msgid ""
8419
"Once the relevant credentials are declared in this file you may use branch "
8420
"urls\n"
8421
"without embedding passwords (security hazard) or even users (enabling "
8422
"sharing\n"
8423
"of your urls with others)."
8424
msgstr ""
8425
8426
#: en/help_topics/authentication.txt:25
8427
msgid "Instead of using::"
8428
msgstr ""
8429
8430
#: en/help_topics/authentication.txt:27
8431
msgid " bzr branch ftp://joe:secret@host.com/path/to/my/branch"
8432
msgstr ""
8433
8434
#: en/help_topics/authentication.txt:29
8435
msgid "you simply use::"
8436
msgstr ""
8437
8438
#: en/help_topics/authentication.txt:31
8439
msgid " bzr branch ftp://host.com/path/to/my/branch"
8440
msgstr ""
8441
8442
#: en/help_topics/authentication.txt:33
8443
msgid ""
8444
"provided you have created the following ``authentication.conf`` file::"
8445
msgstr ""
8446
8447
#: en/help_topics/authentication.txt:35
8448
msgid ""
8449
" [myprojects]\n"
8450
" scheme=ftp\n"
8451
" host=host.com\n"
8452
" user=joe\n"
8453
" password=secret\n"
8454
" "
8455
msgstr ""
8456
8457
#: en/help_topics/authentication.txt:42
8458
msgid ""
8459
"Authentication definitions\n"
8460
"--------------------------"
8461
msgstr ""
8462
8463
#: en/help_topics/authentication.txt:45
8464
msgid ""
8465
"There are two kinds of authentication used by the various schemes supported "
8466
"by\n"
8467
"bzr:"
8468
msgstr ""
8469
8470
#: en/help_topics/authentication.txt:48
8471
msgid "1. user and password"
8472
msgstr ""
8473
8474
#: en/help_topics/authentication.txt:50
8475
msgid ""
8476
"``FTP`` needs a (``user``, ``password``) to authenticate against a ``host``\n"
8477
"``SFTP`` can use either a password or a host key to authenticate. However,\n"
8478
"ssh agents are a better, more secure solution. So we have chosen to not "
8479
"provide\n"
8480
"our own less secure method."
8481
msgstr ""
8482
8483
#: en/help_topics/authentication.txt:55
8484
msgid "2. user, realm and password"
8485
msgstr ""
8486
8487
#: en/help_topics/authentication.txt:57
8488
msgid ""
8489
"``HTTP`` and ``HTTPS`` needs a (``user, realm, password``) to authenticate\n"
8490
"against a host. But, by using ``.htaccess`` files, for example, it is "
8491
"possible\n"
8492
"to define several (``user, realm, password``) for a given ``host``. So what "
8493
"is\n"
8494
"really needed is (``user``, ``password``, ``host``, ``path``). The ``realm`` "
8495
"is\n"
8496
"not taken into account in the definitions, but will displayed if bzr "
8497
"prompts\n"
8498
"you for a password."
8499
msgstr ""
8500
8501
#: en/help_topics/authentication.txt:64
8502
msgid ""
8503
"``HTTP proxy`` can be handled as ``HTTP`` (or ``HTTPS``) by explicitly\n"
8504
"specifying the appropriate port."
8505
msgstr ""
8506
8507
#: en/help_topics/authentication.txt:67
8508
msgid ""
8509
"To take all schemes into account, the password will be deduced from a set "
8510
"of\n"
8511
"authentication definitions (``scheme``, ``host``, ``port``, ``path``, "
8512
"``user``,\n"
8513
"``password``)."
8514
msgstr ""
8515
8516
#: en/help_topics/authentication.txt:71
8517
msgid ""
8518
" * ``scheme``: can be empty (meaning the rest of the definition can be "
8519
"used\n"
8520
" for any scheme), ``SFTP`` and ``bzr+ssh`` should not be used here, "
8521
"``ssh``\n"
8522
" should be used instead since this is the real scheme regarding\n"
8523
" authentication,"
8524
msgstr ""
8525
8526
#: en/help_topics/authentication.txt:76
8527
msgid " * ``host``: can be empty (to act as a default for any host),"
8528
msgstr ""
8529
8530
#: en/help_topics/authentication.txt:78
8531
msgid ""
8532
" * ``port`` can be empty (useful when an host provides several servers for "
8533
"the\n"
8534
" same scheme), only numerical values are allowed, this should be used "
8535
"only\n"
8536
" when the server uses a port different than the scheme standard port,"
8537
msgstr ""
8538
8539
#: en/help_topics/authentication.txt:82
8540
msgid " * ``path``: can be empty (FTP or SFTP will never user it),"
8541
msgstr ""
8542
8543
#: en/help_topics/authentication.txt:84
8544
msgid ""
8545
" * ``user``: can be empty (``bzr`` will defaults to python's\n"
8546
" ``getpass.get_user()``),"
8547
msgstr ""
8548
8549
#: en/help_topics/authentication.txt:87
8550
msgid ""
8551
" * ``password``: can be empty if you prefer to always be prompted for your\n"
8552
" password."
8553
msgstr ""
8554
8555
#: en/help_topics/authentication.txt:90
8556
msgid ""
8557
"Multiple definitions can be provided and, for a given URL, bzr will select "
8558
"a\n"
8559
"(``user`` [, ``password``]) based on the following rules :"
8560
msgstr ""
8561
8562
#: en/help_topics/authentication.txt:93
8563
msgid " 1. the first match wins,"
8564
msgstr ""
8565
8566
#: en/help_topics/authentication.txt:95
8567
msgid " 2. empty fields match everything,"
8568
msgstr ""
8569
8570
#: en/help_topics/authentication.txt:97
8571
msgid ""
8572
" 3. ``scheme`` matches even if decorators are used in the requested URL,"
8573
msgstr ""
8574
8575
#: en/help_topics/authentication.txt:99
8576
msgid ""
8577
" 4. ``host`` matches exactly or act as a domain if it starts with '.'\n"
8578
" (``project.bzr.sf.net`` will match ``.bzr.sf.net`` but "
8579
"``projectbzr.sf.net``\n"
8580
" will not match ``bzr.sf.net``)."
8581
msgstr ""
8582
8583
#: en/help_topics/authentication.txt:103
8584
msgid ""
8585
" 5. ``port`` matches if included in the requested URL (exact matches only)"
8586
msgstr ""
8587
8588
#: en/help_topics/authentication.txt:105
8589
msgid ""
8590
" 6. ``path`` matches if included in the requested URL (and by rule #2 "
8591
"above,\n"
8592
" empty paths will match any provided path)."
8593
msgstr ""
8594
8595
#: en/help_topics/authentication.txt:110
8596
msgid ""
8597
"File format\n"
8598
"-----------"
8599
msgstr ""
8600
8601
#: en/help_topics/authentication.txt:113
8602
msgid ""
8603
"The general rules for :doc:`configuration files <configuration-help>`\n"
8604
"apply except for the variable policies."
8605
msgstr ""
8606
8607
#: en/help_topics/authentication.txt:116
8608
msgid "Each section describes an authentication definition."
8609
msgstr ""
8610
8611
#: en/help_topics/authentication.txt:118
8612
msgid ""
8613
"The section name is an arbitrary string, only the ``DEFAULT`` value is "
8614
"reserved\n"
8615
"and should appear as the *last* section."
8616
msgstr ""
8617
8618
#: en/help_topics/authentication.txt:121
8619
msgid "Each section should define:"
8620
msgstr ""
8621
8622
#: en/help_topics/authentication.txt:123
8623
msgid "* ``user``: the login to be used,"
8624
msgstr ""
8625
8626
#: en/help_topics/authentication.txt:125
8627
msgid "Each section could define:"
8628
msgstr ""
8629
8630
#: en/help_topics/authentication.txt:127
8631
msgid "* ``host``: the remote server,"
8632
msgstr ""
8633
8634
#: en/help_topics/authentication.txt:129
8635
msgid "* ``port``: the port the server is listening,"
8636
msgstr ""
8637
8638
#: en/help_topics/authentication.txt:131
8639
msgid "* ``path``: the branch location,"
8640
msgstr ""
8641
8642
#: en/help_topics/authentication.txt:133
8643
msgid "* ``password``: the password."
8644
msgstr ""
8645
8646
#: en/help_topics/authentication.txt:135
8647
msgid ""
8648
"\n"
8649
"Examples\n"
8650
"--------"
8651
msgstr ""
8652
8653
#: en/help_topics/authentication.txt:139
8654
msgid ""
8655
"\n"
8656
"Personal projects hosted outside\n"
8657
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
8658
msgstr ""
8659
8660
#: en/help_topics/authentication.txt:143
8661
msgid ""
8662
"All connections are done with the same ``user`` (the remote one for which "
8663
"the\n"
8664
"default bzr one is not appropriate) and the password is always prompted "
8665
"with\n"
8666
"some exceptions::"
8667
msgstr ""
8668
8669
#: en/help_topics/authentication.txt:147
8670
msgid ""
8671
" # Pet projects on hobby.net\n"
8672
" [hobby]\n"
8673
" host=r.hobby.net\n"
8674
" user=jim\n"
8675
" password=obvious1234\n"
8676
" \n"
8677
" # Home server\n"
8678
" [home]\n"
8679
" scheme=https\n"
8680
" host=home.net\n"
8681
" user=joe\n"
8682
" password=1essobV10us\n"
8683
" \n"
8684
" [DEFAULT]\n"
8685
" # Our local user is barbaz, on all remote sites we're known as "
8686
"foobar\n"
8687
" user=foobar"
8688
msgstr ""
8689
8690
#: en/help_topics/authentication.txt:164
8691
msgid ""
8692
"\n"
8693
"Source hosting provider\n"
8694
"~~~~~~~~~~~~~~~~~~~~~~~"
8695
msgstr ""
8696
8697
#: en/help_topics/authentication.txt:168
8698
msgid "In the shp.net (fictitious) domain, each project has its own site::"
8699
msgstr ""
8700
8701
#: en/help_topics/authentication.txt:170
8702
msgid ""
8703
" [shpnet domain]\n"
8704
" # we use sftp, but ssh is the scheme used for authentication\n"
8705
" scheme=ssh\n"
8706
" # The leading '.' ensures that 'shp.net' alone doesn't match\n"
8707
" host=.shp.net\n"
8708
" user=joe\n"
8709
" # bzr don't support supplying a password for sftp,\n"
8710
" # consider using an ssh agent if you don't want to supply\n"
8711
" # a password interactively. (pageant, ssh-agent, etc)"
8712
msgstr ""
8713
8714
#: en/help_topics/authentication.txt:180
8715
msgid ""
8716
"HTTPS, SFTP servers and their proxy\n"
8717
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
8718
msgstr ""
8719
8720
#: en/help_topics/authentication.txt:183
8721
msgid ""
8722
"At company.com, the server hosting release and integration branches is "
8723
"behind a\n"
8724
"proxy, and the two branches use different authentication policies::"
8725
msgstr ""
8726
8727
#: en/help_topics/authentication.txt:186
8728
msgid ""
8729
" [reference code]\n"
8730
" scheme=https\n"
8731
" host=dev.company.com\n"
8732
" path=/dev\n"
8733
" user=user1\n"
8734
" password=pass1"
8735
msgstr ""
8736
8737
#: en/help_topics/authentication.txt:193
8738
msgid ""
8739
" # development branches on dev server\n"
8740
" [dev]\n"
8741
" scheme=ssh # bzr+ssh and sftp are available here\n"
8742
" host=dev.company.com\n"
8743
" path=/dev/integration\n"
8744
" user=user2\n"
8745
" \n"
8746
" # proxy\n"
8747
" [proxy]\n"
8748
" scheme=http\n"
8749
" host=proxy.company.com\n"
8750
" port=3128\n"
8751
" user=proxyuser1\n"
8752
" password=proxypass1"
8753
msgstr ""
8754
8755
#: en/help_topics/authentication.txt:208
8756
msgid ""
8757
"\n"
8758
"Planned enhancements\n"
8759
"--------------------"
8760
msgstr ""
8761
8762
#: en/help_topics/authentication.txt:212
8763
msgid ""
8764
"The following are not yet implemented but planned as parts of a work in\n"
8765
"progress:"
8766
msgstr ""
8767
8768
#: en/help_topics/authentication.txt:215
8769
msgid "* add a ``password_encoding`` field allowing:"
8770
msgstr ""
8771
8772
#: en/help_topics/authentication.txt:217
8773
msgid ""
8774
" - storing the passwords in various obfuscating encodings (base64 for one),"
8775
msgstr ""
8776
8777
#: en/help_topics/authentication.txt:219
8778
msgid " - delegate password storage to plugins (.netrc for example)."
8779
msgstr ""
8780
8781
#: en/help_topics/authentication.txt:221
8782
msgid ""
8783
"* update the credentials when the user is prompted for user or password,"
8784
msgstr ""
8785
8786
#: en/help_topics/authentication.txt:223
8787
msgid "* add a ``verify_certificates`` field for ``HTTPS``."
8788
msgstr ""
8789
8790
#: en/help_topics/authentication.txt:225
8791
msgid ""
8792
"The ``password_encoding`` and ``verify_certificates`` fields are recognized "
8793
"but\n"
8794
"ignored in the actual implementation.\n"
8795
msgstr ""
8796
8797
#: en/help_topics/bugs.txt:1
8798
msgid "Bug Tracker Settings"
8799
msgstr ""
8800
8801
#: en/help_topics/bugs.txt:3
8802
msgid ""
8803
"When making a commit, metadata about bugs fixed by that change can be\n"
8804
"recorded by using the ``--fixes`` option. For each bug marked as fixed, an\n"
8805
"entry is included in the 'bugs' revision property stating '<url> <status>'.\n"
8806
"(The only ``status`` value currently supported is ``fixed.``)"
8807
msgstr ""
8808
8809
#: en/help_topics/bugs.txt:8
8810
msgid ""
8811
"The ``--fixes`` option allows you to specify a bug tracker and a bug "
8812
"identifier\n"
8813
"rather than a full URL. This looks like::"
8814
msgstr ""
8815
8816
#: en/help_topics/bugs.txt:11
8817
msgid " bzr commit --fixes <tracker>:<id>"
8818
msgstr ""
8819
8820
#: en/help_topics/bugs.txt:13 en/help_topics/configuration.txt:398
8821
msgid "or::"
8822
msgstr ""
8823
8824
#: en/help_topics/bugs.txt:15
8825
msgid " bzr commit --fixes <id>"
8826
msgstr ""
8827
8828
#: en/help_topics/bugs.txt:17
8829
msgid ""
8830
"where \"<tracker>\" is an identifier for the bug tracker, and \"<id>\" is "
8831
"the\n"
8832
"identifier for that bug within the bugtracker, usually the bug number.\n"
8833
"If \"<tracker>\" is not specified the ``bugtracker`` set in the branch\n"
8834
"or global configuration is used."
8835
msgstr ""
8836
8837
#: en/help_topics/bugs.txt:22
8838
msgid ""
8839
"Bazaar knows about a few bug trackers that have many users. If\n"
8840
"you use one of these bug trackers then there is no setup required to\n"
8841
"use this feature, you just need to know the tracker identifier to use.\n"
8842
"These are the bugtrackers that are built in:"
8843
msgstr ""
8844
8845
#: en/help_topics/bugs.txt:27
8846
msgid ""
8847
" ============================ ============ ============\n"
8848
" URL Abbreviation Example\n"
8849
" ============================ ============ ============\n"
8850
" https://bugs.launchpad.net/ lp lp:12345\n"
8851
" http://bugs.debian.org/ deb deb:12345\n"
8852
" http://bugzilla.gnome.org/ gnome gnome:12345\n"
8853
" ============================ ============ ============"
8854
msgstr ""
8855
8856
#: en/help_topics/bugs.txt:35
8857
msgid ""
8858
"For the bug trackers not listed above configuration is required.\n"
8859
"Support for generating the URLs for any project using Bugzilla or Trac\n"
8860
"is built in, along with a template mechanism for other bugtrackers with\n"
8861
"simple URL schemes. If your bug tracker can't be described by one\n"
8862
"of the schemes described below then you can write a plugin to support\n"
8863
"it."
8864
msgstr ""
8865
8866
#: en/help_topics/bugs.txt:42
8867
msgid ""
8868
"If you use Bugzilla or Trac, then you only need to set a configuration\n"
8869
"variable which contains the base URL of the bug tracker. These options\n"
8870
"can go into ``bazaar.conf``, ``branch.conf`` or into a branch-specific\n"
8871
"configuration section in ``locations.conf``. You can set up these values\n"
8872
"for each of the projects you work on."
8873
msgstr ""
8874
8875
#: en/help_topics/bugs.txt:48
8876
msgid ""
8877
"Note: As you provide a short name for each tracker, you can specify one or\n"
8878
"more bugs in one or more trackers at commit time if you wish."
8879
msgstr ""
8880
8881
#: en/help_topics/bugs.txt:51
8882
msgid ""
8883
"Launchpad\n"
8884
"---------"
8885
msgstr ""
8886
8887
#: en/help_topics/bugs.txt:54
8888
msgid ""
8889
"Use ``bzr commit --fixes lp:2`` to record that this commit fixes bug 2."
8890
msgstr ""
8891
8892
#: en/help_topics/bugs.txt:56
8893
msgid ""
8894
"bugzilla_<tracker>_url\n"
8895
"----------------------"
8896
msgstr ""
8897
8898
#: en/help_topics/bugs.txt:59
8899
msgid ""
8900
"If present, the location of the Bugzilla bug tracker referred to by\n"
8901
"<tracker>. This option can then be used together with ``bzr commit\n"
8902
"--fixes`` to mark bugs in that tracker as being fixed by that commit. For\n"
8903
"example::"
8904
msgstr ""
8905
8906
#: en/help_topics/bugs.txt:64
8907
msgid " bugzilla_squid_url = http://bugs.squid-cache.org"
8908
msgstr ""
8909
8910
#: en/help_topics/bugs.txt:66
8911
msgid ""
8912
"would allow ``bzr commit --fixes squid:1234`` to mark Squid's bug 1234 as\n"
8913
"fixed."
8914
msgstr ""
8915
8916
#: en/help_topics/bugs.txt:69
8917
msgid ""
8918
"trac_<tracker>_url\n"
8919
"------------------"
8920
msgstr ""
8921
8922
#: en/help_topics/bugs.txt:72
8923
msgid ""
8924
"If present, the location of the Trac instance referred to by\n"
8925
"<tracker>. This option can then be used together with ``bzr commit\n"
8926
"--fixes`` to mark bugs in that tracker as being fixed by that commit. For\n"
8927
"example::"
8928
msgstr ""
8929
8930
#: en/help_topics/bugs.txt:77
8931
msgid " trac_twisted_url = http://www.twistedmatrix.com/trac"
8932
msgstr ""
8933
8934
#: en/help_topics/bugs.txt:79
8935
msgid ""
8936
"would allow ``bzr commit --fixes twisted:1234`` to mark Twisted's bug 1234 "
8937
"as\n"
8938
"fixed."
8939
msgstr ""
8940
8941
#: en/help_topics/bugs.txt:82
8942
msgid ""
8943
"bugtracker_<tracker>_url\n"
8944
"------------------------"
8945
msgstr ""
8946
8947
#: en/help_topics/bugs.txt:85
8948
msgid ""
8949
"If present, the location of a generic bug tracker instance referred to by\n"
8950
"<tracker>. The location must contain an ``{id}`` placeholder,\n"
8951
"which will be replaced by a specific bug ID. This option can then be used\n"
8952
"together with ``bzr commit --fixes`` to mark bugs in that tracker as being\n"
8953
"fixed by that commit. For example::"
8954
msgstr ""
8955
8956
#: en/help_topics/bugs.txt:91
8957
msgid " bugtracker_python_url = http://bugs.python.org/issue{id}"
8958
msgstr ""
8959
8960
#: en/help_topics/bugs.txt:93
8961
msgid ""
8962
"would allow ``bzr commit --fixes python:1234`` to mark bug 1234 in Python's\n"
8963
"Roundup bug tracker as fixed, or::"
8964
msgstr ""
8965
8966
#: en/help_topics/bugs.txt:96
8967
msgid ""
8968
" bugtracker_cpan_url = http://rt.cpan.org/Public/Bug/Display.html?id={id}"
8969
msgstr ""
8970
8971
#: en/help_topics/bugs.txt:98
8972
msgid ""
8973
"would allow ``bzr commit --fixes cpan:1234`` to mark bug 1234 in CPAN's\n"
8974
"RT bug tracker as fixed, or::"
8975
msgstr ""
8976
8977
#: en/help_topics/bugs.txt:101
8978
msgid " bugtracker_hudson_url = http://issues.hudson-ci.org/browse/{id}"
8979
msgstr ""
8980
8981
#: en/help_topics/bugs.txt:103
8982
msgid ""
8983
"would allow ``bzr commit --fixes hudson:HUDSON-1234`` to mark bug HUDSON-"
8984
"1234\n"
8985
"in Hudson's JIRA bug tracker as fixed.\n"
8986
msgstr ""
8987
8988
#: en/help_topics/commands.txt:1
8989
msgid ""
8990
"add Add specified files or directories.\n"
8991
"alias Set/unset and display aliases.\n"
8992
"annotate Show the origin of each line in a file.\n"
8993
"bash-completion Generate a shell function for bash command line "
8994
"completion.\n"
8995
" [bash_completion]\n"
8996
"bind Convert the current branch into a checkout of the "
8997
"supplied\n"
8998
" branch.\n"
8999
"branch Create a new branch that is a copy of an existing branch.\n"
9000
"branches List the branches available at the current location.\n"
9001
"break-lock Break a dead lock.\n"
9002
"cat Write the contents of a file as of a given revision to\n"
9003
" standard output.\n"
9004
"check Validate working tree structure, branch consistency and\n"
9005
" repository history.\n"
9006
"checkout Create a new checkout of an existing branch.\n"
9007
"clean-tree Remove unwanted files from working tree.\n"
9008
"commit Commit changes into a new revision.\n"
9009
"config Display, set or remove a configuration option.\n"
9010
"conflicts List files with conflicts.\n"
9011
"deleted List files deleted in the working tree.\n"
9012
"diff Show differences in the working tree, between revisions "
9013
"or\n"
9014
" branches.\n"
9015
"dpush Push into a different VCS without any custom bzr "
9016
"metadata.\n"
9017
"export Export current or past revision to a destination directory "
9018
"or\n"
9019
" archive.\n"
9020
"help Show help on a command or other topic.\n"
9021
"ignore Ignore specified files or patterns.\n"
9022
"ignored List ignored files and the patterns that matched them.\n"
9023
"info Show information about a working tree, branch or "
9024
"repository.\n"
9025
"init Make a directory into a versioned branch.\n"
9026
"init-repository Create a shared repository for branches to share storage\n"
9027
" space.\n"
9028
"join Combine a tree into its containing tree.\n"
9029
"launchpad-login Show or set the Launchpad user ID. [launchpad]\n"
9030
"launchpad-mirror Ask Launchpad to mirror a branch now. [launchpad]\n"
9031
"launchpad-open Open a Launchpad branch page in your web browser. "
9032
"[launchpad]\n"
9033
"log Show historical log for a branch or subset of a branch.\n"
9034
"lp-find-proposal Find the proposal to merge this revision. [launchpad]\n"
9035
"lp-propose-merge Propose merging a branch on Launchpad. [launchpad]\n"
9036
"ls List files in a tree.\n"
9037
"merge Perform a three-way merge.\n"
9038
"missing Show unmerged/unpulled revisions between two branches.\n"
9039
"mkdir Create a new versioned directory.\n"
9040
"mv Move or rename a file.\n"
9041
"nick Print or set the branch nickname.\n"
9042
"pack Compress the data within a repository.\n"
9043
"plugins List the installed plugins.\n"
9044
"pull Turn this branch into a mirror of another branch.\n"
9045
"push Update a mirror of this branch.\n"
9046
"reconcile Reconcile bzr metadata in a branch.\n"
9047
"reconfigure Reconfigure the type of a bzr directory.\n"
9048
"register-branch Register a branch with launchpad.net. [launchpad]\n"
9049
"remerge Redo a merge.\n"
9050
"remove Remove files or directories.\n"
9051
"remove-branch Remove a branch.\n"
9052
"remove-tree Remove the working tree from a given branch/checkout.\n"
9053
"renames Show list of renamed files.\n"
9054
"resolve Mark a conflict as resolved.\n"
9055
"revert Revert files to a previous revision.\n"
9056
"revno Show current revision number.\n"
9057
"root Show the tree root directory.\n"
9058
"send Mail or create a merge-directive for submitting changes.\n"
9059
"serve Run the bzr server.\n"
9060
"shelve Temporarily set aside some changes from the current tree.\n"
9061
"sign-my-commits Sign all commits by a given committer.\n"
9062
"split Split a subdirectory of a tree into a separate tree.\n"
9063
"status Display status summary.\n"
9064
"switch Set the branch of a checkout and update.\n"
9065
"tag Create, remove or modify a tag naming a revision.\n"
9066
"tags List tags.\n"
9067
"testament Show testament (signing-form) of a revision.\n"
9068
"unbind Convert the current checkout into a regular branch.\n"
9069
"uncommit Remove the last committed revision.\n"
9070
"unshelve Restore shelved changes.\n"
9071
"update Update a working tree to a new revision.\n"
9072
"upgrade Upgrade a repository, branch or working tree to a newer\n"
9073
" format.\n"
9074
"verify-signatures Verify all commit signatures.\n"
9075
"version Show version of bzr.\n"
9076
"version-info Show version information about this tree.\n"
9077
"view Manage filtered views.\n"
9078
"whoami Show or set bzr user id.\n"
9079
msgstr ""
9080
9081
#: en/help_topics/configuration.txt:1
9082
msgid ""
9083
"Configuration Settings\n"
9084
"======================="
9085
msgstr ""
9086
9087
#: en/help_topics/configuration.txt:4
9088
msgid ""
9089
"Environment settings\n"
9090
"---------------------"
9091
msgstr ""
9092
9093
#: en/help_topics/configuration.txt:7
9094
msgid ""
9095
"While most configuration is handled by configuration files, some options\n"
9096
"which may be semi-permanent can also be controlled through the environment."
9097
msgstr ""
9098
9099
#: en/help_topics/configuration.txt:10
9100
msgid ""
9101
"BZR_EMAIL\n"
9102
"~~~~~~~~~"
9103
msgstr ""
9104
9105
#: en/help_topics/configuration.txt:13
9106
msgid "Override the email id used by Bazaar. Typical format::"
9107
msgstr ""
9108
9109
#: en/help_topics/configuration.txt:15
9110
msgid " \"John Doe <jdoe@example.com>\""
9111
msgstr ""
9112
9113
#: en/help_topics/configuration.txt:17
9114
msgid "See also the ``email`` configuration option."
9115
msgstr ""
9116
9117
#: en/help_topics/configuration.txt:19
9118
msgid ""
9119
"BZR_PROGRESS_BAR\n"
9120
"~~~~~~~~~~~~~~~~"
9121
msgstr ""
9122
9123
#: en/help_topics/configuration.txt:22
9124
msgid ""
9125
"Override the progress display. Possible values are \"none\" or \"text\". "
9126
"If\n"
9127
"the value is \"none\" then no progress bar is displayed. The value \"text\" "
9128
"draws\n"
9129
"the ordinary command line progress bar."
9130
msgstr ""
9131
9132
#: en/help_topics/configuration.txt:26
9133
msgid ""
9134
"BZR_SIGQUIT_PDB\n"
9135
"~~~~~~~~~~~~~~~"
9136
msgstr ""
9137
9138
#: en/help_topics/configuration.txt:29
9139
msgid ""
9140
"Control whether SIGQUIT behaves normally or invokes a breakin debugger."
9141
msgstr ""
9142
9143
#: en/help_topics/configuration.txt:31
9144
msgid ""
9145
"* 0 = Standard SIGQUIT behavior (normally, exit with a core dump)\n"
9146
"* 1 = Invoke breakin debugger (default)"
9147
msgstr ""
9148
9149
#: en/help_topics/configuration.txt:34
9150
msgid ""
9151
"BZR_HOME\n"
9152
"~~~~~~~~"
9153
msgstr ""
9154
9155
#: en/help_topics/configuration.txt:37
9156
msgid "Override the home directory used by Bazaar."
9157
msgstr ""
9158
9159
#: en/help_topics/configuration.txt:39
9160
msgid ""
9161
"BZR_SSH\n"
9162
"~~~~~~~"
9163
msgstr ""
9164
9165
#: en/help_topics/configuration.txt:42
9166
msgid "Select a different SSH implementation."
9167
msgstr ""
9168
9169
#: en/help_topics/configuration.txt:44
9170
msgid ""
9171
"BZR_PDB\n"
9172
"~~~~~~~"
9173
msgstr ""
9174
9175
#: en/help_topics/configuration.txt:47
9176
msgid "Control whether to launch a debugger on error."
9177
msgstr ""
9178
9179
#: en/help_topics/configuration.txt:49
9180
msgid ""
9181
"* 0 = Standard behavior\n"
9182
"* 1 = Launch debugger"
9183
msgstr ""
9184
9185
#: en/help_topics/configuration.txt:52
9186
msgid ""
9187
"BZR_REMOTE_PATH\n"
9188
"~~~~~~~~~~~~~~~"
9189
msgstr ""
9190
9191
#: en/help_topics/configuration.txt:55
9192
msgid "Path to the Bazaar executable to use when using the bzr+ssh protocol."
9193
msgstr ""
9194
9195
#: en/help_topics/configuration.txt:57
9196
msgid "See also the ``bzr_remote_path`` configuration option."
9197
msgstr ""
9198
9199
#: en/help_topics/configuration.txt:59
9200
msgid ""
9201
"BZR_EDITOR\n"
9202
"~~~~~~~~~~"
9203
msgstr ""
9204
9205
#: en/help_topics/configuration.txt:62
9206
msgid "Path to the editor Bazaar should use for commit messages, etc."
9207
msgstr ""
9208
9209
#: en/help_topics/configuration.txt:64
9210
msgid ""
9211
"BZR_LOG\n"
9212
"~~~~~~~"
9213
msgstr ""
9214
9215
#: en/help_topics/configuration.txt:67
9216
msgid ""
9217
"Location of the Bazaar log file. You can check the current location by\n"
9218
"running ``bzr version``."
9219
msgstr ""
9220
9221
#: en/help_topics/configuration.txt:70
9222
msgid ""
9223
"The log file contains debug information that is useful for diagnosing or\n"
9224
"reporting problems with Bazaar."
9225
msgstr ""
9226
9227
#: en/help_topics/configuration.txt:73
9228
msgid ""
9229
"Setting this to ``NUL`` on Windows or ``/dev/null`` on other platforms\n"
9230
"will disable logging."
9231
msgstr ""
9232
9233
#: en/help_topics/configuration.txt:76
9234
msgid ""
9235
"\n"
9236
"BZR_PLUGIN_PATH\n"
9237
"~~~~~~~~~~~~~~~"
9238
msgstr ""
9239
9240
#: en/help_topics/configuration.txt:80
9241
msgid ""
9242
"The path to the plugins directory that Bazaar should use.\n"
9243
"If not set, Bazaar will search for plugins in:"
9244
msgstr ""
9245
9246
#: en/help_topics/configuration.txt:83
9247
msgid ""
9248
"* the user specific plugin directory (containing the ``user`` plugins),"
9249
msgstr ""
9250
9251
#: en/help_topics/configuration.txt:85
9252
msgid "* the bzrlib directory (containing the ``core`` plugins),"
9253
msgstr ""
9254
9255
#: en/help_topics/configuration.txt:87
9256
msgid ""
9257
"* the site specific plugin directory if applicable (containing\n"
9258
" the ``site`` plugins)."
9259
msgstr ""
9260
9261
#: en/help_topics/configuration.txt:90
9262
msgid ""
9263
"If ``BZR_PLUGIN_PATH`` is set in any fashion, it will change the\n"
9264
"the way the plugin are searched. "
9265
msgstr ""
9266
9267
#: en/help_topics/configuration.txt:93
9268
msgid ""
9269
"As for the ``PATH`` variables, if multiple directories are\n"
9270
"specified in ``BZR_PLUGIN_PATH`` they should be separated by the\n"
9271
"platform specific appropriate character (':' on Unix,\n"
9272
"';' on windows)"
9273
msgstr ""
9274
9275
#: en/help_topics/configuration.txt:98
9276
msgid ""
9277
"By default if ``BZR_PLUGIN_PATH`` is set, it replaces searching\n"
9278
"in ``user``. However it will continue to search in ``core`` and\n"
9279
"``site`` unless they are explicitly removed."
9280
msgstr ""
9281
9282
#: en/help_topics/configuration.txt:102
9283
msgid ""
9284
"If you need to change the order or remove one of these\n"
9285
"directories, you should use special values:"
9286
msgstr ""
9287
9288
#: en/help_topics/configuration.txt:105
9289
msgid ""
9290
"* ``-user``, ``-core``, ``-site`` will remove the corresponding\n"
9291
" path from the default values,"
9292
msgstr ""
9293
9294
#: en/help_topics/configuration.txt:108
9295
msgid ""
9296
"* ``+user``, ``+core``, ``+site`` will add the corresponding path\n"
9297
" before the remaining default values (and also remove it from\n"
9298
" the default values)."
9299
msgstr ""
9300
9301
#: en/help_topics/configuration.txt:112
9302
msgid ""
9303
"Note that the special values 'user', 'core' and 'site' should be\n"
9304
"used literally, they will be substituted by the corresponding,\n"
9305
"platform specific, values."
9306
msgstr ""
9307
9308
#: en/help_topics/configuration.txt:116
9309
msgid ""
9310
"The examples below use ':' as the separator, windows users\n"
9311
"should use ';'."
9312
msgstr ""
9313
9314
#: en/help_topics/configuration.txt:119
9315
msgid "Overriding the default user plugin directory::"
9316
msgstr ""
9317
9318
#: en/help_topics/configuration.txt:121
9319
msgid " BZR_PLUGIN_PATH='/path/to/my/other/plugins'"
9320
msgstr ""
9321
9322
#: en/help_topics/configuration.txt:123
9323
msgid "Disabling the site directory while retaining the user directory::"
9324
msgstr ""
9325
9326
#: en/help_topics/configuration.txt:125
9327
msgid " BZR_PLUGIN_PATH='-site:+user'"
9328
msgstr ""
9329
9330
#: en/help_topics/configuration.txt:127
9331
msgid "Disabling all plugins (better achieved with --no-plugins)::"
9332
msgstr ""
9333
9334
#: en/help_topics/configuration.txt:129
9335
msgid " BZR_PLUGIN_PATH='-user:-core:-site'"
9336
msgstr ""
9337
9338
#: en/help_topics/configuration.txt:131
9339
msgid "Overriding the default site plugin directory::"
9340
msgstr ""
9341
9342
#: en/help_topics/configuration.txt:133
9343
msgid " BZR_PLUGIN_PATH='/path/to/my/site/plugins:-site':+user"
9344
msgstr ""
9345
9346
#: en/help_topics/configuration.txt:135
9347
msgid ""
9348
"BZR_DISABLE_PLUGINS\n"
9349
"~~~~~~~~~~~~~~~~~~~"
9350
msgstr ""
9351
9352
#: en/help_topics/configuration.txt:138
9353
msgid ""
9354
"Under special circumstances (mostly when trying to diagnose a\n"
9355
"bug), it's better to disable a plugin (or several) rather than\n"
9356
"uninstalling them completely. Such plugins can be specified in\n"
9357
"the ``BZR_DISABLE_PLUGINS`` environment variable."
9358
msgstr ""
9359
9360
#: en/help_topics/configuration.txt:143
9361
msgid ""
9362
"In that case, ``bzr`` will stop loading the specified plugins and\n"
9363
"will raise an import error if they are explicitly imported (by\n"
9364
"another plugin that depends on them for example)."
9365
msgstr ""
9366
9367
#: en/help_topics/configuration.txt:147
9368
msgid "Disabling ``myplugin`` and ``yourplugin`` is achieved by::"
9369
msgstr ""
9370
9371
#: en/help_topics/configuration.txt:149
9372
msgid " BZR_DISABLE_PLUGINS='myplugin:yourplugin'"
9373
msgstr ""
9374
9375
#: en/help_topics/configuration.txt:151
9376
msgid ""
9377
"BZR_PLUGINS_AT\n"
9378
"~~~~~~~~~~~~~~"
9379
msgstr ""
9380
9381
#: en/help_topics/configuration.txt:154
9382
msgid ""
9383
"When adding a new feature or working on a bug in a plugin,\n"
9384
"developers often need to use a specific version of a given\n"
9385
"plugin. Since python requires that the directory containing the\n"
9386
"code is named like the plugin itself this make it impossible to\n"
9387
"use arbitrary directory names (using a two-level directory scheme\n"
9388
"is inconvenient). ``BZR_PLUGINS_AT`` allows such directories even\n"
9389
"if they don't appear in ``BZR_PLUGIN_PATH`` ."
9390
msgstr ""
9391
9392
#: en/help_topics/configuration.txt:162
9393
msgid ""
9394
"Plugins specified in this environment variable takes precedence\n"
9395
"over the ones in ``BZR_PLUGIN_PATH``."
9396
msgstr ""
9397
9398
#: en/help_topics/configuration.txt:165
9399
msgid ""
9400
"The variable specified a list of ``plugin_name@plugin path``,\n"
9401
"``plugin_name`` being the name of the plugin as it appears in\n"
9402
"python module paths, ``plugin_path`` being the path to the\n"
9403
"directory containing the plugin code itself\n"
9404
"(i.e. ``plugins/myplugin`` not ``plugins``). Use ':' as the list\n"
9405
"separator, use ';' on windows."
9406
msgstr ""
9407
9408
#: en/help_topics/configuration.txt:172
9409
msgid ""
9410
"Example:\n"
9411
"~~~~~~~~"
9412
msgstr ""
9413
9414
#: en/help_topics/configuration.txt:175
9415
msgid ""
9416
"Using a specific version of ``myplugin``:\n"
9417
"``BZR_PLUGINS_AT='myplugin@/home/me/bugfixes/123456-myplugin``"
9418
msgstr ""
9419
9420
#: en/help_topics/configuration.txt:178
9421
msgid ""
9422
"BZRPATH\n"
9423
"~~~~~~~"
9424
msgstr ""
9425
9426
#: en/help_topics/configuration.txt:181
9427
msgid "The path where Bazaar should look for shell plugin external commands."
9428
msgstr ""
9429
9430
#: en/help_topics/configuration.txt:183
9431
msgid ""
9432
"\n"
9433
"http_proxy, https_proxy\n"
9434
"~~~~~~~~~~~~~~~~~~~~~~~"
9435
msgstr ""
9436
9437
#: en/help_topics/configuration.txt:187
9438
msgid "Specifies the network proxy for outgoing connections, for example::"
9439
msgstr ""
9440
9441
#: en/help_topics/configuration.txt:189
9442
msgid ""
9443
" http_proxy=http://proxy.example.com:3128/ \n"
9444
" https_proxy=http://proxy.example.com:3128/"
9445
msgstr ""
9446
9447
#: en/help_topics/configuration.txt:192
9448
msgid ""
9449
"\n"
9450
"Configuration files\n"
9451
"-------------------"
9452
msgstr ""
9453
9454
#: en/help_topics/configuration.txt:196
9455
msgid ""
9456
"Location\n"
9457
"~~~~~~~~"
9458
msgstr ""
9459
9460
#: en/help_topics/configuration.txt:199
9461
msgid ""
9462
"Configuration files are located in ``$HOME/.bazaar`` on Unix and\n"
9463
"``C:\\Documents and Settings\\<username>\\Application Data\\Bazaar\\2.0`` "
9464
"on\n"
9465
"Windows. (You can check the location for your system by using\n"
9466
"``bzr version``.)"
9467
msgstr ""
9468
9469
#: en/help_topics/configuration.txt:204
9470
msgid "There are three primary configuration files in this location:"
9471
msgstr ""
9472
9473
#: en/help_topics/configuration.txt:206
9474
msgid "* ``bazaar.conf`` describes default configuration options,"
9475
msgstr ""
9476
9477
#: en/help_topics/configuration.txt:208
9478
msgid ""
9479
"* ``locations.conf`` describes configuration information for\n"
9480
" specific branch locations,"
9481
msgstr ""
9482
9483
#: en/help_topics/configuration.txt:211
9484
msgid ""
9485
"* ``authentication.conf`` describes credential information for\n"
9486
" remote servers."
9487
msgstr ""
9488
9489
#: en/help_topics/configuration.txt:214
9490
msgid ""
9491
"Each branch can also contain a configuration file that sets values specific\n"
9492
"to that branch. This file is found at ``.bzr/branch/branch.conf`` within "
9493
"the\n"
9494
"branch. This file is visible to all users of a branch, if you wish to "
9495
"override\n"
9496
"one of the values for a branch with a setting that is specific to you then "
9497
"you\n"
9498
"can do so in ``locations.conf``."
9499
msgstr ""
9500
9501
#: en/help_topics/configuration.txt:220
9502
msgid ""
9503
"General format\n"
9504
"~~~~~~~~~~~~~~"
9505
msgstr ""
9506
9507
#: en/help_topics/configuration.txt:223
9508
msgid ""
9509
"An ini file has three types of contructs: section headers, section\n"
9510
"options and comments."
9511
msgstr ""
9512
9513
#: en/help_topics/configuration.txt:226
9514
msgid ""
9515
"Comments\n"
9516
"^^^^^^^^"
9517
msgstr ""
9518
9519
#: en/help_topics/configuration.txt:229
9520
msgid ""
9521
"A comment is any line that starts with a \"#\" (sometimes called a \"hash\n"
9522
"mark\", \"pound sign\" or \"number sign\"). Comment lines are ignored by\n"
9523
"Bazaar when parsing ini files."
9524
msgstr ""
9525
9526
#: en/help_topics/configuration.txt:233
9527
msgid ""
9528
"Section headers\n"
9529
"^^^^^^^^^^^^^^^"
9530
msgstr ""
9531
9532
#: en/help_topics/configuration.txt:236
9533
msgid ""
9534
"A section header is a word enclosed in brackets that starts at the begining\n"
9535
"of a line. A typical section header looks like this::"
9536
msgstr ""
9537
9538
#: en/help_topics/configuration.txt:239
9539
msgid " [DEFAULT]"
9540
msgstr ""
9541
9542
#: en/help_topics/configuration.txt:241
9543
msgid ""
9544
"The only valid section headers for bazaar.conf currently are [DEFAULT] and\n"
9545
"[ALIASES]. Section headers are case sensitive. The default section provides "
9546
"for\n"
9547
"setting options which can be overridden with the branch config file."
9548
msgstr ""
9549
9550
#: en/help_topics/configuration.txt:245
9551
msgid ""
9552
"For ``locations.conf``, the options from the section with the\n"
9553
"longest matching section header are used to the exclusion of other\n"
9554
"potentially valid section headers. A section header uses the path for\n"
9555
"the branch as the section header. Some examples include::"
9556
msgstr ""
9557
9558
#: en/help_topics/configuration.txt:250
9559
msgid ""
9560
" [http://mybranches.isp.com/~jdoe/branchdir]\n"
9561
" [/home/jdoe/branches/]"
9562
msgstr ""
9563
9564
#: en/help_topics/configuration.txt:253
9565
msgid ""
9566
"\n"
9567
"Section options\n"
9568
"^^^^^^^^^^^^^^^"
9569
msgstr ""
9570
9571
#: en/help_topics/configuration.txt:257
9572
msgid ""
9573
"A section option resides within a section. A section option contains an\n"
9574
"option name, an equals sign and a value. For example::"
9575
msgstr ""
9576
9577
#: en/help_topics/configuration.txt:260
9578
msgid ""
9579
" email = John Doe <jdoe@isp.com>\n"
9580
" gpg_signing_key = Amy Pond <amy@example.com>"
9581
msgstr ""
9582
9583
#: en/help_topics/configuration.txt:263
9584
msgid ""
9585
"A option can reference other options by enclosing them in curly brackets::"
9586
msgstr ""
9587
9588
#: en/help_topics/configuration.txt:265
9589
msgid ""
9590
" my_branch_name = feature_x\n"
9591
" my_server = bzr+ssh://example.com\n"
9592
" push_location = {my_server}/project/{my_branch_name}"
9593
msgstr ""
9594
9595
#: en/help_topics/configuration.txt:269
9596
msgid ""
9597
"Option policies\n"
9598
"^^^^^^^^^^^^^^^"
9599
msgstr ""
9600
9601
#: en/help_topics/configuration.txt:272
9602
msgid ""
9603
"Options defined in a section affect the named directory or URL plus\n"
9604
"any locations they contain. Policies can be used to change how an\n"
9605
"option value is interpreted for contained locations. Currently\n"
9606
"there are three policies available:"
9607
msgstr ""
9608
9609
#: en/help_topics/configuration.txt:277
9610
msgid ""
9611
" none:\n"
9612
" the value is interpreted the same for contained locations. This is\n"
9613
" the default behaviour.\n"
9614
" norecurse:\n"
9615
" the value is only used for the exact location specified by the\n"
9616
" section name.\n"
9617
" appendpath:\n"
9618
" for contained locations, any additional path components are\n"
9619
" appended to the value."
9620
msgstr ""
9621
9622
#: en/help_topics/configuration.txt:287
9623
msgid ""
9624
"Policies are specified by keys with names of the form "
9625
"\"<option_name>:policy\".\n"
9626
"For example, to define the push location for a tree of branches, the\n"
9627
"following could be used::"
9628
msgstr ""
9629
9630
#: en/help_topics/configuration.txt:291
9631
msgid ""
9632
" [/top/location]\n"
9633
" push_location = sftp://example.com/location\n"
9634
" push_location:policy = appendpath"
9635
msgstr ""
9636
9637
#: en/help_topics/configuration.txt:295
9638
msgid ""
9639
"With this configuration, the push location for ``/top/location/branch1``\n"
9640
"would be ``sftp://example.com/location/branch1``."
9641
msgstr ""
9642
9643
#: en/help_topics/configuration.txt:298
9644
msgid ""
9645
"Section local options\n"
9646
"^^^^^^^^^^^^^^^^^^^^^"
9647
msgstr ""
9648
9649
#: en/help_topics/configuration.txt:301
9650
msgid ""
9651
"Some options are defined automatically inside a given section and can be\n"
9652
"refered to in this section only. "
9653
msgstr ""
9654
9655
#: en/help_topics/configuration.txt:304
9656
msgid "For example, the ``appendpath`` policy can be used like this::"
9657
msgstr ""
9658
9659
#: en/help_topics/configuration.txt:306
9660
msgid ""
9661
" [/home/vila/src/bzr/bugs]\n"
9662
" mypush = lp:~vila/bzr\n"
9663
" mypush:policy=appendpath"
9664
msgstr ""
9665
9666
#: en/help_topics/configuration.txt:310
9667
msgid "Using ``relpath`` to achieve the same result is done like this::"
9668
msgstr ""
9669
9670
#: en/help_topics/configuration.txt:312
9671
msgid ""
9672
" [/home/vila/src/bzr/bugs]\n"
9673
" mypush = lp:~vila/bzr/{relpath}"
9674
msgstr ""
9675
9676
#: en/help_topics/configuration.txt:315
9677
msgid ""
9678
"In both cases, when used in a directory like\n"
9679
"``/home/vila/src/bzr/bugs/832013-expand-in-stack`` we'll get::"
9680
msgstr ""
9681
9682
#: en/help_topics/configuration.txt:318 en/help_topics/configuration.txt:329
9683
msgid ""
9684
" $ bzr config mypush\n"
9685
" lp:~vila/bzr/832013-expand-in-stack"
9686
msgstr ""
9687
9688
#: en/help_topics/configuration.txt:321
9689
msgid "Another such option is ``basename`` which can be used like this::"
9690
msgstr ""
9691
9692
#: en/help_topics/configuration.txt:323
9693
msgid ""
9694
" [/home/vila/src/bzr]\n"
9695
" mypush = lp:~vila/bzr/{basename}"
9696
msgstr ""
9697
9698
#: en/help_topics/configuration.txt:326
9699
msgid ""
9700
"When used in a directory like\n"
9701
"``/home/vila/src/bzr/bugs/832013-expand-in-stack`` we'll get::"
9702
msgstr ""
9703
9704
#: en/help_topics/configuration.txt:332
9705
msgid ""
9706
"Note that ``basename`` here refers to the base name of ``relpath`` which\n"
9707
"itself is defined as the relative path between the section name and the\n"
9708
"location it matches."
9709
msgstr ""
9710
9711
#: en/help_topics/configuration.txt:336
9712
msgid ""
9713
"When an option is local to a Section, it cannot be referred to from option\n"
9714
"values in any other section from the same ``Store`` nor from any other\n"
9715
"``Store``."
9716
msgstr ""
9717
9718
#: en/help_topics/configuration.txt:340
9719
msgid ""
9720
"\n"
9721
"The main configuration file, bazaar.conf\n"
9722
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
9723
msgstr ""
9724
9725
#: en/help_topics/configuration.txt:344
9726
msgid ""
9727
"``bazaar.conf`` allows two sections: ``[DEFAULT]`` and ``[ALIASES]``.\n"
9728
"The default section contains the default\n"
9729
"configuration options for all branches. The default section can be\n"
9730
"overriden by providing a branch-specific section in ``locations.conf``."
9731
msgstr ""
9732
9733
#: en/help_topics/configuration.txt:349
9734
msgid "A typical ``bazaar.conf`` section often looks like the following::"
9735
msgstr ""
9736
9737
#: en/help_topics/configuration.txt:351
9738
msgid ""
9739
" [DEFAULT]\n"
9740
" email = John Doe <jdoe@isp.com>\n"
9741
" editor = /usr/bin/vim\n"
9742
" create_signatures = when-required"
9743
msgstr ""
9744
9745
#: en/help_topics/configuration.txt:356
9746
msgid ""
9747
"\n"
9748
"The branch location configuration file, locations.conf\n"
9749
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
9750
msgstr ""
9751
9752
#: en/help_topics/configuration.txt:360
9753
msgid ""
9754
"``locations.conf`` allows one to specify overriding settings for\n"
9755
"a specific branch. The format is almost identical to the default section in\n"
9756
"bazaar.conf with one significant change: The section header, instead of "
9757
"saying\n"
9758
"default, will be the path to a branch that you wish to override a value\n"
9759
"for. The '?' and '*' wildcards are supported::"
9760
msgstr ""
9761
9762
#: en/help_topics/configuration.txt:366
9763
msgid ""
9764
" [/home/jdoe/branches/nethack]\n"
9765
" email = Nethack Admin <nethack@nethack.com>"
9766
msgstr ""
9767
9768
#: en/help_topics/configuration.txt:369
9769
msgid ""
9770
" [http://hypothetical.site.com/branches/devel-branch]\n"
9771
" create_signatures = always"
9772
msgstr ""
9773
9774
#: en/help_topics/configuration.txt:372
9775
msgid ""
9776
"The authentication configuration file, authentication.conf\n"
9777
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
9778
msgstr ""
9779
9780
#: en/help_topics/configuration.txt:375
9781
msgid ""
9782
"``authentication.conf`` allows one to specify credentials for\n"
9783
"remote servers. This can be used for all the supported transports and any "
9784
"part\n"
9785
"of bzr that requires authentication (smtp for example)."
9786
msgstr ""
9787
9788
#: en/help_topics/configuration.txt:379
9789
msgid ""
9790
"The syntax of the file obeys the same rules as the others except for the\n"
9791
"option policies which don't apply."
9792
msgstr ""
9793
9794
#: en/help_topics/configuration.txt:382
9795
msgid ""
9796
"For more information on the possible uses of the authentication "
9797
"configuration\n"
9798
"file see :doc:`authentication-help`."
9799
msgstr ""
9800
9801
#: en/help_topics/configuration.txt:385
9802
msgid ""
9803
"\n"
9804
"Common options\n"
9805
"--------------"
9806
msgstr ""
9807
9808
#: en/help_topics/configuration.txt:389
9809
msgid ""
9810
"debug_flags\n"
9811
"~~~~~~~~~~~"
9812
msgstr ""
9813
9814
#: en/help_topics/configuration.txt:392
9815
msgid ""
9816
"A comma-separated list of debugging options to turn on. The same values\n"
9817
"can be used as with the -D command-line option (see `help global-options`).\n"
9818
"For example::"
9819
msgstr ""
9820
9821
#: en/help_topics/configuration.txt:396
9822
msgid " debug_flags = hpss"
9823
msgstr ""
9824
9825
#: en/help_topics/configuration.txt:400
9826
msgid " debug_flags = hpss,evil"
9827
msgstr ""
9828
9829
#: en/help_topics/configuration.txt:402
9830
msgid ""
9831
"email\n"
9832
"~~~~~"
9833
msgstr ""
9834
9835
#: en/help_topics/configuration.txt:405
9836
msgid ""
9837
"The email address to use when committing a branch. Typically takes the form\n"
9838
"of::"
9839
msgstr ""
9840
9841
#: en/help_topics/configuration.txt:408
9842
msgid " email = Full Name <account@hostname.tld>"
9843
msgstr ""
9844
9845
#: en/help_topics/configuration.txt:410
9846
msgid ""
9847
"editor\n"
9848
"~~~~~~"
9849
msgstr ""
9850
9851
#: en/help_topics/configuration.txt:413
9852
msgid ""
9853
"The path of the editor that you wish to use if *bzr commit* is run without\n"
9854
"a commit message. This setting is trumped by the environment variable\n"
9855
"``BZR_EDITOR``, and overrides the ``VISUAL`` and ``EDITOR`` environment\n"
9856
"variables."
9857
msgstr ""
9858
9859
#: en/help_topics/configuration.txt:418
9860
msgid ""
9861
"log_format\n"
9862
"~~~~~~~~~~"
9863
msgstr ""
9864
9865
#: en/help_topics/configuration.txt:421
9866
msgid ""
9867
"The default log format to use. Standard log formats are ``long``, ``short``\n"
9868
"and ``line``. Additional formats may be provided by plugins. The default\n"
9869
"value is ``long``."
9870
msgstr ""
9871
9872
#: en/help_topics/configuration.txt:425
9873
msgid ""
9874
"check_signatures\n"
9875
"~~~~~~~~~~~~~~~~"
9876
msgstr ""
9877
9878
#: en/help_topics/configuration.txt:428
9879
msgid ""
9880
"Reserved for future use. These options will allow a policy for branches to\n"
9881
"require signatures."
9882
msgstr ""
9883
9884
#: en/help_topics/configuration.txt:431
9885
msgid ""
9886
"require\n"
9887
" The gnupg signature for revisions must be present and must be valid."
9888
msgstr ""
9889
9890
#: en/help_topics/configuration.txt:434
9891
msgid ""
9892
"ignore\n"
9893
" Do not check gnupg signatures of revisions."
9894
msgstr ""
9895
9896
#: en/help_topics/configuration.txt:437
9897
msgid ""
9898
"check-available\n"
9899
" (default) If gnupg signatures for revisions are present, check them.\n"
9900
" Bazaar will fail if it finds a bad signature, but will not fail if\n"
9901
" no signature is present."
9902
msgstr ""
9903
9904
#: en/help_topics/configuration.txt:442
9905
msgid ""
9906
"create_signatures\n"
9907
"~~~~~~~~~~~~~~~~~"
9908
msgstr ""
9909
9910
#: en/help_topics/configuration.txt:445
9911
msgid ""
9912
"Defines the behaviour of signing revisions on commits. By default bzr will "
9913
"not\n"
9914
"sign new commits."
9915
msgstr ""
9916
9917
#: en/help_topics/configuration.txt:448
9918
msgid ""
9919
"always\n"
9920
" Sign every new revision that is committed. If the signing fails then "
9921
"the\n"
9922
" commit will not be made."
9923
msgstr ""
9924
9925
#: en/help_topics/configuration.txt:452
9926
msgid ""
9927
"when-required\n"
9928
" Reserved for future use."
9929
msgstr ""
9930
9931
#: en/help_topics/configuration.txt:455
9932
msgid ""
9933
"never\n"
9934
" Reserved for future use."
9935
msgstr ""
9936
9937
#: en/help_topics/configuration.txt:458
9938
msgid ""
9939
"In future it is planned that ``when-required`` will sign newly\n"
9940
"committed revisions only when the branch requires them. ``never`` will "
9941
"refuse\n"
9942
"to sign newly committed revisions, even if the branch requires signatures."
9943
msgstr ""
9944
9945
#: en/help_topics/configuration.txt:462
9946
msgid ""
9947
"dirstate.fdatasync\n"
9948
"~~~~~~~~~~~~~~~~~~"
9949
msgstr ""
9950
9951
#: en/help_topics/configuration.txt:465
9952
msgid ""
9953
"If true (default), working tree metadata changes are flushed through the\n"
9954
"OS buffers to physical disk. This is somewhat slower, but means data\n"
9955
"should not be lost if the machine crashes. See also repository.fdatasync."
9956
msgstr ""
9957
9958
#: en/help_topics/configuration.txt:469
9959
msgid ""
9960
"gpg_signing_key\n"
9961
"~~~~~~~~~~~~~~~"
9962
msgstr ""
9963
9964
#: en/help_topics/configuration.txt:472
9965
msgid ""
9966
"The GnuPG user identity to use when signing commits. Can be an e-mail\n"
9967
"address, key fingerprint or full key ID. When unset or when set to\n"
9968
"\"default\" Bazaar will use the user e-mail set with ``whoami``."
9969
msgstr ""
9970
9971
#: en/help_topics/configuration.txt:476
9972
msgid ""
9973
"recurse\n"
9974
"~~~~~~~"
9975
msgstr ""
9976
9977
#: en/help_topics/configuration.txt:479
9978
msgid ""
9979
"Only useful in ``locations.conf``. Defines whether or not the\n"
9980
"configuration for this section applies to subdirectories:"
9981
msgstr ""
9982
9983
#: en/help_topics/configuration.txt:482
9984
msgid ""
9985
"true\n"
9986
" (default) This section applies to subdirectories as well."
9987
msgstr ""
9988
9989
#: en/help_topics/configuration.txt:485
9990
msgid ""
9991
"false\n"
9992
" This section only applies to the branch at this directory and not\n"
9993
" branches below it."
9994
msgstr ""
9995
9996
#: en/help_topics/configuration.txt:489
9997
msgid ""
9998
"gpg_signing_command\n"
9999
"~~~~~~~~~~~~~~~~~~~"
10000
msgstr ""
10001
10002
#: en/help_topics/configuration.txt:492
10003
msgid ""
10004
"(Default: \"gpg\"). Which program should be used to sign and check "
10005
"revisions.\n"
10006
"For example::"
10007
msgstr ""
10008
10009
#: en/help_topics/configuration.txt:495
10010
msgid " gpg_signing_command = /usr/bin/gnpg"
10011
msgstr ""
10012
10013
#: en/help_topics/configuration.txt:497
10014
msgid ""
10015
"The specified command must accept the options \"--clearsign\" and \"-u "
10016
"<email>\"."
10017
msgstr ""
10018
10019
#: en/help_topics/configuration.txt:499
10020
msgid ""
10021
"bzr_remote_path\n"
10022
"~~~~~~~~~~~~~~~"
10023
msgstr ""
10024
10025
#: en/help_topics/configuration.txt:502
10026
msgid ""
10027
"(Default: \"bzr\"). The path to the command that should be used to run the "
10028
"smart\n"
10029
"server for bzr. This value may only be specified in locations.conf, because:"
10030
msgstr ""
10031
10032
#: en/help_topics/configuration.txt:505
10033
msgid ""
10034
"- it's needed before branch.conf is accessible\n"
10035
"- allowing remote branch.conf files to specify commands would be a security\n"
10036
" risk"
10037
msgstr ""
10038
10039
#: en/help_topics/configuration.txt:509
10040
msgid "It is overridden by the BZR_REMOTE_PATH environment variable."
10041
msgstr ""
10042
10043
#: en/help_topics/configuration.txt:511
10044
msgid ""
10045
"smtp_server\n"
10046
"~~~~~~~~~~~"
10047
msgstr ""
10048
10049
#: en/help_topics/configuration.txt:514
10050
msgid ""
10051
"(Default: \"localhost\"). SMTP server to use when Bazaar needs to send\n"
10052
"email, eg. with ``merge-directive --mail-to``, or the bzr-email plugin."
10053
msgstr ""
10054
10055
#: en/help_topics/configuration.txt:517
10056
msgid ""
10057
"smtp_username, smtp_password\n"
10058
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
10059
msgstr ""
10060
10061
#: en/help_topics/configuration.txt:520
10062
msgid ""
10063
"User and password to authenticate to the SMTP server. If smtp_username\n"
10064
"is set, and smtp_password is not, Bazaar will prompt for a password.\n"
10065
"These settings are only needed if the SMTP server requires authentication\n"
10066
"to send mail."
10067
msgstr ""
10068
10069
#: en/help_topics/configuration.txt:525
10070
msgid ""
10071
"locks.steal_dead\n"
10072
"~~~~~~~~~~~~~~~~"
10073
msgstr ""
10074
10075
#: en/help_topics/configuration.txt:528
10076
msgid ""
10077
"If set to true, bzr will automatically break locks held by processes from\n"
10078
"the same machine and user that are no longer alive. Otherwise, it will\n"
10079
"print a message and you can break the lock manually, if you are satisfied\n"
10080
"the object is no longer in use."
10081
msgstr ""
10082
10083
#: en/help_topics/configuration.txt:533
10084
msgid ""
10085
"mail_client\n"
10086
"~~~~~~~~~~~"
10087
msgstr ""
10088
10089
#: en/help_topics/configuration.txt:536
10090
msgid ""
10091
"A mail client to use for sending merge requests.\n"
10092
"By default, bzr will try to use ``mapi`` on Windows. On other platforms, "
10093
"it\n"
10094
"will try ``xdg-email``. If either of these fails, it will fall back to\n"
10095
"``editor``."
10096
msgstr ""
10097
10098
#: en/help_topics/configuration.txt:541
10099
msgid "Supported values for specific clients:"
10100
msgstr ""
10101
10102
#: en/help_topics/configuration.txt:543
10103
msgid ""
10104
":claws: Use Claws. This skips a dialog for attaching files.\n"
10105
":evolution: Use Evolution.\n"
10106
":kmail: Use KMail.\n"
10107
":mutt: Use Mutt.\n"
10108
":thunderbird: Use Mozilla Thunderbird or Icedove. For Thunderbird/Icedove "
10109
"1.5,\n"
10110
" this works around some bugs that xdg-email doesn't handle."
10111
msgstr ""
10112
10113
#: en/help_topics/configuration.txt:550
10114
msgid "Supported generic values are:"
10115
msgstr ""
10116
10117
#: en/help_topics/configuration.txt:552
10118
msgid ""
10119
":default: See above.\n"
10120
":editor: Use your editor to compose the merge request. This also uses\n"
10121
" your commit id, (see ``bzr whoami``), smtp_server and (optionally)\n"
10122
" smtp_username and smtp_password.\n"
10123
":mapi: Use your preferred e-mail client on Windows.\n"
10124
":xdg-email: Use xdg-email to run your preferred mail program"
10125
msgstr ""
10126
10127
#: en/help_topics/configuration.txt:559
10128
msgid ""
10129
"repository.fdatasync\n"
10130
"~~~~~~~~~~~~~~~~~~~~"
10131
msgstr ""
10132
10133
#: en/help_topics/configuration.txt:562
10134
msgid ""
10135
"If true (default), repository changes are flushed through the OS buffers\n"
10136
"to physical disk. This is somewhat slower, but means data should not be\n"
10137
"lost if the machine crashes. See also dirstate.fdatasync."
10138
msgstr ""
10139
10140
#: en/help_topics/configuration.txt:566
10141
msgid ""
10142
"submit_branch\n"
10143
"~~~~~~~~~~~~~"
10144
msgstr ""
10145
10146
#: en/help_topics/configuration.txt:569
10147
msgid ""
10148
"The branch you intend to submit your current work to. This is "
10149
"automatically\n"
10150
"set by ``bzr send``, and is also used by the ``submit:`` revision spec. "
10151
"This\n"
10152
"should usually be set on a per-branch or per-location basis."
10153
msgstr ""
10154
10155
#: en/help_topics/configuration.txt:573
10156
msgid ""
10157
"public_branch\n"
10158
"~~~~~~~~~~~~~"
10159
msgstr ""
10160
10161
#: en/help_topics/configuration.txt:576
10162
msgid ""
10163
"A publically-accessible version of this branch (implying that this version "
10164
"is\n"
10165
"not publically-accessible). Used (and set) by ``bzr send``."
10166
msgstr ""
10167
10168
#: en/help_topics/configuration.txt:579
10169
msgid ""
10170
"suppress_warnings\n"
10171
"~~~~~~~~~~~~~~~~~"
10172
msgstr ""
10173
10174
#: en/help_topics/configuration.txt:582
10175
msgid ""
10176
"A list of strings, each string represent a warning that can be emitted by\n"
10177
"bzr. Mentioning a warning in this list tells bzr to not emit it."
10178
msgstr ""
10179
10180
#: en/help_topics/configuration.txt:585
10181
msgid "Valid values:"
10182
msgstr ""
10183
10184
#: en/help_topics/configuration.txt:587
10185
msgid ""
10186
"* ``format_deprecation``:\n"
10187
" whether the format deprecation warning is shown on repositories that "
10188
"are\n"
10189
" using deprecated formats."
10190
msgstr ""
10191
10192
#: en/help_topics/configuration.txt:591
10193
msgid ""
10194
"default_format\n"
10195
"~~~~~~~~~~~~~~"
10196
msgstr ""
10197
10198
#: en/help_topics/configuration.txt:594
10199
msgid ""
10200
"A format name for the default format used when creating branches. See "
10201
"``bzr\n"
10202
"help formats`` for possible values."
10203
msgstr ""
10204
10205
#: en/help_topics/configuration.txt:597
10206
msgid ""
10207
"\n"
10208
"Unicode options\n"
10209
"---------------"
10210
msgstr ""
10211
10212
#: en/help_topics/configuration.txt:601
10213
msgid ""
10214
"output_encoding\n"
10215
"~~~~~~~~~~~~~~~"
10216
msgstr ""
10217
10218
#: en/help_topics/configuration.txt:604
10219
msgid ""
10220
"A Python unicode encoding name for text output from bzr, such as log\n"
10221
"information. Values include: utf8, cp850, ascii, iso-8859-1. The default\n"
10222
"is the terminal encoding prefered by the operating system."
10223
msgstr ""
10224
10225
#: en/help_topics/configuration.txt:608
10226
msgid ""
10227
"\n"
10228
"Branch type specific options\n"
10229
"----------------------------"
10230
msgstr ""
10231
10232
#: en/help_topics/configuration.txt:612
10233
msgid ""
10234
"These options apply only to branches that use the ``dirstate-tags`` or\n"
10235
"later format. They\n"
10236
"are usually set in ``.bzr/branch/branch.conf`` automatically, but may be\n"
10237
"manually set in ``locations.conf`` or ``bazaar.conf``."
10238
msgstr ""
10239
10240
#: en/help_topics/configuration.txt:617
10241
msgid ""
10242
"append_revisions_only\n"
10243
"~~~~~~~~~~~~~~~~~~~~~"
10244
msgstr ""
10245
10246
#: en/help_topics/configuration.txt:620
10247
msgid ""
10248
"If set to \"True\" then revisions can only be appended to the log, not\n"
10249
"removed. A branch with this setting enabled can only pull from another\n"
10250
"branch if the other branch's log is a longer version of its own. This is\n"
10251
"normally set by ``bzr init --append-revisions-only``. If you set it\n"
10252
"manually, use either 'True' or 'False' (case-sensitive) to maintain\n"
10253
"compatibility with previous bzr versions (older than 2.2)."
10254
msgstr ""
10255
10256
#: en/help_topics/configuration.txt:627
10257
msgid ""
10258
"parent_location\n"
10259
"~~~~~~~~~~~~~~~"
10260
msgstr ""
10261
10262
#: en/help_topics/configuration.txt:630
10263
msgid ""
10264
"If present, the location of the default branch for pull or merge. This "
10265
"option\n"
10266
"is normally set when creating a branch, the first ``pull`` or by ``pull\n"
10267
"--remember``."
10268
msgstr ""
10269
10270
#: en/help_topics/configuration.txt:634
10271
msgid ""
10272
"push_location\n"
10273
"~~~~~~~~~~~~~"
10274
msgstr ""
10275
10276
#: en/help_topics/configuration.txt:637
10277
msgid ""
10278
"If present, the location of the default branch for push. This option\n"
10279
"is normally set by the first ``push`` or ``push --remember``."
10280
msgstr ""
10281
10282
#: en/help_topics/configuration.txt:640
10283
msgid ""
10284
"push_strict\n"
10285
"~~~~~~~~~~~"
10286
msgstr ""
10287
10288
#: en/help_topics/configuration.txt:643
10289
msgid ""
10290
"If present, defines the ``--strict`` option default value for checking\n"
10291
"uncommitted changes before pushing."
10292
msgstr ""
10293
10294
#: en/help_topics/configuration.txt:646
10295
msgid ""
10296
"dpush_strict\n"
10297
"~~~~~~~~~~~~"
10298
msgstr ""
10299
10300
#: en/help_topics/configuration.txt:649
10301
msgid ""
10302
"If present, defines the ``--strict`` option default value for checking\n"
10303
"uncommitted changes before pushing into a different VCS without any\n"
10304
"custom bzr metadata."
10305
msgstr ""
10306
10307
#: en/help_topics/configuration.txt:653
10308
msgid ""
10309
"bound_location\n"
10310
"~~~~~~~~~~~~~~"
10311
msgstr ""
10312
10313
#: en/help_topics/configuration.txt:656
10314
msgid ""
10315
"The location that commits should go to when acting as a checkout.\n"
10316
"This option is normally set by ``bind``."
10317
msgstr ""
10318
10319
#: en/help_topics/configuration.txt:659
10320
msgid ""
10321
"bound\n"
10322
"~~~~~"
10323
msgstr ""
10324
10325
#: en/help_topics/configuration.txt:662
10326
msgid ""
10327
"If set to \"True\", the branch should act as a checkout, and push each "
10328
"commit to\n"
10329
"the bound_location. This option is normally set by ``bind``/``unbind``."
10330
msgstr ""
10331
10332
#: en/help_topics/configuration.txt:665
10333
msgid ""
10334
"send_strict\n"
10335
"~~~~~~~~~~~"
10336
msgstr ""
10337
10338
#: en/help_topics/configuration.txt:668
10339
msgid ""
10340
"If present, defines the ``--strict`` option default value for checking\n"
10341
"uncommitted changes before sending a merge directive."
10342
msgstr ""
10343
10344
#: en/help_topics/configuration.txt:671
10345
msgid ""
10346
"add.maximum_file_size\n"
10347
"~~~~~~~~~~~~~~~~~~~~~"
10348
msgstr ""
10349
10350
#: en/help_topics/configuration.txt:674
10351
msgid ""
10352
"Defines the maximum file size the command line \"add\" operation will allow\n"
10353
"in recursive mode, with files larger than this value being skipped. You may "
10354
"\n"
10355
"specify this value as an integer (in which case it is interpreted as bytes), "
10356
"\n"
10357
"or you may specify the value using SI units, i.e. 10KB, 20MB, 1G. A value of "
10358
"0 \n"
10359
"will disable skipping."
10360
msgstr ""
10361
10362
#: en/help_topics/configuration.txt:680
10363
msgid ""
10364
"External Merge Tools\n"
10365
"--------------------"
10366
msgstr ""
10367
10368
#: en/help_topics/configuration.txt:683
10369
msgid ""
10370
"bzr.mergetool.<name>\n"
10371
"~~~~~~~~~~~~~~~~~~~~"
10372
msgstr ""
10373
10374
#: en/help_topics/configuration.txt:686
10375
msgid ""
10376
"Defines an external merge tool called <name> with the given command-line.\n"
10377
"Arguments containing spaces should be quoted using single or double quotes. "
10378
"The\n"
10379
"executable may omit its path if it can be found on the PATH."
10380
msgstr ""
10381
10382
#: en/help_topics/configuration.txt:690
10383
msgid ""
10384
"The following markers can be used in the command-line to substitute "
10385
"filenames\n"
10386
"involved in the merge conflict::"
10387
msgstr ""
10388
10389
#: en/help_topics/configuration.txt:693
10390
msgid ""
10391
" {base} file.BASE\n"
10392
" {this} file.THIS\n"
10393
" {other} file.OTHER\n"
10394
" {result} output file\n"
10395
" {this_temp} temp copy of file.THIS, used to overwrite output file if "
10396
"merge\n"
10397
" succeeds."
10398
msgstr ""
10399
10400
#: en/help_topics/configuration.txt:702
10401
msgid " bzr.mergetool.kdiff3 = kdiff3 {base} {this} {other} -o {result}"
10402
msgstr ""
10403
10404
#: en/help_topics/configuration.txt:704
10405
msgid ""
10406
"bzr.default_mergetool\n"
10407
"~~~~~~~~~~~~~~~~~~~~~"
10408
msgstr ""
10409
10410
#: en/help_topics/configuration.txt:707
10411
msgid ""
10412
"Specifies which external merge tool (as defined above) should be selected "
10413
"by\n"
10414
"default in tools such as ``bzr qconflicts``."
10415
msgstr ""
10416
10417
#: en/help_topics/configuration.txt:712
10418
msgid " bzr.default_mergetool = kdiff3\n"
10419
msgstr ""
10420
10421
#: en/help_topics/conflict-types.txt:1
10422
msgid ""
10423
"Conflict Types\n"
10424
"=============="
10425
msgstr ""
10426
10427
#: en/help_topics/conflict-types.txt:4
10428
msgid ""
10429
"Some operations, like merge, revert and pull, modify the contents of your\n"
10430
"working tree. These modifications are programmatically generated, and so "
10431
"they\n"
10432
"may conflict with the current state of your working tree. "
10433
msgstr ""
10434
10435
#: en/help_topics/conflict-types.txt:8
10436
msgid ""
10437
"When conflicts are present in your working tree (as shown by ``bzr\n"
10438
"conflicts``), you should resolve them and then inform bzr that the "
10439
"conflicts\n"
10440
"have been resolved."
10441
msgstr ""
10442
10443
#: en/help_topics/conflict-types.txt:12
10444
msgid ""
10445
"Resolving conflicts is sometimes not obvious. Either because the user that\n"
10446
"should resolve them is not the one responsible for their occurrence, as is "
10447
"the\n"
10448
"case when merging other people's work or because some conflicts are "
10449
"presented\n"
10450
"in a way that is not easy to understand."
10451
msgstr ""
10452
10453
#: en/help_topics/conflict-types.txt:17
10454
msgid ""
10455
"Bazaar tries to avoid conflicts ; its aim is to ask you to resolve the\n"
10456
"conflict if and only if there's an actual conceptual conflict in the source\n"
10457
"tree. Because Bazaar doesn't understand the real meaning of the files "
10458
"being\n"
10459
"versioned, it can, when faced with ambiguities, fall short in either "
10460
"direction\n"
10461
"trying to resolve the conflict itself. Many kinds of changes can be "
10462
"combined\n"
10463
"programmatically, but sometimes only a human can determine the right thing "
10464
"to\n"
10465
"do."
10466
msgstr ""
10467
10468
#: en/help_topics/conflict-types.txt:25
10469
msgid ""
10470
"When Bazaar generates a conflict, it adds information into the working tree "
10471
"to\n"
10472
"present the conflicting versions, and it's up to you to find the correct\n"
10473
"resolution."
10474
msgstr ""
10475
10476
#: en/help_topics/conflict-types.txt:29
10477
msgid "Whatever the conflict is, resolving it is roughly done in two steps:"
10478
msgstr ""
10479
10480
#: en/help_topics/conflict-types.txt:31
10481
msgid ""
10482
"1. Modify the working tree content so that the conflicted item is now in "
10483
"the\n"
10484
" state you want to keep, then"
10485
msgstr ""
10486
10487
#: en/help_topics/conflict-types.txt:34
10488
msgid ""
10489
"2. Inform Bazaar that the conflict is now solved and ask to cleanup any\n"
10490
" remaining generated information (``bzr resolve <item>``)."
10491
msgstr ""
10492
10493
#: en/help_topics/conflict-types.txt:37
10494
msgid ""
10495
"For most conflict types, there are some obvious ways to modify the working\n"
10496
"tree and put it into the desired state. For some types of conflicts, Bazaar\n"
10497
"itself already made a choice, when possible."
10498
msgstr ""
10499
10500
#: en/help_topics/conflict-types.txt:41
10501
msgid ""
10502
"Yet, whether Bazaar makes a choice or not, there are some other simple but\n"
10503
"different ways to resolve the conflict."
10504
msgstr ""
10505
10506
#: en/help_topics/conflict-types.txt:44
10507
msgid ""
10508
"Each type of conflict is explained below, and the action which must be done "
10509
"to\n"
10510
"resolve the conflict is outlined."
10511
msgstr ""
10512
10513
#: en/help_topics/conflict-types.txt:47
10514
msgid ""
10515
"Various actions are available depending on the kind of conflict, for some "
10516
"of\n"
10517
"these actions, Bazaar can provide some help. In the end you should at least\n"
10518
"inform Bazaar that you're done with the conflict with::"
10519
msgstr ""
10520
10521
#: en/help_topics/conflict-types.txt:51
10522
msgid " ``bzr resolve FILE --action=done'"
10523
msgstr ""
10524
10525
#: en/help_topics/conflict-types.txt:53
10526
msgid ""
10527
"Note that this is the default action when a single file is involved so you "
10528
"can\n"
10529
"simply use::"
10530
msgstr ""
10531
10532
#: en/help_topics/conflict-types.txt:56
10533
msgid " ``bzr resolve FILE``"
10534
msgstr ""
10535
10536
#: en/help_topics/conflict-types.txt:58
10537
msgid "See ``bzr help resolve`` for more details."
10538
msgstr ""
10539
10540
#: en/help_topics/conflict-types.txt:60
10541
msgid ""
10542
"Text conflicts\n"
10543
"--------------"
10544
msgstr ""
10545
10546
#: en/help_topics/conflict-types.txt:63 en/help_topics/conflict-types.txt:120
10547
#: en/help_topics/conflict-types.txt:151 en/help_topics/conflict-types.txt:175
10548
#: en/help_topics/conflict-types.txt:198 en/help_topics/conflict-types.txt:213
10549
#: en/help_topics/conflict-types.txt:239 en/help_topics/conflict-types.txt:281
10550
#: en/help_topics/conflict-types.txt:303 en/help_topics/conflict-types.txt:339
10551
msgid "Typical message::"
10552
msgstr ""
10553
10554
#: en/help_topics/conflict-types.txt:65
10555
msgid " Text conflict in FILE"
10556
msgstr ""
10557
10558
#: en/help_topics/conflict-types.txt:67
10559
msgid ""
10560
"These are produced when a text merge cannot completely reconcile two sets "
10561
"of\n"
10562
"text changes. Bazaar will emit files for each version with the extensions\n"
10563
"THIS, OTHER, and BASE. THIS is the version of the file from the target "
10564
"tree,\n"
10565
"i.e. the tree that you are merging changes into. OTHER is the version that "
10566
"you\n"
10567
"are merging into the target. BASE is an older version that is used as a "
10568
"basis\n"
10569
"for comparison."
10570
msgstr ""
10571
10572
#: en/help_topics/conflict-types.txt:74
10573
msgid ""
10574
"In the main copy of the file, Bazaar will include all the changes that it\n"
10575
"could reconcile, and any un-reconciled conflicts are surrounded by\n"
10576
"\"herringbone\" markers like ``<<<<<<<``."
10577
msgstr ""
10578
10579
#: en/help_topics/conflict-types.txt:78
10580
msgid ""
10581
"Say the initial text is \"The project leader released it.\", and THIS "
10582
"modifies it\n"
10583
"to \"Martin Pool released it.\", while OTHER modifies it to \"The project "
10584
"leader\n"
10585
"released Bazaar.\" A conflict would look like this::"
10586
msgstr ""
10587
10588
#: en/help_topics/conflict-types.txt:82
10589
msgid ""
10590
" <<<<<<< TREE\n"
10591
" Martin Pool released it.\n"
10592
" =======\n"
10593
" The project leader released Bazaar.\n"
10594
" >>>>>>> MERGE-SOURCE"
10595
msgstr ""
10596
10597
#: en/help_topics/conflict-types.txt:88
10598
msgid "The correct resolution would be \"Martin Pool released Bazaar.\""
10599
msgstr ""
10600
10601
#: en/help_topics/conflict-types.txt:90
10602
msgid ""
10603
"You can handle text conflicts either by editing the main copy of the file,\n"
10604
"or by invoking external tools on the THIS, OTHER and BASE versions. It's\n"
10605
"worth mentioning that resolving text conflicts rarely involves picking one\n"
10606
"set of changes over the other (but see below when you encounter these\n"
10607
"cases). More often, the two sets of changes must be intelligently combined."
10608
msgstr ""
10609
10610
#: en/help_topics/conflict-types.txt:96
10611
msgid ""
10612
"If you edit the main copy, be sure to remove the herringbone markers. When\n"
10613
"you are done editing, the file should look like it never had a conflict, and "
10614
"be\n"
10615
"ready to commit."
10616
msgstr ""
10617
10618
#: en/help_topics/conflict-types.txt:100
10619
msgid ""
10620
"When you have resolved text conflicts, just run ``bzr resolve --auto``, and\n"
10621
"Bazaar will auto-detect which conflicts you have resolved."
10622
msgstr ""
10623
10624
#: en/help_topics/conflict-types.txt:103
10625
msgid ""
10626
"When the conflict is resolved, Bazaar deletes the previously generated\n"
10627
"``.BASE``, ``.THIS`` and ``.OTHER`` files if they are still present in the\n"
10628
"working tree."
10629
msgstr ""
10630
10631
#: en/help_topics/conflict-types.txt:107
10632
msgid ""
10633
"\n"
10634
"When you want to pick one set of changes over the other, you can use ``bzr\n"
10635
"resolve`` with one of the following actions:"
10636
msgstr ""
10637
10638
#: en/help_topics/conflict-types.txt:111
10639
msgid ""
10640
"* ``--action=take-this`` will issue ``mv FILE.THIS FILE``,\n"
10641
"* ``--action=take-other`` will issue ``mv FILE.OTHER FILE``."
10642
msgstr ""
10643
10644
#: en/help_topics/conflict-types.txt:114
10645
msgid ""
10646
"Note that if you have modified ``FILE.THIS`` or ``FILE.OTHER``, these\n"
10647
"modifications will be taken into account."
10648
msgstr ""
10649
10650
#: en/help_topics/conflict-types.txt:117
10651
msgid ""
10652
"Content conflicts\n"
10653
"-----------------"
10654
msgstr ""
10655
10656
#: en/help_topics/conflict-types.txt:122
10657
msgid " Contents conflict in FILE"
10658
msgstr ""
10659
10660
#: en/help_topics/conflict-types.txt:124
10661
msgid ""
10662
"This conflict happens when there are conflicting changes in the working "
10663
"tree\n"
10664
"and the merge source, but the conflicted items are not text files. They "
10665
"may\n"
10666
"be binary files, or symlinks, or directories. It can even happen with "
10667
"files\n"
10668
"that are deleted on one side, and modified on the other."
10669
msgstr ""
10670
10671
#: en/help_topics/conflict-types.txt:129
10672
msgid ""
10673
"Like text conflicts, Bazaar will emit THIS, OTHER and BASE files. (They may "
10674
"be\n"
10675
"regular files, symlinks or directories). But it will not include a \"main "
10676
"copy\"\n"
10677
"of the file with herringbone conflict markers. It will appear that the "
10678
"\"main\n"
10679
"copy\" has been renamed to THIS or OTHER."
10680
msgstr ""
10681
10682
#: en/help_topics/conflict-types.txt:134 en/help_topics/conflict-types.txt:182
10683
msgid ""
10684
"To resolve that kind of conflict, you should rebuild FILE from either "
10685
"version\n"
10686
"or a combination of both."
10687
msgstr ""
10688
10689
#: en/help_topics/conflict-types.txt:137 en/help_topics/conflict-types.txt:185
10690
#: en/help_topics/conflict-types.txt:226 en/help_topics/conflict-types.txt:252
10691
#: en/help_topics/conflict-types.txt:291 en/help_topics/conflict-types.txt:326
10692
#: en/help_topics/conflict-types.txt:361
10693
msgid "``bzr resolve`` recognizes the following actions:"
10694
msgstr ""
10695
10696
#: en/help_topics/conflict-types.txt:139
10697
msgid ""
10698
"* ``--action=take-this`` will issue ``bzr mv FILE.THIS FILE``,\n"
10699
"* ``--action=take-other`` will issue ``bzr mv FILE.OTHER FILE``,\n"
10700
"* ``--action=done`` will just mark the conflict as resolved."
10701
msgstr ""
10702
10703
#: en/help_topics/conflict-types.txt:143
10704
msgid ""
10705
"Any action will also delete the previously generated ``.BASE``, ``.THIS`` "
10706
"and\n"
10707
"``.OTHER`` files if they are still present in the working tree."
10708
msgstr ""
10709
10710
#: en/help_topics/conflict-types.txt:146 en/help_topics/conflict-types.txt:193
10711
#: en/help_topics/conflict-types.txt:234 en/help_topics/conflict-types.txt:276
10712
#: en/help_topics/conflict-types.txt:298 en/help_topics/conflict-types.txt:334
10713
#: en/help_topics/conflict-types.txt:369
10714
msgid ""
10715
"Bazaar cannot auto-detect when conflicts of this kind have been resolved."
10716
msgstr ""
10717
10718
#: en/help_topics/conflict-types.txt:148
10719
msgid ""
10720
"Tag conflicts\n"
10721
"-------------"
10722
msgstr ""
10723
10724
#: en/help_topics/conflict-types.txt:153
10725
msgid ""
10726
" Conflicting tags:\n"
10727
" version-0.1"
10728
msgstr ""
10729
10730
#: en/help_topics/conflict-types.txt:156
10731
msgid ""
10732
"When pulling from or pushing to another branch, Bazaar informs you about "
10733
"tags\n"
10734
"that conflict between the two branches; that is the same tag points to two\n"
10735
"different revisions. You need not resolve these conflicts, but subsequent\n"
10736
"uses of pull or push will result in the same message."
10737
msgstr ""
10738
10739
#: en/help_topics/conflict-types.txt:161
10740
msgid ""
10741
"To resolve the conflict, you must apply the correct tags to either the "
10742
"target\n"
10743
"branch or the source branch as appropriate. Use \"bzr tags --show-ids -d\n"
10744
"SOURCE_URL\" to see the tags in the source branch. If you want to make the\n"
10745
"target branch's tags match the source branch, then in the target branch do\n"
10746
"``bzr tag --force -r revid:REVISION_ID CONFLICTING_TAG`` for each of the\n"
10747
"CONFLICTING_TAGs, where REVISION_ID comes from the list of tags in the "
10748
"source\n"
10749
"branch. You need not call \"bzr resolve\" after doing this. To resolve in\n"
10750
"favor of the target branch, you need to similarly use ``tag --force`` in "
10751
"the\n"
10752
"source branch. (Note that pulling or pushing using --overwrite will "
10753
"overwrite\n"
10754
"all tags as well.)"
10755
msgstr ""
10756
10757
#: en/help_topics/conflict-types.txt:172
10758
msgid ""
10759
"Duplicate paths\n"
10760
"---------------"
10761
msgstr ""
10762
10763
#: en/help_topics/conflict-types.txt:177
10764
msgid " Conflict adding file FILE. Moved existing file to FILE.moved."
10765
msgstr ""
10766
10767
#: en/help_topics/conflict-types.txt:179
10768
msgid ""
10769
"Sometimes Bazaar will attempt to create a file using a pathname that has\n"
10770
"already been used. The existing file will be renamed to \"FILE.moved\". "
10771
msgstr ""
10772
10773
#: en/help_topics/conflict-types.txt:187
10774
msgid ""
10775
"* ``--action=take-this`` will issue ``bzr rm FILE ; bzr mv FILE.moved "
10776
"FILE``,\n"
10777
"* ``--action=take-other`` will issue ``bzr rm FILE.moved``,\n"
10778
"* ``--action=done`` will just mark the conflict as resolved."
10779
msgstr ""
10780
10781
#: en/help_topics/conflict-types.txt:191
10782
msgid ""
10783
"Note that you must get rid of FILE.moved before using ``--action=done``."
10784
msgstr ""
10785
10786
#: en/help_topics/conflict-types.txt:195
10787
msgid ""
10788
"Unversioned parent\n"
10789
"------------------"
10790
msgstr ""
10791
10792
#: en/help_topics/conflict-types.txt:200
10793
msgid ""
10794
" Conflict because FILE is not versioned, but has versioned children."
10795
msgstr ""
10796
10797
#: en/help_topics/conflict-types.txt:202
10798
msgid ""
10799
"Sometimes Bazaar will attempt to create a file whose parent directory is "
10800
"not\n"
10801
"versioned. This happens when the directory has been deleted in the target,\n"
10802
"but has a new child in the source, or vice versa. In this situation, "
10803
"Bazaar\n"
10804
"will version the parent directory as well. Resolving this issue depends\n"
10805
"very much on the particular scenario. You may wish to rename or delete "
10806
"either\n"
10807
"the file or the directory. When you are satisfied, you can run \"bzr "
10808
"resolve\n"
10809
"FILE\" to mark the conflict as resolved."
10810
msgstr ""
10811
10812
#: en/help_topics/conflict-types.txt:210
10813
msgid ""
10814
"Missing parent\n"
10815
"--------------"
10816
msgstr ""
10817
10818
#: en/help_topics/conflict-types.txt:215
10819
msgid " Conflict adding files to FILE. Created directory."
10820
msgstr ""
10821
10822
#: en/help_topics/conflict-types.txt:217
10823
msgid ""
10824
"This happens when a directory has been deleted in the target, but has new\n"
10825
"children in the source. This is similar to the \"unversioned parent\" "
10826
"conflict,\n"
10827
"except that the parent directory does not *exist*, instead of just being\n"
10828
"unversioned. In this situation, Bazaar will create the missing parent.\n"
10829
"Resolving this issue depends very much on the particular scenario."
10830
msgstr ""
10831
10832
#: en/help_topics/conflict-types.txt:223 en/help_topics/conflict-types.txt:249
10833
msgid ""
10834
"To resolve that kind of conflict, you should either remove or rename the\n"
10835
"children or the directory or a combination of both."
10836
msgstr ""
10837
10838
#: en/help_topics/conflict-types.txt:228
10839
msgid ""
10840
"* ``--action=take-this`` will issue ``bzr rm directory`` including the\n"
10841
" children,\n"
10842
"* ``--action=take-other`` will acknowledge Bazaar choice to keep the "
10843
"children\n"
10844
" and restoring the directory,\n"
10845
"* ``--action=done`` will just mark the conflict as resolved."
10846
msgstr ""
10847
10848
#: en/help_topics/conflict-types.txt:236
10849
msgid ""
10850
"Deleting parent\n"
10851
"---------------"
10852
msgstr ""
10853
10854
#: en/help_topics/conflict-types.txt:241
10855
msgid " Conflict: can't delete DIR because it is not empty. Not deleting."
10856
msgstr ""
10857
10858
#: en/help_topics/conflict-types.txt:243
10859
msgid ""
10860
"This is the opposite of \"missing parent\". A directory is deleted in the\n"
10861
"source, but has new children in the target (either because a directory\n"
10862
"deletion is merged or because the merge introduce new children). Bazaar\n"
10863
"will retain the directory. Resolving this issue depends very much on the\n"
10864
"particular scenario."
10865
msgstr ""
10866
10867
#: en/help_topics/conflict-types.txt:254
10868
msgid ""
10869
"* ``--action=take-this`` will acknowledge Bazaar choice to keep the "
10870
"directory,"
10871
msgstr ""
10872
10873
#: en/help_topics/conflict-types.txt:256
10874
msgid ""
10875
"* ``--action=take-other`` will issue ``bzr rm directory`` including the \n"
10876
" children,"
10877
msgstr ""
10878
10879
#: en/help_topics/conflict-types.txt:259
10880
msgid "* ``--action=done`` will just mark the conflict as resolved."
10881
msgstr ""
10882
10883
#: en/help_topics/conflict-types.txt:261
10884
msgid ""
10885
"Note that when merging a directory deletion, if unversioned files are\n"
10886
"present, they become potential orphans has they don't have a directory\n"
10887
"parent anymore."
10888
msgstr ""
10889
10890
#: en/help_topics/conflict-types.txt:265
10891
msgid ""
10892
"Handling such orphans, *before* the conflict is created, is controlled by\n"
10893
"setting the ``bzr.transform.orphan_policy`` configuration option."
10894
msgstr ""
10895
10896
#: en/help_topics/conflict-types.txt:268
10897
msgid "There are two possible values for this option:"
10898
msgstr ""
10899
10900
#: en/help_topics/conflict-types.txt:270
10901
msgid ""
10902
"* ``conflict`` (the default): will leave the orphans in place and\n"
10903
" generate a conflicts,"
10904
msgstr ""
10905
10906
#: en/help_topics/conflict-types.txt:273
10907
msgid ""
10908
"* ``move``: will move the orphans to a ``bzr-orphans`` directory at the "
10909
"root\n"
10910
" of the working tree with names like ``<file>.~#~``."
10911
msgstr ""
10912
10913
#: en/help_topics/conflict-types.txt:278
10914
msgid ""
10915
"Path conflict\n"
10916
"-------------"
10917
msgstr ""
10918
10919
#: en/help_topics/conflict-types.txt:283
10920
msgid " Path conflict: PATH1 / PATH2"
10921
msgstr ""
10922
10923
#: en/help_topics/conflict-types.txt:285
10924
msgid ""
10925
"This happens when the source and target have each modified the name or "
10926
"parent\n"
10927
"directory of a file. Bazaar will use the path elements from the source."
10928
msgstr ""
10929
10930
#: en/help_topics/conflict-types.txt:288
10931
msgid ""
10932
"To resolve that kind of conflict, you just have to decide what name should "
10933
"be\n"
10934
"retained for the file involved."
10935
msgstr ""
10936
10937
#: en/help_topics/conflict-types.txt:293
10938
msgid ""
10939
"* ``--action=take-this`` will revert Bazaar choice and keep ``PATH1`` by\n"
10940
" issuing ``bzr mv PATH2 PATH1``,\n"
10941
"* ``--action=take-other`` will acknowledge Bazaar choice of keeping "
10942
"``PATH2``,\n"
10943
"* ``--action=done`` will just mark the conflict as resolved."
10944
msgstr ""
10945
10946
#: en/help_topics/conflict-types.txt:300
10947
msgid ""
10948
"Parent loop\n"
10949
"-----------"
10950
msgstr ""
10951
10952
#: en/help_topics/conflict-types.txt:305
10953
msgid " Conflict moving FILE into DIRECTORY. Cancelled move."
10954
msgstr ""
10955
10956
#: en/help_topics/conflict-types.txt:307
10957
msgid ""
10958
"This happens when the source and the target have each moved directories, so\n"
10959
"that, if the change could be applied, a directory would be contained by "
10960
"itself.\n"
10961
"For example::"
10962
msgstr ""
10963
10964
#: en/help_topics/conflict-types.txt:311
10965
msgid ""
10966
" $ bzr init\n"
10967
" $ bzr mkdir white\n"
10968
" $ bzr mkdir black\n"
10969
" $ bzr commit -m \"BASE\"\n"
10970
" $ bzr branch . ../other\n"
10971
" $ bzr mv white black\n"
10972
" $ bzr commit -m \"THIS\"\n"
10973
" $ bzr mv ../other/black ../other/white\n"
10974
" $ bzr commit ../other -m \"OTHER\"\n"
10975
" $ bzr merge ../other"
10976
msgstr ""
10977
10978
#: en/help_topics/conflict-types.txt:322
10979
msgid ""
10980
"In this situation, Bazaar will cancel the move, and leave ``white`` in\n"
10981
"``black``. To resolve that kind of conflict, you just have to decide what\n"
10982
"name should be retained for the directories involved."
10983
msgstr ""
10984
10985
#: en/help_topics/conflict-types.txt:328
10986
msgid ""
10987
"* ``--action=take-this`` will acknowledge Bazaar choice of leaving ``white`` "
10988
"\n"
10989
" in ``black``,\n"
10990
"* ``--action=take-other`` will revert Bazaar choice and move ``black`` in\n"
10991
" ``white`` by issuing ``bzr mv black/white white ; bzr mv black white``,\n"
10992
"* ``--action=done`` will just mark the conflict as resolved."
10993
msgstr ""
10994
10995
#: en/help_topics/conflict-types.txt:336
10996
msgid ""
10997
"Non-directory parent\n"
10998
"--------------------"
10999
msgstr ""
11000
11001
#: en/help_topics/conflict-types.txt:341
11002
msgid ""
11003
" Conflict: foo.new is not a directory, but has files in it.\n"
11004
" Created directory."
11005
msgstr ""
11006
11007
#: en/help_topics/conflict-types.txt:344
11008
msgid ""
11009
"This happens when one side has added files to a directory, and the other "
11010
"side\n"
11011
"has changed the directory into a file or symlink. For example::"
11012
msgstr ""
11013
11014
#: en/help_topics/conflict-types.txt:347
11015
msgid ""
11016
" $ bzr init\n"
11017
" $ bzr mkdir foo\n"
11018
" $ bzr commit -m \"BASE\"\n"
11019
" $ bzr branch . ../other\n"
11020
" $ rmdir foo\n"
11021
" $ touch foo\n"
11022
" $ bzr commit -m \"THIS\"\n"
11023
" $ bzr mkdir ../other/foo/bar\n"
11024
" $ bzr commit ../other -m \"OTHER\"\n"
11025
" $ bzr merge ../other"
11026
msgstr ""
11027
11028
#: en/help_topics/conflict-types.txt:358
11029
msgid ""
11030
"To resolve that kind of conflict, you have to decide what name should be\n"
11031
"retained for the file, directory or symlink involved."
11032
msgstr ""
11033
11034
#: en/help_topics/conflict-types.txt:363
11035
msgid ""
11036
"* ``--action=take-this`` will issue ``bzr rm --force foo.new`` and \n"
11037
" ``bzr add foo``,\n"
11038
"* ``--action=take-other`` will issue ``bzr rm --force foo`` and \n"
11039
" ``bzr mv foo.new foo``,\n"
11040
"* ``--action=done`` will just mark the conflict as resolved."
11041
msgstr ""
11042
11043
#: en/help_topics/conflict-types.txt:371
11044
msgid ""
11045
"MalformedTransform\n"
11046
"------------------"
11047
msgstr ""
11048
11049
#: en/help_topics/conflict-types.txt:374
11050
msgid ""
11051
"It is possible (though very rare) for Bazaar to raise a MalformedTransform\n"
11052
"exception. This means that Bazaar encountered a filesystem conflict that it "
11053
"was\n"
11054
"unable to resolve. This usually indicates a bug. Please let us know if "
11055
"you\n"
11056
"encounter this. Our bug tracker is at https://launchpad.net/bzr/+bugs\n"
11057
msgstr ""
11058
11059
#: en/help_topics/content-filters.txt:1
11060
msgid ""
11061
"Content Filters\n"
11062
"==============="
11063
msgstr ""
11064
11065
#: en/help_topics/content-filters.txt:4
11066
msgid ""
11067
"Content formats\n"
11068
"---------------"
11069
msgstr ""
11070
11071
#: en/help_topics/content-filters.txt:7
11072
msgid ""
11073
"Bazaar's content filtering allows you to store files in a different\n"
11074
"format from the copy in your working tree. This lets you, or your\n"
11075
"co-developers, use Windows development tools that expect CRLF files\n"
11076
"on projects that use other line-ending conventions. Among other things,\n"
11077
"content filters also let Unix developers more easily work on projects\n"
11078
"using Windows line-ending conventions, keyword expansion/compression,\n"
11079
"and trailing spaces on lines in text files to be implicitly stripped\n"
11080
"when committed."
11081
msgstr ""
11082
11083
#: en/help_topics/content-filters.txt:16
11084
msgid "To generalize, there are two content formats supported by Bazaar:"
11085
msgstr ""
11086
11087
#: en/help_topics/content-filters.txt:18
11088
msgid ""
11089
"* a canonical format - how files are stored internally\n"
11090
"* a convenience format - how files are created in a working tree."
11091
msgstr ""
11092
11093
#: en/help_topics/content-filters.txt:21
11094
msgid ""
11095
"\n"
11096
"Format conversion\n"
11097
"-----------------"
11098
msgstr ""
11099
11100
#: en/help_topics/content-filters.txt:25
11101
msgid ""
11102
"The conversion between these formats is done by content filters.\n"
11103
"A content filter has two parts:"
11104
msgstr ""
11105
11106
#: en/help_topics/content-filters.txt:28
11107
msgid ""
11108
"* a read converter - converts from convenience to canonical format\n"
11109
"* a write converter - converts from canonical to convenience format."
11110
msgstr ""
11111
11112
#: en/help_topics/content-filters.txt:31
11113
msgid ""
11114
"Many of these converters will provide *round-trip* conversion,\n"
11115
"i.e. applying the read converter followed by the write converter\n"
11116
"gives back the original content. However, others may provide an\n"
11117
"asymmetric conversion. For example, a read converter might strip\n"
11118
"trailing whitespace off lines in source code while the matching\n"
11119
"write converter might pass content through unchanged."
11120
msgstr ""
11121
11122
#: en/help_topics/content-filters.txt:38
11123
msgid ""
11124
"\n"
11125
"Enabling content filters\n"
11126
"------------------------"
11127
msgstr ""
11128
11129
#: en/help_topics/content-filters.txt:42
11130
msgid ""
11131
"Content filters are typically provided by plugins, so the first step\n"
11132
"in using them is to install the relevant plugins and read their\n"
11133
"documentation. Some plugins may be very specific about which files\n"
11134
"they filter, e.g. only files ending in ``.java`` or ``.php``.\n"
11135
"In other cases, the plugin may leave it in the user's hands to\n"
11136
"define which files are to be filtered. This is typically done\n"
11137
"using rule-based preferences. See ``bzr help rules`` for general\n"
11138
"information about defining these."
11139
msgstr ""
11140
11141
#: en/help_topics/content-filters.txt:51
11142
msgid ""
11143
"\n"
11144
"Impact on commands\n"
11145
"------------------"
11146
msgstr ""
11147
11148
#: en/help_topics/content-filters.txt:55
11149
msgid ""
11150
"Read converters are only applied to commands that read content from\n"
11151
"a working tree, e.g. status, diff and commit. For example, ``bzr diff``\n"
11152
"will apply read converters to files in the working tree, then compare\n"
11153
"the results to the content last committed."
11154
msgstr ""
11155
11156
#: en/help_topics/content-filters.txt:60
11157
msgid ""
11158
"Write converters are only applied by commands that **create files in a\n"
11159
"working tree**, e.g. branch, checkout, update. If you wish to see the\n"
11160
"canonical format of a file or tree, use ``bzr cat`` or ``bzr export``\n"
11161
"respectively."
11162
msgstr ""
11163
11164
#: en/help_topics/content-filters.txt:65
11165
msgid ""
11166
"Note: ``bzr commit`` does not implicitly apply write converters after\n"
11167
"comitting files. If this makes sense for a given plugin providing\n"
11168
"a content filter, the plugin can usually achieve this effect by using a\n"
11169
"``start_commit`` or ``post_commit`` hook say. See :doc:`hooks-help`\n"
11170
"for more information on hooks."
11171
msgstr ""
11172
11173
#: en/help_topics/content-filters.txt:71
11174
msgid ""
11175
"\n"
11176
"Refreshing your working tree\n"
11177
"----------------------------"
11178
msgstr ""
11179
11180
#: en/help_topics/content-filters.txt:75
11181
msgid ""
11182
"For performance reasons, Bazaar caches the timestamps of files in\n"
11183
"a working tree, and assumes files are unchanged if their timestamps\n"
11184
"match the cached values. As a consequence, there are times when\n"
11185
"you may need to explicitly ask for content filtering to be reapplied\n"
11186
"in one or both directions, e.g. after installing or reconfiguring\n"
11187
"plugins providing it."
11188
msgstr ""
11189
11190
#: en/help_topics/content-filters.txt:82
11191
msgid "Here are some general guidelines for doing this:"
11192
msgstr ""
11193
11194
#: en/help_topics/content-filters.txt:84
11195
msgid ""
11196
" * To reapply read converters, ``touch`` files, i.e. update their\n"
11197
" timestamp. Operations like ``bzr status`` should then reapply the\n"
11198
" relevant read converters and compare the end result with the\n"
11199
" canonical format."
11200
msgstr ""
11201
11202
#: en/help_topics/content-filters.txt:89
11203
msgid ""
11204
" * To reapply write converters, ensure there are no local changes,\n"
11205
" delete the relevant files and run ``bzr revert`` on those files."
11206
msgstr ""
11207
11208
#: en/help_topics/content-filters.txt:92
11209
msgid ""
11210
"Note: In the future, it is likely that additional options will be added\n"
11211
"to commands to make this refreshing process faster and safer.\n"
11212
msgstr ""
11213
11214
#: en/help_topics/current-formats.txt:1
11215
msgid "Current Storage Formats"
11216
msgstr ""
11217
11218
#: en/help_topics/current-formats.txt:3
11219
msgid ""
11220
":2a:\n"
11221
" (native) (default) Format for the bzr 2.0 series. Uses group-\n"
11222
" compress storage. Provides rich roots which are a one-way\n"
11223
" transition."
11224
msgstr ""
11225
11226
#: en/help_topics/current-formats.txt:8 en/help_topics/other-formats.txt:17
11227
msgid ""
11228
"\n"
11229
"See :doc:`formats-help` for more about storage formats."
11230
msgstr ""
11231
11232
#: en/help_topics/debug-flags.txt:1
11233
msgid ""
11234
"Debug Flags\n"
11235
"==========="
11236
msgstr ""
11237
11238
#: en/help_topics/debug-flags.txt:4
11239
msgid ""
11240
"These flags can be passed on the bzr command line or (without the ``-D``\n"
11241
"prefix) put in the ``debug_flags`` variable in ``bazaar.conf``."
11242
msgstr ""
11243
11244
#: en/help_topics/debug-flags.txt:7
11245
msgid ""
11246
"-Dauth Trace authentication sections used.\n"
11247
"-Dbytes Print out how many bytes were transferred\n"
11248
"-Ddirstate Trace dirstate activity (verbose!)\n"
11249
"-Derror Instead of normal error handling, always print a "
11250
"traceback\n"
11251
" on error.\n"
11252
"-Devil Capture call sites that do expensive or badly-scaling\n"
11253
" operations.\n"
11254
"-Dfetch Trace history copying between repositories.\n"
11255
"-Dfilters Emit information for debugging content filtering.\n"
11256
"-Dforceinvdeltas Force use of inventory deltas during generic streaming "
11257
"fetch.\n"
11258
"-Dgraph Trace graph traversal.\n"
11259
"-Dhashcache Log every time a working file is read to determine its "
11260
"hash.\n"
11261
"-Dhooks Trace hook execution.\n"
11262
"-Dhpss Trace smart protocol requests and responses.\n"
11263
"-Dhpssdetail More hpss details.\n"
11264
"-Dhpssvfs Traceback on vfs access to Remote objects.\n"
11265
"-Dhttp Trace http connections, requests and responses.\n"
11266
"-Dindex Trace major index operations.\n"
11267
"-Dknit Trace knit operations.\n"
11268
"-Dlock Trace when lockdir locks are taken or released.\n"
11269
"-Dnoretry If a connection is reset, fail immediately rather than\n"
11270
" retrying the request.\n"
11271
"-Dprogress Trace progress bar operations.\n"
11272
"-Dmem_dump Dump memory to a file upon an out of memory error.\n"
11273
"-Dmerge Emit information for debugging merges.\n"
11274
"-Dno_apport Don't use apport to report crashes.\n"
11275
"-Dno_activity \t Don't show transport activity indicator in progress bar.\n"
11276
"-Dpack Emit information about pack operations.\n"
11277
"-Drelock Emit a message every time a branch or repository object "
11278
"is\n"
11279
" unlocked then relocked the same way.\n"
11280
"-Dsftp Trace SFTP internals.\n"
11281
"-Dstatic_tuple Error when a tuple is used where a StaticTuple is "
11282
"expected\n"
11283
"-Dstream Trace fetch streams.\n"
11284
"-Dstrict_locks Trace when OS locks are potentially used in a non-"
11285
"portable\n"
11286
" manner.\n"
11287
"-Dunlock Some errors during unlock are treated as warnings.\n"
11288
"-DIDS_never Never use InterDifferingSerializer when fetching.\n"
11289
"-DIDS_always Always use InterDifferingSerializer to fetch if "
11290
"appropriate\n"
11291
" for the format, even for non-local fetches.\n"
11292
msgstr ""
11293
11294
#: en/help_topics/diverged-branches.txt:1
11295
msgid ""
11296
"Diverged Branches\n"
11297
"================="
11298
msgstr ""
11299
11300
#: en/help_topics/diverged-branches.txt:4
11301
msgid ""
11302
"When Bazaar tries to push one branch onto another, it requires that the\n"
11303
"destination branch must be ready to receive the source branch. If this "
11304
"isn't\n"
11305
"the case, then we say that the branches have ``diverged``. Branches are\n"
11306
"considered diverged if the destination branch's most recent commit is one "
11307
"that\n"
11308
"has not been merged (directly or indirectly) by the source branch. To "
11309
"recover\n"
11310
"from diverged branches, one must merge the missing revisions into the "
11311
"source\n"
11312
"branch."
11313
msgstr ""
11314
11315
#: en/help_topics/diverged-branches.txt:12
11316
msgid ""
11317
"This situation commonly arises when using a centralized workflow with local\n"
11318
"commits. If someone else has committed new work to the mainline since your\n"
11319
"last pull and you have local commits that have not yet been pushed to the\n"
11320
"mainline, then your local branch and the mainline have diverged."
11321
msgstr ""
11322
11323
#: en/help_topics/diverged-branches.txt:17
11324
msgid ""
11325
"Discovering What Has Diverged\n"
11326
"-----------------------------"
11327
msgstr ""
11328
11329
#: en/help_topics/diverged-branches.txt:20
11330
msgid ""
11331
"The ``bzr missing`` command is used to find out what revisions are in "
11332
"another\n"
11333
"branch that are not present in the current branch, and vice-versa. It shows "
11334
"a\n"
11335
"summary of which extra revisions exist in each branch. If you want to see "
11336
"the\n"
11337
"precise effects of those revisions, you can use ``bzr diff --"
11338
"old=other_branch``\n"
11339
"to show the differences between other_branch and your current branch."
11340
msgstr ""
11341
11342
#: en/help_topics/diverged-branches.txt:26
11343
msgid ""
11344
"A Solution\n"
11345
"----------"
11346
msgstr ""
11347
11348
#: en/help_topics/diverged-branches.txt:29
11349
msgid ""
11350
"The solution is to merge the revisions from the mainline into your local\n"
11351
"branch. To do so, use ``bzr merge`` to get the new revisions from the\n"
11352
"mainline. This merge may result in conflicts if the other developer's "
11353
"changes\n"
11354
"overlap with your changes. These conflicts should be resolved before\n"
11355
"continuing. After any conflicts have been resolved, or even if there were "
11356
"no\n"
11357
"conflicts, Bazaar requires that you explicitly commit these new revisions\n"
11358
"to your local branch. This requirement gives you an opportunity to test "
11359
"the\n"
11360
"resulting working tree for correctness, since the merged revisions could "
11361
"have\n"
11362
"made arbitrary changes. After testing, you should commit the merge using\n"
11363
"``bzr commit``. This clears up the diverged branches situation. Your "
11364
"local\n"
11365
"branch can now be pushed to the mainline.\n"
11366
msgstr ""
11367
11368
#: en/help_topics/eol.txt:1
11369
msgid ""
11370
"End of Line Conversion\n"
11371
"======================"
11372
msgstr ""
11373
11374
#: en/help_topics/eol.txt:4
11375
msgid ""
11376
"EOL conversion is provided as a content filter where Bazaar internally\n"
11377
"stores a canonical format but outputs a convenience format. See\n"
11378
"``bzr help content-filters`` for general information about using these."
11379
msgstr ""
11380
11381
#: en/help_topics/eol.txt:8
11382
msgid ""
11383
"Note: Content filtering is only supported in recently added formats,\n"
11384
"e.g. 1.14. Be sure that both the repository *and* the branch are\n"
11385
"in a recent format. (Just setting the format on the repository\n"
11386
"is not enough.) If content filtering does not appear to be working, use\n"
11387
"'bzr info -v' to confirm that the branch is using \"Working tree format 5\"\n"
11388
"or later."
11389
msgstr ""
11390
11391
#: en/help_topics/eol.txt:15
11392
msgid ""
11393
"EOL conversion needs to be enabled for selected file patterns using\n"
11394
"rules. See ``bzr help rules`` for general information on defining rules.\n"
11395
"Currently, rules are only supported in $BZR_HOME/.bazaar/rules (or\n"
11396
"%BZR_HOME%/bazaar/2.0/rules on Windows). Branch specific rules will be\n"
11397
"supported in a future verison of Bazaar."
11398
msgstr ""
11399
11400
#: en/help_topics/eol.txt:21
11401
msgid ""
11402
"To configure which files to filter, set ``eol`` to one of the values below.\n"
11403
"(If a value is not set, ``exact`` is the default.)"
11404
msgstr ""
11405
11406
#: en/help_topics/eol.txt:24
11407
msgid ""
11408
" ========== ===================================== ======================\n"
11409
" Value Checkout end-of-lines as Commit end-of-lines as\n"
11410
" ========== ===================================== ======================\n"
11411
" ``native`` ``crlf`` on Windows, ``lf`` otherwise ``lf``\n"
11412
" ---------- ------------------------------------- ----------------------\n"
11413
" ``lf`` ``lf`` ``lf``\n"
11414
" ---------- ------------------------------------- ----------------------\n"
11415
" ``crlf`` ``crlf`` ``lf``\n"
11416
" ---------- ------------------------------------- ----------------------\n"
11417
" ``exact`` No conversion Exactly as in file\n"
11418
" ========== ===================================== ======================"
11419
msgstr ""
11420
11421
#: en/help_topics/eol.txt:36
11422
msgid ""
11423
"Note: For safety reasons, no conversion is applied to any file where a null\n"
11424
"byte is detected in the file."
11425
msgstr ""
11426
11427
#: en/help_topics/eol.txt:39
11428
msgid ""
11429
"For users working on a cross-platform project, here is a suggested rule\n"
11430
"to use as a starting point::"
11431
msgstr ""
11432
11433
#: en/help_topics/eol.txt:42 en/help_topics/eol.txt:52
11434
#: en/help_topics/eol.txt:67 en/help_topics/eol.txt:82
11435
msgid ""
11436
" [name *]\n"
11437
" eol = native"
11438
msgstr ""
11439
11440
#: en/help_topics/eol.txt:45
11441
msgid ""
11442
"If you have binary files that do not contain a null byte though, be\n"
11443
"sure to add ``eol = exact`` rules for those as well. You can do this\n"
11444
"by giving more explicit patterns earlier in the rules file. For example::"
11445
msgstr ""
11446
11447
#: en/help_topics/eol.txt:49
11448
msgid ""
11449
" [name *.png]\n"
11450
" eol = exact"
11451
msgstr ""
11452
11453
#: en/help_topics/eol.txt:55
11454
msgid ""
11455
"If your working tree is on a network drive shared by users on different\n"
11456
"operating systems, you typically want to force certain conventions for\n"
11457
"certain files. In that way, if a file is created with the wrong line\n"
11458
"endings or line endings get mixed during editing, it gets committed\n"
11459
"correctly and gets checked out correctly. For example::"
11460
msgstr ""
11461
11462
#: en/help_topics/eol.txt:61
11463
msgid ""
11464
" [name *.bat]\n"
11465
" eol = crlf"
11466
msgstr ""
11467
11468
#: en/help_topics/eol.txt:64
11469
msgid ""
11470
" [name *.sh]\n"
11471
" eol = lf"
11472
msgstr ""
11473
11474
#: en/help_topics/eol.txt:70
11475
msgid ""
11476
"If you take the care to create files with their required endings, you can\n"
11477
"achieve *almost* the same thing by using ``eol = exact``. It is slightly\n"
11478
"safer to use ``lf`` and ``crlf`` though because edits accidentally\n"
11479
"introducing mixed line endings will be corrected during commit for files\n"
11480
"with those settings."
11481
msgstr ""
11482
11483
#: en/help_topics/eol.txt:76
11484
msgid ""
11485
"If you have sample test data that deliberately has text files with mixed\n"
11486
"newline conventions, you can ask for those to be left alone like this::"
11487
msgstr ""
11488
11489
#: en/help_topics/eol.txt:79
11490
msgid ""
11491
" [name test_data/]\n"
11492
" eol = exact"
11493
msgstr ""
11494
11495
#: en/help_topics/eol.txt:85
11496
msgid ""
11497
"Note that ``exact`` does not imply the file is binary but it does mean\n"
11498
"that no conversion of end-of-lines will be done. (Bazaar currently relies\n"
11499
"of content analysis to detect binary files for commands like ``diff``.\n"
11500
"In the future, a ``binary = true`` rule may be added but it is not\n"
11501
"supported yet.)"
11502
msgstr ""
11503
11504
#: en/help_topics/eol.txt:91
11505
msgid ""
11506
"If you have an existing repository with text files already stored using\n"
11507
"Windows newline conventions (``crlf``), then you may want to keep using "
11508
"that\n"
11509
"convention in the repository. Forcing certain files to this convention\n"
11510
"may also help users who do not have rules configured. To do this, set\n"
11511
"``eol`` to one of the values below."
11512
msgstr ""
11513
11514
#: en/help_topics/eol.txt:97
11515
msgid ""
11516
" ============================ ======================== "
11517
"======================\n"
11518
" Value Checkout end-of-lines as Commit end-of-lines "
11519
"as\n"
11520
" ============================ ======================== "
11521
"======================\n"
11522
" ``native-with-crlf-in-repo`` ``crlf`` on Windows, ``crlf``\n"
11523
" ``lf`` otherwise\n"
11524
" ---------------------------- ------------------------ ----------------------"
11525
"\n"
11526
" ``lf-with-crlf-in-repo`` ``lf`` ``crlf``\n"
11527
" ---------------------------- ------------------------ ----------------------"
11528
"\n"
11529
" ``crlf-with-crlf-in-repo`` ``crlf`` ``crlf``\n"
11530
" ============================ ======================== ======================"
11531
msgstr ""
11532
11533
#: en/help_topics/eol.txt:108
11534
msgid ""
11535
"For users working on an existing project that uses Windows newline\n"
11536
"conventions in their Bazaar repository, this rule is suggested as a\n"
11537
"starting point::"
11538
msgstr ""
11539
11540
#: en/help_topics/eol.txt:112
11541
msgid ""
11542
" [name *]\n"
11543
" eol = native-with-crlf-in-repo"
11544
msgstr ""
11545
11546
#: en/help_topics/eol.txt:115
11547
msgid ""
11548
"For new projects, it is recommended that end-of-lines be stored as ``lf``\n"
11549
"and that users stick to the basic settings, i.e. ``native``, ``lf``,\n"
11550
"``crlf`` and ``exact``."
11551
msgstr ""
11552
11553
#: en/help_topics/eol.txt:119
11554
msgid ""
11555
"Note: Bazaar's EOL conversion will convert the content of files but\n"
11556
"never reject files because a given line ending or mixed line endings\n"
11557
"are found. A precommit hook should be used if you wish to validate\n"
11558
"(and not just convert) content before committing.\n"
11559
msgstr ""
11560
11561
#: en/help_topics/hidden-commands.txt:1
11562
msgid ""
11563
"added List files added in working tree.\n"
11564
"ancestry List all revisions merged into this branch.\n"
11565
"assert-fail Test reporting of assertion failures\n"
11566
"bundle-info Output interesting stats about a bundle\n"
11567
"bundle-revisions Create a merge-directive for submitting changes.\n"
11568
"cat-revision Write out metadata for a revision.\n"
11569
"dump-btree Dump the contents of a btree index file to stdout.\n"
11570
"export-pot Export command helps and error messages in po format.\n"
11571
"file-id Print file_id of a particular file or directory.\n"
11572
"file-path Print path of file_ids to a file or directory.\n"
11573
"find-merge-base Find and print a base revision for merging two "
11574
"branches.\n"
11575
"hooks Show hooks.\n"
11576
"inventory Show inventory of the current working copy or a "
11577
"revision.\n"
11578
"local-time-offset Show the offset in seconds from GMT to local time.\n"
11579
"lookup-revision Lookup the revision-id from a revision-number\n"
11580
"merge-directive Generate a merge directive for auto-merge tools.\n"
11581
"modified List files modified in working tree.\n"
11582
"re-sign Create a digital signature for an existing revision.\n"
11583
"reference list, view and set branch locations for nested trees.\n"
11584
"relpath Show path of a file relative to root\n"
11585
"repair-workingtree Reset the working tree state file.\n"
11586
"revision-history Display the list of revision ids on a branch.\n"
11587
"revision-info Show revision number and revision id for a given "
11588
"revision\n"
11589
" identifier.\n"
11590
"rocks Statement of optimism.\n"
11591
"selftest Run internal test suite.\n"
11592
"shell-complete Show appropriate completions for context.\n"
11593
"test-script Run a shell-like test from a file.\n"
11594
"touching-revisions Return revision-ids which affected a particular file.\n"
11595
"unknowns List unknown files.\n"
11596
"wait-until-signalled Test helper for\n"
11597
" test_start_and_stop_bzr_subprocess_send_signal.\n"
11598
msgstr ""
11599
11600
#: en/help_topics/hooks.txt:1
11601
msgid ""
11602
"\n"
11603
"Hooks\n"
11604
"====="
11605
msgstr ""
11606
11607
#: en/help_topics/hooks.txt:5 en/help_topics/rules.txt:4
11608
msgid ""
11609
"Introduction\n"
11610
"------------"
11611
msgstr ""
11612
11613
#: en/help_topics/hooks.txt:8
11614
msgid "A hook of type *xxx* of class *yyy* needs to be registered using::"
11615
msgstr ""
11616
11617
#: en/help_topics/hooks.txt:10
11618
msgid " yyy.hooks.install_named_hook(\"xxx\", ...)"
11619
msgstr ""
11620
11621
#: en/help_topics/hooks.txt:12
11622
msgid ""
11623
"See :doc:`Using hooks<../user-guide/hooks>` in the User Guide for examples."
11624
msgstr ""
11625
11626
#: en/help_topics/hooks.txt:14
11627
msgid ""
11628
"The class that contains each hook is given before the hooks it supplies. "
11629
"For\n"
11630
"instance, BranchHooks as the class is the hooks class for\n"
11631
"`bzrlib.branch.Branch.hooks`."
11632
msgstr ""
11633
11634
#: en/help_topics/hooks.txt:18
11635
msgid ""
11636
"Each description also indicates whether the hook runs on the client (the\n"
11637
"machine where bzr was invoked) or the server (the machine addressed by\n"
11638
"the branch URL). These may be, but are not necessarily, the same machine."
11639
msgstr ""
11640
11641
#: en/help_topics/hooks.txt:22
11642
msgid ""
11643
"Plugins (including hooks) are run on the server if all of these is true:"
11644
msgstr ""
11645
11646
#: en/help_topics/hooks.txt:24
11647
msgid ""
11648
" * The connection is via a smart server (accessed with a URL starting with\n"
11649
" \"bzr://\", \"bzr+ssh://\" or \"bzr+http://\", or accessed via a "
11650
"\"http://\"\n"
11651
" URL when a smart server is available via HTTP)."
11652
msgstr ""
11653
11654
#: en/help_topics/hooks.txt:28
11655
msgid ""
11656
" * The hook is either server specific or part of general infrastructure "
11657
"rather\n"
11658
" than client specific code (such as commit)."
11659
msgstr ""
11660
11661
#: en/help_topics/hooks.txt:31
11662
msgid ""
11663
"\n"
11664
"BranchHooks\n"
11665
"-----------"
11666
msgstr ""
11667
11668
#: en/help_topics/hooks.txt:35
11669
msgid ""
11670
"automatic_tag_name\n"
11671
"~~~~~~~~~~~~~~~~~~"
11672
msgstr ""
11673
11674
#: en/help_topics/hooks.txt:38 en/help_topics/hooks.txt:56
11675
#: en/help_topics/hooks.txt:102 en/help_topics/hooks.txt:259
11676
msgid "Introduced in: 2.2"
11677
msgstr ""
11678
11679
#: en/help_topics/hooks.txt:40
11680
msgid ""
11681
"Called to determine an automatic tag name for a revision.\n"
11682
"automatic_tag_name is called with (branch, revision_id) and should\n"
11683
"return a tag name or None if no tag name could be determined. The\n"
11684
"first non-None tag name returned will be used."
11685
msgstr ""
11686
11687
#: en/help_topics/hooks.txt:45
11688
msgid ""
11689
"open\n"
11690
"~~~~"
11691
msgstr ""
11692
11693
#: en/help_topics/hooks.txt:48 en/help_topics/hooks.txt:290
11694
#: en/help_topics/hooks.txt:304
11695
msgid "Introduced in: 1.8"
11696
msgstr ""
11697
11698
#: en/help_topics/hooks.txt:50
11699
msgid ""
11700
"Called with the Branch object that has been opened after a branch is\n"
11701
"opened."
11702
msgstr ""
11703
11704
#: en/help_topics/hooks.txt:53
11705
msgid ""
11706
"post_branch_init\n"
11707
"~~~~~~~~~~~~~~~~"
11708
msgstr ""
11709
11710
#: en/help_topics/hooks.txt:58
11711
msgid ""
11712
"Called after new branch initialization completes. post_branch_init is\n"
11713
"called with a bzrlib.branch.BranchInitHookParams. Note that init,\n"
11714
"branch and checkout (both heavyweight and lightweight) will all\n"
11715
"trigger this hook."
11716
msgstr ""
11717
11718
#: en/help_topics/hooks.txt:63
11719
msgid ""
11720
"post_change_branch_tip\n"
11721
"~~~~~~~~~~~~~~~~~~~~~~"
11722
msgstr ""
11723
11724
#: en/help_topics/hooks.txt:66 en/help_topics/hooks.txt:402
11725
msgid "Introduced in: 1.4"
11726
msgstr ""
11727
11728
#: en/help_topics/hooks.txt:68
11729
msgid ""
11730
"Called in bzr client and server after a change to the tip of a branch\n"
11731
"is made. post_change_branch_tip is called with a\n"
11732
"bzrlib.branch.ChangeBranchTipParams. Note that push, pull, commit,\n"
11733
"uncommit will all trigger this hook."
11734
msgstr ""
11735
11736
#: en/help_topics/hooks.txt:73 en/help_topics/hooks.txt:389
11737
msgid ""
11738
"post_commit\n"
11739
"~~~~~~~~~~~"
11740
msgstr ""
11741
11742
#: en/help_topics/hooks.txt:76 en/help_topics/hooks.txt:86
11743
#: en/help_topics/hooks.txt:94 en/help_topics/hooks.txt:110
11744
#: en/help_topics/hooks.txt:145
11745
msgid "Introduced in: 0.15"
11746
msgstr ""
11747
11748
#: en/help_topics/hooks.txt:78
11749
msgid ""
11750
"Called in the bzr client after a commit has completed. post_commit is\n"
11751
"called with (local, master, old_revno, old_revid, new_revno,\n"
11752
"new_revid). old_revid is NULL_REVISION for the first commit to a\n"
11753
"branch."
11754
msgstr ""
11755
11756
#: en/help_topics/hooks.txt:83
11757
msgid ""
11758
"post_pull\n"
11759
"~~~~~~~~~"
11760
msgstr ""
11761
11762
#: en/help_topics/hooks.txt:88
11763
msgid ""
11764
"Called after a pull operation completes. post_pull is called with a\n"
11765
"bzrlib.branch.PullResult object and only runs in the bzr client."
11766
msgstr ""
11767
11768
#: en/help_topics/hooks.txt:91
11769
msgid ""
11770
"post_push\n"
11771
"~~~~~~~~~"
11772
msgstr ""
11773
11774
#: en/help_topics/hooks.txt:96
11775
msgid ""
11776
"Called after a push operation completes. post_push is called with a\n"
11777
"bzrlib.branch.BranchPushResult object and only runs in the bzr client."
11778
msgstr ""
11779
11780
#: en/help_topics/hooks.txt:99
11781
msgid ""
11782
"post_switch\n"
11783
"~~~~~~~~~~~"
11784
msgstr ""
11785
11786
#: en/help_topics/hooks.txt:104
11787
msgid ""
11788
"Called after a checkout switches branch. post_switch is called with a\n"
11789
"bzrlib.branch.SwitchHookParams."
11790
msgstr ""
11791
11792
#: en/help_topics/hooks.txt:107
11793
msgid ""
11794
"post_uncommit\n"
11795
"~~~~~~~~~~~~~"
11796
msgstr ""
11797
11798
#: en/help_topics/hooks.txt:112
11799
msgid ""
11800
"Called in the bzr client after an uncommit completes. post_uncommit is\n"
11801
"called with (local, master, old_revno, old_revid, new_revno,\n"
11802
"new_revid) where local is the local branch or None, master is the\n"
11803
"target branch, and an empty branch receives new_revno of 0, new_revid\n"
11804
"of None."
11805
msgstr ""
11806
11807
#: en/help_topics/hooks.txt:118
11808
msgid ""
11809
"pre_change_branch_tip\n"
11810
"~~~~~~~~~~~~~~~~~~~~~"
11811
msgstr ""
11812
11813
#: en/help_topics/hooks.txt:121
11814
msgid "Introduced in: 1.6"
11815
msgstr ""
11816
11817
#: en/help_topics/hooks.txt:123
11818
msgid ""
11819
"Called in bzr client and server before a change to the tip of a branch\n"
11820
"is made. pre_change_branch_tip is called with a\n"
11821
"bzrlib.branch.ChangeBranchTipParams. Note that push, pull, commit,\n"
11822
"uncommit will all trigger this hook."
11823
msgstr ""
11824
11825
#: en/help_topics/hooks.txt:128
11826
msgid ""
11827
"pre_commit\n"
11828
"~~~~~~~~~~"
11829
msgstr ""
11830
11831
#: en/help_topics/hooks.txt:131
11832
msgid "Introduced in: 0.91"
11833
msgstr ""
11834
11835
#: en/help_topics/hooks.txt:133
11836
msgid ""
11837
"Called after a commit is calculated but before it is completed.\n"
11838
"pre_commit is called with (local, master, old_revno, old_revid,\n"
11839
"future_revno, future_revid, tree_delta, future_tree). old_revid is\n"
11840
"NULL_REVISION for the first commit to a branch, tree_delta is a\n"
11841
"TreeDelta object describing changes from the basis revision. hooks\n"
11842
"MUST NOT modify this delta. future_tree is an in-memory tree obtained\n"
11843
"from CommitBuilder.revision_tree() and hooks MUST NOT modify this\n"
11844
"tree."
11845
msgstr ""
11846
11847
#: en/help_topics/hooks.txt:142
11848
msgid ""
11849
"set_rh\n"
11850
"~~~~~~"
11851
msgstr ""
11852
11853
#: en/help_topics/hooks.txt:147
11854
msgid ""
11855
"Invoked whenever the revision history has been set via\n"
11856
"set_revision_history. The api signature is (branch, revision_history),\n"
11857
"and the branch will be write-locked. The set_rh hook can be expensive\n"
11858
"for bzr to trigger, a better hook to use is\n"
11859
"Branch.post_change_branch_tip."
11860
msgstr ""
11861
11862
#: en/help_topics/hooks.txt:153
11863
msgid ""
11864
"transform_fallback_location\n"
11865
"~~~~~~~~~~~~~~~~~~~~~~~~~~~"
11866
msgstr ""
11867
11868
#: en/help_topics/hooks.txt:156
11869
msgid "Introduced in: 1.9"
11870
msgstr ""
11871
11872
#: en/help_topics/hooks.txt:158
11873
msgid ""
11874
"Called when a stacked branch is activating its fallback locations.\n"
11875
"transform_fallback_location is called with (branch, url), and should\n"
11876
"return a new url. Returning the same url allows it to be used as-is,\n"
11877
"returning a different one can be used to cause the branch to stack on\n"
11878
"a closer copy of that fallback_location. Note that the branch cannot\n"
11879
"have history accessing methods called on it during this hook because\n"
11880
"the fallback locations have not been activated. When there are\n"
11881
"multiple hooks installed for transform_fallback_location, all are\n"
11882
"called with the url returned from the previous hook.The order is\n"
11883
"however undefined."
11884
msgstr ""
11885
11886
#: en/help_topics/hooks.txt:169
11887
msgid ""
11888
"CommandHooks\n"
11889
"------------"
11890
msgstr ""
11891
11892
#: en/help_topics/hooks.txt:172
11893
msgid ""
11894
"extend_command\n"
11895
"~~~~~~~~~~~~~~"
11896
msgstr ""
11897
11898
#: en/help_topics/hooks.txt:175
11899
msgid "Introduced in: 1.13"
11900
msgstr ""
11901
11902
#: en/help_topics/hooks.txt:177
11903
msgid ""
11904
"Called after creating a command object to allow modifications such as\n"
11905
"adding or removing options, docs etc. Called with the new\n"
11906
"bzrlib.commands.Command object."
11907
msgstr ""
11908
11909
#: en/help_topics/hooks.txt:181
11910
msgid ""
11911
"get_command\n"
11912
"~~~~~~~~~~~"
11913
msgstr ""
11914
11915
#: en/help_topics/hooks.txt:184 en/help_topics/hooks.txt:196
11916
#: en/help_topics/hooks.txt:205 en/help_topics/hooks.txt:448
11917
msgid "Introduced in: 1.17"
11918
msgstr ""
11919
11920
#: en/help_topics/hooks.txt:186
11921
msgid ""
11922
"Called when creating a single command. Called with (cmd_or_None,\n"
11923
"command_name). get_command should either return the cmd_or_None\n"
11924
"parameter, or a replacement Command object that should be used for the\n"
11925
"command. Note that the Command.hooks hooks are core infrastructure.\n"
11926
"Many users will prefer to use bzrlib.commands.register_command or\n"
11927
"plugin_cmds.register_lazy."
11928
msgstr ""
11929
11930
#: en/help_topics/hooks.txt:193
11931
msgid ""
11932
"get_missing_command\n"
11933
"~~~~~~~~~~~~~~~~~~~"
11934
msgstr ""
11935
11936
#: en/help_topics/hooks.txt:198
11937
msgid ""
11938
"Called when creating a single command if no command could be found.\n"
11939
"Called with (command_name). get_missing_command should either return\n"
11940
"None, or a Command object to be used for the command."
11941
msgstr ""
11942
11943
#: en/help_topics/hooks.txt:202
11944
msgid ""
11945
"list_commands\n"
11946
"~~~~~~~~~~~~~"
11947
msgstr ""
11948
11949
#: en/help_topics/hooks.txt:207
11950
msgid ""
11951
"Called when enumerating commands. Called with a set of cmd_name\n"
11952
"strings for all the commands found so far. This set is safe to mutate\n"
11953
"- e.g. to remove a command. list_commands should return the updated\n"
11954
"set of command names."
11955
msgstr ""
11956
11957
#: en/help_topics/hooks.txt:212
11958
msgid ""
11959
"_ConfigHooks\n"
11960
"------------"
11961
msgstr ""
11962
11963
#: en/help_topics/hooks.txt:215
11964
msgid ""
11965
"get\n"
11966
"~~~"
11967
msgstr ""
11968
11969
#: en/help_topics/hooks.txt:218 en/help_topics/hooks.txt:226
11970
#: en/help_topics/hooks.txt:233 en/help_topics/hooks.txt:241
11971
#: en/help_topics/hooks.txt:248 en/help_topics/hooks.txt:370
11972
#: en/help_topics/hooks.txt:427
11973
msgid "Introduced in: 2.4"
11974
msgstr ""
11975
11976
#: en/help_topics/hooks.txt:220
11977
msgid ""
11978
"Invoked when a config option is read. The signature is (stack, name,\n"
11979
"value)."
11980
msgstr ""
11981
11982
#: en/help_topics/hooks.txt:223
11983
msgid ""
11984
"load\n"
11985
"~~~~"
11986
msgstr ""
11987
11988
#: en/help_topics/hooks.txt:228
11989
msgid "Invoked when a config store is loaded. The signature is (store)."
11990
msgstr ""
11991
11992
#: en/help_topics/hooks.txt:230
11993
msgid ""
11994
"remove\n"
11995
"~~~~~~"
11996
msgstr ""
11997
11998
#: en/help_topics/hooks.txt:235
11999
msgid ""
12000
"Invoked when a config option is removed. The signature is (stack,\n"
12001
"name)."
12002
msgstr ""
12003
12004
#: en/help_topics/hooks.txt:238
12005
msgid ""
12006
"save\n"
12007
"~~~~"
12008
msgstr ""
12009
12010
#: en/help_topics/hooks.txt:243
12011
msgid "Invoked when a config store is saved. The signature is (store)."
12012
msgstr ""
12013
12014
#: en/help_topics/hooks.txt:245
12015
msgid ""
12016
"set\n"
12017
"~~~"
12018
msgstr ""
12019
12020
#: en/help_topics/hooks.txt:250
12021
msgid ""
12022
"Invoked when a config option is set. The signature is (stack, name,\n"
12023
"value)."
12024
msgstr ""
12025
12026
#: en/help_topics/hooks.txt:253
12027
msgid ""
12028
"ControlDirHooks\n"
12029
"---------------"
12030
msgstr ""
12031
12032
#: en/help_topics/hooks.txt:256
12033
msgid ""
12034
"post_repo_init\n"
12035
"~~~~~~~~~~~~~~"
12036
msgstr ""
12037
12038
#: en/help_topics/hooks.txt:261
12039
msgid ""
12040
"Invoked after a repository has been initialized. post_repo_init is\n"
12041
"called with a bzrlib.controldir.RepoInitHookParams."
12042
msgstr ""
12043
12044
#: en/help_topics/hooks.txt:264
12045
msgid ""
12046
"pre_open\n"
12047
"~~~~~~~~"
12048
msgstr ""
12049
12050
#: en/help_topics/hooks.txt:267
12051
msgid "Introduced in: 1.14"
12052
msgstr ""
12053
12054
#: en/help_topics/hooks.txt:269
12055
msgid ""
12056
"Invoked before attempting to open a ControlDir with the transport that\n"
12057
"the open will use."
12058
msgstr ""
12059
12060
#: en/help_topics/hooks.txt:272
12061
msgid ""
12062
"InfoHooks\n"
12063
"---------"
12064
msgstr ""
12065
12066
#: en/help_topics/hooks.txt:275
12067
msgid ""
12068
"repository\n"
12069
"~~~~~~~~~~"
12070
msgstr ""
12071
12072
#: en/help_topics/hooks.txt:278 en/help_topics/hooks.txt:297
12073
#: en/help_topics/hooks.txt:505
12074
msgid "Introduced in: 1.15"
12075
msgstr ""
12076
12077
#: en/help_topics/hooks.txt:280
12078
msgid ""
12079
"Invoked when displaying the statistics for a repository. repository is\n"
12080
"called with a statistics dictionary as returned by the repository and\n"
12081
"a file-like object to write to."
12082
msgstr ""
12083
12084
#: en/help_topics/hooks.txt:284
12085
msgid ""
12086
"LockHooks\n"
12087
"---------"
12088
msgstr ""
12089
12090
#: en/help_topics/hooks.txt:287
12091
msgid ""
12092
"lock_acquired\n"
12093
"~~~~~~~~~~~~~"
12094
msgstr ""
12095
12096
#: en/help_topics/hooks.txt:292
12097
msgid ""
12098
"Called with a bzrlib.lock.LockResult when a physical lock is acquired."
12099
msgstr ""
12100
12101
#: en/help_topics/hooks.txt:294
12102
msgid ""
12103
"lock_broken\n"
12104
"~~~~~~~~~~~"
12105
msgstr ""
12106
12107
#: en/help_topics/hooks.txt:299
12108
msgid "Called with a bzrlib.lock.LockResult when a physical lock is broken."
12109
msgstr ""
12110
12111
#: en/help_topics/hooks.txt:301
12112
msgid ""
12113
"lock_released\n"
12114
"~~~~~~~~~~~~~"
12115
msgstr ""
12116
12117
#: en/help_topics/hooks.txt:306
12118
msgid ""
12119
"Called with a bzrlib.lock.LockResult when a physical lock is released."
12120
msgstr ""
12121
12122
#: en/help_topics/hooks.txt:308
12123
msgid ""
12124
"MergeHooks\n"
12125
"----------"
12126
msgstr ""
12127
12128
#: en/help_topics/hooks.txt:311
12129
msgid ""
12130
"merge_file_content\n"
12131
"~~~~~~~~~~~~~~~~~~"
12132
msgstr ""
12133
12134
#: en/help_topics/hooks.txt:314
12135
msgid "Introduced in: 2.1"
12136
msgstr ""
12137
12138
#: en/help_topics/hooks.txt:316
12139
msgid ""
12140
"Called with a bzrlib.merge.Merger object to create a per file merge\n"
12141
"object when starting a merge. Should return either None or a subclass\n"
12142
"of ``bzrlib.merge.AbstractPerFileMerger``. Such objects will then be\n"
12143
"called per file that needs to be merged (including when one side has\n"
12144
"deleted the file and the other has changed it). See the\n"
12145
"AbstractPerFileMerger API docs for details on how it is used by merge."
12146
msgstr ""
12147
12148
#: en/help_topics/hooks.txt:323
12149
msgid ""
12150
"post_merge\n"
12151
"~~~~~~~~~~"
12152
msgstr ""
12153
12154
#: en/help_topics/hooks.txt:326 en/help_topics/hooks.txt:334
12155
#: en/help_topics/hooks.txt:384 en/help_topics/hooks.txt:493
12156
msgid "Introduced in: 2.5"
12157
msgstr ""
12158
12159
#: en/help_topics/hooks.txt:328
12160
msgid ""
12161
"Called after a merge. Receives a Merger object as the single argument.\n"
12162
"The return value is ignored."
12163
msgstr ""
12164
12165
#: en/help_topics/hooks.txt:331
12166
msgid ""
12167
"pre_merge\n"
12168
"~~~~~~~~~"
12169
msgstr ""
12170
12171
#: en/help_topics/hooks.txt:336
12172
msgid ""
12173
"Called before a merge. Receives a Merger object as the single\n"
12174
"argument."
12175
msgstr ""
12176
12177
#: en/help_topics/hooks.txt:339
12178
msgid ""
12179
"MergeDirectiveHooks\n"
12180
"-------------------"
12181
msgstr ""
12182
12183
#: en/help_topics/hooks.txt:342
12184
msgid ""
12185
"merge_request_body\n"
12186
"~~~~~~~~~~~~~~~~~~"
12187
msgstr ""
12188
12189
#: en/help_topics/hooks.txt:345
12190
msgid "Introduced in: 1.15.0"
12191
msgstr ""
12192
12193
#: en/help_topics/hooks.txt:347
12194
msgid ""
12195
"Called with a MergeRequestBodyParams when a body is needed for a merge\n"
12196
"request. Callbacks must return a body. If more than one callback is\n"
12197
"registered, the output of one callback is provided to the next."
12198
msgstr ""
12199
12200
#: en/help_topics/hooks.txt:351
12201
msgid ""
12202
"MessageEditorHooks\n"
12203
"------------------"
12204
msgstr ""
12205
12206
#: en/help_topics/hooks.txt:354
12207
msgid ""
12208
"commit_message_template\n"
12209
"~~~~~~~~~~~~~~~~~~~~~~~"
12210
msgstr ""
12211
12212
#: en/help_topics/hooks.txt:357
12213
msgid "Introduced in: 1.10"
12214
msgstr ""
12215
12216
#: en/help_topics/hooks.txt:359
12217
msgid ""
12218
"Called when a commit message is being generated.\n"
12219
"commit_message_template is called with the bzrlib.commit.Commit object\n"
12220
"and the message that is known so far. commit_message_template must\n"
12221
"return a new message to use (which could be the same as it was given).\n"
12222
"When there are multiple hooks registered for commit_message_template,\n"
12223
"they are chained with the result from the first passed into the\n"
12224
"second, and so on."
12225
msgstr ""
12226
12227
#: en/help_topics/hooks.txt:367
12228
msgid ""
12229
"set_commit_message\n"
12230
"~~~~~~~~~~~~~~~~~~"
12231
msgstr ""
12232
12233
#: en/help_topics/hooks.txt:372
12234
msgid ""
12235
"Set a fixed commit message. set_commit_message is called with the\n"
12236
"bzrlib.commit.Commit object (so you can also change e.g. revision\n"
12237
"properties by editing commit.builder._revprops) and the message so\n"
12238
"far. set_commit_message must return the message to use or None if it\n"
12239
"should use the message editor as normal."
12240
msgstr ""
12241
12242
#: en/help_topics/hooks.txt:378
12243
msgid ""
12244
"MutableTreeHooks\n"
12245
"----------------"
12246
msgstr ""
12247
12248
#: en/help_topics/hooks.txt:381
12249
msgid ""
12250
"post_build_tree\n"
12251
"~~~~~~~~~~~~~~~"
12252
msgstr ""
12253
12254
#: en/help_topics/hooks.txt:386
12255
msgid ""
12256
"Called after a completely new tree is built. The hook is called with\n"
12257
"the tree as its only argument."
12258
msgstr ""
12259
12260
#: en/help_topics/hooks.txt:392
12261
msgid "Introduced in: 2.0"
12262
msgstr ""
12263
12264
#: en/help_topics/hooks.txt:394
12265
msgid ""
12266
"Called after a commit is performed on a tree. The hook is called with\n"
12267
"a bzrlib.mutabletree.PostCommitHookParams object. The mutable tree the\n"
12268
"commit was performed on is available via the mutable_tree attribute of\n"
12269
"that object."
12270
msgstr ""
12271
12272
#: en/help_topics/hooks.txt:399
12273
msgid ""
12274
"start_commit\n"
12275
"~~~~~~~~~~~~"
12276
msgstr ""
12277
12278
#: en/help_topics/hooks.txt:404
12279
msgid ""
12280
"Called before a commit is performed on a tree. The start commit hook\n"
12281
"is able to change the tree before the commit takes place. start_commit\n"
12282
"is called with the bzrlib.mutabletree.MutableTree that the commit is\n"
12283
"being performed on."
12284
msgstr ""
12285
12286
#: en/help_topics/hooks.txt:409
12287
msgid ""
12288
"SmartClientHooks\n"
12289
"----------------"
12290
msgstr ""
12291
12292
#: en/help_topics/hooks.txt:412
12293
msgid ""
12294
"call\n"
12295
"~~~~"
12296
msgstr ""
12297
12298
#: en/help_topics/hooks.txt:415
12299
msgid "Introduced in: unknown"
12300
msgstr ""
12301
12302
#: en/help_topics/hooks.txt:417
12303
msgid ""
12304
"Called when the smart client is submitting a request to the smart\n"
12305
"server. Called with a bzrlib.smart.client.CallHookParams object.\n"
12306
"Streaming request bodies, and responses, are not accessible."
12307
msgstr ""
12308
12309
#: en/help_topics/hooks.txt:421
12310
msgid ""
12311
"SmartServerHooks\n"
12312
"----------------"
12313
msgstr ""
12314
12315
#: en/help_topics/hooks.txt:424
12316
msgid ""
12317
"server_exception\n"
12318
"~~~~~~~~~~~~~~~~"
12319
msgstr ""
12320
12321
#: en/help_topics/hooks.txt:429
12322
msgid ""
12323
"Called by the bzr server when an exception occurs. server_exception is\n"
12324
"called with the sys.exc_info() tuple return true for the hook if the\n"
12325
"exception has been handled, in which case the server will exit\n"
12326
"normally."
12327
msgstr ""
12328
12329
#: en/help_topics/hooks.txt:434
12330
msgid ""
12331
"server_started\n"
12332
"~~~~~~~~~~~~~~"
12333
msgstr ""
12334
12335
#: en/help_topics/hooks.txt:437 en/help_topics/hooks.txt:456
12336
msgid "Introduced in: 0.16"
12337
msgstr ""
12338
12339
#: en/help_topics/hooks.txt:439
12340
msgid ""
12341
"Called by the bzr server when it starts serving a directory.\n"
12342
"server_started is called with (backing urls, public url), where\n"
12343
"backing_url is a list of URLs giving the server-specific directory\n"
12344
"locations, and public_url is the public URL for the directory being\n"
12345
"served."
12346
msgstr ""
12347
12348
#: en/help_topics/hooks.txt:445
12349
msgid ""
12350
"server_started_ex\n"
12351
"~~~~~~~~~~~~~~~~~"
12352
msgstr ""
12353
12354
#: en/help_topics/hooks.txt:450
12355
msgid ""
12356
"Called by the bzr server when it starts serving a directory.\n"
12357
"server_started is called with (backing_urls, server_obj)."
12358
msgstr ""
12359
12360
#: en/help_topics/hooks.txt:453
12361
msgid ""
12362
"server_stopped\n"
12363
"~~~~~~~~~~~~~~"
12364
msgstr ""
12365
12366
#: en/help_topics/hooks.txt:458
12367
msgid ""
12368
"Called by the bzr server when it stops serving a directory.\n"
12369
"server_stopped is called with the same parameters as the\n"
12370
"server_started hook: (backing_urls, public_url)."
12371
msgstr ""
12372
12373
#: en/help_topics/hooks.txt:462
12374
msgid ""
12375
"StatusHooks\n"
12376
"-----------"
12377
msgstr ""
12378
12379
#: en/help_topics/hooks.txt:465
12380
msgid ""
12381
"post_status\n"
12382
"~~~~~~~~~~~"
12383
msgstr ""
12384
12385
#: en/help_topics/hooks.txt:468 en/help_topics/hooks.txt:479
12386
msgid "Introduced in: 2.3"
12387
msgstr ""
12388
12389
#: en/help_topics/hooks.txt:470
12390
msgid ""
12391
"Called with argument StatusHookParams after Bazaar has displayed the\n"
12392
"status. StatusHookParams has the attributes (old_tree, new_tree,\n"
12393
"to_file, versioned, show_ids, short, verbose). The last four arguments\n"
12394
"correspond to the command line options specified by the user for the\n"
12395
"status command. to_file is the output stream for writing."
12396
msgstr ""
12397
12398
#: en/help_topics/hooks.txt:476
12399
msgid ""
12400
"pre_status\n"
12401
"~~~~~~~~~~"
12402
msgstr ""
12403
12404
#: en/help_topics/hooks.txt:481
12405
msgid ""
12406
"Called with argument StatusHookParams before Bazaar displays the\n"
12407
"status. StatusHookParams has the attributes (old_tree, new_tree,\n"
12408
"to_file, versioned, show_ids, short, verbose). The last four arguments\n"
12409
"correspond to the command line options specified by the user for the\n"
12410
"status command. to_file is the output stream for writing."
12411
msgstr ""
12412
12413
#: en/help_topics/hooks.txt:487
12414
msgid ""
12415
"TransportHooks\n"
12416
"--------------"
12417
msgstr ""
12418
12419
#: en/help_topics/hooks.txt:490
12420
msgid ""
12421
"post_connect\n"
12422
"~~~~~~~~~~~~"
12423
msgstr ""
12424
12425
#: en/help_topics/hooks.txt:495
12426
msgid ""
12427
"Called after a new connection is established or a reconnect occurs.\n"
12428
"The sole argument passed is either the connected transport or smart\n"
12429
"medium instance."
12430
msgstr ""
12431
12432
#: en/help_topics/hooks.txt:499
12433
msgid ""
12434
"RioVersionInfoBuilderHooks\n"
12435
"--------------------------"
12436
msgstr ""
12437
12438
#: en/help_topics/hooks.txt:502
12439
msgid ""
12440
"revision\n"
12441
"~~~~~~~~"
12442
msgstr ""
12443
12444
#: en/help_topics/hooks.txt:507
12445
msgid ""
12446
"Invoked when adding information about a revision to the RIO stanza\n"
12447
"that is printed. revision is called with a revision object and a RIO\n"
12448
"stanza.\n"
12449
msgstr ""
12450
12451
#: en/help_topics/location-alias.txt:1
12452
msgid ""
12453
"Location aliases\n"
12454
"================"
12455
msgstr ""
12456
12457
#: en/help_topics/location-alias.txt:4
12458
msgid ""
12459
"Bazaar defines several aliases for locations associated with a branch. "
12460
"These\n"
12461
"can be used with most commands that expect a location, such as `bzr push`."
12462
msgstr ""
12463
12464
#: en/help_topics/location-alias.txt:7
12465
msgid "The aliases are::"
12466
msgstr ""
12467
12468
#: en/help_topics/location-alias.txt:9
12469
msgid ""
12470
" :bound The branch this branch is bound to, for bound branches.\n"
12471
" :parent The parent of this branch.\n"
12472
" :public The public location of this branch.\n"
12473
" :push The saved location used for `bzr push` with no arguments.\n"
12474
" :submit The submit branch for this branch.\n"
12475
" :this This branch."
12476
msgstr ""
12477
12478
#: en/help_topics/location-alias.txt:16
12479
msgid "For example, to push to the parent location::"
12480
msgstr ""
12481
12482
#: en/help_topics/location-alias.txt:18
12483
msgid " bzr push :parent\n"
12484
msgstr ""
12485
12486
#: en/help_topics/log-formats.txt:1
12487
msgid ""
12488
"Log Formats\n"
12489
"==========="
12490
msgstr ""
12491
12492
#: en/help_topics/log-formats.txt:4
12493
msgid ""
12494
"A log format controls how information about each revision is displayed.\n"
12495
"The standard log formats are compared below::"
12496
msgstr ""
12497
12498
#: en/help_topics/log-formats.txt:7
12499
msgid ""
12500
" Feature long short line\n"
12501
" ---------------------- ------------- ------------ -------------------\n"
12502
" design goal detailed view concise view 1 revision per line\n"
12503
" committer name+email name only name only\n"
12504
" author name+email - -\n"
12505
" date-time format full date only date only\n"
12506
" commit message full full top line\n"
12507
" tags yes yes yes\n"
12508
" merges indicator - yes -\n"
12509
" status/delta optional optional -\n"
12510
" diff/patch optional optional -\n"
12511
" revision-id optional optional -\n"
12512
" branch nick yes - -\n"
12513
" foreign vcs properties yes yes -\n"
12514
" preferred levels all 1 1\n"
12515
" digital signature optional - -"
12516
msgstr ""
12517
12518
#: en/help_topics/log-formats.txt:24
12519
msgid ""
12520
"The default format is ``long``. To change this, define the ``log_format``\n"
12521
"setting in the ``[DEFAULT]`` section of ``bazaar.conf`` like this (say)::"
12522
msgstr ""
12523
12524
#: en/help_topics/log-formats.txt:27
12525
msgid ""
12526
" [DEFAULT]\n"
12527
" log_format = short"
12528
msgstr ""
12529
12530
#: en/help_topics/log-formats.txt:30
12531
msgid ""
12532
"Alternatively, to change the log format used for a given query, use the\n"
12533
"--long, --short or --line options."
12534
msgstr ""
12535
12536
#: en/help_topics/log-formats.txt:33
12537
msgid ""
12538
"If one of the standard log formats does not meet your needs, additional\n"
12539
"formats can be provided by plugins.\n"
12540
msgstr ""
12541
12542
#: en/help_topics/other-formats.txt:1
12543
msgid "Other Storage Formats"
12544
msgstr ""
12545
12546
#: en/help_topics/other-formats.txt:3
12547
msgid "Experimental formats are shown below."
12548
msgstr ""
12549
12550
#: en/help_topics/other-formats.txt:5
12551
msgid ""
12552
":development-colo:\n"
12553
" (native) The 2a format with experimental support for colocated\n"
12554
" branches."
12555
msgstr ""
12556
12557
#: en/help_topics/other-formats.txt:9
12558
msgid ""
12559
"\n"
12560
"Deprecated formats are shown below."
12561
msgstr ""
12562
12563
#: en/help_topics/other-formats.txt:12
12564
msgid ""
12565
":pack-0.92:\n"
12566
" (native) Pack-based format used in 1.x series. Introduced in 0.92.\n"
12567
" Interoperates with bzr repositories before 0.92 but cannot be read\n"
12568
" by bzr < 0.92."
12569
msgstr ""
12570
12571
#: en/help_topics/patterns.txt:1
12572
msgid ""
12573
"Patterns\n"
12574
"========"
12575
msgstr ""
12576
12577
#: en/help_topics/patterns.txt:4
12578
msgid ""
12579
"Bazaar uses patterns to match files at various times. For example,\n"
12580
"the ``add`` command skips over files that match ignore patterns\n"
12581
"and preferences can be associated with files using rule patterns.\n"
12582
"The pattern syntax is described below."
12583
msgstr ""
12584
12585
#: en/help_topics/patterns.txt:9
12586
msgid ""
12587
"Trailing slashes on patterns are ignored. If the pattern contains a\n"
12588
"slash or is a regular expression, it is compared to the whole path\n"
12589
"from the branch root. Otherwise, it is compared to only the last\n"
12590
"component of the path. To match a file only in the root directory,\n"
12591
"prepend ``./``. Patterns specifying absolute paths are not allowed."
12592
msgstr ""
12593
12594
#: en/help_topics/patterns.txt:15
12595
msgid "Patterns may include globbing wildcards such as::"
12596
msgstr ""
12597
12598
#: en/help_topics/patterns.txt:17
12599
msgid ""
12600
" ? - Matches any single character except '/'\n"
12601
" * - Matches 0 or more characters except '/'\n"
12602
" /**/ - Matches 0 or more directories in a path\n"
12603
" [a-z] - Matches a single character from within a group of characters"
12604
msgstr ""
12605
12606
#: en/help_topics/patterns.txt:22
12607
msgid ""
12608
"Patterns may also be `Python regular expressions`_. Regular expression\n"
12609
"patterns are identified by a ``RE:`` prefix followed by the regular\n"
12610
"expression. Regular expression patterns may not include named or\n"
12611
"numbered groups."
12612
msgstr ""
12613
12614
#: en/help_topics/patterns.txt:27
12615
msgid ""
12616
"Case insensitive ignore patterns can be specified with regular expressions\n"
12617
"by using the ``i`` (for ignore case) flag in the pattern."
12618
msgstr ""
12619
12620
#: en/help_topics/patterns.txt:30
12621
msgid ""
12622
"For example, a case insensitive match for ``foo`` may be specified as::"
12623
msgstr ""
12624
12625
#: en/help_topics/patterns.txt:32
12626
msgid " RE:(?i)foo"
12627
msgstr ""
12628
12629
#: en/help_topics/patterns.txt:34
12630
msgid ""
12631
"Ignore patterns may be prefixed with ``!``, which means that a filename\n"
12632
"matched by that pattern will not be ignored."
12633
msgstr ""
12634
12635
#: en/help_topics/patterns.txt:37
12636
msgid ""
12637
".. _Python regular expressions: http://docs.python.org/library/re.html"
12638
msgstr ""
12639
12640
#: en/help_topics/revisionspec.txt:1
12641
msgid "Revision Identifiers"
12642
msgstr ""
12643
12644
#: en/help_topics/revisionspec.txt:3
12645
msgid ""
12646
"A revision identifier refers to a specific state of a branch's history. It\n"
12647
"can be expressed in several ways. It can begin with a keyword to\n"
12648
"unambiguously specify a given lookup type; some examples are 'last:1',\n"
12649
"'before:yesterday' and 'submit:'."
12650
msgstr ""
12651
12652
#: en/help_topics/revisionspec.txt:8
12653
msgid ""
12654
"Alternately, it can be given without a keyword, in which case it will be\n"
12655
"checked as a revision number, a tag, a revision id, a date specification, or "
12656
"a\n"
12657
"branch specification, in that order. For example, 'date:today' could be\n"
12658
"written as simply 'today', though if you have a tag called 'today' that "
12659
"will\n"
12660
"be found first."
12661
msgstr ""
12662
12663
#: en/help_topics/revisionspec.txt:14
12664
msgid ""
12665
"If 'REV1' and 'REV2' are revision identifiers, then 'REV1..REV2' denotes a\n"
12666
"revision range. Examples: '3647..3649', 'date:yesterday..-1' and\n"
12667
"'branch:/path/to/branch1/..branch:/branch2' (note that there are no quotes "
12668
"or\n"
12669
"spaces around the '..')."
12670
msgstr ""
12671
12672
#: en/help_topics/revisionspec.txt:19
12673
msgid ""
12674
"Ranges are interpreted differently by different commands. To the \"log\" "
12675
"command,\n"
12676
"a range is a sequence of log messages, but to the \"diff\" command, the "
12677
"range\n"
12678
"denotes a change between revisions (and not a sequence of changes). In\n"
12679
"addition, \"log\" considers a closed range whereas \"diff\" and \"merge\" "
12680
"consider it\n"
12681
"to be open-ended, that is, they include one end but not the other. For "
12682
"example:\n"
12683
"\"bzr log -r 3647..3649\" shows the messages of revisions 3647, 3648 and "
12684
"3649,\n"
12685
"while \"bzr diff -r 3647..3649\" includes the changes done in revisions 3648 "
12686
"and\n"
12687
"3649, but not 3647."
12688
msgstr ""
12689
12690
#: en/help_topics/revisionspec.txt:28
12691
msgid "The keywords used as revision selection methods are the following:"
12692
msgstr ""
12693
12694
#: en/help_topics/revisionspec.txt:30
12695
msgid ""
12696
":revid:\n"
12697
"\tSelects a revision using the revision id.\n"
12698
":submit:\n"
12699
"\tSelects a common ancestor with the submit branch.\n"
12700
":ancestor:\n"
12701
"\tSelects a common ancestor with a second branch.\n"
12702
":date:\n"
12703
"\tSelects a revision on the basis of a datestamp.\n"
12704
":branch:\n"
12705
"\tSelects the last revision of a specified branch.\n"
12706
":tag:\n"
12707
"\tSelects a revision identified by a tag name.\n"
12708
":revno:\n"
12709
"\tSelects a revision using a number.\n"
12710
":before:\n"
12711
"\tSelects the parent of the revision specified.\n"
12712
":annotate:\n"
12713
"\tSelect the revision that last modified the specified line.\n"
12714
":mainline:\n"
12715
"\tSelect mainline revision that merged the specified revision.\n"
12716
":last:\n"
12717
"\tSelects the nth revision from the end."
12718
msgstr ""
12719
12720
#: en/help_topics/revisionspec.txt:53
12721
msgid "In addition, plugins can provide other keywords."
12722
msgstr ""
12723
12724
#: en/help_topics/revisionspec.txt:55
12725
msgid "A detailed description of each keyword is given below."
12726
msgstr ""
12727
12728
#: en/help_topics/revisionspec.txt:57
12729
msgid ":revid:"
12730
msgstr ""
12731
12732
#: en/help_topics/revisionspec.txt:59
12733
msgid ""
12734
" Supply a specific revision id, that can be used to specify any\n"
12735
" revision id in the ancestry of the branch.\n"
12736
" Including merges, and pending merges.\n"
12737
" Examples::"
12738
msgstr ""
12739
12740
#: en/help_topics/revisionspec.txt:64
12741
msgid ""
12742
" revid:aaaa@bbbb-123456789 -> Select revision 'aaaa@bbbb-123456789'"
12743
msgstr ""
12744
12745
#: en/help_topics/revisionspec.txt:66
12746
msgid ":submit:"
12747
msgstr ""
12748
12749
#: en/help_topics/revisionspec.txt:68
12750
msgid ""
12751
" Diffing against this shows all the changes that were made in this "
12752
"branch,\n"
12753
" and is a good predictor of what merge will do. The submit branch is\n"
12754
" used by the bundle and merge directive commands. If no submit branch\n"
12755
" is specified, the parent branch is used instead."
12756
msgstr ""
12757
12758
#: en/help_topics/revisionspec.txt:73 en/help_topics/revisionspec.txt:85
12759
msgid ""
12760
" The common ancestor is the last revision that existed in both\n"
12761
" branches. Usually this is the branch point, but it could also be\n"
12762
" a revision that was merged."
12763
msgstr ""
12764
12765
#: en/help_topics/revisionspec.txt:77 en/help_topics/revisionspec.txt:93
12766
#: en/help_topics/revisionspec.txt:109 en/help_topics/revisionspec.txt:119
12767
#: en/help_topics/revisionspec.txt:153
12768
msgid " Examples::"
12769
msgstr ""
12770
12771
#: en/help_topics/revisionspec.txt:79
12772
msgid " $ bzr diff -r submit:"
12773
msgstr ""
12774
12775
#: en/help_topics/revisionspec.txt:81
12776
msgid ":ancestor:"
12777
msgstr ""
12778
12779
#: en/help_topics/revisionspec.txt:83
12780
msgid " Supply the path to a branch to select the common ancestor."
12781
msgstr ""
12782
12783
#: en/help_topics/revisionspec.txt:89
12784
msgid ""
12785
" This is frequently used with 'diff' to return all of the changes\n"
12786
" that your branch introduces, while excluding the changes that you\n"
12787
" have not merged from the remote branch."
12788
msgstr ""
12789
12790
#: en/help_topics/revisionspec.txt:95
12791
msgid ""
12792
" ancestor:/path/to/branch\n"
12793
" $ bzr diff -r ancestor:../../mainline/branch"
12794
msgstr ""
12795
12796
#: en/help_topics/revisionspec.txt:98
12797
msgid ":date:"
12798
msgstr ""
12799
12800
#: en/help_topics/revisionspec.txt:100
12801
msgid ""
12802
" Supply a datestamp to select the first revision that matches the date.\n"
12803
" Date can be 'yesterday', 'today', 'tomorrow' or a YYYY-MM-DD string.\n"
12804
" Matches the first entry after a given date (either at midnight or\n"
12805
" at a specified time)."
12806
msgstr ""
12807
12808
#: en/help_topics/revisionspec.txt:105
12809
msgid " One way to display all the changes since yesterday would be::"
12810
msgstr ""
12811
12812
#: en/help_topics/revisionspec.txt:107
12813
msgid " bzr log -r date:yesterday.."
12814
msgstr ""
12815
12816
#: en/help_topics/revisionspec.txt:111
12817
msgid ""
12818
" date:yesterday -> select the first revision since "
12819
"yesterday\n"
12820
" date:2006-08-14,17:10:14 -> select the first revision after\n"
12821
" August 14th, 2006 at 5:10pm."
12822
msgstr ""
12823
12824
#: en/help_topics/revisionspec.txt:115
12825
msgid ":branch:"
12826
msgstr ""
12827
12828
#: en/help_topics/revisionspec.txt:117
12829
msgid " Supply the path to a branch to select its last revision."
12830
msgstr ""
12831
12832
#: en/help_topics/revisionspec.txt:121
12833
msgid " branch:/path/to/branch"
12834
msgstr ""
12835
12836
#: en/help_topics/revisionspec.txt:123
12837
msgid ":tag:"
12838
msgstr ""
12839
12840
#: en/help_topics/revisionspec.txt:125
12841
msgid " Tags are stored in the branch and created by the 'tag' command."
12842
msgstr ""
12843
12844
#: en/help_topics/revisionspec.txt:127
12845
msgid ":revno:"
12846
msgstr ""
12847
12848
#: en/help_topics/revisionspec.txt:129
12849
msgid ""
12850
" Use an integer to specify a revision in the history of the branch.\n"
12851
" Optionally a branch can be specified. A negative number will count\n"
12852
" from the end of the branch (-1 is the last revision, -2 the previous\n"
12853
" one). If the negative number is larger than the branch's history, the\n"
12854
" first revision is returned.\n"
12855
" Examples::"
12856
msgstr ""
12857
12858
#: en/help_topics/revisionspec.txt:136
12859
msgid ""
12860
" revno:1 -> return the first revision of this branch\n"
12861
" revno:3:/path/to/branch -> return the 3rd revision of\n"
12862
" the branch '/path/to/branch'\n"
12863
" revno:-1 -> The last revision in a branch.\n"
12864
" -2:http://other/branch -> The second to last revision in the\n"
12865
" remote branch.\n"
12866
" -1000000 -> Most likely the first revision, unless\n"
12867
" your history is very long."
12868
msgstr ""
12869
12870
#: en/help_topics/revisionspec.txt:145
12871
msgid ":before:"
12872
msgstr ""
12873
12874
#: en/help_topics/revisionspec.txt:147
12875
msgid ""
12876
" Supply any revision spec to return the parent of that revision. This "
12877
"is\n"
12878
" mostly useful when inspecting revisions that are not in the revision "
12879
"history\n"
12880
" of a branch."
12881
msgstr ""
12882
12883
#: en/help_topics/revisionspec.txt:151
12884
msgid ""
12885
" It is an error to request the parent of the null revision (before:0)."
12886
msgstr ""
12887
12888
#: en/help_topics/revisionspec.txt:155
12889
msgid ""
12890
" before:1913 -> Return the parent of revno 1913 (revno 1912)\n"
12891
" before:revid:aaaa@bbbb-1234567890 -> return the parent of revision\n"
12892
" aaaa@bbbb-1234567890\n"
12893
" bzr diff -r before:1913..1913\n"
12894
" -> Find the changes between revision 1913 and its parent "
12895
"(1912).\n"
12896
" (What changes did revision 1913 introduce).\n"
12897
" This is equivalent to: bzr diff -c 1913"
12898
msgstr ""
12899
12900
#: en/help_topics/revisionspec.txt:163
12901
msgid ":annotate:"
12902
msgstr ""
12903
12904
#: en/help_topics/revisionspec.txt:165
12905
msgid ""
12906
" Select the revision that last modified the specified line. Line is\n"
12907
" specified as path:number. Path is a relative path to the file. "
12908
"Numbers\n"
12909
" start at 1, and are relative to the current version, not the last-\n"
12910
" committed version of the file."
12911
msgstr ""
12912
12913
#: en/help_topics/revisionspec.txt:170
12914
msgid ":mainline:"
12915
msgstr ""
12916
12917
#: en/help_topics/revisionspec.txt:172
12918
msgid ""
12919
" Select the revision that merged the specified revision into mainline."
12920
msgstr ""
12921
12922
#: en/help_topics/revisionspec.txt:174
12923
msgid ":last:"
12924
msgstr ""
12925
12926
#: en/help_topics/revisionspec.txt:176
12927
msgid ""
12928
" Supply a positive number to get the nth revision from the end.\n"
12929
" This is the same as supplying negative numbers to the 'revno:' spec.\n"
12930
" Examples::"
12931
msgstr ""
12932
12933
#: en/help_topics/revisionspec.txt:180
12934
msgid ""
12935
" last:1 -> return the last revision\n"
12936
" last:3 -> return the revision 2 before the end.\n"
12937
msgstr ""
12938
12939
#: en/help_topics/rules.txt:1
12940
msgid ""
12941
"Rules\n"
12942
"====="
12943
msgstr ""
12944
12945
#: en/help_topics/rules.txt:7
12946
msgid ""
12947
"Rules are defined in ini file format where the sections are file glob\n"
12948
"patterns and the contents of each section are the preferences for files\n"
12949
"matching that pattern(s). For example::"
12950
msgstr ""
12951
12952
#: en/help_topics/rules.txt:11
12953
msgid ""
12954
" [name *.bat]\n"
12955
" eol = native"
12956
msgstr ""
12957
12958
#: en/help_topics/rules.txt:14
12959
msgid ""
12960
" [name *.html *.xml]\n"
12961
" keywords = xml_escape"
12962
msgstr ""
12963
12964
#: en/help_topics/rules.txt:17
12965
msgid ""
12966
"Preferences like these are useful for commands and plugins wishing to\n"
12967
"provide custom behaviour for selected files. For more information on \n"
12968
"end of line conversion see :doc:`eol-help`.\n"
12969
"Keyword support is provided by the `keywords plugin\n"
12970
"<http://doc.bazaar.canonical.com/plugins/en/keywords-plugin.html>`_."
12971
msgstr ""
12972
12973
#: en/help_topics/rules.txt:23
12974
msgid ""
12975
"Files\n"
12976
"-----"
12977
msgstr ""
12978
12979
#: en/help_topics/rules.txt:26
12980
msgid ""
12981
"Default rules for all branches are defined in the optional file\n"
12982
"``BZR_HOME/rules``. "
12983
msgstr ""
12984
12985
#: en/help_topics/rules.txt:29
12986
msgid ""
12987
"Rule Patterns\n"
12988
"-------------"
12989
msgstr ""
12990
12991
#: en/help_topics/rules.txt:32
12992
msgid ""
12993
"Patterns are ordered and searching stops as soon as one matches.\n"
12994
"As a consequence, more explicit patterns should be placed towards\n"
12995
"the top of the file. Rule patterns use exactly the same conventions\n"
12996
"as ignore patterns. See :doc:`patterns-help` for details."
12997
msgstr ""
12998
12999
#: en/help_topics/rules.txt:37
13000
msgid ".. note::"
13001
msgstr ""
13002
13003
#: en/help_topics/rules.txt:39
13004
msgid ""
13005
" Patterns containing square brackets or spaces should be\n"
13006
" surrounded in quotes to ensure they are correctly parsed.\n"
13007
msgstr ""
13008
13009
#: en/help_topics/topics.txt:1
13010
msgid ""
13011
"authentication Information on configuring authentication\n"
13012
"basic Basic commands\n"
13013
"branches Information on what a branch is\n"
13014
"bugs Bug tracker settings\n"
13015
"checkouts Information on what a checkout is\n"
13016
"commands Basic help for all commands\n"
13017
"configuration Details on the configuration settings available\n"
13018
"conflict-types Types of conflicts and what to do about them\n"
13019
"content-filters Conversion of content into/from working trees\n"
13020
"criss-cross Information on criss-cross merging\n"
13021
"current-formats Current storage formats\n"
13022
"debug-flags Options to show or record debug information\n"
13023
"diverged-branches How to fix diverged branches\n"
13024
"env-variables Environment variable names and values\n"
13025
"eol Information on end-of-line handling\n"
13026
"files Information on configuration and log files\n"
13027
"formats Information on choosing a storage format\n"
13028
"global-options Options that control how Bazaar runs\n"
13029
"hidden-commands All hidden commands\n"
13030
"hooks Points at which custom processing can be added\n"
13031
"launchpad Using Bazaar with Launchpad.net\n"
13032
"location-alias Aliases for remembered locations\n"
13033
"log-formats Details on the logging formats available\n"
13034
"other-formats Experimental and deprecated storage formats\n"
13035
"patterns Information on the pattern syntax\n"
13036
"repositories Basic information on shared repositories.\n"
13037
"revisionspec Explain how to use --revision\n"
13038
"rules Information on defining rule-based preferences\n"
13039
"standalone-trees Information on what a standalone tree is\n"
13040
"standard-options Options that can be used with any command\n"
13041
"status-flags Help on status flags\n"
13042
"sync-for-reconfigure Steps to resolve \"out-of-sync\" when reconfiguring\n"
13043
"topics Topics list\n"
13044
"url-special-chars Special character handling in URLs\n"
13045
"urlspec Supported transport protocols\n"
13046
"working-trees Information on working trees\n"
13047
msgstr ""
13048
13049
#: en/help_topics/url-special-chars.txt:1
13050
msgid ""
13051
"Special character handling in URLs\n"
13052
"=================================="
13053
msgstr ""
13054
13055
#: en/help_topics/url-special-chars.txt:4
13056
msgid "Bazaar allows locations to be specified in multiple ways, either:"
13057
msgstr ""
13058
13059
#: en/help_topics/url-special-chars.txt:6
13060
msgid " * Fully qualified URLs"
13061
msgstr ""
13062
13063
#: en/help_topics/url-special-chars.txt:8
13064
msgid " * File system paths, relative or absolute"
13065
msgstr ""
13066
13067
#: en/help_topics/url-special-chars.txt:10
13068
msgid ""
13069
"Internally bzr treats all locations as URLs. For any file system paths\n"
13070
"that are specified it will automatically determine the appropriate URL\n"
13071
"representation, and escape special characters where necessary."
13072
msgstr ""
13073
13074
#: en/help_topics/url-special-chars.txt:14
13075
msgid ""
13076
"There are a few characters which have special meaning in URLs and need "
13077
"careful\n"
13078
"handling to avoid ambiguities. Characters can be escaped with a % and a hex\n"
13079
"value in URLs. Any non-ASCII characters in a file path will automatically "
13080
"be\n"
13081
"urlencoded when the path is converted to a URL."
13082
msgstr ""
13083
13084
#: en/help_topics/url-special-chars.txt:19
13085
msgid ""
13086
"URLs represent non-ASCII characters in an encoding defined by the server, "
13087
"but\n"
13088
"usually UTF-8. The % escapes should be of the UTF-8 bytes. Bazaar tries to "
13089
"be\n"
13090
"generous in what it accepts as a URL and to print them in a way that\n"
13091
"will be readable."
13092
msgstr ""
13093
13094
#: en/help_topics/url-special-chars.txt:24
13095
msgid ""
13096
"For example, if you have a directory named '/tmp/%2False' these are all "
13097
"valid\n"
13098
"ways of accessing the content (0x2F, or 47, is the ASCII code for forward "
13099
"slash)::"
13100
msgstr ""
13101
13102
#: en/help_topics/url-special-chars.txt:27
13103
msgid ""
13104
" cd /tmp\n"
13105
" bzr log /tmp/%2False\n"
13106
" bzr log %2False\n"
13107
" bzr log file:///tmp/%252False\n"
13108
" bzr log file://localhost/tmp/%252False\n"
13109
" bzr log file:%252False"
13110
msgstr ""
13111
13112
#: en/help_topics/url-special-chars.txt:34
13113
msgid "These are valid but do not refer to the same file::"
13114
msgstr ""
13115
13116
#: en/help_topics/url-special-chars.txt:36
13117
msgid ""
13118
" bzr log file:///tmp/%2False (refers to a file called /tmp/\\/alse)\n"
13119
" bzr log %252False (refers to a file called /tmp/%252False)"
13120
msgstr ""
13121
13122
#: en/help_topics/url-special-chars.txt:39
13123
msgid ""
13124
"Comma also has special meaning in URLs, because it denotes `segment "
13125
"parameters`_"
13126
msgstr ""
13127
13128
#: en/help_topics/url-special-chars.txt:41
13129
msgid ""
13130
"_`segment parameters`: http://www.ietf.org/rfc/rfc3986.txt (section 3.3)"
13131
msgstr ""
13132
13133
#: en/help_topics/url-special-chars.txt:43
13134
msgid ""
13135
"Comma is also special in any file system paths that are specified. To use a "
13136
"literal\n"
13137
"comma in a file system path, specify a URL and URL encode the comma::"
13138
msgstr ""
13139
13140
#: en/help_topics/url-special-chars.txt:46
13141
msgid ""
13142
" bzr log foo,branch=bla # path \"foo\" with the segment parameter "
13143
"\"branch\" set to \"bla\"\n"
13144
" bzr log file:foo%2Cbranch=bla # path \"foo,branch=bla\"\n"
13145
" bzr log file:foo,branch=bla # path \"foo\" with segment parameter "
13146
"\"branch\" set to \"bla\"\n"
13147
msgstr ""
13148
13149
#: en/help_topics/urlspec.txt:1
13150
msgid "URL Identifiers"
13151
msgstr ""
13152
13153
#: en/help_topics/urlspec.txt:3
13154
msgid "Supported URL prefixes::"
13155
msgstr ""
13156
13157
#: en/help_topics/urlspec.txt:5
13158
msgid ""
13159
" aftp:// Access using active FTP.\n"
13160
" bzr:// Fast access using the Bazaar smart server.\n"
13161
" bzr+ssh:// Fast access using the Bazaar smart server over SSH.\n"
13162
" file:// Access using the standard filesystem (default)\n"
13163
" ftp:// Access using passive FTP.\n"
13164
" http:// Read-only access of branches exported on the web.\n"
13165
" https:// Read-only access of branches exported on the web using "
13166
"SSL.\n"
13167
" sftp:// Access using SFTP (most SSH servers provide SFTP)."
13168
msgstr ""
13169
13170
#: en/help_topics/urlspec.txt:14
13171
msgid "Supported modifiers::"
13172
msgstr ""
13173
13174
#: en/help_topics/urlspec.txt:16
13175
msgid " gio+ Access using any GIO supported protocols."
13176
msgstr ""
13177
13178
#: en/help_topics/urlspec.txt:18
13179
msgid "Bazaar supports all of the standard parts within the URL::"
13180
msgstr ""
13181
13182
#: en/help_topics/urlspec.txt:20
13183
msgid " <protocol>://[user[:password]@]host[:port]/[path]"
13184
msgstr ""
13185
13186
#: en/help_topics/urlspec.txt:22
13187
msgid "allowing URLs such as::"
13188
msgstr ""
13189
13190
#: en/help_topics/urlspec.txt:24
13191
msgid " http://bzruser:BadPass@bzr.example.com:8080/bzr/trunk"
13192
msgstr ""
13193
13194
#: en/help_topics/urlspec.txt:26
13195
msgid ""
13196
"For bzr+ssh:// and sftp:// URLs, Bazaar also supports paths that begin\n"
13197
"with '~' as meaning that the rest of the path should be interpreted\n"
13198
"relative to the remote user's home directory. For example if the user\n"
13199
"``remote`` has a home directory of ``/home/remote`` on the server\n"
13200
"shell.example.com, then::"
13201
msgstr ""
13202
13203
#: en/help_topics/urlspec.txt:32
13204
msgid " bzr+ssh://remote@shell.example.com/~/myproject/trunk"
13205
msgstr ""
13206
13207
#: en/help_topics/urlspec.txt:34
13208
msgid "would refer to ``/home/remote/myproject/trunk``."
13209
msgstr ""
13210
13211
#: en/help_topics/urlspec.txt:36
13212
msgid ""
13213
"Many commands that accept URLs also accept location aliases too.\n"
13214
"See :doc:`location-alias-help` and :doc:`url-special-chars-help`.\n"
13215
msgstr ""
Loggerhead is a web-based interface for Breezy
Version: 2.0.1