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