« back to all changes in this revision
Viewing changes to po/bzr.pot
- browse files at revision 6111.3.11
- compare with another revision
- compare with revision 6593
- download diff
- download tarball
- view history from revision 6111.3.11
- Committer: Martin Packman
- Date: 2012-01-05 09:50:04 UTC
- mfrom: (6424 +trunk)
- mto: This revision was merged to the branch mainline in revision 6426.
- Revision ID: martin.packman@canonical.com-20120105095004-mia9xb7y0efmto0v
Merge bzr.dev to resolve conflicts in bzrlib.builtins
- 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
- 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/bzr.pot
8
8
msgstr ""
9
9
"Project-Id-Version: bzr\n"
10
10
"Report-Msgid-Bugs-To: <bazaar@canonical.com>\n"
11
"POT-Creation-Date: 2011-08-24 15:14+0100\n"
11
"POT-Creation-Date: 2011-12-08 09:21+0100\n"
12
12
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
13
13
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
14
14
"Language-Team: LANGUAGE <LL@li.org>\n"
18
18
"Content-Transfer-Encoding: 8bit\n"
19
19
"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
20
20
21
#: bzrlib/builtins.py:209
21
#: bzrlib/add.py:95
22
msgid "skipping {0} (larger than {1} of {2} bytes)"
23
msgstr ""
24
25
#: bzrlib/branch.py:871
26
msgid "Unstacking"
27
msgstr ""
28
29
#: bzrlib/branch.py:3173
30
#, python-format
31
msgid "Pushed up to revision %d."
32
msgstr ""
33
34
#: bzrlib/branch.py:3175
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:3178
42
msgid "No new revisions or tags to push."
43
msgstr ""
44
45
#: bzrlib/branch.py:3180
46
msgid "No new revisions to push."
47
msgstr ""
48
49
#: bzrlib/branch.py:3200
50
msgid "checked branch {0} format {1}"
51
msgstr ""
52
53
#: bzrlib/branch.py:3203
54
#, python-format
55
msgid "found error:%s"
56
msgstr ""
57
58
#: bzrlib/builtins.py:118 bzrlib/builtins.py:2868 bzrlib/workingtree.py:304
59
#, python-format
60
msgid "Ignoring files outside view. View is %s"
61
msgstr ""
62
63
#: bzrlib/builtins.py:127
64
#, python-format
65
msgid "bzr %s --revision takes exactly one revision identifier"
66
msgstr ""
67
68
#: bzrlib/builtins.py:212
22
69
msgid "Display status summary."
23
70
msgstr ""
24
71
25
#: bzrlib/builtins.py:211
72
#: bzrlib/builtins.py:214
26
73
msgid ""
27
74
"This reports on versioned and unknown files, reporting them\n"
28
75
"grouped by state. Possible states are:"
29
76
msgstr ""
30
77
31
#: bzrlib/builtins.py:214
78
#: bzrlib/builtins.py:217
32
79
msgid ""
33
80
"added\n"
34
81
" Versioned in the working copy but not in the previous revision."
35
82
msgstr ""
36
83
37
#: bzrlib/builtins.py:217
84
#: bzrlib/builtins.py:220
38
85
msgid ""
39
86
"removed\n"
40
87
" Versioned in the previous revision but removed or deleted\n"
41
88
" in the working copy."
42
89
msgstr ""
43
90
44
#: bzrlib/builtins.py:221
91
#: bzrlib/builtins.py:224
45
92
msgid ""
46
93
"renamed\n"
47
94
" Path of this file changed from the previous revision;\n"
49
96
" parent directory was renamed."
50
97
msgstr ""
51
98
52
#: bzrlib/builtins.py:226
99
#: bzrlib/builtins.py:229
53
100
msgid ""
54
101
"modified\n"
55
102
" Text has changed since the previous revision."
56
103
msgstr ""
57
104
58
#: bzrlib/builtins.py:229
105
#: bzrlib/builtins.py:232
59
106
msgid ""
60
107
"kind changed\n"
61
108
" File kind has been changed (e.g. from file to directory)."
62
109
msgstr ""
63
110
64
#: bzrlib/builtins.py:232
111
#: bzrlib/builtins.py:235
65
112
msgid ""
66
113
"unknown\n"
67
114
" Not versioned and not matching an ignore pattern."
68
115
msgstr ""
69
116
70
#: bzrlib/builtins.py:235
117
#: bzrlib/builtins.py:238
71
118
msgid ""
72
119
"Additionally for directories, symlinks and files with a changed\n"
73
120
"executable bit, Bazaar indicates their type using a trailing\n"
75
122
"disabled using the '--no-classify' option."
76
123
msgstr ""
77
124
78
#: bzrlib/builtins.py:240
125
#: bzrlib/builtins.py:243
79
126
msgid ""
80
127
"To see ignored files use 'bzr ignored'. For details on the\n"
81
128
"changes to file texts, use 'bzr diff'."
82
129
msgstr ""
83
130
84
#: bzrlib/builtins.py:243
131
#: bzrlib/builtins.py:246
85
132
msgid ""
86
133
"Note that --short or -S gives status flags for each item, similar\n"
87
134
"to Subversion's status command. To get output similar to svn -q,\n"
88
135
"use bzr status -SV."
89
136
msgstr ""
90
137
91
#: bzrlib/builtins.py:247
138
#: bzrlib/builtins.py:250
92
139
msgid ""
93
140
"If no arguments are specified, the status of the entire working\n"
94
141
"directory is shown. Otherwise, only the status of the specified\n"
96
143
"is reported for everything inside that directory."
97
144
msgstr ""
98
145
99
#: bzrlib/builtins.py:252
146
#: bzrlib/builtins.py:255
100
147
msgid ""
101
148
"Before merges are committed, the pending merge tip revisions are\n"
102
149
"shown. To see all pending merge revisions, use the -v option.\n"
104
151
"the no-pending option or specify a file/directory."
105
152
msgstr ""
106
153
107
#: bzrlib/builtins.py:257
154
#: bzrlib/builtins.py:260
108
155
msgid ""
109
156
"To compare the working directory to a specific revision, pass a\n"
110
157
"single revision to the revision argument."
111
158
msgstr ""
112
159
113
#: bzrlib/builtins.py:260
160
#: bzrlib/builtins.py:263
114
161
msgid ""
115
162
"To see which files have changed in a specific revision, or between\n"
116
163
"two revisions, pass a revision range to the revision argument.\n"
118
165
msgstr ""
119
166
120
167
# help of 'short' option of 'status' command
121
#: bzrlib/builtins.py:269
168
#: bzrlib/builtins.py:272
122
169
msgid "Use short status indicators."
123
170
msgstr ""
124
171
125
172
# help of 'versioned' option of 'status' command
126
#: bzrlib/builtins.py:271
173
#: bzrlib/builtins.py:274
127
174
msgid "Only show versioned files."
128
175
msgstr ""
129
176
130
177
# help of 'no-pending' option of 'status' command
131
#: bzrlib/builtins.py:273
178
#: bzrlib/builtins.py:276
132
179
msgid "Don't show pending merges."
133
180
msgstr ""
134
181
135
182
# help of 'no-classify' option of 'status' command
136
#: bzrlib/builtins.py:276
183
#: bzrlib/builtins.py:279
137
184
msgid "Do not mark object type using indicator."
138
185
msgstr ""
139
186
140
#: bzrlib/builtins.py:455
187
#: bzrlib/builtins.py:294
188
msgid "bzr status --revision takes exactly one or two revision specifiers"
189
msgstr ""
190
191
#: bzrlib/builtins.py:338 bzrlib/builtins.py:5024
192
msgid "You can only supply one of revision_id or --revision"
193
msgstr ""
194
195
#: bzrlib/builtins.py:341 bzrlib/builtins.py:5026
196
msgid "You must supply either --revision or a revision_id"
197
msgstr ""
198
199
#: bzrlib/builtins.py:348
200
#, python-format
201
msgid "Repository %r does not support access to raw revision texts"
202
msgstr ""
203
204
#: bzrlib/builtins.py:359
205
msgid "The repository {0} contains no revision {1}."
206
msgstr ""
207
208
#: bzrlib/builtins.py:366
209
msgid "You cannot specify a NULL revision."
210
msgstr ""
211
212
#: bzrlib/builtins.py:458
141
213
msgid "Remove the working tree from a given branch/checkout."
142
214
msgstr ""
143
215
144
#: bzrlib/builtins.py:457
216
#: bzrlib/builtins.py:460
145
217
msgid ""
146
218
"Since a lightweight checkout is little more than a working tree\n"
147
219
"this will refuse to run against one."
148
220
msgstr ""
149
221
150
#: bzrlib/builtins.py:460
222
#: bzrlib/builtins.py:463
151
223
msgid "To re-create the working tree, use \"bzr checkout\"."
152
224
msgstr ""
153
225
154
226
# help of 'force' option of 'remove-tree' command
155
#: bzrlib/builtins.py:466
227
#: bzrlib/builtins.py:469
156
228
msgid "Remove the working tree even if it has uncommitted or shelved changes."
157
229
msgstr ""
158
230
159
#: bzrlib/builtins.py:551
231
#: bzrlib/builtins.py:483
232
msgid "No working tree to remove"
233
msgstr ""
234
235
#: bzrlib/builtins.py:485
236
msgid "You cannot remove the working tree of a remote path"
237
msgstr ""
238
239
#: bzrlib/builtins.py:494
240
msgid "You cannot remove the working tree from a lightweight checkout"
241
msgstr ""
242
243
#: bzrlib/builtins.py:534
244
msgid ""
245
"The tree does not appear to be corrupt. You probably want \"bzr revert\" "
246
"instead. Use \"--force\" if you are sure you want to reset the working tree."
247
msgstr ""
248
249
#: bzrlib/builtins.py:545
250
msgid ""
251
", the header appears corrupt, try passing -r -1 to set the state to the last "
252
"commit"
253
msgstr ""
254
255
#: bzrlib/builtins.py:549
256
msgid "failed to reset the tree state{0}"
257
msgstr ""
258
259
#: bzrlib/builtins.py:553
160
260
msgid "Show current revision number."
161
261
msgstr ""
162
262
163
#: bzrlib/builtins.py:553
263
#: bzrlib/builtins.py:555
164
264
msgid "This is equal to the number of revisions on this branch."
165
265
msgstr ""
166
266
267
#: bzrlib/builtins.py:568
268
msgid "--tree and --revision can not be used together"
269
msgstr ""
270
271
#: bzrlib/builtins.py:585 bzrlib/builtins.py:5808
272
msgid "Tags can only be placed on a single revision, not on a range"
273
msgstr ""
274
167
275
# help of 'tree' option of 'revno' command
168
#: bzrlib/builtins.py:594
169
msgid "Show revno of working tree"
276
#: bzrlib/builtins.py:609
277
msgid "Show revno of working tree."
170
278
msgstr ""
171
279
172
#: bzrlib/builtins.py:642
280
#: bzrlib/builtins.py:657
173
281
msgid "Add specified files or directories."
174
282
msgstr ""
175
283
176
#: bzrlib/builtins.py:644
284
#: bzrlib/builtins.py:659
177
285
msgid ""
178
286
"In non-recursive mode, all the named items are added, regardless\n"
179
287
"of whether they were previously ignored. A warning is given if\n"
180
288
"any of the named files are already versioned."
181
289
msgstr ""
182
290
183
#: bzrlib/builtins.py:648
291
#: bzrlib/builtins.py:663
184
292
msgid ""
185
293
"In recursive mode (the default), files are treated the same way\n"
186
294
"but the behaviour for directories is different. Directories that\n"
191
299
"directories. If no names are given '.' is assumed."
192
300
msgstr ""
193
301
194
#: bzrlib/builtins.py:656
302
#: bzrlib/builtins.py:671
303
msgid ""
304
"A warning will be printed when nested trees are encountered,\n"
305
"unless they are explicitly ignored."
306
msgstr ""
307
308
#: bzrlib/builtins.py:674
195
309
msgid ""
196
310
"Therefore simply saying 'bzr add' will version all files that\n"
197
311
"are currently unknown."
198
312
msgstr ""
199
313
200
#: bzrlib/builtins.py:659
314
#: bzrlib/builtins.py:677
201
315
msgid ""
202
316
"Adding a file whose parent directory is not versioned will\n"
203
317
"implicitly add the parent, and so on up to the root. This means\n"
205
319
"get added when you add a file in the directory."
206
320
msgstr ""
207
321
208
#: bzrlib/builtins.py:664
322
#: bzrlib/builtins.py:682
209
323
msgid ""
210
324
"--dry-run will show which files would be added, but not actually\n"
211
325
"add them."
212
326
msgstr ""
213
327
214
#: bzrlib/builtins.py:667
328
#: bzrlib/builtins.py:685
215
329
msgid ""
216
330
"--file-ids-from will try to use the file ids from the supplied path.\n"
217
331
"It looks up ids trying to find a matching parent directory with the\n"
222
336
"into a subdirectory of this one."
223
337
msgstr ""
224
338
225
#: bzrlib/builtins.py:675
339
#: bzrlib/builtins.py:693
226
340
msgid ""
227
341
"Any files matching patterns in the ignore list will not be added\n"
228
342
"unless they are explicitly mentioned."
229
343
msgstr ""
230
344
231
#: bzrlib/builtins.py:678
345
#: bzrlib/builtins.py:696
232
346
msgid ""
233
347
"In recursive mode, files larger than the configuration option \n"
234
348
"add.maximum_file_size will be skipped. Named items are never skipped due\n"
236
350
msgstr ""
237
351
238
352
# help of 'no-recurse' option of 'add' command
239
#: bzrlib/builtins.py:685
353
#: bzrlib/builtins.py:703
240
354
msgid "Don't recursively add the contents of directories."
241
355
msgstr ""
242
356
243
357
# help of 'file-ids-from' option of 'add' command
244
#: bzrlib/builtins.py:691
358
#: bzrlib/builtins.py:709
245
359
msgid "Lookup file ids from this tree."
246
360
msgstr ""
247
361
248
#: bzrlib/builtins.py:731
362
#: bzrlib/builtins.py:745
363
msgid "ignored {0} matching \"{1}\"\n"
364
msgstr ""
365
366
#: bzrlib/builtins.py:750
249
367
msgid "Create a new versioned directory."
250
368
msgstr ""
251
369
252
#: bzrlib/builtins.py:733
370
#: bzrlib/builtins.py:752
253
371
msgid "This is equivalent to creating the directory and then adding it."
254
372
msgstr ""
255
373
256
#: bzrlib/builtins.py:828
374
#: bzrlib/builtins.py:767
375
#, python-format
376
msgid "added %s\n"
377
msgstr ""
378
379
#: bzrlib/builtins.py:811
380
#, python-format
381
msgid "invalid kind %r specified"
382
msgstr ""
383
384
#: bzrlib/builtins.py:848
257
385
msgid "Move or rename a file."
258
386
msgstr ""
259
387
260
#: bzrlib/builtins.py:830
388
#: bzrlib/builtins.py:850
261
389
msgid " bzr mv SOURCE... DESTINATION"
262
390
msgstr ""
263
391
264
#: bzrlib/builtins.py:832
392
#: bzrlib/builtins.py:852
265
393
msgid ""
266
394
"If the last argument is a versioned directory, all the other names\n"
267
395
"are moved into it. Otherwise, there must be exactly two arguments\n"
268
396
"and the file is changed to a new name."
269
397
msgstr ""
270
398
271
#: bzrlib/builtins.py:836
399
#: bzrlib/builtins.py:856
272
400
msgid ""
273
401
"If OLDNAME does not exist on the filesystem but is versioned and\n"
274
402
"NEWNAME does exist on the filesystem but is not versioned, mv\n"
277
405
"The same is valid when moving many SOURCE files to a DESTINATION."
278
406
msgstr ""
279
407
280
#: bzrlib/builtins.py:842
408
#: bzrlib/builtins.py:862
281
409
msgid "Files cannot be moved between branches."
282
410
msgstr ""
283
411
284
412
# help of 'after' option of 'mv' command
285
#: bzrlib/builtins.py:849
413
#: bzrlib/builtins.py:869
286
414
msgid ""
287
415
"Move only the bzr identifier of the file, because the file has already been "
288
416
"moved."
289
417
msgstr ""
290
418
291
419
# help of 'auto' option of 'mv' command
292
#: bzrlib/builtins.py:851
420
#: bzrlib/builtins.py:871
293
421
msgid "Automatically guess renames."
294
422
msgstr ""
295
423
296
424
# help of 'dry-run' option of 'mv' command
297
#: bzrlib/builtins.py:852
425
#: bzrlib/builtins.py:872
298
426
msgid "Avoid making changes when guessing renames."
299
427
msgstr ""
300
428
301
#: bzrlib/builtins.py:964
429
#: bzrlib/builtins.py:881
430
msgid "--dry-run requires --auto."
431
msgstr ""
432
433
#: bzrlib/builtins.py:885
434
msgid "missing file argument"
435
msgstr ""
436
437
#: bzrlib/builtins.py:889
438
msgid "can not move root of branch"
439
msgstr ""
440
441
#: bzrlib/builtins.py:895
442
msgid "Only one path may be specified to --auto."
443
msgstr ""
444
445
#: bzrlib/builtins.py:898
446
msgid "--after cannot be specified with --auto."
447
msgstr ""
448
449
#: bzrlib/builtins.py:935
450
msgid "to mv multiple files the destination must be a versioned directory"
451
msgstr ""
452
453
#: bzrlib/builtins.py:987
302
454
msgid "Turn this branch into a mirror of another branch."
303
455
msgstr ""
304
456
305
#: bzrlib/builtins.py:966
457
#: bzrlib/builtins.py:989
306
458
msgid ""
307
459
"By default, this command only works on branches that have not diverged.\n"
308
460
"Branches are considered diverged if the destination branch's most recent \n"
310
462
"parent."
311
463
msgstr ""
312
464
313
#: bzrlib/builtins.py:971
465
#: bzrlib/builtins.py:994
314
466
msgid ""
315
467
"If branches have diverged, you can use 'bzr merge' to integrate the changes\n"
316
468
"from one into the other. Once one branch has merged, the other should\n"
317
469
"be able to pull it again."
318
470
msgstr ""
319
471
320
#: bzrlib/builtins.py:975
472
#: bzrlib/builtins.py:998
321
473
msgid ""
322
474
"If you want to replace your local changes and just want your branch to\n"
323
475
"match the remote one, use pull --overwrite. This will work even if the two\n"
324
476
"branches have diverged."
325
477
msgstr ""
326
478
327
#: bzrlib/builtins.py:979
479
#: bzrlib/builtins.py:1002
328
480
msgid ""
329
481
"If there is no default location set, the first pull will set it (use\n"
330
"--no-remember to avoid settting it). After that, you can omit the\n"
482
"--no-remember to avoid setting it). After that, you can omit the\n"
331
483
"location to use the default. To change the default, use --remember. The\n"
332
484
"value will only be saved if the remote location can be accessed."
333
485
msgstr ""
334
486
335
#: bzrlib/builtins.py:984
487
#: bzrlib/builtins.py:1007
488
msgid ""
489
"The --verbose option will display the revisions pulled using the log_format\n"
490
"configuration option. You can use a different format by overriding it with\n"
491
"-Olog_format=<other_format>."
492
msgstr ""
493
494
#: bzrlib/builtins.py:1011
336
495
msgid ""
337
496
"Note: The location can be specified either in the form of a branch,\n"
338
497
"or in the form of a path to a file containing a merge directive generated\n"
340
499
msgstr ""
341
500
342
501
# help of 'verbose' option of 'pull' command
343
#: bzrlib/builtins.py:992
502
#: bzrlib/builtins.py:1019
344
503
msgid "Show logs of pulled revisions."
345
504
msgstr ""
346
505
347
506
# help of 'directory' option of 'pull' command
348
#: bzrlib/builtins.py:994
507
#: bzrlib/builtins.py:1021
349
508
msgid ""
350
509
"Branch to pull into, rather than the one containing the working directory."
351
510
msgstr ""
352
511
353
512
# help of 'local' option of 'pull' command
354
#: bzrlib/builtins.py:997
513
#: bzrlib/builtins.py:1024
355
514
msgid ""
356
515
"Perform a local pull in a bound branch. Local pulls are not applied to the "
357
516
"master branch."
358
517
msgstr ""
359
518
360
#: bzrlib/builtins.py:1097
519
#: bzrlib/builtins.py:1053
520
msgid "Need working tree for --show-base."
521
msgstr ""
522
523
#: bzrlib/builtins.py:1069
524
msgid "No pull location known or specified."
525
msgstr ""
526
527
#: bzrlib/builtins.py:1075
528
#, python-format
529
msgid "Using saved parent location: %s\n"
530
msgstr ""
531
532
#: bzrlib/builtins.py:1082 bzrlib/builtins.py:4234
533
msgid "Cannot use -r with merge directives or bundles"
534
msgstr ""
535
536
#: bzrlib/builtins.py:1123
361
537
msgid "Update a mirror of this branch."
362
538
msgstr ""
363
539
364
#: bzrlib/builtins.py:1099
540
#: bzrlib/builtins.py:1125
365
541
msgid ""
366
542
"The target branch will not have its working tree populated because this\n"
367
543
"is both expensive, and is not supported on remote file systems."
368
544
msgstr ""
369
545
370
#: bzrlib/builtins.py:1102
546
#: bzrlib/builtins.py:1128
371
547
msgid ""
372
548
"Some smart servers or protocols *may* put the working tree in place in\n"
373
549
"the future."
374
550
msgstr ""
375
551
376
#: bzrlib/builtins.py:1105
552
#: bzrlib/builtins.py:1131
377
553
msgid ""
378
554
"This command only works on branches that have not diverged. Branches are\n"
379
555
"considered diverged if the destination branch's most recent commit is one\n"
380
556
"that has not been merged (directly or indirectly) by the source branch."
381
557
msgstr ""
382
558
383
#: bzrlib/builtins.py:1109
559
#: bzrlib/builtins.py:1135
384
560
msgid ""
385
561
"If branches have diverged, you can use 'bzr push --overwrite' to replace\n"
386
562
"the other branch completely, discarding its unmerged changes."
387
563
msgstr ""
388
564
389
#: bzrlib/builtins.py:1112
565
#: bzrlib/builtins.py:1138
390
566
msgid ""
391
567
"If you want to ensure you have the different changes in the other branch,\n"
392
568
"do a merge (see bzr help merge) from the other branch, and commit that.\n"
393
569
"After that you will be able to do a push without '--overwrite'."
394
570
msgstr ""
395
571
396
#: bzrlib/builtins.py:1116
572
#: bzrlib/builtins.py:1142
397
573
msgid ""
398
574
"If there is no default push location set, the first push will set it (use\n"
399
"--no-remember to avoid settting it). After that, you can omit the\n"
575
"--no-remember to avoid setting it). After that, you can omit the\n"
400
576
"location to use the default. To change the default, use --remember. The\n"
401
577
"value will only be saved if the remote location can be accessed."
402
578
msgstr ""
403
579
404
# help of 'directory' option of 'push' command
405
#: bzrlib/builtins.py:1128
580
#: bzrlib/builtins.py:1147
406
581
msgid ""
407
"Branch to push from, rather than the one containing the working directory."
582
"The --verbose option will display the revisions pushed using the log_format\n"
583
"configuration option. You can use a different format by overriding it with\n"
584
"-Olog_format=<other_format>."
408
585
msgstr ""
409
586
410
587
# help of 'use-existing-dir' option of 'push' command
411
#: bzrlib/builtins.py:1131
588
#: bzrlib/builtins.py:1161
412
589
msgid ""
413
590
"By default push will fail if the target directory exists, but does not "
414
591
"already have a control directory. This flag will allow push to proceed."
415
592
msgstr ""
416
593
417
594
# help of 'stacked' option of 'push' command
418
#: bzrlib/builtins.py:1136
595
#: bzrlib/builtins.py:1166
419
596
msgid ""
420
597
"Create a stacked branch that references the public location of the parent "
421
598
"branch."
422
599
msgstr ""
423
600
424
601
# help of 'stacked-on' option of 'push' command
425
#: bzrlib/builtins.py:1139
602
#: bzrlib/builtins.py:1169
426
603
msgid ""
427
604
"Create a stacked branch that refers to another branch for the commit "
428
605
"history. Only the work not present in the referenced branch is included in "
429
606
"the branch created."
430
607
msgstr ""
431
608
432
# help of 'strict' option of 'push' command
433
#: bzrlib/builtins.py:1144
434
msgid ""
435
"Refuse to push if there are uncommitted changes in the working tree, --no-"
436
"strict disables the check."
437
msgstr ""
438
439
609
# help of 'no-tree' option of 'push' command
440
#: bzrlib/builtins.py:1147
610
#: bzrlib/builtins.py:1177
441
611
msgid "Don't populate the working tree, even for protocols that support it."
442
612
msgstr ""
443
613
444
#: bzrlib/builtins.py:1212
614
#: bzrlib/builtins.py:1221
615
msgid "Could not determine branch to refer to."
616
msgstr ""
617
618
#: bzrlib/builtins.py:1228 bzrlib/foreign.py:305
619
msgid "No push location known or specified."
620
msgstr ""
621
622
#: bzrlib/builtins.py:1232
623
#, python-format
624
msgid "Using saved push location: %s"
625
msgstr ""
626
627
#: bzrlib/builtins.py:1242
445
628
msgid "Create a new branch that is a copy of an existing branch."
446
629
msgstr ""
447
630
448
#: bzrlib/builtins.py:1214
631
#: bzrlib/builtins.py:1244
449
632
msgid ""
450
633
"If the TO_LOCATION is omitted, the last component of the FROM_LOCATION will\n"
451
634
"be used. In other words, \"branch ../foo/bar\" will attempt to create ./"
456
639
"create ./foo-bar."
457
640
msgstr ""
458
641
459
#: bzrlib/builtins.py:1221
642
#: bzrlib/builtins.py:1251
460
643
msgid ""
461
644
"To retrieve the branch as of a particular revision, supply the --revision\n"
462
645
"parameter, as in \"branch foo/bar -r 5\"."
463
646
msgstr ""
464
647
465
#: bzrlib/builtins.py:1224
648
#: bzrlib/builtins.py:1254
466
649
msgid "The synonyms 'clone' and 'get' for this command are deprecated."
467
650
msgstr ""
468
651
469
652
# help of 'no-tree' option of 'branch' command
470
#: bzrlib/builtins.py:1234
653
#: bzrlib/builtins.py:1264
471
654
msgid "Create a branch without a working-tree."
472
655
msgstr ""
473
656
474
657
# help of 'switch' option of 'branch' command
475
#: bzrlib/builtins.py:1236
658
#: bzrlib/builtins.py:1266
476
659
msgid "Switch the checkout in the current directory to the new branch."
477
660
msgstr ""
478
661
479
662
# help of 'stacked' option of 'branch' command
480
#: bzrlib/builtins.py:1239
663
#: bzrlib/builtins.py:1269
481
664
msgid ""
482
665
"Create a stacked branch referring to the source branch. The new branch will "
483
666
"depend on the availability of the source branch for all operations."
484
667
msgstr ""
485
668
486
669
# help of 'standalone' option of 'branch' command
487
#: bzrlib/builtins.py:1243
670
#: bzrlib/builtins.py:1273
488
671
msgid "Do not use a shared repository, even if available."
489
672
msgstr ""
490
673
491
674
# help of 'use-existing-dir' option of 'branch' command
492
#: bzrlib/builtins.py:1245
675
#: bzrlib/builtins.py:1275
493
676
msgid ""
494
677
"By default branch will fail if the target directory exists, but does not "
495
678
"already have a control directory. This flag will allow branch to proceed."
496
679
msgstr ""
497
680
498
681
# help of 'bind' option of 'branch' command
499
#: bzrlib/builtins.py:1250
682
#: bzrlib/builtins.py:1280
500
683
msgid "Bind new branch to from location."
501
684
msgstr ""
502
685
503
#: bzrlib/builtins.py:1342
686
#: bzrlib/builtins.py:1327
687
#, python-format
688
msgid "Target directory \"%s\" already exists."
689
msgstr ""
690
691
#: bzrlib/builtins.py:1339
692
#, python-format
693
msgid "Parent of \"%s\" does not exist."
694
msgstr ""
695
696
#: bzrlib/builtins.py:1358
697
msgid "The branch {0} has no revision {1}."
698
msgstr ""
699
700
#: bzrlib/builtins.py:1368 bzrlib/push.py:51
701
#, python-format
702
msgid "Created new stacked branch referring to %s."
703
msgstr ""
704
705
#: bzrlib/builtins.py:1372
706
#, python-format
707
msgid "Branched %d revision."
708
msgid_plural "Branched %d revisions."
709
msgstr[0] ""
710
msgstr[1] ""
711
712
#: bzrlib/builtins.py:1377
713
#, python-format
714
msgid "New branch bound to %s"
715
msgstr ""
716
717
#: bzrlib/builtins.py:1382 bzrlib/builtins.py:6121
718
#, python-format
719
msgid "Switched to branch: %s"
720
msgstr ""
721
722
#: bzrlib/builtins.py:1387
504
723
msgid "List the branches available at the current location."
505
724
msgstr ""
506
725
507
#: bzrlib/builtins.py:1344
508
msgid ""
509
"This command will print the names of all the branches at the current "
510
"location."
511
msgstr ""
512
513
#: bzrlib/builtins.py:1359
726
#: bzrlib/builtins.py:1389
727
msgid ""
728
"This command will print the names of all the branches at the current\n"
729
"location."
730
msgstr ""
731
732
# help of 'recursive' option of 'branches' command
733
#: bzrlib/builtins.py:1396
734
msgid ""
735
"Recursively scan for branches rather than just looking in the specified "
736
"location."
737
msgstr ""
738
739
#: bzrlib/builtins.py:1413
740
msgid " (default)\n"
741
msgstr ""
742
743
#: bzrlib/builtins.py:1420
514
744
msgid "Create a new checkout of an existing branch."
515
745
msgstr ""
516
746
517
#: bzrlib/builtins.py:1361
747
#: bzrlib/builtins.py:1422
518
748
msgid ""
519
749
"If BRANCH_LOCATION is omitted, checkout will reconstitute a working tree "
520
750
"for\n"
524
754
"location using SFTP."
525
755
msgstr ""
526
756
527
#: bzrlib/builtins.py:1366
757
#: bzrlib/builtins.py:1427
528
758
msgid ""
529
759
"If the TO_LOCATION is omitted, the last component of the BRANCH_LOCATION "
530
760
"will\n"
536
766
"create ./foo-bar."
537
767
msgstr ""
538
768
539
#: bzrlib/builtins.py:1373
769
#: bzrlib/builtins.py:1434
540
770
msgid ""
541
771
"To retrieve the branch as of a particular revision, supply the --revision\n"
542
772
"parameter, as in \"checkout foo/bar -r 5\". Note that this will be "
547
777
msgstr ""
548
778
549
779
# help of 'lightweight' option of 'checkout' command
550
#: bzrlib/builtins.py:1383
780
#: bzrlib/builtins.py:1444
551
781
msgid ""
552
782
"Perform a lightweight checkout. Lightweight checkouts depend on access to "
553
783
"the branch for every operation. Normal checkouts can perform common "
556
786
msgstr ""
557
787
558
788
# help of 'files-from' option of 'branch' command
559
#: bzrlib/builtins.py:1390
789
#: bzrlib/builtins.py:1451
560
790
msgid "Get file contents from this tree."
561
791
msgstr ""
562
792
563
793
# help of 'hardlink' option of 'branch' command
564
#: bzrlib/builtins.py:1392
794
#: bzrlib/builtins.py:1453
565
795
msgid "Hard-link working tree files where possible."
566
796
msgstr ""
567
797
568
#: bzrlib/builtins.py:1433
798
#: bzrlib/builtins.py:1494
569
799
msgid ""
570
800
"Show list of renamed files.\n"
571
801
" "
572
802
msgstr ""
573
803
574
#: bzrlib/builtins.py:1463
575
msgid "Update a tree to have the latest code committed to its branch."
576
msgstr ""
577
578
#: bzrlib/builtins.py:1465
579
msgid ""
580
"This will perform a merge into the working tree, and may generate\n"
581
"conflicts. If you have any local changes, you will still\n"
582
"need to commit them after the update for the update to be complete."
583
msgstr ""
584
585
#: bzrlib/builtins.py:1469
586
msgid ""
587
"If you want to discard your local changes, you can just do a\n"
588
"'bzr revert' instead of 'bzr commit' after the update."
589
msgstr ""
590
591
#: bzrlib/builtins.py:1472
592
msgid ""
593
"If you want to restore a file that has been removed locally, use\n"
594
"'bzr revert' instead of 'bzr update'."
595
msgstr ""
596
597
#: bzrlib/builtins.py:1475
598
msgid ""
599
"If the tree's branch is bound to a master branch, it will also update\n"
804
#: bzrlib/builtins.py:1524
805
msgid "Update a working tree to a new revision."
806
msgstr ""
807
808
#: bzrlib/builtins.py:1526
809
msgid ""
810
"This will perform a merge of the destination revision (the tip of the\n"
811
"branch, or the specified revision) into the working tree, and then make\n"
812
"that revision the basis revision for the working tree. "
813
msgstr ""
814
815
#: bzrlib/builtins.py:1530
816
msgid ""
817
"You can use this to visit an older revision, or to update a working tree\n"
818
"that is out of date from its branch."
819
msgstr ""
820
821
#: bzrlib/builtins.py:1533
822
msgid ""
823
"If there are any uncommitted changes in the tree, they will be carried\n"
824
"across and remain as uncommitted changes after the update. To discard\n"
825
"these changes, use 'bzr revert'. The uncommitted changes may conflict\n"
826
"with the changes brought in by the change in basis revision."
827
msgstr ""
828
829
#: bzrlib/builtins.py:1538
830
msgid ""
831
"If the tree's branch is bound to a master branch, bzr will also update\n"
600
832
"the branch from the master."
601
833
msgstr ""
602
834
603
#: bzrlib/builtins.py:1556
835
#: bzrlib/builtins.py:1541
836
msgid ""
837
"You cannot update just a single file or directory, because each Bazaar\n"
838
"working tree has just a single basis revision. If you want to restore a\n"
839
"file that has been removed locally, use 'bzr revert' instead of 'bzr\n"
840
"update'. If you want to restore a file to its state in a previous\n"
841
"revision, use 'bzr revert' with a '-r' option, or use 'bzr cat' to write\n"
842
"out the old content of that file to a new location."
843
msgstr ""
844
845
#: bzrlib/builtins.py:1548
846
msgid ""
847
"The 'dir' argument, if given, must be the location of the root of a\n"
848
"working tree to update. By default, the working tree that contains the \n"
849
"current working directory is used."
850
msgstr ""
851
852
#: bzrlib/builtins.py:1564
853
msgid "bzr update --revision takes exactly one revision"
854
msgstr ""
855
856
#: bzrlib/builtins.py:1572
857
msgid "bzr update can only update a whole tree, not a file or subdirectory"
858
msgstr ""
859
860
#: bzrlib/builtins.py:1603
861
msgid "Tree is up to date at revision {0} of branch {1}"
862
msgstr ""
863
864
#: bzrlib/builtins.py:1619
865
#, python-format
866
msgid ""
867
"branch has no revision %s\n"
868
"bzr update --revision only works for a revision in the branch history"
869
msgstr ""
870
871
#: bzrlib/builtins.py:1625
872
msgid "Updated to revision {0} of branch {1}"
873
msgstr ""
874
875
#: bzrlib/builtins.py:1629
876
msgid ""
877
"Your local commits will now show as pending merges with 'bzr status', and "
878
"can be committed with 'bzr commit'."
879
msgstr ""
880
881
#: bzrlib/builtins.py:1638
604
882
msgid "Show information about a working tree, branch or repository."
605
883
msgstr ""
606
884
607
#: bzrlib/builtins.py:1558
885
#: bzrlib/builtins.py:1640
608
886
msgid ""
609
887
"This command will show all known locations and formats associated to the\n"
610
888
"tree, branch or repository."
611
889
msgstr ""
612
890
613
#: bzrlib/builtins.py:1561
891
#: bzrlib/builtins.py:1643
614
892
msgid ""
615
893
"In verbose mode, statistical information is included with each report.\n"
616
894
"To see extended statistic information, use a verbosity level of 2 or\n"
617
895
"higher by specifying the verbose option multiple times, e.g. -vv."
618
896
msgstr ""
619
897
620
#: bzrlib/builtins.py:1565
898
#: bzrlib/builtins.py:1647
621
899
msgid "Branches and working trees will also report any missing revisions."
622
900
msgstr ""
623
901
624
#: bzrlib/builtins.py:1569
902
#: bzrlib/builtins.py:1651
625
903
msgid " Display information on the format and related locations:"
626
904
msgstr ""
627
905
628
#: bzrlib/builtins.py:1571
906
#: bzrlib/builtins.py:1653
629
907
msgid " bzr info"
630
908
msgstr ""
631
909
632
#: bzrlib/builtins.py:1573
910
#: bzrlib/builtins.py:1655
633
911
msgid ""
634
912
" Display the above together with extended format information and\n"
635
913
" basic statistics (like the number of files in the working tree and\n"
636
914
" number of revisions in the branch and repository):"
637
915
msgstr ""
638
916
639
#: bzrlib/builtins.py:1577
917
#: bzrlib/builtins.py:1659
640
918
msgid " bzr info -v"
641
919
msgstr ""
642
920
643
#: bzrlib/builtins.py:1579
921
#: bzrlib/builtins.py:1661
644
922
msgid " Display the above together with number of committers to the branch:"
645
923
msgstr ""
646
924
647
#: bzrlib/builtins.py:1581
925
#: bzrlib/builtins.py:1663
648
926
msgid " bzr info -vv"
649
927
msgstr ""
650
928
651
#: bzrlib/builtins.py:1600
929
#: bzrlib/builtins.py:1682
652
930
msgid "Remove files or directories."
653
931
msgstr ""
654
932
655
#: bzrlib/builtins.py:1602
933
#: bzrlib/builtins.py:1684
656
934
msgid ""
657
935
"This makes Bazaar stop tracking changes to the specified files. Bazaar will\n"
658
936
"delete them if they can easily be recovered using revert otherwise they\n"
662
940
msgstr ""
663
941
664
942
# help of 'new' option of 'remove' command
665
#: bzrlib/builtins.py:1610
943
#: bzrlib/builtins.py:1692
666
944
msgid "Only remove files that have never been committed."
667
945
msgstr ""
668
946
669
947
# help of 'file-deletion-strategy' option of 'remove' command
670
#: bzrlib/builtins.py:1612
948
#: bzrlib/builtins.py:1694
671
949
msgid "The file deletion mode to be used."
672
950
msgstr ""
673
951
674
952
# title of 'file-deletion-strategy' option of 'remove' command
675
#: bzrlib/builtins.py:1613
953
#: bzrlib/builtins.py:1695
676
954
msgid "Deletion Strategy"
677
955
msgstr ""
678
956
679
#: bzrlib/builtins.py:1704
957
# help of 'file-deletion-strategy=safe' option of 'remove' command
958
#: bzrlib/builtins.py:1696
959
msgid "Backup changed files (default)."
960
msgstr ""
961
962
# help of 'file-deletion-strategy=keep' option of 'remove' command
963
#: bzrlib/builtins.py:1697
964
msgid "Delete from bzr but leave the working copy."
965
msgstr ""
966
967
# help of 'file-deletion-strategy=no-backup' option of 'remove' command
968
#: bzrlib/builtins.py:1698
969
msgid "Don't backup changed files."
970
msgstr ""
971
972
# help of 'file-deletion-strategy=force' option of 'remove' command
973
#: bzrlib/builtins.py:1699
974
msgid ""
975
"Delete all the specified files, even if they can not be recovered and even "
976
"if they are non-empty directories. (deprecated, use no-backup)"
977
msgstr ""
978
979
#: bzrlib/builtins.py:1708
980
msgid "(The --force option is deprecated, rather use --no-backup in future.)"
981
msgstr ""
982
983
#: bzrlib/builtins.py:1725
984
msgid "No matching files."
985
msgstr ""
986
987
#: bzrlib/builtins.py:1786
680
988
msgid "Reconcile bzr metadata in a branch."
681
989
msgstr ""
682
990
683
#: bzrlib/builtins.py:1706
991
#: bzrlib/builtins.py:1788
684
992
msgid ""
685
993
"This can correct data mismatches that may have been caused by\n"
686
994
"previous ghost operations or bzr upgrades. You should only\n"
688
996
"advises you to run it."
689
997
msgstr ""
690
998
691
#: bzrlib/builtins.py:1711
999
#: bzrlib/builtins.py:1793
692
1000
msgid ""
693
1001
"If a second branch is provided, cross-branch reconciliation is\n"
694
1002
"also attempted, which will check that data like the tree root\n"
696
1004
"correctly in both branches."
697
1005
msgstr ""
698
1006
699
#: bzrlib/builtins.py:1716
1007
#: bzrlib/builtins.py:1798
700
1008
msgid ""
701
1009
"At the same time it is run it may recompress data resulting in\n"
702
1010
"a potential saving in disk space or performance gain."
703
1011
msgstr ""
704
1012
705
#: bzrlib/builtins.py:1719
1013
#: bzrlib/builtins.py:1801
706
1014
msgid "The branch *MUST* be on a listable system such as local disk or sftp."
707
1015
msgstr ""
708
1016
709
#: bzrlib/builtins.py:1783
1017
# help of 'format=2a' option of 'init' command
1018
#: bzrlib/builtins.py:1868
1019
msgid ""
1020
"Format for the bzr 2.0 series.\n"
1021
"Uses group-compress storage.\n"
1022
"Provides rich roots which are a one-way transition.\n"
1023
msgstr ""
1024
1025
# help of 'format=pack-0.92' option of 'init' command
1026
#: bzrlib/builtins.py:1868
1027
msgid ""
1028
"Pack-based format used in 1.x series. Introduced in 0.92. Interoperates with "
1029
"bzr repositories before 0.92 but cannot be read by bzr < 0.92. "
1030
msgstr ""
1031
1032
# help of 'format=development-colo' option of 'init' command
1033
#: bzrlib/builtins.py:1868
1034
msgid "The 2a format with experimental support for colocated branches.\n"
1035
msgstr ""
1036
1037
#: bzrlib/builtins.py:1869
710
1038
msgid "Make a directory into a versioned branch."
711
1039
msgstr ""
712
1040
713
#: bzrlib/builtins.py:1785
1041
#: bzrlib/builtins.py:1871
714
1042
msgid ""
715
1043
"Use this to create an empty branch, or before importing an\n"
716
1044
"existing project."
717
1045
msgstr ""
718
1046
719
#: bzrlib/builtins.py:1788
1047
#: bzrlib/builtins.py:1874
720
1048
msgid ""
721
1049
"If there is a repository in a parent directory of the location, then\n"
722
1050
"the history of the branch will be stored in the repository. Otherwise\n"
724
1052
"in the .bzr directory."
725
1053
msgstr ""
726
1054
727
#: bzrlib/builtins.py:1793
1055
#: bzrlib/builtins.py:1879
728
1056
msgid ""
729
1057
"If there is already a branch at the location but it has no working tree,\n"
730
1058
"the tree can be populated with 'bzr checkout'."
731
1059
msgstr ""
732
1060
733
#: bzrlib/builtins.py:1796
1061
#: bzrlib/builtins.py:1882
734
1062
msgid "Recipe for importing a tree of files::"
735
1063
msgstr ""
736
1064
737
#: bzrlib/builtins.py:1798
1065
#: bzrlib/builtins.py:1884
738
1066
msgid ""
739
1067
" cd ~/project\n"
740
1068
" bzr init\n"
744
1072
msgstr ""
745
1073
746
1074
# help of 'create-prefix' option of 'init' command
747
#: bzrlib/builtins.py:1809
1075
#: bzrlib/builtins.py:1895
748
1076
msgid "Create the path leading up to the branch if it does not already exist."
749
1077
msgstr ""
750
1078
751
1079
# help of 'format' option of 'init' command
752
#: bzrlib/builtins.py:1812
1080
#: bzrlib/builtins.py:1898
753
1081
msgid "Specify a format for this branch. See \"help formats\"."
754
1082
msgstr ""
755
1083
756
1084
# help of 'append-revisions-only' option of 'init' command
757
#: bzrlib/builtins.py:1820
1085
#: bzrlib/builtins.py:1906
758
1086
msgid "Never change revnos or the existing log. Append revisions to it only."
759
1087
msgstr ""
760
1088
761
1089
# help of 'no-tree' option of 'init' command
762
#: bzrlib/builtins.py:1823
1090
#: bzrlib/builtins.py:1909
763
1091
msgid "Create a branch without a working tree."
764
1092
msgstr ""
765
1093
766
#: bzrlib/builtins.py:1900
1094
#: bzrlib/builtins.py:1929 bzrlib/push.py:108
1095
#, python-format
1096
msgid ""
1097
"Parent directory of %s does not exist.\n"
1098
"You may supply --create-prefix to create all leading parent directories."
1099
msgstr ""
1100
1101
#: bzrlib/builtins.py:1963
1102
msgid ""
1103
"This branch format cannot be set to append-revisions-only. Try --default."
1104
msgstr ""
1105
1106
#: bzrlib/builtins.py:1974
1107
msgid "Created a {0} (format: {1})\n"
1108
msgstr ""
1109
1110
#: bzrlib/builtins.py:1983
1111
#, python-format
1112
msgid "Using shared repository: %s\n"
1113
msgstr ""
1114
1115
#: bzrlib/builtins.py:1987
767
1116
msgid "Create a shared repository for branches to share storage space."
768
1117
msgstr ""
769
1118
770
#: bzrlib/builtins.py:1902
1119
#: bzrlib/builtins.py:1989
771
1120
msgid ""
772
1121
"New branches created under the repository directory will store their\n"
773
1122
"revisions in the repository, not in the branch directory. For branches\n"
775
1124
"speeds up the creation of new branches."
776
1125
msgstr ""
777
1126
778
#: bzrlib/builtins.py:1907
1127
#: bzrlib/builtins.py:1994
779
1128
msgid ""
780
1129
"If the --no-trees option is given then the branches in the repository\n"
781
1130
"will not have working trees by default. They will still exist as \n"
785
1134
"branches, such as on a server."
786
1135
msgstr ""
787
1136
788
#: bzrlib/builtins.py:1914
1137
#: bzrlib/builtins.py:2001
789
1138
msgid ""
790
1139
":Examples:\n"
791
1140
" Create a shared repository holding just branches::"
792
1141
msgstr ""
793
1142
794
#: bzrlib/builtins.py:1917
1143
#: bzrlib/builtins.py:2004
795
1144
msgid ""
796
1145
" bzr init-repo --no-trees repo\n"
797
1146
" bzr init repo/trunk"
798
1147
msgstr ""
799
1148
800
#: bzrlib/builtins.py:1920
1149
#: bzrlib/builtins.py:2007
801
1150
msgid " Make a lightweight checkout elsewhere::"
802
1151
msgstr ""
803
1152
804
#: bzrlib/builtins.py:1922
1153
#: bzrlib/builtins.py:2009
805
1154
msgid ""
806
1155
" bzr checkout --lightweight repo/trunk trunk-checkout\n"
807
1156
" cd trunk-checkout\n"
809
1158
msgstr ""
810
1159
811
1160
# help of 'format' option of 'init-repository' command
812
#: bzrlib/builtins.py:1930
1161
#: bzrlib/builtins.py:2017
813
1162
msgid ""
814
1163
"Specify a format for this repository. See \"bzr help formats\" for details."
815
1164
msgstr ""
816
1165
817
1166
# title of 'format' option of 'init-repository' command
818
#: bzrlib/builtins.py:1934
1167
#: bzrlib/builtins.py:2021
819
1168
msgid "Repository format"
820
1169
msgstr ""
821
1170
822
1171
# help of 'no-trees' option of 'init-repository' command
823
#: bzrlib/builtins.py:1936
1172
#: bzrlib/builtins.py:2023
824
1173
msgid "Branches in the repository will default to not having a working tree."
825
1174
msgstr ""
826
1175
827
#: bzrlib/builtins.py:1960
1176
#: bzrlib/builtins.py:2047
828
1177
msgid "Show differences in the working tree, between revisions or branches."
829
1178
msgstr ""
830
1179
831
#: bzrlib/builtins.py:1962
1180
#: bzrlib/builtins.py:2049
832
1181
msgid ""
833
1182
"If no arguments are given, all changes for the current tree are listed.\n"
834
1183
"If files are given, only the changes in those files are listed.\n"
838
1187
"given."
839
1188
msgstr ""
840
1189
841
#: bzrlib/builtins.py:1969
1190
#: bzrlib/builtins.py:2056
842
1191
msgid ""
843
1192
"\"bzr diff -p1\" is equivalent to \"bzr diff --prefix old/:new/\", and\n"
844
1193
"produces patches suitable for \"patch -p1\"."
845
1194
msgstr ""
846
1195
847
#: bzrlib/builtins.py:1972
1196
#: bzrlib/builtins.py:2059
848
1197
msgid ""
849
1198
"Note that when using the -r argument with a range of revisions, the\n"
850
1199
"differences are computed between the two specified revisions. That\n"
854
1203
"in the range."
855
1204
msgstr ""
856
1205
857
#: bzrlib/builtins.py:1979
1206
#: bzrlib/builtins.py:2066
858
1207
msgid ""
859
1208
":Exit values:\n"
860
1209
" 1 - changed\n"
863
1212
" 0 - no change"
864
1213
msgstr ""
865
1214
866
#: bzrlib/builtins.py:1985
1215
#: bzrlib/builtins.py:2072
867
1216
msgid ""
868
1217
":Examples:\n"
869
1218
" Shows the difference in the working tree versus the last commit::"
870
1219
msgstr ""
871
1220
872
#: bzrlib/builtins.py:1988
1221
#: bzrlib/builtins.py:2075
873
1222
msgid " bzr diff"
874
1223
msgstr ""
875
1224
876
#: bzrlib/builtins.py:1990
1225
#: bzrlib/builtins.py:2077
877
1226
msgid " Difference between the working tree and revision 1::"
878
1227
msgstr ""
879
1228
880
#: bzrlib/builtins.py:1992
1229
#: bzrlib/builtins.py:2079
881
1230
msgid " bzr diff -r1"
882
1231
msgstr ""
883
1232
884
#: bzrlib/builtins.py:1994
1233
#: bzrlib/builtins.py:2081
885
1234
msgid " Difference between revision 3 and revision 1::"
886
1235
msgstr ""
887
1236
888
#: bzrlib/builtins.py:1996
1237
#: bzrlib/builtins.py:2083
889
1238
msgid " bzr diff -r1..3"
890
1239
msgstr ""
891
1240
892
#: bzrlib/builtins.py:1998
1241
#: bzrlib/builtins.py:2085
893
1242
msgid " Difference between revision 3 and revision 1 for branch xxx::"
894
1243
msgstr ""
895
1244
896
#: bzrlib/builtins.py:2000
1245
#: bzrlib/builtins.py:2087
897
1246
msgid " bzr diff -r1..3 xxx"
898
1247
msgstr ""
899
1248
900
#: bzrlib/builtins.py:2002
1249
#: bzrlib/builtins.py:2089
901
1250
msgid " The changes introduced by revision 2 (equivalent to -r1..2)::"
902
1251
msgstr ""
903
1252
904
#: bzrlib/builtins.py:2004
1253
#: bzrlib/builtins.py:2091
905
1254
msgid " bzr diff -c2"
906
1255
msgstr ""
907
1256
908
#: bzrlib/builtins.py:2006
1257
#: bzrlib/builtins.py:2093
909
1258
msgid ""
910
1259
" To see the changes introduced by revision X::\n"
911
1260
" \n"
912
1261
" bzr diff -cX"
913
1262
msgstr ""
914
1263
915
#: bzrlib/builtins.py:2010
1264
#: bzrlib/builtins.py:2097
916
1265
msgid ""
917
1266
" Note that in the case of a merge, the -c option shows the changes\n"
918
1267
" compared to the left hand parent. To see the changes against\n"
919
1268
" another parent, use::"
920
1269
msgstr ""
921
1270
922
#: bzrlib/builtins.py:2014
1271
#: bzrlib/builtins.py:2101
923
1272
msgid " bzr diff -r<chosen_parent>..X"
924
1273
msgstr ""
925
1274
926
#: bzrlib/builtins.py:2016
1275
#: bzrlib/builtins.py:2103
927
1276
msgid ""
928
1277
" The changes between the current revision and the previous revision\n"
929
1278
" (equivalent to -c-1 and -r-2..-1)"
930
1279
msgstr ""
931
1280
932
#: bzrlib/builtins.py:2019
1281
#: bzrlib/builtins.py:2106
933
1282
msgid " bzr diff -r-2.."
934
1283
msgstr ""
935
1284
936
#: bzrlib/builtins.py:2021
1285
#: bzrlib/builtins.py:2108
937
1286
msgid " Show just the differences for file NEWS::"
938
1287
msgstr ""
939
1288
940
#: bzrlib/builtins.py:2023
1289
#: bzrlib/builtins.py:2110
941
1290
msgid " bzr diff NEWS"
942
1291
msgstr ""
943
1292
944
#: bzrlib/builtins.py:2025
1293
#: bzrlib/builtins.py:2112
945
1294
msgid " Show the differences in working tree xxx for file NEWS::"
946
1295
msgstr ""
947
1296
948
#: bzrlib/builtins.py:2027
1297
#: bzrlib/builtins.py:2114
949
1298
msgid " bzr diff xxx/NEWS"
950
1299
msgstr ""
951
1300
952
#: bzrlib/builtins.py:2029
1301
#: bzrlib/builtins.py:2116
953
1302
msgid " Show the differences from branch xxx to this working tree:"
954
1303
msgstr ""
955
1304
956
#: bzrlib/builtins.py:2031
1305
#: bzrlib/builtins.py:2118
957
1306
msgid " bzr diff --old xxx"
958
1307
msgstr ""
959
1308
960
#: bzrlib/builtins.py:2033
1309
#: bzrlib/builtins.py:2120
961
1310
msgid " Show the differences between two branches for file NEWS::"
962
1311
msgstr ""
963
1312
964
#: bzrlib/builtins.py:2035
1313
#: bzrlib/builtins.py:2122
965
1314
msgid " bzr diff --old xxx --new yyy NEWS"
966
1315
msgstr ""
967
1316
968
#: bzrlib/builtins.py:2037
1317
#: bzrlib/builtins.py:2124
969
1318
msgid " Same as 'bzr diff' but prefix paths with old/ and new/::"
970
1319
msgstr ""
971
1320
972
#: bzrlib/builtins.py:2039
1321
#: bzrlib/builtins.py:2126
973
1322
msgid ""
974
1323
" bzr diff --prefix old/:new/\n"
975
1324
" \n"
979
1328
msgstr ""
980
1329
981
1330
# help of 'diff-options' option of 'diff' command
982
#: bzrlib/builtins.py:2049
1331
#: bzrlib/builtins.py:2136
983
1332
msgid "Pass these options to the external diff program."
984
1333
msgstr ""
985
1334
986
1335
# help of 'prefix' option of 'diff' command
987
#: bzrlib/builtins.py:2052
1336
#: bzrlib/builtins.py:2139
988
1337
msgid ""
989
1338
"Set prefixes added to old and new filenames, as two values separated by a "
990
1339
"colon. (eg \"old/:new/\")."
991
1340
msgstr ""
992
1341
993
1342
# help of 'old' option of 'diff' command
994
#: bzrlib/builtins.py:2055
1343
#: bzrlib/builtins.py:2142
995
1344
msgid "Branch/tree to compare from."
996
1345
msgstr ""
997
1346
998
1347
# help of 'new' option of 'diff' command
999
#: bzrlib/builtins.py:2059
1348
#: bzrlib/builtins.py:2146
1000
1349
msgid "Branch/tree to compare to."
1001
1350
msgstr ""
1002
1351
1003
1352
# help of 'using' option of 'diff' command
1004
#: bzrlib/builtins.py:2065
1353
#: bzrlib/builtins.py:2152
1005
1354
msgid "Use this command to compare files."
1006
1355
msgstr ""
1007
1356
1008
1357
# help of 'format' option of 'diff' command
1009
#: bzrlib/builtins.py:2070
1358
#: bzrlib/builtins.py:2157
1010
1359
msgid "Diff format to use."
1011
1360
msgstr ""
1012
1361
1013
1362
# title of 'format' option of 'diff' command
1014
#: bzrlib/builtins.py:2072
1363
#: bzrlib/builtins.py:2159
1015
1364
msgid "Diff format"
1016
1365
msgstr ""
1017
1366
1018
#: bzrlib/builtins.py:2122
1367
#: bzrlib/builtins.py:2181
1368
msgid "--prefix expects two values separated by a colon (eg \"old/:new/\")"
1369
msgstr ""
1370
1371
#: bzrlib/builtins.py:2185
1372
msgid "bzr diff --revision takes exactly one or two revision specifiers"
1373
msgstr ""
1374
1375
#: bzrlib/builtins.py:2190 bzrlib/builtins.py:2588 bzrlib/builtins.py:2601
1376
#: bzrlib/builtins.py:2609 bzrlib/builtins.py:4760
1377
msgid "{0} and {1} are mutually exclusive"
1378
msgstr ""
1379
1380
#: bzrlib/builtins.py:2210
1019
1381
msgid ""
1020
1382
"List files deleted in the working tree.\n"
1021
1383
" "
1022
1384
msgstr ""
1023
1385
1024
#: bzrlib/builtins.py:2200
1386
#: bzrlib/builtins.py:2288
1025
1387
msgid "Show the tree root directory."
1026
1388
msgstr ""
1027
1389
1028
#: bzrlib/builtins.py:2202
1390
#: bzrlib/builtins.py:2290
1029
1391
msgid ""
1030
1392
"The root is the nearest enclosing directory with a .bzr control\n"
1031
1393
"directory."
1032
1394
msgstr ""
1033
1395
1034
#: bzrlib/builtins.py:2230
1396
#: bzrlib/builtins.py:2305
1397
msgid "The limit argument must be an integer."
1398
msgstr ""
1399
1400
#: bzrlib/builtins.py:2313
1401
msgid "The levels argument must be an integer."
1402
msgstr ""
1403
1404
#: bzrlib/builtins.py:2318
1035
1405
msgid "Show historical log for a branch or subset of a branch."
1036
1406
msgstr ""
1037
1407
1038
#: bzrlib/builtins.py:2232
1408
#: bzrlib/builtins.py:2320
1039
1409
msgid ""
1040
1410
"log is bzr's default tool for exploring the history of a branch.\n"
1041
1411
"The branch to use is taken from the first parameter. If no parameters\n"
1043
1413
"Here are some simple examples::"
1044
1414
msgstr ""
1045
1415
1046
#: bzrlib/builtins.py:2237
1416
#: bzrlib/builtins.py:2325
1047
1417
msgid ""
1048
1418
" bzr log log the current branch\n"
1049
1419
" bzr log foo.py log a file in its branch\n"
1050
1420
" bzr log http://server/branch log a branch on a server"
1051
1421
msgstr ""
1052
1422
1053
#: bzrlib/builtins.py:2241
1423
#: bzrlib/builtins.py:2329
1054
1424
msgid ""
1055
1425
"The filtering, ordering and information shown for each revision can\n"
1056
1426
"be controlled as explained below. By default, all revisions are\n"
1060
1430
"were merged."
1061
1431
msgstr ""
1062
1432
1063
#: bzrlib/builtins.py:2248
1433
#: bzrlib/builtins.py:2336
1064
1434
msgid ":Output control:"
1065
1435
msgstr ""
1066
1436
1067
#: bzrlib/builtins.py:2250
1437
#: bzrlib/builtins.py:2338
1068
1438
msgid ""
1069
1439
" The log format controls how information about each revision is\n"
1070
1440
" displayed. The standard log formats are called ``long``, ``short``\n"
1072
1442
" for more details on log formats."
1073
1443
msgstr ""
1074
1444
1075
#: bzrlib/builtins.py:2255
1445
#: bzrlib/builtins.py:2343
1076
1446
msgid ""
1077
1447
" The following options can be used to control what information is\n"
1078
1448
" displayed::"
1079
1449
msgstr ""
1080
1450
1081
#: bzrlib/builtins.py:2258
1451
#: bzrlib/builtins.py:2346
1082
1452
msgid ""
1083
1453
" -l N display a maximum of N revisions\n"
1084
1454
" -n N display N levels of revisions (0 for all, 1 for collapsed)\n"
1087
1457
" --show-ids display revision-ids (and file-ids), not just revnos"
1088
1458
msgstr ""
1089
1459
1090
#: bzrlib/builtins.py:2264
1460
#: bzrlib/builtins.py:2352
1091
1461
msgid ""
1092
1462
" Note that the default number of levels to display is a function of the\n"
1093
1463
" log format. If the -n option is not used, the standard log formats show\n"
1094
1464
" just the top level (mainline)."
1095
1465
msgstr ""
1096
1466
1097
#: bzrlib/builtins.py:2268
1467
#: bzrlib/builtins.py:2356
1098
1468
msgid ""
1099
1469
" Status summaries are shown using status flags like A, M, etc. To see\n"
1100
1470
" the changes explained using words like ``added`` and ``modified``\n"
1101
1471
" instead, use the -vv option."
1102
1472
msgstr ""
1103
1473
1104
#: bzrlib/builtins.py:2272
1474
#: bzrlib/builtins.py:2360
1105
1475
msgid ":Ordering control:"
1106
1476
msgstr ""
1107
1477
1108
#: bzrlib/builtins.py:2274
1478
#: bzrlib/builtins.py:2362
1109
1479
msgid ""
1110
1480
" To display revisions from oldest to newest, use the --forward option.\n"
1111
1481
" In most cases, using this option will have little impact on the total\n"
1113
1483
" display revisions like --reverse does when it can."
1114
1484
msgstr ""
1115
1485
1116
#: bzrlib/builtins.py:2279
1486
#: bzrlib/builtins.py:2367
1117
1487
msgid ":Revision filtering:"
1118
1488
msgstr ""
1119
1489
1120
#: bzrlib/builtins.py:2281
1490
#: bzrlib/builtins.py:2369
1121
1491
msgid ""
1122
1492
" The -r option can be used to specify what revision or range of revisions\n"
1123
1493
" to filter against. The various forms are shown below::"
1124
1494
msgstr ""
1125
1495
1126
#: bzrlib/builtins.py:2284
1496
#: bzrlib/builtins.py:2372
1127
1497
msgid ""
1128
1498
" -rX display revision X\n"
1129
1499
" -rX.. display revision X and later\n"
1131
1501
" -rX..Y display from X to Y inclusive"
1132
1502
msgstr ""
1133
1503
1134
#: bzrlib/builtins.py:2289
1504
#: bzrlib/builtins.py:2377
1135
1505
msgid ""
1136
1506
" See ``bzr help revisionspec`` for details on how to specify X and Y.\n"
1137
1507
" Some common examples are given below::"
1138
1508
msgstr ""
1139
1509
1140
#: bzrlib/builtins.py:2292
1510
#: bzrlib/builtins.py:2380
1141
1511
msgid ""
1142
1512
" -r-1 show just the tip\n"
1143
1513
" -r-10.. show the last 10 mainline revisions\n"
1147
1517
" -rdate:yesterday.. show changes since yesterday"
1148
1518
msgstr ""
1149
1519
1150
#: bzrlib/builtins.py:2299
1520
#: bzrlib/builtins.py:2387
1151
1521
msgid ""
1152
1522
" When logging a range of revisions using -rX..Y, log starts at\n"
1153
1523
" revision Y and searches back in history through the primary\n"
1157
1527
" a nested merge revision and the log will be truncated accordingly."
1158
1528
msgstr ""
1159
1529
1160
#: bzrlib/builtins.py:2306
1530
#: bzrlib/builtins.py:2394
1161
1531
msgid ":Path filtering:"
1162
1532
msgstr ""
1163
1533
1164
#: bzrlib/builtins.py:2308
1534
#: bzrlib/builtins.py:2396
1165
1535
msgid ""
1166
1536
" If parameters are given and the first one is not a branch, the log\n"
1167
1537
" will be filtered to show only those revisions that changed the\n"
1168
1538
" nominated files or directories."
1169
1539
msgstr ""
1170
1540
1171
#: bzrlib/builtins.py:2312
1541
#: bzrlib/builtins.py:2400
1172
1542
msgid ""
1173
1543
" Filenames are interpreted within their historical context. To log a\n"
1174
1544
" deleted file, specify a revision range so that the file existed at\n"
1175
1545
" the end or start of the range."
1176
1546
msgstr ""
1177
1547
1178
#: bzrlib/builtins.py:2316
1548
#: bzrlib/builtins.py:2404
1179
1549
msgid ""
1180
1550
" Historical context is also important when interpreting pathnames of\n"
1181
1551
" renamed files/directories. Consider the following example:"
1182
1552
msgstr ""
1183
1553
1184
#: bzrlib/builtins.py:2319
1554
#: bzrlib/builtins.py:2407
1185
1555
msgid ""
1186
1556
" * revision 1: add tutorial.txt\n"
1187
1557
" * revision 2: modify tutorial.txt\n"
1188
1558
" * revision 3: rename tutorial.txt to guide.txt; add tutorial.txt"
1189
1559
msgstr ""
1190
1560
1191
#: bzrlib/builtins.py:2323
1561
#: bzrlib/builtins.py:2411
1192
1562
msgid " In this case:"
1193
1563
msgstr ""
1194
1564
1195
#: bzrlib/builtins.py:2325
1565
#: bzrlib/builtins.py:2413
1196
1566
msgid " * ``bzr log guide.txt`` will log the file added in revision 1"
1197
1567
msgstr ""
1198
1568
1199
#: bzrlib/builtins.py:2327
1569
#: bzrlib/builtins.py:2415
1200
1570
msgid " * ``bzr log tutorial.txt`` will log the new file added in revision 3"
1201
1571
msgstr ""
1202
1572
1203
#: bzrlib/builtins.py:2329
1573
#: bzrlib/builtins.py:2417
1204
1574
msgid ""
1205
1575
" * ``bzr log -r2 -p tutorial.txt`` will show the changes made to\n"
1206
1576
" the original file in revision 2."
1207
1577
msgstr ""
1208
1578
1209
#: bzrlib/builtins.py:2332
1579
#: bzrlib/builtins.py:2420
1210
1580
msgid ""
1211
1581
" * ``bzr log -r2 -p guide.txt`` will display an error message as there\n"
1212
1582
" was no file called guide.txt in revision 2."
1213
1583
msgstr ""
1214
1584
1215
#: bzrlib/builtins.py:2335
1585
#: bzrlib/builtins.py:2423
1216
1586
msgid ""
1217
1587
" Renames are always followed by log. By design, there is no need to\n"
1218
1588
" explicitly ask for this (and no way to stop logging a file back\n"
1219
1589
" until it was last renamed)."
1220
1590
msgstr ""
1221
1591
1222
#: bzrlib/builtins.py:2339
1592
#: bzrlib/builtins.py:2427
1223
1593
msgid ":Other filtering:"
1224
1594
msgstr ""
1225
1595
1226
#: bzrlib/builtins.py:2341
1596
#: bzrlib/builtins.py:2429
1227
1597
msgid ""
1228
1598
" The --match option can be used for finding revisions that match a\n"
1229
1599
" regular expression in a commit message, committer, author or bug.\n"
1232
1602
" --match-message can be used to only match a specific field."
1233
1603
msgstr ""
1234
1604
1235
#: bzrlib/builtins.py:2347
1605
#: bzrlib/builtins.py:2435
1236
1606
msgid ":Tips & tricks:"
1237
1607
msgstr ""
1238
1608
1239
#: bzrlib/builtins.py:2349
1609
#: bzrlib/builtins.py:2437
1240
1610
msgid ""
1241
1611
" GUI tools and IDEs are often better at exploring history than command\n"
1242
1612
" line tools: you may prefer qlog or viz from qbzr or bzr-gtk, the\n"
1245
1615
" <http://wiki.bazaar.canonical.com/IDEIntegration>. "
1246
1616
msgstr ""
1247
1617
1248
#: bzrlib/builtins.py:2355
1618
#: bzrlib/builtins.py:2443
1249
1619
msgid " You may find it useful to add the aliases below to ``bazaar.conf``::"
1250
1620
msgstr ""
1251
1621
1252
#: bzrlib/builtins.py:2357
1622
#: bzrlib/builtins.py:2445
1253
1623
msgid ""
1254
1624
" [ALIASES]\n"
1255
1625
" tip = log -r-1\n"
1257
1627
" show = log -v -p"
1258
1628
msgstr ""
1259
1629
1260
#: bzrlib/builtins.py:2362
1630
#: bzrlib/builtins.py:2450
1261
1631
msgid ""
1262
1632
" ``bzr tip`` will then show the latest revision while ``bzr top``\n"
1263
1633
" will show the last 10 mainline revisions. To see the details of a\n"
1264
1634
" particular revision X, ``bzr show -rX``."
1265
1635
msgstr ""
1266
1636
1267
#: bzrlib/builtins.py:2366
1637
#: bzrlib/builtins.py:2454
1268
1638
msgid ""
1269
1639
" If you are interested in looking deeper into a particular merge X,\n"
1270
1640
" use ``bzr log -n0 -rX``."
1271
1641
msgstr ""
1272
1642
1273
#: bzrlib/builtins.py:2369
1643
#: bzrlib/builtins.py:2457
1274
1644
msgid ""
1275
1645
" ``bzr log -v`` on a branch with lots of history is currently\n"
1276
1646
" very slow. A fix for this issue is currently under development.\n"
1278
1648
" be given when using the -v option."
1279
1649
msgstr ""
1280
1650
1281
#: bzrlib/builtins.py:2374
1651
#: bzrlib/builtins.py:2462
1282
1652
msgid ""
1283
1653
" bzr has a generic full-text matching plugin, bzr-search, that can be\n"
1284
1654
" used to find revisions matching user names, commit messages, etc.\n"
1286
1656
" a list of words but not others."
1287
1657
msgstr ""
1288
1658
1289
#: bzrlib/builtins.py:2379
1659
#: bzrlib/builtins.py:2467
1290
1660
msgid ""
1291
1661
" When exploring non-mainline history on large projects with deep\n"
1292
1662
" history, the performance of log can be greatly improved by installing\n"
1295
1665
msgstr ""
1296
1666
1297
1667
# help of 'forward' option of 'log' command
1298
#: bzrlib/builtins.py:2388
1668
#: bzrlib/builtins.py:2476
1299
1669
msgid "Show from oldest to newest."
1300
1670
msgstr ""
1301
1671
1302
1672
# help of 'verbose' option of 'log' command
1303
#: bzrlib/builtins.py:2391
1673
#: bzrlib/builtins.py:2479
1304
1674
msgid "Show files changed in each revision."
1305
1675
msgstr ""
1306
1676
1307
1677
# help of 'change' option of 'log' command
1308
#: bzrlib/builtins.py:2397
1678
#: bzrlib/builtins.py:2485
1309
1679
msgid "Show just the specified revision. See also \"help revisionspec\"."
1310
1680
msgstr ""
1311
1681
1312
1682
# help of 'authors' option of 'log' command
1313
#: bzrlib/builtins.py:2401
1683
#: bzrlib/builtins.py:2489
1314
1684
msgid "What names to list as authors - first, all or committer."
1315
1685
msgstr ""
1316
1686
1317
1687
# title of 'authors' option of 'log' command
1318
#: bzrlib/builtins.py:2402
1688
#: bzrlib/builtins.py:2490
1319
1689
msgid "Authors"
1320
1690
msgstr ""
1321
1691
1322
1692
# help of 'levels' option of 'log' command
1323
#: bzrlib/builtins.py:2407
1693
#: bzrlib/builtins.py:2495
1324
1694
msgid "Number of levels to display - 0 for all, 1 for flat."
1325
1695
msgstr ""
1326
1696
1327
1697
# help of 'limit' option of 'log' command
1328
#: bzrlib/builtins.py:2417
1698
#: bzrlib/builtins.py:2505
1329
1699
msgid "Limit the output to the first N revisions."
1330
1700
msgstr ""
1331
1701
1332
1702
# help of 'show-diff' option of 'log' command
1333
#: bzrlib/builtins.py:2422
1703
#: bzrlib/builtins.py:2510
1334
1704
msgid "Show changes made in each revision as a patch."
1335
1705
msgstr ""
1336
1706
1337
# help of 'include-merges' option of 'log' command
1338
#: bzrlib/builtins.py:2424
1707
# help of 'include-merged' option of 'log' command
1708
#: bzrlib/builtins.py:2512
1339
1709
msgid "Show merged revisions like --levels 0 does."
1340
1710
msgstr ""
1341
1711
1712
# help of 'omit-merges' option of 'log' command
1713
#: bzrlib/builtins.py:2516
1714
msgid "Do not report commits with more than one parent."
1715
msgstr ""
1716
1342
1717
# help of 'exclude-common-ancestry' option of 'log' command
1343
#: bzrlib/builtins.py:2426
1718
#: bzrlib/builtins.py:2518
1344
1719
msgid ""
1345
1720
"Display only the revisions that are not part of both ancestries (require -"
1346
"rX..Y)"
1721
"rX..Y)."
1347
1722
msgstr ""
1348
1723
1349
1724
# help of 'signatures' option of 'log' command
1350
#: bzrlib/builtins.py:2430
1351
msgid "Show digital signature validity"
1725
#: bzrlib/builtins.py:2522
1726
msgid "Show digital signature validity."
1352
1727
msgstr ""
1353
1728
1354
1729
# help of 'match' option of 'log' command
1355
#: bzrlib/builtins.py:2433
1730
#: bzrlib/builtins.py:2525
1356
1731
msgid "Show revisions whose properties match this expression."
1357
1732
msgstr ""
1358
1733
1359
1734
# help of 'match-message' option of 'log' command
1360
#: bzrlib/builtins.py:2437
1735
#: bzrlib/builtins.py:2529
1361
1736
msgid "Show revisions whose message matches this expression."
1362
1737
msgstr ""
1363
1738
1364
1739
# help of 'match-committer' option of 'log' command
1365
#: bzrlib/builtins.py:2441
1740
#: bzrlib/builtins.py:2533
1366
1741
msgid "Show revisions whose committer matches this expression."
1367
1742
msgstr ""
1368
1743
1369
1744
# help of 'match-author' option of 'log' command
1370
#: bzrlib/builtins.py:2445
1745
#: bzrlib/builtins.py:2537
1371
1746
msgid "Show revisions whose authors match this expression."
1372
1747
msgstr ""
1373
1748
1374
1749
# help of 'match-bugs' option of 'log' command
1375
#: bzrlib/builtins.py:2449
1750
#: bzrlib/builtins.py:2541
1376
1751
msgid "Show revisions whose bugs match this expression."
1377
1752
msgstr ""
1378
1753
1379
#: bzrlib/builtins.py:2690
1754
#: bzrlib/builtins.py:2595
1755
msgid "--exclude-common-ancestry requires -r with two revisions"
1756
msgstr ""
1757
1758
#: bzrlib/builtins.py:2623
1759
#, python-format
1760
msgid "Path unknown at end or start of revision range: %s"
1761
msgstr ""
1762
1763
#: bzrlib/builtins.py:2740
1764
#, python-format
1765
msgid "bzr %s doesn't accept two revisions in different branches."
1766
msgstr ""
1767
1768
#: bzrlib/builtins.py:2756
1769
#, python-format
1770
msgid "bzr %s --revision takes one or two values."
1771
msgstr ""
1772
1773
#: bzrlib/builtins.py:2801
1380
1774
msgid ""
1381
1775
"List files in a tree.\n"
1382
1776
" "
1383
1777
msgstr ""
1384
1778
1385
1779
# help of 'recursive' option of 'ls' command
1386
#: bzrlib/builtins.py:2699
1780
#: bzrlib/builtins.py:2810
1387
1781
msgid "Recurse into subdirectories."
1388
1782
msgstr ""
1389
1783
1390
1784
# help of 'from-root' option of 'ls' command
1391
#: bzrlib/builtins.py:2701
1785
#: bzrlib/builtins.py:2812
1392
1786
msgid "Print paths relative to the root of the branch."
1393
1787
msgstr ""
1394
1788
1395
1789
# help of 'unknown' option of 'ls' command
1396
#: bzrlib/builtins.py:2703
1790
#: bzrlib/builtins.py:2814
1397
1791
msgid "Print unknown files."
1398
1792
msgstr ""
1399
1793
1400
1794
# help of 'versioned' option of 'ls' command
1401
#: bzrlib/builtins.py:2704
1795
#: bzrlib/builtins.py:2815
1402
1796
msgid "Print versioned files."
1403
1797
msgstr ""
1404
1798
1405
1799
# help of 'ignored' option of 'ls' command
1406
#: bzrlib/builtins.py:2707
1800
#: bzrlib/builtins.py:2818
1407
1801
msgid "Print ignored files."
1408
1802
msgstr ""
1409
1803
1410
1804
# help of 'kind' option of 'ls' command
1411
#: bzrlib/builtins.py:2709
1805
#: bzrlib/builtins.py:2820
1412
1806
msgid "List entries of a particular kind: file, directory, symlink."
1413
1807
msgstr ""
1414
1808
1415
#: bzrlib/builtins.py:2821
1809
#: bzrlib/builtins.py:2833
1810
msgid "invalid kind specified"
1811
msgstr ""
1812
1813
#: bzrlib/builtins.py:2836
1814
msgid "Cannot set both --verbose and --null"
1815
msgstr ""
1816
1817
#: bzrlib/builtins.py:2845
1818
msgid "cannot specify both --from-root and PATH"
1819
msgstr ""
1820
1821
#: bzrlib/builtins.py:2932
1416
1822
msgid "Ignore specified files or patterns."
1417
1823
msgstr ""
1418
1824
1419
#: bzrlib/builtins.py:2823
1825
#: bzrlib/builtins.py:2934
1420
1826
msgid "See ``bzr help patterns`` for details on the syntax of patterns."
1421
1827
msgstr ""
1422
1828
1423
#: bzrlib/builtins.py:2825
1829
#: bzrlib/builtins.py:2936
1424
1830
msgid ""
1425
1831
"If a .bzrignore file does not exist, the ignore command\n"
1426
1832
"will create one and add the specified files or patterns to the newly\n"
1429
1835
"the use of the ignore command will require an explicit add command."
1430
1836
msgstr ""
1431
1837
1432
#: bzrlib/builtins.py:2831
1838
#: bzrlib/builtins.py:2942
1433
1839
msgid ""
1434
1840
"To remove patterns from the ignore list, edit the .bzrignore file.\n"
1435
1841
"After adding, editing or deleting that file either indirectly by\n"
1437
1843
"it."
1438
1844
msgstr ""
1439
1845
1440
#: bzrlib/builtins.py:2836
1846
#: bzrlib/builtins.py:2947
1441
1847
msgid ""
1442
1848
"Bazaar also supports a global ignore file ~/.bazaar/ignore. On Windows\n"
1443
1849
"the global ignore file can be found in the application data directory as\n"
1446
1852
"can be edited directly using an editor."
1447
1853
msgstr ""
1448
1854
1449
#: bzrlib/builtins.py:2842
1855
#: bzrlib/builtins.py:2953
1450
1856
msgid ""
1451
1857
"Patterns prefixed with '!' are exceptions to ignore patterns and take\n"
1452
1858
"precedence over regular ignores. Such exceptions are used to specify\n"
1453
1859
"files that should be versioned which would otherwise be ignored."
1454
1860
msgstr ""
1455
1861
1456
#: bzrlib/builtins.py:2846
1862
#: bzrlib/builtins.py:2957
1457
1863
msgid ""
1458
1864
"Patterns prefixed with '!!' act as regular ignore patterns, but have\n"
1459
1865
"precedence over the '!' exception patterns."
1460
1866
msgstr ""
1461
1867
1462
#: bzrlib/builtins.py:2849
1868
#: bzrlib/builtins.py:2960
1463
1869
msgid ""
1464
1870
":Notes: \n"
1465
1871
" \n"
1467
1873
" the shell on Unix."
1468
1874
msgstr ""
1469
1875
1470
#: bzrlib/builtins.py:2854
1876
#: bzrlib/builtins.py:2965
1471
1877
msgid ""
1472
1878
"* Ignore patterns starting with \"#\" act as comments in the ignore file.\n"
1473
1879
" To ignore patterns that begin with that character, use the \"RE:\" prefix."
1474
1880
msgstr ""
1475
1881
1476
#: bzrlib/builtins.py:2857
1882
#: bzrlib/builtins.py:2968
1477
1883
msgid ""
1478
1884
":Examples:\n"
1479
1885
" Ignore the top level Makefile::"
1480
1886
msgstr ""
1481
1887
1482
#: bzrlib/builtins.py:2860
1888
#: bzrlib/builtins.py:2971
1483
1889
msgid " bzr ignore ./Makefile"
1484
1890
msgstr ""
1485
1891
1486
#: bzrlib/builtins.py:2862
1892
#: bzrlib/builtins.py:2973
1487
1893
msgid " Ignore .class files in all directories...::"
1488
1894
msgstr ""
1489
1895
1490
#: bzrlib/builtins.py:2864
1896
#: bzrlib/builtins.py:2975
1491
1897
msgid " bzr ignore \"*.class\""
1492
1898
msgstr ""
1493
1899
1494
#: bzrlib/builtins.py:2866
1900
#: bzrlib/builtins.py:2977
1495
1901
msgid " ...but do not ignore \"special.class\"::"
1496
1902
msgstr ""
1497
1903
1498
#: bzrlib/builtins.py:2868
1904
#: bzrlib/builtins.py:2979
1499
1905
msgid " bzr ignore \"!special.class\""
1500
1906
msgstr ""
1501
1907
1502
#: bzrlib/builtins.py:2870
1908
#: bzrlib/builtins.py:2981
1503
1909
msgid " Ignore files whose name begins with the \"#\" character::"
1504
1910
msgstr ""
1505
1911
1506
#: bzrlib/builtins.py:2872
1912
#: bzrlib/builtins.py:2983
1507
1913
msgid " bzr ignore \"RE:^#\""
1508
1914
msgstr ""
1509
1915
1510
#: bzrlib/builtins.py:2874
1916
#: bzrlib/builtins.py:2985
1511
1917
msgid " Ignore .o files under the lib directory::"
1512
1918
msgstr ""
1513
1919
1514
#: bzrlib/builtins.py:2876
1920
#: bzrlib/builtins.py:2987
1515
1921
msgid " bzr ignore \"lib/**/*.o\""
1516
1922
msgstr ""
1517
1923
1518
#: bzrlib/builtins.py:2880
1924
#: bzrlib/builtins.py:2991
1519
1925
msgid " bzr ignore \"RE:lib/.*\\.o\""
1520
1926
msgstr ""
1521
1927
1522
#: bzrlib/builtins.py:2882
1928
#: bzrlib/builtins.py:2993
1523
1929
msgid " Ignore everything but the \"debian\" toplevel directory::"
1524
1930
msgstr ""
1525
1931
1526
#: bzrlib/builtins.py:2884
1932
#: bzrlib/builtins.py:2995
1527
1933
msgid ""
1528
1934
" bzr ignore \"RE:(?!debian/).*\"\n"
1529
1935
" \n"
1536
1942
msgstr ""
1537
1943
1538
1944
# help of 'default-rules' option of 'ignore' command
1539
#: bzrlib/builtins.py:2898
1945
#: bzrlib/builtins.py:3009
1540
1946
msgid "Display the default ignore rules that bzr uses."
1541
1947
msgstr ""
1542
1948
1543
#: bzrlib/builtins.py:2946
1949
#: bzrlib/builtins.py:3021
1950
msgid "ignore requires at least one NAME_PATTERN or --default-rules."
1951
msgstr ""
1952
1953
#: bzrlib/builtins.py:3032
1954
#, python-format
1955
msgid "Invalid ignore pattern found. %s"
1956
msgid_plural "Invalid ignore patterns found. %s"
1957
msgstr[0] ""
1958
msgstr[1] ""
1959
1960
#: bzrlib/builtins.py:3041
1961
msgid "NAME_PATTERN should not be an absolute path"
1962
msgstr ""
1963
1964
#: bzrlib/builtins.py:3054
1965
#, python-format
1966
msgid ""
1967
"Warning: the following files are version controlled and match your ignore "
1968
"pattern:\n"
1969
"%s\n"
1970
"These files will continue to be version controlled unless you 'bzr remove' "
1971
"them.\n"
1972
msgstr ""
1973
1974
#: bzrlib/builtins.py:3061
1544
1975
msgid "List ignored files and the patterns that matched them."
1545
1976
msgstr ""
1546
1977
1547
#: bzrlib/builtins.py:2948
1978
#: bzrlib/builtins.py:3063
1548
1979
msgid ""
1549
1980
"List all the ignored files and the ignore pattern that caused the file to\n"
1550
1981
"be ignored."
1551
1982
msgstr ""
1552
1983
1553
#: bzrlib/builtins.py:2951
1984
#: bzrlib/builtins.py:3066
1554
1985
msgid "Alternatively, to list just the files::"
1555
1986
msgstr ""
1556
1987
1557
#: bzrlib/builtins.py:2953
1988
#: bzrlib/builtins.py:3068
1558
1989
msgid " bzr ls --ignored"
1559
1990
msgstr ""
1560
1991
1561
#: bzrlib/builtins.py:2994
1992
#: bzrlib/builtins.py:3102
1993
#, python-format
1994
msgid "not a valid revision-number: %r"
1995
msgstr ""
1996
1997
#: bzrlib/builtins.py:3109
1562
1998
msgid "Export current or past revision to a destination directory or archive."
1563
1999
msgstr ""
1564
2000
1565
#: bzrlib/builtins.py:2996
2001
#: bzrlib/builtins.py:3111
1566
2002
msgid "If no revision is specified this exports the last committed revision."
1567
2003
msgstr ""
1568
2004
1569
#: bzrlib/builtins.py:2998
2005
#: bzrlib/builtins.py:3113
1570
2006
msgid ""
1571
2007
"Format may be an \"exporter\" name, such as tar, tgz, tbz2. If none is\n"
1572
2008
"given, try to find the format with the extension. If no extension\n"
1573
2009
"is found exports to a directory (equivalent to --format=dir)."
1574
2010
msgstr ""
1575
2011
1576
#: bzrlib/builtins.py:3002
2012
#: bzrlib/builtins.py:3117
1577
2013
msgid ""
1578
2014
"If root is supplied, it will be used as the root directory inside\n"
1579
2015
"container formats (tar, zip, etc). If it is not supplied it will default\n"
1580
2016
"to the exported filename. The root option has no effect for 'dir' format."
1581
2017
msgstr ""
1582
2018
1583
#: bzrlib/builtins.py:3006
2019
#: bzrlib/builtins.py:3121
1584
2020
msgid ""
1585
2021
"If branch is omitted then the branch containing the current working\n"
1586
2022
"directory will be used."
1587
2023
msgstr ""
1588
2024
1589
#: bzrlib/builtins.py:3009
2025
#: bzrlib/builtins.py:3124
1590
2026
msgid "Note: Export of tree with non-ASCII filenames to zip is not supported."
1591
2027
msgstr ""
1592
2028
1593
#: bzrlib/builtins.py:3011
2029
#: bzrlib/builtins.py:3126
1594
2030
msgid ""
1595
2031
" ================= =========================\n"
1596
2032
" Supported formats Autodetected by extension\n"
1604
2040
msgstr ""
1605
2041
1606
2042
# help of 'format' option of 'export' command
1607
#: bzrlib/builtins.py:3025
2043
#: bzrlib/builtins.py:3140
1608
2044
msgid "Type of file to export to."
1609
2045
msgstr ""
1610
2046
1611
2047
# help of 'filters' option of 'export' command
1612
#: bzrlib/builtins.py:3028
2048
#: bzrlib/builtins.py:3143
1613
2049
msgid "Apply content filters to export the convenient form."
1614
2050
msgstr ""
1615
2051
1616
2052
# help of 'root' option of 'export' command
1617
#: bzrlib/builtins.py:3032
2053
#: bzrlib/builtins.py:3147
1618
2054
msgid "Name of the root directory inside the exported file."
1619
2055
msgstr ""
1620
2056
1621
2057
# help of 'per-file-timestamps' option of 'export' command
1622
#: bzrlib/builtins.py:3034
2058
#: bzrlib/builtins.py:3149
1623
2059
msgid ""
1624
2060
"Set modification time of files to that of the last revision in which it was "
1625
2061
"changed."
1626
2062
msgstr ""
1627
2063
1628
#: bzrlib/builtins.py:3058
2064
# help of 'uncommitted' option of 'export' command
2065
#: bzrlib/builtins.py:3152
2066
msgid "Export the working tree contents rather than that of the last revision."
2067
msgstr ""
2068
2069
#: bzrlib/builtins.py:3171
2070
msgid "--uncommitted requires a working tree"
2071
msgstr ""
2072
2073
#: bzrlib/builtins.py:3180
2074
#, python-format
2075
msgid "Unsupported export format: %s"
2076
msgstr ""
2077
2078
#: bzrlib/builtins.py:3184
1629
2079
msgid "Write the contents of a file as of a given revision to standard output."
1630
2080
msgstr ""
1631
2081
1632
#: bzrlib/builtins.py:3060
2082
#: bzrlib/builtins.py:3186
1633
2083
msgid "If no revision is nominated, the last revision is used."
1634
2084
msgstr ""
1635
2085
1636
#: bzrlib/builtins.py:3062
2086
#: bzrlib/builtins.py:3188
1637
2087
msgid ""
1638
2088
"Note: Take care to redirect standard output when using this command on a\n"
1639
2089
"binary file."
1640
2090
msgstr ""
1641
2091
2092
# help of 'name-from-revision' option of 'cat' command
2093
#: bzrlib/builtins.py:3194
2094
msgid "The path name in the old tree."
2095
msgstr ""
2096
1642
2097
# help of 'filters' option of 'cat' command
1643
#: bzrlib/builtins.py:3069
2098
#: bzrlib/builtins.py:3195
1644
2099
msgid "Apply content filters to display the convenience form."
1645
2100
msgstr ""
1646
2101
1647
#: bzrlib/builtins.py:3140
2102
#: bzrlib/builtins.py:3206
2103
msgid "bzr cat --revision takes exactly one revision specifier"
2104
msgstr ""
2105
2106
#: bzrlib/builtins.py:3231 bzrlib/builtins.py:3243
2107
msgid "{0!r} is not present in revision {1}"
2108
msgstr ""
2109
2110
#: bzrlib/builtins.py:3266
1648
2111
msgid "Commit changes into a new revision."
1649
2112
msgstr ""
1650
2113
1651
#: bzrlib/builtins.py:3142
2114
#: bzrlib/builtins.py:3268
1652
2115
msgid ""
1653
2116
"An explanatory message needs to be given for each commit. This is\n"
1654
2117
"often done by using the --message option (getting the message from the\n"
1658
2121
"boilerplate text loaded into the editor, use the --show-diff option."
1659
2122
msgstr ""
1660
2123
1661
#: bzrlib/builtins.py:3149
2124
#: bzrlib/builtins.py:3275
1662
2125
msgid ""
1663
2126
"By default, the entire tree is committed and the person doing the\n"
1664
2127
"commit is assumed to be the author. These defaults can be overridden\n"
1665
2128
"as explained below."
1666
2129
msgstr ""
1667
2130
1668
#: bzrlib/builtins.py:3153
2131
#: bzrlib/builtins.py:3279
1669
2132
msgid ":Selective commits:"
1670
2133
msgstr ""
1671
2134
1672
#: bzrlib/builtins.py:3155
2135
#: bzrlib/builtins.py:3281
1673
2136
msgid ""
1674
2137
" If selected files are specified, only changes to those files are\n"
1675
2138
" committed. If a directory is specified then the directory and\n"
1676
2139
" everything within it is committed."
1677
2140
msgstr ""
1678
2141
1679
#: bzrlib/builtins.py:3159
2142
#: bzrlib/builtins.py:3285
1680
2143
msgid ""
1681
2144
" When excludes are given, they take precedence over selected files.\n"
1682
2145
" For example, to commit only changes within foo, but not changes\n"
1683
2146
" within foo/bar::"
1684
2147
msgstr ""
1685
2148
1686
#: bzrlib/builtins.py:3163
2149
#: bzrlib/builtins.py:3289
1687
2150
msgid " bzr commit foo -x foo/bar"
1688
2151
msgstr ""
1689
2152
1690
#: bzrlib/builtins.py:3165
2153
#: bzrlib/builtins.py:3291
1691
2154
msgid " A selective commit after a merge is not yet supported."
1692
2155
msgstr ""
1693
2156
1694
#: bzrlib/builtins.py:3167
2157
#: bzrlib/builtins.py:3293
1695
2158
msgid ":Custom authors:"
1696
2159
msgstr ""
1697
2160
1698
#: bzrlib/builtins.py:3169
2161
#: bzrlib/builtins.py:3295
1699
2162
msgid ""
1700
2163
" If the author of the change is not the same person as the committer,\n"
1701
2164
" you can specify the author's name using the --author option. The\n"
1705
2168
" author."
1706
2169
msgstr ""
1707
2170
1708
#: bzrlib/builtins.py:3176
2171
#: bzrlib/builtins.py:3302
1709
2172
msgid ":Checks:"
1710
2173
msgstr ""
1711
2174
1712
#: bzrlib/builtins.py:3178
2175
#: bzrlib/builtins.py:3304
1713
2176
msgid ""
1714
2177
" A common mistake is to forget to add a new file or directory before\n"
1715
2178
" running the commit command. The --strict option checks for unknown\n"
1718
2181
" for details."
1719
2182
msgstr ""
1720
2183
1721
#: bzrlib/builtins.py:3184
2184
#: bzrlib/builtins.py:3310
1722
2185
msgid ":Things to note:"
1723
2186
msgstr ""
1724
2187
1725
#: bzrlib/builtins.py:3186
2188
#: bzrlib/builtins.py:3312
1726
2189
msgid ""
1727
2190
" If you accidentially commit the wrong changes or make a spelling\n"
1728
2191
" mistake in the commit message say, you can use the uncommit command\n"
1729
2192
" to undo it. See ``bzr help uncommit`` for details."
1730
2193
msgstr ""
1731
2194
1732
#: bzrlib/builtins.py:3190
2195
#: bzrlib/builtins.py:3316
1733
2196
msgid ""
1734
2197
" Hooks can also be configured to run after a commit. This allows you\n"
1735
2198
" to trigger updates to external systems like bug trackers. The --fixes\n"
1738
2201
msgstr ""
1739
2202
1740
2203
# help of 'exclude' option of 'commit' command
1741
#: bzrlib/builtins.py:3200
2204
#: bzrlib/builtins.py:3326
1742
2205
msgid "Do not consider changes made to a given path."
1743
2206
msgstr ""
1744
2207
1745
2208
# help of 'message' option of 'commit' command
1746
#: bzrlib/builtins.py:3203
2209
#: bzrlib/builtins.py:3329
1747
2210
msgid "Description of the new revision."
1748
2211
msgstr ""
1749
2212
1750
2213
# help of 'unchanged' option of 'commit' command
1751
#: bzrlib/builtins.py:3206
2214
#: bzrlib/builtins.py:3332
1752
2215
msgid "Commit even if nothing has changed."
1753
2216
msgstr ""
1754
2217
1755
2218
# help of 'file' option of 'commit' command
1756
#: bzrlib/builtins.py:3210
2219
#: bzrlib/builtins.py:3336
1757
2220
msgid "Take commit message from this file."
1758
2221
msgstr ""
1759
2222
1760
2223
# help of 'strict' option of 'commit' command
1761
#: bzrlib/builtins.py:3212
2224
#: bzrlib/builtins.py:3338
1762
2225
msgid "Refuse to commit if there are unknown files in the working tree."
1763
2226
msgstr ""
1764
2227
1765
2228
# help of 'commit-time' option of 'commit' command
1766
#: bzrlib/builtins.py:3215
2229
#: bzrlib/builtins.py:3341
1767
2230
msgid ""
1768
2231
"Manually set a commit time using commit date format, e.g. '2009-10-10 "
1769
2232
"08:00:00 +0100'."
1770
2233
msgstr ""
1771
2234
1772
2235
# help of 'fixes' option of 'commit' command
1773
#: bzrlib/builtins.py:3218
2236
#: bzrlib/builtins.py:3344
1774
2237
msgid "Mark a bug as being fixed by this revision (see \"bzr help bugs\")."
1775
2238
msgstr ""
1776
2239
1777
2240
# help of 'author' option of 'commit' command
1778
#: bzrlib/builtins.py:3221
2241
#: bzrlib/builtins.py:3347
1779
2242
msgid "Set the author's name, if it's different from the committer."
1780
2243
msgstr ""
1781
2244
1782
2245
# help of 'local' option of 'commit' command
1783
#: bzrlib/builtins.py:3224
2246
#: bzrlib/builtins.py:3350
1784
2247
msgid ""
1785
2248
"Perform a local commit in a bound branch. Local commits are not pushed to "
1786
2249
"the master branch until a normal commit is performed."
1787
2250
msgstr ""
1788
2251
1789
2252
# help of 'show-diff' option of 'commit' command
1790
#: bzrlib/builtins.py:3230
2253
#: bzrlib/builtins.py:3356
1791
2254
msgid ""
1792
2255
"When no message is supplied, show the diff along with the status summary in "
1793
2256
"the message editor."
1794
2257
msgstr ""
1795
2258
1796
2259
# help of 'lossy' option of 'commit' command
1797
#: bzrlib/builtins.py:3233
2260
#: bzrlib/builtins.py:3359
1798
2261
msgid ""
1799
2262
"When committing to a foreign version control system do not push data that "
1800
2263
"can not be natively represented."
1801
2264
msgstr ""
1802
2265
1803
#: bzrlib/builtins.py:3391
2266
#: bzrlib/builtins.py:3377
2267
#, python-format
2268
msgid ""
2269
"No tracker specified for bug %s. Use the form 'tracker:id' or specify a "
2270
"default bug tracker using the `bugtracker` option.\n"
2271
"See \"bzr help bugs\" for more information on this feature. Commit refused."
2272
msgstr ""
2273
2274
#: bzrlib/builtins.py:3386
2275
#, python-format
2276
msgid ""
2277
"Invalid bug %s. Must be in the form of 'tracker:id'. See \"bzr help bugs\" "
2278
"for more information on this feature.\n"
2279
"Commit refused."
2280
msgstr ""
2281
2282
#: bzrlib/builtins.py:3395
2283
#, python-format
2284
msgid "Unrecognized bug %s. Commit refused."
2285
msgstr ""
2286
2287
#: bzrlib/builtins.py:3398
2288
#, python-format
2289
msgid ""
2290
"%s\n"
2291
"Commit refused."
2292
msgstr ""
2293
2294
#: bzrlib/builtins.py:3422
2295
msgid "Could not parse --commit-time: "
2296
msgstr ""
2297
2298
#: bzrlib/builtins.py:3462
2299
msgid "please specify either --message or --file"
2300
msgstr ""
2301
2302
#: bzrlib/builtins.py:3491
2303
msgid "please specify a commit message with either --message or --file"
2304
msgstr ""
2305
2306
#: bzrlib/builtins.py:3494
2307
msgid ""
2308
"Empty commit message specified. Please specify a commit message with either "
2309
"--message or --file or leave a blank message with --message \"\"."
2310
msgstr ""
2311
2312
#: bzrlib/builtins.py:3514
2313
msgid ""
2314
"No changes to commit. Please 'bzr add' the files you want to commit, or use "
2315
"--unchanged to force an empty commit."
2316
msgstr ""
2317
2318
#: bzrlib/builtins.py:3518
2319
msgid ""
2320
"Conflicts detected in working tree. Use \"bzr conflicts\" to list, \"bzr "
2321
"resolve FILE\" to resolve."
2322
msgstr ""
2323
2324
#: bzrlib/builtins.py:3522
2325
msgid "Commit refused because there are unknown files in the working tree."
2326
msgstr ""
2327
2328
#: bzrlib/builtins.py:3525
2329
msgid ""
2330
"\n"
2331
"To commit to master branch, run update and then commit.\n"
2332
"You can also pass --local to commit to continue working disconnected."
2333
msgstr ""
2334
2335
#: bzrlib/builtins.py:3533
1804
2336
msgid ""
1805
2337
"Validate working tree structure, branch consistency and repository history."
1806
2338
msgstr ""
1807
2339
1808
#: bzrlib/builtins.py:3393
2340
#: bzrlib/builtins.py:3535
1809
2341
msgid ""
1810
2342
"This command checks various invariants about branch and repository storage\n"
1811
2343
"to detect data corruption or bzr bugs."
1812
2344
msgstr ""
1813
2345
1814
#: bzrlib/builtins.py:3396
2346
#: bzrlib/builtins.py:3538
1815
2347
msgid ""
1816
2348
"The working tree and branch checks will only give output if a problem is\n"
1817
2349
"detected. The output fields of the repository check are:"
1818
2350
msgstr ""
1819
2351
1820
#: bzrlib/builtins.py:3399
2352
#: bzrlib/builtins.py:3541
1821
2353
msgid ""
1822
2354
"revisions\n"
1823
2355
" This is just the number of revisions checked. It doesn't\n"
1824
2356
" indicate a problem."
1825
2357
msgstr ""
1826
2358
1827
#: bzrlib/builtins.py:3403
2359
#: bzrlib/builtins.py:3545
1828
2360
msgid ""
1829
2361
"versionedfiles\n"
1830
2362
" This is just the number of versionedfiles checked. It\n"
1831
2363
" doesn't indicate a problem."
1832
2364
msgstr ""
1833
2365
1834
#: bzrlib/builtins.py:3407
2366
#: bzrlib/builtins.py:3549
1835
2367
msgid ""
1836
2368
"unreferenced ancestors\n"
1837
2369
" Texts that are ancestors of other texts, but\n"
1839
2371
" subtle problem that Bazaar can work around."
1840
2372
msgstr ""
1841
2373
1842
#: bzrlib/builtins.py:3412
2374
#: bzrlib/builtins.py:3554
1843
2375
msgid ""
1844
2376
"unique file texts\n"
1845
2377
" This is the total number of unique file contents\n"
1846
2378
" seen in the checked revisions. It does not indicate a problem."
1847
2379
msgstr ""
1848
2380
1849
#: bzrlib/builtins.py:3416
2381
#: bzrlib/builtins.py:3558
1850
2382
msgid ""
1851
2383
"repeated file texts\n"
1852
2384
" This is the total number of repeated texts seen\n"
1855
2387
" indicate a problem."
1856
2388
msgstr ""
1857
2389
1858
#: bzrlib/builtins.py:3422
2390
#: bzrlib/builtins.py:3564
1859
2391
msgid ""
1860
2392
"If no restrictions are specified, all Bazaar data that is found at the "
1861
2393
"given\n"
1862
2394
"location will be checked."
1863
2395
msgstr ""
1864
2396
1865
#: bzrlib/builtins.py:3425
2397
#: bzrlib/builtins.py:3567
1866
2398
msgid ":Examples:"
1867
2399
msgstr ""
1868
2400
1869
#: bzrlib/builtins.py:3427
2401
#: bzrlib/builtins.py:3569
1870
2402
msgid " Check the tree and branch at 'foo'::"
1871
2403
msgstr ""
1872
2404
1873
#: bzrlib/builtins.py:3429
2405
#: bzrlib/builtins.py:3571
1874
2406
msgid " bzr check --tree --branch foo"
1875
2407
msgstr ""
1876
2408
1877
#: bzrlib/builtins.py:3431
2409
#: bzrlib/builtins.py:3573
1878
2410
msgid " Check only the repository at 'bar'::"
1879
2411
msgstr ""
1880
2412
1881
#: bzrlib/builtins.py:3433
2413
#: bzrlib/builtins.py:3575
1882
2414
msgid " bzr check --repo bar"
1883
2415
msgstr ""
1884
2416
1885
#: bzrlib/builtins.py:3435
2417
#: bzrlib/builtins.py:3577
1886
2418
msgid " Check everything at 'baz'::"
1887
2419
msgstr ""
1888
2420
1889
#: bzrlib/builtins.py:3437
2421
#: bzrlib/builtins.py:3579
1890
2422
msgid " bzr check baz"
1891
2423
msgstr ""
1892
2424
1893
2425
# help of 'branch' option of 'check' command
1894
#: bzrlib/builtins.py:3443
2426
#: bzrlib/builtins.py:3585
1895
2427
msgid "Check the branch related to the current directory."
1896
2428
msgstr ""
1897
2429
1898
2430
# help of 'repo' option of 'check' command
1899
#: bzrlib/builtins.py:3445
2431
#: bzrlib/builtins.py:3587
1900
2432
msgid "Check the repository related to the current directory."
1901
2433
msgstr ""
1902
2434
1903
2435
# help of 'tree' option of 'check' command
1904
#: bzrlib/builtins.py:3447
2436
#: bzrlib/builtins.py:3589
1905
2437
msgid "Check the working tree related to the current directory."
1906
2438
msgstr ""
1907
2439
1908
#: bzrlib/builtins.py:3461
2440
#: bzrlib/builtins.py:3603
1909
2441
msgid "Upgrade a repository, branch or working tree to a newer format."
1910
2442
msgstr ""
1911
2443
1912
#: bzrlib/builtins.py:3463
2444
#: bzrlib/builtins.py:3605
1913
2445
msgid ""
1914
2446
"When the default format has changed after a major new release of\n"
1915
2447
"Bazaar, you may be informed during certain operations that you\n"
1918
2450
"with older repositories or with older versions of Bazaar."
1919
2451
msgstr ""
1920
2452
1921
#: bzrlib/builtins.py:3469
2453
#: bzrlib/builtins.py:3611
1922
2454
msgid ""
1923
2455
"If you wish to upgrade to a particular format rather than the\n"
1924
2456
"current default, that can be specified using the --format option.\n"
1928
2460
"2.x default) so downgrading is not always possible."
1929
2461
msgstr ""
1930
2462
1931
#: bzrlib/builtins.py:3476
2463
#: bzrlib/builtins.py:3618
1932
2464
msgid ""
1933
2465
"A backup.bzr.~#~ directory is created at the start of the conversion\n"
1934
2466
"process (where # is a number). By default, this is left there on\n"
1939
2471
"afterwards."
1940
2472
msgstr ""
1941
2473
1942
#: bzrlib/builtins.py:3484
2474
#: bzrlib/builtins.py:3626
1943
2475
msgid ""
1944
2476
"If the location given is a shared repository, dependent branches\n"
1945
2477
"are also converted provided the repository converts successfully.\n"
1947
2479
"tried."
1948
2480
msgstr ""
1949
2481
1950
#: bzrlib/builtins.py:3489
2482
#: bzrlib/builtins.py:3631
1951
2483
msgid ""
1952
2484
"For more information on upgrades, see the Bazaar Upgrade Guide,\n"
1953
2485
"http://doc.bazaar.canonical.com/latest/en/upgrade-guide/."
1954
2486
msgstr ""
1955
2487
1956
2488
# help of 'format' option of 'upgrade' command
1957
#: bzrlib/builtins.py:3497
2489
#: bzrlib/builtins.py:3639
1958
2490
msgid "Upgrade to a specific format. See \"bzr help formats\" for details."
1959
2491
msgstr ""
1960
2492
1961
2493
# title of 'format' option of 'init' command
1962
#: bzrlib/builtins.py:3501
2494
#: bzrlib/builtins.py:3643
1963
2495
msgid "Branch format"
1964
2496
msgstr ""
1965
2497
1966
2498
# help of 'clean' option of 'upgrade' command
1967
#: bzrlib/builtins.py:3503
2499
#: bzrlib/builtins.py:3645
1968
2500
msgid "Remove the backup.bzr directory if successful."
1969
2501
msgstr ""
1970
2502
1971
#: bzrlib/builtins.py:3520
2503
# help of 'dry-run' option of 'add' command
2504
#: bzrlib/builtins.py:3647
2505
msgid "Show what would be done, but don't actually do anything."
2506
msgstr ""
2507
2508
#: bzrlib/builtins.py:3662
1972
2509
msgid "Show or set bzr user id."
1973
2510
msgstr ""
1974
2511
1975
#: bzrlib/builtins.py:3522
2512
#: bzrlib/builtins.py:3664
1976
2513
msgid ""
1977
2514
":Examples:\n"
1978
2515
" Show the email of the current user::"
1979
2516
msgstr ""
1980
2517
1981
#: bzrlib/builtins.py:3525
2518
#: bzrlib/builtins.py:3667
1982
2519
msgid " bzr whoami --email"
1983
2520
msgstr ""
1984
2521
1985
#: bzrlib/builtins.py:3527
2522
#: bzrlib/builtins.py:3669
1986
2523
msgid " Set the current user::"
1987
2524
msgstr ""
1988
2525
1989
#: bzrlib/builtins.py:3529
2526
#: bzrlib/builtins.py:3671
1990
2527
msgid " bzr whoami \"Frank Chu <fchu@example.com>\""
1991
2528
msgstr ""
1992
2529
1993
2530
# help of 'email' option of 'whoami' command
1994
#: bzrlib/builtins.py:3533
2531
#: bzrlib/builtins.py:3675
1995
2532
msgid "Display email address only."
1996
2533
msgstr ""
1997
2534
1998
2535
# help of 'branch' option of 'whoami' command
1999
#: bzrlib/builtins.py:3535
2536
#: bzrlib/builtins.py:3677
2000
2537
msgid "Set identity for the current branch instead of globally."
2001
2538
msgstr ""
2002
2539
2003
#: bzrlib/builtins.py:3581
2540
#: bzrlib/builtins.py:3701
2541
msgid "--email can only be used to display existing identity"
2542
msgstr ""
2543
2544
#: bzrlib/builtins.py:3723
2004
2545
msgid "Print or set the branch nickname."
2005
2546
msgstr ""
2006
2547
2007
#: bzrlib/builtins.py:3583
2548
#: bzrlib/builtins.py:3725
2008
2549
msgid ""
2009
2550
"If unset, the tree root directory name is used as the nickname.\n"
2010
2551
"To print the current nickname, execute with no argument."
2011
2552
msgstr ""
2012
2553
2013
#: bzrlib/builtins.py:3586
2554
#: bzrlib/builtins.py:3728
2014
2555
msgid ""
2015
2556
"Bound branches use the nickname of its master branch unless it is set\n"
2016
2557
"locally."
2017
2558
msgstr ""
2018
2559
2019
#: bzrlib/builtins.py:3606
2560
#: bzrlib/builtins.py:3748
2020
2561
msgid "Set/unset and display aliases."
2021
2562
msgstr ""
2022
2563
2023
#: bzrlib/builtins.py:3608
2564
#: bzrlib/builtins.py:3750
2024
2565
msgid ""
2025
2566
":Examples:\n"
2026
2567
" Show the current aliases::"
2027
2568
msgstr ""
2028
2569
2029
#: bzrlib/builtins.py:3611
2570
#: bzrlib/builtins.py:3753
2030
2571
msgid " bzr alias"
2031
2572
msgstr ""
2032
2573
2033
#: bzrlib/builtins.py:3613
2574
#: bzrlib/builtins.py:3755
2034
2575
msgid " Show the alias specified for 'll'::"
2035
2576
msgstr ""
2036
2577
2037
#: bzrlib/builtins.py:3615
2578
#: bzrlib/builtins.py:3757
2038
2579
msgid " bzr alias ll"
2039
2580
msgstr ""
2040
2581
2041
#: bzrlib/builtins.py:3617
2582
#: bzrlib/builtins.py:3759
2042
2583
msgid " Set an alias for 'll'::"
2043
2584
msgstr ""
2044
2585
2045
#: bzrlib/builtins.py:3619
2586
#: bzrlib/builtins.py:3761
2046
2587
msgid " bzr alias ll=\"log --line -r-10..-1\""
2047
2588
msgstr ""
2048
2589
2049
#: bzrlib/builtins.py:3621
2590
#: bzrlib/builtins.py:3763
2050
2591
msgid " To remove an alias for 'll'::"
2051
2592
msgstr ""
2052
2593
2053
#: bzrlib/builtins.py:3623
2594
#: bzrlib/builtins.py:3765
2054
2595
msgid " bzr alias --remove ll"
2055
2596
msgstr ""
2056
2597
2057
2598
# help of 'remove' option of 'alias' command
2058
#: bzrlib/builtins.py:3628
2599
#: bzrlib/builtins.py:3770
2059
2600
msgid "Remove the alias."
2060
2601
msgstr ""
2061
2602
2062
#: bzrlib/builtins.py:3867
2603
#: bzrlib/builtins.py:3788
2604
msgid "bzr alias --remove expects an alias to remove."
2605
msgstr ""
2606
2607
#: bzrlib/builtins.py:3960
2608
msgid "subunit not available. subunit needs to be installed to use --subunit."
2609
msgstr ""
2610
2611
#: bzrlib/builtins.py:3977
2612
msgid ""
2613
"--benchmark is no longer supported from bzr 2.2; use bzr-usertest instead"
2614
msgstr ""
2615
2616
#: bzrlib/builtins.py:4024
2063
2617
msgid "Show version of bzr."
2064
2618
msgstr ""
2065
2619
2066
2620
# help of 'short' option of 'version' command
2067
#: bzrlib/builtins.py:3871
2621
#: bzrlib/builtins.py:4028
2068
2622
msgid "Print just the version number."
2069
2623
msgstr ""
2070
2624
2071
#: bzrlib/builtins.py:3918
2625
#: bzrlib/builtins.py:4047
2626
msgid "It sure does!\n"
2627
msgstr ""
2628
2629
#: bzrlib/builtins.py:4071
2630
#, python-format
2631
msgid "merge base is revision %s\n"
2632
msgstr ""
2633
2634
#: bzrlib/builtins.py:4075
2072
2635
msgid "Perform a three-way merge."
2073
2636
msgstr ""
2074
2637
2075
#: bzrlib/builtins.py:3920
2638
#: bzrlib/builtins.py:4077
2076
2639
msgid ""
2077
2640
"The source of the merge can be specified either in the form of a branch,\n"
2078
2641
"or in the form of a path to a file containing a merge directive generated\n"
2083
2646
"the current working tree."
2084
2647
msgstr ""
2085
2648
2086
#: bzrlib/builtins.py:3928
2649
#: bzrlib/builtins.py:4085
2087
2650
msgid ""
2088
2651
"When merging from a branch, by default bzr will try to merge in all new\n"
2089
2652
"work from the other branch, automatically determining an appropriate base\n"
2090
2653
"revision. If this fails, you may need to give an explicit base."
2091
2654
msgstr ""
2092
2655
2093
#: bzrlib/builtins.py:3932
2656
#: bzrlib/builtins.py:4089
2094
2657
msgid ""
2095
2658
"To pick a different ending revision, pass \"--revision OTHER\". bzr will\n"
2096
2659
"try to merge in all new work up to and including revision OTHER."
2097
2660
msgstr ""
2098
2661
2099
#: bzrlib/builtins.py:3935
2662
#: bzrlib/builtins.py:4092
2100
2663
msgid ""
2101
2664
"If you specify two values, \"--revision BASE..OTHER\", only revisions BASE\n"
2102
2665
"through OTHER, excluding BASE but including OTHER, will be merged. If this\n"
2107
2670
"changes from the other branch is not stored in the commit."
2108
2671
msgstr ""
2109
2672
2110
#: bzrlib/builtins.py:3943
2673
#: bzrlib/builtins.py:4100
2111
2674
msgid "Revision numbers are always relative to the source branch."
2112
2675
msgstr ""
2113
2676
2114
#: bzrlib/builtins.py:3950
2677
#: bzrlib/builtins.py:4107
2115
2678
msgid "Use bzr resolve when you have fixed a problem. See also bzr conflicts."
2116
2679
msgstr ""
2117
2680
2118
#: bzrlib/builtins.py:3952
2681
#: bzrlib/builtins.py:4109
2119
2682
msgid ""
2120
2683
"If there is no default branch set, the first merge will set it (use\n"
2121
"--no-remember to avoid settting it). After that, you can omit the branch\n"
2684
"--no-remember to avoid setting it). After that, you can omit the branch\n"
2122
2685
"to use the default. To change the default, use --remember. The value will\n"
2123
2686
"only be saved if the remote location can be accessed."
2124
2687
msgstr ""
2125
2688
2126
#: bzrlib/builtins.py:3957
2689
#: bzrlib/builtins.py:4114
2127
2690
msgid ""
2128
2691
"The results of the merge are placed into the destination working\n"
2129
2692
"directory, where they can be reviewed (with bzr diff), tested, and then\n"
2130
2693
"committed to record the result of the merge."
2131
2694
msgstr ""
2132
2695
2133
#: bzrlib/builtins.py:3961
2696
#: bzrlib/builtins.py:4118
2134
2697
msgid ""
2135
2698
"merge refuses to run if there are any uncommitted changes, unless\n"
2136
2699
"--force is given. If --force is given, then the changes from the source \n"
2139
2702
"merge revision which has more than two parents."
2140
2703
msgstr ""
2141
2704
2142
#: bzrlib/builtins.py:3967
2705
#: bzrlib/builtins.py:4124
2143
2706
msgid ""
2144
2707
"If one would like to merge changes from the working tree of the other\n"
2145
2708
"branch without merging any committed revisions, the --uncommitted option\n"
2146
2709
"can be given."
2147
2710
msgstr ""
2148
2711
2149
#: bzrlib/builtins.py:3971
2712
#: bzrlib/builtins.py:4128
2150
2713
msgid ""
2151
2714
"To select only some changes to merge, use \"merge -i\", which will prompt\n"
2152
2715
"you to apply each diff hunk and file change, similar to \"shelve\"."
2153
2716
msgstr ""
2154
2717
2155
#: bzrlib/builtins.py:3974
2718
#: bzrlib/builtins.py:4131
2156
2719
msgid ""
2157
2720
":Examples:\n"
2158
2721
" To merge all new revisions from bzr.dev::"
2159
2722
msgstr ""
2160
2723
2161
#: bzrlib/builtins.py:3977
2724
#: bzrlib/builtins.py:4134
2162
2725
msgid " bzr merge ../bzr.dev"
2163
2726
msgstr ""
2164
2727
2165
#: bzrlib/builtins.py:3979
2728
#: bzrlib/builtins.py:4136
2166
2729
msgid " To merge changes up to and including revision 82 from bzr.dev::"
2167
2730
msgstr ""
2168
2731
2169
#: bzrlib/builtins.py:3981
2732
#: bzrlib/builtins.py:4138
2170
2733
msgid " bzr merge -r 82 ../bzr.dev"
2171
2734
msgstr ""
2172
2735
2173
#: bzrlib/builtins.py:3983
2736
#: bzrlib/builtins.py:4140
2174
2737
msgid " To merge the changes introduced by 82, without previous changes::"
2175
2738
msgstr ""
2176
2739
2177
#: bzrlib/builtins.py:3985
2740
#: bzrlib/builtins.py:4142
2178
2741
msgid " bzr merge -r 81..82 ../bzr.dev"
2179
2742
msgstr ""
2180
2743
2181
#: bzrlib/builtins.py:3987
2744
#: bzrlib/builtins.py:4144
2182
2745
msgid " To apply a merge directive contained in /tmp/merge::"
2183
2746
msgstr ""
2184
2747
2185
#: bzrlib/builtins.py:3989
2748
#: bzrlib/builtins.py:4146
2186
2749
msgid " bzr merge /tmp/merge"
2187
2750
msgstr ""
2188
2751
2189
#: bzrlib/builtins.py:3991
2752
#: bzrlib/builtins.py:4148
2190
2753
msgid ""
2191
2754
" To create a merge revision with three parents from two branches\n"
2192
2755
" feature1a and feature1b:"
2193
2756
msgstr ""
2194
2757
2195
#: bzrlib/builtins.py:3994
2758
#: bzrlib/builtins.py:4151
2196
2759
msgid ""
2197
2760
" bzr merge ../feature1a\n"
2198
2761
" bzr merge ../feature1b --force\n"
2200
2763
msgstr ""
2201
2764
2202
2765
# help of 'force' option of 'merge' command
2203
#: bzrlib/builtins.py:4006
2766
#: bzrlib/builtins.py:4163
2204
2767
msgid "Merge even if the destination tree has uncommitted changes."
2205
2768
msgstr ""
2206
2769
2207
2770
# help of 'uncommitted' option of 'merge' command
2208
#: bzrlib/builtins.py:4012
2771
#: bzrlib/builtins.py:4169
2209
2772
msgid ""
2210
2773
"Apply uncommitted changes from a working copy, instead of branch changes."
2211
2774
msgstr ""
2212
2775
2213
2776
# help of 'pull' option of 'merge' command
2214
#: bzrlib/builtins.py:4014
2777
#: bzrlib/builtins.py:4171
2215
2778
msgid ""
2216
2779
"If the destination is already completely merged into the source, pull from "
2217
2780
"the source rather than merging. When this happens, you do not need to "
2219
2782
msgstr ""
2220
2783
2221
2784
# help of 'directory' option of 'merge' command
2222
#: bzrlib/builtins.py:4019
2785
#: bzrlib/builtins.py:4176
2223
2786
msgid ""
2224
2787
"Branch to merge into, rather than the one containing the working directory."
2225
2788
msgstr ""
2226
2789
2227
2790
# help of 'preview' option of 'merge' command
2228
#: bzrlib/builtins.py:4021
2791
#: bzrlib/builtins.py:4178
2229
2792
msgid "Instead of merging, show a diff of the merge."
2230
2793
msgstr ""
2231
2794
2232
2795
# help of 'interactive' option of 'merge' command
2233
#: bzrlib/builtins.py:4023
2796
#: bzrlib/builtins.py:4180
2234
2797
msgid "Select changes interactively."
2235
2798
msgstr ""
2236
2799
2237
#: bzrlib/builtins.py:4307
2800
#: bzrlib/builtins.py:4202
2801
msgid ""
2802
"Merging into empty branches not currently supported, https://bugs.launchpad."
2803
"net/bzr/+bug/308562"
2804
msgstr ""
2805
2806
#: bzrlib/builtins.py:4229
2807
msgid "Cannot use --uncommitted with bundles or merge directives."
2808
msgstr ""
2809
2810
#: bzrlib/builtins.py:4240
2811
msgid "Cannot use --uncommitted and --revision at the same time."
2812
msgstr ""
2813
2814
#: bzrlib/builtins.py:4260
2815
msgid "merger: "
2816
msgstr ""
2817
2818
#: bzrlib/builtins.py:4262 bzrlib/bundle/apply_bundle.py:68
2819
msgid "Nothing to do."
2820
msgstr ""
2821
2822
#: bzrlib/builtins.py:4266
2823
msgid "Cannot pull individual files"
2824
msgstr ""
2825
2826
#: bzrlib/builtins.py:4274
2827
msgid "This branch has no commits. (perhaps you would prefer 'bzr pull')"
2828
msgstr ""
2829
2830
#: bzrlib/builtins.py:4332
2831
#, python-format
2832
msgid "Show-base is not supported for this merge type. %s"
2833
msgstr ""
2834
2835
#: bzrlib/builtins.py:4341
2836
#, python-format
2837
msgid "Conflict reduction is not supported for merge type %s."
2838
msgstr ""
2839
2840
#: bzrlib/builtins.py:4345
2841
msgid "Cannot do conflict reduction and show base."
2842
msgstr ""
2843
2844
#: bzrlib/builtins.py:4456
2845
msgid "No location specified or remembered"
2846
msgstr ""
2847
2848
#: bzrlib/builtins.py:4458
2849
msgid "{0} remembered {1} location {2}"
2850
msgstr ""
2851
2852
#: bzrlib/builtins.py:4464
2238
2853
msgid "Redo a merge."
2239
2854
msgstr ""
2240
2855
2241
#: bzrlib/builtins.py:4309
2856
#: bzrlib/builtins.py:4466
2242
2857
msgid ""
2243
2858
"Use this if you want to try a different merge technique while resolving\n"
2244
2859
"conflicts. Some merge techniques are better than others, and remerge\n"
2245
2860
"lets you try different ones on different files."
2246
2861
msgstr ""
2247
2862
2248
#: bzrlib/builtins.py:4313
2863
#: bzrlib/builtins.py:4470
2249
2864
msgid ""
2250
2865
"The options for remerge have the same meaning and defaults as the ones for\n"
2251
2866
"merge. The difference is that remerge can (only) be run when there is a\n"
2252
2867
"pending merge, and it lets you specify particular files."
2253
2868
msgstr ""
2254
2869
2255
#: bzrlib/builtins.py:4317
2870
#: bzrlib/builtins.py:4474
2256
2871
msgid ""
2257
2872
":Examples:\n"
2258
2873
" Re-do the merge of all conflicted files, and show the base text in\n"
2259
2874
" conflict regions, in addition to the usual THIS and OTHER texts::"
2260
2875
msgstr ""
2261
2876
2262
#: bzrlib/builtins.py:4321
2877
#: bzrlib/builtins.py:4478
2263
2878
msgid " bzr remerge --show-base"
2264
2879
msgstr ""
2265
2880
2266
#: bzrlib/builtins.py:4323
2881
#: bzrlib/builtins.py:4480
2267
2882
msgid ""
2268
2883
" Re-do the merge of \"foobar\", using the weave merge algorithm, with\n"
2269
2884
" additional processing to reduce the size of conflict regions::"
2270
2885
msgstr ""
2271
2886
2272
#: bzrlib/builtins.py:4326
2887
#: bzrlib/builtins.py:4483
2273
2888
msgid " bzr remerge --merge-type weave --reprocess foobar"
2274
2889
msgstr ""
2275
2890
2276
2891
# help of 'show-base' option of 'merge' command
2277
#: bzrlib/builtins.py:4333
2892
#: bzrlib/builtins.py:4490
2278
2893
msgid "Show base revision text in conflicts."
2279
2894
msgstr ""
2280
2895
2281
#: bzrlib/builtins.py:4401
2896
#: bzrlib/builtins.py:4502
2897
msgid ""
2898
"Sorry, remerge only works after normal merges. Not cherrypicking or multi-"
2899
"merges."
2900
msgstr ""
2901
2902
#: bzrlib/builtins.py:4558
2282
2903
msgid "Revert files to a previous revision."
2283
2904
msgstr ""
2284
2905
2285
#: bzrlib/builtins.py:4403
2906
#: bzrlib/builtins.py:4560
2286
2907
msgid ""
2287
2908
"Giving a list of files will revert only those files. Otherwise, all files\n"
2288
2909
"will be reverted. If the revision is not specified with '--revision', the\n"
2289
2910
"last committed revision is used."
2290
2911
msgstr ""
2291
2912
2292
#: bzrlib/builtins.py:4407
2913
#: bzrlib/builtins.py:4564
2293
2914
msgid ""
2294
2915
"To remove only some changes, without reverting to a prior version, use\n"
2295
2916
"merge instead. For example, \"merge . -r -2..-3\" (don't forget the \".\")\n"
2298
2919
"certain changes on a hunk-by-hunk basis, see the shelve command."
2299
2920
msgstr ""
2300
2921
2301
#: bzrlib/builtins.py:4413
2922
#: bzrlib/builtins.py:4570
2302
2923
msgid ""
2303
2924
"By default, any files that have been manually changed will be backed up\n"
2304
2925
"first. (Files changed only by merge are not backed up.) Backup files have\n"
2305
2926
"'.~#~' appended to their name, where # is a number."
2306
2927
msgstr ""
2307
2928
2308
#: bzrlib/builtins.py:4417
2929
#: bzrlib/builtins.py:4574
2309
2930
msgid ""
2310
2931
"When you provide files, you can use their current pathname or the pathname\n"
2311
2932
"from the target revision. So you can use revert to \"undelete\" a file by\n"
2313
2934
"reverted."
2314
2935
msgstr ""
2315
2936
2316
#: bzrlib/builtins.py:4422
2937
#: bzrlib/builtins.py:4579
2317
2938
msgid ""
2318
2939
"If you have newly added files since the target revision, they will be\n"
2319
2940
"removed. If the files to be removed have been changed, backups will be\n"
2321
2942
"deleted."
2322
2943
msgstr ""
2323
2944
2324
#: bzrlib/builtins.py:4427
2945
#: bzrlib/builtins.py:4584
2325
2946
msgid ""
2326
2947
"The working tree contains a list of revisions that have been merged but\n"
2327
2948
"not yet committed. These revisions will be included as additional parents\n"
2333
2954
"reverting any files."
2334
2955
msgstr ""
2335
2956
2336
#: bzrlib/builtins.py:4436
2957
#: bzrlib/builtins.py:4593
2337
2958
msgid ""
2338
2959
"Using \"bzr revert --forget-merges\", it is possible to apply all of the\n"
2339
2960
"changes from a branch in a single revision. To do this, perform the merge\n"
2348
2969
msgstr ""
2349
2970
2350
2971
# help of 'no-backup' option of 'revert' command
2351
#: bzrlib/builtins.py:4450
2972
#: bzrlib/builtins.py:4607
2352
2973
msgid "Do not save backups of reverted files."
2353
2974
msgstr ""
2354
2975
2355
2976
# help of 'forget-merges' option of 'revert' command
2356
#: bzrlib/builtins.py:4452
2977
#: bzrlib/builtins.py:4609
2357
2978
msgid "Remove pending merge marker, without changing any files."
2358
2979
msgstr ""
2359
2980
2360
#: bzrlib/builtins.py:4483
2981
#: bzrlib/builtins.py:4640
2361
2982
msgid ""
2362
2983
"Show help on a command or other topic.\n"
2363
2984
" "
2364
2985
msgstr ""
2365
2986
2366
2987
# help of 'long' option of 'help' command
2367
#: bzrlib/builtins.py:4488
2988
#: bzrlib/builtins.py:4645
2368
2989
msgid "Show help on all commands."
2369
2990
msgstr ""
2370
2991
2371
#: bzrlib/builtins.py:4517
2992
#: bzrlib/builtins.py:4674
2372
2993
msgid "Show unmerged/unpulled revisions between two branches."
2373
2994
msgstr ""
2374
2995
2375
#: bzrlib/builtins.py:4519
2996
#: bzrlib/builtins.py:4676
2376
2997
msgid "OTHER_BRANCH may be local or remote."
2377
2998
msgstr ""
2378
2999
2379
#: bzrlib/builtins.py:4521
3000
#: bzrlib/builtins.py:4678
2380
3001
msgid ""
2381
3002
"To filter on a range of revisions, you can use the command -r begin..end\n"
2382
3003
"-r revision requests a specific revision, -r ..end or -r begin.. are\n"
2387
3008
" 0 - no missing revisions"
2388
3009
msgstr ""
2389
3010
2390
#: bzrlib/builtins.py:4531
3011
#: bzrlib/builtins.py:4688
2391
3012
msgid ""
2392
3013
" Determine the missing revisions between this and the branch at the\n"
2393
3014
" remembered pull location::"
2394
3015
msgstr ""
2395
3016
2396
#: bzrlib/builtins.py:4534
3017
#: bzrlib/builtins.py:4691
2397
3018
msgid " bzr missing"
2398
3019
msgstr ""
2399
3020
2400
#: bzrlib/builtins.py:4536
3021
#: bzrlib/builtins.py:4693
2401
3022
msgid " Determine the missing revisions between this and another branch::"
2402
3023
msgstr ""
2403
3024
2404
#: bzrlib/builtins.py:4538
3025
#: bzrlib/builtins.py:4695
2405
3026
msgid " bzr missing http://server/branch"
2406
3027
msgstr ""
2407
3028
2408
#: bzrlib/builtins.py:4540
3029
#: bzrlib/builtins.py:4697
2409
3030
msgid ""
2410
3031
" Determine the missing revisions up to a specific revision on the other\n"
2411
3032
" branch::"
2412
3033
msgstr ""
2413
3034
2414
#: bzrlib/builtins.py:4543
3035
#: bzrlib/builtins.py:4700
2415
3036
msgid " bzr missing -r ..-10"
2416
3037
msgstr ""
2417
3038
2418
#: bzrlib/builtins.py:4545
3039
#: bzrlib/builtins.py:4702
2419
3040
msgid ""
2420
3041
" Determine the missing revisions up to a specific revision on this\n"
2421
3042
" branch::"
2422
3043
msgstr ""
2423
3044
2424
#: bzrlib/builtins.py:4548
3045
#: bzrlib/builtins.py:4705
2425
3046
msgid " bzr missing --my-revision ..-10"
2426
3047
msgstr ""
2427
3048
2428
3049
# help of 'reverse' option of 'missing' command
2429
#: bzrlib/builtins.py:4555
3050
#: bzrlib/builtins.py:4712
2430
3051
msgid "Reverse the order of revisions."
2431
3052
msgstr ""
2432
3053
2433
3054
# help of 'mine-only' option of 'missing' command
2434
#: bzrlib/builtins.py:4557
3055
#: bzrlib/builtins.py:4714
2435
3056
msgid "Display changes in the local branch only."
2436
3057
msgstr ""
2437
3058
2438
3059
# help of 'this' option of 'missing' command
2439
#: bzrlib/builtins.py:4558
3060
#: bzrlib/builtins.py:4715
2440
3061
msgid "Same as --mine-only."
2441
3062
msgstr ""
2442
3063
2443
3064
# help of 'theirs-only' option of 'missing' command
2444
#: bzrlib/builtins.py:4560
3065
#: bzrlib/builtins.py:4717
2445
3066
msgid "Display changes in the remote branch only."
2446
3067
msgstr ""
2447
3068
2448
3069
# help of 'other' option of 'missing' command
2449
#: bzrlib/builtins.py:4561
3070
#: bzrlib/builtins.py:4718
2450
3071
msgid "Same as --theirs-only."
2451
3072
msgstr ""
2452
3073
2453
3074
# help of 'revision' option of 'missing' command
2454
#: bzrlib/builtins.py:4566
3075
#: bzrlib/builtins.py:4723
2455
3076
msgid ""
2456
3077
"Filter on other branch revisions (inclusive). See \"help revisionspec\" for "
2457
3078
"details."
2458
3079
msgstr ""
2459
3080
2460
3081
# help of 'my-revision' option of 'missing' command
2461
#: bzrlib/builtins.py:4570
3082
#: bzrlib/builtins.py:4727
2462
3083
msgid ""
2463
3084
"Filter on local branch revisions (inclusive). See \"help revisionspec\" for "
2464
3085
"details."
2465
3086
msgstr ""
2466
3087
2467
# help of 'include-merges' option of 'missing' command
2468
#: bzrlib/builtins.py:4573
3088
# help of 'include-merged' option of 'missing' command
3089
#: bzrlib/builtins.py:4730
2469
3090
msgid "Show all revisions in addition to the mainline ones."
2470
3091
msgstr ""
2471
3092
2472
#: bzrlib/builtins.py:4689
3093
#: bzrlib/builtins.py:4784
3094
msgid "No peer location known or specified."
3095
msgstr ""
3096
3097
#: bzrlib/builtins.py:4788
3098
msgid "Using saved parent location: {0}\n"
3099
msgstr ""
3100
3101
#: bzrlib/builtins.py:4821
3102
#, python-format
3103
msgid "You have %d extra revision:\n"
3104
msgid_plural "You have %d extra revisions:\n"
3105
msgstr[0] ""
3106
msgstr[1] ""
3107
3108
#: bzrlib/builtins.py:4837
3109
#, python-format
3110
msgid "You are missing %d revision:\n"
3111
msgid_plural "You are missing %d revisions:\n"
3112
msgstr[0] ""
3113
msgstr[1] ""
3114
3115
#: bzrlib/builtins.py:4849
3116
msgid "This branch has no new revisions.\n"
3117
msgstr ""
3118
3119
#: bzrlib/builtins.py:4852
3120
msgid "Other branch has no new revisions.\n"
3121
msgstr ""
3122
3123
#: bzrlib/builtins.py:4857
3124
msgid "Branches are up to date.\n"
3125
msgstr ""
3126
3127
#: bzrlib/builtins.py:4868
2473
3128
msgid "Compress the data within a repository."
2474
3129
msgstr ""
2475
3130
2476
#: bzrlib/builtins.py:4691
3131
#: bzrlib/builtins.py:4870
2477
3132
msgid ""
2478
3133
"This operation compresses the data within a bazaar repository. As\n"
2479
3134
"bazaar supports automatic packing of repository, this operation is\n"
2480
3135
"normally not required to be done manually."
2481
3136
msgstr ""
2482
3137
2483
#: bzrlib/builtins.py:4695
3138
#: bzrlib/builtins.py:4874
2484
3139
msgid ""
2485
3140
"During the pack operation, bazaar takes a backup of existing repository\n"
2486
3141
"data, i.e. pack files. This backup is eventually removed by bazaar\n"
2489
3144
"used."
2490
3145
msgstr ""
2491
3146
2492
#: bzrlib/builtins.py:4701
3147
#: bzrlib/builtins.py:4880
2493
3148
msgid ""
2494
3149
"Warning: If you use --clean-obsolete-packs and your machine crashes\n"
2495
3150
"during or immediately after repacking, you may be left with a state\n"
2498
3153
msgstr ""
2499
3154
2500
3155
# help of 'clean-obsolete-packs' option of 'pack' command
2501
#: bzrlib/builtins.py:4710
3156
#: bzrlib/builtins.py:4889
2502
3157
msgid "Delete obsolete packs to save disk space."
2503
3158
msgstr ""
2504
3159
2505
#: bzrlib/builtins.py:4724
3160
#: bzrlib/builtins.py:4903
2506
3161
msgid "List the installed plugins."
2507
3162
msgstr ""
2508
3163
2509
#: bzrlib/builtins.py:4726
3164
#: bzrlib/builtins.py:4905
2510
3165
msgid ""
2511
3166
"This command displays the list of installed plugins including\n"
2512
3167
"version of plugin and a short description of each."
2513
3168
msgstr ""
2514
3169
2515
#: bzrlib/builtins.py:4729
3170
#: bzrlib/builtins.py:4908
2516
3171
msgid "--verbose shows the path where each plugin is located."
2517
3172
msgstr ""
2518
3173
2519
#: bzrlib/builtins.py:4731
3174
#: bzrlib/builtins.py:4910
2520
3175
msgid ""
2521
3176
"A plugin is an external component for Bazaar that extends the\n"
2522
3177
"revision control system, by adding or replacing code in Bazaar.\n"
2525
3180
"customizing log output."
2526
3181
msgstr ""
2527
3182
2528
#: bzrlib/builtins.py:4737
3183
#: bzrlib/builtins.py:4916
2529
3184
msgid ""
2530
3185
"See the Bazaar Plugin Guide <http://doc.bazaar.canonical.com/plugins/en/>\n"
2531
3186
"for further information on plugins including where to find them and how to\n"
2533
3188
"plugins using the Python programming language."
2534
3189
msgstr ""
2535
3190
2536
#: bzrlib/builtins.py:4753
3191
#: bzrlib/builtins.py:4932
2537
3192
msgid "Show testament (signing-form) of a revision."
2538
3193
msgstr ""
2539
3194
2540
3195
# help of 'long' option of 'testament' command
2541
#: bzrlib/builtins.py:4756
3196
#: bzrlib/builtins.py:4935
2542
3197
msgid "Produce long-format testament."
2543
3198
msgstr ""
2544
3199
2545
3200
# help of 'strict' option of 'testament' command
2546
#: bzrlib/builtins.py:4758
3201
#: bzrlib/builtins.py:4937
2547
3202
msgid "Produce a strict-format testament."
2548
3203
msgstr ""
2549
3204
2550
#: bzrlib/builtins.py:4784
3205
#: bzrlib/builtins.py:4963
2551
3206
msgid "Show the origin of each line in a file."
2552
3207
msgstr ""
2553
3208
2554
#: bzrlib/builtins.py:4786
3209
#: bzrlib/builtins.py:4965
2555
3210
msgid ""
2556
3211
"This prints out the given file with an annotation on the left side\n"
2557
3212
"indicating which revision, author and date introduced the change."
2558
3213
msgstr ""
2559
3214
2560
#: bzrlib/builtins.py:4789
3215
#: bzrlib/builtins.py:4968
2561
3216
msgid ""
2562
3217
"If the origin is the same for a run of consecutive lines, it is\n"
2563
3218
"shown only at the top, unless the --all option is given."
2564
3219
msgstr ""
2565
3220
2566
3221
# help of 'all' option of 'annotate' command
2567
#: bzrlib/builtins.py:4797
3222
#: bzrlib/builtins.py:4976
2568
3223
msgid "Show annotations on all lines."
2569
3224
msgstr ""
2570
3225
2571
3226
# help of 'long' option of 'annotate' command
2572
#: bzrlib/builtins.py:4798
3227
#: bzrlib/builtins.py:4977
2573
3228
msgid "Show commit date in annotations."
2574
3229
msgstr ""
2575
3230
2576
#: bzrlib/builtins.py:4901
3231
#: bzrlib/builtins.py:5064
3232
msgid "Cannot sign a range of non-revision-history revisions"
3233
msgstr ""
3234
3235
#: bzrlib/builtins.py:5076
3236
msgid "Please supply either one revision, or a range."
3237
msgstr ""
3238
3239
#: bzrlib/builtins.py:5080
2577
3240
msgid ""
2578
3241
"Convert the current branch into a checkout of the supplied branch.\n"
2579
3242
"If no branch is supplied, rebind to the last bound location."
2580
3243
msgstr ""
2581
3244
2582
#: bzrlib/builtins.py:4904
3245
#: bzrlib/builtins.py:5083
2583
3246
msgid ""
2584
3247
"Once converted into a checkout, commits must succeed on the master branch\n"
2585
3248
"before they will be applied to the local branch."
2586
3249
msgstr ""
2587
3250
2588
#: bzrlib/builtins.py:4907
3251
#: bzrlib/builtins.py:5086
2589
3252
msgid ""
2590
3253
"Bound branches use the nickname of its master branch unless it is set\n"
2591
3254
"locally, in which case binding will update the local nickname to be\n"
2592
3255
"that of the master."
2593
3256
msgstr ""
2594
3257
2595
#: bzrlib/builtins.py:4942
3258
#: bzrlib/builtins.py:5101
3259
msgid "No location supplied. This format does not remember old locations."
3260
msgstr ""
3261
3262
#: bzrlib/builtins.py:5106
3263
msgid "Branch is already bound"
3264
msgstr ""
3265
3266
#: bzrlib/builtins.py:5108
3267
msgid "No location supplied and no previous location known"
3268
msgstr ""
3269
3270
#: bzrlib/builtins.py:5114
3271
msgid "These branches have diverged. Try merging, and then bind again."
3272
msgstr ""
3273
3274
#: bzrlib/builtins.py:5121
2596
3275
msgid "Convert the current checkout into a regular branch."
2597
3276
msgstr ""
2598
3277
2599
#: bzrlib/builtins.py:4944
3278
#: bzrlib/builtins.py:5123
2600
3279
msgid ""
2601
3280
"After unbinding, the local branch is considered independent and subsequent\n"
2602
3281
"commits will be local only."
2603
3282
msgstr ""
2604
3283
2605
#: bzrlib/builtins.py:4959
3284
#: bzrlib/builtins.py:5134
3285
msgid "Local branch is not bound"
3286
msgstr ""
3287
3288
#: bzrlib/builtins.py:5138
2606
3289
msgid "Remove the last committed revision."
2607
3290
msgstr ""
2608
3291
2609
#: bzrlib/builtins.py:4961
3292
#: bzrlib/builtins.py:5140
2610
3293
msgid ""
2611
3294
"--verbose will print out what is being removed.\n"
2612
3295
"--dry-run will go through all the motions, but not actually\n"
2613
3296
"remove anything."
2614
3297
msgstr ""
2615
3298
2616
#: bzrlib/builtins.py:4965
3299
#: bzrlib/builtins.py:5144
2617
3300
msgid ""
2618
3301
"If --revision is specified, uncommit revisions to leave the branch at the\n"
2619
3302
"specified revision. For example, \"bzr uncommit -r 15\" will leave the\n"
2620
3303
"branch at revision 15."
2621
3304
msgstr ""
2622
3305
2623
#: bzrlib/builtins.py:4969
3306
#: bzrlib/builtins.py:5148
2624
3307
msgid ""
2625
3308
"Uncommit leaves the working tree ready for a new commit. The only change\n"
2626
3309
"it may make is to restore any pending merges that were present before\n"
2628
3311
msgstr ""
2629
3312
2630
3313
# help of 'dry-run' option of 'uncommit' command
2631
#: bzrlib/builtins.py:4980
3314
#: bzrlib/builtins.py:5159
2632
3315
msgid "Don't actually make changes."
2633
3316
msgstr ""
2634
3317
2635
3318
# help of 'force' option of 'uncommit' command
2636
#: bzrlib/builtins.py:4981
3319
#: bzrlib/builtins.py:5160
2637
3320
msgid "Say yes to all questions."
2638
3321
msgstr ""
2639
3322
3323
# help of 'keep-tags' option of 'uncommit' command
3324
#: bzrlib/builtins.py:5162
3325
msgid "Keep tags that point to removed revisions."
3326
msgstr ""
3327
2640
3328
# help of 'local' option of 'uncommit' command
2641
#: bzrlib/builtins.py:4983
3329
#: bzrlib/builtins.py:5164
2642
3330
msgid "Only remove the commits from the local branch when in a checkout."
2643
3331
msgstr ""
2644
3332
2645
#: bzrlib/builtins.py:5068
3333
#: bzrlib/builtins.py:5213
3334
msgid "No revisions to uncommit.\n"
3335
msgstr ""
3336
3337
#: bzrlib/builtins.py:5228
3338
msgid "Dry-run, pretending to remove the above revisions.\n"
3339
msgstr ""
3340
3341
#: bzrlib/builtins.py:5231
3342
msgid "The above revision(s) will be removed.\n"
3343
msgstr ""
3344
3345
#: bzrlib/builtins.py:5235
3346
msgid "Uncommit these revisions"
3347
msgstr ""
3348
3349
#: bzrlib/builtins.py:5238
3350
msgid "Canceled\n"
3351
msgstr ""
3352
3353
#: bzrlib/builtins.py:5245
3354
#, python-format
3355
msgid ""
3356
"You can restore the old tip by running:\n"
3357
" bzr pull . -r revid:%s\n"
3358
msgstr ""
3359
3360
#: bzrlib/builtins.py:5250
2646
3361
msgid "Break a dead lock."
2647
3362
msgstr ""
2648
3363
2649
#: bzrlib/builtins.py:5070
3364
#: bzrlib/builtins.py:5252
2650
3365
msgid ""
2651
3366
"This command breaks a lock on a repository, branch, working directory or\n"
2652
3367
"config file."
2653
3368
msgstr ""
2654
3369
2655
#: bzrlib/builtins.py:5073
3370
#: bzrlib/builtins.py:5255
2656
3371
msgid ""
2657
3372
"CAUTION: Locks should only be broken when you are sure that the process\n"
2658
3373
"holding the lock has been stopped."
2659
3374
msgstr ""
2660
3375
2661
#: bzrlib/builtins.py:5076
3376
#: bzrlib/builtins.py:5258
2662
3377
msgid ""
2663
3378
"You can get information on what locks are open via the 'bzr info\n"
2664
3379
"[location]' command."
2665
3380
msgstr ""
2666
3381
2667
#: bzrlib/builtins.py:5079
3382
#: bzrlib/builtins.py:5261
2668
3383
msgid ""
2669
3384
":Examples:\n"
2670
3385
" bzr break-lock\n"
2673
3388
msgstr ""
2674
3389
2675
3390
# help of 'config' option of 'break-lock' command
2676
#: bzrlib/builtins.py:5088
3391
#: bzrlib/builtins.py:5270
2677
3392
msgid "LOCATION is the directory where the config lock is."
2678
3393
msgstr ""
2679
3394
2680
3395
# help of 'force' option of 'break-lock' command
2681
#: bzrlib/builtins.py:5090
3396
#: bzrlib/builtins.py:5272
2682
3397
msgid "Do not ask for confirmation before breaking the lock."
2683
3398
msgstr ""
2684
3399
2685
#: bzrlib/builtins.py:5126
3400
# help of 'protocol=bzr' option of 'serve' command
3401
#: bzrlib/builtins.py:5307
3402
msgid "The Bazaar smart server protocol over TCP. (default port: 4155)"
3403
msgstr ""
3404
3405
#: bzrlib/builtins.py:5308
2686
3406
msgid "Run the bzr server."
2687
3407
msgstr ""
2688
3408
2689
3409
# help of 'inet' option of 'serve' command
2690
#: bzrlib/builtins.py:5132
3410
#: bzrlib/builtins.py:5314
2691
3411
msgid "Serve on stdin/out for use from inetd or sshd."
2692
3412
msgstr ""
2693
3413
2694
3414
# title of 'protocol' option of 'serve' command
2695
#: bzrlib/builtins.py:5133
3415
#: bzrlib/builtins.py:5315
2696
3416
msgid "protocol"
2697
3417
msgstr ""
2698
3418
2699
3419
# help of 'protocol' option of 'serve' command
2700
#: bzrlib/builtins.py:5134
3420
#: bzrlib/builtins.py:5316
2701
3421
msgid "Protocol to serve."
2702
3422
msgstr ""
2703
3423
2704
3424
# help of 'port' option of 'serve' command
2705
#: bzrlib/builtins.py:5138
3425
#: bzrlib/builtins.py:5320
2706
3426
msgid ""
2707
3427
"Listen for connections on nominated port of the form [hostname:]portnumber. "
2708
3428
"Passing 0 as the port number will result in a dynamically allocated port. "
2710
3430
msgstr ""
2711
3431
2712
3432
# help of 'directory' option of 'serve' command
2713
#: bzrlib/builtins.py:5144
3433
#: bzrlib/builtins.py:5326
2714
3434
msgid "Serve contents of this directory."
2715
3435
msgstr ""
2716
3436
2717
3437
# help of 'allow-writes' option of 'serve' command
2718
#: bzrlib/builtins.py:5146
3438
#: bzrlib/builtins.py:5328
2719
3439
msgid ""
2720
3440
"By default the server is a readonly server. Supplying --allow-writes "
2721
3441
"enables write access to the contents of the served directory and below. "
2724
3444
"uncontrolled write access to your file system."
2725
3445
msgstr ""
2726
3446
2727
#: bzrlib/builtins.py:5191
3447
# help of 'client-timeout' option of 'serve' command
3448
#: bzrlib/builtins.py:5337
3449
msgid "Override the default idle client timeout (5min)."
3450
msgstr ""
3451
3452
#: bzrlib/builtins.py:5387
2728
3453
msgid "Combine a tree into its containing tree."
2729
3454
msgstr ""
2730
3455
2731
#: bzrlib/builtins.py:5193
3456
#: bzrlib/builtins.py:5389
2732
3457
msgid "This command requires the target tree to be in a rich-root format."
2733
3458
msgstr ""
2734
3459
2735
#: bzrlib/builtins.py:5195
3460
#: bzrlib/builtins.py:5391
2736
3461
msgid ""
2737
3462
"The TREE argument should be an independent tree, inside another tree, but\n"
2738
3463
"not part of it. (Such trees can be produced by \"bzr split\", but also by\n"
2739
3464
"running \"bzr branch\" with the target inside a tree.)"
2740
3465
msgstr ""
2741
3466
2742
#: bzrlib/builtins.py:5199
3467
#: bzrlib/builtins.py:5395
2743
3468
msgid ""
2744
3469
"The result is a combined tree, with the subtree no longer an independent\n"
2745
3470
"part. This is marked as a merge of the subtree into the containing tree,\n"
2746
3471
"and all history is preserved."
2747
3472
msgstr ""
2748
3473
2749
#: bzrlib/builtins.py:5237
3474
#: bzrlib/builtins.py:5413
3475
#, python-format
3476
msgid ""
3477
"Can't join trees because %s doesn't support rich root data.\n"
3478
"You can use bzr upgrade on the repository."
3479
msgstr ""
3480
3481
#: bzrlib/builtins.py:5423 bzrlib/builtins.py:5429
3482
msgid "Cannot join {0}. {1}"
3483
msgstr ""
3484
3485
#: bzrlib/builtins.py:5433
2750
3486
msgid "Split a subdirectory of a tree into a separate tree."
2751
3487
msgstr ""
2752
3488
2753
#: bzrlib/builtins.py:5239
3489
#: bzrlib/builtins.py:5435
2754
3490
msgid ""
2755
3491
"This command will produce a target tree in a format that supports\n"
2756
3492
"rich roots, like 'rich-root' or 'rich-root-pack'. These formats cannot be\n"
2757
3493
"converted into earlier formats like 'dirstate-tags'."
2758
3494
msgstr ""
2759
3495
2760
#: bzrlib/builtins.py:5243
3496
#: bzrlib/builtins.py:5439
2761
3497
msgid ""
2762
3498
"The TREE argument should be a subdirectory of a working tree. That\n"
2763
3499
"subdirectory will be converted into an independent tree, with its own\n"
2764
3500
"branch. Commits in the top-level tree will not apply to the new subtree."
2765
3501
msgstr ""
2766
3502
2767
#: bzrlib/builtins.py:5364
3503
#: bzrlib/builtins.py:5519
3504
msgid "No submit branch specified or known"
3505
msgstr ""
3506
3507
#: bzrlib/builtins.py:5527 bzrlib/send.py:106
3508
msgid "No public branch specified or known"
3509
msgstr ""
3510
3511
#: bzrlib/builtins.py:5532
3512
msgid "bzr merge-directive takes at most two one revision identifiers"
3513
msgstr ""
3514
3515
#: bzrlib/builtins.py:5541
3516
msgid "No revisions to bundle."
3517
msgstr ""
3518
3519
#: bzrlib/builtins.py:5560
2768
3520
msgid "Mail or create a merge-directive for submitting changes."
2769
3521
msgstr ""
2770
3522
2771
#: bzrlib/builtins.py:5366
3523
#: bzrlib/builtins.py:5562
2772
3524
msgid "A merge directive provides many things needed for requesting merges:"
2773
3525
msgstr ""
2774
3526
2775
#: bzrlib/builtins.py:5368
3527
#: bzrlib/builtins.py:5564
2776
3528
msgid "* A machine-readable description of the merge to perform"
2777
3529
msgstr ""
2778
3530
2779
#: bzrlib/builtins.py:5370
3531
#: bzrlib/builtins.py:5566
2780
3532
msgid "* An optional patch that is a preview of the changes requested"
2781
3533
msgstr ""
2782
3534
2783
#: bzrlib/builtins.py:5372
3535
#: bzrlib/builtins.py:5568
2784
3536
msgid ""
2785
3537
"* An optional bundle of revision data, so that the changes can be applied\n"
2786
3538
" directly from the merge directive, without retrieving data from a\n"
2787
3539
" branch."
2788
3540
msgstr ""
2789
3541
2790
#: bzrlib/builtins.py:5376
3542
#: bzrlib/builtins.py:5572
2791
3543
msgid ""
2792
3544
"`bzr send` creates a compact data set that, when applied using bzr\n"
2793
3545
"merge, has the same effect as merging from the source branch. "
2794
3546
msgstr ""
2795
3547
2796
#: bzrlib/builtins.py:5379
3548
#: bzrlib/builtins.py:5575
2797
3549
msgid ""
2798
3550
"By default the merge directive is self-contained and can be applied to any\n"
2799
3551
"branch containing submit_branch in its ancestory without needing access to\n"
2800
3552
"the source branch."
2801
3553
msgstr ""
2802
3554
2803
#: bzrlib/builtins.py:5383
3555
#: bzrlib/builtins.py:5579
2804
3556
msgid ""
2805
3557
"If --no-bundle is specified, then Bazaar doesn't send the contents of the\n"
2806
3558
"revisions, but only a structured request to merge from the\n"
2809
3561
"included if known, so that people can check it later."
2810
3562
msgstr ""
2811
3563
2812
#: bzrlib/builtins.py:5389
3564
#: bzrlib/builtins.py:5585
2813
3565
msgid ""
2814
3566
"The submit branch defaults to the parent of the source branch, but can be\n"
2815
3567
"overridden. Both submit branch and public branch will be remembered in\n"
2818
3570
"be changed using --from."
2819
3571
msgstr ""
2820
3572
2821
#: bzrlib/builtins.py:5395
3573
#: bzrlib/builtins.py:5591
2822
3574
msgid ""
2823
3575
"Both the submit branch and the public branch follow the usual behavior with\n"
2824
3576
"respect to --remember: If there is no default location set, the first send\n"
2825
"will set it (use --no-remember to avoid settting it). After that, you can\n"
3577
"will set it (use --no-remember to avoid setting it). After that, you can\n"
2826
3578
"omit the location to use the default. To change the default, use\n"
2827
3579
"--remember. The value will only be saved if the location can be accessed."
2828
3580
msgstr ""
2829
3581
2830
#: bzrlib/builtins.py:5401
3582
#: bzrlib/builtins.py:5597
2831
3583
msgid ""
2832
3584
"In order to calculate those changes, bzr must analyse the submit branch.\n"
2833
3585
"Therefore it is most efficient for the submit branch to be a local mirror.\n"
2835
3587
"in the merge directive."
2836
3588
msgstr ""
2837
3589
2838
#: bzrlib/builtins.py:5406
3590
#: bzrlib/builtins.py:5602
2839
3591
msgid ""
2840
3592
"The default behaviour is to send the merge directive by mail, unless -o is\n"
2841
3593
"given, in which case it is sent to a file."
2842
3594
msgstr ""
2843
3595
2844
#: bzrlib/builtins.py:5409
3596
#: bzrlib/builtins.py:5605
2845
3597
msgid ""
2846
3598
"Mail is sent using your preferred mail program. This should be transparent\n"
2847
3599
"on Windows (it uses MAPI). On Unix, it requires the xdg-email utility.\n"
2848
3600
"If the preferred client can't be found (or used), your editor will be used."
2849
3601
msgstr ""
2850
3602
2851
#: bzrlib/builtins.py:5413
3603
#: bzrlib/builtins.py:5609
2852
3604
msgid ""
2853
3605
"To use a specific mail program, set the mail_client configuration option.\n"
2854
3606
"(For Thunderbird 1.5, this works around some bugs.) Supported values for\n"
2860
3612
"supported clients."
2861
3613
msgstr ""
2862
3614
2863
#: bzrlib/builtins.py:5420
3615
#: bzrlib/builtins.py:5616
2864
3616
msgid ""
2865
3617
"If mail is being sent, a to address is required. This can be supplied\n"
2866
3618
"either on the commandline, by setting the submit_to configuration\n"
2868
3620
"in the submit branch."
2869
3621
msgstr ""
2870
3622
2871
#: bzrlib/builtins.py:5425
3623
#: bzrlib/builtins.py:5621
2872
3624
msgid ""
2873
3625
"Two formats are currently supported: \"4\" uses revision bundle format 4 "
2874
3626
"and\n"
2878
3630
"format 1. It is compatible with Bazaar 0.12 - 0.18."
2879
3631
msgstr ""
2880
3632
2881
#: bzrlib/builtins.py:5431
3633
#: bzrlib/builtins.py:5627
2882
3634
msgid ""
2883
3635
"The merge directives created by bzr send may be applied using bzr merge or\n"
2884
3636
"bzr pull by specifying a file containing a merge directive as the location."
2885
3637
msgstr ""
2886
3638
2887
#: bzrlib/builtins.py:5434
3639
#: bzrlib/builtins.py:5630
2888
3640
msgid ""
2889
3641
"bzr send makes extensive use of public locations to map local locations "
2890
3642
"into\n"
2893
3645
msgstr ""
2894
3646
2895
3647
# help of 'output' option of 'send' command
2896
#: bzrlib/builtins.py:5458
3648
#: bzrlib/builtins.py:5654
2897
3649
msgid "Write merge directive to this file or directory; use - for stdout."
2898
3650
msgstr ""
2899
3651
2900
3652
# help of 'strict' option of 'send' command
2901
#: bzrlib/builtins.py:5462
3653
#: bzrlib/builtins.py:5658
2902
3654
msgid ""
2903
3655
"Refuse to send if there are uncommitted changes in the working tree, --no-"
2904
3656
"strict disables the check."
2905
3657
msgstr ""
2906
3658
2907
3659
# help of 'mail-to' option of 'send' command
2908
#: bzrlib/builtins.py:5464
3660
#: bzrlib/builtins.py:5660
2909
3661
msgid "Mail the request to this address."
2910
3662
msgstr ""
2911
3663
2912
3664
# help of 'body' option of 'send' command
2913
#: bzrlib/builtins.py:5468
3665
#: bzrlib/builtins.py:5664
2914
3666
msgid "Body for the email."
2915
3667
msgstr ""
2916
3668
2917
3669
# help of 'no-bundle' option of 'send' command
2918
#: bzrlib/builtins.py:5521
3670
#: bzrlib/builtins.py:5717
2919
3671
msgid "Do not include a bundle in the merge directive."
2920
3672
msgstr ""
2921
3673
2922
3674
# help of 'no-patch' option of 'send' command
2923
#: bzrlib/builtins.py:5522
3675
#: bzrlib/builtins.py:5718
2924
3676
msgid "Do not include a preview patch in the merge directive."
2925
3677
msgstr ""
2926
3678
2927
3679
# help of 'remember' option of 'send' command
2928
#: bzrlib/builtins.py:5525
3680
#: bzrlib/builtins.py:5721
2929
3681
msgid "Remember submit and public branch."
2930
3682
msgstr ""
2931
3683
2932
3684
# help of 'from' option of 'send' command
2933
#: bzrlib/builtins.py:5527
3685
#: bzrlib/builtins.py:5723
2934
3686
msgid ""
2935
3687
"Branch to generate the submission from, rather than the one containing the "
2936
3688
"working directory."
2937
3689
msgstr ""
2938
3690
2939
3691
# title of 'format' option of 'send' command
2940
#: bzrlib/builtins.py:5537
3692
#: bzrlib/builtins.py:5733
2941
3693
msgid "format"
2942
3694
msgstr ""
2943
3695
2944
3696
# help of 'format' option of 'send' command
2945
#: bzrlib/builtins.py:5538
3697
#: bzrlib/builtins.py:5734
2946
3698
msgid "Use the specified output format."
2947
3699
msgstr ""
2948
3700
2949
#: bzrlib/builtins.py:5560
3701
#: bzrlib/builtins.py:5756
2950
3702
msgid "Create, remove or modify a tag naming a revision."
2951
3703
msgstr ""
2952
3704
2953
#: bzrlib/builtins.py:5562
3705
#: bzrlib/builtins.py:5758
2954
3706
msgid ""
2955
3707
"Tags give human-meaningful names to revisions. Commands that take a -r\n"
2956
3708
"(--revision) option can be given -rtag:X, where X is any previously\n"
2957
3709
"created tag."
2958
3710
msgstr ""
2959
3711
2960
#: bzrlib/builtins.py:5566
3712
#: bzrlib/builtins.py:5762
2961
3713
msgid ""
2962
3714
"Tags are stored in the branch. Tags are copied from one branch to another\n"
2963
3715
"along when you branch, push, pull or merge."
2964
3716
msgstr ""
2965
3717
2966
#: bzrlib/builtins.py:5569
3718
#: bzrlib/builtins.py:5765
2967
3719
msgid ""
2968
3720
"It is an error to give a tag name that already exists unless you pass\n"
2969
3721
"--force, in which case the tag is moved to point to the new revision."
2970
3722
msgstr ""
2971
3723
2972
#: bzrlib/builtins.py:5572
3724
#: bzrlib/builtins.py:5768
2973
3725
msgid ""
2974
3726
"To rename a tag (change the name but keep it on the same revsion), run "
2975
3727
"``bzr\n"
2976
3728
"tag new-name -r tag:old-name`` and then ``bzr tag --delete oldname``."
2977
3729
msgstr ""
2978
3730
2979
#: bzrlib/builtins.py:5575
3731
#: bzrlib/builtins.py:5771
2980
3732
msgid ""
2981
3733
"If no tag name is specified it will be determined through the \n"
2982
3734
"'automatic_tag_name' hook. This can e.g. be used to automatically tag\n"
2985
3737
msgstr ""
2986
3738
2987
3739
# help of 'delete' option of 'tag' command
2988
#: bzrlib/builtins.py:5585
3740
#: bzrlib/builtins.py:5781
2989
3741
msgid "Delete this tag rather than placing it."
2990
3742
msgstr ""
2991
3743
2992
3744
# help of 'directory' option of 'tag' command
2993
#: bzrlib/builtins.py:5588
3745
#: bzrlib/builtins.py:5784
2994
3746
msgid "Branch in which to place the tag."
2995
3747
msgstr ""
2996
3748
2997
3749
# help of 'force' option of 'tag' command
2998
#: bzrlib/builtins.py:5590
3750
#: bzrlib/builtins.py:5786
2999
3751
msgid "Replace existing tags."
3000
3752
msgstr ""
3001
3753
3002
#: bzrlib/builtins.py:5629
3754
#: bzrlib/builtins.py:5801
3755
msgid "No tag specified to delete."
3756
msgstr ""
3757
3758
#: bzrlib/builtins.py:5803
3759
#, python-format
3760
msgid "Deleted tag %s."
3761
msgstr ""
3762
3763
#: bzrlib/builtins.py:5817
3764
msgid "Please specify a tag name."
3765
msgstr ""
3766
3767
#: bzrlib/builtins.py:5825
3768
#, python-format
3769
msgid "Tag %s already exists for that revision."
3770
msgstr ""
3771
3772
#: bzrlib/builtins.py:5829
3773
#, python-format
3774
msgid "Created tag %s."
3775
msgstr ""
3776
3777
#: bzrlib/builtins.py:5831
3778
#, python-format
3779
msgid "Updated tag %s."
3780
msgstr ""
3781
3782
#: bzrlib/builtins.py:5835
3003
3783
msgid "List tags."
3004
3784
msgstr ""
3005
3785
3006
#: bzrlib/builtins.py:5631
3786
#: bzrlib/builtins.py:5837
3007
3787
msgid ""
3008
3788
"This command shows a table of tag names and the revisions they reference."
3009
3789
msgstr ""
3010
3790
3011
3791
# help of 'directory' option of 'tags' command
3012
#: bzrlib/builtins.py:5637
3792
#: bzrlib/builtins.py:5843
3013
3793
msgid "Branch whose tags should be displayed."
3014
3794
msgstr ""
3015
3795
3016
3796
# help of 'sort' option of 'tags' command
3017
#: bzrlib/builtins.py:5639
3797
#: bzrlib/builtins.py:5845
3018
3798
msgid "Sort tags by different criteria."
3019
3799
msgstr ""
3020
3800
3021
3801
# title of 'sort' option of 'tags' command
3022
#: bzrlib/builtins.py:5639
3802
#: bzrlib/builtins.py:5845
3023
3803
msgid "Sorting"
3024
3804
msgstr ""
3025
3805
3026
#: bzrlib/builtins.py:5684
3806
#: bzrlib/builtins.py:5914
3027
3807
msgid "Reconfigure the type of a bzr directory."
3028
3808
msgstr ""
3029
3809
3030
#: bzrlib/builtins.py:5686
3810
#: bzrlib/builtins.py:5916
3031
3811
msgid "A target configuration must be specified."
3032
3812
msgstr ""
3033
3813
3034
#: bzrlib/builtins.py:5688
3814
#: bzrlib/builtins.py:5918
3035
3815
msgid ""
3036
3816
"For checkouts, the bind-to location will be auto-detected if not specified.\n"
3037
3817
"The order of preference is\n"
3042
3822
"If none of these is available, --bind-to must be specified."
3043
3823
msgstr ""
3044
3824
3045
# title of 'target_type' option of 'reconfigure' command
3046
#: bzrlib/builtins.py:5702
3047
msgid "Target type"
3048
msgstr ""
3049
3050
# help of 'target_type' option of 'reconfigure' command
3051
#: bzrlib/builtins.py:5703
3052
msgid "The type to reconfigure the directory to."
3825
# title of 'tree_type' option of 'reconfigure' command
3826
#: bzrlib/builtins.py:5932
3827
msgid "Tree type"
3828
msgstr ""
3829
3830
# help of 'tree_type' option of 'reconfigure' command
3831
#: bzrlib/builtins.py:5933
3832
msgid "The relation between branch and tree."
3833
msgstr ""
3834
3835
# help of 'tree_type=branch' option of 'reconfigure' command
3836
#: bzrlib/builtins.py:5935
3837
msgid "Reconfigure to be an unbound branch with no working tree."
3838
msgstr ""
3839
3840
# help of 'tree_type=tree' option of 'reconfigure' command
3841
#: bzrlib/builtins.py:5936
3842
msgid "Reconfigure to be an unbound branch with a working tree."
3843
msgstr ""
3844
3845
# help of 'tree_type=checkout' option of 'reconfigure' command
3846
#: bzrlib/builtins.py:5937
3847
msgid "Reconfigure to be a bound branch with a working tree."
3848
msgstr ""
3849
3850
# help of 'tree_type=lightweight-checkout' option of 'reconfigure' command
3851
#: bzrlib/builtins.py:5938
3852
msgid "Reconfigure to be a lightweight checkout (with no local history)."
3853
msgstr ""
3854
3855
# title of 'repository_type' option of 'reconfigure' command
3856
#: bzrlib/builtins.py:5943
3857
msgid "Repository type"
3858
msgstr ""
3859
3860
# help of 'repository_type' option of 'reconfigure' command
3861
#: bzrlib/builtins.py:5944
3862
msgid "Location fo the repository."
3863
msgstr ""
3864
3865
# help of 'repository_type=standalone' option of 'reconfigure' command
3866
#: bzrlib/builtins.py:5946
3867
msgid ""
3868
"Reconfigure to be a standalone branch (i.e. stop using shared repository)."
3869
msgstr ""
3870
3871
# help of 'repository_type=use-shared' option of 'reconfigure' command
3872
#: bzrlib/builtins.py:5948
3873
msgid "Reconfigure to use a shared repository."
3874
msgstr ""
3875
3876
# title of 'repository_trees' option of 'reconfigure' command
3877
#: bzrlib/builtins.py:5952
3878
msgid "Trees in Repository"
3879
msgstr ""
3880
3881
# help of 'repository_trees' option of 'reconfigure' command
3882
#: bzrlib/builtins.py:5953
3883
msgid "Whether new branches in the repository have trees."
3884
msgstr ""
3885
3886
# help of 'repository_trees=with-trees' option of 'reconfigure' command
3887
#: bzrlib/builtins.py:5955
3888
msgid "Reconfigure repository to create working trees on branches by default."
3889
msgstr ""
3890
3891
# help of 'repository_trees=with-no-trees' option of 'reconfigure' command
3892
#: bzrlib/builtins.py:5957
3893
msgid ""
3894
"Reconfigure repository to not create working trees on branches by default."
3053
3895
msgstr ""
3054
3896
3055
3897
# help of 'bind-to' option of 'reconfigure' command
3056
#: bzrlib/builtins.py:5718
3898
#: bzrlib/builtins.py:5960
3057
3899
msgid "Branch to bind checkout to."
3058
3900
msgstr ""
3059
3901
3060
3902
# help of 'force' option of 'reconfigure' command
3061
#: bzrlib/builtins.py:5720
3903
#: bzrlib/builtins.py:5962
3062
3904
msgid "Perform reconfiguration even if local changes will be lost."
3063
3905
msgstr ""
3064
3906
3065
3907
# help of 'stacked-on' option of 'reconfigure' command
3066
#: bzrlib/builtins.py:5723
3908
#: bzrlib/builtins.py:5965
3067
3909
msgid "Reconfigure a branch to be stacked on another branch."
3068
3910
msgstr ""
3069
3911
3070
3912
# help of 'unstacked' option of 'reconfigure' command
3071
#: bzrlib/builtins.py:5727
3913
#: bzrlib/builtins.py:5969
3072
3914
msgid ""
3073
3915
"Reconfigure a branch to be unstacked. This may require copying substantial "
3074
3916
"data into it."
3075
3917
msgstr ""
3076
3918
3077
#: bzrlib/builtins.py:5775
3919
#: bzrlib/builtins.py:5979
3920
msgid "Can't use both --stacked-on and --unstacked"
3921
msgstr ""
3922
3923
#: bzrlib/builtins.py:5993
3924
msgid "No target configuration specified"
3925
msgstr ""
3926
3927
#: bzrlib/builtins.py:6028
3078
3928
msgid "Set the branch of a checkout and update."
3079
3929
msgstr ""
3080
3930
3081
#: bzrlib/builtins.py:5777
3931
#: bzrlib/builtins.py:6030
3082
3932
msgid ""
3083
3933
"For lightweight checkouts, this changes the branch being referenced.\n"
3084
3934
"For heavyweight checkouts, this checks that there are no local commits\n"
3086
3936
"of the new location and binds to it."
3087
3937
msgstr ""
3088
3938
3089
#: bzrlib/builtins.py:5782
3939
#: bzrlib/builtins.py:6035
3090
3940
msgid ""
3091
3941
"In both cases, the working tree is updated and uncommitted changes\n"
3092
3942
"are merged. The user can commit or revert these as they desire."
3093
3943
msgstr ""
3094
3944
3095
#: bzrlib/builtins.py:5785
3945
#: bzrlib/builtins.py:6038
3096
3946
msgid "Pending merges need to be committed or reverted before using switch."
3097
3947
msgstr ""
3098
3948
3099
#: bzrlib/builtins.py:5787
3949
#: bzrlib/builtins.py:6040
3100
3950
msgid ""
3101
3951
"The path to the branch to switch to can be specified relative to the parent\n"
3102
3952
"directory of the current branch. For example, if you are currently in a\n"
3104
3954
"/path/to/newbranch."
3105
3955
msgstr ""
3106
3956
3107
#: bzrlib/builtins.py:5792
3957
#: bzrlib/builtins.py:6045
3108
3958
msgid ""
3109
3959
"Bound branches use the nickname of its master branch unless it is set\n"
3110
3960
"locally, in which case switching will update the local nickname to be\n"
3112
3962
msgstr ""
3113
3963
3114
3964
# help of 'force' option of 'switch' command
3115
#: bzrlib/builtins.py:5800
3965
#: bzrlib/builtins.py:6053
3116
3966
msgid "Switch even if local commits will be lost."
3117
3967
msgstr ""
3118
3968
3119
3969
# help of 'create-branch' option of 'switch' command
3120
#: bzrlib/builtins.py:5803
3970
#: bzrlib/builtins.py:6056
3121
3971
msgid "Create the target branch from this one before switching to it."
3122
3972
msgstr ""
3123
3973
3124
#: bzrlib/builtins.py:5872
3974
#: bzrlib/builtins.py:6068
3975
msgid "You must supply either a revision or a location"
3976
msgstr ""
3977
3978
#: bzrlib/builtins.py:6079
3979
msgid "cannot create branch without source branch"
3980
msgstr ""
3981
3982
#: bzrlib/builtins.py:6143
3125
3983
msgid "Manage filtered views."
3126
3984
msgstr ""
3127
3985
3128
#: bzrlib/builtins.py:5874
3986
#: bzrlib/builtins.py:6145
3129
3987
msgid ""
3130
3988
"Views provide a mask over the tree so that users can focus on\n"
3131
3989
"a subset of a tree when doing their work. After creating a view,\n"
3135
3993
"must be within the current view."
3136
3994
msgstr ""
3137
3995
3138
#: bzrlib/builtins.py:5881
3996
#: bzrlib/builtins.py:6152
3139
3997
msgid ""
3140
3998
"In most cases, a view has a short life-span: it is created to make\n"
3141
3999
"a selected change and is deleted once that change is committed.\n"
3143
4001
"and switch between them."
3144
4002
msgstr ""
3145
4003
3146
#: bzrlib/builtins.py:5886
4004
#: bzrlib/builtins.py:6157
3147
4005
msgid ""
3148
4006
"To disable the current view without deleting it, you can switch to\n"
3149
4007
"the pseudo view called ``off``. This can be useful when you need\n"
3151
4009
"want to switch back to your view after that."
3152
4010
msgstr ""
3153
4011
3154
#: bzrlib/builtins.py:5891
4012
#: bzrlib/builtins.py:6162
3155
4013
msgid ""
3156
4014
":Examples:\n"
3157
4015
" To define the current view::"
3158
4016
msgstr ""
3159
4017
3160
#: bzrlib/builtins.py:5894
4018
#: bzrlib/builtins.py:6165
3161
4019
msgid " bzr view file1 dir1 ..."
3162
4020
msgstr ""
3163
4021
3164
#: bzrlib/builtins.py:5896
4022
#: bzrlib/builtins.py:6167
3165
4023
msgid " To list the current view::"
3166
4024
msgstr ""
3167
4025
3168
#: bzrlib/builtins.py:5898
4026
#: bzrlib/builtins.py:6169
3169
4027
msgid " bzr view"
3170
4028
msgstr ""
3171
4029
3172
#: bzrlib/builtins.py:5900
4030
#: bzrlib/builtins.py:6171
3173
4031
msgid " To delete the current view::"
3174
4032
msgstr ""
3175
4033
3176
#: bzrlib/builtins.py:5902
4034
#: bzrlib/builtins.py:6173
3177
4035
msgid " bzr view --delete"
3178
4036
msgstr ""
3179
4037
3180
#: bzrlib/builtins.py:5904
4038
#: bzrlib/builtins.py:6175
3181
4039
msgid " To disable the current view without deleting it::"
3182
4040
msgstr ""
3183
4041
3184
#: bzrlib/builtins.py:5906
4042
#: bzrlib/builtins.py:6177
3185
4043
msgid " bzr view --switch off"
3186
4044
msgstr ""
3187
4045
3188
#: bzrlib/builtins.py:5908
4046
#: bzrlib/builtins.py:6179
3189
4047
msgid " To define a named view and switch to it::"
3190
4048
msgstr ""
3191
4049
3192
#: bzrlib/builtins.py:5910
4050
#: bzrlib/builtins.py:6181
3193
4051
msgid " bzr view --name view-name file1 dir1 ..."
3194
4052
msgstr ""
3195
4053
3196
#: bzrlib/builtins.py:5912
4054
#: bzrlib/builtins.py:6183
3197
4055
msgid " To list a named view::"
3198
4056
msgstr ""
3199
4057
3200
#: bzrlib/builtins.py:5914
4058
#: bzrlib/builtins.py:6185
3201
4059
msgid " bzr view --name view-name"
3202
4060
msgstr ""
3203
4061
3204
#: bzrlib/builtins.py:5916
4062
#: bzrlib/builtins.py:6187
3205
4063
msgid " To delete a named view::"
3206
4064
msgstr ""
3207
4065
3208
#: bzrlib/builtins.py:5918
4066
#: bzrlib/builtins.py:6189
3209
4067
msgid " bzr view --name view-name --delete"
3210
4068
msgstr ""
3211
4069
3212
#: bzrlib/builtins.py:5920
4070
#: bzrlib/builtins.py:6191
3213
4071
msgid " To switch to a named view::"
3214
4072
msgstr ""
3215
4073
3216
#: bzrlib/builtins.py:5922
4074
#: bzrlib/builtins.py:6193
3217
4075
msgid " bzr view --switch view-name"
3218
4076
msgstr ""
3219
4077
3220
#: bzrlib/builtins.py:5924
4078
#: bzrlib/builtins.py:6195
3221
4079
msgid " To list all views defined::"
3222
4080
msgstr ""
3223
4081
3224
#: bzrlib/builtins.py:5926
4082
#: bzrlib/builtins.py:6197
3225
4083
msgid " bzr view --all"
3226
4084
msgstr ""
3227
4085
3228
#: bzrlib/builtins.py:5928
4086
#: bzrlib/builtins.py:6199
3229
4087
msgid " To delete all views::"
3230
4088
msgstr ""
3231
4089
3232
#: bzrlib/builtins.py:5930
4090
#: bzrlib/builtins.py:6201
3233
4091
msgid " bzr view --delete --all"
3234
4092
msgstr ""
3235
4093
3236
4094
# help of 'all' option of 'view' command
3237
#: bzrlib/builtins.py:5937
4095
#: bzrlib/builtins.py:6208
3238
4096
msgid "Apply list or delete action to all views."
3239
4097
msgstr ""
3240
4098
3241
4099
# help of 'delete' option of 'view' command
3242
#: bzrlib/builtins.py:5940
4100
#: bzrlib/builtins.py:6211
3243
4101
msgid "Delete the view."
3244
4102
msgstr ""
3245
4103
3246
4104
# help of 'name' option of 'view' command
3247
#: bzrlib/builtins.py:5943
4105
#: bzrlib/builtins.py:6214
3248
4106
msgid "Name of the view to define, list or delete."
3249
4107
msgstr ""
3250
4108
3251
4109
# help of 'switch' option of 'view' command
3252
#: bzrlib/builtins.py:5947
4110
#: bzrlib/builtins.py:6218
3253
4111
msgid "Name of the view to switch to."
3254
4112
msgstr ""
3255
4113
3256
#: bzrlib/builtins.py:6047
4114
#: bzrlib/builtins.py:6237
4115
msgid "Both --delete and a file list specified"
4116
msgstr ""
4117
4118
#: bzrlib/builtins.py:6240
4119
msgid "Both --delete and --switch specified"
4120
msgstr ""
4121
4122
#: bzrlib/builtins.py:6243
4123
msgid "Deleted all views.\n"
4124
msgstr ""
4125
4126
#: bzrlib/builtins.py:6245
4127
msgid "No current view to delete"
4128
msgstr ""
4129
4130
#: bzrlib/builtins.py:6248
4131
#, python-format
4132
msgid "Deleted '%s' view.\n"
4133
msgstr ""
4134
4135
#: bzrlib/builtins.py:6252
4136
msgid "Both --switch and a file list specified"
4137
msgstr ""
4138
4139
#: bzrlib/builtins.py:6255
4140
msgid "Both --switch and --all specified"
4141
msgstr ""
4142
4143
#: bzrlib/builtins.py:6258
4144
msgid "No current view to disable"
4145
msgstr ""
4146
4147
#: bzrlib/builtins.py:6260
4148
#, python-format
4149
msgid "Disabled '%s' view.\n"
4150
msgstr ""
4151
4152
#: bzrlib/builtins.py:6264 bzrlib/builtins.py:6286
4153
msgid "Using '{0}' view: {1}\n"
4154
msgstr ""
4155
4156
#: bzrlib/builtins.py:6267
4157
msgid "Views defined:\n"
4158
msgstr ""
4159
4160
#: bzrlib/builtins.py:6276
4161
msgid "No views defined.\n"
4162
msgstr ""
4163
4164
#: bzrlib/builtins.py:6283
4165
msgid "Cannot change the 'off' pseudo view"
4166
msgstr ""
4167
4168
#: bzrlib/builtins.py:6291
4169
msgid "No current view.\n"
4170
msgstr ""
4171
4172
#: bzrlib/builtins.py:6294
4173
msgid "'{0}' view is: {1}\n"
4174
msgstr ""
4175
4176
#: bzrlib/builtins.py:6314
4177
msgid " <no hooks installed>\n"
4178
msgstr ""
4179
4180
#: bzrlib/builtins.py:6318
3257
4181
msgid "Remove a branch."
3258
4182
msgstr ""
3259
4183
3260
#: bzrlib/builtins.py:6049
4184
#: bzrlib/builtins.py:6320
3261
4185
msgid ""
3262
4186
"This will remove the branch from the specified location but \n"
3263
4187
"will keep any working tree or repository in place."
3264
4188
msgstr ""
3265
4189
3266
#: bzrlib/builtins.py:6054
4190
#: bzrlib/builtins.py:6325
3267
4191
msgid " Remove the branch at repo/trunk::"
3268
4192
msgstr ""
3269
4193
3270
#: bzrlib/builtins.py:6056
4194
#: bzrlib/builtins.py:6327
3271
4195
msgid " bzr remove-branch repo/trunk"
3272
4196
msgstr ""
3273
4197
3274
#: bzrlib/builtins.py:6072
4198
# help of 'writer=plain' option of 'shelve' command
4199
#: bzrlib/builtins.py:6342
4200
msgid "Plaintext diff output."
4201
msgstr ""
4202
4203
#: bzrlib/builtins.py:6343
3275
4204
msgid "Temporarily set aside some changes from the current tree."
3276
4205
msgstr ""
3277
4206
3278
#: bzrlib/builtins.py:6074
4207
#: bzrlib/builtins.py:6345
3279
4208
msgid ""
3280
4209
"Shelve allows you to temporarily put changes you've made \"on the shelf\",\n"
3281
4210
"ie. out of the way, until a later time when you can bring them back from\n"
3284
4213
"will they survive its deletion."
3285
4214
msgstr ""
3286
4215
3287
#: bzrlib/builtins.py:6080
4216
#: bzrlib/builtins.py:6351
3288
4217
msgid "If shelve --list is specified, previously-shelved changes are listed."
3289
4218
msgstr ""
3290
4219
3291
#: bzrlib/builtins.py:6082
4220
#: bzrlib/builtins.py:6353
3292
4221
msgid ""
3293
4222
"Shelve is intended to help separate several sets of changes that have\n"
3294
4223
"been inappropriately mingled. If you just want to get rid of all changes\n"
3296
4225
"shelve all text changes at once, use shelve --all."
3297
4226
msgstr ""
3298
4227
3299
#: bzrlib/builtins.py:6087
4228
#: bzrlib/builtins.py:6358
3300
4229
msgid ""
3301
4230
"If filenames are specified, only the changes to those files will be\n"
3302
4231
"shelved. Other files will be left untouched."
3303
4232
msgstr ""
3304
4233
3305
#: bzrlib/builtins.py:6090
4234
#: bzrlib/builtins.py:6361
3306
4235
msgid ""
3307
4236
"If a revision is specified, changes since that revision will be shelved."
3308
4237
msgstr ""
3309
4238
3310
#: bzrlib/builtins.py:6092
4239
#: bzrlib/builtins.py:6363
3311
4240
msgid ""
3312
4241
"You can put multiple items on the shelf, and by default, 'unshelve' will\n"
3313
4242
"restore the most recently shelved changes."
3314
4243
msgstr ""
3315
4244
3316
#: bzrlib/builtins.py:6095
4245
#: bzrlib/builtins.py:6366
3317
4246
msgid ""
3318
4247
"For complicated changes, it is possible to edit the changes in a separate\n"
3319
4248
"editor program to decide what the file remaining in the working copy\n"
3320
4249
"should look like. To do this, add the configuration option"
3321
4250
msgstr ""
3322
4251
3323
#: bzrlib/builtins.py:6099
4252
#: bzrlib/builtins.py:6370
3324
4253
msgid " change_editor = PROGRAM @new_path @old_path"
3325
4254
msgstr ""
3326
4255
3327
#: bzrlib/builtins.py:6101
4256
#: bzrlib/builtins.py:6372
3328
4257
msgid ""
3329
4258
"where @new_path is replaced with the path of the new version of the \n"
3330
4259
"file and @old_path is replaced with the path of the old version of \n"
3334
4263
msgstr ""
3335
4264
3336
4265
# help of 'all' option of 'shelve' command
3337
#: bzrlib/builtins.py:6113
4266
#: bzrlib/builtins.py:6384
3338
4267
msgid "Shelve all changes."
3339
4268
msgstr ""
3340
4269
3341
4270
# help of 'writer' option of 'shelve' command
3342
#: bzrlib/builtins.py:6115
4271
#: bzrlib/builtins.py:6386
3343
4272
msgid "Method to use for writing diffs."
3344
4273
msgstr ""
3345
4274
3346
4275
# title of 'writer' option of 'shelve' command
3347
#: bzrlib/builtins.py:6115
4276
#: bzrlib/builtins.py:6386
3348
4277
msgid "writer"
3349
4278
msgstr ""
3350
4279
3351
4280
# help of 'list' option of 'shelve' command
3352
#: bzrlib/builtins.py:6119
4281
#: bzrlib/builtins.py:6390
3353
4282
msgid "List shelved changes."
3354
4283
msgstr ""
3355
4284
3356
4285
# help of 'destroy' option of 'shelve' command
3357
#: bzrlib/builtins.py:6121
4286
#: bzrlib/builtins.py:6392
3358
4287
msgid "Destroy removed changes instead of shelving them."
3359
4288
msgstr ""
3360
4289
3361
#: bzrlib/builtins.py:6161
4290
#: bzrlib/builtins.py:6421
4291
msgid "No shelved changes."
4292
msgstr ""
4293
4294
#: bzrlib/builtins.py:6432
3362
4295
msgid "Restore shelved changes."
3363
4296
msgstr ""
3364
4297
3365
#: bzrlib/builtins.py:6163
4298
#: bzrlib/builtins.py:6434
3366
4299
msgid ""
3367
4300
"By default, the most recently shelved changes are restored. However if you\n"
3368
4301
"specify a shelf by id those changes will be restored instead. This works\n"
3370
4303
msgstr ""
3371
4304
3372
4305
# help of 'action' option of 'unshelve' command
3373
#: bzrlib/builtins.py:6172
4306
#: bzrlib/builtins.py:6443
3374
4307
msgid "The action to perform."
3375
4308
msgstr ""
3376
4309
3377
#: bzrlib/builtins.py:6194
4310
# help of 'action=apply' option of 'unshelve' command
4311
#: bzrlib/builtins.py:6445
4312
msgid "Apply changes and remove from the shelf."
4313
msgstr ""
4314
4315
# help of 'action=dry-run' option of 'unshelve' command
4316
#: bzrlib/builtins.py:6446
4317
msgid "Show changes, but do not apply or remove them."
4318
msgstr ""
4319
4320
# help of 'action=preview' option of 'unshelve' command
4321
#: bzrlib/builtins.py:6447
4322
msgid ""
4323
"Instead of unshelving the changes, show the diff that would result from "
4324
"unshelving."
4325
msgstr ""
4326
4327
# help of 'action=delete-only' option of 'unshelve' command
4328
#: bzrlib/builtins.py:6449
4329
msgid "Delete changes without applying them."
4330
msgstr ""
4331
4332
# help of 'action=keep' option of 'unshelve' command
4333
#: bzrlib/builtins.py:6450
4334
msgid "Apply changes but don't delete them."
4335
msgstr ""
4336
4337
#: bzrlib/builtins.py:6465
3378
4338
msgid "Remove unwanted files from working tree."
3379
4339
msgstr ""
3380
4340
3381
#: bzrlib/builtins.py:6196
4341
#: bzrlib/builtins.py:6467
3382
4342
msgid ""
3383
4343
"By default, only unknown files, not ignored files, are deleted. Versioned\n"
3384
4344
"files are never deleted."
3385
4345
msgstr ""
3386
4346
3387
#: bzrlib/builtins.py:6199
4347
#: bzrlib/builtins.py:6470
3388
4348
msgid ""
3389
4349
"Another class is 'detritus', which includes files emitted by bzr during\n"
3390
4350
"normal operations and selftests. (The value of these files decreases with\n"
3391
4351
"time.)"
3392
4352
msgstr ""
3393
4353
3394
#: bzrlib/builtins.py:6203
4354
#: bzrlib/builtins.py:6474
3395
4355
msgid ""
3396
4356
"If no options are specified, unknown files are deleted. Otherwise, option\n"
3397
4357
"flags are respected, and may be combined."
3398
4358
msgstr ""
3399
4359
3400
#: bzrlib/builtins.py:6206
4360
#: bzrlib/builtins.py:6477
3401
4361
msgid "To check what clean-tree will do, use --dry-run."
3402
4362
msgstr ""
3403
4363
3404
4364
# help of 'ignored' option of 'clean-tree' command
3405
#: bzrlib/builtins.py:6209
4365
#: bzrlib/builtins.py:6480
3406
4366
msgid "Delete all ignored files."
3407
4367
msgstr ""
3408
4368
3409
4369
# help of 'detritus' option of 'clean-tree' command
3410
#: bzrlib/builtins.py:6210
4370
#: bzrlib/builtins.py:6481
3411
4371
msgid ""
3412
4372
"Delete conflict files, merge and revert backups, and failed selftest dirs."
3413
4373
msgstr ""
3414
4374
3415
4375
# help of 'unknown' option of 'clean-tree' command
3416
#: bzrlib/builtins.py:6213
4376
#: bzrlib/builtins.py:6484
3417
4377
msgid "Delete files unknown to bzr (default)."
3418
4378
msgstr ""
3419
4379
3420
4380
# help of 'dry-run' option of 'clean-tree' command
3421
#: bzrlib/builtins.py:6214
4381
#: bzrlib/builtins.py:6485
3422
4382
msgid "Show files to delete instead of deleting them."
3423
4383
msgstr ""
3424
4384
3425
4385
# help of 'force' option of 'clean-tree' command
3426
#: bzrlib/builtins.py:6216
4386
#: bzrlib/builtins.py:6487
3427
4387
msgid "Do not prompt before deleting."
3428
4388
msgstr ""
3429
4389
3430
#: bzrlib/cmd_version_info.py:50
4390
#: bzrlib/bundle/__init__.py:57
4391
msgid "A directory cannot be a bundle"
4392
msgstr ""
4393
4394
#: bzrlib/bundle/apply_bundle.py:37
4395
msgid "Install revisions"
4396
msgstr ""
4397
4398
#: bzrlib/bundle/commands.py:61
4399
msgid "--verbose requires a merge directive"
4400
msgstr ""
4401
4402
#: bzrlib/bundle/commands.py:64
4403
msgid "Bundle format not supported"
4404
msgstr ""
4405
4406
#: bzrlib/bundle/commands.py:74
4407
msgid "Records\n"
4408
msgstr ""
4409
4410
#: bzrlib/bundle/commands.py:78
4411
msgid "{0}: {1} ({2} multiparent)\n"
4412
msgstr ""
4413
4414
#: bzrlib/bundle/commands.py:80
4415
#, python-format
4416
msgid "unique files: %d\n"
4417
msgstr ""
4418
4419
#: bzrlib/bundle/commands.py:89
4420
msgid "Revisions\n"
4421
msgstr ""
4422
4423
#: bzrlib/bundle/commands.py:90
4424
#, python-format
4425
msgid "nicks: %s\n"
4426
msgstr ""
4427
4428
#: bzrlib/bundle/commands.py:92
4429
#, python-format
4430
msgid ""
4431
"committers: \n"
4432
"%s\n"
4433
msgstr ""
4434
4435
#: bzrlib/bundle/commands.py:100
4436
msgid "Decoded contents\n"
4437
msgstr ""
4438
4439
#: bzrlib/bundle/serializer/v4.py:325
4440
#, python-format
4441
msgid "Bundling %d revision."
4442
msgid_plural "Bundling %d revisions."
4443
msgstr[0] ""
4444
msgstr[1] ""
4445
4446
#: bzrlib/bzrdir.py:487
4447
msgid ""
4448
"making backup of {0}\n"
4449
" to {1}"
4450
msgstr ""
4451
4452
#: bzrlib/bzrdir.py:510
4453
msgid "renamed {0} to {1}"
4454
msgstr ""
4455
4456
#: bzrlib/bzrdir.py:1512
4457
#, python-format
4458
msgid ""
4459
"Source repository format does not support stacking, using format:\n"
4460
" %s"
4461
msgstr ""
4462
4463
#: bzrlib/bzrdir.py:1532
4464
#, python-format
4465
msgid ""
4466
"Source branch format does not support stacking, using format:\n"
4467
" %s"
4468
msgstr ""
4469
4470
#: bzrlib/bzrdir.py:1677
4471
msgid "starting repository conversion"
4472
msgstr ""
4473
4474
#: bzrlib/bzrdir.py:1906
4475
msgid "Using default stacking branch {0} at {1}"
4476
msgstr ""
4477
4478
#: bzrlib/check.py:106
4479
msgid "check"
4480
msgstr ""
4481
4482
#: bzrlib/check.py:108
4483
msgid "checking revisions"
4484
msgstr ""
4485
4486
#: bzrlib/check.py:110
4487
msgid "checking commit contents"
4488
msgstr ""
4489
4490
#: bzrlib/check.py:112
4491
msgid "checking file graphs"
4492
msgstr ""
4493
4494
#: bzrlib/check.py:116
4495
msgid "checking branches and trees"
4496
msgstr ""
4497
4498
#: bzrlib/check.py:203
4499
msgid "checked repository {0} format {1}"
4500
msgstr ""
4501
4502
#: bzrlib/check.py:206
4503
#, python-format
4504
msgid "%6d revisions"
4505
msgstr ""
4506
4507
#: bzrlib/check.py:207
4508
#, python-format
4509
msgid "%6d file-ids"
4510
msgstr ""
4511
4512
#: bzrlib/check.py:209
4513
#, python-format
4514
msgid "%6d unreferenced text versions"
4515
msgstr ""
4516
4517
#: bzrlib/check.py:213
4518
msgid "unreferenced version: {{{0}}} in {1}"
4519
msgstr ""
4520
4521
#: bzrlib/check.py:216
4522
#, python-format
4523
msgid "%6d revisions are missing inventory_sha1"
4524
msgstr ""
4525
4526
#: bzrlib/check.py:219
4527
#, python-format
4528
msgid "%6d revisions are mentioned but not present"
4529
msgstr ""
4530
4531
#: bzrlib/check.py:222
4532
#, python-format
4533
msgid "%6d ghost revisions"
4534
msgstr ""
4535
4536
#: bzrlib/check.py:227
4537
#, python-format
4538
msgid "%6d revisions missing parents in ancestry"
4539
msgstr ""
4540
4541
#: bzrlib/check.py:231
4542
#, python-format
4543
msgid " %s should be in the ancestry for:"
4544
msgstr ""
4545
4546
#: bzrlib/check.py:235
4547
#, python-format
4548
msgid "%6d inconsistent parents"
4549
msgstr ""
4550
4551
#: bzrlib/check.py:239
4552
msgid " * {0} version {1} has parents {2!r} but should have {3!r}"
4553
msgstr ""
4554
4555
#: bzrlib/check.py:245
4556
#, python-format
4557
msgid "%6d revisions have incorrect parents in the revision index"
4558
msgstr ""
4559
4560
#: bzrlib/check.py:251
4561
msgid " {0} has wrong parents in index: {1!r} should be {2!r}"
4562
msgstr ""
4563
4564
#: bzrlib/check.py:265
4565
msgid "Mismatched internal revid {{{0}}} and index revid {{{1}}}"
4566
msgstr ""
4567
4568
#: bzrlib/check.py:294
4569
msgid ""
4570
"Multiple expected sha1s for {0}. {{{1}}} expects {{{2}}}, {{{3}}} expects "
4571
"{{{4}}}"
4572
msgstr ""
4573
4574
#: bzrlib/check.py:352
4575
#, python-format
4576
msgid "Checking branch at '%s'."
4577
msgstr ""
4578
4579
#: bzrlib/check.py:372
4580
#, python-format
4581
msgid "Checking working tree at '%s'."
4582
msgstr ""
4583
4584
#: bzrlib/check.py:425 bzrlib/check.py:439
4585
msgid "No branch found at specified location."
4586
msgstr ""
4587
4588
#: bzrlib/check.py:427 bzrlib/check.py:437
4589
msgid "No working tree found at specified location."
4590
msgstr ""
4591
4592
#: bzrlib/check.py:430
4593
#, python-format
4594
msgid "Checking repository at '%s'."
4595
msgstr ""
4596
4597
#: bzrlib/check.py:441
4598
msgid "No repository found at specified location."
4599
msgstr ""
4600
4601
#: bzrlib/clean_tree.py:62
4602
msgid "Nothing to delete."
4603
msgstr ""
4604
4605
#: bzrlib/clean_tree.py:67
4606
msgid "Are you sure you wish to delete these"
4607
msgstr ""
4608
4609
#: bzrlib/clean_tree.py:69
4610
msgid "Canceled"
4611
msgstr ""
4612
4613
#: bzrlib/clean_tree.py:106
4614
#, python-format
4615
msgid "unable to remove %s"
4616
msgstr ""
4617
4618
#: bzrlib/clean_tree.py:110
4619
msgid "deleting paths:"
4620
msgstr ""
4621
4622
#: bzrlib/clean_tree.py:124
4623
msgid "unable to remove \"{0}\": {1}."
4624
msgstr ""
4625
4626
#: bzrlib/clean_tree.py:129
4627
msgid "No files deleted."
4628
msgstr ""
4629
4630
#: bzrlib/cmd_version_info.py:45
4631
msgid "No known version info format {0}. Supported types are: {1}"
4632
msgstr ""
4633
4634
# help of 'format=custom' option of 'version-info' command
4635
#: bzrlib/cmd_version_info.py:50
4636
msgid "Version info in Custom template-based format."
4637
msgstr ""
4638
4639
# help of 'format=python' option of 'version-info' command
4640
#: bzrlib/cmd_version_info.py:50
4641
msgid "Version info in Python format."
4642
msgstr ""
4643
4644
# help of 'format=rio' option of 'version-info' command
4645
#: bzrlib/cmd_version_info.py:50
4646
msgid "Version info in RIO (simple text) format (default)."
4647
msgstr ""
4648
4649
#: bzrlib/cmd_version_info.py:51
3431
4650
msgid "Show version information about this tree."
3432
4651
msgstr ""
3433
4652
3434
#: bzrlib/cmd_version_info.py:52
4653
#: bzrlib/cmd_version_info.py:53
3435
4654
msgid ""
3436
4655
"You can use this command to add information about version into\n"
3437
4656
"source code of an application. The output can be in one of the\n"
3438
4657
"supported formats or in a custom format based on a template."
3439
4658
msgstr ""
3440
4659
3441
#: bzrlib/cmd_version_info.py:56
4660
#: bzrlib/cmd_version_info.py:57
3442
4661
msgid "For example::"
3443
4662
msgstr ""
3444
4663
3445
#: bzrlib/cmd_version_info.py:58
4664
#: bzrlib/cmd_version_info.py:59
3446
4665
msgid ""
3447
4666
" bzr version-info --custom \\\n"
3448
4667
" --template=\"#define VERSION_INFO \\\"Project 1.2.3 (r{revno})\\\"\\n\""
3449
4668
msgstr ""
3450
4669
3451
#: bzrlib/cmd_version_info.py:61
4670
#: bzrlib/cmd_version_info.py:62
3452
4671
msgid ""
3453
4672
"will produce a C header file with formatted string containing the\n"
3454
4673
"current revision number. Other supported variables in templates are:"
3455
4674
msgstr ""
3456
4675
3457
#: bzrlib/cmd_version_info.py:64
4676
#: bzrlib/cmd_version_info.py:65
3458
4677
msgid ""
3459
4678
" * {date} - date of the last revision\n"
3460
4679
" * {build_date} - current date\n"
3466
4685
msgstr ""
3467
4686
3468
4687
# help of 'format' option of 'version-info' command
3469
#: bzrlib/cmd_version_info.py:74
4688
#: bzrlib/cmd_version_info.py:75
3470
4689
msgid "Select the output format."
3471
4690
msgstr ""
3472
4691
3473
4692
# help of 'all' option of 'version-info' command
3474
#: bzrlib/cmd_version_info.py:78
4693
#: bzrlib/cmd_version_info.py:79
3475
4694
msgid "Include all possible information."
3476
4695
msgstr ""
3477
4696
3478
4697
# help of 'check-clean' option of 'version-info' command
3479
#: bzrlib/cmd_version_info.py:79
4698
#: bzrlib/cmd_version_info.py:80
3480
4699
msgid "Check if tree is clean."
3481
4700
msgstr ""
3482
4701
3483
4702
# help of 'include-history' option of 'version-info' command
3484
#: bzrlib/cmd_version_info.py:81
4703
#: bzrlib/cmd_version_info.py:82
3485
4704
msgid "Include the revision-history."
3486
4705
msgstr ""
3487
4706
3488
4707
# help of 'include-file-revisions' option of 'version-info' command
3489
#: bzrlib/cmd_version_info.py:83
4708
#: bzrlib/cmd_version_info.py:84
3490
4709
msgid "Include the last revision for each file."
3491
4710
msgstr ""
3492
4711
3493
4712
# help of 'template' option of 'version-info' command
3494
#: bzrlib/cmd_version_info.py:84
4713
#: bzrlib/cmd_version_info.py:85
3495
4714
msgid "Template for the output."
3496
4715
msgstr ""
3497
4716
4717
#: bzrlib/cmd_version_info.py:99
4718
msgid "bzr version-info --revision takes exactly one revision specifier"
4719
msgstr ""
4720
4721
#: bzrlib/commands.py:232
4722
#, python-format
4723
msgid "unknown command \"%s\""
4724
msgstr ""
4725
3498
4726
#: bzrlib/commands.py:479
3499
4727
msgid "No help for this command."
3500
4728
msgstr ""
3546
4774
msgstr ""
3547
4775
3548
4776
#: bzrlib/commands.py:557
3549
#, python-format
3550
msgid ":doc:`%s <%s-help>`"
4777
msgid ":doc:`{0} <{1}-help>`"
3551
4778
msgstr ""
3552
4779
3553
#: bzrlib/commands.py:560
4780
#: bzrlib/commands.py:561
3554
4781
#, python-format
3555
4782
msgid ":See also: %s"
3556
4783
msgstr ""
3557
4784
4785
#: bzrlib/commands.py:819 bzrlib/gpg.py:317
4786
msgid "Only ASCII permitted in option names"
4787
msgstr ""
4788
4789
#: bzrlib/commands.py:844 bzrlib/commands.py:852
4790
msgid "command {0!r} needs one or more {1}"
4791
msgstr ""
4792
4793
#: bzrlib/commands.py:861
4794
msgid "command {0!r} requires argument {1}"
4795
msgstr ""
4796
4797
#: bzrlib/commands.py:868
4798
msgid "extra argument to command {0}: {1}"
4799
msgstr ""
4800
4801
#: bzrlib/commands.py:965
4802
#, python-format
4803
msgid "Profile data written to \"%s\"."
4804
msgstr ""
4805
4806
#: bzrlib/commit.py:116 bzrlib/commit.py:738
4807
msgid "added"
4808
msgstr ""
4809
4810
#: bzrlib/commit.py:116 bzrlib/commit.py:746
4811
msgid "modified"
4812
msgstr ""
4813
4814
#: bzrlib/commit.py:130
4815
#, python-format
4816
msgid "Committing%s"
4817
msgstr ""
4818
4819
#: bzrlib/commit.py:133
4820
#, python-format
4821
msgid "Committed revision %d."
4822
msgstr ""
4823
4824
#: bzrlib/commit.py:142
4825
#, python-format
4826
msgid "deleted %s"
4827
msgstr ""
4828
4829
#: bzrlib/commit.py:145
4830
#, python-format
4831
msgid "missing %s"
4832
msgstr ""
4833
4834
#: bzrlib/commit.py:510
4835
msgid ""
4836
"Conflicting tags in bound branch:\n"
4837
"{0}"
4838
msgstr ""
4839
4840
#: bzrlib/commit.py:740
4841
msgid "renamed"
4842
msgstr ""
4843
4844
#: bzrlib/commit.py:975
4845
msgid "unchanged"
4846
msgstr ""
4847
4848
#: bzrlib/commit.py:997
4849
msgid "{0} [{1}] - Stage"
4850
msgstr ""
4851
4852
#: bzrlib/commit.py:1000
4853
#, python-format
4854
msgid "%s - Stage"
4855
msgstr ""
4856
3558
4857
#: bzrlib/commit_signature_commands.py:34
3559
4858
msgid "Sign all commits by a given committer."
3560
4859
msgstr ""
3590
4889
"verification."
3591
4890
msgstr ""
3592
4891
4892
#: bzrlib/commit_signature_commands.py:145
4893
msgid "Cannot verify a range of non-revision-history revisions"
4894
msgstr ""
4895
3593
4896
#: bzrlib/commit_signature_commands.py:166
3594
4897
msgid "All commits signed with verifiable keys"
3595
4898
msgstr ""
3596
4899
3597
#: bzrlib/config.py:3118
4900
#: bzrlib/config.py:451
4901
msgid "Invalid config value for \"{0}\" value {1!r} is not an SI unit."
4902
msgstr ""
4903
4904
#: bzrlib/config.py:2762
4905
#, python-format
4906
msgid "Invalid '%s', should be of the form 'name=value'"
4907
msgstr ""
4908
4909
#: bzrlib/config.py:3469
3598
4910
msgid "Display, set or remove a configuration option."
3599
4911
msgstr ""
3600
4912
3601
#: bzrlib/config.py:3120
4913
#: bzrlib/config.py:3471
3602
4914
msgid "Display the active value for a given option."
3603
4915
msgstr ""
3604
4916
3605
#: bzrlib/config.py:3122
4917
#: bzrlib/config.py:3473
3606
4918
msgid ""
3607
4919
"If --all is specified, NAME is interpreted as a regular expression and all\n"
3608
4920
"matching options are displayed mentioning their scope. The active value\n"
3609
4921
"that bzr will take into account is the first one displayed for each option."
3610
4922
msgstr ""
3611
4923
3612
#: bzrlib/config.py:3126
4924
#: bzrlib/config.py:3477
3613
4925
msgid "If no NAME is given, --all .* is implied."
3614
4926
msgstr ""
3615
4927
3616
#: bzrlib/config.py:3128
4928
#: bzrlib/config.py:3479
3617
4929
msgid ""
3618
4930
"Setting a value is achieved by using name=value without spaces. The value\n"
3619
4931
"is set in the most relevant scope and can be checked by displaying the\n"
3621
4933
msgstr ""
3622
4934
3623
4935
# help of 'scope' option of 'config' command
3624
#: bzrlib/config.py:3139
3625
msgid "Reduce the scope to the specified configuration file"
4936
#: bzrlib/config.py:3491
4937
msgid "Reduce the scope to the specified configuration file."
3626
4938
msgstr ""
3627
4939
3628
4940
# help of 'all' option of 'config' command
3629
#: bzrlib/config.py:3143
4941
#: bzrlib/config.py:3495
3630
4942
msgid "Display all the defined values for the matching options."
3631
4943
msgstr ""
3632
4944
3633
4945
# help of 'remove' option of 'config' command
3634
#: bzrlib/config.py:3145
3635
msgid "Remove the option from the configuration file"
4946
#: bzrlib/config.py:3497
4947
msgid "Remove the option from the configuration file."
3636
4948
msgstr ""
3637
4949
3638
#: bzrlib/conflicts.py:47
4950
#: bzrlib/conflicts.py:48
3639
4951
msgid "List files with conflicts."
3640
4952
msgstr ""
3641
4953
3642
#: bzrlib/conflicts.py:49
4954
#: bzrlib/conflicts.py:50
3643
4955
msgid ""
3644
4956
"Merge will do its best to combine the changes in two branches, but there\n"
3645
4957
"are some kinds of problems only a human can fix. When it encounters those,\n"
3647
4959
"before you should commit."
3648
4960
msgstr ""
3649
4961
3650
#: bzrlib/conflicts.py:54
4962
#: bzrlib/conflicts.py:55
3651
4963
msgid ""
3652
4964
"Conflicts normally are listed as short, human-readable messages. If --text\n"
3653
4965
"is supplied, the pathnames of files with text conflicts are listed,\n"
3654
4966
"instead. (This is useful for editing all files with text conflicts.)"
3655
4967
msgstr ""
3656
4968
3657
#: bzrlib/conflicts.py:58
4969
#: bzrlib/conflicts.py:59
3658
4970
msgid "Use bzr resolve when you have fixed a problem."
3659
4971
msgstr ""
3660
4972
3661
4973
# help of 'text' option of 'conflicts' command
3662
#: bzrlib/conflicts.py:63
4974
#: bzrlib/conflicts.py:64
3663
4975
msgid "List paths of files with text conflicts."
3664
4976
msgstr ""
3665
4977
4978
# help of 'action=done' option of 'resolve' command
4979
#: bzrlib/conflicts.py:83
4980
msgid "Marks the conflict as resolved."
4981
msgstr ""
4982
4983
# help of 'action=take-this' option of 'resolve' command
4984
#: bzrlib/conflicts.py:86
4985
msgid "Resolve the conflict preserving the version in the working tree."
4986
msgstr ""
4987
4988
# help of 'action=take-other' option of 'resolve' command
4989
#: bzrlib/conflicts.py:89
4990
msgid "Resolve the conflict taking the merged version into account."
4991
msgstr ""
4992
3666
4993
# help of 'action' option of 'resolve' command
3667
#: bzrlib/conflicts.py:95
4994
#: bzrlib/conflicts.py:96
3668
4995
msgid "How to resolve the conflict."
3669
4996
msgstr ""
3670
4997
3671
#: bzrlib/conflicts.py:101
4998
#: bzrlib/conflicts.py:102
3672
4999
msgid "Mark a conflict as resolved."
3673
5000
msgstr ""
3674
5001
3675
#: bzrlib/conflicts.py:108
5002
#: bzrlib/conflicts.py:109
3676
5003
msgid ""
3677
5004
"Once you have fixed a problem, use \"bzr resolve\" to automatically mark\n"
3678
5005
"text conflicts as fixed, \"bzr resolve FILE\" to mark a specific conflict "
3681
5008
msgstr ""
3682
5009
3683
5010
# help of 'all' option of 'resolve' command
3684
#: bzrlib/conflicts.py:116
5011
#: bzrlib/conflicts.py:117
3685
5012
msgid "Resolve all conflicts in this tree."
3686
5013
msgstr ""
3687
5014
5015
#: bzrlib/conflicts.py:124
5016
msgid "If --all is specified, no FILE may be provided"
5017
msgstr ""
5018
5019
#: bzrlib/conflicts.py:149
5020
#, python-format
5021
msgid "%d conflict auto-resolved."
5022
msgid_plural "%d conflicts auto-resolved."
5023
msgstr[0] ""
5024
msgstr[1] ""
5025
5026
#: bzrlib/conflicts.py:152
5027
msgid "Remaining conflicts:"
5028
msgstr ""
5029
5030
#: bzrlib/conflicts.py:157
5031
msgid "All conflicts resolved."
5032
msgstr ""
5033
5034
#: bzrlib/conflicts.py:166
5035
msgid "{0} conflict resolved, {1} remaining"
5036
msgid_plural "{0} conflicts resolved, {1} remaining"
5037
msgstr[0] ""
5038
msgstr[1] ""
5039
3688
5040
# title of 'action' option of 'resolve' command
3689
#: bzrlib/conflicts.py:688
5041
#: bzrlib/conflicts.py:692
3690
5042
msgid "action"
3691
5043
msgstr ""
3692
5044
3693
#: bzrlib/errors.py:208
5045
#: bzrlib/controldir.py:682
5046
msgid "{0} is{1} redirected to {2}"
5047
msgstr ""
5048
5049
#: bzrlib/diff.py:397
5050
#, python-format
5051
msgid "*** Ignoring files outside view. View is %s"
5052
msgstr ""
5053
5054
#: bzrlib/errors.py:155
3694
5055
msgid "The tree builder is already building a tree."
3695
5056
msgstr ""
3696
5057
3697
#: bzrlib/errors.py:229
5058
#: bzrlib/errors.py:176
3698
5059
msgid "The dirstate file (%(state)s) appears to be corrupt: %(msg)s"
3699
5060
msgstr ""
3700
5061
3701
#: bzrlib/errors.py:248
5062
#: bzrlib/errors.py:195
3702
5063
msgid ""
3703
5064
"The API for \"%(api)s\" is not compatible with \"%(wanted)s\". It supports "
3704
5065
"versions \"%(minimum)s\" to \"%(current)s\"."
3705
5066
msgstr ""
3706
5067
3707
#: bzrlib/errors.py:260
5068
#: bzrlib/errors.py:207
3708
5069
msgid "The transport '%(transport)s' is only accessible within this process."
3709
5070
msgstr ""
3710
5071
3711
#: bzrlib/errors.py:278
5072
#: bzrlib/errors.py:225
3712
5073
msgid "Invalid revision number %(revno)s"
3713
5074
msgstr ""
3714
5075
3715
#: bzrlib/errors.py:287
5076
#: bzrlib/errors.py:234
3716
5077
msgid "Invalid revision-id {%(revision_id)s} in %(branch)s"
3717
5078
msgstr ""
3718
5079
3719
#: bzrlib/errors.py:298
5080
#: bzrlib/errors.py:245
3720
5081
msgid "Reserved revision-id {%(revision_id)s}"
3721
5082
msgstr ""
3722
5083
3723
#: bzrlib/errors.py:312
5084
#: bzrlib/errors.py:259
3724
5085
msgid "There is no public branch set for \"%(branch_url)s\"."
3725
5086
msgstr ""
3726
5087
3727
#: bzrlib/errors.py:322
5088
#: bzrlib/errors.py:269
3728
5089
msgid ""
3729
5090
"No help could be found for '%(topic)s'. Please use 'bzr help topics' to "
3730
5091
"obtain a list of topics."
3731
5092
msgstr ""
3732
5093
3733
#: bzrlib/errors.py:331
5094
#: bzrlib/errors.py:278
3734
5095
msgid "The file id \"%(file_id)s\" is not present in the tree %(tree)s."
3735
5096
msgstr ""
3736
5097
3737
#: bzrlib/errors.py:341
5098
#: bzrlib/errors.py:288
3738
5099
msgid ""
3739
5100
"The file id \"%(file_id)s\" is not present in the repository %(repository)r"
3740
5101
msgstr ""
3741
5102
3742
#: bzrlib/errors.py:350
5103
#: bzrlib/errors.py:297
3743
5104
msgid "The branch '%(branch)s' is not stacked."
3744
5105
msgstr ""
3745
5106
3746
#: bzrlib/errors.py:364
5107
#: bzrlib/errors.py:311
3747
5108
msgid "No WorkingTree exists for \"%(base)s\"."
3748
5109
msgstr ""
3749
5110
3750
#: bzrlib/errors.py:373
5111
#: bzrlib/errors.py:320
3751
5112
msgid "Not currently building a tree."
3752
5113
msgstr ""
3753
5114
3754
#: bzrlib/errors.py:378
5115
#: bzrlib/errors.py:325
3755
5116
msgid "%(url)s is not a local path."
3756
5117
msgstr ""
3757
5118
3758
#: bzrlib/errors.py:406
5119
#: bzrlib/errors.py:353
3759
5120
msgid "%(not_locked)r is not write locked but needs to be."
3760
5121
msgstr ""
3761
5122
3762
#: bzrlib/errors.py:414
5123
#: bzrlib/errors.py:361
3763
5124
msgid "Error in command line options"
3764
5125
msgstr ""
3765
5126
3766
#: bzrlib/errors.py:419
5127
#: bzrlib/errors.py:366
3767
5128
msgid "%(value)s is not an index of type %(_type)s."
3768
5129
msgstr ""
3769
5130
3770
#: bzrlib/errors.py:429
5131
#: bzrlib/errors.py:376
3771
5132
msgid "Error in data for index %(value)s."
3772
5133
msgstr ""
3773
5134
3774
#: bzrlib/errors.py:438
5135
#: bzrlib/errors.py:385
3775
5136
msgid "The key '%(key)s' is already in index '%(index)s'."
3776
5137
msgstr ""
3777
5138
3778
#: bzrlib/errors.py:448
5139
#: bzrlib/errors.py:395
3779
5140
msgid "The key '%(key)s' is not a valid key."
3780
5141
msgstr ""
3781
5142
3782
#: bzrlib/errors.py:457
5143
#: bzrlib/errors.py:404
3783
5144
msgid "Could not parse options for index %(value)s."
3784
5145
msgstr ""
3785
5146
3786
#: bzrlib/errors.py:466
5147
#: bzrlib/errors.py:413
3787
5148
msgid "The value '%(value)s' is not a valid value."
3788
5149
msgstr ""
3789
5150
3790
#: bzrlib/errors.py:494
5151
#: bzrlib/errors.py:441
3791
5152
msgid "Generic path error: %(path)r%(extra)s)"
3792
5153
msgstr ""
3793
5154
3794
#: bzrlib/errors.py:507
5155
#: bzrlib/errors.py:454
3795
5156
msgid "No such file: %(path)r%(extra)s"
3796
5157
msgstr ""
3797
5158
3798
#: bzrlib/errors.py:512
5159
#: bzrlib/errors.py:459
3799
5160
msgid "File exists: %(path)r%(extra)s"
3800
5161
msgstr ""
3801
5162
3802
#: bzrlib/errors.py:518
5163
#: bzrlib/errors.py:465
3803
5164
msgid ""
3804
5165
"Could not rename %(source)s => %(dest)s because both files exist. (Use --"
3805
5166
"after to tell bzr about a rename that has already happened)%(extra)s"
3806
5167
msgstr ""
3807
5168
3808
#: bzrlib/errors.py:534
5169
#: bzrlib/errors.py:481
3809
5170
msgid "\"%(path)s\" is not a directory %(extra)s"
3810
5171
msgstr ""
3811
5172
3812
#: bzrlib/errors.py:539
5173
#: bzrlib/errors.py:486
3813
5174
msgid "\"%(path)s\" is not in the working directory %(extra)s"
3814
5175
msgstr ""
3815
5176
3816
#: bzrlib/errors.py:544
5177
#: bzrlib/errors.py:491
3817
5178
msgid "Directory not empty: \"%(path)s\"%(extra)s"
3818
5179
msgstr ""
3819
5180
3820
#: bzrlib/errors.py:549
5181
#: bzrlib/errors.py:496
3821
5182
msgid "Hard-linking \"%(path)s\" is not supported"
3822
5183
msgstr ""
3823
5184
3824
#: bzrlib/errors.py:564
5185
#: bzrlib/errors.py:511
3825
5186
msgid "Device or resource busy: \"%(path)s\"%(extra)s"
3826
5187
msgstr ""
3827
5188
3828
#: bzrlib/errors.py:569
5189
#: bzrlib/errors.py:516
3829
5190
msgid "Permission denied: \"%(path)s\"%(extra)s"
3830
5191
msgstr ""
3831
5192
3832
#: bzrlib/errors.py:574
5193
#: bzrlib/errors.py:521
3833
5194
msgid "Invalid url supplied to transport: \"%(path)s\"%(extra)s"
3834
5195
msgstr ""
3835
5196
3836
#: bzrlib/errors.py:579
5197
#: bzrlib/errors.py:526
3837
5198
msgid "Invalid URL join request: %(reason)s: %(base)r + %(join_args)r"
3838
5199
msgstr ""
3839
5200
3840
#: bzrlib/errors.py:590
5201
#: bzrlib/errors.py:537
3841
5202
msgid "URLs differ by more than path: %(from_)r and %(to)r"
3842
5203
msgstr ""
3843
5204
3844
#: bzrlib/errors.py:612
5205
#: bzrlib/errors.py:559
3845
5206
msgid "The %(type)s hook '%(hook)s' is unknown in this version of bzrlib."
3846
5207
msgstr ""
3847
5208
3848
#: bzrlib/errors.py:622
5209
#: bzrlib/errors.py:569
3849
5210
msgid "Unsupported protocol for url \"%(path)s\"%(extra)s"
3850
5211
msgstr ""
3851
5212
3852
#: bzrlib/errors.py:630
5213
#: bzrlib/errors.py:577
3853
5214
msgid ""
3854
5215
"The branch '%(url)s'(%(format)s) is not a stackable format. You will need to "
3855
5216
"upgrade the branch to permit branch stacking."
3856
5217
msgstr ""
3857
5218
3858
#: bzrlib/errors.py:641
5219
#: bzrlib/errors.py:588
3859
5220
msgid "The branch '%(branch_url)s' cannot be stacked on '%(target_url)s'."
3860
5221
msgstr ""
3861
5222
3862
#: bzrlib/errors.py:651
5223
#: bzrlib/errors.py:598
3863
5224
msgid ""
3864
5225
"The repository '%(url)s'(%(format)s) is not a stackable format. You will "
3865
5226
"need to upgrade the repository to permit branch stacking."
3866
5227
msgstr ""
3867
5228
3868
#: bzrlib/errors.py:662
5229
#: bzrlib/errors.py:609
3869
5230
msgid "Error reading from %(path)r."
3870
5231
msgstr ""
3871
5232
3872
#: bzrlib/errors.py:681
5233
#: bzrlib/errors.py:628
3873
5234
msgid "Path \"%(path)s\" is not a child of path \"%(base)s\"%(extra)s"
3874
5235
msgstr ""
3875
5236
3876
#: bzrlib/errors.py:697
5237
#: bzrlib/errors.py:644
3877
5238
msgid "Path \"%(path)s\" is not unicode normalized"
3878
5239
msgstr ""
3879
5240
3880
#: bzrlib/errors.py:705
5241
#: bzrlib/errors.py:652
3881
5242
msgid "Not a branch: \"%(path)s\"%(detail)s."
3882
5243
msgstr ""
3883
5244
3884
#: bzrlib/errors.py:747
5245
#: bzrlib/errors.py:694
3885
5246
msgid "No submit branch available for branch \"%(path)s\""
3886
5247
msgstr ""
3887
5248
3888
#: bzrlib/errors.py:756
5249
#: bzrlib/errors.py:703
3889
5250
msgid "Already a branch: \"%(path)s\"."
3890
5251
msgstr ""
3891
5252
3892
#: bzrlib/errors.py:762
5253
#: bzrlib/errors.py:709
3893
5254
msgid ""
3894
5255
"Directory contains a branch, but no working tree (use bzr checkout if you "
3895
5256
"wish to build a working tree): \"%(path)s\""
3896
5257
msgstr ""
3897
5258
3898
#: bzrlib/errors.py:767
5259
#: bzrlib/errors.py:714
3899
5260
msgid ""
3900
5261
"\"%(function)s\" called on an AtomicFile after it was closed: \"%(path)s\""
3901
5262
msgstr ""
3902
5263
3903
#: bzrlib/errors.py:777
5264
#: bzrlib/errors.py:724
3904
5265
msgid ""
3905
5266
"Parent not accessible given base \"%(base)s\" and relative path \"%(path)s\""
3906
5267
msgstr ""
3907
5268
3908
#: bzrlib/errors.py:787
5269
#: bzrlib/errors.py:734
3909
5270
msgid "No repository present: \"%(path)s\""
3910
5271
msgstr ""
3911
5272
3912
#: bzrlib/errors.py:795
3913
msgid "File \"%(path)s\" is not in branch %(branch_base)s."
3914
msgstr ""
3915
3916
#: bzrlib/errors.py:807
5273
#: bzrlib/errors.py:741
3917
5274
msgid ""
3918
5275
"Unsupported branch format: %(format)s\n"
3919
5276
"Please run 'bzr upgrade'"
3920
5277
msgstr ""
3921
5278
3922
#: bzrlib/errors.py:813
5279
#: bzrlib/errors.py:747
3923
5280
msgid "Unknown %(kind)s format: %(format)r"
3924
5281
msgstr ""
3925
5282
3926
#: bzrlib/errors.py:822
5283
#: bzrlib/errors.py:756
3927
5284
msgid "Format %(format)s is not compatible with .bzr version %(bzrdir)s."
3928
5285
msgstr ""
3929
5286
3930
#: bzrlib/errors.py:835
5287
#: bzrlib/errors.py:769
3931
5288
msgid ""
3932
5289
"%(target)s\n"
3933
5290
"is not compatible with\n"
3935
5292
"%(details)s"
3936
5293
msgstr ""
3937
5294
3938
#: bzrlib/errors.py:851
5295
#: bzrlib/errors.py:785
3939
5296
msgid "Revision is not compatible with %(repo_format)s"
3940
5297
msgstr ""
3941
5298
3942
#: bzrlib/errors.py:861
5299
#: bzrlib/errors.py:795
3943
5300
msgid "%(context_info)s%(path)s is already versioned."
3944
5301
msgstr ""
3945
5302
3946
#: bzrlib/errors.py:882
5303
#: bzrlib/errors.py:816
3947
5304
msgid "%(context_info)s%(path)s is not versioned."
3948
5305
msgstr ""
3949
5306
3950
#: bzrlib/errors.py:903
5307
#: bzrlib/errors.py:837
3951
5308
msgid "Path(s) are not versioned: %(paths_as_string)s"
3952
5309
msgstr ""
3953
5310
3954
#: bzrlib/errors.py:914
5311
#: bzrlib/errors.py:848
3955
5312
msgid "Path(s) do not exist: %(paths_as_string)s%(extra)s"
3956
5313
msgstr ""
3957
5314
3958
#: bzrlib/errors.py:933
5315
#: bzrlib/errors.py:867
3959
5316
msgid "Cannot operate on \"%(filename)s\" of unsupported kind \"%(kind)s\""
3960
5317
msgstr ""
3961
5318
3962
#: bzrlib/errors.py:941
5319
#: bzrlib/errors.py:875
3963
5320
msgid ""
3964
5321
"Filename %(filename)r is not valid in your current filesystem encoding "
3965
5322
"%(fs_encoding)s"
3966
5323
msgstr ""
3967
5324
3968
#: bzrlib/errors.py:952
5325
#: bzrlib/errors.py:886
3969
5326
msgid "Cannot operate on \"%(filename)s\" because it is a control file"
3970
5327
msgstr ""
3971
5328
3972
#: bzrlib/errors.py:970
5329
#: bzrlib/errors.py:904
3973
5330
msgid "The lock for '%(lock_description)s' is in use and cannot be broken."
3974
5331
msgstr ""
3975
5332
3976
#: bzrlib/errors.py:1009
5333
#: bzrlib/errors.py:943
3977
5334
msgid "Cannot lock %(lock)s: %(why)s"
3978
5335
msgstr ""
3979
5336
3980
#: bzrlib/errors.py:1019
5337
#: bzrlib/errors.py:953
3981
5338
msgid ""
3982
5339
"A transaction related operation was attempted after the transaction finished."
3983
5340
msgstr ""
3984
5341
3985
#: bzrlib/errors.py:1046
5342
#: bzrlib/errors.py:980
3986
5343
msgid "Cannot lock: transport is read only: %(transport)s"
3987
5344
msgstr ""
3988
5345
3989
#: bzrlib/errors.py:1054
5346
#: bzrlib/errors.py:988
3990
5347
msgid "Could not acquire lock \"%(lock)s\": %(msg)s"
3991
5348
msgstr ""
3992
5349
3993
#: bzrlib/errors.py:1065
5350
#: bzrlib/errors.py:999
3994
5351
msgid "Lock was broken while still open: %(lock)s - check storage consistency!"
3995
5352
msgstr ""
3996
5353
3997
#: bzrlib/errors.py:1076
5354
#: bzrlib/errors.py:1010
3998
5355
msgid ""
3999
5356
"Lock was released and re-acquired before being broken: %(lock)s: held by "
4000
5357
"%(holder)r, wanted to break %(target)r"
4001
5358
msgstr ""
4002
5359
4003
#: bzrlib/errors.py:1088
5360
#: bzrlib/errors.py:1022
4004
5361
msgid ""
4005
5362
"Lock is apparently held, but corrupted: %(corruption_info)s\n"
4006
5363
"Use 'bzr break-lock' to clear it"
4007
5364
msgstr ""
4008
5365
4009
#: bzrlib/errors.py:1101
5366
#: bzrlib/errors.py:1035
4010
5367
msgid "Lock not held: %(lock)s"
4011
5368
msgstr ""
4012
5369
4013
#: bzrlib/errors.py:1130
5370
#: bzrlib/errors.py:1064
4014
5371
msgid "No changes to commit"
4015
5372
msgstr ""
4016
5373
4017
#: bzrlib/errors.py:1135
5374
#: bzrlib/errors.py:1069
4018
5375
msgid ""
4019
5376
"Selected-file commit of merges is not supported yet: files %(files_str)s"
4020
5377
msgstr ""
4021
5378
4022
#: bzrlib/errors.py:1145
5379
#: bzrlib/errors.py:1079
4023
5380
msgid ""
4024
5381
"Excluding paths during commit is not supported by repository at %(repository)"
4025
5382
"r."
4026
5383
msgstr ""
4027
5384
4028
#: bzrlib/errors.py:1154
5385
#: bzrlib/errors.py:1088
4029
5386
msgid ""
4030
5387
"The specified commit message contains characters unsupported by the current "
4031
5388
"encoding."
4032
5389
msgstr ""
4033
5390
4034
#: bzrlib/errors.py:1160
5391
#: bzrlib/errors.py:1094
4035
5392
msgid "Upgrade URL cannot work with readonly URLs."
4036
5393
msgstr ""
4037
5394
4038
#: bzrlib/errors.py:1165
5395
#: bzrlib/errors.py:1099
4039
5396
msgid "The branch format %(format)s is already at the most recent format."
4040
5397
msgstr ""
4041
5398
4042
#: bzrlib/errors.py:1188
5399
#: bzrlib/errors.py:1122
4043
5400
msgid "Option --change does not accept revision ranges"
4044
5401
msgstr ""
4045
5402
4046
#: bzrlib/errors.py:1193
5403
#: bzrlib/errors.py:1127
4047
5404
msgid "No namespace registered for string: %(spec)r"
4048
5405
msgstr ""
4049
5406
4050
#: bzrlib/errors.py:1212
5407
#: bzrlib/errors.py:1146
4051
5408
msgid ""
4052
5409
"Requested revision: '%(spec)s' does not exist in branch: %(branch_url)s"
4053
5410
"%(extra)s"
4054
5411
msgstr ""
4055
5412
4056
#: bzrlib/errors.py:1226
4057
msgid "%(branch)s is missing %(object_type)s {%(object_id)s}"
4058
msgstr ""
4059
4060
#: bzrlib/errors.py:1231
5413
#: bzrlib/errors.py:1160
4061
5414
msgid ""
4062
5415
"Operation denied because it would change the main history, which is not "
4063
5416
"permitted by the append_revisions_only setting on branch \"%(location)s\"."
4064
5417
msgstr ""
4065
5418
4066
#: bzrlib/errors.py:1242
5419
#: bzrlib/errors.py:1171
4067
5420
msgid ""
4068
5421
"These branches have diverged. Use the missing command to see how.\n"
4069
5422
"Use the merge command to reconcile them."
4070
5423
msgstr ""
4071
5424
4072
#: bzrlib/errors.py:1262
5425
#: bzrlib/errors.py:1191
4073
5426
msgid ""
4074
5427
"Branches have no common ancestor, and no merge base revision was specified."
4075
5428
msgstr ""
4076
5429
4077
#: bzrlib/errors.py:1268
5430
#: bzrlib/errors.py:1197
4078
5431
msgid ""
4079
5432
"Selected merge cannot perform reverse cherrypicks. Try merge3 or diff3."
4080
5433
msgstr ""
4081
5434
4082
#: bzrlib/errors.py:1274
5435
#: bzrlib/errors.py:1203
4083
5436
msgid "Revisions have no common ancestor: %(revision_a)s %(revision_b)s"
4084
5437
msgstr ""
4085
5438
4086
#: bzrlib/errors.py:1283
5439
#: bzrlib/errors.py:1212
4087
5440
msgid ""
4088
5441
"Revisions are not derived from the same root: %(revision_a)s %(revision_b)s."
4089
5442
msgstr ""
4090
5443
4091
#: bzrlib/errors.py:1292
5444
#: bzrlib/errors.py:1221
4092
5445
msgid "Revision %(rev_id)s is not an ancestor of %(not_ancestor_id)s"
4093
5446
msgstr ""
4094
5447
4095
#: bzrlib/errors.py:1312
5448
#: bzrlib/errors.py:1230
4096
5449
msgid "Branch %(branch)s has no commits."
4097
5450
msgstr ""
4098
5451
4099
#: bzrlib/errors.py:1330
5452
#: bzrlib/errors.py:1248
4100
5453
msgid ""
4101
5454
"Bound branch %(branch)s is out of date with master branch %(master)s."
4102
5455
"%(extra_help)s"
4103
5456
msgstr ""
4104
5457
4105
#: bzrlib/errors.py:1342
5458
#: bzrlib/errors.py:1260
4106
5459
msgid ""
4107
5460
"Cannot commit to branch %(branch)s. It is bound to %(master)s, which is "
4108
5461
"bound to %(remote)s."
4109
5462
msgstr ""
4110
5463
4111
#: bzrlib/errors.py:1354
5464
#: bzrlib/errors.py:1272
4112
5465
msgid "Cannot pull --overwrite to a branch which is bound %(branch)s"
4113
5466
msgstr ""
4114
5467
4115
#: bzrlib/errors.py:1363
5468
#: bzrlib/errors.py:1281
4116
5469
msgid ""
4117
5470
"Unable to connect to target of bound branch %(branch)s => %(target)s: "
4118
5471
"%(error)s"
4119
5472
msgstr ""
4120
5473
4121
#: bzrlib/errors.py:1375
5474
#: bzrlib/errors.py:1293
4122
5475
msgid "Error in processing weave: %(msg)s"
4123
5476
msgstr ""
4124
5477
4125
#: bzrlib/errors.py:1384
5478
#: bzrlib/errors.py:1302
4126
5479
msgid "Revision {%(revision_id)s} already present in %(weave)s"
4127
5480
msgstr ""
4128
5481
4129
#: bzrlib/errors.py:1395
5482
#: bzrlib/errors.py:1313
4130
5483
msgid "Revision {%(revision_id)s} not present in %(weave)s"
4131
5484
msgstr ""
4132
5485
4133
#: bzrlib/errors.py:1405
5486
#: bzrlib/errors.py:1323
4134
5487
msgid "Weave invariant violated: %(what)s"
4135
5488
msgstr ""
4136
5489
4137
#: bzrlib/errors.py:1414
5490
#: bzrlib/errors.py:1332
4138
5491
msgid "Parents are mismatched between two revisions. %(msg)s"
4139
5492
msgstr ""
4140
5493
4141
#: bzrlib/errors.py:1436
5494
#: bzrlib/errors.py:1354
4142
5495
msgid ""
4143
5496
"Weaves differ on text content. Revision: {%(revision_id)s}, %(weave_a)s, "
4144
5497
"%(weave_b)s"
4145
5498
msgstr ""
4146
5499
4147
#: bzrlib/errors.py:1448
5500
#: bzrlib/errors.py:1366
4148
5501
msgid "Versioned file error"
4149
5502
msgstr ""
4150
5503
4151
#: bzrlib/errors.py:1453
5504
#: bzrlib/errors.py:1371
4152
5505
msgid "Revision {%(revision_id)s} not present in \"%(file_id)s\"."
4153
5506
msgstr ""
4154
5507
4155
#: bzrlib/errors.py:1463
5508
#: bzrlib/errors.py:1381
4156
5509
msgid "Revision {%(revision_id)s} already present in \"%(file_id)s\"."
4157
5510
msgstr ""
4158
5511
4159
#: bzrlib/errors.py:1473
5512
#: bzrlib/errors.py:1391
4160
5513
msgid "Text did not match its checksum: %(msg)s"
4161
5514
msgstr ""
4162
5515
4163
#: bzrlib/errors.py:1598
5516
#: bzrlib/errors.py:1517
4164
5517
msgid "Export format %(format)r not supported"
4165
5518
msgstr ""
4166
5519
4167
#: bzrlib/errors.py:1607
5520
#: bzrlib/errors.py:1526
4168
5521
msgid "Transport error: %(msg)s %(orig_error)s"
4169
5522
msgstr ""
4170
5523
4171
#: bzrlib/errors.py:1633
5524
#: bzrlib/errors.py:1552
4172
5525
msgid "Generic bzr smart protocol error: %(details)s"
4173
5526
msgstr ""
4174
5527
4175
#: bzrlib/errors.py:1641
5528
#: bzrlib/errors.py:1560
4176
5529
msgid "Received bad protocol version marker: %(marker)r"
4177
5530
msgstr ""
4178
5531
4179
#: bzrlib/errors.py:1672
5532
#: bzrlib/errors.py:1592
4180
5533
msgid "Transport operation not possible: %(msg)s %(orig_error)s"
4181
5534
msgstr ""
4182
5535
4183
#: bzrlib/errors.py:1677
5536
#: bzrlib/errors.py:1597
4184
5537
msgid "Connection error: %(msg)s %(orig_error)s"
4185
5538
msgstr ""
4186
5539
4187
#: bzrlib/errors.py:1682
5540
#: bzrlib/errors.py:1602
4188
5541
msgid "%(msg)s %(host)s%(port)s%(orig_error)s"
4189
5542
msgstr ""
4190
5543
4191
#: bzrlib/errors.py:1703
5544
#: bzrlib/errors.py:1623
4192
5545
msgid "Connection closed: %(msg)s %(orig_error)s"
4193
5546
msgstr ""
4194
5547
4195
#: bzrlib/errors.py:1708
5548
#: bzrlib/errors.py:1628
5549
msgid "Connection Timeout: %(msg)s%(orig_error)s"
5550
msgstr ""
5551
5552
#: bzrlib/errors.py:1633
4196
5553
msgid "Invalid range access in %(path)s at %(offset)s: %(msg)s"
4197
5554
msgstr ""
4198
5555
4199
#: bzrlib/errors.py:1718
5556
#: bzrlib/errors.py:1643
4200
5557
msgid "Invalid http response for %(path)s: %(msg)s%(orig_error)s"
4201
5558
msgstr ""
4202
5559
4203
#: bzrlib/errors.py:1733
5560
#: bzrlib/errors.py:1658
4204
5561
msgid "Invalid http range %(range)r for %(path)s: %(msg)s"
4205
5562
msgstr ""
4206
5563
4207
#: bzrlib/errors.py:1747
5564
#: bzrlib/errors.py:1672
4208
5565
msgid "HTTP MIME Boundary missing for %(path)s: %(msg)s"
4209
5566
msgstr ""
4210
5567
4211
#: bzrlib/errors.py:1755
5568
#: bzrlib/errors.py:1680
4212
5569
msgid "Invalid http Content-type \"%(ctype)s\" for %(path)s: %(msg)s"
4213
5570
msgstr ""
4214
5571
4215
#: bzrlib/errors.py:1764
5572
#: bzrlib/errors.py:1689
4216
5573
msgid "%(source)s is%(permanently)s redirected to %(target)s"
4217
5574
msgstr ""
4218
5575
4219
#: bzrlib/errors.py:1778
5576
#: bzrlib/errors.py:1703
4220
5577
msgid "Too many redirections"
4221
5578
msgstr ""
4222
5579
4223
#: bzrlib/errors.py:1783
5580
#: bzrlib/errors.py:1708
4224
5581
msgid "Working tree has conflicts."
4225
5582
msgstr ""
4226
5583
4227
#: bzrlib/errors.py:1787
5584
#: bzrlib/errors.py:1712
4228
5585
msgid "Config file %(filename)s is not UTF-8 encoded\n"
4229
5586
msgstr ""
4230
5587
4231
#: bzrlib/errors.py:1796
5588
#: bzrlib/errors.py:1721
4232
5589
msgid ""
4233
5590
"Error(s) parsing config file %(filename)s:\n"
4234
5591
"%(errors)s"
4235
5592
msgstr ""
4236
5593
4237
#: bzrlib/errors.py:1807
5594
#: bzrlib/errors.py:1732
4238
5595
msgid "Bad value \"%(value)s\" for option \"%(name)s\"."
4239
5596
msgstr ""
4240
5597
4241
#: bzrlib/errors.py:1815
5598
#: bzrlib/errors.py:1740
4242
5599
msgid "%(username)r does not seem to contain a reasonable email address"
4243
5600
msgstr ""
4244
5601
4245
#: bzrlib/errors.py:1824
5602
#: bzrlib/errors.py:1749
4246
5603
msgid "Failed to GPG sign data with command \"%(command_line)s\""
4247
5604
msgstr ""
4248
5605
4249
#: bzrlib/errors.py:1832
5606
#: bzrlib/errors.py:1757
4250
5607
msgid "Failed to verify GPG signature data with error \"%(error)s\""
4251
5608
msgstr ""
4252
5609
4253
#: bzrlib/errors.py:1840
5610
#: bzrlib/errors.py:1765
4254
5611
msgid "Unable to import library \"%(library)s\": %(error)s"
4255
5612
msgstr ""
4256
5613
4257
#: bzrlib/errors.py:1848
5614
#: bzrlib/errors.py:1773
4258
5615
msgid "python-gpgme is not installed, it is needed to verify signatures"
4259
5616
msgstr ""
4260
5617
4261
#: bzrlib/errors.py:1856
5618
#: bzrlib/errors.py:1781
4262
5619
msgid ""
4263
5620
"The working tree for %(basedir)s has changed since the last commit, but "
4264
5621
"weave merge requires that it be unchanged"
4265
5622
msgstr ""
4266
5623
4267
#: bzrlib/errors.py:1866
5624
#: bzrlib/errors.py:1791
4268
5625
msgid ""
4269
5626
"Can't reprocess and show base, because reprocessing obscures the "
4270
5627
"relationship of conflicting lines to the base"
4271
5628
msgstr ""
4272
5629
4273
#: bzrlib/errors.py:1872
5630
#: bzrlib/errors.py:1797
4274
5631
msgid "Cycle in graph %(graph)r"
4275
5632
msgstr ""
4276
5633
4277
#: bzrlib/errors.py:1900
5634
#: bzrlib/errors.py:1825
4278
5635
msgid "File %(filename)s is not conflicted."
4279
5636
msgstr ""
4280
5637
4281
#: bzrlib/errors.py:1922
5638
#: bzrlib/errors.py:1847
4282
5639
msgid "No bundle was found in \"%(filename)s\"."
4283
5640
msgstr ""
4284
5641
4285
#: bzrlib/errors.py:1931
5642
#: bzrlib/errors.py:1856
4286
5643
msgid "Unable to handle bundle version %(version)s: %(msg)s"
4287
5644
msgstr ""
4288
5645
4289
#: bzrlib/errors.py:1941
5646
#: bzrlib/errors.py:1866
4290
5647
msgid "Branch %(base)s is missing revision %(text_revision)s of %(file_id)s"
4291
5648
msgstr ""
4292
5649
4293
#: bzrlib/errors.py:1954
5650
#: bzrlib/errors.py:1879
4294
5651
msgid "File id {%(file_id)s} already exists in inventory as %(entry)s"
4295
5652
msgstr ""
4296
5653
4297
#: bzrlib/errors.py:1964
5654
#: bzrlib/errors.py:1889
4298
5655
msgid "Key %(key)s is already present in map"
4299
5656
msgstr ""
4300
5657
4301
#: bzrlib/errors.py:1969
5658
#: bzrlib/errors.py:1894
4302
5659
msgid "The prefix %(prefix)s is in the help search path twice."
4303
5660
msgstr ""
4304
5661
4305
#: bzrlib/errors.py:1977
4306
msgid "Tree transform is malformed %(conflicts)r"
4307
msgstr ""
4308
4309
#: bzrlib/errors.py:1979
5662
#: bzrlib/errors.py:1904
4310
5663
msgid ""
4311
5664
"No final name for trans_id %(trans_id)r\n"
4312
5665
"file-id: %(file_id)r\n"
4313
5666
"root trans-id: %(root_trans_id)r\n"
4314
5667
msgstr ""
4315
5668
4316
#: bzrlib/errors.py:2011
5669
#: bzrlib/errors.py:1936
4317
5670
msgid "Attempt to reuse a transform that has already been applied."
4318
5671
msgstr ""
4319
5672
4320
#: bzrlib/errors.py:2016
5673
#: bzrlib/errors.py:1941
4321
5674
msgid "Moving the root directory is not supported at this time"
4322
5675
msgstr ""
4323
5676
4324
#: bzrlib/errors.py:2021
5677
#: bzrlib/errors.py:1946
4325
5678
msgid "Failed to rename %(from_path)s to %(to_path)s: %(why)s"
4326
5679
msgstr ""
4327
5680
4328
#: bzrlib/errors.py:2032
5681
#: bzrlib/errors.py:1957
4329
5682
msgid ""
4330
5683
"Could not move %(from_path)s%(operator)s %(to_path)s%(_has_extra)s%(extra)s"
4331
5684
msgstr ""
4332
5685
4333
#: bzrlib/errors.py:2068
5686
#: bzrlib/errors.py:1993
4334
5687
msgid ""
4335
5688
"Could not rename %(from_path)s%(operator)s %(to_path)s%(_has_extra)s%(extra)s"
4336
5689
msgstr ""
4337
5690
4338
#: bzrlib/errors.py:2077
4339
msgid ""
4340
"Can't safely remove modified or unknown files:\n"
4341
"%(changes_as_text)sUse --keep to not delete them, or --force to delete them "
4342
"regardless."
4343
msgstr ""
4344
4345
#: bzrlib/errors.py:2114
5691
#: bzrlib/errors.py:2023
4346
5692
msgid "Unable to import paramiko (required for sftp support): %(error)s"
4347
5693
msgstr ""
4348
5694
4349
#: bzrlib/errors.py:2122
5695
#: bzrlib/errors.py:2031
4350
5696
msgid "Nothing to merge."
4351
5697
msgstr ""
4352
5698
4353
#: bzrlib/errors.py:2127
5699
#: bzrlib/errors.py:2036
4354
5700
msgid "Format %(format)s cannot be initialised by this version of bzr."
4355
5701
msgstr ""
4356
5702
4357
#: bzrlib/errors.py:2136
5703
#: bzrlib/errors.py:2045
4358
5704
msgid ""
4359
5705
"Cannot convert from format %(from_format)s to format %(format)s. "
4360
5706
"%(problem)s"
4361
5707
msgstr ""
4362
5708
4363
#: bzrlib/errors.py:2148
5709
#: bzrlib/errors.py:2057
4364
5710
msgid "Could not find an appropriate Differ for file \"%(path)s\""
4365
5711
msgstr ""
4366
5712
4367
#: bzrlib/errors.py:2156
5713
#: bzrlib/errors.py:2065
4368
5714
msgid "%(exe_name)s could not be found on this machine"
4369
5715
msgstr ""
4370
5716
4371
#: bzrlib/errors.py:2164
5717
#: bzrlib/errors.py:2073
4372
5718
msgid "Diff is not installed on this machine: %(msg)s"
4373
5719
msgstr ""
4374
5720
4375
#: bzrlib/errors.py:2172
5721
#: bzrlib/errors.py:2081
4376
5722
msgid "Diff3 is not installed on this machine."
4377
5723
msgstr ""
4378
5724
4379
#: bzrlib/errors.py:2178
5725
#: bzrlib/errors.py:2087
4380
5726
msgid "The content being inserted is already present."
4381
5727
msgstr ""
4382
5728
4383
#: bzrlib/errors.py:2183
5729
#: bzrlib/errors.py:2092
4384
5730
msgid ""
4385
5731
"This tree contains left-over files from a failed operation.\n"
4386
5732
" Please examine %(limbo_dir)s to see if it contains any files you wish "
4388
5734
" keep, and delete it when you are done."
4389
5735
msgstr ""
4390
5736
4391
#: bzrlib/errors.py:2194
5737
#: bzrlib/errors.py:2103
4392
5738
msgid ""
4393
5739
"This tree contains left-over files from a failed operation.\n"
4394
5740
" Please examine %(pending_deletion)s to see if it contains any files you\n"
4395
5741
" wish to keep, and delete it when you are done."
4396
5742
msgstr ""
4397
5743
4398
#: bzrlib/errors.py:2204
5744
#: bzrlib/errors.py:2113
4399
5745
msgid ""
4400
5746
"Unable to delete transform temporary directory %(limbo_dir)s.\n"
4401
5747
" Please examine %(limbo_dir)s to see if it contains any files you wish "
4403
5749
" keep, and delete it when you are done."
4404
5750
msgstr ""
4405
5751
4406
#: bzrlib/errors.py:2215
5752
#: bzrlib/errors.py:2124
4407
5753
msgid ""
4408
5754
"Unable to delete transform temporary directory %(pending_deletion)s. Please "
4409
5755
"examine %(pending_deletion)s to see if it contains any files you wish to "
4410
5756
"keep, and delete it when you are done."
4411
5757
msgstr ""
4412
5758
4413
#: bzrlib/errors.py:2225
5759
#: bzrlib/errors.py:2134
4414
5760
msgid "Working tree is out of date, please run 'bzr update'.%(more)s"
4415
5761
msgstr ""
4416
5762
4417
#: bzrlib/errors.py:2239
5763
#: bzrlib/errors.py:2148
4418
5764
msgid "Public branch \"%(public_location)s\" lacks revision \"%(revstring)s\"."
4419
5765
msgstr ""
4420
5766
4421
#: bzrlib/errors.py:2252
5767
#: bzrlib/errors.py:2161
4422
5768
msgid "Error in merge modified format"
4423
5769
msgstr ""
4424
5770
4425
#: bzrlib/errors.py:2257
5771
#: bzrlib/errors.py:2166
4426
5772
msgid "Format error in conflict listings"
4427
5773
msgstr ""
4428
5774
4429
#: bzrlib/errors.py:2261
5775
#: bzrlib/errors.py:2170
4430
5776
msgid ""
4431
5777
"Inconsistency in dirstate file %(dirstate_path)s.\n"
4432
5778
"Error: %(description)s"
4433
5779
msgstr ""
4434
5780
4435
#: bzrlib/errors.py:2272
5781
#: bzrlib/errors.py:2181
4436
5782
msgid ""
4437
5783
"An error has been detected in the repository %(repo_path)s.\n"
4438
5784
"Please run bzr reconcile on this repository."
4439
5785
msgstr ""
4440
5786
4441
#: bzrlib/errors.py:2283
5787
#: bzrlib/errors.py:2192
4442
5788
msgid ""
4443
5789
"An inconsistent delta was supplied involving %(path)r, %(file_id)r\n"
4444
5790
"reason: %(reason)s"
4445
5791
msgstr ""
4446
5792
4447
#: bzrlib/errors.py:2296
5793
#: bzrlib/errors.py:2205
4448
5794
msgid ""
4449
5795
"An inconsistent delta was supplied: %(delta)r\n"
4450
5796
"reason: %(reason)s"
4451
5797
msgstr ""
4452
5798
4453
#: bzrlib/errors.py:2308
5799
#: bzrlib/errors.py:2217
4454
5800
msgid "To use this feature you must upgrade your branch at %(path)s."
4455
5801
msgstr ""
4456
5802
4457
#: bzrlib/errors.py:2317
5803
#: bzrlib/errors.py:2226
4458
5804
msgid "To use this feature you must upgrade your repository at %(path)s."
4459
5805
msgstr ""
4460
5806
4461
#: bzrlib/errors.py:2322
5807
#: bzrlib/errors.py:2231
4462
5808
msgid ""
4463
5809
"To use this feature you must upgrade your branch at %(path)s to a format "
4464
5810
"which supports rich roots."
4465
5811
msgstr ""
4466
5812
4467
#: bzrlib/errors.py:2328
5813
#: bzrlib/errors.py:2237
4468
5814
msgid "Cannot perform local-only commits on unbound branches."
4469
5815
msgstr ""
4470
5816
4471
#: bzrlib/errors.py:2333
5817
#: bzrlib/errors.py:2242
4472
5818
msgid "The method %(mname)s is not supported on objects of type %(tname)s."
4473
5819
msgstr ""
4474
5820
4475
#: bzrlib/errors.py:2354
5821
#: bzrlib/errors.py:2263
5822
msgid "Ghost tags not supported by format %(format)r."
5823
msgstr ""
5824
5825
#: bzrlib/errors.py:2271
4476
5826
msgid "File is binary but should be text."
4477
5827
msgstr ""
4478
5828
4479
#: bzrlib/errors.py:2359
5829
#: bzrlib/errors.py:2276
4480
5830
msgid "The path %(path)s is not permitted on this platform"
4481
5831
msgstr ""
4482
5832
4483
#: bzrlib/errors.py:2368
5833
#: bzrlib/errors.py:2285
4484
5834
msgid ""
4485
5835
"Testament did not match expected value.\n"
4486
5836
" For revision_id {%(revision_id)s}, expected {%(expected)s}, measured\n"
4487
5837
" {%(measured)s}"
4488
5838
msgstr ""
4489
5839
4490
#: bzrlib/errors.py:2380
5840
#: bzrlib/errors.py:2297
4491
5841
msgid "Not a bzr revision-bundle: %(text)r"
4492
5842
msgstr ""
4493
5843
4494
#: bzrlib/errors.py:2389
5844
#: bzrlib/errors.py:2306
4495
5845
msgid "Bad bzr revision-bundle: %(text)r"
4496
5846
msgstr ""
4497
5847
4498
#: bzrlib/errors.py:2398
5848
#: bzrlib/errors.py:2315
4499
5849
msgid "Malformed bzr revision-bundle header: %(text)r"
4500
5850
msgstr ""
4501
5851
4502
#: bzrlib/errors.py:2403
5852
#: bzrlib/errors.py:2320
4503
5853
msgid "Malformed patches in bzr revision-bundle: %(text)r"
4504
5854
msgstr ""
4505
5855
4506
#: bzrlib/errors.py:2408
5856
#: bzrlib/errors.py:2325
4507
5857
msgid "Malformed footer in bzr revision-bundle: %(text)r"
4508
5858
msgstr ""
4509
5859
4510
#: bzrlib/errors.py:2413
5860
#: bzrlib/errors.py:2330
4511
5861
msgid "End of line marker was not \\n in bzr revision-bundle"
4512
5862
msgstr ""
4513
5863
4514
#: bzrlib/errors.py:2423
5864
#: bzrlib/errors.py:2340
4515
5865
msgid "Bundle format %(bundle_format)s is incompatible with %(other)s"
4516
5866
msgstr ""
4517
5867
4518
#: bzrlib/errors.py:2433
5868
#: bzrlib/errors.py:2350
4519
5869
msgid "Root class for inventory serialization errors"
4520
5870
msgstr ""
4521
5871
4522
#: bzrlib/errors.py:2437
5872
#: bzrlib/errors.py:2354
4523
5873
msgid ""
4524
5874
"The inventory was not in the expected format:\n"
4525
5875
" %(msg)s"
4526
5876
msgstr ""
4527
5877
4528
#: bzrlib/errors.py:2446
5878
#: bzrlib/errors.py:2363
4529
5879
msgid "This operation requires rich root data storage"
4530
5880
msgstr ""
4531
5881
4532
#: bzrlib/errors.py:2459
5882
#: bzrlib/errors.py:2376
4533
5883
msgid "Unrecognised value for BZR_SSH environment variable: %(vendor)s"
4534
5884
msgstr ""
4535
5885
4536
#: bzrlib/errors.py:2468
5886
#: bzrlib/errors.py:2385
4537
5887
msgid ""
4538
5888
"Don't know how to handle SSH connections. Please set BZR_SSH environment "
4539
5889
"variable."
4540
5890
msgstr ""
4541
5891
4542
#: bzrlib/errors.py:2475
5892
#: bzrlib/errors.py:2392
4543
5893
msgid ""
4544
5894
"Could not determine revno for {%(revision_id)s} because its ancestry shows a "
4545
5895
"ghost at {%(ghost_revision_id)s}"
4546
5896
msgstr ""
4547
5897
4548
#: bzrlib/errors.py:2485
5898
#: bzrlib/errors.py:2402
4549
5899
msgid "Ghost revision {%(revision_id)s} cannot be used here."
4550
5900
msgstr ""
4551
5901
4552
#: bzrlib/errors.py:2536
5902
#: bzrlib/errors.py:2453
4553
5903
msgid ""
4554
5904
"A merge directive must provide either a bundle or a public branch location."
4555
5905
msgstr ""
4556
5906
4557
#: bzrlib/errors.py:2543
5907
#: bzrlib/errors.py:2460
4558
5908
msgid "Bad merge directive payload %(start)r"
4559
5909
msgstr ""
4560
5910
4561
#: bzrlib/errors.py:2553
5911
#: bzrlib/errors.py:2470
4562
5912
msgid "Preview patch does not match requested changes."
4563
5913
msgstr ""
4564
5914
4565
#: bzrlib/errors.py:2559
5915
#: bzrlib/errors.py:2476
4566
5916
msgid "Patch_type was %(patch_type)s, but no patch was supplied."
4567
5917
msgstr ""
4568
5918
4569
#: bzrlib/errors.py:2569
5919
#: bzrlib/errors.py:2486
4570
5920
msgid ""
4571
5921
"Your branch does not have all of the revisions required in order to merge "
4572
5922
"this merge directive and the target location specified in the merge "
4573
5923
"directive is not a branch: %(location)s."
4574
5924
msgstr ""
4575
5925
4576
#: bzrlib/errors.py:2581
5926
#: bzrlib/errors.py:2498
4577
5927
msgid "Unsupported entry kind %(kind)s"
4578
5928
msgstr ""
4579
5929
4580
#: bzrlib/errors.py:2589
5930
#: bzrlib/errors.py:2506
4581
5931
msgid "Can't subsume %(other_tree)s into %(tree)s. %(reason)s"
4582
5932
msgstr ""
4583
5933
4584
#: bzrlib/errors.py:2599
5934
#: bzrlib/errors.py:2516
4585
5935
msgid "Subsume target %(other_tree)s needs to be upgraded."
4586
5936
msgstr ""
4587
5937
4588
#: bzrlib/errors.py:2618
5938
#: bzrlib/errors.py:2535
4589
5939
msgid "No such tag: %(tag_name)s"
4590
5940
msgstr ""
4591
5941
4592
#: bzrlib/errors.py:2626
5942
#: bzrlib/errors.py:2543
4593
5943
msgid "Tags not supported by %(branch)s; you may be able to use bzr upgrade."
4594
5944
msgstr ""
4595
5945
4596
#: bzrlib/errors.py:2635
5946
#: bzrlib/errors.py:2552
4597
5947
msgid "Tag %(tag_name)s already exists."
4598
5948
msgstr ""
4599
5949
4600
#: bzrlib/errors.py:2643
5950
#: bzrlib/errors.py:2560
4601
5951
msgid ""
4602
5952
"Did not understand bug identifier %(bug_id)s: %(reason)s. See \"bzr help bugs"
4603
5953
"\" for more information on this feature."
4604
5954
msgstr ""
4605
5955
4606
#: bzrlib/errors.py:2653
5956
#: bzrlib/errors.py:2570
4607
5957
msgid ""
4608
5958
"The URL for bug tracker \"%(abbreviation)s\" doesn't contain {id}: %(url)s"
4609
5959
msgstr ""
4610
5960
4611
#: bzrlib/errors.py:2663
5961
#: bzrlib/errors.py:2580
4612
5962
msgid ""
4613
5963
"Cannot find registered bug tracker called %(abbreviation)s on %(branch)s"
4614
5964
msgstr ""
4615
5965
4616
#: bzrlib/errors.py:2673
5966
#: bzrlib/errors.py:2590
4617
5967
msgid "Invalid line in bugs property: '%(line)s'"
4618
5968
msgstr ""
4619
5969
4620
#: bzrlib/errors.py:2681
5970
#: bzrlib/errors.py:2598
4621
5971
msgid "Invalid bug status: '%(status)s'"
4622
5972
msgstr ""
4623
5973
4624
#: bzrlib/errors.py:2689
5974
#: bzrlib/errors.py:2606
4625
5975
msgid "Could not understand response from smart server: %(response_tuple)r"
4626
5976
msgstr ""
4627
5977
4628
#: bzrlib/errors.py:2728
5978
#: bzrlib/errors.py:2645
4629
5979
msgid "Server sent an unexpected error: %(error_tuple)r"
4630
5980
msgstr ""
4631
5981
4632
#: bzrlib/errors.py:2747
5982
#: bzrlib/errors.py:2664
4633
5983
msgid "Unrecognised container format: %(container_format)r"
4634
5984
msgstr ""
4635
5985
4636
#: bzrlib/errors.py:2755
5986
#: bzrlib/errors.py:2672
4637
5987
msgid "Unexpected end of container stream"
4638
5988
msgstr ""
4639
5989
4640
#: bzrlib/errors.py:2760
5990
#: bzrlib/errors.py:2677
4641
5991
msgid "Unknown record type: %(record_type)r"
4642
5992
msgstr ""
4643
5993
4644
#: bzrlib/errors.py:2768
5994
#: bzrlib/errors.py:2685
4645
5995
msgid "Invalid record: %(reason)s"
4646
5996
msgstr ""
4647
5997
4648
#: bzrlib/errors.py:2776
5998
#: bzrlib/errors.py:2693
4649
5999
msgid "Container has data after end marker: %(excess)r"
4650
6000
msgstr ""
4651
6001
4652
#: bzrlib/errors.py:2784
6002
#: bzrlib/errors.py:2701
4653
6003
msgid "Container has multiple records with the same name: %(name)s"
4654
6004
msgstr ""
4655
6005
4656
#: bzrlib/errors.py:2797
6006
#: bzrlib/errors.py:2714
4657
6007
msgid "Corrupt or incompatible data stream: %(reason)s"
4658
6008
msgstr ""
4659
6009
4660
#: bzrlib/errors.py:2805
6010
#: bzrlib/errors.py:2722
4661
6011
msgid "SMTP error: %(error)s"
4662
6012
msgstr ""
4663
6013
4664
#: bzrlib/errors.py:2813
6014
#: bzrlib/errors.py:2730
4665
6015
msgid "No message supplied."
4666
6016
msgstr ""
4667
6017
4668
#: bzrlib/errors.py:2818
6018
#: bzrlib/errors.py:2735
4669
6019
msgid "No mail-to address (--mail-to) or output (-o) specified."
4670
6020
msgstr ""
4671
6021
4672
#: bzrlib/errors.py:2823
6022
#: bzrlib/errors.py:2740
4673
6023
msgid "Unknown mail client: %(mail_client)s"
4674
6024
msgstr ""
4675
6025
4676
#: bzrlib/errors.py:2831
6026
#: bzrlib/errors.py:2748
4677
6027
msgid ""
4678
6028
"Unable to find mail client with the following names: "
4679
6029
"%(mail_command_list_string)s"
4680
6030
msgstr ""
4681
6031
4682
#: bzrlib/errors.py:2841
6032
#: bzrlib/errors.py:2758
4683
6033
msgid "SMTP connection to %(host)s refused"
4684
6034
msgstr ""
4685
6035
4686
#: bzrlib/errors.py:2850
6036
#: bzrlib/errors.py:2767
4687
6037
msgid "Please specify smtp_server. No server at default %(host)s."
4688
6038
msgstr ""
4689
6039
4690
#: bzrlib/errors.py:2864
6040
#: bzrlib/errors.py:2781
4691
6041
msgid ""
4692
6042
"'%(display_url)s' is not in sync with %(target_url)s. See bzr help sync-for-"
4693
6043
"reconfigure."
4694
6044
msgstr ""
4695
6045
4696
#: bzrlib/errors.py:2876
6046
#: bzrlib/errors.py:2793
4697
6047
msgid "'%(display_url)s' is already a branch."
4698
6048
msgstr ""
4699
6049
4700
#: bzrlib/errors.py:2881
6050
#: bzrlib/errors.py:2798
4701
6051
msgid "'%(display_url)s' is already a tree."
4702
6052
msgstr ""
4703
6053
4704
#: bzrlib/errors.py:2886
6054
#: bzrlib/errors.py:2803
4705
6055
msgid "'%(display_url)s' is already a checkout."
4706
6056
msgstr ""
4707
6057
4708
#: bzrlib/errors.py:2891
6058
#: bzrlib/errors.py:2808
4709
6059
msgid "'%(display_url)s' is already a lightweight checkout."
4710
6060
msgstr ""
4711
6061
4712
#: bzrlib/errors.py:2896
6062
#: bzrlib/errors.py:2813
4713
6063
msgid "'%(display_url)s' is already using a shared repository."
4714
6064
msgstr ""
4715
6065
4716
#: bzrlib/errors.py:2901
6066
#: bzrlib/errors.py:2818
4717
6067
msgid "'%(display_url)s' is already standalone."
4718
6068
msgstr ""
4719
6069
4720
#: bzrlib/errors.py:2906
6070
#: bzrlib/errors.py:2823
4721
6071
msgid "Shared repository '%(display_url)s' already creates working trees."
4722
6072
msgstr ""
4723
6073
4724
#: bzrlib/errors.py:2912
6074
#: bzrlib/errors.py:2829
4725
6075
msgid ""
4726
6076
"Shared repository '%(display_url)s' already doesn't create working trees."
4727
6077
msgstr ""
4728
6078
4729
#: bzrlib/errors.py:2918
6079
#: bzrlib/errors.py:2835
4730
6080
msgid "Requested reconfiguration of '%(display_url)s' is not supported."
4731
6081
msgstr ""
4732
6082
4733
#: bzrlib/errors.py:2923
6083
#: bzrlib/errors.py:2840
4734
6084
msgid "No location could be found to bind to at %(display_url)s."
4735
6085
msgstr ""
4736
6086
4737
#: bzrlib/errors.py:2928
6087
#: bzrlib/errors.py:2845
4738
6088
msgid ""
4739
6089
"Working tree \"%(display_url)s\" has uncommitted changes (See bzr status)."
4740
6090
"%(more)s"
4741
6091
msgstr ""
4742
6092
4743
#: bzrlib/errors.py:2947
6093
#: bzrlib/errors.py:2864
4744
6094
msgid ""
4745
6095
"Working tree \"%(display_url)s\" has shelved changes (See bzr shelve --list)."
4746
6096
"%(more)s"
4747
6097
msgstr ""
4748
6098
4749
#: bzrlib/errors.py:2953
6099
#: bzrlib/errors.py:2870
4750
6100
msgid "Variable {%(name)s} is not available."
4751
6101
msgstr ""
4752
6102
4753
#: bzrlib/errors.py:2961
6103
#: bzrlib/errors.py:2878
4754
6104
msgid "No template specified."
4755
6105
msgstr ""
4756
6106
4757
#: bzrlib/errors.py:2966
6107
#: bzrlib/errors.py:2883
4758
6108
msgid "Unable to create symlink %(path_str)son this platform"
4759
6109
msgstr ""
4760
6110
4761
#: bzrlib/errors.py:2981
6111
#: bzrlib/errors.py:2898
4762
6112
msgid ""
4763
6113
"Unsupported timezone format \"%(timezone)s\", options are \"utc\", \"original"
4764
6114
"\", \"local\"."
4765
6115
msgstr ""
4766
6116
4767
#: bzrlib/errors.py:3015
6117
#: bzrlib/errors.py:2932
4768
6118
msgid ""
4769
6119
"Unable to encode %(kind)s path %(path)r in user encoding %(user_encoding)s"
4770
6120
msgstr ""
4771
6121
4772
#: bzrlib/errors.py:3027
6122
#: bzrlib/errors.py:2944
4773
6123
msgid "The \"%(config_id)s\" configuration does not exist."
4774
6124
msgstr ""
4775
6125
4776
#: bzrlib/errors.py:3035
6126
#: bzrlib/errors.py:2952
4777
6127
msgid "The \"%(option_name)s\" configuration option does not exist."
4778
6128
msgstr ""
4779
6129
4780
#: bzrlib/errors.py:3043
6130
#: bzrlib/errors.py:2960
4781
6131
msgid "The alias \"%(alias_name)s\" does not exist."
4782
6132
msgstr ""
4783
6133
4784
#: bzrlib/errors.py:3057
6134
#: bzrlib/errors.py:2974
4785
6135
msgid "\"%(alias_name)s\" is not a valid location alias."
4786
6136
msgstr ""
4787
6137
4788
#: bzrlib/errors.py:3065
6138
#: bzrlib/errors.py:2982
4789
6139
msgid "No %(alias_name)s location assigned."
4790
6140
msgstr ""
4791
6141
4792
#: bzrlib/errors.py:3073
6142
#: bzrlib/errors.py:2990
4793
6143
msgid "Cannot bind address \"%(host)s:%(port)i\": %(orig_error)s."
4794
6144
msgstr ""
4795
6145
4796
#: bzrlib/errors.py:3083
6146
#: bzrlib/errors.py:3000
4797
6147
msgid "Unknown rules detected: %(unknowns_str)s."
4798
6148
msgstr ""
4799
6149
4800
#: bzrlib/errors.py:3096
4801
msgid ""
4802
"Hook '%(hook_name)s' during %(hook_stage)s failed:\n"
4803
"%(traceback_text)s%(exc_value)s"
4804
msgstr ""
4805
4806
#: bzrlib/errors.py:3119
6150
#: bzrlib/errors.py:3011
4807
6151
msgid "Tip change rejected: %(msg)s"
4808
6152
msgstr ""
4809
6153
4810
#: bzrlib/errors.py:3127
6154
#: bzrlib/errors.py:3019
4811
6155
msgid "Shelf corrupt."
4812
6156
msgstr ""
4813
6157
4814
#: bzrlib/errors.py:3132
6158
#: bzrlib/errors.py:3024
4815
6159
msgid "Corruption while decompressing repository file%(orig_error)s"
4816
6160
msgstr ""
4817
6161
4818
#: bzrlib/errors.py:3144
6162
#: bzrlib/errors.py:3036
4819
6163
msgid "No changes are shelved with id \"%(shelf_id)d\"."
4820
6164
msgstr ""
4821
6165
4822
#: bzrlib/errors.py:3152
6166
#: bzrlib/errors.py:3044
4823
6167
msgid "\"%(invalid_id)s\" is not a valid shelf id, try a number instead."
4824
6168
msgstr ""
4825
6169
4826
#: bzrlib/errors.py:3160
6170
#: bzrlib/errors.py:3052
4827
6171
msgid "An attempt to access a url outside the server jail was made: '%(url)s'."
4828
6172
msgstr ""
4829
6173
4830
#: bzrlib/errors.py:3168
6174
#: bzrlib/errors.py:3060
4831
6175
msgid "The user aborted the operation."
4832
6176
msgstr ""
4833
6177
4834
#: bzrlib/errors.py:3173
6178
#: bzrlib/errors.py:3065
4835
6179
msgid "Branching '%(url)s'(%(format)s) must create a working tree."
4836
6180
msgstr ""
4837
6181
4838
#: bzrlib/errors.py:3183
6182
#: bzrlib/errors.py:3075
4839
6183
msgid "No such view: %(view_name)s."
4840
6184
msgstr ""
4841
6185
4842
#: bzrlib/errors.py:3193
6186
#: bzrlib/errors.py:3085
4843
6187
msgid ""
4844
6188
"Views are not supported by %(tree)s; use 'bzr upgrade' to change your tree "
4845
6189
"to a later format."
4846
6190
msgstr ""
4847
6191
4848
#: bzrlib/errors.py:3202
6192
#: bzrlib/errors.py:3094
4849
6193
msgid ""
4850
6194
"Specified file \"%(file_name)s\" is outside the current view: %(view_str)s"
4851
6195
msgstr ""
4852
6196
4853
#: bzrlib/errors.py:3269
6197
#: bzrlib/errors.py:3161
4854
6198
msgid "%(bzrdir)r does not support co-located branches."
4855
6199
msgstr ""
4856
6200
4857
#: bzrlib/errors.py:3275
6201
#: bzrlib/errors.py:3167
4858
6202
msgid ""
4859
6203
"Unable to determine your name.\n"
4860
6204
"Please, set your name with the 'whoami' command.\n"
4861
6205
"E.g. bzr whoami \"Your Name <name@example.com>\""
4862
6206
msgstr ""
4863
6207
4864
#: bzrlib/errors.py:3284
6208
#: bzrlib/errors.py:3176
4865
6209
msgid "Invalid pattern(s) found. %(msg)s"
4866
6210
msgstr ""
4867
6211
4868
#: bzrlib/errors.py:3292
6212
#: bzrlib/errors.py:3184
4869
6213
msgid ""
4870
6214
"Branch \"%(branch_url)s\" appears to be bound to itself. Please use `bzr "
4871
6215
"unbind` to fix."
4872
6216
msgstr ""
4873
6217
4874
#: bzrlib/errors.py:3303
6218
#: bzrlib/errors.py:3195
4875
6219
msgid "Loop involving %(refs)r while expanding \"%(string)s\"."
4876
6220
msgstr ""
4877
6221
4878
#: bzrlib/errors.py:3312
6222
#: bzrlib/errors.py:3204
4879
6223
msgid "Option %(name)s is not defined while expanding \"%(string)s\"."
4880
6224
msgstr ""
4881
6225
4882
#: bzrlib/errors.py:3321
6226
#: bzrlib/errors.py:3213
4883
6227
msgid ""
4884
6228
"No compatible object available for operations from %(source)r to %(target)r."
4885
6229
msgstr ""
4886
6230
4887
#: bzrlib/gpg.py:126 bzrlib/gpg.py:464
6231
#: bzrlib/errors.py:3223
6232
msgid ""
6233
"VFS requests over the smart server are not allowed. Encountered: %(method)s, "
6234
"%(arguments)s."
6235
msgstr ""
6236
6237
#: bzrlib/errors.py:3233
6238
msgid ""
6239
"Kind change from %(from_kind)s to %(to_kind)s for %(path)s not supported by "
6240
"format %(format)r"
6241
msgstr ""
6242
6243
#: bzrlib/errors.py:3249
6244
msgid "Binary files section encountered."
6245
msgstr ""
6246
6247
#: bzrlib/errors.py:3257
6248
msgid ""
6249
"Malformed patch header. %(desc)s\n"
6250
"%(line)r"
6251
msgstr ""
6252
6253
#: bzrlib/errors.py:3266
6254
msgid ""
6255
"Malformed hunk header. %(desc)s\n"
6256
"%(line)r"
6257
msgstr ""
6258
6259
#: bzrlib/errors.py:3275
6260
msgid ""
6261
"Malformed line. %(desc)s\n"
6262
"%(line)r"
6263
msgstr ""
6264
6265
#: bzrlib/errors.py:3285
6266
msgid ""
6267
"Text contents mismatch at line %(line_no)d. Original has \"%(orig_line)s\", "
6268
"but patch says it should be \"%(patch_line)s\""
6269
msgstr ""
6270
6271
#: bzrlib/export_pot.py:246
6272
#, python-format
6273
msgid "Exporting messages from builtin command: %s"
6274
msgstr ""
6275
6276
#: bzrlib/export_pot.py:265
6277
msgid "Exporting messages from plugin command: {0} in {1}"
6278
msgstr ""
6279
6280
#: bzrlib/export_pot.py:286
6281
#, python-format
6282
msgid "Exporting message from error: %s"
6283
msgstr ""
6284
6285
#: bzrlib/fetch.py:97
6286
msgid "Finding revisions"
6287
msgstr ""
6288
6289
#: bzrlib/fetch.py:102
6290
msgid "Fetching revisions"
6291
msgstr ""
6292
6293
#: bzrlib/foreign.py:261
6294
msgid "Push into a different VCS without any custom bzr metadata."
6295
msgstr ""
6296
6297
#: bzrlib/foreign.py:263
6298
msgid ""
6299
"This will afterwards rebase the local branch on the remote\n"
6300
"branch unless the --no-rebase option is used, in which case \n"
6301
"the two branches will be out of sync after the push. "
6302
msgstr ""
6303
6304
# help of 'directory' option of 'dpush' command
6305
#: bzrlib/foreign.py:271
6306
msgid ""
6307
"Branch to push from, rather than the one containing the working directory."
6308
msgstr ""
6309
6310
# help of 'no-rebase' option of 'dpush' command
6311
#: bzrlib/foreign.py:276
6312
msgid "Do not rebase after push."
6313
msgstr ""
6314
6315
# help of 'strict' option of 'dpush' command
6316
#: bzrlib/foreign.py:278
6317
msgid ""
6318
"Refuse to push if there are uncommitted changes in the working tree, --no-"
6319
"strict disables the check."
6320
msgstr ""
6321
6322
#: bzrlib/foreign.py:310
6323
#, python-format
6324
msgid "Using saved location: %s\n"
6325
msgstr ""
6326
6327
#: bzrlib/foreign.py:320
6328
msgid ""
6329
"{0!r} and {1!r} are in the same VCS, lossy push not necessary. Please use "
6330
"regular push."
6331
msgstr ""
6332
6333
#: bzrlib/gpg.py:116 bzrlib/gpg.py:454
4888
6334
msgid "{0} commits with valid signatures"
4889
6335
msgstr ""
4890
6336
4891
#: bzrlib/gpg.py:130 bzrlib/gpg.py:469
6337
#: bzrlib/gpg.py:120 bzrlib/gpg.py:459
4892
6338
msgid "{0} commit with unknown key"
4893
6339
msgid_plural "{0} commits with unknown keys"
4894
6340
msgstr[0] ""
4895
6341
msgstr[1] ""
4896
6342
4897
#: bzrlib/gpg.py:136 bzrlib/gpg.py:476
6343
#: bzrlib/gpg.py:126 bzrlib/gpg.py:466
4898
6344
msgid "{0} commit not valid"
4899
6345
msgid_plural "{0} commits not valid"
4900
6346
msgstr[0] ""
4901
6347
msgstr[1] ""
4902
6348
4903
#: bzrlib/gpg.py:142 bzrlib/gpg.py:483
6349
#: bzrlib/gpg.py:132 bzrlib/gpg.py:473
4904
6350
msgid "{0} commit not signed"
4905
6351
msgid_plural "{0} commits not signed"
4906
6352
msgstr[0] ""
4907
6353
msgstr[1] ""
4908
6354
4909
#: bzrlib/gpg.py:148 bzrlib/gpg.py:490
6355
#: bzrlib/gpg.py:138 bzrlib/gpg.py:480
4910
6356
msgid "{0} commit with key now expired"
4911
6357
msgid_plural "{0} commits with key now expired"
4912
6358
msgstr[0] ""
4913
6359
msgstr[1] ""
4914
6360
4915
#: bzrlib/gpg.py:346
4916
msgid "No GnuPG key results for pattern: {}"
6361
#: bzrlib/gpg.py:336
6362
msgid "No GnuPG key results for pattern: {0}"
4917
6363
msgstr ""
4918
6364
4919
#: bzrlib/gpg.py:389
6365
#: bzrlib/gpg.py:379
4920
6366
msgid "{0} signed {1} commit"
4921
6367
msgid_plural "{0} signed {1} commits"
4922
6368
msgstr[0] ""
4923
6369
msgstr[1] ""
4924
6370
4925
#: bzrlib/gpg.py:406 bzrlib/gpg.py:422
6371
#: bzrlib/gpg.py:396 bzrlib/gpg.py:412
4926
6372
msgid "{0} commit by author {1}"
4927
6373
msgid_plural "{0} commits by author {1}"
4928
6374
msgstr[0] ""
4929
6375
msgstr[1] ""
4930
6376
4931
#: bzrlib/gpg.py:436
6377
#: bzrlib/gpg.py:426
4932
6378
msgid "Unknown key {0} signed {1} commit"
4933
6379
msgid_plural "Unknown key {0} signed {1} commits"
4934
6380
msgstr[0] ""
4935
6381
msgstr[1] ""
4936
6382
4937
#: bzrlib/gpg.py:454
6383
#: bzrlib/gpg.py:444
4938
6384
msgid "{0} commit by author {1} with key {2} now expired"
4939
6385
msgid_plural "{0} commits by author {1} with key {2} now expired"
4940
6386
msgstr[0] ""
4941
6387
msgstr[1] ""
4942
6388
6389
#: bzrlib/groupcompress.py:1737
6390
#, python-format
6391
msgid "Insert claimed random_id=True, but then inserted %r two times"
6392
msgstr ""
6393
6394
#: bzrlib/hooks.py:329
6395
#, python-format
6396
msgid "Introduced in: %s"
6397
msgstr ""
6398
6399
#: bzrlib/hooks.py:332
6400
#, python-format
6401
msgid "Deprecated in: %s"
6402
msgstr ""
6403
6404
#: bzrlib/knit.py:1764 bzrlib/knit.py:1800
6405
msgid "Walking content"
6406
msgstr ""
6407
6408
#: bzrlib/knit.py:3328
6409
msgid "annotating"
6410
msgstr ""
6411
6412
#: bzrlib/lock.py:547
6413
msgid "{0!r} was {1} locked again"
6414
msgstr ""
6415
6416
#: bzrlib/lockdir.py:320
6417
#, python-format
6418
msgid "error removing pending lock: %s"
6419
msgstr ""
6420
6421
#: bzrlib/lockdir.py:615
6422
msgid "Unable to obtain"
6423
msgstr ""
6424
6425
#: bzrlib/lockdir.py:617
6426
msgid "Lock owner changed for"
6427
msgstr ""
6428
6429
#: bzrlib/lockdir.py:619
6430
msgid "{0} lock {1} {2}."
6431
msgstr ""
6432
6433
#: bzrlib/lockdir.py:626
6434
#, python-format
6435
msgid "Will continue to try until %s, unless you press Ctrl-C."
6436
msgstr ""
6437
6438
#: bzrlib/lockdir.py:628
6439
msgid "See \"bzr help break-lock\" for more."
6440
msgstr ""
6441
6442
#: bzrlib/lockdir.py:738
6443
#, python-format
6444
msgid ""
6445
"held by %(user)s on %(hostname)s (process #%(pid)s), acquired %(time_ago)s"
6446
msgstr ""
6447
6448
#: bzrlib/log.py:572
6449
msgid "--exclude-common-ancestry requires two different revisions"
6450
msgstr ""
6451
6452
#: bzrlib/log.py:574
6453
#, python-format
6454
msgid "invalid direction %r"
6455
msgstr ""
6456
6457
#: bzrlib/log.py:621
6458
msgid "Start revision not found in left-hand history of end revision."
6459
msgstr ""
6460
6461
#: bzrlib/log.py:667
6462
msgid "Start revision not found in history of end revision."
6463
msgstr ""
6464
6465
#: bzrlib/log.py:1085 bzrlib/log.py:1143
6466
msgid "Logging revision 0 is invalid."
6467
msgstr ""
6468
6469
#: bzrlib/log.py:1087 bzrlib/log.py:1145
6470
msgid "Start revision must be older than the end revision."
6471
msgstr ""
6472
6473
#: bzrlib/log.py:1832
6474
#, python-format
6475
msgid "unknown log formatter: %r"
6476
msgstr ""
6477
6478
#: bzrlib/log.py:2128
6479
msgid "fixes bug"
6480
msgid_plural "fixes bugs"
6481
msgstr[0] ""
6482
msgstr[1] ""
6483
6484
#: bzrlib/merge.py:718
6485
msgid "All changes applied successfully."
6486
msgstr ""
6487
6488
#: bzrlib/merge.py:720
6489
#, python-format
6490
msgid "%d conflicts encountered."
6491
msgstr ""
6492
6493
#: bzrlib/merge.py:868 bzrlib/merge.py:1956
6494
msgid "Preparing file merge"
6495
msgstr ""
6496
6497
#: bzrlib/multiparent.py:424
6498
msgid "Importing revisions"
6499
msgstr ""
6500
4943
6501
# help of 'help' option
4944
#: bzrlib/option.py:515
6502
#: bzrlib/option.py:524
4945
6503
msgid "Show help message."
4946
6504
msgstr ""
4947
6505
6506
# help of 'quiet' option
6507
#: bzrlib/option.py:526
6508
msgid "Only display errors and warnings."
6509
msgstr ""
6510
4948
6511
# help of 'usage' option
4949
#: bzrlib/option.py:517
6512
#: bzrlib/option.py:529
4950
6513
msgid "Show usage message and options."
4951
6514
msgstr ""
4952
6515
4953
6516
# help of 'verbose' option
4954
#: bzrlib/option.py:519
6517
#: bzrlib/option.py:531
4955
6518
msgid "Display more information."
4956
6519
msgstr ""
4957
6520
4958
# help of 'quiet' option
4959
#: bzrlib/option.py:522
4960
msgid "Only display errors and warnings."
4961
msgstr ""
4962
4963
# help of 'overwrite' option
4964
#: bzrlib/option.py:527
4965
msgid "Ignore differences between branches and overwrite unconditionally."
4966
msgstr ""
4967
4968
# help of 'message' option
4969
#: bzrlib/option.py:538
4970
msgid "Message string."
4971
msgstr ""
4972
4973
# help of 'null' option
4974
#: bzrlib/option.py:541
4975
msgid "Use an ASCII NUL (\\0) separator rather than a newline."
4976
msgstr ""
4977
4978
# help of 'profile' option
4979
#: bzrlib/option.py:544
4980
msgid "Show performance profiling information."
4981
msgstr ""
4982
4983
# help of 'revision' option
4984
#: bzrlib/option.py:548
4985
msgid "See \"help revisionspec\" for details."
4986
msgstr ""
4987
4988
6521
# help of 'change' option
4989
#: bzrlib/option.py:553
6522
#: bzrlib/option.py:539
4990
6523
msgid ""
4991
6524
"Select changes introduced by the specified revision. See also \"help "
4992
6525
"revisionspec\"."
4993
6526
msgstr ""
4994
6527
4995
# help of 'show-ids' option
4996
#: bzrlib/option.py:555
4997
msgid "Show internal object ids."
4998
msgstr ""
4999
5000
# help of 'timezone' option
5001
#: bzrlib/option.py:558
5002
msgid "Display timezone as local, original, or utc."
6528
# help of 'directory' option
6529
#: bzrlib/option.py:541
6530
msgid "Branch to operate on, instead of working directory."
6531
msgstr ""
6532
6533
# help of 'log-format=long' option
6534
#: bzrlib/option.py:543
6535
msgid "Detailed log format."
6536
msgstr ""
6537
6538
# help of 'log-format=gnu-changelog' option
6539
#: bzrlib/option.py:543
6540
msgid "Format used by GNU ChangeLog files."
6541
msgstr ""
6542
6543
# help of 'log-format=line' option
6544
#: bzrlib/option.py:543
6545
msgid "Log format with one line per revision."
6546
msgstr ""
6547
6548
# help of 'log-format=short' option
6549
#: bzrlib/option.py:543
6550
msgid "Moderately short log format."
5003
6551
msgstr ""
5004
6552
5005
6553
# help of 'log-format' option
5006
#: bzrlib/option.py:563
6554
#: bzrlib/option.py:543
5007
6555
msgid "Use specified log format."
5008
6556
msgstr ""
5009
6557
5010
6558
# title of 'log-format' option
5011
#: bzrlib/option.py:565
6559
#: bzrlib/option.py:545
5012
6560
msgid "Log format"
5013
6561
msgstr ""
5014
6562
5015
# help of 'long' option
5016
#: bzrlib/option.py:567
5017
msgid "Use detailed log format. Same as --log-format long"
5018
msgstr ""
5019
5020
# help of 'short' option
5021
#: bzrlib/option.py:569
5022
msgid "Use moderately short log format. Same as --log-format short"
5023
msgstr ""
5024
5025
# help of 'line' option
5026
#: bzrlib/option.py:570
5027
msgid "Use log format with one line per revision. Same as --log-format line"
6563
# help of 'merge-type=lca' option
6564
#: bzrlib/option.py:547
6565
msgid "LCA-newness merge."
6566
msgstr ""
6567
6568
# help of 'merge-type=diff3' option
6569
#: bzrlib/option.py:547
6570
msgid "Merge using external diff3."
6571
msgstr ""
6572
6573
# help of 'merge-type=merge3' option
6574
#: bzrlib/option.py:547
6575
msgid "Native diff3-style merge."
5028
6576
msgstr ""
5029
6577
5030
6578
# help of 'merge-type' option
5031
#: bzrlib/option.py:573
6579
#: bzrlib/option.py:547
5032
6580
msgid "Select a particular merge algorithm."
5033
6581
msgstr ""
5034
6582
6583
# help of 'merge-type=weave' option
6584
#: bzrlib/option.py:547
6585
msgid "Weave-based merge."
6586
msgstr ""
6587
5035
6588
# title of 'merge-type' option
5036
#: bzrlib/option.py:575
6589
#: bzrlib/option.py:549
5037
6590
msgid "Merge algorithm"
5038
6591
msgstr ""
5039
6592
6593
# help of 'message' option
6594
#: bzrlib/option.py:552
6595
msgid "Message string."
6596
msgstr ""
6597
6598
# help of 'null' option
6599
#: bzrlib/option.py:554
6600
msgid "Use an ASCII NUL (\\0) separator rather than a newline."
6601
msgstr ""
6602
6603
# help of 'overwrite' option
6604
#: bzrlib/option.py:556
6605
msgid "Ignore differences between branches and overwrite unconditionally."
6606
msgstr ""
6607
5040
6608
# help of 'remember' option
5041
#: bzrlib/option.py:577
6609
#: bzrlib/option.py:558
5042
6610
msgid "Remember the specified location as a default."
5043
6611
msgstr ""
5044
6612
5045
6613
# help of 'reprocess' option
5046
#: bzrlib/option.py:579
6614
#: bzrlib/option.py:560
5047
6615
msgid "Reprocess to reduce spurious conflicts."
5048
6616
msgstr ""
5049
6617
5050
# help of 'dry-run' option
5051
#: bzrlib/option.py:582
5052
msgid "Show what would be done, but don't actually do anything."
5053
msgstr ""
5054
5055
# help of 'name-from-revision' option
5056
#: bzrlib/option.py:583
5057
msgid "The path name in the old tree."
5058
msgstr ""
5059
5060
# help of 'directory' option
5061
#: bzrlib/option.py:585
5062
msgid "Branch to operate on, instead of working directory"
6618
# help of 'revision' option
6619
#: bzrlib/option.py:564
6620
msgid "See \"help revisionspec\" for details."
6621
msgstr ""
6622
6623
# help of 'show-ids' option
6624
#: bzrlib/option.py:566
6625
msgid "Show internal object ids."
6626
msgstr ""
6627
6628
# help of 'timezone' option
6629
#: bzrlib/option.py:569
6630
msgid "Display timezone as local, original, or utc."
6631
msgstr ""
6632
6633
#: bzrlib/osutils.py:94
6634
msgid "Parameter {0!r} encoding is unsupported by {1} application locale."
6635
msgstr ""
6636
6637
#: bzrlib/osutils.py:214
6638
msgid "lstat/stat of ({0!r}): {1!r}"
6639
msgstr ""
6640
6641
#: bzrlib/osutils.py:964 bzrlib/osutils.py:975
6642
#, python-format
6643
msgid "sorry, %r not allowed in path"
6644
msgstr ""
6645
6646
#: bzrlib/osutils.py:1193
6647
#, python-format
6648
msgid "%r is too short to calculate a relative path"
6649
msgstr ""
6650
6651
#: bzrlib/plugin.py:142
6652
#, python-format
6653
msgid "\"%s\" is not a valid <plugin_name>@<plugin_path> description "
5063
6654
msgstr ""
5064
6655
5065
6656
# help of 'plugin' option of 'bash-completion' command
5066
#: bzrlib/plugins/bash_completion/bashcomp.py:407
6657
#: bzrlib/plugins/bash_completion/bashcomp.py:408
5067
6658
msgid "Enable completions for the selected plugin (default: all plugins)"
5068
6659
msgstr ""
5069
6660
5094
6685
msgid "Generate only the shell function, don't enable it"
5095
6686
msgstr ""
5096
6687
5097
#: bzrlib/plugins/launchpad/__init__.py:78
6688
#: bzrlib/plugins/launchpad/__init__.py:79
5098
6689
msgid "Register a branch with launchpad.net."
5099
6690
msgstr ""
5100
6691
5101
#: bzrlib/plugins/launchpad/__init__.py:80
6692
#: bzrlib/plugins/launchpad/__init__.py:81
5102
6693
msgid ""
5103
6694
"This command lists a bzr branch in the directory of branches on\n"
5104
6695
"launchpad.net. Registration allows the branch to be associated with\n"
5105
6696
"bugs or specifications."
5106
6697
msgstr ""
5107
6698
5108
#: bzrlib/plugins/launchpad/__init__.py:84
6699
#: bzrlib/plugins/launchpad/__init__.py:85
5109
6700
msgid ""
5110
6701
"Before using this command you must register the project to which the\n"
5111
6702
"branch belongs, and create an account for yourself on launchpad.net."
5112
6703
msgstr ""
5113
6704
5114
#: bzrlib/plugins/launchpad/__init__.py:87
6705
#: bzrlib/plugins/launchpad/__init__.py:88
5115
6706
msgid ""
5116
6707
"arguments:\n"
5117
6708
" public_url: The publicly visible url for the branch to register.\n"
5123
6714
" otherwise error."
5124
6715
msgstr ""
5125
6716
5126
#: bzrlib/plugins/launchpad/__init__.py:96
6717
#: bzrlib/plugins/launchpad/__init__.py:97
5127
6718
msgid ""
5128
6719
"example:\n"
5129
6720
" bzr register-branch http://foo.com/bzr/fooproject.mine \\\n"
5131
6722
msgstr ""
5132
6723
5133
6724
# help of 'project' option of 'register-branch' command
5134
#: bzrlib/plugins/launchpad/__init__.py:103
6725
#: bzrlib/plugins/launchpad/__init__.py:104
5135
6726
msgid "Launchpad project short name to associate with the branch."
5136
6727
msgstr ""
5137
6728
5138
6729
# help of 'branch-name' option of 'register-branch' command
5139
#: bzrlib/plugins/launchpad/__init__.py:110
6730
#: bzrlib/plugins/launchpad/__init__.py:111
5140
6731
msgid ""
5141
6732
"Short name for the branch; by default taken from the last component of the "
5142
6733
"url."
5143
6734
msgstr ""
5144
6735
5145
6736
# help of 'branch-title' option of 'register-branch' command
5146
#: bzrlib/plugins/launchpad/__init__.py:114
6737
#: bzrlib/plugins/launchpad/__init__.py:115
5147
6738
msgid "One-sentence description of the branch."
5148
6739
msgstr ""
5149
6740
5150
6741
# help of 'branch-description' option of 'register-branch' command
5151
#: bzrlib/plugins/launchpad/__init__.py:117
6742
#: bzrlib/plugins/launchpad/__init__.py:118
5152
6743
msgid "Longer description of the purpose or contents of the branch."
5153
6744
msgstr ""
5154
6745
5155
6746
# help of 'author' option of 'register-branch' command
5156
#: bzrlib/plugins/launchpad/__init__.py:120
6747
#: bzrlib/plugins/launchpad/__init__.py:121
5157
6748
msgid "Branch author's email address, if not yourself."
5158
6749
msgstr ""
5159
6750
5160
6751
# help of 'link-bug' option of 'register-branch' command
5161
#: bzrlib/plugins/launchpad/__init__.py:123
6752
#: bzrlib/plugins/launchpad/__init__.py:124
5162
6753
msgid "The bug this branch fixes."
5163
6754
msgstr ""
5164
6755
5165
6756
# help of 'dry-run' option of 'register-branch' command
5166
#: bzrlib/plugins/launchpad/__init__.py:126
6757
#: bzrlib/plugins/launchpad/__init__.py:127
5167
6758
msgid "Prepare the request but don't actually send it."
5168
6759
msgstr ""
5169
6760
5170
#: bzrlib/plugins/launchpad/__init__.py:186
6761
#: bzrlib/plugins/launchpad/__init__.py:149
6762
msgid ""
6763
"register-branch requires a public branch url - see bzr help register-branch."
6764
msgstr ""
6765
6766
#: bzrlib/plugins/launchpad/__init__.py:157
6767
msgid "--product is deprecated; please use --project."
6768
msgstr ""
6769
6770
#: bzrlib/plugins/launchpad/__init__.py:189
5171
6771
msgid "Open a Launchpad branch page in your web browser."
5172
6772
msgstr ""
5173
6773
5174
6774
# help of 'dry-run' option of 'launchpad-open' command
5175
#: bzrlib/plugins/launchpad/__init__.py:191
6775
#: bzrlib/plugins/launchpad/__init__.py:194
5176
6776
msgid "Do not actually open the browser. Just say the URL we would use."
5177
6777
msgstr ""
5178
6778
5179
#: bzrlib/plugins/launchpad/__init__.py:236
6779
#: bzrlib/plugins/launchpad/__init__.py:229
6780
#, python-format
6781
msgid "Opening %s in web browser"
6782
msgstr ""
6783
6784
#: bzrlib/plugins/launchpad/__init__.py:239
5180
6785
msgid "Show or set the Launchpad user ID."
5181
6786
msgstr ""
5182
6787
5183
#: bzrlib/plugins/launchpad/__init__.py:238
6788
#: bzrlib/plugins/launchpad/__init__.py:241
5184
6789
msgid ""
5185
6790
"When communicating with Launchpad, some commands need to know your\n"
5186
6791
"Launchpad user ID. This command can be used to set or show the\n"
5187
6792
"user ID that Bazaar will use for such communication."
5188
6793
msgstr ""
5189
6794
5190
#: bzrlib/plugins/launchpad/__init__.py:242
6795
#: bzrlib/plugins/launchpad/__init__.py:245
5191
6796
msgid ""
5192
6797
":Examples:\n"
5193
6798
" Show the Launchpad ID of the current user::"
5194
6799
msgstr ""
5195
6800
5196
#: bzrlib/plugins/launchpad/__init__.py:245
6801
#: bzrlib/plugins/launchpad/__init__.py:248
5197
6802
msgid " bzr launchpad-login"
5198
6803
msgstr ""
5199
6804
5200
#: bzrlib/plugins/launchpad/__init__.py:247
6805
#: bzrlib/plugins/launchpad/__init__.py:250
5201
6806
msgid " Set the Launchpad ID of the current user to 'bob'::"
5202
6807
msgstr ""
5203
6808
5204
#: bzrlib/plugins/launchpad/__init__.py:249
6809
#: bzrlib/plugins/launchpad/__init__.py:252
5205
6810
msgid " bzr launchpad-login bob"
5206
6811
msgstr ""
5207
6812
5208
6813
# help of 'no-check' option of 'launchpad-login' command
5209
#: bzrlib/plugins/launchpad/__init__.py:256
6814
#: bzrlib/plugins/launchpad/__init__.py:259
5210
6815
msgid "Don't check that the user name is valid."
5211
6816
msgstr ""
5212
6817
5213
#: bzrlib/plugins/launchpad/__init__.py:292
6818
#: bzrlib/plugins/launchpad/__init__.py:274
6819
#: bzrlib/plugins/launchpad/__init__.py:285
6820
msgid "Launchpad user ID exists and has SSH keys.\n"
6821
msgstr ""
6822
6823
#: bzrlib/plugins/launchpad/__init__.py:277
6824
msgid "No Launchpad user ID configured.\n"
6825
msgstr ""
6826
6827
#: bzrlib/plugins/launchpad/__init__.py:288
6828
#, python-format
6829
msgid "Launchpad user ID set to '%s'.\n"
6830
msgstr ""
6831
6832
#: bzrlib/plugins/launchpad/__init__.py:296
5214
6833
msgid "Ask Launchpad to mirror a branch now."
5215
6834
msgstr ""
5216
6835
5217
#: bzrlib/plugins/launchpad/__init__.py:312
6836
#: bzrlib/plugins/launchpad/__init__.py:316
5218
6837
msgid "Propose merging a branch on Launchpad."
5219
6838
msgstr ""
5220
6839
5221
#: bzrlib/plugins/launchpad/__init__.py:314
6840
#: bzrlib/plugins/launchpad/__init__.py:318
5222
6841
msgid ""
5223
6842
"This will open your usual editor to provide the initial comment. When it\n"
5224
6843
"has created the proposal, it will open it in your default web browser."
5225
6844
msgstr ""
5226
6845
5227
#: bzrlib/plugins/launchpad/__init__.py:317
6846
#: bzrlib/plugins/launchpad/__init__.py:321
5228
6847
msgid ""
5229
6848
"The branch will be proposed to merge into SUBMIT_BRANCH. If SUBMIT_BRANCH\n"
5230
6849
"is not supplied, the remembered submit branch will be used. If no submit\n"
5231
6850
"branch is remembered, the development focus will be used."
5232
6851
msgstr ""
5233
6852
5234
#: bzrlib/plugins/launchpad/__init__.py:321
6853
#: bzrlib/plugins/launchpad/__init__.py:325
5235
6854
msgid ""
5236
6855
"By default, the SUBMIT_BRANCH's review team will be requested to review\n"
5237
6856
"the merge proposal. This can be overriden by specifying --review (-R).\n"
5239
6858
"may optionally be followed by '=' and the review type. For example:"
5240
6859
msgstr ""
5241
6860
5242
#: bzrlib/plugins/launchpad/__init__.py:326
6861
#: bzrlib/plugins/launchpad/__init__.py:330
5243
6862
msgid " bzr lp-propose-merge --review jrandom --review review-team=qa"
5244
6863
msgstr ""
5245
6864
5246
#: bzrlib/plugins/launchpad/__init__.py:328
6865
#: bzrlib/plugins/launchpad/__init__.py:332
5247
6866
msgid ""
5248
6867
"This will propose a merge, request \"jrandom\" to perform a review of\n"
5249
6868
"unspecified type, and request \"review-team\" to perform a \"qa\" review."
5250
6869
msgstr ""
5251
6870
5252
6871
# help of 'staging' option of 'lp-propose-merge' command
5253
#: bzrlib/plugins/launchpad/__init__.py:333
6872
#: bzrlib/plugins/launchpad/__init__.py:337
5254
6873
msgid "Propose the merge on staging."
5255
6874
msgstr ""
5256
6875
5257
6876
# help of 'message' option of 'lp-propose-merge' command
5258
#: bzrlib/plugins/launchpad/__init__.py:335
6877
#: bzrlib/plugins/launchpad/__init__.py:339
5259
6878
msgid "Commit message."
5260
6879
msgstr ""
5261
6880
5262
6881
# help of 'approve' option of 'lp-propose-merge' command
5263
#: bzrlib/plugins/launchpad/__init__.py:337
6882
#: bzrlib/plugins/launchpad/__init__.py:341
5264
6883
msgid "Mark the proposal as approved immediately."
5265
6884
msgstr ""
5266
6885
5267
6886
# help of 'review' option of 'lp-propose-merge' command
5268
#: bzrlib/plugins/launchpad/__init__.py:339
6887
#: bzrlib/plugins/launchpad/__init__.py:343
5269
6888
msgid "Requested reviewer and optional type."
5270
6889
msgstr ""
5271
6890
5272
#: bzrlib/plugins/launchpad/__init__.py:376
6891
#: bzrlib/plugins/launchpad/__init__.py:380
5273
6892
msgid "Find the proposal to merge this revision."
5274
6893
msgstr ""
5275
6894
5276
#: bzrlib/plugins/launchpad/__init__.py:378
6895
#: bzrlib/plugins/launchpad/__init__.py:382
5277
6896
msgid ""
5278
6897
"Finds the merge proposal(s) that discussed landing the specified revision.\n"
5279
6898
"This works only if the selected branch was the merge proposal target, and\n"
5281
6900
"are opened in a web browser."
5282
6901
msgstr ""
5283
6902
5284
#: bzrlib/plugins/launchpad/__init__.py:383
6903
#: bzrlib/plugins/launchpad/__init__.py:387
5285
6904
msgid ""
5286
6905
"Any revision involved in the merge may be specified-- the revision in\n"
5287
6906
"which the merge was performed, or one of the revisions that was merged."
5288
6907
msgstr ""
5289
6908
5290
#: bzrlib/plugins/launchpad/__init__.py:386
6909
#: bzrlib/plugins/launchpad/__init__.py:390
5291
6910
msgid "So, to find the merge proposal that reviewed line 1 of README::"
5292
6911
msgstr ""
5293
6912
5294
#: bzrlib/plugins/launchpad/__init__.py:388
6913
#: bzrlib/plugins/launchpad/__init__.py:392
5295
6914
msgid " bzr lp-find-proposal -r annotate:README:1"
5296
6915
msgstr ""
6916
6917
#: bzrlib/plugins/launchpad/__init__.py:407
6918
msgid "No review found."
6919
msgstr ""
6920
6921
#: bzrlib/plugins/launchpad/__init__.py:408
6922
#, python-format
6923
msgid "%d proposals(s) found."
6924
msgstr ""
6925
6926
#: bzrlib/plugins/launchpad/__init__.py:418
6927
msgid "Finding revision-id"
6928
msgstr ""
6929
6930
#: bzrlib/plugins/launchpad/__init__.py:425
6931
msgid "Finding merge"
6932
msgstr ""
6933
6934
#: bzrlib/plugins/launchpad/__init__.py:430
6935
msgid "Finding revno"
6936
msgstr ""
6937
6938
#: bzrlib/plugins/launchpad/__init__.py:435
6939
msgid "Finding Launchpad branch"
6940
msgstr ""
6941
6942
#: bzrlib/plugins/launchpad/__init__.py:438
6943
msgid "Finding proposals"
6944
msgstr ""
6945
6946
#: bzrlib/plugins/launchpad/account.py:64
6947
msgid "Setting ssh/sftp usernames for launchpad.net."
6948
msgstr ""
6949
6950
#: bzrlib/plugins/launchpad/lp_api.py:239
6951
#: bzrlib/plugins/launchpad/lp_api.py:244
6952
#, python-format
6953
msgid "%s is not registered on Launchpad"
6954
msgstr ""
6955
6956
#: bzrlib/plugins/launchpad/lp_api.py:254
6957
#, python-format
6958
msgid "%s has no development focus."
6959
msgstr ""
6960
6961
#: bzrlib/plugins/launchpad/lp_api.py:259
6962
#, python-format
6963
msgid "development focus %s has no branch."
6964
msgstr ""
6965
6966
#: bzrlib/plugins/launchpad/lp_api.py:264
6967
#, python-format
6968
msgid "source package %s has no branch."
6969
msgstr ""
6970
6971
#: bzrlib/plugins/launchpad/lp_api.py:268
6972
#, python-format
6973
msgid "%s has no associated product or source package."
6974
msgstr ""
6975
6976
#: bzrlib/plugins/launchpad/lp_api.py:280
6977
#, python-format
6978
msgid "%s is already up-to-date."
6979
msgstr ""
6980
6981
#: bzrlib/plugins/launchpad/lp_api.py:287
6982
#, python-format
6983
msgid "Pushing to %s"
6984
msgstr ""
6985
6986
#: bzrlib/plugins/launchpad/lp_directory.py:169
6987
msgid ""
6988
"resolution for {0}\n"
6989
" local: {1}\n"
6990
" remote: {2}"
6991
msgstr ""
6992
6993
#: bzrlib/plugins/launchpad/lp_propose.py:147
6994
#, python-format
6995
msgid "There is already a branch merge proposal: %s"
6996
msgstr ""
6997
6998
#: bzrlib/plugins/weave_fmt/bzrdir.py:226
6999
msgid "pb parameter to convert() is deprecated"
7000
msgstr ""
7001
7002
#: bzrlib/plugins/weave_fmt/bzrdir.py:229
7003
msgid "starting upgrade from format 4 to 5"
7004
msgstr ""
7005
7006
#: bzrlib/plugins/weave_fmt/bzrdir.py:239
7007
msgid "note: upgrade may be faster if all store files are ungzipped first"
7008
msgstr ""
7009
7010
#: bzrlib/plugins/weave_fmt/bzrdir.py:268
7011
msgid "converting revision"
7012
msgstr ""
7013
7014
#: bzrlib/plugins/weave_fmt/bzrdir.py:273
7015
msgid "upgraded to weaves:"
7016
msgstr ""
7017
7018
#: bzrlib/plugins/weave_fmt/bzrdir.py:274
7019
#, python-format
7020
msgid "%6d revisions and inventories"
7021
msgstr ""
7022
7023
#: bzrlib/plugins/weave_fmt/bzrdir.py:276
7024
#, python-format
7025
msgid "%6d revisions not present"
7026
msgstr ""
7027
7028
#: bzrlib/plugins/weave_fmt/bzrdir.py:278
7029
#, python-format
7030
msgid "%6d texts"
7031
msgstr ""
7032
7033
#: bzrlib/plugins/weave_fmt/bzrdir.py:314
7034
msgid "writing weave"
7035
msgstr ""
7036
7037
#: bzrlib/plugins/weave_fmt/bzrdir.py:318
7038
#: bzrlib/plugins/weave_fmt/bzrdir.py:320
7039
msgid "inventory"
7040
msgstr ""
7041
7042
#: bzrlib/plugins/weave_fmt/bzrdir.py:337
7043
msgid "write revision"
7044
msgstr ""
7045
7046
#: bzrlib/plugins/weave_fmt/bzrdir.py:351
7047
msgid "loading revision"
7048
msgstr ""
7049
7050
#: bzrlib/plugins/weave_fmt/bzrdir.py:356
7051
#, python-format
7052
msgid "revision {%s} not present in branch; will be converted as a ghost"
7053
msgstr ""
7054
7055
#: bzrlib/plugins/weave_fmt/bzrdir.py:496
7056
msgid "starting upgrade from format 5 to 6"
7057
msgstr ""
7058
7059
#: bzrlib/plugins/weave_fmt/bzrdir.py:506
7060
#, python-format
7061
msgid "adding prefixes to %s"
7062
msgstr ""
7063
7064
#: bzrlib/plugins/weave_fmt/bzrdir.py:546
7065
msgid "starting upgrade from format 6 to metadir"
7066
msgstr ""
7067
7068
#: bzrlib/plugins/weave_fmt/bzrdir.py:554
7069
msgid "Removing ancestry.weave"
7070
msgstr ""
7071
7072
#: bzrlib/plugins/weave_fmt/bzrdir.py:559
7073
msgid "Finding branch files"
7074
msgstr ""
7075
7076
#: bzrlib/plugins/weave_fmt/bzrdir.py:569
7077
msgid "Upgrading repository"
7078
msgstr ""
7079
7080
#: bzrlib/plugins/weave_fmt/bzrdir.py:579
7081
msgid "Upgrading branch"
7082
msgstr ""
7083
7084
#: bzrlib/plugins/weave_fmt/bzrdir.py:602
7085
msgid "No working tree."
7086
msgstr ""
7087
7088
#: bzrlib/plugins/weave_fmt/bzrdir.py:609
7089
msgid "Upgrading working tree"
7090
msgstr ""
7091
7092
#: bzrlib/plugins/weave_fmt/bzrdir.py:630
7093
#, python-format
7094
msgid "Make %s lock"
7095
msgstr ""
7096
7097
#: bzrlib/plugins/weave_fmt/bzrdir.py:641
7098
#, python-format
7099
msgid "Moving %s"
7100
msgstr ""
7101
7102
#: bzrlib/push.py:54
7103
msgid "Created new branch."
7104
msgstr ""
7105
7106
#: bzrlib/push.py:96
7107
#, python-format
7108
msgid ""
7109
"Target directory %s already contains a .bzr directory, but it is not valid."
7110
msgstr ""
7111
7112
#: bzrlib/push.py:99
7113
#, python-format
7114
msgid ""
7115
"Target directory %s already exists, but does not have a .bzr directory. "
7116
"Supply --use-existing-dir to push there anyway."
7117
msgstr ""
7118
7119
#: bzrlib/push.py:120
7120
#, python-format
7121
msgid "Too many redirections trying to make %s."
7122
msgstr ""
7123
7124
#: bzrlib/push.py:145
7125
msgid ""
7126
"These branches have diverged. See \"bzr help diverged-branches\" for more "
7127
"information."
7128
msgstr ""
7129
7130
#: bzrlib/push.py:149
7131
#, python-format
7132
msgid ""
7133
"It is not possible to losslessly push to %s. You may want to use dpush "
7134
"instead."
7135
msgstr ""
7136
7137
#: bzrlib/push.py:155
7138
#, python-format
7139
msgid ""
7140
"At %s you have a valid .bzr control directory, but not a branch or "
7141
"repository. This is an unsupported configuration. Please move the target "
7142
"directory out of the way and try again."
7143
msgstr ""
7144
7145
#: bzrlib/reconcile.py:96
7146
#, python-format
7147
msgid "Reconciling branch %s"
7148
msgstr ""
7149
7150
#: bzrlib/reconcile.py:102
7151
#, python-format
7152
msgid "Reconciling repository %s"
7153
msgstr ""
7154
7155
#: bzrlib/reconcile.py:104
7156
msgid "Reconciling repository"
7157
msgstr ""
7158
7159
#: bzrlib/reconcile.py:110
7160
#, python-format
7161
msgid "%s cannot canonicalize CHKs."
7162
msgstr ""
7163
7164
#: bzrlib/reconcile.py:118
7165
msgid "Reconcile aborted: revision index has inconsistent parents."
7166
msgstr ""
7167
7168
#: bzrlib/reconcile.py:120
7169
msgid "Run \"bzr check\" for more details."
7170
msgstr ""
7171
7172
#: bzrlib/reconcile.py:122
7173
msgid "Reconciliation complete."
7174
msgstr ""
7175
7176
#: bzrlib/reconcile.py:165
7177
msgid "Fixing last revision info {0} => {1}"
7178
msgstr ""
7179
7180
#: bzrlib/reconcile.py:172
7181
msgid "revision_history ok."
7182
msgstr ""
7183
7184
#: bzrlib/reconcile.py:233
7185
msgid "Reading inventory data"
7186
msgstr ""
7187
7188
#: bzrlib/reconcile.py:253 bzrlib/reconcile.py:383
7189
msgid "Inventory ok."
7190
msgstr ""
7191
7192
#: bzrlib/reconcile.py:255 bzrlib/reconcile.py:385
7193
msgid "Backing up inventory"
7194
msgstr ""
7195
7196
#: bzrlib/reconcile.py:257
7197
msgid "Backup inventory created."
7198
msgstr ""
7199
7200
#: bzrlib/reconcile.py:273 bzrlib/reconcile.py:404
7201
msgid "Writing weave"
7202
msgstr ""
7203
7204
#: bzrlib/reconcile.py:276 bzrlib/reconcile.py:407
7205
msgid "Inventory regenerated."
7206
msgstr ""
7207
7208
#: bzrlib/reconcile.py:370 bzrlib/reconcile.py:372 bzrlib/reconcile.py:375
7209
msgid "Reading indexes"
7210
msgstr ""
7211
7212
#: bzrlib/reconcile.py:379 bzrlib/reconcile.py:381
7213
msgid "Checking unused inventories"
7214
msgstr ""
7215
7216
#: bzrlib/reconcile.py:387
7217
msgid "Backup Inventory created"
7218
msgstr ""
7219
7220
#: bzrlib/reconcile.py:445
7221
msgid "Fixing text parents"
7222
msgstr ""
7223
7224
#: bzrlib/reconfigure.py:52
7225
msgid "{0} is now stacked on {1}\n"
7226
msgstr ""
7227
7228
#: bzrlib/reconfigure.py:67
7229
#, python-format
7230
msgid "%s is now not stacked\n"
7231
msgstr ""
7232
7233
#: bzrlib/remote.py:1134 bzrlib/repository.py:287
7234
#, python-format
7235
msgid "bzr: ERROR (ignored): %s"
7236
msgstr ""
7237
7238
#: bzrlib/remote.py:2217
7239
msgid "Copying repository content as tarball..."
7240
msgstr ""
7241
7242
#: bzrlib/rename_map.py:68
7243
msgid "Calculating hashes"
7244
msgstr ""
7245
7246
#: bzrlib/rename_map.py:106
7247
msgid "Determining hash hits"
7248
msgstr ""
7249
7250
#: bzrlib/rename_map.py:241
7251
msgid "{0} => {1}"
7252
msgstr ""
7253
7254
#: bzrlib/repository.py:1781
7255
msgid "Moving repository to repository.backup"
7256
msgstr ""
7257
7258
#: bzrlib/repository.py:1788
7259
msgid "Creating new repository"
7260
msgstr ""
7261
7262
#: bzrlib/repository.py:1793
7263
msgid "Copying content"
7264
msgstr ""
7265
7266
#: bzrlib/repository.py:1797
7267
msgid "Deleting old repository content"
7268
msgstr ""
7269
7270
#: bzrlib/repository.py:1799
7271
msgid "repository converted"
7272
msgstr ""
7273
7274
#: bzrlib/revisionspec.py:904
7275
msgid "Using {0} {1}"
7276
msgstr ""
7277
7278
#: bzrlib/send.py:57
7279
#, python-format
7280
msgid "Mail client \"%s\" does not support specifying body"
7281
msgstr ""
7282
7283
#: bzrlib/send.py:61
7284
msgid "--remember requires a branch to be specified."
7285
msgstr ""
7286
7287
#: bzrlib/send.py:75
7288
msgid "No submit branch known or specified"
7289
msgstr ""
7290
7291
#: bzrlib/send.py:78
7292
msgid "Using saved {0} location \"{1}\" to determine what changes to submit."
7293
msgstr ""
7294
7295
#: bzrlib/send.py:95
7296
#, python-format
7297
msgid "No such send format '%s'."
7298
msgstr ""
7299
7300
#: bzrlib/send.py:112
7301
msgid "bzr send takes at most two one revision identifiers"
7302
msgstr ""
7303
7304
#: bzrlib/send.py:125
7305
msgid "No revisions to submit."
7306
msgstr ""
7307
7308
#: bzrlib/send.py:136
7309
msgid ""
7310
"- not supported for merge directives that use more than one output file."
7311
msgstr ""
7312
7313
#: bzrlib/send.py:178
7314
msgid "Format 0.9 does not permit bundle with no patch"
7315
msgstr ""
7316
7317
#: bzrlib/shelf_ui.py:45
7318
#, python-format
7319
msgid "Shelve adding file \"%(path)s\"?"
7320
msgstr ""
7321
7322
#: bzrlib/shelf_ui.py:46
7323
msgid "Shelve binary changes?"
7324
msgstr ""
7325
7326
#: bzrlib/shelf_ui.py:47
7327
msgid "Shelve changing \"%s\" from %(other)s to %(this)s?"
7328
msgstr ""
7329
7330
#: bzrlib/shelf_ui.py:49
7331
#, python-format
7332
msgid "Shelve removing file \"%(path)s\"?"
7333
msgstr ""
7334
7335
#: bzrlib/shelf_ui.py:50
7336
#, python-format
7337
msgid "Shelve %d change(s)?"
7338
msgstr ""
7339
7340
#: bzrlib/shelf_ui.py:51
7341
msgid "Shelve?"
7342
msgstr ""
7343
7344
#: bzrlib/shelf_ui.py:52
7345
#, python-format
7346
msgid ""
7347
"Shelve changing target of \"%(path)s\" from \"%(other)s\" to \"%(this)s\"?"
7348
msgstr ""
7349
7350
#: bzrlib/shelf_ui.py:54
7351
#, python-format
7352
msgid "Shelve renaming \"%(other)s\" => \"%(this)s\"?"
7353
msgstr ""
7354
7355
#: bzrlib/shelf_ui.py:69
7356
#, python-format
7357
msgid "Changes shelved with id \"%d\"."
7358
msgstr ""
7359
7360
#: bzrlib/shelf_ui.py:73
7361
msgid "Selected changes destroyed."
7362
msgstr ""
7363
7364
#: bzrlib/shelf_ui.py:77
7365
msgid "Selected changes:"
7366
msgstr ""
7367
7368
#: bzrlib/shelf_ui.py:97
7369
#, python-format
7370
msgid "Delete file \"%(path)s\"?"
7371
msgstr ""
7372
7373
#: bzrlib/shelf_ui.py:98
7374
msgid "Apply binary changes?"
7375
msgstr ""
7376
7377
#: bzrlib/shelf_ui.py:99
7378
#, python-format
7379
msgid "Change \"%(path)s\" from %(this)s to %(other)s?"
7380
msgstr ""
7381
7382
#: bzrlib/shelf_ui.py:101
7383
#, python-format
7384
msgid "Add file \"%(path)s\"?"
7385
msgstr ""
7386
7387
#: bzrlib/shelf_ui.py:102
7388
#, python-format
7389
msgid "Apply %d change(s)?"
7390
msgstr ""
7391
7392
#: bzrlib/shelf_ui.py:103
7393
msgid "Apply change?"
7394
msgstr ""
7395
7396
#: bzrlib/shelf_ui.py:104
7397
#, python-format
7398
msgid "Change target of \"%(path)s\" from \"%(this)s\" to \"%(other)s\"?"
7399
msgstr ""
7400
7401
#: bzrlib/shelf_ui.py:106
7402
#, python-format
7403
msgid "Rename \"%(this)s\" => \"%(other)s\"?"
7404
msgstr ""
7405
7406
#: bzrlib/shelf_ui.py:401
7407
msgid "No changes are shelved."
7408
msgstr ""
7409
7410
#: bzrlib/shelf_ui.py:459
7411
#, python-format
7412
msgid "Using changes with id \"%d\"."
7413
msgstr ""
7414
7415
#: bzrlib/shelf_ui.py:463
7416
#, python-format
7417
msgid "Message: %s"
7418
msgstr ""
7419
7420
#: bzrlib/shelf_ui.py:475
7421
#, python-format
7422
msgid "Deleted changes with id \"%d\"."
7423
msgstr ""
7424
7425
#: bzrlib/smart/medium.py:712
7426
msgid "HPSS calls: {0} ({1} vfs) {2}"
7427
msgstr ""
7428
7429
#: bzrlib/smart/server.py:167
7430
msgid "Requested to stop gracefully"
7431
msgstr ""
7432
7433
#: bzrlib/smart/server.py:177
7434
#, python-format
7435
msgid "Waiting for %d client(s) to finish"
7436
msgstr ""
7437
7438
#: bzrlib/smart/server.py:183
7439
#, python-format
7440
msgid "Still waiting for %d client(s) to finish"
7441
msgstr ""
7442
7443
#: bzrlib/smart/server.py:217
7444
#, python-format
7445
msgid "listening socket error: %s"
7446
msgstr ""
7447
7448
#: bzrlib/smart/server.py:450
7449
#, python-format
7450
msgid "listening on port: %s"
7451
msgstr ""
7452
7453
#: bzrlib/switch.py:67
7454
msgid "Pending merges must be committed or reverted before using switch."
7455
msgstr ""
7456
7457
#: bzrlib/switch.py:94
7458
msgid ""
7459
"Cannot switch as local commits found in the checkout. Commit these to the "
7460
"bound branch or use --force to throw them away."
7461
msgstr ""
7462
7463
#: bzrlib/switch.py:99
7464
#, python-format
7465
msgid ""
7466
"Unable to connect to current master branch %(target)s: %(error)s To switch "
7467
"anyway, use --force."
7468
msgstr ""
7469
7470
#: bzrlib/switch.py:108
7471
msgid "Cannot switch a branch, only a checkout."
7472
msgstr ""
7473
7474
#: bzrlib/switch.py:144
7475
#, python-format
7476
msgid "Tree is up to date at revision %d."
7477
msgstr ""
7478
7479
#: bzrlib/switch.py:150
7480
#, python-format
7481
msgid "Updated to revision %d."
7482
msgstr ""
7483
7484
#: bzrlib/transform.py:1723 bzrlib/transform.py:1734 bzrlib/transform.py:1736
7485
msgid "Apply phase"
7486
msgstr ""
7487
7488
#: bzrlib/transform.py:1762 bzrlib/transform.py:1830
7489
msgid "removing file"
7490
msgstr ""
7491
7492
#: bzrlib/transform.py:1780 bzrlib/transform.py:1865
7493
msgid "adding file"
7494
msgstr ""
7495
7496
#: bzrlib/transform.py:2580
7497
msgid "Building tree"
7498
msgstr ""
7499
7500
#: bzrlib/transform.py:2670 bzrlib/transform.py:2697
7501
msgid "Adding file contents"
7502
msgstr ""
7503
7504
#: bzrlib/transform.py:3017
7505
msgid "Resolution pass"
7506
msgstr ""
7507
7508
#: bzrlib/transport/ftp/_gssapi.py:86
7509
#, python-format
7510
msgid "Authenticated as %s"
7511
msgstr ""
7512
7513
#: bzrlib/tree.py:632
7514
msgid "*** {0} content-filter: {1} => {2!r}"
7515
msgstr ""
7516
7517
#: bzrlib/upgrade.py:76
7518
#, python-format
7519
msgid "This is a checkout. The branch (%s) needs to be upgraded separately."
7520
msgstr ""
7521
7522
#: bzrlib/upgrade.py:99
7523
#, python-format
7524
msgid "cannot upgrade from bzrdir format %s"
7525
msgstr ""
7526
7527
#: bzrlib/upgrade.py:102
7528
#, python-format
7529
msgid "starting upgrade of %s"
7530
msgstr ""
7531
7532
#: bzrlib/upgrade.py:109
7533
msgid "finished"
7534
msgstr ""
7535
7536
#: bzrlib/upgrade.py:119
7537
msgid "Deleting backup.bzr"
7538
msgstr ""
7539
7540
#: bzrlib/upgrade.py:150
7541
msgid ""
7542
"\n"
7543
"SUMMARY: {0} upgrades attempted, {1} succeeded, {2} failed"
7544
msgstr ""
7545
7546
#: bzrlib/upgrade.py:207
7547
#, python-format
7548
msgid "Found %d dependent branches - upgrading ..."
7549
msgstr ""
7550
7551
#: bzrlib/upgrade.py:275
7552
msgid "Upgrading bzrdirs"
7553
msgstr ""
7554
7555
#: bzrlib/upgrade.py:281
7556
#, python-format
7557
msgid "Upgrading %s"
7558
msgstr ""
7559
7560
#: bzrlib/upgrade.py:282
7561
msgid "Upgrading {0} {1} ..."
7562
msgstr ""
7563
7564
#: bzrlib/upgrade.py:300
7565
msgid "Removing backup ..."
7566
msgstr ""
7567
7568
#: bzrlib/upgrade.py:304
7569
msgid "failed to clean-up {0}: {1}"
7570
msgstr ""
7571
7572
#: bzrlib/vf_repository.py:1093
7573
msgid "inventories"
7574
msgstr ""
7575
7576
#: bzrlib/vf_repository.py:1119
7577
msgid "texts"
7578
msgstr ""
7579
7580
#: bzrlib/vf_repository.py:1624 bzrlib/vf_repository.py:1633
7581
msgid "Calculating text parents"
7582
msgstr ""
7583
7584
#: bzrlib/vf_repository.py:1709
7585
msgid "Fetch texts"
7586
msgstr ""
7587
7588
#: bzrlib/vf_repository.py:2538
7589
msgid "loading text store"
7590
msgstr ""
7591
7592
#: bzrlib/vf_repository.py:2544
7593
msgid "checking text graph"
7594
msgstr ""
7595
7596
#: bzrlib/vf_repository.py:2998 bzrlib/vf_repository.py:3012
7597
#: bzrlib/vf_repository.py:3127
7598
msgid "Transferring revisions"
7599
msgstr ""
7600
7601
#: bzrlib/win32utils.py:137
7602
msgid "Failed to GetProcessMemoryInfo()"
7603
msgstr ""
7604
7605
#: bzrlib/win32utils.py:158
7606
msgid "Cannot debug memory on win32 without ctypes or win32process"
7607
msgstr ""
7608
7609
#: bzrlib/win32utils.py:163
7610
msgid "WorkingSize {0:>7}KiB\tPeakWorking {1:>7}KiB\t{2}"
7611
msgstr ""
7612
7613
#: bzrlib/win32utils.py:171
7614
#, python-format
7615
msgid "WorkingSize %8d KiB"
7616
msgstr ""
7617
7618
#: bzrlib/win32utils.py:172
7619
#, python-format
7620
msgid "PeakWorking %8d KiB"
7621
msgstr ""
7622
7623
#: bzrlib/win32utils.py:173
7624
#, python-format
7625
msgid "PagefileUsage %8d KiB"
7626
msgstr ""
7627
7628
#: bzrlib/win32utils.py:174
7629
#, python-format
7630
msgid "PeakPagefileUsage %8d KiB"
7631
msgstr ""
7632
7633
#: bzrlib/win32utils.py:176
7634
#, python-format
7635
msgid "PrivateUsage %8d KiB"
7636
msgstr ""
7637
7638
#: bzrlib/win32utils.py:177
7639
#, python-format
7640
msgid "PageFaultCount %8d"
7641
msgstr ""
7642
7643
#: bzrlib/workingtree.py:1467
7644
msgid "Rerun update after fixing the conflicts."
7645
msgstr ""
7646
7647
#: dummy/help_topics/authentication/summary.txt:1
7648
msgid "Information on configuring authentication"
7649
msgstr ""
7650
7651
#: dummy/help_topics/basic/detail.txt:1
7652
msgid ""
7653
"Bazaar 2.5b4 -- a free distributed version-control tool\n"
7654
"http://bazaar.canonical.com/"
7655
msgstr ""
7656
7657
#: dummy/help_topics/basic/detail.txt:4
7658
msgid ""
7659
"Basic commands:\n"
7660
" bzr init makes this directory a versioned branch\n"
7661
" bzr branch make a copy of another branch"
7662
msgstr ""
7663
7664
#: dummy/help_topics/basic/detail.txt:8
7665
msgid ""
7666
" bzr add make files or directories versioned\n"
7667
" bzr ignore ignore a file or pattern\n"
7668
" bzr mv move or rename a versioned file"
7669
msgstr ""
7670
7671
#: dummy/help_topics/basic/detail.txt:12
7672
msgid ""
7673
" bzr status summarize changes in working copy\n"
7674
" bzr diff show detailed diffs"
7675
msgstr ""
7676
7677
#: dummy/help_topics/basic/detail.txt:15
7678
msgid ""
7679
" bzr merge pull in changes from another branch\n"
7680
" bzr commit save some or all changes\n"
7681
" bzr send send changes via email"
7682
msgstr ""
7683
7684
#: dummy/help_topics/basic/detail.txt:19
7685
msgid ""
7686
" bzr log show history of changes\n"
7687
" bzr check validate storage"
7688
msgstr ""
7689
7690
#: dummy/help_topics/basic/detail.txt:22
7691
msgid ""
7692
" bzr help init more help on e.g. init command\n"
7693
" bzr help commands list all commands\n"
7694
" bzr help topics list all help topics\n"
7695
msgstr ""
7696
7697
#: dummy/help_topics/basic/summary.txt:1
7698
msgid "Basic commands"
7699
msgstr ""
7700
7701
#: dummy/help_topics/branches/detail.txt:1
7702
msgid "Branches"
7703
msgstr ""
7704
7705
#: dummy/help_topics/branches/detail.txt:3
7706
msgid ""
7707
"A branch consists of the state of a project, including all of its\n"
7708
"history. All branches have a repository associated (which is where the\n"
7709
"branch history is stored), but multiple branches may share the same\n"
7710
"repository (a shared repository). Branches can be copied and merged."
7711
msgstr ""
7712
7713
#: dummy/help_topics/branches/detail.txt:8
7714
msgid ""
7715
"In addition, one branch may be bound to another one. Binding to another\n"
7716
"branch indicates that commits which happen in this branch must also \n"
7717
"happen in the other branch. Bazaar ensures consistency by not allowing \n"
7718
"commits when the two branches are out of date. In order for a commit \n"
7719
"to succeed, it may be necessary to update the current branch using \n"
7720
"``bzr update``."
7721
msgstr ""
7722
7723
#: dummy/help_topics/branches/detail.txt:15
7724
msgid "Related commands::"
7725
msgstr ""
7726
7727
#: dummy/help_topics/branches/detail.txt:17
7728
msgid ""
7729
" init Change a directory into a versioned branch.\n"
7730
" branch Create a new branch that is a copy of an existing branch.\n"
7731
" merge Perform a three-way merge.\n"
7732
" bind Bind a branch to another one.\n"
7733
msgstr ""
7734
7735
#: dummy/help_topics/branches/summary.txt:1
7736
msgid "Information on what a branch is"
7737
msgstr ""
7738
7739
#: dummy/help_topics/bugs/summary.txt:1
7740
msgid "Bug tracker settings"
7741
msgstr ""
7742
7743
#: dummy/help_topics/checkouts/detail.txt:1
7744
msgid "Checkouts"
7745
msgstr ""
7746
7747
#: dummy/help_topics/checkouts/detail.txt:3
7748
msgid ""
7749
"Checkouts are source trees that are connected to a branch, so that when\n"
7750
"you commit in the source tree, the commit goes into that branch. They\n"
7751
"allow you to use a simpler, more centralized workflow, ignoring some of\n"
7752
"Bazaar's decentralized features until you want them. Using checkouts\n"
7753
"with shared repositories is very similar to working with SVN or CVS, but\n"
7754
"doesn't have the same restrictions. And using checkouts still allows\n"
7755
"others working on the project to use whatever workflow they like."
7756
msgstr ""
7757
7758
#: dummy/help_topics/checkouts/detail.txt:11
7759
msgid ""
7760
"A checkout is created with the bzr checkout command (see \"help checkout"
7761
"\").\n"
7762
"You pass it a reference to another branch, and it will create a local copy\n"
7763
"for you that still contains a reference to the branch you created the\n"
7764
"checkout from (the master branch). Then if you make any commits they will "
7765
"be\n"
7766
"made on the other branch first. This creates an instant mirror of your work, "
7767
"or\n"
7768
"facilitates lockstep development, where each developer is working together,\n"
7769
"continuously integrating the changes of others."
7770
msgstr ""
7771
7772
#: dummy/help_topics/checkouts/detail.txt:19
7773
msgid ""
7774
"However the checkout is still a first class branch in Bazaar terms, so that\n"
7775
"you have the full history locally. As you have a first class branch you "
7776
"can\n"
7777
"also commit locally if you want, for instance due to the temporary loss af "
7778
"a\n"
7779
"network connection. Use the --local option to commit to do this. All the "
7780
"local\n"
7781
"commits will then be made on the master branch the next time you do a non-"
7782
"local\n"
7783
"commit."
7784
msgstr ""
7785
7786
#: dummy/help_topics/checkouts/detail.txt:26
7787
msgid ""
7788
"If you are using a checkout from a shared branch you will periodically want "
7789
"to\n"
7790
"pull in all the changes made by others. This is done using the \"update\"\n"
7791
"command. The changes need to be applied before any non-local commit, but\n"
7792
"Bazaar will tell you if there are any changes and suggest that you use this\n"
7793
"command when needed."
7794
msgstr ""
7795
7796
#: dummy/help_topics/checkouts/detail.txt:32
7797
msgid ""
7798
"It is also possible to create a \"lightweight\" checkout by passing the\n"
7799
"--lightweight flag to checkout. A lightweight checkout is even closer to an\n"
7800
"SVN checkout in that it is not a first class branch, it mainly consists of "
7801
"the\n"
7802
"working tree. This means that any history operations must query the master\n"
7803
"branch, which could be slow if a network connection is involved. Also, as "
7804
"you\n"
7805
"don't have a local branch, then you cannot commit locally."
7806
msgstr ""
7807
7808
#: dummy/help_topics/checkouts/detail.txt:39
7809
msgid ""
7810
"Lightweight checkouts work best when you have fast reliable access to the\n"
7811
"master branch. This means that if the master branch is on the same disk or "
7812
"LAN\n"
7813
"a lightweight checkout will be faster than a heavyweight one for any "
7814
"commands\n"
7815
"that modify the revision history (as only one copy of the branch needs to\n"
7816
"be updated). Heavyweight checkouts will generally be faster for any command\n"
7817
"that uses the history but does not change it, but if the master branch is "
7818
"on\n"
7819
"the same disk then there won't be a noticeable difference."
7820
msgstr ""
7821
7822
#: dummy/help_topics/checkouts/detail.txt:47
7823
msgid ""
7824
"Another possible use for a checkout is to use it with a treeless repository\n"
7825
"containing your branches, where you maintain only one working tree by\n"
7826
"switching the master branch that the checkout points to when you want to\n"
7827
"work on a different branch."
7828
msgstr ""
7829
7830
#: dummy/help_topics/checkouts/detail.txt:52
7831
msgid ""
7832
"Obviously to commit on a checkout you need to be able to write to the "
7833
"master\n"
7834
"branch. This means that the master branch must be accessible over a "
7835
"writeable\n"
7836
"protocol , such as sftp://, and that you have write permissions at the "
7837
"other\n"
7838
"end. Checkouts also work on the local file system, so that all that matters "
7839
"is\n"
7840
"file permissions."
7841
msgstr ""
7842
7843
#: dummy/help_topics/checkouts/detail.txt:58
7844
msgid ""
7845
"You can change the master of a checkout by using the \"switch\" command "
7846
"(see\n"
7847
"\"help switch\"). This will change the location that the commits are sent "
7848
"to.\n"
7849
"The \"bind\" command can also be used to turn a normal branch into a heavy\n"
7850
"checkout. If you would like to convert your heavy checkout into a normal\n"
7851
"branch so that every commit is local, you can use the \"unbind\" command. To "
7852
"see\n"
7853
"whether or not a branch is bound or not you can use the \"info\" command. If "
7854
"the\n"
7855
"branch is bound it will tell you the location of the bound branch."
7856
msgstr ""
7857
7858
#: dummy/help_topics/checkouts/detail.txt:68
7859
msgid ""
7860
" checkout Create a checkout. Pass --lightweight to get a lightweight\n"
7861
" checkout\n"
7862
" update Pull any changes in the master branch in to your checkout\n"
7863
" commit Make a commit that is sent to the master branch. If you have\n"
7864
" a heavy checkout then the --local option will commit to the\n"
7865
" checkout without sending the commit to the master\n"
7866
" switch Change the master branch that the commits in the checkout "
7867
"will\n"
7868
" be sent to\n"
7869
" bind Turn a standalone branch into a heavy checkout so that any\n"
7870
" commits will be sent to the master branch\n"
7871
" unbind Turn a heavy checkout into a standalone branch so that any\n"
7872
" commits are only made locally\n"
7873
" info Displays whether a branch is bound or unbound. If the branch "
7874
"is\n"
7875
" bound, then it will also display the location of the bound "
7876
"branch\n"
7877
msgstr ""
7878
7879
#: dummy/help_topics/checkouts/summary.txt:1
7880
msgid "Information on what a checkout is"
7881
msgstr ""
7882
7883
#: dummy/help_topics/commands/summary.txt:1
7884
msgid "Basic help for all commands"
7885
msgstr ""
7886
7887
#: dummy/help_topics/configuration/summary.txt:1
7888
msgid "Details on the configuration settings available"
7889
msgstr ""
7890
7891
#: dummy/help_topics/conflict-types/summary.txt:1
7892
msgid "Types of conflicts and what to do about them"
7893
msgstr ""
7894
7895
#: dummy/help_topics/content-filters/summary.txt:1
7896
msgid "Conversion of content into/from working trees"
7897
msgstr ""
7898
7899
#: dummy/help_topics/criss-cross/detail.txt:1
7900
msgid "Criss-Cross"
7901
msgstr ""
7902
7903
#: dummy/help_topics/criss-cross/detail.txt:3
7904
msgid ""
7905
"A criss-cross in the branch history can cause the default merge technique\n"
7906
"to emit more conflicts than would normally be expected."
7907
msgstr ""
7908
7909
#: dummy/help_topics/criss-cross/detail.txt:6
7910
msgid ""
7911
"In complex merge cases, ``bzr merge --lca`` or ``bzr merge --weave`` may "
7912
"give\n"
7913
"better results. You may wish to ``bzr revert`` the working tree and merge\n"
7914
"again. Alternatively, use ``bzr remerge`` on particular conflicted files."
7915
msgstr ""
7916
7917
#: dummy/help_topics/criss-cross/detail.txt:10
7918
msgid ""
7919
"Criss-crosses occur in a branch's history if two branches merge the same "
7920
"thing\n"
7921
"and then merge one another, or if two branches merge one another at the "
7922
"same\n"
7923
"time. They can be avoided by having each branch only merge from or into a\n"
7924
"designated central branch (a \"star topology\")."
7925
msgstr ""
7926
7927
#: dummy/help_topics/criss-cross/detail.txt:15
7928
msgid ""
7929
"Criss-crosses cause problems because of the way merge works. Bazaar's "
7930
"default\n"
7931
"merge is a three-way merger; in order to merge OTHER into THIS, it must\n"
7932
"find a basis for comparison, BASE. Using BASE, it can determine whether\n"
7933
"differences between THIS and OTHER are due to one side adding lines, or\n"
7934
"from another side removing lines."
7935
msgstr ""
7936
7937
#: dummy/help_topics/criss-cross/detail.txt:21
7938
msgid ""
7939
"Criss-crosses mean there is no good choice for a base. Selecting the "
7940
"recent\n"
7941
"merge points could cause one side's changes to be silently discarded.\n"
7942
"Selecting older merge points (which Bazaar does) mean that extra conflicts\n"
7943
"are emitted."
7944
msgstr ""
7945
7946
#: dummy/help_topics/criss-cross/detail.txt:26
7947
msgid ""
7948
"The ``weave`` merge type is not affected by this problem because it uses\n"
7949
"line-origin detection instead of a basis revision to determine the cause of\n"
7950
"differences.\n"
7951
msgstr ""
7952
7953
#: dummy/help_topics/criss-cross/summary.txt:1
7954
msgid "Information on criss-cross merging"
7955
msgstr ""
7956
7957
#: dummy/help_topics/current-formats/summary.txt:1
7958
msgid "Current storage formats"
7959
msgstr ""
7960
7961
#: dummy/help_topics/debug-flags/summary.txt:1
7962
msgid "Options to show or record debug information"
7963
msgstr ""
7964
7965
#: dummy/help_topics/diverged-branches/summary.txt:1
7966
msgid "How to fix diverged branches"
7967
msgstr ""
7968
7969
#: dummy/help_topics/env-variables/detail.txt:1
7970
msgid "Environment Variables"
7971
msgstr ""
7972
7973
#: dummy/help_topics/env-variables/detail.txt:3
7974
msgid ""
7975
"=================== "
7976
"===========================================================\n"
7977
"BZRPATH Path where bzr is to look for shell plugin external\n"
7978
" commands.\n"
7979
"BZR_EMAIL E-Mail address of the user. Overrides EMAIL.\n"
7980
"EMAIL E-Mail address of the user.\n"
7981
"BZR_EDITOR Editor for editing commit messages. Overrides EDITOR.\n"
7982
"EDITOR Editor for editing commit messages.\n"
7983
"BZR_PLUGIN_PATH Paths where bzr should look for plugins.\n"
7984
"BZR_DISABLE_PLUGINS Plugins that bzr should not load.\n"
7985
"BZR_PLUGINS_AT Plugins to load from a directory not in "
7986
"BZR_PLUGIN_PATH.\n"
7987
"BZR_HOME Directory holding .bazaar config dir. Overrides HOME.\n"
7988
"BZR_HOME (Win32) Directory holding bazaar config dir. Overrides APPDATA "
7989
"and\n"
7990
" HOME.\n"
7991
"BZR_REMOTE_PATH Full name of remote 'bzr' command (for bzr+ssh:// "
7992
"URLs).\n"
7993
"BZR_SSH Path to SSH client, or one of paramiko, openssh, "
7994
"sshcorp,\n"
7995
" plink or lsh.\n"
7996
"BZR_LOG Location of .bzr.log (use '/dev/null' to suppress log).\n"
7997
"BZR_LOG (Win32) Location of .bzr.log (use 'NUL' to suppress log).\n"
7998
"BZR_COLUMNS Override implicit terminal width.\n"
7999
"BZR_CONCURRENCY Number of processes that can be run concurrently "
8000
"(selftest)\n"
8001
"BZR_PROGRESS_BAR Override the progress display. Values are 'none' or "
8002
"'text'.\n"
8003
"BZR_PDB Control whether to launch a debugger on error.\n"
8004
"BZR_SIGQUIT_PDB Control whether SIGQUIT behaves normally or invokes a\n"
8005
" breakin debugger.\n"
8006
"BZR_TEXTUI_INPUT Force console input mode for prompts to line-based "
8007
"(instead\n"
8008
" of char-based).\n"
8009
"=================== "
8010
"===========================================================\n"
8011
msgstr ""
8012
8013
#: dummy/help_topics/env-variables/summary.txt:1
8014
msgid "Environment variable names and values"
8015
msgstr ""
8016
8017
#: dummy/help_topics/eol/summary.txt:1
8018
msgid "Information on end-of-line handling"
8019
msgstr ""
8020
8021
#: dummy/help_topics/files/detail.txt:1
8022
msgid "Files"
8023
msgstr ""
8024
8025
#: dummy/help_topics/files/detail.txt:3
8026
msgid ""
8027
":On Unix: ~/.bazaar/bazaar.conf\n"
8028
":On Windows: C:\\\\Documents and Settings\\\\username\\\\Application Data\\"
8029
"\\bazaar\\\\2.0\\\\bazaar.conf"
8030
msgstr ""
8031
8032
#: dummy/help_topics/files/detail.txt:6
8033
msgid ""
8034
"Contains the user's default configuration. The section ``[DEFAULT]`` is\n"
8035
"used to define general configuration that will be applied everywhere.\n"
8036
"The section ``[ALIASES]`` can be used to create command aliases for\n"
8037
"commonly used options."
8038
msgstr ""
8039
8040
#: dummy/help_topics/files/detail.txt:11
8041
msgid "A typical config file might look something like::"
8042
msgstr ""
8043
8044
#: dummy/help_topics/files/detail.txt:13
8045
msgid ""
8046
" [DEFAULT]\n"
8047
" email=John Doe <jdoe@isp.com>"
8048
msgstr ""
8049
8050
#: dummy/help_topics/files/detail.txt:16
8051
msgid ""
8052
" [ALIASES]\n"
8053
" commit = commit --strict\n"
8054
" log10 = log --short -r -10..-1\n"
8055
msgstr ""
8056
8057
#: dummy/help_topics/files/summary.txt:1
8058
msgid "Information on configuration and log files"
8059
msgstr ""
8060
8061
#: dummy/help_topics/formats/detail.txt:1
8062
msgid "Storage Formats"
8063
msgstr ""
8064
8065
#: dummy/help_topics/formats/detail.txt:3
8066
msgid ""
8067
"To ensure that older clients do not access data incorrectly,\n"
8068
"Bazaar's policy is to introduce a new storage format whenever\n"
8069
"new features requiring new metadata are added. New storage\n"
8070
"formats may also be introduced to improve performance and\n"
8071
"scalability."
8072
msgstr ""
8073
8074
#: dummy/help_topics/formats/detail.txt:9
8075
msgid ""
8076
"The newest format, 2a, is highly recommended. If your\n"
8077
"project is not using 2a, then you should suggest to the\n"
8078
"project owner to upgrade."
8079
msgstr ""
8080
8081
#: dummy/help_topics/formats/detail.txt:13
8082
msgid ""
8083
"\n"
8084
".. note::"
8085
msgstr ""
8086
8087
#: dummy/help_topics/formats/detail.txt:16
8088
msgid ""
8089
" Some of the older formats have two variants:\n"
8090
" a plain one and a rich-root one. The latter include an additional\n"
8091
" field about the root of the tree. There is no performance cost\n"
8092
" for using a rich-root format but you cannot easily merge changes\n"
8093
" from a rich-root format into a plain format. As a consequence,\n"
8094
" moving a project to a rich-root format takes some co-ordination\n"
8095
" in that all contributors need to upgrade their repositories\n"
8096
" around the same time. 2a and all future formats will be\n"
8097
" implicitly rich-root."
8098
msgstr ""
8099
8100
#: dummy/help_topics/formats/detail.txt:26
8101
msgid ""
8102
"See :doc:`current-formats-help` for the complete list of\n"
8103
"currently supported formats. See :doc:`other-formats-help` for\n"
8104
"descriptions of any available experimental and deprecated formats.\n"
8105
msgstr ""
8106
8107
#: dummy/help_topics/formats/summary.txt:1
8108
msgid "Information on choosing a storage format"
8109
msgstr ""
8110
8111
#: dummy/help_topics/global-options/detail.txt:1
8112
msgid "Global Options"
8113
msgstr ""
8114
8115
#: dummy/help_topics/global-options/detail.txt:3
8116
msgid ""
8117
"These options may be used with any command, and may appear in front of any\n"
8118
"command. (e.g. ``bzr --profile help``)."
8119
msgstr ""
8120
8121
#: dummy/help_topics/global-options/detail.txt:6
8122
msgid ""
8123
"--version Print the version number. Must be supplied before the "
8124
"command.\n"
8125
"--no-aliases Do not process command aliases when running this command.\n"
8126
"--builtin Use the built-in version of a command, not the plugin "
8127
"version.\n"
8128
" This does not suppress other plugin effects.\n"
8129
"--no-plugins Do not process any plugins.\n"
8130
"--no-l10n Do not translate messages.\n"
8131
"--concurrency Number of processes that can be run concurrently (selftest)."
8132
msgstr ""
8133
8134
#: dummy/help_topics/global-options/detail.txt:14
8135
msgid ""
8136
"--profile Profile execution using the hotshot profiler.\n"
8137
"--lsprof Profile execution using the lsprof profiler.\n"
8138
"--lsprof-file Profile execution using the lsprof profiler, and write the\n"
8139
" results to a specified file. If the filename ends with \".txt"
8140
"\",\n"
8141
" text format will be used. If the filename either starts "
8142
"with\n"
8143
" \"callgrind.out\" or end with \".callgrind\", the output will "
8144
"be\n"
8145
" formatted for use with KCacheGrind. Otherwise, the output\n"
8146
" will be a pickle.\n"
8147
"--coverage Generate line coverage report in the specified directory."
8148
msgstr ""
8149
8150
#: dummy/help_topics/global-options/detail.txt:24
8151
msgid ""
8152
"-Oname=value Override the ``name`` config option setting it to ``value`` "
8153
"for\n"
8154
" the duration of the command. This can be used multiple times "
8155
"if\n"
8156
" several options need to be overridden."
8157
msgstr ""
8158
8159
#: dummy/help_topics/global-options/detail.txt:28
8160
msgid ""
8161
"See http://doc.bazaar.canonical.com/developers/profiling.html for more\n"
8162
"information on profiling."
8163
msgstr ""
8164
8165
#: dummy/help_topics/global-options/detail.txt:31
8166
msgid ""
8167
"A number of debug flags are also available to assist troubleshooting and\n"
8168
"development. See :doc:`debug-flags-help`.\n"
8169
msgstr ""
8170
8171
#: dummy/help_topics/global-options/summary.txt:1
8172
msgid "Options that control how Bazaar runs"
8173
msgstr ""
8174
8175
#: dummy/help_topics/hidden-commands/summary.txt:1
8176
msgid "All hidden commands"
8177
msgstr ""
8178
8179
#: dummy/help_topics/hooks/summary.txt:1
8180
msgid "Points at which custom processing can be added"
8181
msgstr ""
8182
8183
#: dummy/help_topics/launchpad/detail.txt:1
8184
msgid "Integration with Launchpad.net"
8185
msgstr ""
8186
8187
#: dummy/help_topics/launchpad/detail.txt:3
8188
msgid ""
8189
"Launchpad.net provides free Bazaar branch hosting with integrated bug and\n"
8190
"specification tracking."
8191
msgstr ""
8192
8193
#: dummy/help_topics/launchpad/detail.txt:6
8194
msgid ""
8195
"The bzr client (through the plugin called 'launchpad') has special\n"
8196
"features to communicate with Launchpad:"
8197
msgstr ""
8198
8199
#: dummy/help_topics/launchpad/detail.txt:9
8200
msgid ""
8201
" * The launchpad-login command tells Bazaar your Launchpad user name. "
8202
"This\n"
8203
" is then used by the 'lp:' transport to download your branches using\n"
8204
" bzr+ssh://."
8205
msgstr ""
8206
8207
#: dummy/help_topics/launchpad/detail.txt:13
8208
msgid ""
8209
" * The 'lp:' transport uses Launchpad as a directory service: for "
8210
"example\n"
8211
" 'lp:bzr' and 'lp:python' refer to the main branches of the relevant\n"
8212
" projects and may be branched, logged, etc. You can also use the 'lp:'\n"
8213
" transport to refer to specific branches, e.g. lp:~bzr/bzr/trunk."
8214
msgstr ""
8215
8216
#: dummy/help_topics/launchpad/detail.txt:18
8217
msgid ""
8218
" * The 'lp:' bug tracker alias can expand launchpad bug numbers to their\n"
8219
" URLs for use with 'bzr commit --fixes', e.g. 'bzr commit --fixes "
8220
"lp:12345'\n"
8221
" will record a revision property that marks that revision as fixing\n"
8222
" Launchpad bug 12345. When you push that branch to Launchpad it will\n"
8223
" automatically be linked to the bug report."
8224
msgstr ""
8225
8226
#: dummy/help_topics/launchpad/detail.txt:24
8227
msgid ""
8228
" * The register-branch command tells Launchpad about the url of a\n"
8229
" public branch. Launchpad will then mirror the branch, display\n"
8230
" its contents and allow it to be attached to bugs and other\n"
8231
" objects."
8232
msgstr ""
8233
8234
#: dummy/help_topics/launchpad/detail.txt:29
8235
msgid "For more information see http://help.launchpad.net/\n"
8236
msgstr ""
8237
8238
#: dummy/help_topics/launchpad/summary.txt:1
8239
msgid "Using Bazaar with Launchpad.net"
8240
msgstr ""
8241
8242
#: dummy/help_topics/location-alias/summary.txt:1
8243
msgid "Aliases for remembered locations"
8244
msgstr ""
8245
8246
#: dummy/help_topics/log-formats/summary.txt:1
8247
msgid "Details on the logging formats available"
8248
msgstr ""
8249
8250
#: dummy/help_topics/other-formats/summary.txt:1
8251
msgid "Experimental and deprecated storage formats"
8252
msgstr ""
8253
8254
#: dummy/help_topics/patterns/summary.txt:1
8255
msgid "Information on the pattern syntax"
8256
msgstr ""
8257
8258
#: dummy/help_topics/repositories/detail.txt:1
8259
msgid "Repositories"
8260
msgstr ""
8261
8262
#: dummy/help_topics/repositories/detail.txt:3
8263
msgid ""
8264
"Repositories in Bazaar are where committed information is stored. There is\n"
8265
"a repository associated with every branch."
8266
msgstr ""
8267
8268
#: dummy/help_topics/repositories/detail.txt:6
8269
msgid ""
8270
"Repositories are a form of database. Bzr will usually maintain this for\n"
8271
"good performance automatically, but in some situations (e.g. when doing\n"
8272
"very many commits in a short time period) you may want to ask bzr to\n"
8273
"optimise the database indices. This can be done by the 'bzr pack' command."
8274
msgstr ""
8275
8276
#: dummy/help_topics/repositories/detail.txt:11
8277
msgid ""
8278
"By default just running 'bzr init' will create a repository within the new\n"
8279
"branch but it is possible to create a shared repository which allows "
8280
"multiple\n"
8281
"branches to share their information in the same location. When a new branch "
8282
"is\n"
8283
"created it will first look to see if there is a containing shared repository "
8284
"it\n"
8285
"can use."
8286
msgstr ""
8287
8288
#: dummy/help_topics/repositories/detail.txt:17
8289
msgid ""
8290
"When two branches of the same project share a repository, there is\n"
8291
"generally a large space saving. For some operations (e.g. branching\n"
8292
"within the repository) this translates in to a large time saving."
8293
msgstr ""
8294
8295
#: dummy/help_topics/repositories/detail.txt:21
8296
msgid ""
8297
"To create a shared repository use the init-repository command (or the alias\n"
8298
"init-repo). This command takes the location of the repository to create. "
8299
"This\n"
8300
"means that 'bzr init-repository repo' will create a directory named 'repo',\n"
8301
"which contains a shared repository. Any new branches that are created in "
8302
"this\n"
8303
"directory will then use it for storage."
8304
msgstr ""
8305
8306
#: dummy/help_topics/repositories/detail.txt:27
8307
msgid ""
8308
"It is a good idea to create a repository whenever you might create more\n"
8309
"than one branch of a project. This is true for both working areas where you\n"
8310
"are doing the development, and any server areas that you use for hosting\n"
8311
"projects. In the latter case, it is common to want branches without working\n"
8312
"trees. Since the files in the branch will not be edited directly there is "
8313
"no\n"
8314
"need to use up disk space for a working tree. To create a repository in "
8315
"which\n"
8316
"the branches will not have working trees pass the '--no-trees' option to\n"
8317
"'init-repository'."
8318
msgstr ""
8319
8320
#: dummy/help_topics/repositories/detail.txt:38
8321
msgid ""
8322
" init-repository Create a shared repository. Use --no-trees to create "
8323
"one\n"
8324
" in which new branches won't get a working tree.\n"
8325
msgstr ""
8326
8327
#: dummy/help_topics/repositories/summary.txt:1
8328
msgid "Basic information on shared repositories."
8329
msgstr ""
8330
8331
#: dummy/help_topics/revisionspec/summary.txt:1
8332
msgid "Explain how to use --revision"
8333
msgstr ""
8334
8335
#: dummy/help_topics/rules/summary.txt:1
8336
msgid "Information on defining rule-based preferences"
8337
msgstr ""
8338
8339
#: dummy/help_topics/standalone-trees/detail.txt:1
8340
msgid "Standalone Trees"
8341
msgstr ""
8342
8343
#: dummy/help_topics/standalone-trees/detail.txt:3
8344
msgid ""
8345
"A standalone tree is a working tree with an associated repository. It\n"
8346
"is an independently usable branch, with no dependencies on any other.\n"
8347
"Creating a standalone tree (via bzr init) is the quickest way to put\n"
8348
"an existing project under version control."
8349
msgstr ""
8350
8351
#: dummy/help_topics/standalone-trees/detail.txt:8
8352
msgid "Related Commands::"
8353
msgstr ""
8354
8355
#: dummy/help_topics/standalone-trees/detail.txt:10
8356
msgid " init Make a directory into a versioned branch.\n"
8357
msgstr ""
8358
8359
#: dummy/help_topics/standalone-trees/summary.txt:1
8360
msgid "Information on what a standalone tree is"
8361
msgstr ""
8362
8363
#: dummy/help_topics/standard-options/detail.txt:1
8364
msgid "Standard Options"
8365
msgstr ""
8366
8367
#: dummy/help_topics/standard-options/detail.txt:3
8368
msgid "Standard options are legal for all commands."
8369
msgstr ""
8370
8371
#: dummy/help_topics/standard-options/detail.txt:5
8372
msgid ""
8373
"--help, -h Show help message.\n"
8374
"--verbose, -v Display more information.\n"
8375
"--quiet, -q Only display errors and warnings."
8376
msgstr ""
8377
8378
#: dummy/help_topics/standard-options/detail.txt:9
8379
msgid "Unlike global options, standard options can be used in aliases.\n"
8380
msgstr ""
8381
8382
#: dummy/help_topics/standard-options/summary.txt:1
8383
msgid "Options that can be used with any command"
8384
msgstr ""
8385
8386
#: dummy/help_topics/status-flags/detail.txt:1
8387
msgid "Status Flags"
8388
msgstr ""
8389
8390
#: dummy/help_topics/status-flags/detail.txt:3
8391
msgid ""
8392
"Status flags are used to summarise changes to the working tree in a concise\n"
8393
"manner. They are in the form::"
8394
msgstr ""
8395
8396
#: dummy/help_topics/status-flags/detail.txt:6
8397
msgid " xxx <filename>"
8398
msgstr ""
8399
8400
#: dummy/help_topics/status-flags/detail.txt:8
8401
msgid "where the columns' meanings are as follows."
8402
msgstr ""
8403
8404
#: dummy/help_topics/status-flags/detail.txt:10
8405
msgid "Column 1 - versioning/renames::"
8406
msgstr ""
8407
8408
#: dummy/help_topics/status-flags/detail.txt:12
8409
msgid ""
8410
" + File versioned\n"
8411
" - File unversioned\n"
8412
" R File renamed\n"
8413
" ? File unknown\n"
8414
" X File nonexistent (and unknown to bzr)\n"
8415
" C File has conflicts\n"
8416
" P Entry for a pending merge (not a file)"
8417
msgstr ""
8418
8419
#: dummy/help_topics/status-flags/detail.txt:20
8420
msgid "Column 2 - contents::"
8421
msgstr ""
8422
8423
#: dummy/help_topics/status-flags/detail.txt:22
8424
msgid ""
8425
" N File created\n"
8426
" D File deleted\n"
8427
" K File kind changed\n"
8428
" M File modified"
8429
msgstr ""
8430
8431
#: dummy/help_topics/status-flags/detail.txt:27
8432
msgid "Column 3 - execute::"
8433
msgstr ""
8434
8435
#: dummy/help_topics/status-flags/detail.txt:29
8436
msgid " * The execute bit was changed\n"
8437
msgstr ""
8438
8439
#: dummy/help_topics/status-flags/summary.txt:1
8440
msgid "Help on status flags"
8441
msgstr ""
8442
8443
#: dummy/help_topics/sync-for-reconfigure/detail.txt:1
8444
msgid "Branches Out of Sync"
8445
msgstr ""
8446
8447
#: dummy/help_topics/sync-for-reconfigure/detail.txt:3
8448
msgid ""
8449
"When reconfiguring a checkout, tree or branch into a lightweight checkout,\n"
8450
"a local branch must be destroyed. (For checkouts, this is the local branch\n"
8451
"that serves primarily as a cache.) If the branch-to-be-destroyed does not\n"
8452
"have the same last revision as the new reference branch for the lightweight\n"
8453
"checkout, data could be lost, so Bazaar refuses."
8454
msgstr ""
8455
8456
#: dummy/help_topics/sync-for-reconfigure/detail.txt:9
8457
msgid "How you deal with this depends on *why* the branches are out of sync."
8458
msgstr ""
8459
8460
#: dummy/help_topics/sync-for-reconfigure/detail.txt:11
8461
msgid ""
8462
"If you have a checkout and have done local commits, you can get back in "
8463
"sync\n"
8464
"by running \"bzr update\" (and possibly \"bzr commit\")."
8465
msgstr ""
8466
8467
#: dummy/help_topics/sync-for-reconfigure/detail.txt:14
8468
msgid ""
8469
"If you have a branch and the remote branch is out-of-date, you can push\n"
8470
"the local changes using \"bzr push\". If the local branch is out of date, "
8471
"you\n"
8472
"can do \"bzr pull\". If both branches have had changes, you can merge, "
8473
"commit\n"
8474
"and then push your changes. If you decide that some of the changes aren't\n"
8475
"useful, you can \"push --overwrite\" or \"pull --overwrite\" instead.\n"
8476
msgstr ""
8477
8478
#: dummy/help_topics/sync-for-reconfigure/summary.txt:1
8479
msgid "Steps to resolve \"out-of-sync\" when reconfiguring"
8480
msgstr ""
8481
8482
#: dummy/help_topics/topics/summary.txt:1
8483
msgid "Topics list"
8484
msgstr ""
8485
8486
#: dummy/help_topics/url-special-chars/summary.txt:1
8487
msgid "Special character handling in URLs"
8488
msgstr ""
8489
8490
#: dummy/help_topics/urlspec/summary.txt:1
8491
msgid "Supported transport protocols"
8492
msgstr ""
8493
8494
#: dummy/help_topics/working-trees/detail.txt:1
8495
msgid "Working Trees"
8496
msgstr ""
8497
8498
#: dummy/help_topics/working-trees/detail.txt:3
8499
msgid ""
8500
"A working tree is the contents of a branch placed on disk so that you can\n"
8501
"see the files and edit them. The working tree is where you make changes to "
8502
"a\n"
8503
"branch, and when you commit the current state of the working tree is the\n"
8504
"snapshot that is recorded in the commit."
8505
msgstr ""
8506
8507
#: dummy/help_topics/working-trees/detail.txt:8
8508
msgid ""
8509
"When you push a branch to a remote system, a working tree will not be\n"
8510
"created. If one is already present the files will not be updated. The\n"
8511
"branch information will be updated and the working tree will be marked\n"
8512
"as out-of-date. Updating a working tree remotely is difficult, as there\n"
8513
"may be uncommitted changes or the update may cause content conflicts that "
8514
"are\n"
8515
"difficult to deal with remotely."
8516
msgstr ""
8517
8518
#: dummy/help_topics/working-trees/detail.txt:15
8519
msgid ""
8520
"If you have a branch with no working tree you can use the 'checkout' "
8521
"command\n"
8522
"to create a working tree. If you run 'bzr checkout .' from the branch it "
8523
"will\n"
8524
"create the working tree. If the branch is updated remotely, you can update "
8525
"the\n"
8526
"working tree by running 'bzr update' in that directory."
8527
msgstr ""
8528
8529
#: dummy/help_topics/working-trees/detail.txt:20
8530
msgid ""
8531
"If you have a branch with a working tree that you do not want the 'remove-"
8532
"tree'\n"
8533
"command will remove the tree if it is safe. This can be done to avoid the\n"
8534
"warning about the remote working tree not being updated when pushing to the\n"
8535
"branch. It can also be useful when working with a '--no-trees' repository\n"
8536
"(see 'bzr help repositories')."
8537
msgstr ""
8538
8539
#: dummy/help_topics/working-trees/detail.txt:26
8540
msgid ""
8541
"If you want to have a working tree on a remote machine that you push to you\n"
8542
"can either run 'bzr update' in the remote branch after each push, or use "
8543
"some\n"
8544
"other method to update the tree during the push. There is an 'rspush' "
8545
"plugin\n"
8546
"that will update the working tree using rsync as well as doing a push. "
8547
"There\n"
8548
"is also a 'push-and-update' plugin that automates running 'bzr update' via "
8549
"SSH\n"
8550
"after each push."
8551
msgstr ""
8552
8553
#: dummy/help_topics/working-trees/detail.txt:33
8554
msgid "Useful commands::"
8555
msgstr ""
8556
8557
#: dummy/help_topics/working-trees/detail.txt:35
8558
msgid ""
8559
" checkout Create a working tree when a branch does not have one.\n"
8560
" remove-tree Removes the working tree from a branch when it is safe to do "
8561
"so.\n"
8562
" update When a working tree is out of sync with its associated "
8563
"branch\n"
8564
" this will update the tree to match the branch.\n"
8565
msgstr ""
8566
8567
#: dummy/help_topics/working-trees/summary.txt:1
8568
msgid "Information on working trees"
8569
msgstr ""
8570
8571
#: en/help_topics/authentication.txt:1
8572
msgid ""
8573
"Authentication Settings\n"
8574
"======================="
8575
msgstr ""
8576
8577
#: en/help_topics/authentication.txt:4
8578
msgid ""
8579
"\n"
8580
"Intent\n"
8581
"------"
8582
msgstr ""
8583
8584
#: en/help_topics/authentication.txt:8
8585
msgid ""
8586
"Many different authentication policies can be described in the\n"
8587
"``authentication.conf`` file but a particular user should need only a few\n"
8588
"definitions to cover his needs without having to specify a user and a "
8589
"password\n"
8590
"for every branch he uses."
8591
msgstr ""
8592
8593
#: en/help_topics/authentication.txt:13
8594
msgid ""
8595
"The definitions found in this file are used to find the credentials to use "
8596
"for\n"
8597
"a given url. The same credentials can generally be used for as many branches "
8598
"as\n"
8599
"possible by grouping their declaration around the remote servers that need\n"
8600
"them. It's even possible to declare credentials that will be used by "
8601
"different\n"
8602
"servers."
8603
msgstr ""
8604
8605
#: en/help_topics/authentication.txt:19
8606
msgid ""
8607
"The intent is to make this file as small as possible to minimize maintenance."
8608
msgstr ""
8609
8610
#: en/help_topics/authentication.txt:21
8611
msgid ""
8612
"Once the relevant credentials are declared in this file you may use branch "
8613
"urls\n"
8614
"without embedding passwords (security hazard) or even users (enabling "
8615
"sharing\n"
8616
"of your urls with others)."
8617
msgstr ""
8618
8619
#: en/help_topics/authentication.txt:25
8620
msgid "Instead of using::"
8621
msgstr ""
8622
8623
#: en/help_topics/authentication.txt:27
8624
msgid " bzr branch ftp://joe:secret@host.com/path/to/my/branch"
8625
msgstr ""
8626
8627
#: en/help_topics/authentication.txt:29
8628
msgid "you simply use::"
8629
msgstr ""
8630
8631
#: en/help_topics/authentication.txt:31
8632
msgid " bzr branch ftp://host.com/path/to/my/branch"
8633
msgstr ""
8634
8635
#: en/help_topics/authentication.txt:33
8636
msgid "provided you have created the following ``authentication.conf`` file::"
8637
msgstr ""
8638
8639
#: en/help_topics/authentication.txt:35
8640
msgid ""
8641
" [myprojects]\n"
8642
" scheme=ftp\n"
8643
" host=host.com\n"
8644
" user=joe\n"
8645
" password=secret\n"
8646
" "
8647
msgstr ""
8648
8649
#: en/help_topics/authentication.txt:42
8650
msgid ""
8651
"Authentication definitions\n"
8652
"--------------------------"
8653
msgstr ""
8654
8655
#: en/help_topics/authentication.txt:45
8656
msgid ""
8657
"There are two kinds of authentication used by the various schemes supported "
8658
"by\n"
8659
"bzr:"
8660
msgstr ""
8661
8662
#: en/help_topics/authentication.txt:48
8663
msgid "1. user and password"
8664
msgstr ""
8665
8666
#: en/help_topics/authentication.txt:50
8667
msgid ""
8668
"``FTP`` needs a (``user``, ``password``) to authenticate against a ``host``\n"
8669
"``SFTP`` can use either a password or a host key to authenticate. However,\n"
8670
"ssh agents are a better, more secure solution. So we have chosen to not "
8671
"provide\n"
8672
"our own less secure method."
8673
msgstr ""
8674
8675
#: en/help_topics/authentication.txt:55
8676
msgid "2. user, realm and password"
8677
msgstr ""
8678
8679
#: en/help_topics/authentication.txt:57
8680
msgid ""
8681
"``HTTP`` and ``HTTPS`` needs a (``user, realm, password``) to authenticate\n"
8682
"against a host. But, by using ``.htaccess`` files, for example, it is "
8683
"possible\n"
8684
"to define several (``user, realm, password``) for a given ``host``. So what "
8685
"is\n"
8686
"really needed is (``user``, ``password``, ``host``, ``path``). The ``realm`` "
8687
"is\n"
8688
"not taken into account in the definitions, but will displayed if bzr "
8689
"prompts\n"
8690
"you for a password."
8691
msgstr ""
8692
8693
#: en/help_topics/authentication.txt:64
8694
msgid ""
8695
"``HTTP proxy`` can be handled as ``HTTP`` (or ``HTTPS``) by explicitly\n"
8696
"specifying the appropriate port."
8697
msgstr ""
8698
8699
#: en/help_topics/authentication.txt:67
8700
msgid ""
8701
"To take all schemes into account, the password will be deduced from a set "
8702
"of\n"
8703
"authentication definitions (``scheme``, ``host``, ``port``, ``path``, "
8704
"``user``,\n"
8705
"``password``)."
8706
msgstr ""
8707
8708
#: en/help_topics/authentication.txt:71
8709
msgid ""
8710
" * ``scheme``: can be empty (meaning the rest of the definition can be "
8711
"used\n"
8712
" for any scheme), ``SFTP`` and ``bzr+ssh`` should not be used here, "
8713
"``ssh``\n"
8714
" should be used instead since this is the real scheme regarding\n"
8715
" authentication,"
8716
msgstr ""
8717
8718
#: en/help_topics/authentication.txt:76
8719
msgid " * ``host``: can be empty (to act as a default for any host),"
8720
msgstr ""
8721
8722
#: en/help_topics/authentication.txt:78
8723
msgid ""
8724
" * ``port`` can be empty (useful when an host provides several servers for "
8725
"the\n"
8726
" same scheme), only numerical values are allowed, this should be used "
8727
"only\n"
8728
" when the server uses a port different than the scheme standard port,"
8729
msgstr ""
8730
8731
#: en/help_topics/authentication.txt:82
8732
msgid " * ``path``: can be empty (FTP or SFTP will never user it),"
8733
msgstr ""
8734
8735
#: en/help_topics/authentication.txt:84
8736
msgid ""
8737
" * ``user``: can be empty (``bzr`` will defaults to python's\n"
8738
" ``getpass.get_user()``),"
8739
msgstr ""
8740
8741
#: en/help_topics/authentication.txt:87
8742
msgid ""
8743
" * ``password``: can be empty if you prefer to always be prompted for your\n"
8744
" password."
8745
msgstr ""
8746
8747
#: en/help_topics/authentication.txt:90
8748
msgid ""
8749
"Multiple definitions can be provided and, for a given URL, bzr will select "
8750
"a\n"
8751
"(``user`` [, ``password``]) based on the following rules :"
8752
msgstr ""
8753
8754
#: en/help_topics/authentication.txt:93
8755
msgid " 1. the first match wins,"
8756
msgstr ""
8757
8758
#: en/help_topics/authentication.txt:95
8759
msgid " 2. empty fields match everything,"
8760
msgstr ""
8761
8762
#: en/help_topics/authentication.txt:97
8763
msgid ""
8764
" 3. ``scheme`` matches even if decorators are used in the requested URL,"
8765
msgstr ""
8766
8767
#: en/help_topics/authentication.txt:99
8768
msgid ""
8769
" 4. ``host`` matches exactly or act as a domain if it starts with '.'\n"
8770
" (``project.bzr.sf.net`` will match ``.bzr.sf.net`` but ``projectbzr.sf."
8771
"net``\n"
8772
" will not match ``bzr.sf.net``)."
8773
msgstr ""
8774
8775
#: en/help_topics/authentication.txt:103
8776
msgid ""
8777
" 5. ``port`` matches if included in the requested URL (exact matches only)"
8778
msgstr ""
8779
8780
#: en/help_topics/authentication.txt:105
8781
msgid ""
8782
" 6. ``path`` matches if included in the requested URL (and by rule #2 "
8783
"above,\n"
8784
" empty paths will match any provided path)."
8785
msgstr ""
8786
8787
#: en/help_topics/authentication.txt:110
8788
msgid ""
8789
"File format\n"
8790
"-----------"
8791
msgstr ""
8792
8793
#: en/help_topics/authentication.txt:113
8794
msgid ""
8795
"The general rules for :doc:`configuration files <configuration-help>`\n"
8796
"apply except for the variable policies."
8797
msgstr ""
8798
8799
#: en/help_topics/authentication.txt:116
8800
msgid "Each section describes an authentication definition."
8801
msgstr ""
8802
8803
#: en/help_topics/authentication.txt:118
8804
msgid ""
8805
"The section name is an arbitrary string, only the ``DEFAULT`` value is "
8806
"reserved\n"
8807
"and should appear as the *last* section."
8808
msgstr ""
8809
8810
#: en/help_topics/authentication.txt:121
8811
msgid "Each section should define:"
8812
msgstr ""
8813
8814
#: en/help_topics/authentication.txt:123
8815
msgid "* ``user``: the login to be used,"
8816
msgstr ""
8817
8818
#: en/help_topics/authentication.txt:125
8819
msgid "Each section could define:"
8820
msgstr ""
8821
8822
#: en/help_topics/authentication.txt:127
8823
msgid "* ``host``: the remote server,"
8824
msgstr ""
8825
8826
#: en/help_topics/authentication.txt:129
8827
msgid "* ``port``: the port the server is listening,"
8828
msgstr ""
8829
8830
#: en/help_topics/authentication.txt:131
8831
msgid "* ``path``: the branch location,"
8832
msgstr ""
8833
8834
#: en/help_topics/authentication.txt:133
8835
msgid "* ``password``: the password."
8836
msgstr ""
8837
8838
#: en/help_topics/authentication.txt:135
8839
msgid ""
8840
"\n"
8841
"Examples\n"
8842
"--------"
8843
msgstr ""
8844
8845
#: en/help_topics/authentication.txt:139
8846
msgid ""
8847
"\n"
8848
"Personal projects hosted outside\n"
8849
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
8850
msgstr ""
8851
8852
#: en/help_topics/authentication.txt:143
8853
msgid ""
8854
"All connections are done with the same ``user`` (the remote one for which "
8855
"the\n"
8856
"default bzr one is not appropriate) and the password is always prompted "
8857
"with\n"
8858
"some exceptions::"
8859
msgstr ""
8860
8861
#: en/help_topics/authentication.txt:147
8862
msgid ""
8863
" # Pet projects on hobby.net\n"
8864
" [hobby]\n"
8865
" host=r.hobby.net\n"
8866
" user=jim\n"
8867
" password=obvious1234\n"
8868
" \n"
8869
" # Home server\n"
8870
" [home]\n"
8871
" scheme=https\n"
8872
" host=home.net\n"
8873
" user=joe\n"
8874
" password=1essobV10us\n"
8875
" \n"
8876
" [DEFAULT]\n"
8877
" # Our local user is barbaz, on all remote sites we're known as "
8878
"foobar\n"
8879
" user=foobar"
8880
msgstr ""
8881
8882
#: en/help_topics/authentication.txt:164
8883
msgid ""
8884
"\n"
8885
"Source hosting provider\n"
8886
"~~~~~~~~~~~~~~~~~~~~~~~"
8887
msgstr ""
8888
8889
#: en/help_topics/authentication.txt:168
8890
msgid "In the shp.net (fictitious) domain, each project has its own site::"
8891
msgstr ""
8892
8893
#: en/help_topics/authentication.txt:170
8894
msgid ""
8895
" [shpnet domain]\n"
8896
" # we use sftp, but ssh is the scheme used for authentication\n"
8897
" scheme=ssh\n"
8898
" # The leading '.' ensures that 'shp.net' alone doesn't match\n"
8899
" host=.shp.net\n"
8900
" user=joe\n"
8901
" # bzr don't support supplying a password for sftp,\n"
8902
" # consider using an ssh agent if you don't want to supply\n"
8903
" # a password interactively. (pageant, ssh-agent, etc)"
8904
msgstr ""
8905
8906
#: en/help_topics/authentication.txt:180
8907
msgid ""
8908
"HTTPS, SFTP servers and their proxy\n"
8909
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
8910
msgstr ""
8911
8912
#: en/help_topics/authentication.txt:183
8913
msgid ""
8914
"At company.com, the server hosting release and integration branches is "
8915
"behind a\n"
8916
"proxy, and the two branches use different authentication policies::"
8917
msgstr ""
8918
8919
#: en/help_topics/authentication.txt:186
8920
msgid ""
8921
" [reference code]\n"
8922
" scheme=https\n"
8923
" host=dev.company.com\n"
8924
" path=/dev\n"
8925
" user=user1\n"
8926
" password=pass1"
8927
msgstr ""
8928
8929
#: en/help_topics/authentication.txt:193
8930
msgid ""
8931
" # development branches on dev server\n"
8932
" [dev]\n"
8933
" scheme=ssh # bzr+ssh and sftp are available here\n"
8934
" host=dev.company.com\n"
8935
" path=/dev/integration\n"
8936
" user=user2\n"
8937
" \n"
8938
" # proxy\n"
8939
" [proxy]\n"
8940
" scheme=http\n"
8941
" host=proxy.company.com\n"
8942
" port=3128\n"
8943
" user=proxyuser1\n"
8944
" password=proxypass1"
8945
msgstr ""
8946
8947
#: en/help_topics/authentication.txt:208
8948
msgid ""
8949
"\n"
8950
"Planned enhancements\n"
8951
"--------------------"
8952
msgstr ""
8953
8954
#: en/help_topics/authentication.txt:212
8955
msgid ""
8956
"The following are not yet implemented but planned as parts of a work in\n"
8957
"progress:"
8958
msgstr ""
8959
8960
#: en/help_topics/authentication.txt:215
8961
msgid "* add a ``password_encoding`` field allowing:"
8962
msgstr ""
8963
8964
#: en/help_topics/authentication.txt:217
8965
msgid ""
8966
" - storing the passwords in various obfuscating encodings (base64 for one),"
8967
msgstr ""
8968
8969
#: en/help_topics/authentication.txt:219
8970
msgid " - delegate password storage to plugins (.netrc for example)."
8971
msgstr ""
8972
8973
#: en/help_topics/authentication.txt:221
8974
msgid ""
8975
"* update the credentials when the user is prompted for user or password,"
8976
msgstr ""
8977
8978
#: en/help_topics/authentication.txt:223
8979
msgid "* add a ``verify_certificates`` field for ``HTTPS``."
8980
msgstr ""
8981
8982
#: en/help_topics/authentication.txt:225
8983
msgid ""
8984
"The ``password_encoding`` and ``verify_certificates`` fields are recognized "
8985
"but\n"
8986
"ignored in the actual implementation.\n"
8987
msgstr ""
8988
8989
#: en/help_topics/bugs.txt:1
8990
msgid "Bug Tracker Settings"
8991
msgstr ""
8992
8993
#: en/help_topics/bugs.txt:3
8994
msgid ""
8995
"When making a commit, metadata about bugs fixed by that change can be\n"
8996
"recorded by using the ``--fixes`` option. For each bug marked as fixed, an\n"
8997
"entry is included in the 'bugs' revision property stating '<url> <status>'.\n"
8998
"(The only ``status`` value currently supported is ``fixed.``)"
8999
msgstr ""
9000
9001
#: en/help_topics/bugs.txt:8
9002
msgid ""
9003
"The ``--fixes`` option allows you to specify a bug tracker and a bug "
9004
"identifier\n"
9005
"rather than a full URL. This looks like::"
9006
msgstr ""
9007
9008
#: en/help_topics/bugs.txt:11
9009
msgid " bzr commit --fixes <tracker>:<id>"
9010
msgstr ""
9011
9012
#: en/help_topics/bugs.txt:13
9013
msgid "or::"
9014
msgstr ""
9015
9016
#: en/help_topics/bugs.txt:15
9017
msgid " bzr commit --fixes <id>"
9018
msgstr ""
9019
9020
#: en/help_topics/bugs.txt:17
9021
msgid ""
9022
"where \"<tracker>\" is an identifier for the bug tracker, and \"<id>\" is "
9023
"the\n"
9024
"identifier for that bug within the bugtracker, usually the bug number.\n"
9025
"If \"<tracker>\" is not specified the ``bugtracker`` set in the branch\n"
9026
"or global configuration is used."
9027
msgstr ""
9028
9029
#: en/help_topics/bugs.txt:22
9030
msgid ""
9031
"Bazaar knows about a few bug trackers that have many users. If\n"
9032
"you use one of these bug trackers then there is no setup required to\n"
9033
"use this feature, you just need to know the tracker identifier to use.\n"
9034
"These are the bugtrackers that are built in:"
9035
msgstr ""
9036
9037
#: en/help_topics/bugs.txt:27
9038
msgid ""
9039
" ============================ ============ ============\n"
9040
" URL Abbreviation Example\n"
9041
" ============================ ============ ============\n"
9042
" https://bugs.launchpad.net/ lp lp:12345\n"
9043
" http://bugs.debian.org/ deb deb:12345\n"
9044
" http://bugzilla.gnome.org/ gnome gnome:12345\n"
9045
" ============================ ============ ============"
9046
msgstr ""
9047
9048
#: en/help_topics/bugs.txt:35
9049
msgid ""
9050
"For the bug trackers not listed above configuration is required.\n"
9051
"Support for generating the URLs for any project using Bugzilla or Trac\n"
9052
"is built in, along with a template mechanism for other bugtrackers with\n"
9053
"simple URL schemes. If your bug tracker can't be described by one\n"
9054
"of the schemes described below then you can write a plugin to support\n"
9055
"it."
9056
msgstr ""
9057
9058
#: en/help_topics/bugs.txt:42
9059
msgid ""
9060
"If you use Bugzilla or Trac, then you only need to set a configuration\n"
9061
"variable which contains the base URL of the bug tracker. These options\n"
9062
"can go into ``bazaar.conf``, ``branch.conf`` or into a branch-specific\n"
9063
"configuration section in ``locations.conf``. You can set up these values\n"
9064
"for each of the projects you work on."
9065
msgstr ""
9066
9067
#: en/help_topics/bugs.txt:48
9068
msgid ""
9069
"Note: As you provide a short name for each tracker, you can specify one or\n"
9070
"more bugs in one or more trackers at commit time if you wish."
9071
msgstr ""
9072
9073
#: en/help_topics/bugs.txt:51
9074
msgid ""
9075
"Launchpad\n"
9076
"---------"
9077
msgstr ""
9078
9079
#: en/help_topics/bugs.txt:54
9080
msgid "Use ``bzr commit --fixes lp:2`` to record that this commit fixes bug 2."
9081
msgstr ""
9082
9083
#: en/help_topics/bugs.txt:56
9084
msgid ""
9085
"bugzilla_<tracker>_url\n"
9086
"----------------------"
9087
msgstr ""
9088
9089
#: en/help_topics/bugs.txt:59
9090
msgid ""
9091
"If present, the location of the Bugzilla bug tracker referred to by\n"
9092
"<tracker>. This option can then be used together with ``bzr commit\n"
9093
"--fixes`` to mark bugs in that tracker as being fixed by that commit. For\n"
9094
"example::"
9095
msgstr ""
9096
9097
#: en/help_topics/bugs.txt:64
9098
msgid " bugzilla_squid_url = http://bugs.squid-cache.org"
9099
msgstr ""
9100
9101
#: en/help_topics/bugs.txt:66
9102
msgid ""
9103
"would allow ``bzr commit --fixes squid:1234`` to mark Squid's bug 1234 as\n"
9104
"fixed."
9105
msgstr ""
9106
9107
#: en/help_topics/bugs.txt:69
9108
msgid ""
9109
"trac_<tracker>_url\n"
9110
"------------------"
9111
msgstr ""
9112
9113
#: en/help_topics/bugs.txt:72
9114
msgid ""
9115
"If present, the location of the Trac instance referred to by\n"
9116
"<tracker>. This option can then be used together with ``bzr commit\n"
9117
"--fixes`` to mark bugs in that tracker as being fixed by that commit. For\n"
9118
"example::"
9119
msgstr ""
9120
9121
#: en/help_topics/bugs.txt:77
9122
msgid " trac_twisted_url = http://www.twistedmatrix.com/trac"
9123
msgstr ""
9124
9125
#: en/help_topics/bugs.txt:79
9126
msgid ""
9127
"would allow ``bzr commit --fixes twisted:1234`` to mark Twisted's bug 1234 "
9128
"as\n"
9129
"fixed."
9130
msgstr ""
9131
9132
#: en/help_topics/bugs.txt:82
9133
msgid ""
9134
"bugtracker_<tracker>_url\n"
9135
"------------------------"
9136
msgstr ""
9137
9138
#: en/help_topics/bugs.txt:85
9139
msgid ""
9140
"If present, the location of a generic bug tracker instance referred to by\n"
9141
"<tracker>. The location must contain an ``{id}`` placeholder,\n"
9142
"which will be replaced by a specific bug ID. This option can then be used\n"
9143
"together with ``bzr commit --fixes`` to mark bugs in that tracker as being\n"
9144
"fixed by that commit. For example::"
9145
msgstr ""
9146
9147
#: en/help_topics/bugs.txt:91
9148
msgid " bugtracker_python_url = http://bugs.python.org/issue{id}"
9149
msgstr ""
9150
9151
#: en/help_topics/bugs.txt:93
9152
msgid ""
9153
"would allow ``bzr commit --fixes python:1234`` to mark bug 1234 in Python's\n"
9154
"Roundup bug tracker as fixed, or::"
9155
msgstr ""
9156
9157
#: en/help_topics/bugs.txt:96
9158
msgid ""
9159
" bugtracker_cpan_url = http://rt.cpan.org/Public/Bug/Display.html?id={id}"
9160
msgstr ""
9161
9162
#: en/help_topics/bugs.txt:98
9163
msgid ""
9164
"would allow ``bzr commit --fixes cpan:1234`` to mark bug 1234 in CPAN's\n"
9165
"RT bug tracker as fixed, or::"
9166
msgstr ""
9167
9168
#: en/help_topics/bugs.txt:101
9169
msgid " bugtracker_hudson_url = http://issues.hudson-ci.org/browse/{id}"
9170
msgstr ""
9171
9172
#: en/help_topics/bugs.txt:103
9173
msgid ""
9174
"would allow ``bzr commit --fixes hudson:HUDSON-1234`` to mark bug "
9175
"HUDSON-1234\n"
9176
"in Hudson's JIRA bug tracker as fixed.\n"
9177
msgstr ""
9178
9179
#: en/help_topics/commands.txt:1
9180
msgid ""
9181
"add Add specified files or directories.\n"
9182
"alias Set/unset and display aliases.\n"
9183
"annotate Show the origin of each line in a file.\n"
9184
"bash-completion Generate a shell function for bash command line "
9185
"completion.\n"
9186
" [bash_completion]\n"
9187
"bind Convert the current branch into a checkout of the "
9188
"supplied\n"
9189
" branch.\n"
9190
"branch Create a new branch that is a copy of an existing branch.\n"
9191
"branches List the branches available at the current location.\n"
9192
"break-lock Break a dead lock.\n"
9193
"cat Write the contents of a file as of a given revision to\n"
9194
" standard output.\n"
9195
"check Validate working tree structure, branch consistency and\n"
9196
" repository history.\n"
9197
"checkout Create a new checkout of an existing branch.\n"
9198
"clean-tree Remove unwanted files from working tree.\n"
9199
"commit Commit changes into a new revision.\n"
9200
"config Display, set or remove a configuration option.\n"
9201
"conflicts List files with conflicts.\n"
9202
"deleted List files deleted in the working tree.\n"
9203
"diff Show differences in the working tree, between revisions "
9204
"or\n"
9205
" branches.\n"
9206
"dpush Push into a different VCS without any custom bzr "
9207
"metadata.\n"
9208
"export Export current or past revision to a destination directory "
9209
"or\n"
9210
" archive.\n"
9211
"help Show help on a command or other topic.\n"
9212
"ignore Ignore specified files or patterns.\n"
9213
"ignored List ignored files and the patterns that matched them.\n"
9214
"info Show information about a working tree, branch or "
9215
"repository.\n"
9216
"init Make a directory into a versioned branch.\n"
9217
"init-repository Create a shared repository for branches to share storage\n"
9218
" space.\n"
9219
"join Combine a tree into its containing tree.\n"
9220
"launchpad-login Show or set the Launchpad user ID. [launchpad]\n"
9221
"launchpad-mirror Ask Launchpad to mirror a branch now. [launchpad]\n"
9222
"launchpad-open Open a Launchpad branch page in your web browser. "
9223
"[launchpad]\n"
9224
"log Show historical log for a branch or subset of a branch.\n"
9225
"lp-find-proposal Find the proposal to merge this revision. [launchpad]\n"
9226
"lp-propose-merge Propose merging a branch on Launchpad. [launchpad]\n"
9227
"ls List files in a tree.\n"
9228
"merge Perform a three-way merge.\n"
9229
"missing Show unmerged/unpulled revisions between two branches.\n"
9230
"mkdir Create a new versioned directory.\n"
9231
"mv Move or rename a file.\n"
9232
"nick Print or set the branch nickname.\n"
9233
"pack Compress the data within a repository.\n"
9234
"plugins List the installed plugins.\n"
9235
"pull Turn this branch into a mirror of another branch.\n"
9236
"push Update a mirror of this branch.\n"
9237
"reconcile Reconcile bzr metadata in a branch.\n"
9238
"reconfigure Reconfigure the type of a bzr directory.\n"
9239
"register-branch Register a branch with launchpad.net. [launchpad]\n"
9240
"remerge Redo a merge.\n"
9241
"remove Remove files or directories.\n"
9242
"remove-branch Remove a branch.\n"
9243
"remove-tree Remove the working tree from a given branch/checkout.\n"
9244
"renames Show list of renamed files.\n"
9245
"resolve Mark a conflict as resolved.\n"
9246
"revert Revert files to a previous revision.\n"
9247
"revno Show current revision number.\n"
9248
"root Show the tree root directory.\n"
9249
"send Mail or create a merge-directive for submitting changes.\n"
9250
"serve Run the bzr server.\n"
9251
"shelve Temporarily set aside some changes from the current tree.\n"
9252
"sign-my-commits Sign all commits by a given committer.\n"
9253
"split Split a subdirectory of a tree into a separate tree.\n"
9254
"status Display status summary.\n"
9255
"switch Set the branch of a checkout and update.\n"
9256
"tag Create, remove or modify a tag naming a revision.\n"
9257
"tags List tags.\n"
9258
"testament Show testament (signing-form) of a revision.\n"
9259
"unbind Convert the current checkout into a regular branch.\n"
9260
"uncommit Remove the last committed revision.\n"
9261
"unshelve Restore shelved changes.\n"
9262
"update Update a working tree to a new revision.\n"
9263
"upgrade Upgrade a repository, branch or working tree to a newer\n"
9264
" format.\n"
9265
"verify-signatures Verify all commit signatures.\n"
9266
"version Show version of bzr.\n"
9267
"version-info Show version information about this tree.\n"
9268
"view Manage filtered views.\n"
9269
"whoami Show or set bzr user id.\n"
9270
msgstr ""
9271
9272
#: en/help_topics/configuration.txt:1
9273
msgid ""
9274
"Configuration Settings\n"
9275
"======================="
9276
msgstr ""
9277
9278
#: en/help_topics/configuration.txt:4
9279
msgid ""
9280
"Environment settings\n"
9281
"---------------------"
9282
msgstr ""
9283
9284
#: en/help_topics/configuration.txt:7
9285
msgid ""
9286
"While most configuration is handled by configuration files, some options\n"
9287
"which may be semi-permanent can also be controlled through the environment."
9288
msgstr ""
9289
9290
#: en/help_topics/configuration.txt:10
9291
msgid ""
9292
"BZR_EMAIL\n"
9293
"~~~~~~~~~"
9294
msgstr ""
9295
9296
#: en/help_topics/configuration.txt:13
9297
msgid "Override the email id used by Bazaar. Typical format::"
9298
msgstr ""
9299
9300
#: en/help_topics/configuration.txt:15
9301
msgid " \"John Doe <jdoe@example.com>\""
9302
msgstr ""
9303
9304
#: en/help_topics/configuration.txt:17
9305
msgid "See also the ``email`` configuration option."
9306
msgstr ""
9307
9308
#: en/help_topics/configuration.txt:19
9309
msgid ""
9310
"BZR_PROGRESS_BAR\n"
9311
"~~~~~~~~~~~~~~~~"
9312
msgstr ""
9313
9314
#: en/help_topics/configuration.txt:22
9315
msgid ""
9316
"Override the progress display. Possible values are \"none\" or \"text\". "
9317
"If\n"
9318
"the value is \"none\" then no progress bar is displayed. The value \"text\" "
9319
"draws\n"
9320
"the ordinary command line progress bar."
9321
msgstr ""
9322
9323
#: en/help_topics/configuration.txt:26
9324
msgid ""
9325
"BZR_SIGQUIT_PDB\n"
9326
"~~~~~~~~~~~~~~~"
9327
msgstr ""
9328
9329
#: en/help_topics/configuration.txt:29
9330
msgid "Control whether SIGQUIT behaves normally or invokes a breakin debugger."
9331
msgstr ""
9332
9333
#: en/help_topics/configuration.txt:31
9334
msgid ""
9335
"* 0 = Standard SIGQUIT behavior (normally, exit with a core dump)\n"
9336
"* 1 = Invoke breakin debugger (default)"
9337
msgstr ""
9338
9339
#: en/help_topics/configuration.txt:34
9340
msgid ""
9341
"BZR_HOME\n"
9342
"~~~~~~~~"
9343
msgstr ""
9344
9345
#: en/help_topics/configuration.txt:37
9346
msgid "Override the home directory used by Bazaar."
9347
msgstr ""
9348
9349
#: en/help_topics/configuration.txt:39
9350
msgid ""
9351
"BZR_SSH\n"
9352
"~~~~~~~"
9353
msgstr ""
9354
9355
#: en/help_topics/configuration.txt:42
9356
msgid "Select a different SSH implementation."
9357
msgstr ""
9358
9359
#: en/help_topics/configuration.txt:44
9360
msgid ""
9361
"BZR_PDB\n"
9362
"~~~~~~~"
9363
msgstr ""
9364
9365
#: en/help_topics/configuration.txt:47
9366
msgid "Control whether to launch a debugger on error."
9367
msgstr ""
9368
9369
#: en/help_topics/configuration.txt:49
9370
msgid ""
9371
"* 0 = Standard behavior\n"
9372
"* 1 = Launch debugger"
9373
msgstr ""
9374
9375
#: en/help_topics/configuration.txt:52
9376
msgid ""
9377
"BZR_REMOTE_PATH\n"
9378
"~~~~~~~~~~~~~~~"
9379
msgstr ""
9380
9381
#: en/help_topics/configuration.txt:55
9382
msgid "Path to the Bazaar executable to use when using the bzr+ssh protocol."
9383
msgstr ""
9384
9385
#: en/help_topics/configuration.txt:57
9386
msgid "See also the ``bzr_remote_path`` configuration option."
9387
msgstr ""
9388
9389
#: en/help_topics/configuration.txt:59
9390
msgid ""
9391
"BZR_EDITOR\n"
9392
"~~~~~~~~~~"
9393
msgstr ""
9394
9395
#: en/help_topics/configuration.txt:62
9396
msgid "Path to the editor Bazaar should use for commit messages, etc."
9397
msgstr ""
9398
9399
#: en/help_topics/configuration.txt:64
9400
msgid ""
9401
"BZR_LOG\n"
9402
"~~~~~~~"
9403
msgstr ""
9404
9405
#: en/help_topics/configuration.txt:67
9406
msgid ""
9407
"Location of the Bazaar log file. You can check the current location by\n"
9408
"running ``bzr version``."
9409
msgstr ""
9410
9411
#: en/help_topics/configuration.txt:70
9412
msgid ""
9413
"The log file contains debug information that is useful for diagnosing or\n"
9414
"reporting problems with Bazaar."
9415
msgstr ""
9416
9417
#: en/help_topics/configuration.txt:73
9418
msgid ""
9419
"Setting this to ``NUL`` on Windows or ``/dev/null`` on other platforms\n"
9420
"will disable logging."
9421
msgstr ""
9422
9423
#: en/help_topics/configuration.txt:76
9424
msgid ""
9425
"\n"
9426
"BZR_PLUGIN_PATH\n"
9427
"~~~~~~~~~~~~~~~"
9428
msgstr ""
9429
9430
#: en/help_topics/configuration.txt:80
9431
msgid ""
9432
"The path to the plugins directory that Bazaar should use.\n"
9433
"If not set, Bazaar will search for plugins in:"
9434
msgstr ""
9435
9436
#: en/help_topics/configuration.txt:83
9437
msgid "* the user specific plugin directory (containing the ``user`` plugins),"
9438
msgstr ""
9439
9440
#: en/help_topics/configuration.txt:85
9441
msgid "* the bzrlib directory (containing the ``core`` plugins),"
9442
msgstr ""
9443
9444
#: en/help_topics/configuration.txt:87
9445
msgid ""
9446
"* the site specific plugin directory if applicable (containing\n"
9447
" the ``site`` plugins)."
9448
msgstr ""
9449
9450
#: en/help_topics/configuration.txt:90
9451
msgid ""
9452
"If ``BZR_PLUGIN_PATH`` is set in any fashion, it will change the\n"
9453
"the way the plugin are searched. "
9454
msgstr ""
9455
9456
#: en/help_topics/configuration.txt:93
9457
msgid ""
9458
"As for the ``PATH`` variables, if multiple directories are\n"
9459
"specified in ``BZR_PLUGIN_PATH`` they should be separated by the\n"
9460
"platform specific appropriate character (':' on Unix,\n"
9461
"';' on windows)"
9462
msgstr ""
9463
9464
#: en/help_topics/configuration.txt:98
9465
msgid ""
9466
"By default if ``BZR_PLUGIN_PATH`` is set, it replaces searching\n"
9467
"in ``user``. However it will continue to search in ``core`` and\n"
9468
"``site`` unless they are explicitly removed."
9469
msgstr ""
9470
9471
#: en/help_topics/configuration.txt:102
9472
msgid ""
9473
"If you need to change the order or remove one of these\n"
9474
"directories, you should use special values:"
9475
msgstr ""
9476
9477
#: en/help_topics/configuration.txt:105
9478
msgid ""
9479
"* ``-user``, ``-core``, ``-site`` will remove the corresponding\n"
9480
" path from the default values,"
9481
msgstr ""
9482
9483
#: en/help_topics/configuration.txt:108
9484
msgid ""
9485
"* ``+user``, ``+core``, ``+site`` will add the corresponding path\n"
9486
" before the remaining default values (and also remove it from\n"
9487
" the default values)."
9488
msgstr ""
9489
9490
#: en/help_topics/configuration.txt:112
9491
msgid ""
9492
"Note that the special values 'user', 'core' and 'site' should be\n"
9493
"used literally, they will be substituted by the corresponding,\n"
9494
"platform specific, values."
9495
msgstr ""
9496
9497
#: en/help_topics/configuration.txt:116
9498
msgid ""
9499
"The examples below use ':' as the separator, windows users\n"
9500
"should use ';'."
9501
msgstr ""
9502
9503
#: en/help_topics/configuration.txt:119
9504
msgid "Overriding the default user plugin directory::"
9505
msgstr ""
9506
9507
#: en/help_topics/configuration.txt:121
9508
msgid " BZR_PLUGIN_PATH='/path/to/my/other/plugins'"
9509
msgstr ""
9510
9511
#: en/help_topics/configuration.txt:123
9512
msgid "Disabling the site directory while retaining the user directory::"
9513
msgstr ""
9514
9515
#: en/help_topics/configuration.txt:125
9516
msgid " BZR_PLUGIN_PATH='-site:+user'"
9517
msgstr ""
9518
9519
#: en/help_topics/configuration.txt:127
9520
msgid "Disabling all plugins (better achieved with --no-plugins)::"
9521
msgstr ""
9522
9523
#: en/help_topics/configuration.txt:129
9524
msgid " BZR_PLUGIN_PATH='-user:-core:-site'"
9525
msgstr ""
9526
9527
#: en/help_topics/configuration.txt:131
9528
msgid "Overriding the default site plugin directory::"
9529
msgstr ""
9530
9531
#: en/help_topics/configuration.txt:133
9532
msgid " BZR_PLUGIN_PATH='/path/to/my/site/plugins:-site':+user"
9533
msgstr ""
9534
9535
#: en/help_topics/configuration.txt:135
9536
msgid ""
9537
"BZR_DISABLE_PLUGINS\n"
9538
"~~~~~~~~~~~~~~~~~~~"
9539
msgstr ""
9540
9541
#: en/help_topics/configuration.txt:138
9542
msgid ""
9543
"Under special circumstances (mostly when trying to diagnose a\n"
9544
"bug), it's better to disable a plugin (or several) rather than\n"
9545
"uninstalling them completely. Such plugins can be specified in\n"
9546
"the ``BZR_DISABLE_PLUGINS`` environment variable."
9547
msgstr ""
9548
9549
#: en/help_topics/configuration.txt:143
9550
msgid ""
9551
"In that case, ``bzr`` will stop loading the specified plugins and\n"
9552
"will raise an import error if they are explicitly imported (by\n"
9553
"another plugin that depends on them for example)."
9554
msgstr ""
9555
9556
#: en/help_topics/configuration.txt:147
9557
msgid "Disabling ``myplugin`` and ``yourplugin`` is achieved by::"
9558
msgstr ""
9559
9560
#: en/help_topics/configuration.txt:149
9561
msgid " BZR_DISABLE_PLUGINS='myplugin:yourplugin'"
9562
msgstr ""
9563
9564
#: en/help_topics/configuration.txt:151
9565
msgid ""
9566
"BZR_PLUGINS_AT\n"
9567
"~~~~~~~~~~~~~~"
9568
msgstr ""
9569
9570
#: en/help_topics/configuration.txt:154
9571
msgid ""
9572
"When adding a new feature or working on a bug in a plugin,\n"
9573
"developers often need to use a specific version of a given\n"
9574
"plugin. Since python requires that the directory containing the\n"
9575
"code is named like the plugin itself this make it impossible to\n"
9576
"use arbitrary directory names (using a two-level directory scheme\n"
9577
"is inconvenient). ``BZR_PLUGINS_AT`` allows such directories even\n"
9578
"if they don't appear in ``BZR_PLUGIN_PATH`` ."
9579
msgstr ""
9580
9581
#: en/help_topics/configuration.txt:162
9582
msgid ""
9583
"Plugins specified in this environment variable takes precedence\n"
9584
"over the ones in ``BZR_PLUGIN_PATH``."
9585
msgstr ""
9586
9587
#: en/help_topics/configuration.txt:165
9588
msgid ""
9589
"The variable specified a list of ``plugin_name@plugin path``,\n"
9590
"``plugin_name`` being the name of the plugin as it appears in\n"
9591
"python module paths, ``plugin_path`` being the path to the\n"
9592
"directory containing the plugin code itself\n"
9593
"(i.e. ``plugins/myplugin`` not ``plugins``). Use ':' as the list\n"
9594
"separator, use ';' on windows."
9595
msgstr ""
9596
9597
#: en/help_topics/configuration.txt:172
9598
msgid ""
9599
"Example:\n"
9600
"~~~~~~~~"
9601
msgstr ""
9602
9603
#: en/help_topics/configuration.txt:175
9604
msgid ""
9605
"Using a specific version of ``myplugin``:\n"
9606
"``BZR_PLUGINS_AT='myplugin@/home/me/bugfixes/123456-myplugin``"
9607
msgstr ""
9608
9609
#: en/help_topics/configuration.txt:178
9610
msgid ""
9611
"BZRPATH\n"
9612
"~~~~~~~"
9613
msgstr ""
9614
9615
#: en/help_topics/configuration.txt:181
9616
msgid "The path where Bazaar should look for shell plugin external commands."
9617
msgstr ""
9618
9619
#: en/help_topics/configuration.txt:183
9620
msgid ""
9621
"\n"
9622
"http_proxy, https_proxy\n"
9623
"~~~~~~~~~~~~~~~~~~~~~~~"
9624
msgstr ""
9625
9626
#: en/help_topics/configuration.txt:187
9627
msgid "Specifies the network proxy for outgoing connections, for example::"
9628
msgstr ""
9629
9630
#: en/help_topics/configuration.txt:189
9631
msgid ""
9632
" http_proxy=http://proxy.example.com:3128/ \n"
9633
" https_proxy=http://proxy.example.com:3128/"
9634
msgstr ""
9635
9636
#: en/help_topics/configuration.txt:192
9637
msgid ""
9638
"\n"
9639
"Configuration files\n"
9640
"-------------------"
9641
msgstr ""
9642
9643
#: en/help_topics/configuration.txt:196
9644
msgid ""
9645
"Location\n"
9646
"~~~~~~~~"
9647
msgstr ""
9648
9649
#: en/help_topics/configuration.txt:199
9650
msgid ""
9651
"Configuration files are located in ``$HOME/.bazaar`` on Unix and\n"
9652
"``C:\\Documents and Settings\\<username>\\Application Data\\Bazaar\\2.0`` "
9653
"on\n"
9654
"Windows. (You can check the location for your system by using\n"
9655
"``bzr version``.)"
9656
msgstr ""
9657
9658
#: en/help_topics/configuration.txt:204
9659
msgid "There are three primary configuration files in this location:"
9660
msgstr ""
9661
9662
#: en/help_topics/configuration.txt:206
9663
msgid "* ``bazaar.conf`` describes default configuration options,"
9664
msgstr ""
9665
9666
#: en/help_topics/configuration.txt:208
9667
msgid ""
9668
"* ``locations.conf`` describes configuration information for\n"
9669
" specific branch locations,"
9670
msgstr ""
9671
9672
#: en/help_topics/configuration.txt:211
9673
msgid ""
9674
"* ``authentication.conf`` describes credential information for\n"
9675
" remote servers."
9676
msgstr ""
9677
9678
#: en/help_topics/configuration.txt:214
9679
msgid ""
9680
"Each branch can also contain a configuration file that sets values specific\n"
9681
"to that branch. This file is found at ``.bzr/branch/branch.conf`` within "
9682
"the\n"
9683
"branch. This file is visible to all users of a branch, if you wish to "
9684
"override\n"
9685
"one of the values for a branch with a setting that is specific to you then "
9686
"you\n"
9687
"can do so in ``locations.conf``."
9688
msgstr ""
9689
9690
#: en/help_topics/configuration.txt:220
9691
msgid ""
9692
"General format\n"
9693
"~~~~~~~~~~~~~~"
9694
msgstr ""
9695
9696
#: en/help_topics/configuration.txt:223
9697
msgid ""
9698
"An ini file has three types of contructs: section headers, section\n"
9699
"options and comments."
9700
msgstr ""
9701
9702
#: en/help_topics/configuration.txt:226
9703
msgid ""
9704
"Comments\n"
9705
"^^^^^^^^"
9706
msgstr ""
9707
9708
#: en/help_topics/configuration.txt:229
9709
msgid ""
9710
"A comment is any line that starts with a \"#\" (sometimes called a \"hash\n"
9711
"mark\", \"pound sign\" or \"number sign\"). Comment lines are ignored by\n"
9712
"Bazaar when parsing ini files."
9713
msgstr ""
9714
9715
#: en/help_topics/configuration.txt:233
9716
msgid ""
9717
"Section headers\n"
9718
"^^^^^^^^^^^^^^^"
9719
msgstr ""
9720
9721
#: en/help_topics/configuration.txt:236
9722
msgid ""
9723
"A section header is a word enclosed in brackets that starts at the begining\n"
9724
"of a line. A typical section header looks like this::"
9725
msgstr ""
9726
9727
#: en/help_topics/configuration.txt:239
9728
msgid " [DEFAULT]"
9729
msgstr ""
9730
9731
#: en/help_topics/configuration.txt:241
9732
msgid ""
9733
"The only valid section headers for bazaar.conf currently are [DEFAULT] and\n"
9734
"[ALIASES]. Section headers are case sensitive. The default section provides "
9735
"for\n"
9736
"setting options which can be overridden with the branch config file."
9737
msgstr ""
9738
9739
#: en/help_topics/configuration.txt:245
9740
msgid ""
9741
"For ``locations.conf``, the options from the section with the\n"
9742
"longest matching section header are used to the exclusion of other\n"
9743
"potentially valid section headers. A section header uses the path for\n"
9744
"the branch as the section header. Some examples include::"
9745
msgstr ""
9746
9747
#: en/help_topics/configuration.txt:250
9748
msgid ""
9749
" [http://mybranches.isp.com/~jdoe/branchdir]\n"
9750
" [/home/jdoe/branches/]"
9751
msgstr ""
9752
9753
#: en/help_topics/configuration.txt:253
9754
msgid ""
9755
"\n"
9756
"Section options\n"
9757
"^^^^^^^^^^^^^^^"
9758
msgstr ""
9759
9760
#: en/help_topics/configuration.txt:257
9761
msgid ""
9762
"A section option resides within a section. A section option contains an\n"
9763
"option name, an equals sign and a value. For example::"
9764
msgstr ""
9765
9766
#: en/help_topics/configuration.txt:260
9767
msgid ""
9768
" email = John Doe <jdoe@isp.com>\n"
9769
" gpg_signing_key = Amy Pond <amy@example.com>"
9770
msgstr ""
9771
9772
#: en/help_topics/configuration.txt:263
9773
msgid ""
9774
"A option can reference other options by enclosing them in curly brackets::"
9775
msgstr ""
9776
9777
#: en/help_topics/configuration.txt:265
9778
msgid ""
9779
" my_branch_name = feature_x\n"
9780
" my_server = bzr+ssh://example.com\n"
9781
" push_location = {my_server}/project/{my_branch_name}"
9782
msgstr ""
9783
9784
#: en/help_topics/configuration.txt:269
9785
msgid ""
9786
"Option policies\n"
9787
"^^^^^^^^^^^^^^^"
9788
msgstr ""
9789
9790
#: en/help_topics/configuration.txt:272
9791
msgid ""
9792
"Options defined in a section affect the named directory or URL plus\n"
9793
"any locations they contain. Policies can be used to change how an\n"
9794
"option value is interpreted for contained locations. Currently\n"
9795
"there are three policies available:"
9796
msgstr ""
9797
9798
#: en/help_topics/configuration.txt:277
9799
msgid ""
9800
" none:\n"
9801
" the value is interpreted the same for contained locations. This is\n"
9802
" the default behaviour.\n"
9803
" norecurse:\n"
9804
" the value is only used for the exact location specified by the\n"
9805
" section name.\n"
9806
" appendpath:\n"
9807
" for contained locations, any additional path components are\n"
9808
" appended to the value."
9809
msgstr ""
9810
9811
#: en/help_topics/configuration.txt:287
9812
msgid ""
9813
"Policies are specified by keys with names of the form \"<option_name>:policy"
9814
"\".\n"
9815
"For example, to define the push location for a tree of branches, the\n"
9816
"following could be used::"
9817
msgstr ""
9818
9819
#: en/help_topics/configuration.txt:291
9820
msgid ""
9821
" [/top/location]\n"
9822
" push_location = sftp://example.com/location\n"
9823
" push_location:policy = appendpath"
9824
msgstr ""
9825
9826
#: en/help_topics/configuration.txt:295
9827
msgid ""
9828
"With this configuration, the push location for ``/top/location/branch1``\n"
9829
"would be ``sftp://example.com/location/branch1``."
9830
msgstr ""
9831
9832
#: en/help_topics/configuration.txt:298
9833
msgid ""
9834
"Section local options\n"
9835
"^^^^^^^^^^^^^^^^^^^^^"
9836
msgstr ""
9837
9838
#: en/help_topics/configuration.txt:301
9839
msgid ""
9840
"Some options are defined automatically inside a given section and can be\n"
9841
"refered to in this section only. "
9842
msgstr ""
9843
9844
#: en/help_topics/configuration.txt:304
9845
msgid "For example, the ``appendpath`` policy can be used like this::"
9846
msgstr ""
9847
9848
#: en/help_topics/configuration.txt:306
9849
msgid ""
9850
" [/home/vila/src/bzr/bugs]\n"
9851
" mypush = lp:~vila/bzr\n"
9852
" mypush:policy=appendpath"
9853
msgstr ""
9854
9855
#: en/help_topics/configuration.txt:310
9856
msgid "Using ``relpath`` to achieve the same result is done like this::"
9857
msgstr ""
9858
9859
#: en/help_topics/configuration.txt:312
9860
msgid ""
9861
" [/home/vila/src/bzr/bugs]\n"
9862
" mypush = lp:~vila/bzr/{relpath}"
9863
msgstr ""
9864
9865
#: en/help_topics/configuration.txt:315
9866
msgid ""
9867
"In both cases, when used in a directory like\n"
9868
"``/home/vila/src/bzr/bugs/832013-expand-in-stack`` we'll get::"
9869
msgstr ""
9870
9871
#: en/help_topics/configuration.txt:318
9872
msgid ""
9873
" $ bzr config mypush\n"
9874
" lp:~vila/bzr/832013-expand-in-stack"
9875
msgstr ""
9876
9877
#: en/help_topics/configuration.txt:321
9878
msgid "Another such option is ``basename`` which can be used like this::"
9879
msgstr ""
9880
9881
#: en/help_topics/configuration.txt:323
9882
msgid ""
9883
" [/home/vila/src/bzr]\n"
9884
" mypush = lp:~vila/bzr/{basename}"
9885
msgstr ""
9886
9887
#: en/help_topics/configuration.txt:326
9888
msgid ""
9889
"When used in a directory like\n"
9890
"``/home/vila/src/bzr/bugs/832013-expand-in-stack`` we'll get::"
9891
msgstr ""
9892
9893
#: en/help_topics/configuration.txt:332
9894
msgid ""
9895
"Note that ``basename`` here refers to the base name of ``relpath`` which\n"
9896
"itself is defined as the relative path between the section name and the\n"
9897
"location it matches."
9898
msgstr ""
9899
9900
#: en/help_topics/configuration.txt:336
9901
msgid ""
9902
"When an option is local to a Section, it cannot be referred to from option\n"
9903
"values in any other section from the same ``Store`` nor from any other\n"
9904
"``Store``."
9905
msgstr ""
9906
9907
#: en/help_topics/configuration.txt:340
9908
msgid ""
9909
"\n"
9910
"The main configuration file, bazaar.conf\n"
9911
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
9912
msgstr ""
9913
9914
#: en/help_topics/configuration.txt:344
9915
msgid ""
9916
"``bazaar.conf`` allows two sections: ``[DEFAULT]`` and ``[ALIASES]``.\n"
9917
"The default section contains the default\n"
9918
"configuration options for all branches. The default section can be\n"
9919
"overriden by providing a branch-specific section in ``locations.conf``."
9920
msgstr ""
9921
9922
#: en/help_topics/configuration.txt:349
9923
msgid "A typical ``bazaar.conf`` section often looks like the following::"
9924
msgstr ""
9925
9926
#: en/help_topics/configuration.txt:351
9927
msgid ""
9928
" [DEFAULT]\n"
9929
" email = John Doe <jdoe@isp.com>\n"
9930
" editor = /usr/bin/vim\n"
9931
" create_signatures = when-required"
9932
msgstr ""
9933
9934
#: en/help_topics/configuration.txt:356
9935
msgid ""
9936
"\n"
9937
"The branch location configuration file, locations.conf\n"
9938
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
9939
msgstr ""
9940
9941
#: en/help_topics/configuration.txt:360
9942
msgid ""
9943
"``locations.conf`` allows one to specify overriding settings for\n"
9944
"a specific branch. The format is almost identical to the default section in\n"
9945
"bazaar.conf with one significant change: The section header, instead of "
9946
"saying\n"
9947
"default, will be the path to a branch that you wish to override a value\n"
9948
"for. The '?' and '*' wildcards are supported::"
9949
msgstr ""
9950
9951
#: en/help_topics/configuration.txt:366
9952
msgid ""
9953
" [/home/jdoe/branches/nethack]\n"
9954
" email = Nethack Admin <nethack@nethack.com>"
9955
msgstr ""
9956
9957
#: en/help_topics/configuration.txt:369
9958
msgid ""
9959
" [http://hypothetical.site.com/branches/devel-branch]\n"
9960
" create_signatures = always"
9961
msgstr ""
9962
9963
#: en/help_topics/configuration.txt:372
9964
msgid ""
9965
"The authentication configuration file, authentication.conf\n"
9966
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
9967
msgstr ""
9968
9969
#: en/help_topics/configuration.txt:375
9970
msgid ""
9971
"``authentication.conf`` allows one to specify credentials for\n"
9972
"remote servers. This can be used for all the supported transports and any "
9973
"part\n"
9974
"of bzr that requires authentication (smtp for example)."
9975
msgstr ""
9976
9977
#: en/help_topics/configuration.txt:379
9978
msgid ""
9979
"The syntax of the file obeys the same rules as the others except for the\n"
9980
"option policies which don't apply."
9981
msgstr ""
9982
9983
#: en/help_topics/configuration.txt:382
9984
msgid ""
9985
"For more information on the possible uses of the authentication "
9986
"configuration\n"
9987
"file see :doc:`authentication-help`."
9988
msgstr ""
9989
9990
#: en/help_topics/configuration.txt:385
9991
msgid ""
9992
"\n"
9993
"Common options\n"
9994
"--------------"
9995
msgstr ""
9996
9997
#: en/help_topics/configuration.txt:389
9998
msgid ""
9999
"debug_flags\n"
10000
"~~~~~~~~~~~"
10001
msgstr ""
10002
10003
#: en/help_topics/configuration.txt:392
10004
msgid ""
10005
"A comma-separated list of debugging options to turn on. The same values\n"
10006
"can be used as with the -D command-line option (see `help global-options`).\n"
10007
"For example::"
10008
msgstr ""
10009
10010
#: en/help_topics/configuration.txt:396
10011
msgid " debug_flags = hpss"
10012
msgstr ""
10013
10014
#: en/help_topics/configuration.txt:400
10015
msgid " debug_flags = hpss,evil"
10016
msgstr ""
10017
10018
#: en/help_topics/configuration.txt:402
10019
msgid ""
10020
"email\n"
10021
"~~~~~"
10022
msgstr ""
10023
10024
#: en/help_topics/configuration.txt:405
10025
msgid ""
10026
"The email address to use when committing a branch. Typically takes the form\n"
10027
"of::"
10028
msgstr ""
10029
10030
#: en/help_topics/configuration.txt:408
10031
msgid " email = Full Name <account@hostname.tld>"
10032
msgstr ""
10033
10034
#: en/help_topics/configuration.txt:410
10035
msgid ""
10036
"editor\n"
10037
"~~~~~~"
10038
msgstr ""
10039
10040
#: en/help_topics/configuration.txt:413
10041
msgid ""
10042
"The path of the editor that you wish to use if *bzr commit* is run without\n"
10043
"a commit message. This setting is trumped by the environment variable\n"
10044
"``BZR_EDITOR``, and overrides the ``VISUAL`` and ``EDITOR`` environment\n"
10045
"variables."
10046
msgstr ""
10047
10048
#: en/help_topics/configuration.txt:418
10049
msgid ""
10050
"log_format\n"
10051
"~~~~~~~~~~"
10052
msgstr ""
10053
10054
#: en/help_topics/configuration.txt:421
10055
msgid ""
10056
"The default log format to use. Standard log formats are ``long``, ``short``\n"
10057
"and ``line``. Additional formats may be provided by plugins. The default\n"
10058
"value is ``long``."
10059
msgstr ""
10060
10061
#: en/help_topics/configuration.txt:425
10062
msgid ""
10063
"check_signatures\n"
10064
"~~~~~~~~~~~~~~~~"
10065
msgstr ""
10066
10067
#: en/help_topics/configuration.txt:428
10068
msgid ""
10069
"Reserved for future use. These options will allow a policy for branches to\n"
10070
"require signatures."
10071
msgstr ""
10072
10073
#: en/help_topics/configuration.txt:431
10074
msgid ""
10075
"require\n"
10076
" The gnupg signature for revisions must be present and must be valid."
10077
msgstr ""
10078
10079
#: en/help_topics/configuration.txt:434
10080
msgid ""
10081
"ignore\n"
10082
" Do not check gnupg signatures of revisions."
10083
msgstr ""
10084
10085
#: en/help_topics/configuration.txt:437
10086
msgid ""
10087
"check-available\n"
10088
" (default) If gnupg signatures for revisions are present, check them.\n"
10089
" Bazaar will fail if it finds a bad signature, but will not fail if\n"
10090
" no signature is present."
10091
msgstr ""
10092
10093
#: en/help_topics/configuration.txt:442
10094
msgid ""
10095
"create_signatures\n"
10096
"~~~~~~~~~~~~~~~~~"
10097
msgstr ""
10098
10099
#: en/help_topics/configuration.txt:445
10100
msgid ""
10101
"Defines the behaviour of signing revisions on commits. By default bzr will "
10102
"not\n"
10103
"sign new commits."
10104
msgstr ""
10105
10106
#: en/help_topics/configuration.txt:448
10107
msgid ""
10108
"always\n"
10109
" Sign every new revision that is committed. If the signing fails then "
10110
"the\n"
10111
" commit will not be made."
10112
msgstr ""
10113
10114
#: en/help_topics/configuration.txt:452
10115
msgid ""
10116
"when-required\n"
10117
" Reserved for future use."
10118
msgstr ""
10119
10120
#: en/help_topics/configuration.txt:455
10121
msgid ""
10122
"never\n"
10123
" Reserved for future use."
10124
msgstr ""
10125
10126
#: en/help_topics/configuration.txt:458
10127
msgid ""
10128
"In future it is planned that ``when-required`` will sign newly\n"
10129
"committed revisions only when the branch requires them. ``never`` will "
10130
"refuse\n"
10131
"to sign newly committed revisions, even if the branch requires signatures."
10132
msgstr ""
10133
10134
#: en/help_topics/configuration.txt:462
10135
msgid ""
10136
"dirstate.fdatasync\n"
10137
"~~~~~~~~~~~~~~~~~~"
10138
msgstr ""
10139
10140
#: en/help_topics/configuration.txt:465
10141
msgid ""
10142
"If true (default), working tree metadata changes are flushed through the\n"
10143
"OS buffers to physical disk. This is somewhat slower, but means data\n"
10144
"should not be lost if the machine crashes. See also repository.fdatasync."
10145
msgstr ""
10146
10147
#: en/help_topics/configuration.txt:469
10148
msgid ""
10149
"gpg_signing_key\n"
10150
"~~~~~~~~~~~~~~~"
10151
msgstr ""
10152
10153
#: en/help_topics/configuration.txt:472
10154
msgid ""
10155
"The GnuPG user identity to use when signing commits. Can be an e-mail\n"
10156
"address, key fingerprint or full key ID. When unset or when set to\n"
10157
"\"default\" Bazaar will use the user e-mail set with ``whoami``."
10158
msgstr ""
10159
10160
#: en/help_topics/configuration.txt:476
10161
msgid ""
10162
"recurse\n"
10163
"~~~~~~~"
10164
msgstr ""
10165
10166
#: en/help_topics/configuration.txt:479
10167
msgid ""
10168
"Only useful in ``locations.conf``. Defines whether or not the\n"
10169
"configuration for this section applies to subdirectories:"
10170
msgstr ""
10171
10172
#: en/help_topics/configuration.txt:482
10173
msgid ""
10174
"true\n"
10175
" (default) This section applies to subdirectories as well."
10176
msgstr ""
10177
10178
#: en/help_topics/configuration.txt:485
10179
msgid ""
10180
"false\n"
10181
" This section only applies to the branch at this directory and not\n"
10182
" branches below it."
10183
msgstr ""
10184
10185
#: en/help_topics/configuration.txt:489
10186
msgid ""
10187
"gpg_signing_command\n"
10188
"~~~~~~~~~~~~~~~~~~~"
10189
msgstr ""
10190
10191
#: en/help_topics/configuration.txt:492
10192
msgid ""
10193
"(Default: \"gpg\"). Which program should be used to sign and check "
10194
"revisions.\n"
10195
"For example::"
10196
msgstr ""
10197
10198
#: en/help_topics/configuration.txt:495
10199
msgid " gpg_signing_command = /usr/bin/gnpg"
10200
msgstr ""
10201
10202
#: en/help_topics/configuration.txt:497
10203
msgid ""
10204
"The specified command must accept the options \"--clearsign\" and \"-u "
10205
"<email>\"."
10206
msgstr ""
10207
10208
#: en/help_topics/configuration.txt:499
10209
msgid ""
10210
"bzr_remote_path\n"
10211
"~~~~~~~~~~~~~~~"
10212
msgstr ""
10213
10214
#: en/help_topics/configuration.txt:502
10215
msgid ""
10216
"(Default: \"bzr\"). The path to the command that should be used to run the "
10217
"smart\n"
10218
"server for bzr. This value may only be specified in locations.conf, because:"
10219
msgstr ""
10220
10221
#: en/help_topics/configuration.txt:505
10222
msgid ""
10223
"- it's needed before branch.conf is accessible\n"
10224
"- allowing remote branch.conf files to specify commands would be a security\n"
10225
" risk"
10226
msgstr ""
10227
10228
#: en/help_topics/configuration.txt:509
10229
msgid "It is overridden by the BZR_REMOTE_PATH environment variable."
10230
msgstr ""
10231
10232
#: en/help_topics/configuration.txt:511
10233
msgid ""
10234
"smtp_server\n"
10235
"~~~~~~~~~~~"
10236
msgstr ""
10237
10238
#: en/help_topics/configuration.txt:514
10239
msgid ""
10240
"(Default: \"localhost\"). SMTP server to use when Bazaar needs to send\n"
10241
"email, eg. with ``merge-directive --mail-to``, or the bzr-email plugin."
10242
msgstr ""
10243
10244
#: en/help_topics/configuration.txt:517
10245
msgid ""
10246
"smtp_username, smtp_password\n"
10247
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
10248
msgstr ""
10249
10250
#: en/help_topics/configuration.txt:520
10251
msgid ""
10252
"User and password to authenticate to the SMTP server. If smtp_username\n"
10253
"is set, and smtp_password is not, Bazaar will prompt for a password.\n"
10254
"These settings are only needed if the SMTP server requires authentication\n"
10255
"to send mail."
10256
msgstr ""
10257
10258
#: en/help_topics/configuration.txt:525
10259
msgid ""
10260
"locks.steal_dead\n"
10261
"~~~~~~~~~~~~~~~~"
10262
msgstr ""
10263
10264
#: en/help_topics/configuration.txt:528
10265
msgid ""
10266
"If set to true, bzr will automatically break locks held by processes from\n"
10267
"the same machine and user that are no longer alive. Otherwise, it will\n"
10268
"print a message and you can break the lock manually, if you are satisfied\n"
10269
"the object is no longer in use."
10270
msgstr ""
10271
10272
#: en/help_topics/configuration.txt:533
10273
msgid ""
10274
"mail_client\n"
10275
"~~~~~~~~~~~"
10276
msgstr ""
10277
10278
#: en/help_topics/configuration.txt:536
10279
msgid ""
10280
"A mail client to use for sending merge requests.\n"
10281
"By default, bzr will try to use ``mapi`` on Windows. On other platforms, "
10282
"it\n"
10283
"will try ``xdg-email``. If either of these fails, it will fall back to\n"
10284
"``editor``."
10285
msgstr ""
10286
10287
#: en/help_topics/configuration.txt:541
10288
msgid "Supported values for specific clients:"
10289
msgstr ""
10290
10291
#: en/help_topics/configuration.txt:543
10292
msgid ""
10293
":claws: Use Claws. This skips a dialog for attaching files.\n"
10294
":evolution: Use Evolution.\n"
10295
":kmail: Use KMail.\n"
10296
":mutt: Use Mutt.\n"
10297
":thunderbird: Use Mozilla Thunderbird or Icedove. For Thunderbird/Icedove "
10298
"1.5,\n"
10299
" this works around some bugs that xdg-email doesn't handle."
10300
msgstr ""
10301
10302
#: en/help_topics/configuration.txt:550
10303
msgid "Supported generic values are:"
10304
msgstr ""
10305
10306
#: en/help_topics/configuration.txt:552
10307
msgid ""
10308
":default: See above.\n"
10309
":editor: Use your editor to compose the merge request. This also uses\n"
10310
" your commit id, (see ``bzr whoami``), smtp_server and (optionally)\n"
10311
" smtp_username and smtp_password.\n"
10312
":mapi: Use your preferred e-mail client on Windows.\n"
10313
":xdg-email: Use xdg-email to run your preferred mail program"
10314
msgstr ""
10315
10316
#: en/help_topics/configuration.txt:559
10317
msgid ""
10318
"repository.fdatasync\n"
10319
"~~~~~~~~~~~~~~~~~~~~"
10320
msgstr ""
10321
10322
#: en/help_topics/configuration.txt:562
10323
msgid ""
10324
"If true (default), repository changes are flushed through the OS buffers\n"
10325
"to physical disk. This is somewhat slower, but means data should not be\n"
10326
"lost if the machine crashes. See also dirstate.fdatasync."
10327
msgstr ""
10328
10329
#: en/help_topics/configuration.txt:566
10330
msgid ""
10331
"submit_branch\n"
10332
"~~~~~~~~~~~~~"
10333
msgstr ""
10334
10335
#: en/help_topics/configuration.txt:569
10336
msgid ""
10337
"The branch you intend to submit your current work to. This is "
10338
"automatically\n"
10339
"set by ``bzr send``, and is also used by the ``submit:`` revision spec. "
10340
"This\n"
10341
"should usually be set on a per-branch or per-location basis."
10342
msgstr ""
10343
10344
#: en/help_topics/configuration.txt:573
10345
msgid ""
10346
"public_branch\n"
10347
"~~~~~~~~~~~~~"
10348
msgstr ""
10349
10350
#: en/help_topics/configuration.txt:576
10351
msgid ""
10352
"A publically-accessible version of this branch (implying that this version "
10353
"is\n"
10354
"not publically-accessible). Used (and set) by ``bzr send``."
10355
msgstr ""
10356
10357
#: en/help_topics/configuration.txt:579
10358
msgid ""
10359
"suppress_warnings\n"
10360
"~~~~~~~~~~~~~~~~~"
10361
msgstr ""
10362
10363
#: en/help_topics/configuration.txt:582
10364
msgid ""
10365
"A list of strings, each string represent a warning that can be emitted by\n"
10366
"bzr. Mentioning a warning in this list tells bzr to not emit it."
10367
msgstr ""
10368
10369
#: en/help_topics/configuration.txt:585
10370
msgid "Valid values:"
10371
msgstr ""
10372
10373
#: en/help_topics/configuration.txt:587
10374
msgid ""
10375
"* ``format_deprecation``:\n"
10376
" whether the format deprecation warning is shown on repositories that "
10377
"are\n"
10378
" using deprecated formats."
10379
msgstr ""
10380
10381
#: en/help_topics/configuration.txt:591
10382
msgid ""
10383
"default_format\n"
10384
"~~~~~~~~~~~~~~"
10385
msgstr ""
10386
10387
#: en/help_topics/configuration.txt:594
10388
msgid ""
10389
"A format name for the default format used when creating branches. See "
10390
"``bzr\n"
10391
"help formats`` for possible values."
10392
msgstr ""
10393
10394
#: en/help_topics/configuration.txt:597
10395
msgid ""
10396
"\n"
10397
"Unicode options\n"
10398
"---------------"
10399
msgstr ""
10400
10401
#: en/help_topics/configuration.txt:601
10402
msgid ""
10403
"output_encoding\n"
10404
"~~~~~~~~~~~~~~~"
10405
msgstr ""
10406
10407
#: en/help_topics/configuration.txt:604
10408
msgid ""
10409
"A Python unicode encoding name for text output from bzr, such as log\n"
10410
"information. Values include: utf8, cp850, ascii, iso-8859-1. The default\n"
10411
"is the terminal encoding prefered by the operating system."
10412
msgstr ""
10413
10414
#: en/help_topics/configuration.txt:608
10415
msgid ""
10416
"\n"
10417
"Branch type specific options\n"
10418
"----------------------------"
10419
msgstr ""
10420
10421
#: en/help_topics/configuration.txt:612
10422
msgid ""
10423
"These options apply only to branches that use the ``dirstate-tags`` or\n"
10424
"later format. They\n"
10425
"are usually set in ``.bzr/branch/branch.conf`` automatically, but may be\n"
10426
"manually set in ``locations.conf`` or ``bazaar.conf``."
10427
msgstr ""
10428
10429
#: en/help_topics/configuration.txt:617
10430
msgid ""
10431
"append_revisions_only\n"
10432
"~~~~~~~~~~~~~~~~~~~~~"
10433
msgstr ""
10434
10435
#: en/help_topics/configuration.txt:620
10436
msgid ""
10437
"If set to \"True\" then revisions can only be appended to the log, not\n"
10438
"removed. A branch with this setting enabled can only pull from another\n"
10439
"branch if the other branch's log is a longer version of its own. This is\n"
10440
"normally set by ``bzr init --append-revisions-only``. If you set it\n"
10441
"manually, use either 'True' or 'False' (case-sensitive) to maintain\n"
10442
"compatibility with previous bzr versions (older than 2.2)."
10443
msgstr ""
10444
10445
#: en/help_topics/configuration.txt:627
10446
msgid ""
10447
"parent_location\n"
10448
"~~~~~~~~~~~~~~~"
10449
msgstr ""
10450
10451
#: en/help_topics/configuration.txt:630
10452
msgid ""
10453
"If present, the location of the default branch for pull or merge. This "
10454
"option\n"
10455
"is normally set when creating a branch, the first ``pull`` or by ``pull\n"
10456
"--remember``."
10457
msgstr ""
10458
10459
#: en/help_topics/configuration.txt:634
10460
msgid ""
10461
"push_location\n"
10462
"~~~~~~~~~~~~~"
10463
msgstr ""
10464
10465
#: en/help_topics/configuration.txt:637
10466
msgid ""
10467
"If present, the location of the default branch for push. This option\n"
10468
"is normally set by the first ``push`` or ``push --remember``."
10469
msgstr ""
10470
10471
#: en/help_topics/configuration.txt:640
10472
msgid ""
10473
"push_strict\n"
10474
"~~~~~~~~~~~"
10475
msgstr ""
10476
10477
#: en/help_topics/configuration.txt:643
10478
msgid ""
10479
"If present, defines the ``--strict`` option default value for checking\n"
10480
"uncommitted changes before pushing."
10481
msgstr ""
10482
10483
#: en/help_topics/configuration.txt:646
10484
msgid ""
10485
"dpush_strict\n"
10486
"~~~~~~~~~~~~"
10487
msgstr ""
10488
10489
#: en/help_topics/configuration.txt:649
10490
msgid ""
10491
"If present, defines the ``--strict`` option default value for checking\n"
10492
"uncommitted changes before pushing into a different VCS without any\n"
10493
"custom bzr metadata."
10494
msgstr ""
10495
10496
#: en/help_topics/configuration.txt:653
10497
msgid ""
10498
"bound_location\n"
10499
"~~~~~~~~~~~~~~"
10500
msgstr ""
10501
10502
#: en/help_topics/configuration.txt:656
10503
msgid ""
10504
"The location that commits should go to when acting as a checkout.\n"
10505
"This option is normally set by ``bind``."
10506
msgstr ""
10507
10508
#: en/help_topics/configuration.txt:659
10509
msgid ""
10510
"bound\n"
10511
"~~~~~"
10512
msgstr ""
10513
10514
#: en/help_topics/configuration.txt:662
10515
msgid ""
10516
"If set to \"True\", the branch should act as a checkout, and push each "
10517
"commit to\n"
10518
"the bound_location. This option is normally set by ``bind``/``unbind``."
10519
msgstr ""
10520
10521
#: en/help_topics/configuration.txt:665
10522
msgid ""
10523
"send_strict\n"
10524
"~~~~~~~~~~~"
10525
msgstr ""
10526
10527
#: en/help_topics/configuration.txt:668
10528
msgid ""
10529
"If present, defines the ``--strict`` option default value for checking\n"
10530
"uncommitted changes before sending a merge directive."
10531
msgstr ""
10532
10533
#: en/help_topics/configuration.txt:671
10534
msgid ""
10535
"add.maximum_file_size\n"
10536
"~~~~~~~~~~~~~~~~~~~~~"
10537
msgstr ""
10538
10539
#: en/help_topics/configuration.txt:674
10540
msgid ""
10541
"Defines the maximum file size the command line \"add\" operation will allow\n"
10542
"in recursive mode, with files larger than this value being skipped. You "
10543
"may \n"
10544
"specify this value as an integer (in which case it is interpreted as "
10545
"bytes), \n"
10546
"or you may specify the value using SI units, i.e. 10KB, 20MB, 1G. A value of "
10547
"0 \n"
10548
"will disable skipping."
10549
msgstr ""
10550
10551
#: en/help_topics/configuration.txt:680
10552
msgid ""
10553
"External Merge Tools\n"
10554
"--------------------"
10555
msgstr ""
10556
10557
#: en/help_topics/configuration.txt:683
10558
msgid ""
10559
"bzr.mergetool.<name>\n"
10560
"~~~~~~~~~~~~~~~~~~~~"
10561
msgstr ""
10562
10563
#: en/help_topics/configuration.txt:686
10564
msgid ""
10565
"Defines an external merge tool called <name> with the given command-line.\n"
10566
"Arguments containing spaces should be quoted using single or double quotes. "
10567
"The\n"
10568
"executable may omit its path if it can be found on the PATH."
10569
msgstr ""
10570
10571
#: en/help_topics/configuration.txt:690
10572
msgid ""
10573
"The following markers can be used in the command-line to substitute "
10574
"filenames\n"
10575
"involved in the merge conflict::"
10576
msgstr ""
10577
10578
#: en/help_topics/configuration.txt:693
10579
msgid ""
10580
" {base} file.BASE\n"
10581
" {this} file.THIS\n"
10582
" {other} file.OTHER\n"
10583
" {result} output file\n"
10584
" {this_temp} temp copy of file.THIS, used to overwrite output file if "
10585
"merge\n"
10586
" succeeds."
10587
msgstr ""
10588
10589
#: en/help_topics/configuration.txt:702
10590
msgid " bzr.mergetool.kdiff3 = kdiff3 {base} {this} {other} -o {result}"
10591
msgstr ""
10592
10593
#: en/help_topics/configuration.txt:704
10594
msgid ""
10595
"bzr.default_mergetool\n"
10596
"~~~~~~~~~~~~~~~~~~~~~"
10597
msgstr ""
10598
10599
#: en/help_topics/configuration.txt:707
10600
msgid ""
10601
"Specifies which external merge tool (as defined above) should be selected "
10602
"by\n"
10603
"default in tools such as ``bzr qconflicts``."
10604
msgstr ""
10605
10606
#: en/help_topics/configuration.txt:712
10607
msgid " bzr.default_mergetool = kdiff3\n"
10608
msgstr ""
10609
10610
#: en/help_topics/conflict-types.txt:1
10611
msgid ""
10612
"Conflict Types\n"
10613
"=============="
10614
msgstr ""
10615
10616
#: en/help_topics/conflict-types.txt:4
10617
msgid ""
10618
"Some operations, like merge, revert and pull, modify the contents of your\n"
10619
"working tree. These modifications are programmatically generated, and so "
10620
"they\n"
10621
"may conflict with the current state of your working tree. "
10622
msgstr ""
10623
10624
#: en/help_topics/conflict-types.txt:8
10625
msgid ""
10626
"When conflicts are present in your working tree (as shown by ``bzr\n"
10627
"conflicts``), you should resolve them and then inform bzr that the "
10628
"conflicts\n"
10629
"have been resolved."
10630
msgstr ""
10631
10632
#: en/help_topics/conflict-types.txt:12
10633
msgid ""
10634
"Resolving conflicts is sometimes not obvious. Either because the user that\n"
10635
"should resolve them is not the one responsible for their occurrence, as is "
10636
"the\n"
10637
"case when merging other people's work or because some conflicts are "
10638
"presented\n"
10639
"in a way that is not easy to understand."
10640
msgstr ""
10641
10642
#: en/help_topics/conflict-types.txt:17
10643
msgid ""
10644
"Bazaar tries to avoid conflicts ; its aim is to ask you to resolve the\n"
10645
"conflict if and only if there's an actual conceptual conflict in the source\n"
10646
"tree. Because Bazaar doesn't understand the real meaning of the files "
10647
"being\n"
10648
"versioned, it can, when faced with ambiguities, fall short in either "
10649
"direction\n"
10650
"trying to resolve the conflict itself. Many kinds of changes can be "
10651
"combined\n"
10652
"programmatically, but sometimes only a human can determine the right thing "
10653
"to\n"
10654
"do."
10655
msgstr ""
10656
10657
#: en/help_topics/conflict-types.txt:25
10658
msgid ""
10659
"When Bazaar generates a conflict, it adds information into the working tree "
10660
"to\n"
10661
"present the conflicting versions, and it's up to you to find the correct\n"
10662
"resolution."
10663
msgstr ""
10664
10665
#: en/help_topics/conflict-types.txt:29
10666
msgid "Whatever the conflict is, resolving it is roughly done in two steps:"
10667
msgstr ""
10668
10669
#: en/help_topics/conflict-types.txt:31
10670
msgid ""
10671
"1. Modify the working tree content so that the conflicted item is now in "
10672
"the\n"
10673
" state you want to keep, then"
10674
msgstr ""
10675
10676
#: en/help_topics/conflict-types.txt:34
10677
msgid ""
10678
"2. Inform Bazaar that the conflict is now solved and ask to cleanup any\n"
10679
" remaining generated information (``bzr resolve <item>``)."
10680
msgstr ""
10681
10682
#: en/help_topics/conflict-types.txt:37
10683
msgid ""
10684
"For most conflict types, there are some obvious ways to modify the working\n"
10685
"tree and put it into the desired state. For some types of conflicts, Bazaar\n"
10686
"itself already made a choice, when possible."
10687
msgstr ""
10688
10689
#: en/help_topics/conflict-types.txt:41
10690
msgid ""
10691
"Yet, whether Bazaar makes a choice or not, there are some other simple but\n"
10692
"different ways to resolve the conflict."
10693
msgstr ""
10694
10695
#: en/help_topics/conflict-types.txt:44
10696
msgid ""
10697
"Each type of conflict is explained below, and the action which must be done "
10698
"to\n"
10699
"resolve the conflict is outlined."
10700
msgstr ""
10701
10702
#: en/help_topics/conflict-types.txt:47
10703
msgid ""
10704
"Various actions are available depending on the kind of conflict, for some "
10705
"of\n"
10706
"these actions, Bazaar can provide some help. In the end you should at least\n"
10707
"inform Bazaar that you're done with the conflict with::"
10708
msgstr ""
10709
10710
#: en/help_topics/conflict-types.txt:51
10711
msgid " ``bzr resolve FILE --action=done'"
10712
msgstr ""
10713
10714
#: en/help_topics/conflict-types.txt:53
10715
msgid ""
10716
"Note that this is the default action when a single file is involved so you "
10717
"can\n"
10718
"simply use::"
10719
msgstr ""
10720
10721
#: en/help_topics/conflict-types.txt:56
10722
msgid " ``bzr resolve FILE``"
10723
msgstr ""
10724
10725
#: en/help_topics/conflict-types.txt:58
10726
msgid "See ``bzr help resolve`` for more details."
10727
msgstr ""
10728
10729
#: en/help_topics/conflict-types.txt:60
10730
msgid ""
10731
"Text conflicts\n"
10732
"--------------"
10733
msgstr ""
10734
10735
#: en/help_topics/conflict-types.txt:63
10736
msgid "Typical message::"
10737
msgstr ""
10738
10739
#: en/help_topics/conflict-types.txt:65
10740
msgid " Text conflict in FILE"
10741
msgstr ""
10742
10743
#: en/help_topics/conflict-types.txt:67
10744
msgid ""
10745
"These are produced when a text merge cannot completely reconcile two sets "
10746
"of\n"
10747
"text changes. Bazaar will emit files for each version with the extensions\n"
10748
"THIS, OTHER, and BASE. THIS is the version of the file from the target "
10749
"tree,\n"
10750
"i.e. the tree that you are merging changes into. OTHER is the version that "
10751
"you\n"
10752
"are merging into the target. BASE is an older version that is used as a "
10753
"basis\n"
10754
"for comparison."
10755
msgstr ""
10756
10757
#: en/help_topics/conflict-types.txt:74
10758
msgid ""
10759
"In the main copy of the file, Bazaar will include all the changes that it\n"
10760
"could reconcile, and any un-reconciled conflicts are surrounded by\n"
10761
"\"herringbone\" markers like ``<<<<<<<``."
10762
msgstr ""
10763
10764
#: en/help_topics/conflict-types.txt:78
10765
msgid ""
10766
"Say the initial text is \"The project leader released it.\", and THIS "
10767
"modifies it\n"
10768
"to \"Martin Pool released it.\", while OTHER modifies it to \"The project "
10769
"leader\n"
10770
"released Bazaar.\" A conflict would look like this::"
10771
msgstr ""
10772
10773
#: en/help_topics/conflict-types.txt:82
10774
msgid ""
10775
" <<<<<<< TREE\n"
10776
" Martin Pool released it.\n"
10777
" =======\n"
10778
" The project leader released Bazaar.\n"
10779
" >>>>>>> MERGE-SOURCE"
10780
msgstr ""
10781
10782
#: en/help_topics/conflict-types.txt:88
10783
msgid "The correct resolution would be \"Martin Pool released Bazaar.\""
10784
msgstr ""
10785
10786
#: en/help_topics/conflict-types.txt:90
10787
msgid ""
10788
"You can handle text conflicts either by editing the main copy of the file,\n"
10789
"or by invoking external tools on the THIS, OTHER and BASE versions. It's\n"
10790
"worth mentioning that resolving text conflicts rarely involves picking one\n"
10791
"set of changes over the other (but see below when you encounter these\n"
10792
"cases). More often, the two sets of changes must be intelligently combined."
10793
msgstr ""
10794
10795
#: en/help_topics/conflict-types.txt:96
10796
msgid ""
10797
"If you edit the main copy, be sure to remove the herringbone markers. When\n"
10798
"you are done editing, the file should look like it never had a conflict, and "
10799
"be\n"
10800
"ready to commit."
10801
msgstr ""
10802
10803
#: en/help_topics/conflict-types.txt:100
10804
msgid ""
10805
"When you have resolved text conflicts, just run ``bzr resolve --auto``, and\n"
10806
"Bazaar will auto-detect which conflicts you have resolved."
10807
msgstr ""
10808
10809
#: en/help_topics/conflict-types.txt:103
10810
msgid ""
10811
"When the conflict is resolved, Bazaar deletes the previously generated\n"
10812
"``.BASE``, ``.THIS`` and ``.OTHER`` files if they are still present in the\n"
10813
"working tree."
10814
msgstr ""
10815
10816
#: en/help_topics/conflict-types.txt:107
10817
msgid ""
10818
"\n"
10819
"When you want to pick one set of changes over the other, you can use ``bzr\n"
10820
"resolve`` with one of the following actions:"
10821
msgstr ""
10822
10823
#: en/help_topics/conflict-types.txt:111
10824
msgid ""
10825
"* ``--action=take-this`` will issue ``mv FILE.THIS FILE``,\n"
10826
"* ``--action=take-other`` will issue ``mv FILE.OTHER FILE``."
10827
msgstr ""
10828
10829
#: en/help_topics/conflict-types.txt:114
10830
msgid ""
10831
"Note that if you have modified ``FILE.THIS`` or ``FILE.OTHER``, these\n"
10832
"modifications will be taken into account."
10833
msgstr ""
10834
10835
#: en/help_topics/conflict-types.txt:117
10836
msgid ""
10837
"Content conflicts\n"
10838
"-----------------"
10839
msgstr ""
10840
10841
#: en/help_topics/conflict-types.txt:122
10842
msgid " Contents conflict in FILE"
10843
msgstr ""
10844
10845
#: en/help_topics/conflict-types.txt:124
10846
msgid ""
10847
"This conflict happens when there are conflicting changes in the working "
10848
"tree\n"
10849
"and the merge source, but the conflicted items are not text files. They "
10850
"may\n"
10851
"be binary files, or symlinks, or directories. It can even happen with "
10852
"files\n"
10853
"that are deleted on one side, and modified on the other."
10854
msgstr ""
10855
10856
#: en/help_topics/conflict-types.txt:129
10857
msgid ""
10858
"Like text conflicts, Bazaar will emit THIS, OTHER and BASE files. (They may "
10859
"be\n"
10860
"regular files, symlinks or directories). But it will not include a \"main "
10861
"copy\"\n"
10862
"of the file with herringbone conflict markers. It will appear that the "
10863
"\"main\n"
10864
"copy\" has been renamed to THIS or OTHER."
10865
msgstr ""
10866
10867
#: en/help_topics/conflict-types.txt:134
10868
msgid ""
10869
"To resolve that kind of conflict, you should rebuild FILE from either "
10870
"version\n"
10871
"or a combination of both."
10872
msgstr ""
10873
10874
#: en/help_topics/conflict-types.txt:137
10875
msgid "``bzr resolve`` recognizes the following actions:"
10876
msgstr ""
10877
10878
#: en/help_topics/conflict-types.txt:139
10879
msgid ""
10880
"* ``--action=take-this`` will issue ``bzr mv FILE.THIS FILE``,\n"
10881
"* ``--action=take-other`` will issue ``bzr mv FILE.OTHER FILE``,\n"
10882
"* ``--action=done`` will just mark the conflict as resolved."
10883
msgstr ""
10884
10885
#: en/help_topics/conflict-types.txt:143
10886
msgid ""
10887
"Any action will also delete the previously generated ``.BASE``, ``.THIS`` "
10888
"and\n"
10889
"``.OTHER`` files if they are still present in the working tree."
10890
msgstr ""
10891
10892
#: en/help_topics/conflict-types.txt:146
10893
msgid ""
10894
"Bazaar cannot auto-detect when conflicts of this kind have been resolved."
10895
msgstr ""
10896
10897
#: en/help_topics/conflict-types.txt:148
10898
msgid ""
10899
"Tag conflicts\n"
10900
"-------------"
10901
msgstr ""
10902
10903
#: en/help_topics/conflict-types.txt:153
10904
msgid ""
10905
" Conflicting tags:\n"
10906
" version-0.1"
10907
msgstr ""
10908
10909
#: en/help_topics/conflict-types.txt:156
10910
msgid ""
10911
"When pulling from or pushing to another branch, Bazaar informs you about "
10912
"tags\n"
10913
"that conflict between the two branches; that is the same tag points to two\n"
10914
"different revisions. You need not resolve these conflicts, but subsequent\n"
10915
"uses of pull or push will result in the same message."
10916
msgstr ""
10917
10918
#: en/help_topics/conflict-types.txt:161
10919
msgid ""
10920
"To resolve the conflict, you must apply the correct tags to either the "
10921
"target\n"
10922
"branch or the source branch as appropriate. Use \"bzr tags --show-ids -d\n"
10923
"SOURCE_URL\" to see the tags in the source branch. If you want to make the\n"
10924
"target branch's tags match the source branch, then in the target branch do\n"
10925
"``bzr tag --force -r revid:REVISION_ID CONFLICTING_TAG`` for each of the\n"
10926
"CONFLICTING_TAGs, where REVISION_ID comes from the list of tags in the "
10927
"source\n"
10928
"branch. You need not call \"bzr resolve\" after doing this. To resolve in\n"
10929
"favor of the target branch, you need to similarly use ``tag --force`` in "
10930
"the\n"
10931
"source branch. (Note that pulling or pushing using --overwrite will "
10932
"overwrite\n"
10933
"all tags as well.)"
10934
msgstr ""
10935
10936
#: en/help_topics/conflict-types.txt:172
10937
msgid ""
10938
"Duplicate paths\n"
10939
"---------------"
10940
msgstr ""
10941
10942
#: en/help_topics/conflict-types.txt:177
10943
msgid " Conflict adding file FILE. Moved existing file to FILE.moved."
10944
msgstr ""
10945
10946
#: en/help_topics/conflict-types.txt:179
10947
msgid ""
10948
"Sometimes Bazaar will attempt to create a file using a pathname that has\n"
10949
"already been used. The existing file will be renamed to \"FILE.moved\". "
10950
msgstr ""
10951
10952
#: en/help_topics/conflict-types.txt:187
10953
msgid ""
10954
"* ``--action=take-this`` will issue ``bzr rm FILE ; bzr mv FILE.moved "
10955
"FILE``,\n"
10956
"* ``--action=take-other`` will issue ``bzr rm FILE.moved``,\n"
10957
"* ``--action=done`` will just mark the conflict as resolved."
10958
msgstr ""
10959
10960
#: en/help_topics/conflict-types.txt:191
10961
msgid ""
10962
"Note that you must get rid of FILE.moved before using ``--action=done``."
10963
msgstr ""
10964
10965
#: en/help_topics/conflict-types.txt:195
10966
msgid ""
10967
"Unversioned parent\n"
10968
"------------------"
10969
msgstr ""
10970
10971
#: en/help_topics/conflict-types.txt:200
10972
msgid " Conflict because FILE is not versioned, but has versioned children."
10973
msgstr ""
10974
10975
#: en/help_topics/conflict-types.txt:202
10976
msgid ""
10977
"Sometimes Bazaar will attempt to create a file whose parent directory is "
10978
"not\n"
10979
"versioned. This happens when the directory has been deleted in the target,\n"
10980
"but has a new child in the source, or vice versa. In this situation, "
10981
"Bazaar\n"
10982
"will version the parent directory as well. Resolving this issue depends\n"
10983
"very much on the particular scenario. You may wish to rename or delete "
10984
"either\n"
10985
"the file or the directory. When you are satisfied, you can run \"bzr "
10986
"resolve\n"
10987
"FILE\" to mark the conflict as resolved."
10988
msgstr ""
10989
10990
#: en/help_topics/conflict-types.txt:210
10991
msgid ""
10992
"Missing parent\n"
10993
"--------------"
10994
msgstr ""
10995
10996
#: en/help_topics/conflict-types.txt:215
10997
msgid " Conflict adding files to FILE. Created directory."
10998
msgstr ""
10999
11000
#: en/help_topics/conflict-types.txt:217
11001
msgid ""
11002
"This happens when a directory has been deleted in the target, but has new\n"
11003
"children in the source. This is similar to the \"unversioned parent\" "
11004
"conflict,\n"
11005
"except that the parent directory does not *exist*, instead of just being\n"
11006
"unversioned. In this situation, Bazaar will create the missing parent.\n"
11007
"Resolving this issue depends very much on the particular scenario."
11008
msgstr ""
11009
11010
#: en/help_topics/conflict-types.txt:223
11011
msgid ""
11012
"To resolve that kind of conflict, you should either remove or rename the\n"
11013
"children or the directory or a combination of both."
11014
msgstr ""
11015
11016
#: en/help_topics/conflict-types.txt:228
11017
msgid ""
11018
"* ``--action=take-this`` will issue ``bzr rm directory`` including the\n"
11019
" children,\n"
11020
"* ``--action=take-other`` will acknowledge Bazaar choice to keep the "
11021
"children\n"
11022
" and restoring the directory,\n"
11023
"* ``--action=done`` will just mark the conflict as resolved."
11024
msgstr ""
11025
11026
#: en/help_topics/conflict-types.txt:236
11027
msgid ""
11028
"Deleting parent\n"
11029
"---------------"
11030
msgstr ""
11031
11032
#: en/help_topics/conflict-types.txt:241
11033
msgid " Conflict: can't delete DIR because it is not empty. Not deleting."
11034
msgstr ""
11035
11036
#: en/help_topics/conflict-types.txt:243
11037
msgid ""
11038
"This is the opposite of \"missing parent\". A directory is deleted in the\n"
11039
"source, but has new children in the target (either because a directory\n"
11040
"deletion is merged or because the merge introduce new children). Bazaar\n"
11041
"will retain the directory. Resolving this issue depends very much on the\n"
11042
"particular scenario."
11043
msgstr ""
11044
11045
#: en/help_topics/conflict-types.txt:254
11046
msgid ""
11047
"* ``--action=take-this`` will acknowledge Bazaar choice to keep the "
11048
"directory,"
11049
msgstr ""
11050
11051
#: en/help_topics/conflict-types.txt:256
11052
msgid ""
11053
"* ``--action=take-other`` will issue ``bzr rm directory`` including the \n"
11054
" children,"
11055
msgstr ""
11056
11057
#: en/help_topics/conflict-types.txt:259
11058
msgid "* ``--action=done`` will just mark the conflict as resolved."
11059
msgstr ""
11060
11061
#: en/help_topics/conflict-types.txt:261
11062
msgid ""
11063
"Note that when merging a directory deletion, if unversioned files are\n"
11064
"present, they become potential orphans has they don't have a directory\n"
11065
"parent anymore."
11066
msgstr ""
11067
11068
#: en/help_topics/conflict-types.txt:265
11069
msgid ""
11070
"Handling such orphans, *before* the conflict is created, is controlled by\n"
11071
"setting the ``bzr.transform.orphan_policy`` configuration option."
11072
msgstr ""
11073
11074
#: en/help_topics/conflict-types.txt:268
11075
msgid "There are two possible values for this option:"
11076
msgstr ""
11077
11078
#: en/help_topics/conflict-types.txt:270
11079
msgid ""
11080
"* ``conflict`` (the default): will leave the orphans in place and\n"
11081
" generate a conflicts,"
11082
msgstr ""
11083
11084
#: en/help_topics/conflict-types.txt:273
11085
msgid ""
11086
"* ``move``: will move the orphans to a ``bzr-orphans`` directory at the "
11087
"root\n"
11088
" of the working tree with names like ``<file>.~#~``."
11089
msgstr ""
11090
11091
#: en/help_topics/conflict-types.txt:278
11092
msgid ""
11093
"Path conflict\n"
11094
"-------------"
11095
msgstr ""
11096
11097
#: en/help_topics/conflict-types.txt:283
11098
msgid " Path conflict: PATH1 / PATH2"
11099
msgstr ""
11100
11101
#: en/help_topics/conflict-types.txt:285
11102
msgid ""
11103
"This happens when the source and target have each modified the name or "
11104
"parent\n"
11105
"directory of a file. Bazaar will use the path elements from the source."
11106
msgstr ""
11107
11108
#: en/help_topics/conflict-types.txt:288
11109
msgid ""
11110
"To resolve that kind of conflict, you just have to decide what name should "
11111
"be\n"
11112
"retained for the file involved."
11113
msgstr ""
11114
11115
#: en/help_topics/conflict-types.txt:293
11116
msgid ""
11117
"* ``--action=take-this`` will revert Bazaar choice and keep ``PATH1`` by\n"
11118
" issuing ``bzr mv PATH2 PATH1``,\n"
11119
"* ``--action=take-other`` will acknowledge Bazaar choice of keeping "
11120
"``PATH2``,\n"
11121
"* ``--action=done`` will just mark the conflict as resolved."
11122
msgstr ""
11123
11124
#: en/help_topics/conflict-types.txt:300
11125
msgid ""
11126
"Parent loop\n"
11127
"-----------"
11128
msgstr ""
11129
11130
#: en/help_topics/conflict-types.txt:305
11131
msgid " Conflict moving FILE into DIRECTORY. Cancelled move."
11132
msgstr ""
11133
11134
#: en/help_topics/conflict-types.txt:307
11135
msgid ""
11136
"This happens when the source and the target have each moved directories, so\n"
11137
"that, if the change could be applied, a directory would be contained by "
11138
"itself.\n"
11139
"For example::"
11140
msgstr ""
11141
11142
#: en/help_topics/conflict-types.txt:311
11143
msgid ""
11144
" $ bzr init\n"
11145
" $ bzr mkdir white\n"
11146
" $ bzr mkdir black\n"
11147
" $ bzr commit -m \"BASE\"\n"
11148
" $ bzr branch . ../other\n"
11149
" $ bzr mv white black\n"
11150
" $ bzr commit -m \"THIS\"\n"
11151
" $ bzr mv ../other/black ../other/white\n"
11152
" $ bzr commit ../other -m \"OTHER\"\n"
11153
" $ bzr merge ../other"
11154
msgstr ""
11155
11156
#: en/help_topics/conflict-types.txt:322
11157
msgid ""
11158
"In this situation, Bazaar will cancel the move, and leave ``white`` in\n"
11159
"``black``. To resolve that kind of conflict, you just have to decide what\n"
11160
"name should be retained for the directories involved."
11161
msgstr ""
11162
11163
#: en/help_topics/conflict-types.txt:328
11164
msgid ""
11165
"* ``--action=take-this`` will acknowledge Bazaar choice of leaving "
11166
"``white`` \n"
11167
" in ``black``,\n"
11168
"* ``--action=take-other`` will revert Bazaar choice and move ``black`` in\n"
11169
" ``white`` by issuing ``bzr mv black/white white ; bzr mv black white``,\n"
11170
"* ``--action=done`` will just mark the conflict as resolved."
11171
msgstr ""
11172
11173
#: en/help_topics/conflict-types.txt:336
11174
msgid ""
11175
"Non-directory parent\n"
11176
"--------------------"
11177
msgstr ""
11178
11179
#: en/help_topics/conflict-types.txt:341
11180
msgid ""
11181
" Conflict: foo.new is not a directory, but has files in it.\n"
11182
" Created directory."
11183
msgstr ""
11184
11185
#: en/help_topics/conflict-types.txt:344
11186
msgid ""
11187
"This happens when one side has added files to a directory, and the other "
11188
"side\n"
11189
"has changed the directory into a file or symlink. For example::"
11190
msgstr ""
11191
11192
#: en/help_topics/conflict-types.txt:347
11193
msgid ""
11194
" $ bzr init\n"
11195
" $ bzr mkdir foo\n"
11196
" $ bzr commit -m \"BASE\"\n"
11197
" $ bzr branch . ../other\n"
11198
" $ rmdir foo\n"
11199
" $ touch foo\n"
11200
" $ bzr commit -m \"THIS\"\n"
11201
" $ bzr mkdir ../other/foo/bar\n"
11202
" $ bzr commit ../other -m \"OTHER\"\n"
11203
" $ bzr merge ../other"
11204
msgstr ""
11205
11206
#: en/help_topics/conflict-types.txt:358
11207
msgid ""
11208
"To resolve that kind of conflict, you have to decide what name should be\n"
11209
"retained for the file, directory or symlink involved."
11210
msgstr ""
11211
11212
#: en/help_topics/conflict-types.txt:363
11213
msgid ""
11214
"* ``--action=take-this`` will issue ``bzr rm --force foo.new`` and \n"
11215
" ``bzr add foo``,\n"
11216
"* ``--action=take-other`` will issue ``bzr rm --force foo`` and \n"
11217
" ``bzr mv foo.new foo``,\n"
11218
"* ``--action=done`` will just mark the conflict as resolved."
11219
msgstr ""
11220
11221
#: en/help_topics/conflict-types.txt:371
11222
msgid ""
11223
"MalformedTransform\n"
11224
"------------------"
11225
msgstr ""
11226
11227
#: en/help_topics/conflict-types.txt:374
11228
msgid ""
11229
"It is possible (though very rare) for Bazaar to raise a MalformedTransform\n"
11230
"exception. This means that Bazaar encountered a filesystem conflict that it "
11231
"was\n"
11232
"unable to resolve. This usually indicates a bug. Please let us know if "
11233
"you\n"
11234
"encounter this. Our bug tracker is at https://launchpad.net/bzr/+bugs\n"
11235
msgstr ""
11236
11237
#: en/help_topics/content-filters.txt:1
11238
msgid ""
11239
"Content Filters\n"
11240
"==============="
11241
msgstr ""
11242
11243
#: en/help_topics/content-filters.txt:4
11244
msgid ""
11245
"Content formats\n"
11246
"---------------"
11247
msgstr ""
11248
11249
#: en/help_topics/content-filters.txt:7
11250
msgid ""
11251
"Bazaar's content filtering allows you to store files in a different\n"
11252
"format from the copy in your working tree. This lets you, or your\n"
11253
"co-developers, use Windows development tools that expect CRLF files\n"
11254
"on projects that use other line-ending conventions. Among other things,\n"
11255
"content filters also let Unix developers more easily work on projects\n"
11256
"using Windows line-ending conventions, keyword expansion/compression,\n"
11257
"and trailing spaces on lines in text files to be implicitly stripped\n"
11258
"when committed."
11259
msgstr ""
11260
11261
#: en/help_topics/content-filters.txt:16
11262
msgid "To generalize, there are two content formats supported by Bazaar:"
11263
msgstr ""
11264
11265
#: en/help_topics/content-filters.txt:18
11266
msgid ""
11267
"* a canonical format - how files are stored internally\n"
11268
"* a convenience format - how files are created in a working tree."
11269
msgstr ""
11270
11271
#: en/help_topics/content-filters.txt:21
11272
msgid ""
11273
"\n"
11274
"Format conversion\n"
11275
"-----------------"
11276
msgstr ""
11277
11278
#: en/help_topics/content-filters.txt:25
11279
msgid ""
11280
"The conversion between these formats is done by content filters.\n"
11281
"A content filter has two parts:"
11282
msgstr ""
11283
11284
#: en/help_topics/content-filters.txt:28
11285
msgid ""
11286
"* a read converter - converts from convenience to canonical format\n"
11287
"* a write converter - converts from canonical to convenience format."
11288
msgstr ""
11289
11290
#: en/help_topics/content-filters.txt:31
11291
msgid ""
11292
"Many of these converters will provide *round-trip* conversion,\n"
11293
"i.e. applying the read converter followed by the write converter\n"
11294
"gives back the original content. However, others may provide an\n"
11295
"asymmetric conversion. For example, a read converter might strip\n"
11296
"trailing whitespace off lines in source code while the matching\n"
11297
"write converter might pass content through unchanged."
11298
msgstr ""
11299
11300
#: en/help_topics/content-filters.txt:38
11301
msgid ""
11302
"\n"
11303
"Enabling content filters\n"
11304
"------------------------"
11305
msgstr ""
11306
11307
#: en/help_topics/content-filters.txt:42
11308
msgid ""
11309
"Content filters are typically provided by plugins, so the first step\n"
11310
"in using them is to install the relevant plugins and read their\n"
11311
"documentation. Some plugins may be very specific about which files\n"
11312
"they filter, e.g. only files ending in ``.java`` or ``.php``.\n"
11313
"In other cases, the plugin may leave it in the user's hands to\n"
11314
"define which files are to be filtered. This is typically done\n"
11315
"using rule-based preferences. See ``bzr help rules`` for general\n"
11316
"information about defining these."
11317
msgstr ""
11318
11319
#: en/help_topics/content-filters.txt:51
11320
msgid ""
11321
"\n"
11322
"Impact on commands\n"
11323
"------------------"
11324
msgstr ""
11325
11326
#: en/help_topics/content-filters.txt:55
11327
msgid ""
11328
"Read converters are only applied to commands that read content from\n"
11329
"a working tree, e.g. status, diff and commit. For example, ``bzr diff``\n"
11330
"will apply read converters to files in the working tree, then compare\n"
11331
"the results to the content last committed."
11332
msgstr ""
11333
11334
#: en/help_topics/content-filters.txt:60
11335
msgid ""
11336
"Write converters are only applied by commands that **create files in a\n"
11337
"working tree**, e.g. branch, checkout, update. If you wish to see the\n"
11338
"canonical format of a file or tree, use ``bzr cat`` or ``bzr export``\n"
11339
"respectively."
11340
msgstr ""
11341
11342
#: en/help_topics/content-filters.txt:65
11343
msgid ""
11344
"Note: ``bzr commit`` does not implicitly apply write converters after\n"
11345
"comitting files. If this makes sense for a given plugin providing\n"
11346
"a content filter, the plugin can usually achieve this effect by using a\n"
11347
"``start_commit`` or ``post_commit`` hook say. See :doc:`hooks-help`\n"
11348
"for more information on hooks."
11349
msgstr ""
11350
11351
#: en/help_topics/content-filters.txt:71
11352
msgid ""
11353
"\n"
11354
"Refreshing your working tree\n"
11355
"----------------------------"
11356
msgstr ""
11357
11358
#: en/help_topics/content-filters.txt:75
11359
msgid ""
11360
"For performance reasons, Bazaar caches the timestamps of files in\n"
11361
"a working tree, and assumes files are unchanged if their timestamps\n"
11362
"match the cached values. As a consequence, there are times when\n"
11363
"you may need to explicitly ask for content filtering to be reapplied\n"
11364
"in one or both directions, e.g. after installing or reconfiguring\n"
11365
"plugins providing it."
11366
msgstr ""
11367
11368
#: en/help_topics/content-filters.txt:82
11369
msgid "Here are some general guidelines for doing this:"
11370
msgstr ""
11371
11372
#: en/help_topics/content-filters.txt:84
11373
msgid ""
11374
" * To reapply read converters, ``touch`` files, i.e. update their\n"
11375
" timestamp. Operations like ``bzr status`` should then reapply the\n"
11376
" relevant read converters and compare the end result with the\n"
11377
" canonical format."
11378
msgstr ""
11379
11380
#: en/help_topics/content-filters.txt:89
11381
msgid ""
11382
" * To reapply write converters, ensure there are no local changes,\n"
11383
" delete the relevant files and run ``bzr revert`` on those files."
11384
msgstr ""
11385
11386
#: en/help_topics/content-filters.txt:92
11387
msgid ""
11388
"Note: In the future, it is likely that additional options will be added\n"
11389
"to commands to make this refreshing process faster and safer.\n"
11390
msgstr ""
11391
11392
#: en/help_topics/current-formats.txt:1
11393
msgid "Current Storage Formats"
11394
msgstr ""
11395
11396
#: en/help_topics/current-formats.txt:3
11397
msgid ""
11398
":2a:\n"
11399
" (native) (default) Format for the bzr 2.0 series. Uses group-\n"
11400
" compress storage. Provides rich roots which are a one-way\n"
11401
" transition."
11402
msgstr ""
11403
11404
#: en/help_topics/current-formats.txt:8
11405
msgid ""
11406
"\n"
11407
"See :doc:`formats-help` for more about storage formats."
11408
msgstr ""
11409
11410
#: en/help_topics/debug-flags.txt:1
11411
msgid ""
11412
"Debug Flags\n"
11413
"==========="
11414
msgstr ""
11415
11416
#: en/help_topics/debug-flags.txt:4
11417
msgid ""
11418
"These flags can be passed on the bzr command line or (without the ``-D``\n"
11419
"prefix) put in the ``debug_flags`` variable in ``bazaar.conf``."
11420
msgstr ""
11421
11422
#: en/help_topics/debug-flags.txt:7
11423
msgid ""
11424
"-Dauth Trace authentication sections used.\n"
11425
"-Dbytes Print out how many bytes were transferred\n"
11426
"-Ddirstate Trace dirstate activity (verbose!)\n"
11427
"-Derror Instead of normal error handling, always print a "
11428
"traceback\n"
11429
" on error.\n"
11430
"-Devil Capture call sites that do expensive or badly-scaling\n"
11431
" operations.\n"
11432
"-Dfetch Trace history copying between repositories.\n"
11433
"-Dfilters Emit information for debugging content filtering.\n"
11434
"-Dforceinvdeltas Force use of inventory deltas during generic streaming "
11435
"fetch.\n"
11436
"-Dgraph Trace graph traversal.\n"
11437
"-Dhashcache Log every time a working file is read to determine its "
11438
"hash.\n"
11439
"-Dhooks Trace hook execution.\n"
11440
"-Dhpss Trace smart protocol requests and responses.\n"
11441
"-Dhpssdetail More hpss details.\n"
11442
"-Dhpssvfs Traceback on vfs access to Remote objects.\n"
11443
"-Dhttp Trace http connections, requests and responses.\n"
11444
"-Dindex Trace major index operations.\n"
11445
"-Dknit Trace knit operations.\n"
11446
"-Dlock Trace when lockdir locks are taken or released.\n"
11447
"-Dnoretry If a connection is reset, fail immediately rather than\n"
11448
" retrying the request.\n"
11449
"-Dprogress Trace progress bar operations.\n"
11450
"-Dmem_dump Dump memory to a file upon an out of memory error.\n"
11451
"-Dmerge Emit information for debugging merges.\n"
11452
"-Dno_apport Don't use apport to report crashes.\n"
11453
"-Dno_activity \t Don't show transport activity indicator in progress bar.\n"
11454
"-Dpack Emit information about pack operations.\n"
11455
"-Drelock Emit a message every time a branch or repository object "
11456
"is\n"
11457
" unlocked then relocked the same way.\n"
11458
"-Dsftp Trace SFTP internals.\n"
11459
"-Dstatic_tuple Error when a tuple is used where a StaticTuple is "
11460
"expected\n"
11461
"-Dstream Trace fetch streams.\n"
11462
"-Dstrict_locks Trace when OS locks are potentially used in a non-"
11463
"portable\n"
11464
" manner.\n"
11465
"-Dunlock Some errors during unlock are treated as warnings.\n"
11466
"-DIDS_never Never use InterDifferingSerializer when fetching.\n"
11467
"-DIDS_always Always use InterDifferingSerializer to fetch if "
11468
"appropriate\n"
11469
" for the format, even for non-local fetches.\n"
11470
msgstr ""
11471
11472
#: en/help_topics/diverged-branches.txt:1
11473
msgid ""
11474
"Diverged Branches\n"
11475
"================="
11476
msgstr ""
11477
11478
#: en/help_topics/diverged-branches.txt:4
11479
msgid ""
11480
"When Bazaar tries to push one branch onto another, it requires that the\n"
11481
"destination branch must be ready to receive the source branch. If this "
11482
"isn't\n"
11483
"the case, then we say that the branches have ``diverged``. Branches are\n"
11484
"considered diverged if the destination branch's most recent commit is one "
11485
"that\n"
11486
"has not been merged (directly or indirectly) by the source branch. To "
11487
"recover\n"
11488
"from diverged branches, one must merge the missing revisions into the "
11489
"source\n"
11490
"branch."
11491
msgstr ""
11492
11493
#: en/help_topics/diverged-branches.txt:12
11494
msgid ""
11495
"This situation commonly arises when using a centralized workflow with local\n"
11496
"commits. If someone else has committed new work to the mainline since your\n"
11497
"last pull and you have local commits that have not yet been pushed to the\n"
11498
"mainline, then your local branch and the mainline have diverged."
11499
msgstr ""
11500
11501
#: en/help_topics/diverged-branches.txt:17
11502
msgid ""
11503
"Discovering What Has Diverged\n"
11504
"-----------------------------"
11505
msgstr ""
11506
11507
#: en/help_topics/diverged-branches.txt:20
11508
msgid ""
11509
"The ``bzr missing`` command is used to find out what revisions are in "
11510
"another\n"
11511
"branch that are not present in the current branch, and vice-versa. It shows "
11512
"a\n"
11513
"summary of which extra revisions exist in each branch. If you want to see "
11514
"the\n"
11515
"precise effects of those revisions, you can use ``bzr diff --"
11516
"old=other_branch``\n"
11517
"to show the differences between other_branch and your current branch."
11518
msgstr ""
11519
11520
#: en/help_topics/diverged-branches.txt:26
11521
msgid ""
11522
"A Solution\n"
11523
"----------"
11524
msgstr ""
11525
11526
#: en/help_topics/diverged-branches.txt:29
11527
msgid ""
11528
"The solution is to merge the revisions from the mainline into your local\n"
11529
"branch. To do so, use ``bzr merge`` to get the new revisions from the\n"
11530
"mainline. This merge may result in conflicts if the other developer's "
11531
"changes\n"
11532
"overlap with your changes. These conflicts should be resolved before\n"
11533
"continuing. After any conflicts have been resolved, or even if there were "
11534
"no\n"
11535
"conflicts, Bazaar requires that you explicitly commit these new revisions\n"
11536
"to your local branch. This requirement gives you an opportunity to test "
11537
"the\n"
11538
"resulting working tree for correctness, since the merged revisions could "
11539
"have\n"
11540
"made arbitrary changes. After testing, you should commit the merge using\n"
11541
"``bzr commit``. This clears up the diverged branches situation. Your "
11542
"local\n"
11543
"branch can now be pushed to the mainline.\n"
11544
msgstr ""
11545
11546
#: en/help_topics/eol.txt:1
11547
msgid ""
11548
"End of Line Conversion\n"
11549
"======================"
11550
msgstr ""
11551
11552
#: en/help_topics/eol.txt:4
11553
msgid ""
11554
"EOL conversion is provided as a content filter where Bazaar internally\n"
11555
"stores a canonical format but outputs a convenience format. See\n"
11556
"``bzr help content-filters`` for general information about using these."
11557
msgstr ""
11558
11559
#: en/help_topics/eol.txt:8
11560
msgid ""
11561
"Note: Content filtering is only supported in recently added formats,\n"
11562
"e.g. 1.14. Be sure that both the repository *and* the branch are\n"
11563
"in a recent format. (Just setting the format on the repository\n"
11564
"is not enough.) If content filtering does not appear to be working, use\n"
11565
"'bzr info -v' to confirm that the branch is using \"Working tree format 5\"\n"
11566
"or later."
11567
msgstr ""
11568
11569
#: en/help_topics/eol.txt:15
11570
msgid ""
11571
"EOL conversion needs to be enabled for selected file patterns using\n"
11572
"rules. See ``bzr help rules`` for general information on defining rules.\n"
11573
"Currently, rules are only supported in $BZR_HOME/.bazaar/rules (or\n"
11574
"%BZR_HOME%/bazaar/2.0/rules on Windows). Branch specific rules will be\n"
11575
"supported in a future verison of Bazaar."
11576
msgstr ""
11577
11578
#: en/help_topics/eol.txt:21
11579
msgid ""
11580
"To configure which files to filter, set ``eol`` to one of the values below.\n"
11581
"(If a value is not set, ``exact`` is the default.)"
11582
msgstr ""
11583
11584
#: en/help_topics/eol.txt:24
11585
msgid ""
11586
" ========== ===================================== ======================\n"
11587
" Value Checkout end-of-lines as Commit end-of-lines as\n"
11588
" ========== ===================================== ======================\n"
11589
" ``native`` ``crlf`` on Windows, ``lf`` otherwise ``lf``\n"
11590
" ---------- ------------------------------------- ----------------------\n"
11591
" ``lf`` ``lf`` ``lf``\n"
11592
" ---------- ------------------------------------- ----------------------\n"
11593
" ``crlf`` ``crlf`` ``lf``\n"
11594
" ---------- ------------------------------------- ----------------------\n"
11595
" ``exact`` No conversion Exactly as in file\n"
11596
" ========== ===================================== ======================"
11597
msgstr ""
11598
11599
#: en/help_topics/eol.txt:36
11600
msgid ""
11601
"Note: For safety reasons, no conversion is applied to any file where a null\n"
11602
"byte is detected in the file."
11603
msgstr ""
11604
11605
#: en/help_topics/eol.txt:39
11606
msgid ""
11607
"For users working on a cross-platform project, here is a suggested rule\n"
11608
"to use as a starting point::"
11609
msgstr ""
11610
11611
#: en/help_topics/eol.txt:42
11612
msgid ""
11613
" [name *]\n"
11614
" eol = native"
11615
msgstr ""
11616
11617
#: en/help_topics/eol.txt:45
11618
msgid ""
11619
"If you have binary files that do not contain a null byte though, be\n"
11620
"sure to add ``eol = exact`` rules for those as well. You can do this\n"
11621
"by giving more explicit patterns earlier in the rules file. For example::"
11622
msgstr ""
11623
11624
#: en/help_topics/eol.txt:49
11625
msgid ""
11626
" [name *.png]\n"
11627
" eol = exact"
11628
msgstr ""
11629
11630
#: en/help_topics/eol.txt:55
11631
msgid ""
11632
"If your working tree is on a network drive shared by users on different\n"
11633
"operating systems, you typically want to force certain conventions for\n"
11634
"certain files. In that way, if a file is created with the wrong line\n"
11635
"endings or line endings get mixed during editing, it gets committed\n"
11636
"correctly and gets checked out correctly. For example::"
11637
msgstr ""
11638
11639
#: en/help_topics/eol.txt:61
11640
msgid ""
11641
" [name *.bat]\n"
11642
" eol = crlf"
11643
msgstr ""
11644
11645
#: en/help_topics/eol.txt:64
11646
msgid ""
11647
" [name *.sh]\n"
11648
" eol = lf"
11649
msgstr ""
11650
11651
#: en/help_topics/eol.txt:70
11652
msgid ""
11653
"If you take the care to create files with their required endings, you can\n"
11654
"achieve *almost* the same thing by using ``eol = exact``. It is slightly\n"
11655
"safer to use ``lf`` and ``crlf`` though because edits accidentally\n"
11656
"introducing mixed line endings will be corrected during commit for files\n"
11657
"with those settings."
11658
msgstr ""
11659
11660
#: en/help_topics/eol.txt:76
11661
msgid ""
11662
"If you have sample test data that deliberately has text files with mixed\n"
11663
"newline conventions, you can ask for those to be left alone like this::"
11664
msgstr ""
11665
11666
#: en/help_topics/eol.txt:79
11667
msgid ""
11668
" [name test_data/]\n"
11669
" eol = exact"
11670
msgstr ""
11671
11672
#: en/help_topics/eol.txt:85
11673
msgid ""
11674
"Note that ``exact`` does not imply the file is binary but it does mean\n"
11675
"that no conversion of end-of-lines will be done. (Bazaar currently relies\n"
11676
"of content analysis to detect binary files for commands like ``diff``.\n"
11677
"In the future, a ``binary = true`` rule may be added but it is not\n"
11678
"supported yet.)"
11679
msgstr ""
11680
11681
#: en/help_topics/eol.txt:91
11682
msgid ""
11683
"If you have an existing repository with text files already stored using\n"
11684
"Windows newline conventions (``crlf``), then you may want to keep using "
11685
"that\n"
11686
"convention in the repository. Forcing certain files to this convention\n"
11687
"may also help users who do not have rules configured. To do this, set\n"
11688
"``eol`` to one of the values below."
11689
msgstr ""
11690
11691
#: en/help_topics/eol.txt:97
11692
msgid ""
11693
" ============================ ======================== "
11694
"======================\n"
11695
" Value Checkout end-of-lines as Commit end-of-lines "
11696
"as\n"
11697
" ============================ ======================== "
11698
"======================\n"
11699
" ``native-with-crlf-in-repo`` ``crlf`` on Windows, ``crlf``\n"
11700
" ``lf`` otherwise\n"
11701
" ---------------------------- ------------------------ "
11702
"----------------------\n"
11703
" ``lf-with-crlf-in-repo`` ``lf`` ``crlf``\n"
11704
" ---------------------------- ------------------------ "
11705
"----------------------\n"
11706
" ``crlf-with-crlf-in-repo`` ``crlf`` ``crlf``\n"
11707
" ============================ ======================== ======================"
11708
msgstr ""
11709
11710
#: en/help_topics/eol.txt:108
11711
msgid ""
11712
"For users working on an existing project that uses Windows newline\n"
11713
"conventions in their Bazaar repository, this rule is suggested as a\n"
11714
"starting point::"
11715
msgstr ""
11716
11717
#: en/help_topics/eol.txt:112
11718
msgid ""
11719
" [name *]\n"
11720
" eol = native-with-crlf-in-repo"
11721
msgstr ""
11722
11723
#: en/help_topics/eol.txt:115
11724
msgid ""
11725
"For new projects, it is recommended that end-of-lines be stored as ``lf``\n"
11726
"and that users stick to the basic settings, i.e. ``native``, ``lf``,\n"
11727
"``crlf`` and ``exact``."
11728
msgstr ""
11729
11730
#: en/help_topics/eol.txt:119
11731
msgid ""
11732
"Note: Bazaar's EOL conversion will convert the content of files but\n"
11733
"never reject files because a given line ending or mixed line endings\n"
11734
"are found. A precommit hook should be used if you wish to validate\n"
11735
"(and not just convert) content before committing.\n"
11736
msgstr ""
11737
11738
#: en/help_topics/hidden-commands.txt:1
11739
msgid ""
11740
"added List files added in working tree.\n"
11741
"ancestry List all revisions merged into this branch.\n"
11742
"assert-fail Test reporting of assertion failures\n"
11743
"bundle-info Output interesting stats about a bundle\n"
11744
"bundle-revisions Create a merge-directive for submitting changes.\n"
11745
"cat-revision Write out metadata for a revision.\n"
11746
"dump-btree Dump the contents of a btree index file to stdout.\n"
11747
"export-pot Export command helps and error messages in po format.\n"
11748
"file-id Print file_id of a particular file or directory.\n"
11749
"file-path Print path of file_ids to a file or directory.\n"
11750
"find-merge-base Find and print a base revision for merging two "
11751
"branches.\n"
11752
"hooks Show hooks.\n"
11753
"inventory Show inventory of the current working copy or a "
11754
"revision.\n"
11755
"local-time-offset Show the offset in seconds from GMT to local time.\n"
11756
"lookup-revision Lookup the revision-id from a revision-number\n"
11757
"merge-directive Generate a merge directive for auto-merge tools.\n"
11758
"modified List files modified in working tree.\n"
11759
"re-sign Create a digital signature for an existing revision.\n"
11760
"reference list, view and set branch locations for nested trees.\n"
11761
"relpath Show path of a file relative to root\n"
11762
"repair-workingtree Reset the working tree state file.\n"
11763
"revision-history Display the list of revision ids on a branch.\n"
11764
"revision-info Show revision number and revision id for a given "
11765
"revision\n"
11766
" identifier.\n"
11767
"rocks Statement of optimism.\n"
11768
"selftest Run internal test suite.\n"
11769
"shell-complete Show appropriate completions for context.\n"
11770
"test-script Run a shell-like test from a file.\n"
11771
"touching-revisions Return revision-ids which affected a particular file.\n"
11772
"unknowns List unknown files.\n"
11773
"wait-until-signalled Test helper for\n"
11774
" test_start_and_stop_bzr_subprocess_send_signal.\n"
11775
msgstr ""
11776
11777
#: en/help_topics/hooks.txt:1
11778
msgid ""
11779
"\n"
11780
"Hooks\n"
11781
"====="
11782
msgstr ""
11783
11784
#: en/help_topics/hooks.txt:5
11785
msgid ""
11786
"Introduction\n"
11787
"------------"
11788
msgstr ""
11789
11790
#: en/help_topics/hooks.txt:8
11791
msgid "A hook of type *xxx* of class *yyy* needs to be registered using::"
11792
msgstr ""
11793
11794
#: en/help_topics/hooks.txt:10
11795
msgid " yyy.hooks.install_named_hook(\"xxx\", ...)"
11796
msgstr ""
11797
11798
#: en/help_topics/hooks.txt:12
11799
msgid ""
11800
"See :doc:`Using hooks<../user-guide/hooks>` in the User Guide for examples."
11801
msgstr ""
11802
11803
#: en/help_topics/hooks.txt:14
11804
msgid ""
11805
"The class that contains each hook is given before the hooks it supplies. "
11806
"For\n"
11807
"instance, BranchHooks as the class is the hooks class for\n"
11808
"`bzrlib.branch.Branch.hooks`."
11809
msgstr ""
11810
11811
#: en/help_topics/hooks.txt:18
11812
msgid ""
11813
"Each description also indicates whether the hook runs on the client (the\n"
11814
"machine where bzr was invoked) or the server (the machine addressed by\n"
11815
"the branch URL). These may be, but are not necessarily, the same machine."
11816
msgstr ""
11817
11818
#: en/help_topics/hooks.txt:22
11819
msgid ""
11820
"Plugins (including hooks) are run on the server if all of these is true:"
11821
msgstr ""
11822
11823
#: en/help_topics/hooks.txt:24
11824
msgid ""
11825
" * The connection is via a smart server (accessed with a URL starting with\n"
11826
" \"bzr://\", \"bzr+ssh://\" or \"bzr+http://\", or accessed via a "
11827
"\"http://\"\n"
11828
" URL when a smart server is available via HTTP)."
11829
msgstr ""
11830
11831
#: en/help_topics/hooks.txt:28
11832
msgid ""
11833
" * The hook is either server specific or part of general infrastructure "
11834
"rather\n"
11835
" than client specific code (such as commit)."
11836
msgstr ""
11837
11838
#: en/help_topics/hooks.txt:31
11839
msgid ""
11840
"\n"
11841
"BranchHooks\n"
11842
"-----------"
11843
msgstr ""
11844
11845
#: en/help_topics/hooks.txt:35
11846
msgid ""
11847
"automatic_tag_name\n"
11848
"~~~~~~~~~~~~~~~~~~"
11849
msgstr ""
11850
11851
#: en/help_topics/hooks.txt:38
11852
msgid "Introduced in: 2.2"
11853
msgstr ""
11854
11855
#: en/help_topics/hooks.txt:40
11856
msgid ""
11857
"Called to determine an automatic tag name for a revision.\n"
11858
"automatic_tag_name is called with (branch, revision_id) and should\n"
11859
"return a tag name or None if no tag name could be determined. The\n"
11860
"first non-None tag name returned will be used."
11861
msgstr ""
11862
11863
#: en/help_topics/hooks.txt:45
11864
msgid ""
11865
"open\n"
11866
"~~~~"
11867
msgstr ""
11868
11869
#: en/help_topics/hooks.txt:48
11870
msgid "Introduced in: 1.8"
11871
msgstr ""
11872
11873
#: en/help_topics/hooks.txt:50
11874
msgid ""
11875
"Called with the Branch object that has been opened after a branch is\n"
11876
"opened."
11877
msgstr ""
11878
11879
#: en/help_topics/hooks.txt:53
11880
msgid ""
11881
"post_branch_init\n"
11882
"~~~~~~~~~~~~~~~~"
11883
msgstr ""
11884
11885
#: en/help_topics/hooks.txt:58
11886
msgid ""
11887
"Called after new branch initialization completes. post_branch_init is\n"
11888
"called with a bzrlib.branch.BranchInitHookParams. Note that init,\n"
11889
"branch and checkout (both heavyweight and lightweight) will all\n"
11890
"trigger this hook."
11891
msgstr ""
11892
11893
#: en/help_topics/hooks.txt:63
11894
msgid ""
11895
"post_change_branch_tip\n"
11896
"~~~~~~~~~~~~~~~~~~~~~~"
11897
msgstr ""
11898
11899
#: en/help_topics/hooks.txt:66
11900
msgid "Introduced in: 1.4"
11901
msgstr ""
11902
11903
#: en/help_topics/hooks.txt:68
11904
msgid ""
11905
"Called in bzr client and server after a change to the tip of a branch\n"
11906
"is made. post_change_branch_tip is called with a\n"
11907
"bzrlib.branch.ChangeBranchTipParams. Note that push, pull, commit,\n"
11908
"uncommit will all trigger this hook."
11909
msgstr ""
11910
11911
#: en/help_topics/hooks.txt:73
11912
msgid ""
11913
"post_commit\n"
11914
"~~~~~~~~~~~"
11915
msgstr ""
11916
11917
#: en/help_topics/hooks.txt:76
11918
msgid "Introduced in: 0.15"
11919
msgstr ""
11920
11921
#: en/help_topics/hooks.txt:78
11922
msgid ""
11923
"Called in the bzr client after a commit has completed. post_commit is\n"
11924
"called with (local, master, old_revno, old_revid, new_revno,\n"
11925
"new_revid). old_revid is NULL_REVISION for the first commit to a\n"
11926
"branch."
11927
msgstr ""
11928
11929
#: en/help_topics/hooks.txt:83
11930
msgid ""
11931
"post_pull\n"
11932
"~~~~~~~~~"
11933
msgstr ""
11934
11935
#: en/help_topics/hooks.txt:88
11936
msgid ""
11937
"Called after a pull operation completes. post_pull is called with a\n"
11938
"bzrlib.branch.PullResult object and only runs in the bzr client."
11939
msgstr ""
11940
11941
#: en/help_topics/hooks.txt:91
11942
msgid ""
11943
"post_push\n"
11944
"~~~~~~~~~"
11945
msgstr ""
11946
11947
#: en/help_topics/hooks.txt:96
11948
msgid ""
11949
"Called after a push operation completes. post_push is called with a\n"
11950
"bzrlib.branch.BranchPushResult object and only runs in the bzr client."
11951
msgstr ""
11952
11953
#: en/help_topics/hooks.txt:99
11954
msgid ""
11955
"post_switch\n"
11956
"~~~~~~~~~~~"
11957
msgstr ""
11958
11959
#: en/help_topics/hooks.txt:104
11960
msgid ""
11961
"Called after a checkout switches branch. post_switch is called with a\n"
11962
"bzrlib.branch.SwitchHookParams."
11963
msgstr ""
11964
11965
#: en/help_topics/hooks.txt:107
11966
msgid ""
11967
"post_uncommit\n"
11968
"~~~~~~~~~~~~~"
11969
msgstr ""
11970
11971
#: en/help_topics/hooks.txt:112
11972
msgid ""
11973
"Called in the bzr client after an uncommit completes. post_uncommit is\n"
11974
"called with (local, master, old_revno, old_revid, new_revno,\n"
11975
"new_revid) where local is the local branch or None, master is the\n"
11976
"target branch, and an empty branch receives new_revno of 0, new_revid\n"
11977
"of None."
11978
msgstr ""
11979
11980
#: en/help_topics/hooks.txt:118
11981
msgid ""
11982
"pre_change_branch_tip\n"
11983
"~~~~~~~~~~~~~~~~~~~~~"
11984
msgstr ""
11985
11986
#: en/help_topics/hooks.txt:121
11987
msgid "Introduced in: 1.6"
11988
msgstr ""
11989
11990
#: en/help_topics/hooks.txt:123
11991
msgid ""
11992
"Called in bzr client and server before a change to the tip of a branch\n"
11993
"is made. pre_change_branch_tip is called with a\n"
11994
"bzrlib.branch.ChangeBranchTipParams. Note that push, pull, commit,\n"
11995
"uncommit will all trigger this hook."
11996
msgstr ""
11997
11998
#: en/help_topics/hooks.txt:128
11999
msgid ""
12000
"pre_commit\n"
12001
"~~~~~~~~~~"
12002
msgstr ""
12003
12004
#: en/help_topics/hooks.txt:131
12005
msgid "Introduced in: 0.91"
12006
msgstr ""
12007
12008
#: en/help_topics/hooks.txt:133
12009
msgid ""
12010
"Called after a commit is calculated but before it is completed.\n"
12011
"pre_commit is called with (local, master, old_revno, old_revid,\n"
12012
"future_revno, future_revid, tree_delta, future_tree). old_revid is\n"
12013
"NULL_REVISION for the first commit to a branch, tree_delta is a\n"
12014
"TreeDelta object describing changes from the basis revision. hooks\n"
12015
"MUST NOT modify this delta. future_tree is an in-memory tree obtained\n"
12016
"from CommitBuilder.revision_tree() and hooks MUST NOT modify this\n"
12017
"tree."
12018
msgstr ""
12019
12020
#: en/help_topics/hooks.txt:142
12021
msgid ""
12022
"set_rh\n"
12023
"~~~~~~"
12024
msgstr ""
12025
12026
#: en/help_topics/hooks.txt:147
12027
msgid ""
12028
"Invoked whenever the revision history has been set via\n"
12029
"set_revision_history. The api signature is (branch, revision_history),\n"
12030
"and the branch will be write-locked. The set_rh hook can be expensive\n"
12031
"for bzr to trigger, a better hook to use is\n"
12032
"Branch.post_change_branch_tip."
12033
msgstr ""
12034
12035
#: en/help_topics/hooks.txt:153
12036
msgid ""
12037
"transform_fallback_location\n"
12038
"~~~~~~~~~~~~~~~~~~~~~~~~~~~"
12039
msgstr ""
12040
12041
#: en/help_topics/hooks.txt:156
12042
msgid "Introduced in: 1.9"
12043
msgstr ""
12044
12045
#: en/help_topics/hooks.txt:158
12046
msgid ""
12047
"Called when a stacked branch is activating its fallback locations.\n"
12048
"transform_fallback_location is called with (branch, url), and should\n"
12049
"return a new url. Returning the same url allows it to be used as-is,\n"
12050
"returning a different one can be used to cause the branch to stack on\n"
12051
"a closer copy of that fallback_location. Note that the branch cannot\n"
12052
"have history accessing methods called on it during this hook because\n"
12053
"the fallback locations have not been activated. When there are\n"
12054
"multiple hooks installed for transform_fallback_location, all are\n"
12055
"called with the url returned from the previous hook.The order is\n"
12056
"however undefined."
12057
msgstr ""
12058
12059
#: en/help_topics/hooks.txt:169
12060
msgid ""
12061
"CommandHooks\n"
12062
"------------"
12063
msgstr ""
12064
12065
#: en/help_topics/hooks.txt:172
12066
msgid ""
12067
"extend_command\n"
12068
"~~~~~~~~~~~~~~"
12069
msgstr ""
12070
12071
#: en/help_topics/hooks.txt:175
12072
msgid "Introduced in: 1.13"
12073
msgstr ""
12074
12075
#: en/help_topics/hooks.txt:177
12076
msgid ""
12077
"Called after creating a command object to allow modifications such as\n"
12078
"adding or removing options, docs etc. Called with the new\n"
12079
"bzrlib.commands.Command object."
12080
msgstr ""
12081
12082
#: en/help_topics/hooks.txt:181
12083
msgid ""
12084
"get_command\n"
12085
"~~~~~~~~~~~"
12086
msgstr ""
12087
12088
#: en/help_topics/hooks.txt:184
12089
msgid "Introduced in: 1.17"
12090
msgstr ""
12091
12092
#: en/help_topics/hooks.txt:186
12093
msgid ""
12094
"Called when creating a single command. Called with (cmd_or_None,\n"
12095
"command_name). get_command should either return the cmd_or_None\n"
12096
"parameter, or a replacement Command object that should be used for the\n"
12097
"command. Note that the Command.hooks hooks are core infrastructure.\n"
12098
"Many users will prefer to use bzrlib.commands.register_command or\n"
12099
"plugin_cmds.register_lazy."
12100
msgstr ""
12101
12102
#: en/help_topics/hooks.txt:193
12103
msgid ""
12104
"get_missing_command\n"
12105
"~~~~~~~~~~~~~~~~~~~"
12106
msgstr ""
12107
12108
#: en/help_topics/hooks.txt:198
12109
msgid ""
12110
"Called when creating a single command if no command could be found.\n"
12111
"Called with (command_name). get_missing_command should either return\n"
12112
"None, or a Command object to be used for the command."
12113
msgstr ""
12114
12115
#: en/help_topics/hooks.txt:202
12116
msgid ""
12117
"list_commands\n"
12118
"~~~~~~~~~~~~~"
12119
msgstr ""
12120
12121
#: en/help_topics/hooks.txt:207
12122
msgid ""
12123
"Called when enumerating commands. Called with a set of cmd_name\n"
12124
"strings for all the commands found so far. This set is safe to mutate\n"
12125
"- e.g. to remove a command. list_commands should return the updated\n"
12126
"set of command names."
12127
msgstr ""
12128
12129
#: en/help_topics/hooks.txt:212
12130
msgid ""
12131
"_ConfigHooks\n"
12132
"------------"
12133
msgstr ""
12134
12135
#: en/help_topics/hooks.txt:215
12136
msgid ""
12137
"get\n"
12138
"~~~"
12139
msgstr ""
12140
12141
#: en/help_topics/hooks.txt:218
12142
msgid "Introduced in: 2.4"
12143
msgstr ""
12144
12145
#: en/help_topics/hooks.txt:220
12146
msgid ""
12147
"Invoked when a config option is read. The signature is (stack, name,\n"
12148
"value)."
12149
msgstr ""
12150
12151
#: en/help_topics/hooks.txt:223
12152
msgid ""
12153
"load\n"
12154
"~~~~"
12155
msgstr ""
12156
12157
#: en/help_topics/hooks.txt:228
12158
msgid "Invoked when a config store is loaded. The signature is (store)."
12159
msgstr ""
12160
12161
#: en/help_topics/hooks.txt:230
12162
msgid ""
12163
"remove\n"
12164
"~~~~~~"
12165
msgstr ""
12166
12167
#: en/help_topics/hooks.txt:235
12168
msgid ""
12169
"Invoked when a config option is removed. The signature is (stack,\n"
12170
"name)."
12171
msgstr ""
12172
12173
#: en/help_topics/hooks.txt:238
12174
msgid ""
12175
"save\n"
12176
"~~~~"
12177
msgstr ""
12178
12179
#: en/help_topics/hooks.txt:243
12180
msgid "Invoked when a config store is saved. The signature is (store)."
12181
msgstr ""
12182
12183
#: en/help_topics/hooks.txt:245
12184
msgid ""
12185
"set\n"
12186
"~~~"
12187
msgstr ""
12188
12189
#: en/help_topics/hooks.txt:250
12190
msgid ""
12191
"Invoked when a config option is set. The signature is (stack, name,\n"
12192
"value)."
12193
msgstr ""
12194
12195
#: en/help_topics/hooks.txt:253
12196
msgid ""
12197
"ControlDirHooks\n"
12198
"---------------"
12199
msgstr ""
12200
12201
#: en/help_topics/hooks.txt:256
12202
msgid ""
12203
"post_repo_init\n"
12204
"~~~~~~~~~~~~~~"
12205
msgstr ""
12206
12207
#: en/help_topics/hooks.txt:261
12208
msgid ""
12209
"Invoked after a repository has been initialized. post_repo_init is\n"
12210
"called with a bzrlib.controldir.RepoInitHookParams."
12211
msgstr ""
12212
12213
#: en/help_topics/hooks.txt:264
12214
msgid ""
12215
"pre_open\n"
12216
"~~~~~~~~"
12217
msgstr ""
12218
12219
#: en/help_topics/hooks.txt:267
12220
msgid "Introduced in: 1.14"
12221
msgstr ""
12222
12223
#: en/help_topics/hooks.txt:269
12224
msgid ""
12225
"Invoked before attempting to open a ControlDir with the transport that\n"
12226
"the open will use."
12227
msgstr ""
12228
12229
#: en/help_topics/hooks.txt:272
12230
msgid ""
12231
"InfoHooks\n"
12232
"---------"
12233
msgstr ""
12234
12235
#: en/help_topics/hooks.txt:275
12236
msgid ""
12237
"repository\n"
12238
"~~~~~~~~~~"
12239
msgstr ""
12240
12241
#: en/help_topics/hooks.txt:278
12242
msgid "Introduced in: 1.15"
12243
msgstr ""
12244
12245
#: en/help_topics/hooks.txt:280
12246
msgid ""
12247
"Invoked when displaying the statistics for a repository. repository is\n"
12248
"called with a statistics dictionary as returned by the repository and\n"
12249
"a file-like object to write to."
12250
msgstr ""
12251
12252
#: en/help_topics/hooks.txt:284
12253
msgid ""
12254
"LockHooks\n"
12255
"---------"
12256
msgstr ""
12257
12258
#: en/help_topics/hooks.txt:287
12259
msgid ""
12260
"lock_acquired\n"
12261
"~~~~~~~~~~~~~"
12262
msgstr ""
12263
12264
#: en/help_topics/hooks.txt:292
12265
msgid "Called with a bzrlib.lock.LockResult when a physical lock is acquired."
12266
msgstr ""
12267
12268
#: en/help_topics/hooks.txt:294
12269
msgid ""
12270
"lock_broken\n"
12271
"~~~~~~~~~~~"
12272
msgstr ""
12273
12274
#: en/help_topics/hooks.txt:299
12275
msgid "Called with a bzrlib.lock.LockResult when a physical lock is broken."
12276
msgstr ""
12277
12278
#: en/help_topics/hooks.txt:301
12279
msgid ""
12280
"lock_released\n"
12281
"~~~~~~~~~~~~~"
12282
msgstr ""
12283
12284
#: en/help_topics/hooks.txt:306
12285
msgid "Called with a bzrlib.lock.LockResult when a physical lock is released."
12286
msgstr ""
12287
12288
#: en/help_topics/hooks.txt:308
12289
msgid ""
12290
"MergeHooks\n"
12291
"----------"
12292
msgstr ""
12293
12294
#: en/help_topics/hooks.txt:311
12295
msgid ""
12296
"merge_file_content\n"
12297
"~~~~~~~~~~~~~~~~~~"
12298
msgstr ""
12299
12300
#: en/help_topics/hooks.txt:314
12301
msgid "Introduced in: 2.1"
12302
msgstr ""
12303
12304
#: en/help_topics/hooks.txt:316
12305
msgid ""
12306
"Called with a bzrlib.merge.Merger object to create a per file merge\n"
12307
"object when starting a merge. Should return either None or a subclass\n"
12308
"of ``bzrlib.merge.AbstractPerFileMerger``. Such objects will then be\n"
12309
"called per file that needs to be merged (including when one side has\n"
12310
"deleted the file and the other has changed it). See the\n"
12311
"AbstractPerFileMerger API docs for details on how it is used by merge."
12312
msgstr ""
12313
12314
#: en/help_topics/hooks.txt:323
12315
msgid ""
12316
"MergeDirectiveHooks\n"
12317
"-------------------"
12318
msgstr ""
12319
12320
#: en/help_topics/hooks.txt:326
12321
msgid ""
12322
"merge_request_body\n"
12323
"~~~~~~~~~~~~~~~~~~"
12324
msgstr ""
12325
12326
#: en/help_topics/hooks.txt:329
12327
msgid "Introduced in: 1.15.0"
12328
msgstr ""
12329
12330
#: en/help_topics/hooks.txt:331
12331
msgid ""
12332
"Called with a MergeRequestBodyParams when a body is needed for a merge\n"
12333
"request. Callbacks must return a body. If more than one callback is\n"
12334
"registered, the output of one callback is provided to the next."
12335
msgstr ""
12336
12337
#: en/help_topics/hooks.txt:335
12338
msgid ""
12339
"MessageEditorHooks\n"
12340
"------------------"
12341
msgstr ""
12342
12343
#: en/help_topics/hooks.txt:338
12344
msgid ""
12345
"commit_message_template\n"
12346
"~~~~~~~~~~~~~~~~~~~~~~~"
12347
msgstr ""
12348
12349
#: en/help_topics/hooks.txt:341
12350
msgid "Introduced in: 1.10"
12351
msgstr ""
12352
12353
#: en/help_topics/hooks.txt:343
12354
msgid ""
12355
"Called when a commit message is being generated.\n"
12356
"commit_message_template is called with the bzrlib.commit.Commit object\n"
12357
"and the message that is known so far. commit_message_template must\n"
12358
"return a new message to use (which could be the same as it was given).\n"
12359
"When there are multiple hooks registered for commit_message_template,\n"
12360
"they are chained with the result from the first passed into the\n"
12361
"second, and so on."
12362
msgstr ""
12363
12364
#: en/help_topics/hooks.txt:351
12365
msgid ""
12366
"set_commit_message\n"
12367
"~~~~~~~~~~~~~~~~~~"
12368
msgstr ""
12369
12370
#: en/help_topics/hooks.txt:356
12371
msgid ""
12372
"Set a fixed commit message. set_commit_message is called with the\n"
12373
"bzrlib.commit.Commit object (so you can also change e.g. revision\n"
12374
"properties by editing commit.builder._revprops) and the message so\n"
12375
"far. set_commit_message must return the message to use or None if it\n"
12376
"should use the message editor as normal."
12377
msgstr ""
12378
12379
#: en/help_topics/hooks.txt:362
12380
msgid ""
12381
"MutableTreeHooks\n"
12382
"----------------"
12383
msgstr ""
12384
12385
#: en/help_topics/hooks.txt:368
12386
msgid "Introduced in: 2.0"
12387
msgstr ""
12388
12389
#: en/help_topics/hooks.txt:370
12390
msgid ""
12391
"Called after a commit is performed on a tree. The hook is called with\n"
12392
"a bzrlib.mutabletree.PostCommitHookParams object. The mutable tree the\n"
12393
"commit was performed on is available via the mutable_tree attribute of\n"
12394
"that object."
12395
msgstr ""
12396
12397
#: en/help_topics/hooks.txt:375
12398
msgid ""
12399
"start_commit\n"
12400
"~~~~~~~~~~~~"
12401
msgstr ""
12402
12403
#: en/help_topics/hooks.txt:380
12404
msgid ""
12405
"Called before a commit is performed on a tree. The start commit hook\n"
12406
"is able to change the tree before the commit takes place. start_commit\n"
12407
"is called with the bzrlib.mutabletree.MutableTree that the commit is\n"
12408
"being performed on."
12409
msgstr ""
12410
12411
#: en/help_topics/hooks.txt:385
12412
msgid ""
12413
"SmartClientHooks\n"
12414
"----------------"
12415
msgstr ""
12416
12417
#: en/help_topics/hooks.txt:388
12418
msgid ""
12419
"call\n"
12420
"~~~~"
12421
msgstr ""
12422
12423
#: en/help_topics/hooks.txt:391
12424
msgid "Introduced in: unknown"
12425
msgstr ""
12426
12427
#: en/help_topics/hooks.txt:393
12428
msgid ""
12429
"Called when the smart client is submitting a request to the smart\n"
12430
"server. Called with a bzrlib.smart.client.CallHookParams object.\n"
12431
"Streaming request bodies, and responses, are not accessible."
12432
msgstr ""
12433
12434
#: en/help_topics/hooks.txt:397
12435
msgid ""
12436
"SmartServerHooks\n"
12437
"----------------"
12438
msgstr ""
12439
12440
#: en/help_topics/hooks.txt:400
12441
msgid ""
12442
"server_exception\n"
12443
"~~~~~~~~~~~~~~~~"
12444
msgstr ""
12445
12446
#: en/help_topics/hooks.txt:405
12447
msgid ""
12448
"Called by the bzr server when an exception occurs. server_exception is\n"
12449
"called with the sys.exc_info() tuple return true for the hook if the\n"
12450
"exception has been handled, in which case the server will exit\n"
12451
"normally."
12452
msgstr ""
12453
12454
#: en/help_topics/hooks.txt:410
12455
msgid ""
12456
"server_started\n"
12457
"~~~~~~~~~~~~~~"
12458
msgstr ""
12459
12460
#: en/help_topics/hooks.txt:413
12461
msgid "Introduced in: 0.16"
12462
msgstr ""
12463
12464
#: en/help_topics/hooks.txt:415
12465
msgid ""
12466
"Called by the bzr server when it starts serving a directory.\n"
12467
"server_started is called with (backing urls, public url), where\n"
12468
"backing_url is a list of URLs giving the server-specific directory\n"
12469
"locations, and public_url is the public URL for the directory being\n"
12470
"served."
12471
msgstr ""
12472
12473
#: en/help_topics/hooks.txt:421
12474
msgid ""
12475
"server_started_ex\n"
12476
"~~~~~~~~~~~~~~~~~"
12477
msgstr ""
12478
12479
#: en/help_topics/hooks.txt:426
12480
msgid ""
12481
"Called by the bzr server when it starts serving a directory.\n"
12482
"server_started is called with (backing_urls, server_obj)."
12483
msgstr ""
12484
12485
#: en/help_topics/hooks.txt:429
12486
msgid ""
12487
"server_stopped\n"
12488
"~~~~~~~~~~~~~~"
12489
msgstr ""
12490
12491
#: en/help_topics/hooks.txt:434
12492
msgid ""
12493
"Called by the bzr server when it stops serving a directory.\n"
12494
"server_stopped is called with the same parameters as the\n"
12495
"server_started hook: (backing_urls, public_url)."
12496
msgstr ""
12497
12498
#: en/help_topics/hooks.txt:438
12499
msgid ""
12500
"StatusHooks\n"
12501
"-----------"
12502
msgstr ""
12503
12504
#: en/help_topics/hooks.txt:441
12505
msgid ""
12506
"post_status\n"
12507
"~~~~~~~~~~~"
12508
msgstr ""
12509
12510
#: en/help_topics/hooks.txt:444
12511
msgid "Introduced in: 2.3"
12512
msgstr ""
12513
12514
#: en/help_topics/hooks.txt:446
12515
msgid ""
12516
"Called with argument StatusHookParams after Bazaar has displayed the\n"
12517
"status. StatusHookParams has the attributes (old_tree, new_tree,\n"
12518
"to_file, versioned, show_ids, short, verbose). The last four arguments\n"
12519
"correspond to the command line options specified by the user for the\n"
12520
"status command. to_file is the output stream for writing."
12521
msgstr ""
12522
12523
#: en/help_topics/hooks.txt:452
12524
msgid ""
12525
"pre_status\n"
12526
"~~~~~~~~~~"
12527
msgstr ""
12528
12529
#: en/help_topics/hooks.txt:457
12530
msgid ""
12531
"Called with argument StatusHookParams before Bazaar displays the\n"
12532
"status. StatusHookParams has the attributes (old_tree, new_tree,\n"
12533
"to_file, versioned, show_ids, short, verbose). The last four arguments\n"
12534
"correspond to the command line options specified by the user for the\n"
12535
"status command. to_file is the output stream for writing."
12536
msgstr ""
12537
12538
#: en/help_topics/hooks.txt:463
12539
msgid ""
12540
"RioVersionInfoBuilderHooks\n"
12541
"--------------------------"
12542
msgstr ""
12543
12544
#: en/help_topics/hooks.txt:466
12545
msgid ""
12546
"revision\n"
12547
"~~~~~~~~"
12548
msgstr ""
12549
12550
#: en/help_topics/hooks.txt:471
12551
msgid ""
12552
"Invoked when adding information about a revision to the RIO stanza\n"
12553
"that is printed. revision is called with a revision object and a RIO\n"
12554
"stanza.\n"
12555
msgstr ""
12556
12557
#: en/help_topics/location-alias.txt:1
12558
msgid ""
12559
"Location aliases\n"
12560
"================"
12561
msgstr ""
12562
12563
#: en/help_topics/location-alias.txt:4
12564
msgid ""
12565
"Bazaar defines several aliases for locations associated with a branch. "
12566
"These\n"
12567
"can be used with most commands that expect a location, such as `bzr push`."
12568
msgstr ""
12569
12570
#: en/help_topics/location-alias.txt:7
12571
msgid "The aliases are::"
12572
msgstr ""
12573
12574
#: en/help_topics/location-alias.txt:9
12575
msgid ""
12576
" :bound The branch this branch is bound to, for bound branches.\n"
12577
" :parent The parent of this branch.\n"
12578
" :public The public location of this branch.\n"
12579
" :push The saved location used for `bzr push` with no arguments.\n"
12580
" :submit The submit branch for this branch.\n"
12581
" :this This branch."
12582
msgstr ""
12583
12584
#: en/help_topics/location-alias.txt:16
12585
msgid "For example, to push to the parent location::"
12586
msgstr ""
12587
12588
#: en/help_topics/location-alias.txt:18
12589
msgid " bzr push :parent\n"
12590
msgstr ""
12591
12592
#: en/help_topics/log-formats.txt:1
12593
msgid ""
12594
"Log Formats\n"
12595
"==========="
12596
msgstr ""
12597
12598
#: en/help_topics/log-formats.txt:4
12599
msgid ""
12600
"A log format controls how information about each revision is displayed.\n"
12601
"The standard log formats are compared below::"
12602
msgstr ""
12603
12604
#: en/help_topics/log-formats.txt:7
12605
msgid ""
12606
" Feature long short line\n"
12607
" ---------------------- ------------- ------------ -------------------\n"
12608
" design goal detailed view concise view 1 revision per line\n"
12609
" committer name+email name only name only\n"
12610
" author name+email - -\n"
12611
" date-time format full date only date only\n"
12612
" commit message full full top line\n"
12613
" tags yes yes yes\n"
12614
" merges indicator - yes -\n"
12615
" status/delta optional optional -\n"
12616
" diff/patch optional optional -\n"
12617
" revision-id optional optional -\n"
12618
" branch nick yes - -\n"
12619
" foreign vcs properties yes yes -\n"
12620
" preferred levels all 1 1\n"
12621
" digital signature optional - -"
12622
msgstr ""
12623
12624
#: en/help_topics/log-formats.txt:24
12625
msgid ""
12626
"The default format is ``long``. To change this, define the ``log_format``\n"
12627
"setting in the ``[DEFAULT]`` section of ``bazaar.conf`` like this (say)::"
12628
msgstr ""
12629
12630
#: en/help_topics/log-formats.txt:27
12631
msgid ""
12632
" [DEFAULT]\n"
12633
" log_format = short"
12634
msgstr ""
12635
12636
#: en/help_topics/log-formats.txt:30
12637
msgid ""
12638
"Alternatively, to change the log format used for a given query, use the\n"
12639
"--long, --short or --line options."
12640
msgstr ""
12641
12642
#: en/help_topics/log-formats.txt:33
12643
msgid ""
12644
"If one of the standard log formats does not meet your needs, additional\n"
12645
"formats can be provided by plugins.\n"
12646
msgstr ""
12647
12648
#: en/help_topics/other-formats.txt:1
12649
msgid "Other Storage Formats"
12650
msgstr ""
12651
12652
#: en/help_topics/other-formats.txt:3
12653
msgid "Experimental formats are shown below."
12654
msgstr ""
12655
12656
#: en/help_topics/other-formats.txt:5
12657
msgid ""
12658
":development-colo:\n"
12659
" (native) The 2a format with experimental support for colocated\n"
12660
" branches."
12661
msgstr ""
12662
12663
#: en/help_topics/other-formats.txt:9
12664
msgid ""
12665
"\n"
12666
"Deprecated formats are shown below."
12667
msgstr ""
12668
12669
#: en/help_topics/other-formats.txt:12
12670
msgid ""
12671
":pack-0.92:\n"
12672
" (native) Pack-based format used in 1.x series. Introduced in 0.92.\n"
12673
" Interoperates with bzr repositories before 0.92 but cannot be read\n"
12674
" by bzr < 0.92."
12675
msgstr ""
12676
12677
#: en/help_topics/patterns.txt:1
12678
msgid ""
12679
"Patterns\n"
12680
"========"
12681
msgstr ""
12682
12683
#: en/help_topics/patterns.txt:4
12684
msgid ""
12685
"Bazaar uses patterns to match files at various times. For example,\n"
12686
"the ``add`` command skips over files that match ignore patterns\n"
12687
"and preferences can be associated with files using rule patterns.\n"
12688
"The pattern syntax is described below."
12689
msgstr ""
12690
12691
#: en/help_topics/patterns.txt:9
12692
msgid ""
12693
"Trailing slashes on patterns are ignored. If the pattern contains a\n"
12694
"slash or is a regular expression, it is compared to the whole path\n"
12695
"from the branch root. Otherwise, it is compared to only the last\n"
12696
"component of the path. To match a file only in the root directory,\n"
12697
"prepend ``./``. Patterns specifying absolute paths are not allowed."
12698
msgstr ""
12699
12700
#: en/help_topics/patterns.txt:15
12701
msgid "Patterns may include globbing wildcards such as::"
12702
msgstr ""
12703
12704
#: en/help_topics/patterns.txt:17
12705
msgid ""
12706
" ? - Matches any single character except '/'\n"
12707
" * - Matches 0 or more characters except '/'\n"
12708
" /**/ - Matches 0 or more directories in a path\n"
12709
" [a-z] - Matches a single character from within a group of characters"
12710
msgstr ""
12711
12712
#: en/help_topics/patterns.txt:22
12713
msgid ""
12714
"Patterns may also be `Python regular expressions`_. Regular expression\n"
12715
"patterns are identified by a ``RE:`` prefix followed by the regular\n"
12716
"expression. Regular expression patterns may not include named or\n"
12717
"numbered groups."
12718
msgstr ""
12719
12720
#: en/help_topics/patterns.txt:27
12721
msgid ""
12722
"Case insensitive ignore patterns can be specified with regular expressions\n"
12723
"by using the ``i`` (for ignore case) flag in the pattern."
12724
msgstr ""
12725
12726
#: en/help_topics/patterns.txt:30
12727
msgid "For example, a case insensitive match for ``foo`` may be specified as::"
12728
msgstr ""
12729
12730
#: en/help_topics/patterns.txt:32
12731
msgid " RE:(?i)foo"
12732
msgstr ""
12733
12734
#: en/help_topics/patterns.txt:34
12735
msgid ""
12736
"Ignore patterns may be prefixed with ``!``, which means that a filename\n"
12737
"matched by that pattern will not be ignored."
12738
msgstr ""
12739
12740
#: en/help_topics/patterns.txt:37
12741
msgid ".. _Python regular expressions: http://docs.python.org/library/re.html"
12742
msgstr ""
12743
12744
#: en/help_topics/revisionspec.txt:1
12745
msgid "Revision Identifiers"
12746
msgstr ""
12747
12748
#: en/help_topics/revisionspec.txt:3
12749
msgid ""
12750
"A revision identifier refers to a specific state of a branch's history. It\n"
12751
"can be expressed in several ways. It can begin with a keyword to\n"
12752
"unambiguously specify a given lookup type; some examples are 'last:1',\n"
12753
"'before:yesterday' and 'submit:'."
12754
msgstr ""
12755
12756
#: en/help_topics/revisionspec.txt:8
12757
msgid ""
12758
"Alternately, it can be given without a keyword, in which case it will be\n"
12759
"checked as a revision number, a tag, a revision id, a date specification, or "
12760
"a\n"
12761
"branch specification, in that order. For example, 'date:today' could be\n"
12762
"written as simply 'today', though if you have a tag called 'today' that "
12763
"will\n"
12764
"be found first."
12765
msgstr ""
12766
12767
#: en/help_topics/revisionspec.txt:14
12768
msgid ""
12769
"If 'REV1' and 'REV2' are revision identifiers, then 'REV1..REV2' denotes a\n"
12770
"revision range. Examples: '3647..3649', 'date:yesterday..-1' and\n"
12771
"'branch:/path/to/branch1/..branch:/branch2' (note that there are no quotes "
12772
"or\n"
12773
"spaces around the '..')."
12774
msgstr ""
12775
12776
#: en/help_topics/revisionspec.txt:19
12777
msgid ""
12778
"Ranges are interpreted differently by different commands. To the \"log\" "
12779
"command,\n"
12780
"a range is a sequence of log messages, but to the \"diff\" command, the "
12781
"range\n"
12782
"denotes a change between revisions (and not a sequence of changes). In\n"
12783
"addition, \"log\" considers a closed range whereas \"diff\" and \"merge\" "
12784
"consider it\n"
12785
"to be open-ended, that is, they include one end but not the other. For "
12786
"example:\n"
12787
"\"bzr log -r 3647..3649\" shows the messages of revisions 3647, 3648 and "
12788
"3649,\n"
12789
"while \"bzr diff -r 3647..3649\" includes the changes done in revisions 3648 "
12790
"and\n"
12791
"3649, but not 3647."
12792
msgstr ""
12793
12794
#: en/help_topics/revisionspec.txt:28
12795
msgid "The keywords used as revision selection methods are the following:"
12796
msgstr ""
12797
12798
#: en/help_topics/revisionspec.txt:30
12799
msgid ""
12800
":revid:\n"
12801
"\tSelects a revision using the revision id.\n"
12802
":submit:\n"
12803
"\tSelects a common ancestor with the submit branch.\n"
12804
":ancestor:\n"
12805
"\tSelects a common ancestor with a second branch.\n"
12806
":date:\n"
12807
"\tSelects a revision on the basis of a datestamp.\n"
12808
":branch:\n"
12809
"\tSelects the last revision of a specified branch.\n"
12810
":tag:\n"
12811
"\tSelects a revision identified by a tag name.\n"
12812
":revno:\n"
12813
"\tSelects a revision using a number.\n"
12814
":before:\n"
12815
"\tSelects the parent of the revision specified.\n"
12816
":annotate:\n"
12817
"\tSelect the revision that last modified the specified line.\n"
12818
":mainline:\n"
12819
"\tSelect mainline revision that merged the specified revision.\n"
12820
":last:\n"
12821
"\tSelects the nth revision from the end."
12822
msgstr ""
12823
12824
#: en/help_topics/revisionspec.txt:53
12825
msgid "In addition, plugins can provide other keywords."
12826
msgstr ""
12827
12828
#: en/help_topics/revisionspec.txt:55
12829
msgid "A detailed description of each keyword is given below."
12830
msgstr ""
12831
12832
#: en/help_topics/revisionspec.txt:57
12833
msgid ":revid:"
12834
msgstr ""
12835
12836
#: en/help_topics/revisionspec.txt:59
12837
msgid ""
12838
" Supply a specific revision id, that can be used to specify any\n"
12839
" revision id in the ancestry of the branch.\n"
12840
" Including merges, and pending merges.\n"
12841
" Examples::"
12842
msgstr ""
12843
12844
#: en/help_topics/revisionspec.txt:64
12845
msgid ""
12846
" revid:aaaa@bbbb-123456789 -> Select revision 'aaaa@bbbb-123456789'"
12847
msgstr ""
12848
12849
#: en/help_topics/revisionspec.txt:66
12850
msgid ":submit:"
12851
msgstr ""
12852
12853
#: en/help_topics/revisionspec.txt:68
12854
msgid ""
12855
" Diffing against this shows all the changes that were made in this "
12856
"branch,\n"
12857
" and is a good predictor of what merge will do. The submit branch is\n"
12858
" used by the bundle and merge directive commands. If no submit branch\n"
12859
" is specified, the parent branch is used instead."
12860
msgstr ""
12861
12862
#: en/help_topics/revisionspec.txt:73
12863
msgid ""
12864
" The common ancestor is the last revision that existed in both\n"
12865
" branches. Usually this is the branch point, but it could also be\n"
12866
" a revision that was merged."
12867
msgstr ""
12868
12869
#: en/help_topics/revisionspec.txt:77
12870
msgid " Examples::"
12871
msgstr ""
12872
12873
#: en/help_topics/revisionspec.txt:79
12874
msgid " $ bzr diff -r submit:"
12875
msgstr ""
12876
12877
#: en/help_topics/revisionspec.txt:81
12878
msgid ":ancestor:"
12879
msgstr ""
12880
12881
#: en/help_topics/revisionspec.txt:83
12882
msgid " Supply the path to a branch to select the common ancestor."
12883
msgstr ""
12884
12885
#: en/help_topics/revisionspec.txt:89
12886
msgid ""
12887
" This is frequently used with 'diff' to return all of the changes\n"
12888
" that your branch introduces, while excluding the changes that you\n"
12889
" have not merged from the remote branch."
12890
msgstr ""
12891
12892
#: en/help_topics/revisionspec.txt:95
12893
msgid ""
12894
" ancestor:/path/to/branch\n"
12895
" $ bzr diff -r ancestor:../../mainline/branch"
12896
msgstr ""
12897
12898
#: en/help_topics/revisionspec.txt:98
12899
msgid ":date:"
12900
msgstr ""
12901
12902
#: en/help_topics/revisionspec.txt:100
12903
msgid ""
12904
" Supply a datestamp to select the first revision that matches the date.\n"
12905
" Date can be 'yesterday', 'today', 'tomorrow' or a YYYY-MM-DD string.\n"
12906
" Matches the first entry after a given date (either at midnight or\n"
12907
" at a specified time)."
12908
msgstr ""
12909
12910
#: en/help_topics/revisionspec.txt:105
12911
msgid " One way to display all the changes since yesterday would be::"
12912
msgstr ""
12913
12914
#: en/help_topics/revisionspec.txt:107
12915
msgid " bzr log -r date:yesterday.."
12916
msgstr ""
12917
12918
#: en/help_topics/revisionspec.txt:111
12919
msgid ""
12920
" date:yesterday -> select the first revision since "
12921
"yesterday\n"
12922
" date:2006-08-14,17:10:14 -> select the first revision after\n"
12923
" August 14th, 2006 at 5:10pm."
12924
msgstr ""
12925
12926
#: en/help_topics/revisionspec.txt:115
12927
msgid ":branch:"
12928
msgstr ""
12929
12930
#: en/help_topics/revisionspec.txt:117
12931
msgid " Supply the path to a branch to select its last revision."
12932
msgstr ""
12933
12934
#: en/help_topics/revisionspec.txt:121
12935
msgid " branch:/path/to/branch"
12936
msgstr ""
12937
12938
#: en/help_topics/revisionspec.txt:123
12939
msgid ":tag:"
12940
msgstr ""
12941
12942
#: en/help_topics/revisionspec.txt:125
12943
msgid " Tags are stored in the branch and created by the 'tag' command."
12944
msgstr ""
12945
12946
#: en/help_topics/revisionspec.txt:127
12947
msgid ":revno:"
12948
msgstr ""
12949
12950
#: en/help_topics/revisionspec.txt:129
12951
msgid ""
12952
" Use an integer to specify a revision in the history of the branch.\n"
12953
" Optionally a branch can be specified. A negative number will count\n"
12954
" from the end of the branch (-1 is the last revision, -2 the previous\n"
12955
" one). If the negative number is larger than the branch's history, the\n"
12956
" first revision is returned.\n"
12957
" Examples::"
12958
msgstr ""
12959
12960
#: en/help_topics/revisionspec.txt:136
12961
msgid ""
12962
" revno:1 -> return the first revision of this branch\n"
12963
" revno:3:/path/to/branch -> return the 3rd revision of\n"
12964
" the branch '/path/to/branch'\n"
12965
" revno:-1 -> The last revision in a branch.\n"
12966
" -2:http://other/branch -> The second to last revision in the\n"
12967
" remote branch.\n"
12968
" -1000000 -> Most likely the first revision, unless\n"
12969
" your history is very long."
12970
msgstr ""
12971
12972
#: en/help_topics/revisionspec.txt:145
12973
msgid ":before:"
12974
msgstr ""
12975
12976
#: en/help_topics/revisionspec.txt:147
12977
msgid ""
12978
" Supply any revision spec to return the parent of that revision. This "
12979
"is\n"
12980
" mostly useful when inspecting revisions that are not in the revision "
12981
"history\n"
12982
" of a branch."
12983
msgstr ""
12984
12985
#: en/help_topics/revisionspec.txt:151
12986
msgid ""
12987
" It is an error to request the parent of the null revision (before:0)."
12988
msgstr ""
12989
12990
#: en/help_topics/revisionspec.txt:155
12991
msgid ""
12992
" before:1913 -> Return the parent of revno 1913 (revno 1912)\n"
12993
" before:revid:aaaa@bbbb-1234567890 -> return the parent of revision\n"
12994
" aaaa@bbbb-1234567890\n"
12995
" bzr diff -r before:1913..1913\n"
12996
" -> Find the changes between revision 1913 and its parent "
12997
"(1912).\n"
12998
" (What changes did revision 1913 introduce).\n"
12999
" This is equivalent to: bzr diff -c 1913"
13000
msgstr ""
13001
13002
#: en/help_topics/revisionspec.txt:163
13003
msgid ":annotate:"
13004
msgstr ""
13005
13006
#: en/help_topics/revisionspec.txt:165
13007
msgid ""
13008
" Select the revision that last modified the specified line. Line is\n"
13009
" specified as path:number. Path is a relative path to the file. "
13010
"Numbers\n"
13011
" start at 1, and are relative to the current version, not the last-\n"
13012
" committed version of the file."
13013
msgstr ""
13014
13015
#: en/help_topics/revisionspec.txt:170
13016
msgid ":mainline:"
13017
msgstr ""
13018
13019
#: en/help_topics/revisionspec.txt:172
13020
msgid ""
13021
" Select the revision that merged the specified revision into mainline."
13022
msgstr ""
13023
13024
#: en/help_topics/revisionspec.txt:174
13025
msgid ":last:"
13026
msgstr ""
13027
13028
#: en/help_topics/revisionspec.txt:176
13029
msgid ""
13030
" Supply a positive number to get the nth revision from the end.\n"
13031
" This is the same as supplying negative numbers to the 'revno:' spec.\n"
13032
" Examples::"
13033
msgstr ""
13034
13035
#: en/help_topics/revisionspec.txt:180
13036
msgid ""
13037
" last:1 -> return the last revision\n"
13038
" last:3 -> return the revision 2 before the end.\n"
13039
msgstr ""
13040
13041
#: en/help_topics/rules.txt:1
13042
msgid ""
13043
"Rules\n"
13044
"====="
13045
msgstr ""
13046
13047
#: en/help_topics/rules.txt:7
13048
msgid ""
13049
"Rules are defined in ini file format where the sections are file glob\n"
13050
"patterns and the contents of each section are the preferences for files\n"
13051
"matching that pattern(s). For example::"
13052
msgstr ""
13053
13054
#: en/help_topics/rules.txt:11
13055
msgid ""
13056
" [name *.bat]\n"
13057
" eol = native"
13058
msgstr ""
13059
13060
#: en/help_topics/rules.txt:14
13061
msgid ""
13062
" [name *.html *.xml]\n"
13063
" keywords = xml_escape"
13064
msgstr ""
13065
13066
#: en/help_topics/rules.txt:17
13067
msgid ""
13068
"Preferences like these are useful for commands and plugins wishing to\n"
13069
"provide custom behaviour for selected files. For more information on \n"
13070
"end of line conversion see :doc:`eol-help`.\n"
13071
"Keyword support is provided by the `keywords plugin\n"
13072
"<http://doc.bazaar.canonical.com/plugins/en/keywords-plugin.html>`_."
13073
msgstr ""
13074
13075
#: en/help_topics/rules.txt:23
13076
msgid ""
13077
"Files\n"
13078
"-----"
13079
msgstr ""
13080
13081
#: en/help_topics/rules.txt:26
13082
msgid ""
13083
"Default rules for all branches are defined in the optional file\n"
13084
"``BZR_HOME/rules``. "
13085
msgstr ""
13086
13087
#: en/help_topics/rules.txt:29
13088
msgid ""
13089
"Rule Patterns\n"
13090
"-------------"
13091
msgstr ""
13092
13093
#: en/help_topics/rules.txt:32
13094
msgid ""
13095
"Patterns are ordered and searching stops as soon as one matches.\n"
13096
"As a consequence, more explicit patterns should be placed towards\n"
13097
"the top of the file. Rule patterns use exactly the same conventions\n"
13098
"as ignore patterns. See :doc:`patterns-help` for details."
13099
msgstr ""
13100
13101
#: en/help_topics/rules.txt:37
13102
msgid ".. note::"
13103
msgstr ""
13104
13105
#: en/help_topics/rules.txt:39
13106
msgid ""
13107
" Patterns containing square brackets or spaces should be\n"
13108
" surrounded in quotes to ensure they are correctly parsed.\n"
13109
msgstr ""
13110
13111
#: en/help_topics/topics.txt:1
13112
msgid ""
13113
"authentication Information on configuring authentication\n"
13114
"basic Basic commands\n"
13115
"branches Information on what a branch is\n"
13116
"bugs Bug tracker settings\n"
13117
"checkouts Information on what a checkout is\n"
13118
"commands Basic help for all commands\n"
13119
"configuration Details on the configuration settings available\n"
13120
"conflict-types Types of conflicts and what to do about them\n"
13121
"content-filters Conversion of content into/from working trees\n"
13122
"criss-cross Information on criss-cross merging\n"
13123
"current-formats Current storage formats\n"
13124
"debug-flags Options to show or record debug information\n"
13125
"diverged-branches How to fix diverged branches\n"
13126
"env-variables Environment variable names and values\n"
13127
"eol Information on end-of-line handling\n"
13128
"files Information on configuration and log files\n"
13129
"formats Information on choosing a storage format\n"
13130
"global-options Options that control how Bazaar runs\n"
13131
"hidden-commands All hidden commands\n"
13132
"hooks Points at which custom processing can be added\n"
13133
"launchpad Using Bazaar with Launchpad.net\n"
13134
"location-alias Aliases for remembered locations\n"
13135
"log-formats Details on the logging formats available\n"
13136
"other-formats Experimental and deprecated storage formats\n"
13137
"patterns Information on the pattern syntax\n"
13138
"repositories Basic information on shared repositories.\n"
13139
"revisionspec Explain how to use --revision\n"
13140
"rules Information on defining rule-based preferences\n"
13141
"standalone-trees Information on what a standalone tree is\n"
13142
"standard-options Options that can be used with any command\n"
13143
"status-flags Help on status flags\n"
13144
"sync-for-reconfigure Steps to resolve \"out-of-sync\" when reconfiguring\n"
13145
"topics Topics list\n"
13146
"url-special-chars Special character handling in URLs\n"
13147
"urlspec Supported transport protocols\n"
13148
"working-trees Information on working trees\n"
13149
msgstr ""
13150
13151
#: en/help_topics/url-special-chars.txt:1
13152
msgid ""
13153
"Special character handling in URLs\n"
13154
"=================================="
13155
msgstr ""
13156
13157
#: en/help_topics/url-special-chars.txt:4
13158
msgid "Bazaar allows locations to be specified in multiple ways, either:"
13159
msgstr ""
13160
13161
#: en/help_topics/url-special-chars.txt:6
13162
msgid " * Fully qualified URLs"
13163
msgstr ""
13164
13165
#: en/help_topics/url-special-chars.txt:8
13166
msgid " * File system paths, relative or absolute"
13167
msgstr ""
13168
13169
#: en/help_topics/url-special-chars.txt:10
13170
msgid ""
13171
"Internally bzr treats all locations as URLs. For any file system paths\n"
13172
"that are specified it will automatically determine the appropriate URL\n"
13173
"representation, and escape special characters where necessary."
13174
msgstr ""
13175
13176
#: en/help_topics/url-special-chars.txt:14
13177
msgid ""
13178
"There are a few characters which have special meaning in URLs and need "
13179
"careful\n"
13180
"handling to avoid ambiguities. Characters can be escaped with a % and a hex\n"
13181
"value in URLs. Any non-ASCII characters in a file path will automatically "
13182
"be\n"
13183
"urlencoded when the path is converted to a URL."
13184
msgstr ""
13185
13186
#: en/help_topics/url-special-chars.txt:19
13187
msgid ""
13188
"URLs represent non-ASCII characters in an encoding defined by the server, "
13189
"but\n"
13190
"usually UTF-8. The % escapes should be of the UTF-8 bytes. Bazaar tries to "
13191
"be\n"
13192
"generous in what it accepts as a URL and to print them in a way that\n"
13193
"will be readable."
13194
msgstr ""
13195
13196
#: en/help_topics/url-special-chars.txt:24
13197
msgid ""
13198
"For example, if you have a directory named '/tmp/%2False' these are all "
13199
"valid\n"
13200
"ways of accessing the content (0x2F, or 47, is the ASCII code for forward "
13201
"slash)::"
13202
msgstr ""
13203
13204
#: en/help_topics/url-special-chars.txt:27
13205
msgid ""
13206
" cd /tmp\n"
13207
" bzr log /tmp/%2False\n"
13208
" bzr log %2False\n"
13209
" bzr log file:///tmp/%252False\n"
13210
" bzr log file://localhost/tmp/%252False\n"
13211
" bzr log file:%252False"
13212
msgstr ""
13213
13214
#: en/help_topics/url-special-chars.txt:34
13215
msgid "These are valid but do not refer to the same file::"
13216
msgstr ""
13217
13218
#: en/help_topics/url-special-chars.txt:36
13219
msgid ""
13220
" bzr log file:///tmp/%2False (refers to a file called /tmp/\\/alse)\n"
13221
" bzr log %252False (refers to a file called /tmp/%252False)"
13222
msgstr ""
13223
13224
#: en/help_topics/url-special-chars.txt:39
13225
msgid ""
13226
"Comma also has special meaning in URLs, because it denotes `segment "
13227
"parameters`_"
13228
msgstr ""
13229
13230
#: en/help_topics/url-special-chars.txt:41
13231
msgid ""
13232
"_`segment parameters`: http://www.ietf.org/rfc/rfc3986.txt (section 3.3)"
13233
msgstr ""
13234
13235
#: en/help_topics/url-special-chars.txt:43
13236
msgid ""
13237
"Comma is also special in any file system paths that are specified. To use a "
13238
"literal\n"
13239
"comma in a file system path, specify a URL and URL encode the comma::"
13240
msgstr ""
13241
13242
#: en/help_topics/url-special-chars.txt:46
13243
msgid ""
13244
" bzr log foo,branch=bla # path \"foo\" with the segment parameter \"branch"
13245
"\" set to \"bla\"\n"
13246
" bzr log file:foo%2Cbranch=bla # path \"foo,branch=bla\"\n"
13247
" bzr log file:foo,branch=bla # path \"foo\" with segment parameter \"branch"
13248
"\" set to \"bla\"\n"
13249
msgstr ""
13250
13251
#: en/help_topics/urlspec.txt:1
13252
msgid "URL Identifiers"
13253
msgstr ""
13254
13255
#: en/help_topics/urlspec.txt:3
13256
msgid "Supported URL prefixes::"
13257
msgstr ""
13258
13259
#: en/help_topics/urlspec.txt:5
13260
msgid ""
13261
" aftp:// Access using active FTP.\n"
13262
" bzr:// Fast access using the Bazaar smart server.\n"
13263
" bzr+ssh:// Fast access using the Bazaar smart server over SSH.\n"
13264
" file:// Access using the standard filesystem (default)\n"
13265
" ftp:// Access using passive FTP.\n"
13266
" http:// Read-only access of branches exported on the web.\n"
13267
" https:// Read-only access of branches exported on the web using "
13268
"SSL.\n"
13269
" sftp:// Access using SFTP (most SSH servers provide SFTP)."
13270
msgstr ""
13271
13272
#: en/help_topics/urlspec.txt:14
13273
msgid "Supported modifiers::"
13274
msgstr ""
13275
13276
#: en/help_topics/urlspec.txt:16
13277
msgid " gio+ Access using any GIO supported protocols."
13278
msgstr ""
13279
13280
#: en/help_topics/urlspec.txt:18
13281
msgid "Bazaar supports all of the standard parts within the URL::"
13282
msgstr ""
13283
13284
#: en/help_topics/urlspec.txt:20
13285
msgid " <protocol>://[user[:password]@]host[:port]/[path]"
13286
msgstr ""
13287
13288
#: en/help_topics/urlspec.txt:22
13289
msgid "allowing URLs such as::"
13290
msgstr ""
13291
13292
#: en/help_topics/urlspec.txt:24
13293
msgid " http://bzruser:BadPass@bzr.example.com:8080/bzr/trunk"
13294
msgstr ""
13295
13296
#: en/help_topics/urlspec.txt:26
13297
msgid ""
13298
"For bzr+ssh:// and sftp:// URLs, Bazaar also supports paths that begin\n"
13299
"with '~' as meaning that the rest of the path should be interpreted\n"
13300
"relative to the remote user's home directory. For example if the user\n"
13301
"``remote`` has a home directory of ``/home/remote`` on the server\n"
13302
"shell.example.com, then::"
13303
msgstr ""
13304
13305
#: en/help_topics/urlspec.txt:32
13306
msgid " bzr+ssh://remote@shell.example.com/~/myproject/trunk"
13307
msgstr ""
13308
13309
#: en/help_topics/urlspec.txt:34
13310
msgid "would refer to ``/home/remote/myproject/trunk``."
13311
msgstr ""
13312
13313
#: en/help_topics/urlspec.txt:36
13314
msgid ""
13315
"Many commands that accept URLs also accept location aliases too.\n"
13316
"See :doc:`location-alias-help` and :doc:`url-special-chars-help`.\n"
13317
msgstr ""
Loggerhead is a web-based interface for Breezy
Version: 2.0.1