« back to all changes in this revision
Viewing changes to po/en_AU.po
- browse files at revision 6462
- compare with another revision
- download diff
- download tarball
- view history from revision 6462
- Committer: Patch Queue Manager
- Date: 2012-02-03 10:59:42 UTC
- mfrom: (6461.1.1 trunk)
- Revision ID: pqm@pqm.ubuntu.com-20120203105942-zq9f2k9i5a2akbvu
(vila) Merge 2.5 branch (Vincent Ladeuil)
- files added:
- po/ast.po
- files modified:
- bzrlib/config.py
added
removed
po/en_AU.po
1
# English (Australia) translation for bzr
2
# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
3
# This file is distributed under the same license as the bzr package.
4
# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
5
#
6
msgid ""
7
msgstr ""
8
"Project-Id-Version: bzr\n"
9
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
10
"POT-Creation-Date: 2012-01-16 15:18+0100\n"
11
"PO-Revision-Date: 2012-01-16 16:40+0000\n"
12
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
13
"Language-Team: English (Australia) <en_AU@li.org>\n"
14
"MIME-Version: 1.0\n"
15
"Content-Type: text/plain; charset=UTF-8\n"
16
"Content-Transfer-Encoding: 8bit\n"
17
"Plural-Forms: nplurals=2; plural=n != 1;\n"
18
"X-Launchpad-Export-Date: 2012-01-17 05:18+0000\n"
19
"X-Generator: Launchpad (build 14676)\n"
20
21
#: bzrlib/add.py:95
22
msgid "skipping {0} (larger than {1} of {2} bytes)"
23
msgstr "skipping {0} (larger than {1} of {2} bytes)"
24
25
#: bzrlib/branch.py:872
26
msgid "Unstacking"
27
msgstr "Unstacking"
28
29
#: bzrlib/branch.py:3183
30
#, python-format
31
msgid "Pushed up to revision %d."
32
msgstr "Pushed up to revision %d."
33
34
#: bzrlib/branch.py:3185
35
#, python-format
36
msgid "%d tag updated."
37
msgid_plural "%d tags updated."
38
msgstr[0] ""
39
msgstr[1] ""
40
41
#: bzrlib/branch.py:3188
42
msgid "No new revisions or tags to push."
43
msgstr "No new revisions or tags to push."
44
45
#: bzrlib/branch.py:3190
46
msgid "No new revisions to push."
47
msgstr "No new revisions to push."
48
49
#: bzrlib/branch.py:3210
50
msgid "checked branch {0} format {1}"
51
msgstr ""
52
53
#: bzrlib/branch.py:3213
54
#, python-format
55
msgid "found error:%s"
56
msgstr "found error:%s"
57
58
#: bzrlib/builtins.py:121 bzrlib/builtins.py:2923 bzrlib/workingtree.py:315
59
#, python-format
60
msgid "Ignoring files outside view. View is %s"
61
msgstr "Ignoring files outside view. View is %s"
62
63
#: bzrlib/builtins.py:130
64
#, python-format
65
msgid "bzr %s --revision takes exactly one revision identifier"
66
msgstr "bzr %s --revision takes exactly one revision identifier"
67
68
#: bzrlib/builtins.py:215
69
msgid "Display status summary."
70
msgstr "Display status summary."
71
72
#: bzrlib/builtins.py:217
73
msgid ""
74
"This reports on versioned and unknown files, reporting them\n"
75
"grouped by state. Possible states are:"
76
msgstr ""
77
"This reports on versioned and unknown files, reporting them\n"
78
"grouped by state. Possible states are:"
79
80
#: bzrlib/builtins.py:220
81
msgid ""
82
"added\n"
83
" Versioned in the working copy but not in the previous revision."
84
msgstr ""
85
"added\n"
86
" Versioned in the working copy but not in the previous revision."
87
88
#: bzrlib/builtins.py:223
89
msgid ""
90
"removed\n"
91
" Versioned in the previous revision but removed or deleted\n"
92
" in the working copy."
93
msgstr ""
94
"removed\n"
95
" Versioned in the previous revision but removed or deleted\n"
96
" in the working copy."
97
98
#: bzrlib/builtins.py:227
99
msgid ""
100
"renamed\n"
101
" Path of this file changed from the previous revision;\n"
102
" the text may also have changed. This includes files whose\n"
103
" parent directory was renamed."
104
msgstr ""
105
"renamed\n"
106
" Path of this file changed from the previous revision;\n"
107
" the text may also have changed. This includes files whose\n"
108
" parent directory was renamed."
109
110
#: bzrlib/builtins.py:232
111
msgid ""
112
"modified\n"
113
" Text has changed since the previous revision."
114
msgstr ""
115
"modified\n"
116
" Text has changed since the previous revision."
117
118
#: bzrlib/builtins.py:235
119
msgid ""
120
"kind changed\n"
121
" File kind has been changed (e.g. from file to directory)."
122
msgstr ""
123
"kind changed\n"
124
" File kind has been changed (e.g. from file to directory)."
125
126
#: bzrlib/builtins.py:238
127
msgid ""
128
"unknown\n"
129
" Not versioned and not matching an ignore pattern."
130
msgstr ""
131
"unknown\n"
132
" Not versioned and not matching an ignore pattern."
133
134
#: bzrlib/builtins.py:241
135
msgid ""
136
"Additionally for directories, symlinks and files with a changed\n"
137
"executable bit, Bazaar indicates their type using a trailing\n"
138
"character: '/', '@' or '*' respectively. These decorations can be\n"
139
"disabled using the '--no-classify' option."
140
msgstr ""
141
"Additionally for directories, symlinks and files with a changed\n"
142
"executable bit, Bazaar indicates their type using a trailing\n"
143
"character: '/', '@' or '*' respectively. These decorations can be\n"
144
"disabled using the '--no-classify' option."
145
146
#: bzrlib/builtins.py:246
147
msgid ""
148
"To see ignored files use 'bzr ignored'. For details on the\n"
149
"changes to file texts, use 'bzr diff'."
150
msgstr ""
151
"To see ignored files use 'bzr ignored'. For details on the\n"
152
"changes to file texts, use 'bzr diff'."
153
154
#: bzrlib/builtins.py:249
155
msgid ""
156
"Note that --short or -S gives status flags for each item, similar\n"
157
"to Subversion's status command. To get output similar to svn -q,\n"
158
"use bzr status -SV."
159
msgstr ""
160
"Note that --short or -S gives status flags for each item, similar\n"
161
"to Subversion's status command. To get output similar to svn -q,\n"
162
"use bzr status -SV."
163
164
#: bzrlib/builtins.py:253
165
msgid ""
166
"If no arguments are specified, the status of the entire working\n"
167
"directory is shown. Otherwise, only the status of the specified\n"
168
"files or directories is reported. If a directory is given, status\n"
169
"is reported for everything inside that directory."
170
msgstr ""
171
"If no arguments are specified, the status of the entire working\n"
172
"directory is shown. Otherwise, only the status of the specified\n"
173
"files or directories is reported. If a directory is given, status\n"
174
"is reported for everything inside that directory."
175
176
#: bzrlib/builtins.py:258
177
msgid ""
178
"Before merges are committed, the pending merge tip revisions are\n"
179
"shown. To see all pending merge revisions, use the -v option.\n"
180
"To skip the display of pending merge information altogether, use\n"
181
"the no-pending option or specify a file/directory."
182
msgstr ""
183
"Before merges are committed, the pending merge tip revisions are\n"
184
"shown. To see all pending merge revisions, use the -v option.\n"
185
"To skip the display of pending merge information altogether, use\n"
186
"the no-pending option or specify a file/directory."
187
188
#: bzrlib/builtins.py:263
189
msgid ""
190
"To compare the working directory to a specific revision, pass a\n"
191
"single revision to the revision argument."
192
msgstr ""
193
"To compare the working directory to a specific revision, pass a\n"
194
"single revision to the revision argument."
195
196
#: bzrlib/builtins.py:266
197
msgid ""
198
"To see which files have changed in a specific revision, or between\n"
199
"two revisions, pass a revision range to the revision argument.\n"
200
"This will produce the same results as calling 'bzr diff --summarize'."
201
msgstr ""
202
"To see which files have changed in a specific revision, or between\n"
203
"two revisions, pass a revision range to the revision argument.\n"
204
"This will produce the same results as calling 'bzr diff --summarize'."
205
206
#: bzrlib/builtins.py:275
207
msgid "Use short status indicators."
208
msgstr "Use short status indicators."
209
210
#: bzrlib/builtins.py:277
211
msgid "Only show versioned files."
212
msgstr "Only show versioned files."
213
214
#: bzrlib/builtins.py:279
215
msgid "Don't show pending merges."
216
msgstr "Don't show pending merges."
217
218
#: bzrlib/builtins.py:282
219
msgid "Do not mark object type using indicator."
220
msgstr "Do not mark object type using indicator."
221
222
#: bzrlib/builtins.py:297
223
msgid "bzr status --revision takes exactly one or two revision specifiers"
224
msgstr "bzr status --revision takes exactly one or two revision specifiers"
225
226
#: bzrlib/builtins.py:341 bzrlib/builtins.py:5090
227
msgid "You can only supply one of revision_id or --revision"
228
msgstr "You can only supply one of revision_id or --revision"
229
230
#: bzrlib/builtins.py:344 bzrlib/builtins.py:5092
231
msgid "You must supply either --revision or a revision_id"
232
msgstr "You must supply either --revision or a revision_id"
233
234
#: bzrlib/builtins.py:351
235
#, python-format
236
msgid "Repository %r does not support access to raw revision texts"
237
msgstr "Repository %r does not support access to raw revision texts"
238
239
#: bzrlib/builtins.py:362
240
msgid "The repository {0} contains no revision {1}."
241
msgstr "The repository {0} contains no revision {1}."
242
243
#: bzrlib/builtins.py:369
244
msgid "You cannot specify a NULL revision."
245
msgstr "You cannot specify a NULL revision."
246
247
#: bzrlib/builtins.py:461
248
msgid "Remove the working tree from a given branch/checkout."
249
msgstr "Remove the working tree from a given branch/checkout."
250
251
#: bzrlib/builtins.py:463
252
msgid ""
253
"Since a lightweight checkout is little more than a working tree\n"
254
"this will refuse to run against one."
255
msgstr ""
256
"Since a lightweight checkout is little more than a working tree\n"
257
"this will refuse to run against one."
258
259
#: bzrlib/builtins.py:466
260
msgid "To re-create the working tree, use \"bzr checkout\"."
261
msgstr "To re-create the working tree, use \"bzr checkout\"."
262
263
#: bzrlib/builtins.py:472
264
msgid ""
265
"Remove the working tree even if it has uncommitted or shelved changes."
266
msgstr ""
267
"Remove the working tree even if it has uncommitted or shelved changes."
268
269
#: bzrlib/builtins.py:486
270
msgid "No working tree to remove"
271
msgstr "No working tree to remove"
272
273
#: bzrlib/builtins.py:488
274
msgid "You cannot remove the working tree of a remote path"
275
msgstr "You cannot remove the working tree of a remote path"
276
277
#: bzrlib/builtins.py:497
278
msgid "You cannot remove the working tree from a lightweight checkout"
279
msgstr "You cannot remove the working tree from a lightweight checkout"
280
281
#: bzrlib/builtins.py:537
282
msgid ""
283
"The tree does not appear to be corrupt. You probably want \"bzr revert\" "
284
"instead. Use \"--force\" if you are sure you want to reset the working tree."
285
msgstr ""
286
"The tree does not appear to be corrupt. You probably want \"bzr revert\" "
287
"instead. Use \"--force\" if you are sure you want to reset the working tree."
288
289
#: bzrlib/builtins.py:548
290
msgid ""
291
", the header appears corrupt, try passing -r -1 to set the state to the last "
292
"commit"
293
msgstr ""
294
", the header appears corrupt, try passing -r -1 to set the state to the last "
295
"commit"
296
297
#: bzrlib/builtins.py:552
298
msgid "failed to reset the tree state{0}"
299
msgstr "failed to reset the tree state{0}"
300
301
#: bzrlib/builtins.py:556
302
msgid "Show current revision number."
303
msgstr "Show current revision number."
304
305
#: bzrlib/builtins.py:558
306
msgid "This is equal to the number of revisions on this branch."
307
msgstr "This is equal to the number of revisions on this branch."
308
309
#: bzrlib/builtins.py:571
310
msgid "--tree and --revision can not be used together"
311
msgstr ""
312
313
#: bzrlib/builtins.py:588 bzrlib/builtins.py:5874
314
msgid "Tags can only be placed on a single revision, not on a range"
315
msgstr ""
316
317
#: bzrlib/builtins.py:612
318
msgid "Show revno of working tree."
319
msgstr ""
320
321
#: bzrlib/builtins.py:660
322
msgid "Add specified files or directories."
323
msgstr "Add specified files or directories."
324
325
#: bzrlib/builtins.py:662
326
msgid ""
327
"In non-recursive mode, all the named items are added, regardless\n"
328
"of whether they were previously ignored. A warning is given if\n"
329
"any of the named files are already versioned."
330
msgstr ""
331
"In non-recursive mode, all the named items are added, regardless\n"
332
"of whether they were previously ignored. A warning is given if\n"
333
"any of the named files are already versioned."
334
335
#: bzrlib/builtins.py:666
336
msgid ""
337
"In recursive mode (the default), files are treated the same way\n"
338
"but the behaviour for directories is different. Directories that\n"
339
"are already versioned do not give a warning. All directories,\n"
340
"whether already versioned or not, are searched for files or\n"
341
"subdirectories that are neither versioned or ignored, and these\n"
342
"are added. This search proceeds recursively into versioned\n"
343
"directories. If no names are given '.' is assumed."
344
msgstr ""
345
"In recursive mode (the default), files are treated the same way\n"
346
"but the behaviour for directories is different. Directories that\n"
347
"are already versioned do not give a warning. All directories,\n"
348
"whether already versioned or not, are searched for files or\n"
349
"subdirectories that are neither versioned or ignored, and these\n"
350
"are added. This search proceeds recursively into versioned\n"
351
"directories. If no names are given '.' is assumed."
352
353
#: bzrlib/builtins.py:674
354
msgid ""
355
"A warning will be printed when nested trees are encountered,\n"
356
"unless they are explicitly ignored."
357
msgstr ""
358
359
#: bzrlib/builtins.py:677
360
msgid ""
361
"Therefore simply saying 'bzr add' will version all files that\n"
362
"are currently unknown."
363
msgstr ""
364
"Therefore simply saying 'bzr add' will version all files that\n"
365
"are currently unknown."
366
367
#: bzrlib/builtins.py:680
368
msgid ""
369
"Adding a file whose parent directory is not versioned will\n"
370
"implicitly add the parent, and so on up to the root. This means\n"
371
"you should never need to explicitly add a directory, they'll just\n"
372
"get added when you add a file in the directory."
373
msgstr ""
374
"Adding a file whose parent directory is not versioned will\n"
375
"implicitly add the parent, and so on up to the root. This means\n"
376
"you should never need to explicitly add a directory, they'll just\n"
377
"get added when you add a file in the directory."
378
379
#: bzrlib/builtins.py:685
380
msgid ""
381
"--dry-run will show which files would be added, but not actually\n"
382
"add them."
383
msgstr ""
384
"--dry-run will show which files would be added, but not actually\n"
385
"add them."
386
387
#: bzrlib/builtins.py:688
388
msgid ""
389
"--file-ids-from will try to use the file ids from the supplied path.\n"
390
"It looks up ids trying to find a matching parent directory with the\n"
391
"same filename, and then by pure path. This option is rarely needed\n"
392
"but can be useful when adding the same logical file into two\n"
393
"branches that will be merged later (without showing the two different\n"
394
"adds as a conflict). It is also useful when merging another project\n"
395
"into a subdirectory of this one."
396
msgstr ""
397
"--file-ids-from will try to use the file ids from the supplied path.\n"
398
"It looks up ids trying to find a matching parent directory with the\n"
399
"same filename, and then by pure path. This option is rarely needed\n"
400
"but can be useful when adding the same logical file into two\n"
401
"branches that will be merged later (without showing the two different\n"
402
"adds as a conflict). It is also useful when merging another project\n"
403
"into a subdirectory of this one."
404
405
#: bzrlib/builtins.py:696
406
msgid ""
407
"Any files matching patterns in the ignore list will not be added\n"
408
"unless they are explicitly mentioned."
409
msgstr ""
410
"Any files matching patterns in the ignore list will not be added\n"
411
"unless they are explicitly mentioned."
412
413
#: bzrlib/builtins.py:699
414
msgid ""
415
"In recursive mode, files larger than the configuration option \n"
416
"add.maximum_file_size will be skipped. Named items are never skipped due\n"
417
"to file size."
418
msgstr ""
419
"In recursive mode, files larger than the configuration option \n"
420
"add.maximum_file_size will be skipped. Named items are never skipped due\n"
421
"to file size."
422
423
#: bzrlib/builtins.py:706
424
msgid "Don't recursively add the contents of directories."
425
msgstr "Don't recursively add the contents of directories."
426
427
#: bzrlib/builtins.py:712
428
msgid "Lookup file ids from this tree."
429
msgstr "Lookup file ids from this tree."
430
431
#: bzrlib/builtins.py:748
432
msgid "ignored {0} matching \"{1}\"\n"
433
msgstr "ignored {0} matching \"{1}\"\n"
434
435
#: bzrlib/builtins.py:753
436
msgid "Create a new versioned directory."
437
msgstr "Create a new versioned directory."
438
439
#: bzrlib/builtins.py:755
440
msgid "This is equivalent to creating the directory and then adding it."
441
msgstr "This is equivalent to creating the directory and then adding it."
442
443
#: bzrlib/builtins.py:762
444
msgid "No error if existing, make parent directories as needed."
445
msgstr ""
446
447
#: bzrlib/builtins.py:796
448
#, python-format
449
msgid "added %s\n"
450
msgstr "added %s\n"
451
452
#: bzrlib/builtins.py:838
453
#, python-format
454
msgid "invalid kind %r specified"
455
msgstr "invalid kind %r specified"
456
457
#: bzrlib/builtins.py:875
458
msgid "Move or rename a file."
459
msgstr "Move or rename a file."
460
461
#: bzrlib/builtins.py:877
462
msgid " bzr mv SOURCE... DESTINATION"
463
msgstr " bzr mv SOURCE... DESTINATION"
464
465
#: bzrlib/builtins.py:879
466
msgid ""
467
"If the last argument is a versioned directory, all the other names\n"
468
"are moved into it. Otherwise, there must be exactly two arguments\n"
469
"and the file is changed to a new name."
470
msgstr ""
471
"If the last argument is a versioned directory, all the other names\n"
472
"are moved into it. Otherwise, there must be exactly two arguments\n"
473
"and the file is changed to a new name."
474
475
#: bzrlib/builtins.py:883
476
msgid ""
477
"If OLDNAME does not exist on the filesystem but is versioned and\n"
478
"NEWNAME does exist on the filesystem but is not versioned, mv\n"
479
"assumes that the file has been manually moved and only updates\n"
480
"its internal inventory to reflect that change.\n"
481
"The same is valid when moving many SOURCE files to a DESTINATION."
482
msgstr ""
483
"If OLDNAME does not exist on the filesystem but is versioned and\n"
484
"NEWNAME does exist on the filesystem but is not versioned, mv\n"
485
"assumes that the file has been manually moved and only updates\n"
486
"its internal inventory to reflect that change.\n"
487
"The same is valid when moving many SOURCE files to a DESTINATION."
488
489
#: bzrlib/builtins.py:889
490
msgid "Files cannot be moved between branches."
491
msgstr "Files cannot be moved between branches."
492
493
#: bzrlib/builtins.py:896
494
msgid ""
495
"Move only the bzr identifier of the file, because the file has already been "
496
"moved."
497
msgstr ""
498
"Move only the bzr identifier of the file, because the file has already been "
499
"moved."
500
501
#: bzrlib/builtins.py:898
502
msgid "Automatically guess renames."
503
msgstr "Automatically guess renames."
504
505
#: bzrlib/builtins.py:899
506
msgid "Avoid making changes when guessing renames."
507
msgstr "Avoid making changes when guessing renames."
508
509
#: bzrlib/builtins.py:908
510
msgid "--dry-run requires --auto."
511
msgstr "--dry-run requires --auto."
512
513
#: bzrlib/builtins.py:912
514
msgid "missing file argument"
515
msgstr "missing file argument"
516
517
#: bzrlib/builtins.py:916
518
msgid "can not move root of branch"
519
msgstr ""
520
521
#: bzrlib/builtins.py:922
522
msgid "Only one path may be specified to --auto."
523
msgstr "Only one path may be specified to --auto."
524
525
#: bzrlib/builtins.py:925
526
msgid "--after cannot be specified with --auto."
527
msgstr "--after cannot be specified with --auto."
528
529
#: bzrlib/builtins.py:962
530
msgid "to mv multiple files the destination must be a versioned directory"
531
msgstr "to mv multiple files the destination must be a versioned directory"
532
533
#: bzrlib/builtins.py:1014
534
msgid "Turn this branch into a mirror of another branch."
535
msgstr "Turn this branch into a mirror of another branch."
536
537
#: bzrlib/builtins.py:1016
538
msgid ""
539
"By default, this command only works on branches that have not diverged.\n"
540
"Branches are considered diverged if the destination branch's most recent \n"
541
"commit is one that has not been merged (directly or indirectly) into the \n"
542
"parent."
543
msgstr ""
544
"By default, this command only works on branches that have not diverged.\n"
545
"Branches are considered diverged if the destination branch's most recent \n"
546
"commit is one that has not been merged (directly or indirectly) into the \n"
547
"parent."
548
549
#: bzrlib/builtins.py:1021
550
msgid ""
551
"If branches have diverged, you can use 'bzr merge' to integrate the changes\n"
552
"from one into the other. Once one branch has merged, the other should\n"
553
"be able to pull it again."
554
msgstr ""
555
"If branches have diverged, you can use 'bzr merge' to integrate the changes\n"
556
"from one into the other. Once one branch has merged, the other should\n"
557
"be able to pull it again."
558
559
#: bzrlib/builtins.py:1025
560
msgid ""
561
"If you want to replace your local changes and just want your branch to\n"
562
"match the remote one, use pull --overwrite. This will work even if the two\n"
563
"branches have diverged."
564
msgstr ""
565
"If you want to replace your local changes and just want your branch to\n"
566
"match the remote one, use pull --overwrite. This will work even if the two\n"
567
"branches have diverged."
568
569
#: bzrlib/builtins.py:1029
570
msgid ""
571
"If there is no default location set, the first pull will set it (use\n"
572
"--no-remember to avoid setting it). After that, you can omit the\n"
573
"location to use the default. To change the default, use --remember. The\n"
574
"value will only be saved if the remote location can be accessed."
575
msgstr ""
576
"If there is no default location set, the first pull will set it (use\n"
577
"--no-remember to avoid setting it). After that, you can omit the\n"
578
"location to use the default. To change the default, use --remember. The\n"
579
"value will only be saved if the remote location can be accessed."
580
581
#: bzrlib/builtins.py:1034
582
msgid ""
583
"The --verbose option will display the revisions pulled using the log_format\n"
584
"configuration option. You can use a different format by overriding it with\n"
585
"-Olog_format=<other_format>."
586
msgstr ""
587
588
#: bzrlib/builtins.py:1038
589
msgid ""
590
"Note: The location can be specified either in the form of a branch,\n"
591
"or in the form of a path to a file containing a merge directive generated\n"
592
"with bzr send."
593
msgstr ""
594
"Note: The location can be specified either in the form of a branch,\n"
595
"or in the form of a path to a file containing a merge directive generated\n"
596
"with bzr send."
597
598
#: bzrlib/builtins.py:1046
599
msgid "Show logs of pulled revisions."
600
msgstr "Show logs of pulled revisions."
601
602
#: bzrlib/builtins.py:1048
603
msgid ""
604
"Branch to pull into, rather than the one containing the working directory."
605
msgstr ""
606
"Branch to pull into, rather than the one containing the working directory."
607
608
#: bzrlib/builtins.py:1051
609
msgid ""
610
"Perform a local pull in a bound branch. Local pulls are not applied to the "
611
"master branch."
612
msgstr ""
613
"Perform a local pull in a bound branch. Local pulls are not applied to the "
614
"master branch."
615
616
#: bzrlib/builtins.py:1080
617
msgid "Need working tree for --show-base."
618
msgstr "Need working tree for --show-base."
619
620
#: bzrlib/builtins.py:1096
621
msgid "No pull location known or specified."
622
msgstr "No pull location known or specified."
623
624
#: bzrlib/builtins.py:1102
625
#, python-format
626
msgid "Using saved parent location: %s\n"
627
msgstr "Using saved parent location: %s\n"
628
629
#: bzrlib/builtins.py:1109 bzrlib/builtins.py:4300
630
msgid "Cannot use -r with merge directives or bundles"
631
msgstr "Cannot use -r with merge directives or bundles"
632
633
#: bzrlib/builtins.py:1150
634
msgid "Update a mirror of this branch."
635
msgstr "Update a mirror of this branch."
636
637
#: bzrlib/builtins.py:1152
638
msgid ""
639
"The target branch will not have its working tree populated because this\n"
640
"is both expensive, and is not supported on remote file systems."
641
msgstr ""
642
"The target branch will not have its working tree populated because this\n"
643
"is both expensive and is not supported on remote file systems."
644
645
#: bzrlib/builtins.py:1155
646
msgid ""
647
"Some smart servers or protocols *may* put the working tree in place in\n"
648
"the future."
649
msgstr ""
650
"Some smart servers or protocols *may* put the working tree in place in\n"
651
"the future."
652
653
#: bzrlib/builtins.py:1158
654
msgid ""
655
"This command only works on branches that have not diverged. Branches are\n"
656
"considered diverged if the destination branch's most recent commit is one\n"
657
"that has not been merged (directly or indirectly) by the source branch."
658
msgstr ""
659
"This command only works on branches that have not diverged. Branches are\n"
660
"considered diverged if the destination branch's most recent commit is one\n"
661
"that has not been merged (directly or indirectly) by the source branch."
662
663
#: bzrlib/builtins.py:1162
664
msgid ""
665
"If branches have diverged, you can use 'bzr push --overwrite' to replace\n"
666
"the other branch completely, discarding its unmerged changes."
667
msgstr ""
668
"If branches have diverged, you can use 'bzr push --overwrite' to replace\n"
669
"the other branch completely, discarding its unmerged changes."
670
671
#: bzrlib/builtins.py:1165
672
msgid ""
673
"If you want to ensure you have the different changes in the other branch,\n"
674
"do a merge (see bzr help merge) from the other branch, and commit that.\n"
675
"After that you will be able to do a push without '--overwrite'."
676
msgstr ""
677
"If you want to ensure you have the different changes in the other branch,\n"
678
"do a merge (see bzr help merge) from the other branch, and commit that.\n"
679
"After that you will be able to do a push without '--overwrite'."
680
681
#: bzrlib/builtins.py:1169
682
msgid ""
683
"If there is no default push location set, the first push will set it (use\n"
684
"--no-remember to avoid setting it). After that, you can omit the\n"
685
"location to use the default. To change the default, use --remember. The\n"
686
"value will only be saved if the remote location can be accessed."
687
msgstr ""
688
"If there is no default push location set, the first push will set it (use\n"
689
"--no-remember to avoid setting it). After that, you can omit the\n"
690
"location to use the default. To change the default, use --remember. The\n"
691
"value will only be saved if the remote location can be accessed."
692
693
#: bzrlib/builtins.py:1174
694
msgid ""
695
"The --verbose option will display the revisions pushed using the log_format\n"
696
"configuration option. You can use a different format by overriding it with\n"
697
"-Olog_format=<other_format>."
698
msgstr ""
699
700
#: bzrlib/builtins.py:1185 bzrlib/foreign.py:272
701
msgid ""
702
"Branch to push from, rather than the one containing the working directory."
703
msgstr ""
704
"Branch to push from, rather than the one containing the working directory."
705
706
#: bzrlib/builtins.py:1188
707
msgid ""
708
"By default push will fail if the target directory exists, but does not "
709
"already have a control directory. This flag will allow push to proceed."
710
msgstr ""
711
"By default push will fail if the target directory exists, but does not "
712
"already have a control directory. This flag will allow push to proceed."
713
714
#: bzrlib/builtins.py:1193
715
msgid ""
716
"Create a stacked branch that references the public location of the parent "
717
"branch."
718
msgstr ""
719
"Create a stacked branch that references the public location of the parent "
720
"branch."
721
722
#: bzrlib/builtins.py:1196
723
msgid ""
724
"Create a stacked branch that refers to another branch for the commit "
725
"history. Only the work not present in the referenced branch is included in "
726
"the branch created."
727
msgstr ""
728
729
#: bzrlib/builtins.py:1201 bzrlib/foreign.py:279
730
msgid ""
731
"Refuse to push if there are uncommitted changes in the working tree, --no-"
732
"strict disables the check."
733
msgstr ""
734
735
#: bzrlib/builtins.py:1204
736
msgid "Don't populate the working tree, even for protocols that support it."
737
msgstr ""
738
739
#: bzrlib/builtins.py:1248
740
msgid "Could not determine branch to refer to."
741
msgstr ""
742
743
#: bzrlib/builtins.py:1257
744
#, python-format
745
msgid ""
746
"No push location known or specified. To push to the parent branch (at %s), "
747
"use 'bzr push :parent'."
748
msgstr ""
749
750
#: bzrlib/builtins.py:1263 bzrlib/foreign.py:306
751
msgid "No push location known or specified."
752
msgstr ""
753
754
#: bzrlib/builtins.py:1267
755
#, python-format
756
msgid "Using saved push location: %s"
757
msgstr ""
758
759
#: bzrlib/builtins.py:1277
760
msgid "Create a new branch that is a copy of an existing branch."
761
msgstr ""
762
763
#: bzrlib/builtins.py:1279
764
msgid ""
765
"If the TO_LOCATION is omitted, the last component of the FROM_LOCATION will\n"
766
"be used. In other words, \"branch ../foo/bar\" will attempt to create "
767
"./bar.\n"
768
"If the FROM_LOCATION has no / or path separator embedded, the TO_LOCATION\n"
769
"is derived from the FROM_LOCATION by stripping a leading scheme or drive\n"
770
"identifier, if any. For example, \"branch lp:foo-bar\" will attempt to\n"
771
"create ./foo-bar."
772
msgstr ""
773
774
#: bzrlib/builtins.py:1286
775
msgid ""
776
"To retrieve the branch as of a particular revision, supply the --revision\n"
777
"parameter, as in \"branch foo/bar -r 5\"."
778
msgstr ""
779
780
#: bzrlib/builtins.py:1289
781
msgid "The synonyms 'clone' and 'get' for this command are deprecated."
782
msgstr ""
783
784
#: bzrlib/builtins.py:1299
785
msgid "Create a branch without a working-tree."
786
msgstr ""
787
788
#: bzrlib/builtins.py:1301
789
msgid "Switch the checkout in the current directory to the new branch."
790
msgstr ""
791
792
#: bzrlib/builtins.py:1304
793
msgid ""
794
"Create a stacked branch referring to the source branch. The new branch will "
795
"depend on the availability of the source branch for all operations."
796
msgstr ""
797
798
#: bzrlib/builtins.py:1308
799
msgid "Do not use a shared repository, even if available."
800
msgstr ""
801
802
#: bzrlib/builtins.py:1310
803
msgid ""
804
"By default branch will fail if the target directory exists, but does not "
805
"already have a control directory. This flag will allow branch to proceed."
806
msgstr ""
807
808
#: bzrlib/builtins.py:1315
809
msgid "Bind new branch to from location."
810
msgstr ""
811
812
#: bzrlib/builtins.py:1362
813
#, python-format
814
msgid "Target directory \"%s\" already exists."
815
msgstr ""
816
817
#: bzrlib/builtins.py:1374
818
#, python-format
819
msgid "Parent of \"%s\" does not exist."
820
msgstr ""
821
822
#: bzrlib/builtins.py:1393
823
msgid "The branch {0} has no revision {1}."
824
msgstr ""
825
826
#: bzrlib/builtins.py:1403 bzrlib/push.py:53
827
#, python-format
828
msgid "Created new stacked branch referring to %s."
829
msgstr ""
830
831
#: bzrlib/builtins.py:1407
832
#, python-format
833
msgid "Branched %d revision."
834
msgid_plural "Branched %d revisions."
835
msgstr[0] ""
836
msgstr[1] ""
837
838
#: bzrlib/builtins.py:1412
839
#, python-format
840
msgid "New branch bound to %s"
841
msgstr ""
842
843
#: bzrlib/builtins.py:1417 bzrlib/builtins.py:6187
844
#, python-format
845
msgid "Switched to branch: %s"
846
msgstr ""
847
848
#: bzrlib/builtins.py:1422
849
msgid "List the branches available at the current location."
850
msgstr ""
851
852
#: bzrlib/builtins.py:1424
853
msgid ""
854
"This command will print the names of all the branches at the current\n"
855
"location."
856
msgstr ""
857
858
#: bzrlib/builtins.py:1431
859
msgid ""
860
"Recursively scan for branches rather than just looking in the specified "
861
"location."
862
msgstr ""
863
864
#: bzrlib/builtins.py:1461
865
msgid "(default)"
866
msgstr ""
867
868
#: bzrlib/builtins.py:1473
869
msgid "Create a new checkout of an existing branch."
870
msgstr ""
871
872
#: bzrlib/builtins.py:1475
873
msgid ""
874
"If BRANCH_LOCATION is omitted, checkout will reconstitute a working tree "
875
"for\n"
876
"the branch found in '.'. This is useful if you have removed the working "
877
"tree\n"
878
"or if it was never created - i.e. if you pushed the branch to its current\n"
879
"location using SFTP."
880
msgstr ""
881
882
#: bzrlib/builtins.py:1480
883
msgid ""
884
"If the TO_LOCATION is omitted, the last component of the BRANCH_LOCATION "
885
"will\n"
886
"be used. In other words, \"checkout ../foo/bar\" will attempt to create "
887
"./bar.\n"
888
"If the BRANCH_LOCATION has no / or path separator embedded, the TO_LOCATION\n"
889
"is derived from the BRANCH_LOCATION by stripping a leading scheme or drive\n"
890
"identifier, if any. For example, \"checkout lp:foo-bar\" will attempt to\n"
891
"create ./foo-bar."
892
msgstr ""
893
894
#: bzrlib/builtins.py:1487
895
msgid ""
896
"To retrieve the branch as of a particular revision, supply the --revision\n"
897
"parameter, as in \"checkout foo/bar -r 5\". Note that this will be "
898
"immediately\n"
899
"out of date [so you cannot commit] but it may be useful (i.e. to examine "
900
"old\n"
901
"code.)"
902
msgstr ""
903
904
#: bzrlib/builtins.py:1497
905
msgid ""
906
"Perform a lightweight checkout. Lightweight checkouts depend on access to "
907
"the branch for every operation. Normal checkouts can perform common "
908
"operations like diff and status without such access, and also support local "
909
"commits."
910
msgstr ""
911
912
#: bzrlib/builtins.py:1504
913
msgid "Get file contents from this tree."
914
msgstr ""
915
916
#: bzrlib/builtins.py:1506
917
msgid "Hard-link working tree files where possible."
918
msgstr ""
919
920
#: bzrlib/builtins.py:1547
921
msgid ""
922
"Show list of renamed files.\n"
923
" "
924
msgstr ""
925
926
#: bzrlib/builtins.py:1577
927
msgid "Update a working tree to a new revision."
928
msgstr ""
929
930
#: bzrlib/builtins.py:1579
931
msgid ""
932
"This will perform a merge of the destination revision (the tip of the\n"
933
"branch, or the specified revision) into the working tree, and then make\n"
934
"that revision the basis revision for the working tree. "
935
msgstr ""
936
937
#: bzrlib/builtins.py:1583
938
msgid ""
939
"You can use this to visit an older revision, or to update a working tree\n"
940
"that is out of date from its branch."
941
msgstr ""
942
943
#: bzrlib/builtins.py:1586
944
msgid ""
945
"If there are any uncommitted changes in the tree, they will be carried\n"
946
"across and remain as uncommitted changes after the update. To discard\n"
947
"these changes, use 'bzr revert'. The uncommitted changes may conflict\n"
948
"with the changes brought in by the change in basis revision."
949
msgstr ""
950
951
#: bzrlib/builtins.py:1591
952
msgid ""
953
"If the tree's branch is bound to a master branch, bzr will also update\n"
954
"the branch from the master."
955
msgstr ""
956
957
#: bzrlib/builtins.py:1594
958
msgid ""
959
"You cannot update just a single file or directory, because each Bazaar\n"
960
"working tree has just a single basis revision. If you want to restore a\n"
961
"file that has been removed locally, use 'bzr revert' instead of 'bzr\n"
962
"update'. If you want to restore a file to its state in a previous\n"
963
"revision, use 'bzr revert' with a '-r' option, or use 'bzr cat' to write\n"
964
"out the old content of that file to a new location."
965
msgstr ""
966
967
#: bzrlib/builtins.py:1601
968
msgid ""
969
"The 'dir' argument, if given, must be the location of the root of a\n"
970
"working tree to update. By default, the working tree that contains the \n"
971
"current working directory is used."
972
msgstr ""
973
974
#: bzrlib/builtins.py:1617
975
msgid "bzr update --revision takes exactly one revision"
976
msgstr ""
977
978
#: bzrlib/builtins.py:1625
979
msgid "bzr update can only update a whole tree, not a file or subdirectory"
980
msgstr ""
981
982
#: bzrlib/builtins.py:1656
983
msgid "Tree is up to date at revision {0} of branch {1}"
984
msgstr ""
985
986
#: bzrlib/builtins.py:1672
987
#, python-format
988
msgid ""
989
"branch has no revision %s\n"
990
"bzr update --revision only works for a revision in the branch history"
991
msgstr ""
992
993
#: bzrlib/builtins.py:1678
994
msgid "Updated to revision {0} of branch {1}"
995
msgstr ""
996
997
#: bzrlib/builtins.py:1682
998
msgid ""
999
"Your local commits will now show as pending merges with 'bzr status', and "
1000
"can be committed with 'bzr commit'."
1001
msgstr ""
1002
1003
#: bzrlib/builtins.py:1691
1004
msgid "Show information about a working tree, branch or repository."
1005
msgstr ""
1006
1007
#: bzrlib/builtins.py:1693
1008
msgid ""
1009
"This command will show all known locations and formats associated to the\n"
1010
"tree, branch or repository."
1011
msgstr ""
1012
1013
#: bzrlib/builtins.py:1696
1014
msgid ""
1015
"In verbose mode, statistical information is included with each report.\n"
1016
"To see extended statistic information, use a verbosity level of 2 or\n"
1017
"higher by specifying the verbose option multiple times, e.g. -vv."
1018
msgstr ""
1019
1020
#: bzrlib/builtins.py:1700
1021
msgid "Branches and working trees will also report any missing revisions."
1022
msgstr ""
1023
1024
#: bzrlib/builtins.py:1702 bzrlib/builtins.py:3622 bzrlib/builtins.py:4752
1025
#: bzrlib/builtins.py:6389
1026
msgid ":Examples:"
1027
msgstr ""
1028
1029
#: bzrlib/builtins.py:1704
1030
msgid " Display information on the format and related locations:"
1031
msgstr ""
1032
1033
#: bzrlib/builtins.py:1706
1034
msgid " bzr info"
1035
msgstr ""
1036
1037
#: bzrlib/builtins.py:1708
1038
msgid ""
1039
" Display the above together with extended format information and\n"
1040
" basic statistics (like the number of files in the working tree and\n"
1041
" number of revisions in the branch and repository):"
1042
msgstr ""
1043
1044
#: bzrlib/builtins.py:1712
1045
msgid " bzr info -v"
1046
msgstr ""
1047
1048
#: bzrlib/builtins.py:1714
1049
msgid " Display the above together with number of committers to the branch:"
1050
msgstr ""
1051
1052
#: bzrlib/builtins.py:1716
1053
msgid " bzr info -vv"
1054
msgstr ""
1055
1056
#: bzrlib/builtins.py:1735
1057
msgid "Remove files or directories."
1058
msgstr ""
1059
1060
#: bzrlib/builtins.py:1737
1061
msgid ""
1062
"This makes Bazaar stop tracking changes to the specified files. Bazaar will\n"
1063
"delete them if they can easily be recovered using revert otherwise they\n"
1064
"will be backed up (adding an extention of the form .~#~). If no options or\n"
1065
"parameters are given Bazaar will scan for files that are being tracked by\n"
1066
"Bazaar but missing in your tree and stop tracking them for you."
1067
msgstr ""
1068
1069
#: bzrlib/builtins.py:1745
1070
msgid "Only remove files that have never been committed."
1071
msgstr ""
1072
1073
#: bzrlib/builtins.py:1747
1074
msgid "The file deletion mode to be used."
1075
msgstr ""
1076
1077
#: bzrlib/builtins.py:1748
1078
msgid "Deletion Strategy"
1079
msgstr ""
1080
1081
#: bzrlib/builtins.py:1749
1082
msgid "Backup changed files (default)."
1083
msgstr ""
1084
1085
#: bzrlib/builtins.py:1750
1086
msgid "Delete from bzr but leave the working copy."
1087
msgstr ""
1088
1089
#: bzrlib/builtins.py:1751
1090
msgid "Don't backup changed files."
1091
msgstr ""
1092
1093
#: bzrlib/builtins.py:1752
1094
msgid ""
1095
"Delete all the specified files, even if they can not be recovered and even "
1096
"if they are non-empty directories. (deprecated, use no-backup)"
1097
msgstr ""
1098
1099
#: bzrlib/builtins.py:1761
1100
msgid "(The --force option is deprecated, rather use --no-backup in future.)"
1101
msgstr ""
1102
1103
#: bzrlib/builtins.py:1778
1104
msgid "No matching files."
1105
msgstr ""
1106
1107
#: bzrlib/builtins.py:1839
1108
msgid "Reconcile bzr metadata in a branch."
1109
msgstr ""
1110
1111
#: bzrlib/builtins.py:1841
1112
msgid ""
1113
"This can correct data mismatches that may have been caused by\n"
1114
"previous ghost operations or bzr upgrades. You should only\n"
1115
"need to run this command if 'bzr check' or a bzr developer\n"
1116
"advises you to run it."
1117
msgstr ""
1118
1119
#: bzrlib/builtins.py:1846
1120
msgid ""
1121
"If a second branch is provided, cross-branch reconciliation is\n"
1122
"also attempted, which will check that data like the tree root\n"
1123
"id which was not present in very early bzr versions is represented\n"
1124
"correctly in both branches."
1125
msgstr ""
1126
1127
#: bzrlib/builtins.py:1851
1128
msgid ""
1129
"At the same time it is run it may recompress data resulting in\n"
1130
"a potential saving in disk space or performance gain."
1131
msgstr ""
1132
1133
#: bzrlib/builtins.py:1854
1134
msgid "The branch *MUST* be on a listable system such as local disk or sftp."
1135
msgstr ""
1136
1137
#: bzrlib/builtins.py:1921 bzrlib/builtins.py:2039 bzrlib/builtins.py:3657
1138
msgid ""
1139
"Format for the bzr 2.0 series.\n"
1140
"Uses group-compress storage.\n"
1141
"Provides rich roots which are a one-way transition.\n"
1142
msgstr ""
1143
1144
#: bzrlib/builtins.py:1921 bzrlib/builtins.py:2039 bzrlib/builtins.py:3657
1145
msgid ""
1146
"Pack-based format used in 1.x series. Introduced in 0.92. Interoperates with "
1147
"bzr repositories before 0.92 but cannot be read by bzr < 0.92. "
1148
msgstr ""
1149
1150
#: bzrlib/builtins.py:1921 bzrlib/builtins.py:2039 bzrlib/builtins.py:3657
1151
msgid "The 2a format with experimental support for colocated branches.\n"
1152
msgstr ""
1153
1154
#: bzrlib/builtins.py:1922
1155
msgid "Make a directory into a versioned branch."
1156
msgstr ""
1157
1158
#: bzrlib/builtins.py:1924
1159
msgid ""
1160
"Use this to create an empty branch, or before importing an\n"
1161
"existing project."
1162
msgstr ""
1163
1164
#: bzrlib/builtins.py:1927
1165
msgid ""
1166
"If there is a repository in a parent directory of the location, then\n"
1167
"the history of the branch will be stored in the repository. Otherwise\n"
1168
"init creates a standalone branch which carries its own history\n"
1169
"in the .bzr directory."
1170
msgstr ""
1171
1172
#: bzrlib/builtins.py:1932
1173
msgid ""
1174
"If there is already a branch at the location but it has no working tree,\n"
1175
"the tree can be populated with 'bzr checkout'."
1176
msgstr ""
1177
1178
#: bzrlib/builtins.py:1935
1179
msgid "Recipe for importing a tree of files::"
1180
msgstr ""
1181
1182
#: bzrlib/builtins.py:1937
1183
msgid ""
1184
" cd ~/project\n"
1185
" bzr init\n"
1186
" bzr add .\n"
1187
" bzr status\n"
1188
" bzr commit -m \"imported project\""
1189
msgstr ""
1190
1191
#: bzrlib/builtins.py:1948
1192
msgid ""
1193
"Create the path leading up to the branch if it does not already exist."
1194
msgstr ""
1195
1196
#: bzrlib/builtins.py:1951
1197
msgid "Specify a format for this branch. See \"help formats\"."
1198
msgstr ""
1199
1200
#: bzrlib/builtins.py:1959
1201
msgid ""
1202
"Never change revnos or the existing log. Append revisions to it only."
1203
msgstr ""
1204
1205
#: bzrlib/builtins.py:1962
1206
msgid "Create a branch without a working tree."
1207
msgstr ""
1208
1209
#: bzrlib/builtins.py:1982 bzrlib/push.py:110
1210
#, python-format
1211
msgid ""
1212
"Parent directory of %s does not exist.\n"
1213
"You may supply --create-prefix to create all leading parent directories."
1214
msgstr ""
1215
1216
#: bzrlib/builtins.py:2016
1217
msgid ""
1218
"This branch format cannot be set to append-revisions-only. Try --default."
1219
msgstr ""
1220
1221
#: bzrlib/builtins.py:2027
1222
msgid "Created a {0} (format: {1})\n"
1223
msgstr ""
1224
1225
#: bzrlib/builtins.py:2036
1226
#, python-format
1227
msgid "Using shared repository: %s\n"
1228
msgstr ""
1229
1230
#: bzrlib/builtins.py:2040
1231
msgid "Create a shared repository for branches to share storage space."
1232
msgstr ""
1233
1234
#: bzrlib/builtins.py:2042
1235
msgid ""
1236
"New branches created under the repository directory will store their\n"
1237
"revisions in the repository, not in the branch directory. For branches\n"
1238
"with shared history, this reduces the amount of storage needed and \n"
1239
"speeds up the creation of new branches."
1240
msgstr ""
1241
1242
#: bzrlib/builtins.py:2047
1243
msgid ""
1244
"If the --no-trees option is given then the branches in the repository\n"
1245
"will not have working trees by default. They will still exist as \n"
1246
"directories on disk, but they will not have separate copies of the \n"
1247
"files at a certain revision. This can be useful for repositories that\n"
1248
"store branches which are interacted with through checkouts or remote\n"
1249
"branches, such as on a server."
1250
msgstr ""
1251
1252
#: bzrlib/builtins.py:2054
1253
msgid ""
1254
":Examples:\n"
1255
" Create a shared repository holding just branches::"
1256
msgstr ""
1257
1258
#: bzrlib/builtins.py:2057
1259
msgid ""
1260
" bzr init-repo --no-trees repo\n"
1261
" bzr init repo/trunk"
1262
msgstr ""
1263
1264
#: bzrlib/builtins.py:2060
1265
msgid " Make a lightweight checkout elsewhere::"
1266
msgstr ""
1267
1268
#: bzrlib/builtins.py:2062
1269
msgid ""
1270
" bzr checkout --lightweight repo/trunk trunk-checkout\n"
1271
" cd trunk-checkout\n"
1272
" (add files here)"
1273
msgstr ""
1274
1275
#: bzrlib/builtins.py:2070
1276
msgid ""
1277
"Specify a format for this repository. See \"bzr help formats\" for details."
1278
msgstr ""
1279
1280
#: bzrlib/builtins.py:2074
1281
msgid "Repository format"
1282
msgstr ""
1283
1284
#: bzrlib/builtins.py:2076
1285
msgid "Branches in the repository will default to not having a working tree."
1286
msgstr ""
1287
1288
#: bzrlib/builtins.py:2102
1289
msgid "Show differences in the working tree, between revisions or branches."
1290
msgstr ""
1291
1292
#: bzrlib/builtins.py:2104
1293
msgid ""
1294
"If no arguments are given, all changes for the current tree are listed.\n"
1295
"If files are given, only the changes in those files are listed.\n"
1296
"Remote and multiple branches can be compared by using the --old and\n"
1297
"--new options. If not provided, the default for both is derived from\n"
1298
"the first argument, if any, or the current tree if no arguments are\n"
1299
"given."
1300
msgstr ""
1301
1302
#: bzrlib/builtins.py:2111
1303
msgid ""
1304
"\"bzr diff -p1\" is equivalent to \"bzr diff --prefix old/:new/\", and\n"
1305
"produces patches suitable for \"patch -p1\"."
1306
msgstr ""
1307
1308
#: bzrlib/builtins.py:2114
1309
msgid ""
1310
"Note that when using the -r argument with a range of revisions, the\n"
1311
"differences are computed between the two specified revisions. That\n"
1312
"is, the command does not show the changes introduced by the first \n"
1313
"revision in the range. This differs from the interpretation of \n"
1314
"revision ranges used by \"bzr log\" which includes the first revision\n"
1315
"in the range."
1316
msgstr ""
1317
1318
#: bzrlib/builtins.py:2121
1319
msgid ""
1320
":Exit values:\n"
1321
" 1 - changed\n"
1322
" 2 - unrepresentable changes\n"
1323
" 3 - error\n"
1324
" 0 - no change"
1325
msgstr ""
1326
1327
#: bzrlib/builtins.py:2127
1328
msgid ""
1329
":Examples:\n"
1330
" Shows the difference in the working tree versus the last commit::"
1331
msgstr ""
1332
1333
#: bzrlib/builtins.py:2130
1334
msgid " bzr diff"
1335
msgstr ""
1336
1337
#: bzrlib/builtins.py:2132
1338
msgid " Difference between the working tree and revision 1::"
1339
msgstr ""
1340
1341
#: bzrlib/builtins.py:2134
1342
msgid " bzr diff -r1"
1343
msgstr ""
1344
1345
#: bzrlib/builtins.py:2136
1346
msgid " Difference between revision 3 and revision 1::"
1347
msgstr ""
1348
1349
#: bzrlib/builtins.py:2138
1350
msgid " bzr diff -r1..3"
1351
msgstr ""
1352
1353
#: bzrlib/builtins.py:2140
1354
msgid " Difference between revision 3 and revision 1 for branch xxx::"
1355
msgstr ""
1356
1357
#: bzrlib/builtins.py:2142
1358
msgid " bzr diff -r1..3 xxx"
1359
msgstr ""
1360
1361
#: bzrlib/builtins.py:2144
1362
msgid " The changes introduced by revision 2 (equivalent to -r1..2)::"
1363
msgstr ""
1364
1365
#: bzrlib/builtins.py:2146
1366
msgid " bzr diff -c2"
1367
msgstr ""
1368
1369
#: bzrlib/builtins.py:2148
1370
msgid ""
1371
" To see the changes introduced by revision X::\n"
1372
" \n"
1373
" bzr diff -cX"
1374
msgstr ""
1375
1376
#: bzrlib/builtins.py:2152
1377
msgid ""
1378
" Note that in the case of a merge, the -c option shows the changes\n"
1379
" compared to the left hand parent. To see the changes against\n"
1380
" another parent, use::"
1381
msgstr ""
1382
1383
#: bzrlib/builtins.py:2156
1384
msgid " bzr diff -r<chosen_parent>..X"
1385
msgstr ""
1386
1387
#: bzrlib/builtins.py:2158
1388
msgid ""
1389
" The changes between the current revision and the previous revision\n"
1390
" (equivalent to -c-1 and -r-2..-1)"
1391
msgstr ""
1392
1393
#: bzrlib/builtins.py:2161
1394
msgid " bzr diff -r-2.."
1395
msgstr ""
1396
1397
#: bzrlib/builtins.py:2163
1398
msgid " Show just the differences for file NEWS::"
1399
msgstr ""
1400
1401
#: bzrlib/builtins.py:2165
1402
msgid " bzr diff NEWS"
1403
msgstr ""
1404
1405
#: bzrlib/builtins.py:2167
1406
msgid " Show the differences in working tree xxx for file NEWS::"
1407
msgstr ""
1408
1409
#: bzrlib/builtins.py:2169
1410
msgid " bzr diff xxx/NEWS"
1411
msgstr ""
1412
1413
#: bzrlib/builtins.py:2171
1414
msgid " Show the differences from branch xxx to this working tree:"
1415
msgstr ""
1416
1417
#: bzrlib/builtins.py:2173
1418
msgid " bzr diff --old xxx"
1419
msgstr ""
1420
1421
#: bzrlib/builtins.py:2175
1422
msgid " Show the differences between two branches for file NEWS::"
1423
msgstr ""
1424
1425
#: bzrlib/builtins.py:2177
1426
msgid " bzr diff --old xxx --new yyy NEWS"
1427
msgstr ""
1428
1429
#: bzrlib/builtins.py:2179
1430
msgid " Same as 'bzr diff' but prefix paths with old/ and new/::"
1431
msgstr ""
1432
1433
#: bzrlib/builtins.py:2181
1434
msgid ""
1435
" bzr diff --prefix old/:new/\n"
1436
" \n"
1437
" Show the differences using a custom diff program with options::\n"
1438
" \n"
1439
" bzr diff --using /usr/bin/diff --diff-options -wu"
1440
msgstr ""
1441
1442
#: bzrlib/builtins.py:2191
1443
msgid "Pass these options to the external diff program."
1444
msgstr ""
1445
1446
#: bzrlib/builtins.py:2194
1447
msgid ""
1448
"Set prefixes added to old and new filenames, as two values separated by a "
1449
"colon. (eg \"old/:new/\")."
1450
msgstr ""
1451
1452
#: bzrlib/builtins.py:2197
1453
msgid "Branch/tree to compare from."
1454
msgstr ""
1455
1456
#: bzrlib/builtins.py:2201
1457
msgid "Branch/tree to compare to."
1458
msgstr ""
1459
1460
#: bzrlib/builtins.py:2207
1461
msgid "Use this command to compare files."
1462
msgstr ""
1463
1464
#: bzrlib/builtins.py:2212
1465
msgid "Diff format to use."
1466
msgstr ""
1467
1468
#: bzrlib/builtins.py:2214
1469
msgid "Diff format"
1470
msgstr ""
1471
1472
#: bzrlib/builtins.py:2236
1473
msgid "--prefix expects two values separated by a colon (eg \"old/:new/\")"
1474
msgstr ""
1475
1476
#: bzrlib/builtins.py:2240
1477
msgid "bzr diff --revision takes exactly one or two revision specifiers"
1478
msgstr ""
1479
1480
#: bzrlib/builtins.py:2245 bzrlib/builtins.py:2643 bzrlib/builtins.py:2656
1481
#: bzrlib/builtins.py:2664 bzrlib/builtins.py:4826
1482
msgid "{0} and {1} are mutually exclusive"
1483
msgstr ""
1484
1485
#: bzrlib/builtins.py:2265
1486
msgid ""
1487
"List files deleted in the working tree.\n"
1488
" "
1489
msgstr ""
1490
1491
#: bzrlib/builtins.py:2343
1492
msgid "Show the tree root directory."
1493
msgstr ""
1494
1495
#: bzrlib/builtins.py:2345
1496
msgid ""
1497
"The root is the nearest enclosing directory with a .bzr control\n"
1498
"directory."
1499
msgstr ""
1500
1501
#: bzrlib/builtins.py:2360
1502
msgid "The limit argument must be an integer."
1503
msgstr ""
1504
1505
#: bzrlib/builtins.py:2368
1506
msgid "The levels argument must be an integer."
1507
msgstr ""
1508
1509
#: bzrlib/builtins.py:2373
1510
msgid "Show historical log for a branch or subset of a branch."
1511
msgstr ""
1512
1513
#: bzrlib/builtins.py:2375
1514
msgid ""
1515
"log is bzr's default tool for exploring the history of a branch.\n"
1516
"The branch to use is taken from the first parameter. If no parameters\n"
1517
"are given, the branch containing the working directory is logged.\n"
1518
"Here are some simple examples::"
1519
msgstr ""
1520
1521
#: bzrlib/builtins.py:2380
1522
msgid ""
1523
" bzr log log the current branch\n"
1524
" bzr log foo.py log a file in its branch\n"
1525
" bzr log http://server/branch log a branch on a server"
1526
msgstr ""
1527
1528
#: bzrlib/builtins.py:2384
1529
msgid ""
1530
"The filtering, ordering and information shown for each revision can\n"
1531
"be controlled as explained below. By default, all revisions are\n"
1532
"shown sorted (topologically) so that newer revisions appear before\n"
1533
"older ones and descendants always appear before ancestors. If displayed,\n"
1534
"merged revisions are shown indented under the revision in which they\n"
1535
"were merged."
1536
msgstr ""
1537
1538
#: bzrlib/builtins.py:2391
1539
msgid ":Output control:"
1540
msgstr ""
1541
1542
#: bzrlib/builtins.py:2393
1543
msgid ""
1544
" The log format controls how information about each revision is\n"
1545
" displayed. The standard log formats are called ``long``, ``short``\n"
1546
" and ``line``. The default is long. See ``bzr help log-formats``\n"
1547
" for more details on log formats."
1548
msgstr ""
1549
1550
#: bzrlib/builtins.py:2398
1551
msgid ""
1552
" The following options can be used to control what information is\n"
1553
" displayed::"
1554
msgstr ""
1555
1556
#: bzrlib/builtins.py:2401
1557
msgid ""
1558
" -l N display a maximum of N revisions\n"
1559
" -n N display N levels of revisions (0 for all, 1 for collapsed)\n"
1560
" -v display a status summary (delta) for each revision\n"
1561
" -p display a diff (patch) for each revision\n"
1562
" --show-ids display revision-ids (and file-ids), not just revnos"
1563
msgstr ""
1564
1565
#: bzrlib/builtins.py:2407
1566
msgid ""
1567
" Note that the default number of levels to display is a function of the\n"
1568
" log format. If the -n option is not used, the standard log formats show\n"
1569
" just the top level (mainline)."
1570
msgstr ""
1571
1572
#: bzrlib/builtins.py:2411
1573
msgid ""
1574
" Status summaries are shown using status flags like A, M, etc. To see\n"
1575
" the changes explained using words like ``added`` and ``modified``\n"
1576
" instead, use the -vv option."
1577
msgstr ""
1578
1579
#: bzrlib/builtins.py:2415
1580
msgid ":Ordering control:"
1581
msgstr ""
1582
1583
#: bzrlib/builtins.py:2417
1584
msgid ""
1585
" To display revisions from oldest to newest, use the --forward option.\n"
1586
" In most cases, using this option will have little impact on the total\n"
1587
" time taken to produce a log, though --forward does not incrementally\n"
1588
" display revisions like --reverse does when it can."
1589
msgstr ""
1590
1591
#: bzrlib/builtins.py:2422
1592
msgid ":Revision filtering:"
1593
msgstr ""
1594
1595
#: bzrlib/builtins.py:2424
1596
msgid ""
1597
" The -r option can be used to specify what revision or range of revisions\n"
1598
" to filter against. The various forms are shown below::"
1599
msgstr ""
1600
1601
#: bzrlib/builtins.py:2427
1602
msgid ""
1603
" -rX display revision X\n"
1604
" -rX.. display revision X and later\n"
1605
" -r..Y display up to and including revision Y\n"
1606
" -rX..Y display from X to Y inclusive"
1607
msgstr ""
1608
1609
#: bzrlib/builtins.py:2432
1610
msgid ""
1611
" See ``bzr help revisionspec`` for details on how to specify X and Y.\n"
1612
" Some common examples are given below::"
1613
msgstr ""
1614
1615
#: bzrlib/builtins.py:2435
1616
msgid ""
1617
" -r-1 show just the tip\n"
1618
" -r-10.. show the last 10 mainline revisions\n"
1619
" -rsubmit:.. show what's new on this branch\n"
1620
" -rancestor:path.. show changes since the common ancestor of this\n"
1621
" branch and the one at location path\n"
1622
" -rdate:yesterday.. show changes since yesterday"
1623
msgstr ""
1624
1625
#: bzrlib/builtins.py:2442
1626
msgid ""
1627
" When logging a range of revisions using -rX..Y, log starts at\n"
1628
" revision Y and searches back in history through the primary\n"
1629
" (\"left-hand\") parents until it finds X. When logging just the\n"
1630
" top level (using -n1), an error is reported if X is not found\n"
1631
" along the way. If multi-level logging is used (-n0), X may be\n"
1632
" a nested merge revision and the log will be truncated accordingly."
1633
msgstr ""
1634
1635
#: bzrlib/builtins.py:2449
1636
msgid ":Path filtering:"
1637
msgstr ""
1638
1639
#: bzrlib/builtins.py:2451
1640
msgid ""
1641
" If parameters are given and the first one is not a branch, the log\n"
1642
" will be filtered to show only those revisions that changed the\n"
1643
" nominated files or directories."
1644
msgstr ""
1645
1646
#: bzrlib/builtins.py:2455
1647
msgid ""
1648
" Filenames are interpreted within their historical context. To log a\n"
1649
" deleted file, specify a revision range so that the file existed at\n"
1650
" the end or start of the range."
1651
msgstr ""
1652
1653
#: bzrlib/builtins.py:2459
1654
msgid ""
1655
" Historical context is also important when interpreting pathnames of\n"
1656
" renamed files/directories. Consider the following example:"
1657
msgstr ""
1658
1659
#: bzrlib/builtins.py:2462
1660
msgid ""
1661
" * revision 1: add tutorial.txt\n"
1662
" * revision 2: modify tutorial.txt\n"
1663
" * revision 3: rename tutorial.txt to guide.txt; add tutorial.txt"
1664
msgstr ""
1665
1666
#: bzrlib/builtins.py:2466
1667
msgid " In this case:"
1668
msgstr ""
1669
1670
#: bzrlib/builtins.py:2468
1671
msgid " * ``bzr log guide.txt`` will log the file added in revision 1"
1672
msgstr ""
1673
1674
#: bzrlib/builtins.py:2470
1675
msgid ""
1676
" * ``bzr log tutorial.txt`` will log the new file added in revision 3"
1677
msgstr ""
1678
1679
#: bzrlib/builtins.py:2472
1680
msgid ""
1681
" * ``bzr log -r2 -p tutorial.txt`` will show the changes made to\n"
1682
" the original file in revision 2."
1683
msgstr ""
1684
1685
#: bzrlib/builtins.py:2475
1686
msgid ""
1687
" * ``bzr log -r2 -p guide.txt`` will display an error message as there\n"
1688
" was no file called guide.txt in revision 2."
1689
msgstr ""
1690
1691
#: bzrlib/builtins.py:2478
1692
msgid ""
1693
" Renames are always followed by log. By design, there is no need to\n"
1694
" explicitly ask for this (and no way to stop logging a file back\n"
1695
" until it was last renamed)."
1696
msgstr ""
1697
1698
#: bzrlib/builtins.py:2482
1699
msgid ":Other filtering:"
1700
msgstr ""
1701
1702
#: bzrlib/builtins.py:2484
1703
msgid ""
1704
" The --match option can be used for finding revisions that match a\n"
1705
" regular expression in a commit message, committer, author or bug.\n"
1706
" Specifying the option several times will match any of the supplied\n"
1707
" expressions. --match-author, --match-bugs, --match-committer and\n"
1708
" --match-message can be used to only match a specific field."
1709
msgstr ""
1710
1711
#: bzrlib/builtins.py:2490
1712
msgid ":Tips & tricks:"
1713
msgstr ""
1714
1715
#: bzrlib/builtins.py:2492
1716
msgid ""
1717
" GUI tools and IDEs are often better at exploring history than command\n"
1718
" line tools: you may prefer qlog or viz from qbzr or bzr-gtk, the\n"
1719
" bzr-explorer shell, or the Loggerhead web interface. See the Plugin\n"
1720
" Guide <http://doc.bazaar.canonical.com/plugins/en/> and\n"
1721
" <http://wiki.bazaar.canonical.com/IDEIntegration>. "
1722
msgstr ""
1723
1724
#: bzrlib/builtins.py:2498
1725
msgid ""
1726
" You may find it useful to add the aliases below to ``bazaar.conf``::"
1727
msgstr ""
1728
1729
#: bzrlib/builtins.py:2500
1730
msgid ""
1731
" [ALIASES]\n"
1732
" tip = log -r-1\n"
1733
" top = log -l10 --line\n"
1734
" show = log -v -p"
1735
msgstr ""
1736
1737
#: bzrlib/builtins.py:2505
1738
msgid ""
1739
" ``bzr tip`` will then show the latest revision while ``bzr top``\n"
1740
" will show the last 10 mainline revisions. To see the details of a\n"
1741
" particular revision X, ``bzr show -rX``."
1742
msgstr ""
1743
1744
#: bzrlib/builtins.py:2509
1745
msgid ""
1746
" If you are interested in looking deeper into a particular merge X,\n"
1747
" use ``bzr log -n0 -rX``."
1748
msgstr ""
1749
1750
#: bzrlib/builtins.py:2512
1751
msgid ""
1752
" ``bzr log -v`` on a branch with lots of history is currently\n"
1753
" very slow. A fix for this issue is currently under development.\n"
1754
" With or without that fix, it is recommended that a revision range\n"
1755
" be given when using the -v option."
1756
msgstr ""
1757
1758
#: bzrlib/builtins.py:2517
1759
msgid ""
1760
" bzr has a generic full-text matching plugin, bzr-search, that can be\n"
1761
" used to find revisions matching user names, commit messages, etc.\n"
1762
" Among other features, this plugin can find all revisions containing\n"
1763
" a list of words but not others."
1764
msgstr ""
1765
1766
#: bzrlib/builtins.py:2522
1767
msgid ""
1768
" When exploring non-mainline history on large projects with deep\n"
1769
" history, the performance of log can be greatly improved by installing\n"
1770
" the historycache plugin. This plugin buffers historical information\n"
1771
" trading disk space for faster speed."
1772
msgstr ""
1773
1774
#: bzrlib/builtins.py:2531
1775
msgid "Show from oldest to newest."
1776
msgstr ""
1777
1778
#: bzrlib/builtins.py:2534
1779
msgid "Show files changed in each revision."
1780
msgstr ""
1781
1782
#: bzrlib/builtins.py:2540
1783
msgid "Show just the specified revision. See also \"help revisionspec\"."
1784
msgstr ""
1785
1786
#: bzrlib/builtins.py:2544
1787
msgid "What names to list as authors - first, all or committer."
1788
msgstr ""
1789
1790
#: bzrlib/builtins.py:2545
1791
msgid "Authors"
1792
msgstr ""
1793
1794
#: bzrlib/builtins.py:2550
1795
msgid "Number of levels to display - 0 for all, 1 for flat."
1796
msgstr ""
1797
1798
#: bzrlib/builtins.py:2560
1799
msgid "Limit the output to the first N revisions."
1800
msgstr ""
1801
1802
#: bzrlib/builtins.py:2565
1803
msgid "Show changes made in each revision as a patch."
1804
msgstr ""
1805
1806
#: bzrlib/builtins.py:2567
1807
msgid "Show merged revisions like --levels 0 does."
1808
msgstr ""
1809
1810
#: bzrlib/builtins.py:2571
1811
msgid "Do not report commits with more than one parent."
1812
msgstr ""
1813
1814
#: bzrlib/builtins.py:2573
1815
msgid ""
1816
"Display only the revisions that are not part of both ancestries (require -"
1817
"rX..Y)."
1818
msgstr ""
1819
1820
#: bzrlib/builtins.py:2577
1821
msgid "Show digital signature validity."
1822
msgstr ""
1823
1824
#: bzrlib/builtins.py:2580
1825
msgid "Show revisions whose properties match this expression."
1826
msgstr ""
1827
1828
#: bzrlib/builtins.py:2584
1829
msgid "Show revisions whose message matches this expression."
1830
msgstr ""
1831
1832
#: bzrlib/builtins.py:2588
1833
msgid "Show revisions whose committer matches this expression."
1834
msgstr ""
1835
1836
#: bzrlib/builtins.py:2592
1837
msgid "Show revisions whose authors match this expression."
1838
msgstr ""
1839
1840
#: bzrlib/builtins.py:2596
1841
msgid "Show revisions whose bugs match this expression."
1842
msgstr ""
1843
1844
#: bzrlib/builtins.py:2650
1845
msgid "--exclude-common-ancestry requires -r with two revisions"
1846
msgstr ""
1847
1848
#: bzrlib/builtins.py:2678
1849
#, python-format
1850
msgid "Path unknown at end or start of revision range: %s"
1851
msgstr ""
1852
1853
#: bzrlib/builtins.py:2795
1854
#, python-format
1855
msgid "bzr %s doesn't accept two revisions in different branches."
1856
msgstr ""
1857
1858
#: bzrlib/builtins.py:2811
1859
#, python-format
1860
msgid "bzr %s --revision takes one or two values."
1861
msgstr ""
1862
1863
#: bzrlib/builtins.py:2856
1864
msgid ""
1865
"List files in a tree.\n"
1866
" "
1867
msgstr ""
1868
1869
#: bzrlib/builtins.py:2865
1870
msgid "Recurse into subdirectories."
1871
msgstr ""
1872
1873
#: bzrlib/builtins.py:2867
1874
msgid "Print paths relative to the root of the branch."
1875
msgstr ""
1876
1877
#: bzrlib/builtins.py:2869
1878
msgid "Print unknown files."
1879
msgstr ""
1880
1881
#: bzrlib/builtins.py:2870
1882
msgid "Print versioned files."
1883
msgstr ""
1884
1885
#: bzrlib/builtins.py:2873
1886
msgid "Print ignored files."
1887
msgstr ""
1888
1889
#: bzrlib/builtins.py:2875
1890
msgid "List entries of a particular kind: file, directory, symlink."
1891
msgstr ""
1892
1893
#: bzrlib/builtins.py:2888
1894
msgid "invalid kind specified"
1895
msgstr ""
1896
1897
#: bzrlib/builtins.py:2891
1898
msgid "Cannot set both --verbose and --null"
1899
msgstr ""
1900
1901
#: bzrlib/builtins.py:2900
1902
msgid "cannot specify both --from-root and PATH"
1903
msgstr ""
1904
1905
#: bzrlib/builtins.py:2987
1906
msgid "Ignore specified files or patterns."
1907
msgstr ""
1908
1909
#: bzrlib/builtins.py:2989
1910
msgid "See ``bzr help patterns`` for details on the syntax of patterns."
1911
msgstr ""
1912
1913
#: bzrlib/builtins.py:2991
1914
msgid ""
1915
"If a .bzrignore file does not exist, the ignore command\n"
1916
"will create one and add the specified files or patterns to the newly\n"
1917
"created file. The ignore command will also automatically add the \n"
1918
".bzrignore file to be versioned. Creating a .bzrignore file without\n"
1919
"the use of the ignore command will require an explicit add command."
1920
msgstr ""
1921
1922
#: bzrlib/builtins.py:2997
1923
msgid ""
1924
"To remove patterns from the ignore list, edit the .bzrignore file.\n"
1925
"After adding, editing or deleting that file either indirectly by\n"
1926
"using this command or directly by using an editor, be sure to commit\n"
1927
"it."
1928
msgstr ""
1929
1930
#: bzrlib/builtins.py:3002
1931
msgid ""
1932
"Bazaar also supports a global ignore file ~/.bazaar/ignore. On Windows\n"
1933
"the global ignore file can be found in the application data directory as\n"
1934
"C:\\Documents and Settings\\<user>\\Application Data\\Bazaar\\2.0\\ignore.\n"
1935
"Global ignores are not touched by this command. The global ignore file\n"
1936
"can be edited directly using an editor."
1937
msgstr ""
1938
1939
#: bzrlib/builtins.py:3008
1940
msgid ""
1941
"Patterns prefixed with '!' are exceptions to ignore patterns and take\n"
1942
"precedence over regular ignores. Such exceptions are used to specify\n"
1943
"files that should be versioned which would otherwise be ignored."
1944
msgstr ""
1945
1946
#: bzrlib/builtins.py:3012
1947
msgid ""
1948
"Patterns prefixed with '!!' act as regular ignore patterns, but have\n"
1949
"precedence over the '!' exception patterns."
1950
msgstr ""
1951
1952
#: bzrlib/builtins.py:3015
1953
msgid ""
1954
":Notes: \n"
1955
" \n"
1956
"* Ignore patterns containing shell wildcards must be quoted from\n"
1957
" the shell on Unix."
1958
msgstr ""
1959
1960
#: bzrlib/builtins.py:3020
1961
msgid ""
1962
"* Ignore patterns starting with \"#\" act as comments in the ignore file.\n"
1963
" To ignore patterns that begin with that character, use the \"RE:\" prefix."
1964
msgstr ""
1965
1966
#: bzrlib/builtins.py:3023
1967
msgid ""
1968
":Examples:\n"
1969
" Ignore the top level Makefile::"
1970
msgstr ""
1971
1972
#: bzrlib/builtins.py:3026
1973
msgid " bzr ignore ./Makefile"
1974
msgstr ""
1975
1976
#: bzrlib/builtins.py:3028
1977
msgid " Ignore .class files in all directories...::"
1978
msgstr ""
1979
1980
#: bzrlib/builtins.py:3030
1981
msgid " bzr ignore \"*.class\""
1982
msgstr ""
1983
1984
#: bzrlib/builtins.py:3032
1985
msgid " ...but do not ignore \"special.class\"::"
1986
msgstr ""
1987
1988
#: bzrlib/builtins.py:3034
1989
msgid " bzr ignore \"!special.class\""
1990
msgstr ""
1991
1992
#: bzrlib/builtins.py:3036
1993
msgid " Ignore files whose name begins with the \"#\" character::"
1994
msgstr ""
1995
1996
#: bzrlib/builtins.py:3038
1997
msgid " bzr ignore \"RE:^#\""
1998
msgstr ""
1999
2000
#: bzrlib/builtins.py:3040 bzrlib/builtins.py:3044
2001
msgid " Ignore .o files under the lib directory::"
2002
msgstr ""
2003
2004
#: bzrlib/builtins.py:3042
2005
msgid " bzr ignore \"lib/**/*.o\""
2006
msgstr ""
2007
2008
#: bzrlib/builtins.py:3046
2009
msgid " bzr ignore \"RE:lib/.*\\.o\""
2010
msgstr ""
2011
2012
#: bzrlib/builtins.py:3048
2013
msgid " Ignore everything but the \"debian\" toplevel directory::"
2014
msgstr ""
2015
2016
#: bzrlib/builtins.py:3050
2017
msgid ""
2018
" bzr ignore \"RE:(?!debian/).*\"\n"
2019
" \n"
2020
" Ignore everything except the \"local\" toplevel directory,\n"
2021
" but always ignore autosave files ending in ~, even under local/::\n"
2022
" \n"
2023
" bzr ignore \"*\"\n"
2024
" bzr ignore \"!./local\"\n"
2025
" bzr ignore \"!!*~\""
2026
msgstr ""
2027
2028
#: bzrlib/builtins.py:3064
2029
msgid "Display the default ignore rules that bzr uses."
2030
msgstr ""
2031
2032
#: bzrlib/builtins.py:3076
2033
msgid "ignore requires at least one NAME_PATTERN or --default-rules."
2034
msgstr ""
2035
2036
#: bzrlib/builtins.py:3087
2037
#, python-format
2038
msgid "Invalid ignore pattern found. %s"
2039
msgid_plural "Invalid ignore patterns found. %s"
2040
msgstr[0] ""
2041
msgstr[1] ""
2042
2043
#: bzrlib/builtins.py:3096
2044
msgid "NAME_PATTERN should not be an absolute path"
2045
msgstr ""
2046
2047
#: bzrlib/builtins.py:3109
2048
#, python-format
2049
msgid ""
2050
"Warning: the following files are version controlled and match your ignore "
2051
"pattern:\n"
2052
"%s\n"
2053
"These files will continue to be version controlled unless you 'bzr remove' "
2054
"them.\n"
2055
msgstr ""
2056
2057
#: bzrlib/builtins.py:3116
2058
msgid "List ignored files and the patterns that matched them."
2059
msgstr ""
2060
2061
#: bzrlib/builtins.py:3118
2062
msgid ""
2063
"List all the ignored files and the ignore pattern that caused the file to\n"
2064
"be ignored."
2065
msgstr ""
2066
2067
#: bzrlib/builtins.py:3121
2068
msgid "Alternatively, to list just the files::"
2069
msgstr ""
2070
2071
#: bzrlib/builtins.py:3123
2072
msgid " bzr ls --ignored"
2073
msgstr ""
2074
2075
#: bzrlib/builtins.py:3157
2076
#, python-format
2077
msgid "not a valid revision-number: %r"
2078
msgstr ""
2079
2080
#: bzrlib/builtins.py:3164
2081
msgid ""
2082
"Export current or past revision to a destination directory or archive."
2083
msgstr ""
2084
2085
#: bzrlib/builtins.py:3166
2086
msgid "If no revision is specified this exports the last committed revision."
2087
msgstr ""
2088
2089
#: bzrlib/builtins.py:3168
2090
msgid ""
2091
"Format may be an \"exporter\" name, such as tar, tgz, tbz2. If none is\n"
2092
"given, try to find the format with the extension. If no extension\n"
2093
"is found exports to a directory (equivalent to --format=dir)."
2094
msgstr ""
2095
2096
#: bzrlib/builtins.py:3172
2097
msgid ""
2098
"If root is supplied, it will be used as the root directory inside\n"
2099
"container formats (tar, zip, etc). If it is not supplied it will default\n"
2100
"to the exported filename. The root option has no effect for 'dir' format."
2101
msgstr ""
2102
2103
#: bzrlib/builtins.py:3176
2104
msgid ""
2105
"If branch is omitted then the branch containing the current working\n"
2106
"directory will be used."
2107
msgstr ""
2108
2109
#: bzrlib/builtins.py:3179
2110
msgid ""
2111
"Note: Export of tree with non-ASCII filenames to zip is not supported."
2112
msgstr ""
2113
2114
#: bzrlib/builtins.py:3181
2115
msgid ""
2116
" ================= =========================\n"
2117
" Supported formats Autodetected by extension\n"
2118
" ================= =========================\n"
2119
" dir (none)\n"
2120
" tar .tar\n"
2121
" tbz2 .tar.bz2, .tbz2\n"
2122
" tgz .tar.gz, .tgz\n"
2123
" zip .zip\n"
2124
" ================= ========================="
2125
msgstr ""
2126
2127
#: bzrlib/builtins.py:3195
2128
msgid "Type of file to export to."
2129
msgstr ""
2130
2131
#: bzrlib/builtins.py:3198
2132
msgid "Apply content filters to export the convenient form."
2133
msgstr ""
2134
2135
#: bzrlib/builtins.py:3202
2136
msgid "Name of the root directory inside the exported file."
2137
msgstr ""
2138
2139
#: bzrlib/builtins.py:3204
2140
msgid ""
2141
"Set modification time of files to that of the last revision in which it was "
2142
"changed."
2143
msgstr ""
2144
2145
#: bzrlib/builtins.py:3207
2146
msgid ""
2147
"Export the working tree contents rather than that of the last revision."
2148
msgstr ""
2149
2150
#: bzrlib/builtins.py:3226
2151
msgid "--uncommitted requires a working tree"
2152
msgstr ""
2153
2154
#: bzrlib/builtins.py:3235
2155
#, python-format
2156
msgid "Unsupported export format: %s"
2157
msgstr ""
2158
2159
#: bzrlib/builtins.py:3239
2160
msgid ""
2161
"Write the contents of a file as of a given revision to standard output."
2162
msgstr ""
2163
2164
#: bzrlib/builtins.py:3241
2165
msgid "If no revision is nominated, the last revision is used."
2166
msgstr ""
2167
2168
#: bzrlib/builtins.py:3243
2169
msgid ""
2170
"Note: Take care to redirect standard output when using this command on a\n"
2171
"binary file."
2172
msgstr ""
2173
2174
#: bzrlib/builtins.py:3249
2175
msgid "The path name in the old tree."
2176
msgstr ""
2177
2178
#: bzrlib/builtins.py:3250
2179
msgid "Apply content filters to display the convenience form."
2180
msgstr ""
2181
2182
#: bzrlib/builtins.py:3261
2183
msgid "bzr cat --revision takes exactly one revision specifier"
2184
msgstr ""
2185
2186
#: bzrlib/builtins.py:3286 bzrlib/builtins.py:3298
2187
msgid "{0!r} is not present in revision {1}"
2188
msgstr ""
2189
2190
#: bzrlib/builtins.py:3321
2191
msgid "Commit changes into a new revision."
2192
msgstr ""
2193
2194
#: bzrlib/builtins.py:3323
2195
msgid ""
2196
"An explanatory message needs to be given for each commit. This is\n"
2197
"often done by using the --message option (getting the message from the\n"
2198
"command line) or by using the --file option (getting the message from\n"
2199
"a file). If neither of these options is given, an editor is opened for\n"
2200
"the user to enter the message. To see the changed files in the\n"
2201
"boilerplate text loaded into the editor, use the --show-diff option."
2202
msgstr ""
2203
2204
#: bzrlib/builtins.py:3330
2205
msgid ""
2206
"By default, the entire tree is committed and the person doing the\n"
2207
"commit is assumed to be the author. These defaults can be overridden\n"
2208
"as explained below."
2209
msgstr ""
2210
2211
#: bzrlib/builtins.py:3334
2212
msgid ":Selective commits:"
2213
msgstr ""
2214
2215
#: bzrlib/builtins.py:3336
2216
msgid ""
2217
" If selected files are specified, only changes to those files are\n"
2218
" committed. If a directory is specified then the directory and\n"
2219
" everything within it is committed."
2220
msgstr ""
2221
2222
#: bzrlib/builtins.py:3340
2223
msgid ""
2224
" When excludes are given, they take precedence over selected files.\n"
2225
" For example, to commit only changes within foo, but not changes\n"
2226
" within foo/bar::"
2227
msgstr ""
2228
2229
#: bzrlib/builtins.py:3344
2230
msgid " bzr commit foo -x foo/bar"
2231
msgstr ""
2232
2233
#: bzrlib/builtins.py:3346
2234
msgid " A selective commit after a merge is not yet supported."
2235
msgstr ""
2236
2237
#: bzrlib/builtins.py:3348
2238
msgid ":Custom authors:"
2239
msgstr ""
2240
2241
#: bzrlib/builtins.py:3350
2242
msgid ""
2243
" If the author of the change is not the same person as the committer,\n"
2244
" you can specify the author's name using the --author option. The\n"
2245
" name should be in the same format as a committer-id, e.g.\n"
2246
" \"John Doe <jdoe@example.com>\". If there is more than one author of\n"
2247
" the change you can specify the option multiple times, once for each\n"
2248
" author."
2249
msgstr ""
2250
2251
#: bzrlib/builtins.py:3357
2252
msgid ":Checks:"
2253
msgstr ""
2254
2255
#: bzrlib/builtins.py:3359
2256
msgid ""
2257
" A common mistake is to forget to add a new file or directory before\n"
2258
" running the commit command. The --strict option checks for unknown\n"
2259
" files and aborts the commit if any are found. More advanced pre-commit\n"
2260
" checks can be implemented by defining hooks. See ``bzr help hooks``\n"
2261
" for details."
2262
msgstr ""
2263
2264
#: bzrlib/builtins.py:3365
2265
msgid ":Things to note:"
2266
msgstr ""
2267
2268
#: bzrlib/builtins.py:3367
2269
msgid ""
2270
" If you accidentially commit the wrong changes or make a spelling\n"
2271
" mistake in the commit message say, you can use the uncommit command\n"
2272
" to undo it. See ``bzr help uncommit`` for details."
2273
msgstr ""
2274
2275
#: bzrlib/builtins.py:3371
2276
msgid ""
2277
" Hooks can also be configured to run after a commit. This allows you\n"
2278
" to trigger updates to external systems like bug trackers. The --fixes\n"
2279
" option can be used to record the association between a revision and\n"
2280
" one or more bugs. See ``bzr help bugs`` for details."
2281
msgstr ""
2282
2283
#: bzrlib/builtins.py:3381
2284
msgid "Do not consider changes made to a given path."
2285
msgstr ""
2286
2287
#: bzrlib/builtins.py:3384
2288
msgid "Description of the new revision."
2289
msgstr ""
2290
2291
#: bzrlib/builtins.py:3387
2292
msgid "Commit even if nothing has changed."
2293
msgstr ""
2294
2295
#: bzrlib/builtins.py:3391
2296
msgid "Take commit message from this file."
2297
msgstr ""
2298
2299
#: bzrlib/builtins.py:3393
2300
msgid "Refuse to commit if there are unknown files in the working tree."
2301
msgstr ""
2302
2303
#: bzrlib/builtins.py:3396
2304
msgid ""
2305
"Manually set a commit time using commit date format, e.g. '2009-10-10 "
2306
"08:00:00 +0100'."
2307
msgstr ""
2308
2309
#: bzrlib/builtins.py:3399
2310
msgid "Mark a bug as being fixed by this revision (see \"bzr help bugs\")."
2311
msgstr ""
2312
2313
#: bzrlib/builtins.py:3402
2314
msgid "Set the author's name, if it's different from the committer."
2315
msgstr ""
2316
2317
#: bzrlib/builtins.py:3405
2318
msgid ""
2319
"Perform a local commit in a bound branch. Local commits are not pushed to "
2320
"the master branch until a normal commit is performed."
2321
msgstr ""
2322
2323
#: bzrlib/builtins.py:3411
2324
msgid ""
2325
"When no message is supplied, show the diff along with the status summary in "
2326
"the message editor."
2327
msgstr ""
2328
2329
#: bzrlib/builtins.py:3414
2330
msgid ""
2331
"When committing to a foreign version control system do not push data that "
2332
"can not be natively represented."
2333
msgstr ""
2334
2335
#: bzrlib/builtins.py:3432
2336
#, python-format
2337
msgid ""
2338
"No tracker specified for bug %s. Use the form 'tracker:id' or specify a "
2339
"default bug tracker using the `bugtracker` option.\n"
2340
"See \"bzr help bugs\" for more information on this feature. Commit refused."
2341
msgstr ""
2342
2343
#: bzrlib/builtins.py:3441
2344
#, python-format
2345
msgid ""
2346
"Invalid bug %s. Must be in the form of 'tracker:id'. See \"bzr help bugs\" "
2347
"for more information on this feature.\n"
2348
"Commit refused."
2349
msgstr ""
2350
2351
#: bzrlib/builtins.py:3450
2352
#, python-format
2353
msgid "Unrecognized bug %s. Commit refused."
2354
msgstr ""
2355
2356
#: bzrlib/builtins.py:3453
2357
#, python-format
2358
msgid ""
2359
"%s\n"
2360
"Commit refused."
2361
msgstr ""
2362
2363
#: bzrlib/builtins.py:3477
2364
msgid "Could not parse --commit-time: "
2365
msgstr ""
2366
2367
#: bzrlib/builtins.py:3517
2368
msgid "please specify either --message or --file"
2369
msgstr ""
2370
2371
#: bzrlib/builtins.py:3546
2372
msgid "please specify a commit message with either --message or --file"
2373
msgstr ""
2374
2375
#: bzrlib/builtins.py:3549
2376
msgid ""
2377
"Empty commit message specified. Please specify a commit message with either -"
2378
"-message or --file or leave a blank message with --message \"\"."
2379
msgstr ""
2380
2381
#: bzrlib/builtins.py:3569
2382
msgid ""
2383
"No changes to commit. Please 'bzr add' the files you want to commit, or use -"
2384
"-unchanged to force an empty commit."
2385
msgstr ""
2386
2387
#: bzrlib/builtins.py:3573
2388
msgid ""
2389
"Conflicts detected in working tree. Use \"bzr conflicts\" to list, \"bzr "
2390
"resolve FILE\" to resolve."
2391
msgstr ""
2392
2393
#: bzrlib/builtins.py:3577
2394
msgid "Commit refused because there are unknown files in the working tree."
2395
msgstr ""
2396
2397
#: bzrlib/builtins.py:3580
2398
msgid ""
2399
"\n"
2400
"To commit to master branch, run update and then commit.\n"
2401
"You can also pass --local to commit to continue working disconnected."
2402
msgstr ""
2403
2404
#: bzrlib/builtins.py:3588
2405
msgid ""
2406
"Validate working tree structure, branch consistency and repository history."
2407
msgstr ""
2408
2409
#: bzrlib/builtins.py:3590
2410
msgid ""
2411
"This command checks various invariants about branch and repository storage\n"
2412
"to detect data corruption or bzr bugs."
2413
msgstr ""
2414
2415
#: bzrlib/builtins.py:3593
2416
msgid ""
2417
"The working tree and branch checks will only give output if a problem is\n"
2418
"detected. The output fields of the repository check are:"
2419
msgstr ""
2420
2421
#: bzrlib/builtins.py:3596
2422
msgid ""
2423
"revisions\n"
2424
" This is just the number of revisions checked. It doesn't\n"
2425
" indicate a problem."
2426
msgstr ""
2427
2428
#: bzrlib/builtins.py:3600
2429
msgid ""
2430
"versionedfiles\n"
2431
" This is just the number of versionedfiles checked. It\n"
2432
" doesn't indicate a problem."
2433
msgstr ""
2434
2435
#: bzrlib/builtins.py:3604
2436
msgid ""
2437
"unreferenced ancestors\n"
2438
" Texts that are ancestors of other texts, but\n"
2439
" are not properly referenced by the revision ancestry. This is a\n"
2440
" subtle problem that Bazaar can work around."
2441
msgstr ""
2442
2443
#: bzrlib/builtins.py:3609
2444
msgid ""
2445
"unique file texts\n"
2446
" This is the total number of unique file contents\n"
2447
" seen in the checked revisions. It does not indicate a problem."
2448
msgstr ""
2449
2450
#: bzrlib/builtins.py:3613
2451
msgid ""
2452
"repeated file texts\n"
2453
" This is the total number of repeated texts seen\n"
2454
" in the checked revisions. Texts can be repeated when their file\n"
2455
" entries are modified, but the file contents are not. It does not\n"
2456
" indicate a problem."
2457
msgstr ""
2458
2459
#: bzrlib/builtins.py:3619
2460
msgid ""
2461
"If no restrictions are specified, all Bazaar data that is found at the "
2462
"given\n"
2463
"location will be checked."
2464
msgstr ""
2465
2466
#: bzrlib/builtins.py:3624
2467
msgid " Check the tree and branch at 'foo'::"
2468
msgstr ""
2469
2470
#: bzrlib/builtins.py:3626
2471
msgid " bzr check --tree --branch foo"
2472
msgstr ""
2473
2474
#: bzrlib/builtins.py:3628
2475
msgid " Check only the repository at 'bar'::"
2476
msgstr ""
2477
2478
#: bzrlib/builtins.py:3630
2479
msgid " bzr check --repo bar"
2480
msgstr ""
2481
2482
#: bzrlib/builtins.py:3632
2483
msgid " Check everything at 'baz'::"
2484
msgstr ""
2485
2486
#: bzrlib/builtins.py:3634
2487
msgid " bzr check baz"
2488
msgstr ""
2489
2490
#: bzrlib/builtins.py:3640
2491
msgid "Check the branch related to the current directory."
2492
msgstr ""
2493
2494
#: bzrlib/builtins.py:3642
2495
msgid "Check the repository related to the current directory."
2496
msgstr ""
2497
2498
#: bzrlib/builtins.py:3644
2499
msgid "Check the working tree related to the current directory."
2500
msgstr ""
2501
2502
#: bzrlib/builtins.py:3658
2503
msgid "Upgrade a repository, branch or working tree to a newer format."
2504
msgstr ""
2505
2506
#: bzrlib/builtins.py:3660
2507
msgid ""
2508
"When the default format has changed after a major new release of\n"
2509
"Bazaar, you may be informed during certain operations that you\n"
2510
"should upgrade. Upgrading to a newer format may improve performance\n"
2511
"or make new features available. It may however limit interoperability\n"
2512
"with older repositories or with older versions of Bazaar."
2513
msgstr ""
2514
2515
#: bzrlib/builtins.py:3666
2516
msgid ""
2517
"If you wish to upgrade to a particular format rather than the\n"
2518
"current default, that can be specified using the --format option.\n"
2519
"As a consequence, you can use the upgrade command this way to\n"
2520
"\"downgrade\" to an earlier format, though some conversions are\n"
2521
"a one way process (e.g. changing from the 1.x default to the\n"
2522
"2.x default) so downgrading is not always possible."
2523
msgstr ""
2524
2525
#: bzrlib/builtins.py:3673
2526
msgid ""
2527
"A backup.bzr.~#~ directory is created at the start of the conversion\n"
2528
"process (where # is a number). By default, this is left there on\n"
2529
"completion. If the conversion fails, delete the new .bzr directory\n"
2530
"and rename this one back in its place. Use the --clean option to ask\n"
2531
"for the backup.bzr directory to be removed on successful conversion.\n"
2532
"Alternatively, you can delete it by hand if everything looks good\n"
2533
"afterwards."
2534
msgstr ""
2535
2536
#: bzrlib/builtins.py:3681
2537
msgid ""
2538
"If the location given is a shared repository, dependent branches\n"
2539
"are also converted provided the repository converts successfully.\n"
2540
"If the conversion of a branch fails, remaining branches are still\n"
2541
"tried."
2542
msgstr ""
2543
2544
#: bzrlib/builtins.py:3686
2545
msgid ""
2546
"For more information on upgrades, see the Bazaar Upgrade Guide,\n"
2547
"http://doc.bazaar.canonical.com/latest/en/upgrade-guide/."
2548
msgstr ""
2549
2550
#: bzrlib/builtins.py:3694
2551
msgid "Upgrade to a specific format. See \"bzr help formats\" for details."
2552
msgstr ""
2553
2554
#: bzrlib/builtins.py:3698
2555
msgid "Branch format"
2556
msgstr ""
2557
2558
#: bzrlib/builtins.py:3700
2559
msgid "Remove the backup.bzr directory if successful."
2560
msgstr ""
2561
2562
#: bzrlib/builtins.py:3702
2563
msgid "Show what would be done, but don't actually do anything."
2564
msgstr ""
2565
2566
#: bzrlib/builtins.py:3717
2567
msgid "Show or set bzr user id."
2568
msgstr ""
2569
2570
#: bzrlib/builtins.py:3719
2571
msgid ""
2572
":Examples:\n"
2573
" Show the email of the current user::"
2574
msgstr ""
2575
2576
#: bzrlib/builtins.py:3722
2577
msgid " bzr whoami --email"
2578
msgstr ""
2579
2580
#: bzrlib/builtins.py:3724
2581
msgid " Set the current user::"
2582
msgstr ""
2583
2584
#: bzrlib/builtins.py:3726
2585
msgid " bzr whoami \"Frank Chu <fchu@example.com>\""
2586
msgstr ""
2587
2588
#: bzrlib/builtins.py:3730
2589
msgid "Display email address only."
2590
msgstr ""
2591
2592
#: bzrlib/builtins.py:3732
2593
msgid "Set identity for the current branch instead of globally."
2594
msgstr ""
2595
2596
#: bzrlib/builtins.py:3758
2597
msgid "--email can only be used to display existing identity"
2598
msgstr ""
2599
2600
#: bzrlib/builtins.py:3780
2601
msgid "Print or set the branch nickname."
2602
msgstr ""
2603
2604
#: bzrlib/builtins.py:3782
2605
msgid ""
2606
"If unset, the tree root directory name is used as the nickname.\n"
2607
"To print the current nickname, execute with no argument."
2608
msgstr ""
2609
2610
#: bzrlib/builtins.py:3785
2611
msgid ""
2612
"Bound branches use the nickname of its master branch unless it is set\n"
2613
"locally."
2614
msgstr ""
2615
2616
#: bzrlib/builtins.py:3805
2617
msgid "Set/unset and display aliases."
2618
msgstr ""
2619
2620
#: bzrlib/builtins.py:3807
2621
msgid ""
2622
":Examples:\n"
2623
" Show the current aliases::"
2624
msgstr ""
2625
2626
#: bzrlib/builtins.py:3810
2627
msgid " bzr alias"
2628
msgstr ""
2629
2630
#: bzrlib/builtins.py:3812
2631
msgid " Show the alias specified for 'll'::"
2632
msgstr ""
2633
2634
#: bzrlib/builtins.py:3814
2635
msgid " bzr alias ll"
2636
msgstr ""
2637
2638
#: bzrlib/builtins.py:3816
2639
msgid " Set an alias for 'll'::"
2640
msgstr ""
2641
2642
#: bzrlib/builtins.py:3818
2643
msgid " bzr alias ll=\"log --line -r-10..-1\""
2644
msgstr ""
2645
2646
#: bzrlib/builtins.py:3820
2647
msgid " To remove an alias for 'll'::"
2648
msgstr ""
2649
2650
#: bzrlib/builtins.py:3822
2651
msgid " bzr alias --remove ll"
2652
msgstr ""
2653
2654
#: bzrlib/builtins.py:3827
2655
msgid "Remove the alias."
2656
msgstr ""
2657
2658
#: bzrlib/builtins.py:3845
2659
msgid "bzr alias --remove expects an alias to remove."
2660
msgstr ""
2661
2662
#: bzrlib/builtins.py:4026
2663
msgid ""
2664
"subunit not available. subunit needs to be installed to use --subunit."
2665
msgstr ""
2666
2667
#: bzrlib/builtins.py:4043
2668
msgid ""
2669
"--benchmark is no longer supported from bzr 2.2; use bzr-usertest instead"
2670
msgstr ""
2671
2672
#: bzrlib/builtins.py:4090
2673
msgid "Show version of bzr."
2674
msgstr ""
2675
2676
#: bzrlib/builtins.py:4094
2677
msgid "Print just the version number."
2678
msgstr ""
2679
2680
#: bzrlib/builtins.py:4113
2681
msgid "It sure does!\n"
2682
msgstr ""
2683
2684
#: bzrlib/builtins.py:4137
2685
#, python-format
2686
msgid "merge base is revision %s\n"
2687
msgstr ""
2688
2689
#: bzrlib/builtins.py:4141
2690
msgid "Perform a three-way merge."
2691
msgstr ""
2692
2693
#: bzrlib/builtins.py:4143
2694
msgid ""
2695
"The source of the merge can be specified either in the form of a branch,\n"
2696
"or in the form of a path to a file containing a merge directive generated\n"
2697
"with bzr send. If neither is specified, the default is the upstream branch\n"
2698
"or the branch most recently merged using --remember. The source of the\n"
2699
"merge may also be specified in the form of a path to a file in another\n"
2700
"branch: in this case, only the modifications to that file are merged into\n"
2701
"the current working tree."
2702
msgstr ""
2703
2704
#: bzrlib/builtins.py:4151
2705
msgid ""
2706
"When merging from a branch, by default bzr will try to merge in all new\n"
2707
"work from the other branch, automatically determining an appropriate base\n"
2708
"revision. If this fails, you may need to give an explicit base."
2709
msgstr ""
2710
2711
#: bzrlib/builtins.py:4155
2712
msgid ""
2713
"To pick a different ending revision, pass \"--revision OTHER\". bzr will\n"
2714
"try to merge in all new work up to and including revision OTHER."
2715
msgstr ""
2716
2717
#: bzrlib/builtins.py:4158
2718
msgid ""
2719
"If you specify two values, \"--revision BASE..OTHER\", only revisions BASE\n"
2720
"through OTHER, excluding BASE but including OTHER, will be merged. If this\n"
2721
"causes some revisions to be skipped, i.e. if the destination branch does\n"
2722
"not already contain revision BASE, such a merge is commonly referred to as\n"
2723
"a \"cherrypick\". Unlike a normal merge, Bazaar does not currently track\n"
2724
"cherrypicks. The changes look like a normal commit, and the history of the\n"
2725
"changes from the other branch is not stored in the commit."
2726
msgstr ""
2727
2728
#: bzrlib/builtins.py:4166
2729
msgid "Revision numbers are always relative to the source branch."
2730
msgstr ""
2731
2732
#: bzrlib/builtins.py:4168 bzrlib/conflicts.py:52 bzrlib/conflicts.py:106
2733
msgid ""
2734
"Merge will do its best to combine the changes in two branches, but there\n"
2735
"are some kinds of problems only a human can fix. When it encounters those,\n"
2736
"it will mark a conflict. A conflict means that you need to fix something,\n"
2737
"before you should commit."
2738
msgstr ""
2739
2740
#: bzrlib/builtins.py:4173
2741
msgid ""
2742
"Use bzr resolve when you have fixed a problem. See also bzr conflicts."
2743
msgstr ""
2744
2745
#: bzrlib/builtins.py:4175
2746
msgid ""
2747
"If there is no default branch set, the first merge will set it (use\n"
2748
"--no-remember to avoid setting it). After that, you can omit the branch\n"
2749
"to use the default. To change the default, use --remember. The value will\n"
2750
"only be saved if the remote location can be accessed."
2751
msgstr ""
2752
2753
#: bzrlib/builtins.py:4180
2754
msgid ""
2755
"The results of the merge are placed into the destination working\n"
2756
"directory, where they can be reviewed (with bzr diff), tested, and then\n"
2757
"committed to record the result of the merge."
2758
msgstr ""
2759
2760
#: bzrlib/builtins.py:4184
2761
msgid ""
2762
"merge refuses to run if there are any uncommitted changes, unless\n"
2763
"--force is given. If --force is given, then the changes from the source \n"
2764
"will be merged with the current working tree, including any uncommitted\n"
2765
"changes in the tree. The --force option can also be used to create a\n"
2766
"merge revision which has more than two parents."
2767
msgstr ""
2768
2769
#: bzrlib/builtins.py:4190
2770
msgid ""
2771
"If one would like to merge changes from the working tree of the other\n"
2772
"branch without merging any committed revisions, the --uncommitted option\n"
2773
"can be given."
2774
msgstr ""
2775
2776
#: bzrlib/builtins.py:4194
2777
msgid ""
2778
"To select only some changes to merge, use \"merge -i\", which will prompt\n"
2779
"you to apply each diff hunk and file change, similar to \"shelve\"."
2780
msgstr ""
2781
2782
#: bzrlib/builtins.py:4197
2783
msgid ""
2784
":Examples:\n"
2785
" To merge all new revisions from bzr.dev::"
2786
msgstr ""
2787
2788
#: bzrlib/builtins.py:4200
2789
msgid " bzr merge ../bzr.dev"
2790
msgstr ""
2791
2792
#: bzrlib/builtins.py:4202
2793
msgid " To merge changes up to and including revision 82 from bzr.dev::"
2794
msgstr ""
2795
2796
#: bzrlib/builtins.py:4204
2797
msgid " bzr merge -r 82 ../bzr.dev"
2798
msgstr ""
2799
2800
#: bzrlib/builtins.py:4206
2801
msgid " To merge the changes introduced by 82, without previous changes::"
2802
msgstr ""
2803
2804
#: bzrlib/builtins.py:4208
2805
msgid " bzr merge -r 81..82 ../bzr.dev"
2806
msgstr ""
2807
2808
#: bzrlib/builtins.py:4210
2809
msgid " To apply a merge directive contained in /tmp/merge::"
2810
msgstr ""
2811
2812
#: bzrlib/builtins.py:4212
2813
msgid " bzr merge /tmp/merge"
2814
msgstr ""
2815
2816
#: bzrlib/builtins.py:4214
2817
msgid ""
2818
" To create a merge revision with three parents from two branches\n"
2819
" feature1a and feature1b:"
2820
msgstr ""
2821
2822
#: bzrlib/builtins.py:4217
2823
msgid ""
2824
" bzr merge ../feature1a\n"
2825
" bzr merge ../feature1b --force\n"
2826
" bzr commit -m 'revision with three parents'"
2827
msgstr ""
2828
2829
#: bzrlib/builtins.py:4229
2830
msgid "Merge even if the destination tree has uncommitted changes."
2831
msgstr ""
2832
2833
#: bzrlib/builtins.py:4235
2834
msgid ""
2835
"Apply uncommitted changes from a working copy, instead of branch changes."
2836
msgstr ""
2837
2838
#: bzrlib/builtins.py:4237
2839
msgid ""
2840
"If the destination is already completely merged into the source, pull from "
2841
"the source rather than merging. When this happens, you do not need to "
2842
"commit the result."
2843
msgstr ""
2844
2845
#: bzrlib/builtins.py:4242
2846
msgid ""
2847
"Branch to merge into, rather than the one containing the working directory."
2848
msgstr ""
2849
2850
#: bzrlib/builtins.py:4244
2851
msgid "Instead of merging, show a diff of the merge."
2852
msgstr ""
2853
2854
#: bzrlib/builtins.py:4246
2855
msgid "Select changes interactively."
2856
msgstr ""
2857
2858
#: bzrlib/builtins.py:4268
2859
msgid ""
2860
"Merging into empty branches not currently supported, "
2861
"https://bugs.launchpad.net/bzr/+bug/308562"
2862
msgstr ""
2863
2864
#: bzrlib/builtins.py:4295
2865
msgid "Cannot use --uncommitted with bundles or merge directives."
2866
msgstr ""
2867
2868
#: bzrlib/builtins.py:4306
2869
msgid "Cannot use --uncommitted and --revision at the same time."
2870
msgstr ""
2871
2872
#: bzrlib/builtins.py:4326
2873
msgid "merger: "
2874
msgstr ""
2875
2876
#: bzrlib/builtins.py:4328 bzrlib/bundle/apply_bundle.py:71
2877
msgid "Nothing to do."
2878
msgstr ""
2879
2880
#: bzrlib/builtins.py:4332
2881
msgid "Cannot pull individual files"
2882
msgstr ""
2883
2884
#: bzrlib/builtins.py:4340
2885
msgid "This branch has no commits. (perhaps you would prefer 'bzr pull')"
2886
msgstr ""
2887
2888
#: bzrlib/builtins.py:4398
2889
#, python-format
2890
msgid "Show-base is not supported for this merge type. %s"
2891
msgstr ""
2892
2893
#: bzrlib/builtins.py:4407
2894
#, python-format
2895
msgid "Conflict reduction is not supported for merge type %s."
2896
msgstr ""
2897
2898
#: bzrlib/builtins.py:4411
2899
msgid "Cannot do conflict reduction and show base."
2900
msgstr ""
2901
2902
#: bzrlib/builtins.py:4522
2903
msgid "No location specified or remembered"
2904
msgstr ""
2905
2906
#: bzrlib/builtins.py:4524
2907
msgid "{0} remembered {1} location {2}"
2908
msgstr ""
2909
2910
#: bzrlib/builtins.py:4530
2911
msgid "Redo a merge."
2912
msgstr ""
2913
2914
#: bzrlib/builtins.py:4532
2915
msgid ""
2916
"Use this if you want to try a different merge technique while resolving\n"
2917
"conflicts. Some merge techniques are better than others, and remerge\n"
2918
"lets you try different ones on different files."
2919
msgstr ""
2920
2921
#: bzrlib/builtins.py:4536
2922
msgid ""
2923
"The options for remerge have the same meaning and defaults as the ones for\n"
2924
"merge. The difference is that remerge can (only) be run when there is a\n"
2925
"pending merge, and it lets you specify particular files."
2926
msgstr ""
2927
2928
#: bzrlib/builtins.py:4540
2929
msgid ""
2930
":Examples:\n"
2931
" Re-do the merge of all conflicted files, and show the base text in\n"
2932
" conflict regions, in addition to the usual THIS and OTHER texts::"
2933
msgstr ""
2934
2935
#: bzrlib/builtins.py:4544
2936
msgid " bzr remerge --show-base"
2937
msgstr ""
2938
2939
#: bzrlib/builtins.py:4546
2940
msgid ""
2941
" Re-do the merge of \"foobar\", using the weave merge algorithm, with\n"
2942
" additional processing to reduce the size of conflict regions::"
2943
msgstr ""
2944
2945
#: bzrlib/builtins.py:4549
2946
msgid " bzr remerge --merge-type weave --reprocess foobar"
2947
msgstr ""
2948
2949
#: bzrlib/builtins.py:4556
2950
msgid "Show base revision text in conflicts."
2951
msgstr ""
2952
2953
#: bzrlib/builtins.py:4568
2954
msgid ""
2955
"Sorry, remerge only works after normal merges. Not cherrypicking or multi-"
2956
"merges."
2957
msgstr ""
2958
2959
#: bzrlib/builtins.py:4624
2960
msgid "Revert files to a previous revision."
2961
msgstr ""
2962
2963
#: bzrlib/builtins.py:4626
2964
msgid ""
2965
"Giving a list of files will revert only those files. Otherwise, all files\n"
2966
"will be reverted. If the revision is not specified with '--revision', the\n"
2967
"last committed revision is used."
2968
msgstr ""
2969
2970
#: bzrlib/builtins.py:4630
2971
msgid ""
2972
"To remove only some changes, without reverting to a prior version, use\n"
2973
"merge instead. For example, \"merge . -r -2..-3\" (don't forget the \".\")\n"
2974
"will remove the changes introduced by the second last commit (-2), without\n"
2975
"affecting the changes introduced by the last commit (-1). To remove\n"
2976
"certain changes on a hunk-by-hunk basis, see the shelve command."
2977
msgstr ""
2978
2979
#: bzrlib/builtins.py:4636
2980
msgid ""
2981
"By default, any files that have been manually changed will be backed up\n"
2982
"first. (Files changed only by merge are not backed up.) Backup files have\n"
2983
"'.~#~' appended to their name, where # is a number."
2984
msgstr ""
2985
2986
#: bzrlib/builtins.py:4640
2987
msgid ""
2988
"When you provide files, you can use their current pathname or the pathname\n"
2989
"from the target revision. So you can use revert to \"undelete\" a file by\n"
2990
"name. If you name a directory, all the contents of that directory will be\n"
2991
"reverted."
2992
msgstr ""
2993
2994
#: bzrlib/builtins.py:4645
2995
msgid ""
2996
"If you have newly added files since the target revision, they will be\n"
2997
"removed. If the files to be removed have been changed, backups will be\n"
2998
"created as above. Directories containing unknown files will not be\n"
2999
"deleted."
3000
msgstr ""
3001
3002
#: bzrlib/builtins.py:4650
3003
msgid ""
3004
"The working tree contains a list of revisions that have been merged but\n"
3005
"not yet committed. These revisions will be included as additional parents\n"
3006
"of the next commit. Normally, using revert clears that list as well as\n"
3007
"reverting the files. If any files are specified, revert leaves the list\n"
3008
"of uncommitted merges alone and reverts only the files. Use ``bzr revert\n"
3009
".`` in the tree root to revert all files but keep the recorded merges,\n"
3010
"and ``bzr revert --forget-merges`` to clear the pending merge list without\n"
3011
"reverting any files."
3012
msgstr ""
3013
3014
#: bzrlib/builtins.py:4659
3015
msgid ""
3016
"Using \"bzr revert --forget-merges\", it is possible to apply all of the\n"
3017
"changes from a branch in a single revision. To do this, perform the merge\n"
3018
"as desired. Then doing revert with the \"--forget-merges\" option will "
3019
"keep\n"
3020
"the content of the tree as it was, but it will clear the list of pending\n"
3021
"merges. The next commit will then contain all of the changes that are\n"
3022
"present in the other branch, but without any other parent revisions.\n"
3023
"Because this technique forgets where these changes originated, it may\n"
3024
"cause additional conflicts on later merges involving the same source and\n"
3025
"target branches."
3026
msgstr ""
3027
3028
#: bzrlib/builtins.py:4673
3029
msgid "Do not save backups of reverted files."
3030
msgstr ""
3031
3032
#: bzrlib/builtins.py:4675
3033
msgid "Remove pending merge marker, without changing any files."
3034
msgstr ""
3035
3036
#: bzrlib/builtins.py:4706
3037
msgid ""
3038
"Show help on a command or other topic.\n"
3039
" "
3040
msgstr ""
3041
3042
#: bzrlib/builtins.py:4711
3043
msgid "Show help on all commands."
3044
msgstr ""
3045
3046
#: bzrlib/builtins.py:4740
3047
msgid "Show unmerged/unpulled revisions between two branches."
3048
msgstr ""
3049
3050
#: bzrlib/builtins.py:4742
3051
msgid "OTHER_BRANCH may be local or remote."
3052
msgstr ""
3053
3054
#: bzrlib/builtins.py:4744
3055
msgid ""
3056
"To filter on a range of revisions, you can use the command -r begin..end\n"
3057
"-r revision requests a specific revision, -r ..end or -r begin.. are\n"
3058
"also valid.\n"
3059
" \n"
3060
":Exit values:\n"
3061
" 1 - some missing revisions\n"
3062
" 0 - no missing revisions"
3063
msgstr ""
3064
3065
#: bzrlib/builtins.py:4754
3066
msgid ""
3067
" Determine the missing revisions between this and the branch at the\n"
3068
" remembered pull location::"
3069
msgstr ""
3070
3071
#: bzrlib/builtins.py:4757
3072
msgid " bzr missing"
3073
msgstr ""
3074
3075
#: bzrlib/builtins.py:4759
3076
msgid " Determine the missing revisions between this and another branch::"
3077
msgstr ""
3078
3079
#: bzrlib/builtins.py:4761
3080
msgid " bzr missing http://server/branch"
3081
msgstr ""
3082
3083
#: bzrlib/builtins.py:4763
3084
msgid ""
3085
" Determine the missing revisions up to a specific revision on the other\n"
3086
" branch::"
3087
msgstr ""
3088
3089
#: bzrlib/builtins.py:4766
3090
msgid " bzr missing -r ..-10"
3091
msgstr ""
3092
3093
#: bzrlib/builtins.py:4768
3094
msgid ""
3095
" Determine the missing revisions up to a specific revision on this\n"
3096
" branch::"
3097
msgstr ""
3098
3099
#: bzrlib/builtins.py:4771
3100
msgid " bzr missing --my-revision ..-10"
3101
msgstr ""
3102
3103
#: bzrlib/builtins.py:4778
3104
msgid "Reverse the order of revisions."
3105
msgstr ""
3106
3107
#: bzrlib/builtins.py:4780
3108
msgid "Display changes in the local branch only."
3109
msgstr ""
3110
3111
#: bzrlib/builtins.py:4781
3112
msgid "Same as --mine-only."
3113
msgstr ""
3114
3115
#: bzrlib/builtins.py:4783
3116
msgid "Display changes in the remote branch only."
3117
msgstr ""
3118
3119
#: bzrlib/builtins.py:4784
3120
msgid "Same as --theirs-only."
3121
msgstr ""
3122
3123
#: bzrlib/builtins.py:4789
3124
msgid ""
3125
"Filter on other branch revisions (inclusive). See \"help revisionspec\" for "
3126
"details."
3127
msgstr ""
3128
3129
#: bzrlib/builtins.py:4793
3130
msgid ""
3131
"Filter on local branch revisions (inclusive). See \"help revisionspec\" for "
3132
"details."
3133
msgstr ""
3134
3135
#: bzrlib/builtins.py:4796
3136
msgid "Show all revisions in addition to the mainline ones."
3137
msgstr ""
3138
3139
#: bzrlib/builtins.py:4850
3140
msgid "No peer location known or specified."
3141
msgstr ""
3142
3143
#: bzrlib/builtins.py:4854
3144
msgid "Using saved parent location: {0}\n"
3145
msgstr ""
3146
3147
#: bzrlib/builtins.py:4887
3148
#, python-format
3149
msgid "You have %d extra revision:\n"
3150
msgid_plural "You have %d extra revisions:\n"
3151
msgstr[0] ""
3152
msgstr[1] ""
3153
3154
#: bzrlib/builtins.py:4903
3155
#, python-format
3156
msgid "You are missing %d revision:\n"
3157
msgid_plural "You are missing %d revisions:\n"
3158
msgstr[0] ""
3159
msgstr[1] ""
3160
3161
#: bzrlib/builtins.py:4915
3162
msgid "This branch has no new revisions.\n"
3163
msgstr ""
3164
3165
#: bzrlib/builtins.py:4918
3166
msgid "Other branch has no new revisions.\n"
3167
msgstr ""
3168
3169
#: bzrlib/builtins.py:4923
3170
msgid "Branches are up to date.\n"
3171
msgstr ""
3172
3173
#: bzrlib/builtins.py:4934
3174
msgid "Compress the data within a repository."
3175
msgstr ""
3176
3177
#: bzrlib/builtins.py:4936
3178
msgid ""
3179
"This operation compresses the data within a bazaar repository. As\n"
3180
"bazaar supports automatic packing of repository, this operation is\n"
3181
"normally not required to be done manually."
3182
msgstr ""
3183
3184
#: bzrlib/builtins.py:4940
3185
msgid ""
3186
"During the pack operation, bazaar takes a backup of existing repository\n"
3187
"data, i.e. pack files. This backup is eventually removed by bazaar\n"
3188
"automatically when it is safe to do so. To save disk space by removing\n"
3189
"the backed up pack files, the --clean-obsolete-packs option may be\n"
3190
"used."
3191
msgstr ""
3192
3193
#: bzrlib/builtins.py:4946
3194
msgid ""
3195
"Warning: If you use --clean-obsolete-packs and your machine crashes\n"
3196
"during or immediately after repacking, you may be left with a state\n"
3197
"where the deletion has been written to disk but the new packs have not\n"
3198
"been. In this case the repository may be unusable."
3199
msgstr ""
3200
3201
#: bzrlib/builtins.py:4955
3202
msgid "Delete obsolete packs to save disk space."
3203
msgstr ""
3204
3205
#: bzrlib/builtins.py:4969
3206
msgid "List the installed plugins."
3207
msgstr ""
3208
3209
#: bzrlib/builtins.py:4971
3210
msgid ""
3211
"This command displays the list of installed plugins including\n"
3212
"version of plugin and a short description of each."
3213
msgstr ""
3214
3215
#: bzrlib/builtins.py:4974
3216
msgid "--verbose shows the path where each plugin is located."
3217
msgstr ""
3218
3219
#: bzrlib/builtins.py:4976
3220
msgid ""
3221
"A plugin is an external component for Bazaar that extends the\n"
3222
"revision control system, by adding or replacing code in Bazaar.\n"
3223
"Plugins can do a variety of things, including overriding commands,\n"
3224
"adding new commands, providing additional network transports and\n"
3225
"customizing log output."
3226
msgstr ""
3227
3228
#: bzrlib/builtins.py:4982
3229
msgid ""
3230
"See the Bazaar Plugin Guide <http://doc.bazaar.canonical.com/plugins/en/>\n"
3231
"for further information on plugins including where to find them and how to\n"
3232
"install them. Instructions are also provided there on how to write new\n"
3233
"plugins using the Python programming language."
3234
msgstr ""
3235
3236
#: bzrlib/builtins.py:4998
3237
msgid "Show testament (signing-form) of a revision."
3238
msgstr ""
3239
3240
#: bzrlib/builtins.py:5001
3241
msgid "Produce long-format testament."
3242
msgstr ""
3243
3244
#: bzrlib/builtins.py:5003
3245
msgid "Produce a strict-format testament."
3246
msgstr ""
3247
3248
#: bzrlib/builtins.py:5029
3249
msgid "Show the origin of each line in a file."
3250
msgstr ""
3251
3252
#: bzrlib/builtins.py:5031
3253
msgid ""
3254
"This prints out the given file with an annotation on the left side\n"
3255
"indicating which revision, author and date introduced the change."
3256
msgstr ""
3257
3258
#: bzrlib/builtins.py:5034
3259
msgid ""
3260
"If the origin is the same for a run of consecutive lines, it is\n"
3261
"shown only at the top, unless the --all option is given."
3262
msgstr ""
3263
3264
#: bzrlib/builtins.py:5042
3265
msgid "Show annotations on all lines."
3266
msgstr ""
3267
3268
#: bzrlib/builtins.py:5043
3269
msgid "Show commit date in annotations."
3270
msgstr ""
3271
3272
#: bzrlib/builtins.py:5130
3273
msgid "Cannot sign a range of non-revision-history revisions"
3274
msgstr ""
3275
3276
#: bzrlib/builtins.py:5142
3277
msgid "Please supply either one revision, or a range."
3278
msgstr ""
3279
3280
#: bzrlib/builtins.py:5146
3281
msgid ""
3282
"Convert the current branch into a checkout of the supplied branch.\n"
3283
"If no branch is supplied, rebind to the last bound location."
3284
msgstr ""
3285
3286
#: bzrlib/builtins.py:5149
3287
msgid ""
3288
"Once converted into a checkout, commits must succeed on the master branch\n"
3289
"before they will be applied to the local branch."
3290
msgstr ""
3291
3292
#: bzrlib/builtins.py:5152
3293
msgid ""
3294
"Bound branches use the nickname of its master branch unless it is set\n"
3295
"locally, in which case binding will update the local nickname to be\n"
3296
"that of the master."
3297
msgstr ""
3298
3299
#: bzrlib/builtins.py:5167
3300
msgid "No location supplied. This format does not remember old locations."
3301
msgstr ""
3302
3303
#: bzrlib/builtins.py:5172
3304
msgid "Branch is already bound"
3305
msgstr ""
3306
3307
#: bzrlib/builtins.py:5174
3308
msgid "No location supplied and no previous location known"
3309
msgstr ""
3310
3311
#: bzrlib/builtins.py:5180
3312
msgid "These branches have diverged. Try merging, and then bind again."
3313
msgstr ""
3314
3315
#: bzrlib/builtins.py:5187
3316
msgid "Convert the current checkout into a regular branch."
3317
msgstr ""
3318
3319
#: bzrlib/builtins.py:5189
3320
msgid ""
3321
"After unbinding, the local branch is considered independent and subsequent\n"
3322
"commits will be local only."
3323
msgstr ""
3324
3325
#: bzrlib/builtins.py:5200
3326
msgid "Local branch is not bound"
3327
msgstr ""
3328
3329
#: bzrlib/builtins.py:5204
3330
msgid "Remove the last committed revision."
3331
msgstr ""
3332
3333
#: bzrlib/builtins.py:5206
3334
msgid ""
3335
"--verbose will print out what is being removed.\n"
3336
"--dry-run will go through all the motions, but not actually\n"
3337
"remove anything."
3338
msgstr ""
3339
3340
#: bzrlib/builtins.py:5210
3341
msgid ""
3342
"If --revision is specified, uncommit revisions to leave the branch at the\n"
3343
"specified revision. For example, \"bzr uncommit -r 15\" will leave the\n"
3344
"branch at revision 15."
3345
msgstr ""
3346
3347
#: bzrlib/builtins.py:5214
3348
msgid ""
3349
"Uncommit leaves the working tree ready for a new commit. The only change\n"
3350
"it may make is to restore any pending merges that were present before\n"
3351
"the commit."
3352
msgstr ""
3353
3354
#: bzrlib/builtins.py:5225
3355
msgid "Don't actually make changes."
3356
msgstr ""
3357
3358
#: bzrlib/builtins.py:5226
3359
msgid "Say yes to all questions."
3360
msgstr ""
3361
3362
#: bzrlib/builtins.py:5228
3363
msgid "Keep tags that point to removed revisions."
3364
msgstr ""
3365
3366
#: bzrlib/builtins.py:5230
3367
msgid "Only remove the commits from the local branch when in a checkout."
3368
msgstr ""
3369
3370
#: bzrlib/builtins.py:5279
3371
msgid "No revisions to uncommit.\n"
3372
msgstr ""
3373
3374
#: bzrlib/builtins.py:5294
3375
msgid "Dry-run, pretending to remove the above revisions.\n"
3376
msgstr ""
3377
3378
#: bzrlib/builtins.py:5297
3379
msgid "The above revision(s) will be removed.\n"
3380
msgstr ""
3381
3382
#: bzrlib/builtins.py:5301
3383
msgid "Uncommit these revisions"
3384
msgstr ""
3385
3386
#: bzrlib/builtins.py:5304
3387
msgid "Canceled\n"
3388
msgstr ""
3389
3390
#: bzrlib/builtins.py:5311
3391
#, python-format
3392
msgid ""
3393
"You can restore the old tip by running:\n"
3394
" bzr pull . -r revid:%s\n"
3395
msgstr ""
3396
3397
#: bzrlib/builtins.py:5316
3398
msgid "Break a dead lock."
3399
msgstr ""
3400
3401
#: bzrlib/builtins.py:5318
3402
msgid ""
3403
"This command breaks a lock on a repository, branch, working directory or\n"
3404
"config file."
3405
msgstr ""
3406
3407
#: bzrlib/builtins.py:5321
3408
msgid ""
3409
"CAUTION: Locks should only be broken when you are sure that the process\n"
3410
"holding the lock has been stopped."
3411
msgstr ""
3412
3413
#: bzrlib/builtins.py:5324
3414
msgid ""
3415
"You can get information on what locks are open via the 'bzr info\n"
3416
"[location]' command."
3417
msgstr ""
3418
3419
#: bzrlib/builtins.py:5327
3420
msgid ""
3421
":Examples:\n"
3422
" bzr break-lock\n"
3423
" bzr break-lock bzr+ssh://example.com/bzr/foo\n"
3424
" bzr break-lock --conf ~/.bazaar"
3425
msgstr ""
3426
3427
#: bzrlib/builtins.py:5336
3428
msgid "LOCATION is the directory where the config lock is."
3429
msgstr ""
3430
3431
#: bzrlib/builtins.py:5338
3432
msgid "Do not ask for confirmation before breaking the lock."
3433
msgstr ""
3434
3435
#: bzrlib/builtins.py:5373
3436
msgid "The Bazaar smart server protocol over TCP. (default port: 4155)"
3437
msgstr ""
3438
3439
#: bzrlib/builtins.py:5374
3440
msgid "Run the bzr server."
3441
msgstr ""
3442
3443
#: bzrlib/builtins.py:5380
3444
msgid "Serve on stdin/out for use from inetd or sshd."
3445
msgstr ""
3446
3447
#: bzrlib/builtins.py:5381
3448
msgid "protocol"
3449
msgstr ""
3450
3451
#: bzrlib/builtins.py:5382
3452
msgid "Protocol to serve."
3453
msgstr ""
3454
3455
#: bzrlib/builtins.py:5386
3456
msgid ""
3457
"Listen for connections on nominated port of the form [hostname:]portnumber. "
3458
"Passing 0 as the port number will result in a dynamically allocated port. "
3459
"The default port depends on the protocol."
3460
msgstr ""
3461
3462
#: bzrlib/builtins.py:5392
3463
msgid "Serve contents of this directory."
3464
msgstr ""
3465
3466
#: bzrlib/builtins.py:5394
3467
msgid ""
3468
"By default the server is a readonly server. Supplying --allow-writes "
3469
"enables write access to the contents of the served directory and below. "
3470
"Note that ``bzr serve`` does not perform authentication, so unless some form "
3471
"of external authentication is arranged supplying this option leads to global "
3472
"uncontrolled write access to your file system."
3473
msgstr ""
3474
3475
#: bzrlib/builtins.py:5403
3476
msgid "Override the default idle client timeout (5min)."
3477
msgstr ""
3478
3479
#: bzrlib/builtins.py:5453
3480
msgid "Combine a tree into its containing tree."
3481
msgstr ""
3482
3483
#: bzrlib/builtins.py:5455
3484
msgid "This command requires the target tree to be in a rich-root format."
3485
msgstr ""
3486
3487
#: bzrlib/builtins.py:5457
3488
msgid ""
3489
"The TREE argument should be an independent tree, inside another tree, but\n"
3490
"not part of it. (Such trees can be produced by \"bzr split\", but also by\n"
3491
"running \"bzr branch\" with the target inside a tree.)"
3492
msgstr ""
3493
3494
#: bzrlib/builtins.py:5461
3495
msgid ""
3496
"The result is a combined tree, with the subtree no longer an independent\n"
3497
"part. This is marked as a merge of the subtree into the containing tree,\n"
3498
"and all history is preserved."
3499
msgstr ""
3500
3501
#: bzrlib/builtins.py:5479
3502
#, python-format
3503
msgid ""
3504
"Can't join trees because %s doesn't support rich root data.\n"
3505
"You can use bzr upgrade on the repository."
3506
msgstr ""
3507
3508
#: bzrlib/builtins.py:5489 bzrlib/builtins.py:5495
3509
msgid "Cannot join {0}. {1}"
3510
msgstr ""
3511
3512
#: bzrlib/builtins.py:5499
3513
msgid "Split a subdirectory of a tree into a separate tree."
3514
msgstr ""
3515
3516
#: bzrlib/builtins.py:5501
3517
msgid ""
3518
"This command will produce a target tree in a format that supports\n"
3519
"rich roots, like 'rich-root' or 'rich-root-pack'. These formats cannot be\n"
3520
"converted into earlier formats like 'dirstate-tags'."
3521
msgstr ""
3522
3523
#: bzrlib/builtins.py:5505
3524
msgid ""
3525
"The TREE argument should be a subdirectory of a working tree. That\n"
3526
"subdirectory will be converted into an independent tree, with its own\n"
3527
"branch. Commits in the top-level tree will not apply to the new subtree."
3528
msgstr ""
3529
3530
#: bzrlib/builtins.py:5585
3531
msgid "No submit branch specified or known"
3532
msgstr ""
3533
3534
#: bzrlib/builtins.py:5593 bzrlib/send.py:108
3535
msgid "No public branch specified or known"
3536
msgstr ""
3537
3538
#: bzrlib/builtins.py:5598
3539
msgid "bzr merge-directive takes at most two one revision identifiers"
3540
msgstr ""
3541
3542
#: bzrlib/builtins.py:5607
3543
msgid "No revisions to bundle."
3544
msgstr ""
3545
3546
#: bzrlib/builtins.py:5626
3547
msgid "Mail or create a merge-directive for submitting changes."
3548
msgstr ""
3549
3550
#: bzrlib/builtins.py:5628
3551
msgid "A merge directive provides many things needed for requesting merges:"
3552
msgstr ""
3553
3554
#: bzrlib/builtins.py:5630
3555
msgid "* A machine-readable description of the merge to perform"
3556
msgstr ""
3557
3558
#: bzrlib/builtins.py:5632
3559
msgid "* An optional patch that is a preview of the changes requested"
3560
msgstr ""
3561
3562
#: bzrlib/builtins.py:5634
3563
msgid ""
3564
"* An optional bundle of revision data, so that the changes can be applied\n"
3565
" directly from the merge directive, without retrieving data from a\n"
3566
" branch."
3567
msgstr ""
3568
3569
#: bzrlib/builtins.py:5638
3570
msgid ""
3571
"`bzr send` creates a compact data set that, when applied using bzr\n"
3572
"merge, has the same effect as merging from the source branch. "
3573
msgstr ""
3574
3575
#: bzrlib/builtins.py:5641
3576
msgid ""
3577
"By default the merge directive is self-contained and can be applied to any\n"
3578
"branch containing submit_branch in its ancestory without needing access to\n"
3579
"the source branch."
3580
msgstr ""
3581
3582
#: bzrlib/builtins.py:5645
3583
msgid ""
3584
"If --no-bundle is specified, then Bazaar doesn't send the contents of the\n"
3585
"revisions, but only a structured request to merge from the\n"
3586
"public_location. In that case the public_branch is needed and it must be\n"
3587
"up-to-date and accessible to the recipient. The public_branch is always\n"
3588
"included if known, so that people can check it later."
3589
msgstr ""
3590
3591
#: bzrlib/builtins.py:5651
3592
msgid ""
3593
"The submit branch defaults to the parent of the source branch, but can be\n"
3594
"overridden. Both submit branch and public branch will be remembered in\n"
3595
"branch.conf the first time they are used for a particular branch. The\n"
3596
"source branch defaults to that containing the working directory, but can\n"
3597
"be changed using --from."
3598
msgstr ""
3599
3600
#: bzrlib/builtins.py:5657
3601
msgid ""
3602
"Both the submit branch and the public branch follow the usual behavior with\n"
3603
"respect to --remember: If there is no default location set, the first send\n"
3604
"will set it (use --no-remember to avoid setting it). After that, you can\n"
3605
"omit the location to use the default. To change the default, use\n"
3606
"--remember. The value will only be saved if the location can be accessed."
3607
msgstr ""
3608
3609
#: bzrlib/builtins.py:5663
3610
msgid ""
3611
"In order to calculate those changes, bzr must analyse the submit branch.\n"
3612
"Therefore it is most efficient for the submit branch to be a local mirror.\n"
3613
"If a public location is known for the submit_branch, that location is used\n"
3614
"in the merge directive."
3615
msgstr ""
3616
3617
#: bzrlib/builtins.py:5668
3618
msgid ""
3619
"The default behaviour is to send the merge directive by mail, unless -o is\n"
3620
"given, in which case it is sent to a file."
3621
msgstr ""
3622
3623
#: bzrlib/builtins.py:5671
3624
msgid ""
3625
"Mail is sent using your preferred mail program. This should be transparent\n"
3626
"on Windows (it uses MAPI). On Unix, it requires the xdg-email utility.\n"
3627
"If the preferred client can't be found (or used), your editor will be used."
3628
msgstr ""
3629
3630
#: bzrlib/builtins.py:5675
3631
msgid ""
3632
"To use a specific mail program, set the mail_client configuration option.\n"
3633
"(For Thunderbird 1.5, this works around some bugs.) Supported values for\n"
3634
"specific clients are \"claws\", \"evolution\", \"kmail\", \"mail.app\" "
3635
"(MacOS X's\n"
3636
"Mail.app), \"mutt\", and \"thunderbird\"; generic options are \"default\",\n"
3637
"\"editor\", \"emacsclient\", \"mapi\", and \"xdg-email\". Plugins may also "
3638
"add\n"
3639
"supported clients."
3640
msgstr ""
3641
3642
#: bzrlib/builtins.py:5682
3643
msgid ""
3644
"If mail is being sent, a to address is required. This can be supplied\n"
3645
"either on the commandline, by setting the submit_to configuration\n"
3646
"option in the branch itself or the child_submit_to configuration option\n"
3647
"in the submit branch."
3648
msgstr ""
3649
3650
#: bzrlib/builtins.py:5687
3651
msgid ""
3652
"Two formats are currently supported: \"4\" uses revision bundle format 4 "
3653
"and\n"
3654
"merge directive format 2. It is significantly faster and smaller than\n"
3655
"older formats. It is compatible with Bazaar 0.19 and later. It is the\n"
3656
"default. \"0.9\" uses revision bundle format 0.9 and merge directive\n"
3657
"format 1. It is compatible with Bazaar 0.12 - 0.18."
3658
msgstr ""
3659
3660
#: bzrlib/builtins.py:5693
3661
msgid ""
3662
"The merge directives created by bzr send may be applied using bzr merge or\n"
3663
"bzr pull by specifying a file containing a merge directive as the location."
3664
msgstr ""
3665
3666
#: bzrlib/builtins.py:5696
3667
msgid ""
3668
"bzr send makes extensive use of public locations to map local locations "
3669
"into\n"
3670
"URLs that can be used by other people. See `bzr help configuration` to\n"
3671
"set them, and use `bzr info` to display them."
3672
msgstr ""
3673
3674
#: bzrlib/builtins.py:5720
3675
msgid "Write merge directive to this file or directory; use - for stdout."
3676
msgstr ""
3677
3678
#: bzrlib/builtins.py:5724
3679
msgid ""
3680
"Refuse to send if there are uncommitted changes in the working tree, --no-"
3681
"strict disables the check."
3682
msgstr ""
3683
3684
#: bzrlib/builtins.py:5726
3685
msgid "Mail the request to this address."
3686
msgstr ""
3687
3688
#: bzrlib/builtins.py:5730
3689
msgid "Body for the email."
3690
msgstr ""
3691
3692
#: bzrlib/builtins.py:5783
3693
msgid "Do not include a bundle in the merge directive."
3694
msgstr ""
3695
3696
#: bzrlib/builtins.py:5784
3697
msgid "Do not include a preview patch in the merge directive."
3698
msgstr ""
3699
3700
#: bzrlib/builtins.py:5787
3701
msgid "Remember submit and public branch."
3702
msgstr ""
3703
3704
#: bzrlib/builtins.py:5789
3705
msgid ""
3706
"Branch to generate the submission from, rather than the one containing the "
3707
"working directory."
3708
msgstr ""
3709
3710
#: bzrlib/builtins.py:5799 bzrlib/cmd_version_info.py:76
3711
msgid "format"
3712
msgstr ""
3713
3714
#: bzrlib/builtins.py:5800
3715
msgid "Use the specified output format."
3716
msgstr ""
3717
3718
#: bzrlib/builtins.py:5822
3719
msgid "Create, remove or modify a tag naming a revision."
3720
msgstr ""
3721
3722
#: bzrlib/builtins.py:5824
3723
msgid ""
3724
"Tags give human-meaningful names to revisions. Commands that take a -r\n"
3725
"(--revision) option can be given -rtag:X, where X is any previously\n"
3726
"created tag."
3727
msgstr ""
3728
3729
#: bzrlib/builtins.py:5828
3730
msgid ""
3731
"Tags are stored in the branch. Tags are copied from one branch to another\n"
3732
"along when you branch, push, pull or merge."
3733
msgstr ""
3734
3735
#: bzrlib/builtins.py:5831
3736
msgid ""
3737
"It is an error to give a tag name that already exists unless you pass\n"
3738
"--force, in which case the tag is moved to point to the new revision."
3739
msgstr ""
3740
3741
#: bzrlib/builtins.py:5834
3742
msgid ""
3743
"To rename a tag (change the name but keep it on the same revsion), run "
3744
"``bzr\n"
3745
"tag new-name -r tag:old-name`` and then ``bzr tag --delete oldname``."
3746
msgstr ""
3747
3748
#: bzrlib/builtins.py:5837
3749
msgid ""
3750
"If no tag name is specified it will be determined through the \n"
3751
"'automatic_tag_name' hook. This can e.g. be used to automatically tag\n"
3752
"upstream releases by reading configure.ac. See ``bzr help hooks`` for\n"
3753
"details."
3754
msgstr ""
3755
3756
#: bzrlib/builtins.py:5847
3757
msgid "Delete this tag rather than placing it."
3758
msgstr ""
3759
3760
#: bzrlib/builtins.py:5850
3761
msgid "Branch in which to place the tag."
3762
msgstr ""
3763
3764
#: bzrlib/builtins.py:5852
3765
msgid "Replace existing tags."
3766
msgstr ""
3767
3768
#: bzrlib/builtins.py:5867
3769
msgid "No tag specified to delete."
3770
msgstr ""
3771
3772
#: bzrlib/builtins.py:5869
3773
#, python-format
3774
msgid "Deleted tag %s."
3775
msgstr ""
3776
3777
#: bzrlib/builtins.py:5883
3778
msgid "Please specify a tag name."
3779
msgstr ""
3780
3781
#: bzrlib/builtins.py:5891
3782
#, python-format
3783
msgid "Tag %s already exists for that revision."
3784
msgstr ""
3785
3786
#: bzrlib/builtins.py:5895
3787
#, python-format
3788
msgid "Created tag %s."
3789
msgstr ""
3790
3791
#: bzrlib/builtins.py:5897
3792
#, python-format
3793
msgid "Updated tag %s."
3794
msgstr ""
3795
3796
#: bzrlib/builtins.py:5901
3797
msgid "List tags."
3798
msgstr ""
3799
3800
#: bzrlib/builtins.py:5903
3801
msgid ""
3802
"This command shows a table of tag names and the revisions they reference."
3803
msgstr ""
3804
3805
#: bzrlib/builtins.py:5909
3806
msgid "Branch whose tags should be displayed."
3807
msgstr ""
3808
3809
#: bzrlib/builtins.py:5911
3810
msgid "Sort tags by different criteria."
3811
msgstr ""
3812
3813
#: bzrlib/builtins.py:5911
3814
msgid "Sorting"
3815
msgstr ""
3816
3817
#: bzrlib/builtins.py:5980
3818
msgid "Reconfigure the type of a bzr directory."
3819
msgstr ""
3820
3821
#: bzrlib/builtins.py:5982
3822
msgid "A target configuration must be specified."
3823
msgstr ""
3824
3825
#: bzrlib/builtins.py:5984
3826
msgid ""
3827
"For checkouts, the bind-to location will be auto-detected if not specified.\n"
3828
"The order of preference is\n"
3829
"1. For a lightweight checkout, the current bound location.\n"
3830
"2. For branches that used to be checkouts, the previously-bound location.\n"
3831
"3. The push location.\n"
3832
"4. The parent location.\n"
3833
"If none of these is available, --bind-to must be specified."
3834
msgstr ""
3835
3836
#: bzrlib/builtins.py:5998
3837
msgid "Tree type"
3838
msgstr ""
3839
3840
#: bzrlib/builtins.py:5999
3841
msgid "The relation between branch and tree."
3842
msgstr ""
3843
3844
#: bzrlib/builtins.py:6001
3845
msgid "Reconfigure to be an unbound branch with no working tree."
3846
msgstr ""
3847
3848
#: bzrlib/builtins.py:6002
3849
msgid "Reconfigure to be an unbound branch with a working tree."
3850
msgstr ""
3851
3852
#: bzrlib/builtins.py:6003
3853
msgid "Reconfigure to be a bound branch with a working tree."
3854
msgstr ""
3855
3856
#: bzrlib/builtins.py:6004
3857
msgid "Reconfigure to be a lightweight checkout (with no local history)."
3858
msgstr ""
3859
3860
#: bzrlib/builtins.py:6009
3861
msgid "Repository type"
3862
msgstr ""
3863
3864
#: bzrlib/builtins.py:6010
3865
msgid "Location fo the repository."
3866
msgstr ""
3867
3868
#: bzrlib/builtins.py:6012
3869
msgid ""
3870
"Reconfigure to be a standalone branch (i.e. stop using shared repository)."
3871
msgstr ""
3872
3873
#: bzrlib/builtins.py:6014
3874
msgid "Reconfigure to use a shared repository."
3875
msgstr ""
3876
3877
#: bzrlib/builtins.py:6018
3878
msgid "Trees in Repository"
3879
msgstr ""
3880
3881
#: bzrlib/builtins.py:6019
3882
msgid "Whether new branches in the repository have trees."
3883
msgstr ""
3884
3885
#: bzrlib/builtins.py:6021
3886
msgid ""
3887
"Reconfigure repository to create working trees on branches by default."
3888
msgstr ""
3889
3890
#: bzrlib/builtins.py:6023
3891
msgid ""
3892
"Reconfigure repository to not create working trees on branches by default."
3893
msgstr ""
3894
3895
#: bzrlib/builtins.py:6026
3896
msgid "Branch to bind checkout to."
3897
msgstr ""
3898
3899
#: bzrlib/builtins.py:6028
3900
msgid "Perform reconfiguration even if local changes will be lost."
3901
msgstr ""
3902
3903
#: bzrlib/builtins.py:6031
3904
msgid "Reconfigure a branch to be stacked on another branch."
3905
msgstr ""
3906
3907
#: bzrlib/builtins.py:6035
3908
msgid ""
3909
"Reconfigure a branch to be unstacked. This may require copying substantial "
3910
"data into it."
3911
msgstr ""
3912
3913
#: bzrlib/builtins.py:6045
3914
msgid "Can't use both --stacked-on and --unstacked"
3915
msgstr ""
3916
3917
#: bzrlib/builtins.py:6059
3918
msgid "No target configuration specified"
3919
msgstr ""
3920
3921
#: bzrlib/builtins.py:6094
3922
msgid "Set the branch of a checkout and update."
3923
msgstr ""
3924
3925
#: bzrlib/builtins.py:6096
3926
msgid ""
3927
"For lightweight checkouts, this changes the branch being referenced.\n"
3928
"For heavyweight checkouts, this checks that there are no local commits\n"
3929
"versus the current bound branch, then it makes the local branch a mirror\n"
3930
"of the new location and binds to it."
3931
msgstr ""
3932
3933
#: bzrlib/builtins.py:6101
3934
msgid ""
3935
"In both cases, the working tree is updated and uncommitted changes\n"
3936
"are merged. The user can commit or revert these as they desire."
3937
msgstr ""
3938
3939
#: bzrlib/builtins.py:6104
3940
msgid "Pending merges need to be committed or reverted before using switch."
3941
msgstr ""
3942
3943
#: bzrlib/builtins.py:6106
3944
msgid ""
3945
"The path to the branch to switch to can be specified relative to the parent\n"
3946
"directory of the current branch. For example, if you are currently in a\n"
3947
"checkout of /path/to/branch, specifying 'newbranch' will find a branch at\n"
3948
"/path/to/newbranch."
3949
msgstr ""
3950
3951
#: bzrlib/builtins.py:6111
3952
msgid ""
3953
"Bound branches use the nickname of its master branch unless it is set\n"
3954
"locally, in which case switching will update the local nickname to be\n"
3955
"that of the master."
3956
msgstr ""
3957
3958
#: bzrlib/builtins.py:6119
3959
msgid "Switch even if local commits will be lost."
3960
msgstr ""
3961
3962
#: bzrlib/builtins.py:6122
3963
msgid "Create the target branch from this one before switching to it."
3964
msgstr ""
3965
3966
#: bzrlib/builtins.py:6134
3967
msgid "You must supply either a revision or a location"
3968
msgstr ""
3969
3970
#: bzrlib/builtins.py:6145
3971
msgid "cannot create branch without source branch"
3972
msgstr ""
3973
3974
#: bzrlib/builtins.py:6209
3975
msgid "Manage filtered views."
3976
msgstr ""
3977
3978
#: bzrlib/builtins.py:6211
3979
msgid ""
3980
"Views provide a mask over the tree so that users can focus on\n"
3981
"a subset of a tree when doing their work. After creating a view,\n"
3982
"commands that support a list of files - status, diff, commit, etc -\n"
3983
"effectively have that list of files implicitly given each time.\n"
3984
"An explicit list of files can still be given but those files\n"
3985
"must be within the current view."
3986
msgstr ""
3987
3988
#: bzrlib/builtins.py:6218
3989
msgid ""
3990
"In most cases, a view has a short life-span: it is created to make\n"
3991
"a selected change and is deleted once that change is committed.\n"
3992
"At other times, you may wish to create one or more named views\n"
3993
"and switch between them."
3994
msgstr ""
3995
3996
#: bzrlib/builtins.py:6223
3997
msgid ""
3998
"To disable the current view without deleting it, you can switch to\n"
3999
"the pseudo view called ``off``. This can be useful when you need\n"
4000
"to see the whole tree for an operation or two (e.g. merge) but\n"
4001
"want to switch back to your view after that."
4002
msgstr ""
4003
4004
#: bzrlib/builtins.py:6228
4005
msgid ""
4006
":Examples:\n"
4007
" To define the current view::"
4008
msgstr ""
4009
4010
#: bzrlib/builtins.py:6231
4011
msgid " bzr view file1 dir1 ..."
4012
msgstr ""
4013
4014
#: bzrlib/builtins.py:6233
4015
msgid " To list the current view::"
4016
msgstr ""
4017
4018
#: bzrlib/builtins.py:6235
4019
msgid " bzr view"
4020
msgstr ""
4021
4022
#: bzrlib/builtins.py:6237
4023
msgid " To delete the current view::"
4024
msgstr ""
4025
4026
#: bzrlib/builtins.py:6239
4027
msgid " bzr view --delete"
4028
msgstr ""
4029
4030
#: bzrlib/builtins.py:6241
4031
msgid " To disable the current view without deleting it::"
4032
msgstr ""
4033
4034
#: bzrlib/builtins.py:6243
4035
msgid " bzr view --switch off"
4036
msgstr ""
4037
4038
#: bzrlib/builtins.py:6245
4039
msgid " To define a named view and switch to it::"
4040
msgstr ""
4041
4042
#: bzrlib/builtins.py:6247
4043
msgid " bzr view --name view-name file1 dir1 ..."
4044
msgstr ""
4045
4046
#: bzrlib/builtins.py:6249
4047
msgid " To list a named view::"
4048
msgstr ""
4049
4050
#: bzrlib/builtins.py:6251
4051
msgid " bzr view --name view-name"
4052
msgstr ""
4053
4054
#: bzrlib/builtins.py:6253
4055
msgid " To delete a named view::"
4056
msgstr ""
4057
4058
#: bzrlib/builtins.py:6255
4059
msgid " bzr view --name view-name --delete"
4060
msgstr ""
4061
4062
#: bzrlib/builtins.py:6257
4063
msgid " To switch to a named view::"
4064
msgstr ""
4065
4066
#: bzrlib/builtins.py:6259
4067
msgid " bzr view --switch view-name"
4068
msgstr ""
4069
4070
#: bzrlib/builtins.py:6261
4071
msgid " To list all views defined::"
4072
msgstr ""
4073
4074
#: bzrlib/builtins.py:6263
4075
msgid " bzr view --all"
4076
msgstr ""
4077
4078
#: bzrlib/builtins.py:6265
4079
msgid " To delete all views::"
4080
msgstr ""
4081
4082
#: bzrlib/builtins.py:6267
4083
msgid " bzr view --delete --all"
4084
msgstr ""
4085
4086
#: bzrlib/builtins.py:6274
4087
msgid "Apply list or delete action to all views."
4088
msgstr ""
4089
4090
#: bzrlib/builtins.py:6277
4091
msgid "Delete the view."
4092
msgstr ""
4093
4094
#: bzrlib/builtins.py:6280
4095
msgid "Name of the view to define, list or delete."
4096
msgstr ""
4097
4098
#: bzrlib/builtins.py:6284
4099
msgid "Name of the view to switch to."
4100
msgstr ""
4101
4102
#: bzrlib/builtins.py:6303
4103
msgid "Both --delete and a file list specified"
4104
msgstr ""
4105
4106
#: bzrlib/builtins.py:6306
4107
msgid "Both --delete and --switch specified"
4108
msgstr ""
4109
4110
#: bzrlib/builtins.py:6309
4111
msgid "Deleted all views.\n"
4112
msgstr ""
4113
4114
#: bzrlib/builtins.py:6311
4115
msgid "No current view to delete"
4116
msgstr ""
4117
4118
#: bzrlib/builtins.py:6314
4119
#, python-format
4120
msgid "Deleted '%s' view.\n"
4121
msgstr ""
4122
4123
#: bzrlib/builtins.py:6318
4124
msgid "Both --switch and a file list specified"
4125
msgstr ""
4126
4127
#: bzrlib/builtins.py:6321
4128
msgid "Both --switch and --all specified"
4129
msgstr ""
4130
4131
#: bzrlib/builtins.py:6324
4132
msgid "No current view to disable"
4133
msgstr ""
4134
4135
#: bzrlib/builtins.py:6326
4136
#, python-format
4137
msgid "Disabled '%s' view.\n"
4138
msgstr ""
4139
4140
#: bzrlib/builtins.py:6330 bzrlib/builtins.py:6352
4141
msgid "Using '{0}' view: {1}\n"
4142
msgstr ""
4143
4144
#: bzrlib/builtins.py:6333
4145
msgid "Views defined:\n"
4146
msgstr ""
4147
4148
#: bzrlib/builtins.py:6342
4149
msgid "No views defined.\n"
4150
msgstr ""
4151
4152
#: bzrlib/builtins.py:6349
4153
msgid "Cannot change the 'off' pseudo view"
4154
msgstr ""
4155
4156
#: bzrlib/builtins.py:6357
4157
msgid "No current view.\n"
4158
msgstr ""
4159
4160
#: bzrlib/builtins.py:6360
4161
msgid "'{0}' view is: {1}\n"
4162
msgstr ""
4163
4164
#: bzrlib/builtins.py:6380
4165
msgid " <no hooks installed>\n"
4166
msgstr ""
4167
4168
#: bzrlib/builtins.py:6384
4169
msgid "Remove a branch."
4170
msgstr ""
4171
4172
#: bzrlib/builtins.py:6386
4173
msgid ""
4174
"This will remove the branch from the specified location but \n"
4175
"will keep any working tree or repository in place."
4176
msgstr ""
4177
4178
#: bzrlib/builtins.py:6391
4179
msgid " Remove the branch at repo/trunk::"
4180
msgstr ""
4181
4182
#: bzrlib/builtins.py:6393
4183
msgid " bzr remove-branch repo/trunk"
4184
msgstr ""
4185
4186
#: bzrlib/builtins.py:6408
4187
msgid "Plaintext diff output."
4188
msgstr ""
4189
4190
#: bzrlib/builtins.py:6409
4191
msgid "Temporarily set aside some changes from the current tree."
4192
msgstr ""
4193
4194
#: bzrlib/builtins.py:6411
4195
msgid ""
4196
"Shelve allows you to temporarily put changes you've made \"on the shelf\",\n"
4197
"ie. out of the way, until a later time when you can bring them back from\n"
4198
"the shelf with the 'unshelve' command. The changes are stored alongside\n"
4199
"your working tree, and so they aren't propagated along with your branch nor\n"
4200
"will they survive its deletion."
4201
msgstr ""
4202
4203
#: bzrlib/builtins.py:6417
4204
msgid "If shelve --list is specified, previously-shelved changes are listed."
4205
msgstr ""
4206
4207
#: bzrlib/builtins.py:6419
4208
msgid ""
4209
"Shelve is intended to help separate several sets of changes that have\n"
4210
"been inappropriately mingled. If you just want to get rid of all changes\n"
4211
"and you don't need to restore them later, use revert. If you want to\n"
4212
"shelve all text changes at once, use shelve --all."
4213
msgstr ""
4214
4215
#: bzrlib/builtins.py:6424
4216
msgid ""
4217
"If filenames are specified, only the changes to those files will be\n"
4218
"shelved. Other files will be left untouched."
4219
msgstr ""
4220
4221
#: bzrlib/builtins.py:6427
4222
msgid ""
4223
"If a revision is specified, changes since that revision will be shelved."
4224
msgstr ""
4225
4226
#: bzrlib/builtins.py:6429
4227
msgid ""
4228
"You can put multiple items on the shelf, and by default, 'unshelve' will\n"
4229
"restore the most recently shelved changes."
4230
msgstr ""
4231
4232
#: bzrlib/builtins.py:6432
4233
msgid ""
4234
"For complicated changes, it is possible to edit the changes in a separate\n"
4235
"editor program to decide what the file remaining in the working copy\n"
4236
"should look like. To do this, add the configuration option"
4237
msgstr ""
4238
4239
#: bzrlib/builtins.py:6436
4240
msgid " change_editor = PROGRAM @new_path @old_path"
4241
msgstr ""
4242
4243
#: bzrlib/builtins.py:6438
4244
msgid ""
4245
"where @new_path is replaced with the path of the new version of the \n"
4246
"file and @old_path is replaced with the path of the old version of \n"
4247
"the file. The PROGRAM should save the new file with the desired \n"
4248
"contents of the file in the working tree.\n"
4249
" "
4250
msgstr ""
4251
4252
#: bzrlib/builtins.py:6450
4253
msgid "Shelve all changes."
4254
msgstr ""
4255
4256
#: bzrlib/builtins.py:6452
4257
msgid "Method to use for writing diffs."
4258
msgstr ""
4259
4260
#: bzrlib/builtins.py:6452
4261
msgid "writer"
4262
msgstr ""
4263
4264
#: bzrlib/builtins.py:6456
4265
msgid "List shelved changes."
4266
msgstr ""
4267
4268
#: bzrlib/builtins.py:6458
4269
msgid "Destroy removed changes instead of shelving them."
4270
msgstr ""
4271
4272
#: bzrlib/builtins.py:6487
4273
msgid "No shelved changes."
4274
msgstr ""
4275
4276
#: bzrlib/builtins.py:6498
4277
msgid "Restore shelved changes."
4278
msgstr ""
4279
4280
#: bzrlib/builtins.py:6500
4281
msgid ""
4282
"By default, the most recently shelved changes are restored. However if you\n"
4283
"specify a shelf by id those changes will be restored instead. This works\n"
4284
"best when the changes don't depend on each other."
4285
msgstr ""
4286
4287
#: bzrlib/builtins.py:6509
4288
msgid "The action to perform."
4289
msgstr ""
4290
4291
#: bzrlib/builtins.py:6509 bzrlib/conflicts.py:694
4292
msgid "action"
4293
msgstr ""
4294
4295
#: bzrlib/builtins.py:6511
4296
msgid "Apply changes and remove from the shelf."
4297
msgstr ""
4298
4299
#: bzrlib/builtins.py:6512
4300
msgid "Show changes, but do not apply or remove them."
4301
msgstr ""
4302
4303
#: bzrlib/builtins.py:6513
4304
msgid ""
4305
"Instead of unshelving the changes, show the diff that would result from "
4306
"unshelving."
4307
msgstr ""
4308
4309
#: bzrlib/builtins.py:6515
4310
msgid "Delete changes without applying them."
4311
msgstr ""
4312
4313
#: bzrlib/builtins.py:6516
4314
msgid "Apply changes but don't delete them."
4315
msgstr ""
4316
4317
#: bzrlib/builtins.py:6531
4318
msgid "Remove unwanted files from working tree."
4319
msgstr ""
4320
4321
#: bzrlib/builtins.py:6533
4322
msgid ""
4323
"By default, only unknown files, not ignored files, are deleted. Versioned\n"
4324
"files are never deleted."
4325
msgstr ""
4326
4327
#: bzrlib/builtins.py:6536
4328
msgid ""
4329
"Another class is 'detritus', which includes files emitted by bzr during\n"
4330
"normal operations and selftests. (The value of these files decreases with\n"
4331
"time.)"
4332
msgstr ""
4333
4334
#: bzrlib/builtins.py:6540
4335
msgid ""
4336
"If no options are specified, unknown files are deleted. Otherwise, option\n"
4337
"flags are respected, and may be combined."
4338
msgstr ""
4339
4340
#: bzrlib/builtins.py:6543
4341
msgid "To check what clean-tree will do, use --dry-run."
4342
msgstr ""
4343
4344
#: bzrlib/builtins.py:6546
4345
msgid "Delete all ignored files."
4346
msgstr ""
4347
4348
#: bzrlib/builtins.py:6547
4349
msgid ""
4350
"Delete conflict files, merge and revert backups, and failed selftest dirs."
4351
msgstr ""
4352
4353
#: bzrlib/builtins.py:6550
4354
msgid "Delete files unknown to bzr (default)."
4355
msgstr ""
4356
4357
#: bzrlib/builtins.py:6551
4358
msgid "Show files to delete instead of deleting them."
4359
msgstr ""
4360
4361
#: bzrlib/builtins.py:6553
4362
msgid "Do not prompt before deleting."
4363
msgstr ""
4364
4365
#: bzrlib/bundle/__init__.py:59
4366
msgid "A directory cannot be a bundle"
4367
msgstr ""
4368
4369
#: bzrlib/bundle/apply_bundle.py:40
4370
msgid "Install revisions"
4371
msgstr ""
4372
4373
#: bzrlib/bundle/commands.py:64
4374
msgid "--verbose requires a merge directive"
4375
msgstr ""
4376
4377
#: bzrlib/bundle/commands.py:67
4378
msgid "Bundle format not supported"
4379
msgstr ""
4380
4381
#: bzrlib/bundle/commands.py:77
4382
msgid "Records\n"
4383
msgstr ""
4384
4385
#: bzrlib/bundle/commands.py:81
4386
msgid "{0}: {1} ({2} multiparent)\n"
4387
msgstr ""
4388
4389
#: bzrlib/bundle/commands.py:83
4390
#, python-format
4391
msgid "unique files: %d\n"
4392
msgstr ""
4393
4394
#: bzrlib/bundle/commands.py:92
4395
msgid "Revisions\n"
4396
msgstr ""
4397
4398
#: bzrlib/bundle/commands.py:93
4399
#, python-format
4400
msgid "nicks: %s\n"
4401
msgstr ""
4402
4403
#: bzrlib/bundle/commands.py:95
4404
#, python-format
4405
msgid ""
4406
"committers: \n"
4407
"%s\n"
4408
msgstr ""
4409
4410
#: bzrlib/bundle/commands.py:103
4411
msgid "Decoded contents\n"
4412
msgstr ""
4413
4414
#: bzrlib/bundle/serializer/v4.py:327
4415
#, python-format
4416
msgid "Bundling %d revision."
4417
msgid_plural "Bundling %d revisions."
4418
msgstr[0] ""
4419
msgstr[1] ""
4420
4421
#: bzrlib/bzrdir.py:489
4422
msgid ""
4423
"making backup of {0}\n"
4424
" to {1}"
4425
msgstr ""
4426
4427
#: bzrlib/bzrdir.py:512
4428
msgid "renamed {0} to {1}"
4429
msgstr ""
4430
4431
#: bzrlib/bzrdir.py:1663
4432
#, python-format
4433
msgid ""
4434
"Source repository format does not support stacking, using format:\n"
4435
" %s"
4436
msgstr ""
4437
4438
#: bzrlib/bzrdir.py:1683
4439
#, python-format
4440
msgid ""
4441
"Source branch format does not support stacking, using format:\n"
4442
" %s"
4443
msgstr ""
4444
4445
#: bzrlib/bzrdir.py:1829
4446
msgid "starting repository conversion"
4447
msgstr ""
4448
4449
#: bzrlib/bzrdir.py:2058
4450
msgid "Using default stacking branch {0} at {1}"
4451
msgstr ""
4452
4453
#: bzrlib/check.py:108
4454
msgid "check"
4455
msgstr ""
4456
4457
#: bzrlib/check.py:110
4458
msgid "checking revisions"
4459
msgstr ""
4460
4461
#: bzrlib/check.py:112
4462
msgid "checking commit contents"
4463
msgstr ""
4464
4465
#: bzrlib/check.py:114
4466
msgid "checking file graphs"
4467
msgstr ""
4468
4469
#: bzrlib/check.py:118
4470
msgid "checking branches and trees"
4471
msgstr ""
4472
4473
#: bzrlib/check.py:205
4474
msgid "checked repository {0} format {1}"
4475
msgstr ""
4476
4477
#: bzrlib/check.py:208
4478
#, python-format
4479
msgid "%6d revisions"
4480
msgstr ""
4481
4482
#: bzrlib/check.py:209
4483
#, python-format
4484
msgid "%6d file-ids"
4485
msgstr ""
4486
4487
#: bzrlib/check.py:211
4488
#, python-format
4489
msgid "%6d unreferenced text versions"
4490
msgstr ""
4491
4492
#: bzrlib/check.py:215
4493
msgid "unreferenced version: {{{0}}} in {1}"
4494
msgstr ""
4495
4496
#: bzrlib/check.py:218
4497
#, python-format
4498
msgid "%6d revisions are missing inventory_sha1"
4499
msgstr ""
4500
4501
#: bzrlib/check.py:221
4502
#, python-format
4503
msgid "%6d revisions are mentioned but not present"
4504
msgstr ""
4505
4506
#: bzrlib/check.py:224
4507
#, python-format
4508
msgid "%6d ghost revisions"
4509
msgstr ""
4510
4511
#: bzrlib/check.py:229
4512
#, python-format
4513
msgid "%6d revisions missing parents in ancestry"
4514
msgstr ""
4515
4516
#: bzrlib/check.py:233
4517
#, python-format
4518
msgid " %s should be in the ancestry for:"
4519
msgstr ""
4520
4521
#: bzrlib/check.py:237
4522
#, python-format
4523
msgid "%6d inconsistent parents"
4524
msgstr ""
4525
4526
#: bzrlib/check.py:241
4527
msgid " * {0} version {1} has parents {2!r} but should have {3!r}"
4528
msgstr ""
4529
4530
#: bzrlib/check.py:247
4531
#, python-format
4532
msgid "%6d revisions have incorrect parents in the revision index"
4533
msgstr ""
4534
4535
#: bzrlib/check.py:253
4536
msgid " {0} has wrong parents in index: {1!r} should be {2!r}"
4537
msgstr ""
4538
4539
#: bzrlib/check.py:267
4540
msgid "Mismatched internal revid {{{0}}} and index revid {{{1}}}"
4541
msgstr ""
4542
4543
#: bzrlib/check.py:296
4544
msgid ""
4545
"Multiple expected sha1s for {0}. {{{1}}} expects {{{2}}}, {{{3}}} expects "
4546
"{{{4}}}"
4547
msgstr ""
4548
4549
#: bzrlib/check.py:354
4550
#, python-format
4551
msgid "Checking branch at '%s'."
4552
msgstr ""
4553
4554
#: bzrlib/check.py:374
4555
#, python-format
4556
msgid "Checking working tree at '%s'."
4557
msgstr ""
4558
4559
#: bzrlib/check.py:427 bzrlib/check.py:441
4560
msgid "No branch found at specified location."
4561
msgstr ""
4562
4563
#: bzrlib/check.py:429 bzrlib/check.py:439
4564
msgid "No working tree found at specified location."
4565
msgstr ""
4566
4567
#: bzrlib/check.py:432
4568
#, python-format
4569
msgid "Checking repository at '%s'."
4570
msgstr ""
4571
4572
#: bzrlib/check.py:443
4573
msgid "No repository found at specified location."
4574
msgstr ""
4575
4576
#: bzrlib/clean_tree.py:63
4577
msgid "Nothing to delete."
4578
msgstr ""
4579
4580
#: bzrlib/clean_tree.py:68
4581
msgid "Are you sure you wish to delete these"
4582
msgstr ""
4583
4584
#: bzrlib/clean_tree.py:70
4585
msgid "Canceled"
4586
msgstr ""
4587
4588
#: bzrlib/clean_tree.py:107
4589
#, python-format
4590
msgid "unable to remove %s"
4591
msgstr ""
4592
4593
#: bzrlib/clean_tree.py:111
4594
msgid "deleting paths:"
4595
msgstr ""
4596
4597
#: bzrlib/clean_tree.py:125
4598
msgid "unable to remove \"{0}\": {1}."
4599
msgstr ""
4600
4601
#: bzrlib/clean_tree.py:130
4602
msgid "No files deleted."
4603
msgstr ""
4604
4605
#: bzrlib/cmd_version_info.py:47
4606
msgid "No known version info format {0}. Supported types are: {1}"
4607
msgstr ""
4608
4609
#: bzrlib/cmd_version_info.py:52
4610
msgid "Version info in Custom template-based format."
4611
msgstr ""
4612
4613
#: bzrlib/cmd_version_info.py:52
4614
msgid "Version info in Python format."
4615
msgstr ""
4616
4617
#: bzrlib/cmd_version_info.py:52
4618
msgid "Version info in RIO (simple text) format (default)."
4619
msgstr ""
4620
4621
#: bzrlib/cmd_version_info.py:53
4622
msgid "Show version information about this tree."
4623
msgstr ""
4624
4625
#: bzrlib/cmd_version_info.py:55
4626
msgid ""
4627
"You can use this command to add information about version into\n"
4628
"source code of an application. The output can be in one of the\n"
4629
"supported formats or in a custom format based on a template."
4630
msgstr ""
4631
4632
#: bzrlib/cmd_version_info.py:59 en/help_topics/configuration.txt:700
4633
#: en/help_topics/configuration.txt:710
4634
msgid "For example::"
4635
msgstr ""
4636
4637
#: bzrlib/cmd_version_info.py:61
4638
msgid ""
4639
" bzr version-info --custom \\\n"
4640
" --template=\"#define VERSION_INFO \\\"Project 1.2.3 (r{revno})\\\"\\n\""
4641
msgstr ""
4642
4643
#: bzrlib/cmd_version_info.py:64
4644
msgid ""
4645
"will produce a C header file with formatted string containing the\n"
4646
"current revision number. Other supported variables in templates are:"
4647
msgstr ""
4648
4649
#: bzrlib/cmd_version_info.py:67
4650
msgid ""
4651
" * {date} - date of the last revision\n"
4652
" * {build_date} - current date\n"
4653
" * {revno} - revision number\n"
4654
" * {revision_id} - revision id\n"
4655
" * {branch_nick} - branch nickname\n"
4656
" * {clean} - 0 if the source tree contains uncommitted changes,\n"
4657
" otherwise 1"
4658
msgstr ""
4659
4660
#: bzrlib/cmd_version_info.py:77
4661
msgid "Select the output format."
4662
msgstr ""
4663
4664
#: bzrlib/cmd_version_info.py:81
4665
msgid "Include all possible information."
4666
msgstr ""
4667
4668
#: bzrlib/cmd_version_info.py:82
4669
msgid "Check if tree is clean."
4670
msgstr ""
4671
4672
#: bzrlib/cmd_version_info.py:84
4673
msgid "Include the revision-history."
4674
msgstr ""
4675
4676
#: bzrlib/cmd_version_info.py:86
4677
msgid "Include the last revision for each file."
4678
msgstr ""
4679
4680
#: bzrlib/cmd_version_info.py:87
4681
msgid "Template for the output."
4682
msgstr ""
4683
4684
#: bzrlib/cmd_version_info.py:101
4685
msgid "bzr version-info --revision takes exactly one revision specifier"
4686
msgstr ""
4687
4688
#: bzrlib/commands.py:228
4689
#, python-format
4690
msgid "unknown command \"%s\""
4691
msgstr ""
4692
4693
#: bzrlib/commands.py:475
4694
msgid "No help for this command."
4695
msgstr ""
4696
4697
#: bzrlib/commands.py:488
4698
#, python-format
4699
msgid ":Purpose: %s\n"
4700
msgstr ""
4701
4702
#: bzrlib/commands.py:490
4703
#, python-format
4704
msgid ""
4705
":Usage:\n"
4706
"%s\n"
4707
msgstr ""
4708
4709
#: bzrlib/commands.py:492
4710
#, python-format
4711
msgid ":Usage: %s\n"
4712
msgstr ""
4713
4714
#: bzrlib/commands.py:511
4715
#, python-format
4716
msgid ":Options:%s"
4717
msgstr ""
4718
4719
#: bzrlib/commands.py:522
4720
#, python-format
4721
msgid ""
4722
":Description:\n"
4723
" %s\n"
4724
"\n"
4725
msgstr ""
4726
4727
#: bzrlib/commands.py:532
4728
#, python-format
4729
msgid ""
4730
"See bzr help %s for more details and examples.\n"
4731
"\n"
4732
msgstr ""
4733
4734
#: bzrlib/commands.py:537
4735
msgid ":Aliases: "
4736
msgstr ""
4737
4738
#: bzrlib/commands.py:541
4739
#, python-format
4740
msgid ":From: plugin \"%s\"\n"
4741
msgstr ""
4742
4743
#: bzrlib/commands.py:553
4744
msgid ":doc:`{0} <{1}-help>`"
4745
msgstr ""
4746
4747
#: bzrlib/commands.py:557
4748
#, python-format
4749
msgid ":See also: %s"
4750
msgstr ""
4751
4752
#: bzrlib/commands.py:815 bzrlib/gpg.py:324
4753
msgid "Only ASCII permitted in option names"
4754
msgstr ""
4755
4756
#: bzrlib/commands.py:840 bzrlib/commands.py:848
4757
msgid "command {0!r} needs one or more {1}"
4758
msgstr ""
4759
4760
#: bzrlib/commands.py:857
4761
msgid "command {0!r} requires argument {1}"
4762
msgstr ""
4763
4764
#: bzrlib/commands.py:864
4765
msgid "extra argument to command {0}: {1}"
4766
msgstr ""
4767
4768
#: bzrlib/commands.py:961
4769
#, python-format
4770
msgid "Profile data written to \"%s\"."
4771
msgstr ""
4772
4773
#: bzrlib/commit.py:117 bzrlib/commit.py:740
4774
msgid "added"
4775
msgstr ""
4776
4777
#: bzrlib/commit.py:117 bzrlib/commit.py:748
4778
msgid "modified"
4779
msgstr ""
4780
4781
#: bzrlib/commit.py:131
4782
#, python-format
4783
msgid "Committing%s"
4784
msgstr ""
4785
4786
#: bzrlib/commit.py:134
4787
#, python-format
4788
msgid "Committed revision %d."
4789
msgstr ""
4790
4791
#: bzrlib/commit.py:143
4792
#, python-format
4793
msgid "deleted %s"
4794
msgstr ""
4795
4796
#: bzrlib/commit.py:146
4797
#, python-format
4798
msgid "missing %s"
4799
msgstr ""
4800
4801
#: bzrlib/commit.py:511
4802
msgid ""
4803
"Conflicting tags in bound branch:\n"
4804
"{0}"
4805
msgstr ""
4806
4807
#: bzrlib/commit.py:742
4808
msgid "renamed"
4809
msgstr ""
4810
4811
#: bzrlib/commit.py:977
4812
msgid "unchanged"
4813
msgstr ""
4814
4815
#: bzrlib/commit.py:999
4816
msgid "{0} [{1}] - Stage"
4817
msgstr ""
4818
4819
#: bzrlib/commit.py:1002
4820
#, python-format
4821
msgid "%s - Stage"
4822
msgstr ""
4823
4824
#: bzrlib/commit_signature_commands.py:36
4825
msgid "Sign all commits by a given committer."
4826
msgstr ""
4827
4828
#: bzrlib/commit_signature_commands.py:38
4829
msgid ""
4830
"If location is not specified the local tree is used.\n"
4831
"If committer is not specified the default committer is used."
4832
msgstr ""
4833
4834
#: bzrlib/commit_signature_commands.py:41
4835
msgid "This does not sign commits that already have signatures."
4836
msgstr ""
4837
4838
#: bzrlib/commit_signature_commands.py:49
4839
msgid ""
4840
"Don't actually sign anything, just print the revisions that would be signed."
4841
msgstr ""
4842
4843
#: bzrlib/commit_signature_commands.py:103
4844
msgid "Verify all commit signatures."
4845
msgstr ""
4846
4847
#: bzrlib/commit_signature_commands.py:105
4848
msgid ""
4849
"Verifies that all commits in the branch are signed by known GnuPG keys."
4850
msgstr ""
4851
4852
#: bzrlib/commit_signature_commands.py:110
4853
msgid ""
4854
"Comma separated list of GPG key patterns which are acceptable for "
4855
"verification."
4856
msgstr ""
4857
4858
#: bzrlib/commit_signature_commands.py:147
4859
msgid "Cannot verify a range of non-revision-history revisions"
4860
msgstr ""
4861
4862
#: bzrlib/commit_signature_commands.py:168
4863
msgid "All commits signed with verifiable keys"
4864
msgstr ""
4865
4866
#: bzrlib/config.py:475
4867
msgid "Invalid config value for \"{0}\" value {1!r} is not an SI unit."
4868
msgstr ""
4869
4870
#: bzrlib/config.py:2499
4871
msgid "{0} is not an SI unit."
4872
msgstr ""
4873
4874
#: bzrlib/config.py:2956
4875
msgid ""
4876
"Option {0} in section {1} of {2} was changed from {3} to {4}. The {5} value "
4877
"will be saved."
4878
msgstr ""
4879
4880
#: bzrlib/config.py:3100
4881
#, python-format
4882
msgid "Invalid '%s', should be of the form 'name=value'"
4883
msgstr ""
4884
4885
#: bzrlib/config.py:3969
4886
msgid "Display, set or remove a configuration option."
4887
msgstr ""
4888
4889
#: bzrlib/config.py:3971
4890
msgid "Display the active value for a given option."
4891
msgstr ""
4892
4893
#: bzrlib/config.py:3973
4894
msgid ""
4895
"If --all is specified, NAME is interpreted as a regular expression and all\n"
4896
"matching options are displayed mentioning their scope. The active value\n"
4897
"that bzr will take into account is the first one displayed for each option."
4898
msgstr ""
4899
4900
#: bzrlib/config.py:3977
4901
msgid "If no NAME is given, --all .* is implied."
4902
msgstr ""
4903
4904
#: bzrlib/config.py:3979
4905
msgid ""
4906
"Setting a value is achieved by using name=value without spaces. The value\n"
4907
"is set in the most relevant scope and can be checked by displaying the\n"
4908
"option again."
4909
msgstr ""
4910
4911
#: bzrlib/config.py:3991
4912
msgid "Reduce the scope to the specified configuration file."
4913
msgstr ""
4914
4915
#: bzrlib/config.py:3995
4916
msgid "Display all the defined values for the matching options."
4917
msgstr ""
4918
4919
#: bzrlib/config.py:3997
4920
msgid "Remove the option from the configuration file."
4921
msgstr ""
4922
4923
#: bzrlib/conflicts.py:50
4924
msgid "List files with conflicts."
4925
msgstr ""
4926
4927
#: bzrlib/conflicts.py:57
4928
msgid ""
4929
"Conflicts normally are listed as short, human-readable messages. If --text\n"
4930
"is supplied, the pathnames of files with text conflicts are listed,\n"
4931
"instead. (This is useful for editing all files with text conflicts.)"
4932
msgstr ""
4933
4934
#: bzrlib/conflicts.py:61
4935
msgid "Use bzr resolve when you have fixed a problem."
4936
msgstr ""
4937
4938
#: bzrlib/conflicts.py:66
4939
msgid "List paths of files with text conflicts."
4940
msgstr ""
4941
4942
#: bzrlib/conflicts.py:85
4943
msgid "Marks the conflict as resolved."
4944
msgstr ""
4945
4946
#: bzrlib/conflicts.py:88
4947
msgid "Resolve the conflict preserving the version in the working tree."
4948
msgstr ""
4949
4950
#: bzrlib/conflicts.py:91
4951
msgid "Resolve the conflict taking the merged version into account."
4952
msgstr ""
4953
4954
#: bzrlib/conflicts.py:98
4955
msgid "How to resolve the conflict."
4956
msgstr ""
4957
4958
#: bzrlib/conflicts.py:104
4959
msgid "Mark a conflict as resolved."
4960
msgstr ""
4961
4962
#: bzrlib/conflicts.py:111
4963
msgid ""
4964
"Once you have fixed a problem, use \"bzr resolve\" to automatically mark\n"
4965
"text conflicts as fixed, \"bzr resolve FILE\" to mark a specific conflict "
4966
"as\n"
4967
"resolved, or \"bzr resolve --all\" to mark all conflicts as resolved."
4968
msgstr ""
4969
4970
#: bzrlib/conflicts.py:119
4971
msgid "Resolve all conflicts in this tree."
4972
msgstr ""
4973
4974
#: bzrlib/conflicts.py:126
4975
msgid "If --all is specified, no FILE may be provided"
4976
msgstr ""
4977
4978
#: bzrlib/conflicts.py:151
4979
#, python-format
4980
msgid "%d conflict auto-resolved."
4981
msgid_plural "%d conflicts auto-resolved."
4982
msgstr[0] ""
4983
msgstr[1] ""
4984
4985
#: bzrlib/conflicts.py:154
4986
msgid "Remaining conflicts:"
4987
msgstr ""
4988
4989
#: bzrlib/conflicts.py:159
4990
msgid "All conflicts resolved."
4991
msgstr ""
4992
4993
#: bzrlib/conflicts.py:168
4994
msgid "{0} conflict resolved, {1} remaining"
4995
msgid_plural "{0} conflicts resolved, {1} remaining"
4996
msgstr[0] ""
4997
msgstr[1] ""
4998
4999
#: bzrlib/controldir.py:698
5000
msgid "{0} is{1} redirected to {2}"
5001
msgstr ""
5002
5003
#: bzrlib/diff.py:399
5004
#, python-format
5005
msgid "*** Ignoring files outside view. View is %s"
5006
msgstr ""
5007
5008
#: bzrlib/errors.py:157
5009
msgid "The tree builder is already building a tree."
5010
msgstr ""
5011
5012
#: bzrlib/errors.py:178
5013
msgid "The dirstate file (%(state)s) appears to be corrupt: %(msg)s"
5014
msgstr ""
5015
5016
#: bzrlib/errors.py:197
5017
msgid ""
5018
"The API for \"%(api)s\" is not compatible with \"%(wanted)s\". It supports "
5019
"versions \"%(minimum)s\" to \"%(current)s\"."
5020
msgstr ""
5021
5022
#: bzrlib/errors.py:209
5023
msgid "The transport '%(transport)s' is only accessible within this process."
5024
msgstr ""
5025
5026
#: bzrlib/errors.py:227
5027
msgid "Invalid revision number %(revno)s"
5028
msgstr ""
5029
5030
#: bzrlib/errors.py:236
5031
msgid "Invalid revision-id {%(revision_id)s} in %(branch)s"
5032
msgstr ""
5033
5034
#: bzrlib/errors.py:247
5035
msgid "Reserved revision-id {%(revision_id)s}"
5036
msgstr ""
5037
5038
#: bzrlib/errors.py:261
5039
msgid "There is no public branch set for \"%(branch_url)s\"."
5040
msgstr ""
5041
5042
#: bzrlib/errors.py:271
5043
msgid ""
5044
"No help could be found for '%(topic)s'. Please use 'bzr help topics' to "
5045
"obtain a list of topics."
5046
msgstr ""
5047
5048
#: bzrlib/errors.py:280
5049
msgid "The file id \"%(file_id)s\" is not present in the tree %(tree)s."
5050
msgstr ""
5051
5052
#: bzrlib/errors.py:290
5053
msgid ""
5054
"The file id \"%(file_id)s\" is not present in the repository %(repository)r"
5055
msgstr ""
5056
5057
#: bzrlib/errors.py:299
5058
msgid "The branch '%(branch)s' is not stacked."
5059
msgstr ""
5060
5061
#: bzrlib/errors.py:313
5062
msgid "No WorkingTree exists for \"%(base)s\"."
5063
msgstr ""
5064
5065
#: bzrlib/errors.py:322
5066
msgid "Not currently building a tree."
5067
msgstr ""
5068
5069
#: bzrlib/errors.py:327
5070
msgid "%(url)s is not a local path."
5071
msgstr ""
5072
5073
#: bzrlib/errors.py:355
5074
msgid "%(not_locked)r is not write locked but needs to be."
5075
msgstr ""
5076
5077
#: bzrlib/errors.py:363
5078
msgid "Error in command line options"
5079
msgstr ""
5080
5081
#: bzrlib/errors.py:368
5082
msgid "%(value)s is not an index of type %(_type)s."
5083
msgstr ""
5084
5085
#: bzrlib/errors.py:378
5086
msgid "Error in data for index %(value)s."
5087
msgstr ""
5088
5089
#: bzrlib/errors.py:387
5090
msgid "The key '%(key)s' is already in index '%(index)s'."
5091
msgstr ""
5092
5093
#: bzrlib/errors.py:397
5094
msgid "The key '%(key)s' is not a valid key."
5095
msgstr ""
5096
5097
#: bzrlib/errors.py:406
5098
msgid "Could not parse options for index %(value)s."
5099
msgstr ""
5100
5101
#: bzrlib/errors.py:415
5102
msgid "The value '%(value)s' is not a valid value."
5103
msgstr ""
5104
5105
#: bzrlib/errors.py:443
5106
msgid "Generic path error: %(path)r%(extra)s)"
5107
msgstr ""
5108
5109
#: bzrlib/errors.py:456
5110
msgid "No such file: %(path)r%(extra)s"
5111
msgstr ""
5112
5113
#: bzrlib/errors.py:461
5114
msgid "File exists: %(path)r%(extra)s"
5115
msgstr ""
5116
5117
#: bzrlib/errors.py:467
5118
msgid ""
5119
"Could not rename %(source)s => %(dest)s because both files exist. (Use --"
5120
"after to tell bzr about a rename that has already happened)%(extra)s"
5121
msgstr ""
5122
5123
#: bzrlib/errors.py:483
5124
msgid "\"%(path)s\" is not a directory %(extra)s"
5125
msgstr ""
5126
5127
#: bzrlib/errors.py:488
5128
msgid "\"%(path)s\" is not in the working directory %(extra)s"
5129
msgstr ""
5130
5131
#: bzrlib/errors.py:493
5132
msgid "Directory not empty: \"%(path)s\"%(extra)s"
5133
msgstr ""
5134
5135
#: bzrlib/errors.py:498
5136
msgid "Hard-linking \"%(path)s\" is not supported"
5137
msgstr ""
5138
5139
#: bzrlib/errors.py:513
5140
msgid "Device or resource busy: \"%(path)s\"%(extra)s"
5141
msgstr ""
5142
5143
#: bzrlib/errors.py:518
5144
msgid "Permission denied: \"%(path)s\"%(extra)s"
5145
msgstr ""
5146
5147
#: bzrlib/errors.py:523
5148
msgid "Invalid url supplied to transport: \"%(path)s\"%(extra)s"
5149
msgstr ""
5150
5151
#: bzrlib/errors.py:528
5152
msgid "Invalid URL join request: %(reason)s: %(base)r + %(join_args)r"
5153
msgstr ""
5154
5155
#: bzrlib/errors.py:539
5156
msgid "URLs differ by more than path: %(from_)r and %(to)r"
5157
msgstr ""
5158
5159
#: bzrlib/errors.py:561
5160
msgid "The %(type)s hook '%(hook)s' is unknown in this version of bzrlib."
5161
msgstr ""
5162
5163
#: bzrlib/errors.py:571
5164
msgid "Unsupported protocol for url \"%(path)s\"%(extra)s"
5165
msgstr ""
5166
5167
#: bzrlib/errors.py:579
5168
msgid ""
5169
"The branch '%(url)s'(%(format)s) is not a stackable format. You will need to "
5170
"upgrade the branch to permit branch stacking."
5171
msgstr ""
5172
5173
#: bzrlib/errors.py:590
5174
msgid "The branch '%(branch_url)s' cannot be stacked on '%(target_url)s'."
5175
msgstr ""
5176
5177
#: bzrlib/errors.py:600
5178
msgid ""
5179
"The repository '%(url)s'(%(format)s) is not a stackable format. You will "
5180
"need to upgrade the repository to permit branch stacking."
5181
msgstr ""
5182
5183
#: bzrlib/errors.py:611
5184
msgid "Error reading from %(path)r."
5185
msgstr ""
5186
5187
#: bzrlib/errors.py:630
5188
msgid "Path \"%(path)s\" is not a child of path \"%(base)s\"%(extra)s"
5189
msgstr ""
5190
5191
#: bzrlib/errors.py:646
5192
msgid "Path \"%(path)s\" is not unicode normalized"
5193
msgstr ""
5194
5195
#: bzrlib/errors.py:654
5196
msgid "Not a branch: \"%(path)s\"%(detail)s."
5197
msgstr ""
5198
5199
#: bzrlib/errors.py:696
5200
msgid "No submit branch available for branch \"%(path)s\""
5201
msgstr ""
5202
5203
#: bzrlib/errors.py:705
5204
msgid "Already a branch: \"%(path)s\"."
5205
msgstr ""
5206
5207
#: bzrlib/errors.py:711
5208
msgid ""
5209
"Directory contains a branch, but no working tree (use bzr checkout if you "
5210
"wish to build a working tree): \"%(path)s\""
5211
msgstr ""
5212
5213
#: bzrlib/errors.py:716
5214
msgid ""
5215
"\"%(function)s\" called on an AtomicFile after it was closed: \"%(path)s\""
5216
msgstr ""
5217
5218
#: bzrlib/errors.py:726
5219
msgid ""
5220
"Parent not accessible given base \"%(base)s\" and relative path \"%(path)s\""
5221
msgstr ""
5222
5223
#: bzrlib/errors.py:736
5224
msgid "No repository present: \"%(path)s\""
5225
msgstr ""
5226
5227
#: bzrlib/errors.py:743
5228
msgid ""
5229
"Unsupported branch format: %(format)s\n"
5230
"Please run 'bzr upgrade'"
5231
msgstr ""
5232
5233
#: bzrlib/errors.py:749
5234
msgid "Unknown %(kind)s format: %(format)r"
5235
msgstr ""
5236
5237
#: bzrlib/errors.py:758
5238
msgid "Format %(format)s is not compatible with .bzr version %(bzrdir)s."
5239
msgstr ""
5240
5241
#: bzrlib/errors.py:768
5242
msgid "Parse error on line %(lineno)d of %(format)s format: %(line)s"
5243
msgstr ""
5244
5245
#: bzrlib/errors.py:783
5246
msgid ""
5247
"%(target)s\n"
5248
"is not compatible with\n"
5249
"%(source)s\n"
5250
"%(details)s"
5251
msgstr ""
5252
5253
#: bzrlib/errors.py:799
5254
msgid "Revision is not compatible with %(repo_format)s"
5255
msgstr ""
5256
5257
#: bzrlib/errors.py:809
5258
msgid "%(context_info)s%(path)s is already versioned."
5259
msgstr ""
5260
5261
#: bzrlib/errors.py:830
5262
msgid "%(context_info)s%(path)s is not versioned."
5263
msgstr ""
5264
5265
#: bzrlib/errors.py:851
5266
msgid "Path(s) are not versioned: %(paths_as_string)s"
5267
msgstr ""
5268
5269
#: bzrlib/errors.py:862
5270
msgid "Path(s) do not exist: %(paths_as_string)s%(extra)s"
5271
msgstr ""
5272
5273
#: bzrlib/errors.py:881
5274
msgid "Cannot operate on \"%(filename)s\" of unsupported kind \"%(kind)s\""
5275
msgstr ""
5276
5277
#: bzrlib/errors.py:889
5278
msgid ""
5279
"Filename %(filename)r is not valid in your current filesystem encoding "
5280
"%(fs_encoding)s"
5281
msgstr ""
5282
5283
#: bzrlib/errors.py:900
5284
msgid "Cannot operate on \"%(filename)s\" because it is a control file"
5285
msgstr ""
5286
5287
#: bzrlib/errors.py:918
5288
msgid "The lock for '%(lock_description)s' is in use and cannot be broken."
5289
msgstr ""
5290
5291
#: bzrlib/errors.py:957
5292
msgid "Cannot lock %(lock)s: %(why)s"
5293
msgstr ""
5294
5295
#: bzrlib/errors.py:967
5296
msgid ""
5297
"A transaction related operation was attempted after the transaction finished."
5298
msgstr ""
5299
5300
#: bzrlib/errors.py:994
5301
msgid "Cannot lock: transport is read only: %(transport)s"
5302
msgstr ""
5303
5304
#: bzrlib/errors.py:1002
5305
msgid "Could not acquire lock \"%(lock)s\": %(msg)s"
5306
msgstr ""
5307
5308
#: bzrlib/errors.py:1013
5309
msgid ""
5310
"Lock was broken while still open: %(lock)s - check storage consistency!"
5311
msgstr ""
5312
5313
#: bzrlib/errors.py:1024
5314
msgid ""
5315
"Lock was released and re-acquired before being broken: %(lock)s: held by "
5316
"%(holder)r, wanted to break %(target)r"
5317
msgstr ""
5318
5319
#: bzrlib/errors.py:1036
5320
msgid ""
5321
"Lock is apparently held, but corrupted: %(corruption_info)s\n"
5322
"Use 'bzr break-lock' to clear it"
5323
msgstr ""
5324
5325
#: bzrlib/errors.py:1049
5326
msgid "Lock not held: %(lock)s"
5327
msgstr ""
5328
5329
#: bzrlib/errors.py:1078
5330
msgid "No changes to commit"
5331
msgstr ""
5332
5333
#: bzrlib/errors.py:1083
5334
msgid ""
5335
"Selected-file commit of merges is not supported yet: files %(files_str)s"
5336
msgstr ""
5337
5338
#: bzrlib/errors.py:1093
5339
msgid ""
5340
"Excluding paths during commit is not supported by repository at "
5341
"%(repository)r."
5342
msgstr ""
5343
5344
#: bzrlib/errors.py:1102
5345
msgid ""
5346
"The specified commit message contains characters unsupported by the current "
5347
"encoding."
5348
msgstr ""
5349
5350
#: bzrlib/errors.py:1108
5351
msgid "Upgrade URL cannot work with readonly URLs."
5352
msgstr ""
5353
5354
#: bzrlib/errors.py:1113
5355
msgid "The branch format %(format)s is already at the most recent format."
5356
msgstr ""
5357
5358
#: bzrlib/errors.py:1136
5359
msgid "Option --change does not accept revision ranges"
5360
msgstr ""
5361
5362
#: bzrlib/errors.py:1141
5363
msgid "No namespace registered for string: %(spec)r"
5364
msgstr ""
5365
5366
#: bzrlib/errors.py:1160
5367
msgid ""
5368
"Requested revision: '%(spec)s' does not exist in branch: "
5369
"%(branch_url)s%(extra)s"
5370
msgstr ""
5371
5372
#: bzrlib/errors.py:1174
5373
msgid ""
5374
"Operation denied because it would change the main history, which is not "
5375
"permitted by the append_revisions_only setting on branch \"%(location)s\"."
5376
msgstr ""
5377
5378
#: bzrlib/errors.py:1185
5379
msgid ""
5380
"These branches have diverged. Use the missing command to see how.\n"
5381
"Use the merge command to reconcile them."
5382
msgstr ""
5383
5384
#: bzrlib/errors.py:1205
5385
msgid ""
5386
"Branches have no common ancestor, and no merge base revision was specified."
5387
msgstr ""
5388
5389
#: bzrlib/errors.py:1211
5390
msgid ""
5391
"Selected merge cannot perform reverse cherrypicks. Try merge3 or diff3."
5392
msgstr ""
5393
5394
#: bzrlib/errors.py:1217
5395
msgid "Revisions have no common ancestor: %(revision_a)s %(revision_b)s"
5396
msgstr ""
5397
5398
#: bzrlib/errors.py:1226
5399
msgid ""
5400
"Revisions are not derived from the same root: %(revision_a)s %(revision_b)s."
5401
msgstr ""
5402
5403
#: bzrlib/errors.py:1235
5404
msgid "Revision %(rev_id)s is not an ancestor of %(not_ancestor_id)s"
5405
msgstr ""
5406
5407
#: bzrlib/errors.py:1244
5408
msgid "Branch %(branch)s has no commits."
5409
msgstr ""
5410
5411
#: bzrlib/errors.py:1262
5412
msgid ""
5413
"Bound branch %(branch)s is out of date with master branch "
5414
"%(master)s.%(extra_help)s"
5415
msgstr ""
5416
5417
#: bzrlib/errors.py:1274
5418
msgid ""
5419
"Cannot commit to branch %(branch)s. It is bound to %(master)s, which is "
5420
"bound to %(remote)s."
5421
msgstr ""
5422
5423
#: bzrlib/errors.py:1286
5424
msgid "Cannot pull --overwrite to a branch which is bound %(branch)s"
5425
msgstr ""
5426
5427
#: bzrlib/errors.py:1295
5428
msgid ""
5429
"Unable to connect to target of bound branch %(branch)s => %(target)s: "
5430
"%(error)s"
5431
msgstr ""
5432
5433
#: bzrlib/errors.py:1307
5434
msgid "Error in processing weave: %(msg)s"
5435
msgstr ""
5436
5437
#: bzrlib/errors.py:1316
5438
msgid "Revision {%(revision_id)s} already present in %(weave)s"
5439
msgstr ""
5440
5441
#: bzrlib/errors.py:1327
5442
msgid "Revision {%(revision_id)s} not present in %(weave)s"
5443
msgstr ""
5444
5445
#: bzrlib/errors.py:1337
5446
msgid "Weave invariant violated: %(what)s"
5447
msgstr ""
5448
5449
#: bzrlib/errors.py:1346
5450
msgid "Parents are mismatched between two revisions. %(msg)s"
5451
msgstr ""
5452
5453
#: bzrlib/errors.py:1368
5454
msgid ""
5455
"Weaves differ on text content. Revision: {%(revision_id)s}, %(weave_a)s, "
5456
"%(weave_b)s"
5457
msgstr ""
5458
5459
#: bzrlib/errors.py:1380
5460
msgid "Versioned file error"
5461
msgstr ""
5462
5463
#: bzrlib/errors.py:1385
5464
msgid "Revision {%(revision_id)s} not present in \"%(file_id)s\"."
5465
msgstr ""
5466
5467
#: bzrlib/errors.py:1395
5468
msgid "Revision {%(revision_id)s} already present in \"%(file_id)s\"."
5469
msgstr ""
5470
5471
#: bzrlib/errors.py:1405
5472
msgid "Text did not match its checksum: %(msg)s"
5473
msgstr ""
5474
5475
#: bzrlib/errors.py:1531
5476
msgid "Export format %(format)r not supported"
5477
msgstr ""
5478
5479
#: bzrlib/errors.py:1540
5480
msgid "Transport error: %(msg)s %(orig_error)s"
5481
msgstr ""
5482
5483
#: bzrlib/errors.py:1566
5484
msgid "Generic bzr smart protocol error: %(details)s"
5485
msgstr ""
5486
5487
#: bzrlib/errors.py:1574
5488
msgid "Received bad protocol version marker: %(marker)r"
5489
msgstr ""
5490
5491
#: bzrlib/errors.py:1606
5492
msgid "Transport operation not possible: %(msg)s %(orig_error)s"
5493
msgstr ""
5494
5495
#: bzrlib/errors.py:1611
5496
msgid "Connection error: %(msg)s %(orig_error)s"
5497
msgstr ""
5498
5499
#: bzrlib/errors.py:1616
5500
msgid "%(msg)s %(host)s%(port)s%(orig_error)s"
5501
msgstr ""
5502
5503
#: bzrlib/errors.py:1637
5504
msgid "Connection closed: %(msg)s %(orig_error)s"
5505
msgstr ""
5506
5507
#: bzrlib/errors.py:1642
5508
msgid "Connection Timeout: %(msg)s%(orig_error)s"
5509
msgstr ""
5510
5511
#: bzrlib/errors.py:1647
5512
msgid "Invalid range access in %(path)s at %(offset)s: %(msg)s"
5513
msgstr ""
5514
5515
#: bzrlib/errors.py:1657
5516
msgid "Invalid http response for %(path)s: %(msg)s%(orig_error)s"
5517
msgstr ""
5518
5519
#: bzrlib/errors.py:1672
5520
msgid "Invalid http range %(range)r for %(path)s: %(msg)s"
5521
msgstr ""
5522
5523
#: bzrlib/errors.py:1686
5524
msgid "HTTP MIME Boundary missing for %(path)s: %(msg)s"
5525
msgstr ""
5526
5527
#: bzrlib/errors.py:1694
5528
msgid "Invalid http Content-type \"%(ctype)s\" for %(path)s: %(msg)s"
5529
msgstr ""
5530
5531
#: bzrlib/errors.py:1703
5532
msgid "%(source)s is%(permanently)s redirected to %(target)s"
5533
msgstr ""
5534
5535
#: bzrlib/errors.py:1717
5536
msgid "Too many redirections"
5537
msgstr ""
5538
5539
#: bzrlib/errors.py:1722
5540
msgid "Working tree has conflicts."
5541
msgstr ""
5542
5543
#: bzrlib/errors.py:1726
5544
msgid "Config file %(filename)s is not UTF-8 encoded\n"
5545
msgstr ""
5546
5547
#: bzrlib/errors.py:1735
5548
msgid ""
5549
"Error(s) parsing config file %(filename)s:\n"
5550
"%(errors)s"
5551
msgstr ""
5552
5553
#: bzrlib/errors.py:1746
5554
msgid "Bad value \"%(value)s\" for option \"%(name)s\"."
5555
msgstr ""
5556
5557
#: bzrlib/errors.py:1754
5558
msgid "%(username)r does not seem to contain a reasonable email address"
5559
msgstr ""
5560
5561
#: bzrlib/errors.py:1763
5562
msgid "Failed to GPG sign data with command \"%(command_line)s\""
5563
msgstr ""
5564
5565
#: bzrlib/errors.py:1771
5566
msgid "Failed to verify GPG signature data with error \"%(error)s\""
5567
msgstr ""
5568
5569
#: bzrlib/errors.py:1779
5570
msgid "Unable to import library \"%(library)s\": %(error)s"
5571
msgstr ""
5572
5573
#: bzrlib/errors.py:1787
5574
msgid "python-gpgme is not installed, it is needed to verify signatures"
5575
msgstr ""
5576
5577
#: bzrlib/errors.py:1795
5578
msgid ""
5579
"The working tree for %(basedir)s has changed since the last commit, but "
5580
"weave merge requires that it be unchanged"
5581
msgstr ""
5582
5583
#: bzrlib/errors.py:1805
5584
msgid ""
5585
"Can't reprocess and show base, because reprocessing obscures the "
5586
"relationship of conflicting lines to the base"
5587
msgstr ""
5588
5589
#: bzrlib/errors.py:1811
5590
msgid "Cycle in graph %(graph)r"
5591
msgstr ""
5592
5593
#: bzrlib/errors.py:1839
5594
msgid "File %(filename)s is not conflicted."
5595
msgstr ""
5596
5597
#: bzrlib/errors.py:1861
5598
msgid "No bundle was found in \"%(filename)s\"."
5599
msgstr ""
5600
5601
#: bzrlib/errors.py:1870
5602
msgid "Unable to handle bundle version %(version)s: %(msg)s"
5603
msgstr ""
5604
5605
#: bzrlib/errors.py:1880
5606
msgid "Branch %(base)s is missing revision %(text_revision)s of %(file_id)s"
5607
msgstr ""
5608
5609
#: bzrlib/errors.py:1893
5610
msgid "File id {%(file_id)s} already exists in inventory as %(entry)s"
5611
msgstr ""
5612
5613
#: bzrlib/errors.py:1903
5614
msgid "Key %(key)s is already present in map"
5615
msgstr ""
5616
5617
#: bzrlib/errors.py:1908
5618
msgid "The prefix %(prefix)s is in the help search path twice."
5619
msgstr ""
5620
5621
#: bzrlib/errors.py:1918
5622
msgid ""
5623
"No final name for trans_id %(trans_id)r\n"
5624
"file-id: %(file_id)r\n"
5625
"root trans-id: %(root_trans_id)r\n"
5626
msgstr ""
5627
5628
#: bzrlib/errors.py:1950
5629
msgid "Attempt to reuse a transform that has already been applied."
5630
msgstr ""
5631
5632
#: bzrlib/errors.py:1955
5633
msgid "Moving the root directory is not supported at this time"
5634
msgstr ""
5635
5636
#: bzrlib/errors.py:1960
5637
msgid "Failed to rename %(from_path)s to %(to_path)s: %(why)s"
5638
msgstr ""
5639
5640
#: bzrlib/errors.py:1971
5641
msgid ""
5642
"Could not move %(from_path)s%(operator)s %(to_path)s%(_has_extra)s%(extra)s"
5643
msgstr ""
5644
5645
#: bzrlib/errors.py:2007
5646
msgid ""
5647
"Could not rename %(from_path)s%(operator)s %(to_path)s%(_has_extra)s%(extra)s"
5648
msgstr ""
5649
5650
#: bzrlib/errors.py:2037
5651
msgid "Unable to import paramiko (required for sftp support): %(error)s"
5652
msgstr ""
5653
5654
#: bzrlib/errors.py:2045
5655
msgid "Nothing to merge."
5656
msgstr ""
5657
5658
#: bzrlib/errors.py:2050
5659
msgid "Format %(format)s cannot be initialised by this version of bzr."
5660
msgstr ""
5661
5662
#: bzrlib/errors.py:2059
5663
msgid ""
5664
"Cannot convert from format %(from_format)s to format %(format)s. "
5665
"%(problem)s"
5666
msgstr ""
5667
5668
#: bzrlib/errors.py:2071
5669
msgid "Could not find an appropriate Differ for file \"%(path)s\""
5670
msgstr ""
5671
5672
#: bzrlib/errors.py:2079
5673
msgid "%(exe_name)s could not be found on this machine"
5674
msgstr ""
5675
5676
#: bzrlib/errors.py:2087
5677
msgid "Diff is not installed on this machine: %(msg)s"
5678
msgstr ""
5679
5680
#: bzrlib/errors.py:2095
5681
msgid "Diff3 is not installed on this machine."
5682
msgstr ""
5683
5684
#: bzrlib/errors.py:2101
5685
msgid "The content being inserted is already present."
5686
msgstr ""
5687
5688
#: bzrlib/errors.py:2106
5689
msgid ""
5690
"This tree contains left-over files from a failed operation.\n"
5691
" Please examine %(limbo_dir)s to see if it contains any files you wish "
5692
"to\n"
5693
" keep, and delete it when you are done."
5694
msgstr ""
5695
5696
#: bzrlib/errors.py:2117
5697
msgid ""
5698
"This tree contains left-over files from a failed operation.\n"
5699
" Please examine %(pending_deletion)s to see if it contains any files you\n"
5700
" wish to keep, and delete it when you are done."
5701
msgstr ""
5702
5703
#: bzrlib/errors.py:2127
5704
msgid ""
5705
"Unable to delete transform temporary directory %(limbo_dir)s.\n"
5706
" Please examine %(limbo_dir)s to see if it contains any files you wish "
5707
"to\n"
5708
" keep, and delete it when you are done."
5709
msgstr ""
5710
5711
#: bzrlib/errors.py:2138
5712
msgid ""
5713
"Unable to delete transform temporary directory %(pending_deletion)s. Please "
5714
"examine %(pending_deletion)s to see if it contains any files you wish to "
5715
"keep, and delete it when you are done."
5716
msgstr ""
5717
5718
#: bzrlib/errors.py:2148
5719
msgid "Working tree is out of date, please run 'bzr update'.%(more)s"
5720
msgstr ""
5721
5722
#: bzrlib/errors.py:2162
5723
msgid ""
5724
"Public branch \"%(public_location)s\" lacks revision \"%(revstring)s\"."
5725
msgstr ""
5726
5727
#: bzrlib/errors.py:2175
5728
msgid "Error in merge modified format"
5729
msgstr ""
5730
5731
#: bzrlib/errors.py:2180
5732
msgid "Format error in conflict listings"
5733
msgstr ""
5734
5735
#: bzrlib/errors.py:2184
5736
msgid ""
5737
"Inconsistency in dirstate file %(dirstate_path)s.\n"
5738
"Error: %(description)s"
5739
msgstr ""
5740
5741
#: bzrlib/errors.py:2195
5742
msgid ""
5743
"An error has been detected in the repository %(repo_path)s.\n"
5744
"Please run bzr reconcile on this repository."
5745
msgstr ""
5746
5747
#: bzrlib/errors.py:2206
5748
msgid ""
5749
"An inconsistent delta was supplied involving %(path)r, %(file_id)r\n"
5750
"reason: %(reason)s"
5751
msgstr ""
5752
5753
#: bzrlib/errors.py:2219
5754
msgid ""
5755
"An inconsistent delta was supplied: %(delta)r\n"
5756
"reason: %(reason)s"
5757
msgstr ""
5758
5759
#: bzrlib/errors.py:2231
5760
msgid "To use this feature you must upgrade your branch at %(path)s."
5761
msgstr ""
5762
5763
#: bzrlib/errors.py:2240
5764
msgid "To use this feature you must upgrade your repository at %(path)s."
5765
msgstr ""
5766
5767
#: bzrlib/errors.py:2245
5768
msgid ""
5769
"To use this feature you must upgrade your branch at %(path)s to a format "
5770
"which supports rich roots."
5771
msgstr ""
5772
5773
#: bzrlib/errors.py:2251
5774
msgid "Cannot perform local-only commits on unbound branches."
5775
msgstr ""
5776
5777
#: bzrlib/errors.py:2256
5778
msgid "The method %(mname)s is not supported on objects of type %(tname)s."
5779
msgstr ""
5780
5781
#: bzrlib/errors.py:2277
5782
msgid "Ghost tags not supported by format %(format)r."
5783
msgstr ""
5784
5785
#: bzrlib/errors.py:2285
5786
msgid "File is binary but should be text."
5787
msgstr ""
5788
5789
#: bzrlib/errors.py:2290
5790
msgid "The path %(path)s is not permitted on this platform"
5791
msgstr ""
5792
5793
#: bzrlib/errors.py:2299
5794
msgid ""
5795
"Testament did not match expected value.\n"
5796
" For revision_id {%(revision_id)s}, expected {%(expected)s}, measured\n"
5797
" {%(measured)s}"
5798
msgstr ""
5799
5800
#: bzrlib/errors.py:2311
5801
msgid "Not a bzr revision-bundle: %(text)r"
5802
msgstr ""
5803
5804
#: bzrlib/errors.py:2320
5805
msgid "Bad bzr revision-bundle: %(text)r"
5806
msgstr ""
5807
5808
#: bzrlib/errors.py:2329
5809
msgid "Malformed bzr revision-bundle header: %(text)r"
5810
msgstr ""
5811
5812
#: bzrlib/errors.py:2334
5813
msgid "Malformed patches in bzr revision-bundle: %(text)r"
5814
msgstr ""
5815
5816
#: bzrlib/errors.py:2339
5817
msgid "Malformed footer in bzr revision-bundle: %(text)r"
5818
msgstr ""
5819
5820
#: bzrlib/errors.py:2344
5821
msgid "End of line marker was not \\n in bzr revision-bundle"
5822
msgstr ""
5823
5824
#: bzrlib/errors.py:2354
5825
msgid "Bundle format %(bundle_format)s is incompatible with %(other)s"
5826
msgstr ""
5827
5828
#: bzrlib/errors.py:2364
5829
msgid "Root class for inventory serialization errors"
5830
msgstr ""
5831
5832
#: bzrlib/errors.py:2368
5833
msgid ""
5834
"The inventory was not in the expected format:\n"
5835
" %(msg)s"
5836
msgstr ""
5837
5838
#: bzrlib/errors.py:2377
5839
msgid "This operation requires rich root data storage"
5840
msgstr ""
5841
5842
#: bzrlib/errors.py:2390
5843
msgid "Unrecognised value for BZR_SSH environment variable: %(vendor)s"
5844
msgstr ""
5845
5846
#: bzrlib/errors.py:2399
5847
msgid ""
5848
"Don't know how to handle SSH connections. Please set BZR_SSH environment "
5849
"variable."
5850
msgstr ""
5851
5852
#: bzrlib/errors.py:2406
5853
msgid ""
5854
"Could not determine revno for {%(revision_id)s} because its ancestry shows a "
5855
"ghost at {%(ghost_revision_id)s}"
5856
msgstr ""
5857
5858
#: bzrlib/errors.py:2416
5859
msgid "Ghost revision {%(revision_id)s} cannot be used here."
5860
msgstr ""
5861
5862
#: bzrlib/errors.py:2467
5863
msgid ""
5864
"A merge directive must provide either a bundle or a public branch location."
5865
msgstr ""
5866
5867
#: bzrlib/errors.py:2474
5868
msgid "Bad merge directive payload %(start)r"
5869
msgstr ""
5870
5871
#: bzrlib/errors.py:2484
5872
msgid "Preview patch does not match requested changes."
5873
msgstr ""
5874
5875
#: bzrlib/errors.py:2490
5876
msgid "Patch_type was %(patch_type)s, but no patch was supplied."
5877
msgstr ""
5878
5879
#: bzrlib/errors.py:2500
5880
msgid ""
5881
"Your branch does not have all of the revisions required in order to merge "
5882
"this merge directive and the target location specified in the merge "
5883
"directive is not a branch: %(location)s."
5884
msgstr ""
5885
5886
#: bzrlib/errors.py:2512
5887
msgid "Unsupported entry kind %(kind)s"
5888
msgstr ""
5889
5890
#: bzrlib/errors.py:2520
5891
msgid "Can't subsume %(other_tree)s into %(tree)s. %(reason)s"
5892
msgstr ""
5893
5894
#: bzrlib/errors.py:2530
5895
msgid "Subsume target %(other_tree)s needs to be upgraded."
5896
msgstr ""
5897
5898
#: bzrlib/errors.py:2549
5899
msgid "No such tag: %(tag_name)s"
5900
msgstr ""
5901
5902
#: bzrlib/errors.py:2557
5903
msgid "Tags not supported by %(branch)s; you may be able to use bzr upgrade."
5904
msgstr ""
5905
5906
#: bzrlib/errors.py:2566
5907
msgid "Tag %(tag_name)s already exists."
5908
msgstr ""
5909
5910
#: bzrlib/errors.py:2574
5911
msgid ""
5912
"Did not understand bug identifier %(bug_id)s: %(reason)s. See \"bzr help "
5913
"bugs\" for more information on this feature."
5914
msgstr ""
5915
5916
#: bzrlib/errors.py:2584
5917
msgid ""
5918
"The URL for bug tracker \"%(abbreviation)s\" doesn't contain {id}: %(url)s"
5919
msgstr ""
5920
5921
#: bzrlib/errors.py:2594
5922
msgid ""
5923
"Cannot find registered bug tracker called %(abbreviation)s on %(branch)s"
5924
msgstr ""
5925
5926
#: bzrlib/errors.py:2604
5927
msgid "Invalid line in bugs property: '%(line)s'"
5928
msgstr ""
5929
5930
#: bzrlib/errors.py:2612
5931
msgid "Invalid bug status: '%(status)s'"
5932
msgstr ""
5933
5934
#: bzrlib/errors.py:2620
5935
msgid "Could not understand response from smart server: %(response_tuple)r"
5936
msgstr ""
5937
5938
#: bzrlib/errors.py:2659
5939
msgid "Server sent an unexpected error: %(error_tuple)r"
5940
msgstr ""
5941
5942
#: bzrlib/errors.py:2678
5943
msgid "Unrecognised container format: %(container_format)r"
5944
msgstr ""
5945
5946
#: bzrlib/errors.py:2686
5947
msgid "Unexpected end of container stream"
5948
msgstr ""
5949
5950
#: bzrlib/errors.py:2691
5951
msgid "Unknown record type: %(record_type)r"
5952
msgstr ""
5953
5954
#: bzrlib/errors.py:2699
5955
msgid "Invalid record: %(reason)s"
5956
msgstr ""
5957
5958
#: bzrlib/errors.py:2707
5959
msgid "Container has data after end marker: %(excess)r"
5960
msgstr ""
5961
5962
#: bzrlib/errors.py:2715
5963
msgid "Container has multiple records with the same name: %(name)s"
5964
msgstr ""
5965
5966
#: bzrlib/errors.py:2728
5967
msgid "Corrupt or incompatible data stream: %(reason)s"
5968
msgstr ""
5969
5970
#: bzrlib/errors.py:2736
5971
msgid "SMTP error: %(error)s"
5972
msgstr ""
5973
5974
#: bzrlib/errors.py:2744
5975
msgid "No message supplied."
5976
msgstr ""
5977
5978
#: bzrlib/errors.py:2749
5979
msgid "No mail-to address (--mail-to) or output (-o) specified."
5980
msgstr ""
5981
5982
#: bzrlib/errors.py:2754
5983
msgid "Unknown mail client: %(mail_client)s"
5984
msgstr ""
5985
5986
#: bzrlib/errors.py:2762
5987
msgid ""
5988
"Unable to find mail client with the following names: "
5989
"%(mail_command_list_string)s"
5990
msgstr ""
5991
5992
#: bzrlib/errors.py:2772
5993
msgid "SMTP connection to %(host)s refused"
5994
msgstr ""
5995
5996
#: bzrlib/errors.py:2781
5997
msgid "Please specify smtp_server. No server at default %(host)s."
5998
msgstr ""
5999
6000
#: bzrlib/errors.py:2795
6001
msgid ""
6002
"'%(display_url)s' is not in sync with %(target_url)s. See bzr help sync-for-"
6003
"reconfigure."
6004
msgstr ""
6005
6006
#: bzrlib/errors.py:2807
6007
msgid "'%(display_url)s' is already a branch."
6008
msgstr ""
6009
6010
#: bzrlib/errors.py:2812
6011
msgid "'%(display_url)s' is already a tree."
6012
msgstr ""
6013
6014
#: bzrlib/errors.py:2817
6015
msgid "'%(display_url)s' is already a checkout."
6016
msgstr ""
6017
6018
#: bzrlib/errors.py:2822
6019
msgid "'%(display_url)s' is already a lightweight checkout."
6020
msgstr ""
6021
6022
#: bzrlib/errors.py:2827
6023
msgid "'%(display_url)s' is already using a shared repository."
6024
msgstr ""
6025
6026
#: bzrlib/errors.py:2832
6027
msgid "'%(display_url)s' is already standalone."
6028
msgstr ""
6029
6030
#: bzrlib/errors.py:2837
6031
msgid "Shared repository '%(display_url)s' already creates working trees."
6032
msgstr ""
6033
6034
#: bzrlib/errors.py:2843
6035
msgid ""
6036
"Shared repository '%(display_url)s' already doesn't create working trees."
6037
msgstr ""
6038
6039
#: bzrlib/errors.py:2849
6040
msgid "Requested reconfiguration of '%(display_url)s' is not supported."
6041
msgstr ""
6042
6043
#: bzrlib/errors.py:2854
6044
msgid "No location could be found to bind to at %(display_url)s."
6045
msgstr ""
6046
6047
#: bzrlib/errors.py:2859
6048
msgid ""
6049
"Working tree \"%(display_url)s\" has uncommitted changes (See bzr "
6050
"status).%(more)s"
6051
msgstr ""
6052
6053
#: bzrlib/errors.py:2878
6054
msgid ""
6055
"Working tree \"%(display_url)s\" has shelved changes (See bzr shelve --"
6056
"list).%(more)s"
6057
msgstr ""
6058
6059
#: bzrlib/errors.py:2884
6060
msgid "Variable {%(name)s} is not available."
6061
msgstr ""
6062
6063
#: bzrlib/errors.py:2892
6064
msgid "No template specified."
6065
msgstr ""
6066
6067
#: bzrlib/errors.py:2897
6068
msgid "Unable to create symlink %(path_str)son this platform"
6069
msgstr ""
6070
6071
#: bzrlib/errors.py:2912
6072
msgid ""
6073
"Unsupported timezone format \"%(timezone)s\", options are \"utc\", "
6074
"\"original\", \"local\"."
6075
msgstr ""
6076
6077
#: bzrlib/errors.py:2946
6078
msgid ""
6079
"Unable to encode %(kind)s path %(path)r in user encoding %(user_encoding)s"
6080
msgstr ""
6081
6082
#: bzrlib/errors.py:2958
6083
msgid "The \"%(config_id)s\" configuration does not exist."
6084
msgstr ""
6085
6086
#: bzrlib/errors.py:2966
6087
msgid "The \"%(option_name)s\" configuration option does not exist."
6088
msgstr ""
6089
6090
#: bzrlib/errors.py:2974
6091
msgid "The alias \"%(alias_name)s\" does not exist."
6092
msgstr ""
6093
6094
#: bzrlib/errors.py:2988
6095
msgid "\"%(alias_name)s\" is not a valid location alias."
6096
msgstr ""
6097
6098
#: bzrlib/errors.py:2996
6099
msgid "No %(alias_name)s location assigned."
6100
msgstr ""
6101
6102
#: bzrlib/errors.py:3004
6103
msgid "Cannot bind address \"%(host)s:%(port)i\": %(orig_error)s."
6104
msgstr ""
6105
6106
#: bzrlib/errors.py:3014
6107
msgid "Unknown rules detected: %(unknowns_str)s."
6108
msgstr ""
6109
6110
#: bzrlib/errors.py:3025
6111
msgid "Tip change rejected: %(msg)s"
6112
msgstr ""
6113
6114
#: bzrlib/errors.py:3033
6115
msgid "Shelf corrupt."
6116
msgstr ""
6117
6118
#: bzrlib/errors.py:3038
6119
msgid "Corruption while decompressing repository file%(orig_error)s"
6120
msgstr ""
6121
6122
#: bzrlib/errors.py:3050
6123
msgid "No changes are shelved with id \"%(shelf_id)d\"."
6124
msgstr ""
6125
6126
#: bzrlib/errors.py:3058
6127
msgid "\"%(invalid_id)s\" is not a valid shelf id, try a number instead."
6128
msgstr ""
6129
6130
#: bzrlib/errors.py:3066
6131
msgid ""
6132
"An attempt to access a url outside the server jail was made: '%(url)s'."
6133
msgstr ""
6134
6135
#: bzrlib/errors.py:3074
6136
msgid "The user aborted the operation."
6137
msgstr ""
6138
6139
#: bzrlib/errors.py:3079
6140
msgid "Branching '%(url)s'(%(format)s) must create a working tree."
6141
msgstr ""
6142
6143
#: bzrlib/errors.py:3089
6144
msgid "No such view: %(view_name)s."
6145
msgstr ""
6146
6147
#: bzrlib/errors.py:3099
6148
msgid ""
6149
"Views are not supported by %(tree)s; use 'bzr upgrade' to change your tree "
6150
"to a later format."
6151
msgstr ""
6152
6153
#: bzrlib/errors.py:3108
6154
msgid ""
6155
"Specified file \"%(file_name)s\" is outside the current view: %(view_str)s"
6156
msgstr ""
6157
6158
#: bzrlib/errors.py:3175
6159
msgid "%(bzrdir)r does not support co-located branches."
6160
msgstr ""
6161
6162
#: bzrlib/errors.py:3181
6163
msgid ""
6164
"Unable to determine your name.\n"
6165
"Please, set your name with the 'whoami' command.\n"
6166
"E.g. bzr whoami \"Your Name <name@example.com>\""
6167
msgstr ""
6168
6169
#: bzrlib/errors.py:3190
6170
msgid "Invalid pattern(s) found. %(msg)s"
6171
msgstr ""
6172
6173
#: bzrlib/errors.py:3198
6174
msgid ""
6175
"Branch \"%(branch_url)s\" appears to be bound to itself. Please use `bzr "
6176
"unbind` to fix."
6177
msgstr ""
6178
6179
#: bzrlib/errors.py:3209
6180
msgid "Loop involving %(refs)r while expanding \"%(string)s\"."
6181
msgstr ""
6182
6183
#: bzrlib/errors.py:3218
6184
msgid "Option %(name)s is not defined while expanding \"%(string)s\"."
6185
msgstr ""
6186
6187
#: bzrlib/errors.py:3227
6188
msgid ""
6189
"No compatible object available for operations from %(source)r to %(target)r."
6190
msgstr ""
6191
6192
#: bzrlib/errors.py:3237
6193
msgid ""
6194
"VFS requests over the smart server are not allowed. Encountered: %(method)s, "
6195
"%(arguments)s."
6196
msgstr ""
6197
6198
#: bzrlib/errors.py:3247
6199
msgid ""
6200
"Kind change from %(from_kind)s to %(to_kind)s for %(path)s not supported by "
6201
"format %(format)r"
6202
msgstr ""
6203
6204
#: bzrlib/errors.py:3259
6205
msgid ""
6206
"Missing feature %(feature)s not provided by this version of Bazaar or any "
6207
"plugin."
6208
msgstr ""
6209
6210
#: bzrlib/errors.py:3272
6211
msgid "Binary files section encountered."
6212
msgstr ""
6213
6214
#: bzrlib/errors.py:3280
6215
msgid ""
6216
"Malformed patch header. %(desc)s\n"
6217
"%(line)r"
6218
msgstr ""
6219
6220
#: bzrlib/errors.py:3289
6221
msgid ""
6222
"Malformed hunk header. %(desc)s\n"
6223
"%(line)r"
6224
msgstr ""
6225
6226
#: bzrlib/errors.py:3298
6227
msgid ""
6228
"Malformed line. %(desc)s\n"
6229
"%(line)r"
6230
msgstr ""
6231
6232
#: bzrlib/errors.py:3308
6233
msgid ""
6234
"Text contents mismatch at line %(line_no)d. Original has \"%(orig_line)s\", "
6235
"but patch says it should be \"%(patch_line)s\""
6236
msgstr ""
6237
6238
#: bzrlib/errors.py:3319
6239
msgid "The feature %(feature)s has already been registered."
6240
msgstr ""
6241
6242
#: bzrlib/export_pot.py:252
6243
#, python-format
6244
msgid "Exporting messages from builtin command: %s"
6245
msgstr ""
6246
6247
#: bzrlib/export_pot.py:271
6248
msgid "Exporting messages from plugin command: {0} in {1}"
6249
msgstr ""
6250
6251
#: bzrlib/export_pot.py:292
6252
#, python-format
6253
msgid "Exporting message from error: %s"
6254
msgstr ""
6255
6256
#: bzrlib/fetch.py:98
6257
msgid "Finding revisions"
6258
msgstr ""
6259
6260
#: bzrlib/fetch.py:103
6261
msgid "Fetching revisions"
6262
msgstr ""
6263
6264
#: bzrlib/foreign.py:262
6265
msgid "Push into a different VCS without any custom bzr metadata."
6266
msgstr ""
6267
6268
#: bzrlib/foreign.py:264
6269
msgid ""
6270
"This will afterwards rebase the local branch on the remote\n"
6271
"branch unless the --no-rebase option is used, in which case \n"
6272
"the two branches will be out of sync after the push. "
6273
msgstr ""
6274
6275
#: bzrlib/foreign.py:277
6276
msgid "Do not rebase after push."
6277
msgstr ""
6278
6279
#: bzrlib/foreign.py:311
6280
#, python-format
6281
msgid "Using saved location: %s\n"
6282
msgstr ""
6283
6284
#: bzrlib/foreign.py:321
6285
msgid ""
6286
"{0!r} and {1!r} are in the same VCS, lossy push not necessary. Please use "
6287
"regular push."
6288
msgstr ""
6289
6290
#: bzrlib/gpg.py:119 bzrlib/gpg.py:460
6291
msgid "{0} commits with valid signatures"
6292
msgstr ""
6293
6294
#: bzrlib/gpg.py:123 bzrlib/gpg.py:465
6295
msgid "{0} commit with unknown key"
6296
msgid_plural "{0} commits with unknown keys"
6297
msgstr[0] ""
6298
msgstr[1] ""
6299
6300
#: bzrlib/gpg.py:129 bzrlib/gpg.py:472
6301
msgid "{0} commit not valid"
6302
msgid_plural "{0} commits not valid"
6303
msgstr[0] ""
6304
msgstr[1] ""
6305
6306
#: bzrlib/gpg.py:135 bzrlib/gpg.py:479
6307
msgid "{0} commit not signed"
6308
msgid_plural "{0} commits not signed"
6309
msgstr[0] ""
6310
msgstr[1] ""
6311
6312
#: bzrlib/gpg.py:141 bzrlib/gpg.py:486
6313
msgid "{0} commit with key now expired"
6314
msgid_plural "{0} commits with key now expired"
6315
msgstr[0] ""
6316
msgstr[1] ""
6317
6318
#: bzrlib/gpg.py:343
6319
msgid "No GnuPG key results for pattern: {0}"
6320
msgstr ""
6321
6322
#: bzrlib/gpg.py:386
6323
msgid "{0} signed {1} commit"
6324
msgid_plural "{0} signed {1} commits"
6325
msgstr[0] ""
6326
msgstr[1] ""
6327
6328
#: bzrlib/gpg.py:403 bzrlib/gpg.py:419
6329
msgid "{0} commit by author {1}"
6330
msgid_plural "{0} commits by author {1}"
6331
msgstr[0] ""
6332
msgstr[1] ""
6333
6334
#: bzrlib/gpg.py:433
6335
msgid "Unknown key {0} signed {1} commit"
6336
msgid_plural "Unknown key {0} signed {1} commits"
6337
msgstr[0] ""
6338
msgstr[1] ""
6339
6340
#: bzrlib/gpg.py:452
6341
msgid "{0} commit by author {1} with key {2} now expired"
6342
msgid_plural "{0} commits by author {1} with key {2} now expired"
6343
msgstr[0] ""
6344
msgstr[1] ""
6345
6346
#: bzrlib/groupcompress.py:1739
6347
#, python-format
6348
msgid "Insert claimed random_id=True, but then inserted %r two times"
6349
msgstr ""
6350
6351
#: bzrlib/hooks.py:331
6352
#, python-format
6353
msgid "Introduced in: %s"
6354
msgstr ""
6355
6356
#: bzrlib/hooks.py:334
6357
#, python-format
6358
msgid "Deprecated in: %s"
6359
msgstr ""
6360
6361
#: bzrlib/knit.py:1766 bzrlib/knit.py:1802
6362
msgid "Walking content"
6363
msgstr ""
6364
6365
#: bzrlib/knit.py:3330
6366
msgid "annotating"
6367
msgstr ""
6368
6369
#: bzrlib/lock.py:548
6370
msgid "{0!r} was {1} locked again"
6371
msgstr ""
6372
6373
#: bzrlib/lockdir.py:321
6374
#, python-format
6375
msgid "error removing pending lock: %s"
6376
msgstr ""
6377
6378
#: bzrlib/lockdir.py:616
6379
msgid "Unable to obtain"
6380
msgstr ""
6381
6382
#: bzrlib/lockdir.py:618
6383
msgid "Lock owner changed for"
6384
msgstr ""
6385
6386
#: bzrlib/lockdir.py:620
6387
msgid "{0} lock {1} {2}."
6388
msgstr ""
6389
6390
#: bzrlib/lockdir.py:627
6391
#, python-format
6392
msgid "Will continue to try until %s, unless you press Ctrl-C."
6393
msgstr ""
6394
6395
#: bzrlib/lockdir.py:629
6396
msgid "See \"bzr help break-lock\" for more."
6397
msgstr ""
6398
6399
#: bzrlib/lockdir.py:739
6400
#, python-format
6401
msgid ""
6402
"held by %(user)s on %(hostname)s (process #%(pid)s), acquired %(time_ago)s"
6403
msgstr ""
6404
6405
#: bzrlib/log.py:572
6406
msgid "--exclude-common-ancestry requires two different revisions"
6407
msgstr ""
6408
6409
#: bzrlib/log.py:574
6410
#, python-format
6411
msgid "invalid direction %r"
6412
msgstr ""
6413
6414
#: bzrlib/log.py:662
6415
msgid "Start revision not found in history of end revision."
6416
msgstr ""
6417
6418
#: bzrlib/log.py:1080 bzrlib/log.py:1138
6419
msgid "Logging revision 0 is invalid."
6420
msgstr ""
6421
6422
#: bzrlib/log.py:1082 bzrlib/log.py:1140
6423
msgid "Start revision must be older than the end revision."
6424
msgstr ""
6425
6426
#: bzrlib/log.py:1827
6427
#, python-format
6428
msgid "unknown log formatter: %r"
6429
msgstr ""
6430
6431
#: bzrlib/log.py:2123
6432
msgid "fixes bug"
6433
msgid_plural "fixes bugs"
6434
msgstr[0] ""
6435
msgstr[1] ""
6436
6437
#: bzrlib/merge.py:689
6438
msgid "All changes applied successfully."
6439
msgstr ""
6440
6441
#: bzrlib/merge.py:691
6442
#, python-format
6443
msgid "%d conflicts encountered."
6444
msgstr ""
6445
6446
#: bzrlib/merge.py:845 bzrlib/merge.py:1933
6447
msgid "Preparing file merge"
6448
msgstr ""
6449
6450
#: bzrlib/multiparent.py:426
6451
msgid "Importing revisions"
6452
msgstr ""
6453
6454
#: bzrlib/option.py:526
6455
msgid "Show help message."
6456
msgstr ""
6457
6458
#: bzrlib/option.py:528
6459
msgid "Only display errors and warnings."
6460
msgstr ""
6461
6462
#: bzrlib/option.py:531
6463
msgid "Show usage message and options."
6464
msgstr ""
6465
6466
#: bzrlib/option.py:533
6467
msgid "Display more information."
6468
msgstr ""
6469
6470
#: bzrlib/option.py:541
6471
msgid ""
6472
"Select changes introduced by the specified revision. See also \"help "
6473
"revisionspec\"."
6474
msgstr ""
6475
6476
#: bzrlib/option.py:543
6477
msgid "Branch to operate on, instead of working directory."
6478
msgstr ""
6479
6480
#: bzrlib/option.py:545
6481
msgid "Detailed log format."
6482
msgstr ""
6483
6484
#: bzrlib/option.py:545
6485
msgid "Format used by GNU ChangeLog files."
6486
msgstr ""
6487
6488
#: bzrlib/option.py:545
6489
msgid "Log format with one line per revision."
6490
msgstr ""
6491
6492
#: bzrlib/option.py:545
6493
msgid "Moderately short log format."
6494
msgstr ""
6495
6496
#: bzrlib/option.py:545
6497
msgid "Use specified log format."
6498
msgstr ""
6499
6500
#: bzrlib/option.py:547
6501
msgid "Log format"
6502
msgstr ""
6503
6504
#: bzrlib/option.py:549
6505
msgid "LCA-newness merge."
6506
msgstr ""
6507
6508
#: bzrlib/option.py:549
6509
msgid "Merge using external diff3."
6510
msgstr ""
6511
6512
#: bzrlib/option.py:549
6513
msgid "Native diff3-style merge."
6514
msgstr ""
6515
6516
#: bzrlib/option.py:549
6517
msgid "Select a particular merge algorithm."
6518
msgstr ""
6519
6520
#: bzrlib/option.py:549
6521
msgid "Weave-based merge."
6522
msgstr ""
6523
6524
#: bzrlib/option.py:551
6525
msgid "Merge algorithm"
6526
msgstr ""
6527
6528
#: bzrlib/option.py:554
6529
msgid "Message string."
6530
msgstr ""
6531
6532
#: bzrlib/option.py:556
6533
msgid "Use an ASCII NUL (\\0) separator rather than a newline."
6534
msgstr ""
6535
6536
#: bzrlib/option.py:558
6537
msgid "Ignore differences between branches and overwrite unconditionally."
6538
msgstr ""
6539
6540
#: bzrlib/option.py:560
6541
msgid "Remember the specified location as a default."
6542
msgstr ""
6543
6544
#: bzrlib/option.py:562
6545
msgid "Reprocess to reduce spurious conflicts."
6546
msgstr ""
6547
6548
#: bzrlib/option.py:566
6549
msgid "See \"help revisionspec\" for details."
6550
msgstr ""
6551
6552
#: bzrlib/option.py:568
6553
msgid "Show internal object ids."
6554
msgstr ""
6555
6556
#: bzrlib/option.py:571
6557
msgid "Display timezone as local, original, or utc."
6558
msgstr ""
6559
6560
#: bzrlib/osutils.py:100
6561
msgid "Parameter {0!r} encoding is unsupported by {1} application locale."
6562
msgstr ""
6563
6564
#: bzrlib/osutils.py:220
6565
msgid "lstat/stat of ({0!r}): {1!r}"
6566
msgstr ""
6567
6568
#: bzrlib/osutils.py:997 bzrlib/osutils.py:1008
6569
#, python-format
6570
msgid "sorry, %r not allowed in path"
6571
msgstr ""
6572
6573
#: bzrlib/osutils.py:1226
6574
#, python-format
6575
msgid "%r is too short to calculate a relative path"
6576
msgstr ""
6577
6578
#: bzrlib/plugin.py:143
6579
#, python-format
6580
msgid "\"%s\" is not a valid <plugin_name>@<plugin_path> description "
6581
msgstr ""
6582
6583
#: bzrlib/plugins/bash_completion/bashcomp.py:411
6584
msgid "Enable completions for the selected plugin (default: all plugins)"
6585
msgstr ""
6586
6587
#: bzrlib/plugins/bash_completion/bashcomp.py:412
6588
msgid "Generate a shell function for bash command line completion."
6589
msgstr ""
6590
6591
#: bzrlib/plugins/bash_completion/bashcomp.py:414
6592
msgid ""
6593
"This command generates a shell function which can be used by bash to\n"
6594
"automatically complete the currently typed command when the user presses\n"
6595
"the completion key (usually tab)."
6596
msgstr ""
6597
6598
#: bzrlib/plugins/bash_completion/bashcomp.py:418
6599
msgid ""
6600
"Commonly used like this:\n"
6601
" eval \"`bzr bash-completion`\""
6602
msgstr ""
6603
6604
#: bzrlib/plugins/bash_completion/bashcomp.py:424
6605
msgid "Name of the generated function (default: _bzr)"
6606
msgstr ""
6607
6608
#: bzrlib/plugins/bash_completion/bashcomp.py:426
6609
msgid "Generate only the shell function, don't enable it"
6610
msgstr ""
6611
6612
#: bzrlib/plugins/launchpad/__init__.py:81
6613
msgid "Register a branch with launchpad.net."
6614
msgstr ""
6615
6616
#: bzrlib/plugins/launchpad/__init__.py:83
6617
msgid ""
6618
"This command lists a bzr branch in the directory of branches on\n"
6619
"launchpad.net. Registration allows the branch to be associated with\n"
6620
"bugs or specifications."
6621
msgstr ""
6622
6623
#: bzrlib/plugins/launchpad/__init__.py:87
6624
msgid ""
6625
"Before using this command you must register the project to which the\n"
6626
"branch belongs, and create an account for yourself on launchpad.net."
6627
msgstr ""
6628
6629
#: bzrlib/plugins/launchpad/__init__.py:90
6630
msgid ""
6631
"arguments:\n"
6632
" public_url: The publicly visible url for the branch to register.\n"
6633
" This must be an http or https url (which Launchpad can read\n"
6634
" from to access the branch). Local file urls, SFTP urls, and\n"
6635
" bzr+ssh urls will not work.\n"
6636
" If no public_url is provided, bzr will use the configured\n"
6637
" public_url if there is one for the current branch, and\n"
6638
" otherwise error."
6639
msgstr ""
6640
6641
#: bzrlib/plugins/launchpad/__init__.py:99
6642
msgid ""
6643
"example:\n"
6644
" bzr register-branch http://foo.com/bzr/fooproject.mine \\\n"
6645
" --project fooproject"
6646
msgstr ""
6647
6648
#: bzrlib/plugins/launchpad/__init__.py:106
6649
msgid "Launchpad project short name to associate with the branch."
6650
msgstr ""
6651
6652
#: bzrlib/plugins/launchpad/__init__.py:113
6653
msgid ""
6654
"Short name for the branch; by default taken from the last component of the "
6655
"url."
6656
msgstr ""
6657
6658
#: bzrlib/plugins/launchpad/__init__.py:117
6659
msgid "One-sentence description of the branch."
6660
msgstr ""
6661
6662
#: bzrlib/plugins/launchpad/__init__.py:120
6663
msgid "Longer description of the purpose or contents of the branch."
6664
msgstr ""
6665
6666
#: bzrlib/plugins/launchpad/__init__.py:123
6667
msgid "Branch author's email address, if not yourself."
6668
msgstr ""
6669
6670
#: bzrlib/plugins/launchpad/__init__.py:126
6671
msgid "The bug this branch fixes."
6672
msgstr ""
6673
6674
#: bzrlib/plugins/launchpad/__init__.py:129
6675
msgid "Prepare the request but don't actually send it."
6676
msgstr ""
6677
6678
#: bzrlib/plugins/launchpad/__init__.py:151
6679
msgid ""
6680
"register-branch requires a public branch url - see bzr help register-branch."
6681
msgstr ""
6682
6683
#: bzrlib/plugins/launchpad/__init__.py:159
6684
msgid "--product is deprecated; please use --project."
6685
msgstr ""
6686
6687
#: bzrlib/plugins/launchpad/__init__.py:191
6688
msgid "Open a Launchpad branch page in your web browser."
6689
msgstr ""
6690
6691
#: bzrlib/plugins/launchpad/__init__.py:196
6692
msgid "Do not actually open the browser. Just say the URL we would use."
6693
msgstr ""
6694
6695
#: bzrlib/plugins/launchpad/__init__.py:231
6696
#, python-format
6697
msgid "Opening %s in web browser"
6698
msgstr ""
6699
6700
#: bzrlib/plugins/launchpad/__init__.py:241
6701
msgid "Show or set the Launchpad user ID."
6702
msgstr ""
6703
6704
#: bzrlib/plugins/launchpad/__init__.py:243
6705
msgid ""
6706
"When communicating with Launchpad, some commands need to know your\n"
6707
"Launchpad user ID. This command can be used to set or show the\n"
6708
"user ID that Bazaar will use for such communication."
6709
msgstr ""
6710
6711
#: bzrlib/plugins/launchpad/__init__.py:247
6712
msgid ""
6713
":Examples:\n"
6714
" Show the Launchpad ID of the current user::"
6715
msgstr ""
6716
6717
#: bzrlib/plugins/launchpad/__init__.py:250
6718
msgid " bzr launchpad-login"
6719
msgstr ""
6720
6721
#: bzrlib/plugins/launchpad/__init__.py:252
6722
msgid " Set the Launchpad ID of the current user to 'bob'::"
6723
msgstr ""
6724
6725
#: bzrlib/plugins/launchpad/__init__.py:254
6726
msgid " bzr launchpad-login bob"
6727
msgstr ""
6728
6729
#: bzrlib/plugins/launchpad/__init__.py:261
6730
msgid "Don't check that the user name is valid."
6731
msgstr ""
6732
6733
#: bzrlib/plugins/launchpad/__init__.py:276
6734
#: bzrlib/plugins/launchpad/__init__.py:287
6735
msgid "Launchpad user ID exists and has SSH keys.\n"
6736
msgstr ""
6737
6738
#: bzrlib/plugins/launchpad/__init__.py:279
6739
msgid "No Launchpad user ID configured.\n"
6740
msgstr ""
6741
6742
#: bzrlib/plugins/launchpad/__init__.py:290
6743
#, python-format
6744
msgid "Launchpad user ID set to '%s'.\n"
6745
msgstr ""
6746
6747
#: bzrlib/plugins/launchpad/__init__.py:298
6748
msgid "Ask Launchpad to mirror a branch now."
6749
msgstr ""
6750
6751
#: bzrlib/plugins/launchpad/__init__.py:318
6752
msgid "Propose merging a branch on Launchpad."
6753
msgstr ""
6754
6755
#: bzrlib/plugins/launchpad/__init__.py:320
6756
msgid ""
6757
"This will open your usual editor to provide the initial comment. When it\n"
6758
"has created the proposal, it will open it in your default web browser."
6759
msgstr ""
6760
6761
#: bzrlib/plugins/launchpad/__init__.py:323
6762
msgid ""
6763
"The branch will be proposed to merge into SUBMIT_BRANCH. If SUBMIT_BRANCH\n"
6764
"is not supplied, the remembered submit branch will be used. If no submit\n"
6765
"branch is remembered, the development focus will be used."
6766
msgstr ""
6767
6768
#: bzrlib/plugins/launchpad/__init__.py:327
6769
msgid ""
6770
"By default, the SUBMIT_BRANCH's review team will be requested to review\n"
6771
"the merge proposal. This can be overriden by specifying --review (-R).\n"
6772
"The parameter the launchpad account name of the desired reviewer. This\n"
6773
"may optionally be followed by '=' and the review type. For example:"
6774
msgstr ""
6775
6776
#: bzrlib/plugins/launchpad/__init__.py:332
6777
msgid " bzr lp-propose-merge --review jrandom --review review-team=qa"
6778
msgstr ""
6779
6780
#: bzrlib/plugins/launchpad/__init__.py:334
6781
msgid ""
6782
"This will propose a merge, request \"jrandom\" to perform a review of\n"
6783
"unspecified type, and request \"review-team\" to perform a \"qa\" review."
6784
msgstr ""
6785
6786
#: bzrlib/plugins/launchpad/__init__.py:339
6787
msgid "Propose the merge on staging."
6788
msgstr ""
6789
6790
#: bzrlib/plugins/launchpad/__init__.py:341
6791
msgid "Commit message."
6792
msgstr ""
6793
6794
#: bzrlib/plugins/launchpad/__init__.py:343
6795
msgid "Mark the proposal as approved immediately."
6796
msgstr ""
6797
6798
#: bzrlib/plugins/launchpad/__init__.py:345
6799
msgid "Requested reviewer and optional type."
6800
msgstr ""
6801
6802
#: bzrlib/plugins/launchpad/__init__.py:382
6803
msgid "Find the proposal to merge this revision."
6804
msgstr ""
6805
6806
#: bzrlib/plugins/launchpad/__init__.py:384
6807
msgid ""
6808
"Finds the merge proposal(s) that discussed landing the specified revision.\n"
6809
"This works only if the selected branch was the merge proposal target, and\n"
6810
"if the merged_revno is recorded for the merge proposal. The proposal(s)\n"
6811
"are opened in a web browser."
6812
msgstr ""
6813
6814
#: bzrlib/plugins/launchpad/__init__.py:389
6815
msgid ""
6816
"Any revision involved in the merge may be specified-- the revision in\n"
6817
"which the merge was performed, or one of the revisions that was merged."
6818
msgstr ""
6819
6820
#: bzrlib/plugins/launchpad/__init__.py:392
6821
msgid "So, to find the merge proposal that reviewed line 1 of README::"
6822
msgstr ""
6823
6824
#: bzrlib/plugins/launchpad/__init__.py:394
6825
msgid " bzr lp-find-proposal -r annotate:README:1"
6826
msgstr ""
6827
6828
#: bzrlib/plugins/launchpad/__init__.py:409
6829
msgid "No review found."
6830
msgstr ""
6831
6832
#: bzrlib/plugins/launchpad/__init__.py:410
6833
#, python-format
6834
msgid "%d proposals(s) found."
6835
msgstr ""
6836
6837
#: bzrlib/plugins/launchpad/__init__.py:420
6838
msgid "Finding revision-id"
6839
msgstr ""
6840
6841
#: bzrlib/plugins/launchpad/__init__.py:427
6842
msgid "Finding merge"
6843
msgstr ""
6844
6845
#: bzrlib/plugins/launchpad/__init__.py:432
6846
msgid "Finding revno"
6847
msgstr ""
6848
6849
#: bzrlib/plugins/launchpad/__init__.py:437
6850
msgid "Finding Launchpad branch"
6851
msgstr ""
6852
6853
#: bzrlib/plugins/launchpad/__init__.py:440
6854
msgid "Finding proposals"
6855
msgstr ""
6856
6857
#: bzrlib/plugins/launchpad/account.py:66
6858
msgid "Setting ssh/sftp usernames for launchpad.net."
6859
msgstr ""
6860
6861
#: bzrlib/plugins/launchpad/lp_api.py:241
6862
#: bzrlib/plugins/launchpad/lp_api.py:246
6863
#, python-format
6864
msgid "%s is not registered on Launchpad"
6865
msgstr ""
6866
6867
#: bzrlib/plugins/launchpad/lp_api.py:256
6868
#, python-format
6869
msgid "%s has no development focus."
6870
msgstr ""
6871
6872
#: bzrlib/plugins/launchpad/lp_api.py:261
6873
#, python-format
6874
msgid "development focus %s has no branch."
6875
msgstr ""
6876
6877
#: bzrlib/plugins/launchpad/lp_api.py:266
6878
#, python-format
6879
msgid "source package %s has no branch."
6880
msgstr ""
6881
6882
#: bzrlib/plugins/launchpad/lp_api.py:270
6883
#, python-format
6884
msgid "%s has no associated product or source package."
6885
msgstr ""
6886
6887
#: bzrlib/plugins/launchpad/lp_api.py:282
6888
#, python-format
6889
msgid "%s is already up-to-date."
6890
msgstr ""
6891
6892
#: bzrlib/plugins/launchpad/lp_api.py:289
6893
#, python-format
6894
msgid "Pushing to %s"
6895
msgstr ""
6896
6897
#: bzrlib/plugins/launchpad/lp_directory.py:170
6898
msgid ""
6899
"resolution for {0}\n"
6900
" local: {1}\n"
6901
" remote: {2}"
6902
msgstr ""
6903
6904
#: bzrlib/plugins/launchpad/lp_propose.py:149
6905
#, python-format
6906
msgid "There is already a branch merge proposal: %s"
6907
msgstr ""
6908
6909
#: bzrlib/plugins/weave_fmt/bzrdir.py:236
6910
msgid "pb parameter to convert() is deprecated"
6911
msgstr ""
6912
6913
#: bzrlib/plugins/weave_fmt/bzrdir.py:239
6914
msgid "starting upgrade from format 4 to 5"
6915
msgstr ""
6916
6917
#: bzrlib/plugins/weave_fmt/bzrdir.py:249
6918
msgid "note: upgrade may be faster if all store files are ungzipped first"
6919
msgstr ""
6920
6921
#: bzrlib/plugins/weave_fmt/bzrdir.py:278
6922
msgid "converting revision"
6923
msgstr ""
6924
6925
#: bzrlib/plugins/weave_fmt/bzrdir.py:283
6926
msgid "upgraded to weaves:"
6927
msgstr ""
6928
6929
#: bzrlib/plugins/weave_fmt/bzrdir.py:284
6930
#, python-format
6931
msgid "%6d revisions and inventories"
6932
msgstr ""
6933
6934
#: bzrlib/plugins/weave_fmt/bzrdir.py:286
6935
#, python-format
6936
msgid "%6d revisions not present"
6937
msgstr ""
6938
6939
#: bzrlib/plugins/weave_fmt/bzrdir.py:288
6940
#, python-format
6941
msgid "%6d texts"
6942
msgstr ""
6943
6944
#: bzrlib/plugins/weave_fmt/bzrdir.py:324
6945
msgid "writing weave"
6946
msgstr ""
6947
6948
#: bzrlib/plugins/weave_fmt/bzrdir.py:328
6949
#: bzrlib/plugins/weave_fmt/bzrdir.py:330
6950
msgid "inventory"
6951
msgstr ""
6952
6953
#: bzrlib/plugins/weave_fmt/bzrdir.py:347
6954
msgid "write revision"
6955
msgstr ""
6956
6957
#: bzrlib/plugins/weave_fmt/bzrdir.py:361
6958
msgid "loading revision"
6959
msgstr ""
6960
6961
#: bzrlib/plugins/weave_fmt/bzrdir.py:366
6962
#, python-format
6963
msgid "revision {%s} not present in branch; will be converted as a ghost"
6964
msgstr ""
6965
6966
#: bzrlib/plugins/weave_fmt/bzrdir.py:506
6967
msgid "starting upgrade from format 5 to 6"
6968
msgstr ""
6969
6970
#: bzrlib/plugins/weave_fmt/bzrdir.py:516
6971
#, python-format
6972
msgid "adding prefixes to %s"
6973
msgstr ""
6974
6975
#: bzrlib/plugins/weave_fmt/bzrdir.py:556
6976
msgid "starting upgrade from format 6 to metadir"
6977
msgstr ""
6978
6979
#: bzrlib/plugins/weave_fmt/bzrdir.py:564
6980
msgid "Removing ancestry.weave"
6981
msgstr ""
6982
6983
#: bzrlib/plugins/weave_fmt/bzrdir.py:569
6984
msgid "Finding branch files"
6985
msgstr ""
6986
6987
#: bzrlib/plugins/weave_fmt/bzrdir.py:579
6988
msgid "Upgrading repository"
6989
msgstr ""
6990
6991
#: bzrlib/plugins/weave_fmt/bzrdir.py:589
6992
msgid "Upgrading branch"
6993
msgstr ""
6994
6995
#: bzrlib/plugins/weave_fmt/bzrdir.py:612
6996
msgid "No working tree."
6997
msgstr ""
6998
6999
#: bzrlib/plugins/weave_fmt/bzrdir.py:619
7000
msgid "Upgrading working tree"
7001
msgstr ""
7002
7003
#: bzrlib/plugins/weave_fmt/bzrdir.py:640
7004
#, python-format
7005
msgid "Make %s lock"
7006
msgstr ""
7007
7008
#: bzrlib/plugins/weave_fmt/bzrdir.py:651
7009
#, python-format
7010
msgid "Moving %s"
7011
msgstr ""
7012
7013
#: bzrlib/push.py:56
7014
msgid "Created new branch."
7015
msgstr ""
7016
7017
#: bzrlib/push.py:98
7018
#, python-format
7019
msgid ""
7020
"Target directory %s already contains a .bzr directory, but it is not valid."
7021
msgstr ""
7022
7023
#: bzrlib/push.py:101
7024
#, python-format
7025
msgid ""
7026
"Target directory %s already exists, but does not have a .bzr directory. "
7027
"Supply --use-existing-dir to push there anyway."
7028
msgstr ""
7029
7030
#: bzrlib/push.py:122
7031
#, python-format
7032
msgid "Too many redirections trying to make %s."
7033
msgstr ""
7034
7035
#: bzrlib/push.py:147
7036
msgid ""
7037
"These branches have diverged. See \"bzr help diverged-branches\" for more "
7038
"information."
7039
msgstr ""
7040
7041
#: bzrlib/push.py:151
7042
#, python-format
7043
msgid ""
7044
"It is not possible to losslessly push to %s. You may want to use dpush "
7045
"instead."
7046
msgstr ""
7047
7048
#: bzrlib/push.py:157
7049
#, python-format
7050
msgid ""
7051
"At %s you have a valid .bzr control directory, but not a branch or "
7052
"repository. This is an unsupported configuration. Please move the target "
7053
"directory out of the way and try again."
7054
msgstr ""
7055
7056
#: bzrlib/reconcile.py:97
7057
#, python-format
7058
msgid "Reconciling branch %s"
7059
msgstr ""
7060
7061
#: bzrlib/reconcile.py:103
7062
#, python-format
7063
msgid "Reconciling repository %s"
7064
msgstr ""
7065
7066
#: bzrlib/reconcile.py:105
7067
msgid "Reconciling repository"
7068
msgstr ""
7069
7070
#: bzrlib/reconcile.py:111
7071
#, python-format
7072
msgid "%s cannot canonicalize CHKs."
7073
msgstr ""
7074
7075
#: bzrlib/reconcile.py:119
7076
msgid "Reconcile aborted: revision index has inconsistent parents."
7077
msgstr ""
7078
7079
#: bzrlib/reconcile.py:121
7080
msgid "Run \"bzr check\" for more details."
7081
msgstr ""
7082
7083
#: bzrlib/reconcile.py:123
7084
msgid "Reconciliation complete."
7085
msgstr ""
7086
7087
#: bzrlib/reconcile.py:166
7088
msgid "Fixing last revision info {0} => {1}"
7089
msgstr ""
7090
7091
#: bzrlib/reconcile.py:173
7092
msgid "revision_history ok."
7093
msgstr ""
7094
7095
#: bzrlib/reconcile.py:234
7096
msgid "Reading inventory data"
7097
msgstr ""
7098
7099
#: bzrlib/reconcile.py:254 bzrlib/reconcile.py:384
7100
msgid "Inventory ok."
7101
msgstr ""
7102
7103
#: bzrlib/reconcile.py:256 bzrlib/reconcile.py:386
7104
msgid "Backing up inventory"
7105
msgstr ""
7106
7107
#: bzrlib/reconcile.py:258
7108
msgid "Backup inventory created."
7109
msgstr ""
7110
7111
#: bzrlib/reconcile.py:274 bzrlib/reconcile.py:405
7112
msgid "Writing weave"
7113
msgstr ""
7114
7115
#: bzrlib/reconcile.py:277 bzrlib/reconcile.py:408
7116
msgid "Inventory regenerated."
7117
msgstr ""
7118
7119
#: bzrlib/reconcile.py:371 bzrlib/reconcile.py:373 bzrlib/reconcile.py:376
7120
msgid "Reading indexes"
7121
msgstr ""
7122
7123
#: bzrlib/reconcile.py:380 bzrlib/reconcile.py:382
7124
msgid "Checking unused inventories"
7125
msgstr ""
7126
7127
#: bzrlib/reconcile.py:388
7128
msgid "Backup Inventory created"
7129
msgstr ""
7130
7131
#: bzrlib/reconcile.py:446
7132
msgid "Fixing text parents"
7133
msgstr ""
7134
7135
#: bzrlib/reconfigure.py:54
7136
msgid "{0} is now stacked on {1}\n"
7137
msgstr ""
7138
7139
#: bzrlib/reconfigure.py:69
7140
#, python-format
7141
msgid "%s is now not stacked\n"
7142
msgstr ""
7143
7144
#: bzrlib/remote.py:1180 bzrlib/repository.py:289
7145
#, python-format
7146
msgid "bzr: ERROR (ignored): %s"
7147
msgstr ""
7148
7149
#: bzrlib/remote.py:2493
7150
msgid "Copying repository content as tarball..."
7151
msgstr ""
7152
7153
#: bzrlib/rename_map.py:69
7154
msgid "Calculating hashes"
7155
msgstr ""
7156
7157
#: bzrlib/rename_map.py:107
7158
msgid "Determining hash hits"
7159
msgstr ""
7160
7161
#: bzrlib/rename_map.py:242
7162
msgid "{0} => {1}"
7163
msgstr ""
7164
7165
#: bzrlib/repository.py:1787
7166
msgid "Moving repository to repository.backup"
7167
msgstr ""
7168
7169
#: bzrlib/repository.py:1794
7170
msgid "Creating new repository"
7171
msgstr ""
7172
7173
#: bzrlib/repository.py:1799
7174
msgid "Copying content"
7175
msgstr ""
7176
7177
#: bzrlib/repository.py:1803
7178
msgid "Deleting old repository content"
7179
msgstr ""
7180
7181
#: bzrlib/repository.py:1805
7182
msgid "repository converted"
7183
msgstr ""
7184
7185
#: bzrlib/revisionspec.py:903
7186
msgid "Using {0} {1}"
7187
msgstr ""
7188
7189
#: bzrlib/send.py:58
7190
#, python-format
7191
msgid "Mail client \"%s\" does not support specifying body"
7192
msgstr ""
7193
7194
#: bzrlib/send.py:62
7195
msgid "--remember requires a branch to be specified."
7196
msgstr ""
7197
7198
#: bzrlib/send.py:77
7199
msgid "No submit branch known or specified"
7200
msgstr ""
7201
7202
#: bzrlib/send.py:80
7203
msgid "Using saved {0} location \"{1}\" to determine what changes to submit."
7204
msgstr ""
7205
7206
#: bzrlib/send.py:98
7207
#, python-format
7208
msgid "No such send format '%s'."
7209
msgstr ""
7210
7211
#: bzrlib/send.py:114
7212
msgid "bzr send takes at most two one revision identifiers"
7213
msgstr ""
7214
7215
#: bzrlib/send.py:127
7216
msgid "No revisions to submit."
7217
msgstr ""
7218
7219
#: bzrlib/send.py:139
7220
msgid ""
7221
"- not supported for merge directives that use more than one output file."
7222
msgstr ""
7223
7224
#: bzrlib/send.py:185
7225
msgid "Format 0.9 does not permit bundle with no patch"
7226
msgstr ""
7227
7228
#: bzrlib/shelf_ui.py:46
7229
#, python-format
7230
msgid "Shelve adding file \"%(path)s\"?"
7231
msgstr ""
7232
7233
#: bzrlib/shelf_ui.py:47
7234
msgid "Shelve binary changes?"
7235
msgstr ""
7236
7237
#: bzrlib/shelf_ui.py:48
7238
msgid "Shelve changing \"%s\" from %(other)s to %(this)s?"
7239
msgstr ""
7240
7241
#: bzrlib/shelf_ui.py:50
7242
#, python-format
7243
msgid "Shelve removing file \"%(path)s\"?"
7244
msgstr ""
7245
7246
#: bzrlib/shelf_ui.py:51
7247
#, python-format
7248
msgid "Shelve %d change(s)?"
7249
msgstr ""
7250
7251
#: bzrlib/shelf_ui.py:52
7252
msgid "Shelve?"
7253
msgstr ""
7254
7255
#: bzrlib/shelf_ui.py:53
7256
#, python-format
7257
msgid ""
7258
"Shelve changing target of \"%(path)s\" from \"%(other)s\" to \"%(this)s\"?"
7259
msgstr ""
7260
7261
#: bzrlib/shelf_ui.py:55
7262
#, python-format
7263
msgid "Shelve renaming \"%(other)s\" => \"%(this)s\"?"
7264
msgstr ""
7265
7266
#: bzrlib/shelf_ui.py:70
7267
#, python-format
7268
msgid "Changes shelved with id \"%d\"."
7269
msgstr ""
7270
7271
#: bzrlib/shelf_ui.py:74
7272
msgid "Selected changes destroyed."
7273
msgstr ""
7274
7275
#: bzrlib/shelf_ui.py:78
7276
msgid "Selected changes:"
7277
msgstr ""
7278
7279
#: bzrlib/shelf_ui.py:98
7280
#, python-format
7281
msgid "Delete file \"%(path)s\"?"
7282
msgstr ""
7283
7284
#: bzrlib/shelf_ui.py:99
7285
msgid "Apply binary changes?"
7286
msgstr ""
7287
7288
#: bzrlib/shelf_ui.py:100
7289
#, python-format
7290
msgid "Change \"%(path)s\" from %(this)s to %(other)s?"
7291
msgstr ""
7292
7293
#: bzrlib/shelf_ui.py:102
7294
#, python-format
7295
msgid "Add file \"%(path)s\"?"
7296
msgstr ""
7297
7298
#: bzrlib/shelf_ui.py:103
7299
#, python-format
7300
msgid "Apply %d change(s)?"
7301
msgstr ""
7302
7303
#: bzrlib/shelf_ui.py:104
7304
msgid "Apply change?"
7305
msgstr ""
7306
7307
#: bzrlib/shelf_ui.py:105
7308
#, python-format
7309
msgid "Change target of \"%(path)s\" from \"%(this)s\" to \"%(other)s\"?"
7310
msgstr ""
7311
7312
#: bzrlib/shelf_ui.py:107
7313
#, python-format
7314
msgid "Rename \"%(this)s\" => \"%(other)s\"?"
7315
msgstr ""
7316
7317
#: bzrlib/shelf_ui.py:402
7318
msgid "No changes are shelved."
7319
msgstr ""
7320
7321
#: bzrlib/shelf_ui.py:460
7322
#, python-format
7323
msgid "Using changes with id \"%d\"."
7324
msgstr ""
7325
7326
#: bzrlib/shelf_ui.py:464
7327
#, python-format
7328
msgid "Message: %s"
7329
msgstr ""
7330
7331
#: bzrlib/shelf_ui.py:476
7332
#, python-format
7333
msgid "Deleted changes with id \"%d\"."
7334
msgstr ""
7335
7336
#: bzrlib/smart/medium.py:714
7337
msgid "HPSS calls: {0} ({1} vfs) {2}"
7338
msgstr ""
7339
7340
#: bzrlib/smart/server.py:169
7341
msgid "Requested to stop gracefully"
7342
msgstr ""
7343
7344
#: bzrlib/smart/server.py:179
7345
#, python-format
7346
msgid "Waiting for %d client(s) to finish"
7347
msgstr ""
7348
7349
#: bzrlib/smart/server.py:185
7350
#, python-format
7351
msgid "Still waiting for %d client(s) to finish"
7352
msgstr ""
7353
7354
#: bzrlib/smart/server.py:219
7355
#, python-format
7356
msgid "listening socket error: %s"
7357
msgstr ""
7358
7359
#: bzrlib/smart/server.py:452
7360
#, python-format
7361
msgid "listening on port: %s"
7362
msgstr ""
7363
7364
#: bzrlib/switch.py:69
7365
msgid "Pending merges must be committed or reverted before using switch."
7366
msgstr ""
7367
7368
#: bzrlib/switch.py:96
7369
msgid ""
7370
"Cannot switch as local commits found in the checkout. Commit these to the "
7371
"bound branch or use --force to throw them away."
7372
msgstr ""
7373
7374
#: bzrlib/switch.py:101
7375
#, python-format
7376
msgid ""
7377
"Unable to connect to current master branch %(target)s: %(error)s To switch "
7378
"anyway, use --force."
7379
msgstr ""
7380
7381
#: bzrlib/switch.py:110
7382
msgid "Cannot switch a branch, only a checkout."
7383
msgstr ""
7384
7385
#: bzrlib/switch.py:146
7386
#, python-format
7387
msgid "Tree is up to date at revision %d."
7388
msgstr ""
7389
7390
#: bzrlib/switch.py:152
7391
#, python-format
7392
msgid "Updated to revision %d."
7393
msgstr ""
7394
7395
#: bzrlib/transform.py:1730 bzrlib/transform.py:1741 bzrlib/transform.py:1743
7396
msgid "Apply phase"
7397
msgstr ""
7398
7399
#: bzrlib/transform.py:1769 bzrlib/transform.py:1837
7400
msgid "removing file"
7401
msgstr ""
7402
7403
#: bzrlib/transform.py:1787 bzrlib/transform.py:1872
7404
msgid "adding file"
7405
msgstr ""
7406
7407
#: bzrlib/transform.py:2587
7408
msgid "Building tree"
7409
msgstr ""
7410
7411
#: bzrlib/transform.py:2677 bzrlib/transform.py:2704
7412
msgid "Adding file contents"
7413
msgstr ""
7414
7415
#: bzrlib/transform.py:3024
7416
msgid "Resolution pass"
7417
msgstr ""
7418
7419
#: bzrlib/transport/ftp/_gssapi.py:88
7420
#, python-format
7421
msgid "Authenticated as %s"
7422
msgstr ""
7423
7424
#: bzrlib/tree.py:634
7425
msgid "*** {0} content-filter: {1} => {2!r}"
7426
msgstr ""
7427
7428
#: bzrlib/upgrade.py:77
7429
#, python-format
7430
msgid "This is a checkout. The branch (%s) needs to be upgraded separately."
7431
msgstr ""
7432
7433
#: bzrlib/upgrade.py:100
7434
#, python-format
7435
msgid "cannot upgrade from bzrdir format %s"
7436
msgstr ""
7437
7438
#: bzrlib/upgrade.py:103
7439
#, python-format
7440
msgid "starting upgrade of %s"
7441
msgstr ""
7442
7443
#: bzrlib/upgrade.py:110
7444
msgid "finished"
7445
msgstr ""
7446
7447
#: bzrlib/upgrade.py:120
7448
msgid "Deleting backup.bzr"
7449
msgstr ""
7450
7451
#: bzrlib/upgrade.py:151
7452
msgid ""
7453
"\n"
7454
"SUMMARY: {0} upgrades attempted, {1} succeeded, {2} failed"
7455
msgstr ""
7456
7457
#: bzrlib/upgrade.py:208
7458
#, python-format
7459
msgid "Found %d dependent branches - upgrading ..."
7460
msgstr ""
7461
7462
#: bzrlib/upgrade.py:276
7463
msgid "Upgrading bzrdirs"
7464
msgstr ""
7465
7466
#: bzrlib/upgrade.py:282
7467
#, python-format
7468
msgid "Upgrading %s"
7469
msgstr ""
7470
7471
#: bzrlib/upgrade.py:283
7472
msgid "Upgrading {0} {1} ..."
7473
msgstr ""
7474
7475
#: bzrlib/upgrade.py:301
7476
msgid "Removing backup ..."
7477
msgstr ""
7478
7479
#: bzrlib/upgrade.py:305
7480
msgid "failed to clean-up {0}: {1}"
7481
msgstr ""
7482
7483
#: bzrlib/vf_repository.py:1090
7484
msgid "inventories"
7485
msgstr ""
7486
7487
#: bzrlib/vf_repository.py:1116
7488
msgid "texts"
7489
msgstr ""
7490
7491
#: bzrlib/vf_repository.py:1621 bzrlib/vf_repository.py:1630
7492
msgid "Calculating text parents"
7493
msgstr ""
7494
7495
#: bzrlib/vf_repository.py:1706
7496
msgid "Fetch texts"
7497
msgstr ""
7498
7499
#: bzrlib/vf_repository.py:2535
7500
msgid "loading text store"
7501
msgstr ""
7502
7503
#: bzrlib/vf_repository.py:2541
7504
msgid "checking text graph"
7505
msgstr ""
7506
7507
#: bzrlib/vf_repository.py:2995 bzrlib/vf_repository.py:3009
7508
#: bzrlib/vf_repository.py:3124
7509
msgid "Transferring revisions"
7510
msgstr ""
7511
7512
#: bzrlib/win32utils.py:146
7513
msgid "Failed to GetProcessMemoryInfo()"
7514
msgstr ""
7515
7516
#: bzrlib/win32utils.py:167
7517
msgid "Cannot debug memory on win32 without ctypes or win32process"
7518
msgstr ""
7519
7520
#: bzrlib/win32utils.py:172
7521
msgid "WorkingSize {0:>7}KiB\tPeakWorking {1:>7}KiB\t{2}"
7522
msgstr ""
7523
7524
#: bzrlib/win32utils.py:180
7525
#, python-format
7526
msgid "WorkingSize %8d KiB"
7527
msgstr ""
7528
7529
#: bzrlib/win32utils.py:181
7530
#, python-format
7531
msgid "PeakWorking %8d KiB"
7532
msgstr ""
7533
7534
#: bzrlib/win32utils.py:182
7535
#, python-format
7536
msgid "PagefileUsage %8d KiB"
7537
msgstr ""
7538
7539
#: bzrlib/win32utils.py:183
7540
#, python-format
7541
msgid "PeakPagefileUsage %8d KiB"
7542
msgstr ""
7543
7544
#: bzrlib/win32utils.py:185
7545
#, python-format
7546
msgid "PrivateUsage %8d KiB"
7547
msgstr ""
7548
7549
#: bzrlib/win32utils.py:186
7550
#, python-format
7551
msgid "PageFaultCount %8d"
7552
msgstr ""
7553
7554
#: bzrlib/workingtree.py:1478
7555
msgid "Rerun update after fixing the conflicts."
7556
msgstr ""
7557
7558
#: dummy/help_topics/authentication/summary.txt:1
7559
msgid "Information on configuring authentication"
7560
msgstr ""
7561
7562
#: dummy/help_topics/basic/detail.txt:1
7563
msgid ""
7564
"Bazaar 2.5b5 -- a free distributed version-control tool\n"
7565
"http://bazaar.canonical.com/"
7566
msgstr ""
7567
7568
#: dummy/help_topics/basic/detail.txt:4
7569
msgid ""
7570
"Basic commands:\n"
7571
" bzr init makes this directory a versioned branch\n"
7572
" bzr branch make a copy of another branch"
7573
msgstr ""
7574
7575
#: dummy/help_topics/basic/detail.txt:8
7576
msgid ""
7577
" bzr add make files or directories versioned\n"
7578
" bzr ignore ignore a file or pattern\n"
7579
" bzr mv move or rename a versioned file"
7580
msgstr ""
7581
7582
#: dummy/help_topics/basic/detail.txt:12
7583
msgid ""
7584
" bzr status summarize changes in working copy\n"
7585
" bzr diff show detailed diffs"
7586
msgstr ""
7587
7588
#: dummy/help_topics/basic/detail.txt:15
7589
msgid ""
7590
" bzr merge pull in changes from another branch\n"
7591
" bzr commit save some or all changes\n"
7592
" bzr send send changes via email"
7593
msgstr ""
7594
7595
#: dummy/help_topics/basic/detail.txt:19
7596
msgid ""
7597
" bzr log show history of changes\n"
7598
" bzr check validate storage"
7599
msgstr ""
7600
7601
#: dummy/help_topics/basic/detail.txt:22
7602
msgid ""
7603
" bzr help init more help on e.g. init command\n"
7604
" bzr help commands list all commands\n"
7605
" bzr help topics list all help topics\n"
7606
msgstr ""
7607
7608
#: dummy/help_topics/basic/summary.txt:1
7609
msgid "Basic commands"
7610
msgstr ""
7611
7612
#: dummy/help_topics/branches/detail.txt:1
7613
msgid "Branches"
7614
msgstr ""
7615
7616
#: dummy/help_topics/branches/detail.txt:3
7617
msgid ""
7618
"A branch consists of the state of a project, including all of its\n"
7619
"history. All branches have a repository associated (which is where the\n"
7620
"branch history is stored), but multiple branches may share the same\n"
7621
"repository (a shared repository). Branches can be copied and merged."
7622
msgstr ""
7623
7624
#: dummy/help_topics/branches/detail.txt:8
7625
msgid ""
7626
"In addition, one branch may be bound to another one. Binding to another\n"
7627
"branch indicates that commits which happen in this branch must also \n"
7628
"happen in the other branch. Bazaar ensures consistency by not allowing \n"
7629
"commits when the two branches are out of date. In order for a commit \n"
7630
"to succeed, it may be necessary to update the current branch using \n"
7631
"``bzr update``."
7632
msgstr ""
7633
7634
#: dummy/help_topics/branches/detail.txt:15
7635
#: dummy/help_topics/checkouts/detail.txt:66
7636
#: dummy/help_topics/repositories/detail.txt:36
7637
msgid "Related commands::"
7638
msgstr ""
7639
7640
#: dummy/help_topics/branches/detail.txt:17
7641
msgid ""
7642
" init Change a directory into a versioned branch.\n"
7643
" branch Create a new branch that is a copy of an existing branch.\n"
7644
" merge Perform a three-way merge.\n"
7645
" bind Bind a branch to another one.\n"
7646
msgstr ""
7647
7648
#: dummy/help_topics/branches/summary.txt:1
7649
msgid "Information on what a branch is"
7650
msgstr ""
7651
7652
#: dummy/help_topics/bugs/summary.txt:1
7653
msgid "Bug tracker settings"
7654
msgstr ""
7655
7656
#: dummy/help_topics/checkouts/detail.txt:1
7657
msgid "Checkouts"
7658
msgstr ""
7659
7660
#: dummy/help_topics/checkouts/detail.txt:3
7661
msgid ""
7662
"Checkouts are source trees that are connected to a branch, so that when\n"
7663
"you commit in the source tree, the commit goes into that branch. They\n"
7664
"allow you to use a simpler, more centralized workflow, ignoring some of\n"
7665
"Bazaar's decentralized features until you want them. Using checkouts\n"
7666
"with shared repositories is very similar to working with SVN or CVS, but\n"
7667
"doesn't have the same restrictions. And using checkouts still allows\n"
7668
"others working on the project to use whatever workflow they like."
7669
msgstr ""
7670
7671
#: dummy/help_topics/checkouts/detail.txt:11
7672
msgid ""
7673
"A checkout is created with the bzr checkout command (see \"help "
7674
"checkout\").\n"
7675
"You pass it a reference to another branch, and it will create a local copy\n"
7676
"for you that still contains a reference to the branch you created the\n"
7677
"checkout from (the master branch). Then if you make any commits they will "
7678
"be\n"
7679
"made on the other branch first. This creates an instant mirror of your work, "
7680
"or\n"
7681
"facilitates lockstep development, where each developer is working together,\n"
7682
"continuously integrating the changes of others."
7683
msgstr ""
7684
7685
#: dummy/help_topics/checkouts/detail.txt:19
7686
msgid ""
7687
"However the checkout is still a first class branch in Bazaar terms, so that\n"
7688
"you have the full history locally. As you have a first class branch you "
7689
"can\n"
7690
"also commit locally if you want, for instance due to the temporary loss af "
7691
"a\n"
7692
"network connection. Use the --local option to commit to do this. All the "
7693
"local\n"
7694
"commits will then be made on the master branch the next time you do a non-"
7695
"local\n"
7696
"commit."
7697
msgstr ""
7698
7699
#: dummy/help_topics/checkouts/detail.txt:26
7700
msgid ""
7701
"If you are using a checkout from a shared branch you will periodically want "
7702
"to\n"
7703
"pull in all the changes made by others. This is done using the \"update\"\n"
7704
"command. The changes need to be applied before any non-local commit, but\n"
7705
"Bazaar will tell you if there are any changes and suggest that you use this\n"
7706
"command when needed."
7707
msgstr ""
7708
7709
#: dummy/help_topics/checkouts/detail.txt:32
7710
msgid ""
7711
"It is also possible to create a \"lightweight\" checkout by passing the\n"
7712
"--lightweight flag to checkout. A lightweight checkout is even closer to an\n"
7713
"SVN checkout in that it is not a first class branch, it mainly consists of "
7714
"the\n"
7715
"working tree. This means that any history operations must query the master\n"
7716
"branch, which could be slow if a network connection is involved. Also, as "
7717
"you\n"
7718
"don't have a local branch, then you cannot commit locally."
7719
msgstr ""
7720
7721
#: dummy/help_topics/checkouts/detail.txt:39
7722
msgid ""
7723
"Lightweight checkouts work best when you have fast reliable access to the\n"
7724
"master branch. This means that if the master branch is on the same disk or "
7725
"LAN\n"
7726
"a lightweight checkout will be faster than a heavyweight one for any "
7727
"commands\n"
7728
"that modify the revision history (as only one copy of the branch needs to\n"
7729
"be updated). Heavyweight checkouts will generally be faster for any command\n"
7730
"that uses the history but does not change it, but if the master branch is "
7731
"on\n"
7732
"the same disk then there won't be a noticeable difference."
7733
msgstr ""
7734
7735
#: dummy/help_topics/checkouts/detail.txt:47
7736
msgid ""
7737
"Another possible use for a checkout is to use it with a treeless repository\n"
7738
"containing your branches, where you maintain only one working tree by\n"
7739
"switching the master branch that the checkout points to when you want to\n"
7740
"work on a different branch."
7741
msgstr ""
7742
7743
#: dummy/help_topics/checkouts/detail.txt:52
7744
msgid ""
7745
"Obviously to commit on a checkout you need to be able to write to the "
7746
"master\n"
7747
"branch. This means that the master branch must be accessible over a "
7748
"writeable\n"
7749
"protocol , such as sftp://, and that you have write permissions at the "
7750
"other\n"
7751
"end. Checkouts also work on the local file system, so that all that matters "
7752
"is\n"
7753
"file permissions."
7754
msgstr ""
7755
7756
#: dummy/help_topics/checkouts/detail.txt:58
7757
msgid ""
7758
"You can change the master of a checkout by using the \"switch\" command "
7759
"(see\n"
7760
"\"help switch\"). This will change the location that the commits are sent "
7761
"to.\n"
7762
"The \"bind\" command can also be used to turn a normal branch into a heavy\n"
7763
"checkout. If you would like to convert your heavy checkout into a normal\n"
7764
"branch so that every commit is local, you can use the \"unbind\" command. To "
7765
"see\n"
7766
"whether or not a branch is bound or not you can use the \"info\" command. If "
7767
"the\n"
7768
"branch is bound it will tell you the location of the bound branch."
7769
msgstr ""
7770
7771
#: dummy/help_topics/checkouts/detail.txt:68
7772
msgid ""
7773
" checkout Create a checkout. Pass --lightweight to get a lightweight\n"
7774
" checkout\n"
7775
" update Pull any changes in the master branch in to your checkout\n"
7776
" commit Make a commit that is sent to the master branch. If you have\n"
7777
" a heavy checkout then the --local option will commit to the\n"
7778
" checkout without sending the commit to the master\n"
7779
" switch Change the master branch that the commits in the checkout "
7780
"will\n"
7781
" be sent to\n"
7782
" bind Turn a standalone branch into a heavy checkout so that any\n"
7783
" commits will be sent to the master branch\n"
7784
" unbind Turn a heavy checkout into a standalone branch so that any\n"
7785
" commits are only made locally\n"
7786
" info Displays whether a branch is bound or unbound. If the branch "
7787
"is\n"
7788
" bound, then it will also display the location of the bound "
7789
"branch\n"
7790
msgstr ""
7791
7792
#: dummy/help_topics/checkouts/summary.txt:1
7793
msgid "Information on what a checkout is"
7794
msgstr ""
7795
7796
#: dummy/help_topics/commands/summary.txt:1
7797
msgid "Basic help for all commands"
7798
msgstr ""
7799
7800
#: dummy/help_topics/configuration/summary.txt:1
7801
msgid "Details on the configuration settings available"
7802
msgstr ""
7803
7804
#: dummy/help_topics/conflict-types/summary.txt:1
7805
msgid "Types of conflicts and what to do about them"
7806
msgstr ""
7807
7808
#: dummy/help_topics/content-filters/summary.txt:1
7809
msgid "Conversion of content into/from working trees"
7810
msgstr ""
7811
7812
#: dummy/help_topics/criss-cross/detail.txt:1
7813
msgid "Criss-Cross"
7814
msgstr ""
7815
7816
#: dummy/help_topics/criss-cross/detail.txt:3
7817
msgid ""
7818
"A criss-cross in the branch history can cause the default merge technique\n"
7819
"to emit more conflicts than would normally be expected."
7820
msgstr ""
7821
7822
#: dummy/help_topics/criss-cross/detail.txt:6
7823
msgid ""
7824
"In complex merge cases, ``bzr merge --lca`` or ``bzr merge --weave`` may "
7825
"give\n"
7826
"better results. You may wish to ``bzr revert`` the working tree and merge\n"
7827
"again. Alternatively, use ``bzr remerge`` on particular conflicted files."
7828
msgstr ""
7829
7830
#: dummy/help_topics/criss-cross/detail.txt:10
7831
msgid ""
7832
"Criss-crosses occur in a branch's history if two branches merge the same "
7833
"thing\n"
7834
"and then merge one another, or if two branches merge one another at the "
7835
"same\n"
7836
"time. They can be avoided by having each branch only merge from or into a\n"
7837
"designated central branch (a \"star topology\")."
7838
msgstr ""
7839
7840
#: dummy/help_topics/criss-cross/detail.txt:15
7841
msgid ""
7842
"Criss-crosses cause problems because of the way merge works. Bazaar's "
7843
"default\n"
7844
"merge is a three-way merger; in order to merge OTHER into THIS, it must\n"
7845
"find a basis for comparison, BASE. Using BASE, it can determine whether\n"
7846
"differences between THIS and OTHER are due to one side adding lines, or\n"
7847
"from another side removing lines."
7848
msgstr ""
7849
7850
#: dummy/help_topics/criss-cross/detail.txt:21
7851
msgid ""
7852
"Criss-crosses mean there is no good choice for a base. Selecting the "
7853
"recent\n"
7854
"merge points could cause one side's changes to be silently discarded.\n"
7855
"Selecting older merge points (which Bazaar does) mean that extra conflicts\n"
7856
"are emitted."
7857
msgstr ""
7858
7859
#: dummy/help_topics/criss-cross/detail.txt:26
7860
msgid ""
7861
"The ``weave`` merge type is not affected by this problem because it uses\n"
7862
"line-origin detection instead of a basis revision to determine the cause of\n"
7863
"differences.\n"
7864
msgstr ""
7865
7866
#: dummy/help_topics/criss-cross/summary.txt:1
7867
msgid "Information on criss-cross merging"
7868
msgstr ""
7869
7870
#: dummy/help_topics/current-formats/summary.txt:1
7871
msgid "Current storage formats"
7872
msgstr ""
7873
7874
#: dummy/help_topics/debug-flags/summary.txt:1
7875
msgid "Options to show or record debug information"
7876
msgstr ""
7877
7878
#: dummy/help_topics/diverged-branches/summary.txt:1
7879
msgid "How to fix diverged branches"
7880
msgstr ""
7881
7882
#: dummy/help_topics/env-variables/detail.txt:1
7883
msgid "Environment Variables"
7884
msgstr ""
7885
7886
#: dummy/help_topics/env-variables/detail.txt:3
7887
msgid ""
7888
"=================== "
7889
"===========================================================\n"
7890
"BZRPATH Path where bzr is to look for shell plugin external\n"
7891
" commands.\n"
7892
"BZR_EMAIL E-Mail address of the user. Overrides EMAIL.\n"
7893
"EMAIL E-Mail address of the user.\n"
7894
"BZR_EDITOR Editor for editing commit messages. Overrides EDITOR.\n"
7895
"EDITOR Editor for editing commit messages.\n"
7896
"BZR_PLUGIN_PATH Paths where bzr should look for plugins.\n"
7897
"BZR_DISABLE_PLUGINS Plugins that bzr should not load.\n"
7898
"BZR_PLUGINS_AT Plugins to load from a directory not in "
7899
"BZR_PLUGIN_PATH.\n"
7900
"BZR_HOME Directory holding .bazaar config dir. Overrides HOME.\n"
7901
"BZR_HOME (Win32) Directory holding bazaar config dir. Overrides APPDATA "
7902
"and\n"
7903
" HOME.\n"
7904
"BZR_REMOTE_PATH Full name of remote 'bzr' command (for bzr+ssh:// "
7905
"URLs).\n"
7906
"BZR_SSH Path to SSH client, or one of paramiko, openssh, "
7907
"sshcorp,\n"
7908
" plink or lsh.\n"
7909
"BZR_LOG Location of .bzr.log (use '/dev/null' to suppress log).\n"
7910
"BZR_LOG (Win32) Location of .bzr.log (use 'NUL' to suppress log).\n"
7911
"BZR_COLUMNS Override implicit terminal width.\n"
7912
"BZR_CONCURRENCY Number of processes that can be run concurrently "
7913
"(selftest)\n"
7914
"BZR_PROGRESS_BAR Override the progress display. Values are 'none' or "
7915
"'text'.\n"
7916
"BZR_PDB Control whether to launch a debugger on error.\n"
7917
"BZR_SIGQUIT_PDB Control whether SIGQUIT behaves normally or invokes a\n"
7918
" breakin debugger.\n"
7919
"BZR_TEXTUI_INPUT Force console input mode for prompts to line-based "
7920
"(instead\n"
7921
" of char-based).\n"
7922
"=================== "
7923
"===========================================================\n"
7924
msgstr ""
7925
7926
#: dummy/help_topics/env-variables/summary.txt:1
7927
msgid "Environment variable names and values"
7928
msgstr ""
7929
7930
#: dummy/help_topics/eol/summary.txt:1
7931
msgid "Information on end-of-line handling"
7932
msgstr ""
7933
7934
#: dummy/help_topics/files/detail.txt:1
7935
msgid "Files"
7936
msgstr ""
7937
7938
#: dummy/help_topics/files/detail.txt:3
7939
msgid ""
7940
":On Unix: ~/.bazaar/bazaar.conf\n"
7941
":On Windows: C:\\\\Documents and Settings\\\\username\\\\Application Data\\\\"
7942
"bazaar\\\\2.0\\\\bazaar.conf"
7943
msgstr ""
7944
7945
#: dummy/help_topics/files/detail.txt:6
7946
msgid ""
7947
"Contains the user's default configuration. The section ``[DEFAULT]`` is\n"
7948
"used to define general configuration that will be applied everywhere.\n"
7949
"The section ``[ALIASES]`` can be used to create command aliases for\n"
7950
"commonly used options."
7951
msgstr ""
7952
7953
#: dummy/help_topics/files/detail.txt:11
7954
msgid "A typical config file might look something like::"
7955
msgstr ""
7956
7957
#: dummy/help_topics/files/detail.txt:13
7958
msgid ""
7959
" [DEFAULT]\n"
7960
" email=John Doe <jdoe@isp.com>"
7961
msgstr ""
7962
7963
#: dummy/help_topics/files/detail.txt:16
7964
msgid ""
7965
" [ALIASES]\n"
7966
" commit = commit --strict\n"
7967
" log10 = log --short -r -10..-1\n"
7968
msgstr ""
7969
7970
#: dummy/help_topics/files/summary.txt:1
7971
msgid "Information on configuration and log files"
7972
msgstr ""
7973
7974
#: dummy/help_topics/formats/detail.txt:1
7975
msgid "Storage Formats"
7976
msgstr ""
7977
7978
#: dummy/help_topics/formats/detail.txt:3
7979
msgid ""
7980
"To ensure that older clients do not access data incorrectly,\n"
7981
"Bazaar's policy is to introduce a new storage format whenever\n"
7982
"new features requiring new metadata are added. New storage\n"
7983
"formats may also be introduced to improve performance and\n"
7984
"scalability."
7985
msgstr ""
7986
7987
#: dummy/help_topics/formats/detail.txt:9
7988
msgid ""
7989
"The newest format, 2a, is highly recommended. If your\n"
7990
"project is not using 2a, then you should suggest to the\n"
7991
"project owner to upgrade."
7992
msgstr ""
7993
7994
#: dummy/help_topics/formats/detail.txt:13
7995
msgid ""
7996
"\n"
7997
".. note::"
7998
msgstr ""
7999
8000
#: dummy/help_topics/formats/detail.txt:16
8001
msgid ""
8002
" Some of the older formats have two variants:\n"
8003
" a plain one and a rich-root one. The latter include an additional\n"
8004
" field about the root of the tree. There is no performance cost\n"
8005
" for using a rich-root format but you cannot easily merge changes\n"
8006
" from a rich-root format into a plain format. As a consequence,\n"
8007
" moving a project to a rich-root format takes some co-ordination\n"
8008
" in that all contributors need to upgrade their repositories\n"
8009
" around the same time. 2a and all future formats will be\n"
8010
" implicitly rich-root."
8011
msgstr ""
8012
8013
#: dummy/help_topics/formats/detail.txt:26
8014
msgid ""
8015
"See :doc:`current-formats-help` for the complete list of\n"
8016
"currently supported formats. See :doc:`other-formats-help` for\n"
8017
"descriptions of any available experimental and deprecated formats.\n"
8018
msgstr ""
8019
8020
#: dummy/help_topics/formats/summary.txt:1
8021
msgid "Information on choosing a storage format"
8022
msgstr ""
8023
8024
#: dummy/help_topics/global-options/detail.txt:1
8025
msgid "Global Options"
8026
msgstr ""
8027
8028
#: dummy/help_topics/global-options/detail.txt:3
8029
msgid ""
8030
"These options may be used with any command, and may appear in front of any\n"
8031
"command. (e.g. ``bzr --profile help``)."
8032
msgstr ""
8033
8034
#: dummy/help_topics/global-options/detail.txt:6
8035
msgid ""
8036
"--version Print the version number. Must be supplied before the "
8037
"command.\n"
8038
"--no-aliases Do not process command aliases when running this command.\n"
8039
"--builtin Use the built-in version of a command, not the plugin "
8040
"version.\n"
8041
" This does not suppress other plugin effects.\n"
8042
"--no-plugins Do not process any plugins.\n"
8043
"--no-l10n Do not translate messages.\n"
8044
"--concurrency Number of processes that can be run concurrently (selftest)."
8045
msgstr ""
8046
8047
#: dummy/help_topics/global-options/detail.txt:14
8048
msgid ""
8049
"--profile Profile execution using the hotshot profiler.\n"
8050
"--lsprof Profile execution using the lsprof profiler.\n"
8051
"--lsprof-file Profile execution using the lsprof profiler, and write the\n"
8052
" results to a specified file. If the filename ends with "
8053
"\".txt\",\n"
8054
" text format will be used. If the filename either starts "
8055
"with\n"
8056
" \"callgrind.out\" or end with \".callgrind\", the output will "
8057
"be\n"
8058
" formatted for use with KCacheGrind. Otherwise, the output\n"
8059
" will be a pickle.\n"
8060
"--coverage Generate line coverage report in the specified directory."
8061
msgstr ""
8062
8063
#: dummy/help_topics/global-options/detail.txt:24
8064
msgid ""
8065
"-Oname=value Override the ``name`` config option setting it to ``value`` "
8066
"for\n"
8067
" the duration of the command. This can be used multiple times "
8068
"if\n"
8069
" several options need to be overridden."
8070
msgstr ""
8071
8072
#: dummy/help_topics/global-options/detail.txt:28
8073
msgid ""
8074
"See http://doc.bazaar.canonical.com/developers/profiling.html for more\n"
8075
"information on profiling."
8076
msgstr ""
8077
8078
#: dummy/help_topics/global-options/detail.txt:31
8079
msgid ""
8080
"A number of debug flags are also available to assist troubleshooting and\n"
8081
"development. See :doc:`debug-flags-help`.\n"
8082
msgstr ""
8083
8084
#: dummy/help_topics/global-options/summary.txt:1
8085
msgid "Options that control how Bazaar runs"
8086
msgstr ""
8087
8088
#: dummy/help_topics/hidden-commands/summary.txt:1
8089
msgid "All hidden commands"
8090
msgstr ""
8091
8092
#: dummy/help_topics/hooks/summary.txt:1
8093
msgid "Points at which custom processing can be added"
8094
msgstr ""
8095
8096
#: dummy/help_topics/launchpad/detail.txt:1
8097
msgid "Integration with Launchpad.net"
8098
msgstr ""
8099
8100
#: dummy/help_topics/launchpad/detail.txt:3
8101
msgid ""
8102
"Launchpad.net provides free Bazaar branch hosting with integrated bug and\n"
8103
"specification tracking."
8104
msgstr ""
8105
8106
#: dummy/help_topics/launchpad/detail.txt:6
8107
msgid ""
8108
"The bzr client (through the plugin called 'launchpad') has special\n"
8109
"features to communicate with Launchpad:"
8110
msgstr ""
8111
8112
#: dummy/help_topics/launchpad/detail.txt:9
8113
msgid ""
8114
" * The launchpad-login command tells Bazaar your Launchpad user name. "
8115
"This\n"
8116
" is then used by the 'lp:' transport to download your branches using\n"
8117
" bzr+ssh://."
8118
msgstr ""
8119
8120
#: dummy/help_topics/launchpad/detail.txt:13
8121
msgid ""
8122
" * The 'lp:' transport uses Launchpad as a directory service: for "
8123
"example\n"
8124
" 'lp:bzr' and 'lp:python' refer to the main branches of the relevant\n"
8125
" projects and may be branched, logged, etc. You can also use the 'lp:'\n"
8126
" transport to refer to specific branches, e.g. lp:~bzr/bzr/trunk."
8127
msgstr ""
8128
8129
#: dummy/help_topics/launchpad/detail.txt:18
8130
msgid ""
8131
" * The 'lp:' bug tracker alias can expand launchpad bug numbers to their\n"
8132
" URLs for use with 'bzr commit --fixes', e.g. 'bzr commit --fixes "
8133
"lp:12345'\n"
8134
" will record a revision property that marks that revision as fixing\n"
8135
" Launchpad bug 12345. When you push that branch to Launchpad it will\n"
8136
" automatically be linked to the bug report."
8137
msgstr ""
8138
8139
#: dummy/help_topics/launchpad/detail.txt:24
8140
msgid ""
8141
" * The register-branch command tells Launchpad about the url of a\n"
8142
" public branch. Launchpad will then mirror the branch, display\n"
8143
" its contents and allow it to be attached to bugs and other\n"
8144
" objects."
8145
msgstr ""
8146
8147
#: dummy/help_topics/launchpad/detail.txt:29
8148
msgid "For more information see http://help.launchpad.net/\n"
8149
msgstr ""
8150
8151
#: dummy/help_topics/launchpad/summary.txt:1
8152
msgid "Using Bazaar with Launchpad.net"
8153
msgstr ""
8154
8155
#: dummy/help_topics/location-alias/summary.txt:1
8156
msgid "Aliases for remembered locations"
8157
msgstr ""
8158
8159
#: dummy/help_topics/log-formats/summary.txt:1
8160
msgid "Details on the logging formats available"
8161
msgstr ""
8162
8163
#: dummy/help_topics/other-formats/summary.txt:1
8164
msgid "Experimental and deprecated storage formats"
8165
msgstr ""
8166
8167
#: dummy/help_topics/patterns/summary.txt:1
8168
msgid "Information on the pattern syntax"
8169
msgstr ""
8170
8171
#: dummy/help_topics/repositories/detail.txt:1
8172
msgid "Repositories"
8173
msgstr ""
8174
8175
#: dummy/help_topics/repositories/detail.txt:3
8176
msgid ""
8177
"Repositories in Bazaar are where committed information is stored. There is\n"
8178
"a repository associated with every branch."
8179
msgstr ""
8180
8181
#: dummy/help_topics/repositories/detail.txt:6
8182
msgid ""
8183
"Repositories are a form of database. Bzr will usually maintain this for\n"
8184
"good performance automatically, but in some situations (e.g. when doing\n"
8185
"very many commits in a short time period) you may want to ask bzr to\n"
8186
"optimise the database indices. This can be done by the 'bzr pack' command."
8187
msgstr ""
8188
8189
#: dummy/help_topics/repositories/detail.txt:11
8190
msgid ""
8191
"By default just running 'bzr init' will create a repository within the new\n"
8192
"branch but it is possible to create a shared repository which allows "
8193
"multiple\n"
8194
"branches to share their information in the same location. When a new branch "
8195
"is\n"
8196
"created it will first look to see if there is a containing shared repository "
8197
"it\n"
8198
"can use."
8199
msgstr ""
8200
8201
#: dummy/help_topics/repositories/detail.txt:17
8202
msgid ""
8203
"When two branches of the same project share a repository, there is\n"
8204
"generally a large space saving. For some operations (e.g. branching\n"
8205
"within the repository) this translates in to a large time saving."
8206
msgstr ""
8207
8208
#: dummy/help_topics/repositories/detail.txt:21
8209
msgid ""
8210
"To create a shared repository use the init-repository command (or the alias\n"
8211
"init-repo). This command takes the location of the repository to create. "
8212
"This\n"
8213
"means that 'bzr init-repository repo' will create a directory named 'repo',\n"
8214
"which contains a shared repository. Any new branches that are created in "
8215
"this\n"
8216
"directory will then use it for storage."
8217
msgstr ""
8218
8219
#: dummy/help_topics/repositories/detail.txt:27
8220
msgid ""
8221
"It is a good idea to create a repository whenever you might create more\n"
8222
"than one branch of a project. This is true for both working areas where you\n"
8223
"are doing the development, and any server areas that you use for hosting\n"
8224
"projects. In the latter case, it is common to want branches without working\n"
8225
"trees. Since the files in the branch will not be edited directly there is "
8226
"no\n"
8227
"need to use up disk space for a working tree. To create a repository in "
8228
"which\n"
8229
"the branches will not have working trees pass the '--no-trees' option to\n"
8230
"'init-repository'."
8231
msgstr ""
8232
8233
#: dummy/help_topics/repositories/detail.txt:38
8234
msgid ""
8235
" init-repository Create a shared repository. Use --no-trees to create "
8236
"one\n"
8237
" in which new branches won't get a working tree.\n"
8238
msgstr ""
8239
8240
#: dummy/help_topics/repositories/summary.txt:1
8241
msgid "Basic information on shared repositories."
8242
msgstr ""
8243
8244
#: dummy/help_topics/revisionspec/summary.txt:1
8245
msgid "Explain how to use --revision"
8246
msgstr ""
8247
8248
#: dummy/help_topics/rules/summary.txt:1
8249
msgid "Information on defining rule-based preferences"
8250
msgstr ""
8251
8252
#: dummy/help_topics/standalone-trees/detail.txt:1
8253
msgid "Standalone Trees"
8254
msgstr ""
8255
8256
#: dummy/help_topics/standalone-trees/detail.txt:3
8257
msgid ""
8258
"A standalone tree is a working tree with an associated repository. It\n"
8259
"is an independently usable branch, with no dependencies on any other.\n"
8260
"Creating a standalone tree (via bzr init) is the quickest way to put\n"
8261
"an existing project under version control."
8262
msgstr ""
8263
8264
#: dummy/help_topics/standalone-trees/detail.txt:8
8265
msgid "Related Commands::"
8266
msgstr ""
8267
8268
#: dummy/help_topics/standalone-trees/detail.txt:10
8269
msgid " init Make a directory into a versioned branch.\n"
8270
msgstr ""
8271
8272
#: dummy/help_topics/standalone-trees/summary.txt:1
8273
msgid "Information on what a standalone tree is"
8274
msgstr ""
8275
8276
#: dummy/help_topics/standard-options/detail.txt:1
8277
msgid "Standard Options"
8278
msgstr ""
8279
8280
#: dummy/help_topics/standard-options/detail.txt:3
8281
msgid "Standard options are legal for all commands."
8282
msgstr ""
8283
8284
#: dummy/help_topics/standard-options/detail.txt:5
8285
msgid ""
8286
"--help, -h Show help message.\n"
8287
"--verbose, -v Display more information.\n"
8288
"--quiet, -q Only display errors and warnings."
8289
msgstr ""
8290
8291
#: dummy/help_topics/standard-options/detail.txt:9
8292
msgid "Unlike global options, standard options can be used in aliases.\n"
8293
msgstr ""
8294
8295
#: dummy/help_topics/standard-options/summary.txt:1
8296
msgid "Options that can be used with any command"
8297
msgstr ""
8298
8299
#: dummy/help_topics/status-flags/detail.txt:1
8300
msgid "Status Flags"
8301
msgstr ""
8302
8303
#: dummy/help_topics/status-flags/detail.txt:3
8304
msgid ""
8305
"Status flags are used to summarise changes to the working tree in a concise\n"
8306
"manner. They are in the form::"
8307
msgstr ""
8308
8309
#: dummy/help_topics/status-flags/detail.txt:6
8310
msgid " xxx <filename>"
8311
msgstr ""
8312
8313
#: dummy/help_topics/status-flags/detail.txt:8
8314
msgid "where the columns' meanings are as follows."
8315
msgstr ""
8316
8317
#: dummy/help_topics/status-flags/detail.txt:10
8318
msgid "Column 1 - versioning/renames::"
8319
msgstr ""
8320
8321
#: dummy/help_topics/status-flags/detail.txt:12
8322
msgid ""
8323
" + File versioned\n"
8324
" - File unversioned\n"
8325
" R File renamed\n"
8326
" ? File unknown\n"
8327
" X File nonexistent (and unknown to bzr)\n"
8328
" C File has conflicts\n"
8329
" P Entry for a pending merge (not a file)"
8330
msgstr ""
8331
8332
#: dummy/help_topics/status-flags/detail.txt:20
8333
msgid "Column 2 - contents::"
8334
msgstr ""
8335
8336
#: dummy/help_topics/status-flags/detail.txt:22
8337
msgid ""
8338
" N File created\n"
8339
" D File deleted\n"
8340
" K File kind changed\n"
8341
" M File modified"
8342
msgstr ""
8343
8344
#: dummy/help_topics/status-flags/detail.txt:27
8345
msgid "Column 3 - execute::"
8346
msgstr ""
8347
8348
#: dummy/help_topics/status-flags/detail.txt:29
8349
msgid " * The execute bit was changed\n"
8350
msgstr ""
8351
8352
#: dummy/help_topics/status-flags/summary.txt:1
8353
msgid "Help on status flags"
8354
msgstr ""
8355
8356
#: dummy/help_topics/sync-for-reconfigure/detail.txt:1
8357
msgid "Branches Out of Sync"
8358
msgstr ""
8359
8360
#: dummy/help_topics/sync-for-reconfigure/detail.txt:3
8361
msgid ""
8362
"When reconfiguring a checkout, tree or branch into a lightweight checkout,\n"
8363
"a local branch must be destroyed. (For checkouts, this is the local branch\n"
8364
"that serves primarily as a cache.) If the branch-to-be-destroyed does not\n"
8365
"have the same last revision as the new reference branch for the lightweight\n"
8366
"checkout, data could be lost, so Bazaar refuses."
8367
msgstr ""
8368
8369
#: dummy/help_topics/sync-for-reconfigure/detail.txt:9
8370
msgid "How you deal with this depends on *why* the branches are out of sync."
8371
msgstr ""
8372
8373
#: dummy/help_topics/sync-for-reconfigure/detail.txt:11
8374
msgid ""
8375
"If you have a checkout and have done local commits, you can get back in "
8376
"sync\n"
8377
"by running \"bzr update\" (and possibly \"bzr commit\")."
8378
msgstr ""
8379
8380
#: dummy/help_topics/sync-for-reconfigure/detail.txt:14
8381
msgid ""
8382
"If you have a branch and the remote branch is out-of-date, you can push\n"
8383
"the local changes using \"bzr push\". If the local branch is out of date, "
8384
"you\n"
8385
"can do \"bzr pull\". If both branches have had changes, you can merge, "
8386
"commit\n"
8387
"and then push your changes. If you decide that some of the changes aren't\n"
8388
"useful, you can \"push --overwrite\" or \"pull --overwrite\" instead.\n"
8389
msgstr ""
8390
8391
#: dummy/help_topics/sync-for-reconfigure/summary.txt:1
8392
msgid "Steps to resolve \"out-of-sync\" when reconfiguring"
8393
msgstr ""
8394
8395
#: dummy/help_topics/topics/summary.txt:1
8396
msgid "Topics list"
8397
msgstr ""
8398
8399
#: dummy/help_topics/url-special-chars/summary.txt:1
8400
msgid "Special character handling in URLs"
8401
msgstr ""
8402
8403
#: dummy/help_topics/urlspec/summary.txt:1
8404
msgid "Supported transport protocols"
8405
msgstr ""
8406
8407
#: dummy/help_topics/working-trees/detail.txt:1
8408
msgid "Working Trees"
8409
msgstr ""
8410
8411
#: dummy/help_topics/working-trees/detail.txt:3
8412
msgid ""
8413
"A working tree is the contents of a branch placed on disk so that you can\n"
8414
"see the files and edit them. The working tree is where you make changes to "
8415
"a\n"
8416
"branch, and when you commit the current state of the working tree is the\n"
8417
"snapshot that is recorded in the commit."
8418
msgstr ""
8419
8420
#: dummy/help_topics/working-trees/detail.txt:8
8421
msgid ""
8422
"When you push a branch to a remote system, a working tree will not be\n"
8423
"created. If one is already present the files will not be updated. The\n"
8424
"branch information will be updated and the working tree will be marked\n"
8425
"as out-of-date. Updating a working tree remotely is difficult, as there\n"
8426
"may be uncommitted changes or the update may cause content conflicts that "
8427
"are\n"
8428
"difficult to deal with remotely."
8429
msgstr ""
8430
8431
#: dummy/help_topics/working-trees/detail.txt:15
8432
msgid ""
8433
"If you have a branch with no working tree you can use the 'checkout' "
8434
"command\n"
8435
"to create a working tree. If you run 'bzr checkout .' from the branch it "
8436
"will\n"
8437
"create the working tree. If the branch is updated remotely, you can update "
8438
"the\n"
8439
"working tree by running 'bzr update' in that directory."
8440
msgstr ""
8441
8442
#: dummy/help_topics/working-trees/detail.txt:20
8443
msgid ""
8444
"If you have a branch with a working tree that you do not want the 'remove-"
8445
"tree'\n"
8446
"command will remove the tree if it is safe. This can be done to avoid the\n"
8447
"warning about the remote working tree not being updated when pushing to the\n"
8448
"branch. It can also be useful when working with a '--no-trees' repository\n"
8449
"(see 'bzr help repositories')."
8450
msgstr ""
8451
8452
#: dummy/help_topics/working-trees/detail.txt:26
8453
msgid ""
8454
"If you want to have a working tree on a remote machine that you push to you\n"
8455
"can either run 'bzr update' in the remote branch after each push, or use "
8456
"some\n"
8457
"other method to update the tree during the push. There is an 'rspush' "
8458
"plugin\n"
8459
"that will update the working tree using rsync as well as doing a push. "
8460
"There\n"
8461
"is also a 'push-and-update' plugin that automates running 'bzr update' via "
8462
"SSH\n"
8463
"after each push."
8464
msgstr ""
8465
8466
#: dummy/help_topics/working-trees/detail.txt:33
8467
msgid "Useful commands::"
8468
msgstr ""
8469
8470
#: dummy/help_topics/working-trees/detail.txt:35
8471
msgid ""
8472
" checkout Create a working tree when a branch does not have one.\n"
8473
" remove-tree Removes the working tree from a branch when it is safe to do "
8474
"so.\n"
8475
" update When a working tree is out of sync with its associated "
8476
"branch\n"
8477
" this will update the tree to match the branch.\n"
8478
msgstr ""
8479
8480
#: dummy/help_topics/working-trees/summary.txt:1
8481
msgid "Information on working trees"
8482
msgstr ""
8483
8484
#: en/help_topics/authentication.txt:1
8485
msgid ""
8486
"Authentication Settings\n"
8487
"======================="
8488
msgstr ""
8489
8490
#: en/help_topics/authentication.txt:4
8491
msgid ""
8492
"\n"
8493
"Intent\n"
8494
"------"
8495
msgstr ""
8496
8497
#: en/help_topics/authentication.txt:8
8498
msgid ""
8499
"Many different authentication policies can be described in the\n"
8500
"``authentication.conf`` file but a particular user should need only a few\n"
8501
"definitions to cover his needs without having to specify a user and a "
8502
"password\n"
8503
"for every branch he uses."
8504
msgstr ""
8505
8506
#: en/help_topics/authentication.txt:13
8507
msgid ""
8508
"The definitions found in this file are used to find the credentials to use "
8509
"for\n"
8510
"a given url. The same credentials can generally be used for as many branches "
8511
"as\n"
8512
"possible by grouping their declaration around the remote servers that need\n"
8513
"them. It's even possible to declare credentials that will be used by "
8514
"different\n"
8515
"servers."
8516
msgstr ""
8517
8518
#: en/help_topics/authentication.txt:19
8519
msgid ""
8520
"The intent is to make this file as small as possible to minimize maintenance."
8521
msgstr ""
8522
8523
#: en/help_topics/authentication.txt:21
8524
msgid ""
8525
"Once the relevant credentials are declared in this file you may use branch "
8526
"urls\n"
8527
"without embedding passwords (security hazard) or even users (enabling "
8528
"sharing\n"
8529
"of your urls with others)."
8530
msgstr ""
8531
8532
#: en/help_topics/authentication.txt:25
8533
msgid "Instead of using::"
8534
msgstr ""
8535
8536
#: en/help_topics/authentication.txt:27
8537
msgid " bzr branch ftp://joe:secret@host.com/path/to/my/branch"
8538
msgstr ""
8539
8540
#: en/help_topics/authentication.txt:29
8541
msgid "you simply use::"
8542
msgstr ""
8543
8544
#: en/help_topics/authentication.txt:31
8545
msgid " bzr branch ftp://host.com/path/to/my/branch"
8546
msgstr ""
8547
8548
#: en/help_topics/authentication.txt:33
8549
msgid ""
8550
"provided you have created the following ``authentication.conf`` file::"
8551
msgstr ""
8552
8553
#: en/help_topics/authentication.txt:35
8554
msgid ""
8555
" [myprojects]\n"
8556
" scheme=ftp\n"
8557
" host=host.com\n"
8558
" user=joe\n"
8559
" password=secret\n"
8560
" "
8561
msgstr ""
8562
8563
#: en/help_topics/authentication.txt:42
8564
msgid ""
8565
"Authentication definitions\n"
8566
"--------------------------"
8567
msgstr ""
8568
8569
#: en/help_topics/authentication.txt:45
8570
msgid ""
8571
"There are two kinds of authentication used by the various schemes supported "
8572
"by\n"
8573
"bzr:"
8574
msgstr ""
8575
8576
#: en/help_topics/authentication.txt:48
8577
msgid "1. user and password"
8578
msgstr ""
8579
8580
#: en/help_topics/authentication.txt:50
8581
msgid ""
8582
"``FTP`` needs a (``user``, ``password``) to authenticate against a ``host``\n"
8583
"``SFTP`` can use either a password or a host key to authenticate. However,\n"
8584
"ssh agents are a better, more secure solution. So we have chosen to not "
8585
"provide\n"
8586
"our own less secure method."
8587
msgstr ""
8588
8589
#: en/help_topics/authentication.txt:55
8590
msgid "2. user, realm and password"
8591
msgstr ""
8592
8593
#: en/help_topics/authentication.txt:57
8594
msgid ""
8595
"``HTTP`` and ``HTTPS`` needs a (``user, realm, password``) to authenticate\n"
8596
"against a host. But, by using ``.htaccess`` files, for example, it is "
8597
"possible\n"
8598
"to define several (``user, realm, password``) for a given ``host``. So what "
8599
"is\n"
8600
"really needed is (``user``, ``password``, ``host``, ``path``). The ``realm`` "
8601
"is\n"
8602
"not taken into account in the definitions, but will displayed if bzr "
8603
"prompts\n"
8604
"you for a password."
8605
msgstr ""
8606
8607
#: en/help_topics/authentication.txt:64
8608
msgid ""
8609
"``HTTP proxy`` can be handled as ``HTTP`` (or ``HTTPS``) by explicitly\n"
8610
"specifying the appropriate port."
8611
msgstr ""
8612
8613
#: en/help_topics/authentication.txt:67
8614
msgid ""
8615
"To take all schemes into account, the password will be deduced from a set "
8616
"of\n"
8617
"authentication definitions (``scheme``, ``host``, ``port``, ``path``, "
8618
"``user``,\n"
8619
"``password``)."
8620
msgstr ""
8621
8622
#: en/help_topics/authentication.txt:71
8623
msgid ""
8624
" * ``scheme``: can be empty (meaning the rest of the definition can be "
8625
"used\n"
8626
" for any scheme), ``SFTP`` and ``bzr+ssh`` should not be used here, "
8627
"``ssh``\n"
8628
" should be used instead since this is the real scheme regarding\n"
8629
" authentication,"
8630
msgstr ""
8631
8632
#: en/help_topics/authentication.txt:76
8633
msgid " * ``host``: can be empty (to act as a default for any host),"
8634
msgstr ""
8635
8636
#: en/help_topics/authentication.txt:78
8637
msgid ""
8638
" * ``port`` can be empty (useful when an host provides several servers for "
8639
"the\n"
8640
" same scheme), only numerical values are allowed, this should be used "
8641
"only\n"
8642
" when the server uses a port different than the scheme standard port,"
8643
msgstr ""
8644
8645
#: en/help_topics/authentication.txt:82
8646
msgid " * ``path``: can be empty (FTP or SFTP will never user it),"
8647
msgstr ""
8648
8649
#: en/help_topics/authentication.txt:84
8650
msgid ""
8651
" * ``user``: can be empty (``bzr`` will defaults to python's\n"
8652
" ``getpass.get_user()``),"
8653
msgstr ""
8654
8655
#: en/help_topics/authentication.txt:87
8656
msgid ""
8657
" * ``password``: can be empty if you prefer to always be prompted for your\n"
8658
" password."
8659
msgstr ""
8660
8661
#: en/help_topics/authentication.txt:90
8662
msgid ""
8663
"Multiple definitions can be provided and, for a given URL, bzr will select "
8664
"a\n"
8665
"(``user`` [, ``password``]) based on the following rules :"
8666
msgstr ""
8667
8668
#: en/help_topics/authentication.txt:93
8669
msgid " 1. the first match wins,"
8670
msgstr ""
8671
8672
#: en/help_topics/authentication.txt:95
8673
msgid " 2. empty fields match everything,"
8674
msgstr ""
8675
8676
#: en/help_topics/authentication.txt:97
8677
msgid ""
8678
" 3. ``scheme`` matches even if decorators are used in the requested URL,"
8679
msgstr ""
8680
8681
#: en/help_topics/authentication.txt:99
8682
msgid ""
8683
" 4. ``host`` matches exactly or act as a domain if it starts with '.'\n"
8684
" (``project.bzr.sf.net`` will match ``.bzr.sf.net`` but "
8685
"``projectbzr.sf.net``\n"
8686
" will not match ``bzr.sf.net``)."
8687
msgstr ""
8688
8689
#: en/help_topics/authentication.txt:103
8690
msgid ""
8691
" 5. ``port`` matches if included in the requested URL (exact matches only)"
8692
msgstr ""
8693
8694
#: en/help_topics/authentication.txt:105
8695
msgid ""
8696
" 6. ``path`` matches if included in the requested URL (and by rule #2 "
8697
"above,\n"
8698
" empty paths will match any provided path)."
8699
msgstr ""
8700
8701
#: en/help_topics/authentication.txt:110
8702
msgid ""
8703
"File format\n"
8704
"-----------"
8705
msgstr ""
8706
8707
#: en/help_topics/authentication.txt:113
8708
msgid ""
8709
"The general rules for :doc:`configuration files <configuration-help>`\n"
8710
"apply except for the variable policies."
8711
msgstr ""
8712
8713
#: en/help_topics/authentication.txt:116
8714
msgid "Each section describes an authentication definition."
8715
msgstr ""
8716
8717
#: en/help_topics/authentication.txt:118
8718
msgid ""
8719
"The section name is an arbitrary string, only the ``DEFAULT`` value is "
8720
"reserved\n"
8721
"and should appear as the *last* section."
8722
msgstr ""
8723
8724
#: en/help_topics/authentication.txt:121
8725
msgid "Each section should define:"
8726
msgstr ""
8727
8728
#: en/help_topics/authentication.txt:123
8729
msgid "* ``user``: the login to be used,"
8730
msgstr ""
8731
8732
#: en/help_topics/authentication.txt:125
8733
msgid "Each section could define:"
8734
msgstr ""
8735
8736
#: en/help_topics/authentication.txt:127
8737
msgid "* ``host``: the remote server,"
8738
msgstr ""
8739
8740
#: en/help_topics/authentication.txt:129
8741
msgid "* ``port``: the port the server is listening,"
8742
msgstr ""
8743
8744
#: en/help_topics/authentication.txt:131
8745
msgid "* ``path``: the branch location,"
8746
msgstr ""
8747
8748
#: en/help_topics/authentication.txt:133
8749
msgid "* ``password``: the password."
8750
msgstr ""
8751
8752
#: en/help_topics/authentication.txt:135
8753
msgid ""
8754
"\n"
8755
"Examples\n"
8756
"--------"
8757
msgstr ""
8758
8759
#: en/help_topics/authentication.txt:139
8760
msgid ""
8761
"\n"
8762
"Personal projects hosted outside\n"
8763
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
8764
msgstr ""
8765
8766
#: en/help_topics/authentication.txt:143
8767
msgid ""
8768
"All connections are done with the same ``user`` (the remote one for which "
8769
"the\n"
8770
"default bzr one is not appropriate) and the password is always prompted "
8771
"with\n"
8772
"some exceptions::"
8773
msgstr ""
8774
8775
#: en/help_topics/authentication.txt:147
8776
msgid ""
8777
" # Pet projects on hobby.net\n"
8778
" [hobby]\n"
8779
" host=r.hobby.net\n"
8780
" user=jim\n"
8781
" password=obvious1234\n"
8782
" \n"
8783
" # Home server\n"
8784
" [home]\n"
8785
" scheme=https\n"
8786
" host=home.net\n"
8787
" user=joe\n"
8788
" password=1essobV10us\n"
8789
" \n"
8790
" [DEFAULT]\n"
8791
" # Our local user is barbaz, on all remote sites we're known as "
8792
"foobar\n"
8793
" user=foobar"
8794
msgstr ""
8795
8796
#: en/help_topics/authentication.txt:164
8797
msgid ""
8798
"\n"
8799
"Source hosting provider\n"
8800
"~~~~~~~~~~~~~~~~~~~~~~~"
8801
msgstr ""
8802
8803
#: en/help_topics/authentication.txt:168
8804
msgid "In the shp.net (fictitious) domain, each project has its own site::"
8805
msgstr ""
8806
8807
#: en/help_topics/authentication.txt:170
8808
msgid ""
8809
" [shpnet domain]\n"
8810
" # we use sftp, but ssh is the scheme used for authentication\n"
8811
" scheme=ssh\n"
8812
" # The leading '.' ensures that 'shp.net' alone doesn't match\n"
8813
" host=.shp.net\n"
8814
" user=joe\n"
8815
" # bzr don't support supplying a password for sftp,\n"
8816
" # consider using an ssh agent if you don't want to supply\n"
8817
" # a password interactively. (pageant, ssh-agent, etc)"
8818
msgstr ""
8819
8820
#: en/help_topics/authentication.txt:180
8821
msgid ""
8822
"HTTPS, SFTP servers and their proxy\n"
8823
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
8824
msgstr ""
8825
8826
#: en/help_topics/authentication.txt:183
8827
msgid ""
8828
"At company.com, the server hosting release and integration branches is "
8829
"behind a\n"
8830
"proxy, and the two branches use different authentication policies::"
8831
msgstr ""
8832
8833
#: en/help_topics/authentication.txt:186
8834
msgid ""
8835
" [reference code]\n"
8836
" scheme=https\n"
8837
" host=dev.company.com\n"
8838
" path=/dev\n"
8839
" user=user1\n"
8840
" password=pass1"
8841
msgstr ""
8842
8843
#: en/help_topics/authentication.txt:193
8844
msgid ""
8845
" # development branches on dev server\n"
8846
" [dev]\n"
8847
" scheme=ssh # bzr+ssh and sftp are available here\n"
8848
" host=dev.company.com\n"
8849
" path=/dev/integration\n"
8850
" user=user2\n"
8851
" \n"
8852
" # proxy\n"
8853
" [proxy]\n"
8854
" scheme=http\n"
8855
" host=proxy.company.com\n"
8856
" port=3128\n"
8857
" user=proxyuser1\n"
8858
" password=proxypass1"
8859
msgstr ""
8860
8861
#: en/help_topics/authentication.txt:208
8862
msgid ""
8863
"\n"
8864
"Planned enhancements\n"
8865
"--------------------"
8866
msgstr ""
8867
8868
#: en/help_topics/authentication.txt:212
8869
msgid ""
8870
"The following are not yet implemented but planned as parts of a work in\n"
8871
"progress:"
8872
msgstr ""
8873
8874
#: en/help_topics/authentication.txt:215
8875
msgid "* add a ``password_encoding`` field allowing:"
8876
msgstr ""
8877
8878
#: en/help_topics/authentication.txt:217
8879
msgid ""
8880
" - storing the passwords in various obfuscating encodings (base64 for one),"
8881
msgstr ""
8882
8883
#: en/help_topics/authentication.txt:219
8884
msgid " - delegate password storage to plugins (.netrc for example)."
8885
msgstr ""
8886
8887
#: en/help_topics/authentication.txt:221
8888
msgid ""
8889
"* update the credentials when the user is prompted for user or password,"
8890
msgstr ""
8891
8892
#: en/help_topics/authentication.txt:223
8893
msgid "* add a ``verify_certificates`` field for ``HTTPS``."
8894
msgstr ""
8895
8896
#: en/help_topics/authentication.txt:225
8897
msgid ""
8898
"The ``password_encoding`` and ``verify_certificates`` fields are recognized "
8899
"but\n"
8900
"ignored in the actual implementation.\n"
8901
msgstr ""
8902
8903
#: en/help_topics/bugs.txt:1
8904
msgid "Bug Tracker Settings"
8905
msgstr ""
8906
8907
#: en/help_topics/bugs.txt:3
8908
msgid ""
8909
"When making a commit, metadata about bugs fixed by that change can be\n"
8910
"recorded by using the ``--fixes`` option. For each bug marked as fixed, an\n"
8911
"entry is included in the 'bugs' revision property stating '<url> <status>'.\n"
8912
"(The only ``status`` value currently supported is ``fixed.``)"
8913
msgstr ""
8914
8915
#: en/help_topics/bugs.txt:8
8916
msgid ""
8917
"The ``--fixes`` option allows you to specify a bug tracker and a bug "
8918
"identifier\n"
8919
"rather than a full URL. This looks like::"
8920
msgstr ""
8921
8922
#: en/help_topics/bugs.txt:11
8923
msgid " bzr commit --fixes <tracker>:<id>"
8924
msgstr ""
8925
8926
#: en/help_topics/bugs.txt:13 en/help_topics/configuration.txt:398
8927
msgid "or::"
8928
msgstr ""
8929
8930
#: en/help_topics/bugs.txt:15
8931
msgid " bzr commit --fixes <id>"
8932
msgstr ""
8933
8934
#: en/help_topics/bugs.txt:17
8935
msgid ""
8936
"where \"<tracker>\" is an identifier for the bug tracker, and \"<id>\" is "
8937
"the\n"
8938
"identifier for that bug within the bugtracker, usually the bug number.\n"
8939
"If \"<tracker>\" is not specified the ``bugtracker`` set in the branch\n"
8940
"or global configuration is used."
8941
msgstr ""
8942
8943
#: en/help_topics/bugs.txt:22
8944
msgid ""
8945
"Bazaar knows about a few bug trackers that have many users. If\n"
8946
"you use one of these bug trackers then there is no setup required to\n"
8947
"use this feature, you just need to know the tracker identifier to use.\n"
8948
"These are the bugtrackers that are built in:"
8949
msgstr ""
8950
8951
#: en/help_topics/bugs.txt:27
8952
msgid ""
8953
" ============================ ============ ============\n"
8954
" URL Abbreviation Example\n"
8955
" ============================ ============ ============\n"
8956
" https://bugs.launchpad.net/ lp lp:12345\n"
8957
" http://bugs.debian.org/ deb deb:12345\n"
8958
" http://bugzilla.gnome.org/ gnome gnome:12345\n"
8959
" ============================ ============ ============"
8960
msgstr ""
8961
8962
#: en/help_topics/bugs.txt:35
8963
msgid ""
8964
"For the bug trackers not listed above configuration is required.\n"
8965
"Support for generating the URLs for any project using Bugzilla or Trac\n"
8966
"is built in, along with a template mechanism for other bugtrackers with\n"
8967
"simple URL schemes. If your bug tracker can't be described by one\n"
8968
"of the schemes described below then you can write a plugin to support\n"
8969
"it."
8970
msgstr ""
8971
8972
#: en/help_topics/bugs.txt:42
8973
msgid ""
8974
"If you use Bugzilla or Trac, then you only need to set a configuration\n"
8975
"variable which contains the base URL of the bug tracker. These options\n"
8976
"can go into ``bazaar.conf``, ``branch.conf`` or into a branch-specific\n"
8977
"configuration section in ``locations.conf``. You can set up these values\n"
8978
"for each of the projects you work on."
8979
msgstr ""
8980
8981
#: en/help_topics/bugs.txt:48
8982
msgid ""
8983
"Note: As you provide a short name for each tracker, you can specify one or\n"
8984
"more bugs in one or more trackers at commit time if you wish."
8985
msgstr ""
8986
8987
#: en/help_topics/bugs.txt:51
8988
msgid ""
8989
"Launchpad\n"
8990
"---------"
8991
msgstr ""
8992
8993
#: en/help_topics/bugs.txt:54
8994
msgid ""
8995
"Use ``bzr commit --fixes lp:2`` to record that this commit fixes bug 2."
8996
msgstr ""
8997
8998
#: en/help_topics/bugs.txt:56
8999
msgid ""
9000
"bugzilla_<tracker>_url\n"
9001
"----------------------"
9002
msgstr ""
9003
9004
#: en/help_topics/bugs.txt:59
9005
msgid ""
9006
"If present, the location of the Bugzilla bug tracker referred to by\n"
9007
"<tracker>. This option can then be used together with ``bzr commit\n"
9008
"--fixes`` to mark bugs in that tracker as being fixed by that commit. For\n"
9009
"example::"
9010
msgstr ""
9011
9012
#: en/help_topics/bugs.txt:64
9013
msgid " bugzilla_squid_url = http://bugs.squid-cache.org"
9014
msgstr ""
9015
9016
#: en/help_topics/bugs.txt:66
9017
msgid ""
9018
"would allow ``bzr commit --fixes squid:1234`` to mark Squid's bug 1234 as\n"
9019
"fixed."
9020
msgstr ""
9021
9022
#: en/help_topics/bugs.txt:69
9023
msgid ""
9024
"trac_<tracker>_url\n"
9025
"------------------"
9026
msgstr ""
9027
9028
#: en/help_topics/bugs.txt:72
9029
msgid ""
9030
"If present, the location of the Trac instance referred to by\n"
9031
"<tracker>. This option can then be used together with ``bzr commit\n"
9032
"--fixes`` to mark bugs in that tracker as being fixed by that commit. For\n"
9033
"example::"
9034
msgstr ""
9035
9036
#: en/help_topics/bugs.txt:77
9037
msgid " trac_twisted_url = http://www.twistedmatrix.com/trac"
9038
msgstr ""
9039
9040
#: en/help_topics/bugs.txt:79
9041
msgid ""
9042
"would allow ``bzr commit --fixes twisted:1234`` to mark Twisted's bug 1234 "
9043
"as\n"
9044
"fixed."
9045
msgstr ""
9046
9047
#: en/help_topics/bugs.txt:82
9048
msgid ""
9049
"bugtracker_<tracker>_url\n"
9050
"------------------------"
9051
msgstr ""
9052
9053
#: en/help_topics/bugs.txt:85
9054
msgid ""
9055
"If present, the location of a generic bug tracker instance referred to by\n"
9056
"<tracker>. The location must contain an ``{id}`` placeholder,\n"
9057
"which will be replaced by a specific bug ID. This option can then be used\n"
9058
"together with ``bzr commit --fixes`` to mark bugs in that tracker as being\n"
9059
"fixed by that commit. For example::"
9060
msgstr ""
9061
9062
#: en/help_topics/bugs.txt:91
9063
msgid " bugtracker_python_url = http://bugs.python.org/issue{id}"
9064
msgstr ""
9065
9066
#: en/help_topics/bugs.txt:93
9067
msgid ""
9068
"would allow ``bzr commit --fixes python:1234`` to mark bug 1234 in Python's\n"
9069
"Roundup bug tracker as fixed, or::"
9070
msgstr ""
9071
9072
#: en/help_topics/bugs.txt:96
9073
msgid ""
9074
" bugtracker_cpan_url = http://rt.cpan.org/Public/Bug/Display.html?id={id}"
9075
msgstr ""
9076
9077
#: en/help_topics/bugs.txt:98
9078
msgid ""
9079
"would allow ``bzr commit --fixes cpan:1234`` to mark bug 1234 in CPAN's\n"
9080
"RT bug tracker as fixed, or::"
9081
msgstr ""
9082
9083
#: en/help_topics/bugs.txt:101
9084
msgid " bugtracker_hudson_url = http://issues.hudson-ci.org/browse/{id}"
9085
msgstr ""
9086
9087
#: en/help_topics/bugs.txt:103
9088
msgid ""
9089
"would allow ``bzr commit --fixes hudson:HUDSON-1234`` to mark bug HUDSON-"
9090
"1234\n"
9091
"in Hudson's JIRA bug tracker as fixed.\n"
9092
msgstr ""
9093
9094
#: en/help_topics/commands.txt:1
9095
msgid ""
9096
"add Add specified files or directories.\n"
9097
"alias Set/unset and display aliases.\n"
9098
"annotate Show the origin of each line in a file.\n"
9099
"bash-completion Generate a shell function for bash command line "
9100
"completion.\n"
9101
" [bash_completion]\n"
9102
"bind Convert the current branch into a checkout of the "
9103
"supplied\n"
9104
" branch.\n"
9105
"branch Create a new branch that is a copy of an existing branch.\n"
9106
"branches List the branches available at the current location.\n"
9107
"break-lock Break a dead lock.\n"
9108
"cat Write the contents of a file as of a given revision to\n"
9109
" standard output.\n"
9110
"check Validate working tree structure, branch consistency and\n"
9111
" repository history.\n"
9112
"checkout Create a new checkout of an existing branch.\n"
9113
"clean-tree Remove unwanted files from working tree.\n"
9114
"commit Commit changes into a new revision.\n"
9115
"config Display, set or remove a configuration option.\n"
9116
"conflicts List files with conflicts.\n"
9117
"deleted List files deleted in the working tree.\n"
9118
"diff Show differences in the working tree, between revisions "
9119
"or\n"
9120
" branches.\n"
9121
"dpush Push into a different VCS without any custom bzr "
9122
"metadata.\n"
9123
"export Export current or past revision to a destination directory "
9124
"or\n"
9125
" archive.\n"
9126
"help Show help on a command or other topic.\n"
9127
"ignore Ignore specified files or patterns.\n"
9128
"ignored List ignored files and the patterns that matched them.\n"
9129
"info Show information about a working tree, branch or "
9130
"repository.\n"
9131
"init Make a directory into a versioned branch.\n"
9132
"init-repository Create a shared repository for branches to share storage\n"
9133
" space.\n"
9134
"join Combine a tree into its containing tree.\n"
9135
"launchpad-login Show or set the Launchpad user ID. [launchpad]\n"
9136
"launchpad-mirror Ask Launchpad to mirror a branch now. [launchpad]\n"
9137
"launchpad-open Open a Launchpad branch page in your web browser. "
9138
"[launchpad]\n"
9139
"log Show historical log for a branch or subset of a branch.\n"
9140
"lp-find-proposal Find the proposal to merge this revision. [launchpad]\n"
9141
"lp-propose-merge Propose merging a branch on Launchpad. [launchpad]\n"
9142
"ls List files in a tree.\n"
9143
"merge Perform a three-way merge.\n"
9144
"missing Show unmerged/unpulled revisions between two branches.\n"
9145
"mkdir Create a new versioned directory.\n"
9146
"mv Move or rename a file.\n"
9147
"nick Print or set the branch nickname.\n"
9148
"pack Compress the data within a repository.\n"
9149
"plugins List the installed plugins.\n"
9150
"pull Turn this branch into a mirror of another branch.\n"
9151
"push Update a mirror of this branch.\n"
9152
"reconcile Reconcile bzr metadata in a branch.\n"
9153
"reconfigure Reconfigure the type of a bzr directory.\n"
9154
"register-branch Register a branch with launchpad.net. [launchpad]\n"
9155
"remerge Redo a merge.\n"
9156
"remove Remove files or directories.\n"
9157
"remove-branch Remove a branch.\n"
9158
"remove-tree Remove the working tree from a given branch/checkout.\n"
9159
"renames Show list of renamed files.\n"
9160
"resolve Mark a conflict as resolved.\n"
9161
"revert Revert files to a previous revision.\n"
9162
"revno Show current revision number.\n"
9163
"root Show the tree root directory.\n"
9164
"send Mail or create a merge-directive for submitting changes.\n"
9165
"serve Run the bzr server.\n"
9166
"shelve Temporarily set aside some changes from the current tree.\n"
9167
"sign-my-commits Sign all commits by a given committer.\n"
9168
"split Split a subdirectory of a tree into a separate tree.\n"
9169
"status Display status summary.\n"
9170
"switch Set the branch of a checkout and update.\n"
9171
"tag Create, remove or modify a tag naming a revision.\n"
9172
"tags List tags.\n"
9173
"testament Show testament (signing-form) of a revision.\n"
9174
"unbind Convert the current checkout into a regular branch.\n"
9175
"uncommit Remove the last committed revision.\n"
9176
"unshelve Restore shelved changes.\n"
9177
"update Update a working tree to a new revision.\n"
9178
"upgrade Upgrade a repository, branch or working tree to a newer\n"
9179
" format.\n"
9180
"verify-signatures Verify all commit signatures.\n"
9181
"version Show version of bzr.\n"
9182
"version-info Show version information about this tree.\n"
9183
"view Manage filtered views.\n"
9184
"whoami Show or set bzr user id.\n"
9185
msgstr ""
9186
9187
#: en/help_topics/configuration.txt:1
9188
msgid ""
9189
"Configuration Settings\n"
9190
"======================="
9191
msgstr ""
9192
9193
#: en/help_topics/configuration.txt:4
9194
msgid ""
9195
"Environment settings\n"
9196
"---------------------"
9197
msgstr ""
9198
9199
#: en/help_topics/configuration.txt:7
9200
msgid ""
9201
"While most configuration is handled by configuration files, some options\n"
9202
"which may be semi-permanent can also be controlled through the environment."
9203
msgstr ""
9204
9205
#: en/help_topics/configuration.txt:10
9206
msgid ""
9207
"BZR_EMAIL\n"
9208
"~~~~~~~~~"
9209
msgstr ""
9210
9211
#: en/help_topics/configuration.txt:13
9212
msgid "Override the email id used by Bazaar. Typical format::"
9213
msgstr ""
9214
9215
#: en/help_topics/configuration.txt:15
9216
msgid " \"John Doe <jdoe@example.com>\""
9217
msgstr ""
9218
9219
#: en/help_topics/configuration.txt:17
9220
msgid "See also the ``email`` configuration option."
9221
msgstr ""
9222
9223
#: en/help_topics/configuration.txt:19
9224
msgid ""
9225
"BZR_PROGRESS_BAR\n"
9226
"~~~~~~~~~~~~~~~~"
9227
msgstr ""
9228
9229
#: en/help_topics/configuration.txt:22
9230
msgid ""
9231
"Override the progress display. Possible values are \"none\" or \"text\". "
9232
"If\n"
9233
"the value is \"none\" then no progress bar is displayed. The value \"text\" "
9234
"draws\n"
9235
"the ordinary command line progress bar."
9236
msgstr ""
9237
9238
#: en/help_topics/configuration.txt:26
9239
msgid ""
9240
"BZR_SIGQUIT_PDB\n"
9241
"~~~~~~~~~~~~~~~"
9242
msgstr ""
9243
9244
#: en/help_topics/configuration.txt:29
9245
msgid ""
9246
"Control whether SIGQUIT behaves normally or invokes a breakin debugger."
9247
msgstr ""
9248
9249
#: en/help_topics/configuration.txt:31
9250
msgid ""
9251
"* 0 = Standard SIGQUIT behavior (normally, exit with a core dump)\n"
9252
"* 1 = Invoke breakin debugger (default)"
9253
msgstr ""
9254
9255
#: en/help_topics/configuration.txt:34
9256
msgid ""
9257
"BZR_HOME\n"
9258
"~~~~~~~~"
9259
msgstr ""
9260
9261
#: en/help_topics/configuration.txt:37
9262
msgid "Override the home directory used by Bazaar."
9263
msgstr ""
9264
9265
#: en/help_topics/configuration.txt:39
9266
msgid ""
9267
"BZR_SSH\n"
9268
"~~~~~~~"
9269
msgstr ""
9270
9271
#: en/help_topics/configuration.txt:42
9272
msgid "Select a different SSH implementation."
9273
msgstr ""
9274
9275
#: en/help_topics/configuration.txt:44
9276
msgid ""
9277
"BZR_PDB\n"
9278
"~~~~~~~"
9279
msgstr ""
9280
9281
#: en/help_topics/configuration.txt:47
9282
msgid "Control whether to launch a debugger on error."
9283
msgstr ""
9284
9285
#: en/help_topics/configuration.txt:49
9286
msgid ""
9287
"* 0 = Standard behavior\n"
9288
"* 1 = Launch debugger"
9289
msgstr ""
9290
9291
#: en/help_topics/configuration.txt:52
9292
msgid ""
9293
"BZR_REMOTE_PATH\n"
9294
"~~~~~~~~~~~~~~~"
9295
msgstr ""
9296
9297
#: en/help_topics/configuration.txt:55
9298
msgid "Path to the Bazaar executable to use when using the bzr+ssh protocol."
9299
msgstr ""
9300
9301
#: en/help_topics/configuration.txt:57
9302
msgid "See also the ``bzr_remote_path`` configuration option."
9303
msgstr ""
9304
9305
#: en/help_topics/configuration.txt:59
9306
msgid ""
9307
"BZR_EDITOR\n"
9308
"~~~~~~~~~~"
9309
msgstr ""
9310
9311
#: en/help_topics/configuration.txt:62
9312
msgid "Path to the editor Bazaar should use for commit messages, etc."
9313
msgstr ""
9314
9315
#: en/help_topics/configuration.txt:64
9316
msgid ""
9317
"BZR_LOG\n"
9318
"~~~~~~~"
9319
msgstr ""
9320
9321
#: en/help_topics/configuration.txt:67
9322
msgid ""
9323
"Location of the Bazaar log file. You can check the current location by\n"
9324
"running ``bzr version``."
9325
msgstr ""
9326
9327
#: en/help_topics/configuration.txt:70
9328
msgid ""
9329
"The log file contains debug information that is useful for diagnosing or\n"
9330
"reporting problems with Bazaar."
9331
msgstr ""
9332
9333
#: en/help_topics/configuration.txt:73
9334
msgid ""
9335
"Setting this to ``NUL`` on Windows or ``/dev/null`` on other platforms\n"
9336
"will disable logging."
9337
msgstr ""
9338
9339
#: en/help_topics/configuration.txt:76
9340
msgid ""
9341
"\n"
9342
"BZR_PLUGIN_PATH\n"
9343
"~~~~~~~~~~~~~~~"
9344
msgstr ""
9345
9346
#: en/help_topics/configuration.txt:80
9347
msgid ""
9348
"The path to the plugins directory that Bazaar should use.\n"
9349
"If not set, Bazaar will search for plugins in:"
9350
msgstr ""
9351
9352
#: en/help_topics/configuration.txt:83
9353
msgid ""
9354
"* the user specific plugin directory (containing the ``user`` plugins),"
9355
msgstr ""
9356
9357
#: en/help_topics/configuration.txt:85
9358
msgid "* the bzrlib directory (containing the ``core`` plugins),"
9359
msgstr ""
9360
9361
#: en/help_topics/configuration.txt:87
9362
msgid ""
9363
"* the site specific plugin directory if applicable (containing\n"
9364
" the ``site`` plugins)."
9365
msgstr ""
9366
9367
#: en/help_topics/configuration.txt:90
9368
msgid ""
9369
"If ``BZR_PLUGIN_PATH`` is set in any fashion, it will change the\n"
9370
"the way the plugin are searched. "
9371
msgstr ""
9372
9373
#: en/help_topics/configuration.txt:93
9374
msgid ""
9375
"As for the ``PATH`` variables, if multiple directories are\n"
9376
"specified in ``BZR_PLUGIN_PATH`` they should be separated by the\n"
9377
"platform specific appropriate character (':' on Unix,\n"
9378
"';' on windows)"
9379
msgstr ""
9380
9381
#: en/help_topics/configuration.txt:98
9382
msgid ""
9383
"By default if ``BZR_PLUGIN_PATH`` is set, it replaces searching\n"
9384
"in ``user``. However it will continue to search in ``core`` and\n"
9385
"``site`` unless they are explicitly removed."
9386
msgstr ""
9387
9388
#: en/help_topics/configuration.txt:102
9389
msgid ""
9390
"If you need to change the order or remove one of these\n"
9391
"directories, you should use special values:"
9392
msgstr ""
9393
9394
#: en/help_topics/configuration.txt:105
9395
msgid ""
9396
"* ``-user``, ``-core``, ``-site`` will remove the corresponding\n"
9397
" path from the default values,"
9398
msgstr ""
9399
9400
#: en/help_topics/configuration.txt:108
9401
msgid ""
9402
"* ``+user``, ``+core``, ``+site`` will add the corresponding path\n"
9403
" before the remaining default values (and also remove it from\n"
9404
" the default values)."
9405
msgstr ""
9406
9407
#: en/help_topics/configuration.txt:112
9408
msgid ""
9409
"Note that the special values 'user', 'core' and 'site' should be\n"
9410
"used literally, they will be substituted by the corresponding,\n"
9411
"platform specific, values."
9412
msgstr ""
9413
9414
#: en/help_topics/configuration.txt:116
9415
msgid ""
9416
"The examples below use ':' as the separator, windows users\n"
9417
"should use ';'."
9418
msgstr ""
9419
9420
#: en/help_topics/configuration.txt:119
9421
msgid "Overriding the default user plugin directory::"
9422
msgstr ""
9423
9424
#: en/help_topics/configuration.txt:121
9425
msgid " BZR_PLUGIN_PATH='/path/to/my/other/plugins'"
9426
msgstr ""
9427
9428
#: en/help_topics/configuration.txt:123
9429
msgid "Disabling the site directory while retaining the user directory::"
9430
msgstr ""
9431
9432
#: en/help_topics/configuration.txt:125
9433
msgid " BZR_PLUGIN_PATH='-site:+user'"
9434
msgstr ""
9435
9436
#: en/help_topics/configuration.txt:127
9437
msgid "Disabling all plugins (better achieved with --no-plugins)::"
9438
msgstr ""
9439
9440
#: en/help_topics/configuration.txt:129
9441
msgid " BZR_PLUGIN_PATH='-user:-core:-site'"
9442
msgstr ""
9443
9444
#: en/help_topics/configuration.txt:131
9445
msgid "Overriding the default site plugin directory::"
9446
msgstr ""
9447
9448
#: en/help_topics/configuration.txt:133
9449
msgid " BZR_PLUGIN_PATH='/path/to/my/site/plugins:-site':+user"
9450
msgstr ""
9451
9452
#: en/help_topics/configuration.txt:135
9453
msgid ""
9454
"BZR_DISABLE_PLUGINS\n"
9455
"~~~~~~~~~~~~~~~~~~~"
9456
msgstr ""
9457
9458
#: en/help_topics/configuration.txt:138
9459
msgid ""
9460
"Under special circumstances (mostly when trying to diagnose a\n"
9461
"bug), it's better to disable a plugin (or several) rather than\n"
9462
"uninstalling them completely. Such plugins can be specified in\n"
9463
"the ``BZR_DISABLE_PLUGINS`` environment variable."
9464
msgstr ""
9465
9466
#: en/help_topics/configuration.txt:143
9467
msgid ""
9468
"In that case, ``bzr`` will stop loading the specified plugins and\n"
9469
"will raise an import error if they are explicitly imported (by\n"
9470
"another plugin that depends on them for example)."
9471
msgstr ""
9472
9473
#: en/help_topics/configuration.txt:147
9474
msgid "Disabling ``myplugin`` and ``yourplugin`` is achieved by::"
9475
msgstr ""
9476
9477
#: en/help_topics/configuration.txt:149
9478
msgid " BZR_DISABLE_PLUGINS='myplugin:yourplugin'"
9479
msgstr ""
9480
9481
#: en/help_topics/configuration.txt:151
9482
msgid ""
9483
"BZR_PLUGINS_AT\n"
9484
"~~~~~~~~~~~~~~"
9485
msgstr ""
9486
9487
#: en/help_topics/configuration.txt:154
9488
msgid ""
9489
"When adding a new feature or working on a bug in a plugin,\n"
9490
"developers often need to use a specific version of a given\n"
9491
"plugin. Since python requires that the directory containing the\n"
9492
"code is named like the plugin itself this make it impossible to\n"
9493
"use arbitrary directory names (using a two-level directory scheme\n"
9494
"is inconvenient). ``BZR_PLUGINS_AT`` allows such directories even\n"
9495
"if they don't appear in ``BZR_PLUGIN_PATH`` ."
9496
msgstr ""
9497
9498
#: en/help_topics/configuration.txt:162
9499
msgid ""
9500
"Plugins specified in this environment variable takes precedence\n"
9501
"over the ones in ``BZR_PLUGIN_PATH``."
9502
msgstr ""
9503
9504
#: en/help_topics/configuration.txt:165
9505
msgid ""
9506
"The variable specified a list of ``plugin_name@plugin path``,\n"
9507
"``plugin_name`` being the name of the plugin as it appears in\n"
9508
"python module paths, ``plugin_path`` being the path to the\n"
9509
"directory containing the plugin code itself\n"
9510
"(i.e. ``plugins/myplugin`` not ``plugins``). Use ':' as the list\n"
9511
"separator, use ';' on windows."
9512
msgstr ""
9513
9514
#: en/help_topics/configuration.txt:172
9515
msgid ""
9516
"Example:\n"
9517
"~~~~~~~~"
9518
msgstr ""
9519
9520
#: en/help_topics/configuration.txt:175
9521
msgid ""
9522
"Using a specific version of ``myplugin``:\n"
9523
"``BZR_PLUGINS_AT='myplugin@/home/me/bugfixes/123456-myplugin``"
9524
msgstr ""
9525
9526
#: en/help_topics/configuration.txt:178
9527
msgid ""
9528
"BZRPATH\n"
9529
"~~~~~~~"
9530
msgstr ""
9531
9532
#: en/help_topics/configuration.txt:181
9533
msgid "The path where Bazaar should look for shell plugin external commands."
9534
msgstr ""
9535
9536
#: en/help_topics/configuration.txt:183
9537
msgid ""
9538
"\n"
9539
"http_proxy, https_proxy\n"
9540
"~~~~~~~~~~~~~~~~~~~~~~~"
9541
msgstr ""
9542
9543
#: en/help_topics/configuration.txt:187
9544
msgid "Specifies the network proxy for outgoing connections, for example::"
9545
msgstr ""
9546
9547
#: en/help_topics/configuration.txt:189
9548
msgid ""
9549
" http_proxy=http://proxy.example.com:3128/ \n"
9550
" https_proxy=http://proxy.example.com:3128/"
9551
msgstr ""
9552
9553
#: en/help_topics/configuration.txt:192
9554
msgid ""
9555
"\n"
9556
"Configuration files\n"
9557
"-------------------"
9558
msgstr ""
9559
9560
#: en/help_topics/configuration.txt:196
9561
msgid ""
9562
"Location\n"
9563
"~~~~~~~~"
9564
msgstr ""
9565
9566
#: en/help_topics/configuration.txt:199
9567
msgid ""
9568
"Configuration files are located in ``$HOME/.bazaar`` on Unix and\n"
9569
"``C:\\Documents and Settings\\<username>\\Application Data\\Bazaar\\2.0`` "
9570
"on\n"
9571
"Windows. (You can check the location for your system by using\n"
9572
"``bzr version``.)"
9573
msgstr ""
9574
9575
#: en/help_topics/configuration.txt:204
9576
msgid "There are three primary configuration files in this location:"
9577
msgstr ""
9578
9579
#: en/help_topics/configuration.txt:206
9580
msgid "* ``bazaar.conf`` describes default configuration options,"
9581
msgstr ""
9582
9583
#: en/help_topics/configuration.txt:208
9584
msgid ""
9585
"* ``locations.conf`` describes configuration information for\n"
9586
" specific branch locations,"
9587
msgstr ""
9588
9589
#: en/help_topics/configuration.txt:211
9590
msgid ""
9591
"* ``authentication.conf`` describes credential information for\n"
9592
" remote servers."
9593
msgstr ""
9594
9595
#: en/help_topics/configuration.txt:214
9596
msgid ""
9597
"Each branch can also contain a configuration file that sets values specific\n"
9598
"to that branch. This file is found at ``.bzr/branch/branch.conf`` within "
9599
"the\n"
9600
"branch. This file is visible to all users of a branch, if you wish to "
9601
"override\n"
9602
"one of the values for a branch with a setting that is specific to you then "
9603
"you\n"
9604
"can do so in ``locations.conf``."
9605
msgstr ""
9606
9607
#: en/help_topics/configuration.txt:220
9608
msgid ""
9609
"General format\n"
9610
"~~~~~~~~~~~~~~"
9611
msgstr ""
9612
9613
#: en/help_topics/configuration.txt:223
9614
msgid ""
9615
"An ini file has three types of contructs: section headers, section\n"
9616
"options and comments."
9617
msgstr ""
9618
9619
#: en/help_topics/configuration.txt:226
9620
msgid ""
9621
"Comments\n"
9622
"^^^^^^^^"
9623
msgstr ""
9624
9625
#: en/help_topics/configuration.txt:229
9626
msgid ""
9627
"A comment is any line that starts with a \"#\" (sometimes called a \"hash\n"
9628
"mark\", \"pound sign\" or \"number sign\"). Comment lines are ignored by\n"
9629
"Bazaar when parsing ini files."
9630
msgstr ""
9631
9632
#: en/help_topics/configuration.txt:233
9633
msgid ""
9634
"Section headers\n"
9635
"^^^^^^^^^^^^^^^"
9636
msgstr ""
9637
9638
#: en/help_topics/configuration.txt:236
9639
msgid ""
9640
"A section header is a word enclosed in brackets that starts at the begining\n"
9641
"of a line. A typical section header looks like this::"
9642
msgstr ""
9643
9644
#: en/help_topics/configuration.txt:239
9645
msgid " [DEFAULT]"
9646
msgstr ""
9647
9648
#: en/help_topics/configuration.txt:241
9649
msgid ""
9650
"The only valid section headers for bazaar.conf currently are [DEFAULT] and\n"
9651
"[ALIASES]. Section headers are case sensitive. The default section provides "
9652
"for\n"
9653
"setting options which can be overridden with the branch config file."
9654
msgstr ""
9655
9656
#: en/help_topics/configuration.txt:245
9657
msgid ""
9658
"For ``locations.conf``, the options from the section with the\n"
9659
"longest matching section header are used to the exclusion of other\n"
9660
"potentially valid section headers. A section header uses the path for\n"
9661
"the branch as the section header. Some examples include::"
9662
msgstr ""
9663
9664
#: en/help_topics/configuration.txt:250
9665
msgid ""
9666
" [http://mybranches.isp.com/~jdoe/branchdir]\n"
9667
" [/home/jdoe/branches/]"
9668
msgstr ""
9669
9670
#: en/help_topics/configuration.txt:253
9671
msgid ""
9672
"\n"
9673
"Section options\n"
9674
"^^^^^^^^^^^^^^^"
9675
msgstr ""
9676
9677
#: en/help_topics/configuration.txt:257
9678
msgid ""
9679
"A section option resides within a section. A section option contains an\n"
9680
"option name, an equals sign and a value. For example::"
9681
msgstr ""
9682
9683
#: en/help_topics/configuration.txt:260
9684
msgid ""
9685
" email = John Doe <jdoe@isp.com>\n"
9686
" gpg_signing_key = Amy Pond <amy@example.com>"
9687
msgstr ""
9688
9689
#: en/help_topics/configuration.txt:263
9690
msgid ""
9691
"A option can reference other options by enclosing them in curly brackets::"
9692
msgstr ""
9693
9694
#: en/help_topics/configuration.txt:265
9695
msgid ""
9696
" my_branch_name = feature_x\n"
9697
" my_server = bzr+ssh://example.com\n"
9698
" push_location = {my_server}/project/{my_branch_name}"
9699
msgstr ""
9700
9701
#: en/help_topics/configuration.txt:269
9702
msgid ""
9703
"Option policies\n"
9704
"^^^^^^^^^^^^^^^"
9705
msgstr ""
9706
9707
#: en/help_topics/configuration.txt:272
9708
msgid ""
9709
"Options defined in a section affect the named directory or URL plus\n"
9710
"any locations they contain. Policies can be used to change how an\n"
9711
"option value is interpreted for contained locations. Currently\n"
9712
"there are three policies available:"
9713
msgstr ""
9714
9715
#: en/help_topics/configuration.txt:277
9716
msgid ""
9717
" none:\n"
9718
" the value is interpreted the same for contained locations. This is\n"
9719
" the default behaviour.\n"
9720
" norecurse:\n"
9721
" the value is only used for the exact location specified by the\n"
9722
" section name.\n"
9723
" appendpath:\n"
9724
" for contained locations, any additional path components are\n"
9725
" appended to the value."
9726
msgstr ""
9727
9728
#: en/help_topics/configuration.txt:287
9729
msgid ""
9730
"Policies are specified by keys with names of the form "
9731
"\"<option_name>:policy\".\n"
9732
"For example, to define the push location for a tree of branches, the\n"
9733
"following could be used::"
9734
msgstr ""
9735
9736
#: en/help_topics/configuration.txt:291
9737
msgid ""
9738
" [/top/location]\n"
9739
" push_location = sftp://example.com/location\n"
9740
" push_location:policy = appendpath"
9741
msgstr ""
9742
9743
#: en/help_topics/configuration.txt:295
9744
msgid ""
9745
"With this configuration, the push location for ``/top/location/branch1``\n"
9746
"would be ``sftp://example.com/location/branch1``."
9747
msgstr ""
9748
9749
#: en/help_topics/configuration.txt:298
9750
msgid ""
9751
"Section local options\n"
9752
"^^^^^^^^^^^^^^^^^^^^^"
9753
msgstr ""
9754
9755
#: en/help_topics/configuration.txt:301
9756
msgid ""
9757
"Some options are defined automatically inside a given section and can be\n"
9758
"refered to in this section only. "
9759
msgstr ""
9760
9761
#: en/help_topics/configuration.txt:304
9762
msgid "For example, the ``appendpath`` policy can be used like this::"
9763
msgstr ""
9764
9765
#: en/help_topics/configuration.txt:306
9766
msgid ""
9767
" [/home/vila/src/bzr/bugs]\n"
9768
" mypush = lp:~vila/bzr\n"
9769
" mypush:policy=appendpath"
9770
msgstr ""
9771
9772
#: en/help_topics/configuration.txt:310
9773
msgid "Using ``relpath`` to achieve the same result is done like this::"
9774
msgstr ""
9775
9776
#: en/help_topics/configuration.txt:312
9777
msgid ""
9778
" [/home/vila/src/bzr/bugs]\n"
9779
" mypush = lp:~vila/bzr/{relpath}"
9780
msgstr ""
9781
9782
#: en/help_topics/configuration.txt:315
9783
msgid ""
9784
"In both cases, when used in a directory like\n"
9785
"``/home/vila/src/bzr/bugs/832013-expand-in-stack`` we'll get::"
9786
msgstr ""
9787
9788
#: en/help_topics/configuration.txt:318 en/help_topics/configuration.txt:329
9789
msgid ""
9790
" $ bzr config mypush\n"
9791
" lp:~vila/bzr/832013-expand-in-stack"
9792
msgstr ""
9793
9794
#: en/help_topics/configuration.txt:321
9795
msgid "Another such option is ``basename`` which can be used like this::"
9796
msgstr ""
9797
9798
#: en/help_topics/configuration.txt:323
9799
msgid ""
9800
" [/home/vila/src/bzr]\n"
9801
" mypush = lp:~vila/bzr/{basename}"
9802
msgstr ""
9803
9804
#: en/help_topics/configuration.txt:326
9805
msgid ""
9806
"When used in a directory like\n"
9807
"``/home/vila/src/bzr/bugs/832013-expand-in-stack`` we'll get::"
9808
msgstr ""
9809
9810
#: en/help_topics/configuration.txt:332
9811
msgid ""
9812
"Note that ``basename`` here refers to the base name of ``relpath`` which\n"
9813
"itself is defined as the relative path between the section name and the\n"
9814
"location it matches."
9815
msgstr ""
9816
9817
#: en/help_topics/configuration.txt:336
9818
msgid ""
9819
"When an option is local to a Section, it cannot be referred to from option\n"
9820
"values in any other section from the same ``Store`` nor from any other\n"
9821
"``Store``."
9822
msgstr ""
9823
9824
#: en/help_topics/configuration.txt:340
9825
msgid ""
9826
"\n"
9827
"The main configuration file, bazaar.conf\n"
9828
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
9829
msgstr ""
9830
9831
#: en/help_topics/configuration.txt:344
9832
msgid ""
9833
"``bazaar.conf`` allows two sections: ``[DEFAULT]`` and ``[ALIASES]``.\n"
9834
"The default section contains the default\n"
9835
"configuration options for all branches. The default section can be\n"
9836
"overriden by providing a branch-specific section in ``locations.conf``."
9837
msgstr ""
9838
9839
#: en/help_topics/configuration.txt:349
9840
msgid "A typical ``bazaar.conf`` section often looks like the following::"
9841
msgstr ""
9842
9843
#: en/help_topics/configuration.txt:351
9844
msgid ""
9845
" [DEFAULT]\n"
9846
" email = John Doe <jdoe@isp.com>\n"
9847
" editor = /usr/bin/vim\n"
9848
" create_signatures = when-required"
9849
msgstr ""
9850
9851
#: en/help_topics/configuration.txt:356
9852
msgid ""
9853
"\n"
9854
"The branch location configuration file, locations.conf\n"
9855
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
9856
msgstr ""
9857
9858
#: en/help_topics/configuration.txt:360
9859
msgid ""
9860
"``locations.conf`` allows one to specify overriding settings for\n"
9861
"a specific branch. The format is almost identical to the default section in\n"
9862
"bazaar.conf with one significant change: The section header, instead of "
9863
"saying\n"
9864
"default, will be the path to a branch that you wish to override a value\n"
9865
"for. The '?' and '*' wildcards are supported::"
9866
msgstr ""
9867
9868
#: en/help_topics/configuration.txt:366
9869
msgid ""
9870
" [/home/jdoe/branches/nethack]\n"
9871
" email = Nethack Admin <nethack@nethack.com>"
9872
msgstr ""
9873
9874
#: en/help_topics/configuration.txt:369
9875
msgid ""
9876
" [http://hypothetical.site.com/branches/devel-branch]\n"
9877
" create_signatures = always"
9878
msgstr ""
9879
9880
#: en/help_topics/configuration.txt:372
9881
msgid ""
9882
"The authentication configuration file, authentication.conf\n"
9883
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
9884
msgstr ""
9885
9886
#: en/help_topics/configuration.txt:375
9887
msgid ""
9888
"``authentication.conf`` allows one to specify credentials for\n"
9889
"remote servers. This can be used for all the supported transports and any "
9890
"part\n"
9891
"of bzr that requires authentication (smtp for example)."
9892
msgstr ""
9893
9894
#: en/help_topics/configuration.txt:379
9895
msgid ""
9896
"The syntax of the file obeys the same rules as the others except for the\n"
9897
"option policies which don't apply."
9898
msgstr ""
9899
9900
#: en/help_topics/configuration.txt:382
9901
msgid ""
9902
"For more information on the possible uses of the authentication "
9903
"configuration\n"
9904
"file see :doc:`authentication-help`."
9905
msgstr ""
9906
9907
#: en/help_topics/configuration.txt:385
9908
msgid ""
9909
"\n"
9910
"Common options\n"
9911
"--------------"
9912
msgstr ""
9913
9914
#: en/help_topics/configuration.txt:389
9915
msgid ""
9916
"debug_flags\n"
9917
"~~~~~~~~~~~"
9918
msgstr ""
9919
9920
#: en/help_topics/configuration.txt:392
9921
msgid ""
9922
"A comma-separated list of debugging options to turn on. The same values\n"
9923
"can be used as with the -D command-line option (see `help global-options`).\n"
9924
"For example::"
9925
msgstr ""
9926
9927
#: en/help_topics/configuration.txt:396
9928
msgid " debug_flags = hpss"
9929
msgstr ""
9930
9931
#: en/help_topics/configuration.txt:400
9932
msgid " debug_flags = hpss,evil"
9933
msgstr ""
9934
9935
#: en/help_topics/configuration.txt:402
9936
msgid ""
9937
"email\n"
9938
"~~~~~"
9939
msgstr ""
9940
9941
#: en/help_topics/configuration.txt:405
9942
msgid ""
9943
"The email address to use when committing a branch. Typically takes the form\n"
9944
"of::"
9945
msgstr ""
9946
9947
#: en/help_topics/configuration.txt:408
9948
msgid " email = Full Name <account@hostname.tld>"
9949
msgstr ""
9950
9951
#: en/help_topics/configuration.txt:410
9952
msgid ""
9953
"editor\n"
9954
"~~~~~~"
9955
msgstr ""
9956
9957
#: en/help_topics/configuration.txt:413
9958
msgid ""
9959
"The path of the editor that you wish to use if *bzr commit* is run without\n"
9960
"a commit message. This setting is trumped by the environment variable\n"
9961
"``BZR_EDITOR``, and overrides the ``VISUAL`` and ``EDITOR`` environment\n"
9962
"variables."
9963
msgstr ""
9964
9965
#: en/help_topics/configuration.txt:418
9966
msgid ""
9967
"log_format\n"
9968
"~~~~~~~~~~"
9969
msgstr ""
9970
9971
#: en/help_topics/configuration.txt:421
9972
msgid ""
9973
"The default log format to use. Standard log formats are ``long``, ``short``\n"
9974
"and ``line``. Additional formats may be provided by plugins. The default\n"
9975
"value is ``long``."
9976
msgstr ""
9977
9978
#: en/help_topics/configuration.txt:425
9979
msgid ""
9980
"check_signatures\n"
9981
"~~~~~~~~~~~~~~~~"
9982
msgstr ""
9983
9984
#: en/help_topics/configuration.txt:428
9985
msgid ""
9986
"Reserved for future use. These options will allow a policy for branches to\n"
9987
"require signatures."
9988
msgstr ""
9989
9990
#: en/help_topics/configuration.txt:431
9991
msgid ""
9992
"require\n"
9993
" The gnupg signature for revisions must be present and must be valid."
9994
msgstr ""
9995
9996
#: en/help_topics/configuration.txt:434
9997
msgid ""
9998
"ignore\n"
9999
" Do not check gnupg signatures of revisions."
10000
msgstr ""
10001
10002
#: en/help_topics/configuration.txt:437
10003
msgid ""
10004
"check-available\n"
10005
" (default) If gnupg signatures for revisions are present, check them.\n"
10006
" Bazaar will fail if it finds a bad signature, but will not fail if\n"
10007
" no signature is present."
10008
msgstr ""
10009
10010
#: en/help_topics/configuration.txt:442
10011
msgid ""
10012
"create_signatures\n"
10013
"~~~~~~~~~~~~~~~~~"
10014
msgstr ""
10015
10016
#: en/help_topics/configuration.txt:445
10017
msgid ""
10018
"Defines the behaviour of signing revisions on commits. By default bzr will "
10019
"not\n"
10020
"sign new commits."
10021
msgstr ""
10022
10023
#: en/help_topics/configuration.txt:448
10024
msgid ""
10025
"always\n"
10026
" Sign every new revision that is committed. If the signing fails then "
10027
"the\n"
10028
" commit will not be made."
10029
msgstr ""
10030
10031
#: en/help_topics/configuration.txt:452
10032
msgid ""
10033
"when-required\n"
10034
" Reserved for future use."
10035
msgstr ""
10036
10037
#: en/help_topics/configuration.txt:455
10038
msgid ""
10039
"never\n"
10040
" Reserved for future use."
10041
msgstr ""
10042
10043
#: en/help_topics/configuration.txt:458
10044
msgid ""
10045
"In future it is planned that ``when-required`` will sign newly\n"
10046
"committed revisions only when the branch requires them. ``never`` will "
10047
"refuse\n"
10048
"to sign newly committed revisions, even if the branch requires signatures."
10049
msgstr ""
10050
10051
#: en/help_topics/configuration.txt:462
10052
msgid ""
10053
"dirstate.fdatasync\n"
10054
"~~~~~~~~~~~~~~~~~~"
10055
msgstr ""
10056
10057
#: en/help_topics/configuration.txt:465
10058
msgid ""
10059
"If true (default), working tree metadata changes are flushed through the\n"
10060
"OS buffers to physical disk. This is somewhat slower, but means data\n"
10061
"should not be lost if the machine crashes. See also repository.fdatasync."
10062
msgstr ""
10063
10064
#: en/help_topics/configuration.txt:469
10065
msgid ""
10066
"gpg_signing_key\n"
10067
"~~~~~~~~~~~~~~~"
10068
msgstr ""
10069
10070
#: en/help_topics/configuration.txt:472
10071
msgid ""
10072
"The GnuPG user identity to use when signing commits. Can be an e-mail\n"
10073
"address, key fingerprint or full key ID. When unset or when set to\n"
10074
"\"default\" Bazaar will use the user e-mail set with ``whoami``."
10075
msgstr ""
10076
10077
#: en/help_topics/configuration.txt:476
10078
msgid ""
10079
"recurse\n"
10080
"~~~~~~~"
10081
msgstr ""
10082
10083
#: en/help_topics/configuration.txt:479
10084
msgid ""
10085
"Only useful in ``locations.conf``. Defines whether or not the\n"
10086
"configuration for this section applies to subdirectories:"
10087
msgstr ""
10088
10089
#: en/help_topics/configuration.txt:482
10090
msgid ""
10091
"true\n"
10092
" (default) This section applies to subdirectories as well."
10093
msgstr ""
10094
10095
#: en/help_topics/configuration.txt:485
10096
msgid ""
10097
"false\n"
10098
" This section only applies to the branch at this directory and not\n"
10099
" branches below it."
10100
msgstr ""
10101
10102
#: en/help_topics/configuration.txt:489
10103
msgid ""
10104
"gpg_signing_command\n"
10105
"~~~~~~~~~~~~~~~~~~~"
10106
msgstr ""
10107
10108
#: en/help_topics/configuration.txt:492
10109
msgid ""
10110
"(Default: \"gpg\"). Which program should be used to sign and check "
10111
"revisions.\n"
10112
"For example::"
10113
msgstr ""
10114
10115
#: en/help_topics/configuration.txt:495
10116
msgid " gpg_signing_command = /usr/bin/gnpg"
10117
msgstr ""
10118
10119
#: en/help_topics/configuration.txt:497
10120
msgid ""
10121
"The specified command must accept the options \"--clearsign\" and \"-u "
10122
"<email>\"."
10123
msgstr ""
10124
10125
#: en/help_topics/configuration.txt:499
10126
msgid ""
10127
"bzr_remote_path\n"
10128
"~~~~~~~~~~~~~~~"
10129
msgstr ""
10130
10131
#: en/help_topics/configuration.txt:502
10132
msgid ""
10133
"(Default: \"bzr\"). The path to the command that should be used to run the "
10134
"smart\n"
10135
"server for bzr. This value may only be specified in locations.conf, because:"
10136
msgstr ""
10137
10138
#: en/help_topics/configuration.txt:505
10139
msgid ""
10140
"- it's needed before branch.conf is accessible\n"
10141
"- allowing remote branch.conf files to specify commands would be a security\n"
10142
" risk"
10143
msgstr ""
10144
10145
#: en/help_topics/configuration.txt:509
10146
msgid "It is overridden by the BZR_REMOTE_PATH environment variable."
10147
msgstr ""
10148
10149
#: en/help_topics/configuration.txt:511
10150
msgid ""
10151
"smtp_server\n"
10152
"~~~~~~~~~~~"
10153
msgstr ""
10154
10155
#: en/help_topics/configuration.txt:514
10156
msgid ""
10157
"(Default: \"localhost\"). SMTP server to use when Bazaar needs to send\n"
10158
"email, eg. with ``merge-directive --mail-to``, or the bzr-email plugin."
10159
msgstr ""
10160
10161
#: en/help_topics/configuration.txt:517
10162
msgid ""
10163
"smtp_username, smtp_password\n"
10164
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
10165
msgstr ""
10166
10167
#: en/help_topics/configuration.txt:520
10168
msgid ""
10169
"User and password to authenticate to the SMTP server. If smtp_username\n"
10170
"is set, and smtp_password is not, Bazaar will prompt for a password.\n"
10171
"These settings are only needed if the SMTP server requires authentication\n"
10172
"to send mail."
10173
msgstr ""
10174
10175
#: en/help_topics/configuration.txt:525
10176
msgid ""
10177
"locks.steal_dead\n"
10178
"~~~~~~~~~~~~~~~~"
10179
msgstr ""
10180
10181
#: en/help_topics/configuration.txt:528
10182
msgid ""
10183
"If set to true, bzr will automatically break locks held by processes from\n"
10184
"the same machine and user that are no longer alive. Otherwise, it will\n"
10185
"print a message and you can break the lock manually, if you are satisfied\n"
10186
"the object is no longer in use."
10187
msgstr ""
10188
10189
#: en/help_topics/configuration.txt:533
10190
msgid ""
10191
"mail_client\n"
10192
"~~~~~~~~~~~"
10193
msgstr ""
10194
10195
#: en/help_topics/configuration.txt:536
10196
msgid ""
10197
"A mail client to use for sending merge requests.\n"
10198
"By default, bzr will try to use ``mapi`` on Windows. On other platforms, "
10199
"it\n"
10200
"will try ``xdg-email``. If either of these fails, it will fall back to\n"
10201
"``editor``."
10202
msgstr ""
10203
10204
#: en/help_topics/configuration.txt:541
10205
msgid "Supported values for specific clients:"
10206
msgstr ""
10207
10208
#: en/help_topics/configuration.txt:543
10209
msgid ""
10210
":claws: Use Claws. This skips a dialog for attaching files.\n"
10211
":evolution: Use Evolution.\n"
10212
":kmail: Use KMail.\n"
10213
":mutt: Use Mutt.\n"
10214
":thunderbird: Use Mozilla Thunderbird or Icedove. For Thunderbird/Icedove "
10215
"1.5,\n"
10216
" this works around some bugs that xdg-email doesn't handle."
10217
msgstr ""
10218
10219
#: en/help_topics/configuration.txt:550
10220
msgid "Supported generic values are:"
10221
msgstr ""
10222
10223
#: en/help_topics/configuration.txt:552
10224
msgid ""
10225
":default: See above.\n"
10226
":editor: Use your editor to compose the merge request. This also uses\n"
10227
" your commit id, (see ``bzr whoami``), smtp_server and (optionally)\n"
10228
" smtp_username and smtp_password.\n"
10229
":mapi: Use your preferred e-mail client on Windows.\n"
10230
":xdg-email: Use xdg-email to run your preferred mail program"
10231
msgstr ""
10232
10233
#: en/help_topics/configuration.txt:559
10234
msgid ""
10235
"repository.fdatasync\n"
10236
"~~~~~~~~~~~~~~~~~~~~"
10237
msgstr ""
10238
10239
#: en/help_topics/configuration.txt:562
10240
msgid ""
10241
"If true (default), repository changes are flushed through the OS buffers\n"
10242
"to physical disk. This is somewhat slower, but means data should not be\n"
10243
"lost if the machine crashes. See also dirstate.fdatasync."
10244
msgstr ""
10245
10246
#: en/help_topics/configuration.txt:566
10247
msgid ""
10248
"submit_branch\n"
10249
"~~~~~~~~~~~~~"
10250
msgstr ""
10251
10252
#: en/help_topics/configuration.txt:569
10253
msgid ""
10254
"The branch you intend to submit your current work to. This is "
10255
"automatically\n"
10256
"set by ``bzr send``, and is also used by the ``submit:`` revision spec. "
10257
"This\n"
10258
"should usually be set on a per-branch or per-location basis."
10259
msgstr ""
10260
10261
#: en/help_topics/configuration.txt:573
10262
msgid ""
10263
"public_branch\n"
10264
"~~~~~~~~~~~~~"
10265
msgstr ""
10266
10267
#: en/help_topics/configuration.txt:576
10268
msgid ""
10269
"A publically-accessible version of this branch (implying that this version "
10270
"is\n"
10271
"not publically-accessible). Used (and set) by ``bzr send``."
10272
msgstr ""
10273
10274
#: en/help_topics/configuration.txt:579
10275
msgid ""
10276
"suppress_warnings\n"
10277
"~~~~~~~~~~~~~~~~~"
10278
msgstr ""
10279
10280
#: en/help_topics/configuration.txt:582
10281
msgid ""
10282
"A list of strings, each string represent a warning that can be emitted by\n"
10283
"bzr. Mentioning a warning in this list tells bzr to not emit it."
10284
msgstr ""
10285
10286
#: en/help_topics/configuration.txt:585
10287
msgid "Valid values:"
10288
msgstr ""
10289
10290
#: en/help_topics/configuration.txt:587
10291
msgid ""
10292
"* ``format_deprecation``:\n"
10293
" whether the format deprecation warning is shown on repositories that "
10294
"are\n"
10295
" using deprecated formats."
10296
msgstr ""
10297
10298
#: en/help_topics/configuration.txt:591
10299
msgid ""
10300
"default_format\n"
10301
"~~~~~~~~~~~~~~"
10302
msgstr ""
10303
10304
#: en/help_topics/configuration.txt:594
10305
msgid ""
10306
"A format name for the default format used when creating branches. See "
10307
"``bzr\n"
10308
"help formats`` for possible values."
10309
msgstr ""
10310
10311
#: en/help_topics/configuration.txt:597
10312
msgid ""
10313
"\n"
10314
"Unicode options\n"
10315
"---------------"
10316
msgstr ""
10317
10318
#: en/help_topics/configuration.txt:601
10319
msgid ""
10320
"output_encoding\n"
10321
"~~~~~~~~~~~~~~~"
10322
msgstr ""
10323
10324
#: en/help_topics/configuration.txt:604
10325
msgid ""
10326
"A Python unicode encoding name for text output from bzr, such as log\n"
10327
"information. Values include: utf8, cp850, ascii, iso-8859-1. The default\n"
10328
"is the terminal encoding prefered by the operating system."
10329
msgstr ""
10330
10331
#: en/help_topics/configuration.txt:608
10332
msgid ""
10333
"\n"
10334
"Branch type specific options\n"
10335
"----------------------------"
10336
msgstr ""
10337
10338
#: en/help_topics/configuration.txt:612
10339
msgid ""
10340
"These options apply only to branches that use the ``dirstate-tags`` or\n"
10341
"later format. They\n"
10342
"are usually set in ``.bzr/branch/branch.conf`` automatically, but may be\n"
10343
"manually set in ``locations.conf`` or ``bazaar.conf``."
10344
msgstr ""
10345
10346
#: en/help_topics/configuration.txt:617
10347
msgid ""
10348
"append_revisions_only\n"
10349
"~~~~~~~~~~~~~~~~~~~~~"
10350
msgstr ""
10351
10352
#: en/help_topics/configuration.txt:620
10353
msgid ""
10354
"If set to \"True\" then revisions can only be appended to the log, not\n"
10355
"removed. A branch with this setting enabled can only pull from another\n"
10356
"branch if the other branch's log is a longer version of its own. This is\n"
10357
"normally set by ``bzr init --append-revisions-only``. If you set it\n"
10358
"manually, use either 'True' or 'False' (case-sensitive) to maintain\n"
10359
"compatibility with previous bzr versions (older than 2.2)."
10360
msgstr ""
10361
10362
#: en/help_topics/configuration.txt:627
10363
msgid ""
10364
"parent_location\n"
10365
"~~~~~~~~~~~~~~~"
10366
msgstr ""
10367
10368
#: en/help_topics/configuration.txt:630
10369
msgid ""
10370
"If present, the location of the default branch for pull or merge. This "
10371
"option\n"
10372
"is normally set when creating a branch, the first ``pull`` or by ``pull\n"
10373
"--remember``."
10374
msgstr ""
10375
10376
#: en/help_topics/configuration.txt:634
10377
msgid ""
10378
"push_location\n"
10379
"~~~~~~~~~~~~~"
10380
msgstr ""
10381
10382
#: en/help_topics/configuration.txt:637
10383
msgid ""
10384
"If present, the location of the default branch for push. This option\n"
10385
"is normally set by the first ``push`` or ``push --remember``."
10386
msgstr ""
10387
10388
#: en/help_topics/configuration.txt:640
10389
msgid ""
10390
"push_strict\n"
10391
"~~~~~~~~~~~"
10392
msgstr ""
10393
10394
#: en/help_topics/configuration.txt:643
10395
msgid ""
10396
"If present, defines the ``--strict`` option default value for checking\n"
10397
"uncommitted changes before pushing."
10398
msgstr ""
10399
10400
#: en/help_topics/configuration.txt:646
10401
msgid ""
10402
"dpush_strict\n"
10403
"~~~~~~~~~~~~"
10404
msgstr ""
10405
10406
#: en/help_topics/configuration.txt:649
10407
msgid ""
10408
"If present, defines the ``--strict`` option default value for checking\n"
10409
"uncommitted changes before pushing into a different VCS without any\n"
10410
"custom bzr metadata."
10411
msgstr ""
10412
10413
#: en/help_topics/configuration.txt:653
10414
msgid ""
10415
"bound_location\n"
10416
"~~~~~~~~~~~~~~"
10417
msgstr ""
10418
10419
#: en/help_topics/configuration.txt:656
10420
msgid ""
10421
"The location that commits should go to when acting as a checkout.\n"
10422
"This option is normally set by ``bind``."
10423
msgstr ""
10424
10425
#: en/help_topics/configuration.txt:659
10426
msgid ""
10427
"bound\n"
10428
"~~~~~"
10429
msgstr ""
10430
10431
#: en/help_topics/configuration.txt:662
10432
msgid ""
10433
"If set to \"True\", the branch should act as a checkout, and push each "
10434
"commit to\n"
10435
"the bound_location. This option is normally set by ``bind``/``unbind``."
10436
msgstr ""
10437
10438
#: en/help_topics/configuration.txt:665
10439
msgid ""
10440
"send_strict\n"
10441
"~~~~~~~~~~~"
10442
msgstr ""
10443
10444
#: en/help_topics/configuration.txt:668
10445
msgid ""
10446
"If present, defines the ``--strict`` option default value for checking\n"
10447
"uncommitted changes before sending a merge directive."
10448
msgstr ""
10449
10450
#: en/help_topics/configuration.txt:671
10451
msgid ""
10452
"add.maximum_file_size\n"
10453
"~~~~~~~~~~~~~~~~~~~~~"
10454
msgstr ""
10455
10456
#: en/help_topics/configuration.txt:674
10457
msgid ""
10458
"Defines the maximum file size the command line \"add\" operation will allow\n"
10459
"in recursive mode, with files larger than this value being skipped. You may "
10460
"\n"
10461
"specify this value as an integer (in which case it is interpreted as bytes), "
10462
"\n"
10463
"or you may specify the value using SI units, i.e. 10KB, 20MB, 1G. A value of "
10464
"0 \n"
10465
"will disable skipping."
10466
msgstr ""
10467
10468
#: en/help_topics/configuration.txt:680
10469
msgid ""
10470
"External Merge Tools\n"
10471
"--------------------"
10472
msgstr ""
10473
10474
#: en/help_topics/configuration.txt:683
10475
msgid ""
10476
"bzr.mergetool.<name>\n"
10477
"~~~~~~~~~~~~~~~~~~~~"
10478
msgstr ""
10479
10480
#: en/help_topics/configuration.txt:686
10481
msgid ""
10482
"Defines an external merge tool called <name> with the given command-line.\n"
10483
"Arguments containing spaces should be quoted using single or double quotes. "
10484
"The\n"
10485
"executable may omit its path if it can be found on the PATH."
10486
msgstr ""
10487
10488
#: en/help_topics/configuration.txt:690
10489
msgid ""
10490
"The following markers can be used in the command-line to substitute "
10491
"filenames\n"
10492
"involved in the merge conflict::"
10493
msgstr ""
10494
10495
#: en/help_topics/configuration.txt:693
10496
msgid ""
10497
" {base} file.BASE\n"
10498
" {this} file.THIS\n"
10499
" {other} file.OTHER\n"
10500
" {result} output file\n"
10501
" {this_temp} temp copy of file.THIS, used to overwrite output file if "
10502
"merge\n"
10503
" succeeds."
10504
msgstr ""
10505
10506
#: en/help_topics/configuration.txt:702
10507
msgid " bzr.mergetool.kdiff3 = kdiff3 {base} {this} {other} -o {result}"
10508
msgstr ""
10509
10510
#: en/help_topics/configuration.txt:704
10511
msgid ""
10512
"bzr.default_mergetool\n"
10513
"~~~~~~~~~~~~~~~~~~~~~"
10514
msgstr ""
10515
10516
#: en/help_topics/configuration.txt:707
10517
msgid ""
10518
"Specifies which external merge tool (as defined above) should be selected "
10519
"by\n"
10520
"default in tools such as ``bzr qconflicts``."
10521
msgstr ""
10522
10523
#: en/help_topics/configuration.txt:712
10524
msgid " bzr.default_mergetool = kdiff3\n"
10525
msgstr ""
10526
10527
#: en/help_topics/conflict-types.txt:1
10528
msgid ""
10529
"Conflict Types\n"
10530
"=============="
10531
msgstr ""
10532
10533
#: en/help_topics/conflict-types.txt:4
10534
msgid ""
10535
"Some operations, like merge, revert and pull, modify the contents of your\n"
10536
"working tree. These modifications are programmatically generated, and so "
10537
"they\n"
10538
"may conflict with the current state of your working tree. "
10539
msgstr ""
10540
10541
#: en/help_topics/conflict-types.txt:8
10542
msgid ""
10543
"When conflicts are present in your working tree (as shown by ``bzr\n"
10544
"conflicts``), you should resolve them and then inform bzr that the "
10545
"conflicts\n"
10546
"have been resolved."
10547
msgstr ""
10548
10549
#: en/help_topics/conflict-types.txt:12
10550
msgid ""
10551
"Resolving conflicts is sometimes not obvious. Either because the user that\n"
10552
"should resolve them is not the one responsible for their occurrence, as is "
10553
"the\n"
10554
"case when merging other people's work or because some conflicts are "
10555
"presented\n"
10556
"in a way that is not easy to understand."
10557
msgstr ""
10558
10559
#: en/help_topics/conflict-types.txt:17
10560
msgid ""
10561
"Bazaar tries to avoid conflicts ; its aim is to ask you to resolve the\n"
10562
"conflict if and only if there's an actual conceptual conflict in the source\n"
10563
"tree. Because Bazaar doesn't understand the real meaning of the files "
10564
"being\n"
10565
"versioned, it can, when faced with ambiguities, fall short in either "
10566
"direction\n"
10567
"trying to resolve the conflict itself. Many kinds of changes can be "
10568
"combined\n"
10569
"programmatically, but sometimes only a human can determine the right thing "
10570
"to\n"
10571
"do."
10572
msgstr ""
10573
10574
#: en/help_topics/conflict-types.txt:25
10575
msgid ""
10576
"When Bazaar generates a conflict, it adds information into the working tree "
10577
"to\n"
10578
"present the conflicting versions, and it's up to you to find the correct\n"
10579
"resolution."
10580
msgstr ""
10581
10582
#: en/help_topics/conflict-types.txt:29
10583
msgid "Whatever the conflict is, resolving it is roughly done in two steps:"
10584
msgstr ""
10585
10586
#: en/help_topics/conflict-types.txt:31
10587
msgid ""
10588
"1. Modify the working tree content so that the conflicted item is now in "
10589
"the\n"
10590
" state you want to keep, then"
10591
msgstr ""
10592
10593
#: en/help_topics/conflict-types.txt:34
10594
msgid ""
10595
"2. Inform Bazaar that the conflict is now solved and ask to cleanup any\n"
10596
" remaining generated information (``bzr resolve <item>``)."
10597
msgstr ""
10598
10599
#: en/help_topics/conflict-types.txt:37
10600
msgid ""
10601
"For most conflict types, there are some obvious ways to modify the working\n"
10602
"tree and put it into the desired state. For some types of conflicts, Bazaar\n"
10603
"itself already made a choice, when possible."
10604
msgstr ""
10605
10606
#: en/help_topics/conflict-types.txt:41
10607
msgid ""
10608
"Yet, whether Bazaar makes a choice or not, there are some other simple but\n"
10609
"different ways to resolve the conflict."
10610
msgstr ""
10611
10612
#: en/help_topics/conflict-types.txt:44
10613
msgid ""
10614
"Each type of conflict is explained below, and the action which must be done "
10615
"to\n"
10616
"resolve the conflict is outlined."
10617
msgstr ""
10618
10619
#: en/help_topics/conflict-types.txt:47
10620
msgid ""
10621
"Various actions are available depending on the kind of conflict, for some "
10622
"of\n"
10623
"these actions, Bazaar can provide some help. In the end you should at least\n"
10624
"inform Bazaar that you're done with the conflict with::"
10625
msgstr ""
10626
10627
#: en/help_topics/conflict-types.txt:51
10628
msgid " ``bzr resolve FILE --action=done'"
10629
msgstr ""
10630
10631
#: en/help_topics/conflict-types.txt:53
10632
msgid ""
10633
"Note that this is the default action when a single file is involved so you "
10634
"can\n"
10635
"simply use::"
10636
msgstr ""
10637
10638
#: en/help_topics/conflict-types.txt:56
10639
msgid " ``bzr resolve FILE``"
10640
msgstr ""
10641
10642
#: en/help_topics/conflict-types.txt:58
10643
msgid "See ``bzr help resolve`` for more details."
10644
msgstr ""
10645
10646
#: en/help_topics/conflict-types.txt:60
10647
msgid ""
10648
"Text conflicts\n"
10649
"--------------"
10650
msgstr ""
10651
10652
#: en/help_topics/conflict-types.txt:63 en/help_topics/conflict-types.txt:120
10653
#: en/help_topics/conflict-types.txt:151 en/help_topics/conflict-types.txt:175
10654
#: en/help_topics/conflict-types.txt:198 en/help_topics/conflict-types.txt:213
10655
#: en/help_topics/conflict-types.txt:239 en/help_topics/conflict-types.txt:281
10656
#: en/help_topics/conflict-types.txt:303 en/help_topics/conflict-types.txt:339
10657
msgid "Typical message::"
10658
msgstr ""
10659
10660
#: en/help_topics/conflict-types.txt:65
10661
msgid " Text conflict in FILE"
10662
msgstr ""
10663
10664
#: en/help_topics/conflict-types.txt:67
10665
msgid ""
10666
"These are produced when a text merge cannot completely reconcile two sets "
10667
"of\n"
10668
"text changes. Bazaar will emit files for each version with the extensions\n"
10669
"THIS, OTHER, and BASE. THIS is the version of the file from the target "
10670
"tree,\n"
10671
"i.e. the tree that you are merging changes into. OTHER is the version that "
10672
"you\n"
10673
"are merging into the target. BASE is an older version that is used as a "
10674
"basis\n"
10675
"for comparison."
10676
msgstr ""
10677
10678
#: en/help_topics/conflict-types.txt:74
10679
msgid ""
10680
"In the main copy of the file, Bazaar will include all the changes that it\n"
10681
"could reconcile, and any un-reconciled conflicts are surrounded by\n"
10682
"\"herringbone\" markers like ``<<<<<<<``."
10683
msgstr ""
10684
10685
#: en/help_topics/conflict-types.txt:78
10686
msgid ""
10687
"Say the initial text is \"The project leader released it.\", and THIS "
10688
"modifies it\n"
10689
"to \"Martin Pool released it.\", while OTHER modifies it to \"The project "
10690
"leader\n"
10691
"released Bazaar.\" A conflict would look like this::"
10692
msgstr ""
10693
10694
#: en/help_topics/conflict-types.txt:82
10695
msgid ""
10696
" <<<<<<< TREE\n"
10697
" Martin Pool released it.\n"
10698
" =======\n"
10699
" The project leader released Bazaar.\n"
10700
" >>>>>>> MERGE-SOURCE"
10701
msgstr ""
10702
10703
#: en/help_topics/conflict-types.txt:88
10704
msgid "The correct resolution would be \"Martin Pool released Bazaar.\""
10705
msgstr ""
10706
10707
#: en/help_topics/conflict-types.txt:90
10708
msgid ""
10709
"You can handle text conflicts either by editing the main copy of the file,\n"
10710
"or by invoking external tools on the THIS, OTHER and BASE versions. It's\n"
10711
"worth mentioning that resolving text conflicts rarely involves picking one\n"
10712
"set of changes over the other (but see below when you encounter these\n"
10713
"cases). More often, the two sets of changes must be intelligently combined."
10714
msgstr ""
10715
10716
#: en/help_topics/conflict-types.txt:96
10717
msgid ""
10718
"If you edit the main copy, be sure to remove the herringbone markers. When\n"
10719
"you are done editing, the file should look like it never had a conflict, and "
10720
"be\n"
10721
"ready to commit."
10722
msgstr ""
10723
10724
#: en/help_topics/conflict-types.txt:100
10725
msgid ""
10726
"When you have resolved text conflicts, just run ``bzr resolve --auto``, and\n"
10727
"Bazaar will auto-detect which conflicts you have resolved."
10728
msgstr ""
10729
10730
#: en/help_topics/conflict-types.txt:103
10731
msgid ""
10732
"When the conflict is resolved, Bazaar deletes the previously generated\n"
10733
"``.BASE``, ``.THIS`` and ``.OTHER`` files if they are still present in the\n"
10734
"working tree."
10735
msgstr ""
10736
10737
#: en/help_topics/conflict-types.txt:107
10738
msgid ""
10739
"\n"
10740
"When you want to pick one set of changes over the other, you can use ``bzr\n"
10741
"resolve`` with one of the following actions:"
10742
msgstr ""
10743
10744
#: en/help_topics/conflict-types.txt:111
10745
msgid ""
10746
"* ``--action=take-this`` will issue ``mv FILE.THIS FILE``,\n"
10747
"* ``--action=take-other`` will issue ``mv FILE.OTHER FILE``."
10748
msgstr ""
10749
10750
#: en/help_topics/conflict-types.txt:114
10751
msgid ""
10752
"Note that if you have modified ``FILE.THIS`` or ``FILE.OTHER``, these\n"
10753
"modifications will be taken into account."
10754
msgstr ""
10755
10756
#: en/help_topics/conflict-types.txt:117
10757
msgid ""
10758
"Content conflicts\n"
10759
"-----------------"
10760
msgstr ""
10761
10762
#: en/help_topics/conflict-types.txt:122
10763
msgid " Contents conflict in FILE"
10764
msgstr ""
10765
10766
#: en/help_topics/conflict-types.txt:124
10767
msgid ""
10768
"This conflict happens when there are conflicting changes in the working "
10769
"tree\n"
10770
"and the merge source, but the conflicted items are not text files. They "
10771
"may\n"
10772
"be binary files, or symlinks, or directories. It can even happen with "
10773
"files\n"
10774
"that are deleted on one side, and modified on the other."
10775
msgstr ""
10776
10777
#: en/help_topics/conflict-types.txt:129
10778
msgid ""
10779
"Like text conflicts, Bazaar will emit THIS, OTHER and BASE files. (They may "
10780
"be\n"
10781
"regular files, symlinks or directories). But it will not include a \"main "
10782
"copy\"\n"
10783
"of the file with herringbone conflict markers. It will appear that the "
10784
"\"main\n"
10785
"copy\" has been renamed to THIS or OTHER."
10786
msgstr ""
10787
10788
#: en/help_topics/conflict-types.txt:134 en/help_topics/conflict-types.txt:182
10789
msgid ""
10790
"To resolve that kind of conflict, you should rebuild FILE from either "
10791
"version\n"
10792
"or a combination of both."
10793
msgstr ""
10794
10795
#: en/help_topics/conflict-types.txt:137 en/help_topics/conflict-types.txt:185
10796
#: en/help_topics/conflict-types.txt:226 en/help_topics/conflict-types.txt:252
10797
#: en/help_topics/conflict-types.txt:291 en/help_topics/conflict-types.txt:326
10798
#: en/help_topics/conflict-types.txt:361
10799
msgid "``bzr resolve`` recognizes the following actions:"
10800
msgstr ""
10801
10802
#: en/help_topics/conflict-types.txt:139
10803
msgid ""
10804
"* ``--action=take-this`` will issue ``bzr mv FILE.THIS FILE``,\n"
10805
"* ``--action=take-other`` will issue ``bzr mv FILE.OTHER FILE``,\n"
10806
"* ``--action=done`` will just mark the conflict as resolved."
10807
msgstr ""
10808
10809
#: en/help_topics/conflict-types.txt:143
10810
msgid ""
10811
"Any action will also delete the previously generated ``.BASE``, ``.THIS`` "
10812
"and\n"
10813
"``.OTHER`` files if they are still present in the working tree."
10814
msgstr ""
10815
10816
#: en/help_topics/conflict-types.txt:146 en/help_topics/conflict-types.txt:193
10817
#: en/help_topics/conflict-types.txt:234 en/help_topics/conflict-types.txt:276
10818
#: en/help_topics/conflict-types.txt:298 en/help_topics/conflict-types.txt:334
10819
#: en/help_topics/conflict-types.txt:369
10820
msgid ""
10821
"Bazaar cannot auto-detect when conflicts of this kind have been resolved."
10822
msgstr ""
10823
10824
#: en/help_topics/conflict-types.txt:148
10825
msgid ""
10826
"Tag conflicts\n"
10827
"-------------"
10828
msgstr ""
10829
10830
#: en/help_topics/conflict-types.txt:153
10831
msgid ""
10832
" Conflicting tags:\n"
10833
" version-0.1"
10834
msgstr ""
10835
10836
#: en/help_topics/conflict-types.txt:156
10837
msgid ""
10838
"When pulling from or pushing to another branch, Bazaar informs you about "
10839
"tags\n"
10840
"that conflict between the two branches; that is the same tag points to two\n"
10841
"different revisions. You need not resolve these conflicts, but subsequent\n"
10842
"uses of pull or push will result in the same message."
10843
msgstr ""
10844
10845
#: en/help_topics/conflict-types.txt:161
10846
msgid ""
10847
"To resolve the conflict, you must apply the correct tags to either the "
10848
"target\n"
10849
"branch or the source branch as appropriate. Use \"bzr tags --show-ids -d\n"
10850
"SOURCE_URL\" to see the tags in the source branch. If you want to make the\n"
10851
"target branch's tags match the source branch, then in the target branch do\n"
10852
"``bzr tag --force -r revid:REVISION_ID CONFLICTING_TAG`` for each of the\n"
10853
"CONFLICTING_TAGs, where REVISION_ID comes from the list of tags in the "
10854
"source\n"
10855
"branch. You need not call \"bzr resolve\" after doing this. To resolve in\n"
10856
"favor of the target branch, you need to similarly use ``tag --force`` in "
10857
"the\n"
10858
"source branch. (Note that pulling or pushing using --overwrite will "
10859
"overwrite\n"
10860
"all tags as well.)"
10861
msgstr ""
10862
10863
#: en/help_topics/conflict-types.txt:172
10864
msgid ""
10865
"Duplicate paths\n"
10866
"---------------"
10867
msgstr ""
10868
10869
#: en/help_topics/conflict-types.txt:177
10870
msgid " Conflict adding file FILE. Moved existing file to FILE.moved."
10871
msgstr ""
10872
10873
#: en/help_topics/conflict-types.txt:179
10874
msgid ""
10875
"Sometimes Bazaar will attempt to create a file using a pathname that has\n"
10876
"already been used. The existing file will be renamed to \"FILE.moved\". "
10877
msgstr ""
10878
10879
#: en/help_topics/conflict-types.txt:187
10880
msgid ""
10881
"* ``--action=take-this`` will issue ``bzr rm FILE ; bzr mv FILE.moved "
10882
"FILE``,\n"
10883
"* ``--action=take-other`` will issue ``bzr rm FILE.moved``,\n"
10884
"* ``--action=done`` will just mark the conflict as resolved."
10885
msgstr ""
10886
10887
#: en/help_topics/conflict-types.txt:191
10888
msgid ""
10889
"Note that you must get rid of FILE.moved before using ``--action=done``."
10890
msgstr ""
10891
10892
#: en/help_topics/conflict-types.txt:195
10893
msgid ""
10894
"Unversioned parent\n"
10895
"------------------"
10896
msgstr ""
10897
10898
#: en/help_topics/conflict-types.txt:200
10899
msgid ""
10900
" Conflict because FILE is not versioned, but has versioned children."
10901
msgstr ""
10902
10903
#: en/help_topics/conflict-types.txt:202
10904
msgid ""
10905
"Sometimes Bazaar will attempt to create a file whose parent directory is "
10906
"not\n"
10907
"versioned. This happens when the directory has been deleted in the target,\n"
10908
"but has a new child in the source, or vice versa. In this situation, "
10909
"Bazaar\n"
10910
"will version the parent directory as well. Resolving this issue depends\n"
10911
"very much on the particular scenario. You may wish to rename or delete "
10912
"either\n"
10913
"the file or the directory. When you are satisfied, you can run \"bzr "
10914
"resolve\n"
10915
"FILE\" to mark the conflict as resolved."
10916
msgstr ""
10917
10918
#: en/help_topics/conflict-types.txt:210
10919
msgid ""
10920
"Missing parent\n"
10921
"--------------"
10922
msgstr ""
10923
10924
#: en/help_topics/conflict-types.txt:215
10925
msgid " Conflict adding files to FILE. Created directory."
10926
msgstr ""
10927
10928
#: en/help_topics/conflict-types.txt:217
10929
msgid ""
10930
"This happens when a directory has been deleted in the target, but has new\n"
10931
"children in the source. This is similar to the \"unversioned parent\" "
10932
"conflict,\n"
10933
"except that the parent directory does not *exist*, instead of just being\n"
10934
"unversioned. In this situation, Bazaar will create the missing parent.\n"
10935
"Resolving this issue depends very much on the particular scenario."
10936
msgstr ""
10937
10938
#: en/help_topics/conflict-types.txt:223 en/help_topics/conflict-types.txt:249
10939
msgid ""
10940
"To resolve that kind of conflict, you should either remove or rename the\n"
10941
"children or the directory or a combination of both."
10942
msgstr ""
10943
10944
#: en/help_topics/conflict-types.txt:228
10945
msgid ""
10946
"* ``--action=take-this`` will issue ``bzr rm directory`` including the\n"
10947
" children,\n"
10948
"* ``--action=take-other`` will acknowledge Bazaar choice to keep the "
10949
"children\n"
10950
" and restoring the directory,\n"
10951
"* ``--action=done`` will just mark the conflict as resolved."
10952
msgstr ""
10953
10954
#: en/help_topics/conflict-types.txt:236
10955
msgid ""
10956
"Deleting parent\n"
10957
"---------------"
10958
msgstr ""
10959
10960
#: en/help_topics/conflict-types.txt:241
10961
msgid " Conflict: can't delete DIR because it is not empty. Not deleting."
10962
msgstr ""
10963
10964
#: en/help_topics/conflict-types.txt:243
10965
msgid ""
10966
"This is the opposite of \"missing parent\". A directory is deleted in the\n"
10967
"source, but has new children in the target (either because a directory\n"
10968
"deletion is merged or because the merge introduce new children). Bazaar\n"
10969
"will retain the directory. Resolving this issue depends very much on the\n"
10970
"particular scenario."
10971
msgstr ""
10972
10973
#: en/help_topics/conflict-types.txt:254
10974
msgid ""
10975
"* ``--action=take-this`` will acknowledge Bazaar choice to keep the "
10976
"directory,"
10977
msgstr ""
10978
10979
#: en/help_topics/conflict-types.txt:256
10980
msgid ""
10981
"* ``--action=take-other`` will issue ``bzr rm directory`` including the \n"
10982
" children,"
10983
msgstr ""
10984
10985
#: en/help_topics/conflict-types.txt:259
10986
msgid "* ``--action=done`` will just mark the conflict as resolved."
10987
msgstr ""
10988
10989
#: en/help_topics/conflict-types.txt:261
10990
msgid ""
10991
"Note that when merging a directory deletion, if unversioned files are\n"
10992
"present, they become potential orphans has they don't have a directory\n"
10993
"parent anymore."
10994
msgstr ""
10995
10996
#: en/help_topics/conflict-types.txt:265
10997
msgid ""
10998
"Handling such orphans, *before* the conflict is created, is controlled by\n"
10999
"setting the ``bzr.transform.orphan_policy`` configuration option."
11000
msgstr ""
11001
11002
#: en/help_topics/conflict-types.txt:268
11003
msgid "There are two possible values for this option:"
11004
msgstr ""
11005
11006
#: en/help_topics/conflict-types.txt:270
11007
msgid ""
11008
"* ``conflict`` (the default): will leave the orphans in place and\n"
11009
" generate a conflicts,"
11010
msgstr ""
11011
11012
#: en/help_topics/conflict-types.txt:273
11013
msgid ""
11014
"* ``move``: will move the orphans to a ``bzr-orphans`` directory at the "
11015
"root\n"
11016
" of the working tree with names like ``<file>.~#~``."
11017
msgstr ""
11018
11019
#: en/help_topics/conflict-types.txt:278
11020
msgid ""
11021
"Path conflict\n"
11022
"-------------"
11023
msgstr ""
11024
11025
#: en/help_topics/conflict-types.txt:283
11026
msgid " Path conflict: PATH1 / PATH2"
11027
msgstr ""
11028
11029
#: en/help_topics/conflict-types.txt:285
11030
msgid ""
11031
"This happens when the source and target have each modified the name or "
11032
"parent\n"
11033
"directory of a file. Bazaar will use the path elements from the source."
11034
msgstr ""
11035
11036
#: en/help_topics/conflict-types.txt:288
11037
msgid ""
11038
"To resolve that kind of conflict, you just have to decide what name should "
11039
"be\n"
11040
"retained for the file involved."
11041
msgstr ""
11042
11043
#: en/help_topics/conflict-types.txt:293
11044
msgid ""
11045
"* ``--action=take-this`` will revert Bazaar choice and keep ``PATH1`` by\n"
11046
" issuing ``bzr mv PATH2 PATH1``,\n"
11047
"* ``--action=take-other`` will acknowledge Bazaar choice of keeping "
11048
"``PATH2``,\n"
11049
"* ``--action=done`` will just mark the conflict as resolved."
11050
msgstr ""
11051
11052
#: en/help_topics/conflict-types.txt:300
11053
msgid ""
11054
"Parent loop\n"
11055
"-----------"
11056
msgstr ""
11057
11058
#: en/help_topics/conflict-types.txt:305
11059
msgid " Conflict moving FILE into DIRECTORY. Cancelled move."
11060
msgstr ""
11061
11062
#: en/help_topics/conflict-types.txt:307
11063
msgid ""
11064
"This happens when the source and the target have each moved directories, so\n"
11065
"that, if the change could be applied, a directory would be contained by "
11066
"itself.\n"
11067
"For example::"
11068
msgstr ""
11069
11070
#: en/help_topics/conflict-types.txt:311
11071
msgid ""
11072
" $ bzr init\n"
11073
" $ bzr mkdir white\n"
11074
" $ bzr mkdir black\n"
11075
" $ bzr commit -m \"BASE\"\n"
11076
" $ bzr branch . ../other\n"
11077
" $ bzr mv white black\n"
11078
" $ bzr commit -m \"THIS\"\n"
11079
" $ bzr mv ../other/black ../other/white\n"
11080
" $ bzr commit ../other -m \"OTHER\"\n"
11081
" $ bzr merge ../other"
11082
msgstr ""
11083
11084
#: en/help_topics/conflict-types.txt:322
11085
msgid ""
11086
"In this situation, Bazaar will cancel the move, and leave ``white`` in\n"
11087
"``black``. To resolve that kind of conflict, you just have to decide what\n"
11088
"name should be retained for the directories involved."
11089
msgstr ""
11090
11091
#: en/help_topics/conflict-types.txt:328
11092
msgid ""
11093
"* ``--action=take-this`` will acknowledge Bazaar choice of leaving ``white`` "
11094
"\n"
11095
" in ``black``,\n"
11096
"* ``--action=take-other`` will revert Bazaar choice and move ``black`` in\n"
11097
" ``white`` by issuing ``bzr mv black/white white ; bzr mv black white``,\n"
11098
"* ``--action=done`` will just mark the conflict as resolved."
11099
msgstr ""
11100
11101
#: en/help_topics/conflict-types.txt:336
11102
msgid ""
11103
"Non-directory parent\n"
11104
"--------------------"
11105
msgstr ""
11106
11107
#: en/help_topics/conflict-types.txt:341
11108
msgid ""
11109
" Conflict: foo.new is not a directory, but has files in it.\n"
11110
" Created directory."
11111
msgstr ""
11112
11113
#: en/help_topics/conflict-types.txt:344
11114
msgid ""
11115
"This happens when one side has added files to a directory, and the other "
11116
"side\n"
11117
"has changed the directory into a file or symlink. For example::"
11118
msgstr ""
11119
11120
#: en/help_topics/conflict-types.txt:347
11121
msgid ""
11122
" $ bzr init\n"
11123
" $ bzr mkdir foo\n"
11124
" $ bzr commit -m \"BASE\"\n"
11125
" $ bzr branch . ../other\n"
11126
" $ rmdir foo\n"
11127
" $ touch foo\n"
11128
" $ bzr commit -m \"THIS\"\n"
11129
" $ bzr mkdir ../other/foo/bar\n"
11130
" $ bzr commit ../other -m \"OTHER\"\n"
11131
" $ bzr merge ../other"
11132
msgstr ""
11133
11134
#: en/help_topics/conflict-types.txt:358
11135
msgid ""
11136
"To resolve that kind of conflict, you have to decide what name should be\n"
11137
"retained for the file, directory or symlink involved."
11138
msgstr ""
11139
11140
#: en/help_topics/conflict-types.txt:363
11141
msgid ""
11142
"* ``--action=take-this`` will issue ``bzr rm --force foo.new`` and \n"
11143
" ``bzr add foo``,\n"
11144
"* ``--action=take-other`` will issue ``bzr rm --force foo`` and \n"
11145
" ``bzr mv foo.new foo``,\n"
11146
"* ``--action=done`` will just mark the conflict as resolved."
11147
msgstr ""
11148
11149
#: en/help_topics/conflict-types.txt:371
11150
msgid ""
11151
"MalformedTransform\n"
11152
"------------------"
11153
msgstr ""
11154
11155
#: en/help_topics/conflict-types.txt:374
11156
msgid ""
11157
"It is possible (though very rare) for Bazaar to raise a MalformedTransform\n"
11158
"exception. This means that Bazaar encountered a filesystem conflict that it "
11159
"was\n"
11160
"unable to resolve. This usually indicates a bug. Please let us know if "
11161
"you\n"
11162
"encounter this. Our bug tracker is at https://launchpad.net/bzr/+bugs\n"
11163
msgstr ""
11164
11165
#: en/help_topics/content-filters.txt:1
11166
msgid ""
11167
"Content Filters\n"
11168
"==============="
11169
msgstr ""
11170
11171
#: en/help_topics/content-filters.txt:4
11172
msgid ""
11173
"Content formats\n"
11174
"---------------"
11175
msgstr ""
11176
11177
#: en/help_topics/content-filters.txt:7
11178
msgid ""
11179
"Bazaar's content filtering allows you to store files in a different\n"
11180
"format from the copy in your working tree. This lets you, or your\n"
11181
"co-developers, use Windows development tools that expect CRLF files\n"
11182
"on projects that use other line-ending conventions. Among other things,\n"
11183
"content filters also let Unix developers more easily work on projects\n"
11184
"using Windows line-ending conventions, keyword expansion/compression,\n"
11185
"and trailing spaces on lines in text files to be implicitly stripped\n"
11186
"when committed."
11187
msgstr ""
11188
11189
#: en/help_topics/content-filters.txt:16
11190
msgid "To generalize, there are two content formats supported by Bazaar:"
11191
msgstr ""
11192
11193
#: en/help_topics/content-filters.txt:18
11194
msgid ""
11195
"* a canonical format - how files are stored internally\n"
11196
"* a convenience format - how files are created in a working tree."
11197
msgstr ""
11198
11199
#: en/help_topics/content-filters.txt:21
11200
msgid ""
11201
"\n"
11202
"Format conversion\n"
11203
"-----------------"
11204
msgstr ""
11205
11206
#: en/help_topics/content-filters.txt:25
11207
msgid ""
11208
"The conversion between these formats is done by content filters.\n"
11209
"A content filter has two parts:"
11210
msgstr ""
11211
11212
#: en/help_topics/content-filters.txt:28
11213
msgid ""
11214
"* a read converter - converts from convenience to canonical format\n"
11215
"* a write converter - converts from canonical to convenience format."
11216
msgstr ""
11217
11218
#: en/help_topics/content-filters.txt:31
11219
msgid ""
11220
"Many of these converters will provide *round-trip* conversion,\n"
11221
"i.e. applying the read converter followed by the write converter\n"
11222
"gives back the original content. However, others may provide an\n"
11223
"asymmetric conversion. For example, a read converter might strip\n"
11224
"trailing whitespace off lines in source code while the matching\n"
11225
"write converter might pass content through unchanged."
11226
msgstr ""
11227
11228
#: en/help_topics/content-filters.txt:38
11229
msgid ""
11230
"\n"
11231
"Enabling content filters\n"
11232
"------------------------"
11233
msgstr ""
11234
11235
#: en/help_topics/content-filters.txt:42
11236
msgid ""
11237
"Content filters are typically provided by plugins, so the first step\n"
11238
"in using them is to install the relevant plugins and read their\n"
11239
"documentation. Some plugins may be very specific about which files\n"
11240
"they filter, e.g. only files ending in ``.java`` or ``.php``.\n"
11241
"In other cases, the plugin may leave it in the user's hands to\n"
11242
"define which files are to be filtered. This is typically done\n"
11243
"using rule-based preferences. See ``bzr help rules`` for general\n"
11244
"information about defining these."
11245
msgstr ""
11246
11247
#: en/help_topics/content-filters.txt:51
11248
msgid ""
11249
"\n"
11250
"Impact on commands\n"
11251
"------------------"
11252
msgstr ""
11253
11254
#: en/help_topics/content-filters.txt:55
11255
msgid ""
11256
"Read converters are only applied to commands that read content from\n"
11257
"a working tree, e.g. status, diff and commit. For example, ``bzr diff``\n"
11258
"will apply read converters to files in the working tree, then compare\n"
11259
"the results to the content last committed."
11260
msgstr ""
11261
11262
#: en/help_topics/content-filters.txt:60
11263
msgid ""
11264
"Write converters are only applied by commands that **create files in a\n"
11265
"working tree**, e.g. branch, checkout, update. If you wish to see the\n"
11266
"canonical format of a file or tree, use ``bzr cat`` or ``bzr export``\n"
11267
"respectively."
11268
msgstr ""
11269
11270
#: en/help_topics/content-filters.txt:65
11271
msgid ""
11272
"Note: ``bzr commit`` does not implicitly apply write converters after\n"
11273
"comitting files. If this makes sense for a given plugin providing\n"
11274
"a content filter, the plugin can usually achieve this effect by using a\n"
11275
"``start_commit`` or ``post_commit`` hook say. See :doc:`hooks-help`\n"
11276
"for more information on hooks."
11277
msgstr ""
11278
11279
#: en/help_topics/content-filters.txt:71
11280
msgid ""
11281
"\n"
11282
"Refreshing your working tree\n"
11283
"----------------------------"
11284
msgstr ""
11285
11286
#: en/help_topics/content-filters.txt:75
11287
msgid ""
11288
"For performance reasons, Bazaar caches the timestamps of files in\n"
11289
"a working tree, and assumes files are unchanged if their timestamps\n"
11290
"match the cached values. As a consequence, there are times when\n"
11291
"you may need to explicitly ask for content filtering to be reapplied\n"
11292
"in one or both directions, e.g. after installing or reconfiguring\n"
11293
"plugins providing it."
11294
msgstr ""
11295
11296
#: en/help_topics/content-filters.txt:82
11297
msgid "Here are some general guidelines for doing this:"
11298
msgstr ""
11299
11300
#: en/help_topics/content-filters.txt:84
11301
msgid ""
11302
" * To reapply read converters, ``touch`` files, i.e. update their\n"
11303
" timestamp. Operations like ``bzr status`` should then reapply the\n"
11304
" relevant read converters and compare the end result with the\n"
11305
" canonical format."
11306
msgstr ""
11307
11308
#: en/help_topics/content-filters.txt:89
11309
msgid ""
11310
" * To reapply write converters, ensure there are no local changes,\n"
11311
" delete the relevant files and run ``bzr revert`` on those files."
11312
msgstr ""
11313
11314
#: en/help_topics/content-filters.txt:92
11315
msgid ""
11316
"Note: In the future, it is likely that additional options will be added\n"
11317
"to commands to make this refreshing process faster and safer.\n"
11318
msgstr ""
11319
11320
#: en/help_topics/current-formats.txt:1
11321
msgid "Current Storage Formats"
11322
msgstr ""
11323
11324
#: en/help_topics/current-formats.txt:3
11325
msgid ""
11326
":2a:\n"
11327
" (native) (default) Format for the bzr 2.0 series. Uses group-\n"
11328
" compress storage. Provides rich roots which are a one-way\n"
11329
" transition."
11330
msgstr ""
11331
11332
#: en/help_topics/current-formats.txt:8 en/help_topics/other-formats.txt:17
11333
msgid ""
11334
"\n"
11335
"See :doc:`formats-help` for more about storage formats."
11336
msgstr ""
11337
11338
#: en/help_topics/debug-flags.txt:1
11339
msgid ""
11340
"Debug Flags\n"
11341
"==========="
11342
msgstr ""
11343
11344
#: en/help_topics/debug-flags.txt:4
11345
msgid ""
11346
"These flags can be passed on the bzr command line or (without the ``-D``\n"
11347
"prefix) put in the ``debug_flags`` variable in ``bazaar.conf``."
11348
msgstr ""
11349
11350
#: en/help_topics/debug-flags.txt:7
11351
msgid ""
11352
"-Dauth Trace authentication sections used.\n"
11353
"-Dbytes Print out how many bytes were transferred\n"
11354
"-Ddirstate Trace dirstate activity (verbose!)\n"
11355
"-Derror Instead of normal error handling, always print a "
11356
"traceback\n"
11357
" on error.\n"
11358
"-Devil Capture call sites that do expensive or badly-scaling\n"
11359
" operations.\n"
11360
"-Dfetch Trace history copying between repositories.\n"
11361
"-Dfilters Emit information for debugging content filtering.\n"
11362
"-Dforceinvdeltas Force use of inventory deltas during generic streaming "
11363
"fetch.\n"
11364
"-Dgraph Trace graph traversal.\n"
11365
"-Dhashcache Log every time a working file is read to determine its "
11366
"hash.\n"
11367
"-Dhooks Trace hook execution.\n"
11368
"-Dhpss Trace smart protocol requests and responses.\n"
11369
"-Dhpssdetail More hpss details.\n"
11370
"-Dhpssvfs Traceback on vfs access to Remote objects.\n"
11371
"-Dhttp Trace http connections, requests and responses.\n"
11372
"-Dindex Trace major index operations.\n"
11373
"-Dknit Trace knit operations.\n"
11374
"-Dlock Trace when lockdir locks are taken or released.\n"
11375
"-Dnoretry If a connection is reset, fail immediately rather than\n"
11376
" retrying the request.\n"
11377
"-Dprogress Trace progress bar operations.\n"
11378
"-Dmem_dump Dump memory to a file upon an out of memory error.\n"
11379
"-Dmerge Emit information for debugging merges.\n"
11380
"-Dno_apport Don't use apport to report crashes.\n"
11381
"-Dno_activity \t Don't show transport activity indicator in progress bar.\n"
11382
"-Dpack Emit information about pack operations.\n"
11383
"-Drelock Emit a message every time a branch or repository object "
11384
"is\n"
11385
" unlocked then relocked the same way.\n"
11386
"-Dsftp Trace SFTP internals.\n"
11387
"-Dstatic_tuple Error when a tuple is used where a StaticTuple is "
11388
"expected\n"
11389
"-Dstream Trace fetch streams.\n"
11390
"-Dstrict_locks Trace when OS locks are potentially used in a non-"
11391
"portable\n"
11392
" manner.\n"
11393
"-Dunlock Some errors during unlock are treated as warnings.\n"
11394
"-DIDS_never Never use InterDifferingSerializer when fetching.\n"
11395
"-DIDS_always Always use InterDifferingSerializer to fetch if "
11396
"appropriate\n"
11397
" for the format, even for non-local fetches.\n"
11398
msgstr ""
11399
11400
#: en/help_topics/diverged-branches.txt:1
11401
msgid ""
11402
"Diverged Branches\n"
11403
"================="
11404
msgstr ""
11405
11406
#: en/help_topics/diverged-branches.txt:4
11407
msgid ""
11408
"When Bazaar tries to push one branch onto another, it requires that the\n"
11409
"destination branch must be ready to receive the source branch. If this "
11410
"isn't\n"
11411
"the case, then we say that the branches have ``diverged``. Branches are\n"
11412
"considered diverged if the destination branch's most recent commit is one "
11413
"that\n"
11414
"has not been merged (directly or indirectly) by the source branch. To "
11415
"recover\n"
11416
"from diverged branches, one must merge the missing revisions into the "
11417
"source\n"
11418
"branch."
11419
msgstr ""
11420
11421
#: en/help_topics/diverged-branches.txt:12
11422
msgid ""
11423
"This situation commonly arises when using a centralized workflow with local\n"
11424
"commits. If someone else has committed new work to the mainline since your\n"
11425
"last pull and you have local commits that have not yet been pushed to the\n"
11426
"mainline, then your local branch and the mainline have diverged."
11427
msgstr ""
11428
11429
#: en/help_topics/diverged-branches.txt:17
11430
msgid ""
11431
"Discovering What Has Diverged\n"
11432
"-----------------------------"
11433
msgstr ""
11434
11435
#: en/help_topics/diverged-branches.txt:20
11436
msgid ""
11437
"The ``bzr missing`` command is used to find out what revisions are in "
11438
"another\n"
11439
"branch that are not present in the current branch, and vice-versa. It shows "
11440
"a\n"
11441
"summary of which extra revisions exist in each branch. If you want to see "
11442
"the\n"
11443
"precise effects of those revisions, you can use ``bzr diff --"
11444
"old=other_branch``\n"
11445
"to show the differences between other_branch and your current branch."
11446
msgstr ""
11447
11448
#: en/help_topics/diverged-branches.txt:26
11449
msgid ""
11450
"A Solution\n"
11451
"----------"
11452
msgstr ""
11453
11454
#: en/help_topics/diverged-branches.txt:29
11455
msgid ""
11456
"The solution is to merge the revisions from the mainline into your local\n"
11457
"branch. To do so, use ``bzr merge`` to get the new revisions from the\n"
11458
"mainline. This merge may result in conflicts if the other developer's "
11459
"changes\n"
11460
"overlap with your changes. These conflicts should be resolved before\n"
11461
"continuing. After any conflicts have been resolved, or even if there were "
11462
"no\n"
11463
"conflicts, Bazaar requires that you explicitly commit these new revisions\n"
11464
"to your local branch. This requirement gives you an opportunity to test "
11465
"the\n"
11466
"resulting working tree for correctness, since the merged revisions could "
11467
"have\n"
11468
"made arbitrary changes. After testing, you should commit the merge using\n"
11469
"``bzr commit``. This clears up the diverged branches situation. Your "
11470
"local\n"
11471
"branch can now be pushed to the mainline.\n"
11472
msgstr ""
11473
11474
#: en/help_topics/eol.txt:1
11475
msgid ""
11476
"End of Line Conversion\n"
11477
"======================"
11478
msgstr ""
11479
11480
#: en/help_topics/eol.txt:4
11481
msgid ""
11482
"EOL conversion is provided as a content filter where Bazaar internally\n"
11483
"stores a canonical format but outputs a convenience format. See\n"
11484
"``bzr help content-filters`` for general information about using these."
11485
msgstr ""
11486
11487
#: en/help_topics/eol.txt:8
11488
msgid ""
11489
"Note: Content filtering is only supported in recently added formats,\n"
11490
"e.g. 1.14. Be sure that both the repository *and* the branch are\n"
11491
"in a recent format. (Just setting the format on the repository\n"
11492
"is not enough.) If content filtering does not appear to be working, use\n"
11493
"'bzr info -v' to confirm that the branch is using \"Working tree format 5\"\n"
11494
"or later."
11495
msgstr ""
11496
11497
#: en/help_topics/eol.txt:15
11498
msgid ""
11499
"EOL conversion needs to be enabled for selected file patterns using\n"
11500
"rules. See ``bzr help rules`` for general information on defining rules.\n"
11501
"Currently, rules are only supported in $BZR_HOME/.bazaar/rules (or\n"
11502
"%BZR_HOME%/bazaar/2.0/rules on Windows). Branch specific rules will be\n"
11503
"supported in a future verison of Bazaar."
11504
msgstr ""
11505
11506
#: en/help_topics/eol.txt:21
11507
msgid ""
11508
"To configure which files to filter, set ``eol`` to one of the values below.\n"
11509
"(If a value is not set, ``exact`` is the default.)"
11510
msgstr ""
11511
11512
#: en/help_topics/eol.txt:24
11513
msgid ""
11514
" ========== ===================================== ======================\n"
11515
" Value Checkout end-of-lines as Commit end-of-lines as\n"
11516
" ========== ===================================== ======================\n"
11517
" ``native`` ``crlf`` on Windows, ``lf`` otherwise ``lf``\n"
11518
" ---------- ------------------------------------- ----------------------\n"
11519
" ``lf`` ``lf`` ``lf``\n"
11520
" ---------- ------------------------------------- ----------------------\n"
11521
" ``crlf`` ``crlf`` ``lf``\n"
11522
" ---------- ------------------------------------- ----------------------\n"
11523
" ``exact`` No conversion Exactly as in file\n"
11524
" ========== ===================================== ======================"
11525
msgstr ""
11526
11527
#: en/help_topics/eol.txt:36
11528
msgid ""
11529
"Note: For safety reasons, no conversion is applied to any file where a null\n"
11530
"byte is detected in the file."
11531
msgstr ""
11532
11533
#: en/help_topics/eol.txt:39
11534
msgid ""
11535
"For users working on a cross-platform project, here is a suggested rule\n"
11536
"to use as a starting point::"
11537
msgstr ""
11538
11539
#: en/help_topics/eol.txt:42 en/help_topics/eol.txt:52
11540
#: en/help_topics/eol.txt:67 en/help_topics/eol.txt:82
11541
msgid ""
11542
" [name *]\n"
11543
" eol = native"
11544
msgstr ""
11545
11546
#: en/help_topics/eol.txt:45
11547
msgid ""
11548
"If you have binary files that do not contain a null byte though, be\n"
11549
"sure to add ``eol = exact`` rules for those as well. You can do this\n"
11550
"by giving more explicit patterns earlier in the rules file. For example::"
11551
msgstr ""
11552
11553
#: en/help_topics/eol.txt:49
11554
msgid ""
11555
" [name *.png]\n"
11556
" eol = exact"
11557
msgstr ""
11558
11559
#: en/help_topics/eol.txt:55
11560
msgid ""
11561
"If your working tree is on a network drive shared by users on different\n"
11562
"operating systems, you typically want to force certain conventions for\n"
11563
"certain files. In that way, if a file is created with the wrong line\n"
11564
"endings or line endings get mixed during editing, it gets committed\n"
11565
"correctly and gets checked out correctly. For example::"
11566
msgstr ""
11567
11568
#: en/help_topics/eol.txt:61
11569
msgid ""
11570
" [name *.bat]\n"
11571
" eol = crlf"
11572
msgstr ""
11573
11574
#: en/help_topics/eol.txt:64
11575
msgid ""
11576
" [name *.sh]\n"
11577
" eol = lf"
11578
msgstr ""
11579
11580
#: en/help_topics/eol.txt:70
11581
msgid ""
11582
"If you take the care to create files with their required endings, you can\n"
11583
"achieve *almost* the same thing by using ``eol = exact``. It is slightly\n"
11584
"safer to use ``lf`` and ``crlf`` though because edits accidentally\n"
11585
"introducing mixed line endings will be corrected during commit for files\n"
11586
"with those settings."
11587
msgstr ""
11588
11589
#: en/help_topics/eol.txt:76
11590
msgid ""
11591
"If you have sample test data that deliberately has text files with mixed\n"
11592
"newline conventions, you can ask for those to be left alone like this::"
11593
msgstr ""
11594
11595
#: en/help_topics/eol.txt:79
11596
msgid ""
11597
" [name test_data/]\n"
11598
" eol = exact"
11599
msgstr ""
11600
11601
#: en/help_topics/eol.txt:85
11602
msgid ""
11603
"Note that ``exact`` does not imply the file is binary but it does mean\n"
11604
"that no conversion of end-of-lines will be done. (Bazaar currently relies\n"
11605
"of content analysis to detect binary files for commands like ``diff``.\n"
11606
"In the future, a ``binary = true`` rule may be added but it is not\n"
11607
"supported yet.)"
11608
msgstr ""
11609
11610
#: en/help_topics/eol.txt:91
11611
msgid ""
11612
"If you have an existing repository with text files already stored using\n"
11613
"Windows newline conventions (``crlf``), then you may want to keep using "
11614
"that\n"
11615
"convention in the repository. Forcing certain files to this convention\n"
11616
"may also help users who do not have rules configured. To do this, set\n"
11617
"``eol`` to one of the values below."
11618
msgstr ""
11619
11620
#: en/help_topics/eol.txt:97
11621
msgid ""
11622
" ============================ ======================== "
11623
"======================\n"
11624
" Value Checkout end-of-lines as Commit end-of-lines "
11625
"as\n"
11626
" ============================ ======================== "
11627
"======================\n"
11628
" ``native-with-crlf-in-repo`` ``crlf`` on Windows, ``crlf``\n"
11629
" ``lf`` otherwise\n"
11630
" ---------------------------- ------------------------ ----------------------"
11631
"\n"
11632
" ``lf-with-crlf-in-repo`` ``lf`` ``crlf``\n"
11633
" ---------------------------- ------------------------ ----------------------"
11634
"\n"
11635
" ``crlf-with-crlf-in-repo`` ``crlf`` ``crlf``\n"
11636
" ============================ ======================== ======================"
11637
msgstr ""
11638
11639
#: en/help_topics/eol.txt:108
11640
msgid ""
11641
"For users working on an existing project that uses Windows newline\n"
11642
"conventions in their Bazaar repository, this rule is suggested as a\n"
11643
"starting point::"
11644
msgstr ""
11645
11646
#: en/help_topics/eol.txt:112
11647
msgid ""
11648
" [name *]\n"
11649
" eol = native-with-crlf-in-repo"
11650
msgstr ""
11651
11652
#: en/help_topics/eol.txt:115
11653
msgid ""
11654
"For new projects, it is recommended that end-of-lines be stored as ``lf``\n"
11655
"and that users stick to the basic settings, i.e. ``native``, ``lf``,\n"
11656
"``crlf`` and ``exact``."
11657
msgstr ""
11658
11659
#: en/help_topics/eol.txt:119
11660
msgid ""
11661
"Note: Bazaar's EOL conversion will convert the content of files but\n"
11662
"never reject files because a given line ending or mixed line endings\n"
11663
"are found. A precommit hook should be used if you wish to validate\n"
11664
"(and not just convert) content before committing.\n"
11665
msgstr ""
11666
11667
#: en/help_topics/hidden-commands.txt:1
11668
msgid ""
11669
"added List files added in working tree.\n"
11670
"ancestry List all revisions merged into this branch.\n"
11671
"assert-fail Test reporting of assertion failures\n"
11672
"bundle-info Output interesting stats about a bundle\n"
11673
"bundle-revisions Create a merge-directive for submitting changes.\n"
11674
"cat-revision Write out metadata for a revision.\n"
11675
"dump-btree Dump the contents of a btree index file to stdout.\n"
11676
"export-pot Export command helps and error messages in po format.\n"
11677
"file-id Print file_id of a particular file or directory.\n"
11678
"file-path Print path of file_ids to a file or directory.\n"
11679
"find-merge-base Find and print a base revision for merging two "
11680
"branches.\n"
11681
"hooks Show hooks.\n"
11682
"inventory Show inventory of the current working copy or a "
11683
"revision.\n"
11684
"local-time-offset Show the offset in seconds from GMT to local time.\n"
11685
"lookup-revision Lookup the revision-id from a revision-number\n"
11686
"merge-directive Generate a merge directive for auto-merge tools.\n"
11687
"modified List files modified in working tree.\n"
11688
"re-sign Create a digital signature for an existing revision.\n"
11689
"reference list, view and set branch locations for nested trees.\n"
11690
"relpath Show path of a file relative to root\n"
11691
"repair-workingtree Reset the working tree state file.\n"
11692
"revision-history Display the list of revision ids on a branch.\n"
11693
"revision-info Show revision number and revision id for a given "
11694
"revision\n"
11695
" identifier.\n"
11696
"rocks Statement of optimism.\n"
11697
"selftest Run internal test suite.\n"
11698
"shell-complete Show appropriate completions for context.\n"
11699
"test-script Run a shell-like test from a file.\n"
11700
"touching-revisions Return revision-ids which affected a particular file.\n"
11701
"unknowns List unknown files.\n"
11702
"wait-until-signalled Test helper for\n"
11703
" test_start_and_stop_bzr_subprocess_send_signal.\n"
11704
msgstr ""
11705
11706
#: en/help_topics/hooks.txt:1
11707
msgid ""
11708
"\n"
11709
"Hooks\n"
11710
"====="
11711
msgstr ""
11712
11713
#: en/help_topics/hooks.txt:5 en/help_topics/rules.txt:4
11714
msgid ""
11715
"Introduction\n"
11716
"------------"
11717
msgstr ""
11718
11719
#: en/help_topics/hooks.txt:8
11720
msgid "A hook of type *xxx* of class *yyy* needs to be registered using::"
11721
msgstr ""
11722
11723
#: en/help_topics/hooks.txt:10
11724
msgid " yyy.hooks.install_named_hook(\"xxx\", ...)"
11725
msgstr ""
11726
11727
#: en/help_topics/hooks.txt:12
11728
msgid ""
11729
"See :doc:`Using hooks<../user-guide/hooks>` in the User Guide for examples."
11730
msgstr ""
11731
11732
#: en/help_topics/hooks.txt:14
11733
msgid ""
11734
"The class that contains each hook is given before the hooks it supplies. "
11735
"For\n"
11736
"instance, BranchHooks as the class is the hooks class for\n"
11737
"`bzrlib.branch.Branch.hooks`."
11738
msgstr ""
11739
11740
#: en/help_topics/hooks.txt:18
11741
msgid ""
11742
"Each description also indicates whether the hook runs on the client (the\n"
11743
"machine where bzr was invoked) or the server (the machine addressed by\n"
11744
"the branch URL). These may be, but are not necessarily, the same machine."
11745
msgstr ""
11746
11747
#: en/help_topics/hooks.txt:22
11748
msgid ""
11749
"Plugins (including hooks) are run on the server if all of these is true:"
11750
msgstr ""
11751
11752
#: en/help_topics/hooks.txt:24
11753
msgid ""
11754
" * The connection is via a smart server (accessed with a URL starting with\n"
11755
" \"bzr://\", \"bzr+ssh://\" or \"bzr+http://\", or accessed via a "
11756
"\"http://\"\n"
11757
" URL when a smart server is available via HTTP)."
11758
msgstr ""
11759
11760
#: en/help_topics/hooks.txt:28
11761
msgid ""
11762
" * The hook is either server specific or part of general infrastructure "
11763
"rather\n"
11764
" than client specific code (such as commit)."
11765
msgstr ""
11766
11767
#: en/help_topics/hooks.txt:31
11768
msgid ""
11769
"\n"
11770
"BranchHooks\n"
11771
"-----------"
11772
msgstr ""
11773
11774
#: en/help_topics/hooks.txt:35
11775
msgid ""
11776
"automatic_tag_name\n"
11777
"~~~~~~~~~~~~~~~~~~"
11778
msgstr ""
11779
11780
#: en/help_topics/hooks.txt:38 en/help_topics/hooks.txt:56
11781
#: en/help_topics/hooks.txt:102 en/help_topics/hooks.txt:259
11782
msgid "Introduced in: 2.2"
11783
msgstr ""
11784
11785
#: en/help_topics/hooks.txt:40
11786
msgid ""
11787
"Called to determine an automatic tag name for a revision.\n"
11788
"automatic_tag_name is called with (branch, revision_id) and should\n"
11789
"return a tag name or None if no tag name could be determined. The\n"
11790
"first non-None tag name returned will be used."
11791
msgstr ""
11792
11793
#: en/help_topics/hooks.txt:45
11794
msgid ""
11795
"open\n"
11796
"~~~~"
11797
msgstr ""
11798
11799
#: en/help_topics/hooks.txt:48 en/help_topics/hooks.txt:290
11800
#: en/help_topics/hooks.txt:304
11801
msgid "Introduced in: 1.8"
11802
msgstr ""
11803
11804
#: en/help_topics/hooks.txt:50
11805
msgid ""
11806
"Called with the Branch object that has been opened after a branch is\n"
11807
"opened."
11808
msgstr ""
11809
11810
#: en/help_topics/hooks.txt:53
11811
msgid ""
11812
"post_branch_init\n"
11813
"~~~~~~~~~~~~~~~~"
11814
msgstr ""
11815
11816
#: en/help_topics/hooks.txt:58
11817
msgid ""
11818
"Called after new branch initialization completes. post_branch_init is\n"
11819
"called with a bzrlib.branch.BranchInitHookParams. Note that init,\n"
11820
"branch and checkout (both heavyweight and lightweight) will all\n"
11821
"trigger this hook."
11822
msgstr ""
11823
11824
#: en/help_topics/hooks.txt:63
11825
msgid ""
11826
"post_change_branch_tip\n"
11827
"~~~~~~~~~~~~~~~~~~~~~~"
11828
msgstr ""
11829
11830
#: en/help_topics/hooks.txt:66 en/help_topics/hooks.txt:402
11831
msgid "Introduced in: 1.4"
11832
msgstr ""
11833
11834
#: en/help_topics/hooks.txt:68
11835
msgid ""
11836
"Called in bzr client and server after a change to the tip of a branch\n"
11837
"is made. post_change_branch_tip is called with a\n"
11838
"bzrlib.branch.ChangeBranchTipParams. Note that push, pull, commit,\n"
11839
"uncommit will all trigger this hook."
11840
msgstr ""
11841
11842
#: en/help_topics/hooks.txt:73 en/help_topics/hooks.txt:389
11843
msgid ""
11844
"post_commit\n"
11845
"~~~~~~~~~~~"
11846
msgstr ""
11847
11848
#: en/help_topics/hooks.txt:76 en/help_topics/hooks.txt:86
11849
#: en/help_topics/hooks.txt:94 en/help_topics/hooks.txt:110
11850
#: en/help_topics/hooks.txt:145
11851
msgid "Introduced in: 0.15"
11852
msgstr ""
11853
11854
#: en/help_topics/hooks.txt:78
11855
msgid ""
11856
"Called in the bzr client after a commit has completed. post_commit is\n"
11857
"called with (local, master, old_revno, old_revid, new_revno,\n"
11858
"new_revid). old_revid is NULL_REVISION for the first commit to a\n"
11859
"branch."
11860
msgstr ""
11861
11862
#: en/help_topics/hooks.txt:83
11863
msgid ""
11864
"post_pull\n"
11865
"~~~~~~~~~"
11866
msgstr ""
11867
11868
#: en/help_topics/hooks.txt:88
11869
msgid ""
11870
"Called after a pull operation completes. post_pull is called with a\n"
11871
"bzrlib.branch.PullResult object and only runs in the bzr client."
11872
msgstr ""
11873
11874
#: en/help_topics/hooks.txt:91
11875
msgid ""
11876
"post_push\n"
11877
"~~~~~~~~~"
11878
msgstr ""
11879
11880
#: en/help_topics/hooks.txt:96
11881
msgid ""
11882
"Called after a push operation completes. post_push is called with a\n"
11883
"bzrlib.branch.BranchPushResult object and only runs in the bzr client."
11884
msgstr ""
11885
11886
#: en/help_topics/hooks.txt:99
11887
msgid ""
11888
"post_switch\n"
11889
"~~~~~~~~~~~"
11890
msgstr ""
11891
11892
#: en/help_topics/hooks.txt:104
11893
msgid ""
11894
"Called after a checkout switches branch. post_switch is called with a\n"
11895
"bzrlib.branch.SwitchHookParams."
11896
msgstr ""
11897
11898
#: en/help_topics/hooks.txt:107
11899
msgid ""
11900
"post_uncommit\n"
11901
"~~~~~~~~~~~~~"
11902
msgstr ""
11903
11904
#: en/help_topics/hooks.txt:112
11905
msgid ""
11906
"Called in the bzr client after an uncommit completes. post_uncommit is\n"
11907
"called with (local, master, old_revno, old_revid, new_revno,\n"
11908
"new_revid) where local is the local branch or None, master is the\n"
11909
"target branch, and an empty branch receives new_revno of 0, new_revid\n"
11910
"of None."
11911
msgstr ""
11912
11913
#: en/help_topics/hooks.txt:118
11914
msgid ""
11915
"pre_change_branch_tip\n"
11916
"~~~~~~~~~~~~~~~~~~~~~"
11917
msgstr ""
11918
11919
#: en/help_topics/hooks.txt:121
11920
msgid "Introduced in: 1.6"
11921
msgstr ""
11922
11923
#: en/help_topics/hooks.txt:123
11924
msgid ""
11925
"Called in bzr client and server before a change to the tip of a branch\n"
11926
"is made. pre_change_branch_tip is called with a\n"
11927
"bzrlib.branch.ChangeBranchTipParams. Note that push, pull, commit,\n"
11928
"uncommit will all trigger this hook."
11929
msgstr ""
11930
11931
#: en/help_topics/hooks.txt:128
11932
msgid ""
11933
"pre_commit\n"
11934
"~~~~~~~~~~"
11935
msgstr ""
11936
11937
#: en/help_topics/hooks.txt:131
11938
msgid "Introduced in: 0.91"
11939
msgstr ""
11940
11941
#: en/help_topics/hooks.txt:133
11942
msgid ""
11943
"Called after a commit is calculated but before it is completed.\n"
11944
"pre_commit is called with (local, master, old_revno, old_revid,\n"
11945
"future_revno, future_revid, tree_delta, future_tree). old_revid is\n"
11946
"NULL_REVISION for the first commit to a branch, tree_delta is a\n"
11947
"TreeDelta object describing changes from the basis revision. hooks\n"
11948
"MUST NOT modify this delta. future_tree is an in-memory tree obtained\n"
11949
"from CommitBuilder.revision_tree() and hooks MUST NOT modify this\n"
11950
"tree."
11951
msgstr ""
11952
11953
#: en/help_topics/hooks.txt:142
11954
msgid ""
11955
"set_rh\n"
11956
"~~~~~~"
11957
msgstr ""
11958
11959
#: en/help_topics/hooks.txt:147
11960
msgid ""
11961
"Invoked whenever the revision history has been set via\n"
11962
"set_revision_history. The api signature is (branch, revision_history),\n"
11963
"and the branch will be write-locked. The set_rh hook can be expensive\n"
11964
"for bzr to trigger, a better hook to use is\n"
11965
"Branch.post_change_branch_tip."
11966
msgstr ""
11967
11968
#: en/help_topics/hooks.txt:153
11969
msgid ""
11970
"transform_fallback_location\n"
11971
"~~~~~~~~~~~~~~~~~~~~~~~~~~~"
11972
msgstr ""
11973
11974
#: en/help_topics/hooks.txt:156
11975
msgid "Introduced in: 1.9"
11976
msgstr ""
11977
11978
#: en/help_topics/hooks.txt:158
11979
msgid ""
11980
"Called when a stacked branch is activating its fallback locations.\n"
11981
"transform_fallback_location is called with (branch, url), and should\n"
11982
"return a new url. Returning the same url allows it to be used as-is,\n"
11983
"returning a different one can be used to cause the branch to stack on\n"
11984
"a closer copy of that fallback_location. Note that the branch cannot\n"
11985
"have history accessing methods called on it during this hook because\n"
11986
"the fallback locations have not been activated. When there are\n"
11987
"multiple hooks installed for transform_fallback_location, all are\n"
11988
"called with the url returned from the previous hook.The order is\n"
11989
"however undefined."
11990
msgstr ""
11991
11992
#: en/help_topics/hooks.txt:169
11993
msgid ""
11994
"CommandHooks\n"
11995
"------------"
11996
msgstr ""
11997
11998
#: en/help_topics/hooks.txt:172
11999
msgid ""
12000
"extend_command\n"
12001
"~~~~~~~~~~~~~~"
12002
msgstr ""
12003
12004
#: en/help_topics/hooks.txt:175
12005
msgid "Introduced in: 1.13"
12006
msgstr ""
12007
12008
#: en/help_topics/hooks.txt:177
12009
msgid ""
12010
"Called after creating a command object to allow modifications such as\n"
12011
"adding or removing options, docs etc. Called with the new\n"
12012
"bzrlib.commands.Command object."
12013
msgstr ""
12014
12015
#: en/help_topics/hooks.txt:181
12016
msgid ""
12017
"get_command\n"
12018
"~~~~~~~~~~~"
12019
msgstr ""
12020
12021
#: en/help_topics/hooks.txt:184 en/help_topics/hooks.txt:196
12022
#: en/help_topics/hooks.txt:205 en/help_topics/hooks.txt:448
12023
msgid "Introduced in: 1.17"
12024
msgstr ""
12025
12026
#: en/help_topics/hooks.txt:186
12027
msgid ""
12028
"Called when creating a single command. Called with (cmd_or_None,\n"
12029
"command_name). get_command should either return the cmd_or_None\n"
12030
"parameter, or a replacement Command object that should be used for the\n"
12031
"command. Note that the Command.hooks hooks are core infrastructure.\n"
12032
"Many users will prefer to use bzrlib.commands.register_command or\n"
12033
"plugin_cmds.register_lazy."
12034
msgstr ""
12035
12036
#: en/help_topics/hooks.txt:193
12037
msgid ""
12038
"get_missing_command\n"
12039
"~~~~~~~~~~~~~~~~~~~"
12040
msgstr ""
12041
12042
#: en/help_topics/hooks.txt:198
12043
msgid ""
12044
"Called when creating a single command if no command could be found.\n"
12045
"Called with (command_name). get_missing_command should either return\n"
12046
"None, or a Command object to be used for the command."
12047
msgstr ""
12048
12049
#: en/help_topics/hooks.txt:202
12050
msgid ""
12051
"list_commands\n"
12052
"~~~~~~~~~~~~~"
12053
msgstr ""
12054
12055
#: en/help_topics/hooks.txt:207
12056
msgid ""
12057
"Called when enumerating commands. Called with a set of cmd_name\n"
12058
"strings for all the commands found so far. This set is safe to mutate\n"
12059
"- e.g. to remove a command. list_commands should return the updated\n"
12060
"set of command names."
12061
msgstr ""
12062
12063
#: en/help_topics/hooks.txt:212
12064
msgid ""
12065
"_ConfigHooks\n"
12066
"------------"
12067
msgstr ""
12068
12069
#: en/help_topics/hooks.txt:215
12070
msgid ""
12071
"get\n"
12072
"~~~"
12073
msgstr ""
12074
12075
#: en/help_topics/hooks.txt:218 en/help_topics/hooks.txt:226
12076
#: en/help_topics/hooks.txt:233 en/help_topics/hooks.txt:241
12077
#: en/help_topics/hooks.txt:248 en/help_topics/hooks.txt:370
12078
#: en/help_topics/hooks.txt:427
12079
msgid "Introduced in: 2.4"
12080
msgstr ""
12081
12082
#: en/help_topics/hooks.txt:220
12083
msgid ""
12084
"Invoked when a config option is read. The signature is (stack, name,\n"
12085
"value)."
12086
msgstr ""
12087
12088
#: en/help_topics/hooks.txt:223
12089
msgid ""
12090
"load\n"
12091
"~~~~"
12092
msgstr ""
12093
12094
#: en/help_topics/hooks.txt:228
12095
msgid "Invoked when a config store is loaded. The signature is (store)."
12096
msgstr ""
12097
12098
#: en/help_topics/hooks.txt:230
12099
msgid ""
12100
"remove\n"
12101
"~~~~~~"
12102
msgstr ""
12103
12104
#: en/help_topics/hooks.txt:235
12105
msgid ""
12106
"Invoked when a config option is removed. The signature is (stack,\n"
12107
"name)."
12108
msgstr ""
12109
12110
#: en/help_topics/hooks.txt:238
12111
msgid ""
12112
"save\n"
12113
"~~~~"
12114
msgstr ""
12115
12116
#: en/help_topics/hooks.txt:243
12117
msgid "Invoked when a config store is saved. The signature is (store)."
12118
msgstr ""
12119
12120
#: en/help_topics/hooks.txt:245
12121
msgid ""
12122
"set\n"
12123
"~~~"
12124
msgstr ""
12125
12126
#: en/help_topics/hooks.txt:250
12127
msgid ""
12128
"Invoked when a config option is set. The signature is (stack, name,\n"
12129
"value)."
12130
msgstr ""
12131
12132
#: en/help_topics/hooks.txt:253
12133
msgid ""
12134
"ControlDirHooks\n"
12135
"---------------"
12136
msgstr ""
12137
12138
#: en/help_topics/hooks.txt:256
12139
msgid ""
12140
"post_repo_init\n"
12141
"~~~~~~~~~~~~~~"
12142
msgstr ""
12143
12144
#: en/help_topics/hooks.txt:261
12145
msgid ""
12146
"Invoked after a repository has been initialized. post_repo_init is\n"
12147
"called with a bzrlib.controldir.RepoInitHookParams."
12148
msgstr ""
12149
12150
#: en/help_topics/hooks.txt:264
12151
msgid ""
12152
"pre_open\n"
12153
"~~~~~~~~"
12154
msgstr ""
12155
12156
#: en/help_topics/hooks.txt:267
12157
msgid "Introduced in: 1.14"
12158
msgstr ""
12159
12160
#: en/help_topics/hooks.txt:269
12161
msgid ""
12162
"Invoked before attempting to open a ControlDir with the transport that\n"
12163
"the open will use."
12164
msgstr ""
12165
12166
#: en/help_topics/hooks.txt:272
12167
msgid ""
12168
"InfoHooks\n"
12169
"---------"
12170
msgstr ""
12171
12172
#: en/help_topics/hooks.txt:275
12173
msgid ""
12174
"repository\n"
12175
"~~~~~~~~~~"
12176
msgstr ""
12177
12178
#: en/help_topics/hooks.txt:278 en/help_topics/hooks.txt:297
12179
#: en/help_topics/hooks.txt:505
12180
msgid "Introduced in: 1.15"
12181
msgstr ""
12182
12183
#: en/help_topics/hooks.txt:280
12184
msgid ""
12185
"Invoked when displaying the statistics for a repository. repository is\n"
12186
"called with a statistics dictionary as returned by the repository and\n"
12187
"a file-like object to write to."
12188
msgstr ""
12189
12190
#: en/help_topics/hooks.txt:284
12191
msgid ""
12192
"LockHooks\n"
12193
"---------"
12194
msgstr ""
12195
12196
#: en/help_topics/hooks.txt:287
12197
msgid ""
12198
"lock_acquired\n"
12199
"~~~~~~~~~~~~~"
12200
msgstr ""
12201
12202
#: en/help_topics/hooks.txt:292
12203
msgid ""
12204
"Called with a bzrlib.lock.LockResult when a physical lock is acquired."
12205
msgstr ""
12206
12207
#: en/help_topics/hooks.txt:294
12208
msgid ""
12209
"lock_broken\n"
12210
"~~~~~~~~~~~"
12211
msgstr ""
12212
12213
#: en/help_topics/hooks.txt:299
12214
msgid "Called with a bzrlib.lock.LockResult when a physical lock is broken."
12215
msgstr ""
12216
12217
#: en/help_topics/hooks.txt:301
12218
msgid ""
12219
"lock_released\n"
12220
"~~~~~~~~~~~~~"
12221
msgstr ""
12222
12223
#: en/help_topics/hooks.txt:306
12224
msgid ""
12225
"Called with a bzrlib.lock.LockResult when a physical lock is released."
12226
msgstr ""
12227
12228
#: en/help_topics/hooks.txt:308
12229
msgid ""
12230
"MergeHooks\n"
12231
"----------"
12232
msgstr ""
12233
12234
#: en/help_topics/hooks.txt:311
12235
msgid ""
12236
"merge_file_content\n"
12237
"~~~~~~~~~~~~~~~~~~"
12238
msgstr ""
12239
12240
#: en/help_topics/hooks.txt:314
12241
msgid "Introduced in: 2.1"
12242
msgstr ""
12243
12244
#: en/help_topics/hooks.txt:316
12245
msgid ""
12246
"Called with a bzrlib.merge.Merger object to create a per file merge\n"
12247
"object when starting a merge. Should return either None or a subclass\n"
12248
"of ``bzrlib.merge.AbstractPerFileMerger``. Such objects will then be\n"
12249
"called per file that needs to be merged (including when one side has\n"
12250
"deleted the file and the other has changed it). See the\n"
12251
"AbstractPerFileMerger API docs for details on how it is used by merge."
12252
msgstr ""
12253
12254
#: en/help_topics/hooks.txt:323
12255
msgid ""
12256
"post_merge\n"
12257
"~~~~~~~~~~"
12258
msgstr ""
12259
12260
#: en/help_topics/hooks.txt:326 en/help_topics/hooks.txt:334
12261
#: en/help_topics/hooks.txt:384 en/help_topics/hooks.txt:493
12262
msgid "Introduced in: 2.5"
12263
msgstr ""
12264
12265
#: en/help_topics/hooks.txt:328
12266
msgid ""
12267
"Called after a merge. Receives a Merger object as the single argument.\n"
12268
"The return value is ignored."
12269
msgstr ""
12270
12271
#: en/help_topics/hooks.txt:331
12272
msgid ""
12273
"pre_merge\n"
12274
"~~~~~~~~~"
12275
msgstr ""
12276
12277
#: en/help_topics/hooks.txt:336
12278
msgid ""
12279
"Called before a merge. Receives a Merger object as the single\n"
12280
"argument."
12281
msgstr ""
12282
12283
#: en/help_topics/hooks.txt:339
12284
msgid ""
12285
"MergeDirectiveHooks\n"
12286
"-------------------"
12287
msgstr ""
12288
12289
#: en/help_topics/hooks.txt:342
12290
msgid ""
12291
"merge_request_body\n"
12292
"~~~~~~~~~~~~~~~~~~"
12293
msgstr ""
12294
12295
#: en/help_topics/hooks.txt:345
12296
msgid "Introduced in: 1.15.0"
12297
msgstr ""
12298
12299
#: en/help_topics/hooks.txt:347
12300
msgid ""
12301
"Called with a MergeRequestBodyParams when a body is needed for a merge\n"
12302
"request. Callbacks must return a body. If more than one callback is\n"
12303
"registered, the output of one callback is provided to the next."
12304
msgstr ""
12305
12306
#: en/help_topics/hooks.txt:351
12307
msgid ""
12308
"MessageEditorHooks\n"
12309
"------------------"
12310
msgstr ""
12311
12312
#: en/help_topics/hooks.txt:354
12313
msgid ""
12314
"commit_message_template\n"
12315
"~~~~~~~~~~~~~~~~~~~~~~~"
12316
msgstr ""
12317
12318
#: en/help_topics/hooks.txt:357
12319
msgid "Introduced in: 1.10"
12320
msgstr ""
12321
12322
#: en/help_topics/hooks.txt:359
12323
msgid ""
12324
"Called when a commit message is being generated.\n"
12325
"commit_message_template is called with the bzrlib.commit.Commit object\n"
12326
"and the message that is known so far. commit_message_template must\n"
12327
"return a new message to use (which could be the same as it was given).\n"
12328
"When there are multiple hooks registered for commit_message_template,\n"
12329
"they are chained with the result from the first passed into the\n"
12330
"second, and so on."
12331
msgstr ""
12332
12333
#: en/help_topics/hooks.txt:367
12334
msgid ""
12335
"set_commit_message\n"
12336
"~~~~~~~~~~~~~~~~~~"
12337
msgstr ""
12338
12339
#: en/help_topics/hooks.txt:372
12340
msgid ""
12341
"Set a fixed commit message. set_commit_message is called with the\n"
12342
"bzrlib.commit.Commit object (so you can also change e.g. revision\n"
12343
"properties by editing commit.builder._revprops) and the message so\n"
12344
"far. set_commit_message must return the message to use or None if it\n"
12345
"should use the message editor as normal."
12346
msgstr ""
12347
12348
#: en/help_topics/hooks.txt:378
12349
msgid ""
12350
"MutableTreeHooks\n"
12351
"----------------"
12352
msgstr ""
12353
12354
#: en/help_topics/hooks.txt:381
12355
msgid ""
12356
"post_build_tree\n"
12357
"~~~~~~~~~~~~~~~"
12358
msgstr ""
12359
12360
#: en/help_topics/hooks.txt:386
12361
msgid ""
12362
"Called after a completely new tree is built. The hook is called with\n"
12363
"the tree as its only argument."
12364
msgstr ""
12365
12366
#: en/help_topics/hooks.txt:392
12367
msgid "Introduced in: 2.0"
12368
msgstr ""
12369
12370
#: en/help_topics/hooks.txt:394
12371
msgid ""
12372
"Called after a commit is performed on a tree. The hook is called with\n"
12373
"a bzrlib.mutabletree.PostCommitHookParams object. The mutable tree the\n"
12374
"commit was performed on is available via the mutable_tree attribute of\n"
12375
"that object."
12376
msgstr ""
12377
12378
#: en/help_topics/hooks.txt:399
12379
msgid ""
12380
"start_commit\n"
12381
"~~~~~~~~~~~~"
12382
msgstr ""
12383
12384
#: en/help_topics/hooks.txt:404
12385
msgid ""
12386
"Called before a commit is performed on a tree. The start commit hook\n"
12387
"is able to change the tree before the commit takes place. start_commit\n"
12388
"is called with the bzrlib.mutabletree.MutableTree that the commit is\n"
12389
"being performed on."
12390
msgstr ""
12391
12392
#: en/help_topics/hooks.txt:409
12393
msgid ""
12394
"SmartClientHooks\n"
12395
"----------------"
12396
msgstr ""
12397
12398
#: en/help_topics/hooks.txt:412
12399
msgid ""
12400
"call\n"
12401
"~~~~"
12402
msgstr ""
12403
12404
#: en/help_topics/hooks.txt:415
12405
msgid "Introduced in: unknown"
12406
msgstr ""
12407
12408
#: en/help_topics/hooks.txt:417
12409
msgid ""
12410
"Called when the smart client is submitting a request to the smart\n"
12411
"server. Called with a bzrlib.smart.client.CallHookParams object.\n"
12412
"Streaming request bodies, and responses, are not accessible."
12413
msgstr ""
12414
12415
#: en/help_topics/hooks.txt:421
12416
msgid ""
12417
"SmartServerHooks\n"
12418
"----------------"
12419
msgstr ""
12420
12421
#: en/help_topics/hooks.txt:424
12422
msgid ""
12423
"server_exception\n"
12424
"~~~~~~~~~~~~~~~~"
12425
msgstr ""
12426
12427
#: en/help_topics/hooks.txt:429
12428
msgid ""
12429
"Called by the bzr server when an exception occurs. server_exception is\n"
12430
"called with the sys.exc_info() tuple return true for the hook if the\n"
12431
"exception has been handled, in which case the server will exit\n"
12432
"normally."
12433
msgstr ""
12434
12435
#: en/help_topics/hooks.txt:434
12436
msgid ""
12437
"server_started\n"
12438
"~~~~~~~~~~~~~~"
12439
msgstr ""
12440
12441
#: en/help_topics/hooks.txt:437 en/help_topics/hooks.txt:456
12442
msgid "Introduced in: 0.16"
12443
msgstr ""
12444
12445
#: en/help_topics/hooks.txt:439
12446
msgid ""
12447
"Called by the bzr server when it starts serving a directory.\n"
12448
"server_started is called with (backing urls, public url), where\n"
12449
"backing_url is a list of URLs giving the server-specific directory\n"
12450
"locations, and public_url is the public URL for the directory being\n"
12451
"served."
12452
msgstr ""
12453
12454
#: en/help_topics/hooks.txt:445
12455
msgid ""
12456
"server_started_ex\n"
12457
"~~~~~~~~~~~~~~~~~"
12458
msgstr ""
12459
12460
#: en/help_topics/hooks.txt:450
12461
msgid ""
12462
"Called by the bzr server when it starts serving a directory.\n"
12463
"server_started is called with (backing_urls, server_obj)."
12464
msgstr ""
12465
12466
#: en/help_topics/hooks.txt:453
12467
msgid ""
12468
"server_stopped\n"
12469
"~~~~~~~~~~~~~~"
12470
msgstr ""
12471
12472
#: en/help_topics/hooks.txt:458
12473
msgid ""
12474
"Called by the bzr server when it stops serving a directory.\n"
12475
"server_stopped is called with the same parameters as the\n"
12476
"server_started hook: (backing_urls, public_url)."
12477
msgstr ""
12478
12479
#: en/help_topics/hooks.txt:462
12480
msgid ""
12481
"StatusHooks\n"
12482
"-----------"
12483
msgstr ""
12484
12485
#: en/help_topics/hooks.txt:465
12486
msgid ""
12487
"post_status\n"
12488
"~~~~~~~~~~~"
12489
msgstr ""
12490
12491
#: en/help_topics/hooks.txt:468 en/help_topics/hooks.txt:479
12492
msgid "Introduced in: 2.3"
12493
msgstr ""
12494
12495
#: en/help_topics/hooks.txt:470
12496
msgid ""
12497
"Called with argument StatusHookParams after Bazaar has displayed the\n"
12498
"status. StatusHookParams has the attributes (old_tree, new_tree,\n"
12499
"to_file, versioned, show_ids, short, verbose). The last four arguments\n"
12500
"correspond to the command line options specified by the user for the\n"
12501
"status command. to_file is the output stream for writing."
12502
msgstr ""
12503
12504
#: en/help_topics/hooks.txt:476
12505
msgid ""
12506
"pre_status\n"
12507
"~~~~~~~~~~"
12508
msgstr ""
12509
12510
#: en/help_topics/hooks.txt:481
12511
msgid ""
12512
"Called with argument StatusHookParams before Bazaar displays the\n"
12513
"status. StatusHookParams has the attributes (old_tree, new_tree,\n"
12514
"to_file, versioned, show_ids, short, verbose). The last four arguments\n"
12515
"correspond to the command line options specified by the user for the\n"
12516
"status command. to_file is the output stream for writing."
12517
msgstr ""
12518
12519
#: en/help_topics/hooks.txt:487
12520
msgid ""
12521
"TransportHooks\n"
12522
"--------------"
12523
msgstr ""
12524
12525
#: en/help_topics/hooks.txt:490
12526
msgid ""
12527
"post_connect\n"
12528
"~~~~~~~~~~~~"
12529
msgstr ""
12530
12531
#: en/help_topics/hooks.txt:495
12532
msgid ""
12533
"Called after a new connection is established or a reconnect occurs.\n"
12534
"The sole argument passed is either the connected transport or smart\n"
12535
"medium instance."
12536
msgstr ""
12537
12538
#: en/help_topics/hooks.txt:499
12539
msgid ""
12540
"RioVersionInfoBuilderHooks\n"
12541
"--------------------------"
12542
msgstr ""
12543
12544
#: en/help_topics/hooks.txt:502
12545
msgid ""
12546
"revision\n"
12547
"~~~~~~~~"
12548
msgstr ""
12549
12550
#: en/help_topics/hooks.txt:507
12551
msgid ""
12552
"Invoked when adding information about a revision to the RIO stanza\n"
12553
"that is printed. revision is called with a revision object and a RIO\n"
12554
"stanza.\n"
12555
msgstr ""
12556
12557
#: en/help_topics/location-alias.txt:1
12558
msgid ""
12559
"Location aliases\n"
12560
"================"
12561
msgstr ""
12562
12563
#: en/help_topics/location-alias.txt:4
12564
msgid ""
12565
"Bazaar defines several aliases for locations associated with a branch. "
12566
"These\n"
12567
"can be used with most commands that expect a location, such as `bzr push`."
12568
msgstr ""
12569
12570
#: en/help_topics/location-alias.txt:7
12571
msgid "The aliases are::"
12572
msgstr ""
12573
12574
#: en/help_topics/location-alias.txt:9
12575
msgid ""
12576
" :bound The branch this branch is bound to, for bound branches.\n"
12577
" :parent The parent of this branch.\n"
12578
" :public The public location of this branch.\n"
12579
" :push The saved location used for `bzr push` with no arguments.\n"
12580
" :submit The submit branch for this branch.\n"
12581
" :this This branch."
12582
msgstr ""
12583
12584
#: en/help_topics/location-alias.txt:16
12585
msgid "For example, to push to the parent location::"
12586
msgstr ""
12587
12588
#: en/help_topics/location-alias.txt:18
12589
msgid " bzr push :parent\n"
12590
msgstr ""
12591
12592
#: en/help_topics/log-formats.txt:1
12593
msgid ""
12594
"Log Formats\n"
12595
"==========="
12596
msgstr ""
12597
12598
#: en/help_topics/log-formats.txt:4
12599
msgid ""
12600
"A log format controls how information about each revision is displayed.\n"
12601
"The standard log formats are compared below::"
12602
msgstr ""
12603
12604
#: en/help_topics/log-formats.txt:7
12605
msgid ""
12606
" Feature long short line\n"
12607
" ---------------------- ------------- ------------ -------------------\n"
12608
" design goal detailed view concise view 1 revision per line\n"
12609
" committer name+email name only name only\n"
12610
" author name+email - -\n"
12611
" date-time format full date only date only\n"
12612
" commit message full full top line\n"
12613
" tags yes yes yes\n"
12614
" merges indicator - yes -\n"
12615
" status/delta optional optional -\n"
12616
" diff/patch optional optional -\n"
12617
" revision-id optional optional -\n"
12618
" branch nick yes - -\n"
12619
" foreign vcs properties yes yes -\n"
12620
" preferred levels all 1 1\n"
12621
" digital signature optional - -"
12622
msgstr ""
12623
12624
#: en/help_topics/log-formats.txt:24
12625
msgid ""
12626
"The default format is ``long``. To change this, define the ``log_format``\n"
12627
"setting in the ``[DEFAULT]`` section of ``bazaar.conf`` like this (say)::"
12628
msgstr ""
12629
12630
#: en/help_topics/log-formats.txt:27
12631
msgid ""
12632
" [DEFAULT]\n"
12633
" log_format = short"
12634
msgstr ""
12635
12636
#: en/help_topics/log-formats.txt:30
12637
msgid ""
12638
"Alternatively, to change the log format used for a given query, use the\n"
12639
"--long, --short or --line options."
12640
msgstr ""
12641
12642
#: en/help_topics/log-formats.txt:33
12643
msgid ""
12644
"If one of the standard log formats does not meet your needs, additional\n"
12645
"formats can be provided by plugins.\n"
12646
msgstr ""
12647
12648
#: en/help_topics/other-formats.txt:1
12649
msgid "Other Storage Formats"
12650
msgstr ""
12651
12652
#: en/help_topics/other-formats.txt:3
12653
msgid "Experimental formats are shown below."
12654
msgstr ""
12655
12656
#: en/help_topics/other-formats.txt:5
12657
msgid ""
12658
":development-colo:\n"
12659
" (native) The 2a format with experimental support for colocated\n"
12660
" branches."
12661
msgstr ""
12662
12663
#: en/help_topics/other-formats.txt:9
12664
msgid ""
12665
"\n"
12666
"Deprecated formats are shown below."
12667
msgstr ""
12668
12669
#: en/help_topics/other-formats.txt:12
12670
msgid ""
12671
":pack-0.92:\n"
12672
" (native) Pack-based format used in 1.x series. Introduced in 0.92.\n"
12673
" Interoperates with bzr repositories before 0.92 but cannot be read\n"
12674
" by bzr < 0.92."
12675
msgstr ""
12676
12677
#: en/help_topics/patterns.txt:1
12678
msgid ""
12679
"Patterns\n"
12680
"========"
12681
msgstr ""
12682
12683
#: en/help_topics/patterns.txt:4
12684
msgid ""
12685
"Bazaar uses patterns to match files at various times. For example,\n"
12686
"the ``add`` command skips over files that match ignore patterns\n"
12687
"and preferences can be associated with files using rule patterns.\n"
12688
"The pattern syntax is described below."
12689
msgstr ""
12690
12691
#: en/help_topics/patterns.txt:9
12692
msgid ""
12693
"Trailing slashes on patterns are ignored. If the pattern contains a\n"
12694
"slash or is a regular expression, it is compared to the whole path\n"
12695
"from the branch root. Otherwise, it is compared to only the last\n"
12696
"component of the path. To match a file only in the root directory,\n"
12697
"prepend ``./``. Patterns specifying absolute paths are not allowed."
12698
msgstr ""
12699
12700
#: en/help_topics/patterns.txt:15
12701
msgid "Patterns may include globbing wildcards such as::"
12702
msgstr ""
12703
12704
#: en/help_topics/patterns.txt:17
12705
msgid ""
12706
" ? - Matches any single character except '/'\n"
12707
" * - Matches 0 or more characters except '/'\n"
12708
" /**/ - Matches 0 or more directories in a path\n"
12709
" [a-z] - Matches a single character from within a group of characters"
12710
msgstr ""
12711
12712
#: en/help_topics/patterns.txt:22
12713
msgid ""
12714
"Patterns may also be `Python regular expressions`_. Regular expression\n"
12715
"patterns are identified by a ``RE:`` prefix followed by the regular\n"
12716
"expression. Regular expression patterns may not include named or\n"
12717
"numbered groups."
12718
msgstr ""
12719
12720
#: en/help_topics/patterns.txt:27
12721
msgid ""
12722
"Case insensitive ignore patterns can be specified with regular expressions\n"
12723
"by using the ``i`` (for ignore case) flag in the pattern."
12724
msgstr ""
12725
12726
#: en/help_topics/patterns.txt:30
12727
msgid ""
12728
"For example, a case insensitive match for ``foo`` may be specified as::"
12729
msgstr ""
12730
12731
#: en/help_topics/patterns.txt:32
12732
msgid " RE:(?i)foo"
12733
msgstr ""
12734
12735
#: en/help_topics/patterns.txt:34
12736
msgid ""
12737
"Ignore patterns may be prefixed with ``!``, which means that a filename\n"
12738
"matched by that pattern will not be ignored."
12739
msgstr ""
12740
12741
#: en/help_topics/patterns.txt:37
12742
msgid ""
12743
".. _Python regular expressions: http://docs.python.org/library/re.html"
12744
msgstr ""
12745
12746
#: en/help_topics/revisionspec.txt:1
12747
msgid "Revision Identifiers"
12748
msgstr ""
12749
12750
#: en/help_topics/revisionspec.txt:3
12751
msgid ""
12752
"A revision identifier refers to a specific state of a branch's history. It\n"
12753
"can be expressed in several ways. It can begin with a keyword to\n"
12754
"unambiguously specify a given lookup type; some examples are 'last:1',\n"
12755
"'before:yesterday' and 'submit:'."
12756
msgstr ""
12757
12758
#: en/help_topics/revisionspec.txt:8
12759
msgid ""
12760
"Alternately, it can be given without a keyword, in which case it will be\n"
12761
"checked as a revision number, a tag, a revision id, a date specification, or "
12762
"a\n"
12763
"branch specification, in that order. For example, 'date:today' could be\n"
12764
"written as simply 'today', though if you have a tag called 'today' that "
12765
"will\n"
12766
"be found first."
12767
msgstr ""
12768
12769
#: en/help_topics/revisionspec.txt:14
12770
msgid ""
12771
"If 'REV1' and 'REV2' are revision identifiers, then 'REV1..REV2' denotes a\n"
12772
"revision range. Examples: '3647..3649', 'date:yesterday..-1' and\n"
12773
"'branch:/path/to/branch1/..branch:/branch2' (note that there are no quotes "
12774
"or\n"
12775
"spaces around the '..')."
12776
msgstr ""
12777
12778
#: en/help_topics/revisionspec.txt:19
12779
msgid ""
12780
"Ranges are interpreted differently by different commands. To the \"log\" "
12781
"command,\n"
12782
"a range is a sequence of log messages, but to the \"diff\" command, the "
12783
"range\n"
12784
"denotes a change between revisions (and not a sequence of changes). In\n"
12785
"addition, \"log\" considers a closed range whereas \"diff\" and \"merge\" "
12786
"consider it\n"
12787
"to be open-ended, that is, they include one end but not the other. For "
12788
"example:\n"
12789
"\"bzr log -r 3647..3649\" shows the messages of revisions 3647, 3648 and "
12790
"3649,\n"
12791
"while \"bzr diff -r 3647..3649\" includes the changes done in revisions 3648 "
12792
"and\n"
12793
"3649, but not 3647."
12794
msgstr ""
12795
12796
#: en/help_topics/revisionspec.txt:28
12797
msgid "The keywords used as revision selection methods are the following:"
12798
msgstr ""
12799
12800
#: en/help_topics/revisionspec.txt:30
12801
msgid ""
12802
":revid:\n"
12803
"\tSelects a revision using the revision id.\n"
12804
":submit:\n"
12805
"\tSelects a common ancestor with the submit branch.\n"
12806
":ancestor:\n"
12807
"\tSelects a common ancestor with a second branch.\n"
12808
":date:\n"
12809
"\tSelects a revision on the basis of a datestamp.\n"
12810
":branch:\n"
12811
"\tSelects the last revision of a specified branch.\n"
12812
":tag:\n"
12813
"\tSelects a revision identified by a tag name.\n"
12814
":revno:\n"
12815
"\tSelects a revision using a number.\n"
12816
":before:\n"
12817
"\tSelects the parent of the revision specified.\n"
12818
":annotate:\n"
12819
"\tSelect the revision that last modified the specified line.\n"
12820
":mainline:\n"
12821
"\tSelect mainline revision that merged the specified revision.\n"
12822
":last:\n"
12823
"\tSelects the nth revision from the end."
12824
msgstr ""
12825
12826
#: en/help_topics/revisionspec.txt:53
12827
msgid "In addition, plugins can provide other keywords."
12828
msgstr ""
12829
12830
#: en/help_topics/revisionspec.txt:55
12831
msgid "A detailed description of each keyword is given below."
12832
msgstr ""
12833
12834
#: en/help_topics/revisionspec.txt:57
12835
msgid ":revid:"
12836
msgstr ""
12837
12838
#: en/help_topics/revisionspec.txt:59
12839
msgid ""
12840
" Supply a specific revision id, that can be used to specify any\n"
12841
" revision id in the ancestry of the branch.\n"
12842
" Including merges, and pending merges.\n"
12843
" Examples::"
12844
msgstr ""
12845
12846
#: en/help_topics/revisionspec.txt:64
12847
msgid ""
12848
" revid:aaaa@bbbb-123456789 -> Select revision 'aaaa@bbbb-123456789'"
12849
msgstr ""
12850
12851
#: en/help_topics/revisionspec.txt:66
12852
msgid ":submit:"
12853
msgstr ""
12854
12855
#: en/help_topics/revisionspec.txt:68
12856
msgid ""
12857
" Diffing against this shows all the changes that were made in this "
12858
"branch,\n"
12859
" and is a good predictor of what merge will do. The submit branch is\n"
12860
" used by the bundle and merge directive commands. If no submit branch\n"
12861
" is specified, the parent branch is used instead."
12862
msgstr ""
12863
12864
#: en/help_topics/revisionspec.txt:73 en/help_topics/revisionspec.txt:85
12865
msgid ""
12866
" The common ancestor is the last revision that existed in both\n"
12867
" branches. Usually this is the branch point, but it could also be\n"
12868
" a revision that was merged."
12869
msgstr ""
12870
12871
#: en/help_topics/revisionspec.txt:77 en/help_topics/revisionspec.txt:93
12872
#: en/help_topics/revisionspec.txt:109 en/help_topics/revisionspec.txt:119
12873
#: en/help_topics/revisionspec.txt:153
12874
msgid " Examples::"
12875
msgstr ""
12876
12877
#: en/help_topics/revisionspec.txt:79
12878
msgid " $ bzr diff -r submit:"
12879
msgstr ""
12880
12881
#: en/help_topics/revisionspec.txt:81
12882
msgid ":ancestor:"
12883
msgstr ""
12884
12885
#: en/help_topics/revisionspec.txt:83
12886
msgid " Supply the path to a branch to select the common ancestor."
12887
msgstr ""
12888
12889
#: en/help_topics/revisionspec.txt:89
12890
msgid ""
12891
" This is frequently used with 'diff' to return all of the changes\n"
12892
" that your branch introduces, while excluding the changes that you\n"
12893
" have not merged from the remote branch."
12894
msgstr ""
12895
12896
#: en/help_topics/revisionspec.txt:95
12897
msgid ""
12898
" ancestor:/path/to/branch\n"
12899
" $ bzr diff -r ancestor:../../mainline/branch"
12900
msgstr ""
12901
12902
#: en/help_topics/revisionspec.txt:98
12903
msgid ":date:"
12904
msgstr ""
12905
12906
#: en/help_topics/revisionspec.txt:100
12907
msgid ""
12908
" Supply a datestamp to select the first revision that matches the date.\n"
12909
" Date can be 'yesterday', 'today', 'tomorrow' or a YYYY-MM-DD string.\n"
12910
" Matches the first entry after a given date (either at midnight or\n"
12911
" at a specified time)."
12912
msgstr ""
12913
12914
#: en/help_topics/revisionspec.txt:105
12915
msgid " One way to display all the changes since yesterday would be::"
12916
msgstr ""
12917
12918
#: en/help_topics/revisionspec.txt:107
12919
msgid " bzr log -r date:yesterday.."
12920
msgstr ""
12921
12922
#: en/help_topics/revisionspec.txt:111
12923
msgid ""
12924
" date:yesterday -> select the first revision since "
12925
"yesterday\n"
12926
" date:2006-08-14,17:10:14 -> select the first revision after\n"
12927
" August 14th, 2006 at 5:10pm."
12928
msgstr ""
12929
12930
#: en/help_topics/revisionspec.txt:115
12931
msgid ":branch:"
12932
msgstr ""
12933
12934
#: en/help_topics/revisionspec.txt:117
12935
msgid " Supply the path to a branch to select its last revision."
12936
msgstr ""
12937
12938
#: en/help_topics/revisionspec.txt:121
12939
msgid " branch:/path/to/branch"
12940
msgstr ""
12941
12942
#: en/help_topics/revisionspec.txt:123
12943
msgid ":tag:"
12944
msgstr ""
12945
12946
#: en/help_topics/revisionspec.txt:125
12947
msgid " Tags are stored in the branch and created by the 'tag' command."
12948
msgstr ""
12949
12950
#: en/help_topics/revisionspec.txt:127
12951
msgid ":revno:"
12952
msgstr ""
12953
12954
#: en/help_topics/revisionspec.txt:129
12955
msgid ""
12956
" Use an integer to specify a revision in the history of the branch.\n"
12957
" Optionally a branch can be specified. A negative number will count\n"
12958
" from the end of the branch (-1 is the last revision, -2 the previous\n"
12959
" one). If the negative number is larger than the branch's history, the\n"
12960
" first revision is returned.\n"
12961
" Examples::"
12962
msgstr ""
12963
12964
#: en/help_topics/revisionspec.txt:136
12965
msgid ""
12966
" revno:1 -> return the first revision of this branch\n"
12967
" revno:3:/path/to/branch -> return the 3rd revision of\n"
12968
" the branch '/path/to/branch'\n"
12969
" revno:-1 -> The last revision in a branch.\n"
12970
" -2:http://other/branch -> The second to last revision in the\n"
12971
" remote branch.\n"
12972
" -1000000 -> Most likely the first revision, unless\n"
12973
" your history is very long."
12974
msgstr ""
12975
12976
#: en/help_topics/revisionspec.txt:145
12977
msgid ":before:"
12978
msgstr ""
12979
12980
#: en/help_topics/revisionspec.txt:147
12981
msgid ""
12982
" Supply any revision spec to return the parent of that revision. This "
12983
"is\n"
12984
" mostly useful when inspecting revisions that are not in the revision "
12985
"history\n"
12986
" of a branch."
12987
msgstr ""
12988
12989
#: en/help_topics/revisionspec.txt:151
12990
msgid ""
12991
" It is an error to request the parent of the null revision (before:0)."
12992
msgstr ""
12993
12994
#: en/help_topics/revisionspec.txt:155
12995
msgid ""
12996
" before:1913 -> Return the parent of revno 1913 (revno 1912)\n"
12997
" before:revid:aaaa@bbbb-1234567890 -> return the parent of revision\n"
12998
" aaaa@bbbb-1234567890\n"
12999
" bzr diff -r before:1913..1913\n"
13000
" -> Find the changes between revision 1913 and its parent "
13001
"(1912).\n"
13002
" (What changes did revision 1913 introduce).\n"
13003
" This is equivalent to: bzr diff -c 1913"
13004
msgstr ""
13005
13006
#: en/help_topics/revisionspec.txt:163
13007
msgid ":annotate:"
13008
msgstr ""
13009
13010
#: en/help_topics/revisionspec.txt:165
13011
msgid ""
13012
" Select the revision that last modified the specified line. Line is\n"
13013
" specified as path:number. Path is a relative path to the file. "
13014
"Numbers\n"
13015
" start at 1, and are relative to the current version, not the last-\n"
13016
" committed version of the file."
13017
msgstr ""
13018
13019
#: en/help_topics/revisionspec.txt:170
13020
msgid ":mainline:"
13021
msgstr ""
13022
13023
#: en/help_topics/revisionspec.txt:172
13024
msgid ""
13025
" Select the revision that merged the specified revision into mainline."
13026
msgstr ""
13027
13028
#: en/help_topics/revisionspec.txt:174
13029
msgid ":last:"
13030
msgstr ""
13031
13032
#: en/help_topics/revisionspec.txt:176
13033
msgid ""
13034
" Supply a positive number to get the nth revision from the end.\n"
13035
" This is the same as supplying negative numbers to the 'revno:' spec.\n"
13036
" Examples::"
13037
msgstr ""
13038
13039
#: en/help_topics/revisionspec.txt:180
13040
msgid ""
13041
" last:1 -> return the last revision\n"
13042
" last:3 -> return the revision 2 before the end.\n"
13043
msgstr ""
13044
13045
#: en/help_topics/rules.txt:1
13046
msgid ""
13047
"Rules\n"
13048
"====="
13049
msgstr ""
13050
13051
#: en/help_topics/rules.txt:7
13052
msgid ""
13053
"Rules are defined in ini file format where the sections are file glob\n"
13054
"patterns and the contents of each section are the preferences for files\n"
13055
"matching that pattern(s). For example::"
13056
msgstr ""
13057
13058
#: en/help_topics/rules.txt:11
13059
msgid ""
13060
" [name *.bat]\n"
13061
" eol = native"
13062
msgstr ""
13063
13064
#: en/help_topics/rules.txt:14
13065
msgid ""
13066
" [name *.html *.xml]\n"
13067
" keywords = xml_escape"
13068
msgstr ""
13069
13070
#: en/help_topics/rules.txt:17
13071
msgid ""
13072
"Preferences like these are useful for commands and plugins wishing to\n"
13073
"provide custom behaviour for selected files. For more information on \n"
13074
"end of line conversion see :doc:`eol-help`.\n"
13075
"Keyword support is provided by the `keywords plugin\n"
13076
"<http://doc.bazaar.canonical.com/plugins/en/keywords-plugin.html>`_."
13077
msgstr ""
13078
13079
#: en/help_topics/rules.txt:23
13080
msgid ""
13081
"Files\n"
13082
"-----"
13083
msgstr ""
13084
13085
#: en/help_topics/rules.txt:26
13086
msgid ""
13087
"Default rules for all branches are defined in the optional file\n"
13088
"``BZR_HOME/rules``. "
13089
msgstr ""
13090
13091
#: en/help_topics/rules.txt:29
13092
msgid ""
13093
"Rule Patterns\n"
13094
"-------------"
13095
msgstr ""
13096
13097
#: en/help_topics/rules.txt:32
13098
msgid ""
13099
"Patterns are ordered and searching stops as soon as one matches.\n"
13100
"As a consequence, more explicit patterns should be placed towards\n"
13101
"the top of the file. Rule patterns use exactly the same conventions\n"
13102
"as ignore patterns. See :doc:`patterns-help` for details."
13103
msgstr ""
13104
13105
#: en/help_topics/rules.txt:37
13106
msgid ".. note::"
13107
msgstr ""
13108
13109
#: en/help_topics/rules.txt:39
13110
msgid ""
13111
" Patterns containing square brackets or spaces should be\n"
13112
" surrounded in quotes to ensure they are correctly parsed.\n"
13113
msgstr ""
13114
13115
#: en/help_topics/topics.txt:1
13116
msgid ""
13117
"authentication Information on configuring authentication\n"
13118
"basic Basic commands\n"
13119
"branches Information on what a branch is\n"
13120
"bugs Bug tracker settings\n"
13121
"checkouts Information on what a checkout is\n"
13122
"commands Basic help for all commands\n"
13123
"configuration Details on the configuration settings available\n"
13124
"conflict-types Types of conflicts and what to do about them\n"
13125
"content-filters Conversion of content into/from working trees\n"
13126
"criss-cross Information on criss-cross merging\n"
13127
"current-formats Current storage formats\n"
13128
"debug-flags Options to show or record debug information\n"
13129
"diverged-branches How to fix diverged branches\n"
13130
"env-variables Environment variable names and values\n"
13131
"eol Information on end-of-line handling\n"
13132
"files Information on configuration and log files\n"
13133
"formats Information on choosing a storage format\n"
13134
"global-options Options that control how Bazaar runs\n"
13135
"hidden-commands All hidden commands\n"
13136
"hooks Points at which custom processing can be added\n"
13137
"launchpad Using Bazaar with Launchpad.net\n"
13138
"location-alias Aliases for remembered locations\n"
13139
"log-formats Details on the logging formats available\n"
13140
"other-formats Experimental and deprecated storage formats\n"
13141
"patterns Information on the pattern syntax\n"
13142
"repositories Basic information on shared repositories.\n"
13143
"revisionspec Explain how to use --revision\n"
13144
"rules Information on defining rule-based preferences\n"
13145
"standalone-trees Information on what a standalone tree is\n"
13146
"standard-options Options that can be used with any command\n"
13147
"status-flags Help on status flags\n"
13148
"sync-for-reconfigure Steps to resolve \"out-of-sync\" when reconfiguring\n"
13149
"topics Topics list\n"
13150
"url-special-chars Special character handling in URLs\n"
13151
"urlspec Supported transport protocols\n"
13152
"working-trees Information on working trees\n"
13153
msgstr ""
13154
13155
#: en/help_topics/url-special-chars.txt:1
13156
msgid ""
13157
"Special character handling in URLs\n"
13158
"=================================="
13159
msgstr ""
13160
13161
#: en/help_topics/url-special-chars.txt:4
13162
msgid "Bazaar allows locations to be specified in multiple ways, either:"
13163
msgstr ""
13164
13165
#: en/help_topics/url-special-chars.txt:6
13166
msgid " * Fully qualified URLs"
13167
msgstr ""
13168
13169
#: en/help_topics/url-special-chars.txt:8
13170
msgid " * File system paths, relative or absolute"
13171
msgstr ""
13172
13173
#: en/help_topics/url-special-chars.txt:10
13174
msgid ""
13175
"Internally bzr treats all locations as URLs. For any file system paths\n"
13176
"that are specified it will automatically determine the appropriate URL\n"
13177
"representation, and escape special characters where necessary."
13178
msgstr ""
13179
13180
#: en/help_topics/url-special-chars.txt:14
13181
msgid ""
13182
"There are a few characters which have special meaning in URLs and need "
13183
"careful\n"
13184
"handling to avoid ambiguities. Characters can be escaped with a % and a hex\n"
13185
"value in URLs. Any non-ASCII characters in a file path will automatically "
13186
"be\n"
13187
"urlencoded when the path is converted to a URL."
13188
msgstr ""
13189
13190
#: en/help_topics/url-special-chars.txt:19
13191
msgid ""
13192
"URLs represent non-ASCII characters in an encoding defined by the server, "
13193
"but\n"
13194
"usually UTF-8. The % escapes should be of the UTF-8 bytes. Bazaar tries to "
13195
"be\n"
13196
"generous in what it accepts as a URL and to print them in a way that\n"
13197
"will be readable."
13198
msgstr ""
13199
13200
#: en/help_topics/url-special-chars.txt:24
13201
msgid ""
13202
"For example, if you have a directory named '/tmp/%2False' these are all "
13203
"valid\n"
13204
"ways of accessing the content (0x2F, or 47, is the ASCII code for forward "
13205
"slash)::"
13206
msgstr ""
13207
13208
#: en/help_topics/url-special-chars.txt:27
13209
msgid ""
13210
" cd /tmp\n"
13211
" bzr log /tmp/%2False\n"
13212
" bzr log %2False\n"
13213
" bzr log file:///tmp/%252False\n"
13214
" bzr log file://localhost/tmp/%252False\n"
13215
" bzr log file:%252False"
13216
msgstr ""
13217
13218
#: en/help_topics/url-special-chars.txt:34
13219
msgid "These are valid but do not refer to the same file::"
13220
msgstr ""
13221
13222
#: en/help_topics/url-special-chars.txt:36
13223
msgid ""
13224
" bzr log file:///tmp/%2False (refers to a file called /tmp/\\/alse)\n"
13225
" bzr log %252False (refers to a file called /tmp/%252False)"
13226
msgstr ""
13227
13228
#: en/help_topics/url-special-chars.txt:39
13229
msgid ""
13230
"Comma also has special meaning in URLs, because it denotes `segment "
13231
"parameters`_"
13232
msgstr ""
13233
13234
#: en/help_topics/url-special-chars.txt:41
13235
msgid ""
13236
"_`segment parameters`: http://www.ietf.org/rfc/rfc3986.txt (section 3.3)"
13237
msgstr ""
13238
13239
#: en/help_topics/url-special-chars.txt:43
13240
msgid ""
13241
"Comma is also special in any file system paths that are specified. To use a "
13242
"literal\n"
13243
"comma in a file system path, specify a URL and URL encode the comma::"
13244
msgstr ""
13245
13246
#: en/help_topics/url-special-chars.txt:46
13247
msgid ""
13248
" bzr log foo,branch=bla # path \"foo\" with the segment parameter "
13249
"\"branch\" set to \"bla\"\n"
13250
" bzr log file:foo%2Cbranch=bla # path \"foo,branch=bla\"\n"
13251
" bzr log file:foo,branch=bla # path \"foo\" with segment parameter "
13252
"\"branch\" set to \"bla\"\n"
13253
msgstr ""
13254
13255
#: en/help_topics/urlspec.txt:1
13256
msgid "URL Identifiers"
13257
msgstr ""
13258
13259
#: en/help_topics/urlspec.txt:3
13260
msgid "Supported URL prefixes::"
13261
msgstr ""
13262
13263
#: en/help_topics/urlspec.txt:5
13264
msgid ""
13265
" aftp:// Access using active FTP.\n"
13266
" bzr:// Fast access using the Bazaar smart server.\n"
13267
" bzr+ssh:// Fast access using the Bazaar smart server over SSH.\n"
13268
" file:// Access using the standard filesystem (default)\n"
13269
" ftp:// Access using passive FTP.\n"
13270
" http:// Read-only access of branches exported on the web.\n"
13271
" https:// Read-only access of branches exported on the web using "
13272
"SSL.\n"
13273
" sftp:// Access using SFTP (most SSH servers provide SFTP)."
13274
msgstr ""
13275
13276
#: en/help_topics/urlspec.txt:14
13277
msgid "Supported modifiers::"
13278
msgstr ""
13279
13280
#: en/help_topics/urlspec.txt:16
13281
msgid " gio+ Access using any GIO supported protocols."
13282
msgstr ""
13283
13284
#: en/help_topics/urlspec.txt:18
13285
msgid "Bazaar supports all of the standard parts within the URL::"
13286
msgstr ""
13287
13288
#: en/help_topics/urlspec.txt:20
13289
msgid " <protocol>://[user[:password]@]host[:port]/[path]"
13290
msgstr ""
13291
13292
#: en/help_topics/urlspec.txt:22
13293
msgid "allowing URLs such as::"
13294
msgstr ""
13295
13296
#: en/help_topics/urlspec.txt:24
13297
msgid " http://bzruser:BadPass@bzr.example.com:8080/bzr/trunk"
13298
msgstr ""
13299
13300
#: en/help_topics/urlspec.txt:26
13301
msgid ""
13302
"For bzr+ssh:// and sftp:// URLs, Bazaar also supports paths that begin\n"
13303
"with '~' as meaning that the rest of the path should be interpreted\n"
13304
"relative to the remote user's home directory. For example if the user\n"
13305
"``remote`` has a home directory of ``/home/remote`` on the server\n"
13306
"shell.example.com, then::"
13307
msgstr ""
13308
13309
#: en/help_topics/urlspec.txt:32
13310
msgid " bzr+ssh://remote@shell.example.com/~/myproject/trunk"
13311
msgstr ""
13312
13313
#: en/help_topics/urlspec.txt:34
13314
msgid "would refer to ``/home/remote/myproject/trunk``."
13315
msgstr ""
13316
13317
#: en/help_topics/urlspec.txt:36
13318
msgid ""
13319
"Many commands that accept URLs also accept location aliases too.\n"
13320
"See :doc:`location-alias-help` and :doc:`url-special-chars-help`.\n"
13321
msgstr ""
Loggerhead is a web-based interface for Breezy
Version: 2.0.1