« back to all changes in this revision
Viewing changes to po/fr.po
- browse files at revision 6581.1.1
- compare with another revision
- compare with revision 3984.5.3
- download diff
- download tarball
- view history from revision 6581.1.1
- Committer: Vincent Ladeuil
- Date: 2013-07-27 10:54:05 UTC
- mfrom: (6093.4.218 bzr)
- mto: This revision was merged to the branch mainline in revision 6582.
- Revision ID: v.ladeuil+lp@free.fr-20130727105405-387zagx5ek6yprb1
Update translations
added
removed
po/fr.po
1
1
# French translation for bzr
2
# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
2
# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
3
3
# This file is distributed under the same license as the bzr package.
4
# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
4
# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
5
5
#
6
6
msgid ""
7
7
msgstr ""
8
8
"Project-Id-Version: bzr\n"
9
9
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
10
"POT-Creation-Date: 2012-02-02 17:39+0100\n"
11
"PO-Revision-Date: 2012-01-16 16:40+0000\n"
12
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
10
"POT-Creation-Date: 2012-07-10 11:35+0200\n"
11
"PO-Revision-Date: 2011-11-19 06:51+0000\n"
12
"Last-Translator: Nicolas Delvaux <Unknown>\n"
13
13
"Language-Team: French <fr@li.org>\n"
14
14
"MIME-Version: 1.0\n"
15
15
"Content-Type: text/plain; charset=UTF-8\n"
16
16
"Content-Transfer-Encoding: 8bit\n"
17
17
"Plural-Forms: nplurals=2; plural=n > 1;\n"
18
"X-Launchpad-Export-Date: 2012-02-04 06:19+0000\n"
19
"X-Generator: Launchpad (build 14738)\n"
18
"X-Launchpad-Export-Date: 2012-07-11 04:31+0000\n"
19
"X-Generator: Launchpad (build 15593)\n"
20
20
21
#: bzrlib/add.py:95
21
#: bzrlib/add.py:93
22
22
msgid "skipping {0} (larger than {1} of {2} bytes)"
23
23
msgstr ""
24
24
25
#: bzrlib/branch.py:872
25
#: bzrlib/branch.py:854
26
26
msgid "Unstacking"
27
27
msgstr "Dépilement"
28
28
29
#: bzrlib/branch.py:3205
29
#: bzrlib/branch.py:2955
30
30
#, python-format
31
31
msgid "Pushed up to revision %d."
32
32
msgstr "Publication jusqu'à la révision %d."
33
33
34
#: bzrlib/branch.py:3207
34
#: bzrlib/branch.py:2957
35
35
#, python-format
36
36
msgid "%d tag updated."
37
37
msgid_plural "%d tags updated."
38
38
msgstr[0] "%d étiquette mise à jour."
39
39
msgstr[1] "%d étiquettes mises à jour."
40
40
41
#: bzrlib/branch.py:3210
41
#: bzrlib/branch.py:2960
42
42
msgid "No new revisions or tags to push."
43
43
msgstr "Pas de nouvelles révisions ou étiquettes à publier."
44
44
45
#: bzrlib/branch.py:3212
45
#: bzrlib/branch.py:2962
46
46
msgid "No new revisions to push."
47
47
msgstr "Aucune nouvelle révision à envoyer."
48
48
49
#: bzrlib/branch.py:3232
49
#: bzrlib/branch.py:2982
50
50
msgid "checked branch {0} format {1}"
51
51
msgstr ""
52
52
53
#: bzrlib/branch.py:3235
53
#: bzrlib/branch.py:2985
54
54
#, python-format
55
55
msgid "found error:%s"
56
56
msgstr "erreur trouvée : %s"
57
57
58
#: bzrlib/builtins.py:209 bzrlib/builtins.py:3016 bzrlib/workingtree.py:315
58
#: bzrlib/builtins.py:251 bzrlib/builtins.py:3045 bzrlib/workingtree.py:323
59
59
#, python-format
60
60
msgid "Ignoring files outside view. View is %s"
61
61
msgstr ""
62
62
63
#: bzrlib/builtins.py:218
63
#: bzrlib/builtins.py:260
64
64
#, python-format
65
65
msgid "bzr %s --revision takes exactly one revision identifier"
66
66
msgstr ""
67
67
68
#: bzrlib/builtins.py:303
68
#: bzrlib/builtins.py:315
69
69
msgid "Display status summary."
70
70
msgstr ""
71
71
72
#: bzrlib/builtins.py:305
72
#: bzrlib/builtins.py:317
73
73
msgid ""
74
74
"This reports on versioned and unknown files, reporting them\n"
75
75
"grouped by state. Possible states are:"
77
77
"Ceci informe sur les fichiers versionnés et inconnus, regroupés\n"
78
78
"selon leur état. Les différents états sont :"
79
79
80
#: bzrlib/builtins.py:308
80
#: bzrlib/builtins.py:320
81
81
msgid ""
82
82
"added\n"
83
83
" Versioned in the working copy but not in the previous revision."
85
85
"ajouté\n"
86
86
" Versionné dans la copie de travail mais pas dans la révision précédente."
87
87
88
#: bzrlib/builtins.py:311
88
#: bzrlib/builtins.py:323
89
89
msgid ""
90
90
"removed\n"
91
91
" Versioned in the previous revision but removed or deleted\n"
95
95
" Versionné dans la révision précédente mais enlevé ou supprimé\n"
96
96
" de la copie de travail."
97
97
98
#: bzrlib/builtins.py:315
98
#: bzrlib/builtins.py:327
99
99
msgid ""
100
100
"renamed\n"
101
101
" Path of this file changed from the previous revision;\n"
108
108
"dont\n"
109
109
" le répertoire parent a été renommé."
110
110
111
#: bzrlib/builtins.py:320
111
#: bzrlib/builtins.py:332
112
112
msgid ""
113
113
"modified\n"
114
114
" Text has changed since the previous revision."
116
116
"modifié\n"
117
117
" Le texte a été modifié depuis la révision précédente."
118
118
119
#: bzrlib/builtins.py:323
119
#: bzrlib/builtins.py:335
120
120
msgid ""
121
121
"kind changed\n"
122
122
" File kind has been changed (e.g. from file to directory)."
124
124
"type modifié\n"
125
125
" le type du fichier a été modifiée (ex. de fichier à répertoire)."
126
126
127
#: bzrlib/builtins.py:326
127
#: bzrlib/builtins.py:338
128
128
msgid ""
129
129
"unknown\n"
130
130
" Not versioned and not matching an ignore pattern."
132
132
"inconnu\n"
133
133
" Non versionné et ne correspond pas à une règle d'exclusion."
134
134
135
#: bzrlib/builtins.py:329
135
#: bzrlib/builtins.py:341
136
136
msgid ""
137
137
"Additionally for directories, symlinks and files with a changed\n"
138
138
"executable bit, Bazaar indicates their type using a trailing\n"
140
140
"disabled using the '--no-classify' option."
141
141
msgstr ""
142
142
143
#: bzrlib/builtins.py:334
143
#: bzrlib/builtins.py:346
144
144
msgid ""
145
145
"To see ignored files use 'bzr ignored'. For details on the\n"
146
146
"changes to file texts, use 'bzr diff'."
149
149
"Pour le détail des modifications sur les fichiers textes,\n"
150
150
"utilisez « bzr diff »."
151
151
152
#: bzrlib/builtins.py:337
152
#: bzrlib/builtins.py:349
153
153
msgid ""
154
154
"Note that --short or -S gives status flags for each item, similar\n"
155
155
"to Subversion's status command. To get output similar to svn -q,\n"
156
156
"use bzr status -SV."
157
157
msgstr ""
158
158
159
#: bzrlib/builtins.py:341
159
#: bzrlib/builtins.py:353
160
160
msgid ""
161
161
"If no arguments are specified, the status of the entire working\n"
162
162
"directory is shown. Otherwise, only the status of the specified\n"
164
164
"is reported for everything inside that directory."
165
165
msgstr ""
166
166
167
#: bzrlib/builtins.py:346
167
#: bzrlib/builtins.py:358
168
168
msgid ""
169
169
"Before merges are committed, the pending merge tip revisions are\n"
170
170
"shown. To see all pending merge revisions, use the -v option.\n"
172
172
"the no-pending option or specify a file/directory."
173
173
msgstr ""
174
174
175
#: bzrlib/builtins.py:351
175
#: bzrlib/builtins.py:363
176
176
msgid ""
177
177
"To compare the working directory to a specific revision, pass a\n"
178
178
"single revision to the revision argument."
179
179
msgstr ""
180
180
181
#: bzrlib/builtins.py:354
181
#: bzrlib/builtins.py:366
182
182
msgid ""
183
183
"To see which files have changed in a specific revision, or between\n"
184
184
"two revisions, pass a revision range to the revision argument.\n"
185
185
"This will produce the same results as calling 'bzr diff --summarize'."
186
186
msgstr ""
187
187
188
#: bzrlib/builtins.py:363
188
#: bzrlib/builtins.py:375
189
189
msgid "Use short status indicators."
190
190
msgstr ""
191
191
192
#: bzrlib/builtins.py:365
192
#: bzrlib/builtins.py:377
193
193
msgid "Only show versioned files."
194
194
msgstr ""
195
195
196
#: bzrlib/builtins.py:367
196
#: bzrlib/builtins.py:379
197
197
msgid "Don't show pending merges."
198
198
msgstr ""
199
199
200
#: bzrlib/builtins.py:370
200
#: bzrlib/builtins.py:382
201
201
msgid "Do not mark object type using indicator."
202
202
msgstr ""
203
203
204
#: bzrlib/builtins.py:385
204
#: bzrlib/builtins.py:397
205
205
msgid "bzr status --revision takes exactly one or two revision specifiers"
206
206
msgstr ""
207
207
"bzr status --revision prend exactement un ou deux numéros de révision"
208
208
209
#: bzrlib/builtins.py:429 bzrlib/builtins.py:5183
209
#: bzrlib/builtins.py:441 bzrlib/builtins.py:5230
210
210
msgid "You can only supply one of revision_id or --revision"
211
211
msgstr ""
212
212
213
#: bzrlib/builtins.py:432 bzrlib/builtins.py:5185
213
#: bzrlib/builtins.py:444 bzrlib/builtins.py:5232
214
214
msgid "You must supply either --revision or a revision_id"
215
215
msgstr ""
216
216
217
#: bzrlib/builtins.py:439
217
#: bzrlib/builtins.py:451
218
218
#, python-format
219
219
msgid "Repository %r does not support access to raw revision texts"
220
220
msgstr ""
221
221
222
#: bzrlib/builtins.py:450
222
#: bzrlib/builtins.py:462
223
223
msgid "The repository {0} contains no revision {1}."
224
224
msgstr "Le répertoire {0} ne contient aucune révision {1}."
225
225
226
#: bzrlib/builtins.py:457
226
#: bzrlib/builtins.py:469
227
227
msgid "You cannot specify a NULL revision."
228
228
msgstr ""
229
229
230
#: bzrlib/builtins.py:549
230
#: bzrlib/builtins.py:561
231
231
msgid "Remove the working tree from a given branch/checkout."
232
232
msgstr ""
233
233
234
#: bzrlib/builtins.py:551
234
#: bzrlib/builtins.py:563
235
235
msgid ""
236
236
"Since a lightweight checkout is little more than a working tree\n"
237
237
"this will refuse to run against one."
238
238
msgstr ""
239
239
240
#: bzrlib/builtins.py:554
240
#: bzrlib/builtins.py:566
241
241
msgid "To re-create the working tree, use \"bzr checkout\"."
242
242
msgstr ""
243
243
244
#: bzrlib/builtins.py:560
244
#: bzrlib/builtins.py:572
245
245
msgid ""
246
246
"Remove the working tree even if it has uncommitted or shelved changes."
247
247
msgstr ""
248
248
249
#: bzrlib/builtins.py:574
249
#: bzrlib/builtins.py:586
250
250
msgid "No working tree to remove"
251
251
msgstr ""
252
252
253
#: bzrlib/builtins.py:576
253
#: bzrlib/builtins.py:588
254
254
msgid "You cannot remove the working tree of a remote path"
255
255
msgstr ""
256
256
257
#: bzrlib/builtins.py:585
257
#: bzrlib/builtins.py:597
258
258
msgid "You cannot remove the working tree from a lightweight checkout"
259
259
msgstr ""
260
260
261
#: bzrlib/builtins.py:625
261
#: bzrlib/builtins.py:637
262
262
msgid ""
263
263
"The tree does not appear to be corrupt. You probably want \"bzr revert\" "
264
264
"instead. Use \"--force\" if you are sure you want to reset the working tree."
265
265
msgstr ""
266
266
267
#: bzrlib/builtins.py:636
267
#: bzrlib/builtins.py:648
268
268
msgid ""
269
269
", the header appears corrupt, try passing -r -1 to set the state to the last "
270
270
"commit"
271
271
msgstr ""
272
272
273
#: bzrlib/builtins.py:640
273
#: bzrlib/builtins.py:652
274
274
msgid "failed to reset the tree state{0}"
275
275
msgstr ""
276
276
277
#: bzrlib/builtins.py:644
277
#: bzrlib/builtins.py:656
278
278
msgid "Show current revision number."
279
279
msgstr "Afficher le numéro de la révision actuelle."
280
280
281
#: bzrlib/builtins.py:646
281
#: bzrlib/builtins.py:658
282
282
msgid "This is equal to the number of revisions on this branch."
283
283
msgstr ""
284
284
285
#: bzrlib/builtins.py:659
285
#: bzrlib/builtins.py:671
286
286
msgid "--tree and --revision can not be used together"
287
287
msgstr ""
288
288
289
#: bzrlib/builtins.py:676 bzrlib/builtins.py:5967
289
#: bzrlib/builtins.py:688 bzrlib/builtins.py:5986
290
290
msgid "Tags can only be placed on a single revision, not on a range"
291
291
msgstr ""
292
292
293
#: bzrlib/builtins.py:700
293
#: bzrlib/builtins.py:712
294
294
msgid "Show revno of working tree."
295
295
msgstr ""
296
296
297
#: bzrlib/builtins.py:748
297
#: bzrlib/builtins.py:760
298
298
msgid "Add specified files or directories."
299
299
msgstr ""
300
300
301
#: bzrlib/builtins.py:750
301
#: bzrlib/builtins.py:762
302
302
msgid ""
303
303
"In non-recursive mode, all the named items are added, regardless\n"
304
304
"of whether they were previously ignored. A warning is given if\n"
305
305
"any of the named files are already versioned."
306
306
msgstr ""
307
307
308
#: bzrlib/builtins.py:754
308
#: bzrlib/builtins.py:766
309
309
msgid ""
310
310
"In recursive mode (the default), files are treated the same way\n"
311
311
"but the behaviour for directories is different. Directories that\n"
316
316
"directories. If no names are given '.' is assumed."
317
317
msgstr ""
318
318
319
#: bzrlib/builtins.py:762
319
#: bzrlib/builtins.py:774
320
320
msgid ""
321
321
"A warning will be printed when nested trees are encountered,\n"
322
322
"unless they are explicitly ignored."
323
323
msgstr ""
324
324
325
#: bzrlib/builtins.py:765
325
#: bzrlib/builtins.py:777
326
326
msgid ""
327
327
"Therefore simply saying 'bzr add' will version all files that\n"
328
328
"are currently unknown."
329
329
msgstr ""
330
330
331
#: bzrlib/builtins.py:768
331
#: bzrlib/builtins.py:780
332
332
msgid ""
333
333
"Adding a file whose parent directory is not versioned will\n"
334
334
"implicitly add the parent, and so on up to the root. This means\n"
336
336
"get added when you add a file in the directory."
337
337
msgstr ""
338
338
339
#: bzrlib/builtins.py:773
339
#: bzrlib/builtins.py:785
340
340
msgid ""
341
341
"--dry-run will show which files would be added, but not actually\n"
342
342
"add them."
343
343
msgstr ""
344
344
345
#: bzrlib/builtins.py:776
345
#: bzrlib/builtins.py:788
346
346
msgid ""
347
347
"--file-ids-from will try to use the file ids from the supplied path.\n"
348
348
"It looks up ids trying to find a matching parent directory with the\n"
353
353
"into a subdirectory of this one."
354
354
msgstr ""
355
355
356
#: bzrlib/builtins.py:784
356
#: bzrlib/builtins.py:796
357
357
msgid ""
358
358
"Any files matching patterns in the ignore list will not be added\n"
359
359
"unless they are explicitly mentioned."
360
360
msgstr ""
361
361
362
#: bzrlib/builtins.py:787
362
#: bzrlib/builtins.py:799
363
363
msgid ""
364
364
"In recursive mode, files larger than the configuration option \n"
365
365
"add.maximum_file_size will be skipped. Named items are never skipped due\n"
366
366
"to file size."
367
367
msgstr ""
368
368
369
#: bzrlib/builtins.py:794
369
#: bzrlib/builtins.py:806
370
370
msgid "Don't recursively add the contents of directories."
371
371
msgstr ""
372
372
373
#: bzrlib/builtins.py:800
373
#: bzrlib/builtins.py:813
374
374
msgid "Lookup file ids from this tree."
375
375
msgstr ""
376
376
377
#: bzrlib/builtins.py:836
377
#: bzrlib/builtins.py:849
378
378
msgid "ignored {0} matching \"{1}\"\n"
379
379
msgstr ""
380
380
381
#: bzrlib/builtins.py:841
381
#: bzrlib/builtins.py:854
382
382
msgid "Create a new versioned directory."
383
383
msgstr ""
384
384
385
#: bzrlib/builtins.py:843
385
#: bzrlib/builtins.py:856
386
386
msgid "This is equivalent to creating the directory and then adding it."
387
387
msgstr ""
388
388
389
#: bzrlib/builtins.py:850
389
#: bzrlib/builtins.py:863
390
390
msgid "No error if existing, make parent directories as needed."
391
391
msgstr ""
392
392
393
#: bzrlib/builtins.py:884
393
#: bzrlib/builtins.py:897
394
394
#, python-format
395
395
msgid "added %s\n"
396
396
msgstr "ajouté %s\n"
397
397
398
#: bzrlib/builtins.py:926
398
#: bzrlib/builtins.py:939
399
399
#, python-format
400
400
msgid "invalid kind %r specified"
401
401
msgstr ""
402
402
403
#: bzrlib/builtins.py:963
403
#: bzrlib/builtins.py:976
404
404
msgid "Move or rename a file."
405
405
msgstr "Déplacer ou renommer un fichier."
406
406
407
#: bzrlib/builtins.py:965
407
#: bzrlib/builtins.py:978
408
408
msgid " bzr mv SOURCE... DESTINATION"
409
409
msgstr ""
410
410
411
#: bzrlib/builtins.py:967
411
#: bzrlib/builtins.py:980
412
412
msgid ""
413
413
"If the last argument is a versioned directory, all the other names\n"
414
414
"are moved into it. Otherwise, there must be exactly two arguments\n"
415
415
"and the file is changed to a new name."
416
416
msgstr ""
417
417
418
#: bzrlib/builtins.py:971
418
#: bzrlib/builtins.py:984
419
419
msgid ""
420
420
"If OLDNAME does not exist on the filesystem but is versioned and\n"
421
421
"NEWNAME does exist on the filesystem but is not versioned, mv\n"
424
424
"The same is valid when moving many SOURCE files to a DESTINATION."
425
425
msgstr ""
426
426
427
#: bzrlib/builtins.py:977
427
#: bzrlib/builtins.py:990
428
428
msgid "Files cannot be moved between branches."
429
429
msgstr ""
430
430
431
#: bzrlib/builtins.py:984
431
#: bzrlib/builtins.py:997
432
432
msgid ""
433
433
"Move only the bzr identifier of the file, because the file has already been "
434
434
"moved."
435
435
msgstr ""
436
436
437
#: bzrlib/builtins.py:986
437
#: bzrlib/builtins.py:999
438
438
msgid "Automatically guess renames."
439
439
msgstr ""
440
440
441
#: bzrlib/builtins.py:987
441
#: bzrlib/builtins.py:1000
442
442
msgid "Avoid making changes when guessing renames."
443
443
msgstr ""
444
444
445
#: bzrlib/builtins.py:996
445
#: bzrlib/builtins.py:1009
446
446
msgid "--dry-run requires --auto."
447
447
msgstr ""
448
448
449
#: bzrlib/builtins.py:1000
449
#: bzrlib/builtins.py:1013
450
450
msgid "missing file argument"
451
451
msgstr ""
452
452
453
#: bzrlib/builtins.py:1004
453
#: bzrlib/builtins.py:1017
454
454
msgid "can not move root of branch"
455
455
msgstr ""
456
456
457
#: bzrlib/builtins.py:1010
457
#: bzrlib/builtins.py:1023
458
458
msgid "Only one path may be specified to --auto."
459
459
msgstr ""
460
460
461
#: bzrlib/builtins.py:1013
461
#: bzrlib/builtins.py:1026
462
462
msgid "--after cannot be specified with --auto."
463
463
msgstr ""
464
464
465
#: bzrlib/builtins.py:1050
465
#: bzrlib/builtins.py:1062
466
466
msgid "to mv multiple files the destination must be a versioned directory"
467
467
msgstr ""
468
468
469
#: bzrlib/builtins.py:1102
469
#: bzrlib/builtins.py:1114
470
470
msgid "Turn this branch into a mirror of another branch."
471
471
msgstr ""
472
472
473
#: bzrlib/builtins.py:1104
473
#: bzrlib/builtins.py:1116
474
474
msgid ""
475
475
"By default, this command only works on branches that have not diverged.\n"
476
476
"Branches are considered diverged if the destination branch's most recent \n"
478
478
"parent."
479
479
msgstr ""
480
480
481
#: bzrlib/builtins.py:1109
481
#: bzrlib/builtins.py:1121
482
482
msgid ""
483
483
"If branches have diverged, you can use 'bzr merge' to integrate the changes\n"
484
484
"from one into the other. Once one branch has merged, the other should\n"
485
485
"be able to pull it again."
486
486
msgstr ""
487
487
488
#: bzrlib/builtins.py:1113
488
#: bzrlib/builtins.py:1125
489
489
msgid ""
490
490
"If you want to replace your local changes and just want your branch to\n"
491
491
"match the remote one, use pull --overwrite. This will work even if the two\n"
492
492
"branches have diverged."
493
493
msgstr ""
494
494
495
#: bzrlib/builtins.py:1117
495
#: bzrlib/builtins.py:1129
496
496
msgid ""
497
497
"If there is no default location set, the first pull will set it (use\n"
498
498
"--no-remember to avoid setting it). After that, you can omit the\n"
500
500
"value will only be saved if the remote location can be accessed."
501
501
msgstr ""
502
502
503
#: bzrlib/builtins.py:1122
503
#: bzrlib/builtins.py:1134
504
504
msgid ""
505
505
"The --verbose option will display the revisions pulled using the log_format\n"
506
506
"configuration option. You can use a different format by overriding it with\n"
507
507
"-Olog_format=<other_format>."
508
508
msgstr ""
509
509
510
#: bzrlib/builtins.py:1126
510
#: bzrlib/builtins.py:1138
511
511
msgid ""
512
512
"Note: The location can be specified either in the form of a branch,\n"
513
513
"or in the form of a path to a file containing a merge directive generated\n"
514
514
"with bzr send."
515
515
msgstr ""
516
516
517
#: bzrlib/builtins.py:1134
517
#: bzrlib/builtins.py:1146
518
518
msgid "Show logs of pulled revisions."
519
519
msgstr ""
520
520
521
#: bzrlib/builtins.py:1136
521
#: bzrlib/builtins.py:1148
522
522
msgid ""
523
523
"Branch to pull into, rather than the one containing the working directory."
524
524
msgstr ""
525
525
526
#: bzrlib/builtins.py:1139
526
#: bzrlib/builtins.py:1151
527
527
msgid ""
528
528
"Perform a local pull in a bound branch. Local pulls are not applied to the "
529
529
"master branch."
530
530
msgstr ""
531
531
532
#: bzrlib/builtins.py:1168
532
#: bzrlib/builtins.py:1189
533
533
msgid "Need working tree for --show-base."
534
534
msgstr ""
535
535
536
#: bzrlib/builtins.py:1184
536
#: bzrlib/builtins.py:1205
537
537
msgid "No pull location known or specified."
538
538
msgstr ""
539
539
540
#: bzrlib/builtins.py:1190
540
#: bzrlib/builtins.py:1211
541
541
#, python-format
542
542
msgid "Using saved parent location: %s\n"
543
543
msgstr ""
544
544
545
#: bzrlib/builtins.py:1197 bzrlib/builtins.py:4393
545
#: bzrlib/builtins.py:1218 bzrlib/builtins.py:4425
546
546
msgid "Cannot use -r with merge directives or bundles"
547
547
msgstr ""
548
548
549
#: bzrlib/builtins.py:1238
549
#: bzrlib/builtins.py:1261
550
550
msgid "Update a mirror of this branch."
551
551
msgstr ""
552
552
553
#: bzrlib/builtins.py:1240
553
#: bzrlib/builtins.py:1263
554
554
msgid ""
555
555
"The target branch will not have its working tree populated because this\n"
556
556
"is both expensive, and is not supported on remote file systems."
557
557
msgstr ""
558
558
559
#: bzrlib/builtins.py:1243
559
#: bzrlib/builtins.py:1266
560
560
msgid ""
561
561
"Some smart servers or protocols *may* put the working tree in place in\n"
562
562
"the future."
563
563
msgstr ""
564
564
565
#: bzrlib/builtins.py:1246
565
#: bzrlib/builtins.py:1269
566
566
msgid ""
567
567
"This command only works on branches that have not diverged. Branches are\n"
568
568
"considered diverged if the destination branch's most recent commit is one\n"
569
569
"that has not been merged (directly or indirectly) by the source branch."
570
570
msgstr ""
571
571
572
#: bzrlib/builtins.py:1250
572
#: bzrlib/builtins.py:1273
573
573
msgid ""
574
574
"If branches have diverged, you can use 'bzr push --overwrite' to replace\n"
575
575
"the other branch completely, discarding its unmerged changes."
576
576
msgstr ""
577
577
578
#: bzrlib/builtins.py:1253
578
#: bzrlib/builtins.py:1276
579
579
msgid ""
580
580
"If you want to ensure you have the different changes in the other branch,\n"
581
581
"do a merge (see bzr help merge) from the other branch, and commit that.\n"
582
582
"After that you will be able to do a push without '--overwrite'."
583
583
msgstr ""
584
584
585
#: bzrlib/builtins.py:1257
585
#: bzrlib/builtins.py:1280
586
586
msgid ""
587
587
"If there is no default push location set, the first push will set it (use\n"
588
588
"--no-remember to avoid setting it). After that, you can omit the\n"
590
590
"value will only be saved if the remote location can be accessed."
591
591
msgstr ""
592
592
593
#: bzrlib/builtins.py:1262
593
#: bzrlib/builtins.py:1285
594
594
msgid ""
595
595
"The --verbose option will display the revisions pushed using the log_format\n"
596
596
"configuration option. You can use a different format by overriding it with\n"
597
597
"-Olog_format=<other_format>."
598
598
msgstr ""
599
599
600
#: bzrlib/builtins.py:1273 bzrlib/foreign.py:272
600
#: bzrlib/builtins.py:1296 bzrlib/foreign.py:272
601
601
msgid ""
602
602
"Branch to push from, rather than the one containing the working directory."
603
603
msgstr ""
604
604
605
#: bzrlib/builtins.py:1276
605
#: bzrlib/builtins.py:1299
606
606
msgid ""
607
607
"By default push will fail if the target directory exists, but does not "
608
608
"already have a control directory. This flag will allow push to proceed."
609
609
msgstr ""
610
610
611
#: bzrlib/builtins.py:1281
611
#: bzrlib/builtins.py:1304
612
612
msgid ""
613
613
"Create a stacked branch that references the public location of the parent "
614
614
"branch."
615
615
msgstr ""
616
616
617
#: bzrlib/builtins.py:1284
617
#: bzrlib/builtins.py:1307
618
618
msgid ""
619
619
"Create a stacked branch that refers to another branch for the commit "
620
620
"history. Only the work not present in the referenced branch is included in "
621
621
"the branch created."
622
622
msgstr ""
623
623
624
#: bzrlib/builtins.py:1289 bzrlib/foreign.py:279
624
#: bzrlib/builtins.py:1312 bzrlib/foreign.py:279
625
625
msgid ""
626
626
"Refuse to push if there are uncommitted changes in the working tree, --no-"
627
627
"strict disables the check."
628
628
msgstr ""
629
629
630
#: bzrlib/builtins.py:1292
630
#: bzrlib/builtins.py:1315
631
631
msgid "Don't populate the working tree, even for protocols that support it."
632
632
msgstr ""
633
633
634
#: bzrlib/builtins.py:1336
634
#: bzrlib/builtins.py:1318
635
msgid "Overwrite tags only."
636
msgstr ""
637
638
#: bzrlib/builtins.py:1369
635
639
msgid "Could not determine branch to refer to."
636
640
msgstr ""
637
641
638
#: bzrlib/builtins.py:1345
642
#: bzrlib/builtins.py:1378
639
643
#, python-format
640
644
msgid ""
641
645
"No push location known or specified. To push to the parent branch (at %s), "
642
646
"use 'bzr push :parent'."
643
647
msgstr ""
644
648
645
#: bzrlib/builtins.py:1351 bzrlib/foreign.py:306
649
#: bzrlib/builtins.py:1384 bzrlib/foreign.py:306
646
650
msgid "No push location known or specified."
647
651
msgstr ""
648
652
649
#: bzrlib/builtins.py:1355
653
#: bzrlib/builtins.py:1388
650
654
#, python-format
651
655
msgid "Using saved push location: %s"
652
656
msgstr ""
653
657
654
#: bzrlib/builtins.py:1365
658
#: bzrlib/builtins.py:1398
655
659
msgid "Create a new branch that is a copy of an existing branch."
656
660
msgstr ""
657
661
658
#: bzrlib/builtins.py:1367
662
#: bzrlib/builtins.py:1400
659
663
msgid ""
660
664
"If the TO_LOCATION is omitted, the last component of the FROM_LOCATION will\n"
661
665
"be used. In other words, \"branch ../foo/bar\" will attempt to create "
666
670
"create ./foo-bar."
667
671
msgstr ""
668
672
669
#: bzrlib/builtins.py:1374
673
#: bzrlib/builtins.py:1407
670
674
msgid ""
671
675
"To retrieve the branch as of a particular revision, supply the --revision\n"
672
676
"parameter, as in \"branch foo/bar -r 5\"."
673
677
msgstr ""
674
678
675
#: bzrlib/builtins.py:1377
679
#: bzrlib/builtins.py:1410
676
680
msgid "The synonyms 'clone' and 'get' for this command are deprecated."
677
681
msgstr ""
678
682
679
#: bzrlib/builtins.py:1387
683
#: bzrlib/builtins.py:1420
680
684
msgid "Create a branch without a working-tree."
681
685
msgstr ""
682
686
683
#: bzrlib/builtins.py:1389
687
#: bzrlib/builtins.py:1422
684
688
msgid "Switch the checkout in the current directory to the new branch."
685
689
msgstr ""
686
690
687
#: bzrlib/builtins.py:1392
691
#: bzrlib/builtins.py:1425
688
692
msgid ""
689
693
"Create a stacked branch referring to the source branch. The new branch will "
690
694
"depend on the availability of the source branch for all operations."
691
695
msgstr ""
692
696
693
#: bzrlib/builtins.py:1396
697
#: bzrlib/builtins.py:1429
694
698
msgid "Do not use a shared repository, even if available."
695
699
msgstr ""
696
700
697
#: bzrlib/builtins.py:1398
701
#: bzrlib/builtins.py:1431
698
702
msgid ""
699
703
"By default branch will fail if the target directory exists, but does not "
700
704
"already have a control directory. This flag will allow branch to proceed."
701
705
msgstr ""
702
706
703
#: bzrlib/builtins.py:1403
707
#: bzrlib/builtins.py:1436
704
708
msgid "Bind new branch to from location."
705
709
msgstr ""
706
710
707
#: bzrlib/builtins.py:1450
711
#: bzrlib/builtins.py:1483
708
712
#, python-format
709
713
msgid "Target directory \"%s\" already exists."
710
714
msgstr ""
711
715
712
#: bzrlib/builtins.py:1462
716
#: bzrlib/builtins.py:1495
713
717
#, python-format
714
718
msgid "Parent of \"%s\" does not exist."
715
719
msgstr ""
716
720
717
#: bzrlib/builtins.py:1481
721
#: bzrlib/builtins.py:1514
718
722
msgid "The branch {0} has no revision {1}."
719
723
msgstr ""
720
724
721
#: bzrlib/builtins.py:1496 bzrlib/push.py:53
725
#: bzrlib/builtins.py:1529 bzrlib/push.py:53
722
726
#, python-format
723
727
msgid "Created new stacked branch referring to %s."
724
728
msgstr ""
725
729
726
#: bzrlib/builtins.py:1500
730
#: bzrlib/builtins.py:1533
727
731
#, python-format
728
732
msgid "Branched %d revision."
729
733
msgid_plural "Branched %d revisions."
730
734
msgstr[0] ""
731
735
msgstr[1] ""
732
736
733
#: bzrlib/builtins.py:1505
737
#: bzrlib/builtins.py:1538
734
738
#, python-format
735
739
msgid "New branch bound to %s"
736
740
msgstr ""
737
741
738
#: bzrlib/builtins.py:1510 bzrlib/builtins.py:6256
742
#: bzrlib/builtins.py:1543 bzrlib/builtins.py:6280
739
743
#, python-format
740
744
msgid "Switched to branch: %s"
741
745
msgstr ""
742
746
743
#: bzrlib/builtins.py:1515
747
#: bzrlib/builtins.py:1548
744
748
msgid "List the branches available at the current location."
745
749
msgstr ""
746
750
747
#: bzrlib/builtins.py:1517
751
#: bzrlib/builtins.py:1550
748
752
msgid ""
749
753
"This command will print the names of all the branches at the current\n"
750
754
"location."
751
755
msgstr ""
752
756
753
#: bzrlib/builtins.py:1524
757
#: bzrlib/builtins.py:1557
754
758
msgid ""
755
759
"Recursively scan for branches rather than just looking in the specified "
756
760
"location."
757
761
msgstr ""
758
762
759
#: bzrlib/builtins.py:1554
763
#: bzrlib/builtins.py:1586
760
764
msgid "(default)"
761
765
msgstr ""
762
766
763
#: bzrlib/builtins.py:1566
767
#: bzrlib/builtins.py:1598
764
768
msgid "Create a new checkout of an existing branch."
765
769
msgstr ""
766
770
767
#: bzrlib/builtins.py:1568
771
#: bzrlib/builtins.py:1600
768
772
msgid ""
769
773
"If BRANCH_LOCATION is omitted, checkout will reconstitute a working tree "
770
774
"for\n"
774
778
"location using SFTP."
775
779
msgstr ""
776
780
777
#: bzrlib/builtins.py:1573
781
#: bzrlib/builtins.py:1605
778
782
msgid ""
779
783
"If the TO_LOCATION is omitted, the last component of the BRANCH_LOCATION "
780
784
"will\n"
786
790
"create ./foo-bar."
787
791
msgstr ""
788
792
789
#: bzrlib/builtins.py:1580
793
#: bzrlib/builtins.py:1612
790
794
msgid ""
791
795
"To retrieve the branch as of a particular revision, supply the --revision\n"
792
796
"parameter, as in \"checkout foo/bar -r 5\". Note that this will be "
796
800
"code.)"
797
801
msgstr ""
798
802
799
#: bzrlib/builtins.py:1590
803
#: bzrlib/builtins.py:1622
800
804
msgid ""
801
805
"Perform a lightweight checkout. Lightweight checkouts depend on access to "
802
806
"the branch for every operation. Normal checkouts can perform common "
804
808
"commits."
805
809
msgstr ""
806
810
807
#: bzrlib/builtins.py:1597
811
#: bzrlib/builtins.py:1629
808
812
msgid "Get file contents from this tree."
809
813
msgstr ""
810
814
811
#: bzrlib/builtins.py:1599
815
#: bzrlib/builtins.py:1631
812
816
msgid "Hard-link working tree files where possible."
813
817
msgstr ""
814
818
815
#: bzrlib/builtins.py:1640
819
#: bzrlib/builtins.py:1672
816
820
msgid ""
817
821
"Show list of renamed files.\n"
818
822
" "
819
823
msgstr ""
820
824
821
#: bzrlib/builtins.py:1670
825
#: bzrlib/builtins.py:1700
822
826
msgid "Update a working tree to a new revision."
823
827
msgstr ""
824
828
825
#: bzrlib/builtins.py:1672
829
#: bzrlib/builtins.py:1702
826
830
msgid ""
827
831
"This will perform a merge of the destination revision (the tip of the\n"
828
832
"branch, or the specified revision) into the working tree, and then make\n"
829
833
"that revision the basis revision for the working tree. "
830
834
msgstr ""
831
835
832
#: bzrlib/builtins.py:1676
836
#: bzrlib/builtins.py:1706
833
837
msgid ""
834
838
"You can use this to visit an older revision, or to update a working tree\n"
835
839
"that is out of date from its branch."
836
840
msgstr ""
837
841
838
#: bzrlib/builtins.py:1679
842
#: bzrlib/builtins.py:1709
839
843
msgid ""
840
844
"If there are any uncommitted changes in the tree, they will be carried\n"
841
845
"across and remain as uncommitted changes after the update. To discard\n"
843
847
"with the changes brought in by the change in basis revision."
844
848
msgstr ""
845
849
846
#: bzrlib/builtins.py:1684
850
#: bzrlib/builtins.py:1714
847
851
msgid ""
848
852
"If the tree's branch is bound to a master branch, bzr will also update\n"
849
853
"the branch from the master."
850
854
msgstr ""
851
855
852
#: bzrlib/builtins.py:1687
856
#: bzrlib/builtins.py:1717
853
857
msgid ""
854
858
"You cannot update just a single file or directory, because each Bazaar\n"
855
859
"working tree has just a single basis revision. If you want to restore a\n"
859
863
"out the old content of that file to a new location."
860
864
msgstr ""
861
865
862
#: bzrlib/builtins.py:1694
866
#: bzrlib/builtins.py:1724
863
867
msgid ""
864
868
"The 'dir' argument, if given, must be the location of the root of a\n"
865
869
"working tree to update. By default, the working tree that contains the \n"
866
870
"current working directory is used."
867
871
msgstr ""
868
872
869
#: bzrlib/builtins.py:1710
873
#: bzrlib/builtins.py:1740
870
874
msgid "bzr update --revision takes exactly one revision"
871
875
msgstr ""
872
876
873
#: bzrlib/builtins.py:1718
877
#: bzrlib/builtins.py:1748
874
878
msgid "bzr update can only update a whole tree, not a file or subdirectory"
875
879
msgstr ""
876
880
877
#: bzrlib/builtins.py:1749
881
#: bzrlib/builtins.py:1779
878
882
msgid "Tree is up to date at revision {0} of branch {1}"
879
883
msgstr ""
880
884
881
#: bzrlib/builtins.py:1765
885
#: bzrlib/builtins.py:1795
882
886
#, python-format
883
887
msgid ""
884
888
"branch has no revision %s\n"
885
889
"bzr update --revision only works for a revision in the branch history"
886
890
msgstr ""
887
891
888
#: bzrlib/builtins.py:1771
892
#: bzrlib/builtins.py:1801
889
893
msgid "Updated to revision {0} of branch {1}"
890
894
msgstr ""
891
895
892
#: bzrlib/builtins.py:1775
896
#: bzrlib/builtins.py:1805
893
897
msgid ""
894
898
"Your local commits will now show as pending merges with 'bzr status', and "
895
899
"can be committed with 'bzr commit'."
896
900
msgstr ""
897
901
898
#: bzrlib/builtins.py:1784
902
#: bzrlib/builtins.py:1814
899
903
msgid "Show information about a working tree, branch or repository."
900
904
msgstr ""
901
905
902
#: bzrlib/builtins.py:1786
906
#: bzrlib/builtins.py:1816
903
907
msgid ""
904
908
"This command will show all known locations and formats associated to the\n"
905
909
"tree, branch or repository."
906
910
msgstr ""
907
911
908
#: bzrlib/builtins.py:1789
912
#: bzrlib/builtins.py:1819
909
913
msgid ""
910
914
"In verbose mode, statistical information is included with each report.\n"
911
915
"To see extended statistic information, use a verbosity level of 2 or\n"
912
916
"higher by specifying the verbose option multiple times, e.g. -vv."
913
917
msgstr ""
914
918
915
#: bzrlib/builtins.py:1793
919
#: bzrlib/builtins.py:1823
916
920
msgid "Branches and working trees will also report any missing revisions."
917
921
msgstr ""
918
922
919
#: bzrlib/builtins.py:1795 bzrlib/builtins.py:3715 bzrlib/builtins.py:4845
920
#: bzrlib/builtins.py:6442
923
#: bzrlib/builtins.py:1825 bzrlib/builtins.py:3744 bzrlib/builtins.py:4885
924
#: bzrlib/builtins.py:6466
921
925
msgid ":Examples:"
922
926
msgstr ""
923
927
924
#: bzrlib/builtins.py:1797
928
#: bzrlib/builtins.py:1827
925
929
msgid " Display information on the format and related locations:"
926
930
msgstr ""
927
931
928
#: bzrlib/builtins.py:1799
932
#: bzrlib/builtins.py:1829
929
933
msgid " bzr info"
930
934
msgstr ""
931
935
932
#: bzrlib/builtins.py:1801
936
#: bzrlib/builtins.py:1831
933
937
msgid ""
934
938
" Display the above together with extended format information and\n"
935
939
" basic statistics (like the number of files in the working tree and\n"
936
940
" number of revisions in the branch and repository):"
937
941
msgstr ""
938
942
939
#: bzrlib/builtins.py:1805
943
#: bzrlib/builtins.py:1835
940
944
msgid " bzr info -v"
941
945
msgstr ""
942
946
943
#: bzrlib/builtins.py:1807
947
#: bzrlib/builtins.py:1837
944
948
msgid " Display the above together with number of committers to the branch:"
945
949
msgstr ""
946
950
947
#: bzrlib/builtins.py:1809
951
#: bzrlib/builtins.py:1839
948
952
msgid " bzr info -vv"
949
953
msgstr ""
950
954
951
#: bzrlib/builtins.py:1828
955
#: bzrlib/builtins.py:1858
952
956
msgid "Remove files or directories."
953
957
msgstr ""
954
958
955
#: bzrlib/builtins.py:1830
959
#: bzrlib/builtins.py:1860
956
960
msgid ""
957
961
"This makes Bazaar stop tracking changes to the specified files. Bazaar will\n"
958
962
"delete them if they can easily be recovered using revert otherwise they\n"
959
"will be backed up (adding an extention of the form .~#~). If no options or\n"
963
"will be backed up (adding an extension of the form .~#~). If no options or\n"
960
964
"parameters are given Bazaar will scan for files that are being tracked by\n"
961
965
"Bazaar but missing in your tree and stop tracking them for you."
962
966
msgstr ""
963
967
964
#: bzrlib/builtins.py:1838
968
#: bzrlib/builtins.py:1868
965
969
msgid "Only remove files that have never been committed."
966
970
msgstr ""
967
971
968
#: bzrlib/builtins.py:1840
972
#: bzrlib/builtins.py:1870
969
973
msgid "The file deletion mode to be used."
970
974
msgstr ""
971
975
972
#: bzrlib/builtins.py:1841
976
#: bzrlib/builtins.py:1871
973
977
msgid "Deletion Strategy"
974
978
msgstr ""
975
979
976
#: bzrlib/builtins.py:1842
980
#: bzrlib/builtins.py:1872
977
981
msgid "Backup changed files (default)."
978
982
msgstr ""
979
983
980
#: bzrlib/builtins.py:1843
984
#: bzrlib/builtins.py:1873
981
985
msgid "Delete from bzr but leave the working copy."
982
986
msgstr ""
983
987
984
#: bzrlib/builtins.py:1844
988
#: bzrlib/builtins.py:1874
985
989
msgid "Don't backup changed files."
986
990
msgstr ""
987
991
988
#: bzrlib/builtins.py:1845
992
#: bzrlib/builtins.py:1875
989
993
msgid ""
990
994
"Delete all the specified files, even if they can not be recovered and even "
991
995
"if they are non-empty directories. (deprecated, use no-backup)"
992
996
msgstr ""
993
997
994
#: bzrlib/builtins.py:1854
998
#: bzrlib/builtins.py:1884
995
999
msgid "(The --force option is deprecated, rather use --no-backup in future.)"
996
1000
msgstr ""
997
1001
998
#: bzrlib/builtins.py:1871
1002
#: bzrlib/builtins.py:1901
999
1003
msgid "No matching files."
1000
1004
msgstr ""
1001
1005
1002
#: bzrlib/builtins.py:1932
1006
#: bzrlib/builtins.py:1962
1003
1007
msgid "Reconcile bzr metadata in a branch."
1004
1008
msgstr ""
1005
1009
1006
#: bzrlib/builtins.py:1934
1010
#: bzrlib/builtins.py:1964
1007
1011
msgid ""
1008
1012
"This can correct data mismatches that may have been caused by\n"
1009
1013
"previous ghost operations or bzr upgrades. You should only\n"
1011
1015
"advises you to run it."
1012
1016
msgstr ""
1013
1017
1014
#: bzrlib/builtins.py:1939
1018
#: bzrlib/builtins.py:1969
1015
1019
msgid ""
1016
1020
"If a second branch is provided, cross-branch reconciliation is\n"
1017
1021
"also attempted, which will check that data like the tree root\n"
1019
1023
"correctly in both branches."
1020
1024
msgstr ""
1021
1025
1022
#: bzrlib/builtins.py:1944
1026
#: bzrlib/builtins.py:1974
1023
1027
msgid ""
1024
1028
"At the same time it is run it may recompress data resulting in\n"
1025
1029
"a potential saving in disk space or performance gain."
1026
1030
msgstr ""
1027
1031
1028
#: bzrlib/builtins.py:1947
1032
#: bzrlib/builtins.py:1977
1029
1033
msgid "The branch *MUST* be on a listable system such as local disk or sftp."
1030
1034
msgstr ""
1031
1035
1032
#: bzrlib/builtins.py:2014 bzrlib/builtins.py:2132 bzrlib/builtins.py:3750
1036
#: bzrlib/builtins.py:2044 bzrlib/builtins.py:2162 bzrlib/builtins.py:3779
1033
1037
msgid ""
1034
1038
"Format for the bzr 2.0 series.\n"
1035
1039
"Uses group-compress storage.\n"
1036
1040
"Provides rich roots which are a one-way transition.\n"
1037
1041
msgstr ""
1038
1042
1039
#: bzrlib/builtins.py:2014 bzrlib/builtins.py:2132 bzrlib/builtins.py:3750
1043
#: bzrlib/builtins.py:2044 bzrlib/builtins.py:2162 bzrlib/builtins.py:3779
1040
1044
msgid ""
1041
1045
"Pack-based format used in 1.x series. Introduced in 0.92. Interoperates with "
1042
1046
"bzr repositories before 0.92 but cannot be read by bzr < 0.92. "
1043
1047
msgstr ""
1044
1048
1045
#: bzrlib/builtins.py:2014 bzrlib/builtins.py:2132 bzrlib/builtins.py:3750
1049
#: bzrlib/builtins.py:2044 bzrlib/builtins.py:2162 bzrlib/builtins.py:3779
1046
1050
msgid "The 2a format with experimental support for colocated branches.\n"
1047
1051
msgstr ""
1048
1052
1049
#: bzrlib/builtins.py:2015
1053
#: bzrlib/builtins.py:2045
1050
1054
msgid "Make a directory into a versioned branch."
1051
1055
msgstr ""
1052
1056
1053
#: bzrlib/builtins.py:2017
1057
#: bzrlib/builtins.py:2047
1054
1058
msgid ""
1055
1059
"Use this to create an empty branch, or before importing an\n"
1056
1060
"existing project."
1057
1061
msgstr ""
1058
1062
1059
#: bzrlib/builtins.py:2020
1063
#: bzrlib/builtins.py:2050
1060
1064
msgid ""
1061
1065
"If there is a repository in a parent directory of the location, then\n"
1062
1066
"the history of the branch will be stored in the repository. Otherwise\n"
1064
1068
"in the .bzr directory."
1065
1069
msgstr ""
1066
1070
1067
#: bzrlib/builtins.py:2025
1071
#: bzrlib/builtins.py:2055
1068
1072
msgid ""
1069
1073
"If there is already a branch at the location but it has no working tree,\n"
1070
1074
"the tree can be populated with 'bzr checkout'."
1071
1075
msgstr ""
1072
1076
1073
#: bzrlib/builtins.py:2028
1077
#: bzrlib/builtins.py:2058
1074
1078
msgid "Recipe for importing a tree of files::"
1075
1079
msgstr ""
1076
1080
1077
#: bzrlib/builtins.py:2030
1081
#: bzrlib/builtins.py:2060
1078
1082
msgid ""
1079
1083
" cd ~/project\n"
1080
1084
" bzr init\n"
1083
1087
" bzr commit -m \"imported project\""
1084
1088
msgstr ""
1085
1089
1086
#: bzrlib/builtins.py:2041
1090
#: bzrlib/builtins.py:2071
1087
1091
msgid ""
1088
1092
"Create the path leading up to the branch if it does not already exist."
1089
1093
msgstr ""
1090
1094
1091
#: bzrlib/builtins.py:2044
1095
#: bzrlib/builtins.py:2074
1092
1096
msgid "Specify a format for this branch. See \"help formats\"."
1093
1097
msgstr ""
1094
1098
1095
#: bzrlib/builtins.py:2052
1099
#: bzrlib/builtins.py:2082
1096
1100
msgid ""
1097
1101
"Never change revnos or the existing log. Append revisions to it only."
1098
1102
msgstr ""
1099
1103
1100
#: bzrlib/builtins.py:2055
1104
#: bzrlib/builtins.py:2085
1101
1105
msgid "Create a branch without a working tree."
1102
1106
msgstr ""
1103
1107
1104
#: bzrlib/builtins.py:2075 bzrlib/push.py:110
1108
#: bzrlib/builtins.py:2105 bzrlib/push.py:110
1105
1109
#, python-format
1106
1110
msgid ""
1107
1111
"Parent directory of %s does not exist.\n"
1108
1112
"You may supply --create-prefix to create all leading parent directories."
1109
1113
msgstr ""
1110
1114
1111
#: bzrlib/builtins.py:2109
1115
#: bzrlib/builtins.py:2139
1112
1116
msgid ""
1113
1117
"This branch format cannot be set to append-revisions-only. Try --default."
1114
1118
msgstr ""
1115
1119
1116
#: bzrlib/builtins.py:2120
1120
#: bzrlib/builtins.py:2150
1117
1121
msgid "Created a {0} (format: {1})\n"
1118
1122
msgstr ""
1119
1123
1120
#: bzrlib/builtins.py:2129
1124
#: bzrlib/builtins.py:2159
1121
1125
#, python-format
1122
1126
msgid "Using shared repository: %s\n"
1123
1127
msgstr ""
1124
1128
1125
#: bzrlib/builtins.py:2133
1129
#: bzrlib/builtins.py:2163
1126
1130
msgid "Create a shared repository for branches to share storage space."
1127
1131
msgstr ""
1128
1132
1129
#: bzrlib/builtins.py:2135
1133
#: bzrlib/builtins.py:2165
1130
1134
msgid ""
1131
1135
"New branches created under the repository directory will store their\n"
1132
1136
"revisions in the repository, not in the branch directory. For branches\n"
1134
1138
"speeds up the creation of new branches."
1135
1139
msgstr ""
1136
1140
1137
#: bzrlib/builtins.py:2140
1141
#: bzrlib/builtins.py:2170
1138
1142
msgid ""
1139
1143
"If the --no-trees option is given then the branches in the repository\n"
1140
1144
"will not have working trees by default. They will still exist as \n"
1144
1148
"branches, such as on a server."
1145
1149
msgstr ""
1146
1150
1147
#: bzrlib/builtins.py:2147
1151
#: bzrlib/builtins.py:2177
1148
1152
msgid ""
1149
1153
":Examples:\n"
1150
1154
" Create a shared repository holding just branches::"
1151
1155
msgstr ""
1152
1156
1153
#: bzrlib/builtins.py:2150
1157
#: bzrlib/builtins.py:2180
1154
1158
msgid ""
1155
1159
" bzr init-repo --no-trees repo\n"
1156
1160
" bzr init repo/trunk"
1157
1161
msgstr ""
1158
1162
1159
#: bzrlib/builtins.py:2153
1163
#: bzrlib/builtins.py:2183
1160
1164
msgid " Make a lightweight checkout elsewhere::"
1161
1165
msgstr ""
1162
1166
1163
#: bzrlib/builtins.py:2155
1167
#: bzrlib/builtins.py:2185
1164
1168
msgid ""
1165
1169
" bzr checkout --lightweight repo/trunk trunk-checkout\n"
1166
1170
" cd trunk-checkout\n"
1167
1171
" (add files here)"
1168
1172
msgstr ""
1169
1173
1170
#: bzrlib/builtins.py:2163
1174
#: bzrlib/builtins.py:2193
1171
1175
msgid ""
1172
1176
"Specify a format for this repository. See \"bzr help formats\" for details."
1173
1177
msgstr ""
1174
1178
1175
#: bzrlib/builtins.py:2167
1179
#: bzrlib/builtins.py:2197
1176
1180
msgid "Repository format"
1177
1181
msgstr ""
1178
1182
1179
#: bzrlib/builtins.py:2169
1183
#: bzrlib/builtins.py:2199
1180
1184
msgid "Branches in the repository will default to not having a working tree."
1181
1185
msgstr ""
1182
1186
1183
#: bzrlib/builtins.py:2195
1187
#: bzrlib/builtins.py:2225
1184
1188
msgid "Show differences in the working tree, between revisions or branches."
1185
1189
msgstr ""
1186
1190
1187
#: bzrlib/builtins.py:2197
1191
#: bzrlib/builtins.py:2227
1188
1192
msgid ""
1189
1193
"If no arguments are given, all changes for the current tree are listed.\n"
1190
1194
"If files are given, only the changes in those files are listed.\n"
1194
1198
"given."
1195
1199
msgstr ""
1196
1200
1197
#: bzrlib/builtins.py:2204
1201
#: bzrlib/builtins.py:2234
1198
1202
msgid ""
1199
1203
"\"bzr diff -p1\" is equivalent to \"bzr diff --prefix old/:new/\", and\n"
1200
1204
"produces patches suitable for \"patch -p1\"."
1201
1205
msgstr ""
1202
1206
1203
#: bzrlib/builtins.py:2207
1207
#: bzrlib/builtins.py:2237
1204
1208
msgid ""
1205
1209
"Note that when using the -r argument with a range of revisions, the\n"
1206
1210
"differences are computed between the two specified revisions. That\n"
1210
1214
"in the range."
1211
1215
msgstr ""
1212
1216
1213
#: bzrlib/builtins.py:2214
1217
#: bzrlib/builtins.py:2244
1214
1218
msgid ""
1215
1219
":Exit values:\n"
1216
1220
" 1 - changed\n"
1219
1223
" 0 - no change"
1220
1224
msgstr ""
1221
1225
1222
#: bzrlib/builtins.py:2220
1226
#: bzrlib/builtins.py:2250
1223
1227
msgid ""
1224
1228
":Examples:\n"
1225
1229
" Shows the difference in the working tree versus the last commit::"
1226
1230
msgstr ""
1227
1231
1228
#: bzrlib/builtins.py:2223
1232
#: bzrlib/builtins.py:2253
1229
1233
msgid " bzr diff"
1230
1234
msgstr ""
1231
1235
1232
#: bzrlib/builtins.py:2225
1236
#: bzrlib/builtins.py:2255
1233
1237
msgid " Difference between the working tree and revision 1::"
1234
1238
msgstr ""
1235
1239
1236
#: bzrlib/builtins.py:2227
1240
#: bzrlib/builtins.py:2257
1237
1241
msgid " bzr diff -r1"
1238
1242
msgstr ""
1239
1243
1240
#: bzrlib/builtins.py:2229
1244
#: bzrlib/builtins.py:2259
1241
1245
msgid " Difference between revision 3 and revision 1::"
1242
1246
msgstr ""
1243
1247
1244
#: bzrlib/builtins.py:2231
1248
#: bzrlib/builtins.py:2261
1245
1249
msgid " bzr diff -r1..3"
1246
1250
msgstr ""
1247
1251
1248
#: bzrlib/builtins.py:2233
1252
#: bzrlib/builtins.py:2263
1249
1253
msgid " Difference between revision 3 and revision 1 for branch xxx::"
1250
1254
msgstr ""
1251
1255
1252
#: bzrlib/builtins.py:2235
1256
#: bzrlib/builtins.py:2265
1253
1257
msgid " bzr diff -r1..3 xxx"
1254
1258
msgstr ""
1255
1259
1256
#: bzrlib/builtins.py:2237
1260
#: bzrlib/builtins.py:2267
1257
1261
msgid " The changes introduced by revision 2 (equivalent to -r1..2)::"
1258
1262
msgstr ""
1259
1263
1260
#: bzrlib/builtins.py:2239
1264
#: bzrlib/builtins.py:2269
1261
1265
msgid " bzr diff -c2"
1262
1266
msgstr ""
1263
1267
1264
#: bzrlib/builtins.py:2241
1268
#: bzrlib/builtins.py:2271
1265
1269
msgid ""
1266
1270
" To see the changes introduced by revision X::\n"
1267
1271
" \n"
1268
1272
" bzr diff -cX"
1269
1273
msgstr ""
1270
1274
1271
#: bzrlib/builtins.py:2245
1275
#: bzrlib/builtins.py:2275
1272
1276
msgid ""
1273
1277
" Note that in the case of a merge, the -c option shows the changes\n"
1274
1278
" compared to the left hand parent. To see the changes against\n"
1275
1279
" another parent, use::"
1276
1280
msgstr ""
1277
1281
1278
#: bzrlib/builtins.py:2249
1282
#: bzrlib/builtins.py:2279
1279
1283
msgid " bzr diff -r<chosen_parent>..X"
1280
1284
msgstr ""
1281
1285
1282
#: bzrlib/builtins.py:2251
1286
#: bzrlib/builtins.py:2281
1283
1287
msgid ""
1284
1288
" The changes between the current revision and the previous revision\n"
1285
1289
" (equivalent to -c-1 and -r-2..-1)"
1286
1290
msgstr ""
1287
1291
1288
#: bzrlib/builtins.py:2254
1292
#: bzrlib/builtins.py:2284
1289
1293
msgid " bzr diff -r-2.."
1290
1294
msgstr ""
1291
1295
1292
#: bzrlib/builtins.py:2256
1296
#: bzrlib/builtins.py:2286
1293
1297
msgid " Show just the differences for file NEWS::"
1294
1298
msgstr ""
1295
1299
1296
#: bzrlib/builtins.py:2258
1300
#: bzrlib/builtins.py:2288
1297
1301
msgid " bzr diff NEWS"
1298
1302
msgstr ""
1299
1303
1300
#: bzrlib/builtins.py:2260
1304
#: bzrlib/builtins.py:2290
1301
1305
msgid " Show the differences in working tree xxx for file NEWS::"
1302
1306
msgstr ""
1303
1307
1304
#: bzrlib/builtins.py:2262
1308
#: bzrlib/builtins.py:2292
1305
1309
msgid " bzr diff xxx/NEWS"
1306
1310
msgstr ""
1307
1311
1308
#: bzrlib/builtins.py:2264
1312
#: bzrlib/builtins.py:2294
1309
1313
msgid " Show the differences from branch xxx to this working tree:"
1310
1314
msgstr ""
1311
1315
1312
#: bzrlib/builtins.py:2266
1316
#: bzrlib/builtins.py:2296
1313
1317
msgid " bzr diff --old xxx"
1314
1318
msgstr ""
1315
1319
1316
#: bzrlib/builtins.py:2268
1320
#: bzrlib/builtins.py:2298
1317
1321
msgid " Show the differences between two branches for file NEWS::"
1318
1322
msgstr ""
1319
1323
1320
#: bzrlib/builtins.py:2270
1324
#: bzrlib/builtins.py:2300
1321
1325
msgid " bzr diff --old xxx --new yyy NEWS"
1322
1326
msgstr ""
1323
1327
1324
#: bzrlib/builtins.py:2272
1328
#: bzrlib/builtins.py:2302
1325
1329
msgid " Same as 'bzr diff' but prefix paths with old/ and new/::"
1326
1330
msgstr ""
1327
1331
1328
#: bzrlib/builtins.py:2274
1332
#: bzrlib/builtins.py:2304
1329
1333
msgid ""
1330
1334
" bzr diff --prefix old/:new/\n"
1331
1335
" \n"
1334
1338
" bzr diff --using /usr/bin/diff --diff-options -wu"
1335
1339
msgstr ""
1336
1340
1337
#: bzrlib/builtins.py:2284
1341
#: bzrlib/builtins.py:2314
1338
1342
msgid "Pass these options to the external diff program."
1339
1343
msgstr ""
1340
1344
1341
#: bzrlib/builtins.py:2287
1345
#: bzrlib/builtins.py:2317
1342
1346
msgid ""
1343
1347
"Set prefixes added to old and new filenames, as two values separated by a "
1344
1348
"colon. (eg \"old/:new/\")."
1345
1349
msgstr ""
1346
1350
1347
#: bzrlib/builtins.py:2290
1351
#: bzrlib/builtins.py:2320
1348
1352
msgid "Branch/tree to compare from."
1349
1353
msgstr ""
1350
1354
1351
#: bzrlib/builtins.py:2294
1355
#: bzrlib/builtins.py:2324
1352
1356
msgid "Branch/tree to compare to."
1353
1357
msgstr ""
1354
1358
1355
#: bzrlib/builtins.py:2300
1359
#: bzrlib/builtins.py:2330
1356
1360
msgid "Use this command to compare files."
1357
1361
msgstr ""
1358
1362
1359
#: bzrlib/builtins.py:2305
1363
#: bzrlib/builtins.py:2335
1360
1364
msgid "Diff format to use."
1361
1365
msgstr ""
1362
1366
1363
#: bzrlib/builtins.py:2307
1367
#: bzrlib/builtins.py:2337
1364
1368
msgid "Diff format"
1365
1369
msgstr ""
1366
1370
1367
#: bzrlib/builtins.py:2329
1371
#: bzrlib/builtins.py:2359
1368
1372
msgid "--prefix expects two values separated by a colon (eg \"old/:new/\")"
1369
1373
msgstr ""
1370
1374
1371
#: bzrlib/builtins.py:2333
1375
#: bzrlib/builtins.py:2363
1372
1376
msgid "bzr diff --revision takes exactly one or two revision specifiers"
1373
1377
msgstr ""
1374
1378
1375
#: bzrlib/builtins.py:2338 bzrlib/builtins.py:2736 bzrlib/builtins.py:2749
1376
#: bzrlib/builtins.py:2757 bzrlib/builtins.py:4919
1379
#: bzrlib/builtins.py:2368 bzrlib/builtins.py:2765 bzrlib/builtins.py:2778
1380
#: bzrlib/builtins.py:2786 bzrlib/builtins.py:4959
1377
1381
msgid "{0} and {1} are mutually exclusive"
1378
1382
msgstr ""
1379
1383
1380
#: bzrlib/builtins.py:2358
1384
#: bzrlib/builtins.py:2388
1381
1385
msgid ""
1382
1386
"List files deleted in the working tree.\n"
1383
1387
" "
1384
1388
msgstr ""
1385
1389
1386
#: bzrlib/builtins.py:2436
1390
#: bzrlib/builtins.py:2465
1387
1391
msgid "Show the tree root directory."
1388
1392
msgstr ""
1389
1393
1390
#: bzrlib/builtins.py:2438
1394
#: bzrlib/builtins.py:2467
1391
1395
msgid ""
1392
1396
"The root is the nearest enclosing directory with a .bzr control\n"
1393
1397
"directory."
1394
1398
msgstr ""
1395
1399
1396
#: bzrlib/builtins.py:2453
1400
#: bzrlib/builtins.py:2482
1397
1401
msgid "The limit argument must be an integer."
1398
1402
msgstr ""
1399
1403
1400
#: bzrlib/builtins.py:2461
1404
#: bzrlib/builtins.py:2490
1401
1405
msgid "The levels argument must be an integer."
1402
1406
msgstr ""
1403
1407
1404
#: bzrlib/builtins.py:2466
1408
#: bzrlib/builtins.py:2495
1405
1409
msgid "Show historical log for a branch or subset of a branch."
1406
1410
msgstr ""
1407
1411
1408
#: bzrlib/builtins.py:2468
1412
#: bzrlib/builtins.py:2497
1409
1413
msgid ""
1410
1414
"log is bzr's default tool for exploring the history of a branch.\n"
1411
1415
"The branch to use is taken from the first parameter. If no parameters\n"
1413
1417
"Here are some simple examples::"
1414
1418
msgstr ""
1415
1419
1416
#: bzrlib/builtins.py:2473
1420
#: bzrlib/builtins.py:2502
1417
1421
msgid ""
1418
1422
" bzr log log the current branch\n"
1419
1423
" bzr log foo.py log a file in its branch\n"
1420
1424
" bzr log http://server/branch log a branch on a server"
1421
1425
msgstr ""
1422
1426
1423
#: bzrlib/builtins.py:2477
1427
#: bzrlib/builtins.py:2506
1424
1428
msgid ""
1425
1429
"The filtering, ordering and information shown for each revision can\n"
1426
1430
"be controlled as explained below. By default, all revisions are\n"
1430
1434
"were merged."
1431
1435
msgstr ""
1432
1436
1433
#: bzrlib/builtins.py:2484
1437
#: bzrlib/builtins.py:2513
1434
1438
msgid ":Output control:"
1435
1439
msgstr ""
1436
1440
1437
#: bzrlib/builtins.py:2486
1441
#: bzrlib/builtins.py:2515
1438
1442
msgid ""
1439
1443
" The log format controls how information about each revision is\n"
1440
1444
" displayed. The standard log formats are called ``long``, ``short``\n"
1442
1446
" for more details on log formats."
1443
1447
msgstr ""
1444
1448
1445
#: bzrlib/builtins.py:2491
1449
#: bzrlib/builtins.py:2520
1446
1450
msgid ""
1447
1451
" The following options can be used to control what information is\n"
1448
1452
" displayed::"
1449
1453
msgstr ""
1450
1454
1451
#: bzrlib/builtins.py:2494
1455
#: bzrlib/builtins.py:2523
1452
1456
msgid ""
1453
1457
" -l N display a maximum of N revisions\n"
1454
1458
" -n N display N levels of revisions (0 for all, 1 for collapsed)\n"
1457
1461
" --show-ids display revision-ids (and file-ids), not just revnos"
1458
1462
msgstr ""
1459
1463
1460
#: bzrlib/builtins.py:2500
1464
#: bzrlib/builtins.py:2529
1461
1465
msgid ""
1462
1466
" Note that the default number of levels to display is a function of the\n"
1463
1467
" log format. If the -n option is not used, the standard log formats show\n"
1464
1468
" just the top level (mainline)."
1465
1469
msgstr ""
1466
1470
1467
#: bzrlib/builtins.py:2504
1471
#: bzrlib/builtins.py:2533
1468
1472
msgid ""
1469
1473
" Status summaries are shown using status flags like A, M, etc. To see\n"
1470
1474
" the changes explained using words like ``added`` and ``modified``\n"
1471
1475
" instead, use the -vv option."
1472
1476
msgstr ""
1473
1477
1474
#: bzrlib/builtins.py:2508
1478
#: bzrlib/builtins.py:2537
1475
1479
msgid ":Ordering control:"
1476
1480
msgstr ""
1477
1481
1478
#: bzrlib/builtins.py:2510
1482
#: bzrlib/builtins.py:2539
1479
1483
msgid ""
1480
1484
" To display revisions from oldest to newest, use the --forward option.\n"
1481
1485
" In most cases, using this option will have little impact on the total\n"
1483
1487
" display revisions like --reverse does when it can."
1484
1488
msgstr ""
1485
1489
1486
#: bzrlib/builtins.py:2515
1490
#: bzrlib/builtins.py:2544
1487
1491
msgid ":Revision filtering:"
1488
1492
msgstr ""
1489
1493
1490
#: bzrlib/builtins.py:2517
1494
#: bzrlib/builtins.py:2546
1491
1495
msgid ""
1492
1496
" The -r option can be used to specify what revision or range of revisions\n"
1493
1497
" to filter against. The various forms are shown below::"
1494
1498
msgstr ""
1495
1499
1496
#: bzrlib/builtins.py:2520
1500
#: bzrlib/builtins.py:2549
1497
1501
msgid ""
1498
1502
" -rX display revision X\n"
1499
1503
" -rX.. display revision X and later\n"
1501
1505
" -rX..Y display from X to Y inclusive"
1502
1506
msgstr ""
1503
1507
1504
#: bzrlib/builtins.py:2525
1508
#: bzrlib/builtins.py:2554
1505
1509
msgid ""
1506
1510
" See ``bzr help revisionspec`` for details on how to specify X and Y.\n"
1507
1511
" Some common examples are given below::"
1508
1512
msgstr ""
1509
1513
1510
#: bzrlib/builtins.py:2528
1514
#: bzrlib/builtins.py:2557
1511
1515
msgid ""
1512
1516
" -r-1 show just the tip\n"
1513
1517
" -r-10.. show the last 10 mainline revisions\n"
1517
1521
" -rdate:yesterday.. show changes since yesterday"
1518
1522
msgstr ""
1519
1523
1520
#: bzrlib/builtins.py:2535
1524
#: bzrlib/builtins.py:2564
1521
1525
msgid ""
1522
1526
" When logging a range of revisions using -rX..Y, log starts at\n"
1523
1527
" revision Y and searches back in history through the primary\n"
1527
1531
" a nested merge revision and the log will be truncated accordingly."
1528
1532
msgstr ""
1529
1533
1530
#: bzrlib/builtins.py:2542
1534
#: bzrlib/builtins.py:2571
1531
1535
msgid ":Path filtering:"
1532
1536
msgstr ""
1533
1537
1534
#: bzrlib/builtins.py:2544
1538
#: bzrlib/builtins.py:2573
1535
1539
msgid ""
1536
1540
" If parameters are given and the first one is not a branch, the log\n"
1537
1541
" will be filtered to show only those revisions that changed the\n"
1538
1542
" nominated files or directories."
1539
1543
msgstr ""
1540
1544
1541
#: bzrlib/builtins.py:2548
1545
#: bzrlib/builtins.py:2577
1542
1546
msgid ""
1543
1547
" Filenames are interpreted within their historical context. To log a\n"
1544
1548
" deleted file, specify a revision range so that the file existed at\n"
1545
1549
" the end or start of the range."
1546
1550
msgstr ""
1547
1551
1548
#: bzrlib/builtins.py:2552
1552
#: bzrlib/builtins.py:2581
1549
1553
msgid ""
1550
1554
" Historical context is also important when interpreting pathnames of\n"
1551
1555
" renamed files/directories. Consider the following example:"
1552
1556
msgstr ""
1553
1557
1554
#: bzrlib/builtins.py:2555
1558
#: bzrlib/builtins.py:2584
1555
1559
msgid ""
1556
1560
" * revision 1: add tutorial.txt\n"
1557
1561
" * revision 2: modify tutorial.txt\n"
1558
1562
" * revision 3: rename tutorial.txt to guide.txt; add tutorial.txt"
1559
1563
msgstr ""
1560
1564
1561
#: bzrlib/builtins.py:2559
1565
#: bzrlib/builtins.py:2588
1562
1566
msgid " In this case:"
1563
1567
msgstr ""
1564
1568
1565
#: bzrlib/builtins.py:2561
1569
#: bzrlib/builtins.py:2590
1566
1570
msgid " * ``bzr log guide.txt`` will log the file added in revision 1"
1567
1571
msgstr ""
1568
1572
1569
#: bzrlib/builtins.py:2563
1573
#: bzrlib/builtins.py:2592
1570
1574
msgid ""
1571
1575
" * ``bzr log tutorial.txt`` will log the new file added in revision 3"
1572
1576
msgstr ""
1573
1577
1574
#: bzrlib/builtins.py:2565
1578
#: bzrlib/builtins.py:2594
1575
1579
msgid ""
1576
1580
" * ``bzr log -r2 -p tutorial.txt`` will show the changes made to\n"
1577
1581
" the original file in revision 2."
1578
1582
msgstr ""
1579
1583
1580
#: bzrlib/builtins.py:2568
1584
#: bzrlib/builtins.py:2597
1581
1585
msgid ""
1582
1586
" * ``bzr log -r2 -p guide.txt`` will display an error message as there\n"
1583
1587
" was no file called guide.txt in revision 2."
1584
1588
msgstr ""
1585
1589
1586
#: bzrlib/builtins.py:2571
1590
#: bzrlib/builtins.py:2600
1587
1591
msgid ""
1588
1592
" Renames are always followed by log. By design, there is no need to\n"
1589
1593
" explicitly ask for this (and no way to stop logging a file back\n"
1590
1594
" until it was last renamed)."
1591
1595
msgstr ""
1592
1596
1593
#: bzrlib/builtins.py:2575
1597
#: bzrlib/builtins.py:2604
1594
1598
msgid ":Other filtering:"
1595
1599
msgstr ""
1596
1600
1597
#: bzrlib/builtins.py:2577
1601
#: bzrlib/builtins.py:2606
1598
1602
msgid ""
1599
1603
" The --match option can be used for finding revisions that match a\n"
1600
1604
" regular expression in a commit message, committer, author or bug.\n"
1603
1607
" --match-message can be used to only match a specific field."
1604
1608
msgstr ""
1605
1609
1606
#: bzrlib/builtins.py:2583
1610
#: bzrlib/builtins.py:2612
1607
1611
msgid ":Tips & tricks:"
1608
1612
msgstr ""
1609
1613
1610
#: bzrlib/builtins.py:2585
1614
#: bzrlib/builtins.py:2614
1611
1615
msgid ""
1612
1616
" GUI tools and IDEs are often better at exploring history than command\n"
1613
1617
" line tools: you may prefer qlog or viz from qbzr or bzr-gtk, the\n"
1616
1620
" <http://wiki.bazaar.canonical.com/IDEIntegration>. "
1617
1621
msgstr ""
1618
1622
1619
#: bzrlib/builtins.py:2591
1623
#: bzrlib/builtins.py:2620
1620
1624
msgid ""
1621
1625
" You may find it useful to add the aliases below to ``bazaar.conf``::"
1622
1626
msgstr ""
1623
1627
1624
#: bzrlib/builtins.py:2593
1628
#: bzrlib/builtins.py:2622
1625
1629
msgid ""
1626
1630
" [ALIASES]\n"
1627
1631
" tip = log -r-1\n"
1629
1633
" show = log -v -p"
1630
1634
msgstr ""
1631
1635
1632
#: bzrlib/builtins.py:2598
1636
#: bzrlib/builtins.py:2627
1633
1637
msgid ""
1634
1638
" ``bzr tip`` will then show the latest revision while ``bzr top``\n"
1635
1639
" will show the last 10 mainline revisions. To see the details of a\n"
1636
1640
" particular revision X, ``bzr show -rX``."
1637
1641
msgstr ""
1638
1642
1639
#: bzrlib/builtins.py:2602
1643
#: bzrlib/builtins.py:2631
1640
1644
msgid ""
1641
1645
" If you are interested in looking deeper into a particular merge X,\n"
1642
1646
" use ``bzr log -n0 -rX``."
1643
1647
msgstr ""
1644
1648
1645
#: bzrlib/builtins.py:2605
1649
#: bzrlib/builtins.py:2634
1646
1650
msgid ""
1647
1651
" ``bzr log -v`` on a branch with lots of history is currently\n"
1648
1652
" very slow. A fix for this issue is currently under development.\n"
1650
1654
" be given when using the -v option."
1651
1655
msgstr ""
1652
1656
1653
#: bzrlib/builtins.py:2610
1657
#: bzrlib/builtins.py:2639
1654
1658
msgid ""
1655
1659
" bzr has a generic full-text matching plugin, bzr-search, that can be\n"
1656
1660
" used to find revisions matching user names, commit messages, etc.\n"
1658
1662
" a list of words but not others."
1659
1663
msgstr ""
1660
1664
1661
#: bzrlib/builtins.py:2615
1665
#: bzrlib/builtins.py:2644
1662
1666
msgid ""
1663
1667
" When exploring non-mainline history on large projects with deep\n"
1664
1668
" history, the performance of log can be greatly improved by installing\n"
1666
1670
" trading disk space for faster speed."
1667
1671
msgstr ""
1668
1672
1669
#: bzrlib/builtins.py:2624
1673
#: bzrlib/builtins.py:2653
1670
1674
msgid "Show from oldest to newest."
1671
1675
msgstr ""
1672
1676
1673
#: bzrlib/builtins.py:2627
1677
#: bzrlib/builtins.py:2656
1674
1678
msgid "Show files changed in each revision."
1675
1679
msgstr ""
1676
1680
1677
#: bzrlib/builtins.py:2633
1681
#: bzrlib/builtins.py:2662
1678
1682
msgid "Show just the specified revision. See also \"help revisionspec\"."
1679
1683
msgstr ""
1680
1684
1681
#: bzrlib/builtins.py:2637
1685
#: bzrlib/builtins.py:2666
1682
1686
msgid "What names to list as authors - first, all or committer."
1683
1687
msgstr ""
1684
1688
1685
#: bzrlib/builtins.py:2638
1689
#: bzrlib/builtins.py:2667
1686
1690
msgid "Authors"
1687
1691
msgstr ""
1688
1692
1689
#: bzrlib/builtins.py:2643
1693
#: bzrlib/builtins.py:2672
1690
1694
msgid "Number of levels to display - 0 for all, 1 for flat."
1691
1695
msgstr ""
1692
1696
1693
#: bzrlib/builtins.py:2653
1697
#: bzrlib/builtins.py:2682
1694
1698
msgid "Limit the output to the first N revisions."
1695
1699
msgstr ""
1696
1700
1697
#: bzrlib/builtins.py:2658
1701
#: bzrlib/builtins.py:2687
1698
1702
msgid "Show changes made in each revision as a patch."
1699
1703
msgstr ""
1700
1704
1701
#: bzrlib/builtins.py:2660
1705
#: bzrlib/builtins.py:2689
1702
1706
msgid "Show merged revisions like --levels 0 does."
1703
1707
msgstr ""
1704
1708
1705
#: bzrlib/builtins.py:2664
1709
#: bzrlib/builtins.py:2693
1706
1710
msgid "Do not report commits with more than one parent."
1707
1711
msgstr ""
1708
1712
1709
#: bzrlib/builtins.py:2666
1713
#: bzrlib/builtins.py:2695
1710
1714
msgid ""
1711
1715
"Display only the revisions that are not part of both ancestries (require -"
1712
1716
"rX..Y)."
1713
1717
msgstr ""
1714
1718
1715
#: bzrlib/builtins.py:2670
1719
#: bzrlib/builtins.py:2699
1716
1720
msgid "Show digital signature validity."
1717
1721
msgstr ""
1718
1722
1719
#: bzrlib/builtins.py:2673
1723
#: bzrlib/builtins.py:2702
1720
1724
msgid "Show revisions whose properties match this expression."
1721
1725
msgstr ""
1722
1726
1723
#: bzrlib/builtins.py:2677
1727
#: bzrlib/builtins.py:2706
1724
1728
msgid "Show revisions whose message matches this expression."
1725
1729
msgstr ""
1726
1730
1727
#: bzrlib/builtins.py:2681
1731
#: bzrlib/builtins.py:2710
1728
1732
msgid "Show revisions whose committer matches this expression."
1729
1733
msgstr ""
1730
1734
1731
#: bzrlib/builtins.py:2685
1735
#: bzrlib/builtins.py:2714
1732
1736
msgid "Show revisions whose authors match this expression."
1733
1737
msgstr ""
1734
1738
1735
#: bzrlib/builtins.py:2689
1739
#: bzrlib/builtins.py:2718
1736
1740
msgid "Show revisions whose bugs match this expression."
1737
1741
msgstr ""
1738
1742
1739
#: bzrlib/builtins.py:2743
1743
#: bzrlib/builtins.py:2772
1740
1744
msgid "--exclude-common-ancestry requires -r with two revisions"
1741
1745
msgstr ""
1742
1746
1743
#: bzrlib/builtins.py:2771
1747
#: bzrlib/builtins.py:2800
1744
1748
#, python-format
1745
1749
msgid "Path unknown at end or start of revision range: %s"
1746
1750
msgstr ""
1747
1751
1748
#: bzrlib/builtins.py:2888
1752
#: bzrlib/builtins.py:2917
1749
1753
#, python-format
1750
1754
msgid "bzr %s doesn't accept two revisions in different branches."
1751
1755
msgstr ""
1752
1756
1753
#: bzrlib/builtins.py:2904
1757
#: bzrlib/builtins.py:2933
1754
1758
#, python-format
1755
1759
msgid "bzr %s --revision takes one or two values."
1756
1760
msgstr ""
1757
1761
1758
#: bzrlib/builtins.py:2949
1762
#: bzrlib/builtins.py:2978
1759
1763
msgid ""
1760
1764
"List files in a tree.\n"
1761
1765
" "
1762
1766
msgstr ""
1763
1767
1764
#: bzrlib/builtins.py:2958
1768
#: bzrlib/builtins.py:2987
1765
1769
msgid "Recurse into subdirectories."
1766
1770
msgstr ""
1767
1771
1768
#: bzrlib/builtins.py:2960
1772
#: bzrlib/builtins.py:2989
1769
1773
msgid "Print paths relative to the root of the branch."
1770
1774
msgstr ""
1771
1775
1772
#: bzrlib/builtins.py:2962
1776
#: bzrlib/builtins.py:2991
1773
1777
msgid "Print unknown files."
1774
1778
msgstr ""
1775
1779
1776
#: bzrlib/builtins.py:2963
1780
#: bzrlib/builtins.py:2992
1777
1781
msgid "Print versioned files."
1778
1782
msgstr ""
1779
1783
1780
#: bzrlib/builtins.py:2966
1784
#: bzrlib/builtins.py:2995
1781
1785
msgid "Print ignored files."
1782
1786
msgstr ""
1783
1787
1784
#: bzrlib/builtins.py:2968
1788
#: bzrlib/builtins.py:2997
1785
1789
msgid "List entries of a particular kind: file, directory, symlink."
1786
1790
msgstr ""
1787
1791
1788
#: bzrlib/builtins.py:2981
1792
#: bzrlib/builtins.py:3010
1789
1793
msgid "invalid kind specified"
1790
1794
msgstr ""
1791
1795
1792
#: bzrlib/builtins.py:2984
1796
#: bzrlib/builtins.py:3013
1793
1797
msgid "Cannot set both --verbose and --null"
1794
1798
msgstr ""
1795
1799
1796
#: bzrlib/builtins.py:2993
1800
#: bzrlib/builtins.py:3022
1797
1801
msgid "cannot specify both --from-root and PATH"
1798
1802
msgstr ""
1799
1803
1800
#: bzrlib/builtins.py:3080
1804
#: bzrlib/builtins.py:3109
1801
1805
msgid "Ignore specified files or patterns."
1802
1806
msgstr ""
1803
1807
1804
#: bzrlib/builtins.py:3082
1808
#: bzrlib/builtins.py:3111
1805
1809
msgid "See ``bzr help patterns`` for details on the syntax of patterns."
1806
1810
msgstr ""
1807
1811
1808
#: bzrlib/builtins.py:3084
1812
#: bzrlib/builtins.py:3113
1809
1813
msgid ""
1810
1814
"If a .bzrignore file does not exist, the ignore command\n"
1811
1815
"will create one and add the specified files or patterns to the newly\n"
1814
1818
"the use of the ignore command will require an explicit add command."
1815
1819
msgstr ""
1816
1820
1817
#: bzrlib/builtins.py:3090
1821
#: bzrlib/builtins.py:3119
1818
1822
msgid ""
1819
1823
"To remove patterns from the ignore list, edit the .bzrignore file.\n"
1820
1824
"After adding, editing or deleting that file either indirectly by\n"
1822
1826
"it."
1823
1827
msgstr ""
1824
1828
1825
#: bzrlib/builtins.py:3095
1829
#: bzrlib/builtins.py:3124
1826
1830
msgid ""
1827
1831
"Bazaar also supports a global ignore file ~/.bazaar/ignore. On Windows\n"
1828
1832
"the global ignore file can be found in the application data directory as\n"
1831
1835
"can be edited directly using an editor."
1832
1836
msgstr ""
1833
1837
1834
#: bzrlib/builtins.py:3101
1838
#: bzrlib/builtins.py:3130
1835
1839
msgid ""
1836
1840
"Patterns prefixed with '!' are exceptions to ignore patterns and take\n"
1837
1841
"precedence over regular ignores. Such exceptions are used to specify\n"
1838
1842
"files that should be versioned which would otherwise be ignored."
1839
1843
msgstr ""
1840
1844
1841
#: bzrlib/builtins.py:3105
1845
#: bzrlib/builtins.py:3134
1842
1846
msgid ""
1843
1847
"Patterns prefixed with '!!' act as regular ignore patterns, but have\n"
1844
1848
"precedence over the '!' exception patterns."
1845
1849
msgstr ""
1846
1850
1847
#: bzrlib/builtins.py:3108
1851
#: bzrlib/builtins.py:3137
1848
1852
msgid ""
1849
1853
":Notes: \n"
1850
1854
" \n"
1852
1856
" the shell on Unix."
1853
1857
msgstr ""
1854
1858
1855
#: bzrlib/builtins.py:3113
1859
#: bzrlib/builtins.py:3142
1856
1860
msgid ""
1857
1861
"* Ignore patterns starting with \"#\" act as comments in the ignore file.\n"
1858
1862
" To ignore patterns that begin with that character, use the \"RE:\" prefix."
1859
1863
msgstr ""
1860
1864
1861
#: bzrlib/builtins.py:3116
1865
#: bzrlib/builtins.py:3145
1862
1866
msgid ""
1863
1867
":Examples:\n"
1864
1868
" Ignore the top level Makefile::"
1865
1869
msgstr ""
1866
1870
1867
#: bzrlib/builtins.py:3119
1871
#: bzrlib/builtins.py:3148
1868
1872
msgid " bzr ignore ./Makefile"
1869
1873
msgstr ""
1870
1874
1871
#: bzrlib/builtins.py:3121
1875
#: bzrlib/builtins.py:3150
1872
1876
msgid " Ignore .class files in all directories...::"
1873
1877
msgstr ""
1874
1878
1875
#: bzrlib/builtins.py:3123
1879
#: bzrlib/builtins.py:3152
1876
1880
msgid " bzr ignore \"*.class\""
1877
1881
msgstr ""
1878
1882
1879
#: bzrlib/builtins.py:3125
1883
#: bzrlib/builtins.py:3154
1880
1884
msgid " ...but do not ignore \"special.class\"::"
1881
1885
msgstr ""
1882
1886
1883
#: bzrlib/builtins.py:3127
1887
#: bzrlib/builtins.py:3156
1884
1888
msgid " bzr ignore \"!special.class\""
1885
1889
msgstr ""
1886
1890
1887
#: bzrlib/builtins.py:3129
1891
#: bzrlib/builtins.py:3158
1888
1892
msgid " Ignore files whose name begins with the \"#\" character::"
1889
1893
msgstr ""
1890
1894
1891
#: bzrlib/builtins.py:3131
1895
#: bzrlib/builtins.py:3160
1892
1896
msgid " bzr ignore \"RE:^#\""
1893
1897
msgstr ""
1894
1898
1895
#: bzrlib/builtins.py:3133 bzrlib/builtins.py:3137
1899
#: bzrlib/builtins.py:3162 bzrlib/builtins.py:3166
1896
1900
msgid " Ignore .o files under the lib directory::"
1897
1901
msgstr ""
1898
1902
1899
#: bzrlib/builtins.py:3135
1903
#: bzrlib/builtins.py:3164
1900
1904
msgid " bzr ignore \"lib/**/*.o\""
1901
1905
msgstr ""
1902
1906
1903
#: bzrlib/builtins.py:3139
1907
#: bzrlib/builtins.py:3168
1904
1908
msgid " bzr ignore \"RE:lib/.*\\.o\""
1905
1909
msgstr ""
1906
1910
1907
#: bzrlib/builtins.py:3141
1911
#: bzrlib/builtins.py:3170
1908
1912
msgid " Ignore everything but the \"debian\" toplevel directory::"
1909
1913
msgstr ""
1910
1914
1911
#: bzrlib/builtins.py:3143
1915
#: bzrlib/builtins.py:3172
1912
1916
msgid ""
1913
1917
" bzr ignore \"RE:(?!debian/).*\"\n"
1914
1918
" \n"
1920
1924
" bzr ignore \"!!*~\""
1921
1925
msgstr ""
1922
1926
1923
#: bzrlib/builtins.py:3157
1927
#: bzrlib/builtins.py:3186
1924
1928
msgid "Display the default ignore rules that bzr uses."
1925
1929
msgstr ""
1926
1930
1927
#: bzrlib/builtins.py:3169
1931
#: bzrlib/builtins.py:3198
1928
1932
msgid "ignore requires at least one NAME_PATTERN or --default-rules."
1929
1933
msgstr ""
1930
1934
1931
#: bzrlib/builtins.py:3180
1935
#: bzrlib/builtins.py:3209
1932
1936
#, python-format
1933
1937
msgid "Invalid ignore pattern found. %s"
1934
1938
msgid_plural "Invalid ignore patterns found. %s"
1935
1939
msgstr[0] ""
1936
1940
msgstr[1] ""
1937
1941
1938
#: bzrlib/builtins.py:3189
1942
#: bzrlib/builtins.py:3218
1939
1943
msgid "NAME_PATTERN should not be an absolute path"
1940
1944
msgstr ""
1941
1945
1942
#: bzrlib/builtins.py:3202
1946
#: bzrlib/builtins.py:3231
1943
1947
#, python-format
1944
1948
msgid ""
1945
1949
"Warning: the following files are version controlled and match your ignore "
1949
1953
"them.\n"
1950
1954
msgstr ""
1951
1955
1952
#: bzrlib/builtins.py:3209
1956
#: bzrlib/builtins.py:3238
1953
1957
msgid "List ignored files and the patterns that matched them."
1954
1958
msgstr ""
1955
1959
1956
#: bzrlib/builtins.py:3211
1960
#: bzrlib/builtins.py:3240
1957
1961
msgid ""
1958
1962
"List all the ignored files and the ignore pattern that caused the file to\n"
1959
1963
"be ignored."
1960
1964
msgstr ""
1961
1965
1962
#: bzrlib/builtins.py:3214
1966
#: bzrlib/builtins.py:3243
1963
1967
msgid "Alternatively, to list just the files::"
1964
1968
msgstr ""
1965
1969
1966
#: bzrlib/builtins.py:3216
1970
#: bzrlib/builtins.py:3245
1967
1971
msgid " bzr ls --ignored"
1968
1972
msgstr ""
1969
1973
1970
#: bzrlib/builtins.py:3250
1974
#: bzrlib/builtins.py:3279
1971
1975
#, python-format
1972
1976
msgid "not a valid revision-number: %r"
1973
1977
msgstr ""
1974
1978
1975
#: bzrlib/builtins.py:3257
1979
#: bzrlib/builtins.py:3286
1976
1980
msgid ""
1977
1981
"Export current or past revision to a destination directory or archive."
1978
1982
msgstr ""
1979
1983
1980
#: bzrlib/builtins.py:3259
1984
#: bzrlib/builtins.py:3288
1981
1985
msgid "If no revision is specified this exports the last committed revision."
1982
1986
msgstr ""
1983
1987
1984
#: bzrlib/builtins.py:3261
1988
#: bzrlib/builtins.py:3290
1985
1989
msgid ""
1986
1990
"Format may be an \"exporter\" name, such as tar, tgz, tbz2. If none is\n"
1987
1991
"given, try to find the format with the extension. If no extension\n"
1988
1992
"is found exports to a directory (equivalent to --format=dir)."
1989
1993
msgstr ""
1990
1994
1991
#: bzrlib/builtins.py:3265
1995
#: bzrlib/builtins.py:3294
1992
1996
msgid ""
1993
1997
"If root is supplied, it will be used as the root directory inside\n"
1994
1998
"container formats (tar, zip, etc). If it is not supplied it will default\n"
1995
1999
"to the exported filename. The root option has no effect for 'dir' format."
1996
2000
msgstr ""
1997
2001
1998
#: bzrlib/builtins.py:3269
2002
#: bzrlib/builtins.py:3298
1999
2003
msgid ""
2000
2004
"If branch is omitted then the branch containing the current working\n"
2001
2005
"directory will be used."
2002
2006
msgstr ""
2003
2007
2004
#: bzrlib/builtins.py:3272
2008
#: bzrlib/builtins.py:3301
2005
2009
msgid ""
2006
2010
"Note: Export of tree with non-ASCII filenames to zip is not supported."
2007
2011
msgstr ""
2008
2012
2009
#: bzrlib/builtins.py:3274
2013
#: bzrlib/builtins.py:3303
2010
2014
msgid ""
2011
2015
" ================= =========================\n"
2012
2016
" Supported formats Autodetected by extension\n"
2019
2023
" ================= ========================="
2020
2024
msgstr ""
2021
2025
2022
#: bzrlib/builtins.py:3288
2026
#: bzrlib/builtins.py:3317
2023
2027
msgid "Type of file to export to."
2024
2028
msgstr ""
2025
2029
2026
#: bzrlib/builtins.py:3291
2030
#: bzrlib/builtins.py:3320
2027
2031
msgid "Apply content filters to export the convenient form."
2028
2032
msgstr ""
2029
2033
2030
#: bzrlib/builtins.py:3295
2034
#: bzrlib/builtins.py:3324
2031
2035
msgid "Name of the root directory inside the exported file."
2032
2036
msgstr ""
2033
2037
2034
#: bzrlib/builtins.py:3297
2038
#: bzrlib/builtins.py:3326
2035
2039
msgid ""
2036
2040
"Set modification time of files to that of the last revision in which it was "
2037
2041
"changed."
2038
2042
msgstr ""
2039
2043
2040
#: bzrlib/builtins.py:3300
2044
#: bzrlib/builtins.py:3329
2041
2045
msgid ""
2042
2046
"Export the working tree contents rather than that of the last revision."
2043
2047
msgstr ""
2044
2048
2045
#: bzrlib/builtins.py:3319
2049
#: bzrlib/builtins.py:3348
2046
2050
msgid "--uncommitted requires a working tree"
2047
2051
msgstr ""
2048
2052
2049
#: bzrlib/builtins.py:3328
2053
#: bzrlib/builtins.py:3357
2050
2054
#, python-format
2051
2055
msgid "Unsupported export format: %s"
2052
2056
msgstr ""
2053
2057
2054
#: bzrlib/builtins.py:3332
2058
#: bzrlib/builtins.py:3361
2055
2059
msgid ""
2056
2060
"Write the contents of a file as of a given revision to standard output."
2057
2061
msgstr ""
2058
2062
2059
#: bzrlib/builtins.py:3334
2063
#: bzrlib/builtins.py:3363
2060
2064
msgid "If no revision is nominated, the last revision is used."
2061
2065
msgstr ""
2062
2066
2063
#: bzrlib/builtins.py:3336
2067
#: bzrlib/builtins.py:3365
2064
2068
msgid ""
2065
2069
"Note: Take care to redirect standard output when using this command on a\n"
2066
2070
"binary file."
2067
2071
msgstr ""
2068
2072
2069
#: bzrlib/builtins.py:3342
2073
#: bzrlib/builtins.py:3371
2070
2074
msgid "The path name in the old tree."
2071
2075
msgstr ""
2072
2076
2073
#: bzrlib/builtins.py:3343
2077
#: bzrlib/builtins.py:3372
2074
2078
msgid "Apply content filters to display the convenience form."
2075
2079
msgstr ""
2076
2080
2077
#: bzrlib/builtins.py:3354
2081
#: bzrlib/builtins.py:3383
2078
2082
msgid "bzr cat --revision takes exactly one revision specifier"
2079
2083
msgstr ""
2080
2084
2081
#: bzrlib/builtins.py:3379 bzrlib/builtins.py:3391
2085
#: bzrlib/builtins.py:3408 bzrlib/builtins.py:3420
2082
2086
msgid "{0!r} is not present in revision {1}"
2083
2087
msgstr ""
2084
2088
2085
#: bzrlib/builtins.py:3414
2089
#: bzrlib/builtins.py:3443
2086
2090
msgid "Commit changes into a new revision."
2087
2091
msgstr ""
2088
2092
2089
#: bzrlib/builtins.py:3416
2093
#: bzrlib/builtins.py:3445
2090
2094
msgid ""
2091
2095
"An explanatory message needs to be given for each commit. This is\n"
2092
2096
"often done by using the --message option (getting the message from the\n"
2096
2100
"boilerplate text loaded into the editor, use the --show-diff option."
2097
2101
msgstr ""
2098
2102
2099
#: bzrlib/builtins.py:3423
2103
#: bzrlib/builtins.py:3452
2100
2104
msgid ""
2101
2105
"By default, the entire tree is committed and the person doing the\n"
2102
2106
"commit is assumed to be the author. These defaults can be overridden\n"
2103
2107
"as explained below."
2104
2108
msgstr ""
2105
2109
2106
#: bzrlib/builtins.py:3427
2110
#: bzrlib/builtins.py:3456
2107
2111
msgid ":Selective commits:"
2108
2112
msgstr ""
2109
2113
2110
#: bzrlib/builtins.py:3429
2114
#: bzrlib/builtins.py:3458
2111
2115
msgid ""
2112
2116
" If selected files are specified, only changes to those files are\n"
2113
2117
" committed. If a directory is specified then the directory and\n"
2114
2118
" everything within it is committed."
2115
2119
msgstr ""
2116
2120
2117
#: bzrlib/builtins.py:3433
2121
#: bzrlib/builtins.py:3462
2118
2122
msgid ""
2119
2123
" When excludes are given, they take precedence over selected files.\n"
2120
2124
" For example, to commit only changes within foo, but not changes\n"
2121
2125
" within foo/bar::"
2122
2126
msgstr ""
2123
2127
2124
#: bzrlib/builtins.py:3437
2128
#: bzrlib/builtins.py:3466
2125
2129
msgid " bzr commit foo -x foo/bar"
2126
2130
msgstr ""
2127
2131
2128
#: bzrlib/builtins.py:3439
2132
#: bzrlib/builtins.py:3468
2129
2133
msgid " A selective commit after a merge is not yet supported."
2130
2134
msgstr ""
2131
2135
2132
#: bzrlib/builtins.py:3441
2136
#: bzrlib/builtins.py:3470
2133
2137
msgid ":Custom authors:"
2134
2138
msgstr ""
2135
2139
2136
#: bzrlib/builtins.py:3443
2140
#: bzrlib/builtins.py:3472
2137
2141
msgid ""
2138
2142
" If the author of the change is not the same person as the committer,\n"
2139
2143
" you can specify the author's name using the --author option. The\n"
2143
2147
" author."
2144
2148
msgstr ""
2145
2149
2146
#: bzrlib/builtins.py:3450
2150
#: bzrlib/builtins.py:3479
2147
2151
msgid ":Checks:"
2148
2152
msgstr ""
2149
2153
2150
#: bzrlib/builtins.py:3452
2154
#: bzrlib/builtins.py:3481
2151
2155
msgid ""
2152
2156
" A common mistake is to forget to add a new file or directory before\n"
2153
2157
" running the commit command. The --strict option checks for unknown\n"
2156
2160
" for details."
2157
2161
msgstr ""
2158
2162
2159
#: bzrlib/builtins.py:3458
2163
#: bzrlib/builtins.py:3487
2160
2164
msgid ":Things to note:"
2161
2165
msgstr ""
2162
2166
2163
#: bzrlib/builtins.py:3460
2167
#: bzrlib/builtins.py:3489
2164
2168
msgid ""
2165
2169
" If you accidentially commit the wrong changes or make a spelling\n"
2166
2170
" mistake in the commit message say, you can use the uncommit command\n"
2167
2171
" to undo it. See ``bzr help uncommit`` for details."
2168
2172
msgstr ""
2169
2173
2170
#: bzrlib/builtins.py:3464
2174
#: bzrlib/builtins.py:3493
2171
2175
msgid ""
2172
2176
" Hooks can also be configured to run after a commit. This allows you\n"
2173
2177
" to trigger updates to external systems like bug trackers. The --fixes\n"
2175
2179
" one or more bugs. See ``bzr help bugs`` for details."
2176
2180
msgstr ""
2177
2181
2178
#: bzrlib/builtins.py:3474
2182
#: bzrlib/builtins.py:3503
2179
2183
msgid "Do not consider changes made to a given path."
2180
2184
msgstr ""
2181
2185
2182
#: bzrlib/builtins.py:3477
2186
#: bzrlib/builtins.py:3506
2183
2187
msgid "Description of the new revision."
2184
2188
msgstr ""
2185
2189
2186
#: bzrlib/builtins.py:3480
2190
#: bzrlib/builtins.py:3509
2187
2191
msgid "Commit even if nothing has changed."
2188
2192
msgstr ""
2189
2193
2190
#: bzrlib/builtins.py:3484
2194
#: bzrlib/builtins.py:3513
2191
2195
msgid "Take commit message from this file."
2192
2196
msgstr ""
2193
2197
2194
#: bzrlib/builtins.py:3486
2198
#: bzrlib/builtins.py:3515
2195
2199
msgid "Refuse to commit if there are unknown files in the working tree."
2196
2200
msgstr ""
2197
2201
2198
#: bzrlib/builtins.py:3489
2202
#: bzrlib/builtins.py:3518
2199
2203
msgid ""
2200
2204
"Manually set a commit time using commit date format, e.g. '2009-10-10 "
2201
2205
"08:00:00 +0100'."
2202
2206
msgstr ""
2203
2207
2204
#: bzrlib/builtins.py:3492
2208
#: bzrlib/builtins.py:3521
2205
2209
msgid "Mark a bug as being fixed by this revision (see \"bzr help bugs\")."
2206
2210
msgstr ""
2207
2211
2208
#: bzrlib/builtins.py:3495
2212
#: bzrlib/builtins.py:3524
2209
2213
msgid "Set the author's name, if it's different from the committer."
2210
2214
msgstr ""
2211
2215
2212
#: bzrlib/builtins.py:3498
2216
#: bzrlib/builtins.py:3527
2213
2217
msgid ""
2214
2218
"Perform a local commit in a bound branch. Local commits are not pushed to "
2215
2219
"the master branch until a normal commit is performed."
2216
2220
msgstr ""
2217
2221
2218
#: bzrlib/builtins.py:3504
2222
#: bzrlib/builtins.py:3533
2219
2223
msgid ""
2220
2224
"When no message is supplied, show the diff along with the status summary in "
2221
2225
"the message editor."
2222
2226
msgstr ""
2223
2227
2224
#: bzrlib/builtins.py:3507
2228
#: bzrlib/builtins.py:3536
2225
2229
msgid ""
2226
2230
"When committing to a foreign version control system do not push data that "
2227
2231
"can not be natively represented."
2228
2232
msgstr ""
2229
2233
2230
#: bzrlib/builtins.py:3525
2234
#: bzrlib/builtins.py:3554
2231
2235
#, python-format
2232
2236
msgid ""
2233
2237
"No tracker specified for bug %s. Use the form 'tracker:id' or specify a "
2235
2239
"See \"bzr help bugs\" for more information on this feature. Commit refused."
2236
2240
msgstr ""
2237
2241
2238
#: bzrlib/builtins.py:3534
2242
#: bzrlib/builtins.py:3563
2239
2243
#, python-format
2240
2244
msgid ""
2241
2245
"Invalid bug %s. Must be in the form of 'tracker:id'. See \"bzr help bugs\" "
2243
2247
"Commit refused."
2244
2248
msgstr ""
2245
2249
2246
#: bzrlib/builtins.py:3543
2250
#: bzrlib/builtins.py:3572
2247
2251
#, python-format
2248
2252
msgid "Unrecognized bug %s. Commit refused."
2249
2253
msgstr ""
2250
2254
2251
#: bzrlib/builtins.py:3546
2255
#: bzrlib/builtins.py:3575
2252
2256
#, python-format
2253
2257
msgid ""
2254
2258
"%s\n"
2255
2259
"Commit refused."
2256
2260
msgstr ""
2257
2261
2258
#: bzrlib/builtins.py:3570
2262
#: bzrlib/builtins.py:3599
2259
2263
msgid "Could not parse --commit-time: "
2260
2264
msgstr ""
2261
2265
2262
#: bzrlib/builtins.py:3610
2266
#: bzrlib/builtins.py:3639
2263
2267
msgid "please specify either --message or --file"
2264
2268
msgstr ""
2265
2269
2266
#: bzrlib/builtins.py:3639
2270
#: bzrlib/builtins.py:3668
2267
2271
msgid "please specify a commit message with either --message or --file"
2268
2272
msgstr ""
2269
2273
2270
#: bzrlib/builtins.py:3642
2274
#: bzrlib/builtins.py:3671
2271
2275
msgid ""
2272
2276
"Empty commit message specified. Please specify a commit message with either -"
2273
2277
"-message or --file or leave a blank message with --message \"\"."
2274
2278
msgstr ""
2275
2279
2276
#: bzrlib/builtins.py:3662
2280
#: bzrlib/builtins.py:3691
2277
2281
msgid ""
2278
2282
"No changes to commit. Please 'bzr add' the files you want to commit, or use -"
2279
2283
"-unchanged to force an empty commit."
2280
2284
msgstr ""
2281
2285
2282
#: bzrlib/builtins.py:3666
2286
#: bzrlib/builtins.py:3695
2283
2287
msgid ""
2284
2288
"Conflicts detected in working tree. Use \"bzr conflicts\" to list, \"bzr "
2285
2289
"resolve FILE\" to resolve."
2286
2290
msgstr ""
2287
2291
2288
#: bzrlib/builtins.py:3670
2292
#: bzrlib/builtins.py:3699
2289
2293
msgid "Commit refused because there are unknown files in the working tree."
2290
2294
msgstr ""
2291
2295
2292
#: bzrlib/builtins.py:3673
2296
#: bzrlib/builtins.py:3702
2293
2297
msgid ""
2294
2298
"\n"
2295
2299
"To commit to master branch, run update and then commit.\n"
2296
2300
"You can also pass --local to commit to continue working disconnected."
2297
2301
msgstr ""
2298
2302
2299
#: bzrlib/builtins.py:3681
2303
#: bzrlib/builtins.py:3710
2300
2304
msgid ""
2301
2305
"Validate working tree structure, branch consistency and repository history."
2302
2306
msgstr ""
2303
2307
2304
#: bzrlib/builtins.py:3683
2308
#: bzrlib/builtins.py:3712
2305
2309
msgid ""
2306
2310
"This command checks various invariants about branch and repository storage\n"
2307
2311
"to detect data corruption or bzr bugs."
2308
2312
msgstr ""
2309
2313
2310
#: bzrlib/builtins.py:3686
2314
#: bzrlib/builtins.py:3715
2311
2315
msgid ""
2312
2316
"The working tree and branch checks will only give output if a problem is\n"
2313
2317
"detected. The output fields of the repository check are:"
2314
2318
msgstr ""
2315
2319
2316
#: bzrlib/builtins.py:3689
2320
#: bzrlib/builtins.py:3718
2317
2321
msgid ""
2318
2322
"revisions\n"
2319
2323
" This is just the number of revisions checked. It doesn't\n"
2320
2324
" indicate a problem."
2321
2325
msgstr ""
2322
2326
2323
#: bzrlib/builtins.py:3693
2327
#: bzrlib/builtins.py:3722
2324
2328
msgid ""
2325
2329
"versionedfiles\n"
2326
2330
" This is just the number of versionedfiles checked. It\n"
2327
2331
" doesn't indicate a problem."
2328
2332
msgstr ""
2329
2333
2330
#: bzrlib/builtins.py:3697
2334
#: bzrlib/builtins.py:3726
2331
2335
msgid ""
2332
2336
"unreferenced ancestors\n"
2333
2337
" Texts that are ancestors of other texts, but\n"
2335
2339
" subtle problem that Bazaar can work around."
2336
2340
msgstr ""
2337
2341
2338
#: bzrlib/builtins.py:3702
2342
#: bzrlib/builtins.py:3731
2339
2343
msgid ""
2340
2344
"unique file texts\n"
2341
2345
" This is the total number of unique file contents\n"
2342
2346
" seen in the checked revisions. It does not indicate a problem."
2343
2347
msgstr ""
2344
2348
2345
#: bzrlib/builtins.py:3706
2349
#: bzrlib/builtins.py:3735
2346
2350
msgid ""
2347
2351
"repeated file texts\n"
2348
2352
" This is the total number of repeated texts seen\n"
2351
2355
" indicate a problem."
2352
2356
msgstr ""
2353
2357
2354
#: bzrlib/builtins.py:3712
2358
#: bzrlib/builtins.py:3741
2355
2359
msgid ""
2356
2360
"If no restrictions are specified, all Bazaar data that is found at the "
2357
2361
"given\n"
2358
2362
"location will be checked."
2359
2363
msgstr ""
2360
2364
2361
#: bzrlib/builtins.py:3717
2365
#: bzrlib/builtins.py:3746
2362
2366
msgid " Check the tree and branch at 'foo'::"
2363
2367
msgstr ""
2364
2368
2365
#: bzrlib/builtins.py:3719
2369
#: bzrlib/builtins.py:3748
2366
2370
msgid " bzr check --tree --branch foo"
2367
2371
msgstr ""
2368
2372
2369
#: bzrlib/builtins.py:3721
2373
#: bzrlib/builtins.py:3750
2370
2374
msgid " Check only the repository at 'bar'::"
2371
2375
msgstr ""
2372
2376
2373
#: bzrlib/builtins.py:3723
2377
#: bzrlib/builtins.py:3752
2374
2378
msgid " bzr check --repo bar"
2375
2379
msgstr ""
2376
2380
2377
#: bzrlib/builtins.py:3725
2381
#: bzrlib/builtins.py:3754
2378
2382
msgid " Check everything at 'baz'::"
2379
2383
msgstr ""
2380
2384
2381
#: bzrlib/builtins.py:3727
2385
#: bzrlib/builtins.py:3756
2382
2386
msgid " bzr check baz"
2383
2387
msgstr ""
2384
2388
2385
#: bzrlib/builtins.py:3733
2389
#: bzrlib/builtins.py:3762
2386
2390
msgid "Check the branch related to the current directory."
2387
2391
msgstr ""
2388
2392
2389
#: bzrlib/builtins.py:3735
2393
#: bzrlib/builtins.py:3764
2390
2394
msgid "Check the repository related to the current directory."
2391
2395
msgstr ""
2392
2396
2393
#: bzrlib/builtins.py:3737
2397
#: bzrlib/builtins.py:3766
2394
2398
msgid "Check the working tree related to the current directory."
2395
2399
msgstr ""
2396
2400
2397
#: bzrlib/builtins.py:3751
2401
#: bzrlib/builtins.py:3780
2398
2402
msgid "Upgrade a repository, branch or working tree to a newer format."
2399
2403
msgstr ""
2400
2404
2401
#: bzrlib/builtins.py:3753
2405
#: bzrlib/builtins.py:3782
2402
2406
msgid ""
2403
2407
"When the default format has changed after a major new release of\n"
2404
2408
"Bazaar, you may be informed during certain operations that you\n"
2407
2411
"with older repositories or with older versions of Bazaar."
2408
2412
msgstr ""
2409
2413
2410
#: bzrlib/builtins.py:3759
2414
#: bzrlib/builtins.py:3788
2411
2415
msgid ""
2412
2416
"If you wish to upgrade to a particular format rather than the\n"
2413
2417
"current default, that can be specified using the --format option.\n"
2417
2421
"2.x default) so downgrading is not always possible."
2418
2422
msgstr ""
2419
2423
2420
#: bzrlib/builtins.py:3766
2424
#: bzrlib/builtins.py:3795
2421
2425
msgid ""
2422
2426
"A backup.bzr.~#~ directory is created at the start of the conversion\n"
2423
2427
"process (where # is a number). By default, this is left there on\n"
2428
2432
"afterwards."
2429
2433
msgstr ""
2430
2434
2431
#: bzrlib/builtins.py:3774
2435
#: bzrlib/builtins.py:3803
2432
2436
msgid ""
2433
2437
"If the location given is a shared repository, dependent branches\n"
2434
2438
"are also converted provided the repository converts successfully.\n"
2436
2440
"tried."
2437
2441
msgstr ""
2438
2442
2439
#: bzrlib/builtins.py:3779
2443
#: bzrlib/builtins.py:3808
2440
2444
msgid ""
2441
2445
"For more information on upgrades, see the Bazaar Upgrade Guide,\n"
2442
2446
"http://doc.bazaar.canonical.com/latest/en/upgrade-guide/."
2443
2447
msgstr ""
2444
2448
2445
#: bzrlib/builtins.py:3787
2449
#: bzrlib/builtins.py:3816
2446
2450
msgid "Upgrade to a specific format. See \"bzr help formats\" for details."
2447
2451
msgstr ""
2448
2452
2449
#: bzrlib/builtins.py:3791
2453
#: bzrlib/builtins.py:3820
2450
2454
msgid "Branch format"
2451
2455
msgstr ""
2452
2456
2453
#: bzrlib/builtins.py:3793
2457
#: bzrlib/builtins.py:3822
2454
2458
msgid "Remove the backup.bzr directory if successful."
2455
2459
msgstr ""
2456
2460
2457
#: bzrlib/builtins.py:3795
2461
#: bzrlib/builtins.py:3824
2458
2462
msgid "Show what would be done, but don't actually do anything."
2459
2463
msgstr ""
2460
2464
2461
#: bzrlib/builtins.py:3810
2465
#: bzrlib/builtins.py:3839
2462
2466
msgid "Show or set bzr user id."
2463
2467
msgstr ""
2464
2468
2465
#: bzrlib/builtins.py:3812
2469
#: bzrlib/builtins.py:3841
2466
2470
msgid ""
2467
2471
":Examples:\n"
2468
2472
" Show the email of the current user::"
2469
2473
msgstr ""
2470
2474
2471
#: bzrlib/builtins.py:3815
2475
#: bzrlib/builtins.py:3844
2472
2476
msgid " bzr whoami --email"
2473
2477
msgstr ""
2474
2478
2475
#: bzrlib/builtins.py:3817
2479
#: bzrlib/builtins.py:3846
2476
2480
msgid " Set the current user::"
2477
2481
msgstr ""
2478
2482
2479
#: bzrlib/builtins.py:3819
2483
#: bzrlib/builtins.py:3848
2480
2484
msgid " bzr whoami \"Frank Chu <fchu@example.com>\""
2481
2485
msgstr ""
2482
2486
2483
#: bzrlib/builtins.py:3823
2487
#: bzrlib/builtins.py:3852
2484
2488
msgid "Display email address only."
2485
2489
msgstr ""
2486
2490
2487
#: bzrlib/builtins.py:3825
2491
#: bzrlib/builtins.py:3854
2488
2492
msgid "Set identity for the current branch instead of globally."
2489
2493
msgstr ""
2490
2494
2491
#: bzrlib/builtins.py:3851
2495
#: bzrlib/builtins.py:3880
2492
2496
msgid "--email can only be used to display existing identity"
2493
2497
msgstr ""
2494
2498
2495
#: bzrlib/builtins.py:3873
2499
#: bzrlib/builtins.py:3904
2496
2500
msgid "Print or set the branch nickname."
2497
2501
msgstr ""
2498
2502
2499
#: bzrlib/builtins.py:3875
2503
#: bzrlib/builtins.py:3906
2500
2504
msgid ""
2501
"If unset, the tree root directory name is used as the nickname.\n"
2502
"To print the current nickname, execute with no argument."
2505
"If unset, the colocated branch name is used for colocated branches, and\n"
2506
"the branch directory name is used for other branches. To print the\n"
2507
"current nickname, execute with no argument."
2503
2508
msgstr ""
2504
2509
2505
#: bzrlib/builtins.py:3878
2510
#: bzrlib/builtins.py:3910
2506
2511
msgid ""
2507
2512
"Bound branches use the nickname of its master branch unless it is set\n"
2508
2513
"locally."
2509
2514
msgstr ""
2510
2515
2511
#: bzrlib/builtins.py:3898
2516
#: bzrlib/builtins.py:3930
2512
2517
msgid "Set/unset and display aliases."
2513
2518
msgstr ""
2514
2519
2515
#: bzrlib/builtins.py:3900
2520
#: bzrlib/builtins.py:3932
2516
2521
msgid ""
2517
2522
":Examples:\n"
2518
2523
" Show the current aliases::"
2519
2524
msgstr ""
2520
2525
2521
#: bzrlib/builtins.py:3903
2526
#: bzrlib/builtins.py:3935
2522
2527
msgid " bzr alias"
2523
2528
msgstr ""
2524
2529
2525
#: bzrlib/builtins.py:3905
2530
#: bzrlib/builtins.py:3937
2526
2531
msgid " Show the alias specified for 'll'::"
2527
2532
msgstr ""
2528
2533
2529
#: bzrlib/builtins.py:3907
2534
#: bzrlib/builtins.py:3939
2530
2535
msgid " bzr alias ll"
2531
2536
msgstr ""
2532
2537
2533
#: bzrlib/builtins.py:3909
2538
#: bzrlib/builtins.py:3941
2534
2539
msgid " Set an alias for 'll'::"
2535
2540
msgstr ""
2536
2541
2537
#: bzrlib/builtins.py:3911
2542
#: bzrlib/builtins.py:3943
2538
2543
msgid " bzr alias ll=\"log --line -r-10..-1\""
2539
2544
msgstr ""
2540
2545
2541
#: bzrlib/builtins.py:3913
2546
#: bzrlib/builtins.py:3945
2542
2547
msgid " To remove an alias for 'll'::"
2543
2548
msgstr ""
2544
2549
2545
#: bzrlib/builtins.py:3915
2550
#: bzrlib/builtins.py:3947
2546
2551
msgid " bzr alias --remove ll"
2547
2552
msgstr ""
2548
2553
2549
#: bzrlib/builtins.py:3920
2554
#: bzrlib/builtins.py:3952
2550
2555
msgid "Remove the alias."
2551
2556
msgstr ""
2552
2557
2553
#: bzrlib/builtins.py:3938
2558
#: bzrlib/builtins.py:3970
2554
2559
msgid "bzr alias --remove expects an alias to remove."
2555
2560
msgstr ""
2556
2561
2557
#: bzrlib/builtins.py:4119
2562
#: bzrlib/builtins.py:4151
2558
2563
msgid ""
2559
2564
"subunit not available. subunit needs to be installed to use --subunit."
2560
2565
msgstr ""
2561
2566
2562
#: bzrlib/builtins.py:4136
2567
#: bzrlib/builtins.py:4168
2563
2568
msgid ""
2564
2569
"--benchmark is no longer supported from bzr 2.2; use bzr-usertest instead"
2565
2570
msgstr ""
2566
2571
2567
#: bzrlib/builtins.py:4183
2572
#: bzrlib/builtins.py:4215
2568
2573
msgid "Show version of bzr."
2569
2574
msgstr ""
2570
2575
2571
#: bzrlib/builtins.py:4187
2576
#: bzrlib/builtins.py:4219
2572
2577
msgid "Print just the version number."
2573
2578
msgstr ""
2574
2579
2575
#: bzrlib/builtins.py:4206
2580
#: bzrlib/builtins.py:4238
2576
2581
msgid "It sure does!\n"
2577
2582
msgstr ""
2578
2583
2579
#: bzrlib/builtins.py:4230
2584
#: bzrlib/builtins.py:4262
2580
2585
#, python-format
2581
2586
msgid "merge base is revision %s\n"
2582
2587
msgstr ""
2583
2588
2584
#: bzrlib/builtins.py:4234
2589
#: bzrlib/builtins.py:4266
2585
2590
msgid "Perform a three-way merge."
2586
2591
msgstr ""
2587
2592
2588
#: bzrlib/builtins.py:4236
2593
#: bzrlib/builtins.py:4268
2589
2594
msgid ""
2590
2595
"The source of the merge can be specified either in the form of a branch,\n"
2591
2596
"or in the form of a path to a file containing a merge directive generated\n"
2596
2601
"the current working tree."
2597
2602
msgstr ""
2598
2603
2599
#: bzrlib/builtins.py:4244
2604
#: bzrlib/builtins.py:4276
2600
2605
msgid ""
2601
2606
"When merging from a branch, by default bzr will try to merge in all new\n"
2602
2607
"work from the other branch, automatically determining an appropriate base\n"
2603
2608
"revision. If this fails, you may need to give an explicit base."
2604
2609
msgstr ""
2605
2610
2606
#: bzrlib/builtins.py:4248
2611
#: bzrlib/builtins.py:4280
2607
2612
msgid ""
2608
2613
"To pick a different ending revision, pass \"--revision OTHER\". bzr will\n"
2609
2614
"try to merge in all new work up to and including revision OTHER."
2610
2615
msgstr ""
2611
2616
2612
#: bzrlib/builtins.py:4251
2617
#: bzrlib/builtins.py:4283
2613
2618
msgid ""
2614
2619
"If you specify two values, \"--revision BASE..OTHER\", only revisions BASE\n"
2615
2620
"through OTHER, excluding BASE but including OTHER, will be merged. If this\n"
2620
2625
"changes from the other branch is not stored in the commit."
2621
2626
msgstr ""
2622
2627
2623
#: bzrlib/builtins.py:4259
2628
#: bzrlib/builtins.py:4291
2624
2629
msgid "Revision numbers are always relative to the source branch."
2625
2630
msgstr ""
2626
2631
2627
#: bzrlib/builtins.py:4261 bzrlib/conflicts.py:52 bzrlib/conflicts.py:106
2632
#: bzrlib/builtins.py:4293 bzrlib/conflicts.py:52 bzrlib/conflicts.py:106
2628
2633
msgid ""
2629
2634
"Merge will do its best to combine the changes in two branches, but there\n"
2630
2635
"are some kinds of problems only a human can fix. When it encounters those,\n"
2632
2637
"before you can commit."
2633
2638
msgstr ""
2634
2639
2635
#: bzrlib/builtins.py:4266
2640
#: bzrlib/builtins.py:4298
2636
2641
msgid ""
2637
2642
"Use bzr resolve when you have fixed a problem. See also bzr conflicts."
2638
2643
msgstr ""
2639
2644
2640
#: bzrlib/builtins.py:4268
2645
#: bzrlib/builtins.py:4300
2641
2646
msgid ""
2642
2647
"If there is no default branch set, the first merge will set it (use\n"
2643
2648
"--no-remember to avoid setting it). After that, you can omit the branch\n"
2645
2650
"only be saved if the remote location can be accessed."
2646
2651
msgstr ""
2647
2652
2648
#: bzrlib/builtins.py:4273
2653
#: bzrlib/builtins.py:4305
2649
2654
msgid ""
2650
2655
"The results of the merge are placed into the destination working\n"
2651
2656
"directory, where they can be reviewed (with bzr diff), tested, and then\n"
2652
2657
"committed to record the result of the merge."
2653
2658
msgstr ""
2654
2659
2655
#: bzrlib/builtins.py:4277
2660
#: bzrlib/builtins.py:4309
2656
2661
msgid ""
2657
2662
"merge refuses to run if there are any uncommitted changes, unless\n"
2658
2663
"--force is given. If --force is given, then the changes from the source \n"
2661
2666
"merge revision which has more than two parents."
2662
2667
msgstr ""
2663
2668
2664
#: bzrlib/builtins.py:4283
2669
#: bzrlib/builtins.py:4315
2665
2670
msgid ""
2666
2671
"If one would like to merge changes from the working tree of the other\n"
2667
2672
"branch without merging any committed revisions, the --uncommitted option\n"
2668
2673
"can be given."
2669
2674
msgstr ""
2670
2675
2671
#: bzrlib/builtins.py:4287
2676
#: bzrlib/builtins.py:4319
2672
2677
msgid ""
2673
2678
"To select only some changes to merge, use \"merge -i\", which will prompt\n"
2674
2679
"you to apply each diff hunk and file change, similar to \"shelve\"."
2675
2680
msgstr ""
2676
2681
2677
#: bzrlib/builtins.py:4290
2682
#: bzrlib/builtins.py:4322
2678
2683
msgid ""
2679
2684
":Examples:\n"
2680
2685
" To merge all new revisions from bzr.dev::"
2681
2686
msgstr ""
2682
2687
2683
#: bzrlib/builtins.py:4293
2688
#: bzrlib/builtins.py:4325
2684
2689
msgid " bzr merge ../bzr.dev"
2685
2690
msgstr ""
2686
2691
2687
#: bzrlib/builtins.py:4295
2692
#: bzrlib/builtins.py:4327
2688
2693
msgid " To merge changes up to and including revision 82 from bzr.dev::"
2689
2694
msgstr ""
2690
2695
2691
#: bzrlib/builtins.py:4297
2696
#: bzrlib/builtins.py:4329
2692
2697
msgid " bzr merge -r 82 ../bzr.dev"
2693
2698
msgstr ""
2694
2699
2695
#: bzrlib/builtins.py:4299
2700
#: bzrlib/builtins.py:4331
2696
2701
msgid " To merge the changes introduced by 82, without previous changes::"
2697
2702
msgstr ""
2698
2703
2699
#: bzrlib/builtins.py:4301
2704
#: bzrlib/builtins.py:4333
2700
2705
msgid " bzr merge -r 81..82 ../bzr.dev"
2701
2706
msgstr ""
2702
2707
2703
#: bzrlib/builtins.py:4303
2708
#: bzrlib/builtins.py:4335
2704
2709
msgid " To apply a merge directive contained in /tmp/merge::"
2705
2710
msgstr ""
2706
2711
2707
#: bzrlib/builtins.py:4305
2712
#: bzrlib/builtins.py:4337
2708
2713
msgid " bzr merge /tmp/merge"
2709
2714
msgstr ""
2710
2715
2711
#: bzrlib/builtins.py:4307
2716
#: bzrlib/builtins.py:4339
2712
2717
msgid ""
2713
2718
" To create a merge revision with three parents from two branches\n"
2714
2719
" feature1a and feature1b:"
2715
2720
msgstr ""
2716
2721
2717
#: bzrlib/builtins.py:4310
2722
#: bzrlib/builtins.py:4342
2718
2723
msgid ""
2719
2724
" bzr merge ../feature1a\n"
2720
2725
" bzr merge ../feature1b --force\n"
2721
2726
" bzr commit -m 'revision with three parents'"
2722
2727
msgstr ""
2723
2728
2724
#: bzrlib/builtins.py:4322
2729
#: bzrlib/builtins.py:4354
2725
2730
msgid "Merge even if the destination tree has uncommitted changes."
2726
2731
msgstr ""
2727
2732
2728
#: bzrlib/builtins.py:4328
2733
#: bzrlib/builtins.py:4360
2729
2734
msgid ""
2730
2735
"Apply uncommitted changes from a working copy, instead of branch changes."
2731
2736
msgstr ""
2732
2737
2733
#: bzrlib/builtins.py:4330
2738
#: bzrlib/builtins.py:4362
2734
2739
msgid ""
2735
2740
"If the destination is already completely merged into the source, pull from "
2736
2741
"the source rather than merging. When this happens, you do not need to "
2737
2742
"commit the result."
2738
2743
msgstr ""
2739
2744
2740
#: bzrlib/builtins.py:4335
2745
#: bzrlib/builtins.py:4367
2741
2746
msgid ""
2742
2747
"Branch to merge into, rather than the one containing the working directory."
2743
2748
msgstr ""
2744
2749
2745
#: bzrlib/builtins.py:4337
2750
#: bzrlib/builtins.py:4369
2746
2751
msgid "Instead of merging, show a diff of the merge."
2747
2752
msgstr ""
2748
2753
2749
#: bzrlib/builtins.py:4339
2754
#: bzrlib/builtins.py:4371
2750
2755
msgid "Select changes interactively."
2751
2756
msgstr ""
2752
2757
2753
#: bzrlib/builtins.py:4361
2758
#: bzrlib/builtins.py:4393
2754
2759
msgid ""
2755
2760
"Merging into empty branches not currently supported, "
2756
2761
"https://bugs.launchpad.net/bzr/+bug/308562"
2757
2762
msgstr ""
2758
2763
2759
#: bzrlib/builtins.py:4388
2764
#: bzrlib/builtins.py:4420
2760
2765
msgid "Cannot use --uncommitted with bundles or merge directives."
2761
2766
msgstr ""
2762
2767
2763
#: bzrlib/builtins.py:4399
2768
#: bzrlib/builtins.py:4431
2764
2769
msgid "Cannot use --uncommitted and --revision at the same time."
2765
2770
msgstr ""
2766
2771
2767
#: bzrlib/builtins.py:4419
2772
#: bzrlib/builtins.py:4451
2768
2773
msgid "merger: "
2769
2774
msgstr ""
2770
2775
2771
#: bzrlib/builtins.py:4421 bzrlib/bundle/apply_bundle.py:71
2776
#: bzrlib/builtins.py:4453 bzrlib/bundle/apply_bundle.py:71
2772
2777
msgid "Nothing to do."
2773
2778
msgstr ""
2774
2779
2775
#: bzrlib/builtins.py:4425
2780
#: bzrlib/builtins.py:4457
2776
2781
msgid "Cannot pull individual files"
2777
2782
msgstr ""
2778
2783
2779
#: bzrlib/builtins.py:4433
2784
#: bzrlib/builtins.py:4465
2780
2785
msgid "This branch has no commits. (perhaps you would prefer 'bzr pull')"
2781
2786
msgstr ""
2782
2787
2783
#: bzrlib/builtins.py:4491
2788
#: bzrlib/builtins.py:4523
2784
2789
#, python-format
2785
2790
msgid "Show-base is not supported for this merge type. %s"
2786
2791
msgstr ""
2787
2792
2788
#: bzrlib/builtins.py:4500
2793
#: bzrlib/builtins.py:4532
2789
2794
#, python-format
2790
2795
msgid "Conflict reduction is not supported for merge type %s."
2791
2796
msgstr ""
2792
2797
2793
#: bzrlib/builtins.py:4504
2798
#: bzrlib/builtins.py:4536
2794
2799
msgid "Cannot do conflict reduction and show base."
2795
2800
msgstr ""
2796
2801
2797
#: bzrlib/builtins.py:4615
2802
#: bzrlib/builtins.py:4647
2798
2803
msgid "No location specified or remembered"
2799
2804
msgstr ""
2800
2805
2801
#: bzrlib/builtins.py:4617
2806
#: bzrlib/builtins.py:4649
2802
2807
msgid "{0} remembered {1} location {2}"
2803
2808
msgstr ""
2804
2809
2805
#: bzrlib/builtins.py:4623
2810
#: bzrlib/builtins.py:4655
2806
2811
msgid "Redo a merge."
2807
2812
msgstr ""
2808
2813
2809
#: bzrlib/builtins.py:4625
2814
#: bzrlib/builtins.py:4657
2810
2815
msgid ""
2811
2816
"Use this if you want to try a different merge technique while resolving\n"
2812
2817
"conflicts. Some merge techniques are better than others, and remerge\n"
2813
2818
"lets you try different ones on different files."
2814
2819
msgstr ""
2815
2820
2816
#: bzrlib/builtins.py:4629
2821
#: bzrlib/builtins.py:4661
2817
2822
msgid ""
2818
2823
"The options for remerge have the same meaning and defaults as the ones for\n"
2819
2824
"merge. The difference is that remerge can (only) be run when there is a\n"
2820
2825
"pending merge, and it lets you specify particular files."
2821
2826
msgstr ""
2822
2827
2823
#: bzrlib/builtins.py:4633
2828
#: bzrlib/builtins.py:4665
2824
2829
msgid ""
2825
2830
":Examples:\n"
2826
2831
" Re-do the merge of all conflicted files, and show the base text in\n"
2827
2832
" conflict regions, in addition to the usual THIS and OTHER texts::"
2828
2833
msgstr ""
2829
2834
2830
#: bzrlib/builtins.py:4637
2835
#: bzrlib/builtins.py:4669
2831
2836
msgid " bzr remerge --show-base"
2832
2837
msgstr ""
2833
2838
2834
#: bzrlib/builtins.py:4639
2839
#: bzrlib/builtins.py:4671
2835
2840
msgid ""
2836
2841
" Re-do the merge of \"foobar\", using the weave merge algorithm, with\n"
2837
2842
" additional processing to reduce the size of conflict regions::"
2838
2843
msgstr ""
2839
2844
2840
#: bzrlib/builtins.py:4642
2845
#: bzrlib/builtins.py:4674
2841
2846
msgid " bzr remerge --merge-type weave --reprocess foobar"
2842
2847
msgstr ""
2843
2848
2844
#: bzrlib/builtins.py:4649
2849
#: bzrlib/builtins.py:4681
2845
2850
msgid "Show base revision text in conflicts."
2846
2851
msgstr ""
2847
2852
2848
#: bzrlib/builtins.py:4661
2853
#: bzrlib/builtins.py:4693
2849
2854
msgid ""
2850
2855
"Sorry, remerge only works after normal merges. Not cherrypicking or multi-"
2851
2856
"merges."
2852
2857
msgstr ""
2853
2858
2854
#: bzrlib/builtins.py:4717
2855
msgid "Revert files to a previous revision."
2859
#: bzrlib/builtins.py:4751
2860
msgid ""
2861
"Set files in the working tree back to the contents of a previous revision."
2856
2862
msgstr ""
2857
2863
2858
#: bzrlib/builtins.py:4719
2864
#: bzrlib/builtins.py:4753
2859
2865
msgid ""
2860
2866
"Giving a list of files will revert only those files. Otherwise, all files\n"
2861
2867
"will be reverted. If the revision is not specified with '--revision', the\n"
2862
"last committed revision is used."
2868
"working tree basis revision is used. A revert operation affects only the\n"
2869
"working tree, not any revision history like the branch and repository or\n"
2870
"the working tree basis revision."
2863
2871
msgstr ""
2864
2872
2865
#: bzrlib/builtins.py:4723
2873
#: bzrlib/builtins.py:4759
2866
2874
msgid ""
2867
2875
"To remove only some changes, without reverting to a prior version, use\n"
2868
2876
"merge instead. For example, \"merge . -r -2..-3\" (don't forget the \".\")\n"
2869
2877
"will remove the changes introduced by the second last commit (-2), without\n"
2870
2878
"affecting the changes introduced by the last commit (-1). To remove\n"
2871
"certain changes on a hunk-by-hunk basis, see the shelve command."
2879
"certain changes on a hunk-by-hunk basis, see the shelve command.\n"
2880
"To update the branch to a specific revision or the latest revision and\n"
2881
"update the working tree accordingly while preserving local changes, see the\n"
2882
"update command."
2872
2883
msgstr ""
2873
2884
2874
#: bzrlib/builtins.py:4729
2885
#: bzrlib/builtins.py:4768
2875
2886
msgid ""
2876
"By default, any files that have been manually changed will be backed up\n"
2877
"first. (Files changed only by merge are not backed up.) Backup files have\n"
2878
"'.~#~' appended to their name, where # is a number."
2887
"Uncommitted changes to files that are reverted will be discarded.\n"
2888
"Howver, by default, any files that have been manually changed will be\n"
2889
"backed up first. (Files changed only by merge are not backed up.) Backup\n"
2890
"files have '.~#~' appended to their name, where # is a number."
2879
2891
msgstr ""
2880
2892
2881
#: bzrlib/builtins.py:4733
2893
#: bzrlib/builtins.py:4773
2882
2894
msgid ""
2883
2895
"When you provide files, you can use their current pathname or the pathname\n"
2884
2896
"from the target revision. So you can use revert to \"undelete\" a file by\n"
2886
2898
"reverted."
2887
2899
msgstr ""
2888
2900
2889
#: bzrlib/builtins.py:4738
2901
#: bzrlib/builtins.py:4778
2890
2902
msgid ""
2891
2903
"If you have newly added files since the target revision, they will be\n"
2892
2904
"removed. If the files to be removed have been changed, backups will be\n"
2894
2906
"deleted."
2895
2907
msgstr ""
2896
2908
2897
#: bzrlib/builtins.py:4743
2909
#: bzrlib/builtins.py:4783
2898
2910
msgid ""
2899
2911
"The working tree contains a list of revisions that have been merged but\n"
2900
2912
"not yet committed. These revisions will be included as additional parents\n"
2906
2918
"reverting any files."
2907
2919
msgstr ""
2908
2920
2909
#: bzrlib/builtins.py:4752
2921
#: bzrlib/builtins.py:4792
2910
2922
msgid ""
2911
2923
"Using \"bzr revert --forget-merges\", it is possible to apply all of the\n"
2912
2924
"changes from a branch in a single revision. To do this, perform the merge\n"
2920
2932
"target branches."
2921
2933
msgstr ""
2922
2934
2923
#: bzrlib/builtins.py:4766
2935
#: bzrlib/builtins.py:4806
2924
2936
msgid "Do not save backups of reverted files."
2925
2937
msgstr ""
2926
2938
2927
#: bzrlib/builtins.py:4768
2939
#: bzrlib/builtins.py:4808
2928
2940
msgid "Remove pending merge marker, without changing any files."
2929
2941
msgstr ""
2930
2942
2931
#: bzrlib/builtins.py:4799
2943
#: bzrlib/builtins.py:4839
2932
2944
msgid ""
2933
2945
"Show help on a command or other topic.\n"
2934
2946
" "
2935
2947
msgstr ""
2936
2948
2937
#: bzrlib/builtins.py:4804
2949
#: bzrlib/builtins.py:4844
2938
2950
msgid "Show help on all commands."
2939
2951
msgstr ""
2940
2952
2941
#: bzrlib/builtins.py:4833
2953
#: bzrlib/builtins.py:4873
2942
2954
msgid "Show unmerged/unpulled revisions between two branches."
2943
2955
msgstr ""
2944
2956
2945
#: bzrlib/builtins.py:4835
2957
#: bzrlib/builtins.py:4875
2946
2958
msgid "OTHER_BRANCH may be local or remote."
2947
2959
msgstr ""
2948
2960
2949
#: bzrlib/builtins.py:4837
2961
#: bzrlib/builtins.py:4877
2950
2962
msgid ""
2951
2963
"To filter on a range of revisions, you can use the command -r begin..end\n"
2952
2964
"-r revision requests a specific revision, -r ..end or -r begin.. are\n"
2957
2969
" 0 - no missing revisions"
2958
2970
msgstr ""
2959
2971
2960
#: bzrlib/builtins.py:4847
2972
#: bzrlib/builtins.py:4887
2961
2973
msgid ""
2962
2974
" Determine the missing revisions between this and the branch at the\n"
2963
2975
" remembered pull location::"
2964
2976
msgstr ""
2965
2977
2966
#: bzrlib/builtins.py:4850
2978
#: bzrlib/builtins.py:4890
2967
2979
msgid " bzr missing"
2968
2980
msgstr ""
2969
2981
2970
#: bzrlib/builtins.py:4852
2982
#: bzrlib/builtins.py:4892
2971
2983
msgid " Determine the missing revisions between this and another branch::"
2972
2984
msgstr ""
2973
2985
2974
#: bzrlib/builtins.py:4854
2986
#: bzrlib/builtins.py:4894
2975
2987
msgid " bzr missing http://server/branch"
2976
2988
msgstr ""
2977
2989
2978
#: bzrlib/builtins.py:4856
2990
#: bzrlib/builtins.py:4896
2979
2991
msgid ""
2980
2992
" Determine the missing revisions up to a specific revision on the other\n"
2981
2993
" branch::"
2982
2994
msgstr ""
2983
2995
2984
#: bzrlib/builtins.py:4859
2996
#: bzrlib/builtins.py:4899
2985
2997
msgid " bzr missing -r ..-10"
2986
2998
msgstr ""
2987
2999
2988
#: bzrlib/builtins.py:4861
3000
#: bzrlib/builtins.py:4901
2989
3001
msgid ""
2990
3002
" Determine the missing revisions up to a specific revision on this\n"
2991
3003
" branch::"
2992
3004
msgstr ""
2993
3005
2994
#: bzrlib/builtins.py:4864
3006
#: bzrlib/builtins.py:4904
2995
3007
msgid " bzr missing --my-revision ..-10"
2996
3008
msgstr ""
2997
3009
2998
#: bzrlib/builtins.py:4871
3010
#: bzrlib/builtins.py:4911
2999
3011
msgid "Reverse the order of revisions."
3000
3012
msgstr ""
3001
3013
3002
#: bzrlib/builtins.py:4873
3014
#: bzrlib/builtins.py:4913
3003
3015
msgid "Display changes in the local branch only."
3004
3016
msgstr ""
3005
3017
3006
#: bzrlib/builtins.py:4874
3018
#: bzrlib/builtins.py:4914
3007
3019
msgid "Same as --mine-only."
3008
3020
msgstr ""
3009
3021
3010
#: bzrlib/builtins.py:4876
3022
#: bzrlib/builtins.py:4916
3011
3023
msgid "Display changes in the remote branch only."
3012
3024
msgstr ""
3013
3025
3014
#: bzrlib/builtins.py:4877
3026
#: bzrlib/builtins.py:4917
3015
3027
msgid "Same as --theirs-only."
3016
3028
msgstr ""
3017
3029
3018
#: bzrlib/builtins.py:4882
3030
#: bzrlib/builtins.py:4922
3019
3031
msgid ""
3020
3032
"Filter on other branch revisions (inclusive). See \"help revisionspec\" for "
3021
3033
"details."
3022
3034
msgstr ""
3023
3035
3024
#: bzrlib/builtins.py:4886
3036
#: bzrlib/builtins.py:4926
3025
3037
msgid ""
3026
3038
"Filter on local branch revisions (inclusive). See \"help revisionspec\" for "
3027
3039
"details."
3028
3040
msgstr ""
3029
3041
3030
#: bzrlib/builtins.py:4889
3042
#: bzrlib/builtins.py:4929
3031
3043
msgid "Show all revisions in addition to the mainline ones."
3032
3044
msgstr ""
3033
3045
3034
#: bzrlib/builtins.py:4943
3046
#: bzrlib/builtins.py:4983
3035
3047
msgid "No peer location known or specified."
3036
3048
msgstr ""
3037
3049
3038
#: bzrlib/builtins.py:4947
3050
#: bzrlib/builtins.py:4987
3039
3051
msgid "Using saved parent location: {0}\n"
3040
3052
msgstr ""
3041
3053
3042
#: bzrlib/builtins.py:4980
3054
#: bzrlib/builtins.py:5020
3043
3055
#, python-format
3044
3056
msgid "You have %d extra revision:\n"
3045
3057
msgid_plural "You have %d extra revisions:\n"
3046
3058
msgstr[0] ""
3047
3059
msgstr[1] ""
3048
3060
3049
#: bzrlib/builtins.py:4996
3061
#: bzrlib/builtins.py:5040
3050
3062
#, python-format
3051
3063
msgid "You are missing %d revision:\n"
3052
3064
msgid_plural "You are missing %d revisions:\n"
3053
3065
msgstr[0] ""
3054
3066
msgstr[1] ""
3055
3067
3056
#: bzrlib/builtins.py:5008
3068
#: bzrlib/builtins.py:5055
3057
3069
msgid "This branch has no new revisions.\n"
3058
3070
msgstr ""
3059
3071
3060
#: bzrlib/builtins.py:5011
3072
#: bzrlib/builtins.py:5058
3061
3073
msgid "Other branch has no new revisions.\n"
3062
3074
msgstr ""
3063
3075
3064
#: bzrlib/builtins.py:5016
3076
#: bzrlib/builtins.py:5063
3065
3077
msgid "Branches are up to date.\n"
3066
3078
msgstr ""
3067
3079
3068
#: bzrlib/builtins.py:5027
3080
#: bzrlib/builtins.py:5074
3069
3081
msgid "Compress the data within a repository."
3070
3082
msgstr ""
3071
3083
3072
#: bzrlib/builtins.py:5029
3084
#: bzrlib/builtins.py:5076
3073
3085
msgid ""
3074
3086
"This operation compresses the data within a bazaar repository. As\n"
3075
3087
"bazaar supports automatic packing of repository, this operation is\n"
3076
3088
"normally not required to be done manually."
3077
3089
msgstr ""
3078
3090
3079
#: bzrlib/builtins.py:5033
3091
#: bzrlib/builtins.py:5080
3080
3092
msgid ""
3081
3093
"During the pack operation, bazaar takes a backup of existing repository\n"
3082
3094
"data, i.e. pack files. This backup is eventually removed by bazaar\n"
3085
3097
"used."
3086
3098
msgstr ""
3087
3099
3088
#: bzrlib/builtins.py:5039
3100
#: bzrlib/builtins.py:5086
3089
3101
msgid ""
3090
3102
"Warning: If you use --clean-obsolete-packs and your machine crashes\n"
3091
3103
"during or immediately after repacking, you may be left with a state\n"
3093
3105
"been. In this case the repository may be unusable."
3094
3106
msgstr ""
3095
3107
3096
#: bzrlib/builtins.py:5048
3108
#: bzrlib/builtins.py:5095
3097
3109
msgid "Delete obsolete packs to save disk space."
3098
3110
msgstr ""
3099
3111
3100
#: bzrlib/builtins.py:5062
3112
#: bzrlib/builtins.py:5109
3101
3113
msgid "List the installed plugins."
3102
3114
msgstr ""
3103
3115
3104
#: bzrlib/builtins.py:5064
3116
#: bzrlib/builtins.py:5111
3105
3117
msgid ""
3106
3118
"This command displays the list of installed plugins including\n"
3107
3119
"version of plugin and a short description of each."
3108
3120
msgstr ""
3109
3121
3110
#: bzrlib/builtins.py:5067
3122
#: bzrlib/builtins.py:5114
3111
3123
msgid "--verbose shows the path where each plugin is located."
3112
3124
msgstr ""
3113
3125
3114
#: bzrlib/builtins.py:5069
3126
#: bzrlib/builtins.py:5116
3115
3127
msgid ""
3116
3128
"A plugin is an external component for Bazaar that extends the\n"
3117
3129
"revision control system, by adding or replacing code in Bazaar.\n"
3120
3132
"customizing log output."
3121
3133
msgstr ""
3122
3134
3123
#: bzrlib/builtins.py:5075
3135
#: bzrlib/builtins.py:5122
3124
3136
msgid ""
3125
3137
"See the Bazaar Plugin Guide <http://doc.bazaar.canonical.com/plugins/en/>\n"
3126
3138
"for further information on plugins including where to find them and how to\n"
3128
3140
"plugins using the Python programming language."
3129
3141
msgstr ""
3130
3142
3131
#: bzrlib/builtins.py:5091
3143
#: bzrlib/builtins.py:5138
3132
3144
msgid "Show testament (signing-form) of a revision."
3133
3145
msgstr ""
3134
3146
3135
#: bzrlib/builtins.py:5094
3147
#: bzrlib/builtins.py:5141
3136
3148
msgid "Produce long-format testament."
3137
3149
msgstr ""
3138
3150
3139
#: bzrlib/builtins.py:5096
3151
#: bzrlib/builtins.py:5143
3140
3152
msgid "Produce a strict-format testament."
3141
3153
msgstr ""
3142
3154
3143
#: bzrlib/builtins.py:5122
3155
#: bzrlib/builtins.py:5169
3144
3156
msgid "Show the origin of each line in a file."
3145
3157
msgstr ""
3146
3158
3147
#: bzrlib/builtins.py:5124
3159
#: bzrlib/builtins.py:5171
3148
3160
msgid ""
3149
3161
"This prints out the given file with an annotation on the left side\n"
3150
3162
"indicating which revision, author and date introduced the change."
3151
3163
msgstr ""
3152
3164
3153
#: bzrlib/builtins.py:5127
3165
#: bzrlib/builtins.py:5174
3154
3166
msgid ""
3155
3167
"If the origin is the same for a run of consecutive lines, it is\n"
3156
3168
"shown only at the top, unless the --all option is given."
3157
3169
msgstr ""
3158
3170
3159
#: bzrlib/builtins.py:5135
3171
#: bzrlib/builtins.py:5182
3160
3172
msgid "Show annotations on all lines."
3161
3173
msgstr ""
3162
3174
3163
#: bzrlib/builtins.py:5136
3175
#: bzrlib/builtins.py:5183
3164
3176
msgid "Show commit date in annotations."
3165
3177
msgstr ""
3166
3178
3167
#: bzrlib/builtins.py:5223
3179
#: bzrlib/builtins.py:5270
3168
3180
msgid "Cannot sign a range of non-revision-history revisions"
3169
3181
msgstr ""
3170
3182
3171
#: bzrlib/builtins.py:5235
3183
#: bzrlib/builtins.py:5282
3172
3184
msgid "Please supply either one revision, or a range."
3173
3185
msgstr ""
3174
3186
3175
#: bzrlib/builtins.py:5239
3187
#: bzrlib/builtins.py:5286
3176
3188
msgid ""
3177
3189
"Convert the current branch into a checkout of the supplied branch.\n"
3178
3190
"If no branch is supplied, rebind to the last bound location."
3179
3191
msgstr ""
3180
3192
3181
#: bzrlib/builtins.py:5242
3193
#: bzrlib/builtins.py:5289
3182
3194
msgid ""
3183
3195
"Once converted into a checkout, commits must succeed on the master branch\n"
3184
3196
"before they will be applied to the local branch."
3185
3197
msgstr ""
3186
3198
3187
#: bzrlib/builtins.py:5245
3199
#: bzrlib/builtins.py:5292
3188
3200
msgid ""
3189
3201
"Bound branches use the nickname of its master branch unless it is set\n"
3190
3202
"locally, in which case binding will update the local nickname to be\n"
3191
3203
"that of the master."
3192
3204
msgstr ""
3193
3205
3194
#: bzrlib/builtins.py:5260
3206
#: bzrlib/builtins.py:5307
3195
3207
msgid "No location supplied. This format does not remember old locations."
3196
3208
msgstr ""
3197
3209
3198
#: bzrlib/builtins.py:5265
3210
#: bzrlib/builtins.py:5313
3199
3211
msgid "Branch is already bound"
3200
3212
msgstr ""
3201
3213
3202
#: bzrlib/builtins.py:5267
3214
#: bzrlib/builtins.py:5316
3203
3215
msgid "No location supplied and no previous location known"
3204
3216
msgstr ""
3205
3217
3206
#: bzrlib/builtins.py:5273
3218
#: bzrlib/builtins.py:5322
3207
3219
msgid "These branches have diverged. Try merging, and then bind again."
3208
3220
msgstr ""
3209
3221
3210
#: bzrlib/builtins.py:5280
3222
#: bzrlib/builtins.py:5329
3211
3223
msgid "Convert the current checkout into a regular branch."
3212
3224
msgstr ""
3213
3225
3214
#: bzrlib/builtins.py:5282
3226
#: bzrlib/builtins.py:5331
3215
3227
msgid ""
3216
3228
"After unbinding, the local branch is considered independent and subsequent\n"
3217
3229
"commits will be local only."
3218
3230
msgstr ""
3219
3231
3220
#: bzrlib/builtins.py:5293
3232
#: bzrlib/builtins.py:5342
3221
3233
msgid "Local branch is not bound"
3222
3234
msgstr ""
3223
3235
3224
#: bzrlib/builtins.py:5297
3236
#: bzrlib/builtins.py:5346
3225
3237
msgid "Remove the last committed revision."
3226
3238
msgstr ""
3227
3239
3228
#: bzrlib/builtins.py:5299
3240
#: bzrlib/builtins.py:5348
3229
3241
msgid ""
3230
3242
"--verbose will print out what is being removed.\n"
3231
3243
"--dry-run will go through all the motions, but not actually\n"
3232
3244
"remove anything."
3233
3245
msgstr ""
3234
3246
3235
#: bzrlib/builtins.py:5303
3247
#: bzrlib/builtins.py:5352
3236
3248
msgid ""
3237
3249
"If --revision is specified, uncommit revisions to leave the branch at the\n"
3238
3250
"specified revision. For example, \"bzr uncommit -r 15\" will leave the\n"
3239
3251
"branch at revision 15."
3240
3252
msgstr ""
3241
3253
3242
#: bzrlib/builtins.py:5307
3254
#: bzrlib/builtins.py:5356
3243
3255
msgid ""
3244
3256
"Uncommit leaves the working tree ready for a new commit. The only change\n"
3245
3257
"it may make is to restore any pending merges that were present before\n"
3246
3258
"the commit."
3247
3259
msgstr ""
3248
3260
3249
#: bzrlib/builtins.py:5318
3261
#: bzrlib/builtins.py:5367
3250
3262
msgid "Don't actually make changes."
3251
3263
msgstr ""
3252
3264
3253
#: bzrlib/builtins.py:5319
3265
#: bzrlib/builtins.py:5368
3254
3266
msgid "Say yes to all questions."
3255
3267
msgstr ""
3256
3268
3257
#: bzrlib/builtins.py:5321
3269
#: bzrlib/builtins.py:5370
3258
3270
msgid "Keep tags that point to removed revisions."
3259
3271
msgstr ""
3260
3272
3261
#: bzrlib/builtins.py:5323
3273
#: bzrlib/builtins.py:5372
3262
3274
msgid "Only remove the commits from the local branch when in a checkout."
3263
3275
msgstr ""
3264
3276
3265
#: bzrlib/builtins.py:5372
3277
#: bzrlib/builtins.py:5421
3266
3278
msgid "No revisions to uncommit.\n"
3267
3279
msgstr ""
3268
3280
3269
#: bzrlib/builtins.py:5387
3281
#: bzrlib/builtins.py:5436
3270
3282
msgid "Dry-run, pretending to remove the above revisions.\n"
3271
3283
msgstr ""
3272
3284
3273
#: bzrlib/builtins.py:5390
3285
#: bzrlib/builtins.py:5439
3274
3286
msgid "The above revision(s) will be removed.\n"
3275
3287
msgstr ""
3276
3288
3277
#: bzrlib/builtins.py:5394
3289
#: bzrlib/builtins.py:5443
3278
3290
msgid "Uncommit these revisions"
3279
3291
msgstr ""
3280
3292
3281
#: bzrlib/builtins.py:5397
3293
#: bzrlib/builtins.py:5446
3282
3294
msgid "Canceled\n"
3283
3295
msgstr ""
3284
3296
3285
#: bzrlib/builtins.py:5404
3297
#: bzrlib/builtins.py:5453
3286
3298
#, python-format
3287
3299
msgid ""
3288
3300
"You can restore the old tip by running:\n"
3289
3301
" bzr pull . -r revid:%s\n"
3290
3302
msgstr ""
3291
3303
3292
#: bzrlib/builtins.py:5409
3304
#: bzrlib/builtins.py:5458
3293
3305
msgid "Break a dead lock."
3294
3306
msgstr ""
3295
3307
3296
#: bzrlib/builtins.py:5411
3308
#: bzrlib/builtins.py:5460
3297
3309
msgid ""
3298
3310
"This command breaks a lock on a repository, branch, working directory or\n"
3299
3311
"config file."
3300
3312
msgstr ""
3301
3313
3302
#: bzrlib/builtins.py:5414
3314
#: bzrlib/builtins.py:5463
3303
3315
msgid ""
3304
3316
"CAUTION: Locks should only be broken when you are sure that the process\n"
3305
3317
"holding the lock has been stopped."
3306
3318
msgstr ""
3307
3319
3308
#: bzrlib/builtins.py:5417
3320
#: bzrlib/builtins.py:5466
3309
3321
msgid ""
3310
3322
"You can get information on what locks are open via the 'bzr info\n"
3311
3323
"[location]' command."
3312
3324
msgstr ""
3313
3325
3314
#: bzrlib/builtins.py:5420
3326
#: bzrlib/builtins.py:5469
3315
3327
msgid ""
3316
3328
":Examples:\n"
3317
3329
" bzr break-lock\n"
3319
3331
" bzr break-lock --conf ~/.bazaar"
3320
3332
msgstr ""
3321
3333
3322
#: bzrlib/builtins.py:5429
3334
#: bzrlib/builtins.py:5478
3323
3335
msgid "LOCATION is the directory where the config lock is."
3324
3336
msgstr ""
3325
3337
3326
#: bzrlib/builtins.py:5431
3338
#: bzrlib/builtins.py:5480
3327
3339
msgid "Do not ask for confirmation before breaking the lock."
3328
3340
msgstr ""
3329
3341
3330
#: bzrlib/builtins.py:5466
3342
#: bzrlib/builtins.py:5515
3331
3343
msgid "The Bazaar smart server protocol over TCP. (default port: 4155)"
3332
3344
msgstr ""
3333
3345
3334
#: bzrlib/builtins.py:5467
3346
#: bzrlib/builtins.py:5516
3335
3347
msgid "Run the bzr server."
3336
3348
msgstr ""
3337
3349
3338
#: bzrlib/builtins.py:5473
3350
#: bzrlib/builtins.py:5522
3339
3351
msgid "Serve on stdin/out for use from inetd or sshd."
3340
3352
msgstr ""
3341
3353
3342
#: bzrlib/builtins.py:5474
3354
#: bzrlib/builtins.py:5523
3343
3355
msgid "protocol"
3344
3356
msgstr ""
3345
3357
3346
#: bzrlib/builtins.py:5475
3358
#: bzrlib/builtins.py:5524
3347
3359
msgid "Protocol to serve."
3348
3360
msgstr ""
3349
3361
3350
#: bzrlib/builtins.py:5479
3362
#: bzrlib/builtins.py:5528
3363
msgid "Listen for connections on nominated address."
3364
msgstr ""
3365
3366
#: bzrlib/builtins.py:5530
3351
3367
msgid ""
3352
"Listen for connections on nominated port of the form [hostname:]portnumber. "
3353
"Passing 0 as the port number will result in a dynamically allocated port. "
3354
"The default port depends on the protocol."
3368
"Listen for connections on nominated port. Passing 0 as the port number will "
3369
"result in a dynamically allocated port. The default port depends on the "
3370
"protocol."
3355
3371
msgstr ""
3356
3372
3357
#: bzrlib/builtins.py:5485
3373
#: bzrlib/builtins.py:5535
3358
3374
msgid "Serve contents of this directory."
3359
3375
msgstr ""
3360
3376
3361
#: bzrlib/builtins.py:5487
3377
#: bzrlib/builtins.py:5537
3362
3378
msgid ""
3363
3379
"By default the server is a readonly server. Supplying --allow-writes "
3364
3380
"enables write access to the contents of the served directory and below. "
3367
3383
"uncontrolled write access to your file system."
3368
3384
msgstr ""
3369
3385
3370
#: bzrlib/builtins.py:5496
3386
#: bzrlib/builtins.py:5546
3371
3387
msgid "Override the default idle client timeout (5min)."
3372
3388
msgstr ""
3373
3389
3374
#: bzrlib/builtins.py:5546
3390
#: bzrlib/builtins.py:5564
3375
3391
msgid "Combine a tree into its containing tree."
3376
3392
msgstr ""
3377
3393
3378
#: bzrlib/builtins.py:5548
3394
#: bzrlib/builtins.py:5566
3379
3395
msgid "This command requires the target tree to be in a rich-root format."
3380
3396
msgstr ""
3381
3397
3382
#: bzrlib/builtins.py:5550
3398
#: bzrlib/builtins.py:5568
3383
3399
msgid ""
3384
3400
"The TREE argument should be an independent tree, inside another tree, but\n"
3385
3401
"not part of it. (Such trees can be produced by \"bzr split\", but also by\n"
3386
3402
"running \"bzr branch\" with the target inside a tree.)"
3387
3403
msgstr ""
3388
3404
3389
#: bzrlib/builtins.py:5554
3405
#: bzrlib/builtins.py:5572
3390
3406
msgid ""
3391
3407
"The result is a combined tree, with the subtree no longer an independent\n"
3392
3408
"part. This is marked as a merge of the subtree into the containing tree,\n"
3393
3409
"and all history is preserved."
3394
3410
msgstr ""
3395
3411
3396
#: bzrlib/builtins.py:5572
3412
#: bzrlib/builtins.py:5590
3397
3413
#, python-format
3398
3414
msgid ""
3399
3415
"Can't join trees because %s doesn't support rich root data.\n"
3400
3416
"You can use bzr upgrade on the repository."
3401
3417
msgstr ""
3402
3418
3403
#: bzrlib/builtins.py:5582 bzrlib/builtins.py:5588
3419
#: bzrlib/builtins.py:5600 bzrlib/builtins.py:5606
3404
3420
msgid "Cannot join {0}. {1}"
3405
3421
msgstr ""
3406
3422
3407
#: bzrlib/builtins.py:5592
3423
#: bzrlib/builtins.py:5610
3408
3424
msgid "Split a subdirectory of a tree into a separate tree."
3409
3425
msgstr ""
3410
3426
3411
#: bzrlib/builtins.py:5594
3427
#: bzrlib/builtins.py:5612
3412
3428
msgid ""
3413
3429
"This command will produce a target tree in a format that supports\n"
3414
3430
"rich roots, like 'rich-root' or 'rich-root-pack'. These formats cannot be\n"
3415
3431
"converted into earlier formats like 'dirstate-tags'."
3416
3432
msgstr ""
3417
3433
3418
#: bzrlib/builtins.py:5598
3434
#: bzrlib/builtins.py:5616
3419
3435
msgid ""
3420
3436
"The TREE argument should be a subdirectory of a working tree. That\n"
3421
3437
"subdirectory will be converted into an independent tree, with its own\n"
3422
3438
"branch. Commits in the top-level tree will not apply to the new subtree."
3423
3439
msgstr ""
3424
3440
3425
#: bzrlib/builtins.py:5678
3441
#: bzrlib/builtins.py:5696
3426
3442
msgid "No submit branch specified or known"
3427
3443
msgstr ""
3428
3444
3429
#: bzrlib/builtins.py:5686 bzrlib/send.py:108
3445
#: bzrlib/builtins.py:5705 bzrlib/send.py:109
3430
3446
msgid "No public branch specified or known"
3431
3447
msgstr ""
3432
3448
3433
#: bzrlib/builtins.py:5691
3449
#: bzrlib/builtins.py:5710
3434
3450
msgid "bzr merge-directive takes at most two one revision identifiers"
3435
3451
msgstr ""
3436
3452
3437
#: bzrlib/builtins.py:5700
3453
#: bzrlib/builtins.py:5719
3438
3454
msgid "No revisions to bundle."
3439
3455
msgstr ""
3440
3456
3441
#: bzrlib/builtins.py:5719
3457
#: bzrlib/builtins.py:5738
3442
3458
msgid "Mail or create a merge-directive for submitting changes."
3443
3459
msgstr ""
3444
3460
3445
#: bzrlib/builtins.py:5721
3461
#: bzrlib/builtins.py:5740
3446
3462
msgid "A merge directive provides many things needed for requesting merges:"
3447
3463
msgstr ""
3448
3464
3449
#: bzrlib/builtins.py:5723
3465
#: bzrlib/builtins.py:5742
3450
3466
msgid "* A machine-readable description of the merge to perform"
3451
3467
msgstr ""
3452
3468
3453
#: bzrlib/builtins.py:5725
3469
#: bzrlib/builtins.py:5744
3454
3470
msgid "* An optional patch that is a preview of the changes requested"
3455
3471
msgstr ""
3456
3472
3457
#: bzrlib/builtins.py:5727
3473
#: bzrlib/builtins.py:5746
3458
3474
msgid ""
3459
3475
"* An optional bundle of revision data, so that the changes can be applied\n"
3460
3476
" directly from the merge directive, without retrieving data from a\n"
3461
3477
" branch."
3462
3478
msgstr ""
3463
3479
3464
#: bzrlib/builtins.py:5731
3480
#: bzrlib/builtins.py:5750
3465
3481
msgid ""
3466
3482
"`bzr send` creates a compact data set that, when applied using bzr\n"
3467
3483
"merge, has the same effect as merging from the source branch. "
3468
3484
msgstr ""
3469
3485
3470
#: bzrlib/builtins.py:5734
3486
#: bzrlib/builtins.py:5753
3471
3487
msgid ""
3472
3488
"By default the merge directive is self-contained and can be applied to any\n"
3473
3489
"branch containing submit_branch in its ancestory without needing access to\n"
3474
3490
"the source branch."
3475
3491
msgstr ""
3476
3492
3477
#: bzrlib/builtins.py:5738
3493
#: bzrlib/builtins.py:5757
3478
3494
msgid ""
3479
3495
"If --no-bundle is specified, then Bazaar doesn't send the contents of the\n"
3480
3496
"revisions, but only a structured request to merge from the\n"
3483
3499
"included if known, so that people can check it later."
3484
3500
msgstr ""
3485
3501
3486
#: bzrlib/builtins.py:5744
3502
#: bzrlib/builtins.py:5763
3487
3503
msgid ""
3488
3504
"The submit branch defaults to the parent of the source branch, but can be\n"
3489
3505
"overridden. Both submit branch and public branch will be remembered in\n"
3492
3508
"be changed using --from."
3493
3509
msgstr ""
3494
3510
3495
#: bzrlib/builtins.py:5750
3511
#: bzrlib/builtins.py:5769
3496
3512
msgid ""
3497
3513
"Both the submit branch and the public branch follow the usual behavior with\n"
3498
3514
"respect to --remember: If there is no default location set, the first send\n"
3501
3517
"--remember. The value will only be saved if the location can be accessed."
3502
3518
msgstr ""
3503
3519
3504
#: bzrlib/builtins.py:5756
3520
#: bzrlib/builtins.py:5775
3505
3521
msgid ""
3506
3522
"In order to calculate those changes, bzr must analyse the submit branch.\n"
3507
3523
"Therefore it is most efficient for the submit branch to be a local mirror.\n"
3509
3525
"in the merge directive."
3510
3526
msgstr ""
3511
3527
3512
#: bzrlib/builtins.py:5761
3528
#: bzrlib/builtins.py:5780
3513
3529
msgid ""
3514
3530
"The default behaviour is to send the merge directive by mail, unless -o is\n"
3515
3531
"given, in which case it is sent to a file."
3516
3532
msgstr ""
3517
3533
3518
#: bzrlib/builtins.py:5764
3534
#: bzrlib/builtins.py:5783
3519
3535
msgid ""
3520
3536
"Mail is sent using your preferred mail program. This should be transparent\n"
3521
3537
"on Windows (it uses MAPI). On Unix, it requires the xdg-email utility.\n"
3522
3538
"If the preferred client can't be found (or used), your editor will be used."
3523
3539
msgstr ""
3524
3540
3525
#: bzrlib/builtins.py:5768
3541
#: bzrlib/builtins.py:5787
3526
3542
msgid ""
3527
3543
"To use a specific mail program, set the mail_client configuration option.\n"
3528
3544
"(For Thunderbird 1.5, this works around some bugs.) Supported values for\n"
3534
3550
"supported clients."
3535
3551
msgstr ""
3536
3552
3537
#: bzrlib/builtins.py:5775
3553
#: bzrlib/builtins.py:5794
3538
3554
msgid ""
3539
3555
"If mail is being sent, a to address is required. This can be supplied\n"
3540
3556
"either on the commandline, by setting the submit_to configuration\n"
3542
3558
"in the submit branch."
3543
3559
msgstr ""
3544
3560
3545
#: bzrlib/builtins.py:5780
3561
#: bzrlib/builtins.py:5799
3546
3562
msgid ""
3547
3563
"Two formats are currently supported: \"4\" uses revision bundle format 4 "
3548
3564
"and\n"
3552
3568
"format 1. It is compatible with Bazaar 0.12 - 0.18."
3553
3569
msgstr ""
3554
3570
3555
#: bzrlib/builtins.py:5786
3571
#: bzrlib/builtins.py:5805
3556
3572
msgid ""
3557
3573
"The merge directives created by bzr send may be applied using bzr merge or\n"
3558
3574
"bzr pull by specifying a file containing a merge directive as the location."
3559
3575
msgstr ""
3560
3576
3561
#: bzrlib/builtins.py:5789
3577
#: bzrlib/builtins.py:5808
3562
3578
msgid ""
3563
3579
"bzr send makes extensive use of public locations to map local locations "
3564
3580
"into\n"
3566
3582
"set them, and use `bzr info` to display them."
3567
3583
msgstr ""
3568
3584
3569
#: bzrlib/builtins.py:5813
3585
#: bzrlib/builtins.py:5832
3570
3586
msgid "Write merge directive to this file or directory; use - for stdout."
3571
3587
msgstr ""
3572
3588
3573
#: bzrlib/builtins.py:5817
3589
#: bzrlib/builtins.py:5836
3574
3590
msgid ""
3575
3591
"Refuse to send if there are uncommitted changes in the working tree, --no-"
3576
3592
"strict disables the check."
3577
3593
msgstr ""
3578
3594
3579
#: bzrlib/builtins.py:5819
3595
#: bzrlib/builtins.py:5838
3580
3596
msgid "Mail the request to this address."
3581
3597
msgstr ""
3582
3598
3583
#: bzrlib/builtins.py:5823
3599
#: bzrlib/builtins.py:5842
3584
3600
msgid "Body for the email."
3585
3601
msgstr ""
3586
3602
3587
#: bzrlib/builtins.py:5876
3603
#: bzrlib/builtins.py:5895
3588
3604
msgid "Do not include a bundle in the merge directive."
3589
3605
msgstr ""
3590
3606
3591
#: bzrlib/builtins.py:5877
3607
#: bzrlib/builtins.py:5896
3592
3608
msgid "Do not include a preview patch in the merge directive."
3593
3609
msgstr ""
3594
3610
3595
#: bzrlib/builtins.py:5880
3611
#: bzrlib/builtins.py:5899
3596
3612
msgid "Remember submit and public branch."
3597
3613
msgstr ""
3598
3614
3599
#: bzrlib/builtins.py:5882
3615
#: bzrlib/builtins.py:5901
3600
3616
msgid ""
3601
3617
"Branch to generate the submission from, rather than the one containing the "
3602
3618
"working directory."
3603
3619
msgstr ""
3604
3620
3605
#: bzrlib/builtins.py:5892 bzrlib/cmd_version_info.py:76
3621
#: bzrlib/builtins.py:5911 bzrlib/cmd_version_info.py:76
3606
3622
msgid "format"
3607
3623
msgstr ""
3608
3624
3609
#: bzrlib/builtins.py:5893
3625
#: bzrlib/builtins.py:5912
3610
3626
msgid "Use the specified output format."
3611
3627
msgstr ""
3612
3628
3613
#: bzrlib/builtins.py:5915
3629
#: bzrlib/builtins.py:5934
3614
3630
msgid "Create, remove or modify a tag naming a revision."
3615
3631
msgstr ""
3616
3632
3617
#: bzrlib/builtins.py:5917
3633
#: bzrlib/builtins.py:5936
3618
3634
msgid ""
3619
3635
"Tags give human-meaningful names to revisions. Commands that take a -r\n"
3620
3636
"(--revision) option can be given -rtag:X, where X is any previously\n"
3621
3637
"created tag."
3622
3638
msgstr ""
3623
3639
3624
#: bzrlib/builtins.py:5921
3640
#: bzrlib/builtins.py:5940
3625
3641
msgid ""
3626
3642
"Tags are stored in the branch. Tags are copied from one branch to another\n"
3627
3643
"along when you branch, push, pull or merge."
3628
3644
msgstr ""
3629
3645
3630
#: bzrlib/builtins.py:5924
3646
#: bzrlib/builtins.py:5943
3631
3647
msgid ""
3632
3648
"It is an error to give a tag name that already exists unless you pass\n"
3633
3649
"--force, in which case the tag is moved to point to the new revision."
3634
3650
msgstr ""
3635
3651
3636
#: bzrlib/builtins.py:5927
3652
#: bzrlib/builtins.py:5946
3637
3653
msgid ""
3638
3654
"To rename a tag (change the name but keep it on the same revsion), run "
3639
3655
"``bzr\n"
3640
3656
"tag new-name -r tag:old-name`` and then ``bzr tag --delete oldname``."
3641
3657
msgstr ""
3642
3658
3643
#: bzrlib/builtins.py:5930
3659
#: bzrlib/builtins.py:5949
3644
3660
msgid ""
3645
3661
"If no tag name is specified it will be determined through the \n"
3646
3662
"'automatic_tag_name' hook. This can e.g. be used to automatically tag\n"
3648
3664
"details."
3649
3665
msgstr ""
3650
3666
3651
#: bzrlib/builtins.py:5940
3667
#: bzrlib/builtins.py:5959
3652
3668
msgid "Delete this tag rather than placing it."
3653
3669
msgstr ""
3654
3670
3655
#: bzrlib/builtins.py:5943
3671
#: bzrlib/builtins.py:5962
3656
3672
msgid "Branch in which to place the tag."
3657
3673
msgstr ""
3658
3674
3659
#: bzrlib/builtins.py:5945
3675
#: bzrlib/builtins.py:5964
3660
3676
msgid "Replace existing tags."
3661
3677
msgstr ""
3662
3678
3663
#: bzrlib/builtins.py:5960
3679
#: bzrlib/builtins.py:5979
3664
3680
msgid "No tag specified to delete."
3665
3681
msgstr ""
3666
3682
3667
#: bzrlib/builtins.py:5962
3683
#: bzrlib/builtins.py:5981
3668
3684
#, python-format
3669
3685
msgid "Deleted tag %s."
3670
3686
msgstr ""
3671
3687
3672
#: bzrlib/builtins.py:5976
3688
#: bzrlib/builtins.py:5995
3673
3689
msgid "Please specify a tag name."
3674
3690
msgstr ""
3675
3691
3676
#: bzrlib/builtins.py:5984
3692
#: bzrlib/builtins.py:6003
3677
3693
#, python-format
3678
3694
msgid "Tag %s already exists for that revision."
3679
3695
msgstr ""
3680
3696
3681
#: bzrlib/builtins.py:5988
3697
#: bzrlib/builtins.py:6007
3682
3698
#, python-format
3683
3699
msgid "Created tag %s."
3684
3700
msgstr ""
3685
3701
3686
#: bzrlib/builtins.py:5990
3702
#: bzrlib/builtins.py:6009
3687
3703
#, python-format
3688
3704
msgid "Updated tag %s."
3689
3705
msgstr ""
3690
3706
3691
#: bzrlib/builtins.py:5994
3707
#: bzrlib/builtins.py:6013
3692
3708
msgid "List tags."
3693
3709
msgstr ""
3694
3710
3695
#: bzrlib/builtins.py:5996
3711
#: bzrlib/builtins.py:6015
3696
3712
msgid ""
3697
3713
"This command shows a table of tag names and the revisions they reference."
3698
3714
msgstr ""
3699
3715
3700
#: bzrlib/builtins.py:6002
3716
#: bzrlib/builtins.py:6021
3701
3717
msgid "Branch whose tags should be displayed."
3702
3718
msgstr ""
3703
3719
3704
#: bzrlib/builtins.py:6004
3720
#: bzrlib/builtins.py:6023
3705
3721
msgid "Sort tags by different criteria."
3706
3722
msgstr ""
3707
3723
3708
#: bzrlib/builtins.py:6004
3724
#: bzrlib/builtins.py:6023
3709
3725
msgid "Sorting"
3710
3726
msgstr ""
3711
3727
3712
#: bzrlib/builtins.py:6073
3728
#: bzrlib/builtins.py:6092
3713
3729
msgid "Reconfigure the type of a bzr directory."
3714
3730
msgstr ""
3715
3731
3716
#: bzrlib/builtins.py:6075
3732
#: bzrlib/builtins.py:6094
3717
3733
msgid "A target configuration must be specified."
3718
3734
msgstr ""
3719
3735
3720
#: bzrlib/builtins.py:6077
3736
#: bzrlib/builtins.py:6096
3721
3737
msgid ""
3722
3738
"For checkouts, the bind-to location will be auto-detected if not specified.\n"
3723
3739
"The order of preference is\n"
3728
3744
"If none of these is available, --bind-to must be specified."
3729
3745
msgstr ""
3730
3746
3731
#: bzrlib/builtins.py:6091
3747
#: bzrlib/builtins.py:6110
3732
3748
msgid "Tree type"
3733
3749
msgstr ""
3734
3750
3735
#: bzrlib/builtins.py:6092
3751
#: bzrlib/builtins.py:6111
3736
3752
msgid "The relation between branch and tree."
3737
3753
msgstr ""
3738
3754
3739
#: bzrlib/builtins.py:6094
3755
#: bzrlib/builtins.py:6113
3740
3756
msgid "Reconfigure to be an unbound branch with no working tree."
3741
3757
msgstr ""
3742
3758
3743
#: bzrlib/builtins.py:6095
3759
#: bzrlib/builtins.py:6114
3744
3760
msgid "Reconfigure to be an unbound branch with a working tree."
3745
3761
msgstr ""
3746
3762
3747
#: bzrlib/builtins.py:6096
3763
#: bzrlib/builtins.py:6115
3748
3764
msgid "Reconfigure to be a bound branch with a working tree."
3749
3765
msgstr ""
3750
3766
3751
#: bzrlib/builtins.py:6097
3767
#: bzrlib/builtins.py:6116
3752
3768
msgid "Reconfigure to be a lightweight checkout (with no local history)."
3753
3769
msgstr ""
3754
3770
3755
#: bzrlib/builtins.py:6102
3771
#: bzrlib/builtins.py:6121
3756
3772
msgid "Repository type"
3757
3773
msgstr ""
3758
3774
3759
#: bzrlib/builtins.py:6103
3775
#: bzrlib/builtins.py:6122
3760
3776
msgid "Location fo the repository."
3761
3777
msgstr ""
3762
3778
3763
#: bzrlib/builtins.py:6105
3779
#: bzrlib/builtins.py:6124
3764
3780
msgid ""
3765
3781
"Reconfigure to be a standalone branch (i.e. stop using shared repository)."
3766
3782
msgstr ""
3767
3783
3768
#: bzrlib/builtins.py:6107
3784
#: bzrlib/builtins.py:6126
3769
3785
msgid "Reconfigure to use a shared repository."
3770
3786
msgstr ""
3771
3787
3772
#: bzrlib/builtins.py:6111
3788
#: bzrlib/builtins.py:6130
3773
3789
msgid "Trees in Repository"
3774
3790
msgstr ""
3775
3791
3776
#: bzrlib/builtins.py:6112
3792
#: bzrlib/builtins.py:6131
3777
3793
msgid "Whether new branches in the repository have trees."
3778
3794
msgstr ""
3779
3795
3780
#: bzrlib/builtins.py:6114
3796
#: bzrlib/builtins.py:6133
3781
3797
msgid ""
3782
3798
"Reconfigure repository to create working trees on branches by default."
3783
3799
msgstr ""
3784
3800
3785
#: bzrlib/builtins.py:6116
3801
#: bzrlib/builtins.py:6135
3786
3802
msgid ""
3787
3803
"Reconfigure repository to not create working trees on branches by default."
3788
3804
msgstr ""
3789
3805
3790
#: bzrlib/builtins.py:6119
3806
#: bzrlib/builtins.py:6138
3791
3807
msgid "Branch to bind checkout to."
3792
3808
msgstr ""
3793
3809
3794
#: bzrlib/builtins.py:6121
3810
#: bzrlib/builtins.py:6140
3795
3811
msgid "Perform reconfiguration even if local changes will be lost."
3796
3812
msgstr ""
3797
3813
3798
#: bzrlib/builtins.py:6124
3814
#: bzrlib/builtins.py:6143
3799
3815
msgid "Reconfigure a branch to be stacked on another branch."
3800
3816
msgstr ""
3801
3817
3802
#: bzrlib/builtins.py:6128
3818
#: bzrlib/builtins.py:6147
3803
3819
msgid ""
3804
3820
"Reconfigure a branch to be unstacked. This may require copying substantial "
3805
3821
"data into it."
3806
3822
msgstr ""
3807
3823
3808
#: bzrlib/builtins.py:6138
3824
#: bzrlib/builtins.py:6157
3809
3825
msgid "Can't use both --stacked-on and --unstacked"
3810
3826
msgstr ""
3811
3827
3812
#: bzrlib/builtins.py:6152
3828
#: bzrlib/builtins.py:6171
3813
3829
msgid "No target configuration specified"
3814
3830
msgstr ""
3815
3831
3816
#: bzrlib/builtins.py:6187
3832
#: bzrlib/builtins.py:6206
3817
3833
msgid "Set the branch of a checkout and update."
3818
3834
msgstr ""
3819
3835
3820
#: bzrlib/builtins.py:6189
3836
#: bzrlib/builtins.py:6208
3821
3837
msgid ""
3822
3838
"For lightweight checkouts, this changes the branch being referenced.\n"
3823
3839
"For heavyweight checkouts, this checks that there are no local commits\n"
3825
3841
"of the new location and binds to it."
3826
3842
msgstr ""
3827
3843
3828
#: bzrlib/builtins.py:6194
3844
#: bzrlib/builtins.py:6213
3829
3845
msgid ""
3830
3846
"In both cases, the working tree is updated and uncommitted changes\n"
3831
3847
"are merged. The user can commit or revert these as they desire."
3832
3848
msgstr ""
3833
3849
3834
#: bzrlib/builtins.py:6197
3850
#: bzrlib/builtins.py:6216
3835
3851
msgid "Pending merges need to be committed or reverted before using switch."
3836
3852
msgstr ""
3837
3853
3838
#: bzrlib/builtins.py:6199
3854
#: bzrlib/builtins.py:6218
3839
3855
msgid ""
3840
3856
"The path to the branch to switch to can be specified relative to the parent\n"
3841
3857
"directory of the current branch. For example, if you are currently in a\n"
3843
3859
"/path/to/newbranch."
3844
3860
msgstr ""
3845
3861
3846
#: bzrlib/builtins.py:6204
3862
#: bzrlib/builtins.py:6223
3847
3863
msgid ""
3848
3864
"Bound branches use the nickname of its master branch unless it is set\n"
3849
3865
"locally, in which case switching will update the local nickname to be\n"
3850
3866
"that of the master."
3851
3867
msgstr ""
3852
3868
3853
#: bzrlib/builtins.py:6212
3869
#: bzrlib/builtins.py:6231
3854
3870
msgid "Switch even if local commits will be lost."
3855
3871
msgstr ""
3856
3872
3857
#: bzrlib/builtins.py:6215
3873
#: bzrlib/builtins.py:6234
3858
3874
msgid "Create the target branch from this one before switching to it."
3859
3875
msgstr ""
3860
3876
3861
#: bzrlib/builtins.py:6229
3877
#: bzrlib/builtins.py:6248
3862
3878
msgid "You must supply either a revision or a location"
3863
3879
msgstr ""
3864
3880
3865
#: bzrlib/builtins.py:6242
3881
#: bzrlib/builtins.py:6261
3866
3882
msgid "cannot create branch without source branch"
3867
3883
msgstr ""
3868
3884
3869
#: bzrlib/builtins.py:6262
3885
#: bzrlib/builtins.py:6286
3870
3886
msgid "Manage filtered views."
3871
3887
msgstr ""
3872
3888
3873
#: bzrlib/builtins.py:6264
3889
#: bzrlib/builtins.py:6288
3874
3890
msgid ""
3875
3891
"Views provide a mask over the tree so that users can focus on\n"
3876
3892
"a subset of a tree when doing their work. After creating a view,\n"
3880
3896
"must be within the current view."
3881
3897
msgstr ""
3882
3898
3883
#: bzrlib/builtins.py:6271
3899
#: bzrlib/builtins.py:6295
3884
3900
msgid ""
3885
3901
"In most cases, a view has a short life-span: it is created to make\n"
3886
3902
"a selected change and is deleted once that change is committed.\n"
3888
3904
"and switch between them."
3889
3905
msgstr ""
3890
3906
3891
#: bzrlib/builtins.py:6276
3907
#: bzrlib/builtins.py:6300
3892
3908
msgid ""
3893
3909
"To disable the current view without deleting it, you can switch to\n"
3894
3910
"the pseudo view called ``off``. This can be useful when you need\n"
3896
3912
"want to switch back to your view after that."
3897
3913
msgstr ""
3898
3914
3899
#: bzrlib/builtins.py:6281
3915
#: bzrlib/builtins.py:6305
3900
3916
msgid ""
3901
3917
":Examples:\n"
3902
3918
" To define the current view::"
3903
3919
msgstr ""
3904
3920
3905
#: bzrlib/builtins.py:6284
3921
#: bzrlib/builtins.py:6308
3906
3922
msgid " bzr view file1 dir1 ..."
3907
3923
msgstr ""
3908
3924
3909
#: bzrlib/builtins.py:6286
3925
#: bzrlib/builtins.py:6310
3910
3926
msgid " To list the current view::"
3911
3927
msgstr ""
3912
3928
3913
#: bzrlib/builtins.py:6288
3929
#: bzrlib/builtins.py:6312
3914
3930
msgid " bzr view"
3915
3931
msgstr ""
3916
3932
3917
#: bzrlib/builtins.py:6290
3933
#: bzrlib/builtins.py:6314
3918
3934
msgid " To delete the current view::"
3919
3935
msgstr ""
3920
3936
3921
#: bzrlib/builtins.py:6292
3937
#: bzrlib/builtins.py:6316
3922
3938
msgid " bzr view --delete"
3923
3939
msgstr ""
3924
3940
3925
#: bzrlib/builtins.py:6294
3941
#: bzrlib/builtins.py:6318
3926
3942
msgid " To disable the current view without deleting it::"
3927
3943
msgstr ""
3928
3944
3929
#: bzrlib/builtins.py:6296
3945
#: bzrlib/builtins.py:6320
3930
3946
msgid " bzr view --switch off"
3931
3947
msgstr ""
3932
3948
3933
#: bzrlib/builtins.py:6298
3949
#: bzrlib/builtins.py:6322
3934
3950
msgid " To define a named view and switch to it::"
3935
3951
msgstr ""
3936
3952
3937
#: bzrlib/builtins.py:6300
3953
#: bzrlib/builtins.py:6324
3938
3954
msgid " bzr view --name view-name file1 dir1 ..."
3939
3955
msgstr ""
3940
3956
3941
#: bzrlib/builtins.py:6302
3957
#: bzrlib/builtins.py:6326
3942
3958
msgid " To list a named view::"
3943
3959
msgstr ""
3944
3960
3945
#: bzrlib/builtins.py:6304
3961
#: bzrlib/builtins.py:6328
3946
3962
msgid " bzr view --name view-name"
3947
3963
msgstr ""
3948
3964
3949
#: bzrlib/builtins.py:6306
3965
#: bzrlib/builtins.py:6330
3950
3966
msgid " To delete a named view::"
3951
3967
msgstr ""
3952
3968
3953
#: bzrlib/builtins.py:6308
3969
#: bzrlib/builtins.py:6332
3954
3970
msgid " bzr view --name view-name --delete"
3955
3971
msgstr ""
3956
3972
3957
#: bzrlib/builtins.py:6310
3973
#: bzrlib/builtins.py:6334
3958
3974
msgid " To switch to a named view::"
3959
3975
msgstr ""
3960
3976
3961
#: bzrlib/builtins.py:6312
3977
#: bzrlib/builtins.py:6336
3962
3978
msgid " bzr view --switch view-name"
3963
3979
msgstr ""
3964
3980
3965
#: bzrlib/builtins.py:6314
3981
#: bzrlib/builtins.py:6338
3966
3982
msgid " To list all views defined::"
3967
3983
msgstr ""
3968
3984
3969
#: bzrlib/builtins.py:6316
3985
#: bzrlib/builtins.py:6340
3970
3986
msgid " bzr view --all"
3971
3987
msgstr ""
3972
3988
3973
#: bzrlib/builtins.py:6318
3989
#: bzrlib/builtins.py:6342
3974
3990
msgid " To delete all views::"
3975
3991
msgstr ""
3976
3992
3977
#: bzrlib/builtins.py:6320
3993
#: bzrlib/builtins.py:6344
3978
3994
msgid " bzr view --delete --all"
3979
3995
msgstr ""
3980
3996
3981
#: bzrlib/builtins.py:6327
3997
#: bzrlib/builtins.py:6351
3982
3998
msgid "Apply list or delete action to all views."
3983
3999
msgstr ""
3984
4000
3985
#: bzrlib/builtins.py:6330
4001
#: bzrlib/builtins.py:6354
3986
4002
msgid "Delete the view."
3987
4003
msgstr ""
3988
4004
3989
#: bzrlib/builtins.py:6333
4005
#: bzrlib/builtins.py:6357
3990
4006
msgid "Name of the view to define, list or delete."
3991
4007
msgstr ""
3992
4008
3993
#: bzrlib/builtins.py:6337
4009
#: bzrlib/builtins.py:6361
3994
4010
msgid "Name of the view to switch to."
3995
4011
msgstr ""
3996
4012
3997
#: bzrlib/builtins.py:6356
4013
#: bzrlib/builtins.py:6380
3998
4014
msgid "Both --delete and a file list specified"
3999
4015
msgstr ""
4000
4016
4001
#: bzrlib/builtins.py:6359
4017
#: bzrlib/builtins.py:6383
4002
4018
msgid "Both --delete and --switch specified"
4003
4019
msgstr ""
4004
4020
4005
#: bzrlib/builtins.py:6362
4021
#: bzrlib/builtins.py:6386
4006
4022
msgid "Deleted all views.\n"
4007
4023
msgstr ""
4008
4024
4009
#: bzrlib/builtins.py:6364
4025
#: bzrlib/builtins.py:6388
4010
4026
msgid "No current view to delete"
4011
4027
msgstr ""
4012
4028
4013
#: bzrlib/builtins.py:6367
4029
#: bzrlib/builtins.py:6391
4014
4030
#, python-format
4015
4031
msgid "Deleted '%s' view.\n"
4016
4032
msgstr ""
4017
4033
4018
#: bzrlib/builtins.py:6371
4034
#: bzrlib/builtins.py:6395
4019
4035
msgid "Both --switch and a file list specified"
4020
4036
msgstr ""
4021
4037
4022
#: bzrlib/builtins.py:6374
4038
#: bzrlib/builtins.py:6398
4023
4039
msgid "Both --switch and --all specified"
4024
4040
msgstr ""
4025
4041
4026
#: bzrlib/builtins.py:6377
4042
#: bzrlib/builtins.py:6401
4027
4043
msgid "No current view to disable"
4028
4044
msgstr ""
4029
4045
4030
#: bzrlib/builtins.py:6379
4046
#: bzrlib/builtins.py:6403
4031
4047
#, python-format
4032
4048
msgid "Disabled '%s' view.\n"
4033
4049
msgstr ""
4034
4050
4035
#: bzrlib/builtins.py:6383 bzrlib/builtins.py:6405
4051
#: bzrlib/builtins.py:6407 bzrlib/builtins.py:6429
4036
4052
msgid "Using '{0}' view: {1}\n"
4037
4053
msgstr ""
4038
4054
4039
#: bzrlib/builtins.py:6386
4055
#: bzrlib/builtins.py:6410
4040
4056
msgid "Views defined:\n"
4041
4057
msgstr ""
4042
4058
4043
#: bzrlib/builtins.py:6395
4059
#: bzrlib/builtins.py:6419
4044
4060
msgid "No views defined.\n"
4045
4061
msgstr ""
4046
4062
4047
#: bzrlib/builtins.py:6402
4063
#: bzrlib/builtins.py:6426
4048
4064
msgid "Cannot change the 'off' pseudo view"
4049
4065
msgstr ""
4050
4066
4051
#: bzrlib/builtins.py:6410
4067
#: bzrlib/builtins.py:6434
4052
4068
msgid "No current view.\n"
4053
4069
msgstr ""
4054
4070
4055
#: bzrlib/builtins.py:6413
4071
#: bzrlib/builtins.py:6437
4056
4072
msgid "'{0}' view is: {1}\n"
4057
4073
msgstr ""
4058
4074
4059
#: bzrlib/builtins.py:6433
4075
#: bzrlib/builtins.py:6457
4060
4076
msgid " <no hooks installed>\n"
4061
4077
msgstr ""
4062
4078
4063
#: bzrlib/builtins.py:6437
4079
#: bzrlib/builtins.py:6461
4064
4080
msgid "Remove a branch."
4065
4081
msgstr ""
4066
4082
4067
#: bzrlib/builtins.py:6439
4083
#: bzrlib/builtins.py:6463
4068
4084
msgid ""
4069
4085
"This will remove the branch from the specified location but \n"
4070
4086
"will keep any working tree or repository in place."
4071
4087
msgstr ""
4072
4088
4073
#: bzrlib/builtins.py:6444
4089
#: bzrlib/builtins.py:6468
4074
4090
msgid " Remove the branch at repo/trunk::"
4075
4091
msgstr ""
4076
4092
4077
#: bzrlib/builtins.py:6446
4093
#: bzrlib/builtins.py:6470
4078
4094
msgid " bzr remove-branch repo/trunk"
4079
4095
msgstr ""
4080
4096
4081
#: bzrlib/builtins.py:6461
4097
#: bzrlib/builtins.py:6477
4098
msgid "Remove branch even if it is the active branch."
4099
msgstr ""
4100
4101
#: bzrlib/builtins.py:6491
4102
msgid "Branch is active. Use --force to remove it."
4103
msgstr ""
4104
4105
#: bzrlib/builtins.py:6495
4082
4106
msgid "Plaintext diff output."
4083
4107
msgstr ""
4084
4108
4085
#: bzrlib/builtins.py:6462
4109
#: bzrlib/builtins.py:6496
4086
4110
msgid "Temporarily set aside some changes from the current tree."
4087
4111
msgstr ""
4088
4112
4089
#: bzrlib/builtins.py:6464
4113
#: bzrlib/builtins.py:6498
4090
4114
msgid ""
4091
4115
"Shelve allows you to temporarily put changes you've made \"on the shelf\",\n"
4092
4116
"ie. out of the way, until a later time when you can bring them back from\n"
4095
4119
"will they survive its deletion."
4096
4120
msgstr ""
4097
4121
4098
#: bzrlib/builtins.py:6470
4122
#: bzrlib/builtins.py:6504
4099
4123
msgid "If shelve --list is specified, previously-shelved changes are listed."
4100
4124
msgstr ""
4101
4125
4102
#: bzrlib/builtins.py:6472
4126
#: bzrlib/builtins.py:6506
4103
4127
msgid ""
4104
4128
"Shelve is intended to help separate several sets of changes that have\n"
4105
4129
"been inappropriately mingled. If you just want to get rid of all changes\n"
4107
4131
"shelve all text changes at once, use shelve --all."
4108
4132
msgstr ""
4109
4133
4110
#: bzrlib/builtins.py:6477
4134
#: bzrlib/builtins.py:6511
4111
4135
msgid ""
4112
4136
"If filenames are specified, only the changes to those files will be\n"
4113
4137
"shelved. Other files will be left untouched."
4114
4138
msgstr ""
4115
4139
4116
#: bzrlib/builtins.py:6480
4140
#: bzrlib/builtins.py:6514
4117
4141
msgid ""
4118
4142
"If a revision is specified, changes since that revision will be shelved."
4119
4143
msgstr ""
4120
4144
4121
#: bzrlib/builtins.py:6482
4145
#: bzrlib/builtins.py:6516
4122
4146
msgid ""
4123
4147
"You can put multiple items on the shelf, and by default, 'unshelve' will\n"
4124
4148
"restore the most recently shelved changes."
4125
4149
msgstr ""
4126
4150
4127
#: bzrlib/builtins.py:6485
4151
#: bzrlib/builtins.py:6519
4128
4152
msgid ""
4129
4153
"For complicated changes, it is possible to edit the changes in a separate\n"
4130
4154
"editor program to decide what the file remaining in the working copy\n"
4131
4155
"should look like. To do this, add the configuration option"
4132
4156
msgstr ""
4133
4157
4134
#: bzrlib/builtins.py:6489
4158
#: bzrlib/builtins.py:6523
4135
4159
msgid " change_editor = PROGRAM @new_path @old_path"
4136
4160
msgstr ""
4137
4161
4138
#: bzrlib/builtins.py:6491
4162
#: bzrlib/builtins.py:6525
4139
4163
msgid ""
4140
4164
"where @new_path is replaced with the path of the new version of the \n"
4141
4165
"file and @old_path is replaced with the path of the old version of \n"
4144
4168
" "
4145
4169
msgstr ""
4146
4170
4147
#: bzrlib/builtins.py:6503
4171
#: bzrlib/builtins.py:6537
4148
4172
msgid "Shelve all changes."
4149
4173
msgstr ""
4150
4174
4151
#: bzrlib/builtins.py:6505
4175
#: bzrlib/builtins.py:6539
4152
4176
msgid "Method to use for writing diffs."
4153
4177
msgstr ""
4154
4178
4155
#: bzrlib/builtins.py:6505
4179
#: bzrlib/builtins.py:6539
4156
4180
msgid "writer"
4157
4181
msgstr ""
4158
4182
4159
#: bzrlib/builtins.py:6509
4183
#: bzrlib/builtins.py:6543
4160
4184
msgid "List shelved changes."
4161
4185
msgstr ""
4162
4186
4163
#: bzrlib/builtins.py:6511
4187
#: bzrlib/builtins.py:6545
4164
4188
msgid "Destroy removed changes instead of shelving them."
4165
4189
msgstr ""
4166
4190
4167
#: bzrlib/builtins.py:6540
4191
#: bzrlib/builtins.py:6574
4168
4192
msgid "No shelved changes."
4169
4193
msgstr ""
4170
4194
4171
#: bzrlib/builtins.py:6551
4195
#: bzrlib/builtins.py:6585
4172
4196
msgid "Restore shelved changes."
4173
4197
msgstr ""
4174
4198
4175
#: bzrlib/builtins.py:6553
4199
#: bzrlib/builtins.py:6587
4176
4200
msgid ""
4177
4201
"By default, the most recently shelved changes are restored. However if you\n"
4178
4202
"specify a shelf by id those changes will be restored instead. This works\n"
4179
4203
"best when the changes don't depend on each other."
4180
4204
msgstr ""
4181
4205
4182
#: bzrlib/builtins.py:6562
4206
#: bzrlib/builtins.py:6596
4183
4207
msgid "The action to perform."
4184
4208
msgstr ""
4185
4209
4186
#: bzrlib/builtins.py:6562 bzrlib/conflicts.py:694
4210
#: bzrlib/builtins.py:6596 bzrlib/conflicts.py:694
4187
4211
msgid "action"
4188
4212
msgstr ""
4189
4213
4190
#: bzrlib/builtins.py:6564
4214
#: bzrlib/builtins.py:6598
4191
4215
msgid "Apply changes and remove from the shelf."
4192
4216
msgstr ""
4193
4217
4194
#: bzrlib/builtins.py:6565
4218
#: bzrlib/builtins.py:6599
4195
4219
msgid "Show changes, but do not apply or remove them."
4196
4220
msgstr ""
4197
4221
4198
#: bzrlib/builtins.py:6566
4222
#: bzrlib/builtins.py:6600
4199
4223
msgid ""
4200
4224
"Instead of unshelving the changes, show the diff that would result from "
4201
4225
"unshelving."
4202
4226
msgstr ""
4203
4227
4204
#: bzrlib/builtins.py:6568
4228
#: bzrlib/builtins.py:6602
4205
4229
msgid "Delete changes without applying them."
4206
4230
msgstr ""
4207
4231
4208
#: bzrlib/builtins.py:6569
4232
#: bzrlib/builtins.py:6603
4209
4233
msgid "Apply changes but don't delete them."
4210
4234
msgstr ""
4211
4235
4212
#: bzrlib/builtins.py:6584
4236
#: bzrlib/builtins.py:6618
4213
4237
msgid "Remove unwanted files from working tree."
4214
4238
msgstr ""
4215
4239
4216
#: bzrlib/builtins.py:6586
4240
#: bzrlib/builtins.py:6620
4217
4241
msgid ""
4218
4242
"By default, only unknown files, not ignored files, are deleted. Versioned\n"
4219
4243
"files are never deleted."
4220
4244
msgstr ""
4221
4245
4222
#: bzrlib/builtins.py:6589
4246
#: bzrlib/builtins.py:6623
4223
4247
msgid ""
4224
4248
"Another class is 'detritus', which includes files emitted by bzr during\n"
4225
4249
"normal operations and selftests. (The value of these files decreases with\n"
4226
4250
"time.)"
4227
4251
msgstr ""
4228
4252
4229
#: bzrlib/builtins.py:6593
4253
#: bzrlib/builtins.py:6627
4230
4254
msgid ""
4231
4255
"If no options are specified, unknown files are deleted. Otherwise, option\n"
4232
4256
"flags are respected, and may be combined."
4233
4257
msgstr ""
4234
4258
4235
#: bzrlib/builtins.py:6596
4259
#: bzrlib/builtins.py:6630
4236
4260
msgid "To check what clean-tree will do, use --dry-run."
4237
4261
msgstr ""
4238
4262
4239
#: bzrlib/builtins.py:6599
4263
#: bzrlib/builtins.py:6633
4240
4264
msgid "Delete all ignored files."
4241
4265
msgstr ""
4242
4266
4243
#: bzrlib/builtins.py:6600
4267
#: bzrlib/builtins.py:6634
4244
4268
msgid ""
4245
4269
"Delete conflict files, merge and revert backups, and failed selftest dirs."
4246
4270
msgstr ""
4247
4271
4248
#: bzrlib/builtins.py:6603
4272
#: bzrlib/builtins.py:6637
4249
4273
msgid "Delete files unknown to bzr (default)."
4250
4274
msgstr ""
4251
4275
4252
#: bzrlib/builtins.py:6604
4276
#: bzrlib/builtins.py:6638
4253
4277
msgid "Show files to delete instead of deleting them."
4254
4278
msgstr ""
4255
4279
4256
#: bzrlib/builtins.py:6606
4280
#: bzrlib/builtins.py:6640
4257
4281
msgid "Do not prompt before deleting."
4258
4282
msgstr ""
4259
4283
4313
4337
msgstr[0] ""
4314
4338
msgstr[1] ""
4315
4339
4316
#: bzrlib/bzrdir.py:490
4340
#: bzrlib/bzrdir.py:487
4317
4341
msgid ""
4318
4342
"making backup of {0}\n"
4319
4343
" to {1}"
4320
4344
msgstr ""
4321
4345
4322
#: bzrlib/bzrdir.py:513
4346
#: bzrlib/bzrdir.py:510
4323
4347
msgid "renamed {0} to {1}"
4324
4348
msgstr ""
4325
4349
4326
#: bzrlib/bzrdir.py:1652
4350
#: bzrlib/bzrdir.py:1639
4327
4351
#, python-format
4328
4352
msgid ""
4329
4353
"Source repository format does not support stacking, using format:\n"
4330
4354
" %s"
4331
4355
msgstr ""
4332
4356
4333
#: bzrlib/bzrdir.py:1672
4357
#: bzrlib/bzrdir.py:1659
4334
4358
#, python-format
4335
4359
msgid ""
4336
4360
"Source branch format does not support stacking, using format:\n"
4337
4361
" %s"
4338
4362
msgstr ""
4339
4363
4340
#: bzrlib/bzrdir.py:1818
4364
#: bzrlib/bzrdir.py:1805
4341
4365
msgid "starting repository conversion"
4342
4366
msgstr ""
4343
4367
4344
#: bzrlib/bzrdir.py:2039
4368
#: bzrlib/bzrdir.py:2026
4345
4369
msgid "Using default stacking branch {0} at {1}"
4346
4370
msgstr ""
4347
4371
4524
4548
"supported formats or in a custom format based on a template."
4525
4549
msgstr ""
4526
4550
4527
#: bzrlib/cmd_version_info.py:59 en/help_topics/configuration.txt:700
4528
#: en/help_topics/configuration.txt:710
4551
#: bzrlib/cmd_version_info.py:59 en/help_topics/configuration.txt:712
4552
#: en/help_topics/configuration.txt:722
4529
4553
msgid "For example::"
4530
4554
msgstr ""
4531
4555
4644
4668
msgid ":See also: %s"
4645
4669
msgstr ""
4646
4670
4647
#: bzrlib/commands.py:816 bzrlib/gpg.py:324
4671
#: bzrlib/commands.py:826 bzrlib/gpg.py:347
4648
4672
msgid "Only ASCII permitted in option names"
4649
4673
msgstr ""
4650
4674
4651
#: bzrlib/commands.py:841 bzrlib/commands.py:849
4675
#: bzrlib/commands.py:851 bzrlib/commands.py:859
4652
4676
msgid "command {0!r} needs one or more {1}"
4653
4677
msgstr ""
4654
4678
4655
#: bzrlib/commands.py:858
4679
#: bzrlib/commands.py:868
4656
4680
msgid "command {0!r} requires argument {1}"
4657
4681
msgstr ""
4658
4682
4659
#: bzrlib/commands.py:865
4683
#: bzrlib/commands.py:875
4660
4684
msgid "extra argument to command {0}: {1}"
4661
4685
msgstr ""
4662
4686
4663
#: bzrlib/commands.py:962
4687
#: bzrlib/commands.py:972
4664
4688
#, python-format
4665
4689
msgid "Profile data written to \"%s\"."
4666
4690
msgstr ""
4703
4727
msgid "renamed"
4704
4728
msgstr ""
4705
4729
4706
#: bzrlib/commit.py:977
4730
#: bzrlib/commit.py:976
4707
4731
msgid "unchanged"
4708
4732
msgstr ""
4709
4733
4710
#: bzrlib/commit.py:999
4734
#: bzrlib/commit.py:998
4711
4735
msgid "{0} [{1}] - Stage"
4712
4736
msgstr ""
4713
4737
4714
#: bzrlib/commit.py:1002
4738
#: bzrlib/commit.py:1001
4715
4739
#, python-format
4716
4740
msgid "%s - Stage"
4717
4741
msgstr ""
4718
4742
4743
#: bzrlib/commit_signature_commands.py:34
4744
msgid "Sign all commits by a given committer."
4745
msgstr ""
4746
4719
4747
#: bzrlib/commit_signature_commands.py:36
4720
msgid "Sign all commits by a given committer."
4721
msgstr ""
4722
4723
#: bzrlib/commit_signature_commands.py:38
4724
4748
msgid ""
4725
4749
"If location is not specified the local tree is used.\n"
4726
4750
"If committer is not specified the default committer is used."
4727
4751
msgstr ""
4728
4752
4729
#: bzrlib/commit_signature_commands.py:41
4753
#: bzrlib/commit_signature_commands.py:39
4730
4754
msgid "This does not sign commits that already have signatures."
4731
4755
msgstr ""
4732
4756
4733
#: bzrlib/commit_signature_commands.py:49
4757
#: bzrlib/commit_signature_commands.py:47
4734
4758
msgid ""
4735
4759
"Don't actually sign anything, just print the revisions that would be signed."
4736
4760
msgstr ""
4737
4761
4762
#: bzrlib/commit_signature_commands.py:98
4763
#, python-format
4764
msgid "Signed %d revision.\n"
4765
msgid_plural "Signed %d revisions.\n"
4766
msgstr[0] ""
4767
msgstr[1] ""
4768
4738
4769
#: bzrlib/commit_signature_commands.py:103
4739
4770
msgid "Verify all commit signatures."
4740
4771
msgstr ""
4750
4781
"verification."
4751
4782
msgstr ""
4752
4783
4753
#: bzrlib/commit_signature_commands.py:147
4784
#: bzrlib/commit_signature_commands.py:148
4754
4785
msgid "Cannot verify a range of non-revision-history revisions"
4755
4786
msgstr ""
4756
4787
4757
#: bzrlib/commit_signature_commands.py:168
4788
#: bzrlib/commit_signature_commands.py:166
4758
4789
msgid "All commits signed with verifiable keys"
4759
4790
msgstr ""
4760
4791
4761
#: bzrlib/config.py:475
4792
#: bzrlib/config.py:436
4762
4793
msgid "Invalid config value for \"{0}\" value {1!r} is not an SI unit."
4763
4794
msgstr ""
4764
4795
4765
#: bzrlib/config.py:2485
4796
#: bzrlib/config.py:2452
4766
4797
msgid "{0} is not an SI unit."
4767
4798
msgstr ""
4768
4799
4769
#: bzrlib/config.py:2949
4800
#: bzrlib/config.py:2971
4770
4801
msgid ""
4771
4802
"Option {0} in section {1} of {2} was changed from {3} to {4}. The {5} value "
4772
4803
"will be saved."
4773
4804
msgstr ""
4774
4805
4775
#: bzrlib/config.py:3093
4806
#: bzrlib/config.py:3116
4776
4807
#, python-format
4777
4808
msgid "Invalid '%s', should be of the form 'name=value'"
4778
4809
msgstr ""
4779
4810
4780
#: bzrlib/config.py:3962
4811
#: bzrlib/config.py:4018
4781
4812
msgid "Display, set or remove a configuration option."
4782
4813
msgstr ""
4783
4814
4784
#: bzrlib/config.py:3964
4815
#: bzrlib/config.py:4020
4785
4816
msgid "Display the active value for a given option."
4786
4817
msgstr ""
4787
4818
4788
#: bzrlib/config.py:3966
4819
#: bzrlib/config.py:4022
4789
4820
msgid ""
4790
4821
"If --all is specified, NAME is interpreted as a regular expression and all\n"
4791
4822
"matching options are displayed mentioning their scope. The active value\n"
4792
4823
"that bzr will take into account is the first one displayed for each option."
4793
4824
msgstr ""
4794
4825
4795
#: bzrlib/config.py:3970
4826
#: bzrlib/config.py:4026
4796
4827
msgid "If no NAME is given, --all .* is implied."
4797
4828
msgstr ""
4798
4829
4799
#: bzrlib/config.py:3972
4830
#: bzrlib/config.py:4028
4800
4831
msgid ""
4801
4832
"Setting a value is achieved by using name=value without spaces. The value\n"
4802
4833
"is set in the most relevant scope and can be checked by displaying the\n"
4803
4834
"option again."
4804
4835
msgstr ""
4805
4836
4806
#: bzrlib/config.py:3984
4837
#: bzrlib/config.py:4040
4807
4838
msgid "Reduce the scope to the specified configuration file."
4808
4839
msgstr ""
4809
4840
4810
#: bzrlib/config.py:3988
4841
#: bzrlib/config.py:4044
4811
4842
msgid "Display all the defined values for the matching options."
4812
4843
msgstr ""
4813
4844
4814
#: bzrlib/config.py:3990
4845
#: bzrlib/config.py:4046
4815
4846
msgid "Remove the option from the configuration file."
4816
4847
msgstr ""
4817
4848
4891
4922
msgstr[0] ""
4892
4923
msgstr[1] ""
4893
4924
4894
#: bzrlib/controldir.py:710
4925
#: bzrlib/controldir.py:712
4895
4926
msgid "{0} is{1} redirected to {2}"
4896
4927
msgstr ""
4897
4928
5108
5139
msgstr ""
5109
5140
5110
5141
#: bzrlib/errors.py:715
5142
msgid "Invalid branch name: %(name)s"
5143
msgstr ""
5144
5145
#: bzrlib/errors.py:724
5111
5146
msgid "Parent branch already exists: \"%(path)s\"."
5112
5147
msgstr ""
5113
5148
5114
#: bzrlib/errors.py:721
5149
#: bzrlib/errors.py:730
5115
5150
msgid ""
5116
5151
"Directory contains a branch, but no working tree (use bzr checkout if you "
5117
5152
"wish to build a working tree): \"%(path)s\""
5118
5153
msgstr ""
5119
5154
5120
#: bzrlib/errors.py:726
5155
#: bzrlib/errors.py:735
5121
5156
msgid ""
5122
5157
"\"%(function)s\" called on an AtomicFile after it was closed: \"%(path)s\""
5123
5158
msgstr ""
5124
5159
5125
#: bzrlib/errors.py:736
5160
#: bzrlib/errors.py:745
5126
5161
msgid ""
5127
5162
"Parent not accessible given base \"%(base)s\" and relative path \"%(path)s\""
5128
5163
msgstr ""
5129
5164
5130
#: bzrlib/errors.py:746
5165
#: bzrlib/errors.py:755
5131
5166
msgid "No repository present: \"%(path)s\""
5132
5167
msgstr ""
5133
5168
5134
#: bzrlib/errors.py:753
5169
#: bzrlib/errors.py:762
5135
5170
msgid ""
5136
5171
"Unsupported branch format: %(format)s\n"
5137
5172
"Please run 'bzr upgrade'"
5138
5173
msgstr ""
5139
5174
5140
#: bzrlib/errors.py:759
5175
#: bzrlib/errors.py:768
5141
5176
msgid "Unknown %(kind)s format: %(format)r"
5142
5177
msgstr ""
5143
5178
5144
#: bzrlib/errors.py:768
5179
#: bzrlib/errors.py:777
5145
5180
msgid "Format %(format)s is not compatible with .bzr version %(bzrdir)s."
5146
5181
msgstr ""
5147
5182
5148
#: bzrlib/errors.py:778
5183
#: bzrlib/errors.py:787
5149
5184
msgid "Parse error on line %(lineno)d of %(format)s format: %(line)s"
5150
5185
msgstr ""
5151
5186
5152
#: bzrlib/errors.py:793
5187
#: bzrlib/errors.py:802
5153
5188
msgid ""
5154
5189
"%(target)s\n"
5155
5190
"is not compatible with\n"
5157
5192
"%(details)s"
5158
5193
msgstr ""
5159
5194
5160
#: bzrlib/errors.py:809
5195
#: bzrlib/errors.py:818
5161
5196
msgid "Revision is not compatible with %(repo_format)s"
5162
5197
msgstr ""
5163
5198
5164
#: bzrlib/errors.py:819
5199
#: bzrlib/errors.py:828
5165
5200
msgid "%(context_info)s%(path)s is already versioned."
5166
5201
msgstr ""
5167
5202
5168
#: bzrlib/errors.py:840
5203
#: bzrlib/errors.py:849
5169
5204
msgid "%(context_info)s%(path)s is not versioned."
5170
5205
msgstr ""
5171
5206
5172
#: bzrlib/errors.py:861
5207
#: bzrlib/errors.py:870
5173
5208
msgid "Path(s) are not versioned: %(paths_as_string)s"
5174
5209
msgstr ""
5175
5210
5176
#: bzrlib/errors.py:872
5211
#: bzrlib/errors.py:881
5177
5212
msgid "Path(s) do not exist: %(paths_as_string)s%(extra)s"
5178
5213
msgstr ""
5179
5214
5180
#: bzrlib/errors.py:891
5215
#: bzrlib/errors.py:900
5181
5216
msgid "Cannot operate on \"%(filename)s\" of unsupported kind \"%(kind)s\""
5182
5217
msgstr ""
5183
5218
5184
#: bzrlib/errors.py:899
5219
#: bzrlib/errors.py:908
5185
5220
msgid ""
5186
5221
"Filename %(filename)r is not valid in your current filesystem encoding "
5187
5222
"%(fs_encoding)s"
5188
5223
msgstr ""
5189
5224
5190
#: bzrlib/errors.py:910
5225
#: bzrlib/errors.py:919
5191
5226
msgid "Cannot operate on \"%(filename)s\" because it is a control file"
5192
5227
msgstr ""
5193
5228
5194
#: bzrlib/errors.py:928
5229
#: bzrlib/errors.py:937
5195
5230
msgid "The lock for '%(lock_description)s' is in use and cannot be broken."
5196
5231
msgstr ""
5197
5232
5198
#: bzrlib/errors.py:967
5233
#: bzrlib/errors.py:976
5199
5234
msgid "Cannot lock %(lock)s: %(why)s"
5200
5235
msgstr ""
5201
5236
5202
#: bzrlib/errors.py:977
5237
#: bzrlib/errors.py:986
5203
5238
msgid ""
5204
5239
"A transaction related operation was attempted after the transaction finished."
5205
5240
msgstr ""
5206
5241
5207
#: bzrlib/errors.py:1004
5242
#: bzrlib/errors.py:1013
5208
5243
msgid "Cannot lock: transport is read only: %(transport)s"
5209
5244
msgstr ""
5210
5245
5211
#: bzrlib/errors.py:1012
5246
#: bzrlib/errors.py:1021
5212
5247
msgid "Could not acquire lock \"%(lock)s\": %(msg)s"
5213
5248
msgstr ""
5214
5249
5215
#: bzrlib/errors.py:1023
5250
#: bzrlib/errors.py:1032
5216
5251
msgid ""
5217
5252
"Lock was broken while still open: %(lock)s - check storage consistency!"
5218
5253
msgstr ""
5219
5254
5220
#: bzrlib/errors.py:1034
5255
#: bzrlib/errors.py:1043
5221
5256
msgid ""
5222
5257
"Lock was released and re-acquired before being broken: %(lock)s: held by "
5223
5258
"%(holder)r, wanted to break %(target)r"
5224
5259
msgstr ""
5225
5260
5226
#: bzrlib/errors.py:1046
5261
#: bzrlib/errors.py:1055
5227
5262
msgid ""
5228
5263
"Lock is apparently held, but corrupted: %(corruption_info)s\n"
5229
5264
"Use 'bzr break-lock' to clear it"
5230
5265
msgstr ""
5231
5266
5232
#: bzrlib/errors.py:1059
5267
#: bzrlib/errors.py:1068
5233
5268
msgid "Lock not held: %(lock)s"
5234
5269
msgstr ""
5235
5270
5236
#: bzrlib/errors.py:1088
5271
#: bzrlib/errors.py:1097
5237
5272
msgid "No changes to commit"
5238
5273
msgstr ""
5239
5274
5240
#: bzrlib/errors.py:1093
5275
#: bzrlib/errors.py:1102
5241
5276
msgid ""
5242
5277
"Selected-file commit of merges is not supported yet: files %(files_str)s"
5243
5278
msgstr ""
5244
5279
5245
#: bzrlib/errors.py:1103
5280
#: bzrlib/errors.py:1112
5246
5281
msgid ""
5247
5282
"Excluding paths during commit is not supported by repository at "
5248
5283
"%(repository)r."
5249
5284
msgstr ""
5250
5285
5251
#: bzrlib/errors.py:1112
5286
#: bzrlib/errors.py:1121
5252
5287
msgid ""
5253
5288
"The specified commit message contains characters unsupported by the current "
5254
5289
"encoding."
5255
5290
msgstr ""
5256
5291
5257
#: bzrlib/errors.py:1118
5292
#: bzrlib/errors.py:1127
5258
5293
msgid "Upgrade URL cannot work with readonly URLs."
5259
5294
msgstr ""
5260
5295
5261
#: bzrlib/errors.py:1123
5296
#: bzrlib/errors.py:1132
5262
5297
msgid "The branch format %(format)s is already at the most recent format."
5263
5298
msgstr ""
5264
5299
5265
#: bzrlib/errors.py:1146
5300
#: bzrlib/errors.py:1155
5266
5301
msgid "Option --change does not accept revision ranges"
5267
5302
msgstr ""
5268
5303
5269
#: bzrlib/errors.py:1151
5304
#: bzrlib/errors.py:1160
5270
5305
msgid "No namespace registered for string: %(spec)r"
5271
5306
msgstr ""
5272
5307
5273
#: bzrlib/errors.py:1170
5308
#: bzrlib/errors.py:1179
5274
5309
msgid ""
5275
5310
"Requested revision: '%(spec)s' does not exist in branch: "
5276
5311
"%(branch_url)s%(extra)s"
5277
5312
msgstr ""
5278
5313
5279
#: bzrlib/errors.py:1184
5314
#: bzrlib/errors.py:1193
5280
5315
msgid ""
5281
5316
"Operation denied because it would change the main history, which is not "
5282
5317
"permitted by the append_revisions_only setting on branch \"%(location)s\"."
5283
5318
msgstr ""
5284
5319
5285
#: bzrlib/errors.py:1195
5320
#: bzrlib/errors.py:1204
5286
5321
msgid ""
5287
5322
"These branches have diverged. Use the missing command to see how.\n"
5288
5323
"Use the merge command to reconcile them."
5289
5324
msgstr ""
5290
5325
5291
#: bzrlib/errors.py:1215
5326
#: bzrlib/errors.py:1224
5292
5327
msgid ""
5293
5328
"Branches have no common ancestor, and no merge base revision was specified."
5294
5329
msgstr ""
5295
5330
5296
#: bzrlib/errors.py:1221
5331
#: bzrlib/errors.py:1230
5297
5332
msgid ""
5298
5333
"Selected merge cannot perform reverse cherrypicks. Try merge3 or diff3."
5299
5334
msgstr ""
5300
5335
5301
#: bzrlib/errors.py:1227
5336
#: bzrlib/errors.py:1236
5302
5337
msgid "Revisions have no common ancestor: %(revision_a)s %(revision_b)s"
5303
5338
msgstr ""
5304
5339
5305
#: bzrlib/errors.py:1236
5340
#: bzrlib/errors.py:1245
5306
5341
msgid ""
5307
5342
"Revisions are not derived from the same root: %(revision_a)s %(revision_b)s."
5308
5343
msgstr ""
5309
5344
5310
#: bzrlib/errors.py:1245
5345
#: bzrlib/errors.py:1254
5311
5346
msgid "Revision %(rev_id)s is not an ancestor of %(not_ancestor_id)s"
5312
5347
msgstr ""
5313
5348
5314
#: bzrlib/errors.py:1254
5349
#: bzrlib/errors.py:1263
5315
5350
msgid "Branch %(branch)s has no commits."
5316
5351
msgstr ""
5317
5352
5318
#: bzrlib/errors.py:1272
5353
#: bzrlib/errors.py:1281
5319
5354
msgid ""
5320
5355
"Bound branch %(branch)s is out of date with master branch "
5321
5356
"%(master)s.%(extra_help)s"
5322
5357
msgstr ""
5323
5358
5324
#: bzrlib/errors.py:1284
5359
#: bzrlib/errors.py:1293
5325
5360
msgid ""
5326
5361
"Cannot commit to branch %(branch)s. It is bound to %(master)s, which is "
5327
5362
"bound to %(remote)s."
5328
5363
msgstr ""
5329
5364
5330
#: bzrlib/errors.py:1296
5365
#: bzrlib/errors.py:1305
5331
5366
msgid "Cannot pull --overwrite to a branch which is bound %(branch)s"
5332
5367
msgstr ""
5333
5368
5334
#: bzrlib/errors.py:1305
5369
#: bzrlib/errors.py:1314
5335
5370
msgid ""
5336
5371
"Unable to connect to target of bound branch %(branch)s => %(target)s: "
5337
5372
"%(error)s"
5338
5373
msgstr ""
5339
5374
5340
#: bzrlib/errors.py:1317
5375
#: bzrlib/errors.py:1326
5341
5376
msgid "Error in processing weave: %(msg)s"
5342
5377
msgstr ""
5343
5378
5344
#: bzrlib/errors.py:1326
5379
#: bzrlib/errors.py:1335
5345
5380
msgid "Revision {%(revision_id)s} already present in %(weave)s"
5346
5381
msgstr ""
5347
5382
5348
#: bzrlib/errors.py:1337
5383
#: bzrlib/errors.py:1346
5349
5384
msgid "Revision {%(revision_id)s} not present in %(weave)s"
5350
5385
msgstr ""
5351
5386
5352
#: bzrlib/errors.py:1347
5387
#: bzrlib/errors.py:1356
5353
5388
msgid "Weave invariant violated: %(what)s"
5354
5389
msgstr ""
5355
5390
5356
#: bzrlib/errors.py:1356
5391
#: bzrlib/errors.py:1365
5357
5392
msgid "Parents are mismatched between two revisions. %(msg)s"
5358
5393
msgstr ""
5359
5394
5360
#: bzrlib/errors.py:1378
5395
#: bzrlib/errors.py:1387
5361
5396
msgid ""
5362
5397
"Weaves differ on text content. Revision: {%(revision_id)s}, %(weave_a)s, "
5363
5398
"%(weave_b)s"
5364
5399
msgstr ""
5365
5400
5366
#: bzrlib/errors.py:1390
5401
#: bzrlib/errors.py:1399
5367
5402
msgid "Versioned file error"
5368
5403
msgstr ""
5369
5404
5370
#: bzrlib/errors.py:1395
5405
#: bzrlib/errors.py:1404
5371
5406
msgid "Revision {%(revision_id)s} not present in \"%(file_id)s\"."
5372
5407
msgstr ""
5373
5408
5374
#: bzrlib/errors.py:1405
5409
#: bzrlib/errors.py:1414
5375
5410
msgid "Revision {%(revision_id)s} already present in \"%(file_id)s\"."
5376
5411
msgstr ""
5377
5412
5378
#: bzrlib/errors.py:1415
5413
#: bzrlib/errors.py:1424
5379
5414
msgid "Text did not match its checksum: %(msg)s"
5380
5415
msgstr ""
5381
5416
5382
#: bzrlib/errors.py:1541
5417
#: bzrlib/errors.py:1550
5383
5418
msgid "Export format %(format)r not supported"
5384
5419
msgstr ""
5385
5420
5386
#: bzrlib/errors.py:1550
5421
#: bzrlib/errors.py:1559
5387
5422
msgid "Transport error: %(msg)s %(orig_error)s"
5388
5423
msgstr ""
5389
5424
5390
#: bzrlib/errors.py:1576
5425
#: bzrlib/errors.py:1585
5391
5426
msgid "Generic bzr smart protocol error: %(details)s"
5392
5427
msgstr ""
5393
5428
5394
#: bzrlib/errors.py:1584
5429
#: bzrlib/errors.py:1593
5395
5430
msgid "Received bad protocol version marker: %(marker)r"
5396
5431
msgstr ""
5397
5432
5398
#: bzrlib/errors.py:1616
5433
#: bzrlib/errors.py:1625
5399
5434
msgid "Transport operation not possible: %(msg)s %(orig_error)s"
5400
5435
msgstr ""
5401
5436
5402
#: bzrlib/errors.py:1621
5437
#: bzrlib/errors.py:1630
5403
5438
msgid "Connection error: %(msg)s %(orig_error)s"
5404
5439
msgstr ""
5405
5440
5406
#: bzrlib/errors.py:1626
5441
#: bzrlib/errors.py:1635
5407
5442
msgid "%(msg)s %(host)s%(port)s%(orig_error)s"
5408
5443
msgstr ""
5409
5444
5410
#: bzrlib/errors.py:1647
5445
#: bzrlib/errors.py:1656
5411
5446
msgid "Connection closed: %(msg)s %(orig_error)s"
5412
5447
msgstr ""
5413
5448
5414
#: bzrlib/errors.py:1652
5449
#: bzrlib/errors.py:1661
5415
5450
msgid "Connection Timeout: %(msg)s%(orig_error)s"
5416
5451
msgstr ""
5417
5452
5418
#: bzrlib/errors.py:1657
5453
#: bzrlib/errors.py:1666
5419
5454
msgid "Invalid range access in %(path)s at %(offset)s: %(msg)s"
5420
5455
msgstr ""
5421
5456
5422
#: bzrlib/errors.py:1667
5457
#: bzrlib/errors.py:1676
5423
5458
msgid "Invalid http response for %(path)s: %(msg)s%(orig_error)s"
5424
5459
msgstr ""
5425
5460
5426
#: bzrlib/errors.py:1682
5461
#: bzrlib/errors.py:1691
5427
5462
msgid "Certificate error: %(error)s"
5428
5463
msgstr ""
5429
5464
5430
#: bzrlib/errors.py:1690
5465
#: bzrlib/errors.py:1699
5431
5466
msgid "Invalid http range %(range)r for %(path)s: %(msg)s"
5432
5467
msgstr ""
5433
5468
5434
#: bzrlib/errors.py:1704
5469
#: bzrlib/errors.py:1713
5435
5470
msgid "HTTP MIME Boundary missing for %(path)s: %(msg)s"
5436
5471
msgstr ""
5437
5472
5438
#: bzrlib/errors.py:1712
5473
#: bzrlib/errors.py:1721
5439
5474
msgid "Invalid http Content-type \"%(ctype)s\" for %(path)s: %(msg)s"
5440
5475
msgstr ""
5441
5476
5442
#: bzrlib/errors.py:1721
5477
#: bzrlib/errors.py:1730
5443
5478
msgid "%(source)s is%(permanently)s redirected to %(target)s"
5444
5479
msgstr ""
5445
5480
5446
#: bzrlib/errors.py:1735
5481
#: bzrlib/errors.py:1744
5447
5482
msgid "Too many redirections"
5448
5483
msgstr ""
5449
5484
5450
#: bzrlib/errors.py:1740
5485
#: bzrlib/errors.py:1749
5451
5486
msgid "Working tree has conflicts."
5452
5487
msgstr ""
5453
5488
5454
#: bzrlib/errors.py:1744
5489
#: bzrlib/errors.py:1753
5455
5490
msgid "Config file %(filename)s is not UTF-8 encoded\n"
5456
5491
msgstr ""
5457
5492
5458
#: bzrlib/errors.py:1753
5493
#: bzrlib/errors.py:1762
5459
5494
msgid ""
5460
5495
"Error(s) parsing config file %(filename)s:\n"
5461
5496
"%(errors)s"
5462
5497
msgstr ""
5463
5498
5464
#: bzrlib/errors.py:1763
5499
#: bzrlib/errors.py:1772
5465
5500
msgid ""
5466
5501
"Bad value \"%(value)s\" for option \"%(name)s\".\n"
5467
5502
"See ``bzr help %(name)s``"
5468
5503
msgstr ""
5469
5504
5470
#: bzrlib/errors.py:1773
5505
#: bzrlib/errors.py:1782
5471
5506
msgid "%(username)r does not seem to contain a reasonable email address"
5472
5507
msgstr ""
5473
5508
5474
#: bzrlib/errors.py:1782
5509
#: bzrlib/errors.py:1791
5475
5510
msgid "Failed to GPG sign data with command \"%(command_line)s\""
5476
5511
msgstr ""
5477
5512
5478
#: bzrlib/errors.py:1790
5513
#: bzrlib/errors.py:1799
5479
5514
msgid "Failed to verify GPG signature data with error \"%(error)s\""
5480
5515
msgstr ""
5481
5516
5482
#: bzrlib/errors.py:1798
5517
#: bzrlib/errors.py:1807
5483
5518
msgid "Unable to import library \"%(library)s\": %(error)s"
5484
5519
msgstr ""
5485
5520
5486
#: bzrlib/errors.py:1806
5521
#: bzrlib/errors.py:1815
5487
5522
msgid "python-gpgme is not installed, it is needed to verify signatures"
5488
5523
msgstr ""
5489
5524
5490
#: bzrlib/errors.py:1814
5525
#: bzrlib/errors.py:1823
5491
5526
msgid ""
5492
5527
"The working tree for %(basedir)s has changed since the last commit, but "
5493
5528
"weave merge requires that it be unchanged"
5494
5529
msgstr ""
5495
5530
5496
#: bzrlib/errors.py:1824
5531
#: bzrlib/errors.py:1833
5497
5532
msgid ""
5498
5533
"Can't reprocess and show base, because reprocessing obscures the "
5499
5534
"relationship of conflicting lines to the base"
5500
5535
msgstr ""
5501
5536
5502
#: bzrlib/errors.py:1830
5537
#: bzrlib/errors.py:1839
5503
5538
msgid "Cycle in graph %(graph)r"
5504
5539
msgstr ""
5505
5540
5506
#: bzrlib/errors.py:1858
5541
#: bzrlib/errors.py:1867
5507
5542
msgid "File %(filename)s is not conflicted."
5508
5543
msgstr ""
5509
5544
5510
#: bzrlib/errors.py:1880
5545
#: bzrlib/errors.py:1889
5511
5546
msgid "No bundle was found in \"%(filename)s\"."
5512
5547
msgstr ""
5513
5548
5514
#: bzrlib/errors.py:1889
5549
#: bzrlib/errors.py:1898
5515
5550
msgid "Unable to handle bundle version %(version)s: %(msg)s"
5516
5551
msgstr ""
5517
5552
5518
#: bzrlib/errors.py:1899
5553
#: bzrlib/errors.py:1908
5519
5554
msgid "Branch %(base)s is missing revision %(text_revision)s of %(file_id)s"
5520
5555
msgstr ""
5521
5556
5522
#: bzrlib/errors.py:1912
5557
#: bzrlib/errors.py:1921
5523
5558
msgid "File id {%(file_id)s} already exists in inventory as %(entry)s"
5524
5559
msgstr ""
5525
5560
5526
#: bzrlib/errors.py:1922
5561
#: bzrlib/errors.py:1931
5527
5562
msgid "Key %(key)s is already present in map"
5528
5563
msgstr ""
5529
5564
5530
#: bzrlib/errors.py:1927
5565
#: bzrlib/errors.py:1936
5531
5566
msgid "The prefix %(prefix)s is in the help search path twice."
5532
5567
msgstr ""
5533
5568
5534
#: bzrlib/errors.py:1937
5569
#: bzrlib/errors.py:1946
5535
5570
msgid ""
5536
5571
"No final name for trans_id %(trans_id)r\n"
5537
5572
"file-id: %(file_id)r\n"
5538
5573
"root trans-id: %(root_trans_id)r\n"
5539
5574
msgstr ""
5540
5575
5541
#: bzrlib/errors.py:1969
5576
#: bzrlib/errors.py:1978
5542
5577
msgid "Attempt to reuse a transform that has already been applied."
5543
5578
msgstr ""
5544
5579
5545
#: bzrlib/errors.py:1974
5580
#: bzrlib/errors.py:1983
5546
5581
msgid "Moving the root directory is not supported at this time"
5547
5582
msgstr ""
5548
5583
5549
#: bzrlib/errors.py:1979
5584
#: bzrlib/errors.py:1988
5550
5585
msgid "Failed to rename %(from_path)s to %(to_path)s: %(why)s"
5551
5586
msgstr ""
5552
5587
5553
#: bzrlib/errors.py:1990
5588
#: bzrlib/errors.py:1999
5554
5589
msgid ""
5555
5590
"Could not move %(from_path)s%(operator)s %(to_path)s%(_has_extra)s%(extra)s"
5556
5591
msgstr ""
5557
5592
5558
#: bzrlib/errors.py:2026
5593
#: bzrlib/errors.py:2035
5559
5594
msgid ""
5560
5595
"Could not rename %(from_path)s%(operator)s %(to_path)s%(_has_extra)s%(extra)s"
5561
5596
msgstr ""
5562
5597
5563
#: bzrlib/errors.py:2056
5598
#: bzrlib/errors.py:2065
5564
5599
msgid "Unable to import paramiko (required for sftp support): %(error)s"
5565
5600
msgstr ""
5566
5601
5567
#: bzrlib/errors.py:2064
5602
#: bzrlib/errors.py:2073
5568
5603
msgid "Nothing to merge."
5569
5604
msgstr ""
5570
5605
5571
#: bzrlib/errors.py:2069
5606
#: bzrlib/errors.py:2078
5572
5607
msgid "Format %(format)s cannot be initialised by this version of bzr."
5573
5608
msgstr ""
5574
5609
5575
#: bzrlib/errors.py:2078
5610
#: bzrlib/errors.py:2087
5576
5611
msgid ""
5577
5612
"Cannot convert from format %(from_format)s to format %(format)s. "
5578
5613
"%(problem)s"
5579
5614
msgstr ""
5580
5615
5581
#: bzrlib/errors.py:2090
5616
#: bzrlib/errors.py:2099
5582
5617
msgid "Could not find an appropriate Differ for file \"%(path)s\""
5583
5618
msgstr ""
5584
5619
5585
#: bzrlib/errors.py:2098
5620
#: bzrlib/errors.py:2107
5586
5621
msgid "%(exe_name)s could not be found on this machine"
5587
5622
msgstr ""
5588
5623
5589
#: bzrlib/errors.py:2106
5624
#: bzrlib/errors.py:2115
5590
5625
msgid "Diff is not installed on this machine: %(msg)s"
5591
5626
msgstr ""
5592
5627
5593
#: bzrlib/errors.py:2114
5628
#: bzrlib/errors.py:2123
5594
5629
msgid "Diff3 is not installed on this machine."
5595
5630
msgstr ""
5596
5631
5597
#: bzrlib/errors.py:2120
5632
#: bzrlib/errors.py:2129
5598
5633
msgid "The content being inserted is already present."
5599
5634
msgstr ""
5600
5635
5601
#: bzrlib/errors.py:2125
5636
#: bzrlib/errors.py:2134
5602
5637
msgid ""
5603
5638
"This tree contains left-over files from a failed operation.\n"
5604
5639
" Please examine %(limbo_dir)s to see if it contains any files you wish "
5606
5641
" keep, and delete it when you are done."
5607
5642
msgstr ""
5608
5643
5609
#: bzrlib/errors.py:2136
5644
#: bzrlib/errors.py:2145
5610
5645
msgid ""
5611
5646
"This tree contains left-over files from a failed operation.\n"
5612
5647
" Please examine %(pending_deletion)s to see if it contains any files you\n"
5613
5648
" wish to keep, and delete it when you are done."
5614
5649
msgstr ""
5615
5650
5616
#: bzrlib/errors.py:2146
5651
#: bzrlib/errors.py:2155
5617
5652
msgid ""
5618
5653
"Unable to delete transform temporary directory %(limbo_dir)s.\n"
5619
5654
" Please examine %(limbo_dir)s to see if it contains any files you wish "
5621
5656
" keep, and delete it when you are done."
5622
5657
msgstr ""
5623
5658
5624
#: bzrlib/errors.py:2157
5659
#: bzrlib/errors.py:2166
5625
5660
msgid ""
5626
5661
"Unable to delete transform temporary directory %(pending_deletion)s. Please "
5627
5662
"examine %(pending_deletion)s to see if it contains any files you wish to "
5628
5663
"keep, and delete it when you are done."
5629
5664
msgstr ""
5630
5665
5631
#: bzrlib/errors.py:2167
5666
#: bzrlib/errors.py:2176
5632
5667
msgid "Working tree is out of date, please run 'bzr update'.%(more)s"
5633
5668
msgstr ""
5634
5669
5635
#: bzrlib/errors.py:2181
5670
#: bzrlib/errors.py:2190
5636
5671
msgid ""
5637
5672
"Public branch \"%(public_location)s\" lacks revision \"%(revstring)s\"."
5638
5673
msgstr ""
5639
5674
5640
#: bzrlib/errors.py:2194
5675
#: bzrlib/errors.py:2203
5641
5676
msgid "Error in merge modified format"
5642
5677
msgstr ""
5643
5678
5644
#: bzrlib/errors.py:2199
5679
#: bzrlib/errors.py:2208
5645
5680
msgid "Format error in conflict listings"
5646
5681
msgstr ""
5647
5682
5648
#: bzrlib/errors.py:2203
5683
#: bzrlib/errors.py:2212
5649
5684
msgid ""
5650
5685
"Inconsistency in dirstate file %(dirstate_path)s.\n"
5651
5686
"Error: %(description)s"
5652
5687
msgstr ""
5653
5688
5654
#: bzrlib/errors.py:2214
5689
#: bzrlib/errors.py:2223
5655
5690
msgid ""
5656
5691
"An error has been detected in the repository %(repo_path)s.\n"
5657
5692
"Please run bzr reconcile on this repository."
5658
5693
msgstr ""
5659
5694
5660
#: bzrlib/errors.py:2225
5695
#: bzrlib/errors.py:2234
5661
5696
msgid ""
5662
5697
"An inconsistent delta was supplied involving %(path)r, %(file_id)r\n"
5663
5698
"reason: %(reason)s"
5664
5699
msgstr ""
5665
5700
5666
#: bzrlib/errors.py:2238
5701
#: bzrlib/errors.py:2247
5667
5702
msgid ""
5668
5703
"An inconsistent delta was supplied: %(delta)r\n"
5669
5704
"reason: %(reason)s"
5670
5705
msgstr ""
5671
5706
5672
#: bzrlib/errors.py:2250
5707
#: bzrlib/errors.py:2259
5673
5708
msgid "To use this feature you must upgrade your branch at %(path)s."
5674
5709
msgstr ""
5675
5710
5676
#: bzrlib/errors.py:2259
5711
#: bzrlib/errors.py:2268
5677
5712
msgid "To use this feature you must upgrade your repository at %(path)s."
5678
5713
msgstr ""
5679
5714
5680
#: bzrlib/errors.py:2264
5715
#: bzrlib/errors.py:2273
5681
5716
msgid ""
5682
5717
"To use this feature you must upgrade your branch at %(path)s to a format "
5683
5718
"which supports rich roots."
5684
5719
msgstr ""
5685
5720
5686
#: bzrlib/errors.py:2270
5721
#: bzrlib/errors.py:2279
5687
5722
msgid "Cannot perform local-only commits on unbound branches."
5688
5723
msgstr ""
5689
5724
5690
#: bzrlib/errors.py:2275
5725
#: bzrlib/errors.py:2284
5691
5726
msgid "The method %(mname)s is not supported on objects of type %(tname)s."
5692
5727
msgstr ""
5693
5728
5694
#: bzrlib/errors.py:2296
5729
#: bzrlib/errors.py:2305
5695
5730
msgid "Ghost tags not supported by format %(format)r."
5696
5731
msgstr ""
5697
5732
5698
#: bzrlib/errors.py:2304
5733
#: bzrlib/errors.py:2313
5699
5734
msgid "File is binary but should be text."
5700
5735
msgstr ""
5701
5736
5702
#: bzrlib/errors.py:2309
5737
#: bzrlib/errors.py:2318
5703
5738
msgid "The path %(path)s is not permitted on this platform"
5704
5739
msgstr ""
5705
5740
5706
#: bzrlib/errors.py:2318
5741
#: bzrlib/errors.py:2327
5707
5742
msgid ""
5708
5743
"Testament did not match expected value.\n"
5709
5744
" For revision_id {%(revision_id)s}, expected {%(expected)s}, measured\n"
5710
5745
" {%(measured)s}"
5711
5746
msgstr ""
5712
5747
5713
#: bzrlib/errors.py:2330
5748
#: bzrlib/errors.py:2339
5714
5749
msgid "Not a bzr revision-bundle: %(text)r"
5715
5750
msgstr ""
5716
5751
5717
#: bzrlib/errors.py:2339
5752
#: bzrlib/errors.py:2348
5718
5753
msgid "Bad bzr revision-bundle: %(text)r"
5719
5754
msgstr ""
5720
5755
5721
#: bzrlib/errors.py:2348
5756
#: bzrlib/errors.py:2357
5722
5757
msgid "Malformed bzr revision-bundle header: %(text)r"
5723
5758
msgstr ""
5724
5759
5725
#: bzrlib/errors.py:2353
5760
#: bzrlib/errors.py:2362
5726
5761
msgid "Malformed patches in bzr revision-bundle: %(text)r"
5727
5762
msgstr ""
5728
5763
5729
#: bzrlib/errors.py:2358
5764
#: bzrlib/errors.py:2367
5730
5765
msgid "Malformed footer in bzr revision-bundle: %(text)r"
5731
5766
msgstr ""
5732
5767
5733
#: bzrlib/errors.py:2363
5768
#: bzrlib/errors.py:2372
5734
5769
msgid "End of line marker was not \\n in bzr revision-bundle"
5735
5770
msgstr ""
5736
5771
5737
#: bzrlib/errors.py:2373
5772
#: bzrlib/errors.py:2382
5738
5773
msgid "Bundle format %(bundle_format)s is incompatible with %(other)s"
5739
5774
msgstr ""
5740
5775
5741
#: bzrlib/errors.py:2383
5776
#: bzrlib/errors.py:2392
5742
5777
msgid "Root class for inventory serialization errors"
5743
5778
msgstr ""
5744
5779
5745
#: bzrlib/errors.py:2387
5780
#: bzrlib/errors.py:2396
5746
5781
msgid ""
5747
5782
"The inventory was not in the expected format:\n"
5748
5783
" %(msg)s"
5749
5784
msgstr ""
5750
5785
5751
#: bzrlib/errors.py:2396
5786
#: bzrlib/errors.py:2405
5752
5787
msgid "This operation requires rich root data storage"
5753
5788
msgstr ""
5754
5789
5755
#: bzrlib/errors.py:2409
5790
#: bzrlib/errors.py:2418
5756
5791
msgid "Unrecognised value for BZR_SSH environment variable: %(vendor)s"
5757
5792
msgstr ""
5758
5793
5759
#: bzrlib/errors.py:2418
5794
#: bzrlib/errors.py:2427
5760
5795
msgid ""
5761
5796
"Don't know how to handle SSH connections. Please set BZR_SSH environment "
5762
5797
"variable."
5763
5798
msgstr ""
5764
5799
5765
#: bzrlib/errors.py:2425
5800
#: bzrlib/errors.py:2434
5766
5801
msgid ""
5767
5802
"Could not determine revno for {%(revision_id)s} because its ancestry shows a "
5768
5803
"ghost at {%(ghost_revision_id)s}"
5769
5804
msgstr ""
5770
5805
5771
#: bzrlib/errors.py:2435
5806
#: bzrlib/errors.py:2444
5772
5807
msgid "Ghost revision {%(revision_id)s} cannot be used here."
5773
5808
msgstr ""
5774
5809
5775
#: bzrlib/errors.py:2486
5810
#: bzrlib/errors.py:2495
5776
5811
msgid ""
5777
5812
"A merge directive must provide either a bundle or a public branch location."
5778
5813
msgstr ""
5779
5814
5780
#: bzrlib/errors.py:2493
5815
#: bzrlib/errors.py:2502
5781
5816
msgid "Bad merge directive payload %(start)r"
5782
5817
msgstr ""
5783
5818
5784
#: bzrlib/errors.py:2503
5819
#: bzrlib/errors.py:2512
5785
5820
msgid "Preview patch does not match requested changes."
5786
5821
msgstr ""
5787
5822
5788
#: bzrlib/errors.py:2509
5823
#: bzrlib/errors.py:2518
5789
5824
msgid "Patch_type was %(patch_type)s, but no patch was supplied."
5790
5825
msgstr ""
5791
5826
5792
#: bzrlib/errors.py:2519
5827
#: bzrlib/errors.py:2528
5793
5828
msgid ""
5794
5829
"Your branch does not have all of the revisions required in order to merge "
5795
5830
"this merge directive and the target location specified in the merge "
5796
5831
"directive is not a branch: %(location)s."
5797
5832
msgstr ""
5798
5833
5799
#: bzrlib/errors.py:2531
5834
#: bzrlib/errors.py:2540
5800
5835
msgid "Unsupported entry kind %(kind)s"
5801
5836
msgstr ""
5802
5837
5803
#: bzrlib/errors.py:2539
5838
#: bzrlib/errors.py:2548
5804
5839
msgid "Can't subsume %(other_tree)s into %(tree)s. %(reason)s"
5805
5840
msgstr ""
5806
5841
5807
#: bzrlib/errors.py:2549
5842
#: bzrlib/errors.py:2558
5808
5843
msgid "Subsume target %(other_tree)s needs to be upgraded."
5809
5844
msgstr ""
5810
5845
5811
#: bzrlib/errors.py:2568
5846
#: bzrlib/errors.py:2577
5812
5847
msgid "No such tag: %(tag_name)s"
5813
5848
msgstr ""
5814
5849
5815
#: bzrlib/errors.py:2576
5850
#: bzrlib/errors.py:2585
5816
5851
msgid "Tags not supported by %(branch)s; you may be able to use bzr upgrade."
5817
5852
msgstr ""
5818
5853
5819
#: bzrlib/errors.py:2585
5854
#: bzrlib/errors.py:2594
5820
5855
msgid "Tag %(tag_name)s already exists."
5821
5856
msgstr ""
5822
5857
5823
#: bzrlib/errors.py:2593
5858
#: bzrlib/errors.py:2602
5824
5859
msgid ""
5825
5860
"Did not understand bug identifier %(bug_id)s: %(reason)s. See \"bzr help "
5826
5861
"bugs\" for more information on this feature."
5827
5862
msgstr ""
5828
5863
5829
#: bzrlib/errors.py:2603
5864
#: bzrlib/errors.py:2612
5830
5865
msgid ""
5831
5866
"The URL for bug tracker \"%(abbreviation)s\" doesn't contain {id}: %(url)s"
5832
5867
msgstr ""
5833
5868
5834
#: bzrlib/errors.py:2613
5869
#: bzrlib/errors.py:2622
5835
5870
msgid ""
5836
5871
"Cannot find registered bug tracker called %(abbreviation)s on %(branch)s"
5837
5872
msgstr ""
5838
5873
5839
#: bzrlib/errors.py:2623
5874
#: bzrlib/errors.py:2632
5840
5875
msgid "Invalid line in bugs property: '%(line)s'"
5841
5876
msgstr ""
5842
5877
5843
#: bzrlib/errors.py:2631
5878
#: bzrlib/errors.py:2640
5844
5879
msgid "Invalid bug status: '%(status)s'"
5845
5880
msgstr ""
5846
5881
5847
#: bzrlib/errors.py:2639
5882
#: bzrlib/errors.py:2648
5848
5883
msgid "Could not understand response from smart server: %(response_tuple)r"
5849
5884
msgstr ""
5850
5885
5851
#: bzrlib/errors.py:2678
5886
#: bzrlib/errors.py:2687
5852
5887
msgid "Server sent an unexpected error: %(error_tuple)r"
5853
5888
msgstr ""
5854
5889
5855
#: bzrlib/errors.py:2697
5890
#: bzrlib/errors.py:2706
5856
5891
msgid "Unrecognised container format: %(container_format)r"
5857
5892
msgstr ""
5858
5893
5859
#: bzrlib/errors.py:2705
5894
#: bzrlib/errors.py:2714
5860
5895
msgid "Unexpected end of container stream"
5861
5896
msgstr ""
5862
5897
5863
#: bzrlib/errors.py:2710
5898
#: bzrlib/errors.py:2719
5864
5899
msgid "Unknown record type: %(record_type)r"
5865
5900
msgstr ""
5866
5901
5867
#: bzrlib/errors.py:2718
5902
#: bzrlib/errors.py:2727
5868
5903
msgid "Invalid record: %(reason)s"
5869
5904
msgstr ""
5870
5905
5871
#: bzrlib/errors.py:2726
5906
#: bzrlib/errors.py:2735
5872
5907
msgid "Container has data after end marker: %(excess)r"
5873
5908
msgstr ""
5874
5909
5875
#: bzrlib/errors.py:2734
5910
#: bzrlib/errors.py:2743
5876
5911
msgid "Container has multiple records with the same name: %(name)s"
5877
5912
msgstr ""
5878
5913
5879
#: bzrlib/errors.py:2747
5914
#: bzrlib/errors.py:2756
5880
5915
msgid "Corrupt or incompatible data stream: %(reason)s"
5881
5916
msgstr ""
5882
5917
5883
#: bzrlib/errors.py:2755
5918
#: bzrlib/errors.py:2764
5884
5919
msgid "SMTP error: %(error)s"
5885
5920
msgstr ""
5886
5921
5887
#: bzrlib/errors.py:2763
5922
#: bzrlib/errors.py:2772
5888
5923
msgid "No message supplied."
5889
5924
msgstr ""
5890
5925
5891
#: bzrlib/errors.py:2768
5926
#: bzrlib/errors.py:2777
5892
5927
msgid "No mail-to address (--mail-to) or output (-o) specified."
5893
5928
msgstr ""
5894
5929
5895
#: bzrlib/errors.py:2773
5896
msgid "Unknown mail client: %(mail_client)s"
5897
msgstr ""
5898
5899
#: bzrlib/errors.py:2781
5930
#: bzrlib/errors.py:2782
5900
5931
msgid ""
5901
5932
"Unable to find mail client with the following names: "
5902
5933
"%(mail_command_list_string)s"
5903
5934
msgstr ""
5904
5935
5905
#: bzrlib/errors.py:2791
5936
#: bzrlib/errors.py:2792
5906
5937
msgid "SMTP connection to %(host)s refused"
5907
5938
msgstr ""
5908
5939
5909
#: bzrlib/errors.py:2800
5940
#: bzrlib/errors.py:2801
5910
5941
msgid "Please specify smtp_server. No server at default %(host)s."
5911
5942
msgstr ""
5912
5943
5913
#: bzrlib/errors.py:2814
5944
#: bzrlib/errors.py:2815
5914
5945
msgid ""
5915
5946
"'%(display_url)s' is not in sync with %(target_url)s. See bzr help sync-for-"
5916
5947
"reconfigure."
5917
5948
msgstr ""
5918
5949
5919
#: bzrlib/errors.py:2826
5950
#: bzrlib/errors.py:2827
5920
5951
msgid "'%(display_url)s' is already a branch."
5921
5952
msgstr ""
5922
5953
5923
#: bzrlib/errors.py:2831
5954
#: bzrlib/errors.py:2832
5924
5955
msgid "'%(display_url)s' is already a tree."
5925
5956
msgstr ""
5926
5957
5927
#: bzrlib/errors.py:2836
5958
#: bzrlib/errors.py:2837
5928
5959
msgid "'%(display_url)s' is already a checkout."
5929
5960
msgstr ""
5930
5961
5931
#: bzrlib/errors.py:2841
5962
#: bzrlib/errors.py:2842
5932
5963
msgid "'%(display_url)s' is already a lightweight checkout."
5933
5964
msgstr ""
5934
5965
5935
#: bzrlib/errors.py:2846
5966
#: bzrlib/errors.py:2847
5936
5967
msgid "'%(display_url)s' is already using a shared repository."
5937
5968
msgstr ""
5938
5969
5939
#: bzrlib/errors.py:2851
5970
#: bzrlib/errors.py:2852
5940
5971
msgid "'%(display_url)s' is already standalone."
5941
5972
msgstr ""
5942
5973
5943
#: bzrlib/errors.py:2856
5974
#: bzrlib/errors.py:2857
5944
5975
msgid "Shared repository '%(display_url)s' already creates working trees."
5945
5976
msgstr ""
5946
5977
5947
#: bzrlib/errors.py:2862
5978
#: bzrlib/errors.py:2863
5948
5979
msgid ""
5949
5980
"Shared repository '%(display_url)s' already doesn't create working trees."
5950
5981
msgstr ""
5951
5982
5952
#: bzrlib/errors.py:2868
5983
#: bzrlib/errors.py:2869
5953
5984
msgid "Requested reconfiguration of '%(display_url)s' is not supported."
5954
5985
msgstr ""
5955
5986
5956
#: bzrlib/errors.py:2873
5987
#: bzrlib/errors.py:2874
5957
5988
msgid "No location could be found to bind to at %(display_url)s."
5958
5989
msgstr ""
5959
5990
5960
#: bzrlib/errors.py:2878
5991
#: bzrlib/errors.py:2879
5961
5992
msgid ""
5962
5993
"Working tree \"%(display_url)s\" has uncommitted changes (See bzr "
5963
5994
"status).%(more)s"
5964
5995
msgstr ""
5965
5996
5966
#: bzrlib/errors.py:2897
5997
#: bzrlib/errors.py:2898
5967
5998
msgid ""
5968
5999
"Working tree \"%(display_url)s\" has shelved changes (See bzr shelve --"
5969
6000
"list).%(more)s"
5970
6001
msgstr ""
5971
6002
5972
#: bzrlib/errors.py:2903
6003
#: bzrlib/errors.py:2904
5973
6004
msgid "Variable {%(name)s} is not available."
5974
6005
msgstr ""
5975
6006
5976
#: bzrlib/errors.py:2911
6007
#: bzrlib/errors.py:2912
5977
6008
msgid "No template specified."
5978
6009
msgstr ""
5979
6010
5980
#: bzrlib/errors.py:2916
6011
#: bzrlib/errors.py:2917
5981
6012
msgid "Unable to create symlink %(path_str)son this platform"
5982
6013
msgstr ""
5983
6014
5984
#: bzrlib/errors.py:2931
6015
#: bzrlib/errors.py:2932
5985
6016
msgid ""
5986
6017
"Unsupported timezone format \"%(timezone)s\", options are \"utc\", "
5987
6018
"\"original\", \"local\"."
5988
6019
msgstr ""
5989
6020
5990
#: bzrlib/errors.py:2965
6021
#: bzrlib/errors.py:2966
5991
6022
msgid ""
5992
6023
"Unable to encode %(kind)s path %(path)r in user encoding %(user_encoding)s"
5993
6024
msgstr ""
5994
6025
5995
#: bzrlib/errors.py:2977
6026
#: bzrlib/errors.py:2978
5996
6027
msgid "The \"%(config_id)s\" configuration does not exist."
5997
6028
msgstr ""
5998
6029
5999
#: bzrlib/errors.py:2985
6030
#: bzrlib/errors.py:2986
6000
6031
msgid "The \"%(option_name)s\" configuration option does not exist."
6001
6032
msgstr ""
6002
6033
6003
#: bzrlib/errors.py:2993
6034
#: bzrlib/errors.py:2994
6004
6035
msgid "The alias \"%(alias_name)s\" does not exist."
6005
6036
msgstr ""
6006
6037
6007
#: bzrlib/errors.py:3007
6038
#: bzrlib/errors.py:3008
6008
6039
msgid "\"%(alias_name)s\" is not a valid location alias."
6009
6040
msgstr ""
6010
6041
6011
#: bzrlib/errors.py:3015
6042
#: bzrlib/errors.py:3016
6012
6043
msgid "No %(alias_name)s location assigned."
6013
6044
msgstr ""
6014
6045
6015
#: bzrlib/errors.py:3023
6046
#: bzrlib/errors.py:3024
6016
6047
msgid "Cannot bind address \"%(host)s:%(port)i\": %(orig_error)s."
6017
6048
msgstr ""
6018
6049
6019
#: bzrlib/errors.py:3033
6050
#: bzrlib/errors.py:3034
6020
6051
msgid "Unknown rules detected: %(unknowns_str)s."
6021
6052
msgstr ""
6022
6053
6023
#: bzrlib/errors.py:3044
6054
#: bzrlib/errors.py:3045
6024
6055
msgid "Tip change rejected: %(msg)s"
6025
6056
msgstr ""
6026
6057
6027
#: bzrlib/errors.py:3052
6058
#: bzrlib/errors.py:3053
6028
6059
msgid "Shelf corrupt."
6029
6060
msgstr ""
6030
6061
6031
#: bzrlib/errors.py:3057
6062
#: bzrlib/errors.py:3058
6032
6063
msgid "Corruption while decompressing repository file%(orig_error)s"
6033
6064
msgstr ""
6034
6065
6035
#: bzrlib/errors.py:3069
6066
#: bzrlib/errors.py:3070
6036
6067
msgid "No changes are shelved with id \"%(shelf_id)d\"."
6037
6068
msgstr ""
6038
6069
6039
#: bzrlib/errors.py:3077
6070
#: bzrlib/errors.py:3078
6040
6071
msgid "\"%(invalid_id)s\" is not a valid shelf id, try a number instead."
6041
6072
msgstr ""
6042
6073
6043
#: bzrlib/errors.py:3085
6074
#: bzrlib/errors.py:3086
6044
6075
msgid ""
6045
6076
"An attempt to access a url outside the server jail was made: '%(url)s'."
6046
6077
msgstr ""
6047
6078
6048
#: bzrlib/errors.py:3093
6079
#: bzrlib/errors.py:3094
6049
6080
msgid "The user aborted the operation."
6050
6081
msgstr ""
6051
6082
6052
#: bzrlib/errors.py:3098
6083
#: bzrlib/errors.py:3099
6053
6084
msgid "Branching '%(url)s'(%(format)s) must create a working tree."
6054
6085
msgstr ""
6055
6086
6056
#: bzrlib/errors.py:3108
6087
#: bzrlib/errors.py:3109
6057
6088
msgid "No such view: %(view_name)s."
6058
6089
msgstr ""
6059
6090
6060
#: bzrlib/errors.py:3118
6091
#: bzrlib/errors.py:3119
6061
6092
msgid ""
6062
6093
"Views are not supported by %(tree)s; use 'bzr upgrade' to change your tree "
6063
6094
"to a later format."
6064
6095
msgstr ""
6065
6096
6066
#: bzrlib/errors.py:3127
6097
#: bzrlib/errors.py:3128
6067
6098
msgid ""
6068
6099
"Specified file \"%(file_name)s\" is outside the current view: %(view_str)s"
6069
6100
msgstr ""
6070
6101
6071
#: bzrlib/errors.py:3194
6102
#: bzrlib/errors.py:3195
6072
6103
msgid "%(bzrdir)r does not support co-located branches."
6073
6104
msgstr ""
6074
6105
6075
#: bzrlib/errors.py:3200
6106
#: bzrlib/errors.py:3201
6076
6107
msgid ""
6077
6108
"Unable to determine your name.\n"
6078
6109
"Please, set your name with the 'whoami' command.\n"
6079
6110
"E.g. bzr whoami \"Your Name <name@example.com>\""
6080
6111
msgstr ""
6081
6112
6082
#: bzrlib/errors.py:3209
6113
#: bzrlib/errors.py:3210
6083
6114
msgid "Invalid pattern(s) found. %(msg)s"
6084
6115
msgstr ""
6085
6116
6086
#: bzrlib/errors.py:3217
6117
#: bzrlib/errors.py:3218
6087
6118
msgid ""
6088
6119
"Branch \"%(branch_url)s\" appears to be bound to itself. Please use `bzr "
6089
6120
"unbind` to fix."
6090
6121
msgstr ""
6091
6122
6092
#: bzrlib/errors.py:3228
6123
#: bzrlib/errors.py:3229
6093
6124
msgid "Loop involving %(refs)r while expanding \"%(string)s\"."
6094
6125
msgstr ""
6095
6126
6096
#: bzrlib/errors.py:3237
6127
#: bzrlib/errors.py:3238
6097
6128
msgid "Option %(name)s is not defined while expanding \"%(string)s\"."
6098
6129
msgstr ""
6099
6130
6100
#: bzrlib/errors.py:3246
6131
#: bzrlib/errors.py:3247
6101
6132
msgid ""
6102
6133
"No compatible object available for operations from %(source)r to %(target)r."
6103
6134
msgstr ""
6104
6135
6105
#: bzrlib/errors.py:3256
6136
#: bzrlib/errors.py:3257
6106
6137
msgid ""
6107
6138
"VFS requests over the smart server are not allowed. Encountered: %(method)s, "
6108
6139
"%(arguments)s."
6109
6140
msgstr ""
6110
6141
6111
#: bzrlib/errors.py:3266
6142
#: bzrlib/errors.py:3267
6112
6143
msgid ""
6113
6144
"Kind change from %(from_kind)s to %(to_kind)s for %(path)s not supported by "
6114
6145
"format %(format)r"
6115
6146
msgstr ""
6116
6147
6117
#: bzrlib/errors.py:3278
6148
#: bzrlib/errors.py:3279
6118
6149
msgid ""
6119
6150
"Missing feature %(feature)s not provided by this version of Bazaar or any "
6120
6151
"plugin."
6121
6152
msgstr ""
6122
6153
6123
#: bzrlib/errors.py:3291
6154
#: bzrlib/errors.py:3292
6124
6155
msgid "Binary files section encountered."
6125
6156
msgstr ""
6126
6157
6127
#: bzrlib/errors.py:3299
6158
#: bzrlib/errors.py:3300
6128
6159
msgid ""
6129
6160
"Malformed patch header. %(desc)s\n"
6130
6161
"%(line)r"
6131
6162
msgstr ""
6132
6163
6133
#: bzrlib/errors.py:3308
6164
#: bzrlib/errors.py:3309
6134
6165
msgid ""
6135
6166
"Malformed hunk header. %(desc)s\n"
6136
6167
"%(line)r"
6137
6168
msgstr ""
6138
6169
6139
#: bzrlib/errors.py:3317
6170
#: bzrlib/errors.py:3318
6140
6171
msgid ""
6141
6172
"Malformed line. %(desc)s\n"
6142
6173
"%(line)r"
6143
6174
msgstr ""
6144
6175
6145
#: bzrlib/errors.py:3327
6176
#: bzrlib/errors.py:3328
6146
6177
msgid ""
6147
6178
"Text contents mismatch at line %(line_no)d. Original has \"%(orig_line)s\", "
6148
6179
"but patch says it should be \"%(patch_line)s\""
6149
6180
msgstr ""
6150
6181
6151
#: bzrlib/errors.py:3338
6182
#: bzrlib/errors.py:3339
6152
6183
msgid "The feature %(feature)s has already been registered."
6153
6184
msgstr ""
6154
6185
6200
6231
"regular push."
6201
6232
msgstr ""
6202
6233
6203
#: bzrlib/gpg.py:119 bzrlib/gpg.py:460
6234
#: bzrlib/gpg.py:366
6235
msgid "No GnuPG key results for pattern: {0}"
6236
msgstr ""
6237
6238
#: bzrlib/gpg.py:439
6204
6239
msgid "{0} commits with valid signatures"
6205
6240
msgstr ""
6206
6241
6207
#: bzrlib/gpg.py:123 bzrlib/gpg.py:465
6242
#: bzrlib/gpg.py:445
6208
6243
msgid "{0} commit with unknown key"
6209
6244
msgid_plural "{0} commits with unknown keys"
6210
6245
msgstr[0] ""
6211
6246
msgstr[1] ""
6212
6247
6213
#: bzrlib/gpg.py:129 bzrlib/gpg.py:472
6248
#: bzrlib/gpg.py:453
6214
6249
msgid "{0} commit not valid"
6215
6250
msgid_plural "{0} commits not valid"
6216
6251
msgstr[0] ""
6217
6252
msgstr[1] ""
6218
6253
6219
#: bzrlib/gpg.py:135 bzrlib/gpg.py:479
6254
#: bzrlib/gpg.py:461
6220
6255
msgid "{0} commit not signed"
6221
6256
msgid_plural "{0} commits not signed"
6222
6257
msgstr[0] ""
6223
6258
msgstr[1] ""
6224
6259
6225
#: bzrlib/gpg.py:141 bzrlib/gpg.py:486
6260
#: bzrlib/gpg.py:469
6226
6261
msgid "{0} commit with key now expired"
6227
6262
msgid_plural "{0} commits with key now expired"
6228
6263
msgstr[0] ""
6229
6264
msgstr[1] ""
6230
6265
6231
#: bzrlib/gpg.py:343
6232
msgid "No GnuPG key results for pattern: {0}"
6233
msgstr ""
6266
#: bzrlib/gpg.py:489
6267
msgid "{0} commit by author {1} with key {2} now expired"
6268
msgid_plural "{0} commits by author {1} with key {2} now expired"
6269
msgstr[0] ""
6270
msgstr[1] ""
6234
6271
6235
#: bzrlib/gpg.py:386
6272
#: bzrlib/gpg.py:505
6236
6273
msgid "{0} signed {1} commit"
6237
6274
msgid_plural "{0} signed {1} commits"
6238
6275
msgstr[0] ""
6239
6276
msgstr[1] ""
6240
6277
6241
#: bzrlib/gpg.py:403 bzrlib/gpg.py:419
6278
#: bzrlib/gpg.py:522 bzrlib/gpg.py:539
6242
6279
msgid "{0} commit by author {1}"
6243
6280
msgid_plural "{0} commits by author {1}"
6244
6281
msgstr[0] ""
6245
6282
msgstr[1] ""
6246
6283
6247
#: bzrlib/gpg.py:433
6284
#: bzrlib/gpg.py:554
6248
6285
msgid "Unknown key {0} signed {1} commit"
6249
6286
msgid_plural "Unknown key {0} signed {1} commits"
6250
6287
msgstr[0] ""
6251
6288
msgstr[1] ""
6252
6289
6253
#: bzrlib/gpg.py:452
6254
msgid "{0} commit by author {1} with key {2} now expired"
6255
msgid_plural "{0} commits by author {1} with key {2} now expired"
6256
msgstr[0] ""
6257
msgstr[1] ""
6258
6259
6290
#: bzrlib/groupcompress.py:1739
6260
6291
#, python-format
6261
6292
msgid "Insert claimed random_id=True, but then inserted %r two times"
6262
6293
msgstr ""
6263
6294
6264
#: bzrlib/hooks.py:331
6295
#: bzrlib/hooks.py:313
6265
6296
#, python-format
6266
6297
msgid "Introduced in: %s"
6267
6298
msgstr ""
6268
6299
6269
#: bzrlib/hooks.py:334
6300
#: bzrlib/hooks.py:316
6270
6301
#, python-format
6271
6302
msgid "Deprecated in: %s"
6272
6303
msgstr ""
6315
6346
"held by %(user)s on %(hostname)s (process #%(pid)s), acquired %(time_ago)s"
6316
6347
msgstr ""
6317
6348
6318
#: bzrlib/log.py:572
6349
#: bzrlib/log.py:563
6319
6350
msgid "--exclude-common-ancestry requires two different revisions"
6320
6351
msgstr ""
6321
6352
6322
#: bzrlib/log.py:574
6353
#: bzrlib/log.py:565
6323
6354
#, python-format
6324
6355
msgid "invalid direction %r"
6325
6356
msgstr ""
6326
6357
6327
#: bzrlib/log.py:662
6358
#: bzrlib/log.py:653
6328
6359
msgid "Start revision not found in history of end revision."
6329
6360
msgstr ""
6330
6361
6331
#: bzrlib/log.py:1080 bzrlib/log.py:1138
6362
#: bzrlib/log.py:1071 bzrlib/log.py:1129
6332
6363
msgid "Logging revision 0 is invalid."
6333
6364
msgstr ""
6334
6365
6335
#: bzrlib/log.py:1082 bzrlib/log.py:1140
6366
#: bzrlib/log.py:1073 bzrlib/log.py:1131
6336
6367
msgid "Start revision must be older than the end revision."
6337
6368
msgstr ""
6338
6369
6339
#: bzrlib/log.py:1827
6370
#: bzrlib/log.py:1818
6340
6371
#, python-format
6341
6372
msgid "unknown log formatter: %r"
6342
6373
msgstr ""
6343
6374
6344
#: bzrlib/log.py:2123
6375
#: bzrlib/log.py:2114
6345
6376
msgid "fixes bug"
6346
6377
msgid_plural "fixes bugs"
6347
6378
msgstr[0] ""
6356
6387
msgid "%d conflicts encountered."
6357
6388
msgstr ""
6358
6389
6359
#: bzrlib/merge.py:845 bzrlib/merge.py:1933
6390
#: bzrlib/merge.py:845 bzrlib/merge.py:1868
6360
6391
msgid "Preparing file merge"
6361
6392
msgstr ""
6362
6393
6478
6509
msgid "lstat/stat of ({0!r}): {1!r}"
6479
6510
msgstr ""
6480
6511
6481
#: bzrlib/osutils.py:1008 bzrlib/osutils.py:1019
6512
#: bzrlib/osutils.py:1030 bzrlib/osutils.py:1041
6482
6513
#, python-format
6483
6514
msgid "sorry, %r not allowed in path"
6484
6515
msgstr ""
6485
6516
6486
#: bzrlib/osutils.py:1237
6517
#: bzrlib/osutils.py:1259
6487
6518
#, python-format
6488
6519
msgid "%r is too short to calculate a relative path"
6489
6520
msgstr ""
6522
6553
msgid "Generate only the shell function, don't enable it"
6523
6554
msgstr ""
6524
6555
6525
#: bzrlib/plugins/launchpad/__init__.py:81
6556
#: bzrlib/plugins/launchpad/account.py:66
6557
msgid "Setting ssh/sftp usernames for launchpad.net."
6558
msgstr ""
6559
6560
#: bzrlib/plugins/launchpad/cmds.py:44
6526
6561
msgid "Register a branch with launchpad.net."
6527
6562
msgstr ""
6528
6563
6529
#: bzrlib/plugins/launchpad/__init__.py:83
6564
#: bzrlib/plugins/launchpad/cmds.py:46
6530
6565
msgid ""
6531
6566
"This command lists a bzr branch in the directory of branches on\n"
6532
6567
"launchpad.net. Registration allows the branch to be associated with\n"
6533
6568
"bugs or specifications."
6534
6569
msgstr ""
6535
6570
6536
#: bzrlib/plugins/launchpad/__init__.py:87
6571
#: bzrlib/plugins/launchpad/cmds.py:50
6537
6572
msgid ""
6538
6573
"Before using this command you must register the project to which the\n"
6539
6574
"branch belongs, and create an account for yourself on launchpad.net."
6540
6575
msgstr ""
6541
6576
6542
#: bzrlib/plugins/launchpad/__init__.py:90
6577
#: bzrlib/plugins/launchpad/cmds.py:53
6543
6578
msgid ""
6544
6579
"arguments:\n"
6545
6580
" public_url: The publicly visible url for the branch to register.\n"
6551
6586
" otherwise error."
6552
6587
msgstr ""
6553
6588
6554
#: bzrlib/plugins/launchpad/__init__.py:99
6589
#: bzrlib/plugins/launchpad/cmds.py:62
6555
6590
msgid ""
6556
6591
"example:\n"
6557
6592
" bzr register-branch http://foo.com/bzr/fooproject.mine \\\n"
6558
6593
" --project fooproject"
6559
6594
msgstr ""
6560
6595
6561
#: bzrlib/plugins/launchpad/__init__.py:106
6596
#: bzrlib/plugins/launchpad/cmds.py:69
6562
6597
msgid "Launchpad project short name to associate with the branch."
6563
6598
msgstr ""
6564
6599
6565
#: bzrlib/plugins/launchpad/__init__.py:113
6600
#: bzrlib/plugins/launchpad/cmds.py:76
6566
6601
msgid ""
6567
6602
"Short name for the branch; by default taken from the last component of the "
6568
6603
"url."
6569
6604
msgstr ""
6570
6605
6571
#: bzrlib/plugins/launchpad/__init__.py:117
6606
#: bzrlib/plugins/launchpad/cmds.py:80
6572
6607
msgid "One-sentence description of the branch."
6573
6608
msgstr ""
6574
6609
6575
#: bzrlib/plugins/launchpad/__init__.py:120
6610
#: bzrlib/plugins/launchpad/cmds.py:83
6576
6611
msgid "Longer description of the purpose or contents of the branch."
6577
6612
msgstr ""
6578
6613
6579
#: bzrlib/plugins/launchpad/__init__.py:123
6614
#: bzrlib/plugins/launchpad/cmds.py:86
6580
6615
msgid "Branch author's email address, if not yourself."
6581
6616
msgstr ""
6582
6617
6583
#: bzrlib/plugins/launchpad/__init__.py:126
6618
#: bzrlib/plugins/launchpad/cmds.py:89
6584
6619
msgid "The bug this branch fixes."
6585
6620
msgstr ""
6586
6621
6587
#: bzrlib/plugins/launchpad/__init__.py:129
6622
#: bzrlib/plugins/launchpad/cmds.py:92
6588
6623
msgid "Prepare the request but don't actually send it."
6589
6624
msgstr ""
6590
6625
6591
#: bzrlib/plugins/launchpad/__init__.py:151
6626
#: bzrlib/plugins/launchpad/cmds.py:114
6592
6627
msgid ""
6593
6628
"register-branch requires a public branch url - see bzr help register-branch."
6594
6629
msgstr ""
6595
6630
6596
#: bzrlib/plugins/launchpad/__init__.py:159
6631
#: bzrlib/plugins/launchpad/cmds.py:122
6597
6632
msgid "--product is deprecated; please use --project."
6598
6633
msgstr ""
6599
6634
6600
#: bzrlib/plugins/launchpad/__init__.py:191
6635
#: bzrlib/plugins/launchpad/cmds.py:152
6601
6636
msgid "Open a Launchpad branch page in your web browser."
6602
6637
msgstr ""
6603
6638
6604
#: bzrlib/plugins/launchpad/__init__.py:196
6639
#: bzrlib/plugins/launchpad/cmds.py:157
6605
6640
msgid "Do not actually open the browser. Just say the URL we would use."
6606
6641
msgstr ""
6607
6642
6608
#: bzrlib/plugins/launchpad/__init__.py:231
6643
#: bzrlib/plugins/launchpad/cmds.py:192
6609
6644
#, python-format
6610
6645
msgid "Opening %s in web browser"
6611
6646
msgstr ""
6612
6647
6613
#: bzrlib/plugins/launchpad/__init__.py:241
6648
#: bzrlib/plugins/launchpad/cmds.py:200
6614
6649
msgid "Show or set the Launchpad user ID."
6615
6650
msgstr ""
6616
6651
6617
#: bzrlib/plugins/launchpad/__init__.py:243
6652
#: bzrlib/plugins/launchpad/cmds.py:202
6618
6653
msgid ""
6619
6654
"When communicating with Launchpad, some commands need to know your\n"
6620
6655
"Launchpad user ID. This command can be used to set or show the\n"
6621
6656
"user ID that Bazaar will use for such communication."
6622
6657
msgstr ""
6623
6658
6624
#: bzrlib/plugins/launchpad/__init__.py:247
6659
#: bzrlib/plugins/launchpad/cmds.py:206
6625
6660
msgid ""
6626
6661
":Examples:\n"
6627
6662
" Show the Launchpad ID of the current user::"
6628
6663
msgstr ""
6629
6664
6630
#: bzrlib/plugins/launchpad/__init__.py:250
6665
#: bzrlib/plugins/launchpad/cmds.py:209
6631
6666
msgid " bzr launchpad-login"
6632
6667
msgstr ""
6633
6668
6634
#: bzrlib/plugins/launchpad/__init__.py:252
6669
#: bzrlib/plugins/launchpad/cmds.py:211
6635
6670
msgid " Set the Launchpad ID of the current user to 'bob'::"
6636
6671
msgstr ""
6637
6672
6638
#: bzrlib/plugins/launchpad/__init__.py:254
6673
#: bzrlib/plugins/launchpad/cmds.py:213
6639
6674
msgid " bzr launchpad-login bob"
6640
6675
msgstr ""
6641
6676
6642
#: bzrlib/plugins/launchpad/__init__.py:261
6677
#: bzrlib/plugins/launchpad/cmds.py:220
6643
6678
msgid "Don't check that the user name is valid."
6644
6679
msgstr ""
6645
6680
6646
#: bzrlib/plugins/launchpad/__init__.py:276
6647
#: bzrlib/plugins/launchpad/__init__.py:287
6681
#: bzrlib/plugins/launchpad/cmds.py:235 bzrlib/plugins/launchpad/cmds.py:246
6648
6682
msgid "Launchpad user ID exists and has SSH keys.\n"
6649
6683
msgstr ""
6650
6684
6651
#: bzrlib/plugins/launchpad/__init__.py:279
6685
#: bzrlib/plugins/launchpad/cmds.py:238
6652
6686
msgid "No Launchpad user ID configured.\n"
6653
6687
msgstr ""
6654
6688
6655
#: bzrlib/plugins/launchpad/__init__.py:290
6689
#: bzrlib/plugins/launchpad/cmds.py:249
6656
6690
#, python-format
6657
6691
msgid "Launchpad user ID set to '%s'.\n"
6658
6692
msgstr ""
6659
6693
6660
#: bzrlib/plugins/launchpad/__init__.py:298
6694
#: bzrlib/plugins/launchpad/cmds.py:255
6661
6695
msgid "Ask Launchpad to mirror a branch now."
6662
6696
msgstr ""
6663
6697
6664
#: bzrlib/plugins/launchpad/__init__.py:318
6698
#: bzrlib/plugins/launchpad/cmds.py:272
6665
6699
msgid "Propose merging a branch on Launchpad."
6666
6700
msgstr ""
6667
6701
6668
#: bzrlib/plugins/launchpad/__init__.py:320
6702
#: bzrlib/plugins/launchpad/cmds.py:274
6669
6703
msgid ""
6670
6704
"This will open your usual editor to provide the initial comment. When it\n"
6671
6705
"has created the proposal, it will open it in your default web browser."
6672
6706
msgstr ""
6673
6707
6674
#: bzrlib/plugins/launchpad/__init__.py:323
6708
#: bzrlib/plugins/launchpad/cmds.py:277
6675
6709
msgid ""
6676
6710
"The branch will be proposed to merge into SUBMIT_BRANCH. If SUBMIT_BRANCH\n"
6677
6711
"is not supplied, the remembered submit branch will be used. If no submit\n"
6678
6712
"branch is remembered, the development focus will be used."
6679
6713
msgstr ""
6680
6714
6681
#: bzrlib/plugins/launchpad/__init__.py:327
6715
#: bzrlib/plugins/launchpad/cmds.py:281
6682
6716
msgid ""
6683
6717
"By default, the SUBMIT_BRANCH's review team will be requested to review\n"
6684
6718
"the merge proposal. This can be overriden by specifying --review (-R).\n"
6686
6720
"may optionally be followed by '=' and the review type. For example:"
6687
6721
msgstr ""
6688
6722
6689
#: bzrlib/plugins/launchpad/__init__.py:332
6723
#: bzrlib/plugins/launchpad/cmds.py:286
6690
6724
msgid " bzr lp-propose-merge --review jrandom --review review-team=qa"
6691
6725
msgstr ""
6692
6726
6693
#: bzrlib/plugins/launchpad/__init__.py:334
6727
#: bzrlib/plugins/launchpad/cmds.py:288
6694
6728
msgid ""
6695
6729
"This will propose a merge, request \"jrandom\" to perform a review of\n"
6696
6730
"unspecified type, and request \"review-team\" to perform a \"qa\" review."
6697
6731
msgstr ""
6698
6732
6699
#: bzrlib/plugins/launchpad/__init__.py:339
6733
#: bzrlib/plugins/launchpad/cmds.py:293
6700
6734
msgid "Propose the merge on staging."
6701
6735
msgstr ""
6702
6736
6703
#: bzrlib/plugins/launchpad/__init__.py:341
6737
#: bzrlib/plugins/launchpad/cmds.py:295
6704
6738
msgid "Commit message."
6705
6739
msgstr ""
6706
6740
6707
#: bzrlib/plugins/launchpad/__init__.py:343
6741
#: bzrlib/plugins/launchpad/cmds.py:297
6708
6742
msgid "Mark the proposal as approved immediately."
6709
6743
msgstr ""
6710
6744
6711
#: bzrlib/plugins/launchpad/__init__.py:345
6745
#: bzrlib/plugins/launchpad/cmds.py:298
6746
msgid "The bug this proposal fixes."
6747
msgstr ""
6748
6749
#: bzrlib/plugins/launchpad/cmds.py:300
6712
6750
msgid "Requested reviewer and optional type."
6713
6751
msgstr ""
6714
6752
6715
#: bzrlib/plugins/launchpad/__init__.py:382
6753
#: bzrlib/plugins/launchpad/cmds.py:335
6716
6754
msgid "Find the proposal to merge this revision."
6717
6755
msgstr ""
6718
6756
6719
#: bzrlib/plugins/launchpad/__init__.py:384
6757
#: bzrlib/plugins/launchpad/cmds.py:337
6720
6758
msgid ""
6721
6759
"Finds the merge proposal(s) that discussed landing the specified revision.\n"
6722
6760
"This works only if the selected branch was the merge proposal target, and\n"
6724
6762
"are opened in a web browser."
6725
6763
msgstr ""
6726
6764
6727
#: bzrlib/plugins/launchpad/__init__.py:389
6765
#: bzrlib/plugins/launchpad/cmds.py:342
6728
6766
msgid ""
6729
6767
"Any revision involved in the merge may be specified-- the revision in\n"
6730
6768
"which the merge was performed, or one of the revisions that was merged."
6731
6769
msgstr ""
6732
6770
6733
#: bzrlib/plugins/launchpad/__init__.py:392
6771
#: bzrlib/plugins/launchpad/cmds.py:345
6734
6772
msgid "So, to find the merge proposal that reviewed line 1 of README::"
6735
6773
msgstr ""
6736
6774
6737
#: bzrlib/plugins/launchpad/__init__.py:394
6775
#: bzrlib/plugins/launchpad/cmds.py:347
6738
6776
msgid " bzr lp-find-proposal -r annotate:README:1"
6739
6777
msgstr ""
6740
6778
6741
#: bzrlib/plugins/launchpad/__init__.py:409
6779
#: bzrlib/plugins/launchpad/cmds.py:363
6742
6780
msgid "No review found."
6743
6781
msgstr ""
6744
6782
6745
#: bzrlib/plugins/launchpad/__init__.py:410
6783
#: bzrlib/plugins/launchpad/cmds.py:364
6746
6784
#, python-format
6747
6785
msgid "%d proposals(s) found."
6748
6786
msgstr ""
6749
6787
6750
#: bzrlib/plugins/launchpad/__init__.py:420
6788
#: bzrlib/plugins/launchpad/cmds.py:374
6751
6789
msgid "Finding revision-id"
6752
6790
msgstr ""
6753
6791
6754
#: bzrlib/plugins/launchpad/__init__.py:427
6792
#: bzrlib/plugins/launchpad/cmds.py:381
6755
6793
msgid "Finding merge"
6756
6794
msgstr ""
6757
6795
6758
#: bzrlib/plugins/launchpad/__init__.py:432
6796
#: bzrlib/plugins/launchpad/cmds.py:386
6759
6797
msgid "Finding revno"
6760
6798
msgstr ""
6761
6799
6762
#: bzrlib/plugins/launchpad/__init__.py:437
6800
#: bzrlib/plugins/launchpad/cmds.py:392
6763
6801
msgid "Finding Launchpad branch"
6764
6802
msgstr ""
6765
6803
6766
#: bzrlib/plugins/launchpad/__init__.py:440
6804
#: bzrlib/plugins/launchpad/cmds.py:395
6767
6805
msgid "Finding proposals"
6768
6806
msgstr ""
6769
6807
6770
#: bzrlib/plugins/launchpad/account.py:66
6771
msgid "Setting ssh/sftp usernames for launchpad.net."
6772
msgstr ""
6773
6774
6808
#: bzrlib/plugins/launchpad/lp_api.py:241
6775
6809
#: bzrlib/plugins/launchpad/lp_api.py:246
6776
6810
#, python-format
6814
6848
" remote: {2}"
6815
6849
msgstr ""
6816
6850
6817
#: bzrlib/plugins/launchpad/lp_propose.py:149
6851
#: bzrlib/plugins/launchpad/lp_propose.py:150
6818
6852
#, python-format
6819
6853
msgid "There is already a branch merge proposal: %s"
6820
6854
msgstr ""
6821
6855
6822
#: bzrlib/plugins/weave_fmt/bzrdir.py:236
6856
#: bzrlib/plugins/weave_fmt/bzrdir.py:237
6823
6857
msgid "pb parameter to convert() is deprecated"
6824
6858
msgstr ""
6825
6859
6826
#: bzrlib/plugins/weave_fmt/bzrdir.py:239
6860
#: bzrlib/plugins/weave_fmt/bzrdir.py:240
6827
6861
msgid "starting upgrade from format 4 to 5"
6828
6862
msgstr ""
6829
6863
6830
#: bzrlib/plugins/weave_fmt/bzrdir.py:249
6864
#: bzrlib/plugins/weave_fmt/bzrdir.py:250
6831
6865
msgid "note: upgrade may be faster if all store files are ungzipped first"
6832
6866
msgstr ""
6833
6867
6834
#: bzrlib/plugins/weave_fmt/bzrdir.py:278
6868
#: bzrlib/plugins/weave_fmt/bzrdir.py:279
6835
6869
msgid "converting revision"
6836
6870
msgstr ""
6837
6871
6838
#: bzrlib/plugins/weave_fmt/bzrdir.py:283
6872
#: bzrlib/plugins/weave_fmt/bzrdir.py:284
6839
6873
msgid "upgraded to weaves:"
6840
6874
msgstr ""
6841
6875
6842
#: bzrlib/plugins/weave_fmt/bzrdir.py:284
6876
#: bzrlib/plugins/weave_fmt/bzrdir.py:285
6843
6877
#, python-format
6844
6878
msgid "%6d revisions and inventories"
6845
6879
msgstr ""
6846
6880
6847
#: bzrlib/plugins/weave_fmt/bzrdir.py:286
6881
#: bzrlib/plugins/weave_fmt/bzrdir.py:287
6848
6882
#, python-format
6849
6883
msgid "%6d revisions not present"
6850
6884
msgstr ""
6851
6885
6852
#: bzrlib/plugins/weave_fmt/bzrdir.py:288
6886
#: bzrlib/plugins/weave_fmt/bzrdir.py:289
6853
6887
#, python-format
6854
6888
msgid "%6d texts"
6855
6889
msgstr ""
6856
6890
6857
#: bzrlib/plugins/weave_fmt/bzrdir.py:324
6891
#: bzrlib/plugins/weave_fmt/bzrdir.py:325
6858
6892
msgid "writing weave"
6859
6893
msgstr ""
6860
6894
6861
#: bzrlib/plugins/weave_fmt/bzrdir.py:328
6862
#: bzrlib/plugins/weave_fmt/bzrdir.py:330
6895
#: bzrlib/plugins/weave_fmt/bzrdir.py:329
6896
#: bzrlib/plugins/weave_fmt/bzrdir.py:331
6863
6897
msgid "inventory"
6864
6898
msgstr ""
6865
6899
6866
#: bzrlib/plugins/weave_fmt/bzrdir.py:347
6900
#: bzrlib/plugins/weave_fmt/bzrdir.py:348
6867
6901
msgid "write revision"
6868
6902
msgstr ""
6869
6903
6870
#: bzrlib/plugins/weave_fmt/bzrdir.py:361
6904
#: bzrlib/plugins/weave_fmt/bzrdir.py:362
6871
6905
msgid "loading revision"
6872
6906
msgstr ""
6873
6907
6874
#: bzrlib/plugins/weave_fmt/bzrdir.py:366
6908
#: bzrlib/plugins/weave_fmt/bzrdir.py:367
6875
6909
#, python-format
6876
6910
msgid "revision {%s} not present in branch; will be converted as a ghost"
6877
6911
msgstr ""
6878
6912
6879
#: bzrlib/plugins/weave_fmt/bzrdir.py:506
6913
#: bzrlib/plugins/weave_fmt/bzrdir.py:507
6880
6914
msgid "starting upgrade from format 5 to 6"
6881
6915
msgstr ""
6882
6916
6883
#: bzrlib/plugins/weave_fmt/bzrdir.py:516
6917
#: bzrlib/plugins/weave_fmt/bzrdir.py:517
6884
6918
#, python-format
6885
6919
msgid "adding prefixes to %s"
6886
6920
msgstr ""
6887
6921
6888
#: bzrlib/plugins/weave_fmt/bzrdir.py:556
6922
#: bzrlib/plugins/weave_fmt/bzrdir.py:557
6889
6923
msgid "starting upgrade from format 6 to metadir"
6890
6924
msgstr ""
6891
6925
6892
#: bzrlib/plugins/weave_fmt/bzrdir.py:564
6926
#: bzrlib/plugins/weave_fmt/bzrdir.py:565
6893
6927
msgid "Removing ancestry.weave"
6894
6928
msgstr ""
6895
6929
6896
#: bzrlib/plugins/weave_fmt/bzrdir.py:569
6930
#: bzrlib/plugins/weave_fmt/bzrdir.py:570
6897
6931
msgid "Finding branch files"
6898
6932
msgstr ""
6899
6933
6900
#: bzrlib/plugins/weave_fmt/bzrdir.py:579
6934
#: bzrlib/plugins/weave_fmt/bzrdir.py:580
6901
6935
msgid "Upgrading repository"
6902
6936
msgstr ""
6903
6937
6904
#: bzrlib/plugins/weave_fmt/bzrdir.py:589
6938
#: bzrlib/plugins/weave_fmt/bzrdir.py:590
6905
6939
msgid "Upgrading branch"
6906
6940
msgstr ""
6907
6941
6908
#: bzrlib/plugins/weave_fmt/bzrdir.py:612
6942
#: bzrlib/plugins/weave_fmt/bzrdir.py:613
6909
6943
msgid "No working tree."
6910
6944
msgstr ""
6911
6945
6912
#: bzrlib/plugins/weave_fmt/bzrdir.py:619
6946
#: bzrlib/plugins/weave_fmt/bzrdir.py:620
6913
6947
msgid "Upgrading working tree"
6914
6948
msgstr ""
6915
6949
6916
#: bzrlib/plugins/weave_fmt/bzrdir.py:640
6950
#: bzrlib/plugins/weave_fmt/bzrdir.py:641
6917
6951
#, python-format
6918
6952
msgid "Make %s lock"
6919
6953
msgstr ""
6920
6954
6921
#: bzrlib/plugins/weave_fmt/bzrdir.py:651
6955
#: bzrlib/plugins/weave_fmt/bzrdir.py:652
6922
6956
#, python-format
6923
6957
msgid "Moving %s"
6924
6958
msgstr ""
6945
6979
msgid "Too many redirections trying to make %s."
6946
6980
msgstr ""
6947
6981
6948
#: bzrlib/push.py:147
6982
#: bzrlib/push.py:148
6949
6983
msgid ""
6950
6984
"These branches have diverged. See \"bzr help diverged-branches\" for more "
6951
6985
"information."
6952
6986
msgstr ""
6953
6987
6954
#: bzrlib/push.py:151
6988
#: bzrlib/push.py:152
6955
6989
#, python-format
6956
6990
msgid ""
6957
6991
"It is not possible to losslessly push to %s. You may want to use dpush "
6958
6992
"instead."
6959
6993
msgstr ""
6960
6994
6961
#: bzrlib/push.py:157
6995
#: bzrlib/push.py:158
6962
6996
#, python-format
6963
6997
msgid ""
6964
6998
"At %s you have a valid .bzr control directory, but not a branch or "
7059
7093
msgid "bzr: ERROR (ignored): %s"
7060
7094
msgstr ""
7061
7095
7062
#: bzrlib/remote.py:2541
7096
#: bzrlib/remote.py:2534
7063
7097
msgid "Copying repository content as tarball..."
7064
7098
msgstr ""
7065
7099
7075
7109
msgid "{0} => {1}"
7076
7110
msgstr ""
7077
7111
7078
#: bzrlib/repository.py:1787
7112
#: bzrlib/repository.py:1738
7079
7113
msgid "Moving repository to repository.backup"
7080
7114
msgstr ""
7081
7115
7082
#: bzrlib/repository.py:1794
7116
#: bzrlib/repository.py:1745
7083
7117
msgid "Creating new repository"
7084
7118
msgstr ""
7085
7119
7086
#: bzrlib/repository.py:1799
7120
#: bzrlib/repository.py:1750
7087
7121
msgid "Copying content"
7088
7122
msgstr ""
7089
7123
7090
#: bzrlib/repository.py:1803
7124
#: bzrlib/repository.py:1754
7091
7125
msgid "Deleting old repository content"
7092
7126
msgstr ""
7093
7127
7094
#: bzrlib/repository.py:1805
7128
#: bzrlib/repository.py:1756
7095
7129
msgid "repository converted"
7096
7130
msgstr ""
7097
7131
7099
7133
msgid "Using {0} {1}"
7100
7134
msgstr ""
7101
7135
7102
#: bzrlib/send.py:58
7136
#: bzrlib/send.py:59
7103
7137
#, python-format
7104
7138
msgid "Mail client \"%s\" does not support specifying body"
7105
7139
msgstr ""
7106
7140
7107
#: bzrlib/send.py:62
7141
#: bzrlib/send.py:63
7108
7142
msgid "--remember requires a branch to be specified."
7109
7143
msgstr ""
7110
7144
7111
#: bzrlib/send.py:77
7145
#: bzrlib/send.py:78
7112
7146
msgid "No submit branch known or specified"
7113
7147
msgstr ""
7114
7148
7115
#: bzrlib/send.py:80
7149
#: bzrlib/send.py:81
7116
7150
msgid "Using saved {0} location \"{1}\" to determine what changes to submit."
7117
7151
msgstr ""
7118
7152
7119
#: bzrlib/send.py:98
7153
#: bzrlib/send.py:99
7120
7154
#, python-format
7121
7155
msgid "No such send format '%s'."
7122
7156
msgstr ""
7123
7157
7124
#: bzrlib/send.py:114
7158
#: bzrlib/send.py:115
7125
7159
msgid "bzr send takes at most two one revision identifiers"
7126
7160
msgstr ""
7127
7161
7128
#: bzrlib/send.py:127
7162
#: bzrlib/send.py:128
7129
7163
msgid "No revisions to submit."
7130
7164
msgstr ""
7131
7165
7132
#: bzrlib/send.py:139
7166
#: bzrlib/send.py:140
7133
7167
msgid ""
7134
7168
"- not supported for merge directives that use more than one output file."
7135
7169
msgstr ""
7136
7170
7137
#: bzrlib/send.py:185
7171
#: bzrlib/send.py:186
7138
7172
msgid "Format 0.9 does not permit bundle with no patch"
7139
7173
msgstr ""
7140
7174
7291
7325
"anyway, use --force."
7292
7326
msgstr ""
7293
7327
7294
#: bzrlib/switch.py:125
7328
#: bzrlib/switch.py:129
7295
7329
msgid "Cannot switch a branch, only a checkout."
7296
7330
msgstr ""
7297
7331
7298
#: bzrlib/switch.py:163
7332
#: bzrlib/switch.py:167
7299
7333
#, python-format
7300
7334
msgid "Tree is up to date at revision %d."
7301
7335
msgstr ""
7302
7336
7303
#: bzrlib/switch.py:169
7337
#: bzrlib/switch.py:173
7304
7338
#, python-format
7305
7339
msgid "Updated to revision %d."
7306
7340
msgstr ""
7307
7341
7308
#: bzrlib/transform.py:1734 bzrlib/transform.py:1745 bzrlib/transform.py:1747
7342
#: bzrlib/transform.py:1723 bzrlib/transform.py:1734 bzrlib/transform.py:1736
7309
7343
msgid "Apply phase"
7310
7344
msgstr ""
7311
7345
7312
#: bzrlib/transform.py:1773 bzrlib/transform.py:1841
7346
#: bzrlib/transform.py:1762 bzrlib/transform.py:1830
7313
7347
msgid "removing file"
7314
7348
msgstr ""
7315
7349
7316
#: bzrlib/transform.py:1791 bzrlib/transform.py:1876
7350
#: bzrlib/transform.py:1780 bzrlib/transform.py:1865
7317
7351
msgid "adding file"
7318
7352
msgstr ""
7319
7353
7320
#: bzrlib/transform.py:2591
7354
#: bzrlib/transform.py:2598
7321
7355
msgid "Building tree"
7322
7356
msgstr ""
7323
7357
7324
#: bzrlib/transform.py:2681 bzrlib/transform.py:2708
7358
#: bzrlib/transform.py:2688 bzrlib/transform.py:2715
7325
7359
msgid "Adding file contents"
7326
7360
msgstr ""
7327
7361
7328
#: bzrlib/transform.py:3028
7362
#: bzrlib/transform.py:3017
7329
7363
msgid "Resolution pass"
7330
7364
msgstr ""
7331
7365
7334
7368
msgid "Authenticated as %s"
7335
7369
msgstr ""
7336
7370
7337
#: bzrlib/tree.py:634
7371
#: bzrlib/tree.py:647
7338
7372
msgid "*** {0} content-filter: {1} => {2!r}"
7339
7373
msgstr ""
7340
7374
7393
7427
msgid "failed to clean-up {0}: {1}"
7394
7428
msgstr ""
7395
7429
7396
#: bzrlib/vf_repository.py:1090
7430
#: bzrlib/vf_repository.py:1091
7397
7431
msgid "inventories"
7398
7432
msgstr ""
7399
7433
7400
#: bzrlib/vf_repository.py:1116
7434
#: bzrlib/vf_repository.py:1117
7401
7435
msgid "texts"
7402
7436
msgstr ""
7403
7437
7404
#: bzrlib/vf_repository.py:1621 bzrlib/vf_repository.py:1630
7438
#: bzrlib/vf_repository.py:1622 bzrlib/vf_repository.py:1631
7405
7439
msgid "Calculating text parents"
7406
7440
msgstr ""
7407
7441
7408
#: bzrlib/vf_repository.py:1706
7442
#: bzrlib/vf_repository.py:1707
7409
7443
msgid "Fetch texts"
7410
7444
msgstr ""
7411
7445
7412
#: bzrlib/vf_repository.py:2535
7446
#: bzrlib/vf_repository.py:2536
7413
7447
msgid "loading text store"
7414
7448
msgstr ""
7415
7449
7416
#: bzrlib/vf_repository.py:2541
7450
#: bzrlib/vf_repository.py:2542
7417
7451
msgid "checking text graph"
7418
7452
msgstr ""
7419
7453
7420
#: bzrlib/vf_repository.py:2995 bzrlib/vf_repository.py:3009
7421
#: bzrlib/vf_repository.py:3124
7454
#: bzrlib/vf_repository.py:2998 bzrlib/vf_repository.py:3012
7455
#: bzrlib/vf_repository.py:3127
7422
7456
msgid "Transferring revisions"
7423
7457
msgstr ""
7424
7458
7464
7498
msgid "PageFaultCount %8d"
7465
7499
msgstr ""
7466
7500
7467
#: bzrlib/workingtree.py:1478
7501
#: bzrlib/workingtree.py:1482
7468
7502
msgid "Rerun update after fixing the conflicts."
7469
7503
msgstr ""
7470
7504
7474
7508
7475
7509
#: dummy/help_topics/basic/detail.txt:1
7476
7510
msgid ""
7477
"Bazaar 2.5b6 -- a free distributed version-control tool\n"
7511
"Bazaar 2.6b2 -- a free distributed version-control tool\n"
7478
7512
"http://bazaar.canonical.com/"
7479
7513
msgstr ""
7480
7514
7792
7826
msgid "How to fix diverged branches"
7793
7827
msgstr ""
7794
7828
7795
#: dummy/help_topics/env-variables/detail.txt:1
7796
msgid "Environment Variables"
7797
msgstr ""
7798
7799
#: dummy/help_topics/env-variables/detail.txt:3
7800
msgid ""
7801
"=================== "
7802
"===========================================================\n"
7803
"BZRPATH Path where bzr is to look for shell plugin external\n"
7804
" commands.\n"
7805
"BZR_EMAIL E-Mail address of the user. Overrides EMAIL.\n"
7806
"EMAIL E-Mail address of the user.\n"
7807
"BZR_EDITOR Editor for editing commit messages. Overrides EDITOR.\n"
7808
"EDITOR Editor for editing commit messages.\n"
7809
"BZR_PLUGIN_PATH Paths where bzr should look for plugins.\n"
7810
"BZR_DISABLE_PLUGINS Plugins that bzr should not load.\n"
7811
"BZR_PLUGINS_AT Plugins to load from a directory not in "
7812
"BZR_PLUGIN_PATH.\n"
7813
"BZR_HOME Directory holding .bazaar config dir. Overrides HOME.\n"
7814
"BZR_HOME (Win32) Directory holding bazaar config dir. Overrides APPDATA "
7815
"and\n"
7816
" HOME.\n"
7817
"BZR_REMOTE_PATH Full name of remote 'bzr' command (for bzr+ssh:// "
7818
"URLs).\n"
7819
"BZR_SSH Path to SSH client, or one of paramiko, openssh, "
7820
"sshcorp,\n"
7821
" plink or lsh.\n"
7822
"BZR_LOG Location of .bzr.log (use '/dev/null' to suppress log).\n"
7823
"BZR_LOG (Win32) Location of .bzr.log (use 'NUL' to suppress log).\n"
7824
"BZR_COLUMNS Override implicit terminal width.\n"
7825
"BZR_CONCURRENCY Number of processes that can be run concurrently "
7826
"(selftest)\n"
7827
"BZR_PROGRESS_BAR Override the progress display. Values are 'none' or "
7828
"'text'.\n"
7829
"BZR_PDB Control whether to launch a debugger on error.\n"
7830
"BZR_SIGQUIT_PDB Control whether SIGQUIT behaves normally or invokes a\n"
7831
" breakin debugger.\n"
7832
"BZR_TEXTUI_INPUT Force console input mode for prompts to line-based "
7833
"(instead\n"
7834
" of char-based).\n"
7835
"=================== "
7836
"===========================================================\n"
7837
msgstr ""
7838
7839
7829
#: dummy/help_topics/env-variables/summary.txt:1
7840
7830
msgid "Environment variable names and values"
7841
7831
msgstr ""
8836
8826
msgid " bzr commit --fixes <tracker>:<id>"
8837
8827
msgstr ""
8838
8828
8839
#: en/help_topics/bugs.txt:13 en/help_topics/configuration.txt:398
8829
#: en/help_topics/bugs.txt:13 en/help_topics/configuration.txt:410
8840
8830
msgid "or::"
8841
8831
msgstr ""
8842
8832
9071
9061
"remove-tree Remove the working tree from a given branch/checkout.\n"
9072
9062
"renames Show list of renamed files.\n"
9073
9063
"resolve Mark a conflict as resolved.\n"
9074
"revert Revert files to a previous revision.\n"
9064
"revert Set files in the working tree back to the contents of a\n"
9065
" previous revision.\n"
9075
9066
"revno Show current revision number.\n"
9076
9067
"root Show the tree root directory.\n"
9077
9068
"send Mail or create a merge-directive for submitting changes.\n"
9729
9720
9730
9721
#: en/help_topics/configuration.txt:336
9731
9722
msgid ""
9723
"Another such option is ``branchname``, which refers to the name of a "
9724
"colocated\n"
9725
"branch. For non-colocated branches, it behaves like basename. It can be "
9726
"used\n"
9727
"like this::"
9728
msgstr ""
9729
9730
#: en/help_topics/configuration.txt:340
9731
msgid ""
9732
" [/home/vila/src/bzr/bugs]\n"
9733
" mypush = lp:~vila/bzr/{branchname}"
9734
msgstr ""
9735
9736
#: en/help_topics/configuration.txt:343
9737
msgid ""
9738
"When used with a colocated branch named ``832013-expand-in-stack``, we'll "
9739
"get::"
9740
msgstr ""
9741
9742
#: en/help_topics/configuration.txt:345
9743
msgid ""
9744
" bzr config mypush\n"
9745
" lp:~vila/bzr/832013-expand-in-stack"
9746
msgstr ""
9747
9748
#: en/help_topics/configuration.txt:348
9749
msgid ""
9732
9750
"When an option is local to a Section, it cannot be referred to from option\n"
9733
9751
"values in any other section from the same ``Store`` nor from any other\n"
9734
9752
"``Store``."
9735
9753
msgstr ""
9736
9754
9737
#: en/help_topics/configuration.txt:340
9755
#: en/help_topics/configuration.txt:352
9738
9756
msgid ""
9739
9757
"\n"
9740
9758
"The main configuration file, bazaar.conf\n"
9741
9759
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
9742
9760
msgstr ""
9743
9761
9744
#: en/help_topics/configuration.txt:344
9762
#: en/help_topics/configuration.txt:356
9745
9763
msgid ""
9746
9764
"``bazaar.conf`` allows two sections: ``[DEFAULT]`` and ``[ALIASES]``.\n"
9747
9765
"The default section contains the default\n"
9749
9767
"overriden by providing a branch-specific section in ``locations.conf``."
9750
9768
msgstr ""
9751
9769
9752
#: en/help_topics/configuration.txt:349
9770
#: en/help_topics/configuration.txt:361
9753
9771
msgid "A typical ``bazaar.conf`` section often looks like the following::"
9754
9772
msgstr ""
9755
9773
9756
#: en/help_topics/configuration.txt:351
9774
#: en/help_topics/configuration.txt:363
9757
9775
msgid ""
9758
9776
" [DEFAULT]\n"
9759
9777
" email = John Doe <jdoe@isp.com>\n"
9761
9779
" create_signatures = when-required"
9762
9780
msgstr ""
9763
9781
9764
#: en/help_topics/configuration.txt:356
9782
#: en/help_topics/configuration.txt:368
9765
9783
msgid ""
9766
9784
"\n"
9767
9785
"The branch location configuration file, locations.conf\n"
9768
9786
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
9769
9787
msgstr ""
9770
9788
9771
#: en/help_topics/configuration.txt:360
9789
#: en/help_topics/configuration.txt:372
9772
9790
msgid ""
9773
9791
"``locations.conf`` allows one to specify overriding settings for\n"
9774
9792
"a specific branch. The format is almost identical to the default section in\n"
9778
9796
"for. The '?' and '*' wildcards are supported::"
9779
9797
msgstr ""
9780
9798
9781
#: en/help_topics/configuration.txt:366
9799
#: en/help_topics/configuration.txt:378
9782
9800
msgid ""
9783
9801
" [/home/jdoe/branches/nethack]\n"
9784
9802
" email = Nethack Admin <nethack@nethack.com>"
9785
9803
msgstr ""
9786
9804
9787
#: en/help_topics/configuration.txt:369
9805
#: en/help_topics/configuration.txt:381
9788
9806
msgid ""
9789
9807
" [http://hypothetical.site.com/branches/devel-branch]\n"
9790
9808
" create_signatures = always"
9791
9809
msgstr ""
9792
9810
9793
#: en/help_topics/configuration.txt:372
9811
#: en/help_topics/configuration.txt:384
9794
9812
msgid ""
9795
9813
"The authentication configuration file, authentication.conf\n"
9796
9814
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
9797
9815
msgstr ""
9798
9816
9799
#: en/help_topics/configuration.txt:375
9817
#: en/help_topics/configuration.txt:387
9800
9818
msgid ""
9801
9819
"``authentication.conf`` allows one to specify credentials for\n"
9802
9820
"remote servers. This can be used for all the supported transports and any "
9804
9822
"of bzr that requires authentication (smtp for example)."
9805
9823
msgstr ""
9806
9824
9807
#: en/help_topics/configuration.txt:379
9825
#: en/help_topics/configuration.txt:391
9808
9826
msgid ""
9809
9827
"The syntax of the file obeys the same rules as the others except for the\n"
9810
9828
"option policies which don't apply."
9811
9829
msgstr ""
9812
9830
9813
#: en/help_topics/configuration.txt:382
9831
#: en/help_topics/configuration.txt:394
9814
9832
msgid ""
9815
9833
"For more information on the possible uses of the authentication "
9816
9834
"configuration\n"
9817
9835
"file see :doc:`authentication-help`."
9818
9836
msgstr ""
9819
9837
9820
#: en/help_topics/configuration.txt:385
9838
#: en/help_topics/configuration.txt:397
9821
9839
msgid ""
9822
9840
"\n"
9823
9841
"Common options\n"
9824
9842
"--------------"
9825
9843
msgstr ""
9826
9844
9827
#: en/help_topics/configuration.txt:389
9845
#: en/help_topics/configuration.txt:401
9828
9846
msgid ""
9829
9847
"debug_flags\n"
9830
9848
"~~~~~~~~~~~"
9831
9849
msgstr ""
9832
9850
9833
#: en/help_topics/configuration.txt:392
9851
#: en/help_topics/configuration.txt:404
9834
9852
msgid ""
9835
9853
"A comma-separated list of debugging options to turn on. The same values\n"
9836
9854
"can be used as with the -D command-line option (see `help global-options`).\n"
9837
9855
"For example::"
9838
9856
msgstr ""
9839
9857
9840
#: en/help_topics/configuration.txt:396
9858
#: en/help_topics/configuration.txt:408
9841
9859
msgid " debug_flags = hpss"
9842
9860
msgstr ""
9843
9861
9844
#: en/help_topics/configuration.txt:400
9862
#: en/help_topics/configuration.txt:412
9845
9863
msgid " debug_flags = hpss,evil"
9846
9864
msgstr ""
9847
9865
9848
#: en/help_topics/configuration.txt:402
9866
#: en/help_topics/configuration.txt:414
9849
9867
msgid ""
9850
9868
"email\n"
9851
9869
"~~~~~"
9852
9870
msgstr ""
9853
9871
9854
#: en/help_topics/configuration.txt:405
9872
#: en/help_topics/configuration.txt:417
9855
9873
msgid ""
9856
9874
"The email address to use when committing a branch. Typically takes the form\n"
9857
9875
"of::"
9858
9876
msgstr ""
9859
9877
9860
#: en/help_topics/configuration.txt:408
9878
#: en/help_topics/configuration.txt:420
9861
9879
msgid " email = Full Name <account@hostname.tld>"
9862
9880
msgstr ""
9863
9881
9864
#: en/help_topics/configuration.txt:410
9882
#: en/help_topics/configuration.txt:422
9865
9883
msgid ""
9866
9884
"editor\n"
9867
9885
"~~~~~~"
9868
9886
msgstr ""
9869
9887
9870
#: en/help_topics/configuration.txt:413
9888
#: en/help_topics/configuration.txt:425
9871
9889
msgid ""
9872
9890
"The path of the editor that you wish to use if *bzr commit* is run without\n"
9873
9891
"a commit message. This setting is trumped by the environment variable\n"
9875
9893
"variables."
9876
9894
msgstr ""
9877
9895
9878
#: en/help_topics/configuration.txt:418
9896
#: en/help_topics/configuration.txt:430
9879
9897
msgid ""
9880
9898
"log_format\n"
9881
9899
"~~~~~~~~~~"
9882
9900
msgstr ""
9883
9901
9884
#: en/help_topics/configuration.txt:421
9902
#: en/help_topics/configuration.txt:433
9885
9903
msgid ""
9886
9904
"The default log format to use. Standard log formats are ``long``, ``short``\n"
9887
9905
"and ``line``. Additional formats may be provided by plugins. The default\n"
9888
9906
"value is ``long``."
9889
9907
msgstr ""
9890
9908
9891
#: en/help_topics/configuration.txt:425
9909
#: en/help_topics/configuration.txt:437
9892
9910
msgid ""
9893
9911
"check_signatures\n"
9894
9912
"~~~~~~~~~~~~~~~~"
9895
9913
msgstr ""
9896
9914
9897
#: en/help_topics/configuration.txt:428
9915
#: en/help_topics/configuration.txt:440
9898
9916
msgid ""
9899
9917
"Reserved for future use. These options will allow a policy for branches to\n"
9900
9918
"require signatures."
9901
9919
msgstr ""
9902
9920
9903
#: en/help_topics/configuration.txt:431
9921
#: en/help_topics/configuration.txt:443
9904
9922
msgid ""
9905
9923
"require\n"
9906
9924
" The gnupg signature for revisions must be present and must be valid."
9907
9925
msgstr ""
9908
9926
9909
#: en/help_topics/configuration.txt:434
9927
#: en/help_topics/configuration.txt:446
9910
9928
msgid ""
9911
9929
"ignore\n"
9912
9930
" Do not check gnupg signatures of revisions."
9913
9931
msgstr ""
9914
9932
9915
#: en/help_topics/configuration.txt:437
9933
#: en/help_topics/configuration.txt:449
9916
9934
msgid ""
9917
9935
"check-available\n"
9918
9936
" (default) If gnupg signatures for revisions are present, check them.\n"
9920
9938
" no signature is present."
9921
9939
msgstr ""
9922
9940
9923
#: en/help_topics/configuration.txt:442
9941
#: en/help_topics/configuration.txt:454
9924
9942
msgid ""
9925
9943
"create_signatures\n"
9926
9944
"~~~~~~~~~~~~~~~~~"
9927
9945
msgstr ""
9928
9946
9929
#: en/help_topics/configuration.txt:445
9947
#: en/help_topics/configuration.txt:457
9930
9948
msgid ""
9931
9949
"Defines the behaviour of signing revisions on commits. By default bzr will "
9932
9950
"not\n"
9933
9951
"sign new commits."
9934
9952
msgstr ""
9935
9953
9936
#: en/help_topics/configuration.txt:448
9954
#: en/help_topics/configuration.txt:460
9937
9955
msgid ""
9938
9956
"always\n"
9939
9957
" Sign every new revision that is committed. If the signing fails then "
9941
9959
" commit will not be made."
9942
9960
msgstr ""
9943
9961
9944
#: en/help_topics/configuration.txt:452
9962
#: en/help_topics/configuration.txt:464
9945
9963
msgid ""
9946
9964
"when-required\n"
9947
9965
" Reserved for future use."
9948
9966
msgstr ""
9949
9967
9950
#: en/help_topics/configuration.txt:455
9968
#: en/help_topics/configuration.txt:467
9951
9969
msgid ""
9952
9970
"never\n"
9953
9971
" Reserved for future use."
9954
9972
msgstr ""
9955
9973
9956
#: en/help_topics/configuration.txt:458
9974
#: en/help_topics/configuration.txt:470
9957
9975
msgid ""
9958
9976
"In future it is planned that ``when-required`` will sign newly\n"
9959
9977
"committed revisions only when the branch requires them. ``never`` will "
9961
9979
"to sign newly committed revisions, even if the branch requires signatures."
9962
9980
msgstr ""
9963
9981
9964
#: en/help_topics/configuration.txt:462
9982
#: en/help_topics/configuration.txt:474
9965
9983
msgid ""
9966
9984
"dirstate.fdatasync\n"
9967
9985
"~~~~~~~~~~~~~~~~~~"
9968
9986
msgstr ""
9969
9987
9970
#: en/help_topics/configuration.txt:465
9988
#: en/help_topics/configuration.txt:477
9971
9989
msgid ""
9972
9990
"If true (default), working tree metadata changes are flushed through the\n"
9973
9991
"OS buffers to physical disk. This is somewhat slower, but means data\n"
9974
9992
"should not be lost if the machine crashes. See also repository.fdatasync."
9975
9993
msgstr ""
9976
9994
9977
#: en/help_topics/configuration.txt:469
9995
#: en/help_topics/configuration.txt:481
9978
9996
msgid ""
9979
9997
"gpg_signing_key\n"
9980
9998
"~~~~~~~~~~~~~~~"
9981
9999
msgstr ""
9982
10000
9983
#: en/help_topics/configuration.txt:472
10001
#: en/help_topics/configuration.txt:484
9984
10002
msgid ""
9985
10003
"The GnuPG user identity to use when signing commits. Can be an e-mail\n"
9986
10004
"address, key fingerprint or full key ID. When unset or when set to\n"
9987
10005
"\"default\" Bazaar will use the user e-mail set with ``whoami``."
9988
10006
msgstr ""
9989
10007
9990
#: en/help_topics/configuration.txt:476
10008
#: en/help_topics/configuration.txt:488
9991
10009
msgid ""
9992
10010
"recurse\n"
9993
10011
"~~~~~~~"
9994
10012
msgstr ""
9995
10013
9996
#: en/help_topics/configuration.txt:479
10014
#: en/help_topics/configuration.txt:491
9997
10015
msgid ""
9998
10016
"Only useful in ``locations.conf``. Defines whether or not the\n"
9999
10017
"configuration for this section applies to subdirectories:"
10000
10018
msgstr ""
10001
10019
10002
#: en/help_topics/configuration.txt:482
10020
#: en/help_topics/configuration.txt:494
10003
10021
msgid ""
10004
10022
"true\n"
10005
10023
" (default) This section applies to subdirectories as well."
10006
10024
msgstr ""
10007
10025
10008
#: en/help_topics/configuration.txt:485
10026
#: en/help_topics/configuration.txt:497
10009
10027
msgid ""
10010
10028
"false\n"
10011
10029
" This section only applies to the branch at this directory and not\n"
10012
10030
" branches below it."
10013
10031
msgstr ""
10014
10032
10015
#: en/help_topics/configuration.txt:489
10033
#: en/help_topics/configuration.txt:501
10016
10034
msgid ""
10017
10035
"gpg_signing_command\n"
10018
10036
"~~~~~~~~~~~~~~~~~~~"
10019
10037
msgstr ""
10020
10038
10021
#: en/help_topics/configuration.txt:492
10039
#: en/help_topics/configuration.txt:504
10022
10040
msgid ""
10023
10041
"(Default: \"gpg\"). Which program should be used to sign and check "
10024
10042
"revisions.\n"
10025
10043
"For example::"
10026
10044
msgstr ""
10027
10045
10028
#: en/help_topics/configuration.txt:495
10046
#: en/help_topics/configuration.txt:507
10029
10047
msgid " gpg_signing_command = /usr/bin/gnpg"
10030
10048
msgstr ""
10031
10049
10032
#: en/help_topics/configuration.txt:497
10050
#: en/help_topics/configuration.txt:509
10033
10051
msgid ""
10034
10052
"The specified command must accept the options \"--clearsign\" and \"-u "
10035
10053
"<email>\"."
10036
10054
msgstr ""
10037
10055
10038
#: en/help_topics/configuration.txt:499
10056
#: en/help_topics/configuration.txt:511
10039
10057
msgid ""
10040
10058
"bzr_remote_path\n"
10041
10059
"~~~~~~~~~~~~~~~"
10042
10060
msgstr ""
10043
10061
10044
#: en/help_topics/configuration.txt:502
10062
#: en/help_topics/configuration.txt:514
10045
10063
msgid ""
10046
10064
"(Default: \"bzr\"). The path to the command that should be used to run the "
10047
10065
"smart\n"
10048
10066
"server for bzr. This value may only be specified in locations.conf, because:"
10049
10067
msgstr ""
10050
10068
10051
#: en/help_topics/configuration.txt:505
10069
#: en/help_topics/configuration.txt:517
10052
10070
msgid ""
10053
10071
"- it's needed before branch.conf is accessible\n"
10054
10072
"- allowing remote branch.conf files to specify commands would be a security\n"
10055
10073
" risk"
10056
10074
msgstr ""
10057
10075
10058
#: en/help_topics/configuration.txt:509
10076
#: en/help_topics/configuration.txt:521
10059
10077
msgid "It is overridden by the BZR_REMOTE_PATH environment variable."
10060
10078
msgstr ""
10061
10079
10062
#: en/help_topics/configuration.txt:511
10080
#: en/help_topics/configuration.txt:523
10063
10081
msgid ""
10064
10082
"smtp_server\n"
10065
10083
"~~~~~~~~~~~"
10066
10084
msgstr ""
10067
10085
10068
#: en/help_topics/configuration.txt:514
10086
#: en/help_topics/configuration.txt:526
10069
10087
msgid ""
10070
10088
"(Default: \"localhost\"). SMTP server to use when Bazaar needs to send\n"
10071
10089
"email, eg. with ``merge-directive --mail-to``, or the bzr-email plugin."
10072
10090
msgstr ""
10073
10091
10074
#: en/help_topics/configuration.txt:517
10092
#: en/help_topics/configuration.txt:529
10075
10093
msgid ""
10076
10094
"smtp_username, smtp_password\n"
10077
10095
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
10078
10096
msgstr ""
10079
10097
10080
#: en/help_topics/configuration.txt:520
10098
#: en/help_topics/configuration.txt:532
10081
10099
msgid ""
10082
10100
"User and password to authenticate to the SMTP server. If smtp_username\n"
10083
10101
"is set, and smtp_password is not, Bazaar will prompt for a password.\n"
10085
10103
"to send mail."
10086
10104
msgstr ""
10087
10105
10088
#: en/help_topics/configuration.txt:525
10106
#: en/help_topics/configuration.txt:537
10089
10107
msgid ""
10090
10108
"locks.steal_dead\n"
10091
10109
"~~~~~~~~~~~~~~~~"
10092
10110
msgstr ""
10093
10111
10094
#: en/help_topics/configuration.txt:528
10112
#: en/help_topics/configuration.txt:540
10095
10113
msgid ""
10096
10114
"If set to true, bzr will automatically break locks held by processes from\n"
10097
10115
"the same machine and user that are no longer alive. Otherwise, it will\n"
10099
10117
"the object is no longer in use."
10100
10118
msgstr ""
10101
10119
10102
#: en/help_topics/configuration.txt:533
10120
#: en/help_topics/configuration.txt:545
10103
10121
msgid ""
10104
10122
"mail_client\n"
10105
10123
"~~~~~~~~~~~"
10106
10124
msgstr ""
10107
10125
10108
#: en/help_topics/configuration.txt:536
10126
#: en/help_topics/configuration.txt:548
10109
10127
msgid ""
10110
10128
"A mail client to use for sending merge requests.\n"
10111
10129
"By default, bzr will try to use ``mapi`` on Windows. On other platforms, "
10114
10132
"``editor``."
10115
10133
msgstr ""
10116
10134
10117
#: en/help_topics/configuration.txt:541
10135
#: en/help_topics/configuration.txt:553
10118
10136
msgid "Supported values for specific clients:"
10119
10137
msgstr ""
10120
10138
10121
#: en/help_topics/configuration.txt:543
10139
#: en/help_topics/configuration.txt:555
10122
10140
msgid ""
10123
10141
":claws: Use Claws. This skips a dialog for attaching files.\n"
10124
10142
":evolution: Use Evolution.\n"
10129
10147
" this works around some bugs that xdg-email doesn't handle."
10130
10148
msgstr ""
10131
10149
10132
#: en/help_topics/configuration.txt:550
10150
#: en/help_topics/configuration.txt:562
10133
10151
msgid "Supported generic values are:"
10134
10152
msgstr ""
10135
10153
10136
#: en/help_topics/configuration.txt:552
10154
#: en/help_topics/configuration.txt:564
10137
10155
msgid ""
10138
10156
":default: See above.\n"
10139
10157
":editor: Use your editor to compose the merge request. This also uses\n"
10143
10161
":xdg-email: Use xdg-email to run your preferred mail program"
10144
10162
msgstr ""
10145
10163
10146
#: en/help_topics/configuration.txt:559
10164
#: en/help_topics/configuration.txt:571
10147
10165
msgid ""
10148
10166
"repository.fdatasync\n"
10149
10167
"~~~~~~~~~~~~~~~~~~~~"
10150
10168
msgstr ""
10151
10169
10152
#: en/help_topics/configuration.txt:562
10170
#: en/help_topics/configuration.txt:574
10153
10171
msgid ""
10154
10172
"If true (default), repository changes are flushed through the OS buffers\n"
10155
10173
"to physical disk. This is somewhat slower, but means data should not be\n"
10156
10174
"lost if the machine crashes. See also dirstate.fdatasync."
10157
10175
msgstr ""
10158
10176
10159
#: en/help_topics/configuration.txt:566
10177
#: en/help_topics/configuration.txt:578
10160
10178
msgid ""
10161
10179
"submit_branch\n"
10162
10180
"~~~~~~~~~~~~~"
10163
10181
msgstr ""
10164
10182
10165
#: en/help_topics/configuration.txt:569
10183
#: en/help_topics/configuration.txt:581
10166
10184
msgid ""
10167
10185
"The branch you intend to submit your current work to. This is "
10168
10186
"automatically\n"
10171
10189
"should usually be set on a per-branch or per-location basis."
10172
10190
msgstr ""
10173
10191
10174
#: en/help_topics/configuration.txt:573
10192
#: en/help_topics/configuration.txt:585
10175
10193
msgid ""
10176
10194
"public_branch\n"
10177
10195
"~~~~~~~~~~~~~"
10178
10196
msgstr ""
10179
10197
10180
#: en/help_topics/configuration.txt:576
10198
#: en/help_topics/configuration.txt:588
10181
10199
msgid ""
10182
10200
"A publically-accessible version of this branch (implying that this version "
10183
10201
"is\n"
10184
10202
"not publically-accessible). Used (and set) by ``bzr send``."
10185
10203
msgstr ""
10186
10204
10187
#: en/help_topics/configuration.txt:579
10205
#: en/help_topics/configuration.txt:591
10188
10206
msgid ""
10189
10207
"suppress_warnings\n"
10190
10208
"~~~~~~~~~~~~~~~~~"
10191
10209
msgstr ""
10192
10210
10193
#: en/help_topics/configuration.txt:582
10211
#: en/help_topics/configuration.txt:594
10194
10212
msgid ""
10195
10213
"A list of strings, each string represent a warning that can be emitted by\n"
10196
10214
"bzr. Mentioning a warning in this list tells bzr to not emit it."
10197
10215
msgstr ""
10198
10216
10199
#: en/help_topics/configuration.txt:585
10217
#: en/help_topics/configuration.txt:597
10200
10218
msgid "Valid values:"
10201
10219
msgstr ""
10202
10220
10203
#: en/help_topics/configuration.txt:587
10221
#: en/help_topics/configuration.txt:599
10204
10222
msgid ""
10205
10223
"* ``format_deprecation``:\n"
10206
10224
" whether the format deprecation warning is shown on repositories that "
10208
10226
" using deprecated formats."
10209
10227
msgstr ""
10210
10228
10211
#: en/help_topics/configuration.txt:591
10229
#: en/help_topics/configuration.txt:603
10212
10230
msgid ""
10213
10231
"default_format\n"
10214
10232
"~~~~~~~~~~~~~~"
10215
10233
msgstr ""
10216
10234
10217
#: en/help_topics/configuration.txt:594
10235
#: en/help_topics/configuration.txt:606
10218
10236
msgid ""
10219
10237
"A format name for the default format used when creating branches. See "
10220
10238
"``bzr\n"
10221
10239
"help formats`` for possible values."
10222
10240
msgstr ""
10223
10241
10224
#: en/help_topics/configuration.txt:597
10242
#: en/help_topics/configuration.txt:609
10225
10243
msgid ""
10226
10244
"\n"
10227
10245
"Unicode options\n"
10228
10246
"---------------"
10229
10247
msgstr ""
10230
10248
10231
#: en/help_topics/configuration.txt:601
10249
#: en/help_topics/configuration.txt:613
10232
10250
msgid ""
10233
10251
"output_encoding\n"
10234
10252
"~~~~~~~~~~~~~~~"
10235
10253
msgstr ""
10236
10254
10237
#: en/help_topics/configuration.txt:604
10255
#: en/help_topics/configuration.txt:616
10238
10256
msgid ""
10239
10257
"A Python unicode encoding name for text output from bzr, such as log\n"
10240
10258
"information. Values include: utf8, cp850, ascii, iso-8859-1. The default\n"
10241
10259
"is the terminal encoding prefered by the operating system."
10242
10260
msgstr ""
10243
10261
10244
#: en/help_topics/configuration.txt:608
10262
#: en/help_topics/configuration.txt:620
10245
10263
msgid ""
10246
10264
"\n"
10247
10265
"Branch type specific options\n"
10248
10266
"----------------------------"
10249
10267
msgstr ""
10250
10268
10251
#: en/help_topics/configuration.txt:612
10269
#: en/help_topics/configuration.txt:624
10252
10270
msgid ""
10253
10271
"These options apply only to branches that use the ``dirstate-tags`` or\n"
10254
10272
"later format. They\n"
10256
10274
"manually set in ``locations.conf`` or ``bazaar.conf``."
10257
10275
msgstr ""
10258
10276
10259
#: en/help_topics/configuration.txt:617
10277
#: en/help_topics/configuration.txt:629
10260
10278
msgid ""
10261
10279
"append_revisions_only\n"
10262
10280
"~~~~~~~~~~~~~~~~~~~~~"
10263
10281
msgstr ""
10264
10282
10265
#: en/help_topics/configuration.txt:620
10283
#: en/help_topics/configuration.txt:632
10266
10284
msgid ""
10267
10285
"If set to \"True\" then revisions can only be appended to the log, not\n"
10268
10286
"removed. A branch with this setting enabled can only pull from another\n"
10272
10290
"compatibility with previous bzr versions (older than 2.2)."
10273
10291
msgstr ""
10274
10292
10275
#: en/help_topics/configuration.txt:627
10293
#: en/help_topics/configuration.txt:639
10276
10294
msgid ""
10277
10295
"parent_location\n"
10278
10296
"~~~~~~~~~~~~~~~"
10279
10297
msgstr ""
10280
10298
10281
#: en/help_topics/configuration.txt:630
10299
#: en/help_topics/configuration.txt:642
10282
10300
msgid ""
10283
10301
"If present, the location of the default branch for pull or merge. This "
10284
10302
"option\n"
10286
10304
"--remember``."
10287
10305
msgstr ""
10288
10306
10289
#: en/help_topics/configuration.txt:634
10307
#: en/help_topics/configuration.txt:646
10290
10308
msgid ""
10291
10309
"push_location\n"
10292
10310
"~~~~~~~~~~~~~"
10293
10311
msgstr ""
10294
10312
10295
#: en/help_topics/configuration.txt:637
10313
#: en/help_topics/configuration.txt:649
10296
10314
msgid ""
10297
10315
"If present, the location of the default branch for push. This option\n"
10298
10316
"is normally set by the first ``push`` or ``push --remember``."
10299
10317
msgstr ""
10300
10318
10301
#: en/help_topics/configuration.txt:640
10319
#: en/help_topics/configuration.txt:652
10302
10320
msgid ""
10303
10321
"push_strict\n"
10304
10322
"~~~~~~~~~~~"
10305
10323
msgstr ""
10306
10324
10307
#: en/help_topics/configuration.txt:643
10325
#: en/help_topics/configuration.txt:655
10308
10326
msgid ""
10309
10327
"If present, defines the ``--strict`` option default value for checking\n"
10310
10328
"uncommitted changes before pushing."
10311
10329
msgstr ""
10312
10330
10313
#: en/help_topics/configuration.txt:646
10331
#: en/help_topics/configuration.txt:658
10314
10332
msgid ""
10315
10333
"dpush_strict\n"
10316
10334
"~~~~~~~~~~~~"
10317
10335
msgstr ""
10318
10336
10319
#: en/help_topics/configuration.txt:649
10337
#: en/help_topics/configuration.txt:661
10320
10338
msgid ""
10321
10339
"If present, defines the ``--strict`` option default value for checking\n"
10322
10340
"uncommitted changes before pushing into a different VCS without any\n"
10323
10341
"custom bzr metadata."
10324
10342
msgstr ""
10325
10343
10326
#: en/help_topics/configuration.txt:653
10344
#: en/help_topics/configuration.txt:665
10327
10345
msgid ""
10328
10346
"bound_location\n"
10329
10347
"~~~~~~~~~~~~~~"
10330
10348
msgstr ""
10331
10349
10332
#: en/help_topics/configuration.txt:656
10350
#: en/help_topics/configuration.txt:668
10333
10351
msgid ""
10334
10352
"The location that commits should go to when acting as a checkout.\n"
10335
10353
"This option is normally set by ``bind``."
10336
10354
msgstr ""
10337
10355
10338
#: en/help_topics/configuration.txt:659
10356
#: en/help_topics/configuration.txt:671
10339
10357
msgid ""
10340
10358
"bound\n"
10341
10359
"~~~~~"
10342
10360
msgstr ""
10343
10361
10344
#: en/help_topics/configuration.txt:662
10362
#: en/help_topics/configuration.txt:674
10345
10363
msgid ""
10346
10364
"If set to \"True\", the branch should act as a checkout, and push each "
10347
10365
"commit to\n"
10348
10366
"the bound_location. This option is normally set by ``bind``/``unbind``."
10349
10367
msgstr ""
10350
10368
10351
#: en/help_topics/configuration.txt:665
10369
#: en/help_topics/configuration.txt:677
10352
10370
msgid ""
10353
10371
"send_strict\n"
10354
10372
"~~~~~~~~~~~"
10355
10373
msgstr ""
10356
10374
10357
#: en/help_topics/configuration.txt:668
10375
#: en/help_topics/configuration.txt:680
10358
10376
msgid ""
10359
10377
"If present, defines the ``--strict`` option default value for checking\n"
10360
10378
"uncommitted changes before sending a merge directive."
10361
10379
msgstr ""
10362
10380
10363
#: en/help_topics/configuration.txt:671
10381
#: en/help_topics/configuration.txt:683
10364
10382
msgid ""
10365
10383
"add.maximum_file_size\n"
10366
10384
"~~~~~~~~~~~~~~~~~~~~~"
10367
10385
msgstr ""
10368
10386
10369
#: en/help_topics/configuration.txt:674
10387
#: en/help_topics/configuration.txt:686
10370
10388
msgid ""
10371
10389
"Defines the maximum file size the command line \"add\" operation will allow\n"
10372
10390
"in recursive mode, with files larger than this value being skipped. You may "
10378
10396
"will disable skipping."
10379
10397
msgstr ""
10380
10398
10381
#: en/help_topics/configuration.txt:680
10399
#: en/help_topics/configuration.txt:692
10382
10400
msgid ""
10383
10401
"External Merge Tools\n"
10384
10402
"--------------------"
10385
10403
msgstr ""
10386
10404
10387
#: en/help_topics/configuration.txt:683
10405
#: en/help_topics/configuration.txt:695
10388
10406
msgid ""
10389
10407
"bzr.mergetool.<name>\n"
10390
10408
"~~~~~~~~~~~~~~~~~~~~"
10391
10409
msgstr ""
10392
10410
10393
#: en/help_topics/configuration.txt:686
10411
#: en/help_topics/configuration.txt:698
10394
10412
msgid ""
10395
10413
"Defines an external merge tool called <name> with the given command-line.\n"
10396
10414
"Arguments containing spaces should be quoted using single or double quotes. "
10398
10416
"executable may omit its path if it can be found on the PATH."
10399
10417
msgstr ""
10400
10418
10401
#: en/help_topics/configuration.txt:690
10419
#: en/help_topics/configuration.txt:702
10402
10420
msgid ""
10403
10421
"The following markers can be used in the command-line to substitute "
10404
10422
"filenames\n"
10405
10423
"involved in the merge conflict::"
10406
10424
msgstr ""
10407
10425
10408
#: en/help_topics/configuration.txt:693
10426
#: en/help_topics/configuration.txt:705
10409
10427
msgid ""
10410
10428
" {base} file.BASE\n"
10411
10429
" {this} file.THIS\n"
10416
10434
" succeeds."
10417
10435
msgstr ""
10418
10436
10419
#: en/help_topics/configuration.txt:702
10437
#: en/help_topics/configuration.txt:714
10420
10438
msgid " bzr.mergetool.kdiff3 = kdiff3 {base} {this} {other} -o {result}"
10421
10439
msgstr ""
10422
10440
10423
#: en/help_topics/configuration.txt:704
10441
#: en/help_topics/configuration.txt:716
10424
10442
msgid ""
10425
10443
"bzr.default_mergetool\n"
10426
10444
"~~~~~~~~~~~~~~~~~~~~~"
10427
10445
msgstr ""
10428
10446
10429
#: en/help_topics/configuration.txt:707
10447
#: en/help_topics/configuration.txt:719
10430
10448
msgid ""
10431
10449
"Specifies which external merge tool (as defined above) should be selected "
10432
10450
"by\n"
10433
10451
"default in tools such as ``bzr qconflicts``."
10434
10452
msgstr ""
10435
10453
10436
#: en/help_topics/configuration.txt:712
10454
#: en/help_topics/configuration.txt:724
10437
10455
msgid " bzr.default_mergetool = kdiff3\n"
10438
10456
msgstr ""
10439
10457
11384
11402
"branch can now be pushed to the mainline.\n"
11385
11403
msgstr ""
11386
11404
11405
#: en/help_topics/env-variables.txt:1
11406
msgid "Environment Variables"
11407
msgstr ""
11408
11409
#: en/help_topics/env-variables.txt:3
11410
msgid ""
11411
"=================== "
11412
"===========================================================\n"
11413
"BZRPATH Path where bzr is to look for shell plugin external\n"
11414
" commands.\n"
11415
"BZR_EMAIL E-Mail address of the user. Overrides EMAIL.\n"
11416
"EMAIL E-Mail address of the user.\n"
11417
"BZR_EDITOR Editor for editing commit messages. Overrides EDITOR.\n"
11418
"EDITOR Editor for editing commit messages.\n"
11419
"BZR_PLUGIN_PATH Paths where bzr should look for plugins.\n"
11420
"BZR_DISABLE_PLUGINS Plugins that bzr should not load.\n"
11421
"BZR_PLUGINS_AT Plugins to load from a directory not in "
11422
"BZR_PLUGIN_PATH.\n"
11423
"BZR_HOME Directory holding .bazaar config dir. Overrides HOME.\n"
11424
"BZR_HOME (Win32) Directory holding bazaar config dir. Overrides APPDATA "
11425
"and\n"
11426
" HOME.\n"
11427
"BZR_REMOTE_PATH Full name of remote 'bzr' command (for bzr+ssh:// "
11428
"URLs).\n"
11429
"BZR_SSH Path to SSH client, or one of paramiko, openssh, "
11430
"sshcorp,\n"
11431
" plink or lsh.\n"
11432
"BZR_LOG Location of .bzr.log (use '/dev/null' to suppress log).\n"
11433
"BZR_LOG (Win32) Location of .bzr.log (use 'NUL' to suppress log).\n"
11434
"BZR_COLUMNS Override implicit terminal width.\n"
11435
"BZR_CONCURRENCY Number of processes that can be run concurrently "
11436
"(selftest)\n"
11437
"BZR_PROGRESS_BAR Override the progress display. Values are 'none' or "
11438
"'text'.\n"
11439
"BZR_PDB Control whether to launch a debugger on error.\n"
11440
"BZR_SIGQUIT_PDB Control whether SIGQUIT behaves normally or invokes a\n"
11441
" breakin debugger.\n"
11442
"BZR_TEXTUI_INPUT Force console input mode for prompts to line-based "
11443
"(instead\n"
11444
" of char-based).\n"
11445
"=================== "
11446
"===========================================================\n"
11447
msgstr ""
11448
11387
11449
#: en/help_topics/eol.txt:1
11388
11450
msgid ""
11389
11451
"End of Line Conversion\n"
11691
11753
msgstr ""
11692
11754
11693
11755
#: en/help_topics/hooks.txt:38 en/help_topics/hooks.txt:56
11694
#: en/help_topics/hooks.txt:102 en/help_topics/hooks.txt:259
11756
#: en/help_topics/hooks.txt:102 en/help_topics/hooks.txt:262
11695
11757
msgid "Introduced in: 2.2"
11696
11758
msgstr ""
11697
11759
11709
11771
"~~~~"
11710
11772
msgstr ""
11711
11773
11712
#: en/help_topics/hooks.txt:48 en/help_topics/hooks.txt:290
11713
#: en/help_topics/hooks.txt:304
11774
#: en/help_topics/hooks.txt:48 en/help_topics/hooks.txt:293
11775
#: en/help_topics/hooks.txt:307
11714
11776
msgid "Introduced in: 1.8"
11715
11777
msgstr ""
11716
11778
11740
11802
"~~~~~~~~~~~~~~~~~~~~~~"
11741
11803
msgstr ""
11742
11804
11743
#: en/help_topics/hooks.txt:66 en/help_topics/hooks.txt:418
11805
#: en/help_topics/hooks.txt:66 en/help_topics/hooks.txt:421
11744
11806
msgid "Introduced in: 1.4"
11745
11807
msgstr ""
11746
11808
11752
11814
"uncommit will all trigger this hook."
11753
11815
msgstr ""
11754
11816
11755
#: en/help_topics/hooks.txt:73 en/help_topics/hooks.txt:389
11817
#: en/help_topics/hooks.txt:73 en/help_topics/hooks.txt:392
11756
11818
msgid ""
11757
11819
"post_commit\n"
11758
11820
"~~~~~~~~~~~"
11760
11822
11761
11823
#: en/help_topics/hooks.txt:76 en/help_topics/hooks.txt:86
11762
11824
#: en/help_topics/hooks.txt:94 en/help_topics/hooks.txt:110
11763
#: en/help_topics/hooks.txt:145
11764
11825
msgid "Introduced in: 0.15"
11765
11826
msgstr ""
11766
11827
11865
11926
11866
11927
#: en/help_topics/hooks.txt:142
11867
11928
msgid ""
11868
"set_rh\n"
11869
"~~~~~~"
11870
msgstr ""
11871
11872
#: en/help_topics/hooks.txt:147
11873
msgid ""
11874
"Invoked whenever the revision history has been set via\n"
11875
"set_revision_history. The api signature is (branch, revision_history),\n"
11876
"and the branch will be write-locked. The set_rh hook can be expensive\n"
11877
"for bzr to trigger, a better hook to use is\n"
11878
"Branch.post_change_branch_tip."
11879
msgstr ""
11880
11881
#: en/help_topics/hooks.txt:153
11882
msgid ""
11883
11929
"transform_fallback_location\n"
11884
11930
"~~~~~~~~~~~~~~~~~~~~~~~~~~~"
11885
11931
msgstr ""
11886
11932
11887
#: en/help_topics/hooks.txt:156
11933
#: en/help_topics/hooks.txt:145
11888
11934
msgid "Introduced in: 1.9"
11889
11935
msgstr ""
11890
11936
11891
#: en/help_topics/hooks.txt:158
11937
#: en/help_topics/hooks.txt:147
11892
11938
msgid ""
11893
11939
"Called when a stacked branch is activating its fallback locations.\n"
11894
11940
"transform_fallback_location is called with (branch, url), and should\n"
11902
11948
"however undefined."
11903
11949
msgstr ""
11904
11950
11905
#: en/help_topics/hooks.txt:169
11951
#: en/help_topics/hooks.txt:158
11906
11952
msgid ""
11907
11953
"CommandHooks\n"
11908
11954
"------------"
11909
11955
msgstr ""
11910
11956
11911
#: en/help_topics/hooks.txt:172
11957
#: en/help_topics/hooks.txt:161
11912
11958
msgid ""
11913
11959
"extend_command\n"
11914
11960
"~~~~~~~~~~~~~~"
11915
11961
msgstr ""
11916
11962
11917
#: en/help_topics/hooks.txt:175
11963
#: en/help_topics/hooks.txt:164
11918
11964
msgid "Introduced in: 1.13"
11919
11965
msgstr ""
11920
11966
11921
#: en/help_topics/hooks.txt:177
11967
#: en/help_topics/hooks.txt:166
11922
11968
msgid ""
11923
11969
"Called after creating a command object to allow modifications such as\n"
11924
11970
"adding or removing options, docs etc. Called with the new\n"
11925
11971
"bzrlib.commands.Command object."
11926
11972
msgstr ""
11927
11973
11928
#: en/help_topics/hooks.txt:181
11974
#: en/help_topics/hooks.txt:170
11929
11975
msgid ""
11930
11976
"get_command\n"
11931
11977
"~~~~~~~~~~~"
11932
11978
msgstr ""
11933
11979
11934
#: en/help_topics/hooks.txt:184 en/help_topics/hooks.txt:196
11935
#: en/help_topics/hooks.txt:205 en/help_topics/hooks.txt:464
11980
#: en/help_topics/hooks.txt:173 en/help_topics/hooks.txt:185
11981
#: en/help_topics/hooks.txt:194 en/help_topics/hooks.txt:467
11936
11982
msgid "Introduced in: 1.17"
11937
11983
msgstr ""
11938
11984
11939
#: en/help_topics/hooks.txt:186
11985
#: en/help_topics/hooks.txt:175
11940
11986
msgid ""
11941
11987
"Called when creating a single command. Called with (cmd_or_None,\n"
11942
11988
"command_name). get_command should either return the cmd_or_None\n"
11946
11992
"plugin_cmds.register_lazy."
11947
11993
msgstr ""
11948
11994
11949
#: en/help_topics/hooks.txt:193
11995
#: en/help_topics/hooks.txt:182
11950
11996
msgid ""
11951
11997
"get_missing_command\n"
11952
11998
"~~~~~~~~~~~~~~~~~~~"
11953
11999
msgstr ""
11954
12000
11955
#: en/help_topics/hooks.txt:198
12001
#: en/help_topics/hooks.txt:187
11956
12002
msgid ""
11957
12003
"Called when creating a single command if no command could be found.\n"
11958
12004
"Called with (command_name). get_missing_command should either return\n"
11959
12005
"None, or a Command object to be used for the command."
11960
12006
msgstr ""
11961
12007
11962
#: en/help_topics/hooks.txt:202
12008
#: en/help_topics/hooks.txt:191
11963
12009
msgid ""
11964
12010
"list_commands\n"
11965
12011
"~~~~~~~~~~~~~"
11966
12012
msgstr ""
11967
12013
11968
#: en/help_topics/hooks.txt:207
12014
#: en/help_topics/hooks.txt:196
11969
12015
msgid ""
11970
12016
"Called when enumerating commands. Called with a set of cmd_name\n"
11971
12017
"strings for all the commands found so far. This set is safe to mutate\n"
11973
12019
"set of command names."
11974
12020
msgstr ""
11975
12021
11976
#: en/help_topics/hooks.txt:212
12022
#: en/help_topics/hooks.txt:201
12023
msgid ""
12024
"post_command\n"
12025
"~~~~~~~~~~~~"
12026
msgstr ""
12027
12028
#: en/help_topics/hooks.txt:204 en/help_topics/hooks.txt:211
12029
msgid "Introduced in: 2.6"
12030
msgstr ""
12031
12032
#: en/help_topics/hooks.txt:206
12033
msgid "Called after executing a command. Called with the command object."
12034
msgstr ""
12035
12036
#: en/help_topics/hooks.txt:208
12037
msgid ""
12038
"pre_command\n"
12039
"~~~~~~~~~~~"
12040
msgstr ""
12041
12042
#: en/help_topics/hooks.txt:213
12043
msgid "Called prior to executing a command. Called with the command object."
12044
msgstr ""
12045
12046
#: en/help_topics/hooks.txt:215
11977
12047
msgid ""
11978
12048
"_ConfigHooks\n"
11979
12049
"------------"
11980
12050
msgstr ""
11981
12051
11982
#: en/help_topics/hooks.txt:215
12052
#: en/help_topics/hooks.txt:218
11983
12053
msgid ""
11984
12054
"get\n"
11985
12055
"~~~"
11986
12056
msgstr ""
11987
12057
11988
#: en/help_topics/hooks.txt:218 en/help_topics/hooks.txt:226
11989
#: en/help_topics/hooks.txt:233 en/help_topics/hooks.txt:241
11990
#: en/help_topics/hooks.txt:248 en/help_topics/hooks.txt:370
11991
#: en/help_topics/hooks.txt:443
12058
#: en/help_topics/hooks.txt:221 en/help_topics/hooks.txt:229
12059
#: en/help_topics/hooks.txt:236 en/help_topics/hooks.txt:244
12060
#: en/help_topics/hooks.txt:251 en/help_topics/hooks.txt:373
12061
#: en/help_topics/hooks.txt:446
11992
12062
msgid "Introduced in: 2.4"
11993
12063
msgstr ""
11994
12064
11995
#: en/help_topics/hooks.txt:220
12065
#: en/help_topics/hooks.txt:223
11996
12066
msgid ""
11997
12067
"Invoked when a config option is read. The signature is (stack, name,\n"
11998
12068
"value)."
11999
12069
msgstr ""
12000
12070
12001
#: en/help_topics/hooks.txt:223
12071
#: en/help_topics/hooks.txt:226
12002
12072
msgid ""
12003
12073
"load\n"
12004
12074
"~~~~"
12005
12075
msgstr ""
12006
12076
12007
#: en/help_topics/hooks.txt:228
12077
#: en/help_topics/hooks.txt:231
12008
12078
msgid "Invoked when a config store is loaded. The signature is (store)."
12009
12079
msgstr ""
12010
12080
12011
#: en/help_topics/hooks.txt:230
12081
#: en/help_topics/hooks.txt:233
12012
12082
msgid ""
12013
12083
"remove\n"
12014
12084
"~~~~~~"
12015
12085
msgstr ""
12016
12086
12017
#: en/help_topics/hooks.txt:235
12087
#: en/help_topics/hooks.txt:238
12018
12088
msgid ""
12019
12089
"Invoked when a config option is removed. The signature is (stack,\n"
12020
12090
"name)."
12021
12091
msgstr ""
12022
12092
12023
#: en/help_topics/hooks.txt:238
12093
#: en/help_topics/hooks.txt:241
12024
12094
msgid ""
12025
12095
"save\n"
12026
12096
"~~~~"
12027
12097
msgstr ""
12028
12098
12029
#: en/help_topics/hooks.txt:243
12099
#: en/help_topics/hooks.txt:246
12030
12100
msgid "Invoked when a config store is saved. The signature is (store)."
12031
12101
msgstr ""
12032
12102
12033
#: en/help_topics/hooks.txt:245
12103
#: en/help_topics/hooks.txt:248
12034
12104
msgid ""
12035
12105
"set\n"
12036
12106
"~~~"
12037
12107
msgstr ""
12038
12108
12039
#: en/help_topics/hooks.txt:250
12109
#: en/help_topics/hooks.txt:253
12040
12110
msgid ""
12041
12111
"Invoked when a config option is set. The signature is (stack, name,\n"
12042
12112
"value)."
12043
12113
msgstr ""
12044
12114
12045
#: en/help_topics/hooks.txt:253
12115
#: en/help_topics/hooks.txt:256
12046
12116
msgid ""
12047
12117
"ControlDirHooks\n"
12048
12118
"---------------"
12049
12119
msgstr ""
12050
12120
12051
#: en/help_topics/hooks.txt:256
12121
#: en/help_topics/hooks.txt:259
12052
12122
msgid ""
12053
12123
"post_repo_init\n"
12054
12124
"~~~~~~~~~~~~~~"
12055
12125
msgstr ""
12056
12126
12057
#: en/help_topics/hooks.txt:261
12127
#: en/help_topics/hooks.txt:264
12058
12128
msgid ""
12059
12129
"Invoked after a repository has been initialized. post_repo_init is\n"
12060
12130
"called with a bzrlib.controldir.RepoInitHookParams."
12061
12131
msgstr ""
12062
12132
12063
#: en/help_topics/hooks.txt:264
12133
#: en/help_topics/hooks.txt:267
12064
12134
msgid ""
12065
12135
"pre_open\n"
12066
12136
"~~~~~~~~"
12067
12137
msgstr ""
12068
12138
12069
#: en/help_topics/hooks.txt:267
12139
#: en/help_topics/hooks.txt:270
12070
12140
msgid "Introduced in: 1.14"
12071
12141
msgstr ""
12072
12142
12073
#: en/help_topics/hooks.txt:269
12143
#: en/help_topics/hooks.txt:272
12074
12144
msgid ""
12075
12145
"Invoked before attempting to open a ControlDir with the transport that\n"
12076
12146
"the open will use."
12077
12147
msgstr ""
12078
12148
12079
#: en/help_topics/hooks.txt:272
12149
#: en/help_topics/hooks.txt:275
12080
12150
msgid ""
12081
12151
"InfoHooks\n"
12082
12152
"---------"
12083
12153
msgstr ""
12084
12154
12085
#: en/help_topics/hooks.txt:275
12155
#: en/help_topics/hooks.txt:278
12086
12156
msgid ""
12087
12157
"repository\n"
12088
12158
"~~~~~~~~~~"
12089
12159
msgstr ""
12090
12160
12091
#: en/help_topics/hooks.txt:278 en/help_topics/hooks.txt:297
12092
#: en/help_topics/hooks.txt:521
12161
#: en/help_topics/hooks.txt:281 en/help_topics/hooks.txt:300
12162
#: en/help_topics/hooks.txt:524
12093
12163
msgid "Introduced in: 1.15"
12094
12164
msgstr ""
12095
12165
12096
#: en/help_topics/hooks.txt:280
12166
#: en/help_topics/hooks.txt:283
12097
12167
msgid ""
12098
12168
"Invoked when displaying the statistics for a repository. repository is\n"
12099
12169
"called with a statistics dictionary as returned by the repository and\n"
12100
12170
"a file-like object to write to."
12101
12171
msgstr ""
12102
12172
12103
#: en/help_topics/hooks.txt:284
12173
#: en/help_topics/hooks.txt:287
12104
12174
msgid ""
12105
12175
"LockHooks\n"
12106
12176
"---------"
12107
12177
msgstr ""
12108
12178
12109
#: en/help_topics/hooks.txt:287
12179
#: en/help_topics/hooks.txt:290
12110
12180
msgid ""
12111
12181
"lock_acquired\n"
12112
12182
"~~~~~~~~~~~~~"
12113
12183
msgstr ""
12114
12184
12115
#: en/help_topics/hooks.txt:292
12185
#: en/help_topics/hooks.txt:295
12116
12186
msgid ""
12117
12187
"Called with a bzrlib.lock.LockResult when a physical lock is acquired."
12118
12188
msgstr ""
12119
12189
12120
#: en/help_topics/hooks.txt:294
12190
#: en/help_topics/hooks.txt:297
12121
12191
msgid ""
12122
12192
"lock_broken\n"
12123
12193
"~~~~~~~~~~~"
12124
12194
msgstr ""
12125
12195
12126
#: en/help_topics/hooks.txt:299
12196
#: en/help_topics/hooks.txt:302
12127
12197
msgid "Called with a bzrlib.lock.LockResult when a physical lock is broken."
12128
12198
msgstr ""
12129
12199
12130
#: en/help_topics/hooks.txt:301
12200
#: en/help_topics/hooks.txt:304
12131
12201
msgid ""
12132
12202
"lock_released\n"
12133
12203
"~~~~~~~~~~~~~"
12134
12204
msgstr ""
12135
12205
12136
#: en/help_topics/hooks.txt:306
12206
#: en/help_topics/hooks.txt:309
12137
12207
msgid ""
12138
12208
"Called with a bzrlib.lock.LockResult when a physical lock is released."
12139
12209
msgstr ""
12140
12210
12141
#: en/help_topics/hooks.txt:308
12211
#: en/help_topics/hooks.txt:311
12142
12212
msgid ""
12143
12213
"MergeHooks\n"
12144
12214
"----------"
12145
12215
msgstr ""
12146
12216
12147
#: en/help_topics/hooks.txt:311
12217
#: en/help_topics/hooks.txt:314
12148
12218
msgid ""
12149
12219
"merge_file_content\n"
12150
12220
"~~~~~~~~~~~~~~~~~~"
12151
12221
msgstr ""
12152
12222
12153
#: en/help_topics/hooks.txt:314
12223
#: en/help_topics/hooks.txt:317
12154
12224
msgid "Introduced in: 2.1"
12155
12225
msgstr ""
12156
12226
12157
#: en/help_topics/hooks.txt:316
12227
#: en/help_topics/hooks.txt:319
12158
12228
msgid ""
12159
12229
"Called with a bzrlib.merge.Merger object to create a per file merge\n"
12160
12230
"object when starting a merge. Should return either None or a subclass\n"
12164
12234
"AbstractPerFileMerger API docs for details on how it is used by merge."
12165
12235
msgstr ""
12166
12236
12167
#: en/help_topics/hooks.txt:323
12237
#: en/help_topics/hooks.txt:326
12168
12238
msgid ""
12169
12239
"post_merge\n"
12170
12240
"~~~~~~~~~~"
12171
12241
msgstr ""
12172
12242
12173
#: en/help_topics/hooks.txt:326 en/help_topics/hooks.txt:334
12174
#: en/help_topics/hooks.txt:384 en/help_topics/hooks.txt:402
12175
#: en/help_topics/hooks.txt:410 en/help_topics/hooks.txt:509
12243
#: en/help_topics/hooks.txt:329 en/help_topics/hooks.txt:337
12244
#: en/help_topics/hooks.txt:387 en/help_topics/hooks.txt:405
12245
#: en/help_topics/hooks.txt:413 en/help_topics/hooks.txt:512
12176
12246
msgid "Introduced in: 2.5"
12177
12247
msgstr ""
12178
12248
12179
#: en/help_topics/hooks.txt:328
12249
#: en/help_topics/hooks.txt:331
12180
12250
msgid ""
12181
12251
"Called after a merge. Receives a Merger object as the single argument.\n"
12182
12252
"The return value is ignored."
12183
12253
msgstr ""
12184
12254
12185
#: en/help_topics/hooks.txt:331
12255
#: en/help_topics/hooks.txt:334
12186
12256
msgid ""
12187
12257
"pre_merge\n"
12188
12258
"~~~~~~~~~"
12189
12259
msgstr ""
12190
12260
12191
#: en/help_topics/hooks.txt:336
12261
#: en/help_topics/hooks.txt:339
12192
12262
msgid ""
12193
12263
"Called before a merge. Receives a Merger object as the single\n"
12194
12264
"argument."
12195
12265
msgstr ""
12196
12266
12197
#: en/help_topics/hooks.txt:339
12267
#: en/help_topics/hooks.txt:342
12198
12268
msgid ""
12199
12269
"MergeDirectiveHooks\n"
12200
12270
"-------------------"
12201
12271
msgstr ""
12202
12272
12203
#: en/help_topics/hooks.txt:342
12273
#: en/help_topics/hooks.txt:345
12204
12274
msgid ""
12205
12275
"merge_request_body\n"
12206
12276
"~~~~~~~~~~~~~~~~~~"
12207
12277
msgstr ""
12208
12278
12209
#: en/help_topics/hooks.txt:345
12279
#: en/help_topics/hooks.txt:348
12210
12280
msgid "Introduced in: 1.15.0"
12211
12281
msgstr ""
12212
12282
12213
#: en/help_topics/hooks.txt:347
12283
#: en/help_topics/hooks.txt:350
12214
12284
msgid ""
12215
12285
"Called with a MergeRequestBodyParams when a body is needed for a merge\n"
12216
12286
"request. Callbacks must return a body. If more than one callback is\n"
12217
12287
"registered, the output of one callback is provided to the next."
12218
12288
msgstr ""
12219
12289
12220
#: en/help_topics/hooks.txt:351
12290
#: en/help_topics/hooks.txt:354
12221
12291
msgid ""
12222
12292
"MessageEditorHooks\n"
12223
12293
"------------------"
12224
12294
msgstr ""
12225
12295
12226
#: en/help_topics/hooks.txt:354
12296
#: en/help_topics/hooks.txt:357
12227
12297
msgid ""
12228
12298
"commit_message_template\n"
12229
12299
"~~~~~~~~~~~~~~~~~~~~~~~"
12230
12300
msgstr ""
12231
12301
12232
#: en/help_topics/hooks.txt:357
12302
#: en/help_topics/hooks.txt:360
12233
12303
msgid "Introduced in: 1.10"
12234
12304
msgstr ""
12235
12305
12236
#: en/help_topics/hooks.txt:359
12306
#: en/help_topics/hooks.txt:362
12237
12307
msgid ""
12238
12308
"Called when a commit message is being generated.\n"
12239
12309
"commit_message_template is called with the bzrlib.commit.Commit object\n"
12244
12314
"second, and so on."
12245
12315
msgstr ""
12246
12316
12247
#: en/help_topics/hooks.txt:367
12317
#: en/help_topics/hooks.txt:370
12248
12318
msgid ""
12249
12319
"set_commit_message\n"
12250
12320
"~~~~~~~~~~~~~~~~~~"
12251
12321
msgstr ""
12252
12322
12253
#: en/help_topics/hooks.txt:372
12323
#: en/help_topics/hooks.txt:375
12254
12324
msgid ""
12255
12325
"Set a fixed commit message. set_commit_message is called with the\n"
12256
12326
"bzrlib.commit.Commit object (so you can also change e.g. revision\n"
12259
12329
"should use the message editor as normal."
12260
12330
msgstr ""
12261
12331
12262
#: en/help_topics/hooks.txt:378
12332
#: en/help_topics/hooks.txt:381
12263
12333
msgid ""
12264
12334
"MutableTreeHooks\n"
12265
12335
"----------------"
12266
12336
msgstr ""
12267
12337
12268
#: en/help_topics/hooks.txt:381
12338
#: en/help_topics/hooks.txt:384
12269
12339
msgid ""
12270
12340
"post_build_tree\n"
12271
12341
"~~~~~~~~~~~~~~~"
12272
12342
msgstr ""
12273
12343
12274
#: en/help_topics/hooks.txt:386
12344
#: en/help_topics/hooks.txt:389
12275
12345
msgid ""
12276
12346
"Called after a completely new tree is built. The hook is called with\n"
12277
12347
"the tree as its only argument."
12278
12348
msgstr ""
12279
12349
12280
#: en/help_topics/hooks.txt:392
12350
#: en/help_topics/hooks.txt:395
12281
12351
msgid "Introduced in: 2.0"
12282
12352
msgstr ""
12283
12353
12284
#: en/help_topics/hooks.txt:394
12354
#: en/help_topics/hooks.txt:397
12285
12355
msgid ""
12286
12356
"Called after a commit is performed on a tree. The hook is called with\n"
12287
12357
"a bzrlib.mutabletree.PostCommitHookParams object. The mutable tree the\n"
12289
12359
"that object."
12290
12360
msgstr ""
12291
12361
12292
#: en/help_topics/hooks.txt:399
12362
#: en/help_topics/hooks.txt:402
12293
12363
msgid ""
12294
12364
"post_transform\n"
12295
12365
"~~~~~~~~~~~~~~"
12296
12366
msgstr ""
12297
12367
12298
#: en/help_topics/hooks.txt:404
12368
#: en/help_topics/hooks.txt:407
12299
12369
msgid ""
12300
12370
"Called after a tree transform has been performed on a tree. The hook\n"
12301
12371
"is called with the tree that is being transformed and the transform."
12302
12372
msgstr ""
12303
12373
12304
#: en/help_topics/hooks.txt:407
12374
#: en/help_topics/hooks.txt:410
12305
12375
msgid ""
12306
12376
"pre_transform\n"
12307
12377
"~~~~~~~~~~~~~"
12308
12378
msgstr ""
12309
12379
12310
#: en/help_topics/hooks.txt:412
12380
#: en/help_topics/hooks.txt:415
12311
12381
msgid ""
12312
12382
"Called before a tree transform on this tree. The hook is called with\n"
12313
12383
"the tree that is being transformed and the transform."
12314
12384
msgstr ""
12315
12385
12316
#: en/help_topics/hooks.txt:415
12386
#: en/help_topics/hooks.txt:418
12317
12387
msgid ""
12318
12388
"start_commit\n"
12319
12389
"~~~~~~~~~~~~"
12320
12390
msgstr ""
12321
12391
12322
#: en/help_topics/hooks.txt:420
12392
#: en/help_topics/hooks.txt:423
12323
12393
msgid ""
12324
12394
"Called before a commit is performed on a tree. The start commit hook\n"
12325
12395
"is able to change the tree before the commit takes place. start_commit\n"
12327
12397
"being performed on."
12328
12398
msgstr ""
12329
12399
12330
#: en/help_topics/hooks.txt:425
12400
#: en/help_topics/hooks.txt:428
12331
12401
msgid ""
12332
12402
"SmartClientHooks\n"
12333
12403
"----------------"
12334
12404
msgstr ""
12335
12405
12336
#: en/help_topics/hooks.txt:428
12406
#: en/help_topics/hooks.txt:431
12337
12407
msgid ""
12338
12408
"call\n"
12339
12409
"~~~~"
12340
12410
msgstr ""
12341
12411
12342
#: en/help_topics/hooks.txt:431
12412
#: en/help_topics/hooks.txt:434
12343
12413
msgid "Introduced in: unknown"
12344
12414
msgstr ""
12345
12415
12346
#: en/help_topics/hooks.txt:433
12416
#: en/help_topics/hooks.txt:436
12347
12417
msgid ""
12348
12418
"Called when the smart client is submitting a request to the smart\n"
12349
12419
"server. Called with a bzrlib.smart.client.CallHookParams object.\n"
12350
12420
"Streaming request bodies, and responses, are not accessible."
12351
12421
msgstr ""
12352
12422
12353
#: en/help_topics/hooks.txt:437
12423
#: en/help_topics/hooks.txt:440
12354
12424
msgid ""
12355
12425
"SmartServerHooks\n"
12356
12426
"----------------"
12357
12427
msgstr ""
12358
12428
12359
#: en/help_topics/hooks.txt:440
12429
#: en/help_topics/hooks.txt:443
12360
12430
msgid ""
12361
12431
"server_exception\n"
12362
12432
"~~~~~~~~~~~~~~~~"
12363
12433
msgstr ""
12364
12434
12365
#: en/help_topics/hooks.txt:445
12435
#: en/help_topics/hooks.txt:448
12366
12436
msgid ""
12367
12437
"Called by the bzr server when an exception occurs. server_exception is\n"
12368
12438
"called with the sys.exc_info() tuple return true for the hook if the\n"
12370
12440
"normally."
12371
12441
msgstr ""
12372
12442
12373
#: en/help_topics/hooks.txt:450
12443
#: en/help_topics/hooks.txt:453
12374
12444
msgid ""
12375
12445
"server_started\n"
12376
12446
"~~~~~~~~~~~~~~"
12377
12447
msgstr ""
12378
12448
12379
#: en/help_topics/hooks.txt:453 en/help_topics/hooks.txt:472
12449
#: en/help_topics/hooks.txt:456 en/help_topics/hooks.txt:475
12380
12450
msgid "Introduced in: 0.16"
12381
12451
msgstr ""
12382
12452
12383
#: en/help_topics/hooks.txt:455
12453
#: en/help_topics/hooks.txt:458
12384
12454
msgid ""
12385
12455
"Called by the bzr server when it starts serving a directory.\n"
12386
12456
"server_started is called with (backing urls, public url), where\n"
12389
12459
"served."
12390
12460
msgstr ""
12391
12461
12392
#: en/help_topics/hooks.txt:461
12462
#: en/help_topics/hooks.txt:464
12393
12463
msgid ""
12394
12464
"server_started_ex\n"
12395
12465
"~~~~~~~~~~~~~~~~~"
12396
12466
msgstr ""
12397
12467
12398
#: en/help_topics/hooks.txt:466
12468
#: en/help_topics/hooks.txt:469
12399
12469
msgid ""
12400
12470
"Called by the bzr server when it starts serving a directory.\n"
12401
12471
"server_started is called with (backing_urls, server_obj)."
12402
12472
msgstr ""
12403
12473
12404
#: en/help_topics/hooks.txt:469
12474
#: en/help_topics/hooks.txt:472
12405
12475
msgid ""
12406
12476
"server_stopped\n"
12407
12477
"~~~~~~~~~~~~~~"
12408
12478
msgstr ""
12409
12479
12410
#: en/help_topics/hooks.txt:474
12480
#: en/help_topics/hooks.txt:477
12411
12481
msgid ""
12412
12482
"Called by the bzr server when it stops serving a directory.\n"
12413
12483
"server_stopped is called with the same parameters as the\n"
12414
12484
"server_started hook: (backing_urls, public_url)."
12415
12485
msgstr ""
12416
12486
12417
#: en/help_topics/hooks.txt:478
12487
#: en/help_topics/hooks.txt:481
12418
12488
msgid ""
12419
12489
"StatusHooks\n"
12420
12490
"-----------"
12421
12491
msgstr ""
12422
12492
12423
#: en/help_topics/hooks.txt:481
12493
#: en/help_topics/hooks.txt:484
12424
12494
msgid ""
12425
12495
"post_status\n"
12426
12496
"~~~~~~~~~~~"
12427
12497
msgstr ""
12428
12498
12429
#: en/help_topics/hooks.txt:484 en/help_topics/hooks.txt:495
12499
#: en/help_topics/hooks.txt:487 en/help_topics/hooks.txt:498
12430
12500
msgid "Introduced in: 2.3"
12431
12501
msgstr ""
12432
12502
12433
#: en/help_topics/hooks.txt:486
12503
#: en/help_topics/hooks.txt:489
12434
12504
msgid ""
12435
12505
"Called with argument StatusHookParams after Bazaar has displayed the\n"
12436
12506
"status. StatusHookParams has the attributes (old_tree, new_tree,\n"
12439
12509
"status command. to_file is the output stream for writing."
12440
12510
msgstr ""
12441
12511
12442
#: en/help_topics/hooks.txt:492
12512
#: en/help_topics/hooks.txt:495
12443
12513
msgid ""
12444
12514
"pre_status\n"
12445
12515
"~~~~~~~~~~"
12446
12516
msgstr ""
12447
12517
12448
#: en/help_topics/hooks.txt:497
12518
#: en/help_topics/hooks.txt:500
12449
12519
msgid ""
12450
12520
"Called with argument StatusHookParams before Bazaar displays the\n"
12451
12521
"status. StatusHookParams has the attributes (old_tree, new_tree,\n"
12454
12524
"status command. to_file is the output stream for writing."
12455
12525
msgstr ""
12456
12526
12457
#: en/help_topics/hooks.txt:503
12527
#: en/help_topics/hooks.txt:506
12458
12528
msgid ""
12459
12529
"TransportHooks\n"
12460
12530
"--------------"
12461
12531
msgstr ""
12462
12532
12463
#: en/help_topics/hooks.txt:506
12533
#: en/help_topics/hooks.txt:509
12464
12534
msgid ""
12465
12535
"post_connect\n"
12466
12536
"~~~~~~~~~~~~"
12467
12537
msgstr ""
12468
12538
12469
#: en/help_topics/hooks.txt:511
12539
#: en/help_topics/hooks.txt:514
12470
12540
msgid ""
12471
12541
"Called after a new connection is established or a reconnect occurs.\n"
12472
12542
"The sole argument passed is either the connected transport or smart\n"
12473
12543
"medium instance."
12474
12544
msgstr ""
12475
12545
12476
#: en/help_topics/hooks.txt:515
12546
#: en/help_topics/hooks.txt:518
12477
12547
msgid ""
12478
12548
"RioVersionInfoBuilderHooks\n"
12479
12549
"--------------------------"
12480
12550
msgstr ""
12481
12551
12482
#: en/help_topics/hooks.txt:518
12552
#: en/help_topics/hooks.txt:521
12483
12553
msgid ""
12484
12554
"revision\n"
12485
12555
"~~~~~~~~"
12486
12556
msgstr ""
12487
12557
12488
#: en/help_topics/hooks.txt:523
12558
#: en/help_topics/hooks.txt:526
12489
12559
msgid ""
12490
12560
"Invoked when adding information about a revision to the RIO stanza\n"
12491
12561
"that is printed. revision is called with a revision object and a RIO\n"
Loggerhead is a web-based interface for Breezy
Version: 2.0.1