« back to all changes in this revision
Viewing changes to po/es.po
- browse files at revision 6581.1.1
- compare with another revision
- compare with revision 3984.5.3
- download diff
- download tarball
- view history from revision 6581.1.1
- Committer: Vincent Ladeuil
- Date: 2013-07-27 10:54:05 UTC
- mfrom: (6093.4.218 bzr)
- mto: This revision was merged to the branch mainline in revision 6582.
- Revision ID: v.ladeuil+lp@free.fr-20130727105405-387zagx5ek6yprb1
Update translations
added
removed
po/es.po
1
1
# Spanish translation for bzr
2
# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
2
# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
3
3
# This file is distributed under the same license as the bzr package.
4
# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
4
# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
5
# Paco Molinero <paco@byasl.com>, 2011.
5
6
#
6
7
msgid ""
7
8
msgstr ""
8
9
"Project-Id-Version: bzr\n"
9
10
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
10
"POT-Creation-Date: 2012-02-02 17:39+0100\n"
11
"PO-Revision-Date: 2012-01-16 16:40+0000\n"
12
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
11
"POT-Creation-Date: 2012-07-10 11:35+0200\n"
12
"PO-Revision-Date: 2013-06-29 08:13+0000\n"
13
"Last-Translator: Jose Luis Tirado <Unknown>\n"
13
14
"Language-Team: Spanish <es@li.org>\n"
14
15
"MIME-Version: 1.0\n"
15
16
"Content-Type: text/plain; charset=UTF-8\n"
16
17
"Content-Transfer-Encoding: 8bit\n"
17
18
"Plural-Forms: nplurals=2; plural=n != 1;\n"
18
"X-Launchpad-Export-Date: 2012-02-04 06:21+0000\n"
19
"X-Generator: Launchpad (build 14738)\n"
19
"X-Launchpad-Export-Date: 2013-06-30 04:30+0000\n"
20
"X-Generator: Launchpad (build 16692)\n"
20
21
21
#: bzrlib/add.py:95
22
#: bzrlib/add.py:93
22
23
msgid "skipping {0} (larger than {1} of {2} bytes)"
23
24
msgstr "omitiendo {0} (mayor que {1} de {2} bytes)"
24
25
25
#: bzrlib/branch.py:872
26
#: bzrlib/branch.py:854
26
27
msgid "Unstacking"
27
28
msgstr "Desapilando"
28
29
29
#: bzrlib/branch.py:3205
30
#: bzrlib/branch.py:2955
30
31
#, python-format
31
32
msgid "Pushed up to revision %d."
32
33
msgstr "Subido a la revisión %d."
33
34
34
#: bzrlib/branch.py:3207
35
#: bzrlib/branch.py:2957
35
36
#, python-format
36
37
msgid "%d tag updated."
37
38
msgid_plural "%d tags updated."
38
msgstr[0] "%d etiqueta actualizada"
39
msgstr[1] "%d etiquetas actualizadas"
39
msgstr[0] "%d etiqueta actualizada."
40
msgstr[1] "%d etiquetas actualizadas."
40
41
41
#: bzrlib/branch.py:3210
42
#: bzrlib/branch.py:2960
42
43
msgid "No new revisions or tags to push."
43
44
msgstr "No hay revisiones o etiquetas para subir."
44
45
45
#: bzrlib/branch.py:3212
46
#: bzrlib/branch.py:2962
46
47
msgid "No new revisions to push."
47
48
msgstr "No hay revisiones para subir."
48
49
49
#: bzrlib/branch.py:3232
50
#: bzrlib/branch.py:2982
50
51
msgid "checked branch {0} format {1}"
51
52
msgstr "rama comprobada {0} formato {1}"
52
53
53
#: bzrlib/branch.py:3235
54
#: bzrlib/branch.py:2985
54
55
#, python-format
55
56
msgid "found error:%s"
56
57
msgstr "error encontrado: %s"
57
58
58
#: 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
59
60
#, python-format
60
61
msgid "Ignoring files outside view. View is %s"
61
62
msgstr "Ignorando archivos fuera de la vista. La vista es %s"
62
63
63
#: bzrlib/builtins.py:218
64
#: bzrlib/builtins.py:260
64
65
#, python-format
65
66
msgid "bzr %s --revision takes exactly one revision identifier"
66
67
msgstr "bzr %s --revision toma exactamente un identificador de revisión"
67
68
68
#: bzrlib/builtins.py:303
69
#: bzrlib/builtins.py:315
69
70
msgid "Display status summary."
70
71
msgstr "Mostrar resumen de estado."
71
72
72
#: bzrlib/builtins.py:305
73
#: bzrlib/builtins.py:317
73
74
msgid ""
74
75
"This reports on versioned and unknown files, reporting them\n"
75
76
"grouped by state. Possible states are:"
77
78
"Esto informa de archivos versionados y desconocidos, se informa de ellos\n"
78
79
"agrupados por estado. Los estados posibles son:"
79
80
80
#: bzrlib/builtins.py:308
81
#: bzrlib/builtins.py:320
81
82
msgid ""
82
83
"added\n"
83
84
" Versioned in the working copy but not in the previous revision."
85
86
"añadido\n"
86
87
" Versionado en la copia de trabajo pero no en la revisión anterior."
87
88
88
#: bzrlib/builtins.py:311
89
#: bzrlib/builtins.py:323
89
90
msgid ""
90
91
"removed\n"
91
92
" Versioned in the previous revision but removed or deleted\n"
95
96
" Versionado en la revisión anterior pero borrado o eliminado\n"
96
97
" en la copia de trabajo."
97
98
98
#: bzrlib/builtins.py:315
99
#: bzrlib/builtins.py:327
99
100
msgid ""
100
101
"renamed\n"
101
102
" Path of this file changed from the previous revision;\n"
107
108
" el siguiente se debería cambiar también. Esto incluye archivos cuyo\n"
108
109
" directorio padre ha sido renombrado."
109
110
110
#: bzrlib/builtins.py:320
111
#: bzrlib/builtins.py:332
111
112
msgid ""
112
113
"modified\n"
113
114
" Text has changed since the previous revision."
115
116
"modificado\n"
116
117
" El texto ha cambiado desde una revisión previa."
117
118
118
#: bzrlib/builtins.py:323
119
#: bzrlib/builtins.py:335
119
120
msgid ""
120
121
"kind changed\n"
121
122
" File kind has been changed (e.g. from file to directory)."
123
124
"tipo cambiado\n"
124
125
" El tipo del archivo ha cambiado (p. e. de archivo a directorio)."
125
126
126
#: bzrlib/builtins.py:326
127
#: bzrlib/builtins.py:338
127
128
msgid ""
128
129
"unknown\n"
129
130
" Not versioned and not matching an ignore pattern."
131
132
"desconocido\n"
132
133
" Ni se ha versionado ni se ha encontrado un patrón ignorado."
133
134
134
#: bzrlib/builtins.py:329
135
#: bzrlib/builtins.py:341
135
136
msgid ""
136
137
"Additionally for directories, symlinks and files with a changed\n"
137
138
"executable bit, Bazaar indicates their type using a trailing\n"
144
145
"final: «/», «@» o «*» respectivamente. Estas decoraciones pueden ser\n"
145
146
"desactivadas usando la opción «--no-classify»."
146
147
147
#: bzrlib/builtins.py:334
148
#: bzrlib/builtins.py:346
148
149
msgid ""
149
150
"To see ignored files use 'bzr ignored'. For details on the\n"
150
151
"changes to file texts, use 'bzr diff'."
152
153
"Para ver archivos ignorados use «bzr ignored». Para más detalles en los \n"
153
154
"cambios de textos en los archivos, use «bzr diff»."
154
155
155
#: bzrlib/builtins.py:337
156
#: bzrlib/builtins.py:349
156
157
msgid ""
157
158
"Note that --short or -S gives status flags for each item, similar\n"
158
159
"to Subversion's status command. To get output similar to svn -q,\n"
164
165
"svn -q\n"
165
166
" use bzr status -SV."
166
167
167
#: bzrlib/builtins.py:341
168
#: bzrlib/builtins.py:353
168
169
msgid ""
169
170
"If no arguments are specified, the status of the entire working\n"
170
171
"directory is shown. Otherwise, only the status of the specified\n"
176
177
"archivos o directorios indicados. Si se proporciona un directorio, se\n"
177
178
"informa del estado de todo lo contenido en ese directorio."
178
179
179
#: bzrlib/builtins.py:346
180
#: bzrlib/builtins.py:358
180
181
msgid ""
181
182
"Before merges are committed, the pending merge tip revisions are\n"
182
183
"shown. To see all pending merge revisions, use the -v option.\n"
190
191
"use\n"
191
192
"la opción no-pending o indique un archivo/directorio."
192
193
193
#: bzrlib/builtins.py:351
194
#: bzrlib/builtins.py:363
194
195
msgid ""
195
196
"To compare the working directory to a specific revision, pass a\n"
196
197
"single revision to the revision argument."
198
199
"Para comparar el directorio de trabajo con una revisión concreta, pase una\n"
199
200
"única revisión como argumento a la revisión."
200
201
201
#: bzrlib/builtins.py:354
202
#: bzrlib/builtins.py:366
202
203
msgid ""
203
204
"To see which files have changed in a specific revision, or between\n"
204
205
"two revisions, pass a revision range to the revision argument.\n"
208
209
"dos revisiones, pase un rango de revisiones al argumento de la revisión.\n"
209
210
"Esto producirá los mismos resultados que llamar «bzr diff --summarize»."
210
211
211
#: bzrlib/builtins.py:363
212
#: bzrlib/builtins.py:375
212
213
msgid "Use short status indicators."
213
214
msgstr "Usar indicadores de estado cortos."
214
215
215
#: bzrlib/builtins.py:365
216
#: bzrlib/builtins.py:377
216
217
msgid "Only show versioned files."
217
218
msgstr "Solo mostrar archivos versionados."
218
219
219
#: bzrlib/builtins.py:367
220
#: bzrlib/builtins.py:379
220
221
msgid "Don't show pending merges."
221
222
msgstr "No mostrar fusiones pendientes."
222
223
223
#: bzrlib/builtins.py:370
224
#: bzrlib/builtins.py:382
224
225
msgid "Do not mark object type using indicator."
225
226
msgstr "No marcar tipo de objeto usando indicador."
226
227
227
#: bzrlib/builtins.py:385
228
#: bzrlib/builtins.py:397
228
229
msgid "bzr status --revision takes exactly one or two revision specifiers"
229
230
msgstr ""
230
231
"bzr status --revision toma exactamente uno o dos especificadores de revisión"
231
232
232
#: bzrlib/builtins.py:429 bzrlib/builtins.py:5183
233
#: bzrlib/builtins.py:441 bzrlib/builtins.py:5230
233
234
msgid "You can only supply one of revision_id or --revision"
234
235
msgstr "Puede suiministrar solo uno revision_id o --revision"
235
236
236
#: bzrlib/builtins.py:432 bzrlib/builtins.py:5185
237
#: bzrlib/builtins.py:444 bzrlib/builtins.py:5232
237
238
msgid "You must supply either --revision or a revision_id"
238
239
msgstr "Puede suiministrar ambos revision_id o --revision"
239
240
240
#: bzrlib/builtins.py:439
241
#: bzrlib/builtins.py:451
241
242
#, python-format
242
243
msgid "Repository %r does not support access to raw revision texts"
243
244
msgstr "El repositorio %r no permite acceso a textos de revisión en bruto"
244
245
245
#: bzrlib/builtins.py:450
246
#: bzrlib/builtins.py:462
246
247
msgid "The repository {0} contains no revision {1}."
247
248
msgstr "El repositorio {0} no contiene revisión {1}."
248
249
249
#: bzrlib/builtins.py:457
250
#: bzrlib/builtins.py:469
250
251
msgid "You cannot specify a NULL revision."
251
252
msgstr "No puede especificar una revisión NULL."
252
253
253
#: bzrlib/builtins.py:549
254
#: bzrlib/builtins.py:561
254
255
msgid "Remove the working tree from a given branch/checkout."
255
256
msgstr "Eliminar el árbol de trabajo de una rama/comprobación dada"
256
257
257
#: bzrlib/builtins.py:551
258
#: bzrlib/builtins.py:563
258
259
msgid ""
259
260
"Since a lightweight checkout is little more than a working tree\n"
260
261
"this will refuse to run against one."
262
263
"Dado que una extracción ligera es poco más que un árbol de trabajo\n"
263
264
"esto impedirá que se ejecute contra una."
264
265
265
#: bzrlib/builtins.py:554
266
#: bzrlib/builtins.py:566
266
267
msgid "To re-create the working tree, use \"bzr checkout\"."
267
268
msgstr "Para recrear el árbol de trabajo, use «bzr checkout»."
268
269
269
#: bzrlib/builtins.py:560
270
#: bzrlib/builtins.py:572
270
271
msgid ""
271
272
"Remove the working tree even if it has uncommitted or shelved changes."
272
273
msgstr ""
273
274
"Eliminar el árbol de trabajo incluso si tiene cambios no confirmados o "
274
275
"archivados."
275
276
276
#: bzrlib/builtins.py:574
277
#: bzrlib/builtins.py:586
277
278
msgid "No working tree to remove"
278
279
msgstr "No existe un árbol de trabajo para eliminar"
279
280
280
#: bzrlib/builtins.py:576
281
#: bzrlib/builtins.py:588
281
282
msgid "You cannot remove the working tree of a remote path"
282
283
msgstr "No puede eliminar el árbol de trabajo de una ruta remota"
283
284
284
#: bzrlib/builtins.py:585
285
#: bzrlib/builtins.py:597
285
286
msgid "You cannot remove the working tree from a lightweight checkout"
286
287
msgstr "No puede eliminar el árbol de trabajo desde una comprobación ligera"
287
288
288
#: bzrlib/builtins.py:625
289
#: bzrlib/builtins.py:637
289
290
msgid ""
290
291
"The tree does not appear to be corrupt. You probably want \"bzr revert\" "
291
292
"instead. Use \"--force\" if you are sure you want to reset the working tree."
294
295
"lugar. Use «--force» si está seguro de que quiere reiniciar el árbol de "
295
296
"trabajo."
296
297
297
#: bzrlib/builtins.py:636
298
#: bzrlib/builtins.py:648
298
299
msgid ""
299
300
", the header appears corrupt, try passing -r -1 to set the state to the last "
300
301
"commit"
302
303
", la cabecera parece corrupta, intente pasando -r -1 para establecer el "
303
304
"estado del último envío"
304
305
305
#: bzrlib/builtins.py:640
306
#: bzrlib/builtins.py:652
306
307
msgid "failed to reset the tree state{0}"
307
308
msgstr "fallo al restablecer el estado{0} del árbol"
308
309
309
#: bzrlib/builtins.py:644
310
#: bzrlib/builtins.py:656
310
311
msgid "Show current revision number."
311
312
msgstr "Mostrar número de revisión actual."
312
313
313
#: bzrlib/builtins.py:646
314
#: bzrlib/builtins.py:658
314
315
msgid "This is equal to the number of revisions on this branch."
315
316
msgstr "Esto es igual al número de revisiones en esta rama."
316
317
317
#: bzrlib/builtins.py:659
318
#: bzrlib/builtins.py:671
318
319
msgid "--tree and --revision can not be used together"
319
320
msgstr "--tree y --revision no se pueden usar juntos"
320
321
321
#: bzrlib/builtins.py:676 bzrlib/builtins.py:5967
322
#: bzrlib/builtins.py:688 bzrlib/builtins.py:5986
322
323
msgid "Tags can only be placed on a single revision, not on a range"
323
324
msgstr ""
324
325
"Las etiquetas solo se pueden emplazar en una única revisión, no en un rango."
325
326
326
#: bzrlib/builtins.py:700
327
#: bzrlib/builtins.py:712
327
328
msgid "Show revno of working tree."
328
329
msgstr "Mostrar número de revisión del árbol de trabajo."
329
330
330
#: bzrlib/builtins.py:748
331
#: bzrlib/builtins.py:760
331
332
msgid "Add specified files or directories."
332
333
msgstr "Añadir archivos especificados o directorios."
333
334
334
#: bzrlib/builtins.py:750
335
#: bzrlib/builtins.py:762
335
336
msgid ""
336
337
"In non-recursive mode, all the named items are added, regardless\n"
337
338
"of whether they were previously ignored. A warning is given if\n"
341
342
"sin tener en cuenta que hayan sido previamente ignorados. Se avisa si\n"
342
343
"cualquiera de los archivos nombrados ya está versionado."
343
344
344
#: bzrlib/builtins.py:754
345
#: bzrlib/builtins.py:766
345
346
msgid ""
346
347
"In recursive mode (the default), files are treated the same way\n"
347
348
"but the behaviour for directories is different. Directories that\n"
360
361
"son añadidos. Esta búsqueda procede recursivamente por los directorios\n"
361
362
"versionados. SI no se indican nombres se asume «.»."
362
363
363
#: bzrlib/builtins.py:762
364
#: bzrlib/builtins.py:774
364
365
msgid ""
365
366
"A warning will be printed when nested trees are encountered,\n"
366
367
"unless they are explicitly ignored."
367
368
msgstr ""
369
"Se imprimirá un aviso cuando se encuentren árboles anidados\n"
370
"a menos que se ignoren explícitamente."
368
371
369
#: bzrlib/builtins.py:765
372
#: bzrlib/builtins.py:777
370
373
msgid ""
371
374
"Therefore simply saying 'bzr add' will version all files that\n"
372
375
"are currently unknown."
374
377
"Por lo tanto, simplemente diciendo «bzr add» versionará todos los archivos\n"
375
378
"desconocidos actualmente."
376
379
377
#: bzrlib/builtins.py:768
380
#: bzrlib/builtins.py:780
378
381
msgid ""
379
382
"Adding a file whose parent directory is not versioned will\n"
380
383
"implicitly add the parent, and so on up to the root. This means\n"
386
389
"significa que nunca necesitaría añadir explícitamente un directorio,\n"
387
390
"ya que serán añadidos cuando añada un archivo del directorio."
388
391
389
#: bzrlib/builtins.py:773
392
#: bzrlib/builtins.py:785
390
393
msgid ""
391
394
"--dry-run will show which files would be added, but not actually\n"
392
395
"add them."
394
397
"--dry-run mostrará que archivos se pueden añadir, pero no los\n"
395
398
"añade realmente."
396
399
397
#: bzrlib/builtins.py:776
400
#: bzrlib/builtins.py:788
398
401
msgid ""
399
402
"--file-ids-from will try to use the file ids from the supplied path.\n"
400
403
"It looks up ids trying to find a matching parent directory with the\n"
412
415
"diferentes como un conflicto). También es útil al fusionar otro proyecto\n"
413
416
"en un subdirectorio de éste."
414
417
415
#: bzrlib/builtins.py:784
418
#: bzrlib/builtins.py:796
416
419
msgid ""
417
420
"Any files matching patterns in the ignore list will not be added\n"
418
421
"unless they are explicitly mentioned."
421
424
"se añadirá\n"
422
425
"salvo que se mencione explícitamente."
423
426
424
#: bzrlib/builtins.py:787
427
#: bzrlib/builtins.py:799
425
428
msgid ""
426
429
"In recursive mode, files larger than the configuration option \n"
427
430
"add.maximum_file_size will be skipped. Named items are never skipped due\n"
432
435
"omitirán\n"
433
436
"por su tamaño."
434
437
435
#: bzrlib/builtins.py:794
438
#: bzrlib/builtins.py:806
436
439
msgid "Don't recursively add the contents of directories."
437
440
msgstr "No añade de manera recursiva los contenidos de los directorios."
438
441
439
#: bzrlib/builtins.py:800
442
#: bzrlib/builtins.py:813
440
443
msgid "Lookup file ids from this tree."
441
444
msgstr "Buscar id de archivos desde este árbol."
442
445
443
#: bzrlib/builtins.py:836
446
#: bzrlib/builtins.py:849
444
447
msgid "ignored {0} matching \"{1}\"\n"
445
448
msgstr "ignorado {0} coincidente «{1}»\n"
446
449
447
#: bzrlib/builtins.py:841
450
#: bzrlib/builtins.py:854
448
451
msgid "Create a new versioned directory."
449
452
msgstr "Crear un directorio versionado nuevo."
450
453
451
#: bzrlib/builtins.py:843
454
#: bzrlib/builtins.py:856
452
455
msgid "This is equivalent to creating the directory and then adding it."
453
456
msgstr "Esto es equivalente a crear el directorio y luego añadirlo."
454
457
455
#: bzrlib/builtins.py:850
458
#: bzrlib/builtins.py:863
456
459
msgid "No error if existing, make parent directories as needed."
457
460
msgstr ""
461
"Sin error si existen, creará los directorios padre según se necesiten."
458
462
459
#: bzrlib/builtins.py:884
463
#: bzrlib/builtins.py:897
460
464
#, python-format
461
465
msgid "added %s\n"
462
466
msgstr "añadido %s\n"
463
467
464
#: bzrlib/builtins.py:926
468
#: bzrlib/builtins.py:939
465
469
#, python-format
466
470
msgid "invalid kind %r specified"
467
471
msgstr "tipo inválido %r especificado"
468
472
469
#: bzrlib/builtins.py:963
473
#: bzrlib/builtins.py:976
470
474
msgid "Move or rename a file."
471
475
msgstr "Mover o renombrar un archivo."
472
476
473
#: bzrlib/builtins.py:965
477
#: bzrlib/builtins.py:978
474
478
msgid " bzr mv SOURCE... DESTINATION"
475
479
msgstr " bzr mv ORIGEN... DESTINO"
476
480
477
#: bzrlib/builtins.py:967
481
#: bzrlib/builtins.py:980
478
482
msgid ""
479
483
"If the last argument is a versioned directory, all the other names\n"
480
484
"are moved into it. Otherwise, there must be exactly two arguments\n"
484
488
"se moverán a él. De otra forma, deben haber exactamente dos argumentos\n"
485
489
"y el archivo se cambia al nuevo nombre."
486
490
487
#: bzrlib/builtins.py:971
491
#: bzrlib/builtins.py:984
488
492
msgid ""
489
493
"If OLDNAME does not exist on the filesystem but is versioned and\n"
490
494
"NEWNAME does exist on the filesystem but is not versioned, mv\n"
498
502
"inventario interno para reflejar ese cambio.\n"
499
503
"Lo mismo es válido cuando se mueven muchos archivos ORIGEN a un DESTINO."
500
504
501
#: bzrlib/builtins.py:977
505
#: bzrlib/builtins.py:990
502
506
msgid "Files cannot be moved between branches."
503
507
msgstr "Los archivos no se pueden mover entre ramas."
504
508
505
#: bzrlib/builtins.py:984
509
#: bzrlib/builtins.py:997
506
510
msgid ""
507
511
"Move only the bzr identifier of the file, because the file has already been "
508
512
"moved."
510
514
"Mover solo el identificador bzr del archivo, porque el archivo ya ha sido "
511
515
"movido."
512
516
513
#: bzrlib/builtins.py:986
517
#: bzrlib/builtins.py:999
514
518
msgid "Automatically guess renames."
515
519
msgstr "Adivinar automáticamente rel renombrado."
516
520
517
#: bzrlib/builtins.py:987
521
#: bzrlib/builtins.py:1000
518
522
msgid "Avoid making changes when guessing renames."
519
523
msgstr "Evitar hacer cambios cunado se adivina el renombrado."
520
524
521
#: bzrlib/builtins.py:996
525
#: bzrlib/builtins.py:1009
522
526
msgid "--dry-run requires --auto."
523
527
msgstr "--dry-run requiere --auto."
524
528
525
#: bzrlib/builtins.py:1000
529
#: bzrlib/builtins.py:1013
526
530
msgid "missing file argument"
527
531
msgstr "falta el argumento de archivo"
528
532
529
#: bzrlib/builtins.py:1004
533
#: bzrlib/builtins.py:1017
530
534
msgid "can not move root of branch"
531
535
msgstr "no se puede mover la raíz de la rama"
532
536
533
#: bzrlib/builtins.py:1010
537
#: bzrlib/builtins.py:1023
534
538
msgid "Only one path may be specified to --auto."
535
539
msgstr "Solo se puede especificar una ruta a --auto"
536
540
537
#: bzrlib/builtins.py:1013
541
#: bzrlib/builtins.py:1026
538
542
msgid "--after cannot be specified with --auto."
539
543
msgstr "--after no se puede especificar con --auto."
540
544
541
#: bzrlib/builtins.py:1050
545
#: bzrlib/builtins.py:1062
542
546
msgid "to mv multiple files the destination must be a versioned directory"
543
547
msgstr ""
544
548
"para hacer mv a múltiples archivos el destino debe ser un directorio "
545
549
"versionado"
546
550
547
#: bzrlib/builtins.py:1102
551
#: bzrlib/builtins.py:1114
548
552
msgid "Turn this branch into a mirror of another branch."
549
553
msgstr "Cambiar esta rama a una réplica de otra rama."
550
554
551
#: bzrlib/builtins.py:1104
555
#: bzrlib/builtins.py:1116
552
556
msgid ""
553
557
"By default, this command only works on branches that have not diverged.\n"
554
558
"Branches are considered diverged if the destination branch's most recent \n"
560
564
"rama destino es una que no ha sido fusionada (directa o indirectamente) \n"
561
565
"en el padre."
562
566
563
#: bzrlib/builtins.py:1109
567
#: bzrlib/builtins.py:1121
564
568
msgid ""
565
569
"If branches have diverged, you can use 'bzr merge' to integrate the changes\n"
566
570
"from one into the other. Once one branch has merged, the other should\n"
571
575
"de una en la otra. Una vez que una rama se ha fusionado, la otra debería\n"
572
576
"ser capaz de extraer de nuevo."
573
577
574
#: bzrlib/builtins.py:1113
578
#: bzrlib/builtins.py:1125
575
579
msgid ""
576
580
"If you want to replace your local changes and just want your branch to\n"
577
581
"match the remote one, use pull --overwrite. This will work even if the two\n"
581
585
"coincida con la remota, use pull --overwrite. Esto funcionará incluso\n"
582
586
"si las dos ramas han divergido."
583
587
584
#: bzrlib/builtins.py:1117
588
#: bzrlib/builtins.py:1129
585
589
msgid ""
586
590
"If there is no default location set, the first pull will set it (use\n"
587
591
"--no-remember to avoid setting it). After that, you can omit the\n"
593
597
"ubicación para usar la predeterminada. Para cambiarla, use --remember. El\n"
594
598
"valor solo se guardará si la ubicación remota es accesible."
595
599
596
#: bzrlib/builtins.py:1122
600
#: bzrlib/builtins.py:1134
597
601
msgid ""
598
602
"The --verbose option will display the revisions pulled using the log_format\n"
599
603
"configuration option. You can use a different format by overriding it with\n"
603
607
"configuración log_format. Puede usar un formato distinto redefiniéndolo\n"
604
608
"con -Olog_format=<otro_formato>."
605
609
606
#: bzrlib/builtins.py:1126
610
#: bzrlib/builtins.py:1138
607
611
msgid ""
608
612
"Note: The location can be specified either in the form of a branch,\n"
609
613
"or in the form of a path to a file containing a merge directive generated\n"
613
617
"o en forma de una ruta a un archivo conteniendo una directiva de\n"
614
618
"fusión generada con bzr send."
615
619
616
#: bzrlib/builtins.py:1134
620
#: bzrlib/builtins.py:1146
617
621
msgid "Show logs of pulled revisions."
618
622
msgstr "Mostrar registros de revisiones extraídas."
619
623
620
#: bzrlib/builtins.py:1136
624
#: bzrlib/builtins.py:1148
621
625
msgid ""
622
626
"Branch to pull into, rather than the one containing the working directory."
623
627
msgstr ""
624
628
"Rama en la que extraer, en lugar de la que contiene el directorio de trabajo."
625
629
626
#: bzrlib/builtins.py:1139
630
#: bzrlib/builtins.py:1151
627
631
msgid ""
628
632
"Perform a local pull in a bound branch. Local pulls are not applied to the "
629
633
"master branch."
631
635
"Efectuar una extracción local en una rama ligada. Las extracciones locales "
632
636
"no se aplican a la rama maestra."
633
637
634
#: bzrlib/builtins.py:1168
638
#: bzrlib/builtins.py:1189
635
639
msgid "Need working tree for --show-base."
636
640
msgstr "Se necesita árbol de trabajo para --show-base."
637
641
638
#: bzrlib/builtins.py:1184
642
#: bzrlib/builtins.py:1205
639
643
msgid "No pull location known or specified."
640
644
msgstr "Ubicación de extración no conocida ni indicada."
641
645
642
#: bzrlib/builtins.py:1190
646
#: bzrlib/builtins.py:1211
643
647
#, python-format
644
648
msgid "Using saved parent location: %s\n"
645
649
msgstr "Usar ubicaciones padre guardadas: %s\n"
646
650
647
#: bzrlib/builtins.py:1197 bzrlib/builtins.py:4393
651
#: bzrlib/builtins.py:1218 bzrlib/builtins.py:4425
648
652
msgid "Cannot use -r with merge directives or bundles"
649
653
msgstr "No se puede usar -r con directivas de fusión o paquetes"
650
654
651
#: bzrlib/builtins.py:1238
655
#: bzrlib/builtins.py:1261
652
656
msgid "Update a mirror of this branch."
653
657
msgstr "Actualizar una réplica de esta rama."
654
658
655
#: bzrlib/builtins.py:1240
659
#: bzrlib/builtins.py:1263
656
660
msgid ""
657
661
"The target branch will not have its working tree populated because this\n"
658
662
"is both expensive, and is not supported on remote file systems."
660
664
"El árbol de trabajo de la rama destino no se rellenará porque esto\n"
661
665
"es tanto costoso como no soportado por sistemas de archivos remotos."
662
666
663
#: bzrlib/builtins.py:1243
667
#: bzrlib/builtins.py:1266
664
668
msgid ""
665
669
"Some smart servers or protocols *may* put the working tree in place in\n"
666
670
"the future."
669
673
"trabajo\n"
670
674
"en su lugar en el futuro."
671
675
672
#: bzrlib/builtins.py:1246
676
#: bzrlib/builtins.py:1269
673
677
msgid ""
674
678
"This command only works on branches that have not diverged. Branches are\n"
675
679
"considered diverged if the destination branch's most recent commit is one\n"
679
683
"consideran divergidas si la confirmación más reciente de la rama destino es\n"
680
684
"una que no ha sido fusionada (directa o indirectamente) por la rama origen."
681
685
682
#: bzrlib/builtins.py:1250
686
#: bzrlib/builtins.py:1273
683
687
msgid ""
684
688
"If branches have diverged, you can use 'bzr push --overwrite' to replace\n"
685
689
"the other branch completely, discarding its unmerged changes."
688
692
"reemplazar\n"
689
693
"la otra rama completamente, descartando sus cambios no fusionados."
690
694
691
#: bzrlib/builtins.py:1253
695
#: bzrlib/builtins.py:1276
692
696
msgid ""
693
697
"If you want to ensure you have the different changes in the other branch,\n"
694
698
"do a merge (see bzr help merge) from the other branch, and commit that.\n"
698
702
"haga una fusión (vea bzr help merge) desde la otra rama y confirmela.\n"
699
703
"Después eso será capaz de hacer una inserción sin «--overwrite»."
700
704
701
#: bzrlib/builtins.py:1257
705
#: bzrlib/builtins.py:1280
702
706
msgid ""
703
707
"If there is no default push location set, the first push will set it (use\n"
704
708
"--no-remember to avoid setting it). After that, you can omit the\n"
705
709
"location to use the default. To change the default, use --remember. The\n"
706
710
"value will only be saved if the remote location can be accessed."
707
711
msgstr ""
712
"Si no existe una ubicación de «pushx definida, el primer «push» la "
713
"determinará (Usar \n"
714
"--no-remember para evitar su configuración). Después de esto, podrá omitir "
715
"la\n"
716
"ubicación para usar la predeterminada. Para cambiar la ubicación "
717
"predeterminada, usar --remember. El\n"
718
"parámetro solo será guardado si es posible el acceso a la ubicación remota."
708
719
709
#: bzrlib/builtins.py:1262
720
#: bzrlib/builtins.py:1285
710
721
msgid ""
711
722
"The --verbose option will display the revisions pushed using the log_format\n"
712
723
"configuration option. You can use a different format by overriding it with\n"
716
727
"configuración log_format. Puede usar un formato distinto redefiniéndolo\n"
717
728
"con -Olog_format=<otro_formato>."
718
729
719
#: bzrlib/builtins.py:1273 bzrlib/foreign.py:272
730
#: bzrlib/builtins.py:1296 bzrlib/foreign.py:272
720
731
msgid ""
721
732
"Branch to push from, rather than the one containing the working directory."
722
733
msgstr ""
723
734
"Rama desde la que impulsar en vez de la que contiene el directorio de "
724
735
"trabajo."
725
736
726
#: bzrlib/builtins.py:1276
737
#: bzrlib/builtins.py:1299
727
738
msgid ""
728
739
"By default push will fail if the target directory exists, but does not "
729
740
"already have a control directory. This flag will allow push to proceed."
731
742
"Por defecto «push» fallará si el directorio destino existe, pero no tiene "
732
743
"todavía un directorio de control. Este marcador permitirá a «push» proceder."
733
744
734
#: bzrlib/builtins.py:1281
745
#: bzrlib/builtins.py:1304
735
746
msgid ""
736
747
"Create a stacked branch that references the public location of the parent "
737
748
"branch."
739
750
"Crear una rama apilada que referencia a la ubicación pública de la rama "
740
751
"padre."
741
752
742
#: bzrlib/builtins.py:1284
753
#: bzrlib/builtins.py:1307
743
754
msgid ""
744
755
"Create a stacked branch that refers to another branch for the commit "
745
756
"history. Only the work not present in the referenced branch is included in "
749
760
"confirmaciones. Solo el trabajo no presente en la rama referenciada se "
750
761
"incluye en la rama creada."
751
762
752
#: bzrlib/builtins.py:1289 bzrlib/foreign.py:279
763
#: bzrlib/builtins.py:1312 bzrlib/foreign.py:279
753
764
msgid ""
754
765
"Refuse to push if there are uncommitted changes in the working tree, --no-"
755
766
"strict disables the check."
757
768
"Rechazar empujar si hay cambios sin ejecutar en el árbol de trabajo, --no-"
758
769
"strict desactiva la comprobación."
759
770
760
#: bzrlib/builtins.py:1292
771
#: bzrlib/builtins.py:1315
761
772
msgid "Don't populate the working tree, even for protocols that support it."
762
773
msgstr ""
763
774
"No rellenar el árbol de trabajo, incluso para los protocolos que lo permitan."
764
775
765
#: bzrlib/builtins.py:1336
776
#: bzrlib/builtins.py:1318
777
msgid "Overwrite tags only."
778
msgstr "Solo sobreescribir las etiquetas."
779
780
#: bzrlib/builtins.py:1369
766
781
msgid "Could not determine branch to refer to."
767
782
msgstr "No se puede determinar la rama a la que referirse."
768
783
769
#: bzrlib/builtins.py:1345
784
#: bzrlib/builtins.py:1378
770
785
#, python-format
771
786
msgid ""
772
787
"No push location known or specified. To push to the parent branch (at %s), "
775
790
"Ubicación de inserción no conocida ni indicada. Para insertar en la rama "
776
791
"padre (en %s), use «bzr push :parent»."
777
792
778
#: bzrlib/builtins.py:1351 bzrlib/foreign.py:306
793
#: bzrlib/builtins.py:1384 bzrlib/foreign.py:306
779
794
msgid "No push location known or specified."
780
795
msgstr "No hay una ubicación para impulsar conocida o especificada."
781
796
782
#: bzrlib/builtins.py:1355
797
#: bzrlib/builtins.py:1388
783
798
#, python-format
784
799
msgid "Using saved push location: %s"
785
800
msgstr "Usar la ubicación para impulsar guardada: %s"
786
801
787
#: bzrlib/builtins.py:1365
802
#: bzrlib/builtins.py:1398
788
803
msgid "Create a new branch that is a copy of an existing branch."
789
804
msgstr "Crea una nueva rama que es una copia de la rama existente."
790
805
791
#: bzrlib/builtins.py:1367
806
#: bzrlib/builtins.py:1400
792
807
msgid ""
793
808
"If the TO_LOCATION is omitted, the last component of the FROM_LOCATION will\n"
794
809
"be used. In other words, \"branch ../foo/bar\" will attempt to create "
798
813
"identifier, if any. For example, \"branch lp:foo-bar\" will attempt to\n"
799
814
"create ./foo-bar."
800
815
msgstr ""
816
"Si se omite TO_LOCATION, se usará el último componente de FROM_LOCATION. \n"
817
"En otras palabras, «branch ../foo/bar» intentará crear ./bar.\n"
818
"Si FROM_LOCATION no posee un / o un separador de ubicación incrustado, "
819
"TO_LOCATION\n"
820
"se deriva de FROM_LOCATION al liquidar un esquema líder o identificador\n"
821
"de unidad, si existe alguno. Por ejemplo, «branch lp:foo-bar» intentará "
822
"crear ./foo-bar."
801
823
802
#: bzrlib/builtins.py:1374
824
#: bzrlib/builtins.py:1407
803
825
msgid ""
804
826
"To retrieve the branch as of a particular revision, supply the --revision\n"
805
827
"parameter, as in \"branch foo/bar -r 5\"."
808
830
"-revision\n"
809
831
"como en «branch foo/bar -r 5»."
810
832
811
#: bzrlib/builtins.py:1377
833
#: bzrlib/builtins.py:1410
812
834
msgid "The synonyms 'clone' and 'get' for this command are deprecated."
813
835
msgstr "Los sinónimos «clone» y «get» para esta orden están obsoletos."
814
836
815
#: bzrlib/builtins.py:1387
837
#: bzrlib/builtins.py:1420
816
838
msgid "Create a branch without a working-tree."
817
839
msgstr "Crear una rama sin directorio de trabajo."
818
840
819
#: bzrlib/builtins.py:1389
841
#: bzrlib/builtins.py:1422
820
842
msgid "Switch the checkout in the current directory to the new branch."
821
843
msgstr "Cambiar la comprobación en el directorio actual a la rama nueva."
822
844
823
#: bzrlib/builtins.py:1392
845
#: bzrlib/builtins.py:1425
824
846
msgid ""
825
847
"Create a stacked branch referring to the source branch. The new branch will "
826
848
"depend on the availability of the source branch for all operations."
828
850
"Crear una rama apilada refiriéndose a la rama origen. La nueva rama "
829
851
"dependerá de la disponibilidad de la rama fuente para todas las operaciones."
830
852
831
#: bzrlib/builtins.py:1396
853
#: bzrlib/builtins.py:1429
832
854
msgid "Do not use a shared repository, even if available."
833
855
msgstr "No usar un repositorio compartido, incluso si está disponible."
834
856
835
#: bzrlib/builtins.py:1398
857
#: bzrlib/builtins.py:1431
836
858
msgid ""
837
859
"By default branch will fail if the target directory exists, but does not "
838
860
"already have a control directory. This flag will allow branch to proceed."
841
863
"todavía un directorio de control. Este marcador permitirá a «branch» "
842
864
"proceder."
843
865
844
#: bzrlib/builtins.py:1403
866
#: bzrlib/builtins.py:1436
845
867
msgid "Bind new branch to from location."
846
868
msgstr "Vincular una rama nueva desde la ubicación."
847
869
848
#: bzrlib/builtins.py:1450
870
#: bzrlib/builtins.py:1483
849
871
#, python-format
850
872
msgid "Target directory \"%s\" already exists."
851
873
msgstr "El directorio objetivo «%s» ya existe."
852
874
853
#: bzrlib/builtins.py:1462
875
#: bzrlib/builtins.py:1495
854
876
#, python-format
855
877
msgid "Parent of \"%s\" does not exist."
856
878
msgstr "El padre de «%s» no existe."
857
879
858
#: bzrlib/builtins.py:1481
880
#: bzrlib/builtins.py:1514
859
881
msgid "The branch {0} has no revision {1}."
860
882
msgstr "La rama {0} no tiene revisión {1}."
861
883
862
#: bzrlib/builtins.py:1496 bzrlib/push.py:53
884
#: bzrlib/builtins.py:1529 bzrlib/push.py:53
863
885
#, python-format
864
886
msgid "Created new stacked branch referring to %s."
865
887
msgstr "Creada rama apilada nueva referida a %s."
866
888
867
#: bzrlib/builtins.py:1500
889
#: bzrlib/builtins.py:1533
868
890
#, python-format
869
891
msgid "Branched %d revision."
870
892
msgid_plural "Branched %d revisions."
871
893
msgstr[0] "%d revisión enramada"
872
894
msgstr[1] "%d revisiones enramadas"
873
895
874
#: bzrlib/builtins.py:1505
896
#: bzrlib/builtins.py:1538
875
897
#, python-format
876
898
msgid "New branch bound to %s"
877
899
msgstr "Nueva rama unida a %s"
878
900
879
#: bzrlib/builtins.py:1510 bzrlib/builtins.py:6256
901
#: bzrlib/builtins.py:1543 bzrlib/builtins.py:6280
880
902
#, python-format
881
903
msgid "Switched to branch: %s"
882
904
msgstr "Cambiado a la rama: %s"
883
905
884
#: bzrlib/builtins.py:1515
906
#: bzrlib/builtins.py:1548
885
907
msgid "List the branches available at the current location."
886
908
msgstr "Lista las ramas disponibles en la ubicación actual."
887
909
888
#: bzrlib/builtins.py:1517
910
#: bzrlib/builtins.py:1550
889
911
msgid ""
890
912
"This command will print the names of all the branches at the current\n"
891
913
"location."
893
915
"Esta orden imprimirá los nombres de todas las ramas en la ubicación\n"
894
916
"actual."
895
917
896
#: bzrlib/builtins.py:1524
918
#: bzrlib/builtins.py:1557
897
919
msgid ""
898
920
"Recursively scan for branches rather than just looking in the specified "
899
921
"location."
901
923
"Buscar recursivamente en las ramas en lugar de mirar solo en la ubicación "
902
924
"indicada."
903
925
904
#: bzrlib/builtins.py:1554
926
#: bzrlib/builtins.py:1586
905
927
msgid "(default)"
906
928
msgstr "(predeterminado)"
907
929
908
#: bzrlib/builtins.py:1566
930
#: bzrlib/builtins.py:1598
909
931
msgid "Create a new checkout of an existing branch."
910
932
msgstr "Crea una nueva comprobación de una rama existente."
911
933
912
#: bzrlib/builtins.py:1568
934
#: bzrlib/builtins.py:1600
913
935
msgid ""
914
936
"If BRANCH_LOCATION is omitted, checkout will reconstitute a working tree "
915
937
"for\n"
918
940
"or if it was never created - i.e. if you pushed the branch to its current\n"
919
941
"location using SFTP."
920
942
msgstr ""
943
"Si BRANCH_LOCATION se omie, checkout reconstituirá un árbol funcional para\n"
944
"la rama encontrada en «.». Esto es útil si se ha eliminado el árbol "
945
"funcional actual\n"
946
"o si nunca fué creado - es decir si se empujó la rama a la ubicación actual "
947
"\n"
948
"usando SFTP."
921
949
922
#: bzrlib/builtins.py:1573
950
#: bzrlib/builtins.py:1605
923
951
msgid ""
924
952
"If the TO_LOCATION is omitted, the last component of the BRANCH_LOCATION "
925
953
"will\n"
930
958
"identifier, if any. For example, \"checkout lp:foo-bar\" will attempt to\n"
931
959
"create ./foo-bar."
932
960
msgstr ""
961
"Si se omite TO_LOCATION, se usará el último componente de FROM_LOCATION.\n"
962
"En otras palabras, «branch ../foo/bar» intentará crear ./bar.\n"
963
"Si FROM_LOCATION no posee un / o un separador de ubicación incrustado, "
964
"TO_LOCATION\n"
965
"es derivada desde FROM_LOCATION al liquidar un esquema líder o "
966
"identificador\n"
967
"de unidad, si existe alguno. Por ejemplo, «branch lp:foo-bar» intentará "
968
"crear ./foo-bar."
933
969
934
#: bzrlib/builtins.py:1580
970
#: bzrlib/builtins.py:1612
935
971
msgid ""
936
972
"To retrieve the branch as of a particular revision, supply the --revision\n"
937
973
"parameter, as in \"checkout foo/bar -r 5\". Note that this will be "
946
982
"desfasado [por lo que no puede confirmar] pero aún así puede ser útil (por \n"
947
983
"ejemplo, para examinar código antiguo)."
948
984
949
#: bzrlib/builtins.py:1590
985
#: bzrlib/builtins.py:1622
950
986
msgid ""
951
987
"Perform a lightweight checkout. Lightweight checkouts depend on access to "
952
988
"the branch for every operation. Normal checkouts can perform common "
958
994
"operaciones habituales como diff y status sin este acceso, así como permitir "
959
995
"confirmaciones locales."
960
996
961
#: bzrlib/builtins.py:1597
997
#: bzrlib/builtins.py:1629
962
998
msgid "Get file contents from this tree."
963
999
msgstr "Conseguir contenidos de archivo desde este árbol."
964
1000
965
#: bzrlib/builtins.py:1599
1001
#: bzrlib/builtins.py:1631
966
1002
msgid "Hard-link working tree files where possible."
967
1003
msgstr ""
968
1004
"Vincular de forma dura los archivos del árbol de trabajo donde sea posible."
969
1005
970
#: bzrlib/builtins.py:1640
1006
#: bzrlib/builtins.py:1672
971
1007
msgid ""
972
1008
"Show list of renamed files.\n"
973
1009
" "
975
1011
"Mostrar la lista de archivos renombrados\n"
976
1012
" "
977
1013
978
#: bzrlib/builtins.py:1670
1014
#: bzrlib/builtins.py:1700
979
1015
msgid "Update a working tree to a new revision."
980
1016
msgstr "Actualiza un árbol de trabajo a una revisión nueva."
981
1017
982
#: bzrlib/builtins.py:1672
1018
#: bzrlib/builtins.py:1702
983
1019
msgid ""
984
1020
"This will perform a merge of the destination revision (the tip of the\n"
985
1021
"branch, or the specified revision) into the working tree, and then make\n"
989
1025
"rama, o la revisión indicada) en el árbol de trabajo, y hará esa\n"
990
1026
"revisión la revisión base del árbol de trabajo. "
991
1027
992
#: bzrlib/builtins.py:1676
1028
#: bzrlib/builtins.py:1706
993
1029
msgid ""
994
1030
"You can use this to visit an older revision, or to update a working tree\n"
995
1031
"that is out of date from its branch."
998
1034
"árbol de trabajo\n"
999
1035
"que esté desactualizado de su rama."
1000
1036
1001
#: bzrlib/builtins.py:1679
1037
#: bzrlib/builtins.py:1709
1002
1038
msgid ""
1003
1039
"If there are any uncommitted changes in the tree, they will be carried\n"
1004
1040
"across and remain as uncommitted changes after the update. To discard\n"
1005
1041
"these changes, use 'bzr revert'. The uncommitted changes may conflict\n"
1006
1042
"with the changes brought in by the change in basis revision."
1007
1043
msgstr ""
1044
"Si hay cambios sin confirmar en el árbol, serán traspasados y permanecerán \n"
1045
"como cambios sin confirmar después de la actualización. Para descartar\n"
1046
"estos cambios, use «bzr revert». Los cambios no confirmados puede entrar\n"
1047
"en conflicto con los cambios traídos por modificaciones en la revisión base."
1008
1048
1009
#: bzrlib/builtins.py:1684
1049
#: bzrlib/builtins.py:1714
1010
1050
msgid ""
1011
1051
"If the tree's branch is bound to a master branch, bzr will also update\n"
1012
1052
"the branch from the master."
1015
1055
"actualizará\n"
1016
1056
"la rama de la superior."
1017
1057
1018
#: bzrlib/builtins.py:1687
1058
#: bzrlib/builtins.py:1717
1019
1059
msgid ""
1020
1060
"You cannot update just a single file or directory, because each Bazaar\n"
1021
1061
"working tree has just a single basis revision. If you want to restore a\n"
1024
1064
"revision, use 'bzr revert' with a '-r' option, or use 'bzr cat' to write\n"
1025
1065
"out the old content of that file to a new location."
1026
1066
msgstr ""
1067
"No puede actualizar solo un único fichero o directorio, porque cada árbol\n"
1068
"de trabajo Bazaar tiene una única revisión base. Si quiere restaurar un\n"
1069
"archivo que ha sido borrado localmente, use «bzr revert» en lugar de «bzr\n"
1070
"update». Si quiere restaurar un archivo a su estado en una revisión\n"
1071
"previa, use «bzr revert» con la opción «-r», o use «bzr cat» para escribir "
1072
"el\n"
1073
"contenido antiguo de ese archivo en una nueva ubicación."
1027
1074
1028
#: bzrlib/builtins.py:1694
1075
#: bzrlib/builtins.py:1724
1029
1076
msgid ""
1030
1077
"The 'dir' argument, if given, must be the location of the root of a\n"
1031
1078
"working tree to update. By default, the working tree that contains the \n"
1032
1079
"current working directory is used."
1033
1080
msgstr ""
1081
"El argumento «dir», si se indica, debe ser la ubicación de la raíz de un\n"
1082
"árbol de trabajo a actualizar. Por defecto, se usa el árbol de trabajo \n"
1083
"que contiene el directorio de trabajo actual."
1034
1084
1035
#: bzrlib/builtins.py:1710
1085
#: bzrlib/builtins.py:1740
1036
1086
msgid "bzr update --revision takes exactly one revision"
1037
1087
msgstr "bzr update --revision toma exactamente una revisión"
1038
1088
1039
#: bzrlib/builtins.py:1718
1089
#: bzrlib/builtins.py:1748
1040
1090
msgid "bzr update can only update a whole tree, not a file or subdirectory"
1041
1091
msgstr ""
1042
1092
"bzr update solo puede actualizar todo un árbol, no un archivo o subdirectorio"
1043
1093
1044
#: bzrlib/builtins.py:1749
1094
#: bzrlib/builtins.py:1779
1045
1095
msgid "Tree is up to date at revision {0} of branch {1}"
1046
1096
msgstr "El árbol está actualizado en la revisión {0} de la rama {1}"
1047
1097
1048
#: bzrlib/builtins.py:1765
1098
#: bzrlib/builtins.py:1795
1049
1099
#, python-format
1050
1100
msgid ""
1051
1101
"branch has no revision %s\n"
1055
1105
"bzr update --revision solo funciona para una revisión en el histórico de la "
1056
1106
"rama"
1057
1107
1058
#: bzrlib/builtins.py:1771
1108
#: bzrlib/builtins.py:1801
1059
1109
msgid "Updated to revision {0} of branch {1}"
1060
1110
msgstr "Actualizado a la revisión {0} de la rama {1}"
1061
1111
1062
#: bzrlib/builtins.py:1775
1112
#: bzrlib/builtins.py:1805
1063
1113
msgid ""
1064
1114
"Your local commits will now show as pending merges with 'bzr status', and "
1065
1115
"can be committed with 'bzr commit'."
1066
1116
msgstr ""
1067
"Sus confirmaciones locales serán ahora mostradas como fusiones pendientes "
1068
"con «bzr status», y pueden ser confirmadas con «bzr commit»."
1117
"Sus envíos locales se mostrarán ahora como fusiones pendientes con «bzr "
1118
"status», y pueden enviarse con «bzr commit»."
1069
1119
1070
#: bzrlib/builtins.py:1784
1120
#: bzrlib/builtins.py:1814
1071
1121
msgid "Show information about a working tree, branch or repository."
1072
1122
msgstr "Muestra información sobre un árbol de trabajo, rama o repositorio."
1073
1123
1074
#: bzrlib/builtins.py:1786
1124
#: bzrlib/builtins.py:1816
1075
1125
msgid ""
1076
1126
"This command will show all known locations and formats associated to the\n"
1077
1127
"tree, branch or repository."
1079
1129
"Esta orden mostrará todas las ubicaciones conocidas y formatos asociados a\n"
1080
1130
"árbol, rama o repositorio."
1081
1131
1082
#: bzrlib/builtins.py:1789
1132
#: bzrlib/builtins.py:1819
1083
1133
msgid ""
1084
1134
"In verbose mode, statistical information is included with each report.\n"
1085
1135
"To see extended statistic information, use a verbosity level of 2 or\n"
1086
1136
"higher by specifying the verbose option multiple times, e.g. -vv."
1087
1137
msgstr ""
1138
"En modo verboso, se incluye información estadística con cada informe.\n"
1139
"Para ver información estadística extendida, use un nivel de verbosidad de 2 "
1140
"o\n"
1141
"superior indicando la opción verbosa varias veces, p.e. -vv."
1088
1142
1089
#: bzrlib/builtins.py:1793
1143
#: bzrlib/builtins.py:1823
1090
1144
msgid "Branches and working trees will also report any missing revisions."
1091
1145
msgstr ""
1092
1146
"Las ramas y los árboles de trabajo informarán también de cualquier revisión "
1093
1147
"que falte."
1094
1148
1095
#: bzrlib/builtins.py:1795 bzrlib/builtins.py:3715 bzrlib/builtins.py:4845
1096
#: bzrlib/builtins.py:6442
1149
#: bzrlib/builtins.py:1825 bzrlib/builtins.py:3744 bzrlib/builtins.py:4885
1150
#: bzrlib/builtins.py:6466
1097
1151
msgid ":Examples:"
1098
1152
msgstr ":Ejemplos:"
1099
1153
1100
#: bzrlib/builtins.py:1797
1154
#: bzrlib/builtins.py:1827
1101
1155
msgid " Display information on the format and related locations:"
1102
1156
msgstr " Muestra información en el formato y ubicaciones relacionadas:"
1103
1157
1104
#: bzrlib/builtins.py:1799
1158
#: bzrlib/builtins.py:1829
1105
1159
msgid " bzr info"
1106
1160
msgstr " información bzr"
1107
1161
1108
#: bzrlib/builtins.py:1801
1162
#: bzrlib/builtins.py:1831
1109
1163
msgid ""
1110
1164
" Display the above together with extended format information and\n"
1111
1165
" basic statistics (like the number of files in the working tree and\n"
1112
1166
" number of revisions in the branch and repository):"
1113
1167
msgstr ""
1168
" Mostrar lo anterior junto a información extendida de formato y\n"
1169
" estadísticas básicas (como el número de archivos en el árbol funcional y\n"
1170
" el número de revisiones en la rama y el repositorio):"
1114
1171
1115
#: bzrlib/builtins.py:1805
1172
#: bzrlib/builtins.py:1835
1116
1173
msgid " bzr info -v"
1117
1174
msgstr " bzr info -v"
1118
1175
1119
#: bzrlib/builtins.py:1807
1176
#: bzrlib/builtins.py:1837
1120
1177
msgid " Display the above together with number of committers to the branch:"
1121
1178
msgstr " Mostrar lo anterior junto con el número de aplicadores de la rama:"
1122
1179
1123
#: bzrlib/builtins.py:1809
1180
#: bzrlib/builtins.py:1839
1124
1181
msgid " bzr info -vv"
1125
1182
msgstr " bzr info -vv"
1126
1183
1127
#: bzrlib/builtins.py:1828
1184
#: bzrlib/builtins.py:1858
1128
1185
msgid "Remove files or directories."
1129
1186
msgstr "Elimina archivos o directorios."
1130
1187
1131
#: bzrlib/builtins.py:1830
1188
#: bzrlib/builtins.py:1860
1132
1189
msgid ""
1133
1190
"This makes Bazaar stop tracking changes to the specified files. Bazaar will\n"
1134
1191
"delete them if they can easily be recovered using revert otherwise they\n"
1135
"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"
1136
1193
"parameters are given Bazaar will scan for files that are being tracked by\n"
1137
1194
"Bazaar but missing in your tree and stop tracking them for you."
1138
1195
msgstr ""
1196
"Esto hace que Bazaar deje tracear cambios de los archivos especificados. "
1197
"Bazaar \n"
1198
"eliminará estos archivos si pueden ser recuperados fácilmente usando "
1199
"revertir, en caso contrario \n"
1200
"serán respaldados (añadiendo una extensión de la forma .~#~). Si no se "
1201
"proporcionan opciones o \n"
1202
"parámetros, Bazaar escaneará los archivos que están siendo seguidos por\n"
1203
" Bazaar pero que faltan en tu árbol y dejarán de ser seguidos."
1139
1204
1140
#: bzrlib/builtins.py:1838
1205
#: bzrlib/builtins.py:1868
1141
1206
msgid "Only remove files that have never been committed."
1142
msgstr "Eliminar solo los archivos que nunca se han aplicado."
1207
msgstr "Eliminar solo los archivos que nunca se han enviado."
1143
1208
1144
#: bzrlib/builtins.py:1840
1209
#: bzrlib/builtins.py:1870
1145
1210
msgid "The file deletion mode to be used."
1146
1211
msgstr "El modo de borrado de archivo a usar."
1147
1212
1148
#: bzrlib/builtins.py:1841
1213
#: bzrlib/builtins.py:1871
1149
1214
msgid "Deletion Strategy"
1150
1215
msgstr "Estrategia de borrado"
1151
1216
1152
#: bzrlib/builtins.py:1842
1217
#: bzrlib/builtins.py:1872
1153
1218
msgid "Backup changed files (default)."
1154
1219
msgstr "Copiar archivos modificados (predeterminado)."
1155
1220
1156
#: bzrlib/builtins.py:1843
1221
#: bzrlib/builtins.py:1873
1157
1222
msgid "Delete from bzr but leave the working copy."
1158
1223
msgstr "Borrar de bzr pero dejar la copia de trabajo."
1159
1224
1160
#: bzrlib/builtins.py:1844
1225
#: bzrlib/builtins.py:1874
1161
1226
msgid "Don't backup changed files."
1162
1227
msgstr "No copiar los archivos modificados."
1163
1228
1164
#: bzrlib/builtins.py:1845
1229
#: bzrlib/builtins.py:1875
1165
1230
msgid ""
1166
1231
"Delete all the specified files, even if they can not be recovered and even "
1167
1232
"if they are non-empty directories. (deprecated, use no-backup)"
1169
1234
"Borrar todos los archivos indicados, incluso si no pueden ser recuperados y "
1170
1235
"aunque existan directorios no vacíos (obsoleto, use no-backup)."
1171
1236
1172
#: bzrlib/builtins.py:1854
1237
#: bzrlib/builtins.py:1884
1173
1238
msgid "(The --force option is deprecated, rather use --no-backup in future.)"
1174
1239
msgstr ""
1175
1240
"(La opción --force está obsoleta, en su lugar use --no-backup en el futuro)"
1176
1241
1177
#: bzrlib/builtins.py:1871
1242
#: bzrlib/builtins.py:1901
1178
1243
msgid "No matching files."
1179
1244
msgstr "No hay archivos coincidentes."
1180
1245
1181
#: bzrlib/builtins.py:1932
1246
#: bzrlib/builtins.py:1962
1182
1247
msgid "Reconcile bzr metadata in a branch."
1183
1248
msgstr "Reconcilia metadatos bzr en una rama."
1184
1249
1185
#: bzrlib/builtins.py:1934
1250
#: bzrlib/builtins.py:1964
1186
1251
msgid ""
1187
1252
"This can correct data mismatches that may have been caused by\n"
1188
1253
"previous ghost operations or bzr upgrades. You should only\n"
1189
1254
"need to run this command if 'bzr check' or a bzr developer\n"
1190
1255
"advises you to run it."
1191
1256
msgstr ""
1257
"Esto puede corregir discrepancias en los datos que puedan haber sido "
1258
"causadas por\n"
1259
"operaciones fantasma previas o por actualizaciones de bzr. Solo debería "
1260
"necesitar\n"
1261
"ejecutar este comando si «bzr check» o un desarrollador de bzr le \n"
1262
"aconsejan hacerlo."
1192
1263
1193
#: bzrlib/builtins.py:1939
1264
#: bzrlib/builtins.py:1969
1194
1265
msgid ""
1195
1266
"If a second branch is provided, cross-branch reconciliation is\n"
1196
1267
"also attempted, which will check that data like the tree root\n"
1197
1268
"id which was not present in very early bzr versions is represented\n"
1198
1269
"correctly in both branches."
1199
1270
msgstr ""
1271
"Si se proporciona una rama secundaria, se intentará una reconciliación \n"
1272
"entre las ramas, la cual, verificará que información como el número de "
1273
"identificación \n"
1274
"del árbol raíz que no estaba presente en versiones anteriores de bzr esté\n"
1275
"representada correctamente en ambas ramas."
1200
1276
1201
#: bzrlib/builtins.py:1944
1277
#: bzrlib/builtins.py:1974
1202
1278
msgid ""
1203
1279
"At the same time it is run it may recompress data resulting in\n"
1204
1280
"a potential saving in disk space or performance gain."
1206
1282
"Al mismo tiempo que se ejecuta, puede comprimir los datos resultando\n"
1207
1283
"un ahorro potencial de espacio en disco o aumento el rendimiento."
1208
1284
1209
#: bzrlib/builtins.py:1947
1285
#: bzrlib/builtins.py:1977
1210
1286
msgid "The branch *MUST* be on a listable system such as local disk or sftp."
1211
1287
msgstr ""
1212
1288
"La rama *DEBE* estar en un sistema que se pueda listar tal como disco local "
1213
1289
"o sftp."
1214
1290
1215
#: bzrlib/builtins.py:2014 bzrlib/builtins.py:2132 bzrlib/builtins.py:3750
1291
#: bzrlib/builtins.py:2044 bzrlib/builtins.py:2162 bzrlib/builtins.py:3779
1216
1292
msgid ""
1217
1293
"Format for the bzr 2.0 series.\n"
1218
1294
"Uses group-compress storage.\n"
1219
1295
"Provides rich roots which are a one-way transition.\n"
1220
1296
msgstr ""
1297
"Formato para las series bzr 2.0.\n"
1298
"Usa almacenamiento group-compress.\n"
1299
"Proporciona roots ricas que tienen una transición de una dirección.\n"
1221
1300
1222
#: bzrlib/builtins.py:2014 bzrlib/builtins.py:2132 bzrlib/builtins.py:3750
1301
#: bzrlib/builtins.py:2044 bzrlib/builtins.py:2162 bzrlib/builtins.py:3779
1223
1302
msgid ""
1224
1303
"Pack-based format used in 1.x series. Introduced in 0.92. Interoperates with "
1225
1304
"bzr repositories before 0.92 but cannot be read by bzr < 0.92. "
1226
1305
msgstr ""
1306
"Formato basado en paquete usado en la versión 1.x. Introducido en 0.92. "
1307
"Interopera con repositorios de bzr antes de 0.92, pero no es compatible con "
1308
"versiones de bzr < 0.92. "
1227
1309
1228
#: bzrlib/builtins.py:2014 bzrlib/builtins.py:2132 bzrlib/builtins.py:3750
1310
#: bzrlib/builtins.py:2044 bzrlib/builtins.py:2162 bzrlib/builtins.py:3779
1229
1311
msgid "The 2a format with experimental support for colocated branches.\n"
1230
msgstr ""
1312
msgstr "El formato 2a con soporte experimental para ramas colocadas.\n"
1231
1313
1232
#: bzrlib/builtins.py:2015
1314
#: bzrlib/builtins.py:2045
1233
1315
msgid "Make a directory into a versioned branch."
1234
1316
msgstr "Hacer un directorio en una rama versionada."
1235
1317
1236
#: bzrlib/builtins.py:2017
1318
#: bzrlib/builtins.py:2047
1237
1319
msgid ""
1238
1320
"Use this to create an empty branch, or before importing an\n"
1239
1321
"existing project."
1241
1323
"Use esto para crear una rama nueva o antes de importar un\n"
1242
1324
"proyecto existente."
1243
1325
1244
#: bzrlib/builtins.py:2020
1326
#: bzrlib/builtins.py:2050
1245
1327
msgid ""
1246
1328
"If there is a repository in a parent directory of the location, then\n"
1247
1329
"the history of the branch will be stored in the repository. Otherwise\n"
1253
1335
"init crea una rama independiente que lleva su propio historial \n"
1254
1336
"en el directorio .bzr."
1255
1337
1256
#: bzrlib/builtins.py:2025
1338
#: bzrlib/builtins.py:2055
1257
1339
msgid ""
1258
1340
"If there is already a branch at the location but it has no working tree,\n"
1259
1341
"the tree can be populated with 'bzr checkout'."
1261
1343
"Si existe ya una rama en la ubicación, pero no tiene árbol de trabajo,\n"
1262
1344
"se puede poblar el árbol con «bzr checkout»."
1263
1345
1264
#: bzrlib/builtins.py:2028
1346
#: bzrlib/builtins.py:2058
1265
1347
msgid "Recipe for importing a tree of files::"
1266
1348
msgstr "Recipiente para importar un árbol de archivos:"
1267
1349
1268
#: bzrlib/builtins.py:2030
1350
#: bzrlib/builtins.py:2060
1269
1351
msgid ""
1270
1352
" cd ~/project\n"
1271
1353
" bzr init\n"
1279
1361
" bzr status\n"
1280
1362
" bzr commit -m «proyecto importado»"
1281
1363
1282
#: bzrlib/builtins.py:2041
1364
#: bzrlib/builtins.py:2071
1283
1365
msgid ""
1284
1366
"Create the path leading up to the branch if it does not already exist."
1285
1367
msgstr "Crea la ruta que conduce a la rama si no existe ya."
1286
1368
1287
#: bzrlib/builtins.py:2044
1369
#: bzrlib/builtins.py:2074
1288
1370
msgid "Specify a format for this branch. See \"help formats\"."
1289
1371
msgstr "Especificar un formato para esta rama. Vea «help formats»"
1290
1372
1291
#: bzrlib/builtins.py:2052
1373
#: bzrlib/builtins.py:2082
1292
1374
msgid ""
1293
1375
"Never change revnos or the existing log. Append revisions to it only."
1294
1376
msgstr ""
1377
"Nunca cambiar revnos o el registro existente. Solo añadir revisiones."
1295
1378
1296
#: bzrlib/builtins.py:2055
1379
#: bzrlib/builtins.py:2085
1297
1380
msgid "Create a branch without a working tree."
1298
1381
msgstr "Crea una rama sin árbol de trabajo."
1299
1382
1300
#: bzrlib/builtins.py:2075 bzrlib/push.py:110
1383
#: bzrlib/builtins.py:2105 bzrlib/push.py:110
1301
1384
#, python-format
1302
1385
msgid ""
1303
1386
"Parent directory of %s does not exist.\n"
1304
1387
"You may supply --create-prefix to create all leading parent directories."
1305
1388
msgstr ""
1389
"El directorio padre de %s no existe.\n"
1390
"Debe indicar --create-prefix para crear todos los directorios padre "
1391
"precedentes."
1306
1392
1307
#: bzrlib/builtins.py:2109
1393
#: bzrlib/builtins.py:2139
1308
1394
msgid ""
1309
1395
"This branch format cannot be set to append-revisions-only. Try --default."
1310
1396
msgstr ""
1311
1397
"Este formato de rama no se puede establecer como append-revisions-only. "
1312
1398
"Intente --default."
1313
1399
1314
#: bzrlib/builtins.py:2120
1400
#: bzrlib/builtins.py:2150
1315
1401
msgid "Created a {0} (format: {1})\n"
1316
1402
msgstr "Creado un {0} (formaot: {1})\n"
1317
1403
1318
#: bzrlib/builtins.py:2129
1404
#: bzrlib/builtins.py:2159
1319
1405
#, python-format
1320
1406
msgid "Using shared repository: %s\n"
1321
1407
msgstr "Usando el repositorio compartido: %s\n"
1322
1408
1323
#: bzrlib/builtins.py:2133
1409
#: bzrlib/builtins.py:2163
1324
1410
msgid "Create a shared repository for branches to share storage space."
1325
1411
msgstr ""
1326
1412
"Crea un repositorio compartido para ramas para compartir el espacio de "
1327
1413
"almacenamiento."
1328
1414
1329
#: bzrlib/builtins.py:2135
1415
#: bzrlib/builtins.py:2165
1330
1416
msgid ""
1331
1417
"New branches created under the repository directory will store their\n"
1332
1418
"revisions in the repository, not in the branch directory. For branches\n"
1333
1419
"with shared history, this reduces the amount of storage needed and \n"
1334
1420
"speeds up the creation of new branches."
1335
1421
msgstr ""
1422
"Las nuevas ramas creadas en la ubicación del repositorio, guardarán sus\n"
1423
"revisiones en el mismo, no en el directorio de la rama. Para las ramas\n"
1424
"con historia compartida, significa una reducción en el espacio de "
1425
"almacenamiento necesario y \n"
1426
"aceleramiento en la cración de nuevas ramas."
1336
1427
1337
#: bzrlib/builtins.py:2140
1428
#: bzrlib/builtins.py:2170
1338
1429
msgid ""
1339
1430
"If the --no-trees option is given then the branches in the repository\n"
1340
1431
"will not have working trees by default. They will still exist as \n"
1343
1434
"store branches which are interacted with through checkouts or remote\n"
1344
1435
"branches, such as on a server."
1345
1436
msgstr ""
1437
"Si se da la opción --no-trees entonces las ramas en el repositorio\n"
1438
"no tendrá árboles de trabajo por defecto. Seguirán existiendo como\n"
1439
"directorios en el disco, pero no van a tener copias separadas de los\n"
1440
"archivos en una cierta revisión. Esto puede ser útil para repositorios que\n"
1441
"almacenan ramas para interactuar a través de comprobaciones o ramas\n"
1442
"remotas, como en un servidor."
1346
1443
1347
#: bzrlib/builtins.py:2147
1444
#: bzrlib/builtins.py:2177
1348
1445
msgid ""
1349
1446
":Examples:\n"
1350
1447
" Create a shared repository holding just branches::"
1352
1449
":Ejemplos:\n"
1353
1450
" Crear un repositorio compartido manteniendo solo las ramas::"
1354
1451
1355
#: bzrlib/builtins.py:2150
1452
#: bzrlib/builtins.py:2180
1356
1453
msgid ""
1357
1454
" bzr init-repo --no-trees repo\n"
1358
1455
" bzr init repo/trunk"
1360
1457
" bzr init-repo --no-trees repo\n"
1361
1458
" bzr init repo/trunk"
1362
1459
1363
#: bzrlib/builtins.py:2153
1460
#: bzrlib/builtins.py:2183
1364
1461
msgid " Make a lightweight checkout elsewhere::"
1365
1462
msgstr " Hace una comprobación ligera en cualquier sitio::"
1366
1463
1367
#: bzrlib/builtins.py:2155
1464
#: bzrlib/builtins.py:2185
1368
1465
msgid ""
1369
1466
" bzr checkout --lightweight repo/trunk trunk-checkout\n"
1370
1467
" cd trunk-checkout\n"
1371
1468
" (add files here)"
1372
1469
msgstr ""
1470
" bzr checkout --lightweight repo/trunk trunk-checkout\n"
1471
" cd trunk-checkout\n"
1472
" (añadir archivos aquí)"
1373
1473
1374
#: bzrlib/builtins.py:2163
1474
#: bzrlib/builtins.py:2193
1375
1475
msgid ""
1376
1476
"Specify a format for this repository. See \"bzr help formats\" for details."
1377
1477
msgstr ""
1378
1478
"Especificar un formato para este repositorio, Vea «bzr help formats» para "
1379
1479
"tener más detalles."
1380
1480
1381
#: bzrlib/builtins.py:2167
1481
#: bzrlib/builtins.py:2197
1382
1482
msgid "Repository format"
1383
1483
msgstr "Formato de repositorio"
1384
1484
1385
#: bzrlib/builtins.py:2169
1485
#: bzrlib/builtins.py:2199
1386
1486
msgid "Branches in the repository will default to not having a working tree."
1387
1487
msgstr ""
1388
1488
"Las ramas en el repositorio no tendrán de manera predeterminada un árbol de "
1389
1489
"trabajo."
1390
1490
1391
#: bzrlib/builtins.py:2195
1491
#: bzrlib/builtins.py:2225
1392
1492
msgid "Show differences in the working tree, between revisions or branches."
1393
1493
msgstr ""
1394
1494
"Muestra diferencias en el árbol de trabajo, entre revisiones o ramas."
1395
1495
1396
#: bzrlib/builtins.py:2197
1496
#: bzrlib/builtins.py:2227
1397
1497
msgid ""
1398
1498
"If no arguments are given, all changes for the current tree are listed.\n"
1399
1499
"If files are given, only the changes in those files are listed.\n"
1402
1502
"the first argument, if any, or the current tree if no arguments are\n"
1403
1503
"given."
1404
1504
msgstr ""
1505
"Si no se dan argumentos, todos los cambios aparecen en el árbol actual.\n"
1506
"Si se facilitan los archivos, solo se mostrarán los cambios en esos "
1507
"archivos.\n"
1508
"Las ramas múltiples y remotas podrán compararse mediante las opciones --old "
1509
"y\n"
1510
"--new. Si no se facilita, el valor predeterminado para ambos se deriva\n"
1511
"desde el primer argumento, si lo hay, o al árbol actual si no los tiene."
1405
1512
1406
#: bzrlib/builtins.py:2204
1513
#: bzrlib/builtins.py:2234
1407
1514
msgid ""
1408
1515
"\"bzr diff -p1\" is equivalent to \"bzr diff --prefix old/:new/\", and\n"
1409
1516
"produces patches suitable for \"patch -p1\"."
1411
1518
"«bzr diff -p1» es equivalente a «bzr diff --prefix old/:new/», y\n"
1412
1519
"produce parches adecuados para «patch -p1»."
1413
1520
1414
#: bzrlib/builtins.py:2207
1521
#: bzrlib/builtins.py:2237
1415
1522
msgid ""
1416
1523
"Note that when using the -r argument with a range of revisions, the\n"
1417
1524
"differences are computed between the two specified revisions. That\n"
1420
1527
"revision ranges used by \"bzr log\" which includes the first revision\n"
1421
1528
"in the range."
1422
1529
msgstr ""
1530
"Tenga en cuenta que cuando se use el argumento -r con un rango de "
1531
"revisiones, las\n"
1532
"diferencias se calculan entre las dos revisiones indicadas. Esto es, la\n"
1533
"orden no muestra los cambios introducidos por la primera \n"
1534
"revisión del rango. Esto difiere de la interpretación de rangos de \n"
1535
"revisiones usada por «bzr log» el cuál incluye la primera revisión\n"
1536
"del rango."
1423
1537
1424
#: bzrlib/builtins.py:2214
1538
#: bzrlib/builtins.py:2244
1425
1539
msgid ""
1426
1540
":Exit values:\n"
1427
1541
" 1 - changed\n"
1435
1549
" 3 - error\n"
1436
1550
" 0 - sin cambios"
1437
1551
1438
#: bzrlib/builtins.py:2220
1552
#: bzrlib/builtins.py:2250
1439
1553
msgid ""
1440
1554
":Examples:\n"
1441
1555
" Shows the difference in the working tree versus the last commit::"
1442
1556
msgstr ""
1443
1557
":Ejemplos:\n"
1444
" Muestra las diferencias en el árbol de trabajo contra la última "
1445
"aplicación::"
1558
" Muestra las diferencias en el árbol de trabajo contra el último envío::"
1446
1559
1447
#: bzrlib/builtins.py:2223
1560
#: bzrlib/builtins.py:2253
1448
1561
msgid " bzr diff"
1449
1562
msgstr " bzr diff"
1450
1563
1451
#: bzrlib/builtins.py:2225
1564
#: bzrlib/builtins.py:2255
1452
1565
msgid " Difference between the working tree and revision 1::"
1453
1566
msgstr " Diferencia entre el árbol de trabajo y la revisión 1::"
1454
1567
1455
#: bzrlib/builtins.py:2227
1568
#: bzrlib/builtins.py:2257
1456
1569
msgid " bzr diff -r1"
1457
1570
msgstr " bzr diff -r1"
1458
1571
1459
#: bzrlib/builtins.py:2229
1572
#: bzrlib/builtins.py:2259
1460
1573
msgid " Difference between revision 3 and revision 1::"
1461
1574
msgstr " Diferencia entre revisión 3 y revisión 1::"
1462
1575
1463
#: bzrlib/builtins.py:2231
1576
#: bzrlib/builtins.py:2261
1464
1577
msgid " bzr diff -r1..3"
1465
1578
msgstr " bzr diff -r1..3"
1466
1579
1467
#: bzrlib/builtins.py:2233
1580
#: bzrlib/builtins.py:2263
1468
1581
msgid " Difference between revision 3 and revision 1 for branch xxx::"
1469
1582
msgstr " Diferencia entre revisión 3 y revisión 1 para la rama xxx::"
1470
1583
1471
#: bzrlib/builtins.py:2235
1584
#: bzrlib/builtins.py:2265
1472
1585
msgid " bzr diff -r1..3 xxx"
1473
1586
msgstr " bzr diff -r1..3 xxx"
1474
1587
1475
#: bzrlib/builtins.py:2237
1588
#: bzrlib/builtins.py:2267
1476
1589
msgid " The changes introduced by revision 2 (equivalent to -r1..2)::"
1477
1590
msgstr ""
1478
1591
" Los cambios introducidos por la revisión 2 (equivalente a -r1..2)::"
1479
1592
1480
#: bzrlib/builtins.py:2239
1593
#: bzrlib/builtins.py:2269
1481
1594
msgid " bzr diff -c2"
1482
1595
msgstr " bzr diff -c2"
1483
1596
1484
#: bzrlib/builtins.py:2241
1597
#: bzrlib/builtins.py:2271
1485
1598
msgid ""
1486
1599
" To see the changes introduced by revision X::\n"
1487
1600
" \n"
1491
1604
" \n"
1492
1605
" bzr diff -cX"
1493
1606
1494
#: bzrlib/builtins.py:2245
1607
#: bzrlib/builtins.py:2275
1495
1608
msgid ""
1496
1609
" Note that in the case of a merge, the -c option shows the changes\n"
1497
1610
" compared to the left hand parent. To see the changes against\n"
1498
1611
" another parent, use::"
1499
1612
msgstr ""
1613
" Note que en caso de fusión, la opción -c muestra los cambios\n"
1614
" comparados con el padre a la izquierda. Para ver los cambios contra\n"
1615
" otro padre, use::"
1500
1616
1501
#: bzrlib/builtins.py:2249
1617
#: bzrlib/builtins.py:2279
1502
1618
msgid " bzr diff -r<chosen_parent>..X"
1503
1619
msgstr " bzr diff -r<padre_elegido>..X"
1504
1620
1505
#: bzrlib/builtins.py:2251
1621
#: bzrlib/builtins.py:2281
1506
1622
msgid ""
1507
1623
" The changes between the current revision and the previous revision\n"
1508
1624
" (equivalent to -c-1 and -r-2..-1)"
1510
1626
" Los cambios entre la versión actual y la previa\n"
1511
1627
" (equivalente a -c-1 y -r-2..-1)"
1512
1628
1513
#: bzrlib/builtins.py:2254
1629
#: bzrlib/builtins.py:2284
1514
1630
msgid " bzr diff -r-2.."
1515
1631
msgstr " bzr diff -r-2.."
1516
1632
1517
#: bzrlib/builtins.py:2256
1633
#: bzrlib/builtins.py:2286
1518
1634
msgid " Show just the differences for file NEWS::"
1519
1635
msgstr " Solo muestra las diferencias para el archivo NEWS::"
1520
1636
1521
#: bzrlib/builtins.py:2258
1637
#: bzrlib/builtins.py:2288
1522
1638
msgid " bzr diff NEWS"
1523
1639
msgstr " bzr diff NEWS"
1524
1640
1525
#: bzrlib/builtins.py:2260
1641
#: bzrlib/builtins.py:2290
1526
1642
msgid " Show the differences in working tree xxx for file NEWS::"
1527
1643
msgstr ""
1528
1644
" Muestra las diferencias en el árbol de trabajo xxx para el archivo NEWS::"
1529
1645
1530
#: bzrlib/builtins.py:2262
1646
#: bzrlib/builtins.py:2292
1531
1647
msgid " bzr diff xxx/NEWS"
1532
1648
msgstr " bzr diff xxx/NEWS"
1533
1649
1534
#: bzrlib/builtins.py:2264
1650
#: bzrlib/builtins.py:2294
1535
1651
msgid " Show the differences from branch xxx to this working tree:"
1536
1652
msgstr ""
1537
1653
" Muestra la diferencias desde la rama xxx a este árbol de trabajo:"
1538
1654
1539
#: bzrlib/builtins.py:2266
1655
#: bzrlib/builtins.py:2296
1540
1656
msgid " bzr diff --old xxx"
1541
1657
msgstr " bzr diff --old xxx"
1542
1658
1543
#: bzrlib/builtins.py:2268
1659
#: bzrlib/builtins.py:2298
1544
1660
msgid " Show the differences between two branches for file NEWS::"
1545
1661
msgstr " Muestra las diferencias entre dos ramas para el archivo NEWS:"
1546
1662
1547
#: bzrlib/builtins.py:2270
1663
#: bzrlib/builtins.py:2300
1548
1664
msgid " bzr diff --old xxx --new yyy NEWS"
1549
1665
msgstr " bzr diff --old xxx --new yyy NEWS"
1550
1666
1551
#: bzrlib/builtins.py:2272
1667
#: bzrlib/builtins.py:2302
1552
1668
msgid " Same as 'bzr diff' but prefix paths with old/ and new/::"
1553
1669
msgstr ""
1554
1670
" Igual que «bzr diff» pero pone el prefijo a las rutas old/ y new/::"
1555
1671
1556
#: bzrlib/builtins.py:2274
1672
#: bzrlib/builtins.py:2304
1557
1673
msgid ""
1558
1674
" bzr diff --prefix old/:new/\n"
1559
1675
" \n"
1561
1677
" \n"
1562
1678
" bzr diff --using /usr/bin/diff --diff-options -wu"
1563
1679
msgstr ""
1680
" bzr diff --prefix old/:new/\n"
1681
" \n"
1682
" Mostrar las diferencias usando un programa de comparación externo con "
1683
"opciones:\n"
1684
" \n"
1685
" bzr diff --using /usr/bin/diff --diff-options -wu"
1564
1686
1565
#: bzrlib/builtins.py:2284
1687
#: bzrlib/builtins.py:2314
1566
1688
msgid "Pass these options to the external diff program."
1567
1689
msgstr "Pasa esta opciones para el programa diff externo."
1568
1690
1569
#: bzrlib/builtins.py:2287
1691
#: bzrlib/builtins.py:2317
1570
1692
msgid ""
1571
1693
"Set prefixes added to old and new filenames, as two values separated by a "
1572
1694
"colon. (eg \"old/:new/\")."
1573
1695
msgstr ""
1696
"Establecer los prefijos añadidos a los nombres de archivos antiguo y nuevo "
1697
"como dos valores separados por dos puntos. (ejemplo, «old/:new/»)."
1574
1698
1575
#: bzrlib/builtins.py:2290
1699
#: bzrlib/builtins.py:2320
1576
1700
msgid "Branch/tree to compare from."
1577
1701
msgstr "Rama/árbol desde donde comparar."
1578
1702
1579
#: bzrlib/builtins.py:2294
1703
#: bzrlib/builtins.py:2324
1580
1704
msgid "Branch/tree to compare to."
1581
1705
msgstr "Rama/árbol a la que comparar."
1582
1706
1583
#: bzrlib/builtins.py:2300
1707
#: bzrlib/builtins.py:2330
1584
1708
msgid "Use this command to compare files."
1585
1709
msgstr "Use esta orden para comparar archivos."
1586
1710
1587
#: bzrlib/builtins.py:2305
1711
#: bzrlib/builtins.py:2335
1588
1712
msgid "Diff format to use."
1589
1713
msgstr "Formato diff a usar."
1590
1714
1591
#: bzrlib/builtins.py:2307
1715
#: bzrlib/builtins.py:2337
1592
1716
msgid "Diff format"
1593
1717
msgstr "Formato diff"
1594
1718
1595
#: bzrlib/builtins.py:2329
1719
#: bzrlib/builtins.py:2359
1596
1720
msgid "--prefix expects two values separated by a colon (eg \"old/:new/\")"
1597
1721
msgstr ""
1598
1722
"--prefix espera dos valores separados por dos puntos (ej. «old/:new/»)"
1599
1723
1600
#: bzrlib/builtins.py:2333
1724
#: bzrlib/builtins.py:2363
1601
1725
msgid "bzr diff --revision takes exactly one or two revision specifiers"
1602
1726
msgstr ""
1603
1727
"bzr diff --revision toma exactamente uno o dos especificadores de revisión"
1604
1728
1605
#: bzrlib/builtins.py:2338 bzrlib/builtins.py:2736 bzrlib/builtins.py:2749
1606
#: bzrlib/builtins.py:2757 bzrlib/builtins.py:4919
1729
#: bzrlib/builtins.py:2368 bzrlib/builtins.py:2765 bzrlib/builtins.py:2778
1730
#: bzrlib/builtins.py:2786 bzrlib/builtins.py:4959
1607
1731
msgid "{0} and {1} are mutually exclusive"
1608
1732
msgstr "{0} y {1} se excluyen mutuamente"
1609
1733
1610
#: bzrlib/builtins.py:2358
1734
#: bzrlib/builtins.py:2388
1611
1735
msgid ""
1612
1736
"List files deleted in the working tree.\n"
1613
1737
" "
1615
1739
"Lista archivos eliminados en el árbol de trabajo.\n"
1616
1740
" "
1617
1741
1618
#: bzrlib/builtins.py:2436
1742
#: bzrlib/builtins.py:2465
1619
1743
msgid "Show the tree root directory."
1620
1744
msgstr "Muestra el directorio raíz del árbol."
1621
1745
1622
#: bzrlib/builtins.py:2438
1746
#: bzrlib/builtins.py:2467
1623
1747
msgid ""
1624
1748
"The root is the nearest enclosing directory with a .bzr control\n"
1625
1749
"directory."
1626
1750
msgstr ""
1751
"El raíz es el directorio envolvente más cercando con un directorio \n"
1752
"de control .bzr."
1627
1753
1628
#: bzrlib/builtins.py:2453
1754
#: bzrlib/builtins.py:2482
1629
1755
msgid "The limit argument must be an integer."
1630
1756
msgstr "El argumento límite debe ser un entero."
1631
1757
1632
#: bzrlib/builtins.py:2461
1758
#: bzrlib/builtins.py:2490
1633
1759
msgid "The levels argument must be an integer."
1634
1760
msgstr "Los argumentos de niveles deben ser un entero."
1635
1761
1636
#: bzrlib/builtins.py:2466
1762
#: bzrlib/builtins.py:2495
1637
1763
msgid "Show historical log for a branch or subset of a branch."
1638
1764
msgstr ""
1639
1765
"Muestra el registro histórico de una rama o un subconjunto de una rama."
1640
1766
1641
#: bzrlib/builtins.py:2468
1767
#: bzrlib/builtins.py:2497
1642
1768
msgid ""
1643
1769
"log is bzr's default tool for exploring the history of a branch.\n"
1644
1770
"The branch to use is taken from the first parameter. If no parameters\n"
1645
1771
"are given, the branch containing the working directory is logged.\n"
1646
1772
"Here are some simple examples::"
1647
1773
msgstr ""
1774
"El registro es la herramienta predeterminada de bzr para explorar la "
1775
"historia\n"
1776
"de una rama. La rama a usar se toma del primer parámetro. Si no se da "
1777
"ningún\n"
1778
"parámetro, se registra la rama que contiene el directorio de trabajo.\n"
1779
"Aquí hay algunos ejemplos sencillos::"
1648
1780
1649
#: bzrlib/builtins.py:2473
1781
#: bzrlib/builtins.py:2502
1650
1782
msgid ""
1651
1783
" bzr log log the current branch\n"
1652
1784
" bzr log foo.py log a file in its branch\n"
1656
1788
" bzr log foo.py registra un archivo en esta rama\n"
1657
1789
" bzr log http://servidor/rama registra una rama en un servidor"
1658
1790
1659
#: bzrlib/builtins.py:2477
1791
#: bzrlib/builtins.py:2506
1660
1792
msgid ""
1661
1793
"The filtering, ordering and information shown for each revision can\n"
1662
1794
"be controlled as explained below. By default, all revisions are\n"
1665
1797
"merged revisions are shown indented under the revision in which they\n"
1666
1798
"were merged."
1667
1799
msgstr ""
1800
"El filtrado, la ordenación y la información mostrada para cada revisión se "
1801
"puede\n"
1802
"controlar tal y como se explica debajo. Por defecto, se muestran todas las\n"
1803
"revisiones (topológicamente) para que las nuevas revisiones aparezcan antes\n"
1804
"que las más antiguas y las descendientes siempre aparezcan antes que las\n"
1805
"ancestras. Si se muestran, las revisiones fusionadas aparecen sangradas "
1806
"bajo la \n"
1807
"revisión en la cual se fusionaron."
1668
1808
1669
#: bzrlib/builtins.py:2484
1809
#: bzrlib/builtins.py:2513
1670
1810
msgid ":Output control:"
1671
1811
msgstr ":Control de saliuda:"
1672
1812
1673
#: bzrlib/builtins.py:2486
1813
#: bzrlib/builtins.py:2515
1674
1814
msgid ""
1675
1815
" The log format controls how information about each revision is\n"
1676
1816
" displayed. The standard log formats are called ``long``, ``short``\n"
1678
1818
" for more details on log formats."
1679
1819
msgstr ""
1680
1820
1681
#: bzrlib/builtins.py:2491
1821
#: bzrlib/builtins.py:2520
1682
1822
msgid ""
1683
1823
" The following options can be used to control what information is\n"
1684
1824
" displayed::"
1686
1826
" Las siguientes opciones se pueden usar para controlar qué información\n"
1687
1827
" se muestra::"
1688
1828
1689
#: bzrlib/builtins.py:2494
1829
#: bzrlib/builtins.py:2523
1690
1830
msgid ""
1691
1831
" -l N display a maximum of N revisions\n"
1692
1832
" -n N display N levels of revisions (0 for all, 1 for collapsed)\n"
1695
1835
" --show-ids display revision-ids (and file-ids), not just revnos"
1696
1836
msgstr ""
1697
1837
1698
#: bzrlib/builtins.py:2500
1838
#: bzrlib/builtins.py:2529
1699
1839
msgid ""
1700
1840
" Note that the default number of levels to display is a function of the\n"
1701
1841
" log format. If the -n option is not used, the standard log formats show\n"
1702
1842
" just the top level (mainline)."
1703
1843
msgstr ""
1704
1844
1705
#: bzrlib/builtins.py:2504
1845
#: bzrlib/builtins.py:2533
1706
1846
msgid ""
1707
1847
" Status summaries are shown using status flags like A, M, etc. To see\n"
1708
1848
" the changes explained using words like ``added`` and ``modified``\n"
1709
1849
" instead, use the -vv option."
1710
1850
msgstr ""
1711
1851
1712
#: bzrlib/builtins.py:2508
1852
#: bzrlib/builtins.py:2537
1713
1853
msgid ":Ordering control:"
1714
1854
msgstr ":Control de ordenación:"
1715
1855
1716
#: bzrlib/builtins.py:2510
1856
#: bzrlib/builtins.py:2539
1717
1857
msgid ""
1718
1858
" To display revisions from oldest to newest, use the --forward option.\n"
1719
1859
" In most cases, using this option will have little impact on the total\n"
1721
1861
" display revisions like --reverse does when it can."
1722
1862
msgstr ""
1723
1863
1724
#: bzrlib/builtins.py:2515
1864
#: bzrlib/builtins.py:2544
1725
1865
msgid ":Revision filtering:"
1726
1866
msgstr ":Filtrado de revisión:"
1727
1867
1728
#: bzrlib/builtins.py:2517
1868
#: bzrlib/builtins.py:2546
1729
1869
msgid ""
1730
1870
" The -r option can be used to specify what revision or range of revisions\n"
1731
1871
" to filter against. The various forms are shown below::"
1732
1872
msgstr ""
1873
" La opción -r se puede usar para indicar qué revisión o rango de "
1874
"revisiones\n"
1875
" contra las que filtrar. Las diferentes formas se muestran a continuación:"
1733
1876
1734
#: bzrlib/builtins.py:2520
1877
#: bzrlib/builtins.py:2549
1735
1878
msgid ""
1736
1879
" -rX display revision X\n"
1737
1880
" -rX.. display revision X and later\n"
1743
1886
" -r..Y muestra hasta la revisión Y inclusive\n"
1744
1887
" -rX..Y muestra desde X a Y inclusive"
1745
1888
1746
#: bzrlib/builtins.py:2525
1889
#: bzrlib/builtins.py:2554
1747
1890
msgid ""
1748
1891
" See ``bzr help revisionspec`` for details on how to specify X and Y.\n"
1749
1892
" Some common examples are given below::"
1752
1895
"X e Y.\n"
1753
1896
" Más abajo se listan algunos ejemplos::"
1754
1897
1755
#: bzrlib/builtins.py:2528
1898
#: bzrlib/builtins.py:2557
1756
1899
msgid ""
1757
1900
" -r-1 show just the tip\n"
1758
1901
" -r-10.. show the last 10 mainline revisions\n"
1762
1905
" -rdate:yesterday.. show changes since yesterday"
1763
1906
msgstr ""
1764
1907
1765
#: bzrlib/builtins.py:2535
1908
#: bzrlib/builtins.py:2564
1766
1909
msgid ""
1767
1910
" When logging a range of revisions using -rX..Y, log starts at\n"
1768
1911
" revision Y and searches back in history through the primary\n"
1772
1915
" a nested merge revision and the log will be truncated accordingly."
1773
1916
msgstr ""
1774
1917
1775
#: bzrlib/builtins.py:2542
1918
#: bzrlib/builtins.py:2571
1776
1919
msgid ":Path filtering:"
1777
1920
msgstr ":Filtrado de ruta:"
1778
1921
1779
#: bzrlib/builtins.py:2544
1922
#: bzrlib/builtins.py:2573
1780
1923
msgid ""
1781
1924
" If parameters are given and the first one is not a branch, the log\n"
1782
1925
" will be filtered to show only those revisions that changed the\n"
1786
1929
" se filtrará para mostrar solo las revisiones que cambiaron los\n"
1787
1930
" archivos o directorios nominados."
1788
1931
1789
#: bzrlib/builtins.py:2548
1932
#: bzrlib/builtins.py:2577
1790
1933
msgid ""
1791
1934
" Filenames are interpreted within their historical context. To log a\n"
1792
1935
" deleted file, specify a revision range so that the file existed at\n"
1793
1936
" the end or start of the range."
1794
1937
msgstr ""
1795
1938
1796
#: bzrlib/builtins.py:2552
1939
#: bzrlib/builtins.py:2581
1797
1940
msgid ""
1798
1941
" Historical context is also important when interpreting pathnames of\n"
1799
1942
" renamed files/directories. Consider the following example:"
1800
1943
msgstr ""
1944
" El contexto histórico también es importante al interpretar las rutas de\n"
1945
" archivos/directorios renombrados. Considere el siguiente ejemplo:"
1801
1946
1802
#: bzrlib/builtins.py:2555
1947
#: bzrlib/builtins.py:2584
1803
1948
msgid ""
1804
1949
" * revision 1: add tutorial.txt\n"
1805
1950
" * revision 2: modify tutorial.txt\n"
1809
1954
" * revisión 2: modificar tutorial.txt\n"
1810
1955
" * revisión 3: renombrar tutorial.txt a guide.txt; añadir tutorial.txt"
1811
1956
1812
#: bzrlib/builtins.py:2559
1957
#: bzrlib/builtins.py:2588
1813
1958
msgid " In this case:"
1814
1959
msgstr " en este caso:"
1815
1960
1816
#: bzrlib/builtins.py:2561
1961
#: bzrlib/builtins.py:2590
1817
1962
msgid " * ``bzr log guide.txt`` will log the file added in revision 1"
1818
1963
msgstr ""
1819
1964
" * ``bzr log guide.txt`` registrará el archivo añadido en revisión 1:"
1820
1965
1821
#: bzrlib/builtins.py:2563
1966
#: bzrlib/builtins.py:2592
1822
1967
msgid ""
1823
1968
" * ``bzr log tutorial.txt`` will log the new file added in revision 3"
1824
1969
msgstr ""
1825
1970
" * «bzr log tutorial.txt» registrará el nuevo archivo añadido en la "
1826
1971
"revisión 3"
1827
1972
1828
#: bzrlib/builtins.py:2565
1973
#: bzrlib/builtins.py:2594
1829
1974
msgid ""
1830
1975
" * ``bzr log -r2 -p tutorial.txt`` will show the changes made to\n"
1831
1976
" the original file in revision 2."
1833
1978
" * «bzr log -r2 -p tutorial.txt» mostrará los cambios realizados al\n"
1834
1979
" archivo original en la revisión 2."
1835
1980
1836
#: bzrlib/builtins.py:2568
1981
#: bzrlib/builtins.py:2597
1837
1982
msgid ""
1838
1983
" * ``bzr log -r2 -p guide.txt`` will display an error message as there\n"
1839
1984
" was no file called guide.txt in revision 2."
1840
1985
msgstr ""
1986
" * «bzr log -r2 -p guide.txt» mostrará un mensaje de error de que\n"
1987
" no había un archivo llamado guide.txt en la revisión 2."
1841
1988
1842
#: bzrlib/builtins.py:2571
1989
#: bzrlib/builtins.py:2600
1843
1990
msgid ""
1844
1991
" Renames are always followed by log. By design, there is no need to\n"
1845
1992
" explicitly ask for this (and no way to stop logging a file back\n"
1846
1993
" until it was last renamed)."
1847
1994
msgstr ""
1848
1995
1849
#: bzrlib/builtins.py:2575
1996
#: bzrlib/builtins.py:2604
1850
1997
msgid ":Other filtering:"
1851
1998
msgstr ":Otro filtrado:"
1852
1999
1853
#: bzrlib/builtins.py:2577
2000
#: bzrlib/builtins.py:2606
1854
2001
msgid ""
1855
2002
" The --match option can be used for finding revisions that match a\n"
1856
2003
" regular expression in a commit message, committer, author or bug.\n"
1859
2006
" --match-message can be used to only match a specific field."
1860
2007
msgstr ""
1861
2008
1862
#: bzrlib/builtins.py:2583
2009
#: bzrlib/builtins.py:2612
1863
2010
msgid ":Tips & tricks:"
1864
2011
msgstr ":Trucos y consejos:"
1865
2012
1866
#: bzrlib/builtins.py:2585
2013
#: bzrlib/builtins.py:2614
1867
2014
msgid ""
1868
2015
" GUI tools and IDEs are often better at exploring history than command\n"
1869
2016
" line tools: you may prefer qlog or viz from qbzr or bzr-gtk, the\n"
1872
2019
" <http://wiki.bazaar.canonical.com/IDEIntegration>. "
1873
2020
msgstr ""
1874
2021
1875
#: bzrlib/builtins.py:2591
2022
#: bzrlib/builtins.py:2620
1876
2023
msgid ""
1877
2024
" You may find it useful to add the aliases below to ``bazaar.conf``::"
1878
2025
msgstr ""
2026
" Puede resultarle útil añadir los alias de abajo para «bazaar.conf»::"
1879
2027
1880
#: bzrlib/builtins.py:2593
2028
#: bzrlib/builtins.py:2622
1881
2029
msgid ""
1882
2030
" [ALIASES]\n"
1883
2031
" tip = log -r-1\n"
1889
2037
" top = log -l10 --line\n"
1890
2038
" show = log -v -p"
1891
2039
1892
#: bzrlib/builtins.py:2598
2040
#: bzrlib/builtins.py:2627
1893
2041
msgid ""
1894
2042
" ``bzr tip`` will then show the latest revision while ``bzr top``\n"
1895
2043
" will show the last 10 mainline revisions. To see the details of a\n"
1896
2044
" particular revision X, ``bzr show -rX``."
1897
2045
msgstr ""
1898
2046
1899
#: bzrlib/builtins.py:2602
2047
#: bzrlib/builtins.py:2631
1900
2048
msgid ""
1901
2049
" If you are interested in looking deeper into a particular merge X,\n"
1902
2050
" use ``bzr log -n0 -rX``."
1904
2052
" Si está interesado en mirar más profundamente en una fusiòn X particular,\n"
1905
2053
" use «bzr log -n0 -rX»."
1906
2054
1907
#: bzrlib/builtins.py:2605
2055
#: bzrlib/builtins.py:2634
1908
2056
msgid ""
1909
2057
" ``bzr log -v`` on a branch with lots of history is currently\n"
1910
2058
" very slow. A fix for this issue is currently under development.\n"
1912
2060
" be given when using the -v option."
1913
2061
msgstr ""
1914
2062
1915
#: bzrlib/builtins.py:2610
2063
#: bzrlib/builtins.py:2639
1916
2064
msgid ""
1917
2065
" bzr has a generic full-text matching plugin, bzr-search, that can be\n"
1918
2066
" used to find revisions matching user names, commit messages, etc.\n"
1920
2068
" a list of words but not others."
1921
2069
msgstr ""
1922
2070
1923
#: bzrlib/builtins.py:2615
2071
#: bzrlib/builtins.py:2644
1924
2072
msgid ""
1925
2073
" When exploring non-mainline history on large projects with deep\n"
1926
2074
" history, the performance of log can be greatly improved by installing\n"
1928
2076
" trading disk space for faster speed."
1929
2077
msgstr ""
1930
2078
1931
#: bzrlib/builtins.py:2624
2079
#: bzrlib/builtins.py:2653
1932
2080
msgid "Show from oldest to newest."
1933
2081
msgstr "Muestra desde el más antiguo al más moderno."
1934
2082
1935
#: bzrlib/builtins.py:2627
2083
#: bzrlib/builtins.py:2656
1936
2084
msgid "Show files changed in each revision."
1937
2085
msgstr "Muestra los archivos cambiados en cada revisión."
1938
2086
1939
#: bzrlib/builtins.py:2633
2087
#: bzrlib/builtins.py:2662
1940
2088
msgid "Show just the specified revision. See also \"help revisionspec\"."
1941
2089
msgstr ""
1942
2090
"Muestra solo la revisión especificada. Vea también «help revisionspec»."
1943
2091
1944
#: bzrlib/builtins.py:2637
2092
#: bzrlib/builtins.py:2666
1945
2093
msgid "What names to list as authors - first, all or committer."
1946
msgstr ""
2094
msgstr "Qué nombres listar como autores - primero, todos o ejecutor."
1947
2095
1948
#: bzrlib/builtins.py:2638
2096
#: bzrlib/builtins.py:2667
1949
2097
msgid "Authors"
1950
2098
msgstr "Autores"
1951
2099
1952
#: bzrlib/builtins.py:2643
2100
#: bzrlib/builtins.py:2672
1953
2101
msgid "Number of levels to display - 0 for all, 1 for flat."
1954
2102
msgstr "Número de niveles a mostrar -0 para todo, 1 para plano."
1955
2103
1956
#: bzrlib/builtins.py:2653
2104
#: bzrlib/builtins.py:2682
1957
2105
msgid "Limit the output to the first N revisions."
1958
2106
msgstr "Límite de salida para las primeras N revisiones."
1959
2107
1960
#: bzrlib/builtins.py:2658
2108
#: bzrlib/builtins.py:2687
1961
2109
msgid "Show changes made in each revision as a patch."
1962
2110
msgstr "Mostrar cambios realizados en cada revisión como un parche."
1963
2111
1964
#: bzrlib/builtins.py:2660
2112
#: bzrlib/builtins.py:2689
1965
2113
msgid "Show merged revisions like --levels 0 does."
1966
msgstr ""
2114
msgstr "Muestra las revisiones combinadas como lo hace --levels 0."
1967
2115
1968
#: bzrlib/builtins.py:2664
2116
#: bzrlib/builtins.py:2693
1969
2117
msgid "Do not report commits with more than one parent."
1970
msgstr "No informar de ejecuciones con más de un padre."
2118
msgstr "No informar de envíos con más de un padre."
1971
2119
1972
#: bzrlib/builtins.py:2666
2120
#: bzrlib/builtins.py:2695
1973
2121
msgid ""
1974
2122
"Display only the revisions that are not part of both ancestries (require -"
1975
2123
"rX..Y)."
1976
2124
msgstr ""
2125
"Muestra solo las revisiones que no sean parte de ambas ascendencias "
2126
"(requiere -rX..Y)."
1977
2127
1978
#: bzrlib/builtins.py:2670
2128
#: bzrlib/builtins.py:2699
1979
2129
msgid "Show digital signature validity."
1980
msgstr ""
2130
msgstr "Mostrar la validez de la firma digital"
1981
2131
1982
#: bzrlib/builtins.py:2673
2132
#: bzrlib/builtins.py:2702
1983
2133
msgid "Show revisions whose properties match this expression."
1984
2134
msgstr "Mostrar revisiones cuyas propiedades coincidan con esta expresión."
1985
2135
1986
#: bzrlib/builtins.py:2677
2136
#: bzrlib/builtins.py:2706
1987
2137
msgid "Show revisions whose message matches this expression."
1988
2138
msgstr "Mostrar revisiones cuyos mensajes coincidan con esta expresión."
1989
2139
1990
#: bzrlib/builtins.py:2681
2140
#: bzrlib/builtins.py:2710
1991
2141
msgid "Show revisions whose committer matches this expression."
1992
2142
msgstr "Mostrar revisiones cuyos ejecutores coincidan con esta expresión."
1993
2143
1994
#: bzrlib/builtins.py:2685
2144
#: bzrlib/builtins.py:2714
1995
2145
msgid "Show revisions whose authors match this expression."
1996
2146
msgstr "Mostrar revisiones cuyos autores coincidan con esta expresión."
1997
2147
1998
#: bzrlib/builtins.py:2689
2148
#: bzrlib/builtins.py:2718
1999
2149
msgid "Show revisions whose bugs match this expression."
2000
2150
msgstr "Mostrar revisiones cuyos errores coincidan con esta expresión."
2001
2151
2002
#: bzrlib/builtins.py:2743
2152
#: bzrlib/builtins.py:2772
2003
2153
msgid "--exclude-common-ancestry requires -r with two revisions"
2004
2154
msgstr "--exclude-common-ancestry requieren -r con dos revisiones"
2005
2155
2006
#: bzrlib/builtins.py:2771
2156
#: bzrlib/builtins.py:2800
2007
2157
#, python-format
2008
2158
msgid "Path unknown at end or start of revision range: %s"
2009
2159
msgstr "Ruta desconocida en el principio o final del rango de revisión: %s"
2010
2160
2011
#: bzrlib/builtins.py:2888
2161
#: bzrlib/builtins.py:2917
2012
2162
#, python-format
2013
2163
msgid "bzr %s doesn't accept two revisions in different branches."
2014
2164
msgstr "bzr %s no acepta dos revisiones en diferentes ramas."
2015
2165
2016
#: bzrlib/builtins.py:2904
2166
#: bzrlib/builtins.py:2933
2017
2167
#, python-format
2018
2168
msgid "bzr %s --revision takes one or two values."
2019
2169
msgstr "bzr %s --revision toma uno o dos valores."
2020
2170
2021
#: bzrlib/builtins.py:2949
2171
#: bzrlib/builtins.py:2978
2022
2172
msgid ""
2023
2173
"List files in a tree.\n"
2024
2174
" "
2026
2176
"Lista archivos en un árbol\n"
2027
2177
" "
2028
2178
2029
#: bzrlib/builtins.py:2958
2179
#: bzrlib/builtins.py:2987
2030
2180
msgid "Recurse into subdirectories."
2031
msgstr ""
2181
msgstr "Recurrir en subdirectorios."
2032
2182
2033
#: bzrlib/builtins.py:2960
2183
#: bzrlib/builtins.py:2989
2034
2184
msgid "Print paths relative to the root of the branch."
2035
2185
msgstr "Imprime rutas relativas a la raíz de la rama."
2036
2186
2037
#: bzrlib/builtins.py:2962
2187
#: bzrlib/builtins.py:2991
2038
2188
msgid "Print unknown files."
2039
2189
msgstr "Imprimir archivos desconocidos."
2040
2190
2041
#: bzrlib/builtins.py:2963
2191
#: bzrlib/builtins.py:2992
2042
2192
msgid "Print versioned files."
2043
2193
msgstr "Imprimir archivos versionados."
2044
2194
2045
#: bzrlib/builtins.py:2966
2195
#: bzrlib/builtins.py:2995
2046
2196
msgid "Print ignored files."
2047
2197
msgstr "Imprimir archivos ignorados."
2048
2198
2049
#: bzrlib/builtins.py:2968
2199
#: bzrlib/builtins.py:2997
2050
2200
msgid "List entries of a particular kind: file, directory, symlink."
2051
2201
msgstr ""
2052
2202
"Lista entradas de un tipo particular; archivo, directorio, vínculo simbólico."
2053
2203
2054
#: bzrlib/builtins.py:2981
2204
#: bzrlib/builtins.py:3010
2055
2205
msgid "invalid kind specified"
2056
2206
msgstr "tivo inválido especificado"
2057
2207
2058
#: bzrlib/builtins.py:2984
2208
#: bzrlib/builtins.py:3013
2059
2209
msgid "Cannot set both --verbose and --null"
2060
2210
msgstr "No se pueden establecer ambos --verbose y --null"
2061
2211
2062
#: bzrlib/builtins.py:2993
2212
#: bzrlib/builtins.py:3022
2063
2213
msgid "cannot specify both --from-root and PATH"
2064
2214
msgstr "No se pueden establecer ambos --from-root y PATH"
2065
2215
2066
#: bzrlib/builtins.py:3080
2216
#: bzrlib/builtins.py:3109
2067
2217
msgid "Ignore specified files or patterns."
2068
2218
msgstr "Ignorar archivos o patrones especificados."
2069
2219
2070
#: bzrlib/builtins.py:3082
2220
#: bzrlib/builtins.py:3111
2071
2221
msgid "See ``bzr help patterns`` for details on the syntax of patterns."
2072
2222
msgstr ""
2073
2223
"Vea «bzr help patterns» para tener detalles sobre la sintaxis de patrones."
2074
2224
2075
#: bzrlib/builtins.py:3084
2225
#: bzrlib/builtins.py:3113
2076
2226
msgid ""
2077
2227
"If a .bzrignore file does not exist, the ignore command\n"
2078
2228
"will create one and add the specified files or patterns to the newly\n"
2081
2231
"the use of the ignore command will require an explicit add command."
2082
2232
msgstr ""
2083
2233
2084
#: bzrlib/builtins.py:3090
2234
#: bzrlib/builtins.py:3119
2085
2235
msgid ""
2086
2236
"To remove patterns from the ignore list, edit the .bzrignore file.\n"
2087
2237
"After adding, editing or deleting that file either indirectly by\n"
2094
2244
"el uso de esta orden, o directamente mediante un editor, asegúrese de "
2095
2245
"ejecutarlo."
2096
2246
2097
#: bzrlib/builtins.py:3095
2247
#: bzrlib/builtins.py:3124
2098
2248
msgid ""
2099
2249
"Bazaar also supports a global ignore file ~/.bazaar/ignore. On Windows\n"
2100
2250
"the global ignore file can be found in the application data directory as\n"
2103
2253
"can be edited directly using an editor."
2104
2254
msgstr ""
2105
2255
2106
#: bzrlib/builtins.py:3101
2256
#: bzrlib/builtins.py:3130
2107
2257
msgid ""
2108
2258
"Patterns prefixed with '!' are exceptions to ignore patterns and take\n"
2109
2259
"precedence over regular ignores. Such exceptions are used to specify\n"
2110
2260
"files that should be versioned which would otherwise be ignored."
2111
2261
msgstr ""
2112
2262
2113
#: bzrlib/builtins.py:3105
2263
#: bzrlib/builtins.py:3134
2114
2264
msgid ""
2115
2265
"Patterns prefixed with '!!' act as regular ignore patterns, but have\n"
2116
2266
"precedence over the '!' exception patterns."
2117
2267
msgstr ""
2118
2268
2119
#: bzrlib/builtins.py:3108
2269
#: bzrlib/builtins.py:3137
2120
2270
msgid ""
2121
2271
":Notes: \n"
2122
2272
" \n"
2124
2274
" the shell on Unix."
2125
2275
msgstr ""
2126
2276
2127
#: bzrlib/builtins.py:3113
2277
#: bzrlib/builtins.py:3142
2128
2278
msgid ""
2129
2279
"* Ignore patterns starting with \"#\" act as comments in the ignore file.\n"
2130
2280
" To ignore patterns that begin with that character, use the \"RE:\" prefix."
2131
2281
msgstr ""
2132
2282
2133
#: bzrlib/builtins.py:3116
2283
#: bzrlib/builtins.py:3145
2134
2284
msgid ""
2135
2285
":Examples:\n"
2136
2286
" Ignore the top level Makefile::"
2137
2287
msgstr ""
2288
":Ejemplos:\n"
2289
" Ignore el Makefile del nivel superior::"
2138
2290
2139
#: bzrlib/builtins.py:3119
2291
#: bzrlib/builtins.py:3148
2140
2292
msgid " bzr ignore ./Makefile"
2141
2293
msgstr " bzr ignore ./Makefile"
2142
2294
2143
#: bzrlib/builtins.py:3121
2295
#: bzrlib/builtins.py:3150
2144
2296
msgid " Ignore .class files in all directories...::"
2145
2297
msgstr " Ignorar archivos .class en todos los directorios...::"
2146
2298
2147
#: bzrlib/builtins.py:3123
2299
#: bzrlib/builtins.py:3152
2148
2300
msgid " bzr ignore \"*.class\""
2149
2301
msgstr " bzr ignore \"*.class\""
2150
2302
2151
#: bzrlib/builtins.py:3125
2303
#: bzrlib/builtins.py:3154
2152
2304
msgid " ...but do not ignore \"special.class\"::"
2153
2305
msgstr " ...pero no ignora «special.class»::"
2154
2306
2155
#: bzrlib/builtins.py:3127
2307
#: bzrlib/builtins.py:3156
2156
2308
msgid " bzr ignore \"!special.class\""
2157
2309
msgstr " bzr ignore «!special.class»"
2158
2310
2159
#: bzrlib/builtins.py:3129
2311
#: bzrlib/builtins.py:3158
2160
2312
msgid " Ignore files whose name begins with the \"#\" character::"
2161
2313
msgstr " Ignorar archivos cuyos nombres comiencen con el carácter «#»::"
2162
2314
2163
#: bzrlib/builtins.py:3131
2315
#: bzrlib/builtins.py:3160
2164
2316
msgid " bzr ignore \"RE:^#\""
2165
2317
msgstr " bzr ignore \"RE:^#\""
2166
2318
2167
#: bzrlib/builtins.py:3133 bzrlib/builtins.py:3137
2319
#: bzrlib/builtins.py:3162 bzrlib/builtins.py:3166
2168
2320
msgid " Ignore .o files under the lib directory::"
2169
2321
msgstr " Ignorar archivos .o bajo el directorio lib::"
2170
2322
2171
#: bzrlib/builtins.py:3135
2323
#: bzrlib/builtins.py:3164
2172
2324
msgid " bzr ignore \"lib/**/*.o\""
2173
2325
msgstr " bzr ignore \"lib/**/*.o\""
2174
2326
2175
#: bzrlib/builtins.py:3139
2327
#: bzrlib/builtins.py:3168
2176
2328
msgid " bzr ignore \"RE:lib/.*\\.o\""
2177
2329
msgstr " bzr ignore \"RE:lib/.*\\.o\""
2178
2330
2179
#: bzrlib/builtins.py:3141
2331
#: bzrlib/builtins.py:3170
2180
2332
msgid " Ignore everything but the \"debian\" toplevel directory::"
2181
2333
msgstr ""
2182
2334
" Ignorar todo excepto el directorio de nivel superior de «debian»::"
2183
2335
2184
#: bzrlib/builtins.py:3143
2336
#: bzrlib/builtins.py:3172
2185
2337
msgid ""
2186
2338
" bzr ignore \"RE:(?!debian/).*\"\n"
2187
2339
" \n"
2193
2345
" bzr ignore \"!!*~\""
2194
2346
msgstr ""
2195
2347
2196
#: bzrlib/builtins.py:3157
2348
#: bzrlib/builtins.py:3186
2197
2349
msgid "Display the default ignore rules that bzr uses."
2198
2350
msgstr "Muestra las reglas de ignorado predeterminada que usa bzr."
2199
2351
2200
#: bzrlib/builtins.py:3169
2352
#: bzrlib/builtins.py:3198
2201
2353
msgid "ignore requires at least one NAME_PATTERN or --default-rules."
2202
msgstr ""
2354
msgstr "ignore requiere al menos un NAME_PATTERN o --default-rules."
2203
2355
2204
#: bzrlib/builtins.py:3180
2356
#: bzrlib/builtins.py:3209
2205
2357
#, python-format
2206
2358
msgid "Invalid ignore pattern found. %s"
2207
2359
msgid_plural "Invalid ignore patterns found. %s"
2208
2360
msgstr[0] "Se encontró un patrón de ignorado inválido. %s"
2209
2361
msgstr[1] "Se encontraron patrones de ignorado inválidos. %s"
2210
2362
2211
#: bzrlib/builtins.py:3189
2363
#: bzrlib/builtins.py:3218
2212
2364
msgid "NAME_PATTERN should not be an absolute path"
2213
2365
msgstr "NAME_PATTERN no debe ser una ruta absoluta"
2214
2366
2215
#: bzrlib/builtins.py:3202
2367
#: bzrlib/builtins.py:3231
2216
2368
#, python-format
2217
2369
msgid ""
2218
2370
"Warning: the following files are version controlled and match your ignore "
2222
2374
"them.\n"
2223
2375
msgstr ""
2224
2376
2225
#: bzrlib/builtins.py:3209
2377
#: bzrlib/builtins.py:3238
2226
2378
msgid "List ignored files and the patterns that matched them."
2227
2379
msgstr "Lista todos los archivos ignorados y patrones que conciden."
2228
2380
2229
#: bzrlib/builtins.py:3211
2381
#: bzrlib/builtins.py:3240
2230
2382
msgid ""
2231
2383
"List all the ignored files and the ignore pattern that caused the file to\n"
2232
2384
"be ignored."
2233
2385
msgstr ""
2386
"Listar todos los archivos ignorados y el patrón de ignorar que hicieron que "
2387
"el archivo\n"
2388
"fuese ignorado."
2234
2389
2235
#: bzrlib/builtins.py:3214
2390
#: bzrlib/builtins.py:3243
2236
2391
msgid "Alternatively, to list just the files::"
2237
2392
msgstr "Alternativamente, lista solo los archivos:"
2238
2393
2239
#: bzrlib/builtins.py:3216
2394
#: bzrlib/builtins.py:3245
2240
2395
msgid " bzr ls --ignored"
2241
2396
msgstr " bzr ls --ignored"
2242
2397
2243
#: bzrlib/builtins.py:3250
2398
#: bzrlib/builtins.py:3279
2244
2399
#, python-format
2245
2400
msgid "not a valid revision-number: %r"
2246
2401
msgstr "no es un número de revisión válido: %r"
2247
2402
2248
#: bzrlib/builtins.py:3257
2403
#: bzrlib/builtins.py:3286
2249
2404
msgid ""
2250
2405
"Export current or past revision to a destination directory or archive."
2251
2406
msgstr ""
2252
2407
"Exporta la revisión actual o pasada a un directorio de destino o un "
2253
2408
"archivador."
2254
2409
2255
#: bzrlib/builtins.py:3259
2410
#: bzrlib/builtins.py:3288
2256
2411
msgid "If no revision is specified this exports the last committed revision."
2257
msgstr "Si no se especifica revisión, exporta la última revisión ejecutada."
2412
msgstr "Si no se especifica la revisión, exporta la última revisión enviada."
2258
2413
2259
#: bzrlib/builtins.py:3261
2414
#: bzrlib/builtins.py:3290
2260
2415
msgid ""
2261
2416
"Format may be an \"exporter\" name, such as tar, tgz, tbz2. If none is\n"
2262
2417
"given, try to find the format with the extension. If no extension\n"
2263
2418
"is found exports to a directory (equivalent to --format=dir)."
2264
2419
msgstr ""
2265
2420
2266
#: bzrlib/builtins.py:3265
2421
#: bzrlib/builtins.py:3294
2267
2422
msgid ""
2268
2423
"If root is supplied, it will be used as the root directory inside\n"
2269
2424
"container formats (tar, zip, etc). If it is not supplied it will default\n"
2270
2425
"to the exported filename. The root option has no effect for 'dir' format."
2271
2426
msgstr ""
2272
2427
2273
#: bzrlib/builtins.py:3269
2428
#: bzrlib/builtins.py:3298
2274
2429
msgid ""
2275
2430
"If branch is omitted then the branch containing the current working\n"
2276
2431
"directory will be used."
2278
2433
"Si se omite la rama entonces se usa la rama que contiene el directorio\n"
2279
2434
"de trabajo actual."
2280
2435
2281
#: bzrlib/builtins.py:3272
2436
#: bzrlib/builtins.py:3301
2282
2437
msgid ""
2283
2438
"Note: Export of tree with non-ASCII filenames to zip is not supported."
2284
2439
msgstr ""
2285
2440
"Nota: no se puede exportar un aŕbol con nombres de archivo no ASCII a zip."
2286
2441
2287
#: bzrlib/builtins.py:3274
2442
#: bzrlib/builtins.py:3303
2288
2443
msgid ""
2289
2444
" ================= =========================\n"
2290
2445
" Supported formats Autodetected by extension\n"
2306
2461
" zip .zip\n"
2307
2462
" ================= ==================================="
2308
2463
2309
#: bzrlib/builtins.py:3288
2464
#: bzrlib/builtins.py:3317
2310
2465
msgid "Type of file to export to."
2311
2466
msgstr "Tipo de archivo para exportar."
2312
2467
2313
#: bzrlib/builtins.py:3291
2468
#: bzrlib/builtins.py:3320
2314
2469
msgid "Apply content filters to export the convenient form."
2315
2470
msgstr ""
2316
2471
"Aplicar los filtros de contenido para exportar el formulario conveniente."
2317
2472
2318
#: bzrlib/builtins.py:3295
2473
#: bzrlib/builtins.py:3324
2319
2474
msgid "Name of the root directory inside the exported file."
2320
2475
msgstr "Nombre del directorio raíz dentro del archivo exportado."
2321
2476
2322
#: bzrlib/builtins.py:3297
2477
#: bzrlib/builtins.py:3326
2323
2478
msgid ""
2324
2479
"Set modification time of files to that of the last revision in which it was "
2325
2480
"changed."
2327
2482
"Establecer la fecha de modificación de los archivos a la de la última "
2328
2483
"revisión en la que se cambió."
2329
2484
2330
#: bzrlib/builtins.py:3300
2485
#: bzrlib/builtins.py:3329
2331
2486
msgid ""
2332
2487
"Export the working tree contents rather than that of the last revision."
2333
2488
msgstr ""
2489
"Exportar el contenido del árbol de trabajo en lugar de la de la última "
2490
"revisión."
2334
2491
2335
#: bzrlib/builtins.py:3319
2492
#: bzrlib/builtins.py:3348
2336
2493
msgid "--uncommitted requires a working tree"
2337
msgstr ""
2494
msgstr "--uncommitted requiere un árbol de trabajo"
2338
2495
2339
#: bzrlib/builtins.py:3328
2496
#: bzrlib/builtins.py:3357
2340
2497
#, python-format
2341
2498
msgid "Unsupported export format: %s"
2342
2499
msgstr "Formato de exportación no permitido: %s"
2343
2500
2344
#: bzrlib/builtins.py:3332
2501
#: bzrlib/builtins.py:3361
2345
2502
msgid ""
2346
2503
"Write the contents of a file as of a given revision to standard output."
2347
2504
msgstr ""
2348
2505
"Escribir los contenidos de un archivo como una revisión dada a la salida "
2349
2506
"estándar."
2350
2507
2351
#: bzrlib/builtins.py:3334
2508
#: bzrlib/builtins.py:3363
2352
2509
msgid "If no revision is nominated, the last revision is used."
2353
2510
msgstr "SI no hay una revisión nominada, se usa la última revisión."
2354
2511
2355
#: bzrlib/builtins.py:3336
2512
#: bzrlib/builtins.py:3365
2356
2513
msgid ""
2357
2514
"Note: Take care to redirect standard output when using this command on a\n"
2358
2515
"binary file."
2359
2516
msgstr ""
2517
"Nota: asegúrese de redirigir la salida estándar al utilizar esta orden en "
2518
"un\n"
2519
"archivo binario."
2360
2520
2361
#: bzrlib/builtins.py:3342
2521
#: bzrlib/builtins.py:3371
2362
2522
msgid "The path name in the old tree."
2363
2523
msgstr "La ruta en el árbol antiguo."
2364
2524
2365
#: bzrlib/builtins.py:3343
2525
#: bzrlib/builtins.py:3372
2366
2526
msgid "Apply content filters to display the convenience form."
2367
msgstr ""
2527
msgstr "Aplicar los filtros de contenido para mostrar la forma conveniente."
2368
2528
2369
#: bzrlib/builtins.py:3354
2529
#: bzrlib/builtins.py:3383
2370
2530
msgid "bzr cat --revision takes exactly one revision specifier"
2371
2531
msgstr "bzr cat --revision toma específicamente un especificador de revisión"
2372
2532
2373
#: bzrlib/builtins.py:3379 bzrlib/builtins.py:3391
2533
#: bzrlib/builtins.py:3408 bzrlib/builtins.py:3420
2374
2534
msgid "{0!r} is not present in revision {1}"
2375
2535
msgstr "{0!r} no está presente en la revisión {1}"
2376
2536
2377
#: bzrlib/builtins.py:3414
2537
#: bzrlib/builtins.py:3443
2378
2538
msgid "Commit changes into a new revision."
2379
2539
msgstr "Ejecutar cambios en una revisión nueva."
2380
2540
2381
#: bzrlib/builtins.py:3416
2541
#: bzrlib/builtins.py:3445
2382
2542
msgid ""
2383
2543
"An explanatory message needs to be given for each commit. This is\n"
2384
2544
"often done by using the --message option (getting the message from the\n"
2388
2548
"boilerplate text loaded into the editor, use the --show-diff option."
2389
2549
msgstr ""
2390
2550
2391
#: bzrlib/builtins.py:3423
2551
#: bzrlib/builtins.py:3452
2392
2552
msgid ""
2393
2553
"By default, the entire tree is committed and the person doing the\n"
2394
2554
"commit is assumed to be the author. These defaults can be overridden\n"
2395
2555
"as explained below."
2396
2556
msgstr ""
2557
"Por defecto, el árbol entero está comprometido y la persona que realiza\n"
2558
"la confirmación se da por supuesto que es el autor. Estos valores por "
2559
"defecto pueden ser reemplazados\n"
2560
"tal y como se explica más abajo."
2397
2561
2398
#: bzrlib/builtins.py:3427
2562
#: bzrlib/builtins.py:3456
2399
2563
msgid ":Selective commits:"
2400
2564
msgstr ""
2401
2565
2402
#: bzrlib/builtins.py:3429
2566
#: bzrlib/builtins.py:3458
2403
2567
msgid ""
2404
2568
" If selected files are specified, only changes to those files are\n"
2405
2569
" committed. If a directory is specified then the directory and\n"
2406
2570
" everything within it is committed."
2407
2571
msgstr ""
2408
2572
2409
#: bzrlib/builtins.py:3433
2573
#: bzrlib/builtins.py:3462
2410
2574
msgid ""
2411
2575
" When excludes are given, they take precedence over selected files.\n"
2412
2576
" For example, to commit only changes within foo, but not changes\n"
2413
2577
" within foo/bar::"
2414
2578
msgstr ""
2415
2579
2416
#: bzrlib/builtins.py:3437
2580
#: bzrlib/builtins.py:3466
2417
2581
msgid " bzr commit foo -x foo/bar"
2418
2582
msgstr " bzr commit foo -x foo/bar"
2419
2583
2420
#: bzrlib/builtins.py:3439
2584
#: bzrlib/builtins.py:3468
2421
2585
msgid " A selective commit after a merge is not yet supported."
2422
2586
msgstr " No está permitida una ejecución selectiva después de una fusión."
2423
2587
2424
#: bzrlib/builtins.py:3441
2588
#: bzrlib/builtins.py:3470
2425
2589
msgid ":Custom authors:"
2426
2590
msgstr ":Autores personalizados:"
2427
2591
2428
#: bzrlib/builtins.py:3443
2592
#: bzrlib/builtins.py:3472
2429
2593
msgid ""
2430
2594
" If the author of the change is not the same person as the committer,\n"
2431
2595
" you can specify the author's name using the --author option. The\n"
2434
2598
" the change you can specify the option multiple times, once for each\n"
2435
2599
" author."
2436
2600
msgstr ""
2601
" Si el autor del cambio no es la misma persona que la que hace el envío,\n"
2602
" puede especificar el nombre del autor con la opción --author. El\n"
2603
" nombre debería estar en el mismo formato que un committer-id, p.ej.\n"
2604
" «Juan Pérez <jperez@ejemplo.com>». Si el cambio tiene más de un autor\n"
2605
" puede especificar la opción varias veces, una por cada autor."
2437
2606
2438
#: bzrlib/builtins.py:3450
2607
#: bzrlib/builtins.py:3479
2439
2608
msgid ":Checks:"
2440
2609
msgstr ":Comprobaciones:"
2441
2610
2442
#: bzrlib/builtins.py:3452
2611
#: bzrlib/builtins.py:3481
2443
2612
msgid ""
2444
2613
" A common mistake is to forget to add a new file or directory before\n"
2445
2614
" running the commit command. The --strict option checks for unknown\n"
2448
2617
" for details."
2449
2618
msgstr ""
2450
2619
2451
#: bzrlib/builtins.py:3458
2620
#: bzrlib/builtins.py:3487
2452
2621
msgid ":Things to note:"
2453
2622
msgstr ":Cosas a tener en cuenta:"
2454
2623
2455
#: bzrlib/builtins.py:3460
2624
#: bzrlib/builtins.py:3489
2456
2625
msgid ""
2457
2626
" If you accidentially commit the wrong changes or make a spelling\n"
2458
2627
" mistake in the commit message say, you can use the uncommit command\n"
2459
2628
" to undo it. See ``bzr help uncommit`` for details."
2460
2629
msgstr ""
2461
2630
2462
#: bzrlib/builtins.py:3464
2631
#: bzrlib/builtins.py:3493
2463
2632
msgid ""
2464
2633
" Hooks can also be configured to run after a commit. This allows you\n"
2465
2634
" to trigger updates to external systems like bug trackers. The --fixes\n"
2467
2636
" one or more bugs. See ``bzr help bugs`` for details."
2468
2637
msgstr ""
2469
2638
2470
#: bzrlib/builtins.py:3474
2639
#: bzrlib/builtins.py:3503
2471
2640
msgid "Do not consider changes made to a given path."
2472
2641
msgstr "No considerar los cambios realizados en una ruta dada."
2473
2642
2474
#: bzrlib/builtins.py:3477
2643
#: bzrlib/builtins.py:3506
2475
2644
msgid "Description of the new revision."
2476
2645
msgstr "Descripción de la revisión nueva."
2477
2646
2478
#: bzrlib/builtins.py:3480
2647
#: bzrlib/builtins.py:3509
2479
2648
msgid "Commit even if nothing has changed."
2480
msgstr "Ejecutar incluso si no ha cambiado nada."
2649
msgstr "Enviar incluso si no ha cambiado nada."
2481
2650
2482
#: bzrlib/builtins.py:3484
2651
#: bzrlib/builtins.py:3513
2483
2652
msgid "Take commit message from this file."
2484
msgstr "Tomar el mensaje de ejecución desde este archivo."
2653
msgstr "Tomar el mensaje de envío desde este archivo."
2485
2654
2486
#: bzrlib/builtins.py:3486
2655
#: bzrlib/builtins.py:3515
2487
2656
msgid "Refuse to commit if there are unknown files in the working tree."
2488
2657
msgstr ""
2489
"Rechazar la ejecución si hay archivos desconocidos en el árbol de trabajo."
2658
"Rechazar el envío si hay archivos desconocidos en el árbol de trabajo."
2490
2659
2491
#: bzrlib/builtins.py:3489
2660
#: bzrlib/builtins.py:3518
2492
2661
msgid ""
2493
2662
"Manually set a commit time using commit date format, e.g. '2009-10-10 "
2494
2663
"08:00:00 +0100'."
2495
2664
msgstr ""
2496
"Establecer manualmente la hora de ejecución usando un formato de fecha de "
2497
"ejecución, por ejemplo «2009-10-10 08:00:00 +0100»."
2665
"Establecer manualmente la hora de envío usando un formato de fecha de envío, "
2666
"p.ej. «2009-10-10 08:00:00 +0100»."
2498
2667
2499
#: bzrlib/builtins.py:3492
2668
#: bzrlib/builtins.py:3521
2500
2669
msgid "Mark a bug as being fixed by this revision (see \"bzr help bugs\")."
2501
2670
msgstr ""
2502
2671
"Marca que un error se ha arreglado en esta revisión (vea «bzr help bugs»)."
2503
2672
2504
#: bzrlib/builtins.py:3495
2673
#: bzrlib/builtins.py:3524
2505
2674
msgid "Set the author's name, if it's different from the committer."
2506
2675
msgstr ""
2507
2676
"Establecer el nombre del autor, si este es diferente al del ejecutor."
2508
2677
2509
#: bzrlib/builtins.py:3498
2678
#: bzrlib/builtins.py:3527
2510
2679
msgid ""
2511
2680
"Perform a local commit in a bound branch. Local commits are not pushed to "
2512
2681
"the master branch until a normal commit is performed."
2513
2682
msgstr ""
2683
"Se realiza un compromiso local en una rama unida. Ese compromiso hace que no "
2684
"sean empujadas a la rama principal hasta que no se realice una confirmación "
2685
"normal."
2514
2686
2515
#: bzrlib/builtins.py:3504
2687
#: bzrlib/builtins.py:3533
2516
2688
msgid ""
2517
2689
"When no message is supplied, show the diff along with the status summary in "
2518
2690
"the message editor."
2519
2691
msgstr ""
2692
"Cuando no se suministra ningún mensaje, se muestra el diff en conjunto con "
2693
"el resumen estado del editor de mensajes."
2520
2694
2521
#: bzrlib/builtins.py:3507
2695
#: bzrlib/builtins.py:3536
2522
2696
msgid ""
2523
2697
"When committing to a foreign version control system do not push data that "
2524
2698
"can not be natively represented."
2525
2699
msgstr ""
2700
"Al comprometerse con un sistema de control de versiones extranjeras no "
2701
"enviará datos que no puedan ser representados de forma nativa."
2526
2702
2527
#: bzrlib/builtins.py:3525
2703
#: bzrlib/builtins.py:3554
2528
2704
#, python-format
2529
2705
msgid ""
2530
2706
"No tracker specified for bug %s. Use the form 'tracker:id' or specify a "
2532
2708
"See \"bzr help bugs\" for more information on this feature. Commit refused."
2533
2709
msgstr ""
2534
2710
2535
#: bzrlib/builtins.py:3534
2711
#: bzrlib/builtins.py:3563
2536
2712
#, python-format
2537
2713
msgid ""
2538
2714
"Invalid bug %s. Must be in the form of 'tracker:id'. See \"bzr help bugs\" "
2539
2715
"for more information on this feature.\n"
2540
2716
"Commit refused."
2541
2717
msgstr ""
2718
"Informe de error no válido %s. Debe estar en el formato «rastreador:id». "
2719
"Consulte «bzr help bugs» para más información sobre esta función.\n"
2720
"Envío rechazado."
2542
2721
2543
#: bzrlib/builtins.py:3543
2722
#: bzrlib/builtins.py:3572
2544
2723
#, python-format
2545
2724
msgid "Unrecognized bug %s. Commit refused."
2546
msgstr "Error no reconocido %s. Ejecución rechazada."
2725
msgstr "Informe de error no reconocido %s. Envío rechazado."
2547
2726
2548
#: bzrlib/builtins.py:3546
2727
#: bzrlib/builtins.py:3575
2549
2728
#, python-format
2550
2729
msgid ""
2551
2730
"%s\n"
2552
2731
"Commit refused."
2553
2732
msgstr ""
2554
2733
"%s\n"
2555
"Ejecución rechazada."
2734
"Envío rechazado."
2556
2735
2557
#: bzrlib/builtins.py:3570
2736
#: bzrlib/builtins.py:3599
2558
2737
msgid "Could not parse --commit-time: "
2559
2738
msgstr "No se puede analizar --commit-time: "
2560
2739
2561
#: bzrlib/builtins.py:3610
2740
#: bzrlib/builtins.py:3639
2562
2741
msgid "please specify either --message or --file"
2563
2742
msgstr "especifique uno --message o --file"
2564
2743
2565
#: bzrlib/builtins.py:3639
2744
#: bzrlib/builtins.py:3668
2566
2745
msgid "please specify a commit message with either --message or --file"
2567
2746
msgstr "especifique un mensaje de ejecución con --message o --file"
2568
2747
2569
#: bzrlib/builtins.py:3642
2748
#: bzrlib/builtins.py:3671
2570
2749
msgid ""
2571
2750
"Empty commit message specified. Please specify a commit message with either -"
2572
2751
"-message or --file or leave a blank message with --message \"\"."
2573
2752
msgstr ""
2753
"El mensaje de envío está vacío. Especifique un mensaje de envío con --"
2754
"message o --file o déjelo en blanco con --message \"\"."
2574
2755
2575
#: bzrlib/builtins.py:3662
2756
#: bzrlib/builtins.py:3691
2576
2757
msgid ""
2577
2758
"No changes to commit. Please 'bzr add' the files you want to commit, or use -"
2578
2759
"-unchanged to force an empty commit."
2579
2760
msgstr ""
2580
"No hay cambios que ejecutar. «bzr add» los archivos que quiera ejecutar o "
2581
"use --unchanged para forzar una ejecución vacía."
2761
"No hay cambios que enviar. Use «bzr add» con los archivos que quiera enviar "
2762
"o use --unchanged para forzar un envío vacío."
2582
2763
2583
#: bzrlib/builtins.py:3666
2764
#: bzrlib/builtins.py:3695
2584
2765
msgid ""
2585
2766
"Conflicts detected in working tree. Use \"bzr conflicts\" to list, \"bzr "
2586
2767
"resolve FILE\" to resolve."
2588
2769
"Conflictos detectados en el árbol de trabajo. Use «bzr conflicts» para "
2589
2770
"listar, «bzr resolve ARCHIVO»\" para resolver."
2590
2771
2591
#: bzrlib/builtins.py:3670
2772
#: bzrlib/builtins.py:3699
2592
2773
msgid "Commit refused because there are unknown files in the working tree."
2593
2774
msgstr ""
2594
"Ejecución rechazada porque hay archivos desconocidos en el árbol de trabajo."
2775
"Se rechazó el envío porque hay archivos desconocidos en el árbol de trabajo."
2595
2776
2596
#: bzrlib/builtins.py:3673
2777
#: bzrlib/builtins.py:3702
2597
2778
msgid ""
2598
2779
"\n"
2599
2780
"To commit to master branch, run update and then commit.\n"
2600
2781
"You can also pass --local to commit to continue working disconnected."
2601
2782
msgstr ""
2602
2783
2603
#: bzrlib/builtins.py:3681
2784
#: bzrlib/builtins.py:3710
2604
2785
msgid ""
2605
2786
"Validate working tree structure, branch consistency and repository history."
2606
2787
msgstr ""
2607
2788
"Valida la estructura del árbol de trabajo, la consistencia de la rama y el "
2608
2789
"historial del repositorio."
2609
2790
2610
#: bzrlib/builtins.py:3683
2791
#: bzrlib/builtins.py:3712
2611
2792
msgid ""
2612
2793
"This command checks various invariants about branch and repository storage\n"
2613
2794
"to detect data corruption or bzr bugs."
2614
2795
msgstr ""
2615
2796
2616
#: bzrlib/builtins.py:3686
2797
#: bzrlib/builtins.py:3715
2617
2798
msgid ""
2618
2799
"The working tree and branch checks will only give output if a problem is\n"
2619
2800
"detected. The output fields of the repository check are:"
2620
2801
msgstr ""
2802
"El árbol de trabajo y los controles de rama sólo darán resultado si se "
2803
"detecta\n"
2804
"un problema. El resultado de los campos de verificación del repositorio son "
2805
"los siguientes:"
2621
2806
2622
#: bzrlib/builtins.py:3689
2807
#: bzrlib/builtins.py:3718
2623
2808
msgid ""
2624
2809
"revisions\n"
2625
2810
" This is just the number of revisions checked. It doesn't\n"
2629
2814
" Esto es solo el número de revisiones comprobadas, No\n"
2630
2815
" indica un problema."
2631
2816
2632
#: bzrlib/builtins.py:3693
2817
#: bzrlib/builtins.py:3722
2633
2818
msgid ""
2634
2819
"versionedfiles\n"
2635
2820
" This is just the number of versionedfiles checked. It\n"
2639
2824
" Esto es solo el número de archivos versionados comprobados.. No\n"
2640
2825
" indica un problema."
2641
2826
2642
#: bzrlib/builtins.py:3697
2827
#: bzrlib/builtins.py:3726
2643
2828
msgid ""
2644
2829
"unreferenced ancestors\n"
2645
2830
" Texts that are ancestors of other texts, but\n"
2647
2832
" subtle problem that Bazaar can work around."
2648
2833
msgstr ""
2649
2834
2650
#: bzrlib/builtins.py:3702
2835
#: bzrlib/builtins.py:3731
2651
2836
msgid ""
2652
2837
"unique file texts\n"
2653
2838
" This is the total number of unique file contents\n"
2654
2839
" seen in the checked revisions. It does not indicate a problem."
2655
2840
msgstr ""
2656
2841
2657
#: bzrlib/builtins.py:3706
2842
#: bzrlib/builtins.py:3735
2658
2843
msgid ""
2659
2844
"repeated file texts\n"
2660
2845
" This is the total number of repeated texts seen\n"
2663
2848
" indicate a problem."
2664
2849
msgstr ""
2665
2850
2666
#: bzrlib/builtins.py:3712
2851
#: bzrlib/builtins.py:3741
2667
2852
msgid ""
2668
2853
"If no restrictions are specified, all Bazaar data that is found at the "
2669
2854
"given\n"
2670
2855
"location will be checked."
2671
2856
msgstr ""
2857
"Si no se aplican las restricciones especificadas, se verificarán todos los "
2858
"datos\n"
2859
" Bazaar que están en la localización."
2672
2860
2673
#: bzrlib/builtins.py:3717
2861
#: bzrlib/builtins.py:3746
2674
2862
msgid " Check the tree and branch at 'foo'::"
2675
2863
msgstr " Comprueba el árbol y la rama en «foo»::"
2676
2864
2677
#: bzrlib/builtins.py:3719
2865
#: bzrlib/builtins.py:3748
2678
2866
msgid " bzr check --tree --branch foo"
2679
2867
msgstr " bzr check --tree --branch foo"
2680
2868
2681
#: bzrlib/builtins.py:3721
2869
#: bzrlib/builtins.py:3750
2682
2870
msgid " Check only the repository at 'bar'::"
2683
2871
msgstr " Comprueba solo el repositorio en «bar»::"
2684
2872
2685
#: bzrlib/builtins.py:3723
2873
#: bzrlib/builtins.py:3752
2686
2874
msgid " bzr check --repo bar"
2687
2875
msgstr " bzr check --repo bar"
2688
2876
2689
#: bzrlib/builtins.py:3725
2877
#: bzrlib/builtins.py:3754
2690
2878
msgid " Check everything at 'baz'::"
2691
2879
msgstr " Comprueba todo en «baz»::"
2692
2880
2693
#: bzrlib/builtins.py:3727
2881
#: bzrlib/builtins.py:3756
2694
2882
msgid " bzr check baz"
2695
2883
msgstr " bzr check baz"
2696
2884
2697
#: bzrlib/builtins.py:3733
2885
#: bzrlib/builtins.py:3762
2698
2886
msgid "Check the branch related to the current directory."
2699
2887
msgstr "Comprueba la rama relacionada con el directorio actual."
2700
2888
2701
#: bzrlib/builtins.py:3735
2889
#: bzrlib/builtins.py:3764
2702
2890
msgid "Check the repository related to the current directory."
2703
2891
msgstr "Comprueba el repositorio relacionado con el directorio actual."
2704
2892
2705
#: bzrlib/builtins.py:3737
2893
#: bzrlib/builtins.py:3766
2706
2894
msgid "Check the working tree related to the current directory."
2707
2895
msgstr "Comprueba el árbol de trabajo relacionado con el directorio actual."
2708
2896
2709
#: bzrlib/builtins.py:3751
2897
#: bzrlib/builtins.py:3780
2710
2898
msgid "Upgrade a repository, branch or working tree to a newer format."
2711
2899
msgstr "Actualiza un repositorio, rama o árbol de trabajo al formato nuevo."
2712
2900
2713
#: bzrlib/builtins.py:3753
2901
#: bzrlib/builtins.py:3782
2714
2902
msgid ""
2715
2903
"When the default format has changed after a major new release of\n"
2716
2904
"Bazaar, you may be informed during certain operations that you\n"
2719
2907
"with older repositories or with older versions of Bazaar."
2720
2908
msgstr ""
2721
2909
2722
#: bzrlib/builtins.py:3759
2910
#: bzrlib/builtins.py:3788
2723
2911
msgid ""
2724
2912
"If you wish to upgrade to a particular format rather than the\n"
2725
2913
"current default, that can be specified using the --format option.\n"
2729
2917
"2.x default) so downgrading is not always possible."
2730
2918
msgstr ""
2731
2919
2732
#: bzrlib/builtins.py:3766
2920
#: bzrlib/builtins.py:3795
2733
2921
msgid ""
2734
2922
"A backup.bzr.~#~ directory is created at the start of the conversion\n"
2735
2923
"process (where # is a number). By default, this is left there on\n"
2740
2928
"afterwards."
2741
2929
msgstr ""
2742
2930
2743
#: bzrlib/builtins.py:3774
2931
#: bzrlib/builtins.py:3803
2744
2932
msgid ""
2745
2933
"If the location given is a shared repository, dependent branches\n"
2746
2934
"are also converted provided the repository converts successfully.\n"
2748
2936
"tried."
2749
2937
msgstr ""
2750
2938
2751
#: bzrlib/builtins.py:3779
2939
#: bzrlib/builtins.py:3808
2752
2940
msgid ""
2753
2941
"For more information on upgrades, see the Bazaar Upgrade Guide,\n"
2754
2942
"http://doc.bazaar.canonical.com/latest/en/upgrade-guide/."
2757
2945
"actualización de Bazaar,\n"
2758
2946
"http://doc.bazaar.canonical.com/latest/en/upgrade-guide/."
2759
2947
2760
#: bzrlib/builtins.py:3787
2948
#: bzrlib/builtins.py:3816
2761
2949
msgid "Upgrade to a specific format. See \"bzr help formats\" for details."
2762
2950
msgstr ""
2763
2951
"Actualizar a un formato específico. Vea «bzr help formats» para tener más "
2764
2952
"detalles."
2765
2953
2766
#: bzrlib/builtins.py:3791
2954
#: bzrlib/builtins.py:3820
2767
2955
msgid "Branch format"
2768
2956
msgstr "Formato de la rama"
2769
2957
2770
#: bzrlib/builtins.py:3793
2958
#: bzrlib/builtins.py:3822
2771
2959
msgid "Remove the backup.bzr directory if successful."
2772
2960
msgstr "Elimina el directorio backup.bzr si tiene éxito."
2773
2961
2774
#: bzrlib/builtins.py:3795
2962
#: bzrlib/builtins.py:3824
2775
2963
msgid "Show what would be done, but don't actually do anything."
2776
msgstr ""
2964
msgstr "Muestra lo que se haría, pero no hace nada en realidad."
2777
2965
2778
#: bzrlib/builtins.py:3810
2966
#: bzrlib/builtins.py:3839
2779
2967
msgid "Show or set bzr user id."
2780
2968
msgstr "Muestra o establece la id de usuario bzr."
2781
2969
2782
#: bzrlib/builtins.py:3812
2970
#: bzrlib/builtins.py:3841
2783
2971
msgid ""
2784
2972
":Examples:\n"
2785
2973
" Show the email of the current user::"
2787
2975
":Ejemplos:\n"
2788
2976
" Muestra el correo del usuario actual::"
2789
2977
2790
#: bzrlib/builtins.py:3815
2978
#: bzrlib/builtins.py:3844
2791
2979
msgid " bzr whoami --email"
2792
2980
msgstr " bzr whoami --email"
2793
2981
2794
#: bzrlib/builtins.py:3817
2982
#: bzrlib/builtins.py:3846
2795
2983
msgid " Set the current user::"
2796
2984
msgstr " Establece el usuario actual::"
2797
2985
2798
#: bzrlib/builtins.py:3819
2986
#: bzrlib/builtins.py:3848
2799
2987
msgid " bzr whoami \"Frank Chu <fchu@example.com>\""
2800
2988
msgstr " bzr whoami «Frank Chu <fchu@example.com>»"
2801
2989
2802
#: bzrlib/builtins.py:3823
2990
#: bzrlib/builtins.py:3852
2803
2991
msgid "Display email address only."
2804
2992
msgstr "Muestra solo la dirección de correo."
2805
2993
2806
#: bzrlib/builtins.py:3825
2994
#: bzrlib/builtins.py:3854
2807
2995
msgid "Set identity for the current branch instead of globally."
2808
2996
msgstr "Establece la identidad de la rama actual en lugar de globalmente."
2809
2997
2810
#: bzrlib/builtins.py:3851
2998
#: bzrlib/builtins.py:3880
2811
2999
msgid "--email can only be used to display existing identity"
2812
3000
msgstr "--email solo se puede usar para mostrar la identidad del directorio"
2813
3001
2814
#: bzrlib/builtins.py:3873
3002
#: bzrlib/builtins.py:3904
2815
3003
msgid "Print or set the branch nickname."
2816
3004
msgstr "Muestra o establece el apodo de la rama."
2817
3005
2818
#: bzrlib/builtins.py:3875
3006
#: bzrlib/builtins.py:3906
2819
3007
msgid ""
2820
"If unset, the tree root directory name is used as the nickname.\n"
2821
"To print the current nickname, execute with no argument."
3008
"If unset, the colocated branch name is used for colocated branches, and\n"
3009
"the branch directory name is used for other branches. To print the\n"
3010
"current nickname, execute with no argument."
2822
3011
msgstr ""
2823
3012
2824
#: bzrlib/builtins.py:3878
3013
#: bzrlib/builtins.py:3910
2825
3014
msgid ""
2826
3015
"Bound branches use the nickname of its master branch unless it is set\n"
2827
3016
"locally."
2828
3017
msgstr ""
3018
"Las ramas enlazadas usarán el apodo de su rama principal a menos que se "
3019
"ajuste\n"
3020
"localmente."
2829
3021
2830
#: bzrlib/builtins.py:3898
3022
#: bzrlib/builtins.py:3930
2831
3023
msgid "Set/unset and display aliases."
2832
3024
msgstr "Establece/desestablece y muestra alias."
2833
3025
2834
#: bzrlib/builtins.py:3900
3026
#: bzrlib/builtins.py:3932
2835
3027
msgid ""
2836
3028
":Examples:\n"
2837
3029
" Show the current aliases::"
2839
3031
":Ejemplos:\n"
2840
3032
" Muestra los alias actuales::"
2841
3033
2842
#: bzrlib/builtins.py:3903
3034
#: bzrlib/builtins.py:3935
2843
3035
msgid " bzr alias"
2844
3036
msgstr " bzr alias"
2845
3037
2846
#: bzrlib/builtins.py:3905
3038
#: bzrlib/builtins.py:3937
2847
3039
msgid " Show the alias specified for 'll'::"
2848
3040
msgstr " Muestra los alias especificados por «ll»::"
2849
3041
2850
#: bzrlib/builtins.py:3907
3042
#: bzrlib/builtins.py:3939
2851
3043
msgid " bzr alias ll"
2852
3044
msgstr " bzr alias ll"
2853
3045
2854
#: bzrlib/builtins.py:3909
3046
#: bzrlib/builtins.py:3941
2855
3047
msgid " Set an alias for 'll'::"
2856
3048
msgstr " Establece un alias para «ll»::"
2857
3049
2858
#: bzrlib/builtins.py:3911
3050
#: bzrlib/builtins.py:3943
2859
3051
msgid " bzr alias ll=\"log --line -r-10..-1\""
2860
3052
msgstr " bzr alias ll=\"log --line -r-10..-1\""
2861
3053
2862
#: bzrlib/builtins.py:3913
3054
#: bzrlib/builtins.py:3945
2863
3055
msgid " To remove an alias for 'll'::"
2864
3056
msgstr " Para eliminar un alias de «ll»::"
2865
3057
2866
#: bzrlib/builtins.py:3915
3058
#: bzrlib/builtins.py:3947
2867
3059
msgid " bzr alias --remove ll"
2868
3060
msgstr " bzr alias --remove ll"
2869
3061
2870
#: bzrlib/builtins.py:3920
3062
#: bzrlib/builtins.py:3952
2871
3063
msgid "Remove the alias."
2872
3064
msgstr "Elimina los alias."
2873
3065
2874
#: bzrlib/builtins.py:3938
3066
#: bzrlib/builtins.py:3970
2875
3067
msgid "bzr alias --remove expects an alias to remove."
2876
msgstr ""
3068
msgstr "bzr alias --remove está esperando un alias para ser eliminado."
2877
3069
2878
#: bzrlib/builtins.py:4119
3070
#: bzrlib/builtins.py:4151
2879
3071
msgid ""
2880
3072
"subunit not available. subunit needs to be installed to use --subunit."
2881
3073
msgstr ""
3074
"subunit ni disponible. Necesita instalar subunit para usar --subunit."
2882
3075
2883
#: bzrlib/builtins.py:4136
3076
#: bzrlib/builtins.py:4168
2884
3077
msgid ""
2885
3078
"--benchmark is no longer supported from bzr 2.2; use bzr-usertest instead"
2886
3079
msgstr ""
2887
3080
"--benchmark ya no está permitido en bzr 2.2; use bzr-usertest en su lugar"
2888
3081
2889
#: bzrlib/builtins.py:4183
3082
#: bzrlib/builtins.py:4215
2890
3083
msgid "Show version of bzr."
2891
3084
msgstr "Muestra la versión de bzr."
2892
3085
2893
#: bzrlib/builtins.py:4187
3086
#: bzrlib/builtins.py:4219
2894
3087
msgid "Print just the version number."
2895
3088
msgstr "Solamente imprime el número de versión."
2896
3089
2897
#: bzrlib/builtins.py:4206
3090
#: bzrlib/builtins.py:4238
2898
3091
msgid "It sure does!\n"
2899
3092
msgstr "¡Seguro que si!\n"
2900
3093
2901
#: bzrlib/builtins.py:4230
3094
#: bzrlib/builtins.py:4262
2902
3095
#, python-format
2903
3096
msgid "merge base is revision %s\n"
2904
msgstr ""
3097
msgstr "la base de combinación es la revisión %s\n"
2905
3098
2906
#: bzrlib/builtins.py:4234
3099
#: bzrlib/builtins.py:4266
2907
3100
msgid "Perform a three-way merge."
2908
3101
msgstr "Realiza una fusión de tres vías."
2909
3102
2910
#: bzrlib/builtins.py:4236
3103
#: bzrlib/builtins.py:4268
2911
3104
msgid ""
2912
3105
"The source of the merge can be specified either in the form of a branch,\n"
2913
3106
"or in the form of a path to a file containing a merge directive generated\n"
2918
3111
"the current working tree."
2919
3112
msgstr ""
2920
3113
2921
#: bzrlib/builtins.py:4244
3114
#: bzrlib/builtins.py:4276
2922
3115
msgid ""
2923
3116
"When merging from a branch, by default bzr will try to merge in all new\n"
2924
3117
"work from the other branch, automatically determining an appropriate base\n"
2925
3118
"revision. If this fails, you may need to give an explicit base."
2926
3119
msgstr ""
2927
3120
2928
#: bzrlib/builtins.py:4248
3121
#: bzrlib/builtins.py:4280
2929
3122
msgid ""
2930
3123
"To pick a different ending revision, pass \"--revision OTHER\". bzr will\n"
2931
3124
"try to merge in all new work up to and including revision OTHER."
2932
3125
msgstr ""
2933
3126
2934
#: bzrlib/builtins.py:4251
3127
#: bzrlib/builtins.py:4283
2935
3128
msgid ""
2936
3129
"If you specify two values, \"--revision BASE..OTHER\", only revisions BASE\n"
2937
3130
"through OTHER, excluding BASE but including OTHER, will be merged. If this\n"
2942
3135
"changes from the other branch is not stored in the commit."
2943
3136
msgstr ""
2944
3137
2945
#: bzrlib/builtins.py:4259
3138
#: bzrlib/builtins.py:4291
2946
3139
msgid "Revision numbers are always relative to the source branch."
2947
3140
msgstr ""
2948
3141
"Los números de revisión están siempre relacionados con la rama origen."
2949
3142
2950
#: bzrlib/builtins.py:4261 bzrlib/conflicts.py:52 bzrlib/conflicts.py:106
3143
#: bzrlib/builtins.py:4293 bzrlib/conflicts.py:52 bzrlib/conflicts.py:106
2951
3144
msgid ""
2952
3145
"Merge will do its best to combine the changes in two branches, but there\n"
2953
3146
"are some kinds of problems only a human can fix. When it encounters those,\n"
2955
3148
"before you can commit."
2956
3149
msgstr ""
2957
3150
2958
#: bzrlib/builtins.py:4266
3151
#: bzrlib/builtins.py:4298
2959
3152
msgid ""
2960
3153
"Use bzr resolve when you have fixed a problem. See also bzr conflicts."
2961
3154
msgstr ""
2962
3155
"Use bzr resolve cuando tenga un problema arreglado. Vea también bzr "
2963
3156
"conflicts."
2964
3157
2965
#: bzrlib/builtins.py:4268
3158
#: bzrlib/builtins.py:4300
2966
3159
msgid ""
2967
3160
"If there is no default branch set, the first merge will set it (use\n"
2968
3161
"--no-remember to avoid setting it). After that, you can omit the branch\n"
2970
3163
"only be saved if the remote location can be accessed."
2971
3164
msgstr ""
2972
3165
2973
#: bzrlib/builtins.py:4273
3166
#: bzrlib/builtins.py:4305
2974
3167
msgid ""
2975
3168
"The results of the merge are placed into the destination working\n"
2976
3169
"directory, where they can be reviewed (with bzr diff), tested, and then\n"
2977
3170
"committed to record the result of the merge."
2978
3171
msgstr ""
2979
3172
2980
#: bzrlib/builtins.py:4277
3173
#: bzrlib/builtins.py:4309
2981
3174
msgid ""
2982
3175
"merge refuses to run if there are any uncommitted changes, unless\n"
2983
3176
"--force is given. If --force is given, then the changes from the source \n"
2986
3179
"merge revision which has more than two parents."
2987
3180
msgstr ""
2988
3181
2989
#: bzrlib/builtins.py:4283
3182
#: bzrlib/builtins.py:4315
2990
3183
msgid ""
2991
3184
"If one would like to merge changes from the working tree of the other\n"
2992
3185
"branch without merging any committed revisions, the --uncommitted option\n"
2993
3186
"can be given."
2994
3187
msgstr ""
2995
3188
2996
#: bzrlib/builtins.py:4287
3189
#: bzrlib/builtins.py:4319
2997
3190
msgid ""
2998
3191
"To select only some changes to merge, use \"merge -i\", which will prompt\n"
2999
3192
"you to apply each diff hunk and file change, similar to \"shelve\"."
3000
3193
msgstr ""
3001
3194
3002
#: bzrlib/builtins.py:4290
3195
#: bzrlib/builtins.py:4322
3003
3196
msgid ""
3004
3197
":Examples:\n"
3005
3198
" To merge all new revisions from bzr.dev::"
3007
3200
":Ejemplos:\n"
3008
3201
" Para fusionar todas las revisiones nuevas de bzr.dev::"
3009
3202
3010
#: bzrlib/builtins.py:4293
3203
#: bzrlib/builtins.py:4325
3011
3204
msgid " bzr merge ../bzr.dev"
3012
3205
msgstr " bzr merge ../bzr.dev"
3013
3206
3014
#: bzrlib/builtins.py:4295
3207
#: bzrlib/builtins.py:4327
3015
3208
msgid " To merge changes up to and including revision 82 from bzr.dev::"
3016
3209
msgstr " Para fusionar cambios e incluir la revisión 82 desde bzr.dev::"
3017
3210
3018
#: bzrlib/builtins.py:4297
3211
#: bzrlib/builtins.py:4329
3019
3212
msgid " bzr merge -r 82 ../bzr.dev"
3020
3213
msgstr " bzr merge -r 82 ../bzr.dev"
3021
3214
3022
#: bzrlib/builtins.py:4299
3215
#: bzrlib/builtins.py:4331
3023
3216
msgid " To merge the changes introduced by 82, without previous changes::"
3024
3217
msgstr ""
3025
3218
" Para fusionar los cambios introducidos por 82, sin cambios previos::"
3026
3219
3027
#: bzrlib/builtins.py:4301
3220
#: bzrlib/builtins.py:4333
3028
3221
msgid " bzr merge -r 81..82 ../bzr.dev"
3029
3222
msgstr " bzr merge -r 81..82 ../bzr.dev"
3030
3223
3031
#: bzrlib/builtins.py:4303
3224
#: bzrlib/builtins.py:4335
3032
3225
msgid " To apply a merge directive contained in /tmp/merge::"
3033
3226
msgstr " Para aplicar una directiva de fusión contenida en /tmp/merge::"
3034
3227
3035
#: bzrlib/builtins.py:4305
3228
#: bzrlib/builtins.py:4337
3036
3229
msgid " bzr merge /tmp/merge"
3037
3230
msgstr " bzr merge /tmp/merge"
3038
3231
3039
#: bzrlib/builtins.py:4307
3232
#: bzrlib/builtins.py:4339
3040
3233
msgid ""
3041
3234
" To create a merge revision with three parents from two branches\n"
3042
3235
" feature1a and feature1b:"
3043
3236
msgstr ""
3044
3237
3045
#: bzrlib/builtins.py:4310
3238
#: bzrlib/builtins.py:4342
3046
3239
msgid ""
3047
3240
" bzr merge ../feature1a\n"
3048
3241
" bzr merge ../feature1b --force\n"
3049
3242
" bzr commit -m 'revision with three parents'"
3050
3243
msgstr ""
3051
3244
3052
#: bzrlib/builtins.py:4322
3245
#: bzrlib/builtins.py:4354
3053
3246
msgid "Merge even if the destination tree has uncommitted changes."
3054
msgstr "Fusionar incluso si el árbol de destino tiene cambios sin ejecutar."
3247
msgstr "Fusionar incluso si el árbol de destino tiene cambios sin enviar."
3055
3248
3056
#: bzrlib/builtins.py:4328
3249
#: bzrlib/builtins.py:4360
3057
3250
msgid ""
3058
3251
"Apply uncommitted changes from a working copy, instead of branch changes."
3059
3252
msgstr ""
3060
3253
"Aplicar cambios no ejecutados desde una copia de trabajo, en vez de cambios "
3061
3254
"de rama."
3062
3255
3063
#: bzrlib/builtins.py:4330
3256
#: bzrlib/builtins.py:4362
3064
3257
msgid ""
3065
3258
"If the destination is already completely merged into the source, pull from "
3066
3259
"the source rather than merging. When this happens, you do not need to "
3067
3260
"commit the result."
3068
3261
msgstr ""
3262
"Si el destino ya está totalmente combinado con la fuente, use la fuente en "
3263
"vez de la combinación. Cuando esto ocurra, no debe comprometerse con el "
3264
"resultado."
3069
3265
3070
#: bzrlib/builtins.py:4335
3266
#: bzrlib/builtins.py:4367
3071
3267
msgid ""
3072
3268
"Branch to merge into, rather than the one containing the working directory."
3073
3269
msgstr ""
3270
"Branch desea combinarse, en lugar de aquel contenido en el directorio de "
3271
"trabajo."
3074
3272
3075
#: bzrlib/builtins.py:4337
3273
#: bzrlib/builtins.py:4369
3076
3274
msgid "Instead of merging, show a diff of the merge."
3077
msgstr ""
3275
msgstr "En lugar de la combinación, se muestra un resumen de la combinación."
3078
3276
3079
#: bzrlib/builtins.py:4339
3277
#: bzrlib/builtins.py:4371
3080
3278
msgid "Select changes interactively."
3081
3279
msgstr "Seleccionar cambios de manera interactiva."
3082
3280
3083
#: bzrlib/builtins.py:4361
3281
#: bzrlib/builtins.py:4393
3084
3282
msgid ""
3085
3283
"Merging into empty branches not currently supported, "
3086
3284
"https://bugs.launchpad.net/bzr/+bug/308562"
3087
3285
msgstr ""
3286
"La combinación en ramas vacías no se soporta actualmente, "
3287
"https://bugs.launchpad.net/bzr/+bug/308562"
3088
3288
3089
#: bzrlib/builtins.py:4388
3289
#: bzrlib/builtins.py:4420
3090
3290
msgid "Cannot use --uncommitted with bundles or merge directives."
3091
3291
msgstr ""
3292
"No puede usarse --uncommited con los paquetes o cdirectivas combinadas."
3092
3293
3093
#: bzrlib/builtins.py:4399
3294
#: bzrlib/builtins.py:4431
3094
3295
msgid "Cannot use --uncommitted and --revision at the same time."
3095
3296
msgstr "No se puede usar --uncommitted y --revision al mismo tiempo."
3096
3297
3097
#: bzrlib/builtins.py:4419
3298
#: bzrlib/builtins.py:4451
3098
3299
msgid "merger: "
3099
3300
msgstr "fusión: "
3100
3301
3101
#: bzrlib/builtins.py:4421 bzrlib/bundle/apply_bundle.py:71
3302
#: bzrlib/builtins.py:4453 bzrlib/bundle/apply_bundle.py:71
3102
3303
msgid "Nothing to do."
3103
3304
msgstr "Nada que hacer."
3104
3305
3105
#: bzrlib/builtins.py:4425
3306
#: bzrlib/builtins.py:4457
3106
3307
msgid "Cannot pull individual files"
3107
3308
msgstr "No se puede tirar de archivos individuales"
3108
3309
3109
#: bzrlib/builtins.py:4433
3310
#: bzrlib/builtins.py:4465
3110
3311
msgid "This branch has no commits. (perhaps you would prefer 'bzr pull')"
3111
3312
msgstr "Esta rama no tiene ejecuciones. (quizá prefiera «bzr pull»)"
3112
3313
3113
#: bzrlib/builtins.py:4491
3314
#: bzrlib/builtins.py:4523
3114
3315
#, python-format
3115
3316
msgid "Show-base is not supported for this merge type. %s"
3116
3317
msgstr "Show-base no está permitido en este tipo de fusión. %s"
3117
3318
3118
#: bzrlib/builtins.py:4500
3319
#: bzrlib/builtins.py:4532
3119
3320
#, python-format
3120
3321
msgid "Conflict reduction is not supported for merge type %s."
3121
3322
msgstr ""
3122
3323
"La reducción de conflicot no está permitida para el tipo de fusión %s."
3123
3324
3124
#: bzrlib/builtins.py:4504
3325
#: bzrlib/builtins.py:4536
3125
3326
msgid "Cannot do conflict reduction and show base."
3126
msgstr ""
3327
msgstr "No se pueden realizar la reducción de conflictos y mostrar la base."
3127
3328
3128
#: bzrlib/builtins.py:4615
3329
#: bzrlib/builtins.py:4647
3129
3330
msgid "No location specified or remembered"
3130
3331
msgstr "No hay ubicación especificada o recordada"
3131
3332
3132
#: bzrlib/builtins.py:4617
3333
#: bzrlib/builtins.py:4649
3133
3334
msgid "{0} remembered {1} location {2}"
3134
msgstr ""
3335
msgstr "{0} recordados {1} ubicación {2}"
3135
3336
3136
#: bzrlib/builtins.py:4623
3337
#: bzrlib/builtins.py:4655
3137
3338
msgid "Redo a merge."
3138
3339
msgstr "Rehacer una fusión."
3139
3340
3140
#: bzrlib/builtins.py:4625
3341
#: bzrlib/builtins.py:4657
3141
3342
msgid ""
3142
3343
"Use this if you want to try a different merge technique while resolving\n"
3143
3344
"conflicts. Some merge techniques are better than others, and remerge\n"
3144
3345
"lets you try different ones on different files."
3145
3346
msgstr ""
3347
"Utilice esto si lo que se pretende es probar un técnica de combinación "
3348
"diferente para resolver\n"
3349
"conflictos. Algunas técnicas de combinación son mejores que otras y "
3350
"reinstalar\n"
3351
"le permite probar distintas cosas en diferentes archivos."
3146
3352
3147
#: bzrlib/builtins.py:4629
3353
#: bzrlib/builtins.py:4661
3148
3354
msgid ""
3149
3355
"The options for remerge have the same meaning and defaults as the ones for\n"
3150
3356
"merge. The difference is that remerge can (only) be run when there is a\n"
3151
3357
"pending merge, and it lets you specify particular files."
3152
3358
msgstr ""
3359
"Las opciones para la reinstalación tienen el mismo significado que los "
3360
"valores predeterminados.\n"
3361
"La única diferencia que existe es que la reinstalación (solo) se ejecuta "
3362
"cuando hay\n"
3363
"pendiente una combinación, y se permite la especificación de los archivos "
3364
"particulares."
3153
3365
3154
#: bzrlib/builtins.py:4633
3366
#: bzrlib/builtins.py:4665
3155
3367
msgid ""
3156
3368
":Examples:\n"
3157
3369
" Re-do the merge of all conflicted files, and show the base text in\n"
3158
3370
" conflict regions, in addition to the usual THIS and OTHER texts::"
3159
3371
msgstr ""
3160
3372
3161
#: bzrlib/builtins.py:4637
3373
#: bzrlib/builtins.py:4669
3162
3374
msgid " bzr remerge --show-base"
3163
3375
msgstr " bzr remerge --show-base"
3164
3376
3165
#: bzrlib/builtins.py:4639
3377
#: bzrlib/builtins.py:4671
3166
3378
msgid ""
3167
3379
" Re-do the merge of \"foobar\", using the weave merge algorithm, with\n"
3168
3380
" additional processing to reduce the size of conflict regions::"
3169
3381
msgstr ""
3170
3382
3171
#: bzrlib/builtins.py:4642
3383
#: bzrlib/builtins.py:4674
3172
3384
msgid " bzr remerge --merge-type weave --reprocess foobar"
3173
3385
msgstr ""
3174
3386
3175
#: bzrlib/builtins.py:4649
3387
#: bzrlib/builtins.py:4681
3176
3388
msgid "Show base revision text in conflicts."
3177
3389
msgstr "Mostrar el texto de revisión base en los conflictos."
3178
3390
3179
#: bzrlib/builtins.py:4661
3391
#: bzrlib/builtins.py:4693
3180
3392
msgid ""
3181
3393
"Sorry, remerge only works after normal merges. Not cherrypicking or multi-"
3182
3394
"merges."
3183
3395
msgstr ""
3184
3185
#: bzrlib/builtins.py:4717
3186
msgid "Revert files to a previous revision."
3187
msgstr "Revierte los archivos a la revisión previa."
3188
3189
#: bzrlib/builtins.py:4719
3396
"Lo sentimos, la reinstalación solo funciona después de fusiones normales. No "
3397
"hay repesca ni combinaciones múltiples."
3398
3399
#: bzrlib/builtins.py:4751
3400
msgid ""
3401
"Set files in the working tree back to the contents of a previous revision."
3402
msgstr ""
3403
"Establece los archivos de nuevo en el árbol de trabajo con el contenido de "
3404
"una revisión anterior."
3405
3406
#: bzrlib/builtins.py:4753
3190
3407
msgid ""
3191
3408
"Giving a list of files will revert only those files. Otherwise, all files\n"
3192
3409
"will be reverted. If the revision is not specified with '--revision', the\n"
3193
"last committed revision is used."
3410
"working tree basis revision is used. A revert operation affects only the\n"
3411
"working tree, not any revision history like the branch and repository or\n"
3412
"the working tree basis revision."
3194
3413
msgstr ""
3195
3414
3196
#: bzrlib/builtins.py:4723
3415
#: bzrlib/builtins.py:4759
3197
3416
msgid ""
3198
3417
"To remove only some changes, without reverting to a prior version, use\n"
3199
3418
"merge instead. For example, \"merge . -r -2..-3\" (don't forget the \".\")\n"
3200
3419
"will remove the changes introduced by the second last commit (-2), without\n"
3201
3420
"affecting the changes introduced by the last commit (-1). To remove\n"
3202
"certain changes on a hunk-by-hunk basis, see the shelve command."
3421
"certain changes on a hunk-by-hunk basis, see the shelve command.\n"
3422
"To update the branch to a specific revision or the latest revision and\n"
3423
"update the working tree accordingly while preserving local changes, see the\n"
3424
"update command."
3203
3425
msgstr ""
3204
3426
3205
#: bzrlib/builtins.py:4729
3427
#: bzrlib/builtins.py:4768
3206
3428
msgid ""
3207
"By default, any files that have been manually changed will be backed up\n"
3208
"first. (Files changed only by merge are not backed up.) Backup files have\n"
3209
"'.~#~' appended to their name, where # is a number."
3429
"Uncommitted changes to files that are reverted will be discarded.\n"
3430
"Howver, by default, any files that have been manually changed will be\n"
3431
"backed up first. (Files changed only by merge are not backed up.) Backup\n"
3432
"files have '.~#~' appended to their name, where # is a number."
3210
3433
msgstr ""
3211
3434
3212
#: bzrlib/builtins.py:4733
3435
#: bzrlib/builtins.py:4773
3213
3436
msgid ""
3214
3437
"When you provide files, you can use their current pathname or the pathname\n"
3215
3438
"from the target revision. So you can use revert to \"undelete\" a file by\n"
3217
3440
"reverted."
3218
3441
msgstr ""
3219
3442
3220
#: bzrlib/builtins.py:4738
3443
#: bzrlib/builtins.py:4778
3221
3444
msgid ""
3222
3445
"If you have newly added files since the target revision, they will be\n"
3223
3446
"removed. If the files to be removed have been changed, backups will be\n"
3225
3448
"deleted."
3226
3449
msgstr ""
3227
3450
3228
#: bzrlib/builtins.py:4743
3451
#: bzrlib/builtins.py:4783
3229
3452
msgid ""
3230
3453
"The working tree contains a list of revisions that have been merged but\n"
3231
3454
"not yet committed. These revisions will be included as additional parents\n"
3237
3460
"reverting any files."
3238
3461
msgstr ""
3239
3462
3240
#: bzrlib/builtins.py:4752
3463
#: bzrlib/builtins.py:4792
3241
3464
msgid ""
3242
3465
"Using \"bzr revert --forget-merges\", it is possible to apply all of the\n"
3243
3466
"changes from a branch in a single revision. To do this, perform the merge\n"
3251
3474
"target branches."
3252
3475
msgstr ""
3253
3476
3254
#: bzrlib/builtins.py:4766
3477
#: bzrlib/builtins.py:4806
3255
3478
msgid "Do not save backups of reverted files."
3256
3479
msgstr "No guardar respaldos de los archivos revertidos"
3257
3480
3258
#: bzrlib/builtins.py:4768
3481
#: bzrlib/builtins.py:4808
3259
3482
msgid "Remove pending merge marker, without changing any files."
3260
3483
msgstr ""
3261
3484
"Eliminar el marcador de fusión pendiente, sin cambiar ningún archivo."
3262
3485
3263
#: bzrlib/builtins.py:4799
3486
#: bzrlib/builtins.py:4839
3264
3487
msgid ""
3265
3488
"Show help on a command or other topic.\n"
3266
3489
" "
3268
3491
"Muestra ayuda en una orden u otro tema.\n"
3269
3492
" "
3270
3493
3271
#: bzrlib/builtins.py:4804
3494
#: bzrlib/builtins.py:4844
3272
3495
msgid "Show help on all commands."
3273
3496
msgstr "Muestra ayuda en todas las órdenes"
3274
3497
3275
#: bzrlib/builtins.py:4833
3498
#: bzrlib/builtins.py:4873
3276
3499
msgid "Show unmerged/unpulled revisions between two branches."
3277
3500
msgstr "Mostrar revisiones sin fusionar/extraer entre dos ramas."
3278
3501
3279
#: bzrlib/builtins.py:4835
3502
#: bzrlib/builtins.py:4875
3280
3503
msgid "OTHER_BRANCH may be local or remote."
3281
3504
msgstr "OTHER_BRANCH puede ser local o remoto."
3282
3505
3283
#: bzrlib/builtins.py:4837
3506
#: bzrlib/builtins.py:4877
3284
3507
msgid ""
3285
3508
"To filter on a range of revisions, you can use the command -r begin..end\n"
3286
3509
"-r revision requests a specific revision, -r ..end or -r begin.. are\n"
3291
3514
" 0 - no missing revisions"
3292
3515
msgstr ""
3293
3516
3294
#: bzrlib/builtins.py:4847
3517
#: bzrlib/builtins.py:4887
3295
3518
msgid ""
3296
3519
" Determine the missing revisions between this and the branch at the\n"
3297
3520
" remembered pull location::"
3298
3521
msgstr ""
3299
3522
3300
#: bzrlib/builtins.py:4850
3523
#: bzrlib/builtins.py:4890
3301
3524
msgid " bzr missing"
3302
3525
msgstr " bzr missing"
3303
3526
3304
#: bzrlib/builtins.py:4852
3527
#: bzrlib/builtins.py:4892
3305
3528
msgid " Determine the missing revisions between this and another branch::"
3306
3529
msgstr " Determina las revisiones perdidas entre esta y otra rama::"
3307
3530
3308
#: bzrlib/builtins.py:4854
3531
#: bzrlib/builtins.py:4894
3309
3532
msgid " bzr missing http://server/branch"
3310
3533
msgstr " bzr missing http://server/branch"
3311
3534
3312
#: bzrlib/builtins.py:4856
3535
#: bzrlib/builtins.py:4896
3313
3536
msgid ""
3314
3537
" Determine the missing revisions up to a specific revision on the other\n"
3315
3538
" branch::"
3316
3539
msgstr ""
3317
3540
3318
#: bzrlib/builtins.py:4859
3541
#: bzrlib/builtins.py:4899
3319
3542
msgid " bzr missing -r ..-10"
3320
3543
msgstr " bzr missing -r ..-10"
3321
3544
3322
#: bzrlib/builtins.py:4861
3545
#: bzrlib/builtins.py:4901
3323
3546
msgid ""
3324
3547
" Determine the missing revisions up to a specific revision on this\n"
3325
3548
" branch::"
3326
3549
msgstr ""
3327
3550
3328
#: bzrlib/builtins.py:4864
3551
#: bzrlib/builtins.py:4904
3329
3552
msgid " bzr missing --my-revision ..-10"
3330
3553
msgstr " bzr missing --my-revision ..-10"
3331
3554
3332
#: bzrlib/builtins.py:4871
3555
#: bzrlib/builtins.py:4911
3333
3556
msgid "Reverse the order of revisions."
3334
3557
msgstr "Revierte el orden de las revisiones."
3335
3558
3336
#: bzrlib/builtins.py:4873
3559
#: bzrlib/builtins.py:4913
3337
3560
msgid "Display changes in the local branch only."
3338
3561
msgstr "Muestra cambios solo en la rama local."
3339
3562
3340
#: bzrlib/builtins.py:4874
3563
#: bzrlib/builtins.py:4914
3341
3564
msgid "Same as --mine-only."
3342
3565
msgstr "Lo mismo que --mine-only."
3343
3566
3344
#: bzrlib/builtins.py:4876
3567
#: bzrlib/builtins.py:4916
3345
3568
msgid "Display changes in the remote branch only."
3346
3569
msgstr "Muestra cambios solo en la rama remota."
3347
3570
3348
#: bzrlib/builtins.py:4877
3571
#: bzrlib/builtins.py:4917
3349
3572
msgid "Same as --theirs-only."
3350
3573
msgstr "Lo mismo que --theirs-only."
3351
3574
3352
#: bzrlib/builtins.py:4882
3575
#: bzrlib/builtins.py:4922
3353
3576
msgid ""
3354
3577
"Filter on other branch revisions (inclusive). See \"help revisionspec\" for "
3355
3578
"details."
3357
3580
"Filtro en otras revisiones de rama (inclusive). Vea «help revisionspec» para "
3358
3581
"tener más detalles."
3359
3582
3360
#: bzrlib/builtins.py:4886
3583
#: bzrlib/builtins.py:4926
3361
3584
msgid ""
3362
3585
"Filter on local branch revisions (inclusive). See \"help revisionspec\" for "
3363
3586
"details."
3365
3588
"Filtro en revisiones locales de rama (inclusive). Vea «help revisionspec» "
3366
3589
"para tener más detalles."
3367
3590
3368
#: bzrlib/builtins.py:4889
3591
#: bzrlib/builtins.py:4929
3369
3592
msgid "Show all revisions in addition to the mainline ones."
3370
msgstr ""
3593
msgstr "Mostrar todas las revisiones además de las líneas principales."
3371
3594
3372
#: bzrlib/builtins.py:4943
3595
#: bzrlib/builtins.py:4983
3373
3596
msgid "No peer location known or specified."
3374
3597
msgstr "No hay ubicación del par conocida o especificada."
3375
3598
3376
#: bzrlib/builtins.py:4947
3599
#: bzrlib/builtins.py:4987
3377
3600
msgid "Using saved parent location: {0}\n"
3378
3601
msgstr "Usar ubicación padre guardada: {0}\n"
3379
3602
3380
#: bzrlib/builtins.py:4980
3603
#: bzrlib/builtins.py:5020
3381
3604
#, python-format
3382
3605
msgid "You have %d extra revision:\n"
3383
3606
msgid_plural "You have %d extra revisions:\n"
3384
3607
msgstr[0] "Tiene %d revisión extra:\n"
3385
3608
msgstr[1] "Tiene %d revisiones extra:\n"
3386
3609
3387
#: bzrlib/builtins.py:4996
3610
#: bzrlib/builtins.py:5040
3388
3611
#, python-format
3389
3612
msgid "You are missing %d revision:\n"
3390
3613
msgid_plural "You are missing %d revisions:\n"
3391
3614
msgstr[0] "Tiene %d revisión perdida:\n"
3392
3615
msgstr[1] "Tiene %d revisiones perdidas:\n"
3393
3616
3394
#: bzrlib/builtins.py:5008
3617
#: bzrlib/builtins.py:5055
3395
3618
msgid "This branch has no new revisions.\n"
3396
3619
msgstr "Esta rama no tiene revisiones.\n"
3397
3620
3398
#: bzrlib/builtins.py:5011
3621
#: bzrlib/builtins.py:5058
3399
3622
msgid "Other branch has no new revisions.\n"
3400
3623
msgstr "Otra rama no tiene revisiones nuevas.\n"
3401
3624
3402
#: bzrlib/builtins.py:5016
3625
#: bzrlib/builtins.py:5063
3403
3626
msgid "Branches are up to date.\n"
3404
3627
msgstr "La rama está actualizada:\n"
3405
3628
3406
#: bzrlib/builtins.py:5027
3629
#: bzrlib/builtins.py:5074
3407
3630
msgid "Compress the data within a repository."
3408
3631
msgstr "Comprime los datos en un repositorio."
3409
3632
3410
#: bzrlib/builtins.py:5029
3633
#: bzrlib/builtins.py:5076
3411
3634
msgid ""
3412
3635
"This operation compresses the data within a bazaar repository. As\n"
3413
3636
"bazaar supports automatic packing of repository, this operation is\n"
3414
3637
"normally not required to be done manually."
3415
3638
msgstr ""
3416
3639
3417
#: bzrlib/builtins.py:5033
3640
#: bzrlib/builtins.py:5080
3418
3641
msgid ""
3419
3642
"During the pack operation, bazaar takes a backup of existing repository\n"
3420
3643
"data, i.e. pack files. This backup is eventually removed by bazaar\n"
3423
3646
"used."
3424
3647
msgstr ""
3425
3648
3426
#: bzrlib/builtins.py:5039
3649
#: bzrlib/builtins.py:5086
3427
3650
msgid ""
3428
3651
"Warning: If you use --clean-obsolete-packs and your machine crashes\n"
3429
3652
"during or immediately after repacking, you may be left with a state\n"
3431
3654
"been. In this case the repository may be unusable."
3432
3655
msgstr ""
3433
3656
3434
#: bzrlib/builtins.py:5048
3657
#: bzrlib/builtins.py:5095
3435
3658
msgid "Delete obsolete packs to save disk space."
3436
3659
msgstr "Elimina paquetes obsoletos para ahorrar espacio de disco."
3437
3660
3438
#: bzrlib/builtins.py:5062
3661
#: bzrlib/builtins.py:5109
3439
3662
msgid "List the installed plugins."
3440
3663
msgstr "Lista los complementos instalados."
3441
3664
3442
#: bzrlib/builtins.py:5064
3665
#: bzrlib/builtins.py:5111
3443
3666
msgid ""
3444
3667
"This command displays the list of installed plugins including\n"
3445
3668
"version of plugin and a short description of each."
3447
3670
"Esta orden muestra la lista de complementos instalados incluyendo\n"
3448
3671
"versión del complemento y una breve descripción de cada uno."
3449
3672
3450
#: bzrlib/builtins.py:5067
3673
#: bzrlib/builtins.py:5114
3451
3674
msgid "--verbose shows the path where each plugin is located."
3452
3675
msgstr "--verbose muestra la ruta donde está ubicado cada complemento."
3453
3676
3454
#: bzrlib/builtins.py:5069
3677
#: bzrlib/builtins.py:5116
3455
3678
msgid ""
3456
3679
"A plugin is an external component for Bazaar that extends the\n"
3457
3680
"revision control system, by adding or replacing code in Bazaar.\n"
3460
3683
"customizing log output."
3461
3684
msgstr ""
3462
3685
3463
#: bzrlib/builtins.py:5075
3686
#: bzrlib/builtins.py:5122
3464
3687
msgid ""
3465
3688
"See the Bazaar Plugin Guide <http://doc.bazaar.canonical.com/plugins/en/>\n"
3466
3689
"for further information on plugins including where to find them and how to\n"
3468
3691
"plugins using the Python programming language."
3469
3692
msgstr ""
3470
3693
3471
#: bzrlib/builtins.py:5091
3694
#: bzrlib/builtins.py:5138
3472
3695
msgid "Show testament (signing-form) of a revision."
3473
msgstr ""
3696
msgstr "Mostrar el testamento (formulario de firma) de una revisión."
3474
3697
3475
#: bzrlib/builtins.py:5094
3698
#: bzrlib/builtins.py:5141
3476
3699
msgid "Produce long-format testament."
3477
3700
msgstr "Produce testamento en formato largo."
3478
3701
3479
#: bzrlib/builtins.py:5096
3702
#: bzrlib/builtins.py:5143
3480
3703
msgid "Produce a strict-format testament."
3481
3704
msgstr "Produce testamento en formato estricto."
3482
3705
3483
#: bzrlib/builtins.py:5122
3706
#: bzrlib/builtins.py:5169
3484
3707
msgid "Show the origin of each line in a file."
3485
3708
msgstr "Muestra el origen de cada línea en un archivo"
3486
3709
3487
#: bzrlib/builtins.py:5124
3710
#: bzrlib/builtins.py:5171
3488
3711
msgid ""
3489
3712
"This prints out the given file with an annotation on the left side\n"
3490
3713
"indicating which revision, author and date introduced the change."
3491
3714
msgstr ""
3715
"Esto solo imprime el archivo dado con una anotación en el lado izquierdo\n"
3716
"que indica la revisión, el autor y la fecha en que se realizó el cambio."
3492
3717
3493
#: bzrlib/builtins.py:5127
3718
#: bzrlib/builtins.py:5174
3494
3719
msgid ""
3495
3720
"If the origin is the same for a run of consecutive lines, it is\n"
3496
3721
"shown only at the top, unless the --all option is given."
3497
3722
msgstr ""
3723
"Si el origen es igual para el funcionamiento entre línea consecutivas, solo\n"
3724
"se muestra en la parte superior, a menos que la opción --all así lo diga."
3498
3725
3499
#: bzrlib/builtins.py:5135
3726
#: bzrlib/builtins.py:5182
3500
3727
msgid "Show annotations on all lines."
3501
3728
msgstr "Muestra anotaciones en todas las líneas."
3502
3729
3503
#: bzrlib/builtins.py:5136
3730
#: bzrlib/builtins.py:5183
3504
3731
msgid "Show commit date in annotations."
3505
3732
msgstr "Muestra la fecha de ejecución en anotaciones."
3506
3733
3507
#: bzrlib/builtins.py:5223
3734
#: bzrlib/builtins.py:5270
3508
3735
msgid "Cannot sign a range of non-revision-history revisions"
3509
3736
msgstr ""
3737
"No se puede firmar un rango de revisiones sin el historial de esas revisiones"
3510
3738
3511
#: bzrlib/builtins.py:5235
3739
#: bzrlib/builtins.py:5282
3512
3740
msgid "Please supply either one revision, or a range."
3513
3741
msgstr "Proporcione una revisión o un rango."
3514
3742
3515
#: bzrlib/builtins.py:5239
3743
#: bzrlib/builtins.py:5286
3516
3744
msgid ""
3517
3745
"Convert the current branch into a checkout of the supplied branch.\n"
3518
3746
"If no branch is supplied, rebind to the last bound location."
3519
3747
msgstr ""
3520
3748
3521
#: bzrlib/builtins.py:5242
3749
#: bzrlib/builtins.py:5289
3522
3750
msgid ""
3523
3751
"Once converted into a checkout, commits must succeed on the master branch\n"
3524
3752
"before they will be applied to the local branch."
3525
3753
msgstr ""
3526
3754
3527
#: bzrlib/builtins.py:5245
3755
#: bzrlib/builtins.py:5292
3528
3756
msgid ""
3529
3757
"Bound branches use the nickname of its master branch unless it is set\n"
3530
3758
"locally, in which case binding will update the local nickname to be\n"
3531
3759
"that of the master."
3532
3760
msgstr ""
3533
3761
3534
#: bzrlib/builtins.py:5260
3762
#: bzrlib/builtins.py:5307
3535
3763
msgid "No location supplied. This format does not remember old locations."
3536
3764
msgstr ""
3537
3765
"No se proporcionó ubicación. Este formato no recuerda antiguas ubicaciones."
3538
3766
3539
#: bzrlib/builtins.py:5265
3767
#: bzrlib/builtins.py:5313
3540
3768
msgid "Branch is already bound"
3541
3769
msgstr "La rama ya está asociada"
3542
3770
3543
#: bzrlib/builtins.py:5267
3771
#: bzrlib/builtins.py:5316
3544
3772
msgid "No location supplied and no previous location known"
3545
3773
msgstr "No se proporcionó ubicación y no hay ubicación previa conocida"
3546
3774
3547
#: bzrlib/builtins.py:5273
3775
#: bzrlib/builtins.py:5322
3548
3776
msgid "These branches have diverged. Try merging, and then bind again."
3549
3777
msgstr ""
3550
3778
"Las ramas tienen divergencias. Intente fusionar y vincularlas de nuevo."
3551
3779
3552
#: bzrlib/builtins.py:5280
3780
#: bzrlib/builtins.py:5329
3553
3781
msgid "Convert the current checkout into a regular branch."
3554
3782
msgstr "Convertir la comprobación actual en una rama regular."
3555
3783
3556
#: bzrlib/builtins.py:5282
3784
#: bzrlib/builtins.py:5331
3557
3785
msgid ""
3558
3786
"After unbinding, the local branch is considered independent and subsequent\n"
3559
3787
"commits will be local only."
3560
3788
msgstr ""
3561
3789
3562
#: bzrlib/builtins.py:5293
3790
#: bzrlib/builtins.py:5342
3563
3791
msgid "Local branch is not bound"
3564
3792
msgstr "La rama local no está vinculada"
3565
3793
3566
#: bzrlib/builtins.py:5297
3794
#: bzrlib/builtins.py:5346
3567
3795
msgid "Remove the last committed revision."
3568
3796
msgstr "Elimina la última revisión ejecutada."
3569
3797
3570
#: bzrlib/builtins.py:5299
3798
#: bzrlib/builtins.py:5348
3571
3799
msgid ""
3572
3800
"--verbose will print out what is being removed.\n"
3573
3801
"--dry-run will go through all the motions, but not actually\n"
3574
3802
"remove anything."
3575
3803
msgstr ""
3576
3804
3577
#: bzrlib/builtins.py:5303
3805
#: bzrlib/builtins.py:5352
3578
3806
msgid ""
3579
3807
"If --revision is specified, uncommit revisions to leave the branch at the\n"
3580
3808
"specified revision. For example, \"bzr uncommit -r 15\" will leave the\n"
3581
3809
"branch at revision 15."
3582
3810
msgstr ""
3583
3811
3584
#: bzrlib/builtins.py:5307
3812
#: bzrlib/builtins.py:5356
3585
3813
msgid ""
3586
3814
"Uncommit leaves the working tree ready for a new commit. The only change\n"
3587
3815
"it may make is to restore any pending merges that were present before\n"
3588
3816
"the commit."
3589
3817
msgstr ""
3590
3818
3591
#: bzrlib/builtins.py:5318
3819
#: bzrlib/builtins.py:5367
3592
3820
msgid "Don't actually make changes."
3593
3821
msgstr "En relaidad no hace cambios."
3594
3822
3595
#: bzrlib/builtins.py:5319
3823
#: bzrlib/builtins.py:5368
3596
3824
msgid "Say yes to all questions."
3597
3825
msgstr "Decir sí a todas las preguntas."
3598
3826
3599
#: bzrlib/builtins.py:5321
3827
#: bzrlib/builtins.py:5370
3600
3828
msgid "Keep tags that point to removed revisions."
3601
3829
msgstr "Mantener etiquetas que apuntan a eliminar revisiones."
3602
3830
3603
#: bzrlib/builtins.py:5323
3831
#: bzrlib/builtins.py:5372
3604
3832
msgid "Only remove the commits from the local branch when in a checkout."
3605
3833
msgstr ""
3606
3834
"Solo elimina ejecuciones de la rama local cuando se está en una comprobación."
3607
3835
3608
#: bzrlib/builtins.py:5372
3836
#: bzrlib/builtins.py:5421
3609
3837
msgid "No revisions to uncommit.\n"
3610
3838
msgstr "No hay revisiones para desejecutar.\n"
3611
3839
3612
#: bzrlib/builtins.py:5387
3840
#: bzrlib/builtins.py:5436
3613
3841
msgid "Dry-run, pretending to remove the above revisions.\n"
3614
3842
msgstr ""
3615
3843
3616
#: bzrlib/builtins.py:5390
3844
#: bzrlib/builtins.py:5439
3617
3845
msgid "The above revision(s) will be removed.\n"
3618
3846
msgstr "Las revisiones de arriba se eliminarán.\n"
3619
3847
3620
#: bzrlib/builtins.py:5394
3848
#: bzrlib/builtins.py:5443
3621
3849
msgid "Uncommit these revisions"
3622
3850
msgstr "Desejecutar estas revisiones"
3623
3851
3624
#: bzrlib/builtins.py:5397
3852
#: bzrlib/builtins.py:5446
3625
3853
msgid "Canceled\n"
3626
3854
msgstr "Cancelado\n"
3627
3855
3628
#: bzrlib/builtins.py:5404
3856
#: bzrlib/builtins.py:5453
3629
3857
#, python-format
3630
3858
msgid ""
3631
3859
"You can restore the old tip by running:\n"
3634
3862
"Puede restaurar el consejo antiguo ejecutando:\n"
3635
3863
" bzr pull . -r revid:%s\n"
3636
3864
3637
#: bzrlib/builtins.py:5409
3865
#: bzrlib/builtins.py:5458
3638
3866
msgid "Break a dead lock."
3639
3867
msgstr "Romper un bloqueo."
3640
3868
3641
#: bzrlib/builtins.py:5411
3869
#: bzrlib/builtins.py:5460
3642
3870
msgid ""
3643
3871
"This command breaks a lock on a repository, branch, working directory or\n"
3644
3872
"config file."
3647
3875
"o\n"
3648
3876
"archivo de configuración."
3649
3877
3650
#: bzrlib/builtins.py:5414
3878
#: bzrlib/builtins.py:5463
3651
3879
msgid ""
3652
3880
"CAUTION: Locks should only be broken when you are sure that the process\n"
3653
3881
"holding the lock has been stopped."
3654
3882
msgstr ""
3655
3883
3656
#: bzrlib/builtins.py:5417
3884
#: bzrlib/builtins.py:5466
3657
3885
msgid ""
3658
3886
"You can get information on what locks are open via the 'bzr info\n"
3659
3887
"[location]' command."
3660
3888
msgstr ""
3661
3889
3662
#: bzrlib/builtins.py:5420
3890
#: bzrlib/builtins.py:5469
3663
3891
msgid ""
3664
3892
":Examples:\n"
3665
3893
" bzr break-lock\n"
3671
3899
" bzr break-lock bzr+ssh://example.com/bzr/foo\n"
3672
3900
" bzr break-lock --conf ~/.bazaar"
3673
3901
3674
#: bzrlib/builtins.py:5429
3902
#: bzrlib/builtins.py:5478
3675
3903
msgid "LOCATION is the directory where the config lock is."
3676
3904
msgstr ""
3677
3905
3678
#: bzrlib/builtins.py:5431
3906
#: bzrlib/builtins.py:5480
3679
3907
msgid "Do not ask for confirmation before breaking the lock."
3680
3908
msgstr "No pedir confirmación antes de romper el bloqueo."
3681
3909
3682
#: bzrlib/builtins.py:5466
3910
#: bzrlib/builtins.py:5515
3683
3911
msgid "The Bazaar smart server protocol over TCP. (default port: 4155)"
3684
3912
msgstr ""
3685
3913
3686
#: bzrlib/builtins.py:5467
3914
#: bzrlib/builtins.py:5516
3687
3915
msgid "Run the bzr server."
3688
3916
msgstr "Ejecutar el servidor bzr."
3689
3917
3690
#: bzrlib/builtins.py:5473
3918
#: bzrlib/builtins.py:5522
3691
3919
msgid "Serve on stdin/out for use from inetd or sshd."
3692
3920
msgstr ""
3693
3921
3694
#: bzrlib/builtins.py:5474
3922
#: bzrlib/builtins.py:5523
3695
3923
msgid "protocol"
3696
3924
msgstr "protocolo"
3697
3925
3698
#: bzrlib/builtins.py:5475
3926
#: bzrlib/builtins.py:5524
3699
3927
msgid "Protocol to serve."
3700
3928
msgstr "Protocolo a servir."
3701
3929
3702
#: bzrlib/builtins.py:5479
3930
#: bzrlib/builtins.py:5528
3931
msgid "Listen for connections on nominated address."
3932
msgstr ""
3933
3934
#: bzrlib/builtins.py:5530
3703
3935
msgid ""
3704
"Listen for connections on nominated port of the form [hostname:]portnumber. "
3705
"Passing 0 as the port number will result in a dynamically allocated port. "
3706
"The default port depends on the protocol."
3936
"Listen for connections on nominated port. Passing 0 as the port number will "
3937
"result in a dynamically allocated port. The default port depends on the "
3938
"protocol."
3707
3939
msgstr ""
3708
3940
3709
#: bzrlib/builtins.py:5485
3941
#: bzrlib/builtins.py:5535
3710
3942
msgid "Serve contents of this directory."
3711
msgstr ""
3943
msgstr "Servir contenidos de esta carpeta"
3712
3944
3713
#: bzrlib/builtins.py:5487
3945
#: bzrlib/builtins.py:5537
3714
3946
msgid ""
3715
3947
"By default the server is a readonly server. Supplying --allow-writes "
3716
3948
"enables write access to the contents of the served directory and below. "
3719
3951
"uncontrolled write access to your file system."
3720
3952
msgstr ""
3721
3953
3722
#: bzrlib/builtins.py:5496
3954
#: bzrlib/builtins.py:5546
3723
3955
msgid "Override the default idle client timeout (5min)."
3724
3956
msgstr ""
3725
3957
3726
#: bzrlib/builtins.py:5546
3958
#: bzrlib/builtins.py:5564
3727
3959
msgid "Combine a tree into its containing tree."
3728
3960
msgstr "Combina un árbol en su árbol contenedor."
3729
3961
3730
#: bzrlib/builtins.py:5548
3962
#: bzrlib/builtins.py:5566
3731
3963
msgid "This command requires the target tree to be in a rich-root format."
3732
3964
msgstr ""
3733
3965
3734
#: bzrlib/builtins.py:5550
3966
#: bzrlib/builtins.py:5568
3735
3967
msgid ""
3736
3968
"The TREE argument should be an independent tree, inside another tree, but\n"
3737
3969
"not part of it. (Such trees can be produced by \"bzr split\", but also by\n"
3738
3970
"running \"bzr branch\" with the target inside a tree.)"
3739
3971
msgstr ""
3740
3972
3741
#: bzrlib/builtins.py:5554
3973
#: bzrlib/builtins.py:5572
3742
3974
msgid ""
3743
3975
"The result is a combined tree, with the subtree no longer an independent\n"
3744
3976
"part. This is marked as a merge of the subtree into the containing tree,\n"
3745
3977
"and all history is preserved."
3746
3978
msgstr ""
3747
3979
3748
#: bzrlib/builtins.py:5572
3980
#: bzrlib/builtins.py:5590
3749
3981
#, python-format
3750
3982
msgid ""
3751
3983
"Can't join trees because %s doesn't support rich root data.\n"
3752
3984
"You can use bzr upgrade on the repository."
3753
3985
msgstr ""
3754
3986
3755
#: bzrlib/builtins.py:5582 bzrlib/builtins.py:5588
3987
#: bzrlib/builtins.py:5600 bzrlib/builtins.py:5606
3756
3988
msgid "Cannot join {0}. {1}"
3757
3989
msgstr "No se puede unir {0}. {1}"
3758
3990
3759
#: bzrlib/builtins.py:5592
3991
#: bzrlib/builtins.py:5610
3760
3992
msgid "Split a subdirectory of a tree into a separate tree."
3761
3993
msgstr "Divide un subdirectorio de un árbol en un árbol separado."
3762
3994
3763
#: bzrlib/builtins.py:5594
3995
#: bzrlib/builtins.py:5612
3764
3996
msgid ""
3765
3997
"This command will produce a target tree in a format that supports\n"
3766
3998
"rich roots, like 'rich-root' or 'rich-root-pack'. These formats cannot be\n"
3767
3999
"converted into earlier formats like 'dirstate-tags'."
3768
4000
msgstr ""
3769
4001
3770
#: bzrlib/builtins.py:5598
4002
#: bzrlib/builtins.py:5616
3771
4003
msgid ""
3772
4004
"The TREE argument should be a subdirectory of a working tree. That\n"
3773
4005
"subdirectory will be converted into an independent tree, with its own\n"
3774
4006
"branch. Commits in the top-level tree will not apply to the new subtree."
3775
4007
msgstr ""
3776
4008
3777
#: bzrlib/builtins.py:5678
4009
#: bzrlib/builtins.py:5696
3778
4010
msgid "No submit branch specified or known"
3779
4011
msgstr "No se ha enviado una rama especificada o conocida"
3780
4012
3781
#: bzrlib/builtins.py:5686 bzrlib/send.py:108
4013
#: bzrlib/builtins.py:5705 bzrlib/send.py:109
3782
4014
msgid "No public branch specified or known"
3783
4015
msgstr "No hay una rama especificada o conocida pública"
3784
4016
3785
#: bzrlib/builtins.py:5691
4017
#: bzrlib/builtins.py:5710
3786
4018
msgid "bzr merge-directive takes at most two one revision identifiers"
3787
4019
msgstr ""
3788
4020
3789
#: bzrlib/builtins.py:5700
4021
#: bzrlib/builtins.py:5719
3790
4022
msgid "No revisions to bundle."
3791
4023
msgstr ""
3792
4024
3793
#: bzrlib/builtins.py:5719
4025
#: bzrlib/builtins.py:5738
3794
4026
msgid "Mail or create a merge-directive for submitting changes."
3795
4027
msgstr ""
3796
4028
3797
#: bzrlib/builtins.py:5721
4029
#: bzrlib/builtins.py:5740
3798
4030
msgid "A merge directive provides many things needed for requesting merges:"
3799
4031
msgstr ""
3800
4032
3801
#: bzrlib/builtins.py:5723
4033
#: bzrlib/builtins.py:5742
3802
4034
msgid "* A machine-readable description of the merge to perform"
3803
4035
msgstr ""
3804
4036
3805
#: bzrlib/builtins.py:5725
4037
#: bzrlib/builtins.py:5744
3806
4038
msgid "* An optional patch that is a preview of the changes requested"
3807
4039
msgstr ""
3808
4040
"* Una ruta opcional que es una vista previa de los cambios requeridos"
3809
4041
3810
#: bzrlib/builtins.py:5727
4042
#: bzrlib/builtins.py:5746
3811
4043
msgid ""
3812
4044
"* An optional bundle of revision data, so that the changes can be applied\n"
3813
4045
" directly from the merge directive, without retrieving data from a\n"
3814
4046
" branch."
3815
4047
msgstr ""
3816
4048
3817
#: bzrlib/builtins.py:5731
4049
#: bzrlib/builtins.py:5750
3818
4050
msgid ""
3819
4051
"`bzr send` creates a compact data set that, when applied using bzr\n"
3820
4052
"merge, has the same effect as merging from the source branch. "
3821
4053
msgstr ""
3822
4054
3823
#: bzrlib/builtins.py:5734
4055
#: bzrlib/builtins.py:5753
3824
4056
msgid ""
3825
4057
"By default the merge directive is self-contained and can be applied to any\n"
3826
4058
"branch containing submit_branch in its ancestory without needing access to\n"
3827
4059
"the source branch."
3828
4060
msgstr ""
3829
4061
3830
#: bzrlib/builtins.py:5738
4062
#: bzrlib/builtins.py:5757
3831
4063
msgid ""
3832
4064
"If --no-bundle is specified, then Bazaar doesn't send the contents of the\n"
3833
4065
"revisions, but only a structured request to merge from the\n"
3836
4068
"included if known, so that people can check it later."
3837
4069
msgstr ""
3838
4070
3839
#: bzrlib/builtins.py:5744
4071
#: bzrlib/builtins.py:5763
3840
4072
msgid ""
3841
4073
"The submit branch defaults to the parent of the source branch, but can be\n"
3842
4074
"overridden. Both submit branch and public branch will be remembered in\n"
3845
4077
"be changed using --from."
3846
4078
msgstr ""
3847
4079
3848
#: bzrlib/builtins.py:5750
4080
#: bzrlib/builtins.py:5769
3849
4081
msgid ""
3850
4082
"Both the submit branch and the public branch follow the usual behavior with\n"
3851
4083
"respect to --remember: If there is no default location set, the first send\n"
3854
4086
"--remember. The value will only be saved if the location can be accessed."
3855
4087
msgstr ""
3856
4088
3857
#: bzrlib/builtins.py:5756
4089
#: bzrlib/builtins.py:5775
3858
4090
msgid ""
3859
4091
"In order to calculate those changes, bzr must analyse the submit branch.\n"
3860
4092
"Therefore it is most efficient for the submit branch to be a local mirror.\n"
3862
4094
"in the merge directive."
3863
4095
msgstr ""
3864
4096
3865
#: bzrlib/builtins.py:5761
4097
#: bzrlib/builtins.py:5780
3866
4098
msgid ""
3867
4099
"The default behaviour is to send the merge directive by mail, unless -o is\n"
3868
4100
"given, in which case it is sent to a file."
3869
4101
msgstr ""
3870
4102
3871
#: bzrlib/builtins.py:5764
4103
#: bzrlib/builtins.py:5783
3872
4104
msgid ""
3873
4105
"Mail is sent using your preferred mail program. This should be transparent\n"
3874
4106
"on Windows (it uses MAPI). On Unix, it requires the xdg-email utility.\n"
3875
4107
"If the preferred client can't be found (or used), your editor will be used."
3876
4108
msgstr ""
3877
4109
3878
#: bzrlib/builtins.py:5768
4110
#: bzrlib/builtins.py:5787
3879
4111
msgid ""
3880
4112
"To use a specific mail program, set the mail_client configuration option.\n"
3881
4113
"(For Thunderbird 1.5, this works around some bugs.) Supported values for\n"
3887
4119
"supported clients."
3888
4120
msgstr ""
3889
4121
3890
#: bzrlib/builtins.py:5775
4122
#: bzrlib/builtins.py:5794
3891
4123
msgid ""
3892
4124
"If mail is being sent, a to address is required. This can be supplied\n"
3893
4125
"either on the commandline, by setting the submit_to configuration\n"
3895
4127
"in the submit branch."
3896
4128
msgstr ""
3897
4129
3898
#: bzrlib/builtins.py:5780
4130
#: bzrlib/builtins.py:5799
3899
4131
msgid ""
3900
4132
"Two formats are currently supported: \"4\" uses revision bundle format 4 "
3901
4133
"and\n"
3905
4137
"format 1. It is compatible with Bazaar 0.12 - 0.18."
3906
4138
msgstr ""
3907
4139
3908
#: bzrlib/builtins.py:5786
4140
#: bzrlib/builtins.py:5805
3909
4141
msgid ""
3910
4142
"The merge directives created by bzr send may be applied using bzr merge or\n"
3911
4143
"bzr pull by specifying a file containing a merge directive as the location."
3912
4144
msgstr ""
3913
4145
3914
#: bzrlib/builtins.py:5789
4146
#: bzrlib/builtins.py:5808
3915
4147
msgid ""
3916
4148
"bzr send makes extensive use of public locations to map local locations "
3917
4149
"into\n"
3919
4151
"set them, and use `bzr info` to display them."
3920
4152
msgstr ""
3921
4153
3922
#: bzrlib/builtins.py:5813
4154
#: bzrlib/builtins.py:5832
3923
4155
msgid "Write merge directive to this file or directory; use - for stdout."
3924
4156
msgstr "Escribir la directiva de fusión a este archivo; use - for stdout."
3925
4157
3926
#: bzrlib/builtins.py:5817
4158
#: bzrlib/builtins.py:5836
3927
4159
msgid ""
3928
4160
"Refuse to send if there are uncommitted changes in the working tree, --no-"
3929
4161
"strict disables the check."
3930
4162
msgstr ""
3931
4163
3932
#: bzrlib/builtins.py:5819
4164
#: bzrlib/builtins.py:5838
3933
4165
msgid "Mail the request to this address."
3934
4166
msgstr "Enviar por correo la petición a esta dirección"
3935
4167
3936
#: bzrlib/builtins.py:5823
4168
#: bzrlib/builtins.py:5842
3937
4169
msgid "Body for the email."
3938
4170
msgstr "Cuerpo para el correo."
3939
4171
3940
#: bzrlib/builtins.py:5876
4172
#: bzrlib/builtins.py:5895
3941
4173
msgid "Do not include a bundle in the merge directive."
3942
4174
msgstr ""
3943
4175
3944
#: bzrlib/builtins.py:5877
4176
#: bzrlib/builtins.py:5896
3945
4177
msgid "Do not include a preview patch in the merge directive."
3946
4178
msgstr "No incluir una ruta de vista previa en la directiva de fusión."
3947
4179
3948
#: bzrlib/builtins.py:5880
4180
#: bzrlib/builtins.py:5899
3949
4181
msgid "Remember submit and public branch."
3950
4182
msgstr "Recordar el envío y la rama pública."
3951
4183
3952
#: bzrlib/builtins.py:5882
4184
#: bzrlib/builtins.py:5901
3953
4185
msgid ""
3954
4186
"Branch to generate the submission from, rather than the one containing the "
3955
4187
"working directory."
3956
4188
msgstr ""
3957
4189
3958
#: bzrlib/builtins.py:5892 bzrlib/cmd_version_info.py:76
4190
#: bzrlib/builtins.py:5911 bzrlib/cmd_version_info.py:76
3959
4191
msgid "format"
3960
4192
msgstr "formato"
3961
4193
3962
#: bzrlib/builtins.py:5893
4194
#: bzrlib/builtins.py:5912
3963
4195
msgid "Use the specified output format."
3964
4196
msgstr "Usar el formato de salida especificado."
3965
4197
3966
#: bzrlib/builtins.py:5915
4198
#: bzrlib/builtins.py:5934
3967
4199
msgid "Create, remove or modify a tag naming a revision."
3968
4200
msgstr "Crea, elimina o modifica una etiqueta que nombra una revisión."
3969
4201
3970
#: bzrlib/builtins.py:5917
4202
#: bzrlib/builtins.py:5936
3971
4203
msgid ""
3972
4204
"Tags give human-meaningful names to revisions. Commands that take a -r\n"
3973
4205
"(--revision) option can be given -rtag:X, where X is any previously\n"
3974
4206
"created tag."
3975
4207
msgstr ""
3976
4208
3977
#: bzrlib/builtins.py:5921
4209
#: bzrlib/builtins.py:5940
3978
4210
msgid ""
3979
4211
"Tags are stored in the branch. Tags are copied from one branch to another\n"
3980
4212
"along when you branch, push, pull or merge."
3981
4213
msgstr ""
3982
4214
3983
#: bzrlib/builtins.py:5924
4215
#: bzrlib/builtins.py:5943
3984
4216
msgid ""
3985
4217
"It is an error to give a tag name that already exists unless you pass\n"
3986
4218
"--force, in which case the tag is moved to point to the new revision."
3987
4219
msgstr ""
3988
4220
3989
#: bzrlib/builtins.py:5927
4221
#: bzrlib/builtins.py:5946
3990
4222
msgid ""
3991
4223
"To rename a tag (change the name but keep it on the same revsion), run "
3992
4224
"``bzr\n"
3993
4225
"tag new-name -r tag:old-name`` and then ``bzr tag --delete oldname``."
3994
4226
msgstr ""
3995
4227
3996
#: bzrlib/builtins.py:5930
4228
#: bzrlib/builtins.py:5949
3997
4229
msgid ""
3998
4230
"If no tag name is specified it will be determined through the \n"
3999
4231
"'automatic_tag_name' hook. This can e.g. be used to automatically tag\n"
4001
4233
"details."
4002
4234
msgstr ""
4003
4235
4004
#: bzrlib/builtins.py:5940
4236
#: bzrlib/builtins.py:5959
4005
4237
msgid "Delete this tag rather than placing it."
4006
4238
msgstr "Eliminar esta etiqueta en lugar de colocarla."
4007
4239
4008
#: bzrlib/builtins.py:5943
4240
#: bzrlib/builtins.py:5962
4009
4241
msgid "Branch in which to place the tag."
4010
4242
msgstr ""
4011
4243
4012
#: bzrlib/builtins.py:5945
4244
#: bzrlib/builtins.py:5964
4013
4245
msgid "Replace existing tags."
4014
4246
msgstr "Reemplazar las etiquetas existentes."
4015
4247
4016
#: bzrlib/builtins.py:5960
4248
#: bzrlib/builtins.py:5979
4017
4249
msgid "No tag specified to delete."
4018
4250
msgstr "No hay etiquetas especificadas para eliminar."
4019
4251
4020
#: bzrlib/builtins.py:5962
4252
#: bzrlib/builtins.py:5981
4021
4253
#, python-format
4022
4254
msgid "Deleted tag %s."
4023
4255
msgstr "Etiqueta%s eliminada."
4024
4256
4025
#: bzrlib/builtins.py:5976
4257
#: bzrlib/builtins.py:5995
4026
4258
msgid "Please specify a tag name."
4027
4259
msgstr "Especifique un nombre de etiqueta."
4028
4260
4029
#: bzrlib/builtins.py:5984
4261
#: bzrlib/builtins.py:6003
4030
4262
#, python-format
4031
4263
msgid "Tag %s already exists for that revision."
4032
4264
msgstr "La etiqueta %s existe para esta revisión."
4033
4265
4034
#: bzrlib/builtins.py:5988
4266
#: bzrlib/builtins.py:6007
4035
4267
#, python-format
4036
4268
msgid "Created tag %s."
4037
4269
msgstr "Etiqueta %s creada."
4038
4270
4039
#: bzrlib/builtins.py:5990
4271
#: bzrlib/builtins.py:6009
4040
4272
#, python-format
4041
4273
msgid "Updated tag %s."
4042
4274
msgstr "Etiqueta actualizada %s."
4043
4275
4044
#: bzrlib/builtins.py:5994
4276
#: bzrlib/builtins.py:6013
4045
4277
msgid "List tags."
4046
4278
msgstr "Listar etiquetas."
4047
4279
4048
#: bzrlib/builtins.py:5996
4280
#: bzrlib/builtins.py:6015
4049
4281
msgid ""
4050
4282
"This command shows a table of tag names and the revisions they reference."
4051
4283
msgstr ""
4052
4284
4053
#: bzrlib/builtins.py:6002
4285
#: bzrlib/builtins.py:6021
4054
4286
msgid "Branch whose tags should be displayed."
4055
4287
msgstr "Rama cuyas etiquetas se deben mostrar."
4056
4288
4057
#: bzrlib/builtins.py:6004
4289
#: bzrlib/builtins.py:6023
4058
4290
msgid "Sort tags by different criteria."
4059
4291
msgstr "Ordenar etiquetas con diferentes criterios."
4060
4292
4061
#: bzrlib/builtins.py:6004
4293
#: bzrlib/builtins.py:6023
4062
4294
msgid "Sorting"
4063
4295
msgstr "Ordenación"
4064
4296
4065
#: bzrlib/builtins.py:6073
4297
#: bzrlib/builtins.py:6092
4066
4298
msgid "Reconfigure the type of a bzr directory."
4067
4299
msgstr "Reconfigura el tipo de un directorio bzr."
4068
4300
4069
#: bzrlib/builtins.py:6075
4301
#: bzrlib/builtins.py:6094
4070
4302
msgid "A target configuration must be specified."
4071
4303
msgstr "Se debe especificar una configuración objetivo."
4072
4304
4073
#: bzrlib/builtins.py:6077
4305
#: bzrlib/builtins.py:6096
4074
4306
msgid ""
4075
4307
"For checkouts, the bind-to location will be auto-detected if not specified.\n"
4076
4308
"The order of preference is\n"
4081
4313
"If none of these is available, --bind-to must be specified."
4082
4314
msgstr ""
4083
4315
4084
#: bzrlib/builtins.py:6091
4316
#: bzrlib/builtins.py:6110
4085
4317
msgid "Tree type"
4086
4318
msgstr "Tipo de árbol"
4087
4319
4088
#: bzrlib/builtins.py:6092
4320
#: bzrlib/builtins.py:6111
4089
4321
msgid "The relation between branch and tree."
4090
4322
msgstr "La relación entre rama y árbol."
4091
4323
4092
#: bzrlib/builtins.py:6094
4324
#: bzrlib/builtins.py:6113
4093
4325
msgid "Reconfigure to be an unbound branch with no working tree."
4094
4326
msgstr ""
4095
4327
4096
#: bzrlib/builtins.py:6095
4328
#: bzrlib/builtins.py:6114
4097
4329
msgid "Reconfigure to be an unbound branch with a working tree."
4098
4330
msgstr ""
4099
4331
4100
#: bzrlib/builtins.py:6096
4332
#: bzrlib/builtins.py:6115
4101
4333
msgid "Reconfigure to be a bound branch with a working tree."
4102
4334
msgstr ""
4103
4335
4104
#: bzrlib/builtins.py:6097
4336
#: bzrlib/builtins.py:6116
4105
4337
msgid "Reconfigure to be a lightweight checkout (with no local history)."
4106
4338
msgstr ""
4107
4339
4108
#: bzrlib/builtins.py:6102
4340
#: bzrlib/builtins.py:6121
4109
4341
msgid "Repository type"
4110
4342
msgstr "Tipo de repositorio"
4111
4343
4112
#: bzrlib/builtins.py:6103
4344
#: bzrlib/builtins.py:6122
4113
4345
msgid "Location fo the repository."
4114
4346
msgstr "Ubicación en el repositorio."
4115
4347
4116
#: bzrlib/builtins.py:6105
4348
#: bzrlib/builtins.py:6124
4117
4349
msgid ""
4118
4350
"Reconfigure to be a standalone branch (i.e. stop using shared repository)."
4119
4351
msgstr ""
4120
4352
4121
#: bzrlib/builtins.py:6107
4353
#: bzrlib/builtins.py:6126
4122
4354
msgid "Reconfigure to use a shared repository."
4123
msgstr ""
4355
msgstr "Reconfigure para usar un repositorio compartido."
4124
4356
4125
#: bzrlib/builtins.py:6111
4357
#: bzrlib/builtins.py:6130
4126
4358
msgid "Trees in Repository"
4127
4359
msgstr "Árboles en el repositorio"
4128
4360
4129
#: bzrlib/builtins.py:6112
4361
#: bzrlib/builtins.py:6131
4130
4362
msgid "Whether new branches in the repository have trees."
4131
4363
msgstr "Si las ramas nuevas en el repositorio tienen árboles."
4132
4364
4133
#: bzrlib/builtins.py:6114
4365
#: bzrlib/builtins.py:6133
4134
4366
msgid ""
4135
4367
"Reconfigure repository to create working trees on branches by default."
4136
4368
msgstr ""
4137
4369
4138
#: bzrlib/builtins.py:6116
4370
#: bzrlib/builtins.py:6135
4139
4371
msgid ""
4140
4372
"Reconfigure repository to not create working trees on branches by default."
4141
4373
msgstr ""
4142
4374
4143
#: bzrlib/builtins.py:6119
4375
#: bzrlib/builtins.py:6138
4144
4376
msgid "Branch to bind checkout to."
4145
4377
msgstr ""
4146
4378
4147
#: bzrlib/builtins.py:6121
4379
#: bzrlib/builtins.py:6140
4148
4380
msgid "Perform reconfiguration even if local changes will be lost."
4149
4381
msgstr ""
4150
4382
"Realizar reconfiguración incluso si se han perdido los cambios locales."
4151
4383
4152
#: bzrlib/builtins.py:6124
4384
#: bzrlib/builtins.py:6143
4153
4385
msgid "Reconfigure a branch to be stacked on another branch."
4154
4386
msgstr "Reconfigurar una rama para apilarla en otra rama."
4155
4387
4156
#: bzrlib/builtins.py:6128
4388
#: bzrlib/builtins.py:6147
4157
4389
msgid ""
4158
4390
"Reconfigure a branch to be unstacked. This may require copying substantial "
4159
4391
"data into it."
4160
4392
msgstr ""
4161
4393
4162
#: bzrlib/builtins.py:6138
4394
#: bzrlib/builtins.py:6157
4163
4395
msgid "Can't use both --stacked-on and --unstacked"
4164
4396
msgstr "No se pueden usar ambos --stacked-on y --unstacked"
4165
4397
4166
#: bzrlib/builtins.py:6152
4398
#: bzrlib/builtins.py:6171
4167
4399
msgid "No target configuration specified"
4168
4400
msgstr "No se ha especificado una configuración objetivo"
4169
4401
4170
#: bzrlib/builtins.py:6187
4402
#: bzrlib/builtins.py:6206
4171
4403
msgid "Set the branch of a checkout and update."
4172
4404
msgstr "Establezca la rama de una comprobación y actualización."
4173
4405
4174
#: bzrlib/builtins.py:6189
4406
#: bzrlib/builtins.py:6208
4175
4407
msgid ""
4176
4408
"For lightweight checkouts, this changes the branch being referenced.\n"
4177
4409
"For heavyweight checkouts, this checks that there are no local commits\n"
4179
4411
"of the new location and binds to it."
4180
4412
msgstr ""
4181
4413
4182
#: bzrlib/builtins.py:6194
4414
#: bzrlib/builtins.py:6213
4183
4415
msgid ""
4184
4416
"In both cases, the working tree is updated and uncommitted changes\n"
4185
4417
"are merged. The user can commit or revert these as they desire."
4186
4418
msgstr ""
4187
4419
4188
#: bzrlib/builtins.py:6197
4420
#: bzrlib/builtins.py:6216
4189
4421
msgid "Pending merges need to be committed or reverted before using switch."
4190
4422
msgstr ""
4191
4423
4192
#: bzrlib/builtins.py:6199
4424
#: bzrlib/builtins.py:6218
4193
4425
msgid ""
4194
4426
"The path to the branch to switch to can be specified relative to the parent\n"
4195
4427
"directory of the current branch. For example, if you are currently in a\n"
4197
4429
"/path/to/newbranch."
4198
4430
msgstr ""
4199
4431
4200
#: bzrlib/builtins.py:6204
4432
#: bzrlib/builtins.py:6223
4201
4433
msgid ""
4202
4434
"Bound branches use the nickname of its master branch unless it is set\n"
4203
4435
"locally, in which case switching will update the local nickname to be\n"
4204
4436
"that of the master."
4205
4437
msgstr ""
4206
4438
4207
#: bzrlib/builtins.py:6212
4439
#: bzrlib/builtins.py:6231
4208
4440
msgid "Switch even if local commits will be lost."
4209
4441
msgstr "Cambiar incluso si las ejecuciones se han perdido."
4210
4442
4211
#: bzrlib/builtins.py:6215
4443
#: bzrlib/builtins.py:6234
4212
4444
msgid "Create the target branch from this one before switching to it."
4213
4445
msgstr ""
4214
4446
4215
#: bzrlib/builtins.py:6229
4447
#: bzrlib/builtins.py:6248
4216
4448
msgid "You must supply either a revision or a location"
4217
4449
msgstr "Debe especificar una revisión o una ubicación"
4218
4450
4219
#: bzrlib/builtins.py:6242
4451
#: bzrlib/builtins.py:6261
4220
4452
msgid "cannot create branch without source branch"
4221
4453
msgstr "no se puede crear una rama sin rama origen"
4222
4454
4223
#: bzrlib/builtins.py:6262
4455
#: bzrlib/builtins.py:6286
4224
4456
msgid "Manage filtered views."
4225
4457
msgstr "Gestionar vistas filtradas."
4226
4458
4227
#: bzrlib/builtins.py:6264
4459
#: bzrlib/builtins.py:6288
4228
4460
msgid ""
4229
4461
"Views provide a mask over the tree so that users can focus on\n"
4230
4462
"a subset of a tree when doing their work. After creating a view,\n"
4234
4466
"must be within the current view."
4235
4467
msgstr ""
4236
4468
4237
#: bzrlib/builtins.py:6271
4469
#: bzrlib/builtins.py:6295
4238
4470
msgid ""
4239
4471
"In most cases, a view has a short life-span: it is created to make\n"
4240
4472
"a selected change and is deleted once that change is committed.\n"
4242
4474
"and switch between them."
4243
4475
msgstr ""
4244
4476
4245
#: bzrlib/builtins.py:6276
4477
#: bzrlib/builtins.py:6300
4246
4478
msgid ""
4247
4479
"To disable the current view without deleting it, you can switch to\n"
4248
4480
"the pseudo view called ``off``. This can be useful when you need\n"
4250
4482
"want to switch back to your view after that."
4251
4483
msgstr ""
4252
4484
4253
#: bzrlib/builtins.py:6281
4485
#: bzrlib/builtins.py:6305
4254
4486
msgid ""
4255
4487
":Examples:\n"
4256
4488
" To define the current view::"
4258
4490
":Ejemplos:\n"
4259
4491
" Para definir la vista actual::"
4260
4492
4261
#: bzrlib/builtins.py:6284
4493
#: bzrlib/builtins.py:6308
4262
4494
msgid " bzr view file1 dir1 ..."
4263
4495
msgstr " bzr view file1 dir1 ..."
4264
4496
4265
#: bzrlib/builtins.py:6286
4497
#: bzrlib/builtins.py:6310
4266
4498
msgid " To list the current view::"
4267
4499
msgstr " Para listar la vista actual::"
4268
4500
4269
#: bzrlib/builtins.py:6288
4501
#: bzrlib/builtins.py:6312
4270
4502
msgid " bzr view"
4271
4503
msgstr " vista bzr"
4272
4504
4273
#: bzrlib/builtins.py:6290
4505
#: bzrlib/builtins.py:6314
4274
4506
msgid " To delete the current view::"
4275
4507
msgstr " Para eliminar la vista actual::"
4276
4508
4277
#: bzrlib/builtins.py:6292
4509
#: bzrlib/builtins.py:6316
4278
4510
msgid " bzr view --delete"
4279
4511
msgstr " bzr view --delete"
4280
4512
4281
#: bzrlib/builtins.py:6294
4513
#: bzrlib/builtins.py:6318
4282
4514
msgid " To disable the current view without deleting it::"
4283
4515
msgstr " Para desactivar la vista actual sin eliminarla::"
4284
4516
4285
#: bzrlib/builtins.py:6296
4517
#: bzrlib/builtins.py:6320
4286
4518
msgid " bzr view --switch off"
4287
4519
msgstr " bzr view --switch off"
4288
4520
4289
#: bzrlib/builtins.py:6298
4521
#: bzrlib/builtins.py:6322
4290
4522
msgid " To define a named view and switch to it::"
4291
4523
msgstr ""
4292
4524
4293
#: bzrlib/builtins.py:6300
4525
#: bzrlib/builtins.py:6324
4294
4526
msgid " bzr view --name view-name file1 dir1 ..."
4295
4527
msgstr " bzr view --name view-name file1 dir1 ..."
4296
4528
4297
#: bzrlib/builtins.py:6302
4529
#: bzrlib/builtins.py:6326
4298
4530
msgid " To list a named view::"
4299
4531
msgstr " Para lista la vista nombrada::"
4300
4532
4301
#: bzrlib/builtins.py:6304
4533
#: bzrlib/builtins.py:6328
4302
4534
msgid " bzr view --name view-name"
4303
4535
msgstr " bzr view --name view-name"
4304
4536
4305
#: bzrlib/builtins.py:6306
4537
#: bzrlib/builtins.py:6330
4306
4538
msgid " To delete a named view::"
4307
4539
msgstr " Para eliminar una vista nombrada::"
4308
4540
4309
#: bzrlib/builtins.py:6308
4541
#: bzrlib/builtins.py:6332
4310
4542
msgid " bzr view --name view-name --delete"
4311
4543
msgstr " bzr view --name view-name --delete"
4312
4544
4313
#: bzrlib/builtins.py:6310
4545
#: bzrlib/builtins.py:6334
4314
4546
msgid " To switch to a named view::"
4315
4547
msgstr " Para cambiar a una vista nombrada::"
4316
4548
4317
#: bzrlib/builtins.py:6312
4549
#: bzrlib/builtins.py:6336
4318
4550
msgid " bzr view --switch view-name"
4319
4551
msgstr " bzr view --switch view-name"
4320
4552
4321
#: bzrlib/builtins.py:6314
4553
#: bzrlib/builtins.py:6338
4322
4554
msgid " To list all views defined::"
4323
4555
msgstr " Para listar todas las vistas definidas::"
4324
4556
4325
#: bzrlib/builtins.py:6316
4557
#: bzrlib/builtins.py:6340
4326
4558
msgid " bzr view --all"
4327
4559
msgstr " bzr view --all"
4328
4560
4329
#: bzrlib/builtins.py:6318
4561
#: bzrlib/builtins.py:6342
4330
4562
msgid " To delete all views::"
4331
4563
msgstr " Para eliminar todas las vistas::"
4332
4564
4333
#: bzrlib/builtins.py:6320
4565
#: bzrlib/builtins.py:6344
4334
4566
msgid " bzr view --delete --all"
4335
4567
msgstr " bzr view --delete --all"
4336
4568
4337
#: bzrlib/builtins.py:6327
4569
#: bzrlib/builtins.py:6351
4338
4570
msgid "Apply list or delete action to all views."
4339
4571
msgstr ""
4340
4572
4341
#: bzrlib/builtins.py:6330
4573
#: bzrlib/builtins.py:6354
4342
4574
msgid "Delete the view."
4343
4575
msgstr "Eliminar la vista."
4344
4576
4345
#: bzrlib/builtins.py:6333
4577
#: bzrlib/builtins.py:6357
4346
4578
msgid "Name of the view to define, list or delete."
4347
4579
msgstr "Nombre de la vista a definir, listar o eliminar."
4348
4580
4349
#: bzrlib/builtins.py:6337
4581
#: bzrlib/builtins.py:6361
4350
4582
msgid "Name of the view to switch to."
4351
4583
msgstr "Nombre de la vista a la que cambiar."
4352
4584
4353
#: bzrlib/builtins.py:6356
4585
#: bzrlib/builtins.py:6380
4354
4586
msgid "Both --delete and a file list specified"
4355
4587
msgstr ""
4356
4588
4357
#: bzrlib/builtins.py:6359
4589
#: bzrlib/builtins.py:6383
4358
4590
msgid "Both --delete and --switch specified"
4359
4591
msgstr "Ambos --delete y --switch especificados"
4360
4592
4361
#: bzrlib/builtins.py:6362
4593
#: bzrlib/builtins.py:6386
4362
4594
msgid "Deleted all views.\n"
4363
4595
msgstr "Eliminar todas las vistas.\n"
4364
4596
4365
#: bzrlib/builtins.py:6364
4597
#: bzrlib/builtins.py:6388
4366
4598
msgid "No current view to delete"
4367
4599
msgstr "No hay vista para eliminar"
4368
4600
4369
#: bzrlib/builtins.py:6367
4601
#: bzrlib/builtins.py:6391
4370
4602
#, python-format
4371
4603
msgid "Deleted '%s' view.\n"
4372
4604
msgstr "Vista «%s» eliminada.\n"
4373
4605
4374
#: bzrlib/builtins.py:6371
4606
#: bzrlib/builtins.py:6395
4375
4607
msgid "Both --switch and a file list specified"
4376
4608
msgstr ""
4377
4609
4378
#: bzrlib/builtins.py:6374
4610
#: bzrlib/builtins.py:6398
4379
4611
msgid "Both --switch and --all specified"
4380
4612
msgstr "Ambos --switch y --all especificados"
4381
4613
4382
#: bzrlib/builtins.py:6377
4614
#: bzrlib/builtins.py:6401
4383
4615
msgid "No current view to disable"
4384
4616
msgstr "No hay vista actual que desactivar"
4385
4617
4386
#: bzrlib/builtins.py:6379
4618
#: bzrlib/builtins.py:6403
4387
4619
#, python-format
4388
4620
msgid "Disabled '%s' view.\n"
4389
4621
msgstr "Vista «%s» desactivada.\n"
4390
4622
4391
#: bzrlib/builtins.py:6383 bzrlib/builtins.py:6405
4623
#: bzrlib/builtins.py:6407 bzrlib/builtins.py:6429
4392
4624
msgid "Using '{0}' view: {1}\n"
4393
4625
msgstr "Usar «{0}» vista: {1}\n"
4394
4626
4395
#: bzrlib/builtins.py:6386
4627
#: bzrlib/builtins.py:6410
4396
4628
msgid "Views defined:\n"
4397
4629
msgstr "Vistas definidas:\n"
4398
4630
4399
#: bzrlib/builtins.py:6395
4631
#: bzrlib/builtins.py:6419
4400
4632
msgid "No views defined.\n"
4401
4633
msgstr "No hay vista definida.\n"
4402
4634
4403
#: bzrlib/builtins.py:6402
4635
#: bzrlib/builtins.py:6426
4404
4636
msgid "Cannot change the 'off' pseudo view"
4405
4637
msgstr ""
4406
4638
4407
#: bzrlib/builtins.py:6410
4639
#: bzrlib/builtins.py:6434
4408
4640
msgid "No current view.\n"
4409
4641
msgstr "No hay vista actual.\n"
4410
4642
4411
#: bzrlib/builtins.py:6413
4643
#: bzrlib/builtins.py:6437
4412
4644
msgid "'{0}' view is: {1}\n"
4413
4645
msgstr "«{0}» vista es: {1}\n"
4414
4646
4415
#: bzrlib/builtins.py:6433
4647
#: bzrlib/builtins.py:6457
4416
4648
msgid " <no hooks installed>\n"
4417
4649
msgstr ""
4418
4650
4419
#: bzrlib/builtins.py:6437
4651
#: bzrlib/builtins.py:6461
4420
4652
msgid "Remove a branch."
4421
4653
msgstr "Eliminar una rama."
4422
4654
4423
#: bzrlib/builtins.py:6439
4655
#: bzrlib/builtins.py:6463
4424
4656
msgid ""
4425
4657
"This will remove the branch from the specified location but \n"
4426
4658
"will keep any working tree or repository in place."
4427
4659
msgstr ""
4428
4660
4429
#: bzrlib/builtins.py:6444
4661
#: bzrlib/builtins.py:6468
4430
4662
msgid " Remove the branch at repo/trunk::"
4431
4663
msgstr " Eliminar la rama en repo/trunk::"
4432
4664
4433
#: bzrlib/builtins.py:6446
4665
#: bzrlib/builtins.py:6470
4434
4666
msgid " bzr remove-branch repo/trunk"
4435
4667
msgstr " bzr remove-branch repo/trunk"
4436
4668
4437
#: bzrlib/builtins.py:6461
4669
#: bzrlib/builtins.py:6477
4670
msgid "Remove branch even if it is the active branch."
4671
msgstr ""
4672
4673
#: bzrlib/builtins.py:6491
4674
msgid "Branch is active. Use --force to remove it."
4675
msgstr ""
4676
4677
#: bzrlib/builtins.py:6495
4438
4678
msgid "Plaintext diff output."
4439
4679
msgstr ""
4440
4680
4441
#: bzrlib/builtins.py:6462
4681
#: bzrlib/builtins.py:6496
4442
4682
msgid "Temporarily set aside some changes from the current tree."
4443
4683
msgstr ""
4444
4684
4445
#: bzrlib/builtins.py:6464
4685
#: bzrlib/builtins.py:6498
4446
4686
msgid ""
4447
4687
"Shelve allows you to temporarily put changes you've made \"on the shelf\",\n"
4448
4688
"ie. out of the way, until a later time when you can bring them back from\n"
4451
4691
"will they survive its deletion."
4452
4692
msgstr ""
4453
4693
4454
#: bzrlib/builtins.py:6470
4694
#: bzrlib/builtins.py:6504
4455
4695
msgid "If shelve --list is specified, previously-shelved changes are listed."
4456
4696
msgstr ""
4457
4697
4458
#: bzrlib/builtins.py:6472
4698
#: bzrlib/builtins.py:6506
4459
4699
msgid ""
4460
4700
"Shelve is intended to help separate several sets of changes that have\n"
4461
4701
"been inappropriately mingled. If you just want to get rid of all changes\n"
4463
4703
"shelve all text changes at once, use shelve --all."
4464
4704
msgstr ""
4465
4705
4466
#: bzrlib/builtins.py:6477
4706
#: bzrlib/builtins.py:6511
4467
4707
msgid ""
4468
4708
"If filenames are specified, only the changes to those files will be\n"
4469
4709
"shelved. Other files will be left untouched."
4470
4710
msgstr ""
4471
4711
4472
#: bzrlib/builtins.py:6480
4712
#: bzrlib/builtins.py:6514
4473
4713
msgid ""
4474
4714
"If a revision is specified, changes since that revision will be shelved."
4475
4715
msgstr ""
4476
4716
"Si se especifica una revisión, los cambios realizados desde esta revisión "
4477
4717
"serán archivados."
4478
4718
4479
#: bzrlib/builtins.py:6482
4719
#: bzrlib/builtins.py:6516
4480
4720
msgid ""
4481
4721
"You can put multiple items on the shelf, and by default, 'unshelve' will\n"
4482
4722
"restore the most recently shelved changes."
4483
4723
msgstr ""
4484
4724
4485
#: bzrlib/builtins.py:6485
4725
#: bzrlib/builtins.py:6519
4486
4726
msgid ""
4487
4727
"For complicated changes, it is possible to edit the changes in a separate\n"
4488
4728
"editor program to decide what the file remaining in the working copy\n"
4489
4729
"should look like. To do this, add the configuration option"
4490
4730
msgstr ""
4491
4731
4492
#: bzrlib/builtins.py:6489
4732
#: bzrlib/builtins.py:6523
4493
4733
msgid " change_editor = PROGRAM @new_path @old_path"
4494
4734
msgstr ""
4495
4735
4496
#: bzrlib/builtins.py:6491
4736
#: bzrlib/builtins.py:6525
4497
4737
msgid ""
4498
4738
"where @new_path is replaced with the path of the new version of the \n"
4499
4739
"file and @old_path is replaced with the path of the old version of \n"
4502
4742
" "
4503
4743
msgstr ""
4504
4744
4505
#: bzrlib/builtins.py:6503
4745
#: bzrlib/builtins.py:6537
4506
4746
msgid "Shelve all changes."
4507
4747
msgstr "Guardar todos los cambios."
4508
4748
4509
#: bzrlib/builtins.py:6505
4749
#: bzrlib/builtins.py:6539
4510
4750
msgid "Method to use for writing diffs."
4511
4751
msgstr "Método a usar para escribir diferencias."
4512
4752
4513
#: bzrlib/builtins.py:6505
4753
#: bzrlib/builtins.py:6539
4514
4754
msgid "writer"
4515
4755
msgstr "escritor"
4516
4756
4517
#: bzrlib/builtins.py:6509
4757
#: bzrlib/builtins.py:6543
4518
4758
msgid "List shelved changes."
4519
4759
msgstr "Listar cambios guardados."
4520
4760
4521
#: bzrlib/builtins.py:6511
4761
#: bzrlib/builtins.py:6545
4522
4762
msgid "Destroy removed changes instead of shelving them."
4523
4763
msgstr "Destruir cambios eliminados en vez de guardarlos."
4524
4764
4525
#: bzrlib/builtins.py:6540
4765
#: bzrlib/builtins.py:6574
4526
4766
msgid "No shelved changes."
4527
4767
msgstr "No ha cambios guardados."
4528
4768
4529
#: bzrlib/builtins.py:6551
4769
#: bzrlib/builtins.py:6585
4530
4770
msgid "Restore shelved changes."
4531
4771
msgstr "Restaurar cambios guardados."
4532
4772
4533
#: bzrlib/builtins.py:6553
4773
#: bzrlib/builtins.py:6587
4534
4774
msgid ""
4535
4775
"By default, the most recently shelved changes are restored. However if you\n"
4536
4776
"specify a shelf by id those changes will be restored instead. This works\n"
4537
4777
"best when the changes don't depend on each other."
4538
4778
msgstr ""
4539
4779
4540
#: bzrlib/builtins.py:6562
4780
#: bzrlib/builtins.py:6596
4541
4781
msgid "The action to perform."
4542
4782
msgstr "La acción a realizar."
4543
4783
4544
#: bzrlib/builtins.py:6562 bzrlib/conflicts.py:694
4784
#: bzrlib/builtins.py:6596 bzrlib/conflicts.py:694
4545
4785
msgid "action"
4546
4786
msgstr "acción"
4547
4787
4548
#: bzrlib/builtins.py:6564
4788
#: bzrlib/builtins.py:6598
4549
4789
msgid "Apply changes and remove from the shelf."
4550
4790
msgstr ""
4551
4791
4552
#: bzrlib/builtins.py:6565
4792
#: bzrlib/builtins.py:6599
4553
4793
msgid "Show changes, but do not apply or remove them."
4554
4794
msgstr ""
4555
4795
4556
#: bzrlib/builtins.py:6566
4796
#: bzrlib/builtins.py:6600
4557
4797
msgid ""
4558
4798
"Instead of unshelving the changes, show the diff that would result from "
4559
4799
"unshelving."
4560
4800
msgstr ""
4561
4801
4562
#: bzrlib/builtins.py:6568
4802
#: bzrlib/builtins.py:6602
4563
4803
msgid "Delete changes without applying them."
4564
msgstr ""
4804
msgstr "Eliminar cambios sin aplicarlos."
4565
4805
4566
#: bzrlib/builtins.py:6569
4806
#: bzrlib/builtins.py:6603
4567
4807
msgid "Apply changes but don't delete them."
4568
4808
msgstr ""
4569
4809
4570
#: bzrlib/builtins.py:6584
4810
#: bzrlib/builtins.py:6618
4571
4811
msgid "Remove unwanted files from working tree."
4572
4812
msgstr "Eliminar archivos no deseados desde el árbol de trabajo."
4573
4813
4574
#: bzrlib/builtins.py:6586
4814
#: bzrlib/builtins.py:6620
4575
4815
msgid ""
4576
4816
"By default, only unknown files, not ignored files, are deleted. Versioned\n"
4577
4817
"files are never deleted."
4578
4818
msgstr ""
4579
4819
4580
#: bzrlib/builtins.py:6589
4820
#: bzrlib/builtins.py:6623
4581
4821
msgid ""
4582
4822
"Another class is 'detritus', which includes files emitted by bzr during\n"
4583
4823
"normal operations and selftests. (The value of these files decreases with\n"
4584
4824
"time.)"
4585
4825
msgstr ""
4586
4826
4587
#: bzrlib/builtins.py:6593
4827
#: bzrlib/builtins.py:6627
4588
4828
msgid ""
4589
4829
"If no options are specified, unknown files are deleted. Otherwise, option\n"
4590
4830
"flags are respected, and may be combined."
4591
4831
msgstr ""
4592
4832
4593
#: bzrlib/builtins.py:6596
4833
#: bzrlib/builtins.py:6630
4594
4834
msgid "To check what clean-tree will do, use --dry-run."
4595
4835
msgstr ""
4596
4836
4597
#: bzrlib/builtins.py:6599
4837
#: bzrlib/builtins.py:6633
4598
4838
msgid "Delete all ignored files."
4599
4839
msgstr "Eliminar todos los archivos ignorados."
4600
4840
4601
#: bzrlib/builtins.py:6600
4841
#: bzrlib/builtins.py:6634
4602
4842
msgid ""
4603
4843
"Delete conflict files, merge and revert backups, and failed selftest dirs."
4604
4844
msgstr ""
4605
4845
4606
#: bzrlib/builtins.py:6603
4846
#: bzrlib/builtins.py:6637
4607
4847
msgid "Delete files unknown to bzr (default)."
4608
4848
msgstr "Eliminar archivos desconocidos de bzr (predeterminado)."
4609
4849
4610
#: bzrlib/builtins.py:6604
4850
#: bzrlib/builtins.py:6638
4611
4851
msgid "Show files to delete instead of deleting them."
4612
4852
msgstr "Mostrar archivos a eliminar en vez de eliminarles."
4613
4853
4614
#: bzrlib/builtins.py:6606
4854
#: bzrlib/builtins.py:6640
4615
4855
msgid "Do not prompt before deleting."
4616
4856
msgstr "No preguntar antes de eliminar."
4617
4857
4621
4861
4622
4862
#: bzrlib/bundle/apply_bundle.py:40
4623
4863
msgid "Install revisions"
4624
msgstr ""
4864
msgstr "Instalar revisiones"
4625
4865
4626
4866
#: bzrlib/bundle/commands.py:64
4627
4867
msgid "--verbose requires a merge directive"
4633
4873
4634
4874
#: bzrlib/bundle/commands.py:77
4635
4875
msgid "Records\n"
4636
msgstr ""
4876
msgstr "Grabaciones\n"
4637
4877
4638
4878
#: bzrlib/bundle/commands.py:81
4639
4879
msgid "{0}: {1} ({2} multiparent)\n"
4642
4882
#: bzrlib/bundle/commands.py:83
4643
4883
#, python-format
4644
4884
msgid "unique files: %d\n"
4645
msgstr ""
4885
msgstr "archivos únicos: %d\n"
4646
4886
4647
4887
#: bzrlib/bundle/commands.py:92
4648
4888
msgid "Revisions\n"
4649
msgstr ""
4889
msgstr "Revisiones\n"
4650
4890
4651
4891
#: bzrlib/bundle/commands.py:93
4652
4892
#, python-format
4662
4902
4663
4903
#: bzrlib/bundle/commands.py:103
4664
4904
msgid "Decoded contents\n"
4665
msgstr ""
4905
msgstr "Contenidos descodificados\n"
4666
4906
4667
4907
#: bzrlib/bundle/serializer/v4.py:327
4668
4908
#, python-format
4671
4911
msgstr[0] ""
4672
4912
msgstr[1] ""
4673
4913
4674
#: bzrlib/bzrdir.py:490
4914
#: bzrlib/bzrdir.py:487
4675
4915
msgid ""
4676
4916
"making backup of {0}\n"
4677
4917
" to {1}"
4679
4919
"haciendo respaldo de {0}\n"
4680
4920
" a {1}"
4681
4921
4682
#: bzrlib/bzrdir.py:513
4922
#: bzrlib/bzrdir.py:510
4683
4923
msgid "renamed {0} to {1}"
4684
4924
msgstr "renombrado {0} a {1}"
4685
4925
4686
#: bzrlib/bzrdir.py:1652
4926
#: bzrlib/bzrdir.py:1639
4687
4927
#, python-format
4688
4928
msgid ""
4689
4929
"Source repository format does not support stacking, using format:\n"
4690
4930
" %s"
4691
4931
msgstr ""
4692
4932
4693
#: bzrlib/bzrdir.py:1672
4933
#: bzrlib/bzrdir.py:1659
4694
4934
#, python-format
4695
4935
msgid ""
4696
4936
"Source branch format does not support stacking, using format:\n"
4697
4937
" %s"
4698
4938
msgstr ""
4699
4939
4700
#: bzrlib/bzrdir.py:1818
4940
#: bzrlib/bzrdir.py:1805
4701
4941
msgid "starting repository conversion"
4702
4942
msgstr "iniciar conversión de repositorio"
4703
4943
4704
#: bzrlib/bzrdir.py:2039
4944
#: bzrlib/bzrdir.py:2026
4705
4945
msgid "Using default stacking branch {0} at {1}"
4706
4946
msgstr ""
4707
4947
4756
4996
#: bzrlib/check.py:221
4757
4997
#, python-format
4758
4998
msgid "%6d revisions are mentioned but not present"
4759
msgstr ""
4999
msgstr "%6d revisiones mencionadas pero no presentes"
4760
5000
4761
5001
#: bzrlib/check.py:224
4762
5002
#, python-format
4763
5003
msgid "%6d ghost revisions"
4764
msgstr ""
5004
msgstr "%6d revisiones fantasma"
4765
5005
4766
5006
#: bzrlib/check.py:229
4767
5007
#, python-format
4834
5074
4835
5075
#: bzrlib/clean_tree.py:68
4836
5076
msgid "Are you sure you wish to delete these"
4837
msgstr ""
5077
msgstr "Está seguro de querer eliminar este"
4838
5078
4839
5079
#: bzrlib/clean_tree.py:70
4840
5080
msgid "Canceled"
4841
msgstr ""
5081
msgstr "Cancelado"
4842
5082
4843
5083
#: bzrlib/clean_tree.py:107
4844
5084
#, python-format
4884
5124
"supported formats or in a custom format based on a template."
4885
5125
msgstr ""
4886
5126
4887
#: bzrlib/cmd_version_info.py:59 en/help_topics/configuration.txt:700
4888
#: en/help_topics/configuration.txt:710
5127
#: bzrlib/cmd_version_info.py:59 en/help_topics/configuration.txt:712
5128
#: en/help_topics/configuration.txt:722
4889
5129
msgid "For example::"
4890
5130
msgstr "Por ejemplo::"
4891
5131
4930
5170
4931
5171
#: bzrlib/cmd_version_info.py:86
4932
5172
msgid "Include the last revision for each file."
4933
msgstr ""
5173
msgstr "Incluir la úlima revisión para cada archivo."
4934
5174
4935
5175
#: bzrlib/cmd_version_info.py:87
4936
5176
msgid "Template for the output."
4990
5230
"See bzr help %s for more details and examples.\n"
4991
5231
"\n"
4992
5232
msgstr ""
5233
"Vea bzr help %s para más detalles y ejemplos.\n"
5234
"\n"
4993
5235
4994
5236
#: bzrlib/commands.py:538
4995
5237
msgid ":Aliases: "
5009
5251
msgid ":See also: %s"
5010
5252
msgstr ":Vea también: %s"
5011
5253
5012
#: bzrlib/commands.py:816 bzrlib/gpg.py:324
5254
#: bzrlib/commands.py:826 bzrlib/gpg.py:347
5013
5255
msgid "Only ASCII permitted in option names"
5014
5256
msgstr "Solo se permiten nombres de opción en ASCII"
5015
5257
5016
#: bzrlib/commands.py:841 bzrlib/commands.py:849
5258
#: bzrlib/commands.py:851 bzrlib/commands.py:859
5017
5259
msgid "command {0!r} needs one or more {1}"
5018
5260
msgstr "la orden {0!r} necesita una o más {1}"
5019
5261
5020
#: bzrlib/commands.py:858
5262
#: bzrlib/commands.py:868
5021
5263
msgid "command {0!r} requires argument {1}"
5022
5264
msgstr "la orden {0!r} necesita un argumento {1}"
5023
5265
5024
#: bzrlib/commands.py:865
5266
#: bzrlib/commands.py:875
5025
5267
msgid "extra argument to command {0}: {1}"
5026
5268
msgstr ""
5027
5269
5028
#: bzrlib/commands.py:962
5270
#: bzrlib/commands.py:972
5029
5271
#, python-format
5030
5272
msgid "Profile data written to \"%s\"."
5031
5273
msgstr "Datos de perfil escritos en «%s»"
5068
5310
msgid "renamed"
5069
5311
msgstr "renombrado"
5070
5312
5071
#: bzrlib/commit.py:977
5313
#: bzrlib/commit.py:976
5072
5314
msgid "unchanged"
5073
5315
msgstr "sin cambios"
5074
5316
5075
#: bzrlib/commit.py:999
5317
#: bzrlib/commit.py:998
5076
5318
msgid "{0} [{1}] - Stage"
5077
5319
msgstr ""
5078
5320
5079
#: bzrlib/commit.py:1002
5321
#: bzrlib/commit.py:1001
5080
5322
#, python-format
5081
5323
msgid "%s - Stage"
5082
5324
msgstr ""
5083
5325
5326
#: bzrlib/commit_signature_commands.py:34
5327
msgid "Sign all commits by a given committer."
5328
msgstr ""
5329
5084
5330
#: bzrlib/commit_signature_commands.py:36
5085
msgid "Sign all commits by a given committer."
5086
msgstr ""
5087
5088
#: bzrlib/commit_signature_commands.py:38
5089
5331
msgid ""
5090
5332
"If location is not specified the local tree is used.\n"
5091
5333
"If committer is not specified the default committer is used."
5092
5334
msgstr ""
5093
5335
5094
#: bzrlib/commit_signature_commands.py:41
5336
#: bzrlib/commit_signature_commands.py:39
5095
5337
msgid "This does not sign commits that already have signatures."
5096
5338
msgstr ""
5097
5339
5098
#: bzrlib/commit_signature_commands.py:49
5340
#: bzrlib/commit_signature_commands.py:47
5099
5341
msgid ""
5100
5342
"Don't actually sign anything, just print the revisions that would be signed."
5101
5343
msgstr ""
5102
5344
5345
#: bzrlib/commit_signature_commands.py:98
5346
#, python-format
5347
msgid "Signed %d revision.\n"
5348
msgid_plural "Signed %d revisions.\n"
5349
msgstr[0] ""
5350
msgstr[1] ""
5351
5103
5352
#: bzrlib/commit_signature_commands.py:103
5104
5353
msgid "Verify all commit signatures."
5105
5354
msgstr "Verificar todas las firmas de ejecución."
5115
5364
"verification."
5116
5365
msgstr ""
5117
5366
5118
#: bzrlib/commit_signature_commands.py:147
5367
#: bzrlib/commit_signature_commands.py:148
5119
5368
msgid "Cannot verify a range of non-revision-history revisions"
5120
5369
msgstr ""
5121
5370
5122
#: bzrlib/commit_signature_commands.py:168
5371
#: bzrlib/commit_signature_commands.py:166
5123
5372
msgid "All commits signed with verifiable keys"
5124
5373
msgstr ""
5125
5374
5126
#: bzrlib/config.py:475
5375
#: bzrlib/config.py:436
5127
5376
msgid "Invalid config value for \"{0}\" value {1!r} is not an SI unit."
5128
5377
msgstr ""
5129
5378
5130
#: bzrlib/config.py:2485
5379
#: bzrlib/config.py:2452
5131
5380
msgid "{0} is not an SI unit."
5132
5381
msgstr ""
5133
5382
5134
#: bzrlib/config.py:2949
5383
#: bzrlib/config.py:2971
5135
5384
msgid ""
5136
5385
"Option {0} in section {1} of {2} was changed from {3} to {4}. The {5} value "
5137
5386
"will be saved."
5138
5387
msgstr ""
5139
5388
5140
#: bzrlib/config.py:3093
5389
#: bzrlib/config.py:3116
5141
5390
#, python-format
5142
5391
msgid "Invalid '%s', should be of the form 'name=value'"
5143
5392
msgstr ""
5144
5393
5145
#: bzrlib/config.py:3962
5394
#: bzrlib/config.py:4018
5146
5395
msgid "Display, set or remove a configuration option."
5147
msgstr ""
5396
msgstr "Mostrar, establecer o eliminar una opción de configuración."
5148
5397
5149
#: bzrlib/config.py:3964
5398
#: bzrlib/config.py:4020
5150
5399
msgid "Display the active value for a given option."
5151
msgstr ""
5400
msgstr "Mostrar el valor activo para la opción dada."
5152
5401
5153
#: bzrlib/config.py:3966
5402
#: bzrlib/config.py:4022
5154
5403
msgid ""
5155
5404
"If --all is specified, NAME is interpreted as a regular expression and all\n"
5156
5405
"matching options are displayed mentioning their scope. The active value\n"
5157
5406
"that bzr will take into account is the first one displayed for each option."
5158
5407
msgstr ""
5159
5408
5160
#: bzrlib/config.py:3970
5409
#: bzrlib/config.py:4026
5161
5410
msgid "If no NAME is given, --all .* is implied."
5162
5411
msgstr ""
5163
5412
5164
#: bzrlib/config.py:3972
5413
#: bzrlib/config.py:4028
5165
5414
msgid ""
5166
5415
"Setting a value is achieved by using name=value without spaces. The value\n"
5167
5416
"is set in the most relevant scope and can be checked by displaying the\n"
5168
5417
"option again."
5169
5418
msgstr ""
5170
5419
5171
#: bzrlib/config.py:3984
5420
#: bzrlib/config.py:4040
5172
5421
msgid "Reduce the scope to the specified configuration file."
5173
5422
msgstr ""
5174
5423
5175
#: bzrlib/config.py:3988
5424
#: bzrlib/config.py:4044
5176
5425
msgid "Display all the defined values for the matching options."
5177
5426
msgstr ""
5178
5427
5179
#: bzrlib/config.py:3990
5428
#: bzrlib/config.py:4046
5180
5429
msgid "Remove the option from the configuration file."
5181
msgstr ""
5430
msgstr "Eliminar la opción del archivo de configuración."
5182
5431
5183
5432
#: bzrlib/conflicts.py:50
5184
5433
msgid "List files with conflicts."
5185
msgstr ""
5434
msgstr "Lista de archivos con conflictos."
5186
5435
5187
5436
#: bzrlib/conflicts.py:57
5188
5437
msgid ""
5197
5446
5198
5447
#: bzrlib/conflicts.py:66
5199
5448
msgid "List paths of files with text conflicts."
5200
msgstr ""
5449
msgstr "Lista de rutas de archivos con conflictos de texto."
5201
5450
5202
5451
#: bzrlib/conflicts.py:85
5203
5452
msgid "Marks the conflict as resolved."
5204
msgstr ""
5453
msgstr "Marca el conflicto como resuelto."
5205
5454
5206
5455
#: bzrlib/conflicts.py:88
5207
5456
msgid "Resolve the conflict preserving the version in the working tree."
5213
5462
5214
5463
#: bzrlib/conflicts.py:98
5215
5464
msgid "How to resolve the conflict."
5216
msgstr ""
5465
msgstr "Cómo resolver el conflicto."
5217
5466
5218
5467
#: bzrlib/conflicts.py:104
5219
5468
msgid "Mark a conflict as resolved."
5220
msgstr ""
5469
msgstr "Marcar un conflicto como resuelto."
5221
5470
5222
5471
#: bzrlib/conflicts.py:111
5223
5472
msgid ""
5256
5505
msgstr[0] ""
5257
5506
msgstr[1] ""
5258
5507
5259
#: bzrlib/controldir.py:710
5508
#: bzrlib/controldir.py:712
5260
5509
msgid "{0} is{1} redirected to {2}"
5261
5510
msgstr "{0} es{1} redirigido a {2}"
5262
5511
5285
5534
5286
5535
#: bzrlib/errors.py:227
5287
5536
msgid "Invalid revision number %(revno)s"
5288
msgstr ""
5537
msgstr "número de revisión no válido %(revno)s"
5289
5538
5290
5539
#: bzrlib/errors.py:236
5291
5540
msgid "Invalid revision-id {%(revision_id)s} in %(branch)s"
5297
5546
5298
5547
#: bzrlib/errors.py:261
5299
5548
msgid "There is no public branch set for \"%(branch_url)s\"."
5300
msgstr ""
5549
msgstr "No hay una rama publica establecida para «%(branch_url)s»."
5301
5550
5302
5551
#: bzrlib/errors.py:271
5303
5552
msgid ""
5316
5565
5317
5566
#: bzrlib/errors.py:299
5318
5567
msgid "The branch '%(branch)s' is not stacked."
5319
msgstr ""
5568
msgstr "La rama «%(branch)s» no está apilada."
5320
5569
5321
5570
#: bzrlib/errors.py:313
5322
5571
msgid "No WorkingTree exists for \"%(base)s\"."
5323
msgstr ""
5572
msgstr "No existe un árbol de trabajo para «%(base)s»."
5324
5573
5325
5574
#: bzrlib/errors.py:322
5326
5575
msgid "Not currently building a tree."
5328
5577
5329
5578
#: bzrlib/errors.py:327
5330
5579
msgid "%(url)s is not a local path."
5331
msgstr ""
5580
msgstr "%(url)s no es una ruta local."
5332
5581
5333
5582
#: bzrlib/errors.py:355
5334
5583
msgid "%(not_locked)r is not write locked but needs to be."
5335
5584
msgstr ""
5585
"%(not_locked)r no está bloqueado contra escritura pero tiene que estarlo."
5336
5586
5337
5587
#: bzrlib/errors.py:363
5338
5588
msgid "Error in command line options"
5340
5590
5341
5591
#: bzrlib/errors.py:368
5342
5592
msgid "%(value)s is not an index of type %(_type)s."
5343
msgstr ""
5593
msgstr "%(value)s no es un índice de tipo %(_type)s."
5344
5594
5345
5595
#: bzrlib/errors.py:378
5346
5596
msgid "Error in data for index %(value)s."
5348
5598
5349
5599
#: bzrlib/errors.py:387
5350
5600
msgid "The key '%(key)s' is already in index '%(index)s'."
5351
msgstr ""
5601
msgstr "La clave «%(key)s» ya está en el índice «%(index)s»."
5352
5602
5353
5603
#: bzrlib/errors.py:397
5354
5604
msgid "The key '%(key)s' is not a valid key."
5355
msgstr ""
5605
msgstr "La clave «%(key)s» no es una clave válida."
5356
5606
5357
5607
#: bzrlib/errors.py:406
5358
5608
msgid "Could not parse options for index %(value)s."
5359
msgstr ""
5609
msgstr "No se pueden analizar las opciones para el índice %(value)s."
5360
5610
5361
5611
#: bzrlib/errors.py:415
5362
5612
msgid "The value '%(value)s' is not a valid value."
5363
msgstr ""
5613
msgstr "El valor «%(value)s» no es un valor válido."
5364
5614
5365
5615
#: bzrlib/errors.py:424
5366
5616
msgid "Bad value \"%(value)s\" for option \"%(name)s\"."
5367
msgstr ""
5617
msgstr "Valor erróneo «%(value)s» para la opción «%(name)s»."
5368
5618
5369
5619
#: bzrlib/errors.py:443
5370
5620
msgid "Generic path error: %(path)r%(extra)s)"
5371
msgstr ""
5621
msgstr "Error ruta genérica: %(path)r%(extra)s)"
5372
5622
5373
5623
#: bzrlib/errors.py:456
5374
5624
msgid "No such file: %(path)r%(extra)s"
5375
msgstr ""
5625
msgstr "Ningún archivo: %(path)r%(extra)s"
5376
5626
5377
5627
#: bzrlib/errors.py:461
5378
5628
msgid "File exists: %(path)r%(extra)s"
5379
msgstr ""
5629
msgstr "El archivo existe: %(path)r%(extra)s"
5380
5630
5381
5631
#: bzrlib/errors.py:467
5382
5632
msgid ""
5386
5636
5387
5637
#: bzrlib/errors.py:483
5388
5638
msgid "\"%(path)s\" is not a directory %(extra)s"
5389
msgstr ""
5639
msgstr "«%(path)s» no es una carpeta %(extra)s"
5390
5640
5391
5641
#: bzrlib/errors.py:488
5392
5642
msgid "\"%(path)s\" is not in the working directory %(extra)s"
5394
5644
5395
5645
#: bzrlib/errors.py:493
5396
5646
msgid "Directory not empty: \"%(path)s\"%(extra)s"
5397
msgstr ""
5647
msgstr "La carpeta no está vacía: «%(path)s»%(extra)s"
5398
5648
5399
5649
#: bzrlib/errors.py:498
5400
5650
msgid "Hard-linking \"%(path)s\" is not supported"
5406
5656
5407
5657
#: bzrlib/errors.py:518
5408
5658
msgid "Permission denied: \"%(path)s\"%(extra)s"
5409
msgstr ""
5659
msgstr "Permiso denegado: «%(path)s»%(extra)s"
5410
5660
5411
5661
#: bzrlib/errors.py:523
5412
5662
msgid "Invalid url supplied to transport: \"%(path)s\"%(extra)s"
5458
5708
5459
5709
#: bzrlib/errors.py:654
5460
5710
msgid "Not a branch: \"%(path)s\"%(detail)s."
5461
msgstr ""
5711
msgstr "No es una rama: «%(path)s»%(detail)s."
5462
5712
5463
5713
#: bzrlib/errors.py:696
5464
5714
msgid "No submit branch available for branch \"%(path)s\""
5470
5720
5471
5721
#: bzrlib/errors.py:710
5472
5722
msgid "Already a branch: \"%(path)s\"."
5473
msgstr ""
5723
msgstr "Ya hay una rama: «%(path)s»."
5474
5724
5475
5725
#: bzrlib/errors.py:715
5726
msgid "Invalid branch name: %(name)s"
5727
msgstr "Nombre de rama no válido: %(name)s"
5728
5729
#: bzrlib/errors.py:724
5476
5730
msgid "Parent branch already exists: \"%(path)s\"."
5477
5731
msgstr ""
5478
5732
5479
#: bzrlib/errors.py:721
5733
#: bzrlib/errors.py:730
5480
5734
msgid ""
5481
5735
"Directory contains a branch, but no working tree (use bzr checkout if you "
5482
5736
"wish to build a working tree): \"%(path)s\""
5483
5737
msgstr ""
5484
5738
5485
#: bzrlib/errors.py:726
5739
#: bzrlib/errors.py:735
5486
5740
msgid ""
5487
5741
"\"%(function)s\" called on an AtomicFile after it was closed: \"%(path)s\""
5488
5742
msgstr ""
5489
5743
5490
#: bzrlib/errors.py:736
5744
#: bzrlib/errors.py:745
5491
5745
msgid ""
5492
5746
"Parent not accessible given base \"%(base)s\" and relative path \"%(path)s\""
5493
5747
msgstr ""
5494
5748
5495
#: bzrlib/errors.py:746
5749
#: bzrlib/errors.py:755
5496
5750
msgid "No repository present: \"%(path)s\""
5497
5751
msgstr ""
5498
5752
5499
#: bzrlib/errors.py:753
5753
#: bzrlib/errors.py:762
5500
5754
msgid ""
5501
5755
"Unsupported branch format: %(format)s\n"
5502
5756
"Please run 'bzr upgrade'"
5503
5757
msgstr ""
5504
5758
5505
#: bzrlib/errors.py:759
5759
#: bzrlib/errors.py:768
5506
5760
msgid "Unknown %(kind)s format: %(format)r"
5507
5761
msgstr ""
5508
5762
5509
#: bzrlib/errors.py:768
5763
#: bzrlib/errors.py:777
5510
5764
msgid "Format %(format)s is not compatible with .bzr version %(bzrdir)s."
5511
5765
msgstr ""
5512
5766
5513
#: bzrlib/errors.py:778
5767
#: bzrlib/errors.py:787
5514
5768
msgid "Parse error on line %(lineno)d of %(format)s format: %(line)s"
5515
5769
msgstr ""
5516
5770
5517
#: bzrlib/errors.py:793
5771
#: bzrlib/errors.py:802
5518
5772
msgid ""
5519
5773
"%(target)s\n"
5520
5774
"is not compatible with\n"
5521
5775
"%(source)s\n"
5522
5776
"%(details)s"
5523
5777
msgstr ""
5778
"%(target)s\n"
5779
"no es compatible con\n"
5780
"%(source)s\n"
5781
"%(details)s"
5524
5782
5525
#: bzrlib/errors.py:809
5783
#: bzrlib/errors.py:818
5526
5784
msgid "Revision is not compatible with %(repo_format)s"
5527
msgstr ""
5785
msgstr "La revisión no es compatible con %(repo_format)s"
5528
5786
5529
#: bzrlib/errors.py:819
5787
#: bzrlib/errors.py:828
5530
5788
msgid "%(context_info)s%(path)s is already versioned."
5531
5789
msgstr ""
5532
5790
5533
#: bzrlib/errors.py:840
5791
#: bzrlib/errors.py:849
5534
5792
msgid "%(context_info)s%(path)s is not versioned."
5535
5793
msgstr ""
5536
5794
5537
#: bzrlib/errors.py:861
5795
#: bzrlib/errors.py:870
5538
5796
msgid "Path(s) are not versioned: %(paths_as_string)s"
5539
5797
msgstr ""
5540
5798
5541
#: bzrlib/errors.py:872
5799
#: bzrlib/errors.py:881
5542
5800
msgid "Path(s) do not exist: %(paths_as_string)s%(extra)s"
5543
5801
msgstr ""
5544
5802
5545
#: bzrlib/errors.py:891
5803
#: bzrlib/errors.py:900
5546
5804
msgid "Cannot operate on \"%(filename)s\" of unsupported kind \"%(kind)s\""
5547
5805
msgstr ""
5548
5806
5549
#: bzrlib/errors.py:899
5807
#: bzrlib/errors.py:908
5550
5808
msgid ""
5551
5809
"Filename %(filename)r is not valid in your current filesystem encoding "
5552
5810
"%(fs_encoding)s"
5553
5811
msgstr ""
5554
5812
5555
#: bzrlib/errors.py:910
5813
#: bzrlib/errors.py:919
5556
5814
msgid "Cannot operate on \"%(filename)s\" because it is a control file"
5557
5815
msgstr ""
5558
5816
5559
#: bzrlib/errors.py:928
5817
#: bzrlib/errors.py:937
5560
5818
msgid "The lock for '%(lock_description)s' is in use and cannot be broken."
5561
5819
msgstr ""
5562
5820
5563
#: bzrlib/errors.py:967
5821
#: bzrlib/errors.py:976
5564
5822
msgid "Cannot lock %(lock)s: %(why)s"
5565
msgstr ""
5823
msgstr "No se puede bloquear %(lock)s: %(why)s"
5566
5824
5567
#: bzrlib/errors.py:977
5825
#: bzrlib/errors.py:986
5568
5826
msgid ""
5569
5827
"A transaction related operation was attempted after the transaction finished."
5570
5828
msgstr ""
5571
5829
5572
#: bzrlib/errors.py:1004
5830
#: bzrlib/errors.py:1013
5573
5831
msgid "Cannot lock: transport is read only: %(transport)s"
5574
5832
msgstr ""
5575
5833
5576
#: bzrlib/errors.py:1012
5834
#: bzrlib/errors.py:1021
5577
5835
msgid "Could not acquire lock \"%(lock)s\": %(msg)s"
5578
5836
msgstr ""
5579
5837
5580
#: bzrlib/errors.py:1023
5838
#: bzrlib/errors.py:1032
5581
5839
msgid ""
5582
5840
"Lock was broken while still open: %(lock)s - check storage consistency!"
5583
5841
msgstr ""
5584
5842
5585
#: bzrlib/errors.py:1034
5843
#: bzrlib/errors.py:1043
5586
5844
msgid ""
5587
5845
"Lock was released and re-acquired before being broken: %(lock)s: held by "
5588
5846
"%(holder)r, wanted to break %(target)r"
5589
5847
msgstr ""
5590
5848
5591
#: bzrlib/errors.py:1046
5849
#: bzrlib/errors.py:1055
5592
5850
msgid ""
5593
5851
"Lock is apparently held, but corrupted: %(corruption_info)s\n"
5594
5852
"Use 'bzr break-lock' to clear it"
5595
5853
msgstr ""
5596
5854
5597
#: bzrlib/errors.py:1059
5855
#: bzrlib/errors.py:1068
5598
5856
msgid "Lock not held: %(lock)s"
5599
5857
msgstr ""
5600
5858
5601
#: bzrlib/errors.py:1088
5859
#: bzrlib/errors.py:1097
5602
5860
msgid "No changes to commit"
5603
5861
msgstr "No hay cambios que ejecutar."
5604
5862
5605
#: bzrlib/errors.py:1093
5863
#: bzrlib/errors.py:1102
5606
5864
msgid ""
5607
5865
"Selected-file commit of merges is not supported yet: files %(files_str)s"
5608
5866
msgstr ""
5609
5867
5610
#: bzrlib/errors.py:1103
5868
#: bzrlib/errors.py:1112
5611
5869
msgid ""
5612
5870
"Excluding paths during commit is not supported by repository at "
5613
5871
"%(repository)r."
5614
5872
msgstr ""
5615
5873
5616
#: bzrlib/errors.py:1112
5874
#: bzrlib/errors.py:1121
5617
5875
msgid ""
5618
5876
"The specified commit message contains characters unsupported by the current "
5619
5877
"encoding."
5620
5878
msgstr ""
5621
5879
5622
#: bzrlib/errors.py:1118
5880
#: bzrlib/errors.py:1127
5623
5881
msgid "Upgrade URL cannot work with readonly URLs."
5624
5882
msgstr ""
5625
5883
5626
#: bzrlib/errors.py:1123
5884
#: bzrlib/errors.py:1132
5627
5885
msgid "The branch format %(format)s is already at the most recent format."
5628
5886
msgstr ""
5629
5887
5630
#: bzrlib/errors.py:1146
5888
#: bzrlib/errors.py:1155
5631
5889
msgid "Option --change does not accept revision ranges"
5632
5890
msgstr ""
5633
5891
5634
#: bzrlib/errors.py:1151
5892
#: bzrlib/errors.py:1160
5635
5893
msgid "No namespace registered for string: %(spec)r"
5636
5894
msgstr ""
5637
5895
5638
#: bzrlib/errors.py:1170
5896
#: bzrlib/errors.py:1179
5639
5897
msgid ""
5640
5898
"Requested revision: '%(spec)s' does not exist in branch: "
5641
5899
"%(branch_url)s%(extra)s"
5642
5900
msgstr ""
5643
5901
5644
#: bzrlib/errors.py:1184
5902
#: bzrlib/errors.py:1193
5645
5903
msgid ""
5646
5904
"Operation denied because it would change the main history, which is not "
5647
5905
"permitted by the append_revisions_only setting on branch \"%(location)s\"."
5648
5906
msgstr ""
5649
5907
5650
#: bzrlib/errors.py:1195
5908
#: bzrlib/errors.py:1204
5651
5909
msgid ""
5652
5910
"These branches have diverged. Use the missing command to see how.\n"
5653
5911
"Use the merge command to reconcile them."
5654
5912
msgstr ""
5655
5913
5656
#: bzrlib/errors.py:1215
5914
#: bzrlib/errors.py:1224
5657
5915
msgid ""
5658
5916
"Branches have no common ancestor, and no merge base revision was specified."
5659
5917
msgstr ""
5660
5918
5661
#: bzrlib/errors.py:1221
5919
#: bzrlib/errors.py:1230
5662
5920
msgid ""
5663
5921
"Selected merge cannot perform reverse cherrypicks. Try merge3 or diff3."
5664
5922
msgstr ""
5665
5923
5666
#: bzrlib/errors.py:1227
5924
#: bzrlib/errors.py:1236
5667
5925
msgid "Revisions have no common ancestor: %(revision_a)s %(revision_b)s"
5668
5926
msgstr ""
5669
5927
5670
#: bzrlib/errors.py:1236
5928
#: bzrlib/errors.py:1245
5671
5929
msgid ""
5672
5930
"Revisions are not derived from the same root: %(revision_a)s %(revision_b)s."
5673
5931
msgstr ""
5674
5932
5675
#: bzrlib/errors.py:1245
5933
#: bzrlib/errors.py:1254
5676
5934
msgid "Revision %(rev_id)s is not an ancestor of %(not_ancestor_id)s"
5677
5935
msgstr ""
5678
5936
5679
#: bzrlib/errors.py:1254
5937
#: bzrlib/errors.py:1263
5680
5938
msgid "Branch %(branch)s has no commits."
5681
5939
msgstr ""
5682
5940
5683
#: bzrlib/errors.py:1272
5941
#: bzrlib/errors.py:1281
5684
5942
msgid ""
5685
5943
"Bound branch %(branch)s is out of date with master branch "
5686
5944
"%(master)s.%(extra_help)s"
5687
5945
msgstr ""
5688
5946
5689
#: bzrlib/errors.py:1284
5947
#: bzrlib/errors.py:1293
5690
5948
msgid ""
5691
5949
"Cannot commit to branch %(branch)s. It is bound to %(master)s, which is "
5692
5950
"bound to %(remote)s."
5693
5951
msgstr ""
5694
5952
5695
#: bzrlib/errors.py:1296
5953
#: bzrlib/errors.py:1305
5696
5954
msgid "Cannot pull --overwrite to a branch which is bound %(branch)s"
5697
5955
msgstr ""
5698
5956
5699
#: bzrlib/errors.py:1305
5957
#: bzrlib/errors.py:1314
5700
5958
msgid ""
5701
5959
"Unable to connect to target of bound branch %(branch)s => %(target)s: "
5702
5960
"%(error)s"
5703
5961
msgstr ""
5704
5962
5705
#: bzrlib/errors.py:1317
5963
#: bzrlib/errors.py:1326
5706
5964
msgid "Error in processing weave: %(msg)s"
5707
5965
msgstr ""
5708
5966
5709
#: bzrlib/errors.py:1326
5967
#: bzrlib/errors.py:1335
5710
5968
msgid "Revision {%(revision_id)s} already present in %(weave)s"
5711
5969
msgstr ""
5712
5970
5713
#: bzrlib/errors.py:1337
5971
#: bzrlib/errors.py:1346
5714
5972
msgid "Revision {%(revision_id)s} not present in %(weave)s"
5715
5973
msgstr ""
5716
5974
5717
#: bzrlib/errors.py:1347
5975
#: bzrlib/errors.py:1356
5718
5976
msgid "Weave invariant violated: %(what)s"
5719
5977
msgstr ""
5720
5978
5721
#: bzrlib/errors.py:1356
5979
#: bzrlib/errors.py:1365
5722
5980
msgid "Parents are mismatched between two revisions. %(msg)s"
5723
5981
msgstr ""
5724
5982
5725
#: bzrlib/errors.py:1378
5983
#: bzrlib/errors.py:1387
5726
5984
msgid ""
5727
5985
"Weaves differ on text content. Revision: {%(revision_id)s}, %(weave_a)s, "
5728
5986
"%(weave_b)s"
5729
5987
msgstr ""
5730
5988
5731
#: bzrlib/errors.py:1390
5989
#: bzrlib/errors.py:1399
5732
5990
msgid "Versioned file error"
5733
5991
msgstr "Error en el archivo versiondao"
5734
5992
5735
#: bzrlib/errors.py:1395
5993
#: bzrlib/errors.py:1404
5736
5994
msgid "Revision {%(revision_id)s} not present in \"%(file_id)s\"."
5737
5995
msgstr ""
5738
5996
5739
#: bzrlib/errors.py:1405
5997
#: bzrlib/errors.py:1414
5740
5998
msgid "Revision {%(revision_id)s} already present in \"%(file_id)s\"."
5741
5999
msgstr ""
5742
6000
5743
#: bzrlib/errors.py:1415
6001
#: bzrlib/errors.py:1424
5744
6002
msgid "Text did not match its checksum: %(msg)s"
5745
6003
msgstr ""
5746
6004
5747
#: bzrlib/errors.py:1541
6005
#: bzrlib/errors.py:1550
5748
6006
msgid "Export format %(format)r not supported"
5749
6007
msgstr ""
5750
6008
5751
#: bzrlib/errors.py:1550
6009
#: bzrlib/errors.py:1559
5752
6010
msgid "Transport error: %(msg)s %(orig_error)s"
5753
msgstr ""
6011
msgstr "Error de transporte: %(msg)s %(orig_error)s"
5754
6012
5755
#: bzrlib/errors.py:1576
6013
#: bzrlib/errors.py:1585
5756
6014
msgid "Generic bzr smart protocol error: %(details)s"
5757
6015
msgstr ""
5758
6016
5759
#: bzrlib/errors.py:1584
6017
#: bzrlib/errors.py:1593
5760
6018
msgid "Received bad protocol version marker: %(marker)r"
5761
6019
msgstr ""
5762
6020
5763
#: bzrlib/errors.py:1616
6021
#: bzrlib/errors.py:1625
5764
6022
msgid "Transport operation not possible: %(msg)s %(orig_error)s"
5765
6023
msgstr ""
5766
6024
5767
#: bzrlib/errors.py:1621
6025
#: bzrlib/errors.py:1630
5768
6026
msgid "Connection error: %(msg)s %(orig_error)s"
5769
msgstr ""
6027
msgstr "Error de conexión: %(msg)s %(orig_error)s"
5770
6028
5771
#: bzrlib/errors.py:1626
6029
#: bzrlib/errors.py:1635
5772
6030
msgid "%(msg)s %(host)s%(port)s%(orig_error)s"
5773
6031
msgstr ""
5774
6032
5775
#: bzrlib/errors.py:1647
6033
#: bzrlib/errors.py:1656
5776
6034
msgid "Connection closed: %(msg)s %(orig_error)s"
5777
msgstr ""
6035
msgstr "Conexión cerrada: %(msg)s %(orig_error)s"
5778
6036
5779
#: bzrlib/errors.py:1652
6037
#: bzrlib/errors.py:1661
5780
6038
msgid "Connection Timeout: %(msg)s%(orig_error)s"
5781
msgstr ""
6039
msgstr "Tiempo de espera de la conexión agotado: %(msg)s%(orig_error)s"
5782
6040
5783
#: bzrlib/errors.py:1657
6041
#: bzrlib/errors.py:1666
5784
6042
msgid "Invalid range access in %(path)s at %(offset)s: %(msg)s"
5785
6043
msgstr ""
5786
6044
5787
#: bzrlib/errors.py:1667
6045
#: bzrlib/errors.py:1676
5788
6046
msgid "Invalid http response for %(path)s: %(msg)s%(orig_error)s"
5789
6047
msgstr ""
5790
6048
5791
#: bzrlib/errors.py:1682
6049
#: bzrlib/errors.py:1691
5792
6050
msgid "Certificate error: %(error)s"
5793
6051
msgstr ""
5794
6052
5795
#: bzrlib/errors.py:1690
6053
#: bzrlib/errors.py:1699
5796
6054
msgid "Invalid http range %(range)r for %(path)s: %(msg)s"
5797
msgstr ""
6055
msgstr "rango http no válido %(range)r para %(path)s: %(msg)s"
5798
6056
5799
#: bzrlib/errors.py:1704
6057
#: bzrlib/errors.py:1713
5800
6058
msgid "HTTP MIME Boundary missing for %(path)s: %(msg)s"
5801
6059
msgstr ""
5802
6060
5803
#: bzrlib/errors.py:1712
6061
#: bzrlib/errors.py:1721
5804
6062
msgid "Invalid http Content-type \"%(ctype)s\" for %(path)s: %(msg)s"
5805
6063
msgstr ""
5806
6064
5807
#: bzrlib/errors.py:1721
6065
#: bzrlib/errors.py:1730
5808
6066
msgid "%(source)s is%(permanently)s redirected to %(target)s"
5809
6067
msgstr ""
5810
6068
5811
#: bzrlib/errors.py:1735
6069
#: bzrlib/errors.py:1744
5812
6070
msgid "Too many redirections"
5813
6071
msgstr "Demasiadas redirecciones"
5814
6072
5815
#: bzrlib/errors.py:1740
6073
#: bzrlib/errors.py:1749
5816
6074
msgid "Working tree has conflicts."
5817
msgstr ""
6075
msgstr "El árbol de trabajo tiene conflictos."
5818
6076
5819
#: bzrlib/errors.py:1744
6077
#: bzrlib/errors.py:1753
5820
6078
msgid "Config file %(filename)s is not UTF-8 encoded\n"
5821
6079
msgstr ""
5822
6080
5823
#: bzrlib/errors.py:1753
6081
#: bzrlib/errors.py:1762
5824
6082
msgid ""
5825
6083
"Error(s) parsing config file %(filename)s:\n"
5826
6084
"%(errors)s"
5827
6085
msgstr ""
5828
6086
5829
#: bzrlib/errors.py:1763
6087
#: bzrlib/errors.py:1772
5830
6088
msgid ""
5831
6089
"Bad value \"%(value)s\" for option \"%(name)s\".\n"
5832
6090
"See ``bzr help %(name)s``"
5833
6091
msgstr ""
5834
6092
5835
#: bzrlib/errors.py:1773
6093
#: bzrlib/errors.py:1782
5836
6094
msgid "%(username)r does not seem to contain a reasonable email address"
5837
6095
msgstr ""
5838
6096
5839
#: bzrlib/errors.py:1782
6097
#: bzrlib/errors.py:1791
5840
6098
msgid "Failed to GPG sign data with command \"%(command_line)s\""
5841
6099
msgstr ""
5842
6100
5843
#: bzrlib/errors.py:1790
6101
#: bzrlib/errors.py:1799
5844
6102
msgid "Failed to verify GPG signature data with error \"%(error)s\""
5845
6103
msgstr ""
5846
6104
5847
#: bzrlib/errors.py:1798
6105
#: bzrlib/errors.py:1807
5848
6106
msgid "Unable to import library \"%(library)s\": %(error)s"
5849
6107
msgstr ""
5850
6108
5851
#: bzrlib/errors.py:1806
6109
#: bzrlib/errors.py:1815
5852
6110
msgid "python-gpgme is not installed, it is needed to verify signatures"
5853
6111
msgstr ""
5854
6112
5855
#: bzrlib/errors.py:1814
6113
#: bzrlib/errors.py:1823
5856
6114
msgid ""
5857
6115
"The working tree for %(basedir)s has changed since the last commit, but "
5858
6116
"weave merge requires that it be unchanged"
5859
6117
msgstr ""
5860
6118
5861
#: bzrlib/errors.py:1824
6119
#: bzrlib/errors.py:1833
5862
6120
msgid ""
5863
6121
"Can't reprocess and show base, because reprocessing obscures the "
5864
6122
"relationship of conflicting lines to the base"
5865
6123
msgstr ""
5866
6124
5867
#: bzrlib/errors.py:1830
6125
#: bzrlib/errors.py:1839
5868
6126
msgid "Cycle in graph %(graph)r"
5869
6127
msgstr ""
5870
6128
5871
#: bzrlib/errors.py:1858
6129
#: bzrlib/errors.py:1867
5872
6130
msgid "File %(filename)s is not conflicted."
5873
6131
msgstr ""
5874
6132
5875
#: bzrlib/errors.py:1880
6133
#: bzrlib/errors.py:1889
5876
6134
msgid "No bundle was found in \"%(filename)s\"."
5877
6135
msgstr ""
5878
6136
5879
#: bzrlib/errors.py:1889
6137
#: bzrlib/errors.py:1898
5880
6138
msgid "Unable to handle bundle version %(version)s: %(msg)s"
5881
6139
msgstr ""
5882
6140
5883
#: bzrlib/errors.py:1899
6141
#: bzrlib/errors.py:1908
5884
6142
msgid "Branch %(base)s is missing revision %(text_revision)s of %(file_id)s"
5885
6143
msgstr ""
5886
6144
5887
#: bzrlib/errors.py:1912
6145
#: bzrlib/errors.py:1921
5888
6146
msgid "File id {%(file_id)s} already exists in inventory as %(entry)s"
5889
6147
msgstr ""
5890
6148
5891
#: bzrlib/errors.py:1922
6149
#: bzrlib/errors.py:1931
5892
6150
msgid "Key %(key)s is already present in map"
5893
6151
msgstr ""
5894
6152
5895
#: bzrlib/errors.py:1927
6153
#: bzrlib/errors.py:1936
5896
6154
msgid "The prefix %(prefix)s is in the help search path twice."
5897
6155
msgstr ""
5898
6156
5899
#: bzrlib/errors.py:1937
6157
#: bzrlib/errors.py:1946
5900
6158
msgid ""
5901
6159
"No final name for trans_id %(trans_id)r\n"
5902
6160
"file-id: %(file_id)r\n"
5903
6161
"root trans-id: %(root_trans_id)r\n"
5904
6162
msgstr ""
5905
6163
5906
#: bzrlib/errors.py:1969
6164
#: bzrlib/errors.py:1978
5907
6165
msgid "Attempt to reuse a transform that has already been applied."
5908
6166
msgstr ""
5909
6167
5910
#: bzrlib/errors.py:1974
6168
#: bzrlib/errors.py:1983
5911
6169
msgid "Moving the root directory is not supported at this time"
5912
6170
msgstr ""
5913
6171
5914
#: bzrlib/errors.py:1979
6172
#: bzrlib/errors.py:1988
5915
6173
msgid "Failed to rename %(from_path)s to %(to_path)s: %(why)s"
5916
msgstr ""
6174
msgstr "Fallo al renombrar %(from_path)s a %(to_path)s: %(why)s"
5917
6175
5918
#: bzrlib/errors.py:1990
6176
#: bzrlib/errors.py:1999
5919
6177
msgid ""
5920
6178
"Could not move %(from_path)s%(operator)s %(to_path)s%(_has_extra)s%(extra)s"
5921
6179
msgstr ""
5922
6180
5923
#: bzrlib/errors.py:2026
6181
#: bzrlib/errors.py:2035
5924
6182
msgid ""
5925
6183
"Could not rename %(from_path)s%(operator)s %(to_path)s%(_has_extra)s%(extra)s"
5926
6184
msgstr ""
5927
6185
5928
#: bzrlib/errors.py:2056
6186
#: bzrlib/errors.py:2065
5929
6187
msgid "Unable to import paramiko (required for sftp support): %(error)s"
5930
6188
msgstr ""
5931
6189
5932
#: bzrlib/errors.py:2064
6190
#: bzrlib/errors.py:2073
5933
6191
msgid "Nothing to merge."
5934
6192
msgstr "Nada a fusionar."
5935
6193
5936
#: bzrlib/errors.py:2069
6194
#: bzrlib/errors.py:2078
5937
6195
msgid "Format %(format)s cannot be initialised by this version of bzr."
5938
6196
msgstr ""
5939
6197
5940
#: bzrlib/errors.py:2078
6198
#: bzrlib/errors.py:2087
5941
6199
msgid ""
5942
6200
"Cannot convert from format %(from_format)s to format %(format)s. "
5943
6201
"%(problem)s"
5944
6202
msgstr ""
5945
6203
5946
#: bzrlib/errors.py:2090
6204
#: bzrlib/errors.py:2099
5947
6205
msgid "Could not find an appropriate Differ for file \"%(path)s\""
5948
6206
msgstr ""
5949
6207
5950
#: bzrlib/errors.py:2098
6208
#: bzrlib/errors.py:2107
5951
6209
msgid "%(exe_name)s could not be found on this machine"
5952
msgstr ""
6210
msgstr "%(exe_name)s no se encuentra en este equipo"
5953
6211
5954
#: bzrlib/errors.py:2106
6212
#: bzrlib/errors.py:2115
5955
6213
msgid "Diff is not installed on this machine: %(msg)s"
5956
msgstr ""
6214
msgstr "Diff no está instalado en este equipo: %(msg)s"
5957
6215
5958
#: bzrlib/errors.py:2114
6216
#: bzrlib/errors.py:2123
5959
6217
msgid "Diff3 is not installed on this machine."
5960
msgstr ""
6218
msgstr "Diff3 no está instalado en este equipo."
5961
6219
5962
#: bzrlib/errors.py:2120
6220
#: bzrlib/errors.py:2129
5963
6221
msgid "The content being inserted is already present."
5964
6222
msgstr ""
5965
6223
5966
#: bzrlib/errors.py:2125
6224
#: bzrlib/errors.py:2134
5967
6225
msgid ""
5968
6226
"This tree contains left-over files from a failed operation.\n"
5969
6227
" Please examine %(limbo_dir)s to see if it contains any files you wish "
5971
6229
" keep, and delete it when you are done."
5972
6230
msgstr ""
5973
6231
5974
#: bzrlib/errors.py:2136
6232
#: bzrlib/errors.py:2145
5975
6233
msgid ""
5976
6234
"This tree contains left-over files from a failed operation.\n"
5977
6235
" Please examine %(pending_deletion)s to see if it contains any files you\n"
5978
6236
" wish to keep, and delete it when you are done."
5979
6237
msgstr ""
5980
6238
5981
#: bzrlib/errors.py:2146
6239
#: bzrlib/errors.py:2155
5982
6240
msgid ""
5983
6241
"Unable to delete transform temporary directory %(limbo_dir)s.\n"
5984
6242
" Please examine %(limbo_dir)s to see if it contains any files you wish "
5986
6244
" keep, and delete it when you are done."
5987
6245
msgstr ""
5988
6246
5989
#: bzrlib/errors.py:2157
6247
#: bzrlib/errors.py:2166
5990
6248
msgid ""
5991
6249
"Unable to delete transform temporary directory %(pending_deletion)s. Please "
5992
6250
"examine %(pending_deletion)s to see if it contains any files you wish to "
5993
6251
"keep, and delete it when you are done."
5994
6252
msgstr ""
5995
6253
5996
#: bzrlib/errors.py:2167
6254
#: bzrlib/errors.py:2176
5997
6255
msgid "Working tree is out of date, please run 'bzr update'.%(more)s"
5998
6256
msgstr ""
5999
6257
6000
#: bzrlib/errors.py:2181
6258
#: bzrlib/errors.py:2190
6001
6259
msgid ""
6002
6260
"Public branch \"%(public_location)s\" lacks revision \"%(revstring)s\"."
6003
6261
msgstr ""
6004
6262
6005
#: bzrlib/errors.py:2194
6263
#: bzrlib/errors.py:2203
6006
6264
msgid "Error in merge modified format"
6007
6265
msgstr "Error en el formato modificado de fusión"
6008
6266
6009
#: bzrlib/errors.py:2199
6267
#: bzrlib/errors.py:2208
6010
6268
msgid "Format error in conflict listings"
6011
6269
msgstr ""
6012
6270
6013
#: bzrlib/errors.py:2203
6271
#: bzrlib/errors.py:2212
6014
6272
msgid ""
6015
6273
"Inconsistency in dirstate file %(dirstate_path)s.\n"
6016
6274
"Error: %(description)s"
6017
6275
msgstr ""
6018
6276
6019
#: bzrlib/errors.py:2214
6277
#: bzrlib/errors.py:2223
6020
6278
msgid ""
6021
6279
"An error has been detected in the repository %(repo_path)s.\n"
6022
6280
"Please run bzr reconcile on this repository."
6023
6281
msgstr ""
6024
6282
6025
#: bzrlib/errors.py:2225
6283
#: bzrlib/errors.py:2234
6026
6284
msgid ""
6027
6285
"An inconsistent delta was supplied involving %(path)r, %(file_id)r\n"
6028
6286
"reason: %(reason)s"
6029
6287
msgstr ""
6030
6288
6031
#: bzrlib/errors.py:2238
6289
#: bzrlib/errors.py:2247
6032
6290
msgid ""
6033
6291
"An inconsistent delta was supplied: %(delta)r\n"
6034
6292
"reason: %(reason)s"
6035
6293
msgstr ""
6036
6294
6037
#: bzrlib/errors.py:2250
6295
#: bzrlib/errors.py:2259
6038
6296
msgid "To use this feature you must upgrade your branch at %(path)s."
6039
6297
msgstr ""
6040
6298
6041
#: bzrlib/errors.py:2259
6299
#: bzrlib/errors.py:2268
6042
6300
msgid "To use this feature you must upgrade your repository at %(path)s."
6043
6301
msgstr ""
6044
6302
6045
#: bzrlib/errors.py:2264
6303
#: bzrlib/errors.py:2273
6046
6304
msgid ""
6047
6305
"To use this feature you must upgrade your branch at %(path)s to a format "
6048
6306
"which supports rich roots."
6049
6307
msgstr ""
6050
6308
6051
#: bzrlib/errors.py:2270
6309
#: bzrlib/errors.py:2279
6052
6310
msgid "Cannot perform local-only commits on unbound branches."
6053
6311
msgstr ""
6054
6312
6055
#: bzrlib/errors.py:2275
6313
#: bzrlib/errors.py:2284
6056
6314
msgid "The method %(mname)s is not supported on objects of type %(tname)s."
6057
6315
msgstr ""
6058
6316
6059
#: bzrlib/errors.py:2296
6317
#: bzrlib/errors.py:2305
6060
6318
msgid "Ghost tags not supported by format %(format)r."
6061
6319
msgstr ""
6062
6320
6063
#: bzrlib/errors.py:2304
6321
#: bzrlib/errors.py:2313
6064
6322
msgid "File is binary but should be text."
6065
msgstr ""
6323
msgstr "El archivo es binario pero debe ser texto."
6066
6324
6067
#: bzrlib/errors.py:2309
6325
#: bzrlib/errors.py:2318
6068
6326
msgid "The path %(path)s is not permitted on this platform"
6069
msgstr ""
6327
msgstr "La ruta %(path)s no está permitida en esta plataforma"
6070
6328
6071
#: bzrlib/errors.py:2318
6329
#: bzrlib/errors.py:2327
6072
6330
msgid ""
6073
6331
"Testament did not match expected value.\n"
6074
6332
" For revision_id {%(revision_id)s}, expected {%(expected)s}, measured\n"
6075
6333
" {%(measured)s}"
6076
6334
msgstr ""
6077
6335
6078
#: bzrlib/errors.py:2330
6336
#: bzrlib/errors.py:2339
6079
6337
msgid "Not a bzr revision-bundle: %(text)r"
6080
6338
msgstr ""
6081
6339
6082
#: bzrlib/errors.py:2339
6340
#: bzrlib/errors.py:2348
6083
6341
msgid "Bad bzr revision-bundle: %(text)r"
6084
6342
msgstr ""
6085
6343
6086
#: bzrlib/errors.py:2348
6344
#: bzrlib/errors.py:2357
6087
6345
msgid "Malformed bzr revision-bundle header: %(text)r"
6088
6346
msgstr ""
6089
6347
6090
#: bzrlib/errors.py:2353
6348
#: bzrlib/errors.py:2362
6091
6349
msgid "Malformed patches in bzr revision-bundle: %(text)r"
6092
6350
msgstr ""
6093
6351
6094
#: bzrlib/errors.py:2358
6352
#: bzrlib/errors.py:2367
6095
6353
msgid "Malformed footer in bzr revision-bundle: %(text)r"
6096
6354
msgstr ""
6097
6355
6098
#: bzrlib/errors.py:2363
6356
#: bzrlib/errors.py:2372
6099
6357
msgid "End of line marker was not \\n in bzr revision-bundle"
6100
6358
msgstr ""
6101
6359
6102
#: bzrlib/errors.py:2373
6360
#: bzrlib/errors.py:2382
6103
6361
msgid "Bundle format %(bundle_format)s is incompatible with %(other)s"
6104
6362
msgstr ""
6105
6363
6106
#: bzrlib/errors.py:2383
6364
#: bzrlib/errors.py:2392
6107
6365
msgid "Root class for inventory serialization errors"
6108
6366
msgstr ""
6109
6367
6110
#: bzrlib/errors.py:2387
6368
#: bzrlib/errors.py:2396
6111
6369
msgid ""
6112
6370
"The inventory was not in the expected format:\n"
6113
6371
" %(msg)s"
6114
6372
msgstr ""
6115
6373
6116
#: bzrlib/errors.py:2396
6374
#: bzrlib/errors.py:2405
6117
6375
msgid "This operation requires rich root data storage"
6118
6376
msgstr ""
6119
6377
6120
#: bzrlib/errors.py:2409
6378
#: bzrlib/errors.py:2418
6121
6379
msgid "Unrecognised value for BZR_SSH environment variable: %(vendor)s"
6122
6380
msgstr ""
6123
6381
6124
#: bzrlib/errors.py:2418
6382
#: bzrlib/errors.py:2427
6125
6383
msgid ""
6126
6384
"Don't know how to handle SSH connections. Please set BZR_SSH environment "
6127
6385
"variable."
6128
6386
msgstr ""
6129
6387
6130
#: bzrlib/errors.py:2425
6388
#: bzrlib/errors.py:2434
6131
6389
msgid ""
6132
6390
"Could not determine revno for {%(revision_id)s} because its ancestry shows a "
6133
6391
"ghost at {%(ghost_revision_id)s}"
6134
6392
msgstr ""
6135
6393
6136
#: bzrlib/errors.py:2435
6394
#: bzrlib/errors.py:2444
6137
6395
msgid "Ghost revision {%(revision_id)s} cannot be used here."
6138
6396
msgstr ""
6139
6397
6140
#: bzrlib/errors.py:2486
6398
#: bzrlib/errors.py:2495
6141
6399
msgid ""
6142
6400
"A merge directive must provide either a bundle or a public branch location."
6143
6401
msgstr ""
6144
6402
6145
#: bzrlib/errors.py:2493
6403
#: bzrlib/errors.py:2502
6146
6404
msgid "Bad merge directive payload %(start)r"
6147
6405
msgstr ""
6148
6406
6149
#: bzrlib/errors.py:2503
6407
#: bzrlib/errors.py:2512
6150
6408
msgid "Preview patch does not match requested changes."
6151
6409
msgstr ""
6152
6410
6153
#: bzrlib/errors.py:2509
6411
#: bzrlib/errors.py:2518
6154
6412
msgid "Patch_type was %(patch_type)s, but no patch was supplied."
6155
6413
msgstr ""
6156
6414
6157
#: bzrlib/errors.py:2519
6415
#: bzrlib/errors.py:2528
6158
6416
msgid ""
6159
6417
"Your branch does not have all of the revisions required in order to merge "
6160
6418
"this merge directive and the target location specified in the merge "
6161
6419
"directive is not a branch: %(location)s."
6162
6420
msgstr ""
6163
6421
6164
#: bzrlib/errors.py:2531
6422
#: bzrlib/errors.py:2540
6165
6423
msgid "Unsupported entry kind %(kind)s"
6166
6424
msgstr ""
6167
6425
6168
#: bzrlib/errors.py:2539
6426
#: bzrlib/errors.py:2548
6169
6427
msgid "Can't subsume %(other_tree)s into %(tree)s. %(reason)s"
6170
6428
msgstr ""
6171
6429
6172
#: bzrlib/errors.py:2549
6430
#: bzrlib/errors.py:2558
6173
6431
msgid "Subsume target %(other_tree)s needs to be upgraded."
6174
6432
msgstr ""
6175
6433
6176
#: bzrlib/errors.py:2568
6434
#: bzrlib/errors.py:2577
6177
6435
msgid "No such tag: %(tag_name)s"
6178
6436
msgstr ""
6179
6437
6180
#: bzrlib/errors.py:2576
6438
#: bzrlib/errors.py:2585
6181
6439
msgid "Tags not supported by %(branch)s; you may be able to use bzr upgrade."
6182
6440
msgstr ""
6183
6441
6184
#: bzrlib/errors.py:2585
6442
#: bzrlib/errors.py:2594
6185
6443
msgid "Tag %(tag_name)s already exists."
6186
6444
msgstr ""
6187
6445
6188
#: bzrlib/errors.py:2593
6446
#: bzrlib/errors.py:2602
6189
6447
msgid ""
6190
6448
"Did not understand bug identifier %(bug_id)s: %(reason)s. See \"bzr help "
6191
6449
"bugs\" for more information on this feature."
6192
6450
msgstr ""
6193
6451
6194
#: bzrlib/errors.py:2603
6452
#: bzrlib/errors.py:2612
6195
6453
msgid ""
6196
6454
"The URL for bug tracker \"%(abbreviation)s\" doesn't contain {id}: %(url)s"
6197
6455
msgstr ""
6198
6456
6199
#: bzrlib/errors.py:2613
6457
#: bzrlib/errors.py:2622
6200
6458
msgid ""
6201
6459
"Cannot find registered bug tracker called %(abbreviation)s on %(branch)s"
6202
6460
msgstr ""
6203
6461
6204
#: bzrlib/errors.py:2623
6462
#: bzrlib/errors.py:2632
6205
6463
msgid "Invalid line in bugs property: '%(line)s'"
6206
6464
msgstr ""
6207
6465
6208
#: bzrlib/errors.py:2631
6466
#: bzrlib/errors.py:2640
6209
6467
msgid "Invalid bug status: '%(status)s'"
6210
6468
msgstr ""
6211
6469
6212
#: bzrlib/errors.py:2639
6470
#: bzrlib/errors.py:2648
6213
6471
msgid "Could not understand response from smart server: %(response_tuple)r"
6214
6472
msgstr ""
6215
6473
6216
#: bzrlib/errors.py:2678
6474
#: bzrlib/errors.py:2687
6217
6475
msgid "Server sent an unexpected error: %(error_tuple)r"
6218
6476
msgstr "El servidor envió un error inesperado: %(error_tuple)r"
6219
6477
6220
#: bzrlib/errors.py:2697
6478
#: bzrlib/errors.py:2706
6221
6479
msgid "Unrecognised container format: %(container_format)r"
6222
6480
msgstr ""
6223
6481
6224
#: bzrlib/errors.py:2705
6482
#: bzrlib/errors.py:2714
6225
6483
msgid "Unexpected end of container stream"
6226
6484
msgstr "Final inesperado del flujo del contenedor"
6227
6485
6228
#: bzrlib/errors.py:2710
6486
#: bzrlib/errors.py:2719
6229
6487
msgid "Unknown record type: %(record_type)r"
6230
6488
msgstr "Tipo de registro inesperado: %(record_type)r"
6231
6489
6232
#: bzrlib/errors.py:2718
6490
#: bzrlib/errors.py:2727
6233
6491
msgid "Invalid record: %(reason)s"
6234
6492
msgstr "Registro inesperado: %(reason)s"
6235
6493
6236
#: bzrlib/errors.py:2726
6494
#: bzrlib/errors.py:2735
6237
6495
msgid "Container has data after end marker: %(excess)r"
6238
6496
msgstr ""
6239
6497
6240
#: bzrlib/errors.py:2734
6498
#: bzrlib/errors.py:2743
6241
6499
msgid "Container has multiple records with the same name: %(name)s"
6242
6500
msgstr ""
6243
6501
6244
#: bzrlib/errors.py:2747
6502
#: bzrlib/errors.py:2756
6245
6503
msgid "Corrupt or incompatible data stream: %(reason)s"
6246
6504
msgstr ""
6247
6505
6248
#: bzrlib/errors.py:2755
6506
#: bzrlib/errors.py:2764
6249
6507
msgid "SMTP error: %(error)s"
6250
6508
msgstr "Error SMTP: %(error)s"
6251
6509
6252
#: bzrlib/errors.py:2763
6510
#: bzrlib/errors.py:2772
6253
6511
msgid "No message supplied."
6254
6512
msgstr "No se ha proporcionado mensaje."
6255
6513
6256
#: bzrlib/errors.py:2768
6514
#: bzrlib/errors.py:2777
6257
6515
msgid "No mail-to address (--mail-to) or output (-o) specified."
6258
6516
msgstr ""
6259
6517
"No se a especificado una dirección de correo a enviar (--mail-to) o salida (-"
6260
6518
"o)."
6261
6519
6262
#: bzrlib/errors.py:2773
6263
msgid "Unknown mail client: %(mail_client)s"
6264
msgstr "Correo de cliente desconocido: %(mail_client)s"
6265
6266
#: bzrlib/errors.py:2781
6520
#: bzrlib/errors.py:2782
6267
6521
msgid ""
6268
6522
"Unable to find mail client with the following names: "
6269
6523
"%(mail_command_list_string)s"
6270
6524
msgstr ""
6271
6525
6272
#: bzrlib/errors.py:2791
6526
#: bzrlib/errors.py:2792
6273
6527
msgid "SMTP connection to %(host)s refused"
6274
6528
msgstr "Las conexiones SMTP a %(host)s se han rechazado"
6275
6529
6276
#: bzrlib/errors.py:2800
6530
#: bzrlib/errors.py:2801
6277
6531
msgid "Please specify smtp_server. No server at default %(host)s."
6278
6532
msgstr ""
6279
6533
6280
#: bzrlib/errors.py:2814
6534
#: bzrlib/errors.py:2815
6281
6535
msgid ""
6282
6536
"'%(display_url)s' is not in sync with %(target_url)s. See bzr help sync-for-"
6283
6537
"reconfigure."
6284
6538
msgstr ""
6285
6539
6286
#: bzrlib/errors.py:2826
6540
#: bzrlib/errors.py:2827
6287
6541
msgid "'%(display_url)s' is already a branch."
6288
6542
msgstr "«%(display_url)s» ya es una la rama."
6289
6543
6290
#: bzrlib/errors.py:2831
6544
#: bzrlib/errors.py:2832
6291
6545
msgid "'%(display_url)s' is already a tree."
6292
6546
msgstr "«%(display_url)s» ya es un árbol."
6293
6547
6294
#: bzrlib/errors.py:2836
6548
#: bzrlib/errors.py:2837
6295
6549
msgid "'%(display_url)s' is already a checkout."
6296
6550
msgstr "«%(display_url)s» ya es una comprobación."
6297
6551
6298
#: bzrlib/errors.py:2841
6552
#: bzrlib/errors.py:2842
6299
6553
msgid "'%(display_url)s' is already a lightweight checkout."
6300
6554
msgstr "«%(display_url)s» ya es una comprobación ligera."
6301
6555
6302
#: bzrlib/errors.py:2846
6556
#: bzrlib/errors.py:2847
6303
6557
msgid "'%(display_url)s' is already using a shared repository."
6304
6558
msgstr "«%(display_url)s» ya está usando un repositorio compartido."
6305
6559
6306
#: bzrlib/errors.py:2851
6560
#: bzrlib/errors.py:2852
6307
6561
msgid "'%(display_url)s' is already standalone."
6308
6562
msgstr "«%(display_url)s» ya es autónomo."
6309
6563
6310
#: bzrlib/errors.py:2856
6564
#: bzrlib/errors.py:2857
6311
6565
msgid "Shared repository '%(display_url)s' already creates working trees."
6312
6566
msgstr ""
6313
6567
6314
#: bzrlib/errors.py:2862
6568
#: bzrlib/errors.py:2863
6315
6569
msgid ""
6316
6570
"Shared repository '%(display_url)s' already doesn't create working trees."
6317
6571
msgstr ""
6318
6572
6319
#: bzrlib/errors.py:2868
6573
#: bzrlib/errors.py:2869
6320
6574
msgid "Requested reconfiguration of '%(display_url)s' is not supported."
6321
6575
msgstr ""
6322
6576
6323
#: bzrlib/errors.py:2873
6577
#: bzrlib/errors.py:2874
6324
6578
msgid "No location could be found to bind to at %(display_url)s."
6325
6579
msgstr "No se encontró ubicación a donde vincular %(display_url)s."
6326
6580
6327
#: bzrlib/errors.py:2878
6581
#: bzrlib/errors.py:2879
6328
6582
msgid ""
6329
6583
"Working tree \"%(display_url)s\" has uncommitted changes (See bzr "
6330
6584
"status).%(more)s"
6331
6585
msgstr ""
6332
6586
6333
#: bzrlib/errors.py:2897
6587
#: bzrlib/errors.py:2898
6334
6588
msgid ""
6335
6589
"Working tree \"%(display_url)s\" has shelved changes (See bzr shelve --"
6336
6590
"list).%(more)s"
6337
6591
msgstr ""
6338
6592
6339
#: bzrlib/errors.py:2903
6593
#: bzrlib/errors.py:2904
6340
6594
msgid "Variable {%(name)s} is not available."
6341
6595
msgstr "La variable {%(name)s} no está disponible."
6342
6596
6343
#: bzrlib/errors.py:2911
6597
#: bzrlib/errors.py:2912
6344
6598
msgid "No template specified."
6345
6599
msgstr "No se ha especificado una plantilla."
6346
6600
6347
#: bzrlib/errors.py:2916
6601
#: bzrlib/errors.py:2917
6348
6602
msgid "Unable to create symlink %(path_str)son this platform"
6349
6603
msgstr "Imposible crear un vínculo simbólico %(path_str)s en esta plataforma"
6350
6604
6351
#: bzrlib/errors.py:2931
6605
#: bzrlib/errors.py:2932
6352
6606
msgid ""
6353
6607
"Unsupported timezone format \"%(timezone)s\", options are \"utc\", "
6354
6608
"\"original\", \"local\"."
6356
6610
"Formato de zona horaria «%(timezone)s» no permitido , las opciones son«utc», "
6357
6611
"«original», «local»."
6358
6612
6359
#: bzrlib/errors.py:2965
6613
#: bzrlib/errors.py:2966
6360
6614
msgid ""
6361
6615
"Unable to encode %(kind)s path %(path)r in user encoding %(user_encoding)s"
6362
6616
msgstr ""
6363
6617
6364
#: bzrlib/errors.py:2977
6618
#: bzrlib/errors.py:2978
6365
6619
msgid "The \"%(config_id)s\" configuration does not exist."
6366
6620
msgstr ""
6367
6621
6368
#: bzrlib/errors.py:2985
6622
#: bzrlib/errors.py:2986
6369
6623
msgid "The \"%(option_name)s\" configuration option does not exist."
6370
6624
msgstr ""
6371
6625
6372
#: bzrlib/errors.py:2993
6626
#: bzrlib/errors.py:2994
6373
6627
msgid "The alias \"%(alias_name)s\" does not exist."
6374
6628
msgstr ""
6375
6629
6376
#: bzrlib/errors.py:3007
6630
#: bzrlib/errors.py:3008
6377
6631
msgid "\"%(alias_name)s\" is not a valid location alias."
6378
6632
msgstr ""
6379
6633
6380
#: bzrlib/errors.py:3015
6634
#: bzrlib/errors.py:3016
6381
6635
msgid "No %(alias_name)s location assigned."
6382
6636
msgstr ""
6383
6637
6384
#: bzrlib/errors.py:3023
6638
#: bzrlib/errors.py:3024
6385
6639
msgid "Cannot bind address \"%(host)s:%(port)i\": %(orig_error)s."
6386
6640
msgstr ""
6387
6641
6388
#: bzrlib/errors.py:3033
6642
#: bzrlib/errors.py:3034
6389
6643
msgid "Unknown rules detected: %(unknowns_str)s."
6390
6644
msgstr "Reglas detectadas desconocidas: %(unknowns_str)s."
6391
6645
6392
#: bzrlib/errors.py:3044
6646
#: bzrlib/errors.py:3045
6393
6647
msgid "Tip change rejected: %(msg)s"
6394
6648
msgstr ""
6395
6649
6396
#: bzrlib/errors.py:3052
6650
#: bzrlib/errors.py:3053
6397
6651
msgid "Shelf corrupt."
6398
6652
msgstr ""
6399
6653
6400
#: bzrlib/errors.py:3057
6654
#: bzrlib/errors.py:3058
6401
6655
msgid "Corruption while decompressing repository file%(orig_error)s"
6402
6656
msgstr ""
6403
6657
6404
#: bzrlib/errors.py:3069
6658
#: bzrlib/errors.py:3070
6405
6659
msgid "No changes are shelved with id \"%(shelf_id)d\"."
6406
6660
msgstr ""
6407
6661
6408
#: bzrlib/errors.py:3077
6662
#: bzrlib/errors.py:3078
6409
6663
msgid "\"%(invalid_id)s\" is not a valid shelf id, try a number instead."
6410
6664
msgstr ""
6411
6665
6412
#: bzrlib/errors.py:3085
6666
#: bzrlib/errors.py:3086
6413
6667
msgid ""
6414
6668
"An attempt to access a url outside the server jail was made: '%(url)s'."
6415
6669
msgstr ""
6416
6670
6417
#: bzrlib/errors.py:3093
6671
#: bzrlib/errors.py:3094
6418
6672
msgid "The user aborted the operation."
6419
6673
msgstr "El usuario abortó la operación."
6420
6674
6421
#: bzrlib/errors.py:3098
6675
#: bzrlib/errors.py:3099
6422
6676
msgid "Branching '%(url)s'(%(format)s) must create a working tree."
6423
6677
msgstr ""
6424
6678
6425
#: bzrlib/errors.py:3108
6679
#: bzrlib/errors.py:3109
6426
6680
msgid "No such view: %(view_name)s."
6427
6681
msgstr ""
6428
6682
6429
#: bzrlib/errors.py:3118
6683
#: bzrlib/errors.py:3119
6430
6684
msgid ""
6431
6685
"Views are not supported by %(tree)s; use 'bzr upgrade' to change your tree "
6432
6686
"to a later format."
6433
6687
msgstr ""
6434
6688
6435
#: bzrlib/errors.py:3127
6689
#: bzrlib/errors.py:3128
6436
6690
msgid ""
6437
6691
"Specified file \"%(file_name)s\" is outside the current view: %(view_str)s"
6438
6692
msgstr ""
6439
6693
6440
#: bzrlib/errors.py:3194
6694
#: bzrlib/errors.py:3195
6441
6695
msgid "%(bzrdir)r does not support co-located branches."
6442
6696
msgstr ""
6443
6697
6444
#: bzrlib/errors.py:3200
6698
#: bzrlib/errors.py:3201
6445
6699
msgid ""
6446
6700
"Unable to determine your name.\n"
6447
6701
"Please, set your name with the 'whoami' command.\n"
6448
6702
"E.g. bzr whoami \"Your Name <name@example.com>\""
6449
6703
msgstr ""
6450
6704
6451
#: bzrlib/errors.py:3209
6705
#: bzrlib/errors.py:3210
6452
6706
msgid "Invalid pattern(s) found. %(msg)s"
6453
6707
msgstr "Se encontró un patrón inválido. %(msg)s"
6454
6708
6455
#: bzrlib/errors.py:3217
6709
#: bzrlib/errors.py:3218
6456
6710
msgid ""
6457
6711
"Branch \"%(branch_url)s\" appears to be bound to itself. Please use `bzr "
6458
6712
"unbind` to fix."
6459
6713
msgstr ""
6460
6714
6461
#: bzrlib/errors.py:3228
6715
#: bzrlib/errors.py:3229
6462
6716
msgid "Loop involving %(refs)r while expanding \"%(string)s\"."
6463
6717
msgstr ""
6464
6718
6465
#: bzrlib/errors.py:3237
6719
#: bzrlib/errors.py:3238
6466
6720
msgid "Option %(name)s is not defined while expanding \"%(string)s\"."
6467
6721
msgstr ""
6468
6722
6469
#: bzrlib/errors.py:3246
6723
#: bzrlib/errors.py:3247
6470
6724
msgid ""
6471
6725
"No compatible object available for operations from %(source)r to %(target)r."
6472
6726
msgstr ""
6473
6727
6474
#: bzrlib/errors.py:3256
6728
#: bzrlib/errors.py:3257
6475
6729
msgid ""
6476
6730
"VFS requests over the smart server are not allowed. Encountered: %(method)s, "
6477
6731
"%(arguments)s."
6478
6732
msgstr ""
6479
6733
6480
#: bzrlib/errors.py:3266
6734
#: bzrlib/errors.py:3267
6481
6735
msgid ""
6482
6736
"Kind change from %(from_kind)s to %(to_kind)s for %(path)s not supported by "
6483
6737
"format %(format)r"
6484
6738
msgstr ""
6485
6739
6486
#: bzrlib/errors.py:3278
6740
#: bzrlib/errors.py:3279
6487
6741
msgid ""
6488
6742
"Missing feature %(feature)s not provided by this version of Bazaar or any "
6489
6743
"plugin."
6490
6744
msgstr ""
6491
6745
6492
#: bzrlib/errors.py:3291
6746
#: bzrlib/errors.py:3292
6493
6747
msgid "Binary files section encountered."
6494
6748
msgstr ""
6495
6749
6496
#: bzrlib/errors.py:3299
6750
#: bzrlib/errors.py:3300
6497
6751
msgid ""
6498
6752
"Malformed patch header. %(desc)s\n"
6499
6753
"%(line)r"
6500
6754
msgstr ""
6501
6755
6502
#: bzrlib/errors.py:3308
6756
#: bzrlib/errors.py:3309
6503
6757
msgid ""
6504
6758
"Malformed hunk header. %(desc)s\n"
6505
6759
"%(line)r"
6506
6760
msgstr ""
6507
6761
6508
#: bzrlib/errors.py:3317
6762
#: bzrlib/errors.py:3318
6509
6763
msgid ""
6510
6764
"Malformed line. %(desc)s\n"
6511
6765
"%(line)r"
6512
6766
msgstr ""
6513
6767
6514
#: bzrlib/errors.py:3327
6768
#: bzrlib/errors.py:3328
6515
6769
msgid ""
6516
6770
"Text contents mismatch at line %(line_no)d. Original has \"%(orig_line)s\", "
6517
6771
"but patch says it should be \"%(patch_line)s\""
6518
6772
msgstr ""
6519
6773
6520
#: bzrlib/errors.py:3338
6774
#: bzrlib/errors.py:3339
6521
6775
msgid "The feature %(feature)s has already been registered."
6522
6776
msgstr ""
6523
6777
6569
6823
"regular push."
6570
6824
msgstr ""
6571
6825
6572
#: bzrlib/gpg.py:119 bzrlib/gpg.py:460
6826
#: bzrlib/gpg.py:366
6827
msgid "No GnuPG key results for pattern: {0}"
6828
msgstr "No hay resultados de la clave GnuPG para el patrón: {0}"
6829
6830
#: bzrlib/gpg.py:439
6573
6831
msgid "{0} commits with valid signatures"
6574
6832
msgstr "{0} ejecuciones con firmas válidas"
6575
6833
6576
#: bzrlib/gpg.py:123 bzrlib/gpg.py:465
6834
#: bzrlib/gpg.py:445
6577
6835
msgid "{0} commit with unknown key"
6578
6836
msgid_plural "{0} commits with unknown keys"
6579
6837
msgstr[0] "{0} ejecución con clave desconocida"
6580
6838
msgstr[1] "{0} ejecuciones con claves desconocidas"
6581
6839
6582
#: bzrlib/gpg.py:129 bzrlib/gpg.py:472
6840
#: bzrlib/gpg.py:453
6583
6841
msgid "{0} commit not valid"
6584
6842
msgid_plural "{0} commits not valid"
6585
6843
msgstr[0] "{0} ejecución inválida"
6586
6844
msgstr[1] "{0} ejecuciones inválidas"
6587
6845
6588
#: bzrlib/gpg.py:135 bzrlib/gpg.py:479
6846
#: bzrlib/gpg.py:461
6589
6847
msgid "{0} commit not signed"
6590
6848
msgid_plural "{0} commits not signed"
6591
6849
msgstr[0] "{0} ejecución no firmada"
6592
6850
msgstr[1] "{0} ejecuciones no firmadas"
6593
6851
6594
#: bzrlib/gpg.py:141 bzrlib/gpg.py:486
6852
#: bzrlib/gpg.py:469
6595
6853
msgid "{0} commit with key now expired"
6596
6854
msgid_plural "{0} commits with key now expired"
6597
6855
msgstr[0] ""
6598
6856
msgstr[1] ""
6599
6857
6600
#: bzrlib/gpg.py:343
6601
msgid "No GnuPG key results for pattern: {0}"
6602
msgstr "No hay resultados de la clave GnuPG para el patrón: {0}"
6858
#: bzrlib/gpg.py:489
6859
msgid "{0} commit by author {1} with key {2} now expired"
6860
msgid_plural "{0} commits by author {1} with key {2} now expired"
6861
msgstr[0] ""
6862
msgstr[1] ""
6603
6863
6604
#: bzrlib/gpg.py:386
6864
#: bzrlib/gpg.py:505
6605
6865
msgid "{0} signed {1} commit"
6606
6866
msgid_plural "{0} signed {1} commits"
6607
6867
msgstr[0] ""
6608
6868
msgstr[1] ""
6609
6869
6610
#: bzrlib/gpg.py:403 bzrlib/gpg.py:419
6870
#: bzrlib/gpg.py:522 bzrlib/gpg.py:539
6611
6871
msgid "{0} commit by author {1}"
6612
6872
msgid_plural "{0} commits by author {1}"
6613
6873
msgstr[0] ""
6614
6874
msgstr[1] ""
6615
6875
6616
#: bzrlib/gpg.py:433
6876
#: bzrlib/gpg.py:554
6617
6877
msgid "Unknown key {0} signed {1} commit"
6618
6878
msgid_plural "Unknown key {0} signed {1} commits"
6619
6879
msgstr[0] ""
6620
6880
msgstr[1] ""
6621
6881
6622
#: bzrlib/gpg.py:452
6623
msgid "{0} commit by author {1} with key {2} now expired"
6624
msgid_plural "{0} commits by author {1} with key {2} now expired"
6625
msgstr[0] ""
6626
msgstr[1] ""
6627
6628
6882
#: bzrlib/groupcompress.py:1739
6629
6883
#, python-format
6630
6884
msgid "Insert claimed random_id=True, but then inserted %r two times"
6631
6885
msgstr ""
6632
6886
6633
#: bzrlib/hooks.py:331
6887
#: bzrlib/hooks.py:313
6634
6888
#, python-format
6635
6889
msgid "Introduced in: %s"
6636
6890
msgstr ""
6637
6891
6638
#: bzrlib/hooks.py:334
6892
#: bzrlib/hooks.py:316
6639
6893
#, python-format
6640
6894
msgid "Deprecated in: %s"
6641
6895
msgstr ""
6684
6938
"held by %(user)s on %(hostname)s (process #%(pid)s), acquired %(time_ago)s"
6685
6939
msgstr ""
6686
6940
6687
#: bzrlib/log.py:572
6941
#: bzrlib/log.py:563
6688
6942
msgid "--exclude-common-ancestry requires two different revisions"
6689
6943
msgstr "--exclude-common-ancestry requiere dos revisiones diferentes"
6690
6944
6691
#: bzrlib/log.py:574
6945
#: bzrlib/log.py:565
6692
6946
#, python-format
6693
6947
msgid "invalid direction %r"
6694
6948
msgstr "dirección %r inválida"
6695
6949
6696
#: bzrlib/log.py:662
6950
#: bzrlib/log.py:653
6697
6951
msgid "Start revision not found in history of end revision."
6698
6952
msgstr ""
6699
6953
6700
#: bzrlib/log.py:1080 bzrlib/log.py:1138
6954
#: bzrlib/log.py:1071 bzrlib/log.py:1129
6701
6955
msgid "Logging revision 0 is invalid."
6702
6956
msgstr ""
6703
6957
6704
#: bzrlib/log.py:1082 bzrlib/log.py:1140
6958
#: bzrlib/log.py:1073 bzrlib/log.py:1131
6705
6959
msgid "Start revision must be older than the end revision."
6706
6960
msgstr "El inicio de la revisión debe ser anterior al final."
6707
6961
6708
#: bzrlib/log.py:1827
6962
#: bzrlib/log.py:1818
6709
6963
#, python-format
6710
6964
msgid "unknown log formatter: %r"
6711
6965
msgstr ""
6712
6966
6713
#: bzrlib/log.py:2123
6967
#: bzrlib/log.py:2114
6714
6968
msgid "fixes bug"
6715
6969
msgid_plural "fixes bugs"
6716
msgstr[0] "error areglado"
6717
msgstr[1] "errores arreglados"
6970
msgstr[0] "corrige el error"
6971
msgstr[1] "corrige los errores"
6718
6972
6719
6973
#: bzrlib/merge.py:689
6720
6974
msgid "All changes applied successfully."
6721
msgstr "Cambios aplicados con éxito."
6975
msgstr "Todos los cambios se aplicaron correctamente."
6722
6976
6723
6977
#: bzrlib/merge.py:691
6724
6978
#, python-format
6725
6979
msgid "%d conflicts encountered."
6726
6980
msgstr "%d conflictos encontrados."
6727
6981
6728
#: bzrlib/merge.py:845 bzrlib/merge.py:1933
6982
#: bzrlib/merge.py:845 bzrlib/merge.py:1868
6729
6983
msgid "Preparing file merge"
6730
6984
msgstr ""
6731
6985
6847
7101
msgid "lstat/stat of ({0!r}): {1!r}"
6848
7102
msgstr "lstat/stat de ({0!r}): {1!r}"
6849
7103
6850
#: bzrlib/osutils.py:1008 bzrlib/osutils.py:1019
7104
#: bzrlib/osutils.py:1030 bzrlib/osutils.py:1041
6851
7105
#, python-format
6852
7106
msgid "sorry, %r not allowed in path"
6853
7107
msgstr ""
6854
7108
6855
#: bzrlib/osutils.py:1237
7109
#: bzrlib/osutils.py:1259
6856
7110
#, python-format
6857
7111
msgid "%r is too short to calculate a relative path"
6858
7112
msgstr ""
6891
7145
msgid "Generate only the shell function, don't enable it"
6892
7146
msgstr ""
6893
7147
6894
#: bzrlib/plugins/launchpad/__init__.py:81
7148
#: bzrlib/plugins/launchpad/account.py:66
7149
msgid "Setting ssh/sftp usernames for launchpad.net."
7150
msgstr ""
7151
7152
#: bzrlib/plugins/launchpad/cmds.py:44
6895
7153
msgid "Register a branch with launchpad.net."
6896
7154
msgstr "Registrar una rama con launchpad.net."
6897
7155
6898
#: bzrlib/plugins/launchpad/__init__.py:83
7156
#: bzrlib/plugins/launchpad/cmds.py:46
6899
7157
msgid ""
6900
7158
"This command lists a bzr branch in the directory of branches on\n"
6901
7159
"launchpad.net. Registration allows the branch to be associated with\n"
6902
7160
"bugs or specifications."
6903
7161
msgstr ""
6904
7162
6905
#: bzrlib/plugins/launchpad/__init__.py:87
7163
#: bzrlib/plugins/launchpad/cmds.py:50
6906
7164
msgid ""
6907
7165
"Before using this command you must register the project to which the\n"
6908
7166
"branch belongs, and create an account for yourself on launchpad.net."
6909
7167
msgstr ""
6910
7168
6911
#: bzrlib/plugins/launchpad/__init__.py:90
7169
#: bzrlib/plugins/launchpad/cmds.py:53
6912
7170
msgid ""
6913
7171
"arguments:\n"
6914
7172
" public_url: The publicly visible url for the branch to register.\n"
6920
7178
" otherwise error."
6921
7179
msgstr ""
6922
7180
6923
#: bzrlib/plugins/launchpad/__init__.py:99
7181
#: bzrlib/plugins/launchpad/cmds.py:62
6924
7182
msgid ""
6925
7183
"example:\n"
6926
7184
" bzr register-branch http://foo.com/bzr/fooproject.mine \\\n"
6927
7185
" --project fooproject"
6928
7186
msgstr ""
6929
7187
6930
#: bzrlib/plugins/launchpad/__init__.py:106
7188
#: bzrlib/plugins/launchpad/cmds.py:69
6931
7189
msgid "Launchpad project short name to associate with the branch."
6932
7190
msgstr "Nombre corto del proyecto de Launchpad para asociar con la rama."
6933
7191
6934
#: bzrlib/plugins/launchpad/__init__.py:113
7192
#: bzrlib/plugins/launchpad/cmds.py:76
6935
7193
msgid ""
6936
7194
"Short name for the branch; by default taken from the last component of the "
6937
7195
"url."
6938
7196
msgstr ""
6939
7197
6940
#: bzrlib/plugins/launchpad/__init__.py:117
7198
#: bzrlib/plugins/launchpad/cmds.py:80
6941
7199
msgid "One-sentence description of the branch."
6942
7200
msgstr ""
6943
7201
6944
#: bzrlib/plugins/launchpad/__init__.py:120
7202
#: bzrlib/plugins/launchpad/cmds.py:83
6945
7203
msgid "Longer description of the purpose or contents of the branch."
6946
7204
msgstr ""
6947
7205
6948
#: bzrlib/plugins/launchpad/__init__.py:123
7206
#: bzrlib/plugins/launchpad/cmds.py:86
6949
7207
msgid "Branch author's email address, if not yourself."
6950
7208
msgstr ""
6951
7209
6952
#: bzrlib/plugins/launchpad/__init__.py:126
7210
#: bzrlib/plugins/launchpad/cmds.py:89
6953
7211
msgid "The bug this branch fixes."
6954
7212
msgstr "El error que arregla esta rama."
6955
7213
6956
#: bzrlib/plugins/launchpad/__init__.py:129
7214
#: bzrlib/plugins/launchpad/cmds.py:92
6957
7215
msgid "Prepare the request but don't actually send it."
6958
7216
msgstr ""
6959
7217
6960
#: bzrlib/plugins/launchpad/__init__.py:151
7218
#: bzrlib/plugins/launchpad/cmds.py:114
6961
7219
msgid ""
6962
7220
"register-branch requires a public branch url - see bzr help register-branch."
6963
7221
msgstr ""
6964
7222
6965
#: bzrlib/plugins/launchpad/__init__.py:159
7223
#: bzrlib/plugins/launchpad/cmds.py:122
6966
7224
msgid "--product is deprecated; please use --project."
6967
7225
msgstr ""
6968
7226
6969
#: bzrlib/plugins/launchpad/__init__.py:191
7227
#: bzrlib/plugins/launchpad/cmds.py:152
6970
7228
msgid "Open a Launchpad branch page in your web browser."
6971
7229
msgstr "Abrir una página de rama de Launchpad en su navegador web."
6972
7230
6973
#: bzrlib/plugins/launchpad/__init__.py:196
7231
#: bzrlib/plugins/launchpad/cmds.py:157
6974
7232
msgid "Do not actually open the browser. Just say the URL we would use."
6975
7233
msgstr ""
6976
7234
6977
#: bzrlib/plugins/launchpad/__init__.py:231
7235
#: bzrlib/plugins/launchpad/cmds.py:192
6978
7236
#, python-format
6979
7237
msgid "Opening %s in web browser"
6980
7238
msgstr ""
6981
7239
6982
#: bzrlib/plugins/launchpad/__init__.py:241
7240
#: bzrlib/plugins/launchpad/cmds.py:200
6983
7241
msgid "Show or set the Launchpad user ID."
6984
7242
msgstr "Mostrar o establecer el ID de usuario de Launchpad."
6985
7243
6986
#: bzrlib/plugins/launchpad/__init__.py:243
7244
#: bzrlib/plugins/launchpad/cmds.py:202
6987
7245
msgid ""
6988
7246
"When communicating with Launchpad, some commands need to know your\n"
6989
7247
"Launchpad user ID. This command can be used to set or show the\n"
6990
7248
"user ID that Bazaar will use for such communication."
6991
7249
msgstr ""
6992
7250
6993
#: bzrlib/plugins/launchpad/__init__.py:247
7251
#: bzrlib/plugins/launchpad/cmds.py:206
6994
7252
msgid ""
6995
7253
":Examples:\n"
6996
7254
" Show the Launchpad ID of the current user::"
6997
7255
msgstr ""
6998
7256
6999
#: bzrlib/plugins/launchpad/__init__.py:250
7257
#: bzrlib/plugins/launchpad/cmds.py:209
7000
7258
msgid " bzr launchpad-login"
7001
7259
msgstr " bzr launchpad-login"
7002
7260
7003
#: bzrlib/plugins/launchpad/__init__.py:252
7261
#: bzrlib/plugins/launchpad/cmds.py:211
7004
7262
msgid " Set the Launchpad ID of the current user to 'bob'::"
7005
7263
msgstr ""
7006
7264
7007
#: bzrlib/plugins/launchpad/__init__.py:254
7265
#: bzrlib/plugins/launchpad/cmds.py:213
7008
7266
msgid " bzr launchpad-login bob"
7009
7267
msgstr " bzr launchpad-login bob"
7010
7268
7011
#: bzrlib/plugins/launchpad/__init__.py:261
7269
#: bzrlib/plugins/launchpad/cmds.py:220
7012
7270
msgid "Don't check that the user name is valid."
7013
7271
msgstr "No comprueba que el nombre de usuario sea válido."
7014
7272
7015
#: bzrlib/plugins/launchpad/__init__.py:276
7016
#: bzrlib/plugins/launchpad/__init__.py:287
7273
#: bzrlib/plugins/launchpad/cmds.py:235 bzrlib/plugins/launchpad/cmds.py:246
7017
7274
msgid "Launchpad user ID exists and has SSH keys.\n"
7018
7275
msgstr ""
7019
7276
7020
#: bzrlib/plugins/launchpad/__init__.py:279
7277
#: bzrlib/plugins/launchpad/cmds.py:238
7021
7278
msgid "No Launchpad user ID configured.\n"
7022
7279
msgstr ""
7023
7280
7024
#: bzrlib/plugins/launchpad/__init__.py:290
7281
#: bzrlib/plugins/launchpad/cmds.py:249
7025
7282
#, python-format
7026
7283
msgid "Launchpad user ID set to '%s'.\n"
7027
7284
msgstr ""
7028
7285
7029
#: bzrlib/plugins/launchpad/__init__.py:298
7286
#: bzrlib/plugins/launchpad/cmds.py:255
7030
7287
msgid "Ask Launchpad to mirror a branch now."
7031
7288
msgstr ""
7032
7289
7033
#: bzrlib/plugins/launchpad/__init__.py:318
7290
#: bzrlib/plugins/launchpad/cmds.py:272
7034
7291
msgid "Propose merging a branch on Launchpad."
7035
7292
msgstr ""
7036
7293
7037
#: bzrlib/plugins/launchpad/__init__.py:320
7294
#: bzrlib/plugins/launchpad/cmds.py:274
7038
7295
msgid ""
7039
7296
"This will open your usual editor to provide the initial comment. When it\n"
7040
7297
"has created the proposal, it will open it in your default web browser."
7041
7298
msgstr ""
7042
7299
7043
#: bzrlib/plugins/launchpad/__init__.py:323
7300
#: bzrlib/plugins/launchpad/cmds.py:277
7044
7301
msgid ""
7045
7302
"The branch will be proposed to merge into SUBMIT_BRANCH. If SUBMIT_BRANCH\n"
7046
7303
"is not supplied, the remembered submit branch will be used. If no submit\n"
7047
7304
"branch is remembered, the development focus will be used."
7048
7305
msgstr ""
7049
7306
7050
#: bzrlib/plugins/launchpad/__init__.py:327
7307
#: bzrlib/plugins/launchpad/cmds.py:281
7051
7308
msgid ""
7052
7309
"By default, the SUBMIT_BRANCH's review team will be requested to review\n"
7053
7310
"the merge proposal. This can be overriden by specifying --review (-R).\n"
7055
7312
"may optionally be followed by '=' and the review type. For example:"
7056
7313
msgstr ""
7057
7314
7058
#: bzrlib/plugins/launchpad/__init__.py:332
7315
#: bzrlib/plugins/launchpad/cmds.py:286
7059
7316
msgid " bzr lp-propose-merge --review jrandom --review review-team=qa"
7060
7317
msgstr " bzr lp-propose-merge --review jrandom --review review-team=qa"
7061
7318
7062
#: bzrlib/plugins/launchpad/__init__.py:334
7319
#: bzrlib/plugins/launchpad/cmds.py:288
7063
7320
msgid ""
7064
7321
"This will propose a merge, request \"jrandom\" to perform a review of\n"
7065
7322
"unspecified type, and request \"review-team\" to perform a \"qa\" review."
7066
7323
msgstr ""
7067
7324
7068
#: bzrlib/plugins/launchpad/__init__.py:339
7325
#: bzrlib/plugins/launchpad/cmds.py:293
7069
7326
msgid "Propose the merge on staging."
7070
7327
msgstr ""
7071
7328
7072
#: bzrlib/plugins/launchpad/__init__.py:341
7329
#: bzrlib/plugins/launchpad/cmds.py:295
7073
7330
msgid "Commit message."
7074
7331
msgstr "Mensaje de ejecución."
7075
7332
7076
#: bzrlib/plugins/launchpad/__init__.py:343
7333
#: bzrlib/plugins/launchpad/cmds.py:297
7077
7334
msgid "Mark the proposal as approved immediately."
7078
7335
msgstr "Marcar el propuesto como aprobado inmediatamente."
7079
7336
7080
#: bzrlib/plugins/launchpad/__init__.py:345
7337
#: bzrlib/plugins/launchpad/cmds.py:298
7338
msgid "The bug this proposal fixes."
7339
msgstr ""
7340
7341
#: bzrlib/plugins/launchpad/cmds.py:300
7081
7342
msgid "Requested reviewer and optional type."
7082
7343
msgstr "Revisor solicitado y tipo opcional."
7083
7344
7084
#: bzrlib/plugins/launchpad/__init__.py:382
7345
#: bzrlib/plugins/launchpad/cmds.py:335
7085
7346
msgid "Find the proposal to merge this revision."
7086
7347
msgstr "Buscar el propuesto para fusionar esta revisión."
7087
7348
7088
#: bzrlib/plugins/launchpad/__init__.py:384
7349
#: bzrlib/plugins/launchpad/cmds.py:337
7089
7350
msgid ""
7090
7351
"Finds the merge proposal(s) that discussed landing the specified revision.\n"
7091
7352
"This works only if the selected branch was the merge proposal target, and\n"
7093
7354
"are opened in a web browser."
7094
7355
msgstr ""
7095
7356
7096
#: bzrlib/plugins/launchpad/__init__.py:389
7357
#: bzrlib/plugins/launchpad/cmds.py:342
7097
7358
msgid ""
7098
7359
"Any revision involved in the merge may be specified-- the revision in\n"
7099
7360
"which the merge was performed, or one of the revisions that was merged."
7100
7361
msgstr ""
7101
7362
7102
#: bzrlib/plugins/launchpad/__init__.py:392
7363
#: bzrlib/plugins/launchpad/cmds.py:345
7103
7364
msgid "So, to find the merge proposal that reviewed line 1 of README::"
7104
7365
msgstr ""
7105
7366
7106
#: bzrlib/plugins/launchpad/__init__.py:394
7367
#: bzrlib/plugins/launchpad/cmds.py:347
7107
7368
msgid " bzr lp-find-proposal -r annotate:README:1"
7108
7369
msgstr " bzr lp-find-proposal -r annotate:README:1"
7109
7370
7110
#: bzrlib/plugins/launchpad/__init__.py:409
7371
#: bzrlib/plugins/launchpad/cmds.py:363
7111
7372
msgid "No review found."
7112
7373
msgstr ""
7113
7374
7114
#: bzrlib/plugins/launchpad/__init__.py:410
7375
#: bzrlib/plugins/launchpad/cmds.py:364
7115
7376
#, python-format
7116
7377
msgid "%d proposals(s) found."
7117
7378
msgstr ""
7118
7379
7119
#: bzrlib/plugins/launchpad/__init__.py:420
7380
#: bzrlib/plugins/launchpad/cmds.py:374
7120
7381
msgid "Finding revision-id"
7121
7382
msgstr ""
7122
7383
7123
#: bzrlib/plugins/launchpad/__init__.py:427
7384
#: bzrlib/plugins/launchpad/cmds.py:381
7124
7385
msgid "Finding merge"
7125
7386
msgstr ""
7126
7387
7127
#: bzrlib/plugins/launchpad/__init__.py:432
7388
#: bzrlib/plugins/launchpad/cmds.py:386
7128
7389
msgid "Finding revno"
7129
7390
msgstr ""
7130
7391
7131
#: bzrlib/plugins/launchpad/__init__.py:437
7392
#: bzrlib/plugins/launchpad/cmds.py:392
7132
7393
msgid "Finding Launchpad branch"
7133
7394
msgstr ""
7134
7395
7135
#: bzrlib/plugins/launchpad/__init__.py:440
7396
#: bzrlib/plugins/launchpad/cmds.py:395
7136
7397
msgid "Finding proposals"
7137
7398
msgstr ""
7138
7399
7139
#: bzrlib/plugins/launchpad/account.py:66
7140
msgid "Setting ssh/sftp usernames for launchpad.net."
7141
msgstr ""
7142
7143
7400
#: bzrlib/plugins/launchpad/lp_api.py:241
7144
7401
#: bzrlib/plugins/launchpad/lp_api.py:246
7145
7402
#, python-format
7183
7440
" remote: {2}"
7184
7441
msgstr ""
7185
7442
7186
#: bzrlib/plugins/launchpad/lp_propose.py:149
7443
#: bzrlib/plugins/launchpad/lp_propose.py:150
7187
7444
#, python-format
7188
7445
msgid "There is already a branch merge proposal: %s"
7189
7446
msgstr ""
7190
7447
7191
#: bzrlib/plugins/weave_fmt/bzrdir.py:236
7448
#: bzrlib/plugins/weave_fmt/bzrdir.py:237
7192
7449
msgid "pb parameter to convert() is deprecated"
7193
7450
msgstr ""
7194
7451
7195
#: bzrlib/plugins/weave_fmt/bzrdir.py:239
7452
#: bzrlib/plugins/weave_fmt/bzrdir.py:240
7196
7453
msgid "starting upgrade from format 4 to 5"
7197
7454
msgstr ""
7198
7455
7199
#: bzrlib/plugins/weave_fmt/bzrdir.py:249
7456
#: bzrlib/plugins/weave_fmt/bzrdir.py:250
7200
7457
msgid "note: upgrade may be faster if all store files are ungzipped first"
7201
7458
msgstr ""
7202
7459
7203
#: bzrlib/plugins/weave_fmt/bzrdir.py:278
7460
#: bzrlib/plugins/weave_fmt/bzrdir.py:279
7204
7461
msgid "converting revision"
7205
7462
msgstr ""
7206
7463
7207
#: bzrlib/plugins/weave_fmt/bzrdir.py:283
7464
#: bzrlib/plugins/weave_fmt/bzrdir.py:284
7208
7465
msgid "upgraded to weaves:"
7209
7466
msgstr ""
7210
7467
7211
#: bzrlib/plugins/weave_fmt/bzrdir.py:284
7468
#: bzrlib/plugins/weave_fmt/bzrdir.py:285
7212
7469
#, python-format
7213
7470
msgid "%6d revisions and inventories"
7214
7471
msgstr ""
7215
7472
7216
#: bzrlib/plugins/weave_fmt/bzrdir.py:286
7473
#: bzrlib/plugins/weave_fmt/bzrdir.py:287
7217
7474
#, python-format
7218
7475
msgid "%6d revisions not present"
7219
7476
msgstr ""
7220
7477
7221
#: bzrlib/plugins/weave_fmt/bzrdir.py:288
7478
#: bzrlib/plugins/weave_fmt/bzrdir.py:289
7222
7479
#, python-format
7223
7480
msgid "%6d texts"
7224
7481
msgstr ""
7225
7482
7226
#: bzrlib/plugins/weave_fmt/bzrdir.py:324
7483
#: bzrlib/plugins/weave_fmt/bzrdir.py:325
7227
7484
msgid "writing weave"
7228
7485
msgstr ""
7229
7486
7230
#: bzrlib/plugins/weave_fmt/bzrdir.py:328
7231
#: bzrlib/plugins/weave_fmt/bzrdir.py:330
7487
#: bzrlib/plugins/weave_fmt/bzrdir.py:329
7488
#: bzrlib/plugins/weave_fmt/bzrdir.py:331
7232
7489
msgid "inventory"
7233
7490
msgstr ""
7234
7491
7235
#: bzrlib/plugins/weave_fmt/bzrdir.py:347
7492
#: bzrlib/plugins/weave_fmt/bzrdir.py:348
7236
7493
msgid "write revision"
7237
7494
msgstr ""
7238
7495
7239
#: bzrlib/plugins/weave_fmt/bzrdir.py:361
7496
#: bzrlib/plugins/weave_fmt/bzrdir.py:362
7240
7497
msgid "loading revision"
7241
7498
msgstr ""
7242
7499
7243
#: bzrlib/plugins/weave_fmt/bzrdir.py:366
7500
#: bzrlib/plugins/weave_fmt/bzrdir.py:367
7244
7501
#, python-format
7245
7502
msgid "revision {%s} not present in branch; will be converted as a ghost"
7246
7503
msgstr ""
7247
7504
7248
#: bzrlib/plugins/weave_fmt/bzrdir.py:506
7505
#: bzrlib/plugins/weave_fmt/bzrdir.py:507
7249
7506
msgid "starting upgrade from format 5 to 6"
7250
7507
msgstr ""
7251
7508
7252
#: bzrlib/plugins/weave_fmt/bzrdir.py:516
7509
#: bzrlib/plugins/weave_fmt/bzrdir.py:517
7253
7510
#, python-format
7254
7511
msgid "adding prefixes to %s"
7255
7512
msgstr ""
7256
7513
7257
#: bzrlib/plugins/weave_fmt/bzrdir.py:556
7514
#: bzrlib/plugins/weave_fmt/bzrdir.py:557
7258
7515
msgid "starting upgrade from format 6 to metadir"
7259
7516
msgstr ""
7260
7517
7261
#: bzrlib/plugins/weave_fmt/bzrdir.py:564
7518
#: bzrlib/plugins/weave_fmt/bzrdir.py:565
7262
7519
msgid "Removing ancestry.weave"
7263
7520
msgstr ""
7264
7521
7265
#: bzrlib/plugins/weave_fmt/bzrdir.py:569
7522
#: bzrlib/plugins/weave_fmt/bzrdir.py:570
7266
7523
msgid "Finding branch files"
7267
7524
msgstr ""
7268
7525
7269
#: bzrlib/plugins/weave_fmt/bzrdir.py:579
7526
#: bzrlib/plugins/weave_fmt/bzrdir.py:580
7270
7527
msgid "Upgrading repository"
7271
7528
msgstr ""
7272
7529
7273
#: bzrlib/plugins/weave_fmt/bzrdir.py:589
7530
#: bzrlib/plugins/weave_fmt/bzrdir.py:590
7274
7531
msgid "Upgrading branch"
7275
7532
msgstr ""
7276
7533
7277
#: bzrlib/plugins/weave_fmt/bzrdir.py:612
7534
#: bzrlib/plugins/weave_fmt/bzrdir.py:613
7278
7535
msgid "No working tree."
7279
7536
msgstr ""
7280
7537
7281
#: bzrlib/plugins/weave_fmt/bzrdir.py:619
7538
#: bzrlib/plugins/weave_fmt/bzrdir.py:620
7282
7539
msgid "Upgrading working tree"
7283
7540
msgstr ""
7284
7541
7285
#: bzrlib/plugins/weave_fmt/bzrdir.py:640
7542
#: bzrlib/plugins/weave_fmt/bzrdir.py:641
7286
7543
#, python-format
7287
7544
msgid "Make %s lock"
7288
7545
msgstr ""
7289
7546
7290
#: bzrlib/plugins/weave_fmt/bzrdir.py:651
7547
#: bzrlib/plugins/weave_fmt/bzrdir.py:652
7291
7548
#, python-format
7292
7549
msgid "Moving %s"
7293
7550
msgstr ""
7314
7571
msgid "Too many redirections trying to make %s."
7315
7572
msgstr ""
7316
7573
7317
#: bzrlib/push.py:147
7574
#: bzrlib/push.py:148
7318
7575
msgid ""
7319
7576
"These branches have diverged. See \"bzr help diverged-branches\" for more "
7320
7577
"information."
7321
7578
msgstr ""
7322
7579
7323
#: bzrlib/push.py:151
7580
#: bzrlib/push.py:152
7324
7581
#, python-format
7325
7582
msgid ""
7326
7583
"It is not possible to losslessly push to %s. You may want to use dpush "
7327
7584
"instead."
7328
7585
msgstr ""
7329
7586
7330
#: bzrlib/push.py:157
7587
#: bzrlib/push.py:158
7331
7588
#, python-format
7332
7589
msgid ""
7333
7590
"At %s you have a valid .bzr control directory, but not a branch or "
7428
7685
msgid "bzr: ERROR (ignored): %s"
7429
7686
msgstr "bzr: ERROR (ignorado): %s"
7430
7687
7431
#: bzrlib/remote.py:2541
7688
#: bzrlib/remote.py:2534
7432
7689
msgid "Copying repository content as tarball..."
7433
7690
msgstr ""
7434
7691
7444
7701
msgid "{0} => {1}"
7445
7702
msgstr "{0} => {1}"
7446
7703
7447
#: bzrlib/repository.py:1787
7704
#: bzrlib/repository.py:1738
7448
7705
msgid "Moving repository to repository.backup"
7449
7706
msgstr ""
7450
7707
7451
#: bzrlib/repository.py:1794
7708
#: bzrlib/repository.py:1745
7452
7709
msgid "Creating new repository"
7453
7710
msgstr "Creando repositorio nuevo"
7454
7711
7455
#: bzrlib/repository.py:1799
7712
#: bzrlib/repository.py:1750
7456
7713
msgid "Copying content"
7457
7714
msgstr "Copiar contenido"
7458
7715
7459
#: bzrlib/repository.py:1803
7716
#: bzrlib/repository.py:1754
7460
7717
msgid "Deleting old repository content"
7461
7718
msgstr ""
7462
7719
7463
#: bzrlib/repository.py:1805
7720
#: bzrlib/repository.py:1756
7464
7721
msgid "repository converted"
7465
7722
msgstr "repositorio convertido"
7466
7723
7468
7725
msgid "Using {0} {1}"
7469
7726
msgstr "Usando {0} {1}"
7470
7727
7471
#: bzrlib/send.py:58
7728
#: bzrlib/send.py:59
7472
7729
#, python-format
7473
7730
msgid "Mail client \"%s\" does not support specifying body"
7474
7731
msgstr ""
7475
7732
7476
#: bzrlib/send.py:62
7733
#: bzrlib/send.py:63
7477
7734
msgid "--remember requires a branch to be specified."
7478
7735
msgstr ""
7479
7736
7480
#: bzrlib/send.py:77
7737
#: bzrlib/send.py:78
7481
7738
msgid "No submit branch known or specified"
7482
7739
msgstr ""
7483
7740
7484
#: bzrlib/send.py:80
7741
#: bzrlib/send.py:81
7485
7742
msgid "Using saved {0} location \"{1}\" to determine what changes to submit."
7486
7743
msgstr ""
7487
7744
7488
#: bzrlib/send.py:98
7745
#: bzrlib/send.py:99
7489
7746
#, python-format
7490
7747
msgid "No such send format '%s'."
7491
7748
msgstr ""
7492
7749
7493
#: bzrlib/send.py:114
7750
#: bzrlib/send.py:115
7494
7751
msgid "bzr send takes at most two one revision identifiers"
7495
7752
msgstr ""
7496
7753
7497
#: bzrlib/send.py:127
7754
#: bzrlib/send.py:128
7498
7755
msgid "No revisions to submit."
7499
7756
msgstr "No hay revisiones para enviar."
7500
7757
7501
#: bzrlib/send.py:139
7758
#: bzrlib/send.py:140
7502
7759
msgid ""
7503
7760
"- not supported for merge directives that use more than one output file."
7504
7761
msgstr ""
7505
7762
7506
#: bzrlib/send.py:185
7763
#: bzrlib/send.py:186
7507
7764
msgid "Format 0.9 does not permit bundle with no patch"
7508
7765
msgstr ""
7509
7766
7660
7917
"anyway, use --force."
7661
7918
msgstr ""
7662
7919
7663
#: bzrlib/switch.py:125
7920
#: bzrlib/switch.py:129
7664
7921
msgid "Cannot switch a branch, only a checkout."
7665
7922
msgstr ""
7666
7923
7667
#: bzrlib/switch.py:163
7924
#: bzrlib/switch.py:167
7668
7925
#, python-format
7669
7926
msgid "Tree is up to date at revision %d."
7670
7927
msgstr ""
7671
7928
7672
#: bzrlib/switch.py:169
7929
#: bzrlib/switch.py:173
7673
7930
#, python-format
7674
7931
msgid "Updated to revision %d."
7675
7932
msgstr ""
7676
7933
7677
#: bzrlib/transform.py:1734 bzrlib/transform.py:1745 bzrlib/transform.py:1747
7934
#: bzrlib/transform.py:1723 bzrlib/transform.py:1734 bzrlib/transform.py:1736
7678
7935
msgid "Apply phase"
7679
7936
msgstr "Aplicar fase"
7680
7937
7681
#: bzrlib/transform.py:1773 bzrlib/transform.py:1841
7938
#: bzrlib/transform.py:1762 bzrlib/transform.py:1830
7682
7939
msgid "removing file"
7683
7940
msgstr "eliminar archivo"
7684
7941
7685
#: bzrlib/transform.py:1791 bzrlib/transform.py:1876
7942
#: bzrlib/transform.py:1780 bzrlib/transform.py:1865
7686
7943
msgid "adding file"
7687
7944
msgstr "añadiendo archivo"
7688
7945
7689
#: bzrlib/transform.py:2591
7946
#: bzrlib/transform.py:2598
7690
7947
msgid "Building tree"
7691
7948
msgstr "Construyendo árbol"
7692
7949
7693
#: bzrlib/transform.py:2681 bzrlib/transform.py:2708
7950
#: bzrlib/transform.py:2688 bzrlib/transform.py:2715
7694
7951
msgid "Adding file contents"
7695
7952
msgstr "Añadiendo contenidos de archivo"
7696
7953
7697
#: bzrlib/transform.py:3028
7954
#: bzrlib/transform.py:3017
7698
7955
msgid "Resolution pass"
7699
7956
msgstr ""
7700
7957
7703
7960
msgid "Authenticated as %s"
7704
7961
msgstr ""
7705
7962
7706
#: bzrlib/tree.py:634
7963
#: bzrlib/tree.py:647
7707
7964
msgid "*** {0} content-filter: {1} => {2!r}"
7708
7965
msgstr ""
7709
7966
7762
8019
msgid "failed to clean-up {0}: {1}"
7763
8020
msgstr ""
7764
8021
7765
#: bzrlib/vf_repository.py:1090
8022
#: bzrlib/vf_repository.py:1091
7766
8023
msgid "inventories"
7767
8024
msgstr ""
7768
8025
7769
#: bzrlib/vf_repository.py:1116
8026
#: bzrlib/vf_repository.py:1117
7770
8027
msgid "texts"
7771
8028
msgstr "textos"
7772
8029
7773
#: bzrlib/vf_repository.py:1621 bzrlib/vf_repository.py:1630
8030
#: bzrlib/vf_repository.py:1622 bzrlib/vf_repository.py:1631
7774
8031
msgid "Calculating text parents"
7775
8032
msgstr ""
7776
8033
7777
#: bzrlib/vf_repository.py:1706
8034
#: bzrlib/vf_repository.py:1707
7778
8035
msgid "Fetch texts"
7779
8036
msgstr ""
7780
8037
7781
#: bzrlib/vf_repository.py:2535
8038
#: bzrlib/vf_repository.py:2536
7782
8039
msgid "loading text store"
7783
8040
msgstr ""
7784
8041
7785
#: bzrlib/vf_repository.py:2541
8042
#: bzrlib/vf_repository.py:2542
7786
8043
msgid "checking text graph"
7787
8044
msgstr ""
7788
8045
7789
#: bzrlib/vf_repository.py:2995 bzrlib/vf_repository.py:3009
7790
#: bzrlib/vf_repository.py:3124
8046
#: bzrlib/vf_repository.py:2998 bzrlib/vf_repository.py:3012
8047
#: bzrlib/vf_repository.py:3127
7791
8048
msgid "Transferring revisions"
7792
8049
msgstr ""
7793
8050
7833
8090
msgid "PageFaultCount %8d"
7834
8091
msgstr ""
7835
8092
7836
#: bzrlib/workingtree.py:1478
8093
#: bzrlib/workingtree.py:1482
7837
8094
msgid "Rerun update after fixing the conflicts."
7838
8095
msgstr ""
7839
8096
7843
8100
7844
8101
#: dummy/help_topics/basic/detail.txt:1
7845
8102
msgid ""
7846
"Bazaar 2.5b6 -- a free distributed version-control tool\n"
8103
"Bazaar 2.6b2 -- a free distributed version-control tool\n"
7847
8104
"http://bazaar.canonical.com/"
7848
8105
msgstr ""
7849
8106
8163
8420
msgid "How to fix diverged branches"
8164
8421
msgstr ""
8165
8422
8166
#: dummy/help_topics/env-variables/detail.txt:1
8167
msgid "Environment Variables"
8168
msgstr "Variables de entorno"
8169
8170
#: dummy/help_topics/env-variables/detail.txt:3
8171
msgid ""
8172
"=================== "
8173
"===========================================================\n"
8174
"BZRPATH Path where bzr is to look for shell plugin external\n"
8175
" commands.\n"
8176
"BZR_EMAIL E-Mail address of the user. Overrides EMAIL.\n"
8177
"EMAIL E-Mail address of the user.\n"
8178
"BZR_EDITOR Editor for editing commit messages. Overrides EDITOR.\n"
8179
"EDITOR Editor for editing commit messages.\n"
8180
"BZR_PLUGIN_PATH Paths where bzr should look for plugins.\n"
8181
"BZR_DISABLE_PLUGINS Plugins that bzr should not load.\n"
8182
"BZR_PLUGINS_AT Plugins to load from a directory not in "
8183
"BZR_PLUGIN_PATH.\n"
8184
"BZR_HOME Directory holding .bazaar config dir. Overrides HOME.\n"
8185
"BZR_HOME (Win32) Directory holding bazaar config dir. Overrides APPDATA "
8186
"and\n"
8187
" HOME.\n"
8188
"BZR_REMOTE_PATH Full name of remote 'bzr' command (for bzr+ssh:// "
8189
"URLs).\n"
8190
"BZR_SSH Path to SSH client, or one of paramiko, openssh, "
8191
"sshcorp,\n"
8192
" plink or lsh.\n"
8193
"BZR_LOG Location of .bzr.log (use '/dev/null' to suppress log).\n"
8194
"BZR_LOG (Win32) Location of .bzr.log (use 'NUL' to suppress log).\n"
8195
"BZR_COLUMNS Override implicit terminal width.\n"
8196
"BZR_CONCURRENCY Number of processes that can be run concurrently "
8197
"(selftest)\n"
8198
"BZR_PROGRESS_BAR Override the progress display. Values are 'none' or "
8199
"'text'.\n"
8200
"BZR_PDB Control whether to launch a debugger on error.\n"
8201
"BZR_SIGQUIT_PDB Control whether SIGQUIT behaves normally or invokes a\n"
8202
" breakin debugger.\n"
8203
"BZR_TEXTUI_INPUT Force console input mode for prompts to line-based "
8204
"(instead\n"
8205
" of char-based).\n"
8206
"=================== "
8207
"===========================================================\n"
8208
msgstr ""
8209
8210
8423
#: dummy/help_topics/env-variables/summary.txt:1
8211
8424
msgid "Environment variable names and values"
8212
8425
msgstr "Nombres y valores de variables de entorno"
9268
9481
msgid " bzr commit --fixes <tracker>:<id>"
9269
9482
msgstr " bzr commit --fixes <tracker>:<id>"
9270
9483
9271
#: en/help_topics/bugs.txt:13 en/help_topics/configuration.txt:398
9484
#: en/help_topics/bugs.txt:13 en/help_topics/configuration.txt:410
9272
9485
msgid "or::"
9273
9486
msgstr "o::"
9274
9487
9521
9734
"remove-tree Remove the working tree from a given branch/checkout.\n"
9522
9735
"renames Show list of renamed files.\n"
9523
9736
"resolve Mark a conflict as resolved.\n"
9524
"revert Revert files to a previous revision.\n"
9737
"revert Set files in the working tree back to the contents of a\n"
9738
" previous revision.\n"
9525
9739
"revno Show current revision number.\n"
9526
9740
"root Show the tree root directory.\n"
9527
9741
"send Mail or create a merge-directive for submitting changes.\n"
10245
10459
10246
10460
#: en/help_topics/configuration.txt:336
10247
10461
msgid ""
10462
"Another such option is ``branchname``, which refers to the name of a "
10463
"colocated\n"
10464
"branch. For non-colocated branches, it behaves like basename. It can be "
10465
"used\n"
10466
"like this::"
10467
msgstr ""
10468
10469
#: en/help_topics/configuration.txt:340
10470
msgid ""
10471
" [/home/vila/src/bzr/bugs]\n"
10472
" mypush = lp:~vila/bzr/{branchname}"
10473
msgstr ""
10474
10475
#: en/help_topics/configuration.txt:343
10476
msgid ""
10477
"When used with a colocated branch named ``832013-expand-in-stack``, we'll "
10478
"get::"
10479
msgstr ""
10480
10481
#: en/help_topics/configuration.txt:345
10482
msgid ""
10483
" bzr config mypush\n"
10484
" lp:~vila/bzr/832013-expand-in-stack"
10485
msgstr ""
10486
10487
#: en/help_topics/configuration.txt:348
10488
msgid ""
10248
10489
"When an option is local to a Section, it cannot be referred to from option\n"
10249
10490
"values in any other section from the same ``Store`` nor from any other\n"
10250
10491
"``Store``."
10251
10492
msgstr ""
10252
10493
10253
#: en/help_topics/configuration.txt:340
10494
#: en/help_topics/configuration.txt:352
10254
10495
msgid ""
10255
10496
"\n"
10256
10497
"The main configuration file, bazaar.conf\n"
10260
10501
"El archivo de configuración principal, bazaar.conf\n"
10261
10502
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
10262
10503
10263
#: en/help_topics/configuration.txt:344
10504
#: en/help_topics/configuration.txt:356
10264
10505
msgid ""
10265
10506
"``bazaar.conf`` allows two sections: ``[DEFAULT]`` and ``[ALIASES]``.\n"
10266
10507
"The default section contains the default\n"
10268
10509
"overriden by providing a branch-specific section in ``locations.conf``."
10269
10510
msgstr ""
10270
10511
10271
#: en/help_topics/configuration.txt:349
10512
#: en/help_topics/configuration.txt:361
10272
10513
msgid "A typical ``bazaar.conf`` section often looks like the following::"
10273
10514
msgstr ""
10274
10515
10275
#: en/help_topics/configuration.txt:351
10516
#: en/help_topics/configuration.txt:363
10276
10517
msgid ""
10277
10518
" [DEFAULT]\n"
10278
10519
" email = John Doe <jdoe@isp.com>\n"
10284
10525
" editor = /usr/bin/vim\n"
10285
10526
" create_signatures = when-required"
10286
10527
10287
#: en/help_topics/configuration.txt:356
10528
#: en/help_topics/configuration.txt:368
10288
10529
msgid ""
10289
10530
"\n"
10290
10531
"The branch location configuration file, locations.conf\n"
10294
10535
"El archivo de ubicación de la rama, locations.conf\n"
10295
10536
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
10296
10537
10297
#: en/help_topics/configuration.txt:360
10538
#: en/help_topics/configuration.txt:372
10298
10539
msgid ""
10299
10540
"``locations.conf`` allows one to specify overriding settings for\n"
10300
10541
"a specific branch. The format is almost identical to the default section in\n"
10304
10545
"for. The '?' and '*' wildcards are supported::"
10305
10546
msgstr ""
10306
10547
10307
#: en/help_topics/configuration.txt:366
10548
#: en/help_topics/configuration.txt:378
10308
10549
msgid ""
10309
10550
" [/home/jdoe/branches/nethack]\n"
10310
10551
" email = Nethack Admin <nethack@nethack.com>"
10312
10553
" [/home/jdado/ramas/nethack]\n"
10313
10554
" email = Nethack Admin <nethack@nethack.com>"
10314
10555
10315
#: en/help_topics/configuration.txt:369
10556
#: en/help_topics/configuration.txt:381
10316
10557
msgid ""
10317
10558
" [http://hypothetical.site.com/branches/devel-branch]\n"
10318
10559
" create_signatures = always"
10320
10561
" [http://hypothetical.site.com/branches/devel-branch]\n"
10321
10562
" create_signatures = always"
10322
10563
10323
#: en/help_topics/configuration.txt:372
10564
#: en/help_topics/configuration.txt:384
10324
10565
msgid ""
10325
10566
"The authentication configuration file, authentication.conf\n"
10326
10567
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
10328
10569
"El archivo de configuración de la autenticación, authentication.conf\n"
10329
10570
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
10330
10571
10331
#: en/help_topics/configuration.txt:375
10572
#: en/help_topics/configuration.txt:387
10332
10573
msgid ""
10333
10574
"``authentication.conf`` allows one to specify credentials for\n"
10334
10575
"remote servers. This can be used for all the supported transports and any "
10336
10577
"of bzr that requires authentication (smtp for example)."
10337
10578
msgstr ""
10338
10579
10339
#: en/help_topics/configuration.txt:379
10580
#: en/help_topics/configuration.txt:391
10340
10581
msgid ""
10341
10582
"The syntax of the file obeys the same rules as the others except for the\n"
10342
10583
"option policies which don't apply."
10343
10584
msgstr ""
10344
10585
10345
#: en/help_topics/configuration.txt:382
10586
#: en/help_topics/configuration.txt:394
10346
10587
msgid ""
10347
10588
"For more information on the possible uses of the authentication "
10348
10589
"configuration\n"
10349
10590
"file see :doc:`authentication-help`."
10350
10591
msgstr ""
10351
10592
10352
#: en/help_topics/configuration.txt:385
10593
#: en/help_topics/configuration.txt:397
10353
10594
msgid ""
10354
10595
"\n"
10355
10596
"Common options\n"
10356
10597
"--------------"
10357
10598
msgstr ""
10358
10599
10359
#: en/help_topics/configuration.txt:389
10600
#: en/help_topics/configuration.txt:401
10360
10601
msgid ""
10361
10602
"debug_flags\n"
10362
10603
"~~~~~~~~~~~"
10364
10605
"debug_flags\n"
10365
10606
"~~~~~~~~~~~"
10366
10607
10367
#: en/help_topics/configuration.txt:392
10608
#: en/help_topics/configuration.txt:404
10368
10609
msgid ""
10369
10610
"A comma-separated list of debugging options to turn on. The same values\n"
10370
10611
"can be used as with the -D command-line option (see `help global-options`).\n"
10371
10612
"For example::"
10372
10613
msgstr ""
10373
10614
10374
#: en/help_topics/configuration.txt:396
10615
#: en/help_topics/configuration.txt:408
10375
10616
msgid " debug_flags = hpss"
10376
10617
msgstr " debug_flags = hpss"
10377
10618
10378
#: en/help_topics/configuration.txt:400
10619
#: en/help_topics/configuration.txt:412
10379
10620
msgid " debug_flags = hpss,evil"
10380
10621
msgstr " debug_flags = hpss,evil"
10381
10622
10382
#: en/help_topics/configuration.txt:402
10623
#: en/help_topics/configuration.txt:414
10383
10624
msgid ""
10384
10625
"email\n"
10385
10626
"~~~~~"
10387
10628
"correo\n"
10388
10629
"~~~~~"
10389
10630
10390
#: en/help_topics/configuration.txt:405
10631
#: en/help_topics/configuration.txt:417
10391
10632
msgid ""
10392
10633
"The email address to use when committing a branch. Typically takes the form\n"
10393
10634
"of::"
10394
10635
msgstr ""
10395
10636
10396
#: en/help_topics/configuration.txt:408
10637
#: en/help_topics/configuration.txt:420
10397
10638
msgid " email = Full Name <account@hostname.tld>"
10398
10639
msgstr ""
10399
10640
10400
#: en/help_topics/configuration.txt:410
10641
#: en/help_topics/configuration.txt:422
10401
10642
msgid ""
10402
10643
"editor\n"
10403
10644
"~~~~~~"
10405
10646
"editor\n"
10406
10647
"~~~~~~"
10407
10648
10408
#: en/help_topics/configuration.txt:413
10649
#: en/help_topics/configuration.txt:425
10409
10650
msgid ""
10410
10651
"The path of the editor that you wish to use if *bzr commit* is run without\n"
10411
10652
"a commit message. This setting is trumped by the environment variable\n"
10413
10654
"variables."
10414
10655
msgstr ""
10415
10656
10416
#: en/help_topics/configuration.txt:418
10657
#: en/help_topics/configuration.txt:430
10417
10658
msgid ""
10418
10659
"log_format\n"
10419
10660
"~~~~~~~~~~"
10421
10662
"log_format\n"
10422
10663
"~~~~~~~~~~"
10423
10664
10424
#: en/help_topics/configuration.txt:421
10665
#: en/help_topics/configuration.txt:433
10425
10666
msgid ""
10426
10667
"The default log format to use. Standard log formats are ``long``, ``short``\n"
10427
10668
"and ``line``. Additional formats may be provided by plugins. The default\n"
10428
10669
"value is ``long``."
10429
10670
msgstr ""
10430
10671
10431
#: en/help_topics/configuration.txt:425
10672
#: en/help_topics/configuration.txt:437
10432
10673
msgid ""
10433
10674
"check_signatures\n"
10434
10675
"~~~~~~~~~~~~~~~~"
10436
10677
"check_signatures\n"
10437
10678
"~~~~~~~~~~~~~~~~"
10438
10679
10439
#: en/help_topics/configuration.txt:428
10680
#: en/help_topics/configuration.txt:440
10440
10681
msgid ""
10441
10682
"Reserved for future use. These options will allow a policy for branches to\n"
10442
10683
"require signatures."
10443
10684
msgstr ""
10444
10685
10445
#: en/help_topics/configuration.txt:431
10686
#: en/help_topics/configuration.txt:443
10446
10687
msgid ""
10447
10688
"require\n"
10448
10689
" The gnupg signature for revisions must be present and must be valid."
10449
10690
msgstr ""
10450
10691
10451
#: en/help_topics/configuration.txt:434
10692
#: en/help_topics/configuration.txt:446
10452
10693
msgid ""
10453
10694
"ignore\n"
10454
10695
" Do not check gnupg signatures of revisions."
10455
10696
msgstr ""
10456
10697
10457
#: en/help_topics/configuration.txt:437
10698
#: en/help_topics/configuration.txt:449
10458
10699
msgid ""
10459
10700
"check-available\n"
10460
10701
" (default) If gnupg signatures for revisions are present, check them.\n"
10462
10703
" no signature is present."
10463
10704
msgstr ""
10464
10705
10465
#: en/help_topics/configuration.txt:442
10706
#: en/help_topics/configuration.txt:454
10466
10707
msgid ""
10467
10708
"create_signatures\n"
10468
10709
"~~~~~~~~~~~~~~~~~"
10470
10711
"create_signatures\n"
10471
10712
"~~~~~~~~~~~~~~~~~"
10472
10713
10473
#: en/help_topics/configuration.txt:445
10714
#: en/help_topics/configuration.txt:457
10474
10715
msgid ""
10475
10716
"Defines the behaviour of signing revisions on commits. By default bzr will "
10476
10717
"not\n"
10477
10718
"sign new commits."
10478
10719
msgstr ""
10479
10720
10480
#: en/help_topics/configuration.txt:448
10721
#: en/help_topics/configuration.txt:460
10481
10722
msgid ""
10482
10723
"always\n"
10483
10724
" Sign every new revision that is committed. If the signing fails then "
10485
10726
" commit will not be made."
10486
10727
msgstr ""
10487
10728
10488
#: en/help_topics/configuration.txt:452
10489
msgid ""
10490
"when-required\n"
10491
" Reserved for future use."
10492
msgstr ""
10493
"when-required\n"
10494
" Reservada para uso futuro."
10495
10496
#: en/help_topics/configuration.txt:455
10497
msgid ""
10498
"never\n"
10499
" Reserved for future use."
10500
msgstr ""
10501
"never\n"
10502
" Reservada para uso futuro."
10503
10504
#: en/help_topics/configuration.txt:458
10729
#: en/help_topics/configuration.txt:464
10730
msgid ""
10731
"when-required\n"
10732
" Reserved for future use."
10733
msgstr ""
10734
"when-required\n"
10735
" Reservada para uso futuro."
10736
10737
#: en/help_topics/configuration.txt:467
10738
msgid ""
10739
"never\n"
10740
" Reserved for future use."
10741
msgstr ""
10742
"never\n"
10743
" Reservada para uso futuro."
10744
10745
#: en/help_topics/configuration.txt:470
10505
10746
msgid ""
10506
10747
"In future it is planned that ``when-required`` will sign newly\n"
10507
10748
"committed revisions only when the branch requires them. ``never`` will "
10509
10750
"to sign newly committed revisions, even if the branch requires signatures."
10510
10751
msgstr ""
10511
10752
10512
#: en/help_topics/configuration.txt:462
10753
#: en/help_topics/configuration.txt:474
10513
10754
msgid ""
10514
10755
"dirstate.fdatasync\n"
10515
10756
"~~~~~~~~~~~~~~~~~~"
10517
10758
"dirstate.fdatasync\n"
10518
10759
"~~~~~~~~~~~~~~~~~~"
10519
10760
10520
#: en/help_topics/configuration.txt:465
10761
#: en/help_topics/configuration.txt:477
10521
10762
msgid ""
10522
10763
"If true (default), working tree metadata changes are flushed through the\n"
10523
10764
"OS buffers to physical disk. This is somewhat slower, but means data\n"
10524
10765
"should not be lost if the machine crashes. See also repository.fdatasync."
10525
10766
msgstr ""
10526
10767
10527
#: en/help_topics/configuration.txt:469
10768
#: en/help_topics/configuration.txt:481
10528
10769
msgid ""
10529
10770
"gpg_signing_key\n"
10530
10771
"~~~~~~~~~~~~~~~"
10532
10773
"gpg_signing_key\n"
10533
10774
"~~~~~~~~~~~~~~~"
10534
10775
10535
#: en/help_topics/configuration.txt:472
10776
#: en/help_topics/configuration.txt:484
10536
10777
msgid ""
10537
10778
"The GnuPG user identity to use when signing commits. Can be an e-mail\n"
10538
10779
"address, key fingerprint or full key ID. When unset or when set to\n"
10539
10780
"\"default\" Bazaar will use the user e-mail set with ``whoami``."
10540
10781
msgstr ""
10541
10782
10542
#: en/help_topics/configuration.txt:476
10783
#: en/help_topics/configuration.txt:488
10543
10784
msgid ""
10544
10785
"recurse\n"
10545
10786
"~~~~~~~"
10547
10788
"recurse\n"
10548
10789
"~~~~~~~"
10549
10790
10550
#: en/help_topics/configuration.txt:479
10791
#: en/help_topics/configuration.txt:491
10551
10792
msgid ""
10552
10793
"Only useful in ``locations.conf``. Defines whether or not the\n"
10553
10794
"configuration for this section applies to subdirectories:"
10554
10795
msgstr ""
10555
10796
10556
#: en/help_topics/configuration.txt:482
10797
#: en/help_topics/configuration.txt:494
10557
10798
msgid ""
10558
10799
"true\n"
10559
10800
" (default) This section applies to subdirectories as well."
10560
10801
msgstr ""
10561
10802
10562
#: en/help_topics/configuration.txt:485
10803
#: en/help_topics/configuration.txt:497
10563
10804
msgid ""
10564
10805
"false\n"
10565
10806
" This section only applies to the branch at this directory and not\n"
10566
10807
" branches below it."
10567
10808
msgstr ""
10568
10809
10569
#: en/help_topics/configuration.txt:489
10810
#: en/help_topics/configuration.txt:501
10570
10811
msgid ""
10571
10812
"gpg_signing_command\n"
10572
10813
"~~~~~~~~~~~~~~~~~~~"
10574
10815
"gpg_signing_command\n"
10575
10816
"~~~~~~~~~~~~~~~~~~~"
10576
10817
10577
#: en/help_topics/configuration.txt:492
10818
#: en/help_topics/configuration.txt:504
10578
10819
msgid ""
10579
10820
"(Default: \"gpg\"). Which program should be used to sign and check "
10580
10821
"revisions.\n"
10581
10822
"For example::"
10582
10823
msgstr ""
10583
10824
10584
#: en/help_topics/configuration.txt:495
10825
#: en/help_topics/configuration.txt:507
10585
10826
msgid " gpg_signing_command = /usr/bin/gnpg"
10586
10827
msgstr " gpg_signing_command = /usr/bin/gnpg"
10587
10828
10588
#: en/help_topics/configuration.txt:497
10829
#: en/help_topics/configuration.txt:509
10589
10830
msgid ""
10590
10831
"The specified command must accept the options \"--clearsign\" and \"-u "
10591
10832
"<email>\"."
10593
10834
"La orden especificada puede aceptar las opciones «--clearsign» y «-u "
10594
10835
"<correo>»."
10595
10836
10596
#: en/help_topics/configuration.txt:499
10837
#: en/help_topics/configuration.txt:511
10597
10838
msgid ""
10598
10839
"bzr_remote_path\n"
10599
10840
"~~~~~~~~~~~~~~~"
10601
10842
"bzr_remote_path\n"
10602
10843
"~~~~~~~~~~~~~~~"
10603
10844
10604
#: en/help_topics/configuration.txt:502
10845
#: en/help_topics/configuration.txt:514
10605
10846
msgid ""
10606
10847
"(Default: \"bzr\"). The path to the command that should be used to run the "
10607
10848
"smart\n"
10608
10849
"server for bzr. This value may only be specified in locations.conf, because:"
10609
10850
msgstr ""
10610
10851
10611
#: en/help_topics/configuration.txt:505
10852
#: en/help_topics/configuration.txt:517
10612
10853
msgid ""
10613
10854
"- it's needed before branch.conf is accessible\n"
10614
10855
"- allowing remote branch.conf files to specify commands would be a security\n"
10615
10856
" risk"
10616
10857
msgstr ""
10617
10858
10618
#: en/help_topics/configuration.txt:509
10859
#: en/help_topics/configuration.txt:521
10619
10860
msgid "It is overridden by the BZR_REMOTE_PATH environment variable."
10620
10861
msgstr ""
10621
10862
10622
#: en/help_topics/configuration.txt:511
10863
#: en/help_topics/configuration.txt:523
10623
10864
msgid ""
10624
10865
"smtp_server\n"
10625
10866
"~~~~~~~~~~~"
10627
10868
"smtp_server\n"
10628
10869
"~~~~~~~~~~~"
10629
10870
10630
#: en/help_topics/configuration.txt:514
10871
#: en/help_topics/configuration.txt:526
10631
10872
msgid ""
10632
10873
"(Default: \"localhost\"). SMTP server to use when Bazaar needs to send\n"
10633
10874
"email, eg. with ``merge-directive --mail-to``, or the bzr-email plugin."
10634
10875
msgstr ""
10635
10876
10636
#: en/help_topics/configuration.txt:517
10877
#: en/help_topics/configuration.txt:529
10637
10878
msgid ""
10638
10879
"smtp_username, smtp_password\n"
10639
10880
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
10641
10882
"smtp_username, smtp_password\n"
10642
10883
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
10643
10884
10644
#: en/help_topics/configuration.txt:520
10885
#: en/help_topics/configuration.txt:532
10645
10886
msgid ""
10646
10887
"User and password to authenticate to the SMTP server. If smtp_username\n"
10647
10888
"is set, and smtp_password is not, Bazaar will prompt for a password.\n"
10649
10890
"to send mail."
10650
10891
msgstr ""
10651
10892
10652
#: en/help_topics/configuration.txt:525
10893
#: en/help_topics/configuration.txt:537
10653
10894
msgid ""
10654
10895
"locks.steal_dead\n"
10655
10896
"~~~~~~~~~~~~~~~~"
10657
10898
"locks.steal_dead\n"
10658
10899
"~~~~~~~~~~~~~~~~"
10659
10900
10660
#: en/help_topics/configuration.txt:528
10901
#: en/help_topics/configuration.txt:540
10661
10902
msgid ""
10662
10903
"If set to true, bzr will automatically break locks held by processes from\n"
10663
10904
"the same machine and user that are no longer alive. Otherwise, it will\n"
10665
10906
"the object is no longer in use."
10666
10907
msgstr ""
10667
10908
10668
#: en/help_topics/configuration.txt:533
10909
#: en/help_topics/configuration.txt:545
10669
10910
msgid ""
10670
10911
"mail_client\n"
10671
10912
"~~~~~~~~~~~"
10673
10914
"mail_client\n"
10674
10915
"~~~~~~~~~~~"
10675
10916
10676
#: en/help_topics/configuration.txt:536
10917
#: en/help_topics/configuration.txt:548
10677
10918
msgid ""
10678
10919
"A mail client to use for sending merge requests.\n"
10679
10920
"By default, bzr will try to use ``mapi`` on Windows. On other platforms, "
10682
10923
"``editor``."
10683
10924
msgstr ""
10684
10925
10685
#: en/help_topics/configuration.txt:541
10926
#: en/help_topics/configuration.txt:553
10686
10927
msgid "Supported values for specific clients:"
10687
10928
msgstr "Valores permitidos para clientes específicos:"
10688
10929
10689
#: en/help_topics/configuration.txt:543
10930
#: en/help_topics/configuration.txt:555
10690
10931
msgid ""
10691
10932
":claws: Use Claws. This skips a dialog for attaching files.\n"
10692
10933
":evolution: Use Evolution.\n"
10697
10938
" this works around some bugs that xdg-email doesn't handle."
10698
10939
msgstr ""
10699
10940
10700
#: en/help_topics/configuration.txt:550
10941
#: en/help_topics/configuration.txt:562
10701
10942
msgid "Supported generic values are:"
10702
10943
msgstr "Los valores genéricos permitidos son:"
10703
10944
10704
#: en/help_topics/configuration.txt:552
10945
#: en/help_topics/configuration.txt:564
10705
10946
msgid ""
10706
10947
":default: See above.\n"
10707
10948
":editor: Use your editor to compose the merge request. This also uses\n"
10711
10952
":xdg-email: Use xdg-email to run your preferred mail program"
10712
10953
msgstr ""
10713
10954
10714
#: en/help_topics/configuration.txt:559
10955
#: en/help_topics/configuration.txt:571
10715
10956
msgid ""
10716
10957
"repository.fdatasync\n"
10717
10958
"~~~~~~~~~~~~~~~~~~~~"
10719
10960
"repository.fdatasync\n"
10720
10961
"~~~~~~~~~~~~~~~~~~~~"
10721
10962
10722
#: en/help_topics/configuration.txt:562
10963
#: en/help_topics/configuration.txt:574
10723
10964
msgid ""
10724
10965
"If true (default), repository changes are flushed through the OS buffers\n"
10725
10966
"to physical disk. This is somewhat slower, but means data should not be\n"
10726
10967
"lost if the machine crashes. See also dirstate.fdatasync."
10727
10968
msgstr ""
10728
10969
10729
#: en/help_topics/configuration.txt:566
10970
#: en/help_topics/configuration.txt:578
10730
10971
msgid ""
10731
10972
"submit_branch\n"
10732
10973
"~~~~~~~~~~~~~"
10734
10975
"submit_branch\n"
10735
10976
"~~~~~~~~~~~~~"
10736
10977
10737
#: en/help_topics/configuration.txt:569
10978
#: en/help_topics/configuration.txt:581
10738
10979
msgid ""
10739
10980
"The branch you intend to submit your current work to. This is "
10740
10981
"automatically\n"
10743
10984
"should usually be set on a per-branch or per-location basis."
10744
10985
msgstr ""
10745
10986
10746
#: en/help_topics/configuration.txt:573
10987
#: en/help_topics/configuration.txt:585
10747
10988
msgid ""
10748
10989
"public_branch\n"
10749
10990
"~~~~~~~~~~~~~"
10751
10992
"public_branch\n"
10752
10993
"~~~~~~~~~~~~~"
10753
10994
10754
#: en/help_topics/configuration.txt:576
10995
#: en/help_topics/configuration.txt:588
10755
10996
msgid ""
10756
10997
"A publically-accessible version of this branch (implying that this version "
10757
10998
"is\n"
10758
10999
"not publically-accessible). Used (and set) by ``bzr send``."
10759
11000
msgstr ""
10760
11001
10761
#: en/help_topics/configuration.txt:579
11002
#: en/help_topics/configuration.txt:591
10762
11003
msgid ""
10763
11004
"suppress_warnings\n"
10764
11005
"~~~~~~~~~~~~~~~~~"
10766
11007
"suppress_warnings\n"
10767
11008
"~~~~~~~~~~~~~~~~~"
10768
11009
10769
#: en/help_topics/configuration.txt:582
11010
#: en/help_topics/configuration.txt:594
10770
11011
msgid ""
10771
11012
"A list of strings, each string represent a warning that can be emitted by\n"
10772
11013
"bzr. Mentioning a warning in this list tells bzr to not emit it."
10773
11014
msgstr ""
10774
11015
10775
#: en/help_topics/configuration.txt:585
11016
#: en/help_topics/configuration.txt:597
10776
11017
msgid "Valid values:"
10777
11018
msgstr "valores válidos:"
10778
11019
10779
#: en/help_topics/configuration.txt:587
11020
#: en/help_topics/configuration.txt:599
10780
11021
msgid ""
10781
11022
"* ``format_deprecation``:\n"
10782
11023
" whether the format deprecation warning is shown on repositories that "
10784
11025
" using deprecated formats."
10785
11026
msgstr ""
10786
11027
10787
#: en/help_topics/configuration.txt:591
11028
#: en/help_topics/configuration.txt:603
10788
11029
msgid ""
10789
11030
"default_format\n"
10790
11031
"~~~~~~~~~~~~~~"
10792
11033
"default_format\n"
10793
11034
"~~~~~~~~~~~~~~"
10794
11035
10795
#: en/help_topics/configuration.txt:594
11036
#: en/help_topics/configuration.txt:606
10796
11037
msgid ""
10797
11038
"A format name for the default format used when creating branches. See "
10798
11039
"``bzr\n"
10799
11040
"help formats`` for possible values."
10800
11041
msgstr ""
10801
11042
10802
#: en/help_topics/configuration.txt:597
11043
#: en/help_topics/configuration.txt:609
10803
11044
msgid ""
10804
11045
"\n"
10805
11046
"Unicode options\n"
10809
11050
"Opciones Unicode\n"
10810
11051
"---------------"
10811
11052
10812
#: en/help_topics/configuration.txt:601
11053
#: en/help_topics/configuration.txt:613
10813
11054
msgid ""
10814
11055
"output_encoding\n"
10815
11056
"~~~~~~~~~~~~~~~"
10817
11058
"output_encoding\n"
10818
11059
"~~~~~~~~~~~~~~~"
10819
11060
10820
#: en/help_topics/configuration.txt:604
11061
#: en/help_topics/configuration.txt:616
10821
11062
msgid ""
10822
11063
"A Python unicode encoding name for text output from bzr, such as log\n"
10823
11064
"information. Values include: utf8, cp850, ascii, iso-8859-1. The default\n"
10824
11065
"is the terminal encoding prefered by the operating system."
10825
11066
msgstr ""
10826
11067
10827
#: en/help_topics/configuration.txt:608
11068
#: en/help_topics/configuration.txt:620
10828
11069
msgid ""
10829
11070
"\n"
10830
11071
"Branch type specific options\n"
10834
11075
"Opciones específicas del tipo de rama\n"
10835
11076
"-----------------------------------------------------------"
10836
11077
10837
#: en/help_topics/configuration.txt:612
11078
#: en/help_topics/configuration.txt:624
10838
11079
msgid ""
10839
11080
"These options apply only to branches that use the ``dirstate-tags`` or\n"
10840
11081
"later format. They\n"
10842
11083
"manually set in ``locations.conf`` or ``bazaar.conf``."
10843
11084
msgstr ""
10844
11085
10845
#: en/help_topics/configuration.txt:617
11086
#: en/help_topics/configuration.txt:629
10846
11087
msgid ""
10847
11088
"append_revisions_only\n"
10848
11089
"~~~~~~~~~~~~~~~~~~~~~"
10850
11091
"append_revisions_only\n"
10851
11092
"~~~~~~~~~~~~~~~~~~~~~"
10852
11093
10853
#: en/help_topics/configuration.txt:620
11094
#: en/help_topics/configuration.txt:632
10854
11095
msgid ""
10855
11096
"If set to \"True\" then revisions can only be appended to the log, not\n"
10856
11097
"removed. A branch with this setting enabled can only pull from another\n"
10860
11101
"compatibility with previous bzr versions (older than 2.2)."
10861
11102
msgstr ""
10862
11103
10863
#: en/help_topics/configuration.txt:627
11104
#: en/help_topics/configuration.txt:639
10864
11105
msgid ""
10865
11106
"parent_location\n"
10866
11107
"~~~~~~~~~~~~~~~"
10868
11109
"parent_location\n"
10869
11110
"~~~~~~~~~~~~~~~"
10870
11111
10871
#: en/help_topics/configuration.txt:630
11112
#: en/help_topics/configuration.txt:642
10872
11113
msgid ""
10873
11114
"If present, the location of the default branch for pull or merge. This "
10874
11115
"option\n"
10876
11117
"--remember``."
10877
11118
msgstr ""
10878
11119
10879
#: en/help_topics/configuration.txt:634
11120
#: en/help_topics/configuration.txt:646
10880
11121
msgid ""
10881
11122
"push_location\n"
10882
11123
"~~~~~~~~~~~~~"
10884
11125
"push_location\n"
10885
11126
"~~~~~~~~~~~~~"
10886
11127
10887
#: en/help_topics/configuration.txt:637
11128
#: en/help_topics/configuration.txt:649
10888
11129
msgid ""
10889
11130
"If present, the location of the default branch for push. This option\n"
10890
11131
"is normally set by the first ``push`` or ``push --remember``."
10891
11132
msgstr ""
10892
11133
10893
#: en/help_topics/configuration.txt:640
11134
#: en/help_topics/configuration.txt:652
10894
11135
msgid ""
10895
11136
"push_strict\n"
10896
11137
"~~~~~~~~~~~"
10898
11139
"push_strict\n"
10899
11140
"~~~~~~~~~~~"
10900
11141
10901
#: en/help_topics/configuration.txt:643
11142
#: en/help_topics/configuration.txt:655
10902
11143
msgid ""
10903
11144
"If present, defines the ``--strict`` option default value for checking\n"
10904
11145
"uncommitted changes before pushing."
10905
11146
msgstr ""
10906
11147
10907
#: en/help_topics/configuration.txt:646
11148
#: en/help_topics/configuration.txt:658
10908
11149
msgid ""
10909
11150
"dpush_strict\n"
10910
11151
"~~~~~~~~~~~~"
10912
11153
"dpush_strict\n"
10913
11154
"~~~~~~~~~~~~"
10914
11155
10915
#: en/help_topics/configuration.txt:649
11156
#: en/help_topics/configuration.txt:661
10916
11157
msgid ""
10917
11158
"If present, defines the ``--strict`` option default value for checking\n"
10918
11159
"uncommitted changes before pushing into a different VCS without any\n"
10919
11160
"custom bzr metadata."
10920
11161
msgstr ""
10921
11162
10922
#: en/help_topics/configuration.txt:653
11163
#: en/help_topics/configuration.txt:665
10923
11164
msgid ""
10924
11165
"bound_location\n"
10925
11166
"~~~~~~~~~~~~~~"
10927
11168
"bound_location\n"
10928
11169
"~~~~~~~~~~~~~~"
10929
11170
10930
#: en/help_topics/configuration.txt:656
11171
#: en/help_topics/configuration.txt:668
10931
11172
msgid ""
10932
11173
"The location that commits should go to when acting as a checkout.\n"
10933
11174
"This option is normally set by ``bind``."
10934
11175
msgstr ""
10935
11176
10936
#: en/help_topics/configuration.txt:659
11177
#: en/help_topics/configuration.txt:671
10937
11178
msgid ""
10938
11179
"bound\n"
10939
11180
"~~~~~"
10941
11182
"bound\n"
10942
11183
"~~~~~"
10943
11184
10944
#: en/help_topics/configuration.txt:662
11185
#: en/help_topics/configuration.txt:674
10945
11186
msgid ""
10946
11187
"If set to \"True\", the branch should act as a checkout, and push each "
10947
11188
"commit to\n"
10948
11189
"the bound_location. This option is normally set by ``bind``/``unbind``."
10949
11190
msgstr ""
10950
11191
10951
#: en/help_topics/configuration.txt:665
11192
#: en/help_topics/configuration.txt:677
10952
11193
msgid ""
10953
11194
"send_strict\n"
10954
11195
"~~~~~~~~~~~"
10956
11197
"send_strict\n"
10957
11198
"~~~~~~~~~"
10958
11199
10959
#: en/help_topics/configuration.txt:668
11200
#: en/help_topics/configuration.txt:680
10960
11201
msgid ""
10961
11202
"If present, defines the ``--strict`` option default value for checking\n"
10962
11203
"uncommitted changes before sending a merge directive."
10963
11204
msgstr ""
10964
11205
10965
#: en/help_topics/configuration.txt:671
11206
#: en/help_topics/configuration.txt:683
10966
11207
msgid ""
10967
11208
"add.maximum_file_size\n"
10968
11209
"~~~~~~~~~~~~~~~~~~~~~"
10970
11211
"add.maximum_file_size\n"
10971
11212
"~~~~~~~~~~~~~~~~~~~"
10972
11213
10973
#: en/help_topics/configuration.txt:674
11214
#: en/help_topics/configuration.txt:686
10974
11215
msgid ""
10975
11216
"Defines the maximum file size the command line \"add\" operation will allow\n"
10976
11217
"in recursive mode, with files larger than this value being skipped. You may "
10982
11223
"will disable skipping."
10983
11224
msgstr ""
10984
11225
10985
#: en/help_topics/configuration.txt:680
11226
#: en/help_topics/configuration.txt:692
10986
11227
msgid ""
10987
11228
"External Merge Tools\n"
10988
11229
"--------------------"
10990
11231
"Herramientas de fusión externas\n"
10991
11232
"----------------------------------------------------"
10992
11233
10993
#: en/help_topics/configuration.txt:683
11234
#: en/help_topics/configuration.txt:695
10994
11235
msgid ""
10995
11236
"bzr.mergetool.<name>\n"
10996
11237
"~~~~~~~~~~~~~~~~~~~~"
10998
11239
"bzr.mergetool.<nombre>\n"
10999
11240
"~~~~~~~~~~~~~~~~~~~"
11000
11241
11001
#: en/help_topics/configuration.txt:686
11242
#: en/help_topics/configuration.txt:698
11002
11243
msgid ""
11003
11244
"Defines an external merge tool called <name> with the given command-line.\n"
11004
11245
"Arguments containing spaces should be quoted using single or double quotes. "
11006
11247
"executable may omit its path if it can be found on the PATH."
11007
11248
msgstr ""
11008
11249
11009
#: en/help_topics/configuration.txt:690
11250
#: en/help_topics/configuration.txt:702
11010
11251
msgid ""
11011
11252
"The following markers can be used in the command-line to substitute "
11012
11253
"filenames\n"
11013
11254
"involved in the merge conflict::"
11014
11255
msgstr ""
11015
11256
11016
#: en/help_topics/configuration.txt:693
11257
#: en/help_topics/configuration.txt:705
11017
11258
msgid ""
11018
11259
" {base} file.BASE\n"
11019
11260
" {this} file.THIS\n"
11024
11265
" succeeds."
11025
11266
msgstr ""
11026
11267
11027
#: en/help_topics/configuration.txt:702
11268
#: en/help_topics/configuration.txt:714
11028
11269
msgid " bzr.mergetool.kdiff3 = kdiff3 {base} {this} {other} -o {result}"
11029
11270
msgstr " bzr.mergetool.kdiff3 = kdiff3 {base} {este} {otro} -o {resultado}"
11030
11271
11031
#: en/help_topics/configuration.txt:704
11272
#: en/help_topics/configuration.txt:716
11032
11273
msgid ""
11033
11274
"bzr.default_mergetool\n"
11034
11275
"~~~~~~~~~~~~~~~~~~~~~"
11036
11277
"bzr.default_mergetool\n"
11037
11278
"~~~~~~~~~~~~~~~~~~"
11038
11279
11039
#: en/help_topics/configuration.txt:707
11280
#: en/help_topics/configuration.txt:719
11040
11281
msgid ""
11041
11282
"Specifies which external merge tool (as defined above) should be selected "
11042
11283
"by\n"
11043
11284
"default in tools such as ``bzr qconflicts``."
11044
11285
msgstr ""
11045
11286
11046
#: en/help_topics/configuration.txt:712
11287
#: en/help_topics/configuration.txt:724
11047
11288
msgid " bzr.default_mergetool = kdiff3\n"
11048
11289
msgstr " bzr.default_mergetool = kdiff3\n"
11049
11290
11735
11976
"Content Filters\n"
11736
11977
"==============="
11737
11978
msgstr ""
11979
"Filtros de contenido\n"
11980
"==============="
11738
11981
11739
11982
#: en/help_topics/content-filters.txt:4
11740
11983
msgid ""
11741
11984
"Content formats\n"
11742
11985
"---------------"
11743
11986
msgstr ""
11987
"Formatos de contenido\n"
11988
"---------------"
11744
11989
11745
11990
#: en/help_topics/content-filters.txt:7
11746
11991
msgid ""
12057
12302
"branch can now be pushed to the mainline.\n"
12058
12303
msgstr ""
12059
12304
12305
#: en/help_topics/env-variables.txt:1
12306
msgid "Environment Variables"
12307
msgstr "Variables de entorno"
12308
12309
#: en/help_topics/env-variables.txt:3
12310
msgid ""
12311
"=================== "
12312
"===========================================================\n"
12313
"BZRPATH Path where bzr is to look for shell plugin external\n"
12314
" commands.\n"
12315
"BZR_EMAIL E-Mail address of the user. Overrides EMAIL.\n"
12316
"EMAIL E-Mail address of the user.\n"
12317
"BZR_EDITOR Editor for editing commit messages. Overrides EDITOR.\n"
12318
"EDITOR Editor for editing commit messages.\n"
12319
"BZR_PLUGIN_PATH Paths where bzr should look for plugins.\n"
12320
"BZR_DISABLE_PLUGINS Plugins that bzr should not load.\n"
12321
"BZR_PLUGINS_AT Plugins to load from a directory not in "
12322
"BZR_PLUGIN_PATH.\n"
12323
"BZR_HOME Directory holding .bazaar config dir. Overrides HOME.\n"
12324
"BZR_HOME (Win32) Directory holding bazaar config dir. Overrides APPDATA "
12325
"and\n"
12326
" HOME.\n"
12327
"BZR_REMOTE_PATH Full name of remote 'bzr' command (for bzr+ssh:// "
12328
"URLs).\n"
12329
"BZR_SSH Path to SSH client, or one of paramiko, openssh, "
12330
"sshcorp,\n"
12331
" plink or lsh.\n"
12332
"BZR_LOG Location of .bzr.log (use '/dev/null' to suppress log).\n"
12333
"BZR_LOG (Win32) Location of .bzr.log (use 'NUL' to suppress log).\n"
12334
"BZR_COLUMNS Override implicit terminal width.\n"
12335
"BZR_CONCURRENCY Number of processes that can be run concurrently "
12336
"(selftest)\n"
12337
"BZR_PROGRESS_BAR Override the progress display. Values are 'none' or "
12338
"'text'.\n"
12339
"BZR_PDB Control whether to launch a debugger on error.\n"
12340
"BZR_SIGQUIT_PDB Control whether SIGQUIT behaves normally or invokes a\n"
12341
" breakin debugger.\n"
12342
"BZR_TEXTUI_INPUT Force console input mode for prompts to line-based "
12343
"(instead\n"
12344
" of char-based).\n"
12345
"=================== "
12346
"===========================================================\n"
12347
msgstr ""
12348
12060
12349
#: en/help_topics/eol.txt:1
12061
12350
msgid ""
12062
12351
"End of Line Conversion\n"
12376
12665
"~~~~~~~~~~~~~~~~~~"
12377
12666
12378
12667
#: en/help_topics/hooks.txt:38 en/help_topics/hooks.txt:56
12379
#: en/help_topics/hooks.txt:102 en/help_topics/hooks.txt:259
12668
#: en/help_topics/hooks.txt:102 en/help_topics/hooks.txt:262
12380
12669
msgid "Introduced in: 2.2"
12381
12670
msgstr "Introducido en: 2.2"
12382
12671
12396
12685
"open\n"
12397
12686
"~~~~"
12398
12687
12399
#: en/help_topics/hooks.txt:48 en/help_topics/hooks.txt:290
12400
#: en/help_topics/hooks.txt:304
12688
#: en/help_topics/hooks.txt:48 en/help_topics/hooks.txt:293
12689
#: en/help_topics/hooks.txt:307
12401
12690
msgid "Introduced in: 1.8"
12402
12691
msgstr "Introducido en: 1.8"
12403
12692
12431
12720
"post_change_branch_tip\n"
12432
12721
"~~~~~~~~~~~~~~~~~~~~~~"
12433
12722
12434
#: en/help_topics/hooks.txt:66 en/help_topics/hooks.txt:418
12723
#: en/help_topics/hooks.txt:66 en/help_topics/hooks.txt:421
12435
12724
msgid "Introduced in: 1.4"
12436
12725
msgstr "Introducido en: 1.4"
12437
12726
12443
12732
"uncommit will all trigger this hook."
12444
12733
msgstr ""
12445
12734
12446
#: en/help_topics/hooks.txt:73 en/help_topics/hooks.txt:389
12735
#: en/help_topics/hooks.txt:73 en/help_topics/hooks.txt:392
12447
12736
msgid ""
12448
12737
"post_commit\n"
12449
12738
"~~~~~~~~~~~"
12453
12742
12454
12743
#: en/help_topics/hooks.txt:76 en/help_topics/hooks.txt:86
12455
12744
#: en/help_topics/hooks.txt:94 en/help_topics/hooks.txt:110
12456
#: en/help_topics/hooks.txt:145
12457
12745
msgid "Introduced in: 0.15"
12458
12746
msgstr "Introducido en: 0.15"
12459
12747
12570
12858
12571
12859
#: en/help_topics/hooks.txt:142
12572
12860
msgid ""
12573
"set_rh\n"
12574
"~~~~~~"
12575
msgstr ""
12576
"set_rh\n"
12577
"~~~~~~"
12578
12579
#: en/help_topics/hooks.txt:147
12580
msgid ""
12581
"Invoked whenever the revision history has been set via\n"
12582
"set_revision_history. The api signature is (branch, revision_history),\n"
12583
"and the branch will be write-locked. The set_rh hook can be expensive\n"
12584
"for bzr to trigger, a better hook to use is\n"
12585
"Branch.post_change_branch_tip."
12586
msgstr ""
12587
12588
#: en/help_topics/hooks.txt:153
12589
msgid ""
12590
"transform_fallback_location\n"
12591
"~~~~~~~~~~~~~~~~~~~~~~~~~~~"
12592
msgstr ""
12593
"transform_fallback_location\n"
12594
"~~~~~~~~~~~~~~~~~~~~~~~~~~~"
12595
12596
#: en/help_topics/hooks.txt:156
12861
"transform_fallback_location\n"
12862
"~~~~~~~~~~~~~~~~~~~~~~~~~~~"
12863
msgstr ""
12864
"transform_fallback_location\n"
12865
"~~~~~~~~~~~~~~~~~~~~~~~~~~~"
12866
12867
#: en/help_topics/hooks.txt:145
12597
12868
msgid "Introduced in: 1.9"
12598
12869
msgstr "Introducido en: 1.9"
12599
12870
12600
#: en/help_topics/hooks.txt:158
12871
#: en/help_topics/hooks.txt:147
12601
12872
msgid ""
12602
12873
"Called when a stacked branch is activating its fallback locations.\n"
12603
12874
"transform_fallback_location is called with (branch, url), and should\n"
12611
12882
"however undefined."
12612
12883
msgstr ""
12613
12884
12614
#: en/help_topics/hooks.txt:169
12615
msgid ""
12616
"CommandHooks\n"
12617
"------------"
12618
msgstr ""
12619
"CommandHooks\n"
12620
"------------"
12621
12622
#: en/help_topics/hooks.txt:172
12623
msgid ""
12624
"extend_command\n"
12625
"~~~~~~~~~~~~~~"
12626
msgstr ""
12627
"extend_command\n"
12628
"~~~~~~~~~~~~~~"
12629
12630
#: en/help_topics/hooks.txt:175
12885
#: en/help_topics/hooks.txt:158
12886
msgid ""
12887
"CommandHooks\n"
12888
"------------"
12889
msgstr ""
12890
"CommandHooks\n"
12891
"------------"
12892
12893
#: en/help_topics/hooks.txt:161
12894
msgid ""
12895
"extend_command\n"
12896
"~~~~~~~~~~~~~~"
12897
msgstr ""
12898
"extend_command\n"
12899
"~~~~~~~~~~~~~~"
12900
12901
#: en/help_topics/hooks.txt:164
12631
12902
msgid "Introduced in: 1.13"
12632
12903
msgstr "Introducido en: 1.13"
12633
12904
12634
#: en/help_topics/hooks.txt:177
12905
#: en/help_topics/hooks.txt:166
12635
12906
msgid ""
12636
12907
"Called after creating a command object to allow modifications such as\n"
12637
12908
"adding or removing options, docs etc. Called with the new\n"
12638
12909
"bzrlib.commands.Command object."
12639
12910
msgstr ""
12640
12911
12641
#: en/help_topics/hooks.txt:181
12912
#: en/help_topics/hooks.txt:170
12642
12913
msgid ""
12643
12914
"get_command\n"
12644
12915
"~~~~~~~~~~~"
12646
12917
"get_command\n"
12647
12918
"~~~~~~~~~~~"
12648
12919
12649
#: en/help_topics/hooks.txt:184 en/help_topics/hooks.txt:196
12650
#: en/help_topics/hooks.txt:205 en/help_topics/hooks.txt:464
12920
#: en/help_topics/hooks.txt:173 en/help_topics/hooks.txt:185
12921
#: en/help_topics/hooks.txt:194 en/help_topics/hooks.txt:467
12651
12922
msgid "Introduced in: 1.17"
12652
12923
msgstr "Introducido en: 1.17"
12653
12924
12654
#: en/help_topics/hooks.txt:186
12925
#: en/help_topics/hooks.txt:175
12655
12926
msgid ""
12656
12927
"Called when creating a single command. Called with (cmd_or_None,\n"
12657
12928
"command_name). get_command should either return the cmd_or_None\n"
12661
12932
"plugin_cmds.register_lazy."
12662
12933
msgstr ""
12663
12934
12664
#: en/help_topics/hooks.txt:193
12935
#: en/help_topics/hooks.txt:182
12665
12936
msgid ""
12666
12937
"get_missing_command\n"
12667
12938
"~~~~~~~~~~~~~~~~~~~"
12669
12940
"get_missing_command\n"
12670
12941
"~~~~~~~~~~~~~~~~~~~"
12671
12942
12672
#: en/help_topics/hooks.txt:198
12943
#: en/help_topics/hooks.txt:187
12673
12944
msgid ""
12674
12945
"Called when creating a single command if no command could be found.\n"
12675
12946
"Called with (command_name). get_missing_command should either return\n"
12676
12947
"None, or a Command object to be used for the command."
12677
12948
msgstr ""
12678
12949
12679
#: en/help_topics/hooks.txt:202
12950
#: en/help_topics/hooks.txt:191
12680
12951
msgid ""
12681
12952
"list_commands\n"
12682
12953
"~~~~~~~~~~~~~"
12684
12955
"list_commands\n"
12685
12956
"~~~~~~~~~~~~~"
12686
12957
12687
#: en/help_topics/hooks.txt:207
12958
#: en/help_topics/hooks.txt:196
12688
12959
msgid ""
12689
12960
"Called when enumerating commands. Called with a set of cmd_name\n"
12690
12961
"strings for all the commands found so far. This set is safe to mutate\n"
12692
12963
"set of command names."
12693
12964
msgstr ""
12694
12965
12695
#: en/help_topics/hooks.txt:212
12696
msgid ""
12697
"_ConfigHooks\n"
12698
"------------"
12699
msgstr ""
12700
"_ConfigHooks\n"
12701
"------------"
12966
#: en/help_topics/hooks.txt:201
12967
msgid ""
12968
"post_command\n"
12969
"~~~~~~~~~~~~"
12970
msgstr ""
12971
12972
#: en/help_topics/hooks.txt:204 en/help_topics/hooks.txt:211
12973
msgid "Introduced in: 2.6"
12974
msgstr "Introducido en: 2.6"
12975
12976
#: en/help_topics/hooks.txt:206
12977
msgid "Called after executing a command. Called with the command object."
12978
msgstr ""
12979
12980
#: en/help_topics/hooks.txt:208
12981
msgid ""
12982
"pre_command\n"
12983
"~~~~~~~~~~~"
12984
msgstr ""
12985
12986
#: en/help_topics/hooks.txt:213
12987
msgid "Called prior to executing a command. Called with the command object."
12988
msgstr ""
12702
12989
12703
12990
#: en/help_topics/hooks.txt:215
12704
12991
msgid ""
12705
"get\n"
12706
"~~~"
12707
msgstr ""
12708
"get\n"
12709
"~~~"
12710
12711
#: en/help_topics/hooks.txt:218 en/help_topics/hooks.txt:226
12712
#: en/help_topics/hooks.txt:233 en/help_topics/hooks.txt:241
12713
#: en/help_topics/hooks.txt:248 en/help_topics/hooks.txt:370
12714
#: en/help_topics/hooks.txt:443
12992
"_ConfigHooks\n"
12993
"------------"
12994
msgstr ""
12995
"_ConfigHooks\n"
12996
"------------"
12997
12998
#: en/help_topics/hooks.txt:218
12999
msgid ""
13000
"get\n"
13001
"~~~"
13002
msgstr ""
13003
"get\n"
13004
"~~~"
13005
13006
#: en/help_topics/hooks.txt:221 en/help_topics/hooks.txt:229
13007
#: en/help_topics/hooks.txt:236 en/help_topics/hooks.txt:244
13008
#: en/help_topics/hooks.txt:251 en/help_topics/hooks.txt:373
13009
#: en/help_topics/hooks.txt:446
12715
13010
msgid "Introduced in: 2.4"
12716
13011
msgstr "Introducido en: 2.4"
12717
13012
12718
#: en/help_topics/hooks.txt:220
13013
#: en/help_topics/hooks.txt:223
12719
13014
msgid ""
12720
13015
"Invoked when a config option is read. The signature is (stack, name,\n"
12721
13016
"value)."
12722
13017
msgstr ""
12723
13018
12724
#: en/help_topics/hooks.txt:223
13019
#: en/help_topics/hooks.txt:226
12725
13020
msgid ""
12726
13021
"load\n"
12727
13022
"~~~~"
12729
13024
"load\n"
12730
13025
"~~~~"
12731
13026
12732
#: en/help_topics/hooks.txt:228
13027
#: en/help_topics/hooks.txt:231
12733
13028
msgid "Invoked when a config store is loaded. The signature is (store)."
12734
13029
msgstr ""
12735
13030
12736
#: en/help_topics/hooks.txt:230
13031
#: en/help_topics/hooks.txt:233
12737
13032
msgid ""
12738
13033
"remove\n"
12739
13034
"~~~~~~"
12741
13036
"remove\n"
12742
13037
"~~~~~~"
12743
13038
12744
#: en/help_topics/hooks.txt:235
13039
#: en/help_topics/hooks.txt:238
12745
13040
msgid ""
12746
13041
"Invoked when a config option is removed. The signature is (stack,\n"
12747
13042
"name)."
12748
13043
msgstr ""
12749
13044
12750
#: en/help_topics/hooks.txt:238
13045
#: en/help_topics/hooks.txt:241
12751
13046
msgid ""
12752
13047
"save\n"
12753
13048
"~~~~"
12755
13050
"save\n"
12756
13051
"~~~~"
12757
13052
12758
#: en/help_topics/hooks.txt:243
13053
#: en/help_topics/hooks.txt:246
12759
13054
msgid "Invoked when a config store is saved. The signature is (store)."
12760
13055
msgstr ""
12761
13056
12762
#: en/help_topics/hooks.txt:245
13057
#: en/help_topics/hooks.txt:248
12763
13058
msgid ""
12764
13059
"set\n"
12765
13060
"~~~"
12767
13062
"set\n"
12768
13063
"~~~"
12769
13064
12770
#: en/help_topics/hooks.txt:250
13065
#: en/help_topics/hooks.txt:253
12771
13066
msgid ""
12772
13067
"Invoked when a config option is set. The signature is (stack, name,\n"
12773
13068
"value)."
12774
13069
msgstr ""
12775
13070
12776
#: en/help_topics/hooks.txt:253
13071
#: en/help_topics/hooks.txt:256
12777
13072
msgid ""
12778
13073
"ControlDirHooks\n"
12779
13074
"---------------"
12780
13075
msgstr ""
12781
13076
12782
#: en/help_topics/hooks.txt:256
13077
#: en/help_topics/hooks.txt:259
12783
13078
msgid ""
12784
13079
"post_repo_init\n"
12785
13080
"~~~~~~~~~~~~~~"
12787
13082
"post_repo_init\n"
12788
13083
"~~~~~~~~~~~~~~"
12789
13084
12790
#: en/help_topics/hooks.txt:261
13085
#: en/help_topics/hooks.txt:264
12791
13086
msgid ""
12792
13087
"Invoked after a repository has been initialized. post_repo_init is\n"
12793
13088
"called with a bzrlib.controldir.RepoInitHookParams."
12794
13089
msgstr ""
12795
13090
12796
#: en/help_topics/hooks.txt:264
12797
msgid ""
12798
"pre_open\n"
12799
"~~~~~~~~"
12800
msgstr ""
12801
"pre_open\n"
12802
"~~~~~~~~"
12803
12804
13091
#: en/help_topics/hooks.txt:267
13092
msgid ""
13093
"pre_open\n"
13094
"~~~~~~~~"
13095
msgstr ""
13096
"pre_open\n"
13097
"~~~~~~~~"
13098
13099
#: en/help_topics/hooks.txt:270
12805
13100
msgid "Introduced in: 1.14"
12806
13101
msgstr "Introducido en: 1.14"
12807
13102
12808
#: en/help_topics/hooks.txt:269
13103
#: en/help_topics/hooks.txt:272
12809
13104
msgid ""
12810
13105
"Invoked before attempting to open a ControlDir with the transport that\n"
12811
13106
"the open will use."
12812
13107
msgstr ""
12813
13108
12814
#: en/help_topics/hooks.txt:272
12815
msgid ""
12816
"InfoHooks\n"
12817
"---------"
12818
msgstr ""
12819
"InfoHooks\n"
12820
"---------"
12821
12822
13109
#: en/help_topics/hooks.txt:275
12823
13110
msgid ""
12824
"repository\n"
12825
"~~~~~~~~~~"
12826
msgstr ""
12827
"repository\n"
12828
"~~~~~~~~~~"
12829
12830
#: en/help_topics/hooks.txt:278 en/help_topics/hooks.txt:297
12831
#: en/help_topics/hooks.txt:521
13111
"InfoHooks\n"
13112
"---------"
13113
msgstr ""
13114
"InfoHooks\n"
13115
"---------"
13116
13117
#: en/help_topics/hooks.txt:278
13118
msgid ""
13119
"repository\n"
13120
"~~~~~~~~~~"
13121
msgstr ""
13122
"repository\n"
13123
"~~~~~~~~~~"
13124
13125
#: en/help_topics/hooks.txt:281 en/help_topics/hooks.txt:300
13126
#: en/help_topics/hooks.txt:524
12832
13127
msgid "Introduced in: 1.15"
12833
13128
msgstr "Introducido en: 1.15"
12834
13129
12835
#: en/help_topics/hooks.txt:280
13130
#: en/help_topics/hooks.txt:283
12836
13131
msgid ""
12837
13132
"Invoked when displaying the statistics for a repository. repository is\n"
12838
13133
"called with a statistics dictionary as returned by the repository and\n"
12839
13134
"a file-like object to write to."
12840
13135
msgstr ""
12841
13136
12842
#: en/help_topics/hooks.txt:284
12843
msgid ""
12844
"LockHooks\n"
12845
"---------"
12846
msgstr ""
12847
"LockHooks\n"
12848
"---------"
12849
12850
13137
#: en/help_topics/hooks.txt:287
12851
13138
msgid ""
12852
"lock_acquired\n"
12853
"~~~~~~~~~~~~~"
12854
msgstr ""
12855
"lock_acquired\n"
12856
"~~~~~~~~~~~~~"
12857
12858
#: en/help_topics/hooks.txt:292
13139
"LockHooks\n"
13140
"---------"
13141
msgstr ""
13142
"LockHooks\n"
13143
"---------"
13144
13145
#: en/help_topics/hooks.txt:290
13146
msgid ""
13147
"lock_acquired\n"
13148
"~~~~~~~~~~~~~"
13149
msgstr ""
13150
"lock_acquired\n"
13151
"~~~~~~~~~~~~~"
13152
13153
#: en/help_topics/hooks.txt:295
12859
13154
msgid ""
12860
13155
"Called with a bzrlib.lock.LockResult when a physical lock is acquired."
12861
13156
msgstr ""
12862
13157
12863
#: en/help_topics/hooks.txt:294
13158
#: en/help_topics/hooks.txt:297
12864
13159
msgid ""
12865
13160
"lock_broken\n"
12866
13161
"~~~~~~~~~~~"
12868
13163
"lock_broken\n"
12869
13164
"~~~~~~~~~~~"
12870
13165
12871
#: en/help_topics/hooks.txt:299
13166
#: en/help_topics/hooks.txt:302
12872
13167
msgid "Called with a bzrlib.lock.LockResult when a physical lock is broken."
12873
13168
msgstr ""
12874
13169
12875
#: en/help_topics/hooks.txt:301
13170
#: en/help_topics/hooks.txt:304
12876
13171
msgid ""
12877
13172
"lock_released\n"
12878
13173
"~~~~~~~~~~~~~"
12880
13175
"lock_released\n"
12881
13176
"~~~~~~~~~~~~~"
12882
13177
12883
#: en/help_topics/hooks.txt:306
13178
#: en/help_topics/hooks.txt:309
12884
13179
msgid ""
12885
13180
"Called with a bzrlib.lock.LockResult when a physical lock is released."
12886
13181
msgstr ""
12887
13182
12888
#: en/help_topics/hooks.txt:308
12889
msgid ""
12890
"MergeHooks\n"
12891
"----------"
12892
msgstr ""
12893
"MergeHooks\n"
12894
"----------"
12895
12896
13183
#: en/help_topics/hooks.txt:311
12897
13184
msgid ""
12898
"merge_file_content\n"
12899
"~~~~~~~~~~~~~~~~~~"
13185
"MergeHooks\n"
13186
"----------"
12900
13187
msgstr ""
12901
"merge_file_content\n"
12902
"~~~~~~~~~~~~~~~~~~"
13188
"MergeHooks\n"
13189
"----------"
12903
13190
12904
13191
#: en/help_topics/hooks.txt:314
13192
msgid ""
13193
"merge_file_content\n"
13194
"~~~~~~~~~~~~~~~~~~"
13195
msgstr ""
13196
"merge_file_content\n"
13197
"~~~~~~~~~~~~~~~~~~"
13198
13199
#: en/help_topics/hooks.txt:317
12905
13200
msgid "Introduced in: 2.1"
12906
13201
msgstr "Introducido en: 2.1"
12907
13202
12908
#: en/help_topics/hooks.txt:316
13203
#: en/help_topics/hooks.txt:319
12909
13204
msgid ""
12910
13205
"Called with a bzrlib.merge.Merger object to create a per file merge\n"
12911
13206
"object when starting a merge. Should return either None or a subclass\n"
12915
13210
"AbstractPerFileMerger API docs for details on how it is used by merge."
12916
13211
msgstr ""
12917
13212
12918
#: en/help_topics/hooks.txt:323
13213
#: en/help_topics/hooks.txt:326
12919
13214
msgid ""
12920
13215
"post_merge\n"
12921
13216
"~~~~~~~~~~"
12922
13217
msgstr ""
12923
13218
12924
#: en/help_topics/hooks.txt:326 en/help_topics/hooks.txt:334
12925
#: en/help_topics/hooks.txt:384 en/help_topics/hooks.txt:402
12926
#: en/help_topics/hooks.txt:410 en/help_topics/hooks.txt:509
13219
#: en/help_topics/hooks.txt:329 en/help_topics/hooks.txt:337
13220
#: en/help_topics/hooks.txt:387 en/help_topics/hooks.txt:405
13221
#: en/help_topics/hooks.txt:413 en/help_topics/hooks.txt:512
12927
13222
msgid "Introduced in: 2.5"
12928
msgstr ""
13223
msgstr "Introducido en: 2.5"
12929
13224
12930
#: en/help_topics/hooks.txt:328
13225
#: en/help_topics/hooks.txt:331
12931
13226
msgid ""
12932
13227
"Called after a merge. Receives a Merger object as the single argument.\n"
12933
13228
"The return value is ignored."
12934
13229
msgstr ""
12935
13230
12936
#: en/help_topics/hooks.txt:331
13231
#: en/help_topics/hooks.txt:334
12937
13232
msgid ""
12938
13233
"pre_merge\n"
12939
13234
"~~~~~~~~~"
12940
13235
msgstr ""
12941
13236
12942
#: en/help_topics/hooks.txt:336
13237
#: en/help_topics/hooks.txt:339
12943
13238
msgid ""
12944
13239
"Called before a merge. Receives a Merger object as the single\n"
12945
13240
"argument."
12946
13241
msgstr ""
12947
13242
12948
#: en/help_topics/hooks.txt:339
12949
msgid ""
12950
"MergeDirectiveHooks\n"
12951
"-------------------"
12952
msgstr ""
12953
"MergeDirectiveHooks\n"
12954
"-------------------"
12955
12956
13243
#: en/help_topics/hooks.txt:342
12957
13244
msgid ""
12958
"merge_request_body\n"
12959
"~~~~~~~~~~~~~~~~~~"
13245
"MergeDirectiveHooks\n"
13246
"-------------------"
12960
13247
msgstr ""
12961
"merge_request_body\n"
12962
"~~~~~~~~~~~~~~~~~~"
13248
"MergeDirectiveHooks\n"
13249
"-------------------"
12963
13250
12964
13251
#: en/help_topics/hooks.txt:345
13252
msgid ""
13253
"merge_request_body\n"
13254
"~~~~~~~~~~~~~~~~~~"
13255
msgstr ""
13256
"merge_request_body\n"
13257
"~~~~~~~~~~~~~~~~~~"
13258
13259
#: en/help_topics/hooks.txt:348
12965
13260
msgid "Introduced in: 1.15.0"
12966
13261
msgstr "Introducido en: 1.15.0"
12967
13262
12968
#: en/help_topics/hooks.txt:347
13263
#: en/help_topics/hooks.txt:350
12969
13264
msgid ""
12970
13265
"Called with a MergeRequestBodyParams when a body is needed for a merge\n"
12971
13266
"request. Callbacks must return a body. If more than one callback is\n"
12972
13267
"registered, the output of one callback is provided to the next."
12973
13268
msgstr ""
12974
13269
12975
#: en/help_topics/hooks.txt:351
12976
msgid ""
12977
"MessageEditorHooks\n"
12978
"------------------"
12979
msgstr ""
12980
"MessageEditorHooks\n"
12981
"------------------"
12982
12983
13270
#: en/help_topics/hooks.txt:354
12984
13271
msgid ""
12985
"commit_message_template\n"
12986
"~~~~~~~~~~~~~~~~~~~~~~~"
13272
"MessageEditorHooks\n"
13273
"------------------"
12987
13274
msgstr ""
12988
"commit_message_template\n"
12989
"~~~~~~~~~~~~~~~~~~~~~~~"
13275
"MessageEditorHooks\n"
13276
"------------------"
12990
13277
12991
13278
#: en/help_topics/hooks.txt:357
13279
msgid ""
13280
"commit_message_template\n"
13281
"~~~~~~~~~~~~~~~~~~~~~~~"
13282
msgstr ""
13283
"commit_message_template\n"
13284
"~~~~~~~~~~~~~~~~~~~~~~~"
13285
13286
#: en/help_topics/hooks.txt:360
12992
13287
msgid "Introduced in: 1.10"
12993
13288
msgstr "Introducido en: 1.10"
12994
13289
12995
#: en/help_topics/hooks.txt:359
13290
#: en/help_topics/hooks.txt:362
12996
13291
msgid ""
12997
13292
"Called when a commit message is being generated.\n"
12998
13293
"commit_message_template is called with the bzrlib.commit.Commit object\n"
13003
13298
"second, and so on."
13004
13299
msgstr ""
13005
13300
13006
#: en/help_topics/hooks.txt:367
13301
#: en/help_topics/hooks.txt:370
13007
13302
msgid ""
13008
13303
"set_commit_message\n"
13009
13304
"~~~~~~~~~~~~~~~~~~"
13011
13306
"set_commit_message\n"
13012
13307
"~~~~~~~~~~~~~~~~~~"
13013
13308
13014
#: en/help_topics/hooks.txt:372
13309
#: en/help_topics/hooks.txt:375
13015
13310
msgid ""
13016
13311
"Set a fixed commit message. set_commit_message is called with the\n"
13017
13312
"bzrlib.commit.Commit object (so you can also change e.g. revision\n"
13020
13315
"should use the message editor as normal."
13021
13316
msgstr ""
13022
13317
13023
#: en/help_topics/hooks.txt:378
13024
msgid ""
13025
"MutableTreeHooks\n"
13026
"----------------"
13027
msgstr ""
13028
"MutableTreeHooks\n"
13029
"----------------"
13030
13031
13318
#: en/help_topics/hooks.txt:381
13032
13319
msgid ""
13320
"MutableTreeHooks\n"
13321
"----------------"
13322
msgstr ""
13323
"MutableTreeHooks\n"
13324
"----------------"
13325
13326
#: en/help_topics/hooks.txt:384
13327
msgid ""
13033
13328
"post_build_tree\n"
13034
13329
"~~~~~~~~~~~~~~~"
13035
13330
msgstr ""
13036
13331
13037
#: en/help_topics/hooks.txt:386
13332
#: en/help_topics/hooks.txt:389
13038
13333
msgid ""
13039
13334
"Called after a completely new tree is built. The hook is called with\n"
13040
13335
"the tree as its only argument."
13041
13336
msgstr ""
13042
13337
13043
#: en/help_topics/hooks.txt:392
13338
#: en/help_topics/hooks.txt:395
13044
13339
msgid "Introduced in: 2.0"
13045
13340
msgstr "Introducido en: 2.0"
13046
13341
13047
#: en/help_topics/hooks.txt:394
13342
#: en/help_topics/hooks.txt:397
13048
13343
msgid ""
13049
13344
"Called after a commit is performed on a tree. The hook is called with\n"
13050
13345
"a bzrlib.mutabletree.PostCommitHookParams object. The mutable tree the\n"
13052
13347
"that object."
13053
13348
msgstr ""
13054
13349
13055
#: en/help_topics/hooks.txt:399
13350
#: en/help_topics/hooks.txt:402
13056
13351
msgid ""
13057
13352
"post_transform\n"
13058
13353
"~~~~~~~~~~~~~~"
13059
13354
msgstr ""
13060
13355
13061
#: en/help_topics/hooks.txt:404
13356
#: en/help_topics/hooks.txt:407
13062
13357
msgid ""
13063
13358
"Called after a tree transform has been performed on a tree. The hook\n"
13064
13359
"is called with the tree that is being transformed and the transform."
13065
13360
msgstr ""
13066
13361
13067
#: en/help_topics/hooks.txt:407
13362
#: en/help_topics/hooks.txt:410
13068
13363
msgid ""
13069
13364
"pre_transform\n"
13070
13365
"~~~~~~~~~~~~~"
13071
13366
msgstr ""
13072
13367
13073
#: en/help_topics/hooks.txt:412
13368
#: en/help_topics/hooks.txt:415
13074
13369
msgid ""
13075
13370
"Called before a tree transform on this tree. The hook is called with\n"
13076
13371
"the tree that is being transformed and the transform."
13077
13372
msgstr ""
13078
13373
13079
#: en/help_topics/hooks.txt:415
13374
#: en/help_topics/hooks.txt:418
13080
13375
msgid ""
13081
13376
"start_commit\n"
13082
13377
"~~~~~~~~~~~~"
13084
13379
"start_commit\n"
13085
13380
"~~~~~~~~~~~~"
13086
13381
13087
#: en/help_topics/hooks.txt:420
13382
#: en/help_topics/hooks.txt:423
13088
13383
msgid ""
13089
13384
"Called before a commit is performed on a tree. The start commit hook\n"
13090
13385
"is able to change the tree before the commit takes place. start_commit\n"
13092
13387
"being performed on."
13093
13388
msgstr ""
13094
13389
13095
#: en/help_topics/hooks.txt:425
13096
msgid ""
13097
"SmartClientHooks\n"
13098
"----------------"
13099
msgstr ""
13100
"SmartClientHooks\n"
13101
"----------------"
13102
13103
13390
#: en/help_topics/hooks.txt:428
13104
13391
msgid ""
13105
"call\n"
13106
"~~~~"
13392
"SmartClientHooks\n"
13393
"----------------"
13107
13394
msgstr ""
13108
"call\n"
13109
"~~~~"
13395
"SmartClientHooks\n"
13396
"----------------"
13110
13397
13111
13398
#: en/help_topics/hooks.txt:431
13399
msgid ""
13400
"call\n"
13401
"~~~~"
13402
msgstr ""
13403
"call\n"
13404
"~~~~"
13405
13406
#: en/help_topics/hooks.txt:434
13112
13407
msgid "Introduced in: unknown"
13113
msgstr ""
13408
msgstr "Introducido en: deconocido"
13114
13409
13115
#: en/help_topics/hooks.txt:433
13410
#: en/help_topics/hooks.txt:436
13116
13411
msgid ""
13117
13412
"Called when the smart client is submitting a request to the smart\n"
13118
13413
"server. Called with a bzrlib.smart.client.CallHookParams object.\n"
13119
13414
"Streaming request bodies, and responses, are not accessible."
13120
13415
msgstr ""
13121
13416
13122
#: en/help_topics/hooks.txt:437
13123
msgid ""
13124
"SmartServerHooks\n"
13125
"----------------"
13126
msgstr ""
13127
"SmartServerHooks\n"
13128
"----------------"
13129
13130
13417
#: en/help_topics/hooks.txt:440
13131
13418
msgid ""
13132
"server_exception\n"
13133
"~~~~~~~~~~~~~~~~"
13134
msgstr ""
13135
"server_exception\n"
13136
"~~~~~~~~~~~~~~~~"
13137
13138
#: en/help_topics/hooks.txt:445
13419
"SmartServerHooks\n"
13420
"----------------"
13421
msgstr ""
13422
"SmartServerHooks\n"
13423
"----------------"
13424
13425
#: en/help_topics/hooks.txt:443
13426
msgid ""
13427
"server_exception\n"
13428
"~~~~~~~~~~~~~~~~"
13429
msgstr ""
13430
"server_exception\n"
13431
"~~~~~~~~~~~~~~~~"
13432
13433
#: en/help_topics/hooks.txt:448
13139
13434
msgid ""
13140
13435
"Called by the bzr server when an exception occurs. server_exception is\n"
13141
13436
"called with the sys.exc_info() tuple return true for the hook if the\n"
13143
13438
"normally."
13144
13439
msgstr ""
13145
13440
13146
#: en/help_topics/hooks.txt:450
13441
#: en/help_topics/hooks.txt:453
13147
13442
msgid ""
13148
13443
"server_started\n"
13149
13444
"~~~~~~~~~~~~~~"
13151
13446
"server_started\n"
13152
13447
"~~~~~~~~~~~~~~"
13153
13448
13154
#: en/help_topics/hooks.txt:453 en/help_topics/hooks.txt:472
13449
#: en/help_topics/hooks.txt:456 en/help_topics/hooks.txt:475
13155
13450
msgid "Introduced in: 0.16"
13156
msgstr ""
13451
msgstr "Introducido en: 0.16"
13157
13452
13158
#: en/help_topics/hooks.txt:455
13453
#: en/help_topics/hooks.txt:458
13159
13454
msgid ""
13160
13455
"Called by the bzr server when it starts serving a directory.\n"
13161
13456
"server_started is called with (backing urls, public url), where\n"
13164
13459
"served."
13165
13460
msgstr ""
13166
13461
13167
#: en/help_topics/hooks.txt:461
13462
#: en/help_topics/hooks.txt:464
13168
13463
msgid ""
13169
13464
"server_started_ex\n"
13170
13465
"~~~~~~~~~~~~~~~~~"
13172
13467
"server_started_ex\n"
13173
13468
"~~~~~~~~~~~~~~~~~"
13174
13469
13175
#: en/help_topics/hooks.txt:466
13470
#: en/help_topics/hooks.txt:469
13176
13471
msgid ""
13177
13472
"Called by the bzr server when it starts serving a directory.\n"
13178
13473
"server_started is called with (backing_urls, server_obj)."
13179
13474
msgstr ""
13180
13475
13181
#: en/help_topics/hooks.txt:469
13476
#: en/help_topics/hooks.txt:472
13182
13477
msgid ""
13183
13478
"server_stopped\n"
13184
13479
"~~~~~~~~~~~~~~"
13186
13481
"server_stopped\n"
13187
13482
"~~~~~~~~~~~~~~"
13188
13483
13189
#: en/help_topics/hooks.txt:474
13484
#: en/help_topics/hooks.txt:477
13190
13485
msgid ""
13191
13486
"Called by the bzr server when it stops serving a directory.\n"
13192
13487
"server_stopped is called with the same parameters as the\n"
13193
13488
"server_started hook: (backing_urls, public_url)."
13194
13489
msgstr ""
13195
13490
13196
#: en/help_topics/hooks.txt:478
13197
msgid ""
13198
"StatusHooks\n"
13199
"-----------"
13200
msgstr ""
13201
"StatusHooks\n"
13202
"-----------"
13203
13204
13491
#: en/help_topics/hooks.txt:481
13205
13492
msgid ""
13206
"post_status\n"
13207
"~~~~~~~~~~~"
13208
msgstr ""
13209
"post_status\n"
13210
"~~~~~~~~~~~"
13211
13212
#: en/help_topics/hooks.txt:484 en/help_topics/hooks.txt:495
13493
"StatusHooks\n"
13494
"-----------"
13495
msgstr ""
13496
"StatusHooks\n"
13497
"-----------"
13498
13499
#: en/help_topics/hooks.txt:484
13500
msgid ""
13501
"post_status\n"
13502
"~~~~~~~~~~~"
13503
msgstr ""
13504
"post_status\n"
13505
"~~~~~~~~~~~"
13506
13507
#: en/help_topics/hooks.txt:487 en/help_topics/hooks.txt:498
13213
13508
msgid "Introduced in: 2.3"
13214
msgstr ""
13509
msgstr "Introducido en: 2.3"
13215
13510
13216
#: en/help_topics/hooks.txt:486
13511
#: en/help_topics/hooks.txt:489
13217
13512
msgid ""
13218
13513
"Called with argument StatusHookParams after Bazaar has displayed the\n"
13219
13514
"status. StatusHookParams has the attributes (old_tree, new_tree,\n"
13222
13517
"status command. to_file is the output stream for writing."
13223
13518
msgstr ""
13224
13519
13225
#: en/help_topics/hooks.txt:492
13520
#: en/help_topics/hooks.txt:495
13226
13521
msgid ""
13227
13522
"pre_status\n"
13228
13523
"~~~~~~~~~~"
13230
13525
"pre_status\n"
13231
13526
"~~~~~~~~~~"
13232
13527
13233
#: en/help_topics/hooks.txt:497
13528
#: en/help_topics/hooks.txt:500
13234
13529
msgid ""
13235
13530
"Called with argument StatusHookParams before Bazaar displays the\n"
13236
13531
"status. StatusHookParams has the attributes (old_tree, new_tree,\n"
13239
13534
"status command. to_file is the output stream for writing."
13240
13535
msgstr ""
13241
13536
13242
#: en/help_topics/hooks.txt:503
13537
#: en/help_topics/hooks.txt:506
13243
13538
msgid ""
13244
13539
"TransportHooks\n"
13245
13540
"--------------"
13246
13541
msgstr ""
13247
13542
13248
#: en/help_topics/hooks.txt:506
13543
#: en/help_topics/hooks.txt:509
13249
13544
msgid ""
13250
13545
"post_connect\n"
13251
13546
"~~~~~~~~~~~~"
13252
13547
msgstr ""
13253
13548
13254
#: en/help_topics/hooks.txt:511
13549
#: en/help_topics/hooks.txt:514
13255
13550
msgid ""
13256
13551
"Called after a new connection is established or a reconnect occurs.\n"
13257
13552
"The sole argument passed is either the connected transport or smart\n"
13258
13553
"medium instance."
13259
13554
msgstr ""
13260
13555
13261
#: en/help_topics/hooks.txt:515
13262
msgid ""
13263
"RioVersionInfoBuilderHooks\n"
13264
"--------------------------"
13265
msgstr ""
13266
"RioVersionInfoBuilderHooks\n"
13267
"--------------------------"
13268
13269
13556
#: en/help_topics/hooks.txt:518
13270
13557
msgid ""
13558
"RioVersionInfoBuilderHooks\n"
13559
"--------------------------"
13560
msgstr ""
13561
"RioVersionInfoBuilderHooks\n"
13562
"--------------------------"
13563
13564
#: en/help_topics/hooks.txt:521
13565
msgid ""
13271
13566
"revision\n"
13272
13567
"~~~~~~~~"
13273
13568
msgstr ""
13274
13569
"revisión\n"
13275
13570
"~~~~~~~~"
13276
13571
13277
#: en/help_topics/hooks.txt:523
13572
#: en/help_topics/hooks.txt:526
13278
13573
msgid ""
13279
13574
"Invoked when adding information about a revision to the RIO stanza\n"
13280
13575
"that is printed. revision is called with a revision object and a RIO\n"
13382
13677
13383
13678
#: en/help_topics/other-formats.txt:3
13384
13679
msgid "Experimental formats are shown below."
13385
msgstr ""
13680
msgstr "Los formatos experimentales se muestran a continuación."
13386
13681
13387
13682
#: en/help_topics/other-formats.txt:5
13388
13683
msgid ""
13396
13691
"\n"
13397
13692
"Deprecated formats are shown below."
13398
13693
msgstr ""
13694
"\n"
13695
"Los formatos obsoletos se muestran a continuación."
13399
13696
13400
13697
#: en/help_topics/other-formats.txt:12
13401
13698
msgid ""
13475
13772
msgid ""
13476
13773
".. _Python regular expressions: http://docs.python.org/library/re.html"
13477
13774
msgstr ""
13775
".. Expresiones regulares de _Python: http://docs.python.org/library/re.html"
13478
13776
13479
13777
#: en/help_topics/revisionspec.txt:1
13480
13778
msgid "Revision Identifiers"
13907
14205
"Special character handling in URLs\n"
13908
14206
"=================================="
13909
14207
msgstr ""
14208
"Manejo de caracteres especiales en las URL\n"
14209
"=================================="
13910
14210
13911
14211
#: en/help_topics/url-special-chars.txt:4
13912
14212
msgid "Bazaar allows locations to be specified in multiple ways, either:"
13913
14213
msgstr ""
14214
"Bazar permite ubicaciones que se especifican en múltiples formas, ya sea:"
13914
14215
13915
14216
#: en/help_topics/url-special-chars.txt:6
13916
14217
msgid " * Fully qualified URLs"
13917
msgstr ""
14218
msgstr " * URL altamente calificados"
13918
14219
13919
14220
#: en/help_topics/url-special-chars.txt:8
13920
14221
msgid " * File system paths, relative or absolute"
13954
14255
"ways of accessing the content (0x2F, or 47, is the ASCII code for forward "
13955
14256
"slash)::"
13956
14257
msgstr ""
14258
"Por ejemplo, si tiene un directorio llamado «/tmp/%2False» todas estas "
14259
"maneras son\n"
14260
"válidas para acceder al contenido (0x2F, o 47, es el código ASCII de la "
14261
"barra diagonal)::"
13957
14262
13958
14263
#: en/help_topics/url-special-chars.txt:27
13959
14264
msgid ""
13988
14293
"Comma also has special meaning in URLs, because it denotes `segment "
13989
14294
"parameters`_"
13990
14295
msgstr ""
14296
"La coma también tiene un significado especial en las URL, porque denota "
14297
"«parámetros de segmento»_"
13991
14298
13992
14299
#: en/help_topics/url-special-chars.txt:41
13993
14300
msgid ""
13994
14301
"_`segment parameters`: http://www.ietf.org/rfc/rfc3986.txt (section 3.3)"
13995
14302
msgstr ""
14303
"_ «parámetros de segmento»: http://www.ietf.org/rfc/rfc3986.txt (sección 3.3)"
13996
14304
13997
14305
#: en/help_topics/url-special-chars.txt:43
13998
14306
msgid ""
14000
14308
"literal\n"
14001
14309
"comma in a file system path, specify a URL and URL encode the comma::"
14002
14310
msgstr ""
14311
"La coma también es especial en todas las rutas de archivos de sistema que se "
14312
"especifican. Para utilizar una coma\n"
14313
"literal en una ruta de archivos de sistema, especifique un URL y codifique "
14314
"la coma en el URL::"
14003
14315
14004
14316
#: en/help_topics/url-special-chars.txt:46
14005
14317
msgid ""
14037
14349
14038
14350
#: en/help_topics/urlspec.txt:16
14039
14351
msgid " gio+ Access using any GIO supported protocols."
14040
msgstr ""
14352
msgstr " gio + Access utilizando cualquier protocolo GIO compatible."
14041
14353
14042
14354
#: en/help_topics/urlspec.txt:18
14043
14355
msgid "Bazaar supports all of the standard parts within the URL::"
14079
14391
msgstr ""
14080
14392
"Muchas órdenes que aceptan URL también aceptan alias de ubicaciones.\n"
14081
14393
"Vea :doc:`location-alias-help` y :doc:`url-special-chars-help`.\n"
14394
14395
#~ msgid "Unknown mail client: %(mail_client)s"
14396
#~ msgstr "Correo de cliente desconocido: %(mail_client)s"
14397
14398
#~ msgid ""
14399
#~ "set_rh\n"
14400
#~ "~~~~~~"
14401
#~ msgstr ""
14402
#~ "set_rh\n"
14403
#~ "~~~~~~"
14404
14405
#~ msgid "Revert files to a previous revision."
14406
#~ msgstr "Revierte los archivos a la revisión previa."
14407
14408
#~ msgid ""
14409
#~ "This makes Bazaar stop tracking changes to the specified files. Bazaar will\n"
14410
#~ "delete them if they can easily be recovered using revert otherwise they\n"
14411
#~ "will be backed up (adding an extention of the form .~#~). If no options or\n"
14412
#~ "parameters are given Bazaar will scan for files that are being tracked by\n"
14413
#~ "Bazaar but missing in your tree and stop tracking them for you."
14414
#~ msgstr ""
14415
#~ "Esto hace que Bazaar deje de revisar los cambios en los archivos "
14416
#~ "especificados.\n"
14417
#~ "Bazaar los borrará si estos pueden ser fácilmente recuperados usando "
14418
#~ "revertir\n"
14419
#~ "de otra manera se hará una copia (agregando la extensión .~#~). Si no se dan "
14420
#~ "\n"
14421
#~ "parámetros u opciones, Bazaar revisará los archivos que están siendo "
14422
#~ "revisados\n"
14423
#~ "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