« back to all changes in this revision
Viewing changes to po/es.po
- browse files at revision 6093.4.149
- compare with another revision
- compare with revision 6079
- download diff
- download tarball
- view history from revision 6093.4.149
- Committer: Launchpad Translations on behalf of bzr-core
- Date: 2012-07-11 04:34:44 UTC
- mto: (6581.1.1 trunk)
- mto: This revision was merged to the branch mainline in revision 6582.
- Revision ID: launchpad_translations_on_behalf_of_bzr-core-20120711043444-s6bhpt1r22h4fpi1
Launchpad automatic translations update.
added
removed
po/es.po
8
8
msgstr ""
9
9
"Project-Id-Version: bzr\n"
10
10
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
11
"POT-Creation-Date: 2012-03-15 10:20+0100\n"
11
"POT-Creation-Date: 2012-07-10 11:35+0200\n"
12
12
"PO-Revision-Date: 2012-07-04 10:54+0000\n"
13
13
"Last-Translator: Monkey <monkey.libre@gmail.com>\n"
14
14
"Language-Team: Spanish <es@li.org>\n"
16
16
"Content-Type: text/plain; charset=UTF-8\n"
17
17
"Content-Transfer-Encoding: 8bit\n"
18
18
"Plural-Forms: nplurals=2; plural=n != 1;\n"
19
"X-Launchpad-Export-Date: 2012-07-05 04:30+0000\n"
20
"X-Generator: Launchpad (build 15544)\n"
19
"X-Launchpad-Export-Date: 2012-07-11 04:33+0000\n"
20
"X-Generator: Launchpad (build 15593)\n"
21
21
22
#: bzrlib/add.py:95
22
#: bzrlib/add.py:93
23
23
msgid "skipping {0} (larger than {1} of {2} bytes)"
24
24
msgstr "omitiendo {0} (mayor que {1} de {2} bytes)"
25
25
26
#: bzrlib/branch.py:872
26
#: bzrlib/branch.py:854
27
27
msgid "Unstacking"
28
28
msgstr "Desapilando"
29
29
30
#: bzrlib/branch.py:3205
30
#: bzrlib/branch.py:2955
31
31
#, python-format
32
32
msgid "Pushed up to revision %d."
33
33
msgstr "Subido a la revisión %d."
34
34
35
#: bzrlib/branch.py:3207
35
#: bzrlib/branch.py:2957
36
36
#, python-format
37
37
msgid "%d tag updated."
38
38
msgid_plural "%d tags updated."
39
39
msgstr[0] "%d etiqueta actualizada"
40
40
msgstr[1] "%d etiquetas actualizadas"
41
41
42
#: bzrlib/branch.py:3210
42
#: bzrlib/branch.py:2960
43
43
msgid "No new revisions or tags to push."
44
44
msgstr "No hay revisiones o etiquetas para subir."
45
45
46
#: bzrlib/branch.py:3212
46
#: bzrlib/branch.py:2962
47
47
msgid "No new revisions to push."
48
48
msgstr "No hay revisiones para subir."
49
49
50
#: bzrlib/branch.py:3232
50
#: bzrlib/branch.py:2982
51
51
msgid "checked branch {0} format {1}"
52
52
msgstr "rama comprobada {0} formato {1}"
53
53
54
#: bzrlib/branch.py:3235
54
#: bzrlib/branch.py:2985
55
55
#, python-format
56
56
msgid "found error:%s"
57
57
msgstr "error encontrado: %s"
58
58
59
#: bzrlib/builtins.py:209 bzrlib/builtins.py:3016 bzrlib/workingtree.py:315
59
#: bzrlib/builtins.py:251 bzrlib/builtins.py:3045 bzrlib/workingtree.py:323
60
60
#, python-format
61
61
msgid "Ignoring files outside view. View is %s"
62
62
msgstr "Ignorando archivos fuera de la vista. La vista es %s"
63
63
64
#: bzrlib/builtins.py:218
64
#: bzrlib/builtins.py:260
65
65
#, python-format
66
66
msgid "bzr %s --revision takes exactly one revision identifier"
67
67
msgstr "bzr %s --revision toma exactamente un identificador de revisión"
68
68
69
#: bzrlib/builtins.py:303
69
#: bzrlib/builtins.py:315
70
70
msgid "Display status summary."
71
71
msgstr "Mostrar resumen de estado."
72
72
73
#: bzrlib/builtins.py:305
73
#: bzrlib/builtins.py:317
74
74
msgid ""
75
75
"This reports on versioned and unknown files, reporting them\n"
76
76
"grouped by state. Possible states are:"
78
78
"Esto informa de archivos versionados y desconocidos, se informa de ellos\n"
79
79
"agrupados por estado. Los estados posibles son:"
80
80
81
#: bzrlib/builtins.py:308
81
#: bzrlib/builtins.py:320
82
82
msgid ""
83
83
"added\n"
84
84
" Versioned in the working copy but not in the previous revision."
86
86
"añadido\n"
87
87
" Versionado en la copia de trabajo pero no en la revisión anterior."
88
88
89
#: bzrlib/builtins.py:311
89
#: bzrlib/builtins.py:323
90
90
msgid ""
91
91
"removed\n"
92
92
" Versioned in the previous revision but removed or deleted\n"
96
96
" Versionado en la revisión anterior pero borrado o eliminado\n"
97
97
" en la copia de trabajo."
98
98
99
#: bzrlib/builtins.py:315
99
#: bzrlib/builtins.py:327
100
100
msgid ""
101
101
"renamed\n"
102
102
" Path of this file changed from the previous revision;\n"
108
108
" el siguiente se debería cambiar también. Esto incluye archivos cuyo\n"
109
109
" directorio padre ha sido renombrado."
110
110
111
#: bzrlib/builtins.py:320
111
#: bzrlib/builtins.py:332
112
112
msgid ""
113
113
"modified\n"
114
114
" Text has changed since the previous revision."
116
116
"modificado\n"
117
117
" El texto ha cambiado desde una revisión previa."
118
118
119
#: bzrlib/builtins.py:323
119
#: bzrlib/builtins.py:335
120
120
msgid ""
121
121
"kind changed\n"
122
122
" File kind has been changed (e.g. from file to directory)."
124
124
"tipo cambiado\n"
125
125
" El tipo del archivo ha cambiado (p. e. de archivo a directorio)."
126
126
127
#: bzrlib/builtins.py:326
127
#: bzrlib/builtins.py:338
128
128
msgid ""
129
129
"unknown\n"
130
130
" Not versioned and not matching an ignore pattern."
132
132
"desconocido\n"
133
133
" Ni se ha versionado ni se ha encontrado un patrón ignorado."
134
134
135
#: bzrlib/builtins.py:329
135
#: bzrlib/builtins.py:341
136
136
msgid ""
137
137
"Additionally for directories, symlinks and files with a changed\n"
138
138
"executable bit, Bazaar indicates their type using a trailing\n"
145
145
"final: «/», «@» o «*» respectivamente. Estas decoraciones pueden ser\n"
146
146
"desactivadas usando la opción «--no-classify»."
147
147
148
#: bzrlib/builtins.py:334
148
#: bzrlib/builtins.py:346
149
149
msgid ""
150
150
"To see ignored files use 'bzr ignored'. For details on the\n"
151
151
"changes to file texts, use 'bzr diff'."
153
153
"Para ver archivos ignorados use «bzr ignored». Para más detalles en los \n"
154
154
"cambios de textos en los archivos, use «bzr diff»."
155
155
156
#: bzrlib/builtins.py:337
156
#: bzrlib/builtins.py:349
157
157
msgid ""
158
158
"Note that --short or -S gives status flags for each item, similar\n"
159
159
"to Subversion's status command. To get output similar to svn -q,\n"
165
165
"svn -q\n"
166
166
" use bzr status -SV."
167
167
168
#: bzrlib/builtins.py:341
168
#: bzrlib/builtins.py:353
169
169
msgid ""
170
170
"If no arguments are specified, the status of the entire working\n"
171
171
"directory is shown. Otherwise, only the status of the specified\n"
177
177
"archivos o directorios indicados. Si se proporciona un directorio, se\n"
178
178
"informa del estado de todo lo contenido en ese directorio."
179
179
180
#: bzrlib/builtins.py:346
180
#: bzrlib/builtins.py:358
181
181
msgid ""
182
182
"Before merges are committed, the pending merge tip revisions are\n"
183
183
"shown. To see all pending merge revisions, use the -v option.\n"
191
191
"use\n"
192
192
"la opción no-pending o indique un archivo/directorio."
193
193
194
#: bzrlib/builtins.py:351
194
#: bzrlib/builtins.py:363
195
195
msgid ""
196
196
"To compare the working directory to a specific revision, pass a\n"
197
197
"single revision to the revision argument."
199
199
"Para comparar el directorio de trabajo con una revisión concreta, pase una\n"
200
200
"única revisión como argumento a la revisión."
201
201
202
#: bzrlib/builtins.py:354
202
#: bzrlib/builtins.py:366
203
203
msgid ""
204
204
"To see which files have changed in a specific revision, or between\n"
205
205
"two revisions, pass a revision range to the revision argument.\n"
209
209
"dos revisiones, pase un rango de revisiones al argumento de la revisión.\n"
210
210
"Esto producirá los mismos resultados que llamar «bzr diff --summarize»."
211
211
212
#: bzrlib/builtins.py:363
212
#: bzrlib/builtins.py:375
213
213
msgid "Use short status indicators."
214
214
msgstr "Usar indicadores de estado cortos."
215
215
216
#: bzrlib/builtins.py:365
216
#: bzrlib/builtins.py:377
217
217
msgid "Only show versioned files."
218
218
msgstr "Solo mostrar archivos versionados."
219
219
220
#: bzrlib/builtins.py:367
220
#: bzrlib/builtins.py:379
221
221
msgid "Don't show pending merges."
222
222
msgstr "No mostrar fusiones pendientes."
223
223
224
#: bzrlib/builtins.py:370
224
#: bzrlib/builtins.py:382
225
225
msgid "Do not mark object type using indicator."
226
226
msgstr "No marcar tipo de objeto usando indicador."
227
227
228
#: bzrlib/builtins.py:385
228
#: bzrlib/builtins.py:397
229
229
msgid "bzr status --revision takes exactly one or two revision specifiers"
230
230
msgstr ""
231
231
"bzr status --revision toma exactamente uno o dos especificadores de revisión"
232
232
233
#: bzrlib/builtins.py:429 bzrlib/builtins.py:5183
233
#: bzrlib/builtins.py:441 bzrlib/builtins.py:5230
234
234
msgid "You can only supply one of revision_id or --revision"
235
235
msgstr "Puede suiministrar solo uno revision_id o --revision"
236
236
237
#: bzrlib/builtins.py:432 bzrlib/builtins.py:5185
237
#: bzrlib/builtins.py:444 bzrlib/builtins.py:5232
238
238
msgid "You must supply either --revision or a revision_id"
239
239
msgstr "Puede suiministrar ambos revision_id o --revision"
240
240
241
#: bzrlib/builtins.py:439
241
#: bzrlib/builtins.py:451
242
242
#, python-format
243
243
msgid "Repository %r does not support access to raw revision texts"
244
244
msgstr "El repositorio %r no permite acceso a textos de revisión en bruto"
245
245
246
#: bzrlib/builtins.py:450
246
#: bzrlib/builtins.py:462
247
247
msgid "The repository {0} contains no revision {1}."
248
248
msgstr "El repositorio {0} no contiene revisión {1}."
249
249
250
#: bzrlib/builtins.py:457
250
#: bzrlib/builtins.py:469
251
251
msgid "You cannot specify a NULL revision."
252
252
msgstr "No puede especificar una revisión NULL."
253
253
254
#: bzrlib/builtins.py:549
254
#: bzrlib/builtins.py:561
255
255
msgid "Remove the working tree from a given branch/checkout."
256
256
msgstr "Eliminar el árbol de trabajo de una rama/comprobación dada"
257
257
258
#: bzrlib/builtins.py:551
258
#: bzrlib/builtins.py:563
259
259
msgid ""
260
260
"Since a lightweight checkout is little more than a working tree\n"
261
261
"this will refuse to run against one."
263
263
"Dado que una extracción ligera es poco más que un árbol de trabajo\n"
264
264
"esto impedirá que se ejecute contra una."
265
265
266
#: bzrlib/builtins.py:554
266
#: bzrlib/builtins.py:566
267
267
msgid "To re-create the working tree, use \"bzr checkout\"."
268
268
msgstr "Para recrear el árbol de trabajo, use «bzr checkout»."
269
269
270
#: bzrlib/builtins.py:560
270
#: bzrlib/builtins.py:572
271
271
msgid ""
272
272
"Remove the working tree even if it has uncommitted or shelved changes."
273
273
msgstr ""
274
274
"Eliminar el árbol de trabajo incluso si tiene cambios no confirmados o "
275
275
"archivados."
276
276
277
#: bzrlib/builtins.py:574
277
#: bzrlib/builtins.py:586
278
278
msgid "No working tree to remove"
279
279
msgstr "No existe un árbol de trabajo para eliminar"
280
280
281
#: bzrlib/builtins.py:576
281
#: bzrlib/builtins.py:588
282
282
msgid "You cannot remove the working tree of a remote path"
283
283
msgstr "No puede eliminar el árbol de trabajo de una ruta remota"
284
284
285
#: bzrlib/builtins.py:585
285
#: bzrlib/builtins.py:597
286
286
msgid "You cannot remove the working tree from a lightweight checkout"
287
287
msgstr "No puede eliminar el árbol de trabajo desde una comprobación ligera"
288
288
289
#: bzrlib/builtins.py:625
289
#: bzrlib/builtins.py:637
290
290
msgid ""
291
291
"The tree does not appear to be corrupt. You probably want \"bzr revert\" "
292
292
"instead. Use \"--force\" if you are sure you want to reset the working tree."
295
295
"lugar. Use «--force» si está seguro de que quiere reiniciar el árbol de "
296
296
"trabajo."
297
297
298
#: bzrlib/builtins.py:636
298
#: bzrlib/builtins.py:648
299
299
msgid ""
300
300
", the header appears corrupt, try passing -r -1 to set the state to the last "
301
301
"commit"
303
303
", la cabecera parece corrupta, intente pasando -r -1 para establecer el "
304
304
"estado del último envío"
305
305
306
#: bzrlib/builtins.py:640
306
#: bzrlib/builtins.py:652
307
307
msgid "failed to reset the tree state{0}"
308
308
msgstr "fallo al restablecer el estado{0} del árbol"
309
309
310
#: bzrlib/builtins.py:644
310
#: bzrlib/builtins.py:656
311
311
msgid "Show current revision number."
312
312
msgstr "Mostrar número de revisión actual."
313
313
314
#: bzrlib/builtins.py:646
314
#: bzrlib/builtins.py:658
315
315
msgid "This is equal to the number of revisions on this branch."
316
316
msgstr "Esto es igual al número de revisiones en esta rama."
317
317
318
#: bzrlib/builtins.py:659
318
#: bzrlib/builtins.py:671
319
319
msgid "--tree and --revision can not be used together"
320
320
msgstr "--tree y --revision no se pueden usar juntos"
321
321
322
#: bzrlib/builtins.py:676 bzrlib/builtins.py:5967
322
#: bzrlib/builtins.py:688 bzrlib/builtins.py:5986
323
323
msgid "Tags can only be placed on a single revision, not on a range"
324
324
msgstr ""
325
325
"Las etiquetas solo se pueden emplazar en una única revisión, no en un rango."
326
326
327
#: bzrlib/builtins.py:700
327
#: bzrlib/builtins.py:712
328
328
msgid "Show revno of working tree."
329
329
msgstr "Mostrar número de revisión del árbol de trabajo."
330
330
331
#: bzrlib/builtins.py:748
331
#: bzrlib/builtins.py:760
332
332
msgid "Add specified files or directories."
333
333
msgstr "Añadir archivos especificados o directorios."
334
334
335
#: bzrlib/builtins.py:750
335
#: bzrlib/builtins.py:762
336
336
msgid ""
337
337
"In non-recursive mode, all the named items are added, regardless\n"
338
338
"of whether they were previously ignored. A warning is given if\n"
342
342
"sin tener en cuenta que hayan sido previamente ignorados. Se avisa si\n"
343
343
"cualquiera de los archivos nombrados ya está versionado."
344
344
345
#: bzrlib/builtins.py:754
345
#: bzrlib/builtins.py:766
346
346
msgid ""
347
347
"In recursive mode (the default), files are treated the same way\n"
348
348
"but the behaviour for directories is different. Directories that\n"
361
361
"son añadidos. Esta búsqueda procede recursivamente por los directorios\n"
362
362
"versionados. SI no se indican nombres se asume «.»."
363
363
364
#: bzrlib/builtins.py:762
364
#: bzrlib/builtins.py:774
365
365
msgid ""
366
366
"A warning will be printed when nested trees are encountered,\n"
367
367
"unless they are explicitly ignored."
369
369
"Se imprimirá un aviso cuando se encuentren árboles anidados\n"
370
370
"a menos que se ignoren explícitamente."
371
371
372
#: bzrlib/builtins.py:765
372
#: bzrlib/builtins.py:777
373
373
msgid ""
374
374
"Therefore simply saying 'bzr add' will version all files that\n"
375
375
"are currently unknown."
377
377
"Por lo tanto, simplemente diciendo «bzr add» versionará todos los archivos\n"
378
378
"desconocidos actualmente."
379
379
380
#: bzrlib/builtins.py:768
380
#: bzrlib/builtins.py:780
381
381
msgid ""
382
382
"Adding a file whose parent directory is not versioned will\n"
383
383
"implicitly add the parent, and so on up to the root. This means\n"
389
389
"significa que nunca necesitaría añadir explícitamente un directorio,\n"
390
390
"ya que serán añadidos cuando añada un archivo del directorio."
391
391
392
#: bzrlib/builtins.py:773
392
#: bzrlib/builtins.py:785
393
393
msgid ""
394
394
"--dry-run will show which files would be added, but not actually\n"
395
395
"add them."
397
397
"--dry-run mostrará que archivos se pueden añadir, pero no los\n"
398
398
"añade realmente."
399
399
400
#: bzrlib/builtins.py:776
400
#: bzrlib/builtins.py:788
401
401
msgid ""
402
402
"--file-ids-from will try to use the file ids from the supplied path.\n"
403
403
"It looks up ids trying to find a matching parent directory with the\n"
415
415
"diferentes como un conflicto). También es útil al fusionar otro proyecto\n"
416
416
"en un subdirectorio de éste."
417
417
418
#: bzrlib/builtins.py:784
418
#: bzrlib/builtins.py:796
419
419
msgid ""
420
420
"Any files matching patterns in the ignore list will not be added\n"
421
421
"unless they are explicitly mentioned."
424
424
"se añadirá\n"
425
425
"salvo que se mencione explícitamente."
426
426
427
#: bzrlib/builtins.py:787
427
#: bzrlib/builtins.py:799
428
428
msgid ""
429
429
"In recursive mode, files larger than the configuration option \n"
430
430
"add.maximum_file_size will be skipped. Named items are never skipped due\n"
435
435
"omitirán\n"
436
436
"por su tamaño."
437
437
438
#: bzrlib/builtins.py:794
438
#: bzrlib/builtins.py:806
439
439
msgid "Don't recursively add the contents of directories."
440
440
msgstr "No añade de manera recursiva los contenidos de los directorios."
441
441
442
#: bzrlib/builtins.py:800
442
#: bzrlib/builtins.py:813
443
443
msgid "Lookup file ids from this tree."
444
444
msgstr "Buscar id de archivos desde este árbol."
445
445
446
#: bzrlib/builtins.py:836
446
#: bzrlib/builtins.py:849
447
447
msgid "ignored {0} matching \"{1}\"\n"
448
448
msgstr "ignorado {0} coincidente «{1}»\n"
449
449
450
#: bzrlib/builtins.py:841
450
#: bzrlib/builtins.py:854
451
451
msgid "Create a new versioned directory."
452
452
msgstr "Crear un directorio versionado nuevo."
453
453
454
#: bzrlib/builtins.py:843
454
#: bzrlib/builtins.py:856
455
455
msgid "This is equivalent to creating the directory and then adding it."
456
456
msgstr "Esto es equivalente a crear el directorio y luego añadirlo."
457
457
458
#: bzrlib/builtins.py:850
458
#: bzrlib/builtins.py:863
459
459
msgid "No error if existing, make parent directories as needed."
460
460
msgstr ""
461
461
"Sin error si existen, creará los directorios padre según se necesiten."
462
462
463
#: bzrlib/builtins.py:884
463
#: bzrlib/builtins.py:897
464
464
#, python-format
465
465
msgid "added %s\n"
466
466
msgstr "añadido %s\n"
467
467
468
#: bzrlib/builtins.py:926
468
#: bzrlib/builtins.py:939
469
469
#, python-format
470
470
msgid "invalid kind %r specified"
471
471
msgstr "tipo inválido %r especificado"
472
472
473
#: bzrlib/builtins.py:963
473
#: bzrlib/builtins.py:976
474
474
msgid "Move or rename a file."
475
475
msgstr "Mover o renombrar un archivo."
476
476
477
#: bzrlib/builtins.py:965
477
#: bzrlib/builtins.py:978
478
478
msgid " bzr mv SOURCE... DESTINATION"
479
479
msgstr " bzr mv ORIGEN... DESTINO"
480
480
481
#: bzrlib/builtins.py:967
481
#: bzrlib/builtins.py:980
482
482
msgid ""
483
483
"If the last argument is a versioned directory, all the other names\n"
484
484
"are moved into it. Otherwise, there must be exactly two arguments\n"
488
488
"se moverán a él. De otra forma, deben haber exactamente dos argumentos\n"
489
489
"y el archivo se cambia al nuevo nombre."
490
490
491
#: bzrlib/builtins.py:971
491
#: bzrlib/builtins.py:984
492
492
msgid ""
493
493
"If OLDNAME does not exist on the filesystem but is versioned and\n"
494
494
"NEWNAME does exist on the filesystem but is not versioned, mv\n"
502
502
"inventario interno para reflejar ese cambio.\n"
503
503
"Lo mismo es válido cuando se mueven muchos archivos ORIGEN a un DESTINO."
504
504
505
#: bzrlib/builtins.py:977
505
#: bzrlib/builtins.py:990
506
506
msgid "Files cannot be moved between branches."
507
507
msgstr "Los archivos no se pueden mover entre ramas."
508
508
509
#: bzrlib/builtins.py:984
509
#: bzrlib/builtins.py:997
510
510
msgid ""
511
511
"Move only the bzr identifier of the file, because the file has already been "
512
512
"moved."
514
514
"Mover solo el identificador bzr del archivo, porque el archivo ya ha sido "
515
515
"movido."
516
516
517
#: bzrlib/builtins.py:986
517
#: bzrlib/builtins.py:999
518
518
msgid "Automatically guess renames."
519
519
msgstr "Adivinar automáticamente rel renombrado."
520
520
521
#: bzrlib/builtins.py:987
521
#: bzrlib/builtins.py:1000
522
522
msgid "Avoid making changes when guessing renames."
523
523
msgstr "Evitar hacer cambios cunado se adivina el renombrado."
524
524
525
#: bzrlib/builtins.py:996
525
#: bzrlib/builtins.py:1009
526
526
msgid "--dry-run requires --auto."
527
527
msgstr "--dry-run requiere --auto."
528
528
529
#: bzrlib/builtins.py:1000
529
#: bzrlib/builtins.py:1013
530
530
msgid "missing file argument"
531
531
msgstr "falta el argumento de archivo"
532
532
533
#: bzrlib/builtins.py:1004
533
#: bzrlib/builtins.py:1017
534
534
msgid "can not move root of branch"
535
535
msgstr "no se puede mover la raíz de la rama"
536
536
537
#: bzrlib/builtins.py:1010
537
#: bzrlib/builtins.py:1023
538
538
msgid "Only one path may be specified to --auto."
539
539
msgstr "Solo se puede especificar una ruta a --auto"
540
540
541
#: bzrlib/builtins.py:1013
541
#: bzrlib/builtins.py:1026
542
542
msgid "--after cannot be specified with --auto."
543
543
msgstr "--after no se puede especificar con --auto."
544
544
545
#: bzrlib/builtins.py:1050
545
#: bzrlib/builtins.py:1062
546
546
msgid "to mv multiple files the destination must be a versioned directory"
547
547
msgstr ""
548
548
"para hacer mv a múltiples archivos el destino debe ser un directorio "
549
549
"versionado"
550
550
551
#: bzrlib/builtins.py:1102
551
#: bzrlib/builtins.py:1114
552
552
msgid "Turn this branch into a mirror of another branch."
553
553
msgstr "Cambiar esta rama a una réplica de otra rama."
554
554
555
#: bzrlib/builtins.py:1104
555
#: bzrlib/builtins.py:1116
556
556
msgid ""
557
557
"By default, this command only works on branches that have not diverged.\n"
558
558
"Branches are considered diverged if the destination branch's most recent \n"
564
564
"rama destino es una que no ha sido fusionada (directa o indirectamente) \n"
565
565
"en el padre."
566
566
567
#: bzrlib/builtins.py:1109
567
#: bzrlib/builtins.py:1121
568
568
msgid ""
569
569
"If branches have diverged, you can use 'bzr merge' to integrate the changes\n"
570
570
"from one into the other. Once one branch has merged, the other should\n"
575
575
"de una en la otra. Una vez que una rama se ha fusionado, la otra debería\n"
576
576
"ser capaz de extraer de nuevo."
577
577
578
#: bzrlib/builtins.py:1113
578
#: bzrlib/builtins.py:1125
579
579
msgid ""
580
580
"If you want to replace your local changes and just want your branch to\n"
581
581
"match the remote one, use pull --overwrite. This will work even if the two\n"
585
585
"coincida con la remota, use pull --overwrite. Esto funcionará incluso\n"
586
586
"si las dos ramas han divergido."
587
587
588
#: bzrlib/builtins.py:1117
588
#: bzrlib/builtins.py:1129
589
589
msgid ""
590
590
"If there is no default location set, the first pull will set it (use\n"
591
591
"--no-remember to avoid setting it). After that, you can omit the\n"
597
597
"ubicación para usar la predeterminada. Para cambiarla, use --remember. El\n"
598
598
"valor solo se guardará si la ubicación remota es accesible."
599
599
600
#: bzrlib/builtins.py:1122
600
#: bzrlib/builtins.py:1134
601
601
msgid ""
602
602
"The --verbose option will display the revisions pulled using the log_format\n"
603
603
"configuration option. You can use a different format by overriding it with\n"
607
607
"configuración log_format. Puede usar un formato distinto redefiniéndolo\n"
608
608
"con -Olog_format=<otro_formato>."
609
609
610
#: bzrlib/builtins.py:1126
610
#: bzrlib/builtins.py:1138
611
611
msgid ""
612
612
"Note: The location can be specified either in the form of a branch,\n"
613
613
"or in the form of a path to a file containing a merge directive generated\n"
617
617
"o en forma de una ruta a un archivo conteniendo una directiva de\n"
618
618
"fusión generada con bzr send."
619
619
620
#: bzrlib/builtins.py:1134
620
#: bzrlib/builtins.py:1146
621
621
msgid "Show logs of pulled revisions."
622
622
msgstr "Mostrar registros de revisiones extraídas."
623
623
624
#: bzrlib/builtins.py:1136
624
#: bzrlib/builtins.py:1148
625
625
msgid ""
626
626
"Branch to pull into, rather than the one containing the working directory."
627
627
msgstr ""
628
628
"Rama en la que extraer, en lugar de la que contiene el directorio de trabajo."
629
629
630
#: bzrlib/builtins.py:1139
630
#: bzrlib/builtins.py:1151
631
631
msgid ""
632
632
"Perform a local pull in a bound branch. Local pulls are not applied to the "
633
633
"master branch."
635
635
"Efectuar una extracción local en una rama ligada. Las extracciones locales "
636
636
"no se aplican a la rama maestra."
637
637
638
#: bzrlib/builtins.py:1168
638
#: bzrlib/builtins.py:1189
639
639
msgid "Need working tree for --show-base."
640
640
msgstr "Se necesita árbol de trabajo para --show-base."
641
641
642
#: bzrlib/builtins.py:1184
642
#: bzrlib/builtins.py:1205
643
643
msgid "No pull location known or specified."
644
644
msgstr "Ubicación de extración no conocida ni indicada."
645
645
646
#: bzrlib/builtins.py:1190
646
#: bzrlib/builtins.py:1211
647
647
#, python-format
648
648
msgid "Using saved parent location: %s\n"
649
649
msgstr "Usar ubicaciones padre guardadas: %s\n"
650
650
651
#: bzrlib/builtins.py:1197 bzrlib/builtins.py:4393
651
#: bzrlib/builtins.py:1218 bzrlib/builtins.py:4425
652
652
msgid "Cannot use -r with merge directives or bundles"
653
653
msgstr "No se puede usar -r con directivas de fusión o paquetes"
654
654
655
#: bzrlib/builtins.py:1238
655
#: bzrlib/builtins.py:1261
656
656
msgid "Update a mirror of this branch."
657
657
msgstr "Actualizar una réplica de esta rama."
658
658
659
#: bzrlib/builtins.py:1240
659
#: bzrlib/builtins.py:1263
660
660
msgid ""
661
661
"The target branch will not have its working tree populated because this\n"
662
662
"is both expensive, and is not supported on remote file systems."
664
664
"El árbol de trabajo de la rama destino no se rellenará porque esto\n"
665
665
"es tanto costoso como no soportado por sistemas de archivos remotos."
666
666
667
#: bzrlib/builtins.py:1243
667
#: bzrlib/builtins.py:1266
668
668
msgid ""
669
669
"Some smart servers or protocols *may* put the working tree in place in\n"
670
670
"the future."
673
673
"trabajo\n"
674
674
"en su lugar en el futuro."
675
675
676
#: bzrlib/builtins.py:1246
676
#: bzrlib/builtins.py:1269
677
677
msgid ""
678
678
"This command only works on branches that have not diverged. Branches are\n"
679
679
"considered diverged if the destination branch's most recent commit is one\n"
683
683
"consideran divergidas si la confirmación más reciente de la rama destino es\n"
684
684
"una que no ha sido fusionada (directa o indirectamente) por la rama origen."
685
685
686
#: bzrlib/builtins.py:1250
686
#: bzrlib/builtins.py:1273
687
687
msgid ""
688
688
"If branches have diverged, you can use 'bzr push --overwrite' to replace\n"
689
689
"the other branch completely, discarding its unmerged changes."
692
692
"reemplazar\n"
693
693
"la otra rama completamente, descartando sus cambios no fusionados."
694
694
695
#: bzrlib/builtins.py:1253
695
#: bzrlib/builtins.py:1276
696
696
msgid ""
697
697
"If you want to ensure you have the different changes in the other branch,\n"
698
698
"do a merge (see bzr help merge) from the other branch, and commit that.\n"
702
702
"haga una fusión (vea bzr help merge) desde la otra rama y confirmela.\n"
703
703
"Después eso será capaz de hacer una inserción sin «--overwrite»."
704
704
705
#: bzrlib/builtins.py:1257
705
#: bzrlib/builtins.py:1280
706
706
msgid ""
707
707
"If there is no default push location set, the first push will set it (use\n"
708
708
"--no-remember to avoid setting it). After that, you can omit the\n"
717
717
"predeterminada, usar --remember. El\n"
718
718
"parámetro solo será guardado si es posible el acceso a la ubicación remota."
719
719
720
#: bzrlib/builtins.py:1262
720
#: bzrlib/builtins.py:1285
721
721
msgid ""
722
722
"The --verbose option will display the revisions pushed using the log_format\n"
723
723
"configuration option. You can use a different format by overriding it with\n"
727
727
"configuración log_format. Puede usar un formato distinto redefiniéndolo\n"
728
728
"con -Olog_format=<otro_formato>."
729
729
730
#: bzrlib/builtins.py:1273 bzrlib/foreign.py:272
730
#: bzrlib/builtins.py:1296 bzrlib/foreign.py:272
731
731
msgid ""
732
732
"Branch to push from, rather than the one containing the working directory."
733
733
msgstr ""
734
734
"Rama desde la que impulsar en vez de la que contiene el directorio de "
735
735
"trabajo."
736
736
737
#: bzrlib/builtins.py:1276
737
#: bzrlib/builtins.py:1299
738
738
msgid ""
739
739
"By default push will fail if the target directory exists, but does not "
740
740
"already have a control directory. This flag will allow push to proceed."
742
742
"Por defecto «push» fallará si el directorio destino existe, pero no tiene "
743
743
"todavía un directorio de control. Este marcador permitirá a «push» proceder."
744
744
745
#: bzrlib/builtins.py:1281
745
#: bzrlib/builtins.py:1304
746
746
msgid ""
747
747
"Create a stacked branch that references the public location of the parent "
748
748
"branch."
750
750
"Crear una rama apilada que referencia a la ubicación pública de la rama "
751
751
"padre."
752
752
753
#: bzrlib/builtins.py:1284
753
#: bzrlib/builtins.py:1307
754
754
msgid ""
755
755
"Create a stacked branch that refers to another branch for the commit "
756
756
"history. Only the work not present in the referenced branch is included in "
760
760
"confirmaciones. Solo el trabajo no presente en la rama referenciada se "
761
761
"incluye en la rama creada."
762
762
763
#: bzrlib/builtins.py:1289 bzrlib/foreign.py:279
763
#: bzrlib/builtins.py:1312 bzrlib/foreign.py:279
764
764
msgid ""
765
765
"Refuse to push if there are uncommitted changes in the working tree, --no-"
766
766
"strict disables the check."
768
768
"Rechazar empujar si hay cambios sin ejecutar en el árbol de trabajo, --no-"
769
769
"strict desactiva la comprobación."
770
770
771
#: bzrlib/builtins.py:1292
771
#: bzrlib/builtins.py:1315
772
772
msgid "Don't populate the working tree, even for protocols that support it."
773
773
msgstr ""
774
774
"No rellenar el árbol de trabajo, incluso para los protocolos que lo permitan."
775
775
776
#: bzrlib/builtins.py:1336
776
#: bzrlib/builtins.py:1318
777
msgid "Overwrite tags only."
778
msgstr ""
779
780
#: bzrlib/builtins.py:1369
777
781
msgid "Could not determine branch to refer to."
778
782
msgstr "No se puede determinar la rama a la que referirse."
779
783
780
#: bzrlib/builtins.py:1345
784
#: bzrlib/builtins.py:1378
781
785
#, python-format
782
786
msgid ""
783
787
"No push location known or specified. To push to the parent branch (at %s), "
786
790
"Ubicación de inserción no conocida ni indicada. Para insertar en la rama "
787
791
"padre (en %s), use «bzr push :parent»."
788
792
789
#: bzrlib/builtins.py:1351 bzrlib/foreign.py:306
793
#: bzrlib/builtins.py:1384 bzrlib/foreign.py:306
790
794
msgid "No push location known or specified."
791
795
msgstr "No hay una ubicación para impulsar conocida o especificada."
792
796
793
#: bzrlib/builtins.py:1355
797
#: bzrlib/builtins.py:1388
794
798
#, python-format
795
799
msgid "Using saved push location: %s"
796
800
msgstr "Usar la ubicación para impulsar guardada: %s"
797
801
798
#: bzrlib/builtins.py:1365
802
#: bzrlib/builtins.py:1398
799
803
msgid "Create a new branch that is a copy of an existing branch."
800
804
msgstr "Crea una nueva rama que es una copia de la rama existente."
801
805
802
#: bzrlib/builtins.py:1367
806
#: bzrlib/builtins.py:1400
803
807
msgid ""
804
808
"If the TO_LOCATION is omitted, the last component of the FROM_LOCATION will\n"
805
809
"be used. In other words, \"branch ../foo/bar\" will attempt to create "
817
821
"de unidad, si existe alguno. Por ejemplo, «branch lp:foo-bar» intentará "
818
822
"crear ./foo-bar."
819
823
820
#: bzrlib/builtins.py:1374
824
#: bzrlib/builtins.py:1407
821
825
msgid ""
822
826
"To retrieve the branch as of a particular revision, supply the --revision\n"
823
827
"parameter, as in \"branch foo/bar -r 5\"."
826
830
"-revision\n"
827
831
"como en «branch foo/bar -r 5»."
828
832
829
#: bzrlib/builtins.py:1377
833
#: bzrlib/builtins.py:1410
830
834
msgid "The synonyms 'clone' and 'get' for this command are deprecated."
831
835
msgstr "Los sinónimos «clone» y «get» para esta orden están obsoletos."
832
836
833
#: bzrlib/builtins.py:1387
837
#: bzrlib/builtins.py:1420
834
838
msgid "Create a branch without a working-tree."
835
839
msgstr "Crear una rama sin directorio de trabajo."
836
840
837
#: bzrlib/builtins.py:1389
841
#: bzrlib/builtins.py:1422
838
842
msgid "Switch the checkout in the current directory to the new branch."
839
843
msgstr "Cambiar la comprobación en el directorio actual a la rama nueva."
840
844
841
#: bzrlib/builtins.py:1392
845
#: bzrlib/builtins.py:1425
842
846
msgid ""
843
847
"Create a stacked branch referring to the source branch. The new branch will "
844
848
"depend on the availability of the source branch for all operations."
846
850
"Crear una rama apilada refiriéndose a la rama origen. La nueva rama "
847
851
"dependerá de la disponibilidad de la rama fuente para todas las operaciones."
848
852
849
#: bzrlib/builtins.py:1396
853
#: bzrlib/builtins.py:1429
850
854
msgid "Do not use a shared repository, even if available."
851
855
msgstr "No usar un repositorio compartido, incluso si está disponible."
852
856
853
#: bzrlib/builtins.py:1398
857
#: bzrlib/builtins.py:1431
854
858
msgid ""
855
859
"By default branch will fail if the target directory exists, but does not "
856
860
"already have a control directory. This flag will allow branch to proceed."
859
863
"todavía un directorio de control. Este marcador permitirá a «branch» "
860
864
"proceder."
861
865
862
#: bzrlib/builtins.py:1403
866
#: bzrlib/builtins.py:1436
863
867
msgid "Bind new branch to from location."
864
868
msgstr "Vincular una rama nueva desde la ubicación."
865
869
866
#: bzrlib/builtins.py:1450
870
#: bzrlib/builtins.py:1483
867
871
#, python-format
868
872
msgid "Target directory \"%s\" already exists."
869
873
msgstr "El directorio objetivo «%s» ya existe."
870
874
871
#: bzrlib/builtins.py:1462
875
#: bzrlib/builtins.py:1495
872
876
#, python-format
873
877
msgid "Parent of \"%s\" does not exist."
874
878
msgstr "El padre de «%s» no existe."
875
879
876
#: bzrlib/builtins.py:1481
880
#: bzrlib/builtins.py:1514
877
881
msgid "The branch {0} has no revision {1}."
878
882
msgstr "La rama {0} no tiene revisión {1}."
879
883
880
#: bzrlib/builtins.py:1496 bzrlib/push.py:53
884
#: bzrlib/builtins.py:1529 bzrlib/push.py:53
881
885
#, python-format
882
886
msgid "Created new stacked branch referring to %s."
883
887
msgstr "Creada rama apilada nueva referida a %s."
884
888
885
#: bzrlib/builtins.py:1500
889
#: bzrlib/builtins.py:1533
886
890
#, python-format
887
891
msgid "Branched %d revision."
888
892
msgid_plural "Branched %d revisions."
889
893
msgstr[0] "%d revisión enramada"
890
894
msgstr[1] "%d revisiones enramadas"
891
895
892
#: bzrlib/builtins.py:1505
896
#: bzrlib/builtins.py:1538
893
897
#, python-format
894
898
msgid "New branch bound to %s"
895
899
msgstr "Nueva rama unida a %s"
896
900
897
#: bzrlib/builtins.py:1510 bzrlib/builtins.py:6256
901
#: bzrlib/builtins.py:1543 bzrlib/builtins.py:6280
898
902
#, python-format
899
903
msgid "Switched to branch: %s"
900
904
msgstr "Cambiado a la rama: %s"
901
905
902
#: bzrlib/builtins.py:1515
906
#: bzrlib/builtins.py:1548
903
907
msgid "List the branches available at the current location."
904
908
msgstr "Lista las ramas disponibles en la ubicación actual."
905
909
906
#: bzrlib/builtins.py:1517
910
#: bzrlib/builtins.py:1550
907
911
msgid ""
908
912
"This command will print the names of all the branches at the current\n"
909
913
"location."
911
915
"Esta orden imprimirá los nombres de todas las ramas en la ubicación\n"
912
916
"actual."
913
917
914
#: bzrlib/builtins.py:1524
918
#: bzrlib/builtins.py:1557
915
919
msgid ""
916
920
"Recursively scan for branches rather than just looking in the specified "
917
921
"location."
919
923
"Buscar recursivamente en las ramas en lugar de mirar solo en la ubicación "
920
924
"indicada."
921
925
922
#: bzrlib/builtins.py:1554
926
#: bzrlib/builtins.py:1586
923
927
msgid "(default)"
924
928
msgstr "(predeterminado)"
925
929
926
#: bzrlib/builtins.py:1566
930
#: bzrlib/builtins.py:1598
927
931
msgid "Create a new checkout of an existing branch."
928
932
msgstr "Crea una nueva comprobación de una rama existente."
929
933
930
#: bzrlib/builtins.py:1568
934
#: bzrlib/builtins.py:1600
931
935
msgid ""
932
936
"If BRANCH_LOCATION is omitted, checkout will reconstitute a working tree "
933
937
"for\n"
943
947
"\n"
944
948
"usando SFTP."
945
949
946
#: bzrlib/builtins.py:1573
950
#: bzrlib/builtins.py:1605
947
951
msgid ""
948
952
"If the TO_LOCATION is omitted, the last component of the BRANCH_LOCATION "
949
953
"will\n"
963
967
"de unidad, si existe alguno. Por ejemplo, «branch lp:foo-bar» intentará "
964
968
"crear ./foo-bar."
965
969
966
#: bzrlib/builtins.py:1580
970
#: bzrlib/builtins.py:1612
967
971
msgid ""
968
972
"To retrieve the branch as of a particular revision, supply the --revision\n"
969
973
"parameter, as in \"checkout foo/bar -r 5\". Note that this will be "
978
982
"desfasado [por lo que no puede confirmar] pero aún así puede ser útil (por \n"
979
983
"ejemplo, para examinar código antiguo)."
980
984
981
#: bzrlib/builtins.py:1590
985
#: bzrlib/builtins.py:1622
982
986
msgid ""
983
987
"Perform a lightweight checkout. Lightweight checkouts depend on access to "
984
988
"the branch for every operation. Normal checkouts can perform common "
990
994
"operaciones habituales como diff y status sin este acceso, así como permitir "
991
995
"confirmaciones locales."
992
996
993
#: bzrlib/builtins.py:1597
997
#: bzrlib/builtins.py:1629
994
998
msgid "Get file contents from this tree."
995
999
msgstr "Conseguir contenidos de archivo desde este árbol."
996
1000
997
#: bzrlib/builtins.py:1599
1001
#: bzrlib/builtins.py:1631
998
1002
msgid "Hard-link working tree files where possible."
999
1003
msgstr ""
1000
1004
"Vincular de forma dura los archivos del árbol de trabajo donde sea posible."
1001
1005
1002
#: bzrlib/builtins.py:1640
1006
#: bzrlib/builtins.py:1672
1003
1007
msgid ""
1004
1008
"Show list of renamed files.\n"
1005
1009
" "
1007
1011
"Mostrar la lista de archivos renombrados\n"
1008
1012
" "
1009
1013
1010
#: bzrlib/builtins.py:1670
1014
#: bzrlib/builtins.py:1700
1011
1015
msgid "Update a working tree to a new revision."
1012
1016
msgstr "Actualiza un árbol de trabajo a una revisión nueva."
1013
1017
1014
#: bzrlib/builtins.py:1672
1018
#: bzrlib/builtins.py:1702
1015
1019
msgid ""
1016
1020
"This will perform a merge of the destination revision (the tip of the\n"
1017
1021
"branch, or the specified revision) into the working tree, and then make\n"
1021
1025
"rama, o la revisión indicada) en el árbol de trabajo, y hará esa\n"
1022
1026
"revisión la revisión base del árbol de trabajo. "
1023
1027
1024
#: bzrlib/builtins.py:1676
1028
#: bzrlib/builtins.py:1706
1025
1029
msgid ""
1026
1030
"You can use this to visit an older revision, or to update a working tree\n"
1027
1031
"that is out of date from its branch."
1030
1034
"árbol de trabajo\n"
1031
1035
"que esté desactualizado de su rama."
1032
1036
1033
#: bzrlib/builtins.py:1679
1037
#: bzrlib/builtins.py:1709
1034
1038
msgid ""
1035
1039
"If there are any uncommitted changes in the tree, they will be carried\n"
1036
1040
"across and remain as uncommitted changes after the update. To discard\n"
1042
1046
"estos cambios, use «bzr revert». Los cambios no confirmados puede entrar\n"
1043
1047
"en conflicto con los cambios traídos por modificaciones en la revisión base."
1044
1048
1045
#: bzrlib/builtins.py:1684
1049
#: bzrlib/builtins.py:1714
1046
1050
msgid ""
1047
1051
"If the tree's branch is bound to a master branch, bzr will also update\n"
1048
1052
"the branch from the master."
1051
1055
"actualizará\n"
1052
1056
"la rama de la superior."
1053
1057
1054
#: bzrlib/builtins.py:1687
1058
#: bzrlib/builtins.py:1717
1055
1059
msgid ""
1056
1060
"You cannot update just a single file or directory, because each Bazaar\n"
1057
1061
"working tree has just a single basis revision. If you want to restore a\n"
1068
1072
"el\n"
1069
1073
"contenido antiguo de ese archivo en una nueva ubicación."
1070
1074
1071
#: bzrlib/builtins.py:1694
1075
#: bzrlib/builtins.py:1724
1072
1076
msgid ""
1073
1077
"The 'dir' argument, if given, must be the location of the root of a\n"
1074
1078
"working tree to update. By default, the working tree that contains the \n"
1078
1082
"árbol de trabajo a actualizar. Por defecto, se usa el árbol de trabajo \n"
1079
1083
"que contiene el directorio de trabajo actual."
1080
1084
1081
#: bzrlib/builtins.py:1710
1085
#: bzrlib/builtins.py:1740
1082
1086
msgid "bzr update --revision takes exactly one revision"
1083
1087
msgstr "bzr update --revision toma exactamente una revisión"
1084
1088
1085
#: bzrlib/builtins.py:1718
1089
#: bzrlib/builtins.py:1748
1086
1090
msgid "bzr update can only update a whole tree, not a file or subdirectory"
1087
1091
msgstr ""
1088
1092
"bzr update solo puede actualizar todo un árbol, no un archivo o subdirectorio"
1089
1093
1090
#: bzrlib/builtins.py:1749
1094
#: bzrlib/builtins.py:1779
1091
1095
msgid "Tree is up to date at revision {0} of branch {1}"
1092
1096
msgstr "El árbol está actualizado en la revisión {0} de la rama {1}"
1093
1097
1094
#: bzrlib/builtins.py:1765
1098
#: bzrlib/builtins.py:1795
1095
1099
#, python-format
1096
1100
msgid ""
1097
1101
"branch has no revision %s\n"
1101
1105
"bzr update --revision solo funciona para una revisión en el histórico de la "
1102
1106
"rama"
1103
1107
1104
#: bzrlib/builtins.py:1771
1108
#: bzrlib/builtins.py:1801
1105
1109
msgid "Updated to revision {0} of branch {1}"
1106
1110
msgstr "Actualizado a la revisión {0} de la rama {1}"
1107
1111
1108
#: bzrlib/builtins.py:1775
1112
#: bzrlib/builtins.py:1805
1109
1113
msgid ""
1110
1114
"Your local commits will now show as pending merges with 'bzr status', and "
1111
1115
"can be committed with 'bzr commit'."
1113
1117
"Sus confirmaciones locales serán ahora mostradas como fusiones pendientes "
1114
1118
"con «bzr status», y pueden ser confirmadas con «bzr commit»."
1115
1119
1116
#: bzrlib/builtins.py:1784
1120
#: bzrlib/builtins.py:1814
1117
1121
msgid "Show information about a working tree, branch or repository."
1118
1122
msgstr "Muestra información sobre un árbol de trabajo, rama o repositorio."
1119
1123
1120
#: bzrlib/builtins.py:1786
1124
#: bzrlib/builtins.py:1816
1121
1125
msgid ""
1122
1126
"This command will show all known locations and formats associated to the\n"
1123
1127
"tree, branch or repository."
1125
1129
"Esta orden mostrará todas las ubicaciones conocidas y formatos asociados a\n"
1126
1130
"árbol, rama o repositorio."
1127
1131
1128
#: bzrlib/builtins.py:1789
1132
#: bzrlib/builtins.py:1819
1129
1133
msgid ""
1130
1134
"In verbose mode, statistical information is included with each report.\n"
1131
1135
"To see extended statistic information, use a verbosity level of 2 or\n"
1136
1140
"o\n"
1137
1141
"superior indicando la opción verbosa varias veces, p.e. -vv."
1138
1142
1139
#: bzrlib/builtins.py:1793
1143
#: bzrlib/builtins.py:1823
1140
1144
msgid "Branches and working trees will also report any missing revisions."
1141
1145
msgstr ""
1142
1146
"Las ramas y los árboles de trabajo informarán también de cualquier revisión "
1143
1147
"que falte."
1144
1148
1145
#: bzrlib/builtins.py:1795 bzrlib/builtins.py:3715 bzrlib/builtins.py:4845
1146
#: bzrlib/builtins.py:6442
1149
#: bzrlib/builtins.py:1825 bzrlib/builtins.py:3744 bzrlib/builtins.py:4885
1150
#: bzrlib/builtins.py:6466
1147
1151
msgid ":Examples:"
1148
1152
msgstr ":Ejemplos:"
1149
1153
1150
#: bzrlib/builtins.py:1797
1154
#: bzrlib/builtins.py:1827
1151
1155
msgid " Display information on the format and related locations:"
1152
1156
msgstr " Muestra información en el formato y ubicaciones relacionadas:"
1153
1157
1154
#: bzrlib/builtins.py:1799
1158
#: bzrlib/builtins.py:1829
1155
1159
msgid " bzr info"
1156
1160
msgstr " información bzr"
1157
1161
1158
#: bzrlib/builtins.py:1801
1162
#: bzrlib/builtins.py:1831
1159
1163
msgid ""
1160
1164
" Display the above together with extended format information and\n"
1161
1165
" basic statistics (like the number of files in the working tree and\n"
1165
1169
" estadísticas básicas (como el número de archivos en el árbol funcional y\n"
1166
1170
" el número de revisiones en la rama y el repositorio):"
1167
1171
1168
#: bzrlib/builtins.py:1805
1172
#: bzrlib/builtins.py:1835
1169
1173
msgid " bzr info -v"
1170
1174
msgstr " bzr info -v"
1171
1175
1172
#: bzrlib/builtins.py:1807
1176
#: bzrlib/builtins.py:1837
1173
1177
msgid " Display the above together with number of committers to the branch:"
1174
1178
msgstr " Mostrar lo anterior junto con el número de aplicadores de la rama:"
1175
1179
1176
#: bzrlib/builtins.py:1809
1180
#: bzrlib/builtins.py:1839
1177
1181
msgid " bzr info -vv"
1178
1182
msgstr " bzr info -vv"
1179
1183
1180
#: bzrlib/builtins.py:1828
1184
#: bzrlib/builtins.py:1858
1181
1185
msgid "Remove files or directories."
1182
1186
msgstr "Elimina archivos o directorios."
1183
1187
1184
#: bzrlib/builtins.py:1830
1188
#: bzrlib/builtins.py:1860
1185
1189
msgid ""
1186
1190
"This makes Bazaar stop tracking changes to the specified files. Bazaar will\n"
1187
1191
"delete them if they can easily be recovered using revert otherwise they\n"
1188
"will be backed up (adding an extention of the form .~#~). If no options or\n"
1192
"will be backed up (adding an extension of the form .~#~). If no options or\n"
1189
1193
"parameters are given Bazaar will scan for files that are being tracked by\n"
1190
1194
"Bazaar but missing in your tree and stop tracking them for you."
1191
1195
msgstr ""
1192
"Esto hace que Bazaar deje de revisar los cambios en los archivos "
1193
"especificados.\n"
1194
"Bazaar los borrará si estos pueden ser fácilmente recuperados usando "
1195
"revertir\n"
1196
"de otra manera se hará una copia (agregando la extensión .~#~). Si no se dan "
1197
"\n"
1198
"parámetros u opciones, Bazaar revisará los archivos que están siendo "
1199
"revisados\n"
1200
"por Bazaar pero que no están en su árbol y dejará de revisarlos para usted."
1201
1196
1202
#: bzrlib/builtins.py:1838
1197
#: bzrlib/builtins.py:1868
1203
1198
msgid "Only remove files that have never been committed."
1204
1199
msgstr "Eliminar solo los archivos que nunca se han aplicado."
1205
1200
1206
#: bzrlib/builtins.py:1840
1201
#: bzrlib/builtins.py:1870
1207
1202
msgid "The file deletion mode to be used."
1208
1203
msgstr "El modo de borrado de archivo a usar."
1209
1204
1210
#: bzrlib/builtins.py:1841
1205
#: bzrlib/builtins.py:1871
1211
1206
msgid "Deletion Strategy"
1212
1207
msgstr "Estrategia de borrado"
1213
1208
1214
#: bzrlib/builtins.py:1842
1209
#: bzrlib/builtins.py:1872
1215
1210
msgid "Backup changed files (default)."
1216
1211
msgstr "Copiar archivos modificados (predeterminado)."
1217
1212
1218
#: bzrlib/builtins.py:1843
1213
#: bzrlib/builtins.py:1873
1219
1214
msgid "Delete from bzr but leave the working copy."
1220
1215
msgstr "Borrar de bzr pero dejar la copia de trabajo."
1221
1216
1222
#: bzrlib/builtins.py:1844
1217
#: bzrlib/builtins.py:1874
1223
1218
msgid "Don't backup changed files."
1224
1219
msgstr "No copiar los archivos modificados."
1225
1220
1226
#: bzrlib/builtins.py:1845
1221
#: bzrlib/builtins.py:1875
1227
1222
msgid ""
1228
1223
"Delete all the specified files, even if they can not be recovered and even "
1229
1224
"if they are non-empty directories. (deprecated, use no-backup)"
1231
1226
"Borrar todos los archivos indicados, incluso si no pueden ser recuperados y "
1232
1227
"aunque existan directorios no vacíos (obsoleto, use no-backup)."
1233
1228
1234
#: bzrlib/builtins.py:1854
1229
#: bzrlib/builtins.py:1884
1235
1230
msgid "(The --force option is deprecated, rather use --no-backup in future.)"
1236
1231
msgstr ""
1237
1232
"(La opción --force está obsoleta, en su lugar use --no-backup en el futuro)"
1238
1233
1239
#: bzrlib/builtins.py:1871
1234
#: bzrlib/builtins.py:1901
1240
1235
msgid "No matching files."
1241
1236
msgstr "No hay archivos coincidentes."
1242
1237
1243
#: bzrlib/builtins.py:1932
1238
#: bzrlib/builtins.py:1962
1244
1239
msgid "Reconcile bzr metadata in a branch."
1245
1240
msgstr "Reconcilia metadatos bzr en una rama."
1246
1241
1247
#: bzrlib/builtins.py:1934
1242
#: bzrlib/builtins.py:1964
1248
1243
msgid ""
1249
1244
"This can correct data mismatches that may have been caused by\n"
1250
1245
"previous ghost operations or bzr upgrades. You should only\n"
1258
1253
"ejecutar este comando si «bzr check» o un desarrollador de bzr le \n"
1259
1254
"aconsejan hacerlo."
1260
1255
1261
#: bzrlib/builtins.py:1939
1256
#: bzrlib/builtins.py:1969
1262
1257
msgid ""
1263
1258
"If a second branch is provided, cross-branch reconciliation is\n"
1264
1259
"also attempted, which will check that data like the tree root\n"
1271
1266
"del árbol raíz que no estaba presente en versiones anteriores de bzr esté\n"
1272
1267
"representada correctamente en ambas ramas."
1273
1268
1274
#: bzrlib/builtins.py:1944
1269
#: bzrlib/builtins.py:1974
1275
1270
msgid ""
1276
1271
"At the same time it is run it may recompress data resulting in\n"
1277
1272
"a potential saving in disk space or performance gain."
1279
1274
"Al mismo tiempo que se ejecuta, puede comprimir los datos resultando\n"
1280
1275
"un ahorro potencial de espacio en disco o aumento el rendimiento."
1281
1276
1282
#: bzrlib/builtins.py:1947
1277
#: bzrlib/builtins.py:1977
1283
1278
msgid "The branch *MUST* be on a listable system such as local disk or sftp."
1284
1279
msgstr ""
1285
1280
"La rama *DEBE* estar en un sistema que se pueda listar tal como disco local "
1286
1281
"o sftp."
1287
1282
1288
#: bzrlib/builtins.py:2014 bzrlib/builtins.py:2132 bzrlib/builtins.py:3750
1283
#: bzrlib/builtins.py:2044 bzrlib/builtins.py:2162 bzrlib/builtins.py:3779
1289
1284
msgid ""
1290
1285
"Format for the bzr 2.0 series.\n"
1291
1286
"Uses group-compress storage.\n"
1295
1290
"Usa almacenamiento group-compress.\n"
1296
1291
"Proporciona roots ricas que tienen una transición de una dirección.\n"
1297
1292
1298
#: bzrlib/builtins.py:2014 bzrlib/builtins.py:2132 bzrlib/builtins.py:3750
1293
#: bzrlib/builtins.py:2044 bzrlib/builtins.py:2162 bzrlib/builtins.py:3779
1299
1294
msgid ""
1300
1295
"Pack-based format used in 1.x series. Introduced in 0.92. Interoperates with "
1301
1296
"bzr repositories before 0.92 but cannot be read by bzr < 0.92. "
1304
1299
"Interopera con repositorios de bzr antes de 0.92, pero no es compatible con "
1305
1300
"versiones de bzr < 0.92. "
1306
1301
1307
#: bzrlib/builtins.py:2014 bzrlib/builtins.py:2132 bzrlib/builtins.py:3750
1302
#: bzrlib/builtins.py:2044 bzrlib/builtins.py:2162 bzrlib/builtins.py:3779
1308
1303
msgid "The 2a format with experimental support for colocated branches.\n"
1309
1304
msgstr "El formato 2a con soporte experimental para ramas colocadas.\n"
1310
1305
1311
#: bzrlib/builtins.py:2015
1306
#: bzrlib/builtins.py:2045
1312
1307
msgid "Make a directory into a versioned branch."
1313
1308
msgstr "Hacer un directorio en una rama versionada."
1314
1309
1315
#: bzrlib/builtins.py:2017
1310
#: bzrlib/builtins.py:2047
1316
1311
msgid ""
1317
1312
"Use this to create an empty branch, or before importing an\n"
1318
1313
"existing project."
1320
1315
"Use esto para crear una rama nueva o antes de importar un\n"
1321
1316
"proyecto existente."
1322
1317
1323
#: bzrlib/builtins.py:2020
1318
#: bzrlib/builtins.py:2050
1324
1319
msgid ""
1325
1320
"If there is a repository in a parent directory of the location, then\n"
1326
1321
"the history of the branch will be stored in the repository. Otherwise\n"
1332
1327
"init crea una rama independiente que lleva su propio historial \n"
1333
1328
"en el directorio .bzr."
1334
1329
1335
#: bzrlib/builtins.py:2025
1330
#: bzrlib/builtins.py:2055
1336
1331
msgid ""
1337
1332
"If there is already a branch at the location but it has no working tree,\n"
1338
1333
"the tree can be populated with 'bzr checkout'."
1340
1335
"Si existe ya una rama en la ubicación, pero no tiene árbol de trabajo,\n"
1341
1336
"se puede poblar el árbol con «bzr checkout»."
1342
1337
1343
#: bzrlib/builtins.py:2028
1338
#: bzrlib/builtins.py:2058
1344
1339
msgid "Recipe for importing a tree of files::"
1345
1340
msgstr "Recipiente para importar un árbol de archivos:"
1346
1341
1347
#: bzrlib/builtins.py:2030
1342
#: bzrlib/builtins.py:2060
1348
1343
msgid ""
1349
1344
" cd ~/project\n"
1350
1345
" bzr init\n"
1358
1353
" bzr status\n"
1359
1354
" bzr commit -m «proyecto importado»"
1360
1355
1361
#: bzrlib/builtins.py:2041
1356
#: bzrlib/builtins.py:2071
1362
1357
msgid ""
1363
1358
"Create the path leading up to the branch if it does not already exist."
1364
1359
msgstr "Crea la ruta que conduce a la rama si no existe ya."
1365
1360
1366
#: bzrlib/builtins.py:2044
1361
#: bzrlib/builtins.py:2074
1367
1362
msgid "Specify a format for this branch. See \"help formats\"."
1368
1363
msgstr "Especificar un formato para esta rama. Vea «help formats»"
1369
1364
1370
#: bzrlib/builtins.py:2052
1365
#: bzrlib/builtins.py:2082
1371
1366
msgid ""
1372
1367
"Never change revnos or the existing log. Append revisions to it only."
1373
1368
msgstr ""
1374
1369
"Nunca cambiar revnos o el registro existente. Solo añadir revisiones."
1375
1370
1376
#: bzrlib/builtins.py:2055
1371
#: bzrlib/builtins.py:2085
1377
1372
msgid "Create a branch without a working tree."
1378
1373
msgstr "Crea una rama sin árbol de trabajo."
1379
1374
1380
#: bzrlib/builtins.py:2075 bzrlib/push.py:110
1375
#: bzrlib/builtins.py:2105 bzrlib/push.py:110
1381
1376
#, python-format
1382
1377
msgid ""
1383
1378
"Parent directory of %s does not exist.\n"
1387
1382
"Debe indicar --create-prefix para crear todos los directorios padre "
1388
1383
"precedentes."
1389
1384
1390
#: bzrlib/builtins.py:2109
1385
#: bzrlib/builtins.py:2139
1391
1386
msgid ""
1392
1387
"This branch format cannot be set to append-revisions-only. Try --default."
1393
1388
msgstr ""
1394
1389
"Este formato de rama no se puede establecer como append-revisions-only. "
1395
1390
"Intente --default."
1396
1391
1397
#: bzrlib/builtins.py:2120
1392
#: bzrlib/builtins.py:2150
1398
1393
msgid "Created a {0} (format: {1})\n"
1399
1394
msgstr "Creado un {0} (formaot: {1})\n"
1400
1395
1401
#: bzrlib/builtins.py:2129
1396
#: bzrlib/builtins.py:2159
1402
1397
#, python-format
1403
1398
msgid "Using shared repository: %s\n"
1404
1399
msgstr "Usando el repositorio compartido: %s\n"
1405
1400
1406
#: bzrlib/builtins.py:2133
1401
#: bzrlib/builtins.py:2163
1407
1402
msgid "Create a shared repository for branches to share storage space."
1408
1403
msgstr ""
1409
1404
"Crea un repositorio compartido para ramas para compartir el espacio de "
1410
1405
"almacenamiento."
1411
1406
1412
#: bzrlib/builtins.py:2135
1407
#: bzrlib/builtins.py:2165
1413
1408
msgid ""
1414
1409
"New branches created under the repository directory will store their\n"
1415
1410
"revisions in the repository, not in the branch directory. For branches\n"
1422
1417
"almacenamiento necesario y \n"
1423
1418
"aceleramiento en la cración de nuevas ramas."
1424
1419
1425
#: bzrlib/builtins.py:2140
1420
#: bzrlib/builtins.py:2170
1426
1421
msgid ""
1427
1422
"If the --no-trees option is given then the branches in the repository\n"
1428
1423
"will not have working trees by default. They will still exist as \n"
1432
1427
"branches, such as on a server."
1433
1428
msgstr ""
1434
1429
1435
#: bzrlib/builtins.py:2147
1430
#: bzrlib/builtins.py:2177
1436
1431
msgid ""
1437
1432
":Examples:\n"
1438
1433
" Create a shared repository holding just branches::"
1440
1435
":Ejemplos:\n"
1441
1436
" Crear un repositorio compartido manteniendo solo las ramas::"
1442
1437
1443
#: bzrlib/builtins.py:2150
1438
#: bzrlib/builtins.py:2180
1444
1439
msgid ""
1445
1440
" bzr init-repo --no-trees repo\n"
1446
1441
" bzr init repo/trunk"
1448
1443
" bzr init-repo --no-trees repo\n"
1449
1444
" bzr init repo/trunk"
1450
1445
1451
#: bzrlib/builtins.py:2153
1446
#: bzrlib/builtins.py:2183
1452
1447
msgid " Make a lightweight checkout elsewhere::"
1453
1448
msgstr " Hace una comprobación ligera en cualquier sitio::"
1454
1449
1455
#: bzrlib/builtins.py:2155
1450
#: bzrlib/builtins.py:2185
1456
1451
msgid ""
1457
1452
" bzr checkout --lightweight repo/trunk trunk-checkout\n"
1458
1453
" cd trunk-checkout\n"
1459
1454
" (add files here)"
1460
1455
msgstr ""
1461
1456
1462
#: bzrlib/builtins.py:2163
1457
#: bzrlib/builtins.py:2193
1463
1458
msgid ""
1464
1459
"Specify a format for this repository. See \"bzr help formats\" for details."
1465
1460
msgstr ""
1466
1461
"Especificar un formato para este repositorio, Vea «bzr help formats» para "
1467
1462
"tener más detalles."
1468
1463
1469
#: bzrlib/builtins.py:2167
1464
#: bzrlib/builtins.py:2197
1470
1465
msgid "Repository format"
1471
1466
msgstr "Formato de repositorio"
1472
1467
1473
#: bzrlib/builtins.py:2169
1468
#: bzrlib/builtins.py:2199
1474
1469
msgid "Branches in the repository will default to not having a working tree."
1475
1470
msgstr ""
1476
1471
"Las ramas en el repositorio no tendrán de manera predeterminada un árbol de "
1477
1472
"trabajo."
1478
1473
1479
#: bzrlib/builtins.py:2195
1474
#: bzrlib/builtins.py:2225
1480
1475
msgid "Show differences in the working tree, between revisions or branches."
1481
1476
msgstr ""
1482
1477
"Muestra diferencias en el árbol de trabajo, entre revisiones o ramas."
1483
1478
1484
#: bzrlib/builtins.py:2197
1479
#: bzrlib/builtins.py:2227
1485
1480
msgid ""
1486
1481
"If no arguments are given, all changes for the current tree are listed.\n"
1487
1482
"If files are given, only the changes in those files are listed.\n"
1491
1486
"given."
1492
1487
msgstr ""
1493
1488
1494
#: bzrlib/builtins.py:2204
1489
#: bzrlib/builtins.py:2234
1495
1490
msgid ""
1496
1491
"\"bzr diff -p1\" is equivalent to \"bzr diff --prefix old/:new/\", and\n"
1497
1492
"produces patches suitable for \"patch -p1\"."
1499
1494
"«bzr diff -p1» es equivalente a «bzr diff --prefix old/:new/», y\n"
1500
1495
"produce parches adecuados para «patch -p1»."
1501
1496
1502
#: bzrlib/builtins.py:2207
1497
#: bzrlib/builtins.py:2237
1503
1498
msgid ""
1504
1499
"Note that when using the -r argument with a range of revisions, the\n"
1505
1500
"differences are computed between the two specified revisions. That\n"
1516
1511
"revisiones usada por «bzr log» el cuál incluye la primera revisión\n"
1517
1512
"del rango."
1518
1513
1519
#: bzrlib/builtins.py:2214
1514
#: bzrlib/builtins.py:2244
1520
1515
msgid ""
1521
1516
":Exit values:\n"
1522
1517
" 1 - changed\n"
1530
1525
" 3 - error\n"
1531
1526
" 0 - sin cambios"
1532
1527
1533
#: bzrlib/builtins.py:2220
1528
#: bzrlib/builtins.py:2250
1534
1529
msgid ""
1535
1530
":Examples:\n"
1536
1531
" Shows the difference in the working tree versus the last commit::"
1539
1534
" Muestra las diferencias en el árbol de trabajo contra la última "
1540
1535
"aplicación::"
1541
1536
1542
#: bzrlib/builtins.py:2223
1537
#: bzrlib/builtins.py:2253
1543
1538
msgid " bzr diff"
1544
1539
msgstr " bzr diff"
1545
1540
1546
#: bzrlib/builtins.py:2225
1541
#: bzrlib/builtins.py:2255
1547
1542
msgid " Difference between the working tree and revision 1::"
1548
1543
msgstr " Diferencia entre el árbol de trabajo y la revisión 1::"
1549
1544
1550
#: bzrlib/builtins.py:2227
1545
#: bzrlib/builtins.py:2257
1551
1546
msgid " bzr diff -r1"
1552
1547
msgstr " bzr diff -r1"
1553
1548
1554
#: bzrlib/builtins.py:2229
1549
#: bzrlib/builtins.py:2259
1555
1550
msgid " Difference between revision 3 and revision 1::"
1556
1551
msgstr " Diferencia entre revisión 3 y revisión 1::"
1557
1552
1558
#: bzrlib/builtins.py:2231
1553
#: bzrlib/builtins.py:2261
1559
1554
msgid " bzr diff -r1..3"
1560
1555
msgstr " bzr diff -r1..3"
1561
1556
1562
#: bzrlib/builtins.py:2233
1557
#: bzrlib/builtins.py:2263
1563
1558
msgid " Difference between revision 3 and revision 1 for branch xxx::"
1564
1559
msgstr " Diferencia entre revisión 3 y revisión 1 para la rama xxx::"
1565
1560
1566
#: bzrlib/builtins.py:2235
1561
#: bzrlib/builtins.py:2265
1567
1562
msgid " bzr diff -r1..3 xxx"
1568
1563
msgstr " bzr diff -r1..3 xxx"
1569
1564
1570
#: bzrlib/builtins.py:2237
1565
#: bzrlib/builtins.py:2267
1571
1566
msgid " The changes introduced by revision 2 (equivalent to -r1..2)::"
1572
1567
msgstr ""
1573
1568
" Los cambios introducidos por la revisión 2 (equivalente a -r1..2)::"
1574
1569
1575
#: bzrlib/builtins.py:2239
1570
#: bzrlib/builtins.py:2269
1576
1571
msgid " bzr diff -c2"
1577
1572
msgstr " bzr diff -c2"
1578
1573
1579
#: bzrlib/builtins.py:2241
1574
#: bzrlib/builtins.py:2271
1580
1575
msgid ""
1581
1576
" To see the changes introduced by revision X::\n"
1582
1577
" \n"
1586
1581
" \n"
1587
1582
" bzr diff -cX"
1588
1583
1589
#: bzrlib/builtins.py:2245
1584
#: bzrlib/builtins.py:2275
1590
1585
msgid ""
1591
1586
" Note that in the case of a merge, the -c option shows the changes\n"
1592
1587
" compared to the left hand parent. To see the changes against\n"
1596
1591
" comparados con el padre a la izquierda. Para ver los cambios contra\n"
1597
1592
" otro padre, use::"
1598
1593
1599
#: bzrlib/builtins.py:2249
1594
#: bzrlib/builtins.py:2279
1600
1595
msgid " bzr diff -r<chosen_parent>..X"
1601
1596
msgstr " bzr diff -r<padre_elegido>..X"
1602
1597
1603
#: bzrlib/builtins.py:2251
1598
#: bzrlib/builtins.py:2281
1604
1599
msgid ""
1605
1600
" The changes between the current revision and the previous revision\n"
1606
1601
" (equivalent to -c-1 and -r-2..-1)"
1608
1603
" Los cambios entre la versión actual y la previa\n"
1609
1604
" (equivalente a -c-1 y -r-2..-1)"
1610
1605
1611
#: bzrlib/builtins.py:2254
1606
#: bzrlib/builtins.py:2284
1612
1607
msgid " bzr diff -r-2.."
1613
1608
msgstr " bzr diff -r-2.."
1614
1609
1615
#: bzrlib/builtins.py:2256
1610
#: bzrlib/builtins.py:2286
1616
1611
msgid " Show just the differences for file NEWS::"
1617
1612
msgstr " Solo muestra las diferencias para el archivo NEWS::"
1618
1613
1619
#: bzrlib/builtins.py:2258
1614
#: bzrlib/builtins.py:2288
1620
1615
msgid " bzr diff NEWS"
1621
1616
msgstr " bzr diff NEWS"
1622
1617
1623
#: bzrlib/builtins.py:2260
1618
#: bzrlib/builtins.py:2290
1624
1619
msgid " Show the differences in working tree xxx for file NEWS::"
1625
1620
msgstr ""
1626
1621
" Muestra las diferencias en el árbol de trabajo xxx para el archivo NEWS::"
1627
1622
1628
#: bzrlib/builtins.py:2262
1623
#: bzrlib/builtins.py:2292
1629
1624
msgid " bzr diff xxx/NEWS"
1630
1625
msgstr " bzr diff xxx/NEWS"
1631
1626
1632
#: bzrlib/builtins.py:2264
1627
#: bzrlib/builtins.py:2294
1633
1628
msgid " Show the differences from branch xxx to this working tree:"
1634
1629
msgstr ""
1635
1630
" Muestra la diferencias desde la rama xxx a este árbol de trabajo:"
1636
1631
1637
#: bzrlib/builtins.py:2266
1632
#: bzrlib/builtins.py:2296
1638
1633
msgid " bzr diff --old xxx"
1639
1634
msgstr " bzr diff --old xxx"
1640
1635
1641
#: bzrlib/builtins.py:2268
1636
#: bzrlib/builtins.py:2298
1642
1637
msgid " Show the differences between two branches for file NEWS::"
1643
1638
msgstr " Muestra las diferencias entre dos ramas para el archivo NEWS:"
1644
1639
1645
#: bzrlib/builtins.py:2270
1640
#: bzrlib/builtins.py:2300
1646
1641
msgid " bzr diff --old xxx --new yyy NEWS"
1647
1642
msgstr " bzr diff --old xxx --new yyy NEWS"
1648
1643
1649
#: bzrlib/builtins.py:2272
1644
#: bzrlib/builtins.py:2302
1650
1645
msgid " Same as 'bzr diff' but prefix paths with old/ and new/::"
1651
1646
msgstr ""
1652
1647
" Igual que «bzr diff» pero pone el prefijo a las rutas old/ y new/::"
1653
1648
1654
#: bzrlib/builtins.py:2274
1649
#: bzrlib/builtins.py:2304
1655
1650
msgid ""
1656
1651
" bzr diff --prefix old/:new/\n"
1657
1652
" \n"
1666
1661
" \n"
1667
1662
" bzr diff --using /usr/bin/diff --diff-options -wu"
1668
1663
1669
#: bzrlib/builtins.py:2284
1664
#: bzrlib/builtins.py:2314
1670
1665
msgid "Pass these options to the external diff program."
1671
1666
msgstr "Pasa esta opciones para el programa diff externo."
1672
1667
1673
#: bzrlib/builtins.py:2287
1668
#: bzrlib/builtins.py:2317
1674
1669
msgid ""
1675
1670
"Set prefixes added to old and new filenames, as two values separated by a "
1676
1671
"colon. (eg \"old/:new/\")."
1678
1673
"Establecer los prefijos añadidos a los nombres de archivos antiguo y nuevo "
1679
1674
"como dos valores separados por dos puntos. (ejemplo, «old/:new/»)."
1680
1675
1681
#: bzrlib/builtins.py:2290
1676
#: bzrlib/builtins.py:2320
1682
1677
msgid "Branch/tree to compare from."
1683
1678
msgstr "Rama/árbol desde donde comparar."
1684
1679
1685
#: bzrlib/builtins.py:2294
1680
#: bzrlib/builtins.py:2324
1686
1681
msgid "Branch/tree to compare to."
1687
1682
msgstr "Rama/árbol a la que comparar."
1688
1683
1689
#: bzrlib/builtins.py:2300
1684
#: bzrlib/builtins.py:2330
1690
1685
msgid "Use this command to compare files."
1691
1686
msgstr "Use esta orden para comparar archivos."
1692
1687
1693
#: bzrlib/builtins.py:2305
1688
#: bzrlib/builtins.py:2335
1694
1689
msgid "Diff format to use."
1695
1690
msgstr "Formato diff a usar."
1696
1691
1697
#: bzrlib/builtins.py:2307
1692
#: bzrlib/builtins.py:2337
1698
1693
msgid "Diff format"
1699
1694
msgstr "Formato diff"
1700
1695
1701
#: bzrlib/builtins.py:2329
1696
#: bzrlib/builtins.py:2359
1702
1697
msgid "--prefix expects two values separated by a colon (eg \"old/:new/\")"
1703
1698
msgstr ""
1704
1699
"--prefix espera dos valores separados por dos puntos (ej. «old/:new/»)"
1705
1700
1706
#: bzrlib/builtins.py:2333
1701
#: bzrlib/builtins.py:2363
1707
1702
msgid "bzr diff --revision takes exactly one or two revision specifiers"
1708
1703
msgstr ""
1709
1704
"bzr diff --revision toma exactamente uno o dos especificadores de revisión"
1710
1705
1711
#: bzrlib/builtins.py:2338 bzrlib/builtins.py:2736 bzrlib/builtins.py:2749
1712
#: bzrlib/builtins.py:2757 bzrlib/builtins.py:4919
1706
#: bzrlib/builtins.py:2368 bzrlib/builtins.py:2765 bzrlib/builtins.py:2778
1707
#: bzrlib/builtins.py:2786 bzrlib/builtins.py:4959
1713
1708
msgid "{0} and {1} are mutually exclusive"
1714
1709
msgstr "{0} y {1} se excluyen mutuamente"
1715
1710
1716
#: bzrlib/builtins.py:2358
1711
#: bzrlib/builtins.py:2388
1717
1712
msgid ""
1718
1713
"List files deleted in the working tree.\n"
1719
1714
" "
1721
1716
"Lista archivos eliminados en el árbol de trabajo.\n"
1722
1717
" "
1723
1718
1724
#: bzrlib/builtins.py:2436
1719
#: bzrlib/builtins.py:2465
1725
1720
msgid "Show the tree root directory."
1726
1721
msgstr "Muestra el directorio raíz del árbol."
1727
1722
1728
#: bzrlib/builtins.py:2438
1723
#: bzrlib/builtins.py:2467
1729
1724
msgid ""
1730
1725
"The root is the nearest enclosing directory with a .bzr control\n"
1731
1726
"directory."
1733
1728
"El raíz es el directorio envolvente más cercando con un directorio \n"
1734
1729
"de control .bzr."
1735
1730
1736
#: bzrlib/builtins.py:2453
1731
#: bzrlib/builtins.py:2482
1737
1732
msgid "The limit argument must be an integer."
1738
1733
msgstr "El argumento límite debe ser un entero."
1739
1734
1740
#: bzrlib/builtins.py:2461
1735
#: bzrlib/builtins.py:2490
1741
1736
msgid "The levels argument must be an integer."
1742
1737
msgstr "Los argumentos de niveles deben ser un entero."
1743
1738
1744
#: bzrlib/builtins.py:2466
1739
#: bzrlib/builtins.py:2495
1745
1740
msgid "Show historical log for a branch or subset of a branch."
1746
1741
msgstr ""
1747
1742
"Muestra el registro histórico de una rama o un subconjunto de una rama."
1748
1743
1749
#: bzrlib/builtins.py:2468
1744
#: bzrlib/builtins.py:2497
1750
1745
msgid ""
1751
1746
"log is bzr's default tool for exploring the history of a branch.\n"
1752
1747
"The branch to use is taken from the first parameter. If no parameters\n"
1760
1755
"parámetro, se registra la rama que contiene el directorio de trabajo.\n"
1761
1756
"Aquí hay algunos ejemplos sencillos::"
1762
1757
1763
#: bzrlib/builtins.py:2473
1758
#: bzrlib/builtins.py:2502
1764
1759
msgid ""
1765
1760
" bzr log log the current branch\n"
1766
1761
" bzr log foo.py log a file in its branch\n"
1770
1765
" bzr log foo.py registra un archivo en esta rama\n"
1771
1766
" bzr log http://servidor/rama registra una rama en un servidor"
1772
1767
1773
#: bzrlib/builtins.py:2477
1768
#: bzrlib/builtins.py:2506
1774
1769
msgid ""
1775
1770
"The filtering, ordering and information shown for each revision can\n"
1776
1771
"be controlled as explained below. By default, all revisions are\n"
1780
1775
"were merged."
1781
1776
msgstr ""
1782
1777
1783
#: bzrlib/builtins.py:2484
1778
#: bzrlib/builtins.py:2513
1784
1779
msgid ":Output control:"
1785
1780
msgstr ":Control de saliuda:"
1786
1781
1787
#: bzrlib/builtins.py:2486
1782
#: bzrlib/builtins.py:2515
1788
1783
msgid ""
1789
1784
" The log format controls how information about each revision is\n"
1790
1785
" displayed. The standard log formats are called ``long``, ``short``\n"
1792
1787
" for more details on log formats."
1793
1788
msgstr ""
1794
1789
1795
#: bzrlib/builtins.py:2491
1790
#: bzrlib/builtins.py:2520
1796
1791
msgid ""
1797
1792
" The following options can be used to control what information is\n"
1798
1793
" displayed::"
1800
1795
" Las siguientes opciones se pueden usar para controlar qué información\n"
1801
1796
" se muestra::"
1802
1797
1803
#: bzrlib/builtins.py:2494
1798
#: bzrlib/builtins.py:2523
1804
1799
msgid ""
1805
1800
" -l N display a maximum of N revisions\n"
1806
1801
" -n N display N levels of revisions (0 for all, 1 for collapsed)\n"
1809
1804
" --show-ids display revision-ids (and file-ids), not just revnos"
1810
1805
msgstr ""
1811
1806
1812
#: bzrlib/builtins.py:2500
1807
#: bzrlib/builtins.py:2529
1813
1808
msgid ""
1814
1809
" Note that the default number of levels to display is a function of the\n"
1815
1810
" log format. If the -n option is not used, the standard log formats show\n"
1816
1811
" just the top level (mainline)."
1817
1812
msgstr ""
1818
1813
1819
#: bzrlib/builtins.py:2504
1814
#: bzrlib/builtins.py:2533
1820
1815
msgid ""
1821
1816
" Status summaries are shown using status flags like A, M, etc. To see\n"
1822
1817
" the changes explained using words like ``added`` and ``modified``\n"
1823
1818
" instead, use the -vv option."
1824
1819
msgstr ""
1825
1820
1826
#: bzrlib/builtins.py:2508
1821
#: bzrlib/builtins.py:2537
1827
1822
msgid ":Ordering control:"
1828
1823
msgstr ":Control de ordenación:"
1829
1824
1830
#: bzrlib/builtins.py:2510
1825
#: bzrlib/builtins.py:2539
1831
1826
msgid ""
1832
1827
" To display revisions from oldest to newest, use the --forward option.\n"
1833
1828
" In most cases, using this option will have little impact on the total\n"
1835
1830
" display revisions like --reverse does when it can."
1836
1831
msgstr ""
1837
1832
1838
#: bzrlib/builtins.py:2515
1833
#: bzrlib/builtins.py:2544
1839
1834
msgid ":Revision filtering:"
1840
1835
msgstr ":Filtrado de revisión:"
1841
1836
1842
#: bzrlib/builtins.py:2517
1837
#: bzrlib/builtins.py:2546
1843
1838
msgid ""
1844
1839
" The -r option can be used to specify what revision or range of revisions\n"
1845
1840
" to filter against. The various forms are shown below::"
1848
1843
"revisiones\n"
1849
1844
" contra las que filtrar. Las diferentes formas se muestran a continuación:"
1850
1845
1851
#: bzrlib/builtins.py:2520
1846
#: bzrlib/builtins.py:2549
1852
1847
msgid ""
1853
1848
" -rX display revision X\n"
1854
1849
" -rX.. display revision X and later\n"
1860
1855
" -r..Y muestra hasta la revisión Y inclusive\n"
1861
1856
" -rX..Y muestra desde X a Y inclusive"
1862
1857
1863
#: bzrlib/builtins.py:2525
1858
#: bzrlib/builtins.py:2554
1864
1859
msgid ""
1865
1860
" See ``bzr help revisionspec`` for details on how to specify X and Y.\n"
1866
1861
" Some common examples are given below::"
1869
1864
"X e Y.\n"
1870
1865
" Más abajo se listan algunos ejemplos::"
1871
1866
1872
#: bzrlib/builtins.py:2528
1867
#: bzrlib/builtins.py:2557
1873
1868
msgid ""
1874
1869
" -r-1 show just the tip\n"
1875
1870
" -r-10.. show the last 10 mainline revisions\n"
1879
1874
" -rdate:yesterday.. show changes since yesterday"
1880
1875
msgstr ""
1881
1876
1882
#: bzrlib/builtins.py:2535
1877
#: bzrlib/builtins.py:2564
1883
1878
msgid ""
1884
1879
" When logging a range of revisions using -rX..Y, log starts at\n"
1885
1880
" revision Y and searches back in history through the primary\n"
1889
1884
" a nested merge revision and the log will be truncated accordingly."
1890
1885
msgstr ""
1891
1886
1892
#: bzrlib/builtins.py:2542
1887
#: bzrlib/builtins.py:2571
1893
1888
msgid ":Path filtering:"
1894
1889
msgstr ":Filtrado de ruta:"
1895
1890
1896
#: bzrlib/builtins.py:2544
1891
#: bzrlib/builtins.py:2573
1897
1892
msgid ""
1898
1893
" If parameters are given and the first one is not a branch, the log\n"
1899
1894
" will be filtered to show only those revisions that changed the\n"
1903
1898
" se filtrará para mostrar solo las revisiones que cambiaron los\n"
1904
1899
" archivos o directorios nominados."
1905
1900
1906
#: bzrlib/builtins.py:2548
1901
#: bzrlib/builtins.py:2577
1907
1902
msgid ""
1908
1903
" Filenames are interpreted within their historical context. To log a\n"
1909
1904
" deleted file, specify a revision range so that the file existed at\n"
1910
1905
" the end or start of the range."
1911
1906
msgstr ""
1912
1907
1913
#: bzrlib/builtins.py:2552
1908
#: bzrlib/builtins.py:2581
1914
1909
msgid ""
1915
1910
" Historical context is also important when interpreting pathnames of\n"
1916
1911
" renamed files/directories. Consider the following example:"
1918
1913
" El contexto histórico también es importante al interpretar las rutas de\n"
1919
1914
" archivos/directorios renombrados. Considere el siguiente ejemplo:"
1920
1915
1921
#: bzrlib/builtins.py:2555
1916
#: bzrlib/builtins.py:2584
1922
1917
msgid ""
1923
1918
" * revision 1: add tutorial.txt\n"
1924
1919
" * revision 2: modify tutorial.txt\n"
1928
1923
" * revisión 2: modificar tutorial.txt\n"
1929
1924
" * revisión 3: renombrar tutorial.txt a guide.txt; añadir tutorial.txt"
1930
1925
1931
#: bzrlib/builtins.py:2559
1926
#: bzrlib/builtins.py:2588
1932
1927
msgid " In this case:"
1933
1928
msgstr " en este caso:"
1934
1929
1935
#: bzrlib/builtins.py:2561
1930
#: bzrlib/builtins.py:2590
1936
1931
msgid " * ``bzr log guide.txt`` will log the file added in revision 1"
1937
1932
msgstr ""
1938
1933
" * ``bzr log guide.txt`` registrará el archivo añadido en revisión 1:"
1939
1934
1940
#: bzrlib/builtins.py:2563
1935
#: bzrlib/builtins.py:2592
1941
1936
msgid ""
1942
1937
" * ``bzr log tutorial.txt`` will log the new file added in revision 3"
1943
1938
msgstr ""
1944
1939
" * «bzr log tutorial.txt» registrará el nuevo archivo añadido en la "
1945
1940
"revisión 3"
1946
1941
1947
#: bzrlib/builtins.py:2565
1942
#: bzrlib/builtins.py:2594
1948
1943
msgid ""
1949
1944
" * ``bzr log -r2 -p tutorial.txt`` will show the changes made to\n"
1950
1945
" the original file in revision 2."
1952
1947
" * «bzr log -r2 -p tutorial.txt» mostrará los cambios realizados al\n"
1953
1948
" archivo original en la revisión 2."
1954
1949
1955
#: bzrlib/builtins.py:2568
1950
#: bzrlib/builtins.py:2597
1956
1951
msgid ""
1957
1952
" * ``bzr log -r2 -p guide.txt`` will display an error message as there\n"
1958
1953
" was no file called guide.txt in revision 2."
1960
1955
" * «bzr log -r2 -p guide.txt» mostrará un mensaje de error de que\n"
1961
1956
" no había un archivo llamado guide.txt en la revisión 2."
1962
1957
1963
#: bzrlib/builtins.py:2571
1958
#: bzrlib/builtins.py:2600
1964
1959
msgid ""
1965
1960
" Renames are always followed by log. By design, there is no need to\n"
1966
1961
" explicitly ask for this (and no way to stop logging a file back\n"
1967
1962
" until it was last renamed)."
1968
1963
msgstr ""
1969
1964
1970
#: bzrlib/builtins.py:2575
1965
#: bzrlib/builtins.py:2604
1971
1966
msgid ":Other filtering:"
1972
1967
msgstr ":Otro filtrado:"
1973
1968
1974
#: bzrlib/builtins.py:2577
1969
#: bzrlib/builtins.py:2606
1975
1970
msgid ""
1976
1971
" The --match option can be used for finding revisions that match a\n"
1977
1972
" regular expression in a commit message, committer, author or bug.\n"
1980
1975
" --match-message can be used to only match a specific field."
1981
1976
msgstr ""
1982
1977
1983
#: bzrlib/builtins.py:2583
1978
#: bzrlib/builtins.py:2612
1984
1979
msgid ":Tips & tricks:"
1985
1980
msgstr ":Trucos y consejos:"
1986
1981
1987
#: bzrlib/builtins.py:2585
1982
#: bzrlib/builtins.py:2614
1988
1983
msgid ""
1989
1984
" GUI tools and IDEs are often better at exploring history than command\n"
1990
1985
" line tools: you may prefer qlog or viz from qbzr or bzr-gtk, the\n"
1993
1988
" <http://wiki.bazaar.canonical.com/IDEIntegration>. "
1994
1989
msgstr ""
1995
1990
1996
#: bzrlib/builtins.py:2591
1991
#: bzrlib/builtins.py:2620
1997
1992
msgid ""
1998
1993
" You may find it useful to add the aliases below to ``bazaar.conf``::"
1999
1994
msgstr ""
2000
1995
2001
#: bzrlib/builtins.py:2593
1996
#: bzrlib/builtins.py:2622
2002
1997
msgid ""
2003
1998
" [ALIASES]\n"
2004
1999
" tip = log -r-1\n"
2010
2005
" top = log -l10 --line\n"
2011
2006
" show = log -v -p"
2012
2007
2013
#: bzrlib/builtins.py:2598
2008
#: bzrlib/builtins.py:2627
2014
2009
msgid ""
2015
2010
" ``bzr tip`` will then show the latest revision while ``bzr top``\n"
2016
2011
" will show the last 10 mainline revisions. To see the details of a\n"
2017
2012
" particular revision X, ``bzr show -rX``."
2018
2013
msgstr ""
2019
2014
2020
#: bzrlib/builtins.py:2602
2015
#: bzrlib/builtins.py:2631
2021
2016
msgid ""
2022
2017
" If you are interested in looking deeper into a particular merge X,\n"
2023
2018
" use ``bzr log -n0 -rX``."
2025
2020
" Si está interesado en mirar más profundamente en una fusiòn X particular,\n"
2026
2021
" use «bzr log -n0 -rX»."
2027
2022
2028
#: bzrlib/builtins.py:2605
2023
#: bzrlib/builtins.py:2634
2029
2024
msgid ""
2030
2025
" ``bzr log -v`` on a branch with lots of history is currently\n"
2031
2026
" very slow. A fix for this issue is currently under development.\n"
2033
2028
" be given when using the -v option."
2034
2029
msgstr ""
2035
2030
2036
#: bzrlib/builtins.py:2610
2031
#: bzrlib/builtins.py:2639
2037
2032
msgid ""
2038
2033
" bzr has a generic full-text matching plugin, bzr-search, that can be\n"
2039
2034
" used to find revisions matching user names, commit messages, etc.\n"
2041
2036
" a list of words but not others."
2042
2037
msgstr ""
2043
2038
2044
#: bzrlib/builtins.py:2615
2039
#: bzrlib/builtins.py:2644
2045
2040
msgid ""
2046
2041
" When exploring non-mainline history on large projects with deep\n"
2047
2042
" history, the performance of log can be greatly improved by installing\n"
2049
2044
" trading disk space for faster speed."
2050
2045
msgstr ""
2051
2046
2052
#: bzrlib/builtins.py:2624
2047
#: bzrlib/builtins.py:2653
2053
2048
msgid "Show from oldest to newest."
2054
2049
msgstr "Muestra desde el más antiguo al más moderno."
2055
2050
2056
#: bzrlib/builtins.py:2627
2051
#: bzrlib/builtins.py:2656
2057
2052
msgid "Show files changed in each revision."
2058
2053
msgstr "Muestra los archivos cambiados en cada revisión."
2059
2054
2060
#: bzrlib/builtins.py:2633
2055
#: bzrlib/builtins.py:2662
2061
2056
msgid "Show just the specified revision. See also \"help revisionspec\"."
2062
2057
msgstr ""
2063
2058
"Muestra solo la revisión especificada. Vea también «help revisionspec»."
2064
2059
2065
#: bzrlib/builtins.py:2637
2060
#: bzrlib/builtins.py:2666
2066
2061
msgid "What names to list as authors - first, all or committer."
2067
2062
msgstr "Qué nombres listar como autores - primero, todos o ejecutor."
2068
2063
2069
#: bzrlib/builtins.py:2638
2064
#: bzrlib/builtins.py:2667
2070
2065
msgid "Authors"
2071
2066
msgstr "Autores"
2072
2067
2073
#: bzrlib/builtins.py:2643
2068
#: bzrlib/builtins.py:2672
2074
2069
msgid "Number of levels to display - 0 for all, 1 for flat."
2075
2070
msgstr "Número de niveles a mostrar -0 para todo, 1 para plano."
2076
2071
2077
#: bzrlib/builtins.py:2653
2072
#: bzrlib/builtins.py:2682
2078
2073
msgid "Limit the output to the first N revisions."
2079
2074
msgstr "Límite de salida para las primeras N revisiones."
2080
2075
2081
#: bzrlib/builtins.py:2658
2076
#: bzrlib/builtins.py:2687
2082
2077
msgid "Show changes made in each revision as a patch."
2083
2078
msgstr "Mostrar cambios realizados en cada revisión como un parche."
2084
2079
2085
#: bzrlib/builtins.py:2660
2080
#: bzrlib/builtins.py:2689
2086
2081
msgid "Show merged revisions like --levels 0 does."
2087
2082
msgstr "Muestra las revisiones combinadas como lo hace --levels 0."
2088
2083
2089
#: bzrlib/builtins.py:2664
2084
#: bzrlib/builtins.py:2693
2090
2085
msgid "Do not report commits with more than one parent."
2091
2086
msgstr "No informar de ejecuciones con más de un padre."
2092
2087
2093
#: bzrlib/builtins.py:2666
2088
#: bzrlib/builtins.py:2695
2094
2089
msgid ""
2095
2090
"Display only the revisions that are not part of both ancestries (require -"
2096
2091
"rX..Y)."
2098
2093
"Muestra solo las revisiones que no sean parte de ambas ascendencias "
2099
2094
"(requiere -rX..Y)."
2100
2095
2101
#: bzrlib/builtins.py:2670
2096
#: bzrlib/builtins.py:2699
2102
2097
msgid "Show digital signature validity."
2103
2098
msgstr "Mostrar la validez de la firma digital"
2104
2099
2105
#: bzrlib/builtins.py:2673
2100
#: bzrlib/builtins.py:2702
2106
2101
msgid "Show revisions whose properties match this expression."
2107
2102
msgstr "Mostrar revisiones cuyas propiedades coincidan con esta expresión."
2108
2103
2109
#: bzrlib/builtins.py:2677
2104
#: bzrlib/builtins.py:2706
2110
2105
msgid "Show revisions whose message matches this expression."
2111
2106
msgstr "Mostrar revisiones cuyos mensajes coincidan con esta expresión."
2112
2107
2113
#: bzrlib/builtins.py:2681
2108
#: bzrlib/builtins.py:2710
2114
2109
msgid "Show revisions whose committer matches this expression."
2115
2110
msgstr "Mostrar revisiones cuyos ejecutores coincidan con esta expresión."
2116
2111
2117
#: bzrlib/builtins.py:2685
2112
#: bzrlib/builtins.py:2714
2118
2113
msgid "Show revisions whose authors match this expression."
2119
2114
msgstr "Mostrar revisiones cuyos autores coincidan con esta expresión."
2120
2115
2121
#: bzrlib/builtins.py:2689
2116
#: bzrlib/builtins.py:2718
2122
2117
msgid "Show revisions whose bugs match this expression."
2123
2118
msgstr "Mostrar revisiones cuyos errores coincidan con esta expresión."
2124
2119
2125
#: bzrlib/builtins.py:2743
2120
#: bzrlib/builtins.py:2772
2126
2121
msgid "--exclude-common-ancestry requires -r with two revisions"
2127
2122
msgstr "--exclude-common-ancestry requieren -r con dos revisiones"
2128
2123
2129
#: bzrlib/builtins.py:2771
2124
#: bzrlib/builtins.py:2800
2130
2125
#, python-format
2131
2126
msgid "Path unknown at end or start of revision range: %s"
2132
2127
msgstr "Ruta desconocida en el principio o final del rango de revisión: %s"
2133
2128
2134
#: bzrlib/builtins.py:2888
2129
#: bzrlib/builtins.py:2917
2135
2130
#, python-format
2136
2131
msgid "bzr %s doesn't accept two revisions in different branches."
2137
2132
msgstr "bzr %s no acepta dos revisiones en diferentes ramas."
2138
2133
2139
#: bzrlib/builtins.py:2904
2134
#: bzrlib/builtins.py:2933
2140
2135
#, python-format
2141
2136
msgid "bzr %s --revision takes one or two values."
2142
2137
msgstr "bzr %s --revision toma uno o dos valores."
2143
2138
2144
#: bzrlib/builtins.py:2949
2139
#: bzrlib/builtins.py:2978
2145
2140
msgid ""
2146
2141
"List files in a tree.\n"
2147
2142
" "
2149
2144
"Lista archivos en un árbol\n"
2150
2145
" "
2151
2146
2152
#: bzrlib/builtins.py:2958
2147
#: bzrlib/builtins.py:2987
2153
2148
msgid "Recurse into subdirectories."
2154
2149
msgstr "Recurrir en subdirectorios."
2155
2150
2156
#: bzrlib/builtins.py:2960
2151
#: bzrlib/builtins.py:2989
2157
2152
msgid "Print paths relative to the root of the branch."
2158
2153
msgstr "Imprime rutas relativas a la raíz de la rama."
2159
2154
2160
#: bzrlib/builtins.py:2962
2155
#: bzrlib/builtins.py:2991
2161
2156
msgid "Print unknown files."
2162
2157
msgstr "Imprimir archivos desconocidos."
2163
2158
2164
#: bzrlib/builtins.py:2963
2159
#: bzrlib/builtins.py:2992
2165
2160
msgid "Print versioned files."
2166
2161
msgstr "Imprimir archivos versionados."
2167
2162
2168
#: bzrlib/builtins.py:2966
2163
#: bzrlib/builtins.py:2995
2169
2164
msgid "Print ignored files."
2170
2165
msgstr "Imprimir archivos ignorados."
2171
2166
2172
#: bzrlib/builtins.py:2968
2167
#: bzrlib/builtins.py:2997
2173
2168
msgid "List entries of a particular kind: file, directory, symlink."
2174
2169
msgstr ""
2175
2170
"Lista entradas de un tipo particular; archivo, directorio, vínculo simbólico."
2176
2171
2177
#: bzrlib/builtins.py:2981
2172
#: bzrlib/builtins.py:3010
2178
2173
msgid "invalid kind specified"
2179
2174
msgstr "tivo inválido especificado"
2180
2175
2181
#: bzrlib/builtins.py:2984
2176
#: bzrlib/builtins.py:3013
2182
2177
msgid "Cannot set both --verbose and --null"
2183
2178
msgstr "No se pueden establecer ambos --verbose y --null"
2184
2179
2185
#: bzrlib/builtins.py:2993
2180
#: bzrlib/builtins.py:3022
2186
2181
msgid "cannot specify both --from-root and PATH"
2187
2182
msgstr "No se pueden establecer ambos --from-root y PATH"
2188
2183
2189
#: bzrlib/builtins.py:3080
2184
#: bzrlib/builtins.py:3109
2190
2185
msgid "Ignore specified files or patterns."
2191
2186
msgstr "Ignorar archivos o patrones especificados."
2192
2187
2193
#: bzrlib/builtins.py:3082
2188
#: bzrlib/builtins.py:3111
2194
2189
msgid "See ``bzr help patterns`` for details on the syntax of patterns."
2195
2190
msgstr ""
2196
2191
"Vea «bzr help patterns» para tener detalles sobre la sintaxis de patrones."
2197
2192
2198
#: bzrlib/builtins.py:3084
2193
#: bzrlib/builtins.py:3113
2199
2194
msgid ""
2200
2195
"If a .bzrignore file does not exist, the ignore command\n"
2201
2196
"will create one and add the specified files or patterns to the newly\n"
2204
2199
"the use of the ignore command will require an explicit add command."
2205
2200
msgstr ""
2206
2201
2207
#: bzrlib/builtins.py:3090
2202
#: bzrlib/builtins.py:3119
2208
2203
msgid ""
2209
2204
"To remove patterns from the ignore list, edit the .bzrignore file.\n"
2210
2205
"After adding, editing or deleting that file either indirectly by\n"
2217
2212
"el uso de esta orden, o directamente mediante un editor, asegúrese de "
2218
2213
"ejecutarlo."
2219
2214
2220
#: bzrlib/builtins.py:3095
2215
#: bzrlib/builtins.py:3124
2221
2216
msgid ""
2222
2217
"Bazaar also supports a global ignore file ~/.bazaar/ignore. On Windows\n"
2223
2218
"the global ignore file can be found in the application data directory as\n"
2226
2221
"can be edited directly using an editor."
2227
2222
msgstr ""
2228
2223
2229
#: bzrlib/builtins.py:3101
2224
#: bzrlib/builtins.py:3130
2230
2225
msgid ""
2231
2226
"Patterns prefixed with '!' are exceptions to ignore patterns and take\n"
2232
2227
"precedence over regular ignores. Such exceptions are used to specify\n"
2233
2228
"files that should be versioned which would otherwise be ignored."
2234
2229
msgstr ""
2235
2230
2236
#: bzrlib/builtins.py:3105
2231
#: bzrlib/builtins.py:3134
2237
2232
msgid ""
2238
2233
"Patterns prefixed with '!!' act as regular ignore patterns, but have\n"
2239
2234
"precedence over the '!' exception patterns."
2240
2235
msgstr ""
2241
2236
2242
#: bzrlib/builtins.py:3108
2237
#: bzrlib/builtins.py:3137
2243
2238
msgid ""
2244
2239
":Notes: \n"
2245
2240
" \n"
2247
2242
" the shell on Unix."
2248
2243
msgstr ""
2249
2244
2250
#: bzrlib/builtins.py:3113
2245
#: bzrlib/builtins.py:3142
2251
2246
msgid ""
2252
2247
"* Ignore patterns starting with \"#\" act as comments in the ignore file.\n"
2253
2248
" To ignore patterns that begin with that character, use the \"RE:\" prefix."
2254
2249
msgstr ""
2255
2250
2256
#: bzrlib/builtins.py:3116
2251
#: bzrlib/builtins.py:3145
2257
2252
msgid ""
2258
2253
":Examples:\n"
2259
2254
" Ignore the top level Makefile::"
2260
2255
msgstr ""
2261
2256
2262
#: bzrlib/builtins.py:3119
2257
#: bzrlib/builtins.py:3148
2263
2258
msgid " bzr ignore ./Makefile"
2264
2259
msgstr " bzr ignore ./Makefile"
2265
2260
2266
#: bzrlib/builtins.py:3121
2261
#: bzrlib/builtins.py:3150
2267
2262
msgid " Ignore .class files in all directories...::"
2268
2263
msgstr " Ignorar archivos .class en todos los directorios...::"
2269
2264
2270
#: bzrlib/builtins.py:3123
2265
#: bzrlib/builtins.py:3152
2271
2266
msgid " bzr ignore \"*.class\""
2272
2267
msgstr " bzr ignore \"*.class\""
2273
2268
2274
#: bzrlib/builtins.py:3125
2269
#: bzrlib/builtins.py:3154
2275
2270
msgid " ...but do not ignore \"special.class\"::"
2276
2271
msgstr " ...pero no ignora «special.class»::"
2277
2272
2278
#: bzrlib/builtins.py:3127
2273
#: bzrlib/builtins.py:3156
2279
2274
msgid " bzr ignore \"!special.class\""
2280
2275
msgstr " bzr ignore «!special.class»"
2281
2276
2282
#: bzrlib/builtins.py:3129
2277
#: bzrlib/builtins.py:3158
2283
2278
msgid " Ignore files whose name begins with the \"#\" character::"
2284
2279
msgstr " Ignorar archivos cuyos nombres comiencen con el carácter «#»::"
2285
2280
2286
#: bzrlib/builtins.py:3131
2281
#: bzrlib/builtins.py:3160
2287
2282
msgid " bzr ignore \"RE:^#\""
2288
2283
msgstr " bzr ignore \"RE:^#\""
2289
2284
2290
#: bzrlib/builtins.py:3133 bzrlib/builtins.py:3137
2285
#: bzrlib/builtins.py:3162 bzrlib/builtins.py:3166
2291
2286
msgid " Ignore .o files under the lib directory::"
2292
2287
msgstr " Ignorar archivos .o bajo el directorio lib::"
2293
2288
2294
#: bzrlib/builtins.py:3135
2289
#: bzrlib/builtins.py:3164
2295
2290
msgid " bzr ignore \"lib/**/*.o\""
2296
2291
msgstr " bzr ignore \"lib/**/*.o\""
2297
2292
2298
#: bzrlib/builtins.py:3139
2293
#: bzrlib/builtins.py:3168
2299
2294
msgid " bzr ignore \"RE:lib/.*\\.o\""
2300
2295
msgstr " bzr ignore \"RE:lib/.*\\.o\""
2301
2296
2302
#: bzrlib/builtins.py:3141
2297
#: bzrlib/builtins.py:3170
2303
2298
msgid " Ignore everything but the \"debian\" toplevel directory::"
2304
2299
msgstr ""
2305
2300
" Ignorar todo excepto el directorio de nivel superior de «debian»::"
2306
2301
2307
#: bzrlib/builtins.py:3143
2302
#: bzrlib/builtins.py:3172
2308
2303
msgid ""
2309
2304
" bzr ignore \"RE:(?!debian/).*\"\n"
2310
2305
" \n"
2316
2311
" bzr ignore \"!!*~\""
2317
2312
msgstr ""
2318
2313
2319
#: bzrlib/builtins.py:3157
2314
#: bzrlib/builtins.py:3186
2320
2315
msgid "Display the default ignore rules that bzr uses."
2321
2316
msgstr "Muestra las reglas de ignorado predeterminada que usa bzr."
2322
2317
2323
#: bzrlib/builtins.py:3169
2318
#: bzrlib/builtins.py:3198
2324
2319
msgid "ignore requires at least one NAME_PATTERN or --default-rules."
2325
2320
msgstr "ignore requiere al menos un NAME_PATTERN o --default-rules."
2326
2321
2327
#: bzrlib/builtins.py:3180
2322
#: bzrlib/builtins.py:3209
2328
2323
#, python-format
2329
2324
msgid "Invalid ignore pattern found. %s"
2330
2325
msgid_plural "Invalid ignore patterns found. %s"
2331
2326
msgstr[0] "Se encontró un patrón de ignorado inválido. %s"
2332
2327
msgstr[1] "Se encontraron patrones de ignorado inválidos. %s"
2333
2328
2334
#: bzrlib/builtins.py:3189
2329
#: bzrlib/builtins.py:3218
2335
2330
msgid "NAME_PATTERN should not be an absolute path"
2336
2331
msgstr "NAME_PATTERN no debe ser una ruta absoluta"
2337
2332
2338
#: bzrlib/builtins.py:3202
2333
#: bzrlib/builtins.py:3231
2339
2334
#, python-format
2340
2335
msgid ""
2341
2336
"Warning: the following files are version controlled and match your ignore "
2345
2340
"them.\n"
2346
2341
msgstr ""
2347
2342
2348
#: bzrlib/builtins.py:3209
2343
#: bzrlib/builtins.py:3238
2349
2344
msgid "List ignored files and the patterns that matched them."
2350
2345
msgstr "Lista todos los archivos ignorados y patrones que conciden."
2351
2346
2352
#: bzrlib/builtins.py:3211
2347
#: bzrlib/builtins.py:3240
2353
2348
msgid ""
2354
2349
"List all the ignored files and the ignore pattern that caused the file to\n"
2355
2350
"be ignored."
2356
2351
msgstr ""
2357
2352
2358
#: bzrlib/builtins.py:3214
2353
#: bzrlib/builtins.py:3243
2359
2354
msgid "Alternatively, to list just the files::"
2360
2355
msgstr "Alternativamente, lista solo los archivos:"
2361
2356
2362
#: bzrlib/builtins.py:3216
2357
#: bzrlib/builtins.py:3245
2363
2358
msgid " bzr ls --ignored"
2364
2359
msgstr " bzr ls --ignored"
2365
2360
2366
#: bzrlib/builtins.py:3250
2361
#: bzrlib/builtins.py:3279
2367
2362
#, python-format
2368
2363
msgid "not a valid revision-number: %r"
2369
2364
msgstr "no es un número de revisión válido: %r"
2370
2365
2371
#: bzrlib/builtins.py:3257
2366
#: bzrlib/builtins.py:3286
2372
2367
msgid ""
2373
2368
"Export current or past revision to a destination directory or archive."
2374
2369
msgstr ""
2375
2370
"Exporta la revisión actual o pasada a un directorio de destino o un "
2376
2371
"archivador."
2377
2372
2378
#: bzrlib/builtins.py:3259
2373
#: bzrlib/builtins.py:3288
2379
2374
msgid "If no revision is specified this exports the last committed revision."
2380
2375
msgstr "Si no se especifica revisión, exporta la última revisión ejecutada."
2381
2376
2382
#: bzrlib/builtins.py:3261
2377
#: bzrlib/builtins.py:3290
2383
2378
msgid ""
2384
2379
"Format may be an \"exporter\" name, such as tar, tgz, tbz2. If none is\n"
2385
2380
"given, try to find the format with the extension. If no extension\n"
2386
2381
"is found exports to a directory (equivalent to --format=dir)."
2387
2382
msgstr ""
2388
2383
2389
#: bzrlib/builtins.py:3265
2384
#: bzrlib/builtins.py:3294
2390
2385
msgid ""
2391
2386
"If root is supplied, it will be used as the root directory inside\n"
2392
2387
"container formats (tar, zip, etc). If it is not supplied it will default\n"
2393
2388
"to the exported filename. The root option has no effect for 'dir' format."
2394
2389
msgstr ""
2395
2390
2396
#: bzrlib/builtins.py:3269
2391
#: bzrlib/builtins.py:3298
2397
2392
msgid ""
2398
2393
"If branch is omitted then the branch containing the current working\n"
2399
2394
"directory will be used."
2401
2396
"Si se omite la rama entonces se usa la rama que contiene el directorio\n"
2402
2397
"de trabajo actual."
2403
2398
2404
#: bzrlib/builtins.py:3272
2399
#: bzrlib/builtins.py:3301
2405
2400
msgid ""
2406
2401
"Note: Export of tree with non-ASCII filenames to zip is not supported."
2407
2402
msgstr ""
2408
2403
"Nota: no se puede exportar un aŕbol con nombres de archivo no ASCII a zip."
2409
2404
2410
#: bzrlib/builtins.py:3274
2405
#: bzrlib/builtins.py:3303
2411
2406
msgid ""
2412
2407
" ================= =========================\n"
2413
2408
" Supported formats Autodetected by extension\n"
2429
2424
" zip .zip\n"
2430
2425
" ================= ==================================="
2431
2426
2432
#: bzrlib/builtins.py:3288
2427
#: bzrlib/builtins.py:3317
2433
2428
msgid "Type of file to export to."
2434
2429
msgstr "Tipo de archivo para exportar."
2435
2430
2436
#: bzrlib/builtins.py:3291
2431
#: bzrlib/builtins.py:3320
2437
2432
msgid "Apply content filters to export the convenient form."
2438
2433
msgstr ""
2439
2434
"Aplicar los filtros de contenido para exportar el formulario conveniente."
2440
2435
2441
#: bzrlib/builtins.py:3295
2436
#: bzrlib/builtins.py:3324
2442
2437
msgid "Name of the root directory inside the exported file."
2443
2438
msgstr "Nombre del directorio raíz dentro del archivo exportado."
2444
2439
2445
#: bzrlib/builtins.py:3297
2440
#: bzrlib/builtins.py:3326
2446
2441
msgid ""
2447
2442
"Set modification time of files to that of the last revision in which it was "
2448
2443
"changed."
2450
2445
"Establecer la fecha de modificación de los archivos a la de la última "
2451
2446
"revisión en la que se cambió."
2452
2447
2453
#: bzrlib/builtins.py:3300
2448
#: bzrlib/builtins.py:3329
2454
2449
msgid ""
2455
2450
"Export the working tree contents rather than that of the last revision."
2456
2451
msgstr ""
2457
2452
2458
#: bzrlib/builtins.py:3319
2453
#: bzrlib/builtins.py:3348
2459
2454
msgid "--uncommitted requires a working tree"
2460
2455
msgstr "--uncommitted requiere un árbol de trabajo"
2461
2456
2462
#: bzrlib/builtins.py:3328
2457
#: bzrlib/builtins.py:3357
2463
2458
#, python-format
2464
2459
msgid "Unsupported export format: %s"
2465
2460
msgstr "Formato de exportación no permitido: %s"
2466
2461
2467
#: bzrlib/builtins.py:3332
2462
#: bzrlib/builtins.py:3361
2468
2463
msgid ""
2469
2464
"Write the contents of a file as of a given revision to standard output."
2470
2465
msgstr ""
2471
2466
"Escribir los contenidos de un archivo como una revisión dada a la salida "
2472
2467
"estándar."
2473
2468
2474
#: bzrlib/builtins.py:3334
2469
#: bzrlib/builtins.py:3363
2475
2470
msgid "If no revision is nominated, the last revision is used."
2476
2471
msgstr "SI no hay una revisión nominada, se usa la última revisión."
2477
2472
2478
#: bzrlib/builtins.py:3336
2473
#: bzrlib/builtins.py:3365
2479
2474
msgid ""
2480
2475
"Note: Take care to redirect standard output when using this command on a\n"
2481
2476
"binary file."
2484
2479
"un\n"
2485
2480
"archivo binario."
2486
2481
2487
#: bzrlib/builtins.py:3342
2482
#: bzrlib/builtins.py:3371
2488
2483
msgid "The path name in the old tree."
2489
2484
msgstr "La ruta en el árbol antiguo."
2490
2485
2491
#: bzrlib/builtins.py:3343
2486
#: bzrlib/builtins.py:3372
2492
2487
msgid "Apply content filters to display the convenience form."
2493
2488
msgstr "Aplicar los filtros de contenido para mostrar la forma conveniente."
2494
2489
2495
#: bzrlib/builtins.py:3354
2490
#: bzrlib/builtins.py:3383
2496
2491
msgid "bzr cat --revision takes exactly one revision specifier"
2497
2492
msgstr "bzr cat --revision toma específicamente un especificador de revisión"
2498
2493
2499
#: bzrlib/builtins.py:3379 bzrlib/builtins.py:3391
2494
#: bzrlib/builtins.py:3408 bzrlib/builtins.py:3420
2500
2495
msgid "{0!r} is not present in revision {1}"
2501
2496
msgstr "{0!r} no está presente en la revisión {1}"
2502
2497
2503
#: bzrlib/builtins.py:3414
2498
#: bzrlib/builtins.py:3443
2504
2499
msgid "Commit changes into a new revision."
2505
2500
msgstr "Ejecutar cambios en una revisión nueva."
2506
2501
2507
#: bzrlib/builtins.py:3416
2502
#: bzrlib/builtins.py:3445
2508
2503
msgid ""
2509
2504
"An explanatory message needs to be given for each commit. This is\n"
2510
2505
"often done by using the --message option (getting the message from the\n"
2514
2509
"boilerplate text loaded into the editor, use the --show-diff option."
2515
2510
msgstr ""
2516
2511
2517
#: bzrlib/builtins.py:3423
2512
#: bzrlib/builtins.py:3452
2518
2513
msgid ""
2519
2514
"By default, the entire tree is committed and the person doing the\n"
2520
2515
"commit is assumed to be the author. These defaults can be overridden\n"
2521
2516
"as explained below."
2522
2517
msgstr ""
2523
2518
2524
#: bzrlib/builtins.py:3427
2519
#: bzrlib/builtins.py:3456
2525
2520
msgid ":Selective commits:"
2526
2521
msgstr ""
2527
2522
2528
#: bzrlib/builtins.py:3429
2523
#: bzrlib/builtins.py:3458
2529
2524
msgid ""
2530
2525
" If selected files are specified, only changes to those files are\n"
2531
2526
" committed. If a directory is specified then the directory and\n"
2532
2527
" everything within it is committed."
2533
2528
msgstr ""
2534
2529
2535
#: bzrlib/builtins.py:3433
2530
#: bzrlib/builtins.py:3462
2536
2531
msgid ""
2537
2532
" When excludes are given, they take precedence over selected files.\n"
2538
2533
" For example, to commit only changes within foo, but not changes\n"
2539
2534
" within foo/bar::"
2540
2535
msgstr ""
2541
2536
2542
#: bzrlib/builtins.py:3437
2537
#: bzrlib/builtins.py:3466
2543
2538
msgid " bzr commit foo -x foo/bar"
2544
2539
msgstr " bzr commit foo -x foo/bar"
2545
2540
2546
#: bzrlib/builtins.py:3439
2541
#: bzrlib/builtins.py:3468
2547
2542
msgid " A selective commit after a merge is not yet supported."
2548
2543
msgstr " No está permitida una ejecución selectiva después de una fusión."
2549
2544
2550
#: bzrlib/builtins.py:3441
2545
#: bzrlib/builtins.py:3470
2551
2546
msgid ":Custom authors:"
2552
2547
msgstr ":Autores personalizados:"
2553
2548
2554
#: bzrlib/builtins.py:3443
2549
#: bzrlib/builtins.py:3472
2555
2550
msgid ""
2556
2551
" If the author of the change is not the same person as the committer,\n"
2557
2552
" you can specify the author's name using the --author option. The\n"
2561
2556
" author."
2562
2557
msgstr ""
2563
2558
2564
#: bzrlib/builtins.py:3450
2559
#: bzrlib/builtins.py:3479
2565
2560
msgid ":Checks:"
2566
2561
msgstr ":Comprobaciones:"
2567
2562
2568
#: bzrlib/builtins.py:3452
2563
#: bzrlib/builtins.py:3481
2569
2564
msgid ""
2570
2565
" A common mistake is to forget to add a new file or directory before\n"
2571
2566
" running the commit command. The --strict option checks for unknown\n"
2574
2569
" for details."
2575
2570
msgstr ""
2576
2571
2577
#: bzrlib/builtins.py:3458
2572
#: bzrlib/builtins.py:3487
2578
2573
msgid ":Things to note:"
2579
2574
msgstr ":Cosas a tener en cuenta:"
2580
2575
2581
#: bzrlib/builtins.py:3460
2576
#: bzrlib/builtins.py:3489
2582
2577
msgid ""
2583
2578
" If you accidentially commit the wrong changes or make a spelling\n"
2584
2579
" mistake in the commit message say, you can use the uncommit command\n"
2585
2580
" to undo it. See ``bzr help uncommit`` for details."
2586
2581
msgstr ""
2587
2582
2588
#: bzrlib/builtins.py:3464
2583
#: bzrlib/builtins.py:3493
2589
2584
msgid ""
2590
2585
" Hooks can also be configured to run after a commit. This allows you\n"
2591
2586
" to trigger updates to external systems like bug trackers. The --fixes\n"
2593
2588
" one or more bugs. See ``bzr help bugs`` for details."
2594
2589
msgstr ""
2595
2590
2596
#: bzrlib/builtins.py:3474
2591
#: bzrlib/builtins.py:3503
2597
2592
msgid "Do not consider changes made to a given path."
2598
2593
msgstr "No considerar los cambios realizados en una ruta dada."
2599
2594
2600
#: bzrlib/builtins.py:3477
2595
#: bzrlib/builtins.py:3506
2601
2596
msgid "Description of the new revision."
2602
2597
msgstr "Descripción de la revisión nueva."
2603
2598
2604
#: bzrlib/builtins.py:3480
2599
#: bzrlib/builtins.py:3509
2605
2600
msgid "Commit even if nothing has changed."
2606
2601
msgstr "Ejecutar incluso si no ha cambiado nada."
2607
2602
2608
#: bzrlib/builtins.py:3484
2603
#: bzrlib/builtins.py:3513
2609
2604
msgid "Take commit message from this file."
2610
2605
msgstr "Tomar el mensaje de ejecución desde este archivo."
2611
2606
2612
#: bzrlib/builtins.py:3486
2607
#: bzrlib/builtins.py:3515
2613
2608
msgid "Refuse to commit if there are unknown files in the working tree."
2614
2609
msgstr ""
2615
2610
"Rechazar la ejecución si hay archivos desconocidos en el árbol de trabajo."
2616
2611
2617
#: bzrlib/builtins.py:3489
2612
#: bzrlib/builtins.py:3518
2618
2613
msgid ""
2619
2614
"Manually set a commit time using commit date format, e.g. '2009-10-10 "
2620
2615
"08:00:00 +0100'."
2622
2617
"Establecer manualmente la hora de ejecución usando un formato de fecha de "
2623
2618
"ejecución, por ejemplo «2009-10-10 08:00:00 +0100»."
2624
2619
2625
#: bzrlib/builtins.py:3492
2620
#: bzrlib/builtins.py:3521
2626
2621
msgid "Mark a bug as being fixed by this revision (see \"bzr help bugs\")."
2627
2622
msgstr ""
2628
2623
"Marca que un error se ha arreglado en esta revisión (vea «bzr help bugs»)."
2629
2624
2630
#: bzrlib/builtins.py:3495
2625
#: bzrlib/builtins.py:3524
2631
2626
msgid "Set the author's name, if it's different from the committer."
2632
2627
msgstr ""
2633
2628
"Establecer el nombre del autor, si este es diferente al del ejecutor."
2634
2629
2635
#: bzrlib/builtins.py:3498
2630
#: bzrlib/builtins.py:3527
2636
2631
msgid ""
2637
2632
"Perform a local commit in a bound branch. Local commits are not pushed to "
2638
2633
"the master branch until a normal commit is performed."
2639
2634
msgstr ""
2640
2635
2641
#: bzrlib/builtins.py:3504
2636
#: bzrlib/builtins.py:3533
2642
2637
msgid ""
2643
2638
"When no message is supplied, show the diff along with the status summary in "
2644
2639
"the message editor."
2645
2640
msgstr ""
2646
2641
2647
#: bzrlib/builtins.py:3507
2642
#: bzrlib/builtins.py:3536
2648
2643
msgid ""
2649
2644
"When committing to a foreign version control system do not push data that "
2650
2645
"can not be natively represented."
2651
2646
msgstr ""
2652
2647
2653
#: bzrlib/builtins.py:3525
2648
#: bzrlib/builtins.py:3554
2654
2649
#, python-format
2655
2650
msgid ""
2656
2651
"No tracker specified for bug %s. Use the form 'tracker:id' or specify a "
2658
2653
"See \"bzr help bugs\" for more information on this feature. Commit refused."
2659
2654
msgstr ""
2660
2655
2661
#: bzrlib/builtins.py:3534
2656
#: bzrlib/builtins.py:3563
2662
2657
#, python-format
2663
2658
msgid ""
2664
2659
"Invalid bug %s. Must be in the form of 'tracker:id'. See \"bzr help bugs\" "
2666
2661
"Commit refused."
2667
2662
msgstr ""
2668
2663
2669
#: bzrlib/builtins.py:3543
2664
#: bzrlib/builtins.py:3572
2670
2665
#, python-format
2671
2666
msgid "Unrecognized bug %s. Commit refused."
2672
2667
msgstr "Error no reconocido %s. Ejecución rechazada."
2673
2668
2674
#: bzrlib/builtins.py:3546
2669
#: bzrlib/builtins.py:3575
2675
2670
#, python-format
2676
2671
msgid ""
2677
2672
"%s\n"
2680
2675
"%s\n"
2681
2676
"Ejecución rechazada."
2682
2677
2683
#: bzrlib/builtins.py:3570
2678
#: bzrlib/builtins.py:3599
2684
2679
msgid "Could not parse --commit-time: "
2685
2680
msgstr "No se puede analizar --commit-time: "
2686
2681
2687
#: bzrlib/builtins.py:3610
2682
#: bzrlib/builtins.py:3639
2688
2683
msgid "please specify either --message or --file"
2689
2684
msgstr "especifique uno --message o --file"
2690
2685
2691
#: bzrlib/builtins.py:3639
2686
#: bzrlib/builtins.py:3668
2692
2687
msgid "please specify a commit message with either --message or --file"
2693
2688
msgstr "especifique un mensaje de ejecución con --message o --file"
2694
2689
2695
#: bzrlib/builtins.py:3642
2690
#: bzrlib/builtins.py:3671
2696
2691
msgid ""
2697
2692
"Empty commit message specified. Please specify a commit message with either -"
2698
2693
"-message or --file or leave a blank message with --message \"\"."
2699
2694
msgstr ""
2700
2695
2701
#: bzrlib/builtins.py:3662
2696
#: bzrlib/builtins.py:3691
2702
2697
msgid ""
2703
2698
"No changes to commit. Please 'bzr add' the files you want to commit, or use -"
2704
2699
"-unchanged to force an empty commit."
2706
2701
"No hay cambios que ejecutar. «bzr add» los archivos que quiera ejecutar o "
2707
2702
"use --unchanged para forzar una ejecución vacía."
2708
2703
2709
#: bzrlib/builtins.py:3666
2704
#: bzrlib/builtins.py:3695
2710
2705
msgid ""
2711
2706
"Conflicts detected in working tree. Use \"bzr conflicts\" to list, \"bzr "
2712
2707
"resolve FILE\" to resolve."
2714
2709
"Conflictos detectados en el árbol de trabajo. Use «bzr conflicts» para "
2715
2710
"listar, «bzr resolve ARCHIVO»\" para resolver."
2716
2711
2717
#: bzrlib/builtins.py:3670
2712
#: bzrlib/builtins.py:3699
2718
2713
msgid "Commit refused because there are unknown files in the working tree."
2719
2714
msgstr ""
2720
2715
"Ejecución rechazada porque hay archivos desconocidos en el árbol de trabajo."
2721
2716
2722
#: bzrlib/builtins.py:3673
2717
#: bzrlib/builtins.py:3702
2723
2718
msgid ""
2724
2719
"\n"
2725
2720
"To commit to master branch, run update and then commit.\n"
2726
2721
"You can also pass --local to commit to continue working disconnected."
2727
2722
msgstr ""
2728
2723
2729
#: bzrlib/builtins.py:3681
2724
#: bzrlib/builtins.py:3710
2730
2725
msgid ""
2731
2726
"Validate working tree structure, branch consistency and repository history."
2732
2727
msgstr ""
2733
2728
"Valida la estructura del árbol de trabajo, la consistencia de la rama y el "
2734
2729
"historial del repositorio."
2735
2730
2736
#: bzrlib/builtins.py:3683
2731
#: bzrlib/builtins.py:3712
2737
2732
msgid ""
2738
2733
"This command checks various invariants about branch and repository storage\n"
2739
2734
"to detect data corruption or bzr bugs."
2740
2735
msgstr ""
2741
2736
2742
#: bzrlib/builtins.py:3686
2737
#: bzrlib/builtins.py:3715
2743
2738
msgid ""
2744
2739
"The working tree and branch checks will only give output if a problem is\n"
2745
2740
"detected. The output fields of the repository check are:"
2746
2741
msgstr ""
2747
2742
2748
#: bzrlib/builtins.py:3689
2743
#: bzrlib/builtins.py:3718
2749
2744
msgid ""
2750
2745
"revisions\n"
2751
2746
" This is just the number of revisions checked. It doesn't\n"
2755
2750
" Esto es solo el número de revisiones comprobadas, No\n"
2756
2751
" indica un problema."
2757
2752
2758
#: bzrlib/builtins.py:3693
2753
#: bzrlib/builtins.py:3722
2759
2754
msgid ""
2760
2755
"versionedfiles\n"
2761
2756
" This is just the number of versionedfiles checked. It\n"
2765
2760
" Esto es solo el número de archivos versionados comprobados.. No\n"
2766
2761
" indica un problema."
2767
2762
2768
#: bzrlib/builtins.py:3697
2763
#: bzrlib/builtins.py:3726
2769
2764
msgid ""
2770
2765
"unreferenced ancestors\n"
2771
2766
" Texts that are ancestors of other texts, but\n"
2773
2768
" subtle problem that Bazaar can work around."
2774
2769
msgstr ""
2775
2770
2776
#: bzrlib/builtins.py:3702
2771
#: bzrlib/builtins.py:3731
2777
2772
msgid ""
2778
2773
"unique file texts\n"
2779
2774
" This is the total number of unique file contents\n"
2780
2775
" seen in the checked revisions. It does not indicate a problem."
2781
2776
msgstr ""
2782
2777
2783
#: bzrlib/builtins.py:3706
2778
#: bzrlib/builtins.py:3735
2784
2779
msgid ""
2785
2780
"repeated file texts\n"
2786
2781
" This is the total number of repeated texts seen\n"
2789
2784
" indicate a problem."
2790
2785
msgstr ""
2791
2786
2792
#: bzrlib/builtins.py:3712
2787
#: bzrlib/builtins.py:3741
2793
2788
msgid ""
2794
2789
"If no restrictions are specified, all Bazaar data that is found at the "
2795
2790
"given\n"
2796
2791
"location will be checked."
2797
2792
msgstr ""
2798
2793
2799
#: bzrlib/builtins.py:3717
2794
#: bzrlib/builtins.py:3746
2800
2795
msgid " Check the tree and branch at 'foo'::"
2801
2796
msgstr " Comprueba el árbol y la rama en «foo»::"
2802
2797
2803
#: bzrlib/builtins.py:3719
2798
#: bzrlib/builtins.py:3748
2804
2799
msgid " bzr check --tree --branch foo"
2805
2800
msgstr " bzr check --tree --branch foo"
2806
2801
2807
#: bzrlib/builtins.py:3721
2802
#: bzrlib/builtins.py:3750
2808
2803
msgid " Check only the repository at 'bar'::"
2809
2804
msgstr " Comprueba solo el repositorio en «bar»::"
2810
2805
2811
#: bzrlib/builtins.py:3723
2806
#: bzrlib/builtins.py:3752
2812
2807
msgid " bzr check --repo bar"
2813
2808
msgstr " bzr check --repo bar"
2814
2809
2815
#: bzrlib/builtins.py:3725
2810
#: bzrlib/builtins.py:3754
2816
2811
msgid " Check everything at 'baz'::"
2817
2812
msgstr " Comprueba todo en «baz»::"
2818
2813
2819
#: bzrlib/builtins.py:3727
2814
#: bzrlib/builtins.py:3756
2820
2815
msgid " bzr check baz"
2821
2816
msgstr " bzr check baz"
2822
2817
2823
#: bzrlib/builtins.py:3733
2818
#: bzrlib/builtins.py:3762
2824
2819
msgid "Check the branch related to the current directory."
2825
2820
msgstr "Comprueba la rama relacionada con el directorio actual."
2826
2821
2827
#: bzrlib/builtins.py:3735
2822
#: bzrlib/builtins.py:3764
2828
2823
msgid "Check the repository related to the current directory."
2829
2824
msgstr "Comprueba el repositorio relacionado con el directorio actual."
2830
2825
2831
#: bzrlib/builtins.py:3737
2826
#: bzrlib/builtins.py:3766
2832
2827
msgid "Check the working tree related to the current directory."
2833
2828
msgstr "Comprueba el árbol de trabajo relacionado con el directorio actual."
2834
2829
2835
#: bzrlib/builtins.py:3751
2830
#: bzrlib/builtins.py:3780
2836
2831
msgid "Upgrade a repository, branch or working tree to a newer format."
2837
2832
msgstr "Actualiza un repositorio, rama o árbol de trabajo al formato nuevo."
2838
2833
2839
#: bzrlib/builtins.py:3753
2834
#: bzrlib/builtins.py:3782
2840
2835
msgid ""
2841
2836
"When the default format has changed after a major new release of\n"
2842
2837
"Bazaar, you may be informed during certain operations that you\n"
2845
2840
"with older repositories or with older versions of Bazaar."
2846
2841
msgstr ""
2847
2842
2848
#: bzrlib/builtins.py:3759
2843
#: bzrlib/builtins.py:3788
2849
2844
msgid ""
2850
2845
"If you wish to upgrade to a particular format rather than the\n"
2851
2846
"current default, that can be specified using the --format option.\n"
2855
2850
"2.x default) so downgrading is not always possible."
2856
2851
msgstr ""
2857
2852
2858
#: bzrlib/builtins.py:3766
2853
#: bzrlib/builtins.py:3795
2859
2854
msgid ""
2860
2855
"A backup.bzr.~#~ directory is created at the start of the conversion\n"
2861
2856
"process (where # is a number). By default, this is left there on\n"
2866
2861
"afterwards."
2867
2862
msgstr ""
2868
2863
2869
#: bzrlib/builtins.py:3774
2864
#: bzrlib/builtins.py:3803
2870
2865
msgid ""
2871
2866
"If the location given is a shared repository, dependent branches\n"
2872
2867
"are also converted provided the repository converts successfully.\n"
2874
2869
"tried."
2875
2870
msgstr ""
2876
2871
2877
#: bzrlib/builtins.py:3779
2872
#: bzrlib/builtins.py:3808
2878
2873
msgid ""
2879
2874
"For more information on upgrades, see the Bazaar Upgrade Guide,\n"
2880
2875
"http://doc.bazaar.canonical.com/latest/en/upgrade-guide/."
2883
2878
"actualización de Bazaar,\n"
2884
2879
"http://doc.bazaar.canonical.com/latest/en/upgrade-guide/."
2885
2880
2886
#: bzrlib/builtins.py:3787
2881
#: bzrlib/builtins.py:3816
2887
2882
msgid "Upgrade to a specific format. See \"bzr help formats\" for details."
2888
2883
msgstr ""
2889
2884
"Actualizar a un formato específico. Vea «bzr help formats» para tener más "
2890
2885
"detalles."
2891
2886
2892
#: bzrlib/builtins.py:3791
2887
#: bzrlib/builtins.py:3820
2893
2888
msgid "Branch format"
2894
2889
msgstr "Formato de la rama"
2895
2890
2896
#: bzrlib/builtins.py:3793
2891
#: bzrlib/builtins.py:3822
2897
2892
msgid "Remove the backup.bzr directory if successful."
2898
2893
msgstr "Elimina el directorio backup.bzr si tiene éxito."
2899
2894
2900
#: bzrlib/builtins.py:3795
2895
#: bzrlib/builtins.py:3824
2901
2896
msgid "Show what would be done, but don't actually do anything."
2902
2897
msgstr "Muestra lo que se haría, pero no hace nada en realidad."
2903
2898
2904
#: bzrlib/builtins.py:3810
2899
#: bzrlib/builtins.py:3839
2905
2900
msgid "Show or set bzr user id."
2906
2901
msgstr "Muestra o establece la id de usuario bzr."
2907
2902
2908
#: bzrlib/builtins.py:3812
2903
#: bzrlib/builtins.py:3841
2909
2904
msgid ""
2910
2905
":Examples:\n"
2911
2906
" Show the email of the current user::"
2913
2908
":Ejemplos:\n"
2914
2909
" Muestra el correo del usuario actual::"
2915
2910
2916
#: bzrlib/builtins.py:3815
2911
#: bzrlib/builtins.py:3844
2917
2912
msgid " bzr whoami --email"
2918
2913
msgstr " bzr whoami --email"
2919
2914
2920
#: bzrlib/builtins.py:3817
2915
#: bzrlib/builtins.py:3846
2921
2916
msgid " Set the current user::"
2922
2917
msgstr " Establece el usuario actual::"
2923
2918
2924
#: bzrlib/builtins.py:3819
2919
#: bzrlib/builtins.py:3848
2925
2920
msgid " bzr whoami \"Frank Chu <fchu@example.com>\""
2926
2921
msgstr " bzr whoami «Frank Chu <fchu@example.com>»"
2927
2922
2928
#: bzrlib/builtins.py:3823
2923
#: bzrlib/builtins.py:3852
2929
2924
msgid "Display email address only."
2930
2925
msgstr "Muestra solo la dirección de correo."
2931
2926
2932
#: bzrlib/builtins.py:3825
2927
#: bzrlib/builtins.py:3854
2933
2928
msgid "Set identity for the current branch instead of globally."
2934
2929
msgstr "Establece la identidad de la rama actual en lugar de globalmente."
2935
2930
2936
#: bzrlib/builtins.py:3851
2931
#: bzrlib/builtins.py:3880
2937
2932
msgid "--email can only be used to display existing identity"
2938
2933
msgstr "--email solo se puede usar para mostrar la identidad del directorio"
2939
2934
2940
#: bzrlib/builtins.py:3873
2935
#: bzrlib/builtins.py:3904
2941
2936
msgid "Print or set the branch nickname."
2942
2937
msgstr "Muestra o establece el apodo de la rama."
2943
2938
2944
#: bzrlib/builtins.py:3887
2939
#: bzrlib/builtins.py:3906
2945
2940
msgid ""
2946
2941
"If unset, the colocated branch name is used for colocated branches, and\n"
2947
2942
"the branch directory name is used for other branches. To print the\n"
2948
2943
"current nickname, execute with no argument."
2949
2944
msgstr ""
2950
2945
2951
#: bzrlib/builtins.py:3878
2946
#: bzrlib/builtins.py:3910
2952
2947
msgid ""
2953
2948
"Bound branches use the nickname of its master branch unless it is set\n"
2954
2949
"locally."
2955
2950
msgstr ""
2956
2951
2957
#: bzrlib/builtins.py:3898
2952
#: bzrlib/builtins.py:3930
2958
2953
msgid "Set/unset and display aliases."
2959
2954
msgstr "Establece/desestablece y muestra alias."
2960
2955
2961
#: bzrlib/builtins.py:3900
2956
#: bzrlib/builtins.py:3932
2962
2957
msgid ""
2963
2958
":Examples:\n"
2964
2959
" Show the current aliases::"
2966
2961
":Ejemplos:\n"
2967
2962
" Muestra los alias actuales::"
2968
2963
2969
#: bzrlib/builtins.py:3903
2964
#: bzrlib/builtins.py:3935
2970
2965
msgid " bzr alias"
2971
2966
msgstr " bzr alias"
2972
2967
2973
#: bzrlib/builtins.py:3905
2968
#: bzrlib/builtins.py:3937
2974
2969
msgid " Show the alias specified for 'll'::"
2975
2970
msgstr " Muestra los alias especificados por «ll»::"
2976
2971
2977
#: bzrlib/builtins.py:3907
2972
#: bzrlib/builtins.py:3939
2978
2973
msgid " bzr alias ll"
2979
2974
msgstr " bzr alias ll"
2980
2975
2981
#: bzrlib/builtins.py:3909
2976
#: bzrlib/builtins.py:3941
2982
2977
msgid " Set an alias for 'll'::"
2983
2978
msgstr " Establece un alias para «ll»::"
2984
2979
2985
#: bzrlib/builtins.py:3911
2980
#: bzrlib/builtins.py:3943
2986
2981
msgid " bzr alias ll=\"log --line -r-10..-1\""
2987
2982
msgstr " bzr alias ll=\"log --line -r-10..-1\""
2988
2983
2989
#: bzrlib/builtins.py:3913
2984
#: bzrlib/builtins.py:3945
2990
2985
msgid " To remove an alias for 'll'::"
2991
2986
msgstr " Para eliminar un alias de «ll»::"
2992
2987
2993
#: bzrlib/builtins.py:3915
2988
#: bzrlib/builtins.py:3947
2994
2989
msgid " bzr alias --remove ll"
2995
2990
msgstr " bzr alias --remove ll"
2996
2991
2997
#: bzrlib/builtins.py:3920
2992
#: bzrlib/builtins.py:3952
2998
2993
msgid "Remove the alias."
2999
2994
msgstr "Elimina los alias."
3000
2995
3001
#: bzrlib/builtins.py:3938
2996
#: bzrlib/builtins.py:3970
3002
2997
msgid "bzr alias --remove expects an alias to remove."
3003
2998
msgstr ""
3004
2999
3005
#: bzrlib/builtins.py:4119
3000
#: bzrlib/builtins.py:4151
3006
3001
msgid ""
3007
3002
"subunit not available. subunit needs to be installed to use --subunit."
3008
3003
msgstr ""
3009
3004
3010
#: bzrlib/builtins.py:4136
3005
#: bzrlib/builtins.py:4168
3011
3006
msgid ""
3012
3007
"--benchmark is no longer supported from bzr 2.2; use bzr-usertest instead"
3013
3008
msgstr ""
3014
3009
"--benchmark ya no está permitido en bzr 2.2; use bzr-usertest en su lugar"
3015
3010
3016
#: bzrlib/builtins.py:4183
3011
#: bzrlib/builtins.py:4215
3017
3012
msgid "Show version of bzr."
3018
3013
msgstr "Muestra la versión de bzr."
3019
3014
3020
#: bzrlib/builtins.py:4187
3015
#: bzrlib/builtins.py:4219
3021
3016
msgid "Print just the version number."
3022
3017
msgstr "Solamente imprime el número de versión."
3023
3018
3024
#: bzrlib/builtins.py:4206
3019
#: bzrlib/builtins.py:4238
3025
3020
msgid "It sure does!\n"
3026
3021
msgstr "¡Seguro que si!\n"
3027
3022
3028
#: bzrlib/builtins.py:4230
3023
#: bzrlib/builtins.py:4262
3029
3024
#, python-format
3030
3025
msgid "merge base is revision %s\n"
3031
3026
msgstr ""
3032
3027
3033
#: bzrlib/builtins.py:4234
3028
#: bzrlib/builtins.py:4266
3034
3029
msgid "Perform a three-way merge."
3035
3030
msgstr "Realiza una fusión de tres vías."
3036
3031
3037
#: bzrlib/builtins.py:4236
3032
#: bzrlib/builtins.py:4268
3038
3033
msgid ""
3039
3034
"The source of the merge can be specified either in the form of a branch,\n"
3040
3035
"or in the form of a path to a file containing a merge directive generated\n"
3045
3040
"the current working tree."
3046
3041
msgstr ""
3047
3042
3048
#: bzrlib/builtins.py:4244
3043
#: bzrlib/builtins.py:4276
3049
3044
msgid ""
3050
3045
"When merging from a branch, by default bzr will try to merge in all new\n"
3051
3046
"work from the other branch, automatically determining an appropriate base\n"
3052
3047
"revision. If this fails, you may need to give an explicit base."
3053
3048
msgstr ""
3054
3049
3055
#: bzrlib/builtins.py:4248
3050
#: bzrlib/builtins.py:4280
3056
3051
msgid ""
3057
3052
"To pick a different ending revision, pass \"--revision OTHER\". bzr will\n"
3058
3053
"try to merge in all new work up to and including revision OTHER."
3059
3054
msgstr ""
3060
3055
3061
#: bzrlib/builtins.py:4251
3056
#: bzrlib/builtins.py:4283
3062
3057
msgid ""
3063
3058
"If you specify two values, \"--revision BASE..OTHER\", only revisions BASE\n"
3064
3059
"through OTHER, excluding BASE but including OTHER, will be merged. If this\n"
3069
3064
"changes from the other branch is not stored in the commit."
3070
3065
msgstr ""
3071
3066
3072
#: bzrlib/builtins.py:4259
3067
#: bzrlib/builtins.py:4291
3073
3068
msgid "Revision numbers are always relative to the source branch."
3074
3069
msgstr ""
3075
3070
"Los números de revisión están siempre relacionados con la rama origen."
3076
3071
3077
#: bzrlib/builtins.py:4261 bzrlib/conflicts.py:52 bzrlib/conflicts.py:106
3072
#: bzrlib/builtins.py:4293 bzrlib/conflicts.py:52 bzrlib/conflicts.py:106
3078
3073
msgid ""
3079
3074
"Merge will do its best to combine the changes in two branches, but there\n"
3080
3075
"are some kinds of problems only a human can fix. When it encounters those,\n"
3082
3077
"before you can commit."
3083
3078
msgstr ""
3084
3079
3085
#: bzrlib/builtins.py:4266
3080
#: bzrlib/builtins.py:4298
3086
3081
msgid ""
3087
3082
"Use bzr resolve when you have fixed a problem. See also bzr conflicts."
3088
3083
msgstr ""
3089
3084
"Use bzr resolve cuando tenga un problema arreglado. Vea también bzr "
3090
3085
"conflicts."
3091
3086
3092
#: bzrlib/builtins.py:4268
3087
#: bzrlib/builtins.py:4300
3093
3088
msgid ""
3094
3089
"If there is no default branch set, the first merge will set it (use\n"
3095
3090
"--no-remember to avoid setting it). After that, you can omit the branch\n"
3097
3092
"only be saved if the remote location can be accessed."
3098
3093
msgstr ""
3099
3094
3100
#: bzrlib/builtins.py:4273
3095
#: bzrlib/builtins.py:4305
3101
3096
msgid ""
3102
3097
"The results of the merge are placed into the destination working\n"
3103
3098
"directory, where they can be reviewed (with bzr diff), tested, and then\n"
3104
3099
"committed to record the result of the merge."
3105
3100
msgstr ""
3106
3101
3107
#: bzrlib/builtins.py:4277
3102
#: bzrlib/builtins.py:4309
3108
3103
msgid ""
3109
3104
"merge refuses to run if there are any uncommitted changes, unless\n"
3110
3105
"--force is given. If --force is given, then the changes from the source \n"
3113
3108
"merge revision which has more than two parents."
3114
3109
msgstr ""
3115
3110
3116
#: bzrlib/builtins.py:4283
3111
#: bzrlib/builtins.py:4315
3117
3112
msgid ""
3118
3113
"If one would like to merge changes from the working tree of the other\n"
3119
3114
"branch without merging any committed revisions, the --uncommitted option\n"
3120
3115
"can be given."
3121
3116
msgstr ""
3122
3117
3123
#: bzrlib/builtins.py:4287
3118
#: bzrlib/builtins.py:4319
3124
3119
msgid ""
3125
3120
"To select only some changes to merge, use \"merge -i\", which will prompt\n"
3126
3121
"you to apply each diff hunk and file change, similar to \"shelve\"."
3127
3122
msgstr ""
3128
3123
3129
#: bzrlib/builtins.py:4290
3124
#: bzrlib/builtins.py:4322
3130
3125
msgid ""
3131
3126
":Examples:\n"
3132
3127
" To merge all new revisions from bzr.dev::"
3134
3129
":Ejemplos:\n"
3135
3130
" Para fusionar todas las revisiones nuevas de bzr.dev::"
3136
3131
3137
#: bzrlib/builtins.py:4293
3132
#: bzrlib/builtins.py:4325
3138
3133
msgid " bzr merge ../bzr.dev"
3139
3134
msgstr " bzr merge ../bzr.dev"
3140
3135
3141
#: bzrlib/builtins.py:4295
3136
#: bzrlib/builtins.py:4327
3142
3137
msgid " To merge changes up to and including revision 82 from bzr.dev::"
3143
3138
msgstr " Para fusionar cambios e incluir la revisión 82 desde bzr.dev::"
3144
3139
3145
#: bzrlib/builtins.py:4297
3140
#: bzrlib/builtins.py:4329
3146
3141
msgid " bzr merge -r 82 ../bzr.dev"
3147
3142
msgstr " bzr merge -r 82 ../bzr.dev"
3148
3143
3149
#: bzrlib/builtins.py:4299
3144
#: bzrlib/builtins.py:4331
3150
3145
msgid " To merge the changes introduced by 82, without previous changes::"
3151
3146
msgstr ""
3152
3147
" Para fusionar los cambios introducidos por 82, sin cambios previos::"
3153
3148
3154
#: bzrlib/builtins.py:4301
3149
#: bzrlib/builtins.py:4333
3155
3150
msgid " bzr merge -r 81..82 ../bzr.dev"
3156
3151
msgstr " bzr merge -r 81..82 ../bzr.dev"
3157
3152
3158
#: bzrlib/builtins.py:4303
3153
#: bzrlib/builtins.py:4335
3159
3154
msgid " To apply a merge directive contained in /tmp/merge::"
3160
3155
msgstr " Para aplicar una directiva de fusión contenida en /tmp/merge::"
3161
3156
3162
#: bzrlib/builtins.py:4305
3157
#: bzrlib/builtins.py:4337
3163
3158
msgid " bzr merge /tmp/merge"
3164
3159
msgstr " bzr merge /tmp/merge"
3165
3160
3166
#: bzrlib/builtins.py:4307
3161
#: bzrlib/builtins.py:4339
3167
3162
msgid ""
3168
3163
" To create a merge revision with three parents from two branches\n"
3169
3164
" feature1a and feature1b:"
3170
3165
msgstr ""
3171
3166
3172
#: bzrlib/builtins.py:4310
3167
#: bzrlib/builtins.py:4342
3173
3168
msgid ""
3174
3169
" bzr merge ../feature1a\n"
3175
3170
" bzr merge ../feature1b --force\n"
3176
3171
" bzr commit -m 'revision with three parents'"
3177
3172
msgstr ""
3178
3173
3179
#: bzrlib/builtins.py:4322
3174
#: bzrlib/builtins.py:4354
3180
3175
msgid "Merge even if the destination tree has uncommitted changes."
3181
3176
msgstr "Fusionar incluso si el árbol de destino tiene cambios sin ejecutar."
3182
3177
3183
#: bzrlib/builtins.py:4328
3178
#: bzrlib/builtins.py:4360
3184
3179
msgid ""
3185
3180
"Apply uncommitted changes from a working copy, instead of branch changes."
3186
3181
msgstr ""
3187
3182
"Aplicar cambios no ejecutados desde una copia de trabajo, en vez de cambios "
3188
3183
"de rama."
3189
3184
3190
#: bzrlib/builtins.py:4330
3185
#: bzrlib/builtins.py:4362
3191
3186
msgid ""
3192
3187
"If the destination is already completely merged into the source, pull from "
3193
3188
"the source rather than merging. When this happens, you do not need to "
3194
3189
"commit the result."
3195
3190
msgstr ""
3196
3191
3197
#: bzrlib/builtins.py:4335
3192
#: bzrlib/builtins.py:4367
3198
3193
msgid ""
3199
3194
"Branch to merge into, rather than the one containing the working directory."
3200
3195
msgstr ""
3201
3196
3202
#: bzrlib/builtins.py:4337
3197
#: bzrlib/builtins.py:4369
3203
3198
msgid "Instead of merging, show a diff of the merge."
3204
3199
msgstr ""
3205
3200
3206
#: bzrlib/builtins.py:4339
3201
#: bzrlib/builtins.py:4371
3207
3202
msgid "Select changes interactively."
3208
3203
msgstr "Seleccionar cambios de manera interactiva."
3209
3204
3210
#: bzrlib/builtins.py:4361
3205
#: bzrlib/builtins.py:4393
3211
3206
msgid ""
3212
3207
"Merging into empty branches not currently supported, "
3213
3208
"https://bugs.launchpad.net/bzr/+bug/308562"
3214
3209
msgstr ""
3215
3210
3216
#: bzrlib/builtins.py:4388
3211
#: bzrlib/builtins.py:4420
3217
3212
msgid "Cannot use --uncommitted with bundles or merge directives."
3218
3213
msgstr ""
3219
3214
3220
#: bzrlib/builtins.py:4399
3215
#: bzrlib/builtins.py:4431
3221
3216
msgid "Cannot use --uncommitted and --revision at the same time."
3222
3217
msgstr "No se puede usar --uncommitted y --revision al mismo tiempo."
3223
3218
3224
#: bzrlib/builtins.py:4419
3219
#: bzrlib/builtins.py:4451
3225
3220
msgid "merger: "
3226
3221
msgstr "fusión: "
3227
3222
3228
#: bzrlib/builtins.py:4421 bzrlib/bundle/apply_bundle.py:71
3223
#: bzrlib/builtins.py:4453 bzrlib/bundle/apply_bundle.py:71
3229
3224
msgid "Nothing to do."
3230
3225
msgstr "Nada que hacer."
3231
3226
3232
#: bzrlib/builtins.py:4425
3227
#: bzrlib/builtins.py:4457
3233
3228
msgid "Cannot pull individual files"
3234
3229
msgstr "No se puede tirar de archivos individuales"
3235
3230
3236
#: bzrlib/builtins.py:4433
3231
#: bzrlib/builtins.py:4465
3237
3232
msgid "This branch has no commits. (perhaps you would prefer 'bzr pull')"
3238
3233
msgstr "Esta rama no tiene ejecuciones. (quizá prefiera «bzr pull»)"
3239
3234
3240
#: bzrlib/builtins.py:4491
3235
#: bzrlib/builtins.py:4523
3241
3236
#, python-format
3242
3237
msgid "Show-base is not supported for this merge type. %s"
3243
3238
msgstr "Show-base no está permitido en este tipo de fusión. %s"
3244
3239
3245
#: bzrlib/builtins.py:4500
3240
#: bzrlib/builtins.py:4532
3246
3241
#, python-format
3247
3242
msgid "Conflict reduction is not supported for merge type %s."
3248
3243
msgstr ""
3249
3244
"La reducción de conflicot no está permitida para el tipo de fusión %s."
3250
3245
3251
#: bzrlib/builtins.py:4504
3246
#: bzrlib/builtins.py:4536
3252
3247
msgid "Cannot do conflict reduction and show base."
3253
3248
msgstr ""
3254
3249
3255
#: bzrlib/builtins.py:4615
3250
#: bzrlib/builtins.py:4647
3256
3251
msgid "No location specified or remembered"
3257
3252
msgstr "No hay ubicación especificada o recordada"
3258
3253
3259
#: bzrlib/builtins.py:4617
3254
#: bzrlib/builtins.py:4649
3260
3255
msgid "{0} remembered {1} location {2}"
3261
3256
msgstr ""
3262
3257
3263
#: bzrlib/builtins.py:4623
3258
#: bzrlib/builtins.py:4655
3264
3259
msgid "Redo a merge."
3265
3260
msgstr "Rehacer una fusión."
3266
3261
3267
#: bzrlib/builtins.py:4625
3262
#: bzrlib/builtins.py:4657
3268
3263
msgid ""
3269
3264
"Use this if you want to try a different merge technique while resolving\n"
3270
3265
"conflicts. Some merge techniques are better than others, and remerge\n"
3271
3266
"lets you try different ones on different files."
3272
3267
msgstr ""
3273
3268
3274
#: bzrlib/builtins.py:4629
3269
#: bzrlib/builtins.py:4661
3275
3270
msgid ""
3276
3271
"The options for remerge have the same meaning and defaults as the ones for\n"
3277
3272
"merge. The difference is that remerge can (only) be run when there is a\n"
3278
3273
"pending merge, and it lets you specify particular files."
3279
3274
msgstr ""
3280
3275
3281
#: bzrlib/builtins.py:4633
3276
#: bzrlib/builtins.py:4665
3282
3277
msgid ""
3283
3278
":Examples:\n"
3284
3279
" Re-do the merge of all conflicted files, and show the base text in\n"
3285
3280
" conflict regions, in addition to the usual THIS and OTHER texts::"
3286
3281
msgstr ""
3287
3282
3288
#: bzrlib/builtins.py:4637
3283
#: bzrlib/builtins.py:4669
3289
3284
msgid " bzr remerge --show-base"
3290
3285
msgstr " bzr remerge --show-base"
3291
3286
3292
#: bzrlib/builtins.py:4639
3287
#: bzrlib/builtins.py:4671
3293
3288
msgid ""
3294
3289
" Re-do the merge of \"foobar\", using the weave merge algorithm, with\n"
3295
3290
" additional processing to reduce the size of conflict regions::"
3296
3291
msgstr ""
3297
3292
3298
#: bzrlib/builtins.py:4642
3293
#: bzrlib/builtins.py:4674
3299
3294
msgid " bzr remerge --merge-type weave --reprocess foobar"
3300
3295
msgstr ""
3301
3296
3302
#: bzrlib/builtins.py:4649
3297
#: bzrlib/builtins.py:4681
3303
3298
msgid "Show base revision text in conflicts."
3304
3299
msgstr "Mostrar el texto de revisión base en los conflictos."
3305
3300
3306
#: bzrlib/builtins.py:4661
3301
#: bzrlib/builtins.py:4693
3307
3302
msgid ""
3308
3303
"Sorry, remerge only works after normal merges. Not cherrypicking or multi-"
3309
3304
"merges."
3310
3305
msgstr ""
3311
3306
3312
#: bzrlib/builtins.py:4717
3313
msgid "Revert files to a previous revision."
3314
msgstr "Revierte los archivos a la revisión previa."
3307
#: bzrlib/builtins.py:4751
3308
msgid ""
3309
"Set files in the working tree back to the contents of a previous revision."
3310
msgstr ""
3315
3311
3316
#: bzrlib/builtins.py:4719
3312
#: bzrlib/builtins.py:4753
3317
3313
msgid ""
3318
3314
"Giving a list of files will revert only those files. Otherwise, all files\n"
3319
3315
"will be reverted. If the revision is not specified with '--revision', the\n"
3320
"last committed revision is used."
3316
"working tree basis revision is used. A revert operation affects only the\n"
3317
"working tree, not any revision history like the branch and repository or\n"
3318
"the working tree basis revision."
3321
3319
msgstr ""
3322
3320
3323
#: bzrlib/builtins.py:4723
3321
#: bzrlib/builtins.py:4759
3324
3322
msgid ""
3325
3323
"To remove only some changes, without reverting to a prior version, use\n"
3326
3324
"merge instead. For example, \"merge . -r -2..-3\" (don't forget the \".\")\n"
3327
3325
"will remove the changes introduced by the second last commit (-2), without\n"
3328
3326
"affecting the changes introduced by the last commit (-1). To remove\n"
3329
"certain changes on a hunk-by-hunk basis, see the shelve command."
3327
"certain changes on a hunk-by-hunk basis, see the shelve command.\n"
3328
"To update the branch to a specific revision or the latest revision and\n"
3329
"update the working tree accordingly while preserving local changes, see the\n"
3330
"update command."
3330
3331
msgstr ""
3331
3332
3332
#: bzrlib/builtins.py:4729
3333
#: bzrlib/builtins.py:4768
3333
3334
msgid ""
3334
"By default, any files that have been manually changed will be backed up\n"
3335
"first. (Files changed only by merge are not backed up.) Backup files have\n"
3336
"'.~#~' appended to their name, where # is a number."
3335
"Uncommitted changes to files that are reverted will be discarded.\n"
3336
"Howver, by default, any files that have been manually changed will be\n"
3337
"backed up first. (Files changed only by merge are not backed up.) Backup\n"
3338
"files have '.~#~' appended to their name, where # is a number."
3337
3339
msgstr ""
3338
3340
3339
#: bzrlib/builtins.py:4733
3341
#: bzrlib/builtins.py:4773
3340
3342
msgid ""
3341
3343
"When you provide files, you can use their current pathname or the pathname\n"
3342
3344
"from the target revision. So you can use revert to \"undelete\" a file by\n"
3344
3346
"reverted."
3345
3347
msgstr ""
3346
3348
3347
#: bzrlib/builtins.py:4738
3349
#: bzrlib/builtins.py:4778
3348
3350
msgid ""
3349
3351
"If you have newly added files since the target revision, they will be\n"
3350
3352
"removed. If the files to be removed have been changed, backups will be\n"
3352
3354
"deleted."
3353
3355
msgstr ""
3354
3356
3355
#: bzrlib/builtins.py:4743
3357
#: bzrlib/builtins.py:4783
3356
3358
msgid ""
3357
3359
"The working tree contains a list of revisions that have been merged but\n"
3358
3360
"not yet committed. These revisions will be included as additional parents\n"
3364
3366
"reverting any files."
3365
3367
msgstr ""
3366
3368
3367
#: bzrlib/builtins.py:4752
3369
#: bzrlib/builtins.py:4792
3368
3370
msgid ""
3369
3371
"Using \"bzr revert --forget-merges\", it is possible to apply all of the\n"
3370
3372
"changes from a branch in a single revision. To do this, perform the merge\n"
3378
3380
"target branches."
3379
3381
msgstr ""
3380
3382
3381
#: bzrlib/builtins.py:4766
3383
#: bzrlib/builtins.py:4806
3382
3384
msgid "Do not save backups of reverted files."
3383
3385
msgstr "No guardar respaldos de los archivos revertidos"
3384
3386
3385
#: bzrlib/builtins.py:4768
3387
#: bzrlib/builtins.py:4808
3386
3388
msgid "Remove pending merge marker, without changing any files."
3387
3389
msgstr ""
3388
3390
"Eliminar el marcador de fusión pendiente, sin cambiar ningún archivo."
3389
3391
3390
#: bzrlib/builtins.py:4799
3392
#: bzrlib/builtins.py:4839
3391
3393
msgid ""
3392
3394
"Show help on a command or other topic.\n"
3393
3395
" "
3395
3397
"Muestra ayuda en una orden u otro tema.\n"
3396
3398
" "
3397
3399
3398
#: bzrlib/builtins.py:4804
3400
#: bzrlib/builtins.py:4844
3399
3401
msgid "Show help on all commands."
3400
3402
msgstr "Muestra ayuda en todas las órdenes"
3401
3403
3402
#: bzrlib/builtins.py:4833
3404
#: bzrlib/builtins.py:4873
3403
3405
msgid "Show unmerged/unpulled revisions between two branches."
3404
3406
msgstr "Mostrar revisiones sin fusionar/extraer entre dos ramas."
3405
3407
3406
#: bzrlib/builtins.py:4835
3408
#: bzrlib/builtins.py:4875
3407
3409
msgid "OTHER_BRANCH may be local or remote."
3408
3410
msgstr "OTHER_BRANCH puede ser local o remoto."
3409
3411
3410
#: bzrlib/builtins.py:4837
3412
#: bzrlib/builtins.py:4877
3411
3413
msgid ""
3412
3414
"To filter on a range of revisions, you can use the command -r begin..end\n"
3413
3415
"-r revision requests a specific revision, -r ..end or -r begin.. are\n"
3418
3420
" 0 - no missing revisions"
3419
3421
msgstr ""
3420
3422
3421
#: bzrlib/builtins.py:4847
3423
#: bzrlib/builtins.py:4887
3422
3424
msgid ""
3423
3425
" Determine the missing revisions between this and the branch at the\n"
3424
3426
" remembered pull location::"
3425
3427
msgstr ""
3426
3428
3427
#: bzrlib/builtins.py:4850
3429
#: bzrlib/builtins.py:4890
3428
3430
msgid " bzr missing"
3429
3431
msgstr " bzr missing"
3430
3432
3431
#: bzrlib/builtins.py:4852
3433
#: bzrlib/builtins.py:4892
3432
3434
msgid " Determine the missing revisions between this and another branch::"
3433
3435
msgstr " Determina las revisiones perdidas entre esta y otra rama::"
3434
3436
3435
#: bzrlib/builtins.py:4854
3437
#: bzrlib/builtins.py:4894
3436
3438
msgid " bzr missing http://server/branch"
3437
3439
msgstr " bzr missing http://server/branch"
3438
3440
3439
#: bzrlib/builtins.py:4856
3441
#: bzrlib/builtins.py:4896
3440
3442
msgid ""
3441
3443
" Determine the missing revisions up to a specific revision on the other\n"
3442
3444
" branch::"
3443
3445
msgstr ""
3444
3446
3445
#: bzrlib/builtins.py:4859
3447
#: bzrlib/builtins.py:4899
3446
3448
msgid " bzr missing -r ..-10"
3447
3449
msgstr " bzr missing -r ..-10"
3448
3450
3449
#: bzrlib/builtins.py:4861
3451
#: bzrlib/builtins.py:4901
3450
3452
msgid ""
3451
3453
" Determine the missing revisions up to a specific revision on this\n"
3452
3454
" branch::"
3453
3455
msgstr ""
3454
3456
3455
#: bzrlib/builtins.py:4864
3457
#: bzrlib/builtins.py:4904
3456
3458
msgid " bzr missing --my-revision ..-10"
3457
3459
msgstr " bzr missing --my-revision ..-10"
3458
3460
3459
#: bzrlib/builtins.py:4871
3461
#: bzrlib/builtins.py:4911
3460
3462
msgid "Reverse the order of revisions."
3461
3463
msgstr "Revierte el orden de las revisiones."
3462
3464
3463
#: bzrlib/builtins.py:4873
3465
#: bzrlib/builtins.py:4913
3464
3466
msgid "Display changes in the local branch only."
3465
3467
msgstr "Muestra cambios solo en la rama local."
3466
3468
3467
#: bzrlib/builtins.py:4874
3469
#: bzrlib/builtins.py:4914
3468
3470
msgid "Same as --mine-only."
3469
3471
msgstr "Lo mismo que --mine-only."
3470
3472
3471
#: bzrlib/builtins.py:4876
3473
#: bzrlib/builtins.py:4916
3472
3474
msgid "Display changes in the remote branch only."
3473
3475
msgstr "Muestra cambios solo en la rama remota."
3474
3476
3475
#: bzrlib/builtins.py:4877
3477
#: bzrlib/builtins.py:4917
3476
3478
msgid "Same as --theirs-only."
3477
3479
msgstr "Lo mismo que --theirs-only."
3478
3480
3479
#: bzrlib/builtins.py:4882
3481
#: bzrlib/builtins.py:4922
3480
3482
msgid ""
3481
3483
"Filter on other branch revisions (inclusive). See \"help revisionspec\" for "
3482
3484
"details."
3484
3486
"Filtro en otras revisiones de rama (inclusive). Vea «help revisionspec» para "
3485
3487
"tener más detalles."
3486
3488
3487
#: bzrlib/builtins.py:4886
3489
#: bzrlib/builtins.py:4926
3488
3490
msgid ""
3489
3491
"Filter on local branch revisions (inclusive). See \"help revisionspec\" for "
3490
3492
"details."
3492
3494
"Filtro en revisiones locales de rama (inclusive). Vea «help revisionspec» "
3493
3495
"para tener más detalles."
3494
3496
3495
#: bzrlib/builtins.py:4889
3497
#: bzrlib/builtins.py:4929
3496
3498
msgid "Show all revisions in addition to the mainline ones."
3497
3499
msgstr ""
3498
3500
3499
#: bzrlib/builtins.py:4943
3501
#: bzrlib/builtins.py:4983
3500
3502
msgid "No peer location known or specified."
3501
3503
msgstr "No hay ubicación del par conocida o especificada."
3502
3504
3503
#: bzrlib/builtins.py:4947
3505
#: bzrlib/builtins.py:4987
3504
3506
msgid "Using saved parent location: {0}\n"
3505
3507
msgstr "Usar ubicación padre guardada: {0}\n"
3506
3508
3507
#: bzrlib/builtins.py:4980
3509
#: bzrlib/builtins.py:5020
3508
3510
#, python-format
3509
3511
msgid "You have %d extra revision:\n"
3510
3512
msgid_plural "You have %d extra revisions:\n"
3511
3513
msgstr[0] "Tiene %d revisión extra:\n"
3512
3514
msgstr[1] "Tiene %d revisiones extra:\n"
3513
3515
3514
#: bzrlib/builtins.py:4996
3516
#: bzrlib/builtins.py:5040
3515
3517
#, python-format
3516
3518
msgid "You are missing %d revision:\n"
3517
3519
msgid_plural "You are missing %d revisions:\n"
3518
3520
msgstr[0] "Tiene %d revisión perdida:\n"
3519
3521
msgstr[1] "Tiene %d revisiones perdidas:\n"
3520
3522
3521
#: bzrlib/builtins.py:5008
3523
#: bzrlib/builtins.py:5055
3522
3524
msgid "This branch has no new revisions.\n"
3523
3525
msgstr "Esta rama no tiene revisiones.\n"
3524
3526
3525
#: bzrlib/builtins.py:5011
3527
#: bzrlib/builtins.py:5058
3526
3528
msgid "Other branch has no new revisions.\n"
3527
3529
msgstr "Otra rama no tiene revisiones nuevas.\n"
3528
3530
3529
#: bzrlib/builtins.py:5016
3531
#: bzrlib/builtins.py:5063
3530
3532
msgid "Branches are up to date.\n"
3531
3533
msgstr "La rama está actualizada:\n"
3532
3534
3533
#: bzrlib/builtins.py:5027
3535
#: bzrlib/builtins.py:5074
3534
3536
msgid "Compress the data within a repository."
3535
3537
msgstr "Comprime los datos en un repositorio."
3536
3538
3537
#: bzrlib/builtins.py:5029
3539
#: bzrlib/builtins.py:5076
3538
3540
msgid ""
3539
3541
"This operation compresses the data within a bazaar repository. As\n"
3540
3542
"bazaar supports automatic packing of repository, this operation is\n"
3541
3543
"normally not required to be done manually."
3542
3544
msgstr ""
3543
3545
3544
#: bzrlib/builtins.py:5033
3546
#: bzrlib/builtins.py:5080
3545
3547
msgid ""
3546
3548
"During the pack operation, bazaar takes a backup of existing repository\n"
3547
3549
"data, i.e. pack files. This backup is eventually removed by bazaar\n"
3550
3552
"used."
3551
3553
msgstr ""
3552
3554
3553
#: bzrlib/builtins.py:5039
3555
#: bzrlib/builtins.py:5086
3554
3556
msgid ""
3555
3557
"Warning: If you use --clean-obsolete-packs and your machine crashes\n"
3556
3558
"during or immediately after repacking, you may be left with a state\n"
3558
3560
"been. In this case the repository may be unusable."
3559
3561
msgstr ""
3560
3562
3561
#: bzrlib/builtins.py:5048
3563
#: bzrlib/builtins.py:5095
3562
3564
msgid "Delete obsolete packs to save disk space."
3563
3565
msgstr "Elimina paquetes obsoletos para ahorrar espacio de disco."
3564
3566
3565
#: bzrlib/builtins.py:5062
3567
#: bzrlib/builtins.py:5109
3566
3568
msgid "List the installed plugins."
3567
3569
msgstr "Lista los complementos instalados."
3568
3570
3569
#: bzrlib/builtins.py:5064
3571
#: bzrlib/builtins.py:5111
3570
3572
msgid ""
3571
3573
"This command displays the list of installed plugins including\n"
3572
3574
"version of plugin and a short description of each."
3574
3576
"Esta orden muestra la lista de complementos instalados incluyendo\n"
3575
3577
"versión del complemento y una breve descripción de cada uno."
3576
3578
3577
#: bzrlib/builtins.py:5067
3579
#: bzrlib/builtins.py:5114
3578
3580
msgid "--verbose shows the path where each plugin is located."
3579
3581
msgstr "--verbose muestra la ruta donde está ubicado cada complemento."
3580
3582
3581
#: bzrlib/builtins.py:5069
3583
#: bzrlib/builtins.py:5116
3582
3584
msgid ""
3583
3585
"A plugin is an external component for Bazaar that extends the\n"
3584
3586
"revision control system, by adding or replacing code in Bazaar.\n"
3587
3589
"customizing log output."
3588
3590
msgstr ""
3589
3591
3590
#: bzrlib/builtins.py:5075
3592
#: bzrlib/builtins.py:5122
3591
3593
msgid ""
3592
3594
"See the Bazaar Plugin Guide <http://doc.bazaar.canonical.com/plugins/en/>\n"
3593
3595
"for further information on plugins including where to find them and how to\n"
3595
3597
"plugins using the Python programming language."
3596
3598
msgstr ""
3597
3599
3598
#: bzrlib/builtins.py:5091
3600
#: bzrlib/builtins.py:5138
3599
3601
msgid "Show testament (signing-form) of a revision."
3600
3602
msgstr ""
3601
3603
3602
#: bzrlib/builtins.py:5094
3604
#: bzrlib/builtins.py:5141
3603
3605
msgid "Produce long-format testament."
3604
3606
msgstr "Produce testamento en formato largo."
3605
3607
3606
#: bzrlib/builtins.py:5096
3608
#: bzrlib/builtins.py:5143
3607
3609
msgid "Produce a strict-format testament."
3608
3610
msgstr "Produce testamento en formato estricto."
3609
3611
3610
#: bzrlib/builtins.py:5122
3612
#: bzrlib/builtins.py:5169
3611
3613
msgid "Show the origin of each line in a file."
3612
3614
msgstr "Muestra el origen de cada línea en un archivo"
3613
3615
3614
#: bzrlib/builtins.py:5124
3616
#: bzrlib/builtins.py:5171
3615
3617
msgid ""
3616
3618
"This prints out the given file with an annotation on the left side\n"
3617
3619
"indicating which revision, author and date introduced the change."
3618
3620
msgstr ""
3619
3621
3620
#: bzrlib/builtins.py:5127
3622
#: bzrlib/builtins.py:5174
3621
3623
msgid ""
3622
3624
"If the origin is the same for a run of consecutive lines, it is\n"
3623
3625
"shown only at the top, unless the --all option is given."
3624
3626
msgstr ""
3625
3627
3626
#: bzrlib/builtins.py:5135
3628
#: bzrlib/builtins.py:5182
3627
3629
msgid "Show annotations on all lines."
3628
3630
msgstr "Muestra anotaciones en todas las líneas."
3629
3631
3630
#: bzrlib/builtins.py:5136
3632
#: bzrlib/builtins.py:5183
3631
3633
msgid "Show commit date in annotations."
3632
3634
msgstr "Muestra la fecha de ejecución en anotaciones."
3633
3635
3634
#: bzrlib/builtins.py:5223
3636
#: bzrlib/builtins.py:5270
3635
3637
msgid "Cannot sign a range of non-revision-history revisions"
3636
3638
msgstr ""
3637
3639
3638
#: bzrlib/builtins.py:5235
3640
#: bzrlib/builtins.py:5282
3639
3641
msgid "Please supply either one revision, or a range."
3640
3642
msgstr "Proporcione una revisión o un rango."
3641
3643
3642
#: bzrlib/builtins.py:5239
3644
#: bzrlib/builtins.py:5286
3643
3645
msgid ""
3644
3646
"Convert the current branch into a checkout of the supplied branch.\n"
3645
3647
"If no branch is supplied, rebind to the last bound location."
3646
3648
msgstr ""
3647
3649
3648
#: bzrlib/builtins.py:5242
3650
#: bzrlib/builtins.py:5289
3649
3651
msgid ""
3650
3652
"Once converted into a checkout, commits must succeed on the master branch\n"
3651
3653
"before they will be applied to the local branch."
3652
3654
msgstr ""
3653
3655
3654
#: bzrlib/builtins.py:5245
3656
#: bzrlib/builtins.py:5292
3655
3657
msgid ""
3656
3658
"Bound branches use the nickname of its master branch unless it is set\n"
3657
3659
"locally, in which case binding will update the local nickname to be\n"
3658
3660
"that of the master."
3659
3661
msgstr ""
3660
3662
3661
#: bzrlib/builtins.py:5260
3663
#: bzrlib/builtins.py:5307
3662
3664
msgid "No location supplied. This format does not remember old locations."
3663
3665
msgstr ""
3664
3666
"No se proporcionó ubicación. Este formato no recuerda antiguas ubicaciones."
3665
3667
3666
#: bzrlib/builtins.py:5265
3668
#: bzrlib/builtins.py:5313
3667
3669
msgid "Branch is already bound"
3668
3670
msgstr "La rama ya está asociada"
3669
3671
3670
#: bzrlib/builtins.py:5267
3672
#: bzrlib/builtins.py:5316
3671
3673
msgid "No location supplied and no previous location known"
3672
3674
msgstr "No se proporcionó ubicación y no hay ubicación previa conocida"
3673
3675
3674
#: bzrlib/builtins.py:5273
3676
#: bzrlib/builtins.py:5322
3675
3677
msgid "These branches have diverged. Try merging, and then bind again."
3676
3678
msgstr ""
3677
3679
"Las ramas tienen divergencias. Intente fusionar y vincularlas de nuevo."
3678
3680
3679
#: bzrlib/builtins.py:5280
3681
#: bzrlib/builtins.py:5329
3680
3682
msgid "Convert the current checkout into a regular branch."
3681
3683
msgstr "Convertir la comprobación actual en una rama regular."
3682
3684
3683
#: bzrlib/builtins.py:5282
3685
#: bzrlib/builtins.py:5331
3684
3686
msgid ""
3685
3687
"After unbinding, the local branch is considered independent and subsequent\n"
3686
3688
"commits will be local only."
3687
3689
msgstr ""
3688
3690
3689
#: bzrlib/builtins.py:5293
3691
#: bzrlib/builtins.py:5342
3690
3692
msgid "Local branch is not bound"
3691
3693
msgstr "La rama local no está vinculada"
3692
3694
3693
#: bzrlib/builtins.py:5297
3695
#: bzrlib/builtins.py:5346
3694
3696
msgid "Remove the last committed revision."
3695
3697
msgstr "Elimina la última revisión ejecutada."
3696
3698
3697
#: bzrlib/builtins.py:5299
3699
#: bzrlib/builtins.py:5348
3698
3700
msgid ""
3699
3701
"--verbose will print out what is being removed.\n"
3700
3702
"--dry-run will go through all the motions, but not actually\n"
3701
3703
"remove anything."
3702
3704
msgstr ""
3703
3705
3704
#: bzrlib/builtins.py:5303
3706
#: bzrlib/builtins.py:5352
3705
3707
msgid ""
3706
3708
"If --revision is specified, uncommit revisions to leave the branch at the\n"
3707
3709
"specified revision. For example, \"bzr uncommit -r 15\" will leave the\n"
3708
3710
"branch at revision 15."
3709
3711
msgstr ""
3710
3712
3711
#: bzrlib/builtins.py:5307
3713
#: bzrlib/builtins.py:5356
3712
3714
msgid ""
3713
3715
"Uncommit leaves the working tree ready for a new commit. The only change\n"
3714
3716
"it may make is to restore any pending merges that were present before\n"
3715
3717
"the commit."
3716
3718
msgstr ""
3717
3719
3718
#: bzrlib/builtins.py:5318
3720
#: bzrlib/builtins.py:5367
3719
3721
msgid "Don't actually make changes."
3720
3722
msgstr "En relaidad no hace cambios."
3721
3723
3722
#: bzrlib/builtins.py:5319
3724
#: bzrlib/builtins.py:5368
3723
3725
msgid "Say yes to all questions."
3724
3726
msgstr "Decir sí a todas las preguntas."
3725
3727
3726
#: bzrlib/builtins.py:5321
3728
#: bzrlib/builtins.py:5370
3727
3729
msgid "Keep tags that point to removed revisions."
3728
3730
msgstr "Mantener etiquetas que apuntan a eliminar revisiones."
3729
3731
3730
#: bzrlib/builtins.py:5323
3732
#: bzrlib/builtins.py:5372
3731
3733
msgid "Only remove the commits from the local branch when in a checkout."
3732
3734
msgstr ""
3733
3735
"Solo elimina ejecuciones de la rama local cuando se está en una comprobación."
3734
3736
3735
#: bzrlib/builtins.py:5372
3737
#: bzrlib/builtins.py:5421
3736
3738
msgid "No revisions to uncommit.\n"
3737
3739
msgstr "No hay revisiones para desejecutar.\n"
3738
3740
3739
#: bzrlib/builtins.py:5387
3741
#: bzrlib/builtins.py:5436
3740
3742
msgid "Dry-run, pretending to remove the above revisions.\n"
3741
3743
msgstr ""
3742
3744
3743
#: bzrlib/builtins.py:5390
3745
#: bzrlib/builtins.py:5439
3744
3746
msgid "The above revision(s) will be removed.\n"
3745
3747
msgstr "Las revisiones de arriba se eliminarán.\n"
3746
3748
3747
#: bzrlib/builtins.py:5394
3749
#: bzrlib/builtins.py:5443
3748
3750
msgid "Uncommit these revisions"
3749
3751
msgstr "Desejecutar estas revisiones"
3750
3752
3751
#: bzrlib/builtins.py:5397
3753
#: bzrlib/builtins.py:5446
3752
3754
msgid "Canceled\n"
3753
3755
msgstr "Cancelado\n"
3754
3756
3755
#: bzrlib/builtins.py:5404
3757
#: bzrlib/builtins.py:5453
3756
3758
#, python-format
3757
3759
msgid ""
3758
3760
"You can restore the old tip by running:\n"
3761
3763
"Puede restaurar el consejo antiguo ejecutando:\n"
3762
3764
" bzr pull . -r revid:%s\n"
3763
3765
3764
#: bzrlib/builtins.py:5409
3766
#: bzrlib/builtins.py:5458
3765
3767
msgid "Break a dead lock."
3766
3768
msgstr "Romper un bloqueo."
3767
3769
3768
#: bzrlib/builtins.py:5411
3770
#: bzrlib/builtins.py:5460
3769
3771
msgid ""
3770
3772
"This command breaks a lock on a repository, branch, working directory or\n"
3771
3773
"config file."
3774
3776
"o\n"
3775
3777
"archivo de configuración."
3776
3778
3777
#: bzrlib/builtins.py:5414
3779
#: bzrlib/builtins.py:5463
3778
3780
msgid ""
3779
3781
"CAUTION: Locks should only be broken when you are sure that the process\n"
3780
3782
"holding the lock has been stopped."
3781
3783
msgstr ""
3782
3784
3783
#: bzrlib/builtins.py:5417
3785
#: bzrlib/builtins.py:5466
3784
3786
msgid ""
3785
3787
"You can get information on what locks are open via the 'bzr info\n"
3786
3788
"[location]' command."
3787
3789
msgstr ""
3788
3790
3789
#: bzrlib/builtins.py:5420
3791
#: bzrlib/builtins.py:5469
3790
3792
msgid ""
3791
3793
":Examples:\n"
3792
3794
" bzr break-lock\n"
3798
3800
" bzr break-lock bzr+ssh://example.com/bzr/foo\n"
3799
3801
" bzr break-lock --conf ~/.bazaar"
3800
3802
3801
#: bzrlib/builtins.py:5429
3803
#: bzrlib/builtins.py:5478
3802
3804
msgid "LOCATION is the directory where the config lock is."
3803
3805
msgstr ""
3804
3806
3805
#: bzrlib/builtins.py:5431
3807
#: bzrlib/builtins.py:5480
3806
3808
msgid "Do not ask for confirmation before breaking the lock."
3807
3809
msgstr "No pedir confirmación antes de romper el bloqueo."
3808
3810
3809
#: bzrlib/builtins.py:5466
3811
#: bzrlib/builtins.py:5515
3810
3812
msgid "The Bazaar smart server protocol over TCP. (default port: 4155)"
3811
3813
msgstr ""
3812
3814
3813
#: bzrlib/builtins.py:5467
3815
#: bzrlib/builtins.py:5516
3814
3816
msgid "Run the bzr server."
3815
3817
msgstr "Ejecutar el servidor bzr."
3816
3818
3817
#: bzrlib/builtins.py:5473
3819
#: bzrlib/builtins.py:5522
3818
3820
msgid "Serve on stdin/out for use from inetd or sshd."
3819
3821
msgstr ""
3820
3822
3821
#: bzrlib/builtins.py:5474
3823
#: bzrlib/builtins.py:5523
3822
3824
msgid "protocol"
3823
3825
msgstr "protocolo"
3824
3826
3825
#: bzrlib/builtins.py:5475
3827
#: bzrlib/builtins.py:5524
3826
3828
msgid "Protocol to serve."
3827
3829
msgstr "Protocolo a servir."
3828
3830
3829
#: bzrlib/builtins.py:5495
3831
#: bzrlib/builtins.py:5528
3830
3832
msgid "Listen for connections on nominated address."
3831
3833
msgstr ""
3832
3834
3833
#: bzrlib/builtins.py:5497
3835
#: bzrlib/builtins.py:5530
3834
3836
msgid ""
3835
3837
"Listen for connections on nominated port. Passing 0 as the port number will "
3836
3838
"result in a dynamically allocated port. The default port depends on the "
3837
3839
"protocol."
3838
3840
msgstr ""
3839
3841
3840
#: bzrlib/builtins.py:5485
3842
#: bzrlib/builtins.py:5535
3841
3843
msgid "Serve contents of this directory."
3842
3844
msgstr ""
3843
3845
3844
#: bzrlib/builtins.py:5487
3846
#: bzrlib/builtins.py:5537
3845
3847
msgid ""
3846
3848
"By default the server is a readonly server. Supplying --allow-writes "
3847
3849
"enables write access to the contents of the served directory and below. "
3850
3852
"uncontrolled write access to your file system."
3851
3853
msgstr ""
3852
3854
3853
#: bzrlib/builtins.py:5496
3855
#: bzrlib/builtins.py:5546
3854
3856
msgid "Override the default idle client timeout (5min)."
3855
3857
msgstr ""
3856
3858
3857
#: bzrlib/builtins.py:5546
3859
#: bzrlib/builtins.py:5564
3858
3860
msgid "Combine a tree into its containing tree."
3859
3861
msgstr "Combina un árbol en su árbol contenedor."
3860
3862
3861
#: bzrlib/builtins.py:5548
3863
#: bzrlib/builtins.py:5566
3862
3864
msgid "This command requires the target tree to be in a rich-root format."
3863
3865
msgstr ""
3864
3866
3865
#: bzrlib/builtins.py:5550
3867
#: bzrlib/builtins.py:5568
3866
3868
msgid ""
3867
3869
"The TREE argument should be an independent tree, inside another tree, but\n"
3868
3870
"not part of it. (Such trees can be produced by \"bzr split\", but also by\n"
3869
3871
"running \"bzr branch\" with the target inside a tree.)"
3870
3872
msgstr ""
3871
3873
3872
#: bzrlib/builtins.py:5554
3874
#: bzrlib/builtins.py:5572
3873
3875
msgid ""
3874
3876
"The result is a combined tree, with the subtree no longer an independent\n"
3875
3877
"part. This is marked as a merge of the subtree into the containing tree,\n"
3876
3878
"and all history is preserved."
3877
3879
msgstr ""
3878
3880
3879
#: bzrlib/builtins.py:5572
3881
#: bzrlib/builtins.py:5590
3880
3882
#, python-format
3881
3883
msgid ""
3882
3884
"Can't join trees because %s doesn't support rich root data.\n"
3883
3885
"You can use bzr upgrade on the repository."
3884
3886
msgstr ""
3885
3887
3886
#: bzrlib/builtins.py:5582 bzrlib/builtins.py:5588
3888
#: bzrlib/builtins.py:5600 bzrlib/builtins.py:5606
3887
3889
msgid "Cannot join {0}. {1}"
3888
3890
msgstr "No se puede unir {0}. {1}"
3889
3891
3890
#: bzrlib/builtins.py:5592
3892
#: bzrlib/builtins.py:5610
3891
3893
msgid "Split a subdirectory of a tree into a separate tree."
3892
3894
msgstr "Divide un subdirectorio de un árbol en un árbol separado."
3893
3895
3894
#: bzrlib/builtins.py:5594
3896
#: bzrlib/builtins.py:5612
3895
3897
msgid ""
3896
3898
"This command will produce a target tree in a format that supports\n"
3897
3899
"rich roots, like 'rich-root' or 'rich-root-pack'. These formats cannot be\n"
3898
3900
"converted into earlier formats like 'dirstate-tags'."
3899
3901
msgstr ""
3900
3902
3901
#: bzrlib/builtins.py:5598
3903
#: bzrlib/builtins.py:5616
3902
3904
msgid ""
3903
3905
"The TREE argument should be a subdirectory of a working tree. That\n"
3904
3906
"subdirectory will be converted into an independent tree, with its own\n"
3905
3907
"branch. Commits in the top-level tree will not apply to the new subtree."
3906
3908
msgstr ""
3907
3909
3908
#: bzrlib/builtins.py:5678
3910
#: bzrlib/builtins.py:5696
3909
3911
msgid "No submit branch specified or known"
3910
3912
msgstr "No se ha enviado una rama especificada o conocida"
3911
3913
3912
#: bzrlib/builtins.py:5686 bzrlib/send.py:108
3914
#: bzrlib/builtins.py:5705 bzrlib/send.py:109
3913
3915
msgid "No public branch specified or known"
3914
3916
msgstr "No hay una rama especificada o conocida pública"
3915
3917
3916
#: bzrlib/builtins.py:5691
3918
#: bzrlib/builtins.py:5710
3917
3919
msgid "bzr merge-directive takes at most two one revision identifiers"
3918
3920
msgstr ""
3919
3921
3920
#: bzrlib/builtins.py:5700
3922
#: bzrlib/builtins.py:5719
3921
3923
msgid "No revisions to bundle."
3922
3924
msgstr ""
3923
3925
3924
#: bzrlib/builtins.py:5719
3926
#: bzrlib/builtins.py:5738
3925
3927
msgid "Mail or create a merge-directive for submitting changes."
3926
3928
msgstr ""
3927
3929
3928
#: bzrlib/builtins.py:5721
3930
#: bzrlib/builtins.py:5740
3929
3931
msgid "A merge directive provides many things needed for requesting merges:"
3930
3932
msgstr ""
3931
3933
3932
#: bzrlib/builtins.py:5723
3934
#: bzrlib/builtins.py:5742
3933
3935
msgid "* A machine-readable description of the merge to perform"
3934
3936
msgstr ""
3935
3937
3936
#: bzrlib/builtins.py:5725
3938
#: bzrlib/builtins.py:5744
3937
3939
msgid "* An optional patch that is a preview of the changes requested"
3938
3940
msgstr ""
3939
3941
"* Una ruta opcional que es una vista previa de los cambios requeridos"
3940
3942
3941
#: bzrlib/builtins.py:5727
3943
#: bzrlib/builtins.py:5746
3942
3944
msgid ""
3943
3945
"* An optional bundle of revision data, so that the changes can be applied\n"
3944
3946
" directly from the merge directive, without retrieving data from a\n"
3945
3947
" branch."
3946
3948
msgstr ""
3947
3949
3948
#: bzrlib/builtins.py:5731
3950
#: bzrlib/builtins.py:5750
3949
3951
msgid ""
3950
3952
"`bzr send` creates a compact data set that, when applied using bzr\n"
3951
3953
"merge, has the same effect as merging from the source branch. "
3952
3954
msgstr ""
3953
3955
3954
#: bzrlib/builtins.py:5734
3956
#: bzrlib/builtins.py:5753
3955
3957
msgid ""
3956
3958
"By default the merge directive is self-contained and can be applied to any\n"
3957
3959
"branch containing submit_branch in its ancestory without needing access to\n"
3958
3960
"the source branch."
3959
3961
msgstr ""
3960
3962
3961
#: bzrlib/builtins.py:5738
3963
#: bzrlib/builtins.py:5757
3962
3964
msgid ""
3963
3965
"If --no-bundle is specified, then Bazaar doesn't send the contents of the\n"
3964
3966
"revisions, but only a structured request to merge from the\n"
3967
3969
"included if known, so that people can check it later."
3968
3970
msgstr ""
3969
3971
3970
#: bzrlib/builtins.py:5744
3972
#: bzrlib/builtins.py:5763
3971
3973
msgid ""
3972
3974
"The submit branch defaults to the parent of the source branch, but can be\n"
3973
3975
"overridden. Both submit branch and public branch will be remembered in\n"
3976
3978
"be changed using --from."
3977
3979
msgstr ""
3978
3980
3979
#: bzrlib/builtins.py:5750
3981
#: bzrlib/builtins.py:5769
3980
3982
msgid ""
3981
3983
"Both the submit branch and the public branch follow the usual behavior with\n"
3982
3984
"respect to --remember: If there is no default location set, the first send\n"
3985
3987
"--remember. The value will only be saved if the location can be accessed."
3986
3988
msgstr ""
3987
3989
3988
#: bzrlib/builtins.py:5756
3990
#: bzrlib/builtins.py:5775
3989
3991
msgid ""
3990
3992
"In order to calculate those changes, bzr must analyse the submit branch.\n"
3991
3993
"Therefore it is most efficient for the submit branch to be a local mirror.\n"
3993
3995
"in the merge directive."
3994
3996
msgstr ""
3995
3997
3996
#: bzrlib/builtins.py:5761
3998
#: bzrlib/builtins.py:5780
3997
3999
msgid ""
3998
4000
"The default behaviour is to send the merge directive by mail, unless -o is\n"
3999
4001
"given, in which case it is sent to a file."
4000
4002
msgstr ""
4001
4003
4002
#: bzrlib/builtins.py:5764
4004
#: bzrlib/builtins.py:5783
4003
4005
msgid ""
4004
4006
"Mail is sent using your preferred mail program. This should be transparent\n"
4005
4007
"on Windows (it uses MAPI). On Unix, it requires the xdg-email utility.\n"
4006
4008
"If the preferred client can't be found (or used), your editor will be used."
4007
4009
msgstr ""
4008
4010
4009
#: bzrlib/builtins.py:5768
4011
#: bzrlib/builtins.py:5787
4010
4012
msgid ""
4011
4013
"To use a specific mail program, set the mail_client configuration option.\n"
4012
4014
"(For Thunderbird 1.5, this works around some bugs.) Supported values for\n"
4018
4020
"supported clients."
4019
4021
msgstr ""
4020
4022
4021
#: bzrlib/builtins.py:5775
4023
#: bzrlib/builtins.py:5794
4022
4024
msgid ""
4023
4025
"If mail is being sent, a to address is required. This can be supplied\n"
4024
4026
"either on the commandline, by setting the submit_to configuration\n"
4026
4028
"in the submit branch."
4027
4029
msgstr ""
4028
4030
4029
#: bzrlib/builtins.py:5780
4031
#: bzrlib/builtins.py:5799
4030
4032
msgid ""
4031
4033
"Two formats are currently supported: \"4\" uses revision bundle format 4 "
4032
4034
"and\n"
4036
4038
"format 1. It is compatible with Bazaar 0.12 - 0.18."
4037
4039
msgstr ""
4038
4040
4039
#: bzrlib/builtins.py:5786
4041
#: bzrlib/builtins.py:5805
4040
4042
msgid ""
4041
4043
"The merge directives created by bzr send may be applied using bzr merge or\n"
4042
4044
"bzr pull by specifying a file containing a merge directive as the location."
4043
4045
msgstr ""
4044
4046
4045
#: bzrlib/builtins.py:5789
4047
#: bzrlib/builtins.py:5808
4046
4048
msgid ""
4047
4049
"bzr send makes extensive use of public locations to map local locations "
4048
4050
"into\n"
4050
4052
"set them, and use `bzr info` to display them."
4051
4053
msgstr ""
4052
4054
4053
#: bzrlib/builtins.py:5813
4055
#: bzrlib/builtins.py:5832
4054
4056
msgid "Write merge directive to this file or directory; use - for stdout."
4055
4057
msgstr "Escribir la directiva de fusión a este archivo; use - for stdout."
4056
4058
4057
#: bzrlib/builtins.py:5817
4059
#: bzrlib/builtins.py:5836
4058
4060
msgid ""
4059
4061
"Refuse to send if there are uncommitted changes in the working tree, --no-"
4060
4062
"strict disables the check."
4061
4063
msgstr ""
4062
4064
4063
#: bzrlib/builtins.py:5819
4065
#: bzrlib/builtins.py:5838
4064
4066
msgid "Mail the request to this address."
4065
4067
msgstr "Enviar por correo la petición a esta dirección"
4066
4068
4067
#: bzrlib/builtins.py:5823
4069
#: bzrlib/builtins.py:5842
4068
4070
msgid "Body for the email."
4069
4071
msgstr "Cuerpo para el correo."
4070
4072
4071
#: bzrlib/builtins.py:5876
4073
#: bzrlib/builtins.py:5895
4072
4074
msgid "Do not include a bundle in the merge directive."
4073
4075
msgstr ""
4074
4076
4075
#: bzrlib/builtins.py:5877
4077
#: bzrlib/builtins.py:5896
4076
4078
msgid "Do not include a preview patch in the merge directive."
4077
4079
msgstr "No incluir una ruta de vista previa en la directiva de fusión."
4078
4080
4079
#: bzrlib/builtins.py:5880
4081
#: bzrlib/builtins.py:5899
4080
4082
msgid "Remember submit and public branch."
4081
4083
msgstr "Recordar el envío y la rama pública."
4082
4084
4083
#: bzrlib/builtins.py:5882
4085
#: bzrlib/builtins.py:5901
4084
4086
msgid ""
4085
4087
"Branch to generate the submission from, rather than the one containing the "
4086
4088
"working directory."
4087
4089
msgstr ""
4088
4090
4089
#: bzrlib/builtins.py:5892 bzrlib/cmd_version_info.py:76
4091
#: bzrlib/builtins.py:5911 bzrlib/cmd_version_info.py:76
4090
4092
msgid "format"
4091
4093
msgstr "formato"
4092
4094
4093
#: bzrlib/builtins.py:5893
4095
#: bzrlib/builtins.py:5912
4094
4096
msgid "Use the specified output format."
4095
4097
msgstr "Usar el formato de salida especificado."
4096
4098
4097
#: bzrlib/builtins.py:5915
4099
#: bzrlib/builtins.py:5934
4098
4100
msgid "Create, remove or modify a tag naming a revision."
4099
4101
msgstr "Crea, elimina o modifica una etiqueta que nombra una revisión."
4100
4102
4101
#: bzrlib/builtins.py:5917
4103
#: bzrlib/builtins.py:5936
4102
4104
msgid ""
4103
4105
"Tags give human-meaningful names to revisions. Commands that take a -r\n"
4104
4106
"(--revision) option can be given -rtag:X, where X is any previously\n"
4105
4107
"created tag."
4106
4108
msgstr ""
4107
4109
4108
#: bzrlib/builtins.py:5921
4110
#: bzrlib/builtins.py:5940
4109
4111
msgid ""
4110
4112
"Tags are stored in the branch. Tags are copied from one branch to another\n"
4111
4113
"along when you branch, push, pull or merge."
4112
4114
msgstr ""
4113
4115
4114
#: bzrlib/builtins.py:5924
4116
#: bzrlib/builtins.py:5943
4115
4117
msgid ""
4116
4118
"It is an error to give a tag name that already exists unless you pass\n"
4117
4119
"--force, in which case the tag is moved to point to the new revision."
4118
4120
msgstr ""
4119
4121
4120
#: bzrlib/builtins.py:5927
4122
#: bzrlib/builtins.py:5946
4121
4123
msgid ""
4122
4124
"To rename a tag (change the name but keep it on the same revsion), run "
4123
4125
"``bzr\n"
4124
4126
"tag new-name -r tag:old-name`` and then ``bzr tag --delete oldname``."
4125
4127
msgstr ""
4126
4128
4127
#: bzrlib/builtins.py:5930
4129
#: bzrlib/builtins.py:5949
4128
4130
msgid ""
4129
4131
"If no tag name is specified it will be determined through the \n"
4130
4132
"'automatic_tag_name' hook. This can e.g. be used to automatically tag\n"
4132
4134
"details."
4133
4135
msgstr ""
4134
4136
4135
#: bzrlib/builtins.py:5940
4137
#: bzrlib/builtins.py:5959
4136
4138
msgid "Delete this tag rather than placing it."
4137
4139
msgstr "Eliminar esta etiqueta en lugar de colocarla."
4138
4140
4139
#: bzrlib/builtins.py:5943
4141
#: bzrlib/builtins.py:5962
4140
4142
msgid "Branch in which to place the tag."
4141
4143
msgstr ""
4142
4144
4143
#: bzrlib/builtins.py:5945
4145
#: bzrlib/builtins.py:5964
4144
4146
msgid "Replace existing tags."
4145
4147
msgstr "Reemplazar las etiquetas existentes."
4146
4148
4147
#: bzrlib/builtins.py:5960
4149
#: bzrlib/builtins.py:5979
4148
4150
msgid "No tag specified to delete."
4149
4151
msgstr "No hay etiquetas especificadas para eliminar."
4150
4152
4151
#: bzrlib/builtins.py:5962
4153
#: bzrlib/builtins.py:5981
4152
4154
#, python-format
4153
4155
msgid "Deleted tag %s."
4154
4156
msgstr "Etiqueta%s eliminada."
4155
4157
4156
#: bzrlib/builtins.py:5976
4158
#: bzrlib/builtins.py:5995
4157
4159
msgid "Please specify a tag name."
4158
4160
msgstr "Especifique un nombre de etiqueta."
4159
4161
4160
#: bzrlib/builtins.py:5984
4162
#: bzrlib/builtins.py:6003
4161
4163
#, python-format
4162
4164
msgid "Tag %s already exists for that revision."
4163
4165
msgstr "La etiqueta %s existe para esta revisión."
4164
4166
4165
#: bzrlib/builtins.py:5988
4167
#: bzrlib/builtins.py:6007
4166
4168
#, python-format
4167
4169
msgid "Created tag %s."
4168
4170
msgstr "Etiqueta %s creada."
4169
4171
4170
#: bzrlib/builtins.py:5990
4172
#: bzrlib/builtins.py:6009
4171
4173
#, python-format
4172
4174
msgid "Updated tag %s."
4173
4175
msgstr "Etiqueta actualizada %s."
4174
4176
4175
#: bzrlib/builtins.py:5994
4177
#: bzrlib/builtins.py:6013
4176
4178
msgid "List tags."
4177
4179
msgstr "Listar etiquetas."
4178
4180
4179
#: bzrlib/builtins.py:5996
4181
#: bzrlib/builtins.py:6015
4180
4182
msgid ""
4181
4183
"This command shows a table of tag names and the revisions they reference."
4182
4184
msgstr ""
4183
4185
4184
#: bzrlib/builtins.py:6002
4186
#: bzrlib/builtins.py:6021
4185
4187
msgid "Branch whose tags should be displayed."
4186
4188
msgstr "Rama cuyas etiquetas se deben mostrar."
4187
4189
4188
#: bzrlib/builtins.py:6004
4190
#: bzrlib/builtins.py:6023
4189
4191
msgid "Sort tags by different criteria."
4190
4192
msgstr "Ordenar etiquetas con diferentes criterios."
4191
4193
4192
#: bzrlib/builtins.py:6004
4194
#: bzrlib/builtins.py:6023
4193
4195
msgid "Sorting"
4194
4196
msgstr "Ordenación"
4195
4197
4196
#: bzrlib/builtins.py:6073
4198
#: bzrlib/builtins.py:6092
4197
4199
msgid "Reconfigure the type of a bzr directory."
4198
4200
msgstr "Reconfigura el tipo de un directorio bzr."
4199
4201
4200
#: bzrlib/builtins.py:6075
4202
#: bzrlib/builtins.py:6094
4201
4203
msgid "A target configuration must be specified."
4202
4204
msgstr "Se debe especificar una configuración objetivo."
4203
4205
4204
#: bzrlib/builtins.py:6077
4206
#: bzrlib/builtins.py:6096
4205
4207
msgid ""
4206
4208
"For checkouts, the bind-to location will be auto-detected if not specified.\n"
4207
4209
"The order of preference is\n"
4212
4214
"If none of these is available, --bind-to must be specified."
4213
4215
msgstr ""
4214
4216
4215
#: bzrlib/builtins.py:6091
4217
#: bzrlib/builtins.py:6110
4216
4218
msgid "Tree type"
4217
4219
msgstr "Tipo de árbol"
4218
4220
4219
#: bzrlib/builtins.py:6092
4221
#: bzrlib/builtins.py:6111
4220
4222
msgid "The relation between branch and tree."
4221
4223
msgstr "La relación entre rama y árbol."
4222
4224
4223
#: bzrlib/builtins.py:6094
4225
#: bzrlib/builtins.py:6113
4224
4226
msgid "Reconfigure to be an unbound branch with no working tree."
4225
4227
msgstr ""
4226
4228
4227
#: bzrlib/builtins.py:6095
4229
#: bzrlib/builtins.py:6114
4228
4230
msgid "Reconfigure to be an unbound branch with a working tree."
4229
4231
msgstr ""
4230
4232
4231
#: bzrlib/builtins.py:6096
4233
#: bzrlib/builtins.py:6115
4232
4234
msgid "Reconfigure to be a bound branch with a working tree."
4233
4235
msgstr ""
4234
4236
4235
#: bzrlib/builtins.py:6097
4237
#: bzrlib/builtins.py:6116
4236
4238
msgid "Reconfigure to be a lightweight checkout (with no local history)."
4237
4239
msgstr ""
4238
4240
4239
#: bzrlib/builtins.py:6102
4241
#: bzrlib/builtins.py:6121
4240
4242
msgid "Repository type"
4241
4243
msgstr "Tipo de repositorio"
4242
4244
4243
#: bzrlib/builtins.py:6103
4245
#: bzrlib/builtins.py:6122
4244
4246
msgid "Location fo the repository."
4245
4247
msgstr "Ubicación en el repositorio."
4246
4248
4247
#: bzrlib/builtins.py:6105
4249
#: bzrlib/builtins.py:6124
4248
4250
msgid ""
4249
4251
"Reconfigure to be a standalone branch (i.e. stop using shared repository)."
4250
4252
msgstr ""
4251
4253
4252
#: bzrlib/builtins.py:6107
4254
#: bzrlib/builtins.py:6126
4253
4255
msgid "Reconfigure to use a shared repository."
4254
4256
msgstr "Reconfigure para usar un repositorio compartido."
4255
4257
4256
#: bzrlib/builtins.py:6111
4258
#: bzrlib/builtins.py:6130
4257
4259
msgid "Trees in Repository"
4258
4260
msgstr "Árboles en el repositorio"
4259
4261
4260
#: bzrlib/builtins.py:6112
4262
#: bzrlib/builtins.py:6131
4261
4263
msgid "Whether new branches in the repository have trees."
4262
4264
msgstr "Si las ramas nuevas en el repositorio tienen árboles."
4263
4265
4264
#: bzrlib/builtins.py:6114
4266
#: bzrlib/builtins.py:6133
4265
4267
msgid ""
4266
4268
"Reconfigure repository to create working trees on branches by default."
4267
4269
msgstr ""
4268
4270
4269
#: bzrlib/builtins.py:6116
4271
#: bzrlib/builtins.py:6135
4270
4272
msgid ""
4271
4273
"Reconfigure repository to not create working trees on branches by default."
4272
4274
msgstr ""
4273
4275
4274
#: bzrlib/builtins.py:6119
4276
#: bzrlib/builtins.py:6138
4275
4277
msgid "Branch to bind checkout to."
4276
4278
msgstr ""
4277
4279
4278
#: bzrlib/builtins.py:6121
4280
#: bzrlib/builtins.py:6140
4279
4281
msgid "Perform reconfiguration even if local changes will be lost."
4280
4282
msgstr ""
4281
4283
"Realizar reconfiguración incluso si se han perdido los cambios locales."
4282
4284
4283
#: bzrlib/builtins.py:6124
4285
#: bzrlib/builtins.py:6143
4284
4286
msgid "Reconfigure a branch to be stacked on another branch."
4285
4287
msgstr "Reconfigurar una rama para apilarla en otra rama."
4286
4288
4287
#: bzrlib/builtins.py:6128
4289
#: bzrlib/builtins.py:6147
4288
4290
msgid ""
4289
4291
"Reconfigure a branch to be unstacked. This may require copying substantial "
4290
4292
"data into it."
4291
4293
msgstr ""
4292
4294
4293
#: bzrlib/builtins.py:6138
4295
#: bzrlib/builtins.py:6157
4294
4296
msgid "Can't use both --stacked-on and --unstacked"
4295
4297
msgstr "No se pueden usar ambos --stacked-on y --unstacked"
4296
4298
4297
#: bzrlib/builtins.py:6152
4299
#: bzrlib/builtins.py:6171
4298
4300
msgid "No target configuration specified"
4299
4301
msgstr "No se ha especificado una configuración objetivo"
4300
4302
4301
#: bzrlib/builtins.py:6187
4303
#: bzrlib/builtins.py:6206
4302
4304
msgid "Set the branch of a checkout and update."
4303
4305
msgstr "Establezca la rama de una comprobación y actualización."
4304
4306
4305
#: bzrlib/builtins.py:6189
4307
#: bzrlib/builtins.py:6208
4306
4308
msgid ""
4307
4309
"For lightweight checkouts, this changes the branch being referenced.\n"
4308
4310
"For heavyweight checkouts, this checks that there are no local commits\n"
4310
4312
"of the new location and binds to it."
4311
4313
msgstr ""
4312
4314
4313
#: bzrlib/builtins.py:6194
4315
#: bzrlib/builtins.py:6213
4314
4316
msgid ""
4315
4317
"In both cases, the working tree is updated and uncommitted changes\n"
4316
4318
"are merged. The user can commit or revert these as they desire."
4317
4319
msgstr ""
4318
4320
4319
#: bzrlib/builtins.py:6197
4321
#: bzrlib/builtins.py:6216
4320
4322
msgid "Pending merges need to be committed or reverted before using switch."
4321
4323
msgstr ""
4322
4324
4323
#: bzrlib/builtins.py:6199
4325
#: bzrlib/builtins.py:6218
4324
4326
msgid ""
4325
4327
"The path to the branch to switch to can be specified relative to the parent\n"
4326
4328
"directory of the current branch. For example, if you are currently in a\n"
4328
4330
"/path/to/newbranch."
4329
4331
msgstr ""
4330
4332
4331
#: bzrlib/builtins.py:6204
4333
#: bzrlib/builtins.py:6223
4332
4334
msgid ""
4333
4335
"Bound branches use the nickname of its master branch unless it is set\n"
4334
4336
"locally, in which case switching will update the local nickname to be\n"
4335
4337
"that of the master."
4336
4338
msgstr ""
4337
4339
4338
#: bzrlib/builtins.py:6212
4340
#: bzrlib/builtins.py:6231
4339
4341
msgid "Switch even if local commits will be lost."
4340
4342
msgstr "Cambiar incluso si las ejecuciones se han perdido."
4341
4343
4342
#: bzrlib/builtins.py:6215
4344
#: bzrlib/builtins.py:6234
4343
4345
msgid "Create the target branch from this one before switching to it."
4344
4346
msgstr ""
4345
4347
4346
#: bzrlib/builtins.py:6229
4348
#: bzrlib/builtins.py:6248
4347
4349
msgid "You must supply either a revision or a location"
4348
4350
msgstr "Debe especificar una revisión o una ubicación"
4349
4351
4350
#: bzrlib/builtins.py:6242
4352
#: bzrlib/builtins.py:6261
4351
4353
msgid "cannot create branch without source branch"
4352
4354
msgstr "no se puede crear una rama sin rama origen"
4353
4355
4354
#: bzrlib/builtins.py:6262
4356
#: bzrlib/builtins.py:6286
4355
4357
msgid "Manage filtered views."
4356
4358
msgstr "Gestionar vistas filtradas."
4357
4359
4358
#: bzrlib/builtins.py:6264
4360
#: bzrlib/builtins.py:6288
4359
4361
msgid ""
4360
4362
"Views provide a mask over the tree so that users can focus on\n"
4361
4363
"a subset of a tree when doing their work. After creating a view,\n"
4365
4367
"must be within the current view."
4366
4368
msgstr ""
4367
4369
4368
#: bzrlib/builtins.py:6271
4370
#: bzrlib/builtins.py:6295
4369
4371
msgid ""
4370
4372
"In most cases, a view has a short life-span: it is created to make\n"
4371
4373
"a selected change and is deleted once that change is committed.\n"
4373
4375
"and switch between them."
4374
4376
msgstr ""
4375
4377
4376
#: bzrlib/builtins.py:6276
4378
#: bzrlib/builtins.py:6300
4377
4379
msgid ""
4378
4380
"To disable the current view without deleting it, you can switch to\n"
4379
4381
"the pseudo view called ``off``. This can be useful when you need\n"
4381
4383
"want to switch back to your view after that."
4382
4384
msgstr ""
4383
4385
4384
#: bzrlib/builtins.py:6281
4386
#: bzrlib/builtins.py:6305
4385
4387
msgid ""
4386
4388
":Examples:\n"
4387
4389
" To define the current view::"
4389
4391
":Ejemplos:\n"
4390
4392
" Para definir la vista actual::"
4391
4393
4392
#: bzrlib/builtins.py:6284
4394
#: bzrlib/builtins.py:6308
4393
4395
msgid " bzr view file1 dir1 ..."
4394
4396
msgstr " bzr view file1 dir1 ..."
4395
4397
4396
#: bzrlib/builtins.py:6286
4398
#: bzrlib/builtins.py:6310
4397
4399
msgid " To list the current view::"
4398
4400
msgstr " Para listar la vista actual::"
4399
4401
4400
#: bzrlib/builtins.py:6288
4402
#: bzrlib/builtins.py:6312
4401
4403
msgid " bzr view"
4402
4404
msgstr " vista bzr"
4403
4405
4404
#: bzrlib/builtins.py:6290
4406
#: bzrlib/builtins.py:6314
4405
4407
msgid " To delete the current view::"
4406
4408
msgstr " Para eliminar la vista actual::"
4407
4409
4408
#: bzrlib/builtins.py:6292
4410
#: bzrlib/builtins.py:6316
4409
4411
msgid " bzr view --delete"
4410
4412
msgstr " bzr view --delete"
4411
4413
4412
#: bzrlib/builtins.py:6294
4414
#: bzrlib/builtins.py:6318
4413
4415
msgid " To disable the current view without deleting it::"
4414
4416
msgstr " Para desactivar la vista actual sin eliminarla::"
4415
4417
4416
#: bzrlib/builtins.py:6296
4418
#: bzrlib/builtins.py:6320
4417
4419
msgid " bzr view --switch off"
4418
4420
msgstr " bzr view --switch off"
4419
4421
4420
#: bzrlib/builtins.py:6298
4422
#: bzrlib/builtins.py:6322
4421
4423
msgid " To define a named view and switch to it::"
4422
4424
msgstr ""
4423
4425
4424
#: bzrlib/builtins.py:6300
4426
#: bzrlib/builtins.py:6324
4425
4427
msgid " bzr view --name view-name file1 dir1 ..."
4426
4428
msgstr " bzr view --name view-name file1 dir1 ..."
4427
4429
4428
#: bzrlib/builtins.py:6302
4430
#: bzrlib/builtins.py:6326
4429
4431
msgid " To list a named view::"
4430
4432
msgstr " Para lista la vista nombrada::"
4431
4433
4432
#: bzrlib/builtins.py:6304
4434
#: bzrlib/builtins.py:6328
4433
4435
msgid " bzr view --name view-name"
4434
4436
msgstr " bzr view --name view-name"
4435
4437
4436
#: bzrlib/builtins.py:6306
4438
#: bzrlib/builtins.py:6330
4437
4439
msgid " To delete a named view::"
4438
4440
msgstr " Para eliminar una vista nombrada::"
4439
4441
4440
#: bzrlib/builtins.py:6308
4442
#: bzrlib/builtins.py:6332
4441
4443
msgid " bzr view --name view-name --delete"
4442
4444
msgstr " bzr view --name view-name --delete"
4443
4445
4444
#: bzrlib/builtins.py:6310
4446
#: bzrlib/builtins.py:6334
4445
4447
msgid " To switch to a named view::"
4446
4448
msgstr " Para cambiar a una vista nombrada::"
4447
4449
4448
#: bzrlib/builtins.py:6312
4450
#: bzrlib/builtins.py:6336
4449
4451
msgid " bzr view --switch view-name"
4450
4452
msgstr " bzr view --switch view-name"
4451
4453
4452
#: bzrlib/builtins.py:6314
4454
#: bzrlib/builtins.py:6338
4453
4455
msgid " To list all views defined::"
4454
4456
msgstr " Para listar todas las vistas definidas::"
4455
4457
4456
#: bzrlib/builtins.py:6316
4458
#: bzrlib/builtins.py:6340
4457
4459
msgid " bzr view --all"
4458
4460
msgstr " bzr view --all"
4459
4461
4460
#: bzrlib/builtins.py:6318
4462
#: bzrlib/builtins.py:6342
4461
4463
msgid " To delete all views::"
4462
4464
msgstr " Para eliminar todas las vistas::"
4463
4465
4464
#: bzrlib/builtins.py:6320
4466
#: bzrlib/builtins.py:6344
4465
4467
msgid " bzr view --delete --all"
4466
4468
msgstr " bzr view --delete --all"
4467
4469
4468
#: bzrlib/builtins.py:6327
4470
#: bzrlib/builtins.py:6351
4469
4471
msgid "Apply list or delete action to all views."
4470
4472
msgstr ""
4471
4473
4472
#: bzrlib/builtins.py:6330
4474
#: bzrlib/builtins.py:6354
4473
4475
msgid "Delete the view."
4474
4476
msgstr "Eliminar la vista."
4475
4477
4476
#: bzrlib/builtins.py:6333
4478
#: bzrlib/builtins.py:6357
4477
4479
msgid "Name of the view to define, list or delete."
4478
4480
msgstr "Nombre de la vista a definir, listar o eliminar."
4479
4481
4480
#: bzrlib/builtins.py:6337
4482
#: bzrlib/builtins.py:6361
4481
4483
msgid "Name of the view to switch to."
4482
4484
msgstr "Nombre de la vista a la que cambiar."
4483
4485
4484
#: bzrlib/builtins.py:6356
4486
#: bzrlib/builtins.py:6380
4485
4487
msgid "Both --delete and a file list specified"
4486
4488
msgstr ""
4487
4489
4488
#: bzrlib/builtins.py:6359
4490
#: bzrlib/builtins.py:6383
4489
4491
msgid "Both --delete and --switch specified"
4490
4492
msgstr "Ambos --delete y --switch especificados"
4491
4493
4492
#: bzrlib/builtins.py:6362
4494
#: bzrlib/builtins.py:6386
4493
4495
msgid "Deleted all views.\n"
4494
4496
msgstr "Eliminar todas las vistas.\n"
4495
4497
4496
#: bzrlib/builtins.py:6364
4498
#: bzrlib/builtins.py:6388
4497
4499
msgid "No current view to delete"
4498
4500
msgstr "No hay vista para eliminar"
4499
4501
4500
#: bzrlib/builtins.py:6367
4502
#: bzrlib/builtins.py:6391
4501
4503
#, python-format
4502
4504
msgid "Deleted '%s' view.\n"
4503
4505
msgstr "Vista «%s» eliminada.\n"
4504
4506
4505
#: bzrlib/builtins.py:6371
4507
#: bzrlib/builtins.py:6395
4506
4508
msgid "Both --switch and a file list specified"
4507
4509
msgstr ""
4508
4510
4509
#: bzrlib/builtins.py:6374
4511
#: bzrlib/builtins.py:6398
4510
4512
msgid "Both --switch and --all specified"
4511
4513
msgstr "Ambos --switch y --all especificados"
4512
4514
4513
#: bzrlib/builtins.py:6377
4515
#: bzrlib/builtins.py:6401
4514
4516
msgid "No current view to disable"
4515
4517
msgstr "No hay vista actual que desactivar"
4516
4518
4517
#: bzrlib/builtins.py:6379
4519
#: bzrlib/builtins.py:6403
4518
4520
#, python-format
4519
4521
msgid "Disabled '%s' view.\n"
4520
4522
msgstr "Vista «%s» desactivada.\n"
4521
4523
4522
#: bzrlib/builtins.py:6383 bzrlib/builtins.py:6405
4524
#: bzrlib/builtins.py:6407 bzrlib/builtins.py:6429
4523
4525
msgid "Using '{0}' view: {1}\n"
4524
4526
msgstr "Usar «{0}» vista: {1}\n"
4525
4527
4526
#: bzrlib/builtins.py:6386
4528
#: bzrlib/builtins.py:6410
4527
4529
msgid "Views defined:\n"
4528
4530
msgstr "Vistas definidas:\n"
4529
4531
4530
#: bzrlib/builtins.py:6395
4532
#: bzrlib/builtins.py:6419
4531
4533
msgid "No views defined.\n"
4532
4534
msgstr "No hay vista definida.\n"
4533
4535
4534
#: bzrlib/builtins.py:6402
4536
#: bzrlib/builtins.py:6426
4535
4537
msgid "Cannot change the 'off' pseudo view"
4536
4538
msgstr ""
4537
4539
4538
#: bzrlib/builtins.py:6410
4540
#: bzrlib/builtins.py:6434
4539
4541
msgid "No current view.\n"
4540
4542
msgstr "No hay vista actual.\n"
4541
4543
4542
#: bzrlib/builtins.py:6413
4544
#: bzrlib/builtins.py:6437
4543
4545
msgid "'{0}' view is: {1}\n"
4544
4546
msgstr "«{0}» vista es: {1}\n"
4545
4547
4546
#: bzrlib/builtins.py:6433
4548
#: bzrlib/builtins.py:6457
4547
4549
msgid " <no hooks installed>\n"
4548
4550
msgstr ""
4549
4551
4550
#: bzrlib/builtins.py:6437
4552
#: bzrlib/builtins.py:6461
4551
4553
msgid "Remove a branch."
4552
4554
msgstr "Eliminar una rama."
4553
4555
4554
#: bzrlib/builtins.py:6439
4556
#: bzrlib/builtins.py:6463
4555
4557
msgid ""
4556
4558
"This will remove the branch from the specified location but \n"
4557
4559
"will keep any working tree or repository in place."
4558
4560
msgstr ""
4559
4561
4560
#: bzrlib/builtins.py:6444
4562
#: bzrlib/builtins.py:6468
4561
4563
msgid " Remove the branch at repo/trunk::"
4562
4564
msgstr " Eliminar la rama en repo/trunk::"
4563
4565
4564
#: bzrlib/builtins.py:6446
4566
#: bzrlib/builtins.py:6470
4565
4567
msgid " bzr remove-branch repo/trunk"
4566
4568
msgstr " bzr remove-branch repo/trunk"
4567
4569
4568
#: bzrlib/builtins.py:6444
4570
#: bzrlib/builtins.py:6477
4569
4571
msgid "Remove branch even if it is the active branch."
4570
4572
msgstr ""
4571
4573
4572
#: bzrlib/builtins.py:6458
4574
#: bzrlib/builtins.py:6491
4573
4575
msgid "Branch is active. Use --force to remove it."
4574
4576
msgstr ""
4575
4577
4576
#: bzrlib/builtins.py:6461
4578
#: bzrlib/builtins.py:6495
4577
4579
msgid "Plaintext diff output."
4578
4580
msgstr ""
4579
4581
4580
#: bzrlib/builtins.py:6462
4582
#: bzrlib/builtins.py:6496
4581
4583
msgid "Temporarily set aside some changes from the current tree."
4582
4584
msgstr ""
4583
4585
4584
#: bzrlib/builtins.py:6464
4586
#: bzrlib/builtins.py:6498
4585
4587
msgid ""
4586
4588
"Shelve allows you to temporarily put changes you've made \"on the shelf\",\n"
4587
4589
"ie. out of the way, until a later time when you can bring them back from\n"
4590
4592
"will they survive its deletion."
4591
4593
msgstr ""
4592
4594
4593
#: bzrlib/builtins.py:6470
4595
#: bzrlib/builtins.py:6504
4594
4596
msgid "If shelve --list is specified, previously-shelved changes are listed."
4595
4597
msgstr ""
4596
4598
4597
#: bzrlib/builtins.py:6472
4599
#: bzrlib/builtins.py:6506
4598
4600
msgid ""
4599
4601
"Shelve is intended to help separate several sets of changes that have\n"
4600
4602
"been inappropriately mingled. If you just want to get rid of all changes\n"
4602
4604
"shelve all text changes at once, use shelve --all."
4603
4605
msgstr ""
4604
4606
4605
#: bzrlib/builtins.py:6477
4607
#: bzrlib/builtins.py:6511
4606
4608
msgid ""
4607
4609
"If filenames are specified, only the changes to those files will be\n"
4608
4610
"shelved. Other files will be left untouched."
4609
4611
msgstr ""
4610
4612
4611
#: bzrlib/builtins.py:6480
4613
#: bzrlib/builtins.py:6514
4612
4614
msgid ""
4613
4615
"If a revision is specified, changes since that revision will be shelved."
4614
4616
msgstr ""
4615
4617
"Si se especifica una revisión, los cambios realizados desde esta revisión "
4616
4618
"serán archivados."
4617
4619
4618
#: bzrlib/builtins.py:6482
4620
#: bzrlib/builtins.py:6516
4619
4621
msgid ""
4620
4622
"You can put multiple items on the shelf, and by default, 'unshelve' will\n"
4621
4623
"restore the most recently shelved changes."
4622
4624
msgstr ""
4623
4625
4624
#: bzrlib/builtins.py:6485
4626
#: bzrlib/builtins.py:6519
4625
4627
msgid ""
4626
4628
"For complicated changes, it is possible to edit the changes in a separate\n"
4627
4629
"editor program to decide what the file remaining in the working copy\n"
4628
4630
"should look like. To do this, add the configuration option"
4629
4631
msgstr ""
4630
4632
4631
#: bzrlib/builtins.py:6489
4633
#: bzrlib/builtins.py:6523
4632
4634
msgid " change_editor = PROGRAM @new_path @old_path"
4633
4635
msgstr ""
4634
4636
4635
#: bzrlib/builtins.py:6491
4637
#: bzrlib/builtins.py:6525
4636
4638
msgid ""
4637
4639
"where @new_path is replaced with the path of the new version of the \n"
4638
4640
"file and @old_path is replaced with the path of the old version of \n"
4641
4643
" "
4642
4644
msgstr ""
4643
4645
4644
#: bzrlib/builtins.py:6503
4646
#: bzrlib/builtins.py:6537
4645
4647
msgid "Shelve all changes."
4646
4648
msgstr "Guardar todos los cambios."
4647
4649
4648
#: bzrlib/builtins.py:6505
4650
#: bzrlib/builtins.py:6539
4649
4651
msgid "Method to use for writing diffs."
4650
4652
msgstr "Método a usar para escribir diferencias."
4651
4653
4652
#: bzrlib/builtins.py:6505
4654
#: bzrlib/builtins.py:6539
4653
4655
msgid "writer"
4654
4656
msgstr "escritor"
4655
4657
4656
#: bzrlib/builtins.py:6509
4658
#: bzrlib/builtins.py:6543
4657
4659
msgid "List shelved changes."
4658
4660
msgstr "Listar cambios guardados."
4659
4661
4660
#: bzrlib/builtins.py:6511
4662
#: bzrlib/builtins.py:6545
4661
4663
msgid "Destroy removed changes instead of shelving them."
4662
4664
msgstr "Destruir cambios eliminados en vez de guardarlos."
4663
4665
4664
#: bzrlib/builtins.py:6540
4666
#: bzrlib/builtins.py:6574
4665
4667
msgid "No shelved changes."
4666
4668
msgstr "No ha cambios guardados."
4667
4669
4668
#: bzrlib/builtins.py:6551
4670
#: bzrlib/builtins.py:6585
4669
4671
msgid "Restore shelved changes."
4670
4672
msgstr "Restaurar cambios guardados."
4671
4673
4672
#: bzrlib/builtins.py:6553
4674
#: bzrlib/builtins.py:6587
4673
4675
msgid ""
4674
4676
"By default, the most recently shelved changes are restored. However if you\n"
4675
4677
"specify a shelf by id those changes will be restored instead. This works\n"
4676
4678
"best when the changes don't depend on each other."
4677
4679
msgstr ""
4678
4680
4679
#: bzrlib/builtins.py:6562
4681
#: bzrlib/builtins.py:6596
4680
4682
msgid "The action to perform."
4681
4683
msgstr "La acción a realizar."
4682
4684
4683
#: bzrlib/builtins.py:6562 bzrlib/conflicts.py:694
4685
#: bzrlib/builtins.py:6596 bzrlib/conflicts.py:694
4684
4686
msgid "action"
4685
4687
msgstr "acción"
4686
4688
4687
#: bzrlib/builtins.py:6564
4689
#: bzrlib/builtins.py:6598
4688
4690
msgid "Apply changes and remove from the shelf."
4689
4691
msgstr ""
4690
4692
4691
#: bzrlib/builtins.py:6565
4693
#: bzrlib/builtins.py:6599
4692
4694
msgid "Show changes, but do not apply or remove them."
4693
4695
msgstr ""
4694
4696
4695
#: bzrlib/builtins.py:6566
4697
#: bzrlib/builtins.py:6600
4696
4698
msgid ""
4697
4699
"Instead of unshelving the changes, show the diff that would result from "
4698
4700
"unshelving."
4699
4701
msgstr ""
4700
4702
4701
#: bzrlib/builtins.py:6568
4703
#: bzrlib/builtins.py:6602
4702
4704
msgid "Delete changes without applying them."
4703
4705
msgstr "Eliminar cambios sin aplicarlos."
4704
4706
4705
#: bzrlib/builtins.py:6569
4707
#: bzrlib/builtins.py:6603
4706
4708
msgid "Apply changes but don't delete them."
4707
4709
msgstr ""
4708
4710
4709
#: bzrlib/builtins.py:6584
4711
#: bzrlib/builtins.py:6618
4710
4712
msgid "Remove unwanted files from working tree."
4711
4713
msgstr "Eliminar archivos no deseados desde el árbol de trabajo."
4712
4714
4713
#: bzrlib/builtins.py:6586
4715
#: bzrlib/builtins.py:6620
4714
4716
msgid ""
4715
4717
"By default, only unknown files, not ignored files, are deleted. Versioned\n"
4716
4718
"files are never deleted."
4717
4719
msgstr ""
4718
4720
4719
#: bzrlib/builtins.py:6589
4721
#: bzrlib/builtins.py:6623
4720
4722
msgid ""
4721
4723
"Another class is 'detritus', which includes files emitted by bzr during\n"
4722
4724
"normal operations and selftests. (The value of these files decreases with\n"
4723
4725
"time.)"
4724
4726
msgstr ""
4725
4727
4726
#: bzrlib/builtins.py:6593
4728
#: bzrlib/builtins.py:6627
4727
4729
msgid ""
4728
4730
"If no options are specified, unknown files are deleted. Otherwise, option\n"
4729
4731
"flags are respected, and may be combined."
4730
4732
msgstr ""
4731
4733
4732
#: bzrlib/builtins.py:6596
4734
#: bzrlib/builtins.py:6630
4733
4735
msgid "To check what clean-tree will do, use --dry-run."
4734
4736
msgstr ""
4735
4737
4736
#: bzrlib/builtins.py:6599
4738
#: bzrlib/builtins.py:6633
4737
4739
msgid "Delete all ignored files."
4738
4740
msgstr "Eliminar todos los archivos ignorados."
4739
4741
4740
#: bzrlib/builtins.py:6600
4742
#: bzrlib/builtins.py:6634
4741
4743
msgid ""
4742
4744
"Delete conflict files, merge and revert backups, and failed selftest dirs."
4743
4745
msgstr ""
4744
4746
4745
#: bzrlib/builtins.py:6603
4747
#: bzrlib/builtins.py:6637
4746
4748
msgid "Delete files unknown to bzr (default)."
4747
4749
msgstr "Eliminar archivos desconocidos de bzr (predeterminado)."
4748
4750
4749
#: bzrlib/builtins.py:6604
4751
#: bzrlib/builtins.py:6638
4750
4752
msgid "Show files to delete instead of deleting them."
4751
4753
msgstr "Mostrar archivos a eliminar en vez de eliminarles."
4752
4754
4753
#: bzrlib/builtins.py:6606
4755
#: bzrlib/builtins.py:6640
4754
4756
msgid "Do not prompt before deleting."
4755
4757
msgstr "No preguntar antes de eliminar."
4756
4758
4810
4812
msgstr[0] ""
4811
4813
msgstr[1] ""
4812
4814
4813
#: bzrlib/bzrdir.py:490
4815
#: bzrlib/bzrdir.py:487
4814
4816
msgid ""
4815
4817
"making backup of {0}\n"
4816
4818
" to {1}"
4818
4820
"haciendo respaldo de {0}\n"
4819
4821
" a {1}"
4820
4822
4821
#: bzrlib/bzrdir.py:513
4823
#: bzrlib/bzrdir.py:510
4822
4824
msgid "renamed {0} to {1}"
4823
4825
msgstr "renombrado {0} a {1}"
4824
4826
4825
#: bzrlib/bzrdir.py:1652
4827
#: bzrlib/bzrdir.py:1639
4826
4828
#, python-format
4827
4829
msgid ""
4828
4830
"Source repository format does not support stacking, using format:\n"
4829
4831
" %s"
4830
4832
msgstr ""
4831
4833
4832
#: bzrlib/bzrdir.py:1672
4834
#: bzrlib/bzrdir.py:1659
4833
4835
#, python-format
4834
4836
msgid ""
4835
4837
"Source branch format does not support stacking, using format:\n"
4836
4838
" %s"
4837
4839
msgstr ""
4838
4840
4839
#: bzrlib/bzrdir.py:1818
4841
#: bzrlib/bzrdir.py:1805
4840
4842
msgid "starting repository conversion"
4841
4843
msgstr "iniciar conversión de repositorio"
4842
4844
4843
#: bzrlib/bzrdir.py:2039
4845
#: bzrlib/bzrdir.py:2026
4844
4846
msgid "Using default stacking branch {0} at {1}"
4845
4847
msgstr ""
4846
4848
5023
5025
"supported formats or in a custom format based on a template."
5024
5026
msgstr ""
5025
5027
5026
#: bzrlib/cmd_version_info.py:59 en/help_topics/configuration.txt:700
5027
#: en/help_topics/configuration.txt:710
5028
#: bzrlib/cmd_version_info.py:59 en/help_topics/configuration.txt:712
5029
#: en/help_topics/configuration.txt:722
5028
5030
msgid "For example::"
5029
5031
msgstr "Por ejemplo::"
5030
5032
5148
5150
msgid ":See also: %s"
5149
5151
msgstr ":Vea también: %s"
5150
5152
5151
#: bzrlib/commands.py:816 bzrlib/gpg.py:324
5153
#: bzrlib/commands.py:826 bzrlib/gpg.py:347
5152
5154
msgid "Only ASCII permitted in option names"
5153
5155
msgstr "Solo se permiten nombres de opción en ASCII"
5154
5156
5155
#: bzrlib/commands.py:841 bzrlib/commands.py:849
5157
#: bzrlib/commands.py:851 bzrlib/commands.py:859
5156
5158
msgid "command {0!r} needs one or more {1}"
5157
5159
msgstr "la orden {0!r} necesita una o más {1}"
5158
5160
5159
#: bzrlib/commands.py:858
5161
#: bzrlib/commands.py:868
5160
5162
msgid "command {0!r} requires argument {1}"
5161
5163
msgstr "la orden {0!r} necesita un argumento {1}"
5162
5164
5163
#: bzrlib/commands.py:865
5165
#: bzrlib/commands.py:875
5164
5166
msgid "extra argument to command {0}: {1}"
5165
5167
msgstr ""
5166
5168
5167
#: bzrlib/commands.py:962
5169
#: bzrlib/commands.py:972
5168
5170
#, python-format
5169
5171
msgid "Profile data written to \"%s\"."
5170
5172
msgstr "Datos de perfil escritos en «%s»"
5207
5209
msgid "renamed"
5208
5210
msgstr "renombrado"
5209
5211
5210
#: bzrlib/commit.py:977
5212
#: bzrlib/commit.py:976
5211
5213
msgid "unchanged"
5212
5214
msgstr "sin cambios"
5213
5215
5214
#: bzrlib/commit.py:999
5216
#: bzrlib/commit.py:998
5215
5217
msgid "{0} [{1}] - Stage"
5216
5218
msgstr ""
5217
5219
5218
#: bzrlib/commit.py:1002
5220
#: bzrlib/commit.py:1001
5219
5221
#, python-format
5220
5222
msgid "%s - Stage"
5221
5223
msgstr ""
5222
5224
5225
#: bzrlib/commit_signature_commands.py:34
5226
msgid "Sign all commits by a given committer."
5227
msgstr ""
5228
5223
5229
#: bzrlib/commit_signature_commands.py:36
5224
msgid "Sign all commits by a given committer."
5225
msgstr ""
5226
5227
#: bzrlib/commit_signature_commands.py:38
5228
5230
msgid ""
5229
5231
"If location is not specified the local tree is used.\n"
5230
5232
"If committer is not specified the default committer is used."
5231
5233
msgstr ""
5232
5234
5233
#: bzrlib/commit_signature_commands.py:41
5235
#: bzrlib/commit_signature_commands.py:39
5234
5236
msgid "This does not sign commits that already have signatures."
5235
5237
msgstr ""
5236
5238
5237
#: bzrlib/commit_signature_commands.py:49
5239
#: bzrlib/commit_signature_commands.py:47
5238
5240
msgid ""
5239
5241
"Don't actually sign anything, just print the revisions that would be signed."
5240
5242
msgstr ""
5261
5263
"verification."
5262
5264
msgstr ""
5263
5265
5264
#: bzrlib/commit_signature_commands.py:147
5266
#: bzrlib/commit_signature_commands.py:148
5265
5267
msgid "Cannot verify a range of non-revision-history revisions"
5266
5268
msgstr ""
5267
5269
5268
#: bzrlib/commit_signature_commands.py:168
5270
#: bzrlib/commit_signature_commands.py:166
5269
5271
msgid "All commits signed with verifiable keys"
5270
5272
msgstr ""
5271
5273
5272
#: bzrlib/config.py:475
5274
#: bzrlib/config.py:436
5273
5275
msgid "Invalid config value for \"{0}\" value {1!r} is not an SI unit."
5274
5276
msgstr ""
5275
5277
5276
#: bzrlib/config.py:2485
5278
#: bzrlib/config.py:2452
5277
5279
msgid "{0} is not an SI unit."
5278
5280
msgstr ""
5279
5281
5280
#: bzrlib/config.py:2949
5282
#: bzrlib/config.py:2971
5281
5283
msgid ""
5282
5284
"Option {0} in section {1} of {2} was changed from {3} to {4}. The {5} value "
5283
5285
"will be saved."
5284
5286
msgstr ""
5285
5287
5286
#: bzrlib/config.py:3093
5288
#: bzrlib/config.py:3116
5287
5289
#, python-format
5288
5290
msgid "Invalid '%s', should be of the form 'name=value'"
5289
5291
msgstr ""
5290
5292
5291
#: bzrlib/config.py:3962
5293
#: bzrlib/config.py:4018
5292
5294
msgid "Display, set or remove a configuration option."
5293
5295
msgstr ""
5294
5296
5295
#: bzrlib/config.py:3964
5297
#: bzrlib/config.py:4020
5296
5298
msgid "Display the active value for a given option."
5297
5299
msgstr ""
5298
5300
5299
#: bzrlib/config.py:3966
5301
#: bzrlib/config.py:4022
5300
5302
msgid ""
5301
5303
"If --all is specified, NAME is interpreted as a regular expression and all\n"
5302
5304
"matching options are displayed mentioning their scope. The active value\n"
5303
5305
"that bzr will take into account is the first one displayed for each option."
5304
5306
msgstr ""
5305
5307
5306
#: bzrlib/config.py:3970
5308
#: bzrlib/config.py:4026
5307
5309
msgid "If no NAME is given, --all .* is implied."
5308
5310
msgstr ""
5309
5311
5310
#: bzrlib/config.py:3972
5312
#: bzrlib/config.py:4028
5311
5313
msgid ""
5312
5314
"Setting a value is achieved by using name=value without spaces. The value\n"
5313
5315
"is set in the most relevant scope and can be checked by displaying the\n"
5314
5316
"option again."
5315
5317
msgstr ""
5316
5318
5317
#: bzrlib/config.py:3984
5319
#: bzrlib/config.py:4040
5318
5320
msgid "Reduce the scope to the specified configuration file."
5319
5321
msgstr ""
5320
5322
5321
#: bzrlib/config.py:3988
5323
#: bzrlib/config.py:4044
5322
5324
msgid "Display all the defined values for the matching options."
5323
5325
msgstr ""
5324
5326
5325
#: bzrlib/config.py:3990
5327
#: bzrlib/config.py:4046
5326
5328
msgid "Remove the option from the configuration file."
5327
5329
msgstr ""
5328
5330
5402
5404
msgstr[0] ""
5403
5405
msgstr[1] ""
5404
5406
5405
#: bzrlib/controldir.py:710
5407
#: bzrlib/controldir.py:712
5406
5408
msgid "{0} is{1} redirected to {2}"
5407
5409
msgstr "{0} es{1} redirigido a {2}"
5408
5410
5622
5624
msgid "Invalid branch name: %(name)s"
5623
5625
msgstr ""
5624
5626
5625
#: bzrlib/errors.py:715
5627
#: bzrlib/errors.py:724
5626
5628
msgid "Parent branch already exists: \"%(path)s\"."
5627
5629
msgstr ""
5628
5630
5629
#: bzrlib/errors.py:721
5631
#: bzrlib/errors.py:730
5630
5632
msgid ""
5631
5633
"Directory contains a branch, but no working tree (use bzr checkout if you "
5632
5634
"wish to build a working tree): \"%(path)s\""
5633
5635
msgstr ""
5634
5636
5635
#: bzrlib/errors.py:726
5637
#: bzrlib/errors.py:735
5636
5638
msgid ""
5637
5639
"\"%(function)s\" called on an AtomicFile after it was closed: \"%(path)s\""
5638
5640
msgstr ""
5639
5641
5640
#: bzrlib/errors.py:736
5642
#: bzrlib/errors.py:745
5641
5643
msgid ""
5642
5644
"Parent not accessible given base \"%(base)s\" and relative path \"%(path)s\""
5643
5645
msgstr ""
5644
5646
5645
#: bzrlib/errors.py:746
5647
#: bzrlib/errors.py:755
5646
5648
msgid "No repository present: \"%(path)s\""
5647
5649
msgstr ""
5648
5650
5649
#: bzrlib/errors.py:753
5651
#: bzrlib/errors.py:762
5650
5652
msgid ""
5651
5653
"Unsupported branch format: %(format)s\n"
5652
5654
"Please run 'bzr upgrade'"
5653
5655
msgstr ""
5654
5656
5655
#: bzrlib/errors.py:759
5657
#: bzrlib/errors.py:768
5656
5658
msgid "Unknown %(kind)s format: %(format)r"
5657
5659
msgstr ""
5658
5660
5659
#: bzrlib/errors.py:768
5661
#: bzrlib/errors.py:777
5660
5662
msgid "Format %(format)s is not compatible with .bzr version %(bzrdir)s."
5661
5663
msgstr ""
5662
5664
5663
#: bzrlib/errors.py:778
5665
#: bzrlib/errors.py:787
5664
5666
msgid "Parse error on line %(lineno)d of %(format)s format: %(line)s"
5665
5667
msgstr ""
5666
5668
5667
#: bzrlib/errors.py:793
5669
#: bzrlib/errors.py:802
5668
5670
msgid ""
5669
5671
"%(target)s\n"
5670
5672
"is not compatible with\n"
5672
5674
"%(details)s"
5673
5675
msgstr ""
5674
5676
5675
#: bzrlib/errors.py:809
5677
#: bzrlib/errors.py:818
5676
5678
msgid "Revision is not compatible with %(repo_format)s"
5677
5679
msgstr ""
5678
5680
5679
#: bzrlib/errors.py:819
5681
#: bzrlib/errors.py:828
5680
5682
msgid "%(context_info)s%(path)s is already versioned."
5681
5683
msgstr ""
5682
5684
5683
#: bzrlib/errors.py:840
5685
#: bzrlib/errors.py:849
5684
5686
msgid "%(context_info)s%(path)s is not versioned."
5685
5687
msgstr ""
5686
5688
5687
#: bzrlib/errors.py:861
5689
#: bzrlib/errors.py:870
5688
5690
msgid "Path(s) are not versioned: %(paths_as_string)s"
5689
5691
msgstr ""
5690
5692
5691
#: bzrlib/errors.py:872
5693
#: bzrlib/errors.py:881
5692
5694
msgid "Path(s) do not exist: %(paths_as_string)s%(extra)s"
5693
5695
msgstr ""
5694
5696
5695
#: bzrlib/errors.py:891
5697
#: bzrlib/errors.py:900
5696
5698
msgid "Cannot operate on \"%(filename)s\" of unsupported kind \"%(kind)s\""
5697
5699
msgstr ""
5698
5700
5699
#: bzrlib/errors.py:899
5701
#: bzrlib/errors.py:908
5700
5702
msgid ""
5701
5703
"Filename %(filename)r is not valid in your current filesystem encoding "
5702
5704
"%(fs_encoding)s"
5703
5705
msgstr ""
5704
5706
5705
#: bzrlib/errors.py:910
5707
#: bzrlib/errors.py:919
5706
5708
msgid "Cannot operate on \"%(filename)s\" because it is a control file"
5707
5709
msgstr ""
5708
5710
5709
#: bzrlib/errors.py:928
5711
#: bzrlib/errors.py:937
5710
5712
msgid "The lock for '%(lock_description)s' is in use and cannot be broken."
5711
5713
msgstr ""
5712
5714
5713
#: bzrlib/errors.py:967
5715
#: bzrlib/errors.py:976
5714
5716
msgid "Cannot lock %(lock)s: %(why)s"
5715
5717
msgstr ""
5716
5718
5717
#: bzrlib/errors.py:977
5719
#: bzrlib/errors.py:986
5718
5720
msgid ""
5719
5721
"A transaction related operation was attempted after the transaction finished."
5720
5722
msgstr ""
5721
5723
5722
#: bzrlib/errors.py:1004
5724
#: bzrlib/errors.py:1013
5723
5725
msgid "Cannot lock: transport is read only: %(transport)s"
5724
5726
msgstr ""
5725
5727
5726
#: bzrlib/errors.py:1012
5728
#: bzrlib/errors.py:1021
5727
5729
msgid "Could not acquire lock \"%(lock)s\": %(msg)s"
5728
5730
msgstr ""
5729
5731
5730
#: bzrlib/errors.py:1023
5732
#: bzrlib/errors.py:1032
5731
5733
msgid ""
5732
5734
"Lock was broken while still open: %(lock)s - check storage consistency!"
5733
5735
msgstr ""
5734
5736
5735
#: bzrlib/errors.py:1034
5737
#: bzrlib/errors.py:1043
5736
5738
msgid ""
5737
5739
"Lock was released and re-acquired before being broken: %(lock)s: held by "
5738
5740
"%(holder)r, wanted to break %(target)r"
5739
5741
msgstr ""
5740
5742
5741
#: bzrlib/errors.py:1046
5743
#: bzrlib/errors.py:1055
5742
5744
msgid ""
5743
5745
"Lock is apparently held, but corrupted: %(corruption_info)s\n"
5744
5746
"Use 'bzr break-lock' to clear it"
5745
5747
msgstr ""
5746
5748
5747
#: bzrlib/errors.py:1059
5749
#: bzrlib/errors.py:1068
5748
5750
msgid "Lock not held: %(lock)s"
5749
5751
msgstr ""
5750
5752
5751
#: bzrlib/errors.py:1088
5753
#: bzrlib/errors.py:1097
5752
5754
msgid "No changes to commit"
5753
5755
msgstr "No hay cambios que ejecutar."
5754
5756
5755
#: bzrlib/errors.py:1093
5757
#: bzrlib/errors.py:1102
5756
5758
msgid ""
5757
5759
"Selected-file commit of merges is not supported yet: files %(files_str)s"
5758
5760
msgstr ""
5759
5761
5760
#: bzrlib/errors.py:1103
5762
#: bzrlib/errors.py:1112
5761
5763
msgid ""
5762
5764
"Excluding paths during commit is not supported by repository at "
5763
5765
"%(repository)r."
5764
5766
msgstr ""
5765
5767
5766
#: bzrlib/errors.py:1112
5768
#: bzrlib/errors.py:1121
5767
5769
msgid ""
5768
5770
"The specified commit message contains characters unsupported by the current "
5769
5771
"encoding."
5770
5772
msgstr ""
5771
5773
5772
#: bzrlib/errors.py:1118
5774
#: bzrlib/errors.py:1127
5773
5775
msgid "Upgrade URL cannot work with readonly URLs."
5774
5776
msgstr ""
5775
5777
5776
#: bzrlib/errors.py:1123
5778
#: bzrlib/errors.py:1132
5777
5779
msgid "The branch format %(format)s is already at the most recent format."
5778
5780
msgstr ""
5779
5781
5780
#: bzrlib/errors.py:1146
5782
#: bzrlib/errors.py:1155
5781
5783
msgid "Option --change does not accept revision ranges"
5782
5784
msgstr ""
5783
5785
5784
#: bzrlib/errors.py:1151
5786
#: bzrlib/errors.py:1160
5785
5787
msgid "No namespace registered for string: %(spec)r"
5786
5788
msgstr ""
5787
5789
5788
#: bzrlib/errors.py:1170
5790
#: bzrlib/errors.py:1179
5789
5791
msgid ""
5790
5792
"Requested revision: '%(spec)s' does not exist in branch: "
5791
5793
"%(branch_url)s%(extra)s"
5792
5794
msgstr ""
5793
5795
5794
#: bzrlib/errors.py:1184
5796
#: bzrlib/errors.py:1193
5795
5797
msgid ""
5796
5798
"Operation denied because it would change the main history, which is not "
5797
5799
"permitted by the append_revisions_only setting on branch \"%(location)s\"."
5798
5800
msgstr ""
5799
5801
5800
#: bzrlib/errors.py:1195
5802
#: bzrlib/errors.py:1204
5801
5803
msgid ""
5802
5804
"These branches have diverged. Use the missing command to see how.\n"
5803
5805
"Use the merge command to reconcile them."
5804
5806
msgstr ""
5805
5807
5806
#: bzrlib/errors.py:1215
5808
#: bzrlib/errors.py:1224
5807
5809
msgid ""
5808
5810
"Branches have no common ancestor, and no merge base revision was specified."
5809
5811
msgstr ""
5810
5812
5811
#: bzrlib/errors.py:1221
5813
#: bzrlib/errors.py:1230
5812
5814
msgid ""
5813
5815
"Selected merge cannot perform reverse cherrypicks. Try merge3 or diff3."
5814
5816
msgstr ""
5815
5817
5816
#: bzrlib/errors.py:1227
5818
#: bzrlib/errors.py:1236
5817
5819
msgid "Revisions have no common ancestor: %(revision_a)s %(revision_b)s"
5818
5820
msgstr ""
5819
5821
5820
#: bzrlib/errors.py:1236
5822
#: bzrlib/errors.py:1245
5821
5823
msgid ""
5822
5824
"Revisions are not derived from the same root: %(revision_a)s %(revision_b)s."
5823
5825
msgstr ""
5824
5826
5825
#: bzrlib/errors.py:1245
5827
#: bzrlib/errors.py:1254
5826
5828
msgid "Revision %(rev_id)s is not an ancestor of %(not_ancestor_id)s"
5827
5829
msgstr ""
5828
5830
5829
#: bzrlib/errors.py:1254
5831
#: bzrlib/errors.py:1263
5830
5832
msgid "Branch %(branch)s has no commits."
5831
5833
msgstr ""
5832
5834
5833
#: bzrlib/errors.py:1272
5835
#: bzrlib/errors.py:1281
5834
5836
msgid ""
5835
5837
"Bound branch %(branch)s is out of date with master branch "
5836
5838
"%(master)s.%(extra_help)s"
5837
5839
msgstr ""
5838
5840
5839
#: bzrlib/errors.py:1284
5841
#: bzrlib/errors.py:1293
5840
5842
msgid ""
5841
5843
"Cannot commit to branch %(branch)s. It is bound to %(master)s, which is "
5842
5844
"bound to %(remote)s."
5843
5845
msgstr ""
5844
5846
5845
#: bzrlib/errors.py:1296
5847
#: bzrlib/errors.py:1305
5846
5848
msgid "Cannot pull --overwrite to a branch which is bound %(branch)s"
5847
5849
msgstr ""
5848
5850
5849
#: bzrlib/errors.py:1305
5851
#: bzrlib/errors.py:1314
5850
5852
msgid ""
5851
5853
"Unable to connect to target of bound branch %(branch)s => %(target)s: "
5852
5854
"%(error)s"
5853
5855
msgstr ""
5854
5856
5855
#: bzrlib/errors.py:1317
5857
#: bzrlib/errors.py:1326
5856
5858
msgid "Error in processing weave: %(msg)s"
5857
5859
msgstr ""
5858
5860
5859
#: bzrlib/errors.py:1326
5861
#: bzrlib/errors.py:1335
5860
5862
msgid "Revision {%(revision_id)s} already present in %(weave)s"
5861
5863
msgstr ""
5862
5864
5863
#: bzrlib/errors.py:1337
5865
#: bzrlib/errors.py:1346
5864
5866
msgid "Revision {%(revision_id)s} not present in %(weave)s"
5865
5867
msgstr ""
5866
5868
5867
#: bzrlib/errors.py:1347
5869
#: bzrlib/errors.py:1356
5868
5870
msgid "Weave invariant violated: %(what)s"
5869
5871
msgstr ""
5870
5872
5871
#: bzrlib/errors.py:1356
5873
#: bzrlib/errors.py:1365
5872
5874
msgid "Parents are mismatched between two revisions. %(msg)s"
5873
5875
msgstr ""
5874
5876
5875
#: bzrlib/errors.py:1378
5877
#: bzrlib/errors.py:1387
5876
5878
msgid ""
5877
5879
"Weaves differ on text content. Revision: {%(revision_id)s}, %(weave_a)s, "
5878
5880
"%(weave_b)s"
5879
5881
msgstr ""
5880
5882
5881
#: bzrlib/errors.py:1390
5883
#: bzrlib/errors.py:1399
5882
5884
msgid "Versioned file error"
5883
5885
msgstr "Error en el archivo versiondao"
5884
5886
5885
#: bzrlib/errors.py:1395
5887
#: bzrlib/errors.py:1404
5886
5888
msgid "Revision {%(revision_id)s} not present in \"%(file_id)s\"."
5887
5889
msgstr ""
5888
5890
5889
#: bzrlib/errors.py:1405
5891
#: bzrlib/errors.py:1414
5890
5892
msgid "Revision {%(revision_id)s} already present in \"%(file_id)s\"."
5891
5893
msgstr ""
5892
5894
5893
#: bzrlib/errors.py:1415
5895
#: bzrlib/errors.py:1424
5894
5896
msgid "Text did not match its checksum: %(msg)s"
5895
5897
msgstr ""
5896
5898
5897
#: bzrlib/errors.py:1541
5899
#: bzrlib/errors.py:1550
5898
5900
msgid "Export format %(format)r not supported"
5899
5901
msgstr ""
5900
5902
5901
#: bzrlib/errors.py:1550
5903
#: bzrlib/errors.py:1559
5902
5904
msgid "Transport error: %(msg)s %(orig_error)s"
5903
5905
msgstr ""
5904
5906
5905
#: bzrlib/errors.py:1576
5907
#: bzrlib/errors.py:1585
5906
5908
msgid "Generic bzr smart protocol error: %(details)s"
5907
5909
msgstr ""
5908
5910
5909
#: bzrlib/errors.py:1584
5911
#: bzrlib/errors.py:1593
5910
5912
msgid "Received bad protocol version marker: %(marker)r"
5911
5913
msgstr ""
5912
5914
5913
#: bzrlib/errors.py:1616
5915
#: bzrlib/errors.py:1625
5914
5916
msgid "Transport operation not possible: %(msg)s %(orig_error)s"
5915
5917
msgstr ""
5916
5918
5917
#: bzrlib/errors.py:1621
5919
#: bzrlib/errors.py:1630
5918
5920
msgid "Connection error: %(msg)s %(orig_error)s"
5919
5921
msgstr ""
5920
5922
5921
#: bzrlib/errors.py:1626
5923
#: bzrlib/errors.py:1635
5922
5924
msgid "%(msg)s %(host)s%(port)s%(orig_error)s"
5923
5925
msgstr ""
5924
5926
5925
#: bzrlib/errors.py:1647
5927
#: bzrlib/errors.py:1656
5926
5928
msgid "Connection closed: %(msg)s %(orig_error)s"
5927
5929
msgstr ""
5928
5930
5929
#: bzrlib/errors.py:1652
5931
#: bzrlib/errors.py:1661
5930
5932
msgid "Connection Timeout: %(msg)s%(orig_error)s"
5931
5933
msgstr ""
5932
5934
5933
#: bzrlib/errors.py:1657
5935
#: bzrlib/errors.py:1666
5934
5936
msgid "Invalid range access in %(path)s at %(offset)s: %(msg)s"
5935
5937
msgstr ""
5936
5938
5937
#: bzrlib/errors.py:1667
5939
#: bzrlib/errors.py:1676
5938
5940
msgid "Invalid http response for %(path)s: %(msg)s%(orig_error)s"
5939
5941
msgstr ""
5940
5942
5941
#: bzrlib/errors.py:1682
5943
#: bzrlib/errors.py:1691
5942
5944
msgid "Certificate error: %(error)s"
5943
5945
msgstr ""
5944
5946
5945
#: bzrlib/errors.py:1690
5947
#: bzrlib/errors.py:1699
5946
5948
msgid "Invalid http range %(range)r for %(path)s: %(msg)s"
5947
5949
msgstr ""
5948
5950
5949
#: bzrlib/errors.py:1704
5951
#: bzrlib/errors.py:1713
5950
5952
msgid "HTTP MIME Boundary missing for %(path)s: %(msg)s"
5951
5953
msgstr ""
5952
5954
5953
#: bzrlib/errors.py:1712
5955
#: bzrlib/errors.py:1721
5954
5956
msgid "Invalid http Content-type \"%(ctype)s\" for %(path)s: %(msg)s"
5955
5957
msgstr ""
5956
5958
5957
#: bzrlib/errors.py:1721
5959
#: bzrlib/errors.py:1730
5958
5960
msgid "%(source)s is%(permanently)s redirected to %(target)s"
5959
5961
msgstr ""
5960
5962
5961
#: bzrlib/errors.py:1735
5963
#: bzrlib/errors.py:1744
5962
5964
msgid "Too many redirections"
5963
5965
msgstr "Demasiadas redirecciones"
5964
5966
5965
#: bzrlib/errors.py:1740
5967
#: bzrlib/errors.py:1749
5966
5968
msgid "Working tree has conflicts."
5967
5969
msgstr ""
5968
5970
5969
#: bzrlib/errors.py:1744
5971
#: bzrlib/errors.py:1753
5970
5972
msgid "Config file %(filename)s is not UTF-8 encoded\n"
5971
5973
msgstr ""
5972
5974
5973
#: bzrlib/errors.py:1753
5975
#: bzrlib/errors.py:1762
5974
5976
msgid ""
5975
5977
"Error(s) parsing config file %(filename)s:\n"
5976
5978
"%(errors)s"
5977
5979
msgstr ""
5978
5980
5979
#: bzrlib/errors.py:1763
5981
#: bzrlib/errors.py:1772
5980
5982
msgid ""
5981
5983
"Bad value \"%(value)s\" for option \"%(name)s\".\n"
5982
5984
"See ``bzr help %(name)s``"
5983
5985
msgstr ""
5984
5986
5985
#: bzrlib/errors.py:1773
5987
#: bzrlib/errors.py:1782
5986
5988
msgid "%(username)r does not seem to contain a reasonable email address"
5987
5989
msgstr ""
5988
5990
5989
#: bzrlib/errors.py:1782
5991
#: bzrlib/errors.py:1791
5990
5992
msgid "Failed to GPG sign data with command \"%(command_line)s\""
5991
5993
msgstr ""
5992
5994
5993
#: bzrlib/errors.py:1790
5995
#: bzrlib/errors.py:1799
5994
5996
msgid "Failed to verify GPG signature data with error \"%(error)s\""
5995
5997
msgstr ""
5996
5998
5997
#: bzrlib/errors.py:1798
5999
#: bzrlib/errors.py:1807
5998
6000
msgid "Unable to import library \"%(library)s\": %(error)s"
5999
6001
msgstr ""
6000
6002
6001
#: bzrlib/errors.py:1806
6003
#: bzrlib/errors.py:1815
6002
6004
msgid "python-gpgme is not installed, it is needed to verify signatures"
6003
6005
msgstr ""
6004
6006
6005
#: bzrlib/errors.py:1814
6007
#: bzrlib/errors.py:1823
6006
6008
msgid ""
6007
6009
"The working tree for %(basedir)s has changed since the last commit, but "
6008
6010
"weave merge requires that it be unchanged"
6009
6011
msgstr ""
6010
6012
6011
#: bzrlib/errors.py:1824
6013
#: bzrlib/errors.py:1833
6012
6014
msgid ""
6013
6015
"Can't reprocess and show base, because reprocessing obscures the "
6014
6016
"relationship of conflicting lines to the base"
6015
6017
msgstr ""
6016
6018
6017
#: bzrlib/errors.py:1830
6019
#: bzrlib/errors.py:1839
6018
6020
msgid "Cycle in graph %(graph)r"
6019
6021
msgstr ""
6020
6022
6021
#: bzrlib/errors.py:1858
6023
#: bzrlib/errors.py:1867
6022
6024
msgid "File %(filename)s is not conflicted."
6023
6025
msgstr ""
6024
6026
6025
#: bzrlib/errors.py:1880
6027
#: bzrlib/errors.py:1889
6026
6028
msgid "No bundle was found in \"%(filename)s\"."
6027
6029
msgstr ""
6028
6030
6029
#: bzrlib/errors.py:1889
6031
#: bzrlib/errors.py:1898
6030
6032
msgid "Unable to handle bundle version %(version)s: %(msg)s"
6031
6033
msgstr ""
6032
6034
6033
#: bzrlib/errors.py:1899
6035
#: bzrlib/errors.py:1908
6034
6036
msgid "Branch %(base)s is missing revision %(text_revision)s of %(file_id)s"
6035
6037
msgstr ""
6036
6038
6037
#: bzrlib/errors.py:1912
6039
#: bzrlib/errors.py:1921
6038
6040
msgid "File id {%(file_id)s} already exists in inventory as %(entry)s"
6039
6041
msgstr ""
6040
6042
6041
#: bzrlib/errors.py:1922
6043
#: bzrlib/errors.py:1931
6042
6044
msgid "Key %(key)s is already present in map"
6043
6045
msgstr ""
6044
6046
6045
#: bzrlib/errors.py:1927
6047
#: bzrlib/errors.py:1936
6046
6048
msgid "The prefix %(prefix)s is in the help search path twice."
6047
6049
msgstr ""
6048
6050
6049
#: bzrlib/errors.py:1937
6051
#: bzrlib/errors.py:1946
6050
6052
msgid ""
6051
6053
"No final name for trans_id %(trans_id)r\n"
6052
6054
"file-id: %(file_id)r\n"
6053
6055
"root trans-id: %(root_trans_id)r\n"
6054
6056
msgstr ""
6055
6057
6056
#: bzrlib/errors.py:1969
6058
#: bzrlib/errors.py:1978
6057
6059
msgid "Attempt to reuse a transform that has already been applied."
6058
6060
msgstr ""
6059
6061
6060
#: bzrlib/errors.py:1974
6062
#: bzrlib/errors.py:1983
6061
6063
msgid "Moving the root directory is not supported at this time"
6062
6064
msgstr ""
6063
6065
6064
#: bzrlib/errors.py:1979
6066
#: bzrlib/errors.py:1988
6065
6067
msgid "Failed to rename %(from_path)s to %(to_path)s: %(why)s"
6066
6068
msgstr ""
6067
6069
6068
#: bzrlib/errors.py:1990
6070
#: bzrlib/errors.py:1999
6069
6071
msgid ""
6070
6072
"Could not move %(from_path)s%(operator)s %(to_path)s%(_has_extra)s%(extra)s"
6071
6073
msgstr ""
6072
6074
6073
#: bzrlib/errors.py:2026
6075
#: bzrlib/errors.py:2035
6074
6076
msgid ""
6075
6077
"Could not rename %(from_path)s%(operator)s %(to_path)s%(_has_extra)s%(extra)s"
6076
6078
msgstr ""
6077
6079
6078
#: bzrlib/errors.py:2056
6080
#: bzrlib/errors.py:2065
6079
6081
msgid "Unable to import paramiko (required for sftp support): %(error)s"
6080
6082
msgstr ""
6081
6083
6082
#: bzrlib/errors.py:2064
6084
#: bzrlib/errors.py:2073
6083
6085
msgid "Nothing to merge."
6084
6086
msgstr "Nada a fusionar."
6085
6087
6086
#: bzrlib/errors.py:2069
6088
#: bzrlib/errors.py:2078
6087
6089
msgid "Format %(format)s cannot be initialised by this version of bzr."
6088
6090
msgstr ""
6089
6091
6090
#: bzrlib/errors.py:2078
6092
#: bzrlib/errors.py:2087
6091
6093
msgid ""
6092
6094
"Cannot convert from format %(from_format)s to format %(format)s. "
6093
6095
"%(problem)s"
6094
6096
msgstr ""
6095
6097
6096
#: bzrlib/errors.py:2090
6098
#: bzrlib/errors.py:2099
6097
6099
msgid "Could not find an appropriate Differ for file \"%(path)s\""
6098
6100
msgstr ""
6099
6101
6100
#: bzrlib/errors.py:2098
6102
#: bzrlib/errors.py:2107
6101
6103
msgid "%(exe_name)s could not be found on this machine"
6102
6104
msgstr ""
6103
6105
6104
#: bzrlib/errors.py:2106
6106
#: bzrlib/errors.py:2115
6105
6107
msgid "Diff is not installed on this machine: %(msg)s"
6106
6108
msgstr ""
6107
6109
6108
#: bzrlib/errors.py:2114
6110
#: bzrlib/errors.py:2123
6109
6111
msgid "Diff3 is not installed on this machine."
6110
6112
msgstr ""
6111
6113
6112
#: bzrlib/errors.py:2120
6114
#: bzrlib/errors.py:2129
6113
6115
msgid "The content being inserted is already present."
6114
6116
msgstr ""
6115
6117
6116
#: bzrlib/errors.py:2125
6118
#: bzrlib/errors.py:2134
6117
6119
msgid ""
6118
6120
"This tree contains left-over files from a failed operation.\n"
6119
6121
" Please examine %(limbo_dir)s to see if it contains any files you wish "
6121
6123
" keep, and delete it when you are done."
6122
6124
msgstr ""
6123
6125
6124
#: bzrlib/errors.py:2136
6126
#: bzrlib/errors.py:2145
6125
6127
msgid ""
6126
6128
"This tree contains left-over files from a failed operation.\n"
6127
6129
" Please examine %(pending_deletion)s to see if it contains any files you\n"
6128
6130
" wish to keep, and delete it when you are done."
6129
6131
msgstr ""
6130
6132
6131
#: bzrlib/errors.py:2146
6133
#: bzrlib/errors.py:2155
6132
6134
msgid ""
6133
6135
"Unable to delete transform temporary directory %(limbo_dir)s.\n"
6134
6136
" Please examine %(limbo_dir)s to see if it contains any files you wish "
6136
6138
" keep, and delete it when you are done."
6137
6139
msgstr ""
6138
6140
6139
#: bzrlib/errors.py:2157
6141
#: bzrlib/errors.py:2166
6140
6142
msgid ""
6141
6143
"Unable to delete transform temporary directory %(pending_deletion)s. Please "
6142
6144
"examine %(pending_deletion)s to see if it contains any files you wish to "
6143
6145
"keep, and delete it when you are done."
6144
6146
msgstr ""
6145
6147
6146
#: bzrlib/errors.py:2167
6148
#: bzrlib/errors.py:2176
6147
6149
msgid "Working tree is out of date, please run 'bzr update'.%(more)s"
6148
6150
msgstr ""
6149
6151
6150
#: bzrlib/errors.py:2181
6152
#: bzrlib/errors.py:2190
6151
6153
msgid ""
6152
6154
"Public branch \"%(public_location)s\" lacks revision \"%(revstring)s\"."
6153
6155
msgstr ""
6154
6156
6155
#: bzrlib/errors.py:2194
6157
#: bzrlib/errors.py:2203
6156
6158
msgid "Error in merge modified format"
6157
6159
msgstr "Error en el formato modificado de fusión"
6158
6160
6159
#: bzrlib/errors.py:2199
6161
#: bzrlib/errors.py:2208
6160
6162
msgid "Format error in conflict listings"
6161
6163
msgstr ""
6162
6164
6163
#: bzrlib/errors.py:2203
6165
#: bzrlib/errors.py:2212
6164
6166
msgid ""
6165
6167
"Inconsistency in dirstate file %(dirstate_path)s.\n"
6166
6168
"Error: %(description)s"
6167
6169
msgstr ""
6168
6170
6169
#: bzrlib/errors.py:2214
6171
#: bzrlib/errors.py:2223
6170
6172
msgid ""
6171
6173
"An error has been detected in the repository %(repo_path)s.\n"
6172
6174
"Please run bzr reconcile on this repository."
6173
6175
msgstr ""
6174
6176
6175
#: bzrlib/errors.py:2225
6177
#: bzrlib/errors.py:2234
6176
6178
msgid ""
6177
6179
"An inconsistent delta was supplied involving %(path)r, %(file_id)r\n"
6178
6180
"reason: %(reason)s"
6179
6181
msgstr ""
6180
6182
6181
#: bzrlib/errors.py:2238
6183
#: bzrlib/errors.py:2247
6182
6184
msgid ""
6183
6185
"An inconsistent delta was supplied: %(delta)r\n"
6184
6186
"reason: %(reason)s"
6185
6187
msgstr ""
6186
6188
6187
#: bzrlib/errors.py:2250
6189
#: bzrlib/errors.py:2259
6188
6190
msgid "To use this feature you must upgrade your branch at %(path)s."
6189
6191
msgstr ""
6190
6192
6191
#: bzrlib/errors.py:2259
6193
#: bzrlib/errors.py:2268
6192
6194
msgid "To use this feature you must upgrade your repository at %(path)s."
6193
6195
msgstr ""
6194
6196
6195
#: bzrlib/errors.py:2264
6197
#: bzrlib/errors.py:2273
6196
6198
msgid ""
6197
6199
"To use this feature you must upgrade your branch at %(path)s to a format "
6198
6200
"which supports rich roots."
6199
6201
msgstr ""
6200
6202
6201
#: bzrlib/errors.py:2270
6203
#: bzrlib/errors.py:2279
6202
6204
msgid "Cannot perform local-only commits on unbound branches."
6203
6205
msgstr ""
6204
6206
6205
#: bzrlib/errors.py:2275
6207
#: bzrlib/errors.py:2284
6206
6208
msgid "The method %(mname)s is not supported on objects of type %(tname)s."
6207
6209
msgstr ""
6208
6210
6209
#: bzrlib/errors.py:2296
6211
#: bzrlib/errors.py:2305
6210
6212
msgid "Ghost tags not supported by format %(format)r."
6211
6213
msgstr ""
6212
6214
6213
#: bzrlib/errors.py:2304
6215
#: bzrlib/errors.py:2313
6214
6216
msgid "File is binary but should be text."
6215
6217
msgstr ""
6216
6218
6217
#: bzrlib/errors.py:2309
6219
#: bzrlib/errors.py:2318
6218
6220
msgid "The path %(path)s is not permitted on this platform"
6219
6221
msgstr ""
6220
6222
6221
#: bzrlib/errors.py:2318
6223
#: bzrlib/errors.py:2327
6222
6224
msgid ""
6223
6225
"Testament did not match expected value.\n"
6224
6226
" For revision_id {%(revision_id)s}, expected {%(expected)s}, measured\n"
6225
6227
" {%(measured)s}"
6226
6228
msgstr ""
6227
6229
6228
#: bzrlib/errors.py:2330
6230
#: bzrlib/errors.py:2339
6229
6231
msgid "Not a bzr revision-bundle: %(text)r"
6230
6232
msgstr ""
6231
6233
6232
#: bzrlib/errors.py:2339
6234
#: bzrlib/errors.py:2348
6233
6235
msgid "Bad bzr revision-bundle: %(text)r"
6234
6236
msgstr ""
6235
6237
6236
#: bzrlib/errors.py:2348
6238
#: bzrlib/errors.py:2357
6237
6239
msgid "Malformed bzr revision-bundle header: %(text)r"
6238
6240
msgstr ""
6239
6241
6240
#: bzrlib/errors.py:2353
6242
#: bzrlib/errors.py:2362
6241
6243
msgid "Malformed patches in bzr revision-bundle: %(text)r"
6242
6244
msgstr ""
6243
6245
6244
#: bzrlib/errors.py:2358
6246
#: bzrlib/errors.py:2367
6245
6247
msgid "Malformed footer in bzr revision-bundle: %(text)r"
6246
6248
msgstr ""
6247
6249
6248
#: bzrlib/errors.py:2363
6250
#: bzrlib/errors.py:2372
6249
6251
msgid "End of line marker was not \\n in bzr revision-bundle"
6250
6252
msgstr ""
6251
6253
6252
#: bzrlib/errors.py:2373
6254
#: bzrlib/errors.py:2382
6253
6255
msgid "Bundle format %(bundle_format)s is incompatible with %(other)s"
6254
6256
msgstr ""
6255
6257
6256
#: bzrlib/errors.py:2383
6258
#: bzrlib/errors.py:2392
6257
6259
msgid "Root class for inventory serialization errors"
6258
6260
msgstr ""
6259
6261
6260
#: bzrlib/errors.py:2387
6262
#: bzrlib/errors.py:2396
6261
6263
msgid ""
6262
6264
"The inventory was not in the expected format:\n"
6263
6265
" %(msg)s"
6264
6266
msgstr ""
6265
6267
6266
#: bzrlib/errors.py:2396
6268
#: bzrlib/errors.py:2405
6267
6269
msgid "This operation requires rich root data storage"
6268
6270
msgstr ""
6269
6271
6270
#: bzrlib/errors.py:2409
6272
#: bzrlib/errors.py:2418
6271
6273
msgid "Unrecognised value for BZR_SSH environment variable: %(vendor)s"
6272
6274
msgstr ""
6273
6275
6274
#: bzrlib/errors.py:2418
6276
#: bzrlib/errors.py:2427
6275
6277
msgid ""
6276
6278
"Don't know how to handle SSH connections. Please set BZR_SSH environment "
6277
6279
"variable."
6278
6280
msgstr ""
6279
6281
6280
#: bzrlib/errors.py:2425
6282
#: bzrlib/errors.py:2434
6281
6283
msgid ""
6282
6284
"Could not determine revno for {%(revision_id)s} because its ancestry shows a "
6283
6285
"ghost at {%(ghost_revision_id)s}"
6284
6286
msgstr ""
6285
6287
6286
#: bzrlib/errors.py:2435
6288
#: bzrlib/errors.py:2444
6287
6289
msgid "Ghost revision {%(revision_id)s} cannot be used here."
6288
6290
msgstr ""
6289
6291
6290
#: bzrlib/errors.py:2486
6292
#: bzrlib/errors.py:2495
6291
6293
msgid ""
6292
6294
"A merge directive must provide either a bundle or a public branch location."
6293
6295
msgstr ""
6294
6296
6295
#: bzrlib/errors.py:2493
6297
#: bzrlib/errors.py:2502
6296
6298
msgid "Bad merge directive payload %(start)r"
6297
6299
msgstr ""
6298
6300
6299
#: bzrlib/errors.py:2503
6301
#: bzrlib/errors.py:2512
6300
6302
msgid "Preview patch does not match requested changes."
6301
6303
msgstr ""
6302
6304
6303
#: bzrlib/errors.py:2509
6305
#: bzrlib/errors.py:2518
6304
6306
msgid "Patch_type was %(patch_type)s, but no patch was supplied."
6305
6307
msgstr ""
6306
6308
6307
#: bzrlib/errors.py:2519
6309
#: bzrlib/errors.py:2528
6308
6310
msgid ""
6309
6311
"Your branch does not have all of the revisions required in order to merge "
6310
6312
"this merge directive and the target location specified in the merge "
6311
6313
"directive is not a branch: %(location)s."
6312
6314
msgstr ""
6313
6315
6314
#: bzrlib/errors.py:2531
6316
#: bzrlib/errors.py:2540
6315
6317
msgid "Unsupported entry kind %(kind)s"
6316
6318
msgstr ""
6317
6319
6318
#: bzrlib/errors.py:2539
6320
#: bzrlib/errors.py:2548
6319
6321
msgid "Can't subsume %(other_tree)s into %(tree)s. %(reason)s"
6320
6322
msgstr ""
6321
6323
6322
#: bzrlib/errors.py:2549
6324
#: bzrlib/errors.py:2558
6323
6325
msgid "Subsume target %(other_tree)s needs to be upgraded."
6324
6326
msgstr ""
6325
6327
6326
#: bzrlib/errors.py:2568
6328
#: bzrlib/errors.py:2577
6327
6329
msgid "No such tag: %(tag_name)s"
6328
6330
msgstr ""
6329
6331
6330
#: bzrlib/errors.py:2576
6332
#: bzrlib/errors.py:2585
6331
6333
msgid "Tags not supported by %(branch)s; you may be able to use bzr upgrade."
6332
6334
msgstr ""
6333
6335
6334
#: bzrlib/errors.py:2585
6336
#: bzrlib/errors.py:2594
6335
6337
msgid "Tag %(tag_name)s already exists."
6336
6338
msgstr ""
6337
6339
6338
#: bzrlib/errors.py:2593
6340
#: bzrlib/errors.py:2602
6339
6341
msgid ""
6340
6342
"Did not understand bug identifier %(bug_id)s: %(reason)s. See \"bzr help "
6341
6343
"bugs\" for more information on this feature."
6342
6344
msgstr ""
6343
6345
6344
#: bzrlib/errors.py:2603
6346
#: bzrlib/errors.py:2612
6345
6347
msgid ""
6346
6348
"The URL for bug tracker \"%(abbreviation)s\" doesn't contain {id}: %(url)s"
6347
6349
msgstr ""
6348
6350
6349
#: bzrlib/errors.py:2613
6351
#: bzrlib/errors.py:2622
6350
6352
msgid ""
6351
6353
"Cannot find registered bug tracker called %(abbreviation)s on %(branch)s"
6352
6354
msgstr ""
6353
6355
6354
#: bzrlib/errors.py:2623
6356
#: bzrlib/errors.py:2632
6355
6357
msgid "Invalid line in bugs property: '%(line)s'"
6356
6358
msgstr ""
6357
6359
6358
#: bzrlib/errors.py:2631
6360
#: bzrlib/errors.py:2640
6359
6361
msgid "Invalid bug status: '%(status)s'"
6360
6362
msgstr ""
6361
6363
6362
#: bzrlib/errors.py:2639
6364
#: bzrlib/errors.py:2648
6363
6365
msgid "Could not understand response from smart server: %(response_tuple)r"
6364
6366
msgstr ""
6365
6367
6366
#: bzrlib/errors.py:2678
6368
#: bzrlib/errors.py:2687
6367
6369
msgid "Server sent an unexpected error: %(error_tuple)r"
6368
6370
msgstr "El servidor envió un error inesperado: %(error_tuple)r"
6369
6371
6370
#: bzrlib/errors.py:2697
6372
#: bzrlib/errors.py:2706
6371
6373
msgid "Unrecognised container format: %(container_format)r"
6372
6374
msgstr ""
6373
6375
6374
#: bzrlib/errors.py:2705
6376
#: bzrlib/errors.py:2714
6375
6377
msgid "Unexpected end of container stream"
6376
6378
msgstr "Final inesperado del flujo del contenedor"
6377
6379
6378
#: bzrlib/errors.py:2710
6380
#: bzrlib/errors.py:2719
6379
6381
msgid "Unknown record type: %(record_type)r"
6380
6382
msgstr "Tipo de registro inesperado: %(record_type)r"
6381
6383
6382
#: bzrlib/errors.py:2718
6384
#: bzrlib/errors.py:2727
6383
6385
msgid "Invalid record: %(reason)s"
6384
6386
msgstr "Registro inesperado: %(reason)s"
6385
6387
6386
#: bzrlib/errors.py:2726
6388
#: bzrlib/errors.py:2735
6387
6389
msgid "Container has data after end marker: %(excess)r"
6388
6390
msgstr ""
6389
6391
6390
#: bzrlib/errors.py:2734
6392
#: bzrlib/errors.py:2743
6391
6393
msgid "Container has multiple records with the same name: %(name)s"
6392
6394
msgstr ""
6393
6395
6394
#: bzrlib/errors.py:2747
6396
#: bzrlib/errors.py:2756
6395
6397
msgid "Corrupt or incompatible data stream: %(reason)s"
6396
6398
msgstr ""
6397
6399
6398
#: bzrlib/errors.py:2755
6400
#: bzrlib/errors.py:2764
6399
6401
msgid "SMTP error: %(error)s"
6400
6402
msgstr "Error SMTP: %(error)s"
6401
6403
6402
#: bzrlib/errors.py:2763
6404
#: bzrlib/errors.py:2772
6403
6405
msgid "No message supplied."
6404
6406
msgstr "No se ha proporcionado mensaje."
6405
6407
6406
#: bzrlib/errors.py:2768
6408
#: bzrlib/errors.py:2777
6407
6409
msgid "No mail-to address (--mail-to) or output (-o) specified."
6408
6410
msgstr ""
6409
6411
"No se a especificado una dirección de correo a enviar (--mail-to) o salida (-"
6410
6412
"o)."
6411
6413
6412
#: bzrlib/errors.py:2781
6414
#: bzrlib/errors.py:2782
6413
6415
msgid ""
6414
6416
"Unable to find mail client with the following names: "
6415
6417
"%(mail_command_list_string)s"
6416
6418
msgstr ""
6417
6419
6418
#: bzrlib/errors.py:2791
6420
#: bzrlib/errors.py:2792
6419
6421
msgid "SMTP connection to %(host)s refused"
6420
6422
msgstr "Las conexiones SMTP a %(host)s se han rechazado"
6421
6423
6422
#: bzrlib/errors.py:2800
6424
#: bzrlib/errors.py:2801
6423
6425
msgid "Please specify smtp_server. No server at default %(host)s."
6424
6426
msgstr ""
6425
6427
6426
#: bzrlib/errors.py:2814
6428
#: bzrlib/errors.py:2815
6427
6429
msgid ""
6428
6430
"'%(display_url)s' is not in sync with %(target_url)s. See bzr help sync-for-"
6429
6431
"reconfigure."
6430
6432
msgstr ""
6431
6433
6432
#: bzrlib/errors.py:2826
6434
#: bzrlib/errors.py:2827
6433
6435
msgid "'%(display_url)s' is already a branch."
6434
6436
msgstr "«%(display_url)s» ya es una la rama."
6435
6437
6436
#: bzrlib/errors.py:2831
6438
#: bzrlib/errors.py:2832
6437
6439
msgid "'%(display_url)s' is already a tree."
6438
6440
msgstr "«%(display_url)s» ya es un árbol."
6439
6441
6440
#: bzrlib/errors.py:2836
6442
#: bzrlib/errors.py:2837
6441
6443
msgid "'%(display_url)s' is already a checkout."
6442
6444
msgstr "«%(display_url)s» ya es una comprobación."
6443
6445
6444
#: bzrlib/errors.py:2841
6446
#: bzrlib/errors.py:2842
6445
6447
msgid "'%(display_url)s' is already a lightweight checkout."
6446
6448
msgstr "«%(display_url)s» ya es una comprobación ligera."
6447
6449
6448
#: bzrlib/errors.py:2846
6450
#: bzrlib/errors.py:2847
6449
6451
msgid "'%(display_url)s' is already using a shared repository."
6450
6452
msgstr "«%(display_url)s» ya está usando un repositorio compartido."
6451
6453
6452
#: bzrlib/errors.py:2851
6454
#: bzrlib/errors.py:2852
6453
6455
msgid "'%(display_url)s' is already standalone."
6454
6456
msgstr "«%(display_url)s» ya es autónomo."
6455
6457
6456
#: bzrlib/errors.py:2856
6458
#: bzrlib/errors.py:2857
6457
6459
msgid "Shared repository '%(display_url)s' already creates working trees."
6458
6460
msgstr ""
6459
6461
6460
#: bzrlib/errors.py:2862
6462
#: bzrlib/errors.py:2863
6461
6463
msgid ""
6462
6464
"Shared repository '%(display_url)s' already doesn't create working trees."
6463
6465
msgstr ""
6464
6466
6465
#: bzrlib/errors.py:2868
6467
#: bzrlib/errors.py:2869
6466
6468
msgid "Requested reconfiguration of '%(display_url)s' is not supported."
6467
6469
msgstr ""
6468
6470
6469
#: bzrlib/errors.py:2873
6471
#: bzrlib/errors.py:2874
6470
6472
msgid "No location could be found to bind to at %(display_url)s."
6471
6473
msgstr "No se encontró ubicación a donde vincular %(display_url)s."
6472
6474
6473
#: bzrlib/errors.py:2878
6475
#: bzrlib/errors.py:2879
6474
6476
msgid ""
6475
6477
"Working tree \"%(display_url)s\" has uncommitted changes (See bzr "
6476
6478
"status).%(more)s"
6477
6479
msgstr ""
6478
6480
6479
#: bzrlib/errors.py:2897
6481
#: bzrlib/errors.py:2898
6480
6482
msgid ""
6481
6483
"Working tree \"%(display_url)s\" has shelved changes (See bzr shelve --"
6482
6484
"list).%(more)s"
6483
6485
msgstr ""
6484
6486
6485
#: bzrlib/errors.py:2903
6487
#: bzrlib/errors.py:2904
6486
6488
msgid "Variable {%(name)s} is not available."
6487
6489
msgstr "La variable {%(name)s} no está disponible."
6488
6490
6489
#: bzrlib/errors.py:2911
6491
#: bzrlib/errors.py:2912
6490
6492
msgid "No template specified."
6491
6493
msgstr "No se ha especificado una plantilla."
6492
6494
6493
#: bzrlib/errors.py:2916
6495
#: bzrlib/errors.py:2917
6494
6496
msgid "Unable to create symlink %(path_str)son this platform"
6495
6497
msgstr "Imposible crear un vínculo simbólico %(path_str)s en esta plataforma"
6496
6498
6497
#: bzrlib/errors.py:2931
6499
#: bzrlib/errors.py:2932
6498
6500
msgid ""
6499
6501
"Unsupported timezone format \"%(timezone)s\", options are \"utc\", "
6500
6502
"\"original\", \"local\"."
6502
6504
"Formato de zona horaria «%(timezone)s» no permitido , las opciones son«utc», "
6503
6505
"«original», «local»."
6504
6506
6505
#: bzrlib/errors.py:2965
6507
#: bzrlib/errors.py:2966
6506
6508
msgid ""
6507
6509
"Unable to encode %(kind)s path %(path)r in user encoding %(user_encoding)s"
6508
6510
msgstr ""
6509
6511
6510
#: bzrlib/errors.py:2977
6512
#: bzrlib/errors.py:2978
6511
6513
msgid "The \"%(config_id)s\" configuration does not exist."
6512
6514
msgstr ""
6513
6515
6514
#: bzrlib/errors.py:2985
6516
#: bzrlib/errors.py:2986
6515
6517
msgid "The \"%(option_name)s\" configuration option does not exist."
6516
6518
msgstr ""
6517
6519
6518
#: bzrlib/errors.py:2993
6520
#: bzrlib/errors.py:2994
6519
6521
msgid "The alias \"%(alias_name)s\" does not exist."
6520
6522
msgstr ""
6521
6523
6522
#: bzrlib/errors.py:3007
6524
#: bzrlib/errors.py:3008
6523
6525
msgid "\"%(alias_name)s\" is not a valid location alias."
6524
6526
msgstr ""
6525
6527
6526
#: bzrlib/errors.py:3015
6528
#: bzrlib/errors.py:3016
6527
6529
msgid "No %(alias_name)s location assigned."
6528
6530
msgstr ""
6529
6531
6530
#: bzrlib/errors.py:3023
6532
#: bzrlib/errors.py:3024
6531
6533
msgid "Cannot bind address \"%(host)s:%(port)i\": %(orig_error)s."
6532
6534
msgstr ""
6533
6535
6534
#: bzrlib/errors.py:3033
6536
#: bzrlib/errors.py:3034
6535
6537
msgid "Unknown rules detected: %(unknowns_str)s."
6536
6538
msgstr "Reglas detectadas desconocidas: %(unknowns_str)s."
6537
6539
6538
#: bzrlib/errors.py:3044
6540
#: bzrlib/errors.py:3045
6539
6541
msgid "Tip change rejected: %(msg)s"
6540
6542
msgstr ""
6541
6543
6542
#: bzrlib/errors.py:3052
6544
#: bzrlib/errors.py:3053
6543
6545
msgid "Shelf corrupt."
6544
6546
msgstr ""
6545
6547
6546
#: bzrlib/errors.py:3057
6548
#: bzrlib/errors.py:3058
6547
6549
msgid "Corruption while decompressing repository file%(orig_error)s"
6548
6550
msgstr ""
6549
6551
6550
#: bzrlib/errors.py:3069
6552
#: bzrlib/errors.py:3070
6551
6553
msgid "No changes are shelved with id \"%(shelf_id)d\"."
6552
6554
msgstr ""
6553
6555
6554
#: bzrlib/errors.py:3077
6556
#: bzrlib/errors.py:3078
6555
6557
msgid "\"%(invalid_id)s\" is not a valid shelf id, try a number instead."
6556
6558
msgstr ""
6557
6559
6558
#: bzrlib/errors.py:3085
6560
#: bzrlib/errors.py:3086
6559
6561
msgid ""
6560
6562
"An attempt to access a url outside the server jail was made: '%(url)s'."
6561
6563
msgstr ""
6562
6564
6563
#: bzrlib/errors.py:3093
6565
#: bzrlib/errors.py:3094
6564
6566
msgid "The user aborted the operation."
6565
6567
msgstr "El usuario abortó la operación."
6566
6568
6567
#: bzrlib/errors.py:3098
6569
#: bzrlib/errors.py:3099
6568
6570
msgid "Branching '%(url)s'(%(format)s) must create a working tree."
6569
6571
msgstr ""
6570
6572
6571
#: bzrlib/errors.py:3108
6573
#: bzrlib/errors.py:3109
6572
6574
msgid "No such view: %(view_name)s."
6573
6575
msgstr ""
6574
6576
6575
#: bzrlib/errors.py:3118
6577
#: bzrlib/errors.py:3119
6576
6578
msgid ""
6577
6579
"Views are not supported by %(tree)s; use 'bzr upgrade' to change your tree "
6578
6580
"to a later format."
6579
6581
msgstr ""
6580
6582
6581
#: bzrlib/errors.py:3127
6583
#: bzrlib/errors.py:3128
6582
6584
msgid ""
6583
6585
"Specified file \"%(file_name)s\" is outside the current view: %(view_str)s"
6584
6586
msgstr ""
6585
6587
6586
#: bzrlib/errors.py:3194
6588
#: bzrlib/errors.py:3195
6587
6589
msgid "%(bzrdir)r does not support co-located branches."
6588
6590
msgstr ""
6589
6591
6590
#: bzrlib/errors.py:3200
6592
#: bzrlib/errors.py:3201
6591
6593
msgid ""
6592
6594
"Unable to determine your name.\n"
6593
6595
"Please, set your name with the 'whoami' command.\n"
6594
6596
"E.g. bzr whoami \"Your Name <name@example.com>\""
6595
6597
msgstr ""
6596
6598
6597
#: bzrlib/errors.py:3209
6599
#: bzrlib/errors.py:3210
6598
6600
msgid "Invalid pattern(s) found. %(msg)s"
6599
6601
msgstr "Se encontró un patrón inválido. %(msg)s"
6600
6602
6601
#: bzrlib/errors.py:3217
6603
#: bzrlib/errors.py:3218
6602
6604
msgid ""
6603
6605
"Branch \"%(branch_url)s\" appears to be bound to itself. Please use `bzr "
6604
6606
"unbind` to fix."
6605
6607
msgstr ""
6606
6608
6607
#: bzrlib/errors.py:3228
6609
#: bzrlib/errors.py:3229
6608
6610
msgid "Loop involving %(refs)r while expanding \"%(string)s\"."
6609
6611
msgstr ""
6610
6612
6611
#: bzrlib/errors.py:3237
6613
#: bzrlib/errors.py:3238
6612
6614
msgid "Option %(name)s is not defined while expanding \"%(string)s\"."
6613
6615
msgstr ""
6614
6616
6615
#: bzrlib/errors.py:3246
6617
#: bzrlib/errors.py:3247
6616
6618
msgid ""
6617
6619
"No compatible object available for operations from %(source)r to %(target)r."
6618
6620
msgstr ""
6619
6621
6620
#: bzrlib/errors.py:3256
6622
#: bzrlib/errors.py:3257
6621
6623
msgid ""
6622
6624
"VFS requests over the smart server are not allowed. Encountered: %(method)s, "
6623
6625
"%(arguments)s."
6624
6626
msgstr ""
6625
6627
6626
#: bzrlib/errors.py:3266
6628
#: bzrlib/errors.py:3267
6627
6629
msgid ""
6628
6630
"Kind change from %(from_kind)s to %(to_kind)s for %(path)s not supported by "
6629
6631
"format %(format)r"
6630
6632
msgstr ""
6631
6633
6632
#: bzrlib/errors.py:3278
6634
#: bzrlib/errors.py:3279
6633
6635
msgid ""
6634
6636
"Missing feature %(feature)s not provided by this version of Bazaar or any "
6635
6637
"plugin."
6636
6638
msgstr ""
6637
6639
6638
#: bzrlib/errors.py:3291
6640
#: bzrlib/errors.py:3292
6639
6641
msgid "Binary files section encountered."
6640
6642
msgstr ""
6641
6643
6642
#: bzrlib/errors.py:3299
6644
#: bzrlib/errors.py:3300
6643
6645
msgid ""
6644
6646
"Malformed patch header. %(desc)s\n"
6645
6647
"%(line)r"
6646
6648
msgstr ""
6647
6649
6648
#: bzrlib/errors.py:3308
6650
#: bzrlib/errors.py:3309
6649
6651
msgid ""
6650
6652
"Malformed hunk header. %(desc)s\n"
6651
6653
"%(line)r"
6652
6654
msgstr ""
6653
6655
6654
#: bzrlib/errors.py:3317
6656
#: bzrlib/errors.py:3318
6655
6657
msgid ""
6656
6658
"Malformed line. %(desc)s\n"
6657
6659
"%(line)r"
6658
6660
msgstr ""
6659
6661
6660
#: bzrlib/errors.py:3327
6662
#: bzrlib/errors.py:3328
6661
6663
msgid ""
6662
6664
"Text contents mismatch at line %(line_no)d. Original has \"%(orig_line)s\", "
6663
6665
"but patch says it should be \"%(patch_line)s\""
6664
6666
msgstr ""
6665
6667
6666
#: bzrlib/errors.py:3338
6668
#: bzrlib/errors.py:3339
6667
6669
msgid "The feature %(feature)s has already been registered."
6668
6670
msgstr ""
6669
6671
6715
6717
"regular push."
6716
6718
msgstr ""
6717
6719
6718
#: bzrlib/gpg.py:343
6720
#: bzrlib/gpg.py:366
6719
6721
msgid "No GnuPG key results for pattern: {0}"
6720
6722
msgstr "No hay resultados de la clave GnuPG para el patrón: {0}"
6721
6723
6722
#: bzrlib/gpg.py:119 bzrlib/gpg.py:460
6724
#: bzrlib/gpg.py:439
6723
6725
msgid "{0} commits with valid signatures"
6724
6726
msgstr "{0} ejecuciones con firmas válidas"
6725
6727
6726
#: bzrlib/gpg.py:123 bzrlib/gpg.py:465
6728
#: bzrlib/gpg.py:445
6727
6729
msgid "{0} commit with unknown key"
6728
6730
msgid_plural "{0} commits with unknown keys"
6729
6731
msgstr[0] "{0} ejecución con clave desconocida"
6730
6732
msgstr[1] "{0} ejecuciones con claves desconocidas"
6731
6733
6732
#: bzrlib/gpg.py:129 bzrlib/gpg.py:472
6734
#: bzrlib/gpg.py:453
6733
6735
msgid "{0} commit not valid"
6734
6736
msgid_plural "{0} commits not valid"
6735
6737
msgstr[0] "{0} ejecución inválida"
6736
6738
msgstr[1] "{0} ejecuciones inválidas"
6737
6739
6738
#: bzrlib/gpg.py:135 bzrlib/gpg.py:479
6740
#: bzrlib/gpg.py:461
6739
6741
msgid "{0} commit not signed"
6740
6742
msgid_plural "{0} commits not signed"
6741
6743
msgstr[0] "{0} ejecución no firmada"
6742
6744
msgstr[1] "{0} ejecuciones no firmadas"
6743
6745
6744
#: bzrlib/gpg.py:141 bzrlib/gpg.py:486
6746
#: bzrlib/gpg.py:469
6745
6747
msgid "{0} commit with key now expired"
6746
6748
msgid_plural "{0} commits with key now expired"
6747
6749
msgstr[0] ""
6748
6750
msgstr[1] ""
6749
6751
6750
#: bzrlib/gpg.py:452
6752
#: bzrlib/gpg.py:489
6751
6753
msgid "{0} commit by author {1} with key {2} now expired"
6752
6754
msgid_plural "{0} commits by author {1} with key {2} now expired"
6753
6755
msgstr[0] ""
6754
6756
msgstr[1] ""
6755
6757
6756
#: bzrlib/gpg.py:386
6758
#: bzrlib/gpg.py:505
6757
6759
msgid "{0} signed {1} commit"
6758
6760
msgid_plural "{0} signed {1} commits"
6759
6761
msgstr[0] ""
6760
6762
msgstr[1] ""
6761
6763
6762
#: bzrlib/gpg.py:403 bzrlib/gpg.py:419
6764
#: bzrlib/gpg.py:522 bzrlib/gpg.py:539
6763
6765
msgid "{0} commit by author {1}"
6764
6766
msgid_plural "{0} commits by author {1}"
6765
6767
msgstr[0] ""
6766
6768
msgstr[1] ""
6767
6769
6768
#: bzrlib/gpg.py:433
6770
#: bzrlib/gpg.py:554
6769
6771
msgid "Unknown key {0} signed {1} commit"
6770
6772
msgid_plural "Unknown key {0} signed {1} commits"
6771
6773
msgstr[0] ""
6776
6778
msgid "Insert claimed random_id=True, but then inserted %r two times"
6777
6779
msgstr ""
6778
6780
6779
#: bzrlib/hooks.py:331
6781
#: bzrlib/hooks.py:313
6780
6782
#, python-format
6781
6783
msgid "Introduced in: %s"
6782
6784
msgstr ""
6783
6785
6784
#: bzrlib/hooks.py:334
6786
#: bzrlib/hooks.py:316
6785
6787
#, python-format
6786
6788
msgid "Deprecated in: %s"
6787
6789
msgstr ""
6830
6832
"held by %(user)s on %(hostname)s (process #%(pid)s), acquired %(time_ago)s"
6831
6833
msgstr ""
6832
6834
6833
#: bzrlib/log.py:572
6835
#: bzrlib/log.py:563
6834
6836
msgid "--exclude-common-ancestry requires two different revisions"
6835
6837
msgstr "--exclude-common-ancestry requiere dos revisiones diferentes"
6836
6838
6837
#: bzrlib/log.py:574
6839
#: bzrlib/log.py:565
6838
6840
#, python-format
6839
6841
msgid "invalid direction %r"
6840
6842
msgstr "dirección %r inválida"
6841
6843
6842
#: bzrlib/log.py:662
6844
#: bzrlib/log.py:653
6843
6845
msgid "Start revision not found in history of end revision."
6844
6846
msgstr ""
6845
6847
6846
#: bzrlib/log.py:1080 bzrlib/log.py:1138
6848
#: bzrlib/log.py:1071 bzrlib/log.py:1129
6847
6849
msgid "Logging revision 0 is invalid."
6848
6850
msgstr ""
6849
6851
6850
#: bzrlib/log.py:1082 bzrlib/log.py:1140
6852
#: bzrlib/log.py:1073 bzrlib/log.py:1131
6851
6853
msgid "Start revision must be older than the end revision."
6852
6854
msgstr "El inicio de la revisión debe ser anterior al final."
6853
6855
6854
#: bzrlib/log.py:1827
6856
#: bzrlib/log.py:1818
6855
6857
#, python-format
6856
6858
msgid "unknown log formatter: %r"
6857
6859
msgstr ""
6858
6860
6859
#: bzrlib/log.py:2123
6861
#: bzrlib/log.py:2114
6860
6862
msgid "fixes bug"
6861
6863
msgid_plural "fixes bugs"
6862
6864
msgstr[0] "error areglado"
6871
6873
msgid "%d conflicts encountered."
6872
6874
msgstr "%d conflictos encontrados."
6873
6875
6874
#: bzrlib/merge.py:845 bzrlib/merge.py:1933
6876
#: bzrlib/merge.py:845 bzrlib/merge.py:1868
6875
6877
msgid "Preparing file merge"
6876
6878
msgstr ""
6877
6879
6993
6995
msgid "lstat/stat of ({0!r}): {1!r}"
6994
6996
msgstr "lstat/stat de ({0!r}): {1!r}"
6995
6997
6996
#: bzrlib/osutils.py:1008 bzrlib/osutils.py:1019
6998
#: bzrlib/osutils.py:1030 bzrlib/osutils.py:1041
6997
6999
#, python-format
6998
7000
msgid "sorry, %r not allowed in path"
6999
7001
msgstr ""
7000
7002
7001
#: bzrlib/osutils.py:1237
7003
#: bzrlib/osutils.py:1259
7002
7004
#, python-format
7003
7005
msgid "%r is too short to calculate a relative path"
7004
7006
msgstr ""
7041
7043
msgid "Setting ssh/sftp usernames for launchpad.net."
7042
7044
msgstr ""
7043
7045
7044
#: bzrlib/plugins/launchpad/__init__.py:81
7046
#: bzrlib/plugins/launchpad/cmds.py:44
7045
7047
msgid "Register a branch with launchpad.net."
7046
7048
msgstr "Registrar una rama con launchpad.net."
7047
7049
7048
#: bzrlib/plugins/launchpad/__init__.py:83
7050
#: bzrlib/plugins/launchpad/cmds.py:46
7049
7051
msgid ""
7050
7052
"This command lists a bzr branch in the directory of branches on\n"
7051
7053
"launchpad.net. Registration allows the branch to be associated with\n"
7052
7054
"bugs or specifications."
7053
7055
msgstr ""
7054
7056
7055
#: bzrlib/plugins/launchpad/__init__.py:87
7057
#: bzrlib/plugins/launchpad/cmds.py:50
7056
7058
msgid ""
7057
7059
"Before using this command you must register the project to which the\n"
7058
7060
"branch belongs, and create an account for yourself on launchpad.net."
7059
7061
msgstr ""
7060
7062
7061
#: bzrlib/plugins/launchpad/__init__.py:90
7063
#: bzrlib/plugins/launchpad/cmds.py:53
7062
7064
msgid ""
7063
7065
"arguments:\n"
7064
7066
" public_url: The publicly visible url for the branch to register.\n"
7070
7072
" otherwise error."
7071
7073
msgstr ""
7072
7074
7073
#: bzrlib/plugins/launchpad/__init__.py:99
7075
#: bzrlib/plugins/launchpad/cmds.py:62
7074
7076
msgid ""
7075
7077
"example:\n"
7076
7078
" bzr register-branch http://foo.com/bzr/fooproject.mine \\\n"
7077
7079
" --project fooproject"
7078
7080
msgstr ""
7079
7081
7080
#: bzrlib/plugins/launchpad/__init__.py:106
7082
#: bzrlib/plugins/launchpad/cmds.py:69
7081
7083
msgid "Launchpad project short name to associate with the branch."
7082
7084
msgstr "Nombre corto del proyecto de Launchpad para asociar con la rama."
7083
7085
7084
#: bzrlib/plugins/launchpad/__init__.py:113
7086
#: bzrlib/plugins/launchpad/cmds.py:76
7085
7087
msgid ""
7086
7088
"Short name for the branch; by default taken from the last component of the "
7087
7089
"url."
7088
7090
msgstr ""
7089
7091
7090
#: bzrlib/plugins/launchpad/__init__.py:117
7092
#: bzrlib/plugins/launchpad/cmds.py:80
7091
7093
msgid "One-sentence description of the branch."
7092
7094
msgstr ""
7093
7095
7094
#: bzrlib/plugins/launchpad/__init__.py:120
7096
#: bzrlib/plugins/launchpad/cmds.py:83
7095
7097
msgid "Longer description of the purpose or contents of the branch."
7096
7098
msgstr ""
7097
7099
7098
#: bzrlib/plugins/launchpad/__init__.py:123
7100
#: bzrlib/plugins/launchpad/cmds.py:86
7099
7101
msgid "Branch author's email address, if not yourself."
7100
7102
msgstr ""
7101
7103
7102
#: bzrlib/plugins/launchpad/__init__.py:126
7104
#: bzrlib/plugins/launchpad/cmds.py:89
7103
7105
msgid "The bug this branch fixes."
7104
7106
msgstr "El error que arregla esta rama."
7105
7107
7106
#: bzrlib/plugins/launchpad/__init__.py:129
7108
#: bzrlib/plugins/launchpad/cmds.py:92
7107
7109
msgid "Prepare the request but don't actually send it."
7108
7110
msgstr ""
7109
7111
7110
#: bzrlib/plugins/launchpad/__init__.py:151
7112
#: bzrlib/plugins/launchpad/cmds.py:114
7111
7113
msgid ""
7112
7114
"register-branch requires a public branch url - see bzr help register-branch."
7113
7115
msgstr ""
7114
7116
7115
#: bzrlib/plugins/launchpad/__init__.py:159
7117
#: bzrlib/plugins/launchpad/cmds.py:122
7116
7118
msgid "--product is deprecated; please use --project."
7117
7119
msgstr ""
7118
7120
7119
#: bzrlib/plugins/launchpad/__init__.py:191
7121
#: bzrlib/plugins/launchpad/cmds.py:152
7120
7122
msgid "Open a Launchpad branch page in your web browser."
7121
7123
msgstr "Abrir una página de rama de Launchpad en su navegador web."
7122
7124
7123
#: bzrlib/plugins/launchpad/__init__.py:196
7125
#: bzrlib/plugins/launchpad/cmds.py:157
7124
7126
msgid "Do not actually open the browser. Just say the URL we would use."
7125
7127
msgstr ""
7126
7128
7127
#: bzrlib/plugins/launchpad/__init__.py:231
7129
#: bzrlib/plugins/launchpad/cmds.py:192
7128
7130
#, python-format
7129
7131
msgid "Opening %s in web browser"
7130
7132
msgstr ""
7131
7133
7132
#: bzrlib/plugins/launchpad/__init__.py:241
7134
#: bzrlib/plugins/launchpad/cmds.py:200
7133
7135
msgid "Show or set the Launchpad user ID."
7134
7136
msgstr "Mostrar o establecer el ID de usuario de Launchpad."
7135
7137
7136
#: bzrlib/plugins/launchpad/__init__.py:243
7138
#: bzrlib/plugins/launchpad/cmds.py:202
7137
7139
msgid ""
7138
7140
"When communicating with Launchpad, some commands need to know your\n"
7139
7141
"Launchpad user ID. This command can be used to set or show the\n"
7140
7142
"user ID that Bazaar will use for such communication."
7141
7143
msgstr ""
7142
7144
7143
#: bzrlib/plugins/launchpad/__init__.py:247
7145
#: bzrlib/plugins/launchpad/cmds.py:206
7144
7146
msgid ""
7145
7147
":Examples:\n"
7146
7148
" Show the Launchpad ID of the current user::"
7147
7149
msgstr ""
7148
7150
7149
#: bzrlib/plugins/launchpad/__init__.py:250
7151
#: bzrlib/plugins/launchpad/cmds.py:209
7150
7152
msgid " bzr launchpad-login"
7151
7153
msgstr " bzr launchpad-login"
7152
7154
7153
#: bzrlib/plugins/launchpad/__init__.py:252
7155
#: bzrlib/plugins/launchpad/cmds.py:211
7154
7156
msgid " Set the Launchpad ID of the current user to 'bob'::"
7155
7157
msgstr ""
7156
7158
7157
#: bzrlib/plugins/launchpad/__init__.py:254
7159
#: bzrlib/plugins/launchpad/cmds.py:213
7158
7160
msgid " bzr launchpad-login bob"
7159
7161
msgstr " bzr launchpad-login bob"
7160
7162
7161
#: bzrlib/plugins/launchpad/__init__.py:261
7163
#: bzrlib/plugins/launchpad/cmds.py:220
7162
7164
msgid "Don't check that the user name is valid."
7163
7165
msgstr "No comprueba que el nombre de usuario sea válido."
7164
7166
7165
#: bzrlib/plugins/launchpad/__init__.py:276
7166
#: bzrlib/plugins/launchpad/__init__.py:287
7167
#: bzrlib/plugins/launchpad/cmds.py:235 bzrlib/plugins/launchpad/cmds.py:246
7167
7168
msgid "Launchpad user ID exists and has SSH keys.\n"
7168
7169
msgstr ""
7169
7170
7170
#: bzrlib/plugins/launchpad/__init__.py:279
7171
#: bzrlib/plugins/launchpad/cmds.py:238
7171
7172
msgid "No Launchpad user ID configured.\n"
7172
7173
msgstr ""
7173
7174
7174
#: bzrlib/plugins/launchpad/__init__.py:290
7175
#: bzrlib/plugins/launchpad/cmds.py:249
7175
7176
#, python-format
7176
7177
msgid "Launchpad user ID set to '%s'.\n"
7177
7178
msgstr ""
7178
7179
7179
#: bzrlib/plugins/launchpad/__init__.py:298
7180
#: bzrlib/plugins/launchpad/cmds.py:255
7180
7181
msgid "Ask Launchpad to mirror a branch now."
7181
7182
msgstr ""
7182
7183
7183
#: bzrlib/plugins/launchpad/__init__.py:318
7184
#: bzrlib/plugins/launchpad/cmds.py:272
7184
7185
msgid "Propose merging a branch on Launchpad."
7185
7186
msgstr ""
7186
7187
7187
#: bzrlib/plugins/launchpad/__init__.py:320
7188
#: bzrlib/plugins/launchpad/cmds.py:274
7188
7189
msgid ""
7189
7190
"This will open your usual editor to provide the initial comment. When it\n"
7190
7191
"has created the proposal, it will open it in your default web browser."
7191
7192
msgstr ""
7192
7193
7193
#: bzrlib/plugins/launchpad/__init__.py:323
7194
#: bzrlib/plugins/launchpad/cmds.py:277
7194
7195
msgid ""
7195
7196
"The branch will be proposed to merge into SUBMIT_BRANCH. If SUBMIT_BRANCH\n"
7196
7197
"is not supplied, the remembered submit branch will be used. If no submit\n"
7197
7198
"branch is remembered, the development focus will be used."
7198
7199
msgstr ""
7199
7200
7200
#: bzrlib/plugins/launchpad/__init__.py:327
7201
#: bzrlib/plugins/launchpad/cmds.py:281
7201
7202
msgid ""
7202
7203
"By default, the SUBMIT_BRANCH's review team will be requested to review\n"
7203
7204
"the merge proposal. This can be overriden by specifying --review (-R).\n"
7205
7206
"may optionally be followed by '=' and the review type. For example:"
7206
7207
msgstr ""
7207
7208
7208
#: bzrlib/plugins/launchpad/__init__.py:332
7209
#: bzrlib/plugins/launchpad/cmds.py:286
7209
7210
msgid " bzr lp-propose-merge --review jrandom --review review-team=qa"
7210
7211
msgstr " bzr lp-propose-merge --review jrandom --review review-team=qa"
7211
7212
7212
#: bzrlib/plugins/launchpad/__init__.py:334
7213
#: bzrlib/plugins/launchpad/cmds.py:288
7213
7214
msgid ""
7214
7215
"This will propose a merge, request \"jrandom\" to perform a review of\n"
7215
7216
"unspecified type, and request \"review-team\" to perform a \"qa\" review."
7216
7217
msgstr ""
7217
7218
7218
#: bzrlib/plugins/launchpad/__init__.py:339
7219
#: bzrlib/plugins/launchpad/cmds.py:293
7219
7220
msgid "Propose the merge on staging."
7220
7221
msgstr ""
7221
7222
7222
#: bzrlib/plugins/launchpad/__init__.py:341
7223
#: bzrlib/plugins/launchpad/cmds.py:295
7223
7224
msgid "Commit message."
7224
7225
msgstr "Mensaje de ejecución."
7225
7226
7226
#: bzrlib/plugins/launchpad/__init__.py:343
7227
#: bzrlib/plugins/launchpad/cmds.py:297
7227
7228
msgid "Mark the proposal as approved immediately."
7228
7229
msgstr "Marcar el propuesto como aprobado inmediatamente."
7229
7230
7231
7232
msgid "The bug this proposal fixes."
7232
7233
msgstr ""
7233
7234
7234
#: bzrlib/plugins/launchpad/__init__.py:345
7235
#: bzrlib/plugins/launchpad/cmds.py:300
7235
7236
msgid "Requested reviewer and optional type."
7236
7237
msgstr "Revisor solicitado y tipo opcional."
7237
7238
7238
#: bzrlib/plugins/launchpad/__init__.py:382
7239
#: bzrlib/plugins/launchpad/cmds.py:335
7239
7240
msgid "Find the proposal to merge this revision."
7240
7241
msgstr "Buscar el propuesto para fusionar esta revisión."
7241
7242
7242
#: bzrlib/plugins/launchpad/__init__.py:384
7243
#: bzrlib/plugins/launchpad/cmds.py:337
7243
7244
msgid ""
7244
7245
"Finds the merge proposal(s) that discussed landing the specified revision.\n"
7245
7246
"This works only if the selected branch was the merge proposal target, and\n"
7247
7248
"are opened in a web browser."
7248
7249
msgstr ""
7249
7250
7250
#: bzrlib/plugins/launchpad/__init__.py:389
7251
#: bzrlib/plugins/launchpad/cmds.py:342
7251
7252
msgid ""
7252
7253
"Any revision involved in the merge may be specified-- the revision in\n"
7253
7254
"which the merge was performed, or one of the revisions that was merged."
7254
7255
msgstr ""
7255
7256
7256
#: bzrlib/plugins/launchpad/__init__.py:392
7257
#: bzrlib/plugins/launchpad/cmds.py:345
7257
7258
msgid "So, to find the merge proposal that reviewed line 1 of README::"
7258
7259
msgstr ""
7259
7260
7260
#: bzrlib/plugins/launchpad/__init__.py:394
7261
#: bzrlib/plugins/launchpad/cmds.py:347
7261
7262
msgid " bzr lp-find-proposal -r annotate:README:1"
7262
7263
msgstr " bzr lp-find-proposal -r annotate:README:1"
7263
7264
7264
#: bzrlib/plugins/launchpad/__init__.py:409
7265
#: bzrlib/plugins/launchpad/cmds.py:363
7265
7266
msgid "No review found."
7266
7267
msgstr ""
7267
7268
7268
#: bzrlib/plugins/launchpad/__init__.py:410
7269
#: bzrlib/plugins/launchpad/cmds.py:364
7269
7270
#, python-format
7270
7271
msgid "%d proposals(s) found."
7271
7272
msgstr ""
7272
7273
7273
#: bzrlib/plugins/launchpad/__init__.py:420
7274
#: bzrlib/plugins/launchpad/cmds.py:374
7274
7275
msgid "Finding revision-id"
7275
7276
msgstr ""
7276
7277
7277
#: bzrlib/plugins/launchpad/__init__.py:427
7278
#: bzrlib/plugins/launchpad/cmds.py:381
7278
7279
msgid "Finding merge"
7279
7280
msgstr ""
7280
7281
7281
#: bzrlib/plugins/launchpad/__init__.py:432
7282
#: bzrlib/plugins/launchpad/cmds.py:386
7282
7283
msgid "Finding revno"
7283
7284
msgstr ""
7284
7285
7285
#: bzrlib/plugins/launchpad/__init__.py:437
7286
#: bzrlib/plugins/launchpad/cmds.py:392
7286
7287
msgid "Finding Launchpad branch"
7287
7288
msgstr ""
7288
7289
7289
#: bzrlib/plugins/launchpad/__init__.py:440
7290
#: bzrlib/plugins/launchpad/cmds.py:395
7290
7291
msgid "Finding proposals"
7291
7292
msgstr ""
7292
7293
7333
7334
" remote: {2}"
7334
7335
msgstr ""
7335
7336
7336
#: bzrlib/plugins/launchpad/lp_propose.py:149
7337
#: bzrlib/plugins/launchpad/lp_propose.py:150
7337
7338
#, python-format
7338
7339
msgid "There is already a branch merge proposal: %s"
7339
7340
msgstr ""
7340
7341
7341
#: bzrlib/plugins/weave_fmt/bzrdir.py:236
7342
#: bzrlib/plugins/weave_fmt/bzrdir.py:237
7342
7343
msgid "pb parameter to convert() is deprecated"
7343
7344
msgstr ""
7344
7345
7345
#: bzrlib/plugins/weave_fmt/bzrdir.py:239
7346
#: bzrlib/plugins/weave_fmt/bzrdir.py:240
7346
7347
msgid "starting upgrade from format 4 to 5"
7347
7348
msgstr ""
7348
7349
7349
#: bzrlib/plugins/weave_fmt/bzrdir.py:249
7350
#: bzrlib/plugins/weave_fmt/bzrdir.py:250
7350
7351
msgid "note: upgrade may be faster if all store files are ungzipped first"
7351
7352
msgstr ""
7352
7353
7353
#: bzrlib/plugins/weave_fmt/bzrdir.py:278
7354
#: bzrlib/plugins/weave_fmt/bzrdir.py:279
7354
7355
msgid "converting revision"
7355
7356
msgstr ""
7356
7357
7357
#: bzrlib/plugins/weave_fmt/bzrdir.py:283
7358
#: bzrlib/plugins/weave_fmt/bzrdir.py:284
7358
7359
msgid "upgraded to weaves:"
7359
7360
msgstr ""
7360
7361
7361
#: bzrlib/plugins/weave_fmt/bzrdir.py:284
7362
#: bzrlib/plugins/weave_fmt/bzrdir.py:285
7362
7363
#, python-format
7363
7364
msgid "%6d revisions and inventories"
7364
7365
msgstr ""
7365
7366
7366
#: bzrlib/plugins/weave_fmt/bzrdir.py:286
7367
#: bzrlib/plugins/weave_fmt/bzrdir.py:287
7367
7368
#, python-format
7368
7369
msgid "%6d revisions not present"
7369
7370
msgstr ""
7370
7371
7371
#: bzrlib/plugins/weave_fmt/bzrdir.py:288
7372
#: bzrlib/plugins/weave_fmt/bzrdir.py:289
7372
7373
#, python-format
7373
7374
msgid "%6d texts"
7374
7375
msgstr ""
7375
7376
7376
#: bzrlib/plugins/weave_fmt/bzrdir.py:324
7377
#: bzrlib/plugins/weave_fmt/bzrdir.py:325
7377
7378
msgid "writing weave"
7378
7379
msgstr ""
7379
7380
7380
#: bzrlib/plugins/weave_fmt/bzrdir.py:328
7381
#: bzrlib/plugins/weave_fmt/bzrdir.py:330
7381
#: bzrlib/plugins/weave_fmt/bzrdir.py:329
7382
#: bzrlib/plugins/weave_fmt/bzrdir.py:331
7382
7383
msgid "inventory"
7383
7384
msgstr ""
7384
7385
7385
#: bzrlib/plugins/weave_fmt/bzrdir.py:347
7386
#: bzrlib/plugins/weave_fmt/bzrdir.py:348
7386
7387
msgid "write revision"
7387
7388
msgstr ""
7388
7389
7389
#: bzrlib/plugins/weave_fmt/bzrdir.py:361
7390
#: bzrlib/plugins/weave_fmt/bzrdir.py:362
7390
7391
msgid "loading revision"
7391
7392
msgstr ""
7392
7393
7393
#: bzrlib/plugins/weave_fmt/bzrdir.py:366
7394
#: bzrlib/plugins/weave_fmt/bzrdir.py:367
7394
7395
#, python-format
7395
7396
msgid "revision {%s} not present in branch; will be converted as a ghost"
7396
7397
msgstr ""
7397
7398
7398
#: bzrlib/plugins/weave_fmt/bzrdir.py:506
7399
#: bzrlib/plugins/weave_fmt/bzrdir.py:507
7399
7400
msgid "starting upgrade from format 5 to 6"
7400
7401
msgstr ""
7401
7402
7402
#: bzrlib/plugins/weave_fmt/bzrdir.py:516
7403
#: bzrlib/plugins/weave_fmt/bzrdir.py:517
7403
7404
#, python-format
7404
7405
msgid "adding prefixes to %s"
7405
7406
msgstr ""
7406
7407
7407
#: bzrlib/plugins/weave_fmt/bzrdir.py:556
7408
#: bzrlib/plugins/weave_fmt/bzrdir.py:557
7408
7409
msgid "starting upgrade from format 6 to metadir"
7409
7410
msgstr ""
7410
7411
7411
#: bzrlib/plugins/weave_fmt/bzrdir.py:564
7412
#: bzrlib/plugins/weave_fmt/bzrdir.py:565
7412
7413
msgid "Removing ancestry.weave"
7413
7414
msgstr ""
7414
7415
7415
#: bzrlib/plugins/weave_fmt/bzrdir.py:569
7416
#: bzrlib/plugins/weave_fmt/bzrdir.py:570
7416
7417
msgid "Finding branch files"
7417
7418
msgstr ""
7418
7419
7419
#: bzrlib/plugins/weave_fmt/bzrdir.py:579
7420
#: bzrlib/plugins/weave_fmt/bzrdir.py:580
7420
7421
msgid "Upgrading repository"
7421
7422
msgstr ""
7422
7423
7423
#: bzrlib/plugins/weave_fmt/bzrdir.py:589
7424
#: bzrlib/plugins/weave_fmt/bzrdir.py:590
7424
7425
msgid "Upgrading branch"
7425
7426
msgstr ""
7426
7427
7427
#: bzrlib/plugins/weave_fmt/bzrdir.py:612
7428
#: bzrlib/plugins/weave_fmt/bzrdir.py:613
7428
7429
msgid "No working tree."
7429
7430
msgstr ""
7430
7431
7431
#: bzrlib/plugins/weave_fmt/bzrdir.py:619
7432
#: bzrlib/plugins/weave_fmt/bzrdir.py:620
7432
7433
msgid "Upgrading working tree"
7433
7434
msgstr ""
7434
7435
7435
#: bzrlib/plugins/weave_fmt/bzrdir.py:640
7436
#: bzrlib/plugins/weave_fmt/bzrdir.py:641
7436
7437
#, python-format
7437
7438
msgid "Make %s lock"
7438
7439
msgstr ""
7439
7440
7440
#: bzrlib/plugins/weave_fmt/bzrdir.py:651
7441
#: bzrlib/plugins/weave_fmt/bzrdir.py:652
7441
7442
#, python-format
7442
7443
msgid "Moving %s"
7443
7444
msgstr ""
7464
7465
msgid "Too many redirections trying to make %s."
7465
7466
msgstr ""
7466
7467
7467
#: bzrlib/push.py:147
7468
#: bzrlib/push.py:148
7468
7469
msgid ""
7469
7470
"These branches have diverged. See \"bzr help diverged-branches\" for more "
7470
7471
"information."
7471
7472
msgstr ""
7472
7473
7473
#: bzrlib/push.py:151
7474
#: bzrlib/push.py:152
7474
7475
#, python-format
7475
7476
msgid ""
7476
7477
"It is not possible to losslessly push to %s. You may want to use dpush "
7477
7478
"instead."
7478
7479
msgstr ""
7479
7480
7480
#: bzrlib/push.py:157
7481
#: bzrlib/push.py:158
7481
7482
#, python-format
7482
7483
msgid ""
7483
7484
"At %s you have a valid .bzr control directory, but not a branch or "
7578
7579
msgid "bzr: ERROR (ignored): %s"
7579
7580
msgstr "bzr: ERROR (ignorado): %s"
7580
7581
7581
#: bzrlib/remote.py:2541
7582
#: bzrlib/remote.py:2534
7582
7583
msgid "Copying repository content as tarball..."
7583
7584
msgstr ""
7584
7585
7594
7595
msgid "{0} => {1}"
7595
7596
msgstr "{0} => {1}"
7596
7597
7597
#: bzrlib/repository.py:1787
7598
#: bzrlib/repository.py:1738
7598
7599
msgid "Moving repository to repository.backup"
7599
7600
msgstr ""
7600
7601
7601
#: bzrlib/repository.py:1794
7602
#: bzrlib/repository.py:1745
7602
7603
msgid "Creating new repository"
7603
7604
msgstr "Creando repositorio nuevo"
7604
7605
7605
#: bzrlib/repository.py:1799
7606
#: bzrlib/repository.py:1750
7606
7607
msgid "Copying content"
7607
7608
msgstr "Copiar contenido"
7608
7609
7609
#: bzrlib/repository.py:1803
7610
#: bzrlib/repository.py:1754
7610
7611
msgid "Deleting old repository content"
7611
7612
msgstr ""
7612
7613
7613
#: bzrlib/repository.py:1805
7614
#: bzrlib/repository.py:1756
7614
7615
msgid "repository converted"
7615
7616
msgstr "repositorio convertido"
7616
7617
7618
7619
msgid "Using {0} {1}"
7619
7620
msgstr "Usando {0} {1}"
7620
7621
7621
#: bzrlib/send.py:58
7622
#: bzrlib/send.py:59
7622
7623
#, python-format
7623
7624
msgid "Mail client \"%s\" does not support specifying body"
7624
7625
msgstr ""
7625
7626
7626
#: bzrlib/send.py:62
7627
#: bzrlib/send.py:63
7627
7628
msgid "--remember requires a branch to be specified."
7628
7629
msgstr ""
7629
7630
7630
#: bzrlib/send.py:77
7631
#: bzrlib/send.py:78
7631
7632
msgid "No submit branch known or specified"
7632
7633
msgstr ""
7633
7634
7634
#: bzrlib/send.py:80
7635
#: bzrlib/send.py:81
7635
7636
msgid "Using saved {0} location \"{1}\" to determine what changes to submit."
7636
7637
msgstr ""
7637
7638
7638
#: bzrlib/send.py:98
7639
#: bzrlib/send.py:99
7639
7640
#, python-format
7640
7641
msgid "No such send format '%s'."
7641
7642
msgstr ""
7642
7643
7643
#: bzrlib/send.py:114
7644
#: bzrlib/send.py:115
7644
7645
msgid "bzr send takes at most two one revision identifiers"
7645
7646
msgstr ""
7646
7647
7647
#: bzrlib/send.py:127
7648
#: bzrlib/send.py:128
7648
7649
msgid "No revisions to submit."
7649
7650
msgstr "No hay revisiones para enviar."
7650
7651
7651
#: bzrlib/send.py:139
7652
#: bzrlib/send.py:140
7652
7653
msgid ""
7653
7654
"- not supported for merge directives that use more than one output file."
7654
7655
msgstr ""
7655
7656
7656
#: bzrlib/send.py:185
7657
#: bzrlib/send.py:186
7657
7658
msgid "Format 0.9 does not permit bundle with no patch"
7658
7659
msgstr ""
7659
7660
7810
7811
"anyway, use --force."
7811
7812
msgstr ""
7812
7813
7813
#: bzrlib/switch.py:125
7814
#: bzrlib/switch.py:129
7814
7815
msgid "Cannot switch a branch, only a checkout."
7815
7816
msgstr ""
7816
7817
7817
#: bzrlib/switch.py:163
7818
#: bzrlib/switch.py:167
7818
7819
#, python-format
7819
7820
msgid "Tree is up to date at revision %d."
7820
7821
msgstr ""
7821
7822
7822
#: bzrlib/switch.py:169
7823
#: bzrlib/switch.py:173
7823
7824
#, python-format
7824
7825
msgid "Updated to revision %d."
7825
7826
msgstr ""
7826
7827
7827
#: bzrlib/transform.py:1734 bzrlib/transform.py:1745 bzrlib/transform.py:1747
7828
#: bzrlib/transform.py:1723 bzrlib/transform.py:1734 bzrlib/transform.py:1736
7828
7829
msgid "Apply phase"
7829
7830
msgstr "Aplicar fase"
7830
7831
7831
#: bzrlib/transform.py:1773 bzrlib/transform.py:1841
7832
#: bzrlib/transform.py:1762 bzrlib/transform.py:1830
7832
7833
msgid "removing file"
7833
7834
msgstr "eliminar archivo"
7834
7835
7835
#: bzrlib/transform.py:1791 bzrlib/transform.py:1876
7836
#: bzrlib/transform.py:1780 bzrlib/transform.py:1865
7836
7837
msgid "adding file"
7837
7838
msgstr "añadiendo archivo"
7838
7839
7839
#: bzrlib/transform.py:2591
7840
#: bzrlib/transform.py:2598
7840
7841
msgid "Building tree"
7841
7842
msgstr "Construyendo árbol"
7842
7843
7843
#: bzrlib/transform.py:2681 bzrlib/transform.py:2708
7844
#: bzrlib/transform.py:2688 bzrlib/transform.py:2715
7844
7845
msgid "Adding file contents"
7845
7846
msgstr "Añadiendo contenidos de archivo"
7846
7847
7847
#: bzrlib/transform.py:3028
7848
#: bzrlib/transform.py:3017
7848
7849
msgid "Resolution pass"
7849
7850
msgstr ""
7850
7851
7853
7854
msgid "Authenticated as %s"
7854
7855
msgstr ""
7855
7856
7856
#: bzrlib/tree.py:634
7857
#: bzrlib/tree.py:647
7857
7858
msgid "*** {0} content-filter: {1} => {2!r}"
7858
7859
msgstr ""
7859
7860
7912
7913
msgid "failed to clean-up {0}: {1}"
7913
7914
msgstr ""
7914
7915
7915
#: bzrlib/vf_repository.py:1090
7916
#: bzrlib/vf_repository.py:1091
7916
7917
msgid "inventories"
7917
7918
msgstr ""
7918
7919
7919
#: bzrlib/vf_repository.py:1116
7920
#: bzrlib/vf_repository.py:1117
7920
7921
msgid "texts"
7921
7922
msgstr "textos"
7922
7923
7923
#: bzrlib/vf_repository.py:1621 bzrlib/vf_repository.py:1630
7924
#: bzrlib/vf_repository.py:1622 bzrlib/vf_repository.py:1631
7924
7925
msgid "Calculating text parents"
7925
7926
msgstr ""
7926
7927
7927
#: bzrlib/vf_repository.py:1706
7928
#: bzrlib/vf_repository.py:1707
7928
7929
msgid "Fetch texts"
7929
7930
msgstr ""
7930
7931
7931
#: bzrlib/vf_repository.py:2535
7932
#: bzrlib/vf_repository.py:2536
7932
7933
msgid "loading text store"
7933
7934
msgstr ""
7934
7935
7935
#: bzrlib/vf_repository.py:2541
7936
#: bzrlib/vf_repository.py:2542
7936
7937
msgid "checking text graph"
7937
7938
msgstr ""
7938
7939
7939
#: bzrlib/vf_repository.py:2995 bzrlib/vf_repository.py:3009
7940
#: bzrlib/vf_repository.py:3124
7940
#: bzrlib/vf_repository.py:2998 bzrlib/vf_repository.py:3012
7941
#: bzrlib/vf_repository.py:3127
7941
7942
msgid "Transferring revisions"
7942
7943
msgstr ""
7943
7944
7983
7984
msgid "PageFaultCount %8d"
7984
7985
msgstr ""
7985
7986
7986
#: bzrlib/workingtree.py:1478
7987
#: bzrlib/workingtree.py:1482
7987
7988
msgid "Rerun update after fixing the conflicts."
7988
7989
msgstr ""
7989
7990
7993
7994
7994
7995
#: dummy/help_topics/basic/detail.txt:1
7995
7996
msgid ""
7996
"Bazaar 2.6.0dev1 -- a free distributed version-control tool\n"
7997
"Bazaar 2.6b2 -- a free distributed version-control tool\n"
7997
7998
"http://bazaar.canonical.com/"
7998
7999
msgstr ""
7999
8000
8313
8314
msgid "How to fix diverged branches"
8314
8315
msgstr ""
8315
8316
8316
#: dummy/help_topics/env-variables/detail.txt:1
8317
msgid "Environment Variables"
8318
msgstr "Variables de entorno"
8319
8320
#: dummy/help_topics/env-variables/detail.txt:3
8321
msgid ""
8322
"=================== "
8323
"===========================================================\n"
8324
"BZRPATH Path where bzr is to look for shell plugin external\n"
8325
" commands.\n"
8326
"BZR_EMAIL E-Mail address of the user. Overrides EMAIL.\n"
8327
"EMAIL E-Mail address of the user.\n"
8328
"BZR_EDITOR Editor for editing commit messages. Overrides EDITOR.\n"
8329
"EDITOR Editor for editing commit messages.\n"
8330
"BZR_PLUGIN_PATH Paths where bzr should look for plugins.\n"
8331
"BZR_DISABLE_PLUGINS Plugins that bzr should not load.\n"
8332
"BZR_PLUGINS_AT Plugins to load from a directory not in "
8333
"BZR_PLUGIN_PATH.\n"
8334
"BZR_HOME Directory holding .bazaar config dir. Overrides HOME.\n"
8335
"BZR_HOME (Win32) Directory holding bazaar config dir. Overrides APPDATA "
8336
"and\n"
8337
" HOME.\n"
8338
"BZR_REMOTE_PATH Full name of remote 'bzr' command (for bzr+ssh:// "
8339
"URLs).\n"
8340
"BZR_SSH Path to SSH client, or one of paramiko, openssh, "
8341
"sshcorp,\n"
8342
" plink or lsh.\n"
8343
"BZR_LOG Location of .bzr.log (use '/dev/null' to suppress log).\n"
8344
"BZR_LOG (Win32) Location of .bzr.log (use 'NUL' to suppress log).\n"
8345
"BZR_COLUMNS Override implicit terminal width.\n"
8346
"BZR_CONCURRENCY Number of processes that can be run concurrently "
8347
"(selftest)\n"
8348
"BZR_PROGRESS_BAR Override the progress display. Values are 'none' or "
8349
"'text'.\n"
8350
"BZR_PDB Control whether to launch a debugger on error.\n"
8351
"BZR_SIGQUIT_PDB Control whether SIGQUIT behaves normally or invokes a\n"
8352
" breakin debugger.\n"
8353
"BZR_TEXTUI_INPUT Force console input mode for prompts to line-based "
8354
"(instead\n"
8355
" of char-based).\n"
8356
"=================== "
8357
"===========================================================\n"
8358
msgstr ""
8359
8360
8317
#: dummy/help_topics/env-variables/summary.txt:1
8361
8318
msgid "Environment variable names and values"
8362
8319
msgstr "Nombres y valores de variables de entorno"
9418
9375
msgid " bzr commit --fixes <tracker>:<id>"
9419
9376
msgstr " bzr commit --fixes <tracker>:<id>"
9420
9377
9421
#: en/help_topics/bugs.txt:13 en/help_topics/configuration.txt:398
9378
#: en/help_topics/bugs.txt:13 en/help_topics/configuration.txt:410
9422
9379
msgid "or::"
9423
9380
msgstr "o::"
9424
9381
9671
9628
"remove-tree Remove the working tree from a given branch/checkout.\n"
9672
9629
"renames Show list of renamed files.\n"
9673
9630
"resolve Mark a conflict as resolved.\n"
9674
"revert Revert files to a previous revision.\n"
9631
"revert Set files in the working tree back to the contents of a\n"
9632
" previous revision.\n"
9675
9633
"revno Show current revision number.\n"
9676
9634
"root Show the tree root directory.\n"
9677
9635
"send Mail or create a merge-directive for submitting changes.\n"
10395
10353
10396
10354
#: en/help_topics/configuration.txt:336
10397
10355
msgid ""
10356
"Another such option is ``branchname``, which refers to the name of a "
10357
"colocated\n"
10358
"branch. For non-colocated branches, it behaves like basename. It can be "
10359
"used\n"
10360
"like this::"
10361
msgstr ""
10362
10363
#: en/help_topics/configuration.txt:340
10364
msgid ""
10365
" [/home/vila/src/bzr/bugs]\n"
10366
" mypush = lp:~vila/bzr/{branchname}"
10367
msgstr ""
10368
10369
#: en/help_topics/configuration.txt:343
10370
msgid ""
10371
"When used with a colocated branch named ``832013-expand-in-stack``, we'll "
10372
"get::"
10373
msgstr ""
10374
10375
#: en/help_topics/configuration.txt:345
10376
msgid ""
10377
" bzr config mypush\n"
10378
" lp:~vila/bzr/832013-expand-in-stack"
10379
msgstr ""
10380
10381
#: en/help_topics/configuration.txt:348
10382
msgid ""
10398
10383
"When an option is local to a Section, it cannot be referred to from option\n"
10399
10384
"values in any other section from the same ``Store`` nor from any other\n"
10400
10385
"``Store``."
10401
10386
msgstr ""
10402
10387
10403
#: en/help_topics/configuration.txt:340
10388
#: en/help_topics/configuration.txt:352
10404
10389
msgid ""
10405
10390
"\n"
10406
10391
"The main configuration file, bazaar.conf\n"
10410
10395
"El archivo de configuración principal, bazaar.conf\n"
10411
10396
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
10412
10397
10413
#: en/help_topics/configuration.txt:344
10398
#: en/help_topics/configuration.txt:356
10414
10399
msgid ""
10415
10400
"``bazaar.conf`` allows two sections: ``[DEFAULT]`` and ``[ALIASES]``.\n"
10416
10401
"The default section contains the default\n"
10418
10403
"overriden by providing a branch-specific section in ``locations.conf``."
10419
10404
msgstr ""
10420
10405
10421
#: en/help_topics/configuration.txt:349
10406
#: en/help_topics/configuration.txt:361
10422
10407
msgid "A typical ``bazaar.conf`` section often looks like the following::"
10423
10408
msgstr ""
10424
10409
10425
#: en/help_topics/configuration.txt:351
10410
#: en/help_topics/configuration.txt:363
10426
10411
msgid ""
10427
10412
" [DEFAULT]\n"
10428
10413
" email = John Doe <jdoe@isp.com>\n"
10434
10419
" editor = /usr/bin/vim\n"
10435
10420
" create_signatures = when-required"
10436
10421
10437
#: en/help_topics/configuration.txt:356
10422
#: en/help_topics/configuration.txt:368
10438
10423
msgid ""
10439
10424
"\n"
10440
10425
"The branch location configuration file, locations.conf\n"
10444
10429
"El archivo de ubicación de la rama, locations.conf\n"
10445
10430
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
10446
10431
10447
#: en/help_topics/configuration.txt:360
10432
#: en/help_topics/configuration.txt:372
10448
10433
msgid ""
10449
10434
"``locations.conf`` allows one to specify overriding settings for\n"
10450
10435
"a specific branch. The format is almost identical to the default section in\n"
10454
10439
"for. The '?' and '*' wildcards are supported::"
10455
10440
msgstr ""
10456
10441
10457
#: en/help_topics/configuration.txt:366
10442
#: en/help_topics/configuration.txt:378
10458
10443
msgid ""
10459
10444
" [/home/jdoe/branches/nethack]\n"
10460
10445
" email = Nethack Admin <nethack@nethack.com>"
10462
10447
" [/home/jdado/ramas/nethack]\n"
10463
10448
" email = Nethack Admin <nethack@nethack.com>"
10464
10449
10465
#: en/help_topics/configuration.txt:369
10450
#: en/help_topics/configuration.txt:381
10466
10451
msgid ""
10467
10452
" [http://hypothetical.site.com/branches/devel-branch]\n"
10468
10453
" create_signatures = always"
10470
10455
" [http://hypothetical.site.com/branches/devel-branch]\n"
10471
10456
" create_signatures = always"
10472
10457
10473
#: en/help_topics/configuration.txt:372
10458
#: en/help_topics/configuration.txt:384
10474
10459
msgid ""
10475
10460
"The authentication configuration file, authentication.conf\n"
10476
10461
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
10478
10463
"El archivo de configuración de la autenticación, authentication.conf\n"
10479
10464
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
10480
10465
10481
#: en/help_topics/configuration.txt:375
10466
#: en/help_topics/configuration.txt:387
10482
10467
msgid ""
10483
10468
"``authentication.conf`` allows one to specify credentials for\n"
10484
10469
"remote servers. This can be used for all the supported transports and any "
10486
10471
"of bzr that requires authentication (smtp for example)."
10487
10472
msgstr ""
10488
10473
10489
#: en/help_topics/configuration.txt:379
10474
#: en/help_topics/configuration.txt:391
10490
10475
msgid ""
10491
10476
"The syntax of the file obeys the same rules as the others except for the\n"
10492
10477
"option policies which don't apply."
10493
10478
msgstr ""
10494
10479
10495
#: en/help_topics/configuration.txt:382
10480
#: en/help_topics/configuration.txt:394
10496
10481
msgid ""
10497
10482
"For more information on the possible uses of the authentication "
10498
10483
"configuration\n"
10499
10484
"file see :doc:`authentication-help`."
10500
10485
msgstr ""
10501
10486
10502
#: en/help_topics/configuration.txt:385
10487
#: en/help_topics/configuration.txt:397
10503
10488
msgid ""
10504
10489
"\n"
10505
10490
"Common options\n"
10506
10491
"--------------"
10507
10492
msgstr ""
10508
10493
10509
#: en/help_topics/configuration.txt:389
10494
#: en/help_topics/configuration.txt:401
10510
10495
msgid ""
10511
10496
"debug_flags\n"
10512
10497
"~~~~~~~~~~~"
10514
10499
"debug_flags\n"
10515
10500
"~~~~~~~~~~~"
10516
10501
10517
#: en/help_topics/configuration.txt:392
10502
#: en/help_topics/configuration.txt:404
10518
10503
msgid ""
10519
10504
"A comma-separated list of debugging options to turn on. The same values\n"
10520
10505
"can be used as with the -D command-line option (see `help global-options`).\n"
10521
10506
"For example::"
10522
10507
msgstr ""
10523
10508
10524
#: en/help_topics/configuration.txt:396
10509
#: en/help_topics/configuration.txt:408
10525
10510
msgid " debug_flags = hpss"
10526
10511
msgstr " debug_flags = hpss"
10527
10512
10528
#: en/help_topics/configuration.txt:400
10513
#: en/help_topics/configuration.txt:412
10529
10514
msgid " debug_flags = hpss,evil"
10530
10515
msgstr " debug_flags = hpss,evil"
10531
10516
10532
#: en/help_topics/configuration.txt:402
10517
#: en/help_topics/configuration.txt:414
10533
10518
msgid ""
10534
10519
"email\n"
10535
10520
"~~~~~"
10537
10522
"correo\n"
10538
10523
"~~~~~"
10539
10524
10540
#: en/help_topics/configuration.txt:405
10525
#: en/help_topics/configuration.txt:417
10541
10526
msgid ""
10542
10527
"The email address to use when committing a branch. Typically takes the form\n"
10543
10528
"of::"
10544
10529
msgstr ""
10545
10530
10546
#: en/help_topics/configuration.txt:408
10531
#: en/help_topics/configuration.txt:420
10547
10532
msgid " email = Full Name <account@hostname.tld>"
10548
10533
msgstr ""
10549
10534
10550
#: en/help_topics/configuration.txt:410
10535
#: en/help_topics/configuration.txt:422
10551
10536
msgid ""
10552
10537
"editor\n"
10553
10538
"~~~~~~"
10555
10540
"editor\n"
10556
10541
"~~~~~~"
10557
10542
10558
#: en/help_topics/configuration.txt:413
10543
#: en/help_topics/configuration.txt:425
10559
10544
msgid ""
10560
10545
"The path of the editor that you wish to use if *bzr commit* is run without\n"
10561
10546
"a commit message. This setting is trumped by the environment variable\n"
10563
10548
"variables."
10564
10549
msgstr ""
10565
10550
10566
#: en/help_topics/configuration.txt:418
10551
#: en/help_topics/configuration.txt:430
10567
10552
msgid ""
10568
10553
"log_format\n"
10569
10554
"~~~~~~~~~~"
10571
10556
"log_format\n"
10572
10557
"~~~~~~~~~~"
10573
10558
10574
#: en/help_topics/configuration.txt:421
10559
#: en/help_topics/configuration.txt:433
10575
10560
msgid ""
10576
10561
"The default log format to use. Standard log formats are ``long``, ``short``\n"
10577
10562
"and ``line``. Additional formats may be provided by plugins. The default\n"
10578
10563
"value is ``long``."
10579
10564
msgstr ""
10580
10565
10581
#: en/help_topics/configuration.txt:425
10566
#: en/help_topics/configuration.txt:437
10582
10567
msgid ""
10583
10568
"check_signatures\n"
10584
10569
"~~~~~~~~~~~~~~~~"
10586
10571
"check_signatures\n"
10587
10572
"~~~~~~~~~~~~~~~~"
10588
10573
10589
#: en/help_topics/configuration.txt:428
10574
#: en/help_topics/configuration.txt:440
10590
10575
msgid ""
10591
10576
"Reserved for future use. These options will allow a policy for branches to\n"
10592
10577
"require signatures."
10593
10578
msgstr ""
10594
10579
10595
#: en/help_topics/configuration.txt:431
10580
#: en/help_topics/configuration.txt:443
10596
10581
msgid ""
10597
10582
"require\n"
10598
10583
" The gnupg signature for revisions must be present and must be valid."
10599
10584
msgstr ""
10600
10585
10601
#: en/help_topics/configuration.txt:434
10586
#: en/help_topics/configuration.txt:446
10602
10587
msgid ""
10603
10588
"ignore\n"
10604
10589
" Do not check gnupg signatures of revisions."
10605
10590
msgstr ""
10606
10591
10607
#: en/help_topics/configuration.txt:437
10592
#: en/help_topics/configuration.txt:449
10608
10593
msgid ""
10609
10594
"check-available\n"
10610
10595
" (default) If gnupg signatures for revisions are present, check them.\n"
10612
10597
" no signature is present."
10613
10598
msgstr ""
10614
10599
10615
#: en/help_topics/configuration.txt:442
10600
#: en/help_topics/configuration.txt:454
10616
10601
msgid ""
10617
10602
"create_signatures\n"
10618
10603
"~~~~~~~~~~~~~~~~~"
10620
10605
"create_signatures\n"
10621
10606
"~~~~~~~~~~~~~~~~~"
10622
10607
10623
#: en/help_topics/configuration.txt:445
10608
#: en/help_topics/configuration.txt:457
10624
10609
msgid ""
10625
10610
"Defines the behaviour of signing revisions on commits. By default bzr will "
10626
10611
"not\n"
10627
10612
"sign new commits."
10628
10613
msgstr ""
10629
10614
10630
#: en/help_topics/configuration.txt:448
10615
#: en/help_topics/configuration.txt:460
10631
10616
msgid ""
10632
10617
"always\n"
10633
10618
" Sign every new revision that is committed. If the signing fails then "
10635
10620
" commit will not be made."
10636
10621
msgstr ""
10637
10622
10638
#: en/help_topics/configuration.txt:452
10639
msgid ""
10640
"when-required\n"
10641
" Reserved for future use."
10642
msgstr ""
10643
"when-required\n"
10644
" Reservada para uso futuro."
10645
10646
#: en/help_topics/configuration.txt:455
10647
msgid ""
10648
"never\n"
10649
" Reserved for future use."
10650
msgstr ""
10651
"never\n"
10652
" Reservada para uso futuro."
10653
10654
#: en/help_topics/configuration.txt:458
10623
#: en/help_topics/configuration.txt:464
10624
msgid ""
10625
"when-required\n"
10626
" Reserved for future use."
10627
msgstr ""
10628
"when-required\n"
10629
" Reservada para uso futuro."
10630
10631
#: en/help_topics/configuration.txt:467
10632
msgid ""
10633
"never\n"
10634
" Reserved for future use."
10635
msgstr ""
10636
"never\n"
10637
" Reservada para uso futuro."
10638
10639
#: en/help_topics/configuration.txt:470
10655
10640
msgid ""
10656
10641
"In future it is planned that ``when-required`` will sign newly\n"
10657
10642
"committed revisions only when the branch requires them. ``never`` will "
10659
10644
"to sign newly committed revisions, even if the branch requires signatures."
10660
10645
msgstr ""
10661
10646
10662
#: en/help_topics/configuration.txt:462
10647
#: en/help_topics/configuration.txt:474
10663
10648
msgid ""
10664
10649
"dirstate.fdatasync\n"
10665
10650
"~~~~~~~~~~~~~~~~~~"
10667
10652
"dirstate.fdatasync\n"
10668
10653
"~~~~~~~~~~~~~~~~~~"
10669
10654
10670
#: en/help_topics/configuration.txt:465
10655
#: en/help_topics/configuration.txt:477
10671
10656
msgid ""
10672
10657
"If true (default), working tree metadata changes are flushed through the\n"
10673
10658
"OS buffers to physical disk. This is somewhat slower, but means data\n"
10674
10659
"should not be lost if the machine crashes. See also repository.fdatasync."
10675
10660
msgstr ""
10676
10661
10677
#: en/help_topics/configuration.txt:469
10662
#: en/help_topics/configuration.txt:481
10678
10663
msgid ""
10679
10664
"gpg_signing_key\n"
10680
10665
"~~~~~~~~~~~~~~~"
10682
10667
"gpg_signing_key\n"
10683
10668
"~~~~~~~~~~~~~~~"
10684
10669
10685
#: en/help_topics/configuration.txt:472
10670
#: en/help_topics/configuration.txt:484
10686
10671
msgid ""
10687
10672
"The GnuPG user identity to use when signing commits. Can be an e-mail\n"
10688
10673
"address, key fingerprint or full key ID. When unset or when set to\n"
10689
10674
"\"default\" Bazaar will use the user e-mail set with ``whoami``."
10690
10675
msgstr ""
10691
10676
10692
#: en/help_topics/configuration.txt:476
10677
#: en/help_topics/configuration.txt:488
10693
10678
msgid ""
10694
10679
"recurse\n"
10695
10680
"~~~~~~~"
10697
10682
"recurse\n"
10698
10683
"~~~~~~~"
10699
10684
10700
#: en/help_topics/configuration.txt:479
10685
#: en/help_topics/configuration.txt:491
10701
10686
msgid ""
10702
10687
"Only useful in ``locations.conf``. Defines whether or not the\n"
10703
10688
"configuration for this section applies to subdirectories:"
10704
10689
msgstr ""
10705
10690
10706
#: en/help_topics/configuration.txt:482
10691
#: en/help_topics/configuration.txt:494
10707
10692
msgid ""
10708
10693
"true\n"
10709
10694
" (default) This section applies to subdirectories as well."
10710
10695
msgstr ""
10711
10696
10712
#: en/help_topics/configuration.txt:485
10697
#: en/help_topics/configuration.txt:497
10713
10698
msgid ""
10714
10699
"false\n"
10715
10700
" This section only applies to the branch at this directory and not\n"
10716
10701
" branches below it."
10717
10702
msgstr ""
10718
10703
10719
#: en/help_topics/configuration.txt:489
10704
#: en/help_topics/configuration.txt:501
10720
10705
msgid ""
10721
10706
"gpg_signing_command\n"
10722
10707
"~~~~~~~~~~~~~~~~~~~"
10724
10709
"gpg_signing_command\n"
10725
10710
"~~~~~~~~~~~~~~~~~~~"
10726
10711
10727
#: en/help_topics/configuration.txt:492
10712
#: en/help_topics/configuration.txt:504
10728
10713
msgid ""
10729
10714
"(Default: \"gpg\"). Which program should be used to sign and check "
10730
10715
"revisions.\n"
10731
10716
"For example::"
10732
10717
msgstr ""
10733
10718
10734
#: en/help_topics/configuration.txt:495
10719
#: en/help_topics/configuration.txt:507
10735
10720
msgid " gpg_signing_command = /usr/bin/gnpg"
10736
10721
msgstr " gpg_signing_command = /usr/bin/gnpg"
10737
10722
10738
#: en/help_topics/configuration.txt:497
10723
#: en/help_topics/configuration.txt:509
10739
10724
msgid ""
10740
10725
"The specified command must accept the options \"--clearsign\" and \"-u "
10741
10726
"<email>\"."
10743
10728
"La orden especificada puede aceptar las opciones «--clearsign» y «-u "
10744
10729
"<correo>»."
10745
10730
10746
#: en/help_topics/configuration.txt:499
10731
#: en/help_topics/configuration.txt:511
10747
10732
msgid ""
10748
10733
"bzr_remote_path\n"
10749
10734
"~~~~~~~~~~~~~~~"
10751
10736
"bzr_remote_path\n"
10752
10737
"~~~~~~~~~~~~~~~"
10753
10738
10754
#: en/help_topics/configuration.txt:502
10739
#: en/help_topics/configuration.txt:514
10755
10740
msgid ""
10756
10741
"(Default: \"bzr\"). The path to the command that should be used to run the "
10757
10742
"smart\n"
10758
10743
"server for bzr. This value may only be specified in locations.conf, because:"
10759
10744
msgstr ""
10760
10745
10761
#: en/help_topics/configuration.txt:505
10746
#: en/help_topics/configuration.txt:517
10762
10747
msgid ""
10763
10748
"- it's needed before branch.conf is accessible\n"
10764
10749
"- allowing remote branch.conf files to specify commands would be a security\n"
10765
10750
" risk"
10766
10751
msgstr ""
10767
10752
10768
#: en/help_topics/configuration.txt:509
10753
#: en/help_topics/configuration.txt:521
10769
10754
msgid "It is overridden by the BZR_REMOTE_PATH environment variable."
10770
10755
msgstr ""
10771
10756
10772
#: en/help_topics/configuration.txt:511
10757
#: en/help_topics/configuration.txt:523
10773
10758
msgid ""
10774
10759
"smtp_server\n"
10775
10760
"~~~~~~~~~~~"
10777
10762
"smtp_server\n"
10778
10763
"~~~~~~~~~~~"
10779
10764
10780
#: en/help_topics/configuration.txt:514
10765
#: en/help_topics/configuration.txt:526
10781
10766
msgid ""
10782
10767
"(Default: \"localhost\"). SMTP server to use when Bazaar needs to send\n"
10783
10768
"email, eg. with ``merge-directive --mail-to``, or the bzr-email plugin."
10784
10769
msgstr ""
10785
10770
10786
#: en/help_topics/configuration.txt:517
10771
#: en/help_topics/configuration.txt:529
10787
10772
msgid ""
10788
10773
"smtp_username, smtp_password\n"
10789
10774
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
10791
10776
"smtp_username, smtp_password\n"
10792
10777
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
10793
10778
10794
#: en/help_topics/configuration.txt:520
10779
#: en/help_topics/configuration.txt:532
10795
10780
msgid ""
10796
10781
"User and password to authenticate to the SMTP server. If smtp_username\n"
10797
10782
"is set, and smtp_password is not, Bazaar will prompt for a password.\n"
10799
10784
"to send mail."
10800
10785
msgstr ""
10801
10786
10802
#: en/help_topics/configuration.txt:525
10787
#: en/help_topics/configuration.txt:537
10803
10788
msgid ""
10804
10789
"locks.steal_dead\n"
10805
10790
"~~~~~~~~~~~~~~~~"
10807
10792
"locks.steal_dead\n"
10808
10793
"~~~~~~~~~~~~~~~~"
10809
10794
10810
#: en/help_topics/configuration.txt:528
10795
#: en/help_topics/configuration.txt:540
10811
10796
msgid ""
10812
10797
"If set to true, bzr will automatically break locks held by processes from\n"
10813
10798
"the same machine and user that are no longer alive. Otherwise, it will\n"
10815
10800
"the object is no longer in use."
10816
10801
msgstr ""
10817
10802
10818
#: en/help_topics/configuration.txt:533
10803
#: en/help_topics/configuration.txt:545
10819
10804
msgid ""
10820
10805
"mail_client\n"
10821
10806
"~~~~~~~~~~~"
10823
10808
"mail_client\n"
10824
10809
"~~~~~~~~~~~"
10825
10810
10826
#: en/help_topics/configuration.txt:536
10811
#: en/help_topics/configuration.txt:548
10827
10812
msgid ""
10828
10813
"A mail client to use for sending merge requests.\n"
10829
10814
"By default, bzr will try to use ``mapi`` on Windows. On other platforms, "
10832
10817
"``editor``."
10833
10818
msgstr ""
10834
10819
10835
#: en/help_topics/configuration.txt:541
10820
#: en/help_topics/configuration.txt:553
10836
10821
msgid "Supported values for specific clients:"
10837
10822
msgstr "Valores permitidos para clientes específicos:"
10838
10823
10839
#: en/help_topics/configuration.txt:543
10824
#: en/help_topics/configuration.txt:555
10840
10825
msgid ""
10841
10826
":claws: Use Claws. This skips a dialog for attaching files.\n"
10842
10827
":evolution: Use Evolution.\n"
10847
10832
" this works around some bugs that xdg-email doesn't handle."
10848
10833
msgstr ""
10849
10834
10850
#: en/help_topics/configuration.txt:550
10835
#: en/help_topics/configuration.txt:562
10851
10836
msgid "Supported generic values are:"
10852
10837
msgstr "Los valores genéricos permitidos son:"
10853
10838
10854
#: en/help_topics/configuration.txt:552
10839
#: en/help_topics/configuration.txt:564
10855
10840
msgid ""
10856
10841
":default: See above.\n"
10857
10842
":editor: Use your editor to compose the merge request. This also uses\n"
10861
10846
":xdg-email: Use xdg-email to run your preferred mail program"
10862
10847
msgstr ""
10863
10848
10864
#: en/help_topics/configuration.txt:559
10849
#: en/help_topics/configuration.txt:571
10865
10850
msgid ""
10866
10851
"repository.fdatasync\n"
10867
10852
"~~~~~~~~~~~~~~~~~~~~"
10869
10854
"repository.fdatasync\n"
10870
10855
"~~~~~~~~~~~~~~~~~~~~"
10871
10856
10872
#: en/help_topics/configuration.txt:562
10857
#: en/help_topics/configuration.txt:574
10873
10858
msgid ""
10874
10859
"If true (default), repository changes are flushed through the OS buffers\n"
10875
10860
"to physical disk. This is somewhat slower, but means data should not be\n"
10876
10861
"lost if the machine crashes. See also dirstate.fdatasync."
10877
10862
msgstr ""
10878
10863
10879
#: en/help_topics/configuration.txt:566
10864
#: en/help_topics/configuration.txt:578
10880
10865
msgid ""
10881
10866
"submit_branch\n"
10882
10867
"~~~~~~~~~~~~~"
10884
10869
"submit_branch\n"
10885
10870
"~~~~~~~~~~~~~"
10886
10871
10887
#: en/help_topics/configuration.txt:569
10872
#: en/help_topics/configuration.txt:581
10888
10873
msgid ""
10889
10874
"The branch you intend to submit your current work to. This is "
10890
10875
"automatically\n"
10893
10878
"should usually be set on a per-branch or per-location basis."
10894
10879
msgstr ""
10895
10880
10896
#: en/help_topics/configuration.txt:573
10881
#: en/help_topics/configuration.txt:585
10897
10882
msgid ""
10898
10883
"public_branch\n"
10899
10884
"~~~~~~~~~~~~~"
10901
10886
"public_branch\n"
10902
10887
"~~~~~~~~~~~~~"
10903
10888
10904
#: en/help_topics/configuration.txt:576
10889
#: en/help_topics/configuration.txt:588
10905
10890
msgid ""
10906
10891
"A publically-accessible version of this branch (implying that this version "
10907
10892
"is\n"
10908
10893
"not publically-accessible). Used (and set) by ``bzr send``."
10909
10894
msgstr ""
10910
10895
10911
#: en/help_topics/configuration.txt:579
10896
#: en/help_topics/configuration.txt:591
10912
10897
msgid ""
10913
10898
"suppress_warnings\n"
10914
10899
"~~~~~~~~~~~~~~~~~"
10916
10901
"suppress_warnings\n"
10917
10902
"~~~~~~~~~~~~~~~~~"
10918
10903
10919
#: en/help_topics/configuration.txt:582
10904
#: en/help_topics/configuration.txt:594
10920
10905
msgid ""
10921
10906
"A list of strings, each string represent a warning that can be emitted by\n"
10922
10907
"bzr. Mentioning a warning in this list tells bzr to not emit it."
10923
10908
msgstr ""
10924
10909
10925
#: en/help_topics/configuration.txt:585
10910
#: en/help_topics/configuration.txt:597
10926
10911
msgid "Valid values:"
10927
10912
msgstr "valores válidos:"
10928
10913
10929
#: en/help_topics/configuration.txt:587
10914
#: en/help_topics/configuration.txt:599
10930
10915
msgid ""
10931
10916
"* ``format_deprecation``:\n"
10932
10917
" whether the format deprecation warning is shown on repositories that "
10934
10919
" using deprecated formats."
10935
10920
msgstr ""
10936
10921
10937
#: en/help_topics/configuration.txt:591
10922
#: en/help_topics/configuration.txt:603
10938
10923
msgid ""
10939
10924
"default_format\n"
10940
10925
"~~~~~~~~~~~~~~"
10942
10927
"default_format\n"
10943
10928
"~~~~~~~~~~~~~~"
10944
10929
10945
#: en/help_topics/configuration.txt:594
10930
#: en/help_topics/configuration.txt:606
10946
10931
msgid ""
10947
10932
"A format name for the default format used when creating branches. See "
10948
10933
"``bzr\n"
10949
10934
"help formats`` for possible values."
10950
10935
msgstr ""
10951
10936
10952
#: en/help_topics/configuration.txt:597
10937
#: en/help_topics/configuration.txt:609
10953
10938
msgid ""
10954
10939
"\n"
10955
10940
"Unicode options\n"
10959
10944
"Opciones Unicode\n"
10960
10945
"---------------"
10961
10946
10962
#: en/help_topics/configuration.txt:601
10947
#: en/help_topics/configuration.txt:613
10963
10948
msgid ""
10964
10949
"output_encoding\n"
10965
10950
"~~~~~~~~~~~~~~~"
10967
10952
"output_encoding\n"
10968
10953
"~~~~~~~~~~~~~~~"
10969
10954
10970
#: en/help_topics/configuration.txt:604
10955
#: en/help_topics/configuration.txt:616
10971
10956
msgid ""
10972
10957
"A Python unicode encoding name for text output from bzr, such as log\n"
10973
10958
"information. Values include: utf8, cp850, ascii, iso-8859-1. The default\n"
10974
10959
"is the terminal encoding prefered by the operating system."
10975
10960
msgstr ""
10976
10961
10977
#: en/help_topics/configuration.txt:608
10962
#: en/help_topics/configuration.txt:620
10978
10963
msgid ""
10979
10964
"\n"
10980
10965
"Branch type specific options\n"
10984
10969
"Opciones específicas del tipo de rama\n"
10985
10970
"-----------------------------------------------------------"
10986
10971
10987
#: en/help_topics/configuration.txt:612
10972
#: en/help_topics/configuration.txt:624
10988
10973
msgid ""
10989
10974
"These options apply only to branches that use the ``dirstate-tags`` or\n"
10990
10975
"later format. They\n"
10992
10977
"manually set in ``locations.conf`` or ``bazaar.conf``."
10993
10978
msgstr ""
10994
10979
10995
#: en/help_topics/configuration.txt:617
10980
#: en/help_topics/configuration.txt:629
10996
10981
msgid ""
10997
10982
"append_revisions_only\n"
10998
10983
"~~~~~~~~~~~~~~~~~~~~~"
11000
10985
"append_revisions_only\n"
11001
10986
"~~~~~~~~~~~~~~~~~~~~~"
11002
10987
11003
#: en/help_topics/configuration.txt:620
10988
#: en/help_topics/configuration.txt:632
11004
10989
msgid ""
11005
10990
"If set to \"True\" then revisions can only be appended to the log, not\n"
11006
10991
"removed. A branch with this setting enabled can only pull from another\n"
11010
10995
"compatibility with previous bzr versions (older than 2.2)."
11011
10996
msgstr ""
11012
10997
11013
#: en/help_topics/configuration.txt:627
10998
#: en/help_topics/configuration.txt:639
11014
10999
msgid ""
11015
11000
"parent_location\n"
11016
11001
"~~~~~~~~~~~~~~~"
11018
11003
"parent_location\n"
11019
11004
"~~~~~~~~~~~~~~~"
11020
11005
11021
#: en/help_topics/configuration.txt:630
11006
#: en/help_topics/configuration.txt:642
11022
11007
msgid ""
11023
11008
"If present, the location of the default branch for pull or merge. This "
11024
11009
"option\n"
11026
11011
"--remember``."
11027
11012
msgstr ""
11028
11013
11029
#: en/help_topics/configuration.txt:634
11014
#: en/help_topics/configuration.txt:646
11030
11015
msgid ""
11031
11016
"push_location\n"
11032
11017
"~~~~~~~~~~~~~"
11034
11019
"push_location\n"
11035
11020
"~~~~~~~~~~~~~"
11036
11021
11037
#: en/help_topics/configuration.txt:637
11022
#: en/help_topics/configuration.txt:649
11038
11023
msgid ""
11039
11024
"If present, the location of the default branch for push. This option\n"
11040
11025
"is normally set by the first ``push`` or ``push --remember``."
11041
11026
msgstr ""
11042
11027
11043
#: en/help_topics/configuration.txt:640
11028
#: en/help_topics/configuration.txt:652
11044
11029
msgid ""
11045
11030
"push_strict\n"
11046
11031
"~~~~~~~~~~~"
11048
11033
"push_strict\n"
11049
11034
"~~~~~~~~~~~"
11050
11035
11051
#: en/help_topics/configuration.txt:643
11036
#: en/help_topics/configuration.txt:655
11052
11037
msgid ""
11053
11038
"If present, defines the ``--strict`` option default value for checking\n"
11054
11039
"uncommitted changes before pushing."
11055
11040
msgstr ""
11056
11041
11057
#: en/help_topics/configuration.txt:646
11042
#: en/help_topics/configuration.txt:658
11058
11043
msgid ""
11059
11044
"dpush_strict\n"
11060
11045
"~~~~~~~~~~~~"
11062
11047
"dpush_strict\n"
11063
11048
"~~~~~~~~~~~~"
11064
11049
11065
#: en/help_topics/configuration.txt:649
11050
#: en/help_topics/configuration.txt:661
11066
11051
msgid ""
11067
11052
"If present, defines the ``--strict`` option default value for checking\n"
11068
11053
"uncommitted changes before pushing into a different VCS without any\n"
11069
11054
"custom bzr metadata."
11070
11055
msgstr ""
11071
11056
11072
#: en/help_topics/configuration.txt:653
11057
#: en/help_topics/configuration.txt:665
11073
11058
msgid ""
11074
11059
"bound_location\n"
11075
11060
"~~~~~~~~~~~~~~"
11077
11062
"bound_location\n"
11078
11063
"~~~~~~~~~~~~~~"
11079
11064
11080
#: en/help_topics/configuration.txt:656
11065
#: en/help_topics/configuration.txt:668
11081
11066
msgid ""
11082
11067
"The location that commits should go to when acting as a checkout.\n"
11083
11068
"This option is normally set by ``bind``."
11084
11069
msgstr ""
11085
11070
11086
#: en/help_topics/configuration.txt:659
11071
#: en/help_topics/configuration.txt:671
11087
11072
msgid ""
11088
11073
"bound\n"
11089
11074
"~~~~~"
11091
11076
"bound\n"
11092
11077
"~~~~~"
11093
11078
11094
#: en/help_topics/configuration.txt:662
11079
#: en/help_topics/configuration.txt:674
11095
11080
msgid ""
11096
11081
"If set to \"True\", the branch should act as a checkout, and push each "
11097
11082
"commit to\n"
11098
11083
"the bound_location. This option is normally set by ``bind``/``unbind``."
11099
11084
msgstr ""
11100
11085
11101
#: en/help_topics/configuration.txt:665
11086
#: en/help_topics/configuration.txt:677
11102
11087
msgid ""
11103
11088
"send_strict\n"
11104
11089
"~~~~~~~~~~~"
11106
11091
"send_strict\n"
11107
11092
"~~~~~~~~~"
11108
11093
11109
#: en/help_topics/configuration.txt:668
11094
#: en/help_topics/configuration.txt:680
11110
11095
msgid ""
11111
11096
"If present, defines the ``--strict`` option default value for checking\n"
11112
11097
"uncommitted changes before sending a merge directive."
11113
11098
msgstr ""
11114
11099
11115
#: en/help_topics/configuration.txt:671
11100
#: en/help_topics/configuration.txt:683
11116
11101
msgid ""
11117
11102
"add.maximum_file_size\n"
11118
11103
"~~~~~~~~~~~~~~~~~~~~~"
11120
11105
"add.maximum_file_size\n"
11121
11106
"~~~~~~~~~~~~~~~~~~~"
11122
11107
11123
#: en/help_topics/configuration.txt:674
11108
#: en/help_topics/configuration.txt:686
11124
11109
msgid ""
11125
11110
"Defines the maximum file size the command line \"add\" operation will allow\n"
11126
11111
"in recursive mode, with files larger than this value being skipped. You may "
11132
11117
"will disable skipping."
11133
11118
msgstr ""
11134
11119
11135
#: en/help_topics/configuration.txt:680
11120
#: en/help_topics/configuration.txt:692
11136
11121
msgid ""
11137
11122
"External Merge Tools\n"
11138
11123
"--------------------"
11140
11125
"Herramientas de fusión externas\n"
11141
11126
"----------------------------------------------------"
11142
11127
11143
#: en/help_topics/configuration.txt:683
11128
#: en/help_topics/configuration.txt:695
11144
11129
msgid ""
11145
11130
"bzr.mergetool.<name>\n"
11146
11131
"~~~~~~~~~~~~~~~~~~~~"
11148
11133
"bzr.mergetool.<nombre>\n"
11149
11134
"~~~~~~~~~~~~~~~~~~~"
11150
11135
11151
#: en/help_topics/configuration.txt:686
11136
#: en/help_topics/configuration.txt:698
11152
11137
msgid ""
11153
11138
"Defines an external merge tool called <name> with the given command-line.\n"
11154
11139
"Arguments containing spaces should be quoted using single or double quotes. "
11156
11141
"executable may omit its path if it can be found on the PATH."
11157
11142
msgstr ""
11158
11143
11159
#: en/help_topics/configuration.txt:690
11144
#: en/help_topics/configuration.txt:702
11160
11145
msgid ""
11161
11146
"The following markers can be used in the command-line to substitute "
11162
11147
"filenames\n"
11163
11148
"involved in the merge conflict::"
11164
11149
msgstr ""
11165
11150
11166
#: en/help_topics/configuration.txt:693
11151
#: en/help_topics/configuration.txt:705
11167
11152
msgid ""
11168
11153
" {base} file.BASE\n"
11169
11154
" {this} file.THIS\n"
11174
11159
" succeeds."
11175
11160
msgstr ""
11176
11161
11177
#: en/help_topics/configuration.txt:702
11162
#: en/help_topics/configuration.txt:714
11178
11163
msgid " bzr.mergetool.kdiff3 = kdiff3 {base} {this} {other} -o {result}"
11179
11164
msgstr " bzr.mergetool.kdiff3 = kdiff3 {base} {este} {otro} -o {resultado}"
11180
11165
11181
#: en/help_topics/configuration.txt:704
11166
#: en/help_topics/configuration.txt:716
11182
11167
msgid ""
11183
11168
"bzr.default_mergetool\n"
11184
11169
"~~~~~~~~~~~~~~~~~~~~~"
11186
11171
"bzr.default_mergetool\n"
11187
11172
"~~~~~~~~~~~~~~~~~~"
11188
11173
11189
#: en/help_topics/configuration.txt:707
11174
#: en/help_topics/configuration.txt:719
11190
11175
msgid ""
11191
11176
"Specifies which external merge tool (as defined above) should be selected "
11192
11177
"by\n"
11193
11178
"default in tools such as ``bzr qconflicts``."
11194
11179
msgstr ""
11195
11180
11196
#: en/help_topics/configuration.txt:712
11181
#: en/help_topics/configuration.txt:724
11197
11182
msgid " bzr.default_mergetool = kdiff3\n"
11198
11183
msgstr " bzr.default_mergetool = kdiff3\n"
11199
11184
12207
12192
"branch can now be pushed to the mainline.\n"
12208
12193
msgstr ""
12209
12194
12195
#: en/help_topics/env-variables.txt:1
12196
msgid "Environment Variables"
12197
msgstr "Variables de entorno"
12198
12199
#: en/help_topics/env-variables.txt:3
12200
msgid ""
12201
"=================== "
12202
"===========================================================\n"
12203
"BZRPATH Path where bzr is to look for shell plugin external\n"
12204
" commands.\n"
12205
"BZR_EMAIL E-Mail address of the user. Overrides EMAIL.\n"
12206
"EMAIL E-Mail address of the user.\n"
12207
"BZR_EDITOR Editor for editing commit messages. Overrides EDITOR.\n"
12208
"EDITOR Editor for editing commit messages.\n"
12209
"BZR_PLUGIN_PATH Paths where bzr should look for plugins.\n"
12210
"BZR_DISABLE_PLUGINS Plugins that bzr should not load.\n"
12211
"BZR_PLUGINS_AT Plugins to load from a directory not in "
12212
"BZR_PLUGIN_PATH.\n"
12213
"BZR_HOME Directory holding .bazaar config dir. Overrides HOME.\n"
12214
"BZR_HOME (Win32) Directory holding bazaar config dir. Overrides APPDATA "
12215
"and\n"
12216
" HOME.\n"
12217
"BZR_REMOTE_PATH Full name of remote 'bzr' command (for bzr+ssh:// "
12218
"URLs).\n"
12219
"BZR_SSH Path to SSH client, or one of paramiko, openssh, "
12220
"sshcorp,\n"
12221
" plink or lsh.\n"
12222
"BZR_LOG Location of .bzr.log (use '/dev/null' to suppress log).\n"
12223
"BZR_LOG (Win32) Location of .bzr.log (use 'NUL' to suppress log).\n"
12224
"BZR_COLUMNS Override implicit terminal width.\n"
12225
"BZR_CONCURRENCY Number of processes that can be run concurrently "
12226
"(selftest)\n"
12227
"BZR_PROGRESS_BAR Override the progress display. Values are 'none' or "
12228
"'text'.\n"
12229
"BZR_PDB Control whether to launch a debugger on error.\n"
12230
"BZR_SIGQUIT_PDB Control whether SIGQUIT behaves normally or invokes a\n"
12231
" breakin debugger.\n"
12232
"BZR_TEXTUI_INPUT Force console input mode for prompts to line-based "
12233
"(instead\n"
12234
" of char-based).\n"
12235
"=================== "
12236
"===========================================================\n"
12237
msgstr ""
12238
12210
12239
#: en/help_topics/eol.txt:1
12211
12240
msgid ""
12212
12241
"End of Line Conversion\n"
12526
12555
"~~~~~~~~~~~~~~~~~~"
12527
12556
12528
12557
#: en/help_topics/hooks.txt:38 en/help_topics/hooks.txt:56
12529
#: en/help_topics/hooks.txt:102 en/help_topics/hooks.txt:259
12558
#: en/help_topics/hooks.txt:102 en/help_topics/hooks.txt:262
12530
12559
msgid "Introduced in: 2.2"
12531
12560
msgstr "Introducido en: 2.2"
12532
12561
12546
12575
"open\n"
12547
12576
"~~~~"
12548
12577
12549
#: en/help_topics/hooks.txt:48 en/help_topics/hooks.txt:290
12550
#: en/help_topics/hooks.txt:304
12578
#: en/help_topics/hooks.txt:48 en/help_topics/hooks.txt:293
12579
#: en/help_topics/hooks.txt:307
12551
12580
msgid "Introduced in: 1.8"
12552
12581
msgstr "Introducido en: 1.8"
12553
12582
12581
12610
"post_change_branch_tip\n"
12582
12611
"~~~~~~~~~~~~~~~~~~~~~~"
12583
12612
12584
#: en/help_topics/hooks.txt:66 en/help_topics/hooks.txt:418
12613
#: en/help_topics/hooks.txt:66 en/help_topics/hooks.txt:421
12585
12614
msgid "Introduced in: 1.4"
12586
12615
msgstr "Introducido en: 1.4"
12587
12616
12593
12622
"uncommit will all trigger this hook."
12594
12623
msgstr ""
12595
12624
12596
#: en/help_topics/hooks.txt:73 en/help_topics/hooks.txt:389
12625
#: en/help_topics/hooks.txt:73 en/help_topics/hooks.txt:392
12597
12626
msgid ""
12598
12627
"post_commit\n"
12599
12628
"~~~~~~~~~~~"
12603
12632
12604
12633
#: en/help_topics/hooks.txt:76 en/help_topics/hooks.txt:86
12605
12634
#: en/help_topics/hooks.txt:94 en/help_topics/hooks.txt:110
12606
#: en/help_topics/hooks.txt:145
12607
12635
msgid "Introduced in: 0.15"
12608
12636
msgstr "Introducido en: 0.15"
12609
12637
12718
12746
"tree."
12719
12747
msgstr ""
12720
12748
12721
#: en/help_topics/hooks.txt:153
12749
#: en/help_topics/hooks.txt:142
12722
12750
msgid ""
12723
12751
"transform_fallback_location\n"
12724
12752
"~~~~~~~~~~~~~~~~~~~~~~~~~~~"
12726
12754
"transform_fallback_location\n"
12727
12755
"~~~~~~~~~~~~~~~~~~~~~~~~~~~"
12728
12756
12729
#: en/help_topics/hooks.txt:156
12757
#: en/help_topics/hooks.txt:145
12730
12758
msgid "Introduced in: 1.9"
12731
12759
msgstr "Introducido en: 1.9"
12732
12760
12733
#: en/help_topics/hooks.txt:158
12761
#: en/help_topics/hooks.txt:147
12734
12762
msgid ""
12735
12763
"Called when a stacked branch is activating its fallback locations.\n"
12736
12764
"transform_fallback_location is called with (branch, url), and should\n"
12744
12772
"however undefined."
12745
12773
msgstr ""
12746
12774
12747
#: en/help_topics/hooks.txt:169
12748
msgid ""
12749
"CommandHooks\n"
12750
"------------"
12751
msgstr ""
12752
"CommandHooks\n"
12753
"------------"
12754
12755
#: en/help_topics/hooks.txt:172
12756
msgid ""
12757
"extend_command\n"
12758
"~~~~~~~~~~~~~~"
12759
msgstr ""
12760
"extend_command\n"
12761
"~~~~~~~~~~~~~~"
12762
12763
#: en/help_topics/hooks.txt:175
12775
#: en/help_topics/hooks.txt:158
12776
msgid ""
12777
"CommandHooks\n"
12778
"------------"
12779
msgstr ""
12780
"CommandHooks\n"
12781
"------------"
12782
12783
#: en/help_topics/hooks.txt:161
12784
msgid ""
12785
"extend_command\n"
12786
"~~~~~~~~~~~~~~"
12787
msgstr ""
12788
"extend_command\n"
12789
"~~~~~~~~~~~~~~"
12790
12791
#: en/help_topics/hooks.txt:164
12764
12792
msgid "Introduced in: 1.13"
12765
12793
msgstr "Introducido en: 1.13"
12766
12794
12767
#: en/help_topics/hooks.txt:177
12795
#: en/help_topics/hooks.txt:166
12768
12796
msgid ""
12769
12797
"Called after creating a command object to allow modifications such as\n"
12770
12798
"adding or removing options, docs etc. Called with the new\n"
12771
12799
"bzrlib.commands.Command object."
12772
12800
msgstr ""
12773
12801
12774
#: en/help_topics/hooks.txt:181
12802
#: en/help_topics/hooks.txt:170
12775
12803
msgid ""
12776
12804
"get_command\n"
12777
12805
"~~~~~~~~~~~"
12779
12807
"get_command\n"
12780
12808
"~~~~~~~~~~~"
12781
12809
12782
#: en/help_topics/hooks.txt:184 en/help_topics/hooks.txt:196
12783
#: en/help_topics/hooks.txt:205 en/help_topics/hooks.txt:464
12810
#: en/help_topics/hooks.txt:173 en/help_topics/hooks.txt:185
12811
#: en/help_topics/hooks.txt:194 en/help_topics/hooks.txt:467
12784
12812
msgid "Introduced in: 1.17"
12785
12813
msgstr "Introducido en: 1.17"
12786
12814
12787
#: en/help_topics/hooks.txt:186
12815
#: en/help_topics/hooks.txt:175
12788
12816
msgid ""
12789
12817
"Called when creating a single command. Called with (cmd_or_None,\n"
12790
12818
"command_name). get_command should either return the cmd_or_None\n"
12794
12822
"plugin_cmds.register_lazy."
12795
12823
msgstr ""
12796
12824
12797
#: en/help_topics/hooks.txt:193
12825
#: en/help_topics/hooks.txt:182
12798
12826
msgid ""
12799
12827
"get_missing_command\n"
12800
12828
"~~~~~~~~~~~~~~~~~~~"
12802
12830
"get_missing_command\n"
12803
12831
"~~~~~~~~~~~~~~~~~~~"
12804
12832
12805
#: en/help_topics/hooks.txt:198
12833
#: en/help_topics/hooks.txt:187
12806
12834
msgid ""
12807
12835
"Called when creating a single command if no command could be found.\n"
12808
12836
"Called with (command_name). get_missing_command should either return\n"
12809
12837
"None, or a Command object to be used for the command."
12810
12838
msgstr ""
12811
12839
12812
#: en/help_topics/hooks.txt:202
12840
#: en/help_topics/hooks.txt:191
12813
12841
msgid ""
12814
12842
"list_commands\n"
12815
12843
"~~~~~~~~~~~~~"
12817
12845
"list_commands\n"
12818
12846
"~~~~~~~~~~~~~"
12819
12847
12820
#: en/help_topics/hooks.txt:207
12848
#: en/help_topics/hooks.txt:196
12821
12849
msgid ""
12822
12850
"Called when enumerating commands. Called with a set of cmd_name\n"
12823
12851
"strings for all the commands found so far. This set is safe to mutate\n"
12849
12877
msgid "Called prior to executing a command. Called with the command object."
12850
12878
msgstr ""
12851
12879
12852
#: en/help_topics/hooks.txt:212
12853
msgid ""
12854
"_ConfigHooks\n"
12855
"------------"
12856
msgstr ""
12857
"_ConfigHooks\n"
12858
"------------"
12859
12860
12880
#: en/help_topics/hooks.txt:215
12861
12881
msgid ""
12862
"get\n"
12863
"~~~"
12864
msgstr ""
12865
"get\n"
12866
"~~~"
12867
12868
#: en/help_topics/hooks.txt:218 en/help_topics/hooks.txt:226
12869
#: en/help_topics/hooks.txt:233 en/help_topics/hooks.txt:241
12870
#: en/help_topics/hooks.txt:248 en/help_topics/hooks.txt:370
12871
#: en/help_topics/hooks.txt:443
12882
"_ConfigHooks\n"
12883
"------------"
12884
msgstr ""
12885
"_ConfigHooks\n"
12886
"------------"
12887
12888
#: en/help_topics/hooks.txt:218
12889
msgid ""
12890
"get\n"
12891
"~~~"
12892
msgstr ""
12893
"get\n"
12894
"~~~"
12895
12896
#: en/help_topics/hooks.txt:221 en/help_topics/hooks.txt:229
12897
#: en/help_topics/hooks.txt:236 en/help_topics/hooks.txt:244
12898
#: en/help_topics/hooks.txt:251 en/help_topics/hooks.txt:373
12899
#: en/help_topics/hooks.txt:446
12872
12900
msgid "Introduced in: 2.4"
12873
12901
msgstr "Introducido en: 2.4"
12874
12902
12875
#: en/help_topics/hooks.txt:220
12903
#: en/help_topics/hooks.txt:223
12876
12904
msgid ""
12877
12905
"Invoked when a config option is read. The signature is (stack, name,\n"
12878
12906
"value)."
12879
12907
msgstr ""
12880
12908
12881
#: en/help_topics/hooks.txt:223
12909
#: en/help_topics/hooks.txt:226
12882
12910
msgid ""
12883
12911
"load\n"
12884
12912
"~~~~"
12886
12914
"load\n"
12887
12915
"~~~~"
12888
12916
12889
#: en/help_topics/hooks.txt:228
12917
#: en/help_topics/hooks.txt:231
12890
12918
msgid "Invoked when a config store is loaded. The signature is (store)."
12891
12919
msgstr ""
12892
12920
12893
#: en/help_topics/hooks.txt:230
12921
#: en/help_topics/hooks.txt:233
12894
12922
msgid ""
12895
12923
"remove\n"
12896
12924
"~~~~~~"
12898
12926
"remove\n"
12899
12927
"~~~~~~"
12900
12928
12901
#: en/help_topics/hooks.txt:235
12929
#: en/help_topics/hooks.txt:238
12902
12930
msgid ""
12903
12931
"Invoked when a config option is removed. The signature is (stack,\n"
12904
12932
"name)."
12905
12933
msgstr ""
12906
12934
12907
#: en/help_topics/hooks.txt:238
12935
#: en/help_topics/hooks.txt:241
12908
12936
msgid ""
12909
12937
"save\n"
12910
12938
"~~~~"
12912
12940
"save\n"
12913
12941
"~~~~"
12914
12942
12915
#: en/help_topics/hooks.txt:243
12943
#: en/help_topics/hooks.txt:246
12916
12944
msgid "Invoked when a config store is saved. The signature is (store)."
12917
12945
msgstr ""
12918
12946
12919
#: en/help_topics/hooks.txt:245
12947
#: en/help_topics/hooks.txt:248
12920
12948
msgid ""
12921
12949
"set\n"
12922
12950
"~~~"
12924
12952
"set\n"
12925
12953
"~~~"
12926
12954
12927
#: en/help_topics/hooks.txt:250
12955
#: en/help_topics/hooks.txt:253
12928
12956
msgid ""
12929
12957
"Invoked when a config option is set. The signature is (stack, name,\n"
12930
12958
"value)."
12931
12959
msgstr ""
12932
12960
12933
#: en/help_topics/hooks.txt:253
12961
#: en/help_topics/hooks.txt:256
12934
12962
msgid ""
12935
12963
"ControlDirHooks\n"
12936
12964
"---------------"
12937
12965
msgstr ""
12938
12966
12939
#: en/help_topics/hooks.txt:256
12967
#: en/help_topics/hooks.txt:259
12940
12968
msgid ""
12941
12969
"post_repo_init\n"
12942
12970
"~~~~~~~~~~~~~~"
12944
12972
"post_repo_init\n"
12945
12973
"~~~~~~~~~~~~~~"
12946
12974
12947
#: en/help_topics/hooks.txt:261
12975
#: en/help_topics/hooks.txt:264
12948
12976
msgid ""
12949
12977
"Invoked after a repository has been initialized. post_repo_init is\n"
12950
12978
"called with a bzrlib.controldir.RepoInitHookParams."
12951
12979
msgstr ""
12952
12980
12953
#: en/help_topics/hooks.txt:264
12954
msgid ""
12955
"pre_open\n"
12956
"~~~~~~~~"
12957
msgstr ""
12958
"pre_open\n"
12959
"~~~~~~~~"
12960
12961
12981
#: en/help_topics/hooks.txt:267
12982
msgid ""
12983
"pre_open\n"
12984
"~~~~~~~~"
12985
msgstr ""
12986
"pre_open\n"
12987
"~~~~~~~~"
12988
12989
#: en/help_topics/hooks.txt:270
12962
12990
msgid "Introduced in: 1.14"
12963
12991
msgstr "Introducido en: 1.14"
12964
12992
12965
#: en/help_topics/hooks.txt:269
12993
#: en/help_topics/hooks.txt:272
12966
12994
msgid ""
12967
12995
"Invoked before attempting to open a ControlDir with the transport that\n"
12968
12996
"the open will use."
12969
12997
msgstr ""
12970
12998
12971
#: en/help_topics/hooks.txt:272
12972
msgid ""
12973
"InfoHooks\n"
12974
"---------"
12975
msgstr ""
12976
"InfoHooks\n"
12977
"---------"
12978
12979
12999
#: en/help_topics/hooks.txt:275
12980
13000
msgid ""
12981
"repository\n"
12982
"~~~~~~~~~~"
12983
msgstr ""
12984
"repository\n"
12985
"~~~~~~~~~~"
12986
12987
#: en/help_topics/hooks.txt:278 en/help_topics/hooks.txt:297
12988
#: en/help_topics/hooks.txt:521
13001
"InfoHooks\n"
13002
"---------"
13003
msgstr ""
13004
"InfoHooks\n"
13005
"---------"
13006
13007
#: en/help_topics/hooks.txt:278
13008
msgid ""
13009
"repository\n"
13010
"~~~~~~~~~~"
13011
msgstr ""
13012
"repository\n"
13013
"~~~~~~~~~~"
13014
13015
#: en/help_topics/hooks.txt:281 en/help_topics/hooks.txt:300
13016
#: en/help_topics/hooks.txt:524
12989
13017
msgid "Introduced in: 1.15"
12990
13018
msgstr "Introducido en: 1.15"
12991
13019
12992
#: en/help_topics/hooks.txt:280
13020
#: en/help_topics/hooks.txt:283
12993
13021
msgid ""
12994
13022
"Invoked when displaying the statistics for a repository. repository is\n"
12995
13023
"called with a statistics dictionary as returned by the repository and\n"
12996
13024
"a file-like object to write to."
12997
13025
msgstr ""
12998
13026
12999
#: en/help_topics/hooks.txt:284
13000
msgid ""
13001
"LockHooks\n"
13002
"---------"
13003
msgstr ""
13004
"LockHooks\n"
13005
"---------"
13006
13007
13027
#: en/help_topics/hooks.txt:287
13008
13028
msgid ""
13009
"lock_acquired\n"
13010
"~~~~~~~~~~~~~"
13011
msgstr ""
13012
"lock_acquired\n"
13013
"~~~~~~~~~~~~~"
13014
13015
#: en/help_topics/hooks.txt:292
13029
"LockHooks\n"
13030
"---------"
13031
msgstr ""
13032
"LockHooks\n"
13033
"---------"
13034
13035
#: en/help_topics/hooks.txt:290
13036
msgid ""
13037
"lock_acquired\n"
13038
"~~~~~~~~~~~~~"
13039
msgstr ""
13040
"lock_acquired\n"
13041
"~~~~~~~~~~~~~"
13042
13043
#: en/help_topics/hooks.txt:295
13016
13044
msgid ""
13017
13045
"Called with a bzrlib.lock.LockResult when a physical lock is acquired."
13018
13046
msgstr ""
13019
13047
13020
#: en/help_topics/hooks.txt:294
13048
#: en/help_topics/hooks.txt:297
13021
13049
msgid ""
13022
13050
"lock_broken\n"
13023
13051
"~~~~~~~~~~~"
13025
13053
"lock_broken\n"
13026
13054
"~~~~~~~~~~~"
13027
13055
13028
#: en/help_topics/hooks.txt:299
13056
#: en/help_topics/hooks.txt:302
13029
13057
msgid "Called with a bzrlib.lock.LockResult when a physical lock is broken."
13030
13058
msgstr ""
13031
13059
13032
#: en/help_topics/hooks.txt:301
13060
#: en/help_topics/hooks.txt:304
13033
13061
msgid ""
13034
13062
"lock_released\n"
13035
13063
"~~~~~~~~~~~~~"
13037
13065
"lock_released\n"
13038
13066
"~~~~~~~~~~~~~"
13039
13067
13040
#: en/help_topics/hooks.txt:306
13068
#: en/help_topics/hooks.txt:309
13041
13069
msgid ""
13042
13070
"Called with a bzrlib.lock.LockResult when a physical lock is released."
13043
13071
msgstr ""
13044
13072
13045
#: en/help_topics/hooks.txt:308
13046
msgid ""
13047
"MergeHooks\n"
13048
"----------"
13049
msgstr ""
13050
"MergeHooks\n"
13051
"----------"
13052
13053
13073
#: en/help_topics/hooks.txt:311
13054
13074
msgid ""
13055
"merge_file_content\n"
13056
"~~~~~~~~~~~~~~~~~~"
13075
"MergeHooks\n"
13076
"----------"
13057
13077
msgstr ""
13058
"merge_file_content\n"
13059
"~~~~~~~~~~~~~~~~~~"
13078
"MergeHooks\n"
13079
"----------"
13060
13080
13061
13081
#: en/help_topics/hooks.txt:314
13082
msgid ""
13083
"merge_file_content\n"
13084
"~~~~~~~~~~~~~~~~~~"
13085
msgstr ""
13086
"merge_file_content\n"
13087
"~~~~~~~~~~~~~~~~~~"
13088
13089
#: en/help_topics/hooks.txt:317
13062
13090
msgid "Introduced in: 2.1"
13063
13091
msgstr "Introducido en: 2.1"
13064
13092
13065
#: en/help_topics/hooks.txt:316
13093
#: en/help_topics/hooks.txt:319
13066
13094
msgid ""
13067
13095
"Called with a bzrlib.merge.Merger object to create a per file merge\n"
13068
13096
"object when starting a merge. Should return either None or a subclass\n"
13072
13100
"AbstractPerFileMerger API docs for details on how it is used by merge."
13073
13101
msgstr ""
13074
13102
13075
#: en/help_topics/hooks.txt:323
13103
#: en/help_topics/hooks.txt:326
13076
13104
msgid ""
13077
13105
"post_merge\n"
13078
13106
"~~~~~~~~~~"
13079
13107
msgstr ""
13080
13108
13081
#: en/help_topics/hooks.txt:326 en/help_topics/hooks.txt:334
13082
#: en/help_topics/hooks.txt:384 en/help_topics/hooks.txt:402
13083
#: en/help_topics/hooks.txt:410 en/help_topics/hooks.txt:509
13109
#: en/help_topics/hooks.txt:329 en/help_topics/hooks.txt:337
13110
#: en/help_topics/hooks.txt:387 en/help_topics/hooks.txt:405
13111
#: en/help_topics/hooks.txt:413 en/help_topics/hooks.txt:512
13084
13112
msgid "Introduced in: 2.5"
13085
13113
msgstr ""
13086
13114
13087
#: en/help_topics/hooks.txt:328
13115
#: en/help_topics/hooks.txt:331
13088
13116
msgid ""
13089
13117
"Called after a merge. Receives a Merger object as the single argument.\n"
13090
13118
"The return value is ignored."
13091
13119
msgstr ""
13092
13120
13093
#: en/help_topics/hooks.txt:331
13121
#: en/help_topics/hooks.txt:334
13094
13122
msgid ""
13095
13123
"pre_merge\n"
13096
13124
"~~~~~~~~~"
13097
13125
msgstr ""
13098
13126
13099
#: en/help_topics/hooks.txt:336
13127
#: en/help_topics/hooks.txt:339
13100
13128
msgid ""
13101
13129
"Called before a merge. Receives a Merger object as the single\n"
13102
13130
"argument."
13103
13131
msgstr ""
13104
13132
13105
#: en/help_topics/hooks.txt:339
13106
msgid ""
13107
"MergeDirectiveHooks\n"
13108
"-------------------"
13109
msgstr ""
13110
"MergeDirectiveHooks\n"
13111
"-------------------"
13112
13113
13133
#: en/help_topics/hooks.txt:342
13114
13134
msgid ""
13115
"merge_request_body\n"
13116
"~~~~~~~~~~~~~~~~~~"
13135
"MergeDirectiveHooks\n"
13136
"-------------------"
13117
13137
msgstr ""
13118
"merge_request_body\n"
13119
"~~~~~~~~~~~~~~~~~~"
13138
"MergeDirectiveHooks\n"
13139
"-------------------"
13120
13140
13121
13141
#: en/help_topics/hooks.txt:345
13142
msgid ""
13143
"merge_request_body\n"
13144
"~~~~~~~~~~~~~~~~~~"
13145
msgstr ""
13146
"merge_request_body\n"
13147
"~~~~~~~~~~~~~~~~~~"
13148
13149
#: en/help_topics/hooks.txt:348
13122
13150
msgid "Introduced in: 1.15.0"
13123
13151
msgstr "Introducido en: 1.15.0"
13124
13152
13125
#: en/help_topics/hooks.txt:347
13153
#: en/help_topics/hooks.txt:350
13126
13154
msgid ""
13127
13155
"Called with a MergeRequestBodyParams when a body is needed for a merge\n"
13128
13156
"request. Callbacks must return a body. If more than one callback is\n"
13129
13157
"registered, the output of one callback is provided to the next."
13130
13158
msgstr ""
13131
13159
13132
#: en/help_topics/hooks.txt:351
13133
msgid ""
13134
"MessageEditorHooks\n"
13135
"------------------"
13136
msgstr ""
13137
"MessageEditorHooks\n"
13138
"------------------"
13139
13140
13160
#: en/help_topics/hooks.txt:354
13141
13161
msgid ""
13142
"commit_message_template\n"
13143
"~~~~~~~~~~~~~~~~~~~~~~~"
13162
"MessageEditorHooks\n"
13163
"------------------"
13144
13164
msgstr ""
13145
"commit_message_template\n"
13146
"~~~~~~~~~~~~~~~~~~~~~~~"
13165
"MessageEditorHooks\n"
13166
"------------------"
13147
13167
13148
13168
#: en/help_topics/hooks.txt:357
13169
msgid ""
13170
"commit_message_template\n"
13171
"~~~~~~~~~~~~~~~~~~~~~~~"
13172
msgstr ""
13173
"commit_message_template\n"
13174
"~~~~~~~~~~~~~~~~~~~~~~~"
13175
13176
#: en/help_topics/hooks.txt:360
13149
13177
msgid "Introduced in: 1.10"
13150
13178
msgstr "Introducido en: 1.10"
13151
13179
13152
#: en/help_topics/hooks.txt:359
13180
#: en/help_topics/hooks.txt:362
13153
13181
msgid ""
13154
13182
"Called when a commit message is being generated.\n"
13155
13183
"commit_message_template is called with the bzrlib.commit.Commit object\n"
13160
13188
"second, and so on."
13161
13189
msgstr ""
13162
13190
13163
#: en/help_topics/hooks.txt:367
13191
#: en/help_topics/hooks.txt:370
13164
13192
msgid ""
13165
13193
"set_commit_message\n"
13166
13194
"~~~~~~~~~~~~~~~~~~"
13168
13196
"set_commit_message\n"
13169
13197
"~~~~~~~~~~~~~~~~~~"
13170
13198
13171
#: en/help_topics/hooks.txt:372
13199
#: en/help_topics/hooks.txt:375
13172
13200
msgid ""
13173
13201
"Set a fixed commit message. set_commit_message is called with the\n"
13174
13202
"bzrlib.commit.Commit object (so you can also change e.g. revision\n"
13177
13205
"should use the message editor as normal."
13178
13206
msgstr ""
13179
13207
13180
#: en/help_topics/hooks.txt:378
13181
msgid ""
13182
"MutableTreeHooks\n"
13183
"----------------"
13184
msgstr ""
13185
"MutableTreeHooks\n"
13186
"----------------"
13187
13188
13208
#: en/help_topics/hooks.txt:381
13189
13209
msgid ""
13210
"MutableTreeHooks\n"
13211
"----------------"
13212
msgstr ""
13213
"MutableTreeHooks\n"
13214
"----------------"
13215
13216
#: en/help_topics/hooks.txt:384
13217
msgid ""
13190
13218
"post_build_tree\n"
13191
13219
"~~~~~~~~~~~~~~~"
13192
13220
msgstr ""
13193
13221
13194
#: en/help_topics/hooks.txt:386
13222
#: en/help_topics/hooks.txt:389
13195
13223
msgid ""
13196
13224
"Called after a completely new tree is built. The hook is called with\n"
13197
13225
"the tree as its only argument."
13198
13226
msgstr ""
13199
13227
13200
#: en/help_topics/hooks.txt:392
13228
#: en/help_topics/hooks.txt:395
13201
13229
msgid "Introduced in: 2.0"
13202
13230
msgstr "Introducido en: 2.0"
13203
13231
13204
#: en/help_topics/hooks.txt:394
13232
#: en/help_topics/hooks.txt:397
13205
13233
msgid ""
13206
13234
"Called after a commit is performed on a tree. The hook is called with\n"
13207
13235
"a bzrlib.mutabletree.PostCommitHookParams object. The mutable tree the\n"
13209
13237
"that object."
13210
13238
msgstr ""
13211
13239
13212
#: en/help_topics/hooks.txt:399
13240
#: en/help_topics/hooks.txt:402
13213
13241
msgid ""
13214
13242
"post_transform\n"
13215
13243
"~~~~~~~~~~~~~~"
13216
13244
msgstr ""
13217
13245
13218
#: en/help_topics/hooks.txt:404
13246
#: en/help_topics/hooks.txt:407
13219
13247
msgid ""
13220
13248
"Called after a tree transform has been performed on a tree. The hook\n"
13221
13249
"is called with the tree that is being transformed and the transform."
13222
13250
msgstr ""
13223
13251
13224
#: en/help_topics/hooks.txt:407
13252
#: en/help_topics/hooks.txt:410
13225
13253
msgid ""
13226
13254
"pre_transform\n"
13227
13255
"~~~~~~~~~~~~~"
13228
13256
msgstr ""
13229
13257
13230
#: en/help_topics/hooks.txt:412
13258
#: en/help_topics/hooks.txt:415
13231
13259
msgid ""
13232
13260
"Called before a tree transform on this tree. The hook is called with\n"
13233
13261
"the tree that is being transformed and the transform."
13234
13262
msgstr ""
13235
13263
13236
#: en/help_topics/hooks.txt:415
13264
#: en/help_topics/hooks.txt:418
13237
13265
msgid ""
13238
13266
"start_commit\n"
13239
13267
"~~~~~~~~~~~~"
13241
13269
"start_commit\n"
13242
13270
"~~~~~~~~~~~~"
13243
13271
13244
#: en/help_topics/hooks.txt:420
13272
#: en/help_topics/hooks.txt:423
13245
13273
msgid ""
13246
13274
"Called before a commit is performed on a tree. The start commit hook\n"
13247
13275
"is able to change the tree before the commit takes place. start_commit\n"
13249
13277
"being performed on."
13250
13278
msgstr ""
13251
13279
13252
#: en/help_topics/hooks.txt:425
13253
msgid ""
13254
"SmartClientHooks\n"
13255
"----------------"
13256
msgstr ""
13257
"SmartClientHooks\n"
13258
"----------------"
13259
13260
13280
#: en/help_topics/hooks.txt:428
13261
13281
msgid ""
13262
"call\n"
13263
"~~~~"
13282
"SmartClientHooks\n"
13283
"----------------"
13264
13284
msgstr ""
13265
"call\n"
13266
"~~~~"
13285
"SmartClientHooks\n"
13286
"----------------"
13267
13287
13268
13288
#: en/help_topics/hooks.txt:431
13289
msgid ""
13290
"call\n"
13291
"~~~~"
13292
msgstr ""
13293
"call\n"
13294
"~~~~"
13295
13296
#: en/help_topics/hooks.txt:434
13269
13297
msgid "Introduced in: unknown"
13270
13298
msgstr ""
13271
13299
13272
#: en/help_topics/hooks.txt:433
13300
#: en/help_topics/hooks.txt:436
13273
13301
msgid ""
13274
13302
"Called when the smart client is submitting a request to the smart\n"
13275
13303
"server. Called with a bzrlib.smart.client.CallHookParams object.\n"
13276
13304
"Streaming request bodies, and responses, are not accessible."
13277
13305
msgstr ""
13278
13306
13279
#: en/help_topics/hooks.txt:437
13280
msgid ""
13281
"SmartServerHooks\n"
13282
"----------------"
13283
msgstr ""
13284
"SmartServerHooks\n"
13285
"----------------"
13286
13287
13307
#: en/help_topics/hooks.txt:440
13288
13308
msgid ""
13289
"server_exception\n"
13290
"~~~~~~~~~~~~~~~~"
13291
msgstr ""
13292
"server_exception\n"
13293
"~~~~~~~~~~~~~~~~"
13294
13295
#: en/help_topics/hooks.txt:445
13309
"SmartServerHooks\n"
13310
"----------------"
13311
msgstr ""
13312
"SmartServerHooks\n"
13313
"----------------"
13314
13315
#: en/help_topics/hooks.txt:443
13316
msgid ""
13317
"server_exception\n"
13318
"~~~~~~~~~~~~~~~~"
13319
msgstr ""
13320
"server_exception\n"
13321
"~~~~~~~~~~~~~~~~"
13322
13323
#: en/help_topics/hooks.txt:448
13296
13324
msgid ""
13297
13325
"Called by the bzr server when an exception occurs. server_exception is\n"
13298
13326
"called with the sys.exc_info() tuple return true for the hook if the\n"
13300
13328
"normally."
13301
13329
msgstr ""
13302
13330
13303
#: en/help_topics/hooks.txt:450
13331
#: en/help_topics/hooks.txt:453
13304
13332
msgid ""
13305
13333
"server_started\n"
13306
13334
"~~~~~~~~~~~~~~"
13308
13336
"server_started\n"
13309
13337
"~~~~~~~~~~~~~~"
13310
13338
13311
#: en/help_topics/hooks.txt:453 en/help_topics/hooks.txt:472
13339
#: en/help_topics/hooks.txt:456 en/help_topics/hooks.txt:475
13312
13340
msgid "Introduced in: 0.16"
13313
13341
msgstr ""
13314
13342
13315
#: en/help_topics/hooks.txt:455
13343
#: en/help_topics/hooks.txt:458
13316
13344
msgid ""
13317
13345
"Called by the bzr server when it starts serving a directory.\n"
13318
13346
"server_started is called with (backing urls, public url), where\n"
13321
13349
"served."
13322
13350
msgstr ""
13323
13351
13324
#: en/help_topics/hooks.txt:461
13352
#: en/help_topics/hooks.txt:464
13325
13353
msgid ""
13326
13354
"server_started_ex\n"
13327
13355
"~~~~~~~~~~~~~~~~~"
13329
13357
"server_started_ex\n"
13330
13358
"~~~~~~~~~~~~~~~~~"
13331
13359
13332
#: en/help_topics/hooks.txt:466
13360
#: en/help_topics/hooks.txt:469
13333
13361
msgid ""
13334
13362
"Called by the bzr server when it starts serving a directory.\n"
13335
13363
"server_started is called with (backing_urls, server_obj)."
13336
13364
msgstr ""
13337
13365
13338
#: en/help_topics/hooks.txt:469
13366
#: en/help_topics/hooks.txt:472
13339
13367
msgid ""
13340
13368
"server_stopped\n"
13341
13369
"~~~~~~~~~~~~~~"
13343
13371
"server_stopped\n"
13344
13372
"~~~~~~~~~~~~~~"
13345
13373
13346
#: en/help_topics/hooks.txt:474
13374
#: en/help_topics/hooks.txt:477
13347
13375
msgid ""
13348
13376
"Called by the bzr server when it stops serving a directory.\n"
13349
13377
"server_stopped is called with the same parameters as the\n"
13350
13378
"server_started hook: (backing_urls, public_url)."
13351
13379
msgstr ""
13352
13380
13353
#: en/help_topics/hooks.txt:478
13354
msgid ""
13355
"StatusHooks\n"
13356
"-----------"
13357
msgstr ""
13358
"StatusHooks\n"
13359
"-----------"
13360
13361
13381
#: en/help_topics/hooks.txt:481
13362
13382
msgid ""
13363
"post_status\n"
13364
"~~~~~~~~~~~"
13365
msgstr ""
13366
"post_status\n"
13367
"~~~~~~~~~~~"
13368
13369
#: en/help_topics/hooks.txt:484 en/help_topics/hooks.txt:495
13383
"StatusHooks\n"
13384
"-----------"
13385
msgstr ""
13386
"StatusHooks\n"
13387
"-----------"
13388
13389
#: en/help_topics/hooks.txt:484
13390
msgid ""
13391
"post_status\n"
13392
"~~~~~~~~~~~"
13393
msgstr ""
13394
"post_status\n"
13395
"~~~~~~~~~~~"
13396
13397
#: en/help_topics/hooks.txt:487 en/help_topics/hooks.txt:498
13370
13398
msgid "Introduced in: 2.3"
13371
13399
msgstr ""
13372
13400
13373
#: en/help_topics/hooks.txt:486
13401
#: en/help_topics/hooks.txt:489
13374
13402
msgid ""
13375
13403
"Called with argument StatusHookParams after Bazaar has displayed the\n"
13376
13404
"status. StatusHookParams has the attributes (old_tree, new_tree,\n"
13379
13407
"status command. to_file is the output stream for writing."
13380
13408
msgstr ""
13381
13409
13382
#: en/help_topics/hooks.txt:492
13410
#: en/help_topics/hooks.txt:495
13383
13411
msgid ""
13384
13412
"pre_status\n"
13385
13413
"~~~~~~~~~~"
13387
13415
"pre_status\n"
13388
13416
"~~~~~~~~~~"
13389
13417
13390
#: en/help_topics/hooks.txt:497
13418
#: en/help_topics/hooks.txt:500
13391
13419
msgid ""
13392
13420
"Called with argument StatusHookParams before Bazaar displays the\n"
13393
13421
"status. StatusHookParams has the attributes (old_tree, new_tree,\n"
13396
13424
"status command. to_file is the output stream for writing."
13397
13425
msgstr ""
13398
13426
13399
#: en/help_topics/hooks.txt:503
13427
#: en/help_topics/hooks.txt:506
13400
13428
msgid ""
13401
13429
"TransportHooks\n"
13402
13430
"--------------"
13403
13431
msgstr ""
13404
13432
13405
#: en/help_topics/hooks.txt:506
13433
#: en/help_topics/hooks.txt:509
13406
13434
msgid ""
13407
13435
"post_connect\n"
13408
13436
"~~~~~~~~~~~~"
13409
13437
msgstr ""
13410
13438
13411
#: en/help_topics/hooks.txt:511
13439
#: en/help_topics/hooks.txt:514
13412
13440
msgid ""
13413
13441
"Called after a new connection is established or a reconnect occurs.\n"
13414
13442
"The sole argument passed is either the connected transport or smart\n"
13415
13443
"medium instance."
13416
13444
msgstr ""
13417
13445
13418
#: en/help_topics/hooks.txt:515
13419
msgid ""
13420
"RioVersionInfoBuilderHooks\n"
13421
"--------------------------"
13422
msgstr ""
13423
"RioVersionInfoBuilderHooks\n"
13424
"--------------------------"
13425
13426
13446
#: en/help_topics/hooks.txt:518
13427
13447
msgid ""
13448
"RioVersionInfoBuilderHooks\n"
13449
"--------------------------"
13450
msgstr ""
13451
"RioVersionInfoBuilderHooks\n"
13452
"--------------------------"
13453
13454
#: en/help_topics/hooks.txt:521
13455
msgid ""
13428
13456
"revision\n"
13429
13457
"~~~~~~~~"
13430
13458
msgstr ""
13431
13459
"revisión\n"
13432
13460
"~~~~~~~~"
13433
13461
13434
#: en/help_topics/hooks.txt:523
13462
#: en/help_topics/hooks.txt:526
13435
13463
msgid ""
13436
13464
"Invoked when adding information about a revision to the RIO stanza\n"
13437
13465
"that is printed. revision is called with a revision object and a RIO\n"
14257
14285
#~ msgstr ""
14258
14286
#~ "set_rh\n"
14259
14287
#~ "~~~~~~"
14288
14289
#~ msgid "Revert files to a previous revision."
14290
#~ msgstr "Revierte los archivos a la revisión previa."
14291
14292
#~ msgid ""
14293
#~ "This makes Bazaar stop tracking changes to the specified files. Bazaar will\n"
14294
#~ "delete them if they can easily be recovered using revert otherwise they\n"
14295
#~ "will be backed up (adding an extention of the form .~#~). If no options or\n"
14296
#~ "parameters are given Bazaar will scan for files that are being tracked by\n"
14297
#~ "Bazaar but missing in your tree and stop tracking them for you."
14298
#~ msgstr ""
14299
#~ "Esto hace que Bazaar deje de revisar los cambios en los archivos "
14300
#~ "especificados.\n"
14301
#~ "Bazaar los borrará si estos pueden ser fácilmente recuperados usando "
14302
#~ "revertir\n"
14303
#~ "de otra manera se hará una copia (agregando la extensión .~#~). Si no se dan "
14304
#~ "\n"
14305
#~ "parámetros u opciones, Bazaar revisará los archivos que están siendo "
14306
#~ "revisados\n"
14307
#~ "por Bazaar pero que no están en su árbol y dejará de revisarlos para usted."
Loggerhead is a web-based interface for Breezy
Version: 2.0.1