« back to all changes in this revision
Viewing changes to po/en_AU.po
- browse files at revision 6093.4.72
- compare with another revision
- compare with revision 6093.4.72
- download diff
- download tarball
- view history from revision 6093.4.72
- Committer: Jelmer Vernooij
- Date: 2012-02-20 12:19:29 UTC
- mfrom: (6437.23.11 2.5)
- mto: (6581.1.1 trunk)
- mto: This revision was merged to the branch mainline in revision 6582.
- Revision ID: jelmer@samba.org-20120220121929-7ni2psvjoatm1yp4
Merge bzr/2.5.
- files added:
- bzrlib/estimate_compressed_size.py
- bzrlib/plugins/po_merge
- bzrlib/plugins/po_merge/tests
- files removed:
- bzrlib/help_topics/en/location-alias.txt
- bzrlib/util/effbot
- bzrlib/util/effbot/org
- bzrlib/util/elementtree
- files renamed:
- tools/build_mo.py => bzrlib/bzr_distutils.py
- bzrlib/tests/per_repository/test_merge_directive.py => bzrlib/tests/per_repository_vf/test_merge_directive.py
- files modified:
- Makefile
added
removed
po/en_AU.po
1
# English (Australia) translation for bzr
2
# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
3
# This file is distributed under the same license as the bzr package.
4
# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
5
#
6
msgid ""
7
msgstr ""
8
"Project-Id-Version: bzr\n"
9
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
10
"POT-Creation-Date: 2012-02-02 17:39+0100\n"
11
"PO-Revision-Date: 2011-09-17 01:19+0000\n"
12
"Last-Translator: Joel Pickett <jlkpcktt@gmail.com>\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-02-04 04:50+0000\n"
19
"X-Generator: Launchpad (build 14738)\n"
20
21
#: bzrlib/add.py:95
22
msgid "skipping {0} (larger than {1} of {2} bytes)"
23
msgstr "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:3205
30
#, python-format
31
msgid "Pushed up to revision %d."
32
msgstr "Pushed up to revision %d."
33
34
#: bzrlib/branch.py:3207
35
#, python-format
36
msgid "%d tag updated."
37
msgid_plural "%d tags updated."
38
msgstr[0] ""
39
msgstr[1] ""
40
41
#: bzrlib/branch.py:3210
42
msgid "No new revisions or tags to push."
43
msgstr "No new revisions or tags to push."
44
45
#: bzrlib/branch.py:3212
46
msgid "No new revisions to push."
47
msgstr "No new revisions to push."
48
49
#: bzrlib/branch.py:3232
50
msgid "checked branch {0} format {1}"
51
msgstr ""
52
53
#: bzrlib/branch.py:3235
54
#, python-format
55
msgid "found error:%s"
56
msgstr "found error:%s"
57
58
#: bzrlib/builtins.py:209 bzrlib/builtins.py:3016 bzrlib/workingtree.py:315
59
#, python-format
60
msgid "Ignoring files outside view. View is %s"
61
msgstr "Ignoring files outside view. View is %s"
62
63
#: bzrlib/builtins.py:218
64
#, python-format
65
msgid "bzr %s --revision takes exactly one revision identifier"
66
msgstr "bzr %s --revision takes exactly one revision identifier"
67
68
#: bzrlib/builtins.py:303
69
msgid "Display status summary."
70
msgstr "Display status summary."
71
72
#: bzrlib/builtins.py:305
73
msgid ""
74
"This reports on versioned and unknown files, reporting them\n"
75
"grouped by state. Possible states are:"
76
msgstr ""
77
"This reports on versioned and unknown files, reporting them\n"
78
"grouped by state. Possible states are:"
79
80
#: bzrlib/builtins.py:308
81
msgid ""
82
"added\n"
83
" Versioned in the working copy but not in the previous revision."
84
msgstr ""
85
"added\n"
86
" Versioned in the working copy but not in the previous revision."
87
88
#: bzrlib/builtins.py:311
89
msgid ""
90
"removed\n"
91
" Versioned in the previous revision but removed or deleted\n"
92
" in the working copy."
93
msgstr ""
94
"removed\n"
95
" Versioned in the previous revision but removed or deleted\n"
96
" in the working copy."
97
98
#: bzrlib/builtins.py:315
99
msgid ""
100
"renamed\n"
101
" Path of this file changed from the previous revision;\n"
102
" the text may also have changed. This includes files whose\n"
103
" parent directory was renamed."
104
msgstr ""
105
"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:320
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:323
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:326
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:329
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:334
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:337
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:341
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:346
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:351
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:354
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:363
207
msgid "Use short status indicators."
208
msgstr "Use short status indicators."
209
210
#: bzrlib/builtins.py:365
211
msgid "Only show versioned files."
212
msgstr "Only show versioned files."
213
214
#: bzrlib/builtins.py:367
215
msgid "Don't show pending merges."
216
msgstr "Don't show pending merges."
217
218
#: bzrlib/builtins.py:370
219
msgid "Do not mark object type using indicator."
220
msgstr "Do not mark object type using indicator."
221
222
#: bzrlib/builtins.py:385
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:429 bzrlib/builtins.py:5183
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:432 bzrlib/builtins.py:5185
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:439
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:450
240
msgid "The repository {0} contains no revision {1}."
241
msgstr "The repository {0} contains no revision {1}."
242
243
#: bzrlib/builtins.py:457
244
msgid "You cannot specify a NULL revision."
245
msgstr "You cannot specify a NULL revision."
246
247
#: bzrlib/builtins.py:549
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:551
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:554
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:560
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:574
270
msgid "No working tree to remove"
271
msgstr "No working tree to remove"
272
273
#: bzrlib/builtins.py:576
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:585
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:625
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:636
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:640
298
msgid "failed to reset the tree state{0}"
299
msgstr "failed to reset the tree state{0}"
300
301
#: bzrlib/builtins.py:644
302
msgid "Show current revision number."
303
msgstr "Show current revision number."
304
305
#: bzrlib/builtins.py:646
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:659
310
msgid "--tree and --revision can not be used together"
311
msgstr ""
312
313
#: bzrlib/builtins.py:676 bzrlib/builtins.py:5967
314
msgid "Tags can only be placed on a single revision, not on a range"
315
msgstr ""
316
317
#: bzrlib/builtins.py:700
318
msgid "Show revno of working tree."
319
msgstr ""
320
321
#: bzrlib/builtins.py:748
322
msgid "Add specified files or directories."
323
msgstr "Add specified files or directories."
324
325
#: bzrlib/builtins.py:750
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:754
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:762
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:765
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:768
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:773
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:776
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:784
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:787
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:794
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:800
428
msgid "Lookup file ids from this tree."
429
msgstr "Lookup file ids from this tree."
430
431
#: bzrlib/builtins.py:836
432
msgid "ignored {0} matching \"{1}\"\n"
433
msgstr "ignored {0} matching \"{1}\"\n"
434
435
#: bzrlib/builtins.py:841
436
msgid "Create a new versioned directory."
437
msgstr "Create a new versioned directory."
438
439
#: bzrlib/builtins.py:843
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:850
444
msgid "No error if existing, make parent directories as needed."
445
msgstr "No error if existing, make parent directories as needed."
446
447
#: bzrlib/builtins.py:884
448
#, python-format
449
msgid "added %s\n"
450
msgstr "added %s\n"
451
452
#: bzrlib/builtins.py:926
453
#, python-format
454
msgid "invalid kind %r specified"
455
msgstr "invalid kind %r specified"
456
457
#: bzrlib/builtins.py:963
458
msgid "Move or rename a file."
459
msgstr "Move or rename a file."
460
461
#: bzrlib/builtins.py:965
462
msgid " bzr mv SOURCE... DESTINATION"
463
msgstr " bzr mv SOURCE... DESTINATION"
464
465
#: bzrlib/builtins.py:967
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:971
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:977
490
msgid "Files cannot be moved between branches."
491
msgstr "Files cannot be moved between branches."
492
493
#: bzrlib/builtins.py:984
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:986
502
msgid "Automatically guess renames."
503
msgstr "Automatically guess renames."
504
505
#: bzrlib/builtins.py:987
506
msgid "Avoid making changes when guessing renames."
507
msgstr "Avoid making changes when guessing renames."
508
509
#: bzrlib/builtins.py:996
510
msgid "--dry-run requires --auto."
511
msgstr "--dry-run requires --auto."
512
513
#: bzrlib/builtins.py:1000
514
msgid "missing file argument"
515
msgstr "missing file argument"
516
517
#: bzrlib/builtins.py:1004
518
msgid "can not move root of branch"
519
msgstr ""
520
521
#: bzrlib/builtins.py:1010
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:1013
526
msgid "--after cannot be specified with --auto."
527
msgstr "--after cannot be specified with --auto."
528
529
#: bzrlib/builtins.py:1050
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:1102
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:1104
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:1109
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:1113
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:1117
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:1122
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:1126
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:1134
599
msgid "Show logs of pulled revisions."
600
msgstr "Show logs of pulled revisions."
601
602
#: bzrlib/builtins.py:1136
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:1139
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:1168
617
msgid "Need working tree for --show-base."
618
msgstr "Need working tree for --show-base."
619
620
#: bzrlib/builtins.py:1184
621
msgid "No pull location known or specified."
622
msgstr "No pull location known or specified."
623
624
#: bzrlib/builtins.py:1190
625
#, python-format
626
msgid "Using saved parent location: %s\n"
627
msgstr "Using saved parent location: %s\n"
628
629
#: bzrlib/builtins.py:1197 bzrlib/builtins.py:4393
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:1238
634
msgid "Update a mirror of this branch."
635
msgstr "Update a mirror of this branch."
636
637
#: bzrlib/builtins.py:1240
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:1243
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:1246
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:1250
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:1253
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:1257
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:1262
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:1273 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:1276
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:1281
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:1284
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:1289 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:1292
736
msgid "Don't populate the working tree, even for protocols that support it."
737
msgstr ""
738
739
#: bzrlib/builtins.py:1336
740
msgid "Could not determine branch to refer to."
741
msgstr ""
742
743
#: bzrlib/builtins.py:1345
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
"No push location known or specified. To push to the parent branch (at %s), "
750
"use 'bzr push :parent'."
751
752
#: bzrlib/builtins.py:1351 bzrlib/foreign.py:306
753
msgid "No push location known or specified."
754
msgstr ""
755
756
#: bzrlib/builtins.py:1355
757
#, python-format
758
msgid "Using saved push location: %s"
759
msgstr ""
760
761
#: bzrlib/builtins.py:1365
762
msgid "Create a new branch that is a copy of an existing branch."
763
msgstr ""
764
765
#: bzrlib/builtins.py:1367
766
msgid ""
767
"If the TO_LOCATION is omitted, the last component of the FROM_LOCATION will\n"
768
"be used. In other words, \"branch ../foo/bar\" will attempt to create "
769
"./bar.\n"
770
"If the FROM_LOCATION has no / or path separator embedded, the TO_LOCATION\n"
771
"is derived from the FROM_LOCATION by stripping a leading scheme or drive\n"
772
"identifier, if any. For example, \"branch lp:foo-bar\" will attempt to\n"
773
"create ./foo-bar."
774
msgstr ""
775
776
#: bzrlib/builtins.py:1374
777
msgid ""
778
"To retrieve the branch as of a particular revision, supply the --revision\n"
779
"parameter, as in \"branch foo/bar -r 5\"."
780
msgstr ""
781
782
#: bzrlib/builtins.py:1377
783
msgid "The synonyms 'clone' and 'get' for this command are deprecated."
784
msgstr ""
785
786
#: bzrlib/builtins.py:1387
787
msgid "Create a branch without a working-tree."
788
msgstr ""
789
790
#: bzrlib/builtins.py:1389
791
msgid "Switch the checkout in the current directory to the new branch."
792
msgstr ""
793
794
#: bzrlib/builtins.py:1392
795
msgid ""
796
"Create a stacked branch referring to the source branch. The new branch will "
797
"depend on the availability of the source branch for all operations."
798
msgstr ""
799
800
#: bzrlib/builtins.py:1396
801
msgid "Do not use a shared repository, even if available."
802
msgstr ""
803
804
#: bzrlib/builtins.py:1398
805
msgid ""
806
"By default branch will fail if the target directory exists, but does not "
807
"already have a control directory. This flag will allow branch to proceed."
808
msgstr ""
809
810
#: bzrlib/builtins.py:1403
811
msgid "Bind new branch to from location."
812
msgstr ""
813
814
#: bzrlib/builtins.py:1450
815
#, python-format
816
msgid "Target directory \"%s\" already exists."
817
msgstr ""
818
819
#: bzrlib/builtins.py:1462
820
#, python-format
821
msgid "Parent of \"%s\" does not exist."
822
msgstr ""
823
824
#: bzrlib/builtins.py:1481
825
msgid "The branch {0} has no revision {1}."
826
msgstr ""
827
828
#: bzrlib/builtins.py:1496 bzrlib/push.py:53
829
#, python-format
830
msgid "Created new stacked branch referring to %s."
831
msgstr ""
832
833
#: bzrlib/builtins.py:1500
834
#, python-format
835
msgid "Branched %d revision."
836
msgid_plural "Branched %d revisions."
837
msgstr[0] ""
838
msgstr[1] ""
839
840
#: bzrlib/builtins.py:1505
841
#, python-format
842
msgid "New branch bound to %s"
843
msgstr ""
844
845
#: bzrlib/builtins.py:1510 bzrlib/builtins.py:6256
846
#, python-format
847
msgid "Switched to branch: %s"
848
msgstr ""
849
850
#: bzrlib/builtins.py:1515
851
msgid "List the branches available at the current location."
852
msgstr ""
853
854
#: bzrlib/builtins.py:1517
855
msgid ""
856
"This command will print the names of all the branches at the current\n"
857
"location."
858
msgstr ""
859
860
#: bzrlib/builtins.py:1524
861
msgid ""
862
"Recursively scan for branches rather than just looking in the specified "
863
"location."
864
msgstr ""
865
866
#: bzrlib/builtins.py:1554
867
msgid "(default)"
868
msgstr "(default)"
869
870
#: bzrlib/builtins.py:1566
871
msgid "Create a new checkout of an existing branch."
872
msgstr ""
873
874
#: bzrlib/builtins.py:1568
875
msgid ""
876
"If BRANCH_LOCATION is omitted, checkout will reconstitute a working tree "
877
"for\n"
878
"the branch found in '.'. This is useful if you have removed the working "
879
"tree\n"
880
"or if it was never created - i.e. if you pushed the branch to its current\n"
881
"location using SFTP."
882
msgstr ""
883
884
#: bzrlib/builtins.py:1573
885
msgid ""
886
"If the TO_LOCATION is omitted, the last component of the BRANCH_LOCATION "
887
"will\n"
888
"be used. In other words, \"checkout ../foo/bar\" will attempt to create "
889
"./bar.\n"
890
"If the BRANCH_LOCATION has no / or path separator embedded, the TO_LOCATION\n"
891
"is derived from the BRANCH_LOCATION by stripping a leading scheme or drive\n"
892
"identifier, if any. For example, \"checkout lp:foo-bar\" will attempt to\n"
893
"create ./foo-bar."
894
msgstr ""
895
896
#: bzrlib/builtins.py:1580
897
msgid ""
898
"To retrieve the branch as of a particular revision, supply the --revision\n"
899
"parameter, as in \"checkout foo/bar -r 5\". Note that this will be "
900
"immediately\n"
901
"out of date [so you cannot commit] but it may be useful (i.e. to examine "
902
"old\n"
903
"code.)"
904
msgstr ""
905
906
#: bzrlib/builtins.py:1590
907
msgid ""
908
"Perform a lightweight checkout. Lightweight checkouts depend on access to "
909
"the branch for every operation. Normal checkouts can perform common "
910
"operations like diff and status without such access, and also support local "
911
"commits."
912
msgstr ""
913
914
#: bzrlib/builtins.py:1597
915
msgid "Get file contents from this tree."
916
msgstr ""
917
918
#: bzrlib/builtins.py:1599
919
msgid "Hard-link working tree files where possible."
920
msgstr ""
921
922
#: bzrlib/builtins.py:1640
923
msgid ""
924
"Show list of renamed files.\n"
925
" "
926
msgstr ""
927
928
#: bzrlib/builtins.py:1670
929
msgid "Update a working tree to a new revision."
930
msgstr ""
931
932
#: bzrlib/builtins.py:1672
933
msgid ""
934
"This will perform a merge of the destination revision (the tip of the\n"
935
"branch, or the specified revision) into the working tree, and then make\n"
936
"that revision the basis revision for the working tree. "
937
msgstr ""
938
939
#: bzrlib/builtins.py:1676
940
msgid ""
941
"You can use this to visit an older revision, or to update a working tree\n"
942
"that is out of date from its branch."
943
msgstr ""
944
945
#: bzrlib/builtins.py:1679
946
msgid ""
947
"If there are any uncommitted changes in the tree, they will be carried\n"
948
"across and remain as uncommitted changes after the update. To discard\n"
949
"these changes, use 'bzr revert'. The uncommitted changes may conflict\n"
950
"with the changes brought in by the change in basis revision."
951
msgstr ""
952
953
#: bzrlib/builtins.py:1684
954
msgid ""
955
"If the tree's branch is bound to a master branch, bzr will also update\n"
956
"the branch from the master."
957
msgstr ""
958
959
#: bzrlib/builtins.py:1687
960
msgid ""
961
"You cannot update just a single file or directory, because each Bazaar\n"
962
"working tree has just a single basis revision. If you want to restore a\n"
963
"file that has been removed locally, use 'bzr revert' instead of 'bzr\n"
964
"update'. If you want to restore a file to its state in a previous\n"
965
"revision, use 'bzr revert' with a '-r' option, or use 'bzr cat' to write\n"
966
"out the old content of that file to a new location."
967
msgstr ""
968
969
#: bzrlib/builtins.py:1694
970
msgid ""
971
"The 'dir' argument, if given, must be the location of the root of a\n"
972
"working tree to update. By default, the working tree that contains the \n"
973
"current working directory is used."
974
msgstr ""
975
976
#: bzrlib/builtins.py:1710
977
msgid "bzr update --revision takes exactly one revision"
978
msgstr ""
979
980
#: bzrlib/builtins.py:1718
981
msgid "bzr update can only update a whole tree, not a file or subdirectory"
982
msgstr ""
983
984
#: bzrlib/builtins.py:1749
985
msgid "Tree is up to date at revision {0} of branch {1}"
986
msgstr ""
987
988
#: bzrlib/builtins.py:1765
989
#, python-format
990
msgid ""
991
"branch has no revision %s\n"
992
"bzr update --revision only works for a revision in the branch history"
993
msgstr ""
994
995
#: bzrlib/builtins.py:1771
996
msgid "Updated to revision {0} of branch {1}"
997
msgstr ""
998
999
#: bzrlib/builtins.py:1775
1000
msgid ""
1001
"Your local commits will now show as pending merges with 'bzr status', and "
1002
"can be committed with 'bzr commit'."
1003
msgstr ""
1004
1005
#: bzrlib/builtins.py:1784
1006
msgid "Show information about a working tree, branch or repository."
1007
msgstr ""
1008
1009
#: bzrlib/builtins.py:1786
1010
msgid ""
1011
"This command will show all known locations and formats associated to the\n"
1012
"tree, branch or repository."
1013
msgstr ""
1014
1015
#: bzrlib/builtins.py:1789
1016
msgid ""
1017
"In verbose mode, statistical information is included with each report.\n"
1018
"To see extended statistic information, use a verbosity level of 2 or\n"
1019
"higher by specifying the verbose option multiple times, e.g. -vv."
1020
msgstr ""
1021
1022
#: bzrlib/builtins.py:1793
1023
msgid "Branches and working trees will also report any missing revisions."
1024
msgstr ""
1025
1026
#: bzrlib/builtins.py:1795 bzrlib/builtins.py:3715 bzrlib/builtins.py:4845
1027
#: bzrlib/builtins.py:6442
1028
msgid ":Examples:"
1029
msgstr ""
1030
1031
#: bzrlib/builtins.py:1797
1032
msgid " Display information on the format and related locations:"
1033
msgstr ""
1034
1035
#: bzrlib/builtins.py:1799
1036
msgid " bzr info"
1037
msgstr ""
1038
1039
#: bzrlib/builtins.py:1801
1040
msgid ""
1041
" Display the above together with extended format information and\n"
1042
" basic statistics (like the number of files in the working tree and\n"
1043
" number of revisions in the branch and repository):"
1044
msgstr ""
1045
1046
#: bzrlib/builtins.py:1805
1047
msgid " bzr info -v"
1048
msgstr ""
1049
1050
#: bzrlib/builtins.py:1807
1051
msgid " Display the above together with number of committers to the branch:"
1052
msgstr ""
1053
1054
#: bzrlib/builtins.py:1809
1055
msgid " bzr info -vv"
1056
msgstr ""
1057
1058
#: bzrlib/builtins.py:1828
1059
msgid "Remove files or directories."
1060
msgstr ""
1061
1062
#: bzrlib/builtins.py:1830
1063
msgid ""
1064
"This makes Bazaar stop tracking changes to the specified files. Bazaar will\n"
1065
"delete them if they can easily be recovered using revert otherwise they\n"
1066
"will be backed up (adding an extention of the form .~#~). If no options or\n"
1067
"parameters are given Bazaar will scan for files that are being tracked by\n"
1068
"Bazaar but missing in your tree and stop tracking them for you."
1069
msgstr ""
1070
1071
#: bzrlib/builtins.py:1838
1072
msgid "Only remove files that have never been committed."
1073
msgstr ""
1074
1075
#: bzrlib/builtins.py:1840
1076
msgid "The file deletion mode to be used."
1077
msgstr ""
1078
1079
#: bzrlib/builtins.py:1841
1080
msgid "Deletion Strategy"
1081
msgstr ""
1082
1083
#: bzrlib/builtins.py:1842
1084
msgid "Backup changed files (default)."
1085
msgstr ""
1086
1087
#: bzrlib/builtins.py:1843
1088
msgid "Delete from bzr but leave the working copy."
1089
msgstr ""
1090
1091
#: bzrlib/builtins.py:1844
1092
msgid "Don't backup changed files."
1093
msgstr ""
1094
1095
#: bzrlib/builtins.py:1845
1096
msgid ""
1097
"Delete all the specified files, even if they can not be recovered and even "
1098
"if they are non-empty directories. (deprecated, use no-backup)"
1099
msgstr ""
1100
1101
#: bzrlib/builtins.py:1854
1102
msgid "(The --force option is deprecated, rather use --no-backup in future.)"
1103
msgstr ""
1104
1105
#: bzrlib/builtins.py:1871
1106
msgid "No matching files."
1107
msgstr ""
1108
1109
#: bzrlib/builtins.py:1932
1110
msgid "Reconcile bzr metadata in a branch."
1111
msgstr ""
1112
1113
#: bzrlib/builtins.py:1934
1114
msgid ""
1115
"This can correct data mismatches that may have been caused by\n"
1116
"previous ghost operations or bzr upgrades. You should only\n"
1117
"need to run this command if 'bzr check' or a bzr developer\n"
1118
"advises you to run it."
1119
msgstr ""
1120
1121
#: bzrlib/builtins.py:1939
1122
msgid ""
1123
"If a second branch is provided, cross-branch reconciliation is\n"
1124
"also attempted, which will check that data like the tree root\n"
1125
"id which was not present in very early bzr versions is represented\n"
1126
"correctly in both branches."
1127
msgstr ""
1128
1129
#: bzrlib/builtins.py:1944
1130
msgid ""
1131
"At the same time it is run it may recompress data resulting in\n"
1132
"a potential saving in disk space or performance gain."
1133
msgstr ""
1134
1135
#: bzrlib/builtins.py:1947
1136
msgid "The branch *MUST* be on a listable system such as local disk or sftp."
1137
msgstr ""
1138
1139
#: bzrlib/builtins.py:2014 bzrlib/builtins.py:2132 bzrlib/builtins.py:3750
1140
msgid ""
1141
"Format for the bzr 2.0 series.\n"
1142
"Uses group-compress storage.\n"
1143
"Provides rich roots which are a one-way transition.\n"
1144
msgstr ""
1145
1146
#: bzrlib/builtins.py:2014 bzrlib/builtins.py:2132 bzrlib/builtins.py:3750
1147
msgid ""
1148
"Pack-based format used in 1.x series. Introduced in 0.92. Interoperates with "
1149
"bzr repositories before 0.92 but cannot be read by bzr < 0.92. "
1150
msgstr ""
1151
1152
#: bzrlib/builtins.py:2014 bzrlib/builtins.py:2132 bzrlib/builtins.py:3750
1153
msgid "The 2a format with experimental support for colocated branches.\n"
1154
msgstr ""
1155
1156
#: bzrlib/builtins.py:2015
1157
msgid "Make a directory into a versioned branch."
1158
msgstr ""
1159
1160
#: bzrlib/builtins.py:2017
1161
msgid ""
1162
"Use this to create an empty branch, or before importing an\n"
1163
"existing project."
1164
msgstr ""
1165
1166
#: bzrlib/builtins.py:2020
1167
msgid ""
1168
"If there is a repository in a parent directory of the location, then\n"
1169
"the history of the branch will be stored in the repository. Otherwise\n"
1170
"init creates a standalone branch which carries its own history\n"
1171
"in the .bzr directory."
1172
msgstr ""
1173
1174
#: bzrlib/builtins.py:2025
1175
msgid ""
1176
"If there is already a branch at the location but it has no working tree,\n"
1177
"the tree can be populated with 'bzr checkout'."
1178
msgstr ""
1179
1180
#: bzrlib/builtins.py:2028
1181
msgid "Recipe for importing a tree of files::"
1182
msgstr ""
1183
1184
#: bzrlib/builtins.py:2030
1185
msgid ""
1186
" cd ~/project\n"
1187
" bzr init\n"
1188
" bzr add .\n"
1189
" bzr status\n"
1190
" bzr commit -m \"imported project\""
1191
msgstr ""
1192
1193
#: bzrlib/builtins.py:2041
1194
msgid ""
1195
"Create the path leading up to the branch if it does not already exist."
1196
msgstr ""
1197
1198
#: bzrlib/builtins.py:2044
1199
msgid "Specify a format for this branch. See \"help formats\"."
1200
msgstr ""
1201
1202
#: bzrlib/builtins.py:2052
1203
msgid ""
1204
"Never change revnos or the existing log. Append revisions to it only."
1205
msgstr ""
1206
1207
#: bzrlib/builtins.py:2055
1208
msgid "Create a branch without a working tree."
1209
msgstr ""
1210
1211
#: bzrlib/builtins.py:2075 bzrlib/push.py:110
1212
#, python-format
1213
msgid ""
1214
"Parent directory of %s does not exist.\n"
1215
"You may supply --create-prefix to create all leading parent directories."
1216
msgstr ""
1217
1218
#: bzrlib/builtins.py:2109
1219
msgid ""
1220
"This branch format cannot be set to append-revisions-only. Try --default."
1221
msgstr ""
1222
1223
#: bzrlib/builtins.py:2120
1224
msgid "Created a {0} (format: {1})\n"
1225
msgstr ""
1226
1227
#: bzrlib/builtins.py:2129
1228
#, python-format
1229
msgid "Using shared repository: %s\n"
1230
msgstr ""
1231
1232
#: bzrlib/builtins.py:2133
1233
msgid "Create a shared repository for branches to share storage space."
1234
msgstr ""
1235
1236
#: bzrlib/builtins.py:2135
1237
msgid ""
1238
"New branches created under the repository directory will store their\n"
1239
"revisions in the repository, not in the branch directory. For branches\n"
1240
"with shared history, this reduces the amount of storage needed and \n"
1241
"speeds up the creation of new branches."
1242
msgstr ""
1243
1244
#: bzrlib/builtins.py:2140
1245
msgid ""
1246
"If the --no-trees option is given then the branches in the repository\n"
1247
"will not have working trees by default. They will still exist as \n"
1248
"directories on disk, but they will not have separate copies of the \n"
1249
"files at a certain revision. This can be useful for repositories that\n"
1250
"store branches which are interacted with through checkouts or remote\n"
1251
"branches, such as on a server."
1252
msgstr ""
1253
1254
#: bzrlib/builtins.py:2147
1255
msgid ""
1256
":Examples:\n"
1257
" Create a shared repository holding just branches::"
1258
msgstr ""
1259
1260
#: bzrlib/builtins.py:2150
1261
msgid ""
1262
" bzr init-repo --no-trees repo\n"
1263
" bzr init repo/trunk"
1264
msgstr ""
1265
1266
#: bzrlib/builtins.py:2153
1267
msgid " Make a lightweight checkout elsewhere::"
1268
msgstr ""
1269
1270
#: bzrlib/builtins.py:2155
1271
msgid ""
1272
" bzr checkout --lightweight repo/trunk trunk-checkout\n"
1273
" cd trunk-checkout\n"
1274
" (add files here)"
1275
msgstr ""
1276
1277
#: bzrlib/builtins.py:2163
1278
msgid ""
1279
"Specify a format for this repository. See \"bzr help formats\" for details."
1280
msgstr ""
1281
1282
#: bzrlib/builtins.py:2167
1283
msgid "Repository format"
1284
msgstr ""
1285
1286
#: bzrlib/builtins.py:2169
1287
msgid "Branches in the repository will default to not having a working tree."
1288
msgstr ""
1289
1290
#: bzrlib/builtins.py:2195
1291
msgid "Show differences in the working tree, between revisions or branches."
1292
msgstr ""
1293
1294
#: bzrlib/builtins.py:2197
1295
msgid ""
1296
"If no arguments are given, all changes for the current tree are listed.\n"
1297
"If files are given, only the changes in those files are listed.\n"
1298
"Remote and multiple branches can be compared by using the --old and\n"
1299
"--new options. If not provided, the default for both is derived from\n"
1300
"the first argument, if any, or the current tree if no arguments are\n"
1301
"given."
1302
msgstr ""
1303
1304
#: bzrlib/builtins.py:2204
1305
msgid ""
1306
"\"bzr diff -p1\" is equivalent to \"bzr diff --prefix old/:new/\", and\n"
1307
"produces patches suitable for \"patch -p1\"."
1308
msgstr ""
1309
1310
#: bzrlib/builtins.py:2207
1311
msgid ""
1312
"Note that when using the -r argument with a range of revisions, the\n"
1313
"differences are computed between the two specified revisions. That\n"
1314
"is, the command does not show the changes introduced by the first \n"
1315
"revision in the range. This differs from the interpretation of \n"
1316
"revision ranges used by \"bzr log\" which includes the first revision\n"
1317
"in the range."
1318
msgstr ""
1319
1320
#: bzrlib/builtins.py:2214
1321
msgid ""
1322
":Exit values:\n"
1323
" 1 - changed\n"
1324
" 2 - unrepresentable changes\n"
1325
" 3 - error\n"
1326
" 0 - no change"
1327
msgstr ""
1328
1329
#: bzrlib/builtins.py:2220
1330
msgid ""
1331
":Examples:\n"
1332
" Shows the difference in the working tree versus the last commit::"
1333
msgstr ""
1334
1335
#: bzrlib/builtins.py:2223
1336
msgid " bzr diff"
1337
msgstr ""
1338
1339
#: bzrlib/builtins.py:2225
1340
msgid " Difference between the working tree and revision 1::"
1341
msgstr ""
1342
1343
#: bzrlib/builtins.py:2227
1344
msgid " bzr diff -r1"
1345
msgstr ""
1346
1347
#: bzrlib/builtins.py:2229
1348
msgid " Difference between revision 3 and revision 1::"
1349
msgstr ""
1350
1351
#: bzrlib/builtins.py:2231
1352
msgid " bzr diff -r1..3"
1353
msgstr ""
1354
1355
#: bzrlib/builtins.py:2233
1356
msgid " Difference between revision 3 and revision 1 for branch xxx::"
1357
msgstr ""
1358
1359
#: bzrlib/builtins.py:2235
1360
msgid " bzr diff -r1..3 xxx"
1361
msgstr ""
1362
1363
#: bzrlib/builtins.py:2237
1364
msgid " The changes introduced by revision 2 (equivalent to -r1..2)::"
1365
msgstr ""
1366
1367
#: bzrlib/builtins.py:2239
1368
msgid " bzr diff -c2"
1369
msgstr ""
1370
1371
#: bzrlib/builtins.py:2241
1372
msgid ""
1373
" To see the changes introduced by revision X::\n"
1374
" \n"
1375
" bzr diff -cX"
1376
msgstr ""
1377
1378
#: bzrlib/builtins.py:2245
1379
msgid ""
1380
" Note that in the case of a merge, the -c option shows the changes\n"
1381
" compared to the left hand parent. To see the changes against\n"
1382
" another parent, use::"
1383
msgstr ""
1384
1385
#: bzrlib/builtins.py:2249
1386
msgid " bzr diff -r<chosen_parent>..X"
1387
msgstr ""
1388
1389
#: bzrlib/builtins.py:2251
1390
msgid ""
1391
" The changes between the current revision and the previous revision\n"
1392
" (equivalent to -c-1 and -r-2..-1)"
1393
msgstr ""
1394
1395
#: bzrlib/builtins.py:2254
1396
msgid " bzr diff -r-2.."
1397
msgstr ""
1398
1399
#: bzrlib/builtins.py:2256
1400
msgid " Show just the differences for file NEWS::"
1401
msgstr ""
1402
1403
#: bzrlib/builtins.py:2258
1404
msgid " bzr diff NEWS"
1405
msgstr ""
1406
1407
#: bzrlib/builtins.py:2260
1408
msgid " Show the differences in working tree xxx for file NEWS::"
1409
msgstr ""
1410
1411
#: bzrlib/builtins.py:2262
1412
msgid " bzr diff xxx/NEWS"
1413
msgstr ""
1414
1415
#: bzrlib/builtins.py:2264
1416
msgid " Show the differences from branch xxx to this working tree:"
1417
msgstr ""
1418
1419
#: bzrlib/builtins.py:2266
1420
msgid " bzr diff --old xxx"
1421
msgstr ""
1422
1423
#: bzrlib/builtins.py:2268
1424
msgid " Show the differences between two branches for file NEWS::"
1425
msgstr ""
1426
1427
#: bzrlib/builtins.py:2270
1428
msgid " bzr diff --old xxx --new yyy NEWS"
1429
msgstr ""
1430
1431
#: bzrlib/builtins.py:2272
1432
msgid " Same as 'bzr diff' but prefix paths with old/ and new/::"
1433
msgstr ""
1434
1435
#: bzrlib/builtins.py:2274
1436
msgid ""
1437
" bzr diff --prefix old/:new/\n"
1438
" \n"
1439
" Show the differences using a custom diff program with options::\n"
1440
" \n"
1441
" bzr diff --using /usr/bin/diff --diff-options -wu"
1442
msgstr ""
1443
1444
#: bzrlib/builtins.py:2284
1445
msgid "Pass these options to the external diff program."
1446
msgstr ""
1447
1448
#: bzrlib/builtins.py:2287
1449
msgid ""
1450
"Set prefixes added to old and new filenames, as two values separated by a "
1451
"colon. (eg \"old/:new/\")."
1452
msgstr ""
1453
1454
#: bzrlib/builtins.py:2290
1455
msgid "Branch/tree to compare from."
1456
msgstr ""
1457
1458
#: bzrlib/builtins.py:2294
1459
msgid "Branch/tree to compare to."
1460
msgstr ""
1461
1462
#: bzrlib/builtins.py:2300
1463
msgid "Use this command to compare files."
1464
msgstr ""
1465
1466
#: bzrlib/builtins.py:2305
1467
msgid "Diff format to use."
1468
msgstr ""
1469
1470
#: bzrlib/builtins.py:2307
1471
msgid "Diff format"
1472
msgstr ""
1473
1474
#: bzrlib/builtins.py:2329
1475
msgid "--prefix expects two values separated by a colon (eg \"old/:new/\")"
1476
msgstr ""
1477
1478
#: bzrlib/builtins.py:2333
1479
msgid "bzr diff --revision takes exactly one or two revision specifiers"
1480
msgstr ""
1481
1482
#: bzrlib/builtins.py:2338 bzrlib/builtins.py:2736 bzrlib/builtins.py:2749
1483
#: bzrlib/builtins.py:2757 bzrlib/builtins.py:4919
1484
msgid "{0} and {1} are mutually exclusive"
1485
msgstr ""
1486
1487
#: bzrlib/builtins.py:2358
1488
msgid ""
1489
"List files deleted in the working tree.\n"
1490
" "
1491
msgstr ""
1492
1493
#: bzrlib/builtins.py:2436
1494
msgid "Show the tree root directory."
1495
msgstr ""
1496
1497
#: bzrlib/builtins.py:2438
1498
msgid ""
1499
"The root is the nearest enclosing directory with a .bzr control\n"
1500
"directory."
1501
msgstr ""
1502
1503
#: bzrlib/builtins.py:2453
1504
msgid "The limit argument must be an integer."
1505
msgstr ""
1506
1507
#: bzrlib/builtins.py:2461
1508
msgid "The levels argument must be an integer."
1509
msgstr ""
1510
1511
#: bzrlib/builtins.py:2466
1512
msgid "Show historical log for a branch or subset of a branch."
1513
msgstr ""
1514
1515
#: bzrlib/builtins.py:2468
1516
msgid ""
1517
"log is bzr's default tool for exploring the history of a branch.\n"
1518
"The branch to use is taken from the first parameter. If no parameters\n"
1519
"are given, the branch containing the working directory is logged.\n"
1520
"Here are some simple examples::"
1521
msgstr ""
1522
1523
#: bzrlib/builtins.py:2473
1524
msgid ""
1525
" bzr log log the current branch\n"
1526
" bzr log foo.py log a file in its branch\n"
1527
" bzr log http://server/branch log a branch on a server"
1528
msgstr ""
1529
1530
#: bzrlib/builtins.py:2477
1531
msgid ""
1532
"The filtering, ordering and information shown for each revision can\n"
1533
"be controlled as explained below. By default, all revisions are\n"
1534
"shown sorted (topologically) so that newer revisions appear before\n"
1535
"older ones and descendants always appear before ancestors. If displayed,\n"
1536
"merged revisions are shown indented under the revision in which they\n"
1537
"were merged."
1538
msgstr ""
1539
1540
#: bzrlib/builtins.py:2484
1541
msgid ":Output control:"
1542
msgstr ""
1543
1544
#: bzrlib/builtins.py:2486
1545
msgid ""
1546
" The log format controls how information about each revision is\n"
1547
" displayed. The standard log formats are called ``long``, ``short``\n"
1548
" and ``line``. The default is long. See ``bzr help log-formats``\n"
1549
" for more details on log formats."
1550
msgstr ""
1551
1552
#: bzrlib/builtins.py:2491
1553
msgid ""
1554
" The following options can be used to control what information is\n"
1555
" displayed::"
1556
msgstr ""
1557
1558
#: bzrlib/builtins.py:2494
1559
msgid ""
1560
" -l N display a maximum of N revisions\n"
1561
" -n N display N levels of revisions (0 for all, 1 for collapsed)\n"
1562
" -v display a status summary (delta) for each revision\n"
1563
" -p display a diff (patch) for each revision\n"
1564
" --show-ids display revision-ids (and file-ids), not just revnos"
1565
msgstr ""
1566
1567
#: bzrlib/builtins.py:2500
1568
msgid ""
1569
" Note that the default number of levels to display is a function of the\n"
1570
" log format. If the -n option is not used, the standard log formats show\n"
1571
" just the top level (mainline)."
1572
msgstr ""
1573
1574
#: bzrlib/builtins.py:2504
1575
msgid ""
1576
" Status summaries are shown using status flags like A, M, etc. To see\n"
1577
" the changes explained using words like ``added`` and ``modified``\n"
1578
" instead, use the -vv option."
1579
msgstr ""
1580
1581
#: bzrlib/builtins.py:2508
1582
msgid ":Ordering control:"
1583
msgstr ""
1584
1585
#: bzrlib/builtins.py:2510
1586
msgid ""
1587
" To display revisions from oldest to newest, use the --forward option.\n"
1588
" In most cases, using this option will have little impact on the total\n"
1589
" time taken to produce a log, though --forward does not incrementally\n"
1590
" display revisions like --reverse does when it can."
1591
msgstr ""
1592
1593
#: bzrlib/builtins.py:2515
1594
msgid ":Revision filtering:"
1595
msgstr ""
1596
1597
#: bzrlib/builtins.py:2517
1598
msgid ""
1599
" The -r option can be used to specify what revision or range of revisions\n"
1600
" to filter against. The various forms are shown below::"
1601
msgstr ""
1602
1603
#: bzrlib/builtins.py:2520
1604
msgid ""
1605
" -rX display revision X\n"
1606
" -rX.. display revision X and later\n"
1607
" -r..Y display up to and including revision Y\n"
1608
" -rX..Y display from X to Y inclusive"
1609
msgstr ""
1610
1611
#: bzrlib/builtins.py:2525
1612
msgid ""
1613
" See ``bzr help revisionspec`` for details on how to specify X and Y.\n"
1614
" Some common examples are given below::"
1615
msgstr ""
1616
1617
#: bzrlib/builtins.py:2528
1618
msgid ""
1619
" -r-1 show just the tip\n"
1620
" -r-10.. show the last 10 mainline revisions\n"
1621
" -rsubmit:.. show what's new on this branch\n"
1622
" -rancestor:path.. show changes since the common ancestor of this\n"
1623
" branch and the one at location path\n"
1624
" -rdate:yesterday.. show changes since yesterday"
1625
msgstr ""
1626
1627
#: bzrlib/builtins.py:2535
1628
msgid ""
1629
" When logging a range of revisions using -rX..Y, log starts at\n"
1630
" revision Y and searches back in history through the primary\n"
1631
" (\"left-hand\") parents until it finds X. When logging just the\n"
1632
" top level (using -n1), an error is reported if X is not found\n"
1633
" along the way. If multi-level logging is used (-n0), X may be\n"
1634
" a nested merge revision and the log will be truncated accordingly."
1635
msgstr ""
1636
1637
#: bzrlib/builtins.py:2542
1638
msgid ":Path filtering:"
1639
msgstr ""
1640
1641
#: bzrlib/builtins.py:2544
1642
msgid ""
1643
" If parameters are given and the first one is not a branch, the log\n"
1644
" will be filtered to show only those revisions that changed the\n"
1645
" nominated files or directories."
1646
msgstr ""
1647
1648
#: bzrlib/builtins.py:2548
1649
msgid ""
1650
" Filenames are interpreted within their historical context. To log a\n"
1651
" deleted file, specify a revision range so that the file existed at\n"
1652
" the end or start of the range."
1653
msgstr ""
1654
1655
#: bzrlib/builtins.py:2552
1656
msgid ""
1657
" Historical context is also important when interpreting pathnames of\n"
1658
" renamed files/directories. Consider the following example:"
1659
msgstr ""
1660
1661
#: bzrlib/builtins.py:2555
1662
msgid ""
1663
" * revision 1: add tutorial.txt\n"
1664
" * revision 2: modify tutorial.txt\n"
1665
" * revision 3: rename tutorial.txt to guide.txt; add tutorial.txt"
1666
msgstr ""
1667
1668
#: bzrlib/builtins.py:2559
1669
msgid " In this case:"
1670
msgstr ""
1671
1672
#: bzrlib/builtins.py:2561
1673
msgid " * ``bzr log guide.txt`` will log the file added in revision 1"
1674
msgstr ""
1675
1676
#: bzrlib/builtins.py:2563
1677
msgid ""
1678
" * ``bzr log tutorial.txt`` will log the new file added in revision 3"
1679
msgstr ""
1680
1681
#: bzrlib/builtins.py:2565
1682
msgid ""
1683
" * ``bzr log -r2 -p tutorial.txt`` will show the changes made to\n"
1684
" the original file in revision 2."
1685
msgstr ""
1686
1687
#: bzrlib/builtins.py:2568
1688
msgid ""
1689
" * ``bzr log -r2 -p guide.txt`` will display an error message as there\n"
1690
" was no file called guide.txt in revision 2."
1691
msgstr ""
1692
1693
#: bzrlib/builtins.py:2571
1694
msgid ""
1695
" Renames are always followed by log. By design, there is no need to\n"
1696
" explicitly ask for this (and no way to stop logging a file back\n"
1697
" until it was last renamed)."
1698
msgstr ""
1699
1700
#: bzrlib/builtins.py:2575
1701
msgid ":Other filtering:"
1702
msgstr ""
1703
1704
#: bzrlib/builtins.py:2577
1705
msgid ""
1706
" The --match option can be used for finding revisions that match a\n"
1707
" regular expression in a commit message, committer, author or bug.\n"
1708
" Specifying the option several times will match any of the supplied\n"
1709
" expressions. --match-author, --match-bugs, --match-committer and\n"
1710
" --match-message can be used to only match a specific field."
1711
msgstr ""
1712
1713
#: bzrlib/builtins.py:2583
1714
msgid ":Tips & tricks:"
1715
msgstr ""
1716
1717
#: bzrlib/builtins.py:2585
1718
msgid ""
1719
" GUI tools and IDEs are often better at exploring history than command\n"
1720
" line tools: you may prefer qlog or viz from qbzr or bzr-gtk, the\n"
1721
" bzr-explorer shell, or the Loggerhead web interface. See the Plugin\n"
1722
" Guide <http://doc.bazaar.canonical.com/plugins/en/> and\n"
1723
" <http://wiki.bazaar.canonical.com/IDEIntegration>. "
1724
msgstr ""
1725
1726
#: bzrlib/builtins.py:2591
1727
msgid ""
1728
" You may find it useful to add the aliases below to ``bazaar.conf``::"
1729
msgstr ""
1730
1731
#: bzrlib/builtins.py:2593
1732
msgid ""
1733
" [ALIASES]\n"
1734
" tip = log -r-1\n"
1735
" top = log -l10 --line\n"
1736
" show = log -v -p"
1737
msgstr ""
1738
1739
#: bzrlib/builtins.py:2598
1740
msgid ""
1741
" ``bzr tip`` will then show the latest revision while ``bzr top``\n"
1742
" will show the last 10 mainline revisions. To see the details of a\n"
1743
" particular revision X, ``bzr show -rX``."
1744
msgstr ""
1745
1746
#: bzrlib/builtins.py:2602
1747
msgid ""
1748
" If you are interested in looking deeper into a particular merge X,\n"
1749
" use ``bzr log -n0 -rX``."
1750
msgstr ""
1751
1752
#: bzrlib/builtins.py:2605
1753
msgid ""
1754
" ``bzr log -v`` on a branch with lots of history is currently\n"
1755
" very slow. A fix for this issue is currently under development.\n"
1756
" With or without that fix, it is recommended that a revision range\n"
1757
" be given when using the -v option."
1758
msgstr ""
1759
1760
#: bzrlib/builtins.py:2610
1761
msgid ""
1762
" bzr has a generic full-text matching plugin, bzr-search, that can be\n"
1763
" used to find revisions matching user names, commit messages, etc.\n"
1764
" Among other features, this plugin can find all revisions containing\n"
1765
" a list of words but not others."
1766
msgstr ""
1767
1768
#: bzrlib/builtins.py:2615
1769
msgid ""
1770
" When exploring non-mainline history on large projects with deep\n"
1771
" history, the performance of log can be greatly improved by installing\n"
1772
" the historycache plugin. This plugin buffers historical information\n"
1773
" trading disk space for faster speed."
1774
msgstr ""
1775
1776
#: bzrlib/builtins.py:2624
1777
msgid "Show from oldest to newest."
1778
msgstr ""
1779
1780
#: bzrlib/builtins.py:2627
1781
msgid "Show files changed in each revision."
1782
msgstr ""
1783
1784
#: bzrlib/builtins.py:2633
1785
msgid "Show just the specified revision. See also \"help revisionspec\"."
1786
msgstr ""
1787
1788
#: bzrlib/builtins.py:2637
1789
msgid "What names to list as authors - first, all or committer."
1790
msgstr ""
1791
1792
#: bzrlib/builtins.py:2638
1793
msgid "Authors"
1794
msgstr ""
1795
1796
#: bzrlib/builtins.py:2643
1797
msgid "Number of levels to display - 0 for all, 1 for flat."
1798
msgstr ""
1799
1800
#: bzrlib/builtins.py:2653
1801
msgid "Limit the output to the first N revisions."
1802
msgstr ""
1803
1804
#: bzrlib/builtins.py:2658
1805
msgid "Show changes made in each revision as a patch."
1806
msgstr ""
1807
1808
#: bzrlib/builtins.py:2660
1809
msgid "Show merged revisions like --levels 0 does."
1810
msgstr ""
1811
1812
#: bzrlib/builtins.py:2664
1813
msgid "Do not report commits with more than one parent."
1814
msgstr ""
1815
1816
#: bzrlib/builtins.py:2666
1817
msgid ""
1818
"Display only the revisions that are not part of both ancestries (require -"
1819
"rX..Y)."
1820
msgstr ""
1821
1822
#: bzrlib/builtins.py:2670
1823
msgid "Show digital signature validity."
1824
msgstr ""
1825
1826
#: bzrlib/builtins.py:2673
1827
msgid "Show revisions whose properties match this expression."
1828
msgstr ""
1829
1830
#: bzrlib/builtins.py:2677
1831
msgid "Show revisions whose message matches this expression."
1832
msgstr ""
1833
1834
#: bzrlib/builtins.py:2681
1835
msgid "Show revisions whose committer matches this expression."
1836
msgstr ""
1837
1838
#: bzrlib/builtins.py:2685
1839
msgid "Show revisions whose authors match this expression."
1840
msgstr ""
1841
1842
#: bzrlib/builtins.py:2689
1843
msgid "Show revisions whose bugs match this expression."
1844
msgstr ""
1845
1846
#: bzrlib/builtins.py:2743
1847
msgid "--exclude-common-ancestry requires -r with two revisions"
1848
msgstr ""
1849
1850
#: bzrlib/builtins.py:2771
1851
#, python-format
1852
msgid "Path unknown at end or start of revision range: %s"
1853
msgstr ""
1854
1855
#: bzrlib/builtins.py:2888
1856
#, python-format
1857
msgid "bzr %s doesn't accept two revisions in different branches."
1858
msgstr ""
1859
1860
#: bzrlib/builtins.py:2904
1861
#, python-format
1862
msgid "bzr %s --revision takes one or two values."
1863
msgstr ""
1864
1865
#: bzrlib/builtins.py:2949
1866
msgid ""
1867
"List files in a tree.\n"
1868
" "
1869
msgstr ""
1870
1871
#: bzrlib/builtins.py:2958
1872
msgid "Recurse into subdirectories."
1873
msgstr ""
1874
1875
#: bzrlib/builtins.py:2960
1876
msgid "Print paths relative to the root of the branch."
1877
msgstr ""
1878
1879
#: bzrlib/builtins.py:2962
1880
msgid "Print unknown files."
1881
msgstr ""
1882
1883
#: bzrlib/builtins.py:2963
1884
msgid "Print versioned files."
1885
msgstr ""
1886
1887
#: bzrlib/builtins.py:2966
1888
msgid "Print ignored files."
1889
msgstr ""
1890
1891
#: bzrlib/builtins.py:2968
1892
msgid "List entries of a particular kind: file, directory, symlink."
1893
msgstr ""
1894
1895
#: bzrlib/builtins.py:2981
1896
msgid "invalid kind specified"
1897
msgstr ""
1898
1899
#: bzrlib/builtins.py:2984
1900
msgid "Cannot set both --verbose and --null"
1901
msgstr ""
1902
1903
#: bzrlib/builtins.py:2993
1904
msgid "cannot specify both --from-root and PATH"
1905
msgstr ""
1906
1907
#: bzrlib/builtins.py:3080
1908
msgid "Ignore specified files or patterns."
1909
msgstr ""
1910
1911
#: bzrlib/builtins.py:3082
1912
msgid "See ``bzr help patterns`` for details on the syntax of patterns."
1913
msgstr ""
1914
1915
#: bzrlib/builtins.py:3084
1916
msgid ""
1917
"If a .bzrignore file does not exist, the ignore command\n"
1918
"will create one and add the specified files or patterns to the newly\n"
1919
"created file. The ignore command will also automatically add the \n"
1920
".bzrignore file to be versioned. Creating a .bzrignore file without\n"
1921
"the use of the ignore command will require an explicit add command."
1922
msgstr ""
1923
1924
#: bzrlib/builtins.py:3090
1925
msgid ""
1926
"To remove patterns from the ignore list, edit the .bzrignore file.\n"
1927
"After adding, editing or deleting that file either indirectly by\n"
1928
"using this command or directly by using an editor, be sure to commit\n"
1929
"it."
1930
msgstr ""
1931
1932
#: bzrlib/builtins.py:3095
1933
msgid ""
1934
"Bazaar also supports a global ignore file ~/.bazaar/ignore. On Windows\n"
1935
"the global ignore file can be found in the application data directory as\n"
1936
"C:\\Documents and Settings\\<user>\\Application Data\\Bazaar\\2.0\\ignore.\n"
1937
"Global ignores are not touched by this command. The global ignore file\n"
1938
"can be edited directly using an editor."
1939
msgstr ""
1940
1941
#: bzrlib/builtins.py:3101
1942
msgid ""
1943
"Patterns prefixed with '!' are exceptions to ignore patterns and take\n"
1944
"precedence over regular ignores. Such exceptions are used to specify\n"
1945
"files that should be versioned which would otherwise be ignored."
1946
msgstr ""
1947
1948
#: bzrlib/builtins.py:3105
1949
msgid ""
1950
"Patterns prefixed with '!!' act as regular ignore patterns, but have\n"
1951
"precedence over the '!' exception patterns."
1952
msgstr ""
1953
1954
#: bzrlib/builtins.py:3108
1955
msgid ""
1956
":Notes: \n"
1957
" \n"
1958
"* Ignore patterns containing shell wildcards must be quoted from\n"
1959
" the shell on Unix."
1960
msgstr ""
1961
1962
#: bzrlib/builtins.py:3113
1963
msgid ""
1964
"* Ignore patterns starting with \"#\" act as comments in the ignore file.\n"
1965
" To ignore patterns that begin with that character, use the \"RE:\" prefix."
1966
msgstr ""
1967
1968
#: bzrlib/builtins.py:3116
1969
msgid ""
1970
":Examples:\n"
1971
" Ignore the top level Makefile::"
1972
msgstr ""
1973
1974
#: bzrlib/builtins.py:3119
1975
msgid " bzr ignore ./Makefile"
1976
msgstr ""
1977
1978
#: bzrlib/builtins.py:3121
1979
msgid " Ignore .class files in all directories...::"
1980
msgstr ""
1981
1982
#: bzrlib/builtins.py:3123
1983
msgid " bzr ignore \"*.class\""
1984
msgstr ""
1985
1986
#: bzrlib/builtins.py:3125
1987
msgid " ...but do not ignore \"special.class\"::"
1988
msgstr ""
1989
1990
#: bzrlib/builtins.py:3127
1991
msgid " bzr ignore \"!special.class\""
1992
msgstr ""
1993
1994
#: bzrlib/builtins.py:3129
1995
msgid " Ignore files whose name begins with the \"#\" character::"
1996
msgstr ""
1997
1998
#: bzrlib/builtins.py:3131
1999
msgid " bzr ignore \"RE:^#\""
2000
msgstr ""
2001
2002
#: bzrlib/builtins.py:3133 bzrlib/builtins.py:3137
2003
msgid " Ignore .o files under the lib directory::"
2004
msgstr ""
2005
2006
#: bzrlib/builtins.py:3135
2007
msgid " bzr ignore \"lib/**/*.o\""
2008
msgstr ""
2009
2010
#: bzrlib/builtins.py:3139
2011
msgid " bzr ignore \"RE:lib/.*\\.o\""
2012
msgstr ""
2013
2014
#: bzrlib/builtins.py:3141
2015
msgid " Ignore everything but the \"debian\" toplevel directory::"
2016
msgstr ""
2017
2018
#: bzrlib/builtins.py:3143
2019
msgid ""
2020
" bzr ignore \"RE:(?!debian/).*\"\n"
2021
" \n"
2022
" Ignore everything except the \"local\" toplevel directory,\n"
2023
" but always ignore autosave files ending in ~, even under local/::\n"
2024
" \n"
2025
" bzr ignore \"*\"\n"
2026
" bzr ignore \"!./local\"\n"
2027
" bzr ignore \"!!*~\""
2028
msgstr ""
2029
2030
#: bzrlib/builtins.py:3157
2031
msgid "Display the default ignore rules that bzr uses."
2032
msgstr ""
2033
2034
#: bzrlib/builtins.py:3169
2035
msgid "ignore requires at least one NAME_PATTERN or --default-rules."
2036
msgstr ""
2037
2038
#: bzrlib/builtins.py:3180
2039
#, python-format
2040
msgid "Invalid ignore pattern found. %s"
2041
msgid_plural "Invalid ignore patterns found. %s"
2042
msgstr[0] ""
2043
msgstr[1] ""
2044
2045
#: bzrlib/builtins.py:3189
2046
msgid "NAME_PATTERN should not be an absolute path"
2047
msgstr ""
2048
2049
#: bzrlib/builtins.py:3202
2050
#, python-format
2051
msgid ""
2052
"Warning: the following files are version controlled and match your ignore "
2053
"pattern:\n"
2054
"%s\n"
2055
"These files will continue to be version controlled unless you 'bzr remove' "
2056
"them.\n"
2057
msgstr ""
2058
2059
#: bzrlib/builtins.py:3209
2060
msgid "List ignored files and the patterns that matched them."
2061
msgstr ""
2062
2063
#: bzrlib/builtins.py:3211
2064
msgid ""
2065
"List all the ignored files and the ignore pattern that caused the file to\n"
2066
"be ignored."
2067
msgstr ""
2068
2069
#: bzrlib/builtins.py:3214
2070
msgid "Alternatively, to list just the files::"
2071
msgstr ""
2072
2073
#: bzrlib/builtins.py:3216
2074
msgid " bzr ls --ignored"
2075
msgstr ""
2076
2077
#: bzrlib/builtins.py:3250
2078
#, python-format
2079
msgid "not a valid revision-number: %r"
2080
msgstr ""
2081
2082
#: bzrlib/builtins.py:3257
2083
msgid ""
2084
"Export current or past revision to a destination directory or archive."
2085
msgstr ""
2086
2087
#: bzrlib/builtins.py:3259
2088
msgid "If no revision is specified this exports the last committed revision."
2089
msgstr ""
2090
2091
#: bzrlib/builtins.py:3261
2092
msgid ""
2093
"Format may be an \"exporter\" name, such as tar, tgz, tbz2. If none is\n"
2094
"given, try to find the format with the extension. If no extension\n"
2095
"is found exports to a directory (equivalent to --format=dir)."
2096
msgstr ""
2097
2098
#: bzrlib/builtins.py:3265
2099
msgid ""
2100
"If root is supplied, it will be used as the root directory inside\n"
2101
"container formats (tar, zip, etc). If it is not supplied it will default\n"
2102
"to the exported filename. The root option has no effect for 'dir' format."
2103
msgstr ""
2104
2105
#: bzrlib/builtins.py:3269
2106
msgid ""
2107
"If branch is omitted then the branch containing the current working\n"
2108
"directory will be used."
2109
msgstr ""
2110
2111
#: bzrlib/builtins.py:3272
2112
msgid ""
2113
"Note: Export of tree with non-ASCII filenames to zip is not supported."
2114
msgstr ""
2115
2116
#: bzrlib/builtins.py:3274
2117
msgid ""
2118
" ================= =========================\n"
2119
" Supported formats Autodetected by extension\n"
2120
" ================= =========================\n"
2121
" dir (none)\n"
2122
" tar .tar\n"
2123
" tbz2 .tar.bz2, .tbz2\n"
2124
" tgz .tar.gz, .tgz\n"
2125
" zip .zip\n"
2126
" ================= ========================="
2127
msgstr ""
2128
2129
#: bzrlib/builtins.py:3288
2130
msgid "Type of file to export to."
2131
msgstr ""
2132
2133
#: bzrlib/builtins.py:3291
2134
msgid "Apply content filters to export the convenient form."
2135
msgstr ""
2136
2137
#: bzrlib/builtins.py:3295
2138
msgid "Name of the root directory inside the exported file."
2139
msgstr ""
2140
2141
#: bzrlib/builtins.py:3297
2142
msgid ""
2143
"Set modification time of files to that of the last revision in which it was "
2144
"changed."
2145
msgstr ""
2146
2147
#: bzrlib/builtins.py:3300
2148
msgid ""
2149
"Export the working tree contents rather than that of the last revision."
2150
msgstr ""
2151
2152
#: bzrlib/builtins.py:3319
2153
msgid "--uncommitted requires a working tree"
2154
msgstr ""
2155
2156
#: bzrlib/builtins.py:3328
2157
#, python-format
2158
msgid "Unsupported export format: %s"
2159
msgstr ""
2160
2161
#: bzrlib/builtins.py:3332
2162
msgid ""
2163
"Write the contents of a file as of a given revision to standard output."
2164
msgstr ""
2165
2166
#: bzrlib/builtins.py:3334
2167
msgid "If no revision is nominated, the last revision is used."
2168
msgstr ""
2169
2170
#: bzrlib/builtins.py:3336
2171
msgid ""
2172
"Note: Take care to redirect standard output when using this command on a\n"
2173
"binary file."
2174
msgstr ""
2175
2176
#: bzrlib/builtins.py:3342
2177
msgid "The path name in the old tree."
2178
msgstr ""
2179
2180
#: bzrlib/builtins.py:3343
2181
msgid "Apply content filters to display the convenience form."
2182
msgstr ""
2183
2184
#: bzrlib/builtins.py:3354
2185
msgid "bzr cat --revision takes exactly one revision specifier"
2186
msgstr ""
2187
2188
#: bzrlib/builtins.py:3379 bzrlib/builtins.py:3391
2189
msgid "{0!r} is not present in revision {1}"
2190
msgstr ""
2191
2192
#: bzrlib/builtins.py:3414
2193
msgid "Commit changes into a new revision."
2194
msgstr ""
2195
2196
#: bzrlib/builtins.py:3416
2197
msgid ""
2198
"An explanatory message needs to be given for each commit. This is\n"
2199
"often done by using the --message option (getting the message from the\n"
2200
"command line) or by using the --file option (getting the message from\n"
2201
"a file). If neither of these options is given, an editor is opened for\n"
2202
"the user to enter the message. To see the changed files in the\n"
2203
"boilerplate text loaded into the editor, use the --show-diff option."
2204
msgstr ""
2205
2206
#: bzrlib/builtins.py:3423
2207
msgid ""
2208
"By default, the entire tree is committed and the person doing the\n"
2209
"commit is assumed to be the author. These defaults can be overridden\n"
2210
"as explained below."
2211
msgstr ""
2212
2213
#: bzrlib/builtins.py:3427
2214
msgid ":Selective commits:"
2215
msgstr ""
2216
2217
#: bzrlib/builtins.py:3429
2218
msgid ""
2219
" If selected files are specified, only changes to those files are\n"
2220
" committed. If a directory is specified then the directory and\n"
2221
" everything within it is committed."
2222
msgstr ""
2223
2224
#: bzrlib/builtins.py:3433
2225
msgid ""
2226
" When excludes are given, they take precedence over selected files.\n"
2227
" For example, to commit only changes within foo, but not changes\n"
2228
" within foo/bar::"
2229
msgstr ""
2230
2231
#: bzrlib/builtins.py:3437
2232
msgid " bzr commit foo -x foo/bar"
2233
msgstr ""
2234
2235
#: bzrlib/builtins.py:3439
2236
msgid " A selective commit after a merge is not yet supported."
2237
msgstr ""
2238
2239
#: bzrlib/builtins.py:3441
2240
msgid ":Custom authors:"
2241
msgstr ""
2242
2243
#: bzrlib/builtins.py:3443
2244
msgid ""
2245
" If the author of the change is not the same person as the committer,\n"
2246
" you can specify the author's name using the --author option. The\n"
2247
" name should be in the same format as a committer-id, e.g.\n"
2248
" \"John Doe <jdoe@example.com>\". If there is more than one author of\n"
2249
" the change you can specify the option multiple times, once for each\n"
2250
" author."
2251
msgstr ""
2252
2253
#: bzrlib/builtins.py:3450
2254
msgid ":Checks:"
2255
msgstr ""
2256
2257
#: bzrlib/builtins.py:3452
2258
msgid ""
2259
" A common mistake is to forget to add a new file or directory before\n"
2260
" running the commit command. The --strict option checks for unknown\n"
2261
" files and aborts the commit if any are found. More advanced pre-commit\n"
2262
" checks can be implemented by defining hooks. See ``bzr help hooks``\n"
2263
" for details."
2264
msgstr ""
2265
2266
#: bzrlib/builtins.py:3458
2267
msgid ":Things to note:"
2268
msgstr ""
2269
2270
#: bzrlib/builtins.py:3460
2271
msgid ""
2272
" If you accidentially commit the wrong changes or make a spelling\n"
2273
" mistake in the commit message say, you can use the uncommit command\n"
2274
" to undo it. See ``bzr help uncommit`` for details."
2275
msgstr ""
2276
2277
#: bzrlib/builtins.py:3464
2278
msgid ""
2279
" Hooks can also be configured to run after a commit. This allows you\n"
2280
" to trigger updates to external systems like bug trackers. The --fixes\n"
2281
" option can be used to record the association between a revision and\n"
2282
" one or more bugs. See ``bzr help bugs`` for details."
2283
msgstr ""
2284
2285
#: bzrlib/builtins.py:3474
2286
msgid "Do not consider changes made to a given path."
2287
msgstr ""
2288
2289
#: bzrlib/builtins.py:3477
2290
msgid "Description of the new revision."
2291
msgstr ""
2292
2293
#: bzrlib/builtins.py:3480
2294
msgid "Commit even if nothing has changed."
2295
msgstr ""
2296
2297
#: bzrlib/builtins.py:3484
2298
msgid "Take commit message from this file."
2299
msgstr ""
2300
2301
#: bzrlib/builtins.py:3486
2302
msgid "Refuse to commit if there are unknown files in the working tree."
2303
msgstr ""
2304
2305
#: bzrlib/builtins.py:3489
2306
msgid ""
2307
"Manually set a commit time using commit date format, e.g. '2009-10-10 "
2308
"08:00:00 +0100'."
2309
msgstr ""
2310
2311
#: bzrlib/builtins.py:3492
2312
msgid "Mark a bug as being fixed by this revision (see \"bzr help bugs\")."
2313
msgstr ""
2314
2315
#: bzrlib/builtins.py:3495
2316
msgid "Set the author's name, if it's different from the committer."
2317
msgstr ""
2318
2319
#: bzrlib/builtins.py:3498
2320
msgid ""
2321
"Perform a local commit in a bound branch. Local commits are not pushed to "
2322
"the master branch until a normal commit is performed."
2323
msgstr ""
2324
2325
#: bzrlib/builtins.py:3504
2326
msgid ""
2327
"When no message is supplied, show the diff along with the status summary in "
2328
"the message editor."
2329
msgstr ""
2330
2331
#: bzrlib/builtins.py:3507
2332
msgid ""
2333
"When committing to a foreign version control system do not push data that "
2334
"can not be natively represented."
2335
msgstr ""
2336
2337
#: bzrlib/builtins.py:3525
2338
#, python-format
2339
msgid ""
2340
"No tracker specified for bug %s. Use the form 'tracker:id' or specify a "
2341
"default bug tracker using the `bugtracker` option.\n"
2342
"See \"bzr help bugs\" for more information on this feature. Commit refused."
2343
msgstr ""
2344
2345
#: bzrlib/builtins.py:3534
2346
#, python-format
2347
msgid ""
2348
"Invalid bug %s. Must be in the form of 'tracker:id'. See \"bzr help bugs\" "
2349
"for more information on this feature.\n"
2350
"Commit refused."
2351
msgstr ""
2352
2353
#: bzrlib/builtins.py:3543
2354
#, python-format
2355
msgid "Unrecognized bug %s. Commit refused."
2356
msgstr ""
2357
2358
#: bzrlib/builtins.py:3546
2359
#, python-format
2360
msgid ""
2361
"%s\n"
2362
"Commit refused."
2363
msgstr ""
2364
2365
#: bzrlib/builtins.py:3570
2366
msgid "Could not parse --commit-time: "
2367
msgstr ""
2368
2369
#: bzrlib/builtins.py:3610
2370
msgid "please specify either --message or --file"
2371
msgstr ""
2372
2373
#: bzrlib/builtins.py:3639
2374
msgid "please specify a commit message with either --message or --file"
2375
msgstr ""
2376
2377
#: bzrlib/builtins.py:3642
2378
msgid ""
2379
"Empty commit message specified. Please specify a commit message with either -"
2380
"-message or --file or leave a blank message with --message \"\"."
2381
msgstr ""
2382
2383
#: bzrlib/builtins.py:3662
2384
msgid ""
2385
"No changes to commit. Please 'bzr add' the files you want to commit, or use -"
2386
"-unchanged to force an empty commit."
2387
msgstr ""
2388
2389
#: bzrlib/builtins.py:3666
2390
msgid ""
2391
"Conflicts detected in working tree. Use \"bzr conflicts\" to list, \"bzr "
2392
"resolve FILE\" to resolve."
2393
msgstr ""
2394
2395
#: bzrlib/builtins.py:3670
2396
msgid "Commit refused because there are unknown files in the working tree."
2397
msgstr ""
2398
2399
#: bzrlib/builtins.py:3673
2400
msgid ""
2401
"\n"
2402
"To commit to master branch, run update and then commit.\n"
2403
"You can also pass --local to commit to continue working disconnected."
2404
msgstr ""
2405
2406
#: bzrlib/builtins.py:3681
2407
msgid ""
2408
"Validate working tree structure, branch consistency and repository history."
2409
msgstr ""
2410
2411
#: bzrlib/builtins.py:3683
2412
msgid ""
2413
"This command checks various invariants about branch and repository storage\n"
2414
"to detect data corruption or bzr bugs."
2415
msgstr ""
2416
2417
#: bzrlib/builtins.py:3686
2418
msgid ""
2419
"The working tree and branch checks will only give output if a problem is\n"
2420
"detected. The output fields of the repository check are:"
2421
msgstr ""
2422
2423
#: bzrlib/builtins.py:3689
2424
msgid ""
2425
"revisions\n"
2426
" This is just the number of revisions checked. It doesn't\n"
2427
" indicate a problem."
2428
msgstr ""
2429
2430
#: bzrlib/builtins.py:3693
2431
msgid ""
2432
"versionedfiles\n"
2433
" This is just the number of versionedfiles checked. It\n"
2434
" doesn't indicate a problem."
2435
msgstr ""
2436
2437
#: bzrlib/builtins.py:3697
2438
msgid ""
2439
"unreferenced ancestors\n"
2440
" Texts that are ancestors of other texts, but\n"
2441
" are not properly referenced by the revision ancestry. This is a\n"
2442
" subtle problem that Bazaar can work around."
2443
msgstr ""
2444
2445
#: bzrlib/builtins.py:3702
2446
msgid ""
2447
"unique file texts\n"
2448
" This is the total number of unique file contents\n"
2449
" seen in the checked revisions. It does not indicate a problem."
2450
msgstr ""
2451
2452
#: bzrlib/builtins.py:3706
2453
msgid ""
2454
"repeated file texts\n"
2455
" This is the total number of repeated texts seen\n"
2456
" in the checked revisions. Texts can be repeated when their file\n"
2457
" entries are modified, but the file contents are not. It does not\n"
2458
" indicate a problem."
2459
msgstr ""
2460
2461
#: bzrlib/builtins.py:3712
2462
msgid ""
2463
"If no restrictions are specified, all Bazaar data that is found at the "
2464
"given\n"
2465
"location will be checked."
2466
msgstr ""
2467
2468
#: bzrlib/builtins.py:3717
2469
msgid " Check the tree and branch at 'foo'::"
2470
msgstr ""
2471
2472
#: bzrlib/builtins.py:3719
2473
msgid " bzr check --tree --branch foo"
2474
msgstr ""
2475
2476
#: bzrlib/builtins.py:3721
2477
msgid " Check only the repository at 'bar'::"
2478
msgstr ""
2479
2480
#: bzrlib/builtins.py:3723
2481
msgid " bzr check --repo bar"
2482
msgstr ""
2483
2484
#: bzrlib/builtins.py:3725
2485
msgid " Check everything at 'baz'::"
2486
msgstr ""
2487
2488
#: bzrlib/builtins.py:3727
2489
msgid " bzr check baz"
2490
msgstr ""
2491
2492
#: bzrlib/builtins.py:3733
2493
msgid "Check the branch related to the current directory."
2494
msgstr ""
2495
2496
#: bzrlib/builtins.py:3735
2497
msgid "Check the repository related to the current directory."
2498
msgstr ""
2499
2500
#: bzrlib/builtins.py:3737
2501
msgid "Check the working tree related to the current directory."
2502
msgstr ""
2503
2504
#: bzrlib/builtins.py:3751
2505
msgid "Upgrade a repository, branch or working tree to a newer format."
2506
msgstr ""
2507
2508
#: bzrlib/builtins.py:3753
2509
msgid ""
2510
"When the default format has changed after a major new release of\n"
2511
"Bazaar, you may be informed during certain operations that you\n"
2512
"should upgrade. Upgrading to a newer format may improve performance\n"
2513
"or make new features available. It may however limit interoperability\n"
2514
"with older repositories or with older versions of Bazaar."
2515
msgstr ""
2516
2517
#: bzrlib/builtins.py:3759
2518
msgid ""
2519
"If you wish to upgrade to a particular format rather than the\n"
2520
"current default, that can be specified using the --format option.\n"
2521
"As a consequence, you can use the upgrade command this way to\n"
2522
"\"downgrade\" to an earlier format, though some conversions are\n"
2523
"a one way process (e.g. changing from the 1.x default to the\n"
2524
"2.x default) so downgrading is not always possible."
2525
msgstr ""
2526
2527
#: bzrlib/builtins.py:3766
2528
msgid ""
2529
"A backup.bzr.~#~ directory is created at the start of the conversion\n"
2530
"process (where # is a number). By default, this is left there on\n"
2531
"completion. If the conversion fails, delete the new .bzr directory\n"
2532
"and rename this one back in its place. Use the --clean option to ask\n"
2533
"for the backup.bzr directory to be removed on successful conversion.\n"
2534
"Alternatively, you can delete it by hand if everything looks good\n"
2535
"afterwards."
2536
msgstr ""
2537
2538
#: bzrlib/builtins.py:3774
2539
msgid ""
2540
"If the location given is a shared repository, dependent branches\n"
2541
"are also converted provided the repository converts successfully.\n"
2542
"If the conversion of a branch fails, remaining branches are still\n"
2543
"tried."
2544
msgstr ""
2545
2546
#: bzrlib/builtins.py:3779
2547
msgid ""
2548
"For more information on upgrades, see the Bazaar Upgrade Guide,\n"
2549
"http://doc.bazaar.canonical.com/latest/en/upgrade-guide/."
2550
msgstr ""
2551
2552
#: bzrlib/builtins.py:3787
2553
msgid "Upgrade to a specific format. See \"bzr help formats\" for details."
2554
msgstr ""
2555
2556
#: bzrlib/builtins.py:3791
2557
msgid "Branch format"
2558
msgstr ""
2559
2560
#: bzrlib/builtins.py:3793
2561
msgid "Remove the backup.bzr directory if successful."
2562
msgstr ""
2563
2564
#: bzrlib/builtins.py:3795
2565
msgid "Show what would be done, but don't actually do anything."
2566
msgstr ""
2567
2568
#: bzrlib/builtins.py:3810
2569
msgid "Show or set bzr user id."
2570
msgstr ""
2571
2572
#: bzrlib/builtins.py:3812
2573
msgid ""
2574
":Examples:\n"
2575
" Show the email of the current user::"
2576
msgstr ""
2577
2578
#: bzrlib/builtins.py:3815
2579
msgid " bzr whoami --email"
2580
msgstr ""
2581
2582
#: bzrlib/builtins.py:3817
2583
msgid " Set the current user::"
2584
msgstr ""
2585
2586
#: bzrlib/builtins.py:3819
2587
msgid " bzr whoami \"Frank Chu <fchu@example.com>\""
2588
msgstr ""
2589
2590
#: bzrlib/builtins.py:3823
2591
msgid "Display email address only."
2592
msgstr ""
2593
2594
#: bzrlib/builtins.py:3825
2595
msgid "Set identity for the current branch instead of globally."
2596
msgstr ""
2597
2598
#: bzrlib/builtins.py:3851
2599
msgid "--email can only be used to display existing identity"
2600
msgstr ""
2601
2602
#: bzrlib/builtins.py:3873
2603
msgid "Print or set the branch nickname."
2604
msgstr ""
2605
2606
#: bzrlib/builtins.py:3875
2607
msgid ""
2608
"If unset, the tree root directory name is used as the nickname.\n"
2609
"To print the current nickname, execute with no argument."
2610
msgstr ""
2611
2612
#: bzrlib/builtins.py:3878
2613
msgid ""
2614
"Bound branches use the nickname of its master branch unless it is set\n"
2615
"locally."
2616
msgstr ""
2617
2618
#: bzrlib/builtins.py:3898
2619
msgid "Set/unset and display aliases."
2620
msgstr ""
2621
2622
#: bzrlib/builtins.py:3900
2623
msgid ""
2624
":Examples:\n"
2625
" Show the current aliases::"
2626
msgstr ""
2627
2628
#: bzrlib/builtins.py:3903
2629
msgid " bzr alias"
2630
msgstr ""
2631
2632
#: bzrlib/builtins.py:3905
2633
msgid " Show the alias specified for 'll'::"
2634
msgstr ""
2635
2636
#: bzrlib/builtins.py:3907
2637
msgid " bzr alias ll"
2638
msgstr ""
2639
2640
#: bzrlib/builtins.py:3909
2641
msgid " Set an alias for 'll'::"
2642
msgstr ""
2643
2644
#: bzrlib/builtins.py:3911
2645
msgid " bzr alias ll=\"log --line -r-10..-1\""
2646
msgstr ""
2647
2648
#: bzrlib/builtins.py:3913
2649
msgid " To remove an alias for 'll'::"
2650
msgstr ""
2651
2652
#: bzrlib/builtins.py:3915
2653
msgid " bzr alias --remove ll"
2654
msgstr ""
2655
2656
#: bzrlib/builtins.py:3920
2657
msgid "Remove the alias."
2658
msgstr ""
2659
2660
#: bzrlib/builtins.py:3938
2661
msgid "bzr alias --remove expects an alias to remove."
2662
msgstr ""
2663
2664
#: bzrlib/builtins.py:4119
2665
msgid ""
2666
"subunit not available. subunit needs to be installed to use --subunit."
2667
msgstr ""
2668
2669
#: bzrlib/builtins.py:4136
2670
msgid ""
2671
"--benchmark is no longer supported from bzr 2.2; use bzr-usertest instead"
2672
msgstr ""
2673
2674
#: bzrlib/builtins.py:4183
2675
msgid "Show version of bzr."
2676
msgstr ""
2677
2678
#: bzrlib/builtins.py:4187
2679
msgid "Print just the version number."
2680
msgstr ""
2681
2682
#: bzrlib/builtins.py:4206
2683
msgid "It sure does!\n"
2684
msgstr ""
2685
2686
#: bzrlib/builtins.py:4230
2687
#, python-format
2688
msgid "merge base is revision %s\n"
2689
msgstr ""
2690
2691
#: bzrlib/builtins.py:4234
2692
msgid "Perform a three-way merge."
2693
msgstr ""
2694
2695
#: bzrlib/builtins.py:4236
2696
msgid ""
2697
"The source of the merge can be specified either in the form of a branch,\n"
2698
"or in the form of a path to a file containing a merge directive generated\n"
2699
"with bzr send. If neither is specified, the default is the upstream branch\n"
2700
"or the branch most recently merged using --remember. The source of the\n"
2701
"merge may also be specified in the form of a path to a file in another\n"
2702
"branch: in this case, only the modifications to that file are merged into\n"
2703
"the current working tree."
2704
msgstr ""
2705
2706
#: bzrlib/builtins.py:4244
2707
msgid ""
2708
"When merging from a branch, by default bzr will try to merge in all new\n"
2709
"work from the other branch, automatically determining an appropriate base\n"
2710
"revision. If this fails, you may need to give an explicit base."
2711
msgstr ""
2712
2713
#: bzrlib/builtins.py:4248
2714
msgid ""
2715
"To pick a different ending revision, pass \"--revision OTHER\". bzr will\n"
2716
"try to merge in all new work up to and including revision OTHER."
2717
msgstr ""
2718
2719
#: bzrlib/builtins.py:4251
2720
msgid ""
2721
"If you specify two values, \"--revision BASE..OTHER\", only revisions BASE\n"
2722
"through OTHER, excluding BASE but including OTHER, will be merged. If this\n"
2723
"causes some revisions to be skipped, i.e. if the destination branch does\n"
2724
"not already contain revision BASE, such a merge is commonly referred to as\n"
2725
"a \"cherrypick\". Unlike a normal merge, Bazaar does not currently track\n"
2726
"cherrypicks. The changes look like a normal commit, and the history of the\n"
2727
"changes from the other branch is not stored in the commit."
2728
msgstr ""
2729
2730
#: bzrlib/builtins.py:4259
2731
msgid "Revision numbers are always relative to the source branch."
2732
msgstr ""
2733
2734
#: bzrlib/builtins.py:4261 bzrlib/conflicts.py:52 bzrlib/conflicts.py:106
2735
msgid ""
2736
"Merge will do its best to combine the changes in two branches, but there\n"
2737
"are some kinds of problems only a human can fix. When it encounters those,\n"
2738
"it will mark a conflict. A conflict means that you need to fix something,\n"
2739
"before you can commit."
2740
msgstr ""
2741
2742
#: bzrlib/builtins.py:4266
2743
msgid ""
2744
"Use bzr resolve when you have fixed a problem. See also bzr conflicts."
2745
msgstr ""
2746
2747
#: bzrlib/builtins.py:4268
2748
msgid ""
2749
"If there is no default branch set, the first merge will set it (use\n"
2750
"--no-remember to avoid setting it). After that, you can omit the branch\n"
2751
"to use the default. To change the default, use --remember. The value will\n"
2752
"only be saved if the remote location can be accessed."
2753
msgstr ""
2754
2755
#: bzrlib/builtins.py:4273
2756
msgid ""
2757
"The results of the merge are placed into the destination working\n"
2758
"directory, where they can be reviewed (with bzr diff), tested, and then\n"
2759
"committed to record the result of the merge."
2760
msgstr ""
2761
2762
#: bzrlib/builtins.py:4277
2763
msgid ""
2764
"merge refuses to run if there are any uncommitted changes, unless\n"
2765
"--force is given. If --force is given, then the changes from the source \n"
2766
"will be merged with the current working tree, including any uncommitted\n"
2767
"changes in the tree. The --force option can also be used to create a\n"
2768
"merge revision which has more than two parents."
2769
msgstr ""
2770
2771
#: bzrlib/builtins.py:4283
2772
msgid ""
2773
"If one would like to merge changes from the working tree of the other\n"
2774
"branch without merging any committed revisions, the --uncommitted option\n"
2775
"can be given."
2776
msgstr ""
2777
2778
#: bzrlib/builtins.py:4287
2779
msgid ""
2780
"To select only some changes to merge, use \"merge -i\", which will prompt\n"
2781
"you to apply each diff hunk and file change, similar to \"shelve\"."
2782
msgstr ""
2783
2784
#: bzrlib/builtins.py:4290
2785
msgid ""
2786
":Examples:\n"
2787
" To merge all new revisions from bzr.dev::"
2788
msgstr ""
2789
2790
#: bzrlib/builtins.py:4293
2791
msgid " bzr merge ../bzr.dev"
2792
msgstr ""
2793
2794
#: bzrlib/builtins.py:4295
2795
msgid " To merge changes up to and including revision 82 from bzr.dev::"
2796
msgstr ""
2797
2798
#: bzrlib/builtins.py:4297
2799
msgid " bzr merge -r 82 ../bzr.dev"
2800
msgstr ""
2801
2802
#: bzrlib/builtins.py:4299
2803
msgid " To merge the changes introduced by 82, without previous changes::"
2804
msgstr ""
2805
2806
#: bzrlib/builtins.py:4301
2807
msgid " bzr merge -r 81..82 ../bzr.dev"
2808
msgstr ""
2809
2810
#: bzrlib/builtins.py:4303
2811
msgid " To apply a merge directive contained in /tmp/merge::"
2812
msgstr ""
2813
2814
#: bzrlib/builtins.py:4305
2815
msgid " bzr merge /tmp/merge"
2816
msgstr ""
2817
2818
#: bzrlib/builtins.py:4307
2819
msgid ""
2820
" To create a merge revision with three parents from two branches\n"
2821
" feature1a and feature1b:"
2822
msgstr ""
2823
2824
#: bzrlib/builtins.py:4310
2825
msgid ""
2826
" bzr merge ../feature1a\n"
2827
" bzr merge ../feature1b --force\n"
2828
" bzr commit -m 'revision with three parents'"
2829
msgstr ""
2830
2831
#: bzrlib/builtins.py:4322
2832
msgid "Merge even if the destination tree has uncommitted changes."
2833
msgstr ""
2834
2835
#: bzrlib/builtins.py:4328
2836
msgid ""
2837
"Apply uncommitted changes from a working copy, instead of branch changes."
2838
msgstr ""
2839
2840
#: bzrlib/builtins.py:4330
2841
msgid ""
2842
"If the destination is already completely merged into the source, pull from "
2843
"the source rather than merging. When this happens, you do not need to "
2844
"commit the result."
2845
msgstr ""
2846
2847
#: bzrlib/builtins.py:4335
2848
msgid ""
2849
"Branch to merge into, rather than the one containing the working directory."
2850
msgstr ""
2851
2852
#: bzrlib/builtins.py:4337
2853
msgid "Instead of merging, show a diff of the merge."
2854
msgstr ""
2855
2856
#: bzrlib/builtins.py:4339
2857
msgid "Select changes interactively."
2858
msgstr ""
2859
2860
#: bzrlib/builtins.py:4361
2861
msgid ""
2862
"Merging into empty branches not currently supported, "
2863
"https://bugs.launchpad.net/bzr/+bug/308562"
2864
msgstr ""
2865
2866
#: bzrlib/builtins.py:4388
2867
msgid "Cannot use --uncommitted with bundles or merge directives."
2868
msgstr ""
2869
2870
#: bzrlib/builtins.py:4399
2871
msgid "Cannot use --uncommitted and --revision at the same time."
2872
msgstr ""
2873
2874
#: bzrlib/builtins.py:4419
2875
msgid "merger: "
2876
msgstr ""
2877
2878
#: bzrlib/builtins.py:4421 bzrlib/bundle/apply_bundle.py:71
2879
msgid "Nothing to do."
2880
msgstr ""
2881
2882
#: bzrlib/builtins.py:4425
2883
msgid "Cannot pull individual files"
2884
msgstr ""
2885
2886
#: bzrlib/builtins.py:4433
2887
msgid "This branch has no commits. (perhaps you would prefer 'bzr pull')"
2888
msgstr ""
2889
2890
#: bzrlib/builtins.py:4491
2891
#, python-format
2892
msgid "Show-base is not supported for this merge type. %s"
2893
msgstr ""
2894
2895
#: bzrlib/builtins.py:4500
2896
#, python-format
2897
msgid "Conflict reduction is not supported for merge type %s."
2898
msgstr ""
2899
2900
#: bzrlib/builtins.py:4504
2901
msgid "Cannot do conflict reduction and show base."
2902
msgstr ""
2903
2904
#: bzrlib/builtins.py:4615
2905
msgid "No location specified or remembered"
2906
msgstr ""
2907
2908
#: bzrlib/builtins.py:4617
2909
msgid "{0} remembered {1} location {2}"
2910
msgstr ""
2911
2912
#: bzrlib/builtins.py:4623
2913
msgid "Redo a merge."
2914
msgstr ""
2915
2916
#: bzrlib/builtins.py:4625
2917
msgid ""
2918
"Use this if you want to try a different merge technique while resolving\n"
2919
"conflicts. Some merge techniques are better than others, and remerge\n"
2920
"lets you try different ones on different files."
2921
msgstr ""
2922
2923
#: bzrlib/builtins.py:4629
2924
msgid ""
2925
"The options for remerge have the same meaning and defaults as the ones for\n"
2926
"merge. The difference is that remerge can (only) be run when there is a\n"
2927
"pending merge, and it lets you specify particular files."
2928
msgstr ""
2929
2930
#: bzrlib/builtins.py:4633
2931
msgid ""
2932
":Examples:\n"
2933
" Re-do the merge of all conflicted files, and show the base text in\n"
2934
" conflict regions, in addition to the usual THIS and OTHER texts::"
2935
msgstr ""
2936
2937
#: bzrlib/builtins.py:4637
2938
msgid " bzr remerge --show-base"
2939
msgstr ""
2940
2941
#: bzrlib/builtins.py:4639
2942
msgid ""
2943
" Re-do the merge of \"foobar\", using the weave merge algorithm, with\n"
2944
" additional processing to reduce the size of conflict regions::"
2945
msgstr ""
2946
2947
#: bzrlib/builtins.py:4642
2948
msgid " bzr remerge --merge-type weave --reprocess foobar"
2949
msgstr ""
2950
2951
#: bzrlib/builtins.py:4649
2952
msgid "Show base revision text in conflicts."
2953
msgstr ""
2954
2955
#: bzrlib/builtins.py:4661
2956
msgid ""
2957
"Sorry, remerge only works after normal merges. Not cherrypicking or multi-"
2958
"merges."
2959
msgstr ""
2960
2961
#: bzrlib/builtins.py:4717
2962
msgid "Revert files to a previous revision."
2963
msgstr ""
2964
2965
#: bzrlib/builtins.py:4719
2966
msgid ""
2967
"Giving a list of files will revert only those files. Otherwise, all files\n"
2968
"will be reverted. If the revision is not specified with '--revision', the\n"
2969
"last committed revision is used."
2970
msgstr ""
2971
2972
#: bzrlib/builtins.py:4723
2973
msgid ""
2974
"To remove only some changes, without reverting to a prior version, use\n"
2975
"merge instead. For example, \"merge . -r -2..-3\" (don't forget the \".\")\n"
2976
"will remove the changes introduced by the second last commit (-2), without\n"
2977
"affecting the changes introduced by the last commit (-1). To remove\n"
2978
"certain changes on a hunk-by-hunk basis, see the shelve command."
2979
msgstr ""
2980
2981
#: bzrlib/builtins.py:4729
2982
msgid ""
2983
"By default, any files that have been manually changed will be backed up\n"
2984
"first. (Files changed only by merge are not backed up.) Backup files have\n"
2985
"'.~#~' appended to their name, where # is a number."
2986
msgstr ""
2987
2988
#: bzrlib/builtins.py:4733
2989
msgid ""
2990
"When you provide files, you can use their current pathname or the pathname\n"
2991
"from the target revision. So you can use revert to \"undelete\" a file by\n"
2992
"name. If you name a directory, all the contents of that directory will be\n"
2993
"reverted."
2994
msgstr ""
2995
2996
#: bzrlib/builtins.py:4738
2997
msgid ""
2998
"If you have newly added files since the target revision, they will be\n"
2999
"removed. If the files to be removed have been changed, backups will be\n"
3000
"created as above. Directories containing unknown files will not be\n"
3001
"deleted."
3002
msgstr ""
3003
3004
#: bzrlib/builtins.py:4743
3005
msgid ""
3006
"The working tree contains a list of revisions that have been merged but\n"
3007
"not yet committed. These revisions will be included as additional parents\n"
3008
"of the next commit. Normally, using revert clears that list as well as\n"
3009
"reverting the files. If any files are specified, revert leaves the list\n"
3010
"of uncommitted merges alone and reverts only the files. Use ``bzr revert\n"
3011
".`` in the tree root to revert all files but keep the recorded merges,\n"
3012
"and ``bzr revert --forget-merges`` to clear the pending merge list without\n"
3013
"reverting any files."
3014
msgstr ""
3015
3016
#: bzrlib/builtins.py:4752
3017
msgid ""
3018
"Using \"bzr revert --forget-merges\", it is possible to apply all of the\n"
3019
"changes from a branch in a single revision. To do this, perform the merge\n"
3020
"as desired. Then doing revert with the \"--forget-merges\" option will "
3021
"keep\n"
3022
"the content of the tree as it was, but it will clear the list of pending\n"
3023
"merges. The next commit will then contain all of the changes that are\n"
3024
"present in the other branch, but without any other parent revisions.\n"
3025
"Because this technique forgets where these changes originated, it may\n"
3026
"cause additional conflicts on later merges involving the same source and\n"
3027
"target branches."
3028
msgstr ""
3029
3030
#: bzrlib/builtins.py:4766
3031
msgid "Do not save backups of reverted files."
3032
msgstr ""
3033
3034
#: bzrlib/builtins.py:4768
3035
msgid "Remove pending merge marker, without changing any files."
3036
msgstr ""
3037
3038
#: bzrlib/builtins.py:4799
3039
msgid ""
3040
"Show help on a command or other topic.\n"
3041
" "
3042
msgstr ""
3043
3044
#: bzrlib/builtins.py:4804
3045
msgid "Show help on all commands."
3046
msgstr ""
3047
3048
#: bzrlib/builtins.py:4833
3049
msgid "Show unmerged/unpulled revisions between two branches."
3050
msgstr ""
3051
3052
#: bzrlib/builtins.py:4835
3053
msgid "OTHER_BRANCH may be local or remote."
3054
msgstr ""
3055
3056
#: bzrlib/builtins.py:4837
3057
msgid ""
3058
"To filter on a range of revisions, you can use the command -r begin..end\n"
3059
"-r revision requests a specific revision, -r ..end or -r begin.. are\n"
3060
"also valid.\n"
3061
" \n"
3062
":Exit values:\n"
3063
" 1 - some missing revisions\n"
3064
" 0 - no missing revisions"
3065
msgstr ""
3066
3067
#: bzrlib/builtins.py:4847
3068
msgid ""
3069
" Determine the missing revisions between this and the branch at the\n"
3070
" remembered pull location::"
3071
msgstr ""
3072
3073
#: bzrlib/builtins.py:4850
3074
msgid " bzr missing"
3075
msgstr ""
3076
3077
#: bzrlib/builtins.py:4852
3078
msgid " Determine the missing revisions between this and another branch::"
3079
msgstr ""
3080
3081
#: bzrlib/builtins.py:4854
3082
msgid " bzr missing http://server/branch"
3083
msgstr ""
3084
3085
#: bzrlib/builtins.py:4856
3086
msgid ""
3087
" Determine the missing revisions up to a specific revision on the other\n"
3088
" branch::"
3089
msgstr ""
3090
3091
#: bzrlib/builtins.py:4859
3092
msgid " bzr missing -r ..-10"
3093
msgstr ""
3094
3095
#: bzrlib/builtins.py:4861
3096
msgid ""
3097
" Determine the missing revisions up to a specific revision on this\n"
3098
" branch::"
3099
msgstr ""
3100
3101
#: bzrlib/builtins.py:4864
3102
msgid " bzr missing --my-revision ..-10"
3103
msgstr ""
3104
3105
#: bzrlib/builtins.py:4871
3106
msgid "Reverse the order of revisions."
3107
msgstr ""
3108
3109
#: bzrlib/builtins.py:4873
3110
msgid "Display changes in the local branch only."
3111
msgstr ""
3112
3113
#: bzrlib/builtins.py:4874
3114
msgid "Same as --mine-only."
3115
msgstr ""
3116
3117
#: bzrlib/builtins.py:4876
3118
msgid "Display changes in the remote branch only."
3119
msgstr ""
3120
3121
#: bzrlib/builtins.py:4877
3122
msgid "Same as --theirs-only."
3123
msgstr ""
3124
3125
#: bzrlib/builtins.py:4882
3126
msgid ""
3127
"Filter on other branch revisions (inclusive). See \"help revisionspec\" for "
3128
"details."
3129
msgstr ""
3130
3131
#: bzrlib/builtins.py:4886
3132
msgid ""
3133
"Filter on local branch revisions (inclusive). See \"help revisionspec\" for "
3134
"details."
3135
msgstr ""
3136
3137
#: bzrlib/builtins.py:4889
3138
msgid "Show all revisions in addition to the mainline ones."
3139
msgstr ""
3140
3141
#: bzrlib/builtins.py:4943
3142
msgid "No peer location known or specified."
3143
msgstr ""
3144
3145
#: bzrlib/builtins.py:4947
3146
msgid "Using saved parent location: {0}\n"
3147
msgstr ""
3148
3149
#: bzrlib/builtins.py:4980
3150
#, python-format
3151
msgid "You have %d extra revision:\n"
3152
msgid_plural "You have %d extra revisions:\n"
3153
msgstr[0] ""
3154
msgstr[1] ""
3155
3156
#: bzrlib/builtins.py:4996
3157
#, python-format
3158
msgid "You are missing %d revision:\n"
3159
msgid_plural "You are missing %d revisions:\n"
3160
msgstr[0] ""
3161
msgstr[1] ""
3162
3163
#: bzrlib/builtins.py:5008
3164
msgid "This branch has no new revisions.\n"
3165
msgstr ""
3166
3167
#: bzrlib/builtins.py:5011
3168
msgid "Other branch has no new revisions.\n"
3169
msgstr ""
3170
3171
#: bzrlib/builtins.py:5016
3172
msgid "Branches are up to date.\n"
3173
msgstr ""
3174
3175
#: bzrlib/builtins.py:5027
3176
msgid "Compress the data within a repository."
3177
msgstr ""
3178
3179
#: bzrlib/builtins.py:5029
3180
msgid ""
3181
"This operation compresses the data within a bazaar repository. As\n"
3182
"bazaar supports automatic packing of repository, this operation is\n"
3183
"normally not required to be done manually."
3184
msgstr ""
3185
3186
#: bzrlib/builtins.py:5033
3187
msgid ""
3188
"During the pack operation, bazaar takes a backup of existing repository\n"
3189
"data, i.e. pack files. This backup is eventually removed by bazaar\n"
3190
"automatically when it is safe to do so. To save disk space by removing\n"
3191
"the backed up pack files, the --clean-obsolete-packs option may be\n"
3192
"used."
3193
msgstr ""
3194
3195
#: bzrlib/builtins.py:5039
3196
msgid ""
3197
"Warning: If you use --clean-obsolete-packs and your machine crashes\n"
3198
"during or immediately after repacking, you may be left with a state\n"
3199
"where the deletion has been written to disk but the new packs have not\n"
3200
"been. In this case the repository may be unusable."
3201
msgstr ""
3202
3203
#: bzrlib/builtins.py:5048
3204
msgid "Delete obsolete packs to save disk space."
3205
msgstr ""
3206
3207
#: bzrlib/builtins.py:5062
3208
msgid "List the installed plugins."
3209
msgstr ""
3210
3211
#: bzrlib/builtins.py:5064
3212
msgid ""
3213
"This command displays the list of installed plugins including\n"
3214
"version of plugin and a short description of each."
3215
msgstr ""
3216
3217
#: bzrlib/builtins.py:5067
3218
msgid "--verbose shows the path where each plugin is located."
3219
msgstr ""
3220
3221
#: bzrlib/builtins.py:5069
3222
msgid ""
3223
"A plugin is an external component for Bazaar that extends the\n"
3224
"revision control system, by adding or replacing code in Bazaar.\n"
3225
"Plugins can do a variety of things, including overriding commands,\n"
3226
"adding new commands, providing additional network transports and\n"
3227
"customizing log output."
3228
msgstr ""
3229
3230
#: bzrlib/builtins.py:5075
3231
msgid ""
3232
"See the Bazaar Plugin Guide <http://doc.bazaar.canonical.com/plugins/en/>\n"
3233
"for further information on plugins including where to find them and how to\n"
3234
"install them. Instructions are also provided there on how to write new\n"
3235
"plugins using the Python programming language."
3236
msgstr ""
3237
3238
#: bzrlib/builtins.py:5091
3239
msgid "Show testament (signing-form) of a revision."
3240
msgstr ""
3241
3242
#: bzrlib/builtins.py:5094
3243
msgid "Produce long-format testament."
3244
msgstr ""
3245
3246
#: bzrlib/builtins.py:5096
3247
msgid "Produce a strict-format testament."
3248
msgstr ""
3249
3250
#: bzrlib/builtins.py:5122
3251
msgid "Show the origin of each line in a file."
3252
msgstr ""
3253
3254
#: bzrlib/builtins.py:5124
3255
msgid ""
3256
"This prints out the given file with an annotation on the left side\n"
3257
"indicating which revision, author and date introduced the change."
3258
msgstr ""
3259
3260
#: bzrlib/builtins.py:5127
3261
msgid ""
3262
"If the origin is the same for a run of consecutive lines, it is\n"
3263
"shown only at the top, unless the --all option is given."
3264
msgstr ""
3265
3266
#: bzrlib/builtins.py:5135
3267
msgid "Show annotations on all lines."
3268
msgstr ""
3269
3270
#: bzrlib/builtins.py:5136
3271
msgid "Show commit date in annotations."
3272
msgstr ""
3273
3274
#: bzrlib/builtins.py:5223
3275
msgid "Cannot sign a range of non-revision-history revisions"
3276
msgstr ""
3277
3278
#: bzrlib/builtins.py:5235
3279
msgid "Please supply either one revision, or a range."
3280
msgstr ""
3281
3282
#: bzrlib/builtins.py:5239
3283
msgid ""
3284
"Convert the current branch into a checkout of the supplied branch.\n"
3285
"If no branch is supplied, rebind to the last bound location."
3286
msgstr ""
3287
3288
#: bzrlib/builtins.py:5242
3289
msgid ""
3290
"Once converted into a checkout, commits must succeed on the master branch\n"
3291
"before they will be applied to the local branch."
3292
msgstr ""
3293
3294
#: bzrlib/builtins.py:5245
3295
msgid ""
3296
"Bound branches use the nickname of its master branch unless it is set\n"
3297
"locally, in which case binding will update the local nickname to be\n"
3298
"that of the master."
3299
msgstr ""
3300
3301
#: bzrlib/builtins.py:5260
3302
msgid "No location supplied. This format does not remember old locations."
3303
msgstr ""
3304
3305
#: bzrlib/builtins.py:5265
3306
msgid "Branch is already bound"
3307
msgstr ""
3308
3309
#: bzrlib/builtins.py:5267
3310
msgid "No location supplied and no previous location known"
3311
msgstr ""
3312
3313
#: bzrlib/builtins.py:5273
3314
msgid "These branches have diverged. Try merging, and then bind again."
3315
msgstr ""
3316
3317
#: bzrlib/builtins.py:5280
3318
msgid "Convert the current checkout into a regular branch."
3319
msgstr ""
3320
3321
#: bzrlib/builtins.py:5282
3322
msgid ""
3323
"After unbinding, the local branch is considered independent and subsequent\n"
3324
"commits will be local only."
3325
msgstr ""
3326
3327
#: bzrlib/builtins.py:5293
3328
msgid "Local branch is not bound"
3329
msgstr ""
3330
3331
#: bzrlib/builtins.py:5297
3332
msgid "Remove the last committed revision."
3333
msgstr ""
3334
3335
#: bzrlib/builtins.py:5299
3336
msgid ""
3337
"--verbose will print out what is being removed.\n"
3338
"--dry-run will go through all the motions, but not actually\n"
3339
"remove anything."
3340
msgstr ""
3341
3342
#: bzrlib/builtins.py:5303
3343
msgid ""
3344
"If --revision is specified, uncommit revisions to leave the branch at the\n"
3345
"specified revision. For example, \"bzr uncommit -r 15\" will leave the\n"
3346
"branch at revision 15."
3347
msgstr ""
3348
3349
#: bzrlib/builtins.py:5307
3350
msgid ""
3351
"Uncommit leaves the working tree ready for a new commit. The only change\n"
3352
"it may make is to restore any pending merges that were present before\n"
3353
"the commit."
3354
msgstr ""
3355
3356
#: bzrlib/builtins.py:5318
3357
msgid "Don't actually make changes."
3358
msgstr ""
3359
3360
#: bzrlib/builtins.py:5319
3361
msgid "Say yes to all questions."
3362
msgstr ""
3363
3364
#: bzrlib/builtins.py:5321
3365
msgid "Keep tags that point to removed revisions."
3366
msgstr ""
3367
3368
#: bzrlib/builtins.py:5323
3369
msgid "Only remove the commits from the local branch when in a checkout."
3370
msgstr ""
3371
3372
#: bzrlib/builtins.py:5372
3373
msgid "No revisions to uncommit.\n"
3374
msgstr ""
3375
3376
#: bzrlib/builtins.py:5387
3377
msgid "Dry-run, pretending to remove the above revisions.\n"
3378
msgstr ""
3379
3380
#: bzrlib/builtins.py:5390
3381
msgid "The above revision(s) will be removed.\n"
3382
msgstr ""
3383
3384
#: bzrlib/builtins.py:5394
3385
msgid "Uncommit these revisions"
3386
msgstr ""
3387
3388
#: bzrlib/builtins.py:5397
3389
msgid "Canceled\n"
3390
msgstr ""
3391
3392
#: bzrlib/builtins.py:5404
3393
#, python-format
3394
msgid ""
3395
"You can restore the old tip by running:\n"
3396
" bzr pull . -r revid:%s\n"
3397
msgstr ""
3398
3399
#: bzrlib/builtins.py:5409
3400
msgid "Break a dead lock."
3401
msgstr ""
3402
3403
#: bzrlib/builtins.py:5411
3404
msgid ""
3405
"This command breaks a lock on a repository, branch, working directory or\n"
3406
"config file."
3407
msgstr ""
3408
3409
#: bzrlib/builtins.py:5414
3410
msgid ""
3411
"CAUTION: Locks should only be broken when you are sure that the process\n"
3412
"holding the lock has been stopped."
3413
msgstr ""
3414
3415
#: bzrlib/builtins.py:5417
3416
msgid ""
3417
"You can get information on what locks are open via the 'bzr info\n"
3418
"[location]' command."
3419
msgstr ""
3420
3421
#: bzrlib/builtins.py:5420
3422
msgid ""
3423
":Examples:\n"
3424
" bzr break-lock\n"
3425
" bzr break-lock bzr+ssh://example.com/bzr/foo\n"
3426
" bzr break-lock --conf ~/.bazaar"
3427
msgstr ""
3428
3429
#: bzrlib/builtins.py:5429
3430
msgid "LOCATION is the directory where the config lock is."
3431
msgstr ""
3432
3433
#: bzrlib/builtins.py:5431
3434
msgid "Do not ask for confirmation before breaking the lock."
3435
msgstr ""
3436
3437
#: bzrlib/builtins.py:5466
3438
msgid "The Bazaar smart server protocol over TCP. (default port: 4155)"
3439
msgstr ""
3440
3441
#: bzrlib/builtins.py:5467
3442
msgid "Run the bzr server."
3443
msgstr ""
3444
3445
#: bzrlib/builtins.py:5473
3446
msgid "Serve on stdin/out for use from inetd or sshd."
3447
msgstr ""
3448
3449
#: bzrlib/builtins.py:5474
3450
msgid "protocol"
3451
msgstr ""
3452
3453
#: bzrlib/builtins.py:5475
3454
msgid "Protocol to serve."
3455
msgstr ""
3456
3457
#: bzrlib/builtins.py:5479
3458
msgid ""
3459
"Listen for connections on nominated port of the form [hostname:]portnumber. "
3460
"Passing 0 as the port number will result in a dynamically allocated port. "
3461
"The default port depends on the protocol."
3462
msgstr ""
3463
3464
#: bzrlib/builtins.py:5485
3465
msgid "Serve contents of this directory."
3466
msgstr ""
3467
3468
#: bzrlib/builtins.py:5487
3469
msgid ""
3470
"By default the server is a readonly server. Supplying --allow-writes "
3471
"enables write access to the contents of the served directory and below. "
3472
"Note that ``bzr serve`` does not perform authentication, so unless some form "
3473
"of external authentication is arranged supplying this option leads to global "
3474
"uncontrolled write access to your file system."
3475
msgstr ""
3476
3477
#: bzrlib/builtins.py:5496
3478
msgid "Override the default idle client timeout (5min)."
3479
msgstr ""
3480
3481
#: bzrlib/builtins.py:5546
3482
msgid "Combine a tree into its containing tree."
3483
msgstr ""
3484
3485
#: bzrlib/builtins.py:5548
3486
msgid "This command requires the target tree to be in a rich-root format."
3487
msgstr ""
3488
3489
#: bzrlib/builtins.py:5550
3490
msgid ""
3491
"The TREE argument should be an independent tree, inside another tree, but\n"
3492
"not part of it. (Such trees can be produced by \"bzr split\", but also by\n"
3493
"running \"bzr branch\" with the target inside a tree.)"
3494
msgstr ""
3495
3496
#: bzrlib/builtins.py:5554
3497
msgid ""
3498
"The result is a combined tree, with the subtree no longer an independent\n"
3499
"part. This is marked as a merge of the subtree into the containing tree,\n"
3500
"and all history is preserved."
3501
msgstr ""
3502
3503
#: bzrlib/builtins.py:5572
3504
#, python-format
3505
msgid ""
3506
"Can't join trees because %s doesn't support rich root data.\n"
3507
"You can use bzr upgrade on the repository."
3508
msgstr ""
3509
3510
#: bzrlib/builtins.py:5582 bzrlib/builtins.py:5588
3511
msgid "Cannot join {0}. {1}"
3512
msgstr ""
3513
3514
#: bzrlib/builtins.py:5592
3515
msgid "Split a subdirectory of a tree into a separate tree."
3516
msgstr ""
3517
3518
#: bzrlib/builtins.py:5594
3519
msgid ""
3520
"This command will produce a target tree in a format that supports\n"
3521
"rich roots, like 'rich-root' or 'rich-root-pack'. These formats cannot be\n"
3522
"converted into earlier formats like 'dirstate-tags'."
3523
msgstr ""
3524
3525
#: bzrlib/builtins.py:5598
3526
msgid ""
3527
"The TREE argument should be a subdirectory of a working tree. That\n"
3528
"subdirectory will be converted into an independent tree, with its own\n"
3529
"branch. Commits in the top-level tree will not apply to the new subtree."
3530
msgstr ""
3531
3532
#: bzrlib/builtins.py:5678
3533
msgid "No submit branch specified or known"
3534
msgstr ""
3535
3536
#: bzrlib/builtins.py:5686 bzrlib/send.py:108
3537
msgid "No public branch specified or known"
3538
msgstr ""
3539
3540
#: bzrlib/builtins.py:5691
3541
msgid "bzr merge-directive takes at most two one revision identifiers"
3542
msgstr ""
3543
3544
#: bzrlib/builtins.py:5700
3545
msgid "No revisions to bundle."
3546
msgstr ""
3547
3548
#: bzrlib/builtins.py:5719
3549
msgid "Mail or create a merge-directive for submitting changes."
3550
msgstr ""
3551
3552
#: bzrlib/builtins.py:5721
3553
msgid "A merge directive provides many things needed for requesting merges:"
3554
msgstr ""
3555
3556
#: bzrlib/builtins.py:5723
3557
msgid "* A machine-readable description of the merge to perform"
3558
msgstr ""
3559
3560
#: bzrlib/builtins.py:5725
3561
msgid "* An optional patch that is a preview of the changes requested"
3562
msgstr ""
3563
3564
#: bzrlib/builtins.py:5727
3565
msgid ""
3566
"* An optional bundle of revision data, so that the changes can be applied\n"
3567
" directly from the merge directive, without retrieving data from a\n"
3568
" branch."
3569
msgstr ""
3570
3571
#: bzrlib/builtins.py:5731
3572
msgid ""
3573
"`bzr send` creates a compact data set that, when applied using bzr\n"
3574
"merge, has the same effect as merging from the source branch. "
3575
msgstr ""
3576
3577
#: bzrlib/builtins.py:5734
3578
msgid ""
3579
"By default the merge directive is self-contained and can be applied to any\n"
3580
"branch containing submit_branch in its ancestory without needing access to\n"
3581
"the source branch."
3582
msgstr ""
3583
3584
#: bzrlib/builtins.py:5738
3585
msgid ""
3586
"If --no-bundle is specified, then Bazaar doesn't send the contents of the\n"
3587
"revisions, but only a structured request to merge from the\n"
3588
"public_location. In that case the public_branch is needed and it must be\n"
3589
"up-to-date and accessible to the recipient. The public_branch is always\n"
3590
"included if known, so that people can check it later."
3591
msgstr ""
3592
3593
#: bzrlib/builtins.py:5744
3594
msgid ""
3595
"The submit branch defaults to the parent of the source branch, but can be\n"
3596
"overridden. Both submit branch and public branch will be remembered in\n"
3597
"branch.conf the first time they are used for a particular branch. The\n"
3598
"source branch defaults to that containing the working directory, but can\n"
3599
"be changed using --from."
3600
msgstr ""
3601
3602
#: bzrlib/builtins.py:5750
3603
msgid ""
3604
"Both the submit branch and the public branch follow the usual behavior with\n"
3605
"respect to --remember: If there is no default location set, the first send\n"
3606
"will set it (use --no-remember to avoid setting it). After that, you can\n"
3607
"omit the location to use the default. To change the default, use\n"
3608
"--remember. The value will only be saved if the location can be accessed."
3609
msgstr ""
3610
3611
#: bzrlib/builtins.py:5756
3612
msgid ""
3613
"In order to calculate those changes, bzr must analyse the submit branch.\n"
3614
"Therefore it is most efficient for the submit branch to be a local mirror.\n"
3615
"If a public location is known for the submit_branch, that location is used\n"
3616
"in the merge directive."
3617
msgstr ""
3618
3619
#: bzrlib/builtins.py:5761
3620
msgid ""
3621
"The default behaviour is to send the merge directive by mail, unless -o is\n"
3622
"given, in which case it is sent to a file."
3623
msgstr ""
3624
3625
#: bzrlib/builtins.py:5764
3626
msgid ""
3627
"Mail is sent using your preferred mail program. This should be transparent\n"
3628
"on Windows (it uses MAPI). On Unix, it requires the xdg-email utility.\n"
3629
"If the preferred client can't be found (or used), your editor will be used."
3630
msgstr ""
3631
3632
#: bzrlib/builtins.py:5768
3633
msgid ""
3634
"To use a specific mail program, set the mail_client configuration option.\n"
3635
"(For Thunderbird 1.5, this works around some bugs.) Supported values for\n"
3636
"specific clients are \"claws\", \"evolution\", \"kmail\", \"mail.app\" "
3637
"(MacOS X's\n"
3638
"Mail.app), \"mutt\", and \"thunderbird\"; generic options are \"default\",\n"
3639
"\"editor\", \"emacsclient\", \"mapi\", and \"xdg-email\". Plugins may also "
3640
"add\n"
3641
"supported clients."
3642
msgstr ""
3643
3644
#: bzrlib/builtins.py:5775
3645
msgid ""
3646
"If mail is being sent, a to address is required. This can be supplied\n"
3647
"either on the commandline, by setting the submit_to configuration\n"
3648
"option in the branch itself or the child_submit_to configuration option\n"
3649
"in the submit branch."
3650
msgstr ""
3651
3652
#: bzrlib/builtins.py:5780
3653
msgid ""
3654
"Two formats are currently supported: \"4\" uses revision bundle format 4 "
3655
"and\n"
3656
"merge directive format 2. It is significantly faster and smaller than\n"
3657
"older formats. It is compatible with Bazaar 0.19 and later. It is the\n"
3658
"default. \"0.9\" uses revision bundle format 0.9 and merge directive\n"
3659
"format 1. It is compatible with Bazaar 0.12 - 0.18."
3660
msgstr ""
3661
3662
#: bzrlib/builtins.py:5786
3663
msgid ""
3664
"The merge directives created by bzr send may be applied using bzr merge or\n"
3665
"bzr pull by specifying a file containing a merge directive as the location."
3666
msgstr ""
3667
3668
#: bzrlib/builtins.py:5789
3669
msgid ""
3670
"bzr send makes extensive use of public locations to map local locations "
3671
"into\n"
3672
"URLs that can be used by other people. See `bzr help configuration` to\n"
3673
"set them, and use `bzr info` to display them."
3674
msgstr ""
3675
3676
#: bzrlib/builtins.py:5813
3677
msgid "Write merge directive to this file or directory; use - for stdout."
3678
msgstr ""
3679
3680
#: bzrlib/builtins.py:5817
3681
msgid ""
3682
"Refuse to send if there are uncommitted changes in the working tree, --no-"
3683
"strict disables the check."
3684
msgstr ""
3685
3686
#: bzrlib/builtins.py:5819
3687
msgid "Mail the request to this address."
3688
msgstr ""
3689
3690
#: bzrlib/builtins.py:5823
3691
msgid "Body for the email."
3692
msgstr ""
3693
3694
#: bzrlib/builtins.py:5876
3695
msgid "Do not include a bundle in the merge directive."
3696
msgstr ""
3697
3698
#: bzrlib/builtins.py:5877
3699
msgid "Do not include a preview patch in the merge directive."
3700
msgstr ""
3701
3702
#: bzrlib/builtins.py:5880
3703
msgid "Remember submit and public branch."
3704
msgstr ""
3705
3706
#: bzrlib/builtins.py:5882
3707
msgid ""
3708
"Branch to generate the submission from, rather than the one containing the "
3709
"working directory."
3710
msgstr ""
3711
3712
#: bzrlib/builtins.py:5892 bzrlib/cmd_version_info.py:76
3713
msgid "format"
3714
msgstr ""
3715
3716
#: bzrlib/builtins.py:5893
3717
msgid "Use the specified output format."
3718
msgstr ""
3719
3720
#: bzrlib/builtins.py:5915
3721
msgid "Create, remove or modify a tag naming a revision."
3722
msgstr ""
3723
3724
#: bzrlib/builtins.py:5917
3725
msgid ""
3726
"Tags give human-meaningful names to revisions. Commands that take a -r\n"
3727
"(--revision) option can be given -rtag:X, where X is any previously\n"
3728
"created tag."
3729
msgstr ""
3730
3731
#: bzrlib/builtins.py:5921
3732
msgid ""
3733
"Tags are stored in the branch. Tags are copied from one branch to another\n"
3734
"along when you branch, push, pull or merge."
3735
msgstr ""
3736
3737
#: bzrlib/builtins.py:5924
3738
msgid ""
3739
"It is an error to give a tag name that already exists unless you pass\n"
3740
"--force, in which case the tag is moved to point to the new revision."
3741
msgstr ""
3742
3743
#: bzrlib/builtins.py:5927
3744
msgid ""
3745
"To rename a tag (change the name but keep it on the same revsion), run "
3746
"``bzr\n"
3747
"tag new-name -r tag:old-name`` and then ``bzr tag --delete oldname``."
3748
msgstr ""
3749
3750
#: bzrlib/builtins.py:5930
3751
msgid ""
3752
"If no tag name is specified it will be determined through the \n"
3753
"'automatic_tag_name' hook. This can e.g. be used to automatically tag\n"
3754
"upstream releases by reading configure.ac. See ``bzr help hooks`` for\n"
3755
"details."
3756
msgstr ""
3757
3758
#: bzrlib/builtins.py:5940
3759
msgid "Delete this tag rather than placing it."
3760
msgstr ""
3761
3762
#: bzrlib/builtins.py:5943
3763
msgid "Branch in which to place the tag."
3764
msgstr ""
3765
3766
#: bzrlib/builtins.py:5945
3767
msgid "Replace existing tags."
3768
msgstr ""
3769
3770
#: bzrlib/builtins.py:5960
3771
msgid "No tag specified to delete."
3772
msgstr ""
3773
3774
#: bzrlib/builtins.py:5962
3775
#, python-format
3776
msgid "Deleted tag %s."
3777
msgstr ""
3778
3779
#: bzrlib/builtins.py:5976
3780
msgid "Please specify a tag name."
3781
msgstr ""
3782
3783
#: bzrlib/builtins.py:5984
3784
#, python-format
3785
msgid "Tag %s already exists for that revision."
3786
msgstr ""
3787
3788
#: bzrlib/builtins.py:5988
3789
#, python-format
3790
msgid "Created tag %s."
3791
msgstr ""
3792
3793
#: bzrlib/builtins.py:5990
3794
#, python-format
3795
msgid "Updated tag %s."
3796
msgstr ""
3797
3798
#: bzrlib/builtins.py:5994
3799
msgid "List tags."
3800
msgstr ""
3801
3802
#: bzrlib/builtins.py:5996
3803
msgid ""
3804
"This command shows a table of tag names and the revisions they reference."
3805
msgstr ""
3806
3807
#: bzrlib/builtins.py:6002
3808
msgid "Branch whose tags should be displayed."
3809
msgstr ""
3810
3811
#: bzrlib/builtins.py:6004
3812
msgid "Sort tags by different criteria."
3813
msgstr ""
3814
3815
#: bzrlib/builtins.py:6004
3816
msgid "Sorting"
3817
msgstr ""
3818
3819
#: bzrlib/builtins.py:6073
3820
msgid "Reconfigure the type of a bzr directory."
3821
msgstr ""
3822
3823
#: bzrlib/builtins.py:6075
3824
msgid "A target configuration must be specified."
3825
msgstr ""
3826
3827
#: bzrlib/builtins.py:6077
3828
msgid ""
3829
"For checkouts, the bind-to location will be auto-detected if not specified.\n"
3830
"The order of preference is\n"
3831
"1. For a lightweight checkout, the current bound location.\n"
3832
"2. For branches that used to be checkouts, the previously-bound location.\n"
3833
"3. The push location.\n"
3834
"4. The parent location.\n"
3835
"If none of these is available, --bind-to must be specified."
3836
msgstr ""
3837
3838
#: bzrlib/builtins.py:6091
3839
msgid "Tree type"
3840
msgstr ""
3841
3842
#: bzrlib/builtins.py:6092
3843
msgid "The relation between branch and tree."
3844
msgstr ""
3845
3846
#: bzrlib/builtins.py:6094
3847
msgid "Reconfigure to be an unbound branch with no working tree."
3848
msgstr ""
3849
3850
#: bzrlib/builtins.py:6095
3851
msgid "Reconfigure to be an unbound branch with a working tree."
3852
msgstr ""
3853
3854
#: bzrlib/builtins.py:6096
3855
msgid "Reconfigure to be a bound branch with a working tree."
3856
msgstr ""
3857
3858
#: bzrlib/builtins.py:6097
3859
msgid "Reconfigure to be a lightweight checkout (with no local history)."
3860
msgstr ""
3861
3862
#: bzrlib/builtins.py:6102
3863
msgid "Repository type"
3864
msgstr ""
3865
3866
#: bzrlib/builtins.py:6103
3867
msgid "Location fo the repository."
3868
msgstr ""
3869
3870
#: bzrlib/builtins.py:6105
3871
msgid ""
3872
"Reconfigure to be a standalone branch (i.e. stop using shared repository)."
3873
msgstr ""
3874
3875
#: bzrlib/builtins.py:6107
3876
msgid "Reconfigure to use a shared repository."
3877
msgstr ""
3878
3879
#: bzrlib/builtins.py:6111
3880
msgid "Trees in Repository"
3881
msgstr ""
3882
3883
#: bzrlib/builtins.py:6112
3884
msgid "Whether new branches in the repository have trees."
3885
msgstr ""
3886
3887
#: bzrlib/builtins.py:6114
3888
msgid ""
3889
"Reconfigure repository to create working trees on branches by default."
3890
msgstr ""
3891
3892
#: bzrlib/builtins.py:6116
3893
msgid ""
3894
"Reconfigure repository to not create working trees on branches by default."
3895
msgstr ""
3896
3897
#: bzrlib/builtins.py:6119
3898
msgid "Branch to bind checkout to."
3899
msgstr ""
3900
3901
#: bzrlib/builtins.py:6121
3902
msgid "Perform reconfiguration even if local changes will be lost."
3903
msgstr ""
3904
3905
#: bzrlib/builtins.py:6124
3906
msgid "Reconfigure a branch to be stacked on another branch."
3907
msgstr ""
3908
3909
#: bzrlib/builtins.py:6128
3910
msgid ""
3911
"Reconfigure a branch to be unstacked. This may require copying substantial "
3912
"data into it."
3913
msgstr ""
3914
3915
#: bzrlib/builtins.py:6138
3916
msgid "Can't use both --stacked-on and --unstacked"
3917
msgstr ""
3918
3919
#: bzrlib/builtins.py:6152
3920
msgid "No target configuration specified"
3921
msgstr ""
3922
3923
#: bzrlib/builtins.py:6187
3924
msgid "Set the branch of a checkout and update."
3925
msgstr ""
3926
3927
#: bzrlib/builtins.py:6189
3928
msgid ""
3929
"For lightweight checkouts, this changes the branch being referenced.\n"
3930
"For heavyweight checkouts, this checks that there are no local commits\n"
3931
"versus the current bound branch, then it makes the local branch a mirror\n"
3932
"of the new location and binds to it."
3933
msgstr ""
3934
3935
#: bzrlib/builtins.py:6194
3936
msgid ""
3937
"In both cases, the working tree is updated and uncommitted changes\n"
3938
"are merged. The user can commit or revert these as they desire."
3939
msgstr ""
3940
3941
#: bzrlib/builtins.py:6197
3942
msgid "Pending merges need to be committed or reverted before using switch."
3943
msgstr ""
3944
3945
#: bzrlib/builtins.py:6199
3946
msgid ""
3947
"The path to the branch to switch to can be specified relative to the parent\n"
3948
"directory of the current branch. For example, if you are currently in a\n"
3949
"checkout of /path/to/branch, specifying 'newbranch' will find a branch at\n"
3950
"/path/to/newbranch."
3951
msgstr ""
3952
3953
#: bzrlib/builtins.py:6204
3954
msgid ""
3955
"Bound branches use the nickname of its master branch unless it is set\n"
3956
"locally, in which case switching will update the local nickname to be\n"
3957
"that of the master."
3958
msgstr ""
3959
3960
#: bzrlib/builtins.py:6212
3961
msgid "Switch even if local commits will be lost."
3962
msgstr ""
3963
3964
#: bzrlib/builtins.py:6215
3965
msgid "Create the target branch from this one before switching to it."
3966
msgstr ""
3967
3968
#: bzrlib/builtins.py:6229
3969
msgid "You must supply either a revision or a location"
3970
msgstr ""
3971
3972
#: bzrlib/builtins.py:6242
3973
msgid "cannot create branch without source branch"
3974
msgstr ""
3975
3976
#: bzrlib/builtins.py:6262
3977
msgid "Manage filtered views."
3978
msgstr ""
3979
3980
#: bzrlib/builtins.py:6264
3981
msgid ""
3982
"Views provide a mask over the tree so that users can focus on\n"
3983
"a subset of a tree when doing their work. After creating a view,\n"
3984
"commands that support a list of files - status, diff, commit, etc -\n"
3985
"effectively have that list of files implicitly given each time.\n"
3986
"An explicit list of files can still be given but those files\n"
3987
"must be within the current view."
3988
msgstr ""
3989
3990
#: bzrlib/builtins.py:6271
3991
msgid ""
3992
"In most cases, a view has a short life-span: it is created to make\n"
3993
"a selected change and is deleted once that change is committed.\n"
3994
"At other times, you may wish to create one or more named views\n"
3995
"and switch between them."
3996
msgstr ""
3997
3998
#: bzrlib/builtins.py:6276
3999
msgid ""
4000
"To disable the current view without deleting it, you can switch to\n"
4001
"the pseudo view called ``off``. This can be useful when you need\n"
4002
"to see the whole tree for an operation or two (e.g. merge) but\n"
4003
"want to switch back to your view after that."
4004
msgstr ""
4005
4006
#: bzrlib/builtins.py:6281
4007
msgid ""
4008
":Examples:\n"
4009
" To define the current view::"
4010
msgstr ""
4011
4012
#: bzrlib/builtins.py:6284
4013
msgid " bzr view file1 dir1 ..."
4014
msgstr ""
4015
4016
#: bzrlib/builtins.py:6286
4017
msgid " To list the current view::"
4018
msgstr ""
4019
4020
#: bzrlib/builtins.py:6288
4021
msgid " bzr view"
4022
msgstr ""
4023
4024
#: bzrlib/builtins.py:6290
4025
msgid " To delete the current view::"
4026
msgstr ""
4027
4028
#: bzrlib/builtins.py:6292
4029
msgid " bzr view --delete"
4030
msgstr ""
4031
4032
#: bzrlib/builtins.py:6294
4033
msgid " To disable the current view without deleting it::"
4034
msgstr ""
4035
4036
#: bzrlib/builtins.py:6296
4037
msgid " bzr view --switch off"
4038
msgstr ""
4039
4040
#: bzrlib/builtins.py:6298
4041
msgid " To define a named view and switch to it::"
4042
msgstr ""
4043
4044
#: bzrlib/builtins.py:6300
4045
msgid " bzr view --name view-name file1 dir1 ..."
4046
msgstr ""
4047
4048
#: bzrlib/builtins.py:6302
4049
msgid " To list a named view::"
4050
msgstr ""
4051
4052
#: bzrlib/builtins.py:6304
4053
msgid " bzr view --name view-name"
4054
msgstr ""
4055
4056
#: bzrlib/builtins.py:6306
4057
msgid " To delete a named view::"
4058
msgstr ""
4059
4060
#: bzrlib/builtins.py:6308
4061
msgid " bzr view --name view-name --delete"
4062
msgstr ""
4063
4064
#: bzrlib/builtins.py:6310
4065
msgid " To switch to a named view::"
4066
msgstr ""
4067
4068
#: bzrlib/builtins.py:6312
4069
msgid " bzr view --switch view-name"
4070
msgstr ""
4071
4072
#: bzrlib/builtins.py:6314
4073
msgid " To list all views defined::"
4074
msgstr ""
4075
4076
#: bzrlib/builtins.py:6316
4077
msgid " bzr view --all"
4078
msgstr ""
4079
4080
#: bzrlib/builtins.py:6318
4081
msgid " To delete all views::"
4082
msgstr ""
4083
4084
#: bzrlib/builtins.py:6320
4085
msgid " bzr view --delete --all"
4086
msgstr ""
4087
4088
#: bzrlib/builtins.py:6327
4089
msgid "Apply list or delete action to all views."
4090
msgstr ""
4091
4092
#: bzrlib/builtins.py:6330
4093
msgid "Delete the view."
4094
msgstr ""
4095
4096
#: bzrlib/builtins.py:6333
4097
msgid "Name of the view to define, list or delete."
4098
msgstr ""
4099
4100
#: bzrlib/builtins.py:6337
4101
msgid "Name of the view to switch to."
4102
msgstr ""
4103
4104
#: bzrlib/builtins.py:6356
4105
msgid "Both --delete and a file list specified"
4106
msgstr ""
4107
4108
#: bzrlib/builtins.py:6359
4109
msgid "Both --delete and --switch specified"
4110
msgstr ""
4111
4112
#: bzrlib/builtins.py:6362
4113
msgid "Deleted all views.\n"
4114
msgstr ""
4115
4116
#: bzrlib/builtins.py:6364
4117
msgid "No current view to delete"
4118
msgstr ""
4119
4120
#: bzrlib/builtins.py:6367
4121
#, python-format
4122
msgid "Deleted '%s' view.\n"
4123
msgstr ""
4124
4125
#: bzrlib/builtins.py:6371
4126
msgid "Both --switch and a file list specified"
4127
msgstr ""
4128
4129
#: bzrlib/builtins.py:6374
4130
msgid "Both --switch and --all specified"
4131
msgstr ""
4132
4133
#: bzrlib/builtins.py:6377
4134
msgid "No current view to disable"
4135
msgstr ""
4136
4137
#: bzrlib/builtins.py:6379
4138
#, python-format
4139
msgid "Disabled '%s' view.\n"
4140
msgstr ""
4141
4142
#: bzrlib/builtins.py:6383 bzrlib/builtins.py:6405
4143
msgid "Using '{0}' view: {1}\n"
4144
msgstr ""
4145
4146
#: bzrlib/builtins.py:6386
4147
msgid "Views defined:\n"
4148
msgstr ""
4149
4150
#: bzrlib/builtins.py:6395
4151
msgid "No views defined.\n"
4152
msgstr ""
4153
4154
#: bzrlib/builtins.py:6402
4155
msgid "Cannot change the 'off' pseudo view"
4156
msgstr ""
4157
4158
#: bzrlib/builtins.py:6410
4159
msgid "No current view.\n"
4160
msgstr ""
4161
4162
#: bzrlib/builtins.py:6413
4163
msgid "'{0}' view is: {1}\n"
4164
msgstr ""
4165
4166
#: bzrlib/builtins.py:6433
4167
msgid " <no hooks installed>\n"
4168
msgstr ""
4169
4170
#: bzrlib/builtins.py:6437
4171
msgid "Remove a branch."
4172
msgstr ""
4173
4174
#: bzrlib/builtins.py:6439
4175
msgid ""
4176
"This will remove the branch from the specified location but \n"
4177
"will keep any working tree or repository in place."
4178
msgstr ""
4179
4180
#: bzrlib/builtins.py:6444
4181
msgid " Remove the branch at repo/trunk::"
4182
msgstr ""
4183
4184
#: bzrlib/builtins.py:6446
4185
msgid " bzr remove-branch repo/trunk"
4186
msgstr ""
4187
4188
#: bzrlib/builtins.py:6461
4189
msgid "Plaintext diff output."
4190
msgstr ""
4191
4192
#: bzrlib/builtins.py:6462
4193
msgid "Temporarily set aside some changes from the current tree."
4194
msgstr ""
4195
4196
#: bzrlib/builtins.py:6464
4197
msgid ""
4198
"Shelve allows you to temporarily put changes you've made \"on the shelf\",\n"
4199
"ie. out of the way, until a later time when you can bring them back from\n"
4200
"the shelf with the 'unshelve' command. The changes are stored alongside\n"
4201
"your working tree, and so they aren't propagated along with your branch nor\n"
4202
"will they survive its deletion."
4203
msgstr ""
4204
4205
#: bzrlib/builtins.py:6470
4206
msgid "If shelve --list is specified, previously-shelved changes are listed."
4207
msgstr ""
4208
4209
#: bzrlib/builtins.py:6472
4210
msgid ""
4211
"Shelve is intended to help separate several sets of changes that have\n"
4212
"been inappropriately mingled. If you just want to get rid of all changes\n"
4213
"and you don't need to restore them later, use revert. If you want to\n"
4214
"shelve all text changes at once, use shelve --all."
4215
msgstr ""
4216
4217
#: bzrlib/builtins.py:6477
4218
msgid ""
4219
"If filenames are specified, only the changes to those files will be\n"
4220
"shelved. Other files will be left untouched."
4221
msgstr ""
4222
4223
#: bzrlib/builtins.py:6480
4224
msgid ""
4225
"If a revision is specified, changes since that revision will be shelved."
4226
msgstr ""
4227
4228
#: bzrlib/builtins.py:6482
4229
msgid ""
4230
"You can put multiple items on the shelf, and by default, 'unshelve' will\n"
4231
"restore the most recently shelved changes."
4232
msgstr ""
4233
4234
#: bzrlib/builtins.py:6485
4235
msgid ""
4236
"For complicated changes, it is possible to edit the changes in a separate\n"
4237
"editor program to decide what the file remaining in the working copy\n"
4238
"should look like. To do this, add the configuration option"
4239
msgstr ""
4240
4241
#: bzrlib/builtins.py:6489
4242
msgid " change_editor = PROGRAM @new_path @old_path"
4243
msgstr ""
4244
4245
#: bzrlib/builtins.py:6491
4246
msgid ""
4247
"where @new_path is replaced with the path of the new version of the \n"
4248
"file and @old_path is replaced with the path of the old version of \n"
4249
"the file. The PROGRAM should save the new file with the desired \n"
4250
"contents of the file in the working tree.\n"
4251
" "
4252
msgstr ""
4253
4254
#: bzrlib/builtins.py:6503
4255
msgid "Shelve all changes."
4256
msgstr ""
4257
4258
#: bzrlib/builtins.py:6505
4259
msgid "Method to use for writing diffs."
4260
msgstr ""
4261
4262
#: bzrlib/builtins.py:6505
4263
msgid "writer"
4264
msgstr ""
4265
4266
#: bzrlib/builtins.py:6509
4267
msgid "List shelved changes."
4268
msgstr ""
4269
4270
#: bzrlib/builtins.py:6511
4271
msgid "Destroy removed changes instead of shelving them."
4272
msgstr ""
4273
4274
#: bzrlib/builtins.py:6540
4275
msgid "No shelved changes."
4276
msgstr ""
4277
4278
#: bzrlib/builtins.py:6551
4279
msgid "Restore shelved changes."
4280
msgstr ""
4281
4282
#: bzrlib/builtins.py:6553
4283
msgid ""
4284
"By default, the most recently shelved changes are restored. However if you\n"
4285
"specify a shelf by id those changes will be restored instead. This works\n"
4286
"best when the changes don't depend on each other."
4287
msgstr ""
4288
4289
#: bzrlib/builtins.py:6562
4290
msgid "The action to perform."
4291
msgstr ""
4292
4293
#: bzrlib/builtins.py:6562 bzrlib/conflicts.py:694
4294
msgid "action"
4295
msgstr ""
4296
4297
#: bzrlib/builtins.py:6564
4298
msgid "Apply changes and remove from the shelf."
4299
msgstr ""
4300
4301
#: bzrlib/builtins.py:6565
4302
msgid "Show changes, but do not apply or remove them."
4303
msgstr ""
4304
4305
#: bzrlib/builtins.py:6566
4306
msgid ""
4307
"Instead of unshelving the changes, show the diff that would result from "
4308
"unshelving."
4309
msgstr ""
4310
4311
#: bzrlib/builtins.py:6568
4312
msgid "Delete changes without applying them."
4313
msgstr ""
4314
4315
#: bzrlib/builtins.py:6569
4316
msgid "Apply changes but don't delete them."
4317
msgstr ""
4318
4319
#: bzrlib/builtins.py:6584
4320
msgid "Remove unwanted files from working tree."
4321
msgstr ""
4322
4323
#: bzrlib/builtins.py:6586
4324
msgid ""
4325
"By default, only unknown files, not ignored files, are deleted. Versioned\n"
4326
"files are never deleted."
4327
msgstr ""
4328
4329
#: bzrlib/builtins.py:6589
4330
msgid ""
4331
"Another class is 'detritus', which includes files emitted by bzr during\n"
4332
"normal operations and selftests. (The value of these files decreases with\n"
4333
"time.)"
4334
msgstr ""
4335
4336
#: bzrlib/builtins.py:6593
4337
msgid ""
4338
"If no options are specified, unknown files are deleted. Otherwise, option\n"
4339
"flags are respected, and may be combined."
4340
msgstr ""
4341
4342
#: bzrlib/builtins.py:6596
4343
msgid "To check what clean-tree will do, use --dry-run."
4344
msgstr ""
4345
4346
#: bzrlib/builtins.py:6599
4347
msgid "Delete all ignored files."
4348
msgstr ""
4349
4350
#: bzrlib/builtins.py:6600
4351
msgid ""
4352
"Delete conflict files, merge and revert backups, and failed selftest dirs."
4353
msgstr ""
4354
4355
#: bzrlib/builtins.py:6603
4356
msgid "Delete files unknown to bzr (default)."
4357
msgstr ""
4358
4359
#: bzrlib/builtins.py:6604
4360
msgid "Show files to delete instead of deleting them."
4361
msgstr ""
4362
4363
#: bzrlib/builtins.py:6606
4364
msgid "Do not prompt before deleting."
4365
msgstr ""
4366
4367
#: bzrlib/bundle/__init__.py:59
4368
msgid "A directory cannot be a bundle"
4369
msgstr ""
4370
4371
#: bzrlib/bundle/apply_bundle.py:40
4372
msgid "Install revisions"
4373
msgstr ""
4374
4375
#: bzrlib/bundle/commands.py:64
4376
msgid "--verbose requires a merge directive"
4377
msgstr ""
4378
4379
#: bzrlib/bundle/commands.py:67
4380
msgid "Bundle format not supported"
4381
msgstr ""
4382
4383
#: bzrlib/bundle/commands.py:77
4384
msgid "Records\n"
4385
msgstr ""
4386
4387
#: bzrlib/bundle/commands.py:81
4388
msgid "{0}: {1} ({2} multiparent)\n"
4389
msgstr ""
4390
4391
#: bzrlib/bundle/commands.py:83
4392
#, python-format
4393
msgid "unique files: %d\n"
4394
msgstr ""
4395
4396
#: bzrlib/bundle/commands.py:92
4397
msgid "Revisions\n"
4398
msgstr ""
4399
4400
#: bzrlib/bundle/commands.py:93
4401
#, python-format
4402
msgid "nicks: %s\n"
4403
msgstr ""
4404
4405
#: bzrlib/bundle/commands.py:95
4406
#, python-format
4407
msgid ""
4408
"committers: \n"
4409
"%s\n"
4410
msgstr ""
4411
4412
#: bzrlib/bundle/commands.py:103
4413
msgid "Decoded contents\n"
4414
msgstr ""
4415
4416
#: bzrlib/bundle/serializer/v4.py:327
4417
#, python-format
4418
msgid "Bundling %d revision."
4419
msgid_plural "Bundling %d revisions."
4420
msgstr[0] ""
4421
msgstr[1] ""
4422
4423
#: bzrlib/bzrdir.py:490
4424
msgid ""
4425
"making backup of {0}\n"
4426
" to {1}"
4427
msgstr ""
4428
4429
#: bzrlib/bzrdir.py:513
4430
msgid "renamed {0} to {1}"
4431
msgstr ""
4432
4433
#: bzrlib/bzrdir.py:1652
4434
#, python-format
4435
msgid ""
4436
"Source repository format does not support stacking, using format:\n"
4437
" %s"
4438
msgstr ""
4439
4440
#: bzrlib/bzrdir.py:1672
4441
#, python-format
4442
msgid ""
4443
"Source branch format does not support stacking, using format:\n"
4444
" %s"
4445
msgstr ""
4446
4447
#: bzrlib/bzrdir.py:1818
4448
msgid "starting repository conversion"
4449
msgstr ""
4450
4451
#: bzrlib/bzrdir.py:2039
4452
msgid "Using default stacking branch {0} at {1}"
4453
msgstr ""
4454
4455
#: bzrlib/check.py:108
4456
msgid "check"
4457
msgstr ""
4458
4459
#: bzrlib/check.py:110
4460
msgid "checking revisions"
4461
msgstr ""
4462
4463
#: bzrlib/check.py:112
4464
msgid "checking commit contents"
4465
msgstr ""
4466
4467
#: bzrlib/check.py:114
4468
msgid "checking file graphs"
4469
msgstr ""
4470
4471
#: bzrlib/check.py:118
4472
msgid "checking branches and trees"
4473
msgstr ""
4474
4475
#: bzrlib/check.py:205
4476
msgid "checked repository {0} format {1}"
4477
msgstr ""
4478
4479
#: bzrlib/check.py:208
4480
#, python-format
4481
msgid "%6d revisions"
4482
msgstr ""
4483
4484
#: bzrlib/check.py:209
4485
#, python-format
4486
msgid "%6d file-ids"
4487
msgstr ""
4488
4489
#: bzrlib/check.py:211
4490
#, python-format
4491
msgid "%6d unreferenced text versions"
4492
msgstr ""
4493
4494
#: bzrlib/check.py:215
4495
msgid "unreferenced version: {{{0}}} in {1}"
4496
msgstr ""
4497
4498
#: bzrlib/check.py:218
4499
#, python-format
4500
msgid "%6d revisions are missing inventory_sha1"
4501
msgstr ""
4502
4503
#: bzrlib/check.py:221
4504
#, python-format
4505
msgid "%6d revisions are mentioned but not present"
4506
msgstr ""
4507
4508
#: bzrlib/check.py:224
4509
#, python-format
4510
msgid "%6d ghost revisions"
4511
msgstr ""
4512
4513
#: bzrlib/check.py:229
4514
#, python-format
4515
msgid "%6d revisions missing parents in ancestry"
4516
msgstr ""
4517
4518
#: bzrlib/check.py:233
4519
#, python-format
4520
msgid " %s should be in the ancestry for:"
4521
msgstr ""
4522
4523
#: bzrlib/check.py:237
4524
#, python-format
4525
msgid "%6d inconsistent parents"
4526
msgstr ""
4527
4528
#: bzrlib/check.py:241
4529
msgid " * {0} version {1} has parents {2!r} but should have {3!r}"
4530
msgstr ""
4531
4532
#: bzrlib/check.py:247
4533
#, python-format
4534
msgid "%6d revisions have incorrect parents in the revision index"
4535
msgstr ""
4536
4537
#: bzrlib/check.py:253
4538
msgid " {0} has wrong parents in index: {1!r} should be {2!r}"
4539
msgstr ""
4540
4541
#: bzrlib/check.py:267
4542
msgid "Mismatched internal revid {{{0}}} and index revid {{{1}}}"
4543
msgstr ""
4544
4545
#: bzrlib/check.py:296
4546
msgid ""
4547
"Multiple expected sha1s for {0}. {{{1}}} expects {{{2}}}, {{{3}}} expects "
4548
"{{{4}}}"
4549
msgstr ""
4550
4551
#: bzrlib/check.py:354
4552
#, python-format
4553
msgid "Checking branch at '%s'."
4554
msgstr ""
4555
4556
#: bzrlib/check.py:374
4557
#, python-format
4558
msgid "Checking working tree at '%s'."
4559
msgstr ""
4560
4561
#: bzrlib/check.py:427 bzrlib/check.py:441
4562
msgid "No branch found at specified location."
4563
msgstr ""
4564
4565
#: bzrlib/check.py:429 bzrlib/check.py:439
4566
msgid "No working tree found at specified location."
4567
msgstr ""
4568
4569
#: bzrlib/check.py:432
4570
#, python-format
4571
msgid "Checking repository at '%s'."
4572
msgstr ""
4573
4574
#: bzrlib/check.py:443
4575
msgid "No repository found at specified location."
4576
msgstr ""
4577
4578
#: bzrlib/clean_tree.py:63
4579
msgid "Nothing to delete."
4580
msgstr ""
4581
4582
#: bzrlib/clean_tree.py:68
4583
msgid "Are you sure you wish to delete these"
4584
msgstr ""
4585
4586
#: bzrlib/clean_tree.py:70
4587
msgid "Canceled"
4588
msgstr ""
4589
4590
#: bzrlib/clean_tree.py:107
4591
#, python-format
4592
msgid "unable to remove %s"
4593
msgstr ""
4594
4595
#: bzrlib/clean_tree.py:111
4596
msgid "deleting paths:"
4597
msgstr ""
4598
4599
#: bzrlib/clean_tree.py:125
4600
msgid "unable to remove \"{0}\": {1}."
4601
msgstr ""
4602
4603
#: bzrlib/clean_tree.py:130
4604
msgid "No files deleted."
4605
msgstr ""
4606
4607
#: bzrlib/cmd_version_info.py:47
4608
msgid "No known version info format {0}. Supported types are: {1}"
4609
msgstr ""
4610
4611
#: bzrlib/cmd_version_info.py:52
4612
msgid "Version info in Custom template-based format."
4613
msgstr ""
4614
4615
#: bzrlib/cmd_version_info.py:52
4616
msgid "Version info in Python format."
4617
msgstr ""
4618
4619
#: bzrlib/cmd_version_info.py:52
4620
msgid "Version info in RIO (simple text) format (default)."
4621
msgstr ""
4622
4623
#: bzrlib/cmd_version_info.py:53
4624
msgid "Show version information about this tree."
4625
msgstr ""
4626
4627
#: bzrlib/cmd_version_info.py:55
4628
msgid ""
4629
"You can use this command to add information about version into\n"
4630
"source code of an application. The output can be in one of the\n"
4631
"supported formats or in a custom format based on a template."
4632
msgstr ""
4633
4634
#: bzrlib/cmd_version_info.py:59 en/help_topics/configuration.txt:700
4635
#: en/help_topics/configuration.txt:710
4636
msgid "For example::"
4637
msgstr ""
4638
4639
#: bzrlib/cmd_version_info.py:61
4640
msgid ""
4641
" bzr version-info --custom \\\n"
4642
" --template=\"#define VERSION_INFO \\\"Project 1.2.3 (r{revno})\\\"\\n\""
4643
msgstr ""
4644
4645
#: bzrlib/cmd_version_info.py:64
4646
msgid ""
4647
"will produce a C header file with formatted string containing the\n"
4648
"current revision number. Other supported variables in templates are:"
4649
msgstr ""
4650
4651
#: bzrlib/cmd_version_info.py:67
4652
msgid ""
4653
" * {date} - date of the last revision\n"
4654
" * {build_date} - current date\n"
4655
" * {revno} - revision number\n"
4656
" * {revision_id} - revision id\n"
4657
" * {branch_nick} - branch nickname\n"
4658
" * {clean} - 0 if the source tree contains uncommitted changes,\n"
4659
" otherwise 1"
4660
msgstr ""
4661
4662
#: bzrlib/cmd_version_info.py:77
4663
msgid "Select the output format."
4664
msgstr ""
4665
4666
#: bzrlib/cmd_version_info.py:81
4667
msgid "Include all possible information."
4668
msgstr ""
4669
4670
#: bzrlib/cmd_version_info.py:82
4671
msgid "Check if tree is clean."
4672
msgstr ""
4673
4674
#: bzrlib/cmd_version_info.py:84
4675
msgid "Include the revision-history."
4676
msgstr ""
4677
4678
#: bzrlib/cmd_version_info.py:86
4679
msgid "Include the last revision for each file."
4680
msgstr ""
4681
4682
#: bzrlib/cmd_version_info.py:87
4683
msgid "Template for the output."
4684
msgstr ""
4685
4686
#: bzrlib/cmd_version_info.py:101
4687
msgid "bzr version-info --revision takes exactly one revision specifier"
4688
msgstr ""
4689
4690
#: bzrlib/commands.py:229
4691
#, python-format
4692
msgid "unknown command \"%s\""
4693
msgstr ""
4694
4695
#: bzrlib/commands.py:476
4696
msgid "No help for this command."
4697
msgstr ""
4698
4699
#: bzrlib/commands.py:489
4700
#, python-format
4701
msgid ":Purpose: %s\n"
4702
msgstr ""
4703
4704
#: bzrlib/commands.py:491
4705
#, python-format
4706
msgid ""
4707
":Usage:\n"
4708
"%s\n"
4709
msgstr ""
4710
4711
#: bzrlib/commands.py:493
4712
#, python-format
4713
msgid ":Usage: %s\n"
4714
msgstr ""
4715
4716
#: bzrlib/commands.py:512
4717
#, python-format
4718
msgid ":Options:%s"
4719
msgstr ""
4720
4721
#: bzrlib/commands.py:523
4722
#, python-format
4723
msgid ""
4724
":Description:\n"
4725
" %s\n"
4726
"\n"
4727
msgstr ""
4728
4729
#: bzrlib/commands.py:533
4730
#, python-format
4731
msgid ""
4732
"See bzr help %s for more details and examples.\n"
4733
"\n"
4734
msgstr ""
4735
4736
#: bzrlib/commands.py:538
4737
msgid ":Aliases: "
4738
msgstr ""
4739
4740
#: bzrlib/commands.py:542
4741
#, python-format
4742
msgid ":From: plugin \"%s\"\n"
4743
msgstr ""
4744
4745
#: bzrlib/commands.py:554
4746
msgid ":doc:`{0} <{1}-help>`"
4747
msgstr ""
4748
4749
#: bzrlib/commands.py:558
4750
#, python-format
4751
msgid ":See also: %s"
4752
msgstr ""
4753
4754
#: bzrlib/commands.py:816 bzrlib/gpg.py:324
4755
msgid "Only ASCII permitted in option names"
4756
msgstr ""
4757
4758
#: bzrlib/commands.py:841 bzrlib/commands.py:849
4759
msgid "command {0!r} needs one or more {1}"
4760
msgstr ""
4761
4762
#: bzrlib/commands.py:858
4763
msgid "command {0!r} requires argument {1}"
4764
msgstr ""
4765
4766
#: bzrlib/commands.py:865
4767
msgid "extra argument to command {0}: {1}"
4768
msgstr ""
4769
4770
#: bzrlib/commands.py:962
4771
#, python-format
4772
msgid "Profile data written to \"%s\"."
4773
msgstr ""
4774
4775
#: bzrlib/commit.py:117 bzrlib/commit.py:740
4776
msgid "added"
4777
msgstr ""
4778
4779
#: bzrlib/commit.py:117 bzrlib/commit.py:748
4780
msgid "modified"
4781
msgstr ""
4782
4783
#: bzrlib/commit.py:131
4784
#, python-format
4785
msgid "Committing%s"
4786
msgstr ""
4787
4788
#: bzrlib/commit.py:134
4789
#, python-format
4790
msgid "Committed revision %d."
4791
msgstr ""
4792
4793
#: bzrlib/commit.py:143
4794
#, python-format
4795
msgid "deleted %s"
4796
msgstr ""
4797
4798
#: bzrlib/commit.py:146
4799
#, python-format
4800
msgid "missing %s"
4801
msgstr ""
4802
4803
#: bzrlib/commit.py:511
4804
msgid ""
4805
"Conflicting tags in bound branch:\n"
4806
"{0}"
4807
msgstr ""
4808
4809
#: bzrlib/commit.py:742
4810
msgid "renamed"
4811
msgstr ""
4812
4813
#: bzrlib/commit.py:977
4814
msgid "unchanged"
4815
msgstr ""
4816
4817
#: bzrlib/commit.py:999
4818
msgid "{0} [{1}] - Stage"
4819
msgstr ""
4820
4821
#: bzrlib/commit.py:1002
4822
#, python-format
4823
msgid "%s - Stage"
4824
msgstr ""
4825
4826
#: bzrlib/commit_signature_commands.py:36
4827
msgid "Sign all commits by a given committer."
4828
msgstr ""
4829
4830
#: bzrlib/commit_signature_commands.py:38
4831
msgid ""
4832
"If location is not specified the local tree is used.\n"
4833
"If committer is not specified the default committer is used."
4834
msgstr ""
4835
4836
#: bzrlib/commit_signature_commands.py:41
4837
msgid "This does not sign commits that already have signatures."
4838
msgstr ""
4839
4840
#: bzrlib/commit_signature_commands.py:49
4841
msgid ""
4842
"Don't actually sign anything, just print the revisions that would be signed."
4843
msgstr ""
4844
4845
#: bzrlib/commit_signature_commands.py:103
4846
msgid "Verify all commit signatures."
4847
msgstr ""
4848
4849
#: bzrlib/commit_signature_commands.py:105
4850
msgid ""
4851
"Verifies that all commits in the branch are signed by known GnuPG keys."
4852
msgstr ""
4853
4854
#: bzrlib/commit_signature_commands.py:110
4855
msgid ""
4856
"Comma separated list of GPG key patterns which are acceptable for "
4857
"verification."
4858
msgstr ""
4859
4860
#: bzrlib/commit_signature_commands.py:147
4861
msgid "Cannot verify a range of non-revision-history revisions"
4862
msgstr ""
4863
4864
#: bzrlib/commit_signature_commands.py:168
4865
msgid "All commits signed with verifiable keys"
4866
msgstr ""
4867
4868
#: bzrlib/config.py:475
4869
msgid "Invalid config value for \"{0}\" value {1!r} is not an SI unit."
4870
msgstr ""
4871
4872
#: bzrlib/config.py:2485
4873
msgid "{0} is not an SI unit."
4874
msgstr "{0} is not an SI unit."
4875
4876
#: bzrlib/config.py:2949
4877
msgid ""
4878
"Option {0} in section {1} of {2} was changed from {3} to {4}. The {5} value "
4879
"will be saved."
4880
msgstr ""
4881
"Option {0} in section {1} of {2} was changed from {3} to {4}. The {5} value "
4882
"will be saved."
4883
4884
#: bzrlib/config.py:3093
4885
#, python-format
4886
msgid "Invalid '%s', should be of the form 'name=value'"
4887
msgstr ""
4888
4889
#: bzrlib/config.py:3962
4890
msgid "Display, set or remove a configuration option."
4891
msgstr ""
4892
4893
#: bzrlib/config.py:3964
4894
msgid "Display the active value for a given option."
4895
msgstr ""
4896
4897
#: bzrlib/config.py:3966
4898
msgid ""
4899
"If --all is specified, NAME is interpreted as a regular expression and all\n"
4900
"matching options are displayed mentioning their scope. The active value\n"
4901
"that bzr will take into account is the first one displayed for each option."
4902
msgstr ""
4903
4904
#: bzrlib/config.py:3970
4905
msgid "If no NAME is given, --all .* is implied."
4906
msgstr ""
4907
4908
#: bzrlib/config.py:3972
4909
msgid ""
4910
"Setting a value is achieved by using name=value without spaces. The value\n"
4911
"is set in the most relevant scope and can be checked by displaying the\n"
4912
"option again."
4913
msgstr ""
4914
4915
#: bzrlib/config.py:3984
4916
msgid "Reduce the scope to the specified configuration file."
4917
msgstr ""
4918
4919
#: bzrlib/config.py:3988
4920
msgid "Display all the defined values for the matching options."
4921
msgstr ""
4922
4923
#: bzrlib/config.py:3990
4924
msgid "Remove the option from the configuration file."
4925
msgstr ""
4926
4927
#: bzrlib/conflicts.py:50
4928
msgid "List files with conflicts."
4929
msgstr ""
4930
4931
#: bzrlib/conflicts.py:57
4932
msgid ""
4933
"Conflicts normally are listed as short, human-readable messages. If --text\n"
4934
"is supplied, the pathnames of files with text conflicts are listed,\n"
4935
"instead. (This is useful for editing all files with text conflicts.)"
4936
msgstr ""
4937
4938
#: bzrlib/conflicts.py:61
4939
msgid "Use bzr resolve when you have fixed a problem."
4940
msgstr ""
4941
4942
#: bzrlib/conflicts.py:66
4943
msgid "List paths of files with text conflicts."
4944
msgstr ""
4945
4946
#: bzrlib/conflicts.py:85
4947
msgid "Marks the conflict as resolved."
4948
msgstr ""
4949
4950
#: bzrlib/conflicts.py:88
4951
msgid "Resolve the conflict preserving the version in the working tree."
4952
msgstr ""
4953
4954
#: bzrlib/conflicts.py:91
4955
msgid "Resolve the conflict taking the merged version into account."
4956
msgstr ""
4957
4958
#: bzrlib/conflicts.py:98
4959
msgid "How to resolve the conflict."
4960
msgstr ""
4961
4962
#: bzrlib/conflicts.py:104
4963
msgid "Mark a conflict as resolved."
4964
msgstr ""
4965
4966
#: bzrlib/conflicts.py:111
4967
msgid ""
4968
"Once you have fixed a problem, use \"bzr resolve\" to automatically mark\n"
4969
"text conflicts as fixed, \"bzr resolve FILE\" to mark a specific conflict "
4970
"as\n"
4971
"resolved, or \"bzr resolve --all\" to mark all conflicts as resolved."
4972
msgstr ""
4973
4974
#: bzrlib/conflicts.py:119
4975
msgid "Resolve all conflicts in this tree."
4976
msgstr ""
4977
4978
#: bzrlib/conflicts.py:126
4979
msgid "If --all is specified, no FILE may be provided"
4980
msgstr ""
4981
4982
#: bzrlib/conflicts.py:151
4983
#, python-format
4984
msgid "%d conflict auto-resolved."
4985
msgid_plural "%d conflicts auto-resolved."
4986
msgstr[0] ""
4987
msgstr[1] ""
4988
4989
#: bzrlib/conflicts.py:154
4990
msgid "Remaining conflicts:"
4991
msgstr ""
4992
4993
#: bzrlib/conflicts.py:159
4994
msgid "All conflicts resolved."
4995
msgstr ""
4996
4997
#: bzrlib/conflicts.py:168
4998
msgid "{0} conflict resolved, {1} remaining"
4999
msgid_plural "{0} conflicts resolved, {1} remaining"
5000
msgstr[0] ""
5001
msgstr[1] ""
5002
5003
#: bzrlib/controldir.py:710
5004
msgid "{0} is{1} redirected to {2}"
5005
msgstr ""
5006
5007
#: bzrlib/diff.py:399
5008
#, python-format
5009
msgid "*** Ignoring files outside view. View is %s"
5010
msgstr ""
5011
5012
#: bzrlib/errors.py:157
5013
msgid "The tree builder is already building a tree."
5014
msgstr ""
5015
5016
#: bzrlib/errors.py:178
5017
msgid "The dirstate file (%(state)s) appears to be corrupt: %(msg)s"
5018
msgstr ""
5019
5020
#: bzrlib/errors.py:197
5021
msgid ""
5022
"The API for \"%(api)s\" is not compatible with \"%(wanted)s\". It supports "
5023
"versions \"%(minimum)s\" to \"%(current)s\"."
5024
msgstr ""
5025
5026
#: bzrlib/errors.py:209
5027
msgid "The transport '%(transport)s' is only accessible within this process."
5028
msgstr ""
5029
5030
#: bzrlib/errors.py:227
5031
msgid "Invalid revision number %(revno)s"
5032
msgstr ""
5033
5034
#: bzrlib/errors.py:236
5035
msgid "Invalid revision-id {%(revision_id)s} in %(branch)s"
5036
msgstr ""
5037
5038
#: bzrlib/errors.py:247
5039
msgid "Reserved revision-id {%(revision_id)s}"
5040
msgstr ""
5041
5042
#: bzrlib/errors.py:261
5043
msgid "There is no public branch set for \"%(branch_url)s\"."
5044
msgstr ""
5045
5046
#: bzrlib/errors.py:271
5047
msgid ""
5048
"No help could be found for '%(topic)s'. Please use 'bzr help topics' to "
5049
"obtain a list of topics."
5050
msgstr ""
5051
5052
#: bzrlib/errors.py:280
5053
msgid "The file id \"%(file_id)s\" is not present in the tree %(tree)s."
5054
msgstr ""
5055
5056
#: bzrlib/errors.py:290
5057
msgid ""
5058
"The file id \"%(file_id)s\" is not present in the repository %(repository)r"
5059
msgstr ""
5060
5061
#: bzrlib/errors.py:299
5062
msgid "The branch '%(branch)s' is not stacked."
5063
msgstr ""
5064
5065
#: bzrlib/errors.py:313
5066
msgid "No WorkingTree exists for \"%(base)s\"."
5067
msgstr ""
5068
5069
#: bzrlib/errors.py:322
5070
msgid "Not currently building a tree."
5071
msgstr ""
5072
5073
#: bzrlib/errors.py:327
5074
msgid "%(url)s is not a local path."
5075
msgstr ""
5076
5077
#: bzrlib/errors.py:355
5078
msgid "%(not_locked)r is not write locked but needs to be."
5079
msgstr ""
5080
5081
#: bzrlib/errors.py:363
5082
msgid "Error in command line options"
5083
msgstr ""
5084
5085
#: bzrlib/errors.py:368
5086
msgid "%(value)s is not an index of type %(_type)s."
5087
msgstr ""
5088
5089
#: bzrlib/errors.py:378
5090
msgid "Error in data for index %(value)s."
5091
msgstr ""
5092
5093
#: bzrlib/errors.py:387
5094
msgid "The key '%(key)s' is already in index '%(index)s'."
5095
msgstr ""
5096
5097
#: bzrlib/errors.py:397
5098
msgid "The key '%(key)s' is not a valid key."
5099
msgstr ""
5100
5101
#: bzrlib/errors.py:406
5102
msgid "Could not parse options for index %(value)s."
5103
msgstr ""
5104
5105
#: bzrlib/errors.py:415
5106
msgid "The value '%(value)s' is not a valid value."
5107
msgstr ""
5108
5109
#: bzrlib/errors.py:424
5110
msgid "Bad value \"%(value)s\" for option \"%(name)s\"."
5111
msgstr ""
5112
5113
#: bzrlib/errors.py:443
5114
msgid "Generic path error: %(path)r%(extra)s)"
5115
msgstr ""
5116
5117
#: bzrlib/errors.py:456
5118
msgid "No such file: %(path)r%(extra)s"
5119
msgstr ""
5120
5121
#: bzrlib/errors.py:461
5122
msgid "File exists: %(path)r%(extra)s"
5123
msgstr ""
5124
5125
#: bzrlib/errors.py:467
5126
msgid ""
5127
"Could not rename %(source)s => %(dest)s because both files exist. (Use --"
5128
"after to tell bzr about a rename that has already happened)%(extra)s"
5129
msgstr ""
5130
5131
#: bzrlib/errors.py:483
5132
msgid "\"%(path)s\" is not a directory %(extra)s"
5133
msgstr ""
5134
5135
#: bzrlib/errors.py:488
5136
msgid "\"%(path)s\" is not in the working directory %(extra)s"
5137
msgstr ""
5138
5139
#: bzrlib/errors.py:493
5140
msgid "Directory not empty: \"%(path)s\"%(extra)s"
5141
msgstr ""
5142
5143
#: bzrlib/errors.py:498
5144
msgid "Hard-linking \"%(path)s\" is not supported"
5145
msgstr ""
5146
5147
#: bzrlib/errors.py:513
5148
msgid "Device or resource busy: \"%(path)s\"%(extra)s"
5149
msgstr ""
5150
5151
#: bzrlib/errors.py:518
5152
msgid "Permission denied: \"%(path)s\"%(extra)s"
5153
msgstr ""
5154
5155
#: bzrlib/errors.py:523
5156
msgid "Invalid url supplied to transport: \"%(path)s\"%(extra)s"
5157
msgstr ""
5158
5159
#: bzrlib/errors.py:528
5160
msgid "Invalid URL join request: %(reason)s: %(base)r + %(join_args)r"
5161
msgstr ""
5162
5163
#: bzrlib/errors.py:539
5164
msgid "URLs differ by more than path: %(from_)r and %(to)r"
5165
msgstr ""
5166
5167
#: bzrlib/errors.py:561
5168
msgid "The %(type)s hook '%(hook)s' is unknown in this version of bzrlib."
5169
msgstr ""
5170
5171
#: bzrlib/errors.py:571
5172
msgid "Unsupported protocol for url \"%(path)s\"%(extra)s"
5173
msgstr ""
5174
5175
#: bzrlib/errors.py:579
5176
msgid ""
5177
"The branch '%(url)s'(%(format)s) is not a stackable format. You will need to "
5178
"upgrade the branch to permit branch stacking."
5179
msgstr ""
5180
5181
#: bzrlib/errors.py:590
5182
msgid "The branch '%(branch_url)s' cannot be stacked on '%(target_url)s'."
5183
msgstr ""
5184
5185
#: bzrlib/errors.py:600
5186
msgid ""
5187
"The repository '%(url)s'(%(format)s) is not a stackable format. You will "
5188
"need to upgrade the repository to permit branch stacking."
5189
msgstr ""
5190
5191
#: bzrlib/errors.py:611
5192
msgid "Error reading from %(path)r."
5193
msgstr ""
5194
5195
#: bzrlib/errors.py:630
5196
msgid "Path \"%(path)s\" is not a child of path \"%(base)s\"%(extra)s"
5197
msgstr ""
5198
5199
#: bzrlib/errors.py:646
5200
msgid "Path \"%(path)s\" is not unicode normalized"
5201
msgstr ""
5202
5203
#: bzrlib/errors.py:654
5204
msgid "Not a branch: \"%(path)s\"%(detail)s."
5205
msgstr ""
5206
5207
#: bzrlib/errors.py:696
5208
msgid "No submit branch available for branch \"%(path)s\""
5209
msgstr ""
5210
5211
#: bzrlib/errors.py:705
5212
msgid "A control directory already exists: \"%(path)s\"."
5213
msgstr ""
5214
5215
#: bzrlib/errors.py:710
5216
msgid "Already a branch: \"%(path)s\"."
5217
msgstr ""
5218
5219
#: bzrlib/errors.py:715
5220
msgid "Parent branch already exists: \"%(path)s\"."
5221
msgstr ""
5222
5223
#: bzrlib/errors.py:721
5224
msgid ""
5225
"Directory contains a branch, but no working tree (use bzr checkout if you "
5226
"wish to build a working tree): \"%(path)s\""
5227
msgstr ""
5228
5229
#: bzrlib/errors.py:726
5230
msgid ""
5231
"\"%(function)s\" called on an AtomicFile after it was closed: \"%(path)s\""
5232
msgstr ""
5233
5234
#: bzrlib/errors.py:736
5235
msgid ""
5236
"Parent not accessible given base \"%(base)s\" and relative path \"%(path)s\""
5237
msgstr ""
5238
5239
#: bzrlib/errors.py:746
5240
msgid "No repository present: \"%(path)s\""
5241
msgstr ""
5242
5243
#: bzrlib/errors.py:753
5244
msgid ""
5245
"Unsupported branch format: %(format)s\n"
5246
"Please run 'bzr upgrade'"
5247
msgstr ""
5248
5249
#: bzrlib/errors.py:759
5250
msgid "Unknown %(kind)s format: %(format)r"
5251
msgstr ""
5252
5253
#: bzrlib/errors.py:768
5254
msgid "Format %(format)s is not compatible with .bzr version %(bzrdir)s."
5255
msgstr ""
5256
5257
#: bzrlib/errors.py:778
5258
msgid "Parse error on line %(lineno)d of %(format)s format: %(line)s"
5259
msgstr "Parse error on line %(lineno)d of %(format)s format: %(line)s"
5260
5261
#: bzrlib/errors.py:793
5262
msgid ""
5263
"%(target)s\n"
5264
"is not compatible with\n"
5265
"%(source)s\n"
5266
"%(details)s"
5267
msgstr ""
5268
5269
#: bzrlib/errors.py:809
5270
msgid "Revision is not compatible with %(repo_format)s"
5271
msgstr ""
5272
5273
#: bzrlib/errors.py:819
5274
msgid "%(context_info)s%(path)s is already versioned."
5275
msgstr ""
5276
5277
#: bzrlib/errors.py:840
5278
msgid "%(context_info)s%(path)s is not versioned."
5279
msgstr ""
5280
5281
#: bzrlib/errors.py:861
5282
msgid "Path(s) are not versioned: %(paths_as_string)s"
5283
msgstr ""
5284
5285
#: bzrlib/errors.py:872
5286
msgid "Path(s) do not exist: %(paths_as_string)s%(extra)s"
5287
msgstr ""
5288
5289
#: bzrlib/errors.py:891
5290
msgid "Cannot operate on \"%(filename)s\" of unsupported kind \"%(kind)s\""
5291
msgstr ""
5292
5293
#: bzrlib/errors.py:899
5294
msgid ""
5295
"Filename %(filename)r is not valid in your current filesystem encoding "
5296
"%(fs_encoding)s"
5297
msgstr ""
5298
5299
#: bzrlib/errors.py:910
5300
msgid "Cannot operate on \"%(filename)s\" because it is a control file"
5301
msgstr ""
5302
5303
#: bzrlib/errors.py:928
5304
msgid "The lock for '%(lock_description)s' is in use and cannot be broken."
5305
msgstr ""
5306
5307
#: bzrlib/errors.py:967
5308
msgid "Cannot lock %(lock)s: %(why)s"
5309
msgstr ""
5310
5311
#: bzrlib/errors.py:977
5312
msgid ""
5313
"A transaction related operation was attempted after the transaction finished."
5314
msgstr ""
5315
5316
#: bzrlib/errors.py:1004
5317
msgid "Cannot lock: transport is read only: %(transport)s"
5318
msgstr ""
5319
5320
#: bzrlib/errors.py:1012
5321
msgid "Could not acquire lock \"%(lock)s\": %(msg)s"
5322
msgstr ""
5323
5324
#: bzrlib/errors.py:1023
5325
msgid ""
5326
"Lock was broken while still open: %(lock)s - check storage consistency!"
5327
msgstr ""
5328
5329
#: bzrlib/errors.py:1034
5330
msgid ""
5331
"Lock was released and re-acquired before being broken: %(lock)s: held by "
5332
"%(holder)r, wanted to break %(target)r"
5333
msgstr ""
5334
5335
#: bzrlib/errors.py:1046
5336
msgid ""
5337
"Lock is apparently held, but corrupted: %(corruption_info)s\n"
5338
"Use 'bzr break-lock' to clear it"
5339
msgstr ""
5340
5341
#: bzrlib/errors.py:1059
5342
msgid "Lock not held: %(lock)s"
5343
msgstr ""
5344
5345
#: bzrlib/errors.py:1088
5346
msgid "No changes to commit"
5347
msgstr ""
5348
5349
#: bzrlib/errors.py:1093
5350
msgid ""
5351
"Selected-file commit of merges is not supported yet: files %(files_str)s"
5352
msgstr ""
5353
5354
#: bzrlib/errors.py:1103
5355
msgid ""
5356
"Excluding paths during commit is not supported by repository at "
5357
"%(repository)r."
5358
msgstr ""
5359
5360
#: bzrlib/errors.py:1112
5361
msgid ""
5362
"The specified commit message contains characters unsupported by the current "
5363
"encoding."
5364
msgstr ""
5365
5366
#: bzrlib/errors.py:1118
5367
msgid "Upgrade URL cannot work with readonly URLs."
5368
msgstr ""
5369
5370
#: bzrlib/errors.py:1123
5371
msgid "The branch format %(format)s is already at the most recent format."
5372
msgstr ""
5373
5374
#: bzrlib/errors.py:1146
5375
msgid "Option --change does not accept revision ranges"
5376
msgstr ""
5377
5378
#: bzrlib/errors.py:1151
5379
msgid "No namespace registered for string: %(spec)r"
5380
msgstr ""
5381
5382
#: bzrlib/errors.py:1170
5383
msgid ""
5384
"Requested revision: '%(spec)s' does not exist in branch: "
5385
"%(branch_url)s%(extra)s"
5386
msgstr ""
5387
5388
#: bzrlib/errors.py:1184
5389
msgid ""
5390
"Operation denied because it would change the main history, which is not "
5391
"permitted by the append_revisions_only setting on branch \"%(location)s\"."
5392
msgstr ""
5393
5394
#: bzrlib/errors.py:1195
5395
msgid ""
5396
"These branches have diverged. Use the missing command to see how.\n"
5397
"Use the merge command to reconcile them."
5398
msgstr ""
5399
5400
#: bzrlib/errors.py:1215
5401
msgid ""
5402
"Branches have no common ancestor, and no merge base revision was specified."
5403
msgstr ""
5404
5405
#: bzrlib/errors.py:1221
5406
msgid ""
5407
"Selected merge cannot perform reverse cherrypicks. Try merge3 or diff3."
5408
msgstr ""
5409
5410
#: bzrlib/errors.py:1227
5411
msgid "Revisions have no common ancestor: %(revision_a)s %(revision_b)s"
5412
msgstr ""
5413
5414
#: bzrlib/errors.py:1236
5415
msgid ""
5416
"Revisions are not derived from the same root: %(revision_a)s %(revision_b)s."
5417
msgstr ""
5418
5419
#: bzrlib/errors.py:1245
5420
msgid "Revision %(rev_id)s is not an ancestor of %(not_ancestor_id)s"
5421
msgstr ""
5422
5423
#: bzrlib/errors.py:1254
5424
msgid "Branch %(branch)s has no commits."
5425
msgstr ""
5426
5427
#: bzrlib/errors.py:1272
5428
msgid ""
5429
"Bound branch %(branch)s is out of date with master branch "
5430
"%(master)s.%(extra_help)s"
5431
msgstr ""
5432
5433
#: bzrlib/errors.py:1284
5434
msgid ""
5435
"Cannot commit to branch %(branch)s. It is bound to %(master)s, which is "
5436
"bound to %(remote)s."
5437
msgstr ""
5438
5439
#: bzrlib/errors.py:1296
5440
msgid "Cannot pull --overwrite to a branch which is bound %(branch)s"
5441
msgstr ""
5442
5443
#: bzrlib/errors.py:1305
5444
msgid ""
5445
"Unable to connect to target of bound branch %(branch)s => %(target)s: "
5446
"%(error)s"
5447
msgstr ""
5448
5449
#: bzrlib/errors.py:1317
5450
msgid "Error in processing weave: %(msg)s"
5451
msgstr ""
5452
5453
#: bzrlib/errors.py:1326
5454
msgid "Revision {%(revision_id)s} already present in %(weave)s"
5455
msgstr ""
5456
5457
#: bzrlib/errors.py:1337
5458
msgid "Revision {%(revision_id)s} not present in %(weave)s"
5459
msgstr ""
5460
5461
#: bzrlib/errors.py:1347
5462
msgid "Weave invariant violated: %(what)s"
5463
msgstr ""
5464
5465
#: bzrlib/errors.py:1356
5466
msgid "Parents are mismatched between two revisions. %(msg)s"
5467
msgstr ""
5468
5469
#: bzrlib/errors.py:1378
5470
msgid ""
5471
"Weaves differ on text content. Revision: {%(revision_id)s}, %(weave_a)s, "
5472
"%(weave_b)s"
5473
msgstr ""
5474
5475
#: bzrlib/errors.py:1390
5476
msgid "Versioned file error"
5477
msgstr ""
5478
5479
#: bzrlib/errors.py:1395
5480
msgid "Revision {%(revision_id)s} not present in \"%(file_id)s\"."
5481
msgstr ""
5482
5483
#: bzrlib/errors.py:1405
5484
msgid "Revision {%(revision_id)s} already present in \"%(file_id)s\"."
5485
msgstr ""
5486
5487
#: bzrlib/errors.py:1415
5488
msgid "Text did not match its checksum: %(msg)s"
5489
msgstr ""
5490
5491
#: bzrlib/errors.py:1541
5492
msgid "Export format %(format)r not supported"
5493
msgstr ""
5494
5495
#: bzrlib/errors.py:1550
5496
msgid "Transport error: %(msg)s %(orig_error)s"
5497
msgstr ""
5498
5499
#: bzrlib/errors.py:1576
5500
msgid "Generic bzr smart protocol error: %(details)s"
5501
msgstr ""
5502
5503
#: bzrlib/errors.py:1584
5504
msgid "Received bad protocol version marker: %(marker)r"
5505
msgstr ""
5506
5507
#: bzrlib/errors.py:1616
5508
msgid "Transport operation not possible: %(msg)s %(orig_error)s"
5509
msgstr ""
5510
5511
#: bzrlib/errors.py:1621
5512
msgid "Connection error: %(msg)s %(orig_error)s"
5513
msgstr ""
5514
5515
#: bzrlib/errors.py:1626
5516
msgid "%(msg)s %(host)s%(port)s%(orig_error)s"
5517
msgstr ""
5518
5519
#: bzrlib/errors.py:1647
5520
msgid "Connection closed: %(msg)s %(orig_error)s"
5521
msgstr ""
5522
5523
#: bzrlib/errors.py:1652
5524
msgid "Connection Timeout: %(msg)s%(orig_error)s"
5525
msgstr ""
5526
5527
#: bzrlib/errors.py:1657
5528
msgid "Invalid range access in %(path)s at %(offset)s: %(msg)s"
5529
msgstr ""
5530
5531
#: bzrlib/errors.py:1667
5532
msgid "Invalid http response for %(path)s: %(msg)s%(orig_error)s"
5533
msgstr ""
5534
5535
#: bzrlib/errors.py:1682
5536
msgid "Certificate error: %(error)s"
5537
msgstr ""
5538
5539
#: bzrlib/errors.py:1690
5540
msgid "Invalid http range %(range)r for %(path)s: %(msg)s"
5541
msgstr ""
5542
5543
#: bzrlib/errors.py:1704
5544
msgid "HTTP MIME Boundary missing for %(path)s: %(msg)s"
5545
msgstr ""
5546
5547
#: bzrlib/errors.py:1712
5548
msgid "Invalid http Content-type \"%(ctype)s\" for %(path)s: %(msg)s"
5549
msgstr ""
5550
5551
#: bzrlib/errors.py:1721
5552
msgid "%(source)s is%(permanently)s redirected to %(target)s"
5553
msgstr ""
5554
5555
#: bzrlib/errors.py:1735
5556
msgid "Too many redirections"
5557
msgstr ""
5558
5559
#: bzrlib/errors.py:1740
5560
msgid "Working tree has conflicts."
5561
msgstr ""
5562
5563
#: bzrlib/errors.py:1744
5564
msgid "Config file %(filename)s is not UTF-8 encoded\n"
5565
msgstr ""
5566
5567
#: bzrlib/errors.py:1753
5568
msgid ""
5569
"Error(s) parsing config file %(filename)s:\n"
5570
"%(errors)s"
5571
msgstr ""
5572
5573
#: bzrlib/errors.py:1763
5574
msgid ""
5575
"Bad value \"%(value)s\" for option \"%(name)s\".\n"
5576
"See ``bzr help %(name)s``"
5577
msgstr ""
5578
5579
#: bzrlib/errors.py:1773
5580
msgid "%(username)r does not seem to contain a reasonable email address"
5581
msgstr ""
5582
5583
#: bzrlib/errors.py:1782
5584
msgid "Failed to GPG sign data with command \"%(command_line)s\""
5585
msgstr ""
5586
5587
#: bzrlib/errors.py:1790
5588
msgid "Failed to verify GPG signature data with error \"%(error)s\""
5589
msgstr ""
5590
5591
#: bzrlib/errors.py:1798
5592
msgid "Unable to import library \"%(library)s\": %(error)s"
5593
msgstr ""
5594
5595
#: bzrlib/errors.py:1806
5596
msgid "python-gpgme is not installed, it is needed to verify signatures"
5597
msgstr ""
5598
5599
#: bzrlib/errors.py:1814
5600
msgid ""
5601
"The working tree for %(basedir)s has changed since the last commit, but "
5602
"weave merge requires that it be unchanged"
5603
msgstr ""
5604
5605
#: bzrlib/errors.py:1824
5606
msgid ""
5607
"Can't reprocess and show base, because reprocessing obscures the "
5608
"relationship of conflicting lines to the base"
5609
msgstr ""
5610
5611
#: bzrlib/errors.py:1830
5612
msgid "Cycle in graph %(graph)r"
5613
msgstr ""
5614
5615
#: bzrlib/errors.py:1858
5616
msgid "File %(filename)s is not conflicted."
5617
msgstr ""
5618
5619
#: bzrlib/errors.py:1880
5620
msgid "No bundle was found in \"%(filename)s\"."
5621
msgstr ""
5622
5623
#: bzrlib/errors.py:1889
5624
msgid "Unable to handle bundle version %(version)s: %(msg)s"
5625
msgstr ""
5626
5627
#: bzrlib/errors.py:1899
5628
msgid "Branch %(base)s is missing revision %(text_revision)s of %(file_id)s"
5629
msgstr ""
5630
5631
#: bzrlib/errors.py:1912
5632
msgid "File id {%(file_id)s} already exists in inventory as %(entry)s"
5633
msgstr ""
5634
5635
#: bzrlib/errors.py:1922
5636
msgid "Key %(key)s is already present in map"
5637
msgstr ""
5638
5639
#: bzrlib/errors.py:1927
5640
msgid "The prefix %(prefix)s is in the help search path twice."
5641
msgstr ""
5642
5643
#: bzrlib/errors.py:1937
5644
msgid ""
5645
"No final name for trans_id %(trans_id)r\n"
5646
"file-id: %(file_id)r\n"
5647
"root trans-id: %(root_trans_id)r\n"
5648
msgstr ""
5649
5650
#: bzrlib/errors.py:1969
5651
msgid "Attempt to reuse a transform that has already been applied."
5652
msgstr ""
5653
5654
#: bzrlib/errors.py:1974
5655
msgid "Moving the root directory is not supported at this time"
5656
msgstr ""
5657
5658
#: bzrlib/errors.py:1979
5659
msgid "Failed to rename %(from_path)s to %(to_path)s: %(why)s"
5660
msgstr ""
5661
5662
#: bzrlib/errors.py:1990
5663
msgid ""
5664
"Could not move %(from_path)s%(operator)s %(to_path)s%(_has_extra)s%(extra)s"
5665
msgstr ""
5666
5667
#: bzrlib/errors.py:2026
5668
msgid ""
5669
"Could not rename %(from_path)s%(operator)s %(to_path)s%(_has_extra)s%(extra)s"
5670
msgstr ""
5671
5672
#: bzrlib/errors.py:2056
5673
msgid "Unable to import paramiko (required for sftp support): %(error)s"
5674
msgstr ""
5675
5676
#: bzrlib/errors.py:2064
5677
msgid "Nothing to merge."
5678
msgstr ""
5679
5680
#: bzrlib/errors.py:2069
5681
msgid "Format %(format)s cannot be initialised by this version of bzr."
5682
msgstr ""
5683
5684
#: bzrlib/errors.py:2078
5685
msgid ""
5686
"Cannot convert from format %(from_format)s to format %(format)s. "
5687
"%(problem)s"
5688
msgstr ""
5689
5690
#: bzrlib/errors.py:2090
5691
msgid "Could not find an appropriate Differ for file \"%(path)s\""
5692
msgstr ""
5693
5694
#: bzrlib/errors.py:2098
5695
msgid "%(exe_name)s could not be found on this machine"
5696
msgstr ""
5697
5698
#: bzrlib/errors.py:2106
5699
msgid "Diff is not installed on this machine: %(msg)s"
5700
msgstr ""
5701
5702
#: bzrlib/errors.py:2114
5703
msgid "Diff3 is not installed on this machine."
5704
msgstr ""
5705
5706
#: bzrlib/errors.py:2120
5707
msgid "The content being inserted is already present."
5708
msgstr ""
5709
5710
#: bzrlib/errors.py:2125
5711
msgid ""
5712
"This tree contains left-over files from a failed operation.\n"
5713
" Please examine %(limbo_dir)s to see if it contains any files you wish "
5714
"to\n"
5715
" keep, and delete it when you are done."
5716
msgstr ""
5717
5718
#: bzrlib/errors.py:2136
5719
msgid ""
5720
"This tree contains left-over files from a failed operation.\n"
5721
" Please examine %(pending_deletion)s to see if it contains any files you\n"
5722
" wish to keep, and delete it when you are done."
5723
msgstr ""
5724
5725
#: bzrlib/errors.py:2146
5726
msgid ""
5727
"Unable to delete transform temporary directory %(limbo_dir)s.\n"
5728
" Please examine %(limbo_dir)s to see if it contains any files you wish "
5729
"to\n"
5730
" keep, and delete it when you are done."
5731
msgstr ""
5732
5733
#: bzrlib/errors.py:2157
5734
msgid ""
5735
"Unable to delete transform temporary directory %(pending_deletion)s. Please "
5736
"examine %(pending_deletion)s to see if it contains any files you wish to "
5737
"keep, and delete it when you are done."
5738
msgstr ""
5739
5740
#: bzrlib/errors.py:2167
5741
msgid "Working tree is out of date, please run 'bzr update'.%(more)s"
5742
msgstr ""
5743
5744
#: bzrlib/errors.py:2181
5745
msgid ""
5746
"Public branch \"%(public_location)s\" lacks revision \"%(revstring)s\"."
5747
msgstr ""
5748
5749
#: bzrlib/errors.py:2194
5750
msgid "Error in merge modified format"
5751
msgstr ""
5752
5753
#: bzrlib/errors.py:2199
5754
msgid "Format error in conflict listings"
5755
msgstr ""
5756
5757
#: bzrlib/errors.py:2203
5758
msgid ""
5759
"Inconsistency in dirstate file %(dirstate_path)s.\n"
5760
"Error: %(description)s"
5761
msgstr ""
5762
5763
#: bzrlib/errors.py:2214
5764
msgid ""
5765
"An error has been detected in the repository %(repo_path)s.\n"
5766
"Please run bzr reconcile on this repository."
5767
msgstr ""
5768
5769
#: bzrlib/errors.py:2225
5770
msgid ""
5771
"An inconsistent delta was supplied involving %(path)r, %(file_id)r\n"
5772
"reason: %(reason)s"
5773
msgstr ""
5774
5775
#: bzrlib/errors.py:2238
5776
msgid ""
5777
"An inconsistent delta was supplied: %(delta)r\n"
5778
"reason: %(reason)s"
5779
msgstr ""
5780
5781
#: bzrlib/errors.py:2250
5782
msgid "To use this feature you must upgrade your branch at %(path)s."
5783
msgstr ""
5784
5785
#: bzrlib/errors.py:2259
5786
msgid "To use this feature you must upgrade your repository at %(path)s."
5787
msgstr ""
5788
5789
#: bzrlib/errors.py:2264
5790
msgid ""
5791
"To use this feature you must upgrade your branch at %(path)s to a format "
5792
"which supports rich roots."
5793
msgstr ""
5794
5795
#: bzrlib/errors.py:2270
5796
msgid "Cannot perform local-only commits on unbound branches."
5797
msgstr ""
5798
5799
#: bzrlib/errors.py:2275
5800
msgid "The method %(mname)s is not supported on objects of type %(tname)s."
5801
msgstr ""
5802
5803
#: bzrlib/errors.py:2296
5804
msgid "Ghost tags not supported by format %(format)r."
5805
msgstr ""
5806
5807
#: bzrlib/errors.py:2304
5808
msgid "File is binary but should be text."
5809
msgstr ""
5810
5811
#: bzrlib/errors.py:2309
5812
msgid "The path %(path)s is not permitted on this platform"
5813
msgstr ""
5814
5815
#: bzrlib/errors.py:2318
5816
msgid ""
5817
"Testament did not match expected value.\n"
5818
" For revision_id {%(revision_id)s}, expected {%(expected)s}, measured\n"
5819
" {%(measured)s}"
5820
msgstr ""
5821
5822
#: bzrlib/errors.py:2330
5823
msgid "Not a bzr revision-bundle: %(text)r"
5824
msgstr ""
5825
5826
#: bzrlib/errors.py:2339
5827
msgid "Bad bzr revision-bundle: %(text)r"
5828
msgstr ""
5829
5830
#: bzrlib/errors.py:2348
5831
msgid "Malformed bzr revision-bundle header: %(text)r"
5832
msgstr ""
5833
5834
#: bzrlib/errors.py:2353
5835
msgid "Malformed patches in bzr revision-bundle: %(text)r"
5836
msgstr ""
5837
5838
#: bzrlib/errors.py:2358
5839
msgid "Malformed footer in bzr revision-bundle: %(text)r"
5840
msgstr ""
5841
5842
#: bzrlib/errors.py:2363
5843
msgid "End of line marker was not \\n in bzr revision-bundle"
5844
msgstr ""
5845
5846
#: bzrlib/errors.py:2373
5847
msgid "Bundle format %(bundle_format)s is incompatible with %(other)s"
5848
msgstr ""
5849
5850
#: bzrlib/errors.py:2383
5851
msgid "Root class for inventory serialization errors"
5852
msgstr ""
5853
5854
#: bzrlib/errors.py:2387
5855
msgid ""
5856
"The inventory was not in the expected format:\n"
5857
" %(msg)s"
5858
msgstr ""
5859
5860
#: bzrlib/errors.py:2396
5861
msgid "This operation requires rich root data storage"
5862
msgstr ""
5863
5864
#: bzrlib/errors.py:2409
5865
msgid "Unrecognised value for BZR_SSH environment variable: %(vendor)s"
5866
msgstr ""
5867
5868
#: bzrlib/errors.py:2418
5869
msgid ""
5870
"Don't know how to handle SSH connections. Please set BZR_SSH environment "
5871
"variable."
5872
msgstr ""
5873
5874
#: bzrlib/errors.py:2425
5875
msgid ""
5876
"Could not determine revno for {%(revision_id)s} because its ancestry shows a "
5877
"ghost at {%(ghost_revision_id)s}"
5878
msgstr ""
5879
5880
#: bzrlib/errors.py:2435
5881
msgid "Ghost revision {%(revision_id)s} cannot be used here."
5882
msgstr ""
5883
5884
#: bzrlib/errors.py:2486
5885
msgid ""
5886
"A merge directive must provide either a bundle or a public branch location."
5887
msgstr ""
5888
5889
#: bzrlib/errors.py:2493
5890
msgid "Bad merge directive payload %(start)r"
5891
msgstr ""
5892
5893
#: bzrlib/errors.py:2503
5894
msgid "Preview patch does not match requested changes."
5895
msgstr ""
5896
5897
#: bzrlib/errors.py:2509
5898
msgid "Patch_type was %(patch_type)s, but no patch was supplied."
5899
msgstr ""
5900
5901
#: bzrlib/errors.py:2519
5902
msgid ""
5903
"Your branch does not have all of the revisions required in order to merge "
5904
"this merge directive and the target location specified in the merge "
5905
"directive is not a branch: %(location)s."
5906
msgstr ""
5907
5908
#: bzrlib/errors.py:2531
5909
msgid "Unsupported entry kind %(kind)s"
5910
msgstr ""
5911
5912
#: bzrlib/errors.py:2539
5913
msgid "Can't subsume %(other_tree)s into %(tree)s. %(reason)s"
5914
msgstr ""
5915
5916
#: bzrlib/errors.py:2549
5917
msgid "Subsume target %(other_tree)s needs to be upgraded."
5918
msgstr ""
5919
5920
#: bzrlib/errors.py:2568
5921
msgid "No such tag: %(tag_name)s"
5922
msgstr ""
5923
5924
#: bzrlib/errors.py:2576
5925
msgid "Tags not supported by %(branch)s; you may be able to use bzr upgrade."
5926
msgstr ""
5927
5928
#: bzrlib/errors.py:2585
5929
msgid "Tag %(tag_name)s already exists."
5930
msgstr ""
5931
5932
#: bzrlib/errors.py:2593
5933
msgid ""
5934
"Did not understand bug identifier %(bug_id)s: %(reason)s. See \"bzr help "
5935
"bugs\" for more information on this feature."
5936
msgstr ""
5937
5938
#: bzrlib/errors.py:2603
5939
msgid ""
5940
"The URL for bug tracker \"%(abbreviation)s\" doesn't contain {id}: %(url)s"
5941
msgstr ""
5942
5943
#: bzrlib/errors.py:2613
5944
msgid ""
5945
"Cannot find registered bug tracker called %(abbreviation)s on %(branch)s"
5946
msgstr ""
5947
5948
#: bzrlib/errors.py:2623
5949
msgid "Invalid line in bugs property: '%(line)s'"
5950
msgstr ""
5951
5952
#: bzrlib/errors.py:2631
5953
msgid "Invalid bug status: '%(status)s'"
5954
msgstr ""
5955
5956
#: bzrlib/errors.py:2639
5957
msgid "Could not understand response from smart server: %(response_tuple)r"
5958
msgstr ""
5959
5960
#: bzrlib/errors.py:2678
5961
msgid "Server sent an unexpected error: %(error_tuple)r"
5962
msgstr ""
5963
5964
#: bzrlib/errors.py:2697
5965
msgid "Unrecognised container format: %(container_format)r"
5966
msgstr ""
5967
5968
#: bzrlib/errors.py:2705
5969
msgid "Unexpected end of container stream"
5970
msgstr ""
5971
5972
#: bzrlib/errors.py:2710
5973
msgid "Unknown record type: %(record_type)r"
5974
msgstr ""
5975
5976
#: bzrlib/errors.py:2718
5977
msgid "Invalid record: %(reason)s"
5978
msgstr ""
5979
5980
#: bzrlib/errors.py:2726
5981
msgid "Container has data after end marker: %(excess)r"
5982
msgstr ""
5983
5984
#: bzrlib/errors.py:2734
5985
msgid "Container has multiple records with the same name: %(name)s"
5986
msgstr ""
5987
5988
#: bzrlib/errors.py:2747
5989
msgid "Corrupt or incompatible data stream: %(reason)s"
5990
msgstr ""
5991
5992
#: bzrlib/errors.py:2755
5993
msgid "SMTP error: %(error)s"
5994
msgstr ""
5995
5996
#: bzrlib/errors.py:2763
5997
msgid "No message supplied."
5998
msgstr ""
5999
6000
#: bzrlib/errors.py:2768
6001
msgid "No mail-to address (--mail-to) or output (-o) specified."
6002
msgstr ""
6003
6004
#: bzrlib/errors.py:2773
6005
msgid "Unknown mail client: %(mail_client)s"
6006
msgstr ""
6007
6008
#: bzrlib/errors.py:2781
6009
msgid ""
6010
"Unable to find mail client with the following names: "
6011
"%(mail_command_list_string)s"
6012
msgstr ""
6013
6014
#: bzrlib/errors.py:2791
6015
msgid "SMTP connection to %(host)s refused"
6016
msgstr ""
6017
6018
#: bzrlib/errors.py:2800
6019
msgid "Please specify smtp_server. No server at default %(host)s."
6020
msgstr ""
6021
6022
#: bzrlib/errors.py:2814
6023
msgid ""
6024
"'%(display_url)s' is not in sync with %(target_url)s. See bzr help sync-for-"
6025
"reconfigure."
6026
msgstr ""
6027
6028
#: bzrlib/errors.py:2826
6029
msgid "'%(display_url)s' is already a branch."
6030
msgstr ""
6031
6032
#: bzrlib/errors.py:2831
6033
msgid "'%(display_url)s' is already a tree."
6034
msgstr ""
6035
6036
#: bzrlib/errors.py:2836
6037
msgid "'%(display_url)s' is already a checkout."
6038
msgstr ""
6039
6040
#: bzrlib/errors.py:2841
6041
msgid "'%(display_url)s' is already a lightweight checkout."
6042
msgstr ""
6043
6044
#: bzrlib/errors.py:2846
6045
msgid "'%(display_url)s' is already using a shared repository."
6046
msgstr ""
6047
6048
#: bzrlib/errors.py:2851
6049
msgid "'%(display_url)s' is already standalone."
6050
msgstr ""
6051
6052
#: bzrlib/errors.py:2856
6053
msgid "Shared repository '%(display_url)s' already creates working trees."
6054
msgstr ""
6055
6056
#: bzrlib/errors.py:2862
6057
msgid ""
6058
"Shared repository '%(display_url)s' already doesn't create working trees."
6059
msgstr ""
6060
6061
#: bzrlib/errors.py:2868
6062
msgid "Requested reconfiguration of '%(display_url)s' is not supported."
6063
msgstr ""
6064
6065
#: bzrlib/errors.py:2873
6066
msgid "No location could be found to bind to at %(display_url)s."
6067
msgstr ""
6068
6069
#: bzrlib/errors.py:2878
6070
msgid ""
6071
"Working tree \"%(display_url)s\" has uncommitted changes (See bzr "
6072
"status).%(more)s"
6073
msgstr ""
6074
6075
#: bzrlib/errors.py:2897
6076
msgid ""
6077
"Working tree \"%(display_url)s\" has shelved changes (See bzr shelve --"
6078
"list).%(more)s"
6079
msgstr ""
6080
6081
#: bzrlib/errors.py:2903
6082
msgid "Variable {%(name)s} is not available."
6083
msgstr ""
6084
6085
#: bzrlib/errors.py:2911
6086
msgid "No template specified."
6087
msgstr ""
6088
6089
#: bzrlib/errors.py:2916
6090
msgid "Unable to create symlink %(path_str)son this platform"
6091
msgstr ""
6092
6093
#: bzrlib/errors.py:2931
6094
msgid ""
6095
"Unsupported timezone format \"%(timezone)s\", options are \"utc\", "
6096
"\"original\", \"local\"."
6097
msgstr ""
6098
6099
#: bzrlib/errors.py:2965
6100
msgid ""
6101
"Unable to encode %(kind)s path %(path)r in user encoding %(user_encoding)s"
6102
msgstr ""
6103
6104
#: bzrlib/errors.py:2977
6105
msgid "The \"%(config_id)s\" configuration does not exist."
6106
msgstr ""
6107
6108
#: bzrlib/errors.py:2985
6109
msgid "The \"%(option_name)s\" configuration option does not exist."
6110
msgstr ""
6111
6112
#: bzrlib/errors.py:2993
6113
msgid "The alias \"%(alias_name)s\" does not exist."
6114
msgstr ""
6115
6116
#: bzrlib/errors.py:3007
6117
msgid "\"%(alias_name)s\" is not a valid location alias."
6118
msgstr ""
6119
6120
#: bzrlib/errors.py:3015
6121
msgid "No %(alias_name)s location assigned."
6122
msgstr ""
6123
6124
#: bzrlib/errors.py:3023
6125
msgid "Cannot bind address \"%(host)s:%(port)i\": %(orig_error)s."
6126
msgstr ""
6127
6128
#: bzrlib/errors.py:3033
6129
msgid "Unknown rules detected: %(unknowns_str)s."
6130
msgstr ""
6131
6132
#: bzrlib/errors.py:3044
6133
msgid "Tip change rejected: %(msg)s"
6134
msgstr ""
6135
6136
#: bzrlib/errors.py:3052
6137
msgid "Shelf corrupt."
6138
msgstr ""
6139
6140
#: bzrlib/errors.py:3057
6141
msgid "Corruption while decompressing repository file%(orig_error)s"
6142
msgstr ""
6143
6144
#: bzrlib/errors.py:3069
6145
msgid "No changes are shelved with id \"%(shelf_id)d\"."
6146
msgstr ""
6147
6148
#: bzrlib/errors.py:3077
6149
msgid "\"%(invalid_id)s\" is not a valid shelf id, try a number instead."
6150
msgstr ""
6151
6152
#: bzrlib/errors.py:3085
6153
msgid ""
6154
"An attempt to access a url outside the server jail was made: '%(url)s'."
6155
msgstr ""
6156
6157
#: bzrlib/errors.py:3093
6158
msgid "The user aborted the operation."
6159
msgstr ""
6160
6161
#: bzrlib/errors.py:3098
6162
msgid "Branching '%(url)s'(%(format)s) must create a working tree."
6163
msgstr ""
6164
6165
#: bzrlib/errors.py:3108
6166
msgid "No such view: %(view_name)s."
6167
msgstr ""
6168
6169
#: bzrlib/errors.py:3118
6170
msgid ""
6171
"Views are not supported by %(tree)s; use 'bzr upgrade' to change your tree "
6172
"to a later format."
6173
msgstr ""
6174
6175
#: bzrlib/errors.py:3127
6176
msgid ""
6177
"Specified file \"%(file_name)s\" is outside the current view: %(view_str)s"
6178
msgstr ""
6179
6180
#: bzrlib/errors.py:3194
6181
msgid "%(bzrdir)r does not support co-located branches."
6182
msgstr ""
6183
6184
#: bzrlib/errors.py:3200
6185
msgid ""
6186
"Unable to determine your name.\n"
6187
"Please, set your name with the 'whoami' command.\n"
6188
"E.g. bzr whoami \"Your Name <name@example.com>\""
6189
msgstr ""
6190
6191
#: bzrlib/errors.py:3209
6192
msgid "Invalid pattern(s) found. %(msg)s"
6193
msgstr ""
6194
6195
#: bzrlib/errors.py:3217
6196
msgid ""
6197
"Branch \"%(branch_url)s\" appears to be bound to itself. Please use `bzr "
6198
"unbind` to fix."
6199
msgstr ""
6200
6201
#: bzrlib/errors.py:3228
6202
msgid "Loop involving %(refs)r while expanding \"%(string)s\"."
6203
msgstr ""
6204
6205
#: bzrlib/errors.py:3237
6206
msgid "Option %(name)s is not defined while expanding \"%(string)s\"."
6207
msgstr ""
6208
6209
#: bzrlib/errors.py:3246
6210
msgid ""
6211
"No compatible object available for operations from %(source)r to %(target)r."
6212
msgstr ""
6213
6214
#: bzrlib/errors.py:3256
6215
msgid ""
6216
"VFS requests over the smart server are not allowed. Encountered: %(method)s, "
6217
"%(arguments)s."
6218
msgstr ""
6219
6220
#: bzrlib/errors.py:3266
6221
msgid ""
6222
"Kind change from %(from_kind)s to %(to_kind)s for %(path)s not supported by "
6223
"format %(format)r"
6224
msgstr ""
6225
6226
#: bzrlib/errors.py:3278
6227
msgid ""
6228
"Missing feature %(feature)s not provided by this version of Bazaar or any "
6229
"plugin."
6230
msgstr ""
6231
"Missing feature %(feature)s not provided by this version of Bazaar or any "
6232
"plugin."
6233
6234
#: bzrlib/errors.py:3291
6235
msgid "Binary files section encountered."
6236
msgstr ""
6237
6238
#: bzrlib/errors.py:3299
6239
msgid ""
6240
"Malformed patch header. %(desc)s\n"
6241
"%(line)r"
6242
msgstr ""
6243
6244
#: bzrlib/errors.py:3308
6245
msgid ""
6246
"Malformed hunk header. %(desc)s\n"
6247
"%(line)r"
6248
msgstr ""
6249
6250
#: bzrlib/errors.py:3317
6251
msgid ""
6252
"Malformed line. %(desc)s\n"
6253
"%(line)r"
6254
msgstr ""
6255
6256
#: bzrlib/errors.py:3327
6257
msgid ""
6258
"Text contents mismatch at line %(line_no)d. Original has \"%(orig_line)s\", "
6259
"but patch says it should be \"%(patch_line)s\""
6260
msgstr ""
6261
6262
#: bzrlib/errors.py:3338
6263
msgid "The feature %(feature)s has already been registered."
6264
msgstr "The feature %(feature)s has already been registered."
6265
6266
#: bzrlib/export_pot.py:252
6267
#, python-format
6268
msgid "Exporting messages from builtin command: %s"
6269
msgstr ""
6270
6271
#: bzrlib/export_pot.py:271
6272
msgid "Exporting messages from plugin command: {0} in {1}"
6273
msgstr ""
6274
6275
#: bzrlib/export_pot.py:292
6276
#, python-format
6277
msgid "Exporting message from error: %s"
6278
msgstr ""
6279
6280
#: bzrlib/fetch.py:98
6281
msgid "Finding revisions"
6282
msgstr ""
6283
6284
#: bzrlib/fetch.py:103
6285
msgid "Fetching revisions"
6286
msgstr ""
6287
6288
#: bzrlib/foreign.py:262
6289
msgid "Push into a different VCS without any custom bzr metadata."
6290
msgstr ""
6291
6292
#: bzrlib/foreign.py:264
6293
msgid ""
6294
"This will afterwards rebase the local branch on the remote\n"
6295
"branch unless the --no-rebase option is used, in which case \n"
6296
"the two branches will be out of sync after the push. "
6297
msgstr ""
6298
6299
#: bzrlib/foreign.py:277
6300
msgid "Do not rebase after push."
6301
msgstr ""
6302
6303
#: bzrlib/foreign.py:311
6304
#, python-format
6305
msgid "Using saved location: %s\n"
6306
msgstr ""
6307
6308
#: bzrlib/foreign.py:321
6309
msgid ""
6310
"{0!r} and {1!r} are in the same VCS, lossy push not necessary. Please use "
6311
"regular push."
6312
msgstr ""
6313
6314
#: bzrlib/gpg.py:119 bzrlib/gpg.py:460
6315
msgid "{0} commits with valid signatures"
6316
msgstr ""
6317
6318
#: bzrlib/gpg.py:123 bzrlib/gpg.py:465
6319
msgid "{0} commit with unknown key"
6320
msgid_plural "{0} commits with unknown keys"
6321
msgstr[0] ""
6322
msgstr[1] ""
6323
6324
#: bzrlib/gpg.py:129 bzrlib/gpg.py:472
6325
msgid "{0} commit not valid"
6326
msgid_plural "{0} commits not valid"
6327
msgstr[0] ""
6328
msgstr[1] ""
6329
6330
#: bzrlib/gpg.py:135 bzrlib/gpg.py:479
6331
msgid "{0} commit not signed"
6332
msgid_plural "{0} commits not signed"
6333
msgstr[0] ""
6334
msgstr[1] ""
6335
6336
#: bzrlib/gpg.py:141 bzrlib/gpg.py:486
6337
msgid "{0} commit with key now expired"
6338
msgid_plural "{0} commits with key now expired"
6339
msgstr[0] ""
6340
msgstr[1] ""
6341
6342
#: bzrlib/gpg.py:343
6343
msgid "No GnuPG key results for pattern: {0}"
6344
msgstr ""
6345
6346
#: bzrlib/gpg.py:386
6347
msgid "{0} signed {1} commit"
6348
msgid_plural "{0} signed {1} commits"
6349
msgstr[0] ""
6350
msgstr[1] ""
6351
6352
#: bzrlib/gpg.py:403 bzrlib/gpg.py:419
6353
msgid "{0} commit by author {1}"
6354
msgid_plural "{0} commits by author {1}"
6355
msgstr[0] ""
6356
msgstr[1] ""
6357
6358
#: bzrlib/gpg.py:433
6359
msgid "Unknown key {0} signed {1} commit"
6360
msgid_plural "Unknown key {0} signed {1} commits"
6361
msgstr[0] ""
6362
msgstr[1] ""
6363
6364
#: bzrlib/gpg.py:452
6365
msgid "{0} commit by author {1} with key {2} now expired"
6366
msgid_plural "{0} commits by author {1} with key {2} now expired"
6367
msgstr[0] ""
6368
msgstr[1] ""
6369
6370
#: bzrlib/groupcompress.py:1739
6371
#, python-format
6372
msgid "Insert claimed random_id=True, but then inserted %r two times"
6373
msgstr ""
6374
6375
#: bzrlib/hooks.py:331
6376
#, python-format
6377
msgid "Introduced in: %s"
6378
msgstr ""
6379
6380
#: bzrlib/hooks.py:334
6381
#, python-format
6382
msgid "Deprecated in: %s"
6383
msgstr ""
6384
6385
#: bzrlib/knit.py:1766 bzrlib/knit.py:1802
6386
msgid "Walking content"
6387
msgstr ""
6388
6389
#: bzrlib/knit.py:3330
6390
msgid "annotating"
6391
msgstr ""
6392
6393
#: bzrlib/lock.py:548
6394
msgid "{0!r} was {1} locked again"
6395
msgstr ""
6396
6397
#: bzrlib/lockdir.py:321
6398
#, python-format
6399
msgid "error removing pending lock: %s"
6400
msgstr ""
6401
6402
#: bzrlib/lockdir.py:616
6403
msgid "Unable to obtain"
6404
msgstr ""
6405
6406
#: bzrlib/lockdir.py:618
6407
msgid "Lock owner changed for"
6408
msgstr ""
6409
6410
#: bzrlib/lockdir.py:620
6411
msgid "{0} lock {1} {2}."
6412
msgstr ""
6413
6414
#: bzrlib/lockdir.py:627
6415
#, python-format
6416
msgid "Will continue to try until %s, unless you press Ctrl-C."
6417
msgstr ""
6418
6419
#: bzrlib/lockdir.py:629
6420
msgid "See \"bzr help break-lock\" for more."
6421
msgstr ""
6422
6423
#: bzrlib/lockdir.py:739
6424
#, python-format
6425
msgid ""
6426
"held by %(user)s on %(hostname)s (process #%(pid)s), acquired %(time_ago)s"
6427
msgstr ""
6428
6429
#: bzrlib/log.py:572
6430
msgid "--exclude-common-ancestry requires two different revisions"
6431
msgstr ""
6432
6433
#: bzrlib/log.py:574
6434
#, python-format
6435
msgid "invalid direction %r"
6436
msgstr ""
6437
6438
#: bzrlib/log.py:662
6439
msgid "Start revision not found in history of end revision."
6440
msgstr ""
6441
6442
#: bzrlib/log.py:1080 bzrlib/log.py:1138
6443
msgid "Logging revision 0 is invalid."
6444
msgstr ""
6445
6446
#: bzrlib/log.py:1082 bzrlib/log.py:1140
6447
msgid "Start revision must be older than the end revision."
6448
msgstr ""
6449
6450
#: bzrlib/log.py:1827
6451
#, python-format
6452
msgid "unknown log formatter: %r"
6453
msgstr ""
6454
6455
#: bzrlib/log.py:2123
6456
msgid "fixes bug"
6457
msgid_plural "fixes bugs"
6458
msgstr[0] ""
6459
msgstr[1] ""
6460
6461
#: bzrlib/merge.py:689
6462
msgid "All changes applied successfully."
6463
msgstr ""
6464
6465
#: bzrlib/merge.py:691
6466
#, python-format
6467
msgid "%d conflicts encountered."
6468
msgstr ""
6469
6470
#: bzrlib/merge.py:845 bzrlib/merge.py:1933
6471
msgid "Preparing file merge"
6472
msgstr ""
6473
6474
#: bzrlib/multiparent.py:426
6475
msgid "Importing revisions"
6476
msgstr ""
6477
6478
#: bzrlib/option.py:526
6479
msgid "Show help message."
6480
msgstr ""
6481
6482
#: bzrlib/option.py:528
6483
msgid "Only display errors and warnings."
6484
msgstr ""
6485
6486
#: bzrlib/option.py:531
6487
msgid "Show usage message and options."
6488
msgstr ""
6489
6490
#: bzrlib/option.py:533
6491
msgid "Display more information."
6492
msgstr ""
6493
6494
#: bzrlib/option.py:541
6495
msgid ""
6496
"Select changes introduced by the specified revision. See also \"help "
6497
"revisionspec\"."
6498
msgstr ""
6499
6500
#: bzrlib/option.py:543
6501
msgid "Branch to operate on, instead of working directory."
6502
msgstr ""
6503
6504
#: bzrlib/option.py:545
6505
msgid "Detailed log format."
6506
msgstr ""
6507
6508
#: bzrlib/option.py:545
6509
msgid "Format used by GNU ChangeLog files."
6510
msgstr ""
6511
6512
#: bzrlib/option.py:545
6513
msgid "Log format with one line per revision."
6514
msgstr ""
6515
6516
#: bzrlib/option.py:545
6517
msgid "Moderately short log format."
6518
msgstr ""
6519
6520
#: bzrlib/option.py:545
6521
msgid "Use specified log format."
6522
msgstr ""
6523
6524
#: bzrlib/option.py:547
6525
msgid "Log format"
6526
msgstr ""
6527
6528
#: bzrlib/option.py:549
6529
msgid "LCA-newness merge."
6530
msgstr ""
6531
6532
#: bzrlib/option.py:549
6533
msgid "Merge using external diff3."
6534
msgstr ""
6535
6536
#: bzrlib/option.py:549
6537
msgid "Native diff3-style merge."
6538
msgstr ""
6539
6540
#: bzrlib/option.py:549
6541
msgid "Select a particular merge algorithm."
6542
msgstr ""
6543
6544
#: bzrlib/option.py:549
6545
msgid "Weave-based merge."
6546
msgstr ""
6547
6548
#: bzrlib/option.py:551
6549
msgid "Merge algorithm"
6550
msgstr ""
6551
6552
#: bzrlib/option.py:554
6553
msgid "Message string."
6554
msgstr ""
6555
6556
#: bzrlib/option.py:556
6557
msgid "Use an ASCII NUL (\\0) separator rather than a newline."
6558
msgstr ""
6559
6560
#: bzrlib/option.py:558
6561
msgid "Ignore differences between branches and overwrite unconditionally."
6562
msgstr ""
6563
6564
#: bzrlib/option.py:560
6565
msgid "Remember the specified location as a default."
6566
msgstr ""
6567
6568
#: bzrlib/option.py:562
6569
msgid "Reprocess to reduce spurious conflicts."
6570
msgstr ""
6571
6572
#: bzrlib/option.py:566
6573
msgid "See \"help revisionspec\" for details."
6574
msgstr ""
6575
6576
#: bzrlib/option.py:568
6577
msgid "Show internal object ids."
6578
msgstr ""
6579
6580
#: bzrlib/option.py:571
6581
msgid "Display timezone as local, original, or utc."
6582
msgstr ""
6583
6584
#: bzrlib/osutils.py:100
6585
msgid "Parameter {0!r} encoding is unsupported by {1} application locale."
6586
msgstr ""
6587
6588
#: bzrlib/osutils.py:220
6589
msgid "lstat/stat of ({0!r}): {1!r}"
6590
msgstr ""
6591
6592
#: bzrlib/osutils.py:1008 bzrlib/osutils.py:1019
6593
#, python-format
6594
msgid "sorry, %r not allowed in path"
6595
msgstr ""
6596
6597
#: bzrlib/osutils.py:1237
6598
#, python-format
6599
msgid "%r is too short to calculate a relative path"
6600
msgstr ""
6601
6602
#: bzrlib/plugin.py:143
6603
#, python-format
6604
msgid "\"%s\" is not a valid <plugin_name>@<plugin_path> description "
6605
msgstr ""
6606
6607
#: bzrlib/plugins/bash_completion/bashcomp.py:411
6608
msgid "Enable completions for the selected plugin (default: all plugins)"
6609
msgstr ""
6610
6611
#: bzrlib/plugins/bash_completion/bashcomp.py:412
6612
msgid "Generate a shell function for bash command line completion."
6613
msgstr ""
6614
6615
#: bzrlib/plugins/bash_completion/bashcomp.py:414
6616
msgid ""
6617
"This command generates a shell function which can be used by bash to\n"
6618
"automatically complete the currently typed command when the user presses\n"
6619
"the completion key (usually tab)."
6620
msgstr ""
6621
6622
#: bzrlib/plugins/bash_completion/bashcomp.py:418
6623
msgid ""
6624
"Commonly used like this:\n"
6625
" eval \"`bzr bash-completion`\""
6626
msgstr ""
6627
6628
#: bzrlib/plugins/bash_completion/bashcomp.py:424
6629
msgid "Name of the generated function (default: _bzr)"
6630
msgstr ""
6631
6632
#: bzrlib/plugins/bash_completion/bashcomp.py:426
6633
msgid "Generate only the shell function, don't enable it"
6634
msgstr ""
6635
6636
#: bzrlib/plugins/launchpad/__init__.py:81
6637
msgid "Register a branch with launchpad.net."
6638
msgstr ""
6639
6640
#: bzrlib/plugins/launchpad/__init__.py:83
6641
msgid ""
6642
"This command lists a bzr branch in the directory of branches on\n"
6643
"launchpad.net. Registration allows the branch to be associated with\n"
6644
"bugs or specifications."
6645
msgstr ""
6646
6647
#: bzrlib/plugins/launchpad/__init__.py:87
6648
msgid ""
6649
"Before using this command you must register the project to which the\n"
6650
"branch belongs, and create an account for yourself on launchpad.net."
6651
msgstr ""
6652
6653
#: bzrlib/plugins/launchpad/__init__.py:90
6654
msgid ""
6655
"arguments:\n"
6656
" public_url: The publicly visible url for the branch to register.\n"
6657
" This must be an http or https url (which Launchpad can read\n"
6658
" from to access the branch). Local file urls, SFTP urls, and\n"
6659
" bzr+ssh urls will not work.\n"
6660
" If no public_url is provided, bzr will use the configured\n"
6661
" public_url if there is one for the current branch, and\n"
6662
" otherwise error."
6663
msgstr ""
6664
6665
#: bzrlib/plugins/launchpad/__init__.py:99
6666
msgid ""
6667
"example:\n"
6668
" bzr register-branch http://foo.com/bzr/fooproject.mine \\\n"
6669
" --project fooproject"
6670
msgstr ""
6671
6672
#: bzrlib/plugins/launchpad/__init__.py:106
6673
msgid "Launchpad project short name to associate with the branch."
6674
msgstr ""
6675
6676
#: bzrlib/plugins/launchpad/__init__.py:113
6677
msgid ""
6678
"Short name for the branch; by default taken from the last component of the "
6679
"url."
6680
msgstr ""
6681
6682
#: bzrlib/plugins/launchpad/__init__.py:117
6683
msgid "One-sentence description of the branch."
6684
msgstr ""
6685
6686
#: bzrlib/plugins/launchpad/__init__.py:120
6687
msgid "Longer description of the purpose or contents of the branch."
6688
msgstr ""
6689
6690
#: bzrlib/plugins/launchpad/__init__.py:123
6691
msgid "Branch author's email address, if not yourself."
6692
msgstr ""
6693
6694
#: bzrlib/plugins/launchpad/__init__.py:126
6695
msgid "The bug this branch fixes."
6696
msgstr ""
6697
6698
#: bzrlib/plugins/launchpad/__init__.py:129
6699
msgid "Prepare the request but don't actually send it."
6700
msgstr ""
6701
6702
#: bzrlib/plugins/launchpad/__init__.py:151
6703
msgid ""
6704
"register-branch requires a public branch url - see bzr help register-branch."
6705
msgstr ""
6706
6707
#: bzrlib/plugins/launchpad/__init__.py:159
6708
msgid "--product is deprecated; please use --project."
6709
msgstr ""
6710
6711
#: bzrlib/plugins/launchpad/__init__.py:191
6712
msgid "Open a Launchpad branch page in your web browser."
6713
msgstr ""
6714
6715
#: bzrlib/plugins/launchpad/__init__.py:196
6716
msgid "Do not actually open the browser. Just say the URL we would use."
6717
msgstr ""
6718
6719
#: bzrlib/plugins/launchpad/__init__.py:231
6720
#, python-format
6721
msgid "Opening %s in web browser"
6722
msgstr ""
6723
6724
#: bzrlib/plugins/launchpad/__init__.py:241
6725
msgid "Show or set the Launchpad user ID."
6726
msgstr ""
6727
6728
#: bzrlib/plugins/launchpad/__init__.py:243
6729
msgid ""
6730
"When communicating with Launchpad, some commands need to know your\n"
6731
"Launchpad user ID. This command can be used to set or show the\n"
6732
"user ID that Bazaar will use for such communication."
6733
msgstr ""
6734
6735
#: bzrlib/plugins/launchpad/__init__.py:247
6736
msgid ""
6737
":Examples:\n"
6738
" Show the Launchpad ID of the current user::"
6739
msgstr ""
6740
6741
#: bzrlib/plugins/launchpad/__init__.py:250
6742
msgid " bzr launchpad-login"
6743
msgstr ""
6744
6745
#: bzrlib/plugins/launchpad/__init__.py:252
6746
msgid " Set the Launchpad ID of the current user to 'bob'::"
6747
msgstr ""
6748
6749
#: bzrlib/plugins/launchpad/__init__.py:254
6750
msgid " bzr launchpad-login bob"
6751
msgstr ""
6752
6753
#: bzrlib/plugins/launchpad/__init__.py:261
6754
msgid "Don't check that the user name is valid."
6755
msgstr ""
6756
6757
#: bzrlib/plugins/launchpad/__init__.py:276
6758
#: bzrlib/plugins/launchpad/__init__.py:287
6759
msgid "Launchpad user ID exists and has SSH keys.\n"
6760
msgstr ""
6761
6762
#: bzrlib/plugins/launchpad/__init__.py:279
6763
msgid "No Launchpad user ID configured.\n"
6764
msgstr ""
6765
6766
#: bzrlib/plugins/launchpad/__init__.py:290
6767
#, python-format
6768
msgid "Launchpad user ID set to '%s'.\n"
6769
msgstr ""
6770
6771
#: bzrlib/plugins/launchpad/__init__.py:298
6772
msgid "Ask Launchpad to mirror a branch now."
6773
msgstr ""
6774
6775
#: bzrlib/plugins/launchpad/__init__.py:318
6776
msgid "Propose merging a branch on Launchpad."
6777
msgstr ""
6778
6779
#: bzrlib/plugins/launchpad/__init__.py:320
6780
msgid ""
6781
"This will open your usual editor to provide the initial comment. When it\n"
6782
"has created the proposal, it will open it in your default web browser."
6783
msgstr ""
6784
6785
#: bzrlib/plugins/launchpad/__init__.py:323
6786
msgid ""
6787
"The branch will be proposed to merge into SUBMIT_BRANCH. If SUBMIT_BRANCH\n"
6788
"is not supplied, the remembered submit branch will be used. If no submit\n"
6789
"branch is remembered, the development focus will be used."
6790
msgstr ""
6791
6792
#: bzrlib/plugins/launchpad/__init__.py:327
6793
msgid ""
6794
"By default, the SUBMIT_BRANCH's review team will be requested to review\n"
6795
"the merge proposal. This can be overriden by specifying --review (-R).\n"
6796
"The parameter the launchpad account name of the desired reviewer. This\n"
6797
"may optionally be followed by '=' and the review type. For example:"
6798
msgstr ""
6799
6800
#: bzrlib/plugins/launchpad/__init__.py:332
6801
msgid " bzr lp-propose-merge --review jrandom --review review-team=qa"
6802
msgstr ""
6803
6804
#: bzrlib/plugins/launchpad/__init__.py:334
6805
msgid ""
6806
"This will propose a merge, request \"jrandom\" to perform a review of\n"
6807
"unspecified type, and request \"review-team\" to perform a \"qa\" review."
6808
msgstr ""
6809
6810
#: bzrlib/plugins/launchpad/__init__.py:339
6811
msgid "Propose the merge on staging."
6812
msgstr ""
6813
6814
#: bzrlib/plugins/launchpad/__init__.py:341
6815
msgid "Commit message."
6816
msgstr ""
6817
6818
#: bzrlib/plugins/launchpad/__init__.py:343
6819
msgid "Mark the proposal as approved immediately."
6820
msgstr ""
6821
6822
#: bzrlib/plugins/launchpad/__init__.py:345
6823
msgid "Requested reviewer and optional type."
6824
msgstr ""
6825
6826
#: bzrlib/plugins/launchpad/__init__.py:382
6827
msgid "Find the proposal to merge this revision."
6828
msgstr ""
6829
6830
#: bzrlib/plugins/launchpad/__init__.py:384
6831
msgid ""
6832
"Finds the merge proposal(s) that discussed landing the specified revision.\n"
6833
"This works only if the selected branch was the merge proposal target, and\n"
6834
"if the merged_revno is recorded for the merge proposal. The proposal(s)\n"
6835
"are opened in a web browser."
6836
msgstr ""
6837
6838
#: bzrlib/plugins/launchpad/__init__.py:389
6839
msgid ""
6840
"Any revision involved in the merge may be specified-- the revision in\n"
6841
"which the merge was performed, or one of the revisions that was merged."
6842
msgstr ""
6843
6844
#: bzrlib/plugins/launchpad/__init__.py:392
6845
msgid "So, to find the merge proposal that reviewed line 1 of README::"
6846
msgstr ""
6847
6848
#: bzrlib/plugins/launchpad/__init__.py:394
6849
msgid " bzr lp-find-proposal -r annotate:README:1"
6850
msgstr ""
6851
6852
#: bzrlib/plugins/launchpad/__init__.py:409
6853
msgid "No review found."
6854
msgstr ""
6855
6856
#: bzrlib/plugins/launchpad/__init__.py:410
6857
#, python-format
6858
msgid "%d proposals(s) found."
6859
msgstr ""
6860
6861
#: bzrlib/plugins/launchpad/__init__.py:420
6862
msgid "Finding revision-id"
6863
msgstr ""
6864
6865
#: bzrlib/plugins/launchpad/__init__.py:427
6866
msgid "Finding merge"
6867
msgstr ""
6868
6869
#: bzrlib/plugins/launchpad/__init__.py:432
6870
msgid "Finding revno"
6871
msgstr ""
6872
6873
#: bzrlib/plugins/launchpad/__init__.py:437
6874
msgid "Finding Launchpad branch"
6875
msgstr ""
6876
6877
#: bzrlib/plugins/launchpad/__init__.py:440
6878
msgid "Finding proposals"
6879
msgstr ""
6880
6881
#: bzrlib/plugins/launchpad/account.py:66
6882
msgid "Setting ssh/sftp usernames for launchpad.net."
6883
msgstr ""
6884
6885
#: bzrlib/plugins/launchpad/lp_api.py:241
6886
#: bzrlib/plugins/launchpad/lp_api.py:246
6887
#, python-format
6888
msgid "%s is not registered on Launchpad"
6889
msgstr ""
6890
6891
#: bzrlib/plugins/launchpad/lp_api.py:256
6892
#, python-format
6893
msgid "%s has no development focus."
6894
msgstr ""
6895
6896
#: bzrlib/plugins/launchpad/lp_api.py:261
6897
#, python-format
6898
msgid "development focus %s has no branch."
6899
msgstr ""
6900
6901
#: bzrlib/plugins/launchpad/lp_api.py:266
6902
#, python-format
6903
msgid "source package %s has no branch."
6904
msgstr ""
6905
6906
#: bzrlib/plugins/launchpad/lp_api.py:270
6907
#, python-format
6908
msgid "%s has no associated product or source package."
6909
msgstr ""
6910
6911
#: bzrlib/plugins/launchpad/lp_api.py:282
6912
#, python-format
6913
msgid "%s is already up-to-date."
6914
msgstr ""
6915
6916
#: bzrlib/plugins/launchpad/lp_api.py:289
6917
#, python-format
6918
msgid "Pushing to %s"
6919
msgstr ""
6920
6921
#: bzrlib/plugins/launchpad/lp_directory.py:170
6922
msgid ""
6923
"resolution for {0}\n"
6924
" local: {1}\n"
6925
" remote: {2}"
6926
msgstr ""
6927
6928
#: bzrlib/plugins/launchpad/lp_propose.py:149
6929
#, python-format
6930
msgid "There is already a branch merge proposal: %s"
6931
msgstr ""
6932
6933
#: bzrlib/plugins/weave_fmt/bzrdir.py:236
6934
msgid "pb parameter to convert() is deprecated"
6935
msgstr ""
6936
6937
#: bzrlib/plugins/weave_fmt/bzrdir.py:239
6938
msgid "starting upgrade from format 4 to 5"
6939
msgstr ""
6940
6941
#: bzrlib/plugins/weave_fmt/bzrdir.py:249
6942
msgid "note: upgrade may be faster if all store files are ungzipped first"
6943
msgstr ""
6944
6945
#: bzrlib/plugins/weave_fmt/bzrdir.py:278
6946
msgid "converting revision"
6947
msgstr ""
6948
6949
#: bzrlib/plugins/weave_fmt/bzrdir.py:283
6950
msgid "upgraded to weaves:"
6951
msgstr ""
6952
6953
#: bzrlib/plugins/weave_fmt/bzrdir.py:284
6954
#, python-format
6955
msgid "%6d revisions and inventories"
6956
msgstr ""
6957
6958
#: bzrlib/plugins/weave_fmt/bzrdir.py:286
6959
#, python-format
6960
msgid "%6d revisions not present"
6961
msgstr ""
6962
6963
#: bzrlib/plugins/weave_fmt/bzrdir.py:288
6964
#, python-format
6965
msgid "%6d texts"
6966
msgstr ""
6967
6968
#: bzrlib/plugins/weave_fmt/bzrdir.py:324
6969
msgid "writing weave"
6970
msgstr ""
6971
6972
#: bzrlib/plugins/weave_fmt/bzrdir.py:328
6973
#: bzrlib/plugins/weave_fmt/bzrdir.py:330
6974
msgid "inventory"
6975
msgstr ""
6976
6977
#: bzrlib/plugins/weave_fmt/bzrdir.py:347
6978
msgid "write revision"
6979
msgstr ""
6980
6981
#: bzrlib/plugins/weave_fmt/bzrdir.py:361
6982
msgid "loading revision"
6983
msgstr ""
6984
6985
#: bzrlib/plugins/weave_fmt/bzrdir.py:366
6986
#, python-format
6987
msgid "revision {%s} not present in branch; will be converted as a ghost"
6988
msgstr ""
6989
6990
#: bzrlib/plugins/weave_fmt/bzrdir.py:506
6991
msgid "starting upgrade from format 5 to 6"
6992
msgstr ""
6993
6994
#: bzrlib/plugins/weave_fmt/bzrdir.py:516
6995
#, python-format
6996
msgid "adding prefixes to %s"
6997
msgstr ""
6998
6999
#: bzrlib/plugins/weave_fmt/bzrdir.py:556
7000
msgid "starting upgrade from format 6 to metadir"
7001
msgstr ""
7002
7003
#: bzrlib/plugins/weave_fmt/bzrdir.py:564
7004
msgid "Removing ancestry.weave"
7005
msgstr ""
7006
7007
#: bzrlib/plugins/weave_fmt/bzrdir.py:569
7008
msgid "Finding branch files"
7009
msgstr ""
7010
7011
#: bzrlib/plugins/weave_fmt/bzrdir.py:579
7012
msgid "Upgrading repository"
7013
msgstr ""
7014
7015
#: bzrlib/plugins/weave_fmt/bzrdir.py:589
7016
msgid "Upgrading branch"
7017
msgstr ""
7018
7019
#: bzrlib/plugins/weave_fmt/bzrdir.py:612
7020
msgid "No working tree."
7021
msgstr ""
7022
7023
#: bzrlib/plugins/weave_fmt/bzrdir.py:619
7024
msgid "Upgrading working tree"
7025
msgstr ""
7026
7027
#: bzrlib/plugins/weave_fmt/bzrdir.py:640
7028
#, python-format
7029
msgid "Make %s lock"
7030
msgstr ""
7031
7032
#: bzrlib/plugins/weave_fmt/bzrdir.py:651
7033
#, python-format
7034
msgid "Moving %s"
7035
msgstr ""
7036
7037
#: bzrlib/push.py:56
7038
msgid "Created new branch."
7039
msgstr ""
7040
7041
#: bzrlib/push.py:97
7042
#, python-format
7043
msgid ""
7044
"Target directory %s already contains a .bzr directory, but it is not valid."
7045
msgstr ""
7046
7047
#: bzrlib/push.py:101
7048
#, python-format
7049
msgid ""
7050
"Target directory %s already exists, but does not have a .bzr directory. "
7051
"Supply --use-existing-dir to push there anyway."
7052
msgstr ""
7053
7054
#: bzrlib/push.py:122
7055
#, python-format
7056
msgid "Too many redirections trying to make %s."
7057
msgstr ""
7058
7059
#: bzrlib/push.py:147
7060
msgid ""
7061
"These branches have diverged. See \"bzr help diverged-branches\" for more "
7062
"information."
7063
msgstr ""
7064
7065
#: bzrlib/push.py:151
7066
#, python-format
7067
msgid ""
7068
"It is not possible to losslessly push to %s. You may want to use dpush "
7069
"instead."
7070
msgstr ""
7071
7072
#: bzrlib/push.py:157
7073
#, python-format
7074
msgid ""
7075
"At %s you have a valid .bzr control directory, but not a branch or "
7076
"repository. This is an unsupported configuration. Please move the target "
7077
"directory out of the way and try again."
7078
msgstr ""
7079
7080
#: bzrlib/reconcile.py:97
7081
#, python-format
7082
msgid "Reconciling branch %s"
7083
msgstr ""
7084
7085
#: bzrlib/reconcile.py:103
7086
#, python-format
7087
msgid "Reconciling repository %s"
7088
msgstr ""
7089
7090
#: bzrlib/reconcile.py:105
7091
msgid "Reconciling repository"
7092
msgstr ""
7093
7094
#: bzrlib/reconcile.py:111
7095
#, python-format
7096
msgid "%s cannot canonicalize CHKs."
7097
msgstr ""
7098
7099
#: bzrlib/reconcile.py:119
7100
msgid "Reconcile aborted: revision index has inconsistent parents."
7101
msgstr ""
7102
7103
#: bzrlib/reconcile.py:121
7104
msgid "Run \"bzr check\" for more details."
7105
msgstr ""
7106
7107
#: bzrlib/reconcile.py:123
7108
msgid "Reconciliation complete."
7109
msgstr ""
7110
7111
#: bzrlib/reconcile.py:166
7112
msgid "Fixing last revision info {0} => {1}"
7113
msgstr ""
7114
7115
#: bzrlib/reconcile.py:173
7116
msgid "revision_history ok."
7117
msgstr ""
7118
7119
#: bzrlib/reconcile.py:234
7120
msgid "Reading inventory data"
7121
msgstr ""
7122
7123
#: bzrlib/reconcile.py:254 bzrlib/reconcile.py:384
7124
msgid "Inventory ok."
7125
msgstr ""
7126
7127
#: bzrlib/reconcile.py:256 bzrlib/reconcile.py:386
7128
msgid "Backing up inventory"
7129
msgstr ""
7130
7131
#: bzrlib/reconcile.py:258
7132
msgid "Backup inventory created."
7133
msgstr ""
7134
7135
#: bzrlib/reconcile.py:274 bzrlib/reconcile.py:405
7136
msgid "Writing weave"
7137
msgstr ""
7138
7139
#: bzrlib/reconcile.py:277 bzrlib/reconcile.py:408
7140
msgid "Inventory regenerated."
7141
msgstr ""
7142
7143
#: bzrlib/reconcile.py:371 bzrlib/reconcile.py:373 bzrlib/reconcile.py:376
7144
msgid "Reading indexes"
7145
msgstr ""
7146
7147
#: bzrlib/reconcile.py:380 bzrlib/reconcile.py:382
7148
msgid "Checking unused inventories"
7149
msgstr ""
7150
7151
#: bzrlib/reconcile.py:388
7152
msgid "Backup Inventory created"
7153
msgstr ""
7154
7155
#: bzrlib/reconcile.py:446
7156
msgid "Fixing text parents"
7157
msgstr ""
7158
7159
#: bzrlib/reconfigure.py:54
7160
msgid "{0} is now stacked on {1}\n"
7161
msgstr ""
7162
7163
#: bzrlib/reconfigure.py:69
7164
#, python-format
7165
msgid "%s is now not stacked\n"
7166
msgstr ""
7167
7168
#: bzrlib/remote.py:1228 bzrlib/repository.py:289
7169
#, python-format
7170
msgid "bzr: ERROR (ignored): %s"
7171
msgstr ""
7172
7173
#: bzrlib/remote.py:2541
7174
msgid "Copying repository content as tarball..."
7175
msgstr ""
7176
7177
#: bzrlib/rename_map.py:69
7178
msgid "Calculating hashes"
7179
msgstr ""
7180
7181
#: bzrlib/rename_map.py:107
7182
msgid "Determining hash hits"
7183
msgstr ""
7184
7185
#: bzrlib/rename_map.py:242
7186
msgid "{0} => {1}"
7187
msgstr ""
7188
7189
#: bzrlib/repository.py:1787
7190
msgid "Moving repository to repository.backup"
7191
msgstr ""
7192
7193
#: bzrlib/repository.py:1794
7194
msgid "Creating new repository"
7195
msgstr ""
7196
7197
#: bzrlib/repository.py:1799
7198
msgid "Copying content"
7199
msgstr ""
7200
7201
#: bzrlib/repository.py:1803
7202
msgid "Deleting old repository content"
7203
msgstr ""
7204
7205
#: bzrlib/repository.py:1805
7206
msgid "repository converted"
7207
msgstr ""
7208
7209
#: bzrlib/revisionspec.py:903
7210
msgid "Using {0} {1}"
7211
msgstr ""
7212
7213
#: bzrlib/send.py:58
7214
#, python-format
7215
msgid "Mail client \"%s\" does not support specifying body"
7216
msgstr ""
7217
7218
#: bzrlib/send.py:62
7219
msgid "--remember requires a branch to be specified."
7220
msgstr ""
7221
7222
#: bzrlib/send.py:77
7223
msgid "No submit branch known or specified"
7224
msgstr ""
7225
7226
#: bzrlib/send.py:80
7227
msgid "Using saved {0} location \"{1}\" to determine what changes to submit."
7228
msgstr ""
7229
7230
#: bzrlib/send.py:98
7231
#, python-format
7232
msgid "No such send format '%s'."
7233
msgstr ""
7234
7235
#: bzrlib/send.py:114
7236
msgid "bzr send takes at most two one revision identifiers"
7237
msgstr ""
7238
7239
#: bzrlib/send.py:127
7240
msgid "No revisions to submit."
7241
msgstr ""
7242
7243
#: bzrlib/send.py:139
7244
msgid ""
7245
"- not supported for merge directives that use more than one output file."
7246
msgstr ""
7247
7248
#: bzrlib/send.py:185
7249
msgid "Format 0.9 does not permit bundle with no patch"
7250
msgstr ""
7251
7252
#: bzrlib/shelf_ui.py:46
7253
#, python-format
7254
msgid "Shelve adding file \"%(path)s\"?"
7255
msgstr ""
7256
7257
#: bzrlib/shelf_ui.py:47
7258
msgid "Shelve binary changes?"
7259
msgstr ""
7260
7261
#: bzrlib/shelf_ui.py:48
7262
msgid "Shelve changing \"%s\" from %(other)s to %(this)s?"
7263
msgstr ""
7264
7265
#: bzrlib/shelf_ui.py:50
7266
#, python-format
7267
msgid "Shelve removing file \"%(path)s\"?"
7268
msgstr ""
7269
7270
#: bzrlib/shelf_ui.py:51
7271
#, python-format
7272
msgid "Shelve %d change(s)?"
7273
msgstr ""
7274
7275
#: bzrlib/shelf_ui.py:52
7276
msgid "Shelve?"
7277
msgstr ""
7278
7279
#: bzrlib/shelf_ui.py:53
7280
#, python-format
7281
msgid ""
7282
"Shelve changing target of \"%(path)s\" from \"%(other)s\" to \"%(this)s\"?"
7283
msgstr ""
7284
7285
#: bzrlib/shelf_ui.py:55
7286
#, python-format
7287
msgid "Shelve renaming \"%(other)s\" => \"%(this)s\"?"
7288
msgstr ""
7289
7290
#: bzrlib/shelf_ui.py:70
7291
#, python-format
7292
msgid "Changes shelved with id \"%d\"."
7293
msgstr ""
7294
7295
#: bzrlib/shelf_ui.py:74
7296
msgid "Selected changes destroyed."
7297
msgstr ""
7298
7299
#: bzrlib/shelf_ui.py:78
7300
msgid "Selected changes:"
7301
msgstr ""
7302
7303
#: bzrlib/shelf_ui.py:98
7304
#, python-format
7305
msgid "Delete file \"%(path)s\"?"
7306
msgstr ""
7307
7308
#: bzrlib/shelf_ui.py:99
7309
msgid "Apply binary changes?"
7310
msgstr ""
7311
7312
#: bzrlib/shelf_ui.py:100
7313
#, python-format
7314
msgid "Change \"%(path)s\" from %(this)s to %(other)s?"
7315
msgstr ""
7316
7317
#: bzrlib/shelf_ui.py:102
7318
#, python-format
7319
msgid "Add file \"%(path)s\"?"
7320
msgstr ""
7321
7322
#: bzrlib/shelf_ui.py:103
7323
#, python-format
7324
msgid "Apply %d change(s)?"
7325
msgstr ""
7326
7327
#: bzrlib/shelf_ui.py:104
7328
msgid "Apply change?"
7329
msgstr ""
7330
7331
#: bzrlib/shelf_ui.py:105
7332
#, python-format
7333
msgid "Change target of \"%(path)s\" from \"%(this)s\" to \"%(other)s\"?"
7334
msgstr ""
7335
7336
#: bzrlib/shelf_ui.py:107
7337
#, python-format
7338
msgid "Rename \"%(this)s\" => \"%(other)s\"?"
7339
msgstr ""
7340
7341
#: bzrlib/shelf_ui.py:402
7342
msgid "No changes are shelved."
7343
msgstr ""
7344
7345
#: bzrlib/shelf_ui.py:460
7346
#, python-format
7347
msgid "Using changes with id \"%d\"."
7348
msgstr ""
7349
7350
#: bzrlib/shelf_ui.py:464
7351
#, python-format
7352
msgid "Message: %s"
7353
msgstr ""
7354
7355
#: bzrlib/shelf_ui.py:476
7356
#, python-format
7357
msgid "Deleted changes with id \"%d\"."
7358
msgstr ""
7359
7360
#: bzrlib/smart/medium.py:714
7361
msgid "HPSS calls: {0} ({1} vfs) {2}"
7362
msgstr ""
7363
7364
#: bzrlib/smart/server.py:169
7365
msgid "Requested to stop gracefully"
7366
msgstr ""
7367
7368
#: bzrlib/smart/server.py:179
7369
#, python-format
7370
msgid "Waiting for %d client(s) to finish"
7371
msgstr ""
7372
7373
#: bzrlib/smart/server.py:185
7374
#, python-format
7375
msgid "Still waiting for %d client(s) to finish"
7376
msgstr ""
7377
7378
#: bzrlib/smart/server.py:219
7379
#, python-format
7380
msgid "listening socket error: %s"
7381
msgstr ""
7382
7383
#: bzrlib/smart/server.py:452
7384
#, python-format
7385
msgid "listening on port: %s"
7386
msgstr ""
7387
7388
#: bzrlib/switch.py:73
7389
msgid "Pending merges must be committed or reverted before using switch."
7390
msgstr ""
7391
7392
#: bzrlib/switch.py:100
7393
msgid ""
7394
"Cannot switch as local commits found in the checkout. Commit these to the "
7395
"bound branch or use --force to throw them away."
7396
msgstr ""
7397
7398
#: bzrlib/switch.py:105
7399
#, python-format
7400
msgid ""
7401
"Unable to connect to current master branch %(target)s: %(error)s To switch "
7402
"anyway, use --force."
7403
msgstr ""
7404
7405
#: bzrlib/switch.py:125
7406
msgid "Cannot switch a branch, only a checkout."
7407
msgstr ""
7408
7409
#: bzrlib/switch.py:163
7410
#, python-format
7411
msgid "Tree is up to date at revision %d."
7412
msgstr ""
7413
7414
#: bzrlib/switch.py:169
7415
#, python-format
7416
msgid "Updated to revision %d."
7417
msgstr ""
7418
7419
#: bzrlib/transform.py:1734 bzrlib/transform.py:1745 bzrlib/transform.py:1747
7420
msgid "Apply phase"
7421
msgstr ""
7422
7423
#: bzrlib/transform.py:1773 bzrlib/transform.py:1841
7424
msgid "removing file"
7425
msgstr ""
7426
7427
#: bzrlib/transform.py:1791 bzrlib/transform.py:1876
7428
msgid "adding file"
7429
msgstr ""
7430
7431
#: bzrlib/transform.py:2591
7432
msgid "Building tree"
7433
msgstr ""
7434
7435
#: bzrlib/transform.py:2681 bzrlib/transform.py:2708
7436
msgid "Adding file contents"
7437
msgstr ""
7438
7439
#: bzrlib/transform.py:3028
7440
msgid "Resolution pass"
7441
msgstr ""
7442
7443
#: bzrlib/transport/ftp/_gssapi.py:88
7444
#, python-format
7445
msgid "Authenticated as %s"
7446
msgstr ""
7447
7448
#: bzrlib/tree.py:634
7449
msgid "*** {0} content-filter: {1} => {2!r}"
7450
msgstr ""
7451
7452
#: bzrlib/upgrade.py:77
7453
#, python-format
7454
msgid "This is a checkout. The branch (%s) needs to be upgraded separately."
7455
msgstr ""
7456
7457
#: bzrlib/upgrade.py:100
7458
#, python-format
7459
msgid "cannot upgrade from bzrdir format %s"
7460
msgstr ""
7461
7462
#: bzrlib/upgrade.py:103
7463
#, python-format
7464
msgid "starting upgrade of %s"
7465
msgstr ""
7466
7467
#: bzrlib/upgrade.py:110
7468
msgid "finished"
7469
msgstr ""
7470
7471
#: bzrlib/upgrade.py:120
7472
msgid "Deleting backup.bzr"
7473
msgstr ""
7474
7475
#: bzrlib/upgrade.py:151
7476
msgid ""
7477
"\n"
7478
"SUMMARY: {0} upgrades attempted, {1} succeeded, {2} failed"
7479
msgstr ""
7480
7481
#: bzrlib/upgrade.py:208
7482
#, python-format
7483
msgid "Found %d dependent branches - upgrading ..."
7484
msgstr ""
7485
7486
#: bzrlib/upgrade.py:276
7487
msgid "Upgrading bzrdirs"
7488
msgstr ""
7489
7490
#: bzrlib/upgrade.py:282
7491
#, python-format
7492
msgid "Upgrading %s"
7493
msgstr ""
7494
7495
#: bzrlib/upgrade.py:283
7496
msgid "Upgrading {0} {1} ..."
7497
msgstr ""
7498
7499
#: bzrlib/upgrade.py:301
7500
msgid "Removing backup ..."
7501
msgstr ""
7502
7503
#: bzrlib/upgrade.py:305
7504
msgid "failed to clean-up {0}: {1}"
7505
msgstr ""
7506
7507
#: bzrlib/vf_repository.py:1090
7508
msgid "inventories"
7509
msgstr ""
7510
7511
#: bzrlib/vf_repository.py:1116
7512
msgid "texts"
7513
msgstr ""
7514
7515
#: bzrlib/vf_repository.py:1621 bzrlib/vf_repository.py:1630
7516
msgid "Calculating text parents"
7517
msgstr ""
7518
7519
#: bzrlib/vf_repository.py:1706
7520
msgid "Fetch texts"
7521
msgstr ""
7522
7523
#: bzrlib/vf_repository.py:2535
7524
msgid "loading text store"
7525
msgstr ""
7526
7527
#: bzrlib/vf_repository.py:2541
7528
msgid "checking text graph"
7529
msgstr ""
7530
7531
#: bzrlib/vf_repository.py:2995 bzrlib/vf_repository.py:3009
7532
#: bzrlib/vf_repository.py:3124
7533
msgid "Transferring revisions"
7534
msgstr ""
7535
7536
#: bzrlib/win32utils.py:146
7537
msgid "Failed to GetProcessMemoryInfo()"
7538
msgstr ""
7539
7540
#: bzrlib/win32utils.py:167
7541
msgid "Cannot debug memory on win32 without ctypes or win32process"
7542
msgstr ""
7543
7544
#: bzrlib/win32utils.py:172
7545
msgid "WorkingSize {0:>7}KiB\tPeakWorking {1:>7}KiB\t{2}"
7546
msgstr ""
7547
7548
#: bzrlib/win32utils.py:180
7549
#, python-format
7550
msgid "WorkingSize %8d KiB"
7551
msgstr ""
7552
7553
#: bzrlib/win32utils.py:181
7554
#, python-format
7555
msgid "PeakWorking %8d KiB"
7556
msgstr ""
7557
7558
#: bzrlib/win32utils.py:182
7559
#, python-format
7560
msgid "PagefileUsage %8d KiB"
7561
msgstr ""
7562
7563
#: bzrlib/win32utils.py:183
7564
#, python-format
7565
msgid "PeakPagefileUsage %8d KiB"
7566
msgstr ""
7567
7568
#: bzrlib/win32utils.py:185
7569
#, python-format
7570
msgid "PrivateUsage %8d KiB"
7571
msgstr ""
7572
7573
#: bzrlib/win32utils.py:186
7574
#, python-format
7575
msgid "PageFaultCount %8d"
7576
msgstr ""
7577
7578
#: bzrlib/workingtree.py:1478
7579
msgid "Rerun update after fixing the conflicts."
7580
msgstr ""
7581
7582
#: dummy/help_topics/authentication/summary.txt:1
7583
msgid "Information on configuring authentication"
7584
msgstr ""
7585
7586
#: dummy/help_topics/basic/detail.txt:1
7587
msgid ""
7588
"Bazaar 2.5b6 -- a free distributed version-control tool\n"
7589
"http://bazaar.canonical.com/"
7590
msgstr ""
7591
7592
#: dummy/help_topics/basic/detail.txt:4
7593
msgid ""
7594
"Basic commands:\n"
7595
" bzr init makes this directory a versioned branch\n"
7596
" bzr branch make a copy of another branch"
7597
msgstr ""
7598
7599
#: dummy/help_topics/basic/detail.txt:8
7600
msgid ""
7601
" bzr add make files or directories versioned\n"
7602
" bzr ignore ignore a file or pattern\n"
7603
" bzr mv move or rename a versioned file"
7604
msgstr ""
7605
7606
#: dummy/help_topics/basic/detail.txt:12
7607
msgid ""
7608
" bzr status summarize changes in working copy\n"
7609
" bzr diff show detailed diffs"
7610
msgstr ""
7611
7612
#: dummy/help_topics/basic/detail.txt:15
7613
msgid ""
7614
" bzr merge pull in changes from another branch\n"
7615
" bzr commit save some or all changes\n"
7616
" bzr send send changes via email"
7617
msgstr ""
7618
7619
#: dummy/help_topics/basic/detail.txt:19
7620
msgid ""
7621
" bzr log show history of changes\n"
7622
" bzr check validate storage"
7623
msgstr ""
7624
7625
#: dummy/help_topics/basic/detail.txt:22
7626
msgid ""
7627
" bzr help init more help on e.g. init command\n"
7628
" bzr help commands list all commands\n"
7629
" bzr help topics list all help topics\n"
7630
msgstr ""
7631
7632
#: dummy/help_topics/basic/summary.txt:1
7633
msgid "Basic commands"
7634
msgstr ""
7635
7636
#: dummy/help_topics/branches/detail.txt:1
7637
msgid "Branches"
7638
msgstr ""
7639
7640
#: dummy/help_topics/branches/detail.txt:3
7641
msgid ""
7642
"A branch consists of the state of a project, including all of its\n"
7643
"history. All branches have a repository associated (which is where the\n"
7644
"branch history is stored), but multiple branches may share the same\n"
7645
"repository (a shared repository). Branches can be copied and merged."
7646
msgstr ""
7647
7648
#: dummy/help_topics/branches/detail.txt:8
7649
msgid ""
7650
"In addition, one branch may be bound to another one. Binding to another\n"
7651
"branch indicates that commits which happen in this branch must also \n"
7652
"happen in the other branch. Bazaar ensures consistency by not allowing \n"
7653
"commits when the two branches are out of date. In order for a commit \n"
7654
"to succeed, it may be necessary to update the current branch using \n"
7655
"``bzr update``."
7656
msgstr ""
7657
7658
#: dummy/help_topics/branches/detail.txt:15
7659
#: dummy/help_topics/checkouts/detail.txt:66
7660
#: dummy/help_topics/repositories/detail.txt:36
7661
msgid "Related commands::"
7662
msgstr ""
7663
7664
#: dummy/help_topics/branches/detail.txt:17
7665
msgid ""
7666
" init Change a directory into a versioned branch.\n"
7667
" branch Create a new branch that is a copy of an existing branch.\n"
7668
" merge Perform a three-way merge.\n"
7669
" bind Bind a branch to another one.\n"
7670
msgstr ""
7671
7672
#: dummy/help_topics/branches/summary.txt:1
7673
msgid "Information on what a branch is"
7674
msgstr ""
7675
7676
#: dummy/help_topics/bugs/summary.txt:1
7677
msgid "Bug tracker settings"
7678
msgstr ""
7679
7680
#: dummy/help_topics/checkouts/detail.txt:1
7681
msgid "Checkouts"
7682
msgstr ""
7683
7684
#: dummy/help_topics/checkouts/detail.txt:3
7685
msgid ""
7686
"Checkouts are source trees that are connected to a branch, so that when\n"
7687
"you commit in the source tree, the commit goes into that branch. They\n"
7688
"allow you to use a simpler, more centralized workflow, ignoring some of\n"
7689
"Bazaar's decentralized features until you want them. Using checkouts\n"
7690
"with shared repositories is very similar to working with SVN or CVS, but\n"
7691
"doesn't have the same restrictions. And using checkouts still allows\n"
7692
"others working on the project to use whatever workflow they like."
7693
msgstr ""
7694
7695
#: dummy/help_topics/checkouts/detail.txt:11
7696
msgid ""
7697
"A checkout is created with the bzr checkout command (see \"help "
7698
"checkout\").\n"
7699
"You pass it a reference to another branch, and it will create a local copy\n"
7700
"for you that still contains a reference to the branch you created the\n"
7701
"checkout from (the master branch). Then if you make any commits they will "
7702
"be\n"
7703
"made on the other branch first. This creates an instant mirror of your work, "
7704
"or\n"
7705
"facilitates lockstep development, where each developer is working together,\n"
7706
"continuously integrating the changes of others."
7707
msgstr ""
7708
7709
#: dummy/help_topics/checkouts/detail.txt:19
7710
msgid ""
7711
"However the checkout is still a first class branch in Bazaar terms, so that\n"
7712
"you have the full history locally. As you have a first class branch you "
7713
"can\n"
7714
"also commit locally if you want, for instance due to the temporary loss af "
7715
"a\n"
7716
"network connection. Use the --local option to commit to do this. All the "
7717
"local\n"
7718
"commits will then be made on the master branch the next time you do a non-"
7719
"local\n"
7720
"commit."
7721
msgstr ""
7722
7723
#: dummy/help_topics/checkouts/detail.txt:26
7724
msgid ""
7725
"If you are using a checkout from a shared branch you will periodically want "
7726
"to\n"
7727
"pull in all the changes made by others. This is done using the \"update\"\n"
7728
"command. The changes need to be applied before any non-local commit, but\n"
7729
"Bazaar will tell you if there are any changes and suggest that you use this\n"
7730
"command when needed."
7731
msgstr ""
7732
7733
#: dummy/help_topics/checkouts/detail.txt:32
7734
msgid ""
7735
"It is also possible to create a \"lightweight\" checkout by passing the\n"
7736
"--lightweight flag to checkout. A lightweight checkout is even closer to an\n"
7737
"SVN checkout in that it is not a first class branch, it mainly consists of "
7738
"the\n"
7739
"working tree. This means that any history operations must query the master\n"
7740
"branch, which could be slow if a network connection is involved. Also, as "
7741
"you\n"
7742
"don't have a local branch, then you cannot commit locally."
7743
msgstr ""
7744
7745
#: dummy/help_topics/checkouts/detail.txt:39
7746
msgid ""
7747
"Lightweight checkouts work best when you have fast reliable access to the\n"
7748
"master branch. This means that if the master branch is on the same disk or "
7749
"LAN\n"
7750
"a lightweight checkout will be faster than a heavyweight one for any "
7751
"commands\n"
7752
"that modify the revision history (as only one copy of the branch needs to\n"
7753
"be updated). Heavyweight checkouts will generally be faster for any command\n"
7754
"that uses the history but does not change it, but if the master branch is "
7755
"on\n"
7756
"the same disk then there won't be a noticeable difference."
7757
msgstr ""
7758
7759
#: dummy/help_topics/checkouts/detail.txt:47
7760
msgid ""
7761
"Another possible use for a checkout is to use it with a treeless repository\n"
7762
"containing your branches, where you maintain only one working tree by\n"
7763
"switching the master branch that the checkout points to when you want to\n"
7764
"work on a different branch."
7765
msgstr ""
7766
7767
#: dummy/help_topics/checkouts/detail.txt:52
7768
msgid ""
7769
"Obviously to commit on a checkout you need to be able to write to the "
7770
"master\n"
7771
"branch. This means that the master branch must be accessible over a "
7772
"writeable\n"
7773
"protocol , such as sftp://, and that you have write permissions at the "
7774
"other\n"
7775
"end. Checkouts also work on the local file system, so that all that matters "
7776
"is\n"
7777
"file permissions."
7778
msgstr ""
7779
7780
#: dummy/help_topics/checkouts/detail.txt:58
7781
msgid ""
7782
"You can change the master of a checkout by using the \"switch\" command "
7783
"(see\n"
7784
"\"help switch\"). This will change the location that the commits are sent "
7785
"to.\n"
7786
"The \"bind\" command can also be used to turn a normal branch into a heavy\n"
7787
"checkout. If you would like to convert your heavy checkout into a normal\n"
7788
"branch so that every commit is local, you can use the \"unbind\" command. To "
7789
"see\n"
7790
"whether or not a branch is bound or not you can use the \"info\" command. If "
7791
"the\n"
7792
"branch is bound it will tell you the location of the bound branch."
7793
msgstr ""
7794
7795
#: dummy/help_topics/checkouts/detail.txt:68
7796
msgid ""
7797
" checkout Create a checkout. Pass --lightweight to get a lightweight\n"
7798
" checkout\n"
7799
" update Pull any changes in the master branch in to your checkout\n"
7800
" commit Make a commit that is sent to the master branch. If you have\n"
7801
" a heavy checkout then the --local option will commit to the\n"
7802
" checkout without sending the commit to the master\n"
7803
" switch Change the master branch that the commits in the checkout "
7804
"will\n"
7805
" be sent to\n"
7806
" bind Turn a standalone branch into a heavy checkout so that any\n"
7807
" commits will be sent to the master branch\n"
7808
" unbind Turn a heavy checkout into a standalone branch so that any\n"
7809
" commits are only made locally\n"
7810
" info Displays whether a branch is bound or unbound. If the branch "
7811
"is\n"
7812
" bound, then it will also display the location of the bound "
7813
"branch\n"
7814
msgstr ""
7815
7816
#: dummy/help_topics/checkouts/summary.txt:1
7817
msgid "Information on what a checkout is"
7818
msgstr ""
7819
7820
#: dummy/help_topics/commands/summary.txt:1
7821
msgid "Basic help for all commands"
7822
msgstr ""
7823
7824
#: dummy/help_topics/configuration/summary.txt:1
7825
msgid "Details on the configuration settings available"
7826
msgstr ""
7827
7828
#: dummy/help_topics/conflict-types/summary.txt:1
7829
msgid "Types of conflicts and what to do about them"
7830
msgstr ""
7831
7832
#: dummy/help_topics/content-filters/summary.txt:1
7833
msgid "Conversion of content into/from working trees"
7834
msgstr ""
7835
7836
#: dummy/help_topics/criss-cross/detail.txt:1
7837
msgid "Criss-Cross"
7838
msgstr ""
7839
7840
#: dummy/help_topics/criss-cross/detail.txt:3
7841
msgid ""
7842
"A criss-cross in the branch history can cause the default merge technique\n"
7843
"to emit more conflicts than would normally be expected."
7844
msgstr ""
7845
7846
#: dummy/help_topics/criss-cross/detail.txt:6
7847
msgid ""
7848
"In complex merge cases, ``bzr merge --lca`` or ``bzr merge --weave`` may "
7849
"give\n"
7850
"better results. You may wish to ``bzr revert`` the working tree and merge\n"
7851
"again. Alternatively, use ``bzr remerge`` on particular conflicted files."
7852
msgstr ""
7853
7854
#: dummy/help_topics/criss-cross/detail.txt:10
7855
msgid ""
7856
"Criss-crosses occur in a branch's history if two branches merge the same "
7857
"thing\n"
7858
"and then merge one another, or if two branches merge one another at the "
7859
"same\n"
7860
"time. They can be avoided by having each branch only merge from or into a\n"
7861
"designated central branch (a \"star topology\")."
7862
msgstr ""
7863
7864
#: dummy/help_topics/criss-cross/detail.txt:15
7865
msgid ""
7866
"Criss-crosses cause problems because of the way merge works. Bazaar's "
7867
"default\n"
7868
"merge is a three-way merger; in order to merge OTHER into THIS, it must\n"
7869
"find a basis for comparison, BASE. Using BASE, it can determine whether\n"
7870
"differences between THIS and OTHER are due to one side adding lines, or\n"
7871
"from another side removing lines."
7872
msgstr ""
7873
7874
#: dummy/help_topics/criss-cross/detail.txt:21
7875
msgid ""
7876
"Criss-crosses mean there is no good choice for a base. Selecting the "
7877
"recent\n"
7878
"merge points could cause one side's changes to be silently discarded.\n"
7879
"Selecting older merge points (which Bazaar does) mean that extra conflicts\n"
7880
"are emitted."
7881
msgstr ""
7882
7883
#: dummy/help_topics/criss-cross/detail.txt:26
7884
msgid ""
7885
"The ``weave`` merge type is not affected by this problem because it uses\n"
7886
"line-origin detection instead of a basis revision to determine the cause of\n"
7887
"differences.\n"
7888
msgstr ""
7889
7890
#: dummy/help_topics/criss-cross/summary.txt:1
7891
msgid "Information on criss-cross merging"
7892
msgstr ""
7893
7894
#: dummy/help_topics/current-formats/summary.txt:1
7895
msgid "Current storage formats"
7896
msgstr ""
7897
7898
#: dummy/help_topics/debug-flags/summary.txt:1
7899
msgid "Options to show or record debug information"
7900
msgstr ""
7901
7902
#: dummy/help_topics/diverged-branches/summary.txt:1
7903
msgid "How to fix diverged branches"
7904
msgstr ""
7905
7906
#: dummy/help_topics/env-variables/detail.txt:1
7907
msgid "Environment Variables"
7908
msgstr ""
7909
7910
#: dummy/help_topics/env-variables/detail.txt:3
7911
msgid ""
7912
"=================== "
7913
"===========================================================\n"
7914
"BZRPATH Path where bzr is to look for shell plugin external\n"
7915
" commands.\n"
7916
"BZR_EMAIL E-Mail address of the user. Overrides EMAIL.\n"
7917
"EMAIL E-Mail address of the user.\n"
7918
"BZR_EDITOR Editor for editing commit messages. Overrides EDITOR.\n"
7919
"EDITOR Editor for editing commit messages.\n"
7920
"BZR_PLUGIN_PATH Paths where bzr should look for plugins.\n"
7921
"BZR_DISABLE_PLUGINS Plugins that bzr should not load.\n"
7922
"BZR_PLUGINS_AT Plugins to load from a directory not in "
7923
"BZR_PLUGIN_PATH.\n"
7924
"BZR_HOME Directory holding .bazaar config dir. Overrides HOME.\n"
7925
"BZR_HOME (Win32) Directory holding bazaar config dir. Overrides APPDATA "
7926
"and\n"
7927
" HOME.\n"
7928
"BZR_REMOTE_PATH Full name of remote 'bzr' command (for bzr+ssh:// "
7929
"URLs).\n"
7930
"BZR_SSH Path to SSH client, or one of paramiko, openssh, "
7931
"sshcorp,\n"
7932
" plink or lsh.\n"
7933
"BZR_LOG Location of .bzr.log (use '/dev/null' to suppress log).\n"
7934
"BZR_LOG (Win32) Location of .bzr.log (use 'NUL' to suppress log).\n"
7935
"BZR_COLUMNS Override implicit terminal width.\n"
7936
"BZR_CONCURRENCY Number of processes that can be run concurrently "
7937
"(selftest)\n"
7938
"BZR_PROGRESS_BAR Override the progress display. Values are 'none' or "
7939
"'text'.\n"
7940
"BZR_PDB Control whether to launch a debugger on error.\n"
7941
"BZR_SIGQUIT_PDB Control whether SIGQUIT behaves normally or invokes a\n"
7942
" breakin debugger.\n"
7943
"BZR_TEXTUI_INPUT Force console input mode for prompts to line-based "
7944
"(instead\n"
7945
" of char-based).\n"
7946
"=================== "
7947
"===========================================================\n"
7948
msgstr ""
7949
7950
#: dummy/help_topics/env-variables/summary.txt:1
7951
msgid "Environment variable names and values"
7952
msgstr ""
7953
7954
#: dummy/help_topics/eol/summary.txt:1
7955
msgid "Information on end-of-line handling"
7956
msgstr ""
7957
7958
#: dummy/help_topics/files/detail.txt:1
7959
msgid "Files"
7960
msgstr ""
7961
7962
#: dummy/help_topics/files/detail.txt:3
7963
msgid ""
7964
":On Unix: ~/.bazaar/bazaar.conf\n"
7965
":On Windows: C:\\\\Documents and Settings\\\\username\\\\Application Data\\\\"
7966
"bazaar\\\\2.0\\\\bazaar.conf"
7967
msgstr ""
7968
7969
#: dummy/help_topics/files/detail.txt:6
7970
msgid ""
7971
"Contains the user's default configuration. The section ``[DEFAULT]`` is\n"
7972
"used to define general configuration that will be applied everywhere.\n"
7973
"The section ``[ALIASES]`` can be used to create command aliases for\n"
7974
"commonly used options."
7975
msgstr ""
7976
7977
#: dummy/help_topics/files/detail.txt:11
7978
msgid "A typical config file might look something like::"
7979
msgstr ""
7980
7981
#: dummy/help_topics/files/detail.txt:13
7982
msgid ""
7983
" [DEFAULT]\n"
7984
" email=John Doe <jdoe@isp.com>"
7985
msgstr ""
7986
7987
#: dummy/help_topics/files/detail.txt:16
7988
msgid ""
7989
" [ALIASES]\n"
7990
" commit = commit --strict\n"
7991
" log10 = log --short -r -10..-1\n"
7992
msgstr ""
7993
7994
#: dummy/help_topics/files/summary.txt:1
7995
msgid "Information on configuration and log files"
7996
msgstr ""
7997
7998
#: dummy/help_topics/formats/detail.txt:1
7999
msgid "Storage Formats"
8000
msgstr ""
8001
8002
#: dummy/help_topics/formats/detail.txt:3
8003
msgid ""
8004
"To ensure that older clients do not access data incorrectly,\n"
8005
"Bazaar's policy is to introduce a new storage format whenever\n"
8006
"new features requiring new metadata are added. New storage\n"
8007
"formats may also be introduced to improve performance and\n"
8008
"scalability."
8009
msgstr ""
8010
8011
#: dummy/help_topics/formats/detail.txt:9
8012
msgid ""
8013
"The newest format, 2a, is highly recommended. If your\n"
8014
"project is not using 2a, then you should suggest to the\n"
8015
"project owner to upgrade."
8016
msgstr ""
8017
8018
#: dummy/help_topics/formats/detail.txt:13
8019
msgid ""
8020
"\n"
8021
".. note::"
8022
msgstr ""
8023
8024
#: dummy/help_topics/formats/detail.txt:16
8025
msgid ""
8026
" Some of the older formats have two variants:\n"
8027
" a plain one and a rich-root one. The latter include an additional\n"
8028
" field about the root of the tree. There is no performance cost\n"
8029
" for using a rich-root format but you cannot easily merge changes\n"
8030
" from a rich-root format into a plain format. As a consequence,\n"
8031
" moving a project to a rich-root format takes some co-ordination\n"
8032
" in that all contributors need to upgrade their repositories\n"
8033
" around the same time. 2a and all future formats will be\n"
8034
" implicitly rich-root."
8035
msgstr ""
8036
8037
#: dummy/help_topics/formats/detail.txt:26
8038
msgid ""
8039
"See :doc:`current-formats-help` for the complete list of\n"
8040
"currently supported formats. See :doc:`other-formats-help` for\n"
8041
"descriptions of any available experimental and deprecated formats.\n"
8042
msgstr ""
8043
8044
#: dummy/help_topics/formats/summary.txt:1
8045
msgid "Information on choosing a storage format"
8046
msgstr ""
8047
8048
#: dummy/help_topics/global-options/detail.txt:1
8049
msgid "Global Options"
8050
msgstr ""
8051
8052
#: dummy/help_topics/global-options/detail.txt:3
8053
msgid ""
8054
"These options may be used with any command, and may appear in front of any\n"
8055
"command. (e.g. ``bzr --profile help``)."
8056
msgstr ""
8057
8058
#: dummy/help_topics/global-options/detail.txt:6
8059
msgid ""
8060
"--version Print the version number. Must be supplied before the "
8061
"command.\n"
8062
"--no-aliases Do not process command aliases when running this command.\n"
8063
"--builtin Use the built-in version of a command, not the plugin "
8064
"version.\n"
8065
" This does not suppress other plugin effects.\n"
8066
"--no-plugins Do not process any plugins.\n"
8067
"--no-l10n Do not translate messages.\n"
8068
"--concurrency Number of processes that can be run concurrently (selftest)."
8069
msgstr ""
8070
8071
#: dummy/help_topics/global-options/detail.txt:14
8072
msgid ""
8073
"--profile Profile execution using the hotshot profiler.\n"
8074
"--lsprof Profile execution using the lsprof profiler.\n"
8075
"--lsprof-file Profile execution using the lsprof profiler, and write the\n"
8076
" results to a specified file. If the filename ends with "
8077
"\".txt\",\n"
8078
" text format will be used. If the filename either starts "
8079
"with\n"
8080
" \"callgrind.out\" or end with \".callgrind\", the output will "
8081
"be\n"
8082
" formatted for use with KCacheGrind. Otherwise, the output\n"
8083
" will be a pickle.\n"
8084
"--coverage Generate line coverage report in the specified directory."
8085
msgstr ""
8086
8087
#: dummy/help_topics/global-options/detail.txt:24
8088
msgid ""
8089
"-Oname=value Override the ``name`` config option setting it to ``value`` "
8090
"for\n"
8091
" the duration of the command. This can be used multiple times "
8092
"if\n"
8093
" several options need to be overridden."
8094
msgstr ""
8095
8096
#: dummy/help_topics/global-options/detail.txt:28
8097
msgid ""
8098
"See http://doc.bazaar.canonical.com/developers/profiling.html for more\n"
8099
"information on profiling."
8100
msgstr ""
8101
8102
#: dummy/help_topics/global-options/detail.txt:31
8103
msgid ""
8104
"A number of debug flags are also available to assist troubleshooting and\n"
8105
"development. See :doc:`debug-flags-help`.\n"
8106
msgstr ""
8107
8108
#: dummy/help_topics/global-options/summary.txt:1
8109
msgid "Options that control how Bazaar runs"
8110
msgstr ""
8111
8112
#: dummy/help_topics/hidden-commands/summary.txt:1
8113
msgid "All hidden commands"
8114
msgstr ""
8115
8116
#: dummy/help_topics/hooks/summary.txt:1
8117
msgid "Points at which custom processing can be added"
8118
msgstr ""
8119
8120
#: dummy/help_topics/launchpad/detail.txt:1
8121
msgid "Integration with Launchpad.net"
8122
msgstr ""
8123
8124
#: dummy/help_topics/launchpad/detail.txt:3
8125
msgid ""
8126
"Launchpad.net provides free Bazaar branch hosting with integrated bug and\n"
8127
"specification tracking."
8128
msgstr ""
8129
8130
#: dummy/help_topics/launchpad/detail.txt:6
8131
msgid ""
8132
"The bzr client (through the plugin called 'launchpad') has special\n"
8133
"features to communicate with Launchpad:"
8134
msgstr ""
8135
8136
#: dummy/help_topics/launchpad/detail.txt:9
8137
msgid ""
8138
" * The launchpad-login command tells Bazaar your Launchpad user name. "
8139
"This\n"
8140
" is then used by the 'lp:' transport to download your branches using\n"
8141
" bzr+ssh://."
8142
msgstr ""
8143
8144
#: dummy/help_topics/launchpad/detail.txt:13
8145
msgid ""
8146
" * The 'lp:' transport uses Launchpad as a directory service: for "
8147
"example\n"
8148
" 'lp:bzr' and 'lp:python' refer to the main branches of the relevant\n"
8149
" projects and may be branched, logged, etc. You can also use the 'lp:'\n"
8150
" transport to refer to specific branches, e.g. lp:~bzr/bzr/trunk."
8151
msgstr ""
8152
8153
#: dummy/help_topics/launchpad/detail.txt:18
8154
msgid ""
8155
" * The 'lp:' bug tracker alias can expand launchpad bug numbers to their\n"
8156
" URLs for use with 'bzr commit --fixes', e.g. 'bzr commit --fixes "
8157
"lp:12345'\n"
8158
" will record a revision property that marks that revision as fixing\n"
8159
" Launchpad bug 12345. When you push that branch to Launchpad it will\n"
8160
" automatically be linked to the bug report."
8161
msgstr ""
8162
8163
#: dummy/help_topics/launchpad/detail.txt:24
8164
msgid ""
8165
" * The register-branch command tells Launchpad about the url of a\n"
8166
" public branch. Launchpad will then mirror the branch, display\n"
8167
" its contents and allow it to be attached to bugs and other\n"
8168
" objects."
8169
msgstr ""
8170
8171
#: dummy/help_topics/launchpad/detail.txt:29
8172
msgid "For more information see http://help.launchpad.net/\n"
8173
msgstr ""
8174
8175
#: dummy/help_topics/launchpad/summary.txt:1
8176
msgid "Using Bazaar with Launchpad.net"
8177
msgstr ""
8178
8179
#: dummy/help_topics/location-alias/summary.txt:1
8180
msgid "Aliases for remembered locations"
8181
msgstr ""
8182
8183
#: dummy/help_topics/log-formats/summary.txt:1
8184
msgid "Details on the logging formats available"
8185
msgstr ""
8186
8187
#: dummy/help_topics/other-formats/summary.txt:1
8188
msgid "Experimental and deprecated storage formats"
8189
msgstr ""
8190
8191
#: dummy/help_topics/patterns/summary.txt:1
8192
msgid "Information on the pattern syntax"
8193
msgstr ""
8194
8195
#: dummy/help_topics/repositories/detail.txt:1
8196
msgid "Repositories"
8197
msgstr ""
8198
8199
#: dummy/help_topics/repositories/detail.txt:3
8200
msgid ""
8201
"Repositories in Bazaar are where committed information is stored. There is\n"
8202
"a repository associated with every branch."
8203
msgstr ""
8204
8205
#: dummy/help_topics/repositories/detail.txt:6
8206
msgid ""
8207
"Repositories are a form of database. Bzr will usually maintain this for\n"
8208
"good performance automatically, but in some situations (e.g. when doing\n"
8209
"very many commits in a short time period) you may want to ask bzr to\n"
8210
"optimise the database indices. This can be done by the 'bzr pack' command."
8211
msgstr ""
8212
8213
#: dummy/help_topics/repositories/detail.txt:11
8214
msgid ""
8215
"By default just running 'bzr init' will create a repository within the new\n"
8216
"branch but it is possible to create a shared repository which allows "
8217
"multiple\n"
8218
"branches to share their information in the same location. When a new branch "
8219
"is\n"
8220
"created it will first look to see if there is a containing shared repository "
8221
"it\n"
8222
"can use."
8223
msgstr ""
8224
8225
#: dummy/help_topics/repositories/detail.txt:17
8226
msgid ""
8227
"When two branches of the same project share a repository, there is\n"
8228
"generally a large space saving. For some operations (e.g. branching\n"
8229
"within the repository) this translates in to a large time saving."
8230
msgstr ""
8231
8232
#: dummy/help_topics/repositories/detail.txt:21
8233
msgid ""
8234
"To create a shared repository use the init-repository command (or the alias\n"
8235
"init-repo). This command takes the location of the repository to create. "
8236
"This\n"
8237
"means that 'bzr init-repository repo' will create a directory named 'repo',\n"
8238
"which contains a shared repository. Any new branches that are created in "
8239
"this\n"
8240
"directory will then use it for storage."
8241
msgstr ""
8242
8243
#: dummy/help_topics/repositories/detail.txt:27
8244
msgid ""
8245
"It is a good idea to create a repository whenever you might create more\n"
8246
"than one branch of a project. This is true for both working areas where you\n"
8247
"are doing the development, and any server areas that you use for hosting\n"
8248
"projects. In the latter case, it is common to want branches without working\n"
8249
"trees. Since the files in the branch will not be edited directly there is "
8250
"no\n"
8251
"need to use up disk space for a working tree. To create a repository in "
8252
"which\n"
8253
"the branches will not have working trees pass the '--no-trees' option to\n"
8254
"'init-repository'."
8255
msgstr ""
8256
8257
#: dummy/help_topics/repositories/detail.txt:38
8258
msgid ""
8259
" init-repository Create a shared repository. Use --no-trees to create "
8260
"one\n"
8261
" in which new branches won't get a working tree.\n"
8262
msgstr ""
8263
8264
#: dummy/help_topics/repositories/summary.txt:1
8265
msgid "Basic information on shared repositories."
8266
msgstr ""
8267
8268
#: dummy/help_topics/revisionspec/summary.txt:1
8269
msgid "Explain how to use --revision"
8270
msgstr ""
8271
8272
#: dummy/help_topics/rules/summary.txt:1
8273
msgid "Information on defining rule-based preferences"
8274
msgstr ""
8275
8276
#: dummy/help_topics/standalone-trees/detail.txt:1
8277
msgid "Standalone Trees"
8278
msgstr ""
8279
8280
#: dummy/help_topics/standalone-trees/detail.txt:3
8281
msgid ""
8282
"A standalone tree is a working tree with an associated repository. It\n"
8283
"is an independently usable branch, with no dependencies on any other.\n"
8284
"Creating a standalone tree (via bzr init) is the quickest way to put\n"
8285
"an existing project under version control."
8286
msgstr ""
8287
8288
#: dummy/help_topics/standalone-trees/detail.txt:8
8289
msgid "Related Commands::"
8290
msgstr ""
8291
8292
#: dummy/help_topics/standalone-trees/detail.txt:10
8293
msgid " init Make a directory into a versioned branch.\n"
8294
msgstr ""
8295
8296
#: dummy/help_topics/standalone-trees/summary.txt:1
8297
msgid "Information on what a standalone tree is"
8298
msgstr ""
8299
8300
#: dummy/help_topics/standard-options/detail.txt:1
8301
msgid "Standard Options"
8302
msgstr ""
8303
8304
#: dummy/help_topics/standard-options/detail.txt:3
8305
msgid "Standard options are legal for all commands."
8306
msgstr ""
8307
8308
#: dummy/help_topics/standard-options/detail.txt:5
8309
msgid ""
8310
"--help, -h Show help message.\n"
8311
"--verbose, -v Display more information.\n"
8312
"--quiet, -q Only display errors and warnings."
8313
msgstr ""
8314
8315
#: dummy/help_topics/standard-options/detail.txt:9
8316
msgid "Unlike global options, standard options can be used in aliases.\n"
8317
msgstr ""
8318
8319
#: dummy/help_topics/standard-options/summary.txt:1
8320
msgid "Options that can be used with any command"
8321
msgstr ""
8322
8323
#: dummy/help_topics/status-flags/detail.txt:1
8324
msgid "Status Flags"
8325
msgstr ""
8326
8327
#: dummy/help_topics/status-flags/detail.txt:3
8328
msgid ""
8329
"Status flags are used to summarise changes to the working tree in a concise\n"
8330
"manner. They are in the form::"
8331
msgstr ""
8332
8333
#: dummy/help_topics/status-flags/detail.txt:6
8334
msgid " xxx <filename>"
8335
msgstr ""
8336
8337
#: dummy/help_topics/status-flags/detail.txt:8
8338
msgid "where the columns' meanings are as follows."
8339
msgstr ""
8340
8341
#: dummy/help_topics/status-flags/detail.txt:10
8342
msgid "Column 1 - versioning/renames::"
8343
msgstr ""
8344
8345
#: dummy/help_topics/status-flags/detail.txt:12
8346
msgid ""
8347
" + File versioned\n"
8348
" - File unversioned\n"
8349
" R File renamed\n"
8350
" ? File unknown\n"
8351
" X File nonexistent (and unknown to bzr)\n"
8352
" C File has conflicts\n"
8353
" P Entry for a pending merge (not a file)"
8354
msgstr ""
8355
8356
#: dummy/help_topics/status-flags/detail.txt:20
8357
msgid "Column 2 - contents::"
8358
msgstr ""
8359
8360
#: dummy/help_topics/status-flags/detail.txt:22
8361
msgid ""
8362
" N File created\n"
8363
" D File deleted\n"
8364
" K File kind changed\n"
8365
" M File modified"
8366
msgstr ""
8367
8368
#: dummy/help_topics/status-flags/detail.txt:27
8369
msgid "Column 3 - execute::"
8370
msgstr ""
8371
8372
#: dummy/help_topics/status-flags/detail.txt:29
8373
msgid " * The execute bit was changed\n"
8374
msgstr ""
8375
8376
#: dummy/help_topics/status-flags/summary.txt:1
8377
msgid "Help on status flags"
8378
msgstr ""
8379
8380
#: dummy/help_topics/sync-for-reconfigure/detail.txt:1
8381
msgid "Branches Out of Sync"
8382
msgstr ""
8383
8384
#: dummy/help_topics/sync-for-reconfigure/detail.txt:3
8385
msgid ""
8386
"When reconfiguring a checkout, tree or branch into a lightweight checkout,\n"
8387
"a local branch must be destroyed. (For checkouts, this is the local branch\n"
8388
"that serves primarily as a cache.) If the branch-to-be-destroyed does not\n"
8389
"have the same last revision as the new reference branch for the lightweight\n"
8390
"checkout, data could be lost, so Bazaar refuses."
8391
msgstr ""
8392
8393
#: dummy/help_topics/sync-for-reconfigure/detail.txt:9
8394
msgid "How you deal with this depends on *why* the branches are out of sync."
8395
msgstr ""
8396
8397
#: dummy/help_topics/sync-for-reconfigure/detail.txt:11
8398
msgid ""
8399
"If you have a checkout and have done local commits, you can get back in "
8400
"sync\n"
8401
"by running \"bzr update\" (and possibly \"bzr commit\")."
8402
msgstr ""
8403
8404
#: dummy/help_topics/sync-for-reconfigure/detail.txt:14
8405
msgid ""
8406
"If you have a branch and the remote branch is out-of-date, you can push\n"
8407
"the local changes using \"bzr push\". If the local branch is out of date, "
8408
"you\n"
8409
"can do \"bzr pull\". If both branches have had changes, you can merge, "
8410
"commit\n"
8411
"and then push your changes. If you decide that some of the changes aren't\n"
8412
"useful, you can \"push --overwrite\" or \"pull --overwrite\" instead.\n"
8413
msgstr ""
8414
8415
#: dummy/help_topics/sync-for-reconfigure/summary.txt:1
8416
msgid "Steps to resolve \"out-of-sync\" when reconfiguring"
8417
msgstr ""
8418
8419
#: dummy/help_topics/topics/summary.txt:1
8420
msgid "Topics list"
8421
msgstr ""
8422
8423
#: dummy/help_topics/url-special-chars/summary.txt:1
8424
msgid "Special character handling in URLs"
8425
msgstr ""
8426
8427
#: dummy/help_topics/urlspec/summary.txt:1
8428
msgid "Supported transport protocols"
8429
msgstr ""
8430
8431
#: dummy/help_topics/working-trees/detail.txt:1
8432
msgid "Working Trees"
8433
msgstr ""
8434
8435
#: dummy/help_topics/working-trees/detail.txt:3
8436
msgid ""
8437
"A working tree is the contents of a branch placed on disk so that you can\n"
8438
"see the files and edit them. The working tree is where you make changes to "
8439
"a\n"
8440
"branch, and when you commit the current state of the working tree is the\n"
8441
"snapshot that is recorded in the commit."
8442
msgstr ""
8443
8444
#: dummy/help_topics/working-trees/detail.txt:8
8445
msgid ""
8446
"When you push a branch to a remote system, a working tree will not be\n"
8447
"created. If one is already present the files will not be updated. The\n"
8448
"branch information will be updated and the working tree will be marked\n"
8449
"as out-of-date. Updating a working tree remotely is difficult, as there\n"
8450
"may be uncommitted changes or the update may cause content conflicts that "
8451
"are\n"
8452
"difficult to deal with remotely."
8453
msgstr ""
8454
8455
#: dummy/help_topics/working-trees/detail.txt:15
8456
msgid ""
8457
"If you have a branch with no working tree you can use the 'checkout' "
8458
"command\n"
8459
"to create a working tree. If you run 'bzr checkout .' from the branch it "
8460
"will\n"
8461
"create the working tree. If the branch is updated remotely, you can update "
8462
"the\n"
8463
"working tree by running 'bzr update' in that directory."
8464
msgstr ""
8465
8466
#: dummy/help_topics/working-trees/detail.txt:20
8467
msgid ""
8468
"If you have a branch with a working tree that you do not want the 'remove-"
8469
"tree'\n"
8470
"command will remove the tree if it is safe. This can be done to avoid the\n"
8471
"warning about the remote working tree not being updated when pushing to the\n"
8472
"branch. It can also be useful when working with a '--no-trees' repository\n"
8473
"(see 'bzr help repositories')."
8474
msgstr ""
8475
8476
#: dummy/help_topics/working-trees/detail.txt:26
8477
msgid ""
8478
"If you want to have a working tree on a remote machine that you push to you\n"
8479
"can either run 'bzr update' in the remote branch after each push, or use "
8480
"some\n"
8481
"other method to update the tree during the push. There is an 'rspush' "
8482
"plugin\n"
8483
"that will update the working tree using rsync as well as doing a push. "
8484
"There\n"
8485
"is also a 'push-and-update' plugin that automates running 'bzr update' via "
8486
"SSH\n"
8487
"after each push."
8488
msgstr ""
8489
8490
#: dummy/help_topics/working-trees/detail.txt:33
8491
msgid "Useful commands::"
8492
msgstr ""
8493
8494
#: dummy/help_topics/working-trees/detail.txt:35
8495
msgid ""
8496
" checkout Create a working tree when a branch does not have one.\n"
8497
" remove-tree Removes the working tree from a branch when it is safe to do "
8498
"so.\n"
8499
" update When a working tree is out of sync with its associated "
8500
"branch\n"
8501
" this will update the tree to match the branch.\n"
8502
msgstr ""
8503
8504
#: dummy/help_topics/working-trees/summary.txt:1
8505
msgid "Information on working trees"
8506
msgstr ""
8507
8508
#: en/help_topics/authentication.txt:1
8509
msgid ""
8510
"Authentication Settings\n"
8511
"======================="
8512
msgstr ""
8513
8514
#: en/help_topics/authentication.txt:4
8515
msgid ""
8516
"\n"
8517
"Intent\n"
8518
"------"
8519
msgstr ""
8520
8521
#: en/help_topics/authentication.txt:8
8522
msgid ""
8523
"Many different authentication policies can be described in the\n"
8524
"``authentication.conf`` file but a particular user should need only a few\n"
8525
"definitions to cover his needs without having to specify a user and a "
8526
"password\n"
8527
"for every branch he uses."
8528
msgstr ""
8529
8530
#: en/help_topics/authentication.txt:13
8531
msgid ""
8532
"The definitions found in this file are used to find the credentials to use "
8533
"for\n"
8534
"a given url. The same credentials can generally be used for as many branches "
8535
"as\n"
8536
"possible by grouping their declaration around the remote servers that need\n"
8537
"them. It's even possible to declare credentials that will be used by "
8538
"different\n"
8539
"servers."
8540
msgstr ""
8541
8542
#: en/help_topics/authentication.txt:19
8543
msgid ""
8544
"The intent is to make this file as small as possible to minimize maintenance."
8545
msgstr ""
8546
8547
#: en/help_topics/authentication.txt:21
8548
msgid ""
8549
"Once the relevant credentials are declared in this file you may use branch "
8550
"urls\n"
8551
"without embedding passwords (security hazard) or even users (enabling "
8552
"sharing\n"
8553
"of your urls with others)."
8554
msgstr ""
8555
8556
#: en/help_topics/authentication.txt:25
8557
msgid "Instead of using::"
8558
msgstr ""
8559
8560
#: en/help_topics/authentication.txt:27
8561
msgid " bzr branch ftp://joe:secret@host.com/path/to/my/branch"
8562
msgstr ""
8563
8564
#: en/help_topics/authentication.txt:29
8565
msgid "you simply use::"
8566
msgstr ""
8567
8568
#: en/help_topics/authentication.txt:31
8569
msgid " bzr branch ftp://host.com/path/to/my/branch"
8570
msgstr ""
8571
8572
#: en/help_topics/authentication.txt:33
8573
msgid ""
8574
"provided you have created the following ``authentication.conf`` file::"
8575
msgstr ""
8576
8577
#: en/help_topics/authentication.txt:35
8578
msgid ""
8579
" [myprojects]\n"
8580
" scheme=ftp\n"
8581
" host=host.com\n"
8582
" user=joe\n"
8583
" password=secret\n"
8584
" "
8585
msgstr ""
8586
8587
#: en/help_topics/authentication.txt:42
8588
msgid ""
8589
"Authentication definitions\n"
8590
"--------------------------"
8591
msgstr ""
8592
8593
#: en/help_topics/authentication.txt:45
8594
msgid ""
8595
"There are two kinds of authentication used by the various schemes supported "
8596
"by\n"
8597
"bzr:"
8598
msgstr ""
8599
8600
#: en/help_topics/authentication.txt:48
8601
msgid "1. user and password"
8602
msgstr ""
8603
8604
#: en/help_topics/authentication.txt:50
8605
msgid ""
8606
"``FTP`` needs a (``user``, ``password``) to authenticate against a ``host``\n"
8607
"``SFTP`` can use either a password or a host key to authenticate. However,\n"
8608
"ssh agents are a better, more secure solution. So we have chosen to not "
8609
"provide\n"
8610
"our own less secure method."
8611
msgstr ""
8612
8613
#: en/help_topics/authentication.txt:55
8614
msgid "2. user, realm and password"
8615
msgstr ""
8616
8617
#: en/help_topics/authentication.txt:57
8618
msgid ""
8619
"``HTTP`` and ``HTTPS`` needs a (``user, realm, password``) to authenticate\n"
8620
"against a host. But, by using ``.htaccess`` files, for example, it is "
8621
"possible\n"
8622
"to define several (``user, realm, password``) for a given ``host``. So what "
8623
"is\n"
8624
"really needed is (``user``, ``password``, ``host``, ``path``). The ``realm`` "
8625
"is\n"
8626
"not taken into account in the definitions, but will displayed if bzr "
8627
"prompts\n"
8628
"you for a password."
8629
msgstr ""
8630
8631
#: en/help_topics/authentication.txt:64
8632
msgid ""
8633
"``HTTP proxy`` can be handled as ``HTTP`` (or ``HTTPS``) by explicitly\n"
8634
"specifying the appropriate port."
8635
msgstr ""
8636
8637
#: en/help_topics/authentication.txt:67
8638
msgid ""
8639
"To take all schemes into account, the password will be deduced from a set "
8640
"of\n"
8641
"authentication definitions (``scheme``, ``host``, ``port``, ``path``, "
8642
"``user``,\n"
8643
"``password``)."
8644
msgstr ""
8645
8646
#: en/help_topics/authentication.txt:71
8647
msgid ""
8648
" * ``scheme``: can be empty (meaning the rest of the definition can be "
8649
"used\n"
8650
" for any scheme), ``SFTP`` and ``bzr+ssh`` should not be used here, "
8651
"``ssh``\n"
8652
" should be used instead since this is the real scheme regarding\n"
8653
" authentication,"
8654
msgstr ""
8655
8656
#: en/help_topics/authentication.txt:76
8657
msgid " * ``host``: can be empty (to act as a default for any host),"
8658
msgstr ""
8659
8660
#: en/help_topics/authentication.txt:78
8661
msgid ""
8662
" * ``port`` can be empty (useful when an host provides several servers for "
8663
"the\n"
8664
" same scheme), only numerical values are allowed, this should be used "
8665
"only\n"
8666
" when the server uses a port different than the scheme standard port,"
8667
msgstr ""
8668
8669
#: en/help_topics/authentication.txt:82
8670
msgid " * ``path``: can be empty (FTP or SFTP will never user it),"
8671
msgstr ""
8672
8673
#: en/help_topics/authentication.txt:84
8674
msgid ""
8675
" * ``user``: can be empty (``bzr`` will defaults to python's\n"
8676
" ``getpass.get_user()``),"
8677
msgstr ""
8678
8679
#: en/help_topics/authentication.txt:87
8680
msgid ""
8681
" * ``password``: can be empty if you prefer to always be prompted for your\n"
8682
" password."
8683
msgstr ""
8684
8685
#: en/help_topics/authentication.txt:90
8686
msgid ""
8687
"Multiple definitions can be provided and, for a given URL, bzr will select "
8688
"a\n"
8689
"(``user`` [, ``password``]) based on the following rules :"
8690
msgstr ""
8691
8692
#: en/help_topics/authentication.txt:93
8693
msgid " 1. the first match wins,"
8694
msgstr ""
8695
8696
#: en/help_topics/authentication.txt:95
8697
msgid " 2. empty fields match everything,"
8698
msgstr ""
8699
8700
#: en/help_topics/authentication.txt:97
8701
msgid ""
8702
" 3. ``scheme`` matches even if decorators are used in the requested URL,"
8703
msgstr ""
8704
8705
#: en/help_topics/authentication.txt:99
8706
msgid ""
8707
" 4. ``host`` matches exactly or act as a domain if it starts with '.'\n"
8708
" (``project.bzr.sf.net`` will match ``.bzr.sf.net`` but "
8709
"``projectbzr.sf.net``\n"
8710
" will not match ``bzr.sf.net``)."
8711
msgstr ""
8712
8713
#: en/help_topics/authentication.txt:103
8714
msgid ""
8715
" 5. ``port`` matches if included in the requested URL (exact matches only)"
8716
msgstr ""
8717
8718
#: en/help_topics/authentication.txt:105
8719
msgid ""
8720
" 6. ``path`` matches if included in the requested URL (and by rule #2 "
8721
"above,\n"
8722
" empty paths will match any provided path)."
8723
msgstr ""
8724
8725
#: en/help_topics/authentication.txt:110
8726
msgid ""
8727
"File format\n"
8728
"-----------"
8729
msgstr ""
8730
8731
#: en/help_topics/authentication.txt:113
8732
msgid ""
8733
"The general rules for :doc:`configuration files <configuration-help>`\n"
8734
"apply except for the variable policies."
8735
msgstr ""
8736
8737
#: en/help_topics/authentication.txt:116
8738
msgid "Each section describes an authentication definition."
8739
msgstr ""
8740
8741
#: en/help_topics/authentication.txt:118
8742
msgid ""
8743
"The section name is an arbitrary string, only the ``DEFAULT`` value is "
8744
"reserved\n"
8745
"and should appear as the *last* section."
8746
msgstr ""
8747
8748
#: en/help_topics/authentication.txt:121
8749
msgid "Each section should define:"
8750
msgstr ""
8751
8752
#: en/help_topics/authentication.txt:123
8753
msgid "* ``user``: the login to be used,"
8754
msgstr ""
8755
8756
#: en/help_topics/authentication.txt:125
8757
msgid "Each section could define:"
8758
msgstr ""
8759
8760
#: en/help_topics/authentication.txt:127
8761
msgid "* ``host``: the remote server,"
8762
msgstr ""
8763
8764
#: en/help_topics/authentication.txt:129
8765
msgid "* ``port``: the port the server is listening,"
8766
msgstr ""
8767
8768
#: en/help_topics/authentication.txt:131
8769
msgid "* ``path``: the branch location,"
8770
msgstr ""
8771
8772
#: en/help_topics/authentication.txt:133
8773
msgid "* ``password``: the password."
8774
msgstr ""
8775
8776
#: en/help_topics/authentication.txt:135
8777
msgid ""
8778
"\n"
8779
"Examples\n"
8780
"--------"
8781
msgstr ""
8782
8783
#: en/help_topics/authentication.txt:139
8784
msgid ""
8785
"\n"
8786
"Personal projects hosted outside\n"
8787
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
8788
msgstr ""
8789
8790
#: en/help_topics/authentication.txt:143
8791
msgid ""
8792
"All connections are done with the same ``user`` (the remote one for which "
8793
"the\n"
8794
"default bzr one is not appropriate) and the password is always prompted "
8795
"with\n"
8796
"some exceptions::"
8797
msgstr ""
8798
8799
#: en/help_topics/authentication.txt:147
8800
msgid ""
8801
" # Pet projects on hobby.net\n"
8802
" [hobby]\n"
8803
" host=r.hobby.net\n"
8804
" user=jim\n"
8805
" password=obvious1234\n"
8806
" \n"
8807
" # Home server\n"
8808
" [home]\n"
8809
" scheme=https\n"
8810
" host=home.net\n"
8811
" user=joe\n"
8812
" password=1essobV10us\n"
8813
" \n"
8814
" [DEFAULT]\n"
8815
" # Our local user is barbaz, on all remote sites we're known as "
8816
"foobar\n"
8817
" user=foobar"
8818
msgstr ""
8819
8820
#: en/help_topics/authentication.txt:164
8821
msgid ""
8822
"\n"
8823
"Source hosting provider\n"
8824
"~~~~~~~~~~~~~~~~~~~~~~~"
8825
msgstr ""
8826
8827
#: en/help_topics/authentication.txt:168
8828
msgid "In the shp.net (fictitious) domain, each project has its own site::"
8829
msgstr ""
8830
8831
#: en/help_topics/authentication.txt:170
8832
msgid ""
8833
" [shpnet domain]\n"
8834
" # we use sftp, but ssh is the scheme used for authentication\n"
8835
" scheme=ssh\n"
8836
" # The leading '.' ensures that 'shp.net' alone doesn't match\n"
8837
" host=.shp.net\n"
8838
" user=joe\n"
8839
" # bzr don't support supplying a password for sftp,\n"
8840
" # consider using an ssh agent if you don't want to supply\n"
8841
" # a password interactively. (pageant, ssh-agent, etc)"
8842
msgstr ""
8843
8844
#: en/help_topics/authentication.txt:180
8845
msgid ""
8846
"HTTPS, SFTP servers and their proxy\n"
8847
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
8848
msgstr ""
8849
8850
#: en/help_topics/authentication.txt:183
8851
msgid ""
8852
"At company.com, the server hosting release and integration branches is "
8853
"behind a\n"
8854
"proxy, and the two branches use different authentication policies::"
8855
msgstr ""
8856
8857
#: en/help_topics/authentication.txt:186
8858
msgid ""
8859
" [reference code]\n"
8860
" scheme=https\n"
8861
" host=dev.company.com\n"
8862
" path=/dev\n"
8863
" user=user1\n"
8864
" password=pass1"
8865
msgstr ""
8866
8867
#: en/help_topics/authentication.txt:193
8868
msgid ""
8869
" # development branches on dev server\n"
8870
" [dev]\n"
8871
" scheme=ssh # bzr+ssh and sftp are available here\n"
8872
" host=dev.company.com\n"
8873
" path=/dev/integration\n"
8874
" user=user2\n"
8875
" \n"
8876
" # proxy\n"
8877
" [proxy]\n"
8878
" scheme=http\n"
8879
" host=proxy.company.com\n"
8880
" port=3128\n"
8881
" user=proxyuser1\n"
8882
" password=proxypass1"
8883
msgstr ""
8884
8885
#: en/help_topics/authentication.txt:208
8886
msgid ""
8887
"\n"
8888
"Planned enhancements\n"
8889
"--------------------"
8890
msgstr ""
8891
8892
#: en/help_topics/authentication.txt:212
8893
msgid ""
8894
"The following are not yet implemented but planned as parts of a work in\n"
8895
"progress:"
8896
msgstr ""
8897
8898
#: en/help_topics/authentication.txt:215
8899
msgid "* add a ``password_encoding`` field allowing:"
8900
msgstr ""
8901
8902
#: en/help_topics/authentication.txt:217
8903
msgid ""
8904
" - storing the passwords in various obfuscating encodings (base64 for one),"
8905
msgstr ""
8906
8907
#: en/help_topics/authentication.txt:219
8908
msgid " - delegate password storage to plugins (.netrc for example)."
8909
msgstr ""
8910
8911
#: en/help_topics/authentication.txt:221
8912
msgid ""
8913
"* update the credentials when the user is prompted for user or password,"
8914
msgstr ""
8915
8916
#: en/help_topics/authentication.txt:223
8917
msgid "* add a ``verify_certificates`` field for ``HTTPS``."
8918
msgstr ""
8919
8920
#: en/help_topics/authentication.txt:225
8921
msgid ""
8922
"The ``password_encoding`` and ``verify_certificates`` fields are recognized "
8923
"but\n"
8924
"ignored in the actual implementation.\n"
8925
msgstr ""
8926
8927
#: en/help_topics/bugs.txt:1
8928
msgid "Bug Tracker Settings"
8929
msgstr ""
8930
8931
#: en/help_topics/bugs.txt:3
8932
msgid ""
8933
"When making a commit, metadata about bugs fixed by that change can be\n"
8934
"recorded by using the ``--fixes`` option. For each bug marked as fixed, an\n"
8935
"entry is included in the 'bugs' revision property stating '<url> <status>'.\n"
8936
"(The only ``status`` value currently supported is ``fixed.``)"
8937
msgstr ""
8938
8939
#: en/help_topics/bugs.txt:8
8940
msgid ""
8941
"The ``--fixes`` option allows you to specify a bug tracker and a bug "
8942
"identifier\n"
8943
"rather than a full URL. This looks like::"
8944
msgstr ""
8945
8946
#: en/help_topics/bugs.txt:11
8947
msgid " bzr commit --fixes <tracker>:<id>"
8948
msgstr ""
8949
8950
#: en/help_topics/bugs.txt:13 en/help_topics/configuration.txt:398
8951
msgid "or::"
8952
msgstr ""
8953
8954
#: en/help_topics/bugs.txt:15
8955
msgid " bzr commit --fixes <id>"
8956
msgstr ""
8957
8958
#: en/help_topics/bugs.txt:17
8959
msgid ""
8960
"where \"<tracker>\" is an identifier for the bug tracker, and \"<id>\" is "
8961
"the\n"
8962
"identifier for that bug within the bugtracker, usually the bug number.\n"
8963
"If \"<tracker>\" is not specified the ``bugtracker`` set in the branch\n"
8964
"or global configuration is used."
8965
msgstr ""
8966
8967
#: en/help_topics/bugs.txt:22
8968
msgid ""
8969
"Bazaar knows about a few bug trackers that have many users. If\n"
8970
"you use one of these bug trackers then there is no setup required to\n"
8971
"use this feature, you just need to know the tracker identifier to use.\n"
8972
"These are the bugtrackers that are built in:"
8973
msgstr ""
8974
8975
#: en/help_topics/bugs.txt:27
8976
msgid ""
8977
" ============================ ============ ============\n"
8978
" URL Abbreviation Example\n"
8979
" ============================ ============ ============\n"
8980
" https://bugs.launchpad.net/ lp lp:12345\n"
8981
" http://bugs.debian.org/ deb deb:12345\n"
8982
" http://bugzilla.gnome.org/ gnome gnome:12345\n"
8983
" ============================ ============ ============"
8984
msgstr ""
8985
8986
#: en/help_topics/bugs.txt:35
8987
msgid ""
8988
"For the bug trackers not listed above configuration is required.\n"
8989
"Support for generating the URLs for any project using Bugzilla or Trac\n"
8990
"is built in, along with a template mechanism for other bugtrackers with\n"
8991
"simple URL schemes. If your bug tracker can't be described by one\n"
8992
"of the schemes described below then you can write a plugin to support\n"
8993
"it."
8994
msgstr ""
8995
8996
#: en/help_topics/bugs.txt:42
8997
msgid ""
8998
"If you use Bugzilla or Trac, then you only need to set a configuration\n"
8999
"variable which contains the base URL of the bug tracker. These options\n"
9000
"can go into ``bazaar.conf``, ``branch.conf`` or into a branch-specific\n"
9001
"configuration section in ``locations.conf``. You can set up these values\n"
9002
"for each of the projects you work on."
9003
msgstr ""
9004
9005
#: en/help_topics/bugs.txt:48
9006
msgid ""
9007
"Note: As you provide a short name for each tracker, you can specify one or\n"
9008
"more bugs in one or more trackers at commit time if you wish."
9009
msgstr ""
9010
9011
#: en/help_topics/bugs.txt:51
9012
msgid ""
9013
"Launchpad\n"
9014
"---------"
9015
msgstr ""
9016
9017
#: en/help_topics/bugs.txt:54
9018
msgid ""
9019
"Use ``bzr commit --fixes lp:2`` to record that this commit fixes bug 2."
9020
msgstr ""
9021
9022
#: en/help_topics/bugs.txt:56
9023
msgid ""
9024
"bugzilla_<tracker>_url\n"
9025
"----------------------"
9026
msgstr ""
9027
9028
#: en/help_topics/bugs.txt:59
9029
msgid ""
9030
"If present, the location of the Bugzilla bug tracker 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:64
9037
msgid " bugzilla_squid_url = http://bugs.squid-cache.org"
9038
msgstr ""
9039
9040
#: en/help_topics/bugs.txt:66
9041
msgid ""
9042
"would allow ``bzr commit --fixes squid:1234`` to mark Squid's bug 1234 as\n"
9043
"fixed."
9044
msgstr ""
9045
9046
#: en/help_topics/bugs.txt:69
9047
msgid ""
9048
"trac_<tracker>_url\n"
9049
"------------------"
9050
msgstr ""
9051
9052
#: en/help_topics/bugs.txt:72
9053
msgid ""
9054
"If present, the location of the Trac instance referred to by\n"
9055
"<tracker>. This option can then be used together with ``bzr commit\n"
9056
"--fixes`` to mark bugs in that tracker as being fixed by that commit. For\n"
9057
"example::"
9058
msgstr ""
9059
9060
#: en/help_topics/bugs.txt:77
9061
msgid " trac_twisted_url = http://www.twistedmatrix.com/trac"
9062
msgstr ""
9063
9064
#: en/help_topics/bugs.txt:79
9065
msgid ""
9066
"would allow ``bzr commit --fixes twisted:1234`` to mark Twisted's bug 1234 "
9067
"as\n"
9068
"fixed."
9069
msgstr ""
9070
9071
#: en/help_topics/bugs.txt:82
9072
msgid ""
9073
"bugtracker_<tracker>_url\n"
9074
"------------------------"
9075
msgstr ""
9076
9077
#: en/help_topics/bugs.txt:85
9078
msgid ""
9079
"If present, the location of a generic bug tracker instance referred to by\n"
9080
"<tracker>. The location must contain an ``{id}`` placeholder,\n"
9081
"which will be replaced by a specific bug ID. This option can then be used\n"
9082
"together with ``bzr commit --fixes`` to mark bugs in that tracker as being\n"
9083
"fixed by that commit. For example::"
9084
msgstr ""
9085
9086
#: en/help_topics/bugs.txt:91
9087
msgid " bugtracker_python_url = http://bugs.python.org/issue{id}"
9088
msgstr ""
9089
9090
#: en/help_topics/bugs.txt:93
9091
msgid ""
9092
"would allow ``bzr commit --fixes python:1234`` to mark bug 1234 in Python's\n"
9093
"Roundup bug tracker as fixed, or::"
9094
msgstr ""
9095
9096
#: en/help_topics/bugs.txt:96
9097
msgid ""
9098
" bugtracker_cpan_url = http://rt.cpan.org/Public/Bug/Display.html?id={id}"
9099
msgstr ""
9100
9101
#: en/help_topics/bugs.txt:98
9102
msgid ""
9103
"would allow ``bzr commit --fixes cpan:1234`` to mark bug 1234 in CPAN's\n"
9104
"RT bug tracker as fixed, or::"
9105
msgstr ""
9106
9107
#: en/help_topics/bugs.txt:101
9108
msgid " bugtracker_hudson_url = http://issues.hudson-ci.org/browse/{id}"
9109
msgstr ""
9110
9111
#: en/help_topics/bugs.txt:103
9112
msgid ""
9113
"would allow ``bzr commit --fixes hudson:HUDSON-1234`` to mark bug HUDSON-"
9114
"1234\n"
9115
"in Hudson's JIRA bug tracker as fixed.\n"
9116
msgstr ""
9117
9118
#: en/help_topics/commands.txt:1
9119
msgid ""
9120
"add Add specified files or directories.\n"
9121
"alias Set/unset and display aliases.\n"
9122
"annotate Show the origin of each line in a file.\n"
9123
"bash-completion Generate a shell function for bash command line "
9124
"completion.\n"
9125
" [bash_completion]\n"
9126
"bind Convert the current branch into a checkout of the "
9127
"supplied\n"
9128
" branch.\n"
9129
"branch Create a new branch that is a copy of an existing branch.\n"
9130
"branches List the branches available at the current location.\n"
9131
"break-lock Break a dead lock.\n"
9132
"cat Write the contents of a file as of a given revision to\n"
9133
" standard output.\n"
9134
"check Validate working tree structure, branch consistency and\n"
9135
" repository history.\n"
9136
"checkout Create a new checkout of an existing branch.\n"
9137
"clean-tree Remove unwanted files from working tree.\n"
9138
"commit Commit changes into a new revision.\n"
9139
"config Display, set or remove a configuration option.\n"
9140
"conflicts List files with conflicts.\n"
9141
"deleted List files deleted in the working tree.\n"
9142
"diff Show differences in the working tree, between revisions "
9143
"or\n"
9144
" branches.\n"
9145
"dpush Push into a different VCS without any custom bzr "
9146
"metadata.\n"
9147
"export Export current or past revision to a destination directory "
9148
"or\n"
9149
" archive.\n"
9150
"help Show help on a command or other topic.\n"
9151
"ignore Ignore specified files or patterns.\n"
9152
"ignored List ignored files and the patterns that matched them.\n"
9153
"info Show information about a working tree, branch or "
9154
"repository.\n"
9155
"init Make a directory into a versioned branch.\n"
9156
"init-repository Create a shared repository for branches to share storage\n"
9157
" space.\n"
9158
"join Combine a tree into its containing tree.\n"
9159
"launchpad-login Show or set the Launchpad user ID. [launchpad]\n"
9160
"launchpad-mirror Ask Launchpad to mirror a branch now. [launchpad]\n"
9161
"launchpad-open Open a Launchpad branch page in your web browser. "
9162
"[launchpad]\n"
9163
"log Show historical log for a branch or subset of a branch.\n"
9164
"lp-find-proposal Find the proposal to merge this revision. [launchpad]\n"
9165
"lp-propose-merge Propose merging a branch on Launchpad. [launchpad]\n"
9166
"ls List files in a tree.\n"
9167
"merge Perform a three-way merge.\n"
9168
"missing Show unmerged/unpulled revisions between two branches.\n"
9169
"mkdir Create a new versioned directory.\n"
9170
"mv Move or rename a file.\n"
9171
"nick Print or set the branch nickname.\n"
9172
"pack Compress the data within a repository.\n"
9173
"plugins List the installed plugins.\n"
9174
"pull Turn this branch into a mirror of another branch.\n"
9175
"push Update a mirror of this branch.\n"
9176
"reconcile Reconcile bzr metadata in a branch.\n"
9177
"reconfigure Reconfigure the type of a bzr directory.\n"
9178
"register-branch Register a branch with launchpad.net. [launchpad]\n"
9179
"remerge Redo a merge.\n"
9180
"remove Remove files or directories.\n"
9181
"remove-branch Remove a branch.\n"
9182
"remove-tree Remove the working tree from a given branch/checkout.\n"
9183
"renames Show list of renamed files.\n"
9184
"resolve Mark a conflict as resolved.\n"
9185
"revert Revert files to a previous revision.\n"
9186
"revno Show current revision number.\n"
9187
"root Show the tree root directory.\n"
9188
"send Mail or create a merge-directive for submitting changes.\n"
9189
"serve Run the bzr server.\n"
9190
"shelve Temporarily set aside some changes from the current tree.\n"
9191
"sign-my-commits Sign all commits by a given committer.\n"
9192
"split Split a subdirectory of a tree into a separate tree.\n"
9193
"status Display status summary.\n"
9194
"switch Set the branch of a checkout and update.\n"
9195
"tag Create, remove or modify a tag naming a revision.\n"
9196
"tags List tags.\n"
9197
"testament Show testament (signing-form) of a revision.\n"
9198
"unbind Convert the current checkout into a regular branch.\n"
9199
"uncommit Remove the last committed revision.\n"
9200
"unshelve Restore shelved changes.\n"
9201
"update Update a working tree to a new revision.\n"
9202
"upgrade Upgrade a repository, branch or working tree to a newer\n"
9203
" format.\n"
9204
"verify-signatures Verify all commit signatures.\n"
9205
"version Show version of bzr.\n"
9206
"version-info Show version information about this tree.\n"
9207
"view Manage filtered views.\n"
9208
"whoami Show or set bzr user id.\n"
9209
msgstr ""
9210
9211
#: en/help_topics/configuration.txt:1
9212
msgid ""
9213
"Configuration Settings\n"
9214
"======================="
9215
msgstr ""
9216
9217
#: en/help_topics/configuration.txt:4
9218
msgid ""
9219
"Environment settings\n"
9220
"---------------------"
9221
msgstr ""
9222
9223
#: en/help_topics/configuration.txt:7
9224
msgid ""
9225
"While most configuration is handled by configuration files, some options\n"
9226
"which may be semi-permanent can also be controlled through the environment."
9227
msgstr ""
9228
9229
#: en/help_topics/configuration.txt:10
9230
msgid ""
9231
"BZR_EMAIL\n"
9232
"~~~~~~~~~"
9233
msgstr ""
9234
9235
#: en/help_topics/configuration.txt:13
9236
msgid "Override the email id used by Bazaar. Typical format::"
9237
msgstr ""
9238
9239
#: en/help_topics/configuration.txt:15
9240
msgid " \"John Doe <jdoe@example.com>\""
9241
msgstr ""
9242
9243
#: en/help_topics/configuration.txt:17
9244
msgid "See also the ``email`` configuration option."
9245
msgstr ""
9246
9247
#: en/help_topics/configuration.txt:19
9248
msgid ""
9249
"BZR_PROGRESS_BAR\n"
9250
"~~~~~~~~~~~~~~~~"
9251
msgstr ""
9252
9253
#: en/help_topics/configuration.txt:22
9254
msgid ""
9255
"Override the progress display. Possible values are \"none\" or \"text\". "
9256
"If\n"
9257
"the value is \"none\" then no progress bar is displayed. The value \"text\" "
9258
"draws\n"
9259
"the ordinary command line progress bar."
9260
msgstr ""
9261
9262
#: en/help_topics/configuration.txt:26
9263
msgid ""
9264
"BZR_SIGQUIT_PDB\n"
9265
"~~~~~~~~~~~~~~~"
9266
msgstr ""
9267
9268
#: en/help_topics/configuration.txt:29
9269
msgid ""
9270
"Control whether SIGQUIT behaves normally or invokes a breakin debugger."
9271
msgstr ""
9272
9273
#: en/help_topics/configuration.txt:31
9274
msgid ""
9275
"* 0 = Standard SIGQUIT behavior (normally, exit with a core dump)\n"
9276
"* 1 = Invoke breakin debugger (default)"
9277
msgstr ""
9278
9279
#: en/help_topics/configuration.txt:34
9280
msgid ""
9281
"BZR_HOME\n"
9282
"~~~~~~~~"
9283
msgstr ""
9284
9285
#: en/help_topics/configuration.txt:37
9286
msgid "Override the home directory used by Bazaar."
9287
msgstr ""
9288
9289
#: en/help_topics/configuration.txt:39
9290
msgid ""
9291
"BZR_SSH\n"
9292
"~~~~~~~"
9293
msgstr ""
9294
9295
#: en/help_topics/configuration.txt:42
9296
msgid "Select a different SSH implementation."
9297
msgstr ""
9298
9299
#: en/help_topics/configuration.txt:44
9300
msgid ""
9301
"BZR_PDB\n"
9302
"~~~~~~~"
9303
msgstr ""
9304
9305
#: en/help_topics/configuration.txt:47
9306
msgid "Control whether to launch a debugger on error."
9307
msgstr ""
9308
9309
#: en/help_topics/configuration.txt:49
9310
msgid ""
9311
"* 0 = Standard behavior\n"
9312
"* 1 = Launch debugger"
9313
msgstr ""
9314
9315
#: en/help_topics/configuration.txt:52
9316
msgid ""
9317
"BZR_REMOTE_PATH\n"
9318
"~~~~~~~~~~~~~~~"
9319
msgstr ""
9320
9321
#: en/help_topics/configuration.txt:55
9322
msgid "Path to the Bazaar executable to use when using the bzr+ssh protocol."
9323
msgstr ""
9324
9325
#: en/help_topics/configuration.txt:57
9326
msgid "See also the ``bzr_remote_path`` configuration option."
9327
msgstr ""
9328
9329
#: en/help_topics/configuration.txt:59
9330
msgid ""
9331
"BZR_EDITOR\n"
9332
"~~~~~~~~~~"
9333
msgstr ""
9334
9335
#: en/help_topics/configuration.txt:62
9336
msgid "Path to the editor Bazaar should use for commit messages, etc."
9337
msgstr ""
9338
9339
#: en/help_topics/configuration.txt:64
9340
msgid ""
9341
"BZR_LOG\n"
9342
"~~~~~~~"
9343
msgstr ""
9344
9345
#: en/help_topics/configuration.txt:67
9346
msgid ""
9347
"Location of the Bazaar log file. You can check the current location by\n"
9348
"running ``bzr version``."
9349
msgstr ""
9350
9351
#: en/help_topics/configuration.txt:70
9352
msgid ""
9353
"The log file contains debug information that is useful for diagnosing or\n"
9354
"reporting problems with Bazaar."
9355
msgstr ""
9356
9357
#: en/help_topics/configuration.txt:73
9358
msgid ""
9359
"Setting this to ``NUL`` on Windows or ``/dev/null`` on other platforms\n"
9360
"will disable logging."
9361
msgstr ""
9362
9363
#: en/help_topics/configuration.txt:76
9364
msgid ""
9365
"\n"
9366
"BZR_PLUGIN_PATH\n"
9367
"~~~~~~~~~~~~~~~"
9368
msgstr ""
9369
9370
#: en/help_topics/configuration.txt:80
9371
msgid ""
9372
"The path to the plugins directory that Bazaar should use.\n"
9373
"If not set, Bazaar will search for plugins in:"
9374
msgstr ""
9375
9376
#: en/help_topics/configuration.txt:83
9377
msgid ""
9378
"* the user specific plugin directory (containing the ``user`` plugins),"
9379
msgstr ""
9380
9381
#: en/help_topics/configuration.txt:85
9382
msgid "* the bzrlib directory (containing the ``core`` plugins),"
9383
msgstr ""
9384
9385
#: en/help_topics/configuration.txt:87
9386
msgid ""
9387
"* the site specific plugin directory if applicable (containing\n"
9388
" the ``site`` plugins)."
9389
msgstr ""
9390
9391
#: en/help_topics/configuration.txt:90
9392
msgid ""
9393
"If ``BZR_PLUGIN_PATH`` is set in any fashion, it will change the\n"
9394
"the way the plugin are searched. "
9395
msgstr ""
9396
9397
#: en/help_topics/configuration.txt:93
9398
msgid ""
9399
"As for the ``PATH`` variables, if multiple directories are\n"
9400
"specified in ``BZR_PLUGIN_PATH`` they should be separated by the\n"
9401
"platform specific appropriate character (':' on Unix,\n"
9402
"';' on windows)"
9403
msgstr ""
9404
9405
#: en/help_topics/configuration.txt:98
9406
msgid ""
9407
"By default if ``BZR_PLUGIN_PATH`` is set, it replaces searching\n"
9408
"in ``user``. However it will continue to search in ``core`` and\n"
9409
"``site`` unless they are explicitly removed."
9410
msgstr ""
9411
9412
#: en/help_topics/configuration.txt:102
9413
msgid ""
9414
"If you need to change the order or remove one of these\n"
9415
"directories, you should use special values:"
9416
msgstr ""
9417
9418
#: en/help_topics/configuration.txt:105
9419
msgid ""
9420
"* ``-user``, ``-core``, ``-site`` will remove the corresponding\n"
9421
" path from the default values,"
9422
msgstr ""
9423
9424
#: en/help_topics/configuration.txt:108
9425
msgid ""
9426
"* ``+user``, ``+core``, ``+site`` will add the corresponding path\n"
9427
" before the remaining default values (and also remove it from\n"
9428
" the default values)."
9429
msgstr ""
9430
9431
#: en/help_topics/configuration.txt:112
9432
msgid ""
9433
"Note that the special values 'user', 'core' and 'site' should be\n"
9434
"used literally, they will be substituted by the corresponding,\n"
9435
"platform specific, values."
9436
msgstr ""
9437
9438
#: en/help_topics/configuration.txt:116
9439
msgid ""
9440
"The examples below use ':' as the separator, windows users\n"
9441
"should use ';'."
9442
msgstr ""
9443
9444
#: en/help_topics/configuration.txt:119
9445
msgid "Overriding the default user plugin directory::"
9446
msgstr ""
9447
9448
#: en/help_topics/configuration.txt:121
9449
msgid " BZR_PLUGIN_PATH='/path/to/my/other/plugins'"
9450
msgstr ""
9451
9452
#: en/help_topics/configuration.txt:123
9453
msgid "Disabling the site directory while retaining the user directory::"
9454
msgstr ""
9455
9456
#: en/help_topics/configuration.txt:125
9457
msgid " BZR_PLUGIN_PATH='-site:+user'"
9458
msgstr ""
9459
9460
#: en/help_topics/configuration.txt:127
9461
msgid "Disabling all plugins (better achieved with --no-plugins)::"
9462
msgstr ""
9463
9464
#: en/help_topics/configuration.txt:129
9465
msgid " BZR_PLUGIN_PATH='-user:-core:-site'"
9466
msgstr ""
9467
9468
#: en/help_topics/configuration.txt:131
9469
msgid "Overriding the default site plugin directory::"
9470
msgstr ""
9471
9472
#: en/help_topics/configuration.txt:133
9473
msgid " BZR_PLUGIN_PATH='/path/to/my/site/plugins:-site':+user"
9474
msgstr ""
9475
9476
#: en/help_topics/configuration.txt:135
9477
msgid ""
9478
"BZR_DISABLE_PLUGINS\n"
9479
"~~~~~~~~~~~~~~~~~~~"
9480
msgstr ""
9481
9482
#: en/help_topics/configuration.txt:138
9483
msgid ""
9484
"Under special circumstances (mostly when trying to diagnose a\n"
9485
"bug), it's better to disable a plugin (or several) rather than\n"
9486
"uninstalling them completely. Such plugins can be specified in\n"
9487
"the ``BZR_DISABLE_PLUGINS`` environment variable."
9488
msgstr ""
9489
9490
#: en/help_topics/configuration.txt:143
9491
msgid ""
9492
"In that case, ``bzr`` will stop loading the specified plugins and\n"
9493
"will raise an import error if they are explicitly imported (by\n"
9494
"another plugin that depends on them for example)."
9495
msgstr ""
9496
9497
#: en/help_topics/configuration.txt:147
9498
msgid "Disabling ``myplugin`` and ``yourplugin`` is achieved by::"
9499
msgstr ""
9500
9501
#: en/help_topics/configuration.txt:149
9502
msgid " BZR_DISABLE_PLUGINS='myplugin:yourplugin'"
9503
msgstr ""
9504
9505
#: en/help_topics/configuration.txt:151
9506
msgid ""
9507
"BZR_PLUGINS_AT\n"
9508
"~~~~~~~~~~~~~~"
9509
msgstr ""
9510
9511
#: en/help_topics/configuration.txt:154
9512
msgid ""
9513
"When adding a new feature or working on a bug in a plugin,\n"
9514
"developers often need to use a specific version of a given\n"
9515
"plugin. Since python requires that the directory containing the\n"
9516
"code is named like the plugin itself this make it impossible to\n"
9517
"use arbitrary directory names (using a two-level directory scheme\n"
9518
"is inconvenient). ``BZR_PLUGINS_AT`` allows such directories even\n"
9519
"if they don't appear in ``BZR_PLUGIN_PATH`` ."
9520
msgstr ""
9521
9522
#: en/help_topics/configuration.txt:162
9523
msgid ""
9524
"Plugins specified in this environment variable takes precedence\n"
9525
"over the ones in ``BZR_PLUGIN_PATH``."
9526
msgstr ""
9527
9528
#: en/help_topics/configuration.txt:165
9529
msgid ""
9530
"The variable specified a list of ``plugin_name@plugin path``,\n"
9531
"``plugin_name`` being the name of the plugin as it appears in\n"
9532
"python module paths, ``plugin_path`` being the path to the\n"
9533
"directory containing the plugin code itself\n"
9534
"(i.e. ``plugins/myplugin`` not ``plugins``). Use ':' as the list\n"
9535
"separator, use ';' on windows."
9536
msgstr ""
9537
9538
#: en/help_topics/configuration.txt:172
9539
msgid ""
9540
"Example:\n"
9541
"~~~~~~~~"
9542
msgstr ""
9543
9544
#: en/help_topics/configuration.txt:175
9545
msgid ""
9546
"Using a specific version of ``myplugin``:\n"
9547
"``BZR_PLUGINS_AT='myplugin@/home/me/bugfixes/123456-myplugin``"
9548
msgstr ""
9549
9550
#: en/help_topics/configuration.txt:178
9551
msgid ""
9552
"BZRPATH\n"
9553
"~~~~~~~"
9554
msgstr ""
9555
9556
#: en/help_topics/configuration.txt:181
9557
msgid "The path where Bazaar should look for shell plugin external commands."
9558
msgstr ""
9559
9560
#: en/help_topics/configuration.txt:183
9561
msgid ""
9562
"\n"
9563
"http_proxy, https_proxy\n"
9564
"~~~~~~~~~~~~~~~~~~~~~~~"
9565
msgstr ""
9566
9567
#: en/help_topics/configuration.txt:187
9568
msgid "Specifies the network proxy for outgoing connections, for example::"
9569
msgstr ""
9570
9571
#: en/help_topics/configuration.txt:189
9572
msgid ""
9573
" http_proxy=http://proxy.example.com:3128/ \n"
9574
" https_proxy=http://proxy.example.com:3128/"
9575
msgstr ""
9576
9577
#: en/help_topics/configuration.txt:192
9578
msgid ""
9579
"\n"
9580
"Configuration files\n"
9581
"-------------------"
9582
msgstr ""
9583
9584
#: en/help_topics/configuration.txt:196
9585
msgid ""
9586
"Location\n"
9587
"~~~~~~~~"
9588
msgstr ""
9589
9590
#: en/help_topics/configuration.txt:199
9591
msgid ""
9592
"Configuration files are located in ``$HOME/.bazaar`` on Unix and\n"
9593
"``C:\\Documents and Settings\\<username>\\Application Data\\Bazaar\\2.0`` "
9594
"on\n"
9595
"Windows. (You can check the location for your system by using\n"
9596
"``bzr version``.)"
9597
msgstr ""
9598
9599
#: en/help_topics/configuration.txt:204
9600
msgid "There are three primary configuration files in this location:"
9601
msgstr ""
9602
9603
#: en/help_topics/configuration.txt:206
9604
msgid "* ``bazaar.conf`` describes default configuration options,"
9605
msgstr ""
9606
9607
#: en/help_topics/configuration.txt:208
9608
msgid ""
9609
"* ``locations.conf`` describes configuration information for\n"
9610
" specific branch locations,"
9611
msgstr ""
9612
9613
#: en/help_topics/configuration.txt:211
9614
msgid ""
9615
"* ``authentication.conf`` describes credential information for\n"
9616
" remote servers."
9617
msgstr ""
9618
9619
#: en/help_topics/configuration.txt:214
9620
msgid ""
9621
"Each branch can also contain a configuration file that sets values specific\n"
9622
"to that branch. This file is found at ``.bzr/branch/branch.conf`` within "
9623
"the\n"
9624
"branch. This file is visible to all users of a branch, if you wish to "
9625
"override\n"
9626
"one of the values for a branch with a setting that is specific to you then "
9627
"you\n"
9628
"can do so in ``locations.conf``."
9629
msgstr ""
9630
9631
#: en/help_topics/configuration.txt:220
9632
msgid ""
9633
"General format\n"
9634
"~~~~~~~~~~~~~~"
9635
msgstr ""
9636
9637
#: en/help_topics/configuration.txt:223
9638
msgid ""
9639
"An ini file has three types of contructs: section headers, section\n"
9640
"options and comments."
9641
msgstr ""
9642
9643
#: en/help_topics/configuration.txt:226
9644
msgid ""
9645
"Comments\n"
9646
"^^^^^^^^"
9647
msgstr ""
9648
9649
#: en/help_topics/configuration.txt:229
9650
msgid ""
9651
"A comment is any line that starts with a \"#\" (sometimes called a \"hash\n"
9652
"mark\", \"pound sign\" or \"number sign\"). Comment lines are ignored by\n"
9653
"Bazaar when parsing ini files."
9654
msgstr ""
9655
9656
#: en/help_topics/configuration.txt:233
9657
msgid ""
9658
"Section headers\n"
9659
"^^^^^^^^^^^^^^^"
9660
msgstr ""
9661
9662
#: en/help_topics/configuration.txt:236
9663
msgid ""
9664
"A section header is a word enclosed in brackets that starts at the begining\n"
9665
"of a line. A typical section header looks like this::"
9666
msgstr ""
9667
9668
#: en/help_topics/configuration.txt:239
9669
msgid " [DEFAULT]"
9670
msgstr ""
9671
9672
#: en/help_topics/configuration.txt:241
9673
msgid ""
9674
"The only valid section headers for bazaar.conf currently are [DEFAULT] and\n"
9675
"[ALIASES]. Section headers are case sensitive. The default section provides "
9676
"for\n"
9677
"setting options which can be overridden with the branch config file."
9678
msgstr ""
9679
9680
#: en/help_topics/configuration.txt:245
9681
msgid ""
9682
"For ``locations.conf``, the options from the section with the\n"
9683
"longest matching section header are used to the exclusion of other\n"
9684
"potentially valid section headers. A section header uses the path for\n"
9685
"the branch as the section header. Some examples include::"
9686
msgstr ""
9687
9688
#: en/help_topics/configuration.txt:250
9689
msgid ""
9690
" [http://mybranches.isp.com/~jdoe/branchdir]\n"
9691
" [/home/jdoe/branches/]"
9692
msgstr ""
9693
9694
#: en/help_topics/configuration.txt:253
9695
msgid ""
9696
"\n"
9697
"Section options\n"
9698
"^^^^^^^^^^^^^^^"
9699
msgstr ""
9700
9701
#: en/help_topics/configuration.txt:257
9702
msgid ""
9703
"A section option resides within a section. A section option contains an\n"
9704
"option name, an equals sign and a value. For example::"
9705
msgstr ""
9706
9707
#: en/help_topics/configuration.txt:260
9708
msgid ""
9709
" email = John Doe <jdoe@isp.com>\n"
9710
" gpg_signing_key = Amy Pond <amy@example.com>"
9711
msgstr ""
9712
9713
#: en/help_topics/configuration.txt:263
9714
msgid ""
9715
"A option can reference other options by enclosing them in curly brackets::"
9716
msgstr ""
9717
9718
#: en/help_topics/configuration.txt:265
9719
msgid ""
9720
" my_branch_name = feature_x\n"
9721
" my_server = bzr+ssh://example.com\n"
9722
" push_location = {my_server}/project/{my_branch_name}"
9723
msgstr ""
9724
9725
#: en/help_topics/configuration.txt:269
9726
msgid ""
9727
"Option policies\n"
9728
"^^^^^^^^^^^^^^^"
9729
msgstr ""
9730
9731
#: en/help_topics/configuration.txt:272
9732
msgid ""
9733
"Options defined in a section affect the named directory or URL plus\n"
9734
"any locations they contain. Policies can be used to change how an\n"
9735
"option value is interpreted for contained locations. Currently\n"
9736
"there are three policies available:"
9737
msgstr ""
9738
9739
#: en/help_topics/configuration.txt:277
9740
msgid ""
9741
" none:\n"
9742
" the value is interpreted the same for contained locations. This is\n"
9743
" the default behaviour.\n"
9744
" norecurse:\n"
9745
" the value is only used for the exact location specified by the\n"
9746
" section name.\n"
9747
" appendpath:\n"
9748
" for contained locations, any additional path components are\n"
9749
" appended to the value."
9750
msgstr ""
9751
9752
#: en/help_topics/configuration.txt:287
9753
msgid ""
9754
"Policies are specified by keys with names of the form "
9755
"\"<option_name>:policy\".\n"
9756
"For example, to define the push location for a tree of branches, the\n"
9757
"following could be used::"
9758
msgstr ""
9759
9760
#: en/help_topics/configuration.txt:291
9761
msgid ""
9762
" [/top/location]\n"
9763
" push_location = sftp://example.com/location\n"
9764
" push_location:policy = appendpath"
9765
msgstr ""
9766
9767
#: en/help_topics/configuration.txt:295
9768
msgid ""
9769
"With this configuration, the push location for ``/top/location/branch1``\n"
9770
"would be ``sftp://example.com/location/branch1``."
9771
msgstr ""
9772
9773
#: en/help_topics/configuration.txt:298
9774
msgid ""
9775
"Section local options\n"
9776
"^^^^^^^^^^^^^^^^^^^^^"
9777
msgstr ""
9778
9779
#: en/help_topics/configuration.txt:301
9780
msgid ""
9781
"Some options are defined automatically inside a given section and can be\n"
9782
"refered to in this section only. "
9783
msgstr ""
9784
9785
#: en/help_topics/configuration.txt:304
9786
msgid "For example, the ``appendpath`` policy can be used like this::"
9787
msgstr ""
9788
9789
#: en/help_topics/configuration.txt:306
9790
msgid ""
9791
" [/home/vila/src/bzr/bugs]\n"
9792
" mypush = lp:~vila/bzr\n"
9793
" mypush:policy=appendpath"
9794
msgstr ""
9795
9796
#: en/help_topics/configuration.txt:310
9797
msgid "Using ``relpath`` to achieve the same result is done like this::"
9798
msgstr ""
9799
9800
#: en/help_topics/configuration.txt:312
9801
msgid ""
9802
" [/home/vila/src/bzr/bugs]\n"
9803
" mypush = lp:~vila/bzr/{relpath}"
9804
msgstr ""
9805
9806
#: en/help_topics/configuration.txt:315
9807
msgid ""
9808
"In both cases, when used in a directory like\n"
9809
"``/home/vila/src/bzr/bugs/832013-expand-in-stack`` we'll get::"
9810
msgstr ""
9811
9812
#: en/help_topics/configuration.txt:318 en/help_topics/configuration.txt:329
9813
msgid ""
9814
" $ bzr config mypush\n"
9815
" lp:~vila/bzr/832013-expand-in-stack"
9816
msgstr ""
9817
9818
#: en/help_topics/configuration.txt:321
9819
msgid "Another such option is ``basename`` which can be used like this::"
9820
msgstr ""
9821
9822
#: en/help_topics/configuration.txt:323
9823
msgid ""
9824
" [/home/vila/src/bzr]\n"
9825
" mypush = lp:~vila/bzr/{basename}"
9826
msgstr ""
9827
9828
#: en/help_topics/configuration.txt:326
9829
msgid ""
9830
"When used in a directory like\n"
9831
"``/home/vila/src/bzr/bugs/832013-expand-in-stack`` we'll get::"
9832
msgstr ""
9833
9834
#: en/help_topics/configuration.txt:332
9835
msgid ""
9836
"Note that ``basename`` here refers to the base name of ``relpath`` which\n"
9837
"itself is defined as the relative path between the section name and the\n"
9838
"location it matches."
9839
msgstr ""
9840
9841
#: en/help_topics/configuration.txt:336
9842
msgid ""
9843
"When an option is local to a Section, it cannot be referred to from option\n"
9844
"values in any other section from the same ``Store`` nor from any other\n"
9845
"``Store``."
9846
msgstr ""
9847
9848
#: en/help_topics/configuration.txt:340
9849
msgid ""
9850
"\n"
9851
"The main configuration file, bazaar.conf\n"
9852
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
9853
msgstr ""
9854
9855
#: en/help_topics/configuration.txt:344
9856
msgid ""
9857
"``bazaar.conf`` allows two sections: ``[DEFAULT]`` and ``[ALIASES]``.\n"
9858
"The default section contains the default\n"
9859
"configuration options for all branches. The default section can be\n"
9860
"overriden by providing a branch-specific section in ``locations.conf``."
9861
msgstr ""
9862
9863
#: en/help_topics/configuration.txt:349
9864
msgid "A typical ``bazaar.conf`` section often looks like the following::"
9865
msgstr ""
9866
9867
#: en/help_topics/configuration.txt:351
9868
msgid ""
9869
" [DEFAULT]\n"
9870
" email = John Doe <jdoe@isp.com>\n"
9871
" editor = /usr/bin/vim\n"
9872
" create_signatures = when-required"
9873
msgstr ""
9874
9875
#: en/help_topics/configuration.txt:356
9876
msgid ""
9877
"\n"
9878
"The branch location configuration file, locations.conf\n"
9879
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
9880
msgstr ""
9881
9882
#: en/help_topics/configuration.txt:360
9883
msgid ""
9884
"``locations.conf`` allows one to specify overriding settings for\n"
9885
"a specific branch. The format is almost identical to the default section in\n"
9886
"bazaar.conf with one significant change: The section header, instead of "
9887
"saying\n"
9888
"default, will be the path to a branch that you wish to override a value\n"
9889
"for. The '?' and '*' wildcards are supported::"
9890
msgstr ""
9891
9892
#: en/help_topics/configuration.txt:366
9893
msgid ""
9894
" [/home/jdoe/branches/nethack]\n"
9895
" email = Nethack Admin <nethack@nethack.com>"
9896
msgstr ""
9897
9898
#: en/help_topics/configuration.txt:369
9899
msgid ""
9900
" [http://hypothetical.site.com/branches/devel-branch]\n"
9901
" create_signatures = always"
9902
msgstr ""
9903
9904
#: en/help_topics/configuration.txt:372
9905
msgid ""
9906
"The authentication configuration file, authentication.conf\n"
9907
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
9908
msgstr ""
9909
9910
#: en/help_topics/configuration.txt:375
9911
msgid ""
9912
"``authentication.conf`` allows one to specify credentials for\n"
9913
"remote servers. This can be used for all the supported transports and any "
9914
"part\n"
9915
"of bzr that requires authentication (smtp for example)."
9916
msgstr ""
9917
9918
#: en/help_topics/configuration.txt:379
9919
msgid ""
9920
"The syntax of the file obeys the same rules as the others except for the\n"
9921
"option policies which don't apply."
9922
msgstr ""
9923
9924
#: en/help_topics/configuration.txt:382
9925
msgid ""
9926
"For more information on the possible uses of the authentication "
9927
"configuration\n"
9928
"file see :doc:`authentication-help`."
9929
msgstr ""
9930
9931
#: en/help_topics/configuration.txt:385
9932
msgid ""
9933
"\n"
9934
"Common options\n"
9935
"--------------"
9936
msgstr ""
9937
9938
#: en/help_topics/configuration.txt:389
9939
msgid ""
9940
"debug_flags\n"
9941
"~~~~~~~~~~~"
9942
msgstr ""
9943
9944
#: en/help_topics/configuration.txt:392
9945
msgid ""
9946
"A comma-separated list of debugging options to turn on. The same values\n"
9947
"can be used as with the -D command-line option (see `help global-options`).\n"
9948
"For example::"
9949
msgstr ""
9950
9951
#: en/help_topics/configuration.txt:396
9952
msgid " debug_flags = hpss"
9953
msgstr ""
9954
9955
#: en/help_topics/configuration.txt:400
9956
msgid " debug_flags = hpss,evil"
9957
msgstr ""
9958
9959
#: en/help_topics/configuration.txt:402
9960
msgid ""
9961
"email\n"
9962
"~~~~~"
9963
msgstr ""
9964
9965
#: en/help_topics/configuration.txt:405
9966
msgid ""
9967
"The email address to use when committing a branch. Typically takes the form\n"
9968
"of::"
9969
msgstr ""
9970
9971
#: en/help_topics/configuration.txt:408
9972
msgid " email = Full Name <account@hostname.tld>"
9973
msgstr ""
9974
9975
#: en/help_topics/configuration.txt:410
9976
msgid ""
9977
"editor\n"
9978
"~~~~~~"
9979
msgstr ""
9980
9981
#: en/help_topics/configuration.txt:413
9982
msgid ""
9983
"The path of the editor that you wish to use if *bzr commit* is run without\n"
9984
"a commit message. This setting is trumped by the environment variable\n"
9985
"``BZR_EDITOR``, and overrides the ``VISUAL`` and ``EDITOR`` environment\n"
9986
"variables."
9987
msgstr ""
9988
9989
#: en/help_topics/configuration.txt:418
9990
msgid ""
9991
"log_format\n"
9992
"~~~~~~~~~~"
9993
msgstr ""
9994
9995
#: en/help_topics/configuration.txt:421
9996
msgid ""
9997
"The default log format to use. Standard log formats are ``long``, ``short``\n"
9998
"and ``line``. Additional formats may be provided by plugins. The default\n"
9999
"value is ``long``."
10000
msgstr ""
10001
10002
#: en/help_topics/configuration.txt:425
10003
msgid ""
10004
"check_signatures\n"
10005
"~~~~~~~~~~~~~~~~"
10006
msgstr ""
10007
10008
#: en/help_topics/configuration.txt:428
10009
msgid ""
10010
"Reserved for future use. These options will allow a policy for branches to\n"
10011
"require signatures."
10012
msgstr ""
10013
10014
#: en/help_topics/configuration.txt:431
10015
msgid ""
10016
"require\n"
10017
" The gnupg signature for revisions must be present and must be valid."
10018
msgstr ""
10019
10020
#: en/help_topics/configuration.txt:434
10021
msgid ""
10022
"ignore\n"
10023
" Do not check gnupg signatures of revisions."
10024
msgstr ""
10025
10026
#: en/help_topics/configuration.txt:437
10027
msgid ""
10028
"check-available\n"
10029
" (default) If gnupg signatures for revisions are present, check them.\n"
10030
" Bazaar will fail if it finds a bad signature, but will not fail if\n"
10031
" no signature is present."
10032
msgstr ""
10033
10034
#: en/help_topics/configuration.txt:442
10035
msgid ""
10036
"create_signatures\n"
10037
"~~~~~~~~~~~~~~~~~"
10038
msgstr ""
10039
10040
#: en/help_topics/configuration.txt:445
10041
msgid ""
10042
"Defines the behaviour of signing revisions on commits. By default bzr will "
10043
"not\n"
10044
"sign new commits."
10045
msgstr ""
10046
10047
#: en/help_topics/configuration.txt:448
10048
msgid ""
10049
"always\n"
10050
" Sign every new revision that is committed. If the signing fails then "
10051
"the\n"
10052
" commit will not be made."
10053
msgstr ""
10054
10055
#: en/help_topics/configuration.txt:452
10056
msgid ""
10057
"when-required\n"
10058
" Reserved for future use."
10059
msgstr ""
10060
10061
#: en/help_topics/configuration.txt:455
10062
msgid ""
10063
"never\n"
10064
" Reserved for future use."
10065
msgstr ""
10066
10067
#: en/help_topics/configuration.txt:458
10068
msgid ""
10069
"In future it is planned that ``when-required`` will sign newly\n"
10070
"committed revisions only when the branch requires them. ``never`` will "
10071
"refuse\n"
10072
"to sign newly committed revisions, even if the branch requires signatures."
10073
msgstr ""
10074
10075
#: en/help_topics/configuration.txt:462
10076
msgid ""
10077
"dirstate.fdatasync\n"
10078
"~~~~~~~~~~~~~~~~~~"
10079
msgstr ""
10080
10081
#: en/help_topics/configuration.txt:465
10082
msgid ""
10083
"If true (default), working tree metadata changes are flushed through the\n"
10084
"OS buffers to physical disk. This is somewhat slower, but means data\n"
10085
"should not be lost if the machine crashes. See also repository.fdatasync."
10086
msgstr ""
10087
10088
#: en/help_topics/configuration.txt:469
10089
msgid ""
10090
"gpg_signing_key\n"
10091
"~~~~~~~~~~~~~~~"
10092
msgstr ""
10093
10094
#: en/help_topics/configuration.txt:472
10095
msgid ""
10096
"The GnuPG user identity to use when signing commits. Can be an e-mail\n"
10097
"address, key fingerprint or full key ID. When unset or when set to\n"
10098
"\"default\" Bazaar will use the user e-mail set with ``whoami``."
10099
msgstr ""
10100
10101
#: en/help_topics/configuration.txt:476
10102
msgid ""
10103
"recurse\n"
10104
"~~~~~~~"
10105
msgstr ""
10106
10107
#: en/help_topics/configuration.txt:479
10108
msgid ""
10109
"Only useful in ``locations.conf``. Defines whether or not the\n"
10110
"configuration for this section applies to subdirectories:"
10111
msgstr ""
10112
10113
#: en/help_topics/configuration.txt:482
10114
msgid ""
10115
"true\n"
10116
" (default) This section applies to subdirectories as well."
10117
msgstr ""
10118
10119
#: en/help_topics/configuration.txt:485
10120
msgid ""
10121
"false\n"
10122
" This section only applies to the branch at this directory and not\n"
10123
" branches below it."
10124
msgstr ""
10125
10126
#: en/help_topics/configuration.txt:489
10127
msgid ""
10128
"gpg_signing_command\n"
10129
"~~~~~~~~~~~~~~~~~~~"
10130
msgstr ""
10131
10132
#: en/help_topics/configuration.txt:492
10133
msgid ""
10134
"(Default: \"gpg\"). Which program should be used to sign and check "
10135
"revisions.\n"
10136
"For example::"
10137
msgstr ""
10138
10139
#: en/help_topics/configuration.txt:495
10140
msgid " gpg_signing_command = /usr/bin/gnpg"
10141
msgstr ""
10142
10143
#: en/help_topics/configuration.txt:497
10144
msgid ""
10145
"The specified command must accept the options \"--clearsign\" and \"-u "
10146
"<email>\"."
10147
msgstr ""
10148
10149
#: en/help_topics/configuration.txt:499
10150
msgid ""
10151
"bzr_remote_path\n"
10152
"~~~~~~~~~~~~~~~"
10153
msgstr ""
10154
10155
#: en/help_topics/configuration.txt:502
10156
msgid ""
10157
"(Default: \"bzr\"). The path to the command that should be used to run the "
10158
"smart\n"
10159
"server for bzr. This value may only be specified in locations.conf, because:"
10160
msgstr ""
10161
10162
#: en/help_topics/configuration.txt:505
10163
msgid ""
10164
"- it's needed before branch.conf is accessible\n"
10165
"- allowing remote branch.conf files to specify commands would be a security\n"
10166
" risk"
10167
msgstr ""
10168
10169
#: en/help_topics/configuration.txt:509
10170
msgid "It is overridden by the BZR_REMOTE_PATH environment variable."
10171
msgstr ""
10172
10173
#: en/help_topics/configuration.txt:511
10174
msgid ""
10175
"smtp_server\n"
10176
"~~~~~~~~~~~"
10177
msgstr ""
10178
10179
#: en/help_topics/configuration.txt:514
10180
msgid ""
10181
"(Default: \"localhost\"). SMTP server to use when Bazaar needs to send\n"
10182
"email, eg. with ``merge-directive --mail-to``, or the bzr-email plugin."
10183
msgstr ""
10184
10185
#: en/help_topics/configuration.txt:517
10186
msgid ""
10187
"smtp_username, smtp_password\n"
10188
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
10189
msgstr ""
10190
10191
#: en/help_topics/configuration.txt:520
10192
msgid ""
10193
"User and password to authenticate to the SMTP server. If smtp_username\n"
10194
"is set, and smtp_password is not, Bazaar will prompt for a password.\n"
10195
"These settings are only needed if the SMTP server requires authentication\n"
10196
"to send mail."
10197
msgstr ""
10198
10199
#: en/help_topics/configuration.txt:525
10200
msgid ""
10201
"locks.steal_dead\n"
10202
"~~~~~~~~~~~~~~~~"
10203
msgstr ""
10204
10205
#: en/help_topics/configuration.txt:528
10206
msgid ""
10207
"If set to true, bzr will automatically break locks held by processes from\n"
10208
"the same machine and user that are no longer alive. Otherwise, it will\n"
10209
"print a message and you can break the lock manually, if you are satisfied\n"
10210
"the object is no longer in use."
10211
msgstr ""
10212
10213
#: en/help_topics/configuration.txt:533
10214
msgid ""
10215
"mail_client\n"
10216
"~~~~~~~~~~~"
10217
msgstr ""
10218
10219
#: en/help_topics/configuration.txt:536
10220
msgid ""
10221
"A mail client to use for sending merge requests.\n"
10222
"By default, bzr will try to use ``mapi`` on Windows. On other platforms, "
10223
"it\n"
10224
"will try ``xdg-email``. If either of these fails, it will fall back to\n"
10225
"``editor``."
10226
msgstr ""
10227
10228
#: en/help_topics/configuration.txt:541
10229
msgid "Supported values for specific clients:"
10230
msgstr ""
10231
10232
#: en/help_topics/configuration.txt:543
10233
msgid ""
10234
":claws: Use Claws. This skips a dialog for attaching files.\n"
10235
":evolution: Use Evolution.\n"
10236
":kmail: Use KMail.\n"
10237
":mutt: Use Mutt.\n"
10238
":thunderbird: Use Mozilla Thunderbird or Icedove. For Thunderbird/Icedove "
10239
"1.5,\n"
10240
" this works around some bugs that xdg-email doesn't handle."
10241
msgstr ""
10242
10243
#: en/help_topics/configuration.txt:550
10244
msgid "Supported generic values are:"
10245
msgstr ""
10246
10247
#: en/help_topics/configuration.txt:552
10248
msgid ""
10249
":default: See above.\n"
10250
":editor: Use your editor to compose the merge request. This also uses\n"
10251
" your commit id, (see ``bzr whoami``), smtp_server and (optionally)\n"
10252
" smtp_username and smtp_password.\n"
10253
":mapi: Use your preferred e-mail client on Windows.\n"
10254
":xdg-email: Use xdg-email to run your preferred mail program"
10255
msgstr ""
10256
10257
#: en/help_topics/configuration.txt:559
10258
msgid ""
10259
"repository.fdatasync\n"
10260
"~~~~~~~~~~~~~~~~~~~~"
10261
msgstr ""
10262
10263
#: en/help_topics/configuration.txt:562
10264
msgid ""
10265
"If true (default), repository changes are flushed through the OS buffers\n"
10266
"to physical disk. This is somewhat slower, but means data should not be\n"
10267
"lost if the machine crashes. See also dirstate.fdatasync."
10268
msgstr ""
10269
10270
#: en/help_topics/configuration.txt:566
10271
msgid ""
10272
"submit_branch\n"
10273
"~~~~~~~~~~~~~"
10274
msgstr ""
10275
10276
#: en/help_topics/configuration.txt:569
10277
msgid ""
10278
"The branch you intend to submit your current work to. This is "
10279
"automatically\n"
10280
"set by ``bzr send``, and is also used by the ``submit:`` revision spec. "
10281
"This\n"
10282
"should usually be set on a per-branch or per-location basis."
10283
msgstr ""
10284
10285
#: en/help_topics/configuration.txt:573
10286
msgid ""
10287
"public_branch\n"
10288
"~~~~~~~~~~~~~"
10289
msgstr ""
10290
10291
#: en/help_topics/configuration.txt:576
10292
msgid ""
10293
"A publically-accessible version of this branch (implying that this version "
10294
"is\n"
10295
"not publically-accessible). Used (and set) by ``bzr send``."
10296
msgstr ""
10297
10298
#: en/help_topics/configuration.txt:579
10299
msgid ""
10300
"suppress_warnings\n"
10301
"~~~~~~~~~~~~~~~~~"
10302
msgstr ""
10303
10304
#: en/help_topics/configuration.txt:582
10305
msgid ""
10306
"A list of strings, each string represent a warning that can be emitted by\n"
10307
"bzr. Mentioning a warning in this list tells bzr to not emit it."
10308
msgstr ""
10309
10310
#: en/help_topics/configuration.txt:585
10311
msgid "Valid values:"
10312
msgstr ""
10313
10314
#: en/help_topics/configuration.txt:587
10315
msgid ""
10316
"* ``format_deprecation``:\n"
10317
" whether the format deprecation warning is shown on repositories that "
10318
"are\n"
10319
" using deprecated formats."
10320
msgstr ""
10321
10322
#: en/help_topics/configuration.txt:591
10323
msgid ""
10324
"default_format\n"
10325
"~~~~~~~~~~~~~~"
10326
msgstr ""
10327
10328
#: en/help_topics/configuration.txt:594
10329
msgid ""
10330
"A format name for the default format used when creating branches. See "
10331
"``bzr\n"
10332
"help formats`` for possible values."
10333
msgstr ""
10334
10335
#: en/help_topics/configuration.txt:597
10336
msgid ""
10337
"\n"
10338
"Unicode options\n"
10339
"---------------"
10340
msgstr ""
10341
10342
#: en/help_topics/configuration.txt:601
10343
msgid ""
10344
"output_encoding\n"
10345
"~~~~~~~~~~~~~~~"
10346
msgstr ""
10347
10348
#: en/help_topics/configuration.txt:604
10349
msgid ""
10350
"A Python unicode encoding name for text output from bzr, such as log\n"
10351
"information. Values include: utf8, cp850, ascii, iso-8859-1. The default\n"
10352
"is the terminal encoding prefered by the operating system."
10353
msgstr ""
10354
10355
#: en/help_topics/configuration.txt:608
10356
msgid ""
10357
"\n"
10358
"Branch type specific options\n"
10359
"----------------------------"
10360
msgstr ""
10361
10362
#: en/help_topics/configuration.txt:612
10363
msgid ""
10364
"These options apply only to branches that use the ``dirstate-tags`` or\n"
10365
"later format. They\n"
10366
"are usually set in ``.bzr/branch/branch.conf`` automatically, but may be\n"
10367
"manually set in ``locations.conf`` or ``bazaar.conf``."
10368
msgstr ""
10369
10370
#: en/help_topics/configuration.txt:617
10371
msgid ""
10372
"append_revisions_only\n"
10373
"~~~~~~~~~~~~~~~~~~~~~"
10374
msgstr ""
10375
10376
#: en/help_topics/configuration.txt:620
10377
msgid ""
10378
"If set to \"True\" then revisions can only be appended to the log, not\n"
10379
"removed. A branch with this setting enabled can only pull from another\n"
10380
"branch if the other branch's log is a longer version of its own. This is\n"
10381
"normally set by ``bzr init --append-revisions-only``. If you set it\n"
10382
"manually, use either 'True' or 'False' (case-sensitive) to maintain\n"
10383
"compatibility with previous bzr versions (older than 2.2)."
10384
msgstr ""
10385
10386
#: en/help_topics/configuration.txt:627
10387
msgid ""
10388
"parent_location\n"
10389
"~~~~~~~~~~~~~~~"
10390
msgstr ""
10391
10392
#: en/help_topics/configuration.txt:630
10393
msgid ""
10394
"If present, the location of the default branch for pull or merge. This "
10395
"option\n"
10396
"is normally set when creating a branch, the first ``pull`` or by ``pull\n"
10397
"--remember``."
10398
msgstr ""
10399
10400
#: en/help_topics/configuration.txt:634
10401
msgid ""
10402
"push_location\n"
10403
"~~~~~~~~~~~~~"
10404
msgstr ""
10405
10406
#: en/help_topics/configuration.txt:637
10407
msgid ""
10408
"If present, the location of the default branch for push. This option\n"
10409
"is normally set by the first ``push`` or ``push --remember``."
10410
msgstr ""
10411
10412
#: en/help_topics/configuration.txt:640
10413
msgid ""
10414
"push_strict\n"
10415
"~~~~~~~~~~~"
10416
msgstr ""
10417
10418
#: en/help_topics/configuration.txt:643
10419
msgid ""
10420
"If present, defines the ``--strict`` option default value for checking\n"
10421
"uncommitted changes before pushing."
10422
msgstr ""
10423
10424
#: en/help_topics/configuration.txt:646
10425
msgid ""
10426
"dpush_strict\n"
10427
"~~~~~~~~~~~~"
10428
msgstr ""
10429
10430
#: en/help_topics/configuration.txt:649
10431
msgid ""
10432
"If present, defines the ``--strict`` option default value for checking\n"
10433
"uncommitted changes before pushing into a different VCS without any\n"
10434
"custom bzr metadata."
10435
msgstr ""
10436
10437
#: en/help_topics/configuration.txt:653
10438
msgid ""
10439
"bound_location\n"
10440
"~~~~~~~~~~~~~~"
10441
msgstr ""
10442
10443
#: en/help_topics/configuration.txt:656
10444
msgid ""
10445
"The location that commits should go to when acting as a checkout.\n"
10446
"This option is normally set by ``bind``."
10447
msgstr ""
10448
10449
#: en/help_topics/configuration.txt:659
10450
msgid ""
10451
"bound\n"
10452
"~~~~~"
10453
msgstr ""
10454
10455
#: en/help_topics/configuration.txt:662
10456
msgid ""
10457
"If set to \"True\", the branch should act as a checkout, and push each "
10458
"commit to\n"
10459
"the bound_location. This option is normally set by ``bind``/``unbind``."
10460
msgstr ""
10461
10462
#: en/help_topics/configuration.txt:665
10463
msgid ""
10464
"send_strict\n"
10465
"~~~~~~~~~~~"
10466
msgstr ""
10467
10468
#: en/help_topics/configuration.txt:668
10469
msgid ""
10470
"If present, defines the ``--strict`` option default value for checking\n"
10471
"uncommitted changes before sending a merge directive."
10472
msgstr ""
10473
10474
#: en/help_topics/configuration.txt:671
10475
msgid ""
10476
"add.maximum_file_size\n"
10477
"~~~~~~~~~~~~~~~~~~~~~"
10478
msgstr ""
10479
10480
#: en/help_topics/configuration.txt:674
10481
msgid ""
10482
"Defines the maximum file size the command line \"add\" operation will allow\n"
10483
"in recursive mode, with files larger than this value being skipped. You may "
10484
"\n"
10485
"specify this value as an integer (in which case it is interpreted as bytes), "
10486
"\n"
10487
"or you may specify the value using SI units, i.e. 10KB, 20MB, 1G. A value of "
10488
"0 \n"
10489
"will disable skipping."
10490
msgstr ""
10491
10492
#: en/help_topics/configuration.txt:680
10493
msgid ""
10494
"External Merge Tools\n"
10495
"--------------------"
10496
msgstr ""
10497
10498
#: en/help_topics/configuration.txt:683
10499
msgid ""
10500
"bzr.mergetool.<name>\n"
10501
"~~~~~~~~~~~~~~~~~~~~"
10502
msgstr ""
10503
10504
#: en/help_topics/configuration.txt:686
10505
msgid ""
10506
"Defines an external merge tool called <name> with the given command-line.\n"
10507
"Arguments containing spaces should be quoted using single or double quotes. "
10508
"The\n"
10509
"executable may omit its path if it can be found on the PATH."
10510
msgstr ""
10511
10512
#: en/help_topics/configuration.txt:690
10513
msgid ""
10514
"The following markers can be used in the command-line to substitute "
10515
"filenames\n"
10516
"involved in the merge conflict::"
10517
msgstr ""
10518
10519
#: en/help_topics/configuration.txt:693
10520
msgid ""
10521
" {base} file.BASE\n"
10522
" {this} file.THIS\n"
10523
" {other} file.OTHER\n"
10524
" {result} output file\n"
10525
" {this_temp} temp copy of file.THIS, used to overwrite output file if "
10526
"merge\n"
10527
" succeeds."
10528
msgstr ""
10529
10530
#: en/help_topics/configuration.txt:702
10531
msgid " bzr.mergetool.kdiff3 = kdiff3 {base} {this} {other} -o {result}"
10532
msgstr ""
10533
10534
#: en/help_topics/configuration.txt:704
10535
msgid ""
10536
"bzr.default_mergetool\n"
10537
"~~~~~~~~~~~~~~~~~~~~~"
10538
msgstr ""
10539
10540
#: en/help_topics/configuration.txt:707
10541
msgid ""
10542
"Specifies which external merge tool (as defined above) should be selected "
10543
"by\n"
10544
"default in tools such as ``bzr qconflicts``."
10545
msgstr ""
10546
10547
#: en/help_topics/configuration.txt:712
10548
msgid " bzr.default_mergetool = kdiff3\n"
10549
msgstr ""
10550
10551
#: en/help_topics/conflict-types.txt:1
10552
msgid ""
10553
"Conflict Types\n"
10554
"=============="
10555
msgstr ""
10556
10557
#: en/help_topics/conflict-types.txt:4
10558
msgid ""
10559
"Some operations, like merge, revert and pull, modify the contents of your\n"
10560
"working tree. These modifications are programmatically generated, and so "
10561
"they\n"
10562
"may conflict with the current state of your working tree. "
10563
msgstr ""
10564
10565
#: en/help_topics/conflict-types.txt:8
10566
msgid ""
10567
"When conflicts are present in your working tree (as shown by ``bzr\n"
10568
"conflicts``), you should resolve them and then inform bzr that the "
10569
"conflicts\n"
10570
"have been resolved."
10571
msgstr ""
10572
10573
#: en/help_topics/conflict-types.txt:12
10574
msgid ""
10575
"Resolving conflicts is sometimes not obvious. Either because the user that\n"
10576
"should resolve them is not the one responsible for their occurrence, as is "
10577
"the\n"
10578
"case when merging other people's work or because some conflicts are "
10579
"presented\n"
10580
"in a way that is not easy to understand."
10581
msgstr ""
10582
10583
#: en/help_topics/conflict-types.txt:17
10584
msgid ""
10585
"Bazaar tries to avoid conflicts ; its aim is to ask you to resolve the\n"
10586
"conflict if and only if there's an actual conceptual conflict in the source\n"
10587
"tree. Because Bazaar doesn't understand the real meaning of the files "
10588
"being\n"
10589
"versioned, it can, when faced with ambiguities, fall short in either "
10590
"direction\n"
10591
"trying to resolve the conflict itself. Many kinds of changes can be "
10592
"combined\n"
10593
"programmatically, but sometimes only a human can determine the right thing "
10594
"to\n"
10595
"do."
10596
msgstr ""
10597
10598
#: en/help_topics/conflict-types.txt:25
10599
msgid ""
10600
"When Bazaar generates a conflict, it adds information into the working tree "
10601
"to\n"
10602
"present the conflicting versions, and it's up to you to find the correct\n"
10603
"resolution."
10604
msgstr ""
10605
10606
#: en/help_topics/conflict-types.txt:29
10607
msgid "Whatever the conflict is, resolving it is roughly done in two steps:"
10608
msgstr ""
10609
10610
#: en/help_topics/conflict-types.txt:31
10611
msgid ""
10612
"1. Modify the working tree content so that the conflicted item is now in "
10613
"the\n"
10614
" state you want to keep, then"
10615
msgstr ""
10616
10617
#: en/help_topics/conflict-types.txt:34
10618
msgid ""
10619
"2. Inform Bazaar that the conflict is now solved and ask to cleanup any\n"
10620
" remaining generated information (``bzr resolve <item>``)."
10621
msgstr ""
10622
10623
#: en/help_topics/conflict-types.txt:37
10624
msgid ""
10625
"For most conflict types, there are some obvious ways to modify the working\n"
10626
"tree and put it into the desired state. For some types of conflicts, Bazaar\n"
10627
"itself already made a choice, when possible."
10628
msgstr ""
10629
10630
#: en/help_topics/conflict-types.txt:41
10631
msgid ""
10632
"Yet, whether Bazaar makes a choice or not, there are some other simple but\n"
10633
"different ways to resolve the conflict."
10634
msgstr ""
10635
10636
#: en/help_topics/conflict-types.txt:44
10637
msgid ""
10638
"Each type of conflict is explained below, and the action which must be done "
10639
"to\n"
10640
"resolve the conflict is outlined."
10641
msgstr ""
10642
10643
#: en/help_topics/conflict-types.txt:47
10644
msgid ""
10645
"Various actions are available depending on the kind of conflict, for some "
10646
"of\n"
10647
"these actions, Bazaar can provide some help. In the end you should at least\n"
10648
"inform Bazaar that you're done with the conflict with::"
10649
msgstr ""
10650
10651
#: en/help_topics/conflict-types.txt:51
10652
msgid " ``bzr resolve FILE --action=done'"
10653
msgstr ""
10654
10655
#: en/help_topics/conflict-types.txt:53
10656
msgid ""
10657
"Note that this is the default action when a single file is involved so you "
10658
"can\n"
10659
"simply use::"
10660
msgstr ""
10661
10662
#: en/help_topics/conflict-types.txt:56
10663
msgid " ``bzr resolve FILE``"
10664
msgstr ""
10665
10666
#: en/help_topics/conflict-types.txt:58
10667
msgid "See ``bzr help resolve`` for more details."
10668
msgstr ""
10669
10670
#: en/help_topics/conflict-types.txt:60
10671
msgid ""
10672
"Text conflicts\n"
10673
"--------------"
10674
msgstr ""
10675
10676
#: en/help_topics/conflict-types.txt:63 en/help_topics/conflict-types.txt:120
10677
#: en/help_topics/conflict-types.txt:151 en/help_topics/conflict-types.txt:175
10678
#: en/help_topics/conflict-types.txt:198 en/help_topics/conflict-types.txt:213
10679
#: en/help_topics/conflict-types.txt:239 en/help_topics/conflict-types.txt:281
10680
#: en/help_topics/conflict-types.txt:303 en/help_topics/conflict-types.txt:339
10681
msgid "Typical message::"
10682
msgstr ""
10683
10684
#: en/help_topics/conflict-types.txt:65
10685
msgid " Text conflict in FILE"
10686
msgstr ""
10687
10688
#: en/help_topics/conflict-types.txt:67
10689
msgid ""
10690
"These are produced when a text merge cannot completely reconcile two sets "
10691
"of\n"
10692
"text changes. Bazaar will emit files for each version with the extensions\n"
10693
"THIS, OTHER, and BASE. THIS is the version of the file from the target "
10694
"tree,\n"
10695
"i.e. the tree that you are merging changes into. OTHER is the version that "
10696
"you\n"
10697
"are merging into the target. BASE is an older version that is used as a "
10698
"basis\n"
10699
"for comparison."
10700
msgstr ""
10701
10702
#: en/help_topics/conflict-types.txt:74
10703
msgid ""
10704
"In the main copy of the file, Bazaar will include all the changes that it\n"
10705
"could reconcile, and any un-reconciled conflicts are surrounded by\n"
10706
"\"herringbone\" markers like ``<<<<<<<``."
10707
msgstr ""
10708
10709
#: en/help_topics/conflict-types.txt:78
10710
msgid ""
10711
"Say the initial text is \"The project leader released it.\", and THIS "
10712
"modifies it\n"
10713
"to \"Martin Pool released it.\", while OTHER modifies it to \"The project "
10714
"leader\n"
10715
"released Bazaar.\" A conflict would look like this::"
10716
msgstr ""
10717
10718
#: en/help_topics/conflict-types.txt:82
10719
msgid ""
10720
" <<<<<<< TREE\n"
10721
" Martin Pool released it.\n"
10722
" =======\n"
10723
" The project leader released Bazaar.\n"
10724
" >>>>>>> MERGE-SOURCE"
10725
msgstr ""
10726
10727
#: en/help_topics/conflict-types.txt:88
10728
msgid "The correct resolution would be \"Martin Pool released Bazaar.\""
10729
msgstr ""
10730
10731
#: en/help_topics/conflict-types.txt:90
10732
msgid ""
10733
"You can handle text conflicts either by editing the main copy of the file,\n"
10734
"or by invoking external tools on the THIS, OTHER and BASE versions. It's\n"
10735
"worth mentioning that resolving text conflicts rarely involves picking one\n"
10736
"set of changes over the other (but see below when you encounter these\n"
10737
"cases). More often, the two sets of changes must be intelligently combined."
10738
msgstr ""
10739
10740
#: en/help_topics/conflict-types.txt:96
10741
msgid ""
10742
"If you edit the main copy, be sure to remove the herringbone markers. When\n"
10743
"you are done editing, the file should look like it never had a conflict, and "
10744
"be\n"
10745
"ready to commit."
10746
msgstr ""
10747
10748
#: en/help_topics/conflict-types.txt:100
10749
msgid ""
10750
"When you have resolved text conflicts, just run ``bzr resolve --auto``, and\n"
10751
"Bazaar will auto-detect which conflicts you have resolved."
10752
msgstr ""
10753
10754
#: en/help_topics/conflict-types.txt:103
10755
msgid ""
10756
"When the conflict is resolved, Bazaar deletes the previously generated\n"
10757
"``.BASE``, ``.THIS`` and ``.OTHER`` files if they are still present in the\n"
10758
"working tree."
10759
msgstr ""
10760
10761
#: en/help_topics/conflict-types.txt:107
10762
msgid ""
10763
"\n"
10764
"When you want to pick one set of changes over the other, you can use ``bzr\n"
10765
"resolve`` with one of the following actions:"
10766
msgstr ""
10767
10768
#: en/help_topics/conflict-types.txt:111
10769
msgid ""
10770
"* ``--action=take-this`` will issue ``mv FILE.THIS FILE``,\n"
10771
"* ``--action=take-other`` will issue ``mv FILE.OTHER FILE``."
10772
msgstr ""
10773
10774
#: en/help_topics/conflict-types.txt:114
10775
msgid ""
10776
"Note that if you have modified ``FILE.THIS`` or ``FILE.OTHER``, these\n"
10777
"modifications will be taken into account."
10778
msgstr ""
10779
10780
#: en/help_topics/conflict-types.txt:117
10781
msgid ""
10782
"Content conflicts\n"
10783
"-----------------"
10784
msgstr ""
10785
10786
#: en/help_topics/conflict-types.txt:122
10787
msgid " Contents conflict in FILE"
10788
msgstr ""
10789
10790
#: en/help_topics/conflict-types.txt:124
10791
msgid ""
10792
"This conflict happens when there are conflicting changes in the working "
10793
"tree\n"
10794
"and the merge source, but the conflicted items are not text files. They "
10795
"may\n"
10796
"be binary files, or symlinks, or directories. It can even happen with "
10797
"files\n"
10798
"that are deleted on one side, and modified on the other."
10799
msgstr ""
10800
10801
#: en/help_topics/conflict-types.txt:129
10802
msgid ""
10803
"Like text conflicts, Bazaar will emit THIS, OTHER and BASE files. (They may "
10804
"be\n"
10805
"regular files, symlinks or directories). But it will not include a \"main "
10806
"copy\"\n"
10807
"of the file with herringbone conflict markers. It will appear that the "
10808
"\"main\n"
10809
"copy\" has been renamed to THIS or OTHER."
10810
msgstr ""
10811
10812
#: en/help_topics/conflict-types.txt:134 en/help_topics/conflict-types.txt:182
10813
msgid ""
10814
"To resolve that kind of conflict, you should rebuild FILE from either "
10815
"version\n"
10816
"or a combination of both."
10817
msgstr ""
10818
10819
#: en/help_topics/conflict-types.txt:137 en/help_topics/conflict-types.txt:185
10820
#: en/help_topics/conflict-types.txt:226 en/help_topics/conflict-types.txt:252
10821
#: en/help_topics/conflict-types.txt:291 en/help_topics/conflict-types.txt:326
10822
#: en/help_topics/conflict-types.txt:361
10823
msgid "``bzr resolve`` recognizes the following actions:"
10824
msgstr ""
10825
10826
#: en/help_topics/conflict-types.txt:139
10827
msgid ""
10828
"* ``--action=take-this`` will issue ``bzr mv FILE.THIS FILE``,\n"
10829
"* ``--action=take-other`` will issue ``bzr mv FILE.OTHER FILE``,\n"
10830
"* ``--action=done`` will just mark the conflict as resolved."
10831
msgstr ""
10832
10833
#: en/help_topics/conflict-types.txt:143
10834
msgid ""
10835
"Any action will also delete the previously generated ``.BASE``, ``.THIS`` "
10836
"and\n"
10837
"``.OTHER`` files if they are still present in the working tree."
10838
msgstr ""
10839
10840
#: en/help_topics/conflict-types.txt:146 en/help_topics/conflict-types.txt:193
10841
#: en/help_topics/conflict-types.txt:234 en/help_topics/conflict-types.txt:276
10842
#: en/help_topics/conflict-types.txt:298 en/help_topics/conflict-types.txt:334
10843
#: en/help_topics/conflict-types.txt:369
10844
msgid ""
10845
"Bazaar cannot auto-detect when conflicts of this kind have been resolved."
10846
msgstr ""
10847
10848
#: en/help_topics/conflict-types.txt:148
10849
msgid ""
10850
"Tag conflicts\n"
10851
"-------------"
10852
msgstr ""
10853
10854
#: en/help_topics/conflict-types.txt:153
10855
msgid ""
10856
" Conflicting tags:\n"
10857
" version-0.1"
10858
msgstr ""
10859
10860
#: en/help_topics/conflict-types.txt:156
10861
msgid ""
10862
"When pulling from or pushing to another branch, Bazaar informs you about "
10863
"tags\n"
10864
"that conflict between the two branches; that is the same tag points to two\n"
10865
"different revisions. You need not resolve these conflicts, but subsequent\n"
10866
"uses of pull or push will result in the same message."
10867
msgstr ""
10868
10869
#: en/help_topics/conflict-types.txt:161
10870
msgid ""
10871
"To resolve the conflict, you must apply the correct tags to either the "
10872
"target\n"
10873
"branch or the source branch as appropriate. Use \"bzr tags --show-ids -d\n"
10874
"SOURCE_URL\" to see the tags in the source branch. If you want to make the\n"
10875
"target branch's tags match the source branch, then in the target branch do\n"
10876
"``bzr tag --force -r revid:REVISION_ID CONFLICTING_TAG`` for each of the\n"
10877
"CONFLICTING_TAGs, where REVISION_ID comes from the list of tags in the "
10878
"source\n"
10879
"branch. You need not call \"bzr resolve\" after doing this. To resolve in\n"
10880
"favor of the target branch, you need to similarly use ``tag --force`` in "
10881
"the\n"
10882
"source branch. (Note that pulling or pushing using --overwrite will "
10883
"overwrite\n"
10884
"all tags as well.)"
10885
msgstr ""
10886
10887
#: en/help_topics/conflict-types.txt:172
10888
msgid ""
10889
"Duplicate paths\n"
10890
"---------------"
10891
msgstr ""
10892
10893
#: en/help_topics/conflict-types.txt:177
10894
msgid " Conflict adding file FILE. Moved existing file to FILE.moved."
10895
msgstr ""
10896
10897
#: en/help_topics/conflict-types.txt:179
10898
msgid ""
10899
"Sometimes Bazaar will attempt to create a file using a pathname that has\n"
10900
"already been used. The existing file will be renamed to \"FILE.moved\". "
10901
msgstr ""
10902
10903
#: en/help_topics/conflict-types.txt:187
10904
msgid ""
10905
"* ``--action=take-this`` will issue ``bzr rm FILE ; bzr mv FILE.moved "
10906
"FILE``,\n"
10907
"* ``--action=take-other`` will issue ``bzr rm FILE.moved``,\n"
10908
"* ``--action=done`` will just mark the conflict as resolved."
10909
msgstr ""
10910
10911
#: en/help_topics/conflict-types.txt:191
10912
msgid ""
10913
"Note that you must get rid of FILE.moved before using ``--action=done``."
10914
msgstr ""
10915
10916
#: en/help_topics/conflict-types.txt:195
10917
msgid ""
10918
"Unversioned parent\n"
10919
"------------------"
10920
msgstr ""
10921
10922
#: en/help_topics/conflict-types.txt:200
10923
msgid ""
10924
" Conflict because FILE is not versioned, but has versioned children."
10925
msgstr ""
10926
10927
#: en/help_topics/conflict-types.txt:202
10928
msgid ""
10929
"Sometimes Bazaar will attempt to create a file whose parent directory is "
10930
"not\n"
10931
"versioned. This happens when the directory has been deleted in the target,\n"
10932
"but has a new child in the source, or vice versa. In this situation, "
10933
"Bazaar\n"
10934
"will version the parent directory as well. Resolving this issue depends\n"
10935
"very much on the particular scenario. You may wish to rename or delete "
10936
"either\n"
10937
"the file or the directory. When you are satisfied, you can run \"bzr "
10938
"resolve\n"
10939
"FILE\" to mark the conflict as resolved."
10940
msgstr ""
10941
10942
#: en/help_topics/conflict-types.txt:210
10943
msgid ""
10944
"Missing parent\n"
10945
"--------------"
10946
msgstr ""
10947
10948
#: en/help_topics/conflict-types.txt:215
10949
msgid " Conflict adding files to FILE. Created directory."
10950
msgstr ""
10951
10952
#: en/help_topics/conflict-types.txt:217
10953
msgid ""
10954
"This happens when a directory has been deleted in the target, but has new\n"
10955
"children in the source. This is similar to the \"unversioned parent\" "
10956
"conflict,\n"
10957
"except that the parent directory does not *exist*, instead of just being\n"
10958
"unversioned. In this situation, Bazaar will create the missing parent.\n"
10959
"Resolving this issue depends very much on the particular scenario."
10960
msgstr ""
10961
10962
#: en/help_topics/conflict-types.txt:223 en/help_topics/conflict-types.txt:249
10963
msgid ""
10964
"To resolve that kind of conflict, you should either remove or rename the\n"
10965
"children or the directory or a combination of both."
10966
msgstr ""
10967
10968
#: en/help_topics/conflict-types.txt:228
10969
msgid ""
10970
"* ``--action=take-this`` will issue ``bzr rm directory`` including the\n"
10971
" children,\n"
10972
"* ``--action=take-other`` will acknowledge Bazaar choice to keep the "
10973
"children\n"
10974
" and restoring the directory,\n"
10975
"* ``--action=done`` will just mark the conflict as resolved."
10976
msgstr ""
10977
10978
#: en/help_topics/conflict-types.txt:236
10979
msgid ""
10980
"Deleting parent\n"
10981
"---------------"
10982
msgstr ""
10983
10984
#: en/help_topics/conflict-types.txt:241
10985
msgid " Conflict: can't delete DIR because it is not empty. Not deleting."
10986
msgstr ""
10987
10988
#: en/help_topics/conflict-types.txt:243
10989
msgid ""
10990
"This is the opposite of \"missing parent\". A directory is deleted in the\n"
10991
"source, but has new children in the target (either because a directory\n"
10992
"deletion is merged or because the merge introduce new children). Bazaar\n"
10993
"will retain the directory. Resolving this issue depends very much on the\n"
10994
"particular scenario."
10995
msgstr ""
10996
10997
#: en/help_topics/conflict-types.txt:254
10998
msgid ""
10999
"* ``--action=take-this`` will acknowledge Bazaar choice to keep the "
11000
"directory,"
11001
msgstr ""
11002
11003
#: en/help_topics/conflict-types.txt:256
11004
msgid ""
11005
"* ``--action=take-other`` will issue ``bzr rm directory`` including the \n"
11006
" children,"
11007
msgstr ""
11008
11009
#: en/help_topics/conflict-types.txt:259
11010
msgid "* ``--action=done`` will just mark the conflict as resolved."
11011
msgstr ""
11012
11013
#: en/help_topics/conflict-types.txt:261
11014
msgid ""
11015
"Note that when merging a directory deletion, if unversioned files are\n"
11016
"present, they become potential orphans has they don't have a directory\n"
11017
"parent anymore."
11018
msgstr ""
11019
11020
#: en/help_topics/conflict-types.txt:265
11021
msgid ""
11022
"Handling such orphans, *before* the conflict is created, is controlled by\n"
11023
"setting the ``bzr.transform.orphan_policy`` configuration option."
11024
msgstr ""
11025
11026
#: en/help_topics/conflict-types.txt:268
11027
msgid "There are two possible values for this option:"
11028
msgstr ""
11029
11030
#: en/help_topics/conflict-types.txt:270
11031
msgid ""
11032
"* ``conflict`` (the default): will leave the orphans in place and\n"
11033
" generate a conflicts,"
11034
msgstr ""
11035
11036
#: en/help_topics/conflict-types.txt:273
11037
msgid ""
11038
"* ``move``: will move the orphans to a ``bzr-orphans`` directory at the "
11039
"root\n"
11040
" of the working tree with names like ``<file>.~#~``."
11041
msgstr ""
11042
11043
#: en/help_topics/conflict-types.txt:278
11044
msgid ""
11045
"Path conflict\n"
11046
"-------------"
11047
msgstr ""
11048
11049
#: en/help_topics/conflict-types.txt:283
11050
msgid " Path conflict: PATH1 / PATH2"
11051
msgstr ""
11052
11053
#: en/help_topics/conflict-types.txt:285
11054
msgid ""
11055
"This happens when the source and target have each modified the name or "
11056
"parent\n"
11057
"directory of a file. Bazaar will use the path elements from the source."
11058
msgstr ""
11059
11060
#: en/help_topics/conflict-types.txt:288
11061
msgid ""
11062
"To resolve that kind of conflict, you just have to decide what name should "
11063
"be\n"
11064
"retained for the file involved."
11065
msgstr ""
11066
11067
#: en/help_topics/conflict-types.txt:293
11068
msgid ""
11069
"* ``--action=take-this`` will revert Bazaar choice and keep ``PATH1`` by\n"
11070
" issuing ``bzr mv PATH2 PATH1``,\n"
11071
"* ``--action=take-other`` will acknowledge Bazaar choice of keeping "
11072
"``PATH2``,\n"
11073
"* ``--action=done`` will just mark the conflict as resolved."
11074
msgstr ""
11075
11076
#: en/help_topics/conflict-types.txt:300
11077
msgid ""
11078
"Parent loop\n"
11079
"-----------"
11080
msgstr ""
11081
11082
#: en/help_topics/conflict-types.txt:305
11083
msgid " Conflict moving FILE into DIRECTORY. Cancelled move."
11084
msgstr ""
11085
11086
#: en/help_topics/conflict-types.txt:307
11087
msgid ""
11088
"This happens when the source and the target have each moved directories, so\n"
11089
"that, if the change could be applied, a directory would be contained by "
11090
"itself.\n"
11091
"For example::"
11092
msgstr ""
11093
11094
#: en/help_topics/conflict-types.txt:311
11095
msgid ""
11096
" $ bzr init\n"
11097
" $ bzr mkdir white\n"
11098
" $ bzr mkdir black\n"
11099
" $ bzr commit -m \"BASE\"\n"
11100
" $ bzr branch . ../other\n"
11101
" $ bzr mv white black\n"
11102
" $ bzr commit -m \"THIS\"\n"
11103
" $ bzr mv ../other/black ../other/white\n"
11104
" $ bzr commit ../other -m \"OTHER\"\n"
11105
" $ bzr merge ../other"
11106
msgstr ""
11107
11108
#: en/help_topics/conflict-types.txt:322
11109
msgid ""
11110
"In this situation, Bazaar will cancel the move, and leave ``white`` in\n"
11111
"``black``. To resolve that kind of conflict, you just have to decide what\n"
11112
"name should be retained for the directories involved."
11113
msgstr ""
11114
11115
#: en/help_topics/conflict-types.txt:328
11116
msgid ""
11117
"* ``--action=take-this`` will acknowledge Bazaar choice of leaving ``white`` "
11118
"\n"
11119
" in ``black``,\n"
11120
"* ``--action=take-other`` will revert Bazaar choice and move ``black`` in\n"
11121
" ``white`` by issuing ``bzr mv black/white white ; bzr mv black white``,\n"
11122
"* ``--action=done`` will just mark the conflict as resolved."
11123
msgstr ""
11124
11125
#: en/help_topics/conflict-types.txt:336
11126
msgid ""
11127
"Non-directory parent\n"
11128
"--------------------"
11129
msgstr ""
11130
11131
#: en/help_topics/conflict-types.txt:341
11132
msgid ""
11133
" Conflict: foo.new is not a directory, but has files in it.\n"
11134
" Created directory."
11135
msgstr ""
11136
11137
#: en/help_topics/conflict-types.txt:344
11138
msgid ""
11139
"This happens when one side has added files to a directory, and the other "
11140
"side\n"
11141
"has changed the directory into a file or symlink. For example::"
11142
msgstr ""
11143
11144
#: en/help_topics/conflict-types.txt:347
11145
msgid ""
11146
" $ bzr init\n"
11147
" $ bzr mkdir foo\n"
11148
" $ bzr commit -m \"BASE\"\n"
11149
" $ bzr branch . ../other\n"
11150
" $ rmdir foo\n"
11151
" $ touch foo\n"
11152
" $ bzr commit -m \"THIS\"\n"
11153
" $ bzr mkdir ../other/foo/bar\n"
11154
" $ bzr commit ../other -m \"OTHER\"\n"
11155
" $ bzr merge ../other"
11156
msgstr ""
11157
11158
#: en/help_topics/conflict-types.txt:358
11159
msgid ""
11160
"To resolve that kind of conflict, you have to decide what name should be\n"
11161
"retained for the file, directory or symlink involved."
11162
msgstr ""
11163
11164
#: en/help_topics/conflict-types.txt:363
11165
msgid ""
11166
"* ``--action=take-this`` will issue ``bzr rm --force foo.new`` and \n"
11167
" ``bzr add foo``,\n"
11168
"* ``--action=take-other`` will issue ``bzr rm --force foo`` and \n"
11169
" ``bzr mv foo.new foo``,\n"
11170
"* ``--action=done`` will just mark the conflict as resolved."
11171
msgstr ""
11172
11173
#: en/help_topics/conflict-types.txt:371
11174
msgid ""
11175
"MalformedTransform\n"
11176
"------------------"
11177
msgstr ""
11178
11179
#: en/help_topics/conflict-types.txt:374
11180
msgid ""
11181
"It is possible (though very rare) for Bazaar to raise a MalformedTransform\n"
11182
"exception. This means that Bazaar encountered a filesystem conflict that it "
11183
"was\n"
11184
"unable to resolve. This usually indicates a bug. Please let us know if "
11185
"you\n"
11186
"encounter this. Our bug tracker is at https://launchpad.net/bzr/+bugs\n"
11187
msgstr ""
11188
11189
#: en/help_topics/content-filters.txt:1
11190
msgid ""
11191
"Content Filters\n"
11192
"==============="
11193
msgstr ""
11194
11195
#: en/help_topics/content-filters.txt:4
11196
msgid ""
11197
"Content formats\n"
11198
"---------------"
11199
msgstr ""
11200
11201
#: en/help_topics/content-filters.txt:7
11202
msgid ""
11203
"Bazaar's content filtering allows you to store files in a different\n"
11204
"format from the copy in your working tree. This lets you, or your\n"
11205
"co-developers, use Windows development tools that expect CRLF files\n"
11206
"on projects that use other line-ending conventions. Among other things,\n"
11207
"content filters also let Unix developers more easily work on projects\n"
11208
"using Windows line-ending conventions, keyword expansion/compression,\n"
11209
"and trailing spaces on lines in text files to be implicitly stripped\n"
11210
"when committed."
11211
msgstr ""
11212
11213
#: en/help_topics/content-filters.txt:16
11214
msgid "To generalize, there are two content formats supported by Bazaar:"
11215
msgstr ""
11216
11217
#: en/help_topics/content-filters.txt:18
11218
msgid ""
11219
"* a canonical format - how files are stored internally\n"
11220
"* a convenience format - how files are created in a working tree."
11221
msgstr ""
11222
11223
#: en/help_topics/content-filters.txt:21
11224
msgid ""
11225
"\n"
11226
"Format conversion\n"
11227
"-----------------"
11228
msgstr ""
11229
11230
#: en/help_topics/content-filters.txt:25
11231
msgid ""
11232
"The conversion between these formats is done by content filters.\n"
11233
"A content filter has two parts:"
11234
msgstr ""
11235
11236
#: en/help_topics/content-filters.txt:28
11237
msgid ""
11238
"* a read converter - converts from convenience to canonical format\n"
11239
"* a write converter - converts from canonical to convenience format."
11240
msgstr ""
11241
11242
#: en/help_topics/content-filters.txt:31
11243
msgid ""
11244
"Many of these converters will provide *round-trip* conversion,\n"
11245
"i.e. applying the read converter followed by the write converter\n"
11246
"gives back the original content. However, others may provide an\n"
11247
"asymmetric conversion. For example, a read converter might strip\n"
11248
"trailing whitespace off lines in source code while the matching\n"
11249
"write converter might pass content through unchanged."
11250
msgstr ""
11251
11252
#: en/help_topics/content-filters.txt:38
11253
msgid ""
11254
"\n"
11255
"Enabling content filters\n"
11256
"------------------------"
11257
msgstr ""
11258
11259
#: en/help_topics/content-filters.txt:42
11260
msgid ""
11261
"Content filters are typically provided by plugins, so the first step\n"
11262
"in using them is to install the relevant plugins and read their\n"
11263
"documentation. Some plugins may be very specific about which files\n"
11264
"they filter, e.g. only files ending in ``.java`` or ``.php``.\n"
11265
"In other cases, the plugin may leave it in the user's hands to\n"
11266
"define which files are to be filtered. This is typically done\n"
11267
"using rule-based preferences. See ``bzr help rules`` for general\n"
11268
"information about defining these."
11269
msgstr ""
11270
11271
#: en/help_topics/content-filters.txt:51
11272
msgid ""
11273
"\n"
11274
"Impact on commands\n"
11275
"------------------"
11276
msgstr ""
11277
11278
#: en/help_topics/content-filters.txt:55
11279
msgid ""
11280
"Read converters are only applied to commands that read content from\n"
11281
"a working tree, e.g. status, diff and commit. For example, ``bzr diff``\n"
11282
"will apply read converters to files in the working tree, then compare\n"
11283
"the results to the content last committed."
11284
msgstr ""
11285
11286
#: en/help_topics/content-filters.txt:60
11287
msgid ""
11288
"Write converters are only applied by commands that **create files in a\n"
11289
"working tree**, e.g. branch, checkout, update. If you wish to see the\n"
11290
"canonical format of a file or tree, use ``bzr cat`` or ``bzr export``\n"
11291
"respectively."
11292
msgstr ""
11293
11294
#: en/help_topics/content-filters.txt:65
11295
msgid ""
11296
"Note: ``bzr commit`` does not implicitly apply write converters after\n"
11297
"comitting files. If this makes sense for a given plugin providing\n"
11298
"a content filter, the plugin can usually achieve this effect by using a\n"
11299
"``start_commit`` or ``post_commit`` hook say. See :doc:`hooks-help`\n"
11300
"for more information on hooks."
11301
msgstr ""
11302
11303
#: en/help_topics/content-filters.txt:71
11304
msgid ""
11305
"\n"
11306
"Refreshing your working tree\n"
11307
"----------------------------"
11308
msgstr ""
11309
11310
#: en/help_topics/content-filters.txt:75
11311
msgid ""
11312
"For performance reasons, Bazaar caches the timestamps of files in\n"
11313
"a working tree, and assumes files are unchanged if their timestamps\n"
11314
"match the cached values. As a consequence, there are times when\n"
11315
"you may need to explicitly ask for content filtering to be reapplied\n"
11316
"in one or both directions, e.g. after installing or reconfiguring\n"
11317
"plugins providing it."
11318
msgstr ""
11319
11320
#: en/help_topics/content-filters.txt:82
11321
msgid "Here are some general guidelines for doing this:"
11322
msgstr ""
11323
11324
#: en/help_topics/content-filters.txt:84
11325
msgid ""
11326
" * To reapply read converters, ``touch`` files, i.e. update their\n"
11327
" timestamp. Operations like ``bzr status`` should then reapply the\n"
11328
" relevant read converters and compare the end result with the\n"
11329
" canonical format."
11330
msgstr ""
11331
11332
#: en/help_topics/content-filters.txt:89
11333
msgid ""
11334
" * To reapply write converters, ensure there are no local changes,\n"
11335
" delete the relevant files and run ``bzr revert`` on those files."
11336
msgstr ""
11337
11338
#: en/help_topics/content-filters.txt:92
11339
msgid ""
11340
"Note: In the future, it is likely that additional options will be added\n"
11341
"to commands to make this refreshing process faster and safer.\n"
11342
msgstr ""
11343
11344
#: en/help_topics/current-formats.txt:1
11345
msgid "Current Storage Formats"
11346
msgstr ""
11347
11348
#: en/help_topics/current-formats.txt:3
11349
msgid ""
11350
":2a:\n"
11351
" (native) (default) Format for the bzr 2.0 series. Uses group-\n"
11352
" compress storage. Provides rich roots which are a one-way\n"
11353
" transition."
11354
msgstr ""
11355
11356
#: en/help_topics/current-formats.txt:8 en/help_topics/other-formats.txt:17
11357
msgid ""
11358
"\n"
11359
"See :doc:`formats-help` for more about storage formats."
11360
msgstr ""
11361
11362
#: en/help_topics/debug-flags.txt:1
11363
msgid ""
11364
"Debug Flags\n"
11365
"==========="
11366
msgstr ""
11367
11368
#: en/help_topics/debug-flags.txt:4
11369
msgid ""
11370
"These flags can be passed on the bzr command line or (without the ``-D``\n"
11371
"prefix) put in the ``debug_flags`` variable in ``bazaar.conf``."
11372
msgstr ""
11373
11374
#: en/help_topics/debug-flags.txt:7
11375
msgid ""
11376
"-Dauth Trace authentication sections used.\n"
11377
"-Dbytes Print out how many bytes were transferred\n"
11378
"-Ddirstate Trace dirstate activity (verbose!)\n"
11379
"-Derror Instead of normal error handling, always print a "
11380
"traceback\n"
11381
" on error.\n"
11382
"-Devil Capture call sites that do expensive or badly-scaling\n"
11383
" operations.\n"
11384
"-Dfetch Trace history copying between repositories.\n"
11385
"-Dfilters Emit information for debugging content filtering.\n"
11386
"-Dforceinvdeltas Force use of inventory deltas during generic streaming "
11387
"fetch.\n"
11388
"-Dgraph Trace graph traversal.\n"
11389
"-Dhashcache Log every time a working file is read to determine its "
11390
"hash.\n"
11391
"-Dhooks Trace hook execution.\n"
11392
"-Dhpss Trace smart protocol requests and responses.\n"
11393
"-Dhpssdetail More hpss details.\n"
11394
"-Dhpssvfs Traceback on vfs access to Remote objects.\n"
11395
"-Dhttp Trace http connections, requests and responses.\n"
11396
"-Dindex Trace major index operations.\n"
11397
"-Dknit Trace knit operations.\n"
11398
"-Dlock Trace when lockdir locks are taken or released.\n"
11399
"-Dnoretry If a connection is reset, fail immediately rather than\n"
11400
" retrying the request.\n"
11401
"-Dprogress Trace progress bar operations.\n"
11402
"-Dmem_dump Dump memory to a file upon an out of memory error.\n"
11403
"-Dmerge Emit information for debugging merges.\n"
11404
"-Dno_apport Don't use apport to report crashes.\n"
11405
"-Dno_activity \t Don't show transport activity indicator in progress bar.\n"
11406
"-Dpack Emit information about pack operations.\n"
11407
"-Drelock Emit a message every time a branch or repository object "
11408
"is\n"
11409
" unlocked then relocked the same way.\n"
11410
"-Dsftp Trace SFTP internals.\n"
11411
"-Dstatic_tuple Error when a tuple is used where a StaticTuple is "
11412
"expected\n"
11413
"-Dstream Trace fetch streams.\n"
11414
"-Dstrict_locks Trace when OS locks are potentially used in a non-"
11415
"portable\n"
11416
" manner.\n"
11417
"-Dunlock Some errors during unlock are treated as warnings.\n"
11418
"-DIDS_never Never use InterDifferingSerializer when fetching.\n"
11419
"-DIDS_always Always use InterDifferingSerializer to fetch if "
11420
"appropriate\n"
11421
" for the format, even for non-local fetches.\n"
11422
msgstr ""
11423
11424
#: en/help_topics/diverged-branches.txt:1
11425
msgid ""
11426
"Diverged Branches\n"
11427
"================="
11428
msgstr ""
11429
11430
#: en/help_topics/diverged-branches.txt:4
11431
msgid ""
11432
"When Bazaar tries to push one branch onto another, it requires that the\n"
11433
"destination branch must be ready to receive the source branch. If this "
11434
"isn't\n"
11435
"the case, then we say that the branches have ``diverged``. Branches are\n"
11436
"considered diverged if the destination branch's most recent commit is one "
11437
"that\n"
11438
"has not been merged (directly or indirectly) by the source branch. To "
11439
"recover\n"
11440
"from diverged branches, one must merge the missing revisions into the "
11441
"source\n"
11442
"branch."
11443
msgstr ""
11444
11445
#: en/help_topics/diverged-branches.txt:12
11446
msgid ""
11447
"This situation commonly arises when using a centralized workflow with local\n"
11448
"commits. If someone else has committed new work to the mainline since your\n"
11449
"last pull and you have local commits that have not yet been pushed to the\n"
11450
"mainline, then your local branch and the mainline have diverged."
11451
msgstr ""
11452
11453
#: en/help_topics/diverged-branches.txt:17
11454
msgid ""
11455
"Discovering What Has Diverged\n"
11456
"-----------------------------"
11457
msgstr ""
11458
11459
#: en/help_topics/diverged-branches.txt:20
11460
msgid ""
11461
"The ``bzr missing`` command is used to find out what revisions are in "
11462
"another\n"
11463
"branch that are not present in the current branch, and vice-versa. It shows "
11464
"a\n"
11465
"summary of which extra revisions exist in each branch. If you want to see "
11466
"the\n"
11467
"precise effects of those revisions, you can use ``bzr diff --"
11468
"old=other_branch``\n"
11469
"to show the differences between other_branch and your current branch."
11470
msgstr ""
11471
11472
#: en/help_topics/diverged-branches.txt:26
11473
msgid ""
11474
"A Solution\n"
11475
"----------"
11476
msgstr ""
11477
11478
#: en/help_topics/diverged-branches.txt:29
11479
msgid ""
11480
"The solution is to merge the revisions from the mainline into your local\n"
11481
"branch. To do so, use ``bzr merge`` to get the new revisions from the\n"
11482
"mainline. This merge may result in conflicts if the other developer's "
11483
"changes\n"
11484
"overlap with your changes. These conflicts should be resolved before\n"
11485
"continuing. After any conflicts have been resolved, or even if there were "
11486
"no\n"
11487
"conflicts, Bazaar requires that you explicitly commit these new revisions\n"
11488
"to your local branch. This requirement gives you an opportunity to test "
11489
"the\n"
11490
"resulting working tree for correctness, since the merged revisions could "
11491
"have\n"
11492
"made arbitrary changes. After testing, you should commit the merge using\n"
11493
"``bzr commit``. This clears up the diverged branches situation. Your "
11494
"local\n"
11495
"branch can now be pushed to the mainline.\n"
11496
msgstr ""
11497
11498
#: en/help_topics/eol.txt:1
11499
msgid ""
11500
"End of Line Conversion\n"
11501
"======================"
11502
msgstr ""
11503
11504
#: en/help_topics/eol.txt:4
11505
msgid ""
11506
"EOL conversion is provided as a content filter where Bazaar internally\n"
11507
"stores a canonical format but outputs a convenience format. See\n"
11508
"``bzr help content-filters`` for general information about using these."
11509
msgstr ""
11510
11511
#: en/help_topics/eol.txt:8
11512
msgid ""
11513
"Note: Content filtering is only supported in recently added formats,\n"
11514
"e.g. 1.14. Be sure that both the repository *and* the branch are\n"
11515
"in a recent format. (Just setting the format on the repository\n"
11516
"is not enough.) If content filtering does not appear to be working, use\n"
11517
"'bzr info -v' to confirm that the branch is using \"Working tree format 5\"\n"
11518
"or later."
11519
msgstr ""
11520
11521
#: en/help_topics/eol.txt:15
11522
msgid ""
11523
"EOL conversion needs to be enabled for selected file patterns using\n"
11524
"rules. See ``bzr help rules`` for general information on defining rules.\n"
11525
"Currently, rules are only supported in $BZR_HOME/.bazaar/rules (or\n"
11526
"%BZR_HOME%/bazaar/2.0/rules on Windows). Branch specific rules will be\n"
11527
"supported in a future verison of Bazaar."
11528
msgstr ""
11529
11530
#: en/help_topics/eol.txt:21
11531
msgid ""
11532
"To configure which files to filter, set ``eol`` to one of the values below.\n"
11533
"(If a value is not set, ``exact`` is the default.)"
11534
msgstr ""
11535
11536
#: en/help_topics/eol.txt:24
11537
msgid ""
11538
" ========== ===================================== ======================\n"
11539
" Value Checkout end-of-lines as Commit end-of-lines as\n"
11540
" ========== ===================================== ======================\n"
11541
" ``native`` ``crlf`` on Windows, ``lf`` otherwise ``lf``\n"
11542
" ---------- ------------------------------------- ----------------------\n"
11543
" ``lf`` ``lf`` ``lf``\n"
11544
" ---------- ------------------------------------- ----------------------\n"
11545
" ``crlf`` ``crlf`` ``lf``\n"
11546
" ---------- ------------------------------------- ----------------------\n"
11547
" ``exact`` No conversion Exactly as in file\n"
11548
" ========== ===================================== ======================"
11549
msgstr ""
11550
11551
#: en/help_topics/eol.txt:36
11552
msgid ""
11553
"Note: For safety reasons, no conversion is applied to any file where a null\n"
11554
"byte is detected in the file."
11555
msgstr ""
11556
11557
#: en/help_topics/eol.txt:39
11558
msgid ""
11559
"For users working on a cross-platform project, here is a suggested rule\n"
11560
"to use as a starting point::"
11561
msgstr ""
11562
11563
#: en/help_topics/eol.txt:42 en/help_topics/eol.txt:52
11564
#: en/help_topics/eol.txt:67 en/help_topics/eol.txt:82
11565
msgid ""
11566
" [name *]\n"
11567
" eol = native"
11568
msgstr ""
11569
11570
#: en/help_topics/eol.txt:45
11571
msgid ""
11572
"If you have binary files that do not contain a null byte though, be\n"
11573
"sure to add ``eol = exact`` rules for those as well. You can do this\n"
11574
"by giving more explicit patterns earlier in the rules file. For example::"
11575
msgstr ""
11576
11577
#: en/help_topics/eol.txt:49
11578
msgid ""
11579
" [name *.png]\n"
11580
" eol = exact"
11581
msgstr ""
11582
11583
#: en/help_topics/eol.txt:55
11584
msgid ""
11585
"If your working tree is on a network drive shared by users on different\n"
11586
"operating systems, you typically want to force certain conventions for\n"
11587
"certain files. In that way, if a file is created with the wrong line\n"
11588
"endings or line endings get mixed during editing, it gets committed\n"
11589
"correctly and gets checked out correctly. For example::"
11590
msgstr ""
11591
11592
#: en/help_topics/eol.txt:61
11593
msgid ""
11594
" [name *.bat]\n"
11595
" eol = crlf"
11596
msgstr ""
11597
11598
#: en/help_topics/eol.txt:64
11599
msgid ""
11600
" [name *.sh]\n"
11601
" eol = lf"
11602
msgstr ""
11603
11604
#: en/help_topics/eol.txt:70
11605
msgid ""
11606
"If you take the care to create files with their required endings, you can\n"
11607
"achieve *almost* the same thing by using ``eol = exact``. It is slightly\n"
11608
"safer to use ``lf`` and ``crlf`` though because edits accidentally\n"
11609
"introducing mixed line endings will be corrected during commit for files\n"
11610
"with those settings."
11611
msgstr ""
11612
11613
#: en/help_topics/eol.txt:76
11614
msgid ""
11615
"If you have sample test data that deliberately has text files with mixed\n"
11616
"newline conventions, you can ask for those to be left alone like this::"
11617
msgstr ""
11618
11619
#: en/help_topics/eol.txt:79
11620
msgid ""
11621
" [name test_data/]\n"
11622
" eol = exact"
11623
msgstr ""
11624
11625
#: en/help_topics/eol.txt:85
11626
msgid ""
11627
"Note that ``exact`` does not imply the file is binary but it does mean\n"
11628
"that no conversion of end-of-lines will be done. (Bazaar currently relies\n"
11629
"of content analysis to detect binary files for commands like ``diff``.\n"
11630
"In the future, a ``binary = true`` rule may be added but it is not\n"
11631
"supported yet.)"
11632
msgstr ""
11633
11634
#: en/help_topics/eol.txt:91
11635
msgid ""
11636
"If you have an existing repository with text files already stored using\n"
11637
"Windows newline conventions (``crlf``), then you may want to keep using "
11638
"that\n"
11639
"convention in the repository. Forcing certain files to this convention\n"
11640
"may also help users who do not have rules configured. To do this, set\n"
11641
"``eol`` to one of the values below."
11642
msgstr ""
11643
11644
#: en/help_topics/eol.txt:97
11645
msgid ""
11646
" ============================ ======================== "
11647
"======================\n"
11648
" Value Checkout end-of-lines as Commit end-of-lines "
11649
"as\n"
11650
" ============================ ======================== "
11651
"======================\n"
11652
" ``native-with-crlf-in-repo`` ``crlf`` on Windows, ``crlf``\n"
11653
" ``lf`` otherwise\n"
11654
" ---------------------------- ------------------------ ----------------------"
11655
"\n"
11656
" ``lf-with-crlf-in-repo`` ``lf`` ``crlf``\n"
11657
" ---------------------------- ------------------------ ----------------------"
11658
"\n"
11659
" ``crlf-with-crlf-in-repo`` ``crlf`` ``crlf``\n"
11660
" ============================ ======================== ======================"
11661
msgstr ""
11662
11663
#: en/help_topics/eol.txt:108
11664
msgid ""
11665
"For users working on an existing project that uses Windows newline\n"
11666
"conventions in their Bazaar repository, this rule is suggested as a\n"
11667
"starting point::"
11668
msgstr ""
11669
11670
#: en/help_topics/eol.txt:112
11671
msgid ""
11672
" [name *]\n"
11673
" eol = native-with-crlf-in-repo"
11674
msgstr ""
11675
11676
#: en/help_topics/eol.txt:115
11677
msgid ""
11678
"For new projects, it is recommended that end-of-lines be stored as ``lf``\n"
11679
"and that users stick to the basic settings, i.e. ``native``, ``lf``,\n"
11680
"``crlf`` and ``exact``."
11681
msgstr ""
11682
11683
#: en/help_topics/eol.txt:119
11684
msgid ""
11685
"Note: Bazaar's EOL conversion will convert the content of files but\n"
11686
"never reject files because a given line ending or mixed line endings\n"
11687
"are found. A precommit hook should be used if you wish to validate\n"
11688
"(and not just convert) content before committing.\n"
11689
msgstr ""
11690
11691
#: en/help_topics/hidden-commands.txt:1
11692
msgid ""
11693
"added List files added in working tree.\n"
11694
"ancestry List all revisions merged into this branch.\n"
11695
"assert-fail Test reporting of assertion failures\n"
11696
"bundle-info Output interesting stats about a bundle\n"
11697
"bundle-revisions Create a merge-directive for submitting changes.\n"
11698
"cat-revision Write out metadata for a revision.\n"
11699
"dump-btree Dump the contents of a btree index file to stdout.\n"
11700
"export-pot Export command helps and error messages in po format.\n"
11701
"file-id Print file_id of a particular file or directory.\n"
11702
"file-path Print path of file_ids to a file or directory.\n"
11703
"find-merge-base Find and print a base revision for merging two "
11704
"branches.\n"
11705
"hooks Show hooks.\n"
11706
"inventory Show inventory of the current working copy or a "
11707
"revision.\n"
11708
"local-time-offset Show the offset in seconds from GMT to local time.\n"
11709
"lookup-revision Lookup the revision-id from a revision-number\n"
11710
"merge-directive Generate a merge directive for auto-merge tools.\n"
11711
"modified List files modified in working tree.\n"
11712
"re-sign Create a digital signature for an existing revision.\n"
11713
"reference list, view and set branch locations for nested trees.\n"
11714
"relpath Show path of a file relative to root\n"
11715
"repair-workingtree Reset the working tree state file.\n"
11716
"revision-history Display the list of revision ids on a branch.\n"
11717
"revision-info Show revision number and revision id for a given "
11718
"revision\n"
11719
" identifier.\n"
11720
"rocks Statement of optimism.\n"
11721
"selftest Run internal test suite.\n"
11722
"shell-complete Show appropriate completions for context.\n"
11723
"test-script Run a shell-like test from a file.\n"
11724
"touching-revisions Return revision-ids which affected a particular file.\n"
11725
"unknowns List unknown files.\n"
11726
"wait-until-signalled Test helper for\n"
11727
" test_start_and_stop_bzr_subprocess_send_signal.\n"
11728
msgstr ""
11729
11730
#: en/help_topics/hooks.txt:1
11731
msgid ""
11732
"\n"
11733
"Hooks\n"
11734
"====="
11735
msgstr ""
11736
11737
#: en/help_topics/hooks.txt:5 en/help_topics/rules.txt:4
11738
msgid ""
11739
"Introduction\n"
11740
"------------"
11741
msgstr ""
11742
11743
#: en/help_topics/hooks.txt:8
11744
msgid "A hook of type *xxx* of class *yyy* needs to be registered using::"
11745
msgstr ""
11746
11747
#: en/help_topics/hooks.txt:10
11748
msgid " yyy.hooks.install_named_hook(\"xxx\", ...)"
11749
msgstr ""
11750
11751
#: en/help_topics/hooks.txt:12
11752
msgid ""
11753
"See :doc:`Using hooks<../user-guide/hooks>` in the User Guide for examples."
11754
msgstr ""
11755
11756
#: en/help_topics/hooks.txt:14
11757
msgid ""
11758
"The class that contains each hook is given before the hooks it supplies. "
11759
"For\n"
11760
"instance, BranchHooks as the class is the hooks class for\n"
11761
"`bzrlib.branch.Branch.hooks`."
11762
msgstr ""
11763
11764
#: en/help_topics/hooks.txt:18
11765
msgid ""
11766
"Each description also indicates whether the hook runs on the client (the\n"
11767
"machine where bzr was invoked) or the server (the machine addressed by\n"
11768
"the branch URL). These may be, but are not necessarily, the same machine."
11769
msgstr ""
11770
11771
#: en/help_topics/hooks.txt:22
11772
msgid ""
11773
"Plugins (including hooks) are run on the server if all of these is true:"
11774
msgstr ""
11775
11776
#: en/help_topics/hooks.txt:24
11777
msgid ""
11778
" * The connection is via a smart server (accessed with a URL starting with\n"
11779
" \"bzr://\", \"bzr+ssh://\" or \"bzr+http://\", or accessed via a "
11780
"\"http://\"\n"
11781
" URL when a smart server is available via HTTP)."
11782
msgstr ""
11783
11784
#: en/help_topics/hooks.txt:28
11785
msgid ""
11786
" * The hook is either server specific or part of general infrastructure "
11787
"rather\n"
11788
" than client specific code (such as commit)."
11789
msgstr ""
11790
11791
#: en/help_topics/hooks.txt:31
11792
msgid ""
11793
"\n"
11794
"BranchHooks\n"
11795
"-----------"
11796
msgstr ""
11797
11798
#: en/help_topics/hooks.txt:35
11799
msgid ""
11800
"automatic_tag_name\n"
11801
"~~~~~~~~~~~~~~~~~~"
11802
msgstr ""
11803
11804
#: en/help_topics/hooks.txt:38 en/help_topics/hooks.txt:56
11805
#: en/help_topics/hooks.txt:102 en/help_topics/hooks.txt:259
11806
msgid "Introduced in: 2.2"
11807
msgstr ""
11808
11809
#: en/help_topics/hooks.txt:40
11810
msgid ""
11811
"Called to determine an automatic tag name for a revision.\n"
11812
"automatic_tag_name is called with (branch, revision_id) and should\n"
11813
"return a tag name or None if no tag name could be determined. The\n"
11814
"first non-None tag name returned will be used."
11815
msgstr ""
11816
11817
#: en/help_topics/hooks.txt:45
11818
msgid ""
11819
"open\n"
11820
"~~~~"
11821
msgstr ""
11822
11823
#: en/help_topics/hooks.txt:48 en/help_topics/hooks.txt:290
11824
#: en/help_topics/hooks.txt:304
11825
msgid "Introduced in: 1.8"
11826
msgstr ""
11827
11828
#: en/help_topics/hooks.txt:50
11829
msgid ""
11830
"Called with the Branch object that has been opened after a branch is\n"
11831
"opened."
11832
msgstr ""
11833
11834
#: en/help_topics/hooks.txt:53
11835
msgid ""
11836
"post_branch_init\n"
11837
"~~~~~~~~~~~~~~~~"
11838
msgstr ""
11839
11840
#: en/help_topics/hooks.txt:58
11841
msgid ""
11842
"Called after new branch initialization completes. post_branch_init is\n"
11843
"called with a bzrlib.branch.BranchInitHookParams. Note that init,\n"
11844
"branch and checkout (both heavyweight and lightweight) will all\n"
11845
"trigger this hook."
11846
msgstr ""
11847
11848
#: en/help_topics/hooks.txt:63
11849
msgid ""
11850
"post_change_branch_tip\n"
11851
"~~~~~~~~~~~~~~~~~~~~~~"
11852
msgstr ""
11853
11854
#: en/help_topics/hooks.txt:66 en/help_topics/hooks.txt:418
11855
msgid "Introduced in: 1.4"
11856
msgstr ""
11857
11858
#: en/help_topics/hooks.txt:68
11859
msgid ""
11860
"Called in bzr client and server after a change to the tip of a branch\n"
11861
"is made. post_change_branch_tip is called with a\n"
11862
"bzrlib.branch.ChangeBranchTipParams. Note that push, pull, commit,\n"
11863
"uncommit will all trigger this hook."
11864
msgstr ""
11865
11866
#: en/help_topics/hooks.txt:73 en/help_topics/hooks.txt:389
11867
msgid ""
11868
"post_commit\n"
11869
"~~~~~~~~~~~"
11870
msgstr ""
11871
11872
#: en/help_topics/hooks.txt:76 en/help_topics/hooks.txt:86
11873
#: en/help_topics/hooks.txt:94 en/help_topics/hooks.txt:110
11874
#: en/help_topics/hooks.txt:145
11875
msgid "Introduced in: 0.15"
11876
msgstr ""
11877
11878
#: en/help_topics/hooks.txt:78
11879
msgid ""
11880
"Called in the bzr client after a commit has completed. post_commit is\n"
11881
"called with (local, master, old_revno, old_revid, new_revno,\n"
11882
"new_revid). old_revid is NULL_REVISION for the first commit to a\n"
11883
"branch."
11884
msgstr ""
11885
11886
#: en/help_topics/hooks.txt:83
11887
msgid ""
11888
"post_pull\n"
11889
"~~~~~~~~~"
11890
msgstr ""
11891
11892
#: en/help_topics/hooks.txt:88
11893
msgid ""
11894
"Called after a pull operation completes. post_pull is called with a\n"
11895
"bzrlib.branch.PullResult object and only runs in the bzr client."
11896
msgstr ""
11897
11898
#: en/help_topics/hooks.txt:91
11899
msgid ""
11900
"post_push\n"
11901
"~~~~~~~~~"
11902
msgstr ""
11903
11904
#: en/help_topics/hooks.txt:96
11905
msgid ""
11906
"Called after a push operation completes. post_push is called with a\n"
11907
"bzrlib.branch.BranchPushResult object and only runs in the bzr client."
11908
msgstr ""
11909
11910
#: en/help_topics/hooks.txt:99
11911
msgid ""
11912
"post_switch\n"
11913
"~~~~~~~~~~~"
11914
msgstr ""
11915
11916
#: en/help_topics/hooks.txt:104
11917
msgid ""
11918
"Called after a checkout switches branch. post_switch is called with a\n"
11919
"bzrlib.branch.SwitchHookParams."
11920
msgstr ""
11921
11922
#: en/help_topics/hooks.txt:107
11923
msgid ""
11924
"post_uncommit\n"
11925
"~~~~~~~~~~~~~"
11926
msgstr ""
11927
11928
#: en/help_topics/hooks.txt:112
11929
msgid ""
11930
"Called in the bzr client after an uncommit completes. post_uncommit is\n"
11931
"called with (local, master, old_revno, old_revid, new_revno,\n"
11932
"new_revid) where local is the local branch or None, master is the\n"
11933
"target branch, and an empty branch receives new_revno of 0, new_revid\n"
11934
"of None."
11935
msgstr ""
11936
11937
#: en/help_topics/hooks.txt:118
11938
msgid ""
11939
"pre_change_branch_tip\n"
11940
"~~~~~~~~~~~~~~~~~~~~~"
11941
msgstr ""
11942
11943
#: en/help_topics/hooks.txt:121
11944
msgid "Introduced in: 1.6"
11945
msgstr ""
11946
11947
#: en/help_topics/hooks.txt:123
11948
msgid ""
11949
"Called in bzr client and server before a change to the tip of a branch\n"
11950
"is made. pre_change_branch_tip is called with a\n"
11951
"bzrlib.branch.ChangeBranchTipParams. Note that push, pull, commit,\n"
11952
"uncommit will all trigger this hook."
11953
msgstr ""
11954
11955
#: en/help_topics/hooks.txt:128
11956
msgid ""
11957
"pre_commit\n"
11958
"~~~~~~~~~~"
11959
msgstr ""
11960
11961
#: en/help_topics/hooks.txt:131
11962
msgid "Introduced in: 0.91"
11963
msgstr ""
11964
11965
#: en/help_topics/hooks.txt:133
11966
msgid ""
11967
"Called after a commit is calculated but before it is completed.\n"
11968
"pre_commit is called with (local, master, old_revno, old_revid,\n"
11969
"future_revno, future_revid, tree_delta, future_tree). old_revid is\n"
11970
"NULL_REVISION for the first commit to a branch, tree_delta is a\n"
11971
"TreeDelta object describing changes from the basis revision. hooks\n"
11972
"MUST NOT modify this delta. future_tree is an in-memory tree obtained\n"
11973
"from CommitBuilder.revision_tree() and hooks MUST NOT modify this\n"
11974
"tree."
11975
msgstr ""
11976
11977
#: en/help_topics/hooks.txt:142
11978
msgid ""
11979
"set_rh\n"
11980
"~~~~~~"
11981
msgstr ""
11982
11983
#: en/help_topics/hooks.txt:147
11984
msgid ""
11985
"Invoked whenever the revision history has been set via\n"
11986
"set_revision_history. The api signature is (branch, revision_history),\n"
11987
"and the branch will be write-locked. The set_rh hook can be expensive\n"
11988
"for bzr to trigger, a better hook to use is\n"
11989
"Branch.post_change_branch_tip."
11990
msgstr ""
11991
11992
#: en/help_topics/hooks.txt:153
11993
msgid ""
11994
"transform_fallback_location\n"
11995
"~~~~~~~~~~~~~~~~~~~~~~~~~~~"
11996
msgstr ""
11997
11998
#: en/help_topics/hooks.txt:156
11999
msgid "Introduced in: 1.9"
12000
msgstr ""
12001
12002
#: en/help_topics/hooks.txt:158
12003
msgid ""
12004
"Called when a stacked branch is activating its fallback locations.\n"
12005
"transform_fallback_location is called with (branch, url), and should\n"
12006
"return a new url. Returning the same url allows it to be used as-is,\n"
12007
"returning a different one can be used to cause the branch to stack on\n"
12008
"a closer copy of that fallback_location. Note that the branch cannot\n"
12009
"have history accessing methods called on it during this hook because\n"
12010
"the fallback locations have not been activated. When there are\n"
12011
"multiple hooks installed for transform_fallback_location, all are\n"
12012
"called with the url returned from the previous hook.The order is\n"
12013
"however undefined."
12014
msgstr ""
12015
12016
#: en/help_topics/hooks.txt:169
12017
msgid ""
12018
"CommandHooks\n"
12019
"------------"
12020
msgstr ""
12021
12022
#: en/help_topics/hooks.txt:172
12023
msgid ""
12024
"extend_command\n"
12025
"~~~~~~~~~~~~~~"
12026
msgstr ""
12027
12028
#: en/help_topics/hooks.txt:175
12029
msgid "Introduced in: 1.13"
12030
msgstr ""
12031
12032
#: en/help_topics/hooks.txt:177
12033
msgid ""
12034
"Called after creating a command object to allow modifications such as\n"
12035
"adding or removing options, docs etc. Called with the new\n"
12036
"bzrlib.commands.Command object."
12037
msgstr ""
12038
12039
#: en/help_topics/hooks.txt:181
12040
msgid ""
12041
"get_command\n"
12042
"~~~~~~~~~~~"
12043
msgstr ""
12044
12045
#: en/help_topics/hooks.txt:184 en/help_topics/hooks.txt:196
12046
#: en/help_topics/hooks.txt:205 en/help_topics/hooks.txt:464
12047
msgid "Introduced in: 1.17"
12048
msgstr ""
12049
12050
#: en/help_topics/hooks.txt:186
12051
msgid ""
12052
"Called when creating a single command. Called with (cmd_or_None,\n"
12053
"command_name). get_command should either return the cmd_or_None\n"
12054
"parameter, or a replacement Command object that should be used for the\n"
12055
"command. Note that the Command.hooks hooks are core infrastructure.\n"
12056
"Many users will prefer to use bzrlib.commands.register_command or\n"
12057
"plugin_cmds.register_lazy."
12058
msgstr ""
12059
12060
#: en/help_topics/hooks.txt:193
12061
msgid ""
12062
"get_missing_command\n"
12063
"~~~~~~~~~~~~~~~~~~~"
12064
msgstr ""
12065
12066
#: en/help_topics/hooks.txt:198
12067
msgid ""
12068
"Called when creating a single command if no command could be found.\n"
12069
"Called with (command_name). get_missing_command should either return\n"
12070
"None, or a Command object to be used for the command."
12071
msgstr ""
12072
12073
#: en/help_topics/hooks.txt:202
12074
msgid ""
12075
"list_commands\n"
12076
"~~~~~~~~~~~~~"
12077
msgstr ""
12078
12079
#: en/help_topics/hooks.txt:207
12080
msgid ""
12081
"Called when enumerating commands. Called with a set of cmd_name\n"
12082
"strings for all the commands found so far. This set is safe to mutate\n"
12083
"- e.g. to remove a command. list_commands should return the updated\n"
12084
"set of command names."
12085
msgstr ""
12086
12087
#: en/help_topics/hooks.txt:212
12088
msgid ""
12089
"_ConfigHooks\n"
12090
"------------"
12091
msgstr ""
12092
12093
#: en/help_topics/hooks.txt:215
12094
msgid ""
12095
"get\n"
12096
"~~~"
12097
msgstr ""
12098
12099
#: en/help_topics/hooks.txt:218 en/help_topics/hooks.txt:226
12100
#: en/help_topics/hooks.txt:233 en/help_topics/hooks.txt:241
12101
#: en/help_topics/hooks.txt:248 en/help_topics/hooks.txt:370
12102
#: en/help_topics/hooks.txt:443
12103
msgid "Introduced in: 2.4"
12104
msgstr ""
12105
12106
#: en/help_topics/hooks.txt:220
12107
msgid ""
12108
"Invoked when a config option is read. The signature is (stack, name,\n"
12109
"value)."
12110
msgstr ""
12111
12112
#: en/help_topics/hooks.txt:223
12113
msgid ""
12114
"load\n"
12115
"~~~~"
12116
msgstr ""
12117
12118
#: en/help_topics/hooks.txt:228
12119
msgid "Invoked when a config store is loaded. The signature is (store)."
12120
msgstr ""
12121
12122
#: en/help_topics/hooks.txt:230
12123
msgid ""
12124
"remove\n"
12125
"~~~~~~"
12126
msgstr ""
12127
12128
#: en/help_topics/hooks.txt:235
12129
msgid ""
12130
"Invoked when a config option is removed. The signature is (stack,\n"
12131
"name)."
12132
msgstr ""
12133
12134
#: en/help_topics/hooks.txt:238
12135
msgid ""
12136
"save\n"
12137
"~~~~"
12138
msgstr ""
12139
12140
#: en/help_topics/hooks.txt:243
12141
msgid "Invoked when a config store is saved. The signature is (store)."
12142
msgstr ""
12143
12144
#: en/help_topics/hooks.txt:245
12145
msgid ""
12146
"set\n"
12147
"~~~"
12148
msgstr ""
12149
12150
#: en/help_topics/hooks.txt:250
12151
msgid ""
12152
"Invoked when a config option is set. The signature is (stack, name,\n"
12153
"value)."
12154
msgstr ""
12155
12156
#: en/help_topics/hooks.txt:253
12157
msgid ""
12158
"ControlDirHooks\n"
12159
"---------------"
12160
msgstr ""
12161
12162
#: en/help_topics/hooks.txt:256
12163
msgid ""
12164
"post_repo_init\n"
12165
"~~~~~~~~~~~~~~"
12166
msgstr ""
12167
12168
#: en/help_topics/hooks.txt:261
12169
msgid ""
12170
"Invoked after a repository has been initialized. post_repo_init is\n"
12171
"called with a bzrlib.controldir.RepoInitHookParams."
12172
msgstr ""
12173
12174
#: en/help_topics/hooks.txt:264
12175
msgid ""
12176
"pre_open\n"
12177
"~~~~~~~~"
12178
msgstr ""
12179
12180
#: en/help_topics/hooks.txt:267
12181
msgid "Introduced in: 1.14"
12182
msgstr ""
12183
12184
#: en/help_topics/hooks.txt:269
12185
msgid ""
12186
"Invoked before attempting to open a ControlDir with the transport that\n"
12187
"the open will use."
12188
msgstr ""
12189
12190
#: en/help_topics/hooks.txt:272
12191
msgid ""
12192
"InfoHooks\n"
12193
"---------"
12194
msgstr ""
12195
12196
#: en/help_topics/hooks.txt:275
12197
msgid ""
12198
"repository\n"
12199
"~~~~~~~~~~"
12200
msgstr ""
12201
12202
#: en/help_topics/hooks.txt:278 en/help_topics/hooks.txt:297
12203
#: en/help_topics/hooks.txt:521
12204
msgid "Introduced in: 1.15"
12205
msgstr ""
12206
12207
#: en/help_topics/hooks.txt:280
12208
msgid ""
12209
"Invoked when displaying the statistics for a repository. repository is\n"
12210
"called with a statistics dictionary as returned by the repository and\n"
12211
"a file-like object to write to."
12212
msgstr ""
12213
12214
#: en/help_topics/hooks.txt:284
12215
msgid ""
12216
"LockHooks\n"
12217
"---------"
12218
msgstr ""
12219
12220
#: en/help_topics/hooks.txt:287
12221
msgid ""
12222
"lock_acquired\n"
12223
"~~~~~~~~~~~~~"
12224
msgstr ""
12225
12226
#: en/help_topics/hooks.txt:292
12227
msgid ""
12228
"Called with a bzrlib.lock.LockResult when a physical lock is acquired."
12229
msgstr ""
12230
12231
#: en/help_topics/hooks.txt:294
12232
msgid ""
12233
"lock_broken\n"
12234
"~~~~~~~~~~~"
12235
msgstr ""
12236
12237
#: en/help_topics/hooks.txt:299
12238
msgid "Called with a bzrlib.lock.LockResult when a physical lock is broken."
12239
msgstr ""
12240
12241
#: en/help_topics/hooks.txt:301
12242
msgid ""
12243
"lock_released\n"
12244
"~~~~~~~~~~~~~"
12245
msgstr ""
12246
12247
#: en/help_topics/hooks.txt:306
12248
msgid ""
12249
"Called with a bzrlib.lock.LockResult when a physical lock is released."
12250
msgstr ""
12251
12252
#: en/help_topics/hooks.txt:308
12253
msgid ""
12254
"MergeHooks\n"
12255
"----------"
12256
msgstr ""
12257
12258
#: en/help_topics/hooks.txt:311
12259
msgid ""
12260
"merge_file_content\n"
12261
"~~~~~~~~~~~~~~~~~~"
12262
msgstr ""
12263
12264
#: en/help_topics/hooks.txt:314
12265
msgid "Introduced in: 2.1"
12266
msgstr ""
12267
12268
#: en/help_topics/hooks.txt:316
12269
msgid ""
12270
"Called with a bzrlib.merge.Merger object to create a per file merge\n"
12271
"object when starting a merge. Should return either None or a subclass\n"
12272
"of ``bzrlib.merge.AbstractPerFileMerger``. Such objects will then be\n"
12273
"called per file that needs to be merged (including when one side has\n"
12274
"deleted the file and the other has changed it). See the\n"
12275
"AbstractPerFileMerger API docs for details on how it is used by merge."
12276
msgstr ""
12277
12278
#: en/help_topics/hooks.txt:323
12279
msgid ""
12280
"post_merge\n"
12281
"~~~~~~~~~~"
12282
msgstr ""
12283
"post_merge\n"
12284
"~~~~~~~~~~"
12285
12286
#: en/help_topics/hooks.txt:326 en/help_topics/hooks.txt:334
12287
#: en/help_topics/hooks.txt:384 en/help_topics/hooks.txt:402
12288
#: en/help_topics/hooks.txt:410 en/help_topics/hooks.txt:509
12289
msgid "Introduced in: 2.5"
12290
msgstr "Introduced in: 2.5"
12291
12292
#: en/help_topics/hooks.txt:328
12293
msgid ""
12294
"Called after a merge. Receives a Merger object as the single argument.\n"
12295
"The return value is ignored."
12296
msgstr ""
12297
"Called after a merge. Receives a Merger object as the single argument.\n"
12298
"The return value is ignored."
12299
12300
#: en/help_topics/hooks.txt:331
12301
msgid ""
12302
"pre_merge\n"
12303
"~~~~~~~~~"
12304
msgstr ""
12305
"pre_merge\n"
12306
"~~~~~~~~~"
12307
12308
#: en/help_topics/hooks.txt:336
12309
msgid ""
12310
"Called before a merge. Receives a Merger object as the single\n"
12311
"argument."
12312
msgstr ""
12313
"Called before a merge. Receives a Merger object as the single\n"
12314
"argument."
12315
12316
#: en/help_topics/hooks.txt:339
12317
msgid ""
12318
"MergeDirectiveHooks\n"
12319
"-------------------"
12320
msgstr ""
12321
12322
#: en/help_topics/hooks.txt:342
12323
msgid ""
12324
"merge_request_body\n"
12325
"~~~~~~~~~~~~~~~~~~"
12326
msgstr ""
12327
12328
#: en/help_topics/hooks.txt:345
12329
msgid "Introduced in: 1.15.0"
12330
msgstr ""
12331
12332
#: en/help_topics/hooks.txt:347
12333
msgid ""
12334
"Called with a MergeRequestBodyParams when a body is needed for a merge\n"
12335
"request. Callbacks must return a body. If more than one callback is\n"
12336
"registered, the output of one callback is provided to the next."
12337
msgstr ""
12338
12339
#: en/help_topics/hooks.txt:351
12340
msgid ""
12341
"MessageEditorHooks\n"
12342
"------------------"
12343
msgstr ""
12344
12345
#: en/help_topics/hooks.txt:354
12346
msgid ""
12347
"commit_message_template\n"
12348
"~~~~~~~~~~~~~~~~~~~~~~~"
12349
msgstr ""
12350
12351
#: en/help_topics/hooks.txt:357
12352
msgid "Introduced in: 1.10"
12353
msgstr ""
12354
12355
#: en/help_topics/hooks.txt:359
12356
msgid ""
12357
"Called when a commit message is being generated.\n"
12358
"commit_message_template is called with the bzrlib.commit.Commit object\n"
12359
"and the message that is known so far. commit_message_template must\n"
12360
"return a new message to use (which could be the same as it was given).\n"
12361
"When there are multiple hooks registered for commit_message_template,\n"
12362
"they are chained with the result from the first passed into the\n"
12363
"second, and so on."
12364
msgstr ""
12365
12366
#: en/help_topics/hooks.txt:367
12367
msgid ""
12368
"set_commit_message\n"
12369
"~~~~~~~~~~~~~~~~~~"
12370
msgstr ""
12371
12372
#: en/help_topics/hooks.txt:372
12373
msgid ""
12374
"Set a fixed commit message. set_commit_message is called with the\n"
12375
"bzrlib.commit.Commit object (so you can also change e.g. revision\n"
12376
"properties by editing commit.builder._revprops) and the message so\n"
12377
"far. set_commit_message must return the message to use or None if it\n"
12378
"should use the message editor as normal."
12379
msgstr ""
12380
12381
#: en/help_topics/hooks.txt:378
12382
msgid ""
12383
"MutableTreeHooks\n"
12384
"----------------"
12385
msgstr ""
12386
12387
#: en/help_topics/hooks.txt:381
12388
msgid ""
12389
"post_build_tree\n"
12390
"~~~~~~~~~~~~~~~"
12391
msgstr ""
12392
"post_build_tree\n"
12393
"~~~~~~~~~~~~~~~"
12394
12395
#: en/help_topics/hooks.txt:386
12396
msgid ""
12397
"Called after a completely new tree is built. The hook is called with\n"
12398
"the tree as its only argument."
12399
msgstr ""
12400
"Called after a completely new tree is built. The hook is called with\n"
12401
"the tree as its only argument."
12402
12403
#: en/help_topics/hooks.txt:392
12404
msgid "Introduced in: 2.0"
12405
msgstr ""
12406
12407
#: en/help_topics/hooks.txt:394
12408
msgid ""
12409
"Called after a commit is performed on a tree. The hook is called with\n"
12410
"a bzrlib.mutabletree.PostCommitHookParams object. The mutable tree the\n"
12411
"commit was performed on is available via the mutable_tree attribute of\n"
12412
"that object."
12413
msgstr ""
12414
12415
#: en/help_topics/hooks.txt:399
12416
msgid ""
12417
"post_transform\n"
12418
"~~~~~~~~~~~~~~"
12419
msgstr ""
12420
12421
#: en/help_topics/hooks.txt:404
12422
msgid ""
12423
"Called after a tree transform has been performed on a tree. The hook\n"
12424
"is called with the tree that is being transformed and the transform."
12425
msgstr ""
12426
12427
#: en/help_topics/hooks.txt:407
12428
msgid ""
12429
"pre_transform\n"
12430
"~~~~~~~~~~~~~"
12431
msgstr ""
12432
12433
#: en/help_topics/hooks.txt:412
12434
msgid ""
12435
"Called before a tree transform on this tree. The hook is called with\n"
12436
"the tree that is being transformed and the transform."
12437
msgstr ""
12438
12439
#: en/help_topics/hooks.txt:415
12440
msgid ""
12441
"start_commit\n"
12442
"~~~~~~~~~~~~"
12443
msgstr ""
12444
12445
#: en/help_topics/hooks.txt:420
12446
msgid ""
12447
"Called before a commit is performed on a tree. The start commit hook\n"
12448
"is able to change the tree before the commit takes place. start_commit\n"
12449
"is called with the bzrlib.mutabletree.MutableTree that the commit is\n"
12450
"being performed on."
12451
msgstr ""
12452
12453
#: en/help_topics/hooks.txt:425
12454
msgid ""
12455
"SmartClientHooks\n"
12456
"----------------"
12457
msgstr ""
12458
12459
#: en/help_topics/hooks.txt:428
12460
msgid ""
12461
"call\n"
12462
"~~~~"
12463
msgstr ""
12464
12465
#: en/help_topics/hooks.txt:431
12466
msgid "Introduced in: unknown"
12467
msgstr ""
12468
12469
#: en/help_topics/hooks.txt:433
12470
msgid ""
12471
"Called when the smart client is submitting a request to the smart\n"
12472
"server. Called with a bzrlib.smart.client.CallHookParams object.\n"
12473
"Streaming request bodies, and responses, are not accessible."
12474
msgstr ""
12475
12476
#: en/help_topics/hooks.txt:437
12477
msgid ""
12478
"SmartServerHooks\n"
12479
"----------------"
12480
msgstr ""
12481
12482
#: en/help_topics/hooks.txt:440
12483
msgid ""
12484
"server_exception\n"
12485
"~~~~~~~~~~~~~~~~"
12486
msgstr ""
12487
12488
#: en/help_topics/hooks.txt:445
12489
msgid ""
12490
"Called by the bzr server when an exception occurs. server_exception is\n"
12491
"called with the sys.exc_info() tuple return true for the hook if the\n"
12492
"exception has been handled, in which case the server will exit\n"
12493
"normally."
12494
msgstr ""
12495
12496
#: en/help_topics/hooks.txt:450
12497
msgid ""
12498
"server_started\n"
12499
"~~~~~~~~~~~~~~"
12500
msgstr ""
12501
12502
#: en/help_topics/hooks.txt:453 en/help_topics/hooks.txt:472
12503
msgid "Introduced in: 0.16"
12504
msgstr ""
12505
12506
#: en/help_topics/hooks.txt:455
12507
msgid ""
12508
"Called by the bzr server when it starts serving a directory.\n"
12509
"server_started is called with (backing urls, public url), where\n"
12510
"backing_url is a list of URLs giving the server-specific directory\n"
12511
"locations, and public_url is the public URL for the directory being\n"
12512
"served."
12513
msgstr ""
12514
12515
#: en/help_topics/hooks.txt:461
12516
msgid ""
12517
"server_started_ex\n"
12518
"~~~~~~~~~~~~~~~~~"
12519
msgstr ""
12520
12521
#: en/help_topics/hooks.txt:466
12522
msgid ""
12523
"Called by the bzr server when it starts serving a directory.\n"
12524
"server_started is called with (backing_urls, server_obj)."
12525
msgstr ""
12526
12527
#: en/help_topics/hooks.txt:469
12528
msgid ""
12529
"server_stopped\n"
12530
"~~~~~~~~~~~~~~"
12531
msgstr ""
12532
12533
#: en/help_topics/hooks.txt:474
12534
msgid ""
12535
"Called by the bzr server when it stops serving a directory.\n"
12536
"server_stopped is called with the same parameters as the\n"
12537
"server_started hook: (backing_urls, public_url)."
12538
msgstr ""
12539
12540
#: en/help_topics/hooks.txt:478
12541
msgid ""
12542
"StatusHooks\n"
12543
"-----------"
12544
msgstr ""
12545
12546
#: en/help_topics/hooks.txt:481
12547
msgid ""
12548
"post_status\n"
12549
"~~~~~~~~~~~"
12550
msgstr ""
12551
12552
#: en/help_topics/hooks.txt:484 en/help_topics/hooks.txt:495
12553
msgid "Introduced in: 2.3"
12554
msgstr ""
12555
12556
#: en/help_topics/hooks.txt:486
12557
msgid ""
12558
"Called with argument StatusHookParams after Bazaar has displayed the\n"
12559
"status. StatusHookParams has the attributes (old_tree, new_tree,\n"
12560
"to_file, versioned, show_ids, short, verbose). The last four arguments\n"
12561
"correspond to the command line options specified by the user for the\n"
12562
"status command. to_file is the output stream for writing."
12563
msgstr ""
12564
12565
#: en/help_topics/hooks.txt:492
12566
msgid ""
12567
"pre_status\n"
12568
"~~~~~~~~~~"
12569
msgstr ""
12570
12571
#: en/help_topics/hooks.txt:497
12572
msgid ""
12573
"Called with argument StatusHookParams before Bazaar displays the\n"
12574
"status. StatusHookParams has the attributes (old_tree, new_tree,\n"
12575
"to_file, versioned, show_ids, short, verbose). The last four arguments\n"
12576
"correspond to the command line options specified by the user for the\n"
12577
"status command. to_file is the output stream for writing."
12578
msgstr ""
12579
12580
#: en/help_topics/hooks.txt:503
12581
msgid ""
12582
"TransportHooks\n"
12583
"--------------"
12584
msgstr ""
12585
"TransportHooks\n"
12586
"--------------"
12587
12588
#: en/help_topics/hooks.txt:506
12589
msgid ""
12590
"post_connect\n"
12591
"~~~~~~~~~~~~"
12592
msgstr ""
12593
"post_connect\n"
12594
"~~~~~~~~~~~~"
12595
12596
#: en/help_topics/hooks.txt:511
12597
msgid ""
12598
"Called after a new connection is established or a reconnect occurs.\n"
12599
"The sole argument passed is either the connected transport or smart\n"
12600
"medium instance."
12601
msgstr ""
12602
"Called after a new connection is established or a reconnect occurs.\n"
12603
"The sole argument passed is either the connected transport or smart\n"
12604
"medium instance."
12605
12606
#: en/help_topics/hooks.txt:515
12607
msgid ""
12608
"RioVersionInfoBuilderHooks\n"
12609
"--------------------------"
12610
msgstr ""
12611
12612
#: en/help_topics/hooks.txt:518
12613
msgid ""
12614
"revision\n"
12615
"~~~~~~~~"
12616
msgstr ""
12617
12618
#: en/help_topics/hooks.txt:523
12619
msgid ""
12620
"Invoked when adding information about a revision to the RIO stanza\n"
12621
"that is printed. revision is called with a revision object and a RIO\n"
12622
"stanza.\n"
12623
msgstr ""
12624
12625
#: en/help_topics/location-alias.txt:1
12626
msgid ""
12627
"Location aliases\n"
12628
"================"
12629
msgstr ""
12630
12631
#: en/help_topics/location-alias.txt:4
12632
msgid ""
12633
"Bazaar defines several aliases for locations associated with a branch. "
12634
"These\n"
12635
"can be used with most commands that expect a location, such as `bzr push`."
12636
msgstr ""
12637
12638
#: en/help_topics/location-alias.txt:7
12639
msgid "The aliases are::"
12640
msgstr ""
12641
12642
#: en/help_topics/location-alias.txt:9
12643
msgid ""
12644
" :bound The branch this branch is bound to, for bound branches.\n"
12645
" :parent The parent of this branch.\n"
12646
" :public The public location of this branch.\n"
12647
" :push The saved location used for `bzr push` with no arguments.\n"
12648
" :submit The submit branch for this branch.\n"
12649
" :this This branch."
12650
msgstr ""
12651
12652
#: en/help_topics/location-alias.txt:16
12653
msgid "For example, to push to the parent location::"
12654
msgstr ""
12655
12656
#: en/help_topics/location-alias.txt:18
12657
msgid " bzr push :parent\n"
12658
msgstr ""
12659
12660
#: en/help_topics/log-formats.txt:1
12661
msgid ""
12662
"Log Formats\n"
12663
"==========="
12664
msgstr ""
12665
12666
#: en/help_topics/log-formats.txt:4
12667
msgid ""
12668
"A log format controls how information about each revision is displayed.\n"
12669
"The standard log formats are compared below::"
12670
msgstr ""
12671
12672
#: en/help_topics/log-formats.txt:7
12673
msgid ""
12674
" Feature long short line\n"
12675
" ---------------------- ------------- ------------ -------------------\n"
12676
" design goal detailed view concise view 1 revision per line\n"
12677
" committer name+email name only name only\n"
12678
" author name+email - -\n"
12679
" date-time format full date only date only\n"
12680
" commit message full full top line\n"
12681
" tags yes yes yes\n"
12682
" merges indicator - yes -\n"
12683
" status/delta optional optional -\n"
12684
" diff/patch optional optional -\n"
12685
" revision-id optional optional -\n"
12686
" branch nick yes - -\n"
12687
" foreign vcs properties yes yes -\n"
12688
" preferred levels all 1 1\n"
12689
" digital signature optional - -"
12690
msgstr ""
12691
12692
#: en/help_topics/log-formats.txt:24
12693
msgid ""
12694
"The default format is ``long``. To change this, define the ``log_format``\n"
12695
"setting in the ``[DEFAULT]`` section of ``bazaar.conf`` like this (say)::"
12696
msgstr ""
12697
12698
#: en/help_topics/log-formats.txt:27
12699
msgid ""
12700
" [DEFAULT]\n"
12701
" log_format = short"
12702
msgstr ""
12703
12704
#: en/help_topics/log-formats.txt:30
12705
msgid ""
12706
"Alternatively, to change the log format used for a given query, use the\n"
12707
"--long, --short or --line options."
12708
msgstr ""
12709
12710
#: en/help_topics/log-formats.txt:33
12711
msgid ""
12712
"If one of the standard log formats does not meet your needs, additional\n"
12713
"formats can be provided by plugins.\n"
12714
msgstr ""
12715
12716
#: en/help_topics/other-formats.txt:1
12717
msgid "Other Storage Formats"
12718
msgstr ""
12719
12720
#: en/help_topics/other-formats.txt:3
12721
msgid "Experimental formats are shown below."
12722
msgstr ""
12723
12724
#: en/help_topics/other-formats.txt:5
12725
msgid ""
12726
":development-colo:\n"
12727
" (native) The 2a format with experimental support for colocated\n"
12728
" branches."
12729
msgstr ""
12730
12731
#: en/help_topics/other-formats.txt:9
12732
msgid ""
12733
"\n"
12734
"Deprecated formats are shown below."
12735
msgstr ""
12736
12737
#: en/help_topics/other-formats.txt:12
12738
msgid ""
12739
":pack-0.92:\n"
12740
" (native) Pack-based format used in 1.x series. Introduced in 0.92.\n"
12741
" Interoperates with bzr repositories before 0.92 but cannot be read\n"
12742
" by bzr < 0.92."
12743
msgstr ""
12744
12745
#: en/help_topics/patterns.txt:1
12746
msgid ""
12747
"Patterns\n"
12748
"========"
12749
msgstr ""
12750
12751
#: en/help_topics/patterns.txt:4
12752
msgid ""
12753
"Bazaar uses patterns to match files at various times. For example,\n"
12754
"the ``add`` command skips over files that match ignore patterns\n"
12755
"and preferences can be associated with files using rule patterns.\n"
12756
"The pattern syntax is described below."
12757
msgstr ""
12758
12759
#: en/help_topics/patterns.txt:9
12760
msgid ""
12761
"Trailing slashes on patterns are ignored. If the pattern contains a\n"
12762
"slash or is a regular expression, it is compared to the whole path\n"
12763
"from the branch root. Otherwise, it is compared to only the last\n"
12764
"component of the path. To match a file only in the root directory,\n"
12765
"prepend ``./``. Patterns specifying absolute paths are not allowed."
12766
msgstr ""
12767
12768
#: en/help_topics/patterns.txt:15
12769
msgid "Patterns may include globbing wildcards such as::"
12770
msgstr ""
12771
12772
#: en/help_topics/patterns.txt:17
12773
msgid ""
12774
" ? - Matches any single character except '/'\n"
12775
" * - Matches 0 or more characters except '/'\n"
12776
" /**/ - Matches 0 or more directories in a path\n"
12777
" [a-z] - Matches a single character from within a group of characters"
12778
msgstr ""
12779
12780
#: en/help_topics/patterns.txt:22
12781
msgid ""
12782
"Patterns may also be `Python regular expressions`_. Regular expression\n"
12783
"patterns are identified by a ``RE:`` prefix followed by the regular\n"
12784
"expression. Regular expression patterns may not include named or\n"
12785
"numbered groups."
12786
msgstr ""
12787
12788
#: en/help_topics/patterns.txt:27
12789
msgid ""
12790
"Case insensitive ignore patterns can be specified with regular expressions\n"
12791
"by using the ``i`` (for ignore case) flag in the pattern."
12792
msgstr ""
12793
12794
#: en/help_topics/patterns.txt:30
12795
msgid ""
12796
"For example, a case insensitive match for ``foo`` may be specified as::"
12797
msgstr ""
12798
12799
#: en/help_topics/patterns.txt:32
12800
msgid " RE:(?i)foo"
12801
msgstr ""
12802
12803
#: en/help_topics/patterns.txt:34
12804
msgid ""
12805
"Ignore patterns may be prefixed with ``!``, which means that a filename\n"
12806
"matched by that pattern will not be ignored."
12807
msgstr ""
12808
12809
#: en/help_topics/patterns.txt:37
12810
msgid ""
12811
".. _Python regular expressions: http://docs.python.org/library/re.html"
12812
msgstr ""
12813
12814
#: en/help_topics/revisionspec.txt:1
12815
msgid "Revision Identifiers"
12816
msgstr ""
12817
12818
#: en/help_topics/revisionspec.txt:3
12819
msgid ""
12820
"A revision identifier refers to a specific state of a branch's history. It\n"
12821
"can be expressed in several ways. It can begin with a keyword to\n"
12822
"unambiguously specify a given lookup type; some examples are 'last:1',\n"
12823
"'before:yesterday' and 'submit:'."
12824
msgstr ""
12825
12826
#: en/help_topics/revisionspec.txt:8
12827
msgid ""
12828
"Alternately, it can be given without a keyword, in which case it will be\n"
12829
"checked as a revision number, a tag, a revision id, a date specification, or "
12830
"a\n"
12831
"branch specification, in that order. For example, 'date:today' could be\n"
12832
"written as simply 'today', though if you have a tag called 'today' that "
12833
"will\n"
12834
"be found first."
12835
msgstr ""
12836
12837
#: en/help_topics/revisionspec.txt:14
12838
msgid ""
12839
"If 'REV1' and 'REV2' are revision identifiers, then 'REV1..REV2' denotes a\n"
12840
"revision range. Examples: '3647..3649', 'date:yesterday..-1' and\n"
12841
"'branch:/path/to/branch1/..branch:/branch2' (note that there are no quotes "
12842
"or\n"
12843
"spaces around the '..')."
12844
msgstr ""
12845
12846
#: en/help_topics/revisionspec.txt:19
12847
msgid ""
12848
"Ranges are interpreted differently by different commands. To the \"log\" "
12849
"command,\n"
12850
"a range is a sequence of log messages, but to the \"diff\" command, the "
12851
"range\n"
12852
"denotes a change between revisions (and not a sequence of changes). In\n"
12853
"addition, \"log\" considers a closed range whereas \"diff\" and \"merge\" "
12854
"consider it\n"
12855
"to be open-ended, that is, they include one end but not the other. For "
12856
"example:\n"
12857
"\"bzr log -r 3647..3649\" shows the messages of revisions 3647, 3648 and "
12858
"3649,\n"
12859
"while \"bzr diff -r 3647..3649\" includes the changes done in revisions 3648 "
12860
"and\n"
12861
"3649, but not 3647."
12862
msgstr ""
12863
12864
#: en/help_topics/revisionspec.txt:28
12865
msgid "The keywords used as revision selection methods are the following:"
12866
msgstr ""
12867
12868
#: en/help_topics/revisionspec.txt:30
12869
msgid ""
12870
":revid:\n"
12871
"\tSelects a revision using the revision id.\n"
12872
":submit:\n"
12873
"\tSelects a common ancestor with the submit branch.\n"
12874
":ancestor:\n"
12875
"\tSelects a common ancestor with a second branch.\n"
12876
":date:\n"
12877
"\tSelects a revision on the basis of a datestamp.\n"
12878
":branch:\n"
12879
"\tSelects the last revision of a specified branch.\n"
12880
":tag:\n"
12881
"\tSelects a revision identified by a tag name.\n"
12882
":revno:\n"
12883
"\tSelects a revision using a number.\n"
12884
":before:\n"
12885
"\tSelects the parent of the revision specified.\n"
12886
":annotate:\n"
12887
"\tSelect the revision that last modified the specified line.\n"
12888
":mainline:\n"
12889
"\tSelect mainline revision that merged the specified revision.\n"
12890
":last:\n"
12891
"\tSelects the nth revision from the end."
12892
msgstr ""
12893
12894
#: en/help_topics/revisionspec.txt:53
12895
msgid "In addition, plugins can provide other keywords."
12896
msgstr ""
12897
12898
#: en/help_topics/revisionspec.txt:55
12899
msgid "A detailed description of each keyword is given below."
12900
msgstr ""
12901
12902
#: en/help_topics/revisionspec.txt:57
12903
msgid ":revid:"
12904
msgstr ""
12905
12906
#: en/help_topics/revisionspec.txt:59
12907
msgid ""
12908
" Supply a specific revision id, that can be used to specify any\n"
12909
" revision id in the ancestry of the branch.\n"
12910
" Including merges, and pending merges.\n"
12911
" Examples::"
12912
msgstr ""
12913
12914
#: en/help_topics/revisionspec.txt:64
12915
msgid ""
12916
" revid:aaaa@bbbb-123456789 -> Select revision 'aaaa@bbbb-123456789'"
12917
msgstr ""
12918
12919
#: en/help_topics/revisionspec.txt:66
12920
msgid ":submit:"
12921
msgstr ""
12922
12923
#: en/help_topics/revisionspec.txt:68
12924
msgid ""
12925
" Diffing against this shows all the changes that were made in this "
12926
"branch,\n"
12927
" and is a good predictor of what merge will do. The submit branch is\n"
12928
" used by the bundle and merge directive commands. If no submit branch\n"
12929
" is specified, the parent branch is used instead."
12930
msgstr ""
12931
12932
#: en/help_topics/revisionspec.txt:73 en/help_topics/revisionspec.txt:85
12933
msgid ""
12934
" The common ancestor is the last revision that existed in both\n"
12935
" branches. Usually this is the branch point, but it could also be\n"
12936
" a revision that was merged."
12937
msgstr ""
12938
12939
#: en/help_topics/revisionspec.txt:77 en/help_topics/revisionspec.txt:93
12940
#: en/help_topics/revisionspec.txt:109 en/help_topics/revisionspec.txt:119
12941
#: en/help_topics/revisionspec.txt:153
12942
msgid " Examples::"
12943
msgstr ""
12944
12945
#: en/help_topics/revisionspec.txt:79
12946
msgid " $ bzr diff -r submit:"
12947
msgstr ""
12948
12949
#: en/help_topics/revisionspec.txt:81
12950
msgid ":ancestor:"
12951
msgstr ""
12952
12953
#: en/help_topics/revisionspec.txt:83
12954
msgid " Supply the path to a branch to select the common ancestor."
12955
msgstr ""
12956
12957
#: en/help_topics/revisionspec.txt:89
12958
msgid ""
12959
" This is frequently used with 'diff' to return all of the changes\n"
12960
" that your branch introduces, while excluding the changes that you\n"
12961
" have not merged from the remote branch."
12962
msgstr ""
12963
12964
#: en/help_topics/revisionspec.txt:95
12965
msgid ""
12966
" ancestor:/path/to/branch\n"
12967
" $ bzr diff -r ancestor:../../mainline/branch"
12968
msgstr ""
12969
12970
#: en/help_topics/revisionspec.txt:98
12971
msgid ":date:"
12972
msgstr ""
12973
12974
#: en/help_topics/revisionspec.txt:100
12975
msgid ""
12976
" Supply a datestamp to select the first revision that matches the date.\n"
12977
" Date can be 'yesterday', 'today', 'tomorrow' or a YYYY-MM-DD string.\n"
12978
" Matches the first entry after a given date (either at midnight or\n"
12979
" at a specified time)."
12980
msgstr ""
12981
12982
#: en/help_topics/revisionspec.txt:105
12983
msgid " One way to display all the changes since yesterday would be::"
12984
msgstr ""
12985
12986
#: en/help_topics/revisionspec.txt:107
12987
msgid " bzr log -r date:yesterday.."
12988
msgstr ""
12989
12990
#: en/help_topics/revisionspec.txt:111
12991
msgid ""
12992
" date:yesterday -> select the first revision since "
12993
"yesterday\n"
12994
" date:2006-08-14,17:10:14 -> select the first revision after\n"
12995
" August 14th, 2006 at 5:10pm."
12996
msgstr ""
12997
12998
#: en/help_topics/revisionspec.txt:115
12999
msgid ":branch:"
13000
msgstr ""
13001
13002
#: en/help_topics/revisionspec.txt:117
13003
msgid " Supply the path to a branch to select its last revision."
13004
msgstr ""
13005
13006
#: en/help_topics/revisionspec.txt:121
13007
msgid " branch:/path/to/branch"
13008
msgstr ""
13009
13010
#: en/help_topics/revisionspec.txt:123
13011
msgid ":tag:"
13012
msgstr ""
13013
13014
#: en/help_topics/revisionspec.txt:125
13015
msgid " Tags are stored in the branch and created by the 'tag' command."
13016
msgstr ""
13017
13018
#: en/help_topics/revisionspec.txt:127
13019
msgid ":revno:"
13020
msgstr ""
13021
13022
#: en/help_topics/revisionspec.txt:129
13023
msgid ""
13024
" Use an integer to specify a revision in the history of the branch.\n"
13025
" Optionally a branch can be specified. A negative number will count\n"
13026
" from the end of the branch (-1 is the last revision, -2 the previous\n"
13027
" one). If the negative number is larger than the branch's history, the\n"
13028
" first revision is returned.\n"
13029
" Examples::"
13030
msgstr ""
13031
13032
#: en/help_topics/revisionspec.txt:136
13033
msgid ""
13034
" revno:1 -> return the first revision of this branch\n"
13035
" revno:3:/path/to/branch -> return the 3rd revision of\n"
13036
" the branch '/path/to/branch'\n"
13037
" revno:-1 -> The last revision in a branch.\n"
13038
" -2:http://other/branch -> The second to last revision in the\n"
13039
" remote branch.\n"
13040
" -1000000 -> Most likely the first revision, unless\n"
13041
" your history is very long."
13042
msgstr ""
13043
13044
#: en/help_topics/revisionspec.txt:145
13045
msgid ":before:"
13046
msgstr ""
13047
13048
#: en/help_topics/revisionspec.txt:147
13049
msgid ""
13050
" Supply any revision spec to return the parent of that revision. This "
13051
"is\n"
13052
" mostly useful when inspecting revisions that are not in the revision "
13053
"history\n"
13054
" of a branch."
13055
msgstr ""
13056
13057
#: en/help_topics/revisionspec.txt:151
13058
msgid ""
13059
" It is an error to request the parent of the null revision (before:0)."
13060
msgstr ""
13061
13062
#: en/help_topics/revisionspec.txt:155
13063
msgid ""
13064
" before:1913 -> Return the parent of revno 1913 (revno 1912)\n"
13065
" before:revid:aaaa@bbbb-1234567890 -> return the parent of revision\n"
13066
" aaaa@bbbb-1234567890\n"
13067
" bzr diff -r before:1913..1913\n"
13068
" -> Find the changes between revision 1913 and its parent "
13069
"(1912).\n"
13070
" (What changes did revision 1913 introduce).\n"
13071
" This is equivalent to: bzr diff -c 1913"
13072
msgstr ""
13073
13074
#: en/help_topics/revisionspec.txt:163
13075
msgid ":annotate:"
13076
msgstr ""
13077
13078
#: en/help_topics/revisionspec.txt:165
13079
msgid ""
13080
" Select the revision that last modified the specified line. Line is\n"
13081
" specified as path:number. Path is a relative path to the file. "
13082
"Numbers\n"
13083
" start at 1, and are relative to the current version, not the last-\n"
13084
" committed version of the file."
13085
msgstr ""
13086
13087
#: en/help_topics/revisionspec.txt:170
13088
msgid ":mainline:"
13089
msgstr ""
13090
13091
#: en/help_topics/revisionspec.txt:172
13092
msgid ""
13093
" Select the revision that merged the specified revision into mainline."
13094
msgstr ""
13095
13096
#: en/help_topics/revisionspec.txt:174
13097
msgid ":last:"
13098
msgstr ""
13099
13100
#: en/help_topics/revisionspec.txt:176
13101
msgid ""
13102
" Supply a positive number to get the nth revision from the end.\n"
13103
" This is the same as supplying negative numbers to the 'revno:' spec.\n"
13104
" Examples::"
13105
msgstr ""
13106
13107
#: en/help_topics/revisionspec.txt:180
13108
msgid ""
13109
" last:1 -> return the last revision\n"
13110
" last:3 -> return the revision 2 before the end.\n"
13111
msgstr ""
13112
13113
#: en/help_topics/rules.txt:1
13114
msgid ""
13115
"Rules\n"
13116
"====="
13117
msgstr ""
13118
13119
#: en/help_topics/rules.txt:7
13120
msgid ""
13121
"Rules are defined in ini file format where the sections are file glob\n"
13122
"patterns and the contents of each section are the preferences for files\n"
13123
"matching that pattern(s). For example::"
13124
msgstr ""
13125
13126
#: en/help_topics/rules.txt:11
13127
msgid ""
13128
" [name *.bat]\n"
13129
" eol = native"
13130
msgstr ""
13131
13132
#: en/help_topics/rules.txt:14
13133
msgid ""
13134
" [name *.html *.xml]\n"
13135
" keywords = xml_escape"
13136
msgstr ""
13137
13138
#: en/help_topics/rules.txt:17
13139
msgid ""
13140
"Preferences like these are useful for commands and plugins wishing to\n"
13141
"provide custom behaviour for selected files. For more information on \n"
13142
"end of line conversion see :doc:`eol-help`.\n"
13143
"Keyword support is provided by the `keywords plugin\n"
13144
"<http://doc.bazaar.canonical.com/plugins/en/keywords-plugin.html>`_."
13145
msgstr ""
13146
13147
#: en/help_topics/rules.txt:23
13148
msgid ""
13149
"Files\n"
13150
"-----"
13151
msgstr ""
13152
13153
#: en/help_topics/rules.txt:26
13154
msgid ""
13155
"Default rules for all branches are defined in the optional file\n"
13156
"``BZR_HOME/rules``. "
13157
msgstr ""
13158
13159
#: en/help_topics/rules.txt:29
13160
msgid ""
13161
"Rule Patterns\n"
13162
"-------------"
13163
msgstr ""
13164
13165
#: en/help_topics/rules.txt:32
13166
msgid ""
13167
"Patterns are ordered and searching stops as soon as one matches.\n"
13168
"As a consequence, more explicit patterns should be placed towards\n"
13169
"the top of the file. Rule patterns use exactly the same conventions\n"
13170
"as ignore patterns. See :doc:`patterns-help` for details."
13171
msgstr ""
13172
13173
#: en/help_topics/rules.txt:37
13174
msgid ".. note::"
13175
msgstr ""
13176
13177
#: en/help_topics/rules.txt:39
13178
msgid ""
13179
" Patterns containing square brackets or spaces should be\n"
13180
" surrounded in quotes to ensure they are correctly parsed.\n"
13181
msgstr ""
13182
13183
#: en/help_topics/topics.txt:1
13184
msgid ""
13185
"authentication Information on configuring authentication\n"
13186
"basic Basic commands\n"
13187
"branches Information on what a branch is\n"
13188
"bugs Bug tracker settings\n"
13189
"checkouts Information on what a checkout is\n"
13190
"commands Basic help for all commands\n"
13191
"configuration Details on the configuration settings available\n"
13192
"conflict-types Types of conflicts and what to do about them\n"
13193
"content-filters Conversion of content into/from working trees\n"
13194
"criss-cross Information on criss-cross merging\n"
13195
"current-formats Current storage formats\n"
13196
"debug-flags Options to show or record debug information\n"
13197
"diverged-branches How to fix diverged branches\n"
13198
"env-variables Environment variable names and values\n"
13199
"eol Information on end-of-line handling\n"
13200
"files Information on configuration and log files\n"
13201
"formats Information on choosing a storage format\n"
13202
"global-options Options that control how Bazaar runs\n"
13203
"hidden-commands All hidden commands\n"
13204
"hooks Points at which custom processing can be added\n"
13205
"launchpad Using Bazaar with Launchpad.net\n"
13206
"location-alias Aliases for remembered locations\n"
13207
"log-formats Details on the logging formats available\n"
13208
"other-formats Experimental and deprecated storage formats\n"
13209
"patterns Information on the pattern syntax\n"
13210
"repositories Basic information on shared repositories.\n"
13211
"revisionspec Explain how to use --revision\n"
13212
"rules Information on defining rule-based preferences\n"
13213
"standalone-trees Information on what a standalone tree is\n"
13214
"standard-options Options that can be used with any command\n"
13215
"status-flags Help on status flags\n"
13216
"sync-for-reconfigure Steps to resolve \"out-of-sync\" when reconfiguring\n"
13217
"topics Topics list\n"
13218
"url-special-chars Special character handling in URLs\n"
13219
"urlspec Supported transport protocols\n"
13220
"working-trees Information on working trees\n"
13221
msgstr ""
13222
13223
#: en/help_topics/url-special-chars.txt:1
13224
msgid ""
13225
"Special character handling in URLs\n"
13226
"=================================="
13227
msgstr ""
13228
13229
#: en/help_topics/url-special-chars.txt:4
13230
msgid "Bazaar allows locations to be specified in multiple ways, either:"
13231
msgstr ""
13232
13233
#: en/help_topics/url-special-chars.txt:6
13234
msgid " * Fully qualified URLs"
13235
msgstr ""
13236
13237
#: en/help_topics/url-special-chars.txt:8
13238
msgid " * File system paths, relative or absolute"
13239
msgstr ""
13240
13241
#: en/help_topics/url-special-chars.txt:10
13242
msgid ""
13243
"Internally bzr treats all locations as URLs. For any file system paths\n"
13244
"that are specified it will automatically determine the appropriate URL\n"
13245
"representation, and escape special characters where necessary."
13246
msgstr ""
13247
13248
#: en/help_topics/url-special-chars.txt:14
13249
msgid ""
13250
"There are a few characters which have special meaning in URLs and need "
13251
"careful\n"
13252
"handling to avoid ambiguities. Characters can be escaped with a % and a hex\n"
13253
"value in URLs. Any non-ASCII characters in a file path will automatically "
13254
"be\n"
13255
"urlencoded when the path is converted to a URL."
13256
msgstr ""
13257
13258
#: en/help_topics/url-special-chars.txt:19
13259
msgid ""
13260
"URLs represent non-ASCII characters in an encoding defined by the server, "
13261
"but\n"
13262
"usually UTF-8. The % escapes should be of the UTF-8 bytes. Bazaar tries to "
13263
"be\n"
13264
"generous in what it accepts as a URL and to print them in a way that\n"
13265
"will be readable."
13266
msgstr ""
13267
13268
#: en/help_topics/url-special-chars.txt:24
13269
msgid ""
13270
"For example, if you have a directory named '/tmp/%2False' these are all "
13271
"valid\n"
13272
"ways of accessing the content (0x2F, or 47, is the ASCII code for forward "
13273
"slash)::"
13274
msgstr ""
13275
13276
#: en/help_topics/url-special-chars.txt:27
13277
msgid ""
13278
" cd /tmp\n"
13279
" bzr log /tmp/%2False\n"
13280
" bzr log %2False\n"
13281
" bzr log file:///tmp/%252False\n"
13282
" bzr log file://localhost/tmp/%252False\n"
13283
" bzr log file:%252False"
13284
msgstr ""
13285
13286
#: en/help_topics/url-special-chars.txt:34
13287
msgid "These are valid but do not refer to the same file::"
13288
msgstr ""
13289
13290
#: en/help_topics/url-special-chars.txt:36
13291
msgid ""
13292
" bzr log file:///tmp/%2False (refers to a file called /tmp/\\/alse)\n"
13293
" bzr log %252False (refers to a file called /tmp/%252False)"
13294
msgstr ""
13295
13296
#: en/help_topics/url-special-chars.txt:39
13297
msgid ""
13298
"Comma also has special meaning in URLs, because it denotes `segment "
13299
"parameters`_"
13300
msgstr ""
13301
13302
#: en/help_topics/url-special-chars.txt:41
13303
msgid ""
13304
"_`segment parameters`: http://www.ietf.org/rfc/rfc3986.txt (section 3.3)"
13305
msgstr ""
13306
13307
#: en/help_topics/url-special-chars.txt:43
13308
msgid ""
13309
"Comma is also special in any file system paths that are specified. To use a "
13310
"literal\n"
13311
"comma in a file system path, specify a URL and URL encode the comma::"
13312
msgstr ""
13313
13314
#: en/help_topics/url-special-chars.txt:46
13315
msgid ""
13316
" bzr log foo,branch=bla # path \"foo\" with the segment parameter "
13317
"\"branch\" set to \"bla\"\n"
13318
" bzr log file:foo%2Cbranch=bla # path \"foo,branch=bla\"\n"
13319
" bzr log file:foo,branch=bla # path \"foo\" with segment parameter "
13320
"\"branch\" set to \"bla\"\n"
13321
msgstr ""
13322
13323
#: en/help_topics/urlspec.txt:1
13324
msgid "URL Identifiers"
13325
msgstr ""
13326
13327
#: en/help_topics/urlspec.txt:3
13328
msgid "Supported URL prefixes::"
13329
msgstr ""
13330
13331
#: en/help_topics/urlspec.txt:5
13332
msgid ""
13333
" aftp:// Access using active FTP.\n"
13334
" bzr:// Fast access using the Bazaar smart server.\n"
13335
" bzr+ssh:// Fast access using the Bazaar smart server over SSH.\n"
13336
" file:// Access using the standard filesystem (default)\n"
13337
" ftp:// Access using passive FTP.\n"
13338
" http:// Read-only access of branches exported on the web.\n"
13339
" https:// Read-only access of branches exported on the web using "
13340
"SSL.\n"
13341
" sftp:// Access using SFTP (most SSH servers provide SFTP)."
13342
msgstr ""
13343
13344
#: en/help_topics/urlspec.txt:14
13345
msgid "Supported modifiers::"
13346
msgstr ""
13347
13348
#: en/help_topics/urlspec.txt:16
13349
msgid " gio+ Access using any GIO supported protocols."
13350
msgstr ""
13351
13352
#: en/help_topics/urlspec.txt:18
13353
msgid "Bazaar supports all of the standard parts within the URL::"
13354
msgstr ""
13355
13356
#: en/help_topics/urlspec.txt:20
13357
msgid " <protocol>://[user[:password]@]host[:port]/[path]"
13358
msgstr ""
13359
13360
#: en/help_topics/urlspec.txt:22
13361
msgid "allowing URLs such as::"
13362
msgstr ""
13363
13364
#: en/help_topics/urlspec.txt:24
13365
msgid " http://bzruser:BadPass@bzr.example.com:8080/bzr/trunk"
13366
msgstr ""
13367
13368
#: en/help_topics/urlspec.txt:26
13369
msgid ""
13370
"For bzr+ssh:// and sftp:// URLs, Bazaar also supports paths that begin\n"
13371
"with '~' as meaning that the rest of the path should be interpreted\n"
13372
"relative to the remote user's home directory. For example if the user\n"
13373
"``remote`` has a home directory of ``/home/remote`` on the server\n"
13374
"shell.example.com, then::"
13375
msgstr ""
13376
13377
#: en/help_topics/urlspec.txt:32
13378
msgid " bzr+ssh://remote@shell.example.com/~/myproject/trunk"
13379
msgstr ""
13380
13381
#: en/help_topics/urlspec.txt:34
13382
msgid "would refer to ``/home/remote/myproject/trunk``."
13383
msgstr ""
13384
13385
#: en/help_topics/urlspec.txt:36
13386
msgid ""
13387
"Many commands that accept URLs also accept location aliases too.\n"
13388
"See :doc:`location-alias-help` and :doc:`url-special-chars-help`.\n"
13389
msgstr ""
13390
13391
#~ msgid ""
13392
#~ "Bazaar 2.5b5 -- a free distributed version-control tool\n"
13393
#~ "http://bazaar.canonical.com/"
13394
#~ msgstr ""
13395
#~ "Bazaar 2.5b5 -- a free distributed version-control tool\n"
13396
#~ "http://bazaar.canonical.com/"
Loggerhead is a web-based interface for Breezy
Version: 2.0.1