« back to all changes in this revision
Viewing changes to po/de.po
- browse files at revision 6093.4.72
- compare with another revision
- compare with revision 6093.4.72
- download diff
- download tarball
- view history from revision 6093.4.72
- Committer: Jelmer Vernooij
- Date: 2012-02-20 12:19:29 UTC
- mfrom: (6437.23.11 2.5)
- mto: (6581.1.1 trunk)
- mto: This revision was merged to the branch mainline in revision 6582.
- Revision ID: jelmer@samba.org-20120220121929-7ni2psvjoatm1yp4
Merge bzr/2.5.
- files added:
- bzrlib/estimate_compressed_size.py
- bzrlib/plugins/po_merge
- bzrlib/plugins/po_merge/tests
- files removed:
- bzrlib/help_topics/en/location-alias.txt
- bzrlib/util/effbot
- bzrlib/util/effbot/org
- bzrlib/util/elementtree
- files renamed:
- tools/build_mo.py => bzrlib/bzr_distutils.py
- bzrlib/tests/per_repository/test_merge_directive.py => bzrlib/tests/per_repository_vf/test_merge_directive.py
- files modified:
- Makefile
added
removed
po/de.po
1
# German translation for bzr
2
# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
3
# This file is distributed under the same license as the bzr package.
4
# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
5
#
6
msgid ""
7
msgstr ""
8
"Project-Id-Version: bzr\n"
9
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
10
"POT-Creation-Date: 2012-02-02 17:39+0100\n"
11
"PO-Revision-Date: 2012-01-19 12:10+0000\n"
12
"Last-Translator: Andreas Fernandez <Unknown>\n"
13
"Language-Team: German <de@li.org>\n"
14
"MIME-Version: 1.0\n"
15
"Content-Type: text/plain; charset=UTF-8\n"
16
"Content-Transfer-Encoding: 8bit\n"
17
"Plural-Forms: nplurals=2; plural=n != 1;\n"
18
"X-Launchpad-Export-Date: 2012-02-04 04:48+0000\n"
19
"X-Generator: Launchpad (build 14738)\n"
20
21
#: bzrlib/add.py:95
22
msgid "skipping {0} (larger than {1} of {2} bytes)"
23
msgstr "Überspringe {0} (Größer als {1} von {2} Bytes)"
24
25
#: bzrlib/branch.py:872
26
msgid "Unstacking"
27
msgstr ""
28
29
#: bzrlib/branch.py:3205
30
#, python-format
31
msgid "Pushed up to revision %d."
32
msgstr "In Revision %d hochgeladen."
33
34
#: bzrlib/branch.py:3207
35
#, python-format
36
msgid "%d tag updated."
37
msgid_plural "%d tags updated."
38
msgstr[0] "%d Schlüsselwort aktualisiert."
39
msgstr[1] "%d Schlüsselwörter aktualisiert."
40
41
#: bzrlib/branch.py:3210
42
msgid "No new revisions or tags to push."
43
msgstr "Keine neuen Revisionen oder Schlüsselwörter zum Hochladen."
44
45
#: bzrlib/branch.py:3212
46
msgid "No new revisions to push."
47
msgstr "Keine neuen Revisionen zum Hochladen."
48
49
#: bzrlib/branch.py:3232
50
msgid "checked branch {0} format {1}"
51
msgstr ""
52
53
#: bzrlib/branch.py:3235
54
#, python-format
55
msgid "found error:%s"
56
msgstr "Fehler gefunden: %s"
57
58
#: bzrlib/builtins.py:209 bzrlib/builtins.py:3016 bzrlib/workingtree.py:315
59
#, python-format
60
msgid "Ignoring files outside view. View is %s"
61
msgstr "Ignoriere Dateien außerhalb der Ansicht. Die Ansicht ist %s"
62
63
#: bzrlib/builtins.py:218
64
#, python-format
65
msgid "bzr %s --revision takes exactly one revision identifier"
66
msgstr "bzr %s --revision benötigt genau eine Revisions-Nummer"
67
68
#: bzrlib/builtins.py:303
69
msgid "Display status summary."
70
msgstr "Zeige Status-Zusammenfassung an."
71
72
#: bzrlib/builtins.py:305
73
msgid ""
74
"This reports on versioned and unknown files, reporting them\n"
75
"grouped by state. Possible states are:"
76
msgstr ""
77
"Zeigt versionierte und unbekannte Dateien an, Gruppiert nach Zustand.\n"
78
"Mögliche Zustände:"
79
80
#: bzrlib/builtins.py:308
81
msgid ""
82
"added\n"
83
" Versioned in the working copy but not in the previous revision."
84
msgstr "hinzugefügt"
85
86
#: bzrlib/builtins.py:311
87
msgid ""
88
"removed\n"
89
" Versioned in the previous revision but removed or deleted\n"
90
" in the working copy."
91
msgstr "entfernt"
92
93
#: bzrlib/builtins.py:315
94
msgid ""
95
"renamed\n"
96
" Path of this file changed from the previous revision;\n"
97
" the text may also have changed. This includes files whose\n"
98
" parent directory was renamed."
99
msgstr "umbenannt"
100
101
#: bzrlib/builtins.py:320
102
msgid ""
103
"modified\n"
104
" Text has changed since the previous revision."
105
msgstr "verändert"
106
107
#: bzrlib/builtins.py:323
108
msgid ""
109
"kind changed\n"
110
" File kind has been changed (e.g. from file to directory)."
111
msgstr ""
112
"Dateiart wurde geändert\n"
113
" Dateiart hat sich geändert (z.B. von Datei zu Verzeichnis)"
114
115
#: bzrlib/builtins.py:326
116
msgid ""
117
"unknown\n"
118
" Not versioned and not matching an ignore pattern."
119
msgstr ""
120
121
#: bzrlib/builtins.py:329
122
msgid ""
123
"Additionally for directories, symlinks and files with a changed\n"
124
"executable bit, Bazaar indicates their type using a trailing\n"
125
"character: '/', '@' or '*' respectively. These decorations can be\n"
126
"disabled using the '--no-classify' option."
127
msgstr ""
128
"Für Verzeichnisse, Symbolische Verweise sowie Dateien\n"
129
"mit veränderter Ausführungsberechtigung zeigt Bazaar\n"
130
"den Typ zusätzlich durch ein angehängtes Zeichen\n"
131
"»/«, »@« oder »*« an. Diese Kennzeichnung kann mit der Option\n"
132
"»--no-classify« unterbunden werden."
133
134
#: bzrlib/builtins.py:334
135
msgid ""
136
"To see ignored files use 'bzr ignored'. For details on the\n"
137
"changes to file texts, use 'bzr diff'."
138
msgstr ""
139
140
#: bzrlib/builtins.py:337
141
msgid ""
142
"Note that --short or -S gives status flags for each item, similar\n"
143
"to Subversion's status command. To get output similar to svn -q,\n"
144
"use bzr status -SV."
145
msgstr ""
146
147
#: bzrlib/builtins.py:341
148
msgid ""
149
"If no arguments are specified, the status of the entire working\n"
150
"directory is shown. Otherwise, only the status of the specified\n"
151
"files or directories is reported. If a directory is given, status\n"
152
"is reported for everything inside that directory."
153
msgstr ""
154
155
#: bzrlib/builtins.py:346
156
msgid ""
157
"Before merges are committed, the pending merge tip revisions are\n"
158
"shown. To see all pending merge revisions, use the -v option.\n"
159
"To skip the display of pending merge information altogether, use\n"
160
"the no-pending option or specify a file/directory."
161
msgstr ""
162
163
#: bzrlib/builtins.py:351
164
msgid ""
165
"To compare the working directory to a specific revision, pass a\n"
166
"single revision to the revision argument."
167
msgstr ""
168
169
#: bzrlib/builtins.py:354
170
msgid ""
171
"To see which files have changed in a specific revision, or between\n"
172
"two revisions, pass a revision range to the revision argument.\n"
173
"This will produce the same results as calling 'bzr diff --summarize'."
174
msgstr ""
175
176
#: bzrlib/builtins.py:363
177
msgid "Use short status indicators."
178
msgstr ""
179
180
#: bzrlib/builtins.py:365
181
msgid "Only show versioned files."
182
msgstr ""
183
184
#: bzrlib/builtins.py:367
185
msgid "Don't show pending merges."
186
msgstr ""
187
188
#: bzrlib/builtins.py:370
189
msgid "Do not mark object type using indicator."
190
msgstr ""
191
192
#: bzrlib/builtins.py:385
193
msgid "bzr status --revision takes exactly one or two revision specifiers"
194
msgstr ""
195
196
#: bzrlib/builtins.py:429 bzrlib/builtins.py:5183
197
msgid "You can only supply one of revision_id or --revision"
198
msgstr ""
199
200
#: bzrlib/builtins.py:432 bzrlib/builtins.py:5185
201
msgid "You must supply either --revision or a revision_id"
202
msgstr ""
203
204
#: bzrlib/builtins.py:439
205
#, python-format
206
msgid "Repository %r does not support access to raw revision texts"
207
msgstr ""
208
209
#: bzrlib/builtins.py:450
210
msgid "The repository {0} contains no revision {1}."
211
msgstr ""
212
213
#: bzrlib/builtins.py:457
214
msgid "You cannot specify a NULL revision."
215
msgstr ""
216
217
#: bzrlib/builtins.py:549
218
msgid "Remove the working tree from a given branch/checkout."
219
msgstr ""
220
221
#: bzrlib/builtins.py:551
222
msgid ""
223
"Since a lightweight checkout is little more than a working tree\n"
224
"this will refuse to run against one."
225
msgstr ""
226
227
#: bzrlib/builtins.py:554
228
msgid "To re-create the working tree, use \"bzr checkout\"."
229
msgstr ""
230
231
#: bzrlib/builtins.py:560
232
msgid ""
233
"Remove the working tree even if it has uncommitted or shelved changes."
234
msgstr ""
235
236
#: bzrlib/builtins.py:574
237
msgid "No working tree to remove"
238
msgstr ""
239
240
#: bzrlib/builtins.py:576
241
msgid "You cannot remove the working tree of a remote path"
242
msgstr ""
243
244
#: bzrlib/builtins.py:585
245
msgid "You cannot remove the working tree from a lightweight checkout"
246
msgstr ""
247
248
#: bzrlib/builtins.py:625
249
msgid ""
250
"The tree does not appear to be corrupt. You probably want \"bzr revert\" "
251
"instead. Use \"--force\" if you are sure you want to reset the working tree."
252
msgstr ""
253
254
#: bzrlib/builtins.py:636
255
msgid ""
256
", the header appears corrupt, try passing -r -1 to set the state to the last "
257
"commit"
258
msgstr ""
259
260
#: bzrlib/builtins.py:640
261
msgid "failed to reset the tree state{0}"
262
msgstr ""
263
264
#: bzrlib/builtins.py:644
265
msgid "Show current revision number."
266
msgstr ""
267
268
#: bzrlib/builtins.py:646
269
msgid "This is equal to the number of revisions on this branch."
270
msgstr ""
271
272
#: bzrlib/builtins.py:659
273
msgid "--tree and --revision can not be used together"
274
msgstr ""
275
276
#: bzrlib/builtins.py:676 bzrlib/builtins.py:5967
277
msgid "Tags can only be placed on a single revision, not on a range"
278
msgstr ""
279
280
#: bzrlib/builtins.py:700
281
msgid "Show revno of working tree."
282
msgstr ""
283
284
#: bzrlib/builtins.py:748
285
msgid "Add specified files or directories."
286
msgstr ""
287
288
#: bzrlib/builtins.py:750
289
msgid ""
290
"In non-recursive mode, all the named items are added, regardless\n"
291
"of whether they were previously ignored. A warning is given if\n"
292
"any of the named files are already versioned."
293
msgstr ""
294
295
#: bzrlib/builtins.py:754
296
msgid ""
297
"In recursive mode (the default), files are treated the same way\n"
298
"but the behaviour for directories is different. Directories that\n"
299
"are already versioned do not give a warning. All directories,\n"
300
"whether already versioned or not, are searched for files or\n"
301
"subdirectories that are neither versioned or ignored, and these\n"
302
"are added. This search proceeds recursively into versioned\n"
303
"directories. If no names are given '.' is assumed."
304
msgstr ""
305
306
#: bzrlib/builtins.py:762
307
msgid ""
308
"A warning will be printed when nested trees are encountered,\n"
309
"unless they are explicitly ignored."
310
msgstr ""
311
312
#: bzrlib/builtins.py:765
313
msgid ""
314
"Therefore simply saying 'bzr add' will version all files that\n"
315
"are currently unknown."
316
msgstr ""
317
318
#: bzrlib/builtins.py:768
319
msgid ""
320
"Adding a file whose parent directory is not versioned will\n"
321
"implicitly add the parent, and so on up to the root. This means\n"
322
"you should never need to explicitly add a directory, they'll just\n"
323
"get added when you add a file in the directory."
324
msgstr ""
325
326
#: bzrlib/builtins.py:773
327
msgid ""
328
"--dry-run will show which files would be added, but not actually\n"
329
"add them."
330
msgstr ""
331
332
#: bzrlib/builtins.py:776
333
msgid ""
334
"--file-ids-from will try to use the file ids from the supplied path.\n"
335
"It looks up ids trying to find a matching parent directory with the\n"
336
"same filename, and then by pure path. This option is rarely needed\n"
337
"but can be useful when adding the same logical file into two\n"
338
"branches that will be merged later (without showing the two different\n"
339
"adds as a conflict). It is also useful when merging another project\n"
340
"into a subdirectory of this one."
341
msgstr ""
342
343
#: bzrlib/builtins.py:784
344
msgid ""
345
"Any files matching patterns in the ignore list will not be added\n"
346
"unless they are explicitly mentioned."
347
msgstr ""
348
349
#: bzrlib/builtins.py:787
350
msgid ""
351
"In recursive mode, files larger than the configuration option \n"
352
"add.maximum_file_size will be skipped. Named items are never skipped due\n"
353
"to file size."
354
msgstr ""
355
356
#: bzrlib/builtins.py:794
357
msgid "Don't recursively add the contents of directories."
358
msgstr ""
359
360
#: bzrlib/builtins.py:800
361
msgid "Lookup file ids from this tree."
362
msgstr ""
363
364
#: bzrlib/builtins.py:836
365
msgid "ignored {0} matching \"{1}\"\n"
366
msgstr ""
367
368
#: bzrlib/builtins.py:841
369
msgid "Create a new versioned directory."
370
msgstr ""
371
372
#: bzrlib/builtins.py:843
373
msgid "This is equivalent to creating the directory and then adding it."
374
msgstr ""
375
376
#: bzrlib/builtins.py:850
377
msgid "No error if existing, make parent directories as needed."
378
msgstr ""
379
380
#: bzrlib/builtins.py:884
381
#, python-format
382
msgid "added %s\n"
383
msgstr ""
384
385
#: bzrlib/builtins.py:926
386
#, python-format
387
msgid "invalid kind %r specified"
388
msgstr ""
389
390
#: bzrlib/builtins.py:963
391
msgid "Move or rename a file."
392
msgstr ""
393
394
#: bzrlib/builtins.py:965
395
msgid " bzr mv SOURCE... DESTINATION"
396
msgstr ""
397
398
#: bzrlib/builtins.py:967
399
msgid ""
400
"If the last argument is a versioned directory, all the other names\n"
401
"are moved into it. Otherwise, there must be exactly two arguments\n"
402
"and the file is changed to a new name."
403
msgstr ""
404
405
#: bzrlib/builtins.py:971
406
msgid ""
407
"If OLDNAME does not exist on the filesystem but is versioned and\n"
408
"NEWNAME does exist on the filesystem but is not versioned, mv\n"
409
"assumes that the file has been manually moved and only updates\n"
410
"its internal inventory to reflect that change.\n"
411
"The same is valid when moving many SOURCE files to a DESTINATION."
412
msgstr ""
413
414
#: bzrlib/builtins.py:977
415
msgid "Files cannot be moved between branches."
416
msgstr ""
417
418
#: bzrlib/builtins.py:984
419
msgid ""
420
"Move only the bzr identifier of the file, because the file has already been "
421
"moved."
422
msgstr ""
423
424
#: bzrlib/builtins.py:986
425
msgid "Automatically guess renames."
426
msgstr ""
427
428
#: bzrlib/builtins.py:987
429
msgid "Avoid making changes when guessing renames."
430
msgstr ""
431
432
#: bzrlib/builtins.py:996
433
msgid "--dry-run requires --auto."
434
msgstr ""
435
436
#: bzrlib/builtins.py:1000
437
msgid "missing file argument"
438
msgstr ""
439
440
#: bzrlib/builtins.py:1004
441
msgid "can not move root of branch"
442
msgstr ""
443
444
#: bzrlib/builtins.py:1010
445
msgid "Only one path may be specified to --auto."
446
msgstr ""
447
448
#: bzrlib/builtins.py:1013
449
msgid "--after cannot be specified with --auto."
450
msgstr ""
451
452
#: bzrlib/builtins.py:1050
453
msgid "to mv multiple files the destination must be a versioned directory"
454
msgstr ""
455
456
#: bzrlib/builtins.py:1102
457
msgid "Turn this branch into a mirror of another branch."
458
msgstr ""
459
460
#: bzrlib/builtins.py:1104
461
msgid ""
462
"By default, this command only works on branches that have not diverged.\n"
463
"Branches are considered diverged if the destination branch's most recent \n"
464
"commit is one that has not been merged (directly or indirectly) into the \n"
465
"parent."
466
msgstr ""
467
468
#: bzrlib/builtins.py:1109
469
msgid ""
470
"If branches have diverged, you can use 'bzr merge' to integrate the changes\n"
471
"from one into the other. Once one branch has merged, the other should\n"
472
"be able to pull it again."
473
msgstr ""
474
475
#: bzrlib/builtins.py:1113
476
msgid ""
477
"If you want to replace your local changes and just want your branch to\n"
478
"match the remote one, use pull --overwrite. This will work even if the two\n"
479
"branches have diverged."
480
msgstr ""
481
482
#: bzrlib/builtins.py:1117
483
msgid ""
484
"If there is no default location set, the first pull will set it (use\n"
485
"--no-remember to avoid setting it). After that, you can omit the\n"
486
"location to use the default. To change the default, use --remember. The\n"
487
"value will only be saved if the remote location can be accessed."
488
msgstr ""
489
490
#: bzrlib/builtins.py:1122
491
msgid ""
492
"The --verbose option will display the revisions pulled using the log_format\n"
493
"configuration option. You can use a different format by overriding it with\n"
494
"-Olog_format=<other_format>."
495
msgstr ""
496
497
#: bzrlib/builtins.py:1126
498
msgid ""
499
"Note: The location can be specified either in the form of a branch,\n"
500
"or in the form of a path to a file containing a merge directive generated\n"
501
"with bzr send."
502
msgstr ""
503
504
#: bzrlib/builtins.py:1134
505
msgid "Show logs of pulled revisions."
506
msgstr ""
507
508
#: bzrlib/builtins.py:1136
509
msgid ""
510
"Branch to pull into, rather than the one containing the working directory."
511
msgstr ""
512
513
#: bzrlib/builtins.py:1139
514
msgid ""
515
"Perform a local pull in a bound branch. Local pulls are not applied to the "
516
"master branch."
517
msgstr ""
518
519
#: bzrlib/builtins.py:1168
520
msgid "Need working tree for --show-base."
521
msgstr ""
522
523
#: bzrlib/builtins.py:1184
524
msgid "No pull location known or specified."
525
msgstr ""
526
527
#: bzrlib/builtins.py:1190
528
#, python-format
529
msgid "Using saved parent location: %s\n"
530
msgstr ""
531
532
#: bzrlib/builtins.py:1197 bzrlib/builtins.py:4393
533
msgid "Cannot use -r with merge directives or bundles"
534
msgstr ""
535
536
#: bzrlib/builtins.py:1238
537
msgid "Update a mirror of this branch."
538
msgstr ""
539
540
#: bzrlib/builtins.py:1240
541
msgid ""
542
"The target branch will not have its working tree populated because this\n"
543
"is both expensive, and is not supported on remote file systems."
544
msgstr ""
545
546
#: bzrlib/builtins.py:1243
547
msgid ""
548
"Some smart servers or protocols *may* put the working tree in place in\n"
549
"the future."
550
msgstr ""
551
552
#: bzrlib/builtins.py:1246
553
msgid ""
554
"This command only works on branches that have not diverged. Branches are\n"
555
"considered diverged if the destination branch's most recent commit is one\n"
556
"that has not been merged (directly or indirectly) by the source branch."
557
msgstr ""
558
559
#: bzrlib/builtins.py:1250
560
msgid ""
561
"If branches have diverged, you can use 'bzr push --overwrite' to replace\n"
562
"the other branch completely, discarding its unmerged changes."
563
msgstr ""
564
565
#: bzrlib/builtins.py:1253
566
msgid ""
567
"If you want to ensure you have the different changes in the other branch,\n"
568
"do a merge (see bzr help merge) from the other branch, and commit that.\n"
569
"After that you will be able to do a push without '--overwrite'."
570
msgstr ""
571
572
#: bzrlib/builtins.py:1257
573
msgid ""
574
"If there is no default push location set, the first push will set it (use\n"
575
"--no-remember to avoid setting it). After that, you can omit the\n"
576
"location to use the default. To change the default, use --remember. The\n"
577
"value will only be saved if the remote location can be accessed."
578
msgstr ""
579
580
#: bzrlib/builtins.py:1262
581
msgid ""
582
"The --verbose option will display the revisions pushed using the log_format\n"
583
"configuration option. You can use a different format by overriding it with\n"
584
"-Olog_format=<other_format>."
585
msgstr ""
586
587
#: bzrlib/builtins.py:1273 bzrlib/foreign.py:272
588
msgid ""
589
"Branch to push from, rather than the one containing the working directory."
590
msgstr ""
591
592
#: bzrlib/builtins.py:1276
593
msgid ""
594
"By default push will fail if the target directory exists, but does not "
595
"already have a control directory. This flag will allow push to proceed."
596
msgstr ""
597
598
#: bzrlib/builtins.py:1281
599
msgid ""
600
"Create a stacked branch that references the public location of the parent "
601
"branch."
602
msgstr ""
603
604
#: bzrlib/builtins.py:1284
605
msgid ""
606
"Create a stacked branch that refers to another branch for the commit "
607
"history. Only the work not present in the referenced branch is included in "
608
"the branch created."
609
msgstr ""
610
611
#: bzrlib/builtins.py:1289 bzrlib/foreign.py:279
612
msgid ""
613
"Refuse to push if there are uncommitted changes in the working tree, --no-"
614
"strict disables the check."
615
msgstr ""
616
617
#: bzrlib/builtins.py:1292
618
msgid "Don't populate the working tree, even for protocols that support it."
619
msgstr ""
620
621
#: bzrlib/builtins.py:1336
622
msgid "Could not determine branch to refer to."
623
msgstr ""
624
625
#: bzrlib/builtins.py:1345
626
#, python-format
627
msgid ""
628
"No push location known or specified. To push to the parent branch (at %s), "
629
"use 'bzr push :parent'."
630
msgstr ""
631
632
#: bzrlib/builtins.py:1351 bzrlib/foreign.py:306
633
msgid "No push location known or specified."
634
msgstr ""
635
636
#: bzrlib/builtins.py:1355
637
#, python-format
638
msgid "Using saved push location: %s"
639
msgstr ""
640
641
#: bzrlib/builtins.py:1365
642
msgid "Create a new branch that is a copy of an existing branch."
643
msgstr ""
644
645
#: bzrlib/builtins.py:1367
646
msgid ""
647
"If the TO_LOCATION is omitted, the last component of the FROM_LOCATION will\n"
648
"be used. In other words, \"branch ../foo/bar\" will attempt to create "
649
"./bar.\n"
650
"If the FROM_LOCATION has no / or path separator embedded, the TO_LOCATION\n"
651
"is derived from the FROM_LOCATION by stripping a leading scheme or drive\n"
652
"identifier, if any. For example, \"branch lp:foo-bar\" will attempt to\n"
653
"create ./foo-bar."
654
msgstr ""
655
656
#: bzrlib/builtins.py:1374
657
msgid ""
658
"To retrieve the branch as of a particular revision, supply the --revision\n"
659
"parameter, as in \"branch foo/bar -r 5\"."
660
msgstr ""
661
662
#: bzrlib/builtins.py:1377
663
msgid "The synonyms 'clone' and 'get' for this command are deprecated."
664
msgstr ""
665
666
#: bzrlib/builtins.py:1387
667
msgid "Create a branch without a working-tree."
668
msgstr ""
669
670
#: bzrlib/builtins.py:1389
671
msgid "Switch the checkout in the current directory to the new branch."
672
msgstr ""
673
674
#: bzrlib/builtins.py:1392
675
msgid ""
676
"Create a stacked branch referring to the source branch. The new branch will "
677
"depend on the availability of the source branch for all operations."
678
msgstr ""
679
680
#: bzrlib/builtins.py:1396
681
msgid "Do not use a shared repository, even if available."
682
msgstr ""
683
684
#: bzrlib/builtins.py:1398
685
msgid ""
686
"By default branch will fail if the target directory exists, but does not "
687
"already have a control directory. This flag will allow branch to proceed."
688
msgstr ""
689
690
#: bzrlib/builtins.py:1403
691
msgid "Bind new branch to from location."
692
msgstr ""
693
694
#: bzrlib/builtins.py:1450
695
#, python-format
696
msgid "Target directory \"%s\" already exists."
697
msgstr ""
698
699
#: bzrlib/builtins.py:1462
700
#, python-format
701
msgid "Parent of \"%s\" does not exist."
702
msgstr ""
703
704
#: bzrlib/builtins.py:1481
705
msgid "The branch {0} has no revision {1}."
706
msgstr ""
707
708
#: bzrlib/builtins.py:1496 bzrlib/push.py:53
709
#, python-format
710
msgid "Created new stacked branch referring to %s."
711
msgstr ""
712
713
#: bzrlib/builtins.py:1500
714
#, python-format
715
msgid "Branched %d revision."
716
msgid_plural "Branched %d revisions."
717
msgstr[0] ""
718
msgstr[1] ""
719
720
#: bzrlib/builtins.py:1505
721
#, python-format
722
msgid "New branch bound to %s"
723
msgstr ""
724
725
#: bzrlib/builtins.py:1510 bzrlib/builtins.py:6256
726
#, python-format
727
msgid "Switched to branch: %s"
728
msgstr ""
729
730
#: bzrlib/builtins.py:1515
731
msgid "List the branches available at the current location."
732
msgstr ""
733
734
#: bzrlib/builtins.py:1517
735
msgid ""
736
"This command will print the names of all the branches at the current\n"
737
"location."
738
msgstr ""
739
740
#: bzrlib/builtins.py:1524
741
msgid ""
742
"Recursively scan for branches rather than just looking in the specified "
743
"location."
744
msgstr ""
745
746
#: bzrlib/builtins.py:1554
747
msgid "(default)"
748
msgstr ""
749
750
#: bzrlib/builtins.py:1566
751
msgid "Create a new checkout of an existing branch."
752
msgstr ""
753
754
#: bzrlib/builtins.py:1568
755
msgid ""
756
"If BRANCH_LOCATION is omitted, checkout will reconstitute a working tree "
757
"for\n"
758
"the branch found in '.'. This is useful if you have removed the working "
759
"tree\n"
760
"or if it was never created - i.e. if you pushed the branch to its current\n"
761
"location using SFTP."
762
msgstr ""
763
764
#: bzrlib/builtins.py:1573
765
msgid ""
766
"If the TO_LOCATION is omitted, the last component of the BRANCH_LOCATION "
767
"will\n"
768
"be used. In other words, \"checkout ../foo/bar\" will attempt to create "
769
"./bar.\n"
770
"If the BRANCH_LOCATION has no / or path separator embedded, the TO_LOCATION\n"
771
"is derived from the BRANCH_LOCATION by stripping a leading scheme or drive\n"
772
"identifier, if any. For example, \"checkout lp:foo-bar\" will attempt to\n"
773
"create ./foo-bar."
774
msgstr ""
775
776
#: bzrlib/builtins.py:1580
777
msgid ""
778
"To retrieve the branch as of a particular revision, supply the --revision\n"
779
"parameter, as in \"checkout foo/bar -r 5\". Note that this will be "
780
"immediately\n"
781
"out of date [so you cannot commit] but it may be useful (i.e. to examine "
782
"old\n"
783
"code.)"
784
msgstr ""
785
786
#: bzrlib/builtins.py:1590
787
msgid ""
788
"Perform a lightweight checkout. Lightweight checkouts depend on access to "
789
"the branch for every operation. Normal checkouts can perform common "
790
"operations like diff and status without such access, and also support local "
791
"commits."
792
msgstr ""
793
794
#: bzrlib/builtins.py:1597
795
msgid "Get file contents from this tree."
796
msgstr ""
797
798
#: bzrlib/builtins.py:1599
799
msgid "Hard-link working tree files where possible."
800
msgstr ""
801
802
#: bzrlib/builtins.py:1640
803
msgid ""
804
"Show list of renamed files.\n"
805
" "
806
msgstr ""
807
808
#: bzrlib/builtins.py:1670
809
msgid "Update a working tree to a new revision."
810
msgstr ""
811
812
#: bzrlib/builtins.py:1672
813
msgid ""
814
"This will perform a merge of the destination revision (the tip of the\n"
815
"branch, or the specified revision) into the working tree, and then make\n"
816
"that revision the basis revision for the working tree. "
817
msgstr ""
818
819
#: bzrlib/builtins.py:1676
820
msgid ""
821
"You can use this to visit an older revision, or to update a working tree\n"
822
"that is out of date from its branch."
823
msgstr ""
824
825
#: bzrlib/builtins.py:1679
826
msgid ""
827
"If there are any uncommitted changes in the tree, they will be carried\n"
828
"across and remain as uncommitted changes after the update. To discard\n"
829
"these changes, use 'bzr revert'. The uncommitted changes may conflict\n"
830
"with the changes brought in by the change in basis revision."
831
msgstr ""
832
833
#: bzrlib/builtins.py:1684
834
msgid ""
835
"If the tree's branch is bound to a master branch, bzr will also update\n"
836
"the branch from the master."
837
msgstr ""
838
839
#: bzrlib/builtins.py:1687
840
msgid ""
841
"You cannot update just a single file or directory, because each Bazaar\n"
842
"working tree has just a single basis revision. If you want to restore a\n"
843
"file that has been removed locally, use 'bzr revert' instead of 'bzr\n"
844
"update'. If you want to restore a file to its state in a previous\n"
845
"revision, use 'bzr revert' with a '-r' option, or use 'bzr cat' to write\n"
846
"out the old content of that file to a new location."
847
msgstr ""
848
849
#: bzrlib/builtins.py:1694
850
msgid ""
851
"The 'dir' argument, if given, must be the location of the root of a\n"
852
"working tree to update. By default, the working tree that contains the \n"
853
"current working directory is used."
854
msgstr ""
855
856
#: bzrlib/builtins.py:1710
857
msgid "bzr update --revision takes exactly one revision"
858
msgstr ""
859
860
#: bzrlib/builtins.py:1718
861
msgid "bzr update can only update a whole tree, not a file or subdirectory"
862
msgstr ""
863
864
#: bzrlib/builtins.py:1749
865
msgid "Tree is up to date at revision {0} of branch {1}"
866
msgstr ""
867
868
#: bzrlib/builtins.py:1765
869
#, python-format
870
msgid ""
871
"branch has no revision %s\n"
872
"bzr update --revision only works for a revision in the branch history"
873
msgstr ""
874
875
#: bzrlib/builtins.py:1771
876
msgid "Updated to revision {0} of branch {1}"
877
msgstr ""
878
879
#: bzrlib/builtins.py:1775
880
msgid ""
881
"Your local commits will now show as pending merges with 'bzr status', and "
882
"can be committed with 'bzr commit'."
883
msgstr ""
884
885
#: bzrlib/builtins.py:1784
886
msgid "Show information about a working tree, branch or repository."
887
msgstr ""
888
889
#: bzrlib/builtins.py:1786
890
msgid ""
891
"This command will show all known locations and formats associated to the\n"
892
"tree, branch or repository."
893
msgstr ""
894
895
#: bzrlib/builtins.py:1789
896
msgid ""
897
"In verbose mode, statistical information is included with each report.\n"
898
"To see extended statistic information, use a verbosity level of 2 or\n"
899
"higher by specifying the verbose option multiple times, e.g. -vv."
900
msgstr ""
901
902
#: bzrlib/builtins.py:1793
903
msgid "Branches and working trees will also report any missing revisions."
904
msgstr ""
905
906
#: bzrlib/builtins.py:1795 bzrlib/builtins.py:3715 bzrlib/builtins.py:4845
907
#: bzrlib/builtins.py:6442
908
msgid ":Examples:"
909
msgstr ""
910
911
#: bzrlib/builtins.py:1797
912
msgid " Display information on the format and related locations:"
913
msgstr ""
914
915
#: bzrlib/builtins.py:1799
916
msgid " bzr info"
917
msgstr ""
918
919
#: bzrlib/builtins.py:1801
920
msgid ""
921
" Display the above together with extended format information and\n"
922
" basic statistics (like the number of files in the working tree and\n"
923
" number of revisions in the branch and repository):"
924
msgstr ""
925
926
#: bzrlib/builtins.py:1805
927
msgid " bzr info -v"
928
msgstr ""
929
930
#: bzrlib/builtins.py:1807
931
msgid " Display the above together with number of committers to the branch:"
932
msgstr ""
933
934
#: bzrlib/builtins.py:1809
935
msgid " bzr info -vv"
936
msgstr ""
937
938
#: bzrlib/builtins.py:1828
939
msgid "Remove files or directories."
940
msgstr ""
941
942
#: bzrlib/builtins.py:1830
943
msgid ""
944
"This makes Bazaar stop tracking changes to the specified files. Bazaar will\n"
945
"delete them if they can easily be recovered using revert otherwise they\n"
946
"will be backed up (adding an extention of the form .~#~). If no options or\n"
947
"parameters are given Bazaar will scan for files that are being tracked by\n"
948
"Bazaar but missing in your tree and stop tracking them for you."
949
msgstr ""
950
951
#: bzrlib/builtins.py:1838
952
msgid "Only remove files that have never been committed."
953
msgstr ""
954
955
#: bzrlib/builtins.py:1840
956
msgid "The file deletion mode to be used."
957
msgstr ""
958
959
#: bzrlib/builtins.py:1841
960
msgid "Deletion Strategy"
961
msgstr ""
962
963
#: bzrlib/builtins.py:1842
964
msgid "Backup changed files (default)."
965
msgstr ""
966
967
#: bzrlib/builtins.py:1843
968
msgid "Delete from bzr but leave the working copy."
969
msgstr ""
970
971
#: bzrlib/builtins.py:1844
972
msgid "Don't backup changed files."
973
msgstr ""
974
975
#: bzrlib/builtins.py:1845
976
msgid ""
977
"Delete all the specified files, even if they can not be recovered and even "
978
"if they are non-empty directories. (deprecated, use no-backup)"
979
msgstr ""
980
981
#: bzrlib/builtins.py:1854
982
msgid "(The --force option is deprecated, rather use --no-backup in future.)"
983
msgstr ""
984
985
#: bzrlib/builtins.py:1871
986
msgid "No matching files."
987
msgstr ""
988
989
#: bzrlib/builtins.py:1932
990
msgid "Reconcile bzr metadata in a branch."
991
msgstr ""
992
993
#: bzrlib/builtins.py:1934
994
msgid ""
995
"This can correct data mismatches that may have been caused by\n"
996
"previous ghost operations or bzr upgrades. You should only\n"
997
"need to run this command if 'bzr check' or a bzr developer\n"
998
"advises you to run it."
999
msgstr ""
1000
1001
#: bzrlib/builtins.py:1939
1002
msgid ""
1003
"If a second branch is provided, cross-branch reconciliation is\n"
1004
"also attempted, which will check that data like the tree root\n"
1005
"id which was not present in very early bzr versions is represented\n"
1006
"correctly in both branches."
1007
msgstr ""
1008
1009
#: bzrlib/builtins.py:1944
1010
msgid ""
1011
"At the same time it is run it may recompress data resulting in\n"
1012
"a potential saving in disk space or performance gain."
1013
msgstr ""
1014
1015
#: bzrlib/builtins.py:1947
1016
msgid "The branch *MUST* be on a listable system such as local disk or sftp."
1017
msgstr ""
1018
1019
#: bzrlib/builtins.py:2014 bzrlib/builtins.py:2132 bzrlib/builtins.py:3750
1020
msgid ""
1021
"Format for the bzr 2.0 series.\n"
1022
"Uses group-compress storage.\n"
1023
"Provides rich roots which are a one-way transition.\n"
1024
msgstr ""
1025
1026
#: bzrlib/builtins.py:2014 bzrlib/builtins.py:2132 bzrlib/builtins.py:3750
1027
msgid ""
1028
"Pack-based format used in 1.x series. Introduced in 0.92. Interoperates with "
1029
"bzr repositories before 0.92 but cannot be read by bzr < 0.92. "
1030
msgstr ""
1031
1032
#: bzrlib/builtins.py:2014 bzrlib/builtins.py:2132 bzrlib/builtins.py:3750
1033
msgid "The 2a format with experimental support for colocated branches.\n"
1034
msgstr ""
1035
1036
#: bzrlib/builtins.py:2015
1037
msgid "Make a directory into a versioned branch."
1038
msgstr ""
1039
1040
#: bzrlib/builtins.py:2017
1041
msgid ""
1042
"Use this to create an empty branch, or before importing an\n"
1043
"existing project."
1044
msgstr ""
1045
1046
#: bzrlib/builtins.py:2020
1047
msgid ""
1048
"If there is a repository in a parent directory of the location, then\n"
1049
"the history of the branch will be stored in the repository. Otherwise\n"
1050
"init creates a standalone branch which carries its own history\n"
1051
"in the .bzr directory."
1052
msgstr ""
1053
1054
#: bzrlib/builtins.py:2025
1055
msgid ""
1056
"If there is already a branch at the location but it has no working tree,\n"
1057
"the tree can be populated with 'bzr checkout'."
1058
msgstr ""
1059
1060
#: bzrlib/builtins.py:2028
1061
msgid "Recipe for importing a tree of files::"
1062
msgstr ""
1063
1064
#: bzrlib/builtins.py:2030
1065
msgid ""
1066
" cd ~/project\n"
1067
" bzr init\n"
1068
" bzr add .\n"
1069
" bzr status\n"
1070
" bzr commit -m \"imported project\""
1071
msgstr ""
1072
1073
#: bzrlib/builtins.py:2041
1074
msgid ""
1075
"Create the path leading up to the branch if it does not already exist."
1076
msgstr ""
1077
1078
#: bzrlib/builtins.py:2044
1079
msgid "Specify a format for this branch. See \"help formats\"."
1080
msgstr ""
1081
1082
#: bzrlib/builtins.py:2052
1083
msgid ""
1084
"Never change revnos or the existing log. Append revisions to it only."
1085
msgstr ""
1086
1087
#: bzrlib/builtins.py:2055
1088
msgid "Create a branch without a working tree."
1089
msgstr ""
1090
1091
#: bzrlib/builtins.py:2075 bzrlib/push.py:110
1092
#, python-format
1093
msgid ""
1094
"Parent directory of %s does not exist.\n"
1095
"You may supply --create-prefix to create all leading parent directories."
1096
msgstr ""
1097
1098
#: bzrlib/builtins.py:2109
1099
msgid ""
1100
"This branch format cannot be set to append-revisions-only. Try --default."
1101
msgstr ""
1102
1103
#: bzrlib/builtins.py:2120
1104
msgid "Created a {0} (format: {1})\n"
1105
msgstr ""
1106
1107
#: bzrlib/builtins.py:2129
1108
#, python-format
1109
msgid "Using shared repository: %s\n"
1110
msgstr ""
1111
1112
#: bzrlib/builtins.py:2133
1113
msgid "Create a shared repository for branches to share storage space."
1114
msgstr ""
1115
1116
#: bzrlib/builtins.py:2135
1117
msgid ""
1118
"New branches created under the repository directory will store their\n"
1119
"revisions in the repository, not in the branch directory. For branches\n"
1120
"with shared history, this reduces the amount of storage needed and \n"
1121
"speeds up the creation of new branches."
1122
msgstr ""
1123
1124
#: bzrlib/builtins.py:2140
1125
msgid ""
1126
"If the --no-trees option is given then the branches in the repository\n"
1127
"will not have working trees by default. They will still exist as \n"
1128
"directories on disk, but they will not have separate copies of the \n"
1129
"files at a certain revision. This can be useful for repositories that\n"
1130
"store branches which are interacted with through checkouts or remote\n"
1131
"branches, such as on a server."
1132
msgstr ""
1133
1134
#: bzrlib/builtins.py:2147
1135
msgid ""
1136
":Examples:\n"
1137
" Create a shared repository holding just branches::"
1138
msgstr ""
1139
1140
#: bzrlib/builtins.py:2150
1141
msgid ""
1142
" bzr init-repo --no-trees repo\n"
1143
" bzr init repo/trunk"
1144
msgstr ""
1145
1146
#: bzrlib/builtins.py:2153
1147
msgid " Make a lightweight checkout elsewhere::"
1148
msgstr ""
1149
1150
#: bzrlib/builtins.py:2155
1151
msgid ""
1152
" bzr checkout --lightweight repo/trunk trunk-checkout\n"
1153
" cd trunk-checkout\n"
1154
" (add files here)"
1155
msgstr ""
1156
1157
#: bzrlib/builtins.py:2163
1158
msgid ""
1159
"Specify a format for this repository. See \"bzr help formats\" for details."
1160
msgstr ""
1161
1162
#: bzrlib/builtins.py:2167
1163
msgid "Repository format"
1164
msgstr ""
1165
1166
#: bzrlib/builtins.py:2169
1167
msgid "Branches in the repository will default to not having a working tree."
1168
msgstr ""
1169
1170
#: bzrlib/builtins.py:2195
1171
msgid "Show differences in the working tree, between revisions or branches."
1172
msgstr ""
1173
1174
#: bzrlib/builtins.py:2197
1175
msgid ""
1176
"If no arguments are given, all changes for the current tree are listed.\n"
1177
"If files are given, only the changes in those files are listed.\n"
1178
"Remote and multiple branches can be compared by using the --old and\n"
1179
"--new options. If not provided, the default for both is derived from\n"
1180
"the first argument, if any, or the current tree if no arguments are\n"
1181
"given."
1182
msgstr ""
1183
1184
#: bzrlib/builtins.py:2204
1185
msgid ""
1186
"\"bzr diff -p1\" is equivalent to \"bzr diff --prefix old/:new/\", and\n"
1187
"produces patches suitable for \"patch -p1\"."
1188
msgstr ""
1189
1190
#: bzrlib/builtins.py:2207
1191
msgid ""
1192
"Note that when using the -r argument with a range of revisions, the\n"
1193
"differences are computed between the two specified revisions. That\n"
1194
"is, the command does not show the changes introduced by the first \n"
1195
"revision in the range. This differs from the interpretation of \n"
1196
"revision ranges used by \"bzr log\" which includes the first revision\n"
1197
"in the range."
1198
msgstr ""
1199
1200
#: bzrlib/builtins.py:2214
1201
msgid ""
1202
":Exit values:\n"
1203
" 1 - changed\n"
1204
" 2 - unrepresentable changes\n"
1205
" 3 - error\n"
1206
" 0 - no change"
1207
msgstr ""
1208
1209
#: bzrlib/builtins.py:2220
1210
msgid ""
1211
":Examples:\n"
1212
" Shows the difference in the working tree versus the last commit::"
1213
msgstr ""
1214
1215
#: bzrlib/builtins.py:2223
1216
msgid " bzr diff"
1217
msgstr ""
1218
1219
#: bzrlib/builtins.py:2225
1220
msgid " Difference between the working tree and revision 1::"
1221
msgstr ""
1222
1223
#: bzrlib/builtins.py:2227
1224
msgid " bzr diff -r1"
1225
msgstr ""
1226
1227
#: bzrlib/builtins.py:2229
1228
msgid " Difference between revision 3 and revision 1::"
1229
msgstr ""
1230
1231
#: bzrlib/builtins.py:2231
1232
msgid " bzr diff -r1..3"
1233
msgstr ""
1234
1235
#: bzrlib/builtins.py:2233
1236
msgid " Difference between revision 3 and revision 1 for branch xxx::"
1237
msgstr ""
1238
1239
#: bzrlib/builtins.py:2235
1240
msgid " bzr diff -r1..3 xxx"
1241
msgstr ""
1242
1243
#: bzrlib/builtins.py:2237
1244
msgid " The changes introduced by revision 2 (equivalent to -r1..2)::"
1245
msgstr ""
1246
1247
#: bzrlib/builtins.py:2239
1248
msgid " bzr diff -c2"
1249
msgstr ""
1250
1251
#: bzrlib/builtins.py:2241
1252
msgid ""
1253
" To see the changes introduced by revision X::\n"
1254
" \n"
1255
" bzr diff -cX"
1256
msgstr ""
1257
1258
#: bzrlib/builtins.py:2245
1259
msgid ""
1260
" Note that in the case of a merge, the -c option shows the changes\n"
1261
" compared to the left hand parent. To see the changes against\n"
1262
" another parent, use::"
1263
msgstr ""
1264
1265
#: bzrlib/builtins.py:2249
1266
msgid " bzr diff -r<chosen_parent>..X"
1267
msgstr ""
1268
1269
#: bzrlib/builtins.py:2251
1270
msgid ""
1271
" The changes between the current revision and the previous revision\n"
1272
" (equivalent to -c-1 and -r-2..-1)"
1273
msgstr ""
1274
1275
#: bzrlib/builtins.py:2254
1276
msgid " bzr diff -r-2.."
1277
msgstr ""
1278
1279
#: bzrlib/builtins.py:2256
1280
msgid " Show just the differences for file NEWS::"
1281
msgstr ""
1282
1283
#: bzrlib/builtins.py:2258
1284
msgid " bzr diff NEWS"
1285
msgstr ""
1286
1287
#: bzrlib/builtins.py:2260
1288
msgid " Show the differences in working tree xxx for file NEWS::"
1289
msgstr ""
1290
1291
#: bzrlib/builtins.py:2262
1292
msgid " bzr diff xxx/NEWS"
1293
msgstr ""
1294
1295
#: bzrlib/builtins.py:2264
1296
msgid " Show the differences from branch xxx to this working tree:"
1297
msgstr ""
1298
1299
#: bzrlib/builtins.py:2266
1300
msgid " bzr diff --old xxx"
1301
msgstr ""
1302
1303
#: bzrlib/builtins.py:2268
1304
msgid " Show the differences between two branches for file NEWS::"
1305
msgstr ""
1306
1307
#: bzrlib/builtins.py:2270
1308
msgid " bzr diff --old xxx --new yyy NEWS"
1309
msgstr ""
1310
1311
#: bzrlib/builtins.py:2272
1312
msgid " Same as 'bzr diff' but prefix paths with old/ and new/::"
1313
msgstr ""
1314
1315
#: bzrlib/builtins.py:2274
1316
msgid ""
1317
" bzr diff --prefix old/:new/\n"
1318
" \n"
1319
" Show the differences using a custom diff program with options::\n"
1320
" \n"
1321
" bzr diff --using /usr/bin/diff --diff-options -wu"
1322
msgstr ""
1323
1324
#: bzrlib/builtins.py:2284
1325
msgid "Pass these options to the external diff program."
1326
msgstr ""
1327
1328
#: bzrlib/builtins.py:2287
1329
msgid ""
1330
"Set prefixes added to old and new filenames, as two values separated by a "
1331
"colon. (eg \"old/:new/\")."
1332
msgstr ""
1333
1334
#: bzrlib/builtins.py:2290
1335
msgid "Branch/tree to compare from."
1336
msgstr ""
1337
1338
#: bzrlib/builtins.py:2294
1339
msgid "Branch/tree to compare to."
1340
msgstr ""
1341
1342
#: bzrlib/builtins.py:2300
1343
msgid "Use this command to compare files."
1344
msgstr ""
1345
1346
#: bzrlib/builtins.py:2305
1347
msgid "Diff format to use."
1348
msgstr ""
1349
1350
#: bzrlib/builtins.py:2307
1351
msgid "Diff format"
1352
msgstr ""
1353
1354
#: bzrlib/builtins.py:2329
1355
msgid "--prefix expects two values separated by a colon (eg \"old/:new/\")"
1356
msgstr ""
1357
1358
#: bzrlib/builtins.py:2333
1359
msgid "bzr diff --revision takes exactly one or two revision specifiers"
1360
msgstr ""
1361
1362
#: bzrlib/builtins.py:2338 bzrlib/builtins.py:2736 bzrlib/builtins.py:2749
1363
#: bzrlib/builtins.py:2757 bzrlib/builtins.py:4919
1364
msgid "{0} and {1} are mutually exclusive"
1365
msgstr ""
1366
1367
#: bzrlib/builtins.py:2358
1368
msgid ""
1369
"List files deleted in the working tree.\n"
1370
" "
1371
msgstr ""
1372
1373
#: bzrlib/builtins.py:2436
1374
msgid "Show the tree root directory."
1375
msgstr ""
1376
1377
#: bzrlib/builtins.py:2438
1378
msgid ""
1379
"The root is the nearest enclosing directory with a .bzr control\n"
1380
"directory."
1381
msgstr ""
1382
1383
#: bzrlib/builtins.py:2453
1384
msgid "The limit argument must be an integer."
1385
msgstr ""
1386
1387
#: bzrlib/builtins.py:2461
1388
msgid "The levels argument must be an integer."
1389
msgstr ""
1390
1391
#: bzrlib/builtins.py:2466
1392
msgid "Show historical log for a branch or subset of a branch."
1393
msgstr ""
1394
1395
#: bzrlib/builtins.py:2468
1396
msgid ""
1397
"log is bzr's default tool for exploring the history of a branch.\n"
1398
"The branch to use is taken from the first parameter. If no parameters\n"
1399
"are given, the branch containing the working directory is logged.\n"
1400
"Here are some simple examples::"
1401
msgstr ""
1402
1403
#: bzrlib/builtins.py:2473
1404
msgid ""
1405
" bzr log log the current branch\n"
1406
" bzr log foo.py log a file in its branch\n"
1407
" bzr log http://server/branch log a branch on a server"
1408
msgstr ""
1409
1410
#: bzrlib/builtins.py:2477
1411
msgid ""
1412
"The filtering, ordering and information shown for each revision can\n"
1413
"be controlled as explained below. By default, all revisions are\n"
1414
"shown sorted (topologically) so that newer revisions appear before\n"
1415
"older ones and descendants always appear before ancestors. If displayed,\n"
1416
"merged revisions are shown indented under the revision in which they\n"
1417
"were merged."
1418
msgstr ""
1419
1420
#: bzrlib/builtins.py:2484
1421
msgid ":Output control:"
1422
msgstr ""
1423
1424
#: bzrlib/builtins.py:2486
1425
msgid ""
1426
" The log format controls how information about each revision is\n"
1427
" displayed. The standard log formats are called ``long``, ``short``\n"
1428
" and ``line``. The default is long. See ``bzr help log-formats``\n"
1429
" for more details on log formats."
1430
msgstr ""
1431
1432
#: bzrlib/builtins.py:2491
1433
msgid ""
1434
" The following options can be used to control what information is\n"
1435
" displayed::"
1436
msgstr ""
1437
1438
#: bzrlib/builtins.py:2494
1439
msgid ""
1440
" -l N display a maximum of N revisions\n"
1441
" -n N display N levels of revisions (0 for all, 1 for collapsed)\n"
1442
" -v display a status summary (delta) for each revision\n"
1443
" -p display a diff (patch) for each revision\n"
1444
" --show-ids display revision-ids (and file-ids), not just revnos"
1445
msgstr ""
1446
1447
#: bzrlib/builtins.py:2500
1448
msgid ""
1449
" Note that the default number of levels to display is a function of the\n"
1450
" log format. If the -n option is not used, the standard log formats show\n"
1451
" just the top level (mainline)."
1452
msgstr ""
1453
1454
#: bzrlib/builtins.py:2504
1455
msgid ""
1456
" Status summaries are shown using status flags like A, M, etc. To see\n"
1457
" the changes explained using words like ``added`` and ``modified``\n"
1458
" instead, use the -vv option."
1459
msgstr ""
1460
1461
#: bzrlib/builtins.py:2508
1462
msgid ":Ordering control:"
1463
msgstr ""
1464
1465
#: bzrlib/builtins.py:2510
1466
msgid ""
1467
" To display revisions from oldest to newest, use the --forward option.\n"
1468
" In most cases, using this option will have little impact on the total\n"
1469
" time taken to produce a log, though --forward does not incrementally\n"
1470
" display revisions like --reverse does when it can."
1471
msgstr ""
1472
1473
#: bzrlib/builtins.py:2515
1474
msgid ":Revision filtering:"
1475
msgstr ""
1476
1477
#: bzrlib/builtins.py:2517
1478
msgid ""
1479
" The -r option can be used to specify what revision or range of revisions\n"
1480
" to filter against. The various forms are shown below::"
1481
msgstr ""
1482
1483
#: bzrlib/builtins.py:2520
1484
msgid ""
1485
" -rX display revision X\n"
1486
" -rX.. display revision X and later\n"
1487
" -r..Y display up to and including revision Y\n"
1488
" -rX..Y display from X to Y inclusive"
1489
msgstr ""
1490
1491
#: bzrlib/builtins.py:2525
1492
msgid ""
1493
" See ``bzr help revisionspec`` for details on how to specify X and Y.\n"
1494
" Some common examples are given below::"
1495
msgstr ""
1496
1497
#: bzrlib/builtins.py:2528
1498
msgid ""
1499
" -r-1 show just the tip\n"
1500
" -r-10.. show the last 10 mainline revisions\n"
1501
" -rsubmit:.. show what's new on this branch\n"
1502
" -rancestor:path.. show changes since the common ancestor of this\n"
1503
" branch and the one at location path\n"
1504
" -rdate:yesterday.. show changes since yesterday"
1505
msgstr ""
1506
1507
#: bzrlib/builtins.py:2535
1508
msgid ""
1509
" When logging a range of revisions using -rX..Y, log starts at\n"
1510
" revision Y and searches back in history through the primary\n"
1511
" (\"left-hand\") parents until it finds X. When logging just the\n"
1512
" top level (using -n1), an error is reported if X is not found\n"
1513
" along the way. If multi-level logging is used (-n0), X may be\n"
1514
" a nested merge revision and the log will be truncated accordingly."
1515
msgstr ""
1516
1517
#: bzrlib/builtins.py:2542
1518
msgid ":Path filtering:"
1519
msgstr ""
1520
1521
#: bzrlib/builtins.py:2544
1522
msgid ""
1523
" If parameters are given and the first one is not a branch, the log\n"
1524
" will be filtered to show only those revisions that changed the\n"
1525
" nominated files or directories."
1526
msgstr ""
1527
1528
#: bzrlib/builtins.py:2548
1529
msgid ""
1530
" Filenames are interpreted within their historical context. To log a\n"
1531
" deleted file, specify a revision range so that the file existed at\n"
1532
" the end or start of the range."
1533
msgstr ""
1534
1535
#: bzrlib/builtins.py:2552
1536
msgid ""
1537
" Historical context is also important when interpreting pathnames of\n"
1538
" renamed files/directories. Consider the following example:"
1539
msgstr ""
1540
1541
#: bzrlib/builtins.py:2555
1542
msgid ""
1543
" * revision 1: add tutorial.txt\n"
1544
" * revision 2: modify tutorial.txt\n"
1545
" * revision 3: rename tutorial.txt to guide.txt; add tutorial.txt"
1546
msgstr ""
1547
1548
#: bzrlib/builtins.py:2559
1549
msgid " In this case:"
1550
msgstr ""
1551
1552
#: bzrlib/builtins.py:2561
1553
msgid " * ``bzr log guide.txt`` will log the file added in revision 1"
1554
msgstr ""
1555
1556
#: bzrlib/builtins.py:2563
1557
msgid ""
1558
" * ``bzr log tutorial.txt`` will log the new file added in revision 3"
1559
msgstr ""
1560
1561
#: bzrlib/builtins.py:2565
1562
msgid ""
1563
" * ``bzr log -r2 -p tutorial.txt`` will show the changes made to\n"
1564
" the original file in revision 2."
1565
msgstr ""
1566
1567
#: bzrlib/builtins.py:2568
1568
msgid ""
1569
" * ``bzr log -r2 -p guide.txt`` will display an error message as there\n"
1570
" was no file called guide.txt in revision 2."
1571
msgstr ""
1572
1573
#: bzrlib/builtins.py:2571
1574
msgid ""
1575
" Renames are always followed by log. By design, there is no need to\n"
1576
" explicitly ask for this (and no way to stop logging a file back\n"
1577
" until it was last renamed)."
1578
msgstr ""
1579
1580
#: bzrlib/builtins.py:2575
1581
msgid ":Other filtering:"
1582
msgstr ""
1583
1584
#: bzrlib/builtins.py:2577
1585
msgid ""
1586
" The --match option can be used for finding revisions that match a\n"
1587
" regular expression in a commit message, committer, author or bug.\n"
1588
" Specifying the option several times will match any of the supplied\n"
1589
" expressions. --match-author, --match-bugs, --match-committer and\n"
1590
" --match-message can be used to only match a specific field."
1591
msgstr ""
1592
1593
#: bzrlib/builtins.py:2583
1594
msgid ":Tips & tricks:"
1595
msgstr ""
1596
1597
#: bzrlib/builtins.py:2585
1598
msgid ""
1599
" GUI tools and IDEs are often better at exploring history than command\n"
1600
" line tools: you may prefer qlog or viz from qbzr or bzr-gtk, the\n"
1601
" bzr-explorer shell, or the Loggerhead web interface. See the Plugin\n"
1602
" Guide <http://doc.bazaar.canonical.com/plugins/en/> and\n"
1603
" <http://wiki.bazaar.canonical.com/IDEIntegration>. "
1604
msgstr ""
1605
1606
#: bzrlib/builtins.py:2591
1607
msgid ""
1608
" You may find it useful to add the aliases below to ``bazaar.conf``::"
1609
msgstr ""
1610
1611
#: bzrlib/builtins.py:2593
1612
msgid ""
1613
" [ALIASES]\n"
1614
" tip = log -r-1\n"
1615
" top = log -l10 --line\n"
1616
" show = log -v -p"
1617
msgstr ""
1618
1619
#: bzrlib/builtins.py:2598
1620
msgid ""
1621
" ``bzr tip`` will then show the latest revision while ``bzr top``\n"
1622
" will show the last 10 mainline revisions. To see the details of a\n"
1623
" particular revision X, ``bzr show -rX``."
1624
msgstr ""
1625
1626
#: bzrlib/builtins.py:2602
1627
msgid ""
1628
" If you are interested in looking deeper into a particular merge X,\n"
1629
" use ``bzr log -n0 -rX``."
1630
msgstr ""
1631
1632
#: bzrlib/builtins.py:2605
1633
msgid ""
1634
" ``bzr log -v`` on a branch with lots of history is currently\n"
1635
" very slow. A fix for this issue is currently under development.\n"
1636
" With or without that fix, it is recommended that a revision range\n"
1637
" be given when using the -v option."
1638
msgstr ""
1639
1640
#: bzrlib/builtins.py:2610
1641
msgid ""
1642
" bzr has a generic full-text matching plugin, bzr-search, that can be\n"
1643
" used to find revisions matching user names, commit messages, etc.\n"
1644
" Among other features, this plugin can find all revisions containing\n"
1645
" a list of words but not others."
1646
msgstr ""
1647
1648
#: bzrlib/builtins.py:2615
1649
msgid ""
1650
" When exploring non-mainline history on large projects with deep\n"
1651
" history, the performance of log can be greatly improved by installing\n"
1652
" the historycache plugin. This plugin buffers historical information\n"
1653
" trading disk space for faster speed."
1654
msgstr ""
1655
1656
#: bzrlib/builtins.py:2624
1657
msgid "Show from oldest to newest."
1658
msgstr ""
1659
1660
#: bzrlib/builtins.py:2627
1661
msgid "Show files changed in each revision."
1662
msgstr ""
1663
1664
#: bzrlib/builtins.py:2633
1665
msgid "Show just the specified revision. See also \"help revisionspec\"."
1666
msgstr ""
1667
1668
#: bzrlib/builtins.py:2637
1669
msgid "What names to list as authors - first, all or committer."
1670
msgstr ""
1671
1672
#: bzrlib/builtins.py:2638
1673
msgid "Authors"
1674
msgstr ""
1675
1676
#: bzrlib/builtins.py:2643
1677
msgid "Number of levels to display - 0 for all, 1 for flat."
1678
msgstr ""
1679
1680
#: bzrlib/builtins.py:2653
1681
msgid "Limit the output to the first N revisions."
1682
msgstr ""
1683
1684
#: bzrlib/builtins.py:2658
1685
msgid "Show changes made in each revision as a patch."
1686
msgstr ""
1687
1688
#: bzrlib/builtins.py:2660
1689
msgid "Show merged revisions like --levels 0 does."
1690
msgstr ""
1691
1692
#: bzrlib/builtins.py:2664
1693
msgid "Do not report commits with more than one parent."
1694
msgstr ""
1695
1696
#: bzrlib/builtins.py:2666
1697
msgid ""
1698
"Display only the revisions that are not part of both ancestries (require -"
1699
"rX..Y)."
1700
msgstr ""
1701
1702
#: bzrlib/builtins.py:2670
1703
msgid "Show digital signature validity."
1704
msgstr ""
1705
1706
#: bzrlib/builtins.py:2673
1707
msgid "Show revisions whose properties match this expression."
1708
msgstr ""
1709
1710
#: bzrlib/builtins.py:2677
1711
msgid "Show revisions whose message matches this expression."
1712
msgstr ""
1713
1714
#: bzrlib/builtins.py:2681
1715
msgid "Show revisions whose committer matches this expression."
1716
msgstr ""
1717
1718
#: bzrlib/builtins.py:2685
1719
msgid "Show revisions whose authors match this expression."
1720
msgstr ""
1721
1722
#: bzrlib/builtins.py:2689
1723
msgid "Show revisions whose bugs match this expression."
1724
msgstr ""
1725
1726
#: bzrlib/builtins.py:2743
1727
msgid "--exclude-common-ancestry requires -r with two revisions"
1728
msgstr ""
1729
1730
#: bzrlib/builtins.py:2771
1731
#, python-format
1732
msgid "Path unknown at end or start of revision range: %s"
1733
msgstr ""
1734
1735
#: bzrlib/builtins.py:2888
1736
#, python-format
1737
msgid "bzr %s doesn't accept two revisions in different branches."
1738
msgstr ""
1739
1740
#: bzrlib/builtins.py:2904
1741
#, python-format
1742
msgid "bzr %s --revision takes one or two values."
1743
msgstr ""
1744
1745
#: bzrlib/builtins.py:2949
1746
msgid ""
1747
"List files in a tree.\n"
1748
" "
1749
msgstr ""
1750
1751
#: bzrlib/builtins.py:2958
1752
msgid "Recurse into subdirectories."
1753
msgstr ""
1754
1755
#: bzrlib/builtins.py:2960
1756
msgid "Print paths relative to the root of the branch."
1757
msgstr ""
1758
1759
#: bzrlib/builtins.py:2962
1760
msgid "Print unknown files."
1761
msgstr ""
1762
1763
#: bzrlib/builtins.py:2963
1764
msgid "Print versioned files."
1765
msgstr ""
1766
1767
#: bzrlib/builtins.py:2966
1768
msgid "Print ignored files."
1769
msgstr ""
1770
1771
#: bzrlib/builtins.py:2968
1772
msgid "List entries of a particular kind: file, directory, symlink."
1773
msgstr ""
1774
1775
#: bzrlib/builtins.py:2981
1776
msgid "invalid kind specified"
1777
msgstr ""
1778
1779
#: bzrlib/builtins.py:2984
1780
msgid "Cannot set both --verbose and --null"
1781
msgstr ""
1782
1783
#: bzrlib/builtins.py:2993
1784
msgid "cannot specify both --from-root and PATH"
1785
msgstr ""
1786
1787
#: bzrlib/builtins.py:3080
1788
msgid "Ignore specified files or patterns."
1789
msgstr ""
1790
1791
#: bzrlib/builtins.py:3082
1792
msgid "See ``bzr help patterns`` for details on the syntax of patterns."
1793
msgstr ""
1794
1795
#: bzrlib/builtins.py:3084
1796
msgid ""
1797
"If a .bzrignore file does not exist, the ignore command\n"
1798
"will create one and add the specified files or patterns to the newly\n"
1799
"created file. The ignore command will also automatically add the \n"
1800
".bzrignore file to be versioned. Creating a .bzrignore file without\n"
1801
"the use of the ignore command will require an explicit add command."
1802
msgstr ""
1803
1804
#: bzrlib/builtins.py:3090
1805
msgid ""
1806
"To remove patterns from the ignore list, edit the .bzrignore file.\n"
1807
"After adding, editing or deleting that file either indirectly by\n"
1808
"using this command or directly by using an editor, be sure to commit\n"
1809
"it."
1810
msgstr ""
1811
1812
#: bzrlib/builtins.py:3095
1813
msgid ""
1814
"Bazaar also supports a global ignore file ~/.bazaar/ignore. On Windows\n"
1815
"the global ignore file can be found in the application data directory as\n"
1816
"C:\\Documents and Settings\\<user>\\Application Data\\Bazaar\\2.0\\ignore.\n"
1817
"Global ignores are not touched by this command. The global ignore file\n"
1818
"can be edited directly using an editor."
1819
msgstr ""
1820
1821
#: bzrlib/builtins.py:3101
1822
msgid ""
1823
"Patterns prefixed with '!' are exceptions to ignore patterns and take\n"
1824
"precedence over regular ignores. Such exceptions are used to specify\n"
1825
"files that should be versioned which would otherwise be ignored."
1826
msgstr ""
1827
1828
#: bzrlib/builtins.py:3105
1829
msgid ""
1830
"Patterns prefixed with '!!' act as regular ignore patterns, but have\n"
1831
"precedence over the '!' exception patterns."
1832
msgstr ""
1833
1834
#: bzrlib/builtins.py:3108
1835
msgid ""
1836
":Notes: \n"
1837
" \n"
1838
"* Ignore patterns containing shell wildcards must be quoted from\n"
1839
" the shell on Unix."
1840
msgstr ""
1841
1842
#: bzrlib/builtins.py:3113
1843
msgid ""
1844
"* Ignore patterns starting with \"#\" act as comments in the ignore file.\n"
1845
" To ignore patterns that begin with that character, use the \"RE:\" prefix."
1846
msgstr ""
1847
1848
#: bzrlib/builtins.py:3116
1849
msgid ""
1850
":Examples:\n"
1851
" Ignore the top level Makefile::"
1852
msgstr ""
1853
1854
#: bzrlib/builtins.py:3119
1855
msgid " bzr ignore ./Makefile"
1856
msgstr ""
1857
1858
#: bzrlib/builtins.py:3121
1859
msgid " Ignore .class files in all directories...::"
1860
msgstr ""
1861
1862
#: bzrlib/builtins.py:3123
1863
msgid " bzr ignore \"*.class\""
1864
msgstr ""
1865
1866
#: bzrlib/builtins.py:3125
1867
msgid " ...but do not ignore \"special.class\"::"
1868
msgstr ""
1869
1870
#: bzrlib/builtins.py:3127
1871
msgid " bzr ignore \"!special.class\""
1872
msgstr ""
1873
1874
#: bzrlib/builtins.py:3129
1875
msgid " Ignore files whose name begins with the \"#\" character::"
1876
msgstr ""
1877
1878
#: bzrlib/builtins.py:3131
1879
msgid " bzr ignore \"RE:^#\""
1880
msgstr ""
1881
1882
#: bzrlib/builtins.py:3133 bzrlib/builtins.py:3137
1883
msgid " Ignore .o files under the lib directory::"
1884
msgstr ""
1885
1886
#: bzrlib/builtins.py:3135
1887
msgid " bzr ignore \"lib/**/*.o\""
1888
msgstr ""
1889
1890
#: bzrlib/builtins.py:3139
1891
msgid " bzr ignore \"RE:lib/.*\\.o\""
1892
msgstr ""
1893
1894
#: bzrlib/builtins.py:3141
1895
msgid " Ignore everything but the \"debian\" toplevel directory::"
1896
msgstr ""
1897
1898
#: bzrlib/builtins.py:3143
1899
msgid ""
1900
" bzr ignore \"RE:(?!debian/).*\"\n"
1901
" \n"
1902
" Ignore everything except the \"local\" toplevel directory,\n"
1903
" but always ignore autosave files ending in ~, even under local/::\n"
1904
" \n"
1905
" bzr ignore \"*\"\n"
1906
" bzr ignore \"!./local\"\n"
1907
" bzr ignore \"!!*~\""
1908
msgstr ""
1909
1910
#: bzrlib/builtins.py:3157
1911
msgid "Display the default ignore rules that bzr uses."
1912
msgstr ""
1913
1914
#: bzrlib/builtins.py:3169
1915
msgid "ignore requires at least one NAME_PATTERN or --default-rules."
1916
msgstr ""
1917
1918
#: bzrlib/builtins.py:3180
1919
#, python-format
1920
msgid "Invalid ignore pattern found. %s"
1921
msgid_plural "Invalid ignore patterns found. %s"
1922
msgstr[0] ""
1923
msgstr[1] ""
1924
1925
#: bzrlib/builtins.py:3189
1926
msgid "NAME_PATTERN should not be an absolute path"
1927
msgstr ""
1928
1929
#: bzrlib/builtins.py:3202
1930
#, python-format
1931
msgid ""
1932
"Warning: the following files are version controlled and match your ignore "
1933
"pattern:\n"
1934
"%s\n"
1935
"These files will continue to be version controlled unless you 'bzr remove' "
1936
"them.\n"
1937
msgstr ""
1938
1939
#: bzrlib/builtins.py:3209
1940
msgid "List ignored files and the patterns that matched them."
1941
msgstr ""
1942
1943
#: bzrlib/builtins.py:3211
1944
msgid ""
1945
"List all the ignored files and the ignore pattern that caused the file to\n"
1946
"be ignored."
1947
msgstr ""
1948
1949
#: bzrlib/builtins.py:3214
1950
msgid "Alternatively, to list just the files::"
1951
msgstr ""
1952
1953
#: bzrlib/builtins.py:3216
1954
msgid " bzr ls --ignored"
1955
msgstr ""
1956
1957
#: bzrlib/builtins.py:3250
1958
#, python-format
1959
msgid "not a valid revision-number: %r"
1960
msgstr ""
1961
1962
#: bzrlib/builtins.py:3257
1963
msgid ""
1964
"Export current or past revision to a destination directory or archive."
1965
msgstr ""
1966
1967
#: bzrlib/builtins.py:3259
1968
msgid "If no revision is specified this exports the last committed revision."
1969
msgstr ""
1970
1971
#: bzrlib/builtins.py:3261
1972
msgid ""
1973
"Format may be an \"exporter\" name, such as tar, tgz, tbz2. If none is\n"
1974
"given, try to find the format with the extension. If no extension\n"
1975
"is found exports to a directory (equivalent to --format=dir)."
1976
msgstr ""
1977
1978
#: bzrlib/builtins.py:3265
1979
msgid ""
1980
"If root is supplied, it will be used as the root directory inside\n"
1981
"container formats (tar, zip, etc). If it is not supplied it will default\n"
1982
"to the exported filename. The root option has no effect for 'dir' format."
1983
msgstr ""
1984
1985
#: bzrlib/builtins.py:3269
1986
msgid ""
1987
"If branch is omitted then the branch containing the current working\n"
1988
"directory will be used."
1989
msgstr ""
1990
1991
#: bzrlib/builtins.py:3272
1992
msgid ""
1993
"Note: Export of tree with non-ASCII filenames to zip is not supported."
1994
msgstr ""
1995
1996
#: bzrlib/builtins.py:3274
1997
msgid ""
1998
" ================= =========================\n"
1999
" Supported formats Autodetected by extension\n"
2000
" ================= =========================\n"
2001
" dir (none)\n"
2002
" tar .tar\n"
2003
" tbz2 .tar.bz2, .tbz2\n"
2004
" tgz .tar.gz, .tgz\n"
2005
" zip .zip\n"
2006
" ================= ========================="
2007
msgstr ""
2008
2009
#: bzrlib/builtins.py:3288
2010
msgid "Type of file to export to."
2011
msgstr ""
2012
2013
#: bzrlib/builtins.py:3291
2014
msgid "Apply content filters to export the convenient form."
2015
msgstr ""
2016
2017
#: bzrlib/builtins.py:3295
2018
msgid "Name of the root directory inside the exported file."
2019
msgstr ""
2020
2021
#: bzrlib/builtins.py:3297
2022
msgid ""
2023
"Set modification time of files to that of the last revision in which it was "
2024
"changed."
2025
msgstr ""
2026
2027
#: bzrlib/builtins.py:3300
2028
msgid ""
2029
"Export the working tree contents rather than that of the last revision."
2030
msgstr ""
2031
2032
#: bzrlib/builtins.py:3319
2033
msgid "--uncommitted requires a working tree"
2034
msgstr ""
2035
2036
#: bzrlib/builtins.py:3328
2037
#, python-format
2038
msgid "Unsupported export format: %s"
2039
msgstr ""
2040
2041
#: bzrlib/builtins.py:3332
2042
msgid ""
2043
"Write the contents of a file as of a given revision to standard output."
2044
msgstr ""
2045
2046
#: bzrlib/builtins.py:3334
2047
msgid "If no revision is nominated, the last revision is used."
2048
msgstr ""
2049
2050
#: bzrlib/builtins.py:3336
2051
msgid ""
2052
"Note: Take care to redirect standard output when using this command on a\n"
2053
"binary file."
2054
msgstr ""
2055
2056
#: bzrlib/builtins.py:3342
2057
msgid "The path name in the old tree."
2058
msgstr ""
2059
2060
#: bzrlib/builtins.py:3343
2061
msgid "Apply content filters to display the convenience form."
2062
msgstr ""
2063
2064
#: bzrlib/builtins.py:3354
2065
msgid "bzr cat --revision takes exactly one revision specifier"
2066
msgstr ""
2067
2068
#: bzrlib/builtins.py:3379 bzrlib/builtins.py:3391
2069
msgid "{0!r} is not present in revision {1}"
2070
msgstr ""
2071
2072
#: bzrlib/builtins.py:3414
2073
msgid "Commit changes into a new revision."
2074
msgstr ""
2075
2076
#: bzrlib/builtins.py:3416
2077
msgid ""
2078
"An explanatory message needs to be given for each commit. This is\n"
2079
"often done by using the --message option (getting the message from the\n"
2080
"command line) or by using the --file option (getting the message from\n"
2081
"a file). If neither of these options is given, an editor is opened for\n"
2082
"the user to enter the message. To see the changed files in the\n"
2083
"boilerplate text loaded into the editor, use the --show-diff option."
2084
msgstr ""
2085
2086
#: bzrlib/builtins.py:3423
2087
msgid ""
2088
"By default, the entire tree is committed and the person doing the\n"
2089
"commit is assumed to be the author. These defaults can be overridden\n"
2090
"as explained below."
2091
msgstr ""
2092
2093
#: bzrlib/builtins.py:3427
2094
msgid ":Selective commits:"
2095
msgstr ""
2096
2097
#: bzrlib/builtins.py:3429
2098
msgid ""
2099
" If selected files are specified, only changes to those files are\n"
2100
" committed. If a directory is specified then the directory and\n"
2101
" everything within it is committed."
2102
msgstr ""
2103
2104
#: bzrlib/builtins.py:3433
2105
msgid ""
2106
" When excludes are given, they take precedence over selected files.\n"
2107
" For example, to commit only changes within foo, but not changes\n"
2108
" within foo/bar::"
2109
msgstr ""
2110
2111
#: bzrlib/builtins.py:3437
2112
msgid " bzr commit foo -x foo/bar"
2113
msgstr ""
2114
2115
#: bzrlib/builtins.py:3439
2116
msgid " A selective commit after a merge is not yet supported."
2117
msgstr ""
2118
2119
#: bzrlib/builtins.py:3441
2120
msgid ":Custom authors:"
2121
msgstr ""
2122
2123
#: bzrlib/builtins.py:3443
2124
msgid ""
2125
" If the author of the change is not the same person as the committer,\n"
2126
" you can specify the author's name using the --author option. The\n"
2127
" name should be in the same format as a committer-id, e.g.\n"
2128
" \"John Doe <jdoe@example.com>\". If there is more than one author of\n"
2129
" the change you can specify the option multiple times, once for each\n"
2130
" author."
2131
msgstr ""
2132
2133
#: bzrlib/builtins.py:3450
2134
msgid ":Checks:"
2135
msgstr ""
2136
2137
#: bzrlib/builtins.py:3452
2138
msgid ""
2139
" A common mistake is to forget to add a new file or directory before\n"
2140
" running the commit command. The --strict option checks for unknown\n"
2141
" files and aborts the commit if any are found. More advanced pre-commit\n"
2142
" checks can be implemented by defining hooks. See ``bzr help hooks``\n"
2143
" for details."
2144
msgstr ""
2145
2146
#: bzrlib/builtins.py:3458
2147
msgid ":Things to note:"
2148
msgstr ""
2149
2150
#: bzrlib/builtins.py:3460
2151
msgid ""
2152
" If you accidentially commit the wrong changes or make a spelling\n"
2153
" mistake in the commit message say, you can use the uncommit command\n"
2154
" to undo it. See ``bzr help uncommit`` for details."
2155
msgstr ""
2156
2157
#: bzrlib/builtins.py:3464
2158
msgid ""
2159
" Hooks can also be configured to run after a commit. This allows you\n"
2160
" to trigger updates to external systems like bug trackers. The --fixes\n"
2161
" option can be used to record the association between a revision and\n"
2162
" one or more bugs. See ``bzr help bugs`` for details."
2163
msgstr ""
2164
2165
#: bzrlib/builtins.py:3474
2166
msgid "Do not consider changes made to a given path."
2167
msgstr ""
2168
2169
#: bzrlib/builtins.py:3477
2170
msgid "Description of the new revision."
2171
msgstr ""
2172
2173
#: bzrlib/builtins.py:3480
2174
msgid "Commit even if nothing has changed."
2175
msgstr ""
2176
2177
#: bzrlib/builtins.py:3484
2178
msgid "Take commit message from this file."
2179
msgstr ""
2180
2181
#: bzrlib/builtins.py:3486
2182
msgid "Refuse to commit if there are unknown files in the working tree."
2183
msgstr ""
2184
2185
#: bzrlib/builtins.py:3489
2186
msgid ""
2187
"Manually set a commit time using commit date format, e.g. '2009-10-10 "
2188
"08:00:00 +0100'."
2189
msgstr ""
2190
2191
#: bzrlib/builtins.py:3492
2192
msgid "Mark a bug as being fixed by this revision (see \"bzr help bugs\")."
2193
msgstr ""
2194
2195
#: bzrlib/builtins.py:3495
2196
msgid "Set the author's name, if it's different from the committer."
2197
msgstr ""
2198
2199
#: bzrlib/builtins.py:3498
2200
msgid ""
2201
"Perform a local commit in a bound branch. Local commits are not pushed to "
2202
"the master branch until a normal commit is performed."
2203
msgstr ""
2204
2205
#: bzrlib/builtins.py:3504
2206
msgid ""
2207
"When no message is supplied, show the diff along with the status summary in "
2208
"the message editor."
2209
msgstr ""
2210
2211
#: bzrlib/builtins.py:3507
2212
msgid ""
2213
"When committing to a foreign version control system do not push data that "
2214
"can not be natively represented."
2215
msgstr ""
2216
2217
#: bzrlib/builtins.py:3525
2218
#, python-format
2219
msgid ""
2220
"No tracker specified for bug %s. Use the form 'tracker:id' or specify a "
2221
"default bug tracker using the `bugtracker` option.\n"
2222
"See \"bzr help bugs\" for more information on this feature. Commit refused."
2223
msgstr ""
2224
2225
#: bzrlib/builtins.py:3534
2226
#, python-format
2227
msgid ""
2228
"Invalid bug %s. Must be in the form of 'tracker:id'. See \"bzr help bugs\" "
2229
"for more information on this feature.\n"
2230
"Commit refused."
2231
msgstr ""
2232
2233
#: bzrlib/builtins.py:3543
2234
#, python-format
2235
msgid "Unrecognized bug %s. Commit refused."
2236
msgstr ""
2237
2238
#: bzrlib/builtins.py:3546
2239
#, python-format
2240
msgid ""
2241
"%s\n"
2242
"Commit refused."
2243
msgstr ""
2244
2245
#: bzrlib/builtins.py:3570
2246
msgid "Could not parse --commit-time: "
2247
msgstr ""
2248
2249
#: bzrlib/builtins.py:3610
2250
msgid "please specify either --message or --file"
2251
msgstr ""
2252
2253
#: bzrlib/builtins.py:3639
2254
msgid "please specify a commit message with either --message or --file"
2255
msgstr ""
2256
2257
#: bzrlib/builtins.py:3642
2258
msgid ""
2259
"Empty commit message specified. Please specify a commit message with either -"
2260
"-message or --file or leave a blank message with --message \"\"."
2261
msgstr ""
2262
2263
#: bzrlib/builtins.py:3662
2264
msgid ""
2265
"No changes to commit. Please 'bzr add' the files you want to commit, or use -"
2266
"-unchanged to force an empty commit."
2267
msgstr ""
2268
2269
#: bzrlib/builtins.py:3666
2270
msgid ""
2271
"Conflicts detected in working tree. Use \"bzr conflicts\" to list, \"bzr "
2272
"resolve FILE\" to resolve."
2273
msgstr ""
2274
2275
#: bzrlib/builtins.py:3670
2276
msgid "Commit refused because there are unknown files in the working tree."
2277
msgstr ""
2278
2279
#: bzrlib/builtins.py:3673
2280
msgid ""
2281
"\n"
2282
"To commit to master branch, run update and then commit.\n"
2283
"You can also pass --local to commit to continue working disconnected."
2284
msgstr ""
2285
2286
#: bzrlib/builtins.py:3681
2287
msgid ""
2288
"Validate working tree structure, branch consistency and repository history."
2289
msgstr ""
2290
2291
#: bzrlib/builtins.py:3683
2292
msgid ""
2293
"This command checks various invariants about branch and repository storage\n"
2294
"to detect data corruption or bzr bugs."
2295
msgstr ""
2296
2297
#: bzrlib/builtins.py:3686
2298
msgid ""
2299
"The working tree and branch checks will only give output if a problem is\n"
2300
"detected. The output fields of the repository check are:"
2301
msgstr ""
2302
2303
#: bzrlib/builtins.py:3689
2304
msgid ""
2305
"revisions\n"
2306
" This is just the number of revisions checked. It doesn't\n"
2307
" indicate a problem."
2308
msgstr ""
2309
2310
#: bzrlib/builtins.py:3693
2311
msgid ""
2312
"versionedfiles\n"
2313
" This is just the number of versionedfiles checked. It\n"
2314
" doesn't indicate a problem."
2315
msgstr ""
2316
2317
#: bzrlib/builtins.py:3697
2318
msgid ""
2319
"unreferenced ancestors\n"
2320
" Texts that are ancestors of other texts, but\n"
2321
" are not properly referenced by the revision ancestry. This is a\n"
2322
" subtle problem that Bazaar can work around."
2323
msgstr ""
2324
2325
#: bzrlib/builtins.py:3702
2326
msgid ""
2327
"unique file texts\n"
2328
" This is the total number of unique file contents\n"
2329
" seen in the checked revisions. It does not indicate a problem."
2330
msgstr ""
2331
2332
#: bzrlib/builtins.py:3706
2333
msgid ""
2334
"repeated file texts\n"
2335
" This is the total number of repeated texts seen\n"
2336
" in the checked revisions. Texts can be repeated when their file\n"
2337
" entries are modified, but the file contents are not. It does not\n"
2338
" indicate a problem."
2339
msgstr ""
2340
2341
#: bzrlib/builtins.py:3712
2342
msgid ""
2343
"If no restrictions are specified, all Bazaar data that is found at the "
2344
"given\n"
2345
"location will be checked."
2346
msgstr ""
2347
2348
#: bzrlib/builtins.py:3717
2349
msgid " Check the tree and branch at 'foo'::"
2350
msgstr ""
2351
2352
#: bzrlib/builtins.py:3719
2353
msgid " bzr check --tree --branch foo"
2354
msgstr ""
2355
2356
#: bzrlib/builtins.py:3721
2357
msgid " Check only the repository at 'bar'::"
2358
msgstr ""
2359
2360
#: bzrlib/builtins.py:3723
2361
msgid " bzr check --repo bar"
2362
msgstr ""
2363
2364
#: bzrlib/builtins.py:3725
2365
msgid " Check everything at 'baz'::"
2366
msgstr ""
2367
2368
#: bzrlib/builtins.py:3727
2369
msgid " bzr check baz"
2370
msgstr ""
2371
2372
#: bzrlib/builtins.py:3733
2373
msgid "Check the branch related to the current directory."
2374
msgstr ""
2375
2376
#: bzrlib/builtins.py:3735
2377
msgid "Check the repository related to the current directory."
2378
msgstr ""
2379
2380
#: bzrlib/builtins.py:3737
2381
msgid "Check the working tree related to the current directory."
2382
msgstr ""
2383
2384
#: bzrlib/builtins.py:3751
2385
msgid "Upgrade a repository, branch or working tree to a newer format."
2386
msgstr ""
2387
2388
#: bzrlib/builtins.py:3753
2389
msgid ""
2390
"When the default format has changed after a major new release of\n"
2391
"Bazaar, you may be informed during certain operations that you\n"
2392
"should upgrade. Upgrading to a newer format may improve performance\n"
2393
"or make new features available. It may however limit interoperability\n"
2394
"with older repositories or with older versions of Bazaar."
2395
msgstr ""
2396
2397
#: bzrlib/builtins.py:3759
2398
msgid ""
2399
"If you wish to upgrade to a particular format rather than the\n"
2400
"current default, that can be specified using the --format option.\n"
2401
"As a consequence, you can use the upgrade command this way to\n"
2402
"\"downgrade\" to an earlier format, though some conversions are\n"
2403
"a one way process (e.g. changing from the 1.x default to the\n"
2404
"2.x default) so downgrading is not always possible."
2405
msgstr ""
2406
2407
#: bzrlib/builtins.py:3766
2408
msgid ""
2409
"A backup.bzr.~#~ directory is created at the start of the conversion\n"
2410
"process (where # is a number). By default, this is left there on\n"
2411
"completion. If the conversion fails, delete the new .bzr directory\n"
2412
"and rename this one back in its place. Use the --clean option to ask\n"
2413
"for the backup.bzr directory to be removed on successful conversion.\n"
2414
"Alternatively, you can delete it by hand if everything looks good\n"
2415
"afterwards."
2416
msgstr ""
2417
2418
#: bzrlib/builtins.py:3774
2419
msgid ""
2420
"If the location given is a shared repository, dependent branches\n"
2421
"are also converted provided the repository converts successfully.\n"
2422
"If the conversion of a branch fails, remaining branches are still\n"
2423
"tried."
2424
msgstr ""
2425
2426
#: bzrlib/builtins.py:3779
2427
msgid ""
2428
"For more information on upgrades, see the Bazaar Upgrade Guide,\n"
2429
"http://doc.bazaar.canonical.com/latest/en/upgrade-guide/."
2430
msgstr ""
2431
2432
#: bzrlib/builtins.py:3787
2433
msgid "Upgrade to a specific format. See \"bzr help formats\" for details."
2434
msgstr ""
2435
2436
#: bzrlib/builtins.py:3791
2437
msgid "Branch format"
2438
msgstr ""
2439
2440
#: bzrlib/builtins.py:3793
2441
msgid "Remove the backup.bzr directory if successful."
2442
msgstr ""
2443
2444
#: bzrlib/builtins.py:3795
2445
msgid "Show what would be done, but don't actually do anything."
2446
msgstr ""
2447
2448
#: bzrlib/builtins.py:3810
2449
msgid "Show or set bzr user id."
2450
msgstr ""
2451
2452
#: bzrlib/builtins.py:3812
2453
msgid ""
2454
":Examples:\n"
2455
" Show the email of the current user::"
2456
msgstr ""
2457
2458
#: bzrlib/builtins.py:3815
2459
msgid " bzr whoami --email"
2460
msgstr ""
2461
2462
#: bzrlib/builtins.py:3817
2463
msgid " Set the current user::"
2464
msgstr ""
2465
2466
#: bzrlib/builtins.py:3819
2467
msgid " bzr whoami \"Frank Chu <fchu@example.com>\""
2468
msgstr ""
2469
2470
#: bzrlib/builtins.py:3823
2471
msgid "Display email address only."
2472
msgstr ""
2473
2474
#: bzrlib/builtins.py:3825
2475
msgid "Set identity for the current branch instead of globally."
2476
msgstr ""
2477
2478
#: bzrlib/builtins.py:3851
2479
msgid "--email can only be used to display existing identity"
2480
msgstr ""
2481
2482
#: bzrlib/builtins.py:3873
2483
msgid "Print or set the branch nickname."
2484
msgstr ""
2485
2486
#: bzrlib/builtins.py:3875
2487
msgid ""
2488
"If unset, the tree root directory name is used as the nickname.\n"
2489
"To print the current nickname, execute with no argument."
2490
msgstr ""
2491
2492
#: bzrlib/builtins.py:3878
2493
msgid ""
2494
"Bound branches use the nickname of its master branch unless it is set\n"
2495
"locally."
2496
msgstr ""
2497
2498
#: bzrlib/builtins.py:3898
2499
msgid "Set/unset and display aliases."
2500
msgstr ""
2501
2502
#: bzrlib/builtins.py:3900
2503
msgid ""
2504
":Examples:\n"
2505
" Show the current aliases::"
2506
msgstr ""
2507
2508
#: bzrlib/builtins.py:3903
2509
msgid " bzr alias"
2510
msgstr ""
2511
2512
#: bzrlib/builtins.py:3905
2513
msgid " Show the alias specified for 'll'::"
2514
msgstr ""
2515
2516
#: bzrlib/builtins.py:3907
2517
msgid " bzr alias ll"
2518
msgstr ""
2519
2520
#: bzrlib/builtins.py:3909
2521
msgid " Set an alias for 'll'::"
2522
msgstr ""
2523
2524
#: bzrlib/builtins.py:3911
2525
msgid " bzr alias ll=\"log --line -r-10..-1\""
2526
msgstr ""
2527
2528
#: bzrlib/builtins.py:3913
2529
msgid " To remove an alias for 'll'::"
2530
msgstr ""
2531
2532
#: bzrlib/builtins.py:3915
2533
msgid " bzr alias --remove ll"
2534
msgstr ""
2535
2536
#: bzrlib/builtins.py:3920
2537
msgid "Remove the alias."
2538
msgstr ""
2539
2540
#: bzrlib/builtins.py:3938
2541
msgid "bzr alias --remove expects an alias to remove."
2542
msgstr ""
2543
2544
#: bzrlib/builtins.py:4119
2545
msgid ""
2546
"subunit not available. subunit needs to be installed to use --subunit."
2547
msgstr ""
2548
2549
#: bzrlib/builtins.py:4136
2550
msgid ""
2551
"--benchmark is no longer supported from bzr 2.2; use bzr-usertest instead"
2552
msgstr ""
2553
2554
#: bzrlib/builtins.py:4183
2555
msgid "Show version of bzr."
2556
msgstr ""
2557
2558
#: bzrlib/builtins.py:4187
2559
msgid "Print just the version number."
2560
msgstr ""
2561
2562
#: bzrlib/builtins.py:4206
2563
msgid "It sure does!\n"
2564
msgstr ""
2565
2566
#: bzrlib/builtins.py:4230
2567
#, python-format
2568
msgid "merge base is revision %s\n"
2569
msgstr ""
2570
2571
#: bzrlib/builtins.py:4234
2572
msgid "Perform a three-way merge."
2573
msgstr ""
2574
2575
#: bzrlib/builtins.py:4236
2576
msgid ""
2577
"The source of the merge can be specified either in the form of a branch,\n"
2578
"or in the form of a path to a file containing a merge directive generated\n"
2579
"with bzr send. If neither is specified, the default is the upstream branch\n"
2580
"or the branch most recently merged using --remember. The source of the\n"
2581
"merge may also be specified in the form of a path to a file in another\n"
2582
"branch: in this case, only the modifications to that file are merged into\n"
2583
"the current working tree."
2584
msgstr ""
2585
2586
#: bzrlib/builtins.py:4244
2587
msgid ""
2588
"When merging from a branch, by default bzr will try to merge in all new\n"
2589
"work from the other branch, automatically determining an appropriate base\n"
2590
"revision. If this fails, you may need to give an explicit base."
2591
msgstr ""
2592
2593
#: bzrlib/builtins.py:4248
2594
msgid ""
2595
"To pick a different ending revision, pass \"--revision OTHER\". bzr will\n"
2596
"try to merge in all new work up to and including revision OTHER."
2597
msgstr ""
2598
2599
#: bzrlib/builtins.py:4251
2600
msgid ""
2601
"If you specify two values, \"--revision BASE..OTHER\", only revisions BASE\n"
2602
"through OTHER, excluding BASE but including OTHER, will be merged. If this\n"
2603
"causes some revisions to be skipped, i.e. if the destination branch does\n"
2604
"not already contain revision BASE, such a merge is commonly referred to as\n"
2605
"a \"cherrypick\". Unlike a normal merge, Bazaar does not currently track\n"
2606
"cherrypicks. The changes look like a normal commit, and the history of the\n"
2607
"changes from the other branch is not stored in the commit."
2608
msgstr ""
2609
2610
#: bzrlib/builtins.py:4259
2611
msgid "Revision numbers are always relative to the source branch."
2612
msgstr ""
2613
2614
#: bzrlib/builtins.py:4261 bzrlib/conflicts.py:52 bzrlib/conflicts.py:106
2615
msgid ""
2616
"Merge will do its best to combine the changes in two branches, but there\n"
2617
"are some kinds of problems only a human can fix. When it encounters those,\n"
2618
"it will mark a conflict. A conflict means that you need to fix something,\n"
2619
"before you can commit."
2620
msgstr ""
2621
2622
#: bzrlib/builtins.py:4266
2623
msgid ""
2624
"Use bzr resolve when you have fixed a problem. See also bzr conflicts."
2625
msgstr ""
2626
2627
#: bzrlib/builtins.py:4268
2628
msgid ""
2629
"If there is no default branch set, the first merge will set it (use\n"
2630
"--no-remember to avoid setting it). After that, you can omit the branch\n"
2631
"to use the default. To change the default, use --remember. The value will\n"
2632
"only be saved if the remote location can be accessed."
2633
msgstr ""
2634
2635
#: bzrlib/builtins.py:4273
2636
msgid ""
2637
"The results of the merge are placed into the destination working\n"
2638
"directory, where they can be reviewed (with bzr diff), tested, and then\n"
2639
"committed to record the result of the merge."
2640
msgstr ""
2641
2642
#: bzrlib/builtins.py:4277
2643
msgid ""
2644
"merge refuses to run if there are any uncommitted changes, unless\n"
2645
"--force is given. If --force is given, then the changes from the source \n"
2646
"will be merged with the current working tree, including any uncommitted\n"
2647
"changes in the tree. The --force option can also be used to create a\n"
2648
"merge revision which has more than two parents."
2649
msgstr ""
2650
2651
#: bzrlib/builtins.py:4283
2652
msgid ""
2653
"If one would like to merge changes from the working tree of the other\n"
2654
"branch without merging any committed revisions, the --uncommitted option\n"
2655
"can be given."
2656
msgstr ""
2657
2658
#: bzrlib/builtins.py:4287
2659
msgid ""
2660
"To select only some changes to merge, use \"merge -i\", which will prompt\n"
2661
"you to apply each diff hunk and file change, similar to \"shelve\"."
2662
msgstr ""
2663
2664
#: bzrlib/builtins.py:4290
2665
msgid ""
2666
":Examples:\n"
2667
" To merge all new revisions from bzr.dev::"
2668
msgstr ""
2669
2670
#: bzrlib/builtins.py:4293
2671
msgid " bzr merge ../bzr.dev"
2672
msgstr ""
2673
2674
#: bzrlib/builtins.py:4295
2675
msgid " To merge changes up to and including revision 82 from bzr.dev::"
2676
msgstr ""
2677
2678
#: bzrlib/builtins.py:4297
2679
msgid " bzr merge -r 82 ../bzr.dev"
2680
msgstr ""
2681
2682
#: bzrlib/builtins.py:4299
2683
msgid " To merge the changes introduced by 82, without previous changes::"
2684
msgstr ""
2685
2686
#: bzrlib/builtins.py:4301
2687
msgid " bzr merge -r 81..82 ../bzr.dev"
2688
msgstr ""
2689
2690
#: bzrlib/builtins.py:4303
2691
msgid " To apply a merge directive contained in /tmp/merge::"
2692
msgstr ""
2693
2694
#: bzrlib/builtins.py:4305
2695
msgid " bzr merge /tmp/merge"
2696
msgstr ""
2697
2698
#: bzrlib/builtins.py:4307
2699
msgid ""
2700
" To create a merge revision with three parents from two branches\n"
2701
" feature1a and feature1b:"
2702
msgstr ""
2703
2704
#: bzrlib/builtins.py:4310
2705
msgid ""
2706
" bzr merge ../feature1a\n"
2707
" bzr merge ../feature1b --force\n"
2708
" bzr commit -m 'revision with three parents'"
2709
msgstr ""
2710
2711
#: bzrlib/builtins.py:4322
2712
msgid "Merge even if the destination tree has uncommitted changes."
2713
msgstr ""
2714
2715
#: bzrlib/builtins.py:4328
2716
msgid ""
2717
"Apply uncommitted changes from a working copy, instead of branch changes."
2718
msgstr ""
2719
2720
#: bzrlib/builtins.py:4330
2721
msgid ""
2722
"If the destination is already completely merged into the source, pull from "
2723
"the source rather than merging. When this happens, you do not need to "
2724
"commit the result."
2725
msgstr ""
2726
2727
#: bzrlib/builtins.py:4335
2728
msgid ""
2729
"Branch to merge into, rather than the one containing the working directory."
2730
msgstr ""
2731
2732
#: bzrlib/builtins.py:4337
2733
msgid "Instead of merging, show a diff of the merge."
2734
msgstr ""
2735
2736
#: bzrlib/builtins.py:4339
2737
msgid "Select changes interactively."
2738
msgstr ""
2739
2740
#: bzrlib/builtins.py:4361
2741
msgid ""
2742
"Merging into empty branches not currently supported, "
2743
"https://bugs.launchpad.net/bzr/+bug/308562"
2744
msgstr ""
2745
2746
#: bzrlib/builtins.py:4388
2747
msgid "Cannot use --uncommitted with bundles or merge directives."
2748
msgstr ""
2749
2750
#: bzrlib/builtins.py:4399
2751
msgid "Cannot use --uncommitted and --revision at the same time."
2752
msgstr ""
2753
2754
#: bzrlib/builtins.py:4419
2755
msgid "merger: "
2756
msgstr ""
2757
2758
#: bzrlib/builtins.py:4421 bzrlib/bundle/apply_bundle.py:71
2759
msgid "Nothing to do."
2760
msgstr ""
2761
2762
#: bzrlib/builtins.py:4425
2763
msgid "Cannot pull individual files"
2764
msgstr ""
2765
2766
#: bzrlib/builtins.py:4433
2767
msgid "This branch has no commits. (perhaps you would prefer 'bzr pull')"
2768
msgstr ""
2769
2770
#: bzrlib/builtins.py:4491
2771
#, python-format
2772
msgid "Show-base is not supported for this merge type. %s"
2773
msgstr ""
2774
2775
#: bzrlib/builtins.py:4500
2776
#, python-format
2777
msgid "Conflict reduction is not supported for merge type %s."
2778
msgstr ""
2779
2780
#: bzrlib/builtins.py:4504
2781
msgid "Cannot do conflict reduction and show base."
2782
msgstr ""
2783
2784
#: bzrlib/builtins.py:4615
2785
msgid "No location specified or remembered"
2786
msgstr ""
2787
2788
#: bzrlib/builtins.py:4617
2789
msgid "{0} remembered {1} location {2}"
2790
msgstr ""
2791
2792
#: bzrlib/builtins.py:4623
2793
msgid "Redo a merge."
2794
msgstr ""
2795
2796
#: bzrlib/builtins.py:4625
2797
msgid ""
2798
"Use this if you want to try a different merge technique while resolving\n"
2799
"conflicts. Some merge techniques are better than others, and remerge\n"
2800
"lets you try different ones on different files."
2801
msgstr ""
2802
2803
#: bzrlib/builtins.py:4629
2804
msgid ""
2805
"The options for remerge have the same meaning and defaults as the ones for\n"
2806
"merge. The difference is that remerge can (only) be run when there is a\n"
2807
"pending merge, and it lets you specify particular files."
2808
msgstr ""
2809
2810
#: bzrlib/builtins.py:4633
2811
msgid ""
2812
":Examples:\n"
2813
" Re-do the merge of all conflicted files, and show the base text in\n"
2814
" conflict regions, in addition to the usual THIS and OTHER texts::"
2815
msgstr ""
2816
2817
#: bzrlib/builtins.py:4637
2818
msgid " bzr remerge --show-base"
2819
msgstr ""
2820
2821
#: bzrlib/builtins.py:4639
2822
msgid ""
2823
" Re-do the merge of \"foobar\", using the weave merge algorithm, with\n"
2824
" additional processing to reduce the size of conflict regions::"
2825
msgstr ""
2826
2827
#: bzrlib/builtins.py:4642
2828
msgid " bzr remerge --merge-type weave --reprocess foobar"
2829
msgstr ""
2830
2831
#: bzrlib/builtins.py:4649
2832
msgid "Show base revision text in conflicts."
2833
msgstr ""
2834
2835
#: bzrlib/builtins.py:4661
2836
msgid ""
2837
"Sorry, remerge only works after normal merges. Not cherrypicking or multi-"
2838
"merges."
2839
msgstr ""
2840
2841
#: bzrlib/builtins.py:4717
2842
msgid "Revert files to a previous revision."
2843
msgstr ""
2844
2845
#: bzrlib/builtins.py:4719
2846
msgid ""
2847
"Giving a list of files will revert only those files. Otherwise, all files\n"
2848
"will be reverted. If the revision is not specified with '--revision', the\n"
2849
"last committed revision is used."
2850
msgstr ""
2851
2852
#: bzrlib/builtins.py:4723
2853
msgid ""
2854
"To remove only some changes, without reverting to a prior version, use\n"
2855
"merge instead. For example, \"merge . -r -2..-3\" (don't forget the \".\")\n"
2856
"will remove the changes introduced by the second last commit (-2), without\n"
2857
"affecting the changes introduced by the last commit (-1). To remove\n"
2858
"certain changes on a hunk-by-hunk basis, see the shelve command."
2859
msgstr ""
2860
2861
#: bzrlib/builtins.py:4729
2862
msgid ""
2863
"By default, any files that have been manually changed will be backed up\n"
2864
"first. (Files changed only by merge are not backed up.) Backup files have\n"
2865
"'.~#~' appended to their name, where # is a number."
2866
msgstr ""
2867
2868
#: bzrlib/builtins.py:4733
2869
msgid ""
2870
"When you provide files, you can use their current pathname or the pathname\n"
2871
"from the target revision. So you can use revert to \"undelete\" a file by\n"
2872
"name. If you name a directory, all the contents of that directory will be\n"
2873
"reverted."
2874
msgstr ""
2875
2876
#: bzrlib/builtins.py:4738
2877
msgid ""
2878
"If you have newly added files since the target revision, they will be\n"
2879
"removed. If the files to be removed have been changed, backups will be\n"
2880
"created as above. Directories containing unknown files will not be\n"
2881
"deleted."
2882
msgstr ""
2883
2884
#: bzrlib/builtins.py:4743
2885
msgid ""
2886
"The working tree contains a list of revisions that have been merged but\n"
2887
"not yet committed. These revisions will be included as additional parents\n"
2888
"of the next commit. Normally, using revert clears that list as well as\n"
2889
"reverting the files. If any files are specified, revert leaves the list\n"
2890
"of uncommitted merges alone and reverts only the files. Use ``bzr revert\n"
2891
".`` in the tree root to revert all files but keep the recorded merges,\n"
2892
"and ``bzr revert --forget-merges`` to clear the pending merge list without\n"
2893
"reverting any files."
2894
msgstr ""
2895
2896
#: bzrlib/builtins.py:4752
2897
msgid ""
2898
"Using \"bzr revert --forget-merges\", it is possible to apply all of the\n"
2899
"changes from a branch in a single revision. To do this, perform the merge\n"
2900
"as desired. Then doing revert with the \"--forget-merges\" option will "
2901
"keep\n"
2902
"the content of the tree as it was, but it will clear the list of pending\n"
2903
"merges. The next commit will then contain all of the changes that are\n"
2904
"present in the other branch, but without any other parent revisions.\n"
2905
"Because this technique forgets where these changes originated, it may\n"
2906
"cause additional conflicts on later merges involving the same source and\n"
2907
"target branches."
2908
msgstr ""
2909
2910
#: bzrlib/builtins.py:4766
2911
msgid "Do not save backups of reverted files."
2912
msgstr ""
2913
2914
#: bzrlib/builtins.py:4768
2915
msgid "Remove pending merge marker, without changing any files."
2916
msgstr ""
2917
2918
#: bzrlib/builtins.py:4799
2919
msgid ""
2920
"Show help on a command or other topic.\n"
2921
" "
2922
msgstr ""
2923
2924
#: bzrlib/builtins.py:4804
2925
msgid "Show help on all commands."
2926
msgstr ""
2927
2928
#: bzrlib/builtins.py:4833
2929
msgid "Show unmerged/unpulled revisions between two branches."
2930
msgstr ""
2931
2932
#: bzrlib/builtins.py:4835
2933
msgid "OTHER_BRANCH may be local or remote."
2934
msgstr ""
2935
2936
#: bzrlib/builtins.py:4837
2937
msgid ""
2938
"To filter on a range of revisions, you can use the command -r begin..end\n"
2939
"-r revision requests a specific revision, -r ..end or -r begin.. are\n"
2940
"also valid.\n"
2941
" \n"
2942
":Exit values:\n"
2943
" 1 - some missing revisions\n"
2944
" 0 - no missing revisions"
2945
msgstr ""
2946
2947
#: bzrlib/builtins.py:4847
2948
msgid ""
2949
" Determine the missing revisions between this and the branch at the\n"
2950
" remembered pull location::"
2951
msgstr ""
2952
2953
#: bzrlib/builtins.py:4850
2954
msgid " bzr missing"
2955
msgstr ""
2956
2957
#: bzrlib/builtins.py:4852
2958
msgid " Determine the missing revisions between this and another branch::"
2959
msgstr ""
2960
2961
#: bzrlib/builtins.py:4854
2962
msgid " bzr missing http://server/branch"
2963
msgstr ""
2964
2965
#: bzrlib/builtins.py:4856
2966
msgid ""
2967
" Determine the missing revisions up to a specific revision on the other\n"
2968
" branch::"
2969
msgstr ""
2970
2971
#: bzrlib/builtins.py:4859
2972
msgid " bzr missing -r ..-10"
2973
msgstr ""
2974
2975
#: bzrlib/builtins.py:4861
2976
msgid ""
2977
" Determine the missing revisions up to a specific revision on this\n"
2978
" branch::"
2979
msgstr ""
2980
2981
#: bzrlib/builtins.py:4864
2982
msgid " bzr missing --my-revision ..-10"
2983
msgstr ""
2984
2985
#: bzrlib/builtins.py:4871
2986
msgid "Reverse the order of revisions."
2987
msgstr ""
2988
2989
#: bzrlib/builtins.py:4873
2990
msgid "Display changes in the local branch only."
2991
msgstr ""
2992
2993
#: bzrlib/builtins.py:4874
2994
msgid "Same as --mine-only."
2995
msgstr ""
2996
2997
#: bzrlib/builtins.py:4876
2998
msgid "Display changes in the remote branch only."
2999
msgstr ""
3000
3001
#: bzrlib/builtins.py:4877
3002
msgid "Same as --theirs-only."
3003
msgstr ""
3004
3005
#: bzrlib/builtins.py:4882
3006
msgid ""
3007
"Filter on other branch revisions (inclusive). See \"help revisionspec\" for "
3008
"details."
3009
msgstr ""
3010
3011
#: bzrlib/builtins.py:4886
3012
msgid ""
3013
"Filter on local branch revisions (inclusive). See \"help revisionspec\" for "
3014
"details."
3015
msgstr ""
3016
3017
#: bzrlib/builtins.py:4889
3018
msgid "Show all revisions in addition to the mainline ones."
3019
msgstr ""
3020
3021
#: bzrlib/builtins.py:4943
3022
msgid "No peer location known or specified."
3023
msgstr ""
3024
3025
#: bzrlib/builtins.py:4947
3026
msgid "Using saved parent location: {0}\n"
3027
msgstr ""
3028
3029
#: bzrlib/builtins.py:4980
3030
#, python-format
3031
msgid "You have %d extra revision:\n"
3032
msgid_plural "You have %d extra revisions:\n"
3033
msgstr[0] ""
3034
msgstr[1] ""
3035
3036
#: bzrlib/builtins.py:4996
3037
#, python-format
3038
msgid "You are missing %d revision:\n"
3039
msgid_plural "You are missing %d revisions:\n"
3040
msgstr[0] ""
3041
msgstr[1] ""
3042
3043
#: bzrlib/builtins.py:5008
3044
msgid "This branch has no new revisions.\n"
3045
msgstr ""
3046
3047
#: bzrlib/builtins.py:5011
3048
msgid "Other branch has no new revisions.\n"
3049
msgstr ""
3050
3051
#: bzrlib/builtins.py:5016
3052
msgid "Branches are up to date.\n"
3053
msgstr ""
3054
3055
#: bzrlib/builtins.py:5027
3056
msgid "Compress the data within a repository."
3057
msgstr ""
3058
3059
#: bzrlib/builtins.py:5029
3060
msgid ""
3061
"This operation compresses the data within a bazaar repository. As\n"
3062
"bazaar supports automatic packing of repository, this operation is\n"
3063
"normally not required to be done manually."
3064
msgstr ""
3065
3066
#: bzrlib/builtins.py:5033
3067
msgid ""
3068
"During the pack operation, bazaar takes a backup of existing repository\n"
3069
"data, i.e. pack files. This backup is eventually removed by bazaar\n"
3070
"automatically when it is safe to do so. To save disk space by removing\n"
3071
"the backed up pack files, the --clean-obsolete-packs option may be\n"
3072
"used."
3073
msgstr ""
3074
3075
#: bzrlib/builtins.py:5039
3076
msgid ""
3077
"Warning: If you use --clean-obsolete-packs and your machine crashes\n"
3078
"during or immediately after repacking, you may be left with a state\n"
3079
"where the deletion has been written to disk but the new packs have not\n"
3080
"been. In this case the repository may be unusable."
3081
msgstr ""
3082
3083
#: bzrlib/builtins.py:5048
3084
msgid "Delete obsolete packs to save disk space."
3085
msgstr ""
3086
3087
#: bzrlib/builtins.py:5062
3088
msgid "List the installed plugins."
3089
msgstr ""
3090
3091
#: bzrlib/builtins.py:5064
3092
msgid ""
3093
"This command displays the list of installed plugins including\n"
3094
"version of plugin and a short description of each."
3095
msgstr ""
3096
3097
#: bzrlib/builtins.py:5067
3098
msgid "--verbose shows the path where each plugin is located."
3099
msgstr ""
3100
3101
#: bzrlib/builtins.py:5069
3102
msgid ""
3103
"A plugin is an external component for Bazaar that extends the\n"
3104
"revision control system, by adding or replacing code in Bazaar.\n"
3105
"Plugins can do a variety of things, including overriding commands,\n"
3106
"adding new commands, providing additional network transports and\n"
3107
"customizing log output."
3108
msgstr ""
3109
3110
#: bzrlib/builtins.py:5075
3111
msgid ""
3112
"See the Bazaar Plugin Guide <http://doc.bazaar.canonical.com/plugins/en/>\n"
3113
"for further information on plugins including where to find them and how to\n"
3114
"install them. Instructions are also provided there on how to write new\n"
3115
"plugins using the Python programming language."
3116
msgstr ""
3117
3118
#: bzrlib/builtins.py:5091
3119
msgid "Show testament (signing-form) of a revision."
3120
msgstr ""
3121
3122
#: bzrlib/builtins.py:5094
3123
msgid "Produce long-format testament."
3124
msgstr ""
3125
3126
#: bzrlib/builtins.py:5096
3127
msgid "Produce a strict-format testament."
3128
msgstr ""
3129
3130
#: bzrlib/builtins.py:5122
3131
msgid "Show the origin of each line in a file."
3132
msgstr ""
3133
3134
#: bzrlib/builtins.py:5124
3135
msgid ""
3136
"This prints out the given file with an annotation on the left side\n"
3137
"indicating which revision, author and date introduced the change."
3138
msgstr ""
3139
3140
#: bzrlib/builtins.py:5127
3141
msgid ""
3142
"If the origin is the same for a run of consecutive lines, it is\n"
3143
"shown only at the top, unless the --all option is given."
3144
msgstr ""
3145
3146
#: bzrlib/builtins.py:5135
3147
msgid "Show annotations on all lines."
3148
msgstr ""
3149
3150
#: bzrlib/builtins.py:5136
3151
msgid "Show commit date in annotations."
3152
msgstr ""
3153
3154
#: bzrlib/builtins.py:5223
3155
msgid "Cannot sign a range of non-revision-history revisions"
3156
msgstr ""
3157
3158
#: bzrlib/builtins.py:5235
3159
msgid "Please supply either one revision, or a range."
3160
msgstr ""
3161
3162
#: bzrlib/builtins.py:5239
3163
msgid ""
3164
"Convert the current branch into a checkout of the supplied branch.\n"
3165
"If no branch is supplied, rebind to the last bound location."
3166
msgstr ""
3167
3168
#: bzrlib/builtins.py:5242
3169
msgid ""
3170
"Once converted into a checkout, commits must succeed on the master branch\n"
3171
"before they will be applied to the local branch."
3172
msgstr ""
3173
3174
#: bzrlib/builtins.py:5245
3175
msgid ""
3176
"Bound branches use the nickname of its master branch unless it is set\n"
3177
"locally, in which case binding will update the local nickname to be\n"
3178
"that of the master."
3179
msgstr ""
3180
3181
#: bzrlib/builtins.py:5260
3182
msgid "No location supplied. This format does not remember old locations."
3183
msgstr ""
3184
3185
#: bzrlib/builtins.py:5265
3186
msgid "Branch is already bound"
3187
msgstr ""
3188
3189
#: bzrlib/builtins.py:5267
3190
msgid "No location supplied and no previous location known"
3191
msgstr ""
3192
3193
#: bzrlib/builtins.py:5273
3194
msgid "These branches have diverged. Try merging, and then bind again."
3195
msgstr ""
3196
3197
#: bzrlib/builtins.py:5280
3198
msgid "Convert the current checkout into a regular branch."
3199
msgstr ""
3200
3201
#: bzrlib/builtins.py:5282
3202
msgid ""
3203
"After unbinding, the local branch is considered independent and subsequent\n"
3204
"commits will be local only."
3205
msgstr ""
3206
3207
#: bzrlib/builtins.py:5293
3208
msgid "Local branch is not bound"
3209
msgstr ""
3210
3211
#: bzrlib/builtins.py:5297
3212
msgid "Remove the last committed revision."
3213
msgstr ""
3214
3215
#: bzrlib/builtins.py:5299
3216
msgid ""
3217
"--verbose will print out what is being removed.\n"
3218
"--dry-run will go through all the motions, but not actually\n"
3219
"remove anything."
3220
msgstr ""
3221
3222
#: bzrlib/builtins.py:5303
3223
msgid ""
3224
"If --revision is specified, uncommit revisions to leave the branch at the\n"
3225
"specified revision. For example, \"bzr uncommit -r 15\" will leave the\n"
3226
"branch at revision 15."
3227
msgstr ""
3228
3229
#: bzrlib/builtins.py:5307
3230
msgid ""
3231
"Uncommit leaves the working tree ready for a new commit. The only change\n"
3232
"it may make is to restore any pending merges that were present before\n"
3233
"the commit."
3234
msgstr ""
3235
3236
#: bzrlib/builtins.py:5318
3237
msgid "Don't actually make changes."
3238
msgstr ""
3239
3240
#: bzrlib/builtins.py:5319
3241
msgid "Say yes to all questions."
3242
msgstr ""
3243
3244
#: bzrlib/builtins.py:5321
3245
msgid "Keep tags that point to removed revisions."
3246
msgstr ""
3247
3248
#: bzrlib/builtins.py:5323
3249
msgid "Only remove the commits from the local branch when in a checkout."
3250
msgstr ""
3251
3252
#: bzrlib/builtins.py:5372
3253
msgid "No revisions to uncommit.\n"
3254
msgstr ""
3255
3256
#: bzrlib/builtins.py:5387
3257
msgid "Dry-run, pretending to remove the above revisions.\n"
3258
msgstr ""
3259
3260
#: bzrlib/builtins.py:5390
3261
msgid "The above revision(s) will be removed.\n"
3262
msgstr ""
3263
3264
#: bzrlib/builtins.py:5394
3265
msgid "Uncommit these revisions"
3266
msgstr ""
3267
3268
#: bzrlib/builtins.py:5397
3269
msgid "Canceled\n"
3270
msgstr ""
3271
3272
#: bzrlib/builtins.py:5404
3273
#, python-format
3274
msgid ""
3275
"You can restore the old tip by running:\n"
3276
" bzr pull . -r revid:%s\n"
3277
msgstr ""
3278
3279
#: bzrlib/builtins.py:5409
3280
msgid "Break a dead lock."
3281
msgstr ""
3282
3283
#: bzrlib/builtins.py:5411
3284
msgid ""
3285
"This command breaks a lock on a repository, branch, working directory or\n"
3286
"config file."
3287
msgstr ""
3288
3289
#: bzrlib/builtins.py:5414
3290
msgid ""
3291
"CAUTION: Locks should only be broken when you are sure that the process\n"
3292
"holding the lock has been stopped."
3293
msgstr ""
3294
3295
#: bzrlib/builtins.py:5417
3296
msgid ""
3297
"You can get information on what locks are open via the 'bzr info\n"
3298
"[location]' command."
3299
msgstr ""
3300
3301
#: bzrlib/builtins.py:5420
3302
msgid ""
3303
":Examples:\n"
3304
" bzr break-lock\n"
3305
" bzr break-lock bzr+ssh://example.com/bzr/foo\n"
3306
" bzr break-lock --conf ~/.bazaar"
3307
msgstr ""
3308
3309
#: bzrlib/builtins.py:5429
3310
msgid "LOCATION is the directory where the config lock is."
3311
msgstr ""
3312
3313
#: bzrlib/builtins.py:5431
3314
msgid "Do not ask for confirmation before breaking the lock."
3315
msgstr ""
3316
3317
#: bzrlib/builtins.py:5466
3318
msgid "The Bazaar smart server protocol over TCP. (default port: 4155)"
3319
msgstr ""
3320
3321
#: bzrlib/builtins.py:5467
3322
msgid "Run the bzr server."
3323
msgstr ""
3324
3325
#: bzrlib/builtins.py:5473
3326
msgid "Serve on stdin/out for use from inetd or sshd."
3327
msgstr ""
3328
3329
#: bzrlib/builtins.py:5474
3330
msgid "protocol"
3331
msgstr ""
3332
3333
#: bzrlib/builtins.py:5475
3334
msgid "Protocol to serve."
3335
msgstr ""
3336
3337
#: bzrlib/builtins.py:5479
3338
msgid ""
3339
"Listen for connections on nominated port of the form [hostname:]portnumber. "
3340
"Passing 0 as the port number will result in a dynamically allocated port. "
3341
"The default port depends on the protocol."
3342
msgstr ""
3343
3344
#: bzrlib/builtins.py:5485
3345
msgid "Serve contents of this directory."
3346
msgstr ""
3347
3348
#: bzrlib/builtins.py:5487
3349
msgid ""
3350
"By default the server is a readonly server. Supplying --allow-writes "
3351
"enables write access to the contents of the served directory and below. "
3352
"Note that ``bzr serve`` does not perform authentication, so unless some form "
3353
"of external authentication is arranged supplying this option leads to global "
3354
"uncontrolled write access to your file system."
3355
msgstr ""
3356
3357
#: bzrlib/builtins.py:5496
3358
msgid "Override the default idle client timeout (5min)."
3359
msgstr ""
3360
3361
#: bzrlib/builtins.py:5546
3362
msgid "Combine a tree into its containing tree."
3363
msgstr ""
3364
3365
#: bzrlib/builtins.py:5548
3366
msgid "This command requires the target tree to be in a rich-root format."
3367
msgstr ""
3368
3369
#: bzrlib/builtins.py:5550
3370
msgid ""
3371
"The TREE argument should be an independent tree, inside another tree, but\n"
3372
"not part of it. (Such trees can be produced by \"bzr split\", but also by\n"
3373
"running \"bzr branch\" with the target inside a tree.)"
3374
msgstr ""
3375
3376
#: bzrlib/builtins.py:5554
3377
msgid ""
3378
"The result is a combined tree, with the subtree no longer an independent\n"
3379
"part. This is marked as a merge of the subtree into the containing tree,\n"
3380
"and all history is preserved."
3381
msgstr ""
3382
3383
#: bzrlib/builtins.py:5572
3384
#, python-format
3385
msgid ""
3386
"Can't join trees because %s doesn't support rich root data.\n"
3387
"You can use bzr upgrade on the repository."
3388
msgstr ""
3389
3390
#: bzrlib/builtins.py:5582 bzrlib/builtins.py:5588
3391
msgid "Cannot join {0}. {1}"
3392
msgstr ""
3393
3394
#: bzrlib/builtins.py:5592
3395
msgid "Split a subdirectory of a tree into a separate tree."
3396
msgstr ""
3397
3398
#: bzrlib/builtins.py:5594
3399
msgid ""
3400
"This command will produce a target tree in a format that supports\n"
3401
"rich roots, like 'rich-root' or 'rich-root-pack'. These formats cannot be\n"
3402
"converted into earlier formats like 'dirstate-tags'."
3403
msgstr ""
3404
3405
#: bzrlib/builtins.py:5598
3406
msgid ""
3407
"The TREE argument should be a subdirectory of a working tree. That\n"
3408
"subdirectory will be converted into an independent tree, with its own\n"
3409
"branch. Commits in the top-level tree will not apply to the new subtree."
3410
msgstr ""
3411
3412
#: bzrlib/builtins.py:5678
3413
msgid "No submit branch specified or known"
3414
msgstr ""
3415
3416
#: bzrlib/builtins.py:5686 bzrlib/send.py:108
3417
msgid "No public branch specified or known"
3418
msgstr ""
3419
3420
#: bzrlib/builtins.py:5691
3421
msgid "bzr merge-directive takes at most two one revision identifiers"
3422
msgstr ""
3423
3424
#: bzrlib/builtins.py:5700
3425
msgid "No revisions to bundle."
3426
msgstr ""
3427
3428
#: bzrlib/builtins.py:5719
3429
msgid "Mail or create a merge-directive for submitting changes."
3430
msgstr ""
3431
3432
#: bzrlib/builtins.py:5721
3433
msgid "A merge directive provides many things needed for requesting merges:"
3434
msgstr ""
3435
3436
#: bzrlib/builtins.py:5723
3437
msgid "* A machine-readable description of the merge to perform"
3438
msgstr ""
3439
3440
#: bzrlib/builtins.py:5725
3441
msgid "* An optional patch that is a preview of the changes requested"
3442
msgstr ""
3443
3444
#: bzrlib/builtins.py:5727
3445
msgid ""
3446
"* An optional bundle of revision data, so that the changes can be applied\n"
3447
" directly from the merge directive, without retrieving data from a\n"
3448
" branch."
3449
msgstr ""
3450
3451
#: bzrlib/builtins.py:5731
3452
msgid ""
3453
"`bzr send` creates a compact data set that, when applied using bzr\n"
3454
"merge, has the same effect as merging from the source branch. "
3455
msgstr ""
3456
3457
#: bzrlib/builtins.py:5734
3458
msgid ""
3459
"By default the merge directive is self-contained and can be applied to any\n"
3460
"branch containing submit_branch in its ancestory without needing access to\n"
3461
"the source branch."
3462
msgstr ""
3463
3464
#: bzrlib/builtins.py:5738
3465
msgid ""
3466
"If --no-bundle is specified, then Bazaar doesn't send the contents of the\n"
3467
"revisions, but only a structured request to merge from the\n"
3468
"public_location. In that case the public_branch is needed and it must be\n"
3469
"up-to-date and accessible to the recipient. The public_branch is always\n"
3470
"included if known, so that people can check it later."
3471
msgstr ""
3472
3473
#: bzrlib/builtins.py:5744
3474
msgid ""
3475
"The submit branch defaults to the parent of the source branch, but can be\n"
3476
"overridden. Both submit branch and public branch will be remembered in\n"
3477
"branch.conf the first time they are used for a particular branch. The\n"
3478
"source branch defaults to that containing the working directory, but can\n"
3479
"be changed using --from."
3480
msgstr ""
3481
3482
#: bzrlib/builtins.py:5750
3483
msgid ""
3484
"Both the submit branch and the public branch follow the usual behavior with\n"
3485
"respect to --remember: If there is no default location set, the first send\n"
3486
"will set it (use --no-remember to avoid setting it). After that, you can\n"
3487
"omit the location to use the default. To change the default, use\n"
3488
"--remember. The value will only be saved if the location can be accessed."
3489
msgstr ""
3490
3491
#: bzrlib/builtins.py:5756
3492
msgid ""
3493
"In order to calculate those changes, bzr must analyse the submit branch.\n"
3494
"Therefore it is most efficient for the submit branch to be a local mirror.\n"
3495
"If a public location is known for the submit_branch, that location is used\n"
3496
"in the merge directive."
3497
msgstr ""
3498
3499
#: bzrlib/builtins.py:5761
3500
msgid ""
3501
"The default behaviour is to send the merge directive by mail, unless -o is\n"
3502
"given, in which case it is sent to a file."
3503
msgstr ""
3504
3505
#: bzrlib/builtins.py:5764
3506
msgid ""
3507
"Mail is sent using your preferred mail program. This should be transparent\n"
3508
"on Windows (it uses MAPI). On Unix, it requires the xdg-email utility.\n"
3509
"If the preferred client can't be found (or used), your editor will be used."
3510
msgstr ""
3511
3512
#: bzrlib/builtins.py:5768
3513
msgid ""
3514
"To use a specific mail program, set the mail_client configuration option.\n"
3515
"(For Thunderbird 1.5, this works around some bugs.) Supported values for\n"
3516
"specific clients are \"claws\", \"evolution\", \"kmail\", \"mail.app\" "
3517
"(MacOS X's\n"
3518
"Mail.app), \"mutt\", and \"thunderbird\"; generic options are \"default\",\n"
3519
"\"editor\", \"emacsclient\", \"mapi\", and \"xdg-email\". Plugins may also "
3520
"add\n"
3521
"supported clients."
3522
msgstr ""
3523
3524
#: bzrlib/builtins.py:5775
3525
msgid ""
3526
"If mail is being sent, a to address is required. This can be supplied\n"
3527
"either on the commandline, by setting the submit_to configuration\n"
3528
"option in the branch itself or the child_submit_to configuration option\n"
3529
"in the submit branch."
3530
msgstr ""
3531
3532
#: bzrlib/builtins.py:5780
3533
msgid ""
3534
"Two formats are currently supported: \"4\" uses revision bundle format 4 "
3535
"and\n"
3536
"merge directive format 2. It is significantly faster and smaller than\n"
3537
"older formats. It is compatible with Bazaar 0.19 and later. It is the\n"
3538
"default. \"0.9\" uses revision bundle format 0.9 and merge directive\n"
3539
"format 1. It is compatible with Bazaar 0.12 - 0.18."
3540
msgstr ""
3541
3542
#: bzrlib/builtins.py:5786
3543
msgid ""
3544
"The merge directives created by bzr send may be applied using bzr merge or\n"
3545
"bzr pull by specifying a file containing a merge directive as the location."
3546
msgstr ""
3547
3548
#: bzrlib/builtins.py:5789
3549
msgid ""
3550
"bzr send makes extensive use of public locations to map local locations "
3551
"into\n"
3552
"URLs that can be used by other people. See `bzr help configuration` to\n"
3553
"set them, and use `bzr info` to display them."
3554
msgstr ""
3555
3556
#: bzrlib/builtins.py:5813
3557
msgid "Write merge directive to this file or directory; use - for stdout."
3558
msgstr ""
3559
3560
#: bzrlib/builtins.py:5817
3561
msgid ""
3562
"Refuse to send if there are uncommitted changes in the working tree, --no-"
3563
"strict disables the check."
3564
msgstr ""
3565
3566
#: bzrlib/builtins.py:5819
3567
msgid "Mail the request to this address."
3568
msgstr ""
3569
3570
#: bzrlib/builtins.py:5823
3571
msgid "Body for the email."
3572
msgstr ""
3573
3574
#: bzrlib/builtins.py:5876
3575
msgid "Do not include a bundle in the merge directive."
3576
msgstr ""
3577
3578
#: bzrlib/builtins.py:5877
3579
msgid "Do not include a preview patch in the merge directive."
3580
msgstr ""
3581
3582
#: bzrlib/builtins.py:5880
3583
msgid "Remember submit and public branch."
3584
msgstr ""
3585
3586
#: bzrlib/builtins.py:5882
3587
msgid ""
3588
"Branch to generate the submission from, rather than the one containing the "
3589
"working directory."
3590
msgstr ""
3591
3592
#: bzrlib/builtins.py:5892 bzrlib/cmd_version_info.py:76
3593
msgid "format"
3594
msgstr ""
3595
3596
#: bzrlib/builtins.py:5893
3597
msgid "Use the specified output format."
3598
msgstr ""
3599
3600
#: bzrlib/builtins.py:5915
3601
msgid "Create, remove or modify a tag naming a revision."
3602
msgstr ""
3603
3604
#: bzrlib/builtins.py:5917
3605
msgid ""
3606
"Tags give human-meaningful names to revisions. Commands that take a -r\n"
3607
"(--revision) option can be given -rtag:X, where X is any previously\n"
3608
"created tag."
3609
msgstr ""
3610
3611
#: bzrlib/builtins.py:5921
3612
msgid ""
3613
"Tags are stored in the branch. Tags are copied from one branch to another\n"
3614
"along when you branch, push, pull or merge."
3615
msgstr ""
3616
3617
#: bzrlib/builtins.py:5924
3618
msgid ""
3619
"It is an error to give a tag name that already exists unless you pass\n"
3620
"--force, in which case the tag is moved to point to the new revision."
3621
msgstr ""
3622
3623
#: bzrlib/builtins.py:5927
3624
msgid ""
3625
"To rename a tag (change the name but keep it on the same revsion), run "
3626
"``bzr\n"
3627
"tag new-name -r tag:old-name`` and then ``bzr tag --delete oldname``."
3628
msgstr ""
3629
3630
#: bzrlib/builtins.py:5930
3631
msgid ""
3632
"If no tag name is specified it will be determined through the \n"
3633
"'automatic_tag_name' hook. This can e.g. be used to automatically tag\n"
3634
"upstream releases by reading configure.ac. See ``bzr help hooks`` for\n"
3635
"details."
3636
msgstr ""
3637
3638
#: bzrlib/builtins.py:5940
3639
msgid "Delete this tag rather than placing it."
3640
msgstr ""
3641
3642
#: bzrlib/builtins.py:5943
3643
msgid "Branch in which to place the tag."
3644
msgstr ""
3645
3646
#: bzrlib/builtins.py:5945
3647
msgid "Replace existing tags."
3648
msgstr ""
3649
3650
#: bzrlib/builtins.py:5960
3651
msgid "No tag specified to delete."
3652
msgstr ""
3653
3654
#: bzrlib/builtins.py:5962
3655
#, python-format
3656
msgid "Deleted tag %s."
3657
msgstr ""
3658
3659
#: bzrlib/builtins.py:5976
3660
msgid "Please specify a tag name."
3661
msgstr ""
3662
3663
#: bzrlib/builtins.py:5984
3664
#, python-format
3665
msgid "Tag %s already exists for that revision."
3666
msgstr ""
3667
3668
#: bzrlib/builtins.py:5988
3669
#, python-format
3670
msgid "Created tag %s."
3671
msgstr ""
3672
3673
#: bzrlib/builtins.py:5990
3674
#, python-format
3675
msgid "Updated tag %s."
3676
msgstr ""
3677
3678
#: bzrlib/builtins.py:5994
3679
msgid "List tags."
3680
msgstr ""
3681
3682
#: bzrlib/builtins.py:5996
3683
msgid ""
3684
"This command shows a table of tag names and the revisions they reference."
3685
msgstr ""
3686
3687
#: bzrlib/builtins.py:6002
3688
msgid "Branch whose tags should be displayed."
3689
msgstr ""
3690
3691
#: bzrlib/builtins.py:6004
3692
msgid "Sort tags by different criteria."
3693
msgstr ""
3694
3695
#: bzrlib/builtins.py:6004
3696
msgid "Sorting"
3697
msgstr ""
3698
3699
#: bzrlib/builtins.py:6073
3700
msgid "Reconfigure the type of a bzr directory."
3701
msgstr ""
3702
3703
#: bzrlib/builtins.py:6075
3704
msgid "A target configuration must be specified."
3705
msgstr ""
3706
3707
#: bzrlib/builtins.py:6077
3708
msgid ""
3709
"For checkouts, the bind-to location will be auto-detected if not specified.\n"
3710
"The order of preference is\n"
3711
"1. For a lightweight checkout, the current bound location.\n"
3712
"2. For branches that used to be checkouts, the previously-bound location.\n"
3713
"3. The push location.\n"
3714
"4. The parent location.\n"
3715
"If none of these is available, --bind-to must be specified."
3716
msgstr ""
3717
3718
#: bzrlib/builtins.py:6091
3719
msgid "Tree type"
3720
msgstr ""
3721
3722
#: bzrlib/builtins.py:6092
3723
msgid "The relation between branch and tree."
3724
msgstr ""
3725
3726
#: bzrlib/builtins.py:6094
3727
msgid "Reconfigure to be an unbound branch with no working tree."
3728
msgstr ""
3729
3730
#: bzrlib/builtins.py:6095
3731
msgid "Reconfigure to be an unbound branch with a working tree."
3732
msgstr ""
3733
3734
#: bzrlib/builtins.py:6096
3735
msgid "Reconfigure to be a bound branch with a working tree."
3736
msgstr ""
3737
3738
#: bzrlib/builtins.py:6097
3739
msgid "Reconfigure to be a lightweight checkout (with no local history)."
3740
msgstr ""
3741
3742
#: bzrlib/builtins.py:6102
3743
msgid "Repository type"
3744
msgstr ""
3745
3746
#: bzrlib/builtins.py:6103
3747
msgid "Location fo the repository."
3748
msgstr ""
3749
3750
#: bzrlib/builtins.py:6105
3751
msgid ""
3752
"Reconfigure to be a standalone branch (i.e. stop using shared repository)."
3753
msgstr ""
3754
3755
#: bzrlib/builtins.py:6107
3756
msgid "Reconfigure to use a shared repository."
3757
msgstr ""
3758
3759
#: bzrlib/builtins.py:6111
3760
msgid "Trees in Repository"
3761
msgstr ""
3762
3763
#: bzrlib/builtins.py:6112
3764
msgid "Whether new branches in the repository have trees."
3765
msgstr ""
3766
3767
#: bzrlib/builtins.py:6114
3768
msgid ""
3769
"Reconfigure repository to create working trees on branches by default."
3770
msgstr ""
3771
3772
#: bzrlib/builtins.py:6116
3773
msgid ""
3774
"Reconfigure repository to not create working trees on branches by default."
3775
msgstr ""
3776
3777
#: bzrlib/builtins.py:6119
3778
msgid "Branch to bind checkout to."
3779
msgstr ""
3780
3781
#: bzrlib/builtins.py:6121
3782
msgid "Perform reconfiguration even if local changes will be lost."
3783
msgstr ""
3784
3785
#: bzrlib/builtins.py:6124
3786
msgid "Reconfigure a branch to be stacked on another branch."
3787
msgstr ""
3788
3789
#: bzrlib/builtins.py:6128
3790
msgid ""
3791
"Reconfigure a branch to be unstacked. This may require copying substantial "
3792
"data into it."
3793
msgstr ""
3794
3795
#: bzrlib/builtins.py:6138
3796
msgid "Can't use both --stacked-on and --unstacked"
3797
msgstr ""
3798
3799
#: bzrlib/builtins.py:6152
3800
msgid "No target configuration specified"
3801
msgstr ""
3802
3803
#: bzrlib/builtins.py:6187
3804
msgid "Set the branch of a checkout and update."
3805
msgstr ""
3806
3807
#: bzrlib/builtins.py:6189
3808
msgid ""
3809
"For lightweight checkouts, this changes the branch being referenced.\n"
3810
"For heavyweight checkouts, this checks that there are no local commits\n"
3811
"versus the current bound branch, then it makes the local branch a mirror\n"
3812
"of the new location and binds to it."
3813
msgstr ""
3814
3815
#: bzrlib/builtins.py:6194
3816
msgid ""
3817
"In both cases, the working tree is updated and uncommitted changes\n"
3818
"are merged. The user can commit or revert these as they desire."
3819
msgstr ""
3820
3821
#: bzrlib/builtins.py:6197
3822
msgid "Pending merges need to be committed or reverted before using switch."
3823
msgstr ""
3824
3825
#: bzrlib/builtins.py:6199
3826
msgid ""
3827
"The path to the branch to switch to can be specified relative to the parent\n"
3828
"directory of the current branch. For example, if you are currently in a\n"
3829
"checkout of /path/to/branch, specifying 'newbranch' will find a branch at\n"
3830
"/path/to/newbranch."
3831
msgstr ""
3832
3833
#: bzrlib/builtins.py:6204
3834
msgid ""
3835
"Bound branches use the nickname of its master branch unless it is set\n"
3836
"locally, in which case switching will update the local nickname to be\n"
3837
"that of the master."
3838
msgstr ""
3839
3840
#: bzrlib/builtins.py:6212
3841
msgid "Switch even if local commits will be lost."
3842
msgstr ""
3843
3844
#: bzrlib/builtins.py:6215
3845
msgid "Create the target branch from this one before switching to it."
3846
msgstr ""
3847
3848
#: bzrlib/builtins.py:6229
3849
msgid "You must supply either a revision or a location"
3850
msgstr ""
3851
3852
#: bzrlib/builtins.py:6242
3853
msgid "cannot create branch without source branch"
3854
msgstr ""
3855
3856
#: bzrlib/builtins.py:6262
3857
msgid "Manage filtered views."
3858
msgstr ""
3859
3860
#: bzrlib/builtins.py:6264
3861
msgid ""
3862
"Views provide a mask over the tree so that users can focus on\n"
3863
"a subset of a tree when doing their work. After creating a view,\n"
3864
"commands that support a list of files - status, diff, commit, etc -\n"
3865
"effectively have that list of files implicitly given each time.\n"
3866
"An explicit list of files can still be given but those files\n"
3867
"must be within the current view."
3868
msgstr ""
3869
3870
#: bzrlib/builtins.py:6271
3871
msgid ""
3872
"In most cases, a view has a short life-span: it is created to make\n"
3873
"a selected change and is deleted once that change is committed.\n"
3874
"At other times, you may wish to create one or more named views\n"
3875
"and switch between them."
3876
msgstr ""
3877
3878
#: bzrlib/builtins.py:6276
3879
msgid ""
3880
"To disable the current view without deleting it, you can switch to\n"
3881
"the pseudo view called ``off``. This can be useful when you need\n"
3882
"to see the whole tree for an operation or two (e.g. merge) but\n"
3883
"want to switch back to your view after that."
3884
msgstr ""
3885
3886
#: bzrlib/builtins.py:6281
3887
msgid ""
3888
":Examples:\n"
3889
" To define the current view::"
3890
msgstr ""
3891
3892
#: bzrlib/builtins.py:6284
3893
msgid " bzr view file1 dir1 ..."
3894
msgstr ""
3895
3896
#: bzrlib/builtins.py:6286
3897
msgid " To list the current view::"
3898
msgstr ""
3899
3900
#: bzrlib/builtins.py:6288
3901
msgid " bzr view"
3902
msgstr ""
3903
3904
#: bzrlib/builtins.py:6290
3905
msgid " To delete the current view::"
3906
msgstr ""
3907
3908
#: bzrlib/builtins.py:6292
3909
msgid " bzr view --delete"
3910
msgstr ""
3911
3912
#: bzrlib/builtins.py:6294
3913
msgid " To disable the current view without deleting it::"
3914
msgstr ""
3915
3916
#: bzrlib/builtins.py:6296
3917
msgid " bzr view --switch off"
3918
msgstr ""
3919
3920
#: bzrlib/builtins.py:6298
3921
msgid " To define a named view and switch to it::"
3922
msgstr ""
3923
3924
#: bzrlib/builtins.py:6300
3925
msgid " bzr view --name view-name file1 dir1 ..."
3926
msgstr ""
3927
3928
#: bzrlib/builtins.py:6302
3929
msgid " To list a named view::"
3930
msgstr ""
3931
3932
#: bzrlib/builtins.py:6304
3933
msgid " bzr view --name view-name"
3934
msgstr ""
3935
3936
#: bzrlib/builtins.py:6306
3937
msgid " To delete a named view::"
3938
msgstr ""
3939
3940
#: bzrlib/builtins.py:6308
3941
msgid " bzr view --name view-name --delete"
3942
msgstr ""
3943
3944
#: bzrlib/builtins.py:6310
3945
msgid " To switch to a named view::"
3946
msgstr ""
3947
3948
#: bzrlib/builtins.py:6312
3949
msgid " bzr view --switch view-name"
3950
msgstr ""
3951
3952
#: bzrlib/builtins.py:6314
3953
msgid " To list all views defined::"
3954
msgstr ""
3955
3956
#: bzrlib/builtins.py:6316
3957
msgid " bzr view --all"
3958
msgstr ""
3959
3960
#: bzrlib/builtins.py:6318
3961
msgid " To delete all views::"
3962
msgstr ""
3963
3964
#: bzrlib/builtins.py:6320
3965
msgid " bzr view --delete --all"
3966
msgstr ""
3967
3968
#: bzrlib/builtins.py:6327
3969
msgid "Apply list or delete action to all views."
3970
msgstr ""
3971
3972
#: bzrlib/builtins.py:6330
3973
msgid "Delete the view."
3974
msgstr ""
3975
3976
#: bzrlib/builtins.py:6333
3977
msgid "Name of the view to define, list or delete."
3978
msgstr ""
3979
3980
#: bzrlib/builtins.py:6337
3981
msgid "Name of the view to switch to."
3982
msgstr ""
3983
3984
#: bzrlib/builtins.py:6356
3985
msgid "Both --delete and a file list specified"
3986
msgstr ""
3987
3988
#: bzrlib/builtins.py:6359
3989
msgid "Both --delete and --switch specified"
3990
msgstr ""
3991
3992
#: bzrlib/builtins.py:6362
3993
msgid "Deleted all views.\n"
3994
msgstr ""
3995
3996
#: bzrlib/builtins.py:6364
3997
msgid "No current view to delete"
3998
msgstr ""
3999
4000
#: bzrlib/builtins.py:6367
4001
#, python-format
4002
msgid "Deleted '%s' view.\n"
4003
msgstr ""
4004
4005
#: bzrlib/builtins.py:6371
4006
msgid "Both --switch and a file list specified"
4007
msgstr ""
4008
4009
#: bzrlib/builtins.py:6374
4010
msgid "Both --switch and --all specified"
4011
msgstr ""
4012
4013
#: bzrlib/builtins.py:6377
4014
msgid "No current view to disable"
4015
msgstr ""
4016
4017
#: bzrlib/builtins.py:6379
4018
#, python-format
4019
msgid "Disabled '%s' view.\n"
4020
msgstr ""
4021
4022
#: bzrlib/builtins.py:6383 bzrlib/builtins.py:6405
4023
msgid "Using '{0}' view: {1}\n"
4024
msgstr ""
4025
4026
#: bzrlib/builtins.py:6386
4027
msgid "Views defined:\n"
4028
msgstr ""
4029
4030
#: bzrlib/builtins.py:6395
4031
msgid "No views defined.\n"
4032
msgstr ""
4033
4034
#: bzrlib/builtins.py:6402
4035
msgid "Cannot change the 'off' pseudo view"
4036
msgstr ""
4037
4038
#: bzrlib/builtins.py:6410
4039
msgid "No current view.\n"
4040
msgstr ""
4041
4042
#: bzrlib/builtins.py:6413
4043
msgid "'{0}' view is: {1}\n"
4044
msgstr ""
4045
4046
#: bzrlib/builtins.py:6433
4047
msgid " <no hooks installed>\n"
4048
msgstr ""
4049
4050
#: bzrlib/builtins.py:6437
4051
msgid "Remove a branch."
4052
msgstr ""
4053
4054
#: bzrlib/builtins.py:6439
4055
msgid ""
4056
"This will remove the branch from the specified location but \n"
4057
"will keep any working tree or repository in place."
4058
msgstr ""
4059
4060
#: bzrlib/builtins.py:6444
4061
msgid " Remove the branch at repo/trunk::"
4062
msgstr ""
4063
4064
#: bzrlib/builtins.py:6446
4065
msgid " bzr remove-branch repo/trunk"
4066
msgstr ""
4067
4068
#: bzrlib/builtins.py:6461
4069
msgid "Plaintext diff output."
4070
msgstr ""
4071
4072
#: bzrlib/builtins.py:6462
4073
msgid "Temporarily set aside some changes from the current tree."
4074
msgstr ""
4075
4076
#: bzrlib/builtins.py:6464
4077
msgid ""
4078
"Shelve allows you to temporarily put changes you've made \"on the shelf\",\n"
4079
"ie. out of the way, until a later time when you can bring them back from\n"
4080
"the shelf with the 'unshelve' command. The changes are stored alongside\n"
4081
"your working tree, and so they aren't propagated along with your branch nor\n"
4082
"will they survive its deletion."
4083
msgstr ""
4084
4085
#: bzrlib/builtins.py:6470
4086
msgid "If shelve --list is specified, previously-shelved changes are listed."
4087
msgstr ""
4088
4089
#: bzrlib/builtins.py:6472
4090
msgid ""
4091
"Shelve is intended to help separate several sets of changes that have\n"
4092
"been inappropriately mingled. If you just want to get rid of all changes\n"
4093
"and you don't need to restore them later, use revert. If you want to\n"
4094
"shelve all text changes at once, use shelve --all."
4095
msgstr ""
4096
4097
#: bzrlib/builtins.py:6477
4098
msgid ""
4099
"If filenames are specified, only the changes to those files will be\n"
4100
"shelved. Other files will be left untouched."
4101
msgstr ""
4102
4103
#: bzrlib/builtins.py:6480
4104
msgid ""
4105
"If a revision is specified, changes since that revision will be shelved."
4106
msgstr ""
4107
4108
#: bzrlib/builtins.py:6482
4109
msgid ""
4110
"You can put multiple items on the shelf, and by default, 'unshelve' will\n"
4111
"restore the most recently shelved changes."
4112
msgstr ""
4113
4114
#: bzrlib/builtins.py:6485
4115
msgid ""
4116
"For complicated changes, it is possible to edit the changes in a separate\n"
4117
"editor program to decide what the file remaining in the working copy\n"
4118
"should look like. To do this, add the configuration option"
4119
msgstr ""
4120
4121
#: bzrlib/builtins.py:6489
4122
msgid " change_editor = PROGRAM @new_path @old_path"
4123
msgstr ""
4124
4125
#: bzrlib/builtins.py:6491
4126
msgid ""
4127
"where @new_path is replaced with the path of the new version of the \n"
4128
"file and @old_path is replaced with the path of the old version of \n"
4129
"the file. The PROGRAM should save the new file with the desired \n"
4130
"contents of the file in the working tree.\n"
4131
" "
4132
msgstr ""
4133
4134
#: bzrlib/builtins.py:6503
4135
msgid "Shelve all changes."
4136
msgstr ""
4137
4138
#: bzrlib/builtins.py:6505
4139
msgid "Method to use for writing diffs."
4140
msgstr ""
4141
4142
#: bzrlib/builtins.py:6505
4143
msgid "writer"
4144
msgstr ""
4145
4146
#: bzrlib/builtins.py:6509
4147
msgid "List shelved changes."
4148
msgstr ""
4149
4150
#: bzrlib/builtins.py:6511
4151
msgid "Destroy removed changes instead of shelving them."
4152
msgstr ""
4153
4154
#: bzrlib/builtins.py:6540
4155
msgid "No shelved changes."
4156
msgstr ""
4157
4158
#: bzrlib/builtins.py:6551
4159
msgid "Restore shelved changes."
4160
msgstr ""
4161
4162
#: bzrlib/builtins.py:6553
4163
msgid ""
4164
"By default, the most recently shelved changes are restored. However if you\n"
4165
"specify a shelf by id those changes will be restored instead. This works\n"
4166
"best when the changes don't depend on each other."
4167
msgstr ""
4168
4169
#: bzrlib/builtins.py:6562
4170
msgid "The action to perform."
4171
msgstr ""
4172
4173
#: bzrlib/builtins.py:6562 bzrlib/conflicts.py:694
4174
msgid "action"
4175
msgstr ""
4176
4177
#: bzrlib/builtins.py:6564
4178
msgid "Apply changes and remove from the shelf."
4179
msgstr ""
4180
4181
#: bzrlib/builtins.py:6565
4182
msgid "Show changes, but do not apply or remove them."
4183
msgstr ""
4184
4185
#: bzrlib/builtins.py:6566
4186
msgid ""
4187
"Instead of unshelving the changes, show the diff that would result from "
4188
"unshelving."
4189
msgstr ""
4190
4191
#: bzrlib/builtins.py:6568
4192
msgid "Delete changes without applying them."
4193
msgstr ""
4194
4195
#: bzrlib/builtins.py:6569
4196
msgid "Apply changes but don't delete them."
4197
msgstr ""
4198
4199
#: bzrlib/builtins.py:6584
4200
msgid "Remove unwanted files from working tree."
4201
msgstr ""
4202
4203
#: bzrlib/builtins.py:6586
4204
msgid ""
4205
"By default, only unknown files, not ignored files, are deleted. Versioned\n"
4206
"files are never deleted."
4207
msgstr ""
4208
4209
#: bzrlib/builtins.py:6589
4210
msgid ""
4211
"Another class is 'detritus', which includes files emitted by bzr during\n"
4212
"normal operations and selftests. (The value of these files decreases with\n"
4213
"time.)"
4214
msgstr ""
4215
4216
#: bzrlib/builtins.py:6593
4217
msgid ""
4218
"If no options are specified, unknown files are deleted. Otherwise, option\n"
4219
"flags are respected, and may be combined."
4220
msgstr ""
4221
4222
#: bzrlib/builtins.py:6596
4223
msgid "To check what clean-tree will do, use --dry-run."
4224
msgstr ""
4225
4226
#: bzrlib/builtins.py:6599
4227
msgid "Delete all ignored files."
4228
msgstr ""
4229
4230
#: bzrlib/builtins.py:6600
4231
msgid ""
4232
"Delete conflict files, merge and revert backups, and failed selftest dirs."
4233
msgstr ""
4234
4235
#: bzrlib/builtins.py:6603
4236
msgid "Delete files unknown to bzr (default)."
4237
msgstr ""
4238
4239
#: bzrlib/builtins.py:6604
4240
msgid "Show files to delete instead of deleting them."
4241
msgstr ""
4242
4243
#: bzrlib/builtins.py:6606
4244
msgid "Do not prompt before deleting."
4245
msgstr ""
4246
4247
#: bzrlib/bundle/__init__.py:59
4248
msgid "A directory cannot be a bundle"
4249
msgstr ""
4250
4251
#: bzrlib/bundle/apply_bundle.py:40
4252
msgid "Install revisions"
4253
msgstr ""
4254
4255
#: bzrlib/bundle/commands.py:64
4256
msgid "--verbose requires a merge directive"
4257
msgstr ""
4258
4259
#: bzrlib/bundle/commands.py:67
4260
msgid "Bundle format not supported"
4261
msgstr ""
4262
4263
#: bzrlib/bundle/commands.py:77
4264
msgid "Records\n"
4265
msgstr ""
4266
4267
#: bzrlib/bundle/commands.py:81
4268
msgid "{0}: {1} ({2} multiparent)\n"
4269
msgstr ""
4270
4271
#: bzrlib/bundle/commands.py:83
4272
#, python-format
4273
msgid "unique files: %d\n"
4274
msgstr ""
4275
4276
#: bzrlib/bundle/commands.py:92
4277
msgid "Revisions\n"
4278
msgstr ""
4279
4280
#: bzrlib/bundle/commands.py:93
4281
#, python-format
4282
msgid "nicks: %s\n"
4283
msgstr ""
4284
4285
#: bzrlib/bundle/commands.py:95
4286
#, python-format
4287
msgid ""
4288
"committers: \n"
4289
"%s\n"
4290
msgstr ""
4291
4292
#: bzrlib/bundle/commands.py:103
4293
msgid "Decoded contents\n"
4294
msgstr ""
4295
4296
#: bzrlib/bundle/serializer/v4.py:327
4297
#, python-format
4298
msgid "Bundling %d revision."
4299
msgid_plural "Bundling %d revisions."
4300
msgstr[0] ""
4301
msgstr[1] ""
4302
4303
#: bzrlib/bzrdir.py:490
4304
msgid ""
4305
"making backup of {0}\n"
4306
" to {1}"
4307
msgstr ""
4308
4309
#: bzrlib/bzrdir.py:513
4310
msgid "renamed {0} to {1}"
4311
msgstr ""
4312
4313
#: bzrlib/bzrdir.py:1652
4314
#, python-format
4315
msgid ""
4316
"Source repository format does not support stacking, using format:\n"
4317
" %s"
4318
msgstr ""
4319
4320
#: bzrlib/bzrdir.py:1672
4321
#, python-format
4322
msgid ""
4323
"Source branch format does not support stacking, using format:\n"
4324
" %s"
4325
msgstr ""
4326
4327
#: bzrlib/bzrdir.py:1818
4328
msgid "starting repository conversion"
4329
msgstr ""
4330
4331
#: bzrlib/bzrdir.py:2039
4332
msgid "Using default stacking branch {0} at {1}"
4333
msgstr ""
4334
4335
#: bzrlib/check.py:108
4336
msgid "check"
4337
msgstr ""
4338
4339
#: bzrlib/check.py:110
4340
msgid "checking revisions"
4341
msgstr ""
4342
4343
#: bzrlib/check.py:112
4344
msgid "checking commit contents"
4345
msgstr ""
4346
4347
#: bzrlib/check.py:114
4348
msgid "checking file graphs"
4349
msgstr ""
4350
4351
#: bzrlib/check.py:118
4352
msgid "checking branches and trees"
4353
msgstr ""
4354
4355
#: bzrlib/check.py:205
4356
msgid "checked repository {0} format {1}"
4357
msgstr ""
4358
4359
#: bzrlib/check.py:208
4360
#, python-format
4361
msgid "%6d revisions"
4362
msgstr ""
4363
4364
#: bzrlib/check.py:209
4365
#, python-format
4366
msgid "%6d file-ids"
4367
msgstr ""
4368
4369
#: bzrlib/check.py:211
4370
#, python-format
4371
msgid "%6d unreferenced text versions"
4372
msgstr ""
4373
4374
#: bzrlib/check.py:215
4375
msgid "unreferenced version: {{{0}}} in {1}"
4376
msgstr ""
4377
4378
#: bzrlib/check.py:218
4379
#, python-format
4380
msgid "%6d revisions are missing inventory_sha1"
4381
msgstr ""
4382
4383
#: bzrlib/check.py:221
4384
#, python-format
4385
msgid "%6d revisions are mentioned but not present"
4386
msgstr ""
4387
4388
#: bzrlib/check.py:224
4389
#, python-format
4390
msgid "%6d ghost revisions"
4391
msgstr ""
4392
4393
#: bzrlib/check.py:229
4394
#, python-format
4395
msgid "%6d revisions missing parents in ancestry"
4396
msgstr ""
4397
4398
#: bzrlib/check.py:233
4399
#, python-format
4400
msgid " %s should be in the ancestry for:"
4401
msgstr ""
4402
4403
#: bzrlib/check.py:237
4404
#, python-format
4405
msgid "%6d inconsistent parents"
4406
msgstr ""
4407
4408
#: bzrlib/check.py:241
4409
msgid " * {0} version {1} has parents {2!r} but should have {3!r}"
4410
msgstr ""
4411
4412
#: bzrlib/check.py:247
4413
#, python-format
4414
msgid "%6d revisions have incorrect parents in the revision index"
4415
msgstr ""
4416
4417
#: bzrlib/check.py:253
4418
msgid " {0} has wrong parents in index: {1!r} should be {2!r}"
4419
msgstr ""
4420
4421
#: bzrlib/check.py:267
4422
msgid "Mismatched internal revid {{{0}}} and index revid {{{1}}}"
4423
msgstr ""
4424
4425
#: bzrlib/check.py:296
4426
msgid ""
4427
"Multiple expected sha1s for {0}. {{{1}}} expects {{{2}}}, {{{3}}} expects "
4428
"{{{4}}}"
4429
msgstr ""
4430
4431
#: bzrlib/check.py:354
4432
#, python-format
4433
msgid "Checking branch at '%s'."
4434
msgstr ""
4435
4436
#: bzrlib/check.py:374
4437
#, python-format
4438
msgid "Checking working tree at '%s'."
4439
msgstr ""
4440
4441
#: bzrlib/check.py:427 bzrlib/check.py:441
4442
msgid "No branch found at specified location."
4443
msgstr ""
4444
4445
#: bzrlib/check.py:429 bzrlib/check.py:439
4446
msgid "No working tree found at specified location."
4447
msgstr ""
4448
4449
#: bzrlib/check.py:432
4450
#, python-format
4451
msgid "Checking repository at '%s'."
4452
msgstr ""
4453
4454
#: bzrlib/check.py:443
4455
msgid "No repository found at specified location."
4456
msgstr ""
4457
4458
#: bzrlib/clean_tree.py:63
4459
msgid "Nothing to delete."
4460
msgstr ""
4461
4462
#: bzrlib/clean_tree.py:68
4463
msgid "Are you sure you wish to delete these"
4464
msgstr ""
4465
4466
#: bzrlib/clean_tree.py:70
4467
msgid "Canceled"
4468
msgstr ""
4469
4470
#: bzrlib/clean_tree.py:107
4471
#, python-format
4472
msgid "unable to remove %s"
4473
msgstr ""
4474
4475
#: bzrlib/clean_tree.py:111
4476
msgid "deleting paths:"
4477
msgstr ""
4478
4479
#: bzrlib/clean_tree.py:125
4480
msgid "unable to remove \"{0}\": {1}."
4481
msgstr ""
4482
4483
#: bzrlib/clean_tree.py:130
4484
msgid "No files deleted."
4485
msgstr ""
4486
4487
#: bzrlib/cmd_version_info.py:47
4488
msgid "No known version info format {0}. Supported types are: {1}"
4489
msgstr ""
4490
4491
#: bzrlib/cmd_version_info.py:52
4492
msgid "Version info in Custom template-based format."
4493
msgstr ""
4494
4495
#: bzrlib/cmd_version_info.py:52
4496
msgid "Version info in Python format."
4497
msgstr ""
4498
4499
#: bzrlib/cmd_version_info.py:52
4500
msgid "Version info in RIO (simple text) format (default)."
4501
msgstr ""
4502
4503
#: bzrlib/cmd_version_info.py:53
4504
msgid "Show version information about this tree."
4505
msgstr ""
4506
4507
#: bzrlib/cmd_version_info.py:55
4508
msgid ""
4509
"You can use this command to add information about version into\n"
4510
"source code of an application. The output can be in one of the\n"
4511
"supported formats or in a custom format based on a template."
4512
msgstr ""
4513
4514
#: bzrlib/cmd_version_info.py:59 en/help_topics/configuration.txt:700
4515
#: en/help_topics/configuration.txt:710
4516
msgid "For example::"
4517
msgstr ""
4518
4519
#: bzrlib/cmd_version_info.py:61
4520
msgid ""
4521
" bzr version-info --custom \\\n"
4522
" --template=\"#define VERSION_INFO \\\"Project 1.2.3 (r{revno})\\\"\\n\""
4523
msgstr ""
4524
4525
#: bzrlib/cmd_version_info.py:64
4526
msgid ""
4527
"will produce a C header file with formatted string containing the\n"
4528
"current revision number. Other supported variables in templates are:"
4529
msgstr ""
4530
4531
#: bzrlib/cmd_version_info.py:67
4532
msgid ""
4533
" * {date} - date of the last revision\n"
4534
" * {build_date} - current date\n"
4535
" * {revno} - revision number\n"
4536
" * {revision_id} - revision id\n"
4537
" * {branch_nick} - branch nickname\n"
4538
" * {clean} - 0 if the source tree contains uncommitted changes,\n"
4539
" otherwise 1"
4540
msgstr ""
4541
4542
#: bzrlib/cmd_version_info.py:77
4543
msgid "Select the output format."
4544
msgstr ""
4545
4546
#: bzrlib/cmd_version_info.py:81
4547
msgid "Include all possible information."
4548
msgstr ""
4549
4550
#: bzrlib/cmd_version_info.py:82
4551
msgid "Check if tree is clean."
4552
msgstr ""
4553
4554
#: bzrlib/cmd_version_info.py:84
4555
msgid "Include the revision-history."
4556
msgstr ""
4557
4558
#: bzrlib/cmd_version_info.py:86
4559
msgid "Include the last revision for each file."
4560
msgstr ""
4561
4562
#: bzrlib/cmd_version_info.py:87
4563
msgid "Template for the output."
4564
msgstr ""
4565
4566
#: bzrlib/cmd_version_info.py:101
4567
msgid "bzr version-info --revision takes exactly one revision specifier"
4568
msgstr ""
4569
4570
#: bzrlib/commands.py:229
4571
#, python-format
4572
msgid "unknown command \"%s\""
4573
msgstr ""
4574
4575
#: bzrlib/commands.py:476
4576
msgid "No help for this command."
4577
msgstr ""
4578
4579
#: bzrlib/commands.py:489
4580
#, python-format
4581
msgid ":Purpose: %s\n"
4582
msgstr ""
4583
4584
#: bzrlib/commands.py:491
4585
#, python-format
4586
msgid ""
4587
":Usage:\n"
4588
"%s\n"
4589
msgstr ""
4590
4591
#: bzrlib/commands.py:493
4592
#, python-format
4593
msgid ":Usage: %s\n"
4594
msgstr ""
4595
4596
#: bzrlib/commands.py:512
4597
#, python-format
4598
msgid ":Options:%s"
4599
msgstr ""
4600
4601
#: bzrlib/commands.py:523
4602
#, python-format
4603
msgid ""
4604
":Description:\n"
4605
" %s\n"
4606
"\n"
4607
msgstr ""
4608
4609
#: bzrlib/commands.py:533
4610
#, python-format
4611
msgid ""
4612
"See bzr help %s for more details and examples.\n"
4613
"\n"
4614
msgstr ""
4615
4616
#: bzrlib/commands.py:538
4617
msgid ":Aliases: "
4618
msgstr ""
4619
4620
#: bzrlib/commands.py:542
4621
#, python-format
4622
msgid ":From: plugin \"%s\"\n"
4623
msgstr ""
4624
4625
#: bzrlib/commands.py:554
4626
msgid ":doc:`{0} <{1}-help>`"
4627
msgstr ""
4628
4629
#: bzrlib/commands.py:558
4630
#, python-format
4631
msgid ":See also: %s"
4632
msgstr ""
4633
4634
#: bzrlib/commands.py:816 bzrlib/gpg.py:324
4635
msgid "Only ASCII permitted in option names"
4636
msgstr ""
4637
4638
#: bzrlib/commands.py:841 bzrlib/commands.py:849
4639
msgid "command {0!r} needs one or more {1}"
4640
msgstr ""
4641
4642
#: bzrlib/commands.py:858
4643
msgid "command {0!r} requires argument {1}"
4644
msgstr ""
4645
4646
#: bzrlib/commands.py:865
4647
msgid "extra argument to command {0}: {1}"
4648
msgstr ""
4649
4650
#: bzrlib/commands.py:962
4651
#, python-format
4652
msgid "Profile data written to \"%s\"."
4653
msgstr ""
4654
4655
#: bzrlib/commit.py:117 bzrlib/commit.py:740
4656
msgid "added"
4657
msgstr ""
4658
4659
#: bzrlib/commit.py:117 bzrlib/commit.py:748
4660
msgid "modified"
4661
msgstr ""
4662
4663
#: bzrlib/commit.py:131
4664
#, python-format
4665
msgid "Committing%s"
4666
msgstr ""
4667
4668
#: bzrlib/commit.py:134
4669
#, python-format
4670
msgid "Committed revision %d."
4671
msgstr ""
4672
4673
#: bzrlib/commit.py:143
4674
#, python-format
4675
msgid "deleted %s"
4676
msgstr ""
4677
4678
#: bzrlib/commit.py:146
4679
#, python-format
4680
msgid "missing %s"
4681
msgstr ""
4682
4683
#: bzrlib/commit.py:511
4684
msgid ""
4685
"Conflicting tags in bound branch:\n"
4686
"{0}"
4687
msgstr ""
4688
4689
#: bzrlib/commit.py:742
4690
msgid "renamed"
4691
msgstr ""
4692
4693
#: bzrlib/commit.py:977
4694
msgid "unchanged"
4695
msgstr ""
4696
4697
#: bzrlib/commit.py:999
4698
msgid "{0} [{1}] - Stage"
4699
msgstr ""
4700
4701
#: bzrlib/commit.py:1002
4702
#, python-format
4703
msgid "%s - Stage"
4704
msgstr ""
4705
4706
#: bzrlib/commit_signature_commands.py:36
4707
msgid "Sign all commits by a given committer."
4708
msgstr ""
4709
4710
#: bzrlib/commit_signature_commands.py:38
4711
msgid ""
4712
"If location is not specified the local tree is used.\n"
4713
"If committer is not specified the default committer is used."
4714
msgstr ""
4715
4716
#: bzrlib/commit_signature_commands.py:41
4717
msgid "This does not sign commits that already have signatures."
4718
msgstr ""
4719
4720
#: bzrlib/commit_signature_commands.py:49
4721
msgid ""
4722
"Don't actually sign anything, just print the revisions that would be signed."
4723
msgstr ""
4724
4725
#: bzrlib/commit_signature_commands.py:103
4726
msgid "Verify all commit signatures."
4727
msgstr ""
4728
4729
#: bzrlib/commit_signature_commands.py:105
4730
msgid ""
4731
"Verifies that all commits in the branch are signed by known GnuPG keys."
4732
msgstr ""
4733
4734
#: bzrlib/commit_signature_commands.py:110
4735
msgid ""
4736
"Comma separated list of GPG key patterns which are acceptable for "
4737
"verification."
4738
msgstr ""
4739
4740
#: bzrlib/commit_signature_commands.py:147
4741
msgid "Cannot verify a range of non-revision-history revisions"
4742
msgstr ""
4743
4744
#: bzrlib/commit_signature_commands.py:168
4745
msgid "All commits signed with verifiable keys"
4746
msgstr ""
4747
4748
#: bzrlib/config.py:475
4749
msgid "Invalid config value for \"{0}\" value {1!r} is not an SI unit."
4750
msgstr ""
4751
4752
#: bzrlib/config.py:2485
4753
msgid "{0} is not an SI unit."
4754
msgstr ""
4755
4756
#: bzrlib/config.py:2949
4757
msgid ""
4758
"Option {0} in section {1} of {2} was changed from {3} to {4}. The {5} value "
4759
"will be saved."
4760
msgstr ""
4761
4762
#: bzrlib/config.py:3093
4763
#, python-format
4764
msgid "Invalid '%s', should be of the form 'name=value'"
4765
msgstr ""
4766
4767
#: bzrlib/config.py:3962
4768
msgid "Display, set or remove a configuration option."
4769
msgstr ""
4770
4771
#: bzrlib/config.py:3964
4772
msgid "Display the active value for a given option."
4773
msgstr ""
4774
4775
#: bzrlib/config.py:3966
4776
msgid ""
4777
"If --all is specified, NAME is interpreted as a regular expression and all\n"
4778
"matching options are displayed mentioning their scope. The active value\n"
4779
"that bzr will take into account is the first one displayed for each option."
4780
msgstr ""
4781
4782
#: bzrlib/config.py:3970
4783
msgid "If no NAME is given, --all .* is implied."
4784
msgstr ""
4785
4786
#: bzrlib/config.py:3972
4787
msgid ""
4788
"Setting a value is achieved by using name=value without spaces. The value\n"
4789
"is set in the most relevant scope and can be checked by displaying the\n"
4790
"option again."
4791
msgstr ""
4792
4793
#: bzrlib/config.py:3984
4794
msgid "Reduce the scope to the specified configuration file."
4795
msgstr ""
4796
4797
#: bzrlib/config.py:3988
4798
msgid "Display all the defined values for the matching options."
4799
msgstr ""
4800
4801
#: bzrlib/config.py:3990
4802
msgid "Remove the option from the configuration file."
4803
msgstr ""
4804
4805
#: bzrlib/conflicts.py:50
4806
msgid "List files with conflicts."
4807
msgstr ""
4808
4809
#: bzrlib/conflicts.py:57
4810
msgid ""
4811
"Conflicts normally are listed as short, human-readable messages. If --text\n"
4812
"is supplied, the pathnames of files with text conflicts are listed,\n"
4813
"instead. (This is useful for editing all files with text conflicts.)"
4814
msgstr ""
4815
4816
#: bzrlib/conflicts.py:61
4817
msgid "Use bzr resolve when you have fixed a problem."
4818
msgstr ""
4819
4820
#: bzrlib/conflicts.py:66
4821
msgid "List paths of files with text conflicts."
4822
msgstr ""
4823
4824
#: bzrlib/conflicts.py:85
4825
msgid "Marks the conflict as resolved."
4826
msgstr ""
4827
4828
#: bzrlib/conflicts.py:88
4829
msgid "Resolve the conflict preserving the version in the working tree."
4830
msgstr ""
4831
4832
#: bzrlib/conflicts.py:91
4833
msgid "Resolve the conflict taking the merged version into account."
4834
msgstr ""
4835
4836
#: bzrlib/conflicts.py:98
4837
msgid "How to resolve the conflict."
4838
msgstr ""
4839
4840
#: bzrlib/conflicts.py:104
4841
msgid "Mark a conflict as resolved."
4842
msgstr ""
4843
4844
#: bzrlib/conflicts.py:111
4845
msgid ""
4846
"Once you have fixed a problem, use \"bzr resolve\" to automatically mark\n"
4847
"text conflicts as fixed, \"bzr resolve FILE\" to mark a specific conflict "
4848
"as\n"
4849
"resolved, or \"bzr resolve --all\" to mark all conflicts as resolved."
4850
msgstr ""
4851
4852
#: bzrlib/conflicts.py:119
4853
msgid "Resolve all conflicts in this tree."
4854
msgstr ""
4855
4856
#: bzrlib/conflicts.py:126
4857
msgid "If --all is specified, no FILE may be provided"
4858
msgstr ""
4859
4860
#: bzrlib/conflicts.py:151
4861
#, python-format
4862
msgid "%d conflict auto-resolved."
4863
msgid_plural "%d conflicts auto-resolved."
4864
msgstr[0] ""
4865
msgstr[1] ""
4866
4867
#: bzrlib/conflicts.py:154
4868
msgid "Remaining conflicts:"
4869
msgstr ""
4870
4871
#: bzrlib/conflicts.py:159
4872
msgid "All conflicts resolved."
4873
msgstr ""
4874
4875
#: bzrlib/conflicts.py:168
4876
msgid "{0} conflict resolved, {1} remaining"
4877
msgid_plural "{0} conflicts resolved, {1} remaining"
4878
msgstr[0] ""
4879
msgstr[1] ""
4880
4881
#: bzrlib/controldir.py:710
4882
msgid "{0} is{1} redirected to {2}"
4883
msgstr ""
4884
4885
#: bzrlib/diff.py:399
4886
#, python-format
4887
msgid "*** Ignoring files outside view. View is %s"
4888
msgstr ""
4889
4890
#: bzrlib/errors.py:157
4891
msgid "The tree builder is already building a tree."
4892
msgstr ""
4893
4894
#: bzrlib/errors.py:178
4895
msgid "The dirstate file (%(state)s) appears to be corrupt: %(msg)s"
4896
msgstr ""
4897
4898
#: bzrlib/errors.py:197
4899
msgid ""
4900
"The API for \"%(api)s\" is not compatible with \"%(wanted)s\". It supports "
4901
"versions \"%(minimum)s\" to \"%(current)s\"."
4902
msgstr ""
4903
4904
#: bzrlib/errors.py:209
4905
msgid "The transport '%(transport)s' is only accessible within this process."
4906
msgstr ""
4907
4908
#: bzrlib/errors.py:227
4909
msgid "Invalid revision number %(revno)s"
4910
msgstr ""
4911
4912
#: bzrlib/errors.py:236
4913
msgid "Invalid revision-id {%(revision_id)s} in %(branch)s"
4914
msgstr ""
4915
4916
#: bzrlib/errors.py:247
4917
msgid "Reserved revision-id {%(revision_id)s}"
4918
msgstr ""
4919
4920
#: bzrlib/errors.py:261
4921
msgid "There is no public branch set for \"%(branch_url)s\"."
4922
msgstr ""
4923
4924
#: bzrlib/errors.py:271
4925
msgid ""
4926
"No help could be found for '%(topic)s'. Please use 'bzr help topics' to "
4927
"obtain a list of topics."
4928
msgstr ""
4929
4930
#: bzrlib/errors.py:280
4931
msgid "The file id \"%(file_id)s\" is not present in the tree %(tree)s."
4932
msgstr ""
4933
4934
#: bzrlib/errors.py:290
4935
msgid ""
4936
"The file id \"%(file_id)s\" is not present in the repository %(repository)r"
4937
msgstr ""
4938
4939
#: bzrlib/errors.py:299
4940
msgid "The branch '%(branch)s' is not stacked."
4941
msgstr ""
4942
4943
#: bzrlib/errors.py:313
4944
msgid "No WorkingTree exists for \"%(base)s\"."
4945
msgstr ""
4946
4947
#: bzrlib/errors.py:322
4948
msgid "Not currently building a tree."
4949
msgstr ""
4950
4951
#: bzrlib/errors.py:327
4952
msgid "%(url)s is not a local path."
4953
msgstr ""
4954
4955
#: bzrlib/errors.py:355
4956
msgid "%(not_locked)r is not write locked but needs to be."
4957
msgstr ""
4958
4959
#: bzrlib/errors.py:363
4960
msgid "Error in command line options"
4961
msgstr ""
4962
4963
#: bzrlib/errors.py:368
4964
msgid "%(value)s is not an index of type %(_type)s."
4965
msgstr ""
4966
4967
#: bzrlib/errors.py:378
4968
msgid "Error in data for index %(value)s."
4969
msgstr ""
4970
4971
#: bzrlib/errors.py:387
4972
msgid "The key '%(key)s' is already in index '%(index)s'."
4973
msgstr ""
4974
4975
#: bzrlib/errors.py:397
4976
msgid "The key '%(key)s' is not a valid key."
4977
msgstr ""
4978
4979
#: bzrlib/errors.py:406
4980
msgid "Could not parse options for index %(value)s."
4981
msgstr ""
4982
4983
#: bzrlib/errors.py:415
4984
msgid "The value '%(value)s' is not a valid value."
4985
msgstr ""
4986
4987
#: bzrlib/errors.py:424
4988
msgid "Bad value \"%(value)s\" for option \"%(name)s\"."
4989
msgstr ""
4990
4991
#: bzrlib/errors.py:443
4992
msgid "Generic path error: %(path)r%(extra)s)"
4993
msgstr ""
4994
4995
#: bzrlib/errors.py:456
4996
msgid "No such file: %(path)r%(extra)s"
4997
msgstr ""
4998
4999
#: bzrlib/errors.py:461
5000
msgid "File exists: %(path)r%(extra)s"
5001
msgstr ""
5002
5003
#: bzrlib/errors.py:467
5004
msgid ""
5005
"Could not rename %(source)s => %(dest)s because both files exist. (Use --"
5006
"after to tell bzr about a rename that has already happened)%(extra)s"
5007
msgstr ""
5008
5009
#: bzrlib/errors.py:483
5010
msgid "\"%(path)s\" is not a directory %(extra)s"
5011
msgstr ""
5012
5013
#: bzrlib/errors.py:488
5014
msgid "\"%(path)s\" is not in the working directory %(extra)s"
5015
msgstr ""
5016
5017
#: bzrlib/errors.py:493
5018
msgid "Directory not empty: \"%(path)s\"%(extra)s"
5019
msgstr ""
5020
5021
#: bzrlib/errors.py:498
5022
msgid "Hard-linking \"%(path)s\" is not supported"
5023
msgstr ""
5024
5025
#: bzrlib/errors.py:513
5026
msgid "Device or resource busy: \"%(path)s\"%(extra)s"
5027
msgstr ""
5028
5029
#: bzrlib/errors.py:518
5030
msgid "Permission denied: \"%(path)s\"%(extra)s"
5031
msgstr ""
5032
5033
#: bzrlib/errors.py:523
5034
msgid "Invalid url supplied to transport: \"%(path)s\"%(extra)s"
5035
msgstr ""
5036
5037
#: bzrlib/errors.py:528
5038
msgid "Invalid URL join request: %(reason)s: %(base)r + %(join_args)r"
5039
msgstr ""
5040
5041
#: bzrlib/errors.py:539
5042
msgid "URLs differ by more than path: %(from_)r and %(to)r"
5043
msgstr ""
5044
5045
#: bzrlib/errors.py:561
5046
msgid "The %(type)s hook '%(hook)s' is unknown in this version of bzrlib."
5047
msgstr ""
5048
5049
#: bzrlib/errors.py:571
5050
msgid "Unsupported protocol for url \"%(path)s\"%(extra)s"
5051
msgstr ""
5052
5053
#: bzrlib/errors.py:579
5054
msgid ""
5055
"The branch '%(url)s'(%(format)s) is not a stackable format. You will need to "
5056
"upgrade the branch to permit branch stacking."
5057
msgstr ""
5058
5059
#: bzrlib/errors.py:590
5060
msgid "The branch '%(branch_url)s' cannot be stacked on '%(target_url)s'."
5061
msgstr ""
5062
5063
#: bzrlib/errors.py:600
5064
msgid ""
5065
"The repository '%(url)s'(%(format)s) is not a stackable format. You will "
5066
"need to upgrade the repository to permit branch stacking."
5067
msgstr ""
5068
5069
#: bzrlib/errors.py:611
5070
msgid "Error reading from %(path)r."
5071
msgstr ""
5072
5073
#: bzrlib/errors.py:630
5074
msgid "Path \"%(path)s\" is not a child of path \"%(base)s\"%(extra)s"
5075
msgstr ""
5076
5077
#: bzrlib/errors.py:646
5078
msgid "Path \"%(path)s\" is not unicode normalized"
5079
msgstr ""
5080
5081
#: bzrlib/errors.py:654
5082
msgid "Not a branch: \"%(path)s\"%(detail)s."
5083
msgstr ""
5084
5085
#: bzrlib/errors.py:696
5086
msgid "No submit branch available for branch \"%(path)s\""
5087
msgstr ""
5088
5089
#: bzrlib/errors.py:705
5090
msgid "A control directory already exists: \"%(path)s\"."
5091
msgstr ""
5092
5093
#: bzrlib/errors.py:710
5094
msgid "Already a branch: \"%(path)s\"."
5095
msgstr ""
5096
5097
#: bzrlib/errors.py:715
5098
msgid "Parent branch already exists: \"%(path)s\"."
5099
msgstr ""
5100
5101
#: bzrlib/errors.py:721
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:726
5108
msgid ""
5109
"\"%(function)s\" called on an AtomicFile after it was closed: \"%(path)s\""
5110
msgstr ""
5111
5112
#: bzrlib/errors.py:736
5113
msgid ""
5114
"Parent not accessible given base \"%(base)s\" and relative path \"%(path)s\""
5115
msgstr ""
5116
5117
#: bzrlib/errors.py:746
5118
msgid "No repository present: \"%(path)s\""
5119
msgstr ""
5120
5121
#: bzrlib/errors.py:753
5122
msgid ""
5123
"Unsupported branch format: %(format)s\n"
5124
"Please run 'bzr upgrade'"
5125
msgstr ""
5126
5127
#: bzrlib/errors.py:759
5128
msgid "Unknown %(kind)s format: %(format)r"
5129
msgstr ""
5130
5131
#: bzrlib/errors.py:768
5132
msgid "Format %(format)s is not compatible with .bzr version %(bzrdir)s."
5133
msgstr ""
5134
5135
#: bzrlib/errors.py:778
5136
msgid "Parse error on line %(lineno)d of %(format)s format: %(line)s"
5137
msgstr ""
5138
5139
#: bzrlib/errors.py:793
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:809
5148
msgid "Revision is not compatible with %(repo_format)s"
5149
msgstr ""
5150
5151
#: bzrlib/errors.py:819
5152
msgid "%(context_info)s%(path)s is already versioned."
5153
msgstr ""
5154
5155
#: bzrlib/errors.py:840
5156
msgid "%(context_info)s%(path)s is not versioned."
5157
msgstr ""
5158
5159
#: bzrlib/errors.py:861
5160
msgid "Path(s) are not versioned: %(paths_as_string)s"
5161
msgstr ""
5162
5163
#: bzrlib/errors.py:872
5164
msgid "Path(s) do not exist: %(paths_as_string)s%(extra)s"
5165
msgstr ""
5166
5167
#: bzrlib/errors.py:891
5168
msgid "Cannot operate on \"%(filename)s\" of unsupported kind \"%(kind)s\""
5169
msgstr ""
5170
5171
#: bzrlib/errors.py:899
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:910
5178
msgid "Cannot operate on \"%(filename)s\" because it is a control file"
5179
msgstr ""
5180
5181
#: bzrlib/errors.py:928
5182
msgid "The lock for '%(lock_description)s' is in use and cannot be broken."
5183
msgstr ""
5184
5185
#: bzrlib/errors.py:967
5186
msgid "Cannot lock %(lock)s: %(why)s"
5187
msgstr ""
5188
5189
#: bzrlib/errors.py:977
5190
msgid ""
5191
"A transaction related operation was attempted after the transaction finished."
5192
msgstr ""
5193
5194
#: bzrlib/errors.py:1004
5195
msgid "Cannot lock: transport is read only: %(transport)s"
5196
msgstr ""
5197
5198
#: bzrlib/errors.py:1012
5199
msgid "Could not acquire lock \"%(lock)s\": %(msg)s"
5200
msgstr ""
5201
5202
#: bzrlib/errors.py:1023
5203
msgid ""
5204
"Lock was broken while still open: %(lock)s - check storage consistency!"
5205
msgstr ""
5206
5207
#: bzrlib/errors.py:1034
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:1046
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:1059
5220
msgid "Lock not held: %(lock)s"
5221
msgstr ""
5222
5223
#: bzrlib/errors.py:1088
5224
msgid "No changes to commit"
5225
msgstr ""
5226
5227
#: bzrlib/errors.py:1093
5228
msgid ""
5229
"Selected-file commit of merges is not supported yet: files %(files_str)s"
5230
msgstr ""
5231
5232
#: bzrlib/errors.py:1103
5233
msgid ""
5234
"Excluding paths during commit is not supported by repository at "
5235
"%(repository)r."
5236
msgstr ""
5237
5238
#: bzrlib/errors.py:1112
5239
msgid ""
5240
"The specified commit message contains characters unsupported by the current "
5241
"encoding."
5242
msgstr ""
5243
5244
#: bzrlib/errors.py:1118
5245
msgid "Upgrade URL cannot work with readonly URLs."
5246
msgstr ""
5247
5248
#: bzrlib/errors.py:1123
5249
msgid "The branch format %(format)s is already at the most recent format."
5250
msgstr ""
5251
5252
#: bzrlib/errors.py:1146
5253
msgid "Option --change does not accept revision ranges"
5254
msgstr ""
5255
5256
#: bzrlib/errors.py:1151
5257
msgid "No namespace registered for string: %(spec)r"
5258
msgstr ""
5259
5260
#: bzrlib/errors.py:1170
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:1184
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:1195
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:1215
5279
msgid ""
5280
"Branches have no common ancestor, and no merge base revision was specified."
5281
msgstr ""
5282
5283
#: bzrlib/errors.py:1221
5284
msgid ""
5285
"Selected merge cannot perform reverse cherrypicks. Try merge3 or diff3."
5286
msgstr ""
5287
5288
#: bzrlib/errors.py:1227
5289
msgid "Revisions have no common ancestor: %(revision_a)s %(revision_b)s"
5290
msgstr ""
5291
5292
#: bzrlib/errors.py:1236
5293
msgid ""
5294
"Revisions are not derived from the same root: %(revision_a)s %(revision_b)s."
5295
msgstr ""
5296
5297
#: bzrlib/errors.py:1245
5298
msgid "Revision %(rev_id)s is not an ancestor of %(not_ancestor_id)s"
5299
msgstr ""
5300
5301
#: bzrlib/errors.py:1254
5302
msgid "Branch %(branch)s has no commits."
5303
msgstr ""
5304
5305
#: bzrlib/errors.py:1272
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:1284
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:1296
5318
msgid "Cannot pull --overwrite to a branch which is bound %(branch)s"
5319
msgstr ""
5320
5321
#: bzrlib/errors.py:1305
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:1317
5328
msgid "Error in processing weave: %(msg)s"
5329
msgstr ""
5330
5331
#: bzrlib/errors.py:1326
5332
msgid "Revision {%(revision_id)s} already present in %(weave)s"
5333
msgstr ""
5334
5335
#: bzrlib/errors.py:1337
5336
msgid "Revision {%(revision_id)s} not present in %(weave)s"
5337
msgstr ""
5338
5339
#: bzrlib/errors.py:1347
5340
msgid "Weave invariant violated: %(what)s"
5341
msgstr ""
5342
5343
#: bzrlib/errors.py:1356
5344
msgid "Parents are mismatched between two revisions. %(msg)s"
5345
msgstr ""
5346
5347
#: bzrlib/errors.py:1378
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:1390
5354
msgid "Versioned file error"
5355
msgstr ""
5356
5357
#: bzrlib/errors.py:1395
5358
msgid "Revision {%(revision_id)s} not present in \"%(file_id)s\"."
5359
msgstr ""
5360
5361
#: bzrlib/errors.py:1405
5362
msgid "Revision {%(revision_id)s} already present in \"%(file_id)s\"."
5363
msgstr ""
5364
5365
#: bzrlib/errors.py:1415
5366
msgid "Text did not match its checksum: %(msg)s"
5367
msgstr ""
5368
5369
#: bzrlib/errors.py:1541
5370
msgid "Export format %(format)r not supported"
5371
msgstr ""
5372
5373
#: bzrlib/errors.py:1550
5374
msgid "Transport error: %(msg)s %(orig_error)s"
5375
msgstr ""
5376
5377
#: bzrlib/errors.py:1576
5378
msgid "Generic bzr smart protocol error: %(details)s"
5379
msgstr ""
5380
5381
#: bzrlib/errors.py:1584
5382
msgid "Received bad protocol version marker: %(marker)r"
5383
msgstr ""
5384
5385
#: bzrlib/errors.py:1616
5386
msgid "Transport operation not possible: %(msg)s %(orig_error)s"
5387
msgstr ""
5388
5389
#: bzrlib/errors.py:1621
5390
msgid "Connection error: %(msg)s %(orig_error)s"
5391
msgstr ""
5392
5393
#: bzrlib/errors.py:1626
5394
msgid "%(msg)s %(host)s%(port)s%(orig_error)s"
5395
msgstr ""
5396
5397
#: bzrlib/errors.py:1647
5398
msgid "Connection closed: %(msg)s %(orig_error)s"
5399
msgstr ""
5400
5401
#: bzrlib/errors.py:1652
5402
msgid "Connection Timeout: %(msg)s%(orig_error)s"
5403
msgstr ""
5404
5405
#: bzrlib/errors.py:1657
5406
msgid "Invalid range access in %(path)s at %(offset)s: %(msg)s"
5407
msgstr ""
5408
5409
#: bzrlib/errors.py:1667
5410
msgid "Invalid http response for %(path)s: %(msg)s%(orig_error)s"
5411
msgstr ""
5412
5413
#: bzrlib/errors.py:1682
5414
msgid "Certificate error: %(error)s"
5415
msgstr ""
5416
5417
#: bzrlib/errors.py:1690
5418
msgid "Invalid http range %(range)r for %(path)s: %(msg)s"
5419
msgstr ""
5420
5421
#: bzrlib/errors.py:1704
5422
msgid "HTTP MIME Boundary missing for %(path)s: %(msg)s"
5423
msgstr ""
5424
5425
#: bzrlib/errors.py:1712
5426
msgid "Invalid http Content-type \"%(ctype)s\" for %(path)s: %(msg)s"
5427
msgstr ""
5428
5429
#: bzrlib/errors.py:1721
5430
msgid "%(source)s is%(permanently)s redirected to %(target)s"
5431
msgstr ""
5432
5433
#: bzrlib/errors.py:1735
5434
msgid "Too many redirections"
5435
msgstr ""
5436
5437
#: bzrlib/errors.py:1740
5438
msgid "Working tree has conflicts."
5439
msgstr ""
5440
5441
#: bzrlib/errors.py:1744
5442
msgid "Config file %(filename)s is not UTF-8 encoded\n"
5443
msgstr ""
5444
5445
#: bzrlib/errors.py:1753
5446
msgid ""
5447
"Error(s) parsing config file %(filename)s:\n"
5448
"%(errors)s"
5449
msgstr ""
5450
5451
#: bzrlib/errors.py:1763
5452
msgid ""
5453
"Bad value \"%(value)s\" for option \"%(name)s\".\n"
5454
"See ``bzr help %(name)s``"
5455
msgstr ""
5456
5457
#: bzrlib/errors.py:1773
5458
msgid "%(username)r does not seem to contain a reasonable email address"
5459
msgstr ""
5460
5461
#: bzrlib/errors.py:1782
5462
msgid "Failed to GPG sign data with command \"%(command_line)s\""
5463
msgstr ""
5464
5465
#: bzrlib/errors.py:1790
5466
msgid "Failed to verify GPG signature data with error \"%(error)s\""
5467
msgstr ""
5468
5469
#: bzrlib/errors.py:1798
5470
msgid "Unable to import library \"%(library)s\": %(error)s"
5471
msgstr ""
5472
5473
#: bzrlib/errors.py:1806
5474
msgid "python-gpgme is not installed, it is needed to verify signatures"
5475
msgstr ""
5476
5477
#: bzrlib/errors.py:1814
5478
msgid ""
5479
"The working tree for %(basedir)s has changed since the last commit, but "
5480
"weave merge requires that it be unchanged"
5481
msgstr ""
5482
5483
#: bzrlib/errors.py:1824
5484
msgid ""
5485
"Can't reprocess and show base, because reprocessing obscures the "
5486
"relationship of conflicting lines to the base"
5487
msgstr ""
5488
5489
#: bzrlib/errors.py:1830
5490
msgid "Cycle in graph %(graph)r"
5491
msgstr ""
5492
5493
#: bzrlib/errors.py:1858
5494
msgid "File %(filename)s is not conflicted."
5495
msgstr ""
5496
5497
#: bzrlib/errors.py:1880
5498
msgid "No bundle was found in \"%(filename)s\"."
5499
msgstr ""
5500
5501
#: bzrlib/errors.py:1889
5502
msgid "Unable to handle bundle version %(version)s: %(msg)s"
5503
msgstr ""
5504
5505
#: bzrlib/errors.py:1899
5506
msgid "Branch %(base)s is missing revision %(text_revision)s of %(file_id)s"
5507
msgstr ""
5508
5509
#: bzrlib/errors.py:1912
5510
msgid "File id {%(file_id)s} already exists in inventory as %(entry)s"
5511
msgstr ""
5512
5513
#: bzrlib/errors.py:1922
5514
msgid "Key %(key)s is already present in map"
5515
msgstr ""
5516
5517
#: bzrlib/errors.py:1927
5518
msgid "The prefix %(prefix)s is in the help search path twice."
5519
msgstr ""
5520
5521
#: bzrlib/errors.py:1937
5522
msgid ""
5523
"No final name for trans_id %(trans_id)r\n"
5524
"file-id: %(file_id)r\n"
5525
"root trans-id: %(root_trans_id)r\n"
5526
msgstr ""
5527
5528
#: bzrlib/errors.py:1969
5529
msgid "Attempt to reuse a transform that has already been applied."
5530
msgstr ""
5531
5532
#: bzrlib/errors.py:1974
5533
msgid "Moving the root directory is not supported at this time"
5534
msgstr ""
5535
5536
#: bzrlib/errors.py:1979
5537
msgid "Failed to rename %(from_path)s to %(to_path)s: %(why)s"
5538
msgstr ""
5539
5540
#: bzrlib/errors.py:1990
5541
msgid ""
5542
"Could not move %(from_path)s%(operator)s %(to_path)s%(_has_extra)s%(extra)s"
5543
msgstr ""
5544
5545
#: bzrlib/errors.py:2026
5546
msgid ""
5547
"Could not rename %(from_path)s%(operator)s %(to_path)s%(_has_extra)s%(extra)s"
5548
msgstr ""
5549
5550
#: bzrlib/errors.py:2056
5551
msgid "Unable to import paramiko (required for sftp support): %(error)s"
5552
msgstr ""
5553
5554
#: bzrlib/errors.py:2064
5555
msgid "Nothing to merge."
5556
msgstr ""
5557
5558
#: bzrlib/errors.py:2069
5559
msgid "Format %(format)s cannot be initialised by this version of bzr."
5560
msgstr ""
5561
5562
#: bzrlib/errors.py:2078
5563
msgid ""
5564
"Cannot convert from format %(from_format)s to format %(format)s. "
5565
"%(problem)s"
5566
msgstr ""
5567
5568
#: bzrlib/errors.py:2090
5569
msgid "Could not find an appropriate Differ for file \"%(path)s\""
5570
msgstr ""
5571
5572
#: bzrlib/errors.py:2098
5573
msgid "%(exe_name)s could not be found on this machine"
5574
msgstr ""
5575
5576
#: bzrlib/errors.py:2106
5577
msgid "Diff is not installed on this machine: %(msg)s"
5578
msgstr ""
5579
5580
#: bzrlib/errors.py:2114
5581
msgid "Diff3 is not installed on this machine."
5582
msgstr ""
5583
5584
#: bzrlib/errors.py:2120
5585
msgid "The content being inserted is already present."
5586
msgstr ""
5587
5588
#: bzrlib/errors.py:2125
5589
msgid ""
5590
"This tree contains left-over files from a failed operation.\n"
5591
" Please examine %(limbo_dir)s to see if it contains any files you wish "
5592
"to\n"
5593
" keep, and delete it when you are done."
5594
msgstr ""
5595
5596
#: bzrlib/errors.py:2136
5597
msgid ""
5598
"This tree contains left-over files from a failed operation.\n"
5599
" Please examine %(pending_deletion)s to see if it contains any files you\n"
5600
" wish to keep, and delete it when you are done."
5601
msgstr ""
5602
5603
#: bzrlib/errors.py:2146
5604
msgid ""
5605
"Unable to delete transform temporary directory %(limbo_dir)s.\n"
5606
" Please examine %(limbo_dir)s to see if it contains any files you wish "
5607
"to\n"
5608
" keep, and delete it when you are done."
5609
msgstr ""
5610
5611
#: bzrlib/errors.py:2157
5612
msgid ""
5613
"Unable to delete transform temporary directory %(pending_deletion)s. Please "
5614
"examine %(pending_deletion)s to see if it contains any files you wish to "
5615
"keep, and delete it when you are done."
5616
msgstr ""
5617
5618
#: bzrlib/errors.py:2167
5619
msgid "Working tree is out of date, please run 'bzr update'.%(more)s"
5620
msgstr ""
5621
5622
#: bzrlib/errors.py:2181
5623
msgid ""
5624
"Public branch \"%(public_location)s\" lacks revision \"%(revstring)s\"."
5625
msgstr ""
5626
5627
#: bzrlib/errors.py:2194
5628
msgid "Error in merge modified format"
5629
msgstr ""
5630
5631
#: bzrlib/errors.py:2199
5632
msgid "Format error in conflict listings"
5633
msgstr ""
5634
5635
#: bzrlib/errors.py:2203
5636
msgid ""
5637
"Inconsistency in dirstate file %(dirstate_path)s.\n"
5638
"Error: %(description)s"
5639
msgstr ""
5640
5641
#: bzrlib/errors.py:2214
5642
msgid ""
5643
"An error has been detected in the repository %(repo_path)s.\n"
5644
"Please run bzr reconcile on this repository."
5645
msgstr ""
5646
5647
#: bzrlib/errors.py:2225
5648
msgid ""
5649
"An inconsistent delta was supplied involving %(path)r, %(file_id)r\n"
5650
"reason: %(reason)s"
5651
msgstr ""
5652
5653
#: bzrlib/errors.py:2238
5654
msgid ""
5655
"An inconsistent delta was supplied: %(delta)r\n"
5656
"reason: %(reason)s"
5657
msgstr ""
5658
5659
#: bzrlib/errors.py:2250
5660
msgid "To use this feature you must upgrade your branch at %(path)s."
5661
msgstr ""
5662
5663
#: bzrlib/errors.py:2259
5664
msgid "To use this feature you must upgrade your repository at %(path)s."
5665
msgstr ""
5666
5667
#: bzrlib/errors.py:2264
5668
msgid ""
5669
"To use this feature you must upgrade your branch at %(path)s to a format "
5670
"which supports rich roots."
5671
msgstr ""
5672
5673
#: bzrlib/errors.py:2270
5674
msgid "Cannot perform local-only commits on unbound branches."
5675
msgstr ""
5676
5677
#: bzrlib/errors.py:2275
5678
msgid "The method %(mname)s is not supported on objects of type %(tname)s."
5679
msgstr ""
5680
5681
#: bzrlib/errors.py:2296
5682
msgid "Ghost tags not supported by format %(format)r."
5683
msgstr ""
5684
5685
#: bzrlib/errors.py:2304
5686
msgid "File is binary but should be text."
5687
msgstr ""
5688
5689
#: bzrlib/errors.py:2309
5690
msgid "The path %(path)s is not permitted on this platform"
5691
msgstr ""
5692
5693
#: bzrlib/errors.py:2318
5694
msgid ""
5695
"Testament did not match expected value.\n"
5696
" For revision_id {%(revision_id)s}, expected {%(expected)s}, measured\n"
5697
" {%(measured)s}"
5698
msgstr ""
5699
5700
#: bzrlib/errors.py:2330
5701
msgid "Not a bzr revision-bundle: %(text)r"
5702
msgstr ""
5703
5704
#: bzrlib/errors.py:2339
5705
msgid "Bad bzr revision-bundle: %(text)r"
5706
msgstr ""
5707
5708
#: bzrlib/errors.py:2348
5709
msgid "Malformed bzr revision-bundle header: %(text)r"
5710
msgstr ""
5711
5712
#: bzrlib/errors.py:2353
5713
msgid "Malformed patches in bzr revision-bundle: %(text)r"
5714
msgstr ""
5715
5716
#: bzrlib/errors.py:2358
5717
msgid "Malformed footer in bzr revision-bundle: %(text)r"
5718
msgstr ""
5719
5720
#: bzrlib/errors.py:2363
5721
msgid "End of line marker was not \\n in bzr revision-bundle"
5722
msgstr ""
5723
5724
#: bzrlib/errors.py:2373
5725
msgid "Bundle format %(bundle_format)s is incompatible with %(other)s"
5726
msgstr ""
5727
5728
#: bzrlib/errors.py:2383
5729
msgid "Root class for inventory serialization errors"
5730
msgstr ""
5731
5732
#: bzrlib/errors.py:2387
5733
msgid ""
5734
"The inventory was not in the expected format:\n"
5735
" %(msg)s"
5736
msgstr ""
5737
5738
#: bzrlib/errors.py:2396
5739
msgid "This operation requires rich root data storage"
5740
msgstr ""
5741
5742
#: bzrlib/errors.py:2409
5743
msgid "Unrecognised value for BZR_SSH environment variable: %(vendor)s"
5744
msgstr ""
5745
5746
#: bzrlib/errors.py:2418
5747
msgid ""
5748
"Don't know how to handle SSH connections. Please set BZR_SSH environment "
5749
"variable."
5750
msgstr ""
5751
5752
#: bzrlib/errors.py:2425
5753
msgid ""
5754
"Could not determine revno for {%(revision_id)s} because its ancestry shows a "
5755
"ghost at {%(ghost_revision_id)s}"
5756
msgstr ""
5757
5758
#: bzrlib/errors.py:2435
5759
msgid "Ghost revision {%(revision_id)s} cannot be used here."
5760
msgstr ""
5761
5762
#: bzrlib/errors.py:2486
5763
msgid ""
5764
"A merge directive must provide either a bundle or a public branch location."
5765
msgstr ""
5766
5767
#: bzrlib/errors.py:2493
5768
msgid "Bad merge directive payload %(start)r"
5769
msgstr ""
5770
5771
#: bzrlib/errors.py:2503
5772
msgid "Preview patch does not match requested changes."
5773
msgstr ""
5774
5775
#: bzrlib/errors.py:2509
5776
msgid "Patch_type was %(patch_type)s, but no patch was supplied."
5777
msgstr ""
5778
5779
#: bzrlib/errors.py:2519
5780
msgid ""
5781
"Your branch does not have all of the revisions required in order to merge "
5782
"this merge directive and the target location specified in the merge "
5783
"directive is not a branch: %(location)s."
5784
msgstr ""
5785
5786
#: bzrlib/errors.py:2531
5787
msgid "Unsupported entry kind %(kind)s"
5788
msgstr ""
5789
5790
#: bzrlib/errors.py:2539
5791
msgid "Can't subsume %(other_tree)s into %(tree)s. %(reason)s"
5792
msgstr ""
5793
5794
#: bzrlib/errors.py:2549
5795
msgid "Subsume target %(other_tree)s needs to be upgraded."
5796
msgstr ""
5797
5798
#: bzrlib/errors.py:2568
5799
msgid "No such tag: %(tag_name)s"
5800
msgstr ""
5801
5802
#: bzrlib/errors.py:2576
5803
msgid "Tags not supported by %(branch)s; you may be able to use bzr upgrade."
5804
msgstr ""
5805
5806
#: bzrlib/errors.py:2585
5807
msgid "Tag %(tag_name)s already exists."
5808
msgstr ""
5809
5810
#: bzrlib/errors.py:2593
5811
msgid ""
5812
"Did not understand bug identifier %(bug_id)s: %(reason)s. See \"bzr help "
5813
"bugs\" for more information on this feature."
5814
msgstr ""
5815
5816
#: bzrlib/errors.py:2603
5817
msgid ""
5818
"The URL for bug tracker \"%(abbreviation)s\" doesn't contain {id}: %(url)s"
5819
msgstr ""
5820
5821
#: bzrlib/errors.py:2613
5822
msgid ""
5823
"Cannot find registered bug tracker called %(abbreviation)s on %(branch)s"
5824
msgstr ""
5825
5826
#: bzrlib/errors.py:2623
5827
msgid "Invalid line in bugs property: '%(line)s'"
5828
msgstr ""
5829
5830
#: bzrlib/errors.py:2631
5831
msgid "Invalid bug status: '%(status)s'"
5832
msgstr ""
5833
5834
#: bzrlib/errors.py:2639
5835
msgid "Could not understand response from smart server: %(response_tuple)r"
5836
msgstr ""
5837
5838
#: bzrlib/errors.py:2678
5839
msgid "Server sent an unexpected error: %(error_tuple)r"
5840
msgstr ""
5841
5842
#: bzrlib/errors.py:2697
5843
msgid "Unrecognised container format: %(container_format)r"
5844
msgstr ""
5845
5846
#: bzrlib/errors.py:2705
5847
msgid "Unexpected end of container stream"
5848
msgstr ""
5849
5850
#: bzrlib/errors.py:2710
5851
msgid "Unknown record type: %(record_type)r"
5852
msgstr ""
5853
5854
#: bzrlib/errors.py:2718
5855
msgid "Invalid record: %(reason)s"
5856
msgstr ""
5857
5858
#: bzrlib/errors.py:2726
5859
msgid "Container has data after end marker: %(excess)r"
5860
msgstr ""
5861
5862
#: bzrlib/errors.py:2734
5863
msgid "Container has multiple records with the same name: %(name)s"
5864
msgstr ""
5865
5866
#: bzrlib/errors.py:2747
5867
msgid "Corrupt or incompatible data stream: %(reason)s"
5868
msgstr ""
5869
5870
#: bzrlib/errors.py:2755
5871
msgid "SMTP error: %(error)s"
5872
msgstr ""
5873
5874
#: bzrlib/errors.py:2763
5875
msgid "No message supplied."
5876
msgstr ""
5877
5878
#: bzrlib/errors.py:2768
5879
msgid "No mail-to address (--mail-to) or output (-o) specified."
5880
msgstr ""
5881
5882
#: bzrlib/errors.py:2773
5883
msgid "Unknown mail client: %(mail_client)s"
5884
msgstr ""
5885
5886
#: bzrlib/errors.py:2781
5887
msgid ""
5888
"Unable to find mail client with the following names: "
5889
"%(mail_command_list_string)s"
5890
msgstr ""
5891
5892
#: bzrlib/errors.py:2791
5893
msgid "SMTP connection to %(host)s refused"
5894
msgstr ""
5895
5896
#: bzrlib/errors.py:2800
5897
msgid "Please specify smtp_server. No server at default %(host)s."
5898
msgstr ""
5899
5900
#: bzrlib/errors.py:2814
5901
msgid ""
5902
"'%(display_url)s' is not in sync with %(target_url)s. See bzr help sync-for-"
5903
"reconfigure."
5904
msgstr ""
5905
5906
#: bzrlib/errors.py:2826
5907
msgid "'%(display_url)s' is already a branch."
5908
msgstr ""
5909
5910
#: bzrlib/errors.py:2831
5911
msgid "'%(display_url)s' is already a tree."
5912
msgstr ""
5913
5914
#: bzrlib/errors.py:2836
5915
msgid "'%(display_url)s' is already a checkout."
5916
msgstr ""
5917
5918
#: bzrlib/errors.py:2841
5919
msgid "'%(display_url)s' is already a lightweight checkout."
5920
msgstr ""
5921
5922
#: bzrlib/errors.py:2846
5923
msgid "'%(display_url)s' is already using a shared repository."
5924
msgstr ""
5925
5926
#: bzrlib/errors.py:2851
5927
msgid "'%(display_url)s' is already standalone."
5928
msgstr ""
5929
5930
#: bzrlib/errors.py:2856
5931
msgid "Shared repository '%(display_url)s' already creates working trees."
5932
msgstr ""
5933
5934
#: bzrlib/errors.py:2862
5935
msgid ""
5936
"Shared repository '%(display_url)s' already doesn't create working trees."
5937
msgstr ""
5938
5939
#: bzrlib/errors.py:2868
5940
msgid "Requested reconfiguration of '%(display_url)s' is not supported."
5941
msgstr ""
5942
5943
#: bzrlib/errors.py:2873
5944
msgid "No location could be found to bind to at %(display_url)s."
5945
msgstr ""
5946
5947
#: bzrlib/errors.py:2878
5948
msgid ""
5949
"Working tree \"%(display_url)s\" has uncommitted changes (See bzr "
5950
"status).%(more)s"
5951
msgstr ""
5952
5953
#: bzrlib/errors.py:2897
5954
msgid ""
5955
"Working tree \"%(display_url)s\" has shelved changes (See bzr shelve --"
5956
"list).%(more)s"
5957
msgstr ""
5958
5959
#: bzrlib/errors.py:2903
5960
msgid "Variable {%(name)s} is not available."
5961
msgstr ""
5962
5963
#: bzrlib/errors.py:2911
5964
msgid "No template specified."
5965
msgstr ""
5966
5967
#: bzrlib/errors.py:2916
5968
msgid "Unable to create symlink %(path_str)son this platform"
5969
msgstr ""
5970
5971
#: bzrlib/errors.py:2931
5972
msgid ""
5973
"Unsupported timezone format \"%(timezone)s\", options are \"utc\", "
5974
"\"original\", \"local\"."
5975
msgstr ""
5976
5977
#: bzrlib/errors.py:2965
5978
msgid ""
5979
"Unable to encode %(kind)s path %(path)r in user encoding %(user_encoding)s"
5980
msgstr ""
5981
5982
#: bzrlib/errors.py:2977
5983
msgid "The \"%(config_id)s\" configuration does not exist."
5984
msgstr ""
5985
5986
#: bzrlib/errors.py:2985
5987
msgid "The \"%(option_name)s\" configuration option does not exist."
5988
msgstr ""
5989
5990
#: bzrlib/errors.py:2993
5991
msgid "The alias \"%(alias_name)s\" does not exist."
5992
msgstr ""
5993
5994
#: bzrlib/errors.py:3007
5995
msgid "\"%(alias_name)s\" is not a valid location alias."
5996
msgstr ""
5997
5998
#: bzrlib/errors.py:3015
5999
msgid "No %(alias_name)s location assigned."
6000
msgstr ""
6001
6002
#: bzrlib/errors.py:3023
6003
msgid "Cannot bind address \"%(host)s:%(port)i\": %(orig_error)s."
6004
msgstr ""
6005
6006
#: bzrlib/errors.py:3033
6007
msgid "Unknown rules detected: %(unknowns_str)s."
6008
msgstr ""
6009
6010
#: bzrlib/errors.py:3044
6011
msgid "Tip change rejected: %(msg)s"
6012
msgstr ""
6013
6014
#: bzrlib/errors.py:3052
6015
msgid "Shelf corrupt."
6016
msgstr ""
6017
6018
#: bzrlib/errors.py:3057
6019
msgid "Corruption while decompressing repository file%(orig_error)s"
6020
msgstr ""
6021
6022
#: bzrlib/errors.py:3069
6023
msgid "No changes are shelved with id \"%(shelf_id)d\"."
6024
msgstr ""
6025
6026
#: bzrlib/errors.py:3077
6027
msgid "\"%(invalid_id)s\" is not a valid shelf id, try a number instead."
6028
msgstr ""
6029
6030
#: bzrlib/errors.py:3085
6031
msgid ""
6032
"An attempt to access a url outside the server jail was made: '%(url)s'."
6033
msgstr ""
6034
6035
#: bzrlib/errors.py:3093
6036
msgid "The user aborted the operation."
6037
msgstr ""
6038
6039
#: bzrlib/errors.py:3098
6040
msgid "Branching '%(url)s'(%(format)s) must create a working tree."
6041
msgstr ""
6042
6043
#: bzrlib/errors.py:3108
6044
msgid "No such view: %(view_name)s."
6045
msgstr ""
6046
6047
#: bzrlib/errors.py:3118
6048
msgid ""
6049
"Views are not supported by %(tree)s; use 'bzr upgrade' to change your tree "
6050
"to a later format."
6051
msgstr ""
6052
6053
#: bzrlib/errors.py:3127
6054
msgid ""
6055
"Specified file \"%(file_name)s\" is outside the current view: %(view_str)s"
6056
msgstr ""
6057
6058
#: bzrlib/errors.py:3194
6059
msgid "%(bzrdir)r does not support co-located branches."
6060
msgstr ""
6061
6062
#: bzrlib/errors.py:3200
6063
msgid ""
6064
"Unable to determine your name.\n"
6065
"Please, set your name with the 'whoami' command.\n"
6066
"E.g. bzr whoami \"Your Name <name@example.com>\""
6067
msgstr ""
6068
6069
#: bzrlib/errors.py:3209
6070
msgid "Invalid pattern(s) found. %(msg)s"
6071
msgstr ""
6072
6073
#: bzrlib/errors.py:3217
6074
msgid ""
6075
"Branch \"%(branch_url)s\" appears to be bound to itself. Please use `bzr "
6076
"unbind` to fix."
6077
msgstr ""
6078
6079
#: bzrlib/errors.py:3228
6080
msgid "Loop involving %(refs)r while expanding \"%(string)s\"."
6081
msgstr ""
6082
6083
#: bzrlib/errors.py:3237
6084
msgid "Option %(name)s is not defined while expanding \"%(string)s\"."
6085
msgstr ""
6086
6087
#: bzrlib/errors.py:3246
6088
msgid ""
6089
"No compatible object available for operations from %(source)r to %(target)r."
6090
msgstr ""
6091
6092
#: bzrlib/errors.py:3256
6093
msgid ""
6094
"VFS requests over the smart server are not allowed. Encountered: %(method)s, "
6095
"%(arguments)s."
6096
msgstr ""
6097
6098
#: bzrlib/errors.py:3266
6099
msgid ""
6100
"Kind change from %(from_kind)s to %(to_kind)s for %(path)s not supported by "
6101
"format %(format)r"
6102
msgstr ""
6103
6104
#: bzrlib/errors.py:3278
6105
msgid ""
6106
"Missing feature %(feature)s not provided by this version of Bazaar or any "
6107
"plugin."
6108
msgstr ""
6109
6110
#: bzrlib/errors.py:3291
6111
msgid "Binary files section encountered."
6112
msgstr ""
6113
6114
#: bzrlib/errors.py:3299
6115
msgid ""
6116
"Malformed patch header. %(desc)s\n"
6117
"%(line)r"
6118
msgstr ""
6119
6120
#: bzrlib/errors.py:3308
6121
msgid ""
6122
"Malformed hunk header. %(desc)s\n"
6123
"%(line)r"
6124
msgstr ""
6125
6126
#: bzrlib/errors.py:3317
6127
msgid ""
6128
"Malformed line. %(desc)s\n"
6129
"%(line)r"
6130
msgstr ""
6131
6132
#: bzrlib/errors.py:3327
6133
msgid ""
6134
"Text contents mismatch at line %(line_no)d. Original has \"%(orig_line)s\", "
6135
"but patch says it should be \"%(patch_line)s\""
6136
msgstr ""
6137
6138
#: bzrlib/errors.py:3338
6139
msgid "The feature %(feature)s has already been registered."
6140
msgstr ""
6141
6142
#: bzrlib/export_pot.py:252
6143
#, python-format
6144
msgid "Exporting messages from builtin command: %s"
6145
msgstr ""
6146
6147
#: bzrlib/export_pot.py:271
6148
msgid "Exporting messages from plugin command: {0} in {1}"
6149
msgstr ""
6150
6151
#: bzrlib/export_pot.py:292
6152
#, python-format
6153
msgid "Exporting message from error: %s"
6154
msgstr ""
6155
6156
#: bzrlib/fetch.py:98
6157
msgid "Finding revisions"
6158
msgstr ""
6159
6160
#: bzrlib/fetch.py:103
6161
msgid "Fetching revisions"
6162
msgstr ""
6163
6164
#: bzrlib/foreign.py:262
6165
msgid "Push into a different VCS without any custom bzr metadata."
6166
msgstr ""
6167
6168
#: bzrlib/foreign.py:264
6169
msgid ""
6170
"This will afterwards rebase the local branch on the remote\n"
6171
"branch unless the --no-rebase option is used, in which case \n"
6172
"the two branches will be out of sync after the push. "
6173
msgstr ""
6174
6175
#: bzrlib/foreign.py:277
6176
msgid "Do not rebase after push."
6177
msgstr ""
6178
6179
#: bzrlib/foreign.py:311
6180
#, python-format
6181
msgid "Using saved location: %s\n"
6182
msgstr ""
6183
6184
#: bzrlib/foreign.py:321
6185
msgid ""
6186
"{0!r} and {1!r} are in the same VCS, lossy push not necessary. Please use "
6187
"regular push."
6188
msgstr ""
6189
6190
#: bzrlib/gpg.py:119 bzrlib/gpg.py:460
6191
msgid "{0} commits with valid signatures"
6192
msgstr ""
6193
6194
#: bzrlib/gpg.py:123 bzrlib/gpg.py:465
6195
msgid "{0} commit with unknown key"
6196
msgid_plural "{0} commits with unknown keys"
6197
msgstr[0] ""
6198
msgstr[1] ""
6199
6200
#: bzrlib/gpg.py:129 bzrlib/gpg.py:472
6201
msgid "{0} commit not valid"
6202
msgid_plural "{0} commits not valid"
6203
msgstr[0] ""
6204
msgstr[1] ""
6205
6206
#: bzrlib/gpg.py:135 bzrlib/gpg.py:479
6207
msgid "{0} commit not signed"
6208
msgid_plural "{0} commits not signed"
6209
msgstr[0] ""
6210
msgstr[1] ""
6211
6212
#: bzrlib/gpg.py:141 bzrlib/gpg.py:486
6213
msgid "{0} commit with key now expired"
6214
msgid_plural "{0} commits with key now expired"
6215
msgstr[0] ""
6216
msgstr[1] ""
6217
6218
#: bzrlib/gpg.py:343
6219
msgid "No GnuPG key results for pattern: {0}"
6220
msgstr ""
6221
6222
#: bzrlib/gpg.py:386
6223
msgid "{0} signed {1} commit"
6224
msgid_plural "{0} signed {1} commits"
6225
msgstr[0] ""
6226
msgstr[1] ""
6227
6228
#: bzrlib/gpg.py:403 bzrlib/gpg.py:419
6229
msgid "{0} commit by author {1}"
6230
msgid_plural "{0} commits by author {1}"
6231
msgstr[0] ""
6232
msgstr[1] ""
6233
6234
#: bzrlib/gpg.py:433
6235
msgid "Unknown key {0} signed {1} commit"
6236
msgid_plural "Unknown key {0} signed {1} commits"
6237
msgstr[0] ""
6238
msgstr[1] ""
6239
6240
#: bzrlib/gpg.py:452
6241
msgid "{0} commit by author {1} with key {2} now expired"
6242
msgid_plural "{0} commits by author {1} with key {2} now expired"
6243
msgstr[0] ""
6244
msgstr[1] ""
6245
6246
#: bzrlib/groupcompress.py:1739
6247
#, python-format
6248
msgid "Insert claimed random_id=True, but then inserted %r two times"
6249
msgstr ""
6250
6251
#: bzrlib/hooks.py:331
6252
#, python-format
6253
msgid "Introduced in: %s"
6254
msgstr ""
6255
6256
#: bzrlib/hooks.py:334
6257
#, python-format
6258
msgid "Deprecated in: %s"
6259
msgstr ""
6260
6261
#: bzrlib/knit.py:1766 bzrlib/knit.py:1802
6262
msgid "Walking content"
6263
msgstr ""
6264
6265
#: bzrlib/knit.py:3330
6266
msgid "annotating"
6267
msgstr ""
6268
6269
#: bzrlib/lock.py:548
6270
msgid "{0!r} was {1} locked again"
6271
msgstr ""
6272
6273
#: bzrlib/lockdir.py:321
6274
#, python-format
6275
msgid "error removing pending lock: %s"
6276
msgstr ""
6277
6278
#: bzrlib/lockdir.py:616
6279
msgid "Unable to obtain"
6280
msgstr ""
6281
6282
#: bzrlib/lockdir.py:618
6283
msgid "Lock owner changed for"
6284
msgstr ""
6285
6286
#: bzrlib/lockdir.py:620
6287
msgid "{0} lock {1} {2}."
6288
msgstr ""
6289
6290
#: bzrlib/lockdir.py:627
6291
#, python-format
6292
msgid "Will continue to try until %s, unless you press Ctrl-C."
6293
msgstr ""
6294
6295
#: bzrlib/lockdir.py:629
6296
msgid "See \"bzr help break-lock\" for more."
6297
msgstr ""
6298
6299
#: bzrlib/lockdir.py:739
6300
#, python-format
6301
msgid ""
6302
"held by %(user)s on %(hostname)s (process #%(pid)s), acquired %(time_ago)s"
6303
msgstr ""
6304
6305
#: bzrlib/log.py:572
6306
msgid "--exclude-common-ancestry requires two different revisions"
6307
msgstr ""
6308
6309
#: bzrlib/log.py:574
6310
#, python-format
6311
msgid "invalid direction %r"
6312
msgstr ""
6313
6314
#: bzrlib/log.py:662
6315
msgid "Start revision not found in history of end revision."
6316
msgstr ""
6317
6318
#: bzrlib/log.py:1080 bzrlib/log.py:1138
6319
msgid "Logging revision 0 is invalid."
6320
msgstr ""
6321
6322
#: bzrlib/log.py:1082 bzrlib/log.py:1140
6323
msgid "Start revision must be older than the end revision."
6324
msgstr ""
6325
6326
#: bzrlib/log.py:1827
6327
#, python-format
6328
msgid "unknown log formatter: %r"
6329
msgstr ""
6330
6331
#: bzrlib/log.py:2123
6332
msgid "fixes bug"
6333
msgid_plural "fixes bugs"
6334
msgstr[0] ""
6335
msgstr[1] ""
6336
6337
#: bzrlib/merge.py:689
6338
msgid "All changes applied successfully."
6339
msgstr ""
6340
6341
#: bzrlib/merge.py:691
6342
#, python-format
6343
msgid "%d conflicts encountered."
6344
msgstr ""
6345
6346
#: bzrlib/merge.py:845 bzrlib/merge.py:1933
6347
msgid "Preparing file merge"
6348
msgstr ""
6349
6350
#: bzrlib/multiparent.py:426
6351
msgid "Importing revisions"
6352
msgstr ""
6353
6354
#: bzrlib/option.py:526
6355
msgid "Show help message."
6356
msgstr ""
6357
6358
#: bzrlib/option.py:528
6359
msgid "Only display errors and warnings."
6360
msgstr ""
6361
6362
#: bzrlib/option.py:531
6363
msgid "Show usage message and options."
6364
msgstr ""
6365
6366
#: bzrlib/option.py:533
6367
msgid "Display more information."
6368
msgstr ""
6369
6370
#: bzrlib/option.py:541
6371
msgid ""
6372
"Select changes introduced by the specified revision. See also \"help "
6373
"revisionspec\"."
6374
msgstr ""
6375
6376
#: bzrlib/option.py:543
6377
msgid "Branch to operate on, instead of working directory."
6378
msgstr ""
6379
6380
#: bzrlib/option.py:545
6381
msgid "Detailed log format."
6382
msgstr ""
6383
6384
#: bzrlib/option.py:545
6385
msgid "Format used by GNU ChangeLog files."
6386
msgstr ""
6387
6388
#: bzrlib/option.py:545
6389
msgid "Log format with one line per revision."
6390
msgstr ""
6391
6392
#: bzrlib/option.py:545
6393
msgid "Moderately short log format."
6394
msgstr ""
6395
6396
#: bzrlib/option.py:545
6397
msgid "Use specified log format."
6398
msgstr ""
6399
6400
#: bzrlib/option.py:547
6401
msgid "Log format"
6402
msgstr ""
6403
6404
#: bzrlib/option.py:549
6405
msgid "LCA-newness merge."
6406
msgstr ""
6407
6408
#: bzrlib/option.py:549
6409
msgid "Merge using external diff3."
6410
msgstr ""
6411
6412
#: bzrlib/option.py:549
6413
msgid "Native diff3-style merge."
6414
msgstr ""
6415
6416
#: bzrlib/option.py:549
6417
msgid "Select a particular merge algorithm."
6418
msgstr ""
6419
6420
#: bzrlib/option.py:549
6421
msgid "Weave-based merge."
6422
msgstr ""
6423
6424
#: bzrlib/option.py:551
6425
msgid "Merge algorithm"
6426
msgstr ""
6427
6428
#: bzrlib/option.py:554
6429
msgid "Message string."
6430
msgstr ""
6431
6432
#: bzrlib/option.py:556
6433
msgid "Use an ASCII NUL (\\0) separator rather than a newline."
6434
msgstr ""
6435
6436
#: bzrlib/option.py:558
6437
msgid "Ignore differences between branches and overwrite unconditionally."
6438
msgstr ""
6439
6440
#: bzrlib/option.py:560
6441
msgid "Remember the specified location as a default."
6442
msgstr ""
6443
6444
#: bzrlib/option.py:562
6445
msgid "Reprocess to reduce spurious conflicts."
6446
msgstr ""
6447
6448
#: bzrlib/option.py:566
6449
msgid "See \"help revisionspec\" for details."
6450
msgstr ""
6451
6452
#: bzrlib/option.py:568
6453
msgid "Show internal object ids."
6454
msgstr ""
6455
6456
#: bzrlib/option.py:571
6457
msgid "Display timezone as local, original, or utc."
6458
msgstr ""
6459
6460
#: bzrlib/osutils.py:100
6461
msgid "Parameter {0!r} encoding is unsupported by {1} application locale."
6462
msgstr ""
6463
6464
#: bzrlib/osutils.py:220
6465
msgid "lstat/stat of ({0!r}): {1!r}"
6466
msgstr ""
6467
6468
#: bzrlib/osutils.py:1008 bzrlib/osutils.py:1019
6469
#, python-format
6470
msgid "sorry, %r not allowed in path"
6471
msgstr ""
6472
6473
#: bzrlib/osutils.py:1237
6474
#, python-format
6475
msgid "%r is too short to calculate a relative path"
6476
msgstr ""
6477
6478
#: bzrlib/plugin.py:143
6479
#, python-format
6480
msgid "\"%s\" is not a valid <plugin_name>@<plugin_path> description "
6481
msgstr ""
6482
6483
#: bzrlib/plugins/bash_completion/bashcomp.py:411
6484
msgid "Enable completions for the selected plugin (default: all plugins)"
6485
msgstr ""
6486
6487
#: bzrlib/plugins/bash_completion/bashcomp.py:412
6488
msgid "Generate a shell function for bash command line completion."
6489
msgstr ""
6490
6491
#: bzrlib/plugins/bash_completion/bashcomp.py:414
6492
msgid ""
6493
"This command generates a shell function which can be used by bash to\n"
6494
"automatically complete the currently typed command when the user presses\n"
6495
"the completion key (usually tab)."
6496
msgstr ""
6497
6498
#: bzrlib/plugins/bash_completion/bashcomp.py:418
6499
msgid ""
6500
"Commonly used like this:\n"
6501
" eval \"`bzr bash-completion`\""
6502
msgstr ""
6503
6504
#: bzrlib/plugins/bash_completion/bashcomp.py:424
6505
msgid "Name of the generated function (default: _bzr)"
6506
msgstr ""
6507
6508
#: bzrlib/plugins/bash_completion/bashcomp.py:426
6509
msgid "Generate only the shell function, don't enable it"
6510
msgstr ""
6511
6512
#: bzrlib/plugins/launchpad/__init__.py:81
6513
msgid "Register a branch with launchpad.net."
6514
msgstr ""
6515
6516
#: bzrlib/plugins/launchpad/__init__.py:83
6517
msgid ""
6518
"This command lists a bzr branch in the directory of branches on\n"
6519
"launchpad.net. Registration allows the branch to be associated with\n"
6520
"bugs or specifications."
6521
msgstr ""
6522
6523
#: bzrlib/plugins/launchpad/__init__.py:87
6524
msgid ""
6525
"Before using this command you must register the project to which the\n"
6526
"branch belongs, and create an account for yourself on launchpad.net."
6527
msgstr ""
6528
6529
#: bzrlib/plugins/launchpad/__init__.py:90
6530
msgid ""
6531
"arguments:\n"
6532
" public_url: The publicly visible url for the branch to register.\n"
6533
" This must be an http or https url (which Launchpad can read\n"
6534
" from to access the branch). Local file urls, SFTP urls, and\n"
6535
" bzr+ssh urls will not work.\n"
6536
" If no public_url is provided, bzr will use the configured\n"
6537
" public_url if there is one for the current branch, and\n"
6538
" otherwise error."
6539
msgstr ""
6540
6541
#: bzrlib/plugins/launchpad/__init__.py:99
6542
msgid ""
6543
"example:\n"
6544
" bzr register-branch http://foo.com/bzr/fooproject.mine \\\n"
6545
" --project fooproject"
6546
msgstr ""
6547
6548
#: bzrlib/plugins/launchpad/__init__.py:106
6549
msgid "Launchpad project short name to associate with the branch."
6550
msgstr ""
6551
6552
#: bzrlib/plugins/launchpad/__init__.py:113
6553
msgid ""
6554
"Short name for the branch; by default taken from the last component of the "
6555
"url."
6556
msgstr ""
6557
6558
#: bzrlib/plugins/launchpad/__init__.py:117
6559
msgid "One-sentence description of the branch."
6560
msgstr ""
6561
6562
#: bzrlib/plugins/launchpad/__init__.py:120
6563
msgid "Longer description of the purpose or contents of the branch."
6564
msgstr ""
6565
6566
#: bzrlib/plugins/launchpad/__init__.py:123
6567
msgid "Branch author's email address, if not yourself."
6568
msgstr ""
6569
6570
#: bzrlib/plugins/launchpad/__init__.py:126
6571
msgid "The bug this branch fixes."
6572
msgstr ""
6573
6574
#: bzrlib/plugins/launchpad/__init__.py:129
6575
msgid "Prepare the request but don't actually send it."
6576
msgstr ""
6577
6578
#: bzrlib/plugins/launchpad/__init__.py:151
6579
msgid ""
6580
"register-branch requires a public branch url - see bzr help register-branch."
6581
msgstr ""
6582
6583
#: bzrlib/plugins/launchpad/__init__.py:159
6584
msgid "--product is deprecated; please use --project."
6585
msgstr ""
6586
6587
#: bzrlib/plugins/launchpad/__init__.py:191
6588
msgid "Open a Launchpad branch page in your web browser."
6589
msgstr ""
6590
6591
#: bzrlib/plugins/launchpad/__init__.py:196
6592
msgid "Do not actually open the browser. Just say the URL we would use."
6593
msgstr ""
6594
6595
#: bzrlib/plugins/launchpad/__init__.py:231
6596
#, python-format
6597
msgid "Opening %s in web browser"
6598
msgstr ""
6599
6600
#: bzrlib/plugins/launchpad/__init__.py:241
6601
msgid "Show or set the Launchpad user ID."
6602
msgstr ""
6603
6604
#: bzrlib/plugins/launchpad/__init__.py:243
6605
msgid ""
6606
"When communicating with Launchpad, some commands need to know your\n"
6607
"Launchpad user ID. This command can be used to set or show the\n"
6608
"user ID that Bazaar will use for such communication."
6609
msgstr ""
6610
6611
#: bzrlib/plugins/launchpad/__init__.py:247
6612
msgid ""
6613
":Examples:\n"
6614
" Show the Launchpad ID of the current user::"
6615
msgstr ""
6616
6617
#: bzrlib/plugins/launchpad/__init__.py:250
6618
msgid " bzr launchpad-login"
6619
msgstr ""
6620
6621
#: bzrlib/plugins/launchpad/__init__.py:252
6622
msgid " Set the Launchpad ID of the current user to 'bob'::"
6623
msgstr ""
6624
6625
#: bzrlib/plugins/launchpad/__init__.py:254
6626
msgid " bzr launchpad-login bob"
6627
msgstr ""
6628
6629
#: bzrlib/plugins/launchpad/__init__.py:261
6630
msgid "Don't check that the user name is valid."
6631
msgstr ""
6632
6633
#: bzrlib/plugins/launchpad/__init__.py:276
6634
#: bzrlib/plugins/launchpad/__init__.py:287
6635
msgid "Launchpad user ID exists and has SSH keys.\n"
6636
msgstr ""
6637
6638
#: bzrlib/plugins/launchpad/__init__.py:279
6639
msgid "No Launchpad user ID configured.\n"
6640
msgstr ""
6641
6642
#: bzrlib/plugins/launchpad/__init__.py:290
6643
#, python-format
6644
msgid "Launchpad user ID set to '%s'.\n"
6645
msgstr ""
6646
6647
#: bzrlib/plugins/launchpad/__init__.py:298
6648
msgid "Ask Launchpad to mirror a branch now."
6649
msgstr ""
6650
6651
#: bzrlib/plugins/launchpad/__init__.py:318
6652
msgid "Propose merging a branch on Launchpad."
6653
msgstr ""
6654
6655
#: bzrlib/plugins/launchpad/__init__.py:320
6656
msgid ""
6657
"This will open your usual editor to provide the initial comment. When it\n"
6658
"has created the proposal, it will open it in your default web browser."
6659
msgstr ""
6660
6661
#: bzrlib/plugins/launchpad/__init__.py:323
6662
msgid ""
6663
"The branch will be proposed to merge into SUBMIT_BRANCH. If SUBMIT_BRANCH\n"
6664
"is not supplied, the remembered submit branch will be used. If no submit\n"
6665
"branch is remembered, the development focus will be used."
6666
msgstr ""
6667
6668
#: bzrlib/plugins/launchpad/__init__.py:327
6669
msgid ""
6670
"By default, the SUBMIT_BRANCH's review team will be requested to review\n"
6671
"the merge proposal. This can be overriden by specifying --review (-R).\n"
6672
"The parameter the launchpad account name of the desired reviewer. This\n"
6673
"may optionally be followed by '=' and the review type. For example:"
6674
msgstr ""
6675
6676
#: bzrlib/plugins/launchpad/__init__.py:332
6677
msgid " bzr lp-propose-merge --review jrandom --review review-team=qa"
6678
msgstr ""
6679
6680
#: bzrlib/plugins/launchpad/__init__.py:334
6681
msgid ""
6682
"This will propose a merge, request \"jrandom\" to perform a review of\n"
6683
"unspecified type, and request \"review-team\" to perform a \"qa\" review."
6684
msgstr ""
6685
6686
#: bzrlib/plugins/launchpad/__init__.py:339
6687
msgid "Propose the merge on staging."
6688
msgstr ""
6689
6690
#: bzrlib/plugins/launchpad/__init__.py:341
6691
msgid "Commit message."
6692
msgstr ""
6693
6694
#: bzrlib/plugins/launchpad/__init__.py:343
6695
msgid "Mark the proposal as approved immediately."
6696
msgstr ""
6697
6698
#: bzrlib/plugins/launchpad/__init__.py:345
6699
msgid "Requested reviewer and optional type."
6700
msgstr ""
6701
6702
#: bzrlib/plugins/launchpad/__init__.py:382
6703
msgid "Find the proposal to merge this revision."
6704
msgstr ""
6705
6706
#: bzrlib/plugins/launchpad/__init__.py:384
6707
msgid ""
6708
"Finds the merge proposal(s) that discussed landing the specified revision.\n"
6709
"This works only if the selected branch was the merge proposal target, and\n"
6710
"if the merged_revno is recorded for the merge proposal. The proposal(s)\n"
6711
"are opened in a web browser."
6712
msgstr ""
6713
6714
#: bzrlib/plugins/launchpad/__init__.py:389
6715
msgid ""
6716
"Any revision involved in the merge may be specified-- the revision in\n"
6717
"which the merge was performed, or one of the revisions that was merged."
6718
msgstr ""
6719
6720
#: bzrlib/plugins/launchpad/__init__.py:392
6721
msgid "So, to find the merge proposal that reviewed line 1 of README::"
6722
msgstr ""
6723
6724
#: bzrlib/plugins/launchpad/__init__.py:394
6725
msgid " bzr lp-find-proposal -r annotate:README:1"
6726
msgstr ""
6727
6728
#: bzrlib/plugins/launchpad/__init__.py:409
6729
msgid "No review found."
6730
msgstr ""
6731
6732
#: bzrlib/plugins/launchpad/__init__.py:410
6733
#, python-format
6734
msgid "%d proposals(s) found."
6735
msgstr ""
6736
6737
#: bzrlib/plugins/launchpad/__init__.py:420
6738
msgid "Finding revision-id"
6739
msgstr ""
6740
6741
#: bzrlib/plugins/launchpad/__init__.py:427
6742
msgid "Finding merge"
6743
msgstr ""
6744
6745
#: bzrlib/plugins/launchpad/__init__.py:432
6746
msgid "Finding revno"
6747
msgstr ""
6748
6749
#: bzrlib/plugins/launchpad/__init__.py:437
6750
msgid "Finding Launchpad branch"
6751
msgstr ""
6752
6753
#: bzrlib/plugins/launchpad/__init__.py:440
6754
msgid "Finding proposals"
6755
msgstr ""
6756
6757
#: bzrlib/plugins/launchpad/account.py:66
6758
msgid "Setting ssh/sftp usernames for launchpad.net."
6759
msgstr ""
6760
6761
#: bzrlib/plugins/launchpad/lp_api.py:241
6762
#: bzrlib/plugins/launchpad/lp_api.py:246
6763
#, python-format
6764
msgid "%s is not registered on Launchpad"
6765
msgstr ""
6766
6767
#: bzrlib/plugins/launchpad/lp_api.py:256
6768
#, python-format
6769
msgid "%s has no development focus."
6770
msgstr ""
6771
6772
#: bzrlib/plugins/launchpad/lp_api.py:261
6773
#, python-format
6774
msgid "development focus %s has no branch."
6775
msgstr ""
6776
6777
#: bzrlib/plugins/launchpad/lp_api.py:266
6778
#, python-format
6779
msgid "source package %s has no branch."
6780
msgstr ""
6781
6782
#: bzrlib/plugins/launchpad/lp_api.py:270
6783
#, python-format
6784
msgid "%s has no associated product or source package."
6785
msgstr ""
6786
6787
#: bzrlib/plugins/launchpad/lp_api.py:282
6788
#, python-format
6789
msgid "%s is already up-to-date."
6790
msgstr ""
6791
6792
#: bzrlib/plugins/launchpad/lp_api.py:289
6793
#, python-format
6794
msgid "Pushing to %s"
6795
msgstr ""
6796
6797
#: bzrlib/plugins/launchpad/lp_directory.py:170
6798
msgid ""
6799
"resolution for {0}\n"
6800
" local: {1}\n"
6801
" remote: {2}"
6802
msgstr ""
6803
6804
#: bzrlib/plugins/launchpad/lp_propose.py:149
6805
#, python-format
6806
msgid "There is already a branch merge proposal: %s"
6807
msgstr ""
6808
6809
#: bzrlib/plugins/weave_fmt/bzrdir.py:236
6810
msgid "pb parameter to convert() is deprecated"
6811
msgstr ""
6812
6813
#: bzrlib/plugins/weave_fmt/bzrdir.py:239
6814
msgid "starting upgrade from format 4 to 5"
6815
msgstr ""
6816
6817
#: bzrlib/plugins/weave_fmt/bzrdir.py:249
6818
msgid "note: upgrade may be faster if all store files are ungzipped first"
6819
msgstr ""
6820
6821
#: bzrlib/plugins/weave_fmt/bzrdir.py:278
6822
msgid "converting revision"
6823
msgstr ""
6824
6825
#: bzrlib/plugins/weave_fmt/bzrdir.py:283
6826
msgid "upgraded to weaves:"
6827
msgstr ""
6828
6829
#: bzrlib/plugins/weave_fmt/bzrdir.py:284
6830
#, python-format
6831
msgid "%6d revisions and inventories"
6832
msgstr ""
6833
6834
#: bzrlib/plugins/weave_fmt/bzrdir.py:286
6835
#, python-format
6836
msgid "%6d revisions not present"
6837
msgstr ""
6838
6839
#: bzrlib/plugins/weave_fmt/bzrdir.py:288
6840
#, python-format
6841
msgid "%6d texts"
6842
msgstr ""
6843
6844
#: bzrlib/plugins/weave_fmt/bzrdir.py:324
6845
msgid "writing weave"
6846
msgstr ""
6847
6848
#: bzrlib/plugins/weave_fmt/bzrdir.py:328
6849
#: bzrlib/plugins/weave_fmt/bzrdir.py:330
6850
msgid "inventory"
6851
msgstr ""
6852
6853
#: bzrlib/plugins/weave_fmt/bzrdir.py:347
6854
msgid "write revision"
6855
msgstr ""
6856
6857
#: bzrlib/plugins/weave_fmt/bzrdir.py:361
6858
msgid "loading revision"
6859
msgstr ""
6860
6861
#: bzrlib/plugins/weave_fmt/bzrdir.py:366
6862
#, python-format
6863
msgid "revision {%s} not present in branch; will be converted as a ghost"
6864
msgstr ""
6865
6866
#: bzrlib/plugins/weave_fmt/bzrdir.py:506
6867
msgid "starting upgrade from format 5 to 6"
6868
msgstr ""
6869
6870
#: bzrlib/plugins/weave_fmt/bzrdir.py:516
6871
#, python-format
6872
msgid "adding prefixes to %s"
6873
msgstr ""
6874
6875
#: bzrlib/plugins/weave_fmt/bzrdir.py:556
6876
msgid "starting upgrade from format 6 to metadir"
6877
msgstr ""
6878
6879
#: bzrlib/plugins/weave_fmt/bzrdir.py:564
6880
msgid "Removing ancestry.weave"
6881
msgstr ""
6882
6883
#: bzrlib/plugins/weave_fmt/bzrdir.py:569
6884
msgid "Finding branch files"
6885
msgstr ""
6886
6887
#: bzrlib/plugins/weave_fmt/bzrdir.py:579
6888
msgid "Upgrading repository"
6889
msgstr ""
6890
6891
#: bzrlib/plugins/weave_fmt/bzrdir.py:589
6892
msgid "Upgrading branch"
6893
msgstr ""
6894
6895
#: bzrlib/plugins/weave_fmt/bzrdir.py:612
6896
msgid "No working tree."
6897
msgstr ""
6898
6899
#: bzrlib/plugins/weave_fmt/bzrdir.py:619
6900
msgid "Upgrading working tree"
6901
msgstr ""
6902
6903
#: bzrlib/plugins/weave_fmt/bzrdir.py:640
6904
#, python-format
6905
msgid "Make %s lock"
6906
msgstr ""
6907
6908
#: bzrlib/plugins/weave_fmt/bzrdir.py:651
6909
#, python-format
6910
msgid "Moving %s"
6911
msgstr ""
6912
6913
#: bzrlib/push.py:56
6914
msgid "Created new branch."
6915
msgstr ""
6916
6917
#: bzrlib/push.py:97
6918
#, python-format
6919
msgid ""
6920
"Target directory %s already contains a .bzr directory, but it is not valid."
6921
msgstr ""
6922
6923
#: bzrlib/push.py:101
6924
#, python-format
6925
msgid ""
6926
"Target directory %s already exists, but does not have a .bzr directory. "
6927
"Supply --use-existing-dir to push there anyway."
6928
msgstr ""
6929
6930
#: bzrlib/push.py:122
6931
#, python-format
6932
msgid "Too many redirections trying to make %s."
6933
msgstr ""
6934
6935
#: bzrlib/push.py:147
6936
msgid ""
6937
"These branches have diverged. See \"bzr help diverged-branches\" for more "
6938
"information."
6939
msgstr ""
6940
6941
#: bzrlib/push.py:151
6942
#, python-format
6943
msgid ""
6944
"It is not possible to losslessly push to %s. You may want to use dpush "
6945
"instead."
6946
msgstr ""
6947
6948
#: bzrlib/push.py:157
6949
#, python-format
6950
msgid ""
6951
"At %s you have a valid .bzr control directory, but not a branch or "
6952
"repository. This is an unsupported configuration. Please move the target "
6953
"directory out of the way and try again."
6954
msgstr ""
6955
6956
#: bzrlib/reconcile.py:97
6957
#, python-format
6958
msgid "Reconciling branch %s"
6959
msgstr ""
6960
6961
#: bzrlib/reconcile.py:103
6962
#, python-format
6963
msgid "Reconciling repository %s"
6964
msgstr ""
6965
6966
#: bzrlib/reconcile.py:105
6967
msgid "Reconciling repository"
6968
msgstr ""
6969
6970
#: bzrlib/reconcile.py:111
6971
#, python-format
6972
msgid "%s cannot canonicalize CHKs."
6973
msgstr ""
6974
6975
#: bzrlib/reconcile.py:119
6976
msgid "Reconcile aborted: revision index has inconsistent parents."
6977
msgstr ""
6978
6979
#: bzrlib/reconcile.py:121
6980
msgid "Run \"bzr check\" for more details."
6981
msgstr ""
6982
6983
#: bzrlib/reconcile.py:123
6984
msgid "Reconciliation complete."
6985
msgstr ""
6986
6987
#: bzrlib/reconcile.py:166
6988
msgid "Fixing last revision info {0} => {1}"
6989
msgstr ""
6990
6991
#: bzrlib/reconcile.py:173
6992
msgid "revision_history ok."
6993
msgstr ""
6994
6995
#: bzrlib/reconcile.py:234
6996
msgid "Reading inventory data"
6997
msgstr ""
6998
6999
#: bzrlib/reconcile.py:254 bzrlib/reconcile.py:384
7000
msgid "Inventory ok."
7001
msgstr ""
7002
7003
#: bzrlib/reconcile.py:256 bzrlib/reconcile.py:386
7004
msgid "Backing up inventory"
7005
msgstr ""
7006
7007
#: bzrlib/reconcile.py:258
7008
msgid "Backup inventory created."
7009
msgstr ""
7010
7011
#: bzrlib/reconcile.py:274 bzrlib/reconcile.py:405
7012
msgid "Writing weave"
7013
msgstr ""
7014
7015
#: bzrlib/reconcile.py:277 bzrlib/reconcile.py:408
7016
msgid "Inventory regenerated."
7017
msgstr ""
7018
7019
#: bzrlib/reconcile.py:371 bzrlib/reconcile.py:373 bzrlib/reconcile.py:376
7020
msgid "Reading indexes"
7021
msgstr ""
7022
7023
#: bzrlib/reconcile.py:380 bzrlib/reconcile.py:382
7024
msgid "Checking unused inventories"
7025
msgstr ""
7026
7027
#: bzrlib/reconcile.py:388
7028
msgid "Backup Inventory created"
7029
msgstr ""
7030
7031
#: bzrlib/reconcile.py:446
7032
msgid "Fixing text parents"
7033
msgstr ""
7034
7035
#: bzrlib/reconfigure.py:54
7036
msgid "{0} is now stacked on {1}\n"
7037
msgstr ""
7038
7039
#: bzrlib/reconfigure.py:69
7040
#, python-format
7041
msgid "%s is now not stacked\n"
7042
msgstr ""
7043
7044
#: bzrlib/remote.py:1228 bzrlib/repository.py:289
7045
#, python-format
7046
msgid "bzr: ERROR (ignored): %s"
7047
msgstr ""
7048
7049
#: bzrlib/remote.py:2541
7050
msgid "Copying repository content as tarball..."
7051
msgstr ""
7052
7053
#: bzrlib/rename_map.py:69
7054
msgid "Calculating hashes"
7055
msgstr ""
7056
7057
#: bzrlib/rename_map.py:107
7058
msgid "Determining hash hits"
7059
msgstr ""
7060
7061
#: bzrlib/rename_map.py:242
7062
msgid "{0} => {1}"
7063
msgstr ""
7064
7065
#: bzrlib/repository.py:1787
7066
msgid "Moving repository to repository.backup"
7067
msgstr ""
7068
7069
#: bzrlib/repository.py:1794
7070
msgid "Creating new repository"
7071
msgstr ""
7072
7073
#: bzrlib/repository.py:1799
7074
msgid "Copying content"
7075
msgstr ""
7076
7077
#: bzrlib/repository.py:1803
7078
msgid "Deleting old repository content"
7079
msgstr ""
7080
7081
#: bzrlib/repository.py:1805
7082
msgid "repository converted"
7083
msgstr ""
7084
7085
#: bzrlib/revisionspec.py:903
7086
msgid "Using {0} {1}"
7087
msgstr ""
7088
7089
#: bzrlib/send.py:58
7090
#, python-format
7091
msgid "Mail client \"%s\" does not support specifying body"
7092
msgstr ""
7093
7094
#: bzrlib/send.py:62
7095
msgid "--remember requires a branch to be specified."
7096
msgstr ""
7097
7098
#: bzrlib/send.py:77
7099
msgid "No submit branch known or specified"
7100
msgstr ""
7101
7102
#: bzrlib/send.py:80
7103
msgid "Using saved {0} location \"{1}\" to determine what changes to submit."
7104
msgstr ""
7105
7106
#: bzrlib/send.py:98
7107
#, python-format
7108
msgid "No such send format '%s'."
7109
msgstr ""
7110
7111
#: bzrlib/send.py:114
7112
msgid "bzr send takes at most two one revision identifiers"
7113
msgstr ""
7114
7115
#: bzrlib/send.py:127
7116
msgid "No revisions to submit."
7117
msgstr ""
7118
7119
#: bzrlib/send.py:139
7120
msgid ""
7121
"- not supported for merge directives that use more than one output file."
7122
msgstr ""
7123
7124
#: bzrlib/send.py:185
7125
msgid "Format 0.9 does not permit bundle with no patch"
7126
msgstr ""
7127
7128
#: bzrlib/shelf_ui.py:46
7129
#, python-format
7130
msgid "Shelve adding file \"%(path)s\"?"
7131
msgstr ""
7132
7133
#: bzrlib/shelf_ui.py:47
7134
msgid "Shelve binary changes?"
7135
msgstr ""
7136
7137
#: bzrlib/shelf_ui.py:48
7138
msgid "Shelve changing \"%s\" from %(other)s to %(this)s?"
7139
msgstr ""
7140
7141
#: bzrlib/shelf_ui.py:50
7142
#, python-format
7143
msgid "Shelve removing file \"%(path)s\"?"
7144
msgstr ""
7145
7146
#: bzrlib/shelf_ui.py:51
7147
#, python-format
7148
msgid "Shelve %d change(s)?"
7149
msgstr ""
7150
7151
#: bzrlib/shelf_ui.py:52
7152
msgid "Shelve?"
7153
msgstr ""
7154
7155
#: bzrlib/shelf_ui.py:53
7156
#, python-format
7157
msgid ""
7158
"Shelve changing target of \"%(path)s\" from \"%(other)s\" to \"%(this)s\"?"
7159
msgstr ""
7160
7161
#: bzrlib/shelf_ui.py:55
7162
#, python-format
7163
msgid "Shelve renaming \"%(other)s\" => \"%(this)s\"?"
7164
msgstr ""
7165
7166
#: bzrlib/shelf_ui.py:70
7167
#, python-format
7168
msgid "Changes shelved with id \"%d\"."
7169
msgstr ""
7170
7171
#: bzrlib/shelf_ui.py:74
7172
msgid "Selected changes destroyed."
7173
msgstr ""
7174
7175
#: bzrlib/shelf_ui.py:78
7176
msgid "Selected changes:"
7177
msgstr ""
7178
7179
#: bzrlib/shelf_ui.py:98
7180
#, python-format
7181
msgid "Delete file \"%(path)s\"?"
7182
msgstr ""
7183
7184
#: bzrlib/shelf_ui.py:99
7185
msgid "Apply binary changes?"
7186
msgstr ""
7187
7188
#: bzrlib/shelf_ui.py:100
7189
#, python-format
7190
msgid "Change \"%(path)s\" from %(this)s to %(other)s?"
7191
msgstr ""
7192
7193
#: bzrlib/shelf_ui.py:102
7194
#, python-format
7195
msgid "Add file \"%(path)s\"?"
7196
msgstr ""
7197
7198
#: bzrlib/shelf_ui.py:103
7199
#, python-format
7200
msgid "Apply %d change(s)?"
7201
msgstr ""
7202
7203
#: bzrlib/shelf_ui.py:104
7204
msgid "Apply change?"
7205
msgstr ""
7206
7207
#: bzrlib/shelf_ui.py:105
7208
#, python-format
7209
msgid "Change target of \"%(path)s\" from \"%(this)s\" to \"%(other)s\"?"
7210
msgstr ""
7211
7212
#: bzrlib/shelf_ui.py:107
7213
#, python-format
7214
msgid "Rename \"%(this)s\" => \"%(other)s\"?"
7215
msgstr ""
7216
7217
#: bzrlib/shelf_ui.py:402
7218
msgid "No changes are shelved."
7219
msgstr ""
7220
7221
#: bzrlib/shelf_ui.py:460
7222
#, python-format
7223
msgid "Using changes with id \"%d\"."
7224
msgstr ""
7225
7226
#: bzrlib/shelf_ui.py:464
7227
#, python-format
7228
msgid "Message: %s"
7229
msgstr ""
7230
7231
#: bzrlib/shelf_ui.py:476
7232
#, python-format
7233
msgid "Deleted changes with id \"%d\"."
7234
msgstr ""
7235
7236
#: bzrlib/smart/medium.py:714
7237
msgid "HPSS calls: {0} ({1} vfs) {2}"
7238
msgstr ""
7239
7240
#: bzrlib/smart/server.py:169
7241
msgid "Requested to stop gracefully"
7242
msgstr ""
7243
7244
#: bzrlib/smart/server.py:179
7245
#, python-format
7246
msgid "Waiting for %d client(s) to finish"
7247
msgstr ""
7248
7249
#: bzrlib/smart/server.py:185
7250
#, python-format
7251
msgid "Still waiting for %d client(s) to finish"
7252
msgstr ""
7253
7254
#: bzrlib/smart/server.py:219
7255
#, python-format
7256
msgid "listening socket error: %s"
7257
msgstr ""
7258
7259
#: bzrlib/smart/server.py:452
7260
#, python-format
7261
msgid "listening on port: %s"
7262
msgstr ""
7263
7264
#: bzrlib/switch.py:73
7265
msgid "Pending merges must be committed or reverted before using switch."
7266
msgstr ""
7267
7268
#: bzrlib/switch.py:100
7269
msgid ""
7270
"Cannot switch as local commits found in the checkout. Commit these to the "
7271
"bound branch or use --force to throw them away."
7272
msgstr ""
7273
7274
#: bzrlib/switch.py:105
7275
#, python-format
7276
msgid ""
7277
"Unable to connect to current master branch %(target)s: %(error)s To switch "
7278
"anyway, use --force."
7279
msgstr ""
7280
7281
#: bzrlib/switch.py:125
7282
msgid "Cannot switch a branch, only a checkout."
7283
msgstr ""
7284
7285
#: bzrlib/switch.py:163
7286
#, python-format
7287
msgid "Tree is up to date at revision %d."
7288
msgstr ""
7289
7290
#: bzrlib/switch.py:169
7291
#, python-format
7292
msgid "Updated to revision %d."
7293
msgstr ""
7294
7295
#: bzrlib/transform.py:1734 bzrlib/transform.py:1745 bzrlib/transform.py:1747
7296
msgid "Apply phase"
7297
msgstr ""
7298
7299
#: bzrlib/transform.py:1773 bzrlib/transform.py:1841
7300
msgid "removing file"
7301
msgstr ""
7302
7303
#: bzrlib/transform.py:1791 bzrlib/transform.py:1876
7304
msgid "adding file"
7305
msgstr ""
7306
7307
#: bzrlib/transform.py:2591
7308
msgid "Building tree"
7309
msgstr ""
7310
7311
#: bzrlib/transform.py:2681 bzrlib/transform.py:2708
7312
msgid "Adding file contents"
7313
msgstr ""
7314
7315
#: bzrlib/transform.py:3028
7316
msgid "Resolution pass"
7317
msgstr ""
7318
7319
#: bzrlib/transport/ftp/_gssapi.py:88
7320
#, python-format
7321
msgid "Authenticated as %s"
7322
msgstr ""
7323
7324
#: bzrlib/tree.py:634
7325
msgid "*** {0} content-filter: {1} => {2!r}"
7326
msgstr ""
7327
7328
#: bzrlib/upgrade.py:77
7329
#, python-format
7330
msgid "This is a checkout. The branch (%s) needs to be upgraded separately."
7331
msgstr ""
7332
7333
#: bzrlib/upgrade.py:100
7334
#, python-format
7335
msgid "cannot upgrade from bzrdir format %s"
7336
msgstr ""
7337
7338
#: bzrlib/upgrade.py:103
7339
#, python-format
7340
msgid "starting upgrade of %s"
7341
msgstr ""
7342
7343
#: bzrlib/upgrade.py:110
7344
msgid "finished"
7345
msgstr ""
7346
7347
#: bzrlib/upgrade.py:120
7348
msgid "Deleting backup.bzr"
7349
msgstr ""
7350
7351
#: bzrlib/upgrade.py:151
7352
msgid ""
7353
"\n"
7354
"SUMMARY: {0} upgrades attempted, {1} succeeded, {2} failed"
7355
msgstr ""
7356
7357
#: bzrlib/upgrade.py:208
7358
#, python-format
7359
msgid "Found %d dependent branches - upgrading ..."
7360
msgstr ""
7361
7362
#: bzrlib/upgrade.py:276
7363
msgid "Upgrading bzrdirs"
7364
msgstr ""
7365
7366
#: bzrlib/upgrade.py:282
7367
#, python-format
7368
msgid "Upgrading %s"
7369
msgstr ""
7370
7371
#: bzrlib/upgrade.py:283
7372
msgid "Upgrading {0} {1} ..."
7373
msgstr ""
7374
7375
#: bzrlib/upgrade.py:301
7376
msgid "Removing backup ..."
7377
msgstr ""
7378
7379
#: bzrlib/upgrade.py:305
7380
msgid "failed to clean-up {0}: {1}"
7381
msgstr ""
7382
7383
#: bzrlib/vf_repository.py:1090
7384
msgid "inventories"
7385
msgstr ""
7386
7387
#: bzrlib/vf_repository.py:1116
7388
msgid "texts"
7389
msgstr ""
7390
7391
#: bzrlib/vf_repository.py:1621 bzrlib/vf_repository.py:1630
7392
msgid "Calculating text parents"
7393
msgstr ""
7394
7395
#: bzrlib/vf_repository.py:1706
7396
msgid "Fetch texts"
7397
msgstr ""
7398
7399
#: bzrlib/vf_repository.py:2535
7400
msgid "loading text store"
7401
msgstr ""
7402
7403
#: bzrlib/vf_repository.py:2541
7404
msgid "checking text graph"
7405
msgstr ""
7406
7407
#: bzrlib/vf_repository.py:2995 bzrlib/vf_repository.py:3009
7408
#: bzrlib/vf_repository.py:3124
7409
msgid "Transferring revisions"
7410
msgstr ""
7411
7412
#: bzrlib/win32utils.py:146
7413
msgid "Failed to GetProcessMemoryInfo()"
7414
msgstr ""
7415
7416
#: bzrlib/win32utils.py:167
7417
msgid "Cannot debug memory on win32 without ctypes or win32process"
7418
msgstr ""
7419
7420
#: bzrlib/win32utils.py:172
7421
msgid "WorkingSize {0:>7}KiB\tPeakWorking {1:>7}KiB\t{2}"
7422
msgstr ""
7423
7424
#: bzrlib/win32utils.py:180
7425
#, python-format
7426
msgid "WorkingSize %8d KiB"
7427
msgstr ""
7428
7429
#: bzrlib/win32utils.py:181
7430
#, python-format
7431
msgid "PeakWorking %8d KiB"
7432
msgstr ""
7433
7434
#: bzrlib/win32utils.py:182
7435
#, python-format
7436
msgid "PagefileUsage %8d KiB"
7437
msgstr ""
7438
7439
#: bzrlib/win32utils.py:183
7440
#, python-format
7441
msgid "PeakPagefileUsage %8d KiB"
7442
msgstr ""
7443
7444
#: bzrlib/win32utils.py:185
7445
#, python-format
7446
msgid "PrivateUsage %8d KiB"
7447
msgstr ""
7448
7449
#: bzrlib/win32utils.py:186
7450
#, python-format
7451
msgid "PageFaultCount %8d"
7452
msgstr ""
7453
7454
#: bzrlib/workingtree.py:1478
7455
msgid "Rerun update after fixing the conflicts."
7456
msgstr ""
7457
7458
#: dummy/help_topics/authentication/summary.txt:1
7459
msgid "Information on configuring authentication"
7460
msgstr ""
7461
7462
#: dummy/help_topics/basic/detail.txt:1
7463
msgid ""
7464
"Bazaar 2.5b6 -- a free distributed version-control tool\n"
7465
"http://bazaar.canonical.com/"
7466
msgstr ""
7467
7468
#: dummy/help_topics/basic/detail.txt:4
7469
msgid ""
7470
"Basic commands:\n"
7471
" bzr init makes this directory a versioned branch\n"
7472
" bzr branch make a copy of another branch"
7473
msgstr ""
7474
7475
#: dummy/help_topics/basic/detail.txt:8
7476
msgid ""
7477
" bzr add make files or directories versioned\n"
7478
" bzr ignore ignore a file or pattern\n"
7479
" bzr mv move or rename a versioned file"
7480
msgstr ""
7481
7482
#: dummy/help_topics/basic/detail.txt:12
7483
msgid ""
7484
" bzr status summarize changes in working copy\n"
7485
" bzr diff show detailed diffs"
7486
msgstr ""
7487
7488
#: dummy/help_topics/basic/detail.txt:15
7489
msgid ""
7490
" bzr merge pull in changes from another branch\n"
7491
" bzr commit save some or all changes\n"
7492
" bzr send send changes via email"
7493
msgstr ""
7494
7495
#: dummy/help_topics/basic/detail.txt:19
7496
msgid ""
7497
" bzr log show history of changes\n"
7498
" bzr check validate storage"
7499
msgstr ""
7500
7501
#: dummy/help_topics/basic/detail.txt:22
7502
msgid ""
7503
" bzr help init more help on e.g. init command\n"
7504
" bzr help commands list all commands\n"
7505
" bzr help topics list all help topics\n"
7506
msgstr ""
7507
7508
#: dummy/help_topics/basic/summary.txt:1
7509
msgid "Basic commands"
7510
msgstr ""
7511
7512
#: dummy/help_topics/branches/detail.txt:1
7513
msgid "Branches"
7514
msgstr ""
7515
7516
#: dummy/help_topics/branches/detail.txt:3
7517
msgid ""
7518
"A branch consists of the state of a project, including all of its\n"
7519
"history. All branches have a repository associated (which is where the\n"
7520
"branch history is stored), but multiple branches may share the same\n"
7521
"repository (a shared repository). Branches can be copied and merged."
7522
msgstr ""
7523
7524
#: dummy/help_topics/branches/detail.txt:8
7525
msgid ""
7526
"In addition, one branch may be bound to another one. Binding to another\n"
7527
"branch indicates that commits which happen in this branch must also \n"
7528
"happen in the other branch. Bazaar ensures consistency by not allowing \n"
7529
"commits when the two branches are out of date. In order for a commit \n"
7530
"to succeed, it may be necessary to update the current branch using \n"
7531
"``bzr update``."
7532
msgstr ""
7533
7534
#: dummy/help_topics/branches/detail.txt:15
7535
#: dummy/help_topics/checkouts/detail.txt:66
7536
#: dummy/help_topics/repositories/detail.txt:36
7537
msgid "Related commands::"
7538
msgstr ""
7539
7540
#: dummy/help_topics/branches/detail.txt:17
7541
msgid ""
7542
" init Change a directory into a versioned branch.\n"
7543
" branch Create a new branch that is a copy of an existing branch.\n"
7544
" merge Perform a three-way merge.\n"
7545
" bind Bind a branch to another one.\n"
7546
msgstr ""
7547
7548
#: dummy/help_topics/branches/summary.txt:1
7549
msgid "Information on what a branch is"
7550
msgstr ""
7551
7552
#: dummy/help_topics/bugs/summary.txt:1
7553
msgid "Bug tracker settings"
7554
msgstr ""
7555
7556
#: dummy/help_topics/checkouts/detail.txt:1
7557
msgid "Checkouts"
7558
msgstr ""
7559
7560
#: dummy/help_topics/checkouts/detail.txt:3
7561
msgid ""
7562
"Checkouts are source trees that are connected to a branch, so that when\n"
7563
"you commit in the source tree, the commit goes into that branch. They\n"
7564
"allow you to use a simpler, more centralized workflow, ignoring some of\n"
7565
"Bazaar's decentralized features until you want them. Using checkouts\n"
7566
"with shared repositories is very similar to working with SVN or CVS, but\n"
7567
"doesn't have the same restrictions. And using checkouts still allows\n"
7568
"others working on the project to use whatever workflow they like."
7569
msgstr ""
7570
7571
#: dummy/help_topics/checkouts/detail.txt:11
7572
msgid ""
7573
"A checkout is created with the bzr checkout command (see \"help "
7574
"checkout\").\n"
7575
"You pass it a reference to another branch, and it will create a local copy\n"
7576
"for you that still contains a reference to the branch you created the\n"
7577
"checkout from (the master branch). Then if you make any commits they will "
7578
"be\n"
7579
"made on the other branch first. This creates an instant mirror of your work, "
7580
"or\n"
7581
"facilitates lockstep development, where each developer is working together,\n"
7582
"continuously integrating the changes of others."
7583
msgstr ""
7584
7585
#: dummy/help_topics/checkouts/detail.txt:19
7586
msgid ""
7587
"However the checkout is still a first class branch in Bazaar terms, so that\n"
7588
"you have the full history locally. As you have a first class branch you "
7589
"can\n"
7590
"also commit locally if you want, for instance due to the temporary loss af "
7591
"a\n"
7592
"network connection. Use the --local option to commit to do this. All the "
7593
"local\n"
7594
"commits will then be made on the master branch the next time you do a non-"
7595
"local\n"
7596
"commit."
7597
msgstr ""
7598
7599
#: dummy/help_topics/checkouts/detail.txt:26
7600
msgid ""
7601
"If you are using a checkout from a shared branch you will periodically want "
7602
"to\n"
7603
"pull in all the changes made by others. This is done using the \"update\"\n"
7604
"command. The changes need to be applied before any non-local commit, but\n"
7605
"Bazaar will tell you if there are any changes and suggest that you use this\n"
7606
"command when needed."
7607
msgstr ""
7608
7609
#: dummy/help_topics/checkouts/detail.txt:32
7610
msgid ""
7611
"It is also possible to create a \"lightweight\" checkout by passing the\n"
7612
"--lightweight flag to checkout. A lightweight checkout is even closer to an\n"
7613
"SVN checkout in that it is not a first class branch, it mainly consists of "
7614
"the\n"
7615
"working tree. This means that any history operations must query the master\n"
7616
"branch, which could be slow if a network connection is involved. Also, as "
7617
"you\n"
7618
"don't have a local branch, then you cannot commit locally."
7619
msgstr ""
7620
7621
#: dummy/help_topics/checkouts/detail.txt:39
7622
msgid ""
7623
"Lightweight checkouts work best when you have fast reliable access to the\n"
7624
"master branch. This means that if the master branch is on the same disk or "
7625
"LAN\n"
7626
"a lightweight checkout will be faster than a heavyweight one for any "
7627
"commands\n"
7628
"that modify the revision history (as only one copy of the branch needs to\n"
7629
"be updated). Heavyweight checkouts will generally be faster for any command\n"
7630
"that uses the history but does not change it, but if the master branch is "
7631
"on\n"
7632
"the same disk then there won't be a noticeable difference."
7633
msgstr ""
7634
7635
#: dummy/help_topics/checkouts/detail.txt:47
7636
msgid ""
7637
"Another possible use for a checkout is to use it with a treeless repository\n"
7638
"containing your branches, where you maintain only one working tree by\n"
7639
"switching the master branch that the checkout points to when you want to\n"
7640
"work on a different branch."
7641
msgstr ""
7642
7643
#: dummy/help_topics/checkouts/detail.txt:52
7644
msgid ""
7645
"Obviously to commit on a checkout you need to be able to write to the "
7646
"master\n"
7647
"branch. This means that the master branch must be accessible over a "
7648
"writeable\n"
7649
"protocol , such as sftp://, and that you have write permissions at the "
7650
"other\n"
7651
"end. Checkouts also work on the local file system, so that all that matters "
7652
"is\n"
7653
"file permissions."
7654
msgstr ""
7655
7656
#: dummy/help_topics/checkouts/detail.txt:58
7657
msgid ""
7658
"You can change the master of a checkout by using the \"switch\" command "
7659
"(see\n"
7660
"\"help switch\"). This will change the location that the commits are sent "
7661
"to.\n"
7662
"The \"bind\" command can also be used to turn a normal branch into a heavy\n"
7663
"checkout. If you would like to convert your heavy checkout into a normal\n"
7664
"branch so that every commit is local, you can use the \"unbind\" command. To "
7665
"see\n"
7666
"whether or not a branch is bound or not you can use the \"info\" command. If "
7667
"the\n"
7668
"branch is bound it will tell you the location of the bound branch."
7669
msgstr ""
7670
7671
#: dummy/help_topics/checkouts/detail.txt:68
7672
msgid ""
7673
" checkout Create a checkout. Pass --lightweight to get a lightweight\n"
7674
" checkout\n"
7675
" update Pull any changes in the master branch in to your checkout\n"
7676
" commit Make a commit that is sent to the master branch. If you have\n"
7677
" a heavy checkout then the --local option will commit to the\n"
7678
" checkout without sending the commit to the master\n"
7679
" switch Change the master branch that the commits in the checkout "
7680
"will\n"
7681
" be sent to\n"
7682
" bind Turn a standalone branch into a heavy checkout so that any\n"
7683
" commits will be sent to the master branch\n"
7684
" unbind Turn a heavy checkout into a standalone branch so that any\n"
7685
" commits are only made locally\n"
7686
" info Displays whether a branch is bound or unbound. If the branch "
7687
"is\n"
7688
" bound, then it will also display the location of the bound "
7689
"branch\n"
7690
msgstr ""
7691
7692
#: dummy/help_topics/checkouts/summary.txt:1
7693
msgid "Information on what a checkout is"
7694
msgstr ""
7695
7696
#: dummy/help_topics/commands/summary.txt:1
7697
msgid "Basic help for all commands"
7698
msgstr ""
7699
7700
#: dummy/help_topics/configuration/summary.txt:1
7701
msgid "Details on the configuration settings available"
7702
msgstr ""
7703
7704
#: dummy/help_topics/conflict-types/summary.txt:1
7705
msgid "Types of conflicts and what to do about them"
7706
msgstr ""
7707
7708
#: dummy/help_topics/content-filters/summary.txt:1
7709
msgid "Conversion of content into/from working trees"
7710
msgstr ""
7711
7712
#: dummy/help_topics/criss-cross/detail.txt:1
7713
msgid "Criss-Cross"
7714
msgstr ""
7715
7716
#: dummy/help_topics/criss-cross/detail.txt:3
7717
msgid ""
7718
"A criss-cross in the branch history can cause the default merge technique\n"
7719
"to emit more conflicts than would normally be expected."
7720
msgstr ""
7721
7722
#: dummy/help_topics/criss-cross/detail.txt:6
7723
msgid ""
7724
"In complex merge cases, ``bzr merge --lca`` or ``bzr merge --weave`` may "
7725
"give\n"
7726
"better results. You may wish to ``bzr revert`` the working tree and merge\n"
7727
"again. Alternatively, use ``bzr remerge`` on particular conflicted files."
7728
msgstr ""
7729
7730
#: dummy/help_topics/criss-cross/detail.txt:10
7731
msgid ""
7732
"Criss-crosses occur in a branch's history if two branches merge the same "
7733
"thing\n"
7734
"and then merge one another, or if two branches merge one another at the "
7735
"same\n"
7736
"time. They can be avoided by having each branch only merge from or into a\n"
7737
"designated central branch (a \"star topology\")."
7738
msgstr ""
7739
7740
#: dummy/help_topics/criss-cross/detail.txt:15
7741
msgid ""
7742
"Criss-crosses cause problems because of the way merge works. Bazaar's "
7743
"default\n"
7744
"merge is a three-way merger; in order to merge OTHER into THIS, it must\n"
7745
"find a basis for comparison, BASE. Using BASE, it can determine whether\n"
7746
"differences between THIS and OTHER are due to one side adding lines, or\n"
7747
"from another side removing lines."
7748
msgstr ""
7749
7750
#: dummy/help_topics/criss-cross/detail.txt:21
7751
msgid ""
7752
"Criss-crosses mean there is no good choice for a base. Selecting the "
7753
"recent\n"
7754
"merge points could cause one side's changes to be silently discarded.\n"
7755
"Selecting older merge points (which Bazaar does) mean that extra conflicts\n"
7756
"are emitted."
7757
msgstr ""
7758
7759
#: dummy/help_topics/criss-cross/detail.txt:26
7760
msgid ""
7761
"The ``weave`` merge type is not affected by this problem because it uses\n"
7762
"line-origin detection instead of a basis revision to determine the cause of\n"
7763
"differences.\n"
7764
msgstr ""
7765
7766
#: dummy/help_topics/criss-cross/summary.txt:1
7767
msgid "Information on criss-cross merging"
7768
msgstr ""
7769
7770
#: dummy/help_topics/current-formats/summary.txt:1
7771
msgid "Current storage formats"
7772
msgstr ""
7773
7774
#: dummy/help_topics/debug-flags/summary.txt:1
7775
msgid "Options to show or record debug information"
7776
msgstr ""
7777
7778
#: dummy/help_topics/diverged-branches/summary.txt:1
7779
msgid "How to fix diverged branches"
7780
msgstr ""
7781
7782
#: dummy/help_topics/env-variables/detail.txt:1
7783
msgid "Environment Variables"
7784
msgstr ""
7785
7786
#: dummy/help_topics/env-variables/detail.txt:3
7787
msgid ""
7788
"=================== "
7789
"===========================================================\n"
7790
"BZRPATH Path where bzr is to look for shell plugin external\n"
7791
" commands.\n"
7792
"BZR_EMAIL E-Mail address of the user. Overrides EMAIL.\n"
7793
"EMAIL E-Mail address of the user.\n"
7794
"BZR_EDITOR Editor for editing commit messages. Overrides EDITOR.\n"
7795
"EDITOR Editor for editing commit messages.\n"
7796
"BZR_PLUGIN_PATH Paths where bzr should look for plugins.\n"
7797
"BZR_DISABLE_PLUGINS Plugins that bzr should not load.\n"
7798
"BZR_PLUGINS_AT Plugins to load from a directory not in "
7799
"BZR_PLUGIN_PATH.\n"
7800
"BZR_HOME Directory holding .bazaar config dir. Overrides HOME.\n"
7801
"BZR_HOME (Win32) Directory holding bazaar config dir. Overrides APPDATA "
7802
"and\n"
7803
" HOME.\n"
7804
"BZR_REMOTE_PATH Full name of remote 'bzr' command (for bzr+ssh:// "
7805
"URLs).\n"
7806
"BZR_SSH Path to SSH client, or one of paramiko, openssh, "
7807
"sshcorp,\n"
7808
" plink or lsh.\n"
7809
"BZR_LOG Location of .bzr.log (use '/dev/null' to suppress log).\n"
7810
"BZR_LOG (Win32) Location of .bzr.log (use 'NUL' to suppress log).\n"
7811
"BZR_COLUMNS Override implicit terminal width.\n"
7812
"BZR_CONCURRENCY Number of processes that can be run concurrently "
7813
"(selftest)\n"
7814
"BZR_PROGRESS_BAR Override the progress display. Values are 'none' or "
7815
"'text'.\n"
7816
"BZR_PDB Control whether to launch a debugger on error.\n"
7817
"BZR_SIGQUIT_PDB Control whether SIGQUIT behaves normally or invokes a\n"
7818
" breakin debugger.\n"
7819
"BZR_TEXTUI_INPUT Force console input mode for prompts to line-based "
7820
"(instead\n"
7821
" of char-based).\n"
7822
"=================== "
7823
"===========================================================\n"
7824
msgstr ""
7825
7826
#: dummy/help_topics/env-variables/summary.txt:1
7827
msgid "Environment variable names and values"
7828
msgstr ""
7829
7830
#: dummy/help_topics/eol/summary.txt:1
7831
msgid "Information on end-of-line handling"
7832
msgstr ""
7833
7834
#: dummy/help_topics/files/detail.txt:1
7835
msgid "Files"
7836
msgstr ""
7837
7838
#: dummy/help_topics/files/detail.txt:3
7839
msgid ""
7840
":On Unix: ~/.bazaar/bazaar.conf\n"
7841
":On Windows: C:\\\\Documents and Settings\\\\username\\\\Application Data\\\\"
7842
"bazaar\\\\2.0\\\\bazaar.conf"
7843
msgstr ""
7844
7845
#: dummy/help_topics/files/detail.txt:6
7846
msgid ""
7847
"Contains the user's default configuration. The section ``[DEFAULT]`` is\n"
7848
"used to define general configuration that will be applied everywhere.\n"
7849
"The section ``[ALIASES]`` can be used to create command aliases for\n"
7850
"commonly used options."
7851
msgstr ""
7852
7853
#: dummy/help_topics/files/detail.txt:11
7854
msgid "A typical config file might look something like::"
7855
msgstr ""
7856
7857
#: dummy/help_topics/files/detail.txt:13
7858
msgid ""
7859
" [DEFAULT]\n"
7860
" email=John Doe <jdoe@isp.com>"
7861
msgstr ""
7862
7863
#: dummy/help_topics/files/detail.txt:16
7864
msgid ""
7865
" [ALIASES]\n"
7866
" commit = commit --strict\n"
7867
" log10 = log --short -r -10..-1\n"
7868
msgstr ""
7869
7870
#: dummy/help_topics/files/summary.txt:1
7871
msgid "Information on configuration and log files"
7872
msgstr ""
7873
7874
#: dummy/help_topics/formats/detail.txt:1
7875
msgid "Storage Formats"
7876
msgstr ""
7877
7878
#: dummy/help_topics/formats/detail.txt:3
7879
msgid ""
7880
"To ensure that older clients do not access data incorrectly,\n"
7881
"Bazaar's policy is to introduce a new storage format whenever\n"
7882
"new features requiring new metadata are added. New storage\n"
7883
"formats may also be introduced to improve performance and\n"
7884
"scalability."
7885
msgstr ""
7886
7887
#: dummy/help_topics/formats/detail.txt:9
7888
msgid ""
7889
"The newest format, 2a, is highly recommended. If your\n"
7890
"project is not using 2a, then you should suggest to the\n"
7891
"project owner to upgrade."
7892
msgstr ""
7893
7894
#: dummy/help_topics/formats/detail.txt:13
7895
msgid ""
7896
"\n"
7897
".. note::"
7898
msgstr ""
7899
7900
#: dummy/help_topics/formats/detail.txt:16
7901
msgid ""
7902
" Some of the older formats have two variants:\n"
7903
" a plain one and a rich-root one. The latter include an additional\n"
7904
" field about the root of the tree. There is no performance cost\n"
7905
" for using a rich-root format but you cannot easily merge changes\n"
7906
" from a rich-root format into a plain format. As a consequence,\n"
7907
" moving a project to a rich-root format takes some co-ordination\n"
7908
" in that all contributors need to upgrade their repositories\n"
7909
" around the same time. 2a and all future formats will be\n"
7910
" implicitly rich-root."
7911
msgstr ""
7912
7913
#: dummy/help_topics/formats/detail.txt:26
7914
msgid ""
7915
"See :doc:`current-formats-help` for the complete list of\n"
7916
"currently supported formats. See :doc:`other-formats-help` for\n"
7917
"descriptions of any available experimental and deprecated formats.\n"
7918
msgstr ""
7919
7920
#: dummy/help_topics/formats/summary.txt:1
7921
msgid "Information on choosing a storage format"
7922
msgstr ""
7923
7924
#: dummy/help_topics/global-options/detail.txt:1
7925
msgid "Global Options"
7926
msgstr ""
7927
7928
#: dummy/help_topics/global-options/detail.txt:3
7929
msgid ""
7930
"These options may be used with any command, and may appear in front of any\n"
7931
"command. (e.g. ``bzr --profile help``)."
7932
msgstr ""
7933
7934
#: dummy/help_topics/global-options/detail.txt:6
7935
msgid ""
7936
"--version Print the version number. Must be supplied before the "
7937
"command.\n"
7938
"--no-aliases Do not process command aliases when running this command.\n"
7939
"--builtin Use the built-in version of a command, not the plugin "
7940
"version.\n"
7941
" This does not suppress other plugin effects.\n"
7942
"--no-plugins Do not process any plugins.\n"
7943
"--no-l10n Do not translate messages.\n"
7944
"--concurrency Number of processes that can be run concurrently (selftest)."
7945
msgstr ""
7946
7947
#: dummy/help_topics/global-options/detail.txt:14
7948
msgid ""
7949
"--profile Profile execution using the hotshot profiler.\n"
7950
"--lsprof Profile execution using the lsprof profiler.\n"
7951
"--lsprof-file Profile execution using the lsprof profiler, and write the\n"
7952
" results to a specified file. If the filename ends with "
7953
"\".txt\",\n"
7954
" text format will be used. If the filename either starts "
7955
"with\n"
7956
" \"callgrind.out\" or end with \".callgrind\", the output will "
7957
"be\n"
7958
" formatted for use with KCacheGrind. Otherwise, the output\n"
7959
" will be a pickle.\n"
7960
"--coverage Generate line coverage report in the specified directory."
7961
msgstr ""
7962
7963
#: dummy/help_topics/global-options/detail.txt:24
7964
msgid ""
7965
"-Oname=value Override the ``name`` config option setting it to ``value`` "
7966
"for\n"
7967
" the duration of the command. This can be used multiple times "
7968
"if\n"
7969
" several options need to be overridden."
7970
msgstr ""
7971
7972
#: dummy/help_topics/global-options/detail.txt:28
7973
msgid ""
7974
"See http://doc.bazaar.canonical.com/developers/profiling.html for more\n"
7975
"information on profiling."
7976
msgstr ""
7977
7978
#: dummy/help_topics/global-options/detail.txt:31
7979
msgid ""
7980
"A number of debug flags are also available to assist troubleshooting and\n"
7981
"development. See :doc:`debug-flags-help`.\n"
7982
msgstr ""
7983
7984
#: dummy/help_topics/global-options/summary.txt:1
7985
msgid "Options that control how Bazaar runs"
7986
msgstr ""
7987
7988
#: dummy/help_topics/hidden-commands/summary.txt:1
7989
msgid "All hidden commands"
7990
msgstr ""
7991
7992
#: dummy/help_topics/hooks/summary.txt:1
7993
msgid "Points at which custom processing can be added"
7994
msgstr ""
7995
7996
#: dummy/help_topics/launchpad/detail.txt:1
7997
msgid "Integration with Launchpad.net"
7998
msgstr ""
7999
8000
#: dummy/help_topics/launchpad/detail.txt:3
8001
msgid ""
8002
"Launchpad.net provides free Bazaar branch hosting with integrated bug and\n"
8003
"specification tracking."
8004
msgstr ""
8005
8006
#: dummy/help_topics/launchpad/detail.txt:6
8007
msgid ""
8008
"The bzr client (through the plugin called 'launchpad') has special\n"
8009
"features to communicate with Launchpad:"
8010
msgstr ""
8011
8012
#: dummy/help_topics/launchpad/detail.txt:9
8013
msgid ""
8014
" * The launchpad-login command tells Bazaar your Launchpad user name. "
8015
"This\n"
8016
" is then used by the 'lp:' transport to download your branches using\n"
8017
" bzr+ssh://."
8018
msgstr ""
8019
8020
#: dummy/help_topics/launchpad/detail.txt:13
8021
msgid ""
8022
" * The 'lp:' transport uses Launchpad as a directory service: for "
8023
"example\n"
8024
" 'lp:bzr' and 'lp:python' refer to the main branches of the relevant\n"
8025
" projects and may be branched, logged, etc. You can also use the 'lp:'\n"
8026
" transport to refer to specific branches, e.g. lp:~bzr/bzr/trunk."
8027
msgstr ""
8028
8029
#: dummy/help_topics/launchpad/detail.txt:18
8030
msgid ""
8031
" * The 'lp:' bug tracker alias can expand launchpad bug numbers to their\n"
8032
" URLs for use with 'bzr commit --fixes', e.g. 'bzr commit --fixes "
8033
"lp:12345'\n"
8034
" will record a revision property that marks that revision as fixing\n"
8035
" Launchpad bug 12345. When you push that branch to Launchpad it will\n"
8036
" automatically be linked to the bug report."
8037
msgstr ""
8038
8039
#: dummy/help_topics/launchpad/detail.txt:24
8040
msgid ""
8041
" * The register-branch command tells Launchpad about the url of a\n"
8042
" public branch. Launchpad will then mirror the branch, display\n"
8043
" its contents and allow it to be attached to bugs and other\n"
8044
" objects."
8045
msgstr ""
8046
8047
#: dummy/help_topics/launchpad/detail.txt:29
8048
msgid "For more information see http://help.launchpad.net/\n"
8049
msgstr ""
8050
8051
#: dummy/help_topics/launchpad/summary.txt:1
8052
msgid "Using Bazaar with Launchpad.net"
8053
msgstr ""
8054
8055
#: dummy/help_topics/location-alias/summary.txt:1
8056
msgid "Aliases for remembered locations"
8057
msgstr ""
8058
8059
#: dummy/help_topics/log-formats/summary.txt:1
8060
msgid "Details on the logging formats available"
8061
msgstr ""
8062
8063
#: dummy/help_topics/other-formats/summary.txt:1
8064
msgid "Experimental and deprecated storage formats"
8065
msgstr ""
8066
8067
#: dummy/help_topics/patterns/summary.txt:1
8068
msgid "Information on the pattern syntax"
8069
msgstr ""
8070
8071
#: dummy/help_topics/repositories/detail.txt:1
8072
msgid "Repositories"
8073
msgstr ""
8074
8075
#: dummy/help_topics/repositories/detail.txt:3
8076
msgid ""
8077
"Repositories in Bazaar are where committed information is stored. There is\n"
8078
"a repository associated with every branch."
8079
msgstr ""
8080
8081
#: dummy/help_topics/repositories/detail.txt:6
8082
msgid ""
8083
"Repositories are a form of database. Bzr will usually maintain this for\n"
8084
"good performance automatically, but in some situations (e.g. when doing\n"
8085
"very many commits in a short time period) you may want to ask bzr to\n"
8086
"optimise the database indices. This can be done by the 'bzr pack' command."
8087
msgstr ""
8088
8089
#: dummy/help_topics/repositories/detail.txt:11
8090
msgid ""
8091
"By default just running 'bzr init' will create a repository within the new\n"
8092
"branch but it is possible to create a shared repository which allows "
8093
"multiple\n"
8094
"branches to share their information in the same location. When a new branch "
8095
"is\n"
8096
"created it will first look to see if there is a containing shared repository "
8097
"it\n"
8098
"can use."
8099
msgstr ""
8100
8101
#: dummy/help_topics/repositories/detail.txt:17
8102
msgid ""
8103
"When two branches of the same project share a repository, there is\n"
8104
"generally a large space saving. For some operations (e.g. branching\n"
8105
"within the repository) this translates in to a large time saving."
8106
msgstr ""
8107
8108
#: dummy/help_topics/repositories/detail.txt:21
8109
msgid ""
8110
"To create a shared repository use the init-repository command (or the alias\n"
8111
"init-repo). This command takes the location of the repository to create. "
8112
"This\n"
8113
"means that 'bzr init-repository repo' will create a directory named 'repo',\n"
8114
"which contains a shared repository. Any new branches that are created in "
8115
"this\n"
8116
"directory will then use it for storage."
8117
msgstr ""
8118
8119
#: dummy/help_topics/repositories/detail.txt:27
8120
msgid ""
8121
"It is a good idea to create a repository whenever you might create more\n"
8122
"than one branch of a project. This is true for both working areas where you\n"
8123
"are doing the development, and any server areas that you use for hosting\n"
8124
"projects. In the latter case, it is common to want branches without working\n"
8125
"trees. Since the files in the branch will not be edited directly there is "
8126
"no\n"
8127
"need to use up disk space for a working tree. To create a repository in "
8128
"which\n"
8129
"the branches will not have working trees pass the '--no-trees' option to\n"
8130
"'init-repository'."
8131
msgstr ""
8132
8133
#: dummy/help_topics/repositories/detail.txt:38
8134
msgid ""
8135
" init-repository Create a shared repository. Use --no-trees to create "
8136
"one\n"
8137
" in which new branches won't get a working tree.\n"
8138
msgstr ""
8139
8140
#: dummy/help_topics/repositories/summary.txt:1
8141
msgid "Basic information on shared repositories."
8142
msgstr ""
8143
8144
#: dummy/help_topics/revisionspec/summary.txt:1
8145
msgid "Explain how to use --revision"
8146
msgstr ""
8147
8148
#: dummy/help_topics/rules/summary.txt:1
8149
msgid "Information on defining rule-based preferences"
8150
msgstr ""
8151
8152
#: dummy/help_topics/standalone-trees/detail.txt:1
8153
msgid "Standalone Trees"
8154
msgstr ""
8155
8156
#: dummy/help_topics/standalone-trees/detail.txt:3
8157
msgid ""
8158
"A standalone tree is a working tree with an associated repository. It\n"
8159
"is an independently usable branch, with no dependencies on any other.\n"
8160
"Creating a standalone tree (via bzr init) is the quickest way to put\n"
8161
"an existing project under version control."
8162
msgstr ""
8163
8164
#: dummy/help_topics/standalone-trees/detail.txt:8
8165
msgid "Related Commands::"
8166
msgstr ""
8167
8168
#: dummy/help_topics/standalone-trees/detail.txt:10
8169
msgid " init Make a directory into a versioned branch.\n"
8170
msgstr ""
8171
8172
#: dummy/help_topics/standalone-trees/summary.txt:1
8173
msgid "Information on what a standalone tree is"
8174
msgstr ""
8175
8176
#: dummy/help_topics/standard-options/detail.txt:1
8177
msgid "Standard Options"
8178
msgstr ""
8179
8180
#: dummy/help_topics/standard-options/detail.txt:3
8181
msgid "Standard options are legal for all commands."
8182
msgstr ""
8183
8184
#: dummy/help_topics/standard-options/detail.txt:5
8185
msgid ""
8186
"--help, -h Show help message.\n"
8187
"--verbose, -v Display more information.\n"
8188
"--quiet, -q Only display errors and warnings."
8189
msgstr ""
8190
8191
#: dummy/help_topics/standard-options/detail.txt:9
8192
msgid "Unlike global options, standard options can be used in aliases.\n"
8193
msgstr ""
8194
8195
#: dummy/help_topics/standard-options/summary.txt:1
8196
msgid "Options that can be used with any command"
8197
msgstr ""
8198
8199
#: dummy/help_topics/status-flags/detail.txt:1
8200
msgid "Status Flags"
8201
msgstr ""
8202
8203
#: dummy/help_topics/status-flags/detail.txt:3
8204
msgid ""
8205
"Status flags are used to summarise changes to the working tree in a concise\n"
8206
"manner. They are in the form::"
8207
msgstr ""
8208
8209
#: dummy/help_topics/status-flags/detail.txt:6
8210
msgid " xxx <filename>"
8211
msgstr ""
8212
8213
#: dummy/help_topics/status-flags/detail.txt:8
8214
msgid "where the columns' meanings are as follows."
8215
msgstr ""
8216
8217
#: dummy/help_topics/status-flags/detail.txt:10
8218
msgid "Column 1 - versioning/renames::"
8219
msgstr ""
8220
8221
#: dummy/help_topics/status-flags/detail.txt:12
8222
msgid ""
8223
" + File versioned\n"
8224
" - File unversioned\n"
8225
" R File renamed\n"
8226
" ? File unknown\n"
8227
" X File nonexistent (and unknown to bzr)\n"
8228
" C File has conflicts\n"
8229
" P Entry for a pending merge (not a file)"
8230
msgstr ""
8231
8232
#: dummy/help_topics/status-flags/detail.txt:20
8233
msgid "Column 2 - contents::"
8234
msgstr ""
8235
8236
#: dummy/help_topics/status-flags/detail.txt:22
8237
msgid ""
8238
" N File created\n"
8239
" D File deleted\n"
8240
" K File kind changed\n"
8241
" M File modified"
8242
msgstr ""
8243
8244
#: dummy/help_topics/status-flags/detail.txt:27
8245
msgid "Column 3 - execute::"
8246
msgstr ""
8247
8248
#: dummy/help_topics/status-flags/detail.txt:29
8249
msgid " * The execute bit was changed\n"
8250
msgstr ""
8251
8252
#: dummy/help_topics/status-flags/summary.txt:1
8253
msgid "Help on status flags"
8254
msgstr ""
8255
8256
#: dummy/help_topics/sync-for-reconfigure/detail.txt:1
8257
msgid "Branches Out of Sync"
8258
msgstr ""
8259
8260
#: dummy/help_topics/sync-for-reconfigure/detail.txt:3
8261
msgid ""
8262
"When reconfiguring a checkout, tree or branch into a lightweight checkout,\n"
8263
"a local branch must be destroyed. (For checkouts, this is the local branch\n"
8264
"that serves primarily as a cache.) If the branch-to-be-destroyed does not\n"
8265
"have the same last revision as the new reference branch for the lightweight\n"
8266
"checkout, data could be lost, so Bazaar refuses."
8267
msgstr ""
8268
8269
#: dummy/help_topics/sync-for-reconfigure/detail.txt:9
8270
msgid "How you deal with this depends on *why* the branches are out of sync."
8271
msgstr ""
8272
8273
#: dummy/help_topics/sync-for-reconfigure/detail.txt:11
8274
msgid ""
8275
"If you have a checkout and have done local commits, you can get back in "
8276
"sync\n"
8277
"by running \"bzr update\" (and possibly \"bzr commit\")."
8278
msgstr ""
8279
8280
#: dummy/help_topics/sync-for-reconfigure/detail.txt:14
8281
msgid ""
8282
"If you have a branch and the remote branch is out-of-date, you can push\n"
8283
"the local changes using \"bzr push\". If the local branch is out of date, "
8284
"you\n"
8285
"can do \"bzr pull\". If both branches have had changes, you can merge, "
8286
"commit\n"
8287
"and then push your changes. If you decide that some of the changes aren't\n"
8288
"useful, you can \"push --overwrite\" or \"pull --overwrite\" instead.\n"
8289
msgstr ""
8290
8291
#: dummy/help_topics/sync-for-reconfigure/summary.txt:1
8292
msgid "Steps to resolve \"out-of-sync\" when reconfiguring"
8293
msgstr ""
8294
8295
#: dummy/help_topics/topics/summary.txt:1
8296
msgid "Topics list"
8297
msgstr ""
8298
8299
#: dummy/help_topics/url-special-chars/summary.txt:1
8300
msgid "Special character handling in URLs"
8301
msgstr ""
8302
8303
#: dummy/help_topics/urlspec/summary.txt:1
8304
msgid "Supported transport protocols"
8305
msgstr ""
8306
8307
#: dummy/help_topics/working-trees/detail.txt:1
8308
msgid "Working Trees"
8309
msgstr ""
8310
8311
#: dummy/help_topics/working-trees/detail.txt:3
8312
msgid ""
8313
"A working tree is the contents of a branch placed on disk so that you can\n"
8314
"see the files and edit them. The working tree is where you make changes to "
8315
"a\n"
8316
"branch, and when you commit the current state of the working tree is the\n"
8317
"snapshot that is recorded in the commit."
8318
msgstr ""
8319
8320
#: dummy/help_topics/working-trees/detail.txt:8
8321
msgid ""
8322
"When you push a branch to a remote system, a working tree will not be\n"
8323
"created. If one is already present the files will not be updated. The\n"
8324
"branch information will be updated and the working tree will be marked\n"
8325
"as out-of-date. Updating a working tree remotely is difficult, as there\n"
8326
"may be uncommitted changes or the update may cause content conflicts that "
8327
"are\n"
8328
"difficult to deal with remotely."
8329
msgstr ""
8330
8331
#: dummy/help_topics/working-trees/detail.txt:15
8332
msgid ""
8333
"If you have a branch with no working tree you can use the 'checkout' "
8334
"command\n"
8335
"to create a working tree. If you run 'bzr checkout .' from the branch it "
8336
"will\n"
8337
"create the working tree. If the branch is updated remotely, you can update "
8338
"the\n"
8339
"working tree by running 'bzr update' in that directory."
8340
msgstr ""
8341
8342
#: dummy/help_topics/working-trees/detail.txt:20
8343
msgid ""
8344
"If you have a branch with a working tree that you do not want the 'remove-"
8345
"tree'\n"
8346
"command will remove the tree if it is safe. This can be done to avoid the\n"
8347
"warning about the remote working tree not being updated when pushing to the\n"
8348
"branch. It can also be useful when working with a '--no-trees' repository\n"
8349
"(see 'bzr help repositories')."
8350
msgstr ""
8351
8352
#: dummy/help_topics/working-trees/detail.txt:26
8353
msgid ""
8354
"If you want to have a working tree on a remote machine that you push to you\n"
8355
"can either run 'bzr update' in the remote branch after each push, or use "
8356
"some\n"
8357
"other method to update the tree during the push. There is an 'rspush' "
8358
"plugin\n"
8359
"that will update the working tree using rsync as well as doing a push. "
8360
"There\n"
8361
"is also a 'push-and-update' plugin that automates running 'bzr update' via "
8362
"SSH\n"
8363
"after each push."
8364
msgstr ""
8365
8366
#: dummy/help_topics/working-trees/detail.txt:33
8367
msgid "Useful commands::"
8368
msgstr ""
8369
8370
#: dummy/help_topics/working-trees/detail.txt:35
8371
msgid ""
8372
" checkout Create a working tree when a branch does not have one.\n"
8373
" remove-tree Removes the working tree from a branch when it is safe to do "
8374
"so.\n"
8375
" update When a working tree is out of sync with its associated "
8376
"branch\n"
8377
" this will update the tree to match the branch.\n"
8378
msgstr ""
8379
8380
#: dummy/help_topics/working-trees/summary.txt:1
8381
msgid "Information on working trees"
8382
msgstr ""
8383
8384
#: en/help_topics/authentication.txt:1
8385
msgid ""
8386
"Authentication Settings\n"
8387
"======================="
8388
msgstr ""
8389
8390
#: en/help_topics/authentication.txt:4
8391
msgid ""
8392
"\n"
8393
"Intent\n"
8394
"------"
8395
msgstr ""
8396
8397
#: en/help_topics/authentication.txt:8
8398
msgid ""
8399
"Many different authentication policies can be described in the\n"
8400
"``authentication.conf`` file but a particular user should need only a few\n"
8401
"definitions to cover his needs without having to specify a user and a "
8402
"password\n"
8403
"for every branch he uses."
8404
msgstr ""
8405
8406
#: en/help_topics/authentication.txt:13
8407
msgid ""
8408
"The definitions found in this file are used to find the credentials to use "
8409
"for\n"
8410
"a given url. The same credentials can generally be used for as many branches "
8411
"as\n"
8412
"possible by grouping their declaration around the remote servers that need\n"
8413
"them. It's even possible to declare credentials that will be used by "
8414
"different\n"
8415
"servers."
8416
msgstr ""
8417
8418
#: en/help_topics/authentication.txt:19
8419
msgid ""
8420
"The intent is to make this file as small as possible to minimize maintenance."
8421
msgstr ""
8422
8423
#: en/help_topics/authentication.txt:21
8424
msgid ""
8425
"Once the relevant credentials are declared in this file you may use branch "
8426
"urls\n"
8427
"without embedding passwords (security hazard) or even users (enabling "
8428
"sharing\n"
8429
"of your urls with others)."
8430
msgstr ""
8431
8432
#: en/help_topics/authentication.txt:25
8433
msgid "Instead of using::"
8434
msgstr ""
8435
8436
#: en/help_topics/authentication.txt:27
8437
msgid " bzr branch ftp://joe:secret@host.com/path/to/my/branch"
8438
msgstr ""
8439
8440
#: en/help_topics/authentication.txt:29
8441
msgid "you simply use::"
8442
msgstr ""
8443
8444
#: en/help_topics/authentication.txt:31
8445
msgid " bzr branch ftp://host.com/path/to/my/branch"
8446
msgstr ""
8447
8448
#: en/help_topics/authentication.txt:33
8449
msgid ""
8450
"provided you have created the following ``authentication.conf`` file::"
8451
msgstr ""
8452
8453
#: en/help_topics/authentication.txt:35
8454
msgid ""
8455
" [myprojects]\n"
8456
" scheme=ftp\n"
8457
" host=host.com\n"
8458
" user=joe\n"
8459
" password=secret\n"
8460
" "
8461
msgstr ""
8462
8463
#: en/help_topics/authentication.txt:42
8464
msgid ""
8465
"Authentication definitions\n"
8466
"--------------------------"
8467
msgstr ""
8468
8469
#: en/help_topics/authentication.txt:45
8470
msgid ""
8471
"There are two kinds of authentication used by the various schemes supported "
8472
"by\n"
8473
"bzr:"
8474
msgstr ""
8475
8476
#: en/help_topics/authentication.txt:48
8477
msgid "1. user and password"
8478
msgstr ""
8479
8480
#: en/help_topics/authentication.txt:50
8481
msgid ""
8482
"``FTP`` needs a (``user``, ``password``) to authenticate against a ``host``\n"
8483
"``SFTP`` can use either a password or a host key to authenticate. However,\n"
8484
"ssh agents are a better, more secure solution. So we have chosen to not "
8485
"provide\n"
8486
"our own less secure method."
8487
msgstr ""
8488
8489
#: en/help_topics/authentication.txt:55
8490
msgid "2. user, realm and password"
8491
msgstr ""
8492
8493
#: en/help_topics/authentication.txt:57
8494
msgid ""
8495
"``HTTP`` and ``HTTPS`` needs a (``user, realm, password``) to authenticate\n"
8496
"against a host. But, by using ``.htaccess`` files, for example, it is "
8497
"possible\n"
8498
"to define several (``user, realm, password``) for a given ``host``. So what "
8499
"is\n"
8500
"really needed is (``user``, ``password``, ``host``, ``path``). The ``realm`` "
8501
"is\n"
8502
"not taken into account in the definitions, but will displayed if bzr "
8503
"prompts\n"
8504
"you for a password."
8505
msgstr ""
8506
8507
#: en/help_topics/authentication.txt:64
8508
msgid ""
8509
"``HTTP proxy`` can be handled as ``HTTP`` (or ``HTTPS``) by explicitly\n"
8510
"specifying the appropriate port."
8511
msgstr ""
8512
8513
#: en/help_topics/authentication.txt:67
8514
msgid ""
8515
"To take all schemes into account, the password will be deduced from a set "
8516
"of\n"
8517
"authentication definitions (``scheme``, ``host``, ``port``, ``path``, "
8518
"``user``,\n"
8519
"``password``)."
8520
msgstr ""
8521
8522
#: en/help_topics/authentication.txt:71
8523
msgid ""
8524
" * ``scheme``: can be empty (meaning the rest of the definition can be "
8525
"used\n"
8526
" for any scheme), ``SFTP`` and ``bzr+ssh`` should not be used here, "
8527
"``ssh``\n"
8528
" should be used instead since this is the real scheme regarding\n"
8529
" authentication,"
8530
msgstr ""
8531
8532
#: en/help_topics/authentication.txt:76
8533
msgid " * ``host``: can be empty (to act as a default for any host),"
8534
msgstr ""
8535
8536
#: en/help_topics/authentication.txt:78
8537
msgid ""
8538
" * ``port`` can be empty (useful when an host provides several servers for "
8539
"the\n"
8540
" same scheme), only numerical values are allowed, this should be used "
8541
"only\n"
8542
" when the server uses a port different than the scheme standard port,"
8543
msgstr ""
8544
8545
#: en/help_topics/authentication.txt:82
8546
msgid " * ``path``: can be empty (FTP or SFTP will never user it),"
8547
msgstr ""
8548
8549
#: en/help_topics/authentication.txt:84
8550
msgid ""
8551
" * ``user``: can be empty (``bzr`` will defaults to python's\n"
8552
" ``getpass.get_user()``),"
8553
msgstr ""
8554
8555
#: en/help_topics/authentication.txt:87
8556
msgid ""
8557
" * ``password``: can be empty if you prefer to always be prompted for your\n"
8558
" password."
8559
msgstr ""
8560
8561
#: en/help_topics/authentication.txt:90
8562
msgid ""
8563
"Multiple definitions can be provided and, for a given URL, bzr will select "
8564
"a\n"
8565
"(``user`` [, ``password``]) based on the following rules :"
8566
msgstr ""
8567
8568
#: en/help_topics/authentication.txt:93
8569
msgid " 1. the first match wins,"
8570
msgstr ""
8571
8572
#: en/help_topics/authentication.txt:95
8573
msgid " 2. empty fields match everything,"
8574
msgstr ""
8575
8576
#: en/help_topics/authentication.txt:97
8577
msgid ""
8578
" 3. ``scheme`` matches even if decorators are used in the requested URL,"
8579
msgstr ""
8580
8581
#: en/help_topics/authentication.txt:99
8582
msgid ""
8583
" 4. ``host`` matches exactly or act as a domain if it starts with '.'\n"
8584
" (``project.bzr.sf.net`` will match ``.bzr.sf.net`` but "
8585
"``projectbzr.sf.net``\n"
8586
" will not match ``bzr.sf.net``)."
8587
msgstr ""
8588
8589
#: en/help_topics/authentication.txt:103
8590
msgid ""
8591
" 5. ``port`` matches if included in the requested URL (exact matches only)"
8592
msgstr ""
8593
8594
#: en/help_topics/authentication.txt:105
8595
msgid ""
8596
" 6. ``path`` matches if included in the requested URL (and by rule #2 "
8597
"above,\n"
8598
" empty paths will match any provided path)."
8599
msgstr ""
8600
8601
#: en/help_topics/authentication.txt:110
8602
msgid ""
8603
"File format\n"
8604
"-----------"
8605
msgstr ""
8606
8607
#: en/help_topics/authentication.txt:113
8608
msgid ""
8609
"The general rules for :doc:`configuration files <configuration-help>`\n"
8610
"apply except for the variable policies."
8611
msgstr ""
8612
8613
#: en/help_topics/authentication.txt:116
8614
msgid "Each section describes an authentication definition."
8615
msgstr ""
8616
8617
#: en/help_topics/authentication.txt:118
8618
msgid ""
8619
"The section name is an arbitrary string, only the ``DEFAULT`` value is "
8620
"reserved\n"
8621
"and should appear as the *last* section."
8622
msgstr ""
8623
8624
#: en/help_topics/authentication.txt:121
8625
msgid "Each section should define:"
8626
msgstr ""
8627
8628
#: en/help_topics/authentication.txt:123
8629
msgid "* ``user``: the login to be used,"
8630
msgstr ""
8631
8632
#: en/help_topics/authentication.txt:125
8633
msgid "Each section could define:"
8634
msgstr ""
8635
8636
#: en/help_topics/authentication.txt:127
8637
msgid "* ``host``: the remote server,"
8638
msgstr ""
8639
8640
#: en/help_topics/authentication.txt:129
8641
msgid "* ``port``: the port the server is listening,"
8642
msgstr ""
8643
8644
#: en/help_topics/authentication.txt:131
8645
msgid "* ``path``: the branch location,"
8646
msgstr ""
8647
8648
#: en/help_topics/authentication.txt:133
8649
msgid "* ``password``: the password."
8650
msgstr ""
8651
8652
#: en/help_topics/authentication.txt:135
8653
msgid ""
8654
"\n"
8655
"Examples\n"
8656
"--------"
8657
msgstr ""
8658
8659
#: en/help_topics/authentication.txt:139
8660
msgid ""
8661
"\n"
8662
"Personal projects hosted outside\n"
8663
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
8664
msgstr ""
8665
8666
#: en/help_topics/authentication.txt:143
8667
msgid ""
8668
"All connections are done with the same ``user`` (the remote one for which "
8669
"the\n"
8670
"default bzr one is not appropriate) and the password is always prompted "
8671
"with\n"
8672
"some exceptions::"
8673
msgstr ""
8674
8675
#: en/help_topics/authentication.txt:147
8676
msgid ""
8677
" # Pet projects on hobby.net\n"
8678
" [hobby]\n"
8679
" host=r.hobby.net\n"
8680
" user=jim\n"
8681
" password=obvious1234\n"
8682
" \n"
8683
" # Home server\n"
8684
" [home]\n"
8685
" scheme=https\n"
8686
" host=home.net\n"
8687
" user=joe\n"
8688
" password=1essobV10us\n"
8689
" \n"
8690
" [DEFAULT]\n"
8691
" # Our local user is barbaz, on all remote sites we're known as "
8692
"foobar\n"
8693
" user=foobar"
8694
msgstr ""
8695
8696
#: en/help_topics/authentication.txt:164
8697
msgid ""
8698
"\n"
8699
"Source hosting provider\n"
8700
"~~~~~~~~~~~~~~~~~~~~~~~"
8701
msgstr ""
8702
8703
#: en/help_topics/authentication.txt:168
8704
msgid "In the shp.net (fictitious) domain, each project has its own site::"
8705
msgstr ""
8706
8707
#: en/help_topics/authentication.txt:170
8708
msgid ""
8709
" [shpnet domain]\n"
8710
" # we use sftp, but ssh is the scheme used for authentication\n"
8711
" scheme=ssh\n"
8712
" # The leading '.' ensures that 'shp.net' alone doesn't match\n"
8713
" host=.shp.net\n"
8714
" user=joe\n"
8715
" # bzr don't support supplying a password for sftp,\n"
8716
" # consider using an ssh agent if you don't want to supply\n"
8717
" # a password interactively. (pageant, ssh-agent, etc)"
8718
msgstr ""
8719
8720
#: en/help_topics/authentication.txt:180
8721
msgid ""
8722
"HTTPS, SFTP servers and their proxy\n"
8723
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
8724
msgstr ""
8725
8726
#: en/help_topics/authentication.txt:183
8727
msgid ""
8728
"At company.com, the server hosting release and integration branches is "
8729
"behind a\n"
8730
"proxy, and the two branches use different authentication policies::"
8731
msgstr ""
8732
8733
#: en/help_topics/authentication.txt:186
8734
msgid ""
8735
" [reference code]\n"
8736
" scheme=https\n"
8737
" host=dev.company.com\n"
8738
" path=/dev\n"
8739
" user=user1\n"
8740
" password=pass1"
8741
msgstr ""
8742
8743
#: en/help_topics/authentication.txt:193
8744
msgid ""
8745
" # development branches on dev server\n"
8746
" [dev]\n"
8747
" scheme=ssh # bzr+ssh and sftp are available here\n"
8748
" host=dev.company.com\n"
8749
" path=/dev/integration\n"
8750
" user=user2\n"
8751
" \n"
8752
" # proxy\n"
8753
" [proxy]\n"
8754
" scheme=http\n"
8755
" host=proxy.company.com\n"
8756
" port=3128\n"
8757
" user=proxyuser1\n"
8758
" password=proxypass1"
8759
msgstr ""
8760
8761
#: en/help_topics/authentication.txt:208
8762
msgid ""
8763
"\n"
8764
"Planned enhancements\n"
8765
"--------------------"
8766
msgstr ""
8767
8768
#: en/help_topics/authentication.txt:212
8769
msgid ""
8770
"The following are not yet implemented but planned as parts of a work in\n"
8771
"progress:"
8772
msgstr ""
8773
8774
#: en/help_topics/authentication.txt:215
8775
msgid "* add a ``password_encoding`` field allowing:"
8776
msgstr ""
8777
8778
#: en/help_topics/authentication.txt:217
8779
msgid ""
8780
" - storing the passwords in various obfuscating encodings (base64 for one),"
8781
msgstr ""
8782
8783
#: en/help_topics/authentication.txt:219
8784
msgid " - delegate password storage to plugins (.netrc for example)."
8785
msgstr ""
8786
8787
#: en/help_topics/authentication.txt:221
8788
msgid ""
8789
"* update the credentials when the user is prompted for user or password,"
8790
msgstr ""
8791
8792
#: en/help_topics/authentication.txt:223
8793
msgid "* add a ``verify_certificates`` field for ``HTTPS``."
8794
msgstr ""
8795
8796
#: en/help_topics/authentication.txt:225
8797
msgid ""
8798
"The ``password_encoding`` and ``verify_certificates`` fields are recognized "
8799
"but\n"
8800
"ignored in the actual implementation.\n"
8801
msgstr ""
8802
8803
#: en/help_topics/bugs.txt:1
8804
msgid "Bug Tracker Settings"
8805
msgstr ""
8806
8807
#: en/help_topics/bugs.txt:3
8808
msgid ""
8809
"When making a commit, metadata about bugs fixed by that change can be\n"
8810
"recorded by using the ``--fixes`` option. For each bug marked as fixed, an\n"
8811
"entry is included in the 'bugs' revision property stating '<url> <status>'.\n"
8812
"(The only ``status`` value currently supported is ``fixed.``)"
8813
msgstr ""
8814
8815
#: en/help_topics/bugs.txt:8
8816
msgid ""
8817
"The ``--fixes`` option allows you to specify a bug tracker and a bug "
8818
"identifier\n"
8819
"rather than a full URL. This looks like::"
8820
msgstr ""
8821
8822
#: en/help_topics/bugs.txt:11
8823
msgid " bzr commit --fixes <tracker>:<id>"
8824
msgstr ""
8825
8826
#: en/help_topics/bugs.txt:13 en/help_topics/configuration.txt:398
8827
msgid "or::"
8828
msgstr ""
8829
8830
#: en/help_topics/bugs.txt:15
8831
msgid " bzr commit --fixes <id>"
8832
msgstr ""
8833
8834
#: en/help_topics/bugs.txt:17
8835
msgid ""
8836
"where \"<tracker>\" is an identifier for the bug tracker, and \"<id>\" is "
8837
"the\n"
8838
"identifier for that bug within the bugtracker, usually the bug number.\n"
8839
"If \"<tracker>\" is not specified the ``bugtracker`` set in the branch\n"
8840
"or global configuration is used."
8841
msgstr ""
8842
8843
#: en/help_topics/bugs.txt:22
8844
msgid ""
8845
"Bazaar knows about a few bug trackers that have many users. If\n"
8846
"you use one of these bug trackers then there is no setup required to\n"
8847
"use this feature, you just need to know the tracker identifier to use.\n"
8848
"These are the bugtrackers that are built in:"
8849
msgstr ""
8850
8851
#: en/help_topics/bugs.txt:27
8852
msgid ""
8853
" ============================ ============ ============\n"
8854
" URL Abbreviation Example\n"
8855
" ============================ ============ ============\n"
8856
" https://bugs.launchpad.net/ lp lp:12345\n"
8857
" http://bugs.debian.org/ deb deb:12345\n"
8858
" http://bugzilla.gnome.org/ gnome gnome:12345\n"
8859
" ============================ ============ ============"
8860
msgstr ""
8861
8862
#: en/help_topics/bugs.txt:35
8863
msgid ""
8864
"For the bug trackers not listed above configuration is required.\n"
8865
"Support for generating the URLs for any project using Bugzilla or Trac\n"
8866
"is built in, along with a template mechanism for other bugtrackers with\n"
8867
"simple URL schemes. If your bug tracker can't be described by one\n"
8868
"of the schemes described below then you can write a plugin to support\n"
8869
"it."
8870
msgstr ""
8871
8872
#: en/help_topics/bugs.txt:42
8873
msgid ""
8874
"If you use Bugzilla or Trac, then you only need to set a configuration\n"
8875
"variable which contains the base URL of the bug tracker. These options\n"
8876
"can go into ``bazaar.conf``, ``branch.conf`` or into a branch-specific\n"
8877
"configuration section in ``locations.conf``. You can set up these values\n"
8878
"for each of the projects you work on."
8879
msgstr ""
8880
8881
#: en/help_topics/bugs.txt:48
8882
msgid ""
8883
"Note: As you provide a short name for each tracker, you can specify one or\n"
8884
"more bugs in one or more trackers at commit time if you wish."
8885
msgstr ""
8886
8887
#: en/help_topics/bugs.txt:51
8888
msgid ""
8889
"Launchpad\n"
8890
"---------"
8891
msgstr ""
8892
8893
#: en/help_topics/bugs.txt:54
8894
msgid ""
8895
"Use ``bzr commit --fixes lp:2`` to record that this commit fixes bug 2."
8896
msgstr ""
8897
8898
#: en/help_topics/bugs.txt:56
8899
msgid ""
8900
"bugzilla_<tracker>_url\n"
8901
"----------------------"
8902
msgstr ""
8903
8904
#: en/help_topics/bugs.txt:59
8905
msgid ""
8906
"If present, the location of the Bugzilla bug tracker referred to by\n"
8907
"<tracker>. This option can then be used together with ``bzr commit\n"
8908
"--fixes`` to mark bugs in that tracker as being fixed by that commit. For\n"
8909
"example::"
8910
msgstr ""
8911
8912
#: en/help_topics/bugs.txt:64
8913
msgid " bugzilla_squid_url = http://bugs.squid-cache.org"
8914
msgstr ""
8915
8916
#: en/help_topics/bugs.txt:66
8917
msgid ""
8918
"would allow ``bzr commit --fixes squid:1234`` to mark Squid's bug 1234 as\n"
8919
"fixed."
8920
msgstr ""
8921
8922
#: en/help_topics/bugs.txt:69
8923
msgid ""
8924
"trac_<tracker>_url\n"
8925
"------------------"
8926
msgstr ""
8927
8928
#: en/help_topics/bugs.txt:72
8929
msgid ""
8930
"If present, the location of the Trac instance referred to by\n"
8931
"<tracker>. This option can then be used together with ``bzr commit\n"
8932
"--fixes`` to mark bugs in that tracker as being fixed by that commit. For\n"
8933
"example::"
8934
msgstr ""
8935
8936
#: en/help_topics/bugs.txt:77
8937
msgid " trac_twisted_url = http://www.twistedmatrix.com/trac"
8938
msgstr ""
8939
8940
#: en/help_topics/bugs.txt:79
8941
msgid ""
8942
"would allow ``bzr commit --fixes twisted:1234`` to mark Twisted's bug 1234 "
8943
"as\n"
8944
"fixed."
8945
msgstr ""
8946
8947
#: en/help_topics/bugs.txt:82
8948
msgid ""
8949
"bugtracker_<tracker>_url\n"
8950
"------------------------"
8951
msgstr ""
8952
8953
#: en/help_topics/bugs.txt:85
8954
msgid ""
8955
"If present, the location of a generic bug tracker instance referred to by\n"
8956
"<tracker>. The location must contain an ``{id}`` placeholder,\n"
8957
"which will be replaced by a specific bug ID. This option can then be used\n"
8958
"together with ``bzr commit --fixes`` to mark bugs in that tracker as being\n"
8959
"fixed by that commit. For example::"
8960
msgstr ""
8961
8962
#: en/help_topics/bugs.txt:91
8963
msgid " bugtracker_python_url = http://bugs.python.org/issue{id}"
8964
msgstr ""
8965
8966
#: en/help_topics/bugs.txt:93
8967
msgid ""
8968
"would allow ``bzr commit --fixes python:1234`` to mark bug 1234 in Python's\n"
8969
"Roundup bug tracker as fixed, or::"
8970
msgstr ""
8971
8972
#: en/help_topics/bugs.txt:96
8973
msgid ""
8974
" bugtracker_cpan_url = http://rt.cpan.org/Public/Bug/Display.html?id={id}"
8975
msgstr ""
8976
8977
#: en/help_topics/bugs.txt:98
8978
msgid ""
8979
"would allow ``bzr commit --fixes cpan:1234`` to mark bug 1234 in CPAN's\n"
8980
"RT bug tracker as fixed, or::"
8981
msgstr ""
8982
8983
#: en/help_topics/bugs.txt:101
8984
msgid " bugtracker_hudson_url = http://issues.hudson-ci.org/browse/{id}"
8985
msgstr ""
8986
8987
#: en/help_topics/bugs.txt:103
8988
msgid ""
8989
"would allow ``bzr commit --fixes hudson:HUDSON-1234`` to mark bug HUDSON-"
8990
"1234\n"
8991
"in Hudson's JIRA bug tracker as fixed.\n"
8992
msgstr ""
8993
8994
#: en/help_topics/commands.txt:1
8995
msgid ""
8996
"add Add specified files or directories.\n"
8997
"alias Set/unset and display aliases.\n"
8998
"annotate Show the origin of each line in a file.\n"
8999
"bash-completion Generate a shell function for bash command line "
9000
"completion.\n"
9001
" [bash_completion]\n"
9002
"bind Convert the current branch into a checkout of the "
9003
"supplied\n"
9004
" branch.\n"
9005
"branch Create a new branch that is a copy of an existing branch.\n"
9006
"branches List the branches available at the current location.\n"
9007
"break-lock Break a dead lock.\n"
9008
"cat Write the contents of a file as of a given revision to\n"
9009
" standard output.\n"
9010
"check Validate working tree structure, branch consistency and\n"
9011
" repository history.\n"
9012
"checkout Create a new checkout of an existing branch.\n"
9013
"clean-tree Remove unwanted files from working tree.\n"
9014
"commit Commit changes into a new revision.\n"
9015
"config Display, set or remove a configuration option.\n"
9016
"conflicts List files with conflicts.\n"
9017
"deleted List files deleted in the working tree.\n"
9018
"diff Show differences in the working tree, between revisions "
9019
"or\n"
9020
" branches.\n"
9021
"dpush Push into a different VCS without any custom bzr "
9022
"metadata.\n"
9023
"export Export current or past revision to a destination directory "
9024
"or\n"
9025
" archive.\n"
9026
"help Show help on a command or other topic.\n"
9027
"ignore Ignore specified files or patterns.\n"
9028
"ignored List ignored files and the patterns that matched them.\n"
9029
"info Show information about a working tree, branch or "
9030
"repository.\n"
9031
"init Make a directory into a versioned branch.\n"
9032
"init-repository Create a shared repository for branches to share storage\n"
9033
" space.\n"
9034
"join Combine a tree into its containing tree.\n"
9035
"launchpad-login Show or set the Launchpad user ID. [launchpad]\n"
9036
"launchpad-mirror Ask Launchpad to mirror a branch now. [launchpad]\n"
9037
"launchpad-open Open a Launchpad branch page in your web browser. "
9038
"[launchpad]\n"
9039
"log Show historical log for a branch or subset of a branch.\n"
9040
"lp-find-proposal Find the proposal to merge this revision. [launchpad]\n"
9041
"lp-propose-merge Propose merging a branch on Launchpad. [launchpad]\n"
9042
"ls List files in a tree.\n"
9043
"merge Perform a three-way merge.\n"
9044
"missing Show unmerged/unpulled revisions between two branches.\n"
9045
"mkdir Create a new versioned directory.\n"
9046
"mv Move or rename a file.\n"
9047
"nick Print or set the branch nickname.\n"
9048
"pack Compress the data within a repository.\n"
9049
"plugins List the installed plugins.\n"
9050
"pull Turn this branch into a mirror of another branch.\n"
9051
"push Update a mirror of this branch.\n"
9052
"reconcile Reconcile bzr metadata in a branch.\n"
9053
"reconfigure Reconfigure the type of a bzr directory.\n"
9054
"register-branch Register a branch with launchpad.net. [launchpad]\n"
9055
"remerge Redo a merge.\n"
9056
"remove Remove files or directories.\n"
9057
"remove-branch Remove a branch.\n"
9058
"remove-tree Remove the working tree from a given branch/checkout.\n"
9059
"renames Show list of renamed files.\n"
9060
"resolve Mark a conflict as resolved.\n"
9061
"revert Revert files to a previous revision.\n"
9062
"revno Show current revision number.\n"
9063
"root Show the tree root directory.\n"
9064
"send Mail or create a merge-directive for submitting changes.\n"
9065
"serve Run the bzr server.\n"
9066
"shelve Temporarily set aside some changes from the current tree.\n"
9067
"sign-my-commits Sign all commits by a given committer.\n"
9068
"split Split a subdirectory of a tree into a separate tree.\n"
9069
"status Display status summary.\n"
9070
"switch Set the branch of a checkout and update.\n"
9071
"tag Create, remove or modify a tag naming a revision.\n"
9072
"tags List tags.\n"
9073
"testament Show testament (signing-form) of a revision.\n"
9074
"unbind Convert the current checkout into a regular branch.\n"
9075
"uncommit Remove the last committed revision.\n"
9076
"unshelve Restore shelved changes.\n"
9077
"update Update a working tree to a new revision.\n"
9078
"upgrade Upgrade a repository, branch or working tree to a newer\n"
9079
" format.\n"
9080
"verify-signatures Verify all commit signatures.\n"
9081
"version Show version of bzr.\n"
9082
"version-info Show version information about this tree.\n"
9083
"view Manage filtered views.\n"
9084
"whoami Show or set bzr user id.\n"
9085
msgstr ""
9086
9087
#: en/help_topics/configuration.txt:1
9088
msgid ""
9089
"Configuration Settings\n"
9090
"======================="
9091
msgstr ""
9092
9093
#: en/help_topics/configuration.txt:4
9094
msgid ""
9095
"Environment settings\n"
9096
"---------------------"
9097
msgstr ""
9098
9099
#: en/help_topics/configuration.txt:7
9100
msgid ""
9101
"While most configuration is handled by configuration files, some options\n"
9102
"which may be semi-permanent can also be controlled through the environment."
9103
msgstr ""
9104
9105
#: en/help_topics/configuration.txt:10
9106
msgid ""
9107
"BZR_EMAIL\n"
9108
"~~~~~~~~~"
9109
msgstr ""
9110
9111
#: en/help_topics/configuration.txt:13
9112
msgid "Override the email id used by Bazaar. Typical format::"
9113
msgstr ""
9114
9115
#: en/help_topics/configuration.txt:15
9116
msgid " \"John Doe <jdoe@example.com>\""
9117
msgstr ""
9118
9119
#: en/help_topics/configuration.txt:17
9120
msgid "See also the ``email`` configuration option."
9121
msgstr ""
9122
9123
#: en/help_topics/configuration.txt:19
9124
msgid ""
9125
"BZR_PROGRESS_BAR\n"
9126
"~~~~~~~~~~~~~~~~"
9127
msgstr ""
9128
9129
#: en/help_topics/configuration.txt:22
9130
msgid ""
9131
"Override the progress display. Possible values are \"none\" or \"text\". "
9132
"If\n"
9133
"the value is \"none\" then no progress bar is displayed. The value \"text\" "
9134
"draws\n"
9135
"the ordinary command line progress bar."
9136
msgstr ""
9137
9138
#: en/help_topics/configuration.txt:26
9139
msgid ""
9140
"BZR_SIGQUIT_PDB\n"
9141
"~~~~~~~~~~~~~~~"
9142
msgstr ""
9143
9144
#: en/help_topics/configuration.txt:29
9145
msgid ""
9146
"Control whether SIGQUIT behaves normally or invokes a breakin debugger."
9147
msgstr ""
9148
9149
#: en/help_topics/configuration.txt:31
9150
msgid ""
9151
"* 0 = Standard SIGQUIT behavior (normally, exit with a core dump)\n"
9152
"* 1 = Invoke breakin debugger (default)"
9153
msgstr ""
9154
9155
#: en/help_topics/configuration.txt:34
9156
msgid ""
9157
"BZR_HOME\n"
9158
"~~~~~~~~"
9159
msgstr ""
9160
9161
#: en/help_topics/configuration.txt:37
9162
msgid "Override the home directory used by Bazaar."
9163
msgstr ""
9164
9165
#: en/help_topics/configuration.txt:39
9166
msgid ""
9167
"BZR_SSH\n"
9168
"~~~~~~~"
9169
msgstr ""
9170
9171
#: en/help_topics/configuration.txt:42
9172
msgid "Select a different SSH implementation."
9173
msgstr ""
9174
9175
#: en/help_topics/configuration.txt:44
9176
msgid ""
9177
"BZR_PDB\n"
9178
"~~~~~~~"
9179
msgstr ""
9180
9181
#: en/help_topics/configuration.txt:47
9182
msgid "Control whether to launch a debugger on error."
9183
msgstr ""
9184
9185
#: en/help_topics/configuration.txt:49
9186
msgid ""
9187
"* 0 = Standard behavior\n"
9188
"* 1 = Launch debugger"
9189
msgstr ""
9190
9191
#: en/help_topics/configuration.txt:52
9192
msgid ""
9193
"BZR_REMOTE_PATH\n"
9194
"~~~~~~~~~~~~~~~"
9195
msgstr ""
9196
9197
#: en/help_topics/configuration.txt:55
9198
msgid "Path to the Bazaar executable to use when using the bzr+ssh protocol."
9199
msgstr ""
9200
9201
#: en/help_topics/configuration.txt:57
9202
msgid "See also the ``bzr_remote_path`` configuration option."
9203
msgstr ""
9204
9205
#: en/help_topics/configuration.txt:59
9206
msgid ""
9207
"BZR_EDITOR\n"
9208
"~~~~~~~~~~"
9209
msgstr ""
9210
9211
#: en/help_topics/configuration.txt:62
9212
msgid "Path to the editor Bazaar should use for commit messages, etc."
9213
msgstr ""
9214
9215
#: en/help_topics/configuration.txt:64
9216
msgid ""
9217
"BZR_LOG\n"
9218
"~~~~~~~"
9219
msgstr ""
9220
9221
#: en/help_topics/configuration.txt:67
9222
msgid ""
9223
"Location of the Bazaar log file. You can check the current location by\n"
9224
"running ``bzr version``."
9225
msgstr ""
9226
9227
#: en/help_topics/configuration.txt:70
9228
msgid ""
9229
"The log file contains debug information that is useful for diagnosing or\n"
9230
"reporting problems with Bazaar."
9231
msgstr ""
9232
9233
#: en/help_topics/configuration.txt:73
9234
msgid ""
9235
"Setting this to ``NUL`` on Windows or ``/dev/null`` on other platforms\n"
9236
"will disable logging."
9237
msgstr ""
9238
9239
#: en/help_topics/configuration.txt:76
9240
msgid ""
9241
"\n"
9242
"BZR_PLUGIN_PATH\n"
9243
"~~~~~~~~~~~~~~~"
9244
msgstr ""
9245
9246
#: en/help_topics/configuration.txt:80
9247
msgid ""
9248
"The path to the plugins directory that Bazaar should use.\n"
9249
"If not set, Bazaar will search for plugins in:"
9250
msgstr ""
9251
9252
#: en/help_topics/configuration.txt:83
9253
msgid ""
9254
"* the user specific plugin directory (containing the ``user`` plugins),"
9255
msgstr ""
9256
9257
#: en/help_topics/configuration.txt:85
9258
msgid "* the bzrlib directory (containing the ``core`` plugins),"
9259
msgstr ""
9260
9261
#: en/help_topics/configuration.txt:87
9262
msgid ""
9263
"* the site specific plugin directory if applicable (containing\n"
9264
" the ``site`` plugins)."
9265
msgstr ""
9266
9267
#: en/help_topics/configuration.txt:90
9268
msgid ""
9269
"If ``BZR_PLUGIN_PATH`` is set in any fashion, it will change the\n"
9270
"the way the plugin are searched. "
9271
msgstr ""
9272
9273
#: en/help_topics/configuration.txt:93
9274
msgid ""
9275
"As for the ``PATH`` variables, if multiple directories are\n"
9276
"specified in ``BZR_PLUGIN_PATH`` they should be separated by the\n"
9277
"platform specific appropriate character (':' on Unix,\n"
9278
"';' on windows)"
9279
msgstr ""
9280
9281
#: en/help_topics/configuration.txt:98
9282
msgid ""
9283
"By default if ``BZR_PLUGIN_PATH`` is set, it replaces searching\n"
9284
"in ``user``. However it will continue to search in ``core`` and\n"
9285
"``site`` unless they are explicitly removed."
9286
msgstr ""
9287
9288
#: en/help_topics/configuration.txt:102
9289
msgid ""
9290
"If you need to change the order or remove one of these\n"
9291
"directories, you should use special values:"
9292
msgstr ""
9293
9294
#: en/help_topics/configuration.txt:105
9295
msgid ""
9296
"* ``-user``, ``-core``, ``-site`` will remove the corresponding\n"
9297
" path from the default values,"
9298
msgstr ""
9299
9300
#: en/help_topics/configuration.txt:108
9301
msgid ""
9302
"* ``+user``, ``+core``, ``+site`` will add the corresponding path\n"
9303
" before the remaining default values (and also remove it from\n"
9304
" the default values)."
9305
msgstr ""
9306
9307
#: en/help_topics/configuration.txt:112
9308
msgid ""
9309
"Note that the special values 'user', 'core' and 'site' should be\n"
9310
"used literally, they will be substituted by the corresponding,\n"
9311
"platform specific, values."
9312
msgstr ""
9313
9314
#: en/help_topics/configuration.txt:116
9315
msgid ""
9316
"The examples below use ':' as the separator, windows users\n"
9317
"should use ';'."
9318
msgstr ""
9319
9320
#: en/help_topics/configuration.txt:119
9321
msgid "Overriding the default user plugin directory::"
9322
msgstr ""
9323
9324
#: en/help_topics/configuration.txt:121
9325
msgid " BZR_PLUGIN_PATH='/path/to/my/other/plugins'"
9326
msgstr ""
9327
9328
#: en/help_topics/configuration.txt:123
9329
msgid "Disabling the site directory while retaining the user directory::"
9330
msgstr ""
9331
9332
#: en/help_topics/configuration.txt:125
9333
msgid " BZR_PLUGIN_PATH='-site:+user'"
9334
msgstr ""
9335
9336
#: en/help_topics/configuration.txt:127
9337
msgid "Disabling all plugins (better achieved with --no-plugins)::"
9338
msgstr ""
9339
9340
#: en/help_topics/configuration.txt:129
9341
msgid " BZR_PLUGIN_PATH='-user:-core:-site'"
9342
msgstr ""
9343
9344
#: en/help_topics/configuration.txt:131
9345
msgid "Overriding the default site plugin directory::"
9346
msgstr ""
9347
9348
#: en/help_topics/configuration.txt:133
9349
msgid " BZR_PLUGIN_PATH='/path/to/my/site/plugins:-site':+user"
9350
msgstr ""
9351
9352
#: en/help_topics/configuration.txt:135
9353
msgid ""
9354
"BZR_DISABLE_PLUGINS\n"
9355
"~~~~~~~~~~~~~~~~~~~"
9356
msgstr ""
9357
9358
#: en/help_topics/configuration.txt:138
9359
msgid ""
9360
"Under special circumstances (mostly when trying to diagnose a\n"
9361
"bug), it's better to disable a plugin (or several) rather than\n"
9362
"uninstalling them completely. Such plugins can be specified in\n"
9363
"the ``BZR_DISABLE_PLUGINS`` environment variable."
9364
msgstr ""
9365
9366
#: en/help_topics/configuration.txt:143
9367
msgid ""
9368
"In that case, ``bzr`` will stop loading the specified plugins and\n"
9369
"will raise an import error if they are explicitly imported (by\n"
9370
"another plugin that depends on them for example)."
9371
msgstr ""
9372
9373
#: en/help_topics/configuration.txt:147
9374
msgid "Disabling ``myplugin`` and ``yourplugin`` is achieved by::"
9375
msgstr ""
9376
9377
#: en/help_topics/configuration.txt:149
9378
msgid " BZR_DISABLE_PLUGINS='myplugin:yourplugin'"
9379
msgstr ""
9380
9381
#: en/help_topics/configuration.txt:151
9382
msgid ""
9383
"BZR_PLUGINS_AT\n"
9384
"~~~~~~~~~~~~~~"
9385
msgstr ""
9386
9387
#: en/help_topics/configuration.txt:154
9388
msgid ""
9389
"When adding a new feature or working on a bug in a plugin,\n"
9390
"developers often need to use a specific version of a given\n"
9391
"plugin. Since python requires that the directory containing the\n"
9392
"code is named like the plugin itself this make it impossible to\n"
9393
"use arbitrary directory names (using a two-level directory scheme\n"
9394
"is inconvenient). ``BZR_PLUGINS_AT`` allows such directories even\n"
9395
"if they don't appear in ``BZR_PLUGIN_PATH`` ."
9396
msgstr ""
9397
9398
#: en/help_topics/configuration.txt:162
9399
msgid ""
9400
"Plugins specified in this environment variable takes precedence\n"
9401
"over the ones in ``BZR_PLUGIN_PATH``."
9402
msgstr ""
9403
9404
#: en/help_topics/configuration.txt:165
9405
msgid ""
9406
"The variable specified a list of ``plugin_name@plugin path``,\n"
9407
"``plugin_name`` being the name of the plugin as it appears in\n"
9408
"python module paths, ``plugin_path`` being the path to the\n"
9409
"directory containing the plugin code itself\n"
9410
"(i.e. ``plugins/myplugin`` not ``plugins``). Use ':' as the list\n"
9411
"separator, use ';' on windows."
9412
msgstr ""
9413
9414
#: en/help_topics/configuration.txt:172
9415
msgid ""
9416
"Example:\n"
9417
"~~~~~~~~"
9418
msgstr ""
9419
9420
#: en/help_topics/configuration.txt:175
9421
msgid ""
9422
"Using a specific version of ``myplugin``:\n"
9423
"``BZR_PLUGINS_AT='myplugin@/home/me/bugfixes/123456-myplugin``"
9424
msgstr ""
9425
9426
#: en/help_topics/configuration.txt:178
9427
msgid ""
9428
"BZRPATH\n"
9429
"~~~~~~~"
9430
msgstr ""
9431
9432
#: en/help_topics/configuration.txt:181
9433
msgid "The path where Bazaar should look for shell plugin external commands."
9434
msgstr ""
9435
9436
#: en/help_topics/configuration.txt:183
9437
msgid ""
9438
"\n"
9439
"http_proxy, https_proxy\n"
9440
"~~~~~~~~~~~~~~~~~~~~~~~"
9441
msgstr ""
9442
9443
#: en/help_topics/configuration.txt:187
9444
msgid "Specifies the network proxy for outgoing connections, for example::"
9445
msgstr ""
9446
9447
#: en/help_topics/configuration.txt:189
9448
msgid ""
9449
" http_proxy=http://proxy.example.com:3128/ \n"
9450
" https_proxy=http://proxy.example.com:3128/"
9451
msgstr ""
9452
9453
#: en/help_topics/configuration.txt:192
9454
msgid ""
9455
"\n"
9456
"Configuration files\n"
9457
"-------------------"
9458
msgstr ""
9459
9460
#: en/help_topics/configuration.txt:196
9461
msgid ""
9462
"Location\n"
9463
"~~~~~~~~"
9464
msgstr ""
9465
9466
#: en/help_topics/configuration.txt:199
9467
msgid ""
9468
"Configuration files are located in ``$HOME/.bazaar`` on Unix and\n"
9469
"``C:\\Documents and Settings\\<username>\\Application Data\\Bazaar\\2.0`` "
9470
"on\n"
9471
"Windows. (You can check the location for your system by using\n"
9472
"``bzr version``.)"
9473
msgstr ""
9474
9475
#: en/help_topics/configuration.txt:204
9476
msgid "There are three primary configuration files in this location:"
9477
msgstr ""
9478
9479
#: en/help_topics/configuration.txt:206
9480
msgid "* ``bazaar.conf`` describes default configuration options,"
9481
msgstr ""
9482
9483
#: en/help_topics/configuration.txt:208
9484
msgid ""
9485
"* ``locations.conf`` describes configuration information for\n"
9486
" specific branch locations,"
9487
msgstr ""
9488
9489
#: en/help_topics/configuration.txt:211
9490
msgid ""
9491
"* ``authentication.conf`` describes credential information for\n"
9492
" remote servers."
9493
msgstr ""
9494
9495
#: en/help_topics/configuration.txt:214
9496
msgid ""
9497
"Each branch can also contain a configuration file that sets values specific\n"
9498
"to that branch. This file is found at ``.bzr/branch/branch.conf`` within "
9499
"the\n"
9500
"branch. This file is visible to all users of a branch, if you wish to "
9501
"override\n"
9502
"one of the values for a branch with a setting that is specific to you then "
9503
"you\n"
9504
"can do so in ``locations.conf``."
9505
msgstr ""
9506
9507
#: en/help_topics/configuration.txt:220
9508
msgid ""
9509
"General format\n"
9510
"~~~~~~~~~~~~~~"
9511
msgstr ""
9512
9513
#: en/help_topics/configuration.txt:223
9514
msgid ""
9515
"An ini file has three types of contructs: section headers, section\n"
9516
"options and comments."
9517
msgstr ""
9518
9519
#: en/help_topics/configuration.txt:226
9520
msgid ""
9521
"Comments\n"
9522
"^^^^^^^^"
9523
msgstr ""
9524
9525
#: en/help_topics/configuration.txt:229
9526
msgid ""
9527
"A comment is any line that starts with a \"#\" (sometimes called a \"hash\n"
9528
"mark\", \"pound sign\" or \"number sign\"). Comment lines are ignored by\n"
9529
"Bazaar when parsing ini files."
9530
msgstr ""
9531
9532
#: en/help_topics/configuration.txt:233
9533
msgid ""
9534
"Section headers\n"
9535
"^^^^^^^^^^^^^^^"
9536
msgstr ""
9537
9538
#: en/help_topics/configuration.txt:236
9539
msgid ""
9540
"A section header is a word enclosed in brackets that starts at the begining\n"
9541
"of a line. A typical section header looks like this::"
9542
msgstr ""
9543
9544
#: en/help_topics/configuration.txt:239
9545
msgid " [DEFAULT]"
9546
msgstr ""
9547
9548
#: en/help_topics/configuration.txt:241
9549
msgid ""
9550
"The only valid section headers for bazaar.conf currently are [DEFAULT] and\n"
9551
"[ALIASES]. Section headers are case sensitive. The default section provides "
9552
"for\n"
9553
"setting options which can be overridden with the branch config file."
9554
msgstr ""
9555
9556
#: en/help_topics/configuration.txt:245
9557
msgid ""
9558
"For ``locations.conf``, the options from the section with the\n"
9559
"longest matching section header are used to the exclusion of other\n"
9560
"potentially valid section headers. A section header uses the path for\n"
9561
"the branch as the section header. Some examples include::"
9562
msgstr ""
9563
9564
#: en/help_topics/configuration.txt:250
9565
msgid ""
9566
" [http://mybranches.isp.com/~jdoe/branchdir]\n"
9567
" [/home/jdoe/branches/]"
9568
msgstr ""
9569
9570
#: en/help_topics/configuration.txt:253
9571
msgid ""
9572
"\n"
9573
"Section options\n"
9574
"^^^^^^^^^^^^^^^"
9575
msgstr ""
9576
9577
#: en/help_topics/configuration.txt:257
9578
msgid ""
9579
"A section option resides within a section. A section option contains an\n"
9580
"option name, an equals sign and a value. For example::"
9581
msgstr ""
9582
9583
#: en/help_topics/configuration.txt:260
9584
msgid ""
9585
" email = John Doe <jdoe@isp.com>\n"
9586
" gpg_signing_key = Amy Pond <amy@example.com>"
9587
msgstr ""
9588
9589
#: en/help_topics/configuration.txt:263
9590
msgid ""
9591
"A option can reference other options by enclosing them in curly brackets::"
9592
msgstr ""
9593
9594
#: en/help_topics/configuration.txt:265
9595
msgid ""
9596
" my_branch_name = feature_x\n"
9597
" my_server = bzr+ssh://example.com\n"
9598
" push_location = {my_server}/project/{my_branch_name}"
9599
msgstr ""
9600
9601
#: en/help_topics/configuration.txt:269
9602
msgid ""
9603
"Option policies\n"
9604
"^^^^^^^^^^^^^^^"
9605
msgstr ""
9606
9607
#: en/help_topics/configuration.txt:272
9608
msgid ""
9609
"Options defined in a section affect the named directory or URL plus\n"
9610
"any locations they contain. Policies can be used to change how an\n"
9611
"option value is interpreted for contained locations. Currently\n"
9612
"there are three policies available:"
9613
msgstr ""
9614
9615
#: en/help_topics/configuration.txt:277
9616
msgid ""
9617
" none:\n"
9618
" the value is interpreted the same for contained locations. This is\n"
9619
" the default behaviour.\n"
9620
" norecurse:\n"
9621
" the value is only used for the exact location specified by the\n"
9622
" section name.\n"
9623
" appendpath:\n"
9624
" for contained locations, any additional path components are\n"
9625
" appended to the value."
9626
msgstr ""
9627
9628
#: en/help_topics/configuration.txt:287
9629
msgid ""
9630
"Policies are specified by keys with names of the form "
9631
"\"<option_name>:policy\".\n"
9632
"For example, to define the push location for a tree of branches, the\n"
9633
"following could be used::"
9634
msgstr ""
9635
9636
#: en/help_topics/configuration.txt:291
9637
msgid ""
9638
" [/top/location]\n"
9639
" push_location = sftp://example.com/location\n"
9640
" push_location:policy = appendpath"
9641
msgstr ""
9642
9643
#: en/help_topics/configuration.txt:295
9644
msgid ""
9645
"With this configuration, the push location for ``/top/location/branch1``\n"
9646
"would be ``sftp://example.com/location/branch1``."
9647
msgstr ""
9648
9649
#: en/help_topics/configuration.txt:298
9650
msgid ""
9651
"Section local options\n"
9652
"^^^^^^^^^^^^^^^^^^^^^"
9653
msgstr ""
9654
9655
#: en/help_topics/configuration.txt:301
9656
msgid ""
9657
"Some options are defined automatically inside a given section and can be\n"
9658
"refered to in this section only. "
9659
msgstr ""
9660
9661
#: en/help_topics/configuration.txt:304
9662
msgid "For example, the ``appendpath`` policy can be used like this::"
9663
msgstr ""
9664
9665
#: en/help_topics/configuration.txt:306
9666
msgid ""
9667
" [/home/vila/src/bzr/bugs]\n"
9668
" mypush = lp:~vila/bzr\n"
9669
" mypush:policy=appendpath"
9670
msgstr ""
9671
9672
#: en/help_topics/configuration.txt:310
9673
msgid "Using ``relpath`` to achieve the same result is done like this::"
9674
msgstr ""
9675
9676
#: en/help_topics/configuration.txt:312
9677
msgid ""
9678
" [/home/vila/src/bzr/bugs]\n"
9679
" mypush = lp:~vila/bzr/{relpath}"
9680
msgstr ""
9681
9682
#: en/help_topics/configuration.txt:315
9683
msgid ""
9684
"In both cases, when used in a directory like\n"
9685
"``/home/vila/src/bzr/bugs/832013-expand-in-stack`` we'll get::"
9686
msgstr ""
9687
9688
#: en/help_topics/configuration.txt:318 en/help_topics/configuration.txt:329
9689
msgid ""
9690
" $ bzr config mypush\n"
9691
" lp:~vila/bzr/832013-expand-in-stack"
9692
msgstr ""
9693
9694
#: en/help_topics/configuration.txt:321
9695
msgid "Another such option is ``basename`` which can be used like this::"
9696
msgstr ""
9697
9698
#: en/help_topics/configuration.txt:323
9699
msgid ""
9700
" [/home/vila/src/bzr]\n"
9701
" mypush = lp:~vila/bzr/{basename}"
9702
msgstr ""
9703
9704
#: en/help_topics/configuration.txt:326
9705
msgid ""
9706
"When used in a directory like\n"
9707
"``/home/vila/src/bzr/bugs/832013-expand-in-stack`` we'll get::"
9708
msgstr ""
9709
9710
#: en/help_topics/configuration.txt:332
9711
msgid ""
9712
"Note that ``basename`` here refers to the base name of ``relpath`` which\n"
9713
"itself is defined as the relative path between the section name and the\n"
9714
"location it matches."
9715
msgstr ""
9716
9717
#: en/help_topics/configuration.txt:336
9718
msgid ""
9719
"When an option is local to a Section, it cannot be referred to from option\n"
9720
"values in any other section from the same ``Store`` nor from any other\n"
9721
"``Store``."
9722
msgstr ""
9723
9724
#: en/help_topics/configuration.txt:340
9725
msgid ""
9726
"\n"
9727
"The main configuration file, bazaar.conf\n"
9728
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
9729
msgstr ""
9730
9731
#: en/help_topics/configuration.txt:344
9732
msgid ""
9733
"``bazaar.conf`` allows two sections: ``[DEFAULT]`` and ``[ALIASES]``.\n"
9734
"The default section contains the default\n"
9735
"configuration options for all branches. The default section can be\n"
9736
"overriden by providing a branch-specific section in ``locations.conf``."
9737
msgstr ""
9738
9739
#: en/help_topics/configuration.txt:349
9740
msgid "A typical ``bazaar.conf`` section often looks like the following::"
9741
msgstr ""
9742
9743
#: en/help_topics/configuration.txt:351
9744
msgid ""
9745
" [DEFAULT]\n"
9746
" email = John Doe <jdoe@isp.com>\n"
9747
" editor = /usr/bin/vim\n"
9748
" create_signatures = when-required"
9749
msgstr ""
9750
9751
#: en/help_topics/configuration.txt:356
9752
msgid ""
9753
"\n"
9754
"The branch location configuration file, locations.conf\n"
9755
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
9756
msgstr ""
9757
9758
#: en/help_topics/configuration.txt:360
9759
msgid ""
9760
"``locations.conf`` allows one to specify overriding settings for\n"
9761
"a specific branch. The format is almost identical to the default section in\n"
9762
"bazaar.conf with one significant change: The section header, instead of "
9763
"saying\n"
9764
"default, will be the path to a branch that you wish to override a value\n"
9765
"for. The '?' and '*' wildcards are supported::"
9766
msgstr ""
9767
9768
#: en/help_topics/configuration.txt:366
9769
msgid ""
9770
" [/home/jdoe/branches/nethack]\n"
9771
" email = Nethack Admin <nethack@nethack.com>"
9772
msgstr ""
9773
9774
#: en/help_topics/configuration.txt:369
9775
msgid ""
9776
" [http://hypothetical.site.com/branches/devel-branch]\n"
9777
" create_signatures = always"
9778
msgstr ""
9779
9780
#: en/help_topics/configuration.txt:372
9781
msgid ""
9782
"The authentication configuration file, authentication.conf\n"
9783
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
9784
msgstr ""
9785
9786
#: en/help_topics/configuration.txt:375
9787
msgid ""
9788
"``authentication.conf`` allows one to specify credentials for\n"
9789
"remote servers. This can be used for all the supported transports and any "
9790
"part\n"
9791
"of bzr that requires authentication (smtp for example)."
9792
msgstr ""
9793
9794
#: en/help_topics/configuration.txt:379
9795
msgid ""
9796
"The syntax of the file obeys the same rules as the others except for the\n"
9797
"option policies which don't apply."
9798
msgstr ""
9799
9800
#: en/help_topics/configuration.txt:382
9801
msgid ""
9802
"For more information on the possible uses of the authentication "
9803
"configuration\n"
9804
"file see :doc:`authentication-help`."
9805
msgstr ""
9806
9807
#: en/help_topics/configuration.txt:385
9808
msgid ""
9809
"\n"
9810
"Common options\n"
9811
"--------------"
9812
msgstr ""
9813
9814
#: en/help_topics/configuration.txt:389
9815
msgid ""
9816
"debug_flags\n"
9817
"~~~~~~~~~~~"
9818
msgstr ""
9819
9820
#: en/help_topics/configuration.txt:392
9821
msgid ""
9822
"A comma-separated list of debugging options to turn on. The same values\n"
9823
"can be used as with the -D command-line option (see `help global-options`).\n"
9824
"For example::"
9825
msgstr ""
9826
9827
#: en/help_topics/configuration.txt:396
9828
msgid " debug_flags = hpss"
9829
msgstr ""
9830
9831
#: en/help_topics/configuration.txt:400
9832
msgid " debug_flags = hpss,evil"
9833
msgstr ""
9834
9835
#: en/help_topics/configuration.txt:402
9836
msgid ""
9837
"email\n"
9838
"~~~~~"
9839
msgstr ""
9840
9841
#: en/help_topics/configuration.txt:405
9842
msgid ""
9843
"The email address to use when committing a branch. Typically takes the form\n"
9844
"of::"
9845
msgstr ""
9846
9847
#: en/help_topics/configuration.txt:408
9848
msgid " email = Full Name <account@hostname.tld>"
9849
msgstr ""
9850
9851
#: en/help_topics/configuration.txt:410
9852
msgid ""
9853
"editor\n"
9854
"~~~~~~"
9855
msgstr ""
9856
9857
#: en/help_topics/configuration.txt:413
9858
msgid ""
9859
"The path of the editor that you wish to use if *bzr commit* is run without\n"
9860
"a commit message. This setting is trumped by the environment variable\n"
9861
"``BZR_EDITOR``, and overrides the ``VISUAL`` and ``EDITOR`` environment\n"
9862
"variables."
9863
msgstr ""
9864
9865
#: en/help_topics/configuration.txt:418
9866
msgid ""
9867
"log_format\n"
9868
"~~~~~~~~~~"
9869
msgstr ""
9870
9871
#: en/help_topics/configuration.txt:421
9872
msgid ""
9873
"The default log format to use. Standard log formats are ``long``, ``short``\n"
9874
"and ``line``. Additional formats may be provided by plugins. The default\n"
9875
"value is ``long``."
9876
msgstr ""
9877
9878
#: en/help_topics/configuration.txt:425
9879
msgid ""
9880
"check_signatures\n"
9881
"~~~~~~~~~~~~~~~~"
9882
msgstr ""
9883
9884
#: en/help_topics/configuration.txt:428
9885
msgid ""
9886
"Reserved for future use. These options will allow a policy for branches to\n"
9887
"require signatures."
9888
msgstr ""
9889
9890
#: en/help_topics/configuration.txt:431
9891
msgid ""
9892
"require\n"
9893
" The gnupg signature for revisions must be present and must be valid."
9894
msgstr ""
9895
9896
#: en/help_topics/configuration.txt:434
9897
msgid ""
9898
"ignore\n"
9899
" Do not check gnupg signatures of revisions."
9900
msgstr ""
9901
9902
#: en/help_topics/configuration.txt:437
9903
msgid ""
9904
"check-available\n"
9905
" (default) If gnupg signatures for revisions are present, check them.\n"
9906
" Bazaar will fail if it finds a bad signature, but will not fail if\n"
9907
" no signature is present."
9908
msgstr ""
9909
9910
#: en/help_topics/configuration.txt:442
9911
msgid ""
9912
"create_signatures\n"
9913
"~~~~~~~~~~~~~~~~~"
9914
msgstr ""
9915
9916
#: en/help_topics/configuration.txt:445
9917
msgid ""
9918
"Defines the behaviour of signing revisions on commits. By default bzr will "
9919
"not\n"
9920
"sign new commits."
9921
msgstr ""
9922
9923
#: en/help_topics/configuration.txt:448
9924
msgid ""
9925
"always\n"
9926
" Sign every new revision that is committed. If the signing fails then "
9927
"the\n"
9928
" commit will not be made."
9929
msgstr ""
9930
9931
#: en/help_topics/configuration.txt:452
9932
msgid ""
9933
"when-required\n"
9934
" Reserved for future use."
9935
msgstr ""
9936
9937
#: en/help_topics/configuration.txt:455
9938
msgid ""
9939
"never\n"
9940
" Reserved for future use."
9941
msgstr ""
9942
9943
#: en/help_topics/configuration.txt:458
9944
msgid ""
9945
"In future it is planned that ``when-required`` will sign newly\n"
9946
"committed revisions only when the branch requires them. ``never`` will "
9947
"refuse\n"
9948
"to sign newly committed revisions, even if the branch requires signatures."
9949
msgstr ""
9950
9951
#: en/help_topics/configuration.txt:462
9952
msgid ""
9953
"dirstate.fdatasync\n"
9954
"~~~~~~~~~~~~~~~~~~"
9955
msgstr ""
9956
9957
#: en/help_topics/configuration.txt:465
9958
msgid ""
9959
"If true (default), working tree metadata changes are flushed through the\n"
9960
"OS buffers to physical disk. This is somewhat slower, but means data\n"
9961
"should not be lost if the machine crashes. See also repository.fdatasync."
9962
msgstr ""
9963
9964
#: en/help_topics/configuration.txt:469
9965
msgid ""
9966
"gpg_signing_key\n"
9967
"~~~~~~~~~~~~~~~"
9968
msgstr ""
9969
9970
#: en/help_topics/configuration.txt:472
9971
msgid ""
9972
"The GnuPG user identity to use when signing commits. Can be an e-mail\n"
9973
"address, key fingerprint or full key ID. When unset or when set to\n"
9974
"\"default\" Bazaar will use the user e-mail set with ``whoami``."
9975
msgstr ""
9976
9977
#: en/help_topics/configuration.txt:476
9978
msgid ""
9979
"recurse\n"
9980
"~~~~~~~"
9981
msgstr ""
9982
9983
#: en/help_topics/configuration.txt:479
9984
msgid ""
9985
"Only useful in ``locations.conf``. Defines whether or not the\n"
9986
"configuration for this section applies to subdirectories:"
9987
msgstr ""
9988
9989
#: en/help_topics/configuration.txt:482
9990
msgid ""
9991
"true\n"
9992
" (default) This section applies to subdirectories as well."
9993
msgstr ""
9994
9995
#: en/help_topics/configuration.txt:485
9996
msgid ""
9997
"false\n"
9998
" This section only applies to the branch at this directory and not\n"
9999
" branches below it."
10000
msgstr ""
10001
10002
#: en/help_topics/configuration.txt:489
10003
msgid ""
10004
"gpg_signing_command\n"
10005
"~~~~~~~~~~~~~~~~~~~"
10006
msgstr ""
10007
10008
#: en/help_topics/configuration.txt:492
10009
msgid ""
10010
"(Default: \"gpg\"). Which program should be used to sign and check "
10011
"revisions.\n"
10012
"For example::"
10013
msgstr ""
10014
10015
#: en/help_topics/configuration.txt:495
10016
msgid " gpg_signing_command = /usr/bin/gnpg"
10017
msgstr ""
10018
10019
#: en/help_topics/configuration.txt:497
10020
msgid ""
10021
"The specified command must accept the options \"--clearsign\" and \"-u "
10022
"<email>\"."
10023
msgstr ""
10024
10025
#: en/help_topics/configuration.txt:499
10026
msgid ""
10027
"bzr_remote_path\n"
10028
"~~~~~~~~~~~~~~~"
10029
msgstr ""
10030
10031
#: en/help_topics/configuration.txt:502
10032
msgid ""
10033
"(Default: \"bzr\"). The path to the command that should be used to run the "
10034
"smart\n"
10035
"server for bzr. This value may only be specified in locations.conf, because:"
10036
msgstr ""
10037
10038
#: en/help_topics/configuration.txt:505
10039
msgid ""
10040
"- it's needed before branch.conf is accessible\n"
10041
"- allowing remote branch.conf files to specify commands would be a security\n"
10042
" risk"
10043
msgstr ""
10044
10045
#: en/help_topics/configuration.txt:509
10046
msgid "It is overridden by the BZR_REMOTE_PATH environment variable."
10047
msgstr ""
10048
10049
#: en/help_topics/configuration.txt:511
10050
msgid ""
10051
"smtp_server\n"
10052
"~~~~~~~~~~~"
10053
msgstr ""
10054
10055
#: en/help_topics/configuration.txt:514
10056
msgid ""
10057
"(Default: \"localhost\"). SMTP server to use when Bazaar needs to send\n"
10058
"email, eg. with ``merge-directive --mail-to``, or the bzr-email plugin."
10059
msgstr ""
10060
10061
#: en/help_topics/configuration.txt:517
10062
msgid ""
10063
"smtp_username, smtp_password\n"
10064
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
10065
msgstr ""
10066
10067
#: en/help_topics/configuration.txt:520
10068
msgid ""
10069
"User and password to authenticate to the SMTP server. If smtp_username\n"
10070
"is set, and smtp_password is not, Bazaar will prompt for a password.\n"
10071
"These settings are only needed if the SMTP server requires authentication\n"
10072
"to send mail."
10073
msgstr ""
10074
10075
#: en/help_topics/configuration.txt:525
10076
msgid ""
10077
"locks.steal_dead\n"
10078
"~~~~~~~~~~~~~~~~"
10079
msgstr ""
10080
10081
#: en/help_topics/configuration.txt:528
10082
msgid ""
10083
"If set to true, bzr will automatically break locks held by processes from\n"
10084
"the same machine and user that are no longer alive. Otherwise, it will\n"
10085
"print a message and you can break the lock manually, if you are satisfied\n"
10086
"the object is no longer in use."
10087
msgstr ""
10088
10089
#: en/help_topics/configuration.txt:533
10090
msgid ""
10091
"mail_client\n"
10092
"~~~~~~~~~~~"
10093
msgstr ""
10094
10095
#: en/help_topics/configuration.txt:536
10096
msgid ""
10097
"A mail client to use for sending merge requests.\n"
10098
"By default, bzr will try to use ``mapi`` on Windows. On other platforms, "
10099
"it\n"
10100
"will try ``xdg-email``. If either of these fails, it will fall back to\n"
10101
"``editor``."
10102
msgstr ""
10103
10104
#: en/help_topics/configuration.txt:541
10105
msgid "Supported values for specific clients:"
10106
msgstr ""
10107
10108
#: en/help_topics/configuration.txt:543
10109
msgid ""
10110
":claws: Use Claws. This skips a dialog for attaching files.\n"
10111
":evolution: Use Evolution.\n"
10112
":kmail: Use KMail.\n"
10113
":mutt: Use Mutt.\n"
10114
":thunderbird: Use Mozilla Thunderbird or Icedove. For Thunderbird/Icedove "
10115
"1.5,\n"
10116
" this works around some bugs that xdg-email doesn't handle."
10117
msgstr ""
10118
10119
#: en/help_topics/configuration.txt:550
10120
msgid "Supported generic values are:"
10121
msgstr ""
10122
10123
#: en/help_topics/configuration.txt:552
10124
msgid ""
10125
":default: See above.\n"
10126
":editor: Use your editor to compose the merge request. This also uses\n"
10127
" your commit id, (see ``bzr whoami``), smtp_server and (optionally)\n"
10128
" smtp_username and smtp_password.\n"
10129
":mapi: Use your preferred e-mail client on Windows.\n"
10130
":xdg-email: Use xdg-email to run your preferred mail program"
10131
msgstr ""
10132
10133
#: en/help_topics/configuration.txt:559
10134
msgid ""
10135
"repository.fdatasync\n"
10136
"~~~~~~~~~~~~~~~~~~~~"
10137
msgstr ""
10138
10139
#: en/help_topics/configuration.txt:562
10140
msgid ""
10141
"If true (default), repository changes are flushed through the OS buffers\n"
10142
"to physical disk. This is somewhat slower, but means data should not be\n"
10143
"lost if the machine crashes. See also dirstate.fdatasync."
10144
msgstr ""
10145
10146
#: en/help_topics/configuration.txt:566
10147
msgid ""
10148
"submit_branch\n"
10149
"~~~~~~~~~~~~~"
10150
msgstr ""
10151
10152
#: en/help_topics/configuration.txt:569
10153
msgid ""
10154
"The branch you intend to submit your current work to. This is "
10155
"automatically\n"
10156
"set by ``bzr send``, and is also used by the ``submit:`` revision spec. "
10157
"This\n"
10158
"should usually be set on a per-branch or per-location basis."
10159
msgstr ""
10160
10161
#: en/help_topics/configuration.txt:573
10162
msgid ""
10163
"public_branch\n"
10164
"~~~~~~~~~~~~~"
10165
msgstr ""
10166
10167
#: en/help_topics/configuration.txt:576
10168
msgid ""
10169
"A publically-accessible version of this branch (implying that this version "
10170
"is\n"
10171
"not publically-accessible). Used (and set) by ``bzr send``."
10172
msgstr ""
10173
10174
#: en/help_topics/configuration.txt:579
10175
msgid ""
10176
"suppress_warnings\n"
10177
"~~~~~~~~~~~~~~~~~"
10178
msgstr ""
10179
10180
#: en/help_topics/configuration.txt:582
10181
msgid ""
10182
"A list of strings, each string represent a warning that can be emitted by\n"
10183
"bzr. Mentioning a warning in this list tells bzr to not emit it."
10184
msgstr ""
10185
10186
#: en/help_topics/configuration.txt:585
10187
msgid "Valid values:"
10188
msgstr ""
10189
10190
#: en/help_topics/configuration.txt:587
10191
msgid ""
10192
"* ``format_deprecation``:\n"
10193
" whether the format deprecation warning is shown on repositories that "
10194
"are\n"
10195
" using deprecated formats."
10196
msgstr ""
10197
10198
#: en/help_topics/configuration.txt:591
10199
msgid ""
10200
"default_format\n"
10201
"~~~~~~~~~~~~~~"
10202
msgstr ""
10203
10204
#: en/help_topics/configuration.txt:594
10205
msgid ""
10206
"A format name for the default format used when creating branches. See "
10207
"``bzr\n"
10208
"help formats`` for possible values."
10209
msgstr ""
10210
10211
#: en/help_topics/configuration.txt:597
10212
msgid ""
10213
"\n"
10214
"Unicode options\n"
10215
"---------------"
10216
msgstr ""
10217
10218
#: en/help_topics/configuration.txt:601
10219
msgid ""
10220
"output_encoding\n"
10221
"~~~~~~~~~~~~~~~"
10222
msgstr ""
10223
10224
#: en/help_topics/configuration.txt:604
10225
msgid ""
10226
"A Python unicode encoding name for text output from bzr, such as log\n"
10227
"information. Values include: utf8, cp850, ascii, iso-8859-1. The default\n"
10228
"is the terminal encoding prefered by the operating system."
10229
msgstr ""
10230
10231
#: en/help_topics/configuration.txt:608
10232
msgid ""
10233
"\n"
10234
"Branch type specific options\n"
10235
"----------------------------"
10236
msgstr ""
10237
10238
#: en/help_topics/configuration.txt:612
10239
msgid ""
10240
"These options apply only to branches that use the ``dirstate-tags`` or\n"
10241
"later format. They\n"
10242
"are usually set in ``.bzr/branch/branch.conf`` automatically, but may be\n"
10243
"manually set in ``locations.conf`` or ``bazaar.conf``."
10244
msgstr ""
10245
10246
#: en/help_topics/configuration.txt:617
10247
msgid ""
10248
"append_revisions_only\n"
10249
"~~~~~~~~~~~~~~~~~~~~~"
10250
msgstr ""
10251
10252
#: en/help_topics/configuration.txt:620
10253
msgid ""
10254
"If set to \"True\" then revisions can only be appended to the log, not\n"
10255
"removed. A branch with this setting enabled can only pull from another\n"
10256
"branch if the other branch's log is a longer version of its own. This is\n"
10257
"normally set by ``bzr init --append-revisions-only``. If you set it\n"
10258
"manually, use either 'True' or 'False' (case-sensitive) to maintain\n"
10259
"compatibility with previous bzr versions (older than 2.2)."
10260
msgstr ""
10261
10262
#: en/help_topics/configuration.txt:627
10263
msgid ""
10264
"parent_location\n"
10265
"~~~~~~~~~~~~~~~"
10266
msgstr ""
10267
10268
#: en/help_topics/configuration.txt:630
10269
msgid ""
10270
"If present, the location of the default branch for pull or merge. This "
10271
"option\n"
10272
"is normally set when creating a branch, the first ``pull`` or by ``pull\n"
10273
"--remember``."
10274
msgstr ""
10275
10276
#: en/help_topics/configuration.txt:634
10277
msgid ""
10278
"push_location\n"
10279
"~~~~~~~~~~~~~"
10280
msgstr ""
10281
10282
#: en/help_topics/configuration.txt:637
10283
msgid ""
10284
"If present, the location of the default branch for push. This option\n"
10285
"is normally set by the first ``push`` or ``push --remember``."
10286
msgstr ""
10287
10288
#: en/help_topics/configuration.txt:640
10289
msgid ""
10290
"push_strict\n"
10291
"~~~~~~~~~~~"
10292
msgstr ""
10293
10294
#: en/help_topics/configuration.txt:643
10295
msgid ""
10296
"If present, defines the ``--strict`` option default value for checking\n"
10297
"uncommitted changes before pushing."
10298
msgstr ""
10299
10300
#: en/help_topics/configuration.txt:646
10301
msgid ""
10302
"dpush_strict\n"
10303
"~~~~~~~~~~~~"
10304
msgstr ""
10305
10306
#: en/help_topics/configuration.txt:649
10307
msgid ""
10308
"If present, defines the ``--strict`` option default value for checking\n"
10309
"uncommitted changes before pushing into a different VCS without any\n"
10310
"custom bzr metadata."
10311
msgstr ""
10312
10313
#: en/help_topics/configuration.txt:653
10314
msgid ""
10315
"bound_location\n"
10316
"~~~~~~~~~~~~~~"
10317
msgstr ""
10318
10319
#: en/help_topics/configuration.txt:656
10320
msgid ""
10321
"The location that commits should go to when acting as a checkout.\n"
10322
"This option is normally set by ``bind``."
10323
msgstr ""
10324
10325
#: en/help_topics/configuration.txt:659
10326
msgid ""
10327
"bound\n"
10328
"~~~~~"
10329
msgstr ""
10330
10331
#: en/help_topics/configuration.txt:662
10332
msgid ""
10333
"If set to \"True\", the branch should act as a checkout, and push each "
10334
"commit to\n"
10335
"the bound_location. This option is normally set by ``bind``/``unbind``."
10336
msgstr ""
10337
10338
#: en/help_topics/configuration.txt:665
10339
msgid ""
10340
"send_strict\n"
10341
"~~~~~~~~~~~"
10342
msgstr ""
10343
10344
#: en/help_topics/configuration.txt:668
10345
msgid ""
10346
"If present, defines the ``--strict`` option default value for checking\n"
10347
"uncommitted changes before sending a merge directive."
10348
msgstr ""
10349
10350
#: en/help_topics/configuration.txt:671
10351
msgid ""
10352
"add.maximum_file_size\n"
10353
"~~~~~~~~~~~~~~~~~~~~~"
10354
msgstr ""
10355
10356
#: en/help_topics/configuration.txt:674
10357
msgid ""
10358
"Defines the maximum file size the command line \"add\" operation will allow\n"
10359
"in recursive mode, with files larger than this value being skipped. You may "
10360
"\n"
10361
"specify this value as an integer (in which case it is interpreted as bytes), "
10362
"\n"
10363
"or you may specify the value using SI units, i.e. 10KB, 20MB, 1G. A value of "
10364
"0 \n"
10365
"will disable skipping."
10366
msgstr ""
10367
10368
#: en/help_topics/configuration.txt:680
10369
msgid ""
10370
"External Merge Tools\n"
10371
"--------------------"
10372
msgstr ""
10373
10374
#: en/help_topics/configuration.txt:683
10375
msgid ""
10376
"bzr.mergetool.<name>\n"
10377
"~~~~~~~~~~~~~~~~~~~~"
10378
msgstr ""
10379
10380
#: en/help_topics/configuration.txt:686
10381
msgid ""
10382
"Defines an external merge tool called <name> with the given command-line.\n"
10383
"Arguments containing spaces should be quoted using single or double quotes. "
10384
"The\n"
10385
"executable may omit its path if it can be found on the PATH."
10386
msgstr ""
10387
10388
#: en/help_topics/configuration.txt:690
10389
msgid ""
10390
"The following markers can be used in the command-line to substitute "
10391
"filenames\n"
10392
"involved in the merge conflict::"
10393
msgstr ""
10394
10395
#: en/help_topics/configuration.txt:693
10396
msgid ""
10397
" {base} file.BASE\n"
10398
" {this} file.THIS\n"
10399
" {other} file.OTHER\n"
10400
" {result} output file\n"
10401
" {this_temp} temp copy of file.THIS, used to overwrite output file if "
10402
"merge\n"
10403
" succeeds."
10404
msgstr ""
10405
10406
#: en/help_topics/configuration.txt:702
10407
msgid " bzr.mergetool.kdiff3 = kdiff3 {base} {this} {other} -o {result}"
10408
msgstr ""
10409
10410
#: en/help_topics/configuration.txt:704
10411
msgid ""
10412
"bzr.default_mergetool\n"
10413
"~~~~~~~~~~~~~~~~~~~~~"
10414
msgstr ""
10415
10416
#: en/help_topics/configuration.txt:707
10417
msgid ""
10418
"Specifies which external merge tool (as defined above) should be selected "
10419
"by\n"
10420
"default in tools such as ``bzr qconflicts``."
10421
msgstr ""
10422
10423
#: en/help_topics/configuration.txt:712
10424
msgid " bzr.default_mergetool = kdiff3\n"
10425
msgstr ""
10426
10427
#: en/help_topics/conflict-types.txt:1
10428
msgid ""
10429
"Conflict Types\n"
10430
"=============="
10431
msgstr ""
10432
10433
#: en/help_topics/conflict-types.txt:4
10434
msgid ""
10435
"Some operations, like merge, revert and pull, modify the contents of your\n"
10436
"working tree. These modifications are programmatically generated, and so "
10437
"they\n"
10438
"may conflict with the current state of your working tree. "
10439
msgstr ""
10440
10441
#: en/help_topics/conflict-types.txt:8
10442
msgid ""
10443
"When conflicts are present in your working tree (as shown by ``bzr\n"
10444
"conflicts``), you should resolve them and then inform bzr that the "
10445
"conflicts\n"
10446
"have been resolved."
10447
msgstr ""
10448
10449
#: en/help_topics/conflict-types.txt:12
10450
msgid ""
10451
"Resolving conflicts is sometimes not obvious. Either because the user that\n"
10452
"should resolve them is not the one responsible for their occurrence, as is "
10453
"the\n"
10454
"case when merging other people's work or because some conflicts are "
10455
"presented\n"
10456
"in a way that is not easy to understand."
10457
msgstr ""
10458
10459
#: en/help_topics/conflict-types.txt:17
10460
msgid ""
10461
"Bazaar tries to avoid conflicts ; its aim is to ask you to resolve the\n"
10462
"conflict if and only if there's an actual conceptual conflict in the source\n"
10463
"tree. Because Bazaar doesn't understand the real meaning of the files "
10464
"being\n"
10465
"versioned, it can, when faced with ambiguities, fall short in either "
10466
"direction\n"
10467
"trying to resolve the conflict itself. Many kinds of changes can be "
10468
"combined\n"
10469
"programmatically, but sometimes only a human can determine the right thing "
10470
"to\n"
10471
"do."
10472
msgstr ""
10473
10474
#: en/help_topics/conflict-types.txt:25
10475
msgid ""
10476
"When Bazaar generates a conflict, it adds information into the working tree "
10477
"to\n"
10478
"present the conflicting versions, and it's up to you to find the correct\n"
10479
"resolution."
10480
msgstr ""
10481
10482
#: en/help_topics/conflict-types.txt:29
10483
msgid "Whatever the conflict is, resolving it is roughly done in two steps:"
10484
msgstr ""
10485
10486
#: en/help_topics/conflict-types.txt:31
10487
msgid ""
10488
"1. Modify the working tree content so that the conflicted item is now in "
10489
"the\n"
10490
" state you want to keep, then"
10491
msgstr ""
10492
10493
#: en/help_topics/conflict-types.txt:34
10494
msgid ""
10495
"2. Inform Bazaar that the conflict is now solved and ask to cleanup any\n"
10496
" remaining generated information (``bzr resolve <item>``)."
10497
msgstr ""
10498
10499
#: en/help_topics/conflict-types.txt:37
10500
msgid ""
10501
"For most conflict types, there are some obvious ways to modify the working\n"
10502
"tree and put it into the desired state. For some types of conflicts, Bazaar\n"
10503
"itself already made a choice, when possible."
10504
msgstr ""
10505
10506
#: en/help_topics/conflict-types.txt:41
10507
msgid ""
10508
"Yet, whether Bazaar makes a choice or not, there are some other simple but\n"
10509
"different ways to resolve the conflict."
10510
msgstr ""
10511
10512
#: en/help_topics/conflict-types.txt:44
10513
msgid ""
10514
"Each type of conflict is explained below, and the action which must be done "
10515
"to\n"
10516
"resolve the conflict is outlined."
10517
msgstr ""
10518
10519
#: en/help_topics/conflict-types.txt:47
10520
msgid ""
10521
"Various actions are available depending on the kind of conflict, for some "
10522
"of\n"
10523
"these actions, Bazaar can provide some help. In the end you should at least\n"
10524
"inform Bazaar that you're done with the conflict with::"
10525
msgstr ""
10526
10527
#: en/help_topics/conflict-types.txt:51
10528
msgid " ``bzr resolve FILE --action=done'"
10529
msgstr ""
10530
10531
#: en/help_topics/conflict-types.txt:53
10532
msgid ""
10533
"Note that this is the default action when a single file is involved so you "
10534
"can\n"
10535
"simply use::"
10536
msgstr ""
10537
10538
#: en/help_topics/conflict-types.txt:56
10539
msgid " ``bzr resolve FILE``"
10540
msgstr ""
10541
10542
#: en/help_topics/conflict-types.txt:58
10543
msgid "See ``bzr help resolve`` for more details."
10544
msgstr ""
10545
10546
#: en/help_topics/conflict-types.txt:60
10547
msgid ""
10548
"Text conflicts\n"
10549
"--------------"
10550
msgstr ""
10551
10552
#: en/help_topics/conflict-types.txt:63 en/help_topics/conflict-types.txt:120
10553
#: en/help_topics/conflict-types.txt:151 en/help_topics/conflict-types.txt:175
10554
#: en/help_topics/conflict-types.txt:198 en/help_topics/conflict-types.txt:213
10555
#: en/help_topics/conflict-types.txt:239 en/help_topics/conflict-types.txt:281
10556
#: en/help_topics/conflict-types.txt:303 en/help_topics/conflict-types.txt:339
10557
msgid "Typical message::"
10558
msgstr ""
10559
10560
#: en/help_topics/conflict-types.txt:65
10561
msgid " Text conflict in FILE"
10562
msgstr ""
10563
10564
#: en/help_topics/conflict-types.txt:67
10565
msgid ""
10566
"These are produced when a text merge cannot completely reconcile two sets "
10567
"of\n"
10568
"text changes. Bazaar will emit files for each version with the extensions\n"
10569
"THIS, OTHER, and BASE. THIS is the version of the file from the target "
10570
"tree,\n"
10571
"i.e. the tree that you are merging changes into. OTHER is the version that "
10572
"you\n"
10573
"are merging into the target. BASE is an older version that is used as a "
10574
"basis\n"
10575
"for comparison."
10576
msgstr ""
10577
10578
#: en/help_topics/conflict-types.txt:74
10579
msgid ""
10580
"In the main copy of the file, Bazaar will include all the changes that it\n"
10581
"could reconcile, and any un-reconciled conflicts are surrounded by\n"
10582
"\"herringbone\" markers like ``<<<<<<<``."
10583
msgstr ""
10584
10585
#: en/help_topics/conflict-types.txt:78
10586
msgid ""
10587
"Say the initial text is \"The project leader released it.\", and THIS "
10588
"modifies it\n"
10589
"to \"Martin Pool released it.\", while OTHER modifies it to \"The project "
10590
"leader\n"
10591
"released Bazaar.\" A conflict would look like this::"
10592
msgstr ""
10593
10594
#: en/help_topics/conflict-types.txt:82
10595
msgid ""
10596
" <<<<<<< TREE\n"
10597
" Martin Pool released it.\n"
10598
" =======\n"
10599
" The project leader released Bazaar.\n"
10600
" >>>>>>> MERGE-SOURCE"
10601
msgstr ""
10602
10603
#: en/help_topics/conflict-types.txt:88
10604
msgid "The correct resolution would be \"Martin Pool released Bazaar.\""
10605
msgstr ""
10606
10607
#: en/help_topics/conflict-types.txt:90
10608
msgid ""
10609
"You can handle text conflicts either by editing the main copy of the file,\n"
10610
"or by invoking external tools on the THIS, OTHER and BASE versions. It's\n"
10611
"worth mentioning that resolving text conflicts rarely involves picking one\n"
10612
"set of changes over the other (but see below when you encounter these\n"
10613
"cases). More often, the two sets of changes must be intelligently combined."
10614
msgstr ""
10615
10616
#: en/help_topics/conflict-types.txt:96
10617
msgid ""
10618
"If you edit the main copy, be sure to remove the herringbone markers. When\n"
10619
"you are done editing, the file should look like it never had a conflict, and "
10620
"be\n"
10621
"ready to commit."
10622
msgstr ""
10623
10624
#: en/help_topics/conflict-types.txt:100
10625
msgid ""
10626
"When you have resolved text conflicts, just run ``bzr resolve --auto``, and\n"
10627
"Bazaar will auto-detect which conflicts you have resolved."
10628
msgstr ""
10629
10630
#: en/help_topics/conflict-types.txt:103
10631
msgid ""
10632
"When the conflict is resolved, Bazaar deletes the previously generated\n"
10633
"``.BASE``, ``.THIS`` and ``.OTHER`` files if they are still present in the\n"
10634
"working tree."
10635
msgstr ""
10636
10637
#: en/help_topics/conflict-types.txt:107
10638
msgid ""
10639
"\n"
10640
"When you want to pick one set of changes over the other, you can use ``bzr\n"
10641
"resolve`` with one of the following actions:"
10642
msgstr ""
10643
10644
#: en/help_topics/conflict-types.txt:111
10645
msgid ""
10646
"* ``--action=take-this`` will issue ``mv FILE.THIS FILE``,\n"
10647
"* ``--action=take-other`` will issue ``mv FILE.OTHER FILE``."
10648
msgstr ""
10649
10650
#: en/help_topics/conflict-types.txt:114
10651
msgid ""
10652
"Note that if you have modified ``FILE.THIS`` or ``FILE.OTHER``, these\n"
10653
"modifications will be taken into account."
10654
msgstr ""
10655
10656
#: en/help_topics/conflict-types.txt:117
10657
msgid ""
10658
"Content conflicts\n"
10659
"-----------------"
10660
msgstr ""
10661
10662
#: en/help_topics/conflict-types.txt:122
10663
msgid " Contents conflict in FILE"
10664
msgstr ""
10665
10666
#: en/help_topics/conflict-types.txt:124
10667
msgid ""
10668
"This conflict happens when there are conflicting changes in the working "
10669
"tree\n"
10670
"and the merge source, but the conflicted items are not text files. They "
10671
"may\n"
10672
"be binary files, or symlinks, or directories. It can even happen with "
10673
"files\n"
10674
"that are deleted on one side, and modified on the other."
10675
msgstr ""
10676
10677
#: en/help_topics/conflict-types.txt:129
10678
msgid ""
10679
"Like text conflicts, Bazaar will emit THIS, OTHER and BASE files. (They may "
10680
"be\n"
10681
"regular files, symlinks or directories). But it will not include a \"main "
10682
"copy\"\n"
10683
"of the file with herringbone conflict markers. It will appear that the "
10684
"\"main\n"
10685
"copy\" has been renamed to THIS or OTHER."
10686
msgstr ""
10687
10688
#: en/help_topics/conflict-types.txt:134 en/help_topics/conflict-types.txt:182
10689
msgid ""
10690
"To resolve that kind of conflict, you should rebuild FILE from either "
10691
"version\n"
10692
"or a combination of both."
10693
msgstr ""
10694
10695
#: en/help_topics/conflict-types.txt:137 en/help_topics/conflict-types.txt:185
10696
#: en/help_topics/conflict-types.txt:226 en/help_topics/conflict-types.txt:252
10697
#: en/help_topics/conflict-types.txt:291 en/help_topics/conflict-types.txt:326
10698
#: en/help_topics/conflict-types.txt:361
10699
msgid "``bzr resolve`` recognizes the following actions:"
10700
msgstr ""
10701
10702
#: en/help_topics/conflict-types.txt:139
10703
msgid ""
10704
"* ``--action=take-this`` will issue ``bzr mv FILE.THIS FILE``,\n"
10705
"* ``--action=take-other`` will issue ``bzr mv FILE.OTHER FILE``,\n"
10706
"* ``--action=done`` will just mark the conflict as resolved."
10707
msgstr ""
10708
10709
#: en/help_topics/conflict-types.txt:143
10710
msgid ""
10711
"Any action will also delete the previously generated ``.BASE``, ``.THIS`` "
10712
"and\n"
10713
"``.OTHER`` files if they are still present in the working tree."
10714
msgstr ""
10715
10716
#: en/help_topics/conflict-types.txt:146 en/help_topics/conflict-types.txt:193
10717
#: en/help_topics/conflict-types.txt:234 en/help_topics/conflict-types.txt:276
10718
#: en/help_topics/conflict-types.txt:298 en/help_topics/conflict-types.txt:334
10719
#: en/help_topics/conflict-types.txt:369
10720
msgid ""
10721
"Bazaar cannot auto-detect when conflicts of this kind have been resolved."
10722
msgstr ""
10723
10724
#: en/help_topics/conflict-types.txt:148
10725
msgid ""
10726
"Tag conflicts\n"
10727
"-------------"
10728
msgstr ""
10729
10730
#: en/help_topics/conflict-types.txt:153
10731
msgid ""
10732
" Conflicting tags:\n"
10733
" version-0.1"
10734
msgstr ""
10735
10736
#: en/help_topics/conflict-types.txt:156
10737
msgid ""
10738
"When pulling from or pushing to another branch, Bazaar informs you about "
10739
"tags\n"
10740
"that conflict between the two branches; that is the same tag points to two\n"
10741
"different revisions. You need not resolve these conflicts, but subsequent\n"
10742
"uses of pull or push will result in the same message."
10743
msgstr ""
10744
10745
#: en/help_topics/conflict-types.txt:161
10746
msgid ""
10747
"To resolve the conflict, you must apply the correct tags to either the "
10748
"target\n"
10749
"branch or the source branch as appropriate. Use \"bzr tags --show-ids -d\n"
10750
"SOURCE_URL\" to see the tags in the source branch. If you want to make the\n"
10751
"target branch's tags match the source branch, then in the target branch do\n"
10752
"``bzr tag --force -r revid:REVISION_ID CONFLICTING_TAG`` for each of the\n"
10753
"CONFLICTING_TAGs, where REVISION_ID comes from the list of tags in the "
10754
"source\n"
10755
"branch. You need not call \"bzr resolve\" after doing this. To resolve in\n"
10756
"favor of the target branch, you need to similarly use ``tag --force`` in "
10757
"the\n"
10758
"source branch. (Note that pulling or pushing using --overwrite will "
10759
"overwrite\n"
10760
"all tags as well.)"
10761
msgstr ""
10762
10763
#: en/help_topics/conflict-types.txt:172
10764
msgid ""
10765
"Duplicate paths\n"
10766
"---------------"
10767
msgstr ""
10768
10769
#: en/help_topics/conflict-types.txt:177
10770
msgid " Conflict adding file FILE. Moved existing file to FILE.moved."
10771
msgstr ""
10772
10773
#: en/help_topics/conflict-types.txt:179
10774
msgid ""
10775
"Sometimes Bazaar will attempt to create a file using a pathname that has\n"
10776
"already been used. The existing file will be renamed to \"FILE.moved\". "
10777
msgstr ""
10778
10779
#: en/help_topics/conflict-types.txt:187
10780
msgid ""
10781
"* ``--action=take-this`` will issue ``bzr rm FILE ; bzr mv FILE.moved "
10782
"FILE``,\n"
10783
"* ``--action=take-other`` will issue ``bzr rm FILE.moved``,\n"
10784
"* ``--action=done`` will just mark the conflict as resolved."
10785
msgstr ""
10786
10787
#: en/help_topics/conflict-types.txt:191
10788
msgid ""
10789
"Note that you must get rid of FILE.moved before using ``--action=done``."
10790
msgstr ""
10791
10792
#: en/help_topics/conflict-types.txt:195
10793
msgid ""
10794
"Unversioned parent\n"
10795
"------------------"
10796
msgstr ""
10797
10798
#: en/help_topics/conflict-types.txt:200
10799
msgid ""
10800
" Conflict because FILE is not versioned, but has versioned children."
10801
msgstr ""
10802
10803
#: en/help_topics/conflict-types.txt:202
10804
msgid ""
10805
"Sometimes Bazaar will attempt to create a file whose parent directory is "
10806
"not\n"
10807
"versioned. This happens when the directory has been deleted in the target,\n"
10808
"but has a new child in the source, or vice versa. In this situation, "
10809
"Bazaar\n"
10810
"will version the parent directory as well. Resolving this issue depends\n"
10811
"very much on the particular scenario. You may wish to rename or delete "
10812
"either\n"
10813
"the file or the directory. When you are satisfied, you can run \"bzr "
10814
"resolve\n"
10815
"FILE\" to mark the conflict as resolved."
10816
msgstr ""
10817
10818
#: en/help_topics/conflict-types.txt:210
10819
msgid ""
10820
"Missing parent\n"
10821
"--------------"
10822
msgstr ""
10823
10824
#: en/help_topics/conflict-types.txt:215
10825
msgid " Conflict adding files to FILE. Created directory."
10826
msgstr ""
10827
10828
#: en/help_topics/conflict-types.txt:217
10829
msgid ""
10830
"This happens when a directory has been deleted in the target, but has new\n"
10831
"children in the source. This is similar to the \"unversioned parent\" "
10832
"conflict,\n"
10833
"except that the parent directory does not *exist*, instead of just being\n"
10834
"unversioned. In this situation, Bazaar will create the missing parent.\n"
10835
"Resolving this issue depends very much on the particular scenario."
10836
msgstr ""
10837
10838
#: en/help_topics/conflict-types.txt:223 en/help_topics/conflict-types.txt:249
10839
msgid ""
10840
"To resolve that kind of conflict, you should either remove or rename the\n"
10841
"children or the directory or a combination of both."
10842
msgstr ""
10843
10844
#: en/help_topics/conflict-types.txt:228
10845
msgid ""
10846
"* ``--action=take-this`` will issue ``bzr rm directory`` including the\n"
10847
" children,\n"
10848
"* ``--action=take-other`` will acknowledge Bazaar choice to keep the "
10849
"children\n"
10850
" and restoring the directory,\n"
10851
"* ``--action=done`` will just mark the conflict as resolved."
10852
msgstr ""
10853
10854
#: en/help_topics/conflict-types.txt:236
10855
msgid ""
10856
"Deleting parent\n"
10857
"---------------"
10858
msgstr ""
10859
10860
#: en/help_topics/conflict-types.txt:241
10861
msgid " Conflict: can't delete DIR because it is not empty. Not deleting."
10862
msgstr ""
10863
10864
#: en/help_topics/conflict-types.txt:243
10865
msgid ""
10866
"This is the opposite of \"missing parent\". A directory is deleted in the\n"
10867
"source, but has new children in the target (either because a directory\n"
10868
"deletion is merged or because the merge introduce new children). Bazaar\n"
10869
"will retain the directory. Resolving this issue depends very much on the\n"
10870
"particular scenario."
10871
msgstr ""
10872
10873
#: en/help_topics/conflict-types.txt:254
10874
msgid ""
10875
"* ``--action=take-this`` will acknowledge Bazaar choice to keep the "
10876
"directory,"
10877
msgstr ""
10878
10879
#: en/help_topics/conflict-types.txt:256
10880
msgid ""
10881
"* ``--action=take-other`` will issue ``bzr rm directory`` including the \n"
10882
" children,"
10883
msgstr ""
10884
10885
#: en/help_topics/conflict-types.txt:259
10886
msgid "* ``--action=done`` will just mark the conflict as resolved."
10887
msgstr ""
10888
10889
#: en/help_topics/conflict-types.txt:261
10890
msgid ""
10891
"Note that when merging a directory deletion, if unversioned files are\n"
10892
"present, they become potential orphans has they don't have a directory\n"
10893
"parent anymore."
10894
msgstr ""
10895
10896
#: en/help_topics/conflict-types.txt:265
10897
msgid ""
10898
"Handling such orphans, *before* the conflict is created, is controlled by\n"
10899
"setting the ``bzr.transform.orphan_policy`` configuration option."
10900
msgstr ""
10901
10902
#: en/help_topics/conflict-types.txt:268
10903
msgid "There are two possible values for this option:"
10904
msgstr ""
10905
10906
#: en/help_topics/conflict-types.txt:270
10907
msgid ""
10908
"* ``conflict`` (the default): will leave the orphans in place and\n"
10909
" generate a conflicts,"
10910
msgstr ""
10911
10912
#: en/help_topics/conflict-types.txt:273
10913
msgid ""
10914
"* ``move``: will move the orphans to a ``bzr-orphans`` directory at the "
10915
"root\n"
10916
" of the working tree with names like ``<file>.~#~``."
10917
msgstr ""
10918
10919
#: en/help_topics/conflict-types.txt:278
10920
msgid ""
10921
"Path conflict\n"
10922
"-------------"
10923
msgstr ""
10924
10925
#: en/help_topics/conflict-types.txt:283
10926
msgid " Path conflict: PATH1 / PATH2"
10927
msgstr ""
10928
10929
#: en/help_topics/conflict-types.txt:285
10930
msgid ""
10931
"This happens when the source and target have each modified the name or "
10932
"parent\n"
10933
"directory of a file. Bazaar will use the path elements from the source."
10934
msgstr ""
10935
10936
#: en/help_topics/conflict-types.txt:288
10937
msgid ""
10938
"To resolve that kind of conflict, you just have to decide what name should "
10939
"be\n"
10940
"retained for the file involved."
10941
msgstr ""
10942
10943
#: en/help_topics/conflict-types.txt:293
10944
msgid ""
10945
"* ``--action=take-this`` will revert Bazaar choice and keep ``PATH1`` by\n"
10946
" issuing ``bzr mv PATH2 PATH1``,\n"
10947
"* ``--action=take-other`` will acknowledge Bazaar choice of keeping "
10948
"``PATH2``,\n"
10949
"* ``--action=done`` will just mark the conflict as resolved."
10950
msgstr ""
10951
10952
#: en/help_topics/conflict-types.txt:300
10953
msgid ""
10954
"Parent loop\n"
10955
"-----------"
10956
msgstr ""
10957
10958
#: en/help_topics/conflict-types.txt:305
10959
msgid " Conflict moving FILE into DIRECTORY. Cancelled move."
10960
msgstr ""
10961
10962
#: en/help_topics/conflict-types.txt:307
10963
msgid ""
10964
"This happens when the source and the target have each moved directories, so\n"
10965
"that, if the change could be applied, a directory would be contained by "
10966
"itself.\n"
10967
"For example::"
10968
msgstr ""
10969
10970
#: en/help_topics/conflict-types.txt:311
10971
msgid ""
10972
" $ bzr init\n"
10973
" $ bzr mkdir white\n"
10974
" $ bzr mkdir black\n"
10975
" $ bzr commit -m \"BASE\"\n"
10976
" $ bzr branch . ../other\n"
10977
" $ bzr mv white black\n"
10978
" $ bzr commit -m \"THIS\"\n"
10979
" $ bzr mv ../other/black ../other/white\n"
10980
" $ bzr commit ../other -m \"OTHER\"\n"
10981
" $ bzr merge ../other"
10982
msgstr ""
10983
10984
#: en/help_topics/conflict-types.txt:322
10985
msgid ""
10986
"In this situation, Bazaar will cancel the move, and leave ``white`` in\n"
10987
"``black``. To resolve that kind of conflict, you just have to decide what\n"
10988
"name should be retained for the directories involved."
10989
msgstr ""
10990
10991
#: en/help_topics/conflict-types.txt:328
10992
msgid ""
10993
"* ``--action=take-this`` will acknowledge Bazaar choice of leaving ``white`` "
10994
"\n"
10995
" in ``black``,\n"
10996
"* ``--action=take-other`` will revert Bazaar choice and move ``black`` in\n"
10997
" ``white`` by issuing ``bzr mv black/white white ; bzr mv black white``,\n"
10998
"* ``--action=done`` will just mark the conflict as resolved."
10999
msgstr ""
11000
11001
#: en/help_topics/conflict-types.txt:336
11002
msgid ""
11003
"Non-directory parent\n"
11004
"--------------------"
11005
msgstr ""
11006
11007
#: en/help_topics/conflict-types.txt:341
11008
msgid ""
11009
" Conflict: foo.new is not a directory, but has files in it.\n"
11010
" Created directory."
11011
msgstr ""
11012
11013
#: en/help_topics/conflict-types.txt:344
11014
msgid ""
11015
"This happens when one side has added files to a directory, and the other "
11016
"side\n"
11017
"has changed the directory into a file or symlink. For example::"
11018
msgstr ""
11019
11020
#: en/help_topics/conflict-types.txt:347
11021
msgid ""
11022
" $ bzr init\n"
11023
" $ bzr mkdir foo\n"
11024
" $ bzr commit -m \"BASE\"\n"
11025
" $ bzr branch . ../other\n"
11026
" $ rmdir foo\n"
11027
" $ touch foo\n"
11028
" $ bzr commit -m \"THIS\"\n"
11029
" $ bzr mkdir ../other/foo/bar\n"
11030
" $ bzr commit ../other -m \"OTHER\"\n"
11031
" $ bzr merge ../other"
11032
msgstr ""
11033
11034
#: en/help_topics/conflict-types.txt:358
11035
msgid ""
11036
"To resolve that kind of conflict, you have to decide what name should be\n"
11037
"retained for the file, directory or symlink involved."
11038
msgstr ""
11039
11040
#: en/help_topics/conflict-types.txt:363
11041
msgid ""
11042
"* ``--action=take-this`` will issue ``bzr rm --force foo.new`` and \n"
11043
" ``bzr add foo``,\n"
11044
"* ``--action=take-other`` will issue ``bzr rm --force foo`` and \n"
11045
" ``bzr mv foo.new foo``,\n"
11046
"* ``--action=done`` will just mark the conflict as resolved."
11047
msgstr ""
11048
11049
#: en/help_topics/conflict-types.txt:371
11050
msgid ""
11051
"MalformedTransform\n"
11052
"------------------"
11053
msgstr ""
11054
11055
#: en/help_topics/conflict-types.txt:374
11056
msgid ""
11057
"It is possible (though very rare) for Bazaar to raise a MalformedTransform\n"
11058
"exception. This means that Bazaar encountered a filesystem conflict that it "
11059
"was\n"
11060
"unable to resolve. This usually indicates a bug. Please let us know if "
11061
"you\n"
11062
"encounter this. Our bug tracker is at https://launchpad.net/bzr/+bugs\n"
11063
msgstr ""
11064
11065
#: en/help_topics/content-filters.txt:1
11066
msgid ""
11067
"Content Filters\n"
11068
"==============="
11069
msgstr ""
11070
11071
#: en/help_topics/content-filters.txt:4
11072
msgid ""
11073
"Content formats\n"
11074
"---------------"
11075
msgstr ""
11076
11077
#: en/help_topics/content-filters.txt:7
11078
msgid ""
11079
"Bazaar's content filtering allows you to store files in a different\n"
11080
"format from the copy in your working tree. This lets you, or your\n"
11081
"co-developers, use Windows development tools that expect CRLF files\n"
11082
"on projects that use other line-ending conventions. Among other things,\n"
11083
"content filters also let Unix developers more easily work on projects\n"
11084
"using Windows line-ending conventions, keyword expansion/compression,\n"
11085
"and trailing spaces on lines in text files to be implicitly stripped\n"
11086
"when committed."
11087
msgstr ""
11088
11089
#: en/help_topics/content-filters.txt:16
11090
msgid "To generalize, there are two content formats supported by Bazaar:"
11091
msgstr ""
11092
11093
#: en/help_topics/content-filters.txt:18
11094
msgid ""
11095
"* a canonical format - how files are stored internally\n"
11096
"* a convenience format - how files are created in a working tree."
11097
msgstr ""
11098
11099
#: en/help_topics/content-filters.txt:21
11100
msgid ""
11101
"\n"
11102
"Format conversion\n"
11103
"-----------------"
11104
msgstr ""
11105
11106
#: en/help_topics/content-filters.txt:25
11107
msgid ""
11108
"The conversion between these formats is done by content filters.\n"
11109
"A content filter has two parts:"
11110
msgstr ""
11111
11112
#: en/help_topics/content-filters.txt:28
11113
msgid ""
11114
"* a read converter - converts from convenience to canonical format\n"
11115
"* a write converter - converts from canonical to convenience format."
11116
msgstr ""
11117
11118
#: en/help_topics/content-filters.txt:31
11119
msgid ""
11120
"Many of these converters will provide *round-trip* conversion,\n"
11121
"i.e. applying the read converter followed by the write converter\n"
11122
"gives back the original content. However, others may provide an\n"
11123
"asymmetric conversion. For example, a read converter might strip\n"
11124
"trailing whitespace off lines in source code while the matching\n"
11125
"write converter might pass content through unchanged."
11126
msgstr ""
11127
11128
#: en/help_topics/content-filters.txt:38
11129
msgid ""
11130
"\n"
11131
"Enabling content filters\n"
11132
"------------------------"
11133
msgstr ""
11134
11135
#: en/help_topics/content-filters.txt:42
11136
msgid ""
11137
"Content filters are typically provided by plugins, so the first step\n"
11138
"in using them is to install the relevant plugins and read their\n"
11139
"documentation. Some plugins may be very specific about which files\n"
11140
"they filter, e.g. only files ending in ``.java`` or ``.php``.\n"
11141
"In other cases, the plugin may leave it in the user's hands to\n"
11142
"define which files are to be filtered. This is typically done\n"
11143
"using rule-based preferences. See ``bzr help rules`` for general\n"
11144
"information about defining these."
11145
msgstr ""
11146
11147
#: en/help_topics/content-filters.txt:51
11148
msgid ""
11149
"\n"
11150
"Impact on commands\n"
11151
"------------------"
11152
msgstr ""
11153
11154
#: en/help_topics/content-filters.txt:55
11155
msgid ""
11156
"Read converters are only applied to commands that read content from\n"
11157
"a working tree, e.g. status, diff and commit. For example, ``bzr diff``\n"
11158
"will apply read converters to files in the working tree, then compare\n"
11159
"the results to the content last committed."
11160
msgstr ""
11161
11162
#: en/help_topics/content-filters.txt:60
11163
msgid ""
11164
"Write converters are only applied by commands that **create files in a\n"
11165
"working tree**, e.g. branch, checkout, update. If you wish to see the\n"
11166
"canonical format of a file or tree, use ``bzr cat`` or ``bzr export``\n"
11167
"respectively."
11168
msgstr ""
11169
11170
#: en/help_topics/content-filters.txt:65
11171
msgid ""
11172
"Note: ``bzr commit`` does not implicitly apply write converters after\n"
11173
"comitting files. If this makes sense for a given plugin providing\n"
11174
"a content filter, the plugin can usually achieve this effect by using a\n"
11175
"``start_commit`` or ``post_commit`` hook say. See :doc:`hooks-help`\n"
11176
"for more information on hooks."
11177
msgstr ""
11178
11179
#: en/help_topics/content-filters.txt:71
11180
msgid ""
11181
"\n"
11182
"Refreshing your working tree\n"
11183
"----------------------------"
11184
msgstr ""
11185
11186
#: en/help_topics/content-filters.txt:75
11187
msgid ""
11188
"For performance reasons, Bazaar caches the timestamps of files in\n"
11189
"a working tree, and assumes files are unchanged if their timestamps\n"
11190
"match the cached values. As a consequence, there are times when\n"
11191
"you may need to explicitly ask for content filtering to be reapplied\n"
11192
"in one or both directions, e.g. after installing or reconfiguring\n"
11193
"plugins providing it."
11194
msgstr ""
11195
11196
#: en/help_topics/content-filters.txt:82
11197
msgid "Here are some general guidelines for doing this:"
11198
msgstr ""
11199
11200
#: en/help_topics/content-filters.txt:84
11201
msgid ""
11202
" * To reapply read converters, ``touch`` files, i.e. update their\n"
11203
" timestamp. Operations like ``bzr status`` should then reapply the\n"
11204
" relevant read converters and compare the end result with the\n"
11205
" canonical format."
11206
msgstr ""
11207
11208
#: en/help_topics/content-filters.txt:89
11209
msgid ""
11210
" * To reapply write converters, ensure there are no local changes,\n"
11211
" delete the relevant files and run ``bzr revert`` on those files."
11212
msgstr ""
11213
11214
#: en/help_topics/content-filters.txt:92
11215
msgid ""
11216
"Note: In the future, it is likely that additional options will be added\n"
11217
"to commands to make this refreshing process faster and safer.\n"
11218
msgstr ""
11219
11220
#: en/help_topics/current-formats.txt:1
11221
msgid "Current Storage Formats"
11222
msgstr ""
11223
11224
#: en/help_topics/current-formats.txt:3
11225
msgid ""
11226
":2a:\n"
11227
" (native) (default) Format for the bzr 2.0 series. Uses group-\n"
11228
" compress storage. Provides rich roots which are a one-way\n"
11229
" transition."
11230
msgstr ""
11231
11232
#: en/help_topics/current-formats.txt:8 en/help_topics/other-formats.txt:17
11233
msgid ""
11234
"\n"
11235
"See :doc:`formats-help` for more about storage formats."
11236
msgstr ""
11237
11238
#: en/help_topics/debug-flags.txt:1
11239
msgid ""
11240
"Debug Flags\n"
11241
"==========="
11242
msgstr ""
11243
11244
#: en/help_topics/debug-flags.txt:4
11245
msgid ""
11246
"These flags can be passed on the bzr command line or (without the ``-D``\n"
11247
"prefix) put in the ``debug_flags`` variable in ``bazaar.conf``."
11248
msgstr ""
11249
11250
#: en/help_topics/debug-flags.txt:7
11251
msgid ""
11252
"-Dauth Trace authentication sections used.\n"
11253
"-Dbytes Print out how many bytes were transferred\n"
11254
"-Ddirstate Trace dirstate activity (verbose!)\n"
11255
"-Derror Instead of normal error handling, always print a "
11256
"traceback\n"
11257
" on error.\n"
11258
"-Devil Capture call sites that do expensive or badly-scaling\n"
11259
" operations.\n"
11260
"-Dfetch Trace history copying between repositories.\n"
11261
"-Dfilters Emit information for debugging content filtering.\n"
11262
"-Dforceinvdeltas Force use of inventory deltas during generic streaming "
11263
"fetch.\n"
11264
"-Dgraph Trace graph traversal.\n"
11265
"-Dhashcache Log every time a working file is read to determine its "
11266
"hash.\n"
11267
"-Dhooks Trace hook execution.\n"
11268
"-Dhpss Trace smart protocol requests and responses.\n"
11269
"-Dhpssdetail More hpss details.\n"
11270
"-Dhpssvfs Traceback on vfs access to Remote objects.\n"
11271
"-Dhttp Trace http connections, requests and responses.\n"
11272
"-Dindex Trace major index operations.\n"
11273
"-Dknit Trace knit operations.\n"
11274
"-Dlock Trace when lockdir locks are taken or released.\n"
11275
"-Dnoretry If a connection is reset, fail immediately rather than\n"
11276
" retrying the request.\n"
11277
"-Dprogress Trace progress bar operations.\n"
11278
"-Dmem_dump Dump memory to a file upon an out of memory error.\n"
11279
"-Dmerge Emit information for debugging merges.\n"
11280
"-Dno_apport Don't use apport to report crashes.\n"
11281
"-Dno_activity \t Don't show transport activity indicator in progress bar.\n"
11282
"-Dpack Emit information about pack operations.\n"
11283
"-Drelock Emit a message every time a branch or repository object "
11284
"is\n"
11285
" unlocked then relocked the same way.\n"
11286
"-Dsftp Trace SFTP internals.\n"
11287
"-Dstatic_tuple Error when a tuple is used where a StaticTuple is "
11288
"expected\n"
11289
"-Dstream Trace fetch streams.\n"
11290
"-Dstrict_locks Trace when OS locks are potentially used in a non-"
11291
"portable\n"
11292
" manner.\n"
11293
"-Dunlock Some errors during unlock are treated as warnings.\n"
11294
"-DIDS_never Never use InterDifferingSerializer when fetching.\n"
11295
"-DIDS_always Always use InterDifferingSerializer to fetch if "
11296
"appropriate\n"
11297
" for the format, even for non-local fetches.\n"
11298
msgstr ""
11299
11300
#: en/help_topics/diverged-branches.txt:1
11301
msgid ""
11302
"Diverged Branches\n"
11303
"================="
11304
msgstr ""
11305
11306
#: en/help_topics/diverged-branches.txt:4
11307
msgid ""
11308
"When Bazaar tries to push one branch onto another, it requires that the\n"
11309
"destination branch must be ready to receive the source branch. If this "
11310
"isn't\n"
11311
"the case, then we say that the branches have ``diverged``. Branches are\n"
11312
"considered diverged if the destination branch's most recent commit is one "
11313
"that\n"
11314
"has not been merged (directly or indirectly) by the source branch. To "
11315
"recover\n"
11316
"from diverged branches, one must merge the missing revisions into the "
11317
"source\n"
11318
"branch."
11319
msgstr ""
11320
11321
#: en/help_topics/diverged-branches.txt:12
11322
msgid ""
11323
"This situation commonly arises when using a centralized workflow with local\n"
11324
"commits. If someone else has committed new work to the mainline since your\n"
11325
"last pull and you have local commits that have not yet been pushed to the\n"
11326
"mainline, then your local branch and the mainline have diverged."
11327
msgstr ""
11328
11329
#: en/help_topics/diverged-branches.txt:17
11330
msgid ""
11331
"Discovering What Has Diverged\n"
11332
"-----------------------------"
11333
msgstr ""
11334
11335
#: en/help_topics/diverged-branches.txt:20
11336
msgid ""
11337
"The ``bzr missing`` command is used to find out what revisions are in "
11338
"another\n"
11339
"branch that are not present in the current branch, and vice-versa. It shows "
11340
"a\n"
11341
"summary of which extra revisions exist in each branch. If you want to see "
11342
"the\n"
11343
"precise effects of those revisions, you can use ``bzr diff --"
11344
"old=other_branch``\n"
11345
"to show the differences between other_branch and your current branch."
11346
msgstr ""
11347
11348
#: en/help_topics/diverged-branches.txt:26
11349
msgid ""
11350
"A Solution\n"
11351
"----------"
11352
msgstr ""
11353
11354
#: en/help_topics/diverged-branches.txt:29
11355
msgid ""
11356
"The solution is to merge the revisions from the mainline into your local\n"
11357
"branch. To do so, use ``bzr merge`` to get the new revisions from the\n"
11358
"mainline. This merge may result in conflicts if the other developer's "
11359
"changes\n"
11360
"overlap with your changes. These conflicts should be resolved before\n"
11361
"continuing. After any conflicts have been resolved, or even if there were "
11362
"no\n"
11363
"conflicts, Bazaar requires that you explicitly commit these new revisions\n"
11364
"to your local branch. This requirement gives you an opportunity to test "
11365
"the\n"
11366
"resulting working tree for correctness, since the merged revisions could "
11367
"have\n"
11368
"made arbitrary changes. After testing, you should commit the merge using\n"
11369
"``bzr commit``. This clears up the diverged branches situation. Your "
11370
"local\n"
11371
"branch can now be pushed to the mainline.\n"
11372
msgstr ""
11373
11374
#: en/help_topics/eol.txt:1
11375
msgid ""
11376
"End of Line Conversion\n"
11377
"======================"
11378
msgstr ""
11379
11380
#: en/help_topics/eol.txt:4
11381
msgid ""
11382
"EOL conversion is provided as a content filter where Bazaar internally\n"
11383
"stores a canonical format but outputs a convenience format. See\n"
11384
"``bzr help content-filters`` for general information about using these."
11385
msgstr ""
11386
11387
#: en/help_topics/eol.txt:8
11388
msgid ""
11389
"Note: Content filtering is only supported in recently added formats,\n"
11390
"e.g. 1.14. Be sure that both the repository *and* the branch are\n"
11391
"in a recent format. (Just setting the format on the repository\n"
11392
"is not enough.) If content filtering does not appear to be working, use\n"
11393
"'bzr info -v' to confirm that the branch is using \"Working tree format 5\"\n"
11394
"or later."
11395
msgstr ""
11396
11397
#: en/help_topics/eol.txt:15
11398
msgid ""
11399
"EOL conversion needs to be enabled for selected file patterns using\n"
11400
"rules. See ``bzr help rules`` for general information on defining rules.\n"
11401
"Currently, rules are only supported in $BZR_HOME/.bazaar/rules (or\n"
11402
"%BZR_HOME%/bazaar/2.0/rules on Windows). Branch specific rules will be\n"
11403
"supported in a future verison of Bazaar."
11404
msgstr ""
11405
11406
#: en/help_topics/eol.txt:21
11407
msgid ""
11408
"To configure which files to filter, set ``eol`` to one of the values below.\n"
11409
"(If a value is not set, ``exact`` is the default.)"
11410
msgstr ""
11411
11412
#: en/help_topics/eol.txt:24
11413
msgid ""
11414
" ========== ===================================== ======================\n"
11415
" Value Checkout end-of-lines as Commit end-of-lines as\n"
11416
" ========== ===================================== ======================\n"
11417
" ``native`` ``crlf`` on Windows, ``lf`` otherwise ``lf``\n"
11418
" ---------- ------------------------------------- ----------------------\n"
11419
" ``lf`` ``lf`` ``lf``\n"
11420
" ---------- ------------------------------------- ----------------------\n"
11421
" ``crlf`` ``crlf`` ``lf``\n"
11422
" ---------- ------------------------------------- ----------------------\n"
11423
" ``exact`` No conversion Exactly as in file\n"
11424
" ========== ===================================== ======================"
11425
msgstr ""
11426
11427
#: en/help_topics/eol.txt:36
11428
msgid ""
11429
"Note: For safety reasons, no conversion is applied to any file where a null\n"
11430
"byte is detected in the file."
11431
msgstr ""
11432
11433
#: en/help_topics/eol.txt:39
11434
msgid ""
11435
"For users working on a cross-platform project, here is a suggested rule\n"
11436
"to use as a starting point::"
11437
msgstr ""
11438
11439
#: en/help_topics/eol.txt:42 en/help_topics/eol.txt:52
11440
#: en/help_topics/eol.txt:67 en/help_topics/eol.txt:82
11441
msgid ""
11442
" [name *]\n"
11443
" eol = native"
11444
msgstr ""
11445
11446
#: en/help_topics/eol.txt:45
11447
msgid ""
11448
"If you have binary files that do not contain a null byte though, be\n"
11449
"sure to add ``eol = exact`` rules for those as well. You can do this\n"
11450
"by giving more explicit patterns earlier in the rules file. For example::"
11451
msgstr ""
11452
11453
#: en/help_topics/eol.txt:49
11454
msgid ""
11455
" [name *.png]\n"
11456
" eol = exact"
11457
msgstr ""
11458
11459
#: en/help_topics/eol.txt:55
11460
msgid ""
11461
"If your working tree is on a network drive shared by users on different\n"
11462
"operating systems, you typically want to force certain conventions for\n"
11463
"certain files. In that way, if a file is created with the wrong line\n"
11464
"endings or line endings get mixed during editing, it gets committed\n"
11465
"correctly and gets checked out correctly. For example::"
11466
msgstr ""
11467
11468
#: en/help_topics/eol.txt:61
11469
msgid ""
11470
" [name *.bat]\n"
11471
" eol = crlf"
11472
msgstr ""
11473
11474
#: en/help_topics/eol.txt:64
11475
msgid ""
11476
" [name *.sh]\n"
11477
" eol = lf"
11478
msgstr ""
11479
11480
#: en/help_topics/eol.txt:70
11481
msgid ""
11482
"If you take the care to create files with their required endings, you can\n"
11483
"achieve *almost* the same thing by using ``eol = exact``. It is slightly\n"
11484
"safer to use ``lf`` and ``crlf`` though because edits accidentally\n"
11485
"introducing mixed line endings will be corrected during commit for files\n"
11486
"with those settings."
11487
msgstr ""
11488
11489
#: en/help_topics/eol.txt:76
11490
msgid ""
11491
"If you have sample test data that deliberately has text files with mixed\n"
11492
"newline conventions, you can ask for those to be left alone like this::"
11493
msgstr ""
11494
11495
#: en/help_topics/eol.txt:79
11496
msgid ""
11497
" [name test_data/]\n"
11498
" eol = exact"
11499
msgstr ""
11500
11501
#: en/help_topics/eol.txt:85
11502
msgid ""
11503
"Note that ``exact`` does not imply the file is binary but it does mean\n"
11504
"that no conversion of end-of-lines will be done. (Bazaar currently relies\n"
11505
"of content analysis to detect binary files for commands like ``diff``.\n"
11506
"In the future, a ``binary = true`` rule may be added but it is not\n"
11507
"supported yet.)"
11508
msgstr ""
11509
11510
#: en/help_topics/eol.txt:91
11511
msgid ""
11512
"If you have an existing repository with text files already stored using\n"
11513
"Windows newline conventions (``crlf``), then you may want to keep using "
11514
"that\n"
11515
"convention in the repository. Forcing certain files to this convention\n"
11516
"may also help users who do not have rules configured. To do this, set\n"
11517
"``eol`` to one of the values below."
11518
msgstr ""
11519
11520
#: en/help_topics/eol.txt:97
11521
msgid ""
11522
" ============================ ======================== "
11523
"======================\n"
11524
" Value Checkout end-of-lines as Commit end-of-lines "
11525
"as\n"
11526
" ============================ ======================== "
11527
"======================\n"
11528
" ``native-with-crlf-in-repo`` ``crlf`` on Windows, ``crlf``\n"
11529
" ``lf`` otherwise\n"
11530
" ---------------------------- ------------------------ ----------------------"
11531
"\n"
11532
" ``lf-with-crlf-in-repo`` ``lf`` ``crlf``\n"
11533
" ---------------------------- ------------------------ ----------------------"
11534
"\n"
11535
" ``crlf-with-crlf-in-repo`` ``crlf`` ``crlf``\n"
11536
" ============================ ======================== ======================"
11537
msgstr ""
11538
11539
#: en/help_topics/eol.txt:108
11540
msgid ""
11541
"For users working on an existing project that uses Windows newline\n"
11542
"conventions in their Bazaar repository, this rule is suggested as a\n"
11543
"starting point::"
11544
msgstr ""
11545
11546
#: en/help_topics/eol.txt:112
11547
msgid ""
11548
" [name *]\n"
11549
" eol = native-with-crlf-in-repo"
11550
msgstr ""
11551
11552
#: en/help_topics/eol.txt:115
11553
msgid ""
11554
"For new projects, it is recommended that end-of-lines be stored as ``lf``\n"
11555
"and that users stick to the basic settings, i.e. ``native``, ``lf``,\n"
11556
"``crlf`` and ``exact``."
11557
msgstr ""
11558
11559
#: en/help_topics/eol.txt:119
11560
msgid ""
11561
"Note: Bazaar's EOL conversion will convert the content of files but\n"
11562
"never reject files because a given line ending or mixed line endings\n"
11563
"are found. A precommit hook should be used if you wish to validate\n"
11564
"(and not just convert) content before committing.\n"
11565
msgstr ""
11566
11567
#: en/help_topics/hidden-commands.txt:1
11568
msgid ""
11569
"added List files added in working tree.\n"
11570
"ancestry List all revisions merged into this branch.\n"
11571
"assert-fail Test reporting of assertion failures\n"
11572
"bundle-info Output interesting stats about a bundle\n"
11573
"bundle-revisions Create a merge-directive for submitting changes.\n"
11574
"cat-revision Write out metadata for a revision.\n"
11575
"dump-btree Dump the contents of a btree index file to stdout.\n"
11576
"export-pot Export command helps and error messages in po format.\n"
11577
"file-id Print file_id of a particular file or directory.\n"
11578
"file-path Print path of file_ids to a file or directory.\n"
11579
"find-merge-base Find and print a base revision for merging two "
11580
"branches.\n"
11581
"hooks Show hooks.\n"
11582
"inventory Show inventory of the current working copy or a "
11583
"revision.\n"
11584
"local-time-offset Show the offset in seconds from GMT to local time.\n"
11585
"lookup-revision Lookup the revision-id from a revision-number\n"
11586
"merge-directive Generate a merge directive for auto-merge tools.\n"
11587
"modified List files modified in working tree.\n"
11588
"re-sign Create a digital signature for an existing revision.\n"
11589
"reference list, view and set branch locations for nested trees.\n"
11590
"relpath Show path of a file relative to root\n"
11591
"repair-workingtree Reset the working tree state file.\n"
11592
"revision-history Display the list of revision ids on a branch.\n"
11593
"revision-info Show revision number and revision id for a given "
11594
"revision\n"
11595
" identifier.\n"
11596
"rocks Statement of optimism.\n"
11597
"selftest Run internal test suite.\n"
11598
"shell-complete Show appropriate completions for context.\n"
11599
"test-script Run a shell-like test from a file.\n"
11600
"touching-revisions Return revision-ids which affected a particular file.\n"
11601
"unknowns List unknown files.\n"
11602
"wait-until-signalled Test helper for\n"
11603
" test_start_and_stop_bzr_subprocess_send_signal.\n"
11604
msgstr ""
11605
11606
#: en/help_topics/hooks.txt:1
11607
msgid ""
11608
"\n"
11609
"Hooks\n"
11610
"====="
11611
msgstr ""
11612
11613
#: en/help_topics/hooks.txt:5 en/help_topics/rules.txt:4
11614
msgid ""
11615
"Introduction\n"
11616
"------------"
11617
msgstr ""
11618
11619
#: en/help_topics/hooks.txt:8
11620
msgid "A hook of type *xxx* of class *yyy* needs to be registered using::"
11621
msgstr ""
11622
11623
#: en/help_topics/hooks.txt:10
11624
msgid " yyy.hooks.install_named_hook(\"xxx\", ...)"
11625
msgstr ""
11626
11627
#: en/help_topics/hooks.txt:12
11628
msgid ""
11629
"See :doc:`Using hooks<../user-guide/hooks>` in the User Guide for examples."
11630
msgstr ""
11631
11632
#: en/help_topics/hooks.txt:14
11633
msgid ""
11634
"The class that contains each hook is given before the hooks it supplies. "
11635
"For\n"
11636
"instance, BranchHooks as the class is the hooks class for\n"
11637
"`bzrlib.branch.Branch.hooks`."
11638
msgstr ""
11639
11640
#: en/help_topics/hooks.txt:18
11641
msgid ""
11642
"Each description also indicates whether the hook runs on the client (the\n"
11643
"machine where bzr was invoked) or the server (the machine addressed by\n"
11644
"the branch URL). These may be, but are not necessarily, the same machine."
11645
msgstr ""
11646
11647
#: en/help_topics/hooks.txt:22
11648
msgid ""
11649
"Plugins (including hooks) are run on the server if all of these is true:"
11650
msgstr ""
11651
11652
#: en/help_topics/hooks.txt:24
11653
msgid ""
11654
" * The connection is via a smart server (accessed with a URL starting with\n"
11655
" \"bzr://\", \"bzr+ssh://\" or \"bzr+http://\", or accessed via a "
11656
"\"http://\"\n"
11657
" URL when a smart server is available via HTTP)."
11658
msgstr ""
11659
11660
#: en/help_topics/hooks.txt:28
11661
msgid ""
11662
" * The hook is either server specific or part of general infrastructure "
11663
"rather\n"
11664
" than client specific code (such as commit)."
11665
msgstr ""
11666
11667
#: en/help_topics/hooks.txt:31
11668
msgid ""
11669
"\n"
11670
"BranchHooks\n"
11671
"-----------"
11672
msgstr ""
11673
11674
#: en/help_topics/hooks.txt:35
11675
msgid ""
11676
"automatic_tag_name\n"
11677
"~~~~~~~~~~~~~~~~~~"
11678
msgstr ""
11679
11680
#: en/help_topics/hooks.txt:38 en/help_topics/hooks.txt:56
11681
#: en/help_topics/hooks.txt:102 en/help_topics/hooks.txt:259
11682
msgid "Introduced in: 2.2"
11683
msgstr ""
11684
11685
#: en/help_topics/hooks.txt:40
11686
msgid ""
11687
"Called to determine an automatic tag name for a revision.\n"
11688
"automatic_tag_name is called with (branch, revision_id) and should\n"
11689
"return a tag name or None if no tag name could be determined. The\n"
11690
"first non-None tag name returned will be used."
11691
msgstr ""
11692
11693
#: en/help_topics/hooks.txt:45
11694
msgid ""
11695
"open\n"
11696
"~~~~"
11697
msgstr ""
11698
11699
#: en/help_topics/hooks.txt:48 en/help_topics/hooks.txt:290
11700
#: en/help_topics/hooks.txt:304
11701
msgid "Introduced in: 1.8"
11702
msgstr ""
11703
11704
#: en/help_topics/hooks.txt:50
11705
msgid ""
11706
"Called with the Branch object that has been opened after a branch is\n"
11707
"opened."
11708
msgstr ""
11709
11710
#: en/help_topics/hooks.txt:53
11711
msgid ""
11712
"post_branch_init\n"
11713
"~~~~~~~~~~~~~~~~"
11714
msgstr ""
11715
11716
#: en/help_topics/hooks.txt:58
11717
msgid ""
11718
"Called after new branch initialization completes. post_branch_init is\n"
11719
"called with a bzrlib.branch.BranchInitHookParams. Note that init,\n"
11720
"branch and checkout (both heavyweight and lightweight) will all\n"
11721
"trigger this hook."
11722
msgstr ""
11723
11724
#: en/help_topics/hooks.txt:63
11725
msgid ""
11726
"post_change_branch_tip\n"
11727
"~~~~~~~~~~~~~~~~~~~~~~"
11728
msgstr ""
11729
11730
#: en/help_topics/hooks.txt:66 en/help_topics/hooks.txt:418
11731
msgid "Introduced in: 1.4"
11732
msgstr ""
11733
11734
#: en/help_topics/hooks.txt:68
11735
msgid ""
11736
"Called in bzr client and server after a change to the tip of a branch\n"
11737
"is made. post_change_branch_tip is called with a\n"
11738
"bzrlib.branch.ChangeBranchTipParams. Note that push, pull, commit,\n"
11739
"uncommit will all trigger this hook."
11740
msgstr ""
11741
11742
#: en/help_topics/hooks.txt:73 en/help_topics/hooks.txt:389
11743
msgid ""
11744
"post_commit\n"
11745
"~~~~~~~~~~~"
11746
msgstr ""
11747
11748
#: en/help_topics/hooks.txt:76 en/help_topics/hooks.txt:86
11749
#: en/help_topics/hooks.txt:94 en/help_topics/hooks.txt:110
11750
#: en/help_topics/hooks.txt:145
11751
msgid "Introduced in: 0.15"
11752
msgstr ""
11753
11754
#: en/help_topics/hooks.txt:78
11755
msgid ""
11756
"Called in the bzr client after a commit has completed. post_commit is\n"
11757
"called with (local, master, old_revno, old_revid, new_revno,\n"
11758
"new_revid). old_revid is NULL_REVISION for the first commit to a\n"
11759
"branch."
11760
msgstr ""
11761
11762
#: en/help_topics/hooks.txt:83
11763
msgid ""
11764
"post_pull\n"
11765
"~~~~~~~~~"
11766
msgstr ""
11767
11768
#: en/help_topics/hooks.txt:88
11769
msgid ""
11770
"Called after a pull operation completes. post_pull is called with a\n"
11771
"bzrlib.branch.PullResult object and only runs in the bzr client."
11772
msgstr ""
11773
11774
#: en/help_topics/hooks.txt:91
11775
msgid ""
11776
"post_push\n"
11777
"~~~~~~~~~"
11778
msgstr ""
11779
11780
#: en/help_topics/hooks.txt:96
11781
msgid ""
11782
"Called after a push operation completes. post_push is called with a\n"
11783
"bzrlib.branch.BranchPushResult object and only runs in the bzr client."
11784
msgstr ""
11785
11786
#: en/help_topics/hooks.txt:99
11787
msgid ""
11788
"post_switch\n"
11789
"~~~~~~~~~~~"
11790
msgstr ""
11791
11792
#: en/help_topics/hooks.txt:104
11793
msgid ""
11794
"Called after a checkout switches branch. post_switch is called with a\n"
11795
"bzrlib.branch.SwitchHookParams."
11796
msgstr ""
11797
11798
#: en/help_topics/hooks.txt:107
11799
msgid ""
11800
"post_uncommit\n"
11801
"~~~~~~~~~~~~~"
11802
msgstr ""
11803
11804
#: en/help_topics/hooks.txt:112
11805
msgid ""
11806
"Called in the bzr client after an uncommit completes. post_uncommit is\n"
11807
"called with (local, master, old_revno, old_revid, new_revno,\n"
11808
"new_revid) where local is the local branch or None, master is the\n"
11809
"target branch, and an empty branch receives new_revno of 0, new_revid\n"
11810
"of None."
11811
msgstr ""
11812
11813
#: en/help_topics/hooks.txt:118
11814
msgid ""
11815
"pre_change_branch_tip\n"
11816
"~~~~~~~~~~~~~~~~~~~~~"
11817
msgstr ""
11818
11819
#: en/help_topics/hooks.txt:121
11820
msgid "Introduced in: 1.6"
11821
msgstr ""
11822
11823
#: en/help_topics/hooks.txt:123
11824
msgid ""
11825
"Called in bzr client and server before a change to the tip of a branch\n"
11826
"is made. pre_change_branch_tip is called with a\n"
11827
"bzrlib.branch.ChangeBranchTipParams. Note that push, pull, commit,\n"
11828
"uncommit will all trigger this hook."
11829
msgstr ""
11830
11831
#: en/help_topics/hooks.txt:128
11832
msgid ""
11833
"pre_commit\n"
11834
"~~~~~~~~~~"
11835
msgstr ""
11836
11837
#: en/help_topics/hooks.txt:131
11838
msgid "Introduced in: 0.91"
11839
msgstr ""
11840
11841
#: en/help_topics/hooks.txt:133
11842
msgid ""
11843
"Called after a commit is calculated but before it is completed.\n"
11844
"pre_commit is called with (local, master, old_revno, old_revid,\n"
11845
"future_revno, future_revid, tree_delta, future_tree). old_revid is\n"
11846
"NULL_REVISION for the first commit to a branch, tree_delta is a\n"
11847
"TreeDelta object describing changes from the basis revision. hooks\n"
11848
"MUST NOT modify this delta. future_tree is an in-memory tree obtained\n"
11849
"from CommitBuilder.revision_tree() and hooks MUST NOT modify this\n"
11850
"tree."
11851
msgstr ""
11852
11853
#: en/help_topics/hooks.txt:142
11854
msgid ""
11855
"set_rh\n"
11856
"~~~~~~"
11857
msgstr ""
11858
11859
#: en/help_topics/hooks.txt:147
11860
msgid ""
11861
"Invoked whenever the revision history has been set via\n"
11862
"set_revision_history. The api signature is (branch, revision_history),\n"
11863
"and the branch will be write-locked. The set_rh hook can be expensive\n"
11864
"for bzr to trigger, a better hook to use is\n"
11865
"Branch.post_change_branch_tip."
11866
msgstr ""
11867
11868
#: en/help_topics/hooks.txt:153
11869
msgid ""
11870
"transform_fallback_location\n"
11871
"~~~~~~~~~~~~~~~~~~~~~~~~~~~"
11872
msgstr ""
11873
11874
#: en/help_topics/hooks.txt:156
11875
msgid "Introduced in: 1.9"
11876
msgstr ""
11877
11878
#: en/help_topics/hooks.txt:158
11879
msgid ""
11880
"Called when a stacked branch is activating its fallback locations.\n"
11881
"transform_fallback_location is called with (branch, url), and should\n"
11882
"return a new url. Returning the same url allows it to be used as-is,\n"
11883
"returning a different one can be used to cause the branch to stack on\n"
11884
"a closer copy of that fallback_location. Note that the branch cannot\n"
11885
"have history accessing methods called on it during this hook because\n"
11886
"the fallback locations have not been activated. When there are\n"
11887
"multiple hooks installed for transform_fallback_location, all are\n"
11888
"called with the url returned from the previous hook.The order is\n"
11889
"however undefined."
11890
msgstr ""
11891
11892
#: en/help_topics/hooks.txt:169
11893
msgid ""
11894
"CommandHooks\n"
11895
"------------"
11896
msgstr ""
11897
11898
#: en/help_topics/hooks.txt:172
11899
msgid ""
11900
"extend_command\n"
11901
"~~~~~~~~~~~~~~"
11902
msgstr ""
11903
11904
#: en/help_topics/hooks.txt:175
11905
msgid "Introduced in: 1.13"
11906
msgstr ""
11907
11908
#: en/help_topics/hooks.txt:177
11909
msgid ""
11910
"Called after creating a command object to allow modifications such as\n"
11911
"adding or removing options, docs etc. Called with the new\n"
11912
"bzrlib.commands.Command object."
11913
msgstr ""
11914
11915
#: en/help_topics/hooks.txt:181
11916
msgid ""
11917
"get_command\n"
11918
"~~~~~~~~~~~"
11919
msgstr ""
11920
11921
#: en/help_topics/hooks.txt:184 en/help_topics/hooks.txt:196
11922
#: en/help_topics/hooks.txt:205 en/help_topics/hooks.txt:464
11923
msgid "Introduced in: 1.17"
11924
msgstr ""
11925
11926
#: en/help_topics/hooks.txt:186
11927
msgid ""
11928
"Called when creating a single command. Called with (cmd_or_None,\n"
11929
"command_name). get_command should either return the cmd_or_None\n"
11930
"parameter, or a replacement Command object that should be used for the\n"
11931
"command. Note that the Command.hooks hooks are core infrastructure.\n"
11932
"Many users will prefer to use bzrlib.commands.register_command or\n"
11933
"plugin_cmds.register_lazy."
11934
msgstr ""
11935
11936
#: en/help_topics/hooks.txt:193
11937
msgid ""
11938
"get_missing_command\n"
11939
"~~~~~~~~~~~~~~~~~~~"
11940
msgstr ""
11941
11942
#: en/help_topics/hooks.txt:198
11943
msgid ""
11944
"Called when creating a single command if no command could be found.\n"
11945
"Called with (command_name). get_missing_command should either return\n"
11946
"None, or a Command object to be used for the command."
11947
msgstr ""
11948
11949
#: en/help_topics/hooks.txt:202
11950
msgid ""
11951
"list_commands\n"
11952
"~~~~~~~~~~~~~"
11953
msgstr ""
11954
11955
#: en/help_topics/hooks.txt:207
11956
msgid ""
11957
"Called when enumerating commands. Called with a set of cmd_name\n"
11958
"strings for all the commands found so far. This set is safe to mutate\n"
11959
"- e.g. to remove a command. list_commands should return the updated\n"
11960
"set of command names."
11961
msgstr ""
11962
11963
#: en/help_topics/hooks.txt:212
11964
msgid ""
11965
"_ConfigHooks\n"
11966
"------------"
11967
msgstr ""
11968
11969
#: en/help_topics/hooks.txt:215
11970
msgid ""
11971
"get\n"
11972
"~~~"
11973
msgstr ""
11974
11975
#: en/help_topics/hooks.txt:218 en/help_topics/hooks.txt:226
11976
#: en/help_topics/hooks.txt:233 en/help_topics/hooks.txt:241
11977
#: en/help_topics/hooks.txt:248 en/help_topics/hooks.txt:370
11978
#: en/help_topics/hooks.txt:443
11979
msgid "Introduced in: 2.4"
11980
msgstr ""
11981
11982
#: en/help_topics/hooks.txt:220
11983
msgid ""
11984
"Invoked when a config option is read. The signature is (stack, name,\n"
11985
"value)."
11986
msgstr ""
11987
11988
#: en/help_topics/hooks.txt:223
11989
msgid ""
11990
"load\n"
11991
"~~~~"
11992
msgstr ""
11993
11994
#: en/help_topics/hooks.txt:228
11995
msgid "Invoked when a config store is loaded. The signature is (store)."
11996
msgstr ""
11997
11998
#: en/help_topics/hooks.txt:230
11999
msgid ""
12000
"remove\n"
12001
"~~~~~~"
12002
msgstr ""
12003
12004
#: en/help_topics/hooks.txt:235
12005
msgid ""
12006
"Invoked when a config option is removed. The signature is (stack,\n"
12007
"name)."
12008
msgstr ""
12009
12010
#: en/help_topics/hooks.txt:238
12011
msgid ""
12012
"save\n"
12013
"~~~~"
12014
msgstr ""
12015
12016
#: en/help_topics/hooks.txt:243
12017
msgid "Invoked when a config store is saved. The signature is (store)."
12018
msgstr ""
12019
12020
#: en/help_topics/hooks.txt:245
12021
msgid ""
12022
"set\n"
12023
"~~~"
12024
msgstr ""
12025
12026
#: en/help_topics/hooks.txt:250
12027
msgid ""
12028
"Invoked when a config option is set. The signature is (stack, name,\n"
12029
"value)."
12030
msgstr ""
12031
12032
#: en/help_topics/hooks.txt:253
12033
msgid ""
12034
"ControlDirHooks\n"
12035
"---------------"
12036
msgstr ""
12037
12038
#: en/help_topics/hooks.txt:256
12039
msgid ""
12040
"post_repo_init\n"
12041
"~~~~~~~~~~~~~~"
12042
msgstr ""
12043
12044
#: en/help_topics/hooks.txt:261
12045
msgid ""
12046
"Invoked after a repository has been initialized. post_repo_init is\n"
12047
"called with a bzrlib.controldir.RepoInitHookParams."
12048
msgstr ""
12049
12050
#: en/help_topics/hooks.txt:264
12051
msgid ""
12052
"pre_open\n"
12053
"~~~~~~~~"
12054
msgstr ""
12055
12056
#: en/help_topics/hooks.txt:267
12057
msgid "Introduced in: 1.14"
12058
msgstr ""
12059
12060
#: en/help_topics/hooks.txt:269
12061
msgid ""
12062
"Invoked before attempting to open a ControlDir with the transport that\n"
12063
"the open will use."
12064
msgstr ""
12065
12066
#: en/help_topics/hooks.txt:272
12067
msgid ""
12068
"InfoHooks\n"
12069
"---------"
12070
msgstr ""
12071
12072
#: en/help_topics/hooks.txt:275
12073
msgid ""
12074
"repository\n"
12075
"~~~~~~~~~~"
12076
msgstr ""
12077
12078
#: en/help_topics/hooks.txt:278 en/help_topics/hooks.txt:297
12079
#: en/help_topics/hooks.txt:521
12080
msgid "Introduced in: 1.15"
12081
msgstr ""
12082
12083
#: en/help_topics/hooks.txt:280
12084
msgid ""
12085
"Invoked when displaying the statistics for a repository. repository is\n"
12086
"called with a statistics dictionary as returned by the repository and\n"
12087
"a file-like object to write to."
12088
msgstr ""
12089
12090
#: en/help_topics/hooks.txt:284
12091
msgid ""
12092
"LockHooks\n"
12093
"---------"
12094
msgstr ""
12095
12096
#: en/help_topics/hooks.txt:287
12097
msgid ""
12098
"lock_acquired\n"
12099
"~~~~~~~~~~~~~"
12100
msgstr ""
12101
12102
#: en/help_topics/hooks.txt:292
12103
msgid ""
12104
"Called with a bzrlib.lock.LockResult when a physical lock is acquired."
12105
msgstr ""
12106
12107
#: en/help_topics/hooks.txt:294
12108
msgid ""
12109
"lock_broken\n"
12110
"~~~~~~~~~~~"
12111
msgstr ""
12112
12113
#: en/help_topics/hooks.txt:299
12114
msgid "Called with a bzrlib.lock.LockResult when a physical lock is broken."
12115
msgstr ""
12116
12117
#: en/help_topics/hooks.txt:301
12118
msgid ""
12119
"lock_released\n"
12120
"~~~~~~~~~~~~~"
12121
msgstr ""
12122
12123
#: en/help_topics/hooks.txt:306
12124
msgid ""
12125
"Called with a bzrlib.lock.LockResult when a physical lock is released."
12126
msgstr ""
12127
12128
#: en/help_topics/hooks.txt:308
12129
msgid ""
12130
"MergeHooks\n"
12131
"----------"
12132
msgstr ""
12133
12134
#: en/help_topics/hooks.txt:311
12135
msgid ""
12136
"merge_file_content\n"
12137
"~~~~~~~~~~~~~~~~~~"
12138
msgstr ""
12139
12140
#: en/help_topics/hooks.txt:314
12141
msgid "Introduced in: 2.1"
12142
msgstr ""
12143
12144
#: en/help_topics/hooks.txt:316
12145
msgid ""
12146
"Called with a bzrlib.merge.Merger object to create a per file merge\n"
12147
"object when starting a merge. Should return either None or a subclass\n"
12148
"of ``bzrlib.merge.AbstractPerFileMerger``. Such objects will then be\n"
12149
"called per file that needs to be merged (including when one side has\n"
12150
"deleted the file and the other has changed it). See the\n"
12151
"AbstractPerFileMerger API docs for details on how it is used by merge."
12152
msgstr ""
12153
12154
#: en/help_topics/hooks.txt:323
12155
msgid ""
12156
"post_merge\n"
12157
"~~~~~~~~~~"
12158
msgstr ""
12159
12160
#: en/help_topics/hooks.txt:326 en/help_topics/hooks.txt:334
12161
#: en/help_topics/hooks.txt:384 en/help_topics/hooks.txt:402
12162
#: en/help_topics/hooks.txt:410 en/help_topics/hooks.txt:509
12163
msgid "Introduced in: 2.5"
12164
msgstr ""
12165
12166
#: en/help_topics/hooks.txt:328
12167
msgid ""
12168
"Called after a merge. Receives a Merger object as the single argument.\n"
12169
"The return value is ignored."
12170
msgstr ""
12171
12172
#: en/help_topics/hooks.txt:331
12173
msgid ""
12174
"pre_merge\n"
12175
"~~~~~~~~~"
12176
msgstr ""
12177
12178
#: en/help_topics/hooks.txt:336
12179
msgid ""
12180
"Called before a merge. Receives a Merger object as the single\n"
12181
"argument."
12182
msgstr ""
12183
12184
#: en/help_topics/hooks.txt:339
12185
msgid ""
12186
"MergeDirectiveHooks\n"
12187
"-------------------"
12188
msgstr ""
12189
12190
#: en/help_topics/hooks.txt:342
12191
msgid ""
12192
"merge_request_body\n"
12193
"~~~~~~~~~~~~~~~~~~"
12194
msgstr ""
12195
12196
#: en/help_topics/hooks.txt:345
12197
msgid "Introduced in: 1.15.0"
12198
msgstr ""
12199
12200
#: en/help_topics/hooks.txt:347
12201
msgid ""
12202
"Called with a MergeRequestBodyParams when a body is needed for a merge\n"
12203
"request. Callbacks must return a body. If more than one callback is\n"
12204
"registered, the output of one callback is provided to the next."
12205
msgstr ""
12206
12207
#: en/help_topics/hooks.txt:351
12208
msgid ""
12209
"MessageEditorHooks\n"
12210
"------------------"
12211
msgstr ""
12212
12213
#: en/help_topics/hooks.txt:354
12214
msgid ""
12215
"commit_message_template\n"
12216
"~~~~~~~~~~~~~~~~~~~~~~~"
12217
msgstr ""
12218
12219
#: en/help_topics/hooks.txt:357
12220
msgid "Introduced in: 1.10"
12221
msgstr ""
12222
12223
#: en/help_topics/hooks.txt:359
12224
msgid ""
12225
"Called when a commit message is being generated.\n"
12226
"commit_message_template is called with the bzrlib.commit.Commit object\n"
12227
"and the message that is known so far. commit_message_template must\n"
12228
"return a new message to use (which could be the same as it was given).\n"
12229
"When there are multiple hooks registered for commit_message_template,\n"
12230
"they are chained with the result from the first passed into the\n"
12231
"second, and so on."
12232
msgstr ""
12233
12234
#: en/help_topics/hooks.txt:367
12235
msgid ""
12236
"set_commit_message\n"
12237
"~~~~~~~~~~~~~~~~~~"
12238
msgstr ""
12239
12240
#: en/help_topics/hooks.txt:372
12241
msgid ""
12242
"Set a fixed commit message. set_commit_message is called with the\n"
12243
"bzrlib.commit.Commit object (so you can also change e.g. revision\n"
12244
"properties by editing commit.builder._revprops) and the message so\n"
12245
"far. set_commit_message must return the message to use or None if it\n"
12246
"should use the message editor as normal."
12247
msgstr ""
12248
12249
#: en/help_topics/hooks.txt:378
12250
msgid ""
12251
"MutableTreeHooks\n"
12252
"----------------"
12253
msgstr ""
12254
12255
#: en/help_topics/hooks.txt:381
12256
msgid ""
12257
"post_build_tree\n"
12258
"~~~~~~~~~~~~~~~"
12259
msgstr ""
12260
12261
#: en/help_topics/hooks.txt:386
12262
msgid ""
12263
"Called after a completely new tree is built. The hook is called with\n"
12264
"the tree as its only argument."
12265
msgstr ""
12266
12267
#: en/help_topics/hooks.txt:392
12268
msgid "Introduced in: 2.0"
12269
msgstr ""
12270
12271
#: en/help_topics/hooks.txt:394
12272
msgid ""
12273
"Called after a commit is performed on a tree. The hook is called with\n"
12274
"a bzrlib.mutabletree.PostCommitHookParams object. The mutable tree the\n"
12275
"commit was performed on is available via the mutable_tree attribute of\n"
12276
"that object."
12277
msgstr ""
12278
12279
#: en/help_topics/hooks.txt:399
12280
msgid ""
12281
"post_transform\n"
12282
"~~~~~~~~~~~~~~"
12283
msgstr ""
12284
12285
#: en/help_topics/hooks.txt:404
12286
msgid ""
12287
"Called after a tree transform has been performed on a tree. The hook\n"
12288
"is called with the tree that is being transformed and the transform."
12289
msgstr ""
12290
12291
#: en/help_topics/hooks.txt:407
12292
msgid ""
12293
"pre_transform\n"
12294
"~~~~~~~~~~~~~"
12295
msgstr ""
12296
12297
#: en/help_topics/hooks.txt:412
12298
msgid ""
12299
"Called before a tree transform on this tree. The hook is called with\n"
12300
"the tree that is being transformed and the transform."
12301
msgstr ""
12302
12303
#: en/help_topics/hooks.txt:415
12304
msgid ""
12305
"start_commit\n"
12306
"~~~~~~~~~~~~"
12307
msgstr ""
12308
12309
#: en/help_topics/hooks.txt:420
12310
msgid ""
12311
"Called before a commit is performed on a tree. The start commit hook\n"
12312
"is able to change the tree before the commit takes place. start_commit\n"
12313
"is called with the bzrlib.mutabletree.MutableTree that the commit is\n"
12314
"being performed on."
12315
msgstr ""
12316
12317
#: en/help_topics/hooks.txt:425
12318
msgid ""
12319
"SmartClientHooks\n"
12320
"----------------"
12321
msgstr ""
12322
12323
#: en/help_topics/hooks.txt:428
12324
msgid ""
12325
"call\n"
12326
"~~~~"
12327
msgstr ""
12328
12329
#: en/help_topics/hooks.txt:431
12330
msgid "Introduced in: unknown"
12331
msgstr ""
12332
12333
#: en/help_topics/hooks.txt:433
12334
msgid ""
12335
"Called when the smart client is submitting a request to the smart\n"
12336
"server. Called with a bzrlib.smart.client.CallHookParams object.\n"
12337
"Streaming request bodies, and responses, are not accessible."
12338
msgstr ""
12339
12340
#: en/help_topics/hooks.txt:437
12341
msgid ""
12342
"SmartServerHooks\n"
12343
"----------------"
12344
msgstr ""
12345
12346
#: en/help_topics/hooks.txt:440
12347
msgid ""
12348
"server_exception\n"
12349
"~~~~~~~~~~~~~~~~"
12350
msgstr ""
12351
12352
#: en/help_topics/hooks.txt:445
12353
msgid ""
12354
"Called by the bzr server when an exception occurs. server_exception is\n"
12355
"called with the sys.exc_info() tuple return true for the hook if the\n"
12356
"exception has been handled, in which case the server will exit\n"
12357
"normally."
12358
msgstr ""
12359
12360
#: en/help_topics/hooks.txt:450
12361
msgid ""
12362
"server_started\n"
12363
"~~~~~~~~~~~~~~"
12364
msgstr ""
12365
12366
#: en/help_topics/hooks.txt:453 en/help_topics/hooks.txt:472
12367
msgid "Introduced in: 0.16"
12368
msgstr ""
12369
12370
#: en/help_topics/hooks.txt:455
12371
msgid ""
12372
"Called by the bzr server when it starts serving a directory.\n"
12373
"server_started is called with (backing urls, public url), where\n"
12374
"backing_url is a list of URLs giving the server-specific directory\n"
12375
"locations, and public_url is the public URL for the directory being\n"
12376
"served."
12377
msgstr ""
12378
12379
#: en/help_topics/hooks.txt:461
12380
msgid ""
12381
"server_started_ex\n"
12382
"~~~~~~~~~~~~~~~~~"
12383
msgstr ""
12384
12385
#: en/help_topics/hooks.txt:466
12386
msgid ""
12387
"Called by the bzr server when it starts serving a directory.\n"
12388
"server_started is called with (backing_urls, server_obj)."
12389
msgstr ""
12390
12391
#: en/help_topics/hooks.txt:469
12392
msgid ""
12393
"server_stopped\n"
12394
"~~~~~~~~~~~~~~"
12395
msgstr ""
12396
12397
#: en/help_topics/hooks.txt:474
12398
msgid ""
12399
"Called by the bzr server when it stops serving a directory.\n"
12400
"server_stopped is called with the same parameters as the\n"
12401
"server_started hook: (backing_urls, public_url)."
12402
msgstr ""
12403
12404
#: en/help_topics/hooks.txt:478
12405
msgid ""
12406
"StatusHooks\n"
12407
"-----------"
12408
msgstr ""
12409
12410
#: en/help_topics/hooks.txt:481
12411
msgid ""
12412
"post_status\n"
12413
"~~~~~~~~~~~"
12414
msgstr ""
12415
12416
#: en/help_topics/hooks.txt:484 en/help_topics/hooks.txt:495
12417
msgid "Introduced in: 2.3"
12418
msgstr ""
12419
12420
#: en/help_topics/hooks.txt:486
12421
msgid ""
12422
"Called with argument StatusHookParams after Bazaar has displayed the\n"
12423
"status. StatusHookParams has the attributes (old_tree, new_tree,\n"
12424
"to_file, versioned, show_ids, short, verbose). The last four arguments\n"
12425
"correspond to the command line options specified by the user for the\n"
12426
"status command. to_file is the output stream for writing."
12427
msgstr ""
12428
12429
#: en/help_topics/hooks.txt:492
12430
msgid ""
12431
"pre_status\n"
12432
"~~~~~~~~~~"
12433
msgstr ""
12434
12435
#: en/help_topics/hooks.txt:497
12436
msgid ""
12437
"Called with argument StatusHookParams before Bazaar displays the\n"
12438
"status. StatusHookParams has the attributes (old_tree, new_tree,\n"
12439
"to_file, versioned, show_ids, short, verbose). The last four arguments\n"
12440
"correspond to the command line options specified by the user for the\n"
12441
"status command. to_file is the output stream for writing."
12442
msgstr ""
12443
12444
#: en/help_topics/hooks.txt:503
12445
msgid ""
12446
"TransportHooks\n"
12447
"--------------"
12448
msgstr ""
12449
12450
#: en/help_topics/hooks.txt:506
12451
msgid ""
12452
"post_connect\n"
12453
"~~~~~~~~~~~~"
12454
msgstr ""
12455
12456
#: en/help_topics/hooks.txt:511
12457
msgid ""
12458
"Called after a new connection is established or a reconnect occurs.\n"
12459
"The sole argument passed is either the connected transport or smart\n"
12460
"medium instance."
12461
msgstr ""
12462
12463
#: en/help_topics/hooks.txt:515
12464
msgid ""
12465
"RioVersionInfoBuilderHooks\n"
12466
"--------------------------"
12467
msgstr ""
12468
12469
#: en/help_topics/hooks.txt:518
12470
msgid ""
12471
"revision\n"
12472
"~~~~~~~~"
12473
msgstr ""
12474
12475
#: en/help_topics/hooks.txt:523
12476
msgid ""
12477
"Invoked when adding information about a revision to the RIO stanza\n"
12478
"that is printed. revision is called with a revision object and a RIO\n"
12479
"stanza.\n"
12480
msgstr ""
12481
12482
#: en/help_topics/location-alias.txt:1
12483
msgid ""
12484
"Location aliases\n"
12485
"================"
12486
msgstr ""
12487
12488
#: en/help_topics/location-alias.txt:4
12489
msgid ""
12490
"Bazaar defines several aliases for locations associated with a branch. "
12491
"These\n"
12492
"can be used with most commands that expect a location, such as `bzr push`."
12493
msgstr ""
12494
12495
#: en/help_topics/location-alias.txt:7
12496
msgid "The aliases are::"
12497
msgstr ""
12498
12499
#: en/help_topics/location-alias.txt:9
12500
msgid ""
12501
" :bound The branch this branch is bound to, for bound branches.\n"
12502
" :parent The parent of this branch.\n"
12503
" :public The public location of this branch.\n"
12504
" :push The saved location used for `bzr push` with no arguments.\n"
12505
" :submit The submit branch for this branch.\n"
12506
" :this This branch."
12507
msgstr ""
12508
12509
#: en/help_topics/location-alias.txt:16
12510
msgid "For example, to push to the parent location::"
12511
msgstr ""
12512
12513
#: en/help_topics/location-alias.txt:18
12514
msgid " bzr push :parent\n"
12515
msgstr ""
12516
12517
#: en/help_topics/log-formats.txt:1
12518
msgid ""
12519
"Log Formats\n"
12520
"==========="
12521
msgstr ""
12522
12523
#: en/help_topics/log-formats.txt:4
12524
msgid ""
12525
"A log format controls how information about each revision is displayed.\n"
12526
"The standard log formats are compared below::"
12527
msgstr ""
12528
12529
#: en/help_topics/log-formats.txt:7
12530
msgid ""
12531
" Feature long short line\n"
12532
" ---------------------- ------------- ------------ -------------------\n"
12533
" design goal detailed view concise view 1 revision per line\n"
12534
" committer name+email name only name only\n"
12535
" author name+email - -\n"
12536
" date-time format full date only date only\n"
12537
" commit message full full top line\n"
12538
" tags yes yes yes\n"
12539
" merges indicator - yes -\n"
12540
" status/delta optional optional -\n"
12541
" diff/patch optional optional -\n"
12542
" revision-id optional optional -\n"
12543
" branch nick yes - -\n"
12544
" foreign vcs properties yes yes -\n"
12545
" preferred levels all 1 1\n"
12546
" digital signature optional - -"
12547
msgstr ""
12548
12549
#: en/help_topics/log-formats.txt:24
12550
msgid ""
12551
"The default format is ``long``. To change this, define the ``log_format``\n"
12552
"setting in the ``[DEFAULT]`` section of ``bazaar.conf`` like this (say)::"
12553
msgstr ""
12554
12555
#: en/help_topics/log-formats.txt:27
12556
msgid ""
12557
" [DEFAULT]\n"
12558
" log_format = short"
12559
msgstr ""
12560
12561
#: en/help_topics/log-formats.txt:30
12562
msgid ""
12563
"Alternatively, to change the log format used for a given query, use the\n"
12564
"--long, --short or --line options."
12565
msgstr ""
12566
12567
#: en/help_topics/log-formats.txt:33
12568
msgid ""
12569
"If one of the standard log formats does not meet your needs, additional\n"
12570
"formats can be provided by plugins.\n"
12571
msgstr ""
12572
12573
#: en/help_topics/other-formats.txt:1
12574
msgid "Other Storage Formats"
12575
msgstr ""
12576
12577
#: en/help_topics/other-formats.txt:3
12578
msgid "Experimental formats are shown below."
12579
msgstr ""
12580
12581
#: en/help_topics/other-formats.txt:5
12582
msgid ""
12583
":development-colo:\n"
12584
" (native) The 2a format with experimental support for colocated\n"
12585
" branches."
12586
msgstr ""
12587
12588
#: en/help_topics/other-formats.txt:9
12589
msgid ""
12590
"\n"
12591
"Deprecated formats are shown below."
12592
msgstr ""
12593
12594
#: en/help_topics/other-formats.txt:12
12595
msgid ""
12596
":pack-0.92:\n"
12597
" (native) Pack-based format used in 1.x series. Introduced in 0.92.\n"
12598
" Interoperates with bzr repositories before 0.92 but cannot be read\n"
12599
" by bzr < 0.92."
12600
msgstr ""
12601
12602
#: en/help_topics/patterns.txt:1
12603
msgid ""
12604
"Patterns\n"
12605
"========"
12606
msgstr ""
12607
12608
#: en/help_topics/patterns.txt:4
12609
msgid ""
12610
"Bazaar uses patterns to match files at various times. For example,\n"
12611
"the ``add`` command skips over files that match ignore patterns\n"
12612
"and preferences can be associated with files using rule patterns.\n"
12613
"The pattern syntax is described below."
12614
msgstr ""
12615
12616
#: en/help_topics/patterns.txt:9
12617
msgid ""
12618
"Trailing slashes on patterns are ignored. If the pattern contains a\n"
12619
"slash or is a regular expression, it is compared to the whole path\n"
12620
"from the branch root. Otherwise, it is compared to only the last\n"
12621
"component of the path. To match a file only in the root directory,\n"
12622
"prepend ``./``. Patterns specifying absolute paths are not allowed."
12623
msgstr ""
12624
12625
#: en/help_topics/patterns.txt:15
12626
msgid "Patterns may include globbing wildcards such as::"
12627
msgstr ""
12628
12629
#: en/help_topics/patterns.txt:17
12630
msgid ""
12631
" ? - Matches any single character except '/'\n"
12632
" * - Matches 0 or more characters except '/'\n"
12633
" /**/ - Matches 0 or more directories in a path\n"
12634
" [a-z] - Matches a single character from within a group of characters"
12635
msgstr ""
12636
12637
#: en/help_topics/patterns.txt:22
12638
msgid ""
12639
"Patterns may also be `Python regular expressions`_. Regular expression\n"
12640
"patterns are identified by a ``RE:`` prefix followed by the regular\n"
12641
"expression. Regular expression patterns may not include named or\n"
12642
"numbered groups."
12643
msgstr ""
12644
12645
#: en/help_topics/patterns.txt:27
12646
msgid ""
12647
"Case insensitive ignore patterns can be specified with regular expressions\n"
12648
"by using the ``i`` (for ignore case) flag in the pattern."
12649
msgstr ""
12650
12651
#: en/help_topics/patterns.txt:30
12652
msgid ""
12653
"For example, a case insensitive match for ``foo`` may be specified as::"
12654
msgstr ""
12655
12656
#: en/help_topics/patterns.txt:32
12657
msgid " RE:(?i)foo"
12658
msgstr ""
12659
12660
#: en/help_topics/patterns.txt:34
12661
msgid ""
12662
"Ignore patterns may be prefixed with ``!``, which means that a filename\n"
12663
"matched by that pattern will not be ignored."
12664
msgstr ""
12665
12666
#: en/help_topics/patterns.txt:37
12667
msgid ""
12668
".. _Python regular expressions: http://docs.python.org/library/re.html"
12669
msgstr ""
12670
12671
#: en/help_topics/revisionspec.txt:1
12672
msgid "Revision Identifiers"
12673
msgstr ""
12674
12675
#: en/help_topics/revisionspec.txt:3
12676
msgid ""
12677
"A revision identifier refers to a specific state of a branch's history. It\n"
12678
"can be expressed in several ways. It can begin with a keyword to\n"
12679
"unambiguously specify a given lookup type; some examples are 'last:1',\n"
12680
"'before:yesterday' and 'submit:'."
12681
msgstr ""
12682
12683
#: en/help_topics/revisionspec.txt:8
12684
msgid ""
12685
"Alternately, it can be given without a keyword, in which case it will be\n"
12686
"checked as a revision number, a tag, a revision id, a date specification, or "
12687
"a\n"
12688
"branch specification, in that order. For example, 'date:today' could be\n"
12689
"written as simply 'today', though if you have a tag called 'today' that "
12690
"will\n"
12691
"be found first."
12692
msgstr ""
12693
12694
#: en/help_topics/revisionspec.txt:14
12695
msgid ""
12696
"If 'REV1' and 'REV2' are revision identifiers, then 'REV1..REV2' denotes a\n"
12697
"revision range. Examples: '3647..3649', 'date:yesterday..-1' and\n"
12698
"'branch:/path/to/branch1/..branch:/branch2' (note that there are no quotes "
12699
"or\n"
12700
"spaces around the '..')."
12701
msgstr ""
12702
12703
#: en/help_topics/revisionspec.txt:19
12704
msgid ""
12705
"Ranges are interpreted differently by different commands. To the \"log\" "
12706
"command,\n"
12707
"a range is a sequence of log messages, but to the \"diff\" command, the "
12708
"range\n"
12709
"denotes a change between revisions (and not a sequence of changes). In\n"
12710
"addition, \"log\" considers a closed range whereas \"diff\" and \"merge\" "
12711
"consider it\n"
12712
"to be open-ended, that is, they include one end but not the other. For "
12713
"example:\n"
12714
"\"bzr log -r 3647..3649\" shows the messages of revisions 3647, 3648 and "
12715
"3649,\n"
12716
"while \"bzr diff -r 3647..3649\" includes the changes done in revisions 3648 "
12717
"and\n"
12718
"3649, but not 3647."
12719
msgstr ""
12720
12721
#: en/help_topics/revisionspec.txt:28
12722
msgid "The keywords used as revision selection methods are the following:"
12723
msgstr ""
12724
12725
#: en/help_topics/revisionspec.txt:30
12726
msgid ""
12727
":revid:\n"
12728
"\tSelects a revision using the revision id.\n"
12729
":submit:\n"
12730
"\tSelects a common ancestor with the submit branch.\n"
12731
":ancestor:\n"
12732
"\tSelects a common ancestor with a second branch.\n"
12733
":date:\n"
12734
"\tSelects a revision on the basis of a datestamp.\n"
12735
":branch:\n"
12736
"\tSelects the last revision of a specified branch.\n"
12737
":tag:\n"
12738
"\tSelects a revision identified by a tag name.\n"
12739
":revno:\n"
12740
"\tSelects a revision using a number.\n"
12741
":before:\n"
12742
"\tSelects the parent of the revision specified.\n"
12743
":annotate:\n"
12744
"\tSelect the revision that last modified the specified line.\n"
12745
":mainline:\n"
12746
"\tSelect mainline revision that merged the specified revision.\n"
12747
":last:\n"
12748
"\tSelects the nth revision from the end."
12749
msgstr ""
12750
12751
#: en/help_topics/revisionspec.txt:53
12752
msgid "In addition, plugins can provide other keywords."
12753
msgstr ""
12754
12755
#: en/help_topics/revisionspec.txt:55
12756
msgid "A detailed description of each keyword is given below."
12757
msgstr ""
12758
12759
#: en/help_topics/revisionspec.txt:57
12760
msgid ":revid:"
12761
msgstr ""
12762
12763
#: en/help_topics/revisionspec.txt:59
12764
msgid ""
12765
" Supply a specific revision id, that can be used to specify any\n"
12766
" revision id in the ancestry of the branch.\n"
12767
" Including merges, and pending merges.\n"
12768
" Examples::"
12769
msgstr ""
12770
12771
#: en/help_topics/revisionspec.txt:64
12772
msgid ""
12773
" revid:aaaa@bbbb-123456789 -> Select revision 'aaaa@bbbb-123456789'"
12774
msgstr ""
12775
12776
#: en/help_topics/revisionspec.txt:66
12777
msgid ":submit:"
12778
msgstr ""
12779
12780
#: en/help_topics/revisionspec.txt:68
12781
msgid ""
12782
" Diffing against this shows all the changes that were made in this "
12783
"branch,\n"
12784
" and is a good predictor of what merge will do. The submit branch is\n"
12785
" used by the bundle and merge directive commands. If no submit branch\n"
12786
" is specified, the parent branch is used instead."
12787
msgstr ""
12788
12789
#: en/help_topics/revisionspec.txt:73 en/help_topics/revisionspec.txt:85
12790
msgid ""
12791
" The common ancestor is the last revision that existed in both\n"
12792
" branches. Usually this is the branch point, but it could also be\n"
12793
" a revision that was merged."
12794
msgstr ""
12795
12796
#: en/help_topics/revisionspec.txt:77 en/help_topics/revisionspec.txt:93
12797
#: en/help_topics/revisionspec.txt:109 en/help_topics/revisionspec.txt:119
12798
#: en/help_topics/revisionspec.txt:153
12799
msgid " Examples::"
12800
msgstr ""
12801
12802
#: en/help_topics/revisionspec.txt:79
12803
msgid " $ bzr diff -r submit:"
12804
msgstr ""
12805
12806
#: en/help_topics/revisionspec.txt:81
12807
msgid ":ancestor:"
12808
msgstr ""
12809
12810
#: en/help_topics/revisionspec.txt:83
12811
msgid " Supply the path to a branch to select the common ancestor."
12812
msgstr ""
12813
12814
#: en/help_topics/revisionspec.txt:89
12815
msgid ""
12816
" This is frequently used with 'diff' to return all of the changes\n"
12817
" that your branch introduces, while excluding the changes that you\n"
12818
" have not merged from the remote branch."
12819
msgstr ""
12820
12821
#: en/help_topics/revisionspec.txt:95
12822
msgid ""
12823
" ancestor:/path/to/branch\n"
12824
" $ bzr diff -r ancestor:../../mainline/branch"
12825
msgstr ""
12826
12827
#: en/help_topics/revisionspec.txt:98
12828
msgid ":date:"
12829
msgstr ""
12830
12831
#: en/help_topics/revisionspec.txt:100
12832
msgid ""
12833
" Supply a datestamp to select the first revision that matches the date.\n"
12834
" Date can be 'yesterday', 'today', 'tomorrow' or a YYYY-MM-DD string.\n"
12835
" Matches the first entry after a given date (either at midnight or\n"
12836
" at a specified time)."
12837
msgstr ""
12838
12839
#: en/help_topics/revisionspec.txt:105
12840
msgid " One way to display all the changes since yesterday would be::"
12841
msgstr ""
12842
12843
#: en/help_topics/revisionspec.txt:107
12844
msgid " bzr log -r date:yesterday.."
12845
msgstr ""
12846
12847
#: en/help_topics/revisionspec.txt:111
12848
msgid ""
12849
" date:yesterday -> select the first revision since "
12850
"yesterday\n"
12851
" date:2006-08-14,17:10:14 -> select the first revision after\n"
12852
" August 14th, 2006 at 5:10pm."
12853
msgstr ""
12854
12855
#: en/help_topics/revisionspec.txt:115
12856
msgid ":branch:"
12857
msgstr ""
12858
12859
#: en/help_topics/revisionspec.txt:117
12860
msgid " Supply the path to a branch to select its last revision."
12861
msgstr ""
12862
12863
#: en/help_topics/revisionspec.txt:121
12864
msgid " branch:/path/to/branch"
12865
msgstr ""
12866
12867
#: en/help_topics/revisionspec.txt:123
12868
msgid ":tag:"
12869
msgstr ""
12870
12871
#: en/help_topics/revisionspec.txt:125
12872
msgid " Tags are stored in the branch and created by the 'tag' command."
12873
msgstr ""
12874
12875
#: en/help_topics/revisionspec.txt:127
12876
msgid ":revno:"
12877
msgstr ""
12878
12879
#: en/help_topics/revisionspec.txt:129
12880
msgid ""
12881
" Use an integer to specify a revision in the history of the branch.\n"
12882
" Optionally a branch can be specified. A negative number will count\n"
12883
" from the end of the branch (-1 is the last revision, -2 the previous\n"
12884
" one). If the negative number is larger than the branch's history, the\n"
12885
" first revision is returned.\n"
12886
" Examples::"
12887
msgstr ""
12888
12889
#: en/help_topics/revisionspec.txt:136
12890
msgid ""
12891
" revno:1 -> return the first revision of this branch\n"
12892
" revno:3:/path/to/branch -> return the 3rd revision of\n"
12893
" the branch '/path/to/branch'\n"
12894
" revno:-1 -> The last revision in a branch.\n"
12895
" -2:http://other/branch -> The second to last revision in the\n"
12896
" remote branch.\n"
12897
" -1000000 -> Most likely the first revision, unless\n"
12898
" your history is very long."
12899
msgstr ""
12900
12901
#: en/help_topics/revisionspec.txt:145
12902
msgid ":before:"
12903
msgstr ""
12904
12905
#: en/help_topics/revisionspec.txt:147
12906
msgid ""
12907
" Supply any revision spec to return the parent of that revision. This "
12908
"is\n"
12909
" mostly useful when inspecting revisions that are not in the revision "
12910
"history\n"
12911
" of a branch."
12912
msgstr ""
12913
12914
#: en/help_topics/revisionspec.txt:151
12915
msgid ""
12916
" It is an error to request the parent of the null revision (before:0)."
12917
msgstr ""
12918
12919
#: en/help_topics/revisionspec.txt:155
12920
msgid ""
12921
" before:1913 -> Return the parent of revno 1913 (revno 1912)\n"
12922
" before:revid:aaaa@bbbb-1234567890 -> return the parent of revision\n"
12923
" aaaa@bbbb-1234567890\n"
12924
" bzr diff -r before:1913..1913\n"
12925
" -> Find the changes between revision 1913 and its parent "
12926
"(1912).\n"
12927
" (What changes did revision 1913 introduce).\n"
12928
" This is equivalent to: bzr diff -c 1913"
12929
msgstr ""
12930
12931
#: en/help_topics/revisionspec.txt:163
12932
msgid ":annotate:"
12933
msgstr ""
12934
12935
#: en/help_topics/revisionspec.txt:165
12936
msgid ""
12937
" Select the revision that last modified the specified line. Line is\n"
12938
" specified as path:number. Path is a relative path to the file. "
12939
"Numbers\n"
12940
" start at 1, and are relative to the current version, not the last-\n"
12941
" committed version of the file."
12942
msgstr ""
12943
12944
#: en/help_topics/revisionspec.txt:170
12945
msgid ":mainline:"
12946
msgstr ""
12947
12948
#: en/help_topics/revisionspec.txt:172
12949
msgid ""
12950
" Select the revision that merged the specified revision into mainline."
12951
msgstr ""
12952
12953
#: en/help_topics/revisionspec.txt:174
12954
msgid ":last:"
12955
msgstr ""
12956
12957
#: en/help_topics/revisionspec.txt:176
12958
msgid ""
12959
" Supply a positive number to get the nth revision from the end.\n"
12960
" This is the same as supplying negative numbers to the 'revno:' spec.\n"
12961
" Examples::"
12962
msgstr ""
12963
12964
#: en/help_topics/revisionspec.txt:180
12965
msgid ""
12966
" last:1 -> return the last revision\n"
12967
" last:3 -> return the revision 2 before the end.\n"
12968
msgstr ""
12969
12970
#: en/help_topics/rules.txt:1
12971
msgid ""
12972
"Rules\n"
12973
"====="
12974
msgstr ""
12975
12976
#: en/help_topics/rules.txt:7
12977
msgid ""
12978
"Rules are defined in ini file format where the sections are file glob\n"
12979
"patterns and the contents of each section are the preferences for files\n"
12980
"matching that pattern(s). For example::"
12981
msgstr ""
12982
12983
#: en/help_topics/rules.txt:11
12984
msgid ""
12985
" [name *.bat]\n"
12986
" eol = native"
12987
msgstr ""
12988
12989
#: en/help_topics/rules.txt:14
12990
msgid ""
12991
" [name *.html *.xml]\n"
12992
" keywords = xml_escape"
12993
msgstr ""
12994
12995
#: en/help_topics/rules.txt:17
12996
msgid ""
12997
"Preferences like these are useful for commands and plugins wishing to\n"
12998
"provide custom behaviour for selected files. For more information on \n"
12999
"end of line conversion see :doc:`eol-help`.\n"
13000
"Keyword support is provided by the `keywords plugin\n"
13001
"<http://doc.bazaar.canonical.com/plugins/en/keywords-plugin.html>`_."
13002
msgstr ""
13003
13004
#: en/help_topics/rules.txt:23
13005
msgid ""
13006
"Files\n"
13007
"-----"
13008
msgstr ""
13009
13010
#: en/help_topics/rules.txt:26
13011
msgid ""
13012
"Default rules for all branches are defined in the optional file\n"
13013
"``BZR_HOME/rules``. "
13014
msgstr ""
13015
13016
#: en/help_topics/rules.txt:29
13017
msgid ""
13018
"Rule Patterns\n"
13019
"-------------"
13020
msgstr ""
13021
13022
#: en/help_topics/rules.txt:32
13023
msgid ""
13024
"Patterns are ordered and searching stops as soon as one matches.\n"
13025
"As a consequence, more explicit patterns should be placed towards\n"
13026
"the top of the file. Rule patterns use exactly the same conventions\n"
13027
"as ignore patterns. See :doc:`patterns-help` for details."
13028
msgstr ""
13029
13030
#: en/help_topics/rules.txt:37
13031
msgid ".. note::"
13032
msgstr ""
13033
13034
#: en/help_topics/rules.txt:39
13035
msgid ""
13036
" Patterns containing square brackets or spaces should be\n"
13037
" surrounded in quotes to ensure they are correctly parsed.\n"
13038
msgstr ""
13039
13040
#: en/help_topics/topics.txt:1
13041
msgid ""
13042
"authentication Information on configuring authentication\n"
13043
"basic Basic commands\n"
13044
"branches Information on what a branch is\n"
13045
"bugs Bug tracker settings\n"
13046
"checkouts Information on what a checkout is\n"
13047
"commands Basic help for all commands\n"
13048
"configuration Details on the configuration settings available\n"
13049
"conflict-types Types of conflicts and what to do about them\n"
13050
"content-filters Conversion of content into/from working trees\n"
13051
"criss-cross Information on criss-cross merging\n"
13052
"current-formats Current storage formats\n"
13053
"debug-flags Options to show or record debug information\n"
13054
"diverged-branches How to fix diverged branches\n"
13055
"env-variables Environment variable names and values\n"
13056
"eol Information on end-of-line handling\n"
13057
"files Information on configuration and log files\n"
13058
"formats Information on choosing a storage format\n"
13059
"global-options Options that control how Bazaar runs\n"
13060
"hidden-commands All hidden commands\n"
13061
"hooks Points at which custom processing can be added\n"
13062
"launchpad Using Bazaar with Launchpad.net\n"
13063
"location-alias Aliases for remembered locations\n"
13064
"log-formats Details on the logging formats available\n"
13065
"other-formats Experimental and deprecated storage formats\n"
13066
"patterns Information on the pattern syntax\n"
13067
"repositories Basic information on shared repositories.\n"
13068
"revisionspec Explain how to use --revision\n"
13069
"rules Information on defining rule-based preferences\n"
13070
"standalone-trees Information on what a standalone tree is\n"
13071
"standard-options Options that can be used with any command\n"
13072
"status-flags Help on status flags\n"
13073
"sync-for-reconfigure Steps to resolve \"out-of-sync\" when reconfiguring\n"
13074
"topics Topics list\n"
13075
"url-special-chars Special character handling in URLs\n"
13076
"urlspec Supported transport protocols\n"
13077
"working-trees Information on working trees\n"
13078
msgstr ""
13079
13080
#: en/help_topics/url-special-chars.txt:1
13081
msgid ""
13082
"Special character handling in URLs\n"
13083
"=================================="
13084
msgstr ""
13085
13086
#: en/help_topics/url-special-chars.txt:4
13087
msgid "Bazaar allows locations to be specified in multiple ways, either:"
13088
msgstr ""
13089
13090
#: en/help_topics/url-special-chars.txt:6
13091
msgid " * Fully qualified URLs"
13092
msgstr ""
13093
13094
#: en/help_topics/url-special-chars.txt:8
13095
msgid " * File system paths, relative or absolute"
13096
msgstr ""
13097
13098
#: en/help_topics/url-special-chars.txt:10
13099
msgid ""
13100
"Internally bzr treats all locations as URLs. For any file system paths\n"
13101
"that are specified it will automatically determine the appropriate URL\n"
13102
"representation, and escape special characters where necessary."
13103
msgstr ""
13104
13105
#: en/help_topics/url-special-chars.txt:14
13106
msgid ""
13107
"There are a few characters which have special meaning in URLs and need "
13108
"careful\n"
13109
"handling to avoid ambiguities. Characters can be escaped with a % and a hex\n"
13110
"value in URLs. Any non-ASCII characters in a file path will automatically "
13111
"be\n"
13112
"urlencoded when the path is converted to a URL."
13113
msgstr ""
13114
13115
#: en/help_topics/url-special-chars.txt:19
13116
msgid ""
13117
"URLs represent non-ASCII characters in an encoding defined by the server, "
13118
"but\n"
13119
"usually UTF-8. The % escapes should be of the UTF-8 bytes. Bazaar tries to "
13120
"be\n"
13121
"generous in what it accepts as a URL and to print them in a way that\n"
13122
"will be readable."
13123
msgstr ""
13124
13125
#: en/help_topics/url-special-chars.txt:24
13126
msgid ""
13127
"For example, if you have a directory named '/tmp/%2False' these are all "
13128
"valid\n"
13129
"ways of accessing the content (0x2F, or 47, is the ASCII code for forward "
13130
"slash)::"
13131
msgstr ""
13132
13133
#: en/help_topics/url-special-chars.txt:27
13134
msgid ""
13135
" cd /tmp\n"
13136
" bzr log /tmp/%2False\n"
13137
" bzr log %2False\n"
13138
" bzr log file:///tmp/%252False\n"
13139
" bzr log file://localhost/tmp/%252False\n"
13140
" bzr log file:%252False"
13141
msgstr ""
13142
13143
#: en/help_topics/url-special-chars.txt:34
13144
msgid "These are valid but do not refer to the same file::"
13145
msgstr ""
13146
13147
#: en/help_topics/url-special-chars.txt:36
13148
msgid ""
13149
" bzr log file:///tmp/%2False (refers to a file called /tmp/\\/alse)\n"
13150
" bzr log %252False (refers to a file called /tmp/%252False)"
13151
msgstr ""
13152
13153
#: en/help_topics/url-special-chars.txt:39
13154
msgid ""
13155
"Comma also has special meaning in URLs, because it denotes `segment "
13156
"parameters`_"
13157
msgstr ""
13158
13159
#: en/help_topics/url-special-chars.txt:41
13160
msgid ""
13161
"_`segment parameters`: http://www.ietf.org/rfc/rfc3986.txt (section 3.3)"
13162
msgstr ""
13163
13164
#: en/help_topics/url-special-chars.txt:43
13165
msgid ""
13166
"Comma is also special in any file system paths that are specified. To use a "
13167
"literal\n"
13168
"comma in a file system path, specify a URL and URL encode the comma::"
13169
msgstr ""
13170
13171
#: en/help_topics/url-special-chars.txt:46
13172
msgid ""
13173
" bzr log foo,branch=bla # path \"foo\" with the segment parameter "
13174
"\"branch\" set to \"bla\"\n"
13175
" bzr log file:foo%2Cbranch=bla # path \"foo,branch=bla\"\n"
13176
" bzr log file:foo,branch=bla # path \"foo\" with segment parameter "
13177
"\"branch\" set to \"bla\"\n"
13178
msgstr ""
13179
13180
#: en/help_topics/urlspec.txt:1
13181
msgid "URL Identifiers"
13182
msgstr ""
13183
13184
#: en/help_topics/urlspec.txt:3
13185
msgid "Supported URL prefixes::"
13186
msgstr ""
13187
13188
#: en/help_topics/urlspec.txt:5
13189
msgid ""
13190
" aftp:// Access using active FTP.\n"
13191
" bzr:// Fast access using the Bazaar smart server.\n"
13192
" bzr+ssh:// Fast access using the Bazaar smart server over SSH.\n"
13193
" file:// Access using the standard filesystem (default)\n"
13194
" ftp:// Access using passive FTP.\n"
13195
" http:// Read-only access of branches exported on the web.\n"
13196
" https:// Read-only access of branches exported on the web using "
13197
"SSL.\n"
13198
" sftp:// Access using SFTP (most SSH servers provide SFTP)."
13199
msgstr ""
13200
13201
#: en/help_topics/urlspec.txt:14
13202
msgid "Supported modifiers::"
13203
msgstr ""
13204
13205
#: en/help_topics/urlspec.txt:16
13206
msgid " gio+ Access using any GIO supported protocols."
13207
msgstr ""
13208
13209
#: en/help_topics/urlspec.txt:18
13210
msgid "Bazaar supports all of the standard parts within the URL::"
13211
msgstr ""
13212
13213
#: en/help_topics/urlspec.txt:20
13214
msgid " <protocol>://[user[:password]@]host[:port]/[path]"
13215
msgstr ""
13216
13217
#: en/help_topics/urlspec.txt:22
13218
msgid "allowing URLs such as::"
13219
msgstr ""
13220
13221
#: en/help_topics/urlspec.txt:24
13222
msgid " http://bzruser:BadPass@bzr.example.com:8080/bzr/trunk"
13223
msgstr ""
13224
13225
#: en/help_topics/urlspec.txt:26
13226
msgid ""
13227
"For bzr+ssh:// and sftp:// URLs, Bazaar also supports paths that begin\n"
13228
"with '~' as meaning that the rest of the path should be interpreted\n"
13229
"relative to the remote user's home directory. For example if the user\n"
13230
"``remote`` has a home directory of ``/home/remote`` on the server\n"
13231
"shell.example.com, then::"
13232
msgstr ""
13233
13234
#: en/help_topics/urlspec.txt:32
13235
msgid " bzr+ssh://remote@shell.example.com/~/myproject/trunk"
13236
msgstr ""
13237
13238
#: en/help_topics/urlspec.txt:34
13239
msgid "would refer to ``/home/remote/myproject/trunk``."
13240
msgstr ""
13241
13242
#: en/help_topics/urlspec.txt:36
13243
msgid ""
13244
"Many commands that accept URLs also accept location aliases too.\n"
13245
"See :doc:`location-alias-help` and :doc:`url-special-chars-help`.\n"
13246
msgstr ""
Loggerhead is a web-based interface for Breezy
Version: 2.0.1