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