« back to all changes in this revision
Viewing changes to po/de.po
- browse files at revision 6475
- compare with another revision
- compare with revision 1185.65.19
- download diff
- download tarball
- view history from revision 6475
- Committer: Patch Queue Manager
- Date: 2012-02-24 13:19:39 UTC
- mfrom: (6474.1.1 trunk)
- Revision ID: pqm@pqm.ubuntu.com-20120224131939-1xmcon49f1wzfzyz
(vila) Merge 2.5 branch after 2.5.0 freeze and 2.5.1 opening (Vincent
Ladeuil)
Ladeuil)
- files added:
- po/ar.po
- files modified:
- bzrlib/doc_generate/builders/texinfo.py
added
removed
po/de.po
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-01-16 15:18+0100\n"
10
"POT-Creation-Date: 2012-02-02 17:39+0100\n"
11
11
"PO-Revision-Date: 2012-01-16 16:40+0000\n"
12
12
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
13
13
"Language-Team: German <de@li.org>\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-01-17 05:16+0000\n"
19
"X-Generator: Launchpad (build 14676)\n"
18
"X-Launchpad-Export-Date: 2012-02-04 06:19+0000\n"
19
"X-Generator: Launchpad (build 14738)\n"
20
20
21
21
#: bzrlib/add.py:95
22
22
msgid "skipping {0} (larger than {1} of {2} bytes)"
26
26
msgid "Unstacking"
27
27
msgstr ""
28
28
29
#: bzrlib/branch.py:3183
29
#: bzrlib/branch.py:3205
30
30
#, python-format
31
31
msgid "Pushed up to revision %d."
32
msgstr ""
32
msgstr "In Revision %d hochgeladen."
33
33
34
#: bzrlib/branch.py:3185
34
#: bzrlib/branch.py:3207
35
35
#, python-format
36
36
msgid "%d tag updated."
37
37
msgid_plural "%d tags updated."
38
msgstr[0] ""
39
msgstr[1] ""
38
msgstr[0] "%d Schlüsselwort aktualisiert."
39
msgstr[1] "%d Schlüsselwörter aktualisiert."
40
40
41
#: bzrlib/branch.py:3188
41
#: bzrlib/branch.py:3210
42
42
msgid "No new revisions or tags to push."
43
msgstr ""
43
msgstr "Keine neuen Revisionen oder Schlüsselwörter zum Hochladen."
44
44
45
#: bzrlib/branch.py:3190
45
#: bzrlib/branch.py:3212
46
46
msgid "No new revisions to push."
47
msgstr ""
47
msgstr "Keine neuen Revisionen zum Hochladen."
48
48
49
#: bzrlib/branch.py:3210
49
#: bzrlib/branch.py:3232
50
50
msgid "checked branch {0} format {1}"
51
51
msgstr ""
52
52
53
#: bzrlib/branch.py:3213
53
#: bzrlib/branch.py:3235
54
54
#, python-format
55
55
msgid "found error:%s"
56
56
msgstr "Fehler gefunden: %s"
57
57
58
#: bzrlib/builtins.py:121 bzrlib/builtins.py:2923 bzrlib/workingtree.py:315
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 "Ignoriere Dateien außerhalb der Ansicht. Die Ansicht ist %s"
62
62
63
#: bzrlib/builtins.py:130
63
#: bzrlib/builtins.py:218
64
64
#, python-format
65
65
msgid "bzr %s --revision takes exactly one revision identifier"
66
msgstr ""
66
msgstr "bzr %s --revision benötigt genau eine Revisions-Nummer"
67
67
68
#: bzrlib/builtins.py:215
68
#: bzrlib/builtins.py:303
69
69
msgid "Display status summary."
70
70
msgstr "Zeige Status-Zusammenfassung an."
71
71
72
#: bzrlib/builtins.py:217
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
"Zeigt versionierte und unbekannte Dateien an, Gruppiert nach Zustand.\n"
78
78
"Mögliche Zustände:"
79
79
80
#: bzrlib/builtins.py:220
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."
84
84
msgstr "hinzugefügt"
85
85
86
#: bzrlib/builtins.py:223
86
#: bzrlib/builtins.py:311
87
87
msgid ""
88
88
"removed\n"
89
89
" Versioned in the previous revision but removed or deleted\n"
90
90
" in the working copy."
91
91
msgstr "entfernt"
92
92
93
#: bzrlib/builtins.py:227
93
#: bzrlib/builtins.py:315
94
94
msgid ""
95
95
"renamed\n"
96
96
" Path of this file changed from the previous revision;\n"
98
98
" parent directory was renamed."
99
99
msgstr "umbenannt"
100
100
101
#: bzrlib/builtins.py:232
101
#: bzrlib/builtins.py:320
102
102
msgid ""
103
103
"modified\n"
104
104
" Text has changed since the previous revision."
105
105
msgstr "verändert"
106
106
107
#: bzrlib/builtins.py:235
107
#: bzrlib/builtins.py:323
108
108
msgid ""
109
109
"kind changed\n"
110
110
" File kind has been changed (e.g. from file to directory)."
111
111
msgstr ""
112
"Dateiart wurde geändert\n"
113
" Dateiart hat sich geändert (z.B. von Datei zu Verzeichnis)"
112
114
113
#: bzrlib/builtins.py:238
115
#: bzrlib/builtins.py:326
114
116
msgid ""
115
117
"unknown\n"
116
118
" Not versioned and not matching an ignore pattern."
117
119
msgstr ""
118
120
119
#: bzrlib/builtins.py:241
121
#: bzrlib/builtins.py:329
120
122
msgid ""
121
123
"Additionally for directories, symlinks and files with a changed\n"
122
124
"executable bit, Bazaar indicates their type using a trailing\n"
123
125
"character: '/', '@' or '*' respectively. These decorations can be\n"
124
126
"disabled using the '--no-classify' option."
125
127
msgstr ""
128
"Für Verzeichnisse, Symbolische Verweise sowie Dateien\n"
129
"mit veränderter Ausführungsberechtigung zeigt Bazaar\n"
130
"den Typ zusätzlich durch ein angehängtes Zeichen\n"
131
"»/«, »@« oder »*« an. Diese Kennzeichnung kann mit der Option\n"
132
"»--no-classify« unterbunden werden."
126
133
127
#: bzrlib/builtins.py:246
134
#: bzrlib/builtins.py:334
128
135
msgid ""
129
136
"To see ignored files use 'bzr ignored'. For details on the\n"
130
137
"changes to file texts, use 'bzr diff'."
131
138
msgstr ""
132
139
133
#: bzrlib/builtins.py:249
140
#: bzrlib/builtins.py:337
134
141
msgid ""
135
142
"Note that --short or -S gives status flags for each item, similar\n"
136
143
"to Subversion's status command. To get output similar to svn -q,\n"
137
144
"use bzr status -SV."
138
145
msgstr ""
139
146
140
#: bzrlib/builtins.py:253
147
#: bzrlib/builtins.py:341
141
148
msgid ""
142
149
"If no arguments are specified, the status of the entire working\n"
143
150
"directory is shown. Otherwise, only the status of the specified\n"
145
152
"is reported for everything inside that directory."
146
153
msgstr ""
147
154
148
#: bzrlib/builtins.py:258
155
#: bzrlib/builtins.py:346
149
156
msgid ""
150
157
"Before merges are committed, the pending merge tip revisions are\n"
151
158
"shown. To see all pending merge revisions, use the -v option.\n"
153
160
"the no-pending option or specify a file/directory."
154
161
msgstr ""
155
162
156
#: bzrlib/builtins.py:263
163
#: bzrlib/builtins.py:351
157
164
msgid ""
158
165
"To compare the working directory to a specific revision, pass a\n"
159
166
"single revision to the revision argument."
160
167
msgstr ""
161
168
162
#: bzrlib/builtins.py:266
169
#: bzrlib/builtins.py:354
163
170
msgid ""
164
171
"To see which files have changed in a specific revision, or between\n"
165
172
"two revisions, pass a revision range to the revision argument.\n"
166
173
"This will produce the same results as calling 'bzr diff --summarize'."
167
174
msgstr ""
168
175
169
#: bzrlib/builtins.py:275
176
#: bzrlib/builtins.py:363
170
177
msgid "Use short status indicators."
171
178
msgstr ""
172
179
173
#: bzrlib/builtins.py:277
180
#: bzrlib/builtins.py:365
174
181
msgid "Only show versioned files."
175
182
msgstr ""
176
183
177
#: bzrlib/builtins.py:279
184
#: bzrlib/builtins.py:367
178
185
msgid "Don't show pending merges."
179
186
msgstr ""
180
187
181
#: bzrlib/builtins.py:282
188
#: bzrlib/builtins.py:370
182
189
msgid "Do not mark object type using indicator."
183
190
msgstr ""
184
191
185
#: bzrlib/builtins.py:297
192
#: bzrlib/builtins.py:385
186
193
msgid "bzr status --revision takes exactly one or two revision specifiers"
187
194
msgstr ""
188
195
189
#: bzrlib/builtins.py:341 bzrlib/builtins.py:5090
196
#: bzrlib/builtins.py:429 bzrlib/builtins.py:5183
190
197
msgid "You can only supply one of revision_id or --revision"
191
198
msgstr ""
192
199
193
#: bzrlib/builtins.py:344 bzrlib/builtins.py:5092
200
#: bzrlib/builtins.py:432 bzrlib/builtins.py:5185
194
201
msgid "You must supply either --revision or a revision_id"
195
202
msgstr ""
196
203
197
#: bzrlib/builtins.py:351
204
#: bzrlib/builtins.py:439
198
205
#, python-format
199
206
msgid "Repository %r does not support access to raw revision texts"
200
207
msgstr ""
201
208
202
#: bzrlib/builtins.py:362
209
#: bzrlib/builtins.py:450
203
210
msgid "The repository {0} contains no revision {1}."
204
211
msgstr ""
205
212
206
#: bzrlib/builtins.py:369
213
#: bzrlib/builtins.py:457
207
214
msgid "You cannot specify a NULL revision."
208
215
msgstr ""
209
216
210
#: bzrlib/builtins.py:461
217
#: bzrlib/builtins.py:549
211
218
msgid "Remove the working tree from a given branch/checkout."
212
219
msgstr ""
213
220
214
#: bzrlib/builtins.py:463
221
#: bzrlib/builtins.py:551
215
222
msgid ""
216
223
"Since a lightweight checkout is little more than a working tree\n"
217
224
"this will refuse to run against one."
218
225
msgstr ""
219
226
220
#: bzrlib/builtins.py:466
227
#: bzrlib/builtins.py:554
221
228
msgid "To re-create the working tree, use \"bzr checkout\"."
222
229
msgstr ""
223
230
224
#: bzrlib/builtins.py:472
231
#: bzrlib/builtins.py:560
225
232
msgid ""
226
233
"Remove the working tree even if it has uncommitted or shelved changes."
227
234
msgstr ""
228
235
229
#: bzrlib/builtins.py:486
236
#: bzrlib/builtins.py:574
230
237
msgid "No working tree to remove"
231
238
msgstr ""
232
239
233
#: bzrlib/builtins.py:488
240
#: bzrlib/builtins.py:576
234
241
msgid "You cannot remove the working tree of a remote path"
235
242
msgstr ""
236
243
237
#: bzrlib/builtins.py:497
244
#: bzrlib/builtins.py:585
238
245
msgid "You cannot remove the working tree from a lightweight checkout"
239
246
msgstr ""
240
247
241
#: bzrlib/builtins.py:537
248
#: bzrlib/builtins.py:625
242
249
msgid ""
243
250
"The tree does not appear to be corrupt. You probably want \"bzr revert\" "
244
251
"instead. Use \"--force\" if you are sure you want to reset the working tree."
245
252
msgstr ""
246
253
247
#: bzrlib/builtins.py:548
254
#: bzrlib/builtins.py:636
248
255
msgid ""
249
256
", the header appears corrupt, try passing -r -1 to set the state to the last "
250
257
"commit"
251
258
msgstr ""
252
259
253
#: bzrlib/builtins.py:552
260
#: bzrlib/builtins.py:640
254
261
msgid "failed to reset the tree state{0}"
255
262
msgstr ""
256
263
257
#: bzrlib/builtins.py:556
264
#: bzrlib/builtins.py:644
258
265
msgid "Show current revision number."
259
266
msgstr ""
260
267
261
#: bzrlib/builtins.py:558
268
#: bzrlib/builtins.py:646
262
269
msgid "This is equal to the number of revisions on this branch."
263
270
msgstr ""
264
271
265
#: bzrlib/builtins.py:571
272
#: bzrlib/builtins.py:659
266
273
msgid "--tree and --revision can not be used together"
267
274
msgstr ""
268
275
269
#: bzrlib/builtins.py:588 bzrlib/builtins.py:5874
276
#: bzrlib/builtins.py:676 bzrlib/builtins.py:5967
270
277
msgid "Tags can only be placed on a single revision, not on a range"
271
278
msgstr ""
272
279
273
#: bzrlib/builtins.py:612
280
#: bzrlib/builtins.py:700
274
281
msgid "Show revno of working tree."
275
282
msgstr ""
276
283
277
#: bzrlib/builtins.py:660
284
#: bzrlib/builtins.py:748
278
285
msgid "Add specified files or directories."
279
286
msgstr ""
280
287
281
#: bzrlib/builtins.py:662
288
#: bzrlib/builtins.py:750
282
289
msgid ""
283
290
"In non-recursive mode, all the named items are added, regardless\n"
284
291
"of whether they were previously ignored. A warning is given if\n"
285
292
"any of the named files are already versioned."
286
293
msgstr ""
287
294
288
#: bzrlib/builtins.py:666
295
#: bzrlib/builtins.py:754
289
296
msgid ""
290
297
"In recursive mode (the default), files are treated the same way\n"
291
298
"but the behaviour for directories is different. Directories that\n"
296
303
"directories. If no names are given '.' is assumed."
297
304
msgstr ""
298
305
299
#: bzrlib/builtins.py:674
306
#: bzrlib/builtins.py:762
300
307
msgid ""
301
308
"A warning will be printed when nested trees are encountered,\n"
302
309
"unless they are explicitly ignored."
303
310
msgstr ""
304
311
305
#: bzrlib/builtins.py:677
312
#: bzrlib/builtins.py:765
306
313
msgid ""
307
314
"Therefore simply saying 'bzr add' will version all files that\n"
308
315
"are currently unknown."
309
316
msgstr ""
310
317
311
#: bzrlib/builtins.py:680
318
#: bzrlib/builtins.py:768
312
319
msgid ""
313
320
"Adding a file whose parent directory is not versioned will\n"
314
321
"implicitly add the parent, and so on up to the root. This means\n"
316
323
"get added when you add a file in the directory."
317
324
msgstr ""
318
325
319
#: bzrlib/builtins.py:685
326
#: bzrlib/builtins.py:773
320
327
msgid ""
321
328
"--dry-run will show which files would be added, but not actually\n"
322
329
"add them."
323
330
msgstr ""
324
331
325
#: bzrlib/builtins.py:688
332
#: bzrlib/builtins.py:776
326
333
msgid ""
327
334
"--file-ids-from will try to use the file ids from the supplied path.\n"
328
335
"It looks up ids trying to find a matching parent directory with the\n"
333
340
"into a subdirectory of this one."
334
341
msgstr ""
335
342
336
#: bzrlib/builtins.py:696
343
#: bzrlib/builtins.py:784
337
344
msgid ""
338
345
"Any files matching patterns in the ignore list will not be added\n"
339
346
"unless they are explicitly mentioned."
340
347
msgstr ""
341
348
342
#: bzrlib/builtins.py:699
349
#: bzrlib/builtins.py:787
343
350
msgid ""
344
351
"In recursive mode, files larger than the configuration option \n"
345
352
"add.maximum_file_size will be skipped. Named items are never skipped due\n"
346
353
"to file size."
347
354
msgstr ""
348
355
349
#: bzrlib/builtins.py:706
356
#: bzrlib/builtins.py:794
350
357
msgid "Don't recursively add the contents of directories."
351
358
msgstr ""
352
359
353
#: bzrlib/builtins.py:712
360
#: bzrlib/builtins.py:800
354
361
msgid "Lookup file ids from this tree."
355
362
msgstr ""
356
363
357
#: bzrlib/builtins.py:748
364
#: bzrlib/builtins.py:836
358
365
msgid "ignored {0} matching \"{1}\"\n"
359
366
msgstr ""
360
367
361
#: bzrlib/builtins.py:753
368
#: bzrlib/builtins.py:841
362
369
msgid "Create a new versioned directory."
363
370
msgstr ""
364
371
365
#: bzrlib/builtins.py:755
372
#: bzrlib/builtins.py:843
366
373
msgid "This is equivalent to creating the directory and then adding it."
367
374
msgstr ""
368
375
369
#: bzrlib/builtins.py:762
376
#: bzrlib/builtins.py:850
370
377
msgid "No error if existing, make parent directories as needed."
371
378
msgstr ""
372
379
373
#: bzrlib/builtins.py:796
380
#: bzrlib/builtins.py:884
374
381
#, python-format
375
382
msgid "added %s\n"
376
383
msgstr ""
377
384
378
#: bzrlib/builtins.py:838
385
#: bzrlib/builtins.py:926
379
386
#, python-format
380
387
msgid "invalid kind %r specified"
381
388
msgstr ""
382
389
383
#: bzrlib/builtins.py:875
390
#: bzrlib/builtins.py:963
384
391
msgid "Move or rename a file."
385
392
msgstr ""
386
393
387
#: bzrlib/builtins.py:877
394
#: bzrlib/builtins.py:965
388
395
msgid " bzr mv SOURCE... DESTINATION"
389
396
msgstr ""
390
397
391
#: bzrlib/builtins.py:879
398
#: bzrlib/builtins.py:967
392
399
msgid ""
393
400
"If the last argument is a versioned directory, all the other names\n"
394
401
"are moved into it. Otherwise, there must be exactly two arguments\n"
395
402
"and the file is changed to a new name."
396
403
msgstr ""
397
404
398
#: bzrlib/builtins.py:883
405
#: bzrlib/builtins.py:971
399
406
msgid ""
400
407
"If OLDNAME does not exist on the filesystem but is versioned and\n"
401
408
"NEWNAME does exist on the filesystem but is not versioned, mv\n"
404
411
"The same is valid when moving many SOURCE files to a DESTINATION."
405
412
msgstr ""
406
413
407
#: bzrlib/builtins.py:889
414
#: bzrlib/builtins.py:977
408
415
msgid "Files cannot be moved between branches."
409
416
msgstr ""
410
417
411
#: bzrlib/builtins.py:896
418
#: bzrlib/builtins.py:984
412
419
msgid ""
413
420
"Move only the bzr identifier of the file, because the file has already been "
414
421
"moved."
415
422
msgstr ""
416
423
417
#: bzrlib/builtins.py:898
424
#: bzrlib/builtins.py:986
418
425
msgid "Automatically guess renames."
419
426
msgstr ""
420
427
421
#: bzrlib/builtins.py:899
428
#: bzrlib/builtins.py:987
422
429
msgid "Avoid making changes when guessing renames."
423
430
msgstr ""
424
431
425
#: bzrlib/builtins.py:908
432
#: bzrlib/builtins.py:996
426
433
msgid "--dry-run requires --auto."
427
434
msgstr ""
428
435
429
#: bzrlib/builtins.py:912
436
#: bzrlib/builtins.py:1000
430
437
msgid "missing file argument"
431
438
msgstr ""
432
439
433
#: bzrlib/builtins.py:916
440
#: bzrlib/builtins.py:1004
434
441
msgid "can not move root of branch"
435
442
msgstr ""
436
443
437
#: bzrlib/builtins.py:922
444
#: bzrlib/builtins.py:1010
438
445
msgid "Only one path may be specified to --auto."
439
446
msgstr ""
440
447
441
#: bzrlib/builtins.py:925
448
#: bzrlib/builtins.py:1013
442
449
msgid "--after cannot be specified with --auto."
443
450
msgstr ""
444
451
445
#: bzrlib/builtins.py:962
452
#: bzrlib/builtins.py:1050
446
453
msgid "to mv multiple files the destination must be a versioned directory"
447
454
msgstr ""
448
455
449
#: bzrlib/builtins.py:1014
456
#: bzrlib/builtins.py:1102
450
457
msgid "Turn this branch into a mirror of another branch."
451
458
msgstr ""
452
459
453
#: bzrlib/builtins.py:1016
460
#: bzrlib/builtins.py:1104
454
461
msgid ""
455
462
"By default, this command only works on branches that have not diverged.\n"
456
463
"Branches are considered diverged if the destination branch's most recent \n"
458
465
"parent."
459
466
msgstr ""
460
467
461
#: bzrlib/builtins.py:1021
468
#: bzrlib/builtins.py:1109
462
469
msgid ""
463
470
"If branches have diverged, you can use 'bzr merge' to integrate the changes\n"
464
471
"from one into the other. Once one branch has merged, the other should\n"
465
472
"be able to pull it again."
466
473
msgstr ""
467
474
468
#: bzrlib/builtins.py:1025
475
#: bzrlib/builtins.py:1113
469
476
msgid ""
470
477
"If you want to replace your local changes and just want your branch to\n"
471
478
"match the remote one, use pull --overwrite. This will work even if the two\n"
472
479
"branches have diverged."
473
480
msgstr ""
474
481
475
#: bzrlib/builtins.py:1029
482
#: bzrlib/builtins.py:1117
476
483
msgid ""
477
484
"If there is no default location set, the first pull will set it (use\n"
478
485
"--no-remember to avoid setting it). After that, you can omit the\n"
480
487
"value will only be saved if the remote location can be accessed."
481
488
msgstr ""
482
489
483
#: bzrlib/builtins.py:1034
490
#: bzrlib/builtins.py:1122
484
491
msgid ""
485
492
"The --verbose option will display the revisions pulled using the log_format\n"
486
493
"configuration option. You can use a different format by overriding it with\n"
487
494
"-Olog_format=<other_format>."
488
495
msgstr ""
489
496
490
#: bzrlib/builtins.py:1038
497
#: bzrlib/builtins.py:1126
491
498
msgid ""
492
499
"Note: The location can be specified either in the form of a branch,\n"
493
500
"or in the form of a path to a file containing a merge directive generated\n"
494
501
"with bzr send."
495
502
msgstr ""
496
503
497
#: bzrlib/builtins.py:1046
504
#: bzrlib/builtins.py:1134
498
505
msgid "Show logs of pulled revisions."
499
506
msgstr ""
500
507
501
#: bzrlib/builtins.py:1048
508
#: bzrlib/builtins.py:1136
502
509
msgid ""
503
510
"Branch to pull into, rather than the one containing the working directory."
504
511
msgstr ""
505
512
506
#: bzrlib/builtins.py:1051
513
#: bzrlib/builtins.py:1139
507
514
msgid ""
508
515
"Perform a local pull in a bound branch. Local pulls are not applied to the "
509
516
"master branch."
510
517
msgstr ""
511
518
512
#: bzrlib/builtins.py:1080
519
#: bzrlib/builtins.py:1168
513
520
msgid "Need working tree for --show-base."
514
521
msgstr ""
515
522
516
#: bzrlib/builtins.py:1096
523
#: bzrlib/builtins.py:1184
517
524
msgid "No pull location known or specified."
518
525
msgstr ""
519
526
520
#: bzrlib/builtins.py:1102
527
#: bzrlib/builtins.py:1190
521
528
#, python-format
522
529
msgid "Using saved parent location: %s\n"
523
530
msgstr ""
524
531
525
#: bzrlib/builtins.py:1109 bzrlib/builtins.py:4300
532
#: bzrlib/builtins.py:1197 bzrlib/builtins.py:4393
526
533
msgid "Cannot use -r with merge directives or bundles"
527
534
msgstr ""
528
535
529
#: bzrlib/builtins.py:1150
536
#: bzrlib/builtins.py:1238
530
537
msgid "Update a mirror of this branch."
531
538
msgstr ""
532
539
533
#: bzrlib/builtins.py:1152
540
#: bzrlib/builtins.py:1240
534
541
msgid ""
535
542
"The target branch will not have its working tree populated because this\n"
536
543
"is both expensive, and is not supported on remote file systems."
537
544
msgstr ""
538
545
539
#: bzrlib/builtins.py:1155
546
#: bzrlib/builtins.py:1243
540
547
msgid ""
541
548
"Some smart servers or protocols *may* put the working tree in place in\n"
542
549
"the future."
543
550
msgstr ""
544
551
545
#: bzrlib/builtins.py:1158
552
#: bzrlib/builtins.py:1246
546
553
msgid ""
547
554
"This command only works on branches that have not diverged. Branches are\n"
548
555
"considered diverged if the destination branch's most recent commit is one\n"
549
556
"that has not been merged (directly or indirectly) by the source branch."
550
557
msgstr ""
551
558
552
#: bzrlib/builtins.py:1162
559
#: bzrlib/builtins.py:1250
553
560
msgid ""
554
561
"If branches have diverged, you can use 'bzr push --overwrite' to replace\n"
555
562
"the other branch completely, discarding its unmerged changes."
556
563
msgstr ""
557
564
558
#: bzrlib/builtins.py:1165
565
#: bzrlib/builtins.py:1253
559
566
msgid ""
560
567
"If you want to ensure you have the different changes in the other branch,\n"
561
568
"do a merge (see bzr help merge) from the other branch, and commit that.\n"
562
569
"After that you will be able to do a push without '--overwrite'."
563
570
msgstr ""
564
571
565
#: bzrlib/builtins.py:1169
572
#: bzrlib/builtins.py:1257
566
573
msgid ""
567
574
"If there is no default push location set, the first push will set it (use\n"
568
575
"--no-remember to avoid setting it). After that, you can omit the\n"
570
577
"value will only be saved if the remote location can be accessed."
571
578
msgstr ""
572
579
573
#: bzrlib/builtins.py:1174
580
#: bzrlib/builtins.py:1262
574
581
msgid ""
575
582
"The --verbose option will display the revisions pushed using the log_format\n"
576
583
"configuration option. You can use a different format by overriding it with\n"
577
584
"-Olog_format=<other_format>."
578
585
msgstr ""
579
586
580
#: bzrlib/builtins.py:1185 bzrlib/foreign.py:272
587
#: bzrlib/builtins.py:1273 bzrlib/foreign.py:272
581
588
msgid ""
582
589
"Branch to push from, rather than the one containing the working directory."
583
590
msgstr ""
584
591
585
#: bzrlib/builtins.py:1188
592
#: bzrlib/builtins.py:1276
586
593
msgid ""
587
594
"By default push will fail if the target directory exists, but does not "
588
595
"already have a control directory. This flag will allow push to proceed."
589
596
msgstr ""
590
597
591
#: bzrlib/builtins.py:1193
598
#: bzrlib/builtins.py:1281
592
599
msgid ""
593
600
"Create a stacked branch that references the public location of the parent "
594
601
"branch."
595
602
msgstr ""
596
603
597
#: bzrlib/builtins.py:1196
604
#: bzrlib/builtins.py:1284
598
605
msgid ""
599
606
"Create a stacked branch that refers to another branch for the commit "
600
607
"history. Only the work not present in the referenced branch is included in "
601
608
"the branch created."
602
609
msgstr ""
603
610
604
#: bzrlib/builtins.py:1201 bzrlib/foreign.py:279
611
#: bzrlib/builtins.py:1289 bzrlib/foreign.py:279
605
612
msgid ""
606
613
"Refuse to push if there are uncommitted changes in the working tree, --no-"
607
614
"strict disables the check."
608
615
msgstr ""
609
616
610
#: bzrlib/builtins.py:1204
617
#: bzrlib/builtins.py:1292
611
618
msgid "Don't populate the working tree, even for protocols that support it."
612
619
msgstr ""
613
620
614
#: bzrlib/builtins.py:1248
621
#: bzrlib/builtins.py:1336
615
622
msgid "Could not determine branch to refer to."
616
623
msgstr ""
617
624
618
#: bzrlib/builtins.py:1257
625
#: bzrlib/builtins.py:1345
619
626
#, python-format
620
627
msgid ""
621
628
"No push location known or specified. To push to the parent branch (at %s), "
622
629
"use 'bzr push :parent'."
623
630
msgstr ""
624
631
625
#: bzrlib/builtins.py:1263 bzrlib/foreign.py:306
632
#: bzrlib/builtins.py:1351 bzrlib/foreign.py:306
626
633
msgid "No push location known or specified."
627
634
msgstr ""
628
635
629
#: bzrlib/builtins.py:1267
636
#: bzrlib/builtins.py:1355
630
637
#, python-format
631
638
msgid "Using saved push location: %s"
632
639
msgstr ""
633
640
634
#: bzrlib/builtins.py:1277
641
#: bzrlib/builtins.py:1365
635
642
msgid "Create a new branch that is a copy of an existing branch."
636
643
msgstr ""
637
644
638
#: bzrlib/builtins.py:1279
645
#: bzrlib/builtins.py:1367
639
646
msgid ""
640
647
"If the TO_LOCATION is omitted, the last component of the FROM_LOCATION will\n"
641
648
"be used. In other words, \"branch ../foo/bar\" will attempt to create "
646
653
"create ./foo-bar."
647
654
msgstr ""
648
655
649
#: bzrlib/builtins.py:1286
656
#: bzrlib/builtins.py:1374
650
657
msgid ""
651
658
"To retrieve the branch as of a particular revision, supply the --revision\n"
652
659
"parameter, as in \"branch foo/bar -r 5\"."
653
660
msgstr ""
654
661
655
#: bzrlib/builtins.py:1289
662
#: bzrlib/builtins.py:1377
656
663
msgid "The synonyms 'clone' and 'get' for this command are deprecated."
657
664
msgstr ""
658
665
659
#: bzrlib/builtins.py:1299
666
#: bzrlib/builtins.py:1387
660
667
msgid "Create a branch without a working-tree."
661
668
msgstr ""
662
669
663
#: bzrlib/builtins.py:1301
670
#: bzrlib/builtins.py:1389
664
671
msgid "Switch the checkout in the current directory to the new branch."
665
672
msgstr ""
666
673
667
#: bzrlib/builtins.py:1304
674
#: bzrlib/builtins.py:1392
668
675
msgid ""
669
676
"Create a stacked branch referring to the source branch. The new branch will "
670
677
"depend on the availability of the source branch for all operations."
671
678
msgstr ""
672
679
673
#: bzrlib/builtins.py:1308
680
#: bzrlib/builtins.py:1396
674
681
msgid "Do not use a shared repository, even if available."
675
682
msgstr ""
676
683
677
#: bzrlib/builtins.py:1310
684
#: bzrlib/builtins.py:1398
678
685
msgid ""
679
686
"By default branch will fail if the target directory exists, but does not "
680
687
"already have a control directory. This flag will allow branch to proceed."
681
688
msgstr ""
682
689
683
#: bzrlib/builtins.py:1315
690
#: bzrlib/builtins.py:1403
684
691
msgid "Bind new branch to from location."
685
692
msgstr ""
686
693
687
#: bzrlib/builtins.py:1362
694
#: bzrlib/builtins.py:1450
688
695
#, python-format
689
696
msgid "Target directory \"%s\" already exists."
690
697
msgstr ""
691
698
692
#: bzrlib/builtins.py:1374
699
#: bzrlib/builtins.py:1462
693
700
#, python-format
694
701
msgid "Parent of \"%s\" does not exist."
695
702
msgstr ""
696
703
697
#: bzrlib/builtins.py:1393
704
#: bzrlib/builtins.py:1481
698
705
msgid "The branch {0} has no revision {1}."
699
706
msgstr ""
700
707
701
#: bzrlib/builtins.py:1403 bzrlib/push.py:53
708
#: bzrlib/builtins.py:1496 bzrlib/push.py:53
702
709
#, python-format
703
710
msgid "Created new stacked branch referring to %s."
704
711
msgstr ""
705
712
706
#: bzrlib/builtins.py:1407
713
#: bzrlib/builtins.py:1500
707
714
#, python-format
708
715
msgid "Branched %d revision."
709
716
msgid_plural "Branched %d revisions."
710
717
msgstr[0] ""
711
718
msgstr[1] ""
712
719
713
#: bzrlib/builtins.py:1412
720
#: bzrlib/builtins.py:1505
714
721
#, python-format
715
722
msgid "New branch bound to %s"
716
723
msgstr ""
717
724
718
#: bzrlib/builtins.py:1417 bzrlib/builtins.py:6187
725
#: bzrlib/builtins.py:1510 bzrlib/builtins.py:6256
719
726
#, python-format
720
727
msgid "Switched to branch: %s"
721
728
msgstr ""
722
729
723
#: bzrlib/builtins.py:1422
730
#: bzrlib/builtins.py:1515
724
731
msgid "List the branches available at the current location."
725
732
msgstr ""
726
733
727
#: bzrlib/builtins.py:1424
734
#: bzrlib/builtins.py:1517
728
735
msgid ""
729
736
"This command will print the names of all the branches at the current\n"
730
737
"location."
731
738
msgstr ""
732
739
733
#: bzrlib/builtins.py:1431
740
#: bzrlib/builtins.py:1524
734
741
msgid ""
735
742
"Recursively scan for branches rather than just looking in the specified "
736
743
"location."
737
744
msgstr ""
738
745
739
#: bzrlib/builtins.py:1461
746
#: bzrlib/builtins.py:1554
740
747
msgid "(default)"
741
748
msgstr ""
742
749
743
#: bzrlib/builtins.py:1473
750
#: bzrlib/builtins.py:1566
744
751
msgid "Create a new checkout of an existing branch."
745
752
msgstr ""
746
753
747
#: bzrlib/builtins.py:1475
754
#: bzrlib/builtins.py:1568
748
755
msgid ""
749
756
"If BRANCH_LOCATION is omitted, checkout will reconstitute a working tree "
750
757
"for\n"
754
761
"location using SFTP."
755
762
msgstr ""
756
763
757
#: bzrlib/builtins.py:1480
764
#: bzrlib/builtins.py:1573
758
765
msgid ""
759
766
"If the TO_LOCATION is omitted, the last component of the BRANCH_LOCATION "
760
767
"will\n"
766
773
"create ./foo-bar."
767
774
msgstr ""
768
775
769
#: bzrlib/builtins.py:1487
776
#: bzrlib/builtins.py:1580
770
777
msgid ""
771
778
"To retrieve the branch as of a particular revision, supply the --revision\n"
772
779
"parameter, as in \"checkout foo/bar -r 5\". Note that this will be "
776
783
"code.)"
777
784
msgstr ""
778
785
779
#: bzrlib/builtins.py:1497
786
#: bzrlib/builtins.py:1590
780
787
msgid ""
781
788
"Perform a lightweight checkout. Lightweight checkouts depend on access to "
782
789
"the branch for every operation. Normal checkouts can perform common "
784
791
"commits."
785
792
msgstr ""
786
793
787
#: bzrlib/builtins.py:1504
794
#: bzrlib/builtins.py:1597
788
795
msgid "Get file contents from this tree."
789
796
msgstr ""
790
797
791
#: bzrlib/builtins.py:1506
798
#: bzrlib/builtins.py:1599
792
799
msgid "Hard-link working tree files where possible."
793
800
msgstr ""
794
801
795
#: bzrlib/builtins.py:1547
802
#: bzrlib/builtins.py:1640
796
803
msgid ""
797
804
"Show list of renamed files.\n"
798
805
" "
799
806
msgstr ""
800
807
801
#: bzrlib/builtins.py:1577
808
#: bzrlib/builtins.py:1670
802
809
msgid "Update a working tree to a new revision."
803
810
msgstr ""
804
811
805
#: bzrlib/builtins.py:1579
812
#: bzrlib/builtins.py:1672
806
813
msgid ""
807
814
"This will perform a merge of the destination revision (the tip of the\n"
808
815
"branch, or the specified revision) into the working tree, and then make\n"
809
816
"that revision the basis revision for the working tree. "
810
817
msgstr ""
811
818
812
#: bzrlib/builtins.py:1583
819
#: bzrlib/builtins.py:1676
813
820
msgid ""
814
821
"You can use this to visit an older revision, or to update a working tree\n"
815
822
"that is out of date from its branch."
816
823
msgstr ""
817
824
818
#: bzrlib/builtins.py:1586
825
#: bzrlib/builtins.py:1679
819
826
msgid ""
820
827
"If there are any uncommitted changes in the tree, they will be carried\n"
821
828
"across and remain as uncommitted changes after the update. To discard\n"
823
830
"with the changes brought in by the change in basis revision."
824
831
msgstr ""
825
832
826
#: bzrlib/builtins.py:1591
833
#: bzrlib/builtins.py:1684
827
834
msgid ""
828
835
"If the tree's branch is bound to a master branch, bzr will also update\n"
829
836
"the branch from the master."
830
837
msgstr ""
831
838
832
#: bzrlib/builtins.py:1594
839
#: bzrlib/builtins.py:1687
833
840
msgid ""
834
841
"You cannot update just a single file or directory, because each Bazaar\n"
835
842
"working tree has just a single basis revision. If you want to restore a\n"
839
846
"out the old content of that file to a new location."
840
847
msgstr ""
841
848
842
#: bzrlib/builtins.py:1601
849
#: bzrlib/builtins.py:1694
843
850
msgid ""
844
851
"The 'dir' argument, if given, must be the location of the root of a\n"
845
852
"working tree to update. By default, the working tree that contains the \n"
846
853
"current working directory is used."
847
854
msgstr ""
848
855
849
#: bzrlib/builtins.py:1617
856
#: bzrlib/builtins.py:1710
850
857
msgid "bzr update --revision takes exactly one revision"
851
858
msgstr ""
852
859
853
#: bzrlib/builtins.py:1625
860
#: bzrlib/builtins.py:1718
854
861
msgid "bzr update can only update a whole tree, not a file or subdirectory"
855
862
msgstr ""
856
863
857
#: bzrlib/builtins.py:1656
864
#: bzrlib/builtins.py:1749
858
865
msgid "Tree is up to date at revision {0} of branch {1}"
859
866
msgstr ""
860
867
861
#: bzrlib/builtins.py:1672
868
#: bzrlib/builtins.py:1765
862
869
#, python-format
863
870
msgid ""
864
871
"branch has no revision %s\n"
865
872
"bzr update --revision only works for a revision in the branch history"
866
873
msgstr ""
867
874
868
#: bzrlib/builtins.py:1678
875
#: bzrlib/builtins.py:1771
869
876
msgid "Updated to revision {0} of branch {1}"
870
877
msgstr ""
871
878
872
#: bzrlib/builtins.py:1682
879
#: bzrlib/builtins.py:1775
873
880
msgid ""
874
881
"Your local commits will now show as pending merges with 'bzr status', and "
875
882
"can be committed with 'bzr commit'."
876
883
msgstr ""
877
884
878
#: bzrlib/builtins.py:1691
885
#: bzrlib/builtins.py:1784
879
886
msgid "Show information about a working tree, branch or repository."
880
887
msgstr ""
881
888
882
#: bzrlib/builtins.py:1693
889
#: bzrlib/builtins.py:1786
883
890
msgid ""
884
891
"This command will show all known locations and formats associated to the\n"
885
892
"tree, branch or repository."
886
893
msgstr ""
887
894
888
#: bzrlib/builtins.py:1696
895
#: bzrlib/builtins.py:1789
889
896
msgid ""
890
897
"In verbose mode, statistical information is included with each report.\n"
891
898
"To see extended statistic information, use a verbosity level of 2 or\n"
892
899
"higher by specifying the verbose option multiple times, e.g. -vv."
893
900
msgstr ""
894
901
895
#: bzrlib/builtins.py:1700
902
#: bzrlib/builtins.py:1793
896
903
msgid "Branches and working trees will also report any missing revisions."
897
904
msgstr ""
898
905
899
#: bzrlib/builtins.py:1702 bzrlib/builtins.py:3622 bzrlib/builtins.py:4752
900
#: bzrlib/builtins.py:6389
906
#: bzrlib/builtins.py:1795 bzrlib/builtins.py:3715 bzrlib/builtins.py:4845
907
#: bzrlib/builtins.py:6442
901
908
msgid ":Examples:"
902
909
msgstr ""
903
910
904
#: bzrlib/builtins.py:1704
911
#: bzrlib/builtins.py:1797
905
912
msgid " Display information on the format and related locations:"
906
913
msgstr ""
907
914
908
#: bzrlib/builtins.py:1706
915
#: bzrlib/builtins.py:1799
909
916
msgid " bzr info"
910
917
msgstr ""
911
918
912
#: bzrlib/builtins.py:1708
919
#: bzrlib/builtins.py:1801
913
920
msgid ""
914
921
" Display the above together with extended format information and\n"
915
922
" basic statistics (like the number of files in the working tree and\n"
916
923
" number of revisions in the branch and repository):"
917
924
msgstr ""
918
925
919
#: bzrlib/builtins.py:1712
926
#: bzrlib/builtins.py:1805
920
927
msgid " bzr info -v"
921
928
msgstr ""
922
929
923
#: bzrlib/builtins.py:1714
930
#: bzrlib/builtins.py:1807
924
931
msgid " Display the above together with number of committers to the branch:"
925
932
msgstr ""
926
933
927
#: bzrlib/builtins.py:1716
934
#: bzrlib/builtins.py:1809
928
935
msgid " bzr info -vv"
929
936
msgstr ""
930
937
931
#: bzrlib/builtins.py:1735
938
#: bzrlib/builtins.py:1828
932
939
msgid "Remove files or directories."
933
940
msgstr ""
934
941
935
#: bzrlib/builtins.py:1737
942
#: bzrlib/builtins.py:1830
936
943
msgid ""
937
944
"This makes Bazaar stop tracking changes to the specified files. Bazaar will\n"
938
945
"delete them if they can easily be recovered using revert otherwise they\n"
941
948
"Bazaar but missing in your tree and stop tracking them for you."
942
949
msgstr ""
943
950
944
#: bzrlib/builtins.py:1745
951
#: bzrlib/builtins.py:1838
945
952
msgid "Only remove files that have never been committed."
946
953
msgstr ""
947
954
948
#: bzrlib/builtins.py:1747
955
#: bzrlib/builtins.py:1840
949
956
msgid "The file deletion mode to be used."
950
957
msgstr ""
951
958
952
#: bzrlib/builtins.py:1748
959
#: bzrlib/builtins.py:1841
953
960
msgid "Deletion Strategy"
954
961
msgstr ""
955
962
956
#: bzrlib/builtins.py:1749
963
#: bzrlib/builtins.py:1842
957
964
msgid "Backup changed files (default)."
958
965
msgstr ""
959
966
960
#: bzrlib/builtins.py:1750
967
#: bzrlib/builtins.py:1843
961
968
msgid "Delete from bzr but leave the working copy."
962
969
msgstr ""
963
970
964
#: bzrlib/builtins.py:1751
971
#: bzrlib/builtins.py:1844
965
972
msgid "Don't backup changed files."
966
973
msgstr ""
967
974
968
#: bzrlib/builtins.py:1752
975
#: bzrlib/builtins.py:1845
969
976
msgid ""
970
977
"Delete all the specified files, even if they can not be recovered and even "
971
978
"if they are non-empty directories. (deprecated, use no-backup)"
972
979
msgstr ""
973
980
974
#: bzrlib/builtins.py:1761
981
#: bzrlib/builtins.py:1854
975
982
msgid "(The --force option is deprecated, rather use --no-backup in future.)"
976
983
msgstr ""
977
984
978
#: bzrlib/builtins.py:1778
985
#: bzrlib/builtins.py:1871
979
986
msgid "No matching files."
980
987
msgstr ""
981
988
982
#: bzrlib/builtins.py:1839
989
#: bzrlib/builtins.py:1932
983
990
msgid "Reconcile bzr metadata in a branch."
984
991
msgstr ""
985
992
986
#: bzrlib/builtins.py:1841
993
#: bzrlib/builtins.py:1934
987
994
msgid ""
988
995
"This can correct data mismatches that may have been caused by\n"
989
996
"previous ghost operations or bzr upgrades. You should only\n"
991
998
"advises you to run it."
992
999
msgstr ""
993
1000
994
#: bzrlib/builtins.py:1846
1001
#: bzrlib/builtins.py:1939
995
1002
msgid ""
996
1003
"If a second branch is provided, cross-branch reconciliation is\n"
997
1004
"also attempted, which will check that data like the tree root\n"
999
1006
"correctly in both branches."
1000
1007
msgstr ""
1001
1008
1002
#: bzrlib/builtins.py:1851
1009
#: bzrlib/builtins.py:1944
1003
1010
msgid ""
1004
1011
"At the same time it is run it may recompress data resulting in\n"
1005
1012
"a potential saving in disk space or performance gain."
1006
1013
msgstr ""
1007
1014
1008
#: bzrlib/builtins.py:1854
1015
#: bzrlib/builtins.py:1947
1009
1016
msgid "The branch *MUST* be on a listable system such as local disk or sftp."
1010
1017
msgstr ""
1011
1018
1012
#: bzrlib/builtins.py:1921 bzrlib/builtins.py:2039 bzrlib/builtins.py:3657
1019
#: bzrlib/builtins.py:2014 bzrlib/builtins.py:2132 bzrlib/builtins.py:3750
1013
1020
msgid ""
1014
1021
"Format for the bzr 2.0 series.\n"
1015
1022
"Uses group-compress storage.\n"
1016
1023
"Provides rich roots which are a one-way transition.\n"
1017
1024
msgstr ""
1018
1025
1019
#: bzrlib/builtins.py:1921 bzrlib/builtins.py:2039 bzrlib/builtins.py:3657
1026
#: bzrlib/builtins.py:2014 bzrlib/builtins.py:2132 bzrlib/builtins.py:3750
1020
1027
msgid ""
1021
1028
"Pack-based format used in 1.x series. Introduced in 0.92. Interoperates with "
1022
1029
"bzr repositories before 0.92 but cannot be read by bzr < 0.92. "
1023
1030
msgstr ""
1024
1031
1025
#: bzrlib/builtins.py:1921 bzrlib/builtins.py:2039 bzrlib/builtins.py:3657
1032
#: bzrlib/builtins.py:2014 bzrlib/builtins.py:2132 bzrlib/builtins.py:3750
1026
1033
msgid "The 2a format with experimental support for colocated branches.\n"
1027
1034
msgstr ""
1028
1035
1029
#: bzrlib/builtins.py:1922
1036
#: bzrlib/builtins.py:2015
1030
1037
msgid "Make a directory into a versioned branch."
1031
1038
msgstr ""
1032
1039
1033
#: bzrlib/builtins.py:1924
1040
#: bzrlib/builtins.py:2017
1034
1041
msgid ""
1035
1042
"Use this to create an empty branch, or before importing an\n"
1036
1043
"existing project."
1037
1044
msgstr ""
1038
1045
1039
#: bzrlib/builtins.py:1927
1046
#: bzrlib/builtins.py:2020
1040
1047
msgid ""
1041
1048
"If there is a repository in a parent directory of the location, then\n"
1042
1049
"the history of the branch will be stored in the repository. Otherwise\n"
1044
1051
"in the .bzr directory."
1045
1052
msgstr ""
1046
1053
1047
#: bzrlib/builtins.py:1932
1054
#: bzrlib/builtins.py:2025
1048
1055
msgid ""
1049
1056
"If there is already a branch at the location but it has no working tree,\n"
1050
1057
"the tree can be populated with 'bzr checkout'."
1051
1058
msgstr ""
1052
1059
1053
#: bzrlib/builtins.py:1935
1060
#: bzrlib/builtins.py:2028
1054
1061
msgid "Recipe for importing a tree of files::"
1055
1062
msgstr ""
1056
1063
1057
#: bzrlib/builtins.py:1937
1064
#: bzrlib/builtins.py:2030
1058
1065
msgid ""
1059
1066
" cd ~/project\n"
1060
1067
" bzr init\n"
1063
1070
" bzr commit -m \"imported project\""
1064
1071
msgstr ""
1065
1072
1066
#: bzrlib/builtins.py:1948
1073
#: bzrlib/builtins.py:2041
1067
1074
msgid ""
1068
1075
"Create the path leading up to the branch if it does not already exist."
1069
1076
msgstr ""
1070
1077
1071
#: bzrlib/builtins.py:1951
1078
#: bzrlib/builtins.py:2044
1072
1079
msgid "Specify a format for this branch. See \"help formats\"."
1073
1080
msgstr ""
1074
1081
1075
#: bzrlib/builtins.py:1959
1082
#: bzrlib/builtins.py:2052
1076
1083
msgid ""
1077
1084
"Never change revnos or the existing log. Append revisions to it only."
1078
1085
msgstr ""
1079
1086
1080
#: bzrlib/builtins.py:1962
1087
#: bzrlib/builtins.py:2055
1081
1088
msgid "Create a branch without a working tree."
1082
1089
msgstr ""
1083
1090
1084
#: bzrlib/builtins.py:1982 bzrlib/push.py:110
1091
#: bzrlib/builtins.py:2075 bzrlib/push.py:110
1085
1092
#, python-format
1086
1093
msgid ""
1087
1094
"Parent directory of %s does not exist.\n"
1088
1095
"You may supply --create-prefix to create all leading parent directories."
1089
1096
msgstr ""
1090
1097
1091
#: bzrlib/builtins.py:2016
1098
#: bzrlib/builtins.py:2109
1092
1099
msgid ""
1093
1100
"This branch format cannot be set to append-revisions-only. Try --default."
1094
1101
msgstr ""
1095
1102
1096
#: bzrlib/builtins.py:2027
1103
#: bzrlib/builtins.py:2120
1097
1104
msgid "Created a {0} (format: {1})\n"
1098
1105
msgstr ""
1099
1106
1100
#: bzrlib/builtins.py:2036
1107
#: bzrlib/builtins.py:2129
1101
1108
#, python-format
1102
1109
msgid "Using shared repository: %s\n"
1103
1110
msgstr ""
1104
1111
1105
#: bzrlib/builtins.py:2040
1112
#: bzrlib/builtins.py:2133
1106
1113
msgid "Create a shared repository for branches to share storage space."
1107
1114
msgstr ""
1108
1115
1109
#: bzrlib/builtins.py:2042
1116
#: bzrlib/builtins.py:2135
1110
1117
msgid ""
1111
1118
"New branches created under the repository directory will store their\n"
1112
1119
"revisions in the repository, not in the branch directory. For branches\n"
1114
1121
"speeds up the creation of new branches."
1115
1122
msgstr ""
1116
1123
1117
#: bzrlib/builtins.py:2047
1124
#: bzrlib/builtins.py:2140
1118
1125
msgid ""
1119
1126
"If the --no-trees option is given then the branches in the repository\n"
1120
1127
"will not have working trees by default. They will still exist as \n"
1124
1131
"branches, such as on a server."
1125
1132
msgstr ""
1126
1133
1127
#: bzrlib/builtins.py:2054
1134
#: bzrlib/builtins.py:2147
1128
1135
msgid ""
1129
1136
":Examples:\n"
1130
1137
" Create a shared repository holding just branches::"
1131
1138
msgstr ""
1132
1139
1133
#: bzrlib/builtins.py:2057
1140
#: bzrlib/builtins.py:2150
1134
1141
msgid ""
1135
1142
" bzr init-repo --no-trees repo\n"
1136
1143
" bzr init repo/trunk"
1137
1144
msgstr ""
1138
1145
1139
#: bzrlib/builtins.py:2060
1146
#: bzrlib/builtins.py:2153
1140
1147
msgid " Make a lightweight checkout elsewhere::"
1141
1148
msgstr ""
1142
1149
1143
#: bzrlib/builtins.py:2062
1150
#: bzrlib/builtins.py:2155
1144
1151
msgid ""
1145
1152
" bzr checkout --lightweight repo/trunk trunk-checkout\n"
1146
1153
" cd trunk-checkout\n"
1147
1154
" (add files here)"
1148
1155
msgstr ""
1149
1156
1150
#: bzrlib/builtins.py:2070
1157
#: bzrlib/builtins.py:2163
1151
1158
msgid ""
1152
1159
"Specify a format for this repository. See \"bzr help formats\" for details."
1153
1160
msgstr ""
1154
1161
1155
#: bzrlib/builtins.py:2074
1162
#: bzrlib/builtins.py:2167
1156
1163
msgid "Repository format"
1157
1164
msgstr ""
1158
1165
1159
#: bzrlib/builtins.py:2076
1166
#: bzrlib/builtins.py:2169
1160
1167
msgid "Branches in the repository will default to not having a working tree."
1161
1168
msgstr ""
1162
1169
1163
#: bzrlib/builtins.py:2102
1170
#: bzrlib/builtins.py:2195
1164
1171
msgid "Show differences in the working tree, between revisions or branches."
1165
1172
msgstr ""
1166
1173
1167
#: bzrlib/builtins.py:2104
1174
#: bzrlib/builtins.py:2197
1168
1175
msgid ""
1169
1176
"If no arguments are given, all changes for the current tree are listed.\n"
1170
1177
"If files are given, only the changes in those files are listed.\n"
1174
1181
"given."
1175
1182
msgstr ""
1176
1183
1177
#: bzrlib/builtins.py:2111
1184
#: bzrlib/builtins.py:2204
1178
1185
msgid ""
1179
1186
"\"bzr diff -p1\" is equivalent to \"bzr diff --prefix old/:new/\", and\n"
1180
1187
"produces patches suitable for \"patch -p1\"."
1181
1188
msgstr ""
1182
1189
1183
#: bzrlib/builtins.py:2114
1190
#: bzrlib/builtins.py:2207
1184
1191
msgid ""
1185
1192
"Note that when using the -r argument with a range of revisions, the\n"
1186
1193
"differences are computed between the two specified revisions. That\n"
1190
1197
"in the range."
1191
1198
msgstr ""
1192
1199
1193
#: bzrlib/builtins.py:2121
1200
#: bzrlib/builtins.py:2214
1194
1201
msgid ""
1195
1202
":Exit values:\n"
1196
1203
" 1 - changed\n"
1199
1206
" 0 - no change"
1200
1207
msgstr ""
1201
1208
1202
#: bzrlib/builtins.py:2127
1209
#: bzrlib/builtins.py:2220
1203
1210
msgid ""
1204
1211
":Examples:\n"
1205
1212
" Shows the difference in the working tree versus the last commit::"
1206
1213
msgstr ""
1207
1214
1208
#: bzrlib/builtins.py:2130
1215
#: bzrlib/builtins.py:2223
1209
1216
msgid " bzr diff"
1210
1217
msgstr ""
1211
1218
1212
#: bzrlib/builtins.py:2132
1219
#: bzrlib/builtins.py:2225
1213
1220
msgid " Difference between the working tree and revision 1::"
1214
1221
msgstr ""
1215
1222
1216
#: bzrlib/builtins.py:2134
1223
#: bzrlib/builtins.py:2227
1217
1224
msgid " bzr diff -r1"
1218
1225
msgstr ""
1219
1226
1220
#: bzrlib/builtins.py:2136
1227
#: bzrlib/builtins.py:2229
1221
1228
msgid " Difference between revision 3 and revision 1::"
1222
1229
msgstr ""
1223
1230
1224
#: bzrlib/builtins.py:2138
1231
#: bzrlib/builtins.py:2231
1225
1232
msgid " bzr diff -r1..3"
1226
1233
msgstr ""
1227
1234
1228
#: bzrlib/builtins.py:2140
1235
#: bzrlib/builtins.py:2233
1229
1236
msgid " Difference between revision 3 and revision 1 for branch xxx::"
1230
1237
msgstr ""
1231
1238
1232
#: bzrlib/builtins.py:2142
1239
#: bzrlib/builtins.py:2235
1233
1240
msgid " bzr diff -r1..3 xxx"
1234
1241
msgstr ""
1235
1242
1236
#: bzrlib/builtins.py:2144
1243
#: bzrlib/builtins.py:2237
1237
1244
msgid " The changes introduced by revision 2 (equivalent to -r1..2)::"
1238
1245
msgstr ""
1239
1246
1240
#: bzrlib/builtins.py:2146
1247
#: bzrlib/builtins.py:2239
1241
1248
msgid " bzr diff -c2"
1242
1249
msgstr ""
1243
1250
1244
#: bzrlib/builtins.py:2148
1251
#: bzrlib/builtins.py:2241
1245
1252
msgid ""
1246
1253
" To see the changes introduced by revision X::\n"
1247
1254
" \n"
1248
1255
" bzr diff -cX"
1249
1256
msgstr ""
1250
1257
1251
#: bzrlib/builtins.py:2152
1258
#: bzrlib/builtins.py:2245
1252
1259
msgid ""
1253
1260
" Note that in the case of a merge, the -c option shows the changes\n"
1254
1261
" compared to the left hand parent. To see the changes against\n"
1255
1262
" another parent, use::"
1256
1263
msgstr ""
1257
1264
1258
#: bzrlib/builtins.py:2156
1265
#: bzrlib/builtins.py:2249
1259
1266
msgid " bzr diff -r<chosen_parent>..X"
1260
1267
msgstr ""
1261
1268
1262
#: bzrlib/builtins.py:2158
1269
#: bzrlib/builtins.py:2251
1263
1270
msgid ""
1264
1271
" The changes between the current revision and the previous revision\n"
1265
1272
" (equivalent to -c-1 and -r-2..-1)"
1266
1273
msgstr ""
1267
1274
1268
#: bzrlib/builtins.py:2161
1275
#: bzrlib/builtins.py:2254
1269
1276
msgid " bzr diff -r-2.."
1270
1277
msgstr ""
1271
1278
1272
#: bzrlib/builtins.py:2163
1279
#: bzrlib/builtins.py:2256
1273
1280
msgid " Show just the differences for file NEWS::"
1274
1281
msgstr ""
1275
1282
1276
#: bzrlib/builtins.py:2165
1283
#: bzrlib/builtins.py:2258
1277
1284
msgid " bzr diff NEWS"
1278
1285
msgstr ""
1279
1286
1280
#: bzrlib/builtins.py:2167
1287
#: bzrlib/builtins.py:2260
1281
1288
msgid " Show the differences in working tree xxx for file NEWS::"
1282
1289
msgstr ""
1283
1290
1284
#: bzrlib/builtins.py:2169
1291
#: bzrlib/builtins.py:2262
1285
1292
msgid " bzr diff xxx/NEWS"
1286
1293
msgstr ""
1287
1294
1288
#: bzrlib/builtins.py:2171
1295
#: bzrlib/builtins.py:2264
1289
1296
msgid " Show the differences from branch xxx to this working tree:"
1290
1297
msgstr ""
1291
1298
1292
#: bzrlib/builtins.py:2173
1299
#: bzrlib/builtins.py:2266
1293
1300
msgid " bzr diff --old xxx"
1294
1301
msgstr ""
1295
1302
1296
#: bzrlib/builtins.py:2175
1303
#: bzrlib/builtins.py:2268
1297
1304
msgid " Show the differences between two branches for file NEWS::"
1298
1305
msgstr ""
1299
1306
1300
#: bzrlib/builtins.py:2177
1307
#: bzrlib/builtins.py:2270
1301
1308
msgid " bzr diff --old xxx --new yyy NEWS"
1302
1309
msgstr ""
1303
1310
1304
#: bzrlib/builtins.py:2179
1311
#: bzrlib/builtins.py:2272
1305
1312
msgid " Same as 'bzr diff' but prefix paths with old/ and new/::"
1306
1313
msgstr ""
1307
1314
1308
#: bzrlib/builtins.py:2181
1315
#: bzrlib/builtins.py:2274
1309
1316
msgid ""
1310
1317
" bzr diff --prefix old/:new/\n"
1311
1318
" \n"
1314
1321
" bzr diff --using /usr/bin/diff --diff-options -wu"
1315
1322
msgstr ""
1316
1323
1317
#: bzrlib/builtins.py:2191
1324
#: bzrlib/builtins.py:2284
1318
1325
msgid "Pass these options to the external diff program."
1319
1326
msgstr ""
1320
1327
1321
#: bzrlib/builtins.py:2194
1328
#: bzrlib/builtins.py:2287
1322
1329
msgid ""
1323
1330
"Set prefixes added to old and new filenames, as two values separated by a "
1324
1331
"colon. (eg \"old/:new/\")."
1325
1332
msgstr ""
1326
1333
1327
#: bzrlib/builtins.py:2197
1334
#: bzrlib/builtins.py:2290
1328
1335
msgid "Branch/tree to compare from."
1329
1336
msgstr ""
1330
1337
1331
#: bzrlib/builtins.py:2201
1338
#: bzrlib/builtins.py:2294
1332
1339
msgid "Branch/tree to compare to."
1333
1340
msgstr ""
1334
1341
1335
#: bzrlib/builtins.py:2207
1342
#: bzrlib/builtins.py:2300
1336
1343
msgid "Use this command to compare files."
1337
1344
msgstr ""
1338
1345
1339
#: bzrlib/builtins.py:2212
1346
#: bzrlib/builtins.py:2305
1340
1347
msgid "Diff format to use."
1341
1348
msgstr ""
1342
1349
1343
#: bzrlib/builtins.py:2214
1350
#: bzrlib/builtins.py:2307
1344
1351
msgid "Diff format"
1345
1352
msgstr ""
1346
1353
1347
#: bzrlib/builtins.py:2236
1354
#: bzrlib/builtins.py:2329
1348
1355
msgid "--prefix expects two values separated by a colon (eg \"old/:new/\")"
1349
1356
msgstr ""
1350
1357
1351
#: bzrlib/builtins.py:2240
1358
#: bzrlib/builtins.py:2333
1352
1359
msgid "bzr diff --revision takes exactly one or two revision specifiers"
1353
1360
msgstr ""
1354
1361
1355
#: bzrlib/builtins.py:2245 bzrlib/builtins.py:2643 bzrlib/builtins.py:2656
1356
#: bzrlib/builtins.py:2664 bzrlib/builtins.py:4826
1362
#: bzrlib/builtins.py:2338 bzrlib/builtins.py:2736 bzrlib/builtins.py:2749
1363
#: bzrlib/builtins.py:2757 bzrlib/builtins.py:4919
1357
1364
msgid "{0} and {1} are mutually exclusive"
1358
1365
msgstr ""
1359
1366
1360
#: bzrlib/builtins.py:2265
1367
#: bzrlib/builtins.py:2358
1361
1368
msgid ""
1362
1369
"List files deleted in the working tree.\n"
1363
1370
" "
1364
1371
msgstr ""
1365
1372
1366
#: bzrlib/builtins.py:2343
1373
#: bzrlib/builtins.py:2436
1367
1374
msgid "Show the tree root directory."
1368
1375
msgstr ""
1369
1376
1370
#: bzrlib/builtins.py:2345
1377
#: bzrlib/builtins.py:2438
1371
1378
msgid ""
1372
1379
"The root is the nearest enclosing directory with a .bzr control\n"
1373
1380
"directory."
1374
1381
msgstr ""
1375
1382
1376
#: bzrlib/builtins.py:2360
1383
#: bzrlib/builtins.py:2453
1377
1384
msgid "The limit argument must be an integer."
1378
1385
msgstr ""
1379
1386
1380
#: bzrlib/builtins.py:2368
1387
#: bzrlib/builtins.py:2461
1381
1388
msgid "The levels argument must be an integer."
1382
1389
msgstr ""
1383
1390
1384
#: bzrlib/builtins.py:2373
1391
#: bzrlib/builtins.py:2466
1385
1392
msgid "Show historical log for a branch or subset of a branch."
1386
1393
msgstr ""
1387
1394
1388
#: bzrlib/builtins.py:2375
1395
#: bzrlib/builtins.py:2468
1389
1396
msgid ""
1390
1397
"log is bzr's default tool for exploring the history of a branch.\n"
1391
1398
"The branch to use is taken from the first parameter. If no parameters\n"
1393
1400
"Here are some simple examples::"
1394
1401
msgstr ""
1395
1402
1396
#: bzrlib/builtins.py:2380
1403
#: bzrlib/builtins.py:2473
1397
1404
msgid ""
1398
1405
" bzr log log the current branch\n"
1399
1406
" bzr log foo.py log a file in its branch\n"
1400
1407
" bzr log http://server/branch log a branch on a server"
1401
1408
msgstr ""
1402
1409
1403
#: bzrlib/builtins.py:2384
1410
#: bzrlib/builtins.py:2477
1404
1411
msgid ""
1405
1412
"The filtering, ordering and information shown for each revision can\n"
1406
1413
"be controlled as explained below. By default, all revisions are\n"
1410
1417
"were merged."
1411
1418
msgstr ""
1412
1419
1413
#: bzrlib/builtins.py:2391
1420
#: bzrlib/builtins.py:2484
1414
1421
msgid ":Output control:"
1415
1422
msgstr ""
1416
1423
1417
#: bzrlib/builtins.py:2393
1424
#: bzrlib/builtins.py:2486
1418
1425
msgid ""
1419
1426
" The log format controls how information about each revision is\n"
1420
1427
" displayed. The standard log formats are called ``long``, ``short``\n"
1422
1429
" for more details on log formats."
1423
1430
msgstr ""
1424
1431
1425
#: bzrlib/builtins.py:2398
1432
#: bzrlib/builtins.py:2491
1426
1433
msgid ""
1427
1434
" The following options can be used to control what information is\n"
1428
1435
" displayed::"
1429
1436
msgstr ""
1430
1437
1431
#: bzrlib/builtins.py:2401
1438
#: bzrlib/builtins.py:2494
1432
1439
msgid ""
1433
1440
" -l N display a maximum of N revisions\n"
1434
1441
" -n N display N levels of revisions (0 for all, 1 for collapsed)\n"
1437
1444
" --show-ids display revision-ids (and file-ids), not just revnos"
1438
1445
msgstr ""
1439
1446
1440
#: bzrlib/builtins.py:2407
1447
#: bzrlib/builtins.py:2500
1441
1448
msgid ""
1442
1449
" Note that the default number of levels to display is a function of the\n"
1443
1450
" log format. If the -n option is not used, the standard log formats show\n"
1444
1451
" just the top level (mainline)."
1445
1452
msgstr ""
1446
1453
1447
#: bzrlib/builtins.py:2411
1454
#: bzrlib/builtins.py:2504
1448
1455
msgid ""
1449
1456
" Status summaries are shown using status flags like A, M, etc. To see\n"
1450
1457
" the changes explained using words like ``added`` and ``modified``\n"
1451
1458
" instead, use the -vv option."
1452
1459
msgstr ""
1453
1460
1454
#: bzrlib/builtins.py:2415
1461
#: bzrlib/builtins.py:2508
1455
1462
msgid ":Ordering control:"
1456
1463
msgstr ""
1457
1464
1458
#: bzrlib/builtins.py:2417
1465
#: bzrlib/builtins.py:2510
1459
1466
msgid ""
1460
1467
" To display revisions from oldest to newest, use the --forward option.\n"
1461
1468
" In most cases, using this option will have little impact on the total\n"
1463
1470
" display revisions like --reverse does when it can."
1464
1471
msgstr ""
1465
1472
1466
#: bzrlib/builtins.py:2422
1473
#: bzrlib/builtins.py:2515
1467
1474
msgid ":Revision filtering:"
1468
1475
msgstr ""
1469
1476
1470
#: bzrlib/builtins.py:2424
1477
#: bzrlib/builtins.py:2517
1471
1478
msgid ""
1472
1479
" The -r option can be used to specify what revision or range of revisions\n"
1473
1480
" to filter against. The various forms are shown below::"
1474
1481
msgstr ""
1475
1482
1476
#: bzrlib/builtins.py:2427
1483
#: bzrlib/builtins.py:2520
1477
1484
msgid ""
1478
1485
" -rX display revision X\n"
1479
1486
" -rX.. display revision X and later\n"
1481
1488
" -rX..Y display from X to Y inclusive"
1482
1489
msgstr ""
1483
1490
1484
#: bzrlib/builtins.py:2432
1491
#: bzrlib/builtins.py:2525
1485
1492
msgid ""
1486
1493
" See ``bzr help revisionspec`` for details on how to specify X and Y.\n"
1487
1494
" Some common examples are given below::"
1488
1495
msgstr ""
1489
1496
1490
#: bzrlib/builtins.py:2435
1497
#: bzrlib/builtins.py:2528
1491
1498
msgid ""
1492
1499
" -r-1 show just the tip\n"
1493
1500
" -r-10.. show the last 10 mainline revisions\n"
1497
1504
" -rdate:yesterday.. show changes since yesterday"
1498
1505
msgstr ""
1499
1506
1500
#: bzrlib/builtins.py:2442
1507
#: bzrlib/builtins.py:2535
1501
1508
msgid ""
1502
1509
" When logging a range of revisions using -rX..Y, log starts at\n"
1503
1510
" revision Y and searches back in history through the primary\n"
1507
1514
" a nested merge revision and the log will be truncated accordingly."
1508
1515
msgstr ""
1509
1516
1510
#: bzrlib/builtins.py:2449
1517
#: bzrlib/builtins.py:2542
1511
1518
msgid ":Path filtering:"
1512
1519
msgstr ""
1513
1520
1514
#: bzrlib/builtins.py:2451
1521
#: bzrlib/builtins.py:2544
1515
1522
msgid ""
1516
1523
" If parameters are given and the first one is not a branch, the log\n"
1517
1524
" will be filtered to show only those revisions that changed the\n"
1518
1525
" nominated files or directories."
1519
1526
msgstr ""
1520
1527
1521
#: bzrlib/builtins.py:2455
1528
#: bzrlib/builtins.py:2548
1522
1529
msgid ""
1523
1530
" Filenames are interpreted within their historical context. To log a\n"
1524
1531
" deleted file, specify a revision range so that the file existed at\n"
1525
1532
" the end or start of the range."
1526
1533
msgstr ""
1527
1534
1528
#: bzrlib/builtins.py:2459
1535
#: bzrlib/builtins.py:2552
1529
1536
msgid ""
1530
1537
" Historical context is also important when interpreting pathnames of\n"
1531
1538
" renamed files/directories. Consider the following example:"
1532
1539
msgstr ""
1533
1540
1534
#: bzrlib/builtins.py:2462
1541
#: bzrlib/builtins.py:2555
1535
1542
msgid ""
1536
1543
" * revision 1: add tutorial.txt\n"
1537
1544
" * revision 2: modify tutorial.txt\n"
1538
1545
" * revision 3: rename tutorial.txt to guide.txt; add tutorial.txt"
1539
1546
msgstr ""
1540
1547
1541
#: bzrlib/builtins.py:2466
1548
#: bzrlib/builtins.py:2559
1542
1549
msgid " In this case:"
1543
1550
msgstr ""
1544
1551
1545
#: bzrlib/builtins.py:2468
1552
#: bzrlib/builtins.py:2561
1546
1553
msgid " * ``bzr log guide.txt`` will log the file added in revision 1"
1547
1554
msgstr ""
1548
1555
1549
#: bzrlib/builtins.py:2470
1556
#: bzrlib/builtins.py:2563
1550
1557
msgid ""
1551
1558
" * ``bzr log tutorial.txt`` will log the new file added in revision 3"
1552
1559
msgstr ""
1553
1560
1554
#: bzrlib/builtins.py:2472
1561
#: bzrlib/builtins.py:2565
1555
1562
msgid ""
1556
1563
" * ``bzr log -r2 -p tutorial.txt`` will show the changes made to\n"
1557
1564
" the original file in revision 2."
1558
1565
msgstr ""
1559
1566
1560
#: bzrlib/builtins.py:2475
1567
#: bzrlib/builtins.py:2568
1561
1568
msgid ""
1562
1569
" * ``bzr log -r2 -p guide.txt`` will display an error message as there\n"
1563
1570
" was no file called guide.txt in revision 2."
1564
1571
msgstr ""
1565
1572
1566
#: bzrlib/builtins.py:2478
1573
#: bzrlib/builtins.py:2571
1567
1574
msgid ""
1568
1575
" Renames are always followed by log. By design, there is no need to\n"
1569
1576
" explicitly ask for this (and no way to stop logging a file back\n"
1570
1577
" until it was last renamed)."
1571
1578
msgstr ""
1572
1579
1573
#: bzrlib/builtins.py:2482
1580
#: bzrlib/builtins.py:2575
1574
1581
msgid ":Other filtering:"
1575
1582
msgstr ""
1576
1583
1577
#: bzrlib/builtins.py:2484
1584
#: bzrlib/builtins.py:2577
1578
1585
msgid ""
1579
1586
" The --match option can be used for finding revisions that match a\n"
1580
1587
" regular expression in a commit message, committer, author or bug.\n"
1583
1590
" --match-message can be used to only match a specific field."
1584
1591
msgstr ""
1585
1592
1586
#: bzrlib/builtins.py:2490
1593
#: bzrlib/builtins.py:2583
1587
1594
msgid ":Tips & tricks:"
1588
1595
msgstr ""
1589
1596
1590
#: bzrlib/builtins.py:2492
1597
#: bzrlib/builtins.py:2585
1591
1598
msgid ""
1592
1599
" GUI tools and IDEs are often better at exploring history than command\n"
1593
1600
" line tools: you may prefer qlog or viz from qbzr or bzr-gtk, the\n"
1596
1603
" <http://wiki.bazaar.canonical.com/IDEIntegration>. "
1597
1604
msgstr ""
1598
1605
1599
#: bzrlib/builtins.py:2498
1606
#: bzrlib/builtins.py:2591
1600
1607
msgid ""
1601
1608
" You may find it useful to add the aliases below to ``bazaar.conf``::"
1602
1609
msgstr ""
1603
1610
1604
#: bzrlib/builtins.py:2500
1611
#: bzrlib/builtins.py:2593
1605
1612
msgid ""
1606
1613
" [ALIASES]\n"
1607
1614
" tip = log -r-1\n"
1609
1616
" show = log -v -p"
1610
1617
msgstr ""
1611
1618
1612
#: bzrlib/builtins.py:2505
1619
#: bzrlib/builtins.py:2598
1613
1620
msgid ""
1614
1621
" ``bzr tip`` will then show the latest revision while ``bzr top``\n"
1615
1622
" will show the last 10 mainline revisions. To see the details of a\n"
1616
1623
" particular revision X, ``bzr show -rX``."
1617
1624
msgstr ""
1618
1625
1619
#: bzrlib/builtins.py:2509
1626
#: bzrlib/builtins.py:2602
1620
1627
msgid ""
1621
1628
" If you are interested in looking deeper into a particular merge X,\n"
1622
1629
" use ``bzr log -n0 -rX``."
1623
1630
msgstr ""
1624
1631
1625
#: bzrlib/builtins.py:2512
1632
#: bzrlib/builtins.py:2605
1626
1633
msgid ""
1627
1634
" ``bzr log -v`` on a branch with lots of history is currently\n"
1628
1635
" very slow. A fix for this issue is currently under development.\n"
1630
1637
" be given when using the -v option."
1631
1638
msgstr ""
1632
1639
1633
#: bzrlib/builtins.py:2517
1640
#: bzrlib/builtins.py:2610
1634
1641
msgid ""
1635
1642
" bzr has a generic full-text matching plugin, bzr-search, that can be\n"
1636
1643
" used to find revisions matching user names, commit messages, etc.\n"
1638
1645
" a list of words but not others."
1639
1646
msgstr ""
1640
1647
1641
#: bzrlib/builtins.py:2522
1648
#: bzrlib/builtins.py:2615
1642
1649
msgid ""
1643
1650
" When exploring non-mainline history on large projects with deep\n"
1644
1651
" history, the performance of log can be greatly improved by installing\n"
1646
1653
" trading disk space for faster speed."
1647
1654
msgstr ""
1648
1655
1649
#: bzrlib/builtins.py:2531
1656
#: bzrlib/builtins.py:2624
1650
1657
msgid "Show from oldest to newest."
1651
1658
msgstr ""
1652
1659
1653
#: bzrlib/builtins.py:2534
1660
#: bzrlib/builtins.py:2627
1654
1661
msgid "Show files changed in each revision."
1655
1662
msgstr ""
1656
1663
1657
#: bzrlib/builtins.py:2540
1664
#: bzrlib/builtins.py:2633
1658
1665
msgid "Show just the specified revision. See also \"help revisionspec\"."
1659
1666
msgstr ""
1660
1667
1661
#: bzrlib/builtins.py:2544
1668
#: bzrlib/builtins.py:2637
1662
1669
msgid "What names to list as authors - first, all or committer."
1663
1670
msgstr ""
1664
1671
1665
#: bzrlib/builtins.py:2545
1672
#: bzrlib/builtins.py:2638
1666
1673
msgid "Authors"
1667
1674
msgstr ""
1668
1675
1669
#: bzrlib/builtins.py:2550
1676
#: bzrlib/builtins.py:2643
1670
1677
msgid "Number of levels to display - 0 for all, 1 for flat."
1671
1678
msgstr ""
1672
1679
1673
#: bzrlib/builtins.py:2560
1680
#: bzrlib/builtins.py:2653
1674
1681
msgid "Limit the output to the first N revisions."
1675
1682
msgstr ""
1676
1683
1677
#: bzrlib/builtins.py:2565
1684
#: bzrlib/builtins.py:2658
1678
1685
msgid "Show changes made in each revision as a patch."
1679
1686
msgstr ""
1680
1687
1681
#: bzrlib/builtins.py:2567
1688
#: bzrlib/builtins.py:2660
1682
1689
msgid "Show merged revisions like --levels 0 does."
1683
1690
msgstr ""
1684
1691
1685
#: bzrlib/builtins.py:2571
1692
#: bzrlib/builtins.py:2664
1686
1693
msgid "Do not report commits with more than one parent."
1687
1694
msgstr ""
1688
1695
1689
#: bzrlib/builtins.py:2573
1696
#: bzrlib/builtins.py:2666
1690
1697
msgid ""
1691
1698
"Display only the revisions that are not part of both ancestries (require -"
1692
1699
"rX..Y)."
1693
1700
msgstr ""
1694
1701
1695
#: bzrlib/builtins.py:2577
1702
#: bzrlib/builtins.py:2670
1696
1703
msgid "Show digital signature validity."
1697
1704
msgstr ""
1698
1705
1699
#: bzrlib/builtins.py:2580
1706
#: bzrlib/builtins.py:2673
1700
1707
msgid "Show revisions whose properties match this expression."
1701
1708
msgstr ""
1702
1709
1703
#: bzrlib/builtins.py:2584
1710
#: bzrlib/builtins.py:2677
1704
1711
msgid "Show revisions whose message matches this expression."
1705
1712
msgstr ""
1706
1713
1707
#: bzrlib/builtins.py:2588
1714
#: bzrlib/builtins.py:2681
1708
1715
msgid "Show revisions whose committer matches this expression."
1709
1716
msgstr ""
1710
1717
1711
#: bzrlib/builtins.py:2592
1718
#: bzrlib/builtins.py:2685
1712
1719
msgid "Show revisions whose authors match this expression."
1713
1720
msgstr ""
1714
1721
1715
#: bzrlib/builtins.py:2596
1722
#: bzrlib/builtins.py:2689
1716
1723
msgid "Show revisions whose bugs match this expression."
1717
1724
msgstr ""
1718
1725
1719
#: bzrlib/builtins.py:2650
1726
#: bzrlib/builtins.py:2743
1720
1727
msgid "--exclude-common-ancestry requires -r with two revisions"
1721
1728
msgstr ""
1722
1729
1723
#: bzrlib/builtins.py:2678
1730
#: bzrlib/builtins.py:2771
1724
1731
#, python-format
1725
1732
msgid "Path unknown at end or start of revision range: %s"
1726
1733
msgstr ""
1727
1734
1728
#: bzrlib/builtins.py:2795
1735
#: bzrlib/builtins.py:2888
1729
1736
#, python-format
1730
1737
msgid "bzr %s doesn't accept two revisions in different branches."
1731
1738
msgstr ""
1732
1739
1733
#: bzrlib/builtins.py:2811
1740
#: bzrlib/builtins.py:2904
1734
1741
#, python-format
1735
1742
msgid "bzr %s --revision takes one or two values."
1736
1743
msgstr ""
1737
1744
1738
#: bzrlib/builtins.py:2856
1745
#: bzrlib/builtins.py:2949
1739
1746
msgid ""
1740
1747
"List files in a tree.\n"
1741
1748
" "
1742
1749
msgstr ""
1743
1750
1744
#: bzrlib/builtins.py:2865
1751
#: bzrlib/builtins.py:2958
1745
1752
msgid "Recurse into subdirectories."
1746
1753
msgstr ""
1747
1754
1748
#: bzrlib/builtins.py:2867
1755
#: bzrlib/builtins.py:2960
1749
1756
msgid "Print paths relative to the root of the branch."
1750
1757
msgstr ""
1751
1758
1752
#: bzrlib/builtins.py:2869
1759
#: bzrlib/builtins.py:2962
1753
1760
msgid "Print unknown files."
1754
1761
msgstr ""
1755
1762
1756
#: bzrlib/builtins.py:2870
1763
#: bzrlib/builtins.py:2963
1757
1764
msgid "Print versioned files."
1758
1765
msgstr ""
1759
1766
1760
#: bzrlib/builtins.py:2873
1767
#: bzrlib/builtins.py:2966
1761
1768
msgid "Print ignored files."
1762
1769
msgstr ""
1763
1770
1764
#: bzrlib/builtins.py:2875
1771
#: bzrlib/builtins.py:2968
1765
1772
msgid "List entries of a particular kind: file, directory, symlink."
1766
1773
msgstr ""
1767
1774
1768
#: bzrlib/builtins.py:2888
1775
#: bzrlib/builtins.py:2981
1769
1776
msgid "invalid kind specified"
1770
1777
msgstr ""
1771
1778
1772
#: bzrlib/builtins.py:2891
1779
#: bzrlib/builtins.py:2984
1773
1780
msgid "Cannot set both --verbose and --null"
1774
1781
msgstr ""
1775
1782
1776
#: bzrlib/builtins.py:2900
1783
#: bzrlib/builtins.py:2993
1777
1784
msgid "cannot specify both --from-root and PATH"
1778
1785
msgstr ""
1779
1786
1780
#: bzrlib/builtins.py:2987
1787
#: bzrlib/builtins.py:3080
1781
1788
msgid "Ignore specified files or patterns."
1782
1789
msgstr ""
1783
1790
1784
#: bzrlib/builtins.py:2989
1791
#: bzrlib/builtins.py:3082
1785
1792
msgid "See ``bzr help patterns`` for details on the syntax of patterns."
1786
1793
msgstr ""
1787
1794
1788
#: bzrlib/builtins.py:2991
1795
#: bzrlib/builtins.py:3084
1789
1796
msgid ""
1790
1797
"If a .bzrignore file does not exist, the ignore command\n"
1791
1798
"will create one and add the specified files or patterns to the newly\n"
1794
1801
"the use of the ignore command will require an explicit add command."
1795
1802
msgstr ""
1796
1803
1797
#: bzrlib/builtins.py:2997
1804
#: bzrlib/builtins.py:3090
1798
1805
msgid ""
1799
1806
"To remove patterns from the ignore list, edit the .bzrignore file.\n"
1800
1807
"After adding, editing or deleting that file either indirectly by\n"
1802
1809
"it."
1803
1810
msgstr ""
1804
1811
1805
#: bzrlib/builtins.py:3002
1812
#: bzrlib/builtins.py:3095
1806
1813
msgid ""
1807
1814
"Bazaar also supports a global ignore file ~/.bazaar/ignore. On Windows\n"
1808
1815
"the global ignore file can be found in the application data directory as\n"
1811
1818
"can be edited directly using an editor."
1812
1819
msgstr ""
1813
1820
1814
#: bzrlib/builtins.py:3008
1821
#: bzrlib/builtins.py:3101
1815
1822
msgid ""
1816
1823
"Patterns prefixed with '!' are exceptions to ignore patterns and take\n"
1817
1824
"precedence over regular ignores. Such exceptions are used to specify\n"
1818
1825
"files that should be versioned which would otherwise be ignored."
1819
1826
msgstr ""
1820
1827
1821
#: bzrlib/builtins.py:3012
1828
#: bzrlib/builtins.py:3105
1822
1829
msgid ""
1823
1830
"Patterns prefixed with '!!' act as regular ignore patterns, but have\n"
1824
1831
"precedence over the '!' exception patterns."
1825
1832
msgstr ""
1826
1833
1827
#: bzrlib/builtins.py:3015
1834
#: bzrlib/builtins.py:3108
1828
1835
msgid ""
1829
1836
":Notes: \n"
1830
1837
" \n"
1832
1839
" the shell on Unix."
1833
1840
msgstr ""
1834
1841
1835
#: bzrlib/builtins.py:3020
1842
#: bzrlib/builtins.py:3113
1836
1843
msgid ""
1837
1844
"* Ignore patterns starting with \"#\" act as comments in the ignore file.\n"
1838
1845
" To ignore patterns that begin with that character, use the \"RE:\" prefix."
1839
1846
msgstr ""
1840
1847
1841
#: bzrlib/builtins.py:3023
1848
#: bzrlib/builtins.py:3116
1842
1849
msgid ""
1843
1850
":Examples:\n"
1844
1851
" Ignore the top level Makefile::"
1845
1852
msgstr ""
1846
1853
1847
#: bzrlib/builtins.py:3026
1854
#: bzrlib/builtins.py:3119
1848
1855
msgid " bzr ignore ./Makefile"
1849
1856
msgstr ""
1850
1857
1851
#: bzrlib/builtins.py:3028
1858
#: bzrlib/builtins.py:3121
1852
1859
msgid " Ignore .class files in all directories...::"
1853
1860
msgstr ""
1854
1861
1855
#: bzrlib/builtins.py:3030
1862
#: bzrlib/builtins.py:3123
1856
1863
msgid " bzr ignore \"*.class\""
1857
1864
msgstr ""
1858
1865
1859
#: bzrlib/builtins.py:3032
1866
#: bzrlib/builtins.py:3125
1860
1867
msgid " ...but do not ignore \"special.class\"::"
1861
1868
msgstr ""
1862
1869
1863
#: bzrlib/builtins.py:3034
1870
#: bzrlib/builtins.py:3127
1864
1871
msgid " bzr ignore \"!special.class\""
1865
1872
msgstr ""
1866
1873
1867
#: bzrlib/builtins.py:3036
1874
#: bzrlib/builtins.py:3129
1868
1875
msgid " Ignore files whose name begins with the \"#\" character::"
1869
1876
msgstr ""
1870
1877
1871
#: bzrlib/builtins.py:3038
1878
#: bzrlib/builtins.py:3131
1872
1879
msgid " bzr ignore \"RE:^#\""
1873
1880
msgstr ""
1874
1881
1875
#: bzrlib/builtins.py:3040 bzrlib/builtins.py:3044
1882
#: bzrlib/builtins.py:3133 bzrlib/builtins.py:3137
1876
1883
msgid " Ignore .o files under the lib directory::"
1877
1884
msgstr ""
1878
1885
1879
#: bzrlib/builtins.py:3042
1886
#: bzrlib/builtins.py:3135
1880
1887
msgid " bzr ignore \"lib/**/*.o\""
1881
1888
msgstr ""
1882
1889
1883
#: bzrlib/builtins.py:3046
1890
#: bzrlib/builtins.py:3139
1884
1891
msgid " bzr ignore \"RE:lib/.*\\.o\""
1885
1892
msgstr ""
1886
1893
1887
#: bzrlib/builtins.py:3048
1894
#: bzrlib/builtins.py:3141
1888
1895
msgid " Ignore everything but the \"debian\" toplevel directory::"
1889
1896
msgstr ""
1890
1897
1891
#: bzrlib/builtins.py:3050
1898
#: bzrlib/builtins.py:3143
1892
1899
msgid ""
1893
1900
" bzr ignore \"RE:(?!debian/).*\"\n"
1894
1901
" \n"
1900
1907
" bzr ignore \"!!*~\""
1901
1908
msgstr ""
1902
1909
1903
#: bzrlib/builtins.py:3064
1910
#: bzrlib/builtins.py:3157
1904
1911
msgid "Display the default ignore rules that bzr uses."
1905
1912
msgstr ""
1906
1913
1907
#: bzrlib/builtins.py:3076
1914
#: bzrlib/builtins.py:3169
1908
1915
msgid "ignore requires at least one NAME_PATTERN or --default-rules."
1909
1916
msgstr ""
1910
1917
1911
#: bzrlib/builtins.py:3087
1918
#: bzrlib/builtins.py:3180
1912
1919
#, python-format
1913
1920
msgid "Invalid ignore pattern found. %s"
1914
1921
msgid_plural "Invalid ignore patterns found. %s"
1915
1922
msgstr[0] ""
1916
1923
msgstr[1] ""
1917
1924
1918
#: bzrlib/builtins.py:3096
1925
#: bzrlib/builtins.py:3189
1919
1926
msgid "NAME_PATTERN should not be an absolute path"
1920
1927
msgstr ""
1921
1928
1922
#: bzrlib/builtins.py:3109
1929
#: bzrlib/builtins.py:3202
1923
1930
#, python-format
1924
1931
msgid ""
1925
1932
"Warning: the following files are version controlled and match your ignore "
1929
1936
"them.\n"
1930
1937
msgstr ""
1931
1938
1932
#: bzrlib/builtins.py:3116
1939
#: bzrlib/builtins.py:3209
1933
1940
msgid "List ignored files and the patterns that matched them."
1934
1941
msgstr ""
1935
1942
1936
#: bzrlib/builtins.py:3118
1943
#: bzrlib/builtins.py:3211
1937
1944
msgid ""
1938
1945
"List all the ignored files and the ignore pattern that caused the file to\n"
1939
1946
"be ignored."
1940
1947
msgstr ""
1941
1948
1942
#: bzrlib/builtins.py:3121
1949
#: bzrlib/builtins.py:3214
1943
1950
msgid "Alternatively, to list just the files::"
1944
1951
msgstr ""
1945
1952
1946
#: bzrlib/builtins.py:3123
1953
#: bzrlib/builtins.py:3216
1947
1954
msgid " bzr ls --ignored"
1948
1955
msgstr ""
1949
1956
1950
#: bzrlib/builtins.py:3157
1957
#: bzrlib/builtins.py:3250
1951
1958
#, python-format
1952
1959
msgid "not a valid revision-number: %r"
1953
1960
msgstr ""
1954
1961
1955
#: bzrlib/builtins.py:3164
1962
#: bzrlib/builtins.py:3257
1956
1963
msgid ""
1957
1964
"Export current or past revision to a destination directory or archive."
1958
1965
msgstr ""
1959
1966
1960
#: bzrlib/builtins.py:3166
1967
#: bzrlib/builtins.py:3259
1961
1968
msgid "If no revision is specified this exports the last committed revision."
1962
1969
msgstr ""
1963
1970
1964
#: bzrlib/builtins.py:3168
1971
#: bzrlib/builtins.py:3261
1965
1972
msgid ""
1966
1973
"Format may be an \"exporter\" name, such as tar, tgz, tbz2. If none is\n"
1967
1974
"given, try to find the format with the extension. If no extension\n"
1968
1975
"is found exports to a directory (equivalent to --format=dir)."
1969
1976
msgstr ""
1970
1977
1971
#: bzrlib/builtins.py:3172
1978
#: bzrlib/builtins.py:3265
1972
1979
msgid ""
1973
1980
"If root is supplied, it will be used as the root directory inside\n"
1974
1981
"container formats (tar, zip, etc). If it is not supplied it will default\n"
1975
1982
"to the exported filename. The root option has no effect for 'dir' format."
1976
1983
msgstr ""
1977
1984
1978
#: bzrlib/builtins.py:3176
1985
#: bzrlib/builtins.py:3269
1979
1986
msgid ""
1980
1987
"If branch is omitted then the branch containing the current working\n"
1981
1988
"directory will be used."
1982
1989
msgstr ""
1983
1990
1984
#: bzrlib/builtins.py:3179
1991
#: bzrlib/builtins.py:3272
1985
1992
msgid ""
1986
1993
"Note: Export of tree with non-ASCII filenames to zip is not supported."
1987
1994
msgstr ""
1988
1995
1989
#: bzrlib/builtins.py:3181
1996
#: bzrlib/builtins.py:3274
1990
1997
msgid ""
1991
1998
" ================= =========================\n"
1992
1999
" Supported formats Autodetected by extension\n"
1999
2006
" ================= ========================="
2000
2007
msgstr ""
2001
2008
2002
#: bzrlib/builtins.py:3195
2009
#: bzrlib/builtins.py:3288
2003
2010
msgid "Type of file to export to."
2004
2011
msgstr ""
2005
2012
2006
#: bzrlib/builtins.py:3198
2013
#: bzrlib/builtins.py:3291
2007
2014
msgid "Apply content filters to export the convenient form."
2008
2015
msgstr ""
2009
2016
2010
#: bzrlib/builtins.py:3202
2017
#: bzrlib/builtins.py:3295
2011
2018
msgid "Name of the root directory inside the exported file."
2012
2019
msgstr ""
2013
2020
2014
#: bzrlib/builtins.py:3204
2021
#: bzrlib/builtins.py:3297
2015
2022
msgid ""
2016
2023
"Set modification time of files to that of the last revision in which it was "
2017
2024
"changed."
2018
2025
msgstr ""
2019
2026
2020
#: bzrlib/builtins.py:3207
2027
#: bzrlib/builtins.py:3300
2021
2028
msgid ""
2022
2029
"Export the working tree contents rather than that of the last revision."
2023
2030
msgstr ""
2024
2031
2025
#: bzrlib/builtins.py:3226
2032
#: bzrlib/builtins.py:3319
2026
2033
msgid "--uncommitted requires a working tree"
2027
2034
msgstr ""
2028
2035
2029
#: bzrlib/builtins.py:3235
2036
#: bzrlib/builtins.py:3328
2030
2037
#, python-format
2031
2038
msgid "Unsupported export format: %s"
2032
2039
msgstr ""
2033
2040
2034
#: bzrlib/builtins.py:3239
2041
#: bzrlib/builtins.py:3332
2035
2042
msgid ""
2036
2043
"Write the contents of a file as of a given revision to standard output."
2037
2044
msgstr ""
2038
2045
2039
#: bzrlib/builtins.py:3241
2046
#: bzrlib/builtins.py:3334
2040
2047
msgid "If no revision is nominated, the last revision is used."
2041
2048
msgstr ""
2042
2049
2043
#: bzrlib/builtins.py:3243
2050
#: bzrlib/builtins.py:3336
2044
2051
msgid ""
2045
2052
"Note: Take care to redirect standard output when using this command on a\n"
2046
2053
"binary file."
2047
2054
msgstr ""
2048
2055
2049
#: bzrlib/builtins.py:3249
2056
#: bzrlib/builtins.py:3342
2050
2057
msgid "The path name in the old tree."
2051
2058
msgstr ""
2052
2059
2053
#: bzrlib/builtins.py:3250
2060
#: bzrlib/builtins.py:3343
2054
2061
msgid "Apply content filters to display the convenience form."
2055
2062
msgstr ""
2056
2063
2057
#: bzrlib/builtins.py:3261
2064
#: bzrlib/builtins.py:3354
2058
2065
msgid "bzr cat --revision takes exactly one revision specifier"
2059
2066
msgstr ""
2060
2067
2061
#: bzrlib/builtins.py:3286 bzrlib/builtins.py:3298
2068
#: bzrlib/builtins.py:3379 bzrlib/builtins.py:3391
2062
2069
msgid "{0!r} is not present in revision {1}"
2063
2070
msgstr ""
2064
2071
2065
#: bzrlib/builtins.py:3321
2072
#: bzrlib/builtins.py:3414
2066
2073
msgid "Commit changes into a new revision."
2067
2074
msgstr ""
2068
2075
2069
#: bzrlib/builtins.py:3323
2076
#: bzrlib/builtins.py:3416
2070
2077
msgid ""
2071
2078
"An explanatory message needs to be given for each commit. This is\n"
2072
2079
"often done by using the --message option (getting the message from the\n"
2076
2083
"boilerplate text loaded into the editor, use the --show-diff option."
2077
2084
msgstr ""
2078
2085
2079
#: bzrlib/builtins.py:3330
2086
#: bzrlib/builtins.py:3423
2080
2087
msgid ""
2081
2088
"By default, the entire tree is committed and the person doing the\n"
2082
2089
"commit is assumed to be the author. These defaults can be overridden\n"
2083
2090
"as explained below."
2084
2091
msgstr ""
2085
2092
2086
#: bzrlib/builtins.py:3334
2093
#: bzrlib/builtins.py:3427
2087
2094
msgid ":Selective commits:"
2088
2095
msgstr ""
2089
2096
2090
#: bzrlib/builtins.py:3336
2097
#: bzrlib/builtins.py:3429
2091
2098
msgid ""
2092
2099
" If selected files are specified, only changes to those files are\n"
2093
2100
" committed. If a directory is specified then the directory and\n"
2094
2101
" everything within it is committed."
2095
2102
msgstr ""
2096
2103
2097
#: bzrlib/builtins.py:3340
2104
#: bzrlib/builtins.py:3433
2098
2105
msgid ""
2099
2106
" When excludes are given, they take precedence over selected files.\n"
2100
2107
" For example, to commit only changes within foo, but not changes\n"
2101
2108
" within foo/bar::"
2102
2109
msgstr ""
2103
2110
2104
#: bzrlib/builtins.py:3344
2111
#: bzrlib/builtins.py:3437
2105
2112
msgid " bzr commit foo -x foo/bar"
2106
2113
msgstr ""
2107
2114
2108
#: bzrlib/builtins.py:3346
2115
#: bzrlib/builtins.py:3439
2109
2116
msgid " A selective commit after a merge is not yet supported."
2110
2117
msgstr ""
2111
2118
2112
#: bzrlib/builtins.py:3348
2119
#: bzrlib/builtins.py:3441
2113
2120
msgid ":Custom authors:"
2114
2121
msgstr ""
2115
2122
2116
#: bzrlib/builtins.py:3350
2123
#: bzrlib/builtins.py:3443
2117
2124
msgid ""
2118
2125
" If the author of the change is not the same person as the committer,\n"
2119
2126
" you can specify the author's name using the --author option. The\n"
2123
2130
" author."
2124
2131
msgstr ""
2125
2132
2126
#: bzrlib/builtins.py:3357
2133
#: bzrlib/builtins.py:3450
2127
2134
msgid ":Checks:"
2128
2135
msgstr ""
2129
2136
2130
#: bzrlib/builtins.py:3359
2137
#: bzrlib/builtins.py:3452
2131
2138
msgid ""
2132
2139
" A common mistake is to forget to add a new file or directory before\n"
2133
2140
" running the commit command. The --strict option checks for unknown\n"
2136
2143
" for details."
2137
2144
msgstr ""
2138
2145
2139
#: bzrlib/builtins.py:3365
2146
#: bzrlib/builtins.py:3458
2140
2147
msgid ":Things to note:"
2141
2148
msgstr ""
2142
2149
2143
#: bzrlib/builtins.py:3367
2150
#: bzrlib/builtins.py:3460
2144
2151
msgid ""
2145
2152
" If you accidentially commit the wrong changes or make a spelling\n"
2146
2153
" mistake in the commit message say, you can use the uncommit command\n"
2147
2154
" to undo it. See ``bzr help uncommit`` for details."
2148
2155
msgstr ""
2149
2156
2150
#: bzrlib/builtins.py:3371
2157
#: bzrlib/builtins.py:3464
2151
2158
msgid ""
2152
2159
" Hooks can also be configured to run after a commit. This allows you\n"
2153
2160
" to trigger updates to external systems like bug trackers. The --fixes\n"
2155
2162
" one or more bugs. See ``bzr help bugs`` for details."
2156
2163
msgstr ""
2157
2164
2158
#: bzrlib/builtins.py:3381
2165
#: bzrlib/builtins.py:3474
2159
2166
msgid "Do not consider changes made to a given path."
2160
2167
msgstr ""
2161
2168
2162
#: bzrlib/builtins.py:3384
2169
#: bzrlib/builtins.py:3477
2163
2170
msgid "Description of the new revision."
2164
2171
msgstr ""
2165
2172
2166
#: bzrlib/builtins.py:3387
2173
#: bzrlib/builtins.py:3480
2167
2174
msgid "Commit even if nothing has changed."
2168
2175
msgstr ""
2169
2176
2170
#: bzrlib/builtins.py:3391
2177
#: bzrlib/builtins.py:3484
2171
2178
msgid "Take commit message from this file."
2172
2179
msgstr ""
2173
2180
2174
#: bzrlib/builtins.py:3393
2181
#: bzrlib/builtins.py:3486
2175
2182
msgid "Refuse to commit if there are unknown files in the working tree."
2176
2183
msgstr ""
2177
2184
2178
#: bzrlib/builtins.py:3396
2185
#: bzrlib/builtins.py:3489
2179
2186
msgid ""
2180
2187
"Manually set a commit time using commit date format, e.g. '2009-10-10 "
2181
2188
"08:00:00 +0100'."
2182
2189
msgstr ""
2183
2190
2184
#: bzrlib/builtins.py:3399
2191
#: bzrlib/builtins.py:3492
2185
2192
msgid "Mark a bug as being fixed by this revision (see \"bzr help bugs\")."
2186
2193
msgstr ""
2187
2194
2188
#: bzrlib/builtins.py:3402
2195
#: bzrlib/builtins.py:3495
2189
2196
msgid "Set the author's name, if it's different from the committer."
2190
2197
msgstr ""
2191
2198
2192
#: bzrlib/builtins.py:3405
2199
#: bzrlib/builtins.py:3498
2193
2200
msgid ""
2194
2201
"Perform a local commit in a bound branch. Local commits are not pushed to "
2195
2202
"the master branch until a normal commit is performed."
2196
2203
msgstr ""
2197
2204
2198
#: bzrlib/builtins.py:3411
2205
#: bzrlib/builtins.py:3504
2199
2206
msgid ""
2200
2207
"When no message is supplied, show the diff along with the status summary in "
2201
2208
"the message editor."
2202
2209
msgstr ""
2203
2210
2204
#: bzrlib/builtins.py:3414
2211
#: bzrlib/builtins.py:3507
2205
2212
msgid ""
2206
2213
"When committing to a foreign version control system do not push data that "
2207
2214
"can not be natively represented."
2208
2215
msgstr ""
2209
2216
2210
#: bzrlib/builtins.py:3432
2217
#: bzrlib/builtins.py:3525
2211
2218
#, python-format
2212
2219
msgid ""
2213
2220
"No tracker specified for bug %s. Use the form 'tracker:id' or specify a "
2215
2222
"See \"bzr help bugs\" for more information on this feature. Commit refused."
2216
2223
msgstr ""
2217
2224
2218
#: bzrlib/builtins.py:3441
2225
#: bzrlib/builtins.py:3534
2219
2226
#, python-format
2220
2227
msgid ""
2221
2228
"Invalid bug %s. Must be in the form of 'tracker:id'. See \"bzr help bugs\" "
2223
2230
"Commit refused."
2224
2231
msgstr ""
2225
2232
2226
#: bzrlib/builtins.py:3450
2233
#: bzrlib/builtins.py:3543
2227
2234
#, python-format
2228
2235
msgid "Unrecognized bug %s. Commit refused."
2229
2236
msgstr ""
2230
2237
2231
#: bzrlib/builtins.py:3453
2238
#: bzrlib/builtins.py:3546
2232
2239
#, python-format
2233
2240
msgid ""
2234
2241
"%s\n"
2235
2242
"Commit refused."
2236
2243
msgstr ""
2237
2244
2238
#: bzrlib/builtins.py:3477
2245
#: bzrlib/builtins.py:3570
2239
2246
msgid "Could not parse --commit-time: "
2240
2247
msgstr ""
2241
2248
2242
#: bzrlib/builtins.py:3517
2249
#: bzrlib/builtins.py:3610
2243
2250
msgid "please specify either --message or --file"
2244
2251
msgstr ""
2245
2252
2246
#: bzrlib/builtins.py:3546
2253
#: bzrlib/builtins.py:3639
2247
2254
msgid "please specify a commit message with either --message or --file"
2248
2255
msgstr ""
2249
2256
2250
#: bzrlib/builtins.py:3549
2257
#: bzrlib/builtins.py:3642
2251
2258
msgid ""
2252
2259
"Empty commit message specified. Please specify a commit message with either -"
2253
2260
"-message or --file or leave a blank message with --message \"\"."
2254
2261
msgstr ""
2255
2262
2256
#: bzrlib/builtins.py:3569
2263
#: bzrlib/builtins.py:3662
2257
2264
msgid ""
2258
2265
"No changes to commit. Please 'bzr add' the files you want to commit, or use -"
2259
2266
"-unchanged to force an empty commit."
2260
2267
msgstr ""
2261
2268
2262
#: bzrlib/builtins.py:3573
2269
#: bzrlib/builtins.py:3666
2263
2270
msgid ""
2264
2271
"Conflicts detected in working tree. Use \"bzr conflicts\" to list, \"bzr "
2265
2272
"resolve FILE\" to resolve."
2266
2273
msgstr ""
2267
2274
2268
#: bzrlib/builtins.py:3577
2275
#: bzrlib/builtins.py:3670
2269
2276
msgid "Commit refused because there are unknown files in the working tree."
2270
2277
msgstr ""
2271
2278
2272
#: bzrlib/builtins.py:3580
2279
#: bzrlib/builtins.py:3673
2273
2280
msgid ""
2274
2281
"\n"
2275
2282
"To commit to master branch, run update and then commit.\n"
2276
2283
"You can also pass --local to commit to continue working disconnected."
2277
2284
msgstr ""
2278
2285
2279
#: bzrlib/builtins.py:3588
2286
#: bzrlib/builtins.py:3681
2280
2287
msgid ""
2281
2288
"Validate working tree structure, branch consistency and repository history."
2282
2289
msgstr ""
2283
2290
2284
#: bzrlib/builtins.py:3590
2291
#: bzrlib/builtins.py:3683
2285
2292
msgid ""
2286
2293
"This command checks various invariants about branch and repository storage\n"
2287
2294
"to detect data corruption or bzr bugs."
2288
2295
msgstr ""
2289
2296
2290
#: bzrlib/builtins.py:3593
2297
#: bzrlib/builtins.py:3686
2291
2298
msgid ""
2292
2299
"The working tree and branch checks will only give output if a problem is\n"
2293
2300
"detected. The output fields of the repository check are:"
2294
2301
msgstr ""
2295
2302
2296
#: bzrlib/builtins.py:3596
2303
#: bzrlib/builtins.py:3689
2297
2304
msgid ""
2298
2305
"revisions\n"
2299
2306
" This is just the number of revisions checked. It doesn't\n"
2300
2307
" indicate a problem."
2301
2308
msgstr ""
2302
2309
2303
#: bzrlib/builtins.py:3600
2310
#: bzrlib/builtins.py:3693
2304
2311
msgid ""
2305
2312
"versionedfiles\n"
2306
2313
" This is just the number of versionedfiles checked. It\n"
2307
2314
" doesn't indicate a problem."
2308
2315
msgstr ""
2309
2316
2310
#: bzrlib/builtins.py:3604
2317
#: bzrlib/builtins.py:3697
2311
2318
msgid ""
2312
2319
"unreferenced ancestors\n"
2313
2320
" Texts that are ancestors of other texts, but\n"
2315
2322
" subtle problem that Bazaar can work around."
2316
2323
msgstr ""
2317
2324
2318
#: bzrlib/builtins.py:3609
2325
#: bzrlib/builtins.py:3702
2319
2326
msgid ""
2320
2327
"unique file texts\n"
2321
2328
" This is the total number of unique file contents\n"
2322
2329
" seen in the checked revisions. It does not indicate a problem."
2323
2330
msgstr ""
2324
2331
2325
#: bzrlib/builtins.py:3613
2332
#: bzrlib/builtins.py:3706
2326
2333
msgid ""
2327
2334
"repeated file texts\n"
2328
2335
" This is the total number of repeated texts seen\n"
2331
2338
" indicate a problem."
2332
2339
msgstr ""
2333
2340
2334
#: bzrlib/builtins.py:3619
2341
#: bzrlib/builtins.py:3712
2335
2342
msgid ""
2336
2343
"If no restrictions are specified, all Bazaar data that is found at the "
2337
2344
"given\n"
2338
2345
"location will be checked."
2339
2346
msgstr ""
2340
2347
2341
#: bzrlib/builtins.py:3624
2348
#: bzrlib/builtins.py:3717
2342
2349
msgid " Check the tree and branch at 'foo'::"
2343
2350
msgstr ""
2344
2351
2345
#: bzrlib/builtins.py:3626
2352
#: bzrlib/builtins.py:3719
2346
2353
msgid " bzr check --tree --branch foo"
2347
2354
msgstr ""
2348
2355
2349
#: bzrlib/builtins.py:3628
2356
#: bzrlib/builtins.py:3721
2350
2357
msgid " Check only the repository at 'bar'::"
2351
2358
msgstr ""
2352
2359
2353
#: bzrlib/builtins.py:3630
2360
#: bzrlib/builtins.py:3723
2354
2361
msgid " bzr check --repo bar"
2355
2362
msgstr ""
2356
2363
2357
#: bzrlib/builtins.py:3632
2364
#: bzrlib/builtins.py:3725
2358
2365
msgid " Check everything at 'baz'::"
2359
2366
msgstr ""
2360
2367
2361
#: bzrlib/builtins.py:3634
2368
#: bzrlib/builtins.py:3727
2362
2369
msgid " bzr check baz"
2363
2370
msgstr ""
2364
2371
2365
#: bzrlib/builtins.py:3640
2372
#: bzrlib/builtins.py:3733
2366
2373
msgid "Check the branch related to the current directory."
2367
2374
msgstr ""
2368
2375
2369
#: bzrlib/builtins.py:3642
2376
#: bzrlib/builtins.py:3735
2370
2377
msgid "Check the repository related to the current directory."
2371
2378
msgstr ""
2372
2379
2373
#: bzrlib/builtins.py:3644
2380
#: bzrlib/builtins.py:3737
2374
2381
msgid "Check the working tree related to the current directory."
2375
2382
msgstr ""
2376
2383
2377
#: bzrlib/builtins.py:3658
2384
#: bzrlib/builtins.py:3751
2378
2385
msgid "Upgrade a repository, branch or working tree to a newer format."
2379
2386
msgstr ""
2380
2387
2381
#: bzrlib/builtins.py:3660
2388
#: bzrlib/builtins.py:3753
2382
2389
msgid ""
2383
2390
"When the default format has changed after a major new release of\n"
2384
2391
"Bazaar, you may be informed during certain operations that you\n"
2387
2394
"with older repositories or with older versions of Bazaar."
2388
2395
msgstr ""
2389
2396
2390
#: bzrlib/builtins.py:3666
2397
#: bzrlib/builtins.py:3759
2391
2398
msgid ""
2392
2399
"If you wish to upgrade to a particular format rather than the\n"
2393
2400
"current default, that can be specified using the --format option.\n"
2397
2404
"2.x default) so downgrading is not always possible."
2398
2405
msgstr ""
2399
2406
2400
#: bzrlib/builtins.py:3673
2407
#: bzrlib/builtins.py:3766
2401
2408
msgid ""
2402
2409
"A backup.bzr.~#~ directory is created at the start of the conversion\n"
2403
2410
"process (where # is a number). By default, this is left there on\n"
2408
2415
"afterwards."
2409
2416
msgstr ""
2410
2417
2411
#: bzrlib/builtins.py:3681
2418
#: bzrlib/builtins.py:3774
2412
2419
msgid ""
2413
2420
"If the location given is a shared repository, dependent branches\n"
2414
2421
"are also converted provided the repository converts successfully.\n"
2416
2423
"tried."
2417
2424
msgstr ""
2418
2425
2419
#: bzrlib/builtins.py:3686
2426
#: bzrlib/builtins.py:3779
2420
2427
msgid ""
2421
2428
"For more information on upgrades, see the Bazaar Upgrade Guide,\n"
2422
2429
"http://doc.bazaar.canonical.com/latest/en/upgrade-guide/."
2423
2430
msgstr ""
2424
2431
2425
#: bzrlib/builtins.py:3694
2432
#: bzrlib/builtins.py:3787
2426
2433
msgid "Upgrade to a specific format. See \"bzr help formats\" for details."
2427
2434
msgstr ""
2428
2435
2429
#: bzrlib/builtins.py:3698
2436
#: bzrlib/builtins.py:3791
2430
2437
msgid "Branch format"
2431
2438
msgstr ""
2432
2439
2433
#: bzrlib/builtins.py:3700
2440
#: bzrlib/builtins.py:3793
2434
2441
msgid "Remove the backup.bzr directory if successful."
2435
2442
msgstr ""
2436
2443
2437
#: bzrlib/builtins.py:3702
2444
#: bzrlib/builtins.py:3795
2438
2445
msgid "Show what would be done, but don't actually do anything."
2439
2446
msgstr ""
2440
2447
2441
#: bzrlib/builtins.py:3717
2448
#: bzrlib/builtins.py:3810
2442
2449
msgid "Show or set bzr user id."
2443
2450
msgstr ""
2444
2451
2445
#: bzrlib/builtins.py:3719
2452
#: bzrlib/builtins.py:3812
2446
2453
msgid ""
2447
2454
":Examples:\n"
2448
2455
" Show the email of the current user::"
2449
2456
msgstr ""
2450
2457
2451
#: bzrlib/builtins.py:3722
2458
#: bzrlib/builtins.py:3815
2452
2459
msgid " bzr whoami --email"
2453
2460
msgstr ""
2454
2461
2455
#: bzrlib/builtins.py:3724
2462
#: bzrlib/builtins.py:3817
2456
2463
msgid " Set the current user::"
2457
2464
msgstr ""
2458
2465
2459
#: bzrlib/builtins.py:3726
2466
#: bzrlib/builtins.py:3819
2460
2467
msgid " bzr whoami \"Frank Chu <fchu@example.com>\""
2461
2468
msgstr ""
2462
2469
2463
#: bzrlib/builtins.py:3730
2470
#: bzrlib/builtins.py:3823
2464
2471
msgid "Display email address only."
2465
2472
msgstr ""
2466
2473
2467
#: bzrlib/builtins.py:3732
2474
#: bzrlib/builtins.py:3825
2468
2475
msgid "Set identity for the current branch instead of globally."
2469
2476
msgstr ""
2470
2477
2471
#: bzrlib/builtins.py:3758
2478
#: bzrlib/builtins.py:3851
2472
2479
msgid "--email can only be used to display existing identity"
2473
2480
msgstr ""
2474
2481
2475
#: bzrlib/builtins.py:3780
2482
#: bzrlib/builtins.py:3873
2476
2483
msgid "Print or set the branch nickname."
2477
2484
msgstr ""
2478
2485
2479
#: bzrlib/builtins.py:3782
2486
#: bzrlib/builtins.py:3875
2480
2487
msgid ""
2481
2488
"If unset, the tree root directory name is used as the nickname.\n"
2482
2489
"To print the current nickname, execute with no argument."
2483
2490
msgstr ""
2484
2491
2485
#: bzrlib/builtins.py:3785
2492
#: bzrlib/builtins.py:3878
2486
2493
msgid ""
2487
2494
"Bound branches use the nickname of its master branch unless it is set\n"
2488
2495
"locally."
2489
2496
msgstr ""
2490
2497
2491
#: bzrlib/builtins.py:3805
2498
#: bzrlib/builtins.py:3898
2492
2499
msgid "Set/unset and display aliases."
2493
2500
msgstr ""
2494
2501
2495
#: bzrlib/builtins.py:3807
2502
#: bzrlib/builtins.py:3900
2496
2503
msgid ""
2497
2504
":Examples:\n"
2498
2505
" Show the current aliases::"
2499
2506
msgstr ""
2500
2507
2501
#: bzrlib/builtins.py:3810
2508
#: bzrlib/builtins.py:3903
2502
2509
msgid " bzr alias"
2503
2510
msgstr ""
2504
2511
2505
#: bzrlib/builtins.py:3812
2512
#: bzrlib/builtins.py:3905
2506
2513
msgid " Show the alias specified for 'll'::"
2507
2514
msgstr ""
2508
2515
2509
#: bzrlib/builtins.py:3814
2516
#: bzrlib/builtins.py:3907
2510
2517
msgid " bzr alias ll"
2511
2518
msgstr ""
2512
2519
2513
#: bzrlib/builtins.py:3816
2520
#: bzrlib/builtins.py:3909
2514
2521
msgid " Set an alias for 'll'::"
2515
2522
msgstr ""
2516
2523
2517
#: bzrlib/builtins.py:3818
2524
#: bzrlib/builtins.py:3911
2518
2525
msgid " bzr alias ll=\"log --line -r-10..-1\""
2519
2526
msgstr ""
2520
2527
2521
#: bzrlib/builtins.py:3820
2528
#: bzrlib/builtins.py:3913
2522
2529
msgid " To remove an alias for 'll'::"
2523
2530
msgstr ""
2524
2531
2525
#: bzrlib/builtins.py:3822
2532
#: bzrlib/builtins.py:3915
2526
2533
msgid " bzr alias --remove ll"
2527
2534
msgstr ""
2528
2535
2529
#: bzrlib/builtins.py:3827
2536
#: bzrlib/builtins.py:3920
2530
2537
msgid "Remove the alias."
2531
2538
msgstr ""
2532
2539
2533
#: bzrlib/builtins.py:3845
2540
#: bzrlib/builtins.py:3938
2534
2541
msgid "bzr alias --remove expects an alias to remove."
2535
2542
msgstr ""
2536
2543
2537
#: bzrlib/builtins.py:4026
2544
#: bzrlib/builtins.py:4119
2538
2545
msgid ""
2539
2546
"subunit not available. subunit needs to be installed to use --subunit."
2540
2547
msgstr ""
2541
2548
2542
#: bzrlib/builtins.py:4043
2549
#: bzrlib/builtins.py:4136
2543
2550
msgid ""
2544
2551
"--benchmark is no longer supported from bzr 2.2; use bzr-usertest instead"
2545
2552
msgstr ""
2546
2553
2547
#: bzrlib/builtins.py:4090
2554
#: bzrlib/builtins.py:4183
2548
2555
msgid "Show version of bzr."
2549
2556
msgstr ""
2550
2557
2551
#: bzrlib/builtins.py:4094
2558
#: bzrlib/builtins.py:4187
2552
2559
msgid "Print just the version number."
2553
2560
msgstr ""
2554
2561
2555
#: bzrlib/builtins.py:4113
2562
#: bzrlib/builtins.py:4206
2556
2563
msgid "It sure does!\n"
2557
2564
msgstr ""
2558
2565
2559
#: bzrlib/builtins.py:4137
2566
#: bzrlib/builtins.py:4230
2560
2567
#, python-format
2561
2568
msgid "merge base is revision %s\n"
2562
2569
msgstr ""
2563
2570
2564
#: bzrlib/builtins.py:4141
2571
#: bzrlib/builtins.py:4234
2565
2572
msgid "Perform a three-way merge."
2566
2573
msgstr ""
2567
2574
2568
#: bzrlib/builtins.py:4143
2575
#: bzrlib/builtins.py:4236
2569
2576
msgid ""
2570
2577
"The source of the merge can be specified either in the form of a branch,\n"
2571
2578
"or in the form of a path to a file containing a merge directive generated\n"
2576
2583
"the current working tree."
2577
2584
msgstr ""
2578
2585
2579
#: bzrlib/builtins.py:4151
2586
#: bzrlib/builtins.py:4244
2580
2587
msgid ""
2581
2588
"When merging from a branch, by default bzr will try to merge in all new\n"
2582
2589
"work from the other branch, automatically determining an appropriate base\n"
2583
2590
"revision. If this fails, you may need to give an explicit base."
2584
2591
msgstr ""
2585
2592
2586
#: bzrlib/builtins.py:4155
2593
#: bzrlib/builtins.py:4248
2587
2594
msgid ""
2588
2595
"To pick a different ending revision, pass \"--revision OTHER\". bzr will\n"
2589
2596
"try to merge in all new work up to and including revision OTHER."
2590
2597
msgstr ""
2591
2598
2592
#: bzrlib/builtins.py:4158
2599
#: bzrlib/builtins.py:4251
2593
2600
msgid ""
2594
2601
"If you specify two values, \"--revision BASE..OTHER\", only revisions BASE\n"
2595
2602
"through OTHER, excluding BASE but including OTHER, will be merged. If this\n"
2600
2607
"changes from the other branch is not stored in the commit."
2601
2608
msgstr ""
2602
2609
2603
#: bzrlib/builtins.py:4166
2610
#: bzrlib/builtins.py:4259
2604
2611
msgid "Revision numbers are always relative to the source branch."
2605
2612
msgstr ""
2606
2613
2607
#: bzrlib/builtins.py:4168 bzrlib/conflicts.py:52 bzrlib/conflicts.py:106
2614
#: bzrlib/builtins.py:4261 bzrlib/conflicts.py:52 bzrlib/conflicts.py:106
2608
2615
msgid ""
2609
2616
"Merge will do its best to combine the changes in two branches, but there\n"
2610
2617
"are some kinds of problems only a human can fix. When it encounters those,\n"
2611
2618
"it will mark a conflict. A conflict means that you need to fix something,\n"
2612
"before you should commit."
2619
"before you can commit."
2613
2620
msgstr ""
2614
2621
2615
#: bzrlib/builtins.py:4173
2622
#: bzrlib/builtins.py:4266
2616
2623
msgid ""
2617
2624
"Use bzr resolve when you have fixed a problem. See also bzr conflicts."
2618
2625
msgstr ""
2619
2626
2620
#: bzrlib/builtins.py:4175
2627
#: bzrlib/builtins.py:4268
2621
2628
msgid ""
2622
2629
"If there is no default branch set, the first merge will set it (use\n"
2623
2630
"--no-remember to avoid setting it). After that, you can omit the branch\n"
2625
2632
"only be saved if the remote location can be accessed."
2626
2633
msgstr ""
2627
2634
2628
#: bzrlib/builtins.py:4180
2635
#: bzrlib/builtins.py:4273
2629
2636
msgid ""
2630
2637
"The results of the merge are placed into the destination working\n"
2631
2638
"directory, where they can be reviewed (with bzr diff), tested, and then\n"
2632
2639
"committed to record the result of the merge."
2633
2640
msgstr ""
2634
2641
2635
#: bzrlib/builtins.py:4184
2642
#: bzrlib/builtins.py:4277
2636
2643
msgid ""
2637
2644
"merge refuses to run if there are any uncommitted changes, unless\n"
2638
2645
"--force is given. If --force is given, then the changes from the source \n"
2641
2648
"merge revision which has more than two parents."
2642
2649
msgstr ""
2643
2650
2644
#: bzrlib/builtins.py:4190
2651
#: bzrlib/builtins.py:4283
2645
2652
msgid ""
2646
2653
"If one would like to merge changes from the working tree of the other\n"
2647
2654
"branch without merging any committed revisions, the --uncommitted option\n"
2648
2655
"can be given."
2649
2656
msgstr ""
2650
2657
2651
#: bzrlib/builtins.py:4194
2658
#: bzrlib/builtins.py:4287
2652
2659
msgid ""
2653
2660
"To select only some changes to merge, use \"merge -i\", which will prompt\n"
2654
2661
"you to apply each diff hunk and file change, similar to \"shelve\"."
2655
2662
msgstr ""
2656
2663
2657
#: bzrlib/builtins.py:4197
2664
#: bzrlib/builtins.py:4290
2658
2665
msgid ""
2659
2666
":Examples:\n"
2660
2667
" To merge all new revisions from bzr.dev::"
2661
2668
msgstr ""
2662
2669
2663
#: bzrlib/builtins.py:4200
2670
#: bzrlib/builtins.py:4293
2664
2671
msgid " bzr merge ../bzr.dev"
2665
2672
msgstr ""
2666
2673
2667
#: bzrlib/builtins.py:4202
2674
#: bzrlib/builtins.py:4295
2668
2675
msgid " To merge changes up to and including revision 82 from bzr.dev::"
2669
2676
msgstr ""
2670
2677
2671
#: bzrlib/builtins.py:4204
2678
#: bzrlib/builtins.py:4297
2672
2679
msgid " bzr merge -r 82 ../bzr.dev"
2673
2680
msgstr ""
2674
2681
2675
#: bzrlib/builtins.py:4206
2682
#: bzrlib/builtins.py:4299
2676
2683
msgid " To merge the changes introduced by 82, without previous changes::"
2677
2684
msgstr ""
2678
2685
2679
#: bzrlib/builtins.py:4208
2686
#: bzrlib/builtins.py:4301
2680
2687
msgid " bzr merge -r 81..82 ../bzr.dev"
2681
2688
msgstr ""
2682
2689
2683
#: bzrlib/builtins.py:4210
2690
#: bzrlib/builtins.py:4303
2684
2691
msgid " To apply a merge directive contained in /tmp/merge::"
2685
2692
msgstr ""
2686
2693
2687
#: bzrlib/builtins.py:4212
2694
#: bzrlib/builtins.py:4305
2688
2695
msgid " bzr merge /tmp/merge"
2689
2696
msgstr ""
2690
2697
2691
#: bzrlib/builtins.py:4214
2698
#: bzrlib/builtins.py:4307
2692
2699
msgid ""
2693
2700
" To create a merge revision with three parents from two branches\n"
2694
2701
" feature1a and feature1b:"
2695
2702
msgstr ""
2696
2703
2697
#: bzrlib/builtins.py:4217
2704
#: bzrlib/builtins.py:4310
2698
2705
msgid ""
2699
2706
" bzr merge ../feature1a\n"
2700
2707
" bzr merge ../feature1b --force\n"
2701
2708
" bzr commit -m 'revision with three parents'"
2702
2709
msgstr ""
2703
2710
2704
#: bzrlib/builtins.py:4229
2711
#: bzrlib/builtins.py:4322
2705
2712
msgid "Merge even if the destination tree has uncommitted changes."
2706
2713
msgstr ""
2707
2714
2708
#: bzrlib/builtins.py:4235
2715
#: bzrlib/builtins.py:4328
2709
2716
msgid ""
2710
2717
"Apply uncommitted changes from a working copy, instead of branch changes."
2711
2718
msgstr ""
2712
2719
2713
#: bzrlib/builtins.py:4237
2720
#: bzrlib/builtins.py:4330
2714
2721
msgid ""
2715
2722
"If the destination is already completely merged into the source, pull from "
2716
2723
"the source rather than merging. When this happens, you do not need to "
2717
2724
"commit the result."
2718
2725
msgstr ""
2719
2726
2720
#: bzrlib/builtins.py:4242
2727
#: bzrlib/builtins.py:4335
2721
2728
msgid ""
2722
2729
"Branch to merge into, rather than the one containing the working directory."
2723
2730
msgstr ""
2724
2731
2725
#: bzrlib/builtins.py:4244
2732
#: bzrlib/builtins.py:4337
2726
2733
msgid "Instead of merging, show a diff of the merge."
2727
2734
msgstr ""
2728
2735
2729
#: bzrlib/builtins.py:4246
2736
#: bzrlib/builtins.py:4339
2730
2737
msgid "Select changes interactively."
2731
2738
msgstr ""
2732
2739
2733
#: bzrlib/builtins.py:4268
2740
#: bzrlib/builtins.py:4361
2734
2741
msgid ""
2735
2742
"Merging into empty branches not currently supported, "
2736
2743
"https://bugs.launchpad.net/bzr/+bug/308562"
2737
2744
msgstr ""
2738
2745
2739
#: bzrlib/builtins.py:4295
2746
#: bzrlib/builtins.py:4388
2740
2747
msgid "Cannot use --uncommitted with bundles or merge directives."
2741
2748
msgstr ""
2742
2749
2743
#: bzrlib/builtins.py:4306
2750
#: bzrlib/builtins.py:4399
2744
2751
msgid "Cannot use --uncommitted and --revision at the same time."
2745
2752
msgstr ""
2746
2753
2747
#: bzrlib/builtins.py:4326
2754
#: bzrlib/builtins.py:4419
2748
2755
msgid "merger: "
2749
2756
msgstr ""
2750
2757
2751
#: bzrlib/builtins.py:4328 bzrlib/bundle/apply_bundle.py:71
2758
#: bzrlib/builtins.py:4421 bzrlib/bundle/apply_bundle.py:71
2752
2759
msgid "Nothing to do."
2753
2760
msgstr ""
2754
2761
2755
#: bzrlib/builtins.py:4332
2762
#: bzrlib/builtins.py:4425
2756
2763
msgid "Cannot pull individual files"
2757
2764
msgstr ""
2758
2765
2759
#: bzrlib/builtins.py:4340
2766
#: bzrlib/builtins.py:4433
2760
2767
msgid "This branch has no commits. (perhaps you would prefer 'bzr pull')"
2761
2768
msgstr ""
2762
2769
2763
#: bzrlib/builtins.py:4398
2770
#: bzrlib/builtins.py:4491
2764
2771
#, python-format
2765
2772
msgid "Show-base is not supported for this merge type. %s"
2766
2773
msgstr ""
2767
2774
2768
#: bzrlib/builtins.py:4407
2775
#: bzrlib/builtins.py:4500
2769
2776
#, python-format
2770
2777
msgid "Conflict reduction is not supported for merge type %s."
2771
2778
msgstr ""
2772
2779
2773
#: bzrlib/builtins.py:4411
2780
#: bzrlib/builtins.py:4504
2774
2781
msgid "Cannot do conflict reduction and show base."
2775
2782
msgstr ""
2776
2783
2777
#: bzrlib/builtins.py:4522
2784
#: bzrlib/builtins.py:4615
2778
2785
msgid "No location specified or remembered"
2779
2786
msgstr ""
2780
2787
2781
#: bzrlib/builtins.py:4524
2788
#: bzrlib/builtins.py:4617
2782
2789
msgid "{0} remembered {1} location {2}"
2783
2790
msgstr ""
2784
2791
2785
#: bzrlib/builtins.py:4530
2792
#: bzrlib/builtins.py:4623
2786
2793
msgid "Redo a merge."
2787
2794
msgstr ""
2788
2795
2789
#: bzrlib/builtins.py:4532
2796
#: bzrlib/builtins.py:4625
2790
2797
msgid ""
2791
2798
"Use this if you want to try a different merge technique while resolving\n"
2792
2799
"conflicts. Some merge techniques are better than others, and remerge\n"
2793
2800
"lets you try different ones on different files."
2794
2801
msgstr ""
2795
2802
2796
#: bzrlib/builtins.py:4536
2803
#: bzrlib/builtins.py:4629
2797
2804
msgid ""
2798
2805
"The options for remerge have the same meaning and defaults as the ones for\n"
2799
2806
"merge. The difference is that remerge can (only) be run when there is a\n"
2800
2807
"pending merge, and it lets you specify particular files."
2801
2808
msgstr ""
2802
2809
2803
#: bzrlib/builtins.py:4540
2810
#: bzrlib/builtins.py:4633
2804
2811
msgid ""
2805
2812
":Examples:\n"
2806
2813
" Re-do the merge of all conflicted files, and show the base text in\n"
2807
2814
" conflict regions, in addition to the usual THIS and OTHER texts::"
2808
2815
msgstr ""
2809
2816
2810
#: bzrlib/builtins.py:4544
2817
#: bzrlib/builtins.py:4637
2811
2818
msgid " bzr remerge --show-base"
2812
2819
msgstr ""
2813
2820
2814
#: bzrlib/builtins.py:4546
2821
#: bzrlib/builtins.py:4639
2815
2822
msgid ""
2816
2823
" Re-do the merge of \"foobar\", using the weave merge algorithm, with\n"
2817
2824
" additional processing to reduce the size of conflict regions::"
2818
2825
msgstr ""
2819
2826
2820
#: bzrlib/builtins.py:4549
2827
#: bzrlib/builtins.py:4642
2821
2828
msgid " bzr remerge --merge-type weave --reprocess foobar"
2822
2829
msgstr ""
2823
2830
2824
#: bzrlib/builtins.py:4556
2831
#: bzrlib/builtins.py:4649
2825
2832
msgid "Show base revision text in conflicts."
2826
2833
msgstr ""
2827
2834
2828
#: bzrlib/builtins.py:4568
2835
#: bzrlib/builtins.py:4661
2829
2836
msgid ""
2830
2837
"Sorry, remerge only works after normal merges. Not cherrypicking or multi-"
2831
2838
"merges."
2832
2839
msgstr ""
2833
2840
2834
#: bzrlib/builtins.py:4624
2841
#: bzrlib/builtins.py:4717
2835
2842
msgid "Revert files to a previous revision."
2836
2843
msgstr ""
2837
2844
2838
#: bzrlib/builtins.py:4626
2845
#: bzrlib/builtins.py:4719
2839
2846
msgid ""
2840
2847
"Giving a list of files will revert only those files. Otherwise, all files\n"
2841
2848
"will be reverted. If the revision is not specified with '--revision', the\n"
2842
2849
"last committed revision is used."
2843
2850
msgstr ""
2844
2851
2845
#: bzrlib/builtins.py:4630
2852
#: bzrlib/builtins.py:4723
2846
2853
msgid ""
2847
2854
"To remove only some changes, without reverting to a prior version, use\n"
2848
2855
"merge instead. For example, \"merge . -r -2..-3\" (don't forget the \".\")\n"
2851
2858
"certain changes on a hunk-by-hunk basis, see the shelve command."
2852
2859
msgstr ""
2853
2860
2854
#: bzrlib/builtins.py:4636
2861
#: bzrlib/builtins.py:4729
2855
2862
msgid ""
2856
2863
"By default, any files that have been manually changed will be backed up\n"
2857
2864
"first. (Files changed only by merge are not backed up.) Backup files have\n"
2858
2865
"'.~#~' appended to their name, where # is a number."
2859
2866
msgstr ""
2860
2867
2861
#: bzrlib/builtins.py:4640
2868
#: bzrlib/builtins.py:4733
2862
2869
msgid ""
2863
2870
"When you provide files, you can use their current pathname or the pathname\n"
2864
2871
"from the target revision. So you can use revert to \"undelete\" a file by\n"
2866
2873
"reverted."
2867
2874
msgstr ""
2868
2875
2869
#: bzrlib/builtins.py:4645
2876
#: bzrlib/builtins.py:4738
2870
2877
msgid ""
2871
2878
"If you have newly added files since the target revision, they will be\n"
2872
2879
"removed. If the files to be removed have been changed, backups will be\n"
2874
2881
"deleted."
2875
2882
msgstr ""
2876
2883
2877
#: bzrlib/builtins.py:4650
2884
#: bzrlib/builtins.py:4743
2878
2885
msgid ""
2879
2886
"The working tree contains a list of revisions that have been merged but\n"
2880
2887
"not yet committed. These revisions will be included as additional parents\n"
2886
2893
"reverting any files."
2887
2894
msgstr ""
2888
2895
2889
#: bzrlib/builtins.py:4659
2896
#: bzrlib/builtins.py:4752
2890
2897
msgid ""
2891
2898
"Using \"bzr revert --forget-merges\", it is possible to apply all of the\n"
2892
2899
"changes from a branch in a single revision. To do this, perform the merge\n"
2900
2907
"target branches."
2901
2908
msgstr ""
2902
2909
2903
#: bzrlib/builtins.py:4673
2910
#: bzrlib/builtins.py:4766
2904
2911
msgid "Do not save backups of reverted files."
2905
2912
msgstr ""
2906
2913
2907
#: bzrlib/builtins.py:4675
2914
#: bzrlib/builtins.py:4768
2908
2915
msgid "Remove pending merge marker, without changing any files."
2909
2916
msgstr ""
2910
2917
2911
#: bzrlib/builtins.py:4706
2918
#: bzrlib/builtins.py:4799
2912
2919
msgid ""
2913
2920
"Show help on a command or other topic.\n"
2914
2921
" "
2915
2922
msgstr ""
2916
2923
2917
#: bzrlib/builtins.py:4711
2924
#: bzrlib/builtins.py:4804
2918
2925
msgid "Show help on all commands."
2919
2926
msgstr ""
2920
2927
2921
#: bzrlib/builtins.py:4740
2928
#: bzrlib/builtins.py:4833
2922
2929
msgid "Show unmerged/unpulled revisions between two branches."
2923
2930
msgstr ""
2924
2931
2925
#: bzrlib/builtins.py:4742
2932
#: bzrlib/builtins.py:4835
2926
2933
msgid "OTHER_BRANCH may be local or remote."
2927
2934
msgstr ""
2928
2935
2929
#: bzrlib/builtins.py:4744
2936
#: bzrlib/builtins.py:4837
2930
2937
msgid ""
2931
2938
"To filter on a range of revisions, you can use the command -r begin..end\n"
2932
2939
"-r revision requests a specific revision, -r ..end or -r begin.. are\n"
2937
2944
" 0 - no missing revisions"
2938
2945
msgstr ""
2939
2946
2940
#: bzrlib/builtins.py:4754
2947
#: bzrlib/builtins.py:4847
2941
2948
msgid ""
2942
2949
" Determine the missing revisions between this and the branch at the\n"
2943
2950
" remembered pull location::"
2944
2951
msgstr ""
2945
2952
2946
#: bzrlib/builtins.py:4757
2953
#: bzrlib/builtins.py:4850
2947
2954
msgid " bzr missing"
2948
2955
msgstr ""
2949
2956
2950
#: bzrlib/builtins.py:4759
2957
#: bzrlib/builtins.py:4852
2951
2958
msgid " Determine the missing revisions between this and another branch::"
2952
2959
msgstr ""
2953
2960
2954
#: bzrlib/builtins.py:4761
2961
#: bzrlib/builtins.py:4854
2955
2962
msgid " bzr missing http://server/branch"
2956
2963
msgstr ""
2957
2964
2958
#: bzrlib/builtins.py:4763
2965
#: bzrlib/builtins.py:4856
2959
2966
msgid ""
2960
2967
" Determine the missing revisions up to a specific revision on the other\n"
2961
2968
" branch::"
2962
2969
msgstr ""
2963
2970
2964
#: bzrlib/builtins.py:4766
2971
#: bzrlib/builtins.py:4859
2965
2972
msgid " bzr missing -r ..-10"
2966
2973
msgstr ""
2967
2974
2968
#: bzrlib/builtins.py:4768
2975
#: bzrlib/builtins.py:4861
2969
2976
msgid ""
2970
2977
" Determine the missing revisions up to a specific revision on this\n"
2971
2978
" branch::"
2972
2979
msgstr ""
2973
2980
2974
#: bzrlib/builtins.py:4771
2981
#: bzrlib/builtins.py:4864
2975
2982
msgid " bzr missing --my-revision ..-10"
2976
2983
msgstr ""
2977
2984
2978
#: bzrlib/builtins.py:4778
2985
#: bzrlib/builtins.py:4871
2979
2986
msgid "Reverse the order of revisions."
2980
2987
msgstr ""
2981
2988
2982
#: bzrlib/builtins.py:4780
2989
#: bzrlib/builtins.py:4873
2983
2990
msgid "Display changes in the local branch only."
2984
2991
msgstr ""
2985
2992
2986
#: bzrlib/builtins.py:4781
2993
#: bzrlib/builtins.py:4874
2987
2994
msgid "Same as --mine-only."
2988
2995
msgstr ""
2989
2996
2990
#: bzrlib/builtins.py:4783
2997
#: bzrlib/builtins.py:4876
2991
2998
msgid "Display changes in the remote branch only."
2992
2999
msgstr ""
2993
3000
2994
#: bzrlib/builtins.py:4784
3001
#: bzrlib/builtins.py:4877
2995
3002
msgid "Same as --theirs-only."
2996
3003
msgstr ""
2997
3004
2998
#: bzrlib/builtins.py:4789
3005
#: bzrlib/builtins.py:4882
2999
3006
msgid ""
3000
3007
"Filter on other branch revisions (inclusive). See \"help revisionspec\" for "
3001
3008
"details."
3002
3009
msgstr ""
3003
3010
3004
#: bzrlib/builtins.py:4793
3011
#: bzrlib/builtins.py:4886
3005
3012
msgid ""
3006
3013
"Filter on local branch revisions (inclusive). See \"help revisionspec\" for "
3007
3014
"details."
3008
3015
msgstr ""
3009
3016
3010
#: bzrlib/builtins.py:4796
3017
#: bzrlib/builtins.py:4889
3011
3018
msgid "Show all revisions in addition to the mainline ones."
3012
3019
msgstr ""
3013
3020
3014
#: bzrlib/builtins.py:4850
3021
#: bzrlib/builtins.py:4943
3015
3022
msgid "No peer location known or specified."
3016
3023
msgstr ""
3017
3024
3018
#: bzrlib/builtins.py:4854
3025
#: bzrlib/builtins.py:4947
3019
3026
msgid "Using saved parent location: {0}\n"
3020
3027
msgstr ""
3021
3028
3022
#: bzrlib/builtins.py:4887
3029
#: bzrlib/builtins.py:4980
3023
3030
#, python-format
3024
3031
msgid "You have %d extra revision:\n"
3025
3032
msgid_plural "You have %d extra revisions:\n"
3026
3033
msgstr[0] ""
3027
3034
msgstr[1] ""
3028
3035
3029
#: bzrlib/builtins.py:4903
3036
#: bzrlib/builtins.py:4996
3030
3037
#, python-format
3031
3038
msgid "You are missing %d revision:\n"
3032
3039
msgid_plural "You are missing %d revisions:\n"
3033
3040
msgstr[0] ""
3034
3041
msgstr[1] ""
3035
3042
3036
#: bzrlib/builtins.py:4915
3043
#: bzrlib/builtins.py:5008
3037
3044
msgid "This branch has no new revisions.\n"
3038
3045
msgstr ""
3039
3046
3040
#: bzrlib/builtins.py:4918
3047
#: bzrlib/builtins.py:5011
3041
3048
msgid "Other branch has no new revisions.\n"
3042
3049
msgstr ""
3043
3050
3044
#: bzrlib/builtins.py:4923
3051
#: bzrlib/builtins.py:5016
3045
3052
msgid "Branches are up to date.\n"
3046
3053
msgstr ""
3047
3054
3048
#: bzrlib/builtins.py:4934
3055
#: bzrlib/builtins.py:5027
3049
3056
msgid "Compress the data within a repository."
3050
3057
msgstr ""
3051
3058
3052
#: bzrlib/builtins.py:4936
3059
#: bzrlib/builtins.py:5029
3053
3060
msgid ""
3054
3061
"This operation compresses the data within a bazaar repository. As\n"
3055
3062
"bazaar supports automatic packing of repository, this operation is\n"
3056
3063
"normally not required to be done manually."
3057
3064
msgstr ""
3058
3065
3059
#: bzrlib/builtins.py:4940
3066
#: bzrlib/builtins.py:5033
3060
3067
msgid ""
3061
3068
"During the pack operation, bazaar takes a backup of existing repository\n"
3062
3069
"data, i.e. pack files. This backup is eventually removed by bazaar\n"
3065
3072
"used."
3066
3073
msgstr ""
3067
3074
3068
#: bzrlib/builtins.py:4946
3075
#: bzrlib/builtins.py:5039
3069
3076
msgid ""
3070
3077
"Warning: If you use --clean-obsolete-packs and your machine crashes\n"
3071
3078
"during or immediately after repacking, you may be left with a state\n"
3073
3080
"been. In this case the repository may be unusable."
3074
3081
msgstr ""
3075
3082
3076
#: bzrlib/builtins.py:4955
3083
#: bzrlib/builtins.py:5048
3077
3084
msgid "Delete obsolete packs to save disk space."
3078
3085
msgstr ""
3079
3086
3080
#: bzrlib/builtins.py:4969
3087
#: bzrlib/builtins.py:5062
3081
3088
msgid "List the installed plugins."
3082
3089
msgstr ""
3083
3090
3084
#: bzrlib/builtins.py:4971
3091
#: bzrlib/builtins.py:5064
3085
3092
msgid ""
3086
3093
"This command displays the list of installed plugins including\n"
3087
3094
"version of plugin and a short description of each."
3088
3095
msgstr ""
3089
3096
3090
#: bzrlib/builtins.py:4974
3097
#: bzrlib/builtins.py:5067
3091
3098
msgid "--verbose shows the path where each plugin is located."
3092
3099
msgstr ""
3093
3100
3094
#: bzrlib/builtins.py:4976
3101
#: bzrlib/builtins.py:5069
3095
3102
msgid ""
3096
3103
"A plugin is an external component for Bazaar that extends the\n"
3097
3104
"revision control system, by adding or replacing code in Bazaar.\n"
3100
3107
"customizing log output."
3101
3108
msgstr ""
3102
3109
3103
#: bzrlib/builtins.py:4982
3110
#: bzrlib/builtins.py:5075
3104
3111
msgid ""
3105
3112
"See the Bazaar Plugin Guide <http://doc.bazaar.canonical.com/plugins/en/>\n"
3106
3113
"for further information on plugins including where to find them and how to\n"
3108
3115
"plugins using the Python programming language."
3109
3116
msgstr ""
3110
3117
3111
#: bzrlib/builtins.py:4998
3118
#: bzrlib/builtins.py:5091
3112
3119
msgid "Show testament (signing-form) of a revision."
3113
3120
msgstr ""
3114
3121
3115
#: bzrlib/builtins.py:5001
3122
#: bzrlib/builtins.py:5094
3116
3123
msgid "Produce long-format testament."
3117
3124
msgstr ""
3118
3125
3119
#: bzrlib/builtins.py:5003
3126
#: bzrlib/builtins.py:5096
3120
3127
msgid "Produce a strict-format testament."
3121
3128
msgstr ""
3122
3129
3123
#: bzrlib/builtins.py:5029
3130
#: bzrlib/builtins.py:5122
3124
3131
msgid "Show the origin of each line in a file."
3125
3132
msgstr ""
3126
3133
3127
#: bzrlib/builtins.py:5031
3134
#: bzrlib/builtins.py:5124
3128
3135
msgid ""
3129
3136
"This prints out the given file with an annotation on the left side\n"
3130
3137
"indicating which revision, author and date introduced the change."
3131
3138
msgstr ""
3132
3139
3133
#: bzrlib/builtins.py:5034
3140
#: bzrlib/builtins.py:5127
3134
3141
msgid ""
3135
3142
"If the origin is the same for a run of consecutive lines, it is\n"
3136
3143
"shown only at the top, unless the --all option is given."
3137
3144
msgstr ""
3138
3145
3139
#: bzrlib/builtins.py:5042
3146
#: bzrlib/builtins.py:5135
3140
3147
msgid "Show annotations on all lines."
3141
3148
msgstr ""
3142
3149
3143
#: bzrlib/builtins.py:5043
3150
#: bzrlib/builtins.py:5136
3144
3151
msgid "Show commit date in annotations."
3145
3152
msgstr ""
3146
3153
3147
#: bzrlib/builtins.py:5130
3154
#: bzrlib/builtins.py:5223
3148
3155
msgid "Cannot sign a range of non-revision-history revisions"
3149
3156
msgstr ""
3150
3157
3151
#: bzrlib/builtins.py:5142
3158
#: bzrlib/builtins.py:5235
3152
3159
msgid "Please supply either one revision, or a range."
3153
3160
msgstr ""
3154
3161
3155
#: bzrlib/builtins.py:5146
3162
#: bzrlib/builtins.py:5239
3156
3163
msgid ""
3157
3164
"Convert the current branch into a checkout of the supplied branch.\n"
3158
3165
"If no branch is supplied, rebind to the last bound location."
3159
3166
msgstr ""
3160
3167
3161
#: bzrlib/builtins.py:5149
3168
#: bzrlib/builtins.py:5242
3162
3169
msgid ""
3163
3170
"Once converted into a checkout, commits must succeed on the master branch\n"
3164
3171
"before they will be applied to the local branch."
3165
3172
msgstr ""
3166
3173
3167
#: bzrlib/builtins.py:5152
3174
#: bzrlib/builtins.py:5245
3168
3175
msgid ""
3169
3176
"Bound branches use the nickname of its master branch unless it is set\n"
3170
3177
"locally, in which case binding will update the local nickname to be\n"
3171
3178
"that of the master."
3172
3179
msgstr ""
3173
3180
3174
#: bzrlib/builtins.py:5167
3181
#: bzrlib/builtins.py:5260
3175
3182
msgid "No location supplied. This format does not remember old locations."
3176
3183
msgstr ""
3177
3184
3178
#: bzrlib/builtins.py:5172
3185
#: bzrlib/builtins.py:5265
3179
3186
msgid "Branch is already bound"
3180
3187
msgstr ""
3181
3188
3182
#: bzrlib/builtins.py:5174
3189
#: bzrlib/builtins.py:5267
3183
3190
msgid "No location supplied and no previous location known"
3184
3191
msgstr ""
3185
3192
3186
#: bzrlib/builtins.py:5180
3193
#: bzrlib/builtins.py:5273
3187
3194
msgid "These branches have diverged. Try merging, and then bind again."
3188
3195
msgstr ""
3189
3196
3190
#: bzrlib/builtins.py:5187
3197
#: bzrlib/builtins.py:5280
3191
3198
msgid "Convert the current checkout into a regular branch."
3192
3199
msgstr ""
3193
3200
3194
#: bzrlib/builtins.py:5189
3201
#: bzrlib/builtins.py:5282
3195
3202
msgid ""
3196
3203
"After unbinding, the local branch is considered independent and subsequent\n"
3197
3204
"commits will be local only."
3198
3205
msgstr ""
3199
3206
3200
#: bzrlib/builtins.py:5200
3207
#: bzrlib/builtins.py:5293
3201
3208
msgid "Local branch is not bound"
3202
3209
msgstr ""
3203
3210
3204
#: bzrlib/builtins.py:5204
3211
#: bzrlib/builtins.py:5297
3205
3212
msgid "Remove the last committed revision."
3206
3213
msgstr ""
3207
3214
3208
#: bzrlib/builtins.py:5206
3215
#: bzrlib/builtins.py:5299
3209
3216
msgid ""
3210
3217
"--verbose will print out what is being removed.\n"
3211
3218
"--dry-run will go through all the motions, but not actually\n"
3212
3219
"remove anything."
3213
3220
msgstr ""
3214
3221
3215
#: bzrlib/builtins.py:5210
3222
#: bzrlib/builtins.py:5303
3216
3223
msgid ""
3217
3224
"If --revision is specified, uncommit revisions to leave the branch at the\n"
3218
3225
"specified revision. For example, \"bzr uncommit -r 15\" will leave the\n"
3219
3226
"branch at revision 15."
3220
3227
msgstr ""
3221
3228
3222
#: bzrlib/builtins.py:5214
3229
#: bzrlib/builtins.py:5307
3223
3230
msgid ""
3224
3231
"Uncommit leaves the working tree ready for a new commit. The only change\n"
3225
3232
"it may make is to restore any pending merges that were present before\n"
3226
3233
"the commit."
3227
3234
msgstr ""
3228
3235
3229
#: bzrlib/builtins.py:5225
3236
#: bzrlib/builtins.py:5318
3230
3237
msgid "Don't actually make changes."
3231
3238
msgstr ""
3232
3239
3233
#: bzrlib/builtins.py:5226
3240
#: bzrlib/builtins.py:5319
3234
3241
msgid "Say yes to all questions."
3235
3242
msgstr ""
3236
3243
3237
#: bzrlib/builtins.py:5228
3244
#: bzrlib/builtins.py:5321
3238
3245
msgid "Keep tags that point to removed revisions."
3239
3246
msgstr ""
3240
3247
3241
#: bzrlib/builtins.py:5230
3248
#: bzrlib/builtins.py:5323
3242
3249
msgid "Only remove the commits from the local branch when in a checkout."
3243
3250
msgstr ""
3244
3251
3245
#: bzrlib/builtins.py:5279
3252
#: bzrlib/builtins.py:5372
3246
3253
msgid "No revisions to uncommit.\n"
3247
3254
msgstr ""
3248
3255
3249
#: bzrlib/builtins.py:5294
3256
#: bzrlib/builtins.py:5387
3250
3257
msgid "Dry-run, pretending to remove the above revisions.\n"
3251
3258
msgstr ""
3252
3259
3253
#: bzrlib/builtins.py:5297
3260
#: bzrlib/builtins.py:5390
3254
3261
msgid "The above revision(s) will be removed.\n"
3255
3262
msgstr ""
3256
3263
3257
#: bzrlib/builtins.py:5301
3264
#: bzrlib/builtins.py:5394
3258
3265
msgid "Uncommit these revisions"
3259
3266
msgstr ""
3260
3267
3261
#: bzrlib/builtins.py:5304
3268
#: bzrlib/builtins.py:5397
3262
3269
msgid "Canceled\n"
3263
3270
msgstr ""
3264
3271
3265
#: bzrlib/builtins.py:5311
3272
#: bzrlib/builtins.py:5404
3266
3273
#, python-format
3267
3274
msgid ""
3268
3275
"You can restore the old tip by running:\n"
3269
3276
" bzr pull . -r revid:%s\n"
3270
3277
msgstr ""
3271
3278
3272
#: bzrlib/builtins.py:5316
3279
#: bzrlib/builtins.py:5409
3273
3280
msgid "Break a dead lock."
3274
3281
msgstr ""
3275
3282
3276
#: bzrlib/builtins.py:5318
3283
#: bzrlib/builtins.py:5411
3277
3284
msgid ""
3278
3285
"This command breaks a lock on a repository, branch, working directory or\n"
3279
3286
"config file."
3280
3287
msgstr ""
3281
3288
3282
#: bzrlib/builtins.py:5321
3289
#: bzrlib/builtins.py:5414
3283
3290
msgid ""
3284
3291
"CAUTION: Locks should only be broken when you are sure that the process\n"
3285
3292
"holding the lock has been stopped."
3286
3293
msgstr ""
3287
3294
3288
#: bzrlib/builtins.py:5324
3295
#: bzrlib/builtins.py:5417
3289
3296
msgid ""
3290
3297
"You can get information on what locks are open via the 'bzr info\n"
3291
3298
"[location]' command."
3292
3299
msgstr ""
3293
3300
3294
#: bzrlib/builtins.py:5327
3301
#: bzrlib/builtins.py:5420
3295
3302
msgid ""
3296
3303
":Examples:\n"
3297
3304
" bzr break-lock\n"
3299
3306
" bzr break-lock --conf ~/.bazaar"
3300
3307
msgstr ""
3301
3308
3302
#: bzrlib/builtins.py:5336
3309
#: bzrlib/builtins.py:5429
3303
3310
msgid "LOCATION is the directory where the config lock is."
3304
3311
msgstr ""
3305
3312
3306
#: bzrlib/builtins.py:5338
3313
#: bzrlib/builtins.py:5431
3307
3314
msgid "Do not ask for confirmation before breaking the lock."
3308
3315
msgstr ""
3309
3316
3310
#: bzrlib/builtins.py:5373
3317
#: bzrlib/builtins.py:5466
3311
3318
msgid "The Bazaar smart server protocol over TCP. (default port: 4155)"
3312
3319
msgstr ""
3313
3320
3314
#: bzrlib/builtins.py:5374
3321
#: bzrlib/builtins.py:5467
3315
3322
msgid "Run the bzr server."
3316
3323
msgstr ""
3317
3324
3318
#: bzrlib/builtins.py:5380
3325
#: bzrlib/builtins.py:5473
3319
3326
msgid "Serve on stdin/out for use from inetd or sshd."
3320
3327
msgstr ""
3321
3328
3322
#: bzrlib/builtins.py:5381
3329
#: bzrlib/builtins.py:5474
3323
3330
msgid "protocol"
3324
3331
msgstr ""
3325
3332
3326
#: bzrlib/builtins.py:5382
3333
#: bzrlib/builtins.py:5475
3327
3334
msgid "Protocol to serve."
3328
3335
msgstr ""
3329
3336
3330
#: bzrlib/builtins.py:5386
3337
#: bzrlib/builtins.py:5479
3331
3338
msgid ""
3332
3339
"Listen for connections on nominated port of the form [hostname:]portnumber. "
3333
3340
"Passing 0 as the port number will result in a dynamically allocated port. "
3334
3341
"The default port depends on the protocol."
3335
3342
msgstr ""
3336
3343
3337
#: bzrlib/builtins.py:5392
3344
#: bzrlib/builtins.py:5485
3338
3345
msgid "Serve contents of this directory."
3339
3346
msgstr ""
3340
3347
3341
#: bzrlib/builtins.py:5394
3348
#: bzrlib/builtins.py:5487
3342
3349
msgid ""
3343
3350
"By default the server is a readonly server. Supplying --allow-writes "
3344
3351
"enables write access to the contents of the served directory and below. "
3347
3354
"uncontrolled write access to your file system."
3348
3355
msgstr ""
3349
3356
3350
#: bzrlib/builtins.py:5403
3357
#: bzrlib/builtins.py:5496
3351
3358
msgid "Override the default idle client timeout (5min)."
3352
3359
msgstr ""
3353
3360
3354
#: bzrlib/builtins.py:5453
3361
#: bzrlib/builtins.py:5546
3355
3362
msgid "Combine a tree into its containing tree."
3356
3363
msgstr ""
3357
3364
3358
#: bzrlib/builtins.py:5455
3365
#: bzrlib/builtins.py:5548
3359
3366
msgid "This command requires the target tree to be in a rich-root format."
3360
3367
msgstr ""
3361
3368
3362
#: bzrlib/builtins.py:5457
3369
#: bzrlib/builtins.py:5550
3363
3370
msgid ""
3364
3371
"The TREE argument should be an independent tree, inside another tree, but\n"
3365
3372
"not part of it. (Such trees can be produced by \"bzr split\", but also by\n"
3366
3373
"running \"bzr branch\" with the target inside a tree.)"
3367
3374
msgstr ""
3368
3375
3369
#: bzrlib/builtins.py:5461
3376
#: bzrlib/builtins.py:5554
3370
3377
msgid ""
3371
3378
"The result is a combined tree, with the subtree no longer an independent\n"
3372
3379
"part. This is marked as a merge of the subtree into the containing tree,\n"
3373
3380
"and all history is preserved."
3374
3381
msgstr ""
3375
3382
3376
#: bzrlib/builtins.py:5479
3383
#: bzrlib/builtins.py:5572
3377
3384
#, python-format
3378
3385
msgid ""
3379
3386
"Can't join trees because %s doesn't support rich root data.\n"
3380
3387
"You can use bzr upgrade on the repository."
3381
3388
msgstr ""
3382
3389
3383
#: bzrlib/builtins.py:5489 bzrlib/builtins.py:5495
3390
#: bzrlib/builtins.py:5582 bzrlib/builtins.py:5588
3384
3391
msgid "Cannot join {0}. {1}"
3385
3392
msgstr ""
3386
3393
3387
#: bzrlib/builtins.py:5499
3394
#: bzrlib/builtins.py:5592
3388
3395
msgid "Split a subdirectory of a tree into a separate tree."
3389
3396
msgstr ""
3390
3397
3391
#: bzrlib/builtins.py:5501
3398
#: bzrlib/builtins.py:5594
3392
3399
msgid ""
3393
3400
"This command will produce a target tree in a format that supports\n"
3394
3401
"rich roots, like 'rich-root' or 'rich-root-pack'. These formats cannot be\n"
3395
3402
"converted into earlier formats like 'dirstate-tags'."
3396
3403
msgstr ""
3397
3404
3398
#: bzrlib/builtins.py:5505
3405
#: bzrlib/builtins.py:5598
3399
3406
msgid ""
3400
3407
"The TREE argument should be a subdirectory of a working tree. That\n"
3401
3408
"subdirectory will be converted into an independent tree, with its own\n"
3402
3409
"branch. Commits in the top-level tree will not apply to the new subtree."
3403
3410
msgstr ""
3404
3411
3405
#: bzrlib/builtins.py:5585
3412
#: bzrlib/builtins.py:5678
3406
3413
msgid "No submit branch specified or known"
3407
3414
msgstr ""
3408
3415
3409
#: bzrlib/builtins.py:5593 bzrlib/send.py:108
3416
#: bzrlib/builtins.py:5686 bzrlib/send.py:108
3410
3417
msgid "No public branch specified or known"
3411
3418
msgstr ""
3412
3419
3413
#: bzrlib/builtins.py:5598
3420
#: bzrlib/builtins.py:5691
3414
3421
msgid "bzr merge-directive takes at most two one revision identifiers"
3415
3422
msgstr ""
3416
3423
3417
#: bzrlib/builtins.py:5607
3424
#: bzrlib/builtins.py:5700
3418
3425
msgid "No revisions to bundle."
3419
3426
msgstr ""
3420
3427
3421
#: bzrlib/builtins.py:5626
3428
#: bzrlib/builtins.py:5719
3422
3429
msgid "Mail or create a merge-directive for submitting changes."
3423
3430
msgstr ""
3424
3431
3425
#: bzrlib/builtins.py:5628
3432
#: bzrlib/builtins.py:5721
3426
3433
msgid "A merge directive provides many things needed for requesting merges:"
3427
3434
msgstr ""
3428
3435
3429
#: bzrlib/builtins.py:5630
3436
#: bzrlib/builtins.py:5723
3430
3437
msgid "* A machine-readable description of the merge to perform"
3431
3438
msgstr ""
3432
3439
3433
#: bzrlib/builtins.py:5632
3440
#: bzrlib/builtins.py:5725
3434
3441
msgid "* An optional patch that is a preview of the changes requested"
3435
3442
msgstr ""
3436
3443
3437
#: bzrlib/builtins.py:5634
3444
#: bzrlib/builtins.py:5727
3438
3445
msgid ""
3439
3446
"* An optional bundle of revision data, so that the changes can be applied\n"
3440
3447
" directly from the merge directive, without retrieving data from a\n"
3441
3448
" branch."
3442
3449
msgstr ""
3443
3450
3444
#: bzrlib/builtins.py:5638
3451
#: bzrlib/builtins.py:5731
3445
3452
msgid ""
3446
3453
"`bzr send` creates a compact data set that, when applied using bzr\n"
3447
3454
"merge, has the same effect as merging from the source branch. "
3448
3455
msgstr ""
3449
3456
3450
#: bzrlib/builtins.py:5641
3457
#: bzrlib/builtins.py:5734
3451
3458
msgid ""
3452
3459
"By default the merge directive is self-contained and can be applied to any\n"
3453
3460
"branch containing submit_branch in its ancestory without needing access to\n"
3454
3461
"the source branch."
3455
3462
msgstr ""
3456
3463
3457
#: bzrlib/builtins.py:5645
3464
#: bzrlib/builtins.py:5738
3458
3465
msgid ""
3459
3466
"If --no-bundle is specified, then Bazaar doesn't send the contents of the\n"
3460
3467
"revisions, but only a structured request to merge from the\n"
3463
3470
"included if known, so that people can check it later."
3464
3471
msgstr ""
3465
3472
3466
#: bzrlib/builtins.py:5651
3473
#: bzrlib/builtins.py:5744
3467
3474
msgid ""
3468
3475
"The submit branch defaults to the parent of the source branch, but can be\n"
3469
3476
"overridden. Both submit branch and public branch will be remembered in\n"
3472
3479
"be changed using --from."
3473
3480
msgstr ""
3474
3481
3475
#: bzrlib/builtins.py:5657
3482
#: bzrlib/builtins.py:5750
3476
3483
msgid ""
3477
3484
"Both the submit branch and the public branch follow the usual behavior with\n"
3478
3485
"respect to --remember: If there is no default location set, the first send\n"
3481
3488
"--remember. The value will only be saved if the location can be accessed."
3482
3489
msgstr ""
3483
3490
3484
#: bzrlib/builtins.py:5663
3491
#: bzrlib/builtins.py:5756
3485
3492
msgid ""
3486
3493
"In order to calculate those changes, bzr must analyse the submit branch.\n"
3487
3494
"Therefore it is most efficient for the submit branch to be a local mirror.\n"
3489
3496
"in the merge directive."
3490
3497
msgstr ""
3491
3498
3492
#: bzrlib/builtins.py:5668
3499
#: bzrlib/builtins.py:5761
3493
3500
msgid ""
3494
3501
"The default behaviour is to send the merge directive by mail, unless -o is\n"
3495
3502
"given, in which case it is sent to a file."
3496
3503
msgstr ""
3497
3504
3498
#: bzrlib/builtins.py:5671
3505
#: bzrlib/builtins.py:5764
3499
3506
msgid ""
3500
3507
"Mail is sent using your preferred mail program. This should be transparent\n"
3501
3508
"on Windows (it uses MAPI). On Unix, it requires the xdg-email utility.\n"
3502
3509
"If the preferred client can't be found (or used), your editor will be used."
3503
3510
msgstr ""
3504
3511
3505
#: bzrlib/builtins.py:5675
3512
#: bzrlib/builtins.py:5768
3506
3513
msgid ""
3507
3514
"To use a specific mail program, set the mail_client configuration option.\n"
3508
3515
"(For Thunderbird 1.5, this works around some bugs.) Supported values for\n"
3514
3521
"supported clients."
3515
3522
msgstr ""
3516
3523
3517
#: bzrlib/builtins.py:5682
3524
#: bzrlib/builtins.py:5775
3518
3525
msgid ""
3519
3526
"If mail is being sent, a to address is required. This can be supplied\n"
3520
3527
"either on the commandline, by setting the submit_to configuration\n"
3522
3529
"in the submit branch."
3523
3530
msgstr ""
3524
3531
3525
#: bzrlib/builtins.py:5687
3532
#: bzrlib/builtins.py:5780
3526
3533
msgid ""
3527
3534
"Two formats are currently supported: \"4\" uses revision bundle format 4 "
3528
3535
"and\n"
3532
3539
"format 1. It is compatible with Bazaar 0.12 - 0.18."
3533
3540
msgstr ""
3534
3541
3535
#: bzrlib/builtins.py:5693
3542
#: bzrlib/builtins.py:5786
3536
3543
msgid ""
3537
3544
"The merge directives created by bzr send may be applied using bzr merge or\n"
3538
3545
"bzr pull by specifying a file containing a merge directive as the location."
3539
3546
msgstr ""
3540
3547
3541
#: bzrlib/builtins.py:5696
3548
#: bzrlib/builtins.py:5789
3542
3549
msgid ""
3543
3550
"bzr send makes extensive use of public locations to map local locations "
3544
3551
"into\n"
3546
3553
"set them, and use `bzr info` to display them."
3547
3554
msgstr ""
3548
3555
3549
#: bzrlib/builtins.py:5720
3556
#: bzrlib/builtins.py:5813
3550
3557
msgid "Write merge directive to this file or directory; use - for stdout."
3551
3558
msgstr ""
3552
3559
3553
#: bzrlib/builtins.py:5724
3560
#: bzrlib/builtins.py:5817
3554
3561
msgid ""
3555
3562
"Refuse to send if there are uncommitted changes in the working tree, --no-"
3556
3563
"strict disables the check."
3557
3564
msgstr ""
3558
3565
3559
#: bzrlib/builtins.py:5726
3566
#: bzrlib/builtins.py:5819
3560
3567
msgid "Mail the request to this address."
3561
3568
msgstr ""
3562
3569
3563
#: bzrlib/builtins.py:5730
3570
#: bzrlib/builtins.py:5823
3564
3571
msgid "Body for the email."
3565
3572
msgstr ""
3566
3573
3567
#: bzrlib/builtins.py:5783
3574
#: bzrlib/builtins.py:5876
3568
3575
msgid "Do not include a bundle in the merge directive."
3569
3576
msgstr ""
3570
3577
3571
#: bzrlib/builtins.py:5784
3578
#: bzrlib/builtins.py:5877
3572
3579
msgid "Do not include a preview patch in the merge directive."
3573
3580
msgstr ""
3574
3581
3575
#: bzrlib/builtins.py:5787
3582
#: bzrlib/builtins.py:5880
3576
3583
msgid "Remember submit and public branch."
3577
3584
msgstr ""
3578
3585
3579
#: bzrlib/builtins.py:5789
3586
#: bzrlib/builtins.py:5882
3580
3587
msgid ""
3581
3588
"Branch to generate the submission from, rather than the one containing the "
3582
3589
"working directory."
3583
3590
msgstr ""
3584
3591
3585
#: bzrlib/builtins.py:5799 bzrlib/cmd_version_info.py:76
3592
#: bzrlib/builtins.py:5892 bzrlib/cmd_version_info.py:76
3586
3593
msgid "format"
3587
3594
msgstr ""
3588
3595
3589
#: bzrlib/builtins.py:5800
3596
#: bzrlib/builtins.py:5893
3590
3597
msgid "Use the specified output format."
3591
3598
msgstr ""
3592
3599
3593
#: bzrlib/builtins.py:5822
3600
#: bzrlib/builtins.py:5915
3594
3601
msgid "Create, remove or modify a tag naming a revision."
3595
3602
msgstr ""
3596
3603
3597
#: bzrlib/builtins.py:5824
3604
#: bzrlib/builtins.py:5917
3598
3605
msgid ""
3599
3606
"Tags give human-meaningful names to revisions. Commands that take a -r\n"
3600
3607
"(--revision) option can be given -rtag:X, where X is any previously\n"
3601
3608
"created tag."
3602
3609
msgstr ""
3603
3610
3604
#: bzrlib/builtins.py:5828
3611
#: bzrlib/builtins.py:5921
3605
3612
msgid ""
3606
3613
"Tags are stored in the branch. Tags are copied from one branch to another\n"
3607
3614
"along when you branch, push, pull or merge."
3608
3615
msgstr ""
3609
3616
3610
#: bzrlib/builtins.py:5831
3617
#: bzrlib/builtins.py:5924
3611
3618
msgid ""
3612
3619
"It is an error to give a tag name that already exists unless you pass\n"
3613
3620
"--force, in which case the tag is moved to point to the new revision."
3614
3621
msgstr ""
3615
3622
3616
#: bzrlib/builtins.py:5834
3623
#: bzrlib/builtins.py:5927
3617
3624
msgid ""
3618
3625
"To rename a tag (change the name but keep it on the same revsion), run "
3619
3626
"``bzr\n"
3620
3627
"tag new-name -r tag:old-name`` and then ``bzr tag --delete oldname``."
3621
3628
msgstr ""
3622
3629
3623
#: bzrlib/builtins.py:5837
3630
#: bzrlib/builtins.py:5930
3624
3631
msgid ""
3625
3632
"If no tag name is specified it will be determined through the \n"
3626
3633
"'automatic_tag_name' hook. This can e.g. be used to automatically tag\n"
3628
3635
"details."
3629
3636
msgstr ""
3630
3637
3631
#: bzrlib/builtins.py:5847
3638
#: bzrlib/builtins.py:5940
3632
3639
msgid "Delete this tag rather than placing it."
3633
3640
msgstr ""
3634
3641
3635
#: bzrlib/builtins.py:5850
3642
#: bzrlib/builtins.py:5943
3636
3643
msgid "Branch in which to place the tag."
3637
3644
msgstr ""
3638
3645
3639
#: bzrlib/builtins.py:5852
3646
#: bzrlib/builtins.py:5945
3640
3647
msgid "Replace existing tags."
3641
3648
msgstr ""
3642
3649
3643
#: bzrlib/builtins.py:5867
3650
#: bzrlib/builtins.py:5960
3644
3651
msgid "No tag specified to delete."
3645
3652
msgstr ""
3646
3653
3647
#: bzrlib/builtins.py:5869
3654
#: bzrlib/builtins.py:5962
3648
3655
#, python-format
3649
3656
msgid "Deleted tag %s."
3650
3657
msgstr ""
3651
3658
3652
#: bzrlib/builtins.py:5883
3659
#: bzrlib/builtins.py:5976
3653
3660
msgid "Please specify a tag name."
3654
3661
msgstr ""
3655
3662
3656
#: bzrlib/builtins.py:5891
3663
#: bzrlib/builtins.py:5984
3657
3664
#, python-format
3658
3665
msgid "Tag %s already exists for that revision."
3659
3666
msgstr ""
3660
3667
3661
#: bzrlib/builtins.py:5895
3668
#: bzrlib/builtins.py:5988
3662
3669
#, python-format
3663
3670
msgid "Created tag %s."
3664
3671
msgstr ""
3665
3672
3666
#: bzrlib/builtins.py:5897
3673
#: bzrlib/builtins.py:5990
3667
3674
#, python-format
3668
3675
msgid "Updated tag %s."
3669
3676
msgstr ""
3670
3677
3671
#: bzrlib/builtins.py:5901
3678
#: bzrlib/builtins.py:5994
3672
3679
msgid "List tags."
3673
3680
msgstr ""
3674
3681
3675
#: bzrlib/builtins.py:5903
3682
#: bzrlib/builtins.py:5996
3676
3683
msgid ""
3677
3684
"This command shows a table of tag names and the revisions they reference."
3678
3685
msgstr ""
3679
3686
3680
#: bzrlib/builtins.py:5909
3687
#: bzrlib/builtins.py:6002
3681
3688
msgid "Branch whose tags should be displayed."
3682
3689
msgstr ""
3683
3690
3684
#: bzrlib/builtins.py:5911
3691
#: bzrlib/builtins.py:6004
3685
3692
msgid "Sort tags by different criteria."
3686
3693
msgstr ""
3687
3694
3688
#: bzrlib/builtins.py:5911
3695
#: bzrlib/builtins.py:6004
3689
3696
msgid "Sorting"
3690
3697
msgstr ""
3691
3698
3692
#: bzrlib/builtins.py:5980
3699
#: bzrlib/builtins.py:6073
3693
3700
msgid "Reconfigure the type of a bzr directory."
3694
3701
msgstr ""
3695
3702
3696
#: bzrlib/builtins.py:5982
3703
#: bzrlib/builtins.py:6075
3697
3704
msgid "A target configuration must be specified."
3698
3705
msgstr ""
3699
3706
3700
#: bzrlib/builtins.py:5984
3707
#: bzrlib/builtins.py:6077
3701
3708
msgid ""
3702
3709
"For checkouts, the bind-to location will be auto-detected if not specified.\n"
3703
3710
"The order of preference is\n"
3708
3715
"If none of these is available, --bind-to must be specified."
3709
3716
msgstr ""
3710
3717
3711
#: bzrlib/builtins.py:5998
3718
#: bzrlib/builtins.py:6091
3712
3719
msgid "Tree type"
3713
3720
msgstr ""
3714
3721
3715
#: bzrlib/builtins.py:5999
3722
#: bzrlib/builtins.py:6092
3716
3723
msgid "The relation between branch and tree."
3717
3724
msgstr ""
3718
3725
3719
#: bzrlib/builtins.py:6001
3726
#: bzrlib/builtins.py:6094
3720
3727
msgid "Reconfigure to be an unbound branch with no working tree."
3721
3728
msgstr ""
3722
3729
3723
#: bzrlib/builtins.py:6002
3730
#: bzrlib/builtins.py:6095
3724
3731
msgid "Reconfigure to be an unbound branch with a working tree."
3725
3732
msgstr ""
3726
3733
3727
#: bzrlib/builtins.py:6003
3734
#: bzrlib/builtins.py:6096
3728
3735
msgid "Reconfigure to be a bound branch with a working tree."
3729
3736
msgstr ""
3730
3737
3731
#: bzrlib/builtins.py:6004
3738
#: bzrlib/builtins.py:6097
3732
3739
msgid "Reconfigure to be a lightweight checkout (with no local history)."
3733
3740
msgstr ""
3734
3741
3735
#: bzrlib/builtins.py:6009
3742
#: bzrlib/builtins.py:6102
3736
3743
msgid "Repository type"
3737
3744
msgstr ""
3738
3745
3739
#: bzrlib/builtins.py:6010
3746
#: bzrlib/builtins.py:6103
3740
3747
msgid "Location fo the repository."
3741
3748
msgstr ""
3742
3749
3743
#: bzrlib/builtins.py:6012
3750
#: bzrlib/builtins.py:6105
3744
3751
msgid ""
3745
3752
"Reconfigure to be a standalone branch (i.e. stop using shared repository)."
3746
3753
msgstr ""
3747
3754
3748
#: bzrlib/builtins.py:6014
3755
#: bzrlib/builtins.py:6107
3749
3756
msgid "Reconfigure to use a shared repository."
3750
3757
msgstr ""
3751
3758
3752
#: bzrlib/builtins.py:6018
3759
#: bzrlib/builtins.py:6111
3753
3760
msgid "Trees in Repository"
3754
3761
msgstr ""
3755
3762
3756
#: bzrlib/builtins.py:6019
3763
#: bzrlib/builtins.py:6112
3757
3764
msgid "Whether new branches in the repository have trees."
3758
3765
msgstr ""
3759
3766
3760
#: bzrlib/builtins.py:6021
3767
#: bzrlib/builtins.py:6114
3761
3768
msgid ""
3762
3769
"Reconfigure repository to create working trees on branches by default."
3763
3770
msgstr ""
3764
3771
3765
#: bzrlib/builtins.py:6023
3772
#: bzrlib/builtins.py:6116
3766
3773
msgid ""
3767
3774
"Reconfigure repository to not create working trees on branches by default."
3768
3775
msgstr ""
3769
3776
3770
#: bzrlib/builtins.py:6026
3777
#: bzrlib/builtins.py:6119
3771
3778
msgid "Branch to bind checkout to."
3772
3779
msgstr ""
3773
3780
3774
#: bzrlib/builtins.py:6028
3781
#: bzrlib/builtins.py:6121
3775
3782
msgid "Perform reconfiguration even if local changes will be lost."
3776
3783
msgstr ""
3777
3784
3778
#: bzrlib/builtins.py:6031
3785
#: bzrlib/builtins.py:6124
3779
3786
msgid "Reconfigure a branch to be stacked on another branch."
3780
3787
msgstr ""
3781
3788
3782
#: bzrlib/builtins.py:6035
3789
#: bzrlib/builtins.py:6128
3783
3790
msgid ""
3784
3791
"Reconfigure a branch to be unstacked. This may require copying substantial "
3785
3792
"data into it."
3786
3793
msgstr ""
3787
3794
3788
#: bzrlib/builtins.py:6045
3795
#: bzrlib/builtins.py:6138
3789
3796
msgid "Can't use both --stacked-on and --unstacked"
3790
3797
msgstr ""
3791
3798
3792
#: bzrlib/builtins.py:6059
3799
#: bzrlib/builtins.py:6152
3793
3800
msgid "No target configuration specified"
3794
3801
msgstr ""
3795
3802
3796
#: bzrlib/builtins.py:6094
3803
#: bzrlib/builtins.py:6187
3797
3804
msgid "Set the branch of a checkout and update."
3798
3805
msgstr ""
3799
3806
3800
#: bzrlib/builtins.py:6096
3807
#: bzrlib/builtins.py:6189
3801
3808
msgid ""
3802
3809
"For lightweight checkouts, this changes the branch being referenced.\n"
3803
3810
"For heavyweight checkouts, this checks that there are no local commits\n"
3805
3812
"of the new location and binds to it."
3806
3813
msgstr ""
3807
3814
3808
#: bzrlib/builtins.py:6101
3815
#: bzrlib/builtins.py:6194
3809
3816
msgid ""
3810
3817
"In both cases, the working tree is updated and uncommitted changes\n"
3811
3818
"are merged. The user can commit or revert these as they desire."
3812
3819
msgstr ""
3813
3820
3814
#: bzrlib/builtins.py:6104
3821
#: bzrlib/builtins.py:6197
3815
3822
msgid "Pending merges need to be committed or reverted before using switch."
3816
3823
msgstr ""
3817
3824
3818
#: bzrlib/builtins.py:6106
3825
#: bzrlib/builtins.py:6199
3819
3826
msgid ""
3820
3827
"The path to the branch to switch to can be specified relative to the parent\n"
3821
3828
"directory of the current branch. For example, if you are currently in a\n"
3823
3830
"/path/to/newbranch."
3824
3831
msgstr ""
3825
3832
3826
#: bzrlib/builtins.py:6111
3833
#: bzrlib/builtins.py:6204
3827
3834
msgid ""
3828
3835
"Bound branches use the nickname of its master branch unless it is set\n"
3829
3836
"locally, in which case switching will update the local nickname to be\n"
3830
3837
"that of the master."
3831
3838
msgstr ""
3832
3839
3833
#: bzrlib/builtins.py:6119
3840
#: bzrlib/builtins.py:6212
3834
3841
msgid "Switch even if local commits will be lost."
3835
3842
msgstr ""
3836
3843
3837
#: bzrlib/builtins.py:6122
3844
#: bzrlib/builtins.py:6215
3838
3845
msgid "Create the target branch from this one before switching to it."
3839
3846
msgstr ""
3840
3847
3841
#: bzrlib/builtins.py:6134
3848
#: bzrlib/builtins.py:6229
3842
3849
msgid "You must supply either a revision or a location"
3843
3850
msgstr ""
3844
3851
3845
#: bzrlib/builtins.py:6145
3852
#: bzrlib/builtins.py:6242
3846
3853
msgid "cannot create branch without source branch"
3847
3854
msgstr ""
3848
3855
3849
#: bzrlib/builtins.py:6209
3856
#: bzrlib/builtins.py:6262
3850
3857
msgid "Manage filtered views."
3851
3858
msgstr ""
3852
3859
3853
#: bzrlib/builtins.py:6211
3860
#: bzrlib/builtins.py:6264
3854
3861
msgid ""
3855
3862
"Views provide a mask over the tree so that users can focus on\n"
3856
3863
"a subset of a tree when doing their work. After creating a view,\n"
3860
3867
"must be within the current view."
3861
3868
msgstr ""
3862
3869
3863
#: bzrlib/builtins.py:6218
3870
#: bzrlib/builtins.py:6271
3864
3871
msgid ""
3865
3872
"In most cases, a view has a short life-span: it is created to make\n"
3866
3873
"a selected change and is deleted once that change is committed.\n"
3868
3875
"and switch between them."
3869
3876
msgstr ""
3870
3877
3871
#: bzrlib/builtins.py:6223
3878
#: bzrlib/builtins.py:6276
3872
3879
msgid ""
3873
3880
"To disable the current view without deleting it, you can switch to\n"
3874
3881
"the pseudo view called ``off``. This can be useful when you need\n"
3876
3883
"want to switch back to your view after that."
3877
3884
msgstr ""
3878
3885
3879
#: bzrlib/builtins.py:6228
3886
#: bzrlib/builtins.py:6281
3880
3887
msgid ""
3881
3888
":Examples:\n"
3882
3889
" To define the current view::"
3883
3890
msgstr ""
3884
3891
3885
#: bzrlib/builtins.py:6231
3892
#: bzrlib/builtins.py:6284
3886
3893
msgid " bzr view file1 dir1 ..."
3887
3894
msgstr ""
3888
3895
3889
#: bzrlib/builtins.py:6233
3896
#: bzrlib/builtins.py:6286
3890
3897
msgid " To list the current view::"
3891
3898
msgstr ""
3892
3899
3893
#: bzrlib/builtins.py:6235
3900
#: bzrlib/builtins.py:6288
3894
3901
msgid " bzr view"
3895
3902
msgstr ""
3896
3903
3897
#: bzrlib/builtins.py:6237
3904
#: bzrlib/builtins.py:6290
3898
3905
msgid " To delete the current view::"
3899
3906
msgstr ""
3900
3907
3901
#: bzrlib/builtins.py:6239
3908
#: bzrlib/builtins.py:6292
3902
3909
msgid " bzr view --delete"
3903
3910
msgstr ""
3904
3911
3905
#: bzrlib/builtins.py:6241
3912
#: bzrlib/builtins.py:6294
3906
3913
msgid " To disable the current view without deleting it::"
3907
3914
msgstr ""
3908
3915
3909
#: bzrlib/builtins.py:6243
3916
#: bzrlib/builtins.py:6296
3910
3917
msgid " bzr view --switch off"
3911
3918
msgstr ""
3912
3919
3913
#: bzrlib/builtins.py:6245
3920
#: bzrlib/builtins.py:6298
3914
3921
msgid " To define a named view and switch to it::"
3915
3922
msgstr ""
3916
3923
3917
#: bzrlib/builtins.py:6247
3924
#: bzrlib/builtins.py:6300
3918
3925
msgid " bzr view --name view-name file1 dir1 ..."
3919
3926
msgstr ""
3920
3927
3921
#: bzrlib/builtins.py:6249
3928
#: bzrlib/builtins.py:6302
3922
3929
msgid " To list a named view::"
3923
3930
msgstr ""
3924
3931
3925
#: bzrlib/builtins.py:6251
3932
#: bzrlib/builtins.py:6304
3926
3933
msgid " bzr view --name view-name"
3927
3934
msgstr ""
3928
3935
3929
#: bzrlib/builtins.py:6253
3936
#: bzrlib/builtins.py:6306
3930
3937
msgid " To delete a named view::"
3931
3938
msgstr ""
3932
3939
3933
#: bzrlib/builtins.py:6255
3940
#: bzrlib/builtins.py:6308
3934
3941
msgid " bzr view --name view-name --delete"
3935
3942
msgstr ""
3936
3943
3937
#: bzrlib/builtins.py:6257
3944
#: bzrlib/builtins.py:6310
3938
3945
msgid " To switch to a named view::"
3939
3946
msgstr ""
3940
3947
3941
#: bzrlib/builtins.py:6259
3948
#: bzrlib/builtins.py:6312
3942
3949
msgid " bzr view --switch view-name"
3943
3950
msgstr ""
3944
3951
3945
#: bzrlib/builtins.py:6261
3952
#: bzrlib/builtins.py:6314
3946
3953
msgid " To list all views defined::"
3947
3954
msgstr ""
3948
3955
3949
#: bzrlib/builtins.py:6263
3956
#: bzrlib/builtins.py:6316
3950
3957
msgid " bzr view --all"
3951
3958
msgstr ""
3952
3959
3953
#: bzrlib/builtins.py:6265
3960
#: bzrlib/builtins.py:6318
3954
3961
msgid " To delete all views::"
3955
3962
msgstr ""
3956
3963
3957
#: bzrlib/builtins.py:6267
3964
#: bzrlib/builtins.py:6320
3958
3965
msgid " bzr view --delete --all"
3959
3966
msgstr ""
3960
3967
3961
#: bzrlib/builtins.py:6274
3968
#: bzrlib/builtins.py:6327
3962
3969
msgid "Apply list or delete action to all views."
3963
3970
msgstr ""
3964
3971
3965
#: bzrlib/builtins.py:6277
3972
#: bzrlib/builtins.py:6330
3966
3973
msgid "Delete the view."
3967
3974
msgstr ""
3968
3975
3969
#: bzrlib/builtins.py:6280
3976
#: bzrlib/builtins.py:6333
3970
3977
msgid "Name of the view to define, list or delete."
3971
3978
msgstr ""
3972
3979
3973
#: bzrlib/builtins.py:6284
3980
#: bzrlib/builtins.py:6337
3974
3981
msgid "Name of the view to switch to."
3975
3982
msgstr ""
3976
3983
3977
#: bzrlib/builtins.py:6303
3984
#: bzrlib/builtins.py:6356
3978
3985
msgid "Both --delete and a file list specified"
3979
3986
msgstr ""
3980
3987
3981
#: bzrlib/builtins.py:6306
3988
#: bzrlib/builtins.py:6359
3982
3989
msgid "Both --delete and --switch specified"
3983
3990
msgstr ""
3984
3991
3985
#: bzrlib/builtins.py:6309
3992
#: bzrlib/builtins.py:6362
3986
3993
msgid "Deleted all views.\n"
3987
3994
msgstr ""
3988
3995
3989
#: bzrlib/builtins.py:6311
3996
#: bzrlib/builtins.py:6364
3990
3997
msgid "No current view to delete"
3991
3998
msgstr ""
3992
3999
3993
#: bzrlib/builtins.py:6314
4000
#: bzrlib/builtins.py:6367
3994
4001
#, python-format
3995
4002
msgid "Deleted '%s' view.\n"
3996
4003
msgstr ""
3997
4004
3998
#: bzrlib/builtins.py:6318
4005
#: bzrlib/builtins.py:6371
3999
4006
msgid "Both --switch and a file list specified"
4000
4007
msgstr ""
4001
4008
4002
#: bzrlib/builtins.py:6321
4009
#: bzrlib/builtins.py:6374
4003
4010
msgid "Both --switch and --all specified"
4004
4011
msgstr ""
4005
4012
4006
#: bzrlib/builtins.py:6324
4013
#: bzrlib/builtins.py:6377
4007
4014
msgid "No current view to disable"
4008
4015
msgstr ""
4009
4016
4010
#: bzrlib/builtins.py:6326
4017
#: bzrlib/builtins.py:6379
4011
4018
#, python-format
4012
4019
msgid "Disabled '%s' view.\n"
4013
4020
msgstr ""
4014
4021
4015
#: bzrlib/builtins.py:6330 bzrlib/builtins.py:6352
4022
#: bzrlib/builtins.py:6383 bzrlib/builtins.py:6405
4016
4023
msgid "Using '{0}' view: {1}\n"
4017
4024
msgstr ""
4018
4025
4019
#: bzrlib/builtins.py:6333
4026
#: bzrlib/builtins.py:6386
4020
4027
msgid "Views defined:\n"
4021
4028
msgstr ""
4022
4029
4023
#: bzrlib/builtins.py:6342
4030
#: bzrlib/builtins.py:6395
4024
4031
msgid "No views defined.\n"
4025
4032
msgstr ""
4026
4033
4027
#: bzrlib/builtins.py:6349
4034
#: bzrlib/builtins.py:6402
4028
4035
msgid "Cannot change the 'off' pseudo view"
4029
4036
msgstr ""
4030
4037
4031
#: bzrlib/builtins.py:6357
4038
#: bzrlib/builtins.py:6410
4032
4039
msgid "No current view.\n"
4033
4040
msgstr ""
4034
4041
4035
#: bzrlib/builtins.py:6360
4042
#: bzrlib/builtins.py:6413
4036
4043
msgid "'{0}' view is: {1}\n"
4037
4044
msgstr ""
4038
4045
4039
#: bzrlib/builtins.py:6380
4046
#: bzrlib/builtins.py:6433
4040
4047
msgid " <no hooks installed>\n"
4041
4048
msgstr ""
4042
4049
4043
#: bzrlib/builtins.py:6384
4050
#: bzrlib/builtins.py:6437
4044
4051
msgid "Remove a branch."
4045
4052
msgstr ""
4046
4053
4047
#: bzrlib/builtins.py:6386
4054
#: bzrlib/builtins.py:6439
4048
4055
msgid ""
4049
4056
"This will remove the branch from the specified location but \n"
4050
4057
"will keep any working tree or repository in place."
4051
4058
msgstr ""
4052
4059
4053
#: bzrlib/builtins.py:6391
4060
#: bzrlib/builtins.py:6444
4054
4061
msgid " Remove the branch at repo/trunk::"
4055
4062
msgstr ""
4056
4063
4057
#: bzrlib/builtins.py:6393
4064
#: bzrlib/builtins.py:6446
4058
4065
msgid " bzr remove-branch repo/trunk"
4059
4066
msgstr ""
4060
4067
4061
#: bzrlib/builtins.py:6408
4068
#: bzrlib/builtins.py:6461
4062
4069
msgid "Plaintext diff output."
4063
4070
msgstr ""
4064
4071
4065
#: bzrlib/builtins.py:6409
4072
#: bzrlib/builtins.py:6462
4066
4073
msgid "Temporarily set aside some changes from the current tree."
4067
4074
msgstr ""
4068
4075
4069
#: bzrlib/builtins.py:6411
4076
#: bzrlib/builtins.py:6464
4070
4077
msgid ""
4071
4078
"Shelve allows you to temporarily put changes you've made \"on the shelf\",\n"
4072
4079
"ie. out of the way, until a later time when you can bring them back from\n"
4075
4082
"will they survive its deletion."
4076
4083
msgstr ""
4077
4084
4078
#: bzrlib/builtins.py:6417
4085
#: bzrlib/builtins.py:6470
4079
4086
msgid "If shelve --list is specified, previously-shelved changes are listed."
4080
4087
msgstr ""
4081
4088
4082
#: bzrlib/builtins.py:6419
4089
#: bzrlib/builtins.py:6472
4083
4090
msgid ""
4084
4091
"Shelve is intended to help separate several sets of changes that have\n"
4085
4092
"been inappropriately mingled. If you just want to get rid of all changes\n"
4087
4094
"shelve all text changes at once, use shelve --all."
4088
4095
msgstr ""
4089
4096
4090
#: bzrlib/builtins.py:6424
4097
#: bzrlib/builtins.py:6477
4091
4098
msgid ""
4092
4099
"If filenames are specified, only the changes to those files will be\n"
4093
4100
"shelved. Other files will be left untouched."
4094
4101
msgstr ""
4095
4102
4096
#: bzrlib/builtins.py:6427
4103
#: bzrlib/builtins.py:6480
4097
4104
msgid ""
4098
4105
"If a revision is specified, changes since that revision will be shelved."
4099
4106
msgstr ""
4100
4107
4101
#: bzrlib/builtins.py:6429
4108
#: bzrlib/builtins.py:6482
4102
4109
msgid ""
4103
4110
"You can put multiple items on the shelf, and by default, 'unshelve' will\n"
4104
4111
"restore the most recently shelved changes."
4105
4112
msgstr ""
4106
4113
4107
#: bzrlib/builtins.py:6432
4114
#: bzrlib/builtins.py:6485
4108
4115
msgid ""
4109
4116
"For complicated changes, it is possible to edit the changes in a separate\n"
4110
4117
"editor program to decide what the file remaining in the working copy\n"
4111
4118
"should look like. To do this, add the configuration option"
4112
4119
msgstr ""
4113
4120
4114
#: bzrlib/builtins.py:6436
4121
#: bzrlib/builtins.py:6489
4115
4122
msgid " change_editor = PROGRAM @new_path @old_path"
4116
4123
msgstr ""
4117
4124
4118
#: bzrlib/builtins.py:6438
4125
#: bzrlib/builtins.py:6491
4119
4126
msgid ""
4120
4127
"where @new_path is replaced with the path of the new version of the \n"
4121
4128
"file and @old_path is replaced with the path of the old version of \n"
4124
4131
" "
4125
4132
msgstr ""
4126
4133
4127
#: bzrlib/builtins.py:6450
4134
#: bzrlib/builtins.py:6503
4128
4135
msgid "Shelve all changes."
4129
4136
msgstr ""
4130
4137
4131
#: bzrlib/builtins.py:6452
4138
#: bzrlib/builtins.py:6505
4132
4139
msgid "Method to use for writing diffs."
4133
4140
msgstr ""
4134
4141
4135
#: bzrlib/builtins.py:6452
4142
#: bzrlib/builtins.py:6505
4136
4143
msgid "writer"
4137
4144
msgstr ""
4138
4145
4139
#: bzrlib/builtins.py:6456
4146
#: bzrlib/builtins.py:6509
4140
4147
msgid "List shelved changes."
4141
4148
msgstr ""
4142
4149
4143
#: bzrlib/builtins.py:6458
4150
#: bzrlib/builtins.py:6511
4144
4151
msgid "Destroy removed changes instead of shelving them."
4145
4152
msgstr ""
4146
4153
4147
#: bzrlib/builtins.py:6487
4154
#: bzrlib/builtins.py:6540
4148
4155
msgid "No shelved changes."
4149
4156
msgstr ""
4150
4157
4151
#: bzrlib/builtins.py:6498
4158
#: bzrlib/builtins.py:6551
4152
4159
msgid "Restore shelved changes."
4153
4160
msgstr ""
4154
4161
4155
#: bzrlib/builtins.py:6500
4162
#: bzrlib/builtins.py:6553
4156
4163
msgid ""
4157
4164
"By default, the most recently shelved changes are restored. However if you\n"
4158
4165
"specify a shelf by id those changes will be restored instead. This works\n"
4159
4166
"best when the changes don't depend on each other."
4160
4167
msgstr ""
4161
4168
4162
#: bzrlib/builtins.py:6509
4169
#: bzrlib/builtins.py:6562
4163
4170
msgid "The action to perform."
4164
4171
msgstr ""
4165
4172
4166
#: bzrlib/builtins.py:6509 bzrlib/conflicts.py:694
4173
#: bzrlib/builtins.py:6562 bzrlib/conflicts.py:694
4167
4174
msgid "action"
4168
4175
msgstr ""
4169
4176
4170
#: bzrlib/builtins.py:6511
4177
#: bzrlib/builtins.py:6564
4171
4178
msgid "Apply changes and remove from the shelf."
4172
4179
msgstr ""
4173
4180
4174
#: bzrlib/builtins.py:6512
4181
#: bzrlib/builtins.py:6565
4175
4182
msgid "Show changes, but do not apply or remove them."
4176
4183
msgstr ""
4177
4184
4178
#: bzrlib/builtins.py:6513
4185
#: bzrlib/builtins.py:6566
4179
4186
msgid ""
4180
4187
"Instead of unshelving the changes, show the diff that would result from "
4181
4188
"unshelving."
4182
4189
msgstr ""
4183
4190
4184
#: bzrlib/builtins.py:6515
4191
#: bzrlib/builtins.py:6568
4185
4192
msgid "Delete changes without applying them."
4186
4193
msgstr ""
4187
4194
4188
#: bzrlib/builtins.py:6516
4195
#: bzrlib/builtins.py:6569
4189
4196
msgid "Apply changes but don't delete them."
4190
4197
msgstr ""
4191
4198
4192
#: bzrlib/builtins.py:6531
4199
#: bzrlib/builtins.py:6584
4193
4200
msgid "Remove unwanted files from working tree."
4194
4201
msgstr ""
4195
4202
4196
#: bzrlib/builtins.py:6533
4203
#: bzrlib/builtins.py:6586
4197
4204
msgid ""
4198
4205
"By default, only unknown files, not ignored files, are deleted. Versioned\n"
4199
4206
"files are never deleted."
4200
4207
msgstr ""
4201
4208
4202
#: bzrlib/builtins.py:6536
4209
#: bzrlib/builtins.py:6589
4203
4210
msgid ""
4204
4211
"Another class is 'detritus', which includes files emitted by bzr during\n"
4205
4212
"normal operations and selftests. (The value of these files decreases with\n"
4206
4213
"time.)"
4207
4214
msgstr ""
4208
4215
4209
#: bzrlib/builtins.py:6540
4216
#: bzrlib/builtins.py:6593
4210
4217
msgid ""
4211
4218
"If no options are specified, unknown files are deleted. Otherwise, option\n"
4212
4219
"flags are respected, and may be combined."
4213
4220
msgstr ""
4214
4221
4215
#: bzrlib/builtins.py:6543
4222
#: bzrlib/builtins.py:6596
4216
4223
msgid "To check what clean-tree will do, use --dry-run."
4217
4224
msgstr ""
4218
4225
4219
#: bzrlib/builtins.py:6546
4226
#: bzrlib/builtins.py:6599
4220
4227
msgid "Delete all ignored files."
4221
4228
msgstr ""
4222
4229
4223
#: bzrlib/builtins.py:6547
4230
#: bzrlib/builtins.py:6600
4224
4231
msgid ""
4225
4232
"Delete conflict files, merge and revert backups, and failed selftest dirs."
4226
4233
msgstr ""
4227
4234
4228
#: bzrlib/builtins.py:6550
4235
#: bzrlib/builtins.py:6603
4229
4236
msgid "Delete files unknown to bzr (default)."
4230
4237
msgstr ""
4231
4238
4232
#: bzrlib/builtins.py:6551
4239
#: bzrlib/builtins.py:6604
4233
4240
msgid "Show files to delete instead of deleting them."
4234
4241
msgstr ""
4235
4242
4236
#: bzrlib/builtins.py:6553
4243
#: bzrlib/builtins.py:6606
4237
4244
msgid "Do not prompt before deleting."
4238
4245
msgstr ""
4239
4246
4293
4300
msgstr[0] ""
4294
4301
msgstr[1] ""
4295
4302
4296
#: bzrlib/bzrdir.py:489
4303
#: bzrlib/bzrdir.py:490
4297
4304
msgid ""
4298
4305
"making backup of {0}\n"
4299
4306
" to {1}"
4300
4307
msgstr ""
4301
4308
4302
#: bzrlib/bzrdir.py:512
4309
#: bzrlib/bzrdir.py:513
4303
4310
msgid "renamed {0} to {1}"
4304
4311
msgstr ""
4305
4312
4306
#: bzrlib/bzrdir.py:1663
4313
#: bzrlib/bzrdir.py:1652
4307
4314
#, python-format
4308
4315
msgid ""
4309
4316
"Source repository format does not support stacking, using format:\n"
4310
4317
" %s"
4311
4318
msgstr ""
4312
4319
4313
#: bzrlib/bzrdir.py:1683
4320
#: bzrlib/bzrdir.py:1672
4314
4321
#, python-format
4315
4322
msgid ""
4316
4323
"Source branch format does not support stacking, using format:\n"
4317
4324
" %s"
4318
4325
msgstr ""
4319
4326
4320
#: bzrlib/bzrdir.py:1829
4327
#: bzrlib/bzrdir.py:1818
4321
4328
msgid "starting repository conversion"
4322
4329
msgstr ""
4323
4330
4324
#: bzrlib/bzrdir.py:2058
4331
#: bzrlib/bzrdir.py:2039
4325
4332
msgid "Using default stacking branch {0} at {1}"
4326
4333
msgstr ""
4327
4334
4560
4567
msgid "bzr version-info --revision takes exactly one revision specifier"
4561
4568
msgstr ""
4562
4569
4563
#: bzrlib/commands.py:228
4570
#: bzrlib/commands.py:229
4564
4571
#, python-format
4565
4572
msgid "unknown command \"%s\""
4566
4573
msgstr ""
4567
4574
4568
#: bzrlib/commands.py:475
4575
#: bzrlib/commands.py:476
4569
4576
msgid "No help for this command."
4570
4577
msgstr ""
4571
4578
4572
#: bzrlib/commands.py:488
4579
#: bzrlib/commands.py:489
4573
4580
#, python-format
4574
4581
msgid ":Purpose: %s\n"
4575
4582
msgstr ""
4576
4583
4577
#: bzrlib/commands.py:490
4584
#: bzrlib/commands.py:491
4578
4585
#, python-format
4579
4586
msgid ""
4580
4587
":Usage:\n"
4581
4588
"%s\n"
4582
4589
msgstr ""
4583
4590
4584
#: bzrlib/commands.py:492
4591
#: bzrlib/commands.py:493
4585
4592
#, python-format
4586
4593
msgid ":Usage: %s\n"
4587
4594
msgstr ""
4588
4595
4589
#: bzrlib/commands.py:511
4596
#: bzrlib/commands.py:512
4590
4597
#, python-format
4591
4598
msgid ":Options:%s"
4592
4599
msgstr ""
4593
4600
4594
#: bzrlib/commands.py:522
4601
#: bzrlib/commands.py:523
4595
4602
#, python-format
4596
4603
msgid ""
4597
4604
":Description:\n"
4599
4606
"\n"
4600
4607
msgstr ""
4601
4608
4602
#: bzrlib/commands.py:532
4609
#: bzrlib/commands.py:533
4603
4610
#, python-format
4604
4611
msgid ""
4605
4612
"See bzr help %s for more details and examples.\n"
4606
4613
"\n"
4607
4614
msgstr ""
4608
4615
4609
#: bzrlib/commands.py:537
4616
#: bzrlib/commands.py:538
4610
4617
msgid ":Aliases: "
4611
4618
msgstr ""
4612
4619
4613
#: bzrlib/commands.py:541
4620
#: bzrlib/commands.py:542
4614
4621
#, python-format
4615
4622
msgid ":From: plugin \"%s\"\n"
4616
4623
msgstr ""
4617
4624
4618
#: bzrlib/commands.py:553
4625
#: bzrlib/commands.py:554
4619
4626
msgid ":doc:`{0} <{1}-help>`"
4620
4627
msgstr ""
4621
4628
4622
#: bzrlib/commands.py:557
4629
#: bzrlib/commands.py:558
4623
4630
#, python-format
4624
4631
msgid ":See also: %s"
4625
4632
msgstr ""
4626
4633
4627
#: bzrlib/commands.py:815 bzrlib/gpg.py:324
4634
#: bzrlib/commands.py:816 bzrlib/gpg.py:324
4628
4635
msgid "Only ASCII permitted in option names"
4629
4636
msgstr ""
4630
4637
4631
#: bzrlib/commands.py:840 bzrlib/commands.py:848
4638
#: bzrlib/commands.py:841 bzrlib/commands.py:849
4632
4639
msgid "command {0!r} needs one or more {1}"
4633
4640
msgstr ""
4634
4641
4635
#: bzrlib/commands.py:857
4642
#: bzrlib/commands.py:858
4636
4643
msgid "command {0!r} requires argument {1}"
4637
4644
msgstr ""
4638
4645
4639
#: bzrlib/commands.py:864
4646
#: bzrlib/commands.py:865
4640
4647
msgid "extra argument to command {0}: {1}"
4641
4648
msgstr ""
4642
4649
4643
#: bzrlib/commands.py:961
4650
#: bzrlib/commands.py:962
4644
4651
#, python-format
4645
4652
msgid "Profile data written to \"%s\"."
4646
4653
msgstr ""
4742
4749
msgid "Invalid config value for \"{0}\" value {1!r} is not an SI unit."
4743
4750
msgstr ""
4744
4751
4745
#: bzrlib/config.py:2499
4752
#: bzrlib/config.py:2485
4746
4753
msgid "{0} is not an SI unit."
4747
4754
msgstr ""
4748
4755
4749
#: bzrlib/config.py:2956
4756
#: bzrlib/config.py:2949
4750
4757
msgid ""
4751
4758
"Option {0} in section {1} of {2} was changed from {3} to {4}. The {5} value "
4752
4759
"will be saved."
4753
4760
msgstr ""
4754
4761
4755
#: bzrlib/config.py:3100
4762
#: bzrlib/config.py:3093
4756
4763
#, python-format
4757
4764
msgid "Invalid '%s', should be of the form 'name=value'"
4758
4765
msgstr ""
4759
4766
4760
#: bzrlib/config.py:3969
4767
#: bzrlib/config.py:3962
4761
4768
msgid "Display, set or remove a configuration option."
4762
4769
msgstr ""
4763
4770
4764
#: bzrlib/config.py:3971
4771
#: bzrlib/config.py:3964
4765
4772
msgid "Display the active value for a given option."
4766
4773
msgstr ""
4767
4774
4768
#: bzrlib/config.py:3973
4775
#: bzrlib/config.py:3966
4769
4776
msgid ""
4770
4777
"If --all is specified, NAME is interpreted as a regular expression and all\n"
4771
4778
"matching options are displayed mentioning their scope. The active value\n"
4772
4779
"that bzr will take into account is the first one displayed for each option."
4773
4780
msgstr ""
4774
4781
4775
#: bzrlib/config.py:3977
4782
#: bzrlib/config.py:3970
4776
4783
msgid "If no NAME is given, --all .* is implied."
4777
4784
msgstr ""
4778
4785
4779
#: bzrlib/config.py:3979
4786
#: bzrlib/config.py:3972
4780
4787
msgid ""
4781
4788
"Setting a value is achieved by using name=value without spaces. The value\n"
4782
4789
"is set in the most relevant scope and can be checked by displaying the\n"
4783
4790
"option again."
4784
4791
msgstr ""
4785
4792
4786
#: bzrlib/config.py:3991
4793
#: bzrlib/config.py:3984
4787
4794
msgid "Reduce the scope to the specified configuration file."
4788
4795
msgstr ""
4789
4796
4790
#: bzrlib/config.py:3995
4797
#: bzrlib/config.py:3988
4791
4798
msgid "Display all the defined values for the matching options."
4792
4799
msgstr ""
4793
4800
4794
#: bzrlib/config.py:3997
4801
#: bzrlib/config.py:3990
4795
4802
msgid "Remove the option from the configuration file."
4796
4803
msgstr ""
4797
4804
4871
4878
msgstr[0] ""
4872
4879
msgstr[1] ""
4873
4880
4874
#: bzrlib/controldir.py:698
4881
#: bzrlib/controldir.py:710
4875
4882
msgid "{0} is{1} redirected to {2}"
4876
4883
msgstr ""
4877
4884
4977
4984
msgid "The value '%(value)s' is not a valid value."
4978
4985
msgstr ""
4979
4986
4987
#: bzrlib/errors.py:424
4988
msgid "Bad value \"%(value)s\" for option \"%(name)s\"."
4989
msgstr ""
4990
4980
4991
#: bzrlib/errors.py:443
4981
4992
msgid "Generic path error: %(path)r%(extra)s)"
4982
4993
msgstr ""
5076
5087
msgstr ""
5077
5088
5078
5089
#: bzrlib/errors.py:705
5090
msgid "A control directory already exists: \"%(path)s\"."
5091
msgstr ""
5092
5093
#: bzrlib/errors.py:710
5079
5094
msgid "Already a branch: \"%(path)s\"."
5080
5095
msgstr ""
5081
5096
5082
#: bzrlib/errors.py:711
5097
#: bzrlib/errors.py:715
5098
msgid "Parent branch already exists: \"%(path)s\"."
5099
msgstr ""
5100
5101
#: bzrlib/errors.py:721
5083
5102
msgid ""
5084
5103
"Directory contains a branch, but no working tree (use bzr checkout if you "
5085
5104
"wish to build a working tree): \"%(path)s\""
5086
5105
msgstr ""
5087
5106
5088
#: bzrlib/errors.py:716
5107
#: bzrlib/errors.py:726
5089
5108
msgid ""
5090
5109
"\"%(function)s\" called on an AtomicFile after it was closed: \"%(path)s\""
5091
5110
msgstr ""
5092
5111
5093
#: bzrlib/errors.py:726
5112
#: bzrlib/errors.py:736
5094
5113
msgid ""
5095
5114
"Parent not accessible given base \"%(base)s\" and relative path \"%(path)s\""
5096
5115
msgstr ""
5097
5116
5098
#: bzrlib/errors.py:736
5117
#: bzrlib/errors.py:746
5099
5118
msgid "No repository present: \"%(path)s\""
5100
5119
msgstr ""
5101
5120
5102
#: bzrlib/errors.py:743
5121
#: bzrlib/errors.py:753
5103
5122
msgid ""
5104
5123
"Unsupported branch format: %(format)s\n"
5105
5124
"Please run 'bzr upgrade'"
5106
5125
msgstr ""
5107
5126
5108
#: bzrlib/errors.py:749
5127
#: bzrlib/errors.py:759
5109
5128
msgid "Unknown %(kind)s format: %(format)r"
5110
5129
msgstr ""
5111
5130
5112
#: bzrlib/errors.py:758
5131
#: bzrlib/errors.py:768
5113
5132
msgid "Format %(format)s is not compatible with .bzr version %(bzrdir)s."
5114
5133
msgstr ""
5115
5134
5116
#: bzrlib/errors.py:768
5135
#: bzrlib/errors.py:778
5117
5136
msgid "Parse error on line %(lineno)d of %(format)s format: %(line)s"
5118
5137
msgstr ""
5119
5138
5120
#: bzrlib/errors.py:783
5139
#: bzrlib/errors.py:793
5121
5140
msgid ""
5122
5141
"%(target)s\n"
5123
5142
"is not compatible with\n"
5125
5144
"%(details)s"
5126
5145
msgstr ""
5127
5146
5128
#: bzrlib/errors.py:799
5147
#: bzrlib/errors.py:809
5129
5148
msgid "Revision is not compatible with %(repo_format)s"
5130
5149
msgstr ""
5131
5150
5132
#: bzrlib/errors.py:809
5151
#: bzrlib/errors.py:819
5133
5152
msgid "%(context_info)s%(path)s is already versioned."
5134
5153
msgstr ""
5135
5154
5136
#: bzrlib/errors.py:830
5155
#: bzrlib/errors.py:840
5137
5156
msgid "%(context_info)s%(path)s is not versioned."
5138
5157
msgstr ""
5139
5158
5140
#: bzrlib/errors.py:851
5159
#: bzrlib/errors.py:861
5141
5160
msgid "Path(s) are not versioned: %(paths_as_string)s"
5142
5161
msgstr ""
5143
5162
5144
#: bzrlib/errors.py:862
5163
#: bzrlib/errors.py:872
5145
5164
msgid "Path(s) do not exist: %(paths_as_string)s%(extra)s"
5146
5165
msgstr ""
5147
5166
5148
#: bzrlib/errors.py:881
5167
#: bzrlib/errors.py:891
5149
5168
msgid "Cannot operate on \"%(filename)s\" of unsupported kind \"%(kind)s\""
5150
5169
msgstr ""
5151
5170
5152
#: bzrlib/errors.py:889
5171
#: bzrlib/errors.py:899
5153
5172
msgid ""
5154
5173
"Filename %(filename)r is not valid in your current filesystem encoding "
5155
5174
"%(fs_encoding)s"
5156
5175
msgstr ""
5157
5176
5158
#: bzrlib/errors.py:900
5177
#: bzrlib/errors.py:910
5159
5178
msgid "Cannot operate on \"%(filename)s\" because it is a control file"
5160
5179
msgstr ""
5161
5180
5162
#: bzrlib/errors.py:918
5181
#: bzrlib/errors.py:928
5163
5182
msgid "The lock for '%(lock_description)s' is in use and cannot be broken."
5164
5183
msgstr ""
5165
5184
5166
#: bzrlib/errors.py:957
5185
#: bzrlib/errors.py:967
5167
5186
msgid "Cannot lock %(lock)s: %(why)s"
5168
5187
msgstr ""
5169
5188
5170
#: bzrlib/errors.py:967
5189
#: bzrlib/errors.py:977
5171
5190
msgid ""
5172
5191
"A transaction related operation was attempted after the transaction finished."
5173
5192
msgstr ""
5174
5193
5175
#: bzrlib/errors.py:994
5194
#: bzrlib/errors.py:1004
5176
5195
msgid "Cannot lock: transport is read only: %(transport)s"
5177
5196
msgstr ""
5178
5197
5179
#: bzrlib/errors.py:1002
5198
#: bzrlib/errors.py:1012
5180
5199
msgid "Could not acquire lock \"%(lock)s\": %(msg)s"
5181
5200
msgstr ""
5182
5201
5183
#: bzrlib/errors.py:1013
5202
#: bzrlib/errors.py:1023
5184
5203
msgid ""
5185
5204
"Lock was broken while still open: %(lock)s - check storage consistency!"
5186
5205
msgstr ""
5187
5206
5188
#: bzrlib/errors.py:1024
5207
#: bzrlib/errors.py:1034
5189
5208
msgid ""
5190
5209
"Lock was released and re-acquired before being broken: %(lock)s: held by "
5191
5210
"%(holder)r, wanted to break %(target)r"
5192
5211
msgstr ""
5193
5212
5194
#: bzrlib/errors.py:1036
5213
#: bzrlib/errors.py:1046
5195
5214
msgid ""
5196
5215
"Lock is apparently held, but corrupted: %(corruption_info)s\n"
5197
5216
"Use 'bzr break-lock' to clear it"
5198
5217
msgstr ""
5199
5218
5200
#: bzrlib/errors.py:1049
5219
#: bzrlib/errors.py:1059
5201
5220
msgid "Lock not held: %(lock)s"
5202
5221
msgstr ""
5203
5222
5204
#: bzrlib/errors.py:1078
5223
#: bzrlib/errors.py:1088
5205
5224
msgid "No changes to commit"
5206
5225
msgstr ""
5207
5226
5208
#: bzrlib/errors.py:1083
5227
#: bzrlib/errors.py:1093
5209
5228
msgid ""
5210
5229
"Selected-file commit of merges is not supported yet: files %(files_str)s"
5211
5230
msgstr ""
5212
5231
5213
#: bzrlib/errors.py:1093
5232
#: bzrlib/errors.py:1103
5214
5233
msgid ""
5215
5234
"Excluding paths during commit is not supported by repository at "
5216
5235
"%(repository)r."
5217
5236
msgstr ""
5218
5237
5219
#: bzrlib/errors.py:1102
5238
#: bzrlib/errors.py:1112
5220
5239
msgid ""
5221
5240
"The specified commit message contains characters unsupported by the current "
5222
5241
"encoding."
5223
5242
msgstr ""
5224
5243
5225
#: bzrlib/errors.py:1108
5244
#: bzrlib/errors.py:1118
5226
5245
msgid "Upgrade URL cannot work with readonly URLs."
5227
5246
msgstr ""
5228
5247
5229
#: bzrlib/errors.py:1113
5248
#: bzrlib/errors.py:1123
5230
5249
msgid "The branch format %(format)s is already at the most recent format."
5231
5250
msgstr ""
5232
5251
5233
#: bzrlib/errors.py:1136
5252
#: bzrlib/errors.py:1146
5234
5253
msgid "Option --change does not accept revision ranges"
5235
5254
msgstr ""
5236
5255
5237
#: bzrlib/errors.py:1141
5256
#: bzrlib/errors.py:1151
5238
5257
msgid "No namespace registered for string: %(spec)r"
5239
5258
msgstr ""
5240
5259
5241
#: bzrlib/errors.py:1160
5260
#: bzrlib/errors.py:1170
5242
5261
msgid ""
5243
5262
"Requested revision: '%(spec)s' does not exist in branch: "
5244
5263
"%(branch_url)s%(extra)s"
5245
5264
msgstr ""
5246
5265
5247
#: bzrlib/errors.py:1174
5266
#: bzrlib/errors.py:1184
5248
5267
msgid ""
5249
5268
"Operation denied because it would change the main history, which is not "
5250
5269
"permitted by the append_revisions_only setting on branch \"%(location)s\"."
5251
5270
msgstr ""
5252
5271
5253
#: bzrlib/errors.py:1185
5272
#: bzrlib/errors.py:1195
5254
5273
msgid ""
5255
5274
"These branches have diverged. Use the missing command to see how.\n"
5256
5275
"Use the merge command to reconcile them."
5257
5276
msgstr ""
5258
5277
5259
#: bzrlib/errors.py:1205
5278
#: bzrlib/errors.py:1215
5260
5279
msgid ""
5261
5280
"Branches have no common ancestor, and no merge base revision was specified."
5262
5281
msgstr ""
5263
5282
5264
#: bzrlib/errors.py:1211
5283
#: bzrlib/errors.py:1221
5265
5284
msgid ""
5266
5285
"Selected merge cannot perform reverse cherrypicks. Try merge3 or diff3."
5267
5286
msgstr ""
5268
5287
5269
#: bzrlib/errors.py:1217
5288
#: bzrlib/errors.py:1227
5270
5289
msgid "Revisions have no common ancestor: %(revision_a)s %(revision_b)s"
5271
5290
msgstr ""
5272
5291
5273
#: bzrlib/errors.py:1226
5292
#: bzrlib/errors.py:1236
5274
5293
msgid ""
5275
5294
"Revisions are not derived from the same root: %(revision_a)s %(revision_b)s."
5276
5295
msgstr ""
5277
5296
5278
#: bzrlib/errors.py:1235
5297
#: bzrlib/errors.py:1245
5279
5298
msgid "Revision %(rev_id)s is not an ancestor of %(not_ancestor_id)s"
5280
5299
msgstr ""
5281
5300
5282
#: bzrlib/errors.py:1244
5301
#: bzrlib/errors.py:1254
5283
5302
msgid "Branch %(branch)s has no commits."
5284
5303
msgstr ""
5285
5304
5286
#: bzrlib/errors.py:1262
5305
#: bzrlib/errors.py:1272
5287
5306
msgid ""
5288
5307
"Bound branch %(branch)s is out of date with master branch "
5289
5308
"%(master)s.%(extra_help)s"
5290
5309
msgstr ""
5291
5310
5292
#: bzrlib/errors.py:1274
5311
#: bzrlib/errors.py:1284
5293
5312
msgid ""
5294
5313
"Cannot commit to branch %(branch)s. It is bound to %(master)s, which is "
5295
5314
"bound to %(remote)s."
5296
5315
msgstr ""
5297
5316
5298
#: bzrlib/errors.py:1286
5317
#: bzrlib/errors.py:1296
5299
5318
msgid "Cannot pull --overwrite to a branch which is bound %(branch)s"
5300
5319
msgstr ""
5301
5320
5302
#: bzrlib/errors.py:1295
5321
#: bzrlib/errors.py:1305
5303
5322
msgid ""
5304
5323
"Unable to connect to target of bound branch %(branch)s => %(target)s: "
5305
5324
"%(error)s"
5306
5325
msgstr ""
5307
5326
5308
#: bzrlib/errors.py:1307
5327
#: bzrlib/errors.py:1317
5309
5328
msgid "Error in processing weave: %(msg)s"
5310
5329
msgstr ""
5311
5330
5312
#: bzrlib/errors.py:1316
5331
#: bzrlib/errors.py:1326
5313
5332
msgid "Revision {%(revision_id)s} already present in %(weave)s"
5314
5333
msgstr ""
5315
5334
5316
#: bzrlib/errors.py:1327
5335
#: bzrlib/errors.py:1337
5317
5336
msgid "Revision {%(revision_id)s} not present in %(weave)s"
5318
5337
msgstr ""
5319
5338
5320
#: bzrlib/errors.py:1337
5339
#: bzrlib/errors.py:1347
5321
5340
msgid "Weave invariant violated: %(what)s"
5322
5341
msgstr ""
5323
5342
5324
#: bzrlib/errors.py:1346
5343
#: bzrlib/errors.py:1356
5325
5344
msgid "Parents are mismatched between two revisions. %(msg)s"
5326
5345
msgstr ""
5327
5346
5328
#: bzrlib/errors.py:1368
5347
#: bzrlib/errors.py:1378
5329
5348
msgid ""
5330
5349
"Weaves differ on text content. Revision: {%(revision_id)s}, %(weave_a)s, "
5331
5350
"%(weave_b)s"
5332
5351
msgstr ""
5333
5352
5334
#: bzrlib/errors.py:1380
5353
#: bzrlib/errors.py:1390
5335
5354
msgid "Versioned file error"
5336
5355
msgstr ""
5337
5356
5338
#: bzrlib/errors.py:1385
5357
#: bzrlib/errors.py:1395
5339
5358
msgid "Revision {%(revision_id)s} not present in \"%(file_id)s\"."
5340
5359
msgstr ""
5341
5360
5342
#: bzrlib/errors.py:1395
5361
#: bzrlib/errors.py:1405
5343
5362
msgid "Revision {%(revision_id)s} already present in \"%(file_id)s\"."
5344
5363
msgstr ""
5345
5364
5346
#: bzrlib/errors.py:1405
5365
#: bzrlib/errors.py:1415
5347
5366
msgid "Text did not match its checksum: %(msg)s"
5348
5367
msgstr ""
5349
5368
5350
#: bzrlib/errors.py:1531
5369
#: bzrlib/errors.py:1541
5351
5370
msgid "Export format %(format)r not supported"
5352
5371
msgstr ""
5353
5372
5354
#: bzrlib/errors.py:1540
5373
#: bzrlib/errors.py:1550
5355
5374
msgid "Transport error: %(msg)s %(orig_error)s"
5356
5375
msgstr ""
5357
5376
5358
#: bzrlib/errors.py:1566
5377
#: bzrlib/errors.py:1576
5359
5378
msgid "Generic bzr smart protocol error: %(details)s"
5360
5379
msgstr ""
5361
5380
5362
#: bzrlib/errors.py:1574
5381
#: bzrlib/errors.py:1584
5363
5382
msgid "Received bad protocol version marker: %(marker)r"
5364
5383
msgstr ""
5365
5384
5366
#: bzrlib/errors.py:1606
5385
#: bzrlib/errors.py:1616
5367
5386
msgid "Transport operation not possible: %(msg)s %(orig_error)s"
5368
5387
msgstr ""
5369
5388
5370
#: bzrlib/errors.py:1611
5389
#: bzrlib/errors.py:1621
5371
5390
msgid "Connection error: %(msg)s %(orig_error)s"
5372
5391
msgstr ""
5373
5392
5374
#: bzrlib/errors.py:1616
5393
#: bzrlib/errors.py:1626
5375
5394
msgid "%(msg)s %(host)s%(port)s%(orig_error)s"
5376
5395
msgstr ""
5377
5396
5378
#: bzrlib/errors.py:1637
5397
#: bzrlib/errors.py:1647
5379
5398
msgid "Connection closed: %(msg)s %(orig_error)s"
5380
5399
msgstr ""
5381
5400
5382
#: bzrlib/errors.py:1642
5401
#: bzrlib/errors.py:1652
5383
5402
msgid "Connection Timeout: %(msg)s%(orig_error)s"
5384
5403
msgstr ""
5385
5404
5386
#: bzrlib/errors.py:1647
5405
#: bzrlib/errors.py:1657
5387
5406
msgid "Invalid range access in %(path)s at %(offset)s: %(msg)s"
5388
5407
msgstr ""
5389
5408
5390
#: bzrlib/errors.py:1657
5409
#: bzrlib/errors.py:1667
5391
5410
msgid "Invalid http response for %(path)s: %(msg)s%(orig_error)s"
5392
5411
msgstr ""
5393
5412
5394
#: bzrlib/errors.py:1672
5413
#: bzrlib/errors.py:1682
5414
msgid "Certificate error: %(error)s"
5415
msgstr ""
5416
5417
#: bzrlib/errors.py:1690
5395
5418
msgid "Invalid http range %(range)r for %(path)s: %(msg)s"
5396
5419
msgstr ""
5397
5420
5398
#: bzrlib/errors.py:1686
5421
#: bzrlib/errors.py:1704
5399
5422
msgid "HTTP MIME Boundary missing for %(path)s: %(msg)s"
5400
5423
msgstr ""
5401
5424
5402
#: bzrlib/errors.py:1694
5425
#: bzrlib/errors.py:1712
5403
5426
msgid "Invalid http Content-type \"%(ctype)s\" for %(path)s: %(msg)s"
5404
5427
msgstr ""
5405
5428
5406
#: bzrlib/errors.py:1703
5429
#: bzrlib/errors.py:1721
5407
5430
msgid "%(source)s is%(permanently)s redirected to %(target)s"
5408
5431
msgstr ""
5409
5432
5410
#: bzrlib/errors.py:1717
5433
#: bzrlib/errors.py:1735
5411
5434
msgid "Too many redirections"
5412
5435
msgstr ""
5413
5436
5414
#: bzrlib/errors.py:1722
5437
#: bzrlib/errors.py:1740
5415
5438
msgid "Working tree has conflicts."
5416
5439
msgstr ""
5417
5440
5418
#: bzrlib/errors.py:1726
5441
#: bzrlib/errors.py:1744
5419
5442
msgid "Config file %(filename)s is not UTF-8 encoded\n"
5420
5443
msgstr ""
5421
5444
5422
#: bzrlib/errors.py:1735
5445
#: bzrlib/errors.py:1753
5423
5446
msgid ""
5424
5447
"Error(s) parsing config file %(filename)s:\n"
5425
5448
"%(errors)s"
5426
5449
msgstr ""
5427
5450
5428
#: bzrlib/errors.py:1746
5429
msgid "Bad value \"%(value)s\" for option \"%(name)s\"."
5451
#: bzrlib/errors.py:1763
5452
msgid ""
5453
"Bad value \"%(value)s\" for option \"%(name)s\".\n"
5454
"See ``bzr help %(name)s``"
5430
5455
msgstr ""
5431
5456
5432
#: bzrlib/errors.py:1754
5457
#: bzrlib/errors.py:1773
5433
5458
msgid "%(username)r does not seem to contain a reasonable email address"
5434
5459
msgstr ""
5435
5460
5436
#: bzrlib/errors.py:1763
5461
#: bzrlib/errors.py:1782
5437
5462
msgid "Failed to GPG sign data with command \"%(command_line)s\""
5438
5463
msgstr ""
5439
5464
5440
#: bzrlib/errors.py:1771
5465
#: bzrlib/errors.py:1790
5441
5466
msgid "Failed to verify GPG signature data with error \"%(error)s\""
5442
5467
msgstr ""
5443
5468
5444
#: bzrlib/errors.py:1779
5469
#: bzrlib/errors.py:1798
5445
5470
msgid "Unable to import library \"%(library)s\": %(error)s"
5446
5471
msgstr ""
5447
5472
5448
#: bzrlib/errors.py:1787
5473
#: bzrlib/errors.py:1806
5449
5474
msgid "python-gpgme is not installed, it is needed to verify signatures"
5450
5475
msgstr ""
5451
5476
5452
#: bzrlib/errors.py:1795
5477
#: bzrlib/errors.py:1814
5453
5478
msgid ""
5454
5479
"The working tree for %(basedir)s has changed since the last commit, but "
5455
5480
"weave merge requires that it be unchanged"
5456
5481
msgstr ""
5457
5482
5458
#: bzrlib/errors.py:1805
5483
#: bzrlib/errors.py:1824
5459
5484
msgid ""
5460
5485
"Can't reprocess and show base, because reprocessing obscures the "
5461
5486
"relationship of conflicting lines to the base"
5462
5487
msgstr ""
5463
5488
5464
#: bzrlib/errors.py:1811
5489
#: bzrlib/errors.py:1830
5465
5490
msgid "Cycle in graph %(graph)r"
5466
5491
msgstr ""
5467
5492
5468
#: bzrlib/errors.py:1839
5493
#: bzrlib/errors.py:1858
5469
5494
msgid "File %(filename)s is not conflicted."
5470
5495
msgstr ""
5471
5496
5472
#: bzrlib/errors.py:1861
5497
#: bzrlib/errors.py:1880
5473
5498
msgid "No bundle was found in \"%(filename)s\"."
5474
5499
msgstr ""
5475
5500
5476
#: bzrlib/errors.py:1870
5501
#: bzrlib/errors.py:1889
5477
5502
msgid "Unable to handle bundle version %(version)s: %(msg)s"
5478
5503
msgstr ""
5479
5504
5480
#: bzrlib/errors.py:1880
5505
#: bzrlib/errors.py:1899
5481
5506
msgid "Branch %(base)s is missing revision %(text_revision)s of %(file_id)s"
5482
5507
msgstr ""
5483
5508
5484
#: bzrlib/errors.py:1893
5509
#: bzrlib/errors.py:1912
5485
5510
msgid "File id {%(file_id)s} already exists in inventory as %(entry)s"
5486
5511
msgstr ""
5487
5512
5488
#: bzrlib/errors.py:1903
5513
#: bzrlib/errors.py:1922
5489
5514
msgid "Key %(key)s is already present in map"
5490
5515
msgstr ""
5491
5516
5492
#: bzrlib/errors.py:1908
5517
#: bzrlib/errors.py:1927
5493
5518
msgid "The prefix %(prefix)s is in the help search path twice."
5494
5519
msgstr ""
5495
5520
5496
#: bzrlib/errors.py:1918
5521
#: bzrlib/errors.py:1937
5497
5522
msgid ""
5498
5523
"No final name for trans_id %(trans_id)r\n"
5499
5524
"file-id: %(file_id)r\n"
5500
5525
"root trans-id: %(root_trans_id)r\n"
5501
5526
msgstr ""
5502
5527
5503
#: bzrlib/errors.py:1950
5528
#: bzrlib/errors.py:1969
5504
5529
msgid "Attempt to reuse a transform that has already been applied."
5505
5530
msgstr ""
5506
5531
5507
#: bzrlib/errors.py:1955
5532
#: bzrlib/errors.py:1974
5508
5533
msgid "Moving the root directory is not supported at this time"
5509
5534
msgstr ""
5510
5535
5511
#: bzrlib/errors.py:1960
5536
#: bzrlib/errors.py:1979
5512
5537
msgid "Failed to rename %(from_path)s to %(to_path)s: %(why)s"
5513
5538
msgstr ""
5514
5539
5515
#: bzrlib/errors.py:1971
5540
#: bzrlib/errors.py:1990
5516
5541
msgid ""
5517
5542
"Could not move %(from_path)s%(operator)s %(to_path)s%(_has_extra)s%(extra)s"
5518
5543
msgstr ""
5519
5544
5520
#: bzrlib/errors.py:2007
5545
#: bzrlib/errors.py:2026
5521
5546
msgid ""
5522
5547
"Could not rename %(from_path)s%(operator)s %(to_path)s%(_has_extra)s%(extra)s"
5523
5548
msgstr ""
5524
5549
5525
#: bzrlib/errors.py:2037
5550
#: bzrlib/errors.py:2056
5526
5551
msgid "Unable to import paramiko (required for sftp support): %(error)s"
5527
5552
msgstr ""
5528
5553
5529
#: bzrlib/errors.py:2045
5554
#: bzrlib/errors.py:2064
5530
5555
msgid "Nothing to merge."
5531
5556
msgstr ""
5532
5557
5533
#: bzrlib/errors.py:2050
5558
#: bzrlib/errors.py:2069
5534
5559
msgid "Format %(format)s cannot be initialised by this version of bzr."
5535
5560
msgstr ""
5536
5561
5537
#: bzrlib/errors.py:2059
5562
#: bzrlib/errors.py:2078
5538
5563
msgid ""
5539
5564
"Cannot convert from format %(from_format)s to format %(format)s. "
5540
5565
"%(problem)s"
5541
5566
msgstr ""
5542
5567
5543
#: bzrlib/errors.py:2071
5568
#: bzrlib/errors.py:2090
5544
5569
msgid "Could not find an appropriate Differ for file \"%(path)s\""
5545
5570
msgstr ""
5546
5571
5547
#: bzrlib/errors.py:2079
5572
#: bzrlib/errors.py:2098
5548
5573
msgid "%(exe_name)s could not be found on this machine"
5549
5574
msgstr ""
5550
5575
5551
#: bzrlib/errors.py:2087
5576
#: bzrlib/errors.py:2106
5552
5577
msgid "Diff is not installed on this machine: %(msg)s"
5553
5578
msgstr ""
5554
5579
5555
#: bzrlib/errors.py:2095
5580
#: bzrlib/errors.py:2114
5556
5581
msgid "Diff3 is not installed on this machine."
5557
5582
msgstr ""
5558
5583
5559
#: bzrlib/errors.py:2101
5584
#: bzrlib/errors.py:2120
5560
5585
msgid "The content being inserted is already present."
5561
5586
msgstr ""
5562
5587
5563
#: bzrlib/errors.py:2106
5588
#: bzrlib/errors.py:2125
5564
5589
msgid ""
5565
5590
"This tree contains left-over files from a failed operation.\n"
5566
5591
" Please examine %(limbo_dir)s to see if it contains any files you wish "
5568
5593
" keep, and delete it when you are done."
5569
5594
msgstr ""
5570
5595
5571
#: bzrlib/errors.py:2117
5596
#: bzrlib/errors.py:2136
5572
5597
msgid ""
5573
5598
"This tree contains left-over files from a failed operation.\n"
5574
5599
" Please examine %(pending_deletion)s to see if it contains any files you\n"
5575
5600
" wish to keep, and delete it when you are done."
5576
5601
msgstr ""
5577
5602
5578
#: bzrlib/errors.py:2127
5603
#: bzrlib/errors.py:2146
5579
5604
msgid ""
5580
5605
"Unable to delete transform temporary directory %(limbo_dir)s.\n"
5581
5606
" Please examine %(limbo_dir)s to see if it contains any files you wish "
5583
5608
" keep, and delete it when you are done."
5584
5609
msgstr ""
5585
5610
5586
#: bzrlib/errors.py:2138
5611
#: bzrlib/errors.py:2157
5587
5612
msgid ""
5588
5613
"Unable to delete transform temporary directory %(pending_deletion)s. Please "
5589
5614
"examine %(pending_deletion)s to see if it contains any files you wish to "
5590
5615
"keep, and delete it when you are done."
5591
5616
msgstr ""
5592
5617
5593
#: bzrlib/errors.py:2148
5618
#: bzrlib/errors.py:2167
5594
5619
msgid "Working tree is out of date, please run 'bzr update'.%(more)s"
5595
5620
msgstr ""
5596
5621
5597
#: bzrlib/errors.py:2162
5622
#: bzrlib/errors.py:2181
5598
5623
msgid ""
5599
5624
"Public branch \"%(public_location)s\" lacks revision \"%(revstring)s\"."
5600
5625
msgstr ""
5601
5626
5602
#: bzrlib/errors.py:2175
5627
#: bzrlib/errors.py:2194
5603
5628
msgid "Error in merge modified format"
5604
5629
msgstr ""
5605
5630
5606
#: bzrlib/errors.py:2180
5631
#: bzrlib/errors.py:2199
5607
5632
msgid "Format error in conflict listings"
5608
5633
msgstr ""
5609
5634
5610
#: bzrlib/errors.py:2184
5635
#: bzrlib/errors.py:2203
5611
5636
msgid ""
5612
5637
"Inconsistency in dirstate file %(dirstate_path)s.\n"
5613
5638
"Error: %(description)s"
5614
5639
msgstr ""
5615
5640
5616
#: bzrlib/errors.py:2195
5641
#: bzrlib/errors.py:2214
5617
5642
msgid ""
5618
5643
"An error has been detected in the repository %(repo_path)s.\n"
5619
5644
"Please run bzr reconcile on this repository."
5620
5645
msgstr ""
5621
5646
5622
#: bzrlib/errors.py:2206
5647
#: bzrlib/errors.py:2225
5623
5648
msgid ""
5624
5649
"An inconsistent delta was supplied involving %(path)r, %(file_id)r\n"
5625
5650
"reason: %(reason)s"
5626
5651
msgstr ""
5627
5652
5628
#: bzrlib/errors.py:2219
5653
#: bzrlib/errors.py:2238
5629
5654
msgid ""
5630
5655
"An inconsistent delta was supplied: %(delta)r\n"
5631
5656
"reason: %(reason)s"
5632
5657
msgstr ""
5633
5658
5634
#: bzrlib/errors.py:2231
5659
#: bzrlib/errors.py:2250
5635
5660
msgid "To use this feature you must upgrade your branch at %(path)s."
5636
5661
msgstr ""
5637
5662
5638
#: bzrlib/errors.py:2240
5663
#: bzrlib/errors.py:2259
5639
5664
msgid "To use this feature you must upgrade your repository at %(path)s."
5640
5665
msgstr ""
5641
5666
5642
#: bzrlib/errors.py:2245
5667
#: bzrlib/errors.py:2264
5643
5668
msgid ""
5644
5669
"To use this feature you must upgrade your branch at %(path)s to a format "
5645
5670
"which supports rich roots."
5646
5671
msgstr ""
5647
5672
5648
#: bzrlib/errors.py:2251
5673
#: bzrlib/errors.py:2270
5649
5674
msgid "Cannot perform local-only commits on unbound branches."
5650
5675
msgstr ""
5651
5676
5652
#: bzrlib/errors.py:2256
5677
#: bzrlib/errors.py:2275
5653
5678
msgid "The method %(mname)s is not supported on objects of type %(tname)s."
5654
5679
msgstr ""
5655
5680
5656
#: bzrlib/errors.py:2277
5681
#: bzrlib/errors.py:2296
5657
5682
msgid "Ghost tags not supported by format %(format)r."
5658
5683
msgstr ""
5659
5684
5660
#: bzrlib/errors.py:2285
5685
#: bzrlib/errors.py:2304
5661
5686
msgid "File is binary but should be text."
5662
5687
msgstr ""
5663
5688
5664
#: bzrlib/errors.py:2290
5689
#: bzrlib/errors.py:2309
5665
5690
msgid "The path %(path)s is not permitted on this platform"
5666
5691
msgstr ""
5667
5692
5668
#: bzrlib/errors.py:2299
5693
#: bzrlib/errors.py:2318
5669
5694
msgid ""
5670
5695
"Testament did not match expected value.\n"
5671
5696
" For revision_id {%(revision_id)s}, expected {%(expected)s}, measured\n"
5672
5697
" {%(measured)s}"
5673
5698
msgstr ""
5674
5699
5675
#: bzrlib/errors.py:2311
5700
#: bzrlib/errors.py:2330
5676
5701
msgid "Not a bzr revision-bundle: %(text)r"
5677
5702
msgstr ""
5678
5703
5679
#: bzrlib/errors.py:2320
5704
#: bzrlib/errors.py:2339
5680
5705
msgid "Bad bzr revision-bundle: %(text)r"
5681
5706
msgstr ""
5682
5707
5683
#: bzrlib/errors.py:2329
5708
#: bzrlib/errors.py:2348
5684
5709
msgid "Malformed bzr revision-bundle header: %(text)r"
5685
5710
msgstr ""
5686
5711
5687
#: bzrlib/errors.py:2334
5712
#: bzrlib/errors.py:2353
5688
5713
msgid "Malformed patches in bzr revision-bundle: %(text)r"
5689
5714
msgstr ""
5690
5715
5691
#: bzrlib/errors.py:2339
5716
#: bzrlib/errors.py:2358
5692
5717
msgid "Malformed footer in bzr revision-bundle: %(text)r"
5693
5718
msgstr ""
5694
5719
5695
#: bzrlib/errors.py:2344
5720
#: bzrlib/errors.py:2363
5696
5721
msgid "End of line marker was not \\n in bzr revision-bundle"
5697
5722
msgstr ""
5698
5723
5699
#: bzrlib/errors.py:2354
5724
#: bzrlib/errors.py:2373
5700
5725
msgid "Bundle format %(bundle_format)s is incompatible with %(other)s"
5701
5726
msgstr ""
5702
5727
5703
#: bzrlib/errors.py:2364
5728
#: bzrlib/errors.py:2383
5704
5729
msgid "Root class for inventory serialization errors"
5705
5730
msgstr ""
5706
5731
5707
#: bzrlib/errors.py:2368
5732
#: bzrlib/errors.py:2387
5708
5733
msgid ""
5709
5734
"The inventory was not in the expected format:\n"
5710
5735
" %(msg)s"
5711
5736
msgstr ""
5712
5737
5713
#: bzrlib/errors.py:2377
5738
#: bzrlib/errors.py:2396
5714
5739
msgid "This operation requires rich root data storage"
5715
5740
msgstr ""
5716
5741
5717
#: bzrlib/errors.py:2390
5742
#: bzrlib/errors.py:2409
5718
5743
msgid "Unrecognised value for BZR_SSH environment variable: %(vendor)s"
5719
5744
msgstr ""
5720
5745
5721
#: bzrlib/errors.py:2399
5746
#: bzrlib/errors.py:2418
5722
5747
msgid ""
5723
5748
"Don't know how to handle SSH connections. Please set BZR_SSH environment "
5724
5749
"variable."
5725
5750
msgstr ""
5726
5751
5727
#: bzrlib/errors.py:2406
5752
#: bzrlib/errors.py:2425
5728
5753
msgid ""
5729
5754
"Could not determine revno for {%(revision_id)s} because its ancestry shows a "
5730
5755
"ghost at {%(ghost_revision_id)s}"
5731
5756
msgstr ""
5732
5757
5733
#: bzrlib/errors.py:2416
5758
#: bzrlib/errors.py:2435
5734
5759
msgid "Ghost revision {%(revision_id)s} cannot be used here."
5735
5760
msgstr ""
5736
5761
5737
#: bzrlib/errors.py:2467
5762
#: bzrlib/errors.py:2486
5738
5763
msgid ""
5739
5764
"A merge directive must provide either a bundle or a public branch location."
5740
5765
msgstr ""
5741
5766
5742
#: bzrlib/errors.py:2474
5767
#: bzrlib/errors.py:2493
5743
5768
msgid "Bad merge directive payload %(start)r"
5744
5769
msgstr ""
5745
5770
5746
#: bzrlib/errors.py:2484
5771
#: bzrlib/errors.py:2503
5747
5772
msgid "Preview patch does not match requested changes."
5748
5773
msgstr ""
5749
5774
5750
#: bzrlib/errors.py:2490
5775
#: bzrlib/errors.py:2509
5751
5776
msgid "Patch_type was %(patch_type)s, but no patch was supplied."
5752
5777
msgstr ""
5753
5778
5754
#: bzrlib/errors.py:2500
5779
#: bzrlib/errors.py:2519
5755
5780
msgid ""
5756
5781
"Your branch does not have all of the revisions required in order to merge "
5757
5782
"this merge directive and the target location specified in the merge "
5758
5783
"directive is not a branch: %(location)s."
5759
5784
msgstr ""
5760
5785
5761
#: bzrlib/errors.py:2512
5786
#: bzrlib/errors.py:2531
5762
5787
msgid "Unsupported entry kind %(kind)s"
5763
5788
msgstr ""
5764
5789
5765
#: bzrlib/errors.py:2520
5790
#: bzrlib/errors.py:2539
5766
5791
msgid "Can't subsume %(other_tree)s into %(tree)s. %(reason)s"
5767
5792
msgstr ""
5768
5793
5769
#: bzrlib/errors.py:2530
5794
#: bzrlib/errors.py:2549
5770
5795
msgid "Subsume target %(other_tree)s needs to be upgraded."
5771
5796
msgstr ""
5772
5797
5773
#: bzrlib/errors.py:2549
5798
#: bzrlib/errors.py:2568
5774
5799
msgid "No such tag: %(tag_name)s"
5775
5800
msgstr ""
5776
5801
5777
#: bzrlib/errors.py:2557
5802
#: bzrlib/errors.py:2576
5778
5803
msgid "Tags not supported by %(branch)s; you may be able to use bzr upgrade."
5779
5804
msgstr ""
5780
5805
5781
#: bzrlib/errors.py:2566
5806
#: bzrlib/errors.py:2585
5782
5807
msgid "Tag %(tag_name)s already exists."
5783
5808
msgstr ""
5784
5809
5785
#: bzrlib/errors.py:2574
5810
#: bzrlib/errors.py:2593
5786
5811
msgid ""
5787
5812
"Did not understand bug identifier %(bug_id)s: %(reason)s. See \"bzr help "
5788
5813
"bugs\" for more information on this feature."
5789
5814
msgstr ""
5790
5815
5791
#: bzrlib/errors.py:2584
5816
#: bzrlib/errors.py:2603
5792
5817
msgid ""
5793
5818
"The URL for bug tracker \"%(abbreviation)s\" doesn't contain {id}: %(url)s"
5794
5819
msgstr ""
5795
5820
5796
#: bzrlib/errors.py:2594
5821
#: bzrlib/errors.py:2613
5797
5822
msgid ""
5798
5823
"Cannot find registered bug tracker called %(abbreviation)s on %(branch)s"
5799
5824
msgstr ""
5800
5825
5801
#: bzrlib/errors.py:2604
5826
#: bzrlib/errors.py:2623
5802
5827
msgid "Invalid line in bugs property: '%(line)s'"
5803
5828
msgstr ""
5804
5829
5805
#: bzrlib/errors.py:2612
5830
#: bzrlib/errors.py:2631
5806
5831
msgid "Invalid bug status: '%(status)s'"
5807
5832
msgstr ""
5808
5833
5809
#: bzrlib/errors.py:2620
5834
#: bzrlib/errors.py:2639
5810
5835
msgid "Could not understand response from smart server: %(response_tuple)r"
5811
5836
msgstr ""
5812
5837
5813
#: bzrlib/errors.py:2659
5838
#: bzrlib/errors.py:2678
5814
5839
msgid "Server sent an unexpected error: %(error_tuple)r"
5815
5840
msgstr ""
5816
5841
5817
#: bzrlib/errors.py:2678
5842
#: bzrlib/errors.py:2697
5818
5843
msgid "Unrecognised container format: %(container_format)r"
5819
5844
msgstr ""
5820
5845
5821
#: bzrlib/errors.py:2686
5846
#: bzrlib/errors.py:2705
5822
5847
msgid "Unexpected end of container stream"
5823
5848
msgstr ""
5824
5849
5825
#: bzrlib/errors.py:2691
5850
#: bzrlib/errors.py:2710
5826
5851
msgid "Unknown record type: %(record_type)r"
5827
5852
msgstr ""
5828
5853
5829
#: bzrlib/errors.py:2699
5854
#: bzrlib/errors.py:2718
5830
5855
msgid "Invalid record: %(reason)s"
5831
5856
msgstr ""
5832
5857
5833
#: bzrlib/errors.py:2707
5858
#: bzrlib/errors.py:2726
5834
5859
msgid "Container has data after end marker: %(excess)r"
5835
5860
msgstr ""
5836
5861
5837
#: bzrlib/errors.py:2715
5862
#: bzrlib/errors.py:2734
5838
5863
msgid "Container has multiple records with the same name: %(name)s"
5839
5864
msgstr ""
5840
5865
5841
#: bzrlib/errors.py:2728
5866
#: bzrlib/errors.py:2747
5842
5867
msgid "Corrupt or incompatible data stream: %(reason)s"
5843
5868
msgstr ""
5844
5869
5845
#: bzrlib/errors.py:2736
5870
#: bzrlib/errors.py:2755
5846
5871
msgid "SMTP error: %(error)s"
5847
5872
msgstr ""
5848
5873
5849
#: bzrlib/errors.py:2744
5874
#: bzrlib/errors.py:2763
5850
5875
msgid "No message supplied."
5851
5876
msgstr ""
5852
5877
5853
#: bzrlib/errors.py:2749
5878
#: bzrlib/errors.py:2768
5854
5879
msgid "No mail-to address (--mail-to) or output (-o) specified."
5855
5880
msgstr ""
5856
5881
5857
#: bzrlib/errors.py:2754
5882
#: bzrlib/errors.py:2773
5858
5883
msgid "Unknown mail client: %(mail_client)s"
5859
5884
msgstr ""
5860
5885
5861
#: bzrlib/errors.py:2762
5886
#: bzrlib/errors.py:2781
5862
5887
msgid ""
5863
5888
"Unable to find mail client with the following names: "
5864
5889
"%(mail_command_list_string)s"
5865
5890
msgstr ""
5866
5891
5867
#: bzrlib/errors.py:2772
5892
#: bzrlib/errors.py:2791
5868
5893
msgid "SMTP connection to %(host)s refused"
5869
5894
msgstr ""
5870
5895
5871
#: bzrlib/errors.py:2781
5896
#: bzrlib/errors.py:2800
5872
5897
msgid "Please specify smtp_server. No server at default %(host)s."
5873
5898
msgstr ""
5874
5899
5875
#: bzrlib/errors.py:2795
5900
#: bzrlib/errors.py:2814
5876
5901
msgid ""
5877
5902
"'%(display_url)s' is not in sync with %(target_url)s. See bzr help sync-for-"
5878
5903
"reconfigure."
5879
5904
msgstr ""
5880
5905
5881
#: bzrlib/errors.py:2807
5906
#: bzrlib/errors.py:2826
5882
5907
msgid "'%(display_url)s' is already a branch."
5883
5908
msgstr ""
5884
5909
5885
#: bzrlib/errors.py:2812
5910
#: bzrlib/errors.py:2831
5886
5911
msgid "'%(display_url)s' is already a tree."
5887
5912
msgstr ""
5888
5913
5889
#: bzrlib/errors.py:2817
5914
#: bzrlib/errors.py:2836
5890
5915
msgid "'%(display_url)s' is already a checkout."
5891
5916
msgstr ""
5892
5917
5893
#: bzrlib/errors.py:2822
5918
#: bzrlib/errors.py:2841
5894
5919
msgid "'%(display_url)s' is already a lightweight checkout."
5895
5920
msgstr ""
5896
5921
5897
#: bzrlib/errors.py:2827
5922
#: bzrlib/errors.py:2846
5898
5923
msgid "'%(display_url)s' is already using a shared repository."
5899
5924
msgstr ""
5900
5925
5901
#: bzrlib/errors.py:2832
5926
#: bzrlib/errors.py:2851
5902
5927
msgid "'%(display_url)s' is already standalone."
5903
5928
msgstr ""
5904
5929
5905
#: bzrlib/errors.py:2837
5930
#: bzrlib/errors.py:2856
5906
5931
msgid "Shared repository '%(display_url)s' already creates working trees."
5907
5932
msgstr ""
5908
5933
5909
#: bzrlib/errors.py:2843
5934
#: bzrlib/errors.py:2862
5910
5935
msgid ""
5911
5936
"Shared repository '%(display_url)s' already doesn't create working trees."
5912
5937
msgstr ""
5913
5938
5914
#: bzrlib/errors.py:2849
5939
#: bzrlib/errors.py:2868
5915
5940
msgid "Requested reconfiguration of '%(display_url)s' is not supported."
5916
5941
msgstr ""
5917
5942
5918
#: bzrlib/errors.py:2854
5943
#: bzrlib/errors.py:2873
5919
5944
msgid "No location could be found to bind to at %(display_url)s."
5920
5945
msgstr ""
5921
5946
5922
#: bzrlib/errors.py:2859
5947
#: bzrlib/errors.py:2878
5923
5948
msgid ""
5924
5949
"Working tree \"%(display_url)s\" has uncommitted changes (See bzr "
5925
5950
"status).%(more)s"
5926
5951
msgstr ""
5927
5952
5928
#: bzrlib/errors.py:2878
5953
#: bzrlib/errors.py:2897
5929
5954
msgid ""
5930
5955
"Working tree \"%(display_url)s\" has shelved changes (See bzr shelve --"
5931
5956
"list).%(more)s"
5932
5957
msgstr ""
5933
5958
5934
#: bzrlib/errors.py:2884
5959
#: bzrlib/errors.py:2903
5935
5960
msgid "Variable {%(name)s} is not available."
5936
5961
msgstr ""
5937
5962
5938
#: bzrlib/errors.py:2892
5963
#: bzrlib/errors.py:2911
5939
5964
msgid "No template specified."
5940
5965
msgstr ""
5941
5966
5942
#: bzrlib/errors.py:2897
5967
#: bzrlib/errors.py:2916
5943
5968
msgid "Unable to create symlink %(path_str)son this platform"
5944
5969
msgstr ""
5945
5970
5946
#: bzrlib/errors.py:2912
5971
#: bzrlib/errors.py:2931
5947
5972
msgid ""
5948
5973
"Unsupported timezone format \"%(timezone)s\", options are \"utc\", "
5949
5974
"\"original\", \"local\"."
5950
5975
msgstr ""
5951
5976
5952
#: bzrlib/errors.py:2946
5977
#: bzrlib/errors.py:2965
5953
5978
msgid ""
5954
5979
"Unable to encode %(kind)s path %(path)r in user encoding %(user_encoding)s"
5955
5980
msgstr ""
5956
5981
5957
#: bzrlib/errors.py:2958
5982
#: bzrlib/errors.py:2977
5958
5983
msgid "The \"%(config_id)s\" configuration does not exist."
5959
5984
msgstr ""
5960
5985
5961
#: bzrlib/errors.py:2966
5986
#: bzrlib/errors.py:2985
5962
5987
msgid "The \"%(option_name)s\" configuration option does not exist."
5963
5988
msgstr ""
5964
5989
5965
#: bzrlib/errors.py:2974
5990
#: bzrlib/errors.py:2993
5966
5991
msgid "The alias \"%(alias_name)s\" does not exist."
5967
5992
msgstr ""
5968
5993
5969
#: bzrlib/errors.py:2988
5994
#: bzrlib/errors.py:3007
5970
5995
msgid "\"%(alias_name)s\" is not a valid location alias."
5971
5996
msgstr ""
5972
5997
5973
#: bzrlib/errors.py:2996
5998
#: bzrlib/errors.py:3015
5974
5999
msgid "No %(alias_name)s location assigned."
5975
6000
msgstr ""
5976
6001
5977
#: bzrlib/errors.py:3004
6002
#: bzrlib/errors.py:3023
5978
6003
msgid "Cannot bind address \"%(host)s:%(port)i\": %(orig_error)s."
5979
6004
msgstr ""
5980
6005
5981
#: bzrlib/errors.py:3014
6006
#: bzrlib/errors.py:3033
5982
6007
msgid "Unknown rules detected: %(unknowns_str)s."
5983
6008
msgstr ""
5984
6009
5985
#: bzrlib/errors.py:3025
6010
#: bzrlib/errors.py:3044
5986
6011
msgid "Tip change rejected: %(msg)s"
5987
6012
msgstr ""
5988
6013
5989
#: bzrlib/errors.py:3033
6014
#: bzrlib/errors.py:3052
5990
6015
msgid "Shelf corrupt."
5991
6016
msgstr ""
5992
6017
5993
#: bzrlib/errors.py:3038
6018
#: bzrlib/errors.py:3057
5994
6019
msgid "Corruption while decompressing repository file%(orig_error)s"
5995
6020
msgstr ""
5996
6021
5997
#: bzrlib/errors.py:3050
6022
#: bzrlib/errors.py:3069
5998
6023
msgid "No changes are shelved with id \"%(shelf_id)d\"."
5999
6024
msgstr ""
6000
6025
6001
#: bzrlib/errors.py:3058
6026
#: bzrlib/errors.py:3077
6002
6027
msgid "\"%(invalid_id)s\" is not a valid shelf id, try a number instead."
6003
6028
msgstr ""
6004
6029
6005
#: bzrlib/errors.py:3066
6030
#: bzrlib/errors.py:3085
6006
6031
msgid ""
6007
6032
"An attempt to access a url outside the server jail was made: '%(url)s'."
6008
6033
msgstr ""
6009
6034
6010
#: bzrlib/errors.py:3074
6035
#: bzrlib/errors.py:3093
6011
6036
msgid "The user aborted the operation."
6012
6037
msgstr ""
6013
6038
6014
#: bzrlib/errors.py:3079
6039
#: bzrlib/errors.py:3098
6015
6040
msgid "Branching '%(url)s'(%(format)s) must create a working tree."
6016
6041
msgstr ""
6017
6042
6018
#: bzrlib/errors.py:3089
6043
#: bzrlib/errors.py:3108
6019
6044
msgid "No such view: %(view_name)s."
6020
6045
msgstr ""
6021
6046
6022
#: bzrlib/errors.py:3099
6047
#: bzrlib/errors.py:3118
6023
6048
msgid ""
6024
6049
"Views are not supported by %(tree)s; use 'bzr upgrade' to change your tree "
6025
6050
"to a later format."
6026
6051
msgstr ""
6027
6052
6028
#: bzrlib/errors.py:3108
6053
#: bzrlib/errors.py:3127
6029
6054
msgid ""
6030
6055
"Specified file \"%(file_name)s\" is outside the current view: %(view_str)s"
6031
6056
msgstr ""
6032
6057
6033
#: bzrlib/errors.py:3175
6058
#: bzrlib/errors.py:3194
6034
6059
msgid "%(bzrdir)r does not support co-located branches."
6035
6060
msgstr ""
6036
6061
6037
#: bzrlib/errors.py:3181
6062
#: bzrlib/errors.py:3200
6038
6063
msgid ""
6039
6064
"Unable to determine your name.\n"
6040
6065
"Please, set your name with the 'whoami' command.\n"
6041
6066
"E.g. bzr whoami \"Your Name <name@example.com>\""
6042
6067
msgstr ""
6043
6068
6044
#: bzrlib/errors.py:3190
6069
#: bzrlib/errors.py:3209
6045
6070
msgid "Invalid pattern(s) found. %(msg)s"
6046
6071
msgstr ""
6047
6072
6048
#: bzrlib/errors.py:3198
6073
#: bzrlib/errors.py:3217
6049
6074
msgid ""
6050
6075
"Branch \"%(branch_url)s\" appears to be bound to itself. Please use `bzr "
6051
6076
"unbind` to fix."
6052
6077
msgstr ""
6053
6078
6054
#: bzrlib/errors.py:3209
6079
#: bzrlib/errors.py:3228
6055
6080
msgid "Loop involving %(refs)r while expanding \"%(string)s\"."
6056
6081
msgstr ""
6057
6082
6058
#: bzrlib/errors.py:3218
6083
#: bzrlib/errors.py:3237
6059
6084
msgid "Option %(name)s is not defined while expanding \"%(string)s\"."
6060
6085
msgstr ""
6061
6086
6062
#: bzrlib/errors.py:3227
6087
#: bzrlib/errors.py:3246
6063
6088
msgid ""
6064
6089
"No compatible object available for operations from %(source)r to %(target)r."
6065
6090
msgstr ""
6066
6091
6067
#: bzrlib/errors.py:3237
6092
#: bzrlib/errors.py:3256
6068
6093
msgid ""
6069
6094
"VFS requests over the smart server are not allowed. Encountered: %(method)s, "
6070
6095
"%(arguments)s."
6071
6096
msgstr ""
6072
6097
6073
#: bzrlib/errors.py:3247
6098
#: bzrlib/errors.py:3266
6074
6099
msgid ""
6075
6100
"Kind change from %(from_kind)s to %(to_kind)s for %(path)s not supported by "
6076
6101
"format %(format)r"
6077
6102
msgstr ""
6078
6103
6079
#: bzrlib/errors.py:3259
6104
#: bzrlib/errors.py:3278
6080
6105
msgid ""
6081
6106
"Missing feature %(feature)s not provided by this version of Bazaar or any "
6082
6107
"plugin."
6083
6108
msgstr ""
6084
6109
6085
#: bzrlib/errors.py:3272
6110
#: bzrlib/errors.py:3291
6086
6111
msgid "Binary files section encountered."
6087
6112
msgstr ""
6088
6113
6089
#: bzrlib/errors.py:3280
6114
#: bzrlib/errors.py:3299
6090
6115
msgid ""
6091
6116
"Malformed patch header. %(desc)s\n"
6092
6117
"%(line)r"
6093
6118
msgstr ""
6094
6119
6095
#: bzrlib/errors.py:3289
6120
#: bzrlib/errors.py:3308
6096
6121
msgid ""
6097
6122
"Malformed hunk header. %(desc)s\n"
6098
6123
"%(line)r"
6099
6124
msgstr ""
6100
6125
6101
#: bzrlib/errors.py:3298
6126
#: bzrlib/errors.py:3317
6102
6127
msgid ""
6103
6128
"Malformed line. %(desc)s\n"
6104
6129
"%(line)r"
6105
6130
msgstr ""
6106
6131
6107
#: bzrlib/errors.py:3308
6132
#: bzrlib/errors.py:3327
6108
6133
msgid ""
6109
6134
"Text contents mismatch at line %(line_no)d. Original has \"%(orig_line)s\", "
6110
6135
"but patch says it should be \"%(patch_line)s\""
6111
6136
msgstr ""
6112
6137
6113
#: bzrlib/errors.py:3319
6138
#: bzrlib/errors.py:3338
6114
6139
msgid "The feature %(feature)s has already been registered."
6115
6140
msgstr ""
6116
6141
6440
6465
msgid "lstat/stat of ({0!r}): {1!r}"
6441
6466
msgstr ""
6442
6467
6443
#: bzrlib/osutils.py:997 bzrlib/osutils.py:1008
6468
#: bzrlib/osutils.py:1008 bzrlib/osutils.py:1019
6444
6469
#, python-format
6445
6470
msgid "sorry, %r not allowed in path"
6446
6471
msgstr ""
6447
6472
6448
#: bzrlib/osutils.py:1226
6473
#: bzrlib/osutils.py:1237
6449
6474
#, python-format
6450
6475
msgid "%r is too short to calculate a relative path"
6451
6476
msgstr ""
6889
6914
msgid "Created new branch."
6890
6915
msgstr ""
6891
6916
6892
#: bzrlib/push.py:98
6917
#: bzrlib/push.py:97
6893
6918
#, python-format
6894
6919
msgid ""
6895
6920
"Target directory %s already contains a .bzr directory, but it is not valid."
7016
7041
msgid "%s is now not stacked\n"
7017
7042
msgstr ""
7018
7043
7019
#: bzrlib/remote.py:1180 bzrlib/repository.py:289
7044
#: bzrlib/remote.py:1228 bzrlib/repository.py:289
7020
7045
#, python-format
7021
7046
msgid "bzr: ERROR (ignored): %s"
7022
7047
msgstr ""
7023
7048
7024
#: bzrlib/remote.py:2493
7049
#: bzrlib/remote.py:2541
7025
7050
msgid "Copying repository content as tarball..."
7026
7051
msgstr ""
7027
7052
7236
7261
msgid "listening on port: %s"
7237
7262
msgstr ""
7238
7263
7239
#: bzrlib/switch.py:69
7264
#: bzrlib/switch.py:73
7240
7265
msgid "Pending merges must be committed or reverted before using switch."
7241
7266
msgstr ""
7242
7267
7243
#: bzrlib/switch.py:96
7268
#: bzrlib/switch.py:100
7244
7269
msgid ""
7245
7270
"Cannot switch as local commits found in the checkout. Commit these to the "
7246
7271
"bound branch or use --force to throw them away."
7247
7272
msgstr ""
7248
7273
7249
#: bzrlib/switch.py:101
7274
#: bzrlib/switch.py:105
7250
7275
#, python-format
7251
7276
msgid ""
7252
7277
"Unable to connect to current master branch %(target)s: %(error)s To switch "
7253
7278
"anyway, use --force."
7254
7279
msgstr ""
7255
7280
7256
#: bzrlib/switch.py:110
7281
#: bzrlib/switch.py:125
7257
7282
msgid "Cannot switch a branch, only a checkout."
7258
7283
msgstr ""
7259
7284
7260
#: bzrlib/switch.py:146
7285
#: bzrlib/switch.py:163
7261
7286
#, python-format
7262
7287
msgid "Tree is up to date at revision %d."
7263
7288
msgstr ""
7264
7289
7265
#: bzrlib/switch.py:152
7290
#: bzrlib/switch.py:169
7266
7291
#, python-format
7267
7292
msgid "Updated to revision %d."
7268
7293
msgstr ""
7269
7294
7270
#: bzrlib/transform.py:1730 bzrlib/transform.py:1741 bzrlib/transform.py:1743
7295
#: bzrlib/transform.py:1734 bzrlib/transform.py:1745 bzrlib/transform.py:1747
7271
7296
msgid "Apply phase"
7272
7297
msgstr ""
7273
7298
7274
#: bzrlib/transform.py:1769 bzrlib/transform.py:1837
7299
#: bzrlib/transform.py:1773 bzrlib/transform.py:1841
7275
7300
msgid "removing file"
7276
7301
msgstr ""
7277
7302
7278
#: bzrlib/transform.py:1787 bzrlib/transform.py:1872
7303
#: bzrlib/transform.py:1791 bzrlib/transform.py:1876
7279
7304
msgid "adding file"
7280
7305
msgstr ""
7281
7306
7282
#: bzrlib/transform.py:2587
7307
#: bzrlib/transform.py:2591
7283
7308
msgid "Building tree"
7284
7309
msgstr ""
7285
7310
7286
#: bzrlib/transform.py:2677 bzrlib/transform.py:2704
7311
#: bzrlib/transform.py:2681 bzrlib/transform.py:2708
7287
7312
msgid "Adding file contents"
7288
7313
msgstr ""
7289
7314
7290
#: bzrlib/transform.py:3024
7315
#: bzrlib/transform.py:3028
7291
7316
msgid "Resolution pass"
7292
7317
msgstr ""
7293
7318
7436
7461
7437
7462
#: dummy/help_topics/basic/detail.txt:1
7438
7463
msgid ""
7439
"Bazaar 2.5b5 -- a free distributed version-control tool\n"
7464
"Bazaar 2.5b6 -- a free distributed version-control tool\n"
7440
7465
"http://bazaar.canonical.com/"
7441
7466
msgstr ""
7442
7467
11702
11727
"~~~~~~~~~~~~~~~~~~~~~~"
11703
11728
msgstr ""
11704
11729
11705
#: en/help_topics/hooks.txt:66 en/help_topics/hooks.txt:402
11730
#: en/help_topics/hooks.txt:66 en/help_topics/hooks.txt:418
11706
11731
msgid "Introduced in: 1.4"
11707
11732
msgstr ""
11708
11733
11894
11919
msgstr ""
11895
11920
11896
11921
#: en/help_topics/hooks.txt:184 en/help_topics/hooks.txt:196
11897
#: en/help_topics/hooks.txt:205 en/help_topics/hooks.txt:448
11922
#: en/help_topics/hooks.txt:205 en/help_topics/hooks.txt:464
11898
11923
msgid "Introduced in: 1.17"
11899
11924
msgstr ""
11900
11925
11950
11975
#: en/help_topics/hooks.txt:218 en/help_topics/hooks.txt:226
11951
11976
#: en/help_topics/hooks.txt:233 en/help_topics/hooks.txt:241
11952
11977
#: en/help_topics/hooks.txt:248 en/help_topics/hooks.txt:370
11953
#: en/help_topics/hooks.txt:427
11978
#: en/help_topics/hooks.txt:443
11954
11979
msgid "Introduced in: 2.4"
11955
11980
msgstr ""
11956
11981
12051
12076
msgstr ""
12052
12077
12053
12078
#: en/help_topics/hooks.txt:278 en/help_topics/hooks.txt:297
12054
#: en/help_topics/hooks.txt:505
12079
#: en/help_topics/hooks.txt:521
12055
12080
msgid "Introduced in: 1.15"
12056
12081
msgstr ""
12057
12082
12133
12158
msgstr ""
12134
12159
12135
12160
#: en/help_topics/hooks.txt:326 en/help_topics/hooks.txt:334
12136
#: en/help_topics/hooks.txt:384 en/help_topics/hooks.txt:493
12161
#: en/help_topics/hooks.txt:384 en/help_topics/hooks.txt:402
12162
#: en/help_topics/hooks.txt:410 en/help_topics/hooks.txt:509
12137
12163
msgid "Introduced in: 2.5"
12138
12164
msgstr ""
12139
12165
12252
12278
12253
12279
#: en/help_topics/hooks.txt:399
12254
12280
msgid ""
12281
"post_transform\n"
12282
"~~~~~~~~~~~~~~"
12283
msgstr ""
12284
12285
#: en/help_topics/hooks.txt:404
12286
msgid ""
12287
"Called after a tree transform has been performed on a tree. The hook\n"
12288
"is called with the tree that is being transformed and the transform."
12289
msgstr ""
12290
12291
#: en/help_topics/hooks.txt:407
12292
msgid ""
12293
"pre_transform\n"
12294
"~~~~~~~~~~~~~"
12295
msgstr ""
12296
12297
#: en/help_topics/hooks.txt:412
12298
msgid ""
12299
"Called before a tree transform on this tree. The hook is called with\n"
12300
"the tree that is being transformed and the transform."
12301
msgstr ""
12302
12303
#: en/help_topics/hooks.txt:415
12304
msgid ""
12255
12305
"start_commit\n"
12256
12306
"~~~~~~~~~~~~"
12257
12307
msgstr ""
12258
12308
12259
#: en/help_topics/hooks.txt:404
12309
#: en/help_topics/hooks.txt:420
12260
12310
msgid ""
12261
12311
"Called before a commit is performed on a tree. The start commit hook\n"
12262
12312
"is able to change the tree before the commit takes place. start_commit\n"
12264
12314
"being performed on."
12265
12315
msgstr ""
12266
12316
12267
#: en/help_topics/hooks.txt:409
12317
#: en/help_topics/hooks.txt:425
12268
12318
msgid ""
12269
12319
"SmartClientHooks\n"
12270
12320
"----------------"
12271
12321
msgstr ""
12272
12322
12273
#: en/help_topics/hooks.txt:412
12323
#: en/help_topics/hooks.txt:428
12274
12324
msgid ""
12275
12325
"call\n"
12276
12326
"~~~~"
12277
12327
msgstr ""
12278
12328
12279
#: en/help_topics/hooks.txt:415
12329
#: en/help_topics/hooks.txt:431
12280
12330
msgid "Introduced in: unknown"
12281
12331
msgstr ""
12282
12332
12283
#: en/help_topics/hooks.txt:417
12333
#: en/help_topics/hooks.txt:433
12284
12334
msgid ""
12285
12335
"Called when the smart client is submitting a request to the smart\n"
12286
12336
"server. Called with a bzrlib.smart.client.CallHookParams object.\n"
12287
12337
"Streaming request bodies, and responses, are not accessible."
12288
12338
msgstr ""
12289
12339
12290
#: en/help_topics/hooks.txt:421
12340
#: en/help_topics/hooks.txt:437
12291
12341
msgid ""
12292
12342
"SmartServerHooks\n"
12293
12343
"----------------"
12294
12344
msgstr ""
12295
12345
12296
#: en/help_topics/hooks.txt:424
12346
#: en/help_topics/hooks.txt:440
12297
12347
msgid ""
12298
12348
"server_exception\n"
12299
12349
"~~~~~~~~~~~~~~~~"
12300
12350
msgstr ""
12301
12351
12302
#: en/help_topics/hooks.txt:429
12352
#: en/help_topics/hooks.txt:445
12303
12353
msgid ""
12304
12354
"Called by the bzr server when an exception occurs. server_exception is\n"
12305
12355
"called with the sys.exc_info() tuple return true for the hook if the\n"
12307
12357
"normally."
12308
12358
msgstr ""
12309
12359
12310
#: en/help_topics/hooks.txt:434
12360
#: en/help_topics/hooks.txt:450
12311
12361
msgid ""
12312
12362
"server_started\n"
12313
12363
"~~~~~~~~~~~~~~"
12314
12364
msgstr ""
12315
12365
12316
#: en/help_topics/hooks.txt:437 en/help_topics/hooks.txt:456
12366
#: en/help_topics/hooks.txt:453 en/help_topics/hooks.txt:472
12317
12367
msgid "Introduced in: 0.16"
12318
12368
msgstr ""
12319
12369
12320
#: en/help_topics/hooks.txt:439
12370
#: en/help_topics/hooks.txt:455
12321
12371
msgid ""
12322
12372
"Called by the bzr server when it starts serving a directory.\n"
12323
12373
"server_started is called with (backing urls, public url), where\n"
12326
12376
"served."
12327
12377
msgstr ""
12328
12378
12329
#: en/help_topics/hooks.txt:445
12379
#: en/help_topics/hooks.txt:461
12330
12380
msgid ""
12331
12381
"server_started_ex\n"
12332
12382
"~~~~~~~~~~~~~~~~~"
12333
12383
msgstr ""
12334
12384
12335
#: en/help_topics/hooks.txt:450
12385
#: en/help_topics/hooks.txt:466
12336
12386
msgid ""
12337
12387
"Called by the bzr server when it starts serving a directory.\n"
12338
12388
"server_started is called with (backing_urls, server_obj)."
12339
12389
msgstr ""
12340
12390
12341
#: en/help_topics/hooks.txt:453
12391
#: en/help_topics/hooks.txt:469
12342
12392
msgid ""
12343
12393
"server_stopped\n"
12344
12394
"~~~~~~~~~~~~~~"
12345
12395
msgstr ""
12346
12396
12347
#: en/help_topics/hooks.txt:458
12397
#: en/help_topics/hooks.txt:474
12348
12398
msgid ""
12349
12399
"Called by the bzr server when it stops serving a directory.\n"
12350
12400
"server_stopped is called with the same parameters as the\n"
12351
12401
"server_started hook: (backing_urls, public_url)."
12352
12402
msgstr ""
12353
12403
12354
#: en/help_topics/hooks.txt:462
12404
#: en/help_topics/hooks.txt:478
12355
12405
msgid ""
12356
12406
"StatusHooks\n"
12357
12407
"-----------"
12358
12408
msgstr ""
12359
12409
12360
#: en/help_topics/hooks.txt:465
12410
#: en/help_topics/hooks.txt:481
12361
12411
msgid ""
12362
12412
"post_status\n"
12363
12413
"~~~~~~~~~~~"
12364
12414
msgstr ""
12365
12415
12366
#: en/help_topics/hooks.txt:468 en/help_topics/hooks.txt:479
12416
#: en/help_topics/hooks.txt:484 en/help_topics/hooks.txt:495
12367
12417
msgid "Introduced in: 2.3"
12368
12418
msgstr ""
12369
12419
12370
#: en/help_topics/hooks.txt:470
12420
#: en/help_topics/hooks.txt:486
12371
12421
msgid ""
12372
12422
"Called with argument StatusHookParams after Bazaar has displayed the\n"
12373
12423
"status. StatusHookParams has the attributes (old_tree, new_tree,\n"
12376
12426
"status command. to_file is the output stream for writing."
12377
12427
msgstr ""
12378
12428
12379
#: en/help_topics/hooks.txt:476
12429
#: en/help_topics/hooks.txt:492
12380
12430
msgid ""
12381
12431
"pre_status\n"
12382
12432
"~~~~~~~~~~"
12383
12433
msgstr ""
12384
12434
12385
#: en/help_topics/hooks.txt:481
12435
#: en/help_topics/hooks.txt:497
12386
12436
msgid ""
12387
12437
"Called with argument StatusHookParams before Bazaar displays the\n"
12388
12438
"status. StatusHookParams has the attributes (old_tree, new_tree,\n"
12391
12441
"status command. to_file is the output stream for writing."
12392
12442
msgstr ""
12393
12443
12394
#: en/help_topics/hooks.txt:487
12444
#: en/help_topics/hooks.txt:503
12395
12445
msgid ""
12396
12446
"TransportHooks\n"
12397
12447
"--------------"
12398
12448
msgstr ""
12399
12449
12400
#: en/help_topics/hooks.txt:490
12450
#: en/help_topics/hooks.txt:506
12401
12451
msgid ""
12402
12452
"post_connect\n"
12403
12453
"~~~~~~~~~~~~"
12404
12454
msgstr ""
12405
12455
12406
#: en/help_topics/hooks.txt:495
12456
#: en/help_topics/hooks.txt:511
12407
12457
msgid ""
12408
12458
"Called after a new connection is established or a reconnect occurs.\n"
12409
12459
"The sole argument passed is either the connected transport or smart\n"
12410
12460
"medium instance."
12411
12461
msgstr ""
12412
12462
12413
#: en/help_topics/hooks.txt:499
12463
#: en/help_topics/hooks.txt:515
12414
12464
msgid ""
12415
12465
"RioVersionInfoBuilderHooks\n"
12416
12466
"--------------------------"
12417
12467
msgstr ""
12418
12468
12419
#: en/help_topics/hooks.txt:502
12469
#: en/help_topics/hooks.txt:518
12420
12470
msgid ""
12421
12471
"revision\n"
12422
12472
"~~~~~~~~"
12423
12473
msgstr ""
12424
12474
12425
#: en/help_topics/hooks.txt:507
12475
#: en/help_topics/hooks.txt:523
12426
12476
msgid ""
12427
12477
"Invoked when adding information about a revision to the RIO stanza\n"
12428
12478
"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